diff --git a/addressbook/locale/ar/fusiondirectory.po b/addressbook/locale/ar/fusiondirectory.po
index d86280ae29cd481842dbabc4e076b9c16985e6e8..ea6bd2c2de8e3dedeaa88420dc342750b6febb20 100644
--- a/addressbook/locale/ar/fusiondirectory.po
+++ b/addressbook/locale/ar/fusiondirectory.po
@@ -3,16 +3,14 @@
 # This file is distributed under the same license as the PACKAGE package.
 # 
 # Translators:
-# Islam Adel, 2013
-# Islam Adel, 2013
 msgid ""
 msgstr ""
-"Project-Id-Version: FusionDirectory-108\n"
+"Project-Id-Version: FusionDirectory-109\n"
 "Report-Msgid-Bugs-To: documentation@lists.fusiondirectory.org\n"
-"POT-Creation-Date: 2015-03-19 21:45+0100\n"
-"PO-Revision-Date: 2015-02-25 16:02+0000\n"
+"POT-Creation-Date: 2014-12-15 17:47+0100\n"
+"PO-Revision-Date: 2015-02-25 16:04+0000\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>\n"
-"Language-Team: Arabic (http://www.transifex.com/projects/p/FusionDirectory-108/language/ar/)\n"
+"Language-Team: Arabic (http://www.transifex.com/projects/p/FusionDirectory-109/language/ar/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -47,7 +45,6 @@ msgstr ""
 #: addons/addressbook/class_addressbook.inc:472
 #: addons/addressbook/class_addressbook.inc:476
 #: addons/addressbook/class_addressbook.inc:598
-#: addons/addressbook/dial.tpl.c:5
 msgid "Dial"
 msgstr ""
 
@@ -86,7 +83,6 @@ msgstr "Ø§Ù„ÙƒÙ„"
 #: addons/addressbook/class_addressbook.inc:697
 #: addons/addressbook/class_addressbook.inc:707
 #: addons/addressbook/class_addressbook.inc:734
-#: addons/addressbook/address_info.tpl.c:5 addons/addressbook/contents.tpl.c:2
 msgid "Name"
 msgstr "Ø§Ù„Ø¥Ø³Ù…"
 
@@ -115,11 +111,6 @@ msgid "User ID"
 msgstr ""
 
 #: addons/addressbook/class_addressbook.inc:715
-#: addons/addressbook/address_info.tpl.c:20
-#: addons/addressbook/address_info.tpl.c:50
-#: addons/addressbook/contents.tpl.c:5
-#: addons/addressbook/address_edit.tpl.c:26
-#: addons/addressbook/address_edit.tpl.c:56
 msgid "Phone"
 msgstr "Ø§Ù„Ù‡Ø§ØªÙ"
 
@@ -128,27 +119,19 @@ msgid "Telephone number"
 msgstr ""
 
 #: addons/addressbook/class_addressbook.inc:721
-#: addons/addressbook/contents.tpl.c:8
 msgid "Fax"
 msgstr "Ø§Ù„ÙØ§ÙƒØ³"
 
 #: addons/addressbook/class_addressbook.inc:724
-#: addons/addressbook/address_info.tpl.c:23
-#: addons/addressbook/contents.tpl.c:11
-#: addons/addressbook/address_edit.tpl.c:29
 msgid "Mobile"
 msgstr "Ø§Ù„Ù‡Ø§ØªÙ Ø§Ù„Ù…ØÙ…ÙˆÙ„"
 
 #: addons/addressbook/class_addressbook.inc:727
 #: addons/addressbook/class_addressbook.inc:866
-#: addons/addressbook/address_info.tpl.c:56
-#: addons/addressbook/address_edit.tpl.c:62
 msgid "Pager"
 msgstr ""
 
 #: addons/addressbook/class_addressbook.inc:739
-#: addons/addressbook/address_info.tpl.c:26
-#: addons/addressbook/address_edit.tpl.c:32
 msgid "Email"
 msgstr ""
 
@@ -199,8 +182,6 @@ msgid "Organization"
 msgstr ""
 
 #: addons/addressbook/class_addressbook.inc:868
-#: addons/addressbook/address_info.tpl.c:35
-#: addons/addressbook/address_edit.tpl.c:41
 msgid "Department"
 msgstr "Ø§Ù„Ù‚Ø³Ù…"
 
@@ -218,8 +199,6 @@ msgid "State"
 msgstr ""
 
 #: addons/addressbook/class_addressbook.inc:873
-#: addons/addressbook/address_info.tpl.c:8
-#: addons/addressbook/address_edit.tpl.c:14
 msgid "Initials"
 msgstr ""
 
@@ -242,161 +221,3 @@ msgstr "Ø®Ø·Ø£ Ø¯Ø§Ø®Ù„ÙŠ"
 #: html/getvcard.php:39
 msgid "Missing parameters!"
 msgstr ""
-
-#: addons/addressbook/address_info.tpl.c:2
-#: addons/addressbook/address_edit.tpl.c:5
-msgid "Personal"
-msgstr ""
-
-#: addons/addressbook/address_info.tpl.c:11
-#: addons/addressbook/address_edit.tpl.c:17
-msgid "Personal title"
-msgstr "Ø§Ù„Ù„Ù‚Ø¨"
-
-#: addons/addressbook/address_info.tpl.c:14
-#: addons/addressbook/contents.tpl.c:14
-#: addons/addressbook/address_edit.tpl.c:20
-msgid "Private"
-msgstr ""
-
-#: addons/addressbook/address_info.tpl.c:17
-#: addons/addressbook/address_info.tpl.c:47
-#: addons/addressbook/address_edit.tpl.c:23
-#: addons/addressbook/address_edit.tpl.c:53
-msgid "Address"
-msgstr "Ø§Ù„Ø¹Ù†ÙˆØ§Ù†"
-
-#: addons/addressbook/address_info.tpl.c:29
-#: addons/addressbook/address_edit.tpl.c:35
-msgid "Organizational"
-msgstr ""
-
-#: addons/addressbook/address_info.tpl.c:32
-#: addons/addressbook/address_edit.tpl.c:38
-msgid "Company"
-msgstr "Ø§Ù„Ø´Ø±ÙƒØ©"
-
-#: addons/addressbook/address_info.tpl.c:38
-#: addons/addressbook/address_edit.tpl.c:44
-msgid "City"
-msgstr "Ø§Ù„Ù…Ø¯ÙŠÙ†Ø©"
-
-#: addons/addressbook/address_info.tpl.c:41
-#: addons/addressbook/address_edit.tpl.c:47
-msgid "Postal code"
-msgstr "Ø§Ù„Ø±Ù‚Ù… Ø§Ù„Ø¨Ø±ÙŠØ¯ÙŠ"
-
-#: addons/addressbook/address_info.tpl.c:44
-#: addons/addressbook/address_edit.tpl.c:50
-msgid "Country"
-msgstr "Ø§Ù„Ø¨Ù„Ø¯"
-
-#: addons/addressbook/address_info.tpl.c:53
-#: addons/addressbook/address_edit.tpl.c:59
-msgid "FAX"
-msgstr "Ø§Ù„ÙØ§ÙƒØ³"
-
-#: addons/addressbook/dial.tpl.c:2
-msgid "Dial connection..."
-msgstr ""
-
-#: addons/addressbook/contents.tpl.c:17
-msgid "Contact"
-msgstr ""
-
-#: addons/addressbook/contents.tpl.c:20
-msgid "Information"
-msgstr "Ù…Ø¹Ù„ÙˆÙ…Ø§Øª"
-
-#: addons/addressbook/contents.tpl.c:23
-msgid ""
-"The telephone list plugin provides list and search facilities for the people in your site. You may want to specify the asterisk [*] like in\n"
-"'Fu*ry' to find 'FusionDirectory'. Use the filters below to narrow down your search."
-msgstr ""
-
-#: addons/addressbook/contents.tpl.c:26
-msgid "Actions"
-msgstr ""
-
-#: addons/addressbook/contents.tpl.c:29
-msgid "Add entry"
-msgstr ""
-
-#: addons/addressbook/contents.tpl.c:32
-msgid "Edit entry"
-msgstr ""
-
-#: addons/addressbook/contents.tpl.c:35
-msgid "Remove entry"
-msgstr ""
-
-#: addons/addressbook/contents.tpl.c:38
-msgid "Filters"
-msgstr ""
-
-#: addons/addressbook/contents.tpl.c:41
-msgid "Select to see regular users"
-msgstr ""
-
-#: addons/addressbook/contents.tpl.c:44
-msgid "Show organizational entries"
-msgstr ""
-
-#: addons/addressbook/contents.tpl.c:47
-msgid "Select to see users in addressbook"
-msgstr ""
-
-#: addons/addressbook/contents.tpl.c:50
-msgid "Show addressbook entries"
-msgstr ""
-
-#: addons/addressbook/contents.tpl.c:53
-msgid "Display results for department"
-msgstr ""
-
-#: addons/addressbook/contents.tpl.c:56
-msgid "Choose the department the search will be based on"
-msgstr ""
-
-#: addons/addressbook/contents.tpl.c:59
-msgid "Match object"
-msgstr ""
-
-#: addons/addressbook/contents.tpl.c:62
-msgid "Choose the object that will be searched in"
-msgstr ""
-
-#: addons/addressbook/contents.tpl.c:65
-msgid "Search for"
-msgstr ""
-
-#: addons/addressbook/contents.tpl.c:68
-msgid "Search string"
-msgstr ""
-
-#: addons/addressbook/remove.tpl.c:2
-msgid "Warning"
-msgstr "ØªØØ°ÙŠØ±"
-
-#: addons/addressbook/remove.tpl.c:5
-msgid ""
-"This includes all addressbook data in this entry. Please double check if "
-"your really want to do this since there is no way for FusionDirectory to get"
-" your data back."
-msgstr ""
-
-#: addons/addressbook/remove.tpl.c:8
-msgid "So - if you're sure - press 'Delete' to continue or 'Cancel' to abort."
-msgstr ""
-
-#: addons/addressbook/address_edit.tpl.c:2
-msgid "Choose the department to store entry in"
-msgstr ""
-
-#: addons/addressbook/address_edit.tpl.c:8
-msgid "Last name"
-msgstr "Ø§Ù„Ø¥Ø³Ù… Ø§Ù„Ø¹Ø§Ø¦Ù„ÙŠ"
-
-#: addons/addressbook/address_edit.tpl.c:11
-msgid "First name"
-msgstr "Ø§Ù„Ø¥Ø³Ù… Ø§Ù„Ø£ÙˆÙ„"
diff --git a/addressbook/locale/ca/fusiondirectory.po b/addressbook/locale/ca/fusiondirectory.po
index 1f35898b115d19b58193dcd116cbf42b42f162bc..693e230174d16c8ceacf1c91bde0c73a5109c80a 100644
--- a/addressbook/locale/ca/fusiondirectory.po
+++ b/addressbook/locale/ca/fusiondirectory.po
@@ -5,12 +5,12 @@
 # Translators:
 msgid ""
 msgstr ""
-"Project-Id-Version: FusionDirectory-108\n"
+"Project-Id-Version: FusionDirectory-109\n"
 "Report-Msgid-Bugs-To: documentation@lists.fusiondirectory.org\n"
-"POT-Creation-Date: 2015-03-19 21:45+0100\n"
-"PO-Revision-Date: 2015-02-25 16:02+0000\n"
+"POT-Creation-Date: 2014-12-15 17:47+0100\n"
+"PO-Revision-Date: 2015-02-25 16:04+0000\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>\n"
-"Language-Team: Catalan (http://www.transifex.com/projects/p/FusionDirectory-108/language/ca/)\n"
+"Language-Team: Catalan (http://www.transifex.com/projects/p/FusionDirectory-109/language/ca/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -45,7 +45,6 @@ msgstr ""
 #: addons/addressbook/class_addressbook.inc:472
 #: addons/addressbook/class_addressbook.inc:476
 #: addons/addressbook/class_addressbook.inc:598
-#: addons/addressbook/dial.tpl.c:5
 msgid "Dial"
 msgstr ""
 
@@ -84,7 +83,6 @@ msgstr ""
 #: addons/addressbook/class_addressbook.inc:697
 #: addons/addressbook/class_addressbook.inc:707
 #: addons/addressbook/class_addressbook.inc:734
-#: addons/addressbook/address_info.tpl.c:5 addons/addressbook/contents.tpl.c:2
 msgid "Name"
 msgstr "Nom"
 
@@ -113,11 +111,6 @@ msgid "User ID"
 msgstr ""
 
 #: addons/addressbook/class_addressbook.inc:715
-#: addons/addressbook/address_info.tpl.c:20
-#: addons/addressbook/address_info.tpl.c:50
-#: addons/addressbook/contents.tpl.c:5
-#: addons/addressbook/address_edit.tpl.c:26
-#: addons/addressbook/address_edit.tpl.c:56
 msgid "Phone"
 msgstr "TelÃ¨fon"
 
@@ -126,27 +119,19 @@ msgid "Telephone number"
 msgstr ""
 
 #: addons/addressbook/class_addressbook.inc:721
-#: addons/addressbook/contents.tpl.c:8
 msgid "Fax"
 msgstr "Fax"
 
 #: addons/addressbook/class_addressbook.inc:724
-#: addons/addressbook/address_info.tpl.c:23
-#: addons/addressbook/contents.tpl.c:11
-#: addons/addressbook/address_edit.tpl.c:29
 msgid "Mobile"
 msgstr "MÃ²bil"
 
 #: addons/addressbook/class_addressbook.inc:727
 #: addons/addressbook/class_addressbook.inc:866
-#: addons/addressbook/address_info.tpl.c:56
-#: addons/addressbook/address_edit.tpl.c:62
 msgid "Pager"
 msgstr "Buscapersones"
 
 #: addons/addressbook/class_addressbook.inc:739
-#: addons/addressbook/address_info.tpl.c:26
-#: addons/addressbook/address_edit.tpl.c:32
 msgid "Email"
 msgstr ""
 
@@ -197,8 +182,6 @@ msgid "Organization"
 msgstr "OrganitzaciÃ³"
 
 #: addons/addressbook/class_addressbook.inc:868
-#: addons/addressbook/address_info.tpl.c:35
-#: addons/addressbook/address_edit.tpl.c:41
 msgid "Department"
 msgstr "Departament"
 
@@ -216,8 +199,6 @@ msgid "State"
 msgstr "ProvÃncia"
 
 #: addons/addressbook/class_addressbook.inc:873
-#: addons/addressbook/address_info.tpl.c:8
-#: addons/addressbook/address_edit.tpl.c:14
 msgid "Initials"
 msgstr ""
 
@@ -240,161 +221,3 @@ msgstr ""
 #: html/getvcard.php:39
 msgid "Missing parameters!"
 msgstr ""
-
-#: addons/addressbook/address_info.tpl.c:2
-#: addons/addressbook/address_edit.tpl.c:5
-msgid "Personal"
-msgstr ""
-
-#: addons/addressbook/address_info.tpl.c:11
-#: addons/addressbook/address_edit.tpl.c:17
-msgid "Personal title"
-msgstr "Tractament"
-
-#: addons/addressbook/address_info.tpl.c:14
-#: addons/addressbook/contents.tpl.c:14
-#: addons/addressbook/address_edit.tpl.c:20
-msgid "Private"
-msgstr ""
-
-#: addons/addressbook/address_info.tpl.c:17
-#: addons/addressbook/address_info.tpl.c:47
-#: addons/addressbook/address_edit.tpl.c:23
-#: addons/addressbook/address_edit.tpl.c:53
-msgid "Address"
-msgstr "AdreÃ§a"
-
-#: addons/addressbook/address_info.tpl.c:29
-#: addons/addressbook/address_edit.tpl.c:35
-msgid "Organizational"
-msgstr ""
-
-#: addons/addressbook/address_info.tpl.c:32
-#: addons/addressbook/address_edit.tpl.c:38
-msgid "Company"
-msgstr ""
-
-#: addons/addressbook/address_info.tpl.c:38
-#: addons/addressbook/address_edit.tpl.c:44
-msgid "City"
-msgstr ""
-
-#: addons/addressbook/address_info.tpl.c:41
-#: addons/addressbook/address_edit.tpl.c:47
-msgid "Postal code"
-msgstr ""
-
-#: addons/addressbook/address_info.tpl.c:44
-#: addons/addressbook/address_edit.tpl.c:50
-msgid "Country"
-msgstr "Estat"
-
-#: addons/addressbook/address_info.tpl.c:53
-#: addons/addressbook/address_edit.tpl.c:59
-msgid "FAX"
-msgstr "Fax"
-
-#: addons/addressbook/dial.tpl.c:2
-msgid "Dial connection..."
-msgstr ""
-
-#: addons/addressbook/contents.tpl.c:17
-msgid "Contact"
-msgstr ""
-
-#: addons/addressbook/contents.tpl.c:20
-msgid "Information"
-msgstr "InformaciÃ³"
-
-#: addons/addressbook/contents.tpl.c:23
-msgid ""
-"The telephone list plugin provides list and search facilities for the people in your site. You may want to specify the asterisk [*] like in\n"
-"'Fu*ry' to find 'FusionDirectory'. Use the filters below to narrow down your search."
-msgstr ""
-
-#: addons/addressbook/contents.tpl.c:26
-msgid "Actions"
-msgstr ""
-
-#: addons/addressbook/contents.tpl.c:29
-msgid "Add entry"
-msgstr ""
-
-#: addons/addressbook/contents.tpl.c:32
-msgid "Edit entry"
-msgstr ""
-
-#: addons/addressbook/contents.tpl.c:35
-msgid "Remove entry"
-msgstr ""
-
-#: addons/addressbook/contents.tpl.c:38
-msgid "Filters"
-msgstr ""
-
-#: addons/addressbook/contents.tpl.c:41
-msgid "Select to see regular users"
-msgstr ""
-
-#: addons/addressbook/contents.tpl.c:44
-msgid "Show organizational entries"
-msgstr ""
-
-#: addons/addressbook/contents.tpl.c:47
-msgid "Select to see users in addressbook"
-msgstr ""
-
-#: addons/addressbook/contents.tpl.c:50
-msgid "Show addressbook entries"
-msgstr ""
-
-#: addons/addressbook/contents.tpl.c:53
-msgid "Display results for department"
-msgstr ""
-
-#: addons/addressbook/contents.tpl.c:56
-msgid "Choose the department the search will be based on"
-msgstr ""
-
-#: addons/addressbook/contents.tpl.c:59
-msgid "Match object"
-msgstr ""
-
-#: addons/addressbook/contents.tpl.c:62
-msgid "Choose the object that will be searched in"
-msgstr ""
-
-#: addons/addressbook/contents.tpl.c:65
-msgid "Search for"
-msgstr ""
-
-#: addons/addressbook/contents.tpl.c:68
-msgid "Search string"
-msgstr ""
-
-#: addons/addressbook/remove.tpl.c:2
-msgid "Warning"
-msgstr "AvÃs"
-
-#: addons/addressbook/remove.tpl.c:5
-msgid ""
-"This includes all addressbook data in this entry. Please double check if "
-"your really want to do this since there is no way for FusionDirectory to get"
-" your data back."
-msgstr ""
-
-#: addons/addressbook/remove.tpl.c:8
-msgid "So - if you're sure - press 'Delete' to continue or 'Cancel' to abort."
-msgstr ""
-
-#: addons/addressbook/address_edit.tpl.c:2
-msgid "Choose the department to store entry in"
-msgstr ""
-
-#: addons/addressbook/address_edit.tpl.c:8
-msgid "Last name"
-msgstr "Cognoms"
-
-#: addons/addressbook/address_edit.tpl.c:11
-msgid "First name"
-msgstr "Nom"
diff --git a/addressbook/locale/cs_CZ/fusiondirectory.po b/addressbook/locale/cs_CZ/fusiondirectory.po
index 1b885083e0dc0c08bdd21606370772a1c7a0a679..80ffb49bc9f24be49cd39604dbc86d37222cf2cb 100644
--- a/addressbook/locale/cs_CZ/fusiondirectory.po
+++ b/addressbook/locale/cs_CZ/fusiondirectory.po
@@ -3,17 +3,15 @@
 # This file is distributed under the same license as the PACKAGE package.
 # 
 # Translators:
-# Pavel Borecki <pavel.borecki@gmail.com>, 2012
-# Pavel Borecki <pavel.borecki@gmail.com>, 2012
-# Pavel Borecki <pavel.borecki@gmail.com>, 2012
+# Pavel Borecki <pavel.borecki@gmail.com>, 2015
 msgid ""
 msgstr ""
-"Project-Id-Version: FusionDirectory-108\n"
+"Project-Id-Version: FusionDirectory-109\n"
 "Report-Msgid-Bugs-To: documentation@lists.fusiondirectory.org\n"
-"POT-Creation-Date: 2015-03-19 21:45+0100\n"
-"PO-Revision-Date: 2015-02-25 16:12+0000\n"
-"Last-Translator: fusiondirectory <contact@fusiondirectory.org>\n"
-"Language-Team: Czech (Czech Republic) (http://www.transifex.com/projects/p/FusionDirectory-108/language/cs_CZ/)\n"
+"POT-Creation-Date: 2014-12-15 17:47+0100\n"
+"PO-Revision-Date: 2015-04-04 15:11+0000\n"
+"Last-Translator: Pavel Borecki <pavel.borecki@gmail.com>\n"
+"Language-Team: Czech (Czech Republic) (http://www.transifex.com/projects/p/FusionDirectory-109/language/cs_CZ/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -27,7 +25,7 @@ msgstr "VytoÄit spojenÃ z %s na %s?"
 
 #: addons/addressbook/class_addressbook.inc:198
 msgid "Error"
-msgstr "chyba"
+msgstr "Chyba"
 
 #: addons/addressbook/class_addressbook.inc:198
 msgid ""
@@ -37,34 +35,33 @@ msgstr "Abyste mohli vytÃ¡Äet pÅ™Ãmo odsud, je tÅ™eba mÃt zadanÃ© svÃ© vlastn
 #: addons/addressbook/class_addressbook.inc:227
 #: addons/addressbook/class_addressbook.inc:798
 msgid "LDAP error"
-msgstr "chyba LDAPu"
+msgstr "Chyba LDAP"
 
 #: addons/addressbook/class_addressbook.inc:235
 #: addons/addressbook/class_addressbook.inc:343
 msgid "Permission"
-msgstr "oprÃ¡vnÄ›nÃ"
+msgstr "OprÃ¡vnÄ›nÃ"
 
 #: addons/addressbook/class_addressbook.inc:465
 #: addons/addressbook/class_addressbook.inc:472
 #: addons/addressbook/class_addressbook.inc:476
 #: addons/addressbook/class_addressbook.inc:598
-#: addons/addressbook/dial.tpl.c:5
 msgid "Dial"
-msgstr "zavolat"
+msgstr "VytoÄit"
 
 #: addons/addressbook/class_addressbook.inc:482
 #, php-format
 msgid "Save contact for %s as vcard"
-msgstr "exportovat kontakt na %s ve formÃ¡tu vcard"
+msgstr "Exportovat kontakt na %s ve formÃ¡tu vcard"
 
 #: addons/addressbook/class_addressbook.inc:488
 #, php-format
 msgid "Send mail to %s"
-msgstr "poslat %s e-mail"
+msgstr "Poslat %s e-mail"
 
 #: addons/addressbook/class_addressbook.inc:612
 msgid "global addressbook"
-msgstr "globÃ¡lnÃ adresÃ¡Å™"
+msgstr "CelkovÃ½ adresÃ¡Å™"
 
 #: addons/addressbook/class_addressbook.inc:615
 msgid "user database"
@@ -73,7 +70,7 @@ msgstr "databÃ¡ze uÅ¾ivatelÅ¯"
 #: addons/addressbook/class_addressbook.inc:619
 #, php-format
 msgid "Contact stored in '%s'"
-msgstr "kontakt byl uloÅ¾en do '%s'"
+msgstr "Kontakt uloÅ¾en do %s"
 
 #: addons/addressbook/class_addressbook.inc:621
 msgid "Creating new entry in"
@@ -81,15 +78,14 @@ msgstr "probÃhÃ¡ vytvÃ¡Å™enÃ novÃ© poloÅ¾ky v"
 
 #: addons/addressbook/class_addressbook.inc:658
 msgid "All"
-msgstr "vÅ¡e"
+msgstr "VÅ¡e"
 
 #: addons/addressbook/class_addressbook.inc:658
 #: addons/addressbook/class_addressbook.inc:697
 #: addons/addressbook/class_addressbook.inc:707
 #: addons/addressbook/class_addressbook.inc:734
-#: addons/addressbook/address_info.tpl.c:5 addons/addressbook/contents.tpl.c:2
 msgid "Name"
-msgstr "jmÃ©no"
+msgstr "JmÃ©no"
 
 #: addons/addressbook/class_addressbook.inc:658
 #: addons/addressbook/class_addressbook.inc:701
@@ -97,61 +93,48 @@ msgstr "jmÃ©no"
 #: addons/addressbook/class_addressbook.inc:731
 #: addons/addressbook/class_addressbook.inc:859
 msgid "Given name"
-msgstr "jmÃ©no"
+msgstr "JmÃ©no"
 
 #: addons/addressbook/class_addressbook.inc:659
 msgid "Work phone"
-msgstr "telefon do prÃ¡ce"
+msgstr "Telefon do prÃ¡ce"
 
 #: addons/addressbook/class_addressbook.inc:659
 msgid "Cell phone"
-msgstr "mobilnÃ telefon"
+msgstr "MobilnÃ telefon"
 
 #: addons/addressbook/class_addressbook.inc:660
 msgid "Home phone"
-msgstr "telefon domÅ¯"
+msgstr "Telefon domÅ¯"
 
 #: addons/addressbook/class_addressbook.inc:660
 msgid "User ID"
-msgstr "ID uÅ¾ivatele"
+msgstr "IdentifikÃ¡tor uÅ¾ivatele"
 
 #: addons/addressbook/class_addressbook.inc:715
-#: addons/addressbook/address_info.tpl.c:20
-#: addons/addressbook/address_info.tpl.c:50
-#: addons/addressbook/contents.tpl.c:5
-#: addons/addressbook/address_edit.tpl.c:26
-#: addons/addressbook/address_edit.tpl.c:56
 msgid "Phone"
-msgstr "telefon"
+msgstr "Telefon"
 
 #: addons/addressbook/class_addressbook.inc:718
 msgid "Telephone number"
-msgstr "telefonnÃ ÄÃslo"
+msgstr "TelefonnÃ ÄÃslo"
 
 #: addons/addressbook/class_addressbook.inc:721
-#: addons/addressbook/contents.tpl.c:8
 msgid "Fax"
 msgstr "fax"
 
 #: addons/addressbook/class_addressbook.inc:724
-#: addons/addressbook/address_info.tpl.c:23
-#: addons/addressbook/contents.tpl.c:11
-#: addons/addressbook/address_edit.tpl.c:29
 msgid "Mobile"
-msgstr "mobilnÃ telefon"
+msgstr "MobilnÃ"
 
 #: addons/addressbook/class_addressbook.inc:727
 #: addons/addressbook/class_addressbook.inc:866
-#: addons/addressbook/address_info.tpl.c:56
-#: addons/addressbook/address_edit.tpl.c:62
 msgid "Pager"
 msgstr "pager"
 
 #: addons/addressbook/class_addressbook.inc:739
-#: addons/addressbook/address_info.tpl.c:26
-#: addons/addressbook/address_edit.tpl.c:32
 msgid "Email"
-msgstr "e-mail"
+msgstr "E-mail"
 
 #: addons/addressbook/class_addressbook.inc:747
 msgid ""
@@ -161,15 +144,15 @@ msgstr "NedaÅ™Ã se pro VÃ¡s vytvoÅ™it jedineÄnÃ© DN (rozliÅ¡enÃ© jmÃ©no). Vypl
 #: addons/addressbook/class_addressbook.inc:850
 #: addons/addressbook/class_addressbook.inc:855 addons/addressbook/main.inc:43
 msgid "Addressbook"
-msgstr "adresÃ¡Å™"
+msgstr "AdresÃ¡Å™"
 
 #: addons/addressbook/class_addressbook.inc:851
 msgid "The addressbook plugin show internal users and external ones"
-msgstr ""
+msgstr "ZÃ¡suvnÃ½ modul adresÃ¡Å™ zobrazuje vnitÅ™nÃ a vnÄ›jÅ¡Ã uÅ¾ivatele"
 
 #: addons/addressbook/class_addressbook.inc:858
 msgid "Surname"
-msgstr "pÅ™ÃjmenÃ"
+msgstr "PÅ™ÃjmenÃ"
 
 #: addons/addressbook/class_addressbook.inc:860
 msgid "Telefon number"
@@ -177,227 +160,65 @@ msgstr "telefonnÃ ÄÃslo"
 
 #: addons/addressbook/class_addressbook.inc:861
 msgid "Fax number"
-msgstr "ÄÃslo faxu"
+msgstr "FaxovÃ© ÄÃslo"
 
 #: addons/addressbook/class_addressbook.inc:862
 msgid "Mobile number"
-msgstr "ÄÃslo mobilnÃho telefonu"
+msgstr "ÄŒÃslo mobilnÃho telefonu"
 
 #: addons/addressbook/class_addressbook.inc:863
 msgid "Home phone number"
-msgstr "telefonnÃ ÄÃslo domÅ¯"
+msgstr "TelefonnÃ ÄÃslo domÅ¯"
 
 #: addons/addressbook/class_addressbook.inc:864
 msgid "User identification"
-msgstr "identifikace uÅ¾ivatele"
+msgstr "Identifikace uÅ¾ivatele"
 
 #: addons/addressbook/class_addressbook.inc:865
 msgid "Mail address"
-msgstr "e-mailovÃ¡ adresa"
+msgstr "E-mailovÃ¡ adresa"
 
 #: addons/addressbook/class_addressbook.inc:867
 msgid "Organization"
-msgstr "organizace"
+msgstr "Organizace"
 
 #: addons/addressbook/class_addressbook.inc:868
-#: addons/addressbook/address_info.tpl.c:35
-#: addons/addressbook/address_edit.tpl.c:41
 msgid "Department"
-msgstr "oddÄ›lenÃ"
+msgstr "OddÄ›lenÃ"
 
 #: addons/addressbook/class_addressbook.inc:869
 msgid "Location"
-msgstr "umÃstÄ›nÃ"
+msgstr "UmÃstÄ›nÃ"
 
 #: addons/addressbook/class_addressbook.inc:870
 #: addons/addressbook/class_addressbook.inc:871
 msgid "Postal address"
-msgstr "poÅ¡tovnÃ adresa"
+msgstr "PoÅ¡tovnÃ adresa"
 
 #: addons/addressbook/class_addressbook.inc:872
 msgid "State"
-msgstr "stÃ¡t"
+msgstr "StÃ¡t"
 
 #: addons/addressbook/class_addressbook.inc:873
-#: addons/addressbook/address_info.tpl.c:8
-#: addons/addressbook/address_edit.tpl.c:14
 msgid "Initials"
-msgstr "iniciÃ¡ly"
+msgstr "IniciÃ¡ly"
 
 #: addons/addressbook/class_addressbook.inc:874
 msgid "Title"
-msgstr "titul"
+msgstr "Titul"
 
 #: addons/addressbook/class_addressbook.inc:875
 msgid "Home postal address"
-msgstr "soukromÃ¡ poÅ¡tovnÃ adresa"
+msgstr "PoÅ¡tovnÃ adresa domÅ¯"
 
 #: addons/addressbook/class_addressbook.inc:876
 msgid "Common name"
-msgstr "bÄ›Å¾nÃ© jmÃ©no (Common Name)"
+msgstr "bÄ›Å¾nÃ© jmÃ©no (CN)"
 
 #: html/getvcard.php:39
 msgid "Internal error"
-msgstr "vnitÅ™nÃ chyba"
+msgstr "VnitÅ™nÃ chyba"
 
 #: html/getvcard.php:39
 msgid "Missing parameters!"
 msgstr "ChybÄ›jÃcÃ parametry!"
-
-#: addons/addressbook/address_info.tpl.c:2
-#: addons/addressbook/address_edit.tpl.c:5
-msgid "Personal"
-msgstr "osobnÃ"
-
-#: addons/addressbook/address_info.tpl.c:11
-#: addons/addressbook/address_edit.tpl.c:17
-msgid "Personal title"
-msgstr "oslovenÃ"
-
-#: addons/addressbook/address_info.tpl.c:14
-#: addons/addressbook/contents.tpl.c:14
-#: addons/addressbook/address_edit.tpl.c:20
-msgid "Private"
-msgstr "soukromÃ©"
-
-#: addons/addressbook/address_info.tpl.c:17
-#: addons/addressbook/address_info.tpl.c:47
-#: addons/addressbook/address_edit.tpl.c:23
-#: addons/addressbook/address_edit.tpl.c:53
-msgid "Address"
-msgstr "adresa"
-
-#: addons/addressbook/address_info.tpl.c:29
-#: addons/addressbook/address_edit.tpl.c:35
-msgid "Organizational"
-msgstr "organizaÄnÃ"
-
-#: addons/addressbook/address_info.tpl.c:32
-#: addons/addressbook/address_edit.tpl.c:38
-msgid "Company"
-msgstr "spoleÄnost"
-
-#: addons/addressbook/address_info.tpl.c:38
-#: addons/addressbook/address_edit.tpl.c:44
-msgid "City"
-msgstr "mÄ›sto"
-
-#: addons/addressbook/address_info.tpl.c:41
-#: addons/addressbook/address_edit.tpl.c:47
-msgid "Postal code"
-msgstr "poÅ¡tovnÃ smÄ›rovacÃ ÄÃslo (PSÄŒ)"
-
-#: addons/addressbook/address_info.tpl.c:44
-#: addons/addressbook/address_edit.tpl.c:50
-msgid "Country"
-msgstr "zemÄ›"
-
-#: addons/addressbook/address_info.tpl.c:53
-#: addons/addressbook/address_edit.tpl.c:59
-msgid "FAX"
-msgstr "fax"
-
-#: addons/addressbook/dial.tpl.c:2
-msgid "Dial connection..."
-msgstr "probÃhÃ¡ spojenÃâ€¦"
-
-#: addons/addressbook/contents.tpl.c:17
-msgid "Contact"
-msgstr "kontakt"
-
-#: addons/addressbook/contents.tpl.c:20
-msgid "Information"
-msgstr "informace"
-
-#: addons/addressbook/contents.tpl.c:23
-msgid ""
-"The telephone list plugin provides list and search facilities for the people in your site. You may want to specify the asterisk [*] like in\n"
-"'Fu*ry' to find 'FusionDirectory'. Use the filters below to narrow down your search."
-msgstr ""
-
-#: addons/addressbook/contents.tpl.c:26
-msgid "Actions"
-msgstr "akce"
-
-#: addons/addressbook/contents.tpl.c:29
-msgid "Add entry"
-msgstr "pÅ™idat poloÅ¾ku"
-
-#: addons/addressbook/contents.tpl.c:32
-msgid "Edit entry"
-msgstr "upravit poloÅ¾ku"
-
-#: addons/addressbook/contents.tpl.c:35
-msgid "Remove entry"
-msgstr "odebrat poloÅ¾ku"
-
-#: addons/addressbook/contents.tpl.c:38
-msgid "Filters"
-msgstr "filtry"
-
-#: addons/addressbook/contents.tpl.c:41
-msgid "Select to see regular users"
-msgstr "vyberte pro zobrazenÃ bÄ›Å¾nÃ½ch uÅ¾ivatelÅ¯"
-
-#: addons/addressbook/contents.tpl.c:44
-msgid "Show organizational entries"
-msgstr "zobrazovat organizaÄnÃ poloÅ¾ky"
-
-#: addons/addressbook/contents.tpl.c:47
-msgid "Select to see users in addressbook"
-msgstr "vyberte pro zobrazenÃ uÅ¾ivatelÅ¯ v adresÃ¡Å™i"
-
-#: addons/addressbook/contents.tpl.c:50
-msgid "Show addressbook entries"
-msgstr "zobrazovat poloÅ¾ky adresÃ¡Å™e"
-
-#: addons/addressbook/contents.tpl.c:53
-msgid "Display results for department"
-msgstr "zobrazit vÃ½sledky pro oddÄ›lenÃ"
-
-#: addons/addressbook/contents.tpl.c:56
-msgid "Choose the department the search will be based on"
-msgstr "vyberte oddÄ›lenÃ ve kterÃ©m se bude hledat"
-
-#: addons/addressbook/contents.tpl.c:59
-msgid "Match object"
-msgstr "jakÃ½ Ãºdaj"
-
-#: addons/addressbook/contents.tpl.c:62
-msgid "Choose the object that will be searched in"
-msgstr "zvolte objekt ve kterÃ©m chcete vyhledÃ¡vat"
-
-#: addons/addressbook/contents.tpl.c:65
-msgid "Search for"
-msgstr "hledat"
-
-#: addons/addressbook/contents.tpl.c:68
-msgid "Search string"
-msgstr "hledanÃ½ Å™etÄ›zec znakÅ¯"
-
-#: addons/addressbook/remove.tpl.c:2
-msgid "Warning"
-msgstr "varovÃ¡nÃ"
-
-#: addons/addressbook/remove.tpl.c:5
-msgid ""
-"This includes all addressbook data in this entry. 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 veÅ¡kerÃ½ch informacÃ o tÃ©to poloÅ¾ce v adresÃ¡Å™i. ProsÃm velmi dobÅ™e si rozmyslete, zda to opravdu chcete udÄ›lat, protoÅ¾e provedenÃ© zmÄ›ny uÅ¾ ve FusionDirectory nepÅ¯jde vzÃt nijak jednoduÅ¡e zpÄ›t (nanejvÃ½Å¡ sloÅ¾itÄ› ze zÃ¡loh, pokud existujÃ a obsahujÃ potÅ™ebnÃ¡ data)!"
-
-#: addons/addressbook/remove.tpl.c:8
-msgid "So - if you're sure - press 'Delete' to continue or 'Cancel' to abort."
-msgstr "Tedy â€“ pokud jste si jist(a), stisknÄ›te 'smazat'. V opaÄnÃ©m pÅ™ÃpadÄ› operaci zruÅ¡te pomocÃ 'zruÅ¡it'."
-
-#: addons/addressbook/address_edit.tpl.c:2
-msgid "Choose the department to store entry in"
-msgstr "zvolte oddÄ›lenÃ ve kterÃ©m bude poloÅ¾ka umÃstÄ›na"
-
-#: addons/addressbook/address_edit.tpl.c:8
-msgid "Last name"
-msgstr "pÅ™ÃjmenÃ"
-
-#: addons/addressbook/address_edit.tpl.c:11
-msgid "First name"
-msgstr "jmÃ©no"
diff --git a/addressbook/locale/de/fusiondirectory.po b/addressbook/locale/de/fusiondirectory.po
index 0f00390d0f936494c9905ad52b16fc22a4ec8e95..27b762fab9b8e1599e92aca88a3e66ea60f3a460 100644
--- a/addressbook/locale/de/fusiondirectory.po
+++ b/addressbook/locale/de/fusiondirectory.po
@@ -4,15 +4,14 @@
 # 
 # Translators:
 # Maik Wagner <maikwagner@yahoo.com>, 2013
-#  Stefan Koehler <stefan.koehler@GONICUS.de>, 2005
 msgid ""
 msgstr ""
-"Project-Id-Version: FusionDirectory-108\n"
+"Project-Id-Version: FusionDirectory-109\n"
 "Report-Msgid-Bugs-To: documentation@lists.fusiondirectory.org\n"
-"POT-Creation-Date: 2015-03-19 21:45+0100\n"
-"PO-Revision-Date: 2015-02-25 16:12+0000\n"
+"POT-Creation-Date: 2014-12-15 17:47+0100\n"
+"PO-Revision-Date: 2015-02-25 16:04+0000\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>\n"
-"Language-Team: German (http://www.transifex.com/projects/p/FusionDirectory-108/language/de/)\n"
+"Language-Team: German (http://www.transifex.com/projects/p/FusionDirectory-109/language/de/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -47,7 +46,6 @@ msgstr "Berechtigung"
 #: addons/addressbook/class_addressbook.inc:472
 #: addons/addressbook/class_addressbook.inc:476
 #: addons/addressbook/class_addressbook.inc:598
-#: addons/addressbook/dial.tpl.c:5
 msgid "Dial"
 msgstr "WÃ¤hlen"
 
@@ -86,7 +84,6 @@ msgstr "Alle"
 #: addons/addressbook/class_addressbook.inc:697
 #: addons/addressbook/class_addressbook.inc:707
 #: addons/addressbook/class_addressbook.inc:734
-#: addons/addressbook/address_info.tpl.c:5 addons/addressbook/contents.tpl.c:2
 msgid "Name"
 msgstr "Name"
 
@@ -108,18 +105,13 @@ msgstr "Mobiltelefon"
 
 #: addons/addressbook/class_addressbook.inc:660
 msgid "Home phone"
-msgstr "Telefon (zu Hause)"
+msgstr "Telefonnummer (privat)"
 
 #: addons/addressbook/class_addressbook.inc:660
 msgid "User ID"
 msgstr "Benutzer-ID"
 
 #: addons/addressbook/class_addressbook.inc:715
-#: addons/addressbook/address_info.tpl.c:20
-#: addons/addressbook/address_info.tpl.c:50
-#: addons/addressbook/contents.tpl.c:5
-#: addons/addressbook/address_edit.tpl.c:26
-#: addons/addressbook/address_edit.tpl.c:56
 msgid "Phone"
 msgstr "Telefon"
 
@@ -128,27 +120,19 @@ msgid "Telephone number"
 msgstr "Telefonnummer"
 
 #: addons/addressbook/class_addressbook.inc:721
-#: addons/addressbook/contents.tpl.c:8
 msgid "Fax"
 msgstr "Fax"
 
 #: addons/addressbook/class_addressbook.inc:724
-#: addons/addressbook/address_info.tpl.c:23
-#: addons/addressbook/contents.tpl.c:11
-#: addons/addressbook/address_edit.tpl.c:29
 msgid "Mobile"
 msgstr "Mobiltelefon"
 
 #: addons/addressbook/class_addressbook.inc:727
 #: addons/addressbook/class_addressbook.inc:866
-#: addons/addressbook/address_info.tpl.c:56
-#: addons/addressbook/address_edit.tpl.c:62
 msgid "Pager"
 msgstr "Pager"
 
 #: addons/addressbook/class_addressbook.inc:739
-#: addons/addressbook/address_info.tpl.c:26
-#: addons/addressbook/address_edit.tpl.c:32
 msgid "Email"
 msgstr "Email"
 
@@ -199,8 +183,6 @@ msgid "Organization"
 msgstr "Organisation"
 
 #: addons/addressbook/class_addressbook.inc:868
-#: addons/addressbook/address_info.tpl.c:35
-#: addons/addressbook/address_edit.tpl.c:41
 msgid "Department"
 msgstr "Abteilung"
 
@@ -218,10 +200,8 @@ msgid "State"
 msgstr "Land"
 
 #: addons/addressbook/class_addressbook.inc:873
-#: addons/addressbook/address_info.tpl.c:8
-#: addons/addressbook/address_edit.tpl.c:14
 msgid "Initials"
-msgstr "Initialien"
+msgstr "Initialen"
 
 #: addons/addressbook/class_addressbook.inc:874
 msgid "Title"
@@ -233,7 +213,7 @@ msgstr "Private Adresse"
 
 #: addons/addressbook/class_addressbook.inc:876
 msgid "Common name"
-msgstr "Name"
+msgstr "GewÃ¶hnlicher Name"
 
 #: html/getvcard.php:39
 msgid "Internal error"
@@ -242,161 +222,3 @@ msgstr "Interner Fehler"
 #: html/getvcard.php:39
 msgid "Missing parameters!"
 msgstr "Fehlende Parameter!"
-
-#: addons/addressbook/address_info.tpl.c:2
-#: addons/addressbook/address_edit.tpl.c:5
-msgid "Personal"
-msgstr "PersÃ¶nlich"
-
-#: addons/addressbook/address_info.tpl.c:11
-#: addons/addressbook/address_edit.tpl.c:17
-msgid "Personal title"
-msgstr "Titel"
-
-#: addons/addressbook/address_info.tpl.c:14
-#: addons/addressbook/contents.tpl.c:14
-#: addons/addressbook/address_edit.tpl.c:20
-msgid "Private"
-msgstr "Privat"
-
-#: addons/addressbook/address_info.tpl.c:17
-#: addons/addressbook/address_info.tpl.c:47
-#: addons/addressbook/address_edit.tpl.c:23
-#: addons/addressbook/address_edit.tpl.c:53
-msgid "Address"
-msgstr "Adresse"
-
-#: addons/addressbook/address_info.tpl.c:29
-#: addons/addressbook/address_edit.tpl.c:35
-msgid "Organizational"
-msgstr "Organisationsbezogen"
-
-#: addons/addressbook/address_info.tpl.c:32
-#: addons/addressbook/address_edit.tpl.c:38
-msgid "Company"
-msgstr "Firma"
-
-#: addons/addressbook/address_info.tpl.c:38
-#: addons/addressbook/address_edit.tpl.c:44
-msgid "City"
-msgstr "Stadt"
-
-#: addons/addressbook/address_info.tpl.c:41
-#: addons/addressbook/address_edit.tpl.c:47
-msgid "Postal code"
-msgstr "Postleitzahl"
-
-#: addons/addressbook/address_info.tpl.c:44
-#: addons/addressbook/address_edit.tpl.c:50
-msgid "Country"
-msgstr "Land"
-
-#: addons/addressbook/address_info.tpl.c:53
-#: addons/addressbook/address_edit.tpl.c:59
-msgid "FAX"
-msgstr "Fax"
-
-#: addons/addressbook/dial.tpl.c:2
-msgid "Dial connection..."
-msgstr "WÃ¤hle Verbindung..."
-
-#: addons/addressbook/contents.tpl.c:17
-msgid "Contact"
-msgstr "Kontakt"
-
-#: addons/addressbook/contents.tpl.c:20
-msgid "Information"
-msgstr "Information"
-
-#: addons/addressbook/contents.tpl.c:23
-msgid ""
-"The telephone list plugin provides list and search facilities for the people in your site. You may want to specify the asterisk [*] like in\n"
-"'Fu*ry' to find 'FusionDirectory'. Use the filters below to narrow down your search."
-msgstr ""
-
-#: addons/addressbook/contents.tpl.c:26
-msgid "Actions"
-msgstr "Aktionen"
-
-#: addons/addressbook/contents.tpl.c:29
-msgid "Add entry"
-msgstr "Eintrag hinzufÃ¼gen"
-
-#: addons/addressbook/contents.tpl.c:32
-msgid "Edit entry"
-msgstr "Eintrag bearbeiten"
-
-#: addons/addressbook/contents.tpl.c:35
-msgid "Remove entry"
-msgstr "Eintrag entfernen"
-
-#: addons/addressbook/contents.tpl.c:38
-msgid "Filters"
-msgstr "Filter"
-
-#: addons/addressbook/contents.tpl.c:41
-msgid "Select to see regular users"
-msgstr "WÃ¤hlen Sie dies, um gewÃ¶hnliche Benutzer anzuzeigen"
-
-#: addons/addressbook/contents.tpl.c:44
-msgid "Show organizational entries"
-msgstr "Zeige Benutzer der Organisation"
-
-#: addons/addressbook/contents.tpl.c:47
-msgid "Select to see users in addressbook"
-msgstr "WÃ¤hlen, um AdressbucheintrÃ¤ge zu sehen"
-
-#: addons/addressbook/contents.tpl.c:50
-msgid "Show addressbook entries"
-msgstr "Zeige Adressbuch-EintrÃ¤ge"
-
-#: addons/addressbook/contents.tpl.c:53
-msgid "Display results for department"
-msgstr "Zeige Ergebnisse der Abteilung"
-
-#: addons/addressbook/contents.tpl.c:56
-msgid "Choose the department the search will be based on"
-msgstr "WÃ¤hlen Sie die Abteilung, auf die die Suchfunktion angewandt wird"
-
-#: addons/addressbook/contents.tpl.c:59
-msgid "Match object"
-msgstr "Untersuchtes Objekt"
-
-#: addons/addressbook/contents.tpl.c:62
-msgid "Choose the object that will be searched in"
-msgstr "WÃ¤hlen Sie das Objekt, auf das die Suchfunktion angewandt wird"
-
-#: addons/addressbook/contents.tpl.c:65
-msgid "Search for"
-msgstr "Suche nach"
-
-#: addons/addressbook/contents.tpl.c:68
-msgid "Search string"
-msgstr "Suchtext"
-
-#: addons/addressbook/remove.tpl.c:2
-msgid "Warning"
-msgstr "Warnung"
-
-#: addons/addressbook/remove.tpl.c:5
-msgid ""
-"This includes all addressbook data in this entry. Please double check if "
-"your really want to do this since there is no way for FusionDirectory to get"
-" your data back."
-msgstr "Dies beinhaltet alle Adressbuchdaten in diesem Eintrag. Bitte Ã¼berprÃ¼fen Sie, ob Sie dies wirklich durchfÃ¼hren mÃ¶chten, da es keine MÃ¶glichkeit fÃ¼r FusionDirectory gibt, Ihre Daten wieder zu holen."
-
-#: addons/addressbook/remove.tpl.c:8
-msgid "So - if you're sure - press 'Delete' to continue or 'Cancel' to abort."
-msgstr "Wenn Sie sicher sind, drÃ¼cken Sie 'Entfernen' um fortzufahren oder 'Abbrechen' zum Abbruch."
-
-#: addons/addressbook/address_edit.tpl.c:2
-msgid "Choose the department to store entry in"
-msgstr "WÃ¤hlen Sie die Abteilung, in der der Eintrag abgelegt werden soll"
-
-#: addons/addressbook/address_edit.tpl.c:8
-msgid "Last name"
-msgstr "Nachname"
-
-#: addons/addressbook/address_edit.tpl.c:11
-msgid "First name"
-msgstr "Vorname"
diff --git a/addressbook/locale/el_GR/fusiondirectory.po b/addressbook/locale/el_GR/fusiondirectory.po
new file mode 100644
index 0000000000000000000000000000000000000000..c48c6d607ed3d6f40c76e5ce30d5ae80c26b1606
--- /dev/null
+++ b/addressbook/locale/el_GR/fusiondirectory.po
@@ -0,0 +1,223 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR FusionDirectory Project
+# This file is distributed under the same license as the PACKAGE package.
+# 
+# Translators:
+msgid ""
+msgstr ""
+"Project-Id-Version: FusionDirectory-109\n"
+"Report-Msgid-Bugs-To: documentation@lists.fusiondirectory.org\n"
+"POT-Creation-Date: 2014-12-15 17:47+0100\n"
+"PO-Revision-Date: 2015-05-30 11:45+0000\n"
+"Last-Translator: Benoit Mortier <benoit.mortier@opensides.be>\n"
+"Language-Team: Greek (Greece) (http://www.transifex.com/projects/p/FusionDirectory-109/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"
+
+#: addons/addressbook/class_addressbook.inc:195
+#, php-format
+msgid "Dial from %s to %s now?"
+msgstr ""
+
+#: addons/addressbook/class_addressbook.inc:198
+msgid "Error"
+msgstr ""
+
+#: addons/addressbook/class_addressbook.inc:198
+msgid ""
+"You need to set your personal phone number in order to perform direct dials."
+msgstr ""
+
+#: addons/addressbook/class_addressbook.inc:227
+#: addons/addressbook/class_addressbook.inc:798
+msgid "LDAP error"
+msgstr ""
+
+#: addons/addressbook/class_addressbook.inc:235
+#: addons/addressbook/class_addressbook.inc:343
+msgid "Permission"
+msgstr ""
+
+#: addons/addressbook/class_addressbook.inc:465
+#: addons/addressbook/class_addressbook.inc:472
+#: addons/addressbook/class_addressbook.inc:476
+#: addons/addressbook/class_addressbook.inc:598
+msgid "Dial"
+msgstr ""
+
+#: addons/addressbook/class_addressbook.inc:482
+#, php-format
+msgid "Save contact for %s as vcard"
+msgstr ""
+
+#: addons/addressbook/class_addressbook.inc:488
+#, php-format
+msgid "Send mail to %s"
+msgstr ""
+
+#: addons/addressbook/class_addressbook.inc:612
+msgid "global addressbook"
+msgstr ""
+
+#: addons/addressbook/class_addressbook.inc:615
+msgid "user database"
+msgstr ""
+
+#: addons/addressbook/class_addressbook.inc:619
+#, php-format
+msgid "Contact stored in '%s'"
+msgstr ""
+
+#: addons/addressbook/class_addressbook.inc:621
+msgid "Creating new entry in"
+msgstr ""
+
+#: addons/addressbook/class_addressbook.inc:658
+msgid "All"
+msgstr ""
+
+#: addons/addressbook/class_addressbook.inc:658
+#: addons/addressbook/class_addressbook.inc:697
+#: addons/addressbook/class_addressbook.inc:707
+#: addons/addressbook/class_addressbook.inc:734
+msgid "Name"
+msgstr ""
+
+#: addons/addressbook/class_addressbook.inc:658
+#: addons/addressbook/class_addressbook.inc:701
+#: addons/addressbook/class_addressbook.inc:710
+#: addons/addressbook/class_addressbook.inc:731
+#: addons/addressbook/class_addressbook.inc:859
+msgid "Given name"
+msgstr ""
+
+#: addons/addressbook/class_addressbook.inc:659
+msgid "Work phone"
+msgstr ""
+
+#: addons/addressbook/class_addressbook.inc:659
+msgid "Cell phone"
+msgstr ""
+
+#: addons/addressbook/class_addressbook.inc:660
+msgid "Home phone"
+msgstr ""
+
+#: addons/addressbook/class_addressbook.inc:660
+msgid "User ID"
+msgstr ""
+
+#: addons/addressbook/class_addressbook.inc:715
+msgid "Phone"
+msgstr ""
+
+#: addons/addressbook/class_addressbook.inc:718
+msgid "Telephone number"
+msgstr ""
+
+#: addons/addressbook/class_addressbook.inc:721
+msgid "Fax"
+msgstr ""
+
+#: addons/addressbook/class_addressbook.inc:724
+msgid "Mobile"
+msgstr ""
+
+#: addons/addressbook/class_addressbook.inc:727
+#: addons/addressbook/class_addressbook.inc:866
+msgid "Pager"
+msgstr ""
+
+#: addons/addressbook/class_addressbook.inc:739
+msgid "Email"
+msgstr ""
+
+#: addons/addressbook/class_addressbook.inc:747
+msgid ""
+"Cannot create a unique DN for your entry. Please fill more formular fields."
+msgstr ""
+
+#: addons/addressbook/class_addressbook.inc:850
+#: addons/addressbook/class_addressbook.inc:855 addons/addressbook/main.inc:43
+msgid "Addressbook"
+msgstr ""
+
+#: addons/addressbook/class_addressbook.inc:851
+msgid "The addressbook plugin show internal users and external ones"
+msgstr ""
+
+#: addons/addressbook/class_addressbook.inc:858
+msgid "Surname"
+msgstr ""
+
+#: addons/addressbook/class_addressbook.inc:860
+msgid "Telefon number"
+msgstr ""
+
+#: addons/addressbook/class_addressbook.inc:861
+msgid "Fax number"
+msgstr ""
+
+#: addons/addressbook/class_addressbook.inc:862
+msgid "Mobile number"
+msgstr ""
+
+#: addons/addressbook/class_addressbook.inc:863
+msgid "Home phone number"
+msgstr ""
+
+#: addons/addressbook/class_addressbook.inc:864
+msgid "User identification"
+msgstr ""
+
+#: addons/addressbook/class_addressbook.inc:865
+msgid "Mail address"
+msgstr ""
+
+#: addons/addressbook/class_addressbook.inc:867
+msgid "Organization"
+msgstr ""
+
+#: addons/addressbook/class_addressbook.inc:868
+msgid "Department"
+msgstr ""
+
+#: addons/addressbook/class_addressbook.inc:869
+msgid "Location"
+msgstr ""
+
+#: addons/addressbook/class_addressbook.inc:870
+#: addons/addressbook/class_addressbook.inc:871
+msgid "Postal address"
+msgstr ""
+
+#: addons/addressbook/class_addressbook.inc:872
+msgid "State"
+msgstr ""
+
+#: addons/addressbook/class_addressbook.inc:873
+msgid "Initials"
+msgstr ""
+
+#: addons/addressbook/class_addressbook.inc:874
+msgid "Title"
+msgstr ""
+
+#: addons/addressbook/class_addressbook.inc:875
+msgid "Home postal address"
+msgstr ""
+
+#: addons/addressbook/class_addressbook.inc:876
+msgid "Common name"
+msgstr ""
+
+#: html/getvcard.php:39
+msgid "Internal error"
+msgstr ""
+
+#: html/getvcard.php:39
+msgid "Missing parameters!"
+msgstr ""
diff --git a/addressbook/locale/en/fusiondirectory.po b/addressbook/locale/en/fusiondirectory.po
index 8aa7306f41d4264566a5766b0ac59c72301c06b0..cfe14958f46474a9beee82b3f29c3cb79560a5d4 100644
--- a/addressbook/locale/en/fusiondirectory.po
+++ b/addressbook/locale/en/fusiondirectory.po
@@ -6,13 +6,13 @@
 #, fuzzy
 msgid ""
 msgstr ""
-"Project-Id-Version: PACKAGE VERSION\n"
-"Report-Msgid-Bugs-To: documentation@lists.fusiondirectory.org\n"
-"POT-Creation-Date: 2015-03-31 11:49+0200\n"
+"Project-Id-Version: FusionDirectory VERSION\n"
+"Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
+"POT-Creation-Date: 2015-05-30 15:30+0200\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
-"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
-"Language-Team: LANGUAGE <LL@li.org>\n"
-"Language: \n"
+"Last-Translator: FusionDirectory project <contact@fusiondirectory.org>\n"
+"Language-Team: English\n"
+"Language: en\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
diff --git a/addressbook/locale/es/fusiondirectory.po b/addressbook/locale/es/fusiondirectory.po
index dd5bd80d1bf7d5ce49cdb697980fe1fed6320ece..49decd28eb4d731a41eba4b9c5d2d6bfb5d85164 100644
--- a/addressbook/locale/es/fusiondirectory.po
+++ b/addressbook/locale/es/fusiondirectory.po
@@ -5,12 +5,12 @@
 # Translators:
 msgid ""
 msgstr ""
-"Project-Id-Version: FusionDirectory-108\n"
+"Project-Id-Version: FusionDirectory-109\n"
 "Report-Msgid-Bugs-To: documentation@lists.fusiondirectory.org\n"
-"POT-Creation-Date: 2015-03-19 21:45+0100\n"
-"PO-Revision-Date: 2015-02-25 16:12+0000\n"
+"POT-Creation-Date: 2014-12-15 17:47+0100\n"
+"PO-Revision-Date: 2015-02-25 16:04+0000\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>\n"
-"Language-Team: Spanish (http://www.transifex.com/projects/p/FusionDirectory-108/language/es/)\n"
+"Language-Team: Spanish (http://www.transifex.com/projects/p/FusionDirectory-109/language/es/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -45,7 +45,6 @@ msgstr "Permisos"
 #: addons/addressbook/class_addressbook.inc:472
 #: addons/addressbook/class_addressbook.inc:476
 #: addons/addressbook/class_addressbook.inc:598
-#: addons/addressbook/dial.tpl.c:5
 msgid "Dial"
 msgstr "Marcar"
 
@@ -84,7 +83,6 @@ msgstr "Todo"
 #: addons/addressbook/class_addressbook.inc:697
 #: addons/addressbook/class_addressbook.inc:707
 #: addons/addressbook/class_addressbook.inc:734
-#: addons/addressbook/address_info.tpl.c:5 addons/addressbook/contents.tpl.c:2
 msgid "Name"
 msgstr "Nombre"
 
@@ -113,11 +111,6 @@ msgid "User ID"
 msgstr "Identificador (ID) de usuario"
 
 #: addons/addressbook/class_addressbook.inc:715
-#: addons/addressbook/address_info.tpl.c:20
-#: addons/addressbook/address_info.tpl.c:50
-#: addons/addressbook/contents.tpl.c:5
-#: addons/addressbook/address_edit.tpl.c:26
-#: addons/addressbook/address_edit.tpl.c:56
 msgid "Phone"
 msgstr "TelÃ©fono"
 
@@ -126,27 +119,19 @@ msgid "Telephone number"
 msgstr "NÃºmero de telÃ©fono"
 
 #: addons/addressbook/class_addressbook.inc:721
-#: addons/addressbook/contents.tpl.c:8
 msgid "Fax"
 msgstr "Fax"
 
 #: addons/addressbook/class_addressbook.inc:724
-#: addons/addressbook/address_info.tpl.c:23
-#: addons/addressbook/contents.tpl.c:11
-#: addons/addressbook/address_edit.tpl.c:29
 msgid "Mobile"
 msgstr "MÃ³vil"
 
 #: addons/addressbook/class_addressbook.inc:727
 #: addons/addressbook/class_addressbook.inc:866
-#: addons/addressbook/address_info.tpl.c:56
-#: addons/addressbook/address_edit.tpl.c:62
 msgid "Pager"
 msgstr "Buscapersonas"
 
 #: addons/addressbook/class_addressbook.inc:739
-#: addons/addressbook/address_info.tpl.c:26
-#: addons/addressbook/address_edit.tpl.c:32
 msgid "Email"
 msgstr "Correo ElectrÃ³nico"
 
@@ -197,8 +182,6 @@ msgid "Organization"
 msgstr "OrganizaciÃ³n"
 
 #: addons/addressbook/class_addressbook.inc:868
-#: addons/addressbook/address_info.tpl.c:35
-#: addons/addressbook/address_edit.tpl.c:41
 msgid "Department"
 msgstr "Departamento"
 
@@ -216,8 +199,6 @@ msgid "State"
 msgstr "Provincia"
 
 #: addons/addressbook/class_addressbook.inc:873
-#: addons/addressbook/address_info.tpl.c:8
-#: addons/addressbook/address_edit.tpl.c:14
 msgid "Initials"
 msgstr "Iniciales"
 
@@ -235,166 +216,8 @@ msgstr "Nombre comÃºn"
 
 #: html/getvcard.php:39
 msgid "Internal error"
-msgstr "Error interno"
+msgstr "error interno"
 
 #: html/getvcard.php:39
 msgid "Missing parameters!"
 msgstr "Â¡Faltan parÃ¡metros!"
-
-#: addons/addressbook/address_info.tpl.c:2
-#: addons/addressbook/address_edit.tpl.c:5
-msgid "Personal"
-msgstr "Personal"
-
-#: addons/addressbook/address_info.tpl.c:11
-#: addons/addressbook/address_edit.tpl.c:17
-msgid "Personal title"
-msgstr "TÃtulo Personal"
-
-#: addons/addressbook/address_info.tpl.c:14
-#: addons/addressbook/contents.tpl.c:14
-#: addons/addressbook/address_edit.tpl.c:20
-msgid "Private"
-msgstr "Privado"
-
-#: addons/addressbook/address_info.tpl.c:17
-#: addons/addressbook/address_info.tpl.c:47
-#: addons/addressbook/address_edit.tpl.c:23
-#: addons/addressbook/address_edit.tpl.c:53
-msgid "Address"
-msgstr "DirecciÃ³n"
-
-#: addons/addressbook/address_info.tpl.c:29
-#: addons/addressbook/address_edit.tpl.c:35
-msgid "Organizational"
-msgstr "OrganizaciÃ³n"
-
-#: addons/addressbook/address_info.tpl.c:32
-#: addons/addressbook/address_edit.tpl.c:38
-msgid "Company"
-msgstr "CompaÃ±Ãa"
-
-#: addons/addressbook/address_info.tpl.c:38
-#: addons/addressbook/address_edit.tpl.c:44
-msgid "City"
-msgstr "Ciudad"
-
-#: addons/addressbook/address_info.tpl.c:41
-#: addons/addressbook/address_edit.tpl.c:47
-msgid "Postal code"
-msgstr "CÃ³digo Postal"
-
-#: addons/addressbook/address_info.tpl.c:44
-#: addons/addressbook/address_edit.tpl.c:50
-msgid "Country"
-msgstr "PaÃs"
-
-#: addons/addressbook/address_info.tpl.c:53
-#: addons/addressbook/address_edit.tpl.c:59
-msgid "FAX"
-msgstr "FAX"
-
-#: addons/addressbook/dial.tpl.c:2
-msgid "Dial connection..."
-msgstr "Marcando conexiÃ³n..."
-
-#: addons/addressbook/contents.tpl.c:17
-msgid "Contact"
-msgstr "Contacto"
-
-#: addons/addressbook/contents.tpl.c:20
-msgid "Information"
-msgstr "InformaciÃ³n"
-
-#: addons/addressbook/contents.tpl.c:23
-msgid ""
-"The telephone list plugin provides list and search facilities for the people in your site. You may want to specify the asterisk [*] like in\n"
-"'Fu*ry' to find 'FusionDirectory'. Use the filters below to narrow down your search."
-msgstr ""
-
-#: addons/addressbook/contents.tpl.c:26
-msgid "Actions"
-msgstr "Acciones"
-
-#: addons/addressbook/contents.tpl.c:29
-msgid "Add entry"
-msgstr "AÃ±adir entrada"
-
-#: addons/addressbook/contents.tpl.c:32
-msgid "Edit entry"
-msgstr "Editar entrada"
-
-#: addons/addressbook/contents.tpl.c:35
-msgid "Remove entry"
-msgstr "Eliminar entrada"
-
-#: addons/addressbook/contents.tpl.c:38
-msgid "Filters"
-msgstr "Filtros"
-
-#: addons/addressbook/contents.tpl.c:41
-msgid "Select to see regular users"
-msgstr "Seleccione para ver usuarios genÃ©ricos"
-
-#: addons/addressbook/contents.tpl.c:44
-msgid "Show organizational entries"
-msgstr "Mostrar entradas organizativas"
-
-#: addons/addressbook/contents.tpl.c:47
-msgid "Select to see users in addressbook"
-msgstr "Seleccione para ver los usuarios en la libreta de direcciones"
-
-#: addons/addressbook/contents.tpl.c:50
-msgid "Show addressbook entries"
-msgstr "EnseÃ±ar las entradas de la libreta de direcciones"
-
-#: addons/addressbook/contents.tpl.c:53
-msgid "Display results for department"
-msgstr "Mostrar resultados para el departamento"
-
-#: addons/addressbook/contents.tpl.c:56
-msgid "Choose the department the search will be based on"
-msgstr "Escoja el departamento base de la bÃºsqueda"
-
-#: addons/addressbook/contents.tpl.c:59
-msgid "Match object"
-msgstr "Encontrar objeto"
-
-#: addons/addressbook/contents.tpl.c:62
-msgid "Choose the object that will be searched in"
-msgstr "Elegir el objeto que sera buscado"
-
-#: addons/addressbook/contents.tpl.c:65
-msgid "Search for"
-msgstr "Buscar por"
-
-#: addons/addressbook/contents.tpl.c:68
-msgid "Search string"
-msgstr "Cadena de bÃºsqueda"
-
-#: addons/addressbook/remove.tpl.c:2
-msgid "Warning"
-msgstr "Aviso"
-
-#: addons/addressbook/remove.tpl.c:5
-msgid ""
-"This includes all addressbook data in this entry. Please double check if "
-"your really want to do this since there is no way for FusionDirectory to get"
-" your data back."
-msgstr ""
-
-#: addons/addressbook/remove.tpl.c:8
-msgid "So - if you're sure - press 'Delete' to continue or 'Cancel' to abort."
-msgstr "Entonces, si esta seguro, presione <i>Eliminar</i> para continuar o <i>Cancelar</i> para Abortar."
-
-#: addons/addressbook/address_edit.tpl.c:2
-msgid "Choose the department to store entry in"
-msgstr "Elija un departamento para guardar la entrada"
-
-#: addons/addressbook/address_edit.tpl.c:8
-msgid "Last name"
-msgstr "Apellido"
-
-#: addons/addressbook/address_edit.tpl.c:11
-msgid "First name"
-msgstr "Nombre"
diff --git a/addressbook/locale/es_VE/fusiondirectory.po b/addressbook/locale/es_VE/fusiondirectory.po
index 8aa7edf63975818788f5492d73e4f42d6d9469bc..295ff80b2b7413aafd2b2afb5881b0d15639a5b4 100644
--- a/addressbook/locale/es_VE/fusiondirectory.po
+++ b/addressbook/locale/es_VE/fusiondirectory.po
@@ -3,16 +3,14 @@
 # This file is distributed under the same license as the PACKAGE package.
 # 
 # Translators:
-# lars_g <lars.gold@gmail.com>, 2012
-# lars_g <lars.gold@gmail.com>, 2012
 msgid ""
 msgstr ""
-"Project-Id-Version: FusionDirectory-108\n"
+"Project-Id-Version: FusionDirectory-109\n"
 "Report-Msgid-Bugs-To: documentation@lists.fusiondirectory.org\n"
-"POT-Creation-Date: 2015-03-19 21:45+0100\n"
-"PO-Revision-Date: 2015-02-25 16:12+0000\n"
+"POT-Creation-Date: 2014-12-15 17:47+0100\n"
+"PO-Revision-Date: 2015-02-25 16:04+0000\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>\n"
-"Language-Team: Spanish (Venezuela) (http://www.transifex.com/projects/p/FusionDirectory-108/language/es_VE/)\n"
+"Language-Team: Spanish (Venezuela) (http://www.transifex.com/projects/p/FusionDirectory-109/language/es_VE/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -36,7 +34,7 @@ msgstr "Necesita introducir su nÃºmero de telÃ©fono personal para poder realizar
 #: addons/addressbook/class_addressbook.inc:227
 #: addons/addressbook/class_addressbook.inc:798
 msgid "LDAP error"
-msgstr "Error LDAP"
+msgstr "Error de LDAP"
 
 #: addons/addressbook/class_addressbook.inc:235
 #: addons/addressbook/class_addressbook.inc:343
@@ -47,7 +45,6 @@ msgstr "Permisos"
 #: addons/addressbook/class_addressbook.inc:472
 #: addons/addressbook/class_addressbook.inc:476
 #: addons/addressbook/class_addressbook.inc:598
-#: addons/addressbook/dial.tpl.c:5
 msgid "Dial"
 msgstr "Marcar"
 
@@ -86,7 +83,6 @@ msgstr "Todo"
 #: addons/addressbook/class_addressbook.inc:697
 #: addons/addressbook/class_addressbook.inc:707
 #: addons/addressbook/class_addressbook.inc:734
-#: addons/addressbook/address_info.tpl.c:5 addons/addressbook/contents.tpl.c:2
 msgid "Name"
 msgstr "Nombre"
 
@@ -115,11 +111,6 @@ msgid "User ID"
 msgstr "Identificador (ID) de usuario"
 
 #: addons/addressbook/class_addressbook.inc:715
-#: addons/addressbook/address_info.tpl.c:20
-#: addons/addressbook/address_info.tpl.c:50
-#: addons/addressbook/contents.tpl.c:5
-#: addons/addressbook/address_edit.tpl.c:26
-#: addons/addressbook/address_edit.tpl.c:56
 msgid "Phone"
 msgstr "TelÃ©fono"
 
@@ -128,27 +119,19 @@ msgid "Telephone number"
 msgstr "NÃºmero de telÃ©fono"
 
 #: addons/addressbook/class_addressbook.inc:721
-#: addons/addressbook/contents.tpl.c:8
 msgid "Fax"
 msgstr "Fax"
 
 #: addons/addressbook/class_addressbook.inc:724
-#: addons/addressbook/address_info.tpl.c:23
-#: addons/addressbook/contents.tpl.c:11
-#: addons/addressbook/address_edit.tpl.c:29
 msgid "Mobile"
 msgstr "MÃ³vil"
 
 #: addons/addressbook/class_addressbook.inc:727
 #: addons/addressbook/class_addressbook.inc:866
-#: addons/addressbook/address_info.tpl.c:56
-#: addons/addressbook/address_edit.tpl.c:62
 msgid "Pager"
 msgstr "Buscapersonas"
 
 #: addons/addressbook/class_addressbook.inc:739
-#: addons/addressbook/address_info.tpl.c:26
-#: addons/addressbook/address_edit.tpl.c:32
 msgid "Email"
 msgstr "Correo ElectrÃ³nico"
 
@@ -199,8 +182,6 @@ msgid "Organization"
 msgstr "OrganizaciÃ³n"
 
 #: addons/addressbook/class_addressbook.inc:868
-#: addons/addressbook/address_info.tpl.c:35
-#: addons/addressbook/address_edit.tpl.c:41
 msgid "Department"
 msgstr "Departamento"
 
@@ -218,8 +199,6 @@ msgid "State"
 msgstr "Provincia"
 
 #: addons/addressbook/class_addressbook.inc:873
-#: addons/addressbook/address_info.tpl.c:8
-#: addons/addressbook/address_edit.tpl.c:14
 msgid "Initials"
 msgstr "Iniciales"
 
@@ -237,166 +216,8 @@ msgstr "Nombre comÃºn"
 
 #: html/getvcard.php:39
 msgid "Internal error"
-msgstr "Error interno"
+msgstr "error interno"
 
 #: html/getvcard.php:39
 msgid "Missing parameters!"
 msgstr "Â¡Faltan parÃ¡metros!"
-
-#: addons/addressbook/address_info.tpl.c:2
-#: addons/addressbook/address_edit.tpl.c:5
-msgid "Personal"
-msgstr "Personal"
-
-#: addons/addressbook/address_info.tpl.c:11
-#: addons/addressbook/address_edit.tpl.c:17
-msgid "Personal title"
-msgstr "TÃtulo Personal"
-
-#: addons/addressbook/address_info.tpl.c:14
-#: addons/addressbook/contents.tpl.c:14
-#: addons/addressbook/address_edit.tpl.c:20
-msgid "Private"
-msgstr "Privado"
-
-#: addons/addressbook/address_info.tpl.c:17
-#: addons/addressbook/address_info.tpl.c:47
-#: addons/addressbook/address_edit.tpl.c:23
-#: addons/addressbook/address_edit.tpl.c:53
-msgid "Address"
-msgstr "DirecciÃ³n"
-
-#: addons/addressbook/address_info.tpl.c:29
-#: addons/addressbook/address_edit.tpl.c:35
-msgid "Organizational"
-msgstr "OrganizaciÃ³n"
-
-#: addons/addressbook/address_info.tpl.c:32
-#: addons/addressbook/address_edit.tpl.c:38
-msgid "Company"
-msgstr "CompaÃ±Ãa"
-
-#: addons/addressbook/address_info.tpl.c:38
-#: addons/addressbook/address_edit.tpl.c:44
-msgid "City"
-msgstr "Ciudad"
-
-#: addons/addressbook/address_info.tpl.c:41
-#: addons/addressbook/address_edit.tpl.c:47
-msgid "Postal code"
-msgstr "CÃ³digo Postal"
-
-#: addons/addressbook/address_info.tpl.c:44
-#: addons/addressbook/address_edit.tpl.c:50
-msgid "Country"
-msgstr "PaÃs"
-
-#: addons/addressbook/address_info.tpl.c:53
-#: addons/addressbook/address_edit.tpl.c:59
-msgid "FAX"
-msgstr "FAX"
-
-#: addons/addressbook/dial.tpl.c:2
-msgid "Dial connection..."
-msgstr "Marcando conexiÃ³n..."
-
-#: addons/addressbook/contents.tpl.c:17
-msgid "Contact"
-msgstr "Contacto"
-
-#: addons/addressbook/contents.tpl.c:20
-msgid "Information"
-msgstr "InformaciÃ³n"
-
-#: addons/addressbook/contents.tpl.c:23
-msgid ""
-"The telephone list plugin provides list and search facilities for the people in your site. You may want to specify the asterisk [*] like in\n"
-"'Fu*ry' to find 'FusionDirectory'. Use the filters below to narrow down your search."
-msgstr ""
-
-#: addons/addressbook/contents.tpl.c:26
-msgid "Actions"
-msgstr "Acciones"
-
-#: addons/addressbook/contents.tpl.c:29
-msgid "Add entry"
-msgstr "AÃ±adir entrada"
-
-#: addons/addressbook/contents.tpl.c:32
-msgid "Edit entry"
-msgstr "Editar entrada"
-
-#: addons/addressbook/contents.tpl.c:35
-msgid "Remove entry"
-msgstr "Eliminar entrada"
-
-#: addons/addressbook/contents.tpl.c:38
-msgid "Filters"
-msgstr "Filtros"
-
-#: addons/addressbook/contents.tpl.c:41
-msgid "Select to see regular users"
-msgstr "Seleccione para ver usuarios genÃ©ricos"
-
-#: addons/addressbook/contents.tpl.c:44
-msgid "Show organizational entries"
-msgstr "Mostrar entradas organizativas"
-
-#: addons/addressbook/contents.tpl.c:47
-msgid "Select to see users in addressbook"
-msgstr "Seleccione para ver los usuarios en la libreta de direcciones"
-
-#: addons/addressbook/contents.tpl.c:50
-msgid "Show addressbook entries"
-msgstr "EnseÃ±ar las entradas de la libreta de direcciones"
-
-#: addons/addressbook/contents.tpl.c:53
-msgid "Display results for department"
-msgstr "Mostrar resultados para el departamento"
-
-#: addons/addressbook/contents.tpl.c:56
-msgid "Choose the department the search will be based on"
-msgstr "Escoja el departamento base de la bÃºsqueda"
-
-#: addons/addressbook/contents.tpl.c:59
-msgid "Match object"
-msgstr "Encontrar objeto"
-
-#: addons/addressbook/contents.tpl.c:62
-msgid "Choose the object that will be searched in"
-msgstr "Elegir el objeto que sera buscado"
-
-#: addons/addressbook/contents.tpl.c:65
-msgid "Search for"
-msgstr "Buscar por"
-
-#: addons/addressbook/contents.tpl.c:68
-msgid "Search string"
-msgstr "Cadena de bÃºsqueda"
-
-#: addons/addressbook/remove.tpl.c:2
-msgid "Warning"
-msgstr "Aviso"
-
-#: addons/addressbook/remove.tpl.c:5
-msgid ""
-"This includes all addressbook data in this entry. Please double check if "
-"your really want to do this since there is no way for FusionDirectory to get"
-" your data back."
-msgstr "Esto incluye toda la data de la libreta de direcciones para esta entrada. Por favor verifique si realmente desea hacer esto ya que FusionDirectory no tiene forma de recuperar la data."
-
-#: addons/addressbook/remove.tpl.c:8
-msgid "So - if you're sure - press 'Delete' to continue or 'Cancel' to abort."
-msgstr "Entonces, si esta seguro, presione <i>Eliminar</i> para continuar o <i>Cancelar</i> para Abortar."
-
-#: addons/addressbook/address_edit.tpl.c:2
-msgid "Choose the department to store entry in"
-msgstr "Elija un departamento para guardar la entrada"
-
-#: addons/addressbook/address_edit.tpl.c:8
-msgid "Last name"
-msgstr "Apellido"
-
-#: addons/addressbook/address_edit.tpl.c:11
-msgid "First name"
-msgstr "Nombre"
diff --git a/addressbook/locale/fa_IR/fusiondirectory.po b/addressbook/locale/fa_IR/fusiondirectory.po
index 6b2971735c2e7391b1dc2cc51ce6d0c41e5dfc2b..b16aa01f8fa3333b31429a69945f8a0ee947e2ac 100644
--- a/addressbook/locale/fa_IR/fusiondirectory.po
+++ b/addressbook/locale/fa_IR/fusiondirectory.po
@@ -3,17 +3,14 @@
 # This file is distributed under the same license as the PACKAGE package.
 # 
 # Translators:
-# Hamid Ala <h.r.ala1364@gmail.com>, 2012
-# Hamid Ala <h.r.ala1364@gmail.com>, 2012
-# Hamid Ala <h.r.ala1364@gmail.com>, 2012
 msgid ""
 msgstr ""
-"Project-Id-Version: FusionDirectory-108\n"
+"Project-Id-Version: FusionDirectory-109\n"
 "Report-Msgid-Bugs-To: documentation@lists.fusiondirectory.org\n"
-"POT-Creation-Date: 2015-03-19 21:45+0100\n"
-"PO-Revision-Date: 2015-02-25 15:52+0000\n"
+"POT-Creation-Date: 2014-12-15 17:47+0100\n"
+"PO-Revision-Date: 2014-12-15 16:47+0000\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>\n"
-"Language-Team: Persian (Iran) (http://www.transifex.com/projects/p/FusionDirectory-108/language/fa_IR/)\n"
+"Language-Team: Persian (Iran) (http://www.transifex.com/projects/p/FusionDirectory-109/language/fa_IR/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -48,7 +45,6 @@ msgstr "Ø¬ÙˆØ§Ø²"
 #: addons/addressbook/class_addressbook.inc:472
 #: addons/addressbook/class_addressbook.inc:476
 #: addons/addressbook/class_addressbook.inc:598
-#: addons/addressbook/dial.tpl.c:5
 msgid "Dial"
 msgstr "Ø§ØªØµØ§Ù„"
 
@@ -87,7 +83,6 @@ msgstr ""
 #: addons/addressbook/class_addressbook.inc:697
 #: addons/addressbook/class_addressbook.inc:707
 #: addons/addressbook/class_addressbook.inc:734
-#: addons/addressbook/address_info.tpl.c:5 addons/addressbook/contents.tpl.c:2
 msgid "Name"
 msgstr ""
 
@@ -116,11 +111,6 @@ msgid "User ID"
 msgstr ""
 
 #: addons/addressbook/class_addressbook.inc:715
-#: addons/addressbook/address_info.tpl.c:20
-#: addons/addressbook/address_info.tpl.c:50
-#: addons/addressbook/contents.tpl.c:5
-#: addons/addressbook/address_edit.tpl.c:26
-#: addons/addressbook/address_edit.tpl.c:56
 msgid "Phone"
 msgstr "ØªÙ„ÙÙ†"
 
@@ -129,27 +119,19 @@ msgid "Telephone number"
 msgstr ""
 
 #: addons/addressbook/class_addressbook.inc:721
-#: addons/addressbook/contents.tpl.c:8
 msgid "Fax"
 msgstr ""
 
 #: addons/addressbook/class_addressbook.inc:724
-#: addons/addressbook/address_info.tpl.c:23
-#: addons/addressbook/contents.tpl.c:11
-#: addons/addressbook/address_edit.tpl.c:29
 msgid "Mobile"
 msgstr "ØªÙ„ÙÙ† Ù‡Ù…Ø±Ø§Ù‡"
 
 #: addons/addressbook/class_addressbook.inc:727
 #: addons/addressbook/class_addressbook.inc:866
-#: addons/addressbook/address_info.tpl.c:56
-#: addons/addressbook/address_edit.tpl.c:62
 msgid "Pager"
 msgstr "Ù¾ÛŒØ¬Ø±"
 
 #: addons/addressbook/class_addressbook.inc:739
-#: addons/addressbook/address_info.tpl.c:26
-#: addons/addressbook/address_edit.tpl.c:32
 msgid "Email"
 msgstr "Ù¾Ø³Øª Ø§Ù„Ú©ØªØ±ÙˆÙ†ÛŒÚ©"
 
@@ -200,8 +182,6 @@ msgid "Organization"
 msgstr ""
 
 #: addons/addressbook/class_addressbook.inc:868
-#: addons/addressbook/address_info.tpl.c:35
-#: addons/addressbook/address_edit.tpl.c:41
 msgid "Department"
 msgstr "Ø¯Ù¾Ø§Ø±ØªÙ…Ø§Ù†"
 
@@ -219,8 +199,6 @@ msgid "State"
 msgstr ""
 
 #: addons/addressbook/class_addressbook.inc:873
-#: addons/addressbook/address_info.tpl.c:8
-#: addons/addressbook/address_edit.tpl.c:14
 msgid "Initials"
 msgstr "Û±"
 
@@ -243,161 +221,3 @@ msgstr "Ø®Ø·Ø§ÛŒ Ø¯Ø§Ø®Ù„ÛŒ"
 #: html/getvcard.php:39
 msgid "Missing parameters!"
 msgstr "Ù¾Ø§Ø±Ø§Ù…ØªØ±Ù‡Ø§ÛŒ Ù…Ø¬Ù‡ÙˆÙ„"
-
-#: addons/addressbook/address_info.tpl.c:2
-#: addons/addressbook/address_edit.tpl.c:5
-msgid "Personal"
-msgstr "Ø´Ø®ØµÛŒ"
-
-#: addons/addressbook/address_info.tpl.c:11
-#: addons/addressbook/address_edit.tpl.c:17
-msgid "Personal title"
-msgstr "Ø¹Ù†ÙˆØ§Ù† Ø´Ø®ØµÛŒ"
-
-#: addons/addressbook/address_info.tpl.c:14
-#: addons/addressbook/contents.tpl.c:14
-#: addons/addressbook/address_edit.tpl.c:20
-msgid "Private"
-msgstr "Ø®ØµÙˆØµÛŒ"
-
-#: addons/addressbook/address_info.tpl.c:17
-#: addons/addressbook/address_info.tpl.c:47
-#: addons/addressbook/address_edit.tpl.c:23
-#: addons/addressbook/address_edit.tpl.c:53
-msgid "Address"
-msgstr "Ø¢Ø¯Ø±Ø³"
-
-#: addons/addressbook/address_info.tpl.c:29
-#: addons/addressbook/address_edit.tpl.c:35
-msgid "Organizational"
-msgstr "ÙˆØ§Ø¨Ø³ØªÙ‡ Ø¨Ù‡ Ø³Ø§Ø²Ù…Ø§Ù†"
-
-#: addons/addressbook/address_info.tpl.c:32
-#: addons/addressbook/address_edit.tpl.c:38
-msgid "Company"
-msgstr "Ø´Ø±Ú©Øª"
-
-#: addons/addressbook/address_info.tpl.c:38
-#: addons/addressbook/address_edit.tpl.c:44
-msgid "City"
-msgstr "Ø´Ù‡Ø±"
-
-#: addons/addressbook/address_info.tpl.c:41
-#: addons/addressbook/address_edit.tpl.c:47
-msgid "Postal code"
-msgstr "Ú©Ø¯ Ù¾Ø³ØªÛŒ"
-
-#: addons/addressbook/address_info.tpl.c:44
-#: addons/addressbook/address_edit.tpl.c:50
-msgid "Country"
-msgstr "Ú©Ø´ÙˆØ±"
-
-#: addons/addressbook/address_info.tpl.c:53
-#: addons/addressbook/address_edit.tpl.c:59
-msgid "FAX"
-msgstr "ÙÚ©Ø³"
-
-#: addons/addressbook/dial.tpl.c:2
-msgid "Dial connection..."
-msgstr "Ø¨Ø±Ù‚Ø±Ø§Ø±ÛŒ Ø§ØªØµØ§Ù„"
-
-#: addons/addressbook/contents.tpl.c:17
-msgid "Contact"
-msgstr ""
-
-#: addons/addressbook/contents.tpl.c:20
-msgid "Information"
-msgstr ""
-
-#: addons/addressbook/contents.tpl.c:23
-msgid ""
-"The telephone list plugin provides list and search facilities for the people in your site. You may want to specify the asterisk [*] like in\n"
-"'Fu*ry' to find 'FusionDirectory'. Use the filters below to narrow down your search."
-msgstr ""
-
-#: addons/addressbook/contents.tpl.c:26
-msgid "Actions"
-msgstr ""
-
-#: addons/addressbook/contents.tpl.c:29
-msgid "Add entry"
-msgstr ""
-
-#: addons/addressbook/contents.tpl.c:32
-msgid "Edit entry"
-msgstr ""
-
-#: addons/addressbook/contents.tpl.c:35
-msgid "Remove entry"
-msgstr ""
-
-#: addons/addressbook/contents.tpl.c:38
-msgid "Filters"
-msgstr ""
-
-#: addons/addressbook/contents.tpl.c:41
-msgid "Select to see regular users"
-msgstr ""
-
-#: addons/addressbook/contents.tpl.c:44
-msgid "Show organizational entries"
-msgstr ""
-
-#: addons/addressbook/contents.tpl.c:47
-msgid "Select to see users in addressbook"
-msgstr ""
-
-#: addons/addressbook/contents.tpl.c:50
-msgid "Show addressbook entries"
-msgstr ""
-
-#: addons/addressbook/contents.tpl.c:53
-msgid "Display results for department"
-msgstr ""
-
-#: addons/addressbook/contents.tpl.c:56
-msgid "Choose the department the search will be based on"
-msgstr ""
-
-#: addons/addressbook/contents.tpl.c:59
-msgid "Match object"
-msgstr ""
-
-#: addons/addressbook/contents.tpl.c:62
-msgid "Choose the object that will be searched in"
-msgstr ""
-
-#: addons/addressbook/contents.tpl.c:65
-msgid "Search for"
-msgstr ""
-
-#: addons/addressbook/contents.tpl.c:68
-msgid "Search string"
-msgstr ""
-
-#: addons/addressbook/remove.tpl.c:2
-msgid "Warning"
-msgstr ""
-
-#: addons/addressbook/remove.tpl.c:5
-msgid ""
-"This includes all addressbook data in this entry. Please double check if "
-"your really want to do this since there is no way for FusionDirectory to get"
-" your data back."
-msgstr ""
-
-#: addons/addressbook/remove.tpl.c:8
-msgid "So - if you're sure - press 'Delete' to continue or 'Cancel' to abort."
-msgstr ""
-
-#: addons/addressbook/address_edit.tpl.c:2
-msgid "Choose the department to store entry in"
-msgstr "Ø¯Ù¾Ø§Ø±ØªÙ…Ø§Ù† Ø±Ø§ Ø¨Ø±Ø§ÛŒ Ø°Ø®ÛŒØ±Ù‡ Ø³Ø§Ø²ÛŒ ÙˆØ±ÙˆØ¯ÛŒ Ø¯Ø± Ø¢Ù† Ø§Ù†ØªØ®Ø§Ø¨ Ú©Ù†ÛŒØ¯"
-
-#: addons/addressbook/address_edit.tpl.c:8
-msgid "Last name"
-msgstr "ÙØ§Ù…ÛŒÙ„"
-
-#: addons/addressbook/address_edit.tpl.c:11
-msgid "First name"
-msgstr "Ù†Ø§Ù…"
diff --git a/addressbook/locale/fr/fusiondirectory.po b/addressbook/locale/fr/fusiondirectory.po
index c4d804bdd5c98f15c833a1a72e670669b073e21f..92746e9c8d38171f502eca64961fb68b21b600f9 100644
--- a/addressbook/locale/fr/fusiondirectory.po
+++ b/addressbook/locale/fr/fusiondirectory.po
@@ -3,22 +3,14 @@
 # This file is distributed under the same license as the PACKAGE package.
 # 
 # Translators:
-# Benoit Mortier <benoit.mortier@opensides.be>, 2005-2009,2011
-# fusiondirectory <contact@fusiondirectory.org>, 2014
-# fusiondirectory <contact@fusiondirectory.org>, 2012
-# fusiondirectory <contact@fusiondirectory.org>, 2012,2014
-# poterealpopolo <giuliano@opensides.be>, 2013
-# poterealpopolo <giuliano@opensides.be>, 2013
-# ptitoliv <ptitoliv@ptitoliv.net>, 2012
-# ptitoliv <ptitoliv@ptitoliv.net>, 2012
 msgid ""
 msgstr ""
-"Project-Id-Version: FusionDirectory-108\n"
+"Project-Id-Version: FusionDirectory-109\n"
 "Report-Msgid-Bugs-To: documentation@lists.fusiondirectory.org\n"
-"POT-Creation-Date: 2015-03-19 21:45+0100\n"
-"PO-Revision-Date: 2015-02-25 16:12+0000\n"
+"POT-Creation-Date: 2014-12-15 17:47+0100\n"
+"PO-Revision-Date: 2015-02-25 16:04+0000\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>\n"
-"Language-Team: French (http://www.transifex.com/projects/p/FusionDirectory-108/language/fr/)\n"
+"Language-Team: French (http://www.transifex.com/projects/p/FusionDirectory-109/language/fr/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -53,7 +45,6 @@ msgstr "Permissions"
 #: addons/addressbook/class_addressbook.inc:472
 #: addons/addressbook/class_addressbook.inc:476
 #: addons/addressbook/class_addressbook.inc:598
-#: addons/addressbook/dial.tpl.c:5
 msgid "Dial"
 msgstr "Appeler"
 
@@ -92,7 +83,6 @@ msgstr "Tout"
 #: addons/addressbook/class_addressbook.inc:697
 #: addons/addressbook/class_addressbook.inc:707
 #: addons/addressbook/class_addressbook.inc:734
-#: addons/addressbook/address_info.tpl.c:5 addons/addressbook/contents.tpl.c:2
 msgid "Name"
 msgstr "Nom"
 
@@ -114,18 +104,13 @@ msgstr "GSM"
 
 #: addons/addressbook/class_addressbook.inc:660
 msgid "Home phone"
-msgstr "TÃ©lÃ©phone personnel"
+msgstr "TÃ©lÃ©phone privÃ©"
 
 #: addons/addressbook/class_addressbook.inc:660
 msgid "User ID"
 msgstr "ID de l'utilisateur"
 
 #: addons/addressbook/class_addressbook.inc:715
-#: addons/addressbook/address_info.tpl.c:20
-#: addons/addressbook/address_info.tpl.c:50
-#: addons/addressbook/contents.tpl.c:5
-#: addons/addressbook/address_edit.tpl.c:26
-#: addons/addressbook/address_edit.tpl.c:56
 msgid "Phone"
 msgstr "TÃ©lÃ©phone"
 
@@ -134,27 +119,19 @@ msgid "Telephone number"
 msgstr "NumÃ©ro de tÃ©lÃ©phone"
 
 #: addons/addressbook/class_addressbook.inc:721
-#: addons/addressbook/contents.tpl.c:8
 msgid "Fax"
 msgstr "Fax"
 
 #: addons/addressbook/class_addressbook.inc:724
-#: addons/addressbook/address_info.tpl.c:23
-#: addons/addressbook/contents.tpl.c:11
-#: addons/addressbook/address_edit.tpl.c:29
 msgid "Mobile"
 msgstr "GSM"
 
 #: addons/addressbook/class_addressbook.inc:727
 #: addons/addressbook/class_addressbook.inc:866
-#: addons/addressbook/address_info.tpl.c:56
-#: addons/addressbook/address_edit.tpl.c:62
 msgid "Pager"
 msgstr "Bip"
 
 #: addons/addressbook/class_addressbook.inc:739
-#: addons/addressbook/address_info.tpl.c:26
-#: addons/addressbook/address_edit.tpl.c:32
 msgid "Email"
 msgstr "Adresse de messagerie"
 
@@ -174,7 +151,7 @@ msgstr "Le carnet d'adresse montre les utilisateurs internes et externes"
 
 #: addons/addressbook/class_addressbook.inc:858
 msgid "Surname"
-msgstr "Nom de famille"
+msgstr "Nom"
 
 #: addons/addressbook/class_addressbook.inc:860
 msgid "Telefon number"
@@ -205,8 +182,6 @@ msgid "Organization"
 msgstr "Entreprise"
 
 #: addons/addressbook/class_addressbook.inc:868
-#: addons/addressbook/address_info.tpl.c:35
-#: addons/addressbook/address_edit.tpl.c:41
 msgid "Department"
 msgstr "DÃ©partement"
 
@@ -224,8 +199,6 @@ msgid "State"
 msgstr "DÃ©partement"
 
 #: addons/addressbook/class_addressbook.inc:873
-#: addons/addressbook/address_info.tpl.c:8
-#: addons/addressbook/address_edit.tpl.c:14
 msgid "Initials"
 msgstr "Initiales"
 
@@ -239,7 +212,7 @@ msgstr "Adresse postale personnelle"
 
 #: addons/addressbook/class_addressbook.inc:876
 msgid "Common name"
-msgstr "Nom complet"
+msgstr "Nom commun"
 
 #: html/getvcard.php:39
 msgid "Internal error"
@@ -248,161 +221,3 @@ msgstr "Erreur interne"
 #: html/getvcard.php:39
 msgid "Missing parameters!"
 msgstr "ParamÃ¨tres manquants !"
-
-#: addons/addressbook/address_info.tpl.c:2
-#: addons/addressbook/address_edit.tpl.c:5
-msgid "Personal"
-msgstr "Personnel"
-
-#: addons/addressbook/address_info.tpl.c:11
-#: addons/addressbook/address_edit.tpl.c:17
-msgid "Personal title"
-msgstr "Titre personnel"
-
-#: addons/addressbook/address_info.tpl.c:14
-#: addons/addressbook/contents.tpl.c:14
-#: addons/addressbook/address_edit.tpl.c:20
-msgid "Private"
-msgstr "PrivÃ©"
-
-#: addons/addressbook/address_info.tpl.c:17
-#: addons/addressbook/address_info.tpl.c:47
-#: addons/addressbook/address_edit.tpl.c:23
-#: addons/addressbook/address_edit.tpl.c:53
-msgid "Address"
-msgstr "Adresse"
-
-#: addons/addressbook/address_info.tpl.c:29
-#: addons/addressbook/address_edit.tpl.c:35
-msgid "Organizational"
-msgstr "Organisation"
-
-#: addons/addressbook/address_info.tpl.c:32
-#: addons/addressbook/address_edit.tpl.c:38
-msgid "Company"
-msgstr "SociÃ©tÃ©"
-
-#: addons/addressbook/address_info.tpl.c:38
-#: addons/addressbook/address_edit.tpl.c:44
-msgid "City"
-msgstr "Ville"
-
-#: addons/addressbook/address_info.tpl.c:41
-#: addons/addressbook/address_edit.tpl.c:47
-msgid "Postal code"
-msgstr "Code postal"
-
-#: addons/addressbook/address_info.tpl.c:44
-#: addons/addressbook/address_edit.tpl.c:50
-msgid "Country"
-msgstr "Pays"
-
-#: addons/addressbook/address_info.tpl.c:53
-#: addons/addressbook/address_edit.tpl.c:59
-msgid "FAX"
-msgstr "FAX"
-
-#: addons/addressbook/dial.tpl.c:2
-msgid "Dial connection..."
-msgstr "Appel en cours ..."
-
-#: addons/addressbook/contents.tpl.c:17
-msgid "Contact"
-msgstr "Contact"
-
-#: addons/addressbook/contents.tpl.c:20
-msgid "Information"
-msgstr "Information"
-
-#: addons/addressbook/contents.tpl.c:23
-msgid ""
-"The telephone list plugin provides list and search facilities for the people in your site. You may want to specify the asterisk [*] like in\n"
-"'Fu*ry' to find 'FusionDirectory'. Use the filters below to narrow down your search."
-msgstr "L'extension gÃ©rant les listes de numÃ©ros de tÃ©lÃ©phone permet de les mettre Ã  disposition de vos utilisateurs. Vous pouvez utiliser les [*] dans vos recherches, comme dans 'Fu*ry' pour trouver 'FusionDirectory'. Utilisez les filtres ci dessous pour rÃ©duire l'Ã©tendue de votre recherche."
-
-#: addons/addressbook/contents.tpl.c:26
-msgid "Actions"
-msgstr "Actions"
-
-#: addons/addressbook/contents.tpl.c:29
-msgid "Add entry"
-msgstr "Ajouter une entrÃ©e"
-
-#: addons/addressbook/contents.tpl.c:32
-msgid "Edit entry"
-msgstr "Modifier une entrÃ©e"
-
-#: addons/addressbook/contents.tpl.c:35
-msgid "Remove entry"
-msgstr "Supprimer une entrÃ©e"
-
-#: addons/addressbook/contents.tpl.c:38
-msgid "Filters"
-msgstr "Filtres"
-
-#: addons/addressbook/contents.tpl.c:41
-msgid "Select to see regular users"
-msgstr "SÃ©lectionnez afin d'afficher les utilisateurs habituels"
-
-#: addons/addressbook/contents.tpl.c:44
-msgid "Show organizational entries"
-msgstr "Afficher les entrÃ©es de l'organisation"
-
-#: addons/addressbook/contents.tpl.c:47
-msgid "Select to see users in addressbook"
-msgstr "SÃ©lectionner pour afficher les utilisateurs prÃ©sent dans le carnet d'adresse"
-
-#: addons/addressbook/contents.tpl.c:50
-msgid "Show addressbook entries"
-msgstr "Afficher les entrÃ©es du carnet d'adresses"
-
-#: addons/addressbook/contents.tpl.c:53
-msgid "Display results for department"
-msgstr "Afficher les rÃ©sultats pour le dÃ©partement"
-
-#: addons/addressbook/contents.tpl.c:56
-msgid "Choose the department the search will be based on"
-msgstr "SÃ©lectionner le dÃ©partement oÃ¹ sera effectuÃ©e la recherche"
-
-#: addons/addressbook/contents.tpl.c:59
-msgid "Match object"
-msgstr "Objet correspondant"
-
-#: addons/addressbook/contents.tpl.c:62
-msgid "Choose the object that will be searched in"
-msgstr "Indiquez l'objet dans lequel la recherche sera effectuÃ©e"
-
-#: addons/addressbook/contents.tpl.c:65
-msgid "Search for"
-msgstr "Recherche de"
-
-#: addons/addressbook/contents.tpl.c:68
-msgid "Search string"
-msgstr "Phrase de recherche"
-
-#: addons/addressbook/remove.tpl.c:2
-msgid "Warning"
-msgstr "Avertissement"
-
-#: addons/addressbook/remove.tpl.c:5
-msgid ""
-"This includes all addressbook data in this entry. 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 donnÃ©es du carnet d'adresses situÃ©es dans cette entrÃ©e. Veuillez vÃ©rifier si vous voulez rÃ©aliser cette opÃ©ration, toutes les donnÃ©es seront dÃ©finitivement perdues, il n'y a pas de moyen pour FusionDirectory de les rÃ©cupÃ©rer."
-
-#: addons/addressbook/remove.tpl.c:8
-msgid "So - if you're sure - press 'Delete' to continue or 'Cancel' to abort."
-msgstr "Donc - si vous Ãªtes sÃ»r - cliquez sur 'Supprimer' pour continuer ou sur 'Annuler' pour abandonner."
-
-#: addons/addressbook/address_edit.tpl.c:2
-msgid "Choose the department to store entry in"
-msgstr "Choisissez le dÃ©partement oÃ¹ l'entrÃ©e sera stockÃ©e"
-
-#: addons/addressbook/address_edit.tpl.c:8
-msgid "Last name"
-msgstr "Nom de famille"
-
-#: addons/addressbook/address_edit.tpl.c:11
-msgid "First name"
-msgstr "PrÃ©nom"
diff --git a/addressbook/locale/id/fusiondirectory.po b/addressbook/locale/id/fusiondirectory.po
index 3abcb2a064aee074e93700452caa2ea0516ce51c..1494a2aef55bace3a9c356bc32f63de23eb73a61 100644
--- a/addressbook/locale/id/fusiondirectory.po
+++ b/addressbook/locale/id/fusiondirectory.po
@@ -5,12 +5,12 @@
 # Translators:
 msgid ""
 msgstr ""
-"Project-Id-Version: FusionDirectory-108\n"
+"Project-Id-Version: FusionDirectory-109\n"
 "Report-Msgid-Bugs-To: documentation@lists.fusiondirectory.org\n"
-"POT-Creation-Date: 2015-03-19 21:45+0100\n"
-"PO-Revision-Date: 2015-02-25 15:39+0000\n"
+"POT-Creation-Date: 2014-12-15 17:47+0100\n"
+"PO-Revision-Date: 2014-12-15 16:47+0000\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>\n"
-"Language-Team: Indonesian (http://www.transifex.com/projects/p/FusionDirectory-108/language/id/)\n"
+"Language-Team: Indonesian (http://www.transifex.com/projects/p/FusionDirectory-109/language/id/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -45,7 +45,6 @@ msgstr ""
 #: addons/addressbook/class_addressbook.inc:472
 #: addons/addressbook/class_addressbook.inc:476
 #: addons/addressbook/class_addressbook.inc:598
-#: addons/addressbook/dial.tpl.c:5
 msgid "Dial"
 msgstr ""
 
@@ -84,7 +83,6 @@ msgstr ""
 #: addons/addressbook/class_addressbook.inc:697
 #: addons/addressbook/class_addressbook.inc:707
 #: addons/addressbook/class_addressbook.inc:734
-#: addons/addressbook/address_info.tpl.c:5 addons/addressbook/contents.tpl.c:2
 msgid "Name"
 msgstr ""
 
@@ -113,11 +111,6 @@ msgid "User ID"
 msgstr ""
 
 #: addons/addressbook/class_addressbook.inc:715
-#: addons/addressbook/address_info.tpl.c:20
-#: addons/addressbook/address_info.tpl.c:50
-#: addons/addressbook/contents.tpl.c:5
-#: addons/addressbook/address_edit.tpl.c:26
-#: addons/addressbook/address_edit.tpl.c:56
 msgid "Phone"
 msgstr ""
 
@@ -126,27 +119,19 @@ msgid "Telephone number"
 msgstr ""
 
 #: addons/addressbook/class_addressbook.inc:721
-#: addons/addressbook/contents.tpl.c:8
 msgid "Fax"
 msgstr ""
 
 #: addons/addressbook/class_addressbook.inc:724
-#: addons/addressbook/address_info.tpl.c:23
-#: addons/addressbook/contents.tpl.c:11
-#: addons/addressbook/address_edit.tpl.c:29
 msgid "Mobile"
 msgstr ""
 
 #: addons/addressbook/class_addressbook.inc:727
 #: addons/addressbook/class_addressbook.inc:866
-#: addons/addressbook/address_info.tpl.c:56
-#: addons/addressbook/address_edit.tpl.c:62
 msgid "Pager"
 msgstr ""
 
 #: addons/addressbook/class_addressbook.inc:739
-#: addons/addressbook/address_info.tpl.c:26
-#: addons/addressbook/address_edit.tpl.c:32
 msgid "Email"
 msgstr ""
 
@@ -197,8 +182,6 @@ msgid "Organization"
 msgstr ""
 
 #: addons/addressbook/class_addressbook.inc:868
-#: addons/addressbook/address_info.tpl.c:35
-#: addons/addressbook/address_edit.tpl.c:41
 msgid "Department"
 msgstr ""
 
@@ -216,8 +199,6 @@ msgid "State"
 msgstr ""
 
 #: addons/addressbook/class_addressbook.inc:873
-#: addons/addressbook/address_info.tpl.c:8
-#: addons/addressbook/address_edit.tpl.c:14
 msgid "Initials"
 msgstr ""
 
@@ -240,161 +221,3 @@ msgstr ""
 #: html/getvcard.php:39
 msgid "Missing parameters!"
 msgstr ""
-
-#: addons/addressbook/address_info.tpl.c:2
-#: addons/addressbook/address_edit.tpl.c:5
-msgid "Personal"
-msgstr ""
-
-#: addons/addressbook/address_info.tpl.c:11
-#: addons/addressbook/address_edit.tpl.c:17
-msgid "Personal title"
-msgstr ""
-
-#: addons/addressbook/address_info.tpl.c:14
-#: addons/addressbook/contents.tpl.c:14
-#: addons/addressbook/address_edit.tpl.c:20
-msgid "Private"
-msgstr ""
-
-#: addons/addressbook/address_info.tpl.c:17
-#: addons/addressbook/address_info.tpl.c:47
-#: addons/addressbook/address_edit.tpl.c:23
-#: addons/addressbook/address_edit.tpl.c:53
-msgid "Address"
-msgstr ""
-
-#: addons/addressbook/address_info.tpl.c:29
-#: addons/addressbook/address_edit.tpl.c:35
-msgid "Organizational"
-msgstr ""
-
-#: addons/addressbook/address_info.tpl.c:32
-#: addons/addressbook/address_edit.tpl.c:38
-msgid "Company"
-msgstr ""
-
-#: addons/addressbook/address_info.tpl.c:38
-#: addons/addressbook/address_edit.tpl.c:44
-msgid "City"
-msgstr ""
-
-#: addons/addressbook/address_info.tpl.c:41
-#: addons/addressbook/address_edit.tpl.c:47
-msgid "Postal code"
-msgstr ""
-
-#: addons/addressbook/address_info.tpl.c:44
-#: addons/addressbook/address_edit.tpl.c:50
-msgid "Country"
-msgstr ""
-
-#: addons/addressbook/address_info.tpl.c:53
-#: addons/addressbook/address_edit.tpl.c:59
-msgid "FAX"
-msgstr ""
-
-#: addons/addressbook/dial.tpl.c:2
-msgid "Dial connection..."
-msgstr ""
-
-#: addons/addressbook/contents.tpl.c:17
-msgid "Contact"
-msgstr ""
-
-#: addons/addressbook/contents.tpl.c:20
-msgid "Information"
-msgstr ""
-
-#: addons/addressbook/contents.tpl.c:23
-msgid ""
-"The telephone list plugin provides list and search facilities for the people in your site. You may want to specify the asterisk [*] like in\n"
-"'Fu*ry' to find 'FusionDirectory'. Use the filters below to narrow down your search."
-msgstr ""
-
-#: addons/addressbook/contents.tpl.c:26
-msgid "Actions"
-msgstr ""
-
-#: addons/addressbook/contents.tpl.c:29
-msgid "Add entry"
-msgstr ""
-
-#: addons/addressbook/contents.tpl.c:32
-msgid "Edit entry"
-msgstr ""
-
-#: addons/addressbook/contents.tpl.c:35
-msgid "Remove entry"
-msgstr ""
-
-#: addons/addressbook/contents.tpl.c:38
-msgid "Filters"
-msgstr ""
-
-#: addons/addressbook/contents.tpl.c:41
-msgid "Select to see regular users"
-msgstr ""
-
-#: addons/addressbook/contents.tpl.c:44
-msgid "Show organizational entries"
-msgstr ""
-
-#: addons/addressbook/contents.tpl.c:47
-msgid "Select to see users in addressbook"
-msgstr ""
-
-#: addons/addressbook/contents.tpl.c:50
-msgid "Show addressbook entries"
-msgstr ""
-
-#: addons/addressbook/contents.tpl.c:53
-msgid "Display results for department"
-msgstr ""
-
-#: addons/addressbook/contents.tpl.c:56
-msgid "Choose the department the search will be based on"
-msgstr ""
-
-#: addons/addressbook/contents.tpl.c:59
-msgid "Match object"
-msgstr ""
-
-#: addons/addressbook/contents.tpl.c:62
-msgid "Choose the object that will be searched in"
-msgstr ""
-
-#: addons/addressbook/contents.tpl.c:65
-msgid "Search for"
-msgstr ""
-
-#: addons/addressbook/contents.tpl.c:68
-msgid "Search string"
-msgstr ""
-
-#: addons/addressbook/remove.tpl.c:2
-msgid "Warning"
-msgstr ""
-
-#: addons/addressbook/remove.tpl.c:5
-msgid ""
-"This includes all addressbook data in this entry. Please double check if "
-"your really want to do this since there is no way for FusionDirectory to get"
-" your data back."
-msgstr ""
-
-#: addons/addressbook/remove.tpl.c:8
-msgid "So - if you're sure - press 'Delete' to continue or 'Cancel' to abort."
-msgstr ""
-
-#: addons/addressbook/address_edit.tpl.c:2
-msgid "Choose the department to store entry in"
-msgstr ""
-
-#: addons/addressbook/address_edit.tpl.c:8
-msgid "Last name"
-msgstr ""
-
-#: addons/addressbook/address_edit.tpl.c:11
-msgid "First name"
-msgstr ""
diff --git a/addressbook/locale/it/fusiondirectory.po b/addressbook/locale/it/fusiondirectory.po
index 298fda7ea480f0cd4b4ecedfeb88d46288e9bfb7..2056ffd17a0aa4a580e6bf04f355e17f544cd2ab 100644
--- a/addressbook/locale/it/fusiondirectory.po
+++ b/addressbook/locale/it/fusiondirectory.po
@@ -3,18 +3,14 @@
 # This file is distributed under the same license as the PACKAGE package.
 # 
 # Translators:
-# Alessandro Amici <a.amici@bopen.it>, 2005
-# poterealpopolo <giuliano@opensides.be>, 2011
-# poterealpopolo <giuliano@opensides.be>, 2012
-# poterealpopolo <giuliano@opensides.be>, 2011-2012
 msgid ""
 msgstr ""
-"Project-Id-Version: FusionDirectory-108\n"
+"Project-Id-Version: FusionDirectory-109\n"
 "Report-Msgid-Bugs-To: documentation@lists.fusiondirectory.org\n"
-"POT-Creation-Date: 2015-03-19 21:45+0100\n"
-"PO-Revision-Date: 2015-02-25 16:12+0000\n"
+"POT-Creation-Date: 2014-12-15 17:47+0100\n"
+"PO-Revision-Date: 2015-02-25 16:04+0000\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>\n"
-"Language-Team: Italian (http://www.transifex.com/projects/p/FusionDirectory-108/language/it/)\n"
+"Language-Team: Italian (http://www.transifex.com/projects/p/FusionDirectory-109/language/it/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -49,7 +45,6 @@ msgstr "Permessi"
 #: addons/addressbook/class_addressbook.inc:472
 #: addons/addressbook/class_addressbook.inc:476
 #: addons/addressbook/class_addressbook.inc:598
-#: addons/addressbook/dial.tpl.c:5
 msgid "Dial"
 msgstr "Chiamare"
 
@@ -88,9 +83,8 @@ msgstr "Tutto"
 #: addons/addressbook/class_addressbook.inc:697
 #: addons/addressbook/class_addressbook.inc:707
 #: addons/addressbook/class_addressbook.inc:734
-#: addons/addressbook/address_info.tpl.c:5 addons/addressbook/contents.tpl.c:2
 msgid "Name"
-msgstr "Cognome"
+msgstr "Nome"
 
 #: addons/addressbook/class_addressbook.inc:658
 #: addons/addressbook/class_addressbook.inc:701
@@ -114,14 +108,9 @@ msgstr "Telefono privato"
 
 #: addons/addressbook/class_addressbook.inc:660
 msgid "User ID"
-msgstr "ID utente"
+msgstr "ID dell'utente"
 
 #: addons/addressbook/class_addressbook.inc:715
-#: addons/addressbook/address_info.tpl.c:20
-#: addons/addressbook/address_info.tpl.c:50
-#: addons/addressbook/contents.tpl.c:5
-#: addons/addressbook/address_edit.tpl.c:26
-#: addons/addressbook/address_edit.tpl.c:56
 msgid "Phone"
 msgstr "Telefono"
 
@@ -130,27 +119,19 @@ msgid "Telephone number"
 msgstr "Numero di telefono"
 
 #: addons/addressbook/class_addressbook.inc:721
-#: addons/addressbook/contents.tpl.c:8
 msgid "Fax"
 msgstr "Fax"
 
 #: addons/addressbook/class_addressbook.inc:724
-#: addons/addressbook/address_info.tpl.c:23
-#: addons/addressbook/contents.tpl.c:11
-#: addons/addressbook/address_edit.tpl.c:29
 msgid "Mobile"
 msgstr "Cellulare"
 
 #: addons/addressbook/class_addressbook.inc:727
 #: addons/addressbook/class_addressbook.inc:866
-#: addons/addressbook/address_info.tpl.c:56
-#: addons/addressbook/address_edit.tpl.c:62
 msgid "Pager"
 msgstr "Cercapersone"
 
 #: addons/addressbook/class_addressbook.inc:739
-#: addons/addressbook/address_info.tpl.c:26
-#: addons/addressbook/address_edit.tpl.c:32
 msgid "Email"
 msgstr "Indirizzo di posta elettronica"
 
@@ -178,7 +159,7 @@ msgstr "Numero di telefono"
 
 #: addons/addressbook/class_addressbook.inc:861
 msgid "Fax number"
-msgstr "Numero di fax"
+msgstr "Numero di Fax"
 
 #: addons/addressbook/class_addressbook.inc:862
 msgid "Mobile number"
@@ -201,8 +182,6 @@ msgid "Organization"
 msgstr "Organizzazione"
 
 #: addons/addressbook/class_addressbook.inc:868
-#: addons/addressbook/address_info.tpl.c:35
-#: addons/addressbook/address_edit.tpl.c:41
 msgid "Department"
 msgstr "Dipartimento"
 
@@ -213,15 +192,13 @@ msgstr "LocalitÃ "
 #: addons/addressbook/class_addressbook.inc:870
 #: addons/addressbook/class_addressbook.inc:871
 msgid "Postal address"
-msgstr "CAP"
+msgstr "Indirizzo postale"
 
 #: addons/addressbook/class_addressbook.inc:872
 msgid "State"
 msgstr "Regione"
 
 #: addons/addressbook/class_addressbook.inc:873
-#: addons/addressbook/address_info.tpl.c:8
-#: addons/addressbook/address_edit.tpl.c:14
 msgid "Initials"
 msgstr "Iniziali"
 
@@ -231,7 +208,7 @@ msgstr "Titolo"
 
 #: addons/addressbook/class_addressbook.inc:875
 msgid "Home postal address"
-msgstr "Indirizzo postale di casa"
+msgstr "Indirizzo postale personale"
 
 #: addons/addressbook/class_addressbook.inc:876
 msgid "Common name"
@@ -244,161 +221,3 @@ msgstr "Errore interno"
 #: html/getvcard.php:39
 msgid "Missing parameters!"
 msgstr "Mancano dei parametri !"
-
-#: addons/addressbook/address_info.tpl.c:2
-#: addons/addressbook/address_edit.tpl.c:5
-msgid "Personal"
-msgstr "Personale"
-
-#: addons/addressbook/address_info.tpl.c:11
-#: addons/addressbook/address_edit.tpl.c:17
-msgid "Personal title"
-msgstr "Titolo personale"
-
-#: addons/addressbook/address_info.tpl.c:14
-#: addons/addressbook/contents.tpl.c:14
-#: addons/addressbook/address_edit.tpl.c:20
-msgid "Private"
-msgstr "Privato"
-
-#: addons/addressbook/address_info.tpl.c:17
-#: addons/addressbook/address_info.tpl.c:47
-#: addons/addressbook/address_edit.tpl.c:23
-#: addons/addressbook/address_edit.tpl.c:53
-msgid "Address"
-msgstr "Indirizzo"
-
-#: addons/addressbook/address_info.tpl.c:29
-#: addons/addressbook/address_edit.tpl.c:35
-msgid "Organizational"
-msgstr "Organizzazione"
-
-#: addons/addressbook/address_info.tpl.c:32
-#: addons/addressbook/address_edit.tpl.c:38
-msgid "Company"
-msgstr "Azienda"
-
-#: addons/addressbook/address_info.tpl.c:38
-#: addons/addressbook/address_edit.tpl.c:44
-msgid "City"
-msgstr "CittÃ "
-
-#: addons/addressbook/address_info.tpl.c:41
-#: addons/addressbook/address_edit.tpl.c:47
-msgid "Postal code"
-msgstr "CAP"
-
-#: addons/addressbook/address_info.tpl.c:44
-#: addons/addressbook/address_edit.tpl.c:50
-msgid "Country"
-msgstr "Stato"
-
-#: addons/addressbook/address_info.tpl.c:53
-#: addons/addressbook/address_edit.tpl.c:59
-msgid "FAX"
-msgstr "FAX"
-
-#: addons/addressbook/dial.tpl.c:2
-msgid "Dial connection..."
-msgstr "Chiamata in corso ..."
-
-#: addons/addressbook/contents.tpl.c:17
-msgid "Contact"
-msgstr "Contatto"
-
-#: addons/addressbook/contents.tpl.c:20
-msgid "Information"
-msgstr "Informazione"
-
-#: addons/addressbook/contents.tpl.c:23
-msgid ""
-"The telephone list plugin provides list and search facilities for the people in your site. You may want to specify the asterisk [*] like in\n"
-"'Fu*ry' to find 'FusionDirectory'. Use the filters below to narrow down your search."
-msgstr ""
-
-#: addons/addressbook/contents.tpl.c:26
-msgid "Actions"
-msgstr "Azioni"
-
-#: addons/addressbook/contents.tpl.c:29
-msgid "Add entry"
-msgstr "Aggiungi contatto"
-
-#: addons/addressbook/contents.tpl.c:32
-msgid "Edit entry"
-msgstr "Modifica contatto"
-
-#: addons/addressbook/contents.tpl.c:35
-msgid "Remove entry"
-msgstr "Elimina contatto"
-
-#: addons/addressbook/contents.tpl.c:38
-msgid "Filters"
-msgstr "Filtri"
-
-#: addons/addressbook/contents.tpl.c:41
-msgid "Select to see regular users"
-msgstr "Seleziona per elencare gli utenti abituali"
-
-#: addons/addressbook/contents.tpl.c:44
-msgid "Show organizational entries"
-msgstr "Mostra i contatti dell'organizzazione"
-
-#: addons/addressbook/contents.tpl.c:47
-msgid "Select to see users in addressbook"
-msgstr "Seleziona per vedere gli utenti nella rubrica"
-
-#: addons/addressbook/contents.tpl.c:50
-msgid "Show addressbook entries"
-msgstr "Mostra i contatti della rubrica"
-
-#: addons/addressbook/contents.tpl.c:53
-msgid "Display results for department"
-msgstr "Mostra i risultati per il dipartimento"
-
-#: addons/addressbook/contents.tpl.c:56
-msgid "Choose the department the search will be based on"
-msgstr "Scegli il dipartimento di base per la ricerca"
-
-#: addons/addressbook/contents.tpl.c:59
-msgid "Match object"
-msgstr "Oggetto corrispondente"
-
-#: addons/addressbook/contents.tpl.c:62
-msgid "Choose the object that will be searched in"
-msgstr "Indica l'oggetto di base per la ricerca"
-
-#: addons/addressbook/contents.tpl.c:65
-msgid "Search for"
-msgstr "Cerca"
-
-#: addons/addressbook/contents.tpl.c:68
-msgid "Search string"
-msgstr "Frase di ricerca"
-
-#: addons/addressbook/remove.tpl.c:2
-msgid "Warning"
-msgstr "Avvertimento"
-
-#: addons/addressbook/remove.tpl.c:5
-msgid ""
-"This includes all addressbook data in this entry. Please double check if "
-"your really want to do this since there is no way for FusionDirectory to get"
-" your data back."
-msgstr "Questo include tutti i dati nella rubrica per questa entry. Assicurati che vuoi davvero eseguire l'azione visto che poi sarÃ  impossibile per FusionDirectory recuperare i tuoi dati."
-
-#: addons/addressbook/remove.tpl.c:8
-msgid "So - if you're sure - press 'Delete' to continue or 'Cancel' to abort."
-msgstr "Quindi - se sei sicuro - premi 'Rimuovi' per continuare oppure 'Annulla' per interrompere."
-
-#: addons/addressbook/address_edit.tpl.c:2
-msgid "Choose the department to store entry in"
-msgstr "Scegli il dipartimento dove registrare l'entry"
-
-#: addons/addressbook/address_edit.tpl.c:8
-msgid "Last name"
-msgstr "Cognome"
-
-#: addons/addressbook/address_edit.tpl.c:11
-msgid "First name"
-msgstr "Nome"
diff --git a/addressbook/locale/lv/fusiondirectory.po b/addressbook/locale/lv/fusiondirectory.po
index 4d27d886ed65d6597f71686b91c67a77514516d4..fe61607756246466ac7503fa98a3f577d31a38cf 100644
--- a/addressbook/locale/lv/fusiondirectory.po
+++ b/addressbook/locale/lv/fusiondirectory.po
@@ -5,12 +5,12 @@
 # Translators:
 msgid ""
 msgstr ""
-"Project-Id-Version: FusionDirectory-108\n"
+"Project-Id-Version: FusionDirectory-109\n"
 "Report-Msgid-Bugs-To: documentation@lists.fusiondirectory.org\n"
-"POT-Creation-Date: 2015-03-19 21:45+0100\n"
-"PO-Revision-Date: 2015-02-25 15:39+0000\n"
+"POT-Creation-Date: 2014-12-15 17:47+0100\n"
+"PO-Revision-Date: 2014-12-15 16:47+0000\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>\n"
-"Language-Team: Latvian (http://www.transifex.com/projects/p/FusionDirectory-108/language/lv/)\n"
+"Language-Team: Latvian (http://www.transifex.com/projects/p/FusionDirectory-109/language/lv/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -45,7 +45,6 @@ msgstr ""
 #: addons/addressbook/class_addressbook.inc:472
 #: addons/addressbook/class_addressbook.inc:476
 #: addons/addressbook/class_addressbook.inc:598
-#: addons/addressbook/dial.tpl.c:5
 msgid "Dial"
 msgstr ""
 
@@ -84,7 +83,6 @@ msgstr ""
 #: addons/addressbook/class_addressbook.inc:697
 #: addons/addressbook/class_addressbook.inc:707
 #: addons/addressbook/class_addressbook.inc:734
-#: addons/addressbook/address_info.tpl.c:5 addons/addressbook/contents.tpl.c:2
 msgid "Name"
 msgstr ""
 
@@ -113,11 +111,6 @@ msgid "User ID"
 msgstr ""
 
 #: addons/addressbook/class_addressbook.inc:715
-#: addons/addressbook/address_info.tpl.c:20
-#: addons/addressbook/address_info.tpl.c:50
-#: addons/addressbook/contents.tpl.c:5
-#: addons/addressbook/address_edit.tpl.c:26
-#: addons/addressbook/address_edit.tpl.c:56
 msgid "Phone"
 msgstr ""
 
@@ -126,27 +119,19 @@ msgid "Telephone number"
 msgstr ""
 
 #: addons/addressbook/class_addressbook.inc:721
-#: addons/addressbook/contents.tpl.c:8
 msgid "Fax"
 msgstr ""
 
 #: addons/addressbook/class_addressbook.inc:724
-#: addons/addressbook/address_info.tpl.c:23
-#: addons/addressbook/contents.tpl.c:11
-#: addons/addressbook/address_edit.tpl.c:29
 msgid "Mobile"
 msgstr ""
 
 #: addons/addressbook/class_addressbook.inc:727
 #: addons/addressbook/class_addressbook.inc:866
-#: addons/addressbook/address_info.tpl.c:56
-#: addons/addressbook/address_edit.tpl.c:62
 msgid "Pager"
 msgstr ""
 
 #: addons/addressbook/class_addressbook.inc:739
-#: addons/addressbook/address_info.tpl.c:26
-#: addons/addressbook/address_edit.tpl.c:32
 msgid "Email"
 msgstr ""
 
@@ -197,8 +182,6 @@ msgid "Organization"
 msgstr ""
 
 #: addons/addressbook/class_addressbook.inc:868
-#: addons/addressbook/address_info.tpl.c:35
-#: addons/addressbook/address_edit.tpl.c:41
 msgid "Department"
 msgstr ""
 
@@ -216,8 +199,6 @@ msgid "State"
 msgstr ""
 
 #: addons/addressbook/class_addressbook.inc:873
-#: addons/addressbook/address_info.tpl.c:8
-#: addons/addressbook/address_edit.tpl.c:14
 msgid "Initials"
 msgstr ""
 
@@ -240,161 +221,3 @@ msgstr ""
 #: html/getvcard.php:39
 msgid "Missing parameters!"
 msgstr ""
-
-#: addons/addressbook/address_info.tpl.c:2
-#: addons/addressbook/address_edit.tpl.c:5
-msgid "Personal"
-msgstr ""
-
-#: addons/addressbook/address_info.tpl.c:11
-#: addons/addressbook/address_edit.tpl.c:17
-msgid "Personal title"
-msgstr ""
-
-#: addons/addressbook/address_info.tpl.c:14
-#: addons/addressbook/contents.tpl.c:14
-#: addons/addressbook/address_edit.tpl.c:20
-msgid "Private"
-msgstr ""
-
-#: addons/addressbook/address_info.tpl.c:17
-#: addons/addressbook/address_info.tpl.c:47
-#: addons/addressbook/address_edit.tpl.c:23
-#: addons/addressbook/address_edit.tpl.c:53
-msgid "Address"
-msgstr ""
-
-#: addons/addressbook/address_info.tpl.c:29
-#: addons/addressbook/address_edit.tpl.c:35
-msgid "Organizational"
-msgstr ""
-
-#: addons/addressbook/address_info.tpl.c:32
-#: addons/addressbook/address_edit.tpl.c:38
-msgid "Company"
-msgstr ""
-
-#: addons/addressbook/address_info.tpl.c:38
-#: addons/addressbook/address_edit.tpl.c:44
-msgid "City"
-msgstr ""
-
-#: addons/addressbook/address_info.tpl.c:41
-#: addons/addressbook/address_edit.tpl.c:47
-msgid "Postal code"
-msgstr ""
-
-#: addons/addressbook/address_info.tpl.c:44
-#: addons/addressbook/address_edit.tpl.c:50
-msgid "Country"
-msgstr ""
-
-#: addons/addressbook/address_info.tpl.c:53
-#: addons/addressbook/address_edit.tpl.c:59
-msgid "FAX"
-msgstr ""
-
-#: addons/addressbook/dial.tpl.c:2
-msgid "Dial connection..."
-msgstr ""
-
-#: addons/addressbook/contents.tpl.c:17
-msgid "Contact"
-msgstr ""
-
-#: addons/addressbook/contents.tpl.c:20
-msgid "Information"
-msgstr ""
-
-#: addons/addressbook/contents.tpl.c:23
-msgid ""
-"The telephone list plugin provides list and search facilities for the people in your site. You may want to specify the asterisk [*] like in\n"
-"'Fu*ry' to find 'FusionDirectory'. Use the filters below to narrow down your search."
-msgstr ""
-
-#: addons/addressbook/contents.tpl.c:26
-msgid "Actions"
-msgstr ""
-
-#: addons/addressbook/contents.tpl.c:29
-msgid "Add entry"
-msgstr ""
-
-#: addons/addressbook/contents.tpl.c:32
-msgid "Edit entry"
-msgstr ""
-
-#: addons/addressbook/contents.tpl.c:35
-msgid "Remove entry"
-msgstr ""
-
-#: addons/addressbook/contents.tpl.c:38
-msgid "Filters"
-msgstr ""
-
-#: addons/addressbook/contents.tpl.c:41
-msgid "Select to see regular users"
-msgstr ""
-
-#: addons/addressbook/contents.tpl.c:44
-msgid "Show organizational entries"
-msgstr ""
-
-#: addons/addressbook/contents.tpl.c:47
-msgid "Select to see users in addressbook"
-msgstr ""
-
-#: addons/addressbook/contents.tpl.c:50
-msgid "Show addressbook entries"
-msgstr ""
-
-#: addons/addressbook/contents.tpl.c:53
-msgid "Display results for department"
-msgstr ""
-
-#: addons/addressbook/contents.tpl.c:56
-msgid "Choose the department the search will be based on"
-msgstr ""
-
-#: addons/addressbook/contents.tpl.c:59
-msgid "Match object"
-msgstr ""
-
-#: addons/addressbook/contents.tpl.c:62
-msgid "Choose the object that will be searched in"
-msgstr ""
-
-#: addons/addressbook/contents.tpl.c:65
-msgid "Search for"
-msgstr ""
-
-#: addons/addressbook/contents.tpl.c:68
-msgid "Search string"
-msgstr ""
-
-#: addons/addressbook/remove.tpl.c:2
-msgid "Warning"
-msgstr ""
-
-#: addons/addressbook/remove.tpl.c:5
-msgid ""
-"This includes all addressbook data in this entry. Please double check if "
-"your really want to do this since there is no way for FusionDirectory to get"
-" your data back."
-msgstr ""
-
-#: addons/addressbook/remove.tpl.c:8
-msgid "So - if you're sure - press 'Delete' to continue or 'Cancel' to abort."
-msgstr ""
-
-#: addons/addressbook/address_edit.tpl.c:2
-msgid "Choose the department to store entry in"
-msgstr ""
-
-#: addons/addressbook/address_edit.tpl.c:8
-msgid "Last name"
-msgstr ""
-
-#: addons/addressbook/address_edit.tpl.c:11
-msgid "First name"
-msgstr ""
diff --git a/addressbook/locale/nb/fusiondirectory.po b/addressbook/locale/nb/fusiondirectory.po
index 4181856415c981aad58700772d6b477f37838fc0..ddef081b2bad42778a25736309f885c62f3a5fb0 100644
--- a/addressbook/locale/nb/fusiondirectory.po
+++ b/addressbook/locale/nb/fusiondirectory.po
@@ -5,12 +5,12 @@
 # Translators:
 msgid ""
 msgstr ""
-"Project-Id-Version: FusionDirectory-108\n"
+"Project-Id-Version: FusionDirectory-109\n"
 "Report-Msgid-Bugs-To: documentation@lists.fusiondirectory.org\n"
-"POT-Creation-Date: 2015-03-19 21:45+0100\n"
-"PO-Revision-Date: 2015-02-25 16:12+0000\n"
+"POT-Creation-Date: 2014-12-15 17:47+0100\n"
+"PO-Revision-Date: 2015-02-25 16:04+0000\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>\n"
-"Language-Team: Norwegian BokmÃ¥l (http://www.transifex.com/projects/p/FusionDirectory-108/language/nb/)\n"
+"Language-Team: Norwegian BokmÃ¥l (http://www.transifex.com/projects/p/FusionDirectory-109/language/nb/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -45,7 +45,6 @@ msgstr ""
 #: addons/addressbook/class_addressbook.inc:472
 #: addons/addressbook/class_addressbook.inc:476
 #: addons/addressbook/class_addressbook.inc:598
-#: addons/addressbook/dial.tpl.c:5
 msgid "Dial"
 msgstr ""
 
@@ -84,7 +83,6 @@ msgstr ""
 #: addons/addressbook/class_addressbook.inc:697
 #: addons/addressbook/class_addressbook.inc:707
 #: addons/addressbook/class_addressbook.inc:734
-#: addons/addressbook/address_info.tpl.c:5 addons/addressbook/contents.tpl.c:2
 msgid "Name"
 msgstr "Navn"
 
@@ -113,11 +111,6 @@ msgid "User ID"
 msgstr ""
 
 #: addons/addressbook/class_addressbook.inc:715
-#: addons/addressbook/address_info.tpl.c:20
-#: addons/addressbook/address_info.tpl.c:50
-#: addons/addressbook/contents.tpl.c:5
-#: addons/addressbook/address_edit.tpl.c:26
-#: addons/addressbook/address_edit.tpl.c:56
 msgid "Phone"
 msgstr ""
 
@@ -126,27 +119,19 @@ msgid "Telephone number"
 msgstr ""
 
 #: addons/addressbook/class_addressbook.inc:721
-#: addons/addressbook/contents.tpl.c:8
 msgid "Fax"
 msgstr ""
 
 #: addons/addressbook/class_addressbook.inc:724
-#: addons/addressbook/address_info.tpl.c:23
-#: addons/addressbook/contents.tpl.c:11
-#: addons/addressbook/address_edit.tpl.c:29
 msgid "Mobile"
 msgstr ""
 
 #: addons/addressbook/class_addressbook.inc:727
 #: addons/addressbook/class_addressbook.inc:866
-#: addons/addressbook/address_info.tpl.c:56
-#: addons/addressbook/address_edit.tpl.c:62
 msgid "Pager"
 msgstr ""
 
 #: addons/addressbook/class_addressbook.inc:739
-#: addons/addressbook/address_info.tpl.c:26
-#: addons/addressbook/address_edit.tpl.c:32
 msgid "Email"
 msgstr ""
 
@@ -197,8 +182,6 @@ msgid "Organization"
 msgstr ""
 
 #: addons/addressbook/class_addressbook.inc:868
-#: addons/addressbook/address_info.tpl.c:35
-#: addons/addressbook/address_edit.tpl.c:41
 msgid "Department"
 msgstr ""
 
@@ -216,8 +199,6 @@ msgid "State"
 msgstr ""
 
 #: addons/addressbook/class_addressbook.inc:873
-#: addons/addressbook/address_info.tpl.c:8
-#: addons/addressbook/address_edit.tpl.c:14
 msgid "Initials"
 msgstr ""
 
@@ -240,161 +221,3 @@ msgstr ""
 #: html/getvcard.php:39
 msgid "Missing parameters!"
 msgstr ""
-
-#: addons/addressbook/address_info.tpl.c:2
-#: addons/addressbook/address_edit.tpl.c:5
-msgid "Personal"
-msgstr ""
-
-#: addons/addressbook/address_info.tpl.c:11
-#: addons/addressbook/address_edit.tpl.c:17
-msgid "Personal title"
-msgstr ""
-
-#: addons/addressbook/address_info.tpl.c:14
-#: addons/addressbook/contents.tpl.c:14
-#: addons/addressbook/address_edit.tpl.c:20
-msgid "Private"
-msgstr ""
-
-#: addons/addressbook/address_info.tpl.c:17
-#: addons/addressbook/address_info.tpl.c:47
-#: addons/addressbook/address_edit.tpl.c:23
-#: addons/addressbook/address_edit.tpl.c:53
-msgid "Address"
-msgstr ""
-
-#: addons/addressbook/address_info.tpl.c:29
-#: addons/addressbook/address_edit.tpl.c:35
-msgid "Organizational"
-msgstr ""
-
-#: addons/addressbook/address_info.tpl.c:32
-#: addons/addressbook/address_edit.tpl.c:38
-msgid "Company"
-msgstr ""
-
-#: addons/addressbook/address_info.tpl.c:38
-#: addons/addressbook/address_edit.tpl.c:44
-msgid "City"
-msgstr ""
-
-#: addons/addressbook/address_info.tpl.c:41
-#: addons/addressbook/address_edit.tpl.c:47
-msgid "Postal code"
-msgstr ""
-
-#: addons/addressbook/address_info.tpl.c:44
-#: addons/addressbook/address_edit.tpl.c:50
-msgid "Country"
-msgstr ""
-
-#: addons/addressbook/address_info.tpl.c:53
-#: addons/addressbook/address_edit.tpl.c:59
-msgid "FAX"
-msgstr ""
-
-#: addons/addressbook/dial.tpl.c:2
-msgid "Dial connection..."
-msgstr ""
-
-#: addons/addressbook/contents.tpl.c:17
-msgid "Contact"
-msgstr ""
-
-#: addons/addressbook/contents.tpl.c:20
-msgid "Information"
-msgstr ""
-
-#: addons/addressbook/contents.tpl.c:23
-msgid ""
-"The telephone list plugin provides list and search facilities for the people in your site. You may want to specify the asterisk [*] like in\n"
-"'Fu*ry' to find 'FusionDirectory'. Use the filters below to narrow down your search."
-msgstr ""
-
-#: addons/addressbook/contents.tpl.c:26
-msgid "Actions"
-msgstr ""
-
-#: addons/addressbook/contents.tpl.c:29
-msgid "Add entry"
-msgstr ""
-
-#: addons/addressbook/contents.tpl.c:32
-msgid "Edit entry"
-msgstr ""
-
-#: addons/addressbook/contents.tpl.c:35
-msgid "Remove entry"
-msgstr ""
-
-#: addons/addressbook/contents.tpl.c:38
-msgid "Filters"
-msgstr "Filter"
-
-#: addons/addressbook/contents.tpl.c:41
-msgid "Select to see regular users"
-msgstr ""
-
-#: addons/addressbook/contents.tpl.c:44
-msgid "Show organizational entries"
-msgstr ""
-
-#: addons/addressbook/contents.tpl.c:47
-msgid "Select to see users in addressbook"
-msgstr ""
-
-#: addons/addressbook/contents.tpl.c:50
-msgid "Show addressbook entries"
-msgstr ""
-
-#: addons/addressbook/contents.tpl.c:53
-msgid "Display results for department"
-msgstr ""
-
-#: addons/addressbook/contents.tpl.c:56
-msgid "Choose the department the search will be based on"
-msgstr ""
-
-#: addons/addressbook/contents.tpl.c:59
-msgid "Match object"
-msgstr ""
-
-#: addons/addressbook/contents.tpl.c:62
-msgid "Choose the object that will be searched in"
-msgstr ""
-
-#: addons/addressbook/contents.tpl.c:65
-msgid "Search for"
-msgstr ""
-
-#: addons/addressbook/contents.tpl.c:68
-msgid "Search string"
-msgstr ""
-
-#: addons/addressbook/remove.tpl.c:2
-msgid "Warning"
-msgstr ""
-
-#: addons/addressbook/remove.tpl.c:5
-msgid ""
-"This includes all addressbook data in this entry. Please double check if "
-"your really want to do this since there is no way for FusionDirectory to get"
-" your data back."
-msgstr ""
-
-#: addons/addressbook/remove.tpl.c:8
-msgid "So - if you're sure - press 'Delete' to continue or 'Cancel' to abort."
-msgstr ""
-
-#: addons/addressbook/address_edit.tpl.c:2
-msgid "Choose the department to store entry in"
-msgstr ""
-
-#: addons/addressbook/address_edit.tpl.c:8
-msgid "Last name"
-msgstr ""
-
-#: addons/addressbook/address_edit.tpl.c:11
-msgid "First name"
-msgstr ""
diff --git a/addressbook/locale/nl/fusiondirectory.po b/addressbook/locale/nl/fusiondirectory.po
index 5644f2a54069a773afca3a78b48c86bcde21232b..68e313fa3a0c56eb65540bf9d9a530a90bc5ab5b 100644
--- a/addressbook/locale/nl/fusiondirectory.po
+++ b/addressbook/locale/nl/fusiondirectory.po
@@ -3,17 +3,14 @@
 # This file is distributed under the same license as the PACKAGE package.
 # 
 # Translators:
-# Kenny Tordeurs <tordeurskenny@gmail.com>, 2012
-#  Niels Klomp (CareWorks ICT Services) <nk@careworks.nl>, 2005-2008
-# Kenny Tordeurs <tordeurskenny@gmail.com>, 2012
 msgid ""
 msgstr ""
-"Project-Id-Version: FusionDirectory-108\n"
+"Project-Id-Version: FusionDirectory-109\n"
 "Report-Msgid-Bugs-To: documentation@lists.fusiondirectory.org\n"
-"POT-Creation-Date: 2015-03-19 21:45+0100\n"
-"PO-Revision-Date: 2015-02-25 16:12+0000\n"
+"POT-Creation-Date: 2014-12-15 17:47+0100\n"
+"PO-Revision-Date: 2015-02-25 16:04+0000\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>\n"
-"Language-Team: Dutch (http://www.transifex.com/projects/p/FusionDirectory-108/language/nl/)\n"
+"Language-Team: Dutch (http://www.transifex.com/projects/p/FusionDirectory-109/language/nl/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -42,13 +39,12 @@ msgstr "LDAP fout"
 #: addons/addressbook/class_addressbook.inc:235
 #: addons/addressbook/class_addressbook.inc:343
 msgid "Permission"
-msgstr "Rechten"
+msgstr "Recht"
 
 #: addons/addressbook/class_addressbook.inc:465
 #: addons/addressbook/class_addressbook.inc:472
 #: addons/addressbook/class_addressbook.inc:476
 #: addons/addressbook/class_addressbook.inc:598
-#: addons/addressbook/dial.tpl.c:5
 msgid "Dial"
 msgstr "Kies"
 
@@ -87,7 +83,6 @@ msgstr "Alle"
 #: addons/addressbook/class_addressbook.inc:697
 #: addons/addressbook/class_addressbook.inc:707
 #: addons/addressbook/class_addressbook.inc:734
-#: addons/addressbook/address_info.tpl.c:5 addons/addressbook/contents.tpl.c:2
 msgid "Name"
 msgstr "Naam"
 
@@ -109,18 +104,13 @@ msgstr "GSM"
 
 #: addons/addressbook/class_addressbook.inc:660
 msgid "Home phone"
-msgstr "Telefoon privÃ©"
+msgstr "Telefoon PrivÃ©"
 
 #: addons/addressbook/class_addressbook.inc:660
 msgid "User ID"
 msgstr "Gebruikers ID"
 
 #: addons/addressbook/class_addressbook.inc:715
-#: addons/addressbook/address_info.tpl.c:20
-#: addons/addressbook/address_info.tpl.c:50
-#: addons/addressbook/contents.tpl.c:5
-#: addons/addressbook/address_edit.tpl.c:26
-#: addons/addressbook/address_edit.tpl.c:56
 msgid "Phone"
 msgstr "Telefoon"
 
@@ -129,27 +119,19 @@ msgid "Telephone number"
 msgstr "Telefoonnummer"
 
 #: addons/addressbook/class_addressbook.inc:721
-#: addons/addressbook/contents.tpl.c:8
 msgid "Fax"
 msgstr "Fax"
 
 #: addons/addressbook/class_addressbook.inc:724
-#: addons/addressbook/address_info.tpl.c:23
-#: addons/addressbook/contents.tpl.c:11
-#: addons/addressbook/address_edit.tpl.c:29
 msgid "Mobile"
 msgstr "GSM"
 
 #: addons/addressbook/class_addressbook.inc:727
 #: addons/addressbook/class_addressbook.inc:866
-#: addons/addressbook/address_info.tpl.c:56
-#: addons/addressbook/address_edit.tpl.c:62
 msgid "Pager"
 msgstr "Pieper"
 
 #: addons/addressbook/class_addressbook.inc:739
-#: addons/addressbook/address_info.tpl.c:26
-#: addons/addressbook/address_edit.tpl.c:32
 msgid "Email"
 msgstr "E-mail"
 
@@ -173,11 +155,11 @@ msgstr "Achternaam"
 
 #: addons/addressbook/class_addressbook.inc:860
 msgid "Telefon number"
-msgstr "Telefoonnummer"
+msgstr "Telefoon nummer"
 
 #: addons/addressbook/class_addressbook.inc:861
 msgid "Fax number"
-msgstr "FAX nummer"
+msgstr "Fax nummer"
 
 #: addons/addressbook/class_addressbook.inc:862
 msgid "Mobile number"
@@ -200,8 +182,6 @@ msgid "Organization"
 msgstr "Organisatie"
 
 #: addons/addressbook/class_addressbook.inc:868
-#: addons/addressbook/address_info.tpl.c:35
-#: addons/addressbook/address_edit.tpl.c:41
 msgid "Department"
 msgstr "Afdeling"
 
@@ -219,8 +199,6 @@ msgid "State"
 msgstr "Provincie"
 
 #: addons/addressbook/class_addressbook.inc:873
-#: addons/addressbook/address_info.tpl.c:8
-#: addons/addressbook/address_edit.tpl.c:14
 msgid "Initials"
 msgstr "Initialen"
 
@@ -234,170 +212,12 @@ msgstr "Postadres thuis"
 
 #: addons/addressbook/class_addressbook.inc:876
 msgid "Common name"
-msgstr "Algemene naam"
+msgstr "Naam"
 
 #: html/getvcard.php:39
 msgid "Internal error"
-msgstr "Interne fout"
+msgstr "Interne error"
 
 #: html/getvcard.php:39
 msgid "Missing parameters!"
 msgstr "Ontbrekende parameters!"
-
-#: addons/addressbook/address_info.tpl.c:2
-#: addons/addressbook/address_edit.tpl.c:5
-msgid "Personal"
-msgstr "Persoonlijk"
-
-#: addons/addressbook/address_info.tpl.c:11
-#: addons/addressbook/address_edit.tpl.c:17
-msgid "Personal title"
-msgstr "Aanhef"
-
-#: addons/addressbook/address_info.tpl.c:14
-#: addons/addressbook/contents.tpl.c:14
-#: addons/addressbook/address_edit.tpl.c:20
-msgid "Private"
-msgstr "PrivÃ©"
-
-#: addons/addressbook/address_info.tpl.c:17
-#: addons/addressbook/address_info.tpl.c:47
-#: addons/addressbook/address_edit.tpl.c:23
-#: addons/addressbook/address_edit.tpl.c:53
-msgid "Address"
-msgstr "Adres"
-
-#: addons/addressbook/address_info.tpl.c:29
-#: addons/addressbook/address_edit.tpl.c:35
-msgid "Organizational"
-msgstr "Bedrijfsmatig"
-
-#: addons/addressbook/address_info.tpl.c:32
-#: addons/addressbook/address_edit.tpl.c:38
-msgid "Company"
-msgstr "Bedrijf"
-
-#: addons/addressbook/address_info.tpl.c:38
-#: addons/addressbook/address_edit.tpl.c:44
-msgid "City"
-msgstr "Plaats"
-
-#: addons/addressbook/address_info.tpl.c:41
-#: addons/addressbook/address_edit.tpl.c:47
-msgid "Postal code"
-msgstr "Postcode"
-
-#: addons/addressbook/address_info.tpl.c:44
-#: addons/addressbook/address_edit.tpl.c:50
-msgid "Country"
-msgstr "Land"
-
-#: addons/addressbook/address_info.tpl.c:53
-#: addons/addressbook/address_edit.tpl.c:59
-msgid "FAX"
-msgstr "Fax"
-
-#: addons/addressbook/dial.tpl.c:2
-msgid "Dial connection..."
-msgstr "Bel..."
-
-#: addons/addressbook/contents.tpl.c:17
-msgid "Contact"
-msgstr "Contact"
-
-#: addons/addressbook/contents.tpl.c:20
-msgid "Information"
-msgstr "Informatie"
-
-#: addons/addressbook/contents.tpl.c:23
-msgid ""
-"The telephone list plugin provides list and search facilities for the people in your site. You may want to specify the asterisk [*] like in\n"
-"'Fu*ry' to find 'FusionDirectory'. Use the filters below to narrow down your search."
-msgstr ""
-
-#: addons/addressbook/contents.tpl.c:26
-msgid "Actions"
-msgstr "Acties"
-
-#: addons/addressbook/contents.tpl.c:29
-msgid "Add entry"
-msgstr "Invoer toevoegen"
-
-#: addons/addressbook/contents.tpl.c:32
-msgid "Edit entry"
-msgstr "Invoer bewerken"
-
-#: addons/addressbook/contents.tpl.c:35
-msgid "Remove entry"
-msgstr "Invoer verwijderen"
-
-#: addons/addressbook/contents.tpl.c:38
-msgid "Filters"
-msgstr "Filters"
-
-#: addons/addressbook/contents.tpl.c:41
-msgid "Select to see regular users"
-msgstr "Selecteer om gewone gebruikers te tonen"
-
-#: addons/addressbook/contents.tpl.c:44
-msgid "Show organizational entries"
-msgstr "Toon gebruikers binnen de organisatie"
-
-#: addons/addressbook/contents.tpl.c:47
-msgid "Select to see users in addressbook"
-msgstr "Selecteer om gebruikers in het adresboek te zien"
-
-#: addons/addressbook/contents.tpl.c:50
-msgid "Show addressbook entries"
-msgstr "Toon adresboek regels"
-
-#: addons/addressbook/contents.tpl.c:53
-msgid "Display results for department"
-msgstr "Toon resultaten voor afdeling"
-
-#: addons/addressbook/contents.tpl.c:56
-msgid "Choose the department the search will be based on"
-msgstr "Selecteer de afdeling waarbinnen gezocht zal worden"
-
-#: addons/addressbook/contents.tpl.c:59
-msgid "Match object"
-msgstr "Zoek op"
-
-#: addons/addressbook/contents.tpl.c:62
-msgid "Choose the object that will be searched in"
-msgstr "Selecteer het object waarbinnen gezocht zal worden"
-
-#: addons/addressbook/contents.tpl.c:65
-msgid "Search for"
-msgstr "Zoek naar"
-
-#: addons/addressbook/contents.tpl.c:68
-msgid "Search string"
-msgstr "Zoekstring"
-
-#: addons/addressbook/remove.tpl.c:2
-msgid "Warning"
-msgstr "Waarschuwing"
-
-#: addons/addressbook/remove.tpl.c:5
-msgid ""
-"This includes all addressbook data in this entry. Please double check if "
-"your really want to do this since there is no way for FusionDirectory to get"
-" your data back."
-msgstr "Dit bevat all adresboek data voor deze opgave. Verifieer aub  dubbel of je dit echt wenst te doen want er is geen manier voor FusionDirectory om je data terug te halen"
-
-#: addons/addressbook/remove.tpl.c:8
-msgid "So - if you're sure - press 'Delete' to continue or 'Cancel' to abort."
-msgstr "Indien u zeker bent drukt u dan 'Verwijderen' om door te gaan of 'Annuleren' om te annuleren."
-
-#: addons/addressbook/address_edit.tpl.c:2
-msgid "Choose the department to store entry in"
-msgstr "Selecteer de afdeling waarin de invoer bewaard wordt."
-
-#: addons/addressbook/address_edit.tpl.c:8
-msgid "Last name"
-msgstr "Achternaam"
-
-#: addons/addressbook/address_edit.tpl.c:11
-msgid "First name"
-msgstr "Voornaam"
diff --git a/addressbook/locale/pl/fusiondirectory.po b/addressbook/locale/pl/fusiondirectory.po
index 9c0480968262cb081c490007cb1f6a1b59500bea..e9dad793e5390d94d1daac3ed6fb85ef55cda35b 100644
--- a/addressbook/locale/pl/fusiondirectory.po
+++ b/addressbook/locale/pl/fusiondirectory.po
@@ -5,12 +5,12 @@
 # Translators:
 msgid ""
 msgstr ""
-"Project-Id-Version: FusionDirectory-108\n"
+"Project-Id-Version: FusionDirectory-109\n"
 "Report-Msgid-Bugs-To: documentation@lists.fusiondirectory.org\n"
-"POT-Creation-Date: 2015-03-19 21:45+0100\n"
-"PO-Revision-Date: 2015-02-25 16:12+0000\n"
+"POT-Creation-Date: 2014-12-15 17:47+0100\n"
+"PO-Revision-Date: 2015-02-25 16:04+0000\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>\n"
-"Language-Team: Polish (http://www.transifex.com/projects/p/FusionDirectory-108/language/pl/)\n"
+"Language-Team: Polish (http://www.transifex.com/projects/p/FusionDirectory-109/language/pl/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -45,7 +45,6 @@ msgstr "Uprawnienie"
 #: addons/addressbook/class_addressbook.inc:472
 #: addons/addressbook/class_addressbook.inc:476
 #: addons/addressbook/class_addressbook.inc:598
-#: addons/addressbook/dial.tpl.c:5
 msgid "Dial"
 msgstr "Dzwonienie"
 
@@ -84,7 +83,6 @@ msgstr "Wszystkie"
 #: addons/addressbook/class_addressbook.inc:697
 #: addons/addressbook/class_addressbook.inc:707
 #: addons/addressbook/class_addressbook.inc:734
-#: addons/addressbook/address_info.tpl.c:5 addons/addressbook/contents.tpl.c:2
 msgid "Name"
 msgstr "ImiÄ™"
 
@@ -113,11 +111,6 @@ msgid "User ID"
 msgstr "Identyfikator uÅ¼ytkownika"
 
 #: addons/addressbook/class_addressbook.inc:715
-#: addons/addressbook/address_info.tpl.c:20
-#: addons/addressbook/address_info.tpl.c:50
-#: addons/addressbook/contents.tpl.c:5
-#: addons/addressbook/address_edit.tpl.c:26
-#: addons/addressbook/address_edit.tpl.c:56
 msgid "Phone"
 msgstr "Telefon"
 
@@ -126,27 +119,19 @@ msgid "Telephone number"
 msgstr "Numer telefonu"
 
 #: addons/addressbook/class_addressbook.inc:721
-#: addons/addressbook/contents.tpl.c:8
 msgid "Fax"
 msgstr "Fax"
 
 #: addons/addressbook/class_addressbook.inc:724
-#: addons/addressbook/address_info.tpl.c:23
-#: addons/addressbook/contents.tpl.c:11
-#: addons/addressbook/address_edit.tpl.c:29
 msgid "Mobile"
 msgstr "KomÃ³rka"
 
 #: addons/addressbook/class_addressbook.inc:727
 #: addons/addressbook/class_addressbook.inc:866
-#: addons/addressbook/address_info.tpl.c:56
-#: addons/addressbook/address_edit.tpl.c:62
 msgid "Pager"
 msgstr "Pager"
 
 #: addons/addressbook/class_addressbook.inc:739
-#: addons/addressbook/address_info.tpl.c:26
-#: addons/addressbook/address_edit.tpl.c:32
 msgid "Email"
 msgstr "Email"
 
@@ -197,8 +182,6 @@ msgid "Organization"
 msgstr "Organizacja"
 
 #: addons/addressbook/class_addressbook.inc:868
-#: addons/addressbook/address_info.tpl.c:35
-#: addons/addressbook/address_edit.tpl.c:41
 msgid "Department"
 msgstr "Departament"
 
@@ -216,8 +199,6 @@ msgid "State"
 msgstr "Stan"
 
 #: addons/addressbook/class_addressbook.inc:873
-#: addons/addressbook/address_info.tpl.c:8
-#: addons/addressbook/address_edit.tpl.c:14
 msgid "Initials"
 msgstr "InicjaÅ‚y"
 
@@ -240,161 +221,3 @@ msgstr "BÅ‚Ä…d wewnÄ™trzny"
 #: html/getvcard.php:39
 msgid "Missing parameters!"
 msgstr "Brak parametrÃ³w!"
-
-#: addons/addressbook/address_info.tpl.c:2
-#: addons/addressbook/address_edit.tpl.c:5
-msgid "Personal"
-msgstr "Osobiste"
-
-#: addons/addressbook/address_info.tpl.c:11
-#: addons/addressbook/address_edit.tpl.c:17
-msgid "Personal title"
-msgstr "Osobisty tytuÅ‚"
-
-#: addons/addressbook/address_info.tpl.c:14
-#: addons/addressbook/contents.tpl.c:14
-#: addons/addressbook/address_edit.tpl.c:20
-msgid "Private"
-msgstr "Prywatne"
-
-#: addons/addressbook/address_info.tpl.c:17
-#: addons/addressbook/address_info.tpl.c:47
-#: addons/addressbook/address_edit.tpl.c:23
-#: addons/addressbook/address_edit.tpl.c:53
-msgid "Address"
-msgstr "Adres"
-
-#: addons/addressbook/address_info.tpl.c:29
-#: addons/addressbook/address_edit.tpl.c:35
-msgid "Organizational"
-msgstr "Organizacyjne"
-
-#: addons/addressbook/address_info.tpl.c:32
-#: addons/addressbook/address_edit.tpl.c:38
-msgid "Company"
-msgstr "Firma"
-
-#: addons/addressbook/address_info.tpl.c:38
-#: addons/addressbook/address_edit.tpl.c:44
-msgid "City"
-msgstr "Miasto"
-
-#: addons/addressbook/address_info.tpl.c:41
-#: addons/addressbook/address_edit.tpl.c:47
-msgid "Postal code"
-msgstr "Kod pocztowy"
-
-#: addons/addressbook/address_info.tpl.c:44
-#: addons/addressbook/address_edit.tpl.c:50
-msgid "Country"
-msgstr "Kraj"
-
-#: addons/addressbook/address_info.tpl.c:53
-#: addons/addressbook/address_edit.tpl.c:59
-msgid "FAX"
-msgstr "FAX"
-
-#: addons/addressbook/dial.tpl.c:2
-msgid "Dial connection..."
-msgstr "PoÅ‚Ä…czenie dzwonienia..."
-
-#: addons/addressbook/contents.tpl.c:17
-msgid "Contact"
-msgstr "Kontakt"
-
-#: addons/addressbook/contents.tpl.c:20
-msgid "Information"
-msgstr "Informacja"
-
-#: addons/addressbook/contents.tpl.c:23
-msgid ""
-"The telephone list plugin provides list and search facilities for the people in your site. You may want to specify the asterisk [*] like in\n"
-"'Fu*ry' to find 'FusionDirectory'. Use the filters below to narrow down your search."
-msgstr ""
-
-#: addons/addressbook/contents.tpl.c:26
-msgid "Actions"
-msgstr "Akcje"
-
-#: addons/addressbook/contents.tpl.c:29
-msgid "Add entry"
-msgstr "Dodaj pozycjÄ™"
-
-#: addons/addressbook/contents.tpl.c:32
-msgid "Edit entry"
-msgstr "Edycja pozycji"
-
-#: addons/addressbook/contents.tpl.c:35
-msgid "Remove entry"
-msgstr "UsuÅ„ pozycjÄ™"
-
-#: addons/addressbook/contents.tpl.c:38
-msgid "Filters"
-msgstr "Filtry"
-
-#: addons/addressbook/contents.tpl.c:41
-msgid "Select to see regular users"
-msgstr "Wybierz aby zobaczyÄ‡ zwykÅ‚ych uÅ¼ytkownikÃ³w"
-
-#: addons/addressbook/contents.tpl.c:44
-msgid "Show organizational entries"
-msgstr "PokaÅ¼ elementy organizacyjne"
-
-#: addons/addressbook/contents.tpl.c:47
-msgid "Select to see users in addressbook"
-msgstr "Wybierz aby zobaczyÄ‡ uÅ¼ytkownikÃ³w w ksiÄ…Å¼ce adresowej"
-
-#: addons/addressbook/contents.tpl.c:50
-msgid "Show addressbook entries"
-msgstr "PokaÅ¼ elementy ksiÄ…Å¼ki adresowej"
-
-#: addons/addressbook/contents.tpl.c:53
-msgid "Display results for department"
-msgstr "WyÅ›wietl wyniki dla departamentu"
-
-#: addons/addressbook/contents.tpl.c:56
-msgid "Choose the department the search will be based on"
-msgstr "Wybierz departament na ktÃ³rym wyszukiwanie bÄ™dzie bazowaÄ‡"
-
-#: addons/addressbook/contents.tpl.c:59
-msgid "Match object"
-msgstr "Dopasuj obiekt"
-
-#: addons/addressbook/contents.tpl.c:62
-msgid "Choose the object that will be searched in"
-msgstr "Wybierz obiekt w ktÃ³rym bÄ™dziesz przeszukiwaÄ‡"
-
-#: addons/addressbook/contents.tpl.c:65
-msgid "Search for"
-msgstr "Szukaj dla"
-
-#: addons/addressbook/contents.tpl.c:68
-msgid "Search string"
-msgstr "Poszukiwany napis"
-
-#: addons/addressbook/remove.tpl.c:2
-msgid "Warning"
-msgstr "OstrzeÅ¼enie"
-
-#: addons/addressbook/remove.tpl.c:5
-msgid ""
-"This includes all addressbook data in this entry. Please double check if "
-"your really want to do this since there is no way for FusionDirectory to get"
-" your data back."
-msgstr ""
-
-#: addons/addressbook/remove.tpl.c:8
-msgid "So - if you're sure - press 'Delete' to continue or 'Cancel' to abort."
-msgstr "JeÅ›li jesteÅ› pewien - naciÅ›nij 'UsuÅ„' aby kontynuowaÄ‡ lub 'Anuluj' aby anulowaÄ‡."
-
-#: addons/addressbook/address_edit.tpl.c:2
-msgid "Choose the department to store entry in"
-msgstr "Wybierz departament do przechowania wpisu"
-
-#: addons/addressbook/address_edit.tpl.c:8
-msgid "Last name"
-msgstr "Nazwisko"
-
-#: addons/addressbook/address_edit.tpl.c:11
-msgid "First name"
-msgstr "ImiÄ™"
diff --git a/addressbook/locale/pt/fusiondirectory.po b/addressbook/locale/pt/fusiondirectory.po
index 69a2db6d0b9bc3f26a804468996f225b61a9dc2a..1e02f3dcc08c334a8907adc1cc2b6e727212b654 100644
--- a/addressbook/locale/pt/fusiondirectory.po
+++ b/addressbook/locale/pt/fusiondirectory.po
@@ -5,12 +5,12 @@
 # Translators:
 msgid ""
 msgstr ""
-"Project-Id-Version: FusionDirectory-108\n"
+"Project-Id-Version: FusionDirectory-109\n"
 "Report-Msgid-Bugs-To: documentation@lists.fusiondirectory.org\n"
-"POT-Creation-Date: 2015-03-19 21:45+0100\n"
-"PO-Revision-Date: 2015-02-25 16:12+0000\n"
+"POT-Creation-Date: 2014-12-15 17:47+0100\n"
+"PO-Revision-Date: 2015-02-25 16:04+0000\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>\n"
-"Language-Team: Portuguese (http://www.transifex.com/projects/p/FusionDirectory-108/language/pt/)\n"
+"Language-Team: Portuguese (http://www.transifex.com/projects/p/FusionDirectory-109/language/pt/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -45,7 +45,6 @@ msgstr ""
 #: addons/addressbook/class_addressbook.inc:472
 #: addons/addressbook/class_addressbook.inc:476
 #: addons/addressbook/class_addressbook.inc:598
-#: addons/addressbook/dial.tpl.c:5
 msgid "Dial"
 msgstr ""
 
@@ -84,7 +83,6 @@ msgstr ""
 #: addons/addressbook/class_addressbook.inc:697
 #: addons/addressbook/class_addressbook.inc:707
 #: addons/addressbook/class_addressbook.inc:734
-#: addons/addressbook/address_info.tpl.c:5 addons/addressbook/contents.tpl.c:2
 msgid "Name"
 msgstr "Nome"
 
@@ -113,11 +111,6 @@ msgid "User ID"
 msgstr "ID do usuÃ¡rio"
 
 #: addons/addressbook/class_addressbook.inc:715
-#: addons/addressbook/address_info.tpl.c:20
-#: addons/addressbook/address_info.tpl.c:50
-#: addons/addressbook/contents.tpl.c:5
-#: addons/addressbook/address_edit.tpl.c:26
-#: addons/addressbook/address_edit.tpl.c:56
 msgid "Phone"
 msgstr "Fone"
 
@@ -126,27 +119,19 @@ msgid "Telephone number"
 msgstr ""
 
 #: addons/addressbook/class_addressbook.inc:721
-#: addons/addressbook/contents.tpl.c:8
 msgid "Fax"
 msgstr "Fax"
 
 #: addons/addressbook/class_addressbook.inc:724
-#: addons/addressbook/address_info.tpl.c:23
-#: addons/addressbook/contents.tpl.c:11
-#: addons/addressbook/address_edit.tpl.c:29
 msgid "Mobile"
 msgstr "Celular"
 
 #: addons/addressbook/class_addressbook.inc:727
 #: addons/addressbook/class_addressbook.inc:866
-#: addons/addressbook/address_info.tpl.c:56
-#: addons/addressbook/address_edit.tpl.c:62
 msgid "Pager"
 msgstr "Pager"
 
 #: addons/addressbook/class_addressbook.inc:739
-#: addons/addressbook/address_info.tpl.c:26
-#: addons/addressbook/address_edit.tpl.c:32
 msgid "Email"
 msgstr ""
 
@@ -197,8 +182,6 @@ msgid "Organization"
 msgstr "OrganizaÃ§Ã£o"
 
 #: addons/addressbook/class_addressbook.inc:868
-#: addons/addressbook/address_info.tpl.c:35
-#: addons/addressbook/address_edit.tpl.c:41
 msgid "Department"
 msgstr "Departamento"
 
@@ -216,8 +199,6 @@ msgid "State"
 msgstr "Estado"
 
 #: addons/addressbook/class_addressbook.inc:873
-#: addons/addressbook/address_info.tpl.c:8
-#: addons/addressbook/address_edit.tpl.c:14
 msgid "Initials"
 msgstr ""
 
@@ -240,161 +221,3 @@ msgstr "Erro interno"
 #: html/getvcard.php:39
 msgid "Missing parameters!"
 msgstr ""
-
-#: addons/addressbook/address_info.tpl.c:2
-#: addons/addressbook/address_edit.tpl.c:5
-msgid "Personal"
-msgstr ""
-
-#: addons/addressbook/address_info.tpl.c:11
-#: addons/addressbook/address_edit.tpl.c:17
-msgid "Personal title"
-msgstr "TÃtulo pessoal"
-
-#: addons/addressbook/address_info.tpl.c:14
-#: addons/addressbook/contents.tpl.c:14
-#: addons/addressbook/address_edit.tpl.c:20
-msgid "Private"
-msgstr ""
-
-#: addons/addressbook/address_info.tpl.c:17
-#: addons/addressbook/address_info.tpl.c:47
-#: addons/addressbook/address_edit.tpl.c:23
-#: addons/addressbook/address_edit.tpl.c:53
-msgid "Address"
-msgstr "EndereÃ§o"
-
-#: addons/addressbook/address_info.tpl.c:29
-#: addons/addressbook/address_edit.tpl.c:35
-msgid "Organizational"
-msgstr ""
-
-#: addons/addressbook/address_info.tpl.c:32
-#: addons/addressbook/address_edit.tpl.c:38
-msgid "Company"
-msgstr ""
-
-#: addons/addressbook/address_info.tpl.c:38
-#: addons/addressbook/address_edit.tpl.c:44
-msgid "City"
-msgstr ""
-
-#: addons/addressbook/address_info.tpl.c:41
-#: addons/addressbook/address_edit.tpl.c:47
-msgid "Postal code"
-msgstr "CEP"
-
-#: addons/addressbook/address_info.tpl.c:44
-#: addons/addressbook/address_edit.tpl.c:50
-msgid "Country"
-msgstr "PaÃs"
-
-#: addons/addressbook/address_info.tpl.c:53
-#: addons/addressbook/address_edit.tpl.c:59
-msgid "FAX"
-msgstr "FAX"
-
-#: addons/addressbook/dial.tpl.c:2
-msgid "Dial connection..."
-msgstr ""
-
-#: addons/addressbook/contents.tpl.c:17
-msgid "Contact"
-msgstr ""
-
-#: addons/addressbook/contents.tpl.c:20
-msgid "Information"
-msgstr "InformaÃ§Ã£o"
-
-#: addons/addressbook/contents.tpl.c:23
-msgid ""
-"The telephone list plugin provides list and search facilities for the people in your site. You may want to specify the asterisk [*] like in\n"
-"'Fu*ry' to find 'FusionDirectory'. Use the filters below to narrow down your search."
-msgstr ""
-
-#: addons/addressbook/contents.tpl.c:26
-msgid "Actions"
-msgstr "AÃ§Ãµes"
-
-#: addons/addressbook/contents.tpl.c:29
-msgid "Add entry"
-msgstr ""
-
-#: addons/addressbook/contents.tpl.c:32
-msgid "Edit entry"
-msgstr ""
-
-#: addons/addressbook/contents.tpl.c:35
-msgid "Remove entry"
-msgstr ""
-
-#: addons/addressbook/contents.tpl.c:38
-msgid "Filters"
-msgstr "Filtros"
-
-#: addons/addressbook/contents.tpl.c:41
-msgid "Select to see regular users"
-msgstr ""
-
-#: addons/addressbook/contents.tpl.c:44
-msgid "Show organizational entries"
-msgstr ""
-
-#: addons/addressbook/contents.tpl.c:47
-msgid "Select to see users in addressbook"
-msgstr ""
-
-#: addons/addressbook/contents.tpl.c:50
-msgid "Show addressbook entries"
-msgstr ""
-
-#: addons/addressbook/contents.tpl.c:53
-msgid "Display results for department"
-msgstr ""
-
-#: addons/addressbook/contents.tpl.c:56
-msgid "Choose the department the search will be based on"
-msgstr "Escolha o departamento para base de procura"
-
-#: addons/addressbook/contents.tpl.c:59
-msgid "Match object"
-msgstr ""
-
-#: addons/addressbook/contents.tpl.c:62
-msgid "Choose the object that will be searched in"
-msgstr ""
-
-#: addons/addressbook/contents.tpl.c:65
-msgid "Search for"
-msgstr ""
-
-#: addons/addressbook/contents.tpl.c:68
-msgid "Search string"
-msgstr ""
-
-#: addons/addressbook/remove.tpl.c:2
-msgid "Warning"
-msgstr "AtenÃ§Ã£o"
-
-#: addons/addressbook/remove.tpl.c:5
-msgid ""
-"This includes all addressbook data in this entry. Please double check if "
-"your really want to do this since there is no way for FusionDirectory to get"
-" your data back."
-msgstr ""
-
-#: addons/addressbook/remove.tpl.c:8
-msgid "So - if you're sure - press 'Delete' to continue or 'Cancel' to abort."
-msgstr "EntÃ£o, se vocÃª tem certeza, pressione 'Deletar' para continuar ou 'Cancelar' para abortar."
-
-#: addons/addressbook/address_edit.tpl.c:2
-msgid "Choose the department to store entry in"
-msgstr ""
-
-#: addons/addressbook/address_edit.tpl.c:8
-msgid "Last name"
-msgstr "Ãšltimo nome"
-
-#: addons/addressbook/address_edit.tpl.c:11
-msgid "First name"
-msgstr "Primeiro nome"
diff --git a/addressbook/locale/pt_BR/fusiondirectory.po b/addressbook/locale/pt_BR/fusiondirectory.po
index 597e7834c7d084215111240610f4af692f6d790f..4cacc71ac180a23f233e61790d0794882924be66 100644
--- a/addressbook/locale/pt_BR/fusiondirectory.po
+++ b/addressbook/locale/pt_BR/fusiondirectory.po
@@ -3,17 +3,14 @@
 # This file is distributed under the same license as the PACKAGE package.
 # 
 # Translators:
-# ALEJANDRO BARRIOS <alejandrobarrios@interlegis.leg.br>, 2014
-# kayocarneiro <kayomatheus@gmail.com>, 2014
-# kayocarneiro <kayomatheus@gmail.com>, 2014
 msgid ""
 msgstr ""
-"Project-Id-Version: FusionDirectory-108\n"
+"Project-Id-Version: FusionDirectory-109\n"
 "Report-Msgid-Bugs-To: documentation@lists.fusiondirectory.org\n"
-"POT-Creation-Date: 2015-03-19 21:45+0100\n"
-"PO-Revision-Date: 2015-02-25 16:12+0000\n"
+"POT-Creation-Date: 2014-12-15 17:47+0100\n"
+"PO-Revision-Date: 2015-02-25 16:04+0000\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>\n"
-"Language-Team: Portuguese (Brazil) (http://www.transifex.com/projects/p/FusionDirectory-108/language/pt_BR/)\n"
+"Language-Team: Portuguese (Brazil) (http://www.transifex.com/projects/p/FusionDirectory-109/language/pt_BR/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -48,7 +45,6 @@ msgstr "PermissÃ£o"
 #: addons/addressbook/class_addressbook.inc:472
 #: addons/addressbook/class_addressbook.inc:476
 #: addons/addressbook/class_addressbook.inc:598
-#: addons/addressbook/dial.tpl.c:5
 msgid "Dial"
 msgstr "Discar"
 
@@ -87,7 +83,6 @@ msgstr "Todos"
 #: addons/addressbook/class_addressbook.inc:697
 #: addons/addressbook/class_addressbook.inc:707
 #: addons/addressbook/class_addressbook.inc:734
-#: addons/addressbook/address_info.tpl.c:5 addons/addressbook/contents.tpl.c:2
 msgid "Name"
 msgstr "Nome"
 
@@ -116,11 +111,6 @@ msgid "User ID"
 msgstr "ID de usuÃ¡rio"
 
 #: addons/addressbook/class_addressbook.inc:715
-#: addons/addressbook/address_info.tpl.c:20
-#: addons/addressbook/address_info.tpl.c:50
-#: addons/addressbook/contents.tpl.c:5
-#: addons/addressbook/address_edit.tpl.c:26
-#: addons/addressbook/address_edit.tpl.c:56
 msgid "Phone"
 msgstr "Telefone"
 
@@ -129,27 +119,19 @@ msgid "Telephone number"
 msgstr "NÃºmero de telefone"
 
 #: addons/addressbook/class_addressbook.inc:721
-#: addons/addressbook/contents.tpl.c:8
 msgid "Fax"
 msgstr "Fax"
 
 #: addons/addressbook/class_addressbook.inc:724
-#: addons/addressbook/address_info.tpl.c:23
-#: addons/addressbook/contents.tpl.c:11
-#: addons/addressbook/address_edit.tpl.c:29
 msgid "Mobile"
 msgstr "Celular"
 
 #: addons/addressbook/class_addressbook.inc:727
 #: addons/addressbook/class_addressbook.inc:866
-#: addons/addressbook/address_info.tpl.c:56
-#: addons/addressbook/address_edit.tpl.c:62
 msgid "Pager"
 msgstr "Pager"
 
 #: addons/addressbook/class_addressbook.inc:739
-#: addons/addressbook/address_info.tpl.c:26
-#: addons/addressbook/address_edit.tpl.c:32
 msgid "Email"
 msgstr "Email"
 
@@ -200,8 +182,6 @@ msgid "Organization"
 msgstr "OrganizaÃ§Ã£o"
 
 #: addons/addressbook/class_addressbook.inc:868
-#: addons/addressbook/address_info.tpl.c:35
-#: addons/addressbook/address_edit.tpl.c:41
 msgid "Department"
 msgstr "Departamento"
 
@@ -219,8 +199,6 @@ msgid "State"
 msgstr "Estado"
 
 #: addons/addressbook/class_addressbook.inc:873
-#: addons/addressbook/address_info.tpl.c:8
-#: addons/addressbook/address_edit.tpl.c:14
 msgid "Initials"
 msgstr "Iniciais"
 
@@ -243,161 +221,3 @@ msgstr "Erro interno"
 #: html/getvcard.php:39
 msgid "Missing parameters!"
 msgstr "Faltam parÃ¢metros!"
-
-#: addons/addressbook/address_info.tpl.c:2
-#: addons/addressbook/address_edit.tpl.c:5
-msgid "Personal"
-msgstr "Pessoal"
-
-#: addons/addressbook/address_info.tpl.c:11
-#: addons/addressbook/address_edit.tpl.c:17
-msgid "Personal title"
-msgstr "TÃtulo pessoal"
-
-#: addons/addressbook/address_info.tpl.c:14
-#: addons/addressbook/contents.tpl.c:14
-#: addons/addressbook/address_edit.tpl.c:20
-msgid "Private"
-msgstr "Particular"
-
-#: addons/addressbook/address_info.tpl.c:17
-#: addons/addressbook/address_info.tpl.c:47
-#: addons/addressbook/address_edit.tpl.c:23
-#: addons/addressbook/address_edit.tpl.c:53
-msgid "Address"
-msgstr "EndereÃ§o"
-
-#: addons/addressbook/address_info.tpl.c:29
-#: addons/addressbook/address_edit.tpl.c:35
-msgid "Organizational"
-msgstr "Organizacional"
-
-#: addons/addressbook/address_info.tpl.c:32
-#: addons/addressbook/address_edit.tpl.c:38
-msgid "Company"
-msgstr "Empresa"
-
-#: addons/addressbook/address_info.tpl.c:38
-#: addons/addressbook/address_edit.tpl.c:44
-msgid "City"
-msgstr "Cidade"
-
-#: addons/addressbook/address_info.tpl.c:41
-#: addons/addressbook/address_edit.tpl.c:47
-msgid "Postal code"
-msgstr "CÃ³digo postal"
-
-#: addons/addressbook/address_info.tpl.c:44
-#: addons/addressbook/address_edit.tpl.c:50
-msgid "Country"
-msgstr "PaÃs"
-
-#: addons/addressbook/address_info.tpl.c:53
-#: addons/addressbook/address_edit.tpl.c:59
-msgid "FAX"
-msgstr "FAX"
-
-#: addons/addressbook/dial.tpl.c:2
-msgid "Dial connection..."
-msgstr "Estabelecendo conexÃ£o..."
-
-#: addons/addressbook/contents.tpl.c:17
-msgid "Contact"
-msgstr "Contato"
-
-#: addons/addressbook/contents.tpl.c:20
-msgid "Information"
-msgstr "InformaÃ§Ã£o"
-
-#: addons/addressbook/contents.tpl.c:23
-msgid ""
-"The telephone list plugin provides list and search facilities for the people in your site. You may want to specify the asterisk [*] like in\n"
-"'Fu*ry' to find 'FusionDirectory'. Use the filters below to narrow down your search."
-msgstr ""
-
-#: addons/addressbook/contents.tpl.c:26
-msgid "Actions"
-msgstr "AÃ§Ãµes"
-
-#: addons/addressbook/contents.tpl.c:29
-msgid "Add entry"
-msgstr "Adicionar registro"
-
-#: addons/addressbook/contents.tpl.c:32
-msgid "Edit entry"
-msgstr "Editar registro"
-
-#: addons/addressbook/contents.tpl.c:35
-msgid "Remove entry"
-msgstr "Remover registro"
-
-#: addons/addressbook/contents.tpl.c:38
-msgid "Filters"
-msgstr "Filtros"
-
-#: addons/addressbook/contents.tpl.c:41
-msgid "Select to see regular users"
-msgstr "Selecione para ver usuÃ¡rios comuns"
-
-#: addons/addressbook/contents.tpl.c:44
-msgid "Show organizational entries"
-msgstr "Mostrar registros de organizaÃ§Ãµes"
-
-#: addons/addressbook/contents.tpl.c:47
-msgid "Select to see users in addressbook"
-msgstr "Selecione para ver usuÃ¡rios em Contatos"
-
-#: addons/addressbook/contents.tpl.c:50
-msgid "Show addressbook entries"
-msgstr "Mostrar registros de Contatos"
-
-#: addons/addressbook/contents.tpl.c:53
-msgid "Display results for department"
-msgstr "Mostrar resultados por departamento"
-
-#: addons/addressbook/contents.tpl.c:56
-msgid "Choose the department the search will be based on"
-msgstr "scolha o objeto a ser feita a pesquisa"
-
-#: addons/addressbook/contents.tpl.c:59
-msgid "Match object"
-msgstr "Objeto atual"
-
-#: addons/addressbook/contents.tpl.c:62
-msgid "Choose the object that will be searched in"
-msgstr "Escolha o objeto a ser feita a pesquisa"
-
-#: addons/addressbook/contents.tpl.c:65
-msgid "Search for"
-msgstr "Procurar por"
-
-#: addons/addressbook/contents.tpl.c:68
-msgid "Search string"
-msgstr "Procurar palavra"
-
-#: addons/addressbook/remove.tpl.c:2
-msgid "Warning"
-msgstr "Aviso"
-
-#: addons/addressbook/remove.tpl.c:5
-msgid ""
-"This includes all addressbook data in this entry. 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 todos os dados de contatos neste registro. Por favor, clique duas vezes para confirmar. O FusionDirectory nÃ£o poderÃ¡ desfazer esta aÃ§Ã£o."
-
-#: addons/addressbook/remove.tpl.c:8
-msgid "So - if you're sure - press 'Delete' to continue or 'Cancel' to abort."
-msgstr "Se vocÃª tem certeza, pressione 'Delete' para continuar ou 'Cancel' para desistir."
-
-#: addons/addressbook/address_edit.tpl.c:2
-msgid "Choose the department to store entry in"
-msgstr "Escolha o departamento para armazenar a registro"
-
-#: addons/addressbook/address_edit.tpl.c:8
-msgid "Last name"
-msgstr "Sobrenome"
-
-#: addons/addressbook/address_edit.tpl.c:11
-msgid "First name"
-msgstr "Nome"
diff --git a/addressbook/locale/ru/fusiondirectory.po b/addressbook/locale/ru/fusiondirectory.po
index bc91cbafd8ce93903334e8f9c95a443af2013a26..7e71d220ed801de8eb98b6fb232f73584ff62fd5 100644
--- a/addressbook/locale/ru/fusiondirectory.po
+++ b/addressbook/locale/ru/fusiondirectory.po
@@ -3,22 +3,19 @@
 # This file is distributed under the same license as the PACKAGE package.
 # 
 # Translators:
-# Alexey, 2015
-# Alexey, 2015
-#  Valia V. Vaneeva <fattie@altlinux.ru>, 2004
 msgid ""
 msgstr ""
-"Project-Id-Version: FusionDirectory-108\n"
+"Project-Id-Version: FusionDirectory-109\n"
 "Report-Msgid-Bugs-To: documentation@lists.fusiondirectory.org\n"
-"POT-Creation-Date: 2015-03-19 21:45+0100\n"
-"PO-Revision-Date: 2015-03-11 21:42+0000\n"
-"Last-Translator: Alexey\n"
-"Language-Team: Russian (http://www.transifex.com/projects/p/FusionDirectory-108/language/ru/)\n"
+"POT-Creation-Date: 2014-12-15 17:47+0100\n"
+"PO-Revision-Date: 2015-04-12 22:01+0000\n"
+"Last-Translator: fusiondirectory <contact@fusiondirectory.org>\n"
+"Language-Team: Russian (http://www.transifex.com/projects/p/FusionDirectory-109/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=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);\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/addressbook/class_addressbook.inc:195
 #, php-format
@@ -48,7 +45,6 @@ msgstr "ÐŸÑ€Ð°Ð²Ð°"
 #: addons/addressbook/class_addressbook.inc:472
 #: addons/addressbook/class_addressbook.inc:476
 #: addons/addressbook/class_addressbook.inc:598
-#: addons/addressbook/dial.tpl.c:5
 msgid "Dial"
 msgstr "Ð—Ð²Ð¾Ð½Ð¾Ðº"
 
@@ -87,7 +83,6 @@ msgstr "Ð’ÑÐµ"
 #: addons/addressbook/class_addressbook.inc:697
 #: addons/addressbook/class_addressbook.inc:707
 #: addons/addressbook/class_addressbook.inc:734
-#: addons/addressbook/address_info.tpl.c:5 addons/addressbook/contents.tpl.c:2
 msgid "Name"
 msgstr "Ð¤Ð°Ð¼Ð¸Ð»Ð¸Ñ"
 
@@ -116,11 +111,6 @@ msgid "User ID"
 msgstr "Ð˜Ð´ÐµÐ½Ñ‚Ð¸Ñ„Ð¸ÐºÐ°Ñ‚Ð¾Ñ€ Ð¿Ð¾Ð»ÑŒÐ·Ð¾Ð²Ð°Ñ‚ÐµÐ»Ñ"
 
 #: addons/addressbook/class_addressbook.inc:715
-#: addons/addressbook/address_info.tpl.c:20
-#: addons/addressbook/address_info.tpl.c:50
-#: addons/addressbook/contents.tpl.c:5
-#: addons/addressbook/address_edit.tpl.c:26
-#: addons/addressbook/address_edit.tpl.c:56
 msgid "Phone"
 msgstr "Ð¢ÐµÐ»ÐµÑ„Ð¾Ð½"
 
@@ -129,27 +119,19 @@ msgid "Telephone number"
 msgstr "ÐÐ¾Ð¼ÐµÑ€ Ñ‚ÐµÐ»ÐµÑ„Ð¾Ð½Ð°"
 
 #: addons/addressbook/class_addressbook.inc:721
-#: addons/addressbook/contents.tpl.c:8
 msgid "Fax"
 msgstr "Ð¤Ð°ÐºÑ"
 
 #: addons/addressbook/class_addressbook.inc:724
-#: addons/addressbook/address_info.tpl.c:23
-#: addons/addressbook/contents.tpl.c:11
-#: addons/addressbook/address_edit.tpl.c:29
 msgid "Mobile"
 msgstr "ÐœÐ¾Ð±Ð¸Ð»ÑŒÐ½Ñ‹Ð¹"
 
 #: addons/addressbook/class_addressbook.inc:727
 #: addons/addressbook/class_addressbook.inc:866
-#: addons/addressbook/address_info.tpl.c:56
-#: addons/addressbook/address_edit.tpl.c:62
 msgid "Pager"
 msgstr "ÐŸÐµÐ¹Ð´Ð¶ÐµÑ€"
 
 #: addons/addressbook/class_addressbook.inc:739
-#: addons/addressbook/address_info.tpl.c:26
-#: addons/addressbook/address_edit.tpl.c:32
 msgid "Email"
 msgstr "Email"
 
@@ -181,7 +163,7 @@ msgstr "Ð¤Ð°ÐºÑ"
 
 #: addons/addressbook/class_addressbook.inc:862
 msgid "Mobile number"
-msgstr ""
+msgstr "ÐÐ¾Ð¼ÐµÑ€ Ð¼Ð¾Ð±Ð¸Ð»ÑŒÐ½Ð¸ÐºÐ°"
 
 #: addons/addressbook/class_addressbook.inc:863
 msgid "Home phone number"
@@ -200,8 +182,6 @@ msgid "Organization"
 msgstr "ÐžÑ€Ð³Ð°Ð½Ð¸Ð·Ð°Ñ†Ð¸Ñ"
 
 #: addons/addressbook/class_addressbook.inc:868
-#: addons/addressbook/address_info.tpl.c:35
-#: addons/addressbook/address_edit.tpl.c:41
 msgid "Department"
 msgstr "ÐŸÐ¾Ð´Ñ€Ð°Ð·Ð´ÐµÐ»ÐµÐ½Ð¸Ðµ"
 
@@ -219,8 +199,6 @@ msgid "State"
 msgstr "ÐÐ´Ð¼. ÐµÐ´Ð¸Ð½Ð¸Ñ†Ð°"
 
 #: addons/addressbook/class_addressbook.inc:873
-#: addons/addressbook/address_info.tpl.c:8
-#: addons/addressbook/address_edit.tpl.c:14
 msgid "Initials"
 msgstr "ÐžÑ‚Ñ‡ÐµÑÑ‚Ð²Ð¾"
 
@@ -243,161 +221,3 @@ msgstr "Ð’Ð½ÑƒÑ‚Ñ€ÐµÐ½Ð½ÑÑ Ð¾ÑˆÐ¸Ð±ÐºÐ°"
 #: html/getvcard.php:39
 msgid "Missing parameters!"
 msgstr "ÐŸÑ€Ð¾Ð¿ÑƒÑ‰ÐµÐ½Ñ‹ Ð¿Ð°Ñ€Ð°Ð¼ÐµÑ‚Ñ€Ñ‹!"
-
-#: addons/addressbook/address_info.tpl.c:2
-#: addons/addressbook/address_edit.tpl.c:5
-msgid "Personal"
-msgstr "ÐšÐ¾Ð½Ñ‚Ð°ÐºÑ‚"
-
-#: addons/addressbook/address_info.tpl.c:11
-#: addons/addressbook/address_edit.tpl.c:17
-msgid "Personal title"
-msgstr "ÐžÐ±Ñ€Ð°Ñ‰ÐµÐ½Ð¸Ðµ"
-
-#: addons/addressbook/address_info.tpl.c:14
-#: addons/addressbook/contents.tpl.c:14
-#: addons/addressbook/address_edit.tpl.c:20
-msgid "Private"
-msgstr "Ð›Ð¸Ñ‡Ð½Ñ‹Ð¹"
-
-#: addons/addressbook/address_info.tpl.c:17
-#: addons/addressbook/address_info.tpl.c:47
-#: addons/addressbook/address_edit.tpl.c:23
-#: addons/addressbook/address_edit.tpl.c:53
-msgid "Address"
-msgstr "ÐÐ´Ñ€ÐµÑ"
-
-#: addons/addressbook/address_info.tpl.c:29
-#: addons/addressbook/address_edit.tpl.c:35
-msgid "Organizational"
-msgstr "ÐžÑ€Ð³Ð°Ð½Ð¸Ð·Ð°Ñ†Ð¸Ñ"
-
-#: addons/addressbook/address_info.tpl.c:32
-#: addons/addressbook/address_edit.tpl.c:38
-msgid "Company"
-msgstr "ÐšÐ¾Ð¼Ð¿Ð°Ð½Ð¸Ñ"
-
-#: addons/addressbook/address_info.tpl.c:38
-#: addons/addressbook/address_edit.tpl.c:44
-msgid "City"
-msgstr "Ð“Ð¾Ñ€Ð¾Ð´"
-
-#: addons/addressbook/address_info.tpl.c:41
-#: addons/addressbook/address_edit.tpl.c:47
-msgid "Postal code"
-msgstr "ÐŸÐ¾Ñ‡Ñ‚Ð¾Ð²Ñ‹Ð¹ Ð¸Ð½Ð´ÐµÐºÑ"
-
-#: addons/addressbook/address_info.tpl.c:44
-#: addons/addressbook/address_edit.tpl.c:50
-msgid "Country"
-msgstr "Ð¡Ñ‚Ñ€Ð°Ð½Ð°"
-
-#: addons/addressbook/address_info.tpl.c:53
-#: addons/addressbook/address_edit.tpl.c:59
-msgid "FAX"
-msgstr "Ð¤Ð°ÐºÑ"
-
-#: addons/addressbook/dial.tpl.c:2
-msgid "Dial connection..."
-msgstr "Ð¡Ð¾ÐµÐ´Ð¸Ð½ÐµÐ½Ð¸Ðµ..."
-
-#: addons/addressbook/contents.tpl.c:17
-msgid "Contact"
-msgstr "ÐšÐ¾Ð½Ñ‚Ð°ÐºÑ‚"
-
-#: addons/addressbook/contents.tpl.c:20
-msgid "Information"
-msgstr "Ð˜Ð½Ñ„Ð¾Ñ€Ð¼Ð°Ñ†Ð¸Ñ"
-
-#: addons/addressbook/contents.tpl.c:23
-msgid ""
-"The telephone list plugin provides list and search facilities for the people in your site. You may want to specify the asterisk [*] like in\n"
-"'Fu*ry' to find 'FusionDirectory'. Use the filters below to narrow down your search."
-msgstr ""
-
-#: addons/addressbook/contents.tpl.c:26
-msgid "Actions"
-msgstr "Ð”ÐµÐ¹ÑÑ‚Ð²Ð¸Ñ"
-
-#: addons/addressbook/contents.tpl.c:29
-msgid "Add entry"
-msgstr "Ð”Ð¾Ð±Ð°Ð²Ð¸Ñ‚ÑŒ Ð¾Ð±ÑŠÐµÐºÑ‚"
-
-#: addons/addressbook/contents.tpl.c:32
-msgid "Edit entry"
-msgstr "Ð ÐµÐ´Ð°ÐºÑ‚Ð¸Ð¾Ð²Ð°Ñ‚ÑŒ Ð¾Ð±ÑŠÐµÐºÑ‚"
-
-#: addons/addressbook/contents.tpl.c:35
-msgid "Remove entry"
-msgstr "Ð£Ð´Ð°Ð»Ð¸Ñ‚ÑŒ Ð¾Ð±ÑŠÐµÐºÑ‚"
-
-#: addons/addressbook/contents.tpl.c:38
-msgid "Filters"
-msgstr "Ð¤Ð¸Ð»ÑŒÑ‚Ñ€Ñ‹"
-
-#: addons/addressbook/contents.tpl.c:41
-msgid "Select to see regular users"
-msgstr "Ð’Ñ‹Ð±ÐµÑ€Ð¸Ñ‚Ðµ, Ñ‡Ñ‚Ð¾Ð±Ñ‹ Ð¿Ñ€Ð¾ÑÐ¼Ð¾Ñ‚Ñ€ÐµÑ‚ÑŒ Ð¿Ð¾Ð»ÑŒÐ·Ð¾Ð²Ð°Ñ‚ÐµÐ»ÐµÐ¹"
-
-#: addons/addressbook/contents.tpl.c:44
-msgid "Show organizational entries"
-msgstr "ÐŸÐ¾ÐºÐ°Ð·Ð°Ñ‚ÑŒ Ð¾Ñ€Ð³Ð°Ð½Ð¸Ð·Ð°Ñ†Ð¸Ð¾Ð½Ð½Ñ‹Ðµ Ð¾Ð±ÑŠÐµÐºÑ‚Ñ‹"
-
-#: addons/addressbook/contents.tpl.c:47
-msgid "Select to see users in addressbook"
-msgstr "Ð’Ñ‹Ð±ÐµÑ€Ð¸Ñ‚Ðµ, Ñ‡Ñ‚Ð¾Ð±Ñ‹ Ð¿Ñ€Ð¾ÑÐ¼Ð¾Ñ‚Ñ€ÐµÑ‚ÑŒ Ð¿Ð¾Ð»ÑŒÐ·Ð¾Ð²Ð°Ñ‚ÐµÐ»ÐµÐ¹ Ð² Ð°Ð´Ñ€ÐµÑÐ½Ð¾Ð¹ ÐºÐ½Ð¸Ð³Ðµ"
-
-#: addons/addressbook/contents.tpl.c:50
-msgid "Show addressbook entries"
-msgstr "ÐŸÐ¾ÐºÐ°Ð·Ð°Ñ‚ÑŒ Ð¾Ð±ÑŠÐµÐºÑ‚Ñ‹ Ð°Ð´Ñ€ÐµÑÐ½Ð¾Ð¹ ÐºÐ½Ð¸Ð³Ð¸"
-
-#: addons/addressbook/contents.tpl.c:53
-msgid "Display results for department"
-msgstr "ÐŸÐ¾ÐºÐ°Ð·Ð°Ñ‚ÑŒ Ñ€ÐµÐ·ÑƒÐ»ÑŒÑ‚Ð°Ñ‚Ñ‹ Ð´Ð»Ñ Ð¿Ð¾Ð´Ñ€Ð°Ð·Ð´ÐµÐ»ÐµÐ½Ð¸Ñ"
-
-#: addons/addressbook/contents.tpl.c:56
-msgid "Choose the department the search will be based on"
-msgstr "Ð’Ñ‹Ð±Ñ€Ð°Ñ‚ÑŒ Ñ€Ð°Ð·Ð´ÐµÐ», Ð´Ð»Ñ ÐºÐ¾Ñ‚Ð¾Ñ€Ð¾Ð³Ð¾ Ð±ÑƒÐ´ÐµÑ‚ Ð¾ÑÑƒÑ‰ÐµÑÑ‚Ð²Ð»ÐµÐ½ Ð¿Ð¾Ð¸ÑÐº"
-
-#: addons/addressbook/contents.tpl.c:59
-msgid "Match object"
-msgstr "Ð¡Ð¾Ð¾Ñ‚Ð²ÐµÑ‚ÑÑ‚Ð²ÑƒÑŽÑ‰Ð¸Ð¹ Ð¾Ð±ÑŠÐµÐºÑ‚"
-
-#: addons/addressbook/contents.tpl.c:62
-msgid "Choose the object that will be searched in"
-msgstr "Ð’Ñ‹Ð±ÐµÑ€Ð¸Ñ‚Ðµ Ð¾Ð±ÑŠÐµÐºÑ‚, Ð² ÐºÐ¾Ñ‚Ð¾Ñ€Ð¾Ð¼ Ð±ÑƒÐ´ÐµÑ‚ Ð¾ÑÑƒÑ‰ÐµÑÑ‚Ð²Ð»ÐµÐ½ Ð¿Ð¾Ð¸ÑÐº"
-
-#: addons/addressbook/contents.tpl.c:65
-msgid "Search for"
-msgstr "ÐŸÐ¾Ð¸ÑÐº"
-
-#: addons/addressbook/contents.tpl.c:68
-msgid "Search string"
-msgstr "Ð¡Ñ‚Ñ€Ð¾ÐºÐ° Ð¿Ð¾Ð¸ÑÐºÐ°"
-
-#: addons/addressbook/remove.tpl.c:2
-msgid "Warning"
-msgstr "ÐŸÑ€ÐµÐ´ÑƒÐ¿Ñ€ÐµÐ¶Ð´ÐµÐ½Ð¸Ðµ"
-
-#: addons/addressbook/remove.tpl.c:5
-msgid ""
-"This includes all addressbook data in this entry. Please double check if "
-"your really want to do this since there is no way for FusionDirectory to get"
-" your data back."
-msgstr ""
-
-#: addons/addressbook/remove.tpl.c:8
-msgid "So - if you're sure - press 'Delete' to continue or 'Cancel' to abort."
-msgstr "Ð˜Ñ‚Ð°Ðº - ÐµÑÐ»Ð¸ Ð²Ñ‹ ÑƒÐ²ÐµÑ€ÐµÐ½Ñ‹ - Ð½Ð°Ð¶Ð¼Ð¸Ñ‚Ðµ 'Ð£Ð´Ð°Ð»Ð¸Ñ‚ÑŒ', Ñ‡Ñ‚Ð¾Ð±Ñ‹ Ð¿Ñ€Ð¾Ð´Ð¾Ð»Ð¶Ð¸Ñ‚ÑŒ Ð¸Ð»Ð¸ 'ÐžÑ‚Ð¼ÐµÐ½Ð°' Ñ‡Ñ‚Ð¾Ð±Ñ‹ Ð¿Ñ€ÐµÑ€Ð²Ð°Ñ‚ÑŒ."
-
-#: addons/addressbook/address_edit.tpl.c:2
-msgid "Choose the department to store entry in"
-msgstr "Ð’Ñ‹Ð±Ñ€Ð°Ñ‚ÑŒ Ñ€Ð°Ð·Ð´ÐµÐ», Ð´Ð»Ñ Ñ…Ñ€Ð°Ð½ÐµÐ½Ð¸Ñ Ð¾Ð±ÑŠÐµÐºÑ‚Ð°"
-
-#: addons/addressbook/address_edit.tpl.c:8
-msgid "Last name"
-msgstr "Ð¤Ð°Ð¼Ð¸Ð»Ð¸Ñ"
-
-#: addons/addressbook/address_edit.tpl.c:11
-msgid "First name"
-msgstr "Ð˜Ð¼Ñ"
diff --git a/addressbook/locale/ru@petr1708/fusiondirectory.po b/addressbook/locale/ru@petr1708/fusiondirectory.po
index c4ba11ac7eca6081b95381061e9c2d4218584517..d82e213bde8600100436ac902c332126c95d44de 100644
--- a/addressbook/locale/ru@petr1708/fusiondirectory.po
+++ b/addressbook/locale/ru@petr1708/fusiondirectory.po
@@ -5,17 +5,17 @@
 # Translators:
 msgid ""
 msgstr ""
-"Project-Id-Version: FusionDirectory-108\n"
+"Project-Id-Version: FusionDirectory-109\n"
 "Report-Msgid-Bugs-To: documentation@lists.fusiondirectory.org\n"
-"POT-Creation-Date: 2015-03-19 21:45+0100\n"
-"PO-Revision-Date: 2015-02-25 15:39+0000\n"
+"POT-Creation-Date: 2014-12-15 17:47+0100\n"
+"PO-Revision-Date: 2014-12-15 16:47+0000\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>\n"
-"Language-Team: Russian Petrine orthography (http://www.transifex.com/projects/p/FusionDirectory-108/language/ru@petr1708/)\n"
+"Language-Team: Russian Petrine orthography (http://www.transifex.com/projects/p/FusionDirectory-109/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=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);\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/addressbook/class_addressbook.inc:195
 #, php-format
@@ -45,7 +45,6 @@ msgstr ""
 #: addons/addressbook/class_addressbook.inc:472
 #: addons/addressbook/class_addressbook.inc:476
 #: addons/addressbook/class_addressbook.inc:598
-#: addons/addressbook/dial.tpl.c:5
 msgid "Dial"
 msgstr ""
 
@@ -84,7 +83,6 @@ msgstr ""
 #: addons/addressbook/class_addressbook.inc:697
 #: addons/addressbook/class_addressbook.inc:707
 #: addons/addressbook/class_addressbook.inc:734
-#: addons/addressbook/address_info.tpl.c:5 addons/addressbook/contents.tpl.c:2
 msgid "Name"
 msgstr ""
 
@@ -113,11 +111,6 @@ msgid "User ID"
 msgstr ""
 
 #: addons/addressbook/class_addressbook.inc:715
-#: addons/addressbook/address_info.tpl.c:20
-#: addons/addressbook/address_info.tpl.c:50
-#: addons/addressbook/contents.tpl.c:5
-#: addons/addressbook/address_edit.tpl.c:26
-#: addons/addressbook/address_edit.tpl.c:56
 msgid "Phone"
 msgstr ""
 
@@ -126,27 +119,19 @@ msgid "Telephone number"
 msgstr ""
 
 #: addons/addressbook/class_addressbook.inc:721
-#: addons/addressbook/contents.tpl.c:8
 msgid "Fax"
 msgstr ""
 
 #: addons/addressbook/class_addressbook.inc:724
-#: addons/addressbook/address_info.tpl.c:23
-#: addons/addressbook/contents.tpl.c:11
-#: addons/addressbook/address_edit.tpl.c:29
 msgid "Mobile"
 msgstr ""
 
 #: addons/addressbook/class_addressbook.inc:727
 #: addons/addressbook/class_addressbook.inc:866
-#: addons/addressbook/address_info.tpl.c:56
-#: addons/addressbook/address_edit.tpl.c:62
 msgid "Pager"
 msgstr ""
 
 #: addons/addressbook/class_addressbook.inc:739
-#: addons/addressbook/address_info.tpl.c:26
-#: addons/addressbook/address_edit.tpl.c:32
 msgid "Email"
 msgstr ""
 
@@ -197,8 +182,6 @@ msgid "Organization"
 msgstr ""
 
 #: addons/addressbook/class_addressbook.inc:868
-#: addons/addressbook/address_info.tpl.c:35
-#: addons/addressbook/address_edit.tpl.c:41
 msgid "Department"
 msgstr ""
 
@@ -216,8 +199,6 @@ msgid "State"
 msgstr ""
 
 #: addons/addressbook/class_addressbook.inc:873
-#: addons/addressbook/address_info.tpl.c:8
-#: addons/addressbook/address_edit.tpl.c:14
 msgid "Initials"
 msgstr ""
 
@@ -240,161 +221,3 @@ msgstr ""
 #: html/getvcard.php:39
 msgid "Missing parameters!"
 msgstr ""
-
-#: addons/addressbook/address_info.tpl.c:2
-#: addons/addressbook/address_edit.tpl.c:5
-msgid "Personal"
-msgstr ""
-
-#: addons/addressbook/address_info.tpl.c:11
-#: addons/addressbook/address_edit.tpl.c:17
-msgid "Personal title"
-msgstr ""
-
-#: addons/addressbook/address_info.tpl.c:14
-#: addons/addressbook/contents.tpl.c:14
-#: addons/addressbook/address_edit.tpl.c:20
-msgid "Private"
-msgstr ""
-
-#: addons/addressbook/address_info.tpl.c:17
-#: addons/addressbook/address_info.tpl.c:47
-#: addons/addressbook/address_edit.tpl.c:23
-#: addons/addressbook/address_edit.tpl.c:53
-msgid "Address"
-msgstr ""
-
-#: addons/addressbook/address_info.tpl.c:29
-#: addons/addressbook/address_edit.tpl.c:35
-msgid "Organizational"
-msgstr ""
-
-#: addons/addressbook/address_info.tpl.c:32
-#: addons/addressbook/address_edit.tpl.c:38
-msgid "Company"
-msgstr ""
-
-#: addons/addressbook/address_info.tpl.c:38
-#: addons/addressbook/address_edit.tpl.c:44
-msgid "City"
-msgstr ""
-
-#: addons/addressbook/address_info.tpl.c:41
-#: addons/addressbook/address_edit.tpl.c:47
-msgid "Postal code"
-msgstr ""
-
-#: addons/addressbook/address_info.tpl.c:44
-#: addons/addressbook/address_edit.tpl.c:50
-msgid "Country"
-msgstr ""
-
-#: addons/addressbook/address_info.tpl.c:53
-#: addons/addressbook/address_edit.tpl.c:59
-msgid "FAX"
-msgstr ""
-
-#: addons/addressbook/dial.tpl.c:2
-msgid "Dial connection..."
-msgstr ""
-
-#: addons/addressbook/contents.tpl.c:17
-msgid "Contact"
-msgstr ""
-
-#: addons/addressbook/contents.tpl.c:20
-msgid "Information"
-msgstr ""
-
-#: addons/addressbook/contents.tpl.c:23
-msgid ""
-"The telephone list plugin provides list and search facilities for the people in your site. You may want to specify the asterisk [*] like in\n"
-"'Fu*ry' to find 'FusionDirectory'. Use the filters below to narrow down your search."
-msgstr ""
-
-#: addons/addressbook/contents.tpl.c:26
-msgid "Actions"
-msgstr ""
-
-#: addons/addressbook/contents.tpl.c:29
-msgid "Add entry"
-msgstr ""
-
-#: addons/addressbook/contents.tpl.c:32
-msgid "Edit entry"
-msgstr ""
-
-#: addons/addressbook/contents.tpl.c:35
-msgid "Remove entry"
-msgstr ""
-
-#: addons/addressbook/contents.tpl.c:38
-msgid "Filters"
-msgstr ""
-
-#: addons/addressbook/contents.tpl.c:41
-msgid "Select to see regular users"
-msgstr ""
-
-#: addons/addressbook/contents.tpl.c:44
-msgid "Show organizational entries"
-msgstr ""
-
-#: addons/addressbook/contents.tpl.c:47
-msgid "Select to see users in addressbook"
-msgstr ""
-
-#: addons/addressbook/contents.tpl.c:50
-msgid "Show addressbook entries"
-msgstr ""
-
-#: addons/addressbook/contents.tpl.c:53
-msgid "Display results for department"
-msgstr ""
-
-#: addons/addressbook/contents.tpl.c:56
-msgid "Choose the department the search will be based on"
-msgstr ""
-
-#: addons/addressbook/contents.tpl.c:59
-msgid "Match object"
-msgstr ""
-
-#: addons/addressbook/contents.tpl.c:62
-msgid "Choose the object that will be searched in"
-msgstr ""
-
-#: addons/addressbook/contents.tpl.c:65
-msgid "Search for"
-msgstr ""
-
-#: addons/addressbook/contents.tpl.c:68
-msgid "Search string"
-msgstr ""
-
-#: addons/addressbook/remove.tpl.c:2
-msgid "Warning"
-msgstr ""
-
-#: addons/addressbook/remove.tpl.c:5
-msgid ""
-"This includes all addressbook data in this entry. Please double check if "
-"your really want to do this since there is no way for FusionDirectory to get"
-" your data back."
-msgstr ""
-
-#: addons/addressbook/remove.tpl.c:8
-msgid "So - if you're sure - press 'Delete' to continue or 'Cancel' to abort."
-msgstr ""
-
-#: addons/addressbook/address_edit.tpl.c:2
-msgid "Choose the department to store entry in"
-msgstr ""
-
-#: addons/addressbook/address_edit.tpl.c:8
-msgid "Last name"
-msgstr ""
-
-#: addons/addressbook/address_edit.tpl.c:11
-msgid "First name"
-msgstr ""
diff --git a/addressbook/locale/sv/fusiondirectory.po b/addressbook/locale/sv/fusiondirectory.po
index ef72ac4a61a513730981943f29f71b66c0f9312c..95c3d766c613282f0dea86878833019d4c31a49b 100644
--- a/addressbook/locale/sv/fusiondirectory.po
+++ b/addressbook/locale/sv/fusiondirectory.po
@@ -5,12 +5,12 @@
 # Translators:
 msgid ""
 msgstr ""
-"Project-Id-Version: FusionDirectory-108\n"
+"Project-Id-Version: FusionDirectory-109\n"
 "Report-Msgid-Bugs-To: documentation@lists.fusiondirectory.org\n"
-"POT-Creation-Date: 2015-03-19 21:45+0100\n"
-"PO-Revision-Date: 2015-02-25 16:12+0000\n"
+"POT-Creation-Date: 2014-12-15 17:47+0100\n"
+"PO-Revision-Date: 2015-02-25 16:04+0000\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>\n"
-"Language-Team: Swedish (http://www.transifex.com/projects/p/FusionDirectory-108/language/sv/)\n"
+"Language-Team: Swedish (http://www.transifex.com/projects/p/FusionDirectory-109/language/sv/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -45,7 +45,6 @@ msgstr "RÃ¤ttighet"
 #: addons/addressbook/class_addressbook.inc:472
 #: addons/addressbook/class_addressbook.inc:476
 #: addons/addressbook/class_addressbook.inc:598
-#: addons/addressbook/dial.tpl.c:5
 msgid "Dial"
 msgstr ""
 
@@ -84,7 +83,6 @@ msgstr ""
 #: addons/addressbook/class_addressbook.inc:697
 #: addons/addressbook/class_addressbook.inc:707
 #: addons/addressbook/class_addressbook.inc:734
-#: addons/addressbook/address_info.tpl.c:5 addons/addressbook/contents.tpl.c:2
 msgid "Name"
 msgstr "Namn"
 
@@ -113,11 +111,6 @@ msgid "User ID"
 msgstr "AnvÃ¤ndar-ID"
 
 #: addons/addressbook/class_addressbook.inc:715
-#: addons/addressbook/address_info.tpl.c:20
-#: addons/addressbook/address_info.tpl.c:50
-#: addons/addressbook/contents.tpl.c:5
-#: addons/addressbook/address_edit.tpl.c:26
-#: addons/addressbook/address_edit.tpl.c:56
 msgid "Phone"
 msgstr "Telefon"
 
@@ -126,27 +119,19 @@ msgid "Telephone number"
 msgstr ""
 
 #: addons/addressbook/class_addressbook.inc:721
-#: addons/addressbook/contents.tpl.c:8
 msgid "Fax"
 msgstr "Fax"
 
 #: addons/addressbook/class_addressbook.inc:724
-#: addons/addressbook/address_info.tpl.c:23
-#: addons/addressbook/contents.tpl.c:11
-#: addons/addressbook/address_edit.tpl.c:29
 msgid "Mobile"
 msgstr "Mobil"
 
 #: addons/addressbook/class_addressbook.inc:727
 #: addons/addressbook/class_addressbook.inc:866
-#: addons/addressbook/address_info.tpl.c:56
-#: addons/addressbook/address_edit.tpl.c:62
 msgid "Pager"
 msgstr "Pager"
 
 #: addons/addressbook/class_addressbook.inc:739
-#: addons/addressbook/address_info.tpl.c:26
-#: addons/addressbook/address_edit.tpl.c:32
 msgid "Email"
 msgstr ""
 
@@ -197,8 +182,6 @@ msgid "Organization"
 msgstr "Organisation"
 
 #: addons/addressbook/class_addressbook.inc:868
-#: addons/addressbook/address_info.tpl.c:35
-#: addons/addressbook/address_edit.tpl.c:41
 msgid "Department"
 msgstr "Avdelning"
 
@@ -216,8 +199,6 @@ msgid "State"
 msgstr "LÃ¤n"
 
 #: addons/addressbook/class_addressbook.inc:873
-#: addons/addressbook/address_info.tpl.c:8
-#: addons/addressbook/address_edit.tpl.c:14
 msgid "Initials"
 msgstr ""
 
@@ -240,161 +221,3 @@ msgstr "Internt fel"
 #: html/getvcard.php:39
 msgid "Missing parameters!"
 msgstr ""
-
-#: addons/addressbook/address_info.tpl.c:2
-#: addons/addressbook/address_edit.tpl.c:5
-msgid "Personal"
-msgstr ""
-
-#: addons/addressbook/address_info.tpl.c:11
-#: addons/addressbook/address_edit.tpl.c:17
-msgid "Personal title"
-msgstr "Personlig titel"
-
-#: addons/addressbook/address_info.tpl.c:14
-#: addons/addressbook/contents.tpl.c:14
-#: addons/addressbook/address_edit.tpl.c:20
-msgid "Private"
-msgstr ""
-
-#: addons/addressbook/address_info.tpl.c:17
-#: addons/addressbook/address_info.tpl.c:47
-#: addons/addressbook/address_edit.tpl.c:23
-#: addons/addressbook/address_edit.tpl.c:53
-msgid "Address"
-msgstr "Adress"
-
-#: addons/addressbook/address_info.tpl.c:29
-#: addons/addressbook/address_edit.tpl.c:35
-msgid "Organizational"
-msgstr ""
-
-#: addons/addressbook/address_info.tpl.c:32
-#: addons/addressbook/address_edit.tpl.c:38
-msgid "Company"
-msgstr ""
-
-#: addons/addressbook/address_info.tpl.c:38
-#: addons/addressbook/address_edit.tpl.c:44
-msgid "City"
-msgstr ""
-
-#: addons/addressbook/address_info.tpl.c:41
-#: addons/addressbook/address_edit.tpl.c:47
-msgid "Postal code"
-msgstr "Postnummer"
-
-#: addons/addressbook/address_info.tpl.c:44
-#: addons/addressbook/address_edit.tpl.c:50
-msgid "Country"
-msgstr "Land"
-
-#: addons/addressbook/address_info.tpl.c:53
-#: addons/addressbook/address_edit.tpl.c:59
-msgid "FAX"
-msgstr "Fax"
-
-#: addons/addressbook/dial.tpl.c:2
-msgid "Dial connection..."
-msgstr ""
-
-#: addons/addressbook/contents.tpl.c:17
-msgid "Contact"
-msgstr ""
-
-#: addons/addressbook/contents.tpl.c:20
-msgid "Information"
-msgstr "Information"
-
-#: addons/addressbook/contents.tpl.c:23
-msgid ""
-"The telephone list plugin provides list and search facilities for the people in your site. You may want to specify the asterisk [*] like in\n"
-"'Fu*ry' to find 'FusionDirectory'. Use the filters below to narrow down your search."
-msgstr ""
-
-#: addons/addressbook/contents.tpl.c:26
-msgid "Actions"
-msgstr "Ã…tgÃ¤rder"
-
-#: addons/addressbook/contents.tpl.c:29
-msgid "Add entry"
-msgstr ""
-
-#: addons/addressbook/contents.tpl.c:32
-msgid "Edit entry"
-msgstr "Redigera post"
-
-#: addons/addressbook/contents.tpl.c:35
-msgid "Remove entry"
-msgstr "Ta bort post"
-
-#: addons/addressbook/contents.tpl.c:38
-msgid "Filters"
-msgstr "Filter"
-
-#: addons/addressbook/contents.tpl.c:41
-msgid "Select to see regular users"
-msgstr ""
-
-#: addons/addressbook/contents.tpl.c:44
-msgid "Show organizational entries"
-msgstr ""
-
-#: addons/addressbook/contents.tpl.c:47
-msgid "Select to see users in addressbook"
-msgstr ""
-
-#: addons/addressbook/contents.tpl.c:50
-msgid "Show addressbook entries"
-msgstr ""
-
-#: addons/addressbook/contents.tpl.c:53
-msgid "Display results for department"
-msgstr ""
-
-#: addons/addressbook/contents.tpl.c:56
-msgid "Choose the department the search will be based on"
-msgstr "VÃ¤lj vilken avdelning sÃ¶kningen ska baseras pÃ¥"
-
-#: addons/addressbook/contents.tpl.c:59
-msgid "Match object"
-msgstr ""
-
-#: addons/addressbook/contents.tpl.c:62
-msgid "Choose the object that will be searched in"
-msgstr ""
-
-#: addons/addressbook/contents.tpl.c:65
-msgid "Search for"
-msgstr ""
-
-#: addons/addressbook/contents.tpl.c:68
-msgid "Search string"
-msgstr ""
-
-#: addons/addressbook/remove.tpl.c:2
-msgid "Warning"
-msgstr "Varning"
-
-#: addons/addressbook/remove.tpl.c:5
-msgid ""
-"This includes all addressbook data in this entry. Please double check if "
-"your really want to do this since there is no way for FusionDirectory to get"
-" your data back."
-msgstr ""
-
-#: addons/addressbook/remove.tpl.c:8
-msgid "So - if you're sure - press 'Delete' to continue or 'Cancel' to abort."
-msgstr "SÃ¥ - om du Ã¤r sÃ¤ker - tryck 'Ta bort' fÃ¶r att fortsÃ¤tta och 'Avbryt' fÃ¶r att avbryta."
-
-#: addons/addressbook/address_edit.tpl.c:2
-msgid "Choose the department to store entry in"
-msgstr ""
-
-#: addons/addressbook/address_edit.tpl.c:8
-msgid "Last name"
-msgstr "Efternamn"
-
-#: addons/addressbook/address_edit.tpl.c:11
-msgid "First name"
-msgstr "FÃ¶rnamn"
diff --git a/addressbook/locale/ug/fusiondirectory.po b/addressbook/locale/ug/fusiondirectory.po
index 08cbefe8d70691ba254709da56d7e7b3135d6b62..51623f7df9fd9c4430e1434edc30852b87922ae8 100644
--- a/addressbook/locale/ug/fusiondirectory.po
+++ b/addressbook/locale/ug/fusiondirectory.po
@@ -5,12 +5,12 @@
 # Translators:
 msgid ""
 msgstr ""
-"Project-Id-Version: FusionDirectory-108\n"
+"Project-Id-Version: FusionDirectory-109\n"
 "Report-Msgid-Bugs-To: documentation@lists.fusiondirectory.org\n"
-"POT-Creation-Date: 2015-03-19 21:45+0100\n"
-"PO-Revision-Date: 2015-02-25 15:39+0000\n"
+"POT-Creation-Date: 2014-12-15 17:47+0100\n"
+"PO-Revision-Date: 2014-12-15 16:47+0000\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>\n"
-"Language-Team: Uighur (http://www.transifex.com/projects/p/FusionDirectory-108/language/ug/)\n"
+"Language-Team: Uighur (http://www.transifex.com/projects/p/FusionDirectory-109/language/ug/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -45,7 +45,6 @@ msgstr ""
 #: addons/addressbook/class_addressbook.inc:472
 #: addons/addressbook/class_addressbook.inc:476
 #: addons/addressbook/class_addressbook.inc:598
-#: addons/addressbook/dial.tpl.c:5
 msgid "Dial"
 msgstr ""
 
@@ -84,7 +83,6 @@ msgstr ""
 #: addons/addressbook/class_addressbook.inc:697
 #: addons/addressbook/class_addressbook.inc:707
 #: addons/addressbook/class_addressbook.inc:734
-#: addons/addressbook/address_info.tpl.c:5 addons/addressbook/contents.tpl.c:2
 msgid "Name"
 msgstr ""
 
@@ -113,11 +111,6 @@ msgid "User ID"
 msgstr ""
 
 #: addons/addressbook/class_addressbook.inc:715
-#: addons/addressbook/address_info.tpl.c:20
-#: addons/addressbook/address_info.tpl.c:50
-#: addons/addressbook/contents.tpl.c:5
-#: addons/addressbook/address_edit.tpl.c:26
-#: addons/addressbook/address_edit.tpl.c:56
 msgid "Phone"
 msgstr ""
 
@@ -126,27 +119,19 @@ msgid "Telephone number"
 msgstr ""
 
 #: addons/addressbook/class_addressbook.inc:721
-#: addons/addressbook/contents.tpl.c:8
 msgid "Fax"
 msgstr ""
 
 #: addons/addressbook/class_addressbook.inc:724
-#: addons/addressbook/address_info.tpl.c:23
-#: addons/addressbook/contents.tpl.c:11
-#: addons/addressbook/address_edit.tpl.c:29
 msgid "Mobile"
 msgstr ""
 
 #: addons/addressbook/class_addressbook.inc:727
 #: addons/addressbook/class_addressbook.inc:866
-#: addons/addressbook/address_info.tpl.c:56
-#: addons/addressbook/address_edit.tpl.c:62
 msgid "Pager"
 msgstr ""
 
 #: addons/addressbook/class_addressbook.inc:739
-#: addons/addressbook/address_info.tpl.c:26
-#: addons/addressbook/address_edit.tpl.c:32
 msgid "Email"
 msgstr ""
 
@@ -197,8 +182,6 @@ msgid "Organization"
 msgstr ""
 
 #: addons/addressbook/class_addressbook.inc:868
-#: addons/addressbook/address_info.tpl.c:35
-#: addons/addressbook/address_edit.tpl.c:41
 msgid "Department"
 msgstr ""
 
@@ -216,8 +199,6 @@ msgid "State"
 msgstr ""
 
 #: addons/addressbook/class_addressbook.inc:873
-#: addons/addressbook/address_info.tpl.c:8
-#: addons/addressbook/address_edit.tpl.c:14
 msgid "Initials"
 msgstr ""
 
@@ -240,161 +221,3 @@ msgstr ""
 #: html/getvcard.php:39
 msgid "Missing parameters!"
 msgstr ""
-
-#: addons/addressbook/address_info.tpl.c:2
-#: addons/addressbook/address_edit.tpl.c:5
-msgid "Personal"
-msgstr ""
-
-#: addons/addressbook/address_info.tpl.c:11
-#: addons/addressbook/address_edit.tpl.c:17
-msgid "Personal title"
-msgstr ""
-
-#: addons/addressbook/address_info.tpl.c:14
-#: addons/addressbook/contents.tpl.c:14
-#: addons/addressbook/address_edit.tpl.c:20
-msgid "Private"
-msgstr ""
-
-#: addons/addressbook/address_info.tpl.c:17
-#: addons/addressbook/address_info.tpl.c:47
-#: addons/addressbook/address_edit.tpl.c:23
-#: addons/addressbook/address_edit.tpl.c:53
-msgid "Address"
-msgstr ""
-
-#: addons/addressbook/address_info.tpl.c:29
-#: addons/addressbook/address_edit.tpl.c:35
-msgid "Organizational"
-msgstr ""
-
-#: addons/addressbook/address_info.tpl.c:32
-#: addons/addressbook/address_edit.tpl.c:38
-msgid "Company"
-msgstr ""
-
-#: addons/addressbook/address_info.tpl.c:38
-#: addons/addressbook/address_edit.tpl.c:44
-msgid "City"
-msgstr ""
-
-#: addons/addressbook/address_info.tpl.c:41
-#: addons/addressbook/address_edit.tpl.c:47
-msgid "Postal code"
-msgstr ""
-
-#: addons/addressbook/address_info.tpl.c:44
-#: addons/addressbook/address_edit.tpl.c:50
-msgid "Country"
-msgstr ""
-
-#: addons/addressbook/address_info.tpl.c:53
-#: addons/addressbook/address_edit.tpl.c:59
-msgid "FAX"
-msgstr ""
-
-#: addons/addressbook/dial.tpl.c:2
-msgid "Dial connection..."
-msgstr ""
-
-#: addons/addressbook/contents.tpl.c:17
-msgid "Contact"
-msgstr ""
-
-#: addons/addressbook/contents.tpl.c:20
-msgid "Information"
-msgstr ""
-
-#: addons/addressbook/contents.tpl.c:23
-msgid ""
-"The telephone list plugin provides list and search facilities for the people in your site. You may want to specify the asterisk [*] like in\n"
-"'Fu*ry' to find 'FusionDirectory'. Use the filters below to narrow down your search."
-msgstr ""
-
-#: addons/addressbook/contents.tpl.c:26
-msgid "Actions"
-msgstr ""
-
-#: addons/addressbook/contents.tpl.c:29
-msgid "Add entry"
-msgstr ""
-
-#: addons/addressbook/contents.tpl.c:32
-msgid "Edit entry"
-msgstr ""
-
-#: addons/addressbook/contents.tpl.c:35
-msgid "Remove entry"
-msgstr ""
-
-#: addons/addressbook/contents.tpl.c:38
-msgid "Filters"
-msgstr ""
-
-#: addons/addressbook/contents.tpl.c:41
-msgid "Select to see regular users"
-msgstr ""
-
-#: addons/addressbook/contents.tpl.c:44
-msgid "Show organizational entries"
-msgstr ""
-
-#: addons/addressbook/contents.tpl.c:47
-msgid "Select to see users in addressbook"
-msgstr ""
-
-#: addons/addressbook/contents.tpl.c:50
-msgid "Show addressbook entries"
-msgstr ""
-
-#: addons/addressbook/contents.tpl.c:53
-msgid "Display results for department"
-msgstr ""
-
-#: addons/addressbook/contents.tpl.c:56
-msgid "Choose the department the search will be based on"
-msgstr ""
-
-#: addons/addressbook/contents.tpl.c:59
-msgid "Match object"
-msgstr ""
-
-#: addons/addressbook/contents.tpl.c:62
-msgid "Choose the object that will be searched in"
-msgstr ""
-
-#: addons/addressbook/contents.tpl.c:65
-msgid "Search for"
-msgstr ""
-
-#: addons/addressbook/contents.tpl.c:68
-msgid "Search string"
-msgstr ""
-
-#: addons/addressbook/remove.tpl.c:2
-msgid "Warning"
-msgstr ""
-
-#: addons/addressbook/remove.tpl.c:5
-msgid ""
-"This includes all addressbook data in this entry. Please double check if "
-"your really want to do this since there is no way for FusionDirectory to get"
-" your data back."
-msgstr ""
-
-#: addons/addressbook/remove.tpl.c:8
-msgid "So - if you're sure - press 'Delete' to continue or 'Cancel' to abort."
-msgstr ""
-
-#: addons/addressbook/address_edit.tpl.c:2
-msgid "Choose the department to store entry in"
-msgstr ""
-
-#: addons/addressbook/address_edit.tpl.c:8
-msgid "Last name"
-msgstr ""
-
-#: addons/addressbook/address_edit.tpl.c:11
-msgid "First name"
-msgstr ""
diff --git a/addressbook/locale/vi_VN/fusiondirectory.po b/addressbook/locale/vi_VN/fusiondirectory.po
index 4cef2d2b3043b5325bf5e207d11f5a258c5fb19e..049e0f326c120cb75a8d1dea84f473d3a8651cd0 100644
--- a/addressbook/locale/vi_VN/fusiondirectory.po
+++ b/addressbook/locale/vi_VN/fusiondirectory.po
@@ -3,15 +3,14 @@
 # This file is distributed under the same license as the PACKAGE package.
 # 
 # Translators:
-# Stefan Koehler <stefan@gonicus.de>, 2008
 msgid ""
 msgstr ""
-"Project-Id-Version: FusionDirectory-108\n"
+"Project-Id-Version: FusionDirectory-109\n"
 "Report-Msgid-Bugs-To: documentation@lists.fusiondirectory.org\n"
-"POT-Creation-Date: 2015-03-19 21:45+0100\n"
-"PO-Revision-Date: 2015-02-25 16:12+0000\n"
+"POT-Creation-Date: 2014-12-15 17:47+0100\n"
+"PO-Revision-Date: 2015-02-25 16:04+0000\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>\n"
-"Language-Team: Vietnamese (Viet Nam) (http://www.transifex.com/projects/p/FusionDirectory-108/language/vi_VN/)\n"
+"Language-Team: Vietnamese (Viet Nam) (http://www.transifex.com/projects/p/FusionDirectory-109/language/vi_VN/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -46,7 +45,6 @@ msgstr "Cho phÃ©p"
 #: addons/addressbook/class_addressbook.inc:472
 #: addons/addressbook/class_addressbook.inc:476
 #: addons/addressbook/class_addressbook.inc:598
-#: addons/addressbook/dial.tpl.c:5
 msgid "Dial"
 msgstr ""
 
@@ -85,7 +83,6 @@ msgstr ""
 #: addons/addressbook/class_addressbook.inc:697
 #: addons/addressbook/class_addressbook.inc:707
 #: addons/addressbook/class_addressbook.inc:734
-#: addons/addressbook/address_info.tpl.c:5 addons/addressbook/contents.tpl.c:2
 msgid "Name"
 msgstr "TÃªn"
 
@@ -114,11 +111,6 @@ msgid "User ID"
 msgstr "ID ngÆ°á»i dÃ¹ng"
 
 #: addons/addressbook/class_addressbook.inc:715
-#: addons/addressbook/address_info.tpl.c:20
-#: addons/addressbook/address_info.tpl.c:50
-#: addons/addressbook/contents.tpl.c:5
-#: addons/addressbook/address_edit.tpl.c:26
-#: addons/addressbook/address_edit.tpl.c:56
 msgid "Phone"
 msgstr "Sá»‘ Ä‘iá»‡n thoáº¡i"
 
@@ -127,27 +119,19 @@ msgid "Telephone number"
 msgstr ""
 
 #: addons/addressbook/class_addressbook.inc:721
-#: addons/addressbook/contents.tpl.c:8
 msgid "Fax"
 msgstr "Sá»‘ fax"
 
 #: addons/addressbook/class_addressbook.inc:724
-#: addons/addressbook/address_info.tpl.c:23
-#: addons/addressbook/contents.tpl.c:11
-#: addons/addressbook/address_edit.tpl.c:29
 msgid "Mobile"
 msgstr "Äiá»‡n thoáº¡i di Ä‘á»™ng"
 
 #: addons/addressbook/class_addressbook.inc:727
 #: addons/addressbook/class_addressbook.inc:866
-#: addons/addressbook/address_info.tpl.c:56
-#: addons/addressbook/address_edit.tpl.c:62
 msgid "Pager"
 msgstr "MÃ¡y nháº¯n tin"
 
 #: addons/addressbook/class_addressbook.inc:739
-#: addons/addressbook/address_info.tpl.c:26
-#: addons/addressbook/address_edit.tpl.c:32
 msgid "Email"
 msgstr ""
 
@@ -198,8 +182,6 @@ msgid "Organization"
 msgstr "Tá»• chá»©c"
 
 #: addons/addressbook/class_addressbook.inc:868
-#: addons/addressbook/address_info.tpl.c:35
-#: addons/addressbook/address_edit.tpl.c:41
 msgid "Department"
 msgstr "Bá»™ pháºn"
 
@@ -217,8 +199,6 @@ msgid "State"
 msgstr "Bang"
 
 #: addons/addressbook/class_addressbook.inc:873
-#: addons/addressbook/address_info.tpl.c:8
-#: addons/addressbook/address_edit.tpl.c:14
 msgid "Initials"
 msgstr ""
 
@@ -241,161 +221,3 @@ msgstr "Lá»—i ná»™i bá»™"
 #: html/getvcard.php:39
 msgid "Missing parameters!"
 msgstr ""
-
-#: addons/addressbook/address_info.tpl.c:2
-#: addons/addressbook/address_edit.tpl.c:5
-msgid "Personal"
-msgstr ""
-
-#: addons/addressbook/address_info.tpl.c:11
-#: addons/addressbook/address_edit.tpl.c:17
-msgid "Personal title"
-msgstr "Chá»©c danh cÃ¡ nhÃ¢n"
-
-#: addons/addressbook/address_info.tpl.c:14
-#: addons/addressbook/contents.tpl.c:14
-#: addons/addressbook/address_edit.tpl.c:20
-msgid "Private"
-msgstr ""
-
-#: addons/addressbook/address_info.tpl.c:17
-#: addons/addressbook/address_info.tpl.c:47
-#: addons/addressbook/address_edit.tpl.c:23
-#: addons/addressbook/address_edit.tpl.c:53
-msgid "Address"
-msgstr "Äá»‹a chá»‰"
-
-#: addons/addressbook/address_info.tpl.c:29
-#: addons/addressbook/address_edit.tpl.c:35
-msgid "Organizational"
-msgstr ""
-
-#: addons/addressbook/address_info.tpl.c:32
-#: addons/addressbook/address_edit.tpl.c:38
-msgid "Company"
-msgstr ""
-
-#: addons/addressbook/address_info.tpl.c:38
-#: addons/addressbook/address_edit.tpl.c:44
-msgid "City"
-msgstr ""
-
-#: addons/addressbook/address_info.tpl.c:41
-#: addons/addressbook/address_edit.tpl.c:47
-msgid "Postal code"
-msgstr "MÃ£ bÆ°u Ä‘iá»‡n"
-
-#: addons/addressbook/address_info.tpl.c:44
-#: addons/addressbook/address_edit.tpl.c:50
-msgid "Country"
-msgstr "Quá»‘c Gia"
-
-#: addons/addressbook/address_info.tpl.c:53
-#: addons/addressbook/address_edit.tpl.c:59
-msgid "FAX"
-msgstr "Fax"
-
-#: addons/addressbook/dial.tpl.c:2
-msgid "Dial connection..."
-msgstr ""
-
-#: addons/addressbook/contents.tpl.c:17
-msgid "Contact"
-msgstr ""
-
-#: addons/addressbook/contents.tpl.c:20
-msgid "Information"
-msgstr "ThÃ´ng tin"
-
-#: addons/addressbook/contents.tpl.c:23
-msgid ""
-"The telephone list plugin provides list and search facilities for the people in your site. You may want to specify the asterisk [*] like in\n"
-"'Fu*ry' to find 'FusionDirectory'. Use the filters below to narrow down your search."
-msgstr ""
-
-#: addons/addressbook/contents.tpl.c:26
-msgid "Actions"
-msgstr "CÃ¡c thao tÃ¡c"
-
-#: addons/addressbook/contents.tpl.c:29
-msgid "Add entry"
-msgstr ""
-
-#: addons/addressbook/contents.tpl.c:32
-msgid "Edit entry"
-msgstr ""
-
-#: addons/addressbook/contents.tpl.c:35
-msgid "Remove entry"
-msgstr ""
-
-#: addons/addressbook/contents.tpl.c:38
-msgid "Filters"
-msgstr "CÃ¡c bá»™ lá»c"
-
-#: addons/addressbook/contents.tpl.c:41
-msgid "Select to see regular users"
-msgstr ""
-
-#: addons/addressbook/contents.tpl.c:44
-msgid "Show organizational entries"
-msgstr ""
-
-#: addons/addressbook/contents.tpl.c:47
-msgid "Select to see users in addressbook"
-msgstr ""
-
-#: addons/addressbook/contents.tpl.c:50
-msgid "Show addressbook entries"
-msgstr ""
-
-#: addons/addressbook/contents.tpl.c:53
-msgid "Display results for department"
-msgstr ""
-
-#: addons/addressbook/contents.tpl.c:56
-msgid "Choose the department the search will be based on"
-msgstr "Chá»n bá»™ pháºn mÃ  viá»‡c tÃ¬m kiáº¿m sáº½ tiáº¿n hÃ nh trÃªn Ä‘Ã³ "
-
-#: addons/addressbook/contents.tpl.c:59
-msgid "Match object"
-msgstr ""
-
-#: addons/addressbook/contents.tpl.c:62
-msgid "Choose the object that will be searched in"
-msgstr ""
-
-#: addons/addressbook/contents.tpl.c:65
-msgid "Search for"
-msgstr ""
-
-#: addons/addressbook/contents.tpl.c:68
-msgid "Search string"
-msgstr ""
-
-#: addons/addressbook/remove.tpl.c:2
-msgid "Warning"
-msgstr "Cáº£nh bÃ¡o"
-
-#: addons/addressbook/remove.tpl.c:5
-msgid ""
-"This includes all addressbook data in this entry. Please double check if "
-"your really want to do this since there is no way for FusionDirectory to get"
-" your data back."
-msgstr ""
-
-#: addons/addressbook/remove.tpl.c:8
-msgid "So - if you're sure - press 'Delete' to continue or 'Cancel' to abort."
-msgstr "VÃ¬ tháº¿ náº¿u báº¡n cháº¯c cháº¯n hÃ£y nháº¥n \"XÃ³a bá»\" Ä‘á»ƒ tiáº¿p tá»¥c hoáº·c'Há»§y bá»' Ä‘á»ƒ dá»«ng láº¡i."
-
-#: addons/addressbook/address_edit.tpl.c:2
-msgid "Choose the department to store entry in"
-msgstr ""
-
-#: addons/addressbook/address_edit.tpl.c:8
-msgid "Last name"
-msgstr "Há»"
-
-#: addons/addressbook/address_edit.tpl.c:11
-msgid "First name"
-msgstr "TÃªn"
diff --git a/addressbook/locale/zh/fusiondirectory.po b/addressbook/locale/zh/fusiondirectory.po
index de31028a43d642898d1be753c8688dd52fc0091b..ebf6ae658a35dee89ee69ec20da1f777caa3617e 100644
--- a/addressbook/locale/zh/fusiondirectory.po
+++ b/addressbook/locale/zh/fusiondirectory.po
@@ -3,15 +3,14 @@
 # This file is distributed under the same license as the PACKAGE package.
 # 
 # Translators:
-#  Jiang Xin <worldhello.net@gmail.com>, 2007
 msgid ""
 msgstr ""
-"Project-Id-Version: FusionDirectory-108\n"
+"Project-Id-Version: FusionDirectory-109\n"
 "Report-Msgid-Bugs-To: documentation@lists.fusiondirectory.org\n"
-"POT-Creation-Date: 2015-03-19 21:45+0100\n"
-"PO-Revision-Date: 2015-02-25 16:12+0000\n"
+"POT-Creation-Date: 2014-12-15 17:47+0100\n"
+"PO-Revision-Date: 2015-02-25 16:04+0000\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>\n"
-"Language-Team: Chinese (http://www.transifex.com/projects/p/FusionDirectory-108/language/zh/)\n"
+"Language-Team: Chinese (http://www.transifex.com/projects/p/FusionDirectory-109/language/zh/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -46,7 +45,6 @@ msgstr "å…è®¸"
 #: addons/addressbook/class_addressbook.inc:472
 #: addons/addressbook/class_addressbook.inc:476
 #: addons/addressbook/class_addressbook.inc:598
-#: addons/addressbook/dial.tpl.c:5
 msgid "Dial"
 msgstr "æ‹¨å·"
 
@@ -85,7 +83,6 @@ msgstr "å…¨éƒ¨"
 #: addons/addressbook/class_addressbook.inc:697
 #: addons/addressbook/class_addressbook.inc:707
 #: addons/addressbook/class_addressbook.inc:734
-#: addons/addressbook/address_info.tpl.c:5 addons/addressbook/contents.tpl.c:2
 msgid "Name"
 msgstr "åç§°"
 
@@ -114,11 +111,6 @@ msgid "User ID"
 msgstr "ç”¨æˆ· ID"
 
 #: addons/addressbook/class_addressbook.inc:715
-#: addons/addressbook/address_info.tpl.c:20
-#: addons/addressbook/address_info.tpl.c:50
-#: addons/addressbook/contents.tpl.c:5
-#: addons/addressbook/address_edit.tpl.c:26
-#: addons/addressbook/address_edit.tpl.c:56
 msgid "Phone"
 msgstr "ç”µè¯"
 
@@ -127,27 +119,19 @@ msgid "Telephone number"
 msgstr ""
 
 #: addons/addressbook/class_addressbook.inc:721
-#: addons/addressbook/contents.tpl.c:8
 msgid "Fax"
 msgstr "ä¼ çœŸ"
 
 #: addons/addressbook/class_addressbook.inc:724
-#: addons/addressbook/address_info.tpl.c:23
-#: addons/addressbook/contents.tpl.c:11
-#: addons/addressbook/address_edit.tpl.c:29
 msgid "Mobile"
 msgstr "æ‰‹æœº"
 
 #: addons/addressbook/class_addressbook.inc:727
 #: addons/addressbook/class_addressbook.inc:866
-#: addons/addressbook/address_info.tpl.c:56
-#: addons/addressbook/address_edit.tpl.c:62
 msgid "Pager"
 msgstr "å‘¼æœº"
 
 #: addons/addressbook/class_addressbook.inc:739
-#: addons/addressbook/address_info.tpl.c:26
-#: addons/addressbook/address_edit.tpl.c:32
 msgid "Email"
 msgstr "é‚®ä»¶"
 
@@ -198,8 +182,6 @@ msgid "Organization"
 msgstr "ç»„ç»‡/å…¬å¸"
 
 #: addons/addressbook/class_addressbook.inc:868
-#: addons/addressbook/address_info.tpl.c:35
-#: addons/addressbook/address_edit.tpl.c:41
 msgid "Department"
 msgstr "éƒ¨é—¨"
 
@@ -217,8 +199,6 @@ msgid "State"
 msgstr "å·ž/çœ"
 
 #: addons/addressbook/class_addressbook.inc:873
-#: addons/addressbook/address_info.tpl.c:8
-#: addons/addressbook/address_edit.tpl.c:14
 msgid "Initials"
 msgstr "ä¸é—´å"
 
@@ -241,161 +221,3 @@ msgstr ""
 #: html/getvcard.php:39
 msgid "Missing parameters!"
 msgstr ""
-
-#: addons/addressbook/address_info.tpl.c:2
-#: addons/addressbook/address_edit.tpl.c:5
-msgid "Personal"
-msgstr "ä¸ªäºº"
-
-#: addons/addressbook/address_info.tpl.c:11
-#: addons/addressbook/address_edit.tpl.c:17
-msgid "Personal title"
-msgstr "ä¸ªäººç§°è°“"
-
-#: addons/addressbook/address_info.tpl.c:14
-#: addons/addressbook/contents.tpl.c:14
-#: addons/addressbook/address_edit.tpl.c:20
-msgid "Private"
-msgstr "ç§äººç”µè¯"
-
-#: addons/addressbook/address_info.tpl.c:17
-#: addons/addressbook/address_info.tpl.c:47
-#: addons/addressbook/address_edit.tpl.c:23
-#: addons/addressbook/address_edit.tpl.c:53
-msgid "Address"
-msgstr "ä½å€"
-
-#: addons/addressbook/address_info.tpl.c:29
-#: addons/addressbook/address_edit.tpl.c:35
-msgid "Organizational"
-msgstr "ç»„ç»‡"
-
-#: addons/addressbook/address_info.tpl.c:32
-#: addons/addressbook/address_edit.tpl.c:38
-msgid "Company"
-msgstr "å…¬å¸"
-
-#: addons/addressbook/address_info.tpl.c:38
-#: addons/addressbook/address_edit.tpl.c:44
-msgid "City"
-msgstr "åŸŽå¸‚"
-
-#: addons/addressbook/address_info.tpl.c:41
-#: addons/addressbook/address_edit.tpl.c:47
-msgid "Postal code"
-msgstr "é‚®ç¼–"
-
-#: addons/addressbook/address_info.tpl.c:44
-#: addons/addressbook/address_edit.tpl.c:50
-msgid "Country"
-msgstr "å›½å®¶"
-
-#: addons/addressbook/address_info.tpl.c:53
-#: addons/addressbook/address_edit.tpl.c:59
-msgid "FAX"
-msgstr "ä¼ çœŸ"
-
-#: addons/addressbook/dial.tpl.c:2
-msgid "Dial connection..."
-msgstr "æ‹¨å·ä¸..."
-
-#: addons/addressbook/contents.tpl.c:17
-msgid "Contact"
-msgstr "è”ç³»"
-
-#: addons/addressbook/contents.tpl.c:20
-msgid "Information"
-msgstr "æç¤ºä¿¡æ¯"
-
-#: addons/addressbook/contents.tpl.c:23
-msgid ""
-"The telephone list plugin provides list and search facilities for the people in your site. You may want to specify the asterisk [*] like in\n"
-"'Fu*ry' to find 'FusionDirectory'. Use the filters below to narrow down your search."
-msgstr ""
-
-#: addons/addressbook/contents.tpl.c:26
-msgid "Actions"
-msgstr "åŠ¨ä½œ"
-
-#: addons/addressbook/contents.tpl.c:29
-msgid "Add entry"
-msgstr "æ·»åŠ è®°å½•"
-
-#: addons/addressbook/contents.tpl.c:32
-msgid "Edit entry"
-msgstr "ç¼–è¾‘è®°å½•"
-
-#: addons/addressbook/contents.tpl.c:35
-msgid "Remove entry"
-msgstr "åˆ é™¤è®°å½•"
-
-#: addons/addressbook/contents.tpl.c:38
-msgid "Filters"
-msgstr "è¿‡æ»¤å™¨"
-
-#: addons/addressbook/contents.tpl.c:41
-msgid "Select to see regular users"
-msgstr "é€‰æ‹©æŸ¥çœ‹æ™®é€šç”¨æˆ·"
-
-#: addons/addressbook/contents.tpl.c:44
-msgid "Show organizational entries"
-msgstr "æ˜¾ç¤ºç»„ç»‡è®°å½•"
-
-#: addons/addressbook/contents.tpl.c:47
-msgid "Select to see users in addressbook"
-msgstr "é€‰æ‹©æŸ¥çœ‹åœ°å€ç°¿ä¸ç”¨æˆ·"
-
-#: addons/addressbook/contents.tpl.c:50
-msgid "Show addressbook entries"
-msgstr "æ˜¾ç¤ºåœ°å€ç°¿è®°å½•"
-
-#: addons/addressbook/contents.tpl.c:53
-msgid "Display results for department"
-msgstr "æ˜¾ç¤ºéƒ¨é—¨çš„ç»“æžœ"
-
-#: addons/addressbook/contents.tpl.c:56
-msgid "Choose the department the search will be based on"
-msgstr "é€‰æ‹©ä¸€ä¸ªéƒ¨é—¨æ¥åšæŸ¥è¯¢"
-
-#: addons/addressbook/contents.tpl.c:59
-msgid "Match object"
-msgstr "åŒ¹é…å¯¹è±¡"
-
-#: addons/addressbook/contents.tpl.c:62
-msgid "Choose the object that will be searched in"
-msgstr "é€‰æ‹©è¦åœ¨å…¶ä¸æŸ¥è¯¢çš„å¯¹è±¡"
-
-#: addons/addressbook/contents.tpl.c:65
-msgid "Search for"
-msgstr "æŸ¥è¯¢"
-
-#: addons/addressbook/contents.tpl.c:68
-msgid "Search string"
-msgstr "æŸ¥æ‰¾å—ç¬¦ä¸²"
-
-#: addons/addressbook/remove.tpl.c:2
-msgid "Warning"
-msgstr "è¦å‘Š"
-
-#: addons/addressbook/remove.tpl.c:5
-msgid ""
-"This includes all addressbook data in this entry. Please double check if "
-"your really want to do this since there is no way for FusionDirectory to get"
-" your data back."
-msgstr ""
-
-#: addons/addressbook/remove.tpl.c:8
-msgid "So - if you're sure - press 'Delete' to continue or 'Cancel' to abort."
-msgstr "æ‰€ä»¥ï¼Œå¦‚æžœæ‚¨ç¡®å®šï¼Œè¯·æŒ‰â€œåˆ é™¤â€ç»§ç»ï¼Œå¦åˆ™æŒ‰â€œå–æ¶ˆâ€é€€å‡ºã€‚"
-
-#: addons/addressbook/address_edit.tpl.c:2
-msgid "Choose the department to store entry in"
-msgstr "é€‰æ‹©æ”¾ç½®æ¡ç›®çš„éƒ¨é—¨"
-
-#: addons/addressbook/address_edit.tpl.c:8
-msgid "Last name"
-msgstr "å§“"
-
-#: addons/addressbook/address_edit.tpl.c:11
-msgid "First name"
-msgstr "å"
diff --git a/alias/locale/ar/fusiondirectory.po b/alias/locale/ar/fusiondirectory.po
index fa2bb6efb5847267cd3b1ebc7e0a97591169ddbe..6562d0656a2d3a7ebf93b1912a02ee0d727c4315 100644
--- a/alias/locale/ar/fusiondirectory.po
+++ b/alias/locale/ar/fusiondirectory.po
@@ -5,12 +5,12 @@
 # Translators:
 msgid ""
 msgstr ""
-"Project-Id-Version: FusionDirectory-108\n"
+"Project-Id-Version: FusionDirectory-109\n"
 "Report-Msgid-Bugs-To: documentation@lists.fusiondirectory.org\n"
-"POT-Creation-Date: 2015-03-19 21:45+0100\n"
-"PO-Revision-Date: 2015-02-25 16:02+0000\n"
+"POT-Creation-Date: 2014-12-15 17:47+0100\n"
+"PO-Revision-Date: 2015-02-25 16:04+0000\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>\n"
-"Language-Team: Arabic (http://www.transifex.com/projects/p/FusionDirectory-108/language/ar/)\n"
+"Language-Team: Arabic (http://www.transifex.com/projects/p/FusionDirectory-109/language/ar/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
diff --git a/alias/locale/ca/fusiondirectory.po b/alias/locale/ca/fusiondirectory.po
index faf2aa20c040c86faea43ff37c80d5ebfb73b355..1403e1feab7303fe72d0a3e7713591405f2438e1 100644
--- a/alias/locale/ca/fusiondirectory.po
+++ b/alias/locale/ca/fusiondirectory.po
@@ -5,12 +5,12 @@
 # Translators:
 msgid ""
 msgstr ""
-"Project-Id-Version: FusionDirectory-108\n"
+"Project-Id-Version: FusionDirectory-109\n"
 "Report-Msgid-Bugs-To: documentation@lists.fusiondirectory.org\n"
-"POT-Creation-Date: 2015-03-19 21:45+0100\n"
-"PO-Revision-Date: 2015-02-25 16:02+0000\n"
+"POT-Creation-Date: 2014-12-15 17:47+0100\n"
+"PO-Revision-Date: 2015-02-25 16:04+0000\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>\n"
-"Language-Team: Catalan (http://www.transifex.com/projects/p/FusionDirectory-108/language/ca/)\n"
+"Language-Team: Catalan (http://www.transifex.com/projects/p/FusionDirectory-109/language/ca/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
diff --git a/alias/locale/cs_CZ/fusiondirectory.po b/alias/locale/cs_CZ/fusiondirectory.po
index f8cd7c26daca07b1d190960a85e9bc3a09d0fa87..81ba261665eb218427524791f1139454e923abbe 100644
--- a/alias/locale/cs_CZ/fusiondirectory.po
+++ b/alias/locale/cs_CZ/fusiondirectory.po
@@ -3,14 +3,15 @@
 # This file is distributed under the same license as the PACKAGE package.
 # 
 # Translators:
+# Pavel Borecki <pavel.borecki@gmail.com>, 2014-2015
 msgid ""
 msgstr ""
-"Project-Id-Version: FusionDirectory-108\n"
+"Project-Id-Version: FusionDirectory-109\n"
 "Report-Msgid-Bugs-To: documentation@lists.fusiondirectory.org\n"
-"POT-Creation-Date: 2015-03-19 21:45+0100\n"
-"PO-Revision-Date: 2015-02-25 16:51+0000\n"
-"Last-Translator: fusiondirectory <contact@fusiondirectory.org>\n"
-"Language-Team: Czech (Czech Republic) (http://www.transifex.com/projects/p/FusionDirectory-108/language/cs_CZ/)\n"
+"POT-Creation-Date: 2014-12-15 17:47+0100\n"
+"PO-Revision-Date: 2015-04-04 07:11+0000\n"
+"Last-Translator: Pavel Borecki <pavel.borecki@gmail.com>\n"
+"Language-Team: Czech (Czech Republic) (http://www.transifex.com/projects/p/FusionDirectory-109/language/cs_CZ/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -21,59 +22,59 @@ msgstr ""
 #: admin/alias/class_mailAliasDistribution.inc:32
 #: admin/alias/class_mailAliasDistribution.inc:35
 msgid "Temporary mail distribution"
-msgstr ""
+msgstr "DoÄasnÃ¡ distribuce e-mailÅ¯"
 
 #: admin/alias/class_mailAliasDistribution.inc:53
 msgid "Mail distribution"
-msgstr ""
+msgstr "Distribuce e-mailÅ¯"
 
 #: admin/alias/class_mailAliasDistribution.inc:56
 #: admin/alias/class_mailAliasRedirection.inc:55
 msgid "Name"
-msgstr "nÃ¡zev"
+msgstr "NÃ¡zev"
 
 #: admin/alias/class_mailAliasDistribution.inc:56
 msgid "Name to identify this alias"
-msgstr ""
+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"
+msgstr "Popis"
 
 #: admin/alias/class_mailAliasDistribution.inc:58
 msgid "Description of this alias"
-msgstr ""
+msgstr "Popis tohoto alternativnÃho nÃ¡zvu"
 
 #: admin/alias/class_mailAliasDistribution.inc:62
 msgid "Email address"
-msgstr "e-mailovÃ¡ adresa"
+msgstr "E-mailovÃ¡ adresa"
 
 #: admin/alias/class_mailAliasDistribution.inc:67
 msgid "Email aliases"
-msgstr ""
+msgstr "AlternativnÃ nÃ¡zvy e-mailu"
 
 #: admin/alias/class_mailAliasDistribution.inc:67
 msgid "Aliases for this email address"
-msgstr ""
+msgstr "Alternativa tÃ©to e-mailovÃ© adresy"
 
 #: admin/alias/class_mailAliasDistribution.inc:72
 msgid "Mail server"
-msgstr "poÅ¡tovnÃ server"
+msgstr "PoÅ¡tovnÃ server"
 
 #: admin/alias/class_mailAliasDistribution.inc:72
 msgid "Mail server fot this alias"
-msgstr ""
+msgstr "PoÅ¡tovnÃ server pro tento alias"
 
 #: admin/alias/class_mailAliasDistribution.inc:77
 #: admin/alias/class_mailAliasRedirection.inc:73
 msgid "Expiration date"
-msgstr "Datum vyprÅ¡enÃ platnosti"
+msgstr "Datum skonÄenÃ platnosti"
 
 #: admin/alias/class_mailAliasDistribution.inc:77
 msgid ""
 "Date after which the alias should be deleted. Leave empty for no deletion."
-msgstr ""
+msgstr "Datum po kterÃ©m by mÄ›l bÃ½t alternativnÃ nÃ¡zev samoÄinnÄ› smazÃ¡n. Pro nemazÃ¡nÃ ponechte nevyplnÄ›nÃ©."
 
 #: admin/alias/class_mailAliasRedirection.inc:31
 #: admin/alias/class_mailAliasRedirection.inc:32
@@ -83,41 +84,41 @@ msgstr "DoÄasnÃ© pÅ™esmÄ›rovÃ¡nÃ e-mailÅ¯"
 
 #: admin/alias/class_mailAliasRedirection.inc:52
 msgid "Mail redirection"
-msgstr ""
+msgstr "PÅ™esmÄ›rovÃ¡nÃ e-mailu"
 
 #: admin/alias/class_mailAliasRedirection.inc:55
 msgid "Name to identify this redirection"
-msgstr ""
+msgstr "NÃ¡zev identifikujÃcÃ toto pÅ™esmÄ›rovÃ¡nÃ"
 
 #: admin/alias/class_mailAliasRedirection.inc:57
 msgid "Description of this redirection"
-msgstr ""
+msgstr "Popis tohoto pÅ™esmÄ›rovÃ¡nÃ"
 
 #: admin/alias/class_mailAliasRedirection.inc:62
 msgid "Redirect from"
-msgstr ""
+msgstr "PÅ™esmÄ›rovat z"
 
 #: admin/alias/class_mailAliasRedirection.inc:62
 msgid "Mail address from which you want to redirect"
-msgstr ""
+msgstr "E-mailovÃ¡ adresa, ze kterÃ© chcete pÅ™esmÄ›rovat"
 
 #: admin/alias/class_mailAliasRedirection.inc:68
 msgid "Redirect to"
-msgstr ""
+msgstr "PÅ™esmÄ›rovat na"
 
 #: admin/alias/class_mailAliasRedirection.inc:68
 msgid "Destination of this redirection"
-msgstr ""
+msgstr "CÃl tohoto pÅ™esmÄ›rovÃ¡nÃ"
 
 #: admin/alias/class_mailAliasRedirection.inc:73
 msgid ""
 "Date after which the redirection should be deleted. Leave empty for no "
 "deletion."
-msgstr ""
+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_aliasManagement.inc:33
 msgid "Aliases"
-msgstr "alternativnÃ nÃ¡zev (alias)"
+msgstr "AlternativnÃ nÃ¡zvy"
 
 #: admin/alias/class_aliasManagement.inc:34
 msgid "Alias management"
@@ -125,15 +126,15 @@ msgstr "ZprÃ¡va pÅ™ezdÃvek"
 
 #: admin/alias/class_aliasManagement.inc:38
 msgid "Mail aliases"
-msgstr ""
+msgstr "AlternativnÃ nÃ¡zvy e-mailu"
 
 #: config/alias/class_aliasConfig.inc:28
 msgid "Alias configuration"
-msgstr ""
+msgstr "NastavenÃ alternativnÃho nÃ¡zvu"
 
 #: config/alias/class_aliasConfig.inc:29
 msgid "FusionDirectory alias plugin configuration"
-msgstr ""
+msgstr "NastavenÃ zÃ¡suvnÃ©ho modulu alias pro FusionDirecotry"
 
 #: config/alias/class_aliasConfig.inc:42
 msgid "Alias"
@@ -141,8 +142,8 @@ msgstr "alternativnÃ nÃ¡zev (alias)"
 
 #: config/alias/class_aliasConfig.inc:45
 msgid "Alias RDN"
-msgstr ""
+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 ""
+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 63d6f287069bc878444ca11ac26d68b89136a20c..f8e4bb74b4cfb1cab6d64764f9179f22eeb98b27 100644
--- a/alias/locale/de/fusiondirectory.po
+++ b/alias/locale/de/fusiondirectory.po
@@ -3,15 +3,14 @@
 # This file is distributed under the same license as the PACKAGE package.
 # 
 # Translators:
-# Maik Wagner <maikwagner@yahoo.com>, 2013
 msgid ""
 msgstr ""
-"Project-Id-Version: FusionDirectory-108\n"
+"Project-Id-Version: FusionDirectory-109\n"
 "Report-Msgid-Bugs-To: documentation@lists.fusiondirectory.org\n"
-"POT-Creation-Date: 2015-03-19 21:45+0100\n"
+"POT-Creation-Date: 2014-12-15 17:47+0100\n"
 "PO-Revision-Date: 2015-02-25 16:51+0000\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>\n"
-"Language-Team: German (http://www.transifex.com/projects/p/FusionDirectory-108/language/de/)\n"
+"Language-Team: German (http://www.transifex.com/projects/p/FusionDirectory-109/language/de/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -84,7 +83,7 @@ msgstr "TemporÃ¤re Mailumleitung"
 
 #: admin/alias/class_mailAliasRedirection.inc:52
 msgid "Mail redirection"
-msgstr "Mailumleitung"
+msgstr "Mailweiterleitung"
 
 #: admin/alias/class_mailAliasRedirection.inc:55
 msgid "Name to identify this redirection"
diff --git a/alias/locale/el_GR/fusiondirectory.po b/alias/locale/el_GR/fusiondirectory.po
new file mode 100644
index 0000000000000000000000000000000000000000..60d1232515fbecd983b8aee08bfb507e80896b11
--- /dev/null
+++ b/alias/locale/el_GR/fusiondirectory.po
@@ -0,0 +1,148 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR FusionDirectory Project
+# This file is distributed under the same license as the PACKAGE package.
+# 
+# Translators:
+msgid ""
+msgstr ""
+"Project-Id-Version: FusionDirectory-109\n"
+"Report-Msgid-Bugs-To: documentation@lists.fusiondirectory.org\n"
+"POT-Creation-Date: 2014-12-15 17:47+0100\n"
+"PO-Revision-Date: 2015-05-30 11:45+0000\n"
+"Last-Translator: Benoit Mortier <benoit.mortier@opensides.be>\n"
+"Language-Team: Greek (Greece) (http://www.transifex.com/projects/p/FusionDirectory-109/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/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 ""
+
+#: admin/alias/class_mailAliasDistribution.inc:72
+msgid "Mail server"
+msgstr ""
+
+#: admin/alias/class_mailAliasDistribution.inc:72
+msgid "Mail server fot this alias"
+msgstr ""
+
+#: admin/alias/class_mailAliasDistribution.inc:77
+#: admin/alias/class_mailAliasRedirection.inc:73
+msgid "Expiration date"
+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_mailAliasRedirection.inc:31
+#: admin/alias/class_mailAliasRedirection.inc:32
+#: admin/alias/class_mailAliasRedirection.inc:35
+msgid "Temporary mail redirection"
+msgstr ""
+
+#: admin/alias/class_mailAliasRedirection.inc:52
+msgid "Mail redirection"
+msgstr ""
+
+#: admin/alias/class_mailAliasRedirection.inc:55
+msgid "Name to identify this redirection"
+msgstr ""
+
+#: admin/alias/class_mailAliasRedirection.inc:57
+msgid "Description of this redirection"
+msgstr ""
+
+#: admin/alias/class_mailAliasRedirection.inc:62
+msgid "Redirect from"
+msgstr ""
+
+#: admin/alias/class_mailAliasRedirection.inc:62
+msgid "Mail address from which you want to redirect"
+msgstr ""
+
+#: admin/alias/class_mailAliasRedirection.inc:68
+msgid "Redirect to"
+msgstr ""
+
+#: admin/alias/class_mailAliasRedirection.inc:68
+msgid "Destination of this redirection"
+msgstr ""
+
+#: admin/alias/class_mailAliasRedirection.inc:73
+msgid ""
+"Date after which the redirection should be deleted. Leave empty for no "
+"deletion."
+msgstr ""
+
+#: admin/alias/class_aliasManagement.inc:33
+msgid "Aliases"
+msgstr ""
+
+#: admin/alias/class_aliasManagement.inc:34
+msgid "Alias management"
+msgstr ""
+
+#: admin/alias/class_aliasManagement.inc:38
+msgid "Mail aliases"
+msgstr ""
+
+#: config/alias/class_aliasConfig.inc:28
+msgid "Alias configuration"
+msgstr ""
+
+#: config/alias/class_aliasConfig.inc:29
+msgid "FusionDirectory alias plugin configuration"
+msgstr ""
+
+#: config/alias/class_aliasConfig.inc:42
+msgid "Alias"
+msgstr ""
+
+#: config/alias/class_aliasConfig.inc:45
+msgid "Alias RDN"
+msgstr ""
+
+#: config/alias/class_aliasConfig.inc:45
+msgid "Branch in which aliases will be stored"
+msgstr ""
diff --git a/alias/locale/en/fusiondirectory.po b/alias/locale/en/fusiondirectory.po
index a455b67a9e8a5e9680c63c559978eb0ebef9fa5c..8f868503ec82ff01ce28cdd0f7a1607d43f4dc8f 100644
--- a/alias/locale/en/fusiondirectory.po
+++ b/alias/locale/en/fusiondirectory.po
@@ -6,13 +6,13 @@
 #, fuzzy
 msgid ""
 msgstr ""
-"Project-Id-Version: PACKAGE VERSION\n"
-"Report-Msgid-Bugs-To: documentation@lists.fusiondirectory.org\n"
-"POT-Creation-Date: 2015-03-31 11:49+0200\n"
+"Project-Id-Version: FusionDirectory VERSION\n"
+"Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
+"POT-Creation-Date: 2015-05-30 15:30+0200\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
-"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
-"Language-Team: LANGUAGE <LL@li.org>\n"
-"Language: \n"
+"Last-Translator: FusionDirectory project <contact@fusiondirectory.org>\n"
+"Language-Team: English\n"
+"Language: en\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -62,7 +62,7 @@ msgid "Mail server"
 msgstr ""
 
 #: admin/alias/class_mailAliasDistribution.inc:72
-msgid "Mail server fot this alias"
+msgid "Mail server for this alias"
 msgstr ""
 
 #: admin/alias/class_mailAliasDistribution.inc:77
diff --git a/alias/locale/es/fusiondirectory.po b/alias/locale/es/fusiondirectory.po
index 5797c715b6606cb6e93bbcc167bd91f3d2493eb7..dc447ef7d26b2d954473adaa63a76fb50d4babc2 100644
--- a/alias/locale/es/fusiondirectory.po
+++ b/alias/locale/es/fusiondirectory.po
@@ -5,12 +5,12 @@
 # Translators:
 msgid ""
 msgstr ""
-"Project-Id-Version: FusionDirectory-108\n"
+"Project-Id-Version: FusionDirectory-109\n"
 "Report-Msgid-Bugs-To: documentation@lists.fusiondirectory.org\n"
-"POT-Creation-Date: 2015-03-19 21:45+0100\n"
+"POT-Creation-Date: 2014-12-15 17:47+0100\n"
 "PO-Revision-Date: 2015-02-25 16:51+0000\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>\n"
-"Language-Team: Spanish (http://www.transifex.com/projects/p/FusionDirectory-108/language/es/)\n"
+"Language-Team: Spanish (http://www.transifex.com/projects/p/FusionDirectory-109/language/es/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
diff --git a/alias/locale/es_VE/fusiondirectory.po b/alias/locale/es_VE/fusiondirectory.po
index 8e6e061782ceb66d881c61174c8ab6ce6a51977c..d22b0a62d41e1c6384f2fc6969ffc1e344eb0f58 100644
--- a/alias/locale/es_VE/fusiondirectory.po
+++ b/alias/locale/es_VE/fusiondirectory.po
@@ -5,12 +5,12 @@
 # Translators:
 msgid ""
 msgstr ""
-"Project-Id-Version: FusionDirectory-108\n"
+"Project-Id-Version: FusionDirectory-109\n"
 "Report-Msgid-Bugs-To: documentation@lists.fusiondirectory.org\n"
-"POT-Creation-Date: 2015-03-19 21:45+0100\n"
+"POT-Creation-Date: 2014-12-15 17:47+0100\n"
 "PO-Revision-Date: 2015-02-25 16:51+0000\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>\n"
-"Language-Team: Spanish (Venezuela) (http://www.transifex.com/projects/p/FusionDirectory-108/language/es_VE/)\n"
+"Language-Team: Spanish (Venezuela) (http://www.transifex.com/projects/p/FusionDirectory-109/language/es_VE/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
diff --git a/alias/locale/fa_IR/fusiondirectory.po b/alias/locale/fa_IR/fusiondirectory.po
index 3eeb72142dba8c061015b211a6f248b1c7ee58ce..8d5b76436b83ee5d25d76b0e2e4ed445963030e5 100644
--- a/alias/locale/fa_IR/fusiondirectory.po
+++ b/alias/locale/fa_IR/fusiondirectory.po
@@ -5,12 +5,12 @@
 # Translators:
 msgid ""
 msgstr ""
-"Project-Id-Version: FusionDirectory-108\n"
+"Project-Id-Version: FusionDirectory-109\n"
 "Report-Msgid-Bugs-To: documentation@lists.fusiondirectory.org\n"
-"POT-Creation-Date: 2015-03-19 21:45+0100\n"
-"PO-Revision-Date: 2014-12-12 07:33+0000\n"
+"POT-Creation-Date: 2014-12-15 17:47+0100\n"
+"PO-Revision-Date: 2014-12-15 16:47+0000\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>\n"
-"Language-Team: Persian (Iran) (http://www.transifex.com/projects/p/FusionDirectory-108/language/fa_IR/)\n"
+"Language-Team: Persian (Iran) (http://www.transifex.com/projects/p/FusionDirectory-109/language/fa_IR/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
diff --git a/alias/locale/fr/fusiondirectory.po b/alias/locale/fr/fusiondirectory.po
index 19a1ef84ce9dcd7c59d9d79c171e3841fb3523cb..f8d411df04affdc672d26920c008ac39aa446e8f 100644
--- a/alias/locale/fr/fusiondirectory.po
+++ b/alias/locale/fr/fusiondirectory.po
@@ -3,20 +3,14 @@
 # This file is distributed under the same license as the PACKAGE package.
 # 
 # Translators:
-# gallak <antoine.gallavardin@free.fr>, 2013
-# MCMic, 2014
-# fusiondirectory <contact@fusiondirectory.org>, 2012
-# fusiondirectory <contact@fusiondirectory.org>, 2012
-# gallak <antoine.gallavardin@free.fr>, 2013
-# MCMic, 2014
 msgid ""
 msgstr ""
-"Project-Id-Version: FusionDirectory-108\n"
+"Project-Id-Version: FusionDirectory-109\n"
 "Report-Msgid-Bugs-To: documentation@lists.fusiondirectory.org\n"
-"POT-Creation-Date: 2015-03-19 21:45+0100\n"
+"POT-Creation-Date: 2014-12-15 17:47+0100\n"
 "PO-Revision-Date: 2015-02-25 16:51+0000\n"
-"Last-Translator: MCMic\n"
-"Language-Team: French (http://www.transifex.com/projects/p/FusionDirectory-108/language/fr/)\n"
+"Last-Translator: fusiondirectory <contact@fusiondirectory.org>\n"
+"Language-Team: French (http://www.transifex.com/projects/p/FusionDirectory-109/language/fr/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -79,7 +73,7 @@ msgstr "Date d'expiration"
 #: 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."
+msgstr "Date aprÃ¨s laquelle cet alias doit Ãªtre effacÃ©. laisser vide pour aucune expiration"
 
 #: admin/alias/class_mailAliasRedirection.inc:31
 #: admin/alias/class_mailAliasRedirection.inc:32
@@ -119,7 +113,7 @@ msgstr "Destination de la redirection"
 msgid ""
 "Date after which the redirection should be deleted. Leave empty for no "
 "deletion."
-msgstr "Date aprÃ¨s laquelle cet alias doit Ãªtre effacÃ©. Laisser vide pour aucune expiration."
+msgstr "Date aprÃ¨s laquelle cet alias doit Ãªtre effacÃ©. laisser vide pour aucune expiration"
 
 #: admin/alias/class_aliasManagement.inc:33
 msgid "Aliases"
@@ -147,7 +141,7 @@ msgstr "Alias"
 
 #: config/alias/class_aliasConfig.inc:45
 msgid "Alias RDN"
-msgstr "Branche des alias"
+msgstr "Alias RDN"
 
 #: config/alias/class_aliasConfig.inc:45
 msgid "Branch in which aliases will be stored"
diff --git a/alias/locale/id/fusiondirectory.po b/alias/locale/id/fusiondirectory.po
index 8cdff670a7b4d127d534f372b32d1ddc94408d69..0e25b3936a3f9ffcc98fbec11b8e35305dcca83d 100644
--- a/alias/locale/id/fusiondirectory.po
+++ b/alias/locale/id/fusiondirectory.po
@@ -5,12 +5,12 @@
 # Translators:
 msgid ""
 msgstr ""
-"Project-Id-Version: FusionDirectory-108\n"
+"Project-Id-Version: FusionDirectory-109\n"
 "Report-Msgid-Bugs-To: documentation@lists.fusiondirectory.org\n"
-"POT-Creation-Date: 2015-03-19 21:45+0100\n"
-"PO-Revision-Date: 2014-12-12 07:33+0000\n"
+"POT-Creation-Date: 2014-12-15 17:47+0100\n"
+"PO-Revision-Date: 2014-12-15 16:47+0000\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>\n"
-"Language-Team: Indonesian (http://www.transifex.com/projects/p/FusionDirectory-108/language/id/)\n"
+"Language-Team: Indonesian (http://www.transifex.com/projects/p/FusionDirectory-109/language/id/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
diff --git a/alias/locale/it/fusiondirectory.po b/alias/locale/it/fusiondirectory.po
index 743e8f6b506011d3d2a5021de9328a9300f548a8..e5bdb28e8745f928733b56a37ed1aa03789e0927 100644
--- a/alias/locale/it/fusiondirectory.po
+++ b/alias/locale/it/fusiondirectory.po
@@ -3,16 +3,14 @@
 # This file is distributed under the same license as the PACKAGE package.
 # 
 # Translators:
-# poterealpopolo <giuliano@opensides.be>, 2013
-# poterealpopolo <giuliano@opensides.be>, 2013
 msgid ""
 msgstr ""
-"Project-Id-Version: FusionDirectory-108\n"
+"Project-Id-Version: FusionDirectory-109\n"
 "Report-Msgid-Bugs-To: documentation@lists.fusiondirectory.org\n"
-"POT-Creation-Date: 2015-03-19 21:45+0100\n"
+"POT-Creation-Date: 2014-12-15 17:47+0100\n"
 "PO-Revision-Date: 2015-02-25 16:51+0000\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>\n"
-"Language-Team: Italian (http://www.transifex.com/projects/p/FusionDirectory-108/language/it/)\n"
+"Language-Team: Italian (http://www.transifex.com/projects/p/FusionDirectory-109/language/it/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
diff --git a/alias/locale/lv/fusiondirectory.po b/alias/locale/lv/fusiondirectory.po
index ae99369649d8cd400668167d908c1d8370f2c300..cf0e7d125a42e4a8ed92c9596610d587a86d430d 100644
--- a/alias/locale/lv/fusiondirectory.po
+++ b/alias/locale/lv/fusiondirectory.po
@@ -5,12 +5,12 @@
 # Translators:
 msgid ""
 msgstr ""
-"Project-Id-Version: FusionDirectory-108\n"
+"Project-Id-Version: FusionDirectory-109\n"
 "Report-Msgid-Bugs-To: documentation@lists.fusiondirectory.org\n"
-"POT-Creation-Date: 2015-03-19 21:45+0100\n"
-"PO-Revision-Date: 2014-12-12 07:33+0000\n"
+"POT-Creation-Date: 2014-12-15 17:47+0100\n"
+"PO-Revision-Date: 2014-12-15 16:47+0000\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>\n"
-"Language-Team: Latvian (http://www.transifex.com/projects/p/FusionDirectory-108/language/lv/)\n"
+"Language-Team: Latvian (http://www.transifex.com/projects/p/FusionDirectory-109/language/lv/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
diff --git a/alias/locale/nb/fusiondirectory.po b/alias/locale/nb/fusiondirectory.po
index 3131a3d9fb64d51df25aa0819b06c9559a95655f..a86b91c31094c44d8b621d7e4fd79c8880941654 100644
--- a/alias/locale/nb/fusiondirectory.po
+++ b/alias/locale/nb/fusiondirectory.po
@@ -5,12 +5,12 @@
 # Translators:
 msgid ""
 msgstr ""
-"Project-Id-Version: FusionDirectory-108\n"
+"Project-Id-Version: FusionDirectory-109\n"
 "Report-Msgid-Bugs-To: documentation@lists.fusiondirectory.org\n"
-"POT-Creation-Date: 2015-03-19 21:45+0100\n"
-"PO-Revision-Date: 2015-02-25 16:02+0000\n"
+"POT-Creation-Date: 2014-12-15 17:47+0100\n"
+"PO-Revision-Date: 2015-02-25 16:04+0000\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>\n"
-"Language-Team: Norwegian BokmÃ¥l (http://www.transifex.com/projects/p/FusionDirectory-108/language/nb/)\n"
+"Language-Team: Norwegian BokmÃ¥l (http://www.transifex.com/projects/p/FusionDirectory-109/language/nb/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
diff --git a/alias/locale/nl/fusiondirectory.po b/alias/locale/nl/fusiondirectory.po
index 96a57bf3583e076d984213414dddd21309a6baa4..799a982ec6efb1c15a4307eeabb731058a752330 100644
--- a/alias/locale/nl/fusiondirectory.po
+++ b/alias/locale/nl/fusiondirectory.po
@@ -5,12 +5,12 @@
 # Translators:
 msgid ""
 msgstr ""
-"Project-Id-Version: FusionDirectory-108\n"
+"Project-Id-Version: FusionDirectory-109\n"
 "Report-Msgid-Bugs-To: documentation@lists.fusiondirectory.org\n"
-"POT-Creation-Date: 2015-03-19 21:45+0100\n"
+"POT-Creation-Date: 2014-12-15 17:47+0100\n"
 "PO-Revision-Date: 2015-02-25 16:51+0000\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>\n"
-"Language-Team: Dutch (http://www.transifex.com/projects/p/FusionDirectory-108/language/nl/)\n"
+"Language-Team: Dutch (http://www.transifex.com/projects/p/FusionDirectory-109/language/nl/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -39,7 +39,7 @@ msgstr "Naam om deze alias te identificeren"
 #: admin/alias/class_mailAliasDistribution.inc:58
 #: admin/alias/class_mailAliasRedirection.inc:57
 msgid "Description"
-msgstr "Beschrijving"
+msgstr "Omschrijving"
 
 #: admin/alias/class_mailAliasDistribution.inc:58
 msgid "Description of this alias"
diff --git a/alias/locale/pl/fusiondirectory.po b/alias/locale/pl/fusiondirectory.po
index ba329a6d0c4515ad0d28b1332f779fdea8209164..2929648dc7d39ac248d0b4ace4130df0a3c34e65 100644
--- a/alias/locale/pl/fusiondirectory.po
+++ b/alias/locale/pl/fusiondirectory.po
@@ -5,12 +5,12 @@
 # Translators:
 msgid ""
 msgstr ""
-"Project-Id-Version: FusionDirectory-108\n"
+"Project-Id-Version: FusionDirectory-109\n"
 "Report-Msgid-Bugs-To: documentation@lists.fusiondirectory.org\n"
-"POT-Creation-Date: 2015-03-19 21:45+0100\n"
+"POT-Creation-Date: 2014-12-15 17:47+0100\n"
 "PO-Revision-Date: 2015-02-25 16:51+0000\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>\n"
-"Language-Team: Polish (http://www.transifex.com/projects/p/FusionDirectory-108/language/pl/)\n"
+"Language-Team: Polish (http://www.transifex.com/projects/p/FusionDirectory-109/language/pl/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
diff --git a/alias/locale/pt/fusiondirectory.po b/alias/locale/pt/fusiondirectory.po
index 3e41baac0a8a808766c71c117a0c19706cb5691b..2d34b89bc1915d8bda5decf88c8cf77dff19f0e7 100644
--- a/alias/locale/pt/fusiondirectory.po
+++ b/alias/locale/pt/fusiondirectory.po
@@ -5,12 +5,12 @@
 # Translators:
 msgid ""
 msgstr ""
-"Project-Id-Version: FusionDirectory-108\n"
+"Project-Id-Version: FusionDirectory-109\n"
 "Report-Msgid-Bugs-To: documentation@lists.fusiondirectory.org\n"
-"POT-Creation-Date: 2015-03-19 21:45+0100\n"
-"PO-Revision-Date: 2015-02-25 16:02+0000\n"
+"POT-Creation-Date: 2014-12-15 17:47+0100\n"
+"PO-Revision-Date: 2015-02-25 16:04+0000\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>\n"
-"Language-Team: Portuguese (http://www.transifex.com/projects/p/FusionDirectory-108/language/pt/)\n"
+"Language-Team: Portuguese (http://www.transifex.com/projects/p/FusionDirectory-109/language/pt/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
diff --git a/alias/locale/pt_BR/fusiondirectory.po b/alias/locale/pt_BR/fusiondirectory.po
index 2dee3eae225d0511181ca087c11c8d1ea60296ae..f31683742358fe383e2e7861d8e93ad299029b0b 100644
--- a/alias/locale/pt_BR/fusiondirectory.po
+++ b/alias/locale/pt_BR/fusiondirectory.po
@@ -3,17 +3,14 @@
 # This file is distributed under the same license as the PACKAGE package.
 # 
 # Translators:
-# ALEJANDRO BARRIOS <alejandrobarrios@interlegis.leg.br>, 2014
-# kayocarneiro <kayomatheus@gmail.com>, 2014
-# kayocarneiro <kayomatheus@gmail.com>, 2014
 msgid ""
 msgstr ""
-"Project-Id-Version: FusionDirectory-108\n"
+"Project-Id-Version: FusionDirectory-109\n"
 "Report-Msgid-Bugs-To: documentation@lists.fusiondirectory.org\n"
-"POT-Creation-Date: 2015-03-19 21:45+0100\n"
+"POT-Creation-Date: 2014-12-15 17:47+0100\n"
 "PO-Revision-Date: 2015-02-25 16:51+0000\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>\n"
-"Language-Team: Portuguese (Brazil) (http://www.transifex.com/projects/p/FusionDirectory-108/language/pt_BR/)\n"
+"Language-Team: Portuguese (Brazil) (http://www.transifex.com/projects/p/FusionDirectory-109/language/pt_BR/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
diff --git a/alias/locale/ru/fusiondirectory.po b/alias/locale/ru/fusiondirectory.po
index 8cd0543db735c49f565c6c0bff7cef35bb7044cf..58bb7a056ac08f7dc99181849cd4a25bdb331b45 100644
--- a/alias/locale/ru/fusiondirectory.po
+++ b/alias/locale/ru/fusiondirectory.po
@@ -5,17 +5,17 @@
 # Translators:
 msgid ""
 msgstr ""
-"Project-Id-Version: FusionDirectory-108\n"
+"Project-Id-Version: FusionDirectory-109\n"
 "Report-Msgid-Bugs-To: documentation@lists.fusiondirectory.org\n"
-"POT-Creation-Date: 2015-03-19 21:45+0100\n"
-"PO-Revision-Date: 2015-03-06 07:10+0000\n"
+"POT-Creation-Date: 2014-12-15 17:47+0100\n"
+"PO-Revision-Date: 2015-04-07 13:01+0000\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>\n"
-"Language-Team: Russian (http://www.transifex.com/projects/p/FusionDirectory-108/language/ru/)\n"
+"Language-Team: Russian (http://www.transifex.com/projects/p/FusionDirectory-109/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=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);\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
@@ -34,7 +34,7 @@ msgstr "Ð¤Ð°Ð¼Ð¸Ð»Ð¸Ñ"
 
 #: admin/alias/class_mailAliasDistribution.inc:56
 msgid "Name to identify this alias"
-msgstr ""
+msgstr "Ð˜Ð¼Ñ Ð¾Ð¿Ñ€ÐµÐ´ÐµÐ»ÑÑŽÑ‰ÐµÐµ ÑÑ‚Ð¾Ñ‚ Ð¿ÑÐµÐ²Ð¾Ð´Ð¾Ð½Ð¸Ð¼"
 
 #: admin/alias/class_mailAliasDistribution.inc:58
 #: admin/alias/class_mailAliasRedirection.inc:57
@@ -43,7 +43,7 @@ msgstr "ÐžÐ¿Ð¸ÑÐ°Ð½Ð¸Ðµ"
 
 #: admin/alias/class_mailAliasDistribution.inc:58
 msgid "Description of this alias"
-msgstr ""
+msgstr "ÐžÐ¿Ð¸ÑÐ°Ð½Ð¸Ðµ Ð¿ÑÐµÐ²Ð¾Ð´Ð¾Ð½Ð¸Ð¼Ð°"
 
 #: admin/alias/class_mailAliasDistribution.inc:62
 msgid "Email address"
@@ -51,77 +51,77 @@ msgstr "ÐÐ´Ñ€ÐµÑ ÑÐ»ÐµÐºÑ‚Ñ€Ð¾Ð½Ð½Ð¾Ð¹ Ð¿Ð¾Ñ‡Ñ‚Ñ‹"
 
 #: admin/alias/class_mailAliasDistribution.inc:67
 msgid "Email aliases"
-msgstr ""
+msgstr "ÐŸÑÐµÐ²Ð´Ð¾Ð½Ð¸Ð¼Ñ‹ ÑÐ»ÐµÐºÑ‚Ñ€Ð¾Ð½Ð½Ð¾Ð¹ Ð¿Ð¾Ñ‡Ñ‚Ñ‹"
 
 #: admin/alias/class_mailAliasDistribution.inc:67
 msgid "Aliases for this email address"
-msgstr ""
+msgstr "ÐŸÑÐµÐ²Ð´Ð¾Ð½Ð¸Ð¼Ñ‹ Ð´Ð»Ñ Ð°Ð´Ñ€ÐµÑÐ° ÑÐ»ÐµÐºÑ‚Ñ€Ð¾Ð½Ð½Ð¾Ð¹ Ð¿Ð¾Ñ‡Ñ‚Ñ‹"
 
 #: admin/alias/class_mailAliasDistribution.inc:72
 msgid "Mail server"
-msgstr ""
+msgstr "ÐŸÐ¾Ñ‡Ñ‚Ð¾Ð²Ñ‹Ð¹ ÑÐµÑ€Ð²ÐµÑ€"
 
 #: admin/alias/class_mailAliasDistribution.inc:72
 msgid "Mail server fot this alias"
-msgstr ""
+msgstr "ÐŸÐ¾Ñ‡Ñ‚Ð¾Ð²Ñ‹Ð¹ ÑÐµÑ€Ð²ÐµÑ€ Ð´Ð»Ñ ÑÑ‚Ð¾Ð³Ð¾ Ð¿ÑÐµÐ²Ð¾Ð´Ð¾Ð½Ð¸Ð¼Ð°"
 
 #: admin/alias/class_mailAliasDistribution.inc:77
 #: admin/alias/class_mailAliasRedirection.inc:73
 msgid "Expiration date"
-msgstr ""
+msgstr "Ð”Ð°Ñ‚Ð° Ð¾ÐºÐ¾Ð½Ñ‡Ð°Ð½Ð¸Ñ Ð´ÐµÐ¹ÑÑ‚Ð²Ð¸Ñ"
 
 #: admin/alias/class_mailAliasDistribution.inc:77
 msgid ""
 "Date after which the alias should be deleted. Leave empty for no deletion."
-msgstr ""
+msgstr "Ð”Ð°Ñ‚Ð° Ð¿Ð¾ÑÐ»Ðµ ÐºÐ¾Ñ‚Ð¾Ñ€Ð¾Ð¹ Ð¿ÑÐµÐ²Ð´Ð¾Ð½Ð¸Ð¼ Ð±ÑƒÐ´ÐµÑ‚ ÑƒÐ´Ð°Ð»ÐµÐ½. ÐžÑÑ‚Ð°Ð²Ð¸Ñ‚ÑŒ Ð¿ÑƒÑÑ‚Ñ‹Ð¼, ÐµÑÐ»Ð¸ ÑƒÐ´Ð°Ð»ÑÑ‚ÑŒ Ð½Ðµ Ð½ÑƒÐ¶Ð½Ð¾."
 
 #: admin/alias/class_mailAliasRedirection.inc:31
 #: admin/alias/class_mailAliasRedirection.inc:32
 #: admin/alias/class_mailAliasRedirection.inc:35
 msgid "Temporary mail redirection"
-msgstr ""
+msgstr "Ð’Ñ€ÐµÐ¼ÐµÐ½Ð½Ð¾Ðµ Ð¿ÐµÑ€ÐµÐ½Ð°Ð¿Ñ€Ð°Ð²Ð»ÐµÐ½Ð¸Ðµ Ð¿Ð¾Ñ‡Ñ‚Ñ‹"
 
 #: admin/alias/class_mailAliasRedirection.inc:52
 msgid "Mail redirection"
-msgstr ""
+msgstr "ÐŸÐµÑ€ÐµÐ½Ð°Ð¿Ñ€Ð°Ð²Ð»ÐµÐ½Ð¸Ðµ Ð¿Ð¾Ñ‡Ñ‚Ñ‹"
 
 #: admin/alias/class_mailAliasRedirection.inc:55
 msgid "Name to identify this redirection"
-msgstr ""
+msgstr "ÐÐ°Ð·Ð²Ð°Ð½Ð¸Ðµ Ð¾Ð¿Ñ€ÐµÐ´ÐµÐ»ÑÑŽÑ‰ÐµÐµ ÑÑ‚Ð¾ Ð¿ÐµÑ€ÐµÐ½Ð°Ð¿Ñ€Ð°Ð²Ð»ÐµÐ½Ð¸Ðµ"
 
 #: admin/alias/class_mailAliasRedirection.inc:57
 msgid "Description of this redirection"
-msgstr ""
+msgstr "ÐžÐ¿Ð¸ÑÐ°Ð½Ð¸Ðµ ÑÑ‚Ð¾Ð³Ð¾ Ð¿ÐµÑ€ÐµÐ½Ð°Ð¿Ñ€Ð°Ð²Ð»ÐµÐ½Ð¸Ñ"
 
 #: admin/alias/class_mailAliasRedirection.inc:62
 msgid "Redirect from"
-msgstr ""
+msgstr "ÐŸÐµÑ€ÐµÐ½Ð°Ð¿Ñ€Ð°Ð²Ð¸Ñ‚ÑŒ Ð¾Ñ‚ÐºÑƒÐ´Ð°"
 
 #: admin/alias/class_mailAliasRedirection.inc:62
 msgid "Mail address from which you want to redirect"
-msgstr ""
+msgstr "ÐÐ´Ñ€ÐµÑ ÑÐ»ÐµÐºÑ‚Ñ€Ð¾Ð½Ð½Ð¾Ð¹ Ð¿Ð¾Ñ‡Ñ‚Ñ‹ Ñ ÐºÐ¾Ñ‚Ð¾Ñ€Ð¾Ð³Ð¾ Ð²Ñ‹ Ñ…Ð¾Ñ‚Ð¸Ñ‚Ðµ Ð¿ÐµÑ€ÐµÐ½Ð°Ð¿Ñ€Ð°Ð²Ð»ÑÑ‚ÑŒ"
 
 #: admin/alias/class_mailAliasRedirection.inc:68
 msgid "Redirect to"
-msgstr ""
+msgstr "ÐŸÐµÑ€ÐµÐ½Ð°Ð¿Ñ€Ð°Ð²Ð¸Ñ‚ÑŒ ÐºÑƒÐ´Ð°"
 
 #: admin/alias/class_mailAliasRedirection.inc:68
 msgid "Destination of this redirection"
-msgstr ""
+msgstr "ÐÐ´Ñ€ÐµÑ Ð½Ð°Ð·Ð½Ð°Ñ‡ÐµÐ½Ð¸Ñ Ð´Ð»Ñ ÑÑ‚Ð¾Ð³Ð¾ Ð¿ÐµÑ€ÐµÐ½Ð°Ð¿Ñ€Ð°Ð²Ð»ÐµÐ½Ð¸Ñ"
 
 #: admin/alias/class_mailAliasRedirection.inc:73
 msgid ""
 "Date after which the redirection should be deleted. Leave empty for no "
 "deletion."
-msgstr ""
+msgstr "Ð”Ð°Ñ‚Ð° Ð¿Ð¾ÑÐ»Ðµ ÐºÐ¾Ñ‚Ð¾Ñ€Ð¾Ð¹ Ð¿ÐµÑ€ÐµÐ½Ð°Ð¿Ñ€Ð°Ð²Ð»ÐµÐ½Ð¸Ðµ Ð±ÑƒÐ´ÐµÑ‚ ÑƒÐ´Ð°Ð»ÐµÐ½Ð¾. ÐžÑÑ‚Ð°Ð²Ð¸Ñ‚ÑŒ Ð¿ÑƒÑÑ‚Ñ‹Ð¼, ÐµÑÐ»Ð¸ ÑƒÐ´Ð°Ð»ÑÑ‚ÑŒ Ð½Ðµ Ð½ÑƒÐ¶Ð½Ð¾."
 
 #: admin/alias/class_aliasManagement.inc:33
 msgid "Aliases"
-msgstr ""
+msgstr "ÐŸÑÐµÐ²Ð¾Ð´Ð¾Ð½Ð¸Ð¼Ñ‹"
 
 #: admin/alias/class_aliasManagement.inc:34
 msgid "Alias management"
-msgstr ""
+msgstr "Ð£Ð¿Ñ€Ð°Ð²Ð»ÐµÐ½Ð¸Ðµ Ð¿ÑÐµÐ²Ð¾Ð´Ð¾Ð½Ð¸Ð¼Ð°Ð¼Ð¸"
 
 #: admin/alias/class_aliasManagement.inc:38
 msgid "Mail aliases"
@@ -129,20 +129,20 @@ msgstr ""
 
 #: config/alias/class_aliasConfig.inc:28
 msgid "Alias configuration"
-msgstr ""
+msgstr "ÐÐ°ÑÑ‚Ñ€Ð¾Ð¹ÐºÐ° Ð¿ÑÐµÐ²Ð¾Ð´Ð¾Ð½Ð¸Ð¼Ð¾Ð²"
 
 #: config/alias/class_aliasConfig.inc:29
 msgid "FusionDirectory alias plugin configuration"
-msgstr ""
+msgstr "FusionDirectory Ð½Ð°ÑÑ‚Ñ€Ð¾Ð¹ÐºÐ° Ð¿Ð»Ð°Ð³Ð¸Ð½Ð° Ð¿ÑÐµÐ²Ð´Ð¾Ð½Ð¸Ð¼Ð¾Ð²."
 
 #: config/alias/class_aliasConfig.inc:42
 msgid "Alias"
-msgstr ""
+msgstr "ÐŸÑÐµÐ²Ð¾Ð´Ð¾Ð½Ð¸Ð¼"
 
 #: config/alias/class_aliasConfig.inc:45
 msgid "Alias RDN"
-msgstr ""
+msgstr "RDN Ð¿ÑÐµÐ²Ð´Ð¾Ð½Ð¸Ð¼Ð¾Ð²"
 
 #: config/alias/class_aliasConfig.inc:45
 msgid "Branch in which aliases will be stored"
-msgstr ""
+msgstr "Ð’ÐµÑ‚ÐºÐ° Ð² ÐºÐ¾Ñ‚Ð¾Ñ€Ð¾Ð¹ Ð±ÑƒÐ´ÑƒÑ‚ Ñ…Ñ€Ð°Ð½Ð¸Ñ‚ÑŒÑÑ Ð¿ÑÐµÐ²Ð¾Ð´Ð¾Ð½Ð¸Ð¼Ñ‹"
diff --git a/alias/locale/ru@petr1708/fusiondirectory.po b/alias/locale/ru@petr1708/fusiondirectory.po
index f4f1ab7c633cf7be1e8184e49447dd871834e8b4..441ac13d2a2ad001c5bf13abd91bcb8a1e5e57cd 100644
--- a/alias/locale/ru@petr1708/fusiondirectory.po
+++ b/alias/locale/ru@petr1708/fusiondirectory.po
@@ -5,17 +5,17 @@
 # Translators:
 msgid ""
 msgstr ""
-"Project-Id-Version: FusionDirectory-108\n"
+"Project-Id-Version: FusionDirectory-109\n"
 "Report-Msgid-Bugs-To: documentation@lists.fusiondirectory.org\n"
-"POT-Creation-Date: 2015-03-19 21:45+0100\n"
-"PO-Revision-Date: 2014-12-12 07:33+0000\n"
+"POT-Creation-Date: 2014-12-15 17:47+0100\n"
+"PO-Revision-Date: 2014-12-15 16:47+0000\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>\n"
-"Language-Team: Russian Petrine orthography (http://www.transifex.com/projects/p/FusionDirectory-108/language/ru@petr1708/)\n"
+"Language-Team: Russian Petrine orthography (http://www.transifex.com/projects/p/FusionDirectory-109/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=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);\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
diff --git a/alias/locale/sv/fusiondirectory.po b/alias/locale/sv/fusiondirectory.po
index 9355ec87598875eae6302c7b1b78b175d7d72951..a09143c0c8de69f8e5d10eee4aab5fe78b98a7f7 100644
--- a/alias/locale/sv/fusiondirectory.po
+++ b/alias/locale/sv/fusiondirectory.po
@@ -3,15 +3,14 @@
 # This file is distributed under the same license as the PACKAGE package.
 # 
 # Translators:
-# Mathias Friman <mathias.friman@knorca.se>, 2014
 msgid ""
 msgstr ""
-"Project-Id-Version: FusionDirectory-108\n"
+"Project-Id-Version: FusionDirectory-109\n"
 "Report-Msgid-Bugs-To: documentation@lists.fusiondirectory.org\n"
-"POT-Creation-Date: 2015-03-19 21:45+0100\n"
+"POT-Creation-Date: 2014-12-15 17:47+0100\n"
 "PO-Revision-Date: 2015-02-25 16:51+0000\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>\n"
-"Language-Team: Swedish (http://www.transifex.com/projects/p/FusionDirectory-108/language/sv/)\n"
+"Language-Team: Swedish (http://www.transifex.com/projects/p/FusionDirectory-109/language/sv/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
diff --git a/alias/locale/ug/fusiondirectory.po b/alias/locale/ug/fusiondirectory.po
index b6fbf38ab870bfcfcaa6119e82a103c1772d76f5..8563a57f87125edc4522c29d8b44a90854959c00 100644
--- a/alias/locale/ug/fusiondirectory.po
+++ b/alias/locale/ug/fusiondirectory.po
@@ -5,12 +5,12 @@
 # Translators:
 msgid ""
 msgstr ""
-"Project-Id-Version: FusionDirectory-108\n"
+"Project-Id-Version: FusionDirectory-109\n"
 "Report-Msgid-Bugs-To: documentation@lists.fusiondirectory.org\n"
-"POT-Creation-Date: 2015-03-19 21:45+0100\n"
-"PO-Revision-Date: 2014-12-12 07:33+0000\n"
+"POT-Creation-Date: 2014-12-15 17:47+0100\n"
+"PO-Revision-Date: 2014-12-15 16:47+0000\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>\n"
-"Language-Team: Uighur (http://www.transifex.com/projects/p/FusionDirectory-108/language/ug/)\n"
+"Language-Team: Uighur (http://www.transifex.com/projects/p/FusionDirectory-109/language/ug/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
diff --git a/alias/locale/vi_VN/fusiondirectory.po b/alias/locale/vi_VN/fusiondirectory.po
index e8b1588e4b5b09720985abbde1e961db0a70e59a..c98767b67ce9442c9d2f188171fbb774795b47e5 100644
--- a/alias/locale/vi_VN/fusiondirectory.po
+++ b/alias/locale/vi_VN/fusiondirectory.po
@@ -5,12 +5,12 @@
 # Translators:
 msgid ""
 msgstr ""
-"Project-Id-Version: FusionDirectory-108\n"
+"Project-Id-Version: FusionDirectory-109\n"
 "Report-Msgid-Bugs-To: documentation@lists.fusiondirectory.org\n"
-"POT-Creation-Date: 2015-03-19 21:45+0100\n"
-"PO-Revision-Date: 2015-02-25 16:02+0000\n"
+"POT-Creation-Date: 2014-12-15 17:47+0100\n"
+"PO-Revision-Date: 2015-02-25 16:04+0000\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>\n"
-"Language-Team: Vietnamese (Viet Nam) (http://www.transifex.com/projects/p/FusionDirectory-108/language/vi_VN/)\n"
+"Language-Team: Vietnamese (Viet Nam) (http://www.transifex.com/projects/p/FusionDirectory-109/language/vi_VN/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
diff --git a/alias/locale/zh/fusiondirectory.po b/alias/locale/zh/fusiondirectory.po
index 078d043fbe56b90493ddc78762ba6fad4e9a526e..ab6a31bfea4f012cc9193b7f3ec9e098969df74b 100644
--- a/alias/locale/zh/fusiondirectory.po
+++ b/alias/locale/zh/fusiondirectory.po
@@ -5,12 +5,12 @@
 # Translators:
 msgid ""
 msgstr ""
-"Project-Id-Version: FusionDirectory-108\n"
+"Project-Id-Version: FusionDirectory-109\n"
 "Report-Msgid-Bugs-To: documentation@lists.fusiondirectory.org\n"
-"POT-Creation-Date: 2015-03-19 21:45+0100\n"
+"POT-Creation-Date: 2014-12-15 17:47+0100\n"
 "PO-Revision-Date: 2015-02-25 16:51+0000\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>\n"
-"Language-Team: Chinese (http://www.transifex.com/projects/p/FusionDirectory-108/language/zh/)\n"
+"Language-Team: Chinese (http://www.transifex.com/projects/p/FusionDirectory-109/language/zh/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
diff --git a/apache2/locale/ar/fusiondirectory.po b/apache2/locale/ar/fusiondirectory.po
index 04859e57dc1aa2ea74ee5d2f2938bbd936b6ffdf..0bcc4275cf5240cdea9841675b41133335d4f41f 100644
--- a/apache2/locale/ar/fusiondirectory.po
+++ b/apache2/locale/ar/fusiondirectory.po
@@ -5,12 +5,12 @@
 # Translators:
 msgid ""
 msgstr ""
-"Project-Id-Version: FusionDirectory-108\n"
+"Project-Id-Version: FusionDirectory-109\n"
 "Report-Msgid-Bugs-To: documentation@lists.fusiondirectory.org\n"
-"POT-Creation-Date: 2015-03-19 21:45+0100\n"
-"PO-Revision-Date: 2015-02-25 16:02+0000\n"
+"POT-Creation-Date: 2014-12-15 17:47+0100\n"
+"PO-Revision-Date: 2014-12-15 16:48+0000\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>\n"
-"Language-Team: Arabic (http://www.transifex.com/projects/p/FusionDirectory-108/language/ar/)\n"
+"Language-Team: Arabic (http://www.transifex.com/projects/p/FusionDirectory-109/language/ar/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -152,38 +152,3 @@ msgstr ""
 #: admin/systems/services/apache2/class_serviceApacheVhostEdit.inc:107
 msgid "Directory Path"
 msgstr ""
-
-#: admin/systems/services/apache2/remove.tpl.c:2
-msgid "Warning"
-msgstr "ØªØØ°ÙŠØ±"
-
-#: admin/systems/services/apache2/remove.tpl.c:5
-msgid ""
-"This includes all account data, system access rules, imap settings, etc. for"
-" this user. Please double check if your really want to do this since there "
-"is no way for FusionDirectory to get your data back."
-msgstr ""
-
-#: admin/systems/services/apache2/remove.tpl.c:8
-msgid "So - if you're sure - press 'Delete' to continue or 'Cancel' to abort."
-msgstr ""
-
-#: admin/systems/services/apache2/serviceApacheVhostEdit-filter.tpl.c:2
-msgid "Filter"
-msgstr ""
-
-#: admin/systems/services/apache2/serviceApacheVhostEdit-filter.tpl.c:5
-msgid "Name"
-msgstr "Ø§Ù„Ø¥Ø³Ù…"
-
-#: admin/systems/services/apache2/serviceApacheVhostEdit-list.tpl.c:2
-msgid "Base"
-msgstr ""
-
-#: admin/systems/services/apache2/serviceApacheVhostEditFooter.tpl.c:2
-msgid "Save"
-msgstr ""
-
-#: admin/systems/services/apache2/serviceApacheVhostEditFooter.tpl.c:5
-msgid "Cancel"
-msgstr ""
diff --git a/apache2/locale/ca/fusiondirectory.po b/apache2/locale/ca/fusiondirectory.po
index 404ee04e46a9cec5bf6424051d4812ea904e1ad9..0ff2ce355088bd3f3ca8938a0bf14ccfa566330b 100644
--- a/apache2/locale/ca/fusiondirectory.po
+++ b/apache2/locale/ca/fusiondirectory.po
@@ -5,12 +5,12 @@
 # Translators:
 msgid ""
 msgstr ""
-"Project-Id-Version: FusionDirectory-108\n"
+"Project-Id-Version: FusionDirectory-109\n"
 "Report-Msgid-Bugs-To: documentation@lists.fusiondirectory.org\n"
-"POT-Creation-Date: 2015-03-19 21:45+0100\n"
-"PO-Revision-Date: 2015-02-25 16:02+0000\n"
+"POT-Creation-Date: 2014-12-15 17:47+0100\n"
+"PO-Revision-Date: 2014-12-15 16:48+0000\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>\n"
-"Language-Team: Catalan (http://www.transifex.com/projects/p/FusionDirectory-108/language/ca/)\n"
+"Language-Team: Catalan (http://www.transifex.com/projects/p/FusionDirectory-109/language/ca/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -152,38 +152,3 @@ msgstr ""
 #: admin/systems/services/apache2/class_serviceApacheVhostEdit.inc:107
 msgid "Directory Path"
 msgstr ""
-
-#: admin/systems/services/apache2/remove.tpl.c:2
-msgid "Warning"
-msgstr "AvÃs"
-
-#: admin/systems/services/apache2/remove.tpl.c:5
-msgid ""
-"This includes all account data, system access rules, imap settings, etc. for"
-" this user. Please double check if your really want to do this since there "
-"is no way for FusionDirectory to get your data back."
-msgstr ""
-
-#: admin/systems/services/apache2/remove.tpl.c:8
-msgid "So - if you're sure - press 'Delete' to continue or 'Cancel' to abort."
-msgstr ""
-
-#: admin/systems/services/apache2/serviceApacheVhostEdit-filter.tpl.c:2
-msgid "Filter"
-msgstr ""
-
-#: admin/systems/services/apache2/serviceApacheVhostEdit-filter.tpl.c:5
-msgid "Name"
-msgstr "Nom"
-
-#: admin/systems/services/apache2/serviceApacheVhostEdit-list.tpl.c:2
-msgid "Base"
-msgstr "Base"
-
-#: admin/systems/services/apache2/serviceApacheVhostEditFooter.tpl.c:2
-msgid "Save"
-msgstr "Desa"
-
-#: admin/systems/services/apache2/serviceApacheVhostEditFooter.tpl.c:5
-msgid "Cancel"
-msgstr "CanceÅ€la"
diff --git a/apache2/locale/cs_CZ/fusiondirectory.po b/apache2/locale/cs_CZ/fusiondirectory.po
index 9eabb8d26aa963a32242c8e48e8f61e285b940b7..3f5031bdc37ba5c6398b23e164abf3b99f433dfe 100644
--- a/apache2/locale/cs_CZ/fusiondirectory.po
+++ b/apache2/locale/cs_CZ/fusiondirectory.po
@@ -3,14 +3,15 @@
 # This file is distributed under the same license as the PACKAGE package.
 # 
 # Translators:
+# Pavel Borecki <pavel.borecki@gmail.com>, 2015
 msgid ""
 msgstr ""
-"Project-Id-Version: FusionDirectory-108\n"
+"Project-Id-Version: FusionDirectory-109\n"
 "Report-Msgid-Bugs-To: documentation@lists.fusiondirectory.org\n"
-"POT-Creation-Date: 2015-03-19 21:45+0100\n"
-"PO-Revision-Date: 2015-02-25 16:12+0000\n"
-"Last-Translator: fusiondirectory <contact@fusiondirectory.org>\n"
-"Language-Team: Czech (Czech Republic) (http://www.transifex.com/projects/p/FusionDirectory-108/language/cs_CZ/)\n"
+"POT-Creation-Date: 2014-12-15 17:47+0100\n"
+"PO-Revision-Date: 2015-04-04 08:51+0000\n"
+"Last-Translator: Pavel Borecki <pavel.borecki@gmail.com>\n"
+"Language-Team: Czech (Czech Republic) (http://www.transifex.com/projects/p/FusionDirectory-109/language/cs_CZ/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -19,15 +20,15 @@ msgstr ""
 
 #: admin/systems/services/apache2/class_serviceApacheVhost.inc:79
 msgid "Apache service"
-msgstr "sluÅ¾ba Apache"
+msgstr "SluÅ¾ba Apache"
 
 #: admin/systems/services/apache2/class_serviceApacheVhost.inc:80
 msgid "Apache virtual host service"
-msgstr "sluÅ¾ba virtuÃ¡lnÃch strojÅ¯ Apache"
+msgstr "SluÅ¾ba virtuÃ¡lnÃch strojÅ¯ Apache"
 
 #: admin/systems/services/apache2/class_serviceApacheVhost.inc:80
 msgid "Services"
-msgstr "sluÅ¾by"
+msgstr "SluÅ¾by"
 
 #: admin/systems/services/apache2/class_serviceApacheVhost.inc:84
 msgid "Virtual hosts"
@@ -35,28 +36,28 @@ msgstr "virtuÃ¡lnÃ stroje"
 
 #: admin/systems/services/apache2/serviceApacheVhostEdit-list.xml:11
 msgid "List of Apache Vhost"
-msgstr ""
+msgstr "Seznam virtuÃ¡lnÃch hostitelÅ¯ Apache"
 
 #: admin/systems/services/apache2/serviceApacheVhostEdit-list.xml:15
 msgid "Template entry"
-msgstr "smazat poloÅ¾ku"
+msgstr "PoloÅ¾ka Å¡ablony"
 
 #: admin/systems/services/apache2/serviceApacheVhostEdit-list.xml:32
 msgid "Server name"
-msgstr "nÃ¡zev serveru"
+msgstr "NÃ¡zev serveru"
 
 #: admin/systems/services/apache2/serviceApacheVhostEdit-list.xml:40
 #: admin/systems/services/apache2/class_serviceApacheVhostEdit.inc:78
 msgid "Document root"
-msgstr "koÅ™enovÃ¡ sloÅ¾ka (Document root)"
+msgstr "KoÅ™enovÃ¡ sloÅ¾ka dokumentu"
 
 #: admin/systems/services/apache2/serviceApacheVhostEdit-list.xml:48
 msgid "Actions"
-msgstr "akce"
+msgstr "Akce"
 
 #: admin/systems/services/apache2/serviceApacheVhostEdit-list.xml:59
 msgid "Create"
-msgstr "vytvoÅ™it"
+msgstr "VytvoÅ™it"
 
 #: admin/systems/services/apache2/serviceApacheVhostEdit-list.xml:65
 msgid "serviceApacheVhostEdit"
@@ -64,23 +65,23 @@ msgstr ""
 
 #: admin/systems/services/apache2/serviceApacheVhostEdit-list.xml:77
 msgid "Remove"
-msgstr "odebrat"
+msgstr "Odstranit"
 
 #: admin/systems/services/apache2/serviceApacheVhostEdit-list.xml:109
 msgid "Edit host"
-msgstr ""
+msgstr "Upravit poÄÃtaÄ"
 
 #: admin/systems/services/apache2/serviceApacheVhostEdit-list.xml:122
 msgid "Remove host"
-msgstr ""
+msgstr "Odebrat poÄÃtaÄ"
 
 #: admin/systems/services/apache2/class_serviceApacheVhostManagement.inc:24
 msgid "Vhosts"
-msgstr ""
+msgstr "VirtuÃ¡lnÃ hostitelÃ©"
 
 #: admin/systems/services/apache2/class_serviceApacheVhostManagement.inc:25
 msgid "Apache vhosts management"
-msgstr ""
+msgstr "SprÃ¡va virtuÃ¡lnÃch hostitelÅ¯ Apache"
 
 #: admin/systems/services/apache2/class_serviceApacheVhostEdit.inc:48
 #: admin/systems/services/apache2/class_serviceApacheVhostEdit.inc:49
@@ -89,11 +90,11 @@ msgstr ""
 
 #: admin/systems/services/apache2/class_serviceApacheVhostEdit.inc:50
 msgid "This Plugin is for Apache server"
-msgstr ""
+msgstr "Tento zÃ¡suvnÃ½ modul je urÄenÃ½ pro server Apache"
 
 #: admin/systems/services/apache2/class_serviceApacheVhostEdit.inc:52
 msgid "Apache Vhost"
-msgstr ""
+msgstr "VirtuÃ¡lnÃ hostitel Apache"
 
 #: admin/systems/services/apache2/class_serviceApacheVhostEdit.inc:68
 msgid "Informations"
@@ -105,19 +106,19 @@ msgstr "nÃ¡zev virtuÃ¡lnÃho stroje"
 
 #: admin/systems/services/apache2/class_serviceApacheVhostEdit.inc:73
 msgid "The Virtual host name"
-msgstr ""
+msgstr "NÃ¡zev virtuÃ¡lnÃho hostitele"
 
 #: admin/systems/services/apache2/class_serviceApacheVhostEdit.inc:79
 msgid "Document root for the apache web server"
-msgstr ""
+msgstr "KoÅ™enovÃ¡ sloÅ¾ka pro webovÃ½ server Apache"
 
 #: admin/systems/services/apache2/class_serviceApacheVhostEdit.inc:84
 msgid "Admin mail address"
-msgstr "e-mailovÃ¡ adresa sprÃ¡vce"
+msgstr "E-mailovÃ¡ adresa sprÃ¡vce"
 
 #: admin/systems/services/apache2/class_serviceApacheVhostEdit.inc:85
 msgid "Apache admin mail address"
-msgstr ""
+msgstr "E-mail sprÃ¡vce sluÅ¾by apache"
 
 #: admin/systems/services/apache2/class_serviceApacheVhostEdit.inc:90
 #: admin/systems/services/apache2/class_serviceApacheVhostEdit.inc:99
@@ -134,11 +135,11 @@ msgstr "sloÅ¾ka alternativnÃch nÃ¡zvÅ¯ (alias)"
 
 #: admin/systems/services/apache2/class_serviceApacheVhostEdit.inc:94
 msgid "Script"
-msgstr "skript"
+msgstr "Skript"
 
 #: admin/systems/services/apache2/class_serviceApacheVhostEdit.inc:94
 msgid "Script Directory"
-msgstr "sloÅ¾ka se skripty"
+msgstr "SloÅ¾ka se skripty"
 
 #: admin/systems/services/apache2/class_serviceApacheVhostEdit.inc:103
 #: admin/systems/services/apache2/class_serviceApacheVhostEdit.inc:112
@@ -147,43 +148,8 @@ msgstr "alternativnÃ nÃ¡zev (alias) serveru"
 
 #: admin/systems/services/apache2/class_serviceApacheVhostEdit.inc:106
 msgid "URL Alias"
-msgstr "alternativnÃ nÃ¡zev (alias) URL"
+msgstr "AlternativnÃ URL adresa"
 
 #: admin/systems/services/apache2/class_serviceApacheVhostEdit.inc:107
 msgid "Directory Path"
-msgstr "cesta ke sloÅ¾ce"
-
-#: admin/systems/services/apache2/remove.tpl.c:2
-msgid "Warning"
-msgstr "varovÃ¡nÃ"
-
-#: admin/systems/services/apache2/remove.tpl.c:5
-msgid ""
-"This includes all account data, system access rules, imap settings, etc. for"
-" this user. Please double check if your really want to do this since there "
-"is no way for FusionDirectory to get your data back."
-msgstr "TÃ½kÃ¡ se veÅ¡kerÃ½ch informacÃ o tÃ©to poloÅ¾ce v adresÃ¡Å™i. ProsÃm velmi dobÅ™e si rozmyslete, zda to opravdu chcete udÄ›lat, protoÅ¾e provedenÃ© zmÄ›ny uÅ¾ ve FusionDirectory nepÅ¯jde vzÃt nijak jednoduÅ¡e zpÄ›t (nanejvÃ½Å¡ sloÅ¾itÄ› ze zÃ¡loh, pokud existujÃ a obsahujÃ potÅ™ebnÃ¡ data)!"
-
-#: admin/systems/services/apache2/remove.tpl.c:8
-msgid "So - if you're sure - press 'Delete' to continue or 'Cancel' to abort."
-msgstr "Tedy â€“ pokud jste si jist(a), stisknÄ›te 'smazat'. V opaÄnÃ©m pÅ™ÃpadÄ› operaci zruÅ¡te pomocÃ 'zruÅ¡it'."
-
-#: admin/systems/services/apache2/serviceApacheVhostEdit-filter.tpl.c:2
-msgid "Filter"
-msgstr "filtr"
-
-#: admin/systems/services/apache2/serviceApacheVhostEdit-filter.tpl.c:5
-msgid "Name"
-msgstr "nÃ¡zev"
-
-#: admin/systems/services/apache2/serviceApacheVhostEdit-list.tpl.c:2
-msgid "Base"
-msgstr "zÃ¡klad"
-
-#: admin/systems/services/apache2/serviceApacheVhostEditFooter.tpl.c:2
-msgid "Save"
-msgstr "uloÅ¾it"
-
-#: admin/systems/services/apache2/serviceApacheVhostEditFooter.tpl.c:5
-msgid "Cancel"
-msgstr "zruÅ¡it"
+msgstr "UmÃstÄ›nÃ sloÅ¾ky"
diff --git a/apache2/locale/de/fusiondirectory.po b/apache2/locale/de/fusiondirectory.po
index f4ac1c3ff1a62036af911e4ceedb639e55f9a417..1542dd4121d5ab00768d026ba9519d2b068b8757 100644
--- a/apache2/locale/de/fusiondirectory.po
+++ b/apache2/locale/de/fusiondirectory.po
@@ -3,17 +3,15 @@
 # This file is distributed under the same license as the PACKAGE package.
 # 
 # Translators:
-# Islam Adel, 2013
-# Islam Adel, 2013
-# Maik Wagner <maikwagner@yahoo.com>, 2014
+# Ettore Atalan <atalanttore@googlemail.com>, 2014
 msgid ""
 msgstr ""
-"Project-Id-Version: FusionDirectory-108\n"
+"Project-Id-Version: FusionDirectory-109\n"
 "Report-Msgid-Bugs-To: documentation@lists.fusiondirectory.org\n"
-"POT-Creation-Date: 2015-03-19 21:45+0100\n"
-"PO-Revision-Date: 2015-02-25 16:12+0000\n"
-"Last-Translator: fusiondirectory <contact@fusiondirectory.org>\n"
-"Language-Team: German (http://www.transifex.com/projects/p/FusionDirectory-108/language/de/)\n"
+"POT-Creation-Date: 2014-12-15 17:47+0100\n"
+"PO-Revision-Date: 2015-02-25 16:04+0000\n"
+"Last-Translator: Ettore Atalan <atalanttore@googlemail.com>\n"
+"Language-Team: German (http://www.transifex.com/projects/p/FusionDirectory-109/language/de/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -155,38 +153,3 @@ msgstr "URL-Alias"
 #: admin/systems/services/apache2/class_serviceApacheVhostEdit.inc:107
 msgid "Directory Path"
 msgstr "Pfad"
-
-#: admin/systems/services/apache2/remove.tpl.c:2
-msgid "Warning"
-msgstr "Warnung"
-
-#: admin/systems/services/apache2/remove.tpl.c:5
-msgid ""
-"This includes all account data, system access rules, imap settings, etc. for"
-" this user. Please double check if your really want to do this since there "
-"is no way for FusionDirectory to get your data back."
-msgstr "Dies beinhaltet alle Kontendaten, Systemzugangsregeln, Imap-Einstellungen etc. fÃ¼r diesen Benutzer. Bitte Ã¼berprÃ¼fen Sie nochmals ob Sie dies tun wollen, da es keinen Weg fÃ¼r FusionDirectory gibt Ihre Daten zurÃ¼ck zu bekommen."
-
-#: admin/systems/services/apache2/remove.tpl.c:8
-msgid "So - if you're sure - press 'Delete' to continue or 'Cancel' to abort."
-msgstr "Wenn Sie sicher sind, drÃ¼cken Sie 'Entfernen' um fortzufahren oder 'Abbrechen' zum Abbruch."
-
-#: admin/systems/services/apache2/serviceApacheVhostEdit-filter.tpl.c:2
-msgid "Filter"
-msgstr "Filter"
-
-#: admin/systems/services/apache2/serviceApacheVhostEdit-filter.tpl.c:5
-msgid "Name"
-msgstr "Name"
-
-#: admin/systems/services/apache2/serviceApacheVhostEdit-list.tpl.c:2
-msgid "Base"
-msgstr "Basis"
-
-#: admin/systems/services/apache2/serviceApacheVhostEditFooter.tpl.c:2
-msgid "Save"
-msgstr "Speichern"
-
-#: admin/systems/services/apache2/serviceApacheVhostEditFooter.tpl.c:5
-msgid "Cancel"
-msgstr "Abbrechen"
diff --git a/apache2/locale/el_GR/fusiondirectory.po b/apache2/locale/el_GR/fusiondirectory.po
new file mode 100644
index 0000000000000000000000000000000000000000..007b7716a3665de57a833dff6632f6155d01200b
--- /dev/null
+++ b/apache2/locale/el_GR/fusiondirectory.po
@@ -0,0 +1,154 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR FusionDirectory Project
+# This file is distributed under the same license as the PACKAGE package.
+# 
+# Translators:
+msgid ""
+msgstr ""
+"Project-Id-Version: FusionDirectory-109\n"
+"Report-Msgid-Bugs-To: documentation@lists.fusiondirectory.org\n"
+"POT-Creation-Date: 2014-12-15 17:47+0100\n"
+"PO-Revision-Date: 2015-05-30 11:45+0000\n"
+"Last-Translator: Benoit Mortier <benoit.mortier@opensides.be>\n"
+"Language-Team: Greek (Greece) (http://www.transifex.com/projects/p/FusionDirectory-109/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/services/apache2/class_serviceApacheVhost.inc:79
+msgid "Apache service"
+msgstr ""
+
+#: admin/systems/services/apache2/class_serviceApacheVhost.inc:80
+msgid "Apache virtual host service"
+msgstr ""
+
+#: admin/systems/services/apache2/class_serviceApacheVhost.inc:80
+msgid "Services"
+msgstr ""
+
+#: admin/systems/services/apache2/class_serviceApacheVhost.inc:84
+msgid "Virtual hosts"
+msgstr ""
+
+#: admin/systems/services/apache2/serviceApacheVhostEdit-list.xml:11
+msgid "List of Apache Vhost"
+msgstr ""
+
+#: admin/systems/services/apache2/serviceApacheVhostEdit-list.xml:15
+msgid "Template entry"
+msgstr ""
+
+#: admin/systems/services/apache2/serviceApacheVhostEdit-list.xml:32
+msgid "Server name"
+msgstr ""
+
+#: admin/systems/services/apache2/serviceApacheVhostEdit-list.xml:40
+#: admin/systems/services/apache2/class_serviceApacheVhostEdit.inc:78
+msgid "Document root"
+msgstr ""
+
+#: admin/systems/services/apache2/serviceApacheVhostEdit-list.xml:48
+msgid "Actions"
+msgstr ""
+
+#: admin/systems/services/apache2/serviceApacheVhostEdit-list.xml:59
+msgid "Create"
+msgstr ""
+
+#: admin/systems/services/apache2/serviceApacheVhostEdit-list.xml:65
+msgid "serviceApacheVhostEdit"
+msgstr ""
+
+#: admin/systems/services/apache2/serviceApacheVhostEdit-list.xml:77
+msgid "Remove"
+msgstr ""
+
+#: admin/systems/services/apache2/serviceApacheVhostEdit-list.xml:109
+msgid "Edit host"
+msgstr ""
+
+#: admin/systems/services/apache2/serviceApacheVhostEdit-list.xml:122
+msgid "Remove host"
+msgstr ""
+
+#: admin/systems/services/apache2/class_serviceApacheVhostManagement.inc:24
+msgid "Vhosts"
+msgstr ""
+
+#: admin/systems/services/apache2/class_serviceApacheVhostManagement.inc:25
+msgid "Apache vhosts management"
+msgstr ""
+
+#: admin/systems/services/apache2/class_serviceApacheVhostEdit.inc:48
+#: admin/systems/services/apache2/class_serviceApacheVhostEdit.inc:49
+msgid "Apache2"
+msgstr ""
+
+#: admin/systems/services/apache2/class_serviceApacheVhostEdit.inc:50
+msgid "This Plugin is for Apache server"
+msgstr ""
+
+#: admin/systems/services/apache2/class_serviceApacheVhostEdit.inc:52
+msgid "Apache Vhost"
+msgstr ""
+
+#: admin/systems/services/apache2/class_serviceApacheVhostEdit.inc:68
+msgid "Informations"
+msgstr ""
+
+#: admin/systems/services/apache2/class_serviceApacheVhostEdit.inc:72
+msgid "Virtual host name"
+msgstr ""
+
+#: admin/systems/services/apache2/class_serviceApacheVhostEdit.inc:73
+msgid "The Virtual host name"
+msgstr ""
+
+#: admin/systems/services/apache2/class_serviceApacheVhostEdit.inc:79
+msgid "Document root for the apache web server"
+msgstr ""
+
+#: admin/systems/services/apache2/class_serviceApacheVhostEdit.inc:84
+msgid "Admin mail address"
+msgstr ""
+
+#: admin/systems/services/apache2/class_serviceApacheVhostEdit.inc:85
+msgid "Apache admin mail address"
+msgstr ""
+
+#: admin/systems/services/apache2/class_serviceApacheVhostEdit.inc:90
+#: admin/systems/services/apache2/class_serviceApacheVhostEdit.inc:99
+msgid "Script Alias"
+msgstr ""
+
+#: admin/systems/services/apache2/class_serviceApacheVhostEdit.inc:93
+msgid "Alias"
+msgstr ""
+
+#: admin/systems/services/apache2/class_serviceApacheVhostEdit.inc:93
+msgid "Alias Directory"
+msgstr ""
+
+#: admin/systems/services/apache2/class_serviceApacheVhostEdit.inc:94
+msgid "Script"
+msgstr ""
+
+#: admin/systems/services/apache2/class_serviceApacheVhostEdit.inc:94
+msgid "Script Directory"
+msgstr ""
+
+#: admin/systems/services/apache2/class_serviceApacheVhostEdit.inc:103
+#: admin/systems/services/apache2/class_serviceApacheVhostEdit.inc:112
+msgid "Server Alias"
+msgstr ""
+
+#: admin/systems/services/apache2/class_serviceApacheVhostEdit.inc:106
+msgid "URL Alias"
+msgstr ""
+
+#: admin/systems/services/apache2/class_serviceApacheVhostEdit.inc:107
+msgid "Directory Path"
+msgstr ""
diff --git a/apache2/locale/en/fusiondirectory.po b/apache2/locale/en/fusiondirectory.po
index 41a2f51f615b3c7372fddbcfa058c63573bbb68e..ddb3b3d10a5e3df7f8cf4c82b193e100219f70ef 100644
--- a/apache2/locale/en/fusiondirectory.po
+++ b/apache2/locale/en/fusiondirectory.po
@@ -6,13 +6,13 @@
 #, fuzzy
 msgid ""
 msgstr ""
-"Project-Id-Version: PACKAGE VERSION\n"
-"Report-Msgid-Bugs-To: documentation@lists.fusiondirectory.org\n"
-"POT-Creation-Date: 2015-03-31 11:49+0200\n"
+"Project-Id-Version: FusionDirectory VERSION\n"
+"Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
+"POT-Creation-Date: 2015-05-30 15:30+0200\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
-"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
-"Language-Team: LANGUAGE <LL@li.org>\n"
-"Language: \n"
+"Last-Translator: FusionDirectory project <contact@fusiondirectory.org>\n"
+"Language-Team: English\n"
+"Language: en\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -46,7 +46,7 @@ msgid "Server name"
 msgstr ""
 
 #: admin/systems/services/apache2/serviceApacheVhostEdit-list.xml:40
-#: admin/systems/services/apache2/class_serviceApacheVhostEdit.inc:78
+#: admin/systems/services/apache2/class_serviceApacheVhostEdit.inc:79
 msgid "Document root"
 msgstr ""
 
@@ -95,61 +95,61 @@ msgstr ""
 msgid "Apache Vhost"
 msgstr ""
 
-#: admin/systems/services/apache2/class_serviceApacheVhostEdit.inc:68
+#: admin/systems/services/apache2/class_serviceApacheVhostEdit.inc:69
 msgid "Informations"
 msgstr ""
 
-#: admin/systems/services/apache2/class_serviceApacheVhostEdit.inc:72
+#: admin/systems/services/apache2/class_serviceApacheVhostEdit.inc:73
 msgid "Virtual host name"
 msgstr ""
 
-#: admin/systems/services/apache2/class_serviceApacheVhostEdit.inc:73
+#: admin/systems/services/apache2/class_serviceApacheVhostEdit.inc:74
 msgid "The Virtual host name"
 msgstr ""
 
-#: admin/systems/services/apache2/class_serviceApacheVhostEdit.inc:79
+#: admin/systems/services/apache2/class_serviceApacheVhostEdit.inc:80
 msgid "Document root for the apache web server"
 msgstr ""
 
-#: admin/systems/services/apache2/class_serviceApacheVhostEdit.inc:84
+#: admin/systems/services/apache2/class_serviceApacheVhostEdit.inc:85
 msgid "Admin mail address"
 msgstr ""
 
-#: admin/systems/services/apache2/class_serviceApacheVhostEdit.inc:85
+#: admin/systems/services/apache2/class_serviceApacheVhostEdit.inc:86
 msgid "Apache admin mail address"
 msgstr ""
 
-#: admin/systems/services/apache2/class_serviceApacheVhostEdit.inc:90
-#: admin/systems/services/apache2/class_serviceApacheVhostEdit.inc:99
+#: admin/systems/services/apache2/class_serviceApacheVhostEdit.inc:91
+#: admin/systems/services/apache2/class_serviceApacheVhostEdit.inc:100
 msgid "Script Alias"
 msgstr ""
 
-#: admin/systems/services/apache2/class_serviceApacheVhostEdit.inc:93
+#: admin/systems/services/apache2/class_serviceApacheVhostEdit.inc:94
 msgid "Alias"
 msgstr ""
 
-#: admin/systems/services/apache2/class_serviceApacheVhostEdit.inc:93
+#: admin/systems/services/apache2/class_serviceApacheVhostEdit.inc:94
 msgid "Alias Directory"
 msgstr ""
 
-#: admin/systems/services/apache2/class_serviceApacheVhostEdit.inc:94
+#: admin/systems/services/apache2/class_serviceApacheVhostEdit.inc:95
 msgid "Script"
 msgstr ""
 
-#: admin/systems/services/apache2/class_serviceApacheVhostEdit.inc:94
+#: admin/systems/services/apache2/class_serviceApacheVhostEdit.inc:95
 msgid "Script Directory"
 msgstr ""
 
-#: admin/systems/services/apache2/class_serviceApacheVhostEdit.inc:103
-#: admin/systems/services/apache2/class_serviceApacheVhostEdit.inc:112
+#: admin/systems/services/apache2/class_serviceApacheVhostEdit.inc:104
+#: admin/systems/services/apache2/class_serviceApacheVhostEdit.inc:113
 msgid "Server Alias"
 msgstr ""
 
-#: admin/systems/services/apache2/class_serviceApacheVhostEdit.inc:106
+#: admin/systems/services/apache2/class_serviceApacheVhostEdit.inc:107
 msgid "URL Alias"
 msgstr ""
 
-#: admin/systems/services/apache2/class_serviceApacheVhostEdit.inc:107
+#: admin/systems/services/apache2/class_serviceApacheVhostEdit.inc:108
 msgid "Directory Path"
 msgstr ""
 
diff --git a/apache2/locale/es/fusiondirectory.po b/apache2/locale/es/fusiondirectory.po
index 045465d810a8bc06006d8422977ae192140a5cce..12d6b0a59cadcfafd2edd4fe9c78b773b09fa8ae 100644
--- a/apache2/locale/es/fusiondirectory.po
+++ b/apache2/locale/es/fusiondirectory.po
@@ -5,12 +5,12 @@
 # Translators:
 msgid ""
 msgstr ""
-"Project-Id-Version: FusionDirectory-108\n"
+"Project-Id-Version: FusionDirectory-109\n"
 "Report-Msgid-Bugs-To: documentation@lists.fusiondirectory.org\n"
-"POT-Creation-Date: 2015-03-19 21:45+0100\n"
-"PO-Revision-Date: 2015-02-25 16:12+0000\n"
+"POT-Creation-Date: 2014-12-15 17:47+0100\n"
+"PO-Revision-Date: 2015-02-25 16:04+0000\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>\n"
-"Language-Team: Spanish (http://www.transifex.com/projects/p/FusionDirectory-108/language/es/)\n"
+"Language-Team: Spanish (http://www.transifex.com/projects/p/FusionDirectory-109/language/es/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -152,38 +152,3 @@ msgstr "Alias de URL"
 #: admin/systems/services/apache2/class_serviceApacheVhostEdit.inc:107
 msgid "Directory Path"
 msgstr "Ruta al directorio"
-
-#: admin/systems/services/apache2/remove.tpl.c:2
-msgid "Warning"
-msgstr "Aviso"
-
-#: admin/systems/services/apache2/remove.tpl.c:5
-msgid ""
-"This includes all account data, system access rules, imap settings, etc. for"
-" this user. Please double check if your really want to do this since there "
-"is no way for FusionDirectory to get your data back."
-msgstr "Esto incluye toda la data de la cuenta, las reglas de acceso de sistema, opciones de imap, etc. Para este usuario. Por favor verifique bien si quiere hacer esto ya que no hay forma para que FusionDirectory recupere la data."
-
-#: admin/systems/services/apache2/remove.tpl.c:8
-msgid "So - if you're sure - press 'Delete' to continue or 'Cancel' to abort."
-msgstr "Entonces, si esta seguro, presione <i>Eliminar</i> para continuar o <i>Cancelar</i> para Abortar."
-
-#: admin/systems/services/apache2/serviceApacheVhostEdit-filter.tpl.c:2
-msgid "Filter"
-msgstr "Filtro"
-
-#: admin/systems/services/apache2/serviceApacheVhostEdit-filter.tpl.c:5
-msgid "Name"
-msgstr "Nombre"
-
-#: admin/systems/services/apache2/serviceApacheVhostEdit-list.tpl.c:2
-msgid "Base"
-msgstr "Base"
-
-#: admin/systems/services/apache2/serviceApacheVhostEditFooter.tpl.c:2
-msgid "Save"
-msgstr "Guardar"
-
-#: admin/systems/services/apache2/serviceApacheVhostEditFooter.tpl.c:5
-msgid "Cancel"
-msgstr "Cancelar"
diff --git a/apache2/locale/es_VE/fusiondirectory.po b/apache2/locale/es_VE/fusiondirectory.po
index a8e0ede9ae568a3298da70fc338fce82836dbb0c..45d366cb90769098d130b55526442b63679119bb 100644
--- a/apache2/locale/es_VE/fusiondirectory.po
+++ b/apache2/locale/es_VE/fusiondirectory.po
@@ -5,12 +5,12 @@
 # Translators:
 msgid ""
 msgstr ""
-"Project-Id-Version: FusionDirectory-108\n"
+"Project-Id-Version: FusionDirectory-109\n"
 "Report-Msgid-Bugs-To: documentation@lists.fusiondirectory.org\n"
-"POT-Creation-Date: 2015-03-19 21:45+0100\n"
-"PO-Revision-Date: 2015-02-25 16:12+0000\n"
+"POT-Creation-Date: 2014-12-15 17:47+0100\n"
+"PO-Revision-Date: 2015-02-25 16:04+0000\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>\n"
-"Language-Team: Spanish (Venezuela) (http://www.transifex.com/projects/p/FusionDirectory-108/language/es_VE/)\n"
+"Language-Team: Spanish (Venezuela) (http://www.transifex.com/projects/p/FusionDirectory-109/language/es_VE/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -152,38 +152,3 @@ msgstr "Alias de URL"
 #: admin/systems/services/apache2/class_serviceApacheVhostEdit.inc:107
 msgid "Directory Path"
 msgstr "Ruta al directorio"
-
-#: admin/systems/services/apache2/remove.tpl.c:2
-msgid "Warning"
-msgstr "Aviso"
-
-#: admin/systems/services/apache2/remove.tpl.c:5
-msgid ""
-"This includes all account data, system access rules, imap settings, etc. for"
-" this user. Please double check if your really want to do this since there "
-"is no way for FusionDirectory to get your data back."
-msgstr "Esto incluye toda la data de la cuenta, reglas de acceso de sistema, opciones imap, etc. para este usuario. Por favor verifique que realmente desea hacer esto ya que FusionDirectory no tiene forma de recuperar la data"
-
-#: admin/systems/services/apache2/remove.tpl.c:8
-msgid "So - if you're sure - press 'Delete' to continue or 'Cancel' to abort."
-msgstr "Entonces, si esta seguro, presione <i>Eliminar</i> para continuar o <i>Cancelar</i> para Abortar."
-
-#: admin/systems/services/apache2/serviceApacheVhostEdit-filter.tpl.c:2
-msgid "Filter"
-msgstr "Filtro"
-
-#: admin/systems/services/apache2/serviceApacheVhostEdit-filter.tpl.c:5
-msgid "Name"
-msgstr "Nombre"
-
-#: admin/systems/services/apache2/serviceApacheVhostEdit-list.tpl.c:2
-msgid "Base"
-msgstr "Base"
-
-#: admin/systems/services/apache2/serviceApacheVhostEditFooter.tpl.c:2
-msgid "Save"
-msgstr "Guardar"
-
-#: admin/systems/services/apache2/serviceApacheVhostEditFooter.tpl.c:5
-msgid "Cancel"
-msgstr "Cancelar"
diff --git a/apache2/locale/fa_IR/fusiondirectory.po b/apache2/locale/fa_IR/fusiondirectory.po
index 7b55b1cab79c3f57d0970f305235eecc1db7302a..4cb1b2a63f0779c32a0d06d25d860d2e3f169569 100644
--- a/apache2/locale/fa_IR/fusiondirectory.po
+++ b/apache2/locale/fa_IR/fusiondirectory.po
@@ -5,12 +5,12 @@
 # Translators:
 msgid ""
 msgstr ""
-"Project-Id-Version: FusionDirectory-108\n"
+"Project-Id-Version: FusionDirectory-109\n"
 "Report-Msgid-Bugs-To: documentation@lists.fusiondirectory.org\n"
-"POT-Creation-Date: 2015-03-19 21:45+0100\n"
-"PO-Revision-Date: 2015-02-25 15:40+0000\n"
+"POT-Creation-Date: 2014-12-15 17:47+0100\n"
+"PO-Revision-Date: 2014-12-15 16:48+0000\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>\n"
-"Language-Team: Persian (Iran) (http://www.transifex.com/projects/p/FusionDirectory-108/language/fa_IR/)\n"
+"Language-Team: Persian (Iran) (http://www.transifex.com/projects/p/FusionDirectory-109/language/fa_IR/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -152,38 +152,3 @@ msgstr ""
 #: admin/systems/services/apache2/class_serviceApacheVhostEdit.inc:107
 msgid "Directory Path"
 msgstr ""
-
-#: admin/systems/services/apache2/remove.tpl.c:2
-msgid "Warning"
-msgstr ""
-
-#: admin/systems/services/apache2/remove.tpl.c:5
-msgid ""
-"This includes all account data, system access rules, imap settings, etc. for"
-" this user. Please double check if your really want to do this since there "
-"is no way for FusionDirectory to get your data back."
-msgstr ""
-
-#: admin/systems/services/apache2/remove.tpl.c:8
-msgid "So - if you're sure - press 'Delete' to continue or 'Cancel' to abort."
-msgstr ""
-
-#: admin/systems/services/apache2/serviceApacheVhostEdit-filter.tpl.c:2
-msgid "Filter"
-msgstr ""
-
-#: admin/systems/services/apache2/serviceApacheVhostEdit-filter.tpl.c:5
-msgid "Name"
-msgstr ""
-
-#: admin/systems/services/apache2/serviceApacheVhostEdit-list.tpl.c:2
-msgid "Base"
-msgstr ""
-
-#: admin/systems/services/apache2/serviceApacheVhostEditFooter.tpl.c:2
-msgid "Save"
-msgstr ""
-
-#: admin/systems/services/apache2/serviceApacheVhostEditFooter.tpl.c:5
-msgid "Cancel"
-msgstr ""
diff --git a/apache2/locale/fr/fusiondirectory.po b/apache2/locale/fr/fusiondirectory.po
index a9bbe3f1fe40b83bf913135ba5db259b99826b06..5779feb1fa9674ccfaa5e2f1128e53f8aa7e2cd5 100644
--- a/apache2/locale/fr/fusiondirectory.po
+++ b/apache2/locale/fr/fusiondirectory.po
@@ -3,22 +3,14 @@
 # This file is distributed under the same license as the PACKAGE package.
 # 
 # Translators:
-# gallak <antoine.gallavardin@free.fr>, 2013
-# Benoit Mortier <benoit.mortier@opensides.be>, 2008-2009
-# MCMic, 2014
-# fusiondirectory <contact@fusiondirectory.org>, 2014
-# fusiondirectory <contact@fusiondirectory.org>, 2012,2014
-# fusiondirectory <contact@fusiondirectory.org>, 2012
-# gallak <antoine.gallavardin@free.fr>, 2013
-# MCMic, 2014
 msgid ""
 msgstr ""
-"Project-Id-Version: FusionDirectory-108\n"
+"Project-Id-Version: FusionDirectory-109\n"
 "Report-Msgid-Bugs-To: documentation@lists.fusiondirectory.org\n"
-"POT-Creation-Date: 2015-03-19 21:45+0100\n"
-"PO-Revision-Date: 2015-02-25 16:12+0000\n"
+"POT-Creation-Date: 2014-12-15 17:47+0100\n"
+"PO-Revision-Date: 2015-02-25 16:04+0000\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>\n"
-"Language-Team: French (http://www.transifex.com/projects/p/FusionDirectory-108/language/fr/)\n"
+"Language-Team: French (http://www.transifex.com/projects/p/FusionDirectory-109/language/fr/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -31,11 +23,11 @@ msgstr "Service Apache"
 
 #: admin/systems/services/apache2/class_serviceApacheVhost.inc:80
 msgid "Apache virtual host service"
-msgstr "Service d'hÃ´te virtuel Apache"
+msgstr "Service de nom d'hÃ´te virtuel apache"
 
 #: admin/systems/services/apache2/class_serviceApacheVhost.inc:80
 msgid "Services"
-msgstr "Services"
+msgstr "Service"
 
 #: admin/systems/services/apache2/class_serviceApacheVhost.inc:84
 msgid "Virtual hosts"
@@ -47,7 +39,7 @@ msgstr "HÃ´tes virtuels Apache"
 
 #: admin/systems/services/apache2/serviceApacheVhostEdit-list.xml:15
 msgid "Template entry"
-msgstr "ModÃ¨le"
+msgstr "ModÃ¨le FAI"
 
 #: admin/systems/services/apache2/serviceApacheVhostEdit-list.xml:32
 msgid "Server name"
@@ -56,7 +48,7 @@ msgstr "Nom du serveur"
 #: admin/systems/services/apache2/serviceApacheVhostEdit-list.xml:40
 #: admin/systems/services/apache2/class_serviceApacheVhostEdit.inc:78
 msgid "Document root"
-msgstr "Page racine"
+msgstr "Document racine"
 
 #: admin/systems/services/apache2/serviceApacheVhostEdit-list.xml:48
 msgid "Actions"
@@ -80,7 +72,7 @@ msgstr "Editer l'hÃ´te virtuel"
 
 #: admin/systems/services/apache2/serviceApacheVhostEdit-list.xml:122
 msgid "Remove host"
-msgstr "Supprimer l'hÃ´te virtuel"
+msgstr "Enlever l'hÃ´te virtuel"
 
 #: admin/systems/services/apache2/class_serviceApacheVhostManagement.inc:24
 msgid "Vhosts"
@@ -97,7 +89,7 @@ msgstr "Apache2"
 
 #: admin/systems/services/apache2/class_serviceApacheVhostEdit.inc:50
 msgid "This Plugin is for Apache server"
-msgstr "Cette extension est pour le serveur Apache"
+msgstr "Cette extension est pour le service Apache"
 
 #: admin/systems/services/apache2/class_serviceApacheVhostEdit.inc:52
 msgid "Apache Vhost"
@@ -113,19 +105,19 @@ msgstr "Nom de l'hÃ´te de virtuel"
 
 #: admin/systems/services/apache2/class_serviceApacheVhostEdit.inc:73
 msgid "The Virtual host name"
-msgstr "Le nom de l'hÃ´te de virtuel"
+msgstr "Nom de l'hÃ´te de virtuel"
 
 #: admin/systems/services/apache2/class_serviceApacheVhostEdit.inc:79
 msgid "Document root for the apache web server"
-msgstr "Page racine du serveur web apache"
+msgstr "Page Racine du serveur web apache"
 
 #: admin/systems/services/apache2/class_serviceApacheVhostEdit.inc:84
 msgid "Admin mail address"
-msgstr "Adresse de courriel de l'administrateur"
+msgstr "Adresse de messagerie de l'administrateur"
 
 #: admin/systems/services/apache2/class_serviceApacheVhostEdit.inc:85
 msgid "Apache admin mail address"
-msgstr "Adresse de courriel de l'administrateur Apache"
+msgstr "Adresse de messagerie de l'administrateur"
 
 #: admin/systems/services/apache2/class_serviceApacheVhostEdit.inc:90
 #: admin/systems/services/apache2/class_serviceApacheVhostEdit.inc:99
@@ -134,7 +126,7 @@ msgstr "Alias script"
 
 #: admin/systems/services/apache2/class_serviceApacheVhostEdit.inc:93
 msgid "Alias"
-msgstr "Alias"
+msgstr "Alias de l'utilisateur"
 
 #: admin/systems/services/apache2/class_serviceApacheVhostEdit.inc:93
 msgid "Alias Directory"
@@ -160,38 +152,3 @@ msgstr "Alias URL"
 #: admin/systems/services/apache2/class_serviceApacheVhostEdit.inc:107
 msgid "Directory Path"
 msgstr "Chemin du rÃ©pertoire"
-
-#: admin/systems/services/apache2/remove.tpl.c:2
-msgid "Warning"
-msgstr "Avertissement"
-
-#: admin/systems/services/apache2/remove.tpl.c:5
-msgid ""
-"This includes all account data, system access rules, imap settings, etc. for"
-" this user. Please double check if your really want to do this since there "
-"is no way for FusionDirectory to get your data back."
-msgstr "Cela inclut toutes les donnÃ©es des comptes, les droits d'accÃ¨s, la configuration imap, etc. pour cet utilisateur. Veuillez vous assurer que vous voulez effectuez cette opÃ©ration Ã©tant donnÃ© qu'il sera impossible pour FusionDirectory de rÃ©cupÃ©rer vos donnÃ©es."
-
-#: admin/systems/services/apache2/remove.tpl.c:8
-msgid "So - if you're sure - press 'Delete' to continue or 'Cancel' to abort."
-msgstr "Donc - si vous Ãªtes sÃ»r - cliquez sur 'Supprimer' pour continuer ou sur 'Annuler' pour abandonner."
-
-#: admin/systems/services/apache2/serviceApacheVhostEdit-filter.tpl.c:2
-msgid "Filter"
-msgstr "Filtre"
-
-#: admin/systems/services/apache2/serviceApacheVhostEdit-filter.tpl.c:5
-msgid "Name"
-msgstr "Nom"
-
-#: admin/systems/services/apache2/serviceApacheVhostEdit-list.tpl.c:2
-msgid "Base"
-msgstr "Base"
-
-#: admin/systems/services/apache2/serviceApacheVhostEditFooter.tpl.c:2
-msgid "Save"
-msgstr "Sauver"
-
-#: admin/systems/services/apache2/serviceApacheVhostEditFooter.tpl.c:5
-msgid "Cancel"
-msgstr "Annuler"
diff --git a/apache2/locale/id/fusiondirectory.po b/apache2/locale/id/fusiondirectory.po
index 965f713123cda1f1953c4b23174f9d90156437f0..4271af048f48f4eca9a0ab216ac3229d7282f575 100644
--- a/apache2/locale/id/fusiondirectory.po
+++ b/apache2/locale/id/fusiondirectory.po
@@ -5,12 +5,12 @@
 # Translators:
 msgid ""
 msgstr ""
-"Project-Id-Version: FusionDirectory-108\n"
+"Project-Id-Version: FusionDirectory-109\n"
 "Report-Msgid-Bugs-To: documentation@lists.fusiondirectory.org\n"
-"POT-Creation-Date: 2015-03-19 21:45+0100\n"
-"PO-Revision-Date: 2015-02-25 15:40+0000\n"
+"POT-Creation-Date: 2014-12-15 17:47+0100\n"
+"PO-Revision-Date: 2014-12-15 16:48+0000\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>\n"
-"Language-Team: Indonesian (http://www.transifex.com/projects/p/FusionDirectory-108/language/id/)\n"
+"Language-Team: Indonesian (http://www.transifex.com/projects/p/FusionDirectory-109/language/id/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -152,38 +152,3 @@ msgstr ""
 #: admin/systems/services/apache2/class_serviceApacheVhostEdit.inc:107
 msgid "Directory Path"
 msgstr ""
-
-#: admin/systems/services/apache2/remove.tpl.c:2
-msgid "Warning"
-msgstr ""
-
-#: admin/systems/services/apache2/remove.tpl.c:5
-msgid ""
-"This includes all account data, system access rules, imap settings, etc. for"
-" this user. Please double check if your really want to do this since there "
-"is no way for FusionDirectory to get your data back."
-msgstr ""
-
-#: admin/systems/services/apache2/remove.tpl.c:8
-msgid "So - if you're sure - press 'Delete' to continue or 'Cancel' to abort."
-msgstr ""
-
-#: admin/systems/services/apache2/serviceApacheVhostEdit-filter.tpl.c:2
-msgid "Filter"
-msgstr ""
-
-#: admin/systems/services/apache2/serviceApacheVhostEdit-filter.tpl.c:5
-msgid "Name"
-msgstr ""
-
-#: admin/systems/services/apache2/serviceApacheVhostEdit-list.tpl.c:2
-msgid "Base"
-msgstr ""
-
-#: admin/systems/services/apache2/serviceApacheVhostEditFooter.tpl.c:2
-msgid "Save"
-msgstr ""
-
-#: admin/systems/services/apache2/serviceApacheVhostEditFooter.tpl.c:5
-msgid "Cancel"
-msgstr ""
diff --git a/apache2/locale/it/fusiondirectory.po b/apache2/locale/it/fusiondirectory.po
index 4c4ae6e66ae3b48cb5a7b0d4809549b9c038865b..86f5615f35669c07cfe755317747296a03cf270a 100644
--- a/apache2/locale/it/fusiondirectory.po
+++ b/apache2/locale/it/fusiondirectory.po
@@ -3,16 +3,14 @@
 # This file is distributed under the same license as the PACKAGE package.
 # 
 # Translators:
-# poterealpopolo <giuliano@opensides.be>, 2013
-# poterealpopolo <giuliano@opensides.be>, 2013
 msgid ""
 msgstr ""
-"Project-Id-Version: FusionDirectory-108\n"
+"Project-Id-Version: FusionDirectory-109\n"
 "Report-Msgid-Bugs-To: documentation@lists.fusiondirectory.org\n"
-"POT-Creation-Date: 2015-03-19 21:45+0100\n"
-"PO-Revision-Date: 2015-02-25 16:12+0000\n"
+"POT-Creation-Date: 2014-12-15 17:47+0100\n"
+"PO-Revision-Date: 2015-02-25 16:04+0000\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>\n"
-"Language-Team: Italian (http://www.transifex.com/projects/p/FusionDirectory-108/language/it/)\n"
+"Language-Team: Italian (http://www.transifex.com/projects/p/FusionDirectory-109/language/it/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -154,38 +152,3 @@ msgstr "URL alias"
 #: admin/systems/services/apache2/class_serviceApacheVhostEdit.inc:107
 msgid "Directory Path"
 msgstr "Path della cartella"
-
-#: admin/systems/services/apache2/remove.tpl.c:2
-msgid "Warning"
-msgstr "Avvertimento"
-
-#: admin/systems/services/apache2/remove.tpl.c:5
-msgid ""
-"This includes all account data, system access rules, imap settings, etc. for"
-" this user. Please double check if your really want to do this since there "
-"is no way for FusionDirectory to get your data back."
-msgstr "Questo include tutti i dati degli account, i permessi di accesso al sistema, la configurazione imap, etc. di questo utente. Accertati che vuoi davvero eseguire questa azione visto che poi sarÃ  impossibile per FusionDirectory recuperare i tuoi dati."
-
-#: admin/systems/services/apache2/remove.tpl.c:8
-msgid "So - if you're sure - press 'Delete' to continue or 'Cancel' to abort."
-msgstr "Quindi - se sei sicuro - premi 'Rimuovi' per continuare oppure 'Annulla' per interrompere."
-
-#: admin/systems/services/apache2/serviceApacheVhostEdit-filter.tpl.c:2
-msgid "Filter"
-msgstr "Filtro"
-
-#: admin/systems/services/apache2/serviceApacheVhostEdit-filter.tpl.c:5
-msgid "Name"
-msgstr "Nome"
-
-#: admin/systems/services/apache2/serviceApacheVhostEdit-list.tpl.c:2
-msgid "Base"
-msgstr "Base"
-
-#: admin/systems/services/apache2/serviceApacheVhostEditFooter.tpl.c:2
-msgid "Save"
-msgstr "Registra"
-
-#: admin/systems/services/apache2/serviceApacheVhostEditFooter.tpl.c:5
-msgid "Cancel"
-msgstr "Annulla"
diff --git a/apache2/locale/lv/fusiondirectory.po b/apache2/locale/lv/fusiondirectory.po
index 96a388db36009d1503a683852d0a333dafa4f222..9294bfc9a4f15ecea676ee36f1c9230bdfb6b1b7 100644
--- a/apache2/locale/lv/fusiondirectory.po
+++ b/apache2/locale/lv/fusiondirectory.po
@@ -5,12 +5,12 @@
 # Translators:
 msgid ""
 msgstr ""
-"Project-Id-Version: FusionDirectory-108\n"
+"Project-Id-Version: FusionDirectory-109\n"
 "Report-Msgid-Bugs-To: documentation@lists.fusiondirectory.org\n"
-"POT-Creation-Date: 2015-03-19 21:45+0100\n"
-"PO-Revision-Date: 2015-02-25 15:40+0000\n"
+"POT-Creation-Date: 2014-12-15 17:47+0100\n"
+"PO-Revision-Date: 2014-12-15 16:48+0000\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>\n"
-"Language-Team: Latvian (http://www.transifex.com/projects/p/FusionDirectory-108/language/lv/)\n"
+"Language-Team: Latvian (http://www.transifex.com/projects/p/FusionDirectory-109/language/lv/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -152,38 +152,3 @@ msgstr ""
 #: admin/systems/services/apache2/class_serviceApacheVhostEdit.inc:107
 msgid "Directory Path"
 msgstr ""
-
-#: admin/systems/services/apache2/remove.tpl.c:2
-msgid "Warning"
-msgstr ""
-
-#: admin/systems/services/apache2/remove.tpl.c:5
-msgid ""
-"This includes all account data, system access rules, imap settings, etc. for"
-" this user. Please double check if your really want to do this since there "
-"is no way for FusionDirectory to get your data back."
-msgstr ""
-
-#: admin/systems/services/apache2/remove.tpl.c:8
-msgid "So - if you're sure - press 'Delete' to continue or 'Cancel' to abort."
-msgstr ""
-
-#: admin/systems/services/apache2/serviceApacheVhostEdit-filter.tpl.c:2
-msgid "Filter"
-msgstr ""
-
-#: admin/systems/services/apache2/serviceApacheVhostEdit-filter.tpl.c:5
-msgid "Name"
-msgstr ""
-
-#: admin/systems/services/apache2/serviceApacheVhostEdit-list.tpl.c:2
-msgid "Base"
-msgstr ""
-
-#: admin/systems/services/apache2/serviceApacheVhostEditFooter.tpl.c:2
-msgid "Save"
-msgstr ""
-
-#: admin/systems/services/apache2/serviceApacheVhostEditFooter.tpl.c:5
-msgid "Cancel"
-msgstr ""
diff --git a/apache2/locale/nb/fusiondirectory.po b/apache2/locale/nb/fusiondirectory.po
index 0b33acb304315a941046f08bad664f8d4ddfe1c4..cee6fb52d0cb65e9f4f4c8b3a1570ec8ece856c9 100644
--- a/apache2/locale/nb/fusiondirectory.po
+++ b/apache2/locale/nb/fusiondirectory.po
@@ -5,12 +5,12 @@
 # Translators:
 msgid ""
 msgstr ""
-"Project-Id-Version: FusionDirectory-108\n"
+"Project-Id-Version: FusionDirectory-109\n"
 "Report-Msgid-Bugs-To: documentation@lists.fusiondirectory.org\n"
-"POT-Creation-Date: 2015-03-19 21:45+0100\n"
-"PO-Revision-Date: 2015-02-25 16:12+0000\n"
+"POT-Creation-Date: 2014-12-15 17:47+0100\n"
+"PO-Revision-Date: 2015-02-25 16:04+0000\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>\n"
-"Language-Team: Norwegian BokmÃ¥l (http://www.transifex.com/projects/p/FusionDirectory-108/language/nb/)\n"
+"Language-Team: Norwegian BokmÃ¥l (http://www.transifex.com/projects/p/FusionDirectory-109/language/nb/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -152,38 +152,3 @@ msgstr ""
 #: admin/systems/services/apache2/class_serviceApacheVhostEdit.inc:107
 msgid "Directory Path"
 msgstr ""
-
-#: admin/systems/services/apache2/remove.tpl.c:2
-msgid "Warning"
-msgstr ""
-
-#: admin/systems/services/apache2/remove.tpl.c:5
-msgid ""
-"This includes all account data, system access rules, imap settings, etc. for"
-" this user. Please double check if your really want to do this since there "
-"is no way for FusionDirectory to get your data back."
-msgstr ""
-
-#: admin/systems/services/apache2/remove.tpl.c:8
-msgid "So - if you're sure - press 'Delete' to continue or 'Cancel' to abort."
-msgstr ""
-
-#: admin/systems/services/apache2/serviceApacheVhostEdit-filter.tpl.c:2
-msgid "Filter"
-msgstr "Filter"
-
-#: admin/systems/services/apache2/serviceApacheVhostEdit-filter.tpl.c:5
-msgid "Name"
-msgstr "Navn"
-
-#: admin/systems/services/apache2/serviceApacheVhostEdit-list.tpl.c:2
-msgid "Base"
-msgstr ""
-
-#: admin/systems/services/apache2/serviceApacheVhostEditFooter.tpl.c:2
-msgid "Save"
-msgstr ""
-
-#: admin/systems/services/apache2/serviceApacheVhostEditFooter.tpl.c:5
-msgid "Cancel"
-msgstr ""
diff --git a/apache2/locale/nl/fusiondirectory.po b/apache2/locale/nl/fusiondirectory.po
index a7ad94f9474b0619fc9885e5b3c5fe7b6864ab93..9d4883880f551d56d0bab8d1d38fb3bc02f78843 100644
--- a/apache2/locale/nl/fusiondirectory.po
+++ b/apache2/locale/nl/fusiondirectory.po
@@ -5,12 +5,12 @@
 # Translators:
 msgid ""
 msgstr ""
-"Project-Id-Version: FusionDirectory-108\n"
+"Project-Id-Version: FusionDirectory-109\n"
 "Report-Msgid-Bugs-To: documentation@lists.fusiondirectory.org\n"
-"POT-Creation-Date: 2015-03-19 21:45+0100\n"
-"PO-Revision-Date: 2015-02-25 16:12+0000\n"
+"POT-Creation-Date: 2014-12-15 17:47+0100\n"
+"PO-Revision-Date: 2015-02-25 16:04+0000\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>\n"
-"Language-Team: Dutch (http://www.transifex.com/projects/p/FusionDirectory-108/language/nl/)\n"
+"Language-Team: Dutch (http://www.transifex.com/projects/p/FusionDirectory-109/language/nl/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -56,7 +56,7 @@ msgstr "Acties"
 
 #: admin/systems/services/apache2/serviceApacheVhostEdit-list.xml:59
 msgid "Create"
-msgstr "Maak"
+msgstr "Aanmaken"
 
 #: admin/systems/services/apache2/serviceApacheVhostEdit-list.xml:65
 msgid "serviceApacheVhostEdit"
@@ -64,7 +64,7 @@ msgstr ""
 
 #: admin/systems/services/apache2/serviceApacheVhostEdit-list.xml:77
 msgid "Remove"
-msgstr "Verwijder"
+msgstr "Verwijderen"
 
 #: admin/systems/services/apache2/serviceApacheVhostEdit-list.xml:109
 msgid "Edit host"
@@ -152,38 +152,3 @@ msgstr "URL Alias"
 #: admin/systems/services/apache2/class_serviceApacheVhostEdit.inc:107
 msgid "Directory Path"
 msgstr "Directory Path"
-
-#: admin/systems/services/apache2/remove.tpl.c:2
-msgid "Warning"
-msgstr "Waarschuwing"
-
-#: admin/systems/services/apache2/remove.tpl.c:5
-msgid ""
-"This includes all account data, system access rules, imap settings, etc. for"
-" this user. Please double check if your really want to do this since there "
-"is no way for FusionDirectory to get your data back."
-msgstr "Inclusief alle account data,system access rules,imap opties,etc. Voor deze gebruiker. Gelieve dubbel na te kijken of je dit echt wenst te doen want er is geen andere manier voor FusionDirectory om je data terug te krijgen."
-
-#: admin/systems/services/apache2/remove.tpl.c:8
-msgid "So - if you're sure - press 'Delete' to continue or 'Cancel' to abort."
-msgstr "Indien u zeker bent drukt u dan 'Verwijderen' om door te gaan of 'Annuleren' om te annuleren."
-
-#: admin/systems/services/apache2/serviceApacheVhostEdit-filter.tpl.c:2
-msgid "Filter"
-msgstr "Filter"
-
-#: admin/systems/services/apache2/serviceApacheVhostEdit-filter.tpl.c:5
-msgid "Name"
-msgstr "Naam"
-
-#: admin/systems/services/apache2/serviceApacheVhostEdit-list.tpl.c:2
-msgid "Base"
-msgstr "Basis"
-
-#: admin/systems/services/apache2/serviceApacheVhostEditFooter.tpl.c:2
-msgid "Save"
-msgstr "Opslaan"
-
-#: admin/systems/services/apache2/serviceApacheVhostEditFooter.tpl.c:5
-msgid "Cancel"
-msgstr "Annuleren"
diff --git a/apache2/locale/pl/fusiondirectory.po b/apache2/locale/pl/fusiondirectory.po
index 439389cb0fb048bb86b094f44ad974eb5f3e30d0..58f69e9b0ec5c2d4c36cf8d1267eec7ad51673c0 100644
--- a/apache2/locale/pl/fusiondirectory.po
+++ b/apache2/locale/pl/fusiondirectory.po
@@ -5,12 +5,12 @@
 # Translators:
 msgid ""
 msgstr ""
-"Project-Id-Version: FusionDirectory-108\n"
+"Project-Id-Version: FusionDirectory-109\n"
 "Report-Msgid-Bugs-To: documentation@lists.fusiondirectory.org\n"
-"POT-Creation-Date: 2015-03-19 21:45+0100\n"
-"PO-Revision-Date: 2015-02-25 16:12+0000\n"
+"POT-Creation-Date: 2014-12-15 17:47+0100\n"
+"PO-Revision-Date: 2015-02-25 16:04+0000\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>\n"
-"Language-Team: Polish (http://www.transifex.com/projects/p/FusionDirectory-108/language/pl/)\n"
+"Language-Team: Polish (http://www.transifex.com/projects/p/FusionDirectory-109/language/pl/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -152,38 +152,3 @@ msgstr ""
 #: admin/systems/services/apache2/class_serviceApacheVhostEdit.inc:107
 msgid "Directory Path"
 msgstr ""
-
-#: admin/systems/services/apache2/remove.tpl.c:2
-msgid "Warning"
-msgstr "OstrzeÅ¼enie"
-
-#: admin/systems/services/apache2/remove.tpl.c:5
-msgid ""
-"This includes all account data, system access rules, imap settings, etc. for"
-" this user. Please double check if your really want to do this since there "
-"is no way for FusionDirectory to get your data back."
-msgstr ""
-
-#: admin/systems/services/apache2/remove.tpl.c:8
-msgid "So - if you're sure - press 'Delete' to continue or 'Cancel' to abort."
-msgstr "JeÅ›li jesteÅ› pewien - naciÅ›nij 'UsuÅ„' aby kontynuowaÄ‡ lub 'Anuluj' aby anulowaÄ‡."
-
-#: admin/systems/services/apache2/serviceApacheVhostEdit-filter.tpl.c:2
-msgid "Filter"
-msgstr "Filtr"
-
-#: admin/systems/services/apache2/serviceApacheVhostEdit-filter.tpl.c:5
-msgid "Name"
-msgstr "ImiÄ™"
-
-#: admin/systems/services/apache2/serviceApacheVhostEdit-list.tpl.c:2
-msgid "Base"
-msgstr "Kontener"
-
-#: admin/systems/services/apache2/serviceApacheVhostEditFooter.tpl.c:2
-msgid "Save"
-msgstr "Zapisz"
-
-#: admin/systems/services/apache2/serviceApacheVhostEditFooter.tpl.c:5
-msgid "Cancel"
-msgstr "Anuluj"
diff --git a/apache2/locale/pt/fusiondirectory.po b/apache2/locale/pt/fusiondirectory.po
index 9348a25b98877cf156291f8081a346e27572793d..a37a03e1c4decd5625be1f33be787d173225fd22 100644
--- a/apache2/locale/pt/fusiondirectory.po
+++ b/apache2/locale/pt/fusiondirectory.po
@@ -5,12 +5,12 @@
 # Translators:
 msgid ""
 msgstr ""
-"Project-Id-Version: FusionDirectory-108\n"
+"Project-Id-Version: FusionDirectory-109\n"
 "Report-Msgid-Bugs-To: documentation@lists.fusiondirectory.org\n"
-"POT-Creation-Date: 2015-03-19 21:45+0100\n"
-"PO-Revision-Date: 2015-02-25 16:12+0000\n"
+"POT-Creation-Date: 2014-12-15 17:47+0100\n"
+"PO-Revision-Date: 2015-02-25 16:04+0000\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>\n"
-"Language-Team: Portuguese (http://www.transifex.com/projects/p/FusionDirectory-108/language/pt/)\n"
+"Language-Team: Portuguese (http://www.transifex.com/projects/p/FusionDirectory-109/language/pt/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -152,38 +152,3 @@ msgstr ""
 #: admin/systems/services/apache2/class_serviceApacheVhostEdit.inc:107
 msgid "Directory Path"
 msgstr ""
-
-#: admin/systems/services/apache2/remove.tpl.c:2
-msgid "Warning"
-msgstr "AtenÃ§Ã£o"
-
-#: admin/systems/services/apache2/remove.tpl.c:5
-msgid ""
-"This includes all account data, system access rules, imap settings, etc. for"
-" this user. Please double check if your really want to do this since there "
-"is no way for FusionDirectory to get your data back."
-msgstr ""
-
-#: admin/systems/services/apache2/remove.tpl.c:8
-msgid "So - if you're sure - press 'Delete' to continue or 'Cancel' to abort."
-msgstr "EntÃ£o, se vocÃª tem certeza, pressione 'Deletar' para continuar ou 'Cancelar' para abortar."
-
-#: admin/systems/services/apache2/serviceApacheVhostEdit-filter.tpl.c:2
-msgid "Filter"
-msgstr ""
-
-#: admin/systems/services/apache2/serviceApacheVhostEdit-filter.tpl.c:5
-msgid "Name"
-msgstr "Nome"
-
-#: admin/systems/services/apache2/serviceApacheVhostEdit-list.tpl.c:2
-msgid "Base"
-msgstr "Base"
-
-#: admin/systems/services/apache2/serviceApacheVhostEditFooter.tpl.c:2
-msgid "Save"
-msgstr "Salvar"
-
-#: admin/systems/services/apache2/serviceApacheVhostEditFooter.tpl.c:5
-msgid "Cancel"
-msgstr "Cancelar"
diff --git a/apache2/locale/pt_BR/fusiondirectory.po b/apache2/locale/pt_BR/fusiondirectory.po
index d88c5eb9e80357c766d796b0296735e10bf62383..0b884d9b0825650b18cf16f2dd8d09eb02b2dc33 100644
--- a/apache2/locale/pt_BR/fusiondirectory.po
+++ b/apache2/locale/pt_BR/fusiondirectory.po
@@ -3,16 +3,14 @@
 # This file is distributed under the same license as the PACKAGE package.
 # 
 # Translators:
-# kayocarneiro <kayomatheus@gmail.com>, 2014
-# kayocarneiro <kayomatheus@gmail.com>, 2014
 msgid ""
 msgstr ""
-"Project-Id-Version: FusionDirectory-108\n"
+"Project-Id-Version: FusionDirectory-109\n"
 "Report-Msgid-Bugs-To: documentation@lists.fusiondirectory.org\n"
-"POT-Creation-Date: 2015-03-19 21:45+0100\n"
-"PO-Revision-Date: 2015-02-25 16:12+0000\n"
+"POT-Creation-Date: 2014-12-15 17:47+0100\n"
+"PO-Revision-Date: 2015-02-25 16:04+0000\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>\n"
-"Language-Team: Portuguese (Brazil) (http://www.transifex.com/projects/p/FusionDirectory-108/language/pt_BR/)\n"
+"Language-Team: Portuguese (Brazil) (http://www.transifex.com/projects/p/FusionDirectory-109/language/pt_BR/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -154,38 +152,3 @@ msgstr "URL Alias"
 #: admin/systems/services/apache2/class_serviceApacheVhostEdit.inc:107
 msgid "Directory Path"
 msgstr "DiretÃ³rio de Pacote"
-
-#: admin/systems/services/apache2/remove.tpl.c:2
-msgid "Warning"
-msgstr "Aviso"
-
-#: admin/systems/services/apache2/remove.tpl.c:5
-msgid ""
-"This includes all account data, system access rules, imap settings, etc. for"
-" this user. Please double check if your really want to do this since there "
-"is no way for FusionDirectory to get your data back."
-msgstr "Isto inclui todos os dados da conta, regras de acesso ao sistema, configuraÃ§Ãµes do imap, etc. para este usuÃ¡rio. Por favor, tenha certeza que vocÃª quer fazer isso porque nÃ£o tem como recuperar seus dados do FusionDirectory de volta."
-
-#: admin/systems/services/apache2/remove.tpl.c:8
-msgid "So - if you're sure - press 'Delete' to continue or 'Cancel' to abort."
-msgstr "Se vocÃª tem certeza, pressione 'Delete' para continuar ou 'Cancel' para desistir."
-
-#: admin/systems/services/apache2/serviceApacheVhostEdit-filter.tpl.c:2
-msgid "Filter"
-msgstr "Filtro"
-
-#: admin/systems/services/apache2/serviceApacheVhostEdit-filter.tpl.c:5
-msgid "Name"
-msgstr "Nome"
-
-#: admin/systems/services/apache2/serviceApacheVhostEdit-list.tpl.c:2
-msgid "Base"
-msgstr "Base"
-
-#: admin/systems/services/apache2/serviceApacheVhostEditFooter.tpl.c:2
-msgid "Save"
-msgstr "Salvar"
-
-#: admin/systems/services/apache2/serviceApacheVhostEditFooter.tpl.c:5
-msgid "Cancel"
-msgstr "Cancelar"
diff --git a/apache2/locale/ru/fusiondirectory.po b/apache2/locale/ru/fusiondirectory.po
index 123151807b83b475e8c8729157c0b9ade477ea23..bcc1230a6cfc3caa67be09d70291ec5e2eba7f53 100644
--- a/apache2/locale/ru/fusiondirectory.po
+++ b/apache2/locale/ru/fusiondirectory.po
@@ -5,17 +5,17 @@
 # Translators:
 msgid ""
 msgstr ""
-"Project-Id-Version: FusionDirectory-108\n"
+"Project-Id-Version: FusionDirectory-109\n"
 "Report-Msgid-Bugs-To: documentation@lists.fusiondirectory.org\n"
-"POT-Creation-Date: 2015-03-19 21:45+0100\n"
-"PO-Revision-Date: 2015-03-07 09:09+0000\n"
+"POT-Creation-Date: 2014-12-15 17:47+0100\n"
+"PO-Revision-Date: 2015-04-03 10:49+0000\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>\n"
-"Language-Team: Russian (http://www.transifex.com/projects/p/FusionDirectory-108/language/ru/)\n"
+"Language-Team: Russian (http://www.transifex.com/projects/p/FusionDirectory-109/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=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);\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/apache2/class_serviceApacheVhost.inc:79
 msgid "Apache service"
@@ -126,7 +126,7 @@ msgstr ""
 
 #: admin/systems/services/apache2/class_serviceApacheVhostEdit.inc:93
 msgid "Alias"
-msgstr ""
+msgstr "ÐŸÑÐµÐ²Ð¾Ð´Ð¾Ð½Ð¸Ð¼"
 
 #: admin/systems/services/apache2/class_serviceApacheVhostEdit.inc:93
 msgid "Alias Directory"
@@ -152,38 +152,3 @@ msgstr ""
 #: admin/systems/services/apache2/class_serviceApacheVhostEdit.inc:107
 msgid "Directory Path"
 msgstr ""
-
-#: admin/systems/services/apache2/remove.tpl.c:2
-msgid "Warning"
-msgstr "ÐŸÑ€ÐµÐ´ÑƒÐ¿Ñ€ÐµÐ¶Ð´ÐµÐ½Ð¸Ðµ"
-
-#: admin/systems/services/apache2/remove.tpl.c:5
-msgid ""
-"This includes all account data, system access rules, imap settings, etc. for"
-" this user. Please double check if your really want to do this since there "
-"is no way for FusionDirectory to get your data back."
-msgstr ""
-
-#: admin/systems/services/apache2/remove.tpl.c:8
-msgid "So - if you're sure - press 'Delete' to continue or 'Cancel' to abort."
-msgstr "Ð˜Ñ‚Ð°Ðº - ÐµÑÐ»Ð¸ Ð²Ñ‹ ÑƒÐ²ÐµÑ€ÐµÐ½Ñ‹ - Ð½Ð°Ð¶Ð¼Ð¸Ñ‚Ðµ 'Ð£Ð´Ð°Ð»Ð¸Ñ‚ÑŒ', Ñ‡Ñ‚Ð¾Ð±Ñ‹ Ð¿Ñ€Ð¾Ð´Ð¾Ð»Ð¶Ð¸Ñ‚ÑŒ Ð¸Ð»Ð¸ 'ÐžÑ‚Ð¼ÐµÐ½Ð°' Ñ‡Ñ‚Ð¾Ð±Ñ‹ Ð¿Ñ€ÐµÑ€Ð²Ð°Ñ‚ÑŒ."
-
-#: admin/systems/services/apache2/serviceApacheVhostEdit-filter.tpl.c:2
-msgid "Filter"
-msgstr "Ð¤Ð¸Ð»ÑŒÑ‚Ñ€"
-
-#: admin/systems/services/apache2/serviceApacheVhostEdit-filter.tpl.c:5
-msgid "Name"
-msgstr "ÐÐ°Ð·Ð²Ð°Ð½Ð¸Ðµ"
-
-#: admin/systems/services/apache2/serviceApacheVhostEdit-list.tpl.c:2
-msgid "Base"
-msgstr "Ð’ÐµÑ‚ÐºÐ°"
-
-#: admin/systems/services/apache2/serviceApacheVhostEditFooter.tpl.c:2
-msgid "Save"
-msgstr "Ð¡Ð¾Ñ…Ñ€Ð°Ð½Ð¸Ñ‚ÑŒ"
-
-#: admin/systems/services/apache2/serviceApacheVhostEditFooter.tpl.c:5
-msgid "Cancel"
-msgstr "ÐžÑ‚Ð¼ÐµÐ½Ð°"
diff --git a/apache2/locale/ru@petr1708/fusiondirectory.po b/apache2/locale/ru@petr1708/fusiondirectory.po
index 48534dda5d6c539b21cd4e906fc494da270204df..b2cd38793d866e81cec3b0eecb1f3797319f2dac 100644
--- a/apache2/locale/ru@petr1708/fusiondirectory.po
+++ b/apache2/locale/ru@petr1708/fusiondirectory.po
@@ -5,17 +5,17 @@
 # Translators:
 msgid ""
 msgstr ""
-"Project-Id-Version: FusionDirectory-108\n"
+"Project-Id-Version: FusionDirectory-109\n"
 "Report-Msgid-Bugs-To: documentation@lists.fusiondirectory.org\n"
-"POT-Creation-Date: 2015-03-19 21:45+0100\n"
-"PO-Revision-Date: 2015-02-25 15:40+0000\n"
+"POT-Creation-Date: 2014-12-15 17:47+0100\n"
+"PO-Revision-Date: 2014-12-15 16:48+0000\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>\n"
-"Language-Team: Russian Petrine orthography (http://www.transifex.com/projects/p/FusionDirectory-108/language/ru@petr1708/)\n"
+"Language-Team: Russian Petrine orthography (http://www.transifex.com/projects/p/FusionDirectory-109/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=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);\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/apache2/class_serviceApacheVhost.inc:79
 msgid "Apache service"
@@ -152,38 +152,3 @@ msgstr ""
 #: admin/systems/services/apache2/class_serviceApacheVhostEdit.inc:107
 msgid "Directory Path"
 msgstr ""
-
-#: admin/systems/services/apache2/remove.tpl.c:2
-msgid "Warning"
-msgstr ""
-
-#: admin/systems/services/apache2/remove.tpl.c:5
-msgid ""
-"This includes all account data, system access rules, imap settings, etc. for"
-" this user. Please double check if your really want to do this since there "
-"is no way for FusionDirectory to get your data back."
-msgstr ""
-
-#: admin/systems/services/apache2/remove.tpl.c:8
-msgid "So - if you're sure - press 'Delete' to continue or 'Cancel' to abort."
-msgstr ""
-
-#: admin/systems/services/apache2/serviceApacheVhostEdit-filter.tpl.c:2
-msgid "Filter"
-msgstr ""
-
-#: admin/systems/services/apache2/serviceApacheVhostEdit-filter.tpl.c:5
-msgid "Name"
-msgstr ""
-
-#: admin/systems/services/apache2/serviceApacheVhostEdit-list.tpl.c:2
-msgid "Base"
-msgstr ""
-
-#: admin/systems/services/apache2/serviceApacheVhostEditFooter.tpl.c:2
-msgid "Save"
-msgstr ""
-
-#: admin/systems/services/apache2/serviceApacheVhostEditFooter.tpl.c:5
-msgid "Cancel"
-msgstr ""
diff --git a/apache2/locale/sv/fusiondirectory.po b/apache2/locale/sv/fusiondirectory.po
index 2a229bc7dde4421ab40b143ec147eaf002e0f389..76e21dea25a630a728b33cf58e98222e9642fe22 100644
--- a/apache2/locale/sv/fusiondirectory.po
+++ b/apache2/locale/sv/fusiondirectory.po
@@ -5,12 +5,12 @@
 # Translators:
 msgid ""
 msgstr ""
-"Project-Id-Version: FusionDirectory-108\n"
+"Project-Id-Version: FusionDirectory-109\n"
 "Report-Msgid-Bugs-To: documentation@lists.fusiondirectory.org\n"
-"POT-Creation-Date: 2015-03-19 21:45+0100\n"
-"PO-Revision-Date: 2015-02-25 16:12+0000\n"
+"POT-Creation-Date: 2014-12-15 17:47+0100\n"
+"PO-Revision-Date: 2015-02-25 16:04+0000\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>\n"
-"Language-Team: Swedish (http://www.transifex.com/projects/p/FusionDirectory-108/language/sv/)\n"
+"Language-Team: Swedish (http://www.transifex.com/projects/p/FusionDirectory-109/language/sv/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -152,38 +152,3 @@ msgstr ""
 #: admin/systems/services/apache2/class_serviceApacheVhostEdit.inc:107
 msgid "Directory Path"
 msgstr ""
-
-#: admin/systems/services/apache2/remove.tpl.c:2
-msgid "Warning"
-msgstr "Varning"
-
-#: admin/systems/services/apache2/remove.tpl.c:5
-msgid ""
-"This includes all account data, system access rules, imap settings, etc. for"
-" this user. Please double check if your really want to do this since there "
-"is no way for FusionDirectory to get your data back."
-msgstr "Detta inkluderar alla kontodata, systemrÃ¤ttighetsregler, imapinstÃ¤llningar, etc. fÃ¶r den hÃ¤r anvÃ¤ndaren. VÃ¤nligen dubbelkolla att du verkligen vill gÃ¶ra detta eftersom det inte finns nÃ¥got sÃ¤tt fÃ¶r FusionDirectory att fÃ¥ tillbaka informationen."
-
-#: admin/systems/services/apache2/remove.tpl.c:8
-msgid "So - if you're sure - press 'Delete' to continue or 'Cancel' to abort."
-msgstr "SÃ¥ - om du Ã¤r sÃ¤ker - tryck 'Ta bort' fÃ¶r att fortsÃ¤tta och 'Avbryt' fÃ¶r att avbryta."
-
-#: admin/systems/services/apache2/serviceApacheVhostEdit-filter.tpl.c:2
-msgid "Filter"
-msgstr "Filter"
-
-#: admin/systems/services/apache2/serviceApacheVhostEdit-filter.tpl.c:5
-msgid "Name"
-msgstr "Namn"
-
-#: admin/systems/services/apache2/serviceApacheVhostEdit-list.tpl.c:2
-msgid "Base"
-msgstr "Bas"
-
-#: admin/systems/services/apache2/serviceApacheVhostEditFooter.tpl.c:2
-msgid "Save"
-msgstr "Spara"
-
-#: admin/systems/services/apache2/serviceApacheVhostEditFooter.tpl.c:5
-msgid "Cancel"
-msgstr "Avbryt"
diff --git a/apache2/locale/ug/fusiondirectory.po b/apache2/locale/ug/fusiondirectory.po
index 2c0ec7f38120259a6066f4bb63653f40ca841673..41fd04a1bf1fb1bfafd94f4243a599d5fdccc60e 100644
--- a/apache2/locale/ug/fusiondirectory.po
+++ b/apache2/locale/ug/fusiondirectory.po
@@ -5,12 +5,12 @@
 # Translators:
 msgid ""
 msgstr ""
-"Project-Id-Version: FusionDirectory-108\n"
+"Project-Id-Version: FusionDirectory-109\n"
 "Report-Msgid-Bugs-To: documentation@lists.fusiondirectory.org\n"
-"POT-Creation-Date: 2015-03-19 21:45+0100\n"
-"PO-Revision-Date: 2015-02-25 15:40+0000\n"
+"POT-Creation-Date: 2014-12-15 17:47+0100\n"
+"PO-Revision-Date: 2014-12-15 16:48+0000\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>\n"
-"Language-Team: Uighur (http://www.transifex.com/projects/p/FusionDirectory-108/language/ug/)\n"
+"Language-Team: Uighur (http://www.transifex.com/projects/p/FusionDirectory-109/language/ug/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -152,38 +152,3 @@ msgstr ""
 #: admin/systems/services/apache2/class_serviceApacheVhostEdit.inc:107
 msgid "Directory Path"
 msgstr ""
-
-#: admin/systems/services/apache2/remove.tpl.c:2
-msgid "Warning"
-msgstr ""
-
-#: admin/systems/services/apache2/remove.tpl.c:5
-msgid ""
-"This includes all account data, system access rules, imap settings, etc. for"
-" this user. Please double check if your really want to do this since there "
-"is no way for FusionDirectory to get your data back."
-msgstr ""
-
-#: admin/systems/services/apache2/remove.tpl.c:8
-msgid "So - if you're sure - press 'Delete' to continue or 'Cancel' to abort."
-msgstr ""
-
-#: admin/systems/services/apache2/serviceApacheVhostEdit-filter.tpl.c:2
-msgid "Filter"
-msgstr ""
-
-#: admin/systems/services/apache2/serviceApacheVhostEdit-filter.tpl.c:5
-msgid "Name"
-msgstr ""
-
-#: admin/systems/services/apache2/serviceApacheVhostEdit-list.tpl.c:2
-msgid "Base"
-msgstr ""
-
-#: admin/systems/services/apache2/serviceApacheVhostEditFooter.tpl.c:2
-msgid "Save"
-msgstr ""
-
-#: admin/systems/services/apache2/serviceApacheVhostEditFooter.tpl.c:5
-msgid "Cancel"
-msgstr ""
diff --git a/apache2/locale/vi_VN/fusiondirectory.po b/apache2/locale/vi_VN/fusiondirectory.po
index fc29000b4478d93ad9e34708ce35ed3eac8d23d1..4ad7e7154562e346665ce58dce29d13049144343 100644
--- a/apache2/locale/vi_VN/fusiondirectory.po
+++ b/apache2/locale/vi_VN/fusiondirectory.po
@@ -5,12 +5,12 @@
 # Translators:
 msgid ""
 msgstr ""
-"Project-Id-Version: FusionDirectory-108\n"
+"Project-Id-Version: FusionDirectory-109\n"
 "Report-Msgid-Bugs-To: documentation@lists.fusiondirectory.org\n"
-"POT-Creation-Date: 2015-03-19 21:45+0100\n"
-"PO-Revision-Date: 2015-02-25 16:12+0000\n"
+"POT-Creation-Date: 2014-12-15 17:47+0100\n"
+"PO-Revision-Date: 2015-02-25 16:04+0000\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>\n"
-"Language-Team: Vietnamese (Viet Nam) (http://www.transifex.com/projects/p/FusionDirectory-108/language/vi_VN/)\n"
+"Language-Team: Vietnamese (Viet Nam) (http://www.transifex.com/projects/p/FusionDirectory-109/language/vi_VN/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -152,38 +152,3 @@ msgstr ""
 #: admin/systems/services/apache2/class_serviceApacheVhostEdit.inc:107
 msgid "Directory Path"
 msgstr ""
-
-#: admin/systems/services/apache2/remove.tpl.c:2
-msgid "Warning"
-msgstr "Cáº£nh bÃ¡o"
-
-#: admin/systems/services/apache2/remove.tpl.c:5
-msgid ""
-"This includes all account data, system access rules, imap settings, etc. for"
-" this user. Please double check if your really want to do this since there "
-"is no way for FusionDirectory to get your data back."
-msgstr ""
-
-#: admin/systems/services/apache2/remove.tpl.c:8
-msgid "So - if you're sure - press 'Delete' to continue or 'Cancel' to abort."
-msgstr "VÃ¬ tháº¿ náº¿u báº¡n cháº¯c cháº¯n hÃ£y nháº¥n \"XÃ³a bá»\" Ä‘á»ƒ tiáº¿p tá»¥c hoáº·c'Há»§y bá»' Ä‘á»ƒ dá»«ng láº¡i."
-
-#: admin/systems/services/apache2/serviceApacheVhostEdit-filter.tpl.c:2
-msgid "Filter"
-msgstr ""
-
-#: admin/systems/services/apache2/serviceApacheVhostEdit-filter.tpl.c:5
-msgid "Name"
-msgstr "TÃªn"
-
-#: admin/systems/services/apache2/serviceApacheVhostEdit-list.tpl.c:2
-msgid "Base"
-msgstr "CÆ¡ sá»Ÿ"
-
-#: admin/systems/services/apache2/serviceApacheVhostEditFooter.tpl.c:2
-msgid "Save"
-msgstr "LÆ°u láº¡i"
-
-#: admin/systems/services/apache2/serviceApacheVhostEditFooter.tpl.c:5
-msgid "Cancel"
-msgstr "Há»§y bá»"
diff --git a/apache2/locale/zh/fusiondirectory.po b/apache2/locale/zh/fusiondirectory.po
index c6723f4dfb07654f6b9fe398241e9303808b6980..a22272cfce89af3c5556b48474c3d7085da85631 100644
--- a/apache2/locale/zh/fusiondirectory.po
+++ b/apache2/locale/zh/fusiondirectory.po
@@ -5,12 +5,12 @@
 # Translators:
 msgid ""
 msgstr ""
-"Project-Id-Version: FusionDirectory-108\n"
+"Project-Id-Version: FusionDirectory-109\n"
 "Report-Msgid-Bugs-To: documentation@lists.fusiondirectory.org\n"
-"POT-Creation-Date: 2015-03-19 21:45+0100\n"
-"PO-Revision-Date: 2015-02-25 16:12+0000\n"
+"POT-Creation-Date: 2014-12-15 17:47+0100\n"
+"PO-Revision-Date: 2015-02-25 16:04+0000\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>\n"
-"Language-Team: Chinese (http://www.transifex.com/projects/p/FusionDirectory-108/language/zh/)\n"
+"Language-Team: Chinese (http://www.transifex.com/projects/p/FusionDirectory-109/language/zh/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -152,38 +152,3 @@ msgstr ""
 #: admin/systems/services/apache2/class_serviceApacheVhostEdit.inc:107
 msgid "Directory Path"
 msgstr ""
-
-#: admin/systems/services/apache2/remove.tpl.c:2
-msgid "Warning"
-msgstr "è¦å‘Š"
-
-#: admin/systems/services/apache2/remove.tpl.c:5
-msgid ""
-"This includes all account data, system access rules, imap settings, etc. for"
-" this user. Please double check if your really want to do this since there "
-"is no way for FusionDirectory to get your data back."
-msgstr ""
-
-#: admin/systems/services/apache2/remove.tpl.c:8
-msgid "So - if you're sure - press 'Delete' to continue or 'Cancel' to abort."
-msgstr "æ‰€ä»¥ï¼Œå¦‚æžœæ‚¨ç¡®å®šï¼Œè¯·æŒ‰â€œåˆ é™¤â€ç»§ç»ï¼Œå¦åˆ™æŒ‰â€œå–æ¶ˆâ€é€€å‡ºã€‚"
-
-#: admin/systems/services/apache2/serviceApacheVhostEdit-filter.tpl.c:2
-msgid "Filter"
-msgstr "è¿‡æ»¤å™¨"
-
-#: admin/systems/services/apache2/serviceApacheVhostEdit-filter.tpl.c:5
-msgid "Name"
-msgstr "åç§°"
-
-#: admin/systems/services/apache2/serviceApacheVhostEdit-list.tpl.c:2
-msgid "Base"
-msgstr "ä½ç½®"
-
-#: admin/systems/services/apache2/serviceApacheVhostEditFooter.tpl.c:2
-msgid "Save"
-msgstr "ä¿å˜"
-
-#: admin/systems/services/apache2/serviceApacheVhostEditFooter.tpl.c:5
-msgid "Cancel"
-msgstr "å–æ¶ˆ"
diff --git a/applications/locale/ar/fusiondirectory.po b/applications/locale/ar/fusiondirectory.po
index 404c68afbe6cf45087a9030952b9ff461379563c..29b6e033ad35dbf730198db796309ab3fac384d1 100644
--- a/applications/locale/ar/fusiondirectory.po
+++ b/applications/locale/ar/fusiondirectory.po
@@ -5,219 +5,497 @@
 # Translators:
 msgid ""
 msgstr ""
-"Project-Id-Version: FusionDirectory-108\n"
+"Project-Id-Version: FusionDirectory-109\n"
 "Report-Msgid-Bugs-To: documentation@lists.fusiondirectory.org\n"
-"POT-Creation-Date: 2015-03-19 21:45+0100\n"
-"PO-Revision-Date: 2015-02-25 16:03+0000\n"
-"Last-Translator: fusiondirectory <contact@fusiondirectory.org>\n"
-"Language-Team: Arabic (http://www.transifex.com/projects/p/FusionDirectory-108/language/ar/)\n"
+"POT-Creation-Date: 2014-08-28 12:26+0200\n"
+"PO-Revision-Date: 2014-08-28 10:28+0000\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: Arabic (http://www.transifex.com/projects/p/FusionDirectory-109/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/groups/apps/class_groupApplication.inc:410
+#: admin/groups/apps/class_groupApplication.inc:414
+msgid "Menu"
+msgstr ""
+
+#: admin/groups/apps/class_groupApplication.inc:482
+msgid "Back"
+msgstr "Ø§Ù„Ø±Ø¬ÙˆØ¹"
+
+#: admin/groups/apps/class_groupApplication.inc:493
+msgid "back"
+msgstr ""
+
+#: admin/groups/apps/class_groupApplication.inc:501
+msgid "department"
+msgstr ""
+
+#: admin/groups/apps/class_groupApplication.inc:524
+msgid "application"
+msgstr ""
+
+#: admin/groups/apps/class_groupApplication.inc:701
+#: admin/groups/apps/class_groupApplication.inc:1396
+#: admin/groups/apps/class_groupApplication.inc:1409
+#: admin/groups/apps/class_groupApplication.inc:1422
+#: admin/mimetypes/class_mimetypeGeneric.inc:481
+#: admin/mimetypes/class_mimetypeGeneric.inc:493
+#: admin/mimetypes/class_mimetypeGeneric.inc:508
+#: admin/applications/class_applicationParameters.inc:177
+#: admin/applications/class_applicationParameters.inc:242
+#: admin/applications/class_applicationGeneric.inc:290
+msgid "LDAP error"
+msgstr ""
+
+#: admin/groups/apps/class_groupApplication.inc:1208
+msgid "Not available in release."
+msgstr ""
+
+#: admin/groups/apps/class_groupApplication.inc:1459
 #: 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
+#: admin/mimetypes/generic.tpl.c:62 admin/mimetypes/generic.tpl.c:86
 msgid "Applications"
 msgstr ""
 
-#: admin/applications/class_applicationManagement.inc:29
-msgid "Application management"
+#: admin/groups/apps/class_groupApplication.inc:1460
+msgid "Group applications"
 msgstr ""
 
-#: admin/applications/class_applicationManagement.inc:100
-msgid "Web applications"
+#: admin/groups/apps/class_groupApplication.inc:1466
+#: admin/mimetypes/class_mimetypeGeneric.inc:689
+#: admin/applications/class_applicationGeneric.inc:73
+msgid "Application"
 msgstr ""
 
-#: admin/applications/class_applicationGeneric.inc:31
-#: admin/applications/class_applicationGeneric.inc:34
-#: admin/applications/class_applicationGeneric.inc:48
-#: admin/applications/class_webApplication.inc:47
-msgid "Application"
+#: admin/groups/apps/class_groupApplication.inc:1467
+#: admin/groups/apps/app_list.tpl.c:2 admin/groups/apps/app_list.tpl.c:14
+msgid "Release"
 msgstr ""
 
-#: admin/applications/class_applicationGeneric.inc:32
-msgid "Application information"
+#: admin/groups/apps/class_groupApplication.inc:1468
+msgid "Application parameter"
 msgstr ""
 
-#: admin/applications/class_applicationGeneric.inc:52
-msgid "Application name"
+#: admin/groups/apps/class_groupApplication.inc:1469
+#: admin/applications/class_applicationGeneric.inc:135
+#: admin/groups/apps/edit_entry.tpl.c:32
+msgid "Place icon on members desktop"
 msgstr ""
 
-#: admin/applications/class_applicationGeneric.inc:52
-msgid "The name of this application"
+#: admin/groups/apps/class_groupApplication.inc:1470
+#: admin/applications/class_applicationGeneric.inc:145
+#: admin/groups/apps/edit_entry.tpl.c:38
+msgid "Place entry in members launch bar"
+msgstr ""
+
+#: admin/groups/apps/class_groupApplication.inc:1471
+#: admin/applications/class_applicationGeneric.inc:140
+#: admin/groups/apps/edit_entry.tpl.c:35
+msgid "Place entry in members startmenu"
+msgstr ""
+
+#: admin/mimetypes/class_mimetypeManagement.inc:28
+#: admin/mimetypes/class_mimetypeGeneric.inc:674
+msgid "Mime types"
+msgstr ""
+
+#: admin/mimetypes/class_mimetypeManagement.inc:29
+msgid "Mime type management"
+msgstr ""
+
+#: admin/mimetypes/class_mimetypeGeneric.inc:519
+#: admin/mimetypes/class_mimetypeGeneric.inc:685
+#: admin/applications/class_applicationParameters.inc:208
+#: admin/applications/class_applicationParameters.inc:212
+#: admin/groups/apps/edit_entry.tpl.c:26
+msgid "Name"
+msgstr "Ø§Ù„Ø¥Ø³Ù…"
+
+#: admin/mimetypes/class_mimetypeGeneric.inc:522
+msgid "File pattern"
+msgstr ""
+
+#: admin/mimetypes/class_mimetypeGeneric.inc:671
+#: admin/applications/class_applicationGeneric.inc:69
+#: admin/mimetypes/generic.tpl.c:2
+msgid "Generic"
+msgstr ""
+
+#: admin/mimetypes/class_mimetypeGeneric.inc:672
+msgid "Mime type generic"
+msgstr ""
+
+#: admin/mimetypes/class_mimetypeGeneric.inc:678
+#: admin/mimetypes/generic.tpl.c:5
+msgid "Mime type"
+msgstr ""
+
+#: admin/mimetypes/class_mimetypeGeneric.inc:686
+#: admin/mimetypes/generic.tpl.c:11
+msgid "Mime group"
 msgstr ""
 
-#: admin/applications/class_applicationGeneric.inc:56
-#: admin/applications/class_webApplication.inc:55
+#: admin/mimetypes/class_mimetypeGeneric.inc:687
+#: admin/applications/class_applicationGeneric.inc:105
+#: admin/mimetypes/generic.tpl.c:17
 msgid "Description"
 msgstr "Ø§Ù„ÙˆØµÙ"
 
-#: admin/applications/class_applicationGeneric.inc:56
-#: admin/applications/class_webApplication.inc:55
-msgid "A short description of this application"
+#: admin/mimetypes/class_mimetypeGeneric.inc:688
+#: admin/mimetypes/generic.tpl.c:23
+msgid "Base"
 msgstr ""
 
-#: admin/applications/class_applicationGeneric.inc:60
-msgid "Execute"
+#: admin/mimetypes/class_mimetypeGeneric.inc:690
+msgid "Left click action"
 msgstr ""
 
-#: admin/applications/class_applicationGeneric.inc:60
-msgid "The application to be executed"
+#: admin/mimetypes/class_mimetypeGeneric.inc:691
+#: admin/applications/class_applicationGeneric.inc:112
+#: admin/mimetypes/generic.tpl.c:32
+msgid "Icon"
+msgstr ""
+
+#: admin/mimetypes/class_mimetypeGeneric.inc:692
+#: admin/mimetypes/generic.tpl.c:53
+msgid "File patterns"
+msgstr ""
+
+#: admin/mimetypes/class_mimetypeGeneric.inc:693
+msgid "Embedded applications"
+msgstr ""
+
+#: admin/applications/class_applicationManagement.inc:29
+msgid "Application management"
+msgstr ""
+
+#: admin/applications/class_applicationParameters.inc:71
+msgid "Remove options"
+msgstr ""
+
+#: admin/applications/class_applicationParameters.inc:71
+#: admin/applications/class_applicationParameters.inc:73
+msgid "parameter"
+msgstr ""
+
+#: admin/applications/class_applicationParameters.inc:73
+msgid "Create options"
+msgstr ""
+
+#: admin/applications/class_applicationParameters.inc:115
+msgid "Variable"
+msgstr ""
+
+#: admin/applications/class_applicationParameters.inc:115
+msgid "Default value"
+msgstr ""
+
+#: admin/applications/class_applicationParameters.inc:141
+#: admin/groups/apps/app_list.tpl.c:29 admin/groups/apps/app_list.tpl.c:41
+#: admin/groups/apps/app_list.tpl.c:53
+msgid "Remove"
+msgstr "Ø¥Ø²Ø§Ù„Ø©"
+
+#: admin/applications/class_applicationParameters.inc:147
+msgid "Add option"
+msgstr ""
+
+#: admin/applications/class_applicationParameters.inc:265
+msgid "Parameter"
 msgstr ""
 
-#: admin/applications/class_applicationGeneric.inc:64
+#: admin/applications/class_applicationParameters.inc:266
+msgid "Parameter configuration"
+msgstr ""
+
+#: admin/applications/class_applicationParameters.inc:271
+msgid "Application parameter settings"
+msgstr ""
+
+#: admin/applications/class_applicationGeneric.inc:70
+msgid "Application generic"
+msgstr ""
+
+#: admin/applications/class_applicationGeneric.inc:90
+msgid "Properties"
+msgstr "Ø§Ù„Ø®ÙˆØ§Øµ"
+
+#: admin/applications/class_applicationGeneric.inc:93
+msgid "Application name"
+msgstr ""
+
+#: admin/applications/class_applicationGeneric.inc:93
+msgid "The name of this application"
+msgstr ""
+
+#: admin/applications/class_applicationGeneric.inc:97
 msgid "Display name"
 msgstr ""
 
-#: admin/applications/class_applicationGeneric.inc:64
+#: admin/applications/class_applicationGeneric.inc:97
 msgid "The displayed name for this application"
 msgstr ""
 
-#: admin/applications/class_applicationGeneric.inc:70
-#: admin/applications/class_webApplication.inc:69
-msgid "Icon"
+#: admin/applications/class_applicationGeneric.inc:101
+msgid "Execute"
 msgstr ""
 
-#: admin/applications/class_applicationGeneric.inc:73
-#: admin/applications/class_webApplication.inc:72
+#: admin/applications/class_applicationGeneric.inc:101
+msgid "The application to be executed"
+msgstr ""
+
+#: admin/applications/class_applicationGeneric.inc:105
+msgid "A short description of this application"
+msgstr ""
+
+#: admin/applications/class_applicationGeneric.inc:115
 msgid "The icon for this application"
 msgstr ""
 
-#: admin/applications/class_applicationGeneric.inc:80
+#: admin/applications/class_applicationGeneric.inc:122
 msgid "Options"
 msgstr ""
 
-#: admin/applications/class_applicationGeneric.inc:83
+#: admin/applications/class_applicationGeneric.inc:125
 msgid "Only executable for member"
 msgstr ""
 
-#: admin/applications/class_applicationGeneric.inc:83
+#: admin/applications/class_applicationGeneric.inc:125
 msgid "Only executable by the memebers of the group"
 msgstr ""
 
-#: admin/applications/class_applicationGeneric.inc:88
+#: admin/applications/class_applicationGeneric.inc:130
 msgid "Replace user configuration on startup"
 msgstr ""
 
-#: admin/applications/class_applicationGeneric.inc:88
+#: admin/applications/class_applicationGeneric.inc:130
 msgid "Replace the user configuration on startup"
 msgstr ""
 
-#: admin/applications/class_applicationGeneric.inc:93
-msgid "Place icon on members desktop"
+#: admin/applications/class_applicationGeneric.inc:135
+msgid "Put an icon on the user desktop"
 msgstr ""
 
-#: admin/applications/class_applicationGeneric.inc:93
-msgid "Put an icon on the user desktop"
+#: admin/applications/class_applicationGeneric.inc:140
+#: admin/applications/class_applicationGeneric.inc:145
+msgid "Put an entry in the startup menu"
 msgstr ""
 
-#: admin/applications/class_applicationGeneric.inc:98
-msgid "Place entry in members startmenu"
+#: admin/applications/class_applicationGeneric.inc:156
+msgid "Script"
 msgstr ""
 
-#: admin/applications/class_applicationGeneric.inc:98
-#: admin/applications/class_applicationGeneric.inc:103
-msgid "Put an entry in the startup menu"
+#: admin/applications/class_applicationGeneric.inc:159
+msgid "Script to run at logon"
 msgstr ""
 
-#: admin/applications/class_applicationGeneric.inc:103
-msgid "Place entry in members launch bar"
+#: admin/applications/class_applicationGeneric.inc:165
+msgid "Log off script"
 msgstr ""
 
-#: admin/applications/class_webApplication.inc:30
-#: admin/applications/class_webApplication.inc:33
-msgid "Web application"
+#: admin/applications/class_applicationGeneric.inc:168
+msgid "Script to run at logoff"
 msgstr ""
 
-#: admin/applications/class_webApplication.inc:31
-msgid "Web applicationts names, icons and links"
+#: admin/applications/class_applicationGeneric.inc:227
+msgid "no example"
 msgstr ""
 
-#: admin/applications/class_webApplication.inc:51
-msgid "Name"
-msgstr "Ø§Ù„Ø¥Ø³Ù…"
+#: admin/applications/class_applicationGeneric.inc:276
+msgid "Error"
+msgstr "Ø®Ø·Ø£"
 
-#: admin/applications/class_webApplication.inc:51
-msgid "Name or id for application"
+#: admin/applications/class_applicationGeneric.inc:276
+#, php-format
+msgid "Cannot remove application - it is still in use by these objects: %s"
 msgstr ""
 
-#: admin/applications/class_webApplication.inc:59
-msgid "URL"
+#: config/desktop-management/class_desktopPluginConfig.inc:28
+msgid "Desktop management"
 msgstr ""
 
-#: admin/applications/class_webApplication.inc:59
-msgid "Link to this application"
+#: config/desktop-management/class_desktopPluginConfig.inc:29
+msgid "Desktop management plugin configuration"
 msgstr ""
 
-#: admin/applications/class_webApplication.inc:63
-msgid "Display Name"
+#: config/desktop-management/class_desktopPluginConfig.inc:40
+msgid "LDAP tree"
 msgstr ""
 
-#: admin/applications/class_webApplication.inc:63
-msgid "Displayed name for links to this application"
+#: config/desktop-management/class_desktopPluginConfig.inc:43
+msgid "Mimetype RDN"
 msgstr ""
 
-#: admin/applications/class_webApplication.inc:77
-msgid "Icon location"
+#: config/desktop-management/class_desktopPluginConfig.inc:43
+msgid "Branch in which mime types will be stored"
 msgstr ""
 
-#: admin/applications/class_webApplication.inc:77
-msgid "Usual path to this application icon"
+#: config/desktop-management/class_desktopPluginConfig.inc:48
+msgid "Application RDN"
 msgstr ""
 
-#: admin/roles/class_applicationRights.inc:31
-msgid "Applications allowed for this role"
+#: config/desktop-management/class_desktopPluginConfig.inc:48
+msgid "Branch in which applications will be stored"
 msgstr ""
 
-#: admin/roles/class_applicationRights.inc:45
-msgid "Application list"
+#: admin/groups/apps/edit_entry.tpl.c:2
+msgid "Folder image"
 msgstr ""
 
-#: admin/roles/class_applicationRights.inc:49
-msgid "The applications users with this role are allowed to launch"
+#: admin/groups/apps/edit_entry.tpl.c:5
+msgid "Could not load image."
 msgstr ""
 
-#: config/applications/class_applicationsPluginConfig.inc:29
-msgid "Applications plugin configuration"
+#: admin/groups/apps/edit_entry.tpl.c:8
+msgid "None"
 msgstr ""
 
-#: config/applications/class_applicationsPluginConfig.inc:43
-msgid "Application RDN"
+#: admin/groups/apps/edit_entry.tpl.c:11
+msgid "Upload image"
 msgstr ""
 
-#: config/applications/class_applicationsPluginConfig.inc:43
-msgid "Branch in which applications will be stored"
+#: admin/groups/apps/edit_entry.tpl.c:14
+msgid "Upload"
 msgstr ""
 
-#: config/applications/class_applicationsPluginConfig.inc:48
-msgid "Web applications RDN"
+#: admin/groups/apps/edit_entry.tpl.c:17
+msgid "Reset image"
 msgstr ""
 
-#: config/applications/class_applicationsPluginConfig.inc:48
-msgid "Branch in which web applications will be stored"
+#: admin/groups/apps/edit_entry.tpl.c:20
+msgid "Reset"
 msgstr ""
 
-#: config/applications/class_applicationsPluginConfig.inc:53
-msgid "Show web applications in menu"
+#: admin/groups/apps/edit_entry.tpl.c:23
+msgid "Application settings"
 msgstr ""
 
-#: config/applications/class_applicationsPluginConfig.inc:53
-msgid "Whether to show web applications in FD main menu"
+#: admin/groups/apps/edit_entry.tpl.c:29
+msgid "Application options"
 msgstr ""
 
-#: config/applications/class_applicationsPluginConfig.inc:56
-msgid "None"
+#: admin/groups/apps/app_list.tpl.c:5
+msgid "Copy menu"
+msgstr ""
+
+#: admin/groups/apps/app_list.tpl.c:8
+msgid "Paste menu from"
+msgstr ""
+
+#: admin/groups/apps/app_list.tpl.c:11
+msgid "Delete menu"
+msgstr ""
+
+#: admin/groups/apps/app_list.tpl.c:17 admin/groups/apps/app_list.tpl.c:20
+msgid "Folder"
+msgstr ""
+
+#: admin/groups/apps/app_list.tpl.c:23 admin/groups/apps/app_list.tpl.c:35
+#: admin/groups/apps/app_list.tpl.c:47
+msgid "Move up"
+msgstr ""
+
+#: admin/groups/apps/app_list.tpl.c:26 admin/groups/apps/app_list.tpl.c:38
+#: admin/groups/apps/app_list.tpl.c:50
+msgid "Move down"
+msgstr ""
+
+#: admin/groups/apps/app_list.tpl.c:32 admin/groups/apps/app_list.tpl.c:56
+msgid "Edit"
+msgstr ""
+
+#: admin/groups/apps/app_list.tpl.c:44
+msgid "Entry"
 msgstr ""
 
-#: config/applications/class_applicationsPluginConfig.inc:56
-msgid "Only allowed"
+#: admin/groups/apps/app_list.tpl.c:59
+msgid "add to"
 msgstr ""
 
-#: config/applications/class_applicationsPluginConfig.inc:56
-msgid "All"
-msgstr "Ø§Ù„ÙƒÙ„"
+#: admin/groups/apps/app_list.tpl.c:62
+msgid "Add selected category to this folder.."
+msgstr ""
+
+#: admin/groups/apps/app_list.tpl.c:65
+msgid "Separator"
+msgstr ""
+
+#: admin/groups/apps/app_list.tpl.c:68
+msgid "Add a separator to this folder."
+msgstr ""
+
+#: admin/groups/apps/app_list.tpl.c:71
+msgid "Add selected applications to this folder."
+msgstr ""
+
+#: admin/mimetypes/generic.tpl.c:8
+msgid "Please enter a name for the mime type here"
+msgstr ""
+
+#: admin/mimetypes/generic.tpl.c:14
+msgid "Categorize this mime type"
+msgstr ""
+
+#: admin/mimetypes/generic.tpl.c:20
+msgid "Please specify a description"
+msgstr ""
+
+#: admin/mimetypes/generic.tpl.c:26
+msgid "Choose subtree to place application in"
+msgstr ""
+
+#: admin/mimetypes/generic.tpl.c:29
+msgid "Select a base"
+msgstr ""
+
+#: admin/mimetypes/generic.tpl.c:35 admin/mimetypes/generic.tpl.c:38
+msgid "Mime icon"
+msgstr ""
+
+#: admin/mimetypes/generic.tpl.c:41
+msgid "Update"
+msgstr ""
+
+#: admin/mimetypes/generic.tpl.c:44
+msgid "Update mime type icon"
+msgstr ""
+
+#: admin/mimetypes/generic.tpl.c:47 admin/mimetypes/generic.tpl.c:50
+msgid "Left click"
+msgstr ""
+
+#: admin/mimetypes/generic.tpl.c:56
+msgid "Please specify a new file pattern"
+msgstr ""
+
+#: admin/mimetypes/generic.tpl.c:59
+msgid "Add a new file pattern"
+msgstr ""
+
+#: admin/mimetypes/generic.tpl.c:65 admin/mimetypes/generic.tpl.c:89
+msgid "Enter an application name here"
+msgstr ""
+
+#: admin/mimetypes/generic.tpl.c:68 admin/mimetypes/generic.tpl.c:92
+msgid "Add application"
+msgstr ""
+
+#: admin/mimetypes/generic.tpl.c:71 admin/mimetypes/generic.tpl.c:74
+msgid "Embedding"
+msgstr ""
+
+#: admin/mimetypes/generic.tpl.c:77
+msgid "Show file in embedded viewer"
+msgstr ""
+
+#: admin/mimetypes/generic.tpl.c:80
+msgid "Show file in external viewer"
+msgstr ""
+
+#: admin/mimetypes/generic.tpl.c:83
+msgid "Ask whether to save to local disk"
+msgstr ""
diff --git a/applications/locale/ca/fusiondirectory.po b/applications/locale/ca/fusiondirectory.po
index 87c43d6e9ed23018752ae1427d6dd84e1f59a8d1..94f6854d6695baf24453a7c3a4898e83b43fde49 100644
--- a/applications/locale/ca/fusiondirectory.po
+++ b/applications/locale/ca/fusiondirectory.po
@@ -5,219 +5,497 @@
 # Translators:
 msgid ""
 msgstr ""
-"Project-Id-Version: FusionDirectory-108\n"
+"Project-Id-Version: FusionDirectory-109\n"
 "Report-Msgid-Bugs-To: documentation@lists.fusiondirectory.org\n"
-"POT-Creation-Date: 2015-03-19 21:45+0100\n"
-"PO-Revision-Date: 2015-02-25 16:03+0000\n"
-"Last-Translator: fusiondirectory <contact@fusiondirectory.org>\n"
-"Language-Team: Catalan (http://www.transifex.com/projects/p/FusionDirectory-108/language/ca/)\n"
+"POT-Creation-Date: 2014-08-28 12:26+0200\n"
+"PO-Revision-Date: 2014-08-28 10:28+0000\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: Catalan (http://www.transifex.com/projects/p/FusionDirectory-109/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/groups/apps/class_groupApplication.inc:410
+#: admin/groups/apps/class_groupApplication.inc:414
+msgid "Menu"
+msgstr ""
+
+#: admin/groups/apps/class_groupApplication.inc:482
+msgid "Back"
+msgstr "Enrere"
+
+#: admin/groups/apps/class_groupApplication.inc:493
+msgid "back"
+msgstr ""
+
+#: admin/groups/apps/class_groupApplication.inc:501
+msgid "department"
+msgstr ""
+
+#: admin/groups/apps/class_groupApplication.inc:524
+msgid "application"
+msgstr ""
+
+#: admin/groups/apps/class_groupApplication.inc:701
+#: admin/groups/apps/class_groupApplication.inc:1396
+#: admin/groups/apps/class_groupApplication.inc:1409
+#: admin/groups/apps/class_groupApplication.inc:1422
+#: admin/mimetypes/class_mimetypeGeneric.inc:481
+#: admin/mimetypes/class_mimetypeGeneric.inc:493
+#: admin/mimetypes/class_mimetypeGeneric.inc:508
+#: admin/applications/class_applicationParameters.inc:177
+#: admin/applications/class_applicationParameters.inc:242
+#: admin/applications/class_applicationGeneric.inc:290
+msgid "LDAP error"
+msgstr "Error d'LDAP"
+
+#: admin/groups/apps/class_groupApplication.inc:1208
+msgid "Not available in release."
+msgstr ""
+
+#: admin/groups/apps/class_groupApplication.inc:1459
 #: 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
+#: admin/mimetypes/generic.tpl.c:62 admin/mimetypes/generic.tpl.c:86
 msgid "Applications"
 msgstr ""
 
+#: admin/groups/apps/class_groupApplication.inc:1460
+msgid "Group applications"
+msgstr ""
+
+#: admin/groups/apps/class_groupApplication.inc:1466
+#: admin/mimetypes/class_mimetypeGeneric.inc:689
+#: admin/applications/class_applicationGeneric.inc:73
+msgid "Application"
+msgstr ""
+
+#: admin/groups/apps/class_groupApplication.inc:1467
+#: admin/groups/apps/app_list.tpl.c:2 admin/groups/apps/app_list.tpl.c:14
+msgid "Release"
+msgstr ""
+
+#: admin/groups/apps/class_groupApplication.inc:1468
+msgid "Application parameter"
+msgstr ""
+
+#: admin/groups/apps/class_groupApplication.inc:1469
+#: admin/applications/class_applicationGeneric.inc:135
+#: admin/groups/apps/edit_entry.tpl.c:32
+msgid "Place icon on members desktop"
+msgstr ""
+
+#: admin/groups/apps/class_groupApplication.inc:1470
+#: admin/applications/class_applicationGeneric.inc:145
+#: admin/groups/apps/edit_entry.tpl.c:38
+msgid "Place entry in members launch bar"
+msgstr ""
+
+#: admin/groups/apps/class_groupApplication.inc:1471
+#: admin/applications/class_applicationGeneric.inc:140
+#: admin/groups/apps/edit_entry.tpl.c:35
+msgid "Place entry in members startmenu"
+msgstr ""
+
+#: admin/mimetypes/class_mimetypeManagement.inc:28
+#: admin/mimetypes/class_mimetypeGeneric.inc:674
+msgid "Mime types"
+msgstr ""
+
+#: admin/mimetypes/class_mimetypeManagement.inc:29
+msgid "Mime type management"
+msgstr ""
+
+#: admin/mimetypes/class_mimetypeGeneric.inc:519
+#: admin/mimetypes/class_mimetypeGeneric.inc:685
+#: admin/applications/class_applicationParameters.inc:208
+#: admin/applications/class_applicationParameters.inc:212
+#: admin/groups/apps/edit_entry.tpl.c:26
+msgid "Name"
+msgstr "Nom"
+
+#: admin/mimetypes/class_mimetypeGeneric.inc:522
+msgid "File pattern"
+msgstr ""
+
+#: admin/mimetypes/class_mimetypeGeneric.inc:671
+#: admin/applications/class_applicationGeneric.inc:69
+#: admin/mimetypes/generic.tpl.c:2
+msgid "Generic"
+msgstr "GenÃ¨ric"
+
+#: admin/mimetypes/class_mimetypeGeneric.inc:672
+msgid "Mime type generic"
+msgstr ""
+
+#: admin/mimetypes/class_mimetypeGeneric.inc:678
+#: admin/mimetypes/generic.tpl.c:5
+msgid "Mime type"
+msgstr ""
+
+#: admin/mimetypes/class_mimetypeGeneric.inc:686
+#: admin/mimetypes/generic.tpl.c:11
+msgid "Mime group"
+msgstr ""
+
+#: admin/mimetypes/class_mimetypeGeneric.inc:687
+#: admin/applications/class_applicationGeneric.inc:105
+#: admin/mimetypes/generic.tpl.c:17
+msgid "Description"
+msgstr ""
+
+#: admin/mimetypes/class_mimetypeGeneric.inc:688
+#: admin/mimetypes/generic.tpl.c:23
+msgid "Base"
+msgstr "Base"
+
+#: admin/mimetypes/class_mimetypeGeneric.inc:690
+msgid "Left click action"
+msgstr ""
+
+#: admin/mimetypes/class_mimetypeGeneric.inc:691
+#: admin/applications/class_applicationGeneric.inc:112
+#: admin/mimetypes/generic.tpl.c:32
+msgid "Icon"
+msgstr ""
+
+#: admin/mimetypes/class_mimetypeGeneric.inc:692
+#: admin/mimetypes/generic.tpl.c:53
+msgid "File patterns"
+msgstr ""
+
+#: admin/mimetypes/class_mimetypeGeneric.inc:693
+msgid "Embedded applications"
+msgstr ""
+
 #: admin/applications/class_applicationManagement.inc:29
 msgid "Application management"
 msgstr ""
 
-#: admin/applications/class_applicationManagement.inc:100
-msgid "Web applications"
+#: admin/applications/class_applicationParameters.inc:71
+msgid "Remove options"
 msgstr ""
 
-#: admin/applications/class_applicationGeneric.inc:31
-#: admin/applications/class_applicationGeneric.inc:34
-#: admin/applications/class_applicationGeneric.inc:48
-#: admin/applications/class_webApplication.inc:47
-msgid "Application"
+#: admin/applications/class_applicationParameters.inc:71
+#: admin/applications/class_applicationParameters.inc:73
+msgid "parameter"
 msgstr ""
 
-#: admin/applications/class_applicationGeneric.inc:32
-msgid "Application information"
+#: admin/applications/class_applicationParameters.inc:73
+msgid "Create options"
 msgstr ""
 
-#: admin/applications/class_applicationGeneric.inc:52
-msgid "Application name"
+#: admin/applications/class_applicationParameters.inc:115
+msgid "Variable"
 msgstr ""
 
-#: admin/applications/class_applicationGeneric.inc:52
-msgid "The name of this application"
+#: admin/applications/class_applicationParameters.inc:115
+msgid "Default value"
 msgstr ""
 
-#: admin/applications/class_applicationGeneric.inc:56
-#: admin/applications/class_webApplication.inc:55
-msgid "Description"
+#: admin/applications/class_applicationParameters.inc:141
+#: admin/groups/apps/app_list.tpl.c:29 admin/groups/apps/app_list.tpl.c:41
+#: admin/groups/apps/app_list.tpl.c:53
+msgid "Remove"
 msgstr ""
 
-#: admin/applications/class_applicationGeneric.inc:56
-#: admin/applications/class_webApplication.inc:55
-msgid "A short description of this application"
+#: admin/applications/class_applicationParameters.inc:147
+msgid "Add option"
 msgstr ""
 
-#: admin/applications/class_applicationGeneric.inc:60
-msgid "Execute"
+#: admin/applications/class_applicationParameters.inc:265
+msgid "Parameter"
 msgstr ""
 
-#: admin/applications/class_applicationGeneric.inc:60
-msgid "The application to be executed"
+#: admin/applications/class_applicationParameters.inc:266
+msgid "Parameter configuration"
+msgstr ""
+
+#: admin/applications/class_applicationParameters.inc:271
+msgid "Application parameter settings"
+msgstr ""
+
+#: admin/applications/class_applicationGeneric.inc:70
+msgid "Application generic"
+msgstr ""
+
+#: admin/applications/class_applicationGeneric.inc:90
+msgid "Properties"
+msgstr ""
+
+#: admin/applications/class_applicationGeneric.inc:93
+msgid "Application name"
+msgstr ""
+
+#: admin/applications/class_applicationGeneric.inc:93
+msgid "The name of this application"
 msgstr ""
 
-#: admin/applications/class_applicationGeneric.inc:64
+#: admin/applications/class_applicationGeneric.inc:97
 msgid "Display name"
 msgstr ""
 
-#: admin/applications/class_applicationGeneric.inc:64
+#: admin/applications/class_applicationGeneric.inc:97
 msgid "The displayed name for this application"
 msgstr ""
 
-#: admin/applications/class_applicationGeneric.inc:70
-#: admin/applications/class_webApplication.inc:69
-msgid "Icon"
+#: admin/applications/class_applicationGeneric.inc:101
+msgid "Execute"
 msgstr ""
 
-#: admin/applications/class_applicationGeneric.inc:73
-#: admin/applications/class_webApplication.inc:72
+#: admin/applications/class_applicationGeneric.inc:101
+msgid "The application to be executed"
+msgstr ""
+
+#: admin/applications/class_applicationGeneric.inc:105
+msgid "A short description of this application"
+msgstr ""
+
+#: admin/applications/class_applicationGeneric.inc:115
 msgid "The icon for this application"
 msgstr ""
 
-#: admin/applications/class_applicationGeneric.inc:80
+#: admin/applications/class_applicationGeneric.inc:122
 msgid "Options"
 msgstr ""
 
-#: admin/applications/class_applicationGeneric.inc:83
+#: admin/applications/class_applicationGeneric.inc:125
 msgid "Only executable for member"
 msgstr ""
 
-#: admin/applications/class_applicationGeneric.inc:83
+#: admin/applications/class_applicationGeneric.inc:125
 msgid "Only executable by the memebers of the group"
 msgstr ""
 
-#: admin/applications/class_applicationGeneric.inc:88
+#: admin/applications/class_applicationGeneric.inc:130
 msgid "Replace user configuration on startup"
 msgstr ""
 
-#: admin/applications/class_applicationGeneric.inc:88
+#: admin/applications/class_applicationGeneric.inc:130
 msgid "Replace the user configuration on startup"
 msgstr ""
 
-#: admin/applications/class_applicationGeneric.inc:93
-msgid "Place icon on members desktop"
+#: admin/applications/class_applicationGeneric.inc:135
+msgid "Put an icon on the user desktop"
 msgstr ""
 
-#: admin/applications/class_applicationGeneric.inc:93
-msgid "Put an icon on the user desktop"
+#: admin/applications/class_applicationGeneric.inc:140
+#: admin/applications/class_applicationGeneric.inc:145
+msgid "Put an entry in the startup menu"
 msgstr ""
 
-#: admin/applications/class_applicationGeneric.inc:98
-msgid "Place entry in members startmenu"
+#: admin/applications/class_applicationGeneric.inc:156
+msgid "Script"
 msgstr ""
 
-#: admin/applications/class_applicationGeneric.inc:98
-#: admin/applications/class_applicationGeneric.inc:103
-msgid "Put an entry in the startup menu"
+#: admin/applications/class_applicationGeneric.inc:159
+msgid "Script to run at logon"
 msgstr ""
 
-#: admin/applications/class_applicationGeneric.inc:103
-msgid "Place entry in members launch bar"
+#: admin/applications/class_applicationGeneric.inc:165
+msgid "Log off script"
 msgstr ""
 
-#: admin/applications/class_webApplication.inc:30
-#: admin/applications/class_webApplication.inc:33
-msgid "Web application"
+#: admin/applications/class_applicationGeneric.inc:168
+msgid "Script to run at logoff"
 msgstr ""
 
-#: admin/applications/class_webApplication.inc:31
-msgid "Web applicationts names, icons and links"
+#: admin/applications/class_applicationGeneric.inc:227
+msgid "no example"
 msgstr ""
 
-#: admin/applications/class_webApplication.inc:51
-msgid "Name"
-msgstr "Nom"
+#: admin/applications/class_applicationGeneric.inc:276
+msgid "Error"
+msgstr "Error"
 
-#: admin/applications/class_webApplication.inc:51
-msgid "Name or id for application"
+#: admin/applications/class_applicationGeneric.inc:276
+#, php-format
+msgid "Cannot remove application - it is still in use by these objects: %s"
 msgstr ""
 
-#: admin/applications/class_webApplication.inc:59
-msgid "URL"
+#: config/desktop-management/class_desktopPluginConfig.inc:28
+msgid "Desktop management"
 msgstr ""
 
-#: admin/applications/class_webApplication.inc:59
-msgid "Link to this application"
+#: config/desktop-management/class_desktopPluginConfig.inc:29
+msgid "Desktop management plugin configuration"
 msgstr ""
 
-#: admin/applications/class_webApplication.inc:63
-msgid "Display Name"
+#: config/desktop-management/class_desktopPluginConfig.inc:40
+msgid "LDAP tree"
 msgstr ""
 
-#: admin/applications/class_webApplication.inc:63
-msgid "Displayed name for links to this application"
+#: config/desktop-management/class_desktopPluginConfig.inc:43
+msgid "Mimetype RDN"
 msgstr ""
 
-#: admin/applications/class_webApplication.inc:77
-msgid "Icon location"
+#: config/desktop-management/class_desktopPluginConfig.inc:43
+msgid "Branch in which mime types will be stored"
 msgstr ""
 
-#: admin/applications/class_webApplication.inc:77
-msgid "Usual path to this application icon"
+#: config/desktop-management/class_desktopPluginConfig.inc:48
+msgid "Application RDN"
 msgstr ""
 
-#: admin/roles/class_applicationRights.inc:31
-msgid "Applications allowed for this role"
+#: config/desktop-management/class_desktopPluginConfig.inc:48
+msgid "Branch in which applications will be stored"
 msgstr ""
 
-#: admin/roles/class_applicationRights.inc:45
-msgid "Application list"
+#: admin/groups/apps/edit_entry.tpl.c:2
+msgid "Folder image"
 msgstr ""
 
-#: admin/roles/class_applicationRights.inc:49
-msgid "The applications users with this role are allowed to launch"
+#: admin/groups/apps/edit_entry.tpl.c:5
+msgid "Could not load image."
 msgstr ""
 
-#: config/applications/class_applicationsPluginConfig.inc:29
-msgid "Applications plugin configuration"
+#: admin/groups/apps/edit_entry.tpl.c:8
+msgid "None"
 msgstr ""
 
-#: config/applications/class_applicationsPluginConfig.inc:43
-msgid "Application RDN"
+#: admin/groups/apps/edit_entry.tpl.c:11
+msgid "Upload image"
 msgstr ""
 
-#: config/applications/class_applicationsPluginConfig.inc:43
-msgid "Branch in which applications will be stored"
+#: admin/groups/apps/edit_entry.tpl.c:14
+msgid "Upload"
 msgstr ""
 
-#: config/applications/class_applicationsPluginConfig.inc:48
-msgid "Web applications RDN"
+#: admin/groups/apps/edit_entry.tpl.c:17
+msgid "Reset image"
 msgstr ""
 
-#: config/applications/class_applicationsPluginConfig.inc:48
-msgid "Branch in which web applications will be stored"
+#: admin/groups/apps/edit_entry.tpl.c:20
+msgid "Reset"
 msgstr ""
 
-#: config/applications/class_applicationsPluginConfig.inc:53
-msgid "Show web applications in menu"
+#: admin/groups/apps/edit_entry.tpl.c:23
+msgid "Application settings"
 msgstr ""
 
-#: config/applications/class_applicationsPluginConfig.inc:53
-msgid "Whether to show web applications in FD main menu"
+#: admin/groups/apps/edit_entry.tpl.c:29
+msgid "Application options"
 msgstr ""
 
-#: config/applications/class_applicationsPluginConfig.inc:56
-msgid "None"
+#: admin/groups/apps/app_list.tpl.c:5
+msgid "Copy menu"
+msgstr ""
+
+#: admin/groups/apps/app_list.tpl.c:8
+msgid "Paste menu from"
+msgstr ""
+
+#: admin/groups/apps/app_list.tpl.c:11
+msgid "Delete menu"
+msgstr ""
+
+#: admin/groups/apps/app_list.tpl.c:17 admin/groups/apps/app_list.tpl.c:20
+msgid "Folder"
+msgstr ""
+
+#: admin/groups/apps/app_list.tpl.c:23 admin/groups/apps/app_list.tpl.c:35
+#: admin/groups/apps/app_list.tpl.c:47
+msgid "Move up"
+msgstr ""
+
+#: admin/groups/apps/app_list.tpl.c:26 admin/groups/apps/app_list.tpl.c:38
+#: admin/groups/apps/app_list.tpl.c:50
+msgid "Move down"
+msgstr ""
+
+#: admin/groups/apps/app_list.tpl.c:32 admin/groups/apps/app_list.tpl.c:56
+msgid "Edit"
+msgstr ""
+
+#: admin/groups/apps/app_list.tpl.c:44
+msgid "Entry"
+msgstr ""
+
+#: admin/groups/apps/app_list.tpl.c:59
+msgid "add to"
+msgstr ""
+
+#: admin/groups/apps/app_list.tpl.c:62
+msgid "Add selected category to this folder.."
+msgstr ""
+
+#: admin/groups/apps/app_list.tpl.c:65
+msgid "Separator"
+msgstr ""
+
+#: admin/groups/apps/app_list.tpl.c:68
+msgid "Add a separator to this folder."
+msgstr ""
+
+#: admin/groups/apps/app_list.tpl.c:71
+msgid "Add selected applications to this folder."
+msgstr ""
+
+#: admin/mimetypes/generic.tpl.c:8
+msgid "Please enter a name for the mime type here"
+msgstr ""
+
+#: admin/mimetypes/generic.tpl.c:14
+msgid "Categorize this mime type"
+msgstr ""
+
+#: admin/mimetypes/generic.tpl.c:20
+msgid "Please specify a description"
+msgstr ""
+
+#: admin/mimetypes/generic.tpl.c:26
+msgid "Choose subtree to place application in"
+msgstr ""
+
+#: admin/mimetypes/generic.tpl.c:29
+msgid "Select a base"
+msgstr ""
+
+#: admin/mimetypes/generic.tpl.c:35 admin/mimetypes/generic.tpl.c:38
+msgid "Mime icon"
+msgstr ""
+
+#: admin/mimetypes/generic.tpl.c:41
+msgid "Update"
+msgstr ""
+
+#: admin/mimetypes/generic.tpl.c:44
+msgid "Update mime type icon"
+msgstr ""
+
+#: admin/mimetypes/generic.tpl.c:47 admin/mimetypes/generic.tpl.c:50
+msgid "Left click"
+msgstr ""
+
+#: admin/mimetypes/generic.tpl.c:56
+msgid "Please specify a new file pattern"
+msgstr ""
+
+#: admin/mimetypes/generic.tpl.c:59
+msgid "Add a new file pattern"
+msgstr ""
+
+#: admin/mimetypes/generic.tpl.c:65 admin/mimetypes/generic.tpl.c:89
+msgid "Enter an application name here"
+msgstr ""
+
+#: admin/mimetypes/generic.tpl.c:68 admin/mimetypes/generic.tpl.c:92
+msgid "Add application"
+msgstr ""
+
+#: admin/mimetypes/generic.tpl.c:71 admin/mimetypes/generic.tpl.c:74
+msgid "Embedding"
+msgstr ""
+
+#: admin/mimetypes/generic.tpl.c:77
+msgid "Show file in embedded viewer"
 msgstr ""
 
-#: config/applications/class_applicationsPluginConfig.inc:56
-msgid "Only allowed"
+#: admin/mimetypes/generic.tpl.c:80
+msgid "Show file in external viewer"
 msgstr ""
 
-#: config/applications/class_applicationsPluginConfig.inc:56
-msgid "All"
+#: admin/mimetypes/generic.tpl.c:83
+msgid "Ask whether to save to local disk"
 msgstr ""
diff --git a/applications/locale/cs_CZ/fusiondirectory.po b/applications/locale/cs_CZ/fusiondirectory.po
index ddee7e9829238ded1744c5b8bb533def94aff6da..52c23d4fc2844225aaa8eb1accf41593a520dc39 100644
--- a/applications/locale/cs_CZ/fusiondirectory.po
+++ b/applications/locale/cs_CZ/fusiondirectory.po
@@ -3,221 +3,500 @@
 # This file is distributed under the same license as the PACKAGE package.
 # 
 # Translators:
+# Pavel Borecki <pavel.borecki@gmail.com>, 2014-2015
 msgid ""
 msgstr ""
-"Project-Id-Version: FusionDirectory-108\n"
+"Project-Id-Version: FusionDirectory-109\n"
 "Report-Msgid-Bugs-To: documentation@lists.fusiondirectory.org\n"
-"POT-Creation-Date: 2015-03-19 21:45+0100\n"
-"PO-Revision-Date: 2015-02-25 16:12+0000\n"
-"Last-Translator: fusiondirectory <contact@fusiondirectory.org>\n"
-"Language-Team: Czech (Czech Republic) (http://www.transifex.com/projects/p/FusionDirectory-108/language/cs_CZ/)\n"
+"POT-Creation-Date: 2014-08-28 12:26+0200\n"
+"PO-Revision-Date: 2015-04-07 19:21+0000\n"
+"Last-Translator: Pavel Borecki <pavel.borecki@gmail.com>\n"
+"Language-Team: Czech (Czech Republic) (http://www.transifex.com/projects/p/FusionDirectory-109/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/groups/apps/class_groupApplication.inc:410
+#: admin/groups/apps/class_groupApplication.inc:414
+msgid "Menu"
+msgstr "NabÃdka"
+
+#: admin/groups/apps/class_groupApplication.inc:482
+msgid "Back"
+msgstr "ZpÄ›t"
+
+#: admin/groups/apps/class_groupApplication.inc:493
+msgid "back"
+msgstr "ZpÄ›t"
+
+#: admin/groups/apps/class_groupApplication.inc:501
+msgid "department"
+msgstr "oddÄ›lenÃ"
+
+#: admin/groups/apps/class_groupApplication.inc:524
+msgid "application"
+msgstr "Aplikace"
+
+#: admin/groups/apps/class_groupApplication.inc:701
+#: admin/groups/apps/class_groupApplication.inc:1396
+#: admin/groups/apps/class_groupApplication.inc:1409
+#: admin/groups/apps/class_groupApplication.inc:1422
+#: admin/mimetypes/class_mimetypeGeneric.inc:481
+#: admin/mimetypes/class_mimetypeGeneric.inc:493
+#: admin/mimetypes/class_mimetypeGeneric.inc:508
+#: admin/applications/class_applicationParameters.inc:177
+#: admin/applications/class_applicationParameters.inc:242
+#: admin/applications/class_applicationGeneric.inc:290
+msgid "LDAP error"
+msgstr "Chyba LDAP"
+
+#: admin/groups/apps/class_groupApplication.inc:1208
+msgid "Not available in release."
+msgstr "NenÃ k dispozici v tomto vydÃ¡nÃ."
+
+#: admin/groups/apps/class_groupApplication.inc:1459
 #: 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
+#: admin/mimetypes/generic.tpl.c:62 admin/mimetypes/generic.tpl.c:86
 msgid "Applications"
-msgstr "aplikace"
+msgstr "Aplikace"
+
+#: admin/groups/apps/class_groupApplication.inc:1460
+msgid "Group applications"
+msgstr "SkupinovÃ© aplikace"
+
+#: admin/groups/apps/class_groupApplication.inc:1466
+#: admin/mimetypes/class_mimetypeGeneric.inc:689
+#: admin/applications/class_applicationGeneric.inc:73
+msgid "Application"
+msgstr "Aplikace"
+
+#: admin/groups/apps/class_groupApplication.inc:1467
+#: admin/groups/apps/app_list.tpl.c:2 admin/groups/apps/app_list.tpl.c:14
+msgid "Release"
+msgstr "VydÃ¡nÃ"
+
+#: admin/groups/apps/class_groupApplication.inc:1468
+msgid "Application parameter"
+msgstr "Parametr aplikace"
+
+#: admin/groups/apps/class_groupApplication.inc:1469
+#: admin/applications/class_applicationGeneric.inc:135
+#: admin/groups/apps/edit_entry.tpl.c:32
+msgid "Place icon on members desktop"
+msgstr "ÄŒlenÅ¯m umÃstit ikonu na plochu"
+
+#: admin/groups/apps/class_groupApplication.inc:1470
+#: admin/applications/class_applicationGeneric.inc:145
+#: admin/groups/apps/edit_entry.tpl.c:38
+msgid "Place entry in members launch bar"
+msgstr "ÄŒlenÅ¯m poloÅ¾ku umÃstit na panel snadnÃ©ho spuÅ¡tÄ›nÃ"
+
+#: admin/groups/apps/class_groupApplication.inc:1471
+#: admin/applications/class_applicationGeneric.inc:140
+#: admin/groups/apps/edit_entry.tpl.c:35
+msgid "Place entry in members startmenu"
+msgstr "ÄlenÅ¯m umisÅ¥ovat poloÅ¾ku do nabÃdky start"
+
+#: admin/mimetypes/class_mimetypeManagement.inc:28
+#: admin/mimetypes/class_mimetypeGeneric.inc:674
+msgid "Mime types"
+msgstr "typy MIME"
+
+#: admin/mimetypes/class_mimetypeManagement.inc:29
+msgid "Mime type management"
+msgstr "SprÃ¡va MIME typÅ¯"
+
+#: admin/mimetypes/class_mimetypeGeneric.inc:519
+#: admin/mimetypes/class_mimetypeGeneric.inc:685
+#: admin/applications/class_applicationParameters.inc:208
+#: admin/applications/class_applicationParameters.inc:212
+#: admin/groups/apps/edit_entry.tpl.c:26
+msgid "Name"
+msgstr "NÃ¡zev"
+
+#: admin/mimetypes/class_mimetypeGeneric.inc:522
+msgid "File pattern"
+msgstr "Vzorec souboru"
+
+#: admin/mimetypes/class_mimetypeGeneric.inc:671
+#: admin/applications/class_applicationGeneric.inc:69
+#: admin/mimetypes/generic.tpl.c:2
+msgid "Generic"
+msgstr "ObecnÃ©"
+
+#: admin/mimetypes/class_mimetypeGeneric.inc:672
+msgid "Mime type generic"
+msgstr "Typ MIME â€“ obecnÃ©"
+
+#: admin/mimetypes/class_mimetypeGeneric.inc:678
+#: admin/mimetypes/generic.tpl.c:5
+msgid "Mime type"
+msgstr "typ MIME"
+
+#: admin/mimetypes/class_mimetypeGeneric.inc:686
+#: admin/mimetypes/generic.tpl.c:11
+msgid "Mime group"
+msgstr "skupina MIME"
+
+#: admin/mimetypes/class_mimetypeGeneric.inc:687
+#: admin/applications/class_applicationGeneric.inc:105
+#: admin/mimetypes/generic.tpl.c:17
+msgid "Description"
+msgstr "Popis"
+
+#: admin/mimetypes/class_mimetypeGeneric.inc:688
+#: admin/mimetypes/generic.tpl.c:23
+msgid "Base"
+msgstr "ZÃ¡klad"
+
+#: admin/mimetypes/class_mimetypeGeneric.inc:690
+msgid "Left click action"
+msgstr "Akce spuÅ¡tÄ›nÃ¡ kliknutÃm levÃ½m tlaÄÃtkem"
+
+#: admin/mimetypes/class_mimetypeGeneric.inc:691
+#: admin/applications/class_applicationGeneric.inc:112
+#: admin/mimetypes/generic.tpl.c:32
+msgid "Icon"
+msgstr "ikona"
+
+#: admin/mimetypes/class_mimetypeGeneric.inc:692
+#: admin/mimetypes/generic.tpl.c:53
+msgid "File patterns"
+msgstr "Vzory souborÅ¯"
+
+#: admin/mimetypes/class_mimetypeGeneric.inc:693
+msgid "Embedded applications"
+msgstr "VestavÄ›nÃ© aplikace"
 
 #: admin/applications/class_applicationManagement.inc:29
 msgid "Application management"
-msgstr "sprÃ¡va aplikacÃ"
+msgstr "SprÃ¡va aplikacÃ"
 
-#: admin/applications/class_applicationManagement.inc:100
-msgid "Web applications"
-msgstr ""
+#: admin/applications/class_applicationParameters.inc:71
+msgid "Remove options"
+msgstr "Odebrat pÅ™edvolby"
 
-#: admin/applications/class_applicationGeneric.inc:31
-#: admin/applications/class_applicationGeneric.inc:34
-#: admin/applications/class_applicationGeneric.inc:48
-#: admin/applications/class_webApplication.inc:47
-msgid "Application"
-msgstr "aplikace"
+#: admin/applications/class_applicationParameters.inc:71
+#: admin/applications/class_applicationParameters.inc:73
+msgid "parameter"
+msgstr "parametr"
 
-#: admin/applications/class_applicationGeneric.inc:32
-msgid "Application information"
-msgstr ""
+#: admin/applications/class_applicationParameters.inc:73
+msgid "Create options"
+msgstr "VytvoÅ™it pÅ™edvolby"
+
+#: admin/applications/class_applicationParameters.inc:115
+msgid "Variable"
+msgstr "PromÄ›nnÃ¡"
 
-#: admin/applications/class_applicationGeneric.inc:52
+#: admin/applications/class_applicationParameters.inc:115
+msgid "Default value"
+msgstr "VÃ½chozÃ hodnota"
+
+#: admin/applications/class_applicationParameters.inc:141
+#: admin/groups/apps/app_list.tpl.c:29 admin/groups/apps/app_list.tpl.c:41
+#: admin/groups/apps/app_list.tpl.c:53
+msgid "Remove"
+msgstr "Odstranit"
+
+#: admin/applications/class_applicationParameters.inc:147
+msgid "Add option"
+msgstr "PÅ™idat pÅ™edvolbu"
+
+#: admin/applications/class_applicationParameters.inc:265
+msgid "Parameter"
+msgstr "Parametr"
+
+#: admin/applications/class_applicationParameters.inc:266
+msgid "Parameter configuration"
+msgstr "NastavenÃ parametru"
+
+#: admin/applications/class_applicationParameters.inc:271
+msgid "Application parameter settings"
+msgstr "NastavenÃ parametru aplikace"
+
+#: admin/applications/class_applicationGeneric.inc:70
+msgid "Application generic"
+msgstr "Aplikace â€“ obecnÃ©"
+
+#: admin/applications/class_applicationGeneric.inc:90
+msgid "Properties"
+msgstr "Vlastnosti"
+
+#: admin/applications/class_applicationGeneric.inc:93
 msgid "Application name"
-msgstr "nÃ¡zev aplikace"
+msgstr "NÃ¡zev aplikace"
 
-#: admin/applications/class_applicationGeneric.inc:52
+#: admin/applications/class_applicationGeneric.inc:93
 msgid "The name of this application"
 msgstr "NÃ¡zev tÃ©to aplikace"
 
-#: admin/applications/class_applicationGeneric.inc:56
-#: admin/applications/class_webApplication.inc:55
-msgid "Description"
-msgstr "popis"
+#: admin/applications/class_applicationGeneric.inc:97
+msgid "Display name"
+msgstr "ZobrazovanÃ© jmÃ©no"
 
-#: admin/applications/class_applicationGeneric.inc:56
-#: admin/applications/class_webApplication.inc:55
-msgid "A short description of this application"
-msgstr ""
+#: admin/applications/class_applicationGeneric.inc:97
+msgid "The displayed name for this application"
+msgstr "ZobrazovanÃ½ nÃ¡zev tÃ©to aplikace"
 
-#: admin/applications/class_applicationGeneric.inc:60
+#: admin/applications/class_applicationGeneric.inc:101
 msgid "Execute"
-msgstr "spustit"
+msgstr "Spustit"
 
-#: admin/applications/class_applicationGeneric.inc:60
+#: admin/applications/class_applicationGeneric.inc:101
 msgid "The application to be executed"
-msgstr ""
-
-#: admin/applications/class_applicationGeneric.inc:64
-msgid "Display name"
-msgstr "zobrazovanÃ© jmÃ©no"
-
-#: admin/applications/class_applicationGeneric.inc:64
-msgid "The displayed name for this application"
-msgstr ""
+msgstr "Aplikace, kterÃ¡ mÃ¡ bÃ½t spuÅ¡tÄ›na"
 
-#: admin/applications/class_applicationGeneric.inc:70
-#: admin/applications/class_webApplication.inc:69
-msgid "Icon"
-msgstr "ikona"
+#: admin/applications/class_applicationGeneric.inc:105
+msgid "A short description of this application"
+msgstr "StruÄnÃ½ popis tÃ©to aplikace"
 
-#: admin/applications/class_applicationGeneric.inc:73
-#: admin/applications/class_webApplication.inc:72
+#: admin/applications/class_applicationGeneric.inc:115
 msgid "The icon for this application"
-msgstr ""
+msgstr "Ikona pro tuto aplikaci"
 
-#: admin/applications/class_applicationGeneric.inc:80
+#: admin/applications/class_applicationGeneric.inc:122
 msgid "Options"
 msgstr "volby"
 
-#: admin/applications/class_applicationGeneric.inc:83
+#: admin/applications/class_applicationGeneric.inc:125
 msgid "Only executable for member"
 msgstr "SpustitelnÃ© pouze pro Älena"
 
-#: admin/applications/class_applicationGeneric.inc:83
+#: admin/applications/class_applicationGeneric.inc:125
 msgid "Only executable by the memebers of the group"
-msgstr ""
+msgstr "SpustitelnÃ© pouze pro Äleny skupiny"
 
-#: admin/applications/class_applicationGeneric.inc:88
+#: admin/applications/class_applicationGeneric.inc:130
 msgid "Replace user configuration on startup"
-msgstr "nahrazovat konfiguraci uÅ¾ivatele pÅ™i spuÅ¡tÄ›nÃ"
+msgstr "Nahradit nastavenÃ uÅ¾ivatele pÅ™i spuÅ¡tÄ›nÃ"
 
-#: admin/applications/class_applicationGeneric.inc:88
+#: admin/applications/class_applicationGeneric.inc:130
 msgid "Replace the user configuration on startup"
-msgstr "PÅ™i startu nahradit nastavenÃ uÅ¾ivatele"
-
-#: admin/applications/class_applicationGeneric.inc:93
-msgid "Place icon on members desktop"
-msgstr "ÄlenÅ¯m umisÅ¥ovat ikonu na plochu"
+msgstr "PÅ™i spuÅ¡tÄ›nÃ nahradit nastavenÃ uÅ¾ivatele"
 
-#: admin/applications/class_applicationGeneric.inc:93
+#: admin/applications/class_applicationGeneric.inc:135
 msgid "Put an icon on the user desktop"
 msgstr "UmÃstit ikonu na pracovnÃ plochu uÅ¾ivatele"
 
-#: admin/applications/class_applicationGeneric.inc:98
-msgid "Place entry in members startmenu"
-msgstr "ÄlenÅ¯m umisÅ¥ovat poloÅ¾ku do nabÃdky start"
-
-#: admin/applications/class_applicationGeneric.inc:98
-#: admin/applications/class_applicationGeneric.inc:103
+#: admin/applications/class_applicationGeneric.inc:140
+#: admin/applications/class_applicationGeneric.inc:145
 msgid "Put an entry in the startup menu"
-msgstr ""
+msgstr "UmÃstit poloÅ¾ku do nabÃdky po spuÅ¡tÄ›nÃ"
 
-#: admin/applications/class_applicationGeneric.inc:103
-msgid "Place entry in members launch bar"
-msgstr "ÄlenÅ¯m umisÅ¥ovat poloÅ¾ku na panel â€žsnadnÃ© spuÅ¡tÄ›nÃâ€œ"
+#: admin/applications/class_applicationGeneric.inc:156
+msgid "Script"
+msgstr "Skript"
 
-#: admin/applications/class_webApplication.inc:30
-#: admin/applications/class_webApplication.inc:33
-msgid "Web application"
-msgstr ""
+#: admin/applications/class_applicationGeneric.inc:159
+msgid "Script to run at logon"
+msgstr "Skript spouÅ¡tÄ›nÃ½ pÅ™i pÅ™ihlÃ¡Å¡enÃ"
 
-#: admin/applications/class_webApplication.inc:31
-msgid "Web applicationts names, icons and links"
-msgstr ""
+#: admin/applications/class_applicationGeneric.inc:165
+msgid "Log off script"
+msgstr "Skript spouÅ¡tÄ›nÃ½ pÅ™i odhlaÅ¡ovÃ¡nÃ"
 
-#: admin/applications/class_webApplication.inc:51
-msgid "Name"
-msgstr "nÃ¡zev"
+#: admin/applications/class_applicationGeneric.inc:168
+msgid "Script to run at logoff"
+msgstr "Skript spouÅ¡tÄ›nÃ½ pÅ™i odhlaÅ¡ovÃ¡nÃ"
 
-#: admin/applications/class_webApplication.inc:51
-msgid "Name or id for application"
-msgstr ""
+#: admin/applications/class_applicationGeneric.inc:227
+msgid "no example"
+msgstr "Å¾Ã¡dnÃ¡ ukÃ¡zka"
 
-#: admin/applications/class_webApplication.inc:59
-msgid "URL"
-msgstr "URL"
+#: admin/applications/class_applicationGeneric.inc:276
+msgid "Error"
+msgstr "Chyba"
 
-#: admin/applications/class_webApplication.inc:59
-msgid "Link to this application"
-msgstr ""
+#: admin/applications/class_applicationGeneric.inc:276
+#, php-format
+msgid "Cannot remove application - it is still in use by these objects: %s"
+msgstr "Aplikaci nelze odstranit â€“ stÃ¡le je vyuÅ¾ÃvÃ¡na tÄ›mito objekty: %s"
 
-#: admin/applications/class_webApplication.inc:63
-msgid "Display Name"
-msgstr ""
-
-#: admin/applications/class_webApplication.inc:63
-msgid "Displayed name for links to this application"
-msgstr ""
-
-#: admin/applications/class_webApplication.inc:77
-msgid "Icon location"
-msgstr ""
-
-#: admin/applications/class_webApplication.inc:77
-msgid "Usual path to this application icon"
-msgstr ""
+#: config/desktop-management/class_desktopPluginConfig.inc:28
+msgid "Desktop management"
+msgstr "SprÃ¡va desktopu"
 
-#: admin/roles/class_applicationRights.inc:31
-msgid "Applications allowed for this role"
-msgstr ""
+#: config/desktop-management/class_desktopPluginConfig.inc:29
+msgid "Desktop management plugin configuration"
+msgstr "NastavenÃ zÃ¡suvnÃ©ho modulu sprÃ¡va Plochy"
 
-#: admin/roles/class_applicationRights.inc:45
-msgid "Application list"
-msgstr ""
+#: config/desktop-management/class_desktopPluginConfig.inc:40
+msgid "LDAP tree"
+msgstr "Strom LDAP"
 
-#: admin/roles/class_applicationRights.inc:49
-msgid "The applications users with this role are allowed to launch"
-msgstr ""
+#: config/desktop-management/class_desktopPluginConfig.inc:43
+msgid "Mimetype RDN"
+msgstr "RelativnÃ rozliÅ¡enÃ½ nÃ¡zev mimetype"
 
-#: config/applications/class_applicationsPluginConfig.inc:29
-msgid "Applications plugin configuration"
-msgstr ""
+#: config/desktop-management/class_desktopPluginConfig.inc:43
+msgid "Branch in which mime types will be stored"
+msgstr "VÄ›tev, ve kterÃ© budou uloÅ¾eny mime typy"
 
-#: config/applications/class_applicationsPluginConfig.inc:43
+#: config/desktop-management/class_desktopPluginConfig.inc:48
 msgid "Application RDN"
-msgstr ""
+msgstr "RelativnÃ rozliÅ¡enÃ½ nÃ¡zev aplikace"
 
-#: config/applications/class_applicationsPluginConfig.inc:43
+#: config/desktop-management/class_desktopPluginConfig.inc:48
 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 ""
+#: admin/groups/apps/edit_entry.tpl.c:2
+msgid "Folder image"
+msgstr "ObrÃ¡zek sloÅ¾ky"
 
-#: config/applications/class_applicationsPluginConfig.inc:48
-msgid "Branch in which web applications will be stored"
-msgstr ""
+#: admin/groups/apps/edit_entry.tpl.c:5
+msgid "Could not load image."
+msgstr "ObrÃ¡zek nelze nahrÃ¡t."
 
-#: 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
+#: admin/groups/apps/edit_entry.tpl.c:8
 msgid "None"
 msgstr "Å¾Ã¡dnÃ©"
 
-#: config/applications/class_applicationsPluginConfig.inc:56
-msgid "Only allowed"
-msgstr ""
+#: admin/groups/apps/edit_entry.tpl.c:11
+msgid "Upload image"
+msgstr "NahrÃ¡t obrÃ¡zek"
+
+#: admin/groups/apps/edit_entry.tpl.c:14
+msgid "Upload"
+msgstr "NahrÃ¡t"
+
+#: admin/groups/apps/edit_entry.tpl.c:17
+msgid "Reset image"
+msgstr "Znovunastavit obraz"
+
+#: admin/groups/apps/edit_entry.tpl.c:20
+msgid "Reset"
+msgstr "Znovu nastavit"
+
+#: admin/groups/apps/edit_entry.tpl.c:23
+msgid "Application settings"
+msgstr "NastavenÃ aplikace"
+
+#: admin/groups/apps/edit_entry.tpl.c:29
+msgid "Application options"
+msgstr "pÅ™edvolby aplikace"
+
+#: admin/groups/apps/app_list.tpl.c:5
+msgid "Copy menu"
+msgstr "ZkopÃrovat nabÃdku"
+
+#: admin/groups/apps/app_list.tpl.c:8
+msgid "Paste menu from"
+msgstr "VloÅ¾it nabÃdku z"
+
+#: admin/groups/apps/app_list.tpl.c:11
+msgid "Delete menu"
+msgstr "Smazat nabÃdku"
+
+#: admin/groups/apps/app_list.tpl.c:17 admin/groups/apps/app_list.tpl.c:20
+msgid "Folder"
+msgstr "SloÅ¾ka"
+
+#: admin/groups/apps/app_list.tpl.c:23 admin/groups/apps/app_list.tpl.c:35
+#: admin/groups/apps/app_list.tpl.c:47
+msgid "Move up"
+msgstr "PÅ™esunout nahoru"
+
+#: admin/groups/apps/app_list.tpl.c:26 admin/groups/apps/app_list.tpl.c:38
+#: admin/groups/apps/app_list.tpl.c:50
+msgid "Move down"
+msgstr "PÅ™esunout dolÅ¯"
+
+#: admin/groups/apps/app_list.tpl.c:32 admin/groups/apps/app_list.tpl.c:56
+msgid "Edit"
+msgstr "Upravit"
+
+#: admin/groups/apps/app_list.tpl.c:44
+msgid "Entry"
+msgstr "PoloÅ¾ka"
+
+#: admin/groups/apps/app_list.tpl.c:59
+msgid "add to"
+msgstr "pÅ™idat do"
+
+#: admin/groups/apps/app_list.tpl.c:62
+msgid "Add selected category to this folder.."
+msgstr "PÅ™idat zvolenou kategorii do tÃ©to sloÅ¾kyâ€¦"
+
+#: admin/groups/apps/app_list.tpl.c:65
+msgid "Separator"
+msgstr "OddÄ›lovaÄ"
+
+#: admin/groups/apps/app_list.tpl.c:68
+msgid "Add a separator to this folder."
+msgstr "PÅ™idat oddÄ›lovaÄ do tÃ©to sloÅ¾ky."
+
+#: admin/groups/apps/app_list.tpl.c:71
+msgid "Add selected applications to this folder."
+msgstr "PÅ™idat zvolenÃ© aplikace do tÃ©to sloÅ¾ky."
+
+#: admin/mimetypes/generic.tpl.c:8
+msgid "Please enter a name for the mime type here"
+msgstr "Sem zadejte nÃ¡zev tohoto typu MIME"
+
+#: admin/mimetypes/generic.tpl.c:14
+msgid "Categorize this mime type"
+msgstr "zaÅ™adit tento typ MIME do kategorie"
+
+#: admin/mimetypes/generic.tpl.c:20
+msgid "Please specify a description"
+msgstr "Zadejte popis"
+
+#: admin/mimetypes/generic.tpl.c:26
+msgid "Choose subtree to place application in"
+msgstr "Zvolte podstrom, do kterÃ©ho mÃ¡ bÃ½t aplikace umÃstÄ›na"
+
+#: admin/mimetypes/generic.tpl.c:29
+msgid "Select a base"
+msgstr "Vyberte zÃ¡klad"
 
-#: config/applications/class_applicationsPluginConfig.inc:56
-msgid "All"
-msgstr "vÅ¡e"
+#: admin/mimetypes/generic.tpl.c:35 admin/mimetypes/generic.tpl.c:38
+msgid "Mime icon"
+msgstr "Ikona tohoto MIME"
+
+#: admin/mimetypes/generic.tpl.c:41
+msgid "Update"
+msgstr "Aktualizovat"
+
+#: admin/mimetypes/generic.tpl.c:44
+msgid "Update mime type icon"
+msgstr "Aktualizovat ikonu tohoto MIME"
+
+#: admin/mimetypes/generic.tpl.c:47 admin/mimetypes/generic.tpl.c:50
+msgid "Left click"
+msgstr "KliknutÃ levÃ½m tlaÄÃtkem"
+
+#: admin/mimetypes/generic.tpl.c:56
+msgid "Please specify a new file pattern"
+msgstr "Zadejte novÃ½ souborovÃ½ vzor"
+
+#: admin/mimetypes/generic.tpl.c:59
+msgid "Add a new file pattern"
+msgstr "PÅ™idat novÃ½ souborovÃ½ vzor"
+
+#: admin/mimetypes/generic.tpl.c:65 admin/mimetypes/generic.tpl.c:89
+msgid "Enter an application name here"
+msgstr "NÃ¡zev aplikace zadejte sem"
+
+#: admin/mimetypes/generic.tpl.c:68 admin/mimetypes/generic.tpl.c:92
+msgid "Add application"
+msgstr "PÅ™idat aplikaci"
+
+#: admin/mimetypes/generic.tpl.c:71 admin/mimetypes/generic.tpl.c:74
+msgid "Embedding"
+msgstr "ZapouzdÅ™enÃ"
+
+#: admin/mimetypes/generic.tpl.c:77
+msgid "Show file in embedded viewer"
+msgstr "zobrazit obsah souboru v zabudovanÃ©m prohlÃÅ¾eÄi"
+
+#: admin/mimetypes/generic.tpl.c:80
+msgid "Show file in external viewer"
+msgstr "Zobrazit obsah souboru v externÃm prohlÃÅ¾eÄi"
+
+#: admin/mimetypes/generic.tpl.c:83
+msgid "Ask whether to save to local disk"
+msgstr "PtÃ¡t se, zda uklÃ¡dat na mÃstnÃ datovÃ© ÃºloÅ¾iÅ¡tÄ›"
diff --git a/applications/locale/de/fusiondirectory.po b/applications/locale/de/fusiondirectory.po
index 9d72a9c49d52ec070cb44c9973472be6a2a3ef79..b4ef9e1579de2ffe0d49869d420bf9b30b6a3480 100644
--- a/applications/locale/de/fusiondirectory.po
+++ b/applications/locale/de/fusiondirectory.po
@@ -3,223 +3,499 @@
 # This file is distributed under the same license as the PACKAGE package.
 # 
 # Translators:
-# d.oertel <d.oertel@uib.de>, 2015
-# Maik Wagner <maikwagner@yahoo.com>, 2014
 msgid ""
 msgstr ""
-"Project-Id-Version: FusionDirectory-108\n"
+"Project-Id-Version: FusionDirectory-109\n"
 "Report-Msgid-Bugs-To: documentation@lists.fusiondirectory.org\n"
-"POT-Creation-Date: 2015-03-19 21:45+0100\n"
-"PO-Revision-Date: 2015-02-25 16:12+0000\n"
-"Last-Translator: d.oertel <d.oertel@uib.de>\n"
-"Language-Team: German (http://www.transifex.com/projects/p/FusionDirectory-108/language/de/)\n"
+"POT-Creation-Date: 2014-08-28 12:26+0200\n"
+"PO-Revision-Date: 2014-08-28 10:28+0000\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: German (http://www.transifex.com/projects/p/FusionDirectory-109/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/groups/apps/class_groupApplication.inc:410
+#: admin/groups/apps/class_groupApplication.inc:414
+msgid "Menu"
+msgstr "MenÃ¼"
+
+#: admin/groups/apps/class_groupApplication.inc:482
+msgid "Back"
+msgstr "ZurÃ¼ck"
+
+#: admin/groups/apps/class_groupApplication.inc:493
+msgid "back"
+msgstr "zurÃ¼ck"
+
+#: admin/groups/apps/class_groupApplication.inc:501
+msgid "department"
+msgstr "Abteilung"
+
+#: admin/groups/apps/class_groupApplication.inc:524
+msgid "application"
+msgstr "Anwendung"
+
+#: admin/groups/apps/class_groupApplication.inc:701
+#: admin/groups/apps/class_groupApplication.inc:1396
+#: admin/groups/apps/class_groupApplication.inc:1409
+#: admin/groups/apps/class_groupApplication.inc:1422
+#: admin/mimetypes/class_mimetypeGeneric.inc:481
+#: admin/mimetypes/class_mimetypeGeneric.inc:493
+#: admin/mimetypes/class_mimetypeGeneric.inc:508
+#: admin/applications/class_applicationParameters.inc:177
+#: admin/applications/class_applicationParameters.inc:242
+#: admin/applications/class_applicationGeneric.inc:290
+msgid "LDAP error"
+msgstr "LDAP-Fehler"
+
+#: admin/groups/apps/class_groupApplication.inc:1208
+msgid "Not available in release."
+msgstr "Nicht verfÃ¼gbar in Release."
+
+#: admin/groups/apps/class_groupApplication.inc:1459
 #: 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
+#: admin/mimetypes/generic.tpl.c:62 admin/mimetypes/generic.tpl.c:86
 msgid "Applications"
 msgstr "Anwendungen"
 
+#: admin/groups/apps/class_groupApplication.inc:1460
+msgid "Group applications"
+msgstr "Anwendungen der Gruppe"
+
+#: admin/groups/apps/class_groupApplication.inc:1466
+#: admin/mimetypes/class_mimetypeGeneric.inc:689
+#: admin/applications/class_applicationGeneric.inc:73
+msgid "Application"
+msgstr "Anwendung"
+
+#: admin/groups/apps/class_groupApplication.inc:1467
+#: admin/groups/apps/app_list.tpl.c:2 admin/groups/apps/app_list.tpl.c:14
+msgid "Release"
+msgstr "Release"
+
+#: admin/groups/apps/class_groupApplication.inc:1468
+msgid "Application parameter"
+msgstr "Anwendungs-Parameter"
+
+#: admin/groups/apps/class_groupApplication.inc:1469
+#: admin/applications/class_applicationGeneric.inc:135
+#: admin/groups/apps/edit_entry.tpl.c:32
+msgid "Place icon on members desktop"
+msgstr "Platziere das Symbol auf dem Desktop der Gruppenmitglieder"
+
+#: admin/groups/apps/class_groupApplication.inc:1470
+#: admin/applications/class_applicationGeneric.inc:145
+#: admin/groups/apps/edit_entry.tpl.c:38
+msgid "Place entry in members launch bar"
+msgstr "Platziere einen Eintrag in der Kontrollleiste der Gruppenmitglieder"
+
+#: admin/groups/apps/class_groupApplication.inc:1471
+#: admin/applications/class_applicationGeneric.inc:140
+#: admin/groups/apps/edit_entry.tpl.c:35
+msgid "Place entry in members startmenu"
+msgstr "Platziere einen Eintrag im StartmenÃ¼ der Gruppenmitglieder"
+
+#: admin/mimetypes/class_mimetypeManagement.inc:28
+#: admin/mimetypes/class_mimetypeGeneric.inc:674
+msgid "Mime types"
+msgstr "MIME-Typen"
+
+#: admin/mimetypes/class_mimetypeManagement.inc:29
+msgid "Mime type management"
+msgstr "Mimeart-Verwaltung"
+
+#: admin/mimetypes/class_mimetypeGeneric.inc:519
+#: admin/mimetypes/class_mimetypeGeneric.inc:685
+#: admin/applications/class_applicationParameters.inc:208
+#: admin/applications/class_applicationParameters.inc:212
+#: admin/groups/apps/edit_entry.tpl.c:26
+msgid "Name"
+msgstr "Name"
+
+#: admin/mimetypes/class_mimetypeGeneric.inc:522
+msgid "File pattern"
+msgstr "Datei-Muster"
+
+#: admin/mimetypes/class_mimetypeGeneric.inc:671
+#: admin/applications/class_applicationGeneric.inc:69
+#: admin/mimetypes/generic.tpl.c:2
+msgid "Generic"
+msgstr "Allgemein"
+
+#: admin/mimetypes/class_mimetypeGeneric.inc:672
+msgid "Mime type generic"
+msgstr "MIME-Typ (Allgemein)"
+
+#: admin/mimetypes/class_mimetypeGeneric.inc:678
+#: admin/mimetypes/generic.tpl.c:5
+msgid "Mime type"
+msgstr "MIME-Typ"
+
+#: admin/mimetypes/class_mimetypeGeneric.inc:686
+#: admin/mimetypes/generic.tpl.c:11
+msgid "Mime group"
+msgstr "MIME-Gruppe"
+
+#: admin/mimetypes/class_mimetypeGeneric.inc:687
+#: admin/applications/class_applicationGeneric.inc:105
+#: admin/mimetypes/generic.tpl.c:17
+msgid "Description"
+msgstr "Beschreibung"
+
+#: admin/mimetypes/class_mimetypeGeneric.inc:688
+#: admin/mimetypes/generic.tpl.c:23
+msgid "Base"
+msgstr "Basis"
+
+#: admin/mimetypes/class_mimetypeGeneric.inc:690
+msgid "Left click action"
+msgstr "Linksklick-Aktion"
+
+#: admin/mimetypes/class_mimetypeGeneric.inc:691
+#: admin/applications/class_applicationGeneric.inc:112
+#: admin/mimetypes/generic.tpl.c:32
+msgid "Icon"
+msgstr "Symbol"
+
+#: admin/mimetypes/class_mimetypeGeneric.inc:692
+#: admin/mimetypes/generic.tpl.c:53
+msgid "File patterns"
+msgstr "Datei-Muster"
+
+#: admin/mimetypes/class_mimetypeGeneric.inc:693
+msgid "Embedded applications"
+msgstr "Eingebettete Anwendungen"
+
 #: admin/applications/class_applicationManagement.inc:29
 msgid "Application management"
 msgstr "Anwendungsverwaltung"
 
-#: admin/applications/class_applicationManagement.inc:100
-msgid "Web applications"
-msgstr "Web Anwendungen"
+#: admin/applications/class_applicationParameters.inc:71
+msgid "Remove options"
+msgstr "Optionen entfernen"
 
-#: admin/applications/class_applicationGeneric.inc:31
-#: admin/applications/class_applicationGeneric.inc:34
-#: admin/applications/class_applicationGeneric.inc:48
-#: admin/applications/class_webApplication.inc:47
-msgid "Application"
-msgstr "Anwendung"
+#: admin/applications/class_applicationParameters.inc:71
+#: admin/applications/class_applicationParameters.inc:73
+msgid "parameter"
+msgstr "Parameter"
+
+#: admin/applications/class_applicationParameters.inc:73
+msgid "Create options"
+msgstr "Optionen aktivieren"
+
+#: admin/applications/class_applicationParameters.inc:115
+msgid "Variable"
+msgstr "Variable"
+
+#: admin/applications/class_applicationParameters.inc:115
+msgid "Default value"
+msgstr "Standardwert"
+
+#: admin/applications/class_applicationParameters.inc:141
+#: admin/groups/apps/app_list.tpl.c:29 admin/groups/apps/app_list.tpl.c:41
+#: admin/groups/apps/app_list.tpl.c:53
+msgid "Remove"
+msgstr "Entfernen"
+
+#: admin/applications/class_applicationParameters.inc:147
+msgid "Add option"
+msgstr "Option hinzufÃ¼gen"
+
+#: admin/applications/class_applicationParameters.inc:265
+msgid "Parameter"
+msgstr "Parameter"
+
+#: admin/applications/class_applicationParameters.inc:266
+msgid "Parameter configuration"
+msgstr "Konfiguration der Parameter"
+
+#: admin/applications/class_applicationParameters.inc:271
+msgid "Application parameter settings"
+msgstr "Konfiguration der Anwendungs-Parameter"
+
+#: admin/applications/class_applicationGeneric.inc:70
+msgid "Application generic"
+msgstr "Anwendung (Allgemein)"
 
-#: admin/applications/class_applicationGeneric.inc:32
-msgid "Application information"
-msgstr "Anwendungsinformation"
+#: admin/applications/class_applicationGeneric.inc:90
+msgid "Properties"
+msgstr "Eigenschaften"
 
-#: admin/applications/class_applicationGeneric.inc:52
+#: admin/applications/class_applicationGeneric.inc:93
 msgid "Application name"
 msgstr "Name der Anwendung"
 
-#: admin/applications/class_applicationGeneric.inc:52
+#: admin/applications/class_applicationGeneric.inc:93
 msgid "The name of this application"
 msgstr "Der Name dieser Anwendung"
 
-#: admin/applications/class_applicationGeneric.inc:56
-#: admin/applications/class_webApplication.inc:55
-msgid "Description"
-msgstr "Beschreibung"
+#: admin/applications/class_applicationGeneric.inc:97
+msgid "Display name"
+msgstr "Anzeigename"
 
-#: admin/applications/class_applicationGeneric.inc:56
-#: admin/applications/class_webApplication.inc:55
-msgid "A short description of this application"
-msgstr "Eine kurze Beschreibung dieser Anwendung"
+#: admin/applications/class_applicationGeneric.inc:97
+msgid "The displayed name for this application"
+msgstr "Der angezeigte Name fÃ¼r diese Anwendung"
 
-#: admin/applications/class_applicationGeneric.inc:60
+#: admin/applications/class_applicationGeneric.inc:101
 msgid "Execute"
 msgstr "AusfÃ¼hren"
 
-#: admin/applications/class_applicationGeneric.inc:60
+#: admin/applications/class_applicationGeneric.inc:101
 msgid "The application to be executed"
 msgstr "Die auszufÃ¼hrende Anwendung"
 
-#: admin/applications/class_applicationGeneric.inc:64
-msgid "Display name"
-msgstr "Anzeigename"
-
-#: admin/applications/class_applicationGeneric.inc:64
-msgid "The displayed name for this application"
-msgstr "Der angezeigte Name fÃ¼r diese Anwendung"
-
-#: admin/applications/class_applicationGeneric.inc:70
-#: admin/applications/class_webApplication.inc:69
-msgid "Icon"
-msgstr "Symbol"
+#: admin/applications/class_applicationGeneric.inc:105
+msgid "A short description of this application"
+msgstr "Eine kurze Beschreibung dieser Anwendung"
 
-#: admin/applications/class_applicationGeneric.inc:73
-#: admin/applications/class_webApplication.inc:72
+#: admin/applications/class_applicationGeneric.inc:115
 msgid "The icon for this application"
 msgstr "Das Icon fÃ¼r diese Anwendung"
 
-#: admin/applications/class_applicationGeneric.inc:80
+#: admin/applications/class_applicationGeneric.inc:122
 msgid "Options"
 msgstr "Optionen"
 
-#: admin/applications/class_applicationGeneric.inc:83
+#: admin/applications/class_applicationGeneric.inc:125
 msgid "Only executable for member"
 msgstr "Nur fÃ¼r Mitglied ausfÃ¼hrbar"
 
-#: admin/applications/class_applicationGeneric.inc:83
+#: admin/applications/class_applicationGeneric.inc:125
 msgid "Only executable by the memebers of the group"
 msgstr "Nur ausfÃ¼hrbar von den Mitgliedern der Gruppe"
 
-#: admin/applications/class_applicationGeneric.inc:88
+#: admin/applications/class_applicationGeneric.inc:130
 msgid "Replace user configuration on startup"
 msgstr "Konfiguration bei jedem Start ersetzen"
 
-#: admin/applications/class_applicationGeneric.inc:88
+#: admin/applications/class_applicationGeneric.inc:130
 msgid "Replace the user configuration on startup"
 msgstr "Ersetzen der Benutzerkonfiguration beim Start"
 
-#: admin/applications/class_applicationGeneric.inc:93
-msgid "Place icon on members desktop"
-msgstr "Platziere das Symbol auf dem Desktop der Gruppenmitglieder"
-
-#: admin/applications/class_applicationGeneric.inc:93
+#: admin/applications/class_applicationGeneric.inc:135
 msgid "Put an icon on the user desktop"
 msgstr "Ein Icon auf der ArbeitsflÃ¤che erstellen"
 
-#: admin/applications/class_applicationGeneric.inc:98
-msgid "Place entry in members startmenu"
-msgstr "Platziere einen Eintrag im StartmenÃ¼ der Gruppenmitglieder"
-
-#: admin/applications/class_applicationGeneric.inc:98
-#: admin/applications/class_applicationGeneric.inc:103
+#: admin/applications/class_applicationGeneric.inc:140
+#: admin/applications/class_applicationGeneric.inc:145
 msgid "Put an entry in the startup menu"
 msgstr "Einen Eintrag im StartmenÃ¼ setzen"
 
-#: admin/applications/class_applicationGeneric.inc:103
-msgid "Place entry in members launch bar"
-msgstr "Platziere einen Eintrag in der Kontrollleiste der Gruppenmitglieder"
-
-#: admin/applications/class_webApplication.inc:30
-#: admin/applications/class_webApplication.inc:33
-msgid "Web application"
-msgstr "Web Anwendung"
-
-#: admin/applications/class_webApplication.inc:31
-msgid "Web applicationts names, icons and links"
-msgstr ""
+#: admin/applications/class_applicationGeneric.inc:156
+msgid "Script"
+msgstr "Skript"
 
-#: admin/applications/class_webApplication.inc:51
-msgid "Name"
-msgstr "Name"
+#: admin/applications/class_applicationGeneric.inc:159
+msgid "Script to run at logon"
+msgstr "Skript, welches beim Logon gestartet werden soll"
 
-#: admin/applications/class_webApplication.inc:51
-msgid "Name or id for application"
-msgstr ""
+#: admin/applications/class_applicationGeneric.inc:165
+msgid "Log off script"
+msgstr "Skript zum Ausloggen"
 
-#: admin/applications/class_webApplication.inc:59
-msgid "URL"
-msgstr "URL"
+#: admin/applications/class_applicationGeneric.inc:168
+msgid "Script to run at logoff"
+msgstr "Skript, welches beim Logoff gestartet werden soll"
 
-#: admin/applications/class_webApplication.inc:59
-msgid "Link to this application"
-msgstr ""
+#: admin/applications/class_applicationGeneric.inc:227
+msgid "no example"
+msgstr "kein Beispiel"
 
-#: admin/applications/class_webApplication.inc:63
-msgid "Display Name"
-msgstr ""
+#: admin/applications/class_applicationGeneric.inc:276
+msgid "Error"
+msgstr "Fehler"
 
-#: admin/applications/class_webApplication.inc:63
-msgid "Displayed name for links to this application"
-msgstr ""
+#: admin/applications/class_applicationGeneric.inc:276
+#, php-format
+msgid "Cannot remove application - it is still in use by these objects: %s"
+msgstr "Die Anwendung konnte nicht entfernt werden, sie wird momentan noch von folgenden Objekten verwendet: %s"
 
-#: admin/applications/class_webApplication.inc:77
-msgid "Icon location"
-msgstr ""
+#: config/desktop-management/class_desktopPluginConfig.inc:28
+msgid "Desktop management"
+msgstr "Desktopverwaltung"
 
-#: admin/applications/class_webApplication.inc:77
-msgid "Usual path to this application icon"
-msgstr ""
+#: config/desktop-management/class_desktopPluginConfig.inc:29
+msgid "Desktop management plugin configuration"
+msgstr "Desktopverwaltung Plugin-Konfiguration"
 
-#: admin/roles/class_applicationRights.inc:31
-msgid "Applications allowed for this role"
-msgstr ""
+#: config/desktop-management/class_desktopPluginConfig.inc:40
+msgid "LDAP tree"
+msgstr "LDAP Baum"
 
-#: admin/roles/class_applicationRights.inc:45
-msgid "Application list"
-msgstr ""
+#: config/desktop-management/class_desktopPluginConfig.inc:43
+msgid "Mimetype RDN"
+msgstr "Mimetype RDN"
 
-#: admin/roles/class_applicationRights.inc:49
-msgid "The applications users with this role are allowed to launch"
-msgstr ""
+#: config/desktop-management/class_desktopPluginConfig.inc:43
+msgid "Branch in which mime types will be stored"
+msgstr "Zweig in welchem mime-types gespeichert werden"
 
-#: config/applications/class_applicationsPluginConfig.inc:29
-msgid "Applications plugin configuration"
-msgstr ""
-
-#: config/applications/class_applicationsPluginConfig.inc:43
+#: config/desktop-management/class_desktopPluginConfig.inc:48
 msgid "Application RDN"
 msgstr "Anwendung RDN"
 
-#: config/applications/class_applicationsPluginConfig.inc:43
+#: config/desktop-management/class_desktopPluginConfig.inc:48
 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 ""
+#: admin/groups/apps/edit_entry.tpl.c:2
+msgid "Folder image"
+msgstr "Verzeichnisbild"
 
-#: config/applications/class_applicationsPluginConfig.inc:53
-msgid "Whether to show web applications in FD main menu"
-msgstr ""
+#: admin/groups/apps/edit_entry.tpl.c:5
+msgid "Could not load image."
+msgstr "Konnte Bild nicht laden."
 
-#: config/applications/class_applicationsPluginConfig.inc:56
+#: admin/groups/apps/edit_entry.tpl.c:8
 msgid "None"
 msgstr "Keine"
 
-#: config/applications/class_applicationsPluginConfig.inc:56
-msgid "Only allowed"
-msgstr ""
+#: admin/groups/apps/edit_entry.tpl.c:11
+msgid "Upload image"
+msgstr "Bild Hochladen"
+
+#: admin/groups/apps/edit_entry.tpl.c:14
+msgid "Upload"
+msgstr "Hochladen"
+
+#: admin/groups/apps/edit_entry.tpl.c:17
+msgid "Reset image"
+msgstr "Bild zurÃ¼cksetzen"
+
+#: admin/groups/apps/edit_entry.tpl.c:20
+msgid "Reset"
+msgstr "ZurÃ¼cksetzen"
+
+#: admin/groups/apps/edit_entry.tpl.c:23
+msgid "Application settings"
+msgstr "Anwendungs-Einstellungen"
+
+#: admin/groups/apps/edit_entry.tpl.c:29
+msgid "Application options"
+msgstr "Anwendungsoptionen"
+
+#: admin/groups/apps/app_list.tpl.c:5
+msgid "Copy menu"
+msgstr "MenÃ¼ kopieren"
+
+#: admin/groups/apps/app_list.tpl.c:8
+msgid "Paste menu from"
+msgstr "MenÃ¼ einfÃ¼gen von"
+
+#: admin/groups/apps/app_list.tpl.c:11
+msgid "Delete menu"
+msgstr "MenÃ¼ entfernen"
+
+#: admin/groups/apps/app_list.tpl.c:17 admin/groups/apps/app_list.tpl.c:20
+msgid "Folder"
+msgstr "Ordner"
+
+#: admin/groups/apps/app_list.tpl.c:23 admin/groups/apps/app_list.tpl.c:35
+#: admin/groups/apps/app_list.tpl.c:47
+msgid "Move up"
+msgstr "Nach oben bewegen"
+
+#: admin/groups/apps/app_list.tpl.c:26 admin/groups/apps/app_list.tpl.c:38
+#: admin/groups/apps/app_list.tpl.c:50
+msgid "Move down"
+msgstr "Nach unten bewegen"
+
+#: admin/groups/apps/app_list.tpl.c:32 admin/groups/apps/app_list.tpl.c:56
+msgid "Edit"
+msgstr "Bearbeiten"
+
+#: admin/groups/apps/app_list.tpl.c:44
+msgid "Entry"
+msgstr "Eintrag"
+
+#: admin/groups/apps/app_list.tpl.c:59
+msgid "add to"
+msgstr "hinzufÃ¼gen"
+
+#: admin/groups/apps/app_list.tpl.c:62
+msgid "Add selected category to this folder.."
+msgstr "AusgewÃ¤hlte Kategorie diesem Ordner hinzufÃ¼gen.."
+
+#: admin/groups/apps/app_list.tpl.c:65
+msgid "Separator"
+msgstr "Feldtrenner"
+
+#: admin/groups/apps/app_list.tpl.c:68
+msgid "Add a separator to this folder."
+msgstr "FÃ¼ge Feldtrenner zu diesem Verzeichnis hinzu."
+
+#: admin/groups/apps/app_list.tpl.c:71
+msgid "Add selected applications to this folder."
+msgstr "FÃ¼ge gewÃ¤hlte Anwendungen zu diesem Verzeichnis hinzu."
+
+#: admin/mimetypes/generic.tpl.c:8
+msgid "Please enter a name for the mime type here"
+msgstr "Bitte geben Sie hier einen Namen fÃ¼r den MIME-Typ ein"
+
+#: admin/mimetypes/generic.tpl.c:14
+msgid "Categorize this mime type"
+msgstr "Kategorie dieses MIME-Typs"
+
+#: admin/mimetypes/generic.tpl.c:20
+msgid "Please specify a description"
+msgstr "Bitte geben Sie eine Beschreibung an"
+
+#: admin/mimetypes/generic.tpl.c:26
+msgid "Choose subtree to place application in"
+msgstr "WÃ¤hlen Sie den Teilbaum, in den die Anwendung plaziert werden soll."
+
+#: admin/mimetypes/generic.tpl.c:29
+msgid "Select a base"
+msgstr "WÃ¤hlen Sie eine Basis"
 
-#: config/applications/class_applicationsPluginConfig.inc:56
-msgid "All"
-msgstr "Alle"
+#: admin/mimetypes/generic.tpl.c:35 admin/mimetypes/generic.tpl.c:38
+msgid "Mime icon"
+msgstr "MIME-Icon"
+
+#: admin/mimetypes/generic.tpl.c:41
+msgid "Update"
+msgstr "Aktualisieren"
+
+#: admin/mimetypes/generic.tpl.c:44
+msgid "Update mime type icon"
+msgstr "Aktualisiere MIME-Typ Icon"
+
+#: admin/mimetypes/generic.tpl.c:47 admin/mimetypes/generic.tpl.c:50
+msgid "Left click"
+msgstr "Linksklick"
+
+#: admin/mimetypes/generic.tpl.c:56
+msgid "Please specify a new file pattern"
+msgstr "Bitte geben Sie ein neues Dateimuster an"
+
+#: admin/mimetypes/generic.tpl.c:59
+msgid "Add a new file pattern"
+msgstr "Erstelle ein neues Dateimuster"
+
+#: admin/mimetypes/generic.tpl.c:65 admin/mimetypes/generic.tpl.c:89
+msgid "Enter an application name here"
+msgstr "Geben Sie hier den Namen der Anwendung ein"
+
+#: admin/mimetypes/generic.tpl.c:68 admin/mimetypes/generic.tpl.c:92
+msgid "Add application"
+msgstr "Anwendung hinzufÃ¼gen"
+
+#: admin/mimetypes/generic.tpl.c:71 admin/mimetypes/generic.tpl.c:74
+msgid "Embedding"
+msgstr "eingebettet"
+
+#: admin/mimetypes/generic.tpl.c:77
+msgid "Show file in embedded viewer"
+msgstr "Zeige Datei mit eingebautem Betrachter"
+
+#: admin/mimetypes/generic.tpl.c:80
+msgid "Show file in external viewer"
+msgstr "Zeige Datei mit externem Programm"
+
+#: admin/mimetypes/generic.tpl.c:83
+msgid "Ask whether to save to local disk"
+msgstr "Frage nach, ob Datei lokal auf Festplatte gespeichert werden soll"
diff --git a/applications/locale/el_GR/fusiondirectory.po b/applications/locale/el_GR/fusiondirectory.po
new file mode 100644
index 0000000000000000000000000000000000000000..3dc13b7c783cbd55bc0eb55ede582289a0ccee62
--- /dev/null
+++ b/applications/locale/el_GR/fusiondirectory.po
@@ -0,0 +1,501 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR FusionDirectory Project
+# This file is distributed under the same license as the PACKAGE package.
+# 
+# Translators:
+msgid ""
+msgstr ""
+"Project-Id-Version: FusionDirectory-109\n"
+"Report-Msgid-Bugs-To: documentation@lists.fusiondirectory.org\n"
+"POT-Creation-Date: 2014-08-28 12:26+0200\n"
+"PO-Revision-Date: 2015-05-30 11:45+0000\n"
+"Last-Translator: Benoit Mortier <benoit.mortier@opensides.be>\n"
+"Language-Team: Greek (Greece) (http://www.transifex.com/projects/p/FusionDirectory-109/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/groups/apps/class_groupApplication.inc:410
+#: admin/groups/apps/class_groupApplication.inc:414
+msgid "Menu"
+msgstr ""
+
+#: admin/groups/apps/class_groupApplication.inc:482
+msgid "Back"
+msgstr ""
+
+#: admin/groups/apps/class_groupApplication.inc:493
+msgid "back"
+msgstr ""
+
+#: admin/groups/apps/class_groupApplication.inc:501
+msgid "department"
+msgstr ""
+
+#: admin/groups/apps/class_groupApplication.inc:524
+msgid "application"
+msgstr ""
+
+#: admin/groups/apps/class_groupApplication.inc:701
+#: admin/groups/apps/class_groupApplication.inc:1396
+#: admin/groups/apps/class_groupApplication.inc:1409
+#: admin/groups/apps/class_groupApplication.inc:1422
+#: admin/mimetypes/class_mimetypeGeneric.inc:481
+#: admin/mimetypes/class_mimetypeGeneric.inc:493
+#: admin/mimetypes/class_mimetypeGeneric.inc:508
+#: admin/applications/class_applicationParameters.inc:177
+#: admin/applications/class_applicationParameters.inc:242
+#: admin/applications/class_applicationGeneric.inc:290
+msgid "LDAP error"
+msgstr ""
+
+#: admin/groups/apps/class_groupApplication.inc:1208
+msgid "Not available in release."
+msgstr ""
+
+#: admin/groups/apps/class_groupApplication.inc:1459
+#: admin/applications/class_applicationManagement.inc:28
+#: admin/mimetypes/generic.tpl.c:62 admin/mimetypes/generic.tpl.c:86
+msgid "Applications"
+msgstr ""
+
+#: admin/groups/apps/class_groupApplication.inc:1460
+msgid "Group applications"
+msgstr ""
+
+#: admin/groups/apps/class_groupApplication.inc:1466
+#: admin/mimetypes/class_mimetypeGeneric.inc:689
+#: admin/applications/class_applicationGeneric.inc:73
+msgid "Application"
+msgstr ""
+
+#: admin/groups/apps/class_groupApplication.inc:1467
+#: admin/groups/apps/app_list.tpl.c:2 admin/groups/apps/app_list.tpl.c:14
+msgid "Release"
+msgstr ""
+
+#: admin/groups/apps/class_groupApplication.inc:1468
+msgid "Application parameter"
+msgstr ""
+
+#: admin/groups/apps/class_groupApplication.inc:1469
+#: admin/applications/class_applicationGeneric.inc:135
+#: admin/groups/apps/edit_entry.tpl.c:32
+msgid "Place icon on members desktop"
+msgstr ""
+
+#: admin/groups/apps/class_groupApplication.inc:1470
+#: admin/applications/class_applicationGeneric.inc:145
+#: admin/groups/apps/edit_entry.tpl.c:38
+msgid "Place entry in members launch bar"
+msgstr ""
+
+#: admin/groups/apps/class_groupApplication.inc:1471
+#: admin/applications/class_applicationGeneric.inc:140
+#: admin/groups/apps/edit_entry.tpl.c:35
+msgid "Place entry in members startmenu"
+msgstr ""
+
+#: admin/mimetypes/class_mimetypeManagement.inc:28
+#: admin/mimetypes/class_mimetypeGeneric.inc:674
+msgid "Mime types"
+msgstr ""
+
+#: admin/mimetypes/class_mimetypeManagement.inc:29
+msgid "Mime type management"
+msgstr ""
+
+#: admin/mimetypes/class_mimetypeGeneric.inc:519
+#: admin/mimetypes/class_mimetypeGeneric.inc:685
+#: admin/applications/class_applicationParameters.inc:208
+#: admin/applications/class_applicationParameters.inc:212
+#: admin/groups/apps/edit_entry.tpl.c:26
+msgid "Name"
+msgstr ""
+
+#: admin/mimetypes/class_mimetypeGeneric.inc:522
+msgid "File pattern"
+msgstr ""
+
+#: admin/mimetypes/class_mimetypeGeneric.inc:671
+#: admin/applications/class_applicationGeneric.inc:69
+#: admin/mimetypes/generic.tpl.c:2
+msgid "Generic"
+msgstr ""
+
+#: admin/mimetypes/class_mimetypeGeneric.inc:672
+msgid "Mime type generic"
+msgstr ""
+
+#: admin/mimetypes/class_mimetypeGeneric.inc:678
+#: admin/mimetypes/generic.tpl.c:5
+msgid "Mime type"
+msgstr ""
+
+#: admin/mimetypes/class_mimetypeGeneric.inc:686
+#: admin/mimetypes/generic.tpl.c:11
+msgid "Mime group"
+msgstr ""
+
+#: admin/mimetypes/class_mimetypeGeneric.inc:687
+#: admin/applications/class_applicationGeneric.inc:105
+#: admin/mimetypes/generic.tpl.c:17
+msgid "Description"
+msgstr ""
+
+#: admin/mimetypes/class_mimetypeGeneric.inc:688
+#: admin/mimetypes/generic.tpl.c:23
+msgid "Base"
+msgstr ""
+
+#: admin/mimetypes/class_mimetypeGeneric.inc:690
+msgid "Left click action"
+msgstr ""
+
+#: admin/mimetypes/class_mimetypeGeneric.inc:691
+#: admin/applications/class_applicationGeneric.inc:112
+#: admin/mimetypes/generic.tpl.c:32
+msgid "Icon"
+msgstr ""
+
+#: admin/mimetypes/class_mimetypeGeneric.inc:692
+#: admin/mimetypes/generic.tpl.c:53
+msgid "File patterns"
+msgstr ""
+
+#: admin/mimetypes/class_mimetypeGeneric.inc:693
+msgid "Embedded applications"
+msgstr ""
+
+#: admin/applications/class_applicationManagement.inc:29
+msgid "Application management"
+msgstr ""
+
+#: admin/applications/class_applicationParameters.inc:71
+msgid "Remove options"
+msgstr ""
+
+#: admin/applications/class_applicationParameters.inc:71
+#: admin/applications/class_applicationParameters.inc:73
+msgid "parameter"
+msgstr ""
+
+#: admin/applications/class_applicationParameters.inc:73
+msgid "Create options"
+msgstr ""
+
+#: admin/applications/class_applicationParameters.inc:115
+msgid "Variable"
+msgstr ""
+
+#: admin/applications/class_applicationParameters.inc:115
+msgid "Default value"
+msgstr ""
+
+#: admin/applications/class_applicationParameters.inc:141
+#: admin/groups/apps/app_list.tpl.c:29 admin/groups/apps/app_list.tpl.c:41
+#: admin/groups/apps/app_list.tpl.c:53
+msgid "Remove"
+msgstr ""
+
+#: admin/applications/class_applicationParameters.inc:147
+msgid "Add option"
+msgstr ""
+
+#: admin/applications/class_applicationParameters.inc:265
+msgid "Parameter"
+msgstr ""
+
+#: admin/applications/class_applicationParameters.inc:266
+msgid "Parameter configuration"
+msgstr ""
+
+#: admin/applications/class_applicationParameters.inc:271
+msgid "Application parameter settings"
+msgstr ""
+
+#: admin/applications/class_applicationGeneric.inc:70
+msgid "Application generic"
+msgstr ""
+
+#: admin/applications/class_applicationGeneric.inc:90
+msgid "Properties"
+msgstr ""
+
+#: admin/applications/class_applicationGeneric.inc:93
+msgid "Application name"
+msgstr ""
+
+#: admin/applications/class_applicationGeneric.inc:93
+msgid "The name of this application"
+msgstr ""
+
+#: admin/applications/class_applicationGeneric.inc:97
+msgid "Display name"
+msgstr ""
+
+#: admin/applications/class_applicationGeneric.inc:97
+msgid "The displayed name for this application"
+msgstr ""
+
+#: admin/applications/class_applicationGeneric.inc:101
+msgid "Execute"
+msgstr ""
+
+#: admin/applications/class_applicationGeneric.inc:101
+msgid "The application to be executed"
+msgstr ""
+
+#: admin/applications/class_applicationGeneric.inc:105
+msgid "A short description of this application"
+msgstr ""
+
+#: admin/applications/class_applicationGeneric.inc:115
+msgid "The icon for this application"
+msgstr ""
+
+#: admin/applications/class_applicationGeneric.inc:122
+msgid "Options"
+msgstr ""
+
+#: admin/applications/class_applicationGeneric.inc:125
+msgid "Only executable for member"
+msgstr ""
+
+#: admin/applications/class_applicationGeneric.inc:125
+msgid "Only executable by the memebers of the group"
+msgstr ""
+
+#: admin/applications/class_applicationGeneric.inc:130
+msgid "Replace user configuration on startup"
+msgstr ""
+
+#: admin/applications/class_applicationGeneric.inc:130
+msgid "Replace the user configuration on startup"
+msgstr ""
+
+#: admin/applications/class_applicationGeneric.inc:135
+msgid "Put an icon on the user desktop"
+msgstr ""
+
+#: admin/applications/class_applicationGeneric.inc:140
+#: admin/applications/class_applicationGeneric.inc:145
+msgid "Put an entry in the startup menu"
+msgstr ""
+
+#: admin/applications/class_applicationGeneric.inc:156
+msgid "Script"
+msgstr ""
+
+#: admin/applications/class_applicationGeneric.inc:159
+msgid "Script to run at logon"
+msgstr ""
+
+#: admin/applications/class_applicationGeneric.inc:165
+msgid "Log off script"
+msgstr ""
+
+#: admin/applications/class_applicationGeneric.inc:168
+msgid "Script to run at logoff"
+msgstr ""
+
+#: admin/applications/class_applicationGeneric.inc:227
+msgid "no example"
+msgstr ""
+
+#: admin/applications/class_applicationGeneric.inc:276
+msgid "Error"
+msgstr ""
+
+#: admin/applications/class_applicationGeneric.inc:276
+#, php-format
+msgid "Cannot remove application - it is still in use by these objects: %s"
+msgstr ""
+
+#: config/desktop-management/class_desktopPluginConfig.inc:28
+msgid "Desktop management"
+msgstr ""
+
+#: config/desktop-management/class_desktopPluginConfig.inc:29
+msgid "Desktop management plugin configuration"
+msgstr ""
+
+#: config/desktop-management/class_desktopPluginConfig.inc:40
+msgid "LDAP tree"
+msgstr ""
+
+#: config/desktop-management/class_desktopPluginConfig.inc:43
+msgid "Mimetype RDN"
+msgstr ""
+
+#: config/desktop-management/class_desktopPluginConfig.inc:43
+msgid "Branch in which mime types will be stored"
+msgstr ""
+
+#: config/desktop-management/class_desktopPluginConfig.inc:48
+msgid "Application RDN"
+msgstr ""
+
+#: config/desktop-management/class_desktopPluginConfig.inc:48
+msgid "Branch in which applications will be stored"
+msgstr ""
+
+#: admin/groups/apps/edit_entry.tpl.c:2
+msgid "Folder image"
+msgstr ""
+
+#: admin/groups/apps/edit_entry.tpl.c:5
+msgid "Could not load image."
+msgstr ""
+
+#: admin/groups/apps/edit_entry.tpl.c:8
+msgid "None"
+msgstr ""
+
+#: admin/groups/apps/edit_entry.tpl.c:11
+msgid "Upload image"
+msgstr ""
+
+#: admin/groups/apps/edit_entry.tpl.c:14
+msgid "Upload"
+msgstr ""
+
+#: admin/groups/apps/edit_entry.tpl.c:17
+msgid "Reset image"
+msgstr ""
+
+#: admin/groups/apps/edit_entry.tpl.c:20
+msgid "Reset"
+msgstr ""
+
+#: admin/groups/apps/edit_entry.tpl.c:23
+msgid "Application settings"
+msgstr ""
+
+#: admin/groups/apps/edit_entry.tpl.c:29
+msgid "Application options"
+msgstr ""
+
+#: admin/groups/apps/app_list.tpl.c:5
+msgid "Copy menu"
+msgstr ""
+
+#: admin/groups/apps/app_list.tpl.c:8
+msgid "Paste menu from"
+msgstr ""
+
+#: admin/groups/apps/app_list.tpl.c:11
+msgid "Delete menu"
+msgstr ""
+
+#: admin/groups/apps/app_list.tpl.c:17 admin/groups/apps/app_list.tpl.c:20
+msgid "Folder"
+msgstr ""
+
+#: admin/groups/apps/app_list.tpl.c:23 admin/groups/apps/app_list.tpl.c:35
+#: admin/groups/apps/app_list.tpl.c:47
+msgid "Move up"
+msgstr ""
+
+#: admin/groups/apps/app_list.tpl.c:26 admin/groups/apps/app_list.tpl.c:38
+#: admin/groups/apps/app_list.tpl.c:50
+msgid "Move down"
+msgstr ""
+
+#: admin/groups/apps/app_list.tpl.c:32 admin/groups/apps/app_list.tpl.c:56
+msgid "Edit"
+msgstr ""
+
+#: admin/groups/apps/app_list.tpl.c:44
+msgid "Entry"
+msgstr ""
+
+#: admin/groups/apps/app_list.tpl.c:59
+msgid "add to"
+msgstr ""
+
+#: admin/groups/apps/app_list.tpl.c:62
+msgid "Add selected category to this folder.."
+msgstr ""
+
+#: admin/groups/apps/app_list.tpl.c:65
+msgid "Separator"
+msgstr ""
+
+#: admin/groups/apps/app_list.tpl.c:68
+msgid "Add a separator to this folder."
+msgstr ""
+
+#: admin/groups/apps/app_list.tpl.c:71
+msgid "Add selected applications to this folder."
+msgstr ""
+
+#: admin/mimetypes/generic.tpl.c:8
+msgid "Please enter a name for the mime type here"
+msgstr ""
+
+#: admin/mimetypes/generic.tpl.c:14
+msgid "Categorize this mime type"
+msgstr ""
+
+#: admin/mimetypes/generic.tpl.c:20
+msgid "Please specify a description"
+msgstr ""
+
+#: admin/mimetypes/generic.tpl.c:26
+msgid "Choose subtree to place application in"
+msgstr ""
+
+#: admin/mimetypes/generic.tpl.c:29
+msgid "Select a base"
+msgstr ""
+
+#: admin/mimetypes/generic.tpl.c:35 admin/mimetypes/generic.tpl.c:38
+msgid "Mime icon"
+msgstr ""
+
+#: admin/mimetypes/generic.tpl.c:41
+msgid "Update"
+msgstr ""
+
+#: admin/mimetypes/generic.tpl.c:44
+msgid "Update mime type icon"
+msgstr ""
+
+#: admin/mimetypes/generic.tpl.c:47 admin/mimetypes/generic.tpl.c:50
+msgid "Left click"
+msgstr ""
+
+#: admin/mimetypes/generic.tpl.c:56
+msgid "Please specify a new file pattern"
+msgstr ""
+
+#: admin/mimetypes/generic.tpl.c:59
+msgid "Add a new file pattern"
+msgstr ""
+
+#: admin/mimetypes/generic.tpl.c:65 admin/mimetypes/generic.tpl.c:89
+msgid "Enter an application name here"
+msgstr ""
+
+#: admin/mimetypes/generic.tpl.c:68 admin/mimetypes/generic.tpl.c:92
+msgid "Add application"
+msgstr ""
+
+#: admin/mimetypes/generic.tpl.c:71 admin/mimetypes/generic.tpl.c:74
+msgid "Embedding"
+msgstr ""
+
+#: admin/mimetypes/generic.tpl.c:77
+msgid "Show file in embedded viewer"
+msgstr ""
+
+#: admin/mimetypes/generic.tpl.c:80
+msgid "Show file in external viewer"
+msgstr ""
+
+#: admin/mimetypes/generic.tpl.c:83
+msgid "Ask whether to save to local disk"
+msgstr ""
diff --git a/applications/locale/en/fusiondirectory.po b/applications/locale/en/fusiondirectory.po
index 558b2dace5785adefa2d54af4323e3f8427e6a6d..9f3489be003f3bf8b53d4e24d49bb8f44bb73c7d 100644
--- a/applications/locale/en/fusiondirectory.po
+++ b/applications/locale/en/fusiondirectory.po
@@ -6,13 +6,13 @@
 #, fuzzy
 msgid ""
 msgstr ""
-"Project-Id-Version: PACKAGE VERSION\n"
-"Report-Msgid-Bugs-To: documentation@lists.fusiondirectory.org\n"
-"POT-Creation-Date: 2015-03-31 11:49+0200\n"
+"Project-Id-Version: FusionDirectory VERSION\n"
+"Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
+"POT-Creation-Date: 2015-05-30 15:30+0200\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
-"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
-"Language-Team: LANGUAGE <LL@li.org>\n"
-"Language: \n"
+"Last-Translator: FusionDirectory project <contact@fusiondirectory.org>\n"
+"Language-Team: English\n"
+"Language: en\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
diff --git a/applications/locale/es/fusiondirectory.po b/applications/locale/es/fusiondirectory.po
index da688eeb4f93a954c0db2b0ed7d0662c9401369a..8605f2a8d0941e045fbaa39ee5e285f80181c728 100644
--- a/applications/locale/es/fusiondirectory.po
+++ b/applications/locale/es/fusiondirectory.po
@@ -5,219 +5,497 @@
 # Translators:
 msgid ""
 msgstr ""
-"Project-Id-Version: FusionDirectory-108\n"
+"Project-Id-Version: FusionDirectory-109\n"
 "Report-Msgid-Bugs-To: documentation@lists.fusiondirectory.org\n"
-"POT-Creation-Date: 2015-03-19 21:45+0100\n"
-"PO-Revision-Date: 2015-02-25 16:12+0000\n"
-"Last-Translator: fusiondirectory <contact@fusiondirectory.org>\n"
-"Language-Team: Spanish (http://www.transifex.com/projects/p/FusionDirectory-108/language/es/)\n"
+"POT-Creation-Date: 2014-08-28 12:26+0200\n"
+"PO-Revision-Date: 2014-08-28 10:28+0000\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: Spanish (http://www.transifex.com/projects/p/FusionDirectory-109/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/groups/apps/class_groupApplication.inc:410
+#: admin/groups/apps/class_groupApplication.inc:414
+msgid "Menu"
+msgstr "MenÃº"
+
+#: admin/groups/apps/class_groupApplication.inc:482
+msgid "Back"
+msgstr "AtrÃ¡s"
+
+#: admin/groups/apps/class_groupApplication.inc:493
+msgid "back"
+msgstr "atrÃ¡s"
+
+#: admin/groups/apps/class_groupApplication.inc:501
+msgid "department"
+msgstr "departamento"
+
+#: admin/groups/apps/class_groupApplication.inc:524
+msgid "application"
+msgstr "aplicaciÃ³n"
+
+#: admin/groups/apps/class_groupApplication.inc:701
+#: admin/groups/apps/class_groupApplication.inc:1396
+#: admin/groups/apps/class_groupApplication.inc:1409
+#: admin/groups/apps/class_groupApplication.inc:1422
+#: admin/mimetypes/class_mimetypeGeneric.inc:481
+#: admin/mimetypes/class_mimetypeGeneric.inc:493
+#: admin/mimetypes/class_mimetypeGeneric.inc:508
+#: admin/applications/class_applicationParameters.inc:177
+#: admin/applications/class_applicationParameters.inc:242
+#: admin/applications/class_applicationGeneric.inc:290
+msgid "LDAP error"
+msgstr "Error LDAP"
+
+#: admin/groups/apps/class_groupApplication.inc:1208
+msgid "Not available in release."
+msgstr "No esta disponible en esta versiÃ³n"
+
+#: admin/groups/apps/class_groupApplication.inc:1459
 #: 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
+#: admin/mimetypes/generic.tpl.c:62 admin/mimetypes/generic.tpl.c:86
 msgid "Applications"
 msgstr "Aplicaciones"
 
+#: admin/groups/apps/class_groupApplication.inc:1460
+msgid "Group applications"
+msgstr "Grupo de aplicaciones"
+
+#: admin/groups/apps/class_groupApplication.inc:1466
+#: admin/mimetypes/class_mimetypeGeneric.inc:689
+#: admin/applications/class_applicationGeneric.inc:73
+msgid "Application"
+msgstr "AplicaciÃ³n"
+
+#: admin/groups/apps/class_groupApplication.inc:1467
+#: admin/groups/apps/app_list.tpl.c:2 admin/groups/apps/app_list.tpl.c:14
+msgid "Release"
+msgstr "VersiÃ³n"
+
+#: admin/groups/apps/class_groupApplication.inc:1468
+msgid "Application parameter"
+msgstr "ParÃ¡metro de la aplicaciÃ³n"
+
+#: admin/groups/apps/class_groupApplication.inc:1469
+#: admin/applications/class_applicationGeneric.inc:135
+#: admin/groups/apps/edit_entry.tpl.c:32
+msgid "Place icon on members desktop"
+msgstr "Colocar icono en los escritorios de los miembros "
+
+#: admin/groups/apps/class_groupApplication.inc:1470
+#: admin/applications/class_applicationGeneric.inc:145
+#: admin/groups/apps/edit_entry.tpl.c:38
+msgid "Place entry in members launch bar"
+msgstr "Colocar entrada en los barra de inicio de los miembros"
+
+#: admin/groups/apps/class_groupApplication.inc:1471
+#: admin/applications/class_applicationGeneric.inc:140
+#: admin/groups/apps/edit_entry.tpl.c:35
+msgid "Place entry in members startmenu"
+msgstr "Colocar entrado en los menÃºs de inicio de los miembros"
+
+#: admin/mimetypes/class_mimetypeManagement.inc:28
+#: admin/mimetypes/class_mimetypeGeneric.inc:674
+msgid "Mime types"
+msgstr "Tipos MIME"
+
+#: admin/mimetypes/class_mimetypeManagement.inc:29
+msgid "Mime type management"
+msgstr ""
+
+#: admin/mimetypes/class_mimetypeGeneric.inc:519
+#: admin/mimetypes/class_mimetypeGeneric.inc:685
+#: admin/applications/class_applicationParameters.inc:208
+#: admin/applications/class_applicationParameters.inc:212
+#: admin/groups/apps/edit_entry.tpl.c:26
+msgid "Name"
+msgstr "Nombre"
+
+#: admin/mimetypes/class_mimetypeGeneric.inc:522
+msgid "File pattern"
+msgstr "PatrÃ³n de archivo"
+
+#: admin/mimetypes/class_mimetypeGeneric.inc:671
+#: admin/applications/class_applicationGeneric.inc:69
+#: admin/mimetypes/generic.tpl.c:2
+msgid "Generic"
+msgstr "GenÃ©rico"
+
+#: admin/mimetypes/class_mimetypeGeneric.inc:672
+msgid "Mime type generic"
+msgstr "Tipo MIME genÃ©rico"
+
+#: admin/mimetypes/class_mimetypeGeneric.inc:678
+#: admin/mimetypes/generic.tpl.c:5
+msgid "Mime type"
+msgstr "Tipo MIME"
+
+#: admin/mimetypes/class_mimetypeGeneric.inc:686
+#: admin/mimetypes/generic.tpl.c:11
+msgid "Mime group"
+msgstr "Grupo Mime"
+
+#: admin/mimetypes/class_mimetypeGeneric.inc:687
+#: admin/applications/class_applicationGeneric.inc:105
+#: admin/mimetypes/generic.tpl.c:17
+msgid "Description"
+msgstr "DescripciÃ³n"
+
+#: admin/mimetypes/class_mimetypeGeneric.inc:688
+#: admin/mimetypes/generic.tpl.c:23
+msgid "Base"
+msgstr "Base"
+
+#: admin/mimetypes/class_mimetypeGeneric.inc:690
+msgid "Left click action"
+msgstr "AcciÃ³n del botÃ³n izquierdo"
+
+#: admin/mimetypes/class_mimetypeGeneric.inc:691
+#: admin/applications/class_applicationGeneric.inc:112
+#: admin/mimetypes/generic.tpl.c:32
+msgid "Icon"
+msgstr "Icono"
+
+#: admin/mimetypes/class_mimetypeGeneric.inc:692
+#: admin/mimetypes/generic.tpl.c:53
+msgid "File patterns"
+msgstr "Patrones de archivos"
+
+#: admin/mimetypes/class_mimetypeGeneric.inc:693
+msgid "Embedded applications"
+msgstr "Aplicaciones embebidas"
+
 #: admin/applications/class_applicationManagement.inc:29
 msgid "Application management"
 msgstr "AdministraciÃ³n de aplicaciÃ³n"
 
-#: admin/applications/class_applicationManagement.inc:100
-msgid "Web applications"
-msgstr ""
+#: admin/applications/class_applicationParameters.inc:71
+msgid "Remove options"
+msgstr "Eliminar opciones"
 
-#: admin/applications/class_applicationGeneric.inc:31
-#: admin/applications/class_applicationGeneric.inc:34
-#: admin/applications/class_applicationGeneric.inc:48
-#: admin/applications/class_webApplication.inc:47
-msgid "Application"
-msgstr "AplicaciÃ³n"
+#: admin/applications/class_applicationParameters.inc:71
+#: admin/applications/class_applicationParameters.inc:73
+msgid "parameter"
+msgstr "ParÃ¡metro"
 
-#: admin/applications/class_applicationGeneric.inc:32
-msgid "Application information"
-msgstr ""
+#: admin/applications/class_applicationParameters.inc:73
+msgid "Create options"
+msgstr "Crear opciones"
+
+#: admin/applications/class_applicationParameters.inc:115
+msgid "Variable"
+msgstr "Variable"
+
+#: admin/applications/class_applicationParameters.inc:115
+msgid "Default value"
+msgstr "Valor por defecto"
+
+#: admin/applications/class_applicationParameters.inc:141
+#: admin/groups/apps/app_list.tpl.c:29 admin/groups/apps/app_list.tpl.c:41
+#: admin/groups/apps/app_list.tpl.c:53
+msgid "Remove"
+msgstr "Eliminar"
 
-#: admin/applications/class_applicationGeneric.inc:52
+#: admin/applications/class_applicationParameters.inc:147
+msgid "Add option"
+msgstr "AÃ±adir opciÃ³n"
+
+#: admin/applications/class_applicationParameters.inc:265
+msgid "Parameter"
+msgstr "ParÃ¡metro"
+
+#: admin/applications/class_applicationParameters.inc:266
+msgid "Parameter configuration"
+msgstr "ConfiguraciÃ³n del parÃ¡metro"
+
+#: admin/applications/class_applicationParameters.inc:271
+msgid "Application parameter settings"
+msgstr "ConfiguraciÃ³n de los parÃ¡metros de aplicaciÃ³n"
+
+#: admin/applications/class_applicationGeneric.inc:70
+msgid "Application generic"
+msgstr "AplicaciÃ³n genÃ©rica"
+
+#: admin/applications/class_applicationGeneric.inc:90
+msgid "Properties"
+msgstr "Propiedades"
+
+#: admin/applications/class_applicationGeneric.inc:93
 msgid "Application name"
 msgstr "Nombre de la aplicaciÃ³n"
 
-#: admin/applications/class_applicationGeneric.inc:52
+#: admin/applications/class_applicationGeneric.inc:93
 msgid "The name of this application"
 msgstr ""
 
-#: admin/applications/class_applicationGeneric.inc:56
-#: admin/applications/class_webApplication.inc:55
-msgid "Description"
-msgstr "DescripciÃ³n"
+#: admin/applications/class_applicationGeneric.inc:97
+msgid "Display name"
+msgstr "Nombre a Mostrar"
 
-#: admin/applications/class_applicationGeneric.inc:56
-#: admin/applications/class_webApplication.inc:55
-msgid "A short description of this application"
+#: admin/applications/class_applicationGeneric.inc:97
+msgid "The displayed name for this application"
 msgstr ""
 
-#: admin/applications/class_applicationGeneric.inc:60
+#: admin/applications/class_applicationGeneric.inc:101
 msgid "Execute"
 msgstr "Ejecute"
 
-#: admin/applications/class_applicationGeneric.inc:60
+#: admin/applications/class_applicationGeneric.inc:101
 msgid "The application to be executed"
 msgstr ""
 
-#: admin/applications/class_applicationGeneric.inc:64
-msgid "Display name"
-msgstr "Nombre a Mostrar"
-
-#: admin/applications/class_applicationGeneric.inc:64
-msgid "The displayed name for this application"
+#: admin/applications/class_applicationGeneric.inc:105
+msgid "A short description of this application"
 msgstr ""
 
-#: admin/applications/class_applicationGeneric.inc:70
-#: admin/applications/class_webApplication.inc:69
-msgid "Icon"
-msgstr "Icono"
-
-#: admin/applications/class_applicationGeneric.inc:73
-#: admin/applications/class_webApplication.inc:72
+#: admin/applications/class_applicationGeneric.inc:115
 msgid "The icon for this application"
 msgstr ""
 
-#: admin/applications/class_applicationGeneric.inc:80
+#: admin/applications/class_applicationGeneric.inc:122
 msgid "Options"
 msgstr "Opciones"
 
-#: admin/applications/class_applicationGeneric.inc:83
+#: admin/applications/class_applicationGeneric.inc:125
 msgid "Only executable for member"
 msgstr ""
 
-#: admin/applications/class_applicationGeneric.inc:83
+#: admin/applications/class_applicationGeneric.inc:125
 msgid "Only executable by the memebers of the group"
 msgstr ""
 
-#: admin/applications/class_applicationGeneric.inc:88
+#: admin/applications/class_applicationGeneric.inc:130
 msgid "Replace user configuration on startup"
 msgstr "Reemplazar la configuraciÃ³n del usuario en el inicio"
 
-#: admin/applications/class_applicationGeneric.inc:88
+#: admin/applications/class_applicationGeneric.inc:130
 msgid "Replace the user configuration on startup"
 msgstr ""
 
-#: admin/applications/class_applicationGeneric.inc:93
-msgid "Place icon on members desktop"
-msgstr "Colocar icono en los escritorios de los miembros "
-
-#: admin/applications/class_applicationGeneric.inc:93
+#: admin/applications/class_applicationGeneric.inc:135
 msgid "Put an icon on the user desktop"
 msgstr ""
 
-#: admin/applications/class_applicationGeneric.inc:98
-msgid "Place entry in members startmenu"
-msgstr "Colocar entrado en los menÃºs de inicio de los miembros"
-
-#: admin/applications/class_applicationGeneric.inc:98
-#: admin/applications/class_applicationGeneric.inc:103
+#: admin/applications/class_applicationGeneric.inc:140
+#: admin/applications/class_applicationGeneric.inc:145
 msgid "Put an entry in the startup menu"
 msgstr ""
 
-#: admin/applications/class_applicationGeneric.inc:103
-msgid "Place entry in members launch bar"
-msgstr "Colocar entrada en los barra de inicio de los miembros"
+#: admin/applications/class_applicationGeneric.inc:156
+msgid "Script"
+msgstr "Script"
 
-#: admin/applications/class_webApplication.inc:30
-#: admin/applications/class_webApplication.inc:33
-msgid "Web application"
+#: admin/applications/class_applicationGeneric.inc:159
+msgid "Script to run at logon"
 msgstr ""
 
-#: admin/applications/class_webApplication.inc:31
-msgid "Web applicationts names, icons and links"
+#: admin/applications/class_applicationGeneric.inc:165
+msgid "Log off script"
 msgstr ""
 
-#: admin/applications/class_webApplication.inc:51
-msgid "Name"
-msgstr "Nombre"
-
-#: admin/applications/class_webApplication.inc:51
-msgid "Name or id for application"
+#: admin/applications/class_applicationGeneric.inc:168
+msgid "Script to run at logoff"
 msgstr ""
 
-#: admin/applications/class_webApplication.inc:59
-msgid "URL"
-msgstr "URL"
+#: admin/applications/class_applicationGeneric.inc:227
+msgid "no example"
+msgstr "sin ejemplo"
 
-#: admin/applications/class_webApplication.inc:59
-msgid "Link to this application"
-msgstr ""
+#: admin/applications/class_applicationGeneric.inc:276
+msgid "Error"
+msgstr "Error"
 
-#: admin/applications/class_webApplication.inc:63
-msgid "Display Name"
-msgstr ""
-
-#: admin/applications/class_webApplication.inc:63
-msgid "Displayed name for links to this application"
-msgstr ""
-
-#: admin/applications/class_webApplication.inc:77
-msgid "Icon location"
-msgstr ""
+#: admin/applications/class_applicationGeneric.inc:276
+#, php-format
+msgid "Cannot remove application - it is still in use by these objects: %s"
+msgstr "No se puede eliminar las aplicaciÃ³n, estÃ¡ todavÃa en uso por el objeto '%s'."
 
-#: admin/applications/class_webApplication.inc:77
-msgid "Usual path to this application icon"
+#: config/desktop-management/class_desktopPluginConfig.inc:28
+msgid "Desktop management"
 msgstr ""
 
-#: admin/roles/class_applicationRights.inc:31
-msgid "Applications allowed for this role"
+#: config/desktop-management/class_desktopPluginConfig.inc:29
+msgid "Desktop management plugin configuration"
 msgstr ""
 
-#: admin/roles/class_applicationRights.inc:45
-msgid "Application list"
+#: config/desktop-management/class_desktopPluginConfig.inc:40
+msgid "LDAP tree"
 msgstr ""
 
-#: admin/roles/class_applicationRights.inc:49
-msgid "The applications users with this role are allowed to launch"
+#: config/desktop-management/class_desktopPluginConfig.inc:43
+msgid "Mimetype RDN"
 msgstr ""
 
-#: config/applications/class_applicationsPluginConfig.inc:29
-msgid "Applications plugin configuration"
+#: config/desktop-management/class_desktopPluginConfig.inc:43
+msgid "Branch in which mime types will be stored"
 msgstr ""
 
-#: config/applications/class_applicationsPluginConfig.inc:43
+#: config/desktop-management/class_desktopPluginConfig.inc:48
 msgid "Application RDN"
 msgstr ""
 
-#: config/applications/class_applicationsPluginConfig.inc:43
+#: config/desktop-management/class_desktopPluginConfig.inc:48
 msgid "Branch in which applications will be stored"
 msgstr ""
 
-#: config/applications/class_applicationsPluginConfig.inc:48
-msgid "Web applications RDN"
-msgstr ""
+#: admin/groups/apps/edit_entry.tpl.c:2
+msgid "Folder image"
+msgstr "Imagen de carpeta"
 
-#: config/applications/class_applicationsPluginConfig.inc:48
-msgid "Branch in which web applications will be stored"
-msgstr ""
+#: admin/groups/apps/edit_entry.tpl.c:5
+msgid "Could not load image."
+msgstr "No se puede subir la imagen."
 
-#: 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
+#: admin/groups/apps/edit_entry.tpl.c:8
 msgid "None"
 msgstr "Ninguno"
 
-#: config/applications/class_applicationsPluginConfig.inc:56
-msgid "Only allowed"
+#: admin/groups/apps/edit_entry.tpl.c:11
+msgid "Upload image"
+msgstr "Subir imagen"
+
+#: admin/groups/apps/edit_entry.tpl.c:14
+msgid "Upload"
+msgstr "Enviar"
+
+#: admin/groups/apps/edit_entry.tpl.c:17
+msgid "Reset image"
+msgstr "Eliminar imagen"
+
+#: admin/groups/apps/edit_entry.tpl.c:20
+msgid "Reset"
+msgstr "Borrar"
+
+#: admin/groups/apps/edit_entry.tpl.c:23
+msgid "Application settings"
+msgstr "Parametros de la aplicaciÃ³n"
+
+#: admin/groups/apps/edit_entry.tpl.c:29
+msgid "Application options"
+msgstr "Opciones de la aplicaciÃ³n"
+
+#: admin/groups/apps/app_list.tpl.c:5
+msgid "Copy menu"
+msgstr "Copiar menÃº"
+
+#: admin/groups/apps/app_list.tpl.c:8
+msgid "Paste menu from"
+msgstr "Pegar menÃº de"
+
+#: admin/groups/apps/app_list.tpl.c:11
+msgid "Delete menu"
+msgstr "Eliminar menÃº"
+
+#: admin/groups/apps/app_list.tpl.c:17 admin/groups/apps/app_list.tpl.c:20
+msgid "Folder"
+msgstr "Carpeta"
+
+#: admin/groups/apps/app_list.tpl.c:23 admin/groups/apps/app_list.tpl.c:35
+#: admin/groups/apps/app_list.tpl.c:47
+msgid "Move up"
+msgstr "Mover arriba"
+
+#: admin/groups/apps/app_list.tpl.c:26 admin/groups/apps/app_list.tpl.c:38
+#: admin/groups/apps/app_list.tpl.c:50
+msgid "Move down"
+msgstr "Mover abajo"
+
+#: admin/groups/apps/app_list.tpl.c:32 admin/groups/apps/app_list.tpl.c:56
+msgid "Edit"
+msgstr "Editar"
+
+#: admin/groups/apps/app_list.tpl.c:44
+msgid "Entry"
+msgstr "Entrada"
+
+#: admin/groups/apps/app_list.tpl.c:59
+msgid "add to"
+msgstr "AÃ±adir a"
+
+#: admin/groups/apps/app_list.tpl.c:62
+msgid "Add selected category to this folder.."
 msgstr ""
 
-#: config/applications/class_applicationsPluginConfig.inc:56
-msgid "All"
-msgstr "Todo"
+#: admin/groups/apps/app_list.tpl.c:65
+msgid "Separator"
+msgstr "Separador"
+
+#: admin/groups/apps/app_list.tpl.c:68
+msgid "Add a separator to this folder."
+msgstr "AÃ±adir un separador a esta carpeta."
+
+#: admin/groups/apps/app_list.tpl.c:71
+msgid "Add selected applications to this folder."
+msgstr "AÃ±adir la aplicaciÃ³n seleccionada a esta carpeta."
+
+#: admin/mimetypes/generic.tpl.c:8
+msgid "Please enter a name for the mime type here"
+msgstr "Por favor introduzca un nombre para el tipo mime valido"
+
+#: admin/mimetypes/generic.tpl.c:14
+msgid "Categorize this mime type"
+msgstr "Categorizar este tipo mime"
+
+#: admin/mimetypes/generic.tpl.c:20
+msgid "Please specify a description"
+msgstr "Por favor introduzca una descripciÃ³n"
+
+#: admin/mimetypes/generic.tpl.c:26
+msgid "Choose subtree to place application in"
+msgstr "Elija lugar del Ã¡rbol donde colocar la aplicaciÃ³n"
+
+#: admin/mimetypes/generic.tpl.c:29
+msgid "Select a base"
+msgstr "Seleccione una base"
+
+#: admin/mimetypes/generic.tpl.c:35 admin/mimetypes/generic.tpl.c:38
+msgid "Mime icon"
+msgstr "Icono Mime"
+
+#: admin/mimetypes/generic.tpl.c:41
+msgid "Update"
+msgstr "Actualizar"
+
+#: admin/mimetypes/generic.tpl.c:44
+msgid "Update mime type icon"
+msgstr "Actualizar icono de tipo mime"
+
+#: admin/mimetypes/generic.tpl.c:47 admin/mimetypes/generic.tpl.c:50
+msgid "Left click"
+msgstr "BotÃ³n izquierdo"
+
+#: admin/mimetypes/generic.tpl.c:56
+msgid "Please specify a new file pattern"
+msgstr "Por favor introduzca un nuevo patrÃ³n de archivo"
+
+#: admin/mimetypes/generic.tpl.c:59
+msgid "Add a new file pattern"
+msgstr "AÃ±adir nuevo patrÃ³n de archivo"
+
+#: admin/mimetypes/generic.tpl.c:65 admin/mimetypes/generic.tpl.c:89
+msgid "Enter an application name here"
+msgstr "Introduzca un nombre de la aplicaciÃ³n aquÃ"
+
+#: admin/mimetypes/generic.tpl.c:68 admin/mimetypes/generic.tpl.c:92
+msgid "Add application"
+msgstr "AÃ±adir aplicaciÃ³n"
+
+#: admin/mimetypes/generic.tpl.c:71 admin/mimetypes/generic.tpl.c:74
+msgid "Embedding"
+msgstr "Embebido"
+
+#: admin/mimetypes/generic.tpl.c:77
+msgid "Show file in embedded viewer"
+msgstr "Mostrar archivo en un visor interno"
+
+#: admin/mimetypes/generic.tpl.c:80
+msgid "Show file in external viewer"
+msgstr "Mostrar archivo en un visor externo"
+
+#: admin/mimetypes/generic.tpl.c:83
+msgid "Ask whether to save to local disk"
+msgstr "Para saber si graba al disco local"
diff --git a/applications/locale/es_VE/fusiondirectory.po b/applications/locale/es_VE/fusiondirectory.po
index dd2a9c9ef59d40ac0bd19be76848b718324eff5d..0ab04e2fb834e08506689e6e4dbba1204ff483a7 100644
--- a/applications/locale/es_VE/fusiondirectory.po
+++ b/applications/locale/es_VE/fusiondirectory.po
@@ -5,219 +5,497 @@
 # Translators:
 msgid ""
 msgstr ""
-"Project-Id-Version: FusionDirectory-108\n"
+"Project-Id-Version: FusionDirectory-109\n"
 "Report-Msgid-Bugs-To: documentation@lists.fusiondirectory.org\n"
-"POT-Creation-Date: 2015-03-19 21:45+0100\n"
-"PO-Revision-Date: 2015-02-25 16:12+0000\n"
+"POT-Creation-Date: 2014-08-28 12:26+0200\n"
+"PO-Revision-Date: 2015-02-25 16:13+0000\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>\n"
-"Language-Team: Spanish (Venezuela) (http://www.transifex.com/projects/p/FusionDirectory-108/language/es_VE/)\n"
+"Language-Team: Spanish (Venezuela) (http://www.transifex.com/projects/p/FusionDirectory-109/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/groups/apps/class_groupApplication.inc:410
+#: admin/groups/apps/class_groupApplication.inc:414
+msgid "Menu"
+msgstr "MenÃº"
+
+#: admin/groups/apps/class_groupApplication.inc:482
+msgid "Back"
+msgstr "AtrÃ¡s"
+
+#: admin/groups/apps/class_groupApplication.inc:493
+msgid "back"
+msgstr "atrÃ¡s"
+
+#: admin/groups/apps/class_groupApplication.inc:501
+msgid "department"
+msgstr "departamento"
+
+#: admin/groups/apps/class_groupApplication.inc:524
+msgid "application"
+msgstr "aplicaciÃ³n"
+
+#: admin/groups/apps/class_groupApplication.inc:701
+#: admin/groups/apps/class_groupApplication.inc:1396
+#: admin/groups/apps/class_groupApplication.inc:1409
+#: admin/groups/apps/class_groupApplication.inc:1422
+#: admin/mimetypes/class_mimetypeGeneric.inc:481
+#: admin/mimetypes/class_mimetypeGeneric.inc:493
+#: admin/mimetypes/class_mimetypeGeneric.inc:508
+#: admin/applications/class_applicationParameters.inc:177
+#: admin/applications/class_applicationParameters.inc:242
+#: admin/applications/class_applicationGeneric.inc:290
+msgid "LDAP error"
+msgstr "Error de LDAP"
+
+#: admin/groups/apps/class_groupApplication.inc:1208
+msgid "Not available in release."
+msgstr "No esta disponible en esta versiÃ³n"
+
+#: admin/groups/apps/class_groupApplication.inc:1459
 #: 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
+#: admin/mimetypes/generic.tpl.c:62 admin/mimetypes/generic.tpl.c:86
 msgid "Applications"
 msgstr "Aplicaciones"
 
+#: admin/groups/apps/class_groupApplication.inc:1460
+msgid "Group applications"
+msgstr "Grupo de aplicaciones"
+
+#: admin/groups/apps/class_groupApplication.inc:1466
+#: admin/mimetypes/class_mimetypeGeneric.inc:689
+#: admin/applications/class_applicationGeneric.inc:73
+msgid "Application"
+msgstr "AplicaciÃ³n"
+
+#: admin/groups/apps/class_groupApplication.inc:1467
+#: admin/groups/apps/app_list.tpl.c:2 admin/groups/apps/app_list.tpl.c:14
+msgid "Release"
+msgstr "VersiÃ³n"
+
+#: admin/groups/apps/class_groupApplication.inc:1468
+msgid "Application parameter"
+msgstr "ParÃ¡metro de la aplicaciÃ³n"
+
+#: admin/groups/apps/class_groupApplication.inc:1469
+#: admin/applications/class_applicationGeneric.inc:135
+#: admin/groups/apps/edit_entry.tpl.c:32
+msgid "Place icon on members desktop"
+msgstr "Colocar icono en los escritorios de los miembros "
+
+#: admin/groups/apps/class_groupApplication.inc:1470
+#: admin/applications/class_applicationGeneric.inc:145
+#: admin/groups/apps/edit_entry.tpl.c:38
+msgid "Place entry in members launch bar"
+msgstr "Colocar entrada en los barra de inicio de los miembros"
+
+#: admin/groups/apps/class_groupApplication.inc:1471
+#: admin/applications/class_applicationGeneric.inc:140
+#: admin/groups/apps/edit_entry.tpl.c:35
+msgid "Place entry in members startmenu"
+msgstr "Colocar entrado en los menÃºs de inicio de los miembros"
+
+#: admin/mimetypes/class_mimetypeManagement.inc:28
+#: admin/mimetypes/class_mimetypeGeneric.inc:674
+msgid "Mime types"
+msgstr "Tipos MIME"
+
+#: admin/mimetypes/class_mimetypeManagement.inc:29
+msgid "Mime type management"
+msgstr ""
+
+#: admin/mimetypes/class_mimetypeGeneric.inc:519
+#: admin/mimetypes/class_mimetypeGeneric.inc:685
+#: admin/applications/class_applicationParameters.inc:208
+#: admin/applications/class_applicationParameters.inc:212
+#: admin/groups/apps/edit_entry.tpl.c:26
+msgid "Name"
+msgstr "Nombre"
+
+#: admin/mimetypes/class_mimetypeGeneric.inc:522
+msgid "File pattern"
+msgstr "PatrÃ³n de archivo"
+
+#: admin/mimetypes/class_mimetypeGeneric.inc:671
+#: admin/applications/class_applicationGeneric.inc:69
+#: admin/mimetypes/generic.tpl.c:2
+msgid "Generic"
+msgstr "GenÃ©rico"
+
+#: admin/mimetypes/class_mimetypeGeneric.inc:672
+msgid "Mime type generic"
+msgstr "Tipo MIME genÃ©rico"
+
+#: admin/mimetypes/class_mimetypeGeneric.inc:678
+#: admin/mimetypes/generic.tpl.c:5
+msgid "Mime type"
+msgstr "Tipo MIME"
+
+#: admin/mimetypes/class_mimetypeGeneric.inc:686
+#: admin/mimetypes/generic.tpl.c:11
+msgid "Mime group"
+msgstr "Grupo Mime"
+
+#: admin/mimetypes/class_mimetypeGeneric.inc:687
+#: admin/applications/class_applicationGeneric.inc:105
+#: admin/mimetypes/generic.tpl.c:17
+msgid "Description"
+msgstr "DescripciÃ³n"
+
+#: admin/mimetypes/class_mimetypeGeneric.inc:688
+#: admin/mimetypes/generic.tpl.c:23
+msgid "Base"
+msgstr "Base"
+
+#: admin/mimetypes/class_mimetypeGeneric.inc:690
+msgid "Left click action"
+msgstr "AcciÃ³n del botÃ³n izquierdo"
+
+#: admin/mimetypes/class_mimetypeGeneric.inc:691
+#: admin/applications/class_applicationGeneric.inc:112
+#: admin/mimetypes/generic.tpl.c:32
+msgid "Icon"
+msgstr "Icono"
+
+#: admin/mimetypes/class_mimetypeGeneric.inc:692
+#: admin/mimetypes/generic.tpl.c:53
+msgid "File patterns"
+msgstr "Patrones de archivos"
+
+#: admin/mimetypes/class_mimetypeGeneric.inc:693
+msgid "Embedded applications"
+msgstr "Aplicaciones embebidas"
+
 #: admin/applications/class_applicationManagement.inc:29
 msgid "Application management"
 msgstr "AdministraciÃ³n de aplicaciÃ³n"
 
-#: admin/applications/class_applicationManagement.inc:100
-msgid "Web applications"
-msgstr ""
+#: admin/applications/class_applicationParameters.inc:71
+msgid "Remove options"
+msgstr "Eliminar opciones"
 
-#: admin/applications/class_applicationGeneric.inc:31
-#: admin/applications/class_applicationGeneric.inc:34
-#: admin/applications/class_applicationGeneric.inc:48
-#: admin/applications/class_webApplication.inc:47
-msgid "Application"
-msgstr "AplicaciÃ³n"
+#: admin/applications/class_applicationParameters.inc:71
+#: admin/applications/class_applicationParameters.inc:73
+msgid "parameter"
+msgstr "ParÃ¡metro"
 
-#: admin/applications/class_applicationGeneric.inc:32
-msgid "Application information"
-msgstr ""
+#: admin/applications/class_applicationParameters.inc:73
+msgid "Create options"
+msgstr "Crear opciones"
+
+#: admin/applications/class_applicationParameters.inc:115
+msgid "Variable"
+msgstr "Variable"
+
+#: admin/applications/class_applicationParameters.inc:115
+msgid "Default value"
+msgstr "Valor por defecto"
+
+#: admin/applications/class_applicationParameters.inc:141
+#: admin/groups/apps/app_list.tpl.c:29 admin/groups/apps/app_list.tpl.c:41
+#: admin/groups/apps/app_list.tpl.c:53
+msgid "Remove"
+msgstr "Eliminar"
 
-#: admin/applications/class_applicationGeneric.inc:52
+#: admin/applications/class_applicationParameters.inc:147
+msgid "Add option"
+msgstr "AÃ±adir opciÃ³n"
+
+#: admin/applications/class_applicationParameters.inc:265
+msgid "Parameter"
+msgstr "ParÃ¡metro"
+
+#: admin/applications/class_applicationParameters.inc:266
+msgid "Parameter configuration"
+msgstr "ConfiguraciÃ³n del parÃ¡metro"
+
+#: admin/applications/class_applicationParameters.inc:271
+msgid "Application parameter settings"
+msgstr "ConfiguraciÃ³n de los parÃ¡metros de aplicaciÃ³n"
+
+#: admin/applications/class_applicationGeneric.inc:70
+msgid "Application generic"
+msgstr "AplicaciÃ³n genÃ©rica"
+
+#: admin/applications/class_applicationGeneric.inc:90
+msgid "Properties"
+msgstr "Propiedades"
+
+#: admin/applications/class_applicationGeneric.inc:93
 msgid "Application name"
 msgstr "Nombre de la aplicaciÃ³n"
 
-#: admin/applications/class_applicationGeneric.inc:52
+#: admin/applications/class_applicationGeneric.inc:93
 msgid "The name of this application"
 msgstr ""
 
-#: admin/applications/class_applicationGeneric.inc:56
-#: admin/applications/class_webApplication.inc:55
-msgid "Description"
-msgstr "DescripciÃ³n"
+#: admin/applications/class_applicationGeneric.inc:97
+msgid "Display name"
+msgstr "Nombre a Mostrar"
 
-#: admin/applications/class_applicationGeneric.inc:56
-#: admin/applications/class_webApplication.inc:55
-msgid "A short description of this application"
+#: admin/applications/class_applicationGeneric.inc:97
+msgid "The displayed name for this application"
 msgstr ""
 
-#: admin/applications/class_applicationGeneric.inc:60
+#: admin/applications/class_applicationGeneric.inc:101
 msgid "Execute"
 msgstr "Ejecute"
 
-#: admin/applications/class_applicationGeneric.inc:60
+#: admin/applications/class_applicationGeneric.inc:101
 msgid "The application to be executed"
 msgstr ""
 
-#: admin/applications/class_applicationGeneric.inc:64
-msgid "Display name"
-msgstr "Nombre a Mostrar"
-
-#: admin/applications/class_applicationGeneric.inc:64
-msgid "The displayed name for this application"
+#: admin/applications/class_applicationGeneric.inc:105
+msgid "A short description of this application"
 msgstr ""
 
-#: admin/applications/class_applicationGeneric.inc:70
-#: admin/applications/class_webApplication.inc:69
-msgid "Icon"
-msgstr "Icono"
-
-#: admin/applications/class_applicationGeneric.inc:73
-#: admin/applications/class_webApplication.inc:72
+#: admin/applications/class_applicationGeneric.inc:115
 msgid "The icon for this application"
 msgstr ""
 
-#: admin/applications/class_applicationGeneric.inc:80
+#: admin/applications/class_applicationGeneric.inc:122
 msgid "Options"
 msgstr "Opciones"
 
-#: admin/applications/class_applicationGeneric.inc:83
+#: admin/applications/class_applicationGeneric.inc:125
 msgid "Only executable for member"
 msgstr ""
 
-#: admin/applications/class_applicationGeneric.inc:83
+#: admin/applications/class_applicationGeneric.inc:125
 msgid "Only executable by the memebers of the group"
 msgstr ""
 
-#: admin/applications/class_applicationGeneric.inc:88
+#: admin/applications/class_applicationGeneric.inc:130
 msgid "Replace user configuration on startup"
 msgstr "Reemplazar la configuraciÃ³n del usuario en el inicio"
 
-#: admin/applications/class_applicationGeneric.inc:88
+#: admin/applications/class_applicationGeneric.inc:130
 msgid "Replace the user configuration on startup"
 msgstr ""
 
-#: admin/applications/class_applicationGeneric.inc:93
-msgid "Place icon on members desktop"
-msgstr "Colocar icono en los escritorios de los miembros "
-
-#: admin/applications/class_applicationGeneric.inc:93
+#: admin/applications/class_applicationGeneric.inc:135
 msgid "Put an icon on the user desktop"
 msgstr ""
 
-#: admin/applications/class_applicationGeneric.inc:98
-msgid "Place entry in members startmenu"
-msgstr "Colocar entrado en los menÃºs de inicio de los miembros"
-
-#: admin/applications/class_applicationGeneric.inc:98
-#: admin/applications/class_applicationGeneric.inc:103
+#: admin/applications/class_applicationGeneric.inc:140
+#: admin/applications/class_applicationGeneric.inc:145
 msgid "Put an entry in the startup menu"
 msgstr ""
 
-#: admin/applications/class_applicationGeneric.inc:103
-msgid "Place entry in members launch bar"
-msgstr "Colocar entrada en los barra de inicio de los miembros"
+#: admin/applications/class_applicationGeneric.inc:156
+msgid "Script"
+msgstr "Script"
 
-#: admin/applications/class_webApplication.inc:30
-#: admin/applications/class_webApplication.inc:33
-msgid "Web application"
+#: admin/applications/class_applicationGeneric.inc:159
+msgid "Script to run at logon"
 msgstr ""
 
-#: admin/applications/class_webApplication.inc:31
-msgid "Web applicationts names, icons and links"
+#: admin/applications/class_applicationGeneric.inc:165
+msgid "Log off script"
 msgstr ""
 
-#: admin/applications/class_webApplication.inc:51
-msgid "Name"
-msgstr "Nombre"
-
-#: admin/applications/class_webApplication.inc:51
-msgid "Name or id for application"
+#: admin/applications/class_applicationGeneric.inc:168
+msgid "Script to run at logoff"
 msgstr ""
 
-#: admin/applications/class_webApplication.inc:59
-msgid "URL"
-msgstr "URL"
+#: admin/applications/class_applicationGeneric.inc:227
+msgid "no example"
+msgstr "sin ejemplo"
 
-#: admin/applications/class_webApplication.inc:59
-msgid "Link to this application"
-msgstr ""
+#: admin/applications/class_applicationGeneric.inc:276
+msgid "Error"
+msgstr "Error"
 
-#: admin/applications/class_webApplication.inc:63
-msgid "Display Name"
-msgstr ""
-
-#: admin/applications/class_webApplication.inc:63
-msgid "Displayed name for links to this application"
-msgstr ""
-
-#: admin/applications/class_webApplication.inc:77
-msgid "Icon location"
-msgstr ""
+#: admin/applications/class_applicationGeneric.inc:276
+#, php-format
+msgid "Cannot remove application - it is still in use by these objects: %s"
+msgstr "No se puede eliminar las aplicaciÃ³n, estÃ¡ todavÃa en uso por el objeto '%s'."
 
-#: admin/applications/class_webApplication.inc:77
-msgid "Usual path to this application icon"
+#: config/desktop-management/class_desktopPluginConfig.inc:28
+msgid "Desktop management"
 msgstr ""
 
-#: admin/roles/class_applicationRights.inc:31
-msgid "Applications allowed for this role"
+#: config/desktop-management/class_desktopPluginConfig.inc:29
+msgid "Desktop management plugin configuration"
 msgstr ""
 
-#: admin/roles/class_applicationRights.inc:45
-msgid "Application list"
+#: config/desktop-management/class_desktopPluginConfig.inc:40
+msgid "LDAP tree"
 msgstr ""
 
-#: admin/roles/class_applicationRights.inc:49
-msgid "The applications users with this role are allowed to launch"
+#: config/desktop-management/class_desktopPluginConfig.inc:43
+msgid "Mimetype RDN"
 msgstr ""
 
-#: config/applications/class_applicationsPluginConfig.inc:29
-msgid "Applications plugin configuration"
+#: config/desktop-management/class_desktopPluginConfig.inc:43
+msgid "Branch in which mime types will be stored"
 msgstr ""
 
-#: config/applications/class_applicationsPluginConfig.inc:43
+#: config/desktop-management/class_desktopPluginConfig.inc:48
 msgid "Application RDN"
 msgstr ""
 
-#: config/applications/class_applicationsPluginConfig.inc:43
+#: config/desktop-management/class_desktopPluginConfig.inc:48
 msgid "Branch in which applications will be stored"
 msgstr ""
 
-#: config/applications/class_applicationsPluginConfig.inc:48
-msgid "Web applications RDN"
-msgstr ""
+#: admin/groups/apps/edit_entry.tpl.c:2
+msgid "Folder image"
+msgstr "Imagen de carpeta"
 
-#: config/applications/class_applicationsPluginConfig.inc:48
-msgid "Branch in which web applications will be stored"
-msgstr ""
+#: admin/groups/apps/edit_entry.tpl.c:5
+msgid "Could not load image."
+msgstr "No se puede subir la imagen."
 
-#: 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
+#: admin/groups/apps/edit_entry.tpl.c:8
 msgid "None"
 msgstr "Ninguno"
 
-#: config/applications/class_applicationsPluginConfig.inc:56
-msgid "Only allowed"
+#: admin/groups/apps/edit_entry.tpl.c:11
+msgid "Upload image"
+msgstr "Subir imagen"
+
+#: admin/groups/apps/edit_entry.tpl.c:14
+msgid "Upload"
+msgstr "Enviar"
+
+#: admin/groups/apps/edit_entry.tpl.c:17
+msgid "Reset image"
+msgstr "Eliminar imagen"
+
+#: admin/groups/apps/edit_entry.tpl.c:20
+msgid "Reset"
+msgstr "Borrar"
+
+#: admin/groups/apps/edit_entry.tpl.c:23
+msgid "Application settings"
+msgstr "Parametros de la aplicaciÃ³n"
+
+#: admin/groups/apps/edit_entry.tpl.c:29
+msgid "Application options"
+msgstr "Opciones de la aplicaciÃ³n"
+
+#: admin/groups/apps/app_list.tpl.c:5
+msgid "Copy menu"
+msgstr "Copiar menÃº"
+
+#: admin/groups/apps/app_list.tpl.c:8
+msgid "Paste menu from"
+msgstr "Pegar menÃº de"
+
+#: admin/groups/apps/app_list.tpl.c:11
+msgid "Delete menu"
+msgstr "Eliminar menÃº"
+
+#: admin/groups/apps/app_list.tpl.c:17 admin/groups/apps/app_list.tpl.c:20
+msgid "Folder"
+msgstr "Carpeta"
+
+#: admin/groups/apps/app_list.tpl.c:23 admin/groups/apps/app_list.tpl.c:35
+#: admin/groups/apps/app_list.tpl.c:47
+msgid "Move up"
+msgstr "Mover arriba"
+
+#: admin/groups/apps/app_list.tpl.c:26 admin/groups/apps/app_list.tpl.c:38
+#: admin/groups/apps/app_list.tpl.c:50
+msgid "Move down"
+msgstr "Mover abajo"
+
+#: admin/groups/apps/app_list.tpl.c:32 admin/groups/apps/app_list.tpl.c:56
+msgid "Edit"
+msgstr "Editar"
+
+#: admin/groups/apps/app_list.tpl.c:44
+msgid "Entry"
+msgstr "Entrada"
+
+#: admin/groups/apps/app_list.tpl.c:59
+msgid "add to"
+msgstr "AÃ±adir a"
+
+#: admin/groups/apps/app_list.tpl.c:62
+msgid "Add selected category to this folder.."
 msgstr ""
 
-#: config/applications/class_applicationsPluginConfig.inc:56
-msgid "All"
-msgstr "Todo"
+#: admin/groups/apps/app_list.tpl.c:65
+msgid "Separator"
+msgstr "Separador"
+
+#: admin/groups/apps/app_list.tpl.c:68
+msgid "Add a separator to this folder."
+msgstr "AÃ±adir un separador a esta carpeta."
+
+#: admin/groups/apps/app_list.tpl.c:71
+msgid "Add selected applications to this folder."
+msgstr "AÃ±adir la aplicaciÃ³n seleccionada a esta carpeta."
+
+#: admin/mimetypes/generic.tpl.c:8
+msgid "Please enter a name for the mime type here"
+msgstr "Por favor introduzca un nombre para el tipo mime valido"
+
+#: admin/mimetypes/generic.tpl.c:14
+msgid "Categorize this mime type"
+msgstr "Categorizar este tipo mime"
+
+#: admin/mimetypes/generic.tpl.c:20
+msgid "Please specify a description"
+msgstr "Por favor introduzca una descripciÃ³n"
+
+#: admin/mimetypes/generic.tpl.c:26
+msgid "Choose subtree to place application in"
+msgstr "Elija lugar del Ã¡rbol donde colocar la aplicaciÃ³n"
+
+#: admin/mimetypes/generic.tpl.c:29
+msgid "Select a base"
+msgstr "Seleccione una base"
+
+#: admin/mimetypes/generic.tpl.c:35 admin/mimetypes/generic.tpl.c:38
+msgid "Mime icon"
+msgstr "Icono Mime"
+
+#: admin/mimetypes/generic.tpl.c:41
+msgid "Update"
+msgstr "Actualizar"
+
+#: admin/mimetypes/generic.tpl.c:44
+msgid "Update mime type icon"
+msgstr "Actualizar icono de tipo mime"
+
+#: admin/mimetypes/generic.tpl.c:47 admin/mimetypes/generic.tpl.c:50
+msgid "Left click"
+msgstr "BotÃ³n izquierdo"
+
+#: admin/mimetypes/generic.tpl.c:56
+msgid "Please specify a new file pattern"
+msgstr "Por favor introduzca un nuevo patrÃ³n de archivo"
+
+#: admin/mimetypes/generic.tpl.c:59
+msgid "Add a new file pattern"
+msgstr "AÃ±adir nuevo patrÃ³n de archivo"
+
+#: admin/mimetypes/generic.tpl.c:65 admin/mimetypes/generic.tpl.c:89
+msgid "Enter an application name here"
+msgstr "Introduzca un nombre de la aplicaciÃ³n aquÃ"
+
+#: admin/mimetypes/generic.tpl.c:68 admin/mimetypes/generic.tpl.c:92
+msgid "Add application"
+msgstr "AÃ±adir aplicaciÃ³n"
+
+#: admin/mimetypes/generic.tpl.c:71 admin/mimetypes/generic.tpl.c:74
+msgid "Embedding"
+msgstr "Embebido"
+
+#: admin/mimetypes/generic.tpl.c:77
+msgid "Show file in embedded viewer"
+msgstr "Mostrar archivo en un visor interno"
+
+#: admin/mimetypes/generic.tpl.c:80
+msgid "Show file in external viewer"
+msgstr "Mostrar archivo en un visor externo"
+
+#: admin/mimetypes/generic.tpl.c:83
+msgid "Ask whether to save to local disk"
+msgstr "Para saber si graba al disco local"
diff --git a/applications/locale/fa_IR/fusiondirectory.po b/applications/locale/fa_IR/fusiondirectory.po
index 3b95845b3e949b3be72a9f0b8d0d7bdde8326a3d..59d9d62d92669d5de8ab27cffff0d240e56e9b49 100644
--- a/applications/locale/fa_IR/fusiondirectory.po
+++ b/applications/locale/fa_IR/fusiondirectory.po
@@ -5,219 +5,497 @@
 # Translators:
 msgid ""
 msgstr ""
-"Project-Id-Version: FusionDirectory-108\n"
+"Project-Id-Version: FusionDirectory-109\n"
 "Report-Msgid-Bugs-To: documentation@lists.fusiondirectory.org\n"
-"POT-Creation-Date: 2015-03-19 21:45+0100\n"
-"PO-Revision-Date: 2014-12-12 07:34+0000\n"
-"Last-Translator: fusiondirectory <contact@fusiondirectory.org>\n"
-"Language-Team: Persian (Iran) (http://www.transifex.com/projects/p/FusionDirectory-108/language/fa_IR/)\n"
+"POT-Creation-Date: 2014-08-28 12:26+0200\n"
+"PO-Revision-Date: 2014-08-28 10:28+0000\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: Persian (Iran) (http://www.transifex.com/projects/p/FusionDirectory-109/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/groups/apps/class_groupApplication.inc:410
+#: admin/groups/apps/class_groupApplication.inc:414
+msgid "Menu"
+msgstr ""
+
+#: admin/groups/apps/class_groupApplication.inc:482
+msgid "Back"
+msgstr ""
+
+#: admin/groups/apps/class_groupApplication.inc:493
+msgid "back"
+msgstr ""
+
+#: admin/groups/apps/class_groupApplication.inc:501
+msgid "department"
+msgstr ""
+
+#: admin/groups/apps/class_groupApplication.inc:524
+msgid "application"
+msgstr ""
+
+#: admin/groups/apps/class_groupApplication.inc:701
+#: admin/groups/apps/class_groupApplication.inc:1396
+#: admin/groups/apps/class_groupApplication.inc:1409
+#: admin/groups/apps/class_groupApplication.inc:1422
+#: admin/mimetypes/class_mimetypeGeneric.inc:481
+#: admin/mimetypes/class_mimetypeGeneric.inc:493
+#: admin/mimetypes/class_mimetypeGeneric.inc:508
+#: admin/applications/class_applicationParameters.inc:177
+#: admin/applications/class_applicationParameters.inc:242
+#: admin/applications/class_applicationGeneric.inc:290
+msgid "LDAP error"
+msgstr "Ø®Ø·Ø§ÛŒ LDAP"
+
+#: admin/groups/apps/class_groupApplication.inc:1208
+msgid "Not available in release."
+msgstr ""
+
+#: admin/groups/apps/class_groupApplication.inc:1459
 #: 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
+#: admin/mimetypes/generic.tpl.c:62 admin/mimetypes/generic.tpl.c:86
 msgid "Applications"
 msgstr ""
 
+#: admin/groups/apps/class_groupApplication.inc:1460
+msgid "Group applications"
+msgstr ""
+
+#: admin/groups/apps/class_groupApplication.inc:1466
+#: admin/mimetypes/class_mimetypeGeneric.inc:689
+#: admin/applications/class_applicationGeneric.inc:73
+msgid "Application"
+msgstr ""
+
+#: admin/groups/apps/class_groupApplication.inc:1467
+#: admin/groups/apps/app_list.tpl.c:2 admin/groups/apps/app_list.tpl.c:14
+msgid "Release"
+msgstr ""
+
+#: admin/groups/apps/class_groupApplication.inc:1468
+msgid "Application parameter"
+msgstr ""
+
+#: admin/groups/apps/class_groupApplication.inc:1469
+#: admin/applications/class_applicationGeneric.inc:135
+#: admin/groups/apps/edit_entry.tpl.c:32
+msgid "Place icon on members desktop"
+msgstr ""
+
+#: admin/groups/apps/class_groupApplication.inc:1470
+#: admin/applications/class_applicationGeneric.inc:145
+#: admin/groups/apps/edit_entry.tpl.c:38
+msgid "Place entry in members launch bar"
+msgstr ""
+
+#: admin/groups/apps/class_groupApplication.inc:1471
+#: admin/applications/class_applicationGeneric.inc:140
+#: admin/groups/apps/edit_entry.tpl.c:35
+msgid "Place entry in members startmenu"
+msgstr ""
+
+#: admin/mimetypes/class_mimetypeManagement.inc:28
+#: admin/mimetypes/class_mimetypeGeneric.inc:674
+msgid "Mime types"
+msgstr ""
+
+#: admin/mimetypes/class_mimetypeManagement.inc:29
+msgid "Mime type management"
+msgstr ""
+
+#: admin/mimetypes/class_mimetypeGeneric.inc:519
+#: admin/mimetypes/class_mimetypeGeneric.inc:685
+#: admin/applications/class_applicationParameters.inc:208
+#: admin/applications/class_applicationParameters.inc:212
+#: admin/groups/apps/edit_entry.tpl.c:26
+msgid "Name"
+msgstr ""
+
+#: admin/mimetypes/class_mimetypeGeneric.inc:522
+msgid "File pattern"
+msgstr ""
+
+#: admin/mimetypes/class_mimetypeGeneric.inc:671
+#: admin/applications/class_applicationGeneric.inc:69
+#: admin/mimetypes/generic.tpl.c:2
+msgid "Generic"
+msgstr ""
+
+#: admin/mimetypes/class_mimetypeGeneric.inc:672
+msgid "Mime type generic"
+msgstr ""
+
+#: admin/mimetypes/class_mimetypeGeneric.inc:678
+#: admin/mimetypes/generic.tpl.c:5
+msgid "Mime type"
+msgstr ""
+
+#: admin/mimetypes/class_mimetypeGeneric.inc:686
+#: admin/mimetypes/generic.tpl.c:11
+msgid "Mime group"
+msgstr ""
+
+#: admin/mimetypes/class_mimetypeGeneric.inc:687
+#: admin/applications/class_applicationGeneric.inc:105
+#: admin/mimetypes/generic.tpl.c:17
+msgid "Description"
+msgstr ""
+
+#: admin/mimetypes/class_mimetypeGeneric.inc:688
+#: admin/mimetypes/generic.tpl.c:23
+msgid "Base"
+msgstr ""
+
+#: admin/mimetypes/class_mimetypeGeneric.inc:690
+msgid "Left click action"
+msgstr ""
+
+#: admin/mimetypes/class_mimetypeGeneric.inc:691
+#: admin/applications/class_applicationGeneric.inc:112
+#: admin/mimetypes/generic.tpl.c:32
+msgid "Icon"
+msgstr ""
+
+#: admin/mimetypes/class_mimetypeGeneric.inc:692
+#: admin/mimetypes/generic.tpl.c:53
+msgid "File patterns"
+msgstr ""
+
+#: admin/mimetypes/class_mimetypeGeneric.inc:693
+msgid "Embedded applications"
+msgstr ""
+
 #: admin/applications/class_applicationManagement.inc:29
 msgid "Application management"
 msgstr ""
 
-#: admin/applications/class_applicationManagement.inc:100
-msgid "Web applications"
+#: admin/applications/class_applicationParameters.inc:71
+msgid "Remove options"
 msgstr ""
 
-#: admin/applications/class_applicationGeneric.inc:31
-#: admin/applications/class_applicationGeneric.inc:34
-#: admin/applications/class_applicationGeneric.inc:48
-#: admin/applications/class_webApplication.inc:47
-msgid "Application"
+#: admin/applications/class_applicationParameters.inc:71
+#: admin/applications/class_applicationParameters.inc:73
+msgid "parameter"
 msgstr ""
 
-#: admin/applications/class_applicationGeneric.inc:32
-msgid "Application information"
+#: admin/applications/class_applicationParameters.inc:73
+msgid "Create options"
 msgstr ""
 
-#: admin/applications/class_applicationGeneric.inc:52
-msgid "Application name"
+#: admin/applications/class_applicationParameters.inc:115
+msgid "Variable"
 msgstr ""
 
-#: admin/applications/class_applicationGeneric.inc:52
-msgid "The name of this application"
+#: admin/applications/class_applicationParameters.inc:115
+msgid "Default value"
 msgstr ""
 
-#: admin/applications/class_applicationGeneric.inc:56
-#: admin/applications/class_webApplication.inc:55
-msgid "Description"
+#: admin/applications/class_applicationParameters.inc:141
+#: admin/groups/apps/app_list.tpl.c:29 admin/groups/apps/app_list.tpl.c:41
+#: admin/groups/apps/app_list.tpl.c:53
+msgid "Remove"
 msgstr ""
 
-#: admin/applications/class_applicationGeneric.inc:56
-#: admin/applications/class_webApplication.inc:55
-msgid "A short description of this application"
+#: admin/applications/class_applicationParameters.inc:147
+msgid "Add option"
 msgstr ""
 
-#: admin/applications/class_applicationGeneric.inc:60
-msgid "Execute"
+#: admin/applications/class_applicationParameters.inc:265
+msgid "Parameter"
 msgstr ""
 
-#: admin/applications/class_applicationGeneric.inc:60
-msgid "The application to be executed"
+#: admin/applications/class_applicationParameters.inc:266
+msgid "Parameter configuration"
+msgstr ""
+
+#: admin/applications/class_applicationParameters.inc:271
+msgid "Application parameter settings"
+msgstr ""
+
+#: admin/applications/class_applicationGeneric.inc:70
+msgid "Application generic"
+msgstr ""
+
+#: admin/applications/class_applicationGeneric.inc:90
+msgid "Properties"
+msgstr ""
+
+#: admin/applications/class_applicationGeneric.inc:93
+msgid "Application name"
+msgstr ""
+
+#: admin/applications/class_applicationGeneric.inc:93
+msgid "The name of this application"
 msgstr ""
 
-#: admin/applications/class_applicationGeneric.inc:64
+#: admin/applications/class_applicationGeneric.inc:97
 msgid "Display name"
 msgstr ""
 
-#: admin/applications/class_applicationGeneric.inc:64
+#: admin/applications/class_applicationGeneric.inc:97
 msgid "The displayed name for this application"
 msgstr ""
 
-#: admin/applications/class_applicationGeneric.inc:70
-#: admin/applications/class_webApplication.inc:69
-msgid "Icon"
+#: admin/applications/class_applicationGeneric.inc:101
+msgid "Execute"
 msgstr ""
 
-#: admin/applications/class_applicationGeneric.inc:73
-#: admin/applications/class_webApplication.inc:72
+#: admin/applications/class_applicationGeneric.inc:101
+msgid "The application to be executed"
+msgstr ""
+
+#: admin/applications/class_applicationGeneric.inc:105
+msgid "A short description of this application"
+msgstr ""
+
+#: admin/applications/class_applicationGeneric.inc:115
 msgid "The icon for this application"
 msgstr ""
 
-#: admin/applications/class_applicationGeneric.inc:80
+#: admin/applications/class_applicationGeneric.inc:122
 msgid "Options"
 msgstr ""
 
-#: admin/applications/class_applicationGeneric.inc:83
+#: admin/applications/class_applicationGeneric.inc:125
 msgid "Only executable for member"
 msgstr ""
 
-#: admin/applications/class_applicationGeneric.inc:83
+#: admin/applications/class_applicationGeneric.inc:125
 msgid "Only executable by the memebers of the group"
 msgstr ""
 
-#: admin/applications/class_applicationGeneric.inc:88
+#: admin/applications/class_applicationGeneric.inc:130
 msgid "Replace user configuration on startup"
 msgstr ""
 
-#: admin/applications/class_applicationGeneric.inc:88
+#: admin/applications/class_applicationGeneric.inc:130
 msgid "Replace the user configuration on startup"
 msgstr ""
 
-#: admin/applications/class_applicationGeneric.inc:93
-msgid "Place icon on members desktop"
+#: admin/applications/class_applicationGeneric.inc:135
+msgid "Put an icon on the user desktop"
 msgstr ""
 
-#: admin/applications/class_applicationGeneric.inc:93
-msgid "Put an icon on the user desktop"
+#: admin/applications/class_applicationGeneric.inc:140
+#: admin/applications/class_applicationGeneric.inc:145
+msgid "Put an entry in the startup menu"
 msgstr ""
 
-#: admin/applications/class_applicationGeneric.inc:98
-msgid "Place entry in members startmenu"
+#: admin/applications/class_applicationGeneric.inc:156
+msgid "Script"
 msgstr ""
 
-#: admin/applications/class_applicationGeneric.inc:98
-#: admin/applications/class_applicationGeneric.inc:103
-msgid "Put an entry in the startup menu"
+#: admin/applications/class_applicationGeneric.inc:159
+msgid "Script to run at logon"
 msgstr ""
 
-#: admin/applications/class_applicationGeneric.inc:103
-msgid "Place entry in members launch bar"
+#: admin/applications/class_applicationGeneric.inc:165
+msgid "Log off script"
 msgstr ""
 
-#: admin/applications/class_webApplication.inc:30
-#: admin/applications/class_webApplication.inc:33
-msgid "Web application"
+#: admin/applications/class_applicationGeneric.inc:168
+msgid "Script to run at logoff"
 msgstr ""
 
-#: admin/applications/class_webApplication.inc:31
-msgid "Web applicationts names, icons and links"
+#: admin/applications/class_applicationGeneric.inc:227
+msgid "no example"
 msgstr ""
 
-#: admin/applications/class_webApplication.inc:51
-msgid "Name"
+#: admin/applications/class_applicationGeneric.inc:276
+msgid "Error"
+msgstr "Ø®Ø·Ø§"
+
+#: admin/applications/class_applicationGeneric.inc:276
+#, php-format
+msgid "Cannot remove application - it is still in use by these objects: %s"
 msgstr ""
 
-#: admin/applications/class_webApplication.inc:51
-msgid "Name or id for application"
+#: config/desktop-management/class_desktopPluginConfig.inc:28
+msgid "Desktop management"
 msgstr ""
 
-#: admin/applications/class_webApplication.inc:59
-msgid "URL"
+#: config/desktop-management/class_desktopPluginConfig.inc:29
+msgid "Desktop management plugin configuration"
 msgstr ""
 
-#: admin/applications/class_webApplication.inc:59
-msgid "Link to this application"
+#: config/desktop-management/class_desktopPluginConfig.inc:40
+msgid "LDAP tree"
 msgstr ""
 
-#: admin/applications/class_webApplication.inc:63
-msgid "Display Name"
+#: config/desktop-management/class_desktopPluginConfig.inc:43
+msgid "Mimetype RDN"
 msgstr ""
 
-#: admin/applications/class_webApplication.inc:63
-msgid "Displayed name for links to this application"
+#: config/desktop-management/class_desktopPluginConfig.inc:43
+msgid "Branch in which mime types will be stored"
 msgstr ""
 
-#: admin/applications/class_webApplication.inc:77
-msgid "Icon location"
+#: config/desktop-management/class_desktopPluginConfig.inc:48
+msgid "Application RDN"
 msgstr ""
 
-#: admin/applications/class_webApplication.inc:77
-msgid "Usual path to this application icon"
+#: config/desktop-management/class_desktopPluginConfig.inc:48
+msgid "Branch in which applications will be stored"
 msgstr ""
 
-#: admin/roles/class_applicationRights.inc:31
-msgid "Applications allowed for this role"
+#: admin/groups/apps/edit_entry.tpl.c:2
+msgid "Folder image"
 msgstr ""
 
-#: admin/roles/class_applicationRights.inc:45
-msgid "Application list"
+#: admin/groups/apps/edit_entry.tpl.c:5
+msgid "Could not load image."
 msgstr ""
 
-#: admin/roles/class_applicationRights.inc:49
-msgid "The applications users with this role are allowed to launch"
+#: admin/groups/apps/edit_entry.tpl.c:8
+msgid "None"
 msgstr ""
 
-#: config/applications/class_applicationsPluginConfig.inc:29
-msgid "Applications plugin configuration"
+#: admin/groups/apps/edit_entry.tpl.c:11
+msgid "Upload image"
 msgstr ""
 
-#: config/applications/class_applicationsPluginConfig.inc:43
-msgid "Application RDN"
+#: admin/groups/apps/edit_entry.tpl.c:14
+msgid "Upload"
 msgstr ""
 
-#: config/applications/class_applicationsPluginConfig.inc:43
-msgid "Branch in which applications will be stored"
+#: admin/groups/apps/edit_entry.tpl.c:17
+msgid "Reset image"
 msgstr ""
 
-#: config/applications/class_applicationsPluginConfig.inc:48
-msgid "Web applications RDN"
+#: admin/groups/apps/edit_entry.tpl.c:20
+msgid "Reset"
 msgstr ""
 
-#: config/applications/class_applicationsPluginConfig.inc:48
-msgid "Branch in which web applications will be stored"
+#: admin/groups/apps/edit_entry.tpl.c:23
+msgid "Application settings"
 msgstr ""
 
-#: config/applications/class_applicationsPluginConfig.inc:53
-msgid "Show web applications in menu"
+#: admin/groups/apps/edit_entry.tpl.c:29
+msgid "Application options"
 msgstr ""
 
-#: config/applications/class_applicationsPluginConfig.inc:53
-msgid "Whether to show web applications in FD main menu"
+#: admin/groups/apps/app_list.tpl.c:5
+msgid "Copy menu"
 msgstr ""
 
-#: config/applications/class_applicationsPluginConfig.inc:56
-msgid "None"
+#: admin/groups/apps/app_list.tpl.c:8
+msgid "Paste menu from"
+msgstr ""
+
+#: admin/groups/apps/app_list.tpl.c:11
+msgid "Delete menu"
+msgstr ""
+
+#: admin/groups/apps/app_list.tpl.c:17 admin/groups/apps/app_list.tpl.c:20
+msgid "Folder"
+msgstr ""
+
+#: admin/groups/apps/app_list.tpl.c:23 admin/groups/apps/app_list.tpl.c:35
+#: admin/groups/apps/app_list.tpl.c:47
+msgid "Move up"
+msgstr ""
+
+#: admin/groups/apps/app_list.tpl.c:26 admin/groups/apps/app_list.tpl.c:38
+#: admin/groups/apps/app_list.tpl.c:50
+msgid "Move down"
+msgstr ""
+
+#: admin/groups/apps/app_list.tpl.c:32 admin/groups/apps/app_list.tpl.c:56
+msgid "Edit"
+msgstr ""
+
+#: admin/groups/apps/app_list.tpl.c:44
+msgid "Entry"
+msgstr ""
+
+#: admin/groups/apps/app_list.tpl.c:59
+msgid "add to"
+msgstr ""
+
+#: admin/groups/apps/app_list.tpl.c:62
+msgid "Add selected category to this folder.."
+msgstr ""
+
+#: admin/groups/apps/app_list.tpl.c:65
+msgid "Separator"
+msgstr ""
+
+#: admin/groups/apps/app_list.tpl.c:68
+msgid "Add a separator to this folder."
+msgstr ""
+
+#: admin/groups/apps/app_list.tpl.c:71
+msgid "Add selected applications to this folder."
+msgstr ""
+
+#: admin/mimetypes/generic.tpl.c:8
+msgid "Please enter a name for the mime type here"
+msgstr ""
+
+#: admin/mimetypes/generic.tpl.c:14
+msgid "Categorize this mime type"
+msgstr ""
+
+#: admin/mimetypes/generic.tpl.c:20
+msgid "Please specify a description"
+msgstr ""
+
+#: admin/mimetypes/generic.tpl.c:26
+msgid "Choose subtree to place application in"
+msgstr ""
+
+#: admin/mimetypes/generic.tpl.c:29
+msgid "Select a base"
+msgstr ""
+
+#: admin/mimetypes/generic.tpl.c:35 admin/mimetypes/generic.tpl.c:38
+msgid "Mime icon"
+msgstr ""
+
+#: admin/mimetypes/generic.tpl.c:41
+msgid "Update"
+msgstr ""
+
+#: admin/mimetypes/generic.tpl.c:44
+msgid "Update mime type icon"
+msgstr ""
+
+#: admin/mimetypes/generic.tpl.c:47 admin/mimetypes/generic.tpl.c:50
+msgid "Left click"
+msgstr ""
+
+#: admin/mimetypes/generic.tpl.c:56
+msgid "Please specify a new file pattern"
+msgstr ""
+
+#: admin/mimetypes/generic.tpl.c:59
+msgid "Add a new file pattern"
+msgstr ""
+
+#: admin/mimetypes/generic.tpl.c:65 admin/mimetypes/generic.tpl.c:89
+msgid "Enter an application name here"
+msgstr ""
+
+#: admin/mimetypes/generic.tpl.c:68 admin/mimetypes/generic.tpl.c:92
+msgid "Add application"
+msgstr ""
+
+#: admin/mimetypes/generic.tpl.c:71 admin/mimetypes/generic.tpl.c:74
+msgid "Embedding"
+msgstr ""
+
+#: admin/mimetypes/generic.tpl.c:77
+msgid "Show file in embedded viewer"
 msgstr ""
 
-#: config/applications/class_applicationsPluginConfig.inc:56
-msgid "Only allowed"
+#: admin/mimetypes/generic.tpl.c:80
+msgid "Show file in external viewer"
 msgstr ""
 
-#: config/applications/class_applicationsPluginConfig.inc:56
-msgid "All"
+#: admin/mimetypes/generic.tpl.c:83
+msgid "Ask whether to save to local disk"
 msgstr ""
diff --git a/applications/locale/fr/fusiondirectory.po b/applications/locale/fr/fusiondirectory.po
index 7436124af4b977379d8be3ec79976ba0cca8bbf6..78369ed121b5d3f190fe5093c29f294f284539fc 100644
--- a/applications/locale/fr/fusiondirectory.po
+++ b/applications/locale/fr/fusiondirectory.po
@@ -3,223 +3,501 @@
 # This file is distributed under the same license as the PACKAGE package.
 # 
 # Translators:
-# MCMic, 2014
-# MCMic, 2014
+# Ã‰ric Deschamps <erdesc@free.fr>, 2013
+# Ã‰ric Deschamps <erdesc@free.fr>, 2013
 msgid ""
 msgstr ""
-"Project-Id-Version: FusionDirectory-108\n"
+"Project-Id-Version: FusionDirectory-109\n"
 "Report-Msgid-Bugs-To: documentation@lists.fusiondirectory.org\n"
-"POT-Creation-Date: 2015-03-19 21:45+0100\n"
-"PO-Revision-Date: 2015-02-25 16:12+0000\n"
-"Last-Translator: MCMic\n"
-"Language-Team: French (http://www.transifex.com/projects/p/FusionDirectory-108/language/fr/)\n"
+"POT-Creation-Date: 2014-08-28 12:26+0200\n"
+"PO-Revision-Date: 2015-02-25 16:13+0000\n"
+"Last-Translator: fusiondirectory <contact@fusiondirectory.org>\n"
+"Language-Team: French (http://www.transifex.com/projects/p/FusionDirectory-109/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/groups/apps/class_groupApplication.inc:410
+#: admin/groups/apps/class_groupApplication.inc:414
+msgid "Menu"
+msgstr "Menu"
+
+#: admin/groups/apps/class_groupApplication.inc:482
+msgid "Back"
+msgstr "Retour"
+
+#: admin/groups/apps/class_groupApplication.inc:493
+msgid "back"
+msgstr "retour"
+
+#: admin/groups/apps/class_groupApplication.inc:501
+msgid "department"
+msgstr "dÃ©partement"
+
+#: admin/groups/apps/class_groupApplication.inc:524
+msgid "application"
+msgstr "application"
+
+#: admin/groups/apps/class_groupApplication.inc:701
+#: admin/groups/apps/class_groupApplication.inc:1396
+#: admin/groups/apps/class_groupApplication.inc:1409
+#: admin/groups/apps/class_groupApplication.inc:1422
+#: admin/mimetypes/class_mimetypeGeneric.inc:481
+#: admin/mimetypes/class_mimetypeGeneric.inc:493
+#: admin/mimetypes/class_mimetypeGeneric.inc:508
+#: admin/applications/class_applicationParameters.inc:177
+#: admin/applications/class_applicationParameters.inc:242
+#: admin/applications/class_applicationGeneric.inc:290
+msgid "LDAP error"
+msgstr "Erreur LDAP"
+
+#: admin/groups/apps/class_groupApplication.inc:1208
+msgid "Not available in release."
+msgstr "Non disponible dans cette version."
+
+#: admin/groups/apps/class_groupApplication.inc:1459
 #: 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
+#: admin/mimetypes/generic.tpl.c:62 admin/mimetypes/generic.tpl.c:86
 msgid "Applications"
 msgstr "Applications"
 
+#: admin/groups/apps/class_groupApplication.inc:1460
+msgid "Group applications"
+msgstr "Groupe d'applications"
+
+#: admin/groups/apps/class_groupApplication.inc:1466
+#: admin/mimetypes/class_mimetypeGeneric.inc:689
+#: admin/applications/class_applicationGeneric.inc:73
+msgid "Application"
+msgstr "Applications"
+
+#: admin/groups/apps/class_groupApplication.inc:1467
+#: admin/groups/apps/app_list.tpl.c:2 admin/groups/apps/app_list.tpl.c:14
+msgid "Release"
+msgstr "Version"
+
+#: admin/groups/apps/class_groupApplication.inc:1468
+msgid "Application parameter"
+msgstr "ParamÃ¨tre de l'application"
+
+#: admin/groups/apps/class_groupApplication.inc:1469
+#: admin/applications/class_applicationGeneric.inc:135
+#: admin/groups/apps/edit_entry.tpl.c:32
+msgid "Place icon on members desktop"
+msgstr "Placer une icÃ´ne sur le bureau des membres"
+
+#: admin/groups/apps/class_groupApplication.inc:1470
+#: admin/applications/class_applicationGeneric.inc:145
+#: admin/groups/apps/edit_entry.tpl.c:38
+msgid "Place entry in members launch bar"
+msgstr "Placer une entrÃ©e dans le menu dÃ©marrage des membres"
+
+#: admin/groups/apps/class_groupApplication.inc:1471
+#: admin/applications/class_applicationGeneric.inc:140
+#: admin/groups/apps/edit_entry.tpl.c:35
+msgid "Place entry in members startmenu"
+msgstr "Placer une entrÃ©e dans le menu dÃ©marrage des membres"
+
+#: admin/mimetypes/class_mimetypeManagement.inc:28
+#: admin/mimetypes/class_mimetypeGeneric.inc:674
+msgid "Mime types"
+msgstr "Types mime"
+
+#: admin/mimetypes/class_mimetypeManagement.inc:29
+msgid "Mime type management"
+msgstr "Gestion des types Mime"
+
+#: admin/mimetypes/class_mimetypeGeneric.inc:519
+#: admin/mimetypes/class_mimetypeGeneric.inc:685
+#: admin/applications/class_applicationParameters.inc:208
+#: admin/applications/class_applicationParameters.inc:212
+#: admin/groups/apps/edit_entry.tpl.c:26
+msgid "Name"
+msgstr "Nom"
+
+#: admin/mimetypes/class_mimetypeGeneric.inc:522
+msgid "File pattern"
+msgstr "Filtres des fichiers"
+
+#: admin/mimetypes/class_mimetypeGeneric.inc:671
+#: admin/applications/class_applicationGeneric.inc:69
+#: admin/mimetypes/generic.tpl.c:2
+msgid "Generic"
+msgstr "GÃ©nÃ©rique"
+
+#: admin/mimetypes/class_mimetypeGeneric.inc:672
+msgid "Mime type generic"
+msgstr "Information sur les types mime"
+
+#: admin/mimetypes/class_mimetypeGeneric.inc:678
+#: admin/mimetypes/generic.tpl.c:5
+msgid "Mime type"
+msgstr "Type mime"
+
+#: admin/mimetypes/class_mimetypeGeneric.inc:686
+#: admin/mimetypes/generic.tpl.c:11
+msgid "Mime group"
+msgstr "Groupe de type mime"
+
+#: admin/mimetypes/class_mimetypeGeneric.inc:687
+#: admin/applications/class_applicationGeneric.inc:105
+#: admin/mimetypes/generic.tpl.c:17
+msgid "Description"
+msgstr "Description"
+
+#: admin/mimetypes/class_mimetypeGeneric.inc:688
+#: admin/mimetypes/generic.tpl.c:23
+msgid "Base"
+msgstr "Base"
+
+#: admin/mimetypes/class_mimetypeGeneric.inc:690
+msgid "Left click action"
+msgstr "Clic gauche"
+
+#: admin/mimetypes/class_mimetypeGeneric.inc:691
+#: admin/applications/class_applicationGeneric.inc:112
+#: admin/mimetypes/generic.tpl.c:32
+msgid "Icon"
+msgstr "IcÃ´ne"
+
+#: admin/mimetypes/class_mimetypeGeneric.inc:692
+#: admin/mimetypes/generic.tpl.c:53
+msgid "File patterns"
+msgstr "Filtres des fichiers"
+
+#: admin/mimetypes/class_mimetypeGeneric.inc:693
+msgid "Embedded applications"
+msgstr "Applications IncorporÃ©es"
+
 #: admin/applications/class_applicationManagement.inc:29
 msgid "Application management"
 msgstr "Gestion des applications"
 
-#: admin/applications/class_applicationManagement.inc:100
-msgid "Web applications"
-msgstr "Applications web"
+#: admin/applications/class_applicationParameters.inc:71
+msgid "Remove options"
+msgstr "Supprimer les options"
 
-#: admin/applications/class_applicationGeneric.inc:31
-#: admin/applications/class_applicationGeneric.inc:34
-#: admin/applications/class_applicationGeneric.inc:48
-#: admin/applications/class_webApplication.inc:47
-msgid "Application"
-msgstr "Application"
+#: admin/applications/class_applicationParameters.inc:71
+#: admin/applications/class_applicationParameters.inc:73
+msgid "parameter"
+msgstr "paramÃ¨tre"
+
+#: admin/applications/class_applicationParameters.inc:73
+msgid "Create options"
+msgstr "CrÃ©er des options"
+
+#: admin/applications/class_applicationParameters.inc:115
+msgid "Variable"
+msgstr "Variable"
+
+#: admin/applications/class_applicationParameters.inc:115
+msgid "Default value"
+msgstr "Valeur par dÃ©faut"
+
+#: admin/applications/class_applicationParameters.inc:141
+#: admin/groups/apps/app_list.tpl.c:29 admin/groups/apps/app_list.tpl.c:41
+#: admin/groups/apps/app_list.tpl.c:53
+msgid "Remove"
+msgstr "Supprimer"
+
+#: admin/applications/class_applicationParameters.inc:147
+msgid "Add option"
+msgstr "Ajouter une option"
 
-#: admin/applications/class_applicationGeneric.inc:32
-msgid "Application information"
-msgstr "Information de lâ€™application"
+#: admin/applications/class_applicationParameters.inc:265
+msgid "Parameter"
+msgstr "ParamÃ¨tres"
 
-#: admin/applications/class_applicationGeneric.inc:52
+#: admin/applications/class_applicationParameters.inc:266
+msgid "Parameter configuration"
+msgstr "Configuration des paramÃ¨tres"
+
+#: admin/applications/class_applicationParameters.inc:271
+msgid "Application parameter settings"
+msgstr "PrÃ©fÃ©rences de l'application"
+
+#: admin/applications/class_applicationGeneric.inc:70
+msgid "Application generic"
+msgstr "Information des applications"
+
+#: admin/applications/class_applicationGeneric.inc:90
+msgid "Properties"
+msgstr "PropriÃ©tÃ©s"
+
+#: admin/applications/class_applicationGeneric.inc:93
 msgid "Application name"
 msgstr "Nom de l'application"
 
-#: admin/applications/class_applicationGeneric.inc:52
+#: admin/applications/class_applicationGeneric.inc:93
 msgid "The name of this application"
 msgstr "Le nom de cette application"
 
-#: admin/applications/class_applicationGeneric.inc:56
-#: admin/applications/class_webApplication.inc:55
-msgid "Description"
-msgstr "Description"
+#: admin/applications/class_applicationGeneric.inc:97
+msgid "Display name"
+msgstr "Nom d'affichage"
 
-#: admin/applications/class_applicationGeneric.inc:56
-#: admin/applications/class_webApplication.inc:55
-msgid "A short description of this application"
-msgstr "Une courte description de cette application"
+#: admin/applications/class_applicationGeneric.inc:97
+msgid "The displayed name for this application"
+msgstr "Le nom affichÃ© pour cette application"
 
-#: admin/applications/class_applicationGeneric.inc:60
+#: admin/applications/class_applicationGeneric.inc:101
 msgid "Execute"
 msgstr "ExÃ©cuter"
 
-#: admin/applications/class_applicationGeneric.inc:60
+#: admin/applications/class_applicationGeneric.inc:101
 msgid "The application to be executed"
-msgstr "L'application Ã  exÃ©cuter"
-
-#: admin/applications/class_applicationGeneric.inc:64
-msgid "Display name"
-msgstr "Nom d'affichage"
-
-#: admin/applications/class_applicationGeneric.inc:64
-msgid "The displayed name for this application"
-msgstr "Le nom affichÃ© pour cette application"
+msgstr "L'application a Ãªtre exÃ©cutÃ©"
 
-#: admin/applications/class_applicationGeneric.inc:70
-#: admin/applications/class_webApplication.inc:69
-msgid "Icon"
-msgstr "IcÃ´ne"
+#: admin/applications/class_applicationGeneric.inc:105
+msgid "A short description of this application"
+msgstr "Une courte description de cette application"
 
-#: admin/applications/class_applicationGeneric.inc:73
-#: admin/applications/class_webApplication.inc:72
+#: admin/applications/class_applicationGeneric.inc:115
 msgid "The icon for this application"
 msgstr "Lâ€™icÃ´ne pour cette application"
 
-#: admin/applications/class_applicationGeneric.inc:80
+#: admin/applications/class_applicationGeneric.inc:122
 msgid "Options"
 msgstr "Options"
 
-#: admin/applications/class_applicationGeneric.inc:83
+#: admin/applications/class_applicationGeneric.inc:125
 msgid "Only executable for member"
 msgstr "ExÃ©cutable uniquement par les membres"
 
-#: admin/applications/class_applicationGeneric.inc:83
+#: admin/applications/class_applicationGeneric.inc:125
 msgid "Only executable by the memebers of the group"
 msgstr "ExÃ©cutable uniquement par les membres"
 
-#: admin/applications/class_applicationGeneric.inc:88
+#: admin/applications/class_applicationGeneric.inc:130
 msgid "Replace user configuration on startup"
 msgstr "Remplacer la configuration de l'utilisateur au dÃ©marrage"
 
-#: admin/applications/class_applicationGeneric.inc:88
+#: admin/applications/class_applicationGeneric.inc:130
 msgid "Replace the user configuration on startup"
 msgstr "Remplacer la configuration de l'utilisateur au dÃ©marrage"
 
-#: admin/applications/class_applicationGeneric.inc:93
-msgid "Place icon on members desktop"
-msgstr "Placer une icÃ´ne sur le bureau des membres"
-
-#: admin/applications/class_applicationGeneric.inc:93
+#: admin/applications/class_applicationGeneric.inc:135
 msgid "Put an icon on the user desktop"
 msgstr "Placer une icÃ´ne sur le bureau de l'utilisateur"
 
-#: admin/applications/class_applicationGeneric.inc:98
-msgid "Place entry in members startmenu"
-msgstr "Placer une entrÃ©e dans le menu dÃ©marrage des membres"
-
-#: admin/applications/class_applicationGeneric.inc:98
-#: admin/applications/class_applicationGeneric.inc:103
+#: admin/applications/class_applicationGeneric.inc:140
+#: admin/applications/class_applicationGeneric.inc:145
 msgid "Put an entry in the startup menu"
 msgstr "Placer une entrÃ©e dans le menu dÃ©marrage"
 
-#: admin/applications/class_applicationGeneric.inc:103
-msgid "Place entry in members launch bar"
-msgstr "Placer une entrÃ©e dans la barre de lancement des membres"
+#: admin/applications/class_applicationGeneric.inc:156
+msgid "Script"
+msgstr "Script"
 
-#: admin/applications/class_webApplication.inc:30
-#: admin/applications/class_webApplication.inc:33
-msgid "Web application"
-msgstr "Application web"
+#: admin/applications/class_applicationGeneric.inc:159
+msgid "Script to run at logon"
+msgstr "Script Ã  exÃ©cuter Ã  la connexion"
 
-#: admin/applications/class_webApplication.inc:31
-msgid "Web applicationts names, icons and links"
-msgstr "Noms, icÃ´nes et liens des applications web"
+#: admin/applications/class_applicationGeneric.inc:165
+msgid "Log off script"
+msgstr "Script de dÃ©connexion"
 
-#: admin/applications/class_webApplication.inc:51
-msgid "Name"
-msgstr "Nom"
-
-#: admin/applications/class_webApplication.inc:51
-msgid "Name or id for application"
-msgstr "Nom ou id de lâ€™application"
-
-#: admin/applications/class_webApplication.inc:59
-msgid "URL"
-msgstr "URL"
+#: admin/applications/class_applicationGeneric.inc:168
+msgid "Script to run at logoff"
+msgstr "Script Ã  exÃ©cuter Ã  la dÃ©connexion"
 
-#: admin/applications/class_webApplication.inc:59
-msgid "Link to this application"
-msgstr "Lien vers lâ€™application"
+#: admin/applications/class_applicationGeneric.inc:227
+msgid "no example"
+msgstr "pas d'exemple"
 
-#: admin/applications/class_webApplication.inc:63
-msgid "Display Name"
-msgstr "Nom Ã  afficher"
+#: admin/applications/class_applicationGeneric.inc:276
+msgid "Error"
+msgstr "Erreur"
 
-#: admin/applications/class_webApplication.inc:63
-msgid "Displayed name for links to this application"
-msgstr "Nom Ã  afficher dans les liens vers cette application"
+#: admin/applications/class_applicationGeneric.inc:276
+#, php-format
+msgid "Cannot remove application - it is still in use by these objects: %s"
+msgstr "Impossible d'enlever l'application ,elle est encore utilisÃ©e par ce(s) objets : %s"
 
-#: admin/applications/class_webApplication.inc:77
-msgid "Icon location"
-msgstr "Chemin de lâ€™icÃ´ne"
+#: config/desktop-management/class_desktopPluginConfig.inc:28
+msgid "Desktop management"
+msgstr "Administration du bureau"
 
-#: admin/applications/class_webApplication.inc:77
-msgid "Usual path to this application icon"
-msgstr "Chemin usuel vers cette icÃ´ne"
+#: config/desktop-management/class_desktopPluginConfig.inc:29
+msgid "Desktop management plugin configuration"
+msgstr "Configuration du plugin d'administration du bureau"
 
-#: admin/roles/class_applicationRights.inc:31
-msgid "Applications allowed for this role"
-msgstr "Applications autorisÃ©es pour ce rÃ´le"
+#: config/desktop-management/class_desktopPluginConfig.inc:40
+msgid "LDAP tree"
+msgstr "Annuaire LDAP"
 
-#: admin/roles/class_applicationRights.inc:45
-msgid "Application list"
-msgstr "List dâ€™applications"
+#: config/desktop-management/class_desktopPluginConfig.inc:43
+msgid "Mimetype RDN"
+msgstr "Chemin relatif des Mimetypes"
 
-#: 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/desktop-management/class_desktopPluginConfig.inc:43
+msgid "Branch in which mime types will be stored"
+msgstr "Branche oÃ¹ seront stockÃ©s les type mime"
 
-#: config/applications/class_applicationsPluginConfig.inc:29
-msgid "Applications plugin configuration"
-msgstr "Configuration du plugin applications"
-
-#: config/applications/class_applicationsPluginConfig.inc:43
+#: config/desktop-management/class_desktopPluginConfig.inc:48
 msgid "Application RDN"
-msgstr "Branche des applications"
+msgstr "RDN pour les applications"
 
-#: config/applications/class_applicationsPluginConfig.inc:43
+#: config/desktop-management/class_desktopPluginConfig.inc:48
 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 "Montrer les applications web dans le menu"
+#: admin/groups/apps/edit_entry.tpl.c:2
+msgid "Folder image"
+msgstr "Dossier image"
 
-#: config/applications/class_applicationsPluginConfig.inc:53
-msgid "Whether to show web applications in FD main menu"
-msgstr "Sâ€™il faut montrer les applications web dans le menu principal de FD"
+#: admin/groups/apps/edit_entry.tpl.c:5
+msgid "Could not load image."
+msgstr "Impossible de charger l'image."
 
-#: config/applications/class_applicationsPluginConfig.inc:56
+#: admin/groups/apps/edit_entry.tpl.c:8
 msgid "None"
 msgstr "Aucun"
 
-#: config/applications/class_applicationsPluginConfig.inc:56
-msgid "Only allowed"
-msgstr "Selon autorisation"
+#: admin/groups/apps/edit_entry.tpl.c:11
+msgid "Upload image"
+msgstr "TÃ©lÃ©charger une image"
+
+#: admin/groups/apps/edit_entry.tpl.c:14
+msgid "Upload"
+msgstr "TÃ©lÃ©charger"
+
+#: admin/groups/apps/edit_entry.tpl.c:17
+msgid "Reset image"
+msgstr "RÃ©initialiser l'image"
+
+#: admin/groups/apps/edit_entry.tpl.c:20
+msgid "Reset"
+msgstr "RÃ©initialiser"
+
+#: admin/groups/apps/edit_entry.tpl.c:23
+msgid "Application settings"
+msgstr "PrÃ©fÃ©rences de l'application"
+
+#: admin/groups/apps/edit_entry.tpl.c:29
+msgid "Application options"
+msgstr "Options des applications"
+
+#: admin/groups/apps/app_list.tpl.c:5
+msgid "Copy menu"
+msgstr "Menu copie"
+
+#: admin/groups/apps/app_list.tpl.c:8
+msgid "Paste menu from"
+msgstr "Coller le menu depuis"
+
+#: admin/groups/apps/app_list.tpl.c:11
+msgid "Delete menu"
+msgstr "Effacer le menu"
+
+#: admin/groups/apps/app_list.tpl.c:17 admin/groups/apps/app_list.tpl.c:20
+msgid "Folder"
+msgstr "Dossier"
+
+#: admin/groups/apps/app_list.tpl.c:23 admin/groups/apps/app_list.tpl.c:35
+#: admin/groups/apps/app_list.tpl.c:47
+msgid "Move up"
+msgstr "En haut"
+
+#: admin/groups/apps/app_list.tpl.c:26 admin/groups/apps/app_list.tpl.c:38
+#: admin/groups/apps/app_list.tpl.c:50
+msgid "Move down"
+msgstr "En bas"
+
+#: admin/groups/apps/app_list.tpl.c:32 admin/groups/apps/app_list.tpl.c:56
+msgid "Edit"
+msgstr "Editer"
+
+#: admin/groups/apps/app_list.tpl.c:44
+msgid "Entry"
+msgstr "EntrÃ©e"
+
+#: admin/groups/apps/app_list.tpl.c:59
+msgid "add to"
+msgstr "Ajouter Ã "
+
+#: admin/groups/apps/app_list.tpl.c:62
+msgid "Add selected category to this folder.."
+msgstr "Ajouter les applications sÃ©lectionnÃ©es dans ce dossier."
+
+#: admin/groups/apps/app_list.tpl.c:65
+msgid "Separator"
+msgstr "SÃ©parateur"
+
+#: admin/groups/apps/app_list.tpl.c:68
+msgid "Add a separator to this folder."
+msgstr "Ajouter un sÃ©parateur Ã  ce dossier."
+
+#: admin/groups/apps/app_list.tpl.c:71
+msgid "Add selected applications to this folder."
+msgstr "Ajouter les applications sÃ©lectionnÃ©es dans ce dossier."
+
+#: admin/mimetypes/generic.tpl.c:8
+msgid "Please enter a name for the mime type here"
+msgstr "Veuillez entrer un nom pour le type mime"
+
+#: admin/mimetypes/generic.tpl.c:14
+msgid "Categorize this mime type"
+msgstr "Mettre ce type mime dans une catÃ©gorie"
+
+#: admin/mimetypes/generic.tpl.c:20
+msgid "Please specify a description"
+msgstr "Veuillez indiquer une description"
+
+#: admin/mimetypes/generic.tpl.c:26
+msgid "Choose subtree to place application in"
+msgstr "SÃ©lectionner la branche de l'annuaire ou sera placÃ©e l'entrÃ©e de l'application"
+
+#: admin/mimetypes/generic.tpl.c:29
+msgid "Select a base"
+msgstr "SÃ©lectionnez une base"
+
+#: admin/mimetypes/generic.tpl.c:35 admin/mimetypes/generic.tpl.c:38
+msgid "Mime icon"
+msgstr "IcÃ´ne mime"
+
+#: admin/mimetypes/generic.tpl.c:41
+msgid "Update"
+msgstr "Mise Ã  jour"
+
+#: admin/mimetypes/generic.tpl.c:44
+msgid "Update mime type icon"
+msgstr "Mettre Ã  jour l'icÃ´ne mime"
+
+#: admin/mimetypes/generic.tpl.c:47 admin/mimetypes/generic.tpl.c:50
+msgid "Left click"
+msgstr "Clic gauche"
+
+#: admin/mimetypes/generic.tpl.c:56
+msgid "Please specify a new file pattern"
+msgstr "Veuillez indiquer un nouveau filtre de fichiers"
+
+#: admin/mimetypes/generic.tpl.c:59
+msgid "Add a new file pattern"
+msgstr "Ajouter un nouveau filtre de fichier"
+
+#: admin/mimetypes/generic.tpl.c:65 admin/mimetypes/generic.tpl.c:89
+msgid "Enter an application name here"
+msgstr "Nom de l'application"
+
+#: admin/mimetypes/generic.tpl.c:68 admin/mimetypes/generic.tpl.c:92
+msgid "Add application"
+msgstr "Ajouter une Application"
+
+#: admin/mimetypes/generic.tpl.c:71 admin/mimetypes/generic.tpl.c:74
+msgid "Embedding"
+msgstr "Inclure"
+
+#: admin/mimetypes/generic.tpl.c:77
+msgid "Show file in embedded viewer"
+msgstr "Montrer le fichier dans le navigateur"
+
+#: admin/mimetypes/generic.tpl.c:80
+msgid "Show file in external viewer"
+msgstr "Montrer le fichier dans un programme externe"
 
-#: config/applications/class_applicationsPluginConfig.inc:56
-msgid "All"
-msgstr "Tout"
+#: admin/mimetypes/generic.tpl.c:83
+msgid "Ask whether to save to local disk"
+msgstr "Demander si il faut le sauver sur un disque local"
diff --git a/applications/locale/id/fusiondirectory.po b/applications/locale/id/fusiondirectory.po
index a3d51b214180c81325caf402e9e41e1f71994125..443f8cbff583fe9fd49fb38f4811e571a71269a1 100644
--- a/applications/locale/id/fusiondirectory.po
+++ b/applications/locale/id/fusiondirectory.po
@@ -5,219 +5,497 @@
 # Translators:
 msgid ""
 msgstr ""
-"Project-Id-Version: FusionDirectory-108\n"
+"Project-Id-Version: FusionDirectory-109\n"
 "Report-Msgid-Bugs-To: documentation@lists.fusiondirectory.org\n"
-"POT-Creation-Date: 2015-03-19 21:45+0100\n"
-"PO-Revision-Date: 2014-12-12 07:34+0000\n"
-"Last-Translator: fusiondirectory <contact@fusiondirectory.org>\n"
-"Language-Team: Indonesian (http://www.transifex.com/projects/p/FusionDirectory-108/language/id/)\n"
+"POT-Creation-Date: 2014-08-28 12:26+0200\n"
+"PO-Revision-Date: 2014-08-28 10:28+0000\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: Indonesian (http://www.transifex.com/projects/p/FusionDirectory-109/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/groups/apps/class_groupApplication.inc:410
+#: admin/groups/apps/class_groupApplication.inc:414
+msgid "Menu"
+msgstr ""
+
+#: admin/groups/apps/class_groupApplication.inc:482
+msgid "Back"
+msgstr ""
+
+#: admin/groups/apps/class_groupApplication.inc:493
+msgid "back"
+msgstr ""
+
+#: admin/groups/apps/class_groupApplication.inc:501
+msgid "department"
+msgstr ""
+
+#: admin/groups/apps/class_groupApplication.inc:524
+msgid "application"
+msgstr ""
+
+#: admin/groups/apps/class_groupApplication.inc:701
+#: admin/groups/apps/class_groupApplication.inc:1396
+#: admin/groups/apps/class_groupApplication.inc:1409
+#: admin/groups/apps/class_groupApplication.inc:1422
+#: admin/mimetypes/class_mimetypeGeneric.inc:481
+#: admin/mimetypes/class_mimetypeGeneric.inc:493
+#: admin/mimetypes/class_mimetypeGeneric.inc:508
+#: admin/applications/class_applicationParameters.inc:177
+#: admin/applications/class_applicationParameters.inc:242
+#: admin/applications/class_applicationGeneric.inc:290
+msgid "LDAP error"
+msgstr ""
+
+#: admin/groups/apps/class_groupApplication.inc:1208
+msgid "Not available in release."
+msgstr ""
+
+#: admin/groups/apps/class_groupApplication.inc:1459
 #: 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
+#: admin/mimetypes/generic.tpl.c:62 admin/mimetypes/generic.tpl.c:86
 msgid "Applications"
 msgstr ""
 
+#: admin/groups/apps/class_groupApplication.inc:1460
+msgid "Group applications"
+msgstr ""
+
+#: admin/groups/apps/class_groupApplication.inc:1466
+#: admin/mimetypes/class_mimetypeGeneric.inc:689
+#: admin/applications/class_applicationGeneric.inc:73
+msgid "Application"
+msgstr ""
+
+#: admin/groups/apps/class_groupApplication.inc:1467
+#: admin/groups/apps/app_list.tpl.c:2 admin/groups/apps/app_list.tpl.c:14
+msgid "Release"
+msgstr ""
+
+#: admin/groups/apps/class_groupApplication.inc:1468
+msgid "Application parameter"
+msgstr ""
+
+#: admin/groups/apps/class_groupApplication.inc:1469
+#: admin/applications/class_applicationGeneric.inc:135
+#: admin/groups/apps/edit_entry.tpl.c:32
+msgid "Place icon on members desktop"
+msgstr ""
+
+#: admin/groups/apps/class_groupApplication.inc:1470
+#: admin/applications/class_applicationGeneric.inc:145
+#: admin/groups/apps/edit_entry.tpl.c:38
+msgid "Place entry in members launch bar"
+msgstr ""
+
+#: admin/groups/apps/class_groupApplication.inc:1471
+#: admin/applications/class_applicationGeneric.inc:140
+#: admin/groups/apps/edit_entry.tpl.c:35
+msgid "Place entry in members startmenu"
+msgstr ""
+
+#: admin/mimetypes/class_mimetypeManagement.inc:28
+#: admin/mimetypes/class_mimetypeGeneric.inc:674
+msgid "Mime types"
+msgstr ""
+
+#: admin/mimetypes/class_mimetypeManagement.inc:29
+msgid "Mime type management"
+msgstr ""
+
+#: admin/mimetypes/class_mimetypeGeneric.inc:519
+#: admin/mimetypes/class_mimetypeGeneric.inc:685
+#: admin/applications/class_applicationParameters.inc:208
+#: admin/applications/class_applicationParameters.inc:212
+#: admin/groups/apps/edit_entry.tpl.c:26
+msgid "Name"
+msgstr ""
+
+#: admin/mimetypes/class_mimetypeGeneric.inc:522
+msgid "File pattern"
+msgstr ""
+
+#: admin/mimetypes/class_mimetypeGeneric.inc:671
+#: admin/applications/class_applicationGeneric.inc:69
+#: admin/mimetypes/generic.tpl.c:2
+msgid "Generic"
+msgstr ""
+
+#: admin/mimetypes/class_mimetypeGeneric.inc:672
+msgid "Mime type generic"
+msgstr ""
+
+#: admin/mimetypes/class_mimetypeGeneric.inc:678
+#: admin/mimetypes/generic.tpl.c:5
+msgid "Mime type"
+msgstr ""
+
+#: admin/mimetypes/class_mimetypeGeneric.inc:686
+#: admin/mimetypes/generic.tpl.c:11
+msgid "Mime group"
+msgstr ""
+
+#: admin/mimetypes/class_mimetypeGeneric.inc:687
+#: admin/applications/class_applicationGeneric.inc:105
+#: admin/mimetypes/generic.tpl.c:17
+msgid "Description"
+msgstr ""
+
+#: admin/mimetypes/class_mimetypeGeneric.inc:688
+#: admin/mimetypes/generic.tpl.c:23
+msgid "Base"
+msgstr ""
+
+#: admin/mimetypes/class_mimetypeGeneric.inc:690
+msgid "Left click action"
+msgstr ""
+
+#: admin/mimetypes/class_mimetypeGeneric.inc:691
+#: admin/applications/class_applicationGeneric.inc:112
+#: admin/mimetypes/generic.tpl.c:32
+msgid "Icon"
+msgstr ""
+
+#: admin/mimetypes/class_mimetypeGeneric.inc:692
+#: admin/mimetypes/generic.tpl.c:53
+msgid "File patterns"
+msgstr ""
+
+#: admin/mimetypes/class_mimetypeGeneric.inc:693
+msgid "Embedded applications"
+msgstr ""
+
 #: admin/applications/class_applicationManagement.inc:29
 msgid "Application management"
 msgstr ""
 
-#: admin/applications/class_applicationManagement.inc:100
-msgid "Web applications"
+#: admin/applications/class_applicationParameters.inc:71
+msgid "Remove options"
 msgstr ""
 
-#: admin/applications/class_applicationGeneric.inc:31
-#: admin/applications/class_applicationGeneric.inc:34
-#: admin/applications/class_applicationGeneric.inc:48
-#: admin/applications/class_webApplication.inc:47
-msgid "Application"
+#: admin/applications/class_applicationParameters.inc:71
+#: admin/applications/class_applicationParameters.inc:73
+msgid "parameter"
 msgstr ""
 
-#: admin/applications/class_applicationGeneric.inc:32
-msgid "Application information"
+#: admin/applications/class_applicationParameters.inc:73
+msgid "Create options"
 msgstr ""
 
-#: admin/applications/class_applicationGeneric.inc:52
-msgid "Application name"
+#: admin/applications/class_applicationParameters.inc:115
+msgid "Variable"
 msgstr ""
 
-#: admin/applications/class_applicationGeneric.inc:52
-msgid "The name of this application"
+#: admin/applications/class_applicationParameters.inc:115
+msgid "Default value"
 msgstr ""
 
-#: admin/applications/class_applicationGeneric.inc:56
-#: admin/applications/class_webApplication.inc:55
-msgid "Description"
+#: admin/applications/class_applicationParameters.inc:141
+#: admin/groups/apps/app_list.tpl.c:29 admin/groups/apps/app_list.tpl.c:41
+#: admin/groups/apps/app_list.tpl.c:53
+msgid "Remove"
 msgstr ""
 
-#: admin/applications/class_applicationGeneric.inc:56
-#: admin/applications/class_webApplication.inc:55
-msgid "A short description of this application"
+#: admin/applications/class_applicationParameters.inc:147
+msgid "Add option"
 msgstr ""
 
-#: admin/applications/class_applicationGeneric.inc:60
-msgid "Execute"
+#: admin/applications/class_applicationParameters.inc:265
+msgid "Parameter"
 msgstr ""
 
-#: admin/applications/class_applicationGeneric.inc:60
-msgid "The application to be executed"
+#: admin/applications/class_applicationParameters.inc:266
+msgid "Parameter configuration"
+msgstr ""
+
+#: admin/applications/class_applicationParameters.inc:271
+msgid "Application parameter settings"
+msgstr ""
+
+#: admin/applications/class_applicationGeneric.inc:70
+msgid "Application generic"
+msgstr ""
+
+#: admin/applications/class_applicationGeneric.inc:90
+msgid "Properties"
+msgstr ""
+
+#: admin/applications/class_applicationGeneric.inc:93
+msgid "Application name"
+msgstr ""
+
+#: admin/applications/class_applicationGeneric.inc:93
+msgid "The name of this application"
 msgstr ""
 
-#: admin/applications/class_applicationGeneric.inc:64
+#: admin/applications/class_applicationGeneric.inc:97
 msgid "Display name"
 msgstr ""
 
-#: admin/applications/class_applicationGeneric.inc:64
+#: admin/applications/class_applicationGeneric.inc:97
 msgid "The displayed name for this application"
 msgstr ""
 
-#: admin/applications/class_applicationGeneric.inc:70
-#: admin/applications/class_webApplication.inc:69
-msgid "Icon"
+#: admin/applications/class_applicationGeneric.inc:101
+msgid "Execute"
 msgstr ""
 
-#: admin/applications/class_applicationGeneric.inc:73
-#: admin/applications/class_webApplication.inc:72
+#: admin/applications/class_applicationGeneric.inc:101
+msgid "The application to be executed"
+msgstr ""
+
+#: admin/applications/class_applicationGeneric.inc:105
+msgid "A short description of this application"
+msgstr ""
+
+#: admin/applications/class_applicationGeneric.inc:115
 msgid "The icon for this application"
 msgstr ""
 
-#: admin/applications/class_applicationGeneric.inc:80
+#: admin/applications/class_applicationGeneric.inc:122
 msgid "Options"
 msgstr ""
 
-#: admin/applications/class_applicationGeneric.inc:83
+#: admin/applications/class_applicationGeneric.inc:125
 msgid "Only executable for member"
 msgstr ""
 
-#: admin/applications/class_applicationGeneric.inc:83
+#: admin/applications/class_applicationGeneric.inc:125
 msgid "Only executable by the memebers of the group"
 msgstr ""
 
-#: admin/applications/class_applicationGeneric.inc:88
+#: admin/applications/class_applicationGeneric.inc:130
 msgid "Replace user configuration on startup"
 msgstr ""
 
-#: admin/applications/class_applicationGeneric.inc:88
+#: admin/applications/class_applicationGeneric.inc:130
 msgid "Replace the user configuration on startup"
 msgstr ""
 
-#: admin/applications/class_applicationGeneric.inc:93
-msgid "Place icon on members desktop"
+#: admin/applications/class_applicationGeneric.inc:135
+msgid "Put an icon on the user desktop"
 msgstr ""
 
-#: admin/applications/class_applicationGeneric.inc:93
-msgid "Put an icon on the user desktop"
+#: admin/applications/class_applicationGeneric.inc:140
+#: admin/applications/class_applicationGeneric.inc:145
+msgid "Put an entry in the startup menu"
 msgstr ""
 
-#: admin/applications/class_applicationGeneric.inc:98
-msgid "Place entry in members startmenu"
+#: admin/applications/class_applicationGeneric.inc:156
+msgid "Script"
 msgstr ""
 
-#: admin/applications/class_applicationGeneric.inc:98
-#: admin/applications/class_applicationGeneric.inc:103
-msgid "Put an entry in the startup menu"
+#: admin/applications/class_applicationGeneric.inc:159
+msgid "Script to run at logon"
 msgstr ""
 
-#: admin/applications/class_applicationGeneric.inc:103
-msgid "Place entry in members launch bar"
+#: admin/applications/class_applicationGeneric.inc:165
+msgid "Log off script"
 msgstr ""
 
-#: admin/applications/class_webApplication.inc:30
-#: admin/applications/class_webApplication.inc:33
-msgid "Web application"
+#: admin/applications/class_applicationGeneric.inc:168
+msgid "Script to run at logoff"
 msgstr ""
 
-#: admin/applications/class_webApplication.inc:31
-msgid "Web applicationts names, icons and links"
+#: admin/applications/class_applicationGeneric.inc:227
+msgid "no example"
 msgstr ""
 
-#: admin/applications/class_webApplication.inc:51
-msgid "Name"
+#: admin/applications/class_applicationGeneric.inc:276
+msgid "Error"
 msgstr ""
 
-#: admin/applications/class_webApplication.inc:51
-msgid "Name or id for application"
+#: admin/applications/class_applicationGeneric.inc:276
+#, php-format
+msgid "Cannot remove application - it is still in use by these objects: %s"
 msgstr ""
 
-#: admin/applications/class_webApplication.inc:59
-msgid "URL"
+#: config/desktop-management/class_desktopPluginConfig.inc:28
+msgid "Desktop management"
 msgstr ""
 
-#: admin/applications/class_webApplication.inc:59
-msgid "Link to this application"
+#: config/desktop-management/class_desktopPluginConfig.inc:29
+msgid "Desktop management plugin configuration"
 msgstr ""
 
-#: admin/applications/class_webApplication.inc:63
-msgid "Display Name"
+#: config/desktop-management/class_desktopPluginConfig.inc:40
+msgid "LDAP tree"
 msgstr ""
 
-#: admin/applications/class_webApplication.inc:63
-msgid "Displayed name for links to this application"
+#: config/desktop-management/class_desktopPluginConfig.inc:43
+msgid "Mimetype RDN"
 msgstr ""
 
-#: admin/applications/class_webApplication.inc:77
-msgid "Icon location"
+#: config/desktop-management/class_desktopPluginConfig.inc:43
+msgid "Branch in which mime types will be stored"
 msgstr ""
 
-#: admin/applications/class_webApplication.inc:77
-msgid "Usual path to this application icon"
+#: config/desktop-management/class_desktopPluginConfig.inc:48
+msgid "Application RDN"
 msgstr ""
 
-#: admin/roles/class_applicationRights.inc:31
-msgid "Applications allowed for this role"
+#: config/desktop-management/class_desktopPluginConfig.inc:48
+msgid "Branch in which applications will be stored"
 msgstr ""
 
-#: admin/roles/class_applicationRights.inc:45
-msgid "Application list"
+#: admin/groups/apps/edit_entry.tpl.c:2
+msgid "Folder image"
 msgstr ""
 
-#: admin/roles/class_applicationRights.inc:49
-msgid "The applications users with this role are allowed to launch"
+#: admin/groups/apps/edit_entry.tpl.c:5
+msgid "Could not load image."
 msgstr ""
 
-#: config/applications/class_applicationsPluginConfig.inc:29
-msgid "Applications plugin configuration"
+#: admin/groups/apps/edit_entry.tpl.c:8
+msgid "None"
 msgstr ""
 
-#: config/applications/class_applicationsPluginConfig.inc:43
-msgid "Application RDN"
+#: admin/groups/apps/edit_entry.tpl.c:11
+msgid "Upload image"
 msgstr ""
 
-#: config/applications/class_applicationsPluginConfig.inc:43
-msgid "Branch in which applications will be stored"
+#: admin/groups/apps/edit_entry.tpl.c:14
+msgid "Upload"
 msgstr ""
 
-#: config/applications/class_applicationsPluginConfig.inc:48
-msgid "Web applications RDN"
+#: admin/groups/apps/edit_entry.tpl.c:17
+msgid "Reset image"
 msgstr ""
 
-#: config/applications/class_applicationsPluginConfig.inc:48
-msgid "Branch in which web applications will be stored"
+#: admin/groups/apps/edit_entry.tpl.c:20
+msgid "Reset"
 msgstr ""
 
-#: config/applications/class_applicationsPluginConfig.inc:53
-msgid "Show web applications in menu"
+#: admin/groups/apps/edit_entry.tpl.c:23
+msgid "Application settings"
 msgstr ""
 
-#: config/applications/class_applicationsPluginConfig.inc:53
-msgid "Whether to show web applications in FD main menu"
+#: admin/groups/apps/edit_entry.tpl.c:29
+msgid "Application options"
 msgstr ""
 
-#: config/applications/class_applicationsPluginConfig.inc:56
-msgid "None"
+#: admin/groups/apps/app_list.tpl.c:5
+msgid "Copy menu"
+msgstr ""
+
+#: admin/groups/apps/app_list.tpl.c:8
+msgid "Paste menu from"
+msgstr ""
+
+#: admin/groups/apps/app_list.tpl.c:11
+msgid "Delete menu"
+msgstr ""
+
+#: admin/groups/apps/app_list.tpl.c:17 admin/groups/apps/app_list.tpl.c:20
+msgid "Folder"
+msgstr ""
+
+#: admin/groups/apps/app_list.tpl.c:23 admin/groups/apps/app_list.tpl.c:35
+#: admin/groups/apps/app_list.tpl.c:47
+msgid "Move up"
+msgstr ""
+
+#: admin/groups/apps/app_list.tpl.c:26 admin/groups/apps/app_list.tpl.c:38
+#: admin/groups/apps/app_list.tpl.c:50
+msgid "Move down"
+msgstr ""
+
+#: admin/groups/apps/app_list.tpl.c:32 admin/groups/apps/app_list.tpl.c:56
+msgid "Edit"
+msgstr ""
+
+#: admin/groups/apps/app_list.tpl.c:44
+msgid "Entry"
+msgstr ""
+
+#: admin/groups/apps/app_list.tpl.c:59
+msgid "add to"
+msgstr ""
+
+#: admin/groups/apps/app_list.tpl.c:62
+msgid "Add selected category to this folder.."
+msgstr ""
+
+#: admin/groups/apps/app_list.tpl.c:65
+msgid "Separator"
+msgstr ""
+
+#: admin/groups/apps/app_list.tpl.c:68
+msgid "Add a separator to this folder."
+msgstr ""
+
+#: admin/groups/apps/app_list.tpl.c:71
+msgid "Add selected applications to this folder."
+msgstr ""
+
+#: admin/mimetypes/generic.tpl.c:8
+msgid "Please enter a name for the mime type here"
+msgstr ""
+
+#: admin/mimetypes/generic.tpl.c:14
+msgid "Categorize this mime type"
+msgstr ""
+
+#: admin/mimetypes/generic.tpl.c:20
+msgid "Please specify a description"
+msgstr ""
+
+#: admin/mimetypes/generic.tpl.c:26
+msgid "Choose subtree to place application in"
+msgstr ""
+
+#: admin/mimetypes/generic.tpl.c:29
+msgid "Select a base"
+msgstr ""
+
+#: admin/mimetypes/generic.tpl.c:35 admin/mimetypes/generic.tpl.c:38
+msgid "Mime icon"
+msgstr ""
+
+#: admin/mimetypes/generic.tpl.c:41
+msgid "Update"
+msgstr ""
+
+#: admin/mimetypes/generic.tpl.c:44
+msgid "Update mime type icon"
+msgstr ""
+
+#: admin/mimetypes/generic.tpl.c:47 admin/mimetypes/generic.tpl.c:50
+msgid "Left click"
+msgstr ""
+
+#: admin/mimetypes/generic.tpl.c:56
+msgid "Please specify a new file pattern"
+msgstr ""
+
+#: admin/mimetypes/generic.tpl.c:59
+msgid "Add a new file pattern"
+msgstr ""
+
+#: admin/mimetypes/generic.tpl.c:65 admin/mimetypes/generic.tpl.c:89
+msgid "Enter an application name here"
+msgstr ""
+
+#: admin/mimetypes/generic.tpl.c:68 admin/mimetypes/generic.tpl.c:92
+msgid "Add application"
+msgstr ""
+
+#: admin/mimetypes/generic.tpl.c:71 admin/mimetypes/generic.tpl.c:74
+msgid "Embedding"
+msgstr ""
+
+#: admin/mimetypes/generic.tpl.c:77
+msgid "Show file in embedded viewer"
 msgstr ""
 
-#: config/applications/class_applicationsPluginConfig.inc:56
-msgid "Only allowed"
+#: admin/mimetypes/generic.tpl.c:80
+msgid "Show file in external viewer"
 msgstr ""
 
-#: config/applications/class_applicationsPluginConfig.inc:56
-msgid "All"
+#: admin/mimetypes/generic.tpl.c:83
+msgid "Ask whether to save to local disk"
 msgstr ""
diff --git a/applications/locale/it/fusiondirectory.po b/applications/locale/it/fusiondirectory.po
index 21ec13a8470038c59a289fcb6b36f79b39d9d7a5..40c8992a5f7bb3aa0367e763023b2624d9e2a39e 100644
--- a/applications/locale/it/fusiondirectory.po
+++ b/applications/locale/it/fusiondirectory.po
@@ -5,219 +5,497 @@
 # Translators:
 msgid ""
 msgstr ""
-"Project-Id-Version: FusionDirectory-108\n"
+"Project-Id-Version: FusionDirectory-109\n"
 "Report-Msgid-Bugs-To: documentation@lists.fusiondirectory.org\n"
-"POT-Creation-Date: 2015-03-19 21:45+0100\n"
-"PO-Revision-Date: 2015-02-25 16:12+0000\n"
-"Last-Translator: fusiondirectory <contact@fusiondirectory.org>\n"
-"Language-Team: Italian (http://www.transifex.com/projects/p/FusionDirectory-108/language/it/)\n"
+"POT-Creation-Date: 2014-08-28 12:26+0200\n"
+"PO-Revision-Date: 2014-08-28 10:28+0000\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: Italian (http://www.transifex.com/projects/p/FusionDirectory-109/language/it/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Language: it\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
+#: admin/groups/apps/class_groupApplication.inc:410
+#: admin/groups/apps/class_groupApplication.inc:414
+msgid "Menu"
+msgstr "Menu"
+
+#: admin/groups/apps/class_groupApplication.inc:482
+msgid "Back"
+msgstr "Indietro"
+
+#: admin/groups/apps/class_groupApplication.inc:493
+msgid "back"
+msgstr "Indietro"
+
+#: admin/groups/apps/class_groupApplication.inc:501
+msgid "department"
+msgstr "dipartimento"
+
+#: admin/groups/apps/class_groupApplication.inc:524
+msgid "application"
+msgstr "applicazione"
+
+#: admin/groups/apps/class_groupApplication.inc:701
+#: admin/groups/apps/class_groupApplication.inc:1396
+#: admin/groups/apps/class_groupApplication.inc:1409
+#: admin/groups/apps/class_groupApplication.inc:1422
+#: admin/mimetypes/class_mimetypeGeneric.inc:481
+#: admin/mimetypes/class_mimetypeGeneric.inc:493
+#: admin/mimetypes/class_mimetypeGeneric.inc:508
+#: admin/applications/class_applicationParameters.inc:177
+#: admin/applications/class_applicationParameters.inc:242
+#: admin/applications/class_applicationGeneric.inc:290
+msgid "LDAP error"
+msgstr "Errore LDAP"
+
+#: admin/groups/apps/class_groupApplication.inc:1208
+msgid "Not available in release."
+msgstr "Non disponibile in questa versione"
+
+#: admin/groups/apps/class_groupApplication.inc:1459
 #: 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
+#: admin/mimetypes/generic.tpl.c:62 admin/mimetypes/generic.tpl.c:86
 msgid "Applications"
 msgstr "Applicazioni"
 
+#: admin/groups/apps/class_groupApplication.inc:1460
+msgid "Group applications"
+msgstr "Gruppo di applicazioni"
+
+#: admin/groups/apps/class_groupApplication.inc:1466
+#: admin/mimetypes/class_mimetypeGeneric.inc:689
+#: admin/applications/class_applicationGeneric.inc:73
+msgid "Application"
+msgstr "Applicazione"
+
+#: admin/groups/apps/class_groupApplication.inc:1467
+#: admin/groups/apps/app_list.tpl.c:2 admin/groups/apps/app_list.tpl.c:14
+msgid "Release"
+msgstr "Versione"
+
+#: admin/groups/apps/class_groupApplication.inc:1468
+msgid "Application parameter"
+msgstr "Parametri dell'applicazione"
+
+#: admin/groups/apps/class_groupApplication.inc:1469
+#: admin/applications/class_applicationGeneric.inc:135
+#: admin/groups/apps/edit_entry.tpl.c:32
+msgid "Place icon on members desktop"
+msgstr "Metti l'icona sul desktop dei membri"
+
+#: admin/groups/apps/class_groupApplication.inc:1470
+#: admin/applications/class_applicationGeneric.inc:145
+#: admin/groups/apps/edit_entry.tpl.c:38
+msgid "Place entry in members launch bar"
+msgstr "Metti l'entry nella barra di avvio dei membri"
+
+#: admin/groups/apps/class_groupApplication.inc:1471
+#: admin/applications/class_applicationGeneric.inc:140
+#: admin/groups/apps/edit_entry.tpl.c:35
+msgid "Place entry in members startmenu"
+msgstr "Metti l'entry nel menu di avvio dei membri"
+
+#: admin/mimetypes/class_mimetypeManagement.inc:28
+#: admin/mimetypes/class_mimetypeGeneric.inc:674
+msgid "Mime types"
+msgstr "Mime"
+
+#: admin/mimetypes/class_mimetypeManagement.inc:29
+msgid "Mime type management"
+msgstr "Gestione del tipo Mime"
+
+#: admin/mimetypes/class_mimetypeGeneric.inc:519
+#: admin/mimetypes/class_mimetypeGeneric.inc:685
+#: admin/applications/class_applicationParameters.inc:208
+#: admin/applications/class_applicationParameters.inc:212
+#: admin/groups/apps/edit_entry.tpl.c:26
+msgid "Name"
+msgstr "Nome"
+
+#: admin/mimetypes/class_mimetypeGeneric.inc:522
+msgid "File pattern"
+msgstr "file di pattern"
+
+#: admin/mimetypes/class_mimetypeGeneric.inc:671
+#: admin/applications/class_applicationGeneric.inc:69
+#: admin/mimetypes/generic.tpl.c:2
+msgid "Generic"
+msgstr "Informazioni"
+
+#: admin/mimetypes/class_mimetypeGeneric.inc:672
+msgid "Mime type generic"
+msgstr "Tipo Mime generico"
+
+#: admin/mimetypes/class_mimetypeGeneric.inc:678
+#: admin/mimetypes/generic.tpl.c:5
+msgid "Mime type"
+msgstr "Tipo Mime"
+
+#: admin/mimetypes/class_mimetypeGeneric.inc:686
+#: admin/mimetypes/generic.tpl.c:11
+msgid "Mime group"
+msgstr "Gruppi Mime"
+
+#: admin/mimetypes/class_mimetypeGeneric.inc:687
+#: admin/applications/class_applicationGeneric.inc:105
+#: admin/mimetypes/generic.tpl.c:17
+msgid "Description"
+msgstr "Descrizione"
+
+#: admin/mimetypes/class_mimetypeGeneric.inc:688
+#: admin/mimetypes/generic.tpl.c:23
+msgid "Base"
+msgstr "Base"
+
+#: admin/mimetypes/class_mimetypeGeneric.inc:690
+msgid "Left click action"
+msgstr "Azione del click di sinistra"
+
+#: admin/mimetypes/class_mimetypeGeneric.inc:691
+#: admin/applications/class_applicationGeneric.inc:112
+#: admin/mimetypes/generic.tpl.c:32
+msgid "Icon"
+msgstr "Icona"
+
+#: admin/mimetypes/class_mimetypeGeneric.inc:692
+#: admin/mimetypes/generic.tpl.c:53
+msgid "File patterns"
+msgstr "Files di patterns"
+
+#: admin/mimetypes/class_mimetypeGeneric.inc:693
+msgid "Embedded applications"
+msgstr "applicazioni integrate"
+
 #: admin/applications/class_applicationManagement.inc:29
 msgid "Application management"
 msgstr "Gestione dell'applicazione"
 
-#: admin/applications/class_applicationManagement.inc:100
-msgid "Web applications"
-msgstr ""
+#: admin/applications/class_applicationParameters.inc:71
+msgid "Remove options"
+msgstr "Rimuovi le opzioni"
 
-#: admin/applications/class_applicationGeneric.inc:31
-#: admin/applications/class_applicationGeneric.inc:34
-#: admin/applications/class_applicationGeneric.inc:48
-#: admin/applications/class_webApplication.inc:47
-msgid "Application"
-msgstr "Applicazione"
+#: admin/applications/class_applicationParameters.inc:71
+#: admin/applications/class_applicationParameters.inc:73
+msgid "parameter"
+msgstr "parametro"
 
-#: admin/applications/class_applicationGeneric.inc:32
-msgid "Application information"
-msgstr ""
+#: admin/applications/class_applicationParameters.inc:73
+msgid "Create options"
+msgstr "Crea le opzioni"
+
+#: admin/applications/class_applicationParameters.inc:115
+msgid "Variable"
+msgstr "Variabile"
+
+#: admin/applications/class_applicationParameters.inc:115
+msgid "Default value"
+msgstr "Valori di default"
+
+#: admin/applications/class_applicationParameters.inc:141
+#: admin/groups/apps/app_list.tpl.c:29 admin/groups/apps/app_list.tpl.c:41
+#: admin/groups/apps/app_list.tpl.c:53
+msgid "Remove"
+msgstr "Elimina"
+
+#: admin/applications/class_applicationParameters.inc:147
+msgid "Add option"
+msgstr "Aggiungi opzione"
+
+#: admin/applications/class_applicationParameters.inc:265
+msgid "Parameter"
+msgstr "Parametri"
+
+#: admin/applications/class_applicationParameters.inc:266
+msgid "Parameter configuration"
+msgstr "Configurazione dei parametri"
+
+#: admin/applications/class_applicationParameters.inc:271
+msgid "Application parameter settings"
+msgstr "Impostazioni del parametro dell'applicazione"
+
+#: admin/applications/class_applicationGeneric.inc:70
+msgid "Application generic"
+msgstr "Applicazione generica"
+
+#: admin/applications/class_applicationGeneric.inc:90
+msgid "Properties"
+msgstr "ProprietÃ "
 
-#: admin/applications/class_applicationGeneric.inc:52
+#: admin/applications/class_applicationGeneric.inc:93
 msgid "Application name"
 msgstr "Nome dell'applicazione"
 
-#: admin/applications/class_applicationGeneric.inc:52
+#: admin/applications/class_applicationGeneric.inc:93
 msgid "The name of this application"
 msgstr "Il nome di questa applicazione"
 
-#: admin/applications/class_applicationGeneric.inc:56
-#: admin/applications/class_webApplication.inc:55
-msgid "Description"
-msgstr "Descrizione"
+#: admin/applications/class_applicationGeneric.inc:97
+msgid "Display name"
+msgstr "Mostra il nome"
 
-#: admin/applications/class_applicationGeneric.inc:56
-#: admin/applications/class_webApplication.inc:55
-msgid "A short description of this application"
-msgstr "Una breve descrizione di questa applicazione"
+#: admin/applications/class_applicationGeneric.inc:97
+msgid "The displayed name for this application"
+msgstr "Il nome mostrato per questa applicazione"
 
-#: admin/applications/class_applicationGeneric.inc:60
+#: admin/applications/class_applicationGeneric.inc:101
 msgid "Execute"
 msgstr "Esegui"
 
-#: admin/applications/class_applicationGeneric.inc:60
+#: admin/applications/class_applicationGeneric.inc:101
 msgid "The application to be executed"
 msgstr "L'applicazione da eseguire"
 
-#: admin/applications/class_applicationGeneric.inc:64
-msgid "Display name"
-msgstr "Mostra il nome"
-
-#: admin/applications/class_applicationGeneric.inc:64
-msgid "The displayed name for this application"
-msgstr "Il nome mostrato per questa applicazione"
-
-#: admin/applications/class_applicationGeneric.inc:70
-#: admin/applications/class_webApplication.inc:69
-msgid "Icon"
-msgstr "Icona"
+#: admin/applications/class_applicationGeneric.inc:105
+msgid "A short description of this application"
+msgstr "Una breve descrizione di questa applicazione"
 
-#: admin/applications/class_applicationGeneric.inc:73
-#: admin/applications/class_webApplication.inc:72
+#: admin/applications/class_applicationGeneric.inc:115
 msgid "The icon for this application"
 msgstr "L'icona di questa applicazione"
 
-#: admin/applications/class_applicationGeneric.inc:80
+#: admin/applications/class_applicationGeneric.inc:122
 msgid "Options"
 msgstr "Opzioni"
 
-#: admin/applications/class_applicationGeneric.inc:83
+#: admin/applications/class_applicationGeneric.inc:125
 msgid "Only executable for member"
 msgstr "Eseguibile solo dal membro "
 
-#: admin/applications/class_applicationGeneric.inc:83
+#: admin/applications/class_applicationGeneric.inc:125
 msgid "Only executable by the memebers of the group"
 msgstr "Eseguibile solo dai membri del gruppo"
 
-#: admin/applications/class_applicationGeneric.inc:88
+#: admin/applications/class_applicationGeneric.inc:130
 msgid "Replace user configuration on startup"
 msgstr "Sostituisci la  configurazione dell'utente all'avvio"
 
-#: admin/applications/class_applicationGeneric.inc:88
+#: admin/applications/class_applicationGeneric.inc:130
 msgid "Replace the user configuration on startup"
 msgstr "Sostituisci la configurazione dell'utente all'avvio"
 
-#: admin/applications/class_applicationGeneric.inc:93
-msgid "Place icon on members desktop"
-msgstr "Metti l'icona sul desktop dei membri"
-
-#: admin/applications/class_applicationGeneric.inc:93
+#: admin/applications/class_applicationGeneric.inc:135
 msgid "Put an icon on the user desktop"
 msgstr "Inserisci un'icona sul desktop dell'utente"
 
-#: admin/applications/class_applicationGeneric.inc:98
-msgid "Place entry in members startmenu"
-msgstr "Metti l'entry nel menu di avvio dei membri"
-
-#: admin/applications/class_applicationGeneric.inc:98
-#: admin/applications/class_applicationGeneric.inc:103
+#: admin/applications/class_applicationGeneric.inc:140
+#: admin/applications/class_applicationGeneric.inc:145
 msgid "Put an entry in the startup menu"
 msgstr "Inserisci l'icona nel menu di avvio"
 
-#: admin/applications/class_applicationGeneric.inc:103
-msgid "Place entry in members launch bar"
-msgstr "Metti l'entry nella barra di avvio dei membri"
+#: admin/applications/class_applicationGeneric.inc:156
+msgid "Script"
+msgstr "Script"
 
-#: admin/applications/class_webApplication.inc:30
-#: admin/applications/class_webApplication.inc:33
-msgid "Web application"
-msgstr ""
+#: admin/applications/class_applicationGeneric.inc:159
+msgid "Script to run at logon"
+msgstr "Script da eseguire alla connessione"
 
-#: admin/applications/class_webApplication.inc:31
-msgid "Web applicationts names, icons and links"
-msgstr ""
+#: admin/applications/class_applicationGeneric.inc:165
+msgid "Log off script"
+msgstr "Script di logout"
 
-#: admin/applications/class_webApplication.inc:51
-msgid "Name"
-msgstr "Nome"
+#: admin/applications/class_applicationGeneric.inc:168
+msgid "Script to run at logoff"
+msgstr "Script da eseguire alla deconnessione"
 
-#: admin/applications/class_webApplication.inc:51
-msgid "Name or id for application"
-msgstr ""
+#: admin/applications/class_applicationGeneric.inc:227
+msgid "no example"
+msgstr "nessun esempio"
 
-#: admin/applications/class_webApplication.inc:59
-msgid "URL"
-msgstr "URL"
+#: admin/applications/class_applicationGeneric.inc:276
+msgid "Error"
+msgstr "Errore"
 
-#: admin/applications/class_webApplication.inc:59
-msgid "Link to this application"
-msgstr ""
+#: admin/applications/class_applicationGeneric.inc:276
+#, php-format
+msgid "Cannot remove application - it is still in use by these objects: %s"
+msgstr "Non posso rimuovere l'applicazione - Ã¨ ancora in uso da parte di questo oggetto: %s"
 
-#: admin/applications/class_webApplication.inc:63
-msgid "Display Name"
+#: config/desktop-management/class_desktopPluginConfig.inc:28
+msgid "Desktop management"
 msgstr ""
 
-#: admin/applications/class_webApplication.inc:63
-msgid "Displayed name for links to this application"
+#: config/desktop-management/class_desktopPluginConfig.inc:29
+msgid "Desktop management plugin configuration"
 msgstr ""
 
-#: admin/applications/class_webApplication.inc:77
-msgid "Icon location"
-msgstr ""
+#: config/desktop-management/class_desktopPluginConfig.inc:40
+msgid "LDAP tree"
+msgstr "Struttura LDAP"
 
-#: admin/applications/class_webApplication.inc:77
-msgid "Usual path to this application icon"
+#: config/desktop-management/class_desktopPluginConfig.inc:43
+msgid "Mimetype RDN"
 msgstr ""
 
-#: admin/roles/class_applicationRights.inc:31
-msgid "Applications allowed for this role"
+#: config/desktop-management/class_desktopPluginConfig.inc:43
+msgid "Branch in which mime types will be stored"
 msgstr ""
 
-#: admin/roles/class_applicationRights.inc:45
-msgid "Application list"
+#: config/desktop-management/class_desktopPluginConfig.inc:48
+msgid "Application RDN"
 msgstr ""
 
-#: admin/roles/class_applicationRights.inc:49
-msgid "The applications users with this role are allowed to launch"
+#: config/desktop-management/class_desktopPluginConfig.inc:48
+msgid "Branch in which applications will be stored"
 msgstr ""
 
-#: config/applications/class_applicationsPluginConfig.inc:29
-msgid "Applications plugin configuration"
-msgstr ""
+#: admin/groups/apps/edit_entry.tpl.c:2
+msgid "Folder image"
+msgstr "Cartella delle immagini"
 
-#: config/applications/class_applicationsPluginConfig.inc:43
-msgid "Application RDN"
-msgstr ""
+#: admin/groups/apps/edit_entry.tpl.c:5
+msgid "Could not load image."
+msgstr "Non posso caricare l'immagine"
 
-#: config/applications/class_applicationsPluginConfig.inc:43
-msgid "Branch in which applications will be stored"
-msgstr ""
+#: admin/groups/apps/edit_entry.tpl.c:8
+msgid "None"
+msgstr "Nessuno"
 
-#: config/applications/class_applicationsPluginConfig.inc:48
-msgid "Web applications RDN"
-msgstr ""
+#: admin/groups/apps/edit_entry.tpl.c:11
+msgid "Upload image"
+msgstr "Importare immagine"
 
-#: config/applications/class_applicationsPluginConfig.inc:48
-msgid "Branch in which web applications will be stored"
-msgstr ""
+#: admin/groups/apps/edit_entry.tpl.c:14
+msgid "Upload"
+msgstr "Caricare"
 
-#: config/applications/class_applicationsPluginConfig.inc:53
-msgid "Show web applications in menu"
-msgstr ""
+#: admin/groups/apps/edit_entry.tpl.c:17
+msgid "Reset image"
+msgstr "Ripristina l'immagine"
 
-#: config/applications/class_applicationsPluginConfig.inc:53
-msgid "Whether to show web applications in FD main menu"
-msgstr ""
+#: admin/groups/apps/edit_entry.tpl.c:20
+msgid "Reset"
+msgstr "Ripristina"
 
-#: config/applications/class_applicationsPluginConfig.inc:56
-msgid "None"
-msgstr "Nessuno"
+#: admin/groups/apps/edit_entry.tpl.c:23
+msgid "Application settings"
+msgstr "Impostazioni dell'applicazione"
 
-#: config/applications/class_applicationsPluginConfig.inc:56
-msgid "Only allowed"
-msgstr ""
+#: admin/groups/apps/edit_entry.tpl.c:29
+msgid "Application options"
+msgstr "Opzioni dell'applicazione"
+
+#: admin/groups/apps/app_list.tpl.c:5
+msgid "Copy menu"
+msgstr "Copia il menu"
+
+#: admin/groups/apps/app_list.tpl.c:8
+msgid "Paste menu from"
+msgstr "Incolla il menu da"
+
+#: admin/groups/apps/app_list.tpl.c:11
+msgid "Delete menu"
+msgstr "Rimuovi il menu"
+
+#: admin/groups/apps/app_list.tpl.c:17 admin/groups/apps/app_list.tpl.c:20
+msgid "Folder"
+msgstr "Cartella"
+
+#: admin/groups/apps/app_list.tpl.c:23 admin/groups/apps/app_list.tpl.c:35
+#: admin/groups/apps/app_list.tpl.c:47
+msgid "Move up"
+msgstr "Sposta sopra"
+
+#: admin/groups/apps/app_list.tpl.c:26 admin/groups/apps/app_list.tpl.c:38
+#: admin/groups/apps/app_list.tpl.c:50
+msgid "Move down"
+msgstr "Sposta sotto"
+
+#: admin/groups/apps/app_list.tpl.c:32 admin/groups/apps/app_list.tpl.c:56
+msgid "Edit"
+msgstr "Modifica"
+
+#: admin/groups/apps/app_list.tpl.c:44
+msgid "Entry"
+msgstr "Voce"
+
+#: admin/groups/apps/app_list.tpl.c:59
+msgid "add to"
+msgstr "aggiungi a"
+
+#: admin/groups/apps/app_list.tpl.c:62
+msgid "Add selected category to this folder.."
+msgstr "Aggiungi la categoria selezionata a questa cartella.."
+
+#: admin/groups/apps/app_list.tpl.c:65
+msgid "Separator"
+msgstr "Separatore"
+
+#: admin/groups/apps/app_list.tpl.c:68
+msgid "Add a separator to this folder."
+msgstr "Aggiungi un separatore a questa cartella"
+
+#: admin/groups/apps/app_list.tpl.c:71
+msgid "Add selected applications to this folder."
+msgstr "Aggiungi le applicazioni selezionate a questa cartella"
+
+#: admin/mimetypes/generic.tpl.c:8
+msgid "Please enter a name for the mime type here"
+msgstr "Inserisci un nome per il tipo Mime"
+
+#: admin/mimetypes/generic.tpl.c:14
+msgid "Categorize this mime type"
+msgstr "Classifica questo tipo Mime"
+
+#: admin/mimetypes/generic.tpl.c:20
+msgid "Please specify a description"
+msgstr "Inserisci la descrizione"
+
+#: admin/mimetypes/generic.tpl.c:26
+msgid "Choose subtree to place application in"
+msgstr "Scegliere una sottostruttura in cui depositare l'applicazione"
+
+#: admin/mimetypes/generic.tpl.c:29
+msgid "Select a base"
+msgstr "Scegliere una base"
 
-#: config/applications/class_applicationsPluginConfig.inc:56
-msgid "All"
-msgstr "Tutto"
+#: admin/mimetypes/generic.tpl.c:35 admin/mimetypes/generic.tpl.c:38
+msgid "Mime icon"
+msgstr "Icona Mime"
+
+#: admin/mimetypes/generic.tpl.c:41
+msgid "Update"
+msgstr "Aggiornamento"
+
+#: admin/mimetypes/generic.tpl.c:44
+msgid "Update mime type icon"
+msgstr "Aggiorna le icone di tipo Mime"
+
+#: admin/mimetypes/generic.tpl.c:47 admin/mimetypes/generic.tpl.c:50
+msgid "Left click"
+msgstr "Click di sinistra"
+
+#: admin/mimetypes/generic.tpl.c:56
+msgid "Please specify a new file pattern"
+msgstr "Inserisci un nuovo file di pattern"
+
+#: admin/mimetypes/generic.tpl.c:59
+msgid "Add a new file pattern"
+msgstr "Aggiungi un nuovo file di pattern"
+
+#: admin/mimetypes/generic.tpl.c:65 admin/mimetypes/generic.tpl.c:89
+msgid "Enter an application name here"
+msgstr "Inserisci il nome dell'applicazione"
+
+#: admin/mimetypes/generic.tpl.c:68 admin/mimetypes/generic.tpl.c:92
+msgid "Add application"
+msgstr "Aggiungi l'applicazione"
+
+#: admin/mimetypes/generic.tpl.c:71 admin/mimetypes/generic.tpl.c:74
+msgid "Embedding"
+msgstr "Incomrporare"
+
+#: admin/mimetypes/generic.tpl.c:77
+msgid "Show file in embedded viewer"
+msgstr "Mostra il file in un visualizzatore integrato"
+
+#: admin/mimetypes/generic.tpl.c:80
+msgid "Show file in external viewer"
+msgstr "Mostra il file in un visualizzatore esterno"
+
+#: admin/mimetypes/generic.tpl.c:83
+msgid "Ask whether to save to local disk"
+msgstr "Chiedi se salvare su disco locale"
diff --git a/applications/locale/lv/fusiondirectory.po b/applications/locale/lv/fusiondirectory.po
index e0f2dd3a339afefbc1c866cfd4200b6ecb5744de..34ee3efca2300495cd8fbab5f9a4b629139d4bd2 100644
--- a/applications/locale/lv/fusiondirectory.po
+++ b/applications/locale/lv/fusiondirectory.po
@@ -5,219 +5,497 @@
 # Translators:
 msgid ""
 msgstr ""
-"Project-Id-Version: FusionDirectory-108\n"
+"Project-Id-Version: FusionDirectory-109\n"
 "Report-Msgid-Bugs-To: documentation@lists.fusiondirectory.org\n"
-"POT-Creation-Date: 2015-03-19 21:45+0100\n"
-"PO-Revision-Date: 2014-12-12 07:34+0000\n"
-"Last-Translator: fusiondirectory <contact@fusiondirectory.org>\n"
-"Language-Team: Latvian (http://www.transifex.com/projects/p/FusionDirectory-108/language/lv/)\n"
+"POT-Creation-Date: 2014-08-28 12:26+0200\n"
+"PO-Revision-Date: 2014-08-28 10:28+0000\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: Latvian (http://www.transifex.com/projects/p/FusionDirectory-109/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/groups/apps/class_groupApplication.inc:410
+#: admin/groups/apps/class_groupApplication.inc:414
+msgid "Menu"
+msgstr ""
+
+#: admin/groups/apps/class_groupApplication.inc:482
+msgid "Back"
+msgstr ""
+
+#: admin/groups/apps/class_groupApplication.inc:493
+msgid "back"
+msgstr ""
+
+#: admin/groups/apps/class_groupApplication.inc:501
+msgid "department"
+msgstr ""
+
+#: admin/groups/apps/class_groupApplication.inc:524
+msgid "application"
+msgstr ""
+
+#: admin/groups/apps/class_groupApplication.inc:701
+#: admin/groups/apps/class_groupApplication.inc:1396
+#: admin/groups/apps/class_groupApplication.inc:1409
+#: admin/groups/apps/class_groupApplication.inc:1422
+#: admin/mimetypes/class_mimetypeGeneric.inc:481
+#: admin/mimetypes/class_mimetypeGeneric.inc:493
+#: admin/mimetypes/class_mimetypeGeneric.inc:508
+#: admin/applications/class_applicationParameters.inc:177
+#: admin/applications/class_applicationParameters.inc:242
+#: admin/applications/class_applicationGeneric.inc:290
+msgid "LDAP error"
+msgstr ""
+
+#: admin/groups/apps/class_groupApplication.inc:1208
+msgid "Not available in release."
+msgstr ""
+
+#: admin/groups/apps/class_groupApplication.inc:1459
 #: 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
+#: admin/mimetypes/generic.tpl.c:62 admin/mimetypes/generic.tpl.c:86
 msgid "Applications"
 msgstr ""
 
+#: admin/groups/apps/class_groupApplication.inc:1460
+msgid "Group applications"
+msgstr ""
+
+#: admin/groups/apps/class_groupApplication.inc:1466
+#: admin/mimetypes/class_mimetypeGeneric.inc:689
+#: admin/applications/class_applicationGeneric.inc:73
+msgid "Application"
+msgstr ""
+
+#: admin/groups/apps/class_groupApplication.inc:1467
+#: admin/groups/apps/app_list.tpl.c:2 admin/groups/apps/app_list.tpl.c:14
+msgid "Release"
+msgstr ""
+
+#: admin/groups/apps/class_groupApplication.inc:1468
+msgid "Application parameter"
+msgstr ""
+
+#: admin/groups/apps/class_groupApplication.inc:1469
+#: admin/applications/class_applicationGeneric.inc:135
+#: admin/groups/apps/edit_entry.tpl.c:32
+msgid "Place icon on members desktop"
+msgstr ""
+
+#: admin/groups/apps/class_groupApplication.inc:1470
+#: admin/applications/class_applicationGeneric.inc:145
+#: admin/groups/apps/edit_entry.tpl.c:38
+msgid "Place entry in members launch bar"
+msgstr ""
+
+#: admin/groups/apps/class_groupApplication.inc:1471
+#: admin/applications/class_applicationGeneric.inc:140
+#: admin/groups/apps/edit_entry.tpl.c:35
+msgid "Place entry in members startmenu"
+msgstr ""
+
+#: admin/mimetypes/class_mimetypeManagement.inc:28
+#: admin/mimetypes/class_mimetypeGeneric.inc:674
+msgid "Mime types"
+msgstr ""
+
+#: admin/mimetypes/class_mimetypeManagement.inc:29
+msgid "Mime type management"
+msgstr ""
+
+#: admin/mimetypes/class_mimetypeGeneric.inc:519
+#: admin/mimetypes/class_mimetypeGeneric.inc:685
+#: admin/applications/class_applicationParameters.inc:208
+#: admin/applications/class_applicationParameters.inc:212
+#: admin/groups/apps/edit_entry.tpl.c:26
+msgid "Name"
+msgstr ""
+
+#: admin/mimetypes/class_mimetypeGeneric.inc:522
+msgid "File pattern"
+msgstr ""
+
+#: admin/mimetypes/class_mimetypeGeneric.inc:671
+#: admin/applications/class_applicationGeneric.inc:69
+#: admin/mimetypes/generic.tpl.c:2
+msgid "Generic"
+msgstr ""
+
+#: admin/mimetypes/class_mimetypeGeneric.inc:672
+msgid "Mime type generic"
+msgstr ""
+
+#: admin/mimetypes/class_mimetypeGeneric.inc:678
+#: admin/mimetypes/generic.tpl.c:5
+msgid "Mime type"
+msgstr ""
+
+#: admin/mimetypes/class_mimetypeGeneric.inc:686
+#: admin/mimetypes/generic.tpl.c:11
+msgid "Mime group"
+msgstr ""
+
+#: admin/mimetypes/class_mimetypeGeneric.inc:687
+#: admin/applications/class_applicationGeneric.inc:105
+#: admin/mimetypes/generic.tpl.c:17
+msgid "Description"
+msgstr ""
+
+#: admin/mimetypes/class_mimetypeGeneric.inc:688
+#: admin/mimetypes/generic.tpl.c:23
+msgid "Base"
+msgstr ""
+
+#: admin/mimetypes/class_mimetypeGeneric.inc:690
+msgid "Left click action"
+msgstr ""
+
+#: admin/mimetypes/class_mimetypeGeneric.inc:691
+#: admin/applications/class_applicationGeneric.inc:112
+#: admin/mimetypes/generic.tpl.c:32
+msgid "Icon"
+msgstr ""
+
+#: admin/mimetypes/class_mimetypeGeneric.inc:692
+#: admin/mimetypes/generic.tpl.c:53
+msgid "File patterns"
+msgstr ""
+
+#: admin/mimetypes/class_mimetypeGeneric.inc:693
+msgid "Embedded applications"
+msgstr ""
+
 #: admin/applications/class_applicationManagement.inc:29
 msgid "Application management"
 msgstr ""
 
-#: admin/applications/class_applicationManagement.inc:100
-msgid "Web applications"
+#: admin/applications/class_applicationParameters.inc:71
+msgid "Remove options"
 msgstr ""
 
-#: admin/applications/class_applicationGeneric.inc:31
-#: admin/applications/class_applicationGeneric.inc:34
-#: admin/applications/class_applicationGeneric.inc:48
-#: admin/applications/class_webApplication.inc:47
-msgid "Application"
+#: admin/applications/class_applicationParameters.inc:71
+#: admin/applications/class_applicationParameters.inc:73
+msgid "parameter"
 msgstr ""
 
-#: admin/applications/class_applicationGeneric.inc:32
-msgid "Application information"
+#: admin/applications/class_applicationParameters.inc:73
+msgid "Create options"
 msgstr ""
 
-#: admin/applications/class_applicationGeneric.inc:52
-msgid "Application name"
+#: admin/applications/class_applicationParameters.inc:115
+msgid "Variable"
 msgstr ""
 
-#: admin/applications/class_applicationGeneric.inc:52
-msgid "The name of this application"
+#: admin/applications/class_applicationParameters.inc:115
+msgid "Default value"
 msgstr ""
 
-#: admin/applications/class_applicationGeneric.inc:56
-#: admin/applications/class_webApplication.inc:55
-msgid "Description"
+#: admin/applications/class_applicationParameters.inc:141
+#: admin/groups/apps/app_list.tpl.c:29 admin/groups/apps/app_list.tpl.c:41
+#: admin/groups/apps/app_list.tpl.c:53
+msgid "Remove"
 msgstr ""
 
-#: admin/applications/class_applicationGeneric.inc:56
-#: admin/applications/class_webApplication.inc:55
-msgid "A short description of this application"
+#: admin/applications/class_applicationParameters.inc:147
+msgid "Add option"
 msgstr ""
 
-#: admin/applications/class_applicationGeneric.inc:60
-msgid "Execute"
+#: admin/applications/class_applicationParameters.inc:265
+msgid "Parameter"
 msgstr ""
 
-#: admin/applications/class_applicationGeneric.inc:60
-msgid "The application to be executed"
+#: admin/applications/class_applicationParameters.inc:266
+msgid "Parameter configuration"
+msgstr ""
+
+#: admin/applications/class_applicationParameters.inc:271
+msgid "Application parameter settings"
+msgstr ""
+
+#: admin/applications/class_applicationGeneric.inc:70
+msgid "Application generic"
+msgstr ""
+
+#: admin/applications/class_applicationGeneric.inc:90
+msgid "Properties"
+msgstr ""
+
+#: admin/applications/class_applicationGeneric.inc:93
+msgid "Application name"
+msgstr ""
+
+#: admin/applications/class_applicationGeneric.inc:93
+msgid "The name of this application"
 msgstr ""
 
-#: admin/applications/class_applicationGeneric.inc:64
+#: admin/applications/class_applicationGeneric.inc:97
 msgid "Display name"
 msgstr ""
 
-#: admin/applications/class_applicationGeneric.inc:64
+#: admin/applications/class_applicationGeneric.inc:97
 msgid "The displayed name for this application"
 msgstr ""
 
-#: admin/applications/class_applicationGeneric.inc:70
-#: admin/applications/class_webApplication.inc:69
-msgid "Icon"
+#: admin/applications/class_applicationGeneric.inc:101
+msgid "Execute"
 msgstr ""
 
-#: admin/applications/class_applicationGeneric.inc:73
-#: admin/applications/class_webApplication.inc:72
+#: admin/applications/class_applicationGeneric.inc:101
+msgid "The application to be executed"
+msgstr ""
+
+#: admin/applications/class_applicationGeneric.inc:105
+msgid "A short description of this application"
+msgstr ""
+
+#: admin/applications/class_applicationGeneric.inc:115
 msgid "The icon for this application"
 msgstr ""
 
-#: admin/applications/class_applicationGeneric.inc:80
+#: admin/applications/class_applicationGeneric.inc:122
 msgid "Options"
 msgstr ""
 
-#: admin/applications/class_applicationGeneric.inc:83
+#: admin/applications/class_applicationGeneric.inc:125
 msgid "Only executable for member"
 msgstr ""
 
-#: admin/applications/class_applicationGeneric.inc:83
+#: admin/applications/class_applicationGeneric.inc:125
 msgid "Only executable by the memebers of the group"
 msgstr ""
 
-#: admin/applications/class_applicationGeneric.inc:88
+#: admin/applications/class_applicationGeneric.inc:130
 msgid "Replace user configuration on startup"
 msgstr ""
 
-#: admin/applications/class_applicationGeneric.inc:88
+#: admin/applications/class_applicationGeneric.inc:130
 msgid "Replace the user configuration on startup"
 msgstr ""
 
-#: admin/applications/class_applicationGeneric.inc:93
-msgid "Place icon on members desktop"
+#: admin/applications/class_applicationGeneric.inc:135
+msgid "Put an icon on the user desktop"
 msgstr ""
 
-#: admin/applications/class_applicationGeneric.inc:93
-msgid "Put an icon on the user desktop"
+#: admin/applications/class_applicationGeneric.inc:140
+#: admin/applications/class_applicationGeneric.inc:145
+msgid "Put an entry in the startup menu"
 msgstr ""
 
-#: admin/applications/class_applicationGeneric.inc:98
-msgid "Place entry in members startmenu"
+#: admin/applications/class_applicationGeneric.inc:156
+msgid "Script"
 msgstr ""
 
-#: admin/applications/class_applicationGeneric.inc:98
-#: admin/applications/class_applicationGeneric.inc:103
-msgid "Put an entry in the startup menu"
+#: admin/applications/class_applicationGeneric.inc:159
+msgid "Script to run at logon"
 msgstr ""
 
-#: admin/applications/class_applicationGeneric.inc:103
-msgid "Place entry in members launch bar"
+#: admin/applications/class_applicationGeneric.inc:165
+msgid "Log off script"
 msgstr ""
 
-#: admin/applications/class_webApplication.inc:30
-#: admin/applications/class_webApplication.inc:33
-msgid "Web application"
+#: admin/applications/class_applicationGeneric.inc:168
+msgid "Script to run at logoff"
 msgstr ""
 
-#: admin/applications/class_webApplication.inc:31
-msgid "Web applicationts names, icons and links"
+#: admin/applications/class_applicationGeneric.inc:227
+msgid "no example"
 msgstr ""
 
-#: admin/applications/class_webApplication.inc:51
-msgid "Name"
+#: admin/applications/class_applicationGeneric.inc:276
+msgid "Error"
 msgstr ""
 
-#: admin/applications/class_webApplication.inc:51
-msgid "Name or id for application"
+#: admin/applications/class_applicationGeneric.inc:276
+#, php-format
+msgid "Cannot remove application - it is still in use by these objects: %s"
 msgstr ""
 
-#: admin/applications/class_webApplication.inc:59
-msgid "URL"
+#: config/desktop-management/class_desktopPluginConfig.inc:28
+msgid "Desktop management"
 msgstr ""
 
-#: admin/applications/class_webApplication.inc:59
-msgid "Link to this application"
+#: config/desktop-management/class_desktopPluginConfig.inc:29
+msgid "Desktop management plugin configuration"
 msgstr ""
 
-#: admin/applications/class_webApplication.inc:63
-msgid "Display Name"
+#: config/desktop-management/class_desktopPluginConfig.inc:40
+msgid "LDAP tree"
 msgstr ""
 
-#: admin/applications/class_webApplication.inc:63
-msgid "Displayed name for links to this application"
+#: config/desktop-management/class_desktopPluginConfig.inc:43
+msgid "Mimetype RDN"
 msgstr ""
 
-#: admin/applications/class_webApplication.inc:77
-msgid "Icon location"
+#: config/desktop-management/class_desktopPluginConfig.inc:43
+msgid "Branch in which mime types will be stored"
 msgstr ""
 
-#: admin/applications/class_webApplication.inc:77
-msgid "Usual path to this application icon"
+#: config/desktop-management/class_desktopPluginConfig.inc:48
+msgid "Application RDN"
 msgstr ""
 
-#: admin/roles/class_applicationRights.inc:31
-msgid "Applications allowed for this role"
+#: config/desktop-management/class_desktopPluginConfig.inc:48
+msgid "Branch in which applications will be stored"
 msgstr ""
 
-#: admin/roles/class_applicationRights.inc:45
-msgid "Application list"
+#: admin/groups/apps/edit_entry.tpl.c:2
+msgid "Folder image"
 msgstr ""
 
-#: admin/roles/class_applicationRights.inc:49
-msgid "The applications users with this role are allowed to launch"
+#: admin/groups/apps/edit_entry.tpl.c:5
+msgid "Could not load image."
 msgstr ""
 
-#: config/applications/class_applicationsPluginConfig.inc:29
-msgid "Applications plugin configuration"
+#: admin/groups/apps/edit_entry.tpl.c:8
+msgid "None"
 msgstr ""
 
-#: config/applications/class_applicationsPluginConfig.inc:43
-msgid "Application RDN"
+#: admin/groups/apps/edit_entry.tpl.c:11
+msgid "Upload image"
 msgstr ""
 
-#: config/applications/class_applicationsPluginConfig.inc:43
-msgid "Branch in which applications will be stored"
+#: admin/groups/apps/edit_entry.tpl.c:14
+msgid "Upload"
 msgstr ""
 
-#: config/applications/class_applicationsPluginConfig.inc:48
-msgid "Web applications RDN"
+#: admin/groups/apps/edit_entry.tpl.c:17
+msgid "Reset image"
 msgstr ""
 
-#: config/applications/class_applicationsPluginConfig.inc:48
-msgid "Branch in which web applications will be stored"
+#: admin/groups/apps/edit_entry.tpl.c:20
+msgid "Reset"
 msgstr ""
 
-#: config/applications/class_applicationsPluginConfig.inc:53
-msgid "Show web applications in menu"
+#: admin/groups/apps/edit_entry.tpl.c:23
+msgid "Application settings"
 msgstr ""
 
-#: config/applications/class_applicationsPluginConfig.inc:53
-msgid "Whether to show web applications in FD main menu"
+#: admin/groups/apps/edit_entry.tpl.c:29
+msgid "Application options"
 msgstr ""
 
-#: config/applications/class_applicationsPluginConfig.inc:56
-msgid "None"
+#: admin/groups/apps/app_list.tpl.c:5
+msgid "Copy menu"
+msgstr ""
+
+#: admin/groups/apps/app_list.tpl.c:8
+msgid "Paste menu from"
+msgstr ""
+
+#: admin/groups/apps/app_list.tpl.c:11
+msgid "Delete menu"
+msgstr ""
+
+#: admin/groups/apps/app_list.tpl.c:17 admin/groups/apps/app_list.tpl.c:20
+msgid "Folder"
+msgstr ""
+
+#: admin/groups/apps/app_list.tpl.c:23 admin/groups/apps/app_list.tpl.c:35
+#: admin/groups/apps/app_list.tpl.c:47
+msgid "Move up"
+msgstr ""
+
+#: admin/groups/apps/app_list.tpl.c:26 admin/groups/apps/app_list.tpl.c:38
+#: admin/groups/apps/app_list.tpl.c:50
+msgid "Move down"
+msgstr ""
+
+#: admin/groups/apps/app_list.tpl.c:32 admin/groups/apps/app_list.tpl.c:56
+msgid "Edit"
+msgstr ""
+
+#: admin/groups/apps/app_list.tpl.c:44
+msgid "Entry"
+msgstr ""
+
+#: admin/groups/apps/app_list.tpl.c:59
+msgid "add to"
+msgstr ""
+
+#: admin/groups/apps/app_list.tpl.c:62
+msgid "Add selected category to this folder.."
+msgstr ""
+
+#: admin/groups/apps/app_list.tpl.c:65
+msgid "Separator"
+msgstr ""
+
+#: admin/groups/apps/app_list.tpl.c:68
+msgid "Add a separator to this folder."
+msgstr ""
+
+#: admin/groups/apps/app_list.tpl.c:71
+msgid "Add selected applications to this folder."
+msgstr ""
+
+#: admin/mimetypes/generic.tpl.c:8
+msgid "Please enter a name for the mime type here"
+msgstr ""
+
+#: admin/mimetypes/generic.tpl.c:14
+msgid "Categorize this mime type"
+msgstr ""
+
+#: admin/mimetypes/generic.tpl.c:20
+msgid "Please specify a description"
+msgstr ""
+
+#: admin/mimetypes/generic.tpl.c:26
+msgid "Choose subtree to place application in"
+msgstr ""
+
+#: admin/mimetypes/generic.tpl.c:29
+msgid "Select a base"
+msgstr ""
+
+#: admin/mimetypes/generic.tpl.c:35 admin/mimetypes/generic.tpl.c:38
+msgid "Mime icon"
+msgstr ""
+
+#: admin/mimetypes/generic.tpl.c:41
+msgid "Update"
+msgstr ""
+
+#: admin/mimetypes/generic.tpl.c:44
+msgid "Update mime type icon"
+msgstr ""
+
+#: admin/mimetypes/generic.tpl.c:47 admin/mimetypes/generic.tpl.c:50
+msgid "Left click"
+msgstr ""
+
+#: admin/mimetypes/generic.tpl.c:56
+msgid "Please specify a new file pattern"
+msgstr ""
+
+#: admin/mimetypes/generic.tpl.c:59
+msgid "Add a new file pattern"
+msgstr ""
+
+#: admin/mimetypes/generic.tpl.c:65 admin/mimetypes/generic.tpl.c:89
+msgid "Enter an application name here"
+msgstr ""
+
+#: admin/mimetypes/generic.tpl.c:68 admin/mimetypes/generic.tpl.c:92
+msgid "Add application"
+msgstr ""
+
+#: admin/mimetypes/generic.tpl.c:71 admin/mimetypes/generic.tpl.c:74
+msgid "Embedding"
+msgstr ""
+
+#: admin/mimetypes/generic.tpl.c:77
+msgid "Show file in embedded viewer"
 msgstr ""
 
-#: config/applications/class_applicationsPluginConfig.inc:56
-msgid "Only allowed"
+#: admin/mimetypes/generic.tpl.c:80
+msgid "Show file in external viewer"
 msgstr ""
 
-#: config/applications/class_applicationsPluginConfig.inc:56
-msgid "All"
+#: admin/mimetypes/generic.tpl.c:83
+msgid "Ask whether to save to local disk"
 msgstr ""
diff --git a/applications/locale/nb/fusiondirectory.po b/applications/locale/nb/fusiondirectory.po
index 35e11fd5e027628ee17a7d93be555c8bbd04a640..1aff3b51dc7485bc1a78a2f5a3f13e55e0f98933 100644
--- a/applications/locale/nb/fusiondirectory.po
+++ b/applications/locale/nb/fusiondirectory.po
@@ -5,219 +5,497 @@
 # Translators:
 msgid ""
 msgstr ""
-"Project-Id-Version: FusionDirectory-108\n"
+"Project-Id-Version: FusionDirectory-109\n"
 "Report-Msgid-Bugs-To: documentation@lists.fusiondirectory.org\n"
-"POT-Creation-Date: 2015-03-19 21:45+0100\n"
-"PO-Revision-Date: 2015-02-25 16:03+0000\n"
-"Last-Translator: fusiondirectory <contact@fusiondirectory.org>\n"
-"Language-Team: Norwegian BokmÃ¥l (http://www.transifex.com/projects/p/FusionDirectory-108/language/nb/)\n"
+"POT-Creation-Date: 2014-08-28 12:26+0200\n"
+"PO-Revision-Date: 2014-08-28 10:28+0000\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: Norwegian BokmÃ¥l (http://www.transifex.com/projects/p/FusionDirectory-109/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/groups/apps/class_groupApplication.inc:410
+#: admin/groups/apps/class_groupApplication.inc:414
+msgid "Menu"
+msgstr ""
+
+#: admin/groups/apps/class_groupApplication.inc:482
+msgid "Back"
+msgstr ""
+
+#: admin/groups/apps/class_groupApplication.inc:493
+msgid "back"
+msgstr ""
+
+#: admin/groups/apps/class_groupApplication.inc:501
+msgid "department"
+msgstr ""
+
+#: admin/groups/apps/class_groupApplication.inc:524
+msgid "application"
+msgstr ""
+
+#: admin/groups/apps/class_groupApplication.inc:701
+#: admin/groups/apps/class_groupApplication.inc:1396
+#: admin/groups/apps/class_groupApplication.inc:1409
+#: admin/groups/apps/class_groupApplication.inc:1422
+#: admin/mimetypes/class_mimetypeGeneric.inc:481
+#: admin/mimetypes/class_mimetypeGeneric.inc:493
+#: admin/mimetypes/class_mimetypeGeneric.inc:508
+#: admin/applications/class_applicationParameters.inc:177
+#: admin/applications/class_applicationParameters.inc:242
+#: admin/applications/class_applicationGeneric.inc:290
+msgid "LDAP error"
+msgstr "LDAP-feil"
+
+#: admin/groups/apps/class_groupApplication.inc:1208
+msgid "Not available in release."
+msgstr ""
+
+#: admin/groups/apps/class_groupApplication.inc:1459
 #: 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
+#: admin/mimetypes/generic.tpl.c:62 admin/mimetypes/generic.tpl.c:86
 msgid "Applications"
 msgstr ""
 
-#: admin/applications/class_applicationManagement.inc:29
-msgid "Application management"
+#: admin/groups/apps/class_groupApplication.inc:1460
+msgid "Group applications"
 msgstr ""
 
-#: admin/applications/class_applicationManagement.inc:100
-msgid "Web applications"
+#: admin/groups/apps/class_groupApplication.inc:1466
+#: admin/mimetypes/class_mimetypeGeneric.inc:689
+#: admin/applications/class_applicationGeneric.inc:73
+msgid "Application"
 msgstr ""
 
-#: admin/applications/class_applicationGeneric.inc:31
-#: admin/applications/class_applicationGeneric.inc:34
-#: admin/applications/class_applicationGeneric.inc:48
-#: admin/applications/class_webApplication.inc:47
-msgid "Application"
+#: admin/groups/apps/class_groupApplication.inc:1467
+#: admin/groups/apps/app_list.tpl.c:2 admin/groups/apps/app_list.tpl.c:14
+msgid "Release"
 msgstr ""
 
-#: admin/applications/class_applicationGeneric.inc:32
-msgid "Application information"
+#: admin/groups/apps/class_groupApplication.inc:1468
+msgid "Application parameter"
 msgstr ""
 
-#: admin/applications/class_applicationGeneric.inc:52
-msgid "Application name"
+#: admin/groups/apps/class_groupApplication.inc:1469
+#: admin/applications/class_applicationGeneric.inc:135
+#: admin/groups/apps/edit_entry.tpl.c:32
+msgid "Place icon on members desktop"
 msgstr ""
 
-#: admin/applications/class_applicationGeneric.inc:52
-msgid "The name of this application"
+#: admin/groups/apps/class_groupApplication.inc:1470
+#: admin/applications/class_applicationGeneric.inc:145
+#: admin/groups/apps/edit_entry.tpl.c:38
+msgid "Place entry in members launch bar"
+msgstr ""
+
+#: admin/groups/apps/class_groupApplication.inc:1471
+#: admin/applications/class_applicationGeneric.inc:140
+#: admin/groups/apps/edit_entry.tpl.c:35
+msgid "Place entry in members startmenu"
+msgstr ""
+
+#: admin/mimetypes/class_mimetypeManagement.inc:28
+#: admin/mimetypes/class_mimetypeGeneric.inc:674
+msgid "Mime types"
+msgstr ""
+
+#: admin/mimetypes/class_mimetypeManagement.inc:29
+msgid "Mime type management"
+msgstr ""
+
+#: admin/mimetypes/class_mimetypeGeneric.inc:519
+#: admin/mimetypes/class_mimetypeGeneric.inc:685
+#: admin/applications/class_applicationParameters.inc:208
+#: admin/applications/class_applicationParameters.inc:212
+#: admin/groups/apps/edit_entry.tpl.c:26
+msgid "Name"
+msgstr "Navn"
+
+#: admin/mimetypes/class_mimetypeGeneric.inc:522
+msgid "File pattern"
+msgstr ""
+
+#: admin/mimetypes/class_mimetypeGeneric.inc:671
+#: admin/applications/class_applicationGeneric.inc:69
+#: admin/mimetypes/generic.tpl.c:2
+msgid "Generic"
+msgstr "Generisk"
+
+#: admin/mimetypes/class_mimetypeGeneric.inc:672
+msgid "Mime type generic"
+msgstr ""
+
+#: admin/mimetypes/class_mimetypeGeneric.inc:678
+#: admin/mimetypes/generic.tpl.c:5
+msgid "Mime type"
+msgstr ""
+
+#: admin/mimetypes/class_mimetypeGeneric.inc:686
+#: admin/mimetypes/generic.tpl.c:11
+msgid "Mime group"
 msgstr ""
 
-#: admin/applications/class_applicationGeneric.inc:56
-#: admin/applications/class_webApplication.inc:55
+#: admin/mimetypes/class_mimetypeGeneric.inc:687
+#: admin/applications/class_applicationGeneric.inc:105
+#: admin/mimetypes/generic.tpl.c:17
 msgid "Description"
 msgstr "Beskrivelse"
 
-#: admin/applications/class_applicationGeneric.inc:56
-#: admin/applications/class_webApplication.inc:55
-msgid "A short description of this application"
+#: admin/mimetypes/class_mimetypeGeneric.inc:688
+#: admin/mimetypes/generic.tpl.c:23
+msgid "Base"
 msgstr ""
 
-#: admin/applications/class_applicationGeneric.inc:60
-msgid "Execute"
+#: admin/mimetypes/class_mimetypeGeneric.inc:690
+msgid "Left click action"
 msgstr ""
 
-#: admin/applications/class_applicationGeneric.inc:60
-msgid "The application to be executed"
+#: admin/mimetypes/class_mimetypeGeneric.inc:691
+#: admin/applications/class_applicationGeneric.inc:112
+#: admin/mimetypes/generic.tpl.c:32
+msgid "Icon"
+msgstr ""
+
+#: admin/mimetypes/class_mimetypeGeneric.inc:692
+#: admin/mimetypes/generic.tpl.c:53
+msgid "File patterns"
+msgstr ""
+
+#: admin/mimetypes/class_mimetypeGeneric.inc:693
+msgid "Embedded applications"
+msgstr ""
+
+#: admin/applications/class_applicationManagement.inc:29
+msgid "Application management"
+msgstr ""
+
+#: admin/applications/class_applicationParameters.inc:71
+msgid "Remove options"
+msgstr ""
+
+#: admin/applications/class_applicationParameters.inc:71
+#: admin/applications/class_applicationParameters.inc:73
+msgid "parameter"
+msgstr ""
+
+#: admin/applications/class_applicationParameters.inc:73
+msgid "Create options"
+msgstr ""
+
+#: admin/applications/class_applicationParameters.inc:115
+msgid "Variable"
+msgstr ""
+
+#: admin/applications/class_applicationParameters.inc:115
+msgid "Default value"
+msgstr ""
+
+#: admin/applications/class_applicationParameters.inc:141
+#: admin/groups/apps/app_list.tpl.c:29 admin/groups/apps/app_list.tpl.c:41
+#: admin/groups/apps/app_list.tpl.c:53
+msgid "Remove"
+msgstr "Fjern"
+
+#: admin/applications/class_applicationParameters.inc:147
+msgid "Add option"
+msgstr ""
+
+#: admin/applications/class_applicationParameters.inc:265
+msgid "Parameter"
+msgstr ""
+
+#: admin/applications/class_applicationParameters.inc:266
+msgid "Parameter configuration"
+msgstr ""
+
+#: admin/applications/class_applicationParameters.inc:271
+msgid "Application parameter settings"
+msgstr ""
+
+#: admin/applications/class_applicationGeneric.inc:70
+msgid "Application generic"
+msgstr ""
+
+#: admin/applications/class_applicationGeneric.inc:90
+msgid "Properties"
+msgstr "Egenskaper"
+
+#: admin/applications/class_applicationGeneric.inc:93
+msgid "Application name"
+msgstr ""
+
+#: admin/applications/class_applicationGeneric.inc:93
+msgid "The name of this application"
 msgstr ""
 
-#: admin/applications/class_applicationGeneric.inc:64
+#: admin/applications/class_applicationGeneric.inc:97
 msgid "Display name"
 msgstr ""
 
-#: admin/applications/class_applicationGeneric.inc:64
+#: admin/applications/class_applicationGeneric.inc:97
 msgid "The displayed name for this application"
 msgstr ""
 
-#: admin/applications/class_applicationGeneric.inc:70
-#: admin/applications/class_webApplication.inc:69
-msgid "Icon"
+#: admin/applications/class_applicationGeneric.inc:101
+msgid "Execute"
 msgstr ""
 
-#: admin/applications/class_applicationGeneric.inc:73
-#: admin/applications/class_webApplication.inc:72
+#: admin/applications/class_applicationGeneric.inc:101
+msgid "The application to be executed"
+msgstr ""
+
+#: admin/applications/class_applicationGeneric.inc:105
+msgid "A short description of this application"
+msgstr ""
+
+#: admin/applications/class_applicationGeneric.inc:115
 msgid "The icon for this application"
 msgstr ""
 
-#: admin/applications/class_applicationGeneric.inc:80
+#: admin/applications/class_applicationGeneric.inc:122
 msgid "Options"
 msgstr ""
 
-#: admin/applications/class_applicationGeneric.inc:83
+#: admin/applications/class_applicationGeneric.inc:125
 msgid "Only executable for member"
 msgstr ""
 
-#: admin/applications/class_applicationGeneric.inc:83
+#: admin/applications/class_applicationGeneric.inc:125
 msgid "Only executable by the memebers of the group"
 msgstr ""
 
-#: admin/applications/class_applicationGeneric.inc:88
+#: admin/applications/class_applicationGeneric.inc:130
 msgid "Replace user configuration on startup"
 msgstr ""
 
-#: admin/applications/class_applicationGeneric.inc:88
+#: admin/applications/class_applicationGeneric.inc:130
 msgid "Replace the user configuration on startup"
 msgstr ""
 
-#: admin/applications/class_applicationGeneric.inc:93
-msgid "Place icon on members desktop"
+#: admin/applications/class_applicationGeneric.inc:135
+msgid "Put an icon on the user desktop"
 msgstr ""
 
-#: admin/applications/class_applicationGeneric.inc:93
-msgid "Put an icon on the user desktop"
+#: admin/applications/class_applicationGeneric.inc:140
+#: admin/applications/class_applicationGeneric.inc:145
+msgid "Put an entry in the startup menu"
 msgstr ""
 
-#: admin/applications/class_applicationGeneric.inc:98
-msgid "Place entry in members startmenu"
+#: admin/applications/class_applicationGeneric.inc:156
+msgid "Script"
 msgstr ""
 
-#: admin/applications/class_applicationGeneric.inc:98
-#: admin/applications/class_applicationGeneric.inc:103
-msgid "Put an entry in the startup menu"
+#: admin/applications/class_applicationGeneric.inc:159
+msgid "Script to run at logon"
 msgstr ""
 
-#: admin/applications/class_applicationGeneric.inc:103
-msgid "Place entry in members launch bar"
+#: admin/applications/class_applicationGeneric.inc:165
+msgid "Log off script"
 msgstr ""
 
-#: admin/applications/class_webApplication.inc:30
-#: admin/applications/class_webApplication.inc:33
-msgid "Web application"
+#: admin/applications/class_applicationGeneric.inc:168
+msgid "Script to run at logoff"
 msgstr ""
 
-#: admin/applications/class_webApplication.inc:31
-msgid "Web applicationts names, icons and links"
+#: admin/applications/class_applicationGeneric.inc:227
+msgid "no example"
 msgstr ""
 
-#: admin/applications/class_webApplication.inc:51
-msgid "Name"
-msgstr "Navn"
+#: admin/applications/class_applicationGeneric.inc:276
+msgid "Error"
+msgstr "Feil"
 
-#: admin/applications/class_webApplication.inc:51
-msgid "Name or id for application"
+#: admin/applications/class_applicationGeneric.inc:276
+#, php-format
+msgid "Cannot remove application - it is still in use by these objects: %s"
 msgstr ""
 
-#: admin/applications/class_webApplication.inc:59
-msgid "URL"
+#: config/desktop-management/class_desktopPluginConfig.inc:28
+msgid "Desktop management"
 msgstr ""
 
-#: admin/applications/class_webApplication.inc:59
-msgid "Link to this application"
+#: config/desktop-management/class_desktopPluginConfig.inc:29
+msgid "Desktop management plugin configuration"
 msgstr ""
 
-#: admin/applications/class_webApplication.inc:63
-msgid "Display Name"
+#: config/desktop-management/class_desktopPluginConfig.inc:40
+msgid "LDAP tree"
 msgstr ""
 
-#: admin/applications/class_webApplication.inc:63
-msgid "Displayed name for links to this application"
+#: config/desktop-management/class_desktopPluginConfig.inc:43
+msgid "Mimetype RDN"
 msgstr ""
 
-#: admin/applications/class_webApplication.inc:77
-msgid "Icon location"
+#: config/desktop-management/class_desktopPluginConfig.inc:43
+msgid "Branch in which mime types will be stored"
+msgstr ""
+
+#: config/desktop-management/class_desktopPluginConfig.inc:48
+msgid "Application RDN"
 msgstr ""
 
-#: admin/applications/class_webApplication.inc:77
-msgid "Usual path to this application icon"
+#: config/desktop-management/class_desktopPluginConfig.inc:48
+msgid "Branch in which applications will be stored"
 msgstr ""
 
-#: admin/roles/class_applicationRights.inc:31
-msgid "Applications allowed for this role"
+#: admin/groups/apps/edit_entry.tpl.c:2
+msgid "Folder image"
 msgstr ""
 
-#: admin/roles/class_applicationRights.inc:45
-msgid "Application list"
+#: admin/groups/apps/edit_entry.tpl.c:5
+msgid "Could not load image."
 msgstr ""
 
-#: admin/roles/class_applicationRights.inc:49
-msgid "The applications users with this role are allowed to launch"
+#: admin/groups/apps/edit_entry.tpl.c:8
+msgid "None"
 msgstr ""
 
-#: config/applications/class_applicationsPluginConfig.inc:29
-msgid "Applications plugin configuration"
+#: admin/groups/apps/edit_entry.tpl.c:11
+msgid "Upload image"
 msgstr ""
 
-#: config/applications/class_applicationsPluginConfig.inc:43
-msgid "Application RDN"
+#: admin/groups/apps/edit_entry.tpl.c:14
+msgid "Upload"
 msgstr ""
 
-#: config/applications/class_applicationsPluginConfig.inc:43
-msgid "Branch in which applications will be stored"
+#: admin/groups/apps/edit_entry.tpl.c:17
+msgid "Reset image"
 msgstr ""
 
-#: config/applications/class_applicationsPluginConfig.inc:48
-msgid "Web applications RDN"
+#: admin/groups/apps/edit_entry.tpl.c:20
+msgid "Reset"
 msgstr ""
 
-#: config/applications/class_applicationsPluginConfig.inc:48
-msgid "Branch in which web applications will be stored"
+#: admin/groups/apps/edit_entry.tpl.c:23
+msgid "Application settings"
 msgstr ""
 
-#: config/applications/class_applicationsPluginConfig.inc:53
-msgid "Show web applications in menu"
+#: admin/groups/apps/edit_entry.tpl.c:29
+msgid "Application options"
 msgstr ""
 
-#: config/applications/class_applicationsPluginConfig.inc:53
-msgid "Whether to show web applications in FD main menu"
+#: admin/groups/apps/app_list.tpl.c:5
+msgid "Copy menu"
 msgstr ""
 
-#: config/applications/class_applicationsPluginConfig.inc:56
-msgid "None"
+#: admin/groups/apps/app_list.tpl.c:8
+msgid "Paste menu from"
+msgstr ""
+
+#: admin/groups/apps/app_list.tpl.c:11
+msgid "Delete menu"
+msgstr ""
+
+#: admin/groups/apps/app_list.tpl.c:17 admin/groups/apps/app_list.tpl.c:20
+msgid "Folder"
+msgstr ""
+
+#: admin/groups/apps/app_list.tpl.c:23 admin/groups/apps/app_list.tpl.c:35
+#: admin/groups/apps/app_list.tpl.c:47
+msgid "Move up"
+msgstr ""
+
+#: admin/groups/apps/app_list.tpl.c:26 admin/groups/apps/app_list.tpl.c:38
+#: admin/groups/apps/app_list.tpl.c:50
+msgid "Move down"
+msgstr ""
+
+#: admin/groups/apps/app_list.tpl.c:32 admin/groups/apps/app_list.tpl.c:56
+msgid "Edit"
+msgstr "Endre"
+
+#: admin/groups/apps/app_list.tpl.c:44
+msgid "Entry"
+msgstr ""
+
+#: admin/groups/apps/app_list.tpl.c:59
+msgid "add to"
+msgstr ""
+
+#: admin/groups/apps/app_list.tpl.c:62
+msgid "Add selected category to this folder.."
+msgstr ""
+
+#: admin/groups/apps/app_list.tpl.c:65
+msgid "Separator"
+msgstr ""
+
+#: admin/groups/apps/app_list.tpl.c:68
+msgid "Add a separator to this folder."
+msgstr ""
+
+#: admin/groups/apps/app_list.tpl.c:71
+msgid "Add selected applications to this folder."
+msgstr ""
+
+#: admin/mimetypes/generic.tpl.c:8
+msgid "Please enter a name for the mime type here"
+msgstr ""
+
+#: admin/mimetypes/generic.tpl.c:14
+msgid "Categorize this mime type"
+msgstr ""
+
+#: admin/mimetypes/generic.tpl.c:20
+msgid "Please specify a description"
+msgstr ""
+
+#: admin/mimetypes/generic.tpl.c:26
+msgid "Choose subtree to place application in"
+msgstr ""
+
+#: admin/mimetypes/generic.tpl.c:29
+msgid "Select a base"
+msgstr ""
+
+#: admin/mimetypes/generic.tpl.c:35 admin/mimetypes/generic.tpl.c:38
+msgid "Mime icon"
+msgstr ""
+
+#: admin/mimetypes/generic.tpl.c:41
+msgid "Update"
+msgstr ""
+
+#: admin/mimetypes/generic.tpl.c:44
+msgid "Update mime type icon"
+msgstr ""
+
+#: admin/mimetypes/generic.tpl.c:47 admin/mimetypes/generic.tpl.c:50
+msgid "Left click"
+msgstr ""
+
+#: admin/mimetypes/generic.tpl.c:56
+msgid "Please specify a new file pattern"
+msgstr ""
+
+#: admin/mimetypes/generic.tpl.c:59
+msgid "Add a new file pattern"
+msgstr ""
+
+#: admin/mimetypes/generic.tpl.c:65 admin/mimetypes/generic.tpl.c:89
+msgid "Enter an application name here"
+msgstr ""
+
+#: admin/mimetypes/generic.tpl.c:68 admin/mimetypes/generic.tpl.c:92
+msgid "Add application"
+msgstr ""
+
+#: admin/mimetypes/generic.tpl.c:71 admin/mimetypes/generic.tpl.c:74
+msgid "Embedding"
+msgstr ""
+
+#: admin/mimetypes/generic.tpl.c:77
+msgid "Show file in embedded viewer"
 msgstr ""
 
-#: config/applications/class_applicationsPluginConfig.inc:56
-msgid "Only allowed"
+#: admin/mimetypes/generic.tpl.c:80
+msgid "Show file in external viewer"
 msgstr ""
 
-#: config/applications/class_applicationsPluginConfig.inc:56
-msgid "All"
+#: admin/mimetypes/generic.tpl.c:83
+msgid "Ask whether to save to local disk"
 msgstr ""
diff --git a/applications/locale/nl/fusiondirectory.po b/applications/locale/nl/fusiondirectory.po
index 35da7b16531d5f97f65ea19e71ec0b68b73d373f..654d6df6e444c14a4575209fa6b6d5239b939e22 100644
--- a/applications/locale/nl/fusiondirectory.po
+++ b/applications/locale/nl/fusiondirectory.po
@@ -5,219 +5,497 @@
 # Translators:
 msgid ""
 msgstr ""
-"Project-Id-Version: FusionDirectory-108\n"
+"Project-Id-Version: FusionDirectory-109\n"
 "Report-Msgid-Bugs-To: documentation@lists.fusiondirectory.org\n"
-"POT-Creation-Date: 2015-03-19 21:45+0100\n"
-"PO-Revision-Date: 2015-02-25 16:12+0000\n"
-"Last-Translator: fusiondirectory <contact@fusiondirectory.org>\n"
-"Language-Team: Dutch (http://www.transifex.com/projects/p/FusionDirectory-108/language/nl/)\n"
+"POT-Creation-Date: 2014-08-28 12:26+0200\n"
+"PO-Revision-Date: 2014-08-28 10:28+0000\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: Dutch (http://www.transifex.com/projects/p/FusionDirectory-109/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/groups/apps/class_groupApplication.inc:410
+#: admin/groups/apps/class_groupApplication.inc:414
+msgid "Menu"
+msgstr "Menu"
+
+#: admin/groups/apps/class_groupApplication.inc:482
+msgid "Back"
+msgstr "Terug"
+
+#: admin/groups/apps/class_groupApplication.inc:493
+msgid "back"
+msgstr "terug"
+
+#: admin/groups/apps/class_groupApplication.inc:501
+msgid "department"
+msgstr "afdeling"
+
+#: admin/groups/apps/class_groupApplication.inc:524
+msgid "application"
+msgstr "programma"
+
+#: admin/groups/apps/class_groupApplication.inc:701
+#: admin/groups/apps/class_groupApplication.inc:1396
+#: admin/groups/apps/class_groupApplication.inc:1409
+#: admin/groups/apps/class_groupApplication.inc:1422
+#: admin/mimetypes/class_mimetypeGeneric.inc:481
+#: admin/mimetypes/class_mimetypeGeneric.inc:493
+#: admin/mimetypes/class_mimetypeGeneric.inc:508
+#: admin/applications/class_applicationParameters.inc:177
+#: admin/applications/class_applicationParameters.inc:242
+#: admin/applications/class_applicationGeneric.inc:290
+msgid "LDAP error"
+msgstr "LDAP fout"
+
+#: admin/groups/apps/class_groupApplication.inc:1208
+msgid "Not available in release."
+msgstr "Niet beschikbaar in release."
+
+#: admin/groups/apps/class_groupApplication.inc:1459
 #: 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
+#: admin/mimetypes/generic.tpl.c:62 admin/mimetypes/generic.tpl.c:86
 msgid "Applications"
 msgstr "Programma's"
 
+#: admin/groups/apps/class_groupApplication.inc:1460
+msgid "Group applications"
+msgstr "Groep applicaties"
+
+#: admin/groups/apps/class_groupApplication.inc:1466
+#: admin/mimetypes/class_mimetypeGeneric.inc:689
+#: admin/applications/class_applicationGeneric.inc:73
+msgid "Application"
+msgstr "Programma"
+
+#: admin/groups/apps/class_groupApplication.inc:1467
+#: admin/groups/apps/app_list.tpl.c:2 admin/groups/apps/app_list.tpl.c:14
+msgid "Release"
+msgstr "Distributie versie"
+
+#: admin/groups/apps/class_groupApplication.inc:1468
+msgid "Application parameter"
+msgstr "Applicatie parameter"
+
+#: admin/groups/apps/class_groupApplication.inc:1469
+#: admin/applications/class_applicationGeneric.inc:135
+#: admin/groups/apps/edit_entry.tpl.c:32
+msgid "Place icon on members desktop"
+msgstr "Plaats icoon op de desktop van groepsleden"
+
+#: admin/groups/apps/class_groupApplication.inc:1470
+#: admin/applications/class_applicationGeneric.inc:145
+#: admin/groups/apps/edit_entry.tpl.c:38
+msgid "Place entry in members launch bar"
+msgstr "Plaats invoer in snelstartbalk van groepsleden"
+
+#: admin/groups/apps/class_groupApplication.inc:1471
+#: admin/applications/class_applicationGeneric.inc:140
+#: admin/groups/apps/edit_entry.tpl.c:35
+msgid "Place entry in members startmenu"
+msgstr "Plaats programma in het startmenu van groepsleden"
+
+#: admin/mimetypes/class_mimetypeManagement.inc:28
+#: admin/mimetypes/class_mimetypeGeneric.inc:674
+msgid "Mime types"
+msgstr "Mime types"
+
+#: admin/mimetypes/class_mimetypeManagement.inc:29
+msgid "Mime type management"
+msgstr "Mime type beheer"
+
+#: admin/mimetypes/class_mimetypeGeneric.inc:519
+#: admin/mimetypes/class_mimetypeGeneric.inc:685
+#: admin/applications/class_applicationParameters.inc:208
+#: admin/applications/class_applicationParameters.inc:212
+#: admin/groups/apps/edit_entry.tpl.c:26
+msgid "Name"
+msgstr "Naam"
+
+#: admin/mimetypes/class_mimetypeGeneric.inc:522
+msgid "File pattern"
+msgstr "Bestand pattern"
+
+#: admin/mimetypes/class_mimetypeGeneric.inc:671
+#: admin/applications/class_applicationGeneric.inc:69
+#: admin/mimetypes/generic.tpl.c:2
+msgid "Generic"
+msgstr "Algemeen"
+
+#: admin/mimetypes/class_mimetypeGeneric.inc:672
+msgid "Mime type generic"
+msgstr "Mime type generic"
+
+#: admin/mimetypes/class_mimetypeGeneric.inc:678
+#: admin/mimetypes/generic.tpl.c:5
+msgid "Mime type"
+msgstr "Mime type"
+
+#: admin/mimetypes/class_mimetypeGeneric.inc:686
+#: admin/mimetypes/generic.tpl.c:11
+msgid "Mime group"
+msgstr "Mime groep"
+
+#: admin/mimetypes/class_mimetypeGeneric.inc:687
+#: admin/applications/class_applicationGeneric.inc:105
+#: admin/mimetypes/generic.tpl.c:17
+msgid "Description"
+msgstr "Omschrijving"
+
+#: admin/mimetypes/class_mimetypeGeneric.inc:688
+#: admin/mimetypes/generic.tpl.c:23
+msgid "Base"
+msgstr "Basis"
+
+#: admin/mimetypes/class_mimetypeGeneric.inc:690
+msgid "Left click action"
+msgstr "Linkerklick actie"
+
+#: admin/mimetypes/class_mimetypeGeneric.inc:691
+#: admin/applications/class_applicationGeneric.inc:112
+#: admin/mimetypes/generic.tpl.c:32
+msgid "Icon"
+msgstr "Icoon"
+
+#: admin/mimetypes/class_mimetypeGeneric.inc:692
+#: admin/mimetypes/generic.tpl.c:53
+msgid "File patterns"
+msgstr "Bestand patterns"
+
+#: admin/mimetypes/class_mimetypeGeneric.inc:693
+msgid "Embedded applications"
+msgstr "Embedded applicaties"
+
 #: admin/applications/class_applicationManagement.inc:29
 msgid "Application management"
 msgstr "Programma beheer"
 
-#: admin/applications/class_applicationManagement.inc:100
-msgid "Web applications"
-msgstr ""
+#: admin/applications/class_applicationParameters.inc:71
+msgid "Remove options"
+msgstr "Opties verwijderen"
 
-#: admin/applications/class_applicationGeneric.inc:31
-#: admin/applications/class_applicationGeneric.inc:34
-#: admin/applications/class_applicationGeneric.inc:48
-#: admin/applications/class_webApplication.inc:47
-msgid "Application"
-msgstr "Programma"
+#: admin/applications/class_applicationParameters.inc:71
+#: admin/applications/class_applicationParameters.inc:73
+msgid "parameter"
+msgstr "parameter"
 
-#: admin/applications/class_applicationGeneric.inc:32
-msgid "Application information"
-msgstr ""
+#: admin/applications/class_applicationParameters.inc:73
+msgid "Create options"
+msgstr "Opties aanmaken"
+
+#: admin/applications/class_applicationParameters.inc:115
+msgid "Variable"
+msgstr "Variabele"
+
+#: admin/applications/class_applicationParameters.inc:115
+msgid "Default value"
+msgstr "Standaard waarde"
+
+#: admin/applications/class_applicationParameters.inc:141
+#: admin/groups/apps/app_list.tpl.c:29 admin/groups/apps/app_list.tpl.c:41
+#: admin/groups/apps/app_list.tpl.c:53
+msgid "Remove"
+msgstr "Verwijderen"
+
+#: admin/applications/class_applicationParameters.inc:147
+msgid "Add option"
+msgstr "Optie toevoegen"
+
+#: admin/applications/class_applicationParameters.inc:265
+msgid "Parameter"
+msgstr "Parameters"
+
+#: admin/applications/class_applicationParameters.inc:266
+msgid "Parameter configuration"
+msgstr "Parameter configuratie"
+
+#: admin/applications/class_applicationParameters.inc:271
+msgid "Application parameter settings"
+msgstr "Applicatie parameter instelling"
+
+#: admin/applications/class_applicationGeneric.inc:70
+msgid "Application generic"
+msgstr "Applicatie generiek"
+
+#: admin/applications/class_applicationGeneric.inc:90
+msgid "Properties"
+msgstr "Eigenschappen"
 
-#: admin/applications/class_applicationGeneric.inc:52
+#: admin/applications/class_applicationGeneric.inc:93
 msgid "Application name"
 msgstr "Programmanaam"
 
-#: admin/applications/class_applicationGeneric.inc:52
+#: admin/applications/class_applicationGeneric.inc:93
 msgid "The name of this application"
 msgstr ""
 
-#: admin/applications/class_applicationGeneric.inc:56
-#: admin/applications/class_webApplication.inc:55
-msgid "Description"
-msgstr "Omschrijving"
+#: admin/applications/class_applicationGeneric.inc:97
+msgid "Display name"
+msgstr "Getoonde naam"
 
-#: admin/applications/class_applicationGeneric.inc:56
-#: admin/applications/class_webApplication.inc:55
-msgid "A short description of this application"
+#: admin/applications/class_applicationGeneric.inc:97
+msgid "The displayed name for this application"
 msgstr ""
 
-#: admin/applications/class_applicationGeneric.inc:60
+#: admin/applications/class_applicationGeneric.inc:101
 msgid "Execute"
 msgstr "Commando"
 
-#: admin/applications/class_applicationGeneric.inc:60
+#: admin/applications/class_applicationGeneric.inc:101
 msgid "The application to be executed"
 msgstr ""
 
-#: admin/applications/class_applicationGeneric.inc:64
-msgid "Display name"
-msgstr "Getoonde naam"
-
-#: admin/applications/class_applicationGeneric.inc:64
-msgid "The displayed name for this application"
+#: admin/applications/class_applicationGeneric.inc:105
+msgid "A short description of this application"
 msgstr ""
 
-#: admin/applications/class_applicationGeneric.inc:70
-#: admin/applications/class_webApplication.inc:69
-msgid "Icon"
-msgstr "Icoon"
-
-#: admin/applications/class_applicationGeneric.inc:73
-#: admin/applications/class_webApplication.inc:72
+#: admin/applications/class_applicationGeneric.inc:115
 msgid "The icon for this application"
 msgstr ""
 
-#: admin/applications/class_applicationGeneric.inc:80
+#: admin/applications/class_applicationGeneric.inc:122
 msgid "Options"
 msgstr "Opties"
 
-#: admin/applications/class_applicationGeneric.inc:83
+#: admin/applications/class_applicationGeneric.inc:125
 msgid "Only executable for member"
 msgstr ""
 
-#: admin/applications/class_applicationGeneric.inc:83
+#: admin/applications/class_applicationGeneric.inc:125
 msgid "Only executable by the memebers of the group"
 msgstr ""
 
-#: admin/applications/class_applicationGeneric.inc:88
+#: admin/applications/class_applicationGeneric.inc:130
 msgid "Replace user configuration on startup"
 msgstr "Vervang gebruikers configuratie bij opstarten"
 
-#: admin/applications/class_applicationGeneric.inc:88
+#: admin/applications/class_applicationGeneric.inc:130
 msgid "Replace the user configuration on startup"
 msgstr ""
 
-#: admin/applications/class_applicationGeneric.inc:93
-msgid "Place icon on members desktop"
-msgstr "Plaats icoon op de desktop van groepsleden"
-
-#: admin/applications/class_applicationGeneric.inc:93
+#: admin/applications/class_applicationGeneric.inc:135
 msgid "Put an icon on the user desktop"
 msgstr ""
 
-#: admin/applications/class_applicationGeneric.inc:98
-msgid "Place entry in members startmenu"
-msgstr "Plaats programma in het startmenu van groepsleden"
-
-#: admin/applications/class_applicationGeneric.inc:98
-#: admin/applications/class_applicationGeneric.inc:103
+#: admin/applications/class_applicationGeneric.inc:140
+#: admin/applications/class_applicationGeneric.inc:145
 msgid "Put an entry in the startup menu"
 msgstr ""
 
-#: admin/applications/class_applicationGeneric.inc:103
-msgid "Place entry in members launch bar"
-msgstr "Plaats invoer in snelstartbalk van groepsleden"
-
-#: admin/applications/class_webApplication.inc:30
-#: admin/applications/class_webApplication.inc:33
-msgid "Web application"
-msgstr ""
+#: admin/applications/class_applicationGeneric.inc:156
+msgid "Script"
+msgstr "Script"
 
-#: admin/applications/class_webApplication.inc:31
-msgid "Web applicationts names, icons and links"
+#: admin/applications/class_applicationGeneric.inc:159
+msgid "Script to run at logon"
 msgstr ""
 
-#: admin/applications/class_webApplication.inc:51
-msgid "Name"
-msgstr "Naam"
-
-#: admin/applications/class_webApplication.inc:51
-msgid "Name or id for application"
+#: admin/applications/class_applicationGeneric.inc:165
+msgid "Log off script"
 msgstr ""
 
-#: admin/applications/class_webApplication.inc:59
-msgid "URL"
-msgstr "URL"
-
-#: admin/applications/class_webApplication.inc:59
-msgid "Link to this application"
+#: admin/applications/class_applicationGeneric.inc:168
+msgid "Script to run at logoff"
 msgstr ""
 
-#: admin/applications/class_webApplication.inc:63
-msgid "Display Name"
-msgstr ""
+#: admin/applications/class_applicationGeneric.inc:227
+msgid "no example"
+msgstr "geen voorbeeld"
 
-#: admin/applications/class_webApplication.inc:63
-msgid "Displayed name for links to this application"
-msgstr ""
+#: admin/applications/class_applicationGeneric.inc:276
+msgid "Error"
+msgstr "Fout"
 
-#: admin/applications/class_webApplication.inc:77
-msgid "Icon location"
-msgstr ""
+#: admin/applications/class_applicationGeneric.inc:276
+#, php-format
+msgid "Cannot remove application - it is still in use by these objects: %s"
+msgstr "Kan applicatie niet verwijderen - is in gebruik door volgende objecten: %s"
 
-#: admin/applications/class_webApplication.inc:77
-msgid "Usual path to this application icon"
+#: config/desktop-management/class_desktopPluginConfig.inc:28
+msgid "Desktop management"
 msgstr ""
 
-#: admin/roles/class_applicationRights.inc:31
-msgid "Applications allowed for this role"
+#: config/desktop-management/class_desktopPluginConfig.inc:29
+msgid "Desktop management plugin configuration"
 msgstr ""
 
-#: admin/roles/class_applicationRights.inc:45
-msgid "Application list"
-msgstr ""
+#: config/desktop-management/class_desktopPluginConfig.inc:40
+msgid "LDAP tree"
+msgstr "LDAP tree"
 
-#: admin/roles/class_applicationRights.inc:49
-msgid "The applications users with this role are allowed to launch"
+#: config/desktop-management/class_desktopPluginConfig.inc:43
+msgid "Mimetype RDN"
 msgstr ""
 
-#: config/applications/class_applicationsPluginConfig.inc:29
-msgid "Applications plugin configuration"
+#: config/desktop-management/class_desktopPluginConfig.inc:43
+msgid "Branch in which mime types will be stored"
 msgstr ""
 
-#: config/applications/class_applicationsPluginConfig.inc:43
+#: config/desktop-management/class_desktopPluginConfig.inc:48
 msgid "Application RDN"
 msgstr ""
 
-#: config/applications/class_applicationsPluginConfig.inc:43
+#: config/desktop-management/class_desktopPluginConfig.inc:48
 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 ""
+#: admin/groups/apps/edit_entry.tpl.c:2
+msgid "Folder image"
+msgstr "Map image"
 
-#: config/applications/class_applicationsPluginConfig.inc:53
-msgid "Whether to show web applications in FD main menu"
-msgstr ""
+#: admin/groups/apps/edit_entry.tpl.c:5
+msgid "Could not load image."
+msgstr "Kan image niet laden."
 
-#: config/applications/class_applicationsPluginConfig.inc:56
+#: admin/groups/apps/edit_entry.tpl.c:8
 msgid "None"
 msgstr "Geen"
 
-#: config/applications/class_applicationsPluginConfig.inc:56
-msgid "Only allowed"
-msgstr ""
+#: admin/groups/apps/edit_entry.tpl.c:11
+msgid "Upload image"
+msgstr "Upload image"
+
+#: admin/groups/apps/edit_entry.tpl.c:14
+msgid "Upload"
+msgstr "Uploaden"
+
+#: admin/groups/apps/edit_entry.tpl.c:17
+msgid "Reset image"
+msgstr "Reset image"
+
+#: admin/groups/apps/edit_entry.tpl.c:20
+msgid "Reset"
+msgstr "Reset"
+
+#: admin/groups/apps/edit_entry.tpl.c:23
+msgid "Application settings"
+msgstr "Programma instellingen"
+
+#: admin/groups/apps/edit_entry.tpl.c:29
+msgid "Application options"
+msgstr "Programma opties"
+
+#: admin/groups/apps/app_list.tpl.c:5
+msgid "Copy menu"
+msgstr "Kopieer menu"
+
+#: admin/groups/apps/app_list.tpl.c:8
+msgid "Paste menu from"
+msgstr "Plak menu van"
+
+#: admin/groups/apps/app_list.tpl.c:11
+msgid "Delete menu"
+msgstr "Verwijder menu"
+
+#: admin/groups/apps/app_list.tpl.c:17 admin/groups/apps/app_list.tpl.c:20
+msgid "Folder"
+msgstr "Map"
+
+#: admin/groups/apps/app_list.tpl.c:23 admin/groups/apps/app_list.tpl.c:35
+#: admin/groups/apps/app_list.tpl.c:47
+msgid "Move up"
+msgstr "Omhoog verplaatsen"
+
+#: admin/groups/apps/app_list.tpl.c:26 admin/groups/apps/app_list.tpl.c:38
+#: admin/groups/apps/app_list.tpl.c:50
+msgid "Move down"
+msgstr "Omlaag verplaatsen"
+
+#: admin/groups/apps/app_list.tpl.c:32 admin/groups/apps/app_list.tpl.c:56
+msgid "Edit"
+msgstr "Bewerken"
+
+#: admin/groups/apps/app_list.tpl.c:44
+msgid "Entry"
+msgstr "Gegeven"
+
+#: admin/groups/apps/app_list.tpl.c:59
+msgid "add to"
+msgstr "voeg toe"
+
+#: admin/groups/apps/app_list.tpl.c:62
+msgid "Add selected category to this folder.."
+msgstr "Voeg geselecteerde categorie toe aan deze folder.."
+
+#: admin/groups/apps/app_list.tpl.c:65
+msgid "Separator"
+msgstr "Separator"
+
+#: admin/groups/apps/app_list.tpl.c:68
+msgid "Add a separator to this folder."
+msgstr "Voeg een separator toeg in deze map."
+
+#: admin/groups/apps/app_list.tpl.c:71
+msgid "Add selected applications to this folder."
+msgstr "Voeg geselecteerde applicatie in deze map."
+
+#: admin/mimetypes/generic.tpl.c:8
+msgid "Please enter a name for the mime type here"
+msgstr "Geef hier een naam voor het mime type in"
+
+#: admin/mimetypes/generic.tpl.c:14
+msgid "Categorize this mime type"
+msgstr "Categorizeer deze mime type"
+
+#: admin/mimetypes/generic.tpl.c:20
+msgid "Please specify a description"
+msgstr "Gelieve een descripte te specificeren"
+
+#: admin/mimetypes/generic.tpl.c:26
+msgid "Choose subtree to place application in"
+msgstr "Selecteer de subtree waaronder het programma geplaatst zal worden."
+
+#: admin/mimetypes/generic.tpl.c:29
+msgid "Select a base"
+msgstr "Selecteer een basis"
 
-#: config/applications/class_applicationsPluginConfig.inc:56
-msgid "All"
-msgstr "Alle"
+#: admin/mimetypes/generic.tpl.c:35 admin/mimetypes/generic.tpl.c:38
+msgid "Mime icon"
+msgstr "Mime icon"
+
+#: admin/mimetypes/generic.tpl.c:41
+msgid "Update"
+msgstr "Bijwerken"
+
+#: admin/mimetypes/generic.tpl.c:44
+msgid "Update mime type icon"
+msgstr "Update mime type icon"
+
+#: admin/mimetypes/generic.tpl.c:47 admin/mimetypes/generic.tpl.c:50
+msgid "Left click"
+msgstr "linkerklik"
+
+#: admin/mimetypes/generic.tpl.c:56
+msgid "Please specify a new file pattern"
+msgstr "Gelieve een nieuw bestand pattern te specificeren"
+
+#: admin/mimetypes/generic.tpl.c:59
+msgid "Add a new file pattern"
+msgstr "Voeg een nieuw bestand pattern toe"
+
+#: admin/mimetypes/generic.tpl.c:65 admin/mimetypes/generic.tpl.c:89
+msgid "Enter an application name here"
+msgstr "Vul een andere applicatie naam hier"
+
+#: admin/mimetypes/generic.tpl.c:68 admin/mimetypes/generic.tpl.c:92
+msgid "Add application"
+msgstr "Applicatie toevoegen"
+
+#: admin/mimetypes/generic.tpl.c:71 admin/mimetypes/generic.tpl.c:74
+msgid "Embedding"
+msgstr "Embedding"
+
+#: admin/mimetypes/generic.tpl.c:77
+msgid "Show file in embedded viewer"
+msgstr "Toon bestand in embedded weergave"
+
+#: admin/mimetypes/generic.tpl.c:80
+msgid "Show file in external viewer"
+msgstr "Toon bestand in externe weergave"
+
+#: admin/mimetypes/generic.tpl.c:83
+msgid "Ask whether to save to local disk"
+msgstr "Vraag om op te slaan op de lokale harde schijf"
diff --git a/applications/locale/pl/fusiondirectory.po b/applications/locale/pl/fusiondirectory.po
index ddae8c32c2f36719a306327db04c0e74c0579dab..64df07b880037b0e95beeef52f0fa2768737f20c 100644
--- a/applications/locale/pl/fusiondirectory.po
+++ b/applications/locale/pl/fusiondirectory.po
@@ -5,219 +5,497 @@
 # Translators:
 msgid ""
 msgstr ""
-"Project-Id-Version: FusionDirectory-108\n"
+"Project-Id-Version: FusionDirectory-109\n"
 "Report-Msgid-Bugs-To: documentation@lists.fusiondirectory.org\n"
-"POT-Creation-Date: 2015-03-19 21:45+0100\n"
-"PO-Revision-Date: 2015-02-25 16:12+0000\n"
-"Last-Translator: fusiondirectory <contact@fusiondirectory.org>\n"
-"Language-Team: Polish (http://www.transifex.com/projects/p/FusionDirectory-108/language/pl/)\n"
+"POT-Creation-Date: 2014-08-28 12:26+0200\n"
+"PO-Revision-Date: 2014-08-28 10:28+0000\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: Polish (http://www.transifex.com/projects/p/FusionDirectory-109/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/groups/apps/class_groupApplication.inc:410
+#: admin/groups/apps/class_groupApplication.inc:414
+msgid "Menu"
+msgstr ""
+
+#: admin/groups/apps/class_groupApplication.inc:482
+msgid "Back"
+msgstr "WrÃ³Ä‡"
+
+#: admin/groups/apps/class_groupApplication.inc:493
+msgid "back"
+msgstr "wrÃ³Ä‡"
+
+#: admin/groups/apps/class_groupApplication.inc:501
+msgid "department"
+msgstr "departament"
+
+#: admin/groups/apps/class_groupApplication.inc:524
+msgid "application"
+msgstr "aplikacja"
+
+#: admin/groups/apps/class_groupApplication.inc:701
+#: admin/groups/apps/class_groupApplication.inc:1396
+#: admin/groups/apps/class_groupApplication.inc:1409
+#: admin/groups/apps/class_groupApplication.inc:1422
+#: admin/mimetypes/class_mimetypeGeneric.inc:481
+#: admin/mimetypes/class_mimetypeGeneric.inc:493
+#: admin/mimetypes/class_mimetypeGeneric.inc:508
+#: admin/applications/class_applicationParameters.inc:177
+#: admin/applications/class_applicationParameters.inc:242
+#: admin/applications/class_applicationGeneric.inc:290
+msgid "LDAP error"
+msgstr "bÅ‚Ä…d LDAP"
+
+#: admin/groups/apps/class_groupApplication.inc:1208
+msgid "Not available in release."
+msgstr ""
+
+#: admin/groups/apps/class_groupApplication.inc:1459
 #: 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
+#: admin/mimetypes/generic.tpl.c:62 admin/mimetypes/generic.tpl.c:86
 msgid "Applications"
 msgstr "Aplikacje"
 
+#: admin/groups/apps/class_groupApplication.inc:1460
+msgid "Group applications"
+msgstr "Grupa aplikacje"
+
+#: admin/groups/apps/class_groupApplication.inc:1466
+#: admin/mimetypes/class_mimetypeGeneric.inc:689
+#: admin/applications/class_applicationGeneric.inc:73
+msgid "Application"
+msgstr "Aplikacja"
+
+#: admin/groups/apps/class_groupApplication.inc:1467
+#: admin/groups/apps/app_list.tpl.c:2 admin/groups/apps/app_list.tpl.c:14
+msgid "Release"
+msgstr "Wersja"
+
+#: admin/groups/apps/class_groupApplication.inc:1468
+msgid "Application parameter"
+msgstr "Parametr aplikacji"
+
+#: admin/groups/apps/class_groupApplication.inc:1469
+#: admin/applications/class_applicationGeneric.inc:135
+#: admin/groups/apps/edit_entry.tpl.c:32
+msgid "Place icon on members desktop"
+msgstr "UtwÃ³rz ikonÄ™ na desktopie czÅ‚onka"
+
+#: admin/groups/apps/class_groupApplication.inc:1470
+#: admin/applications/class_applicationGeneric.inc:145
+#: admin/groups/apps/edit_entry.tpl.c:38
+msgid "Place entry in members launch bar"
+msgstr "UtwÃ³rz wpis w pasku uruchamiania czÅ‚onka"
+
+#: admin/groups/apps/class_groupApplication.inc:1471
+#: admin/applications/class_applicationGeneric.inc:140
+#: admin/groups/apps/edit_entry.tpl.c:35
+msgid "Place entry in members startmenu"
+msgstr "UtwÃ³rz wpis w menu startowym czÅ‚onka"
+
+#: admin/mimetypes/class_mimetypeManagement.inc:28
+#: admin/mimetypes/class_mimetypeGeneric.inc:674
+msgid "Mime types"
+msgstr "Typy mime"
+
+#: admin/mimetypes/class_mimetypeManagement.inc:29
+msgid "Mime type management"
+msgstr ""
+
+#: admin/mimetypes/class_mimetypeGeneric.inc:519
+#: admin/mimetypes/class_mimetypeGeneric.inc:685
+#: admin/applications/class_applicationParameters.inc:208
+#: admin/applications/class_applicationParameters.inc:212
+#: admin/groups/apps/edit_entry.tpl.c:26
+msgid "Name"
+msgstr "ImiÄ™"
+
+#: admin/mimetypes/class_mimetypeGeneric.inc:522
+msgid "File pattern"
+msgstr ""
+
+#: admin/mimetypes/class_mimetypeGeneric.inc:671
+#: admin/applications/class_applicationGeneric.inc:69
+#: admin/mimetypes/generic.tpl.c:2
+msgid "Generic"
+msgstr "OgÃ³lne"
+
+#: admin/mimetypes/class_mimetypeGeneric.inc:672
+msgid "Mime type generic"
+msgstr "Typ mime podstawowy"
+
+#: admin/mimetypes/class_mimetypeGeneric.inc:678
+#: admin/mimetypes/generic.tpl.c:5
+msgid "Mime type"
+msgstr "Typ mime"
+
+#: admin/mimetypes/class_mimetypeGeneric.inc:686
+#: admin/mimetypes/generic.tpl.c:11
+msgid "Mime group"
+msgstr "Grupa mime"
+
+#: admin/mimetypes/class_mimetypeGeneric.inc:687
+#: admin/applications/class_applicationGeneric.inc:105
+#: admin/mimetypes/generic.tpl.c:17
+msgid "Description"
+msgstr "Opis"
+
+#: admin/mimetypes/class_mimetypeGeneric.inc:688
+#: admin/mimetypes/generic.tpl.c:23
+msgid "Base"
+msgstr "Kontener"
+
+#: admin/mimetypes/class_mimetypeGeneric.inc:690
+msgid "Left click action"
+msgstr "Akcja lewego klikniÄ™cia"
+
+#: admin/mimetypes/class_mimetypeGeneric.inc:691
+#: admin/applications/class_applicationGeneric.inc:112
+#: admin/mimetypes/generic.tpl.c:32
+msgid "Icon"
+msgstr "Ikona"
+
+#: admin/mimetypes/class_mimetypeGeneric.inc:692
+#: admin/mimetypes/generic.tpl.c:53
+msgid "File patterns"
+msgstr "Wzorce pliku"
+
+#: admin/mimetypes/class_mimetypeGeneric.inc:693
+msgid "Embedded applications"
+msgstr "Osadzone aplikacje"
+
 #: admin/applications/class_applicationManagement.inc:29
 msgid "Application management"
 msgstr "ZarzÄ…dzanie aplikacjÄ…"
 
-#: admin/applications/class_applicationManagement.inc:100
-msgid "Web applications"
+#: admin/applications/class_applicationParameters.inc:71
+msgid "Remove options"
+msgstr "UsuÅ„ opcje"
+
+#: admin/applications/class_applicationParameters.inc:71
+#: admin/applications/class_applicationParameters.inc:73
+msgid "parameter"
+msgstr "Parametr"
+
+#: admin/applications/class_applicationParameters.inc:73
+msgid "Create options"
+msgstr "UtwÃ³rz opcje"
+
+#: admin/applications/class_applicationParameters.inc:115
+msgid "Variable"
+msgstr "Zmienna"
+
+#: admin/applications/class_applicationParameters.inc:115
+msgid "Default value"
+msgstr "DomyÅ›lna wartoÅ›Ä‡"
+
+#: admin/applications/class_applicationParameters.inc:141
+#: admin/groups/apps/app_list.tpl.c:29 admin/groups/apps/app_list.tpl.c:41
+#: admin/groups/apps/app_list.tpl.c:53
+msgid "Remove"
+msgstr "UsuÅ„"
+
+#: admin/applications/class_applicationParameters.inc:147
+msgid "Add option"
+msgstr "Dodaj opcjÄ™"
+
+#: admin/applications/class_applicationParameters.inc:265
+msgid "Parameter"
+msgstr "Parametr"
+
+#: admin/applications/class_applicationParameters.inc:266
+msgid "Parameter configuration"
 msgstr ""
 
-#: admin/applications/class_applicationGeneric.inc:31
-#: admin/applications/class_applicationGeneric.inc:34
-#: admin/applications/class_applicationGeneric.inc:48
-#: admin/applications/class_webApplication.inc:47
-msgid "Application"
-msgstr "Aplikacja"
+#: admin/applications/class_applicationParameters.inc:271
+msgid "Application parameter settings"
+msgstr ""
 
-#: admin/applications/class_applicationGeneric.inc:32
-msgid "Application information"
+#: admin/applications/class_applicationGeneric.inc:70
+msgid "Application generic"
 msgstr ""
 
-#: admin/applications/class_applicationGeneric.inc:52
+#: admin/applications/class_applicationGeneric.inc:90
+msgid "Properties"
+msgstr "WÅ‚aÅ›ciwoÅ›ci"
+
+#: admin/applications/class_applicationGeneric.inc:93
 msgid "Application name"
 msgstr "Nazwa aplikacji"
 
-#: admin/applications/class_applicationGeneric.inc:52
+#: admin/applications/class_applicationGeneric.inc:93
 msgid "The name of this application"
 msgstr ""
 
-#: admin/applications/class_applicationGeneric.inc:56
-#: admin/applications/class_webApplication.inc:55
-msgid "Description"
-msgstr "Opis"
+#: admin/applications/class_applicationGeneric.inc:97
+msgid "Display name"
+msgstr "WyÅ›wietl nazwÄ™"
 
-#: admin/applications/class_applicationGeneric.inc:56
-#: admin/applications/class_webApplication.inc:55
-msgid "A short description of this application"
+#: admin/applications/class_applicationGeneric.inc:97
+msgid "The displayed name for this application"
 msgstr ""
 
-#: admin/applications/class_applicationGeneric.inc:60
+#: admin/applications/class_applicationGeneric.inc:101
 msgid "Execute"
 msgstr "Uruchom"
 
-#: admin/applications/class_applicationGeneric.inc:60
+#: admin/applications/class_applicationGeneric.inc:101
 msgid "The application to be executed"
 msgstr ""
 
-#: admin/applications/class_applicationGeneric.inc:64
-msgid "Display name"
-msgstr "WyÅ›wietl nazwÄ™"
-
-#: admin/applications/class_applicationGeneric.inc:64
-msgid "The displayed name for this application"
+#: admin/applications/class_applicationGeneric.inc:105
+msgid "A short description of this application"
 msgstr ""
 
-#: admin/applications/class_applicationGeneric.inc:70
-#: admin/applications/class_webApplication.inc:69
-msgid "Icon"
-msgstr "Ikona"
-
-#: admin/applications/class_applicationGeneric.inc:73
-#: admin/applications/class_webApplication.inc:72
+#: admin/applications/class_applicationGeneric.inc:115
 msgid "The icon for this application"
 msgstr ""
 
-#: admin/applications/class_applicationGeneric.inc:80
+#: admin/applications/class_applicationGeneric.inc:122
 msgid "Options"
 msgstr "Opcje"
 
-#: admin/applications/class_applicationGeneric.inc:83
+#: admin/applications/class_applicationGeneric.inc:125
 msgid "Only executable for member"
 msgstr ""
 
-#: admin/applications/class_applicationGeneric.inc:83
+#: admin/applications/class_applicationGeneric.inc:125
 msgid "Only executable by the memebers of the group"
 msgstr ""
 
-#: admin/applications/class_applicationGeneric.inc:88
+#: admin/applications/class_applicationGeneric.inc:130
 msgid "Replace user configuration on startup"
 msgstr "PodmieÅ„ konfiguracjÄ™ uÅ¼ytkownika na starcie"
 
-#: admin/applications/class_applicationGeneric.inc:88
+#: admin/applications/class_applicationGeneric.inc:130
 msgid "Replace the user configuration on startup"
 msgstr ""
 
-#: admin/applications/class_applicationGeneric.inc:93
-msgid "Place icon on members desktop"
-msgstr "UtwÃ³rz ikonÄ™ na desktopie czÅ‚onka"
-
-#: admin/applications/class_applicationGeneric.inc:93
+#: admin/applications/class_applicationGeneric.inc:135
 msgid "Put an icon on the user desktop"
 msgstr ""
 
-#: admin/applications/class_applicationGeneric.inc:98
-msgid "Place entry in members startmenu"
-msgstr "UtwÃ³rz wpis w menu startowym czÅ‚onka"
-
-#: admin/applications/class_applicationGeneric.inc:98
-#: admin/applications/class_applicationGeneric.inc:103
+#: admin/applications/class_applicationGeneric.inc:140
+#: admin/applications/class_applicationGeneric.inc:145
 msgid "Put an entry in the startup menu"
 msgstr ""
 
-#: admin/applications/class_applicationGeneric.inc:103
-msgid "Place entry in members launch bar"
-msgstr "UtwÃ³rz wpis w pasku uruchamiania czÅ‚onka"
+#: admin/applications/class_applicationGeneric.inc:156
+msgid "Script"
+msgstr "Skrypt"
 
-#: admin/applications/class_webApplication.inc:30
-#: admin/applications/class_webApplication.inc:33
-msgid "Web application"
+#: admin/applications/class_applicationGeneric.inc:159
+msgid "Script to run at logon"
 msgstr ""
 
-#: admin/applications/class_webApplication.inc:31
-msgid "Web applicationts names, icons and links"
+#: admin/applications/class_applicationGeneric.inc:165
+msgid "Log off script"
 msgstr ""
 
-#: admin/applications/class_webApplication.inc:51
-msgid "Name"
-msgstr "ImiÄ™"
+#: admin/applications/class_applicationGeneric.inc:168
+msgid "Script to run at logoff"
+msgstr ""
+
+#: admin/applications/class_applicationGeneric.inc:227
+msgid "no example"
+msgstr "brak przykÅ‚adu"
+
+#: admin/applications/class_applicationGeneric.inc:276
+msgid "Error"
+msgstr "BÅ‚Ä…d"
 
-#: admin/applications/class_webApplication.inc:51
-msgid "Name or id for application"
+#: admin/applications/class_applicationGeneric.inc:276
+#, php-format
+msgid "Cannot remove application - it is still in use by these objects: %s"
 msgstr ""
 
-#: admin/applications/class_webApplication.inc:59
-msgid "URL"
-msgstr "URL"
+#: config/desktop-management/class_desktopPluginConfig.inc:28
+msgid "Desktop management"
+msgstr ""
 
-#: admin/applications/class_webApplication.inc:59
-msgid "Link to this application"
+#: config/desktop-management/class_desktopPluginConfig.inc:29
+msgid "Desktop management plugin configuration"
 msgstr ""
 
-#: admin/applications/class_webApplication.inc:63
-msgid "Display Name"
+#: config/desktop-management/class_desktopPluginConfig.inc:40
+msgid "LDAP tree"
 msgstr ""
 
-#: admin/applications/class_webApplication.inc:63
-msgid "Displayed name for links to this application"
+#: config/desktop-management/class_desktopPluginConfig.inc:43
+msgid "Mimetype RDN"
 msgstr ""
 
-#: admin/applications/class_webApplication.inc:77
-msgid "Icon location"
+#: config/desktop-management/class_desktopPluginConfig.inc:43
+msgid "Branch in which mime types will be stored"
 msgstr ""
 
-#: admin/applications/class_webApplication.inc:77
-msgid "Usual path to this application icon"
+#: config/desktop-management/class_desktopPluginConfig.inc:48
+msgid "Application RDN"
 msgstr ""
 
-#: admin/roles/class_applicationRights.inc:31
-msgid "Applications allowed for this role"
+#: config/desktop-management/class_desktopPluginConfig.inc:48
+msgid "Branch in which applications will be stored"
 msgstr ""
 
-#: admin/roles/class_applicationRights.inc:45
-msgid "Application list"
+#: admin/groups/apps/edit_entry.tpl.c:2
+msgid "Folder image"
 msgstr ""
 
-#: admin/roles/class_applicationRights.inc:49
-msgid "The applications users with this role are allowed to launch"
+#: admin/groups/apps/edit_entry.tpl.c:5
+msgid "Could not load image."
 msgstr ""
 
-#: config/applications/class_applicationsPluginConfig.inc:29
-msgid "Applications plugin configuration"
+#: admin/groups/apps/edit_entry.tpl.c:8
+msgid "None"
 msgstr ""
 
-#: config/applications/class_applicationsPluginConfig.inc:43
-msgid "Application RDN"
+#: admin/groups/apps/edit_entry.tpl.c:11
+msgid "Upload image"
 msgstr ""
 
-#: config/applications/class_applicationsPluginConfig.inc:43
-msgid "Branch in which applications will be stored"
+#: admin/groups/apps/edit_entry.tpl.c:14
+msgid "Upload"
+msgstr "Wgraj"
+
+#: admin/groups/apps/edit_entry.tpl.c:17
+msgid "Reset image"
 msgstr ""
 
-#: config/applications/class_applicationsPluginConfig.inc:48
-msgid "Web applications RDN"
+#: admin/groups/apps/edit_entry.tpl.c:20
+msgid "Reset"
 msgstr ""
 
-#: config/applications/class_applicationsPluginConfig.inc:48
-msgid "Branch in which web applications will be stored"
+#: admin/groups/apps/edit_entry.tpl.c:23
+msgid "Application settings"
+msgstr "Ustawienia Aplikacji"
+
+#: admin/groups/apps/edit_entry.tpl.c:29
+msgid "Application options"
+msgstr "Opcje aplikacji"
+
+#: admin/groups/apps/app_list.tpl.c:5
+msgid "Copy menu"
 msgstr ""
 
-#: config/applications/class_applicationsPluginConfig.inc:53
-msgid "Show web applications in menu"
+#: admin/groups/apps/app_list.tpl.c:8
+msgid "Paste menu from"
 msgstr ""
 
-#: config/applications/class_applicationsPluginConfig.inc:53
-msgid "Whether to show web applications in FD main menu"
+#: admin/groups/apps/app_list.tpl.c:11
+msgid "Delete menu"
 msgstr ""
 
-#: config/applications/class_applicationsPluginConfig.inc:56
-msgid "None"
+#: admin/groups/apps/app_list.tpl.c:17 admin/groups/apps/app_list.tpl.c:20
+msgid "Folder"
+msgstr ""
+
+#: admin/groups/apps/app_list.tpl.c:23 admin/groups/apps/app_list.tpl.c:35
+#: admin/groups/apps/app_list.tpl.c:47
+msgid "Move up"
+msgstr "PrzesuÅ„ w gÃ³rÄ™"
+
+#: admin/groups/apps/app_list.tpl.c:26 admin/groups/apps/app_list.tpl.c:38
+#: admin/groups/apps/app_list.tpl.c:50
+msgid "Move down"
+msgstr "PrzesuÅ„ w dÃ³Å‚"
+
+#: admin/groups/apps/app_list.tpl.c:32 admin/groups/apps/app_list.tpl.c:56
+msgid "Edit"
+msgstr "Edytuj"
+
+#: admin/groups/apps/app_list.tpl.c:44
+msgid "Entry"
+msgstr ""
+
+#: admin/groups/apps/app_list.tpl.c:59
+msgid "add to"
 msgstr ""
 
-#: config/applications/class_applicationsPluginConfig.inc:56
-msgid "Only allowed"
+#: admin/groups/apps/app_list.tpl.c:62
+msgid "Add selected category to this folder.."
 msgstr ""
 
-#: config/applications/class_applicationsPluginConfig.inc:56
-msgid "All"
-msgstr "Wszystkie"
+#: admin/groups/apps/app_list.tpl.c:65
+msgid "Separator"
+msgstr ""
+
+#: admin/groups/apps/app_list.tpl.c:68
+msgid "Add a separator to this folder."
+msgstr ""
+
+#: admin/groups/apps/app_list.tpl.c:71
+msgid "Add selected applications to this folder."
+msgstr ""
+
+#: admin/mimetypes/generic.tpl.c:8
+msgid "Please enter a name for the mime type here"
+msgstr "ProszÄ™ podaÄ‡ nazwÄ™ typu mime"
+
+#: admin/mimetypes/generic.tpl.c:14
+msgid "Categorize this mime type"
+msgstr "Skategoryzuj ten typ mime"
+
+#: admin/mimetypes/generic.tpl.c:20
+msgid "Please specify a description"
+msgstr "ProszÄ™ podaÄ‡ opis"
+
+#: admin/mimetypes/generic.tpl.c:26
+msgid "Choose subtree to place application in"
+msgstr "Wybierz poddrzewo do umieszczenia aplikacji"
+
+#: admin/mimetypes/generic.tpl.c:29
+msgid "Select a base"
+msgstr "Wybierz bazÄ™"
+
+#: admin/mimetypes/generic.tpl.c:35 admin/mimetypes/generic.tpl.c:38
+msgid "Mime icon"
+msgstr ""
+
+#: admin/mimetypes/generic.tpl.c:41
+msgid "Update"
+msgstr "Aktualizuj"
+
+#: admin/mimetypes/generic.tpl.c:44
+msgid "Update mime type icon"
+msgstr "Aktualizuj ikonÄ™ typu mime"
+
+#: admin/mimetypes/generic.tpl.c:47 admin/mimetypes/generic.tpl.c:50
+msgid "Left click"
+msgstr ""
+
+#: admin/mimetypes/generic.tpl.c:56
+msgid "Please specify a new file pattern"
+msgstr "ProszÄ™ podaÄ‡ nowy wzorzec pliku"
+
+#: admin/mimetypes/generic.tpl.c:59
+msgid "Add a new file pattern"
+msgstr "Dodaj nowy wzorzec pliku"
+
+#: admin/mimetypes/generic.tpl.c:65 admin/mimetypes/generic.tpl.c:89
+msgid "Enter an application name here"
+msgstr "Podaj nazwÄ™ aplikacji"
+
+#: admin/mimetypes/generic.tpl.c:68 admin/mimetypes/generic.tpl.c:92
+msgid "Add application"
+msgstr "Dodaj aplikacjÄ™"
+
+#: admin/mimetypes/generic.tpl.c:71 admin/mimetypes/generic.tpl.c:74
+msgid "Embedding"
+msgstr "Osadzanie"
+
+#: admin/mimetypes/generic.tpl.c:77
+msgid "Show file in embedded viewer"
+msgstr "PokaÅ¼ plik w osadzonej przeglÄ…darce"
+
+#: admin/mimetypes/generic.tpl.c:80
+msgid "Show file in external viewer"
+msgstr "PokaÅ¼ plik w zewnÄ™trznej przeglÄ…darce"
+
+#: admin/mimetypes/generic.tpl.c:83
+msgid "Ask whether to save to local disk"
+msgstr "Pytaj czy zapisaÄ‡ na dysk"
diff --git a/applications/locale/pt/fusiondirectory.po b/applications/locale/pt/fusiondirectory.po
index 63a680b9a4a54350f34a665d5a1647ce5637e27e..0554ab936121fc16198570948b87c5e13759ddb3 100644
--- a/applications/locale/pt/fusiondirectory.po
+++ b/applications/locale/pt/fusiondirectory.po
@@ -5,219 +5,497 @@
 # Translators:
 msgid ""
 msgstr ""
-"Project-Id-Version: FusionDirectory-108\n"
+"Project-Id-Version: FusionDirectory-109\n"
 "Report-Msgid-Bugs-To: documentation@lists.fusiondirectory.org\n"
-"POT-Creation-Date: 2015-03-19 21:45+0100\n"
-"PO-Revision-Date: 2015-02-25 16:03+0000\n"
-"Last-Translator: fusiondirectory <contact@fusiondirectory.org>\n"
-"Language-Team: Portuguese (http://www.transifex.com/projects/p/FusionDirectory-108/language/pt/)\n"
+"POT-Creation-Date: 2014-08-28 12:26+0200\n"
+"PO-Revision-Date: 2014-08-28 10:28+0000\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: Portuguese (http://www.transifex.com/projects/p/FusionDirectory-109/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/groups/apps/class_groupApplication.inc:410
+#: admin/groups/apps/class_groupApplication.inc:414
+msgid "Menu"
+msgstr ""
+
+#: admin/groups/apps/class_groupApplication.inc:482
+msgid "Back"
+msgstr "Voltar"
+
+#: admin/groups/apps/class_groupApplication.inc:493
+msgid "back"
+msgstr ""
+
+#: admin/groups/apps/class_groupApplication.inc:501
+msgid "department"
+msgstr ""
+
+#: admin/groups/apps/class_groupApplication.inc:524
+msgid "application"
+msgstr ""
+
+#: admin/groups/apps/class_groupApplication.inc:701
+#: admin/groups/apps/class_groupApplication.inc:1396
+#: admin/groups/apps/class_groupApplication.inc:1409
+#: admin/groups/apps/class_groupApplication.inc:1422
+#: admin/mimetypes/class_mimetypeGeneric.inc:481
+#: admin/mimetypes/class_mimetypeGeneric.inc:493
+#: admin/mimetypes/class_mimetypeGeneric.inc:508
+#: admin/applications/class_applicationParameters.inc:177
+#: admin/applications/class_applicationParameters.inc:242
+#: admin/applications/class_applicationGeneric.inc:290
+msgid "LDAP error"
+msgstr "Erro de LDAP"
+
+#: admin/groups/apps/class_groupApplication.inc:1208
+msgid "Not available in release."
+msgstr ""
+
+#: admin/groups/apps/class_groupApplication.inc:1459
 #: 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
+#: admin/mimetypes/generic.tpl.c:62 admin/mimetypes/generic.tpl.c:86
 msgid "Applications"
 msgstr "AplicaÃ§Ãµes"
 
-#: admin/applications/class_applicationManagement.inc:29
-msgid "Application management"
-msgstr ""
-
-#: admin/applications/class_applicationManagement.inc:100
-msgid "Web applications"
+#: admin/groups/apps/class_groupApplication.inc:1460
+msgid "Group applications"
 msgstr ""
 
-#: admin/applications/class_applicationGeneric.inc:31
-#: admin/applications/class_applicationGeneric.inc:34
-#: admin/applications/class_applicationGeneric.inc:48
-#: admin/applications/class_webApplication.inc:47
+#: admin/groups/apps/class_groupApplication.inc:1466
+#: admin/mimetypes/class_mimetypeGeneric.inc:689
+#: admin/applications/class_applicationGeneric.inc:73
 msgid "Application"
 msgstr "AplicaÃ§Ã£o"
 
-#: admin/applications/class_applicationGeneric.inc:32
-msgid "Application information"
+#: admin/groups/apps/class_groupApplication.inc:1467
+#: admin/groups/apps/app_list.tpl.c:2 admin/groups/apps/app_list.tpl.c:14
+msgid "Release"
 msgstr ""
 
-#: admin/applications/class_applicationGeneric.inc:52
-msgid "Application name"
+#: admin/groups/apps/class_groupApplication.inc:1468
+msgid "Application parameter"
 msgstr ""
 
-#: admin/applications/class_applicationGeneric.inc:52
-msgid "The name of this application"
+#: admin/groups/apps/class_groupApplication.inc:1469
+#: admin/applications/class_applicationGeneric.inc:135
+#: admin/groups/apps/edit_entry.tpl.c:32
+msgid "Place icon on members desktop"
+msgstr ""
+
+#: admin/groups/apps/class_groupApplication.inc:1470
+#: admin/applications/class_applicationGeneric.inc:145
+#: admin/groups/apps/edit_entry.tpl.c:38
+msgid "Place entry in members launch bar"
+msgstr ""
+
+#: admin/groups/apps/class_groupApplication.inc:1471
+#: admin/applications/class_applicationGeneric.inc:140
+#: admin/groups/apps/edit_entry.tpl.c:35
+msgid "Place entry in members startmenu"
+msgstr ""
+
+#: admin/mimetypes/class_mimetypeManagement.inc:28
+#: admin/mimetypes/class_mimetypeGeneric.inc:674
+msgid "Mime types"
+msgstr ""
+
+#: admin/mimetypes/class_mimetypeManagement.inc:29
+msgid "Mime type management"
+msgstr ""
+
+#: admin/mimetypes/class_mimetypeGeneric.inc:519
+#: admin/mimetypes/class_mimetypeGeneric.inc:685
+#: admin/applications/class_applicationParameters.inc:208
+#: admin/applications/class_applicationParameters.inc:212
+#: admin/groups/apps/edit_entry.tpl.c:26
+msgid "Name"
+msgstr "Nome"
+
+#: admin/mimetypes/class_mimetypeGeneric.inc:522
+msgid "File pattern"
+msgstr ""
+
+#: admin/mimetypes/class_mimetypeGeneric.inc:671
+#: admin/applications/class_applicationGeneric.inc:69
+#: admin/mimetypes/generic.tpl.c:2
+msgid "Generic"
+msgstr "Geral"
+
+#: admin/mimetypes/class_mimetypeGeneric.inc:672
+msgid "Mime type generic"
+msgstr ""
+
+#: admin/mimetypes/class_mimetypeGeneric.inc:678
+#: admin/mimetypes/generic.tpl.c:5
+msgid "Mime type"
+msgstr ""
+
+#: admin/mimetypes/class_mimetypeGeneric.inc:686
+#: admin/mimetypes/generic.tpl.c:11
+msgid "Mime group"
 msgstr ""
 
-#: admin/applications/class_applicationGeneric.inc:56
-#: admin/applications/class_webApplication.inc:55
+#: admin/mimetypes/class_mimetypeGeneric.inc:687
+#: admin/applications/class_applicationGeneric.inc:105
+#: admin/mimetypes/generic.tpl.c:17
 msgid "Description"
 msgstr "DescriÃ§Ã£o"
 
-#: admin/applications/class_applicationGeneric.inc:56
-#: admin/applications/class_webApplication.inc:55
-msgid "A short description of this application"
+#: admin/mimetypes/class_mimetypeGeneric.inc:688
+#: admin/mimetypes/generic.tpl.c:23
+msgid "Base"
+msgstr "Base"
+
+#: admin/mimetypes/class_mimetypeGeneric.inc:690
+msgid "Left click action"
 msgstr ""
 
-#: admin/applications/class_applicationGeneric.inc:60
-msgid "Execute"
+#: admin/mimetypes/class_mimetypeGeneric.inc:691
+#: admin/applications/class_applicationGeneric.inc:112
+#: admin/mimetypes/generic.tpl.c:32
+msgid "Icon"
 msgstr ""
 
-#: admin/applications/class_applicationGeneric.inc:60
-msgid "The application to be executed"
+#: admin/mimetypes/class_mimetypeGeneric.inc:692
+#: admin/mimetypes/generic.tpl.c:53
+msgid "File patterns"
+msgstr ""
+
+#: admin/mimetypes/class_mimetypeGeneric.inc:693
+msgid "Embedded applications"
+msgstr ""
+
+#: admin/applications/class_applicationManagement.inc:29
+msgid "Application management"
+msgstr ""
+
+#: admin/applications/class_applicationParameters.inc:71
+msgid "Remove options"
+msgstr ""
+
+#: admin/applications/class_applicationParameters.inc:71
+#: admin/applications/class_applicationParameters.inc:73
+msgid "parameter"
+msgstr ""
+
+#: admin/applications/class_applicationParameters.inc:73
+msgid "Create options"
+msgstr ""
+
+#: admin/applications/class_applicationParameters.inc:115
+msgid "Variable"
+msgstr ""
+
+#: admin/applications/class_applicationParameters.inc:115
+msgid "Default value"
+msgstr ""
+
+#: admin/applications/class_applicationParameters.inc:141
+#: admin/groups/apps/app_list.tpl.c:29 admin/groups/apps/app_list.tpl.c:41
+#: admin/groups/apps/app_list.tpl.c:53
+msgid "Remove"
+msgstr "Remover"
+
+#: admin/applications/class_applicationParameters.inc:147
+msgid "Add option"
+msgstr ""
+
+#: admin/applications/class_applicationParameters.inc:265
+msgid "Parameter"
+msgstr ""
+
+#: admin/applications/class_applicationParameters.inc:266
+msgid "Parameter configuration"
+msgstr ""
+
+#: admin/applications/class_applicationParameters.inc:271
+msgid "Application parameter settings"
+msgstr ""
+
+#: admin/applications/class_applicationGeneric.inc:70
+msgid "Application generic"
+msgstr ""
+
+#: admin/applications/class_applicationGeneric.inc:90
+msgid "Properties"
+msgstr "Propriedades"
+
+#: admin/applications/class_applicationGeneric.inc:93
+msgid "Application name"
+msgstr ""
+
+#: admin/applications/class_applicationGeneric.inc:93
+msgid "The name of this application"
 msgstr ""
 
-#: admin/applications/class_applicationGeneric.inc:64
+#: admin/applications/class_applicationGeneric.inc:97
 msgid "Display name"
 msgstr ""
 
-#: admin/applications/class_applicationGeneric.inc:64
+#: admin/applications/class_applicationGeneric.inc:97
 msgid "The displayed name for this application"
 msgstr ""
 
-#: admin/applications/class_applicationGeneric.inc:70
-#: admin/applications/class_webApplication.inc:69
-msgid "Icon"
+#: admin/applications/class_applicationGeneric.inc:101
+msgid "Execute"
 msgstr ""
 
-#: admin/applications/class_applicationGeneric.inc:73
-#: admin/applications/class_webApplication.inc:72
+#: admin/applications/class_applicationGeneric.inc:101
+msgid "The application to be executed"
+msgstr ""
+
+#: admin/applications/class_applicationGeneric.inc:105
+msgid "A short description of this application"
+msgstr ""
+
+#: admin/applications/class_applicationGeneric.inc:115
 msgid "The icon for this application"
 msgstr ""
 
-#: admin/applications/class_applicationGeneric.inc:80
+#: admin/applications/class_applicationGeneric.inc:122
 msgid "Options"
 msgstr ""
 
-#: admin/applications/class_applicationGeneric.inc:83
+#: admin/applications/class_applicationGeneric.inc:125
 msgid "Only executable for member"
 msgstr ""
 
-#: admin/applications/class_applicationGeneric.inc:83
+#: admin/applications/class_applicationGeneric.inc:125
 msgid "Only executable by the memebers of the group"
 msgstr ""
 
-#: admin/applications/class_applicationGeneric.inc:88
+#: admin/applications/class_applicationGeneric.inc:130
 msgid "Replace user configuration on startup"
 msgstr ""
 
-#: admin/applications/class_applicationGeneric.inc:88
+#: admin/applications/class_applicationGeneric.inc:130
 msgid "Replace the user configuration on startup"
 msgstr ""
 
-#: admin/applications/class_applicationGeneric.inc:93
-msgid "Place icon on members desktop"
+#: admin/applications/class_applicationGeneric.inc:135
+msgid "Put an icon on the user desktop"
 msgstr ""
 
-#: admin/applications/class_applicationGeneric.inc:93
-msgid "Put an icon on the user desktop"
+#: admin/applications/class_applicationGeneric.inc:140
+#: admin/applications/class_applicationGeneric.inc:145
+msgid "Put an entry in the startup menu"
 msgstr ""
 
-#: admin/applications/class_applicationGeneric.inc:98
-msgid "Place entry in members startmenu"
+#: admin/applications/class_applicationGeneric.inc:156
+msgid "Script"
 msgstr ""
 
-#: admin/applications/class_applicationGeneric.inc:98
-#: admin/applications/class_applicationGeneric.inc:103
-msgid "Put an entry in the startup menu"
+#: admin/applications/class_applicationGeneric.inc:159
+msgid "Script to run at logon"
 msgstr ""
 
-#: admin/applications/class_applicationGeneric.inc:103
-msgid "Place entry in members launch bar"
+#: admin/applications/class_applicationGeneric.inc:165
+msgid "Log off script"
 msgstr ""
 
-#: admin/applications/class_webApplication.inc:30
-#: admin/applications/class_webApplication.inc:33
-msgid "Web application"
+#: admin/applications/class_applicationGeneric.inc:168
+msgid "Script to run at logoff"
 msgstr ""
 
-#: admin/applications/class_webApplication.inc:31
-msgid "Web applicationts names, icons and links"
+#: admin/applications/class_applicationGeneric.inc:227
+msgid "no example"
 msgstr ""
 
-#: admin/applications/class_webApplication.inc:51
-msgid "Name"
-msgstr "Nome"
+#: admin/applications/class_applicationGeneric.inc:276
+msgid "Error"
+msgstr "Erro"
 
-#: admin/applications/class_webApplication.inc:51
-msgid "Name or id for application"
+#: admin/applications/class_applicationGeneric.inc:276
+#, php-format
+msgid "Cannot remove application - it is still in use by these objects: %s"
 msgstr ""
 
-#: admin/applications/class_webApplication.inc:59
-msgid "URL"
+#: config/desktop-management/class_desktopPluginConfig.inc:28
+msgid "Desktop management"
 msgstr ""
 
-#: admin/applications/class_webApplication.inc:59
-msgid "Link to this application"
+#: config/desktop-management/class_desktopPluginConfig.inc:29
+msgid "Desktop management plugin configuration"
 msgstr ""
 
-#: admin/applications/class_webApplication.inc:63
-msgid "Display Name"
+#: config/desktop-management/class_desktopPluginConfig.inc:40
+msgid "LDAP tree"
 msgstr ""
 
-#: admin/applications/class_webApplication.inc:63
-msgid "Displayed name for links to this application"
+#: config/desktop-management/class_desktopPluginConfig.inc:43
+msgid "Mimetype RDN"
 msgstr ""
 
-#: admin/applications/class_webApplication.inc:77
-msgid "Icon location"
+#: config/desktop-management/class_desktopPluginConfig.inc:43
+msgid "Branch in which mime types will be stored"
+msgstr ""
+
+#: config/desktop-management/class_desktopPluginConfig.inc:48
+msgid "Application RDN"
 msgstr ""
 
-#: admin/applications/class_webApplication.inc:77
-msgid "Usual path to this application icon"
+#: config/desktop-management/class_desktopPluginConfig.inc:48
+msgid "Branch in which applications will be stored"
 msgstr ""
 
-#: admin/roles/class_applicationRights.inc:31
-msgid "Applications allowed for this role"
+#: admin/groups/apps/edit_entry.tpl.c:2
+msgid "Folder image"
 msgstr ""
 
-#: admin/roles/class_applicationRights.inc:45
-msgid "Application list"
+#: admin/groups/apps/edit_entry.tpl.c:5
+msgid "Could not load image."
 msgstr ""
 
-#: admin/roles/class_applicationRights.inc:49
-msgid "The applications users with this role are allowed to launch"
+#: admin/groups/apps/edit_entry.tpl.c:8
+msgid "None"
 msgstr ""
 
-#: config/applications/class_applicationsPluginConfig.inc:29
-msgid "Applications plugin configuration"
+#: admin/groups/apps/edit_entry.tpl.c:11
+msgid "Upload image"
 msgstr ""
 
-#: config/applications/class_applicationsPluginConfig.inc:43
-msgid "Application RDN"
+#: admin/groups/apps/edit_entry.tpl.c:14
+msgid "Upload"
 msgstr ""
 
-#: config/applications/class_applicationsPluginConfig.inc:43
-msgid "Branch in which applications will be stored"
+#: admin/groups/apps/edit_entry.tpl.c:17
+msgid "Reset image"
 msgstr ""
 
-#: config/applications/class_applicationsPluginConfig.inc:48
-msgid "Web applications RDN"
+#: admin/groups/apps/edit_entry.tpl.c:20
+msgid "Reset"
 msgstr ""
 
-#: config/applications/class_applicationsPluginConfig.inc:48
-msgid "Branch in which web applications will be stored"
+#: admin/groups/apps/edit_entry.tpl.c:23
+msgid "Application settings"
 msgstr ""
 
-#: config/applications/class_applicationsPluginConfig.inc:53
-msgid "Show web applications in menu"
+#: admin/groups/apps/edit_entry.tpl.c:29
+msgid "Application options"
 msgstr ""
 
-#: config/applications/class_applicationsPluginConfig.inc:53
-msgid "Whether to show web applications in FD main menu"
+#: admin/groups/apps/app_list.tpl.c:5
+msgid "Copy menu"
 msgstr ""
 
-#: config/applications/class_applicationsPluginConfig.inc:56
-msgid "None"
+#: admin/groups/apps/app_list.tpl.c:8
+msgid "Paste menu from"
+msgstr ""
+
+#: admin/groups/apps/app_list.tpl.c:11
+msgid "Delete menu"
+msgstr ""
+
+#: admin/groups/apps/app_list.tpl.c:17 admin/groups/apps/app_list.tpl.c:20
+msgid "Folder"
+msgstr ""
+
+#: admin/groups/apps/app_list.tpl.c:23 admin/groups/apps/app_list.tpl.c:35
+#: admin/groups/apps/app_list.tpl.c:47
+msgid "Move up"
+msgstr ""
+
+#: admin/groups/apps/app_list.tpl.c:26 admin/groups/apps/app_list.tpl.c:38
+#: admin/groups/apps/app_list.tpl.c:50
+msgid "Move down"
+msgstr ""
+
+#: admin/groups/apps/app_list.tpl.c:32 admin/groups/apps/app_list.tpl.c:56
+msgid "Edit"
+msgstr "Editar"
+
+#: admin/groups/apps/app_list.tpl.c:44
+msgid "Entry"
+msgstr ""
+
+#: admin/groups/apps/app_list.tpl.c:59
+msgid "add to"
+msgstr ""
+
+#: admin/groups/apps/app_list.tpl.c:62
+msgid "Add selected category to this folder.."
+msgstr ""
+
+#: admin/groups/apps/app_list.tpl.c:65
+msgid "Separator"
+msgstr ""
+
+#: admin/groups/apps/app_list.tpl.c:68
+msgid "Add a separator to this folder."
+msgstr ""
+
+#: admin/groups/apps/app_list.tpl.c:71
+msgid "Add selected applications to this folder."
+msgstr ""
+
+#: admin/mimetypes/generic.tpl.c:8
+msgid "Please enter a name for the mime type here"
+msgstr ""
+
+#: admin/mimetypes/generic.tpl.c:14
+msgid "Categorize this mime type"
+msgstr ""
+
+#: admin/mimetypes/generic.tpl.c:20
+msgid "Please specify a description"
+msgstr ""
+
+#: admin/mimetypes/generic.tpl.c:26
+msgid "Choose subtree to place application in"
+msgstr ""
+
+#: admin/mimetypes/generic.tpl.c:29
+msgid "Select a base"
+msgstr ""
+
+#: admin/mimetypes/generic.tpl.c:35 admin/mimetypes/generic.tpl.c:38
+msgid "Mime icon"
+msgstr ""
+
+#: admin/mimetypes/generic.tpl.c:41
+msgid "Update"
+msgstr ""
+
+#: admin/mimetypes/generic.tpl.c:44
+msgid "Update mime type icon"
+msgstr ""
+
+#: admin/mimetypes/generic.tpl.c:47 admin/mimetypes/generic.tpl.c:50
+msgid "Left click"
+msgstr ""
+
+#: admin/mimetypes/generic.tpl.c:56
+msgid "Please specify a new file pattern"
+msgstr ""
+
+#: admin/mimetypes/generic.tpl.c:59
+msgid "Add a new file pattern"
+msgstr ""
+
+#: admin/mimetypes/generic.tpl.c:65 admin/mimetypes/generic.tpl.c:89
+msgid "Enter an application name here"
+msgstr ""
+
+#: admin/mimetypes/generic.tpl.c:68 admin/mimetypes/generic.tpl.c:92
+msgid "Add application"
+msgstr ""
+
+#: admin/mimetypes/generic.tpl.c:71 admin/mimetypes/generic.tpl.c:74
+msgid "Embedding"
+msgstr ""
+
+#: admin/mimetypes/generic.tpl.c:77
+msgid "Show file in embedded viewer"
 msgstr ""
 
-#: config/applications/class_applicationsPluginConfig.inc:56
-msgid "Only allowed"
+#: admin/mimetypes/generic.tpl.c:80
+msgid "Show file in external viewer"
 msgstr ""
 
-#: config/applications/class_applicationsPluginConfig.inc:56
-msgid "All"
+#: admin/mimetypes/generic.tpl.c:83
+msgid "Ask whether to save to local disk"
 msgstr ""
diff --git a/applications/locale/pt_BR/fusiondirectory.po b/applications/locale/pt_BR/fusiondirectory.po
index ba3674267eab1e9d8eb9364e103df58db282f2b1..ecb9be84ef5384be8978382035df454f1a9b02d5 100644
--- a/applications/locale/pt_BR/fusiondirectory.po
+++ b/applications/locale/pt_BR/fusiondirectory.po
@@ -5,219 +5,497 @@
 # Translators:
 msgid ""
 msgstr ""
-"Project-Id-Version: FusionDirectory-108\n"
+"Project-Id-Version: FusionDirectory-109\n"
 "Report-Msgid-Bugs-To: documentation@lists.fusiondirectory.org\n"
-"POT-Creation-Date: 2015-03-19 21:45+0100\n"
-"PO-Revision-Date: 2015-02-25 16:12+0000\n"
-"Last-Translator: fusiondirectory <contact@fusiondirectory.org>\n"
-"Language-Team: Portuguese (Brazil) (http://www.transifex.com/projects/p/FusionDirectory-108/language/pt_BR/)\n"
+"POT-Creation-Date: 2014-08-28 12:26+0200\n"
+"PO-Revision-Date: 2014-08-28 10:28+0000\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: Portuguese (Brazil) (http://www.transifex.com/projects/p/FusionDirectory-109/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/groups/apps/class_groupApplication.inc:410
+#: admin/groups/apps/class_groupApplication.inc:414
+msgid "Menu"
+msgstr "Menu"
+
+#: admin/groups/apps/class_groupApplication.inc:482
+msgid "Back"
+msgstr "Voltar"
+
+#: admin/groups/apps/class_groupApplication.inc:493
+msgid "back"
+msgstr "voltar"
+
+#: admin/groups/apps/class_groupApplication.inc:501
+msgid "department"
+msgstr "departamento"
+
+#: admin/groups/apps/class_groupApplication.inc:524
+msgid "application"
+msgstr "aplicaÃ§Ã£o"
+
+#: admin/groups/apps/class_groupApplication.inc:701
+#: admin/groups/apps/class_groupApplication.inc:1396
+#: admin/groups/apps/class_groupApplication.inc:1409
+#: admin/groups/apps/class_groupApplication.inc:1422
+#: admin/mimetypes/class_mimetypeGeneric.inc:481
+#: admin/mimetypes/class_mimetypeGeneric.inc:493
+#: admin/mimetypes/class_mimetypeGeneric.inc:508
+#: admin/applications/class_applicationParameters.inc:177
+#: admin/applications/class_applicationParameters.inc:242
+#: admin/applications/class_applicationGeneric.inc:290
+msgid "LDAP error"
+msgstr "Erro de LDAP"
+
+#: admin/groups/apps/class_groupApplication.inc:1208
+msgid "Not available in release."
+msgstr "NÃ£o disponÃvel na versÃ£o"
+
+#: admin/groups/apps/class_groupApplication.inc:1459
 #: 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
+#: admin/mimetypes/generic.tpl.c:62 admin/mimetypes/generic.tpl.c:86
 msgid "Applications"
 msgstr "AplicaÃ§Ãµes"
 
+#: admin/groups/apps/class_groupApplication.inc:1460
+msgid "Group applications"
+msgstr "AplicaÃ§Ãµes de grupo"
+
+#: admin/groups/apps/class_groupApplication.inc:1466
+#: admin/mimetypes/class_mimetypeGeneric.inc:689
+#: admin/applications/class_applicationGeneric.inc:73
+msgid "Application"
+msgstr "AplicaÃ§Ã£o"
+
+#: admin/groups/apps/class_groupApplication.inc:1467
+#: admin/groups/apps/app_list.tpl.c:2 admin/groups/apps/app_list.tpl.c:14
+msgid "Release"
+msgstr "LiberaÃ§Ã£o"
+
+#: admin/groups/apps/class_groupApplication.inc:1468
+msgid "Application parameter"
+msgstr "ParÃ¢metro da aplicaÃ§Ã£o"
+
+#: admin/groups/apps/class_groupApplication.inc:1469
+#: admin/applications/class_applicationGeneric.inc:135
+#: admin/groups/apps/edit_entry.tpl.c:32
+msgid "Place icon on members desktop"
+msgstr "Coloque o item na Ã¡rea de trabalho dos membros"
+
+#: admin/groups/apps/class_groupApplication.inc:1470
+#: admin/applications/class_applicationGeneric.inc:145
+#: admin/groups/apps/edit_entry.tpl.c:38
+msgid "Place entry in members launch bar"
+msgstr ""
+
+#: admin/groups/apps/class_groupApplication.inc:1471
+#: admin/applications/class_applicationGeneric.inc:140
+#: admin/groups/apps/edit_entry.tpl.c:35
+msgid "Place entry in members startmenu"
+msgstr ""
+
+#: admin/mimetypes/class_mimetypeManagement.inc:28
+#: admin/mimetypes/class_mimetypeGeneric.inc:674
+msgid "Mime types"
+msgstr ""
+
+#: admin/mimetypes/class_mimetypeManagement.inc:29
+msgid "Mime type management"
+msgstr ""
+
+#: admin/mimetypes/class_mimetypeGeneric.inc:519
+#: admin/mimetypes/class_mimetypeGeneric.inc:685
+#: admin/applications/class_applicationParameters.inc:208
+#: admin/applications/class_applicationParameters.inc:212
+#: admin/groups/apps/edit_entry.tpl.c:26
+msgid "Name"
+msgstr "Nome"
+
+#: admin/mimetypes/class_mimetypeGeneric.inc:522
+msgid "File pattern"
+msgstr ""
+
+#: admin/mimetypes/class_mimetypeGeneric.inc:671
+#: admin/applications/class_applicationGeneric.inc:69
+#: admin/mimetypes/generic.tpl.c:2
+msgid "Generic"
+msgstr "GenÃ©rico"
+
+#: admin/mimetypes/class_mimetypeGeneric.inc:672
+msgid "Mime type generic"
+msgstr ""
+
+#: admin/mimetypes/class_mimetypeGeneric.inc:678
+#: admin/mimetypes/generic.tpl.c:5
+msgid "Mime type"
+msgstr ""
+
+#: admin/mimetypes/class_mimetypeGeneric.inc:686
+#: admin/mimetypes/generic.tpl.c:11
+msgid "Mime group"
+msgstr ""
+
+#: admin/mimetypes/class_mimetypeGeneric.inc:687
+#: admin/applications/class_applicationGeneric.inc:105
+#: admin/mimetypes/generic.tpl.c:17
+msgid "Description"
+msgstr "DescriÃ§Ã£o"
+
+#: admin/mimetypes/class_mimetypeGeneric.inc:688
+#: admin/mimetypes/generic.tpl.c:23
+msgid "Base"
+msgstr "Base"
+
+#: admin/mimetypes/class_mimetypeGeneric.inc:690
+msgid "Left click action"
+msgstr ""
+
+#: admin/mimetypes/class_mimetypeGeneric.inc:691
+#: admin/applications/class_applicationGeneric.inc:112
+#: admin/mimetypes/generic.tpl.c:32
+msgid "Icon"
+msgstr "Ãcone"
+
+#: admin/mimetypes/class_mimetypeGeneric.inc:692
+#: admin/mimetypes/generic.tpl.c:53
+msgid "File patterns"
+msgstr ""
+
+#: admin/mimetypes/class_mimetypeGeneric.inc:693
+msgid "Embedded applications"
+msgstr ""
+
 #: admin/applications/class_applicationManagement.inc:29
 msgid "Application management"
 msgstr ""
 
-#: admin/applications/class_applicationManagement.inc:100
-msgid "Web applications"
+#: admin/applications/class_applicationParameters.inc:71
+msgid "Remove options"
+msgstr "Remover opÃ§Ãµes"
+
+#: admin/applications/class_applicationParameters.inc:71
+#: admin/applications/class_applicationParameters.inc:73
+msgid "parameter"
+msgstr "parÃ¢metro"
+
+#: admin/applications/class_applicationParameters.inc:73
+msgid "Create options"
 msgstr ""
 
-#: admin/applications/class_applicationGeneric.inc:31
-#: admin/applications/class_applicationGeneric.inc:34
-#: admin/applications/class_applicationGeneric.inc:48
-#: admin/applications/class_webApplication.inc:47
-msgid "Application"
-msgstr "AplicaÃ§Ã£o"
+#: admin/applications/class_applicationParameters.inc:115
+msgid "Variable"
+msgstr "VariÃ¡vel"
+
+#: admin/applications/class_applicationParameters.inc:115
+msgid "Default value"
+msgstr "Valor padrÃ£o"
+
+#: admin/applications/class_applicationParameters.inc:141
+#: admin/groups/apps/app_list.tpl.c:29 admin/groups/apps/app_list.tpl.c:41
+#: admin/groups/apps/app_list.tpl.c:53
+msgid "Remove"
+msgstr "Remover"
+
+#: admin/applications/class_applicationParameters.inc:147
+msgid "Add option"
+msgstr "Adicionar opÃ§Ã£o"
+
+#: admin/applications/class_applicationParameters.inc:265
+msgid "Parameter"
+msgstr "ParÃ¢metro"
 
-#: admin/applications/class_applicationGeneric.inc:32
-msgid "Application information"
+#: admin/applications/class_applicationParameters.inc:266
+msgid "Parameter configuration"
+msgstr "ConfiguraÃ§Ã£o de parÃ¢metro"
+
+#: admin/applications/class_applicationParameters.inc:271
+msgid "Application parameter settings"
 msgstr ""
 
-#: admin/applications/class_applicationGeneric.inc:52
+#: admin/applications/class_applicationGeneric.inc:70
+msgid "Application generic"
+msgstr ""
+
+#: admin/applications/class_applicationGeneric.inc:90
+msgid "Properties"
+msgstr "Propriedades"
+
+#: admin/applications/class_applicationGeneric.inc:93
 msgid "Application name"
 msgstr "Nome da aplicaÃ§Ã£o"
 
-#: admin/applications/class_applicationGeneric.inc:52
+#: admin/applications/class_applicationGeneric.inc:93
 msgid "The name of this application"
 msgstr ""
 
-#: admin/applications/class_applicationGeneric.inc:56
-#: admin/applications/class_webApplication.inc:55
-msgid "Description"
-msgstr "DescriÃ§Ã£o"
+#: admin/applications/class_applicationGeneric.inc:97
+msgid "Display name"
+msgstr "Nome de exibiÃ§Ã£o"
 
-#: admin/applications/class_applicationGeneric.inc:56
-#: admin/applications/class_webApplication.inc:55
-msgid "A short description of this application"
+#: admin/applications/class_applicationGeneric.inc:97
+msgid "The displayed name for this application"
 msgstr ""
 
-#: admin/applications/class_applicationGeneric.inc:60
+#: admin/applications/class_applicationGeneric.inc:101
 msgid "Execute"
 msgstr "Executar"
 
-#: admin/applications/class_applicationGeneric.inc:60
+#: admin/applications/class_applicationGeneric.inc:101
 msgid "The application to be executed"
 msgstr ""
 
-#: admin/applications/class_applicationGeneric.inc:64
-msgid "Display name"
-msgstr "Nome de exibiÃ§Ã£o"
-
-#: admin/applications/class_applicationGeneric.inc:64
-msgid "The displayed name for this application"
+#: admin/applications/class_applicationGeneric.inc:105
+msgid "A short description of this application"
 msgstr ""
 
-#: admin/applications/class_applicationGeneric.inc:70
-#: admin/applications/class_webApplication.inc:69
-msgid "Icon"
-msgstr "Ãcone"
-
-#: admin/applications/class_applicationGeneric.inc:73
-#: admin/applications/class_webApplication.inc:72
+#: admin/applications/class_applicationGeneric.inc:115
 msgid "The icon for this application"
 msgstr ""
 
-#: admin/applications/class_applicationGeneric.inc:80
+#: admin/applications/class_applicationGeneric.inc:122
 msgid "Options"
 msgstr "OpÃ§Ãµes"
 
-#: admin/applications/class_applicationGeneric.inc:83
+#: admin/applications/class_applicationGeneric.inc:125
 msgid "Only executable for member"
 msgstr ""
 
-#: admin/applications/class_applicationGeneric.inc:83
+#: admin/applications/class_applicationGeneric.inc:125
 msgid "Only executable by the memebers of the group"
 msgstr ""
 
-#: admin/applications/class_applicationGeneric.inc:88
+#: admin/applications/class_applicationGeneric.inc:130
 msgid "Replace user configuration on startup"
 msgstr ""
 
-#: admin/applications/class_applicationGeneric.inc:88
+#: admin/applications/class_applicationGeneric.inc:130
 msgid "Replace the user configuration on startup"
 msgstr ""
 
-#: admin/applications/class_applicationGeneric.inc:93
-msgid "Place icon on members desktop"
-msgstr "Coloque o item na Ã¡rea de trabalho dos membros"
-
-#: admin/applications/class_applicationGeneric.inc:93
+#: admin/applications/class_applicationGeneric.inc:135
 msgid "Put an icon on the user desktop"
 msgstr ""
 
-#: admin/applications/class_applicationGeneric.inc:98
-msgid "Place entry in members startmenu"
+#: admin/applications/class_applicationGeneric.inc:140
+#: admin/applications/class_applicationGeneric.inc:145
+msgid "Put an entry in the startup menu"
 msgstr ""
 
-#: admin/applications/class_applicationGeneric.inc:98
-#: admin/applications/class_applicationGeneric.inc:103
-msgid "Put an entry in the startup menu"
+#: admin/applications/class_applicationGeneric.inc:156
+msgid "Script"
+msgstr "Script"
+
+#: admin/applications/class_applicationGeneric.inc:159
+msgid "Script to run at logon"
 msgstr ""
 
-#: admin/applications/class_applicationGeneric.inc:103
-msgid "Place entry in members launch bar"
+#: admin/applications/class_applicationGeneric.inc:165
+msgid "Log off script"
 msgstr ""
 
-#: admin/applications/class_webApplication.inc:30
-#: admin/applications/class_webApplication.inc:33
-msgid "Web application"
+#: admin/applications/class_applicationGeneric.inc:168
+msgid "Script to run at logoff"
 msgstr ""
 
-#: admin/applications/class_webApplication.inc:31
-msgid "Web applicationts names, icons and links"
+#: admin/applications/class_applicationGeneric.inc:227
+msgid "no example"
 msgstr ""
 
-#: admin/applications/class_webApplication.inc:51
-msgid "Name"
-msgstr "Nome"
+#: admin/applications/class_applicationGeneric.inc:276
+msgid "Error"
+msgstr "Erro"
 
-#: admin/applications/class_webApplication.inc:51
-msgid "Name or id for application"
+#: admin/applications/class_applicationGeneric.inc:276
+#, php-format
+msgid "Cannot remove application - it is still in use by these objects: %s"
 msgstr ""
 
-#: admin/applications/class_webApplication.inc:59
-msgid "URL"
-msgstr "URL"
+#: config/desktop-management/class_desktopPluginConfig.inc:28
+msgid "Desktop management"
+msgstr ""
 
-#: admin/applications/class_webApplication.inc:59
-msgid "Link to this application"
+#: config/desktop-management/class_desktopPluginConfig.inc:29
+msgid "Desktop management plugin configuration"
 msgstr ""
 
-#: admin/applications/class_webApplication.inc:63
-msgid "Display Name"
+#: config/desktop-management/class_desktopPluginConfig.inc:40
+msgid "LDAP tree"
+msgstr "Ãrvore LDAP"
+
+#: config/desktop-management/class_desktopPluginConfig.inc:43
+msgid "Mimetype RDN"
 msgstr ""
 
-#: admin/applications/class_webApplication.inc:63
-msgid "Displayed name for links to this application"
+#: config/desktop-management/class_desktopPluginConfig.inc:43
+msgid "Branch in which mime types will be stored"
 msgstr ""
 
-#: admin/applications/class_webApplication.inc:77
-msgid "Icon location"
+#: config/desktop-management/class_desktopPluginConfig.inc:48
+msgid "Application RDN"
 msgstr ""
 
-#: admin/applications/class_webApplication.inc:77
-msgid "Usual path to this application icon"
+#: config/desktop-management/class_desktopPluginConfig.inc:48
+msgid "Branch in which applications will be stored"
 msgstr ""
 
-#: admin/roles/class_applicationRights.inc:31
-msgid "Applications allowed for this role"
+#: admin/groups/apps/edit_entry.tpl.c:2
+msgid "Folder image"
+msgstr "Imagem da pasta"
+
+#: admin/groups/apps/edit_entry.tpl.c:5
+msgid "Could not load image."
+msgstr "NÃ£o foi possÃvel carregar a imagem."
+
+#: admin/groups/apps/edit_entry.tpl.c:8
+msgid "None"
+msgstr "Nenhum"
+
+#: admin/groups/apps/edit_entry.tpl.c:11
+msgid "Upload image"
 msgstr ""
 
-#: admin/roles/class_applicationRights.inc:45
-msgid "Application list"
+#: admin/groups/apps/edit_entry.tpl.c:14
+msgid "Upload"
+msgstr "Upload"
+
+#: admin/groups/apps/edit_entry.tpl.c:17
+msgid "Reset image"
 msgstr ""
 
-#: admin/roles/class_applicationRights.inc:49
-msgid "The applications users with this role are allowed to launch"
+#: admin/groups/apps/edit_entry.tpl.c:20
+msgid "Reset"
+msgstr "Resetar"
+
+#: admin/groups/apps/edit_entry.tpl.c:23
+msgid "Application settings"
 msgstr ""
 
-#: config/applications/class_applicationsPluginConfig.inc:29
-msgid "Applications plugin configuration"
+#: admin/groups/apps/edit_entry.tpl.c:29
+msgid "Application options"
 msgstr ""
 
-#: config/applications/class_applicationsPluginConfig.inc:43
-msgid "Application RDN"
+#: admin/groups/apps/app_list.tpl.c:5
+msgid "Copy menu"
 msgstr ""
 
-#: config/applications/class_applicationsPluginConfig.inc:43
-msgid "Branch in which applications will be stored"
+#: admin/groups/apps/app_list.tpl.c:8
+msgid "Paste menu from"
+msgstr ""
+
+#: admin/groups/apps/app_list.tpl.c:11
+msgid "Delete menu"
+msgstr ""
+
+#: admin/groups/apps/app_list.tpl.c:17 admin/groups/apps/app_list.tpl.c:20
+msgid "Folder"
+msgstr "Pasta"
+
+#: admin/groups/apps/app_list.tpl.c:23 admin/groups/apps/app_list.tpl.c:35
+#: admin/groups/apps/app_list.tpl.c:47
+msgid "Move up"
+msgstr "Mover acima"
+
+#: admin/groups/apps/app_list.tpl.c:26 admin/groups/apps/app_list.tpl.c:38
+#: admin/groups/apps/app_list.tpl.c:50
+msgid "Move down"
+msgstr "Mover abaixo"
+
+#: admin/groups/apps/app_list.tpl.c:32 admin/groups/apps/app_list.tpl.c:56
+msgid "Edit"
+msgstr "Editar"
+
+#: admin/groups/apps/app_list.tpl.c:44
+msgid "Entry"
 msgstr ""
 
-#: config/applications/class_applicationsPluginConfig.inc:48
-msgid "Web applications RDN"
+#: admin/groups/apps/app_list.tpl.c:59
+msgid "add to"
+msgstr "adicionar para"
+
+#: admin/groups/apps/app_list.tpl.c:62
+msgid "Add selected category to this folder.."
 msgstr ""
 
-#: config/applications/class_applicationsPluginConfig.inc:48
-msgid "Branch in which web applications will be stored"
+#: admin/groups/apps/app_list.tpl.c:65
+msgid "Separator"
 msgstr ""
 
-#: config/applications/class_applicationsPluginConfig.inc:53
-msgid "Show web applications in menu"
+#: admin/groups/apps/app_list.tpl.c:68
+msgid "Add a separator to this folder."
 msgstr ""
 
-#: config/applications/class_applicationsPluginConfig.inc:53
-msgid "Whether to show web applications in FD main menu"
+#: admin/groups/apps/app_list.tpl.c:71
+msgid "Add selected applications to this folder."
 msgstr ""
 
-#: config/applications/class_applicationsPluginConfig.inc:56
-msgid "None"
-msgstr "Nenhum"
+#: admin/mimetypes/generic.tpl.c:8
+msgid "Please enter a name for the mime type here"
+msgstr ""
+
+#: admin/mimetypes/generic.tpl.c:14
+msgid "Categorize this mime type"
+msgstr ""
+
+#: admin/mimetypes/generic.tpl.c:20
+msgid "Please specify a description"
+msgstr ""
+
+#: admin/mimetypes/generic.tpl.c:26
+msgid "Choose subtree to place application in"
+msgstr ""
+
+#: admin/mimetypes/generic.tpl.c:29
+msgid "Select a base"
+msgstr "Selecione uma base"
+
+#: admin/mimetypes/generic.tpl.c:35 admin/mimetypes/generic.tpl.c:38
+msgid "Mime icon"
+msgstr ""
+
+#: admin/mimetypes/generic.tpl.c:41
+msgid "Update"
+msgstr "Atualizar"
 
-#: config/applications/class_applicationsPluginConfig.inc:56
-msgid "Only allowed"
+#: admin/mimetypes/generic.tpl.c:44
+msgid "Update mime type icon"
 msgstr ""
 
-#: config/applications/class_applicationsPluginConfig.inc:56
-msgid "All"
-msgstr "Todos"
+#: admin/mimetypes/generic.tpl.c:47 admin/mimetypes/generic.tpl.c:50
+msgid "Left click"
+msgstr ""
+
+#: admin/mimetypes/generic.tpl.c:56
+msgid "Please specify a new file pattern"
+msgstr ""
+
+#: admin/mimetypes/generic.tpl.c:59
+msgid "Add a new file pattern"
+msgstr ""
+
+#: admin/mimetypes/generic.tpl.c:65 admin/mimetypes/generic.tpl.c:89
+msgid "Enter an application name here"
+msgstr ""
+
+#: admin/mimetypes/generic.tpl.c:68 admin/mimetypes/generic.tpl.c:92
+msgid "Add application"
+msgstr ""
+
+#: admin/mimetypes/generic.tpl.c:71 admin/mimetypes/generic.tpl.c:74
+msgid "Embedding"
+msgstr ""
+
+#: admin/mimetypes/generic.tpl.c:77
+msgid "Show file in embedded viewer"
+msgstr ""
+
+#: admin/mimetypes/generic.tpl.c:80
+msgid "Show file in external viewer"
+msgstr ""
+
+#: admin/mimetypes/generic.tpl.c:83
+msgid "Ask whether to save to local disk"
+msgstr ""
diff --git a/applications/locale/ru/fusiondirectory.po b/applications/locale/ru/fusiondirectory.po
index 6f9728af9c13adad07c2801ebc1177e8a17878b2..673c0cba2e58317acd50ebfab3d334c16bfb08b2 100644
--- a/applications/locale/ru/fusiondirectory.po
+++ b/applications/locale/ru/fusiondirectory.po
@@ -5,219 +5,497 @@
 # Translators:
 msgid ""
 msgstr ""
-"Project-Id-Version: FusionDirectory-108\n"
+"Project-Id-Version: FusionDirectory-109\n"
 "Report-Msgid-Bugs-To: documentation@lists.fusiondirectory.org\n"
-"POT-Creation-Date: 2015-03-19 21:45+0100\n"
-"PO-Revision-Date: 2015-02-25 16:12+0000\n"
-"Last-Translator: fusiondirectory <contact@fusiondirectory.org>\n"
-"Language-Team: Russian (http://www.transifex.com/projects/p/FusionDirectory-108/language/ru/)\n"
+"POT-Creation-Date: 2014-08-28 12:26+0200\n"
+"PO-Revision-Date: 2014-08-28 10:28+0000\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: Russian (http://www.transifex.com/projects/p/FusionDirectory-109/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=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);\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/apps/class_groupApplication.inc:410
+#: admin/groups/apps/class_groupApplication.inc:414
+msgid "Menu"
+msgstr "ÐœÐµÐ½ÑŽ"
+
+#: admin/groups/apps/class_groupApplication.inc:482
+msgid "Back"
+msgstr "ÐÐ°Ð·Ð°Ð´"
+
+#: admin/groups/apps/class_groupApplication.inc:493
+msgid "back"
+msgstr "Ð½Ð°Ð·Ð°Ð´"
+
+#: admin/groups/apps/class_groupApplication.inc:501
+msgid "department"
+msgstr "Ð¾Ñ‚Ð´ÐµÐ»"
+
+#: admin/groups/apps/class_groupApplication.inc:524
+msgid "application"
+msgstr ""
+
+#: admin/groups/apps/class_groupApplication.inc:701
+#: admin/groups/apps/class_groupApplication.inc:1396
+#: admin/groups/apps/class_groupApplication.inc:1409
+#: admin/groups/apps/class_groupApplication.inc:1422
+#: admin/mimetypes/class_mimetypeGeneric.inc:481
+#: admin/mimetypes/class_mimetypeGeneric.inc:493
+#: admin/mimetypes/class_mimetypeGeneric.inc:508
+#: admin/applications/class_applicationParameters.inc:177
+#: admin/applications/class_applicationParameters.inc:242
+#: admin/applications/class_applicationGeneric.inc:290
+msgid "LDAP error"
+msgstr "ÐžÑˆÐ¸Ð±ÐºÐ° LDAP"
+
+#: admin/groups/apps/class_groupApplication.inc:1208
+msgid "Not available in release."
+msgstr ""
+
+#: admin/groups/apps/class_groupApplication.inc:1459
 #: 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
+#: admin/mimetypes/generic.tpl.c:62 admin/mimetypes/generic.tpl.c:86
 msgid "Applications"
 msgstr "ÐŸÑ€Ð¸Ð»Ð¾Ð¶ÐµÐ½Ð¸Ñ"
 
+#: admin/groups/apps/class_groupApplication.inc:1460
+msgid "Group applications"
+msgstr ""
+
+#: admin/groups/apps/class_groupApplication.inc:1466
+#: admin/mimetypes/class_mimetypeGeneric.inc:689
+#: admin/applications/class_applicationGeneric.inc:73
+msgid "Application"
+msgstr "ÐŸÑ€Ð¸Ð»Ð¾Ð¶ÐµÐ½Ð¸Ðµ"
+
+#: admin/groups/apps/class_groupApplication.inc:1467
+#: admin/groups/apps/app_list.tpl.c:2 admin/groups/apps/app_list.tpl.c:14
+msgid "Release"
+msgstr ""
+
+#: admin/groups/apps/class_groupApplication.inc:1468
+msgid "Application parameter"
+msgstr ""
+
+#: admin/groups/apps/class_groupApplication.inc:1469
+#: admin/applications/class_applicationGeneric.inc:135
+#: admin/groups/apps/edit_entry.tpl.c:32
+msgid "Place icon on members desktop"
+msgstr "ÐŸÐ¾Ð¼ÐµÑ‰Ð°Ñ‚ÑŒ Ð¿Ð¸ÐºÑ‚Ð¾Ð³Ñ€Ð°Ð¼Ð¼Ñƒ Ð½Ð° Ñ€Ð°Ð±Ð¾Ñ‡Ð¸Ðµ ÑÑ‚Ð¾Ð»Ñ‹ Ñ‡Ð»ÐµÐ½Ð¾Ð² Ð³Ñ€ÑƒÐ¿Ð¿Ñ‹"
+
+#: admin/groups/apps/class_groupApplication.inc:1470
+#: admin/applications/class_applicationGeneric.inc:145
+#: admin/groups/apps/edit_entry.tpl.c:38
+msgid "Place entry in members launch bar"
+msgstr ""
+
+#: admin/groups/apps/class_groupApplication.inc:1471
+#: admin/applications/class_applicationGeneric.inc:140
+#: admin/groups/apps/edit_entry.tpl.c:35
+msgid "Place entry in members startmenu"
+msgstr "ÐŸÐ¾Ð¼ÐµÑ‰Ð°Ñ‚ÑŒ Ñ‡Ð»ÐµÐ½Ð°Ð¼ Ð³Ñ€ÑƒÐ¿Ð¿Ñ‹ ÑÐ¾Ð¾Ñ‚Ð²ÐµÑ‚ÑÑ‚Ð²ÑƒÑŽÑ‰Ð¸Ð¹ ÑÐ»ÐµÐ¼ÐµÐ½Ñ‚ Ð² Ð¼ÐµÐ½ÑŽ Ð·Ð°Ð¿ÑƒÑÐºÐ°"
+
+#: admin/mimetypes/class_mimetypeManagement.inc:28
+#: admin/mimetypes/class_mimetypeGeneric.inc:674
+msgid "Mime types"
+msgstr ""
+
+#: admin/mimetypes/class_mimetypeManagement.inc:29
+msgid "Mime type management"
+msgstr ""
+
+#: admin/mimetypes/class_mimetypeGeneric.inc:519
+#: admin/mimetypes/class_mimetypeGeneric.inc:685
+#: admin/applications/class_applicationParameters.inc:208
+#: admin/applications/class_applicationParameters.inc:212
+#: admin/groups/apps/edit_entry.tpl.c:26
+msgid "Name"
+msgstr "Ð¤Ð°Ð¼Ð¸Ð»Ð¸Ñ"
+
+#: admin/mimetypes/class_mimetypeGeneric.inc:522
+msgid "File pattern"
+msgstr ""
+
+#: admin/mimetypes/class_mimetypeGeneric.inc:671
+#: admin/applications/class_applicationGeneric.inc:69
+#: admin/mimetypes/generic.tpl.c:2
+msgid "Generic"
+msgstr "ÐžÐ±Ñ‰ÐµÐµ"
+
+#: admin/mimetypes/class_mimetypeGeneric.inc:672
+msgid "Mime type generic"
+msgstr ""
+
+#: admin/mimetypes/class_mimetypeGeneric.inc:678
+#: admin/mimetypes/generic.tpl.c:5
+msgid "Mime type"
+msgstr ""
+
+#: admin/mimetypes/class_mimetypeGeneric.inc:686
+#: admin/mimetypes/generic.tpl.c:11
+msgid "Mime group"
+msgstr ""
+
+#: admin/mimetypes/class_mimetypeGeneric.inc:687
+#: admin/applications/class_applicationGeneric.inc:105
+#: admin/mimetypes/generic.tpl.c:17
+msgid "Description"
+msgstr "ÐžÐ¿Ð¸ÑÐ°Ð½Ð¸Ðµ"
+
+#: admin/mimetypes/class_mimetypeGeneric.inc:688
+#: admin/mimetypes/generic.tpl.c:23
+msgid "Base"
+msgstr "Ð’ÐµÑ‚ÐºÐ°"
+
+#: admin/mimetypes/class_mimetypeGeneric.inc:690
+msgid "Left click action"
+msgstr ""
+
+#: admin/mimetypes/class_mimetypeGeneric.inc:691
+#: admin/applications/class_applicationGeneric.inc:112
+#: admin/mimetypes/generic.tpl.c:32
+msgid "Icon"
+msgstr "ÐŸÐ¸ÐºÑ‚Ð¾Ð³Ñ€Ð°Ð¼Ð¼Ð°"
+
+#: admin/mimetypes/class_mimetypeGeneric.inc:692
+#: admin/mimetypes/generic.tpl.c:53
+msgid "File patterns"
+msgstr ""
+
+#: admin/mimetypes/class_mimetypeGeneric.inc:693
+msgid "Embedded applications"
+msgstr ""
+
 #: admin/applications/class_applicationManagement.inc:29
 msgid "Application management"
 msgstr "Ð£Ð¿Ñ€Ð°Ð²Ð»ÐµÐ½Ð¸Ðµ Ð¿Ñ€Ð¸Ð»Ð¾Ð¶ÐµÐ½Ð¸ÑÐ¼Ð¸"
 
-#: admin/applications/class_applicationManagement.inc:100
-msgid "Web applications"
+#: admin/applications/class_applicationParameters.inc:71
+msgid "Remove options"
+msgstr "Ð£Ð´Ð°Ð»Ð¸Ñ‚ÑŒ Ð¿Ð°Ñ€Ð°Ð¼ÐµÑ‚Ñ€Ñ‹"
+
+#: admin/applications/class_applicationParameters.inc:71
+#: admin/applications/class_applicationParameters.inc:73
+msgid "parameter"
 msgstr ""
 
-#: admin/applications/class_applicationGeneric.inc:31
-#: admin/applications/class_applicationGeneric.inc:34
-#: admin/applications/class_applicationGeneric.inc:48
-#: admin/applications/class_webApplication.inc:47
-msgid "Application"
-msgstr "ÐŸÑ€Ð¸Ð»Ð¾Ð¶ÐµÐ½Ð¸Ðµ"
+#: admin/applications/class_applicationParameters.inc:73
+msgid "Create options"
+msgstr "Ð¡Ð¾Ð·Ð´Ð°Ñ‚ÑŒ Ð¿Ð°Ñ€Ð°Ð¼ÐµÑ‚Ñ€Ñ‹"
 
-#: admin/applications/class_applicationGeneric.inc:32
-msgid "Application information"
+#: admin/applications/class_applicationParameters.inc:115
+msgid "Variable"
+msgstr "ÐŸÐµÑ€ÐµÐ¼ÐµÐ½Ð½Ð°Ñ"
+
+#: admin/applications/class_applicationParameters.inc:115
+msgid "Default value"
+msgstr "ÐŸÐ¾ ÑƒÐ¼Ð¾Ð»Ñ‡Ð°Ð½Ð¸ÑŽ"
+
+#: admin/applications/class_applicationParameters.inc:141
+#: admin/groups/apps/app_list.tpl.c:29 admin/groups/apps/app_list.tpl.c:41
+#: admin/groups/apps/app_list.tpl.c:53
+msgid "Remove"
+msgstr "Ð£Ð´Ð°Ð»Ð¸Ñ‚ÑŒ"
+
+#: admin/applications/class_applicationParameters.inc:147
+msgid "Add option"
+msgstr "Ð”Ð¾Ð±Ð°Ð²Ð¸Ñ‚ÑŒ Ð¿Ð°Ñ€Ð°Ð¼ÐµÑ‚Ñ€"
+
+#: admin/applications/class_applicationParameters.inc:265
+msgid "Parameter"
+msgstr ""
+
+#: admin/applications/class_applicationParameters.inc:266
+msgid "Parameter configuration"
+msgstr ""
+
+#: admin/applications/class_applicationParameters.inc:271
+msgid "Application parameter settings"
+msgstr ""
+
+#: admin/applications/class_applicationGeneric.inc:70
+msgid "Application generic"
 msgstr ""
 
-#: admin/applications/class_applicationGeneric.inc:52
+#: admin/applications/class_applicationGeneric.inc:90
+msgid "Properties"
+msgstr "Ð¡Ð²Ð¾Ð¹ÑÑ‚Ð²Ð°"
+
+#: admin/applications/class_applicationGeneric.inc:93
 msgid "Application name"
 msgstr "ÐŸÑ€Ð¸Ð»Ð¾Ð¶ÐµÐ½Ð¸Ðµ"
 
-#: admin/applications/class_applicationGeneric.inc:52
+#: admin/applications/class_applicationGeneric.inc:93
 msgid "The name of this application"
 msgstr ""
 
-#: admin/applications/class_applicationGeneric.inc:56
-#: admin/applications/class_webApplication.inc:55
-msgid "Description"
-msgstr "ÐžÐ¿Ð¸ÑÐ°Ð½Ð¸Ðµ"
+#: admin/applications/class_applicationGeneric.inc:97
+msgid "Display name"
+msgstr "ÐžÑ‚Ð¾Ð±Ñ€Ð°Ð¶Ð°ÐµÐ¼Ð¾Ðµ Ð¸Ð¼Ñ"
 
-#: admin/applications/class_applicationGeneric.inc:56
-#: admin/applications/class_webApplication.inc:55
-msgid "A short description of this application"
+#: admin/applications/class_applicationGeneric.inc:97
+msgid "The displayed name for this application"
 msgstr ""
 
-#: admin/applications/class_applicationGeneric.inc:60
+#: admin/applications/class_applicationGeneric.inc:101
 msgid "Execute"
 msgstr "Ð’Ñ‹Ð¿Ð¾Ð»Ð½Ð¸Ñ‚ÑŒ"
 
-#: admin/applications/class_applicationGeneric.inc:60
+#: admin/applications/class_applicationGeneric.inc:101
 msgid "The application to be executed"
 msgstr ""
 
-#: admin/applications/class_applicationGeneric.inc:64
-msgid "Display name"
-msgstr "ÐžÑ‚Ð¾Ð±Ñ€Ð°Ð¶Ð°ÐµÐ¼Ð¾Ðµ Ð¸Ð¼Ñ"
-
-#: admin/applications/class_applicationGeneric.inc:64
-msgid "The displayed name for this application"
+#: admin/applications/class_applicationGeneric.inc:105
+msgid "A short description of this application"
 msgstr ""
 
-#: admin/applications/class_applicationGeneric.inc:70
-#: admin/applications/class_webApplication.inc:69
-msgid "Icon"
-msgstr "ÐŸÐ¸ÐºÑ‚Ð¾Ð³Ñ€Ð°Ð¼Ð¼Ð°"
-
-#: admin/applications/class_applicationGeneric.inc:73
-#: admin/applications/class_webApplication.inc:72
+#: admin/applications/class_applicationGeneric.inc:115
 msgid "The icon for this application"
 msgstr ""
 
-#: admin/applications/class_applicationGeneric.inc:80
+#: admin/applications/class_applicationGeneric.inc:122
 msgid "Options"
 msgstr "ÐŸÐ°Ñ€Ð°Ð¼ÐµÑ‚Ñ€Ñ‹"
 
-#: admin/applications/class_applicationGeneric.inc:83
+#: admin/applications/class_applicationGeneric.inc:125
 msgid "Only executable for member"
 msgstr ""
 
-#: admin/applications/class_applicationGeneric.inc:83
+#: admin/applications/class_applicationGeneric.inc:125
 msgid "Only executable by the memebers of the group"
 msgstr ""
 
-#: admin/applications/class_applicationGeneric.inc:88
+#: admin/applications/class_applicationGeneric.inc:130
 msgid "Replace user configuration on startup"
 msgstr "Ð—Ð°Ð¼ÐµÐ½ÑÑ‚ÑŒ Ð½Ð°ÑÑ‚Ñ€Ð¾Ð¹ÐºÐ¸ Ð¿Ð¾Ð»ÑŒÐ·Ð¾Ð²Ð°Ñ‚ÐµÐ»Ñ Ð¿Ñ€Ð¸ Ð·Ð°Ð¿ÑƒÑÐºÐµ"
 
-#: admin/applications/class_applicationGeneric.inc:88
+#: admin/applications/class_applicationGeneric.inc:130
 msgid "Replace the user configuration on startup"
 msgstr ""
 
-#: admin/applications/class_applicationGeneric.inc:93
-msgid "Place icon on members desktop"
-msgstr "ÐŸÐ¾Ð¼ÐµÑ‰Ð°Ñ‚ÑŒ Ð¿Ð¸ÐºÑ‚Ð¾Ð³Ñ€Ð°Ð¼Ð¼Ñƒ Ð½Ð° Ñ€Ð°Ð±Ð¾Ñ‡Ð¸Ðµ ÑÑ‚Ð¾Ð»Ñ‹ Ñ‡Ð»ÐµÐ½Ð¾Ð² Ð³Ñ€ÑƒÐ¿Ð¿Ñ‹"
-
-#: admin/applications/class_applicationGeneric.inc:93
+#: admin/applications/class_applicationGeneric.inc:135
 msgid "Put an icon on the user desktop"
 msgstr ""
 
-#: admin/applications/class_applicationGeneric.inc:98
-msgid "Place entry in members startmenu"
-msgstr "ÐŸÐ¾Ð¼ÐµÑ‰Ð°Ñ‚ÑŒ Ñ‡Ð»ÐµÐ½Ð°Ð¼ Ð³Ñ€ÑƒÐ¿Ð¿Ñ‹ ÑÐ¾Ð¾Ñ‚Ð²ÐµÑ‚ÑÑ‚Ð²ÑƒÑŽÑ‰Ð¸Ð¹ ÑÐ»ÐµÐ¼ÐµÐ½Ñ‚ Ð² Ð¼ÐµÐ½ÑŽ Ð·Ð°Ð¿ÑƒÑÐºÐ°"
-
-#: admin/applications/class_applicationGeneric.inc:98
-#: admin/applications/class_applicationGeneric.inc:103
+#: admin/applications/class_applicationGeneric.inc:140
+#: admin/applications/class_applicationGeneric.inc:145
 msgid "Put an entry in the startup menu"
 msgstr ""
 
-#: admin/applications/class_applicationGeneric.inc:103
-msgid "Place entry in members launch bar"
+#: admin/applications/class_applicationGeneric.inc:156
+msgid "Script"
 msgstr ""
 
-#: admin/applications/class_webApplication.inc:30
-#: admin/applications/class_webApplication.inc:33
-msgid "Web application"
+#: admin/applications/class_applicationGeneric.inc:159
+msgid "Script to run at logon"
 msgstr ""
 
-#: admin/applications/class_webApplication.inc:31
-msgid "Web applicationts names, icons and links"
+#: admin/applications/class_applicationGeneric.inc:165
+msgid "Log off script"
 msgstr ""
 
-#: admin/applications/class_webApplication.inc:51
-msgid "Name"
-msgstr "Ð¤Ð°Ð¼Ð¸Ð»Ð¸Ñ"
+#: admin/applications/class_applicationGeneric.inc:168
+msgid "Script to run at logoff"
+msgstr ""
 
-#: admin/applications/class_webApplication.inc:51
-msgid "Name or id for application"
+#: admin/applications/class_applicationGeneric.inc:227
+msgid "no example"
 msgstr ""
 
-#: admin/applications/class_webApplication.inc:59
-msgid "URL"
+#: admin/applications/class_applicationGeneric.inc:276
+msgid "Error"
+msgstr "ÐžÑˆÐ¸Ð±ÐºÐ°"
+
+#: admin/applications/class_applicationGeneric.inc:276
+#, php-format
+msgid "Cannot remove application - it is still in use by these objects: %s"
 msgstr ""
 
-#: admin/applications/class_webApplication.inc:59
-msgid "Link to this application"
+#: config/desktop-management/class_desktopPluginConfig.inc:28
+msgid "Desktop management"
 msgstr ""
 
-#: admin/applications/class_webApplication.inc:63
-msgid "Display Name"
+#: config/desktop-management/class_desktopPluginConfig.inc:29
+msgid "Desktop management plugin configuration"
 msgstr ""
 
-#: admin/applications/class_webApplication.inc:63
-msgid "Displayed name for links to this application"
+#: config/desktop-management/class_desktopPluginConfig.inc:40
+msgid "LDAP tree"
+msgstr "LDAP Ð´ÐµÑ€ÐµÐ²Ð¾ "
+
+#: config/desktop-management/class_desktopPluginConfig.inc:43
+msgid "Mimetype RDN"
 msgstr ""
 
-#: admin/applications/class_webApplication.inc:77
-msgid "Icon location"
+#: config/desktop-management/class_desktopPluginConfig.inc:43
+msgid "Branch in which mime types will be stored"
 msgstr ""
 
-#: admin/applications/class_webApplication.inc:77
-msgid "Usual path to this application icon"
+#: config/desktop-management/class_desktopPluginConfig.inc:48
+msgid "Application RDN"
 msgstr ""
 
-#: admin/roles/class_applicationRights.inc:31
-msgid "Applications allowed for this role"
+#: config/desktop-management/class_desktopPluginConfig.inc:48
+msgid "Branch in which applications will be stored"
 msgstr ""
 
-#: admin/roles/class_applicationRights.inc:45
-msgid "Application list"
+#: admin/groups/apps/edit_entry.tpl.c:2
+msgid "Folder image"
 msgstr ""
 
-#: admin/roles/class_applicationRights.inc:49
-msgid "The applications users with this role are allowed to launch"
+#: admin/groups/apps/edit_entry.tpl.c:5
+msgid "Could not load image."
 msgstr ""
 
-#: config/applications/class_applicationsPluginConfig.inc:29
-msgid "Applications plugin configuration"
+#: admin/groups/apps/edit_entry.tpl.c:8
+msgid "None"
 msgstr ""
 
-#: config/applications/class_applicationsPluginConfig.inc:43
-msgid "Application RDN"
+#: admin/groups/apps/edit_entry.tpl.c:11
+msgid "Upload image"
 msgstr ""
 
-#: config/applications/class_applicationsPluginConfig.inc:43
-msgid "Branch in which applications will be stored"
+#: admin/groups/apps/edit_entry.tpl.c:14
+msgid "Upload"
+msgstr "Ð—Ð°Ð³Ñ€ÑƒÐ·Ð¸Ñ‚ÑŒ"
+
+#: admin/groups/apps/edit_entry.tpl.c:17
+msgid "Reset image"
 msgstr ""
 
-#: config/applications/class_applicationsPluginConfig.inc:48
-msgid "Web applications RDN"
+#: admin/groups/apps/edit_entry.tpl.c:20
+msgid "Reset"
 msgstr ""
 
-#: config/applications/class_applicationsPluginConfig.inc:48
-msgid "Branch in which web applications will be stored"
+#: admin/groups/apps/edit_entry.tpl.c:23
+msgid "Application settings"
 msgstr ""
 
-#: config/applications/class_applicationsPluginConfig.inc:53
-msgid "Show web applications in menu"
+#: admin/groups/apps/edit_entry.tpl.c:29
+msgid "Application options"
+msgstr "ÐŸÐ°Ñ€Ð°Ð¼ÐµÑ‚Ñ€Ñ‹ Ð¿Ñ€Ð¸Ð»Ð¾Ð¶ÐµÐ½Ð¸Ñ"
+
+#: admin/groups/apps/app_list.tpl.c:5
+msgid "Copy menu"
 msgstr ""
 
-#: config/applications/class_applicationsPluginConfig.inc:53
-msgid "Whether to show web applications in FD main menu"
+#: admin/groups/apps/app_list.tpl.c:8
+msgid "Paste menu from"
 msgstr ""
 
-#: config/applications/class_applicationsPluginConfig.inc:56
-msgid "None"
+#: admin/groups/apps/app_list.tpl.c:11
+msgid "Delete menu"
+msgstr ""
+
+#: admin/groups/apps/app_list.tpl.c:17 admin/groups/apps/app_list.tpl.c:20
+msgid "Folder"
+msgstr ""
+
+#: admin/groups/apps/app_list.tpl.c:23 admin/groups/apps/app_list.tpl.c:35
+#: admin/groups/apps/app_list.tpl.c:47
+msgid "Move up"
+msgstr ""
+
+#: admin/groups/apps/app_list.tpl.c:26 admin/groups/apps/app_list.tpl.c:38
+#: admin/groups/apps/app_list.tpl.c:50
+msgid "Move down"
+msgstr ""
+
+#: admin/groups/apps/app_list.tpl.c:32 admin/groups/apps/app_list.tpl.c:56
+msgid "Edit"
+msgstr "Ð˜Ð·Ð¼ÐµÐ½Ð¸Ñ‚ÑŒ"
+
+#: admin/groups/apps/app_list.tpl.c:44
+msgid "Entry"
+msgstr ""
+
+#: admin/groups/apps/app_list.tpl.c:59
+msgid "add to"
+msgstr ""
+
+#: admin/groups/apps/app_list.tpl.c:62
+msgid "Add selected category to this folder.."
+msgstr ""
+
+#: admin/groups/apps/app_list.tpl.c:65
+msgid "Separator"
+msgstr ""
+
+#: admin/groups/apps/app_list.tpl.c:68
+msgid "Add a separator to this folder."
+msgstr ""
+
+#: admin/groups/apps/app_list.tpl.c:71
+msgid "Add selected applications to this folder."
+msgstr ""
+
+#: admin/mimetypes/generic.tpl.c:8
+msgid "Please enter a name for the mime type here"
+msgstr ""
+
+#: admin/mimetypes/generic.tpl.c:14
+msgid "Categorize this mime type"
+msgstr ""
+
+#: admin/mimetypes/generic.tpl.c:20
+msgid "Please specify a description"
+msgstr ""
+
+#: admin/mimetypes/generic.tpl.c:26
+msgid "Choose subtree to place application in"
+msgstr "Ð’Ñ‹Ð±ÐµÑ€Ð¸Ñ‚Ðµ Ð²ÐµÑ‚ÐºÑƒ, ÐºÑƒÐ´Ð° Ð½ÑƒÐ¶Ð½Ð¾ Ð¿Ð¾Ð¼ÐµÑÑ‚Ð¸Ñ‚ÑŒ Ð¿Ñ€Ð¸Ð»Ð¾Ð¶ÐµÐ½Ð¸Ðµ"
+
+#: admin/mimetypes/generic.tpl.c:29
+msgid "Select a base"
 msgstr ""
 
-#: config/applications/class_applicationsPluginConfig.inc:56
-msgid "Only allowed"
+#: admin/mimetypes/generic.tpl.c:35 admin/mimetypes/generic.tpl.c:38
+msgid "Mime icon"
 msgstr ""
 
-#: config/applications/class_applicationsPluginConfig.inc:56
-msgid "All"
-msgstr "Ð’ÑÐµ"
+#: admin/mimetypes/generic.tpl.c:41
+msgid "Update"
+msgstr "ÐžÐ±Ð½Ð¾Ð²Ð¸Ñ‚ÑŒ"
+
+#: admin/mimetypes/generic.tpl.c:44
+msgid "Update mime type icon"
+msgstr ""
+
+#: admin/mimetypes/generic.tpl.c:47 admin/mimetypes/generic.tpl.c:50
+msgid "Left click"
+msgstr ""
+
+#: admin/mimetypes/generic.tpl.c:56
+msgid "Please specify a new file pattern"
+msgstr ""
+
+#: admin/mimetypes/generic.tpl.c:59
+msgid "Add a new file pattern"
+msgstr ""
+
+#: admin/mimetypes/generic.tpl.c:65 admin/mimetypes/generic.tpl.c:89
+msgid "Enter an application name here"
+msgstr ""
+
+#: admin/mimetypes/generic.tpl.c:68 admin/mimetypes/generic.tpl.c:92
+msgid "Add application"
+msgstr ""
+
+#: admin/mimetypes/generic.tpl.c:71 admin/mimetypes/generic.tpl.c:74
+msgid "Embedding"
+msgstr ""
+
+#: admin/mimetypes/generic.tpl.c:77
+msgid "Show file in embedded viewer"
+msgstr ""
+
+#: admin/mimetypes/generic.tpl.c:80
+msgid "Show file in external viewer"
+msgstr ""
+
+#: admin/mimetypes/generic.tpl.c:83
+msgid "Ask whether to save to local disk"
+msgstr ""
diff --git a/applications/locale/ru@petr1708/fusiondirectory.po b/applications/locale/ru@petr1708/fusiondirectory.po
index f3f667beb2eaed1fcf23a629d85d95acbe1ff3b0..79580bdfdb3f3fc42fd7b4c1680a7bfeb73931bb 100644
--- a/applications/locale/ru@petr1708/fusiondirectory.po
+++ b/applications/locale/ru@petr1708/fusiondirectory.po
@@ -5,219 +5,497 @@
 # Translators:
 msgid ""
 msgstr ""
-"Project-Id-Version: FusionDirectory-108\n"
+"Project-Id-Version: FusionDirectory-109\n"
 "Report-Msgid-Bugs-To: documentation@lists.fusiondirectory.org\n"
-"POT-Creation-Date: 2015-03-19 21:45+0100\n"
-"PO-Revision-Date: 2014-12-12 07:34+0000\n"
-"Last-Translator: fusiondirectory <contact@fusiondirectory.org>\n"
-"Language-Team: Russian Petrine orthography (http://www.transifex.com/projects/p/FusionDirectory-108/language/ru@petr1708/)\n"
+"POT-Creation-Date: 2014-08-28 12:26+0200\n"
+"PO-Revision-Date: 2014-08-28 10:28+0000\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: Russian Petrine orthography (http://www.transifex.com/projects/p/FusionDirectory-109/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=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);\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/apps/class_groupApplication.inc:410
+#: admin/groups/apps/class_groupApplication.inc:414
+msgid "Menu"
+msgstr ""
+
+#: admin/groups/apps/class_groupApplication.inc:482
+msgid "Back"
+msgstr ""
+
+#: admin/groups/apps/class_groupApplication.inc:493
+msgid "back"
+msgstr ""
+
+#: admin/groups/apps/class_groupApplication.inc:501
+msgid "department"
+msgstr ""
+
+#: admin/groups/apps/class_groupApplication.inc:524
+msgid "application"
+msgstr ""
+
+#: admin/groups/apps/class_groupApplication.inc:701
+#: admin/groups/apps/class_groupApplication.inc:1396
+#: admin/groups/apps/class_groupApplication.inc:1409
+#: admin/groups/apps/class_groupApplication.inc:1422
+#: admin/mimetypes/class_mimetypeGeneric.inc:481
+#: admin/mimetypes/class_mimetypeGeneric.inc:493
+#: admin/mimetypes/class_mimetypeGeneric.inc:508
+#: admin/applications/class_applicationParameters.inc:177
+#: admin/applications/class_applicationParameters.inc:242
+#: admin/applications/class_applicationGeneric.inc:290
+msgid "LDAP error"
+msgstr ""
+
+#: admin/groups/apps/class_groupApplication.inc:1208
+msgid "Not available in release."
+msgstr ""
+
+#: admin/groups/apps/class_groupApplication.inc:1459
 #: 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
+#: admin/mimetypes/generic.tpl.c:62 admin/mimetypes/generic.tpl.c:86
 msgid "Applications"
 msgstr ""
 
+#: admin/groups/apps/class_groupApplication.inc:1460
+msgid "Group applications"
+msgstr ""
+
+#: admin/groups/apps/class_groupApplication.inc:1466
+#: admin/mimetypes/class_mimetypeGeneric.inc:689
+#: admin/applications/class_applicationGeneric.inc:73
+msgid "Application"
+msgstr ""
+
+#: admin/groups/apps/class_groupApplication.inc:1467
+#: admin/groups/apps/app_list.tpl.c:2 admin/groups/apps/app_list.tpl.c:14
+msgid "Release"
+msgstr ""
+
+#: admin/groups/apps/class_groupApplication.inc:1468
+msgid "Application parameter"
+msgstr ""
+
+#: admin/groups/apps/class_groupApplication.inc:1469
+#: admin/applications/class_applicationGeneric.inc:135
+#: admin/groups/apps/edit_entry.tpl.c:32
+msgid "Place icon on members desktop"
+msgstr ""
+
+#: admin/groups/apps/class_groupApplication.inc:1470
+#: admin/applications/class_applicationGeneric.inc:145
+#: admin/groups/apps/edit_entry.tpl.c:38
+msgid "Place entry in members launch bar"
+msgstr ""
+
+#: admin/groups/apps/class_groupApplication.inc:1471
+#: admin/applications/class_applicationGeneric.inc:140
+#: admin/groups/apps/edit_entry.tpl.c:35
+msgid "Place entry in members startmenu"
+msgstr ""
+
+#: admin/mimetypes/class_mimetypeManagement.inc:28
+#: admin/mimetypes/class_mimetypeGeneric.inc:674
+msgid "Mime types"
+msgstr ""
+
+#: admin/mimetypes/class_mimetypeManagement.inc:29
+msgid "Mime type management"
+msgstr ""
+
+#: admin/mimetypes/class_mimetypeGeneric.inc:519
+#: admin/mimetypes/class_mimetypeGeneric.inc:685
+#: admin/applications/class_applicationParameters.inc:208
+#: admin/applications/class_applicationParameters.inc:212
+#: admin/groups/apps/edit_entry.tpl.c:26
+msgid "Name"
+msgstr ""
+
+#: admin/mimetypes/class_mimetypeGeneric.inc:522
+msgid "File pattern"
+msgstr ""
+
+#: admin/mimetypes/class_mimetypeGeneric.inc:671
+#: admin/applications/class_applicationGeneric.inc:69
+#: admin/mimetypes/generic.tpl.c:2
+msgid "Generic"
+msgstr ""
+
+#: admin/mimetypes/class_mimetypeGeneric.inc:672
+msgid "Mime type generic"
+msgstr ""
+
+#: admin/mimetypes/class_mimetypeGeneric.inc:678
+#: admin/mimetypes/generic.tpl.c:5
+msgid "Mime type"
+msgstr ""
+
+#: admin/mimetypes/class_mimetypeGeneric.inc:686
+#: admin/mimetypes/generic.tpl.c:11
+msgid "Mime group"
+msgstr ""
+
+#: admin/mimetypes/class_mimetypeGeneric.inc:687
+#: admin/applications/class_applicationGeneric.inc:105
+#: admin/mimetypes/generic.tpl.c:17
+msgid "Description"
+msgstr ""
+
+#: admin/mimetypes/class_mimetypeGeneric.inc:688
+#: admin/mimetypes/generic.tpl.c:23
+msgid "Base"
+msgstr ""
+
+#: admin/mimetypes/class_mimetypeGeneric.inc:690
+msgid "Left click action"
+msgstr ""
+
+#: admin/mimetypes/class_mimetypeGeneric.inc:691
+#: admin/applications/class_applicationGeneric.inc:112
+#: admin/mimetypes/generic.tpl.c:32
+msgid "Icon"
+msgstr ""
+
+#: admin/mimetypes/class_mimetypeGeneric.inc:692
+#: admin/mimetypes/generic.tpl.c:53
+msgid "File patterns"
+msgstr ""
+
+#: admin/mimetypes/class_mimetypeGeneric.inc:693
+msgid "Embedded applications"
+msgstr ""
+
 #: admin/applications/class_applicationManagement.inc:29
 msgid "Application management"
 msgstr ""
 
-#: admin/applications/class_applicationManagement.inc:100
-msgid "Web applications"
+#: admin/applications/class_applicationParameters.inc:71
+msgid "Remove options"
 msgstr ""
 
-#: admin/applications/class_applicationGeneric.inc:31
-#: admin/applications/class_applicationGeneric.inc:34
-#: admin/applications/class_applicationGeneric.inc:48
-#: admin/applications/class_webApplication.inc:47
-msgid "Application"
+#: admin/applications/class_applicationParameters.inc:71
+#: admin/applications/class_applicationParameters.inc:73
+msgid "parameter"
 msgstr ""
 
-#: admin/applications/class_applicationGeneric.inc:32
-msgid "Application information"
+#: admin/applications/class_applicationParameters.inc:73
+msgid "Create options"
 msgstr ""
 
-#: admin/applications/class_applicationGeneric.inc:52
-msgid "Application name"
+#: admin/applications/class_applicationParameters.inc:115
+msgid "Variable"
 msgstr ""
 
-#: admin/applications/class_applicationGeneric.inc:52
-msgid "The name of this application"
+#: admin/applications/class_applicationParameters.inc:115
+msgid "Default value"
 msgstr ""
 
-#: admin/applications/class_applicationGeneric.inc:56
-#: admin/applications/class_webApplication.inc:55
-msgid "Description"
+#: admin/applications/class_applicationParameters.inc:141
+#: admin/groups/apps/app_list.tpl.c:29 admin/groups/apps/app_list.tpl.c:41
+#: admin/groups/apps/app_list.tpl.c:53
+msgid "Remove"
 msgstr ""
 
-#: admin/applications/class_applicationGeneric.inc:56
-#: admin/applications/class_webApplication.inc:55
-msgid "A short description of this application"
+#: admin/applications/class_applicationParameters.inc:147
+msgid "Add option"
 msgstr ""
 
-#: admin/applications/class_applicationGeneric.inc:60
-msgid "Execute"
+#: admin/applications/class_applicationParameters.inc:265
+msgid "Parameter"
 msgstr ""
 
-#: admin/applications/class_applicationGeneric.inc:60
-msgid "The application to be executed"
+#: admin/applications/class_applicationParameters.inc:266
+msgid "Parameter configuration"
+msgstr ""
+
+#: admin/applications/class_applicationParameters.inc:271
+msgid "Application parameter settings"
+msgstr ""
+
+#: admin/applications/class_applicationGeneric.inc:70
+msgid "Application generic"
+msgstr ""
+
+#: admin/applications/class_applicationGeneric.inc:90
+msgid "Properties"
+msgstr ""
+
+#: admin/applications/class_applicationGeneric.inc:93
+msgid "Application name"
+msgstr ""
+
+#: admin/applications/class_applicationGeneric.inc:93
+msgid "The name of this application"
 msgstr ""
 
-#: admin/applications/class_applicationGeneric.inc:64
+#: admin/applications/class_applicationGeneric.inc:97
 msgid "Display name"
 msgstr ""
 
-#: admin/applications/class_applicationGeneric.inc:64
+#: admin/applications/class_applicationGeneric.inc:97
 msgid "The displayed name for this application"
 msgstr ""
 
-#: admin/applications/class_applicationGeneric.inc:70
-#: admin/applications/class_webApplication.inc:69
-msgid "Icon"
+#: admin/applications/class_applicationGeneric.inc:101
+msgid "Execute"
 msgstr ""
 
-#: admin/applications/class_applicationGeneric.inc:73
-#: admin/applications/class_webApplication.inc:72
+#: admin/applications/class_applicationGeneric.inc:101
+msgid "The application to be executed"
+msgstr ""
+
+#: admin/applications/class_applicationGeneric.inc:105
+msgid "A short description of this application"
+msgstr ""
+
+#: admin/applications/class_applicationGeneric.inc:115
 msgid "The icon for this application"
 msgstr ""
 
-#: admin/applications/class_applicationGeneric.inc:80
+#: admin/applications/class_applicationGeneric.inc:122
 msgid "Options"
 msgstr ""
 
-#: admin/applications/class_applicationGeneric.inc:83
+#: admin/applications/class_applicationGeneric.inc:125
 msgid "Only executable for member"
 msgstr ""
 
-#: admin/applications/class_applicationGeneric.inc:83
+#: admin/applications/class_applicationGeneric.inc:125
 msgid "Only executable by the memebers of the group"
 msgstr ""
 
-#: admin/applications/class_applicationGeneric.inc:88
+#: admin/applications/class_applicationGeneric.inc:130
 msgid "Replace user configuration on startup"
 msgstr ""
 
-#: admin/applications/class_applicationGeneric.inc:88
+#: admin/applications/class_applicationGeneric.inc:130
 msgid "Replace the user configuration on startup"
 msgstr ""
 
-#: admin/applications/class_applicationGeneric.inc:93
-msgid "Place icon on members desktop"
+#: admin/applications/class_applicationGeneric.inc:135
+msgid "Put an icon on the user desktop"
 msgstr ""
 
-#: admin/applications/class_applicationGeneric.inc:93
-msgid "Put an icon on the user desktop"
+#: admin/applications/class_applicationGeneric.inc:140
+#: admin/applications/class_applicationGeneric.inc:145
+msgid "Put an entry in the startup menu"
 msgstr ""
 
-#: admin/applications/class_applicationGeneric.inc:98
-msgid "Place entry in members startmenu"
+#: admin/applications/class_applicationGeneric.inc:156
+msgid "Script"
 msgstr ""
 
-#: admin/applications/class_applicationGeneric.inc:98
-#: admin/applications/class_applicationGeneric.inc:103
-msgid "Put an entry in the startup menu"
+#: admin/applications/class_applicationGeneric.inc:159
+msgid "Script to run at logon"
 msgstr ""
 
-#: admin/applications/class_applicationGeneric.inc:103
-msgid "Place entry in members launch bar"
+#: admin/applications/class_applicationGeneric.inc:165
+msgid "Log off script"
 msgstr ""
 
-#: admin/applications/class_webApplication.inc:30
-#: admin/applications/class_webApplication.inc:33
-msgid "Web application"
+#: admin/applications/class_applicationGeneric.inc:168
+msgid "Script to run at logoff"
 msgstr ""
 
-#: admin/applications/class_webApplication.inc:31
-msgid "Web applicationts names, icons and links"
+#: admin/applications/class_applicationGeneric.inc:227
+msgid "no example"
 msgstr ""
 
-#: admin/applications/class_webApplication.inc:51
-msgid "Name"
+#: admin/applications/class_applicationGeneric.inc:276
+msgid "Error"
 msgstr ""
 
-#: admin/applications/class_webApplication.inc:51
-msgid "Name or id for application"
+#: admin/applications/class_applicationGeneric.inc:276
+#, php-format
+msgid "Cannot remove application - it is still in use by these objects: %s"
 msgstr ""
 
-#: admin/applications/class_webApplication.inc:59
-msgid "URL"
+#: config/desktop-management/class_desktopPluginConfig.inc:28
+msgid "Desktop management"
 msgstr ""
 
-#: admin/applications/class_webApplication.inc:59
-msgid "Link to this application"
+#: config/desktop-management/class_desktopPluginConfig.inc:29
+msgid "Desktop management plugin configuration"
 msgstr ""
 
-#: admin/applications/class_webApplication.inc:63
-msgid "Display Name"
+#: config/desktop-management/class_desktopPluginConfig.inc:40
+msgid "LDAP tree"
 msgstr ""
 
-#: admin/applications/class_webApplication.inc:63
-msgid "Displayed name for links to this application"
+#: config/desktop-management/class_desktopPluginConfig.inc:43
+msgid "Mimetype RDN"
 msgstr ""
 
-#: admin/applications/class_webApplication.inc:77
-msgid "Icon location"
+#: config/desktop-management/class_desktopPluginConfig.inc:43
+msgid "Branch in which mime types will be stored"
 msgstr ""
 
-#: admin/applications/class_webApplication.inc:77
-msgid "Usual path to this application icon"
+#: config/desktop-management/class_desktopPluginConfig.inc:48
+msgid "Application RDN"
 msgstr ""
 
-#: admin/roles/class_applicationRights.inc:31
-msgid "Applications allowed for this role"
+#: config/desktop-management/class_desktopPluginConfig.inc:48
+msgid "Branch in which applications will be stored"
 msgstr ""
 
-#: admin/roles/class_applicationRights.inc:45
-msgid "Application list"
+#: admin/groups/apps/edit_entry.tpl.c:2
+msgid "Folder image"
 msgstr ""
 
-#: admin/roles/class_applicationRights.inc:49
-msgid "The applications users with this role are allowed to launch"
+#: admin/groups/apps/edit_entry.tpl.c:5
+msgid "Could not load image."
 msgstr ""
 
-#: config/applications/class_applicationsPluginConfig.inc:29
-msgid "Applications plugin configuration"
+#: admin/groups/apps/edit_entry.tpl.c:8
+msgid "None"
 msgstr ""
 
-#: config/applications/class_applicationsPluginConfig.inc:43
-msgid "Application RDN"
+#: admin/groups/apps/edit_entry.tpl.c:11
+msgid "Upload image"
 msgstr ""
 
-#: config/applications/class_applicationsPluginConfig.inc:43
-msgid "Branch in which applications will be stored"
+#: admin/groups/apps/edit_entry.tpl.c:14
+msgid "Upload"
 msgstr ""
 
-#: config/applications/class_applicationsPluginConfig.inc:48
-msgid "Web applications RDN"
+#: admin/groups/apps/edit_entry.tpl.c:17
+msgid "Reset image"
 msgstr ""
 
-#: config/applications/class_applicationsPluginConfig.inc:48
-msgid "Branch in which web applications will be stored"
+#: admin/groups/apps/edit_entry.tpl.c:20
+msgid "Reset"
 msgstr ""
 
-#: config/applications/class_applicationsPluginConfig.inc:53
-msgid "Show web applications in menu"
+#: admin/groups/apps/edit_entry.tpl.c:23
+msgid "Application settings"
 msgstr ""
 
-#: config/applications/class_applicationsPluginConfig.inc:53
-msgid "Whether to show web applications in FD main menu"
+#: admin/groups/apps/edit_entry.tpl.c:29
+msgid "Application options"
 msgstr ""
 
-#: config/applications/class_applicationsPluginConfig.inc:56
-msgid "None"
+#: admin/groups/apps/app_list.tpl.c:5
+msgid "Copy menu"
+msgstr ""
+
+#: admin/groups/apps/app_list.tpl.c:8
+msgid "Paste menu from"
+msgstr ""
+
+#: admin/groups/apps/app_list.tpl.c:11
+msgid "Delete menu"
+msgstr ""
+
+#: admin/groups/apps/app_list.tpl.c:17 admin/groups/apps/app_list.tpl.c:20
+msgid "Folder"
+msgstr ""
+
+#: admin/groups/apps/app_list.tpl.c:23 admin/groups/apps/app_list.tpl.c:35
+#: admin/groups/apps/app_list.tpl.c:47
+msgid "Move up"
+msgstr ""
+
+#: admin/groups/apps/app_list.tpl.c:26 admin/groups/apps/app_list.tpl.c:38
+#: admin/groups/apps/app_list.tpl.c:50
+msgid "Move down"
+msgstr ""
+
+#: admin/groups/apps/app_list.tpl.c:32 admin/groups/apps/app_list.tpl.c:56
+msgid "Edit"
+msgstr ""
+
+#: admin/groups/apps/app_list.tpl.c:44
+msgid "Entry"
+msgstr ""
+
+#: admin/groups/apps/app_list.tpl.c:59
+msgid "add to"
+msgstr ""
+
+#: admin/groups/apps/app_list.tpl.c:62
+msgid "Add selected category to this folder.."
+msgstr ""
+
+#: admin/groups/apps/app_list.tpl.c:65
+msgid "Separator"
+msgstr ""
+
+#: admin/groups/apps/app_list.tpl.c:68
+msgid "Add a separator to this folder."
+msgstr ""
+
+#: admin/groups/apps/app_list.tpl.c:71
+msgid "Add selected applications to this folder."
+msgstr ""
+
+#: admin/mimetypes/generic.tpl.c:8
+msgid "Please enter a name for the mime type here"
+msgstr ""
+
+#: admin/mimetypes/generic.tpl.c:14
+msgid "Categorize this mime type"
+msgstr ""
+
+#: admin/mimetypes/generic.tpl.c:20
+msgid "Please specify a description"
+msgstr ""
+
+#: admin/mimetypes/generic.tpl.c:26
+msgid "Choose subtree to place application in"
+msgstr ""
+
+#: admin/mimetypes/generic.tpl.c:29
+msgid "Select a base"
+msgstr ""
+
+#: admin/mimetypes/generic.tpl.c:35 admin/mimetypes/generic.tpl.c:38
+msgid "Mime icon"
+msgstr ""
+
+#: admin/mimetypes/generic.tpl.c:41
+msgid "Update"
+msgstr ""
+
+#: admin/mimetypes/generic.tpl.c:44
+msgid "Update mime type icon"
+msgstr ""
+
+#: admin/mimetypes/generic.tpl.c:47 admin/mimetypes/generic.tpl.c:50
+msgid "Left click"
+msgstr ""
+
+#: admin/mimetypes/generic.tpl.c:56
+msgid "Please specify a new file pattern"
+msgstr ""
+
+#: admin/mimetypes/generic.tpl.c:59
+msgid "Add a new file pattern"
+msgstr ""
+
+#: admin/mimetypes/generic.tpl.c:65 admin/mimetypes/generic.tpl.c:89
+msgid "Enter an application name here"
+msgstr ""
+
+#: admin/mimetypes/generic.tpl.c:68 admin/mimetypes/generic.tpl.c:92
+msgid "Add application"
+msgstr ""
+
+#: admin/mimetypes/generic.tpl.c:71 admin/mimetypes/generic.tpl.c:74
+msgid "Embedding"
+msgstr ""
+
+#: admin/mimetypes/generic.tpl.c:77
+msgid "Show file in embedded viewer"
 msgstr ""
 
-#: config/applications/class_applicationsPluginConfig.inc:56
-msgid "Only allowed"
+#: admin/mimetypes/generic.tpl.c:80
+msgid "Show file in external viewer"
 msgstr ""
 
-#: config/applications/class_applicationsPluginConfig.inc:56
-msgid "All"
+#: admin/mimetypes/generic.tpl.c:83
+msgid "Ask whether to save to local disk"
 msgstr ""
diff --git a/applications/locale/sv/fusiondirectory.po b/applications/locale/sv/fusiondirectory.po
index 6baf994ddc6f597943d5ada8aaf396058d4bd483..316f948bea8a75884cbab350324d774d9e12c79a 100644
--- a/applications/locale/sv/fusiondirectory.po
+++ b/applications/locale/sv/fusiondirectory.po
@@ -5,219 +5,497 @@
 # Translators:
 msgid ""
 msgstr ""
-"Project-Id-Version: FusionDirectory-108\n"
+"Project-Id-Version: FusionDirectory-109\n"
 "Report-Msgid-Bugs-To: documentation@lists.fusiondirectory.org\n"
-"POT-Creation-Date: 2015-03-19 21:45+0100\n"
-"PO-Revision-Date: 2015-02-25 16:12+0000\n"
-"Last-Translator: fusiondirectory <contact@fusiondirectory.org>\n"
-"Language-Team: Swedish (http://www.transifex.com/projects/p/FusionDirectory-108/language/sv/)\n"
+"POT-Creation-Date: 2014-08-28 12:26+0200\n"
+"PO-Revision-Date: 2014-08-28 10:28+0000\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: Swedish (http://www.transifex.com/projects/p/FusionDirectory-109/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/groups/apps/class_groupApplication.inc:410
+#: admin/groups/apps/class_groupApplication.inc:414
+msgid "Menu"
+msgstr "Meny"
+
+#: admin/groups/apps/class_groupApplication.inc:482
+msgid "Back"
+msgstr "Tillbaka"
+
+#: admin/groups/apps/class_groupApplication.inc:493
+msgid "back"
+msgstr ""
+
+#: admin/groups/apps/class_groupApplication.inc:501
+msgid "department"
+msgstr ""
+
+#: admin/groups/apps/class_groupApplication.inc:524
+msgid "application"
+msgstr ""
+
+#: admin/groups/apps/class_groupApplication.inc:701
+#: admin/groups/apps/class_groupApplication.inc:1396
+#: admin/groups/apps/class_groupApplication.inc:1409
+#: admin/groups/apps/class_groupApplication.inc:1422
+#: admin/mimetypes/class_mimetypeGeneric.inc:481
+#: admin/mimetypes/class_mimetypeGeneric.inc:493
+#: admin/mimetypes/class_mimetypeGeneric.inc:508
+#: admin/applications/class_applicationParameters.inc:177
+#: admin/applications/class_applicationParameters.inc:242
+#: admin/applications/class_applicationGeneric.inc:290
+msgid "LDAP error"
+msgstr "LDAP-fel"
+
+#: admin/groups/apps/class_groupApplication.inc:1208
+msgid "Not available in release."
+msgstr ""
+
+#: admin/groups/apps/class_groupApplication.inc:1459
 #: 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
+#: admin/mimetypes/generic.tpl.c:62 admin/mimetypes/generic.tpl.c:86
 msgid "Applications"
 msgstr "Applikationer"
 
-#: admin/applications/class_applicationManagement.inc:29
-msgid "Application management"
+#: admin/groups/apps/class_groupApplication.inc:1460
+msgid "Group applications"
 msgstr ""
 
-#: admin/applications/class_applicationManagement.inc:100
-msgid "Web applications"
-msgstr ""
-
-#: admin/applications/class_applicationGeneric.inc:31
-#: admin/applications/class_applicationGeneric.inc:34
-#: admin/applications/class_applicationGeneric.inc:48
-#: admin/applications/class_webApplication.inc:47
+#: admin/groups/apps/class_groupApplication.inc:1466
+#: admin/mimetypes/class_mimetypeGeneric.inc:689
+#: admin/applications/class_applicationGeneric.inc:73
 msgid "Application"
 msgstr "Applikation"
 
-#: admin/applications/class_applicationGeneric.inc:32
-msgid "Application information"
+#: admin/groups/apps/class_groupApplication.inc:1467
+#: admin/groups/apps/app_list.tpl.c:2 admin/groups/apps/app_list.tpl.c:14
+msgid "Release"
+msgstr "Release"
+
+#: admin/groups/apps/class_groupApplication.inc:1468
+msgid "Application parameter"
 msgstr ""
 
-#: admin/applications/class_applicationGeneric.inc:52
-msgid "Application name"
+#: admin/groups/apps/class_groupApplication.inc:1469
+#: admin/applications/class_applicationGeneric.inc:135
+#: admin/groups/apps/edit_entry.tpl.c:32
+msgid "Place icon on members desktop"
 msgstr ""
 
-#: admin/applications/class_applicationGeneric.inc:52
-msgid "The name of this application"
+#: admin/groups/apps/class_groupApplication.inc:1470
+#: admin/applications/class_applicationGeneric.inc:145
+#: admin/groups/apps/edit_entry.tpl.c:38
+msgid "Place entry in members launch bar"
 msgstr ""
 
-#: admin/applications/class_applicationGeneric.inc:56
-#: admin/applications/class_webApplication.inc:55
+#: admin/groups/apps/class_groupApplication.inc:1471
+#: admin/applications/class_applicationGeneric.inc:140
+#: admin/groups/apps/edit_entry.tpl.c:35
+msgid "Place entry in members startmenu"
+msgstr ""
+
+#: admin/mimetypes/class_mimetypeManagement.inc:28
+#: admin/mimetypes/class_mimetypeGeneric.inc:674
+msgid "Mime types"
+msgstr ""
+
+#: admin/mimetypes/class_mimetypeManagement.inc:29
+msgid "Mime type management"
+msgstr ""
+
+#: admin/mimetypes/class_mimetypeGeneric.inc:519
+#: admin/mimetypes/class_mimetypeGeneric.inc:685
+#: admin/applications/class_applicationParameters.inc:208
+#: admin/applications/class_applicationParameters.inc:212
+#: admin/groups/apps/edit_entry.tpl.c:26
+msgid "Name"
+msgstr "Namn"
+
+#: admin/mimetypes/class_mimetypeGeneric.inc:522
+msgid "File pattern"
+msgstr ""
+
+#: admin/mimetypes/class_mimetypeGeneric.inc:671
+#: admin/applications/class_applicationGeneric.inc:69
+#: admin/mimetypes/generic.tpl.c:2
+msgid "Generic"
+msgstr "Generisk"
+
+#: admin/mimetypes/class_mimetypeGeneric.inc:672
+msgid "Mime type generic"
+msgstr ""
+
+#: admin/mimetypes/class_mimetypeGeneric.inc:678
+#: admin/mimetypes/generic.tpl.c:5
+msgid "Mime type"
+msgstr ""
+
+#: admin/mimetypes/class_mimetypeGeneric.inc:686
+#: admin/mimetypes/generic.tpl.c:11
+msgid "Mime group"
+msgstr ""
+
+#: admin/mimetypes/class_mimetypeGeneric.inc:687
+#: admin/applications/class_applicationGeneric.inc:105
+#: admin/mimetypes/generic.tpl.c:17
 msgid "Description"
 msgstr "Beskrivning"
 
-#: admin/applications/class_applicationGeneric.inc:56
-#: admin/applications/class_webApplication.inc:55
-msgid "A short description of this application"
+#: admin/mimetypes/class_mimetypeGeneric.inc:688
+#: admin/mimetypes/generic.tpl.c:23
+msgid "Base"
+msgstr "Bas"
+
+#: admin/mimetypes/class_mimetypeGeneric.inc:690
+msgid "Left click action"
 msgstr ""
 
-#: admin/applications/class_applicationGeneric.inc:60
-msgid "Execute"
-msgstr "Exekvera"
+#: admin/mimetypes/class_mimetypeGeneric.inc:691
+#: admin/applications/class_applicationGeneric.inc:112
+#: admin/mimetypes/generic.tpl.c:32
+msgid "Icon"
+msgstr ""
 
-#: admin/applications/class_applicationGeneric.inc:60
-msgid "The application to be executed"
+#: admin/mimetypes/class_mimetypeGeneric.inc:692
+#: admin/mimetypes/generic.tpl.c:53
+msgid "File patterns"
+msgstr ""
+
+#: admin/mimetypes/class_mimetypeGeneric.inc:693
+msgid "Embedded applications"
+msgstr ""
+
+#: admin/applications/class_applicationManagement.inc:29
+msgid "Application management"
+msgstr ""
+
+#: admin/applications/class_applicationParameters.inc:71
+msgid "Remove options"
+msgstr ""
+
+#: admin/applications/class_applicationParameters.inc:71
+#: admin/applications/class_applicationParameters.inc:73
+msgid "parameter"
+msgstr ""
+
+#: admin/applications/class_applicationParameters.inc:73
+msgid "Create options"
+msgstr ""
+
+#: admin/applications/class_applicationParameters.inc:115
+msgid "Variable"
+msgstr "Variabel"
+
+#: admin/applications/class_applicationParameters.inc:115
+msgid "Default value"
+msgstr ""
+
+#: admin/applications/class_applicationParameters.inc:141
+#: admin/groups/apps/app_list.tpl.c:29 admin/groups/apps/app_list.tpl.c:41
+#: admin/groups/apps/app_list.tpl.c:53
+msgid "Remove"
+msgstr "Ta bort"
+
+#: admin/applications/class_applicationParameters.inc:147
+msgid "Add option"
+msgstr ""
+
+#: admin/applications/class_applicationParameters.inc:265
+msgid "Parameter"
+msgstr ""
+
+#: admin/applications/class_applicationParameters.inc:266
+msgid "Parameter configuration"
+msgstr ""
+
+#: admin/applications/class_applicationParameters.inc:271
+msgid "Application parameter settings"
+msgstr ""
+
+#: admin/applications/class_applicationGeneric.inc:70
+msgid "Application generic"
+msgstr ""
+
+#: admin/applications/class_applicationGeneric.inc:90
+msgid "Properties"
+msgstr "Egenskaper"
+
+#: admin/applications/class_applicationGeneric.inc:93
+msgid "Application name"
+msgstr ""
+
+#: admin/applications/class_applicationGeneric.inc:93
+msgid "The name of this application"
 msgstr ""
 
-#: admin/applications/class_applicationGeneric.inc:64
+#: admin/applications/class_applicationGeneric.inc:97
 msgid "Display name"
 msgstr ""
 
-#: admin/applications/class_applicationGeneric.inc:64
+#: admin/applications/class_applicationGeneric.inc:97
 msgid "The displayed name for this application"
 msgstr ""
 
-#: admin/applications/class_applicationGeneric.inc:70
-#: admin/applications/class_webApplication.inc:69
-msgid "Icon"
+#: admin/applications/class_applicationGeneric.inc:101
+msgid "Execute"
+msgstr "Exekvera"
+
+#: admin/applications/class_applicationGeneric.inc:101
+msgid "The application to be executed"
 msgstr ""
 
-#: admin/applications/class_applicationGeneric.inc:73
-#: admin/applications/class_webApplication.inc:72
+#: admin/applications/class_applicationGeneric.inc:105
+msgid "A short description of this application"
+msgstr ""
+
+#: admin/applications/class_applicationGeneric.inc:115
 msgid "The icon for this application"
 msgstr ""
 
-#: admin/applications/class_applicationGeneric.inc:80
+#: admin/applications/class_applicationGeneric.inc:122
 msgid "Options"
 msgstr "Alternativ"
 
-#: admin/applications/class_applicationGeneric.inc:83
+#: admin/applications/class_applicationGeneric.inc:125
 msgid "Only executable for member"
 msgstr ""
 
-#: admin/applications/class_applicationGeneric.inc:83
+#: admin/applications/class_applicationGeneric.inc:125
 msgid "Only executable by the memebers of the group"
 msgstr ""
 
-#: admin/applications/class_applicationGeneric.inc:88
+#: admin/applications/class_applicationGeneric.inc:130
 msgid "Replace user configuration on startup"
 msgstr ""
 
-#: admin/applications/class_applicationGeneric.inc:88
+#: admin/applications/class_applicationGeneric.inc:130
 msgid "Replace the user configuration on startup"
 msgstr ""
 
-#: admin/applications/class_applicationGeneric.inc:93
-msgid "Place icon on members desktop"
+#: admin/applications/class_applicationGeneric.inc:135
+msgid "Put an icon on the user desktop"
 msgstr ""
 
-#: admin/applications/class_applicationGeneric.inc:93
-msgid "Put an icon on the user desktop"
+#: admin/applications/class_applicationGeneric.inc:140
+#: admin/applications/class_applicationGeneric.inc:145
+msgid "Put an entry in the startup menu"
 msgstr ""
 
-#: admin/applications/class_applicationGeneric.inc:98
-msgid "Place entry in members startmenu"
+#: admin/applications/class_applicationGeneric.inc:156
+msgid "Script"
+msgstr "Script"
+
+#: admin/applications/class_applicationGeneric.inc:159
+msgid "Script to run at logon"
 msgstr ""
 
-#: admin/applications/class_applicationGeneric.inc:98
-#: admin/applications/class_applicationGeneric.inc:103
-msgid "Put an entry in the startup menu"
+#: admin/applications/class_applicationGeneric.inc:165
+msgid "Log off script"
 msgstr ""
 
-#: admin/applications/class_applicationGeneric.inc:103
-msgid "Place entry in members launch bar"
+#: admin/applications/class_applicationGeneric.inc:168
+msgid "Script to run at logoff"
 msgstr ""
 
-#: admin/applications/class_webApplication.inc:30
-#: admin/applications/class_webApplication.inc:33
-msgid "Web application"
+#: admin/applications/class_applicationGeneric.inc:227
+msgid "no example"
 msgstr ""
 
-#: admin/applications/class_webApplication.inc:31
-msgid "Web applicationts names, icons and links"
+#: admin/applications/class_applicationGeneric.inc:276
+msgid "Error"
+msgstr "Fel"
+
+#: admin/applications/class_applicationGeneric.inc:276
+#, php-format
+msgid "Cannot remove application - it is still in use by these objects: %s"
 msgstr ""
 
-#: admin/applications/class_webApplication.inc:51
-msgid "Name"
-msgstr "Namn"
+#: config/desktop-management/class_desktopPluginConfig.inc:28
+msgid "Desktop management"
+msgstr ""
 
-#: admin/applications/class_webApplication.inc:51
-msgid "Name or id for application"
+#: config/desktop-management/class_desktopPluginConfig.inc:29
+msgid "Desktop management plugin configuration"
 msgstr ""
 
-#: admin/applications/class_webApplication.inc:59
-msgid "URL"
-msgstr "URL"
+#: config/desktop-management/class_desktopPluginConfig.inc:40
+msgid "LDAP tree"
+msgstr "LDAP-trÃ¤d"
 
-#: admin/applications/class_webApplication.inc:59
-msgid "Link to this application"
+#: config/desktop-management/class_desktopPluginConfig.inc:43
+msgid "Mimetype RDN"
+msgstr ""
+
+#: config/desktop-management/class_desktopPluginConfig.inc:43
+msgid "Branch in which mime types will be stored"
+msgstr ""
+
+#: config/desktop-management/class_desktopPluginConfig.inc:48
+msgid "Application RDN"
 msgstr ""
 
-#: admin/applications/class_webApplication.inc:63
-msgid "Display Name"
+#: config/desktop-management/class_desktopPluginConfig.inc:48
+msgid "Branch in which applications will be stored"
 msgstr ""
 
-#: admin/applications/class_webApplication.inc:63
-msgid "Displayed name for links to this application"
+#: admin/groups/apps/edit_entry.tpl.c:2
+msgid "Folder image"
 msgstr ""
 
-#: admin/applications/class_webApplication.inc:77
-msgid "Icon location"
+#: admin/groups/apps/edit_entry.tpl.c:5
+msgid "Could not load image."
 msgstr ""
 
-#: admin/applications/class_webApplication.inc:77
-msgid "Usual path to this application icon"
+#: admin/groups/apps/edit_entry.tpl.c:8
+msgid "None"
+msgstr "Ingen"
+
+#: admin/groups/apps/edit_entry.tpl.c:11
+msgid "Upload image"
 msgstr ""
 
-#: admin/roles/class_applicationRights.inc:31
-msgid "Applications allowed for this role"
+#: admin/groups/apps/edit_entry.tpl.c:14
+msgid "Upload"
+msgstr "Ladda upp"
+
+#: admin/groups/apps/edit_entry.tpl.c:17
+msgid "Reset image"
 msgstr ""
 
-#: admin/roles/class_applicationRights.inc:45
-msgid "Application list"
+#: admin/groups/apps/edit_entry.tpl.c:20
+msgid "Reset"
 msgstr ""
 
-#: admin/roles/class_applicationRights.inc:49
-msgid "The applications users with this role are allowed to launch"
+#: admin/groups/apps/edit_entry.tpl.c:23
+msgid "Application settings"
 msgstr ""
 
-#: config/applications/class_applicationsPluginConfig.inc:29
-msgid "Applications plugin configuration"
+#: admin/groups/apps/edit_entry.tpl.c:29
+msgid "Application options"
 msgstr ""
 
-#: config/applications/class_applicationsPluginConfig.inc:43
-msgid "Application RDN"
+#: admin/groups/apps/app_list.tpl.c:5
+msgid "Copy menu"
 msgstr ""
 
-#: config/applications/class_applicationsPluginConfig.inc:43
-msgid "Branch in which applications will be stored"
+#: admin/groups/apps/app_list.tpl.c:8
+msgid "Paste menu from"
 msgstr ""
 
-#: config/applications/class_applicationsPluginConfig.inc:48
-msgid "Web applications RDN"
+#: admin/groups/apps/app_list.tpl.c:11
+msgid "Delete menu"
 msgstr ""
 
-#: config/applications/class_applicationsPluginConfig.inc:48
-msgid "Branch in which web applications will be stored"
+#: admin/groups/apps/app_list.tpl.c:17 admin/groups/apps/app_list.tpl.c:20
+msgid "Folder"
 msgstr ""
 
-#: config/applications/class_applicationsPluginConfig.inc:53
-msgid "Show web applications in menu"
+#: admin/groups/apps/app_list.tpl.c:23 admin/groups/apps/app_list.tpl.c:35
+#: admin/groups/apps/app_list.tpl.c:47
+msgid "Move up"
 msgstr ""
 
-#: config/applications/class_applicationsPluginConfig.inc:53
-msgid "Whether to show web applications in FD main menu"
+#: admin/groups/apps/app_list.tpl.c:26 admin/groups/apps/app_list.tpl.c:38
+#: admin/groups/apps/app_list.tpl.c:50
+msgid "Move down"
 msgstr ""
 
-#: config/applications/class_applicationsPluginConfig.inc:56
-msgid "None"
-msgstr "Ingen"
+#: admin/groups/apps/app_list.tpl.c:32 admin/groups/apps/app_list.tpl.c:56
+msgid "Edit"
+msgstr "Redigera"
+
+#: admin/groups/apps/app_list.tpl.c:44
+msgid "Entry"
+msgstr ""
+
+#: admin/groups/apps/app_list.tpl.c:59
+msgid "add to"
+msgstr ""
+
+#: admin/groups/apps/app_list.tpl.c:62
+msgid "Add selected category to this folder.."
+msgstr ""
+
+#: admin/groups/apps/app_list.tpl.c:65
+msgid "Separator"
+msgstr ""
+
+#: admin/groups/apps/app_list.tpl.c:68
+msgid "Add a separator to this folder."
+msgstr ""
+
+#: admin/groups/apps/app_list.tpl.c:71
+msgid "Add selected applications to this folder."
+msgstr ""
+
+#: admin/mimetypes/generic.tpl.c:8
+msgid "Please enter a name for the mime type here"
+msgstr ""
+
+#: admin/mimetypes/generic.tpl.c:14
+msgid "Categorize this mime type"
+msgstr ""
+
+#: admin/mimetypes/generic.tpl.c:20
+msgid "Please specify a description"
+msgstr ""
+
+#: admin/mimetypes/generic.tpl.c:26
+msgid "Choose subtree to place application in"
+msgstr ""
+
+#: admin/mimetypes/generic.tpl.c:29
+msgid "Select a base"
+msgstr ""
+
+#: admin/mimetypes/generic.tpl.c:35 admin/mimetypes/generic.tpl.c:38
+msgid "Mime icon"
+msgstr ""
+
+#: admin/mimetypes/generic.tpl.c:41
+msgid "Update"
+msgstr "Uppdatera"
+
+#: admin/mimetypes/generic.tpl.c:44
+msgid "Update mime type icon"
+msgstr ""
+
+#: admin/mimetypes/generic.tpl.c:47 admin/mimetypes/generic.tpl.c:50
+msgid "Left click"
+msgstr ""
+
+#: admin/mimetypes/generic.tpl.c:56
+msgid "Please specify a new file pattern"
+msgstr ""
+
+#: admin/mimetypes/generic.tpl.c:59
+msgid "Add a new file pattern"
+msgstr ""
+
+#: admin/mimetypes/generic.tpl.c:65 admin/mimetypes/generic.tpl.c:89
+msgid "Enter an application name here"
+msgstr ""
+
+#: admin/mimetypes/generic.tpl.c:68 admin/mimetypes/generic.tpl.c:92
+msgid "Add application"
+msgstr ""
+
+#: admin/mimetypes/generic.tpl.c:71 admin/mimetypes/generic.tpl.c:74
+msgid "Embedding"
+msgstr ""
+
+#: admin/mimetypes/generic.tpl.c:77
+msgid "Show file in embedded viewer"
+msgstr ""
 
-#: config/applications/class_applicationsPluginConfig.inc:56
-msgid "Only allowed"
+#: admin/mimetypes/generic.tpl.c:80
+msgid "Show file in external viewer"
 msgstr ""
 
-#: config/applications/class_applicationsPluginConfig.inc:56
-msgid "All"
+#: admin/mimetypes/generic.tpl.c:83
+msgid "Ask whether to save to local disk"
 msgstr ""
diff --git a/applications/locale/ug/fusiondirectory.po b/applications/locale/ug/fusiondirectory.po
index 0654b70f1fc13ebd06bfbcb64561fb997592815c..9023d51369c8c83a18df656e99e431afbd04aa0c 100644
--- a/applications/locale/ug/fusiondirectory.po
+++ b/applications/locale/ug/fusiondirectory.po
@@ -5,219 +5,497 @@
 # Translators:
 msgid ""
 msgstr ""
-"Project-Id-Version: FusionDirectory-108\n"
+"Project-Id-Version: FusionDirectory-109\n"
 "Report-Msgid-Bugs-To: documentation@lists.fusiondirectory.org\n"
-"POT-Creation-Date: 2015-03-19 21:45+0100\n"
-"PO-Revision-Date: 2014-12-12 07:34+0000\n"
-"Last-Translator: fusiondirectory <contact@fusiondirectory.org>\n"
-"Language-Team: Uighur (http://www.transifex.com/projects/p/FusionDirectory-108/language/ug/)\n"
+"POT-Creation-Date: 2014-08-28 12:26+0200\n"
+"PO-Revision-Date: 2014-08-28 10:28+0000\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: Uighur (http://www.transifex.com/projects/p/FusionDirectory-109/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/groups/apps/class_groupApplication.inc:410
+#: admin/groups/apps/class_groupApplication.inc:414
+msgid "Menu"
+msgstr ""
+
+#: admin/groups/apps/class_groupApplication.inc:482
+msgid "Back"
+msgstr ""
+
+#: admin/groups/apps/class_groupApplication.inc:493
+msgid "back"
+msgstr ""
+
+#: admin/groups/apps/class_groupApplication.inc:501
+msgid "department"
+msgstr ""
+
+#: admin/groups/apps/class_groupApplication.inc:524
+msgid "application"
+msgstr ""
+
+#: admin/groups/apps/class_groupApplication.inc:701
+#: admin/groups/apps/class_groupApplication.inc:1396
+#: admin/groups/apps/class_groupApplication.inc:1409
+#: admin/groups/apps/class_groupApplication.inc:1422
+#: admin/mimetypes/class_mimetypeGeneric.inc:481
+#: admin/mimetypes/class_mimetypeGeneric.inc:493
+#: admin/mimetypes/class_mimetypeGeneric.inc:508
+#: admin/applications/class_applicationParameters.inc:177
+#: admin/applications/class_applicationParameters.inc:242
+#: admin/applications/class_applicationGeneric.inc:290
+msgid "LDAP error"
+msgstr ""
+
+#: admin/groups/apps/class_groupApplication.inc:1208
+msgid "Not available in release."
+msgstr ""
+
+#: admin/groups/apps/class_groupApplication.inc:1459
 #: 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
+#: admin/mimetypes/generic.tpl.c:62 admin/mimetypes/generic.tpl.c:86
 msgid "Applications"
 msgstr ""
 
+#: admin/groups/apps/class_groupApplication.inc:1460
+msgid "Group applications"
+msgstr ""
+
+#: admin/groups/apps/class_groupApplication.inc:1466
+#: admin/mimetypes/class_mimetypeGeneric.inc:689
+#: admin/applications/class_applicationGeneric.inc:73
+msgid "Application"
+msgstr ""
+
+#: admin/groups/apps/class_groupApplication.inc:1467
+#: admin/groups/apps/app_list.tpl.c:2 admin/groups/apps/app_list.tpl.c:14
+msgid "Release"
+msgstr ""
+
+#: admin/groups/apps/class_groupApplication.inc:1468
+msgid "Application parameter"
+msgstr ""
+
+#: admin/groups/apps/class_groupApplication.inc:1469
+#: admin/applications/class_applicationGeneric.inc:135
+#: admin/groups/apps/edit_entry.tpl.c:32
+msgid "Place icon on members desktop"
+msgstr ""
+
+#: admin/groups/apps/class_groupApplication.inc:1470
+#: admin/applications/class_applicationGeneric.inc:145
+#: admin/groups/apps/edit_entry.tpl.c:38
+msgid "Place entry in members launch bar"
+msgstr ""
+
+#: admin/groups/apps/class_groupApplication.inc:1471
+#: admin/applications/class_applicationGeneric.inc:140
+#: admin/groups/apps/edit_entry.tpl.c:35
+msgid "Place entry in members startmenu"
+msgstr ""
+
+#: admin/mimetypes/class_mimetypeManagement.inc:28
+#: admin/mimetypes/class_mimetypeGeneric.inc:674
+msgid "Mime types"
+msgstr ""
+
+#: admin/mimetypes/class_mimetypeManagement.inc:29
+msgid "Mime type management"
+msgstr ""
+
+#: admin/mimetypes/class_mimetypeGeneric.inc:519
+#: admin/mimetypes/class_mimetypeGeneric.inc:685
+#: admin/applications/class_applicationParameters.inc:208
+#: admin/applications/class_applicationParameters.inc:212
+#: admin/groups/apps/edit_entry.tpl.c:26
+msgid "Name"
+msgstr ""
+
+#: admin/mimetypes/class_mimetypeGeneric.inc:522
+msgid "File pattern"
+msgstr ""
+
+#: admin/mimetypes/class_mimetypeGeneric.inc:671
+#: admin/applications/class_applicationGeneric.inc:69
+#: admin/mimetypes/generic.tpl.c:2
+msgid "Generic"
+msgstr ""
+
+#: admin/mimetypes/class_mimetypeGeneric.inc:672
+msgid "Mime type generic"
+msgstr ""
+
+#: admin/mimetypes/class_mimetypeGeneric.inc:678
+#: admin/mimetypes/generic.tpl.c:5
+msgid "Mime type"
+msgstr ""
+
+#: admin/mimetypes/class_mimetypeGeneric.inc:686
+#: admin/mimetypes/generic.tpl.c:11
+msgid "Mime group"
+msgstr ""
+
+#: admin/mimetypes/class_mimetypeGeneric.inc:687
+#: admin/applications/class_applicationGeneric.inc:105
+#: admin/mimetypes/generic.tpl.c:17
+msgid "Description"
+msgstr ""
+
+#: admin/mimetypes/class_mimetypeGeneric.inc:688
+#: admin/mimetypes/generic.tpl.c:23
+msgid "Base"
+msgstr ""
+
+#: admin/mimetypes/class_mimetypeGeneric.inc:690
+msgid "Left click action"
+msgstr ""
+
+#: admin/mimetypes/class_mimetypeGeneric.inc:691
+#: admin/applications/class_applicationGeneric.inc:112
+#: admin/mimetypes/generic.tpl.c:32
+msgid "Icon"
+msgstr ""
+
+#: admin/mimetypes/class_mimetypeGeneric.inc:692
+#: admin/mimetypes/generic.tpl.c:53
+msgid "File patterns"
+msgstr ""
+
+#: admin/mimetypes/class_mimetypeGeneric.inc:693
+msgid "Embedded applications"
+msgstr ""
+
 #: admin/applications/class_applicationManagement.inc:29
 msgid "Application management"
 msgstr ""
 
-#: admin/applications/class_applicationManagement.inc:100
-msgid "Web applications"
+#: admin/applications/class_applicationParameters.inc:71
+msgid "Remove options"
 msgstr ""
 
-#: admin/applications/class_applicationGeneric.inc:31
-#: admin/applications/class_applicationGeneric.inc:34
-#: admin/applications/class_applicationGeneric.inc:48
-#: admin/applications/class_webApplication.inc:47
-msgid "Application"
+#: admin/applications/class_applicationParameters.inc:71
+#: admin/applications/class_applicationParameters.inc:73
+msgid "parameter"
 msgstr ""
 
-#: admin/applications/class_applicationGeneric.inc:32
-msgid "Application information"
+#: admin/applications/class_applicationParameters.inc:73
+msgid "Create options"
 msgstr ""
 
-#: admin/applications/class_applicationGeneric.inc:52
-msgid "Application name"
+#: admin/applications/class_applicationParameters.inc:115
+msgid "Variable"
 msgstr ""
 
-#: admin/applications/class_applicationGeneric.inc:52
-msgid "The name of this application"
+#: admin/applications/class_applicationParameters.inc:115
+msgid "Default value"
 msgstr ""
 
-#: admin/applications/class_applicationGeneric.inc:56
-#: admin/applications/class_webApplication.inc:55
-msgid "Description"
+#: admin/applications/class_applicationParameters.inc:141
+#: admin/groups/apps/app_list.tpl.c:29 admin/groups/apps/app_list.tpl.c:41
+#: admin/groups/apps/app_list.tpl.c:53
+msgid "Remove"
 msgstr ""
 
-#: admin/applications/class_applicationGeneric.inc:56
-#: admin/applications/class_webApplication.inc:55
-msgid "A short description of this application"
+#: admin/applications/class_applicationParameters.inc:147
+msgid "Add option"
 msgstr ""
 
-#: admin/applications/class_applicationGeneric.inc:60
-msgid "Execute"
+#: admin/applications/class_applicationParameters.inc:265
+msgid "Parameter"
 msgstr ""
 
-#: admin/applications/class_applicationGeneric.inc:60
-msgid "The application to be executed"
+#: admin/applications/class_applicationParameters.inc:266
+msgid "Parameter configuration"
+msgstr ""
+
+#: admin/applications/class_applicationParameters.inc:271
+msgid "Application parameter settings"
+msgstr ""
+
+#: admin/applications/class_applicationGeneric.inc:70
+msgid "Application generic"
+msgstr ""
+
+#: admin/applications/class_applicationGeneric.inc:90
+msgid "Properties"
+msgstr ""
+
+#: admin/applications/class_applicationGeneric.inc:93
+msgid "Application name"
+msgstr ""
+
+#: admin/applications/class_applicationGeneric.inc:93
+msgid "The name of this application"
 msgstr ""
 
-#: admin/applications/class_applicationGeneric.inc:64
+#: admin/applications/class_applicationGeneric.inc:97
 msgid "Display name"
 msgstr ""
 
-#: admin/applications/class_applicationGeneric.inc:64
+#: admin/applications/class_applicationGeneric.inc:97
 msgid "The displayed name for this application"
 msgstr ""
 
-#: admin/applications/class_applicationGeneric.inc:70
-#: admin/applications/class_webApplication.inc:69
-msgid "Icon"
+#: admin/applications/class_applicationGeneric.inc:101
+msgid "Execute"
 msgstr ""
 
-#: admin/applications/class_applicationGeneric.inc:73
-#: admin/applications/class_webApplication.inc:72
+#: admin/applications/class_applicationGeneric.inc:101
+msgid "The application to be executed"
+msgstr ""
+
+#: admin/applications/class_applicationGeneric.inc:105
+msgid "A short description of this application"
+msgstr ""
+
+#: admin/applications/class_applicationGeneric.inc:115
 msgid "The icon for this application"
 msgstr ""
 
-#: admin/applications/class_applicationGeneric.inc:80
+#: admin/applications/class_applicationGeneric.inc:122
 msgid "Options"
 msgstr ""
 
-#: admin/applications/class_applicationGeneric.inc:83
+#: admin/applications/class_applicationGeneric.inc:125
 msgid "Only executable for member"
 msgstr ""
 
-#: admin/applications/class_applicationGeneric.inc:83
+#: admin/applications/class_applicationGeneric.inc:125
 msgid "Only executable by the memebers of the group"
 msgstr ""
 
-#: admin/applications/class_applicationGeneric.inc:88
+#: admin/applications/class_applicationGeneric.inc:130
 msgid "Replace user configuration on startup"
 msgstr ""
 
-#: admin/applications/class_applicationGeneric.inc:88
+#: admin/applications/class_applicationGeneric.inc:130
 msgid "Replace the user configuration on startup"
 msgstr ""
 
-#: admin/applications/class_applicationGeneric.inc:93
-msgid "Place icon on members desktop"
+#: admin/applications/class_applicationGeneric.inc:135
+msgid "Put an icon on the user desktop"
 msgstr ""
 
-#: admin/applications/class_applicationGeneric.inc:93
-msgid "Put an icon on the user desktop"
+#: admin/applications/class_applicationGeneric.inc:140
+#: admin/applications/class_applicationGeneric.inc:145
+msgid "Put an entry in the startup menu"
 msgstr ""
 
-#: admin/applications/class_applicationGeneric.inc:98
-msgid "Place entry in members startmenu"
+#: admin/applications/class_applicationGeneric.inc:156
+msgid "Script"
 msgstr ""
 
-#: admin/applications/class_applicationGeneric.inc:98
-#: admin/applications/class_applicationGeneric.inc:103
-msgid "Put an entry in the startup menu"
+#: admin/applications/class_applicationGeneric.inc:159
+msgid "Script to run at logon"
 msgstr ""
 
-#: admin/applications/class_applicationGeneric.inc:103
-msgid "Place entry in members launch bar"
+#: admin/applications/class_applicationGeneric.inc:165
+msgid "Log off script"
 msgstr ""
 
-#: admin/applications/class_webApplication.inc:30
-#: admin/applications/class_webApplication.inc:33
-msgid "Web application"
+#: admin/applications/class_applicationGeneric.inc:168
+msgid "Script to run at logoff"
 msgstr ""
 
-#: admin/applications/class_webApplication.inc:31
-msgid "Web applicationts names, icons and links"
+#: admin/applications/class_applicationGeneric.inc:227
+msgid "no example"
 msgstr ""
 
-#: admin/applications/class_webApplication.inc:51
-msgid "Name"
+#: admin/applications/class_applicationGeneric.inc:276
+msgid "Error"
 msgstr ""
 
-#: admin/applications/class_webApplication.inc:51
-msgid "Name or id for application"
+#: admin/applications/class_applicationGeneric.inc:276
+#, php-format
+msgid "Cannot remove application - it is still in use by these objects: %s"
 msgstr ""
 
-#: admin/applications/class_webApplication.inc:59
-msgid "URL"
+#: config/desktop-management/class_desktopPluginConfig.inc:28
+msgid "Desktop management"
 msgstr ""
 
-#: admin/applications/class_webApplication.inc:59
-msgid "Link to this application"
+#: config/desktop-management/class_desktopPluginConfig.inc:29
+msgid "Desktop management plugin configuration"
 msgstr ""
 
-#: admin/applications/class_webApplication.inc:63
-msgid "Display Name"
+#: config/desktop-management/class_desktopPluginConfig.inc:40
+msgid "LDAP tree"
 msgstr ""
 
-#: admin/applications/class_webApplication.inc:63
-msgid "Displayed name for links to this application"
+#: config/desktop-management/class_desktopPluginConfig.inc:43
+msgid "Mimetype RDN"
 msgstr ""
 
-#: admin/applications/class_webApplication.inc:77
-msgid "Icon location"
+#: config/desktop-management/class_desktopPluginConfig.inc:43
+msgid "Branch in which mime types will be stored"
 msgstr ""
 
-#: admin/applications/class_webApplication.inc:77
-msgid "Usual path to this application icon"
+#: config/desktop-management/class_desktopPluginConfig.inc:48
+msgid "Application RDN"
 msgstr ""
 
-#: admin/roles/class_applicationRights.inc:31
-msgid "Applications allowed for this role"
+#: config/desktop-management/class_desktopPluginConfig.inc:48
+msgid "Branch in which applications will be stored"
 msgstr ""
 
-#: admin/roles/class_applicationRights.inc:45
-msgid "Application list"
+#: admin/groups/apps/edit_entry.tpl.c:2
+msgid "Folder image"
 msgstr ""
 
-#: admin/roles/class_applicationRights.inc:49
-msgid "The applications users with this role are allowed to launch"
+#: admin/groups/apps/edit_entry.tpl.c:5
+msgid "Could not load image."
 msgstr ""
 
-#: config/applications/class_applicationsPluginConfig.inc:29
-msgid "Applications plugin configuration"
+#: admin/groups/apps/edit_entry.tpl.c:8
+msgid "None"
 msgstr ""
 
-#: config/applications/class_applicationsPluginConfig.inc:43
-msgid "Application RDN"
+#: admin/groups/apps/edit_entry.tpl.c:11
+msgid "Upload image"
 msgstr ""
 
-#: config/applications/class_applicationsPluginConfig.inc:43
-msgid "Branch in which applications will be stored"
+#: admin/groups/apps/edit_entry.tpl.c:14
+msgid "Upload"
 msgstr ""
 
-#: config/applications/class_applicationsPluginConfig.inc:48
-msgid "Web applications RDN"
+#: admin/groups/apps/edit_entry.tpl.c:17
+msgid "Reset image"
 msgstr ""
 
-#: config/applications/class_applicationsPluginConfig.inc:48
-msgid "Branch in which web applications will be stored"
+#: admin/groups/apps/edit_entry.tpl.c:20
+msgid "Reset"
 msgstr ""
 
-#: config/applications/class_applicationsPluginConfig.inc:53
-msgid "Show web applications in menu"
+#: admin/groups/apps/edit_entry.tpl.c:23
+msgid "Application settings"
 msgstr ""
 
-#: config/applications/class_applicationsPluginConfig.inc:53
-msgid "Whether to show web applications in FD main menu"
+#: admin/groups/apps/edit_entry.tpl.c:29
+msgid "Application options"
 msgstr ""
 
-#: config/applications/class_applicationsPluginConfig.inc:56
-msgid "None"
+#: admin/groups/apps/app_list.tpl.c:5
+msgid "Copy menu"
+msgstr ""
+
+#: admin/groups/apps/app_list.tpl.c:8
+msgid "Paste menu from"
+msgstr ""
+
+#: admin/groups/apps/app_list.tpl.c:11
+msgid "Delete menu"
+msgstr ""
+
+#: admin/groups/apps/app_list.tpl.c:17 admin/groups/apps/app_list.tpl.c:20
+msgid "Folder"
+msgstr ""
+
+#: admin/groups/apps/app_list.tpl.c:23 admin/groups/apps/app_list.tpl.c:35
+#: admin/groups/apps/app_list.tpl.c:47
+msgid "Move up"
+msgstr ""
+
+#: admin/groups/apps/app_list.tpl.c:26 admin/groups/apps/app_list.tpl.c:38
+#: admin/groups/apps/app_list.tpl.c:50
+msgid "Move down"
+msgstr ""
+
+#: admin/groups/apps/app_list.tpl.c:32 admin/groups/apps/app_list.tpl.c:56
+msgid "Edit"
+msgstr ""
+
+#: admin/groups/apps/app_list.tpl.c:44
+msgid "Entry"
+msgstr ""
+
+#: admin/groups/apps/app_list.tpl.c:59
+msgid "add to"
+msgstr ""
+
+#: admin/groups/apps/app_list.tpl.c:62
+msgid "Add selected category to this folder.."
+msgstr ""
+
+#: admin/groups/apps/app_list.tpl.c:65
+msgid "Separator"
+msgstr ""
+
+#: admin/groups/apps/app_list.tpl.c:68
+msgid "Add a separator to this folder."
+msgstr ""
+
+#: admin/groups/apps/app_list.tpl.c:71
+msgid "Add selected applications to this folder."
+msgstr ""
+
+#: admin/mimetypes/generic.tpl.c:8
+msgid "Please enter a name for the mime type here"
+msgstr ""
+
+#: admin/mimetypes/generic.tpl.c:14
+msgid "Categorize this mime type"
+msgstr ""
+
+#: admin/mimetypes/generic.tpl.c:20
+msgid "Please specify a description"
+msgstr ""
+
+#: admin/mimetypes/generic.tpl.c:26
+msgid "Choose subtree to place application in"
+msgstr ""
+
+#: admin/mimetypes/generic.tpl.c:29
+msgid "Select a base"
+msgstr ""
+
+#: admin/mimetypes/generic.tpl.c:35 admin/mimetypes/generic.tpl.c:38
+msgid "Mime icon"
+msgstr ""
+
+#: admin/mimetypes/generic.tpl.c:41
+msgid "Update"
+msgstr ""
+
+#: admin/mimetypes/generic.tpl.c:44
+msgid "Update mime type icon"
+msgstr ""
+
+#: admin/mimetypes/generic.tpl.c:47 admin/mimetypes/generic.tpl.c:50
+msgid "Left click"
+msgstr ""
+
+#: admin/mimetypes/generic.tpl.c:56
+msgid "Please specify a new file pattern"
+msgstr ""
+
+#: admin/mimetypes/generic.tpl.c:59
+msgid "Add a new file pattern"
+msgstr ""
+
+#: admin/mimetypes/generic.tpl.c:65 admin/mimetypes/generic.tpl.c:89
+msgid "Enter an application name here"
+msgstr ""
+
+#: admin/mimetypes/generic.tpl.c:68 admin/mimetypes/generic.tpl.c:92
+msgid "Add application"
+msgstr ""
+
+#: admin/mimetypes/generic.tpl.c:71 admin/mimetypes/generic.tpl.c:74
+msgid "Embedding"
+msgstr ""
+
+#: admin/mimetypes/generic.tpl.c:77
+msgid "Show file in embedded viewer"
 msgstr ""
 
-#: config/applications/class_applicationsPluginConfig.inc:56
-msgid "Only allowed"
+#: admin/mimetypes/generic.tpl.c:80
+msgid "Show file in external viewer"
 msgstr ""
 
-#: config/applications/class_applicationsPluginConfig.inc:56
-msgid "All"
+#: admin/mimetypes/generic.tpl.c:83
+msgid "Ask whether to save to local disk"
 msgstr ""
diff --git a/applications/locale/vi_VN/fusiondirectory.po b/applications/locale/vi_VN/fusiondirectory.po
index 8ae30ad1041b033db2d66fcd2aa90bda7c82ffb7..635fe766fad104491c0588e54a0bb2b097536847 100644
--- a/applications/locale/vi_VN/fusiondirectory.po
+++ b/applications/locale/vi_VN/fusiondirectory.po
@@ -5,219 +5,497 @@
 # Translators:
 msgid ""
 msgstr ""
-"Project-Id-Version: FusionDirectory-108\n"
+"Project-Id-Version: FusionDirectory-109\n"
 "Report-Msgid-Bugs-To: documentation@lists.fusiondirectory.org\n"
-"POT-Creation-Date: 2015-03-19 21:45+0100\n"
-"PO-Revision-Date: 2015-02-25 16:03+0000\n"
-"Last-Translator: fusiondirectory <contact@fusiondirectory.org>\n"
-"Language-Team: Vietnamese (Viet Nam) (http://www.transifex.com/projects/p/FusionDirectory-108/language/vi_VN/)\n"
+"POT-Creation-Date: 2014-08-28 12:26+0200\n"
+"PO-Revision-Date: 2014-08-28 10:28+0000\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: Vietnamese (Viet Nam) (http://www.transifex.com/projects/p/FusionDirectory-109/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/groups/apps/class_groupApplication.inc:410
+#: admin/groups/apps/class_groupApplication.inc:414
+msgid "Menu"
+msgstr ""
+
+#: admin/groups/apps/class_groupApplication.inc:482
+msgid "Back"
+msgstr "Quay láº¡i"
+
+#: admin/groups/apps/class_groupApplication.inc:493
+msgid "back"
+msgstr ""
+
+#: admin/groups/apps/class_groupApplication.inc:501
+msgid "department"
+msgstr ""
+
+#: admin/groups/apps/class_groupApplication.inc:524
+msgid "application"
+msgstr ""
+
+#: admin/groups/apps/class_groupApplication.inc:701
+#: admin/groups/apps/class_groupApplication.inc:1396
+#: admin/groups/apps/class_groupApplication.inc:1409
+#: admin/groups/apps/class_groupApplication.inc:1422
+#: admin/mimetypes/class_mimetypeGeneric.inc:481
+#: admin/mimetypes/class_mimetypeGeneric.inc:493
+#: admin/mimetypes/class_mimetypeGeneric.inc:508
+#: admin/applications/class_applicationParameters.inc:177
+#: admin/applications/class_applicationParameters.inc:242
+#: admin/applications/class_applicationGeneric.inc:290
+msgid "LDAP error"
+msgstr "Lá»—i LDAP"
+
+#: admin/groups/apps/class_groupApplication.inc:1208
+msgid "Not available in release."
+msgstr ""
+
+#: admin/groups/apps/class_groupApplication.inc:1459
 #: 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
+#: admin/mimetypes/generic.tpl.c:62 admin/mimetypes/generic.tpl.c:86
 msgid "Applications"
 msgstr "CÃ¡c á»©ng dá»¥ng"
 
-#: admin/applications/class_applicationManagement.inc:29
-msgid "Application management"
-msgstr ""
-
-#: admin/applications/class_applicationManagement.inc:100
-msgid "Web applications"
+#: admin/groups/apps/class_groupApplication.inc:1460
+msgid "Group applications"
 msgstr ""
 
-#: admin/applications/class_applicationGeneric.inc:31
-#: admin/applications/class_applicationGeneric.inc:34
-#: admin/applications/class_applicationGeneric.inc:48
-#: admin/applications/class_webApplication.inc:47
+#: admin/groups/apps/class_groupApplication.inc:1466
+#: admin/mimetypes/class_mimetypeGeneric.inc:689
+#: admin/applications/class_applicationGeneric.inc:73
 msgid "Application"
 msgstr "á»¨ng dá»¥ng"
 
-#: admin/applications/class_applicationGeneric.inc:32
-msgid "Application information"
+#: admin/groups/apps/class_groupApplication.inc:1467
+#: admin/groups/apps/app_list.tpl.c:2 admin/groups/apps/app_list.tpl.c:14
+msgid "Release"
 msgstr ""
 
-#: admin/applications/class_applicationGeneric.inc:52
-msgid "Application name"
+#: admin/groups/apps/class_groupApplication.inc:1468
+msgid "Application parameter"
 msgstr ""
 
-#: admin/applications/class_applicationGeneric.inc:52
-msgid "The name of this application"
+#: admin/groups/apps/class_groupApplication.inc:1469
+#: admin/applications/class_applicationGeneric.inc:135
+#: admin/groups/apps/edit_entry.tpl.c:32
+msgid "Place icon on members desktop"
+msgstr ""
+
+#: admin/groups/apps/class_groupApplication.inc:1470
+#: admin/applications/class_applicationGeneric.inc:145
+#: admin/groups/apps/edit_entry.tpl.c:38
+msgid "Place entry in members launch bar"
+msgstr ""
+
+#: admin/groups/apps/class_groupApplication.inc:1471
+#: admin/applications/class_applicationGeneric.inc:140
+#: admin/groups/apps/edit_entry.tpl.c:35
+msgid "Place entry in members startmenu"
+msgstr ""
+
+#: admin/mimetypes/class_mimetypeManagement.inc:28
+#: admin/mimetypes/class_mimetypeGeneric.inc:674
+msgid "Mime types"
+msgstr ""
+
+#: admin/mimetypes/class_mimetypeManagement.inc:29
+msgid "Mime type management"
+msgstr ""
+
+#: admin/mimetypes/class_mimetypeGeneric.inc:519
+#: admin/mimetypes/class_mimetypeGeneric.inc:685
+#: admin/applications/class_applicationParameters.inc:208
+#: admin/applications/class_applicationParameters.inc:212
+#: admin/groups/apps/edit_entry.tpl.c:26
+msgid "Name"
+msgstr "TÃªn"
+
+#: admin/mimetypes/class_mimetypeGeneric.inc:522
+msgid "File pattern"
+msgstr ""
+
+#: admin/mimetypes/class_mimetypeGeneric.inc:671
+#: admin/applications/class_applicationGeneric.inc:69
+#: admin/mimetypes/generic.tpl.c:2
+msgid "Generic"
+msgstr "ThÃ´ng tin chung"
+
+#: admin/mimetypes/class_mimetypeGeneric.inc:672
+msgid "Mime type generic"
+msgstr ""
+
+#: admin/mimetypes/class_mimetypeGeneric.inc:678
+#: admin/mimetypes/generic.tpl.c:5
+msgid "Mime type"
+msgstr ""
+
+#: admin/mimetypes/class_mimetypeGeneric.inc:686
+#: admin/mimetypes/generic.tpl.c:11
+msgid "Mime group"
 msgstr ""
 
-#: admin/applications/class_applicationGeneric.inc:56
-#: admin/applications/class_webApplication.inc:55
+#: admin/mimetypes/class_mimetypeGeneric.inc:687
+#: admin/applications/class_applicationGeneric.inc:105
+#: admin/mimetypes/generic.tpl.c:17
 msgid "Description"
 msgstr "MÃ´ táº£"
 
-#: admin/applications/class_applicationGeneric.inc:56
-#: admin/applications/class_webApplication.inc:55
-msgid "A short description of this application"
+#: admin/mimetypes/class_mimetypeGeneric.inc:688
+#: admin/mimetypes/generic.tpl.c:23
+msgid "Base"
+msgstr "CÆ¡ sá»Ÿ"
+
+#: admin/mimetypes/class_mimetypeGeneric.inc:690
+msgid "Left click action"
 msgstr ""
 
-#: admin/applications/class_applicationGeneric.inc:60
-msgid "Execute"
+#: admin/mimetypes/class_mimetypeGeneric.inc:691
+#: admin/applications/class_applicationGeneric.inc:112
+#: admin/mimetypes/generic.tpl.c:32
+msgid "Icon"
 msgstr ""
 
-#: admin/applications/class_applicationGeneric.inc:60
-msgid "The application to be executed"
+#: admin/mimetypes/class_mimetypeGeneric.inc:692
+#: admin/mimetypes/generic.tpl.c:53
+msgid "File patterns"
+msgstr ""
+
+#: admin/mimetypes/class_mimetypeGeneric.inc:693
+msgid "Embedded applications"
+msgstr ""
+
+#: admin/applications/class_applicationManagement.inc:29
+msgid "Application management"
+msgstr ""
+
+#: admin/applications/class_applicationParameters.inc:71
+msgid "Remove options"
+msgstr ""
+
+#: admin/applications/class_applicationParameters.inc:71
+#: admin/applications/class_applicationParameters.inc:73
+msgid "parameter"
+msgstr ""
+
+#: admin/applications/class_applicationParameters.inc:73
+msgid "Create options"
+msgstr ""
+
+#: admin/applications/class_applicationParameters.inc:115
+msgid "Variable"
+msgstr ""
+
+#: admin/applications/class_applicationParameters.inc:115
+msgid "Default value"
+msgstr ""
+
+#: admin/applications/class_applicationParameters.inc:141
+#: admin/groups/apps/app_list.tpl.c:29 admin/groups/apps/app_list.tpl.c:41
+#: admin/groups/apps/app_list.tpl.c:53
+msgid "Remove"
+msgstr "XÃ³a bá»"
+
+#: admin/applications/class_applicationParameters.inc:147
+msgid "Add option"
+msgstr ""
+
+#: admin/applications/class_applicationParameters.inc:265
+msgid "Parameter"
+msgstr ""
+
+#: admin/applications/class_applicationParameters.inc:266
+msgid "Parameter configuration"
+msgstr ""
+
+#: admin/applications/class_applicationParameters.inc:271
+msgid "Application parameter settings"
+msgstr ""
+
+#: admin/applications/class_applicationGeneric.inc:70
+msgid "Application generic"
+msgstr ""
+
+#: admin/applications/class_applicationGeneric.inc:90
+msgid "Properties"
+msgstr "Properties"
+
+#: admin/applications/class_applicationGeneric.inc:93
+msgid "Application name"
+msgstr ""
+
+#: admin/applications/class_applicationGeneric.inc:93
+msgid "The name of this application"
 msgstr ""
 
-#: admin/applications/class_applicationGeneric.inc:64
+#: admin/applications/class_applicationGeneric.inc:97
 msgid "Display name"
 msgstr ""
 
-#: admin/applications/class_applicationGeneric.inc:64
+#: admin/applications/class_applicationGeneric.inc:97
 msgid "The displayed name for this application"
 msgstr ""
 
-#: admin/applications/class_applicationGeneric.inc:70
-#: admin/applications/class_webApplication.inc:69
-msgid "Icon"
+#: admin/applications/class_applicationGeneric.inc:101
+msgid "Execute"
 msgstr ""
 
-#: admin/applications/class_applicationGeneric.inc:73
-#: admin/applications/class_webApplication.inc:72
+#: admin/applications/class_applicationGeneric.inc:101
+msgid "The application to be executed"
+msgstr ""
+
+#: admin/applications/class_applicationGeneric.inc:105
+msgid "A short description of this application"
+msgstr ""
+
+#: admin/applications/class_applicationGeneric.inc:115
 msgid "The icon for this application"
 msgstr ""
 
-#: admin/applications/class_applicationGeneric.inc:80
+#: admin/applications/class_applicationGeneric.inc:122
 msgid "Options"
 msgstr ""
 
-#: admin/applications/class_applicationGeneric.inc:83
+#: admin/applications/class_applicationGeneric.inc:125
 msgid "Only executable for member"
 msgstr ""
 
-#: admin/applications/class_applicationGeneric.inc:83
+#: admin/applications/class_applicationGeneric.inc:125
 msgid "Only executable by the memebers of the group"
 msgstr ""
 
-#: admin/applications/class_applicationGeneric.inc:88
+#: admin/applications/class_applicationGeneric.inc:130
 msgid "Replace user configuration on startup"
 msgstr ""
 
-#: admin/applications/class_applicationGeneric.inc:88
+#: admin/applications/class_applicationGeneric.inc:130
 msgid "Replace the user configuration on startup"
 msgstr ""
 
-#: admin/applications/class_applicationGeneric.inc:93
-msgid "Place icon on members desktop"
+#: admin/applications/class_applicationGeneric.inc:135
+msgid "Put an icon on the user desktop"
 msgstr ""
 
-#: admin/applications/class_applicationGeneric.inc:93
-msgid "Put an icon on the user desktop"
+#: admin/applications/class_applicationGeneric.inc:140
+#: admin/applications/class_applicationGeneric.inc:145
+msgid "Put an entry in the startup menu"
 msgstr ""
 
-#: admin/applications/class_applicationGeneric.inc:98
-msgid "Place entry in members startmenu"
+#: admin/applications/class_applicationGeneric.inc:156
+msgid "Script"
 msgstr ""
 
-#: admin/applications/class_applicationGeneric.inc:98
-#: admin/applications/class_applicationGeneric.inc:103
-msgid "Put an entry in the startup menu"
+#: admin/applications/class_applicationGeneric.inc:159
+msgid "Script to run at logon"
 msgstr ""
 
-#: admin/applications/class_applicationGeneric.inc:103
-msgid "Place entry in members launch bar"
+#: admin/applications/class_applicationGeneric.inc:165
+msgid "Log off script"
 msgstr ""
 
-#: admin/applications/class_webApplication.inc:30
-#: admin/applications/class_webApplication.inc:33
-msgid "Web application"
+#: admin/applications/class_applicationGeneric.inc:168
+msgid "Script to run at logoff"
 msgstr ""
 
-#: admin/applications/class_webApplication.inc:31
-msgid "Web applicationts names, icons and links"
+#: admin/applications/class_applicationGeneric.inc:227
+msgid "no example"
 msgstr ""
 
-#: admin/applications/class_webApplication.inc:51
-msgid "Name"
-msgstr "TÃªn"
+#: admin/applications/class_applicationGeneric.inc:276
+msgid "Error"
+msgstr "Lá»—i"
 
-#: admin/applications/class_webApplication.inc:51
-msgid "Name or id for application"
+#: admin/applications/class_applicationGeneric.inc:276
+#, php-format
+msgid "Cannot remove application - it is still in use by these objects: %s"
 msgstr ""
 
-#: admin/applications/class_webApplication.inc:59
-msgid "URL"
+#: config/desktop-management/class_desktopPluginConfig.inc:28
+msgid "Desktop management"
 msgstr ""
 
-#: admin/applications/class_webApplication.inc:59
-msgid "Link to this application"
+#: config/desktop-management/class_desktopPluginConfig.inc:29
+msgid "Desktop management plugin configuration"
 msgstr ""
 
-#: admin/applications/class_webApplication.inc:63
-msgid "Display Name"
+#: config/desktop-management/class_desktopPluginConfig.inc:40
+msgid "LDAP tree"
 msgstr ""
 
-#: admin/applications/class_webApplication.inc:63
-msgid "Displayed name for links to this application"
+#: config/desktop-management/class_desktopPluginConfig.inc:43
+msgid "Mimetype RDN"
 msgstr ""
 
-#: admin/applications/class_webApplication.inc:77
-msgid "Icon location"
+#: config/desktop-management/class_desktopPluginConfig.inc:43
+msgid "Branch in which mime types will be stored"
+msgstr ""
+
+#: config/desktop-management/class_desktopPluginConfig.inc:48
+msgid "Application RDN"
 msgstr ""
 
-#: admin/applications/class_webApplication.inc:77
-msgid "Usual path to this application icon"
+#: config/desktop-management/class_desktopPluginConfig.inc:48
+msgid "Branch in which applications will be stored"
 msgstr ""
 
-#: admin/roles/class_applicationRights.inc:31
-msgid "Applications allowed for this role"
+#: admin/groups/apps/edit_entry.tpl.c:2
+msgid "Folder image"
 msgstr ""
 
-#: admin/roles/class_applicationRights.inc:45
-msgid "Application list"
+#: admin/groups/apps/edit_entry.tpl.c:5
+msgid "Could not load image."
 msgstr ""
 
-#: admin/roles/class_applicationRights.inc:49
-msgid "The applications users with this role are allowed to launch"
+#: admin/groups/apps/edit_entry.tpl.c:8
+msgid "None"
 msgstr ""
 
-#: config/applications/class_applicationsPluginConfig.inc:29
-msgid "Applications plugin configuration"
+#: admin/groups/apps/edit_entry.tpl.c:11
+msgid "Upload image"
 msgstr ""
 
-#: config/applications/class_applicationsPluginConfig.inc:43
-msgid "Application RDN"
+#: admin/groups/apps/edit_entry.tpl.c:14
+msgid "Upload"
 msgstr ""
 
-#: config/applications/class_applicationsPluginConfig.inc:43
-msgid "Branch in which applications will be stored"
+#: admin/groups/apps/edit_entry.tpl.c:17
+msgid "Reset image"
 msgstr ""
 
-#: config/applications/class_applicationsPluginConfig.inc:48
-msgid "Web applications RDN"
+#: admin/groups/apps/edit_entry.tpl.c:20
+msgid "Reset"
 msgstr ""
 
-#: config/applications/class_applicationsPluginConfig.inc:48
-msgid "Branch in which web applications will be stored"
+#: admin/groups/apps/edit_entry.tpl.c:23
+msgid "Application settings"
 msgstr ""
 
-#: config/applications/class_applicationsPluginConfig.inc:53
-msgid "Show web applications in menu"
+#: admin/groups/apps/edit_entry.tpl.c:29
+msgid "Application options"
 msgstr ""
 
-#: config/applications/class_applicationsPluginConfig.inc:53
-msgid "Whether to show web applications in FD main menu"
+#: admin/groups/apps/app_list.tpl.c:5
+msgid "Copy menu"
 msgstr ""
 
-#: config/applications/class_applicationsPluginConfig.inc:56
-msgid "None"
+#: admin/groups/apps/app_list.tpl.c:8
+msgid "Paste menu from"
+msgstr ""
+
+#: admin/groups/apps/app_list.tpl.c:11
+msgid "Delete menu"
+msgstr ""
+
+#: admin/groups/apps/app_list.tpl.c:17 admin/groups/apps/app_list.tpl.c:20
+msgid "Folder"
+msgstr ""
+
+#: admin/groups/apps/app_list.tpl.c:23 admin/groups/apps/app_list.tpl.c:35
+#: admin/groups/apps/app_list.tpl.c:47
+msgid "Move up"
+msgstr ""
+
+#: admin/groups/apps/app_list.tpl.c:26 admin/groups/apps/app_list.tpl.c:38
+#: admin/groups/apps/app_list.tpl.c:50
+msgid "Move down"
+msgstr ""
+
+#: admin/groups/apps/app_list.tpl.c:32 admin/groups/apps/app_list.tpl.c:56
+msgid "Edit"
+msgstr "Hiá»‡u chá»‰nh"
+
+#: admin/groups/apps/app_list.tpl.c:44
+msgid "Entry"
+msgstr ""
+
+#: admin/groups/apps/app_list.tpl.c:59
+msgid "add to"
+msgstr ""
+
+#: admin/groups/apps/app_list.tpl.c:62
+msgid "Add selected category to this folder.."
+msgstr ""
+
+#: admin/groups/apps/app_list.tpl.c:65
+msgid "Separator"
+msgstr ""
+
+#: admin/groups/apps/app_list.tpl.c:68
+msgid "Add a separator to this folder."
+msgstr ""
+
+#: admin/groups/apps/app_list.tpl.c:71
+msgid "Add selected applications to this folder."
+msgstr ""
+
+#: admin/mimetypes/generic.tpl.c:8
+msgid "Please enter a name for the mime type here"
+msgstr ""
+
+#: admin/mimetypes/generic.tpl.c:14
+msgid "Categorize this mime type"
+msgstr ""
+
+#: admin/mimetypes/generic.tpl.c:20
+msgid "Please specify a description"
+msgstr ""
+
+#: admin/mimetypes/generic.tpl.c:26
+msgid "Choose subtree to place application in"
+msgstr ""
+
+#: admin/mimetypes/generic.tpl.c:29
+msgid "Select a base"
+msgstr ""
+
+#: admin/mimetypes/generic.tpl.c:35 admin/mimetypes/generic.tpl.c:38
+msgid "Mime icon"
+msgstr ""
+
+#: admin/mimetypes/generic.tpl.c:41
+msgid "Update"
+msgstr ""
+
+#: admin/mimetypes/generic.tpl.c:44
+msgid "Update mime type icon"
+msgstr ""
+
+#: admin/mimetypes/generic.tpl.c:47 admin/mimetypes/generic.tpl.c:50
+msgid "Left click"
+msgstr ""
+
+#: admin/mimetypes/generic.tpl.c:56
+msgid "Please specify a new file pattern"
+msgstr ""
+
+#: admin/mimetypes/generic.tpl.c:59
+msgid "Add a new file pattern"
+msgstr ""
+
+#: admin/mimetypes/generic.tpl.c:65 admin/mimetypes/generic.tpl.c:89
+msgid "Enter an application name here"
+msgstr ""
+
+#: admin/mimetypes/generic.tpl.c:68 admin/mimetypes/generic.tpl.c:92
+msgid "Add application"
+msgstr ""
+
+#: admin/mimetypes/generic.tpl.c:71 admin/mimetypes/generic.tpl.c:74
+msgid "Embedding"
+msgstr ""
+
+#: admin/mimetypes/generic.tpl.c:77
+msgid "Show file in embedded viewer"
 msgstr ""
 
-#: config/applications/class_applicationsPluginConfig.inc:56
-msgid "Only allowed"
+#: admin/mimetypes/generic.tpl.c:80
+msgid "Show file in external viewer"
 msgstr ""
 
-#: config/applications/class_applicationsPluginConfig.inc:56
-msgid "All"
+#: admin/mimetypes/generic.tpl.c:83
+msgid "Ask whether to save to local disk"
 msgstr ""
diff --git a/applications/locale/zh/fusiondirectory.po b/applications/locale/zh/fusiondirectory.po
index f436bac6ccc7356c98037dc52cd0c25a706381f5..1830cfd36b4b6d5e1e99f5c64c64fe986f60770f 100644
--- a/applications/locale/zh/fusiondirectory.po
+++ b/applications/locale/zh/fusiondirectory.po
@@ -5,219 +5,497 @@
 # Translators:
 msgid ""
 msgstr ""
-"Project-Id-Version: FusionDirectory-108\n"
+"Project-Id-Version: FusionDirectory-109\n"
 "Report-Msgid-Bugs-To: documentation@lists.fusiondirectory.org\n"
-"POT-Creation-Date: 2015-03-19 21:45+0100\n"
-"PO-Revision-Date: 2015-02-25 16:12+0000\n"
-"Last-Translator: fusiondirectory <contact@fusiondirectory.org>\n"
-"Language-Team: Chinese (http://www.transifex.com/projects/p/FusionDirectory-108/language/zh/)\n"
+"POT-Creation-Date: 2014-08-28 12:26+0200\n"
+"PO-Revision-Date: 2014-08-28 10:28+0000\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: Chinese (http://www.transifex.com/projects/p/FusionDirectory-109/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/groups/apps/class_groupApplication.inc:410
+#: admin/groups/apps/class_groupApplication.inc:414
+msgid "Menu"
+msgstr ""
+
+#: admin/groups/apps/class_groupApplication.inc:482
+msgid "Back"
+msgstr "è¿”å›ž"
+
+#: admin/groups/apps/class_groupApplication.inc:493
+msgid "back"
+msgstr "è¿”å›ž"
+
+#: admin/groups/apps/class_groupApplication.inc:501
+msgid "department"
+msgstr "éƒ¨é—¨"
+
+#: admin/groups/apps/class_groupApplication.inc:524
+msgid "application"
+msgstr "åº”ç”¨ç¨‹åº"
+
+#: admin/groups/apps/class_groupApplication.inc:701
+#: admin/groups/apps/class_groupApplication.inc:1396
+#: admin/groups/apps/class_groupApplication.inc:1409
+#: admin/groups/apps/class_groupApplication.inc:1422
+#: admin/mimetypes/class_mimetypeGeneric.inc:481
+#: admin/mimetypes/class_mimetypeGeneric.inc:493
+#: admin/mimetypes/class_mimetypeGeneric.inc:508
+#: admin/applications/class_applicationParameters.inc:177
+#: admin/applications/class_applicationParameters.inc:242
+#: admin/applications/class_applicationGeneric.inc:290
+msgid "LDAP error"
+msgstr "LDAP é”™è¯¯"
+
+#: admin/groups/apps/class_groupApplication.inc:1208
+msgid "Not available in release."
+msgstr ""
+
+#: admin/groups/apps/class_groupApplication.inc:1459
 #: 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
+#: admin/mimetypes/generic.tpl.c:62 admin/mimetypes/generic.tpl.c:86
 msgid "Applications"
 msgstr "åº”ç”¨ç¨‹åº"
 
+#: admin/groups/apps/class_groupApplication.inc:1460
+msgid "Group applications"
+msgstr ""
+
+#: admin/groups/apps/class_groupApplication.inc:1466
+#: admin/mimetypes/class_mimetypeGeneric.inc:689
+#: admin/applications/class_applicationGeneric.inc:73
+msgid "Application"
+msgstr "åº”ç”¨ç¨‹åº"
+
+#: admin/groups/apps/class_groupApplication.inc:1467
+#: admin/groups/apps/app_list.tpl.c:2 admin/groups/apps/app_list.tpl.c:14
+msgid "Release"
+msgstr "å‘è¡Œ"
+
+#: admin/groups/apps/class_groupApplication.inc:1468
+msgid "Application parameter"
+msgstr ""
+
+#: admin/groups/apps/class_groupApplication.inc:1469
+#: admin/applications/class_applicationGeneric.inc:135
+#: admin/groups/apps/edit_entry.tpl.c:32
+msgid "Place icon on members desktop"
+msgstr "åœ¨æˆå‘˜æ¡Œé¢æ”¾ç½®å›¾æ ‡"
+
+#: admin/groups/apps/class_groupApplication.inc:1470
+#: admin/applications/class_applicationGeneric.inc:145
+#: admin/groups/apps/edit_entry.tpl.c:38
+msgid "Place entry in members launch bar"
+msgstr "åœ¨æˆå‘˜çš„å¯åŠ¨æ¡æ”¾ç½®æ¡ç›®"
+
+#: admin/groups/apps/class_groupApplication.inc:1471
+#: admin/applications/class_applicationGeneric.inc:140
+#: admin/groups/apps/edit_entry.tpl.c:35
+msgid "Place entry in members startmenu"
+msgstr "æ›¿æ¢æˆå‘˜å¯åŠ¨èœå•æ¡ç›®"
+
+#: admin/mimetypes/class_mimetypeManagement.inc:28
+#: admin/mimetypes/class_mimetypeGeneric.inc:674
+msgid "Mime types"
+msgstr ""
+
+#: admin/mimetypes/class_mimetypeManagement.inc:29
+msgid "Mime type management"
+msgstr ""
+
+#: admin/mimetypes/class_mimetypeGeneric.inc:519
+#: admin/mimetypes/class_mimetypeGeneric.inc:685
+#: admin/applications/class_applicationParameters.inc:208
+#: admin/applications/class_applicationParameters.inc:212
+#: admin/groups/apps/edit_entry.tpl.c:26
+msgid "Name"
+msgstr "åç§°"
+
+#: admin/mimetypes/class_mimetypeGeneric.inc:522
+msgid "File pattern"
+msgstr ""
+
+#: admin/mimetypes/class_mimetypeGeneric.inc:671
+#: admin/applications/class_applicationGeneric.inc:69
+#: admin/mimetypes/generic.tpl.c:2
+msgid "Generic"
+msgstr "é€šç”¨é…ç½®"
+
+#: admin/mimetypes/class_mimetypeGeneric.inc:672
+msgid "Mime type generic"
+msgstr ""
+
+#: admin/mimetypes/class_mimetypeGeneric.inc:678
+#: admin/mimetypes/generic.tpl.c:5
+msgid "Mime type"
+msgstr ""
+
+#: admin/mimetypes/class_mimetypeGeneric.inc:686
+#: admin/mimetypes/generic.tpl.c:11
+msgid "Mime group"
+msgstr ""
+
+#: admin/mimetypes/class_mimetypeGeneric.inc:687
+#: admin/applications/class_applicationGeneric.inc:105
+#: admin/mimetypes/generic.tpl.c:17
+msgid "Description"
+msgstr "æè¿°"
+
+#: admin/mimetypes/class_mimetypeGeneric.inc:688
+#: admin/mimetypes/generic.tpl.c:23
+msgid "Base"
+msgstr "ä½ç½®"
+
+#: admin/mimetypes/class_mimetypeGeneric.inc:690
+msgid "Left click action"
+msgstr ""
+
+#: admin/mimetypes/class_mimetypeGeneric.inc:691
+#: admin/applications/class_applicationGeneric.inc:112
+#: admin/mimetypes/generic.tpl.c:32
+msgid "Icon"
+msgstr "å›¾æ ‡"
+
+#: admin/mimetypes/class_mimetypeGeneric.inc:692
+#: admin/mimetypes/generic.tpl.c:53
+msgid "File patterns"
+msgstr ""
+
+#: admin/mimetypes/class_mimetypeGeneric.inc:693
+msgid "Embedded applications"
+msgstr ""
+
 #: admin/applications/class_applicationManagement.inc:29
 msgid "Application management"
 msgstr "åº”ç”¨ç¨‹åºç®¡ç†"
 
-#: admin/applications/class_applicationManagement.inc:100
-msgid "Web applications"
+#: admin/applications/class_applicationParameters.inc:71
+msgid "Remove options"
+msgstr "åˆ é™¤é€‰é¡¹"
+
+#: admin/applications/class_applicationParameters.inc:71
+#: admin/applications/class_applicationParameters.inc:73
+msgid "parameter"
+msgstr "å‚æ•°"
+
+#: admin/applications/class_applicationParameters.inc:73
+msgid "Create options"
+msgstr "åˆ›å»ºé€‰é¡¹"
+
+#: admin/applications/class_applicationParameters.inc:115
+msgid "Variable"
+msgstr "å˜é‡"
+
+#: admin/applications/class_applicationParameters.inc:115
+msgid "Default value"
+msgstr "ç¼ºçœå€¼"
+
+#: admin/applications/class_applicationParameters.inc:141
+#: admin/groups/apps/app_list.tpl.c:29 admin/groups/apps/app_list.tpl.c:41
+#: admin/groups/apps/app_list.tpl.c:53
+msgid "Remove"
+msgstr "åˆ é™¤"
+
+#: admin/applications/class_applicationParameters.inc:147
+msgid "Add option"
+msgstr "æ·»åŠ é€‰é¡¹"
+
+#: admin/applications/class_applicationParameters.inc:265
+msgid "Parameter"
+msgstr "å‚æ•°"
+
+#: admin/applications/class_applicationParameters.inc:266
+msgid "Parameter configuration"
 msgstr ""
 
-#: admin/applications/class_applicationGeneric.inc:31
-#: admin/applications/class_applicationGeneric.inc:34
-#: admin/applications/class_applicationGeneric.inc:48
-#: admin/applications/class_webApplication.inc:47
-msgid "Application"
-msgstr "åº”ç”¨ç¨‹åº"
+#: admin/applications/class_applicationParameters.inc:271
+msgid "Application parameter settings"
+msgstr ""
 
-#: admin/applications/class_applicationGeneric.inc:32
-msgid "Application information"
+#: admin/applications/class_applicationGeneric.inc:70
+msgid "Application generic"
 msgstr ""
 
-#: admin/applications/class_applicationGeneric.inc:52
+#: admin/applications/class_applicationGeneric.inc:90
+msgid "Properties"
+msgstr "å±žæ€§"
+
+#: admin/applications/class_applicationGeneric.inc:93
 msgid "Application name"
 msgstr "åº”ç”¨ç¨‹åºåç§°"
 
-#: admin/applications/class_applicationGeneric.inc:52
+#: admin/applications/class_applicationGeneric.inc:93
 msgid "The name of this application"
 msgstr ""
 
-#: admin/applications/class_applicationGeneric.inc:56
-#: admin/applications/class_webApplication.inc:55
-msgid "Description"
-msgstr "æè¿°"
+#: admin/applications/class_applicationGeneric.inc:97
+msgid "Display name"
+msgstr "æ˜¾ç¤ºåç§°"
 
-#: admin/applications/class_applicationGeneric.inc:56
-#: admin/applications/class_webApplication.inc:55
-msgid "A short description of this application"
+#: admin/applications/class_applicationGeneric.inc:97
+msgid "The displayed name for this application"
 msgstr ""
 
-#: admin/applications/class_applicationGeneric.inc:60
+#: admin/applications/class_applicationGeneric.inc:101
 msgid "Execute"
 msgstr "æ‰§è¡Œ"
 
-#: admin/applications/class_applicationGeneric.inc:60
+#: admin/applications/class_applicationGeneric.inc:101
 msgid "The application to be executed"
 msgstr ""
 
-#: admin/applications/class_applicationGeneric.inc:64
-msgid "Display name"
-msgstr "æ˜¾ç¤ºåç§°"
-
-#: admin/applications/class_applicationGeneric.inc:64
-msgid "The displayed name for this application"
+#: admin/applications/class_applicationGeneric.inc:105
+msgid "A short description of this application"
 msgstr ""
 
-#: admin/applications/class_applicationGeneric.inc:70
-#: admin/applications/class_webApplication.inc:69
-msgid "Icon"
-msgstr "å›¾æ ‡"
-
-#: admin/applications/class_applicationGeneric.inc:73
-#: admin/applications/class_webApplication.inc:72
+#: admin/applications/class_applicationGeneric.inc:115
 msgid "The icon for this application"
 msgstr ""
 
-#: admin/applications/class_applicationGeneric.inc:80
+#: admin/applications/class_applicationGeneric.inc:122
 msgid "Options"
 msgstr "é€‰é¡¹"
 
-#: admin/applications/class_applicationGeneric.inc:83
+#: admin/applications/class_applicationGeneric.inc:125
 msgid "Only executable for member"
 msgstr ""
 
-#: admin/applications/class_applicationGeneric.inc:83
+#: admin/applications/class_applicationGeneric.inc:125
 msgid "Only executable by the memebers of the group"
 msgstr ""
 
-#: admin/applications/class_applicationGeneric.inc:88
+#: admin/applications/class_applicationGeneric.inc:130
 msgid "Replace user configuration on startup"
 msgstr "æ›¿æ¢å¯åŠ¨æ—¶ç”¨æˆ·é…ç½®"
 
-#: admin/applications/class_applicationGeneric.inc:88
+#: admin/applications/class_applicationGeneric.inc:130
 msgid "Replace the user configuration on startup"
 msgstr ""
 
-#: admin/applications/class_applicationGeneric.inc:93
-msgid "Place icon on members desktop"
-msgstr "åœ¨æˆå‘˜æ¡Œé¢æ”¾ç½®å›¾æ ‡"
-
-#: admin/applications/class_applicationGeneric.inc:93
+#: admin/applications/class_applicationGeneric.inc:135
 msgid "Put an icon on the user desktop"
 msgstr ""
 
-#: admin/applications/class_applicationGeneric.inc:98
-msgid "Place entry in members startmenu"
-msgstr "æ›¿æ¢æˆå‘˜å¯åŠ¨èœå•æ¡ç›®"
-
-#: admin/applications/class_applicationGeneric.inc:98
-#: admin/applications/class_applicationGeneric.inc:103
+#: admin/applications/class_applicationGeneric.inc:140
+#: admin/applications/class_applicationGeneric.inc:145
 msgid "Put an entry in the startup menu"
 msgstr ""
 
-#: admin/applications/class_applicationGeneric.inc:103
-msgid "Place entry in members launch bar"
-msgstr "åœ¨æˆå‘˜çš„å¯åŠ¨æ¡æ”¾ç½®æ¡ç›®"
+#: admin/applications/class_applicationGeneric.inc:156
+msgid "Script"
+msgstr "è„šæœ¬"
 
-#: admin/applications/class_webApplication.inc:30
-#: admin/applications/class_webApplication.inc:33
-msgid "Web application"
+#: admin/applications/class_applicationGeneric.inc:159
+msgid "Script to run at logon"
 msgstr ""
 
-#: admin/applications/class_webApplication.inc:31
-msgid "Web applicationts names, icons and links"
+#: admin/applications/class_applicationGeneric.inc:165
+msgid "Log off script"
 msgstr ""
 
-#: admin/applications/class_webApplication.inc:51
-msgid "Name"
-msgstr "åç§°"
+#: admin/applications/class_applicationGeneric.inc:168
+msgid "Script to run at logoff"
+msgstr ""
+
+#: admin/applications/class_applicationGeneric.inc:227
+msgid "no example"
+msgstr "æ²¡æœ‰ç¤ºä¾‹"
+
+#: admin/applications/class_applicationGeneric.inc:276
+msgid "Error"
+msgstr "é”™è¯¯"
 
-#: admin/applications/class_webApplication.inc:51
-msgid "Name or id for application"
+#: admin/applications/class_applicationGeneric.inc:276
+#, php-format
+msgid "Cannot remove application - it is still in use by these objects: %s"
 msgstr ""
 
-#: admin/applications/class_webApplication.inc:59
-msgid "URL"
-msgstr "URL"
+#: config/desktop-management/class_desktopPluginConfig.inc:28
+msgid "Desktop management"
+msgstr ""
 
-#: admin/applications/class_webApplication.inc:59
-msgid "Link to this application"
+#: config/desktop-management/class_desktopPluginConfig.inc:29
+msgid "Desktop management plugin configuration"
 msgstr ""
 
-#: admin/applications/class_webApplication.inc:63
-msgid "Display Name"
+#: config/desktop-management/class_desktopPluginConfig.inc:40
+msgid "LDAP tree"
 msgstr ""
 
-#: admin/applications/class_webApplication.inc:63
-msgid "Displayed name for links to this application"
+#: config/desktop-management/class_desktopPluginConfig.inc:43
+msgid "Mimetype RDN"
 msgstr ""
 
-#: admin/applications/class_webApplication.inc:77
-msgid "Icon location"
+#: config/desktop-management/class_desktopPluginConfig.inc:43
+msgid "Branch in which mime types will be stored"
 msgstr ""
 
-#: admin/applications/class_webApplication.inc:77
-msgid "Usual path to this application icon"
+#: config/desktop-management/class_desktopPluginConfig.inc:48
+msgid "Application RDN"
 msgstr ""
 
-#: admin/roles/class_applicationRights.inc:31
-msgid "Applications allowed for this role"
+#: config/desktop-management/class_desktopPluginConfig.inc:48
+msgid "Branch in which applications will be stored"
 msgstr ""
 
-#: admin/roles/class_applicationRights.inc:45
-msgid "Application list"
+#: admin/groups/apps/edit_entry.tpl.c:2
+msgid "Folder image"
 msgstr ""
 
-#: admin/roles/class_applicationRights.inc:49
-msgid "The applications users with this role are allowed to launch"
+#: admin/groups/apps/edit_entry.tpl.c:5
+msgid "Could not load image."
 msgstr ""
 
-#: config/applications/class_applicationsPluginConfig.inc:29
-msgid "Applications plugin configuration"
+#: admin/groups/apps/edit_entry.tpl.c:8
+msgid "None"
 msgstr ""
 
-#: config/applications/class_applicationsPluginConfig.inc:43
-msgid "Application RDN"
+#: admin/groups/apps/edit_entry.tpl.c:11
+msgid "Upload image"
 msgstr ""
 
-#: config/applications/class_applicationsPluginConfig.inc:43
-msgid "Branch in which applications will be stored"
+#: admin/groups/apps/edit_entry.tpl.c:14
+msgid "Upload"
+msgstr "ä¸Šä¼ "
+
+#: admin/groups/apps/edit_entry.tpl.c:17
+msgid "Reset image"
 msgstr ""
 
-#: config/applications/class_applicationsPluginConfig.inc:48
-msgid "Web applications RDN"
+#: admin/groups/apps/edit_entry.tpl.c:20
+msgid "Reset"
 msgstr ""
 
-#: config/applications/class_applicationsPluginConfig.inc:48
-msgid "Branch in which web applications will be stored"
+#: admin/groups/apps/edit_entry.tpl.c:23
+msgid "Application settings"
+msgstr "åº”ç”¨ç¨‹åºè®¾ç½®"
+
+#: admin/groups/apps/edit_entry.tpl.c:29
+msgid "Application options"
+msgstr "åº”ç”¨ç¨‹åºé€‰é¡¹"
+
+#: admin/groups/apps/app_list.tpl.c:5
+msgid "Copy menu"
 msgstr ""
 
-#: config/applications/class_applicationsPluginConfig.inc:53
-msgid "Show web applications in menu"
+#: admin/groups/apps/app_list.tpl.c:8
+msgid "Paste menu from"
 msgstr ""
 
-#: config/applications/class_applicationsPluginConfig.inc:53
-msgid "Whether to show web applications in FD main menu"
+#: admin/groups/apps/app_list.tpl.c:11
+msgid "Delete menu"
 msgstr ""
 
-#: config/applications/class_applicationsPluginConfig.inc:56
-msgid "None"
+#: admin/groups/apps/app_list.tpl.c:17 admin/groups/apps/app_list.tpl.c:20
+msgid "Folder"
+msgstr ""
+
+#: admin/groups/apps/app_list.tpl.c:23 admin/groups/apps/app_list.tpl.c:35
+#: admin/groups/apps/app_list.tpl.c:47
+msgid "Move up"
+msgstr "å‘ä¸Šç§»åŠ¨"
+
+#: admin/groups/apps/app_list.tpl.c:26 admin/groups/apps/app_list.tpl.c:38
+#: admin/groups/apps/app_list.tpl.c:50
+msgid "Move down"
+msgstr "å‘ä¸‹ç§»åŠ¨"
+
+#: admin/groups/apps/app_list.tpl.c:32 admin/groups/apps/app_list.tpl.c:56
+msgid "Edit"
+msgstr "ç¼–è¾‘"
+
+#: admin/groups/apps/app_list.tpl.c:44
+msgid "Entry"
+msgstr ""
+
+#: admin/groups/apps/app_list.tpl.c:59
+msgid "add to"
+msgstr ""
+
+#: admin/groups/apps/app_list.tpl.c:62
+msgid "Add selected category to this folder.."
+msgstr ""
+
+#: admin/groups/apps/app_list.tpl.c:65
+msgid "Separator"
+msgstr ""
+
+#: admin/groups/apps/app_list.tpl.c:68
+msgid "Add a separator to this folder."
+msgstr ""
+
+#: admin/groups/apps/app_list.tpl.c:71
+msgid "Add selected applications to this folder."
+msgstr ""
+
+#: admin/mimetypes/generic.tpl.c:8
+msgid "Please enter a name for the mime type here"
+msgstr ""
+
+#: admin/mimetypes/generic.tpl.c:14
+msgid "Categorize this mime type"
 msgstr ""
 
-#: config/applications/class_applicationsPluginConfig.inc:56
-msgid "Only allowed"
+#: admin/mimetypes/generic.tpl.c:20
+msgid "Please specify a description"
 msgstr ""
 
-#: config/applications/class_applicationsPluginConfig.inc:56
-msgid "All"
-msgstr "å…¨éƒ¨"
+#: admin/mimetypes/generic.tpl.c:26
+msgid "Choose subtree to place application in"
+msgstr "é€‰æ‹©æ”¾ç½®åº”ç”¨ç¨‹åºçš„åæ ‘"
+
+#: admin/mimetypes/generic.tpl.c:29
+msgid "Select a base"
+msgstr "é€‰æ‹©ä¸€ä¸ªä½ç½®"
+
+#: admin/mimetypes/generic.tpl.c:35 admin/mimetypes/generic.tpl.c:38
+msgid "Mime icon"
+msgstr ""
+
+#: admin/mimetypes/generic.tpl.c:41
+msgid "Update"
+msgstr "æ›´æ–°"
+
+#: admin/mimetypes/generic.tpl.c:44
+msgid "Update mime type icon"
+msgstr ""
+
+#: admin/mimetypes/generic.tpl.c:47 admin/mimetypes/generic.tpl.c:50
+msgid "Left click"
+msgstr ""
+
+#: admin/mimetypes/generic.tpl.c:56
+msgid "Please specify a new file pattern"
+msgstr ""
+
+#: admin/mimetypes/generic.tpl.c:59
+msgid "Add a new file pattern"
+msgstr ""
+
+#: admin/mimetypes/generic.tpl.c:65 admin/mimetypes/generic.tpl.c:89
+msgid "Enter an application name here"
+msgstr ""
+
+#: admin/mimetypes/generic.tpl.c:68 admin/mimetypes/generic.tpl.c:92
+msgid "Add application"
+msgstr ""
+
+#: admin/mimetypes/generic.tpl.c:71 admin/mimetypes/generic.tpl.c:74
+msgid "Embedding"
+msgstr ""
+
+#: admin/mimetypes/generic.tpl.c:77
+msgid "Show file in embedded viewer"
+msgstr ""
+
+#: admin/mimetypes/generic.tpl.c:80
+msgid "Show file in external viewer"
+msgstr ""
+
+#: admin/mimetypes/generic.tpl.c:83
+msgid "Ask whether to save to local disk"
+msgstr ""
diff --git a/argonaut/locale/ar/fusiondirectory.po b/argonaut/locale/ar/fusiondirectory.po
index 1108fd72b83442002fe7a94f69ced0dd8824e2ce..f5fe7d8b0ccc9142454603dfbe6f827ea59b26a7 100644
--- a/argonaut/locale/ar/fusiondirectory.po
+++ b/argonaut/locale/ar/fusiondirectory.po
@@ -5,12 +5,12 @@
 # Translators:
 msgid ""
 msgstr ""
-"Project-Id-Version: FusionDirectory-108\n"
+"Project-Id-Version: FusionDirectory-109\n"
 "Report-Msgid-Bugs-To: documentation@lists.fusiondirectory.org\n"
-"POT-Creation-Date: 2015-03-31 11:49+0200\n"
-"PO-Revision-Date: 2015-03-17 17:47+0000\n"
+"POT-Creation-Date: 2014-12-15 17:47+0100\n"
+"PO-Revision-Date: 2015-02-25 16:13+0000\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>\n"
-"Language-Team: Arabic (http://www.transifex.com/projects/p/FusionDirectory-108/language/ar/)\n"
+"Language-Team: Arabic (http://www.transifex.com/projects/p/FusionDirectory-109/language/ar/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -47,7 +47,7 @@ msgstr ""
 
 #: admin/systems/argonaut/class_argonautClient.inc:135
 #: admin/systems/services/argonaut/class_argonautFuseConfig.inc:56
-#: admin/systems/services/argonaut/class_argonautMirrorConfig.inc:71
+#: admin/systems/services/argonaut/class_argonautMirrorConfig.inc:79
 #: admin/systems/services/argonaut/class_argonautServer.inc:79
 msgid "Log directory"
 msgstr ""
@@ -78,6 +78,7 @@ msgid "Argonaut Fuse settings"
 msgstr ""
 
 #: admin/systems/services/argonaut/class_argonautFuseConfig.inc:32
+#: admin/systems/services/argonaut/class_argonautMirrorConfig.inc:32
 #: admin/systems/services/argonaut/class_argonautFuseFAIConfig.inc:33
 #: admin/systems/services/argonaut/class_argonautServer.inc:32
 #: admin/systems/services/argonaut/class_argonautFuseOPSIConfig.inc:33
@@ -110,88 +111,60 @@ msgstr ""
 msgid "Path where argonaut-fuse should store pxelinux.cfg"
 msgstr ""
 
-#: admin/systems/services/argonaut/class_argonautMirrorConfig.inc:29
-#: admin/systems/services/argonaut/class_argonautMirrorConfig.inc:30
+#: admin/systems/services/argonaut/class_argonautMirrorConfig.inc:31
+#: admin/systems/services/argonaut/class_argonautMirrorConfig.inc:32
 msgid "Argonaut Mirror settings"
 msgstr ""
 
-#: admin/systems/services/argonaut/class_argonautMirrorConfig.inc:41
+#: admin/systems/services/argonaut/class_argonautMirrorConfig.inc:46
 msgid "Argonaut mirror settings"
 msgstr ""
 
-#: admin/systems/services/argonaut/class_argonautMirrorConfig.inc:44
-msgid "Local Debian mirror directory"
+#: admin/systems/services/argonaut/class_argonautMirrorConfig.inc:49
+msgid "Local debian mirror directory"
 msgstr ""
 
-#: admin/systems/services/argonaut/class_argonautMirrorConfig.inc:52
+#: admin/systems/services/argonaut/class_argonautMirrorConfig.inc:58
 msgid "Argonaut Debconf Crawler configuration"
 msgstr ""
 
-#: admin/systems/services/argonaut/class_argonautMirrorConfig.inc:55
+#: admin/systems/services/argonaut/class_argonautMirrorConfig.inc:61
 msgid "Local packages folder"
 msgstr ""
 
-#: admin/systems/services/argonaut/class_argonautMirrorConfig.inc:56
+#: admin/systems/services/argonaut/class_argonautMirrorConfig.inc:62
 msgid "Folder in which the crawler will store packages during analysis"
 msgstr ""
 
-#: admin/systems/services/argonaut/class_argonautMirrorConfig.inc:63
+#: admin/systems/services/argonaut/class_argonautMirrorConfig.inc:70
 msgid "Argonaut Repository configuration"
 msgstr ""
 
-#: admin/systems/services/argonaut/class_argonautMirrorConfig.inc:66
+#: admin/systems/services/argonaut/class_argonautMirrorConfig.inc:73
 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"
+#: admin/systems/services/argonaut/class_argonautMirrorConfig.inc:84
+msgid "Errors"
 msgstr ""
 
-#: admin/systems/services/argonaut/class_argonautMirrorConfig.inc:71
-msgid "Directory in which logs should be stored"
-msgstr ""
-
-#: admin/systems/services/argonaut/class_argonautMirrorConfig.inc:76
-msgid "Ignore errors"
-msgstr ""
-
-#: admin/systems/services/argonaut/class_argonautMirrorConfig.inc:77
-msgid ""
-"Causes debmirror to ignore missing or broken deb and source files but still "
-"be pedantic about checking meta files"
-msgstr ""
-
-#: admin/systems/services/argonaut/class_argonautMirrorConfig.inc:82
+#: admin/systems/services/argonaut/class_argonautMirrorConfig.inc:91
 msgid "Source"
 msgstr ""
 
-#: admin/systems/services/argonaut/class_argonautMirrorConfig.inc:82
-msgid "Include source in the mirror"
-msgstr ""
-
-#: admin/systems/services/argonaut/class_argonautMirrorConfig.inc:87
+#: admin/systems/services/argonaut/class_argonautMirrorConfig.inc:98
 msgid "GPG Check"
 msgstr ""
 
-#: admin/systems/services/argonaut/class_argonautMirrorConfig.inc:87
-msgid "Fail if the Release.gpg file is missing"
-msgstr ""
-
-#: admin/systems/services/argonaut/class_argonautMirrorConfig.inc:92
+#: admin/systems/services/argonaut/class_argonautMirrorConfig.inc:105
 msgid "Contents"
 msgstr ""
 
-#: admin/systems/services/argonaut/class_argonautMirrorConfig.inc:93
-msgid ""
-"Additionally download Contents.<arch>.gz files (Note that these files can be"
-" relatively big and can change frequently)"
-msgstr ""
-
-#: admin/systems/services/argonaut/class_argonautMirrorConfig.inc:98
+#: admin/systems/services/argonaut/class_argonautMirrorConfig.inc:112
 msgid "Verbose"
 msgstr ""
 
-#: admin/systems/services/argonaut/class_argonautMirrorConfig.inc:98
+#: admin/systems/services/argonaut/class_argonautMirrorConfig.inc:113
 msgid "Wether to activate verbose mode"
 msgstr ""
 
@@ -398,9 +371,9 @@ msgid "LTSP server"
 msgstr ""
 
 #: addons/argonaut/class_filterArgonautEvents.inc:40
-#: addons/argonaut/class_argonautQueue.inc:160
-#: addons/argonaut/class_argonautQueue.inc:260
-#: addons/argonaut/class_argonautQueue.inc:335
+#: addons/argonaut/class_argonautQueue.inc:193
+#: addons/argonaut/class_argonautQueue.inc:307
+#: addons/argonaut/class_argonautQueue.inc:398
 msgid "Error"
 msgstr "Ø®Ø·Ø£"
 
@@ -412,8 +385,7 @@ msgstr ""
 #: addons/argonaut/class_argonautImportFile.inc:44
 #: addons/argonaut/class_argonautImportFile.inc:100
 #: addons/argonaut/class_argonautImportFile.inc:141
-#: addons/argonaut/deploy-list.xml:79
-#: addons/argonaut/argonaut_import_file.tpl.c:68
+#: addons/argonaut/deploy-list.xml:99
 msgid "Import"
 msgstr ""
 
@@ -427,7 +399,8 @@ msgid ""
 msgstr ""
 
 #: addons/argonaut/class_argonautImportFile.inc:134
-msgid "Infrastructure service"
+#: addons/argonaut/class_argonautQueue.inc:350
+msgid "Service infrastructure"
 msgstr ""
 
 #: addons/argonaut/class_argonautImportFile.inc:141
@@ -436,84 +409,82 @@ msgid "Import complete: %s events successfully send, %s failed"
 msgstr ""
 
 #: addons/argonaut/class_argonautImportFile.inc:177
-#: addons/argonaut/argonaut_import_file.tpl.c:47
 msgid "MAC"
 msgstr ""
 
 #: addons/argonaut/class_argonautImportFile.inc:180
 #: addons/argonaut/deploy-list.xml:14
-#: addons/argonaut/argonaut_import_file.tpl.c:50
 msgid "Event"
 msgstr ""
 
-#: addons/argonaut/class_argonautQueue.inc:35
-#: addons/argonaut/class_argonautQueue.inc:41
+#: addons/argonaut/class_argonautQueue.inc:39
+#: addons/argonaut/class_argonautQueue.inc:45
 msgid "Deployment queue"
 msgstr ""
 
-#: addons/argonaut/class_argonautQueue.inc:36
+#: addons/argonaut/class_argonautQueue.inc:40
 msgid "Provide a mechanism to automatically activate systems"
 msgstr ""
 
-#: addons/argonaut/class_argonautQueue.inc:43
+#: addons/argonaut/class_argonautQueue.inc:47
 #: addons/argonaut/events/eventTargetSystems-list.xml:81
 msgid "Description"
 msgstr "Ø§Ù„ÙˆØµÙ"
 
-#: addons/argonaut/class_argonautQueue.inc:141
+#: addons/argonaut/class_argonautQueue.inc:174
 msgid "immediately"
 msgstr ""
 
-#: addons/argonaut/class_argonautQueue.inc:156
+#: addons/argonaut/class_argonautQueue.inc:189
 msgid "Waiting"
 msgstr ""
 
-#: addons/argonaut/class_argonautQueue.inc:159
+#: addons/argonaut/class_argonautQueue.inc:192
 msgid "Show error"
 msgstr ""
 
-#: addons/argonaut/class_argonautQueue.inc:163
+#: addons/argonaut/class_argonautQueue.inc:196
 msgid "Processed"
 msgstr ""
 
-#: addons/argonaut/class_argonautQueue.inc:172
+#: addons/argonaut/class_argonautQueue.inc:205
 msgid "in progress"
 msgstr ""
 
-#: addons/argonaut/class_argonautQueue.inc:180
+#: addons/argonaut/class_argonautQueue.inc:226
 msgid "Permission"
 msgstr ""
 
-#: addons/argonaut/class_argonautQueue.inc:210
+#: addons/argonaut/class_argonautQueue.inc:256
 #: addons/argonaut/events/class_DaemonEvent.inc:258
-#: addons/argonaut/deploy-list.xml:86 addons/argonaut/deploy-list.xml:136
+#: addons/argonaut/deploy-list.xml:106 addons/argonaut/deploy-list.xml:166
 msgid "Remove"
 msgstr "Ø¥Ø²Ø§Ù„Ø©"
 
-#: addons/argonaut/class_argonautQueue.inc:211
+#: addons/argonaut/class_argonautQueue.inc:257
 #, php-format
 msgid "The following jobs couldn't be deleted, they have to be aborted: %s"
 msgstr ""
 
-#: addons/argonaut/class_argonautQueue.inc:257
+#: addons/argonaut/class_argonautQueue.inc:304
 msgid "Info"
 msgstr ""
 
-#: addons/argonaut/class_argonautQueue.inc:257
+#: addons/argonaut/class_argonautQueue.inc:304
 #, php-format
 msgid "%s"
 msgstr ""
 
-#: addons/argonaut/class_argonautQueue.inc:261
+#: addons/argonaut/class_argonautQueue.inc:308
 #, php-format
 msgid "Required class '%s' cannot be found: job not aborted!"
 msgstr ""
 
-#: addons/argonaut/class_argonautQueue.inc:293
+#: addons/argonaut/class_argonautQueue.inc:340
 msgid "Error detail"
 msgstr ""
 
-#: addons/argonaut/class_argonautQueue.inc:335
+#: addons/argonaut/class_argonautQueue.inc:398
 #, php-format
 msgid "Cannot update queue entries."
 msgstr ""
@@ -588,17 +559,15 @@ msgid "Winstation"
 msgstr ""
 
 #: addons/argonaut/events/eventTargetSystems-list.xml:47
-#: addons/argonaut/argonaut_import_file.tpl.c:53
 msgid "Object group"
 msgstr ""
 
 #: addons/argonaut/events/eventTargetSystems-list.xml:73
-#: addons/argonaut/events/eventTargetSystems-filter.tpl.c:20
+#: addons/argonaut/deploy-list.xml:36
 msgid "Name"
 msgstr "Ø§Ù„Ø¥Ø³Ù…"
 
 #: addons/argonaut/events/eventTargetSystems-list.xml:89
-#: addons/argonaut/argonaut_import_file.tpl.c:62
 msgid "IP"
 msgstr ""
 
@@ -611,48 +580,53 @@ msgid "List of queued jobs"
 msgstr ""
 
 #: addons/argonaut/deploy-list.xml:27
-#: addons/argonaut/events/DaemonEvent.tpl.c:17
 msgid "Target"
 msgstr ""
 
-#: addons/argonaut/deploy-list.xml:35
+#: addons/argonaut/deploy-list.xml:45
 msgid "Task"
 msgstr ""
 
-#: addons/argonaut/deploy-list.xml:43
+#: addons/argonaut/deploy-list.xml:53
 msgid "Period"
 msgstr ""
 
-#: addons/argonaut/deploy-list.xml:51
-#: addons/argonaut/events/DaemonEvent.tpl.c:2
+#: addons/argonaut/deploy-list.xml:61
 msgid "Schedule"
 msgstr ""
 
-#: addons/argonaut/deploy-list.xml:59
-#: addons/argonaut/events/DaemonEvent.tpl.c:11
+#: addons/argonaut/deploy-list.xml:69
 msgid "Status"
 msgstr ""
 
-#: addons/argonaut/deploy-list.xml:67
+#: addons/argonaut/deploy-list.xml:77
 msgid "Actions"
 msgstr ""
 
-#: addons/argonaut/deploy-list.xml:97 addons/argonaut/deploy-list.xml:144
+#: addons/argonaut/deploy-list.xml:88
+msgid "Create"
+msgstr ""
+
+#: addons/argonaut/deploy-list.xml:117 addons/argonaut/deploy-list.xml:174
 msgid "Abort"
 msgstr ""
 
-#: addons/argonaut/deploy-list.xml:108
+#: addons/argonaut/deploy-list.xml:128
 msgid "Execute"
 msgstr ""
 
-#: addons/argonaut/deploy-list.xml:120
+#: addons/argonaut/deploy-list.xml:140
 msgid "Process now"
 msgstr ""
 
-#: addons/argonaut/deploy-list.xml:128
+#: addons/argonaut/deploy-list.xml:148
 msgid "View logs"
 msgstr ""
 
+#: addons/argonaut/deploy-list.xml:157
+msgid "Edit"
+msgstr ""
+
 #: include/class_supportDaemon.inc:89
 msgid "Multiple argonaut server found. Only one is supported"
 msgstr ""
@@ -670,162 +644,3 @@ msgstr ""
 #, php-format
 msgid "\"%s\" is not a file!"
 msgstr ""
-
-#: addons/argonaut/argonaut_import_file.tpl.c:2
-msgid "Import jobs"
-msgstr ""
-
-#: addons/argonaut/argonaut_import_file.tpl.c:5
-msgid ""
-"You can import a list of jobs into the FusionDirectory job queue. This "
-"should be a semicolon seperated list of items in the following format:"
-msgstr ""
-
-#: addons/argonaut/argonaut_import_file.tpl.c:8
-msgid "timestamp"
-msgstr ""
-
-#: addons/argonaut/argonaut_import_file.tpl.c:11
-msgid "MAC-address"
-msgstr ""
-
-#: addons/argonaut/argonaut_import_file.tpl.c:14
-msgid "job type"
-msgstr ""
-
-#: addons/argonaut/argonaut_import_file.tpl.c:17
-msgid "object group"
-msgstr ""
-
-#: addons/argonaut/argonaut_import_file.tpl.c:20
-msgid "import base"
-msgstr ""
-
-#: addons/argonaut/argonaut_import_file.tpl.c:23
-msgid "full hostname"
-msgstr ""
-
-#: addons/argonaut/argonaut_import_file.tpl.c:26
-msgid "IP-address"
-msgstr ""
-
-#: addons/argonaut/argonaut_import_file.tpl.c:29
-msgid "DHCP group"
-msgstr ""
-
-#: addons/argonaut/argonaut_import_file.tpl.c:32
-msgid "Example"
-msgstr ""
-
-#: addons/argonaut/argonaut_import_file.tpl.c:35
-msgid "Select list to import"
-msgstr ""
-
-#: addons/argonaut/argonaut_import_file.tpl.c:38
-msgid "Browse"
-msgstr ""
-
-#: addons/argonaut/argonaut_import_file.tpl.c:41
-msgid "Upload"
-msgstr ""
-
-#: addons/argonaut/argonaut_import_file.tpl.c:44
-#: addons/argonaut/events/DaemonEvent.tpl.c:20
-msgid "Timestamp"
-msgstr ""
-
-#: addons/argonaut/argonaut_import_file.tpl.c:56
-msgid "Base"
-msgstr ""
-
-#: addons/argonaut/argonaut_import_file.tpl.c:59
-msgid "FQDN"
-msgstr ""
-
-#: addons/argonaut/argonaut_import_file.tpl.c:65
-msgid "DHCP"
-msgstr ""
-
-#: addons/argonaut/events/target_list.tpl.c:2
-msgid "Apply"
-msgstr ""
-
-#: addons/argonaut/events/target_list.tpl.c:5
-msgid "Cancel"
-msgstr ""
-
-#: addons/argonaut/events/DaemonEvent.tpl.c:5
-msgid "System list"
-msgstr ""
-
-#: addons/argonaut/events/DaemonEvent.tpl.c:8
-msgid "ID"
-msgstr ""
-
-#: addons/argonaut/events/DaemonEvent.tpl.c:14
-msgid "Result"
-msgstr ""
-
-#: addons/argonaut/events/eventTargetSystems-filter.tpl.c:2
-msgid "Filter"
-msgstr ""
-
-#: addons/argonaut/events/eventTargetSystems-filter.tpl.c:5
-msgid "Show servers"
-msgstr ""
-
-#: addons/argonaut/events/eventTargetSystems-filter.tpl.c:8
-msgid "Show workstations"
-msgstr ""
-
-#: addons/argonaut/events/eventTargetSystems-filter.tpl.c:11
-msgid "Show terminals"
-msgstr ""
-
-#: addons/argonaut/events/eventTargetSystems-filter.tpl.c:14
-msgid "Show winstations"
-msgstr ""
-
-#: addons/argonaut/events/eventTargetSystems-filter.tpl.c:17
-msgid "Filter by IP address range"
-msgstr ""
-
-#: addons/argonaut/events/timestamp_select.tpl.c:2
-msgid "Year"
-msgstr ""
-
-#: addons/argonaut/events/timestamp_select.tpl.c:5
-msgid "Month"
-msgstr ""
-
-#: addons/argonaut/events/timestamp_select.tpl.c:8
-msgid "Day"
-msgstr ""
-
-#: addons/argonaut/events/timestamp_select.tpl.c:11
-msgid "Hour"
-msgstr ""
-
-#: addons/argonaut/events/timestamp_select.tpl.c:14
-msgid "Minute"
-msgstr ""
-
-#: addons/argonaut/events/timestamp_select.tpl.c:17
-msgid "Second"
-msgstr ""
-
-#: addons/argonaut/events/timestamp_select.tpl.c:20
-msgid "Periodical job"
-msgstr ""
-
-#: addons/argonaut/events/timestamp_select.tpl.c:23
-msgid "Job intervall"
-msgstr ""
-
-#: addons/argonaut/remove.tpl.c:2
-msgid "Warning"
-msgstr "ØªØØ°ÙŠØ±"
-
-#: addons/argonaut/remove.tpl.c:5
-msgid "So - if you're sure - press 'Delete' to continue or 'Cancel' to abort."
-msgstr ""
diff --git a/argonaut/locale/ca/fusiondirectory.po b/argonaut/locale/ca/fusiondirectory.po
index f22f8df388b74c15faa034f6f5230ec2aa493507..e22c220171fd8261e2257fb00a0083049fff30ba 100644
--- a/argonaut/locale/ca/fusiondirectory.po
+++ b/argonaut/locale/ca/fusiondirectory.po
@@ -5,12 +5,12 @@
 # Translators:
 msgid ""
 msgstr ""
-"Project-Id-Version: FusionDirectory-108\n"
+"Project-Id-Version: FusionDirectory-109\n"
 "Report-Msgid-Bugs-To: documentation@lists.fusiondirectory.org\n"
-"POT-Creation-Date: 2015-03-31 11:49+0200\n"
-"PO-Revision-Date: 2015-03-17 17:47+0000\n"
+"POT-Creation-Date: 2014-12-15 17:47+0100\n"
+"PO-Revision-Date: 2015-02-25 16:04+0000\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>\n"
-"Language-Team: Catalan (http://www.transifex.com/projects/p/FusionDirectory-108/language/ca/)\n"
+"Language-Team: Catalan (http://www.transifex.com/projects/p/FusionDirectory-109/language/ca/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -47,7 +47,7 @@ msgstr ""
 
 #: admin/systems/argonaut/class_argonautClient.inc:135
 #: admin/systems/services/argonaut/class_argonautFuseConfig.inc:56
-#: admin/systems/services/argonaut/class_argonautMirrorConfig.inc:71
+#: admin/systems/services/argonaut/class_argonautMirrorConfig.inc:79
 #: admin/systems/services/argonaut/class_argonautServer.inc:79
 msgid "Log directory"
 msgstr ""
@@ -78,6 +78,7 @@ msgid "Argonaut Fuse settings"
 msgstr ""
 
 #: admin/systems/services/argonaut/class_argonautFuseConfig.inc:32
+#: admin/systems/services/argonaut/class_argonautMirrorConfig.inc:32
 #: admin/systems/services/argonaut/class_argonautFuseFAIConfig.inc:33
 #: admin/systems/services/argonaut/class_argonautServer.inc:32
 #: admin/systems/services/argonaut/class_argonautFuseOPSIConfig.inc:33
@@ -110,88 +111,60 @@ msgstr ""
 msgid "Path where argonaut-fuse should store pxelinux.cfg"
 msgstr ""
 
-#: admin/systems/services/argonaut/class_argonautMirrorConfig.inc:29
-#: admin/systems/services/argonaut/class_argonautMirrorConfig.inc:30
+#: admin/systems/services/argonaut/class_argonautMirrorConfig.inc:31
+#: admin/systems/services/argonaut/class_argonautMirrorConfig.inc:32
 msgid "Argonaut Mirror settings"
 msgstr ""
 
-#: admin/systems/services/argonaut/class_argonautMirrorConfig.inc:41
+#: admin/systems/services/argonaut/class_argonautMirrorConfig.inc:46
 msgid "Argonaut mirror settings"
 msgstr ""
 
-#: admin/systems/services/argonaut/class_argonautMirrorConfig.inc:44
-msgid "Local Debian mirror directory"
+#: admin/systems/services/argonaut/class_argonautMirrorConfig.inc:49
+msgid "Local debian mirror directory"
 msgstr ""
 
-#: admin/systems/services/argonaut/class_argonautMirrorConfig.inc:52
+#: admin/systems/services/argonaut/class_argonautMirrorConfig.inc:58
 msgid "Argonaut Debconf Crawler configuration"
 msgstr ""
 
-#: admin/systems/services/argonaut/class_argonautMirrorConfig.inc:55
+#: admin/systems/services/argonaut/class_argonautMirrorConfig.inc:61
 msgid "Local packages folder"
 msgstr ""
 
-#: admin/systems/services/argonaut/class_argonautMirrorConfig.inc:56
+#: admin/systems/services/argonaut/class_argonautMirrorConfig.inc:62
 msgid "Folder in which the crawler will store packages during analysis"
 msgstr ""
 
-#: admin/systems/services/argonaut/class_argonautMirrorConfig.inc:63
+#: admin/systems/services/argonaut/class_argonautMirrorConfig.inc:70
 msgid "Argonaut Repository configuration"
 msgstr ""
 
-#: admin/systems/services/argonaut/class_argonautMirrorConfig.inc:66
+#: admin/systems/services/argonaut/class_argonautMirrorConfig.inc:73
 msgid "Proxy"
 msgstr "Servidor intermediari"
 
-#: admin/systems/services/argonaut/class_argonautMirrorConfig.inc:67
-msgid "Specifies the http proxy (like Squid) to use for http and hftp method"
+#: admin/systems/services/argonaut/class_argonautMirrorConfig.inc:84
+msgid "Errors"
 msgstr ""
 
-#: admin/systems/services/argonaut/class_argonautMirrorConfig.inc:71
-msgid "Directory in which logs should be stored"
-msgstr ""
-
-#: admin/systems/services/argonaut/class_argonautMirrorConfig.inc:76
-msgid "Ignore errors"
-msgstr ""
-
-#: admin/systems/services/argonaut/class_argonautMirrorConfig.inc:77
-msgid ""
-"Causes debmirror to ignore missing or broken deb and source files but still "
-"be pedantic about checking meta files"
-msgstr ""
-
-#: admin/systems/services/argonaut/class_argonautMirrorConfig.inc:82
+#: admin/systems/services/argonaut/class_argonautMirrorConfig.inc:91
 msgid "Source"
 msgstr ""
 
-#: admin/systems/services/argonaut/class_argonautMirrorConfig.inc:82
-msgid "Include source in the mirror"
-msgstr ""
-
-#: admin/systems/services/argonaut/class_argonautMirrorConfig.inc:87
+#: admin/systems/services/argonaut/class_argonautMirrorConfig.inc:98
 msgid "GPG Check"
 msgstr ""
 
-#: admin/systems/services/argonaut/class_argonautMirrorConfig.inc:87
-msgid "Fail if the Release.gpg file is missing"
-msgstr ""
-
-#: admin/systems/services/argonaut/class_argonautMirrorConfig.inc:92
+#: admin/systems/services/argonaut/class_argonautMirrorConfig.inc:105
 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 ""
-
-#: admin/systems/services/argonaut/class_argonautMirrorConfig.inc:98
+#: admin/systems/services/argonaut/class_argonautMirrorConfig.inc:112
 msgid "Verbose"
 msgstr ""
 
-#: admin/systems/services/argonaut/class_argonautMirrorConfig.inc:98
+#: admin/systems/services/argonaut/class_argonautMirrorConfig.inc:113
 msgid "Wether to activate verbose mode"
 msgstr ""
 
@@ -398,9 +371,9 @@ msgid "LTSP server"
 msgstr ""
 
 #: addons/argonaut/class_filterArgonautEvents.inc:40
-#: addons/argonaut/class_argonautQueue.inc:160
-#: addons/argonaut/class_argonautQueue.inc:260
-#: addons/argonaut/class_argonautQueue.inc:335
+#: addons/argonaut/class_argonautQueue.inc:193
+#: addons/argonaut/class_argonautQueue.inc:307
+#: addons/argonaut/class_argonautQueue.inc:398
 msgid "Error"
 msgstr "Error"
 
@@ -412,8 +385,7 @@ msgstr ""
 #: addons/argonaut/class_argonautImportFile.inc:44
 #: addons/argonaut/class_argonautImportFile.inc:100
 #: addons/argonaut/class_argonautImportFile.inc:141
-#: addons/argonaut/deploy-list.xml:79
-#: addons/argonaut/argonaut_import_file.tpl.c:68
+#: addons/argonaut/deploy-list.xml:99
 msgid "Import"
 msgstr ""
 
@@ -427,7 +399,8 @@ msgid ""
 msgstr ""
 
 #: addons/argonaut/class_argonautImportFile.inc:134
-msgid "Infrastructure service"
+#: addons/argonaut/class_argonautQueue.inc:350
+msgid "Service infrastructure"
 msgstr ""
 
 #: addons/argonaut/class_argonautImportFile.inc:141
@@ -436,84 +409,82 @@ msgid "Import complete: %s events successfully send, %s failed"
 msgstr ""
 
 #: addons/argonaut/class_argonautImportFile.inc:177
-#: addons/argonaut/argonaut_import_file.tpl.c:47
 msgid "MAC"
 msgstr ""
 
 #: addons/argonaut/class_argonautImportFile.inc:180
 #: addons/argonaut/deploy-list.xml:14
-#: addons/argonaut/argonaut_import_file.tpl.c:50
 msgid "Event"
 msgstr ""
 
-#: addons/argonaut/class_argonautQueue.inc:35
-#: addons/argonaut/class_argonautQueue.inc:41
+#: addons/argonaut/class_argonautQueue.inc:39
+#: addons/argonaut/class_argonautQueue.inc:45
 msgid "Deployment queue"
 msgstr ""
 
-#: addons/argonaut/class_argonautQueue.inc:36
+#: addons/argonaut/class_argonautQueue.inc:40
 msgid "Provide a mechanism to automatically activate systems"
 msgstr ""
 
-#: addons/argonaut/class_argonautQueue.inc:43
+#: addons/argonaut/class_argonautQueue.inc:47
 #: addons/argonaut/events/eventTargetSystems-list.xml:81
 msgid "Description"
 msgstr ""
 
-#: addons/argonaut/class_argonautQueue.inc:141
+#: addons/argonaut/class_argonautQueue.inc:174
 msgid "immediately"
 msgstr ""
 
-#: addons/argonaut/class_argonautQueue.inc:156
+#: addons/argonaut/class_argonautQueue.inc:189
 msgid "Waiting"
 msgstr ""
 
-#: addons/argonaut/class_argonautQueue.inc:159
+#: addons/argonaut/class_argonautQueue.inc:192
 msgid "Show error"
 msgstr ""
 
-#: addons/argonaut/class_argonautQueue.inc:163
+#: addons/argonaut/class_argonautQueue.inc:196
 msgid "Processed"
 msgstr ""
 
-#: addons/argonaut/class_argonautQueue.inc:172
+#: addons/argonaut/class_argonautQueue.inc:205
 msgid "in progress"
 msgstr ""
 
-#: addons/argonaut/class_argonautQueue.inc:180
+#: addons/argonaut/class_argonautQueue.inc:226
 msgid "Permission"
 msgstr ""
 
-#: addons/argonaut/class_argonautQueue.inc:210
+#: addons/argonaut/class_argonautQueue.inc:256
 #: addons/argonaut/events/class_DaemonEvent.inc:258
-#: addons/argonaut/deploy-list.xml:86 addons/argonaut/deploy-list.xml:136
+#: addons/argonaut/deploy-list.xml:106 addons/argonaut/deploy-list.xml:166
 msgid "Remove"
 msgstr ""
 
-#: addons/argonaut/class_argonautQueue.inc:211
+#: addons/argonaut/class_argonautQueue.inc:257
 #, php-format
 msgid "The following jobs couldn't be deleted, they have to be aborted: %s"
 msgstr ""
 
-#: addons/argonaut/class_argonautQueue.inc:257
+#: addons/argonaut/class_argonautQueue.inc:304
 msgid "Info"
 msgstr ""
 
-#: addons/argonaut/class_argonautQueue.inc:257
+#: addons/argonaut/class_argonautQueue.inc:304
 #, php-format
 msgid "%s"
 msgstr ""
 
-#: addons/argonaut/class_argonautQueue.inc:261
+#: addons/argonaut/class_argonautQueue.inc:308
 #, php-format
 msgid "Required class '%s' cannot be found: job not aborted!"
 msgstr ""
 
-#: addons/argonaut/class_argonautQueue.inc:293
+#: addons/argonaut/class_argonautQueue.inc:340
 msgid "Error detail"
 msgstr ""
 
-#: addons/argonaut/class_argonautQueue.inc:335
+#: addons/argonaut/class_argonautQueue.inc:398
 #, php-format
 msgid "Cannot update queue entries."
 msgstr ""
@@ -588,17 +559,15 @@ msgid "Winstation"
 msgstr ""
 
 #: addons/argonaut/events/eventTargetSystems-list.xml:47
-#: addons/argonaut/argonaut_import_file.tpl.c:53
 msgid "Object group"
 msgstr ""
 
 #: addons/argonaut/events/eventTargetSystems-list.xml:73
-#: addons/argonaut/events/eventTargetSystems-filter.tpl.c:20
+#: addons/argonaut/deploy-list.xml:36
 msgid "Name"
 msgstr "Nom"
 
 #: addons/argonaut/events/eventTargetSystems-list.xml:89
-#: addons/argonaut/argonaut_import_file.tpl.c:62
 msgid "IP"
 msgstr ""
 
@@ -611,48 +580,53 @@ msgid "List of queued jobs"
 msgstr ""
 
 #: addons/argonaut/deploy-list.xml:27
-#: addons/argonaut/events/DaemonEvent.tpl.c:17
 msgid "Target"
 msgstr ""
 
-#: addons/argonaut/deploy-list.xml:35
+#: addons/argonaut/deploy-list.xml:45
 msgid "Task"
 msgstr ""
 
-#: addons/argonaut/deploy-list.xml:43
+#: addons/argonaut/deploy-list.xml:53
 msgid "Period"
 msgstr ""
 
-#: addons/argonaut/deploy-list.xml:51
-#: addons/argonaut/events/DaemonEvent.tpl.c:2
+#: addons/argonaut/deploy-list.xml:61
 msgid "Schedule"
 msgstr ""
 
-#: addons/argonaut/deploy-list.xml:59
-#: addons/argonaut/events/DaemonEvent.tpl.c:11
+#: addons/argonaut/deploy-list.xml:69
 msgid "Status"
 msgstr ""
 
-#: addons/argonaut/deploy-list.xml:67
+#: addons/argonaut/deploy-list.xml:77
 msgid "Actions"
 msgstr ""
 
-#: addons/argonaut/deploy-list.xml:97 addons/argonaut/deploy-list.xml:144
+#: addons/argonaut/deploy-list.xml:88
+msgid "Create"
+msgstr ""
+
+#: addons/argonaut/deploy-list.xml:117 addons/argonaut/deploy-list.xml:174
 msgid "Abort"
 msgstr ""
 
-#: addons/argonaut/deploy-list.xml:108
+#: addons/argonaut/deploy-list.xml:128
 msgid "Execute"
 msgstr ""
 
-#: addons/argonaut/deploy-list.xml:120
+#: addons/argonaut/deploy-list.xml:140
 msgid "Process now"
 msgstr ""
 
-#: addons/argonaut/deploy-list.xml:128
+#: addons/argonaut/deploy-list.xml:148
 msgid "View logs"
 msgstr ""
 
+#: addons/argonaut/deploy-list.xml:157
+msgid "Edit"
+msgstr ""
+
 #: include/class_supportDaemon.inc:89
 msgid "Multiple argonaut server found. Only one is supported"
 msgstr ""
@@ -670,162 +644,3 @@ msgstr ""
 #, php-format
 msgid "\"%s\" is not a file!"
 msgstr ""
-
-#: addons/argonaut/argonaut_import_file.tpl.c:2
-msgid "Import jobs"
-msgstr ""
-
-#: addons/argonaut/argonaut_import_file.tpl.c:5
-msgid ""
-"You can import a list of jobs into the FusionDirectory job queue. This "
-"should be a semicolon seperated list of items in the following format:"
-msgstr ""
-
-#: addons/argonaut/argonaut_import_file.tpl.c:8
-msgid "timestamp"
-msgstr ""
-
-#: addons/argonaut/argonaut_import_file.tpl.c:11
-msgid "MAC-address"
-msgstr ""
-
-#: addons/argonaut/argonaut_import_file.tpl.c:14
-msgid "job type"
-msgstr ""
-
-#: addons/argonaut/argonaut_import_file.tpl.c:17
-msgid "object group"
-msgstr ""
-
-#: addons/argonaut/argonaut_import_file.tpl.c:20
-msgid "import base"
-msgstr ""
-
-#: addons/argonaut/argonaut_import_file.tpl.c:23
-msgid "full hostname"
-msgstr ""
-
-#: addons/argonaut/argonaut_import_file.tpl.c:26
-msgid "IP-address"
-msgstr ""
-
-#: addons/argonaut/argonaut_import_file.tpl.c:29
-msgid "DHCP group"
-msgstr ""
-
-#: addons/argonaut/argonaut_import_file.tpl.c:32
-msgid "Example"
-msgstr ""
-
-#: addons/argonaut/argonaut_import_file.tpl.c:35
-msgid "Select list to import"
-msgstr ""
-
-#: addons/argonaut/argonaut_import_file.tpl.c:38
-msgid "Browse"
-msgstr ""
-
-#: addons/argonaut/argonaut_import_file.tpl.c:41
-msgid "Upload"
-msgstr ""
-
-#: addons/argonaut/argonaut_import_file.tpl.c:44
-#: addons/argonaut/events/DaemonEvent.tpl.c:20
-msgid "Timestamp"
-msgstr "Marca de temps"
-
-#: addons/argonaut/argonaut_import_file.tpl.c:56
-msgid "Base"
-msgstr "Base"
-
-#: addons/argonaut/argonaut_import_file.tpl.c:59
-msgid "FQDN"
-msgstr ""
-
-#: addons/argonaut/argonaut_import_file.tpl.c:65
-msgid "DHCP"
-msgstr ""
-
-#: addons/argonaut/events/target_list.tpl.c:2
-msgid "Apply"
-msgstr "Aplica"
-
-#: addons/argonaut/events/target_list.tpl.c:5
-msgid "Cancel"
-msgstr "CanceÅ€la"
-
-#: addons/argonaut/events/DaemonEvent.tpl.c:5
-msgid "System list"
-msgstr ""
-
-#: addons/argonaut/events/DaemonEvent.tpl.c:8
-msgid "ID"
-msgstr ""
-
-#: addons/argonaut/events/DaemonEvent.tpl.c:14
-msgid "Result"
-msgstr ""
-
-#: addons/argonaut/events/eventTargetSystems-filter.tpl.c:2
-msgid "Filter"
-msgstr ""
-
-#: addons/argonaut/events/eventTargetSystems-filter.tpl.c:5
-msgid "Show servers"
-msgstr ""
-
-#: addons/argonaut/events/eventTargetSystems-filter.tpl.c:8
-msgid "Show workstations"
-msgstr ""
-
-#: addons/argonaut/events/eventTargetSystems-filter.tpl.c:11
-msgid "Show terminals"
-msgstr ""
-
-#: addons/argonaut/events/eventTargetSystems-filter.tpl.c:14
-msgid "Show winstations"
-msgstr ""
-
-#: addons/argonaut/events/eventTargetSystems-filter.tpl.c:17
-msgid "Filter by IP address range"
-msgstr ""
-
-#: addons/argonaut/events/timestamp_select.tpl.c:2
-msgid "Year"
-msgstr ""
-
-#: addons/argonaut/events/timestamp_select.tpl.c:5
-msgid "Month"
-msgstr ""
-
-#: addons/argonaut/events/timestamp_select.tpl.c:8
-msgid "Day"
-msgstr ""
-
-#: addons/argonaut/events/timestamp_select.tpl.c:11
-msgid "Hour"
-msgstr ""
-
-#: addons/argonaut/events/timestamp_select.tpl.c:14
-msgid "Minute"
-msgstr ""
-
-#: addons/argonaut/events/timestamp_select.tpl.c:17
-msgid "Second"
-msgstr ""
-
-#: addons/argonaut/events/timestamp_select.tpl.c:20
-msgid "Periodical job"
-msgstr ""
-
-#: addons/argonaut/events/timestamp_select.tpl.c:23
-msgid "Job intervall"
-msgstr ""
-
-#: addons/argonaut/remove.tpl.c:2
-msgid "Warning"
-msgstr "AvÃs"
-
-#: addons/argonaut/remove.tpl.c:5
-msgid "So - if you're sure - press 'Delete' to continue or 'Cancel' to abort."
-msgstr ""
diff --git a/argonaut/locale/cs_CZ/fusiondirectory.po b/argonaut/locale/cs_CZ/fusiondirectory.po
index 3fbe055428e79c51a7c0574fa237d694b947c34d..5e75be10813373742bac9d7cbe975e9b473217cc 100644
--- a/argonaut/locale/cs_CZ/fusiondirectory.po
+++ b/argonaut/locale/cs_CZ/fusiondirectory.po
@@ -3,15 +3,15 @@
 # This file is distributed under the same license as the PACKAGE package.
 # 
 # Translators:
-# Pavel Borecki <pavel.borecki@gmail.com>, 2015
+# Pavel Borecki <pavel.borecki@gmail.com>, 2014-2015
 msgid ""
 msgstr ""
-"Project-Id-Version: FusionDirectory-108\n"
+"Project-Id-Version: FusionDirectory-109\n"
 "Report-Msgid-Bugs-To: documentation@lists.fusiondirectory.org\n"
-"POT-Creation-Date: 2015-03-31 11:49+0200\n"
-"PO-Revision-Date: 2015-03-31 11:51+0000\n"
+"POT-Creation-Date: 2014-12-15 17:47+0100\n"
+"PO-Revision-Date: 2015-04-08 08:42+0000\n"
 "Last-Translator: Pavel Borecki <pavel.borecki@gmail.com>\n"
-"Language-Team: Czech (Czech Republic) (http://www.transifex.com/projects/p/FusionDirectory-108/language/cs_CZ/)\n"
+"Language-Team: Czech (Czech Republic) (http://www.transifex.com/projects/p/FusionDirectory-109/language/cs_CZ/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -20,7 +20,7 @@ msgstr ""
 
 #: admin/systems/argonaut/class_argonautClient.inc:117
 msgid "Argonaut client settings"
-msgstr "nastavenÃ Argonaut klienta"
+msgstr "NastavenÃ Argonaut klienta"
 
 #: admin/systems/argonaut/class_argonautClient.inc:120
 msgid "Client port"
@@ -44,18 +44,18 @@ msgstr "TaskId soubor"
 
 #: admin/systems/argonaut/class_argonautClient.inc:130
 msgid "File which argonaut will use to store its task id when booting"
-msgstr "Soubor, kterÃ½ bude argonaut pouÅ¾Ãvat pro uklÃ¡dÃ¡nÃ identifikÃ¡torÅ¯ svÃ½ch Ãºloh pÅ™i zavÃ¡dÄ›nÃ systÃ©mu"
+msgstr "Soubor, kterÃ½ bude argonaut pouÅ¾Ãvat pro uklÃ¡dÃ¡nÃ identifikÃ¡torÅ¯ svÃ½ch Ãºloh pÅ™i spouÅ¡tÄ›nÃ"
 
 #: admin/systems/argonaut/class_argonautClient.inc:135
 #: admin/systems/services/argonaut/class_argonautFuseConfig.inc:56
-#: admin/systems/services/argonaut/class_argonautMirrorConfig.inc:71
+#: admin/systems/services/argonaut/class_argonautMirrorConfig.inc:79
 #: admin/systems/services/argonaut/class_argonautServer.inc:79
 msgid "Log directory"
-msgstr "sloÅ¾ka pro protokolovacÃ zÃ¡znamy"
+msgstr "SloÅ¾ka pro protokoly"
 
 #: admin/systems/argonaut/class_argonautClient.inc:135
 msgid "Directory in which argonaut client should write its logs"
-msgstr "SloÅ¾ka, do kterÃ© by argonaut klient mÄ›l zapisovat svÃ© zÃ¡znamy protokolu"
+msgstr "SloÅ¾ka, do kterÃ© by argonaut klient mÄ›l zapisovat svÃ© protokoly"
 
 #: admin/systems/argonaut/class_argonautClient.inc:142
 msgid "Service names"
@@ -79,13 +79,14 @@ msgid "Argonaut Fuse settings"
 msgstr "NastavenÃ Argonaut Fuse"
 
 #: admin/systems/services/argonaut/class_argonautFuseConfig.inc:32
+#: admin/systems/services/argonaut/class_argonautMirrorConfig.inc:32
 #: 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"
+msgstr "SluÅ¾by"
 
 #: admin/systems/services/argonaut/class_argonautFuseConfig.inc:46
 msgid "Basic settings"
@@ -93,7 +94,7 @@ msgstr "ZÃ¡kladnÃ nastavenÃ"
 
 #: admin/systems/services/argonaut/class_argonautFuseConfig.inc:49
 msgid "Default mode"
-msgstr "vÃ½chozÃ reÅ¾im"
+msgstr "VÃ½chozÃ reÅ¾im"
 
 #: admin/systems/services/argonaut/class_argonautFuseConfig.inc:57
 msgid "Directory in which argonaut-fuse will store its log"
@@ -105,94 +106,66 @@ msgstr ""
 
 #: admin/systems/services/argonaut/class_argonautFuseConfig.inc:68
 msgid "Pxelinux cfg path"
-msgstr "cesta k souborÅ¯m s nastavenÃmi pro PXELINUX"
+msgstr "UmÃstÄ›nÃ souborÅ¯ s nastavenÃmi pro PXELINUX"
 
 #: admin/systems/services/argonaut/class_argonautFuseConfig.inc:69
 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"
 
-#: admin/systems/services/argonaut/class_argonautMirrorConfig.inc:29
-#: admin/systems/services/argonaut/class_argonautMirrorConfig.inc:30
+#: admin/systems/services/argonaut/class_argonautMirrorConfig.inc:31
+#: admin/systems/services/argonaut/class_argonautMirrorConfig.inc:32
 msgid "Argonaut Mirror settings"
 msgstr "NastavenÃ zrcadla Argonaut"
 
-#: admin/systems/services/argonaut/class_argonautMirrorConfig.inc:41
+#: admin/systems/services/argonaut/class_argonautMirrorConfig.inc:46
 msgid "Argonaut mirror settings"
-msgstr "nastavenÃ zrcadla Argonautu"
+msgstr "NastavenÃ zrcadla Argonautu"
 
-#: admin/systems/services/argonaut/class_argonautMirrorConfig.inc:44
-msgid "Local Debian mirror directory"
-msgstr "SloÅ¾ka mÃstnÃho repozitÃ¡Å™e distribuce Debian"
+#: admin/systems/services/argonaut/class_argonautMirrorConfig.inc:49
+msgid "Local debian mirror directory"
+msgstr "sloÅ¾ka s mÃstnÃm zrcadlem repozitÃ¡Å™e Debianu"
 
-#: admin/systems/services/argonaut/class_argonautMirrorConfig.inc:52
+#: admin/systems/services/argonaut/class_argonautMirrorConfig.inc:58
 msgid "Argonaut Debconf Crawler configuration"
 msgstr "NastavenÃ pro Argonaut Debconf Crawler"
 
-#: admin/systems/services/argonaut/class_argonautMirrorConfig.inc:55
+#: admin/systems/services/argonaut/class_argonautMirrorConfig.inc:61
 msgid "Local packages folder"
-msgstr "mÃstnÃ sloÅ¾ka s balÃÄky"
+msgstr "SloÅ¾ka s mÃstnÃmi balÃÄky"
 
-#: admin/systems/services/argonaut/class_argonautMirrorConfig.inc:56
+#: admin/systems/services/argonaut/class_argonautMirrorConfig.inc:62
 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"
 
-#: admin/systems/services/argonaut/class_argonautMirrorConfig.inc:63
+#: admin/systems/services/argonaut/class_argonautMirrorConfig.inc:70
 msgid "Argonaut Repository configuration"
 msgstr "NastavenÃ repozitÃ¡Å™e Argonaut"
 
-#: admin/systems/services/argonaut/class_argonautMirrorConfig.inc:66
+#: admin/systems/services/argonaut/class_argonautMirrorConfig.inc:73
 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 ""
-
-#: admin/systems/services/argonaut/class_argonautMirrorConfig.inc:71
-msgid "Directory in which logs should be stored"
-msgstr "SloÅ¾ka pro uklÃ¡dÃ¡nÃ protokolÅ¯"
-
-#: admin/systems/services/argonaut/class_argonautMirrorConfig.inc:76
-msgid "Ignore errors"
-msgstr "NevÅ¡Ãmat si chyb"
+#: admin/systems/services/argonaut/class_argonautMirrorConfig.inc:84
+msgid "Errors"
+msgstr "Chyby"
 
-#: admin/systems/services/argonaut/class_argonautMirrorConfig.inc:77
-msgid ""
-"Causes debmirror to ignore missing or broken deb and source files but still "
-"be pedantic about checking meta files"
-msgstr ""
-
-#: admin/systems/services/argonaut/class_argonautMirrorConfig.inc:82
+#: admin/systems/services/argonaut/class_argonautMirrorConfig.inc:91
 msgid "Source"
-msgstr "zdroj"
-
-#: admin/systems/services/argonaut/class_argonautMirrorConfig.inc:82
-msgid "Include source in the mirror"
-msgstr "Zahrnout v zrcadlu zdrojovÃ© kÃ³dy"
+msgstr "Zdroj"
 
-#: admin/systems/services/argonaut/class_argonautMirrorConfig.inc:87
+#: admin/systems/services/argonaut/class_argonautMirrorConfig.inc:98
 msgid "GPG Check"
-msgstr "kontrola GPG"
-
-#: admin/systems/services/argonaut/class_argonautMirrorConfig.inc:87
-msgid "Fail if the Release.gpg file is missing"
-msgstr "VyhlÃ¡sit neÃºspÄ›ch v pÅ™ÃpadÄ›, Å¾e chybÃ soubor Release.gpg"
+msgstr "Kontrola GPG"
 
-#: admin/systems/services/argonaut/class_argonautMirrorConfig.inc:92
+#: admin/systems/services/argonaut/class_argonautMirrorConfig.inc:105
 msgid "Contents"
-msgstr "Obsahuje"
+msgstr "Obsah"
 
-#: 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
+#: admin/systems/services/argonaut/class_argonautMirrorConfig.inc:112
 msgid "Verbose"
-msgstr "poskytovat podrobnÄ›jÅ¡Ã informace"
+msgstr "Poskytovat podrobnÄ›jÅ¡Ã informace"
 
-#: admin/systems/services/argonaut/class_argonautMirrorConfig.inc:98
+#: admin/systems/services/argonaut/class_argonautMirrorConfig.inc:113
 msgid "Wether to activate verbose mode"
 msgstr "Zda zapnout vÃ½Å™eÄnÄ›jÅ¡Ã reÅ¾im"
 
@@ -203,11 +176,11 @@ msgstr "NastavenÃ Fuse FAI modulu pro Argonaut"
 
 #: admin/systems/services/argonaut/class_argonautFuseFAIConfig.inc:47
 msgid "FAI"
-msgstr ""
+msgstr "FAI"
 
 #: admin/systems/services/argonaut/class_argonautFuseFAIConfig.inc:50
 msgid "Fai flags"
-msgstr "pÅ™Ãznaky FAI"
+msgstr "PÅ™Ãznaky FAI"
 
 #: admin/systems/services/argonaut/class_argonautFuseFAIConfig.inc:57
 msgid "NFS root"
@@ -224,7 +197,7 @@ msgstr "Argonaut server"
 
 #: admin/systems/services/argonaut/class_argonautServer.inc:49
 msgid "Delete finished tasks"
-msgstr "smazat jiÅ¾ dokonÄenÃ© Ãºlohy"
+msgstr "Smazat jiÅ¾ dokonÄenÃ© Ãºlohy"
 
 #: admin/systems/services/argonaut/class_argonautServer.inc:50
 msgid ""
@@ -252,7 +225,7 @@ msgstr "Protokol, kterÃ½ mÃ¡ bÃ½t pouÅ¾ÃvÃ¡n argonaut"
 
 #: admin/systems/services/argonaut/class_argonautServer.inc:66
 msgid "Port"
-msgstr "port"
+msgstr "Port"
 
 #: admin/systems/services/argonaut/class_argonautServer.inc:67
 msgid "Port on which the argonaut server will be listening"
@@ -260,7 +233,7 @@ msgstr "Port, na kterÃ©m bude argonaut server oÄekÃ¡vat spojenÃ"
 
 #: admin/systems/services/argonaut/class_argonautServer.inc:72
 msgid "Timeout"
-msgstr "ÄasovÃ½ limit"
+msgstr "ÄŒasovÃ½ limit"
 
 #: admin/systems/services/argonaut/class_argonautServer.inc:73
 msgid ""
@@ -301,7 +274,7 @@ msgstr "SÃÅ¥ovÃ© rozhranÃ pÅ™es kterÃ© posÃlat poÅ¾adavky na probuzenÃ poÄ
 
 #: admin/systems/services/argonaut/class_argonautServer.inc:106
 msgid "IP tool"
-msgstr "NÃ¡stroj pro IP"
+msgstr "nÃ¡stroj pro IP"
 
 #: admin/systems/services/argonaut/class_argonautServer.inc:106
 msgid "IP tool to use"
@@ -322,7 +295,7 @@ msgstr "ÃºÄet sprÃ¡vce Opsi"
 
 #: admin/systems/services/argonaut/class_argonautFuseOPSIConfig.inc:55
 msgid "Opsi password"
-msgstr "heslo k tomuto ÃºÄtu"
+msgstr "Heslo k Opsi"
 
 #: admin/systems/services/argonaut/class_argonautFuseOPSIConfig.inc:60
 msgid "Opsi server"
@@ -359,7 +332,7 @@ msgstr "SloÅ¾ka, ve kterÃ© je tÅ™eba vytvoÅ™it soubory s Ãºdaji zÃ³n"
 
 #: admin/systems/services/argonaut/class_argonautDNSConfig.inc:64
 msgid "Allow notify"
-msgstr "povolit upozorÅˆovÃ¡nÃ"
+msgstr "Zapnout upozorÅˆovÃ¡nÃ"
 
 #: admin/systems/services/argonaut/class_argonautDNSConfig.inc:70
 msgid "Allow update (semicolon separated and ended)"
@@ -371,7 +344,7 @@ msgstr "povolen pÅ™enos (poloÅ¾ky je tÅ™eba oddÄ›lovat a celÃ½ seznam zakonÄit
 
 #: admin/systems/services/argonaut/class_argonautDNSConfig.inc:82
 msgid "TTL"
-msgstr ""
+msgstr "TTL"
 
 #: admin/systems/services/argonaut/class_argonautDNSConfig.inc:83
 msgid "Time to live"
@@ -396,125 +369,123 @@ msgstr ""
 
 #: admin/systems/services/argonaut/class_argonautFuseLTSPConfig.inc:50
 msgid "LTSP server"
-msgstr "server LTSP (linuxovÃ½ terminÃ¡lovÃ½ server)"
+msgstr "LinuxovÃ½ terminÃ¡lovÃ½ server (LTSP)"
 
 #: addons/argonaut/class_filterArgonautEvents.inc:40
-#: addons/argonaut/class_argonautQueue.inc:160
-#: addons/argonaut/class_argonautQueue.inc:260
-#: addons/argonaut/class_argonautQueue.inc:335
+#: addons/argonaut/class_argonautQueue.inc:193
+#: addons/argonaut/class_argonautQueue.inc:307
+#: addons/argonaut/class_argonautQueue.inc:398
 msgid "Error"
-msgstr "chyba"
+msgstr "Chyba"
 
 #: addons/argonaut/class_filterArgonautEvents.inc:40
 #, php-format
 msgid "Cannot load queue entries: %s"
-msgstr "nelze naÄÃst poloÅ¾ky fronty: %s"
+msgstr "Nelze naÄÃst poloÅ¾ky fronty: %s"
 
 #: addons/argonaut/class_argonautImportFile.inc:44
 #: addons/argonaut/class_argonautImportFile.inc:100
 #: addons/argonaut/class_argonautImportFile.inc:141
-#: addons/argonaut/deploy-list.xml:79
-#: addons/argonaut/argonaut_import_file.tpl.c:68
+#: addons/argonaut/deploy-list.xml:99
 msgid "Import"
 msgstr "import(ovat)"
 
 #: addons/argonaut/class_argonautImportFile.inc:44
 msgid "file is empty"
-msgstr "soubor je prÃ¡zdnÃ½"
+msgstr "Soubor je prÃ¡zdnÃ½"
 
 #: addons/argonaut/class_argonautImportFile.inc:101
 msgid ""
 "Selected entries will be skipped because of errors. Do you want to proceed?"
-msgstr "ZvolenÃ© poloÅ¾ky byly pÅ™eskoÄeny z dÅ¯vodu chyb. Chcete pokraÄovat?"
+msgstr "VybranÃ© poloÅ¾ky byly pÅ™eskoÄeny z dÅ¯vodu chyb. Chcete pokraÄovat?"
 
 #: addons/argonaut/class_argonautImportFile.inc:134
-msgid "Infrastructure service"
-msgstr "SluÅ¾ba infrastruktura"
+#: addons/argonaut/class_argonautQueue.inc:350
+msgid "Service infrastructure"
+msgstr "servisnÃ infrastruktura"
 
 #: addons/argonaut/class_argonautImportFile.inc:141
 #, php-format
 msgid "Import complete: %s events successfully send, %s failed"
-msgstr "importovÃ¡nÃ bylo dokonÄeno: %s udÃ¡lostÃ ÃºspÄ›Å¡nÄ› zaslÃ¡no, %s selhalo"
+msgstr "Import byl dokonÄen: %s udÃ¡lostÃ ÃºspÄ›Å¡nÄ› zaslÃ¡no, %s se nezdaÅ™ilo"
 
 #: addons/argonaut/class_argonautImportFile.inc:177
-#: addons/argonaut/argonaut_import_file.tpl.c:47
 msgid "MAC"
 msgstr ""
 
 #: addons/argonaut/class_argonautImportFile.inc:180
 #: addons/argonaut/deploy-list.xml:14
-#: addons/argonaut/argonaut_import_file.tpl.c:50
 msgid "Event"
-msgstr "udÃ¡lost"
+msgstr "UdÃ¡lost"
 
-#: addons/argonaut/class_argonautQueue.inc:35
-#: addons/argonaut/class_argonautQueue.inc:41
+#: addons/argonaut/class_argonautQueue.inc:39
+#: addons/argonaut/class_argonautQueue.inc:45
 msgid "Deployment queue"
 msgstr "Fronta nasazenÃ"
 
-#: addons/argonaut/class_argonautQueue.inc:36
+#: addons/argonaut/class_argonautQueue.inc:40
 msgid "Provide a mechanism to automatically activate systems"
 msgstr "Poskytuje mechanizmus pro samoÄinnou aktivaci systÃ©mÅ¯"
 
-#: addons/argonaut/class_argonautQueue.inc:43
+#: addons/argonaut/class_argonautQueue.inc:47
 #: addons/argonaut/events/eventTargetSystems-list.xml:81
 msgid "Description"
-msgstr "popis"
+msgstr "Popis"
 
-#: addons/argonaut/class_argonautQueue.inc:141
+#: addons/argonaut/class_argonautQueue.inc:174
 msgid "immediately"
-msgstr "OkamÅ¾itÄ›"
+msgstr "okamÅ¾itÄ›"
 
-#: addons/argonaut/class_argonautQueue.inc:156
+#: addons/argonaut/class_argonautQueue.inc:189
 msgid "Waiting"
-msgstr "ÄekÃ¡nÃ"
+msgstr "ÄŒekajÃcÃ"
 
-#: addons/argonaut/class_argonautQueue.inc:159
+#: addons/argonaut/class_argonautQueue.inc:192
 msgid "Show error"
-msgstr "zobrazit chybu"
+msgstr "Zobrazit chybu"
 
-#: addons/argonaut/class_argonautQueue.inc:163
+#: addons/argonaut/class_argonautQueue.inc:196
 msgid "Processed"
-msgstr "zpracovanÃ©"
+msgstr "ZpracovanÃ©"
 
-#: addons/argonaut/class_argonautQueue.inc:172
+#: addons/argonaut/class_argonautQueue.inc:205
 msgid "in progress"
 msgstr "probÃhÃ¡"
 
-#: addons/argonaut/class_argonautQueue.inc:180
+#: addons/argonaut/class_argonautQueue.inc:226
 msgid "Permission"
-msgstr "oprÃ¡vnÄ›nÃ"
+msgstr "OprÃ¡vnÄ›nÃ"
 
-#: addons/argonaut/class_argonautQueue.inc:210
+#: addons/argonaut/class_argonautQueue.inc:256
 #: addons/argonaut/events/class_DaemonEvent.inc:258
-#: addons/argonaut/deploy-list.xml:86 addons/argonaut/deploy-list.xml:136
+#: addons/argonaut/deploy-list.xml:106 addons/argonaut/deploy-list.xml:166
 msgid "Remove"
-msgstr "odebrat"
+msgstr "Odstranit"
 
-#: addons/argonaut/class_argonautQueue.inc:211
+#: addons/argonaut/class_argonautQueue.inc:257
 #, 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"
 
-#: addons/argonaut/class_argonautQueue.inc:257
+#: addons/argonaut/class_argonautQueue.inc:304
 msgid "Info"
 msgstr "Informace"
 
-#: addons/argonaut/class_argonautQueue.inc:257
+#: addons/argonaut/class_argonautQueue.inc:304
 #, php-format
 msgid "%s"
 msgstr ""
 
-#: addons/argonaut/class_argonautQueue.inc:261
+#: addons/argonaut/class_argonautQueue.inc:308
 #, php-format
 msgid "Required class '%s' cannot be found: job not aborted!"
 msgstr "PotÅ™ebnou tÅ™Ãdu %s nelze nalÃ©zt: Ãºloha nebyla pÅ™eruÅ¡ena!"
 
-#: addons/argonaut/class_argonautQueue.inc:293
+#: addons/argonaut/class_argonautQueue.inc:340
 msgid "Error detail"
-msgstr "podrobnosti chyby"
+msgstr "Podrobnosti chyby"
 
-#: addons/argonaut/class_argonautQueue.inc:335
+#: addons/argonaut/class_argonautQueue.inc:398
 #, php-format
 msgid "Cannot update queue entries."
 msgstr "Nelze aktualizovat poloÅ¾ky fronty."
@@ -522,7 +493,7 @@ msgstr "Nelze aktualizovat poloÅ¾ky fronty."
 #: addons/argonaut/events/class_DaemonEvent.inc:149
 #, php-format
 msgid "Create '%s' job"
-msgstr "vytvoÅ™it Ãºlohu '%s'"
+msgstr "VytvoÅ™it Ãºlohu %s"
 
 #: addons/argonaut/events/class_DaemonEvent.inc:220
 msgid "Minutes"
@@ -530,7 +501,7 @@ msgstr "minuty"
 
 #: addons/argonaut/events/class_DaemonEvent.inc:221
 msgid "Hours"
-msgstr "hodiny"
+msgstr "Hodiny"
 
 #: addons/argonaut/events/class_DaemonEvent.inc:222
 msgid "Days"
@@ -546,15 +517,15 @@ msgstr "mÄ›sÃce"
 
 #: addons/argonaut/events/class_DaemonEvent.inc:262
 msgid "Add"
-msgstr "pÅ™idat"
+msgstr "PÅ™idat"
 
 #: addons/argonaut/events/class_DaemonEvent.inc:408
 msgid "Switch off"
-msgstr "vypnout"
+msgstr "Vypnout"
 
 #: addons/argonaut/events/class_DaemonEvent.inc:412
 msgid "Reboot"
-msgstr "restartartovat"
+msgstr "Restartovat"
 
 #: addons/argonaut/events/class_DaemonEvent.inc:416
 msgid "Wake up"
@@ -562,7 +533,7 @@ msgstr "zapnout na dÃ¡lku"
 
 #: addons/argonaut/events/class_DaemonEvent.inc:420
 msgid "Software update"
-msgstr "aktualizace softwaru"
+msgstr "Aktualizace programovÃ©ho vybavenÃ"
 
 #: addons/argonaut/events/class_DaemonEvent.inc:424
 msgid "(Re)Install"
@@ -570,36 +541,34 @@ msgstr "(PÅ™e)Instalovat"
 
 #: addons/argonaut/events/eventTargetSystems-list.xml:11
 msgid "List of target systems"
-msgstr "seznam cÃlovÃ½ch systÃ©mÅ¯"
+msgstr "Seznam cÃlovÃ½ch systÃ©mÅ¯"
 
 #: addons/argonaut/events/eventTargetSystems-list.xml:15
 msgid "Server"
-msgstr "server"
+msgstr "Server"
 
 #: addons/argonaut/events/eventTargetSystems-list.xml:23
 msgid "Workstation"
-msgstr "pracovnÃ stanice"
+msgstr "PoÄÃtaÄ"
 
 #: addons/argonaut/events/eventTargetSystems-list.xml:31
 msgid "Terminal"
-msgstr "terminÃ¡l"
+msgstr "TerminÃ¡l"
 
 #: addons/argonaut/events/eventTargetSystems-list.xml:39
 msgid "Winstation"
-msgstr "pracovnÃ stanice s OS MS Windows"
+msgstr "PoÄÃtaÄ s MS Windows"
 
 #: addons/argonaut/events/eventTargetSystems-list.xml:47
-#: addons/argonaut/argonaut_import_file.tpl.c:53
 msgid "Object group"
-msgstr "skupina objektu"
+msgstr "Skupina objektu"
 
 #: addons/argonaut/events/eventTargetSystems-list.xml:73
-#: addons/argonaut/events/eventTargetSystems-filter.tpl.c:20
+#: addons/argonaut/deploy-list.xml:36
 msgid "Name"
-msgstr "nÃ¡zev"
+msgstr "NÃ¡zev"
 
 #: addons/argonaut/events/eventTargetSystems-list.xml:89
-#: addons/argonaut/argonaut_import_file.tpl.c:62
 msgid "IP"
 msgstr ""
 
@@ -609,50 +578,55 @@ msgstr ""
 
 #: addons/argonaut/deploy-list.xml:10
 msgid "List of queued jobs"
-msgstr "seznam Ãºloh ve frontÄ›"
+msgstr "Seznam Ãºloh ve frontÄ›"
 
 #: addons/argonaut/deploy-list.xml:27
-#: addons/argonaut/events/DaemonEvent.tpl.c:17
 msgid "Target"
-msgstr "cÃl"
+msgstr "CÃl"
 
-#: addons/argonaut/deploy-list.xml:35
+#: addons/argonaut/deploy-list.xml:45
 msgid "Task"
-msgstr "Ãºkol"
+msgstr "Ãškol"
 
-#: addons/argonaut/deploy-list.xml:43
+#: addons/argonaut/deploy-list.xml:53
 msgid "Period"
-msgstr "interval"
+msgstr "ObdobÃ"
 
-#: addons/argonaut/deploy-list.xml:51
-#: addons/argonaut/events/DaemonEvent.tpl.c:2
+#: addons/argonaut/deploy-list.xml:61
 msgid "Schedule"
 msgstr "PlÃ¡n"
 
-#: addons/argonaut/deploy-list.xml:59
-#: addons/argonaut/events/DaemonEvent.tpl.c:11
+#: addons/argonaut/deploy-list.xml:69
 msgid "Status"
-msgstr "stav"
+msgstr "Stav"
 
-#: addons/argonaut/deploy-list.xml:67
+#: addons/argonaut/deploy-list.xml:77
 msgid "Actions"
-msgstr "akce"
+msgstr "Akce"
 
-#: addons/argonaut/deploy-list.xml:97 addons/argonaut/deploy-list.xml:144
+#: addons/argonaut/deploy-list.xml:88
+msgid "Create"
+msgstr "VytvoÅ™it"
+
+#: addons/argonaut/deploy-list.xml:117 addons/argonaut/deploy-list.xml:174
 msgid "Abort"
-msgstr "pÅ™eruÅ¡it"
+msgstr "PÅ™eruÅ¡it"
 
-#: addons/argonaut/deploy-list.xml:108
+#: addons/argonaut/deploy-list.xml:128
 msgid "Execute"
-msgstr "spustit"
+msgstr "Spustit"
 
-#: addons/argonaut/deploy-list.xml:120
+#: addons/argonaut/deploy-list.xml:140
 msgid "Process now"
-msgstr "zpracovat nynÃ"
+msgstr "Zpracovat nynÃ"
 
-#: addons/argonaut/deploy-list.xml:128
+#: addons/argonaut/deploy-list.xml:148
 msgid "View logs"
-msgstr "Zobrazit provoznÃ zÃ¡znamy"
+msgstr "Zobrazit protokoly"
+
+#: addons/argonaut/deploy-list.xml:157
+msgid "Edit"
+msgstr "Upravit"
 
 #: include/class_supportDaemon.inc:89
 msgid "Multiple argonaut server found. Only one is supported"
@@ -671,162 +645,3 @@ msgstr "Nelze naÄÃst %s!"
 #, php-format
 msgid "\"%s\" is not a file!"
 msgstr "%s nenÃ soubor!"
-
-#: addons/argonaut/argonaut_import_file.tpl.c:2
-msgid "Import jobs"
-msgstr "importovat Ãºlohy"
-
-#: addons/argonaut/argonaut_import_file.tpl.c:5
-msgid ""
-"You can import a list of jobs into the FusionDirectory job queue. This "
-"should be a semicolon seperated list of items in the following format:"
-msgstr ""
-
-#: addons/argonaut/argonaut_import_file.tpl.c:8
-msgid "timestamp"
-msgstr "ÄasovÃ© razÃtko (timestamp)"
-
-#: addons/argonaut/argonaut_import_file.tpl.c:11
-msgid "MAC-address"
-msgstr "MAC adresa"
-
-#: addons/argonaut/argonaut_import_file.tpl.c:14
-msgid "job type"
-msgstr "typ Ãºlohy"
-
-#: addons/argonaut/argonaut_import_file.tpl.c:17
-msgid "object group"
-msgstr "skupina objektu"
-
-#: addons/argonaut/argonaut_import_file.tpl.c:20
-msgid "import base"
-msgstr "ZÃ¡klad importu"
-
-#: addons/argonaut/argonaut_import_file.tpl.c:23
-msgid "full hostname"
-msgstr "ÃºplnÃ½ nÃ¡zev poÄÃtaÄe"
-
-#: addons/argonaut/argonaut_import_file.tpl.c:26
-msgid "IP-address"
-msgstr "IP adresa"
-
-#: addons/argonaut/argonaut_import_file.tpl.c:29
-msgid "DHCP group"
-msgstr "skupina DHCP"
-
-#: addons/argonaut/argonaut_import_file.tpl.c:32
-msgid "Example"
-msgstr "ukÃ¡zka"
-
-#: addons/argonaut/argonaut_import_file.tpl.c:35
-msgid "Select list to import"
-msgstr "zvolte seznam, kterÃ½ bude importovÃ¡n"
-
-#: addons/argonaut/argonaut_import_file.tpl.c:38
-msgid "Browse"
-msgstr "prochÃ¡zet"
-
-#: addons/argonaut/argonaut_import_file.tpl.c:41
-msgid "Upload"
-msgstr "nahrÃ¡t"
-
-#: addons/argonaut/argonaut_import_file.tpl.c:44
-#: addons/argonaut/events/DaemonEvent.tpl.c:20
-msgid "Timestamp"
-msgstr "ÄasovÃ¡ znaÄka"
-
-#: addons/argonaut/argonaut_import_file.tpl.c:56
-msgid "Base"
-msgstr "ZÃ¡klad"
-
-#: addons/argonaut/argonaut_import_file.tpl.c:59
-msgid "FQDN"
-msgstr ""
-
-#: addons/argonaut/argonaut_import_file.tpl.c:65
-msgid "DHCP"
-msgstr ""
-
-#: addons/argonaut/events/target_list.tpl.c:2
-msgid "Apply"
-msgstr "pouÅ¾Ãt"
-
-#: addons/argonaut/events/target_list.tpl.c:5
-msgid "Cancel"
-msgstr "zruÅ¡it"
-
-#: addons/argonaut/events/DaemonEvent.tpl.c:5
-msgid "System list"
-msgstr "Seznam systÃ©mÅ¯"
-
-#: addons/argonaut/events/DaemonEvent.tpl.c:8
-msgid "ID"
-msgstr "ID"
-
-#: addons/argonaut/events/DaemonEvent.tpl.c:14
-msgid "Result"
-msgstr "vÃ½sledek"
-
-#: addons/argonaut/events/eventTargetSystems-filter.tpl.c:2
-msgid "Filter"
-msgstr "filtr"
-
-#: addons/argonaut/events/eventTargetSystems-filter.tpl.c:5
-msgid "Show servers"
-msgstr "zobrazit servery"
-
-#: addons/argonaut/events/eventTargetSystems-filter.tpl.c:8
-msgid "Show workstations"
-msgstr "zobrazit pracovnÃ stanice"
-
-#: addons/argonaut/events/eventTargetSystems-filter.tpl.c:11
-msgid "Show terminals"
-msgstr "zobrazit terminÃ¡ly"
-
-#: addons/argonaut/events/eventTargetSystems-filter.tpl.c:14
-msgid "Show winstations"
-msgstr "Zobrazit poÄÃtaÄe se systÃ©mem Windows"
-
-#: addons/argonaut/events/eventTargetSystems-filter.tpl.c:17
-msgid "Filter by IP address range"
-msgstr "filtrovat dle rozsahu IP adres"
-
-#: addons/argonaut/events/timestamp_select.tpl.c:2
-msgid "Year"
-msgstr "rok"
-
-#: addons/argonaut/events/timestamp_select.tpl.c:5
-msgid "Month"
-msgstr "mÄ›sÃc"
-
-#: addons/argonaut/events/timestamp_select.tpl.c:8
-msgid "Day"
-msgstr "den"
-
-#: addons/argonaut/events/timestamp_select.tpl.c:11
-msgid "Hour"
-msgstr "hodina"
-
-#: addons/argonaut/events/timestamp_select.tpl.c:14
-msgid "Minute"
-msgstr "minuta"
-
-#: addons/argonaut/events/timestamp_select.tpl.c:17
-msgid "Second"
-msgstr "vteÅ™ina"
-
-#: addons/argonaut/events/timestamp_select.tpl.c:20
-msgid "Periodical job"
-msgstr "opakovanÃ¡ Ãºloha"
-
-#: addons/argonaut/events/timestamp_select.tpl.c:23
-msgid "Job intervall"
-msgstr "Prodleva Ãºlohy"
-
-#: addons/argonaut/remove.tpl.c:2
-msgid "Warning"
-msgstr "varovÃ¡nÃ"
-
-#: addons/argonaut/remove.tpl.c:5
-msgid "So - if you're sure - press 'Delete' to continue or 'Cancel' to abort."
-msgstr "Tedy â€“ pokud jste si jist(a), stisknÄ›te 'smazat'. V opaÄnÃ©m pÅ™ÃpadÄ› operaci zruÅ¡te pomocÃ 'zruÅ¡it'."
diff --git a/argonaut/locale/de/fusiondirectory.po b/argonaut/locale/de/fusiondirectory.po
index 4190153ee86f9dd3c50d2e4cc725dc5ded9e3a77..e2abc13b4c4440f7d287db6fb9a6b8981820deba 100644
--- a/argonaut/locale/de/fusiondirectory.po
+++ b/argonaut/locale/de/fusiondirectory.po
@@ -3,15 +3,15 @@
 # This file is distributed under the same license as the PACKAGE package.
 # 
 # Translators:
-# Maik Wagner <maikwagner@yahoo.com>, 2013-2014
+# Ettore Atalan <atalanttore@googlemail.com>, 2014
 msgid ""
 msgstr ""
-"Project-Id-Version: FusionDirectory-108\n"
+"Project-Id-Version: FusionDirectory-109\n"
 "Report-Msgid-Bugs-To: documentation@lists.fusiondirectory.org\n"
-"POT-Creation-Date: 2015-03-31 11:49+0200\n"
-"PO-Revision-Date: 2015-03-31 11:41+0000\n"
-"Last-Translator: fusiondirectory <contact@fusiondirectory.org>\n"
-"Language-Team: German (http://www.transifex.com/projects/p/FusionDirectory-108/language/de/)\n"
+"POT-Creation-Date: 2014-12-15 17:47+0100\n"
+"PO-Revision-Date: 2015-02-25 16:13+0000\n"
+"Last-Translator: Ettore Atalan <atalanttore@googlemail.com>\n"
+"Language-Team: German (http://www.transifex.com/projects/p/FusionDirectory-109/language/de/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -48,7 +48,7 @@ msgstr "Datei, die argonaut verwenden wird um seine Task ID wÃ¤hrend des Bootens
 
 #: admin/systems/argonaut/class_argonautClient.inc:135
 #: admin/systems/services/argonaut/class_argonautFuseConfig.inc:56
-#: admin/systems/services/argonaut/class_argonautMirrorConfig.inc:71
+#: admin/systems/services/argonaut/class_argonautMirrorConfig.inc:79
 #: admin/systems/services/argonaut/class_argonautServer.inc:79
 msgid "Log directory"
 msgstr "Log Verzeichnis"
@@ -79,6 +79,7 @@ msgid "Argonaut Fuse settings"
 msgstr "Argonaut Fuse Einstellungen"
 
 #: admin/systems/services/argonaut/class_argonautFuseConfig.inc:32
+#: admin/systems/services/argonaut/class_argonautMirrorConfig.inc:32
 #: admin/systems/services/argonaut/class_argonautFuseFAIConfig.inc:33
 #: admin/systems/services/argonaut/class_argonautServer.inc:32
 #: admin/systems/services/argonaut/class_argonautFuseOPSIConfig.inc:33
@@ -111,88 +112,60 @@ msgstr "Pxelinux cfg Pfad"
 msgid "Path where argonaut-fuse should store pxelinux.cfg"
 msgstr "Pfad wo argonaut-fuse pxelinux.cfg speichern soll"
 
-#: admin/systems/services/argonaut/class_argonautMirrorConfig.inc:29
-#: admin/systems/services/argonaut/class_argonautMirrorConfig.inc:30
+#: admin/systems/services/argonaut/class_argonautMirrorConfig.inc:31
+#: admin/systems/services/argonaut/class_argonautMirrorConfig.inc:32
 msgid "Argonaut Mirror settings"
 msgstr "Argonaut Mirror-Einstellungen"
 
-#: admin/systems/services/argonaut/class_argonautMirrorConfig.inc:41
+#: admin/systems/services/argonaut/class_argonautMirrorConfig.inc:46
 msgid "Argonaut mirror settings"
 msgstr "Argonaut Mirror-Einstellungen"
 
-#: admin/systems/services/argonaut/class_argonautMirrorConfig.inc:44
-msgid "Local Debian mirror directory"
-msgstr ""
+#: admin/systems/services/argonaut/class_argonautMirrorConfig.inc:49
+msgid "Local debian mirror directory"
+msgstr "Lokales Debianmirror-Verzeichnis"
 
-#: admin/systems/services/argonaut/class_argonautMirrorConfig.inc:52
+#: admin/systems/services/argonaut/class_argonautMirrorConfig.inc:58
 msgid "Argonaut Debconf Crawler configuration"
 msgstr "Argonaut Debconf Crawler Konfiguration"
 
-#: admin/systems/services/argonaut/class_argonautMirrorConfig.inc:55
+#: admin/systems/services/argonaut/class_argonautMirrorConfig.inc:61
 msgid "Local packages folder"
 msgstr "Lokale Paketeordner"
 
-#: admin/systems/services/argonaut/class_argonautMirrorConfig.inc:56
+#: admin/systems/services/argonaut/class_argonautMirrorConfig.inc:62
 msgid "Folder in which the crawler will store packages during analysis"
 msgstr "Ordner in dem der Crawler Paket wÃ¤hrend der Analyse speichern wird"
 
-#: admin/systems/services/argonaut/class_argonautMirrorConfig.inc:63
+#: admin/systems/services/argonaut/class_argonautMirrorConfig.inc:70
 msgid "Argonaut Repository configuration"
 msgstr "Argonaut Repository Konfiguration"
 
-#: admin/systems/services/argonaut/class_argonautMirrorConfig.inc:66
+#: admin/systems/services/argonaut/class_argonautMirrorConfig.inc:73
 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 ""
-
-#: admin/systems/services/argonaut/class_argonautMirrorConfig.inc:71
-msgid "Directory in which logs should be stored"
-msgstr ""
-
-#: admin/systems/services/argonaut/class_argonautMirrorConfig.inc:76
-msgid "Ignore errors"
-msgstr ""
-
-#: admin/systems/services/argonaut/class_argonautMirrorConfig.inc:77
-msgid ""
-"Causes debmirror to ignore missing or broken deb and source files but still "
-"be pedantic about checking meta files"
-msgstr ""
+#: admin/systems/services/argonaut/class_argonautMirrorConfig.inc:84
+msgid "Errors"
+msgstr "Fehler"
 
-#: admin/systems/services/argonaut/class_argonautMirrorConfig.inc:82
+#: admin/systems/services/argonaut/class_argonautMirrorConfig.inc:91
 msgid "Source"
 msgstr "Quelle"
 
-#: admin/systems/services/argonaut/class_argonautMirrorConfig.inc:82
-msgid "Include source in the mirror"
-msgstr ""
-
-#: admin/systems/services/argonaut/class_argonautMirrorConfig.inc:87
+#: admin/systems/services/argonaut/class_argonautMirrorConfig.inc:98
 msgid "GPG Check"
 msgstr "GPG Check"
 
-#: 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
+#: admin/systems/services/argonaut/class_argonautMirrorConfig.inc:105
 msgid "Contents"
 msgstr "Inhalt"
 
-#: 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
+#: admin/systems/services/argonaut/class_argonautMirrorConfig.inc:112
 msgid "Verbose"
 msgstr "AusfÃ¼hrlich"
 
-#: admin/systems/services/argonaut/class_argonautMirrorConfig.inc:98
+#: admin/systems/services/argonaut/class_argonautMirrorConfig.inc:113
 msgid "Wether to activate verbose mode"
 msgstr "Ob der verbose-Modus aktiviert werden soll"
 
@@ -399,9 +372,9 @@ msgid "LTSP server"
 msgstr "LTSP Server"
 
 #: addons/argonaut/class_filterArgonautEvents.inc:40
-#: addons/argonaut/class_argonautQueue.inc:160
-#: addons/argonaut/class_argonautQueue.inc:260
-#: addons/argonaut/class_argonautQueue.inc:335
+#: addons/argonaut/class_argonautQueue.inc:193
+#: addons/argonaut/class_argonautQueue.inc:307
+#: addons/argonaut/class_argonautQueue.inc:398
 msgid "Error"
 msgstr "Fehler"
 
@@ -413,8 +386,7 @@ msgstr "Kann WarteschlangeneintrÃ¤ge nicht laden: %s"
 #: addons/argonaut/class_argonautImportFile.inc:44
 #: addons/argonaut/class_argonautImportFile.inc:100
 #: addons/argonaut/class_argonautImportFile.inc:141
-#: addons/argonaut/deploy-list.xml:79
-#: addons/argonaut/argonaut_import_file.tpl.c:68
+#: addons/argonaut/deploy-list.xml:99
 msgid "Import"
 msgstr "Importieren"
 
@@ -428,8 +400,9 @@ msgid ""
 msgstr "Die ausgewÃ¤hlten EintrÃ¤ge sind fehlerhaft und werden nicht berÃ¼cksichtig. MÃ¶chten Sie fortfahren?"
 
 #: addons/argonaut/class_argonautImportFile.inc:134
-msgid "Infrastructure service"
-msgstr ""
+#: addons/argonaut/class_argonautQueue.inc:350
+msgid "Service infrastructure"
+msgstr "Dienst-Infrastruktur"
 
 #: addons/argonaut/class_argonautImportFile.inc:141
 #, php-format
@@ -437,84 +410,82 @@ msgid "Import complete: %s events successfully send, %s failed"
 msgstr "Import abgeschlossen: %s VorgÃ¤nge importiert, %s fehlgeschlagen"
 
 #: addons/argonaut/class_argonautImportFile.inc:177
-#: addons/argonaut/argonaut_import_file.tpl.c:47
 msgid "MAC"
 msgstr "MAC"
 
 #: addons/argonaut/class_argonautImportFile.inc:180
 #: addons/argonaut/deploy-list.xml:14
-#: addons/argonaut/argonaut_import_file.tpl.c:50
 msgid "Event"
 msgstr "Ereignis"
 
-#: addons/argonaut/class_argonautQueue.inc:35
-#: addons/argonaut/class_argonautQueue.inc:41
+#: addons/argonaut/class_argonautQueue.inc:39
+#: addons/argonaut/class_argonautQueue.inc:45
 msgid "Deployment queue"
 msgstr "Deployment-Warteschlange"
 
-#: addons/argonaut/class_argonautQueue.inc:36
+#: addons/argonaut/class_argonautQueue.inc:40
 msgid "Provide a mechanism to automatically activate systems"
 msgstr "Stelle einen Mechanismus bereit um Systemen automatisch zu aktivieren"
 
-#: addons/argonaut/class_argonautQueue.inc:43
+#: addons/argonaut/class_argonautQueue.inc:47
 #: addons/argonaut/events/eventTargetSystems-list.xml:81
 msgid "Description"
 msgstr "Beschreibung"
 
-#: addons/argonaut/class_argonautQueue.inc:141
+#: addons/argonaut/class_argonautQueue.inc:174
 msgid "immediately"
 msgstr "sofort"
 
-#: addons/argonaut/class_argonautQueue.inc:156
+#: addons/argonaut/class_argonautQueue.inc:189
 msgid "Waiting"
 msgstr "Wartend"
 
-#: addons/argonaut/class_argonautQueue.inc:159
+#: addons/argonaut/class_argonautQueue.inc:192
 msgid "Show error"
 msgstr "Fehler anzeigen"
 
-#: addons/argonaut/class_argonautQueue.inc:163
+#: addons/argonaut/class_argonautQueue.inc:196
 msgid "Processed"
 msgstr "DurchgefÃ¼hrt"
 
-#: addons/argonaut/class_argonautQueue.inc:172
+#: addons/argonaut/class_argonautQueue.inc:205
 msgid "in progress"
 msgstr "in Bearbeitung"
 
-#: addons/argonaut/class_argonautQueue.inc:180
+#: addons/argonaut/class_argonautQueue.inc:226
 msgid "Permission"
 msgstr "Berechtigung"
 
-#: addons/argonaut/class_argonautQueue.inc:210
+#: addons/argonaut/class_argonautQueue.inc:256
 #: addons/argonaut/events/class_DaemonEvent.inc:258
-#: addons/argonaut/deploy-list.xml:86 addons/argonaut/deploy-list.xml:136
+#: addons/argonaut/deploy-list.xml:106 addons/argonaut/deploy-list.xml:166
 msgid "Remove"
 msgstr "Entfernen"
 
-#: addons/argonaut/class_argonautQueue.inc:211
+#: addons/argonaut/class_argonautQueue.inc:257
 #, 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"
 
-#: addons/argonaut/class_argonautQueue.inc:257
+#: addons/argonaut/class_argonautQueue.inc:304
 msgid "Info"
 msgstr "Info"
 
-#: addons/argonaut/class_argonautQueue.inc:257
+#: addons/argonaut/class_argonautQueue.inc:304
 #, php-format
 msgid "%s"
 msgstr "%s"
 
-#: addons/argonaut/class_argonautQueue.inc:261
+#: addons/argonaut/class_argonautQueue.inc:308
 #, php-format
 msgid "Required class '%s' cannot be found: job not aborted!"
 msgstr "Die erforderliche Klasse '%s' wurde nicht gefunden: Auftrag abgebrochen!"
 
-#: addons/argonaut/class_argonautQueue.inc:293
+#: addons/argonaut/class_argonautQueue.inc:340
 msgid "Error detail"
 msgstr "Fehlerdetail"
 
-#: addons/argonaut/class_argonautQueue.inc:335
+#: addons/argonaut/class_argonautQueue.inc:398
 #, php-format
 msgid "Cannot update queue entries."
 msgstr "Kann WarteschlangeneintrÃ¤ge nicht aktualisieren."
@@ -589,17 +560,15 @@ msgid "Winstation"
 msgstr "Windows-Arbeitsstation"
 
 #: addons/argonaut/events/eventTargetSystems-list.xml:47
-#: addons/argonaut/argonaut_import_file.tpl.c:53
 msgid "Object group"
 msgstr "Objektgruppe"
 
 #: addons/argonaut/events/eventTargetSystems-list.xml:73
-#: addons/argonaut/events/eventTargetSystems-filter.tpl.c:20
+#: addons/argonaut/deploy-list.xml:36
 msgid "Name"
 msgstr "Name"
 
 #: addons/argonaut/events/eventTargetSystems-list.xml:89
-#: addons/argonaut/argonaut_import_file.tpl.c:62
 msgid "IP"
 msgstr "IP"
 
@@ -612,48 +581,53 @@ msgid "List of queued jobs"
 msgstr "Liste der geplanten VorgÃ¤nge"
 
 #: addons/argonaut/deploy-list.xml:27
-#: addons/argonaut/events/DaemonEvent.tpl.c:17
 msgid "Target"
 msgstr "Ziel"
 
-#: addons/argonaut/deploy-list.xml:35
+#: addons/argonaut/deploy-list.xml:45
 msgid "Task"
 msgstr "Vorgang"
 
-#: addons/argonaut/deploy-list.xml:43
+#: addons/argonaut/deploy-list.xml:53
 msgid "Period"
 msgstr "Intervall"
 
-#: addons/argonaut/deploy-list.xml:51
-#: addons/argonaut/events/DaemonEvent.tpl.c:2
+#: addons/argonaut/deploy-list.xml:61
 msgid "Schedule"
 msgstr "Plan"
 
-#: addons/argonaut/deploy-list.xml:59
-#: addons/argonaut/events/DaemonEvent.tpl.c:11
+#: addons/argonaut/deploy-list.xml:69
 msgid "Status"
 msgstr "Status"
 
-#: addons/argonaut/deploy-list.xml:67
+#: addons/argonaut/deploy-list.xml:77
 msgid "Actions"
 msgstr "Aktionen"
 
-#: addons/argonaut/deploy-list.xml:97 addons/argonaut/deploy-list.xml:144
+#: addons/argonaut/deploy-list.xml:88
+msgid "Create"
+msgstr "Anlegen"
+
+#: addons/argonaut/deploy-list.xml:117 addons/argonaut/deploy-list.xml:174
 msgid "Abort"
 msgstr "Abbrechen"
 
-#: addons/argonaut/deploy-list.xml:108
+#: addons/argonaut/deploy-list.xml:128
 msgid "Execute"
 msgstr "AusfÃ¼hren"
 
-#: addons/argonaut/deploy-list.xml:120
+#: addons/argonaut/deploy-list.xml:140
 msgid "Process now"
 msgstr "Jetzt durchfÃ¼hren"
 
-#: addons/argonaut/deploy-list.xml:128
+#: addons/argonaut/deploy-list.xml:148
 msgid "View logs"
 msgstr "Protokolle einsehen"
 
+#: addons/argonaut/deploy-list.xml:157
+msgid "Edit"
+msgstr "Bearbeiten"
+
 #: include/class_supportDaemon.inc:89
 msgid "Multiple argonaut server found. Only one is supported"
 msgstr "Mehrere argonaut Server gefunden. Nur einer wird unterstÃ¼tzt"
@@ -671,162 +645,3 @@ msgstr "\"%s\" konnte nicht gelesen werden!"
 #, php-format
 msgid "\"%s\" is not a file!"
 msgstr "\"%s\" ist keine Datei!"
-
-#: addons/argonaut/argonaut_import_file.tpl.c:2
-msgid "Import jobs"
-msgstr "VorgÃ¤nge importieren"
-
-#: addons/argonaut/argonaut_import_file.tpl.c:5
-msgid ""
-"You can import a list of jobs into the FusionDirectory job queue. This "
-"should be a semicolon seperated list of items in the following format:"
-msgstr "Sie kÃ¶nnen eine Liste von Jobs, der FusionDirectory Jobschlange hinzufÃ¼gen. Dies sollte durch Semikolon getrennte Liste von Items in folgenden Format sein:"
-
-#: addons/argonaut/argonaut_import_file.tpl.c:8
-msgid "timestamp"
-msgstr "Zeitstempel"
-
-#: addons/argonaut/argonaut_import_file.tpl.c:11
-msgid "MAC-address"
-msgstr "MAC-Adresse"
-
-#: addons/argonaut/argonaut_import_file.tpl.c:14
-msgid "job type"
-msgstr "Auftrags-Typ"
-
-#: addons/argonaut/argonaut_import_file.tpl.c:17
-msgid "object group"
-msgstr "Objektgruppe"
-
-#: addons/argonaut/argonaut_import_file.tpl.c:20
-msgid "import base"
-msgstr "Basis fÃ¼r Import"
-
-#: addons/argonaut/argonaut_import_file.tpl.c:23
-msgid "full hostname"
-msgstr "Voll qualifizierter Hostname"
-
-#: addons/argonaut/argonaut_import_file.tpl.c:26
-msgid "IP-address"
-msgstr "IP-Adresse"
-
-#: addons/argonaut/argonaut_import_file.tpl.c:29
-msgid "DHCP group"
-msgstr "DHCP-Gruppe"
-
-#: addons/argonaut/argonaut_import_file.tpl.c:32
-msgid "Example"
-msgstr "Beispiel"
-
-#: addons/argonaut/argonaut_import_file.tpl.c:35
-msgid "Select list to import"
-msgstr "WÃ¤hlen Sie die zu importierende Liste"
-
-#: addons/argonaut/argonaut_import_file.tpl.c:38
-msgid "Browse"
-msgstr "Durchsuchen"
-
-#: addons/argonaut/argonaut_import_file.tpl.c:41
-msgid "Upload"
-msgstr "Hochladen"
-
-#: addons/argonaut/argonaut_import_file.tpl.c:44
-#: addons/argonaut/events/DaemonEvent.tpl.c:20
-msgid "Timestamp"
-msgstr "Zeitstempel"
-
-#: addons/argonaut/argonaut_import_file.tpl.c:56
-msgid "Base"
-msgstr "Basis"
-
-#: addons/argonaut/argonaut_import_file.tpl.c:59
-msgid "FQDN"
-msgstr "FQDN"
-
-#: addons/argonaut/argonaut_import_file.tpl.c:65
-msgid "DHCP"
-msgstr "DHCP"
-
-#: addons/argonaut/events/target_list.tpl.c:2
-msgid "Apply"
-msgstr "Anwenden"
-
-#: addons/argonaut/events/target_list.tpl.c:5
-msgid "Cancel"
-msgstr "Abbrechen"
-
-#: addons/argonaut/events/DaemonEvent.tpl.c:5
-msgid "System list"
-msgstr "Systemliste"
-
-#: addons/argonaut/events/DaemonEvent.tpl.c:8
-msgid "ID"
-msgstr "ID"
-
-#: addons/argonaut/events/DaemonEvent.tpl.c:14
-msgid "Result"
-msgstr "Ergebnis"
-
-#: addons/argonaut/events/eventTargetSystems-filter.tpl.c:2
-msgid "Filter"
-msgstr "Filter"
-
-#: addons/argonaut/events/eventTargetSystems-filter.tpl.c:5
-msgid "Show servers"
-msgstr "Zeige Server"
-
-#: addons/argonaut/events/eventTargetSystems-filter.tpl.c:8
-msgid "Show workstations"
-msgstr "Zeige Arbeitsstationen"
-
-#: addons/argonaut/events/eventTargetSystems-filter.tpl.c:11
-msgid "Show terminals"
-msgstr "Zeige Terminals"
-
-#: addons/argonaut/events/eventTargetSystems-filter.tpl.c:14
-msgid "Show winstations"
-msgstr "Winstations anzeigen"
-
-#: addons/argonaut/events/eventTargetSystems-filter.tpl.c:17
-msgid "Filter by IP address range"
-msgstr "IP-Bereichsfilter"
-
-#: addons/argonaut/events/timestamp_select.tpl.c:2
-msgid "Year"
-msgstr "Jahr"
-
-#: addons/argonaut/events/timestamp_select.tpl.c:5
-msgid "Month"
-msgstr "Monat"
-
-#: addons/argonaut/events/timestamp_select.tpl.c:8
-msgid "Day"
-msgstr "Tag"
-
-#: addons/argonaut/events/timestamp_select.tpl.c:11
-msgid "Hour"
-msgstr "Stunde"
-
-#: addons/argonaut/events/timestamp_select.tpl.c:14
-msgid "Minute"
-msgstr "Minute"
-
-#: addons/argonaut/events/timestamp_select.tpl.c:17
-msgid "Second"
-msgstr "Sekunde"
-
-#: addons/argonaut/events/timestamp_select.tpl.c:20
-msgid "Periodical job"
-msgstr "Periodischer Auftrag"
-
-#: addons/argonaut/events/timestamp_select.tpl.c:23
-msgid "Job intervall"
-msgstr "Aufstrags-Intervall"
-
-#: addons/argonaut/remove.tpl.c:2
-msgid "Warning"
-msgstr "Warnung"
-
-#: addons/argonaut/remove.tpl.c:5
-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."
diff --git a/argonaut/locale/el_GR/fusiondirectory.po b/argonaut/locale/el_GR/fusiondirectory.po
new file mode 100644
index 0000000000000000000000000000000000000000..8daecc6b7d032cb75557b70d24bef59f7d3b34ab
--- /dev/null
+++ b/argonaut/locale/el_GR/fusiondirectory.po
@@ -0,0 +1,646 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR FusionDirectory Project
+# This file is distributed under the same license as the PACKAGE package.
+# 
+# Translators:
+msgid ""
+msgstr ""
+"Project-Id-Version: FusionDirectory-109\n"
+"Report-Msgid-Bugs-To: documentation@lists.fusiondirectory.org\n"
+"POT-Creation-Date: 2014-12-15 17:47+0100\n"
+"PO-Revision-Date: 2015-05-30 11:45+0000\n"
+"Last-Translator: Benoit Mortier <benoit.mortier@opensides.be>\n"
+"Language-Team: Greek (Greece) (http://www.transifex.com/projects/p/FusionDirectory-109/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/argonaut/class_argonautClient.inc:117
+msgid "Argonaut client settings"
+msgstr ""
+
+#: admin/systems/argonaut/class_argonautClient.inc:120
+msgid "Client port"
+msgstr ""
+
+#: admin/systems/argonaut/class_argonautClient.inc:120
+msgid "Port used by argonaut client for JSON-RPC"
+msgstr ""
+
+#: admin/systems/argonaut/class_argonautClient.inc:125
+msgid "WakeOnLan interface"
+msgstr ""
+
+#: admin/systems/argonaut/class_argonautClient.inc:125
+msgid "Interface used by argonaut for WakeOnLan"
+msgstr ""
+
+#: admin/systems/argonaut/class_argonautClient.inc:130
+msgid "TaskId file"
+msgstr ""
+
+#: admin/systems/argonaut/class_argonautClient.inc:130
+msgid "File which argonaut will use to store its task id when booting"
+msgstr ""
+
+#: admin/systems/argonaut/class_argonautClient.inc:135
+#: admin/systems/services/argonaut/class_argonautFuseConfig.inc:56
+#: admin/systems/services/argonaut/class_argonautMirrorConfig.inc:79
+#: admin/systems/services/argonaut/class_argonautServer.inc:79
+msgid "Log directory"
+msgstr ""
+
+#: admin/systems/argonaut/class_argonautClient.inc:135
+msgid "Directory in which argonaut client should write its logs"
+msgstr ""
+
+#: admin/systems/argonaut/class_argonautClient.inc:142
+msgid "Service names"
+msgstr ""
+
+#: admin/systems/argonaut/class_argonautClient.inc:144
+msgid "Argonaut service names"
+msgstr ""
+
+#: admin/systems/argonaut/class_argonautClient.inc:159
+msgid "Argonaut client"
+msgstr ""
+
+#: admin/systems/argonaut/class_argonautClient.inc:160
+msgid "Edit argonaut client settings"
+msgstr ""
+
+#: admin/systems/services/argonaut/class_argonautFuseConfig.inc:31
+#: admin/systems/services/argonaut/class_argonautFuseConfig.inc:32
+msgid "Argonaut Fuse settings"
+msgstr ""
+
+#: admin/systems/services/argonaut/class_argonautFuseConfig.inc:32
+#: admin/systems/services/argonaut/class_argonautMirrorConfig.inc:32
+#: 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_argonautFuseConfig.inc:46
+msgid "Basic settings"
+msgstr ""
+
+#: admin/systems/services/argonaut/class_argonautFuseConfig.inc:49
+msgid "Default mode"
+msgstr ""
+
+#: admin/systems/services/argonaut/class_argonautFuseConfig.inc:57
+msgid "Directory in which argonaut-fuse will store its log"
+msgstr ""
+
+#: admin/systems/services/argonaut/class_argonautFuseConfig.inc:65
+msgid "TFTP"
+msgstr ""
+
+#: admin/systems/services/argonaut/class_argonautFuseConfig.inc:68
+msgid "Pxelinux cfg path"
+msgstr ""
+
+#: admin/systems/services/argonaut/class_argonautFuseConfig.inc:69
+msgid "Path where argonaut-fuse should store pxelinux.cfg"
+msgstr ""
+
+#: admin/systems/services/argonaut/class_argonautMirrorConfig.inc:31
+#: admin/systems/services/argonaut/class_argonautMirrorConfig.inc:32
+msgid "Argonaut Mirror settings"
+msgstr ""
+
+#: admin/systems/services/argonaut/class_argonautMirrorConfig.inc:46
+msgid "Argonaut mirror settings"
+msgstr ""
+
+#: admin/systems/services/argonaut/class_argonautMirrorConfig.inc:49
+msgid "Local debian mirror directory"
+msgstr ""
+
+#: admin/systems/services/argonaut/class_argonautMirrorConfig.inc:58
+msgid "Argonaut Debconf Crawler configuration"
+msgstr ""
+
+#: admin/systems/services/argonaut/class_argonautMirrorConfig.inc:61
+msgid "Local packages folder"
+msgstr ""
+
+#: admin/systems/services/argonaut/class_argonautMirrorConfig.inc:62
+msgid "Folder in which the crawler will store packages during analysis"
+msgstr ""
+
+#: admin/systems/services/argonaut/class_argonautMirrorConfig.inc:70
+msgid "Argonaut Repository configuration"
+msgstr ""
+
+#: admin/systems/services/argonaut/class_argonautMirrorConfig.inc:73
+msgid "Proxy"
+msgstr ""
+
+#: admin/systems/services/argonaut/class_argonautMirrorConfig.inc:84
+msgid "Errors"
+msgstr ""
+
+#: admin/systems/services/argonaut/class_argonautMirrorConfig.inc:91
+msgid "Source"
+msgstr ""
+
+#: admin/systems/services/argonaut/class_argonautMirrorConfig.inc:98
+msgid "GPG Check"
+msgstr ""
+
+#: admin/systems/services/argonaut/class_argonautMirrorConfig.inc:105
+msgid "Contents"
+msgstr ""
+
+#: admin/systems/services/argonaut/class_argonautMirrorConfig.inc:112
+msgid "Verbose"
+msgstr ""
+
+#: admin/systems/services/argonaut/class_argonautMirrorConfig.inc:113
+msgid "Wether to activate verbose mode"
+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_argonautServer.inc:31
+#: admin/systems/services/argonaut/class_argonautServer.inc:32
+msgid "Argonaut Server"
+msgstr ""
+
+#: admin/systems/services/argonaut/class_argonautServer.inc:46
+msgid "Argonaut server"
+msgstr ""
+
+#: admin/systems/services/argonaut/class_argonautServer.inc:49
+msgid "Delete finished tasks"
+msgstr ""
+
+#: admin/systems/services/argonaut/class_argonautServer.inc:50
+msgid ""
+"Wether or not argonaut server should delete successfully finished tasks"
+msgstr ""
+
+#: admin/systems/services/argonaut/class_argonautServer.inc:55
+msgid "Get packages informations"
+msgstr ""
+
+#: admin/systems/services/argonaut/class_argonautServer.inc:56
+msgid ""
+"Wether or not argonaut server should get packages information from "
+"repositories at start and then once a day. Needed for FAI package list "
+"creation."
+msgstr ""
+
+#: admin/systems/services/argonaut/class_argonautServer.inc:61
+msgid "Protocol"
+msgstr ""
+
+#: admin/systems/services/argonaut/class_argonautServer.inc:61
+msgid "Protocol to use for argonaut"
+msgstr ""
+
+#: admin/systems/services/argonaut/class_argonautServer.inc:66
+msgid "Port"
+msgstr ""
+
+#: admin/systems/services/argonaut/class_argonautServer.inc:67
+msgid "Port on which the argonaut server will be listening"
+msgstr ""
+
+#: admin/systems/services/argonaut/class_argonautServer.inc:72
+msgid "Timeout"
+msgstr ""
+
+#: admin/systems/services/argonaut/class_argonautServer.inc:73
+msgid ""
+"Time in seconds before to consider an argonaut client or server as down"
+msgstr ""
+
+#: admin/systems/services/argonaut/class_argonautServer.inc:80
+msgid "Directory in which argonaut will store its log"
+msgstr ""
+
+#: admin/systems/services/argonaut/class_argonautServer.inc:85
+msgid "Key path"
+msgstr ""
+
+#: admin/systems/services/argonaut/class_argonautServer.inc:85
+msgid "Path to the private key file"
+msgstr ""
+
+#: admin/systems/services/argonaut/class_argonautServer.inc:90
+msgid "Certificate path"
+msgstr ""
+
+#: admin/systems/services/argonaut/class_argonautServer.inc:90
+msgid "Path to the certificate file"
+msgstr ""
+
+#: admin/systems/services/argonaut/class_argonautServer.inc:97
+msgid "Wake on lan"
+msgstr ""
+
+#: admin/systems/services/argonaut/class_argonautServer.inc:100
+msgid "Interface"
+msgstr ""
+
+#: admin/systems/services/argonaut/class_argonautServer.inc:101
+msgid "Interface to use for sending WakeOnLan requests"
+msgstr ""
+
+#: admin/systems/services/argonaut/class_argonautServer.inc:106
+msgid "IP tool"
+msgstr ""
+
+#: admin/systems/services/argonaut/class_argonautServer.inc:106
+msgid "IP tool to use"
+msgstr ""
+
+#: admin/systems/services/argonaut/class_argonautFuseOPSIConfig.inc:32
+#: admin/systems/services/argonaut/class_argonautFuseOPSIConfig.inc:33
+msgid "Argonaut Fuse OPSI module settings"
+msgstr ""
+
+#: admin/systems/services/argonaut/class_argonautFuseOPSIConfig.inc:47
+msgid "OPSI"
+msgstr ""
+
+#: admin/systems/services/argonaut/class_argonautFuseOPSIConfig.inc:50
+msgid "Opsi admin"
+msgstr ""
+
+#: admin/systems/services/argonaut/class_argonautFuseOPSIConfig.inc:55
+msgid "Opsi password"
+msgstr ""
+
+#: admin/systems/services/argonaut/class_argonautFuseOPSIConfig.inc:60
+msgid "Opsi server"
+msgstr ""
+
+#: admin/systems/services/argonaut/class_argonautFuseOPSIConfig.inc:65
+msgid "Opsi lang"
+msgstr ""
+
+#: admin/systems/services/argonaut/class_argonautDNSConfig.inc:30
+#: admin/systems/services/argonaut/class_argonautDNSConfig.inc:31
+msgid "Argonaut DNS settings"
+msgstr ""
+
+#: admin/systems/services/argonaut/class_argonautDNSConfig.inc:47
+msgid "Argonaut Ldap2zone settings:"
+msgstr ""
+
+#: admin/systems/services/argonaut/class_argonautDNSConfig.inc:50
+msgid "Bind directory"
+msgstr ""
+
+#: admin/systems/services/argonaut/class_argonautDNSConfig.inc:51
+msgid "The directory in which conf file must be created"
+msgstr ""
+
+#: admin/systems/services/argonaut/class_argonautDNSConfig.inc:57
+msgid "Bind cache directory"
+msgstr ""
+
+#: admin/systems/services/argonaut/class_argonautDNSConfig.inc:58
+msgid "The directory in which zone files must be created"
+msgstr ""
+
+#: admin/systems/services/argonaut/class_argonautDNSConfig.inc:64
+msgid "Allow notify"
+msgstr ""
+
+#: admin/systems/services/argonaut/class_argonautDNSConfig.inc:70
+msgid "Allow update (semicolon separated and ended)"
+msgstr ""
+
+#: admin/systems/services/argonaut/class_argonautDNSConfig.inc:76
+msgid "Allow transfer (semicolon separated and ended)"
+msgstr ""
+
+#: admin/systems/services/argonaut/class_argonautDNSConfig.inc:82
+msgid "TTL"
+msgstr ""
+
+#: admin/systems/services/argonaut/class_argonautDNSConfig.inc:83
+msgid "Time to live"
+msgstr ""
+
+#: admin/systems/services/argonaut/class_argonautDNSConfig.inc:91
+msgid "rndc path"
+msgstr ""
+
+#: admin/systems/services/argonaut/class_argonautDNSConfig.inc:92
+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_filterArgonautEvents.inc:40
+#: addons/argonaut/class_argonautQueue.inc:193
+#: addons/argonaut/class_argonautQueue.inc:307
+#: addons/argonaut/class_argonautQueue.inc:398
+msgid "Error"
+msgstr ""
+
+#: addons/argonaut/class_filterArgonautEvents.inc:40
+#, php-format
+msgid "Cannot load queue entries: %s"
+msgstr ""
+
+#: addons/argonaut/class_argonautImportFile.inc:44
+#: addons/argonaut/class_argonautImportFile.inc:100
+#: addons/argonaut/class_argonautImportFile.inc:141
+#: addons/argonaut/deploy-list.xml:99
+msgid "Import"
+msgstr ""
+
+#: addons/argonaut/class_argonautImportFile.inc:44
+msgid "file is empty"
+msgstr ""
+
+#: addons/argonaut/class_argonautImportFile.inc:101
+msgid ""
+"Selected entries will be skipped because of errors. Do you want to proceed?"
+msgstr ""
+
+#: addons/argonaut/class_argonautImportFile.inc:134
+#: addons/argonaut/class_argonautQueue.inc:350
+msgid "Service infrastructure"
+msgstr ""
+
+#: addons/argonaut/class_argonautImportFile.inc:141
+#, php-format
+msgid "Import complete: %s events successfully send, %s failed"
+msgstr ""
+
+#: addons/argonaut/class_argonautImportFile.inc:177
+msgid "MAC"
+msgstr ""
+
+#: addons/argonaut/class_argonautImportFile.inc:180
+#: addons/argonaut/deploy-list.xml:14
+msgid "Event"
+msgstr ""
+
+#: addons/argonaut/class_argonautQueue.inc:39
+#: addons/argonaut/class_argonautQueue.inc:45
+msgid "Deployment queue"
+msgstr ""
+
+#: addons/argonaut/class_argonautQueue.inc:40
+msgid "Provide a mechanism to automatically activate systems"
+msgstr ""
+
+#: addons/argonaut/class_argonautQueue.inc:47
+#: addons/argonaut/events/eventTargetSystems-list.xml:81
+msgid "Description"
+msgstr ""
+
+#: addons/argonaut/class_argonautQueue.inc:174
+msgid "immediately"
+msgstr ""
+
+#: addons/argonaut/class_argonautQueue.inc:189
+msgid "Waiting"
+msgstr ""
+
+#: addons/argonaut/class_argonautQueue.inc:192
+msgid "Show error"
+msgstr ""
+
+#: addons/argonaut/class_argonautQueue.inc:196
+msgid "Processed"
+msgstr ""
+
+#: addons/argonaut/class_argonautQueue.inc:205
+msgid "in progress"
+msgstr ""
+
+#: addons/argonaut/class_argonautQueue.inc:226
+msgid "Permission"
+msgstr ""
+
+#: addons/argonaut/class_argonautQueue.inc:256
+#: addons/argonaut/events/class_DaemonEvent.inc:258
+#: addons/argonaut/deploy-list.xml:106 addons/argonaut/deploy-list.xml:166
+msgid "Remove"
+msgstr ""
+
+#: addons/argonaut/class_argonautQueue.inc:257
+#, php-format
+msgid "The following jobs couldn't be deleted, they have to be aborted: %s"
+msgstr ""
+
+#: addons/argonaut/class_argonautQueue.inc:304
+msgid "Info"
+msgstr ""
+
+#: addons/argonaut/class_argonautQueue.inc:304
+#, php-format
+msgid "%s"
+msgstr ""
+
+#: addons/argonaut/class_argonautQueue.inc:308
+#, php-format
+msgid "Required class '%s' cannot be found: job not aborted!"
+msgstr ""
+
+#: addons/argonaut/class_argonautQueue.inc:340
+msgid "Error detail"
+msgstr ""
+
+#: addons/argonaut/class_argonautQueue.inc:398
+#, php-format
+msgid "Cannot update queue entries."
+msgstr ""
+
+#: addons/argonaut/events/class_DaemonEvent.inc:149
+#, php-format
+msgid "Create '%s' job"
+msgstr ""
+
+#: addons/argonaut/events/class_DaemonEvent.inc:220
+msgid "Minutes"
+msgstr ""
+
+#: addons/argonaut/events/class_DaemonEvent.inc:221
+msgid "Hours"
+msgstr ""
+
+#: addons/argonaut/events/class_DaemonEvent.inc:222
+msgid "Days"
+msgstr ""
+
+#: addons/argonaut/events/class_DaemonEvent.inc:223
+msgid "Weeks"
+msgstr ""
+
+#: addons/argonaut/events/class_DaemonEvent.inc:224
+msgid "Months"
+msgstr ""
+
+#: addons/argonaut/events/class_DaemonEvent.inc:262
+msgid "Add"
+msgstr ""
+
+#: addons/argonaut/events/class_DaemonEvent.inc:408
+msgid "Switch off"
+msgstr ""
+
+#: addons/argonaut/events/class_DaemonEvent.inc:412
+msgid "Reboot"
+msgstr ""
+
+#: addons/argonaut/events/class_DaemonEvent.inc:416
+msgid "Wake up"
+msgstr ""
+
+#: addons/argonaut/events/class_DaemonEvent.inc:420
+msgid "Software update"
+msgstr ""
+
+#: addons/argonaut/events/class_DaemonEvent.inc:424
+msgid "(Re)Install"
+msgstr ""
+
+#: addons/argonaut/events/eventTargetSystems-list.xml:11
+msgid "List of target systems"
+msgstr ""
+
+#: addons/argonaut/events/eventTargetSystems-list.xml:15
+msgid "Server"
+msgstr ""
+
+#: addons/argonaut/events/eventTargetSystems-list.xml:23
+msgid "Workstation"
+msgstr ""
+
+#: addons/argonaut/events/eventTargetSystems-list.xml:31
+msgid "Terminal"
+msgstr ""
+
+#: addons/argonaut/events/eventTargetSystems-list.xml:39
+msgid "Winstation"
+msgstr ""
+
+#: addons/argonaut/events/eventTargetSystems-list.xml:47
+msgid "Object group"
+msgstr ""
+
+#: addons/argonaut/events/eventTargetSystems-list.xml:73
+#: addons/argonaut/deploy-list.xml:36
+msgid "Name"
+msgstr ""
+
+#: addons/argonaut/events/eventTargetSystems-list.xml:89
+msgid "IP"
+msgstr ""
+
+#: addons/argonaut/events/eventTargetSystems-list.xml:97
+msgid "Mac"
+msgstr ""
+
+#: addons/argonaut/deploy-list.xml:10
+msgid "List of queued jobs"
+msgstr ""
+
+#: addons/argonaut/deploy-list.xml:27
+msgid "Target"
+msgstr ""
+
+#: addons/argonaut/deploy-list.xml:45
+msgid "Task"
+msgstr ""
+
+#: addons/argonaut/deploy-list.xml:53
+msgid "Period"
+msgstr ""
+
+#: addons/argonaut/deploy-list.xml:61
+msgid "Schedule"
+msgstr ""
+
+#: addons/argonaut/deploy-list.xml:69
+msgid "Status"
+msgstr ""
+
+#: addons/argonaut/deploy-list.xml:77
+msgid "Actions"
+msgstr ""
+
+#: addons/argonaut/deploy-list.xml:88
+msgid "Create"
+msgstr ""
+
+#: addons/argonaut/deploy-list.xml:117 addons/argonaut/deploy-list.xml:174
+msgid "Abort"
+msgstr ""
+
+#: addons/argonaut/deploy-list.xml:128
+msgid "Execute"
+msgstr ""
+
+#: addons/argonaut/deploy-list.xml:140
+msgid "Process now"
+msgstr ""
+
+#: addons/argonaut/deploy-list.xml:148
+msgid "View logs"
+msgstr ""
+
+#: addons/argonaut/deploy-list.xml:157
+msgid "Edit"
+msgstr ""
+
+#: include/class_supportDaemon.inc:89
+msgid "Multiple argonaut server found. Only one is supported"
+msgstr ""
+
+#: include/class_supportDaemon.inc:91
+msgid "There is no argonaut server configured"
+msgstr ""
+
+#: include/class_supportDaemon.inc:609
+#, php-format
+msgid "Could not read \"%s\"!"
+msgstr ""
+
+#: include/class_supportDaemon.inc:613
+#, php-format
+msgid "\"%s\" is not a file!"
+msgstr ""
diff --git a/argonaut/locale/en/fusiondirectory.po b/argonaut/locale/en/fusiondirectory.po
index 776af574ade01fdab2c13eeec3d1475d2dc4e52c..0e81aa0f59ad8125d872892ffc0376a6dc07d4a0 100644
--- a/argonaut/locale/en/fusiondirectory.po
+++ b/argonaut/locale/en/fusiondirectory.po
@@ -6,13 +6,13 @@
 #, fuzzy
 msgid ""
 msgstr ""
-"Project-Id-Version: PACKAGE VERSION\n"
-"Report-Msgid-Bugs-To: documentation@lists.fusiondirectory.org\n"
-"POT-Creation-Date: 2015-03-31 11:49+0200\n"
+"Project-Id-Version: FusionDirectory VERSION\n"
+"Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
+"POT-Creation-Date: 2015-05-30 15:30+0200\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
-"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
-"Language-Team: LANGUAGE <LL@li.org>\n"
-"Language: \n"
+"Last-Translator: FusionDirectory project <contact@fusiondirectory.org>\n"
+"Language-Team: English\n"
+"Language: en\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
diff --git a/argonaut/locale/es/fusiondirectory.po b/argonaut/locale/es/fusiondirectory.po
index 3d38fc72a392e13c11f541e4bfecdb84c92165a4..b7350d1afd08e1c7fe4eed167e3951cd40319998 100644
--- a/argonaut/locale/es/fusiondirectory.po
+++ b/argonaut/locale/es/fusiondirectory.po
@@ -5,12 +5,12 @@
 # Translators:
 msgid ""
 msgstr ""
-"Project-Id-Version: FusionDirectory-108\n"
+"Project-Id-Version: FusionDirectory-109\n"
 "Report-Msgid-Bugs-To: documentation@lists.fusiondirectory.org\n"
-"POT-Creation-Date: 2015-03-31 11:49+0200\n"
-"PO-Revision-Date: 2015-03-31 11:41+0000\n"
+"POT-Creation-Date: 2014-12-15 17:47+0100\n"
+"PO-Revision-Date: 2015-02-25 16:13+0000\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>\n"
-"Language-Team: Spanish (http://www.transifex.com/projects/p/FusionDirectory-108/language/es/)\n"
+"Language-Team: Spanish (http://www.transifex.com/projects/p/FusionDirectory-109/language/es/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -47,7 +47,7 @@ msgstr ""
 
 #: admin/systems/argonaut/class_argonautClient.inc:135
 #: admin/systems/services/argonaut/class_argonautFuseConfig.inc:56
-#: admin/systems/services/argonaut/class_argonautMirrorConfig.inc:71
+#: admin/systems/services/argonaut/class_argonautMirrorConfig.inc:79
 #: admin/systems/services/argonaut/class_argonautServer.inc:79
 msgid "Log directory"
 msgstr "Directorio de rgistros"
@@ -78,6 +78,7 @@ msgid "Argonaut Fuse settings"
 msgstr ""
 
 #: admin/systems/services/argonaut/class_argonautFuseConfig.inc:32
+#: admin/systems/services/argonaut/class_argonautMirrorConfig.inc:32
 #: admin/systems/services/argonaut/class_argonautFuseFAIConfig.inc:33
 #: admin/systems/services/argonaut/class_argonautServer.inc:32
 #: admin/systems/services/argonaut/class_argonautFuseOPSIConfig.inc:33
@@ -110,88 +111,60 @@ msgstr "Ruta de configuraciÃ³n Pxelinux"
 msgid "Path where argonaut-fuse should store pxelinux.cfg"
 msgstr ""
 
-#: admin/systems/services/argonaut/class_argonautMirrorConfig.inc:29
-#: admin/systems/services/argonaut/class_argonautMirrorConfig.inc:30
+#: admin/systems/services/argonaut/class_argonautMirrorConfig.inc:31
+#: admin/systems/services/argonaut/class_argonautMirrorConfig.inc:32
 msgid "Argonaut Mirror settings"
 msgstr ""
 
-#: admin/systems/services/argonaut/class_argonautMirrorConfig.inc:41
+#: admin/systems/services/argonaut/class_argonautMirrorConfig.inc:46
 msgid "Argonaut mirror settings"
 msgstr "Opciones de espejo de Argonaut"
 
-#: admin/systems/services/argonaut/class_argonautMirrorConfig.inc:44
-msgid "Local Debian mirror directory"
-msgstr ""
+#: admin/systems/services/argonaut/class_argonautMirrorConfig.inc:49
+msgid "Local debian mirror directory"
+msgstr "Directorio local de repositorio Debian"
 
-#: admin/systems/services/argonaut/class_argonautMirrorConfig.inc:52
+#: admin/systems/services/argonaut/class_argonautMirrorConfig.inc:58
 msgid "Argonaut Debconf Crawler configuration"
 msgstr ""
 
-#: admin/systems/services/argonaut/class_argonautMirrorConfig.inc:55
+#: admin/systems/services/argonaut/class_argonautMirrorConfig.inc:61
 msgid "Local packages folder"
 msgstr "Directorio local de paquetes"
 
-#: admin/systems/services/argonaut/class_argonautMirrorConfig.inc:56
+#: admin/systems/services/argonaut/class_argonautMirrorConfig.inc:62
 msgid "Folder in which the crawler will store packages during analysis"
 msgstr ""
 
-#: admin/systems/services/argonaut/class_argonautMirrorConfig.inc:63
+#: admin/systems/services/argonaut/class_argonautMirrorConfig.inc:70
 msgid "Argonaut Repository configuration"
 msgstr ""
 
-#: admin/systems/services/argonaut/class_argonautMirrorConfig.inc:66
+#: admin/systems/services/argonaut/class_argonautMirrorConfig.inc:73
 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 ""
-
-#: admin/systems/services/argonaut/class_argonautMirrorConfig.inc:71
-msgid "Directory in which logs should be stored"
-msgstr ""
-
-#: admin/systems/services/argonaut/class_argonautMirrorConfig.inc:76
-msgid "Ignore errors"
-msgstr ""
-
-#: admin/systems/services/argonaut/class_argonautMirrorConfig.inc:77
-msgid ""
-"Causes debmirror to ignore missing or broken deb and source files but still "
-"be pedantic about checking meta files"
-msgstr ""
+#: admin/systems/services/argonaut/class_argonautMirrorConfig.inc:84
+msgid "Errors"
+msgstr "Errores"
 
-#: admin/systems/services/argonaut/class_argonautMirrorConfig.inc:82
+#: admin/systems/services/argonaut/class_argonautMirrorConfig.inc:91
 msgid "Source"
 msgstr "Origen"
 
-#: admin/systems/services/argonaut/class_argonautMirrorConfig.inc:82
-msgid "Include source in the mirror"
-msgstr ""
-
-#: admin/systems/services/argonaut/class_argonautMirrorConfig.inc:87
+#: admin/systems/services/argonaut/class_argonautMirrorConfig.inc:98
 msgid "GPG Check"
 msgstr "VerificaciÃ³n 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
+#: admin/systems/services/argonaut/class_argonautMirrorConfig.inc:105
 msgid "Contents"
 msgstr "Contenidos"
 
-#: 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
+#: admin/systems/services/argonaut/class_argonautMirrorConfig.inc:112
 msgid "Verbose"
 msgstr "Detallado"
 
-#: admin/systems/services/argonaut/class_argonautMirrorConfig.inc:98
+#: admin/systems/services/argonaut/class_argonautMirrorConfig.inc:113
 msgid "Wether to activate verbose mode"
 msgstr ""
 
@@ -398,9 +371,9 @@ msgid "LTSP server"
 msgstr "Servidor LTSP"
 
 #: addons/argonaut/class_filterArgonautEvents.inc:40
-#: addons/argonaut/class_argonautQueue.inc:160
-#: addons/argonaut/class_argonautQueue.inc:260
-#: addons/argonaut/class_argonautQueue.inc:335
+#: addons/argonaut/class_argonautQueue.inc:193
+#: addons/argonaut/class_argonautQueue.inc:307
+#: addons/argonaut/class_argonautQueue.inc:398
 msgid "Error"
 msgstr "Error"
 
@@ -412,8 +385,7 @@ msgstr "No se puede cargar entradas en la cola: %s"
 #: addons/argonaut/class_argonautImportFile.inc:44
 #: addons/argonaut/class_argonautImportFile.inc:100
 #: addons/argonaut/class_argonautImportFile.inc:141
-#: addons/argonaut/deploy-list.xml:79
-#: addons/argonaut/argonaut_import_file.tpl.c:68
+#: addons/argonaut/deploy-list.xml:99
 msgid "Import"
 msgstr "Importar"
 
@@ -427,8 +399,9 @@ msgid ""
 msgstr "Seleccione entradas que serÃ¡n ignoradas a causa de errores. Â¿Quiere proceder?"
 
 #: addons/argonaut/class_argonautImportFile.inc:134
-msgid "Infrastructure service"
-msgstr ""
+#: addons/argonaut/class_argonautQueue.inc:350
+msgid "Service infrastructure"
+msgstr "Infraestructura de servicio"
 
 #: addons/argonaut/class_argonautImportFile.inc:141
 #, php-format
@@ -436,84 +409,82 @@ 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:177
-#: addons/argonaut/argonaut_import_file.tpl.c:47
 msgid "MAC"
 msgstr "MAC"
 
 #: addons/argonaut/class_argonautImportFile.inc:180
 #: addons/argonaut/deploy-list.xml:14
-#: addons/argonaut/argonaut_import_file.tpl.c:50
 msgid "Event"
 msgstr "Evento"
 
-#: addons/argonaut/class_argonautQueue.inc:35
-#: addons/argonaut/class_argonautQueue.inc:41
+#: addons/argonaut/class_argonautQueue.inc:39
+#: addons/argonaut/class_argonautQueue.inc:45
 msgid "Deployment queue"
 msgstr ""
 
-#: addons/argonaut/class_argonautQueue.inc:36
+#: addons/argonaut/class_argonautQueue.inc:40
 msgid "Provide a mechanism to automatically activate systems"
 msgstr "Provee un mecanismo para activar sistemas automÃ¡ticamente"
 
-#: addons/argonaut/class_argonautQueue.inc:43
+#: addons/argonaut/class_argonautQueue.inc:47
 #: addons/argonaut/events/eventTargetSystems-list.xml:81
 msgid "Description"
 msgstr "DescripciÃ³n"
 
-#: addons/argonaut/class_argonautQueue.inc:141
+#: addons/argonaut/class_argonautQueue.inc:174
 msgid "immediately"
 msgstr "inmediatamente"
 
-#: addons/argonaut/class_argonautQueue.inc:156
+#: addons/argonaut/class_argonautQueue.inc:189
 msgid "Waiting"
 msgstr "Esperando"
 
-#: addons/argonaut/class_argonautQueue.inc:159
+#: addons/argonaut/class_argonautQueue.inc:192
 msgid "Show error"
 msgstr ""
 
-#: addons/argonaut/class_argonautQueue.inc:163
+#: addons/argonaut/class_argonautQueue.inc:196
 msgid "Processed"
 msgstr "Procesado"
 
-#: addons/argonaut/class_argonautQueue.inc:172
+#: addons/argonaut/class_argonautQueue.inc:205
 msgid "in progress"
 msgstr "en progreso"
 
-#: addons/argonaut/class_argonautQueue.inc:180
+#: addons/argonaut/class_argonautQueue.inc:226
 msgid "Permission"
 msgstr "Permisos"
 
-#: addons/argonaut/class_argonautQueue.inc:210
+#: addons/argonaut/class_argonautQueue.inc:256
 #: addons/argonaut/events/class_DaemonEvent.inc:258
-#: addons/argonaut/deploy-list.xml:86 addons/argonaut/deploy-list.xml:136
+#: addons/argonaut/deploy-list.xml:106 addons/argonaut/deploy-list.xml:166
 msgid "Remove"
 msgstr "Eliminar"
 
-#: addons/argonaut/class_argonautQueue.inc:211
+#: addons/argonaut/class_argonautQueue.inc:257
 #, 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:257
+#: addons/argonaut/class_argonautQueue.inc:304
 msgid "Info"
 msgstr ""
 
-#: addons/argonaut/class_argonautQueue.inc:257
+#: addons/argonaut/class_argonautQueue.inc:304
 #, php-format
 msgid "%s"
 msgstr ""
 
-#: addons/argonaut/class_argonautQueue.inc:261
+#: addons/argonaut/class_argonautQueue.inc:308
 #, php-format
 msgid "Required class '%s' cannot be found: job not aborted!"
 msgstr "No se ha encontrado la clase necesaria '%s': Â¡no se ha cancelado el trabajo!"
 
-#: addons/argonaut/class_argonautQueue.inc:293
+#: addons/argonaut/class_argonautQueue.inc:340
 msgid "Error detail"
 msgstr ""
 
-#: addons/argonaut/class_argonautQueue.inc:335
+#: addons/argonaut/class_argonautQueue.inc:398
 #, php-format
 msgid "Cannot update queue entries."
 msgstr "No se puede actualizar las entradas de la cola."
@@ -588,17 +559,15 @@ msgid "Winstation"
 msgstr "EstaciÃ³n de trabajo Windows"
 
 #: addons/argonaut/events/eventTargetSystems-list.xml:47
-#: addons/argonaut/argonaut_import_file.tpl.c:53
 msgid "Object group"
 msgstr "Grupo de objetos"
 
 #: addons/argonaut/events/eventTargetSystems-list.xml:73
-#: addons/argonaut/events/eventTargetSystems-filter.tpl.c:20
+#: addons/argonaut/deploy-list.xml:36
 msgid "Name"
 msgstr "Nombre"
 
 #: addons/argonaut/events/eventTargetSystems-list.xml:89
-#: addons/argonaut/argonaut_import_file.tpl.c:62
 msgid "IP"
 msgstr "IP"
 
@@ -611,48 +580,53 @@ msgid "List of queued jobs"
 msgstr "Lista de trabajos en cola"
 
 #: addons/argonaut/deploy-list.xml:27
-#: addons/argonaut/events/DaemonEvent.tpl.c:17
 msgid "Target"
 msgstr "Objetivo"
 
-#: addons/argonaut/deploy-list.xml:35
+#: addons/argonaut/deploy-list.xml:45
 msgid "Task"
 msgstr "Tarea"
 
-#: addons/argonaut/deploy-list.xml:43
+#: addons/argonaut/deploy-list.xml:53
 msgid "Period"
 msgstr "Periodo"
 
-#: addons/argonaut/deploy-list.xml:51
-#: addons/argonaut/events/DaemonEvent.tpl.c:2
+#: addons/argonaut/deploy-list.xml:61
 msgid "Schedule"
 msgstr "ProgramaciÃ³n"
 
-#: addons/argonaut/deploy-list.xml:59
-#: addons/argonaut/events/DaemonEvent.tpl.c:11
+#: addons/argonaut/deploy-list.xml:69
 msgid "Status"
 msgstr "Estado"
 
-#: addons/argonaut/deploy-list.xml:67
+#: addons/argonaut/deploy-list.xml:77
 msgid "Actions"
 msgstr "Acciones"
 
-#: addons/argonaut/deploy-list.xml:97 addons/argonaut/deploy-list.xml:144
+#: addons/argonaut/deploy-list.xml:88
+msgid "Create"
+msgstr "Crear"
+
+#: addons/argonaut/deploy-list.xml:117 addons/argonaut/deploy-list.xml:174
 msgid "Abort"
 msgstr "Cancelar"
 
-#: addons/argonaut/deploy-list.xml:108
+#: addons/argonaut/deploy-list.xml:128
 msgid "Execute"
 msgstr "Ejecute"
 
-#: addons/argonaut/deploy-list.xml:120
+#: addons/argonaut/deploy-list.xml:140
 msgid "Process now"
 msgstr ""
 
-#: addons/argonaut/deploy-list.xml:128
+#: addons/argonaut/deploy-list.xml:148
 msgid "View logs"
 msgstr "Ver registros"
 
+#: addons/argonaut/deploy-list.xml:157
+msgid "Edit"
+msgstr "Editar"
+
 #: include/class_supportDaemon.inc:89
 msgid "Multiple argonaut server found. Only one is supported"
 msgstr ""
@@ -670,162 +644,3 @@ msgstr ""
 #, php-format
 msgid "\"%s\" is not a file!"
 msgstr ""
-
-#: addons/argonaut/argonaut_import_file.tpl.c:2
-msgid "Import jobs"
-msgstr "Importar trabajos"
-
-#: addons/argonaut/argonaut_import_file.tpl.c:5
-msgid ""
-"You can import a list of jobs into the FusionDirectory job queue. This "
-"should be a semicolon seperated list of items in the following format:"
-msgstr ""
-
-#: addons/argonaut/argonaut_import_file.tpl.c:8
-msgid "timestamp"
-msgstr "marca de tiempo"
-
-#: addons/argonaut/argonaut_import_file.tpl.c:11
-msgid "MAC-address"
-msgstr "DirecciÃ³n MAC"
-
-#: addons/argonaut/argonaut_import_file.tpl.c:14
-msgid "job type"
-msgstr "Tipo de trabajo"
-
-#: addons/argonaut/argonaut_import_file.tpl.c:17
-msgid "object group"
-msgstr "grupo de objetos"
-
-#: addons/argonaut/argonaut_import_file.tpl.c:20
-msgid "import base"
-msgstr "importar base"
-
-#: addons/argonaut/argonaut_import_file.tpl.c:23
-msgid "full hostname"
-msgstr "nombre de dominio cualificado (fqdn)"
-
-#: addons/argonaut/argonaut_import_file.tpl.c:26
-msgid "IP-address"
-msgstr "DirecciÃ³n IP"
-
-#: addons/argonaut/argonaut_import_file.tpl.c:29
-msgid "DHCP group"
-msgstr "Grupo DHCP"
-
-#: addons/argonaut/argonaut_import_file.tpl.c:32
-msgid "Example"
-msgstr "Ejemplo"
-
-#: addons/argonaut/argonaut_import_file.tpl.c:35
-msgid "Select list to import"
-msgstr "Seleccione lista a importar"
-
-#: addons/argonaut/argonaut_import_file.tpl.c:38
-msgid "Browse"
-msgstr "Visualizar"
-
-#: addons/argonaut/argonaut_import_file.tpl.c:41
-msgid "Upload"
-msgstr "Enviar"
-
-#: addons/argonaut/argonaut_import_file.tpl.c:44
-#: addons/argonaut/events/DaemonEvent.tpl.c:20
-msgid "Timestamp"
-msgstr "Marca de tiempo"
-
-#: addons/argonaut/argonaut_import_file.tpl.c:56
-msgid "Base"
-msgstr "Base"
-
-#: addons/argonaut/argonaut_import_file.tpl.c:59
-msgid "FQDN"
-msgstr "FQDN"
-
-#: addons/argonaut/argonaut_import_file.tpl.c:65
-msgid "DHCP"
-msgstr "DHCP"
-
-#: addons/argonaut/events/target_list.tpl.c:2
-msgid "Apply"
-msgstr "Aplicar"
-
-#: addons/argonaut/events/target_list.tpl.c:5
-msgid "Cancel"
-msgstr "Cancelar"
-
-#: addons/argonaut/events/DaemonEvent.tpl.c:5
-msgid "System list"
-msgstr "Lista de sistemas"
-
-#: addons/argonaut/events/DaemonEvent.tpl.c:8
-msgid "ID"
-msgstr "ID"
-
-#: addons/argonaut/events/DaemonEvent.tpl.c:14
-msgid "Result"
-msgstr "Resultado"
-
-#: addons/argonaut/events/eventTargetSystems-filter.tpl.c:2
-msgid "Filter"
-msgstr "Filtro"
-
-#: addons/argonaut/events/eventTargetSystems-filter.tpl.c:5
-msgid "Show servers"
-msgstr "Mostrar servidores"
-
-#: addons/argonaut/events/eventTargetSystems-filter.tpl.c:8
-msgid "Show workstations"
-msgstr "Mostrar estaciones de trabajo"
-
-#: addons/argonaut/events/eventTargetSystems-filter.tpl.c:11
-msgid "Show terminals"
-msgstr "Mostrar terminales"
-
-#: addons/argonaut/events/eventTargetSystems-filter.tpl.c:14
-msgid "Show winstations"
-msgstr ""
-
-#: addons/argonaut/events/eventTargetSystems-filter.tpl.c:17
-msgid "Filter by IP address range"
-msgstr "Filtrar por rango de direcciones IP"
-
-#: addons/argonaut/events/timestamp_select.tpl.c:2
-msgid "Year"
-msgstr "AÃ±o"
-
-#: addons/argonaut/events/timestamp_select.tpl.c:5
-msgid "Month"
-msgstr "Mes"
-
-#: addons/argonaut/events/timestamp_select.tpl.c:8
-msgid "Day"
-msgstr "DÃa"
-
-#: addons/argonaut/events/timestamp_select.tpl.c:11
-msgid "Hour"
-msgstr "Hora"
-
-#: addons/argonaut/events/timestamp_select.tpl.c:14
-msgid "Minute"
-msgstr "Minuto"
-
-#: addons/argonaut/events/timestamp_select.tpl.c:17
-msgid "Second"
-msgstr "Segundo"
-
-#: addons/argonaut/events/timestamp_select.tpl.c:20
-msgid "Periodical job"
-msgstr "Tareas periÃ³dicas"
-
-#: addons/argonaut/events/timestamp_select.tpl.c:23
-msgid "Job intervall"
-msgstr "Intervalo de trabajo"
-
-#: addons/argonaut/remove.tpl.c:2
-msgid "Warning"
-msgstr "Aviso"
-
-#: addons/argonaut/remove.tpl.c:5
-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."
diff --git a/argonaut/locale/es_VE/fusiondirectory.po b/argonaut/locale/es_VE/fusiondirectory.po
index 44f60be7166d6d80b53d6079121761f3697cab4e..dc003177f801d0e79b5f67fc90c772c4749ec5f7 100644
--- a/argonaut/locale/es_VE/fusiondirectory.po
+++ b/argonaut/locale/es_VE/fusiondirectory.po
@@ -5,12 +5,12 @@
 # Translators:
 msgid ""
 msgstr ""
-"Project-Id-Version: FusionDirectory-108\n"
+"Project-Id-Version: FusionDirectory-109\n"
 "Report-Msgid-Bugs-To: documentation@lists.fusiondirectory.org\n"
-"POT-Creation-Date: 2015-03-31 11:49+0200\n"
-"PO-Revision-Date: 2015-03-31 11:41+0000\n"
+"POT-Creation-Date: 2014-12-15 17:47+0100\n"
+"PO-Revision-Date: 2015-02-25 16:13+0000\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>\n"
-"Language-Team: Spanish (Venezuela) (http://www.transifex.com/projects/p/FusionDirectory-108/language/es_VE/)\n"
+"Language-Team: Spanish (Venezuela) (http://www.transifex.com/projects/p/FusionDirectory-109/language/es_VE/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -47,7 +47,7 @@ msgstr ""
 
 #: admin/systems/argonaut/class_argonautClient.inc:135
 #: admin/systems/services/argonaut/class_argonautFuseConfig.inc:56
-#: admin/systems/services/argonaut/class_argonautMirrorConfig.inc:71
+#: admin/systems/services/argonaut/class_argonautMirrorConfig.inc:79
 #: admin/systems/services/argonaut/class_argonautServer.inc:79
 msgid "Log directory"
 msgstr "Directorio de rgistros"
@@ -78,6 +78,7 @@ msgid "Argonaut Fuse settings"
 msgstr ""
 
 #: admin/systems/services/argonaut/class_argonautFuseConfig.inc:32
+#: admin/systems/services/argonaut/class_argonautMirrorConfig.inc:32
 #: admin/systems/services/argonaut/class_argonautFuseFAIConfig.inc:33
 #: admin/systems/services/argonaut/class_argonautServer.inc:32
 #: admin/systems/services/argonaut/class_argonautFuseOPSIConfig.inc:33
@@ -110,88 +111,60 @@ msgstr "Ruta de configuraciÃ³n Pxelinux"
 msgid "Path where argonaut-fuse should store pxelinux.cfg"
 msgstr ""
 
-#: admin/systems/services/argonaut/class_argonautMirrorConfig.inc:29
-#: admin/systems/services/argonaut/class_argonautMirrorConfig.inc:30
+#: admin/systems/services/argonaut/class_argonautMirrorConfig.inc:31
+#: admin/systems/services/argonaut/class_argonautMirrorConfig.inc:32
 msgid "Argonaut Mirror settings"
 msgstr ""
 
-#: admin/systems/services/argonaut/class_argonautMirrorConfig.inc:41
+#: admin/systems/services/argonaut/class_argonautMirrorConfig.inc:46
 msgid "Argonaut mirror settings"
 msgstr "Opciones de espejo de Argonaut"
 
-#: admin/systems/services/argonaut/class_argonautMirrorConfig.inc:44
-msgid "Local Debian mirror directory"
-msgstr ""
+#: admin/systems/services/argonaut/class_argonautMirrorConfig.inc:49
+msgid "Local debian mirror directory"
+msgstr "Directorio local de repositorio Debian"
 
-#: admin/systems/services/argonaut/class_argonautMirrorConfig.inc:52
+#: admin/systems/services/argonaut/class_argonautMirrorConfig.inc:58
 msgid "Argonaut Debconf Crawler configuration"
 msgstr ""
 
-#: admin/systems/services/argonaut/class_argonautMirrorConfig.inc:55
+#: admin/systems/services/argonaut/class_argonautMirrorConfig.inc:61
 msgid "Local packages folder"
 msgstr "Directorio local de paquetes"
 
-#: admin/systems/services/argonaut/class_argonautMirrorConfig.inc:56
+#: admin/systems/services/argonaut/class_argonautMirrorConfig.inc:62
 msgid "Folder in which the crawler will store packages during analysis"
 msgstr ""
 
-#: admin/systems/services/argonaut/class_argonautMirrorConfig.inc:63
+#: admin/systems/services/argonaut/class_argonautMirrorConfig.inc:70
 msgid "Argonaut Repository configuration"
 msgstr ""
 
-#: admin/systems/services/argonaut/class_argonautMirrorConfig.inc:66
+#: admin/systems/services/argonaut/class_argonautMirrorConfig.inc:73
 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 ""
-
-#: admin/systems/services/argonaut/class_argonautMirrorConfig.inc:71
-msgid "Directory in which logs should be stored"
-msgstr ""
-
-#: admin/systems/services/argonaut/class_argonautMirrorConfig.inc:76
-msgid "Ignore errors"
-msgstr ""
-
-#: admin/systems/services/argonaut/class_argonautMirrorConfig.inc:77
-msgid ""
-"Causes debmirror to ignore missing or broken deb and source files but still "
-"be pedantic about checking meta files"
-msgstr ""
+#: admin/systems/services/argonaut/class_argonautMirrorConfig.inc:84
+msgid "Errors"
+msgstr "Errores"
 
-#: admin/systems/services/argonaut/class_argonautMirrorConfig.inc:82
+#: admin/systems/services/argonaut/class_argonautMirrorConfig.inc:91
 msgid "Source"
 msgstr "Origen"
 
-#: admin/systems/services/argonaut/class_argonautMirrorConfig.inc:82
-msgid "Include source in the mirror"
-msgstr ""
-
-#: admin/systems/services/argonaut/class_argonautMirrorConfig.inc:87
+#: admin/systems/services/argonaut/class_argonautMirrorConfig.inc:98
 msgid "GPG Check"
 msgstr "VerificaciÃ³n 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
+#: admin/systems/services/argonaut/class_argonautMirrorConfig.inc:105
 msgid "Contents"
 msgstr "Contenidos"
 
-#: 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
+#: admin/systems/services/argonaut/class_argonautMirrorConfig.inc:112
 msgid "Verbose"
 msgstr "Detallado"
 
-#: admin/systems/services/argonaut/class_argonautMirrorConfig.inc:98
+#: admin/systems/services/argonaut/class_argonautMirrorConfig.inc:113
 msgid "Wether to activate verbose mode"
 msgstr ""
 
@@ -398,9 +371,9 @@ msgid "LTSP server"
 msgstr "Servidor LTSP"
 
 #: addons/argonaut/class_filterArgonautEvents.inc:40
-#: addons/argonaut/class_argonautQueue.inc:160
-#: addons/argonaut/class_argonautQueue.inc:260
-#: addons/argonaut/class_argonautQueue.inc:335
+#: addons/argonaut/class_argonautQueue.inc:193
+#: addons/argonaut/class_argonautQueue.inc:307
+#: addons/argonaut/class_argonautQueue.inc:398
 msgid "Error"
 msgstr "Error"
 
@@ -412,8 +385,7 @@ msgstr "No se puede cargar entradas en la cola: %s"
 #: addons/argonaut/class_argonautImportFile.inc:44
 #: addons/argonaut/class_argonautImportFile.inc:100
 #: addons/argonaut/class_argonautImportFile.inc:141
-#: addons/argonaut/deploy-list.xml:79
-#: addons/argonaut/argonaut_import_file.tpl.c:68
+#: addons/argonaut/deploy-list.xml:99
 msgid "Import"
 msgstr "Importar"
 
@@ -427,8 +399,9 @@ msgid ""
 msgstr "Seleccione entradas que serÃ¡n ignoradas a causa de errores. Â¿Quiere proceder?"
 
 #: addons/argonaut/class_argonautImportFile.inc:134
-msgid "Infrastructure service"
-msgstr ""
+#: addons/argonaut/class_argonautQueue.inc:350
+msgid "Service infrastructure"
+msgstr "Infraestructura de servicio"
 
 #: addons/argonaut/class_argonautImportFile.inc:141
 #, php-format
@@ -436,84 +409,82 @@ 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:177
-#: addons/argonaut/argonaut_import_file.tpl.c:47
 msgid "MAC"
 msgstr "MAC"
 
 #: addons/argonaut/class_argonautImportFile.inc:180
 #: addons/argonaut/deploy-list.xml:14
-#: addons/argonaut/argonaut_import_file.tpl.c:50
 msgid "Event"
 msgstr "Evento"
 
-#: addons/argonaut/class_argonautQueue.inc:35
-#: addons/argonaut/class_argonautQueue.inc:41
+#: addons/argonaut/class_argonautQueue.inc:39
+#: addons/argonaut/class_argonautQueue.inc:45
 msgid "Deployment queue"
 msgstr ""
 
-#: addons/argonaut/class_argonautQueue.inc:36
+#: addons/argonaut/class_argonautQueue.inc:40
 msgid "Provide a mechanism to automatically activate systems"
 msgstr "Provee un mecanismo para activar sistemas automÃ¡ticamente"
 
-#: addons/argonaut/class_argonautQueue.inc:43
+#: addons/argonaut/class_argonautQueue.inc:47
 #: addons/argonaut/events/eventTargetSystems-list.xml:81
 msgid "Description"
 msgstr "DescripciÃ³n"
 
-#: addons/argonaut/class_argonautQueue.inc:141
+#: addons/argonaut/class_argonautQueue.inc:174
 msgid "immediately"
 msgstr "inmediatamente"
 
-#: addons/argonaut/class_argonautQueue.inc:156
+#: addons/argonaut/class_argonautQueue.inc:189
 msgid "Waiting"
 msgstr "Esperando"
 
-#: addons/argonaut/class_argonautQueue.inc:159
+#: addons/argonaut/class_argonautQueue.inc:192
 msgid "Show error"
 msgstr "Mostrar error"
 
-#: addons/argonaut/class_argonautQueue.inc:163
+#: addons/argonaut/class_argonautQueue.inc:196
 msgid "Processed"
 msgstr "Procesado"
 
-#: addons/argonaut/class_argonautQueue.inc:172
+#: addons/argonaut/class_argonautQueue.inc:205
 msgid "in progress"
 msgstr "en progreso"
 
-#: addons/argonaut/class_argonautQueue.inc:180
+#: addons/argonaut/class_argonautQueue.inc:226
 msgid "Permission"
 msgstr "Permisos"
 
-#: addons/argonaut/class_argonautQueue.inc:210
+#: addons/argonaut/class_argonautQueue.inc:256
 #: addons/argonaut/events/class_DaemonEvent.inc:258
-#: addons/argonaut/deploy-list.xml:86 addons/argonaut/deploy-list.xml:136
+#: addons/argonaut/deploy-list.xml:106 addons/argonaut/deploy-list.xml:166
 msgid "Remove"
 msgstr "Eliminar"
 
-#: addons/argonaut/class_argonautQueue.inc:211
+#: addons/argonaut/class_argonautQueue.inc:257
 #, 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:257
+#: addons/argonaut/class_argonautQueue.inc:304
 msgid "Info"
 msgstr "InformaciÃ³n"
 
-#: addons/argonaut/class_argonautQueue.inc:257
+#: addons/argonaut/class_argonautQueue.inc:304
 #, php-format
 msgid "%s"
 msgstr "%s"
 
-#: addons/argonaut/class_argonautQueue.inc:261
+#: addons/argonaut/class_argonautQueue.inc:308
 #, php-format
 msgid "Required class '%s' cannot be found: job not aborted!"
 msgstr "No se ha encontrado la clase necesaria '%s': Â¡no se ha cancelado el trabajo!"
 
-#: addons/argonaut/class_argonautQueue.inc:293
+#: addons/argonaut/class_argonautQueue.inc:340
 msgid "Error detail"
 msgstr "Detalles del error"
 
-#: addons/argonaut/class_argonautQueue.inc:335
+#: addons/argonaut/class_argonautQueue.inc:398
 #, php-format
 msgid "Cannot update queue entries."
 msgstr "No se puede actualizar las entradas de la cola."
@@ -588,17 +559,15 @@ msgid "Winstation"
 msgstr "EstaciÃ³n de trabajo Windows"
 
 #: addons/argonaut/events/eventTargetSystems-list.xml:47
-#: addons/argonaut/argonaut_import_file.tpl.c:53
 msgid "Object group"
 msgstr "Grupo de objetos"
 
 #: addons/argonaut/events/eventTargetSystems-list.xml:73
-#: addons/argonaut/events/eventTargetSystems-filter.tpl.c:20
+#: addons/argonaut/deploy-list.xml:36
 msgid "Name"
 msgstr "Nombre"
 
 #: addons/argonaut/events/eventTargetSystems-list.xml:89
-#: addons/argonaut/argonaut_import_file.tpl.c:62
 msgid "IP"
 msgstr "IP"
 
@@ -611,48 +580,53 @@ msgid "List of queued jobs"
 msgstr "Lista de trabajos en cola"
 
 #: addons/argonaut/deploy-list.xml:27
-#: addons/argonaut/events/DaemonEvent.tpl.c:17
 msgid "Target"
 msgstr "Objetivo"
 
-#: addons/argonaut/deploy-list.xml:35
+#: addons/argonaut/deploy-list.xml:45
 msgid "Task"
 msgstr "Tarea"
 
-#: addons/argonaut/deploy-list.xml:43
+#: addons/argonaut/deploy-list.xml:53
 msgid "Period"
 msgstr "Periodo"
 
-#: addons/argonaut/deploy-list.xml:51
-#: addons/argonaut/events/DaemonEvent.tpl.c:2
+#: addons/argonaut/deploy-list.xml:61
 msgid "Schedule"
 msgstr "ProgramaciÃ³n"
 
-#: addons/argonaut/deploy-list.xml:59
-#: addons/argonaut/events/DaemonEvent.tpl.c:11
+#: addons/argonaut/deploy-list.xml:69
 msgid "Status"
 msgstr "Estado"
 
-#: addons/argonaut/deploy-list.xml:67
+#: addons/argonaut/deploy-list.xml:77
 msgid "Actions"
 msgstr "Acciones"
 
-#: addons/argonaut/deploy-list.xml:97 addons/argonaut/deploy-list.xml:144
+#: addons/argonaut/deploy-list.xml:88
+msgid "Create"
+msgstr "Crear"
+
+#: addons/argonaut/deploy-list.xml:117 addons/argonaut/deploy-list.xml:174
 msgid "Abort"
 msgstr "Cancelar"
 
-#: addons/argonaut/deploy-list.xml:108
+#: addons/argonaut/deploy-list.xml:128
 msgid "Execute"
 msgstr "Ejecute"
 
-#: addons/argonaut/deploy-list.xml:120
+#: addons/argonaut/deploy-list.xml:140
 msgid "Process now"
 msgstr "Procesar ahora"
 
-#: addons/argonaut/deploy-list.xml:128
+#: addons/argonaut/deploy-list.xml:148
 msgid "View logs"
 msgstr "Ver registros"
 
+#: addons/argonaut/deploy-list.xml:157
+msgid "Edit"
+msgstr "Editar"
+
 #: include/class_supportDaemon.inc:89
 msgid "Multiple argonaut server found. Only one is supported"
 msgstr "Varios servidores Argonaut encontrados. Solo se soporta uno"
@@ -670,162 +644,3 @@ msgstr ""
 #, php-format
 msgid "\"%s\" is not a file!"
 msgstr ""
-
-#: addons/argonaut/argonaut_import_file.tpl.c:2
-msgid "Import jobs"
-msgstr "Importar trabajos"
-
-#: addons/argonaut/argonaut_import_file.tpl.c:5
-msgid ""
-"You can import a list of jobs into the FusionDirectory job queue. This "
-"should be a semicolon seperated list of items in the following format:"
-msgstr "Puede importar una lista de trabajos a la cola de trabajos de FusionDirectory. Esta debe ser una lista separada por punto y coma de entradas en el siguiente formato:"
-
-#: addons/argonaut/argonaut_import_file.tpl.c:8
-msgid "timestamp"
-msgstr "marca de tiempo"
-
-#: addons/argonaut/argonaut_import_file.tpl.c:11
-msgid "MAC-address"
-msgstr "DirecciÃ³n MAC"
-
-#: addons/argonaut/argonaut_import_file.tpl.c:14
-msgid "job type"
-msgstr "Tipo de trabajo"
-
-#: addons/argonaut/argonaut_import_file.tpl.c:17
-msgid "object group"
-msgstr "grupo de objetos"
-
-#: addons/argonaut/argonaut_import_file.tpl.c:20
-msgid "import base"
-msgstr "importar base"
-
-#: addons/argonaut/argonaut_import_file.tpl.c:23
-msgid "full hostname"
-msgstr "nombre de dominio cualificado (fqdn)"
-
-#: addons/argonaut/argonaut_import_file.tpl.c:26
-msgid "IP-address"
-msgstr "DirecciÃ³n IP"
-
-#: addons/argonaut/argonaut_import_file.tpl.c:29
-msgid "DHCP group"
-msgstr "Grupo DHCP"
-
-#: addons/argonaut/argonaut_import_file.tpl.c:32
-msgid "Example"
-msgstr "Ejemplo"
-
-#: addons/argonaut/argonaut_import_file.tpl.c:35
-msgid "Select list to import"
-msgstr "Seleccione lista a importar"
-
-#: addons/argonaut/argonaut_import_file.tpl.c:38
-msgid "Browse"
-msgstr "Visualizar"
-
-#: addons/argonaut/argonaut_import_file.tpl.c:41
-msgid "Upload"
-msgstr "Enviar"
-
-#: addons/argonaut/argonaut_import_file.tpl.c:44
-#: addons/argonaut/events/DaemonEvent.tpl.c:20
-msgid "Timestamp"
-msgstr "Marca de tiempo"
-
-#: addons/argonaut/argonaut_import_file.tpl.c:56
-msgid "Base"
-msgstr "Base"
-
-#: addons/argonaut/argonaut_import_file.tpl.c:59
-msgid "FQDN"
-msgstr "FQDN"
-
-#: addons/argonaut/argonaut_import_file.tpl.c:65
-msgid "DHCP"
-msgstr "DHCP"
-
-#: addons/argonaut/events/target_list.tpl.c:2
-msgid "Apply"
-msgstr "Aplicar"
-
-#: addons/argonaut/events/target_list.tpl.c:5
-msgid "Cancel"
-msgstr "Cancelar"
-
-#: addons/argonaut/events/DaemonEvent.tpl.c:5
-msgid "System list"
-msgstr "Lista de sistemas"
-
-#: addons/argonaut/events/DaemonEvent.tpl.c:8
-msgid "ID"
-msgstr "ID"
-
-#: addons/argonaut/events/DaemonEvent.tpl.c:14
-msgid "Result"
-msgstr "Resultado"
-
-#: addons/argonaut/events/eventTargetSystems-filter.tpl.c:2
-msgid "Filter"
-msgstr "Filtro"
-
-#: addons/argonaut/events/eventTargetSystems-filter.tpl.c:5
-msgid "Show servers"
-msgstr "Mostrar servidores"
-
-#: addons/argonaut/events/eventTargetSystems-filter.tpl.c:8
-msgid "Show workstations"
-msgstr "Mostrar estaciones de trabajo"
-
-#: addons/argonaut/events/eventTargetSystems-filter.tpl.c:11
-msgid "Show terminals"
-msgstr "Mostrar terminales"
-
-#: addons/argonaut/events/eventTargetSystems-filter.tpl.c:14
-msgid "Show winstations"
-msgstr ""
-
-#: addons/argonaut/events/eventTargetSystems-filter.tpl.c:17
-msgid "Filter by IP address range"
-msgstr "Filtrar por rango de direcciones IP"
-
-#: addons/argonaut/events/timestamp_select.tpl.c:2
-msgid "Year"
-msgstr "AÃ±o"
-
-#: addons/argonaut/events/timestamp_select.tpl.c:5
-msgid "Month"
-msgstr "Mes"
-
-#: addons/argonaut/events/timestamp_select.tpl.c:8
-msgid "Day"
-msgstr "DÃa"
-
-#: addons/argonaut/events/timestamp_select.tpl.c:11
-msgid "Hour"
-msgstr "Hora"
-
-#: addons/argonaut/events/timestamp_select.tpl.c:14
-msgid "Minute"
-msgstr "Minuto"
-
-#: addons/argonaut/events/timestamp_select.tpl.c:17
-msgid "Second"
-msgstr "Segundo"
-
-#: addons/argonaut/events/timestamp_select.tpl.c:20
-msgid "Periodical job"
-msgstr "Tareas periÃ³dicas"
-
-#: addons/argonaut/events/timestamp_select.tpl.c:23
-msgid "Job intervall"
-msgstr "Intervalo de trabajo"
-
-#: addons/argonaut/remove.tpl.c:2
-msgid "Warning"
-msgstr "Aviso"
-
-#: addons/argonaut/remove.tpl.c:5
-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."
diff --git a/argonaut/locale/fa_IR/fusiondirectory.po b/argonaut/locale/fa_IR/fusiondirectory.po
index 2965722a97b91326137182ea9efd1da208b0392d..dab2706fda49f4361fc7453ac20d179d8b173b07 100644
--- a/argonaut/locale/fa_IR/fusiondirectory.po
+++ b/argonaut/locale/fa_IR/fusiondirectory.po
@@ -5,12 +5,12 @@
 # Translators:
 msgid ""
 msgstr ""
-"Project-Id-Version: FusionDirectory-108\n"
+"Project-Id-Version: FusionDirectory-109\n"
 "Report-Msgid-Bugs-To: documentation@lists.fusiondirectory.org\n"
-"POT-Creation-Date: 2015-03-31 11:49+0200\n"
-"PO-Revision-Date: 2015-03-17 17:47+0000\n"
+"POT-Creation-Date: 2014-12-15 17:47+0100\n"
+"PO-Revision-Date: 2014-12-15 16:48+0000\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>\n"
-"Language-Team: Persian (Iran) (http://www.transifex.com/projects/p/FusionDirectory-108/language/fa_IR/)\n"
+"Language-Team: Persian (Iran) (http://www.transifex.com/projects/p/FusionDirectory-109/language/fa_IR/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -47,7 +47,7 @@ msgstr ""
 
 #: admin/systems/argonaut/class_argonautClient.inc:135
 #: admin/systems/services/argonaut/class_argonautFuseConfig.inc:56
-#: admin/systems/services/argonaut/class_argonautMirrorConfig.inc:71
+#: admin/systems/services/argonaut/class_argonautMirrorConfig.inc:79
 #: admin/systems/services/argonaut/class_argonautServer.inc:79
 msgid "Log directory"
 msgstr ""
@@ -78,6 +78,7 @@ msgid "Argonaut Fuse settings"
 msgstr ""
 
 #: admin/systems/services/argonaut/class_argonautFuseConfig.inc:32
+#: admin/systems/services/argonaut/class_argonautMirrorConfig.inc:32
 #: admin/systems/services/argonaut/class_argonautFuseFAIConfig.inc:33
 #: admin/systems/services/argonaut/class_argonautServer.inc:32
 #: admin/systems/services/argonaut/class_argonautFuseOPSIConfig.inc:33
@@ -110,88 +111,60 @@ msgstr ""
 msgid "Path where argonaut-fuse should store pxelinux.cfg"
 msgstr ""
 
-#: admin/systems/services/argonaut/class_argonautMirrorConfig.inc:29
-#: admin/systems/services/argonaut/class_argonautMirrorConfig.inc:30
+#: admin/systems/services/argonaut/class_argonautMirrorConfig.inc:31
+#: admin/systems/services/argonaut/class_argonautMirrorConfig.inc:32
 msgid "Argonaut Mirror settings"
 msgstr ""
 
-#: admin/systems/services/argonaut/class_argonautMirrorConfig.inc:41
+#: admin/systems/services/argonaut/class_argonautMirrorConfig.inc:46
 msgid "Argonaut mirror settings"
 msgstr ""
 
-#: admin/systems/services/argonaut/class_argonautMirrorConfig.inc:44
-msgid "Local Debian mirror directory"
+#: admin/systems/services/argonaut/class_argonautMirrorConfig.inc:49
+msgid "Local debian mirror directory"
 msgstr ""
 
-#: admin/systems/services/argonaut/class_argonautMirrorConfig.inc:52
+#: admin/systems/services/argonaut/class_argonautMirrorConfig.inc:58
 msgid "Argonaut Debconf Crawler configuration"
 msgstr ""
 
-#: admin/systems/services/argonaut/class_argonautMirrorConfig.inc:55
+#: admin/systems/services/argonaut/class_argonautMirrorConfig.inc:61
 msgid "Local packages folder"
 msgstr ""
 
-#: admin/systems/services/argonaut/class_argonautMirrorConfig.inc:56
+#: admin/systems/services/argonaut/class_argonautMirrorConfig.inc:62
 msgid "Folder in which the crawler will store packages during analysis"
 msgstr ""
 
-#: admin/systems/services/argonaut/class_argonautMirrorConfig.inc:63
+#: admin/systems/services/argonaut/class_argonautMirrorConfig.inc:70
 msgid "Argonaut Repository configuration"
 msgstr ""
 
-#: admin/systems/services/argonaut/class_argonautMirrorConfig.inc:66
+#: admin/systems/services/argonaut/class_argonautMirrorConfig.inc:73
 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"
+#: admin/systems/services/argonaut/class_argonautMirrorConfig.inc:84
+msgid "Errors"
 msgstr ""
 
-#: admin/systems/services/argonaut/class_argonautMirrorConfig.inc:71
-msgid "Directory in which logs should be stored"
-msgstr ""
-
-#: admin/systems/services/argonaut/class_argonautMirrorConfig.inc:76
-msgid "Ignore errors"
-msgstr ""
-
-#: admin/systems/services/argonaut/class_argonautMirrorConfig.inc:77
-msgid ""
-"Causes debmirror to ignore missing or broken deb and source files but still "
-"be pedantic about checking meta files"
-msgstr ""
-
-#: admin/systems/services/argonaut/class_argonautMirrorConfig.inc:82
+#: admin/systems/services/argonaut/class_argonautMirrorConfig.inc:91
 msgid "Source"
 msgstr ""
 
-#: admin/systems/services/argonaut/class_argonautMirrorConfig.inc:82
-msgid "Include source in the mirror"
-msgstr ""
-
-#: admin/systems/services/argonaut/class_argonautMirrorConfig.inc:87
+#: admin/systems/services/argonaut/class_argonautMirrorConfig.inc:98
 msgid "GPG Check"
 msgstr ""
 
-#: admin/systems/services/argonaut/class_argonautMirrorConfig.inc:87
-msgid "Fail if the Release.gpg file is missing"
-msgstr ""
-
-#: admin/systems/services/argonaut/class_argonautMirrorConfig.inc:92
+#: admin/systems/services/argonaut/class_argonautMirrorConfig.inc:105
 msgid "Contents"
 msgstr ""
 
-#: admin/systems/services/argonaut/class_argonautMirrorConfig.inc:93
-msgid ""
-"Additionally download Contents.<arch>.gz files (Note that these files can be"
-" relatively big and can change frequently)"
-msgstr ""
-
-#: admin/systems/services/argonaut/class_argonautMirrorConfig.inc:98
+#: admin/systems/services/argonaut/class_argonautMirrorConfig.inc:112
 msgid "Verbose"
 msgstr ""
 
-#: admin/systems/services/argonaut/class_argonautMirrorConfig.inc:98
+#: admin/systems/services/argonaut/class_argonautMirrorConfig.inc:113
 msgid "Wether to activate verbose mode"
 msgstr ""
 
@@ -398,9 +371,9 @@ msgid "LTSP server"
 msgstr ""
 
 #: addons/argonaut/class_filterArgonautEvents.inc:40
-#: addons/argonaut/class_argonautQueue.inc:160
-#: addons/argonaut/class_argonautQueue.inc:260
-#: addons/argonaut/class_argonautQueue.inc:335
+#: addons/argonaut/class_argonautQueue.inc:193
+#: addons/argonaut/class_argonautQueue.inc:307
+#: addons/argonaut/class_argonautQueue.inc:398
 msgid "Error"
 msgstr "Ø®Ø·Ø§"
 
@@ -412,8 +385,7 @@ msgstr ""
 #: addons/argonaut/class_argonautImportFile.inc:44
 #: addons/argonaut/class_argonautImportFile.inc:100
 #: addons/argonaut/class_argonautImportFile.inc:141
-#: addons/argonaut/deploy-list.xml:79
-#: addons/argonaut/argonaut_import_file.tpl.c:68
+#: addons/argonaut/deploy-list.xml:99
 msgid "Import"
 msgstr ""
 
@@ -427,7 +399,8 @@ msgid ""
 msgstr ""
 
 #: addons/argonaut/class_argonautImportFile.inc:134
-msgid "Infrastructure service"
+#: addons/argonaut/class_argonautQueue.inc:350
+msgid "Service infrastructure"
 msgstr ""
 
 #: addons/argonaut/class_argonautImportFile.inc:141
@@ -436,84 +409,82 @@ msgid "Import complete: %s events successfully send, %s failed"
 msgstr ""
 
 #: addons/argonaut/class_argonautImportFile.inc:177
-#: addons/argonaut/argonaut_import_file.tpl.c:47
 msgid "MAC"
 msgstr ""
 
 #: addons/argonaut/class_argonautImportFile.inc:180
 #: addons/argonaut/deploy-list.xml:14
-#: addons/argonaut/argonaut_import_file.tpl.c:50
 msgid "Event"
 msgstr ""
 
-#: addons/argonaut/class_argonautQueue.inc:35
-#: addons/argonaut/class_argonautQueue.inc:41
+#: addons/argonaut/class_argonautQueue.inc:39
+#: addons/argonaut/class_argonautQueue.inc:45
 msgid "Deployment queue"
 msgstr ""
 
-#: addons/argonaut/class_argonautQueue.inc:36
+#: addons/argonaut/class_argonautQueue.inc:40
 msgid "Provide a mechanism to automatically activate systems"
 msgstr ""
 
-#: addons/argonaut/class_argonautQueue.inc:43
+#: addons/argonaut/class_argonautQueue.inc:47
 #: addons/argonaut/events/eventTargetSystems-list.xml:81
 msgid "Description"
 msgstr ""
 
-#: addons/argonaut/class_argonautQueue.inc:141
+#: addons/argonaut/class_argonautQueue.inc:174
 msgid "immediately"
 msgstr ""
 
-#: addons/argonaut/class_argonautQueue.inc:156
+#: addons/argonaut/class_argonautQueue.inc:189
 msgid "Waiting"
 msgstr ""
 
-#: addons/argonaut/class_argonautQueue.inc:159
+#: addons/argonaut/class_argonautQueue.inc:192
 msgid "Show error"
 msgstr ""
 
-#: addons/argonaut/class_argonautQueue.inc:163
+#: addons/argonaut/class_argonautQueue.inc:196
 msgid "Processed"
 msgstr ""
 
-#: addons/argonaut/class_argonautQueue.inc:172
+#: addons/argonaut/class_argonautQueue.inc:205
 msgid "in progress"
 msgstr ""
 
-#: addons/argonaut/class_argonautQueue.inc:180
+#: addons/argonaut/class_argonautQueue.inc:226
 msgid "Permission"
 msgstr "Ø¬ÙˆØ§Ø²"
 
-#: addons/argonaut/class_argonautQueue.inc:210
+#: addons/argonaut/class_argonautQueue.inc:256
 #: addons/argonaut/events/class_DaemonEvent.inc:258
-#: addons/argonaut/deploy-list.xml:86 addons/argonaut/deploy-list.xml:136
+#: addons/argonaut/deploy-list.xml:106 addons/argonaut/deploy-list.xml:166
 msgid "Remove"
 msgstr ""
 
-#: addons/argonaut/class_argonautQueue.inc:211
+#: addons/argonaut/class_argonautQueue.inc:257
 #, php-format
 msgid "The following jobs couldn't be deleted, they have to be aborted: %s"
 msgstr ""
 
-#: addons/argonaut/class_argonautQueue.inc:257
+#: addons/argonaut/class_argonautQueue.inc:304
 msgid "Info"
 msgstr ""
 
-#: addons/argonaut/class_argonautQueue.inc:257
+#: addons/argonaut/class_argonautQueue.inc:304
 #, php-format
 msgid "%s"
 msgstr ""
 
-#: addons/argonaut/class_argonautQueue.inc:261
+#: addons/argonaut/class_argonautQueue.inc:308
 #, php-format
 msgid "Required class '%s' cannot be found: job not aborted!"
 msgstr ""
 
-#: addons/argonaut/class_argonautQueue.inc:293
+#: addons/argonaut/class_argonautQueue.inc:340
 msgid "Error detail"
 msgstr ""
 
-#: addons/argonaut/class_argonautQueue.inc:335
+#: addons/argonaut/class_argonautQueue.inc:398
 #, php-format
 msgid "Cannot update queue entries."
 msgstr ""
@@ -588,17 +559,15 @@ msgid "Winstation"
 msgstr ""
 
 #: addons/argonaut/events/eventTargetSystems-list.xml:47
-#: addons/argonaut/argonaut_import_file.tpl.c:53
 msgid "Object group"
 msgstr ""
 
 #: addons/argonaut/events/eventTargetSystems-list.xml:73
-#: addons/argonaut/events/eventTargetSystems-filter.tpl.c:20
+#: addons/argonaut/deploy-list.xml:36
 msgid "Name"
 msgstr ""
 
 #: addons/argonaut/events/eventTargetSystems-list.xml:89
-#: addons/argonaut/argonaut_import_file.tpl.c:62
 msgid "IP"
 msgstr ""
 
@@ -611,48 +580,53 @@ msgid "List of queued jobs"
 msgstr ""
 
 #: addons/argonaut/deploy-list.xml:27
-#: addons/argonaut/events/DaemonEvent.tpl.c:17
 msgid "Target"
 msgstr ""
 
-#: addons/argonaut/deploy-list.xml:35
+#: addons/argonaut/deploy-list.xml:45
 msgid "Task"
 msgstr ""
 
-#: addons/argonaut/deploy-list.xml:43
+#: addons/argonaut/deploy-list.xml:53
 msgid "Period"
 msgstr ""
 
-#: addons/argonaut/deploy-list.xml:51
-#: addons/argonaut/events/DaemonEvent.tpl.c:2
+#: addons/argonaut/deploy-list.xml:61
 msgid "Schedule"
 msgstr ""
 
-#: addons/argonaut/deploy-list.xml:59
-#: addons/argonaut/events/DaemonEvent.tpl.c:11
+#: addons/argonaut/deploy-list.xml:69
 msgid "Status"
 msgstr ""
 
-#: addons/argonaut/deploy-list.xml:67
+#: addons/argonaut/deploy-list.xml:77
 msgid "Actions"
 msgstr ""
 
-#: addons/argonaut/deploy-list.xml:97 addons/argonaut/deploy-list.xml:144
+#: addons/argonaut/deploy-list.xml:88
+msgid "Create"
+msgstr ""
+
+#: addons/argonaut/deploy-list.xml:117 addons/argonaut/deploy-list.xml:174
 msgid "Abort"
 msgstr ""
 
-#: addons/argonaut/deploy-list.xml:108
+#: addons/argonaut/deploy-list.xml:128
 msgid "Execute"
 msgstr ""
 
-#: addons/argonaut/deploy-list.xml:120
+#: addons/argonaut/deploy-list.xml:140
 msgid "Process now"
 msgstr ""
 
-#: addons/argonaut/deploy-list.xml:128
+#: addons/argonaut/deploy-list.xml:148
 msgid "View logs"
 msgstr ""
 
+#: addons/argonaut/deploy-list.xml:157
+msgid "Edit"
+msgstr ""
+
 #: include/class_supportDaemon.inc:89
 msgid "Multiple argonaut server found. Only one is supported"
 msgstr ""
@@ -670,162 +644,3 @@ msgstr ""
 #, php-format
 msgid "\"%s\" is not a file!"
 msgstr ""
-
-#: addons/argonaut/argonaut_import_file.tpl.c:2
-msgid "Import jobs"
-msgstr ""
-
-#: addons/argonaut/argonaut_import_file.tpl.c:5
-msgid ""
-"You can import a list of jobs into the FusionDirectory job queue. This "
-"should be a semicolon seperated list of items in the following format:"
-msgstr ""
-
-#: addons/argonaut/argonaut_import_file.tpl.c:8
-msgid "timestamp"
-msgstr ""
-
-#: addons/argonaut/argonaut_import_file.tpl.c:11
-msgid "MAC-address"
-msgstr ""
-
-#: addons/argonaut/argonaut_import_file.tpl.c:14
-msgid "job type"
-msgstr ""
-
-#: addons/argonaut/argonaut_import_file.tpl.c:17
-msgid "object group"
-msgstr ""
-
-#: addons/argonaut/argonaut_import_file.tpl.c:20
-msgid "import base"
-msgstr ""
-
-#: addons/argonaut/argonaut_import_file.tpl.c:23
-msgid "full hostname"
-msgstr ""
-
-#: addons/argonaut/argonaut_import_file.tpl.c:26
-msgid "IP-address"
-msgstr ""
-
-#: addons/argonaut/argonaut_import_file.tpl.c:29
-msgid "DHCP group"
-msgstr ""
-
-#: addons/argonaut/argonaut_import_file.tpl.c:32
-msgid "Example"
-msgstr ""
-
-#: addons/argonaut/argonaut_import_file.tpl.c:35
-msgid "Select list to import"
-msgstr ""
-
-#: addons/argonaut/argonaut_import_file.tpl.c:38
-msgid "Browse"
-msgstr ""
-
-#: addons/argonaut/argonaut_import_file.tpl.c:41
-msgid "Upload"
-msgstr ""
-
-#: addons/argonaut/argonaut_import_file.tpl.c:44
-#: addons/argonaut/events/DaemonEvent.tpl.c:20
-msgid "Timestamp"
-msgstr ""
-
-#: addons/argonaut/argonaut_import_file.tpl.c:56
-msgid "Base"
-msgstr ""
-
-#: addons/argonaut/argonaut_import_file.tpl.c:59
-msgid "FQDN"
-msgstr ""
-
-#: addons/argonaut/argonaut_import_file.tpl.c:65
-msgid "DHCP"
-msgstr ""
-
-#: addons/argonaut/events/target_list.tpl.c:2
-msgid "Apply"
-msgstr ""
-
-#: addons/argonaut/events/target_list.tpl.c:5
-msgid "Cancel"
-msgstr ""
-
-#: addons/argonaut/events/DaemonEvent.tpl.c:5
-msgid "System list"
-msgstr ""
-
-#: addons/argonaut/events/DaemonEvent.tpl.c:8
-msgid "ID"
-msgstr ""
-
-#: addons/argonaut/events/DaemonEvent.tpl.c:14
-msgid "Result"
-msgstr ""
-
-#: addons/argonaut/events/eventTargetSystems-filter.tpl.c:2
-msgid "Filter"
-msgstr ""
-
-#: addons/argonaut/events/eventTargetSystems-filter.tpl.c:5
-msgid "Show servers"
-msgstr ""
-
-#: addons/argonaut/events/eventTargetSystems-filter.tpl.c:8
-msgid "Show workstations"
-msgstr ""
-
-#: addons/argonaut/events/eventTargetSystems-filter.tpl.c:11
-msgid "Show terminals"
-msgstr ""
-
-#: addons/argonaut/events/eventTargetSystems-filter.tpl.c:14
-msgid "Show winstations"
-msgstr ""
-
-#: addons/argonaut/events/eventTargetSystems-filter.tpl.c:17
-msgid "Filter by IP address range"
-msgstr ""
-
-#: addons/argonaut/events/timestamp_select.tpl.c:2
-msgid "Year"
-msgstr ""
-
-#: addons/argonaut/events/timestamp_select.tpl.c:5
-msgid "Month"
-msgstr ""
-
-#: addons/argonaut/events/timestamp_select.tpl.c:8
-msgid "Day"
-msgstr ""
-
-#: addons/argonaut/events/timestamp_select.tpl.c:11
-msgid "Hour"
-msgstr ""
-
-#: addons/argonaut/events/timestamp_select.tpl.c:14
-msgid "Minute"
-msgstr ""
-
-#: addons/argonaut/events/timestamp_select.tpl.c:17
-msgid "Second"
-msgstr ""
-
-#: addons/argonaut/events/timestamp_select.tpl.c:20
-msgid "Periodical job"
-msgstr ""
-
-#: addons/argonaut/events/timestamp_select.tpl.c:23
-msgid "Job intervall"
-msgstr ""
-
-#: addons/argonaut/remove.tpl.c:2
-msgid "Warning"
-msgstr ""
-
-#: addons/argonaut/remove.tpl.c:5
-msgid "So - if you're sure - press 'Delete' to continue or 'Cancel' to abort."
-msgstr ""
diff --git a/argonaut/locale/fr/fusiondirectory.po b/argonaut/locale/fr/fusiondirectory.po
index f5624337ef024bf8dfd958d5d6a3211fbd0886ee..66dc70d405d1929905dc2f5debf5a0fa75e5a6e3 100644
--- a/argonaut/locale/fr/fusiondirectory.po
+++ b/argonaut/locale/fr/fusiondirectory.po
@@ -3,22 +3,14 @@
 # This file is distributed under the same license as the PACKAGE package.
 # 
 # Translators:
-# gallak <antoine.gallavardin@free.fr>, 2013
-# MCMic, 2014
-# fusiondirectory <contact@fusiondirectory.org>, 2013-2014
-# fusiondirectory <contact@fusiondirectory.org>, 2013
-# gallak <antoine.gallavardin@free.fr>, 2013
-# poterealpopolo <giuliano@opensides.be>, 2012
-# MCMic, 2014
-# poterealpopolo <giuliano@opensides.be>, 2012
 msgid ""
 msgstr ""
-"Project-Id-Version: FusionDirectory-108\n"
+"Project-Id-Version: FusionDirectory-109\n"
 "Report-Msgid-Bugs-To: documentation@lists.fusiondirectory.org\n"
-"POT-Creation-Date: 2015-03-31 11:49+0200\n"
-"PO-Revision-Date: 2015-03-31 11:41+0000\n"
+"POT-Creation-Date: 2014-12-15 17:47+0100\n"
+"PO-Revision-Date: 2015-02-25 16:13+0000\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>\n"
-"Language-Team: French (http://www.transifex.com/projects/p/FusionDirectory-108/language/fr/)\n"
+"Language-Team: French (http://www.transifex.com/projects/p/FusionDirectory-109/language/fr/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -35,7 +27,7 @@ msgstr "Port du client"
 
 #: admin/systems/argonaut/class_argonautClient.inc:120
 msgid "Port used by argonaut client for JSON-RPC"
-msgstr "Port utilisÃ© par le client Argonaut pour les requÃªtes JSON-RPC"
+msgstr "Port utilisÃ© par le client Argonaut pour le dialogue JSON-RPC"
 
 #: admin/systems/argonaut/class_argonautClient.inc:125
 msgid "WakeOnLan interface"
@@ -47,22 +39,22 @@ msgstr "Interface utilisÃ© par argonaut pour le WakeOnLan :"
 
 #: admin/systems/argonaut/class_argonautClient.inc:130
 msgid "TaskId file"
-msgstr "Fichier contenant les ids de tÃ¢ches"
+msgstr "Nom du fichier contenant les id des tÃ¢ches"
 
 #: admin/systems/argonaut/class_argonautClient.inc:130
 msgid "File which argonaut will use to store its task id when booting"
-msgstr "Fichier qu'Argonaut va utiliser pour stocker les ids de tÃ¢ches au dÃ©marrage"
+msgstr "Fichier qu'Argonaut va utilisÃ© pour stocker les tÃ¢ches au dÃ©marrage"
 
 #: admin/systems/argonaut/class_argonautClient.inc:135
 #: admin/systems/services/argonaut/class_argonautFuseConfig.inc:56
-#: admin/systems/services/argonaut/class_argonautMirrorConfig.inc:71
+#: admin/systems/services/argonaut/class_argonautMirrorConfig.inc:79
 #: admin/systems/services/argonaut/class_argonautServer.inc:79
 msgid "Log directory"
-msgstr "RÃ©pertoire des journaux systÃ¨mes"
+msgstr "RÃ©pertoire des Journaux systÃ¨mes"
 
 #: admin/systems/argonaut/class_argonautClient.inc:135
 msgid "Directory in which argonaut client should write its logs"
-msgstr "Dossier des journaux systÃ¨mes du client Argonaut"
+msgstr "Dossier d'Ã©criture des logs du client Argonaut"
 
 #: admin/systems/argonaut/class_argonautClient.inc:142
 msgid "Service names"
@@ -70,7 +62,7 @@ msgstr "Nom des services"
 
 #: admin/systems/argonaut/class_argonautClient.inc:144
 msgid "Argonaut service names"
-msgstr "Noms de services pour Argonaut"
+msgstr "Nom du service argonaut"
 
 #: admin/systems/argonaut/class_argonautClient.inc:159
 msgid "Argonaut client"
@@ -78,7 +70,7 @@ msgstr "Client Argonaut"
 
 #: admin/systems/argonaut/class_argonautClient.inc:160
 msgid "Edit argonaut client settings"
-msgstr "Ã‰dition des paramÃ¨tres du client Argonaut"
+msgstr "Ã‰dition des paramÃ¨tres du client argonaut"
 
 #: admin/systems/services/argonaut/class_argonautFuseConfig.inc:31
 #: admin/systems/services/argonaut/class_argonautFuseConfig.inc:32
@@ -86,13 +78,14 @@ msgid "Argonaut Fuse settings"
 msgstr "ParamÃ¨tres de Argonaut Fuse"
 
 #: admin/systems/services/argonaut/class_argonautFuseConfig.inc:32
+#: admin/systems/services/argonaut/class_argonautMirrorConfig.inc:32
 #: 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"
+msgstr "Service"
 
 #: admin/systems/services/argonaut/class_argonautFuseConfig.inc:46
 msgid "Basic settings"
@@ -104,7 +97,7 @@ msgstr "Mode par dÃ©faut"
 
 #: admin/systems/services/argonaut/class_argonautFuseConfig.inc:57
 msgid "Directory in which argonaut-fuse will store its log"
-msgstr "Dossier des jounaux systÃ¨mes de argonaut-fuse"
+msgstr "Dossier d'Ã©criture des logs du systÃ¨me argonaut fuse"
 
 #: admin/systems/services/argonaut/class_argonautFuseConfig.inc:65
 msgid "TFTP"
@@ -118,88 +111,60 @@ msgstr "RÃ©pertoire des fichiers pxelinux"
 msgid "Path where argonaut-fuse should store pxelinux.cfg"
 msgstr "Chemin oÃ¹ argonaut-fuse stockera le fichier \"pxelinux.cfg\""
 
-#: admin/systems/services/argonaut/class_argonautMirrorConfig.inc:29
-#: admin/systems/services/argonaut/class_argonautMirrorConfig.inc:30
+#: admin/systems/services/argonaut/class_argonautMirrorConfig.inc:31
+#: admin/systems/services/argonaut/class_argonautMirrorConfig.inc:32
 msgid "Argonaut Mirror settings"
-msgstr "ParamÃ¨tres des miroirs Argonaut"
+msgstr "ParamÃ¨tres des mirroirs Argonaut"
 
-#: admin/systems/services/argonaut/class_argonautMirrorConfig.inc:41
+#: admin/systems/services/argonaut/class_argonautMirrorConfig.inc:46
 msgid "Argonaut mirror settings"
-msgstr "ParamÃ¨tres des miroirs Argonaut"
+msgstr "Service Argonaut miroir"
 
-#: admin/systems/services/argonaut/class_argonautMirrorConfig.inc:44
-msgid "Local Debian mirror directory"
-msgstr "RÃ©pertoire du miroir Debian local"
+#: admin/systems/services/argonaut/class_argonautMirrorConfig.inc:49
+msgid "Local debian mirror directory"
+msgstr "Repertoire du mirroir Debian local"
 
-#: admin/systems/services/argonaut/class_argonautMirrorConfig.inc:52
+#: admin/systems/services/argonaut/class_argonautMirrorConfig.inc:58
 msgid "Argonaut Debconf Crawler configuration"
 msgstr "Configuration du module debconf crawler d'Argonaut"
 
-#: admin/systems/services/argonaut/class_argonautMirrorConfig.inc:55
+#: admin/systems/services/argonaut/class_argonautMirrorConfig.inc:61
 msgid "Local packages folder"
-msgstr "RÃ©pertoire local des paquets"
+msgstr "RÃ©pertoire des paquets locaux"
 
-#: admin/systems/services/argonaut/class_argonautMirrorConfig.inc:56
+#: admin/systems/services/argonaut/class_argonautMirrorConfig.inc:62
 msgid "Folder in which the crawler will store packages during analysis"
-msgstr "Dossier de stockage des paquets durant leur analyse"
+msgstr "Dossier de stockage des paquets durant durant leur analyse"
 
-#: admin/systems/services/argonaut/class_argonautMirrorConfig.inc:63
+#: admin/systems/services/argonaut/class_argonautMirrorConfig.inc:70
 msgid "Argonaut Repository configuration"
-msgstr "Configuration des dÃ©pÃ´ts Argonaut"
+msgstr "Configuration des dÃ©pÃ´ts argonaut"
 
-#: admin/systems/services/argonaut/class_argonautMirrorConfig.inc:66
+#: admin/systems/services/argonaut/class_argonautMirrorConfig.inc:73
 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 "Le proxy http (comme Squid) Ã  utiliser pour les mÃ©thode http et hftp"
+#: admin/systems/services/argonaut/class_argonautMirrorConfig.inc:84
+msgid "Errors"
+msgstr "Erreurs"
 
-#: 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"
-
-#: admin/systems/services/argonaut/class_argonautMirrorConfig.inc:76
-msgid "Ignore errors"
-msgstr "Ignorer les erreurs"
-
-#: 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 fichier meta"
-
-#: admin/systems/services/argonaut/class_argonautMirrorConfig.inc:82
+#: admin/systems/services/argonaut/class_argonautMirrorConfig.inc:91
 msgid "Source"
-msgstr "Source"
+msgstr "Emetteur"
 
-#: admin/systems/services/argonaut/class_argonautMirrorConfig.inc:82
-msgid "Include source in the mirror"
-msgstr "Inclus les sources dans le miroir"
-
-#: admin/systems/services/argonaut/class_argonautMirrorConfig.inc:87
+#: admin/systems/services/argonaut/class_argonautMirrorConfig.inc:98
 msgid "GPG Check"
-msgstr "VÃ©rification GPG"
+msgstr "Verification GPG"
 
-#: 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"
-
-#: admin/systems/services/argonaut/class_argonautMirrorConfig.inc:92
+#: admin/systems/services/argonaut/class_argonautMirrorConfig.inc:105
 msgid "Contents"
 msgstr "Contenu"
 
-#: 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)"
-
-#: admin/systems/services/argonaut/class_argonautMirrorConfig.inc:98
+#: admin/systems/services/argonaut/class_argonautMirrorConfig.inc:112
 msgid "Verbose"
 msgstr "Verbeux"
 
-#: admin/systems/services/argonaut/class_argonautMirrorConfig.inc:98
+#: admin/systems/services/argonaut/class_argonautMirrorConfig.inc:113
 msgid "Wether to activate verbose mode"
 msgstr "Activer/DÃ©sactiver le mode verbeux"
 
@@ -236,18 +201,18 @@ msgstr "Supprimer les tÃ¢ches terminÃ©es"
 #: admin/systems/services/argonaut/class_argonautServer.inc:50
 msgid ""
 "Wether or not argonaut server should delete successfully finished tasks"
-msgstr "Activer ou non la suppression des tÃ¢ches terminÃ©es avec succÃ¨s par le serveur Argonaut"
+msgstr "Autoriser  ou non la suppression des tÃ¢ches terminÃ©es avec succÃ¨s par le serveur argonaut"
 
 #: admin/systems/services/argonaut/class_argonautServer.inc:55
 msgid "Get packages informations"
-msgstr "Obtenir des informations sur les paquets"
+msgstr "Impossible d'obtenir des informations sur les paquets"
 
 #: 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."
+msgstr "Si oui ou non le serveur Argonaut devrait obtenir les paquets d'informations Ã  partir des dÃ©pÃ´ts au dÃ©but, puis une fois par jour. NÃ©cessaire pour la crÃ©ation de la liste de paquet FAI."
 
 #: admin/systems/services/argonaut/class_argonautServer.inc:61
 msgid "Protocol"
@@ -276,11 +241,11 @@ msgstr "DÃ©lai en secondes avant de considÃ©rer le systÃ¨me argonaut (client ou
 
 #: admin/systems/services/argonaut/class_argonautServer.inc:80
 msgid "Directory in which argonaut will store its log"
-msgstr "RÃ©pertoire contenant les journaux systÃ¨mes d'Argonaut"
+msgstr "RÃ©pertoire contenant les journaux dâ€™Ã©vÃ©nement d'argonaut"
 
 #: admin/systems/services/argonaut/class_argonautServer.inc:85
 msgid "Key path"
-msgstr "ClÃ© privÃ©e"
+msgstr "Chemin de la clÃ©"
 
 #: admin/systems/services/argonaut/class_argonautServer.inc:85
 msgid "Path to the private key file"
@@ -288,7 +253,7 @@ msgstr "Chemin du fichier contenant la clÃ© privÃ©e"
 
 #: admin/systems/services/argonaut/class_argonautServer.inc:90
 msgid "Certificate path"
-msgstr "Certificat"
+msgstr "Chemin contenant le certificat"
 
 #: admin/systems/services/argonaut/class_argonautServer.inc:90
 msgid "Path to the certificate file"
@@ -354,27 +319,27 @@ msgstr "RÃ©pertoire Bind"
 
 #: admin/systems/services/argonaut/class_argonautDNSConfig.inc:51
 msgid "The directory in which conf file must be created"
-msgstr "Le rÃ©pertoire dans lequel le fichier de configuration doit Ãªtre crÃ©Ã©"
+msgstr "Le rÃ©pertoire contenant le fichier de configuration doit Ãªtre crÃ©Ã©"
 
 #: admin/systems/services/argonaut/class_argonautDNSConfig.inc:57
 msgid "Bind cache directory"
-msgstr "RÃ©pertoire de cache de Bind"
+msgstr "rÃ©pertoire contenant les fichiers de zones de Bind"
 
 #: admin/systems/services/argonaut/class_argonautDNSConfig.inc:58
 msgid "The directory in which zone files must be created"
-msgstr "Le rÃ©pertoire dans lequel les fichiers de zones doivent Ãªtre crÃ©Ã©s"
+msgstr "Le rÃ©pertoire contenant les fichiers de zones doit Ãªtre crÃ©Ã©"
 
 #: admin/systems/services/argonaut/class_argonautDNSConfig.inc:64
 msgid "Allow notify"
-msgstr "IPs autorisÃ©es Ã  notifier (sÃ©parÃ©es et terminÃ© par un point-virgule)"
+msgstr "Autoriser la notification"
 
 #: admin/systems/services/argonaut/class_argonautDNSConfig.inc:70
 msgid "Allow update (semicolon separated and ended)"
-msgstr "IPs autorisÃ©es Ã  mettre Ã  jour (sÃ©parÃ©es et terminÃ© par un point-virgule)"
+msgstr "Permettre les mises a jours (sÃ©parÃ©s par des , ou des ; )"
 
 #: admin/systems/services/argonaut/class_argonautDNSConfig.inc:76
 msgid "Allow transfer (semicolon separated and ended)"
-msgstr "IPs autorisÃ©es Ã  transfÃ©rer (sÃ©parÃ©es et terminÃ© par un point-virgule)"
+msgstr "Permettre le transfert (sÃ©parÃ©s par des , ou des ; )"
 
 #: admin/systems/services/argonaut/class_argonautDNSConfig.inc:82
 msgid "TTL"
@@ -386,11 +351,11 @@ msgstr "Temps de vie"
 
 #: admin/systems/services/argonaut/class_argonautDNSConfig.inc:91
 msgid "rndc path"
-msgstr "Binaire rndc"
+msgstr "Chemin du programme rndc"
 
 #: admin/systems/services/argonaut/class_argonautDNSConfig.inc:92
 msgid "path to rndc binary"
-msgstr "Chemin vers le binaire rndc"
+msgstr "Chemin du binaire rndc"
 
 #: admin/systems/services/argonaut/class_argonautFuseLTSPConfig.inc:32
 #: admin/systems/services/argonaut/class_argonautFuseLTSPConfig.inc:33
@@ -406,125 +371,123 @@ msgid "LTSP server"
 msgstr "Serveur LTSP"
 
 #: addons/argonaut/class_filterArgonautEvents.inc:40
-#: addons/argonaut/class_argonautQueue.inc:160
-#: addons/argonaut/class_argonautQueue.inc:260
-#: addons/argonaut/class_argonautQueue.inc:335
+#: addons/argonaut/class_argonautQueue.inc:193
+#: addons/argonaut/class_argonautQueue.inc:307
+#: addons/argonaut/class_argonautQueue.inc:398
 msgid "Error"
 msgstr "Erreur"
 
 #: addons/argonaut/class_filterArgonautEvents.inc:40
 #, php-format
 msgid "Cannot load queue entries: %s"
-msgstr "Impossible de charger les entrÃ©es de la queueâ€¯: %s"
+msgstr "Impossible de charger les entrÃ©es de la queue: %s"
 
 #: addons/argonaut/class_argonautImportFile.inc:44
 #: addons/argonaut/class_argonautImportFile.inc:100
 #: addons/argonaut/class_argonautImportFile.inc:141
-#: addons/argonaut/deploy-list.xml:79
-#: addons/argonaut/argonaut_import_file.tpl.c:68
+#: addons/argonaut/deploy-list.xml:99
 msgid "Import"
 msgstr "Importer"
 
 #: addons/argonaut/class_argonautImportFile.inc:44
 msgid "file is empty"
-msgstr "le fichier est vide"
+msgstr "le fichier est vide."
 
 #: addons/argonaut/class_argonautImportFile.inc:101
 msgid ""
 "Selected entries will be skipped because of errors. Do you want to proceed?"
-msgstr "Les entrÃ©es sÃ©lectionnÃ©es seront ignorÃ©es Ã  cause des erreurs qu'elle contiennent. Voulez vous continuerâ€¯?"
+msgstr "Les entrÃ©es sÃ©lectionnÃ©es seront ignorÃ©es Ã  cause des erreurs qu'elle contiennent. Voulez vous continuer ?"
 
 #: addons/argonaut/class_argonautImportFile.inc:134
-msgid "Infrastructure service"
-msgstr "Service dâ€™infrastructure"
+#: addons/argonaut/class_argonautQueue.inc:350
+msgid "Service infrastructure"
+msgstr "Service d'infrastructure"
 
 #: addons/argonaut/class_argonautImportFile.inc:141
 #, php-format
 msgid "Import complete: %s events successfully send, %s failed"
-msgstr "L'importation est finieâ€¯: %s Ã©vÃ¨nements ont Ã©tÃ© envoyÃ©s, %s ont Ã©chouÃ©s"
+msgstr "L'importation est finie : %s Ã©vÃ¨nements ont Ã©tÃ© envoyÃ©s, %s ont Ã©chouÃ©s"
 
 #: addons/argonaut/class_argonautImportFile.inc:177
-#: addons/argonaut/argonaut_import_file.tpl.c:47
 msgid "MAC"
 msgstr "MAC"
 
 #: addons/argonaut/class_argonautImportFile.inc:180
 #: addons/argonaut/deploy-list.xml:14
-#: addons/argonaut/argonaut_import_file.tpl.c:50
 msgid "Event"
-msgstr "Ã‰vÃ¨nement"
+msgstr "Evenement"
 
-#: addons/argonaut/class_argonautQueue.inc:35
-#: addons/argonaut/class_argonautQueue.inc:41
+#: addons/argonaut/class_argonautQueue.inc:39
+#: addons/argonaut/class_argonautQueue.inc:45
 msgid "Deployment queue"
 msgstr "File d'attente du dÃ©ploiement"
 
-#: addons/argonaut/class_argonautQueue.inc:36
+#: addons/argonaut/class_argonautQueue.inc:40
 msgid "Provide a mechanism to automatically activate systems"
-msgstr "Procure un mÃ©canisme pour activer des systÃ¨mes automatiquement"
+msgstr "Procure un mÃ©canisme pour activer un ensemble de systÃ¨mes automatiquement"
 
-#: addons/argonaut/class_argonautQueue.inc:43
+#: addons/argonaut/class_argonautQueue.inc:47
 #: addons/argonaut/events/eventTargetSystems-list.xml:81
 msgid "Description"
 msgstr "Description"
 
-#: addons/argonaut/class_argonautQueue.inc:141
+#: addons/argonaut/class_argonautQueue.inc:174
 msgid "immediately"
 msgstr "immÃ©diatement"
 
-#: addons/argonaut/class_argonautQueue.inc:156
+#: addons/argonaut/class_argonautQueue.inc:189
 msgid "Waiting"
 msgstr "En attente"
 
-#: addons/argonaut/class_argonautQueue.inc:159
+#: addons/argonaut/class_argonautQueue.inc:192
 msgid "Show error"
 msgstr "Afficher les erreurs"
 
-#: addons/argonaut/class_argonautQueue.inc:163
+#: addons/argonaut/class_argonautQueue.inc:196
 msgid "Processed"
 msgstr "TerminÃ©"
 
-#: addons/argonaut/class_argonautQueue.inc:172
+#: addons/argonaut/class_argonautQueue.inc:205
 msgid "in progress"
 msgstr "en cours"
 
-#: addons/argonaut/class_argonautQueue.inc:180
+#: addons/argonaut/class_argonautQueue.inc:226
 msgid "Permission"
-msgstr "Permission"
+msgstr "Permissions"
 
-#: addons/argonaut/class_argonautQueue.inc:210
+#: addons/argonaut/class_argonautQueue.inc:256
 #: addons/argonaut/events/class_DaemonEvent.inc:258
-#: addons/argonaut/deploy-list.xml:86 addons/argonaut/deploy-list.xml:136
+#: addons/argonaut/deploy-list.xml:106 addons/argonaut/deploy-list.xml:166
 msgid "Remove"
 msgstr "Supprimer"
 
-#: addons/argonaut/class_argonautQueue.inc:211
+#: addons/argonaut/class_argonautQueue.inc:257
 #, php-format
 msgid "The following jobs couldn't be deleted, they have to be aborted: %s"
-msgstr "Les tÃ¢ches suivantes ne peuvent pas Ãªtre effacÃ©es, elles doivent Ãªtre annulÃ©esâ€¯: %s"
+msgstr "Les jobs suivants ne peuvent pas Ãªtre effacÃ©s, il doivent Ãªtre annulÃ©s: %s"
 
-#: addons/argonaut/class_argonautQueue.inc:257
+#: addons/argonaut/class_argonautQueue.inc:304
 msgid "Info"
 msgstr "Info"
 
-#: addons/argonaut/class_argonautQueue.inc:257
+#: addons/argonaut/class_argonautQueue.inc:304
 #, php-format
 msgid "%s"
 msgstr "%s"
 
-#: addons/argonaut/class_argonautQueue.inc:261
+#: addons/argonaut/class_argonautQueue.inc:308
 #, php-format
 msgid "Required class '%s' cannot be found: job not aborted!"
-msgstr "La classe requise '%s' n'a pas Ã©tÃ© trouvÃ©eâ€¯: tÃ¢che non annulÃ©eâ€¯!"
+msgstr "La classe obligatoire '%s' n'a pas Ã©tÃ© trouvÃ©e: job non annulÃ© !"
 
-#: addons/argonaut/class_argonautQueue.inc:293
+#: addons/argonaut/class_argonautQueue.inc:340
 msgid "Error detail"
 msgstr "DÃ©tail de l'erreur"
 
-#: addons/argonaut/class_argonautQueue.inc:335
+#: addons/argonaut/class_argonautQueue.inc:398
 #, php-format
 msgid "Cannot update queue entries."
-msgstr "Impossible de mettre Ã  jour les entrÃ©es de la file d'attente."
+msgstr "Impossible de mettre Ã  jour les files d'attentes."
 
 #: addons/argonaut/events/class_DaemonEvent.inc:149
 #, php-format
@@ -557,7 +520,7 @@ msgstr "Ajouter"
 
 #: addons/argonaut/events/class_DaemonEvent.inc:408
 msgid "Switch off"
-msgstr "Ã‰teindre"
+msgstr "Eteindre"
 
 #: addons/argonaut/events/class_DaemonEvent.inc:412
 msgid "Reboot"
@@ -577,7 +540,7 @@ msgstr "(RÃ©)installer"
 
 #: addons/argonaut/events/eventTargetSystems-list.xml:11
 msgid "List of target systems"
-msgstr "Listes des systÃ¨mes cibles"
+msgstr "Listes des systÃ¨mes Cibles"
 
 #: addons/argonaut/events/eventTargetSystems-list.xml:15
 msgid "Server"
@@ -585,7 +548,7 @@ msgstr "Serveur"
 
 #: addons/argonaut/events/eventTargetSystems-list.xml:23
 msgid "Workstation"
-msgstr "Station de travail"
+msgstr "Stations de travail"
 
 #: addons/argonaut/events/eventTargetSystems-list.xml:31
 msgid "Terminal"
@@ -593,20 +556,18 @@ msgstr "Terminal"
 
 #: addons/argonaut/events/eventTargetSystems-list.xml:39
 msgid "Winstation"
-msgstr "PC Windows"
+msgstr "Pc Windows"
 
 #: addons/argonaut/events/eventTargetSystems-list.xml:47
-#: addons/argonaut/argonaut_import_file.tpl.c:53
 msgid "Object group"
-msgstr "Groupe d'objet"
+msgstr "Groupes d'objets"
 
 #: addons/argonaut/events/eventTargetSystems-list.xml:73
-#: addons/argonaut/events/eventTargetSystems-filter.tpl.c:20
+#: addons/argonaut/deploy-list.xml:36
 msgid "Name"
 msgstr "Nom"
 
 #: addons/argonaut/events/eventTargetSystems-list.xml:89
-#: addons/argonaut/argonaut_import_file.tpl.c:62
 msgid "IP"
 msgstr "IP"
 
@@ -619,51 +580,56 @@ msgid "List of queued jobs"
 msgstr "Liste des tÃ¢ches dans la queue"
 
 #: addons/argonaut/deploy-list.xml:27
-#: addons/argonaut/events/DaemonEvent.tpl.c:17
 msgid "Target"
 msgstr "Cible"
 
-#: addons/argonaut/deploy-list.xml:35
+#: addons/argonaut/deploy-list.xml:45
 msgid "Task"
-msgstr "TÃ¢che"
+msgstr "TÃ¢ches"
 
-#: addons/argonaut/deploy-list.xml:43
+#: addons/argonaut/deploy-list.xml:53
 msgid "Period"
 msgstr "PÃ©riode"
 
-#: addons/argonaut/deploy-list.xml:51
-#: addons/argonaut/events/DaemonEvent.tpl.c:2
+#: addons/argonaut/deploy-list.xml:61
 msgid "Schedule"
 msgstr "Planificateur"
 
-#: addons/argonaut/deploy-list.xml:59
-#: addons/argonaut/events/DaemonEvent.tpl.c:11
+#: addons/argonaut/deploy-list.xml:69
 msgid "Status"
 msgstr "Statut"
 
-#: addons/argonaut/deploy-list.xml:67
+#: addons/argonaut/deploy-list.xml:77
 msgid "Actions"
 msgstr "Actions"
 
-#: addons/argonaut/deploy-list.xml:97 addons/argonaut/deploy-list.xml:144
+#: addons/argonaut/deploy-list.xml:88
+msgid "Create"
+msgstr "CrÃ©er"
+
+#: addons/argonaut/deploy-list.xml:117 addons/argonaut/deploy-list.xml:174
 msgid "Abort"
 msgstr "Annuler"
 
-#: addons/argonaut/deploy-list.xml:108
+#: addons/argonaut/deploy-list.xml:128
 msgid "Execute"
 msgstr "ExÃ©cuter"
 
-#: addons/argonaut/deploy-list.xml:120
+#: addons/argonaut/deploy-list.xml:140
 msgid "Process now"
-msgstr "Traiter maintenant"
+msgstr "En cours"
 
-#: addons/argonaut/deploy-list.xml:128
+#: addons/argonaut/deploy-list.xml:148
 msgid "View logs"
 msgstr "Voir les journaux systÃ¨mes"
 
+#: addons/argonaut/deploy-list.xml:157
+msgid "Edit"
+msgstr "Editer"
+
 #: include/class_supportDaemon.inc:89
 msgid "Multiple argonaut server found. Only one is supported"
-msgstr "Plusieurs serveurs Argonaut ont Ã©tÃ© trouvÃ©s. Un seul est supportÃ© pour l'instant"
+msgstr "Plusieurs serveurs Argonaut on Ã©tÃ© trouvÃ©s. Un seul est supportÃ© pour l'instant"
 
 #: include/class_supportDaemon.inc:91
 msgid "There is no argonaut server configured"
@@ -672,168 +638,9 @@ msgstr "Il n'y a pas de serveur Argonaut configurÃ©"
 #: include/class_supportDaemon.inc:609
 #, php-format
 msgid "Could not read \"%s\"!"
-msgstr "Impossible de lire \"%s\"â€¯!"
+msgstr "Impossible de lire \"%s\" !"
 
 #: include/class_supportDaemon.inc:613
 #, php-format
 msgid "\"%s\" is not a file!"
-msgstr "\"%s\" n'est pas un fichierâ€¯!"
-
-#: addons/argonaut/argonaut_import_file.tpl.c:2
-msgid "Import jobs"
-msgstr "Importer de tÃ¢ches"
-
-#: addons/argonaut/argonaut_import_file.tpl.c:5
-msgid ""
-"You can import a list of jobs into the FusionDirectory job queue. This "
-"should be a semicolon seperated list of items in the following format:"
-msgstr "Vous pouvez importer une liste de jobs dans la queue des jobs FusionDirectory. Cela doit Ãªtre un liste sÃ©parÃ©e par un point virgule dans le format suivant :"
-
-#: addons/argonaut/argonaut_import_file.tpl.c:8
-msgid "timestamp"
-msgstr "Date"
-
-#: addons/argonaut/argonaut_import_file.tpl.c:11
-msgid "MAC-address"
-msgstr "Adresse MAC"
-
-#: addons/argonaut/argonaut_import_file.tpl.c:14
-msgid "job type"
-msgstr "Type de job"
-
-#: addons/argonaut/argonaut_import_file.tpl.c:17
-msgid "object group"
-msgstr "Groupes d'objets"
-
-#: addons/argonaut/argonaut_import_file.tpl.c:20
-msgid "import base"
-msgstr "base pour l'importation"
-
-#: addons/argonaut/argonaut_import_file.tpl.c:23
-msgid "full hostname"
-msgstr "Nom complet de l'hÃ´te"
-
-#: addons/argonaut/argonaut_import_file.tpl.c:26
-msgid "IP-address"
-msgstr "Adresse IP"
-
-#: addons/argonaut/argonaut_import_file.tpl.c:29
-msgid "DHCP group"
-msgstr "Groupe DHCP"
-
-#: addons/argonaut/argonaut_import_file.tpl.c:32
-msgid "Example"
-msgstr "Exemple"
-
-#: addons/argonaut/argonaut_import_file.tpl.c:35
-msgid "Select list to import"
-msgstr "SÃ©lectionnez la liste Ã  importer"
-
-#: addons/argonaut/argonaut_import_file.tpl.c:38
-msgid "Browse"
-msgstr "Parcourir"
-
-#: addons/argonaut/argonaut_import_file.tpl.c:41
-msgid "Upload"
-msgstr "TÃ©lÃ©verser"
-
-#: addons/argonaut/argonaut_import_file.tpl.c:44
-#: addons/argonaut/events/DaemonEvent.tpl.c:20
-msgid "Timestamp"
-msgstr "Date"
-
-#: addons/argonaut/argonaut_import_file.tpl.c:56
-msgid "Base"
-msgstr "Base"
-
-#: addons/argonaut/argonaut_import_file.tpl.c:59
-msgid "FQDN"
-msgstr "FQDN"
-
-#: addons/argonaut/argonaut_import_file.tpl.c:65
-msgid "DHCP"
-msgstr "DHCP"
-
-#: addons/argonaut/events/target_list.tpl.c:2
-msgid "Apply"
-msgstr "Appliquer"
-
-#: addons/argonaut/events/target_list.tpl.c:5
-msgid "Cancel"
-msgstr "Annuler"
-
-#: addons/argonaut/events/DaemonEvent.tpl.c:5
-msgid "System list"
-msgstr "Liste des systÃ¨mes"
-
-#: addons/argonaut/events/DaemonEvent.tpl.c:8
-msgid "ID"
-msgstr "ID"
-
-#: addons/argonaut/events/DaemonEvent.tpl.c:14
-msgid "Result"
-msgstr "RÃ©sultat"
-
-#: addons/argonaut/events/eventTargetSystems-filter.tpl.c:2
-msgid "Filter"
-msgstr "Filtre"
-
-#: addons/argonaut/events/eventTargetSystems-filter.tpl.c:5
-msgid "Show servers"
-msgstr "Afficher les serveurs"
-
-#: addons/argonaut/events/eventTargetSystems-filter.tpl.c:8
-msgid "Show workstations"
-msgstr "Afficher les stations de travail"
-
-#: addons/argonaut/events/eventTargetSystems-filter.tpl.c:11
-msgid "Show terminals"
-msgstr "Afficher les terminaux"
-
-#: addons/argonaut/events/eventTargetSystems-filter.tpl.c:14
-msgid "Show winstations"
-msgstr "Stations Windows"
-
-#: addons/argonaut/events/eventTargetSystems-filter.tpl.c:17
-msgid "Filter by IP address range"
-msgstr "Filtrer les adresse IP par Ã©tendue"
-
-#: addons/argonaut/events/timestamp_select.tpl.c:2
-msgid "Year"
-msgstr "AnnÃ©e"
-
-#: addons/argonaut/events/timestamp_select.tpl.c:5
-msgid "Month"
-msgstr "Mois"
-
-#: addons/argonaut/events/timestamp_select.tpl.c:8
-msgid "Day"
-msgstr "Jour"
-
-#: addons/argonaut/events/timestamp_select.tpl.c:11
-msgid "Hour"
-msgstr "Heure"
-
-#: addons/argonaut/events/timestamp_select.tpl.c:14
-msgid "Minute"
-msgstr "Minutes"
-
-#: addons/argonaut/events/timestamp_select.tpl.c:17
-msgid "Second"
-msgstr "Secondes"
-
-#: addons/argonaut/events/timestamp_select.tpl.c:20
-msgid "Periodical job"
-msgstr "TÃ¢che pÃ©riodique"
-
-#: addons/argonaut/events/timestamp_select.tpl.c:23
-msgid "Job intervall"
-msgstr "Intervalle pour les tÃ¢ches"
-
-#: addons/argonaut/remove.tpl.c:2
-msgid "Warning"
-msgstr "Avertissement"
-
-#: addons/argonaut/remove.tpl.c:5
-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."
+msgstr "\"%s\" n'est pas un fichier !"
diff --git a/argonaut/locale/id/fusiondirectory.po b/argonaut/locale/id/fusiondirectory.po
index ab0aee78652baa0ae7c8ede011afbb1cb275be29..f3f5d2009c6b90932d67539b4fca747a753ef063 100644
--- a/argonaut/locale/id/fusiondirectory.po
+++ b/argonaut/locale/id/fusiondirectory.po
@@ -5,12 +5,12 @@
 # Translators:
 msgid ""
 msgstr ""
-"Project-Id-Version: FusionDirectory-108\n"
+"Project-Id-Version: FusionDirectory-109\n"
 "Report-Msgid-Bugs-To: documentation@lists.fusiondirectory.org\n"
-"POT-Creation-Date: 2015-03-31 11:49+0200\n"
-"PO-Revision-Date: 2015-03-17 17:47+0000\n"
+"POT-Creation-Date: 2014-12-15 17:47+0100\n"
+"PO-Revision-Date: 2014-12-15 16:48+0000\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>\n"
-"Language-Team: Indonesian (http://www.transifex.com/projects/p/FusionDirectory-108/language/id/)\n"
+"Language-Team: Indonesian (http://www.transifex.com/projects/p/FusionDirectory-109/language/id/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -47,7 +47,7 @@ msgstr ""
 
 #: admin/systems/argonaut/class_argonautClient.inc:135
 #: admin/systems/services/argonaut/class_argonautFuseConfig.inc:56
-#: admin/systems/services/argonaut/class_argonautMirrorConfig.inc:71
+#: admin/systems/services/argonaut/class_argonautMirrorConfig.inc:79
 #: admin/systems/services/argonaut/class_argonautServer.inc:79
 msgid "Log directory"
 msgstr ""
@@ -78,6 +78,7 @@ msgid "Argonaut Fuse settings"
 msgstr ""
 
 #: admin/systems/services/argonaut/class_argonautFuseConfig.inc:32
+#: admin/systems/services/argonaut/class_argonautMirrorConfig.inc:32
 #: admin/systems/services/argonaut/class_argonautFuseFAIConfig.inc:33
 #: admin/systems/services/argonaut/class_argonautServer.inc:32
 #: admin/systems/services/argonaut/class_argonautFuseOPSIConfig.inc:33
@@ -110,88 +111,60 @@ msgstr ""
 msgid "Path where argonaut-fuse should store pxelinux.cfg"
 msgstr ""
 
-#: admin/systems/services/argonaut/class_argonautMirrorConfig.inc:29
-#: admin/systems/services/argonaut/class_argonautMirrorConfig.inc:30
+#: admin/systems/services/argonaut/class_argonautMirrorConfig.inc:31
+#: admin/systems/services/argonaut/class_argonautMirrorConfig.inc:32
 msgid "Argonaut Mirror settings"
 msgstr ""
 
-#: admin/systems/services/argonaut/class_argonautMirrorConfig.inc:41
+#: admin/systems/services/argonaut/class_argonautMirrorConfig.inc:46
 msgid "Argonaut mirror settings"
 msgstr ""
 
-#: admin/systems/services/argonaut/class_argonautMirrorConfig.inc:44
-msgid "Local Debian mirror directory"
+#: admin/systems/services/argonaut/class_argonautMirrorConfig.inc:49
+msgid "Local debian mirror directory"
 msgstr ""
 
-#: admin/systems/services/argonaut/class_argonautMirrorConfig.inc:52
+#: admin/systems/services/argonaut/class_argonautMirrorConfig.inc:58
 msgid "Argonaut Debconf Crawler configuration"
 msgstr ""
 
-#: admin/systems/services/argonaut/class_argonautMirrorConfig.inc:55
+#: admin/systems/services/argonaut/class_argonautMirrorConfig.inc:61
 msgid "Local packages folder"
 msgstr ""
 
-#: admin/systems/services/argonaut/class_argonautMirrorConfig.inc:56
+#: admin/systems/services/argonaut/class_argonautMirrorConfig.inc:62
 msgid "Folder in which the crawler will store packages during analysis"
 msgstr ""
 
-#: admin/systems/services/argonaut/class_argonautMirrorConfig.inc:63
+#: admin/systems/services/argonaut/class_argonautMirrorConfig.inc:70
 msgid "Argonaut Repository configuration"
 msgstr ""
 
-#: admin/systems/services/argonaut/class_argonautMirrorConfig.inc:66
+#: admin/systems/services/argonaut/class_argonautMirrorConfig.inc:73
 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"
+#: admin/systems/services/argonaut/class_argonautMirrorConfig.inc:84
+msgid "Errors"
 msgstr ""
 
-#: admin/systems/services/argonaut/class_argonautMirrorConfig.inc:71
-msgid "Directory in which logs should be stored"
-msgstr ""
-
-#: admin/systems/services/argonaut/class_argonautMirrorConfig.inc:76
-msgid "Ignore errors"
-msgstr ""
-
-#: admin/systems/services/argonaut/class_argonautMirrorConfig.inc:77
-msgid ""
-"Causes debmirror to ignore missing or broken deb and source files but still "
-"be pedantic about checking meta files"
-msgstr ""
-
-#: admin/systems/services/argonaut/class_argonautMirrorConfig.inc:82
+#: admin/systems/services/argonaut/class_argonautMirrorConfig.inc:91
 msgid "Source"
 msgstr ""
 
-#: admin/systems/services/argonaut/class_argonautMirrorConfig.inc:82
-msgid "Include source in the mirror"
-msgstr ""
-
-#: admin/systems/services/argonaut/class_argonautMirrorConfig.inc:87
+#: admin/systems/services/argonaut/class_argonautMirrorConfig.inc:98
 msgid "GPG Check"
 msgstr ""
 
-#: admin/systems/services/argonaut/class_argonautMirrorConfig.inc:87
-msgid "Fail if the Release.gpg file is missing"
-msgstr ""
-
-#: admin/systems/services/argonaut/class_argonautMirrorConfig.inc:92
+#: admin/systems/services/argonaut/class_argonautMirrorConfig.inc:105
 msgid "Contents"
 msgstr ""
 
-#: admin/systems/services/argonaut/class_argonautMirrorConfig.inc:93
-msgid ""
-"Additionally download Contents.<arch>.gz files (Note that these files can be"
-" relatively big and can change frequently)"
-msgstr ""
-
-#: admin/systems/services/argonaut/class_argonautMirrorConfig.inc:98
+#: admin/systems/services/argonaut/class_argonautMirrorConfig.inc:112
 msgid "Verbose"
 msgstr ""
 
-#: admin/systems/services/argonaut/class_argonautMirrorConfig.inc:98
+#: admin/systems/services/argonaut/class_argonautMirrorConfig.inc:113
 msgid "Wether to activate verbose mode"
 msgstr ""
 
@@ -398,9 +371,9 @@ msgid "LTSP server"
 msgstr ""
 
 #: addons/argonaut/class_filterArgonautEvents.inc:40
-#: addons/argonaut/class_argonautQueue.inc:160
-#: addons/argonaut/class_argonautQueue.inc:260
-#: addons/argonaut/class_argonautQueue.inc:335
+#: addons/argonaut/class_argonautQueue.inc:193
+#: addons/argonaut/class_argonautQueue.inc:307
+#: addons/argonaut/class_argonautQueue.inc:398
 msgid "Error"
 msgstr ""
 
@@ -412,8 +385,7 @@ msgstr ""
 #: addons/argonaut/class_argonautImportFile.inc:44
 #: addons/argonaut/class_argonautImportFile.inc:100
 #: addons/argonaut/class_argonautImportFile.inc:141
-#: addons/argonaut/deploy-list.xml:79
-#: addons/argonaut/argonaut_import_file.tpl.c:68
+#: addons/argonaut/deploy-list.xml:99
 msgid "Import"
 msgstr ""
 
@@ -427,7 +399,8 @@ msgid ""
 msgstr ""
 
 #: addons/argonaut/class_argonautImportFile.inc:134
-msgid "Infrastructure service"
+#: addons/argonaut/class_argonautQueue.inc:350
+msgid "Service infrastructure"
 msgstr ""
 
 #: addons/argonaut/class_argonautImportFile.inc:141
@@ -436,84 +409,82 @@ msgid "Import complete: %s events successfully send, %s failed"
 msgstr ""
 
 #: addons/argonaut/class_argonautImportFile.inc:177
-#: addons/argonaut/argonaut_import_file.tpl.c:47
 msgid "MAC"
 msgstr ""
 
 #: addons/argonaut/class_argonautImportFile.inc:180
 #: addons/argonaut/deploy-list.xml:14
-#: addons/argonaut/argonaut_import_file.tpl.c:50
 msgid "Event"
 msgstr ""
 
-#: addons/argonaut/class_argonautQueue.inc:35
-#: addons/argonaut/class_argonautQueue.inc:41
+#: addons/argonaut/class_argonautQueue.inc:39
+#: addons/argonaut/class_argonautQueue.inc:45
 msgid "Deployment queue"
 msgstr ""
 
-#: addons/argonaut/class_argonautQueue.inc:36
+#: addons/argonaut/class_argonautQueue.inc:40
 msgid "Provide a mechanism to automatically activate systems"
 msgstr ""
 
-#: addons/argonaut/class_argonautQueue.inc:43
+#: addons/argonaut/class_argonautQueue.inc:47
 #: addons/argonaut/events/eventTargetSystems-list.xml:81
 msgid "Description"
 msgstr ""
 
-#: addons/argonaut/class_argonautQueue.inc:141
+#: addons/argonaut/class_argonautQueue.inc:174
 msgid "immediately"
 msgstr ""
 
-#: addons/argonaut/class_argonautQueue.inc:156
+#: addons/argonaut/class_argonautQueue.inc:189
 msgid "Waiting"
 msgstr ""
 
-#: addons/argonaut/class_argonautQueue.inc:159
+#: addons/argonaut/class_argonautQueue.inc:192
 msgid "Show error"
 msgstr ""
 
-#: addons/argonaut/class_argonautQueue.inc:163
+#: addons/argonaut/class_argonautQueue.inc:196
 msgid "Processed"
 msgstr ""
 
-#: addons/argonaut/class_argonautQueue.inc:172
+#: addons/argonaut/class_argonautQueue.inc:205
 msgid "in progress"
 msgstr ""
 
-#: addons/argonaut/class_argonautQueue.inc:180
+#: addons/argonaut/class_argonautQueue.inc:226
 msgid "Permission"
 msgstr ""
 
-#: addons/argonaut/class_argonautQueue.inc:210
+#: addons/argonaut/class_argonautQueue.inc:256
 #: addons/argonaut/events/class_DaemonEvent.inc:258
-#: addons/argonaut/deploy-list.xml:86 addons/argonaut/deploy-list.xml:136
+#: addons/argonaut/deploy-list.xml:106 addons/argonaut/deploy-list.xml:166
 msgid "Remove"
 msgstr ""
 
-#: addons/argonaut/class_argonautQueue.inc:211
+#: addons/argonaut/class_argonautQueue.inc:257
 #, php-format
 msgid "The following jobs couldn't be deleted, they have to be aborted: %s"
 msgstr ""
 
-#: addons/argonaut/class_argonautQueue.inc:257
+#: addons/argonaut/class_argonautQueue.inc:304
 msgid "Info"
 msgstr ""
 
-#: addons/argonaut/class_argonautQueue.inc:257
+#: addons/argonaut/class_argonautQueue.inc:304
 #, php-format
 msgid "%s"
 msgstr ""
 
-#: addons/argonaut/class_argonautQueue.inc:261
+#: addons/argonaut/class_argonautQueue.inc:308
 #, php-format
 msgid "Required class '%s' cannot be found: job not aborted!"
 msgstr ""
 
-#: addons/argonaut/class_argonautQueue.inc:293
+#: addons/argonaut/class_argonautQueue.inc:340
 msgid "Error detail"
 msgstr ""
 
-#: addons/argonaut/class_argonautQueue.inc:335
+#: addons/argonaut/class_argonautQueue.inc:398
 #, php-format
 msgid "Cannot update queue entries."
 msgstr ""
@@ -588,17 +559,15 @@ msgid "Winstation"
 msgstr ""
 
 #: addons/argonaut/events/eventTargetSystems-list.xml:47
-#: addons/argonaut/argonaut_import_file.tpl.c:53
 msgid "Object group"
 msgstr ""
 
 #: addons/argonaut/events/eventTargetSystems-list.xml:73
-#: addons/argonaut/events/eventTargetSystems-filter.tpl.c:20
+#: addons/argonaut/deploy-list.xml:36
 msgid "Name"
 msgstr ""
 
 #: addons/argonaut/events/eventTargetSystems-list.xml:89
-#: addons/argonaut/argonaut_import_file.tpl.c:62
 msgid "IP"
 msgstr ""
 
@@ -611,48 +580,53 @@ msgid "List of queued jobs"
 msgstr ""
 
 #: addons/argonaut/deploy-list.xml:27
-#: addons/argonaut/events/DaemonEvent.tpl.c:17
 msgid "Target"
 msgstr ""
 
-#: addons/argonaut/deploy-list.xml:35
+#: addons/argonaut/deploy-list.xml:45
 msgid "Task"
 msgstr ""
 
-#: addons/argonaut/deploy-list.xml:43
+#: addons/argonaut/deploy-list.xml:53
 msgid "Period"
 msgstr ""
 
-#: addons/argonaut/deploy-list.xml:51
-#: addons/argonaut/events/DaemonEvent.tpl.c:2
+#: addons/argonaut/deploy-list.xml:61
 msgid "Schedule"
 msgstr ""
 
-#: addons/argonaut/deploy-list.xml:59
-#: addons/argonaut/events/DaemonEvent.tpl.c:11
+#: addons/argonaut/deploy-list.xml:69
 msgid "Status"
 msgstr ""
 
-#: addons/argonaut/deploy-list.xml:67
+#: addons/argonaut/deploy-list.xml:77
 msgid "Actions"
 msgstr ""
 
-#: addons/argonaut/deploy-list.xml:97 addons/argonaut/deploy-list.xml:144
+#: addons/argonaut/deploy-list.xml:88
+msgid "Create"
+msgstr ""
+
+#: addons/argonaut/deploy-list.xml:117 addons/argonaut/deploy-list.xml:174
 msgid "Abort"
 msgstr ""
 
-#: addons/argonaut/deploy-list.xml:108
+#: addons/argonaut/deploy-list.xml:128
 msgid "Execute"
 msgstr ""
 
-#: addons/argonaut/deploy-list.xml:120
+#: addons/argonaut/deploy-list.xml:140
 msgid "Process now"
 msgstr ""
 
-#: addons/argonaut/deploy-list.xml:128
+#: addons/argonaut/deploy-list.xml:148
 msgid "View logs"
 msgstr ""
 
+#: addons/argonaut/deploy-list.xml:157
+msgid "Edit"
+msgstr ""
+
 #: include/class_supportDaemon.inc:89
 msgid "Multiple argonaut server found. Only one is supported"
 msgstr ""
@@ -670,162 +644,3 @@ msgstr ""
 #, php-format
 msgid "\"%s\" is not a file!"
 msgstr ""
-
-#: addons/argonaut/argonaut_import_file.tpl.c:2
-msgid "Import jobs"
-msgstr ""
-
-#: addons/argonaut/argonaut_import_file.tpl.c:5
-msgid ""
-"You can import a list of jobs into the FusionDirectory job queue. This "
-"should be a semicolon seperated list of items in the following format:"
-msgstr ""
-
-#: addons/argonaut/argonaut_import_file.tpl.c:8
-msgid "timestamp"
-msgstr ""
-
-#: addons/argonaut/argonaut_import_file.tpl.c:11
-msgid "MAC-address"
-msgstr ""
-
-#: addons/argonaut/argonaut_import_file.tpl.c:14
-msgid "job type"
-msgstr ""
-
-#: addons/argonaut/argonaut_import_file.tpl.c:17
-msgid "object group"
-msgstr ""
-
-#: addons/argonaut/argonaut_import_file.tpl.c:20
-msgid "import base"
-msgstr ""
-
-#: addons/argonaut/argonaut_import_file.tpl.c:23
-msgid "full hostname"
-msgstr ""
-
-#: addons/argonaut/argonaut_import_file.tpl.c:26
-msgid "IP-address"
-msgstr ""
-
-#: addons/argonaut/argonaut_import_file.tpl.c:29
-msgid "DHCP group"
-msgstr ""
-
-#: addons/argonaut/argonaut_import_file.tpl.c:32
-msgid "Example"
-msgstr ""
-
-#: addons/argonaut/argonaut_import_file.tpl.c:35
-msgid "Select list to import"
-msgstr ""
-
-#: addons/argonaut/argonaut_import_file.tpl.c:38
-msgid "Browse"
-msgstr ""
-
-#: addons/argonaut/argonaut_import_file.tpl.c:41
-msgid "Upload"
-msgstr ""
-
-#: addons/argonaut/argonaut_import_file.tpl.c:44
-#: addons/argonaut/events/DaemonEvent.tpl.c:20
-msgid "Timestamp"
-msgstr ""
-
-#: addons/argonaut/argonaut_import_file.tpl.c:56
-msgid "Base"
-msgstr ""
-
-#: addons/argonaut/argonaut_import_file.tpl.c:59
-msgid "FQDN"
-msgstr ""
-
-#: addons/argonaut/argonaut_import_file.tpl.c:65
-msgid "DHCP"
-msgstr ""
-
-#: addons/argonaut/events/target_list.tpl.c:2
-msgid "Apply"
-msgstr ""
-
-#: addons/argonaut/events/target_list.tpl.c:5
-msgid "Cancel"
-msgstr ""
-
-#: addons/argonaut/events/DaemonEvent.tpl.c:5
-msgid "System list"
-msgstr ""
-
-#: addons/argonaut/events/DaemonEvent.tpl.c:8
-msgid "ID"
-msgstr ""
-
-#: addons/argonaut/events/DaemonEvent.tpl.c:14
-msgid "Result"
-msgstr ""
-
-#: addons/argonaut/events/eventTargetSystems-filter.tpl.c:2
-msgid "Filter"
-msgstr ""
-
-#: addons/argonaut/events/eventTargetSystems-filter.tpl.c:5
-msgid "Show servers"
-msgstr ""
-
-#: addons/argonaut/events/eventTargetSystems-filter.tpl.c:8
-msgid "Show workstations"
-msgstr ""
-
-#: addons/argonaut/events/eventTargetSystems-filter.tpl.c:11
-msgid "Show terminals"
-msgstr ""
-
-#: addons/argonaut/events/eventTargetSystems-filter.tpl.c:14
-msgid "Show winstations"
-msgstr ""
-
-#: addons/argonaut/events/eventTargetSystems-filter.tpl.c:17
-msgid "Filter by IP address range"
-msgstr ""
-
-#: addons/argonaut/events/timestamp_select.tpl.c:2
-msgid "Year"
-msgstr ""
-
-#: addons/argonaut/events/timestamp_select.tpl.c:5
-msgid "Month"
-msgstr ""
-
-#: addons/argonaut/events/timestamp_select.tpl.c:8
-msgid "Day"
-msgstr ""
-
-#: addons/argonaut/events/timestamp_select.tpl.c:11
-msgid "Hour"
-msgstr ""
-
-#: addons/argonaut/events/timestamp_select.tpl.c:14
-msgid "Minute"
-msgstr ""
-
-#: addons/argonaut/events/timestamp_select.tpl.c:17
-msgid "Second"
-msgstr ""
-
-#: addons/argonaut/events/timestamp_select.tpl.c:20
-msgid "Periodical job"
-msgstr ""
-
-#: addons/argonaut/events/timestamp_select.tpl.c:23
-msgid "Job intervall"
-msgstr ""
-
-#: addons/argonaut/remove.tpl.c:2
-msgid "Warning"
-msgstr ""
-
-#: addons/argonaut/remove.tpl.c:5
-msgid "So - if you're sure - press 'Delete' to continue or 'Cancel' to abort."
-msgstr ""
diff --git a/argonaut/locale/it/fusiondirectory.po b/argonaut/locale/it/fusiondirectory.po
index 90c08b31eef55892c6e95926ced56cb8cac931e1..748dee46620e3fc7ce48bcce5b773cfb19995a74 100644
--- a/argonaut/locale/it/fusiondirectory.po
+++ b/argonaut/locale/it/fusiondirectory.po
@@ -3,17 +3,14 @@
 # This file is distributed under the same license as the PACKAGE package.
 # 
 # Translators:
-# poterealpopolo <giuliano@opensides.be>, 2013
-# poterealpopolo <giuliano@opensides.be>, 2012
-# poterealpopolo <giuliano@opensides.be>, 2012-2013
 msgid ""
 msgstr ""
-"Project-Id-Version: FusionDirectory-108\n"
+"Project-Id-Version: FusionDirectory-109\n"
 "Report-Msgid-Bugs-To: documentation@lists.fusiondirectory.org\n"
-"POT-Creation-Date: 2015-03-31 11:49+0200\n"
-"PO-Revision-Date: 2015-03-31 11:41+0000\n"
+"POT-Creation-Date: 2014-12-15 17:47+0100\n"
+"PO-Revision-Date: 2015-02-25 16:13+0000\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>\n"
-"Language-Team: Italian (http://www.transifex.com/projects/p/FusionDirectory-108/language/it/)\n"
+"Language-Team: Italian (http://www.transifex.com/projects/p/FusionDirectory-109/language/it/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -50,7 +47,7 @@ msgstr "File che Argonaut utilizzerÃ  per memorizzare il suo task id all'avvio"
 
 #: admin/systems/argonaut/class_argonautClient.inc:135
 #: admin/systems/services/argonaut/class_argonautFuseConfig.inc:56
-#: admin/systems/services/argonaut/class_argonautMirrorConfig.inc:71
+#: admin/systems/services/argonaut/class_argonautMirrorConfig.inc:79
 #: admin/systems/services/argonaut/class_argonautServer.inc:79
 msgid "Log directory"
 msgstr "Cartella degli errori"
@@ -81,6 +78,7 @@ msgid "Argonaut Fuse settings"
 msgstr "Impostazioni Fuse di Argonaut"
 
 #: admin/systems/services/argonaut/class_argonautFuseConfig.inc:32
+#: admin/systems/services/argonaut/class_argonautMirrorConfig.inc:32
 #: admin/systems/services/argonaut/class_argonautFuseFAIConfig.inc:33
 #: admin/systems/services/argonaut/class_argonautServer.inc:32
 #: admin/systems/services/argonaut/class_argonautFuseOPSIConfig.inc:33
@@ -113,88 +111,60 @@ msgstr "Path per la configurazione di Pxelinux"
 msgid "Path where argonaut-fuse should store pxelinux.cfg"
 msgstr "Percorso dove argonaut-fuse dovrebbe conservare il file pxelinux.cfg"
 
-#: admin/systems/services/argonaut/class_argonautMirrorConfig.inc:29
-#: admin/systems/services/argonaut/class_argonautMirrorConfig.inc:30
+#: admin/systems/services/argonaut/class_argonautMirrorConfig.inc:31
+#: admin/systems/services/argonaut/class_argonautMirrorConfig.inc:32
 msgid "Argonaut Mirror settings"
 msgstr "Impostazioni del mirror di Argonaut"
 
-#: admin/systems/services/argonaut/class_argonautMirrorConfig.inc:41
+#: admin/systems/services/argonaut/class_argonautMirrorConfig.inc:46
 msgid "Argonaut mirror settings"
 msgstr "Impostazioni del mirror di Argonaut"
 
-#: admin/systems/services/argonaut/class_argonautMirrorConfig.inc:44
-msgid "Local Debian mirror directory"
-msgstr ""
+#: admin/systems/services/argonaut/class_argonautMirrorConfig.inc:49
+msgid "Local debian mirror directory"
+msgstr "Cartella del mirror locale di Debian"
 
-#: admin/systems/services/argonaut/class_argonautMirrorConfig.inc:52
+#: admin/systems/services/argonaut/class_argonautMirrorConfig.inc:58
 msgid "Argonaut Debconf Crawler configuration"
 msgstr ""
 
-#: admin/systems/services/argonaut/class_argonautMirrorConfig.inc:55
+#: admin/systems/services/argonaut/class_argonautMirrorConfig.inc:61
 msgid "Local packages folder"
 msgstr "Cartella locale dei pacchetti"
 
-#: admin/systems/services/argonaut/class_argonautMirrorConfig.inc:56
+#: admin/systems/services/argonaut/class_argonautMirrorConfig.inc:62
 msgid "Folder in which the crawler will store packages during analysis"
 msgstr "Cartella in cui il crawler memorizzerÃ  i pacchetti durante l'analisi"
 
-#: admin/systems/services/argonaut/class_argonautMirrorConfig.inc:63
+#: admin/systems/services/argonaut/class_argonautMirrorConfig.inc:70
 msgid "Argonaut Repository configuration"
 msgstr ""
 
-#: admin/systems/services/argonaut/class_argonautMirrorConfig.inc:66
+#: admin/systems/services/argonaut/class_argonautMirrorConfig.inc:73
 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 ""
-
-#: admin/systems/services/argonaut/class_argonautMirrorConfig.inc:71
-msgid "Directory in which logs should be stored"
-msgstr ""
-
-#: admin/systems/services/argonaut/class_argonautMirrorConfig.inc:76
-msgid "Ignore errors"
-msgstr ""
-
-#: admin/systems/services/argonaut/class_argonautMirrorConfig.inc:77
-msgid ""
-"Causes debmirror to ignore missing or broken deb and source files but still "
-"be pedantic about checking meta files"
-msgstr ""
+#: admin/systems/services/argonaut/class_argonautMirrorConfig.inc:84
+msgid "Errors"
+msgstr "Errori"
 
-#: admin/systems/services/argonaut/class_argonautMirrorConfig.inc:82
+#: admin/systems/services/argonaut/class_argonautMirrorConfig.inc:91
 msgid "Source"
 msgstr "Origine"
 
-#: admin/systems/services/argonaut/class_argonautMirrorConfig.inc:82
-msgid "Include source in the mirror"
-msgstr ""
-
-#: admin/systems/services/argonaut/class_argonautMirrorConfig.inc:87
+#: admin/systems/services/argonaut/class_argonautMirrorConfig.inc:98
 msgid "GPG Check"
 msgstr "Verifica 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
+#: admin/systems/services/argonaut/class_argonautMirrorConfig.inc:105
 msgid "Contents"
 msgstr "Contenuti"
 
-#: 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
+#: admin/systems/services/argonaut/class_argonautMirrorConfig.inc:112
 msgid "Verbose"
 msgstr "Dettagliato"
 
-#: admin/systems/services/argonaut/class_argonautMirrorConfig.inc:98
+#: admin/systems/services/argonaut/class_argonautMirrorConfig.inc:113
 msgid "Wether to activate verbose mode"
 msgstr "Se attivare la modalitÃ  verbose"
 
@@ -401,9 +371,9 @@ msgid "LTSP server"
 msgstr "Server LTSP"
 
 #: addons/argonaut/class_filterArgonautEvents.inc:40
-#: addons/argonaut/class_argonautQueue.inc:160
-#: addons/argonaut/class_argonautQueue.inc:260
-#: addons/argonaut/class_argonautQueue.inc:335
+#: addons/argonaut/class_argonautQueue.inc:193
+#: addons/argonaut/class_argonautQueue.inc:307
+#: addons/argonaut/class_argonautQueue.inc:398
 msgid "Error"
 msgstr "Errore"
 
@@ -415,8 +385,7 @@ msgstr "Impossibile caricare le entry della coda: %s"
 #: addons/argonaut/class_argonautImportFile.inc:44
 #: addons/argonaut/class_argonautImportFile.inc:100
 #: addons/argonaut/class_argonautImportFile.inc:141
-#: addons/argonaut/deploy-list.xml:79
-#: addons/argonaut/argonaut_import_file.tpl.c:68
+#: addons/argonaut/deploy-list.xml:99
 msgid "Import"
 msgstr "Importa"
 
@@ -430,8 +399,9 @@ msgid ""
 msgstr "Le voci selezionate saranno ignorate a causa di errori. Vuoi continuare?"
 
 #: addons/argonaut/class_argonautImportFile.inc:134
-msgid "Infrastructure service"
-msgstr ""
+#: addons/argonaut/class_argonautQueue.inc:350
+msgid "Service infrastructure"
+msgstr "Servizio d'infrastruttura"
 
 #: addons/argonaut/class_argonautImportFile.inc:141
 #, php-format
@@ -439,84 +409,82 @@ msgid "Import complete: %s events successfully send, %s failed"
 msgstr "Importazione completata: %s eventi inviati correttamente, %s falliti"
 
 #: addons/argonaut/class_argonautImportFile.inc:177
-#: addons/argonaut/argonaut_import_file.tpl.c:47
 msgid "MAC"
 msgstr "MAC"
 
 #: addons/argonaut/class_argonautImportFile.inc:180
 #: addons/argonaut/deploy-list.xml:14
-#: addons/argonaut/argonaut_import_file.tpl.c:50
 msgid "Event"
 msgstr "Evento"
 
-#: addons/argonaut/class_argonautQueue.inc:35
-#: addons/argonaut/class_argonautQueue.inc:41
+#: addons/argonaut/class_argonautQueue.inc:39
+#: addons/argonaut/class_argonautQueue.inc:45
 msgid "Deployment queue"
 msgstr "Coda della distribuzione"
 
-#: addons/argonaut/class_argonautQueue.inc:36
+#: addons/argonaut/class_argonautQueue.inc:40
 msgid "Provide a mechanism to automatically activate systems"
 msgstr "Fornire un meccanismo per attivare automaticamente i sistemi"
 
-#: addons/argonaut/class_argonautQueue.inc:43
+#: addons/argonaut/class_argonautQueue.inc:47
 #: addons/argonaut/events/eventTargetSystems-list.xml:81
 msgid "Description"
 msgstr "Descrizione"
 
-#: addons/argonaut/class_argonautQueue.inc:141
+#: addons/argonaut/class_argonautQueue.inc:174
 msgid "immediately"
 msgstr "immediatamente"
 
-#: addons/argonaut/class_argonautQueue.inc:156
+#: addons/argonaut/class_argonautQueue.inc:189
 msgid "Waiting"
 msgstr "In attesa"
 
-#: addons/argonaut/class_argonautQueue.inc:159
+#: addons/argonaut/class_argonautQueue.inc:192
 msgid "Show error"
 msgstr "Mostra l'errore"
 
-#: addons/argonaut/class_argonautQueue.inc:163
+#: addons/argonaut/class_argonautQueue.inc:196
 msgid "Processed"
 msgstr "Finito"
 
-#: addons/argonaut/class_argonautQueue.inc:172
+#: addons/argonaut/class_argonautQueue.inc:205
 msgid "in progress"
 msgstr "in corso"
 
-#: addons/argonaut/class_argonautQueue.inc:180
+#: addons/argonaut/class_argonautQueue.inc:226
 msgid "Permission"
 msgstr "Permessi"
 
-#: addons/argonaut/class_argonautQueue.inc:210
+#: addons/argonaut/class_argonautQueue.inc:256
 #: addons/argonaut/events/class_DaemonEvent.inc:258
-#: addons/argonaut/deploy-list.xml:86 addons/argonaut/deploy-list.xml:136
+#: addons/argonaut/deploy-list.xml:106 addons/argonaut/deploy-list.xml:166
 msgid "Remove"
 msgstr "Elimina"
 
-#: addons/argonaut/class_argonautQueue.inc:211
+#: addons/argonaut/class_argonautQueue.inc:257
 #, 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"
 
-#: addons/argonaut/class_argonautQueue.inc:257
+#: addons/argonaut/class_argonautQueue.inc:304
 msgid "Info"
 msgstr "Info"
 
-#: addons/argonaut/class_argonautQueue.inc:257
+#: addons/argonaut/class_argonautQueue.inc:304
 #, php-format
 msgid "%s"
 msgstr "%s"
 
-#: addons/argonaut/class_argonautQueue.inc:261
+#: addons/argonaut/class_argonautQueue.inc:308
 #, php-format
 msgid "Required class '%s' cannot be found: job not aborted!"
 msgstr "La classe richiesta '%s' non si trova: lavoro non interrotto!"
 
-#: addons/argonaut/class_argonautQueue.inc:293
+#: addons/argonaut/class_argonautQueue.inc:340
 msgid "Error detail"
 msgstr "Dettaglio dell'errore"
 
-#: addons/argonaut/class_argonautQueue.inc:335
+#: addons/argonaut/class_argonautQueue.inc:398
 #, php-format
 msgid "Cannot update queue entries."
 msgstr "Impossibile aggiornare la coda delle entry."
@@ -591,17 +559,15 @@ msgid "Winstation"
 msgstr "Winstation"
 
 #: addons/argonaut/events/eventTargetSystems-list.xml:47
-#: addons/argonaut/argonaut_import_file.tpl.c:53
 msgid "Object group"
 msgstr "Gruppo di oggetti"
 
 #: addons/argonaut/events/eventTargetSystems-list.xml:73
-#: addons/argonaut/events/eventTargetSystems-filter.tpl.c:20
+#: addons/argonaut/deploy-list.xml:36
 msgid "Name"
 msgstr "Nome"
 
 #: addons/argonaut/events/eventTargetSystems-list.xml:89
-#: addons/argonaut/argonaut_import_file.tpl.c:62
 msgid "IP"
 msgstr "IP"
 
@@ -614,48 +580,53 @@ msgid "List of queued jobs"
 msgstr "Elenco dei lavori in coda"
 
 #: addons/argonaut/deploy-list.xml:27
-#: addons/argonaut/events/DaemonEvent.tpl.c:17
 msgid "Target"
 msgstr "Obiettivo"
 
-#: addons/argonaut/deploy-list.xml:35
+#: addons/argonaut/deploy-list.xml:45
 msgid "Task"
 msgstr "AttivitÃ "
 
-#: addons/argonaut/deploy-list.xml:43
+#: addons/argonaut/deploy-list.xml:53
 msgid "Period"
 msgstr "Periodo"
 
-#: addons/argonaut/deploy-list.xml:51
-#: addons/argonaut/events/DaemonEvent.tpl.c:2
+#: addons/argonaut/deploy-list.xml:61
 msgid "Schedule"
 msgstr "Pianifica"
 
-#: addons/argonaut/deploy-list.xml:59
-#: addons/argonaut/events/DaemonEvent.tpl.c:11
+#: addons/argonaut/deploy-list.xml:69
 msgid "Status"
 msgstr "Stato"
 
-#: addons/argonaut/deploy-list.xml:67
+#: addons/argonaut/deploy-list.xml:77
 msgid "Actions"
 msgstr "Azioni"
 
-#: addons/argonaut/deploy-list.xml:97 addons/argonaut/deploy-list.xml:144
+#: addons/argonaut/deploy-list.xml:88
+msgid "Create"
+msgstr "Crea"
+
+#: addons/argonaut/deploy-list.xml:117 addons/argonaut/deploy-list.xml:174
 msgid "Abort"
 msgstr "Annulla"
 
-#: addons/argonaut/deploy-list.xml:108
+#: addons/argonaut/deploy-list.xml:128
 msgid "Execute"
 msgstr "Esegui"
 
-#: addons/argonaut/deploy-list.xml:120
+#: addons/argonaut/deploy-list.xml:140
 msgid "Process now"
 msgstr "in corso"
 
-#: addons/argonaut/deploy-list.xml:128
+#: addons/argonaut/deploy-list.xml:148
 msgid "View logs"
 msgstr "Vedi i logs di sitema"
 
+#: addons/argonaut/deploy-list.xml:157
+msgid "Edit"
+msgstr "Modifica"
+
 #: include/class_supportDaemon.inc:89
 msgid "Multiple argonaut server found. Only one is supported"
 msgstr "Trovati piÃ¹ di un server Argonaut. Solo uno Ã¨ supportato"
@@ -673,162 +644,3 @@ msgstr ""
 #, php-format
 msgid "\"%s\" is not a file!"
 msgstr ""
-
-#: addons/argonaut/argonaut_import_file.tpl.c:2
-msgid "Import jobs"
-msgstr "Importa dei lavori"
-
-#: addons/argonaut/argonaut_import_file.tpl.c:5
-msgid ""
-"You can import a list of jobs into the FusionDirectory job queue. This "
-"should be a semicolon seperated list of items in the following format:"
-msgstr "Ãˆ possibile importare una lista di lavori nella coda di lavoro di FusionDirectory. Dovrebbe essere un elenco di elementi separati da punto e virgola nel seguente formato:"
-
-#: addons/argonaut/argonaut_import_file.tpl.c:8
-msgid "timestamp"
-msgstr "timestamp"
-
-#: addons/argonaut/argonaut_import_file.tpl.c:11
-msgid "MAC-address"
-msgstr "Indirizzo MAC"
-
-#: addons/argonaut/argonaut_import_file.tpl.c:14
-msgid "job type"
-msgstr "Tipo di lavoro"
-
-#: addons/argonaut/argonaut_import_file.tpl.c:17
-msgid "object group"
-msgstr "Gruppo oggetto"
-
-#: addons/argonaut/argonaut_import_file.tpl.c:20
-msgid "import base"
-msgstr "Base per l'importazione"
-
-#: addons/argonaut/argonaut_import_file.tpl.c:23
-msgid "full hostname"
-msgstr "Nome dell'host completo"
-
-#: addons/argonaut/argonaut_import_file.tpl.c:26
-msgid "IP-address"
-msgstr "Indirizzo IP"
-
-#: addons/argonaut/argonaut_import_file.tpl.c:29
-msgid "DHCP group"
-msgstr "Gruppo DHCP"
-
-#: addons/argonaut/argonaut_import_file.tpl.c:32
-msgid "Example"
-msgstr "Esempio"
-
-#: addons/argonaut/argonaut_import_file.tpl.c:35
-msgid "Select list to import"
-msgstr "Seleziona una lista da importare"
-
-#: addons/argonaut/argonaut_import_file.tpl.c:38
-msgid "Browse"
-msgstr "Percorri"
-
-#: addons/argonaut/argonaut_import_file.tpl.c:41
-msgid "Upload"
-msgstr "Caricare"
-
-#: addons/argonaut/argonaut_import_file.tpl.c:44
-#: addons/argonaut/events/DaemonEvent.tpl.c:20
-msgid "Timestamp"
-msgstr "Registrazione cronologica"
-
-#: addons/argonaut/argonaut_import_file.tpl.c:56
-msgid "Base"
-msgstr "Base"
-
-#: addons/argonaut/argonaut_import_file.tpl.c:59
-msgid "FQDN"
-msgstr "FQDN"
-
-#: addons/argonaut/argonaut_import_file.tpl.c:65
-msgid "DHCP"
-msgstr "DHCP"
-
-#: addons/argonaut/events/target_list.tpl.c:2
-msgid "Apply"
-msgstr "Applica"
-
-#: addons/argonaut/events/target_list.tpl.c:5
-msgid "Cancel"
-msgstr "Annulla"
-
-#: addons/argonaut/events/DaemonEvent.tpl.c:5
-msgid "System list"
-msgstr "Elenco sistema"
-
-#: addons/argonaut/events/DaemonEvent.tpl.c:8
-msgid "ID"
-msgstr "ID"
-
-#: addons/argonaut/events/DaemonEvent.tpl.c:14
-msgid "Result"
-msgstr "Risultato"
-
-#: addons/argonaut/events/eventTargetSystems-filter.tpl.c:2
-msgid "Filter"
-msgstr "Filtro"
-
-#: addons/argonaut/events/eventTargetSystems-filter.tpl.c:5
-msgid "Show servers"
-msgstr "Mostra i server"
-
-#: addons/argonaut/events/eventTargetSystems-filter.tpl.c:8
-msgid "Show workstations"
-msgstr "Mostra le workstations"
-
-#: addons/argonaut/events/eventTargetSystems-filter.tpl.c:11
-msgid "Show terminals"
-msgstr "Mostra i terminali"
-
-#: addons/argonaut/events/eventTargetSystems-filter.tpl.c:14
-msgid "Show winstations"
-msgstr "Mostra le stazioni Windows"
-
-#: addons/argonaut/events/eventTargetSystems-filter.tpl.c:17
-msgid "Filter by IP address range"
-msgstr "Filtra per intervallo di indirizzi IP"
-
-#: addons/argonaut/events/timestamp_select.tpl.c:2
-msgid "Year"
-msgstr "Anno"
-
-#: addons/argonaut/events/timestamp_select.tpl.c:5
-msgid "Month"
-msgstr "Mese"
-
-#: addons/argonaut/events/timestamp_select.tpl.c:8
-msgid "Day"
-msgstr "Giorno"
-
-#: addons/argonaut/events/timestamp_select.tpl.c:11
-msgid "Hour"
-msgstr "Ora"
-
-#: addons/argonaut/events/timestamp_select.tpl.c:14
-msgid "Minute"
-msgstr "Minuto"
-
-#: addons/argonaut/events/timestamp_select.tpl.c:17
-msgid "Second"
-msgstr "Secondo"
-
-#: addons/argonaut/events/timestamp_select.tpl.c:20
-msgid "Periodical job"
-msgstr "Lavoro periodico"
-
-#: addons/argonaut/events/timestamp_select.tpl.c:23
-msgid "Job intervall"
-msgstr "Intervallo dei lavori"
-
-#: addons/argonaut/remove.tpl.c:2
-msgid "Warning"
-msgstr "Avvertimento"
-
-#: addons/argonaut/remove.tpl.c:5
-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."
diff --git a/argonaut/locale/lv/fusiondirectory.po b/argonaut/locale/lv/fusiondirectory.po
index f92e0a9541fea03213b650a75404b2b03c0e9fd7..9919f4733c5081364ccfc6238cd32c36e6bc33da 100644
--- a/argonaut/locale/lv/fusiondirectory.po
+++ b/argonaut/locale/lv/fusiondirectory.po
@@ -5,12 +5,12 @@
 # Translators:
 msgid ""
 msgstr ""
-"Project-Id-Version: FusionDirectory-108\n"
+"Project-Id-Version: FusionDirectory-109\n"
 "Report-Msgid-Bugs-To: documentation@lists.fusiondirectory.org\n"
-"POT-Creation-Date: 2015-03-31 11:49+0200\n"
-"PO-Revision-Date: 2015-03-17 17:47+0000\n"
+"POT-Creation-Date: 2014-12-15 17:47+0100\n"
+"PO-Revision-Date: 2014-12-15 16:48+0000\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>\n"
-"Language-Team: Latvian (http://www.transifex.com/projects/p/FusionDirectory-108/language/lv/)\n"
+"Language-Team: Latvian (http://www.transifex.com/projects/p/FusionDirectory-109/language/lv/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -47,7 +47,7 @@ msgstr ""
 
 #: admin/systems/argonaut/class_argonautClient.inc:135
 #: admin/systems/services/argonaut/class_argonautFuseConfig.inc:56
-#: admin/systems/services/argonaut/class_argonautMirrorConfig.inc:71
+#: admin/systems/services/argonaut/class_argonautMirrorConfig.inc:79
 #: admin/systems/services/argonaut/class_argonautServer.inc:79
 msgid "Log directory"
 msgstr ""
@@ -78,6 +78,7 @@ msgid "Argonaut Fuse settings"
 msgstr ""
 
 #: admin/systems/services/argonaut/class_argonautFuseConfig.inc:32
+#: admin/systems/services/argonaut/class_argonautMirrorConfig.inc:32
 #: admin/systems/services/argonaut/class_argonautFuseFAIConfig.inc:33
 #: admin/systems/services/argonaut/class_argonautServer.inc:32
 #: admin/systems/services/argonaut/class_argonautFuseOPSIConfig.inc:33
@@ -110,88 +111,60 @@ msgstr ""
 msgid "Path where argonaut-fuse should store pxelinux.cfg"
 msgstr ""
 
-#: admin/systems/services/argonaut/class_argonautMirrorConfig.inc:29
-#: admin/systems/services/argonaut/class_argonautMirrorConfig.inc:30
+#: admin/systems/services/argonaut/class_argonautMirrorConfig.inc:31
+#: admin/systems/services/argonaut/class_argonautMirrorConfig.inc:32
 msgid "Argonaut Mirror settings"
 msgstr ""
 
-#: admin/systems/services/argonaut/class_argonautMirrorConfig.inc:41
+#: admin/systems/services/argonaut/class_argonautMirrorConfig.inc:46
 msgid "Argonaut mirror settings"
 msgstr ""
 
-#: admin/systems/services/argonaut/class_argonautMirrorConfig.inc:44
-msgid "Local Debian mirror directory"
+#: admin/systems/services/argonaut/class_argonautMirrorConfig.inc:49
+msgid "Local debian mirror directory"
 msgstr ""
 
-#: admin/systems/services/argonaut/class_argonautMirrorConfig.inc:52
+#: admin/systems/services/argonaut/class_argonautMirrorConfig.inc:58
 msgid "Argonaut Debconf Crawler configuration"
 msgstr ""
 
-#: admin/systems/services/argonaut/class_argonautMirrorConfig.inc:55
+#: admin/systems/services/argonaut/class_argonautMirrorConfig.inc:61
 msgid "Local packages folder"
 msgstr ""
 
-#: admin/systems/services/argonaut/class_argonautMirrorConfig.inc:56
+#: admin/systems/services/argonaut/class_argonautMirrorConfig.inc:62
 msgid "Folder in which the crawler will store packages during analysis"
 msgstr ""
 
-#: admin/systems/services/argonaut/class_argonautMirrorConfig.inc:63
+#: admin/systems/services/argonaut/class_argonautMirrorConfig.inc:70
 msgid "Argonaut Repository configuration"
 msgstr ""
 
-#: admin/systems/services/argonaut/class_argonautMirrorConfig.inc:66
+#: admin/systems/services/argonaut/class_argonautMirrorConfig.inc:73
 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"
+#: admin/systems/services/argonaut/class_argonautMirrorConfig.inc:84
+msgid "Errors"
 msgstr ""
 
-#: admin/systems/services/argonaut/class_argonautMirrorConfig.inc:71
-msgid "Directory in which logs should be stored"
-msgstr ""
-
-#: admin/systems/services/argonaut/class_argonautMirrorConfig.inc:76
-msgid "Ignore errors"
-msgstr ""
-
-#: admin/systems/services/argonaut/class_argonautMirrorConfig.inc:77
-msgid ""
-"Causes debmirror to ignore missing or broken deb and source files but still "
-"be pedantic about checking meta files"
-msgstr ""
-
-#: admin/systems/services/argonaut/class_argonautMirrorConfig.inc:82
+#: admin/systems/services/argonaut/class_argonautMirrorConfig.inc:91
 msgid "Source"
 msgstr ""
 
-#: admin/systems/services/argonaut/class_argonautMirrorConfig.inc:82
-msgid "Include source in the mirror"
-msgstr ""
-
-#: admin/systems/services/argonaut/class_argonautMirrorConfig.inc:87
+#: admin/systems/services/argonaut/class_argonautMirrorConfig.inc:98
 msgid "GPG Check"
 msgstr ""
 
-#: admin/systems/services/argonaut/class_argonautMirrorConfig.inc:87
-msgid "Fail if the Release.gpg file is missing"
-msgstr ""
-
-#: admin/systems/services/argonaut/class_argonautMirrorConfig.inc:92
+#: admin/systems/services/argonaut/class_argonautMirrorConfig.inc:105
 msgid "Contents"
 msgstr ""
 
-#: admin/systems/services/argonaut/class_argonautMirrorConfig.inc:93
-msgid ""
-"Additionally download Contents.<arch>.gz files (Note that these files can be"
-" relatively big and can change frequently)"
-msgstr ""
-
-#: admin/systems/services/argonaut/class_argonautMirrorConfig.inc:98
+#: admin/systems/services/argonaut/class_argonautMirrorConfig.inc:112
 msgid "Verbose"
 msgstr ""
 
-#: admin/systems/services/argonaut/class_argonautMirrorConfig.inc:98
+#: admin/systems/services/argonaut/class_argonautMirrorConfig.inc:113
 msgid "Wether to activate verbose mode"
 msgstr ""
 
@@ -398,9 +371,9 @@ msgid "LTSP server"
 msgstr ""
 
 #: addons/argonaut/class_filterArgonautEvents.inc:40
-#: addons/argonaut/class_argonautQueue.inc:160
-#: addons/argonaut/class_argonautQueue.inc:260
-#: addons/argonaut/class_argonautQueue.inc:335
+#: addons/argonaut/class_argonautQueue.inc:193
+#: addons/argonaut/class_argonautQueue.inc:307
+#: addons/argonaut/class_argonautQueue.inc:398
 msgid "Error"
 msgstr ""
 
@@ -412,8 +385,7 @@ msgstr ""
 #: addons/argonaut/class_argonautImportFile.inc:44
 #: addons/argonaut/class_argonautImportFile.inc:100
 #: addons/argonaut/class_argonautImportFile.inc:141
-#: addons/argonaut/deploy-list.xml:79
-#: addons/argonaut/argonaut_import_file.tpl.c:68
+#: addons/argonaut/deploy-list.xml:99
 msgid "Import"
 msgstr ""
 
@@ -427,7 +399,8 @@ msgid ""
 msgstr ""
 
 #: addons/argonaut/class_argonautImportFile.inc:134
-msgid "Infrastructure service"
+#: addons/argonaut/class_argonautQueue.inc:350
+msgid "Service infrastructure"
 msgstr ""
 
 #: addons/argonaut/class_argonautImportFile.inc:141
@@ -436,84 +409,82 @@ msgid "Import complete: %s events successfully send, %s failed"
 msgstr ""
 
 #: addons/argonaut/class_argonautImportFile.inc:177
-#: addons/argonaut/argonaut_import_file.tpl.c:47
 msgid "MAC"
 msgstr ""
 
 #: addons/argonaut/class_argonautImportFile.inc:180
 #: addons/argonaut/deploy-list.xml:14
-#: addons/argonaut/argonaut_import_file.tpl.c:50
 msgid "Event"
 msgstr ""
 
-#: addons/argonaut/class_argonautQueue.inc:35
-#: addons/argonaut/class_argonautQueue.inc:41
+#: addons/argonaut/class_argonautQueue.inc:39
+#: addons/argonaut/class_argonautQueue.inc:45
 msgid "Deployment queue"
 msgstr ""
 
-#: addons/argonaut/class_argonautQueue.inc:36
+#: addons/argonaut/class_argonautQueue.inc:40
 msgid "Provide a mechanism to automatically activate systems"
 msgstr ""
 
-#: addons/argonaut/class_argonautQueue.inc:43
+#: addons/argonaut/class_argonautQueue.inc:47
 #: addons/argonaut/events/eventTargetSystems-list.xml:81
 msgid "Description"
 msgstr ""
 
-#: addons/argonaut/class_argonautQueue.inc:141
+#: addons/argonaut/class_argonautQueue.inc:174
 msgid "immediately"
 msgstr ""
 
-#: addons/argonaut/class_argonautQueue.inc:156
+#: addons/argonaut/class_argonautQueue.inc:189
 msgid "Waiting"
 msgstr ""
 
-#: addons/argonaut/class_argonautQueue.inc:159
+#: addons/argonaut/class_argonautQueue.inc:192
 msgid "Show error"
 msgstr ""
 
-#: addons/argonaut/class_argonautQueue.inc:163
+#: addons/argonaut/class_argonautQueue.inc:196
 msgid "Processed"
 msgstr ""
 
-#: addons/argonaut/class_argonautQueue.inc:172
+#: addons/argonaut/class_argonautQueue.inc:205
 msgid "in progress"
 msgstr ""
 
-#: addons/argonaut/class_argonautQueue.inc:180
+#: addons/argonaut/class_argonautQueue.inc:226
 msgid "Permission"
 msgstr ""
 
-#: addons/argonaut/class_argonautQueue.inc:210
+#: addons/argonaut/class_argonautQueue.inc:256
 #: addons/argonaut/events/class_DaemonEvent.inc:258
-#: addons/argonaut/deploy-list.xml:86 addons/argonaut/deploy-list.xml:136
+#: addons/argonaut/deploy-list.xml:106 addons/argonaut/deploy-list.xml:166
 msgid "Remove"
 msgstr ""
 
-#: addons/argonaut/class_argonautQueue.inc:211
+#: addons/argonaut/class_argonautQueue.inc:257
 #, php-format
 msgid "The following jobs couldn't be deleted, they have to be aborted: %s"
 msgstr ""
 
-#: addons/argonaut/class_argonautQueue.inc:257
+#: addons/argonaut/class_argonautQueue.inc:304
 msgid "Info"
 msgstr ""
 
-#: addons/argonaut/class_argonautQueue.inc:257
+#: addons/argonaut/class_argonautQueue.inc:304
 #, php-format
 msgid "%s"
 msgstr ""
 
-#: addons/argonaut/class_argonautQueue.inc:261
+#: addons/argonaut/class_argonautQueue.inc:308
 #, php-format
 msgid "Required class '%s' cannot be found: job not aborted!"
 msgstr ""
 
-#: addons/argonaut/class_argonautQueue.inc:293
+#: addons/argonaut/class_argonautQueue.inc:340
 msgid "Error detail"
 msgstr ""
 
-#: addons/argonaut/class_argonautQueue.inc:335
+#: addons/argonaut/class_argonautQueue.inc:398
 #, php-format
 msgid "Cannot update queue entries."
 msgstr ""
@@ -588,17 +559,15 @@ msgid "Winstation"
 msgstr ""
 
 #: addons/argonaut/events/eventTargetSystems-list.xml:47
-#: addons/argonaut/argonaut_import_file.tpl.c:53
 msgid "Object group"
 msgstr ""
 
 #: addons/argonaut/events/eventTargetSystems-list.xml:73
-#: addons/argonaut/events/eventTargetSystems-filter.tpl.c:20
+#: addons/argonaut/deploy-list.xml:36
 msgid "Name"
 msgstr ""
 
 #: addons/argonaut/events/eventTargetSystems-list.xml:89
-#: addons/argonaut/argonaut_import_file.tpl.c:62
 msgid "IP"
 msgstr ""
 
@@ -611,48 +580,53 @@ msgid "List of queued jobs"
 msgstr ""
 
 #: addons/argonaut/deploy-list.xml:27
-#: addons/argonaut/events/DaemonEvent.tpl.c:17
 msgid "Target"
 msgstr ""
 
-#: addons/argonaut/deploy-list.xml:35
+#: addons/argonaut/deploy-list.xml:45
 msgid "Task"
 msgstr ""
 
-#: addons/argonaut/deploy-list.xml:43
+#: addons/argonaut/deploy-list.xml:53
 msgid "Period"
 msgstr ""
 
-#: addons/argonaut/deploy-list.xml:51
-#: addons/argonaut/events/DaemonEvent.tpl.c:2
+#: addons/argonaut/deploy-list.xml:61
 msgid "Schedule"
 msgstr ""
 
-#: addons/argonaut/deploy-list.xml:59
-#: addons/argonaut/events/DaemonEvent.tpl.c:11
+#: addons/argonaut/deploy-list.xml:69
 msgid "Status"
 msgstr ""
 
-#: addons/argonaut/deploy-list.xml:67
+#: addons/argonaut/deploy-list.xml:77
 msgid "Actions"
 msgstr ""
 
-#: addons/argonaut/deploy-list.xml:97 addons/argonaut/deploy-list.xml:144
+#: addons/argonaut/deploy-list.xml:88
+msgid "Create"
+msgstr ""
+
+#: addons/argonaut/deploy-list.xml:117 addons/argonaut/deploy-list.xml:174
 msgid "Abort"
 msgstr ""
 
-#: addons/argonaut/deploy-list.xml:108
+#: addons/argonaut/deploy-list.xml:128
 msgid "Execute"
 msgstr ""
 
-#: addons/argonaut/deploy-list.xml:120
+#: addons/argonaut/deploy-list.xml:140
 msgid "Process now"
 msgstr ""
 
-#: addons/argonaut/deploy-list.xml:128
+#: addons/argonaut/deploy-list.xml:148
 msgid "View logs"
 msgstr ""
 
+#: addons/argonaut/deploy-list.xml:157
+msgid "Edit"
+msgstr ""
+
 #: include/class_supportDaemon.inc:89
 msgid "Multiple argonaut server found. Only one is supported"
 msgstr ""
@@ -670,162 +644,3 @@ msgstr ""
 #, php-format
 msgid "\"%s\" is not a file!"
 msgstr ""
-
-#: addons/argonaut/argonaut_import_file.tpl.c:2
-msgid "Import jobs"
-msgstr ""
-
-#: addons/argonaut/argonaut_import_file.tpl.c:5
-msgid ""
-"You can import a list of jobs into the FusionDirectory job queue. This "
-"should be a semicolon seperated list of items in the following format:"
-msgstr ""
-
-#: addons/argonaut/argonaut_import_file.tpl.c:8
-msgid "timestamp"
-msgstr ""
-
-#: addons/argonaut/argonaut_import_file.tpl.c:11
-msgid "MAC-address"
-msgstr ""
-
-#: addons/argonaut/argonaut_import_file.tpl.c:14
-msgid "job type"
-msgstr ""
-
-#: addons/argonaut/argonaut_import_file.tpl.c:17
-msgid "object group"
-msgstr ""
-
-#: addons/argonaut/argonaut_import_file.tpl.c:20
-msgid "import base"
-msgstr ""
-
-#: addons/argonaut/argonaut_import_file.tpl.c:23
-msgid "full hostname"
-msgstr ""
-
-#: addons/argonaut/argonaut_import_file.tpl.c:26
-msgid "IP-address"
-msgstr ""
-
-#: addons/argonaut/argonaut_import_file.tpl.c:29
-msgid "DHCP group"
-msgstr ""
-
-#: addons/argonaut/argonaut_import_file.tpl.c:32
-msgid "Example"
-msgstr ""
-
-#: addons/argonaut/argonaut_import_file.tpl.c:35
-msgid "Select list to import"
-msgstr ""
-
-#: addons/argonaut/argonaut_import_file.tpl.c:38
-msgid "Browse"
-msgstr ""
-
-#: addons/argonaut/argonaut_import_file.tpl.c:41
-msgid "Upload"
-msgstr ""
-
-#: addons/argonaut/argonaut_import_file.tpl.c:44
-#: addons/argonaut/events/DaemonEvent.tpl.c:20
-msgid "Timestamp"
-msgstr ""
-
-#: addons/argonaut/argonaut_import_file.tpl.c:56
-msgid "Base"
-msgstr ""
-
-#: addons/argonaut/argonaut_import_file.tpl.c:59
-msgid "FQDN"
-msgstr ""
-
-#: addons/argonaut/argonaut_import_file.tpl.c:65
-msgid "DHCP"
-msgstr ""
-
-#: addons/argonaut/events/target_list.tpl.c:2
-msgid "Apply"
-msgstr ""
-
-#: addons/argonaut/events/target_list.tpl.c:5
-msgid "Cancel"
-msgstr ""
-
-#: addons/argonaut/events/DaemonEvent.tpl.c:5
-msgid "System list"
-msgstr ""
-
-#: addons/argonaut/events/DaemonEvent.tpl.c:8
-msgid "ID"
-msgstr ""
-
-#: addons/argonaut/events/DaemonEvent.tpl.c:14
-msgid "Result"
-msgstr ""
-
-#: addons/argonaut/events/eventTargetSystems-filter.tpl.c:2
-msgid "Filter"
-msgstr ""
-
-#: addons/argonaut/events/eventTargetSystems-filter.tpl.c:5
-msgid "Show servers"
-msgstr ""
-
-#: addons/argonaut/events/eventTargetSystems-filter.tpl.c:8
-msgid "Show workstations"
-msgstr ""
-
-#: addons/argonaut/events/eventTargetSystems-filter.tpl.c:11
-msgid "Show terminals"
-msgstr ""
-
-#: addons/argonaut/events/eventTargetSystems-filter.tpl.c:14
-msgid "Show winstations"
-msgstr ""
-
-#: addons/argonaut/events/eventTargetSystems-filter.tpl.c:17
-msgid "Filter by IP address range"
-msgstr ""
-
-#: addons/argonaut/events/timestamp_select.tpl.c:2
-msgid "Year"
-msgstr ""
-
-#: addons/argonaut/events/timestamp_select.tpl.c:5
-msgid "Month"
-msgstr ""
-
-#: addons/argonaut/events/timestamp_select.tpl.c:8
-msgid "Day"
-msgstr ""
-
-#: addons/argonaut/events/timestamp_select.tpl.c:11
-msgid "Hour"
-msgstr ""
-
-#: addons/argonaut/events/timestamp_select.tpl.c:14
-msgid "Minute"
-msgstr ""
-
-#: addons/argonaut/events/timestamp_select.tpl.c:17
-msgid "Second"
-msgstr ""
-
-#: addons/argonaut/events/timestamp_select.tpl.c:20
-msgid "Periodical job"
-msgstr ""
-
-#: addons/argonaut/events/timestamp_select.tpl.c:23
-msgid "Job intervall"
-msgstr ""
-
-#: addons/argonaut/remove.tpl.c:2
-msgid "Warning"
-msgstr ""
-
-#: addons/argonaut/remove.tpl.c:5
-msgid "So - if you're sure - press 'Delete' to continue or 'Cancel' to abort."
-msgstr ""
diff --git a/argonaut/locale/nb/fusiondirectory.po b/argonaut/locale/nb/fusiondirectory.po
index b73e919d568026f4a5687ccf32a9f8092f44d057..c2f3e983502a1b6b646257b93b5f5b3e8823ec84 100644
--- a/argonaut/locale/nb/fusiondirectory.po
+++ b/argonaut/locale/nb/fusiondirectory.po
@@ -5,12 +5,12 @@
 # Translators:
 msgid ""
 msgstr ""
-"Project-Id-Version: FusionDirectory-108\n"
+"Project-Id-Version: FusionDirectory-109\n"
 "Report-Msgid-Bugs-To: documentation@lists.fusiondirectory.org\n"
-"POT-Creation-Date: 2015-03-31 11:49+0200\n"
-"PO-Revision-Date: 2015-03-17 17:47+0000\n"
+"POT-Creation-Date: 2014-12-15 17:47+0100\n"
+"PO-Revision-Date: 2015-02-25 16:13+0000\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>\n"
-"Language-Team: Norwegian BokmÃ¥l (http://www.transifex.com/projects/p/FusionDirectory-108/language/nb/)\n"
+"Language-Team: Norwegian BokmÃ¥l (http://www.transifex.com/projects/p/FusionDirectory-109/language/nb/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -47,7 +47,7 @@ msgstr ""
 
 #: admin/systems/argonaut/class_argonautClient.inc:135
 #: admin/systems/services/argonaut/class_argonautFuseConfig.inc:56
-#: admin/systems/services/argonaut/class_argonautMirrorConfig.inc:71
+#: admin/systems/services/argonaut/class_argonautMirrorConfig.inc:79
 #: admin/systems/services/argonaut/class_argonautServer.inc:79
 msgid "Log directory"
 msgstr ""
@@ -78,6 +78,7 @@ msgid "Argonaut Fuse settings"
 msgstr ""
 
 #: admin/systems/services/argonaut/class_argonautFuseConfig.inc:32
+#: admin/systems/services/argonaut/class_argonautMirrorConfig.inc:32
 #: admin/systems/services/argonaut/class_argonautFuseFAIConfig.inc:33
 #: admin/systems/services/argonaut/class_argonautServer.inc:32
 #: admin/systems/services/argonaut/class_argonautFuseOPSIConfig.inc:33
@@ -110,88 +111,60 @@ msgstr ""
 msgid "Path where argonaut-fuse should store pxelinux.cfg"
 msgstr ""
 
-#: admin/systems/services/argonaut/class_argonautMirrorConfig.inc:29
-#: admin/systems/services/argonaut/class_argonautMirrorConfig.inc:30
+#: admin/systems/services/argonaut/class_argonautMirrorConfig.inc:31
+#: admin/systems/services/argonaut/class_argonautMirrorConfig.inc:32
 msgid "Argonaut Mirror settings"
 msgstr ""
 
-#: admin/systems/services/argonaut/class_argonautMirrorConfig.inc:41
+#: admin/systems/services/argonaut/class_argonautMirrorConfig.inc:46
 msgid "Argonaut mirror settings"
 msgstr ""
 
-#: admin/systems/services/argonaut/class_argonautMirrorConfig.inc:44
-msgid "Local Debian mirror directory"
+#: admin/systems/services/argonaut/class_argonautMirrorConfig.inc:49
+msgid "Local debian mirror directory"
 msgstr ""
 
-#: admin/systems/services/argonaut/class_argonautMirrorConfig.inc:52
+#: admin/systems/services/argonaut/class_argonautMirrorConfig.inc:58
 msgid "Argonaut Debconf Crawler configuration"
 msgstr ""
 
-#: admin/systems/services/argonaut/class_argonautMirrorConfig.inc:55
+#: admin/systems/services/argonaut/class_argonautMirrorConfig.inc:61
 msgid "Local packages folder"
 msgstr ""
 
-#: admin/systems/services/argonaut/class_argonautMirrorConfig.inc:56
+#: admin/systems/services/argonaut/class_argonautMirrorConfig.inc:62
 msgid "Folder in which the crawler will store packages during analysis"
 msgstr ""
 
-#: admin/systems/services/argonaut/class_argonautMirrorConfig.inc:63
+#: admin/systems/services/argonaut/class_argonautMirrorConfig.inc:70
 msgid "Argonaut Repository configuration"
 msgstr ""
 
-#: admin/systems/services/argonaut/class_argonautMirrorConfig.inc:66
+#: admin/systems/services/argonaut/class_argonautMirrorConfig.inc:73
 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"
+#: admin/systems/services/argonaut/class_argonautMirrorConfig.inc:84
+msgid "Errors"
 msgstr ""
 
-#: admin/systems/services/argonaut/class_argonautMirrorConfig.inc:71
-msgid "Directory in which logs should be stored"
-msgstr ""
-
-#: admin/systems/services/argonaut/class_argonautMirrorConfig.inc:76
-msgid "Ignore errors"
-msgstr ""
-
-#: admin/systems/services/argonaut/class_argonautMirrorConfig.inc:77
-msgid ""
-"Causes debmirror to ignore missing or broken deb and source files but still "
-"be pedantic about checking meta files"
-msgstr ""
-
-#: admin/systems/services/argonaut/class_argonautMirrorConfig.inc:82
+#: admin/systems/services/argonaut/class_argonautMirrorConfig.inc:91
 msgid "Source"
 msgstr ""
 
-#: admin/systems/services/argonaut/class_argonautMirrorConfig.inc:82
-msgid "Include source in the mirror"
-msgstr ""
-
-#: admin/systems/services/argonaut/class_argonautMirrorConfig.inc:87
+#: admin/systems/services/argonaut/class_argonautMirrorConfig.inc:98
 msgid "GPG Check"
 msgstr ""
 
-#: admin/systems/services/argonaut/class_argonautMirrorConfig.inc:87
-msgid "Fail if the Release.gpg file is missing"
-msgstr ""
-
-#: admin/systems/services/argonaut/class_argonautMirrorConfig.inc:92
+#: admin/systems/services/argonaut/class_argonautMirrorConfig.inc:105
 msgid "Contents"
 msgstr ""
 
-#: admin/systems/services/argonaut/class_argonautMirrorConfig.inc:93
-msgid ""
-"Additionally download Contents.<arch>.gz files (Note that these files can be"
-" relatively big and can change frequently)"
-msgstr ""
-
-#: admin/systems/services/argonaut/class_argonautMirrorConfig.inc:98
+#: admin/systems/services/argonaut/class_argonautMirrorConfig.inc:112
 msgid "Verbose"
 msgstr ""
 
-#: admin/systems/services/argonaut/class_argonautMirrorConfig.inc:98
+#: admin/systems/services/argonaut/class_argonautMirrorConfig.inc:113
 msgid "Wether to activate verbose mode"
 msgstr ""
 
@@ -398,9 +371,9 @@ msgid "LTSP server"
 msgstr ""
 
 #: addons/argonaut/class_filterArgonautEvents.inc:40
-#: addons/argonaut/class_argonautQueue.inc:160
-#: addons/argonaut/class_argonautQueue.inc:260
-#: addons/argonaut/class_argonautQueue.inc:335
+#: addons/argonaut/class_argonautQueue.inc:193
+#: addons/argonaut/class_argonautQueue.inc:307
+#: addons/argonaut/class_argonautQueue.inc:398
 msgid "Error"
 msgstr "Feil"
 
@@ -412,8 +385,7 @@ msgstr ""
 #: addons/argonaut/class_argonautImportFile.inc:44
 #: addons/argonaut/class_argonautImportFile.inc:100
 #: addons/argonaut/class_argonautImportFile.inc:141
-#: addons/argonaut/deploy-list.xml:79
-#: addons/argonaut/argonaut_import_file.tpl.c:68
+#: addons/argonaut/deploy-list.xml:99
 msgid "Import"
 msgstr ""
 
@@ -427,7 +399,8 @@ msgid ""
 msgstr ""
 
 #: addons/argonaut/class_argonautImportFile.inc:134
-msgid "Infrastructure service"
+#: addons/argonaut/class_argonautQueue.inc:350
+msgid "Service infrastructure"
 msgstr ""
 
 #: addons/argonaut/class_argonautImportFile.inc:141
@@ -436,84 +409,82 @@ msgid "Import complete: %s events successfully send, %s failed"
 msgstr ""
 
 #: addons/argonaut/class_argonautImportFile.inc:177
-#: addons/argonaut/argonaut_import_file.tpl.c:47
 msgid "MAC"
 msgstr ""
 
 #: addons/argonaut/class_argonautImportFile.inc:180
 #: addons/argonaut/deploy-list.xml:14
-#: addons/argonaut/argonaut_import_file.tpl.c:50
 msgid "Event"
 msgstr ""
 
-#: addons/argonaut/class_argonautQueue.inc:35
-#: addons/argonaut/class_argonautQueue.inc:41
+#: addons/argonaut/class_argonautQueue.inc:39
+#: addons/argonaut/class_argonautQueue.inc:45
 msgid "Deployment queue"
 msgstr ""
 
-#: addons/argonaut/class_argonautQueue.inc:36
+#: addons/argonaut/class_argonautQueue.inc:40
 msgid "Provide a mechanism to automatically activate systems"
 msgstr ""
 
-#: addons/argonaut/class_argonautQueue.inc:43
+#: addons/argonaut/class_argonautQueue.inc:47
 #: addons/argonaut/events/eventTargetSystems-list.xml:81
 msgid "Description"
 msgstr "Beskrivelse"
 
-#: addons/argonaut/class_argonautQueue.inc:141
+#: addons/argonaut/class_argonautQueue.inc:174
 msgid "immediately"
 msgstr ""
 
-#: addons/argonaut/class_argonautQueue.inc:156
+#: addons/argonaut/class_argonautQueue.inc:189
 msgid "Waiting"
 msgstr ""
 
-#: addons/argonaut/class_argonautQueue.inc:159
+#: addons/argonaut/class_argonautQueue.inc:192
 msgid "Show error"
 msgstr ""
 
-#: addons/argonaut/class_argonautQueue.inc:163
+#: addons/argonaut/class_argonautQueue.inc:196
 msgid "Processed"
 msgstr ""
 
-#: addons/argonaut/class_argonautQueue.inc:172
+#: addons/argonaut/class_argonautQueue.inc:205
 msgid "in progress"
 msgstr ""
 
-#: addons/argonaut/class_argonautQueue.inc:180
+#: addons/argonaut/class_argonautQueue.inc:226
 msgid "Permission"
 msgstr ""
 
-#: addons/argonaut/class_argonautQueue.inc:210
+#: addons/argonaut/class_argonautQueue.inc:256
 #: addons/argonaut/events/class_DaemonEvent.inc:258
-#: addons/argonaut/deploy-list.xml:86 addons/argonaut/deploy-list.xml:136
+#: addons/argonaut/deploy-list.xml:106 addons/argonaut/deploy-list.xml:166
 msgid "Remove"
 msgstr "Fjern"
 
-#: addons/argonaut/class_argonautQueue.inc:211
+#: addons/argonaut/class_argonautQueue.inc:257
 #, php-format
 msgid "The following jobs couldn't be deleted, they have to be aborted: %s"
 msgstr ""
 
-#: addons/argonaut/class_argonautQueue.inc:257
+#: addons/argonaut/class_argonautQueue.inc:304
 msgid "Info"
 msgstr ""
 
-#: addons/argonaut/class_argonautQueue.inc:257
+#: addons/argonaut/class_argonautQueue.inc:304
 #, php-format
 msgid "%s"
 msgstr ""
 
-#: addons/argonaut/class_argonautQueue.inc:261
+#: addons/argonaut/class_argonautQueue.inc:308
 #, php-format
 msgid "Required class '%s' cannot be found: job not aborted!"
 msgstr ""
 
-#: addons/argonaut/class_argonautQueue.inc:293
+#: addons/argonaut/class_argonautQueue.inc:340
 msgid "Error detail"
 msgstr ""
 
-#: addons/argonaut/class_argonautQueue.inc:335
+#: addons/argonaut/class_argonautQueue.inc:398
 #, php-format
 msgid "Cannot update queue entries."
 msgstr ""
@@ -588,17 +559,15 @@ msgid "Winstation"
 msgstr ""
 
 #: addons/argonaut/events/eventTargetSystems-list.xml:47
-#: addons/argonaut/argonaut_import_file.tpl.c:53
 msgid "Object group"
 msgstr ""
 
 #: addons/argonaut/events/eventTargetSystems-list.xml:73
-#: addons/argonaut/events/eventTargetSystems-filter.tpl.c:20
+#: addons/argonaut/deploy-list.xml:36
 msgid "Name"
 msgstr "Navn"
 
 #: addons/argonaut/events/eventTargetSystems-list.xml:89
-#: addons/argonaut/argonaut_import_file.tpl.c:62
 msgid "IP"
 msgstr ""
 
@@ -611,48 +580,53 @@ msgid "List of queued jobs"
 msgstr ""
 
 #: addons/argonaut/deploy-list.xml:27
-#: addons/argonaut/events/DaemonEvent.tpl.c:17
 msgid "Target"
 msgstr ""
 
-#: addons/argonaut/deploy-list.xml:35
+#: addons/argonaut/deploy-list.xml:45
 msgid "Task"
 msgstr ""
 
-#: addons/argonaut/deploy-list.xml:43
+#: addons/argonaut/deploy-list.xml:53
 msgid "Period"
 msgstr ""
 
-#: addons/argonaut/deploy-list.xml:51
-#: addons/argonaut/events/DaemonEvent.tpl.c:2
+#: addons/argonaut/deploy-list.xml:61
 msgid "Schedule"
 msgstr ""
 
-#: addons/argonaut/deploy-list.xml:59
-#: addons/argonaut/events/DaemonEvent.tpl.c:11
+#: addons/argonaut/deploy-list.xml:69
 msgid "Status"
 msgstr ""
 
-#: addons/argonaut/deploy-list.xml:67
+#: addons/argonaut/deploy-list.xml:77
 msgid "Actions"
 msgstr ""
 
-#: addons/argonaut/deploy-list.xml:97 addons/argonaut/deploy-list.xml:144
+#: addons/argonaut/deploy-list.xml:88
+msgid "Create"
+msgstr "Opprett"
+
+#: addons/argonaut/deploy-list.xml:117 addons/argonaut/deploy-list.xml:174
 msgid "Abort"
 msgstr ""
 
-#: addons/argonaut/deploy-list.xml:108
+#: addons/argonaut/deploy-list.xml:128
 msgid "Execute"
 msgstr ""
 
-#: addons/argonaut/deploy-list.xml:120
+#: addons/argonaut/deploy-list.xml:140
 msgid "Process now"
 msgstr ""
 
-#: addons/argonaut/deploy-list.xml:128
+#: addons/argonaut/deploy-list.xml:148
 msgid "View logs"
 msgstr ""
 
+#: addons/argonaut/deploy-list.xml:157
+msgid "Edit"
+msgstr "Endre"
+
 #: include/class_supportDaemon.inc:89
 msgid "Multiple argonaut server found. Only one is supported"
 msgstr ""
@@ -670,162 +644,3 @@ msgstr ""
 #, php-format
 msgid "\"%s\" is not a file!"
 msgstr ""
-
-#: addons/argonaut/argonaut_import_file.tpl.c:2
-msgid "Import jobs"
-msgstr ""
-
-#: addons/argonaut/argonaut_import_file.tpl.c:5
-msgid ""
-"You can import a list of jobs into the FusionDirectory job queue. This "
-"should be a semicolon seperated list of items in the following format:"
-msgstr ""
-
-#: addons/argonaut/argonaut_import_file.tpl.c:8
-msgid "timestamp"
-msgstr ""
-
-#: addons/argonaut/argonaut_import_file.tpl.c:11
-msgid "MAC-address"
-msgstr ""
-
-#: addons/argonaut/argonaut_import_file.tpl.c:14
-msgid "job type"
-msgstr ""
-
-#: addons/argonaut/argonaut_import_file.tpl.c:17
-msgid "object group"
-msgstr ""
-
-#: addons/argonaut/argonaut_import_file.tpl.c:20
-msgid "import base"
-msgstr ""
-
-#: addons/argonaut/argonaut_import_file.tpl.c:23
-msgid "full hostname"
-msgstr ""
-
-#: addons/argonaut/argonaut_import_file.tpl.c:26
-msgid "IP-address"
-msgstr ""
-
-#: addons/argonaut/argonaut_import_file.tpl.c:29
-msgid "DHCP group"
-msgstr ""
-
-#: addons/argonaut/argonaut_import_file.tpl.c:32
-msgid "Example"
-msgstr ""
-
-#: addons/argonaut/argonaut_import_file.tpl.c:35
-msgid "Select list to import"
-msgstr ""
-
-#: addons/argonaut/argonaut_import_file.tpl.c:38
-msgid "Browse"
-msgstr ""
-
-#: addons/argonaut/argonaut_import_file.tpl.c:41
-msgid "Upload"
-msgstr ""
-
-#: addons/argonaut/argonaut_import_file.tpl.c:44
-#: addons/argonaut/events/DaemonEvent.tpl.c:20
-msgid "Timestamp"
-msgstr ""
-
-#: addons/argonaut/argonaut_import_file.tpl.c:56
-msgid "Base"
-msgstr ""
-
-#: addons/argonaut/argonaut_import_file.tpl.c:59
-msgid "FQDN"
-msgstr ""
-
-#: addons/argonaut/argonaut_import_file.tpl.c:65
-msgid "DHCP"
-msgstr ""
-
-#: addons/argonaut/events/target_list.tpl.c:2
-msgid "Apply"
-msgstr ""
-
-#: addons/argonaut/events/target_list.tpl.c:5
-msgid "Cancel"
-msgstr ""
-
-#: addons/argonaut/events/DaemonEvent.tpl.c:5
-msgid "System list"
-msgstr ""
-
-#: addons/argonaut/events/DaemonEvent.tpl.c:8
-msgid "ID"
-msgstr ""
-
-#: addons/argonaut/events/DaemonEvent.tpl.c:14
-msgid "Result"
-msgstr ""
-
-#: addons/argonaut/events/eventTargetSystems-filter.tpl.c:2
-msgid "Filter"
-msgstr "Filter"
-
-#: addons/argonaut/events/eventTargetSystems-filter.tpl.c:5
-msgid "Show servers"
-msgstr ""
-
-#: addons/argonaut/events/eventTargetSystems-filter.tpl.c:8
-msgid "Show workstations"
-msgstr ""
-
-#: addons/argonaut/events/eventTargetSystems-filter.tpl.c:11
-msgid "Show terminals"
-msgstr ""
-
-#: addons/argonaut/events/eventTargetSystems-filter.tpl.c:14
-msgid "Show winstations"
-msgstr ""
-
-#: addons/argonaut/events/eventTargetSystems-filter.tpl.c:17
-msgid "Filter by IP address range"
-msgstr ""
-
-#: addons/argonaut/events/timestamp_select.tpl.c:2
-msgid "Year"
-msgstr ""
-
-#: addons/argonaut/events/timestamp_select.tpl.c:5
-msgid "Month"
-msgstr ""
-
-#: addons/argonaut/events/timestamp_select.tpl.c:8
-msgid "Day"
-msgstr ""
-
-#: addons/argonaut/events/timestamp_select.tpl.c:11
-msgid "Hour"
-msgstr ""
-
-#: addons/argonaut/events/timestamp_select.tpl.c:14
-msgid "Minute"
-msgstr ""
-
-#: addons/argonaut/events/timestamp_select.tpl.c:17
-msgid "Second"
-msgstr ""
-
-#: addons/argonaut/events/timestamp_select.tpl.c:20
-msgid "Periodical job"
-msgstr ""
-
-#: addons/argonaut/events/timestamp_select.tpl.c:23
-msgid "Job intervall"
-msgstr ""
-
-#: addons/argonaut/remove.tpl.c:2
-msgid "Warning"
-msgstr ""
-
-#: addons/argonaut/remove.tpl.c:5
-msgid "So - if you're sure - press 'Delete' to continue or 'Cancel' to abort."
-msgstr ""
diff --git a/argonaut/locale/nl/fusiondirectory.po b/argonaut/locale/nl/fusiondirectory.po
index a44c8c99bb6708d294e20241d2cefce976b4be32..da2e5c698cd1ee59f29dbcfb9da6e3de31c39e4a 100644
--- a/argonaut/locale/nl/fusiondirectory.po
+++ b/argonaut/locale/nl/fusiondirectory.po
@@ -5,12 +5,12 @@
 # Translators:
 msgid ""
 msgstr ""
-"Project-Id-Version: FusionDirectory-108\n"
+"Project-Id-Version: FusionDirectory-109\n"
 "Report-Msgid-Bugs-To: documentation@lists.fusiondirectory.org\n"
-"POT-Creation-Date: 2015-03-31 11:49+0200\n"
-"PO-Revision-Date: 2015-03-31 11:41+0000\n"
+"POT-Creation-Date: 2014-12-15 17:47+0100\n"
+"PO-Revision-Date: 2015-02-25 16:13+0000\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>\n"
-"Language-Team: Dutch (http://www.transifex.com/projects/p/FusionDirectory-108/language/nl/)\n"
+"Language-Team: Dutch (http://www.transifex.com/projects/p/FusionDirectory-109/language/nl/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -47,7 +47,7 @@ msgstr ""
 
 #: admin/systems/argonaut/class_argonautClient.inc:135
 #: admin/systems/services/argonaut/class_argonautFuseConfig.inc:56
-#: admin/systems/services/argonaut/class_argonautMirrorConfig.inc:71
+#: admin/systems/services/argonaut/class_argonautMirrorConfig.inc:79
 #: admin/systems/services/argonaut/class_argonautServer.inc:79
 msgid "Log directory"
 msgstr "Log map"
@@ -78,6 +78,7 @@ msgid "Argonaut Fuse settings"
 msgstr "Argonaut Fuse instellingen"
 
 #: admin/systems/services/argonaut/class_argonautFuseConfig.inc:32
+#: admin/systems/services/argonaut/class_argonautMirrorConfig.inc:32
 #: admin/systems/services/argonaut/class_argonautFuseFAIConfig.inc:33
 #: admin/systems/services/argonaut/class_argonautServer.inc:32
 #: admin/systems/services/argonaut/class_argonautFuseOPSIConfig.inc:33
@@ -110,88 +111,60 @@ msgstr "Pxelinux cfg pad"
 msgid "Path where argonaut-fuse should store pxelinux.cfg"
 msgstr ""
 
-#: admin/systems/services/argonaut/class_argonautMirrorConfig.inc:29
-#: admin/systems/services/argonaut/class_argonautMirrorConfig.inc:30
+#: admin/systems/services/argonaut/class_argonautMirrorConfig.inc:31
+#: admin/systems/services/argonaut/class_argonautMirrorConfig.inc:32
 msgid "Argonaut Mirror settings"
 msgstr "Argonaut Mirror instellingen"
 
-#: admin/systems/services/argonaut/class_argonautMirrorConfig.inc:41
+#: admin/systems/services/argonaut/class_argonautMirrorConfig.inc:46
 msgid "Argonaut mirror settings"
 msgstr "Argonaut mirror instellingen"
 
-#: admin/systems/services/argonaut/class_argonautMirrorConfig.inc:44
-msgid "Local Debian mirror directory"
-msgstr ""
+#: admin/systems/services/argonaut/class_argonautMirrorConfig.inc:49
+msgid "Local debian mirror directory"
+msgstr "Lokale debian mirror map"
 
-#: admin/systems/services/argonaut/class_argonautMirrorConfig.inc:52
+#: admin/systems/services/argonaut/class_argonautMirrorConfig.inc:58
 msgid "Argonaut Debconf Crawler configuration"
 msgstr ""
 
-#: admin/systems/services/argonaut/class_argonautMirrorConfig.inc:55
+#: admin/systems/services/argonaut/class_argonautMirrorConfig.inc:61
 msgid "Local packages folder"
 msgstr "Lokale packages map"
 
-#: admin/systems/services/argonaut/class_argonautMirrorConfig.inc:56
+#: admin/systems/services/argonaut/class_argonautMirrorConfig.inc:62
 msgid "Folder in which the crawler will store packages during analysis"
 msgstr ""
 
-#: admin/systems/services/argonaut/class_argonautMirrorConfig.inc:63
+#: admin/systems/services/argonaut/class_argonautMirrorConfig.inc:70
 msgid "Argonaut Repository configuration"
 msgstr ""
 
-#: admin/systems/services/argonaut/class_argonautMirrorConfig.inc:66
+#: admin/systems/services/argonaut/class_argonautMirrorConfig.inc:73
 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 ""
-
-#: admin/systems/services/argonaut/class_argonautMirrorConfig.inc:71
-msgid "Directory in which logs should be stored"
-msgstr ""
-
-#: admin/systems/services/argonaut/class_argonautMirrorConfig.inc:76
-msgid "Ignore errors"
-msgstr ""
-
-#: admin/systems/services/argonaut/class_argonautMirrorConfig.inc:77
-msgid ""
-"Causes debmirror to ignore missing or broken deb and source files but still "
-"be pedantic about checking meta files"
-msgstr ""
+#: admin/systems/services/argonaut/class_argonautMirrorConfig.inc:84
+msgid "Errors"
+msgstr "Fouten"
 
-#: admin/systems/services/argonaut/class_argonautMirrorConfig.inc:82
+#: admin/systems/services/argonaut/class_argonautMirrorConfig.inc:91
 msgid "Source"
 msgstr "Bron"
 
-#: admin/systems/services/argonaut/class_argonautMirrorConfig.inc:82
-msgid "Include source in the mirror"
-msgstr ""
-
-#: admin/systems/services/argonaut/class_argonautMirrorConfig.inc:87
+#: admin/systems/services/argonaut/class_argonautMirrorConfig.inc:98
 msgid "GPG Check"
 msgstr "GPG verificatie"
 
-#: 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
+#: admin/systems/services/argonaut/class_argonautMirrorConfig.inc:105
 msgid "Contents"
 msgstr "Inhoud"
 
-#: 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
+#: admin/systems/services/argonaut/class_argonautMirrorConfig.inc:112
 msgid "Verbose"
 msgstr "Verbose"
 
-#: admin/systems/services/argonaut/class_argonautMirrorConfig.inc:98
+#: admin/systems/services/argonaut/class_argonautMirrorConfig.inc:113
 msgid "Wether to activate verbose mode"
 msgstr ""
 
@@ -398,9 +371,9 @@ msgid "LTSP server"
 msgstr "LTSP server"
 
 #: addons/argonaut/class_filterArgonautEvents.inc:40
-#: addons/argonaut/class_argonautQueue.inc:160
-#: addons/argonaut/class_argonautQueue.inc:260
-#: addons/argonaut/class_argonautQueue.inc:335
+#: addons/argonaut/class_argonautQueue.inc:193
+#: addons/argonaut/class_argonautQueue.inc:307
+#: addons/argonaut/class_argonautQueue.inc:398
 msgid "Error"
 msgstr "Fout"
 
@@ -412,8 +385,7 @@ msgstr "Kan queue gegevens : %s niet laden"
 #: addons/argonaut/class_argonautImportFile.inc:44
 #: addons/argonaut/class_argonautImportFile.inc:100
 #: addons/argonaut/class_argonautImportFile.inc:141
-#: addons/argonaut/deploy-list.xml:79
-#: addons/argonaut/argonaut_import_file.tpl.c:68
+#: addons/argonaut/deploy-list.xml:99
 msgid "Import"
 msgstr "Importeren"
 
@@ -427,8 +399,9 @@ msgid ""
 msgstr "Geselecteerde waarden  worden overgeslagen vanwege fouten. Wenst u doorgaan?"
 
 #: addons/argonaut/class_argonautImportFile.inc:134
-msgid "Infrastructure service"
-msgstr ""
+#: addons/argonaut/class_argonautQueue.inc:350
+msgid "Service infrastructure"
+msgstr "Dienst infrastructuur"
 
 #: addons/argonaut/class_argonautImportFile.inc:141
 #, php-format
@@ -436,84 +409,82 @@ msgid "Import complete: %s events successfully send, %s failed"
 msgstr "Importeren voltooid : %s events succesvol verzonde, %s mislukt"
 
 #: addons/argonaut/class_argonautImportFile.inc:177
-#: addons/argonaut/argonaut_import_file.tpl.c:47
 msgid "MAC"
 msgstr "MAC"
 
 #: addons/argonaut/class_argonautImportFile.inc:180
 #: addons/argonaut/deploy-list.xml:14
-#: addons/argonaut/argonaut_import_file.tpl.c:50
 msgid "Event"
 msgstr "Event"
 
-#: addons/argonaut/class_argonautQueue.inc:35
-#: addons/argonaut/class_argonautQueue.inc:41
+#: addons/argonaut/class_argonautQueue.inc:39
+#: addons/argonaut/class_argonautQueue.inc:45
 msgid "Deployment queue"
 msgstr ""
 
-#: addons/argonaut/class_argonautQueue.inc:36
+#: addons/argonaut/class_argonautQueue.inc:40
 msgid "Provide a mechanism to automatically activate systems"
 msgstr "Zorg voor een mechanisme om automatisch systemen te activeren"
 
-#: addons/argonaut/class_argonautQueue.inc:43
+#: addons/argonaut/class_argonautQueue.inc:47
 #: addons/argonaut/events/eventTargetSystems-list.xml:81
 msgid "Description"
 msgstr "Omschrijving"
 
-#: addons/argonaut/class_argonautQueue.inc:141
+#: addons/argonaut/class_argonautQueue.inc:174
 msgid "immediately"
 msgstr "onmiddellijk"
 
-#: addons/argonaut/class_argonautQueue.inc:156
+#: addons/argonaut/class_argonautQueue.inc:189
 msgid "Waiting"
 msgstr "Wachten"
 
-#: addons/argonaut/class_argonautQueue.inc:159
+#: addons/argonaut/class_argonautQueue.inc:192
 msgid "Show error"
 msgstr "Toon fouten"
 
-#: addons/argonaut/class_argonautQueue.inc:163
+#: addons/argonaut/class_argonautQueue.inc:196
 msgid "Processed"
 msgstr "Verwerkte"
 
-#: addons/argonaut/class_argonautQueue.inc:172
+#: addons/argonaut/class_argonautQueue.inc:205
 msgid "in progress"
 msgstr "in verwerking"
 
-#: addons/argonaut/class_argonautQueue.inc:180
+#: addons/argonaut/class_argonautQueue.inc:226
 msgid "Permission"
 msgstr "Recht"
 
-#: addons/argonaut/class_argonautQueue.inc:210
+#: addons/argonaut/class_argonautQueue.inc:256
 #: addons/argonaut/events/class_DaemonEvent.inc:258
-#: addons/argonaut/deploy-list.xml:86 addons/argonaut/deploy-list.xml:136
+#: addons/argonaut/deploy-list.xml:106 addons/argonaut/deploy-list.xml:166
 msgid "Remove"
 msgstr "Verwijderen"
 
-#: addons/argonaut/class_argonautQueue.inc:211
+#: addons/argonaut/class_argonautQueue.inc:257
 #, 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:257
+#: addons/argonaut/class_argonautQueue.inc:304
 msgid "Info"
 msgstr "Info"
 
-#: addons/argonaut/class_argonautQueue.inc:257
+#: addons/argonaut/class_argonautQueue.inc:304
 #, php-format
 msgid "%s"
 msgstr "%s"
 
-#: addons/argonaut/class_argonautQueue.inc:261
+#: addons/argonaut/class_argonautQueue.inc:308
 #, php-format
 msgid "Required class '%s' cannot be found: job not aborted!"
 msgstr "Vereist klasse '%s' niet gevonden: jobs niet gestopt!"
 
-#: addons/argonaut/class_argonautQueue.inc:293
+#: addons/argonaut/class_argonautQueue.inc:340
 msgid "Error detail"
 msgstr "Fout detail"
 
-#: addons/argonaut/class_argonautQueue.inc:335
+#: addons/argonaut/class_argonautQueue.inc:398
 #, php-format
 msgid "Cannot update queue entries."
 msgstr "Kan queue waarde niet updaten."
@@ -588,17 +559,15 @@ msgid "Winstation"
 msgstr "Windows werkstation"
 
 #: addons/argonaut/events/eventTargetSystems-list.xml:47
-#: addons/argonaut/argonaut_import_file.tpl.c:53
 msgid "Object group"
 msgstr "Objectgroep"
 
 #: addons/argonaut/events/eventTargetSystems-list.xml:73
-#: addons/argonaut/events/eventTargetSystems-filter.tpl.c:20
+#: addons/argonaut/deploy-list.xml:36
 msgid "Name"
 msgstr "Naam"
 
 #: addons/argonaut/events/eventTargetSystems-list.xml:89
-#: addons/argonaut/argonaut_import_file.tpl.c:62
 msgid "IP"
 msgstr "IP"
 
@@ -611,48 +580,53 @@ msgid "List of queued jobs"
 msgstr "Lijst van queued jobs"
 
 #: addons/argonaut/deploy-list.xml:27
-#: addons/argonaut/events/DaemonEvent.tpl.c:17
 msgid "Target"
 msgstr "Doel"
 
-#: addons/argonaut/deploy-list.xml:35
+#: addons/argonaut/deploy-list.xml:45
 msgid "Task"
 msgstr "Taak"
 
-#: addons/argonaut/deploy-list.xml:43
+#: addons/argonaut/deploy-list.xml:53
 msgid "Period"
 msgstr "Periode"
 
-#: addons/argonaut/deploy-list.xml:51
-#: addons/argonaut/events/DaemonEvent.tpl.c:2
+#: addons/argonaut/deploy-list.xml:61
 msgid "Schedule"
 msgstr "Plan"
 
-#: addons/argonaut/deploy-list.xml:59
-#: addons/argonaut/events/DaemonEvent.tpl.c:11
+#: addons/argonaut/deploy-list.xml:69
 msgid "Status"
 msgstr "Status"
 
-#: addons/argonaut/deploy-list.xml:67
+#: addons/argonaut/deploy-list.xml:77
 msgid "Actions"
 msgstr "Acties"
 
-#: addons/argonaut/deploy-list.xml:97 addons/argonaut/deploy-list.xml:144
+#: addons/argonaut/deploy-list.xml:88
+msgid "Create"
+msgstr "Aanmaken"
+
+#: addons/argonaut/deploy-list.xml:117 addons/argonaut/deploy-list.xml:174
 msgid "Abort"
 msgstr "Onderbreek"
 
-#: addons/argonaut/deploy-list.xml:108
+#: addons/argonaut/deploy-list.xml:128
 msgid "Execute"
 msgstr "Commando"
 
-#: addons/argonaut/deploy-list.xml:120
+#: addons/argonaut/deploy-list.xml:140
 msgid "Process now"
 msgstr "Verwerk nu"
 
-#: addons/argonaut/deploy-list.xml:128
+#: addons/argonaut/deploy-list.xml:148
 msgid "View logs"
 msgstr "Toon logs"
 
+#: addons/argonaut/deploy-list.xml:157
+msgid "Edit"
+msgstr "Bewerken"
+
 #: include/class_supportDaemon.inc:89
 msgid "Multiple argonaut server found. Only one is supported"
 msgstr "Meerdere argonaut servers gevonden. Er is maar 1 mogelijk"
@@ -670,162 +644,3 @@ msgstr ""
 #, php-format
 msgid "\"%s\" is not a file!"
 msgstr ""
-
-#: addons/argonaut/argonaut_import_file.tpl.c:2
-msgid "Import jobs"
-msgstr "Importeer jobs"
-
-#: addons/argonaut/argonaut_import_file.tpl.c:5
-msgid ""
-"You can import a list of jobs into the FusionDirectory job queue. This "
-"should be a semicolon seperated list of items in the following format:"
-msgstr "U kan een lijst importeren van jobs in de FusionDirectory jobs queue. Dit moet een puntkomma gescheiden lijst met items in het volgende formaat zijn:"
-
-#: addons/argonaut/argonaut_import_file.tpl.c:8
-msgid "timestamp"
-msgstr "timestamp"
-
-#: addons/argonaut/argonaut_import_file.tpl.c:11
-msgid "MAC-address"
-msgstr "Hardware adres (MAC)"
-
-#: addons/argonaut/argonaut_import_file.tpl.c:14
-msgid "job type"
-msgstr "job type"
-
-#: addons/argonaut/argonaut_import_file.tpl.c:17
-msgid "object group"
-msgstr "object groep"
-
-#: addons/argonaut/argonaut_import_file.tpl.c:20
-msgid "import base"
-msgstr "import base"
-
-#: addons/argonaut/argonaut_import_file.tpl.c:23
-msgid "full hostname"
-msgstr "volledige hostname"
-
-#: addons/argonaut/argonaut_import_file.tpl.c:26
-msgid "IP-address"
-msgstr "IP adres"
-
-#: addons/argonaut/argonaut_import_file.tpl.c:29
-msgid "DHCP group"
-msgstr "DHCP groep"
-
-#: addons/argonaut/argonaut_import_file.tpl.c:32
-msgid "Example"
-msgstr "Voorbeeld"
-
-#: addons/argonaut/argonaut_import_file.tpl.c:35
-msgid "Select list to import"
-msgstr "Selecteer lijst voor import"
-
-#: addons/argonaut/argonaut_import_file.tpl.c:38
-msgid "Browse"
-msgstr "Doorzoek"
-
-#: addons/argonaut/argonaut_import_file.tpl.c:41
-msgid "Upload"
-msgstr "Uploaden"
-
-#: addons/argonaut/argonaut_import_file.tpl.c:44
-#: addons/argonaut/events/DaemonEvent.tpl.c:20
-msgid "Timestamp"
-msgstr "Timestamp"
-
-#: addons/argonaut/argonaut_import_file.tpl.c:56
-msgid "Base"
-msgstr "Basis"
-
-#: addons/argonaut/argonaut_import_file.tpl.c:59
-msgid "FQDN"
-msgstr "FQDN"
-
-#: addons/argonaut/argonaut_import_file.tpl.c:65
-msgid "DHCP"
-msgstr "DHCP"
-
-#: addons/argonaut/events/target_list.tpl.c:2
-msgid "Apply"
-msgstr "Toepassen"
-
-#: addons/argonaut/events/target_list.tpl.c:5
-msgid "Cancel"
-msgstr "Annuleren"
-
-#: addons/argonaut/events/DaemonEvent.tpl.c:5
-msgid "System list"
-msgstr "Systeem lijst"
-
-#: addons/argonaut/events/DaemonEvent.tpl.c:8
-msgid "ID"
-msgstr "ID"
-
-#: addons/argonaut/events/DaemonEvent.tpl.c:14
-msgid "Result"
-msgstr "Resultaat"
-
-#: addons/argonaut/events/eventTargetSystems-filter.tpl.c:2
-msgid "Filter"
-msgstr "Filter"
-
-#: addons/argonaut/events/eventTargetSystems-filter.tpl.c:5
-msgid "Show servers"
-msgstr "Toon servers"
-
-#: addons/argonaut/events/eventTargetSystems-filter.tpl.c:8
-msgid "Show workstations"
-msgstr "Toon werkstations"
-
-#: addons/argonaut/events/eventTargetSystems-filter.tpl.c:11
-msgid "Show terminals"
-msgstr "Toon terminals"
-
-#: addons/argonaut/events/eventTargetSystems-filter.tpl.c:14
-msgid "Show winstations"
-msgstr ""
-
-#: addons/argonaut/events/eventTargetSystems-filter.tpl.c:17
-msgid "Filter by IP address range"
-msgstr "Filteren op IP-adres range"
-
-#: addons/argonaut/events/timestamp_select.tpl.c:2
-msgid "Year"
-msgstr "Jaar"
-
-#: addons/argonaut/events/timestamp_select.tpl.c:5
-msgid "Month"
-msgstr "Maand"
-
-#: addons/argonaut/events/timestamp_select.tpl.c:8
-msgid "Day"
-msgstr "Dag"
-
-#: addons/argonaut/events/timestamp_select.tpl.c:11
-msgid "Hour"
-msgstr "Uur"
-
-#: addons/argonaut/events/timestamp_select.tpl.c:14
-msgid "Minute"
-msgstr "Minuut"
-
-#: addons/argonaut/events/timestamp_select.tpl.c:17
-msgid "Second"
-msgstr "Second"
-
-#: addons/argonaut/events/timestamp_select.tpl.c:20
-msgid "Periodical job"
-msgstr "Periodieke job"
-
-#: addons/argonaut/events/timestamp_select.tpl.c:23
-msgid "Job intervall"
-msgstr "Job interval"
-
-#: addons/argonaut/remove.tpl.c:2
-msgid "Warning"
-msgstr "Waarschuwing"
-
-#: addons/argonaut/remove.tpl.c:5
-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."
diff --git a/argonaut/locale/pl/fusiondirectory.po b/argonaut/locale/pl/fusiondirectory.po
index 769baa4b67872d38b978bfa54428c4bc80f7f6c1..8b042d10eaaf3e9c5257c23610b02dddf9ffc80f 100644
--- a/argonaut/locale/pl/fusiondirectory.po
+++ b/argonaut/locale/pl/fusiondirectory.po
@@ -5,12 +5,12 @@
 # Translators:
 msgid ""
 msgstr ""
-"Project-Id-Version: FusionDirectory-108\n"
+"Project-Id-Version: FusionDirectory-109\n"
 "Report-Msgid-Bugs-To: documentation@lists.fusiondirectory.org\n"
-"POT-Creation-Date: 2015-03-31 11:49+0200\n"
-"PO-Revision-Date: 2015-03-17 17:47+0000\n"
+"POT-Creation-Date: 2014-12-15 17:47+0100\n"
+"PO-Revision-Date: 2015-02-25 16:13+0000\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>\n"
-"Language-Team: Polish (http://www.transifex.com/projects/p/FusionDirectory-108/language/pl/)\n"
+"Language-Team: Polish (http://www.transifex.com/projects/p/FusionDirectory-109/language/pl/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -47,7 +47,7 @@ msgstr ""
 
 #: admin/systems/argonaut/class_argonautClient.inc:135
 #: admin/systems/services/argonaut/class_argonautFuseConfig.inc:56
-#: admin/systems/services/argonaut/class_argonautMirrorConfig.inc:71
+#: admin/systems/services/argonaut/class_argonautMirrorConfig.inc:79
 #: admin/systems/services/argonaut/class_argonautServer.inc:79
 msgid "Log directory"
 msgstr ""
@@ -78,6 +78,7 @@ msgid "Argonaut Fuse settings"
 msgstr ""
 
 #: admin/systems/services/argonaut/class_argonautFuseConfig.inc:32
+#: admin/systems/services/argonaut/class_argonautMirrorConfig.inc:32
 #: admin/systems/services/argonaut/class_argonautFuseFAIConfig.inc:33
 #: admin/systems/services/argonaut/class_argonautServer.inc:32
 #: admin/systems/services/argonaut/class_argonautFuseOPSIConfig.inc:33
@@ -110,88 +111,60 @@ msgstr ""
 msgid "Path where argonaut-fuse should store pxelinux.cfg"
 msgstr ""
 
-#: admin/systems/services/argonaut/class_argonautMirrorConfig.inc:29
-#: admin/systems/services/argonaut/class_argonautMirrorConfig.inc:30
+#: admin/systems/services/argonaut/class_argonautMirrorConfig.inc:31
+#: admin/systems/services/argonaut/class_argonautMirrorConfig.inc:32
 msgid "Argonaut Mirror settings"
 msgstr ""
 
-#: admin/systems/services/argonaut/class_argonautMirrorConfig.inc:41
+#: admin/systems/services/argonaut/class_argonautMirrorConfig.inc:46
 msgid "Argonaut mirror settings"
 msgstr ""
 
-#: admin/systems/services/argonaut/class_argonautMirrorConfig.inc:44
-msgid "Local Debian mirror directory"
+#: admin/systems/services/argonaut/class_argonautMirrorConfig.inc:49
+msgid "Local debian mirror directory"
 msgstr ""
 
-#: admin/systems/services/argonaut/class_argonautMirrorConfig.inc:52
+#: admin/systems/services/argonaut/class_argonautMirrorConfig.inc:58
 msgid "Argonaut Debconf Crawler configuration"
 msgstr ""
 
-#: admin/systems/services/argonaut/class_argonautMirrorConfig.inc:55
+#: admin/systems/services/argonaut/class_argonautMirrorConfig.inc:61
 msgid "Local packages folder"
 msgstr ""
 
-#: admin/systems/services/argonaut/class_argonautMirrorConfig.inc:56
+#: admin/systems/services/argonaut/class_argonautMirrorConfig.inc:62
 msgid "Folder in which the crawler will store packages during analysis"
 msgstr ""
 
-#: admin/systems/services/argonaut/class_argonautMirrorConfig.inc:63
+#: admin/systems/services/argonaut/class_argonautMirrorConfig.inc:70
 msgid "Argonaut Repository configuration"
 msgstr ""
 
-#: admin/systems/services/argonaut/class_argonautMirrorConfig.inc:66
+#: admin/systems/services/argonaut/class_argonautMirrorConfig.inc:73
 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"
+#: admin/systems/services/argonaut/class_argonautMirrorConfig.inc:84
+msgid "Errors"
 msgstr ""
 
-#: admin/systems/services/argonaut/class_argonautMirrorConfig.inc:71
-msgid "Directory in which logs should be stored"
-msgstr ""
-
-#: admin/systems/services/argonaut/class_argonautMirrorConfig.inc:76
-msgid "Ignore errors"
-msgstr ""
-
-#: admin/systems/services/argonaut/class_argonautMirrorConfig.inc:77
-msgid ""
-"Causes debmirror to ignore missing or broken deb and source files but still "
-"be pedantic about checking meta files"
-msgstr ""
-
-#: admin/systems/services/argonaut/class_argonautMirrorConfig.inc:82
+#: admin/systems/services/argonaut/class_argonautMirrorConfig.inc:91
 msgid "Source"
 msgstr "Å¹rÃ³dÅ‚o"
 
-#: admin/systems/services/argonaut/class_argonautMirrorConfig.inc:82
-msgid "Include source in the mirror"
-msgstr ""
-
-#: admin/systems/services/argonaut/class_argonautMirrorConfig.inc:87
+#: admin/systems/services/argonaut/class_argonautMirrorConfig.inc:98
 msgid "GPG Check"
 msgstr ""
 
-#: admin/systems/services/argonaut/class_argonautMirrorConfig.inc:87
-msgid "Fail if the Release.gpg file is missing"
-msgstr ""
-
-#: admin/systems/services/argonaut/class_argonautMirrorConfig.inc:92
+#: admin/systems/services/argonaut/class_argonautMirrorConfig.inc:105
 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 ""
-
-#: admin/systems/services/argonaut/class_argonautMirrorConfig.inc:98
+#: admin/systems/services/argonaut/class_argonautMirrorConfig.inc:112
 msgid "Verbose"
 msgstr ""
 
-#: admin/systems/services/argonaut/class_argonautMirrorConfig.inc:98
+#: admin/systems/services/argonaut/class_argonautMirrorConfig.inc:113
 msgid "Wether to activate verbose mode"
 msgstr ""
 
@@ -398,9 +371,9 @@ msgid "LTSP server"
 msgstr ""
 
 #: addons/argonaut/class_filterArgonautEvents.inc:40
-#: addons/argonaut/class_argonautQueue.inc:160
-#: addons/argonaut/class_argonautQueue.inc:260
-#: addons/argonaut/class_argonautQueue.inc:335
+#: addons/argonaut/class_argonautQueue.inc:193
+#: addons/argonaut/class_argonautQueue.inc:307
+#: addons/argonaut/class_argonautQueue.inc:398
 msgid "Error"
 msgstr "BÅ‚Ä…d"
 
@@ -412,8 +385,7 @@ msgstr ""
 #: addons/argonaut/class_argonautImportFile.inc:44
 #: addons/argonaut/class_argonautImportFile.inc:100
 #: addons/argonaut/class_argonautImportFile.inc:141
-#: addons/argonaut/deploy-list.xml:79
-#: addons/argonaut/argonaut_import_file.tpl.c:68
+#: addons/argonaut/deploy-list.xml:99
 msgid "Import"
 msgstr "Import"
 
@@ -427,7 +399,8 @@ msgid ""
 msgstr ""
 
 #: addons/argonaut/class_argonautImportFile.inc:134
-msgid "Infrastructure service"
+#: addons/argonaut/class_argonautQueue.inc:350
+msgid "Service infrastructure"
 msgstr ""
 
 #: addons/argonaut/class_argonautImportFile.inc:141
@@ -436,84 +409,82 @@ msgid "Import complete: %s events successfully send, %s failed"
 msgstr ""
 
 #: addons/argonaut/class_argonautImportFile.inc:177
-#: addons/argonaut/argonaut_import_file.tpl.c:47
 msgid "MAC"
 msgstr ""
 
 #: addons/argonaut/class_argonautImportFile.inc:180
 #: addons/argonaut/deploy-list.xml:14
-#: addons/argonaut/argonaut_import_file.tpl.c:50
 msgid "Event"
 msgstr ""
 
-#: addons/argonaut/class_argonautQueue.inc:35
-#: addons/argonaut/class_argonautQueue.inc:41
+#: addons/argonaut/class_argonautQueue.inc:39
+#: addons/argonaut/class_argonautQueue.inc:45
 msgid "Deployment queue"
 msgstr ""
 
-#: addons/argonaut/class_argonautQueue.inc:36
+#: addons/argonaut/class_argonautQueue.inc:40
 msgid "Provide a mechanism to automatically activate systems"
 msgstr ""
 
-#: addons/argonaut/class_argonautQueue.inc:43
+#: addons/argonaut/class_argonautQueue.inc:47
 #: addons/argonaut/events/eventTargetSystems-list.xml:81
 msgid "Description"
 msgstr "Opis"
 
-#: addons/argonaut/class_argonautQueue.inc:141
+#: addons/argonaut/class_argonautQueue.inc:174
 msgid "immediately"
 msgstr ""
 
-#: addons/argonaut/class_argonautQueue.inc:156
+#: addons/argonaut/class_argonautQueue.inc:189
 msgid "Waiting"
 msgstr ""
 
-#: addons/argonaut/class_argonautQueue.inc:159
+#: addons/argonaut/class_argonautQueue.inc:192
 msgid "Show error"
 msgstr ""
 
-#: addons/argonaut/class_argonautQueue.inc:163
+#: addons/argonaut/class_argonautQueue.inc:196
 msgid "Processed"
 msgstr ""
 
-#: addons/argonaut/class_argonautQueue.inc:172
+#: addons/argonaut/class_argonautQueue.inc:205
 msgid "in progress"
 msgstr ""
 
-#: addons/argonaut/class_argonautQueue.inc:180
+#: addons/argonaut/class_argonautQueue.inc:226
 msgid "Permission"
 msgstr "Uprawnienie"
 
-#: addons/argonaut/class_argonautQueue.inc:210
+#: addons/argonaut/class_argonautQueue.inc:256
 #: addons/argonaut/events/class_DaemonEvent.inc:258
-#: addons/argonaut/deploy-list.xml:86 addons/argonaut/deploy-list.xml:136
+#: addons/argonaut/deploy-list.xml:106 addons/argonaut/deploy-list.xml:166
 msgid "Remove"
 msgstr "UsuÅ„"
 
-#: addons/argonaut/class_argonautQueue.inc:211
+#: addons/argonaut/class_argonautQueue.inc:257
 #, php-format
 msgid "The following jobs couldn't be deleted, they have to be aborted: %s"
 msgstr ""
 
-#: addons/argonaut/class_argonautQueue.inc:257
+#: addons/argonaut/class_argonautQueue.inc:304
 msgid "Info"
 msgstr ""
 
-#: addons/argonaut/class_argonautQueue.inc:257
+#: addons/argonaut/class_argonautQueue.inc:304
 #, php-format
 msgid "%s"
 msgstr ""
 
-#: addons/argonaut/class_argonautQueue.inc:261
+#: addons/argonaut/class_argonautQueue.inc:308
 #, php-format
 msgid "Required class '%s' cannot be found: job not aborted!"
 msgstr ""
 
-#: addons/argonaut/class_argonautQueue.inc:293
+#: addons/argonaut/class_argonautQueue.inc:340
 msgid "Error detail"
 msgstr ""
 
-#: addons/argonaut/class_argonautQueue.inc:335
+#: addons/argonaut/class_argonautQueue.inc:398
 #, php-format
 msgid "Cannot update queue entries."
 msgstr ""
@@ -588,17 +559,15 @@ msgid "Winstation"
 msgstr "Stacja Windows"
 
 #: addons/argonaut/events/eventTargetSystems-list.xml:47
-#: addons/argonaut/argonaut_import_file.tpl.c:53
 msgid "Object group"
 msgstr "Grupa obiektu"
 
 #: addons/argonaut/events/eventTargetSystems-list.xml:73
-#: addons/argonaut/events/eventTargetSystems-filter.tpl.c:20
+#: addons/argonaut/deploy-list.xml:36
 msgid "Name"
 msgstr "ImiÄ™"
 
 #: addons/argonaut/events/eventTargetSystems-list.xml:89
-#: addons/argonaut/argonaut_import_file.tpl.c:62
 msgid "IP"
 msgstr ""
 
@@ -611,48 +580,53 @@ msgid "List of queued jobs"
 msgstr ""
 
 #: addons/argonaut/deploy-list.xml:27
-#: addons/argonaut/events/DaemonEvent.tpl.c:17
 msgid "Target"
 msgstr ""
 
-#: addons/argonaut/deploy-list.xml:35
+#: addons/argonaut/deploy-list.xml:45
 msgid "Task"
 msgstr "Zadanie"
 
-#: addons/argonaut/deploy-list.xml:43
+#: addons/argonaut/deploy-list.xml:53
 msgid "Period"
 msgstr ""
 
-#: addons/argonaut/deploy-list.xml:51
-#: addons/argonaut/events/DaemonEvent.tpl.c:2
+#: addons/argonaut/deploy-list.xml:61
 msgid "Schedule"
 msgstr ""
 
-#: addons/argonaut/deploy-list.xml:59
-#: addons/argonaut/events/DaemonEvent.tpl.c:11
+#: addons/argonaut/deploy-list.xml:69
 msgid "Status"
 msgstr "Status"
 
-#: addons/argonaut/deploy-list.xml:67
+#: addons/argonaut/deploy-list.xml:77
 msgid "Actions"
 msgstr "Akcje"
 
-#: addons/argonaut/deploy-list.xml:97 addons/argonaut/deploy-list.xml:144
+#: addons/argonaut/deploy-list.xml:88
+msgid "Create"
+msgstr "UtwÃ³rz"
+
+#: addons/argonaut/deploy-list.xml:117 addons/argonaut/deploy-list.xml:174
 msgid "Abort"
 msgstr ""
 
-#: addons/argonaut/deploy-list.xml:108
+#: addons/argonaut/deploy-list.xml:128
 msgid "Execute"
 msgstr "Uruchom"
 
-#: addons/argonaut/deploy-list.xml:120
+#: addons/argonaut/deploy-list.xml:140
 msgid "Process now"
 msgstr ""
 
-#: addons/argonaut/deploy-list.xml:128
+#: addons/argonaut/deploy-list.xml:148
 msgid "View logs"
 msgstr ""
 
+#: addons/argonaut/deploy-list.xml:157
+msgid "Edit"
+msgstr "Edytuj"
+
 #: include/class_supportDaemon.inc:89
 msgid "Multiple argonaut server found. Only one is supported"
 msgstr ""
@@ -670,162 +644,3 @@ msgstr ""
 #, php-format
 msgid "\"%s\" is not a file!"
 msgstr ""
-
-#: addons/argonaut/argonaut_import_file.tpl.c:2
-msgid "Import jobs"
-msgstr ""
-
-#: addons/argonaut/argonaut_import_file.tpl.c:5
-msgid ""
-"You can import a list of jobs into the FusionDirectory job queue. This "
-"should be a semicolon seperated list of items in the following format:"
-msgstr ""
-
-#: addons/argonaut/argonaut_import_file.tpl.c:8
-msgid "timestamp"
-msgstr "Data"
-
-#: addons/argonaut/argonaut_import_file.tpl.c:11
-msgid "MAC-address"
-msgstr "adres MAC"
-
-#: addons/argonaut/argonaut_import_file.tpl.c:14
-msgid "job type"
-msgstr ""
-
-#: addons/argonaut/argonaut_import_file.tpl.c:17
-msgid "object group"
-msgstr ""
-
-#: addons/argonaut/argonaut_import_file.tpl.c:20
-msgid "import base"
-msgstr ""
-
-#: addons/argonaut/argonaut_import_file.tpl.c:23
-msgid "full hostname"
-msgstr ""
-
-#: addons/argonaut/argonaut_import_file.tpl.c:26
-msgid "IP-address"
-msgstr "adres IP"
-
-#: addons/argonaut/argonaut_import_file.tpl.c:29
-msgid "DHCP group"
-msgstr ""
-
-#: addons/argonaut/argonaut_import_file.tpl.c:32
-msgid "Example"
-msgstr "PrzykÅ‚ad"
-
-#: addons/argonaut/argonaut_import_file.tpl.c:35
-msgid "Select list to import"
-msgstr ""
-
-#: addons/argonaut/argonaut_import_file.tpl.c:38
-msgid "Browse"
-msgstr "PrzeglÄ…daj"
-
-#: addons/argonaut/argonaut_import_file.tpl.c:41
-msgid "Upload"
-msgstr "Wgraj"
-
-#: addons/argonaut/argonaut_import_file.tpl.c:44
-#: addons/argonaut/events/DaemonEvent.tpl.c:20
-msgid "Timestamp"
-msgstr "Czas"
-
-#: addons/argonaut/argonaut_import_file.tpl.c:56
-msgid "Base"
-msgstr "Kontener"
-
-#: addons/argonaut/argonaut_import_file.tpl.c:59
-msgid "FQDN"
-msgstr ""
-
-#: addons/argonaut/argonaut_import_file.tpl.c:65
-msgid "DHCP"
-msgstr ""
-
-#: addons/argonaut/events/target_list.tpl.c:2
-msgid "Apply"
-msgstr "Zastosuj"
-
-#: addons/argonaut/events/target_list.tpl.c:5
-msgid "Cancel"
-msgstr "Anuluj"
-
-#: addons/argonaut/events/DaemonEvent.tpl.c:5
-msgid "System list"
-msgstr ""
-
-#: addons/argonaut/events/DaemonEvent.tpl.c:8
-msgid "ID"
-msgstr "ID"
-
-#: addons/argonaut/events/DaemonEvent.tpl.c:14
-msgid "Result"
-msgstr ""
-
-#: addons/argonaut/events/eventTargetSystems-filter.tpl.c:2
-msgid "Filter"
-msgstr "Filtr"
-
-#: addons/argonaut/events/eventTargetSystems-filter.tpl.c:5
-msgid "Show servers"
-msgstr "PokaÅ¼ serwery"
-
-#: addons/argonaut/events/eventTargetSystems-filter.tpl.c:8
-msgid "Show workstations"
-msgstr "PokaÅ¼ stacje robocze"
-
-#: addons/argonaut/events/eventTargetSystems-filter.tpl.c:11
-msgid "Show terminals"
-msgstr "PokaÅ¼ terminale"
-
-#: addons/argonaut/events/eventTargetSystems-filter.tpl.c:14
-msgid "Show winstations"
-msgstr ""
-
-#: addons/argonaut/events/eventTargetSystems-filter.tpl.c:17
-msgid "Filter by IP address range"
-msgstr ""
-
-#: addons/argonaut/events/timestamp_select.tpl.c:2
-msgid "Year"
-msgstr ""
-
-#: addons/argonaut/events/timestamp_select.tpl.c:5
-msgid "Month"
-msgstr ""
-
-#: addons/argonaut/events/timestamp_select.tpl.c:8
-msgid "Day"
-msgstr ""
-
-#: addons/argonaut/events/timestamp_select.tpl.c:11
-msgid "Hour"
-msgstr ""
-
-#: addons/argonaut/events/timestamp_select.tpl.c:14
-msgid "Minute"
-msgstr ""
-
-#: addons/argonaut/events/timestamp_select.tpl.c:17
-msgid "Second"
-msgstr ""
-
-#: addons/argonaut/events/timestamp_select.tpl.c:20
-msgid "Periodical job"
-msgstr ""
-
-#: addons/argonaut/events/timestamp_select.tpl.c:23
-msgid "Job intervall"
-msgstr ""
-
-#: addons/argonaut/remove.tpl.c:2
-msgid "Warning"
-msgstr "OstrzeÅ¼enie"
-
-#: addons/argonaut/remove.tpl.c:5
-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Ä‡."
diff --git a/argonaut/locale/pt/fusiondirectory.po b/argonaut/locale/pt/fusiondirectory.po
index fbe88f37f693230258d48373b4b7d531ac7a7bff..8c536c0f37e038605658c1e28c0b1fe9069ad6e9 100644
--- a/argonaut/locale/pt/fusiondirectory.po
+++ b/argonaut/locale/pt/fusiondirectory.po
@@ -5,12 +5,12 @@
 # Translators:
 msgid ""
 msgstr ""
-"Project-Id-Version: FusionDirectory-108\n"
+"Project-Id-Version: FusionDirectory-109\n"
 "Report-Msgid-Bugs-To: documentation@lists.fusiondirectory.org\n"
-"POT-Creation-Date: 2015-03-31 11:49+0200\n"
-"PO-Revision-Date: 2015-03-17 17:47+0000\n"
+"POT-Creation-Date: 2014-12-15 17:47+0100\n"
+"PO-Revision-Date: 2015-02-25 16:13+0000\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>\n"
-"Language-Team: Portuguese (http://www.transifex.com/projects/p/FusionDirectory-108/language/pt/)\n"
+"Language-Team: Portuguese (http://www.transifex.com/projects/p/FusionDirectory-109/language/pt/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -47,7 +47,7 @@ msgstr ""
 
 #: admin/systems/argonaut/class_argonautClient.inc:135
 #: admin/systems/services/argonaut/class_argonautFuseConfig.inc:56
-#: admin/systems/services/argonaut/class_argonautMirrorConfig.inc:71
+#: admin/systems/services/argonaut/class_argonautMirrorConfig.inc:79
 #: admin/systems/services/argonaut/class_argonautServer.inc:79
 msgid "Log directory"
 msgstr ""
@@ -78,6 +78,7 @@ msgid "Argonaut Fuse settings"
 msgstr ""
 
 #: admin/systems/services/argonaut/class_argonautFuseConfig.inc:32
+#: admin/systems/services/argonaut/class_argonautMirrorConfig.inc:32
 #: admin/systems/services/argonaut/class_argonautFuseFAIConfig.inc:33
 #: admin/systems/services/argonaut/class_argonautServer.inc:32
 #: admin/systems/services/argonaut/class_argonautFuseOPSIConfig.inc:33
@@ -110,88 +111,60 @@ msgstr ""
 msgid "Path where argonaut-fuse should store pxelinux.cfg"
 msgstr ""
 
-#: admin/systems/services/argonaut/class_argonautMirrorConfig.inc:29
-#: admin/systems/services/argonaut/class_argonautMirrorConfig.inc:30
+#: admin/systems/services/argonaut/class_argonautMirrorConfig.inc:31
+#: admin/systems/services/argonaut/class_argonautMirrorConfig.inc:32
 msgid "Argonaut Mirror settings"
 msgstr ""
 
-#: admin/systems/services/argonaut/class_argonautMirrorConfig.inc:41
+#: admin/systems/services/argonaut/class_argonautMirrorConfig.inc:46
 msgid "Argonaut mirror settings"
 msgstr ""
 
-#: admin/systems/services/argonaut/class_argonautMirrorConfig.inc:44
-msgid "Local Debian mirror directory"
+#: admin/systems/services/argonaut/class_argonautMirrorConfig.inc:49
+msgid "Local debian mirror directory"
 msgstr ""
 
-#: admin/systems/services/argonaut/class_argonautMirrorConfig.inc:52
+#: admin/systems/services/argonaut/class_argonautMirrorConfig.inc:58
 msgid "Argonaut Debconf Crawler configuration"
 msgstr ""
 
-#: admin/systems/services/argonaut/class_argonautMirrorConfig.inc:55
+#: admin/systems/services/argonaut/class_argonautMirrorConfig.inc:61
 msgid "Local packages folder"
 msgstr ""
 
-#: admin/systems/services/argonaut/class_argonautMirrorConfig.inc:56
+#: admin/systems/services/argonaut/class_argonautMirrorConfig.inc:62
 msgid "Folder in which the crawler will store packages during analysis"
 msgstr ""
 
-#: admin/systems/services/argonaut/class_argonautMirrorConfig.inc:63
+#: admin/systems/services/argonaut/class_argonautMirrorConfig.inc:70
 msgid "Argonaut Repository configuration"
 msgstr ""
 
-#: admin/systems/services/argonaut/class_argonautMirrorConfig.inc:66
+#: admin/systems/services/argonaut/class_argonautMirrorConfig.inc:73
 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"
+#: admin/systems/services/argonaut/class_argonautMirrorConfig.inc:84
+msgid "Errors"
 msgstr ""
 
-#: admin/systems/services/argonaut/class_argonautMirrorConfig.inc:71
-msgid "Directory in which logs should be stored"
-msgstr ""
-
-#: admin/systems/services/argonaut/class_argonautMirrorConfig.inc:76
-msgid "Ignore errors"
-msgstr ""
-
-#: admin/systems/services/argonaut/class_argonautMirrorConfig.inc:77
-msgid ""
-"Causes debmirror to ignore missing or broken deb and source files but still "
-"be pedantic about checking meta files"
-msgstr ""
-
-#: admin/systems/services/argonaut/class_argonautMirrorConfig.inc:82
+#: admin/systems/services/argonaut/class_argonautMirrorConfig.inc:91
 msgid "Source"
 msgstr ""
 
-#: admin/systems/services/argonaut/class_argonautMirrorConfig.inc:82
-msgid "Include source in the mirror"
-msgstr ""
-
-#: admin/systems/services/argonaut/class_argonautMirrorConfig.inc:87
+#: admin/systems/services/argonaut/class_argonautMirrorConfig.inc:98
 msgid "GPG Check"
 msgstr ""
 
-#: admin/systems/services/argonaut/class_argonautMirrorConfig.inc:87
-msgid "Fail if the Release.gpg file is missing"
-msgstr ""
-
-#: admin/systems/services/argonaut/class_argonautMirrorConfig.inc:92
+#: admin/systems/services/argonaut/class_argonautMirrorConfig.inc:105
 msgid "Contents"
 msgstr ""
 
-#: admin/systems/services/argonaut/class_argonautMirrorConfig.inc:93
-msgid ""
-"Additionally download Contents.<arch>.gz files (Note that these files can be"
-" relatively big and can change frequently)"
-msgstr ""
-
-#: admin/systems/services/argonaut/class_argonautMirrorConfig.inc:98
+#: admin/systems/services/argonaut/class_argonautMirrorConfig.inc:112
 msgid "Verbose"
 msgstr ""
 
-#: admin/systems/services/argonaut/class_argonautMirrorConfig.inc:98
+#: admin/systems/services/argonaut/class_argonautMirrorConfig.inc:113
 msgid "Wether to activate verbose mode"
 msgstr ""
 
@@ -398,9 +371,9 @@ msgid "LTSP server"
 msgstr ""
 
 #: addons/argonaut/class_filterArgonautEvents.inc:40
-#: addons/argonaut/class_argonautQueue.inc:160
-#: addons/argonaut/class_argonautQueue.inc:260
-#: addons/argonaut/class_argonautQueue.inc:335
+#: addons/argonaut/class_argonautQueue.inc:193
+#: addons/argonaut/class_argonautQueue.inc:307
+#: addons/argonaut/class_argonautQueue.inc:398
 msgid "Error"
 msgstr "Erro"
 
@@ -412,8 +385,7 @@ msgstr ""
 #: addons/argonaut/class_argonautImportFile.inc:44
 #: addons/argonaut/class_argonautImportFile.inc:100
 #: addons/argonaut/class_argonautImportFile.inc:141
-#: addons/argonaut/deploy-list.xml:79
-#: addons/argonaut/argonaut_import_file.tpl.c:68
+#: addons/argonaut/deploy-list.xml:99
 msgid "Import"
 msgstr ""
 
@@ -427,7 +399,8 @@ msgid ""
 msgstr ""
 
 #: addons/argonaut/class_argonautImportFile.inc:134
-msgid "Infrastructure service"
+#: addons/argonaut/class_argonautQueue.inc:350
+msgid "Service infrastructure"
 msgstr ""
 
 #: addons/argonaut/class_argonautImportFile.inc:141
@@ -436,84 +409,82 @@ msgid "Import complete: %s events successfully send, %s failed"
 msgstr ""
 
 #: addons/argonaut/class_argonautImportFile.inc:177
-#: addons/argonaut/argonaut_import_file.tpl.c:47
 msgid "MAC"
 msgstr ""
 
 #: addons/argonaut/class_argonautImportFile.inc:180
 #: addons/argonaut/deploy-list.xml:14
-#: addons/argonaut/argonaut_import_file.tpl.c:50
 msgid "Event"
 msgstr ""
 
-#: addons/argonaut/class_argonautQueue.inc:35
-#: addons/argonaut/class_argonautQueue.inc:41
+#: addons/argonaut/class_argonautQueue.inc:39
+#: addons/argonaut/class_argonautQueue.inc:45
 msgid "Deployment queue"
 msgstr ""
 
-#: addons/argonaut/class_argonautQueue.inc:36
+#: addons/argonaut/class_argonautQueue.inc:40
 msgid "Provide a mechanism to automatically activate systems"
 msgstr ""
 
-#: addons/argonaut/class_argonautQueue.inc:43
+#: addons/argonaut/class_argonautQueue.inc:47
 #: addons/argonaut/events/eventTargetSystems-list.xml:81
 msgid "Description"
 msgstr "DescriÃ§Ã£o"
 
-#: addons/argonaut/class_argonautQueue.inc:141
+#: addons/argonaut/class_argonautQueue.inc:174
 msgid "immediately"
 msgstr ""
 
-#: addons/argonaut/class_argonautQueue.inc:156
+#: addons/argonaut/class_argonautQueue.inc:189
 msgid "Waiting"
 msgstr ""
 
-#: addons/argonaut/class_argonautQueue.inc:159
+#: addons/argonaut/class_argonautQueue.inc:192
 msgid "Show error"
 msgstr ""
 
-#: addons/argonaut/class_argonautQueue.inc:163
+#: addons/argonaut/class_argonautQueue.inc:196
 msgid "Processed"
 msgstr ""
 
-#: addons/argonaut/class_argonautQueue.inc:172
+#: addons/argonaut/class_argonautQueue.inc:205
 msgid "in progress"
 msgstr ""
 
-#: addons/argonaut/class_argonautQueue.inc:180
+#: addons/argonaut/class_argonautQueue.inc:226
 msgid "Permission"
 msgstr ""
 
-#: addons/argonaut/class_argonautQueue.inc:210
+#: addons/argonaut/class_argonautQueue.inc:256
 #: addons/argonaut/events/class_DaemonEvent.inc:258
-#: addons/argonaut/deploy-list.xml:86 addons/argonaut/deploy-list.xml:136
+#: addons/argonaut/deploy-list.xml:106 addons/argonaut/deploy-list.xml:166
 msgid "Remove"
 msgstr "Remover"
 
-#: addons/argonaut/class_argonautQueue.inc:211
+#: addons/argonaut/class_argonautQueue.inc:257
 #, php-format
 msgid "The following jobs couldn't be deleted, they have to be aborted: %s"
 msgstr ""
 
-#: addons/argonaut/class_argonautQueue.inc:257
+#: addons/argonaut/class_argonautQueue.inc:304
 msgid "Info"
 msgstr ""
 
-#: addons/argonaut/class_argonautQueue.inc:257
+#: addons/argonaut/class_argonautQueue.inc:304
 #, php-format
 msgid "%s"
 msgstr ""
 
-#: addons/argonaut/class_argonautQueue.inc:261
+#: addons/argonaut/class_argonautQueue.inc:308
 #, php-format
 msgid "Required class '%s' cannot be found: job not aborted!"
 msgstr ""
 
-#: addons/argonaut/class_argonautQueue.inc:293
+#: addons/argonaut/class_argonautQueue.inc:340
 msgid "Error detail"
 msgstr ""
 
-#: addons/argonaut/class_argonautQueue.inc:335
+#: addons/argonaut/class_argonautQueue.inc:398
 #, php-format
 msgid "Cannot update queue entries."
 msgstr ""
@@ -588,17 +559,15 @@ msgid "Winstation"
 msgstr ""
 
 #: addons/argonaut/events/eventTargetSystems-list.xml:47
-#: addons/argonaut/argonaut_import_file.tpl.c:53
 msgid "Object group"
 msgstr ""
 
 #: addons/argonaut/events/eventTargetSystems-list.xml:73
-#: addons/argonaut/events/eventTargetSystems-filter.tpl.c:20
+#: addons/argonaut/deploy-list.xml:36
 msgid "Name"
 msgstr "Nome"
 
 #: addons/argonaut/events/eventTargetSystems-list.xml:89
-#: addons/argonaut/argonaut_import_file.tpl.c:62
 msgid "IP"
 msgstr ""
 
@@ -611,48 +580,53 @@ msgid "List of queued jobs"
 msgstr ""
 
 #: addons/argonaut/deploy-list.xml:27
-#: addons/argonaut/events/DaemonEvent.tpl.c:17
 msgid "Target"
 msgstr ""
 
-#: addons/argonaut/deploy-list.xml:35
+#: addons/argonaut/deploy-list.xml:45
 msgid "Task"
 msgstr ""
 
-#: addons/argonaut/deploy-list.xml:43
+#: addons/argonaut/deploy-list.xml:53
 msgid "Period"
 msgstr ""
 
-#: addons/argonaut/deploy-list.xml:51
-#: addons/argonaut/events/DaemonEvent.tpl.c:2
+#: addons/argonaut/deploy-list.xml:61
 msgid "Schedule"
 msgstr ""
 
-#: addons/argonaut/deploy-list.xml:59
-#: addons/argonaut/events/DaemonEvent.tpl.c:11
+#: addons/argonaut/deploy-list.xml:69
 msgid "Status"
 msgstr "Estatus"
 
-#: addons/argonaut/deploy-list.xml:67
+#: addons/argonaut/deploy-list.xml:77
 msgid "Actions"
 msgstr "AÃ§Ãµes"
 
-#: addons/argonaut/deploy-list.xml:97 addons/argonaut/deploy-list.xml:144
+#: addons/argonaut/deploy-list.xml:88
+msgid "Create"
+msgstr "Criar"
+
+#: addons/argonaut/deploy-list.xml:117 addons/argonaut/deploy-list.xml:174
 msgid "Abort"
 msgstr ""
 
-#: addons/argonaut/deploy-list.xml:108
+#: addons/argonaut/deploy-list.xml:128
 msgid "Execute"
 msgstr ""
 
-#: addons/argonaut/deploy-list.xml:120
+#: addons/argonaut/deploy-list.xml:140
 msgid "Process now"
 msgstr ""
 
-#: addons/argonaut/deploy-list.xml:128
+#: addons/argonaut/deploy-list.xml:148
 msgid "View logs"
 msgstr ""
 
+#: addons/argonaut/deploy-list.xml:157
+msgid "Edit"
+msgstr "Editar"
+
 #: include/class_supportDaemon.inc:89
 msgid "Multiple argonaut server found. Only one is supported"
 msgstr ""
@@ -670,162 +644,3 @@ msgstr ""
 #, php-format
 msgid "\"%s\" is not a file!"
 msgstr ""
-
-#: addons/argonaut/argonaut_import_file.tpl.c:2
-msgid "Import jobs"
-msgstr ""
-
-#: addons/argonaut/argonaut_import_file.tpl.c:5
-msgid ""
-"You can import a list of jobs into the FusionDirectory job queue. This "
-"should be a semicolon seperated list of items in the following format:"
-msgstr ""
-
-#: addons/argonaut/argonaut_import_file.tpl.c:8
-msgid "timestamp"
-msgstr ""
-
-#: addons/argonaut/argonaut_import_file.tpl.c:11
-msgid "MAC-address"
-msgstr ""
-
-#: addons/argonaut/argonaut_import_file.tpl.c:14
-msgid "job type"
-msgstr ""
-
-#: addons/argonaut/argonaut_import_file.tpl.c:17
-msgid "object group"
-msgstr ""
-
-#: addons/argonaut/argonaut_import_file.tpl.c:20
-msgid "import base"
-msgstr ""
-
-#: addons/argonaut/argonaut_import_file.tpl.c:23
-msgid "full hostname"
-msgstr ""
-
-#: addons/argonaut/argonaut_import_file.tpl.c:26
-msgid "IP-address"
-msgstr ""
-
-#: addons/argonaut/argonaut_import_file.tpl.c:29
-msgid "DHCP group"
-msgstr ""
-
-#: addons/argonaut/argonaut_import_file.tpl.c:32
-msgid "Example"
-msgstr ""
-
-#: addons/argonaut/argonaut_import_file.tpl.c:35
-msgid "Select list to import"
-msgstr ""
-
-#: addons/argonaut/argonaut_import_file.tpl.c:38
-msgid "Browse"
-msgstr ""
-
-#: addons/argonaut/argonaut_import_file.tpl.c:41
-msgid "Upload"
-msgstr ""
-
-#: addons/argonaut/argonaut_import_file.tpl.c:44
-#: addons/argonaut/events/DaemonEvent.tpl.c:20
-msgid "Timestamp"
-msgstr ""
-
-#: addons/argonaut/argonaut_import_file.tpl.c:56
-msgid "Base"
-msgstr "Base"
-
-#: addons/argonaut/argonaut_import_file.tpl.c:59
-msgid "FQDN"
-msgstr ""
-
-#: addons/argonaut/argonaut_import_file.tpl.c:65
-msgid "DHCP"
-msgstr ""
-
-#: addons/argonaut/events/target_list.tpl.c:2
-msgid "Apply"
-msgstr "Aplicar"
-
-#: addons/argonaut/events/target_list.tpl.c:5
-msgid "Cancel"
-msgstr "Cancelar"
-
-#: addons/argonaut/events/DaemonEvent.tpl.c:5
-msgid "System list"
-msgstr ""
-
-#: addons/argonaut/events/DaemonEvent.tpl.c:8
-msgid "ID"
-msgstr ""
-
-#: addons/argonaut/events/DaemonEvent.tpl.c:14
-msgid "Result"
-msgstr ""
-
-#: addons/argonaut/events/eventTargetSystems-filter.tpl.c:2
-msgid "Filter"
-msgstr ""
-
-#: addons/argonaut/events/eventTargetSystems-filter.tpl.c:5
-msgid "Show servers"
-msgstr ""
-
-#: addons/argonaut/events/eventTargetSystems-filter.tpl.c:8
-msgid "Show workstations"
-msgstr ""
-
-#: addons/argonaut/events/eventTargetSystems-filter.tpl.c:11
-msgid "Show terminals"
-msgstr ""
-
-#: addons/argonaut/events/eventTargetSystems-filter.tpl.c:14
-msgid "Show winstations"
-msgstr ""
-
-#: addons/argonaut/events/eventTargetSystems-filter.tpl.c:17
-msgid "Filter by IP address range"
-msgstr ""
-
-#: addons/argonaut/events/timestamp_select.tpl.c:2
-msgid "Year"
-msgstr ""
-
-#: addons/argonaut/events/timestamp_select.tpl.c:5
-msgid "Month"
-msgstr ""
-
-#: addons/argonaut/events/timestamp_select.tpl.c:8
-msgid "Day"
-msgstr ""
-
-#: addons/argonaut/events/timestamp_select.tpl.c:11
-msgid "Hour"
-msgstr ""
-
-#: addons/argonaut/events/timestamp_select.tpl.c:14
-msgid "Minute"
-msgstr ""
-
-#: addons/argonaut/events/timestamp_select.tpl.c:17
-msgid "Second"
-msgstr ""
-
-#: addons/argonaut/events/timestamp_select.tpl.c:20
-msgid "Periodical job"
-msgstr ""
-
-#: addons/argonaut/events/timestamp_select.tpl.c:23
-msgid "Job intervall"
-msgstr ""
-
-#: addons/argonaut/remove.tpl.c:2
-msgid "Warning"
-msgstr "AtenÃ§Ã£o"
-
-#: addons/argonaut/remove.tpl.c:5
-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."
diff --git a/argonaut/locale/pt_BR/fusiondirectory.po b/argonaut/locale/pt_BR/fusiondirectory.po
index 978571bbc560154af142018ee34f55bbcc21eef0..d6a7c36b87e4f5262dc85f93c48064a081bbcc60 100644
--- a/argonaut/locale/pt_BR/fusiondirectory.po
+++ b/argonaut/locale/pt_BR/fusiondirectory.po
@@ -3,17 +3,14 @@
 # This file is distributed under the same license as the PACKAGE package.
 # 
 # Translators:
-# ALEJANDRO BARRIOS <alejandrobarrios@interlegis.leg.br>, 2014
-# kayocarneiro <kayomatheus@gmail.com>, 2014
-# kayocarneiro <kayomatheus@gmail.com>, 2014
 msgid ""
 msgstr ""
-"Project-Id-Version: FusionDirectory-108\n"
+"Project-Id-Version: FusionDirectory-109\n"
 "Report-Msgid-Bugs-To: documentation@lists.fusiondirectory.org\n"
-"POT-Creation-Date: 2015-03-31 11:49+0200\n"
-"PO-Revision-Date: 2015-03-31 11:41+0000\n"
+"POT-Creation-Date: 2014-12-15 17:47+0100\n"
+"PO-Revision-Date: 2015-02-25 16:13+0000\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>\n"
-"Language-Team: Portuguese (Brazil) (http://www.transifex.com/projects/p/FusionDirectory-108/language/pt_BR/)\n"
+"Language-Team: Portuguese (Brazil) (http://www.transifex.com/projects/p/FusionDirectory-109/language/pt_BR/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -50,7 +47,7 @@ msgstr "Arquivo o qual argonaut usarÃ¡ para armazenar sua task id quando inicial
 
 #: admin/systems/argonaut/class_argonautClient.inc:135
 #: admin/systems/services/argonaut/class_argonautFuseConfig.inc:56
-#: admin/systems/services/argonaut/class_argonautMirrorConfig.inc:71
+#: admin/systems/services/argonaut/class_argonautMirrorConfig.inc:79
 #: admin/systems/services/argonaut/class_argonautServer.inc:79
 msgid "Log directory"
 msgstr "DiretÃ³rio de registro"
@@ -81,6 +78,7 @@ msgid "Argonaut Fuse settings"
 msgstr "ConfiguraÃ§Ãµes Argonaut Fuse"
 
 #: admin/systems/services/argonaut/class_argonautFuseConfig.inc:32
+#: admin/systems/services/argonaut/class_argonautMirrorConfig.inc:32
 #: admin/systems/services/argonaut/class_argonautFuseFAIConfig.inc:33
 #: admin/systems/services/argonaut/class_argonautServer.inc:32
 #: admin/systems/services/argonaut/class_argonautFuseOPSIConfig.inc:33
@@ -113,88 +111,60 @@ msgstr "Pxelinux cfg path"
 msgid "Path where argonaut-fuse should store pxelinux.cfg"
 msgstr "Pacote onde argonaut-fuse devera armazenar pxelinux.cfg"
 
-#: admin/systems/services/argonaut/class_argonautMirrorConfig.inc:29
-#: admin/systems/services/argonaut/class_argonautMirrorConfig.inc:30
+#: admin/systems/services/argonaut/class_argonautMirrorConfig.inc:31
+#: admin/systems/services/argonaut/class_argonautMirrorConfig.inc:32
 msgid "Argonaut Mirror settings"
 msgstr "ConfiguraÃ§Ãµes Argonaut Mirror"
 
-#: admin/systems/services/argonaut/class_argonautMirrorConfig.inc:41
+#: admin/systems/services/argonaut/class_argonautMirrorConfig.inc:46
 msgid "Argonaut mirror settings"
 msgstr "ConfiguraÃ§Ãµes mirror do Argonaut"
 
-#: admin/systems/services/argonaut/class_argonautMirrorConfig.inc:44
-msgid "Local Debian mirror directory"
-msgstr ""
+#: admin/systems/services/argonaut/class_argonautMirrorConfig.inc:49
+msgid "Local debian mirror directory"
+msgstr "DiretÃ³rio local mirror debiam"
 
-#: admin/systems/services/argonaut/class_argonautMirrorConfig.inc:52
+#: admin/systems/services/argonaut/class_argonautMirrorConfig.inc:58
 msgid "Argonaut Debconf Crawler configuration"
 msgstr "ConfiguraÃ§Ã£o Argonaut Debconf Crawler"
 
-#: admin/systems/services/argonaut/class_argonautMirrorConfig.inc:55
+#: admin/systems/services/argonaut/class_argonautMirrorConfig.inc:61
 msgid "Local packages folder"
 msgstr "Paste de pacotes locais"
 
-#: admin/systems/services/argonaut/class_argonautMirrorConfig.inc:56
+#: admin/systems/services/argonaut/class_argonautMirrorConfig.inc:62
 msgid "Folder in which the crawler will store packages during analysis"
 msgstr "Pasta onde o rastreador armazenarÃ¡ os pacotes durante a anÃ¡lise"
 
-#: admin/systems/services/argonaut/class_argonautMirrorConfig.inc:63
+#: admin/systems/services/argonaut/class_argonautMirrorConfig.inc:70
 msgid "Argonaut Repository configuration"
 msgstr "ConfiguraÃ§Ã£o de repositÃ³rio Argonaut"
 
-#: admin/systems/services/argonaut/class_argonautMirrorConfig.inc:66
+#: admin/systems/services/argonaut/class_argonautMirrorConfig.inc:73
 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 ""
-
-#: admin/systems/services/argonaut/class_argonautMirrorConfig.inc:71
-msgid "Directory in which logs should be stored"
-msgstr ""
-
-#: admin/systems/services/argonaut/class_argonautMirrorConfig.inc:76
-msgid "Ignore errors"
-msgstr ""
+#: admin/systems/services/argonaut/class_argonautMirrorConfig.inc:84
+msgid "Errors"
+msgstr "Erros"
 
-#: admin/systems/services/argonaut/class_argonautMirrorConfig.inc:77
-msgid ""
-"Causes debmirror to ignore missing or broken deb and source files but still "
-"be pedantic about checking meta files"
-msgstr ""
-
-#: admin/systems/services/argonaut/class_argonautMirrorConfig.inc:82
+#: admin/systems/services/argonaut/class_argonautMirrorConfig.inc:91
 msgid "Source"
 msgstr "Fonte"
 
-#: admin/systems/services/argonaut/class_argonautMirrorConfig.inc:82
-msgid "Include source in the mirror"
-msgstr ""
-
-#: admin/systems/services/argonaut/class_argonautMirrorConfig.inc:87
+#: admin/systems/services/argonaut/class_argonautMirrorConfig.inc:98
 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
+#: admin/systems/services/argonaut/class_argonautMirrorConfig.inc:105
 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
+#: admin/systems/services/argonaut/class_argonautMirrorConfig.inc:112
 msgid "Verbose"
 msgstr "Verbose"
 
-#: admin/systems/services/argonaut/class_argonautMirrorConfig.inc:98
+#: admin/systems/services/argonaut/class_argonautMirrorConfig.inc:113
 msgid "Wether to activate verbose mode"
 msgstr "Aperte para ativar o modo detalhado"
 
@@ -401,9 +371,9 @@ msgid "LTSP server"
 msgstr "Servidor LTSP"
 
 #: addons/argonaut/class_filterArgonautEvents.inc:40
-#: addons/argonaut/class_argonautQueue.inc:160
-#: addons/argonaut/class_argonautQueue.inc:260
-#: addons/argonaut/class_argonautQueue.inc:335
+#: addons/argonaut/class_argonautQueue.inc:193
+#: addons/argonaut/class_argonautQueue.inc:307
+#: addons/argonaut/class_argonautQueue.inc:398
 msgid "Error"
 msgstr "Erro"
 
@@ -415,8 +385,7 @@ msgstr "NÃ£o foi possÃvel carregar as entradas queue: %s"
 #: addons/argonaut/class_argonautImportFile.inc:44
 #: addons/argonaut/class_argonautImportFile.inc:100
 #: addons/argonaut/class_argonautImportFile.inc:141
-#: addons/argonaut/deploy-list.xml:79
-#: addons/argonaut/argonaut_import_file.tpl.c:68
+#: addons/argonaut/deploy-list.xml:99
 msgid "Import"
 msgstr "Importar"
 
@@ -430,8 +399,9 @@ msgid ""
 msgstr "As entradas selecionadas serÃ£o ignoradas por causa dos erros. Gostaria de prosseguir?"
 
 #: addons/argonaut/class_argonautImportFile.inc:134
-msgid "Infrastructure service"
-msgstr ""
+#: addons/argonaut/class_argonautQueue.inc:350
+msgid "Service infrastructure"
+msgstr "Infraestrutura do serviÃ§o"
 
 #: addons/argonaut/class_argonautImportFile.inc:141
 #, php-format
@@ -439,84 +409,82 @@ msgid "Import complete: %s events successfully send, %s failed"
 msgstr "ImportaÃ§Ã£o completa: %s eventos enviados corretamente, %s falharam"
 
 #: addons/argonaut/class_argonautImportFile.inc:177
-#: addons/argonaut/argonaut_import_file.tpl.c:47
 msgid "MAC"
 msgstr "MAC"
 
 #: addons/argonaut/class_argonautImportFile.inc:180
 #: addons/argonaut/deploy-list.xml:14
-#: addons/argonaut/argonaut_import_file.tpl.c:50
 msgid "Event"
 msgstr "Evento"
 
-#: addons/argonaut/class_argonautQueue.inc:35
-#: addons/argonaut/class_argonautQueue.inc:41
+#: addons/argonaut/class_argonautQueue.inc:39
+#: addons/argonaut/class_argonautQueue.inc:45
 msgid "Deployment queue"
 msgstr "Fila de implantaÃ§Ã£o"
 
-#: addons/argonaut/class_argonautQueue.inc:36
+#: addons/argonaut/class_argonautQueue.inc:40
 msgid "Provide a mechanism to automatically activate systems"
 msgstr "Prover um mecanismo para ativar os sistemas automaticamente"
 
-#: addons/argonaut/class_argonautQueue.inc:43
+#: addons/argonaut/class_argonautQueue.inc:47
 #: addons/argonaut/events/eventTargetSystems-list.xml:81
 msgid "Description"
 msgstr "DescriÃ§Ã£o"
 
-#: addons/argonaut/class_argonautQueue.inc:141
+#: addons/argonaut/class_argonautQueue.inc:174
 msgid "immediately"
 msgstr "Imediatamente"
 
-#: addons/argonaut/class_argonautQueue.inc:156
+#: addons/argonaut/class_argonautQueue.inc:189
 msgid "Waiting"
 msgstr "Esperando"
 
-#: addons/argonaut/class_argonautQueue.inc:159
+#: addons/argonaut/class_argonautQueue.inc:192
 msgid "Show error"
 msgstr "Mostrar erro"
 
-#: addons/argonaut/class_argonautQueue.inc:163
+#: addons/argonaut/class_argonautQueue.inc:196
 msgid "Processed"
 msgstr "Processado"
 
-#: addons/argonaut/class_argonautQueue.inc:172
+#: addons/argonaut/class_argonautQueue.inc:205
 msgid "in progress"
 msgstr "em progresso"
 
-#: addons/argonaut/class_argonautQueue.inc:180
+#: addons/argonaut/class_argonautQueue.inc:226
 msgid "Permission"
 msgstr "PermissÃ£o"
 
-#: addons/argonaut/class_argonautQueue.inc:210
+#: addons/argonaut/class_argonautQueue.inc:256
 #: addons/argonaut/events/class_DaemonEvent.inc:258
-#: addons/argonaut/deploy-list.xml:86 addons/argonaut/deploy-list.xml:136
+#: addons/argonaut/deploy-list.xml:106 addons/argonaut/deploy-list.xml:166
 msgid "Remove"
 msgstr "Remover"
 
-#: addons/argonaut/class_argonautQueue.inc:211
+#: addons/argonaut/class_argonautQueue.inc:257
 #, 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:257
+#: addons/argonaut/class_argonautQueue.inc:304
 msgid "Info"
 msgstr "InformaÃ§Ãµes"
 
-#: addons/argonaut/class_argonautQueue.inc:257
+#: addons/argonaut/class_argonautQueue.inc:304
 #, php-format
 msgid "%s"
 msgstr "%s"
 
-#: addons/argonaut/class_argonautQueue.inc:261
+#: addons/argonaut/class_argonautQueue.inc:308
 #, php-format
 msgid "Required class '%s' cannot be found: job not aborted!"
 msgstr "Classe requerida '%s' nÃ£o foi encontrada: trabalho nÃ£o abortado!"
 
-#: addons/argonaut/class_argonautQueue.inc:293
+#: addons/argonaut/class_argonautQueue.inc:340
 msgid "Error detail"
 msgstr "Detalhes do erro"
 
-#: addons/argonaut/class_argonautQueue.inc:335
+#: addons/argonaut/class_argonautQueue.inc:398
 #, php-format
 msgid "Cannot update queue entries."
 msgstr "NÃ£o foi possÃvel atualizar a fila de entradas"
@@ -576,7 +544,7 @@ msgstr "Lista de sistemas de destino"
 
 #: addons/argonaut/events/eventTargetSystems-list.xml:15
 msgid "Server"
-msgstr "Servidor"
+msgstr "servidor"
 
 #: addons/argonaut/events/eventTargetSystems-list.xml:23
 msgid "Workstation"
@@ -591,17 +559,15 @@ msgid "Winstation"
 msgstr "Winstation"
 
 #: addons/argonaut/events/eventTargetSystems-list.xml:47
-#: addons/argonaut/argonaut_import_file.tpl.c:53
 msgid "Object group"
 msgstr "Grupo de objeto"
 
 #: addons/argonaut/events/eventTargetSystems-list.xml:73
-#: addons/argonaut/events/eventTargetSystems-filter.tpl.c:20
+#: addons/argonaut/deploy-list.xml:36
 msgid "Name"
 msgstr "Nome"
 
 #: addons/argonaut/events/eventTargetSystems-list.xml:89
-#: addons/argonaut/argonaut_import_file.tpl.c:62
 msgid "IP"
 msgstr "IP"
 
@@ -614,48 +580,53 @@ msgid "List of queued jobs"
 msgstr "Lista de filas de trabalho"
 
 #: addons/argonaut/deploy-list.xml:27
-#: addons/argonaut/events/DaemonEvent.tpl.c:17
 msgid "Target"
 msgstr "Destino"
 
-#: addons/argonaut/deploy-list.xml:35
+#: addons/argonaut/deploy-list.xml:45
 msgid "Task"
 msgstr "Tarefa"
 
-#: addons/argonaut/deploy-list.xml:43
+#: addons/argonaut/deploy-list.xml:53
 msgid "Period"
 msgstr "PerÃodo"
 
-#: addons/argonaut/deploy-list.xml:51
-#: addons/argonaut/events/DaemonEvent.tpl.c:2
+#: addons/argonaut/deploy-list.xml:61
 msgid "Schedule"
 msgstr "ProgramaÃ§Ã£o"
 
-#: addons/argonaut/deploy-list.xml:59
-#: addons/argonaut/events/DaemonEvent.tpl.c:11
+#: addons/argonaut/deploy-list.xml:69
 msgid "Status"
 msgstr "Estado"
 
-#: addons/argonaut/deploy-list.xml:67
+#: addons/argonaut/deploy-list.xml:77
 msgid "Actions"
 msgstr "AÃ§Ãµes"
 
-#: addons/argonaut/deploy-list.xml:97 addons/argonaut/deploy-list.xml:144
+#: addons/argonaut/deploy-list.xml:88
+msgid "Create"
+msgstr "Criar"
+
+#: addons/argonaut/deploy-list.xml:117 addons/argonaut/deploy-list.xml:174
 msgid "Abort"
 msgstr "Abortar"
 
-#: addons/argonaut/deploy-list.xml:108
+#: addons/argonaut/deploy-list.xml:128
 msgid "Execute"
 msgstr "Executar"
 
-#: addons/argonaut/deploy-list.xml:120
+#: addons/argonaut/deploy-list.xml:140
 msgid "Process now"
 msgstr "Processar agora"
 
-#: addons/argonaut/deploy-list.xml:128
+#: addons/argonaut/deploy-list.xml:148
 msgid "View logs"
 msgstr "Ver registros"
 
+#: addons/argonaut/deploy-list.xml:157
+msgid "Edit"
+msgstr "Editar"
+
 #: include/class_supportDaemon.inc:89
 msgid "Multiple argonaut server found. Only one is supported"
 msgstr "Servidores mÃºltiplos argonaut encontrados. Apenas um Ã© suportado"
@@ -673,162 +644,3 @@ msgstr ""
 #, php-format
 msgid "\"%s\" is not a file!"
 msgstr ""
-
-#: addons/argonaut/argonaut_import_file.tpl.c:2
-msgid "Import jobs"
-msgstr "Importar trabalhos"
-
-#: addons/argonaut/argonaut_import_file.tpl.c:5
-msgid ""
-"You can import a list of jobs into the FusionDirectory job queue. This "
-"should be a semicolon seperated list of items in the following format:"
-msgstr "VocÃª pode importas listas de trabalho para a fila de trabalho do FusionDirectory. Isto aparecerÃ¡ como uma semi coluna separado da lista de itens no seguinte formato:"
-
-#: addons/argonaut/argonaut_import_file.tpl.c:8
-msgid "timestamp"
-msgstr "Data"
-
-#: addons/argonaut/argonaut_import_file.tpl.c:11
-msgid "MAC-address"
-msgstr "EndereÃ§o-MAC"
-
-#: addons/argonaut/argonaut_import_file.tpl.c:14
-msgid "job type"
-msgstr "Tipo de trabalho"
-
-#: addons/argonaut/argonaut_import_file.tpl.c:17
-msgid "object group"
-msgstr "Grupo de objeto"
-
-#: addons/argonaut/argonaut_import_file.tpl.c:20
-msgid "import base"
-msgstr "Importar base"
-
-#: addons/argonaut/argonaut_import_file.tpl.c:23
-msgid "full hostname"
-msgstr "hostname completo"
-
-#: addons/argonaut/argonaut_import_file.tpl.c:26
-msgid "IP-address"
-msgstr "EndereÃ§o-IP"
-
-#: addons/argonaut/argonaut_import_file.tpl.c:29
-msgid "DHCP group"
-msgstr "Grupo DHCP"
-
-#: addons/argonaut/argonaut_import_file.tpl.c:32
-msgid "Example"
-msgstr "Exemplo"
-
-#: addons/argonaut/argonaut_import_file.tpl.c:35
-msgid "Select list to import"
-msgstr "Selecionar lista para importar"
-
-#: addons/argonaut/argonaut_import_file.tpl.c:38
-msgid "Browse"
-msgstr "Navegar"
-
-#: addons/argonaut/argonaut_import_file.tpl.c:41
-msgid "Upload"
-msgstr "Upload"
-
-#: addons/argonaut/argonaut_import_file.tpl.c:44
-#: addons/argonaut/events/DaemonEvent.tpl.c:20
-msgid "Timestamp"
-msgstr "Data e hora"
-
-#: addons/argonaut/argonaut_import_file.tpl.c:56
-msgid "Base"
-msgstr "Base"
-
-#: addons/argonaut/argonaut_import_file.tpl.c:59
-msgid "FQDN"
-msgstr "FQDN"
-
-#: addons/argonaut/argonaut_import_file.tpl.c:65
-msgid "DHCP"
-msgstr "DHCP"
-
-#: addons/argonaut/events/target_list.tpl.c:2
-msgid "Apply"
-msgstr "Aplicar"
-
-#: addons/argonaut/events/target_list.tpl.c:5
-msgid "Cancel"
-msgstr "Cancelar"
-
-#: addons/argonaut/events/DaemonEvent.tpl.c:5
-msgid "System list"
-msgstr "Lista do sistema"
-
-#: addons/argonaut/events/DaemonEvent.tpl.c:8
-msgid "ID"
-msgstr "ID"
-
-#: addons/argonaut/events/DaemonEvent.tpl.c:14
-msgid "Result"
-msgstr "Resultado"
-
-#: addons/argonaut/events/eventTargetSystems-filter.tpl.c:2
-msgid "Filter"
-msgstr "Filtro"
-
-#: addons/argonaut/events/eventTargetSystems-filter.tpl.c:5
-msgid "Show servers"
-msgstr "Exibir servidores"
-
-#: addons/argonaut/events/eventTargetSystems-filter.tpl.c:8
-msgid "Show workstations"
-msgstr "Exibir estaÃ§Ãµes de trabalho"
-
-#: addons/argonaut/events/eventTargetSystems-filter.tpl.c:11
-msgid "Show terminals"
-msgstr "Exibir terminais"
-
-#: addons/argonaut/events/eventTargetSystems-filter.tpl.c:14
-msgid "Show winstations"
-msgstr "Mostrar winstations"
-
-#: addons/argonaut/events/eventTargetSystems-filter.tpl.c:17
-msgid "Filter by IP address range"
-msgstr "Filtrar por intervalo de endereÃ§o de IP"
-
-#: addons/argonaut/events/timestamp_select.tpl.c:2
-msgid "Year"
-msgstr "Ano"
-
-#: addons/argonaut/events/timestamp_select.tpl.c:5
-msgid "Month"
-msgstr "MÃªs"
-
-#: addons/argonaut/events/timestamp_select.tpl.c:8
-msgid "Day"
-msgstr "Dia"
-
-#: addons/argonaut/events/timestamp_select.tpl.c:11
-msgid "Hour"
-msgstr "Hora"
-
-#: addons/argonaut/events/timestamp_select.tpl.c:14
-msgid "Minute"
-msgstr "Minuto"
-
-#: addons/argonaut/events/timestamp_select.tpl.c:17
-msgid "Second"
-msgstr "Segundo"
-
-#: addons/argonaut/events/timestamp_select.tpl.c:20
-msgid "Periodical job"
-msgstr "Trabalho periÃ³dico"
-
-#: addons/argonaut/events/timestamp_select.tpl.c:23
-msgid "Job intervall"
-msgstr "Intervalo de trabalho"
-
-#: addons/argonaut/remove.tpl.c:2
-msgid "Warning"
-msgstr "Aviso"
-
-#: addons/argonaut/remove.tpl.c:5
-msgid "So - if you're sure - press 'Delete' to continue or 'Cancel' to abort."
-msgstr "Se vocÃª tem certeza, pressione 'Delete' para continuar ou 'Cancel' para desistir."
diff --git a/argonaut/locale/ru/fusiondirectory.po b/argonaut/locale/ru/fusiondirectory.po
index 55cc6fc7ede4eb5f13de0e659e134ff8080809d8..c4f7961f5b03b330d70887379938866589eabaf6 100644
--- a/argonaut/locale/ru/fusiondirectory.po
+++ b/argonaut/locale/ru/fusiondirectory.po
@@ -5,17 +5,17 @@
 # Translators:
 msgid ""
 msgstr ""
-"Project-Id-Version: FusionDirectory-108\n"
+"Project-Id-Version: FusionDirectory-109\n"
 "Report-Msgid-Bugs-To: documentation@lists.fusiondirectory.org\n"
-"POT-Creation-Date: 2015-03-31 11:49+0200\n"
-"PO-Revision-Date: 2015-03-31 11:41+0000\n"
+"POT-Creation-Date: 2014-12-15 17:47+0100\n"
+"PO-Revision-Date: 2015-04-18 18:07+0000\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>\n"
-"Language-Team: Russian (http://www.transifex.com/projects/p/FusionDirectory-108/language/ru/)\n"
+"Language-Team: Russian (http://www.transifex.com/projects/p/FusionDirectory-109/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=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);\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 settings"
@@ -47,7 +47,7 @@ msgstr ""
 
 #: admin/systems/argonaut/class_argonautClient.inc:135
 #: admin/systems/services/argonaut/class_argonautFuseConfig.inc:56
-#: admin/systems/services/argonaut/class_argonautMirrorConfig.inc:71
+#: admin/systems/services/argonaut/class_argonautMirrorConfig.inc:79
 #: admin/systems/services/argonaut/class_argonautServer.inc:79
 msgid "Log directory"
 msgstr ""
@@ -78,6 +78,7 @@ msgid "Argonaut Fuse settings"
 msgstr ""
 
 #: admin/systems/services/argonaut/class_argonautFuseConfig.inc:32
+#: admin/systems/services/argonaut/class_argonautMirrorConfig.inc:32
 #: admin/systems/services/argonaut/class_argonautFuseFAIConfig.inc:33
 #: admin/systems/services/argonaut/class_argonautServer.inc:32
 #: admin/systems/services/argonaut/class_argonautFuseOPSIConfig.inc:33
@@ -110,88 +111,60 @@ msgstr ""
 msgid "Path where argonaut-fuse should store pxelinux.cfg"
 msgstr ""
 
-#: admin/systems/services/argonaut/class_argonautMirrorConfig.inc:29
-#: admin/systems/services/argonaut/class_argonautMirrorConfig.inc:30
+#: admin/systems/services/argonaut/class_argonautMirrorConfig.inc:31
+#: admin/systems/services/argonaut/class_argonautMirrorConfig.inc:32
 msgid "Argonaut Mirror settings"
 msgstr ""
 
-#: admin/systems/services/argonaut/class_argonautMirrorConfig.inc:41
+#: admin/systems/services/argonaut/class_argonautMirrorConfig.inc:46
 msgid "Argonaut mirror settings"
 msgstr ""
 
-#: admin/systems/services/argonaut/class_argonautMirrorConfig.inc:44
-msgid "Local Debian mirror directory"
+#: admin/systems/services/argonaut/class_argonautMirrorConfig.inc:49
+msgid "Local debian mirror directory"
 msgstr ""
 
-#: admin/systems/services/argonaut/class_argonautMirrorConfig.inc:52
+#: admin/systems/services/argonaut/class_argonautMirrorConfig.inc:58
 msgid "Argonaut Debconf Crawler configuration"
 msgstr ""
 
-#: admin/systems/services/argonaut/class_argonautMirrorConfig.inc:55
+#: admin/systems/services/argonaut/class_argonautMirrorConfig.inc:61
 msgid "Local packages folder"
 msgstr ""
 
-#: admin/systems/services/argonaut/class_argonautMirrorConfig.inc:56
+#: admin/systems/services/argonaut/class_argonautMirrorConfig.inc:62
 msgid "Folder in which the crawler will store packages during analysis"
 msgstr ""
 
-#: admin/systems/services/argonaut/class_argonautMirrorConfig.inc:63
+#: admin/systems/services/argonaut/class_argonautMirrorConfig.inc:70
 msgid "Argonaut Repository configuration"
 msgstr ""
 
-#: admin/systems/services/argonaut/class_argonautMirrorConfig.inc:66
+#: admin/systems/services/argonaut/class_argonautMirrorConfig.inc:73
 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"
+#: admin/systems/services/argonaut/class_argonautMirrorConfig.inc:84
+msgid "Errors"
 msgstr ""
 
-#: admin/systems/services/argonaut/class_argonautMirrorConfig.inc:71
-msgid "Directory in which logs should be stored"
-msgstr ""
-
-#: admin/systems/services/argonaut/class_argonautMirrorConfig.inc:76
-msgid "Ignore errors"
-msgstr ""
-
-#: admin/systems/services/argonaut/class_argonautMirrorConfig.inc:77
-msgid ""
-"Causes debmirror to ignore missing or broken deb and source files but still "
-"be pedantic about checking meta files"
-msgstr ""
-
-#: admin/systems/services/argonaut/class_argonautMirrorConfig.inc:82
+#: admin/systems/services/argonaut/class_argonautMirrorConfig.inc:91
 msgid "Source"
 msgstr "Ð˜ÑÑ‚Ð¾Ñ‡Ð½Ð¸Ðº"
 
-#: admin/systems/services/argonaut/class_argonautMirrorConfig.inc:82
-msgid "Include source in the mirror"
-msgstr ""
-
-#: admin/systems/services/argonaut/class_argonautMirrorConfig.inc:87
+#: admin/systems/services/argonaut/class_argonautMirrorConfig.inc:98
 msgid "GPG Check"
 msgstr ""
 
-#: admin/systems/services/argonaut/class_argonautMirrorConfig.inc:87
-msgid "Fail if the Release.gpg file is missing"
-msgstr ""
-
-#: admin/systems/services/argonaut/class_argonautMirrorConfig.inc:92
+#: admin/systems/services/argonaut/class_argonautMirrorConfig.inc:105
 msgid "Contents"
 msgstr ""
 
-#: admin/systems/services/argonaut/class_argonautMirrorConfig.inc:93
-msgid ""
-"Additionally download Contents.<arch>.gz files (Note that these files can be"
-" relatively big and can change frequently)"
-msgstr ""
-
-#: admin/systems/services/argonaut/class_argonautMirrorConfig.inc:98
+#: admin/systems/services/argonaut/class_argonautMirrorConfig.inc:112
 msgid "Verbose"
 msgstr ""
 
-#: admin/systems/services/argonaut/class_argonautMirrorConfig.inc:98
+#: admin/systems/services/argonaut/class_argonautMirrorConfig.inc:113
 msgid "Wether to activate verbose mode"
 msgstr ""
 
@@ -398,9 +371,9 @@ msgid "LTSP server"
 msgstr ""
 
 #: addons/argonaut/class_filterArgonautEvents.inc:40
-#: addons/argonaut/class_argonautQueue.inc:160
-#: addons/argonaut/class_argonautQueue.inc:260
-#: addons/argonaut/class_argonautQueue.inc:335
+#: addons/argonaut/class_argonautQueue.inc:193
+#: addons/argonaut/class_argonautQueue.inc:307
+#: addons/argonaut/class_argonautQueue.inc:398
 msgid "Error"
 msgstr "ÐžÑˆÐ¸Ð±ÐºÐ°"
 
@@ -412,8 +385,7 @@ msgstr ""
 #: addons/argonaut/class_argonautImportFile.inc:44
 #: addons/argonaut/class_argonautImportFile.inc:100
 #: addons/argonaut/class_argonautImportFile.inc:141
-#: addons/argonaut/deploy-list.xml:79
-#: addons/argonaut/argonaut_import_file.tpl.c:68
+#: addons/argonaut/deploy-list.xml:99
 msgid "Import"
 msgstr "Ð˜Ð¼Ð¿Ð¾Ñ€Ñ‚Ð¸Ñ€Ð¾Ð²Ð°Ñ‚ÑŒ"
 
@@ -427,7 +399,8 @@ msgid ""
 msgstr ""
 
 #: addons/argonaut/class_argonautImportFile.inc:134
-msgid "Infrastructure service"
+#: addons/argonaut/class_argonautQueue.inc:350
+msgid "Service infrastructure"
 msgstr ""
 
 #: addons/argonaut/class_argonautImportFile.inc:141
@@ -436,84 +409,82 @@ msgid "Import complete: %s events successfully send, %s failed"
 msgstr ""
 
 #: addons/argonaut/class_argonautImportFile.inc:177
-#: addons/argonaut/argonaut_import_file.tpl.c:47
 msgid "MAC"
 msgstr "MAC"
 
 #: addons/argonaut/class_argonautImportFile.inc:180
 #: addons/argonaut/deploy-list.xml:14
-#: addons/argonaut/argonaut_import_file.tpl.c:50
 msgid "Event"
 msgstr ""
 
-#: addons/argonaut/class_argonautQueue.inc:35
-#: addons/argonaut/class_argonautQueue.inc:41
+#: addons/argonaut/class_argonautQueue.inc:39
+#: addons/argonaut/class_argonautQueue.inc:45
 msgid "Deployment queue"
 msgstr ""
 
-#: addons/argonaut/class_argonautQueue.inc:36
+#: addons/argonaut/class_argonautQueue.inc:40
 msgid "Provide a mechanism to automatically activate systems"
 msgstr ""
 
-#: addons/argonaut/class_argonautQueue.inc:43
+#: addons/argonaut/class_argonautQueue.inc:47
 #: addons/argonaut/events/eventTargetSystems-list.xml:81
 msgid "Description"
 msgstr "ÐžÐ¿Ð¸ÑÐ°Ð½Ð¸Ðµ"
 
-#: addons/argonaut/class_argonautQueue.inc:141
+#: addons/argonaut/class_argonautQueue.inc:174
 msgid "immediately"
 msgstr ""
 
-#: addons/argonaut/class_argonautQueue.inc:156
+#: addons/argonaut/class_argonautQueue.inc:189
 msgid "Waiting"
 msgstr ""
 
-#: addons/argonaut/class_argonautQueue.inc:159
+#: addons/argonaut/class_argonautQueue.inc:192
 msgid "Show error"
 msgstr ""
 
-#: addons/argonaut/class_argonautQueue.inc:163
+#: addons/argonaut/class_argonautQueue.inc:196
 msgid "Processed"
 msgstr ""
 
-#: addons/argonaut/class_argonautQueue.inc:172
+#: addons/argonaut/class_argonautQueue.inc:205
 msgid "in progress"
 msgstr ""
 
-#: addons/argonaut/class_argonautQueue.inc:180
+#: addons/argonaut/class_argonautQueue.inc:226
 msgid "Permission"
 msgstr "ÐŸÑ€Ð°Ð²Ð°"
 
-#: addons/argonaut/class_argonautQueue.inc:210
+#: addons/argonaut/class_argonautQueue.inc:256
 #: addons/argonaut/events/class_DaemonEvent.inc:258
-#: addons/argonaut/deploy-list.xml:86 addons/argonaut/deploy-list.xml:136
+#: addons/argonaut/deploy-list.xml:106 addons/argonaut/deploy-list.xml:166
 msgid "Remove"
 msgstr "Ð£Ð´Ð°Ð»Ð¸Ñ‚ÑŒ"
 
-#: addons/argonaut/class_argonautQueue.inc:211
+#: addons/argonaut/class_argonautQueue.inc:257
 #, php-format
 msgid "The following jobs couldn't be deleted, they have to be aborted: %s"
 msgstr ""
 
-#: addons/argonaut/class_argonautQueue.inc:257
+#: addons/argonaut/class_argonautQueue.inc:304
 msgid "Info"
 msgstr ""
 
-#: addons/argonaut/class_argonautQueue.inc:257
+#: addons/argonaut/class_argonautQueue.inc:304
 #, php-format
 msgid "%s"
 msgstr ""
 
-#: addons/argonaut/class_argonautQueue.inc:261
+#: addons/argonaut/class_argonautQueue.inc:308
 #, php-format
 msgid "Required class '%s' cannot be found: job not aborted!"
 msgstr ""
 
-#: addons/argonaut/class_argonautQueue.inc:293
+#: addons/argonaut/class_argonautQueue.inc:340
 msgid "Error detail"
 msgstr ""
 
-#: addons/argonaut/class_argonautQueue.inc:335
+#: addons/argonaut/class_argonautQueue.inc:398
 #, php-format
 msgid "Cannot update queue entries."
 msgstr ""
@@ -561,7 +532,7 @@ msgstr "Ð’ÐµÑ€Ð½ÑƒÑ‚ÑŒ Ð² Ð¾Ð±Ñ‹Ñ‡Ð½Ñ‹Ð¹ Ñ€ÐµÐ¶Ð¸Ð¼"
 
 #: addons/argonaut/events/class_DaemonEvent.inc:420
 msgid "Software update"
-msgstr ""
+msgstr "ÐžÐ±Ð½Ð¾Ð²Ð¸Ñ‚ÑŒ Ð¿Ñ€Ð¾Ð³Ñ€Ð°Ð¼Ð¼Ð½Ð¾Ðµ Ð¾Ð±ÐµÑÐ¿ÐµÑ‡ÐµÐ½Ð¸Ðµ"
 
 #: addons/argonaut/events/class_DaemonEvent.inc:424
 msgid "(Re)Install"
@@ -581,24 +552,22 @@ msgstr "Ð Ð°Ð±Ð¾Ñ‡Ð°Ñ ÑÑ‚Ð°Ð½Ñ†Ð¸Ñ"
 
 #: addons/argonaut/events/eventTargetSystems-list.xml:31
 msgid "Terminal"
-msgstr ""
+msgstr "Ð¢ÐµÑ€Ð¼Ð¸Ð½Ð°Ð»"
 
 #: addons/argonaut/events/eventTargetSystems-list.xml:39
 msgid "Winstation"
-msgstr ""
+msgstr "Ð Ð°Ð±Ð¾Ñ‡Ð°Ñ ÑÑ‚Ð°Ð½Ñ†Ð¸Ñ Windows"
 
 #: addons/argonaut/events/eventTargetSystems-list.xml:47
-#: addons/argonaut/argonaut_import_file.tpl.c:53
 msgid "Object group"
 msgstr "ÐžÐ±ÑŠÐµÐºÑ‚ Ð³Ñ€ÑƒÐ¿Ð¿Ñ‹"
 
 #: addons/argonaut/events/eventTargetSystems-list.xml:73
-#: addons/argonaut/events/eventTargetSystems-filter.tpl.c:20
+#: addons/argonaut/deploy-list.xml:36
 msgid "Name"
 msgstr "Ð¤Ð°Ð¼Ð¸Ð»Ð¸Ñ"
 
 #: addons/argonaut/events/eventTargetSystems-list.xml:89
-#: addons/argonaut/argonaut_import_file.tpl.c:62
 msgid "IP"
 msgstr "IP"
 
@@ -611,48 +580,53 @@ msgid "List of queued jobs"
 msgstr ""
 
 #: addons/argonaut/deploy-list.xml:27
-#: addons/argonaut/events/DaemonEvent.tpl.c:17
 msgid "Target"
 msgstr ""
 
-#: addons/argonaut/deploy-list.xml:35
+#: addons/argonaut/deploy-list.xml:45
 msgid "Task"
 msgstr ""
 
-#: addons/argonaut/deploy-list.xml:43
+#: addons/argonaut/deploy-list.xml:53
 msgid "Period"
 msgstr ""
 
-#: addons/argonaut/deploy-list.xml:51
-#: addons/argonaut/events/DaemonEvent.tpl.c:2
+#: addons/argonaut/deploy-list.xml:61
 msgid "Schedule"
 msgstr ""
 
-#: addons/argonaut/deploy-list.xml:59
-#: addons/argonaut/events/DaemonEvent.tpl.c:11
+#: addons/argonaut/deploy-list.xml:69
 msgid "Status"
 msgstr "Ð¡Ð¾ÑÑ‚Ð¾ÑÐ½Ð¸Ðµ"
 
-#: addons/argonaut/deploy-list.xml:67
+#: addons/argonaut/deploy-list.xml:77
 msgid "Actions"
 msgstr "Ð”ÐµÐ¹ÑÑ‚Ð²Ð¸Ñ"
 
-#: addons/argonaut/deploy-list.xml:97 addons/argonaut/deploy-list.xml:144
+#: addons/argonaut/deploy-list.xml:88
+msgid "Create"
+msgstr "Ð¡Ð¾Ð·Ð´Ð°Ñ‚ÑŒ"
+
+#: addons/argonaut/deploy-list.xml:117 addons/argonaut/deploy-list.xml:174
 msgid "Abort"
 msgstr "ÐŸÑ€ÐµÑ€Ð²Ð°Ñ‚ÑŒ"
 
-#: addons/argonaut/deploy-list.xml:108
+#: addons/argonaut/deploy-list.xml:128
 msgid "Execute"
 msgstr "Ð’Ñ‹Ð¿Ð¾Ð»Ð½Ð¸Ñ‚ÑŒ"
 
-#: addons/argonaut/deploy-list.xml:120
+#: addons/argonaut/deploy-list.xml:140
 msgid "Process now"
 msgstr ""
 
-#: addons/argonaut/deploy-list.xml:128
+#: addons/argonaut/deploy-list.xml:148
 msgid "View logs"
 msgstr ""
 
+#: addons/argonaut/deploy-list.xml:157
+msgid "Edit"
+msgstr "Ð˜Ð·Ð¼ÐµÐ½Ð¸Ñ‚ÑŒ"
+
 #: include/class_supportDaemon.inc:89
 msgid "Multiple argonaut server found. Only one is supported"
 msgstr ""
@@ -670,162 +644,3 @@ msgstr ""
 #, php-format
 msgid "\"%s\" is not a file!"
 msgstr ""
-
-#: addons/argonaut/argonaut_import_file.tpl.c:2
-msgid "Import jobs"
-msgstr ""
-
-#: addons/argonaut/argonaut_import_file.tpl.c:5
-msgid ""
-"You can import a list of jobs into the FusionDirectory job queue. This "
-"should be a semicolon seperated list of items in the following format:"
-msgstr ""
-
-#: addons/argonaut/argonaut_import_file.tpl.c:8
-msgid "timestamp"
-msgstr "Ð”Ð°Ñ‚Ð°"
-
-#: addons/argonaut/argonaut_import_file.tpl.c:11
-msgid "MAC-address"
-msgstr "MAC-Ð°Ð´Ñ€ÐµÑ"
-
-#: addons/argonaut/argonaut_import_file.tpl.c:14
-msgid "job type"
-msgstr ""
-
-#: addons/argonaut/argonaut_import_file.tpl.c:17
-msgid "object group"
-msgstr ""
-
-#: addons/argonaut/argonaut_import_file.tpl.c:20
-msgid "import base"
-msgstr ""
-
-#: addons/argonaut/argonaut_import_file.tpl.c:23
-msgid "full hostname"
-msgstr ""
-
-#: addons/argonaut/argonaut_import_file.tpl.c:26
-msgid "IP-address"
-msgstr "IP-Ð°Ð´Ñ€ÐµÑ"
-
-#: addons/argonaut/argonaut_import_file.tpl.c:29
-msgid "DHCP group"
-msgstr ""
-
-#: addons/argonaut/argonaut_import_file.tpl.c:32
-msgid "Example"
-msgstr "ÐŸÑ€Ð¸Ð¼ÐµÑ€"
-
-#: addons/argonaut/argonaut_import_file.tpl.c:35
-msgid "Select list to import"
-msgstr ""
-
-#: addons/argonaut/argonaut_import_file.tpl.c:38
-msgid "Browse"
-msgstr "ÐŸÑ€Ð¾ÑÐ¼Ð¾Ñ‚Ñ€"
-
-#: addons/argonaut/argonaut_import_file.tpl.c:41
-msgid "Upload"
-msgstr "Ð—Ð°Ð³Ñ€ÑƒÐ·Ð¸Ñ‚ÑŒ"
-
-#: addons/argonaut/argonaut_import_file.tpl.c:44
-#: addons/argonaut/events/DaemonEvent.tpl.c:20
-msgid "Timestamp"
-msgstr "Ð”Ð°Ñ‚Ð°"
-
-#: addons/argonaut/argonaut_import_file.tpl.c:56
-msgid "Base"
-msgstr "Ð’ÐµÑ‚ÐºÐ°"
-
-#: addons/argonaut/argonaut_import_file.tpl.c:59
-msgid "FQDN"
-msgstr ""
-
-#: addons/argonaut/argonaut_import_file.tpl.c:65
-msgid "DHCP"
-msgstr "DHCP"
-
-#: addons/argonaut/events/target_list.tpl.c:2
-msgid "Apply"
-msgstr "ÐŸÑ€Ð¸Ð¼ÐµÐ½Ð¸Ñ‚ÑŒ"
-
-#: addons/argonaut/events/target_list.tpl.c:5
-msgid "Cancel"
-msgstr "ÐžÑ‚Ð¼ÐµÐ½Ð°"
-
-#: addons/argonaut/events/DaemonEvent.tpl.c:5
-msgid "System list"
-msgstr ""
-
-#: addons/argonaut/events/DaemonEvent.tpl.c:8
-msgid "ID"
-msgstr ""
-
-#: addons/argonaut/events/DaemonEvent.tpl.c:14
-msgid "Result"
-msgstr ""
-
-#: addons/argonaut/events/eventTargetSystems-filter.tpl.c:2
-msgid "Filter"
-msgstr "Ð¤Ð¸Ð»ÑŒÑ‚Ñ€"
-
-#: addons/argonaut/events/eventTargetSystems-filter.tpl.c:5
-msgid "Show servers"
-msgstr "ÐŸÐ¾ÐºÐ°Ð·Ð°Ñ‚ÑŒ ÑÐµÑ€Ð²ÐµÑ€Ñ‹"
-
-#: addons/argonaut/events/eventTargetSystems-filter.tpl.c:8
-msgid "Show workstations"
-msgstr "ÐŸÐ¾ÐºÐ°Ð·Ð°Ñ‚ÑŒ Ñ€Ð°Ð±Ð¾Ñ‡Ð¸Ðµ ÑÑ‚Ð°Ð½Ñ†Ð¸Ð¸"
-
-#: addons/argonaut/events/eventTargetSystems-filter.tpl.c:11
-msgid "Show terminals"
-msgstr "ÐŸÐ¾ÐºÐ°Ð·Ð°Ñ‚ÑŒ Ñ‚ÐµÑ€Ð¼Ð¸Ð½Ð°Ð»Ñ‹"
-
-#: addons/argonaut/events/eventTargetSystems-filter.tpl.c:14
-msgid "Show winstations"
-msgstr ""
-
-#: addons/argonaut/events/eventTargetSystems-filter.tpl.c:17
-msgid "Filter by IP address range"
-msgstr ""
-
-#: addons/argonaut/events/timestamp_select.tpl.c:2
-msgid "Year"
-msgstr ""
-
-#: addons/argonaut/events/timestamp_select.tpl.c:5
-msgid "Month"
-msgstr ""
-
-#: addons/argonaut/events/timestamp_select.tpl.c:8
-msgid "Day"
-msgstr ""
-
-#: addons/argonaut/events/timestamp_select.tpl.c:11
-msgid "Hour"
-msgstr ""
-
-#: addons/argonaut/events/timestamp_select.tpl.c:14
-msgid "Minute"
-msgstr ""
-
-#: addons/argonaut/events/timestamp_select.tpl.c:17
-msgid "Second"
-msgstr ""
-
-#: addons/argonaut/events/timestamp_select.tpl.c:20
-msgid "Periodical job"
-msgstr ""
-
-#: addons/argonaut/events/timestamp_select.tpl.c:23
-msgid "Job intervall"
-msgstr ""
-
-#: addons/argonaut/remove.tpl.c:2
-msgid "Warning"
-msgstr "ÐŸÑ€ÐµÐ´ÑƒÐ¿Ñ€ÐµÐ¶Ð´ÐµÐ½Ð¸Ðµ"
-
-#: addons/argonaut/remove.tpl.c:5
-msgid "So - if you're sure - press 'Delete' to continue or 'Cancel' to abort."
-msgstr "Ð˜Ñ‚Ð°Ðº - ÐµÑÐ»Ð¸ Ð²Ñ‹ ÑƒÐ²ÐµÑ€ÐµÐ½Ñ‹ - Ð½Ð°Ð¶Ð¼Ð¸Ñ‚Ðµ 'Ð£Ð´Ð°Ð»Ð¸Ñ‚ÑŒ', Ñ‡Ñ‚Ð¾Ð±Ñ‹ Ð¿Ñ€Ð¾Ð´Ð¾Ð»Ð¶Ð¸Ñ‚ÑŒ Ð¸Ð»Ð¸ 'ÐžÑ‚Ð¼ÐµÐ½Ð°' Ñ‡Ñ‚Ð¾Ð±Ñ‹ Ð¿Ñ€ÐµÑ€Ð²Ð°Ñ‚ÑŒ."
diff --git a/argonaut/locale/ru@petr1708/fusiondirectory.po b/argonaut/locale/ru@petr1708/fusiondirectory.po
index 603dd53d828e5201a64498cbf82db0612f316e2e..d3a23a28bf628485f993985d86a41ec7421bf30f 100644
--- a/argonaut/locale/ru@petr1708/fusiondirectory.po
+++ b/argonaut/locale/ru@petr1708/fusiondirectory.po
@@ -5,17 +5,17 @@
 # Translators:
 msgid ""
 msgstr ""
-"Project-Id-Version: FusionDirectory-108\n"
+"Project-Id-Version: FusionDirectory-109\n"
 "Report-Msgid-Bugs-To: documentation@lists.fusiondirectory.org\n"
-"POT-Creation-Date: 2015-03-31 11:49+0200\n"
-"PO-Revision-Date: 2015-03-17 17:47+0000\n"
+"POT-Creation-Date: 2014-12-15 17:47+0100\n"
+"PO-Revision-Date: 2014-12-15 16:48+0000\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>\n"
-"Language-Team: Russian Petrine orthography (http://www.transifex.com/projects/p/FusionDirectory-108/language/ru@petr1708/)\n"
+"Language-Team: Russian Petrine orthography (http://www.transifex.com/projects/p/FusionDirectory-109/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=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);\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 settings"
@@ -47,7 +47,7 @@ msgstr ""
 
 #: admin/systems/argonaut/class_argonautClient.inc:135
 #: admin/systems/services/argonaut/class_argonautFuseConfig.inc:56
-#: admin/systems/services/argonaut/class_argonautMirrorConfig.inc:71
+#: admin/systems/services/argonaut/class_argonautMirrorConfig.inc:79
 #: admin/systems/services/argonaut/class_argonautServer.inc:79
 msgid "Log directory"
 msgstr ""
@@ -78,6 +78,7 @@ msgid "Argonaut Fuse settings"
 msgstr ""
 
 #: admin/systems/services/argonaut/class_argonautFuseConfig.inc:32
+#: admin/systems/services/argonaut/class_argonautMirrorConfig.inc:32
 #: admin/systems/services/argonaut/class_argonautFuseFAIConfig.inc:33
 #: admin/systems/services/argonaut/class_argonautServer.inc:32
 #: admin/systems/services/argonaut/class_argonautFuseOPSIConfig.inc:33
@@ -110,88 +111,60 @@ msgstr ""
 msgid "Path where argonaut-fuse should store pxelinux.cfg"
 msgstr ""
 
-#: admin/systems/services/argonaut/class_argonautMirrorConfig.inc:29
-#: admin/systems/services/argonaut/class_argonautMirrorConfig.inc:30
+#: admin/systems/services/argonaut/class_argonautMirrorConfig.inc:31
+#: admin/systems/services/argonaut/class_argonautMirrorConfig.inc:32
 msgid "Argonaut Mirror settings"
 msgstr ""
 
-#: admin/systems/services/argonaut/class_argonautMirrorConfig.inc:41
+#: admin/systems/services/argonaut/class_argonautMirrorConfig.inc:46
 msgid "Argonaut mirror settings"
 msgstr ""
 
-#: admin/systems/services/argonaut/class_argonautMirrorConfig.inc:44
-msgid "Local Debian mirror directory"
+#: admin/systems/services/argonaut/class_argonautMirrorConfig.inc:49
+msgid "Local debian mirror directory"
 msgstr ""
 
-#: admin/systems/services/argonaut/class_argonautMirrorConfig.inc:52
+#: admin/systems/services/argonaut/class_argonautMirrorConfig.inc:58
 msgid "Argonaut Debconf Crawler configuration"
 msgstr ""
 
-#: admin/systems/services/argonaut/class_argonautMirrorConfig.inc:55
+#: admin/systems/services/argonaut/class_argonautMirrorConfig.inc:61
 msgid "Local packages folder"
 msgstr ""
 
-#: admin/systems/services/argonaut/class_argonautMirrorConfig.inc:56
+#: admin/systems/services/argonaut/class_argonautMirrorConfig.inc:62
 msgid "Folder in which the crawler will store packages during analysis"
 msgstr ""
 
-#: admin/systems/services/argonaut/class_argonautMirrorConfig.inc:63
+#: admin/systems/services/argonaut/class_argonautMirrorConfig.inc:70
 msgid "Argonaut Repository configuration"
 msgstr ""
 
-#: admin/systems/services/argonaut/class_argonautMirrorConfig.inc:66
+#: admin/systems/services/argonaut/class_argonautMirrorConfig.inc:73
 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"
+#: admin/systems/services/argonaut/class_argonautMirrorConfig.inc:84
+msgid "Errors"
 msgstr ""
 
-#: admin/systems/services/argonaut/class_argonautMirrorConfig.inc:71
-msgid "Directory in which logs should be stored"
-msgstr ""
-
-#: admin/systems/services/argonaut/class_argonautMirrorConfig.inc:76
-msgid "Ignore errors"
-msgstr ""
-
-#: admin/systems/services/argonaut/class_argonautMirrorConfig.inc:77
-msgid ""
-"Causes debmirror to ignore missing or broken deb and source files but still "
-"be pedantic about checking meta files"
-msgstr ""
-
-#: admin/systems/services/argonaut/class_argonautMirrorConfig.inc:82
+#: admin/systems/services/argonaut/class_argonautMirrorConfig.inc:91
 msgid "Source"
 msgstr ""
 
-#: admin/systems/services/argonaut/class_argonautMirrorConfig.inc:82
-msgid "Include source in the mirror"
-msgstr ""
-
-#: admin/systems/services/argonaut/class_argonautMirrorConfig.inc:87
+#: admin/systems/services/argonaut/class_argonautMirrorConfig.inc:98
 msgid "GPG Check"
 msgstr ""
 
-#: admin/systems/services/argonaut/class_argonautMirrorConfig.inc:87
-msgid "Fail if the Release.gpg file is missing"
-msgstr ""
-
-#: admin/systems/services/argonaut/class_argonautMirrorConfig.inc:92
+#: admin/systems/services/argonaut/class_argonautMirrorConfig.inc:105
 msgid "Contents"
 msgstr ""
 
-#: admin/systems/services/argonaut/class_argonautMirrorConfig.inc:93
-msgid ""
-"Additionally download Contents.<arch>.gz files (Note that these files can be"
-" relatively big and can change frequently)"
-msgstr ""
-
-#: admin/systems/services/argonaut/class_argonautMirrorConfig.inc:98
+#: admin/systems/services/argonaut/class_argonautMirrorConfig.inc:112
 msgid "Verbose"
 msgstr ""
 
-#: admin/systems/services/argonaut/class_argonautMirrorConfig.inc:98
+#: admin/systems/services/argonaut/class_argonautMirrorConfig.inc:113
 msgid "Wether to activate verbose mode"
 msgstr ""
 
@@ -398,9 +371,9 @@ msgid "LTSP server"
 msgstr ""
 
 #: addons/argonaut/class_filterArgonautEvents.inc:40
-#: addons/argonaut/class_argonautQueue.inc:160
-#: addons/argonaut/class_argonautQueue.inc:260
-#: addons/argonaut/class_argonautQueue.inc:335
+#: addons/argonaut/class_argonautQueue.inc:193
+#: addons/argonaut/class_argonautQueue.inc:307
+#: addons/argonaut/class_argonautQueue.inc:398
 msgid "Error"
 msgstr ""
 
@@ -412,8 +385,7 @@ msgstr ""
 #: addons/argonaut/class_argonautImportFile.inc:44
 #: addons/argonaut/class_argonautImportFile.inc:100
 #: addons/argonaut/class_argonautImportFile.inc:141
-#: addons/argonaut/deploy-list.xml:79
-#: addons/argonaut/argonaut_import_file.tpl.c:68
+#: addons/argonaut/deploy-list.xml:99
 msgid "Import"
 msgstr ""
 
@@ -427,7 +399,8 @@ msgid ""
 msgstr ""
 
 #: addons/argonaut/class_argonautImportFile.inc:134
-msgid "Infrastructure service"
+#: addons/argonaut/class_argonautQueue.inc:350
+msgid "Service infrastructure"
 msgstr ""
 
 #: addons/argonaut/class_argonautImportFile.inc:141
@@ -436,84 +409,82 @@ msgid "Import complete: %s events successfully send, %s failed"
 msgstr ""
 
 #: addons/argonaut/class_argonautImportFile.inc:177
-#: addons/argonaut/argonaut_import_file.tpl.c:47
 msgid "MAC"
 msgstr ""
 
 #: addons/argonaut/class_argonautImportFile.inc:180
 #: addons/argonaut/deploy-list.xml:14
-#: addons/argonaut/argonaut_import_file.tpl.c:50
 msgid "Event"
 msgstr ""
 
-#: addons/argonaut/class_argonautQueue.inc:35
-#: addons/argonaut/class_argonautQueue.inc:41
+#: addons/argonaut/class_argonautQueue.inc:39
+#: addons/argonaut/class_argonautQueue.inc:45
 msgid "Deployment queue"
 msgstr ""
 
-#: addons/argonaut/class_argonautQueue.inc:36
+#: addons/argonaut/class_argonautQueue.inc:40
 msgid "Provide a mechanism to automatically activate systems"
 msgstr ""
 
-#: addons/argonaut/class_argonautQueue.inc:43
+#: addons/argonaut/class_argonautQueue.inc:47
 #: addons/argonaut/events/eventTargetSystems-list.xml:81
 msgid "Description"
 msgstr ""
 
-#: addons/argonaut/class_argonautQueue.inc:141
+#: addons/argonaut/class_argonautQueue.inc:174
 msgid "immediately"
 msgstr ""
 
-#: addons/argonaut/class_argonautQueue.inc:156
+#: addons/argonaut/class_argonautQueue.inc:189
 msgid "Waiting"
 msgstr ""
 
-#: addons/argonaut/class_argonautQueue.inc:159
+#: addons/argonaut/class_argonautQueue.inc:192
 msgid "Show error"
 msgstr ""
 
-#: addons/argonaut/class_argonautQueue.inc:163
+#: addons/argonaut/class_argonautQueue.inc:196
 msgid "Processed"
 msgstr ""
 
-#: addons/argonaut/class_argonautQueue.inc:172
+#: addons/argonaut/class_argonautQueue.inc:205
 msgid "in progress"
 msgstr ""
 
-#: addons/argonaut/class_argonautQueue.inc:180
+#: addons/argonaut/class_argonautQueue.inc:226
 msgid "Permission"
 msgstr ""
 
-#: addons/argonaut/class_argonautQueue.inc:210
+#: addons/argonaut/class_argonautQueue.inc:256
 #: addons/argonaut/events/class_DaemonEvent.inc:258
-#: addons/argonaut/deploy-list.xml:86 addons/argonaut/deploy-list.xml:136
+#: addons/argonaut/deploy-list.xml:106 addons/argonaut/deploy-list.xml:166
 msgid "Remove"
 msgstr ""
 
-#: addons/argonaut/class_argonautQueue.inc:211
+#: addons/argonaut/class_argonautQueue.inc:257
 #, php-format
 msgid "The following jobs couldn't be deleted, they have to be aborted: %s"
 msgstr ""
 
-#: addons/argonaut/class_argonautQueue.inc:257
+#: addons/argonaut/class_argonautQueue.inc:304
 msgid "Info"
 msgstr ""
 
-#: addons/argonaut/class_argonautQueue.inc:257
+#: addons/argonaut/class_argonautQueue.inc:304
 #, php-format
 msgid "%s"
 msgstr ""
 
-#: addons/argonaut/class_argonautQueue.inc:261
+#: addons/argonaut/class_argonautQueue.inc:308
 #, php-format
 msgid "Required class '%s' cannot be found: job not aborted!"
 msgstr ""
 
-#: addons/argonaut/class_argonautQueue.inc:293
+#: addons/argonaut/class_argonautQueue.inc:340
 msgid "Error detail"
 msgstr ""
 
-#: addons/argonaut/class_argonautQueue.inc:335
+#: addons/argonaut/class_argonautQueue.inc:398
 #, php-format
 msgid "Cannot update queue entries."
 msgstr ""
@@ -588,17 +559,15 @@ msgid "Winstation"
 msgstr ""
 
 #: addons/argonaut/events/eventTargetSystems-list.xml:47
-#: addons/argonaut/argonaut_import_file.tpl.c:53
 msgid "Object group"
 msgstr ""
 
 #: addons/argonaut/events/eventTargetSystems-list.xml:73
-#: addons/argonaut/events/eventTargetSystems-filter.tpl.c:20
+#: addons/argonaut/deploy-list.xml:36
 msgid "Name"
 msgstr ""
 
 #: addons/argonaut/events/eventTargetSystems-list.xml:89
-#: addons/argonaut/argonaut_import_file.tpl.c:62
 msgid "IP"
 msgstr ""
 
@@ -611,48 +580,53 @@ msgid "List of queued jobs"
 msgstr ""
 
 #: addons/argonaut/deploy-list.xml:27
-#: addons/argonaut/events/DaemonEvent.tpl.c:17
 msgid "Target"
 msgstr ""
 
-#: addons/argonaut/deploy-list.xml:35
+#: addons/argonaut/deploy-list.xml:45
 msgid "Task"
 msgstr ""
 
-#: addons/argonaut/deploy-list.xml:43
+#: addons/argonaut/deploy-list.xml:53
 msgid "Period"
 msgstr ""
 
-#: addons/argonaut/deploy-list.xml:51
-#: addons/argonaut/events/DaemonEvent.tpl.c:2
+#: addons/argonaut/deploy-list.xml:61
 msgid "Schedule"
 msgstr ""
 
-#: addons/argonaut/deploy-list.xml:59
-#: addons/argonaut/events/DaemonEvent.tpl.c:11
+#: addons/argonaut/deploy-list.xml:69
 msgid "Status"
 msgstr ""
 
-#: addons/argonaut/deploy-list.xml:67
+#: addons/argonaut/deploy-list.xml:77
 msgid "Actions"
 msgstr ""
 
-#: addons/argonaut/deploy-list.xml:97 addons/argonaut/deploy-list.xml:144
+#: addons/argonaut/deploy-list.xml:88
+msgid "Create"
+msgstr ""
+
+#: addons/argonaut/deploy-list.xml:117 addons/argonaut/deploy-list.xml:174
 msgid "Abort"
 msgstr ""
 
-#: addons/argonaut/deploy-list.xml:108
+#: addons/argonaut/deploy-list.xml:128
 msgid "Execute"
 msgstr ""
 
-#: addons/argonaut/deploy-list.xml:120
+#: addons/argonaut/deploy-list.xml:140
 msgid "Process now"
 msgstr ""
 
-#: addons/argonaut/deploy-list.xml:128
+#: addons/argonaut/deploy-list.xml:148
 msgid "View logs"
 msgstr ""
 
+#: addons/argonaut/deploy-list.xml:157
+msgid "Edit"
+msgstr ""
+
 #: include/class_supportDaemon.inc:89
 msgid "Multiple argonaut server found. Only one is supported"
 msgstr ""
@@ -670,162 +644,3 @@ msgstr ""
 #, php-format
 msgid "\"%s\" is not a file!"
 msgstr ""
-
-#: addons/argonaut/argonaut_import_file.tpl.c:2
-msgid "Import jobs"
-msgstr ""
-
-#: addons/argonaut/argonaut_import_file.tpl.c:5
-msgid ""
-"You can import a list of jobs into the FusionDirectory job queue. This "
-"should be a semicolon seperated list of items in the following format:"
-msgstr ""
-
-#: addons/argonaut/argonaut_import_file.tpl.c:8
-msgid "timestamp"
-msgstr ""
-
-#: addons/argonaut/argonaut_import_file.tpl.c:11
-msgid "MAC-address"
-msgstr ""
-
-#: addons/argonaut/argonaut_import_file.tpl.c:14
-msgid "job type"
-msgstr ""
-
-#: addons/argonaut/argonaut_import_file.tpl.c:17
-msgid "object group"
-msgstr ""
-
-#: addons/argonaut/argonaut_import_file.tpl.c:20
-msgid "import base"
-msgstr ""
-
-#: addons/argonaut/argonaut_import_file.tpl.c:23
-msgid "full hostname"
-msgstr ""
-
-#: addons/argonaut/argonaut_import_file.tpl.c:26
-msgid "IP-address"
-msgstr ""
-
-#: addons/argonaut/argonaut_import_file.tpl.c:29
-msgid "DHCP group"
-msgstr ""
-
-#: addons/argonaut/argonaut_import_file.tpl.c:32
-msgid "Example"
-msgstr ""
-
-#: addons/argonaut/argonaut_import_file.tpl.c:35
-msgid "Select list to import"
-msgstr ""
-
-#: addons/argonaut/argonaut_import_file.tpl.c:38
-msgid "Browse"
-msgstr ""
-
-#: addons/argonaut/argonaut_import_file.tpl.c:41
-msgid "Upload"
-msgstr ""
-
-#: addons/argonaut/argonaut_import_file.tpl.c:44
-#: addons/argonaut/events/DaemonEvent.tpl.c:20
-msgid "Timestamp"
-msgstr ""
-
-#: addons/argonaut/argonaut_import_file.tpl.c:56
-msgid "Base"
-msgstr ""
-
-#: addons/argonaut/argonaut_import_file.tpl.c:59
-msgid "FQDN"
-msgstr ""
-
-#: addons/argonaut/argonaut_import_file.tpl.c:65
-msgid "DHCP"
-msgstr ""
-
-#: addons/argonaut/events/target_list.tpl.c:2
-msgid "Apply"
-msgstr ""
-
-#: addons/argonaut/events/target_list.tpl.c:5
-msgid "Cancel"
-msgstr ""
-
-#: addons/argonaut/events/DaemonEvent.tpl.c:5
-msgid "System list"
-msgstr ""
-
-#: addons/argonaut/events/DaemonEvent.tpl.c:8
-msgid "ID"
-msgstr ""
-
-#: addons/argonaut/events/DaemonEvent.tpl.c:14
-msgid "Result"
-msgstr ""
-
-#: addons/argonaut/events/eventTargetSystems-filter.tpl.c:2
-msgid "Filter"
-msgstr ""
-
-#: addons/argonaut/events/eventTargetSystems-filter.tpl.c:5
-msgid "Show servers"
-msgstr ""
-
-#: addons/argonaut/events/eventTargetSystems-filter.tpl.c:8
-msgid "Show workstations"
-msgstr ""
-
-#: addons/argonaut/events/eventTargetSystems-filter.tpl.c:11
-msgid "Show terminals"
-msgstr ""
-
-#: addons/argonaut/events/eventTargetSystems-filter.tpl.c:14
-msgid "Show winstations"
-msgstr ""
-
-#: addons/argonaut/events/eventTargetSystems-filter.tpl.c:17
-msgid "Filter by IP address range"
-msgstr ""
-
-#: addons/argonaut/events/timestamp_select.tpl.c:2
-msgid "Year"
-msgstr ""
-
-#: addons/argonaut/events/timestamp_select.tpl.c:5
-msgid "Month"
-msgstr ""
-
-#: addons/argonaut/events/timestamp_select.tpl.c:8
-msgid "Day"
-msgstr ""
-
-#: addons/argonaut/events/timestamp_select.tpl.c:11
-msgid "Hour"
-msgstr ""
-
-#: addons/argonaut/events/timestamp_select.tpl.c:14
-msgid "Minute"
-msgstr ""
-
-#: addons/argonaut/events/timestamp_select.tpl.c:17
-msgid "Second"
-msgstr ""
-
-#: addons/argonaut/events/timestamp_select.tpl.c:20
-msgid "Periodical job"
-msgstr ""
-
-#: addons/argonaut/events/timestamp_select.tpl.c:23
-msgid "Job intervall"
-msgstr ""
-
-#: addons/argonaut/remove.tpl.c:2
-msgid "Warning"
-msgstr ""
-
-#: addons/argonaut/remove.tpl.c:5
-msgid "So - if you're sure - press 'Delete' to continue or 'Cancel' to abort."
-msgstr ""
diff --git a/argonaut/locale/sv/fusiondirectory.po b/argonaut/locale/sv/fusiondirectory.po
index 84fe9e7035ae19a34f7e1ff722f77cc907b2b583..c0c183cb2fbb94ad60460474e73f3d95efa85630 100644
--- a/argonaut/locale/sv/fusiondirectory.po
+++ b/argonaut/locale/sv/fusiondirectory.po
@@ -5,12 +5,12 @@
 # Translators:
 msgid ""
 msgstr ""
-"Project-Id-Version: FusionDirectory-108\n"
+"Project-Id-Version: FusionDirectory-109\n"
 "Report-Msgid-Bugs-To: documentation@lists.fusiondirectory.org\n"
-"POT-Creation-Date: 2015-03-31 11:49+0200\n"
-"PO-Revision-Date: 2015-03-17 17:47+0000\n"
+"POT-Creation-Date: 2014-12-15 17:47+0100\n"
+"PO-Revision-Date: 2015-02-25 16:13+0000\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>\n"
-"Language-Team: Swedish (http://www.transifex.com/projects/p/FusionDirectory-108/language/sv/)\n"
+"Language-Team: Swedish (http://www.transifex.com/projects/p/FusionDirectory-109/language/sv/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -47,7 +47,7 @@ msgstr ""
 
 #: admin/systems/argonaut/class_argonautClient.inc:135
 #: admin/systems/services/argonaut/class_argonautFuseConfig.inc:56
-#: admin/systems/services/argonaut/class_argonautMirrorConfig.inc:71
+#: admin/systems/services/argonaut/class_argonautMirrorConfig.inc:79
 #: admin/systems/services/argonaut/class_argonautServer.inc:79
 msgid "Log directory"
 msgstr ""
@@ -78,6 +78,7 @@ msgid "Argonaut Fuse settings"
 msgstr ""
 
 #: admin/systems/services/argonaut/class_argonautFuseConfig.inc:32
+#: admin/systems/services/argonaut/class_argonautMirrorConfig.inc:32
 #: admin/systems/services/argonaut/class_argonautFuseFAIConfig.inc:33
 #: admin/systems/services/argonaut/class_argonautServer.inc:32
 #: admin/systems/services/argonaut/class_argonautFuseOPSIConfig.inc:33
@@ -110,88 +111,60 @@ msgstr ""
 msgid "Path where argonaut-fuse should store pxelinux.cfg"
 msgstr ""
 
-#: admin/systems/services/argonaut/class_argonautMirrorConfig.inc:29
-#: admin/systems/services/argonaut/class_argonautMirrorConfig.inc:30
+#: admin/systems/services/argonaut/class_argonautMirrorConfig.inc:31
+#: admin/systems/services/argonaut/class_argonautMirrorConfig.inc:32
 msgid "Argonaut Mirror settings"
 msgstr ""
 
-#: admin/systems/services/argonaut/class_argonautMirrorConfig.inc:41
+#: admin/systems/services/argonaut/class_argonautMirrorConfig.inc:46
 msgid "Argonaut mirror settings"
 msgstr ""
 
-#: admin/systems/services/argonaut/class_argonautMirrorConfig.inc:44
-msgid "Local Debian mirror directory"
+#: admin/systems/services/argonaut/class_argonautMirrorConfig.inc:49
+msgid "Local debian mirror directory"
 msgstr ""
 
-#: admin/systems/services/argonaut/class_argonautMirrorConfig.inc:52
+#: admin/systems/services/argonaut/class_argonautMirrorConfig.inc:58
 msgid "Argonaut Debconf Crawler configuration"
 msgstr ""
 
-#: admin/systems/services/argonaut/class_argonautMirrorConfig.inc:55
+#: admin/systems/services/argonaut/class_argonautMirrorConfig.inc:61
 msgid "Local packages folder"
 msgstr ""
 
-#: admin/systems/services/argonaut/class_argonautMirrorConfig.inc:56
+#: admin/systems/services/argonaut/class_argonautMirrorConfig.inc:62
 msgid "Folder in which the crawler will store packages during analysis"
 msgstr ""
 
-#: admin/systems/services/argonaut/class_argonautMirrorConfig.inc:63
+#: admin/systems/services/argonaut/class_argonautMirrorConfig.inc:70
 msgid "Argonaut Repository configuration"
 msgstr ""
 
-#: admin/systems/services/argonaut/class_argonautMirrorConfig.inc:66
+#: admin/systems/services/argonaut/class_argonautMirrorConfig.inc:73
 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"
+#: admin/systems/services/argonaut/class_argonautMirrorConfig.inc:84
+msgid "Errors"
 msgstr ""
 
-#: admin/systems/services/argonaut/class_argonautMirrorConfig.inc:71
-msgid "Directory in which logs should be stored"
-msgstr ""
-
-#: admin/systems/services/argonaut/class_argonautMirrorConfig.inc:76
-msgid "Ignore errors"
-msgstr ""
-
-#: admin/systems/services/argonaut/class_argonautMirrorConfig.inc:77
-msgid ""
-"Causes debmirror to ignore missing or broken deb and source files but still "
-"be pedantic about checking meta files"
-msgstr ""
-
-#: admin/systems/services/argonaut/class_argonautMirrorConfig.inc:82
+#: admin/systems/services/argonaut/class_argonautMirrorConfig.inc:91
 msgid "Source"
 msgstr ""
 
-#: admin/systems/services/argonaut/class_argonautMirrorConfig.inc:82
-msgid "Include source in the mirror"
-msgstr ""
-
-#: admin/systems/services/argonaut/class_argonautMirrorConfig.inc:87
+#: admin/systems/services/argonaut/class_argonautMirrorConfig.inc:98
 msgid "GPG Check"
 msgstr ""
 
-#: admin/systems/services/argonaut/class_argonautMirrorConfig.inc:87
-msgid "Fail if the Release.gpg file is missing"
-msgstr ""
-
-#: admin/systems/services/argonaut/class_argonautMirrorConfig.inc:92
+#: admin/systems/services/argonaut/class_argonautMirrorConfig.inc:105
 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 ""
-
-#: admin/systems/services/argonaut/class_argonautMirrorConfig.inc:98
+#: admin/systems/services/argonaut/class_argonautMirrorConfig.inc:112
 msgid "Verbose"
 msgstr ""
 
-#: admin/systems/services/argonaut/class_argonautMirrorConfig.inc:98
+#: admin/systems/services/argonaut/class_argonautMirrorConfig.inc:113
 msgid "Wether to activate verbose mode"
 msgstr ""
 
@@ -398,9 +371,9 @@ msgid "LTSP server"
 msgstr ""
 
 #: addons/argonaut/class_filterArgonautEvents.inc:40
-#: addons/argonaut/class_argonautQueue.inc:160
-#: addons/argonaut/class_argonautQueue.inc:260
-#: addons/argonaut/class_argonautQueue.inc:335
+#: addons/argonaut/class_argonautQueue.inc:193
+#: addons/argonaut/class_argonautQueue.inc:307
+#: addons/argonaut/class_argonautQueue.inc:398
 msgid "Error"
 msgstr "Fel"
 
@@ -412,8 +385,7 @@ msgstr ""
 #: addons/argonaut/class_argonautImportFile.inc:44
 #: addons/argonaut/class_argonautImportFile.inc:100
 #: addons/argonaut/class_argonautImportFile.inc:141
-#: addons/argonaut/deploy-list.xml:79
-#: addons/argonaut/argonaut_import_file.tpl.c:68
+#: addons/argonaut/deploy-list.xml:99
 msgid "Import"
 msgstr ""
 
@@ -427,8 +399,9 @@ msgid ""
 msgstr ""
 
 #: addons/argonaut/class_argonautImportFile.inc:134
-msgid "Infrastructure service"
-msgstr ""
+#: addons/argonaut/class_argonautQueue.inc:350
+msgid "Service infrastructure"
+msgstr "TjÃ¤nste-infrastruktur"
 
 #: addons/argonaut/class_argonautImportFile.inc:141
 #, php-format
@@ -436,84 +409,82 @@ msgid "Import complete: %s events successfully send, %s failed"
 msgstr ""
 
 #: addons/argonaut/class_argonautImportFile.inc:177
-#: addons/argonaut/argonaut_import_file.tpl.c:47
 msgid "MAC"
 msgstr ""
 
 #: addons/argonaut/class_argonautImportFile.inc:180
 #: addons/argonaut/deploy-list.xml:14
-#: addons/argonaut/argonaut_import_file.tpl.c:50
 msgid "Event"
 msgstr ""
 
-#: addons/argonaut/class_argonautQueue.inc:35
-#: addons/argonaut/class_argonautQueue.inc:41
+#: addons/argonaut/class_argonautQueue.inc:39
+#: addons/argonaut/class_argonautQueue.inc:45
 msgid "Deployment queue"
 msgstr ""
 
-#: addons/argonaut/class_argonautQueue.inc:36
+#: addons/argonaut/class_argonautQueue.inc:40
 msgid "Provide a mechanism to automatically activate systems"
 msgstr ""
 
-#: addons/argonaut/class_argonautQueue.inc:43
+#: addons/argonaut/class_argonautQueue.inc:47
 #: addons/argonaut/events/eventTargetSystems-list.xml:81
 msgid "Description"
 msgstr "Beskrivning"
 
-#: addons/argonaut/class_argonautQueue.inc:141
+#: addons/argonaut/class_argonautQueue.inc:174
 msgid "immediately"
 msgstr ""
 
-#: addons/argonaut/class_argonautQueue.inc:156
+#: addons/argonaut/class_argonautQueue.inc:189
 msgid "Waiting"
 msgstr ""
 
-#: addons/argonaut/class_argonautQueue.inc:159
+#: addons/argonaut/class_argonautQueue.inc:192
 msgid "Show error"
 msgstr ""
 
-#: addons/argonaut/class_argonautQueue.inc:163
+#: addons/argonaut/class_argonautQueue.inc:196
 msgid "Processed"
 msgstr ""
 
-#: addons/argonaut/class_argonautQueue.inc:172
+#: addons/argonaut/class_argonautQueue.inc:205
 msgid "in progress"
 msgstr ""
 
-#: addons/argonaut/class_argonautQueue.inc:180
+#: addons/argonaut/class_argonautQueue.inc:226
 msgid "Permission"
 msgstr "RÃ¤ttighet"
 
-#: addons/argonaut/class_argonautQueue.inc:210
+#: addons/argonaut/class_argonautQueue.inc:256
 #: addons/argonaut/events/class_DaemonEvent.inc:258
-#: addons/argonaut/deploy-list.xml:86 addons/argonaut/deploy-list.xml:136
+#: addons/argonaut/deploy-list.xml:106 addons/argonaut/deploy-list.xml:166
 msgid "Remove"
 msgstr "Ta bort"
 
-#: addons/argonaut/class_argonautQueue.inc:211
+#: addons/argonaut/class_argonautQueue.inc:257
 #, php-format
 msgid "The following jobs couldn't be deleted, they have to be aborted: %s"
 msgstr ""
 
-#: addons/argonaut/class_argonautQueue.inc:257
+#: addons/argonaut/class_argonautQueue.inc:304
 msgid "Info"
 msgstr ""
 
-#: addons/argonaut/class_argonautQueue.inc:257
+#: addons/argonaut/class_argonautQueue.inc:304
 #, php-format
 msgid "%s"
 msgstr ""
 
-#: addons/argonaut/class_argonautQueue.inc:261
+#: addons/argonaut/class_argonautQueue.inc:308
 #, php-format
 msgid "Required class '%s' cannot be found: job not aborted!"
 msgstr ""
 
-#: addons/argonaut/class_argonautQueue.inc:293
+#: addons/argonaut/class_argonautQueue.inc:340
 msgid "Error detail"
 msgstr ""
 
-#: addons/argonaut/class_argonautQueue.inc:335
+#: addons/argonaut/class_argonautQueue.inc:398
 #, php-format
 msgid "Cannot update queue entries."
 msgstr ""
@@ -588,17 +559,15 @@ msgid "Winstation"
 msgstr "Winstation"
 
 #: addons/argonaut/events/eventTargetSystems-list.xml:47
-#: addons/argonaut/argonaut_import_file.tpl.c:53
 msgid "Object group"
 msgstr "Objektgrupp"
 
 #: addons/argonaut/events/eventTargetSystems-list.xml:73
-#: addons/argonaut/events/eventTargetSystems-filter.tpl.c:20
+#: addons/argonaut/deploy-list.xml:36
 msgid "Name"
 msgstr "Namn"
 
 #: addons/argonaut/events/eventTargetSystems-list.xml:89
-#: addons/argonaut/argonaut_import_file.tpl.c:62
 msgid "IP"
 msgstr ""
 
@@ -611,48 +580,53 @@ msgid "List of queued jobs"
 msgstr ""
 
 #: addons/argonaut/deploy-list.xml:27
-#: addons/argonaut/events/DaemonEvent.tpl.c:17
 msgid "Target"
 msgstr ""
 
-#: addons/argonaut/deploy-list.xml:35
+#: addons/argonaut/deploy-list.xml:45
 msgid "Task"
 msgstr "Ã…tgÃ¤rd"
 
-#: addons/argonaut/deploy-list.xml:43
+#: addons/argonaut/deploy-list.xml:53
 msgid "Period"
 msgstr ""
 
-#: addons/argonaut/deploy-list.xml:51
-#: addons/argonaut/events/DaemonEvent.tpl.c:2
+#: addons/argonaut/deploy-list.xml:61
 msgid "Schedule"
 msgstr ""
 
-#: addons/argonaut/deploy-list.xml:59
-#: addons/argonaut/events/DaemonEvent.tpl.c:11
+#: addons/argonaut/deploy-list.xml:69
 msgid "Status"
 msgstr "Status"
 
-#: addons/argonaut/deploy-list.xml:67
+#: addons/argonaut/deploy-list.xml:77
 msgid "Actions"
 msgstr "Ã…tgÃ¤rder"
 
-#: addons/argonaut/deploy-list.xml:97 addons/argonaut/deploy-list.xml:144
+#: addons/argonaut/deploy-list.xml:88
+msgid "Create"
+msgstr "Skapa"
+
+#: addons/argonaut/deploy-list.xml:117 addons/argonaut/deploy-list.xml:174
 msgid "Abort"
 msgstr "Avbryt"
 
-#: addons/argonaut/deploy-list.xml:108
+#: addons/argonaut/deploy-list.xml:128
 msgid "Execute"
 msgstr "Exekvera"
 
-#: addons/argonaut/deploy-list.xml:120
+#: addons/argonaut/deploy-list.xml:140
 msgid "Process now"
 msgstr ""
 
-#: addons/argonaut/deploy-list.xml:128
+#: addons/argonaut/deploy-list.xml:148
 msgid "View logs"
 msgstr ""
 
+#: addons/argonaut/deploy-list.xml:157
+msgid "Edit"
+msgstr "Redigera"
+
 #: include/class_supportDaemon.inc:89
 msgid "Multiple argonaut server found. Only one is supported"
 msgstr ""
@@ -670,162 +644,3 @@ msgstr ""
 #, php-format
 msgid "\"%s\" is not a file!"
 msgstr ""
-
-#: addons/argonaut/argonaut_import_file.tpl.c:2
-msgid "Import jobs"
-msgstr ""
-
-#: addons/argonaut/argonaut_import_file.tpl.c:5
-msgid ""
-"You can import a list of jobs into the FusionDirectory job queue. This "
-"should be a semicolon seperated list of items in the following format:"
-msgstr ""
-
-#: addons/argonaut/argonaut_import_file.tpl.c:8
-msgid "timestamp"
-msgstr ""
-
-#: addons/argonaut/argonaut_import_file.tpl.c:11
-msgid "MAC-address"
-msgstr ""
-
-#: addons/argonaut/argonaut_import_file.tpl.c:14
-msgid "job type"
-msgstr ""
-
-#: addons/argonaut/argonaut_import_file.tpl.c:17
-msgid "object group"
-msgstr ""
-
-#: addons/argonaut/argonaut_import_file.tpl.c:20
-msgid "import base"
-msgstr ""
-
-#: addons/argonaut/argonaut_import_file.tpl.c:23
-msgid "full hostname"
-msgstr ""
-
-#: addons/argonaut/argonaut_import_file.tpl.c:26
-msgid "IP-address"
-msgstr ""
-
-#: addons/argonaut/argonaut_import_file.tpl.c:29
-msgid "DHCP group"
-msgstr ""
-
-#: addons/argonaut/argonaut_import_file.tpl.c:32
-msgid "Example"
-msgstr "Exempel"
-
-#: addons/argonaut/argonaut_import_file.tpl.c:35
-msgid "Select list to import"
-msgstr ""
-
-#: addons/argonaut/argonaut_import_file.tpl.c:38
-msgid "Browse"
-msgstr ""
-
-#: addons/argonaut/argonaut_import_file.tpl.c:41
-msgid "Upload"
-msgstr "Ladda upp"
-
-#: addons/argonaut/argonaut_import_file.tpl.c:44
-#: addons/argonaut/events/DaemonEvent.tpl.c:20
-msgid "Timestamp"
-msgstr "TidsstÃ¤mpel"
-
-#: addons/argonaut/argonaut_import_file.tpl.c:56
-msgid "Base"
-msgstr "Bas"
-
-#: addons/argonaut/argonaut_import_file.tpl.c:59
-msgid "FQDN"
-msgstr ""
-
-#: addons/argonaut/argonaut_import_file.tpl.c:65
-msgid "DHCP"
-msgstr ""
-
-#: addons/argonaut/events/target_list.tpl.c:2
-msgid "Apply"
-msgstr ""
-
-#: addons/argonaut/events/target_list.tpl.c:5
-msgid "Cancel"
-msgstr "Avbryt"
-
-#: addons/argonaut/events/DaemonEvent.tpl.c:5
-msgid "System list"
-msgstr ""
-
-#: addons/argonaut/events/DaemonEvent.tpl.c:8
-msgid "ID"
-msgstr ""
-
-#: addons/argonaut/events/DaemonEvent.tpl.c:14
-msgid "Result"
-msgstr ""
-
-#: addons/argonaut/events/eventTargetSystems-filter.tpl.c:2
-msgid "Filter"
-msgstr "Filter"
-
-#: addons/argonaut/events/eventTargetSystems-filter.tpl.c:5
-msgid "Show servers"
-msgstr "Visa servrar"
-
-#: addons/argonaut/events/eventTargetSystems-filter.tpl.c:8
-msgid "Show workstations"
-msgstr "Visa workstations"
-
-#: addons/argonaut/events/eventTargetSystems-filter.tpl.c:11
-msgid "Show terminals"
-msgstr "Visa terminaler"
-
-#: addons/argonaut/events/eventTargetSystems-filter.tpl.c:14
-msgid "Show winstations"
-msgstr ""
-
-#: addons/argonaut/events/eventTargetSystems-filter.tpl.c:17
-msgid "Filter by IP address range"
-msgstr ""
-
-#: addons/argonaut/events/timestamp_select.tpl.c:2
-msgid "Year"
-msgstr ""
-
-#: addons/argonaut/events/timestamp_select.tpl.c:5
-msgid "Month"
-msgstr ""
-
-#: addons/argonaut/events/timestamp_select.tpl.c:8
-msgid "Day"
-msgstr ""
-
-#: addons/argonaut/events/timestamp_select.tpl.c:11
-msgid "Hour"
-msgstr ""
-
-#: addons/argonaut/events/timestamp_select.tpl.c:14
-msgid "Minute"
-msgstr ""
-
-#: addons/argonaut/events/timestamp_select.tpl.c:17
-msgid "Second"
-msgstr ""
-
-#: addons/argonaut/events/timestamp_select.tpl.c:20
-msgid "Periodical job"
-msgstr ""
-
-#: addons/argonaut/events/timestamp_select.tpl.c:23
-msgid "Job intervall"
-msgstr ""
-
-#: addons/argonaut/remove.tpl.c:2
-msgid "Warning"
-msgstr "Varning"
-
-#: addons/argonaut/remove.tpl.c:5
-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."
diff --git a/argonaut/locale/ug/fusiondirectory.po b/argonaut/locale/ug/fusiondirectory.po
index 13653800f26c48fa65ae066e05c53c5ae82a8c1e..fc94af2024e2e6db205cb97c7e6d7d573c163b80 100644
--- a/argonaut/locale/ug/fusiondirectory.po
+++ b/argonaut/locale/ug/fusiondirectory.po
@@ -5,12 +5,12 @@
 # Translators:
 msgid ""
 msgstr ""
-"Project-Id-Version: FusionDirectory-108\n"
+"Project-Id-Version: FusionDirectory-109\n"
 "Report-Msgid-Bugs-To: documentation@lists.fusiondirectory.org\n"
-"POT-Creation-Date: 2015-03-31 11:49+0200\n"
-"PO-Revision-Date: 2015-03-17 17:47+0000\n"
+"POT-Creation-Date: 2014-12-15 17:47+0100\n"
+"PO-Revision-Date: 2014-12-15 16:48+0000\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>\n"
-"Language-Team: Uighur (http://www.transifex.com/projects/p/FusionDirectory-108/language/ug/)\n"
+"Language-Team: Uighur (http://www.transifex.com/projects/p/FusionDirectory-109/language/ug/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -47,7 +47,7 @@ msgstr ""
 
 #: admin/systems/argonaut/class_argonautClient.inc:135
 #: admin/systems/services/argonaut/class_argonautFuseConfig.inc:56
-#: admin/systems/services/argonaut/class_argonautMirrorConfig.inc:71
+#: admin/systems/services/argonaut/class_argonautMirrorConfig.inc:79
 #: admin/systems/services/argonaut/class_argonautServer.inc:79
 msgid "Log directory"
 msgstr ""
@@ -78,6 +78,7 @@ msgid "Argonaut Fuse settings"
 msgstr ""
 
 #: admin/systems/services/argonaut/class_argonautFuseConfig.inc:32
+#: admin/systems/services/argonaut/class_argonautMirrorConfig.inc:32
 #: admin/systems/services/argonaut/class_argonautFuseFAIConfig.inc:33
 #: admin/systems/services/argonaut/class_argonautServer.inc:32
 #: admin/systems/services/argonaut/class_argonautFuseOPSIConfig.inc:33
@@ -110,88 +111,60 @@ msgstr ""
 msgid "Path where argonaut-fuse should store pxelinux.cfg"
 msgstr ""
 
-#: admin/systems/services/argonaut/class_argonautMirrorConfig.inc:29
-#: admin/systems/services/argonaut/class_argonautMirrorConfig.inc:30
+#: admin/systems/services/argonaut/class_argonautMirrorConfig.inc:31
+#: admin/systems/services/argonaut/class_argonautMirrorConfig.inc:32
 msgid "Argonaut Mirror settings"
 msgstr ""
 
-#: admin/systems/services/argonaut/class_argonautMirrorConfig.inc:41
+#: admin/systems/services/argonaut/class_argonautMirrorConfig.inc:46
 msgid "Argonaut mirror settings"
 msgstr ""
 
-#: admin/systems/services/argonaut/class_argonautMirrorConfig.inc:44
-msgid "Local Debian mirror directory"
+#: admin/systems/services/argonaut/class_argonautMirrorConfig.inc:49
+msgid "Local debian mirror directory"
 msgstr ""
 
-#: admin/systems/services/argonaut/class_argonautMirrorConfig.inc:52
+#: admin/systems/services/argonaut/class_argonautMirrorConfig.inc:58
 msgid "Argonaut Debconf Crawler configuration"
 msgstr ""
 
-#: admin/systems/services/argonaut/class_argonautMirrorConfig.inc:55
+#: admin/systems/services/argonaut/class_argonautMirrorConfig.inc:61
 msgid "Local packages folder"
 msgstr ""
 
-#: admin/systems/services/argonaut/class_argonautMirrorConfig.inc:56
+#: admin/systems/services/argonaut/class_argonautMirrorConfig.inc:62
 msgid "Folder in which the crawler will store packages during analysis"
 msgstr ""
 
-#: admin/systems/services/argonaut/class_argonautMirrorConfig.inc:63
+#: admin/systems/services/argonaut/class_argonautMirrorConfig.inc:70
 msgid "Argonaut Repository configuration"
 msgstr ""
 
-#: admin/systems/services/argonaut/class_argonautMirrorConfig.inc:66
+#: admin/systems/services/argonaut/class_argonautMirrorConfig.inc:73
 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"
+#: admin/systems/services/argonaut/class_argonautMirrorConfig.inc:84
+msgid "Errors"
 msgstr ""
 
-#: admin/systems/services/argonaut/class_argonautMirrorConfig.inc:71
-msgid "Directory in which logs should be stored"
-msgstr ""
-
-#: admin/systems/services/argonaut/class_argonautMirrorConfig.inc:76
-msgid "Ignore errors"
-msgstr ""
-
-#: admin/systems/services/argonaut/class_argonautMirrorConfig.inc:77
-msgid ""
-"Causes debmirror to ignore missing or broken deb and source files but still "
-"be pedantic about checking meta files"
-msgstr ""
-
-#: admin/systems/services/argonaut/class_argonautMirrorConfig.inc:82
+#: admin/systems/services/argonaut/class_argonautMirrorConfig.inc:91
 msgid "Source"
 msgstr ""
 
-#: admin/systems/services/argonaut/class_argonautMirrorConfig.inc:82
-msgid "Include source in the mirror"
-msgstr ""
-
-#: admin/systems/services/argonaut/class_argonautMirrorConfig.inc:87
+#: admin/systems/services/argonaut/class_argonautMirrorConfig.inc:98
 msgid "GPG Check"
 msgstr ""
 
-#: admin/systems/services/argonaut/class_argonautMirrorConfig.inc:87
-msgid "Fail if the Release.gpg file is missing"
-msgstr ""
-
-#: admin/systems/services/argonaut/class_argonautMirrorConfig.inc:92
+#: admin/systems/services/argonaut/class_argonautMirrorConfig.inc:105
 msgid "Contents"
 msgstr ""
 
-#: admin/systems/services/argonaut/class_argonautMirrorConfig.inc:93
-msgid ""
-"Additionally download Contents.<arch>.gz files (Note that these files can be"
-" relatively big and can change frequently)"
-msgstr ""
-
-#: admin/systems/services/argonaut/class_argonautMirrorConfig.inc:98
+#: admin/systems/services/argonaut/class_argonautMirrorConfig.inc:112
 msgid "Verbose"
 msgstr ""
 
-#: admin/systems/services/argonaut/class_argonautMirrorConfig.inc:98
+#: admin/systems/services/argonaut/class_argonautMirrorConfig.inc:113
 msgid "Wether to activate verbose mode"
 msgstr ""
 
@@ -398,9 +371,9 @@ msgid "LTSP server"
 msgstr ""
 
 #: addons/argonaut/class_filterArgonautEvents.inc:40
-#: addons/argonaut/class_argonautQueue.inc:160
-#: addons/argonaut/class_argonautQueue.inc:260
-#: addons/argonaut/class_argonautQueue.inc:335
+#: addons/argonaut/class_argonautQueue.inc:193
+#: addons/argonaut/class_argonautQueue.inc:307
+#: addons/argonaut/class_argonautQueue.inc:398
 msgid "Error"
 msgstr ""
 
@@ -412,8 +385,7 @@ msgstr ""
 #: addons/argonaut/class_argonautImportFile.inc:44
 #: addons/argonaut/class_argonautImportFile.inc:100
 #: addons/argonaut/class_argonautImportFile.inc:141
-#: addons/argonaut/deploy-list.xml:79
-#: addons/argonaut/argonaut_import_file.tpl.c:68
+#: addons/argonaut/deploy-list.xml:99
 msgid "Import"
 msgstr ""
 
@@ -427,7 +399,8 @@ msgid ""
 msgstr ""
 
 #: addons/argonaut/class_argonautImportFile.inc:134
-msgid "Infrastructure service"
+#: addons/argonaut/class_argonautQueue.inc:350
+msgid "Service infrastructure"
 msgstr ""
 
 #: addons/argonaut/class_argonautImportFile.inc:141
@@ -436,84 +409,82 @@ msgid "Import complete: %s events successfully send, %s failed"
 msgstr ""
 
 #: addons/argonaut/class_argonautImportFile.inc:177
-#: addons/argonaut/argonaut_import_file.tpl.c:47
 msgid "MAC"
 msgstr ""
 
 #: addons/argonaut/class_argonautImportFile.inc:180
 #: addons/argonaut/deploy-list.xml:14
-#: addons/argonaut/argonaut_import_file.tpl.c:50
 msgid "Event"
 msgstr ""
 
-#: addons/argonaut/class_argonautQueue.inc:35
-#: addons/argonaut/class_argonautQueue.inc:41
+#: addons/argonaut/class_argonautQueue.inc:39
+#: addons/argonaut/class_argonautQueue.inc:45
 msgid "Deployment queue"
 msgstr ""
 
-#: addons/argonaut/class_argonautQueue.inc:36
+#: addons/argonaut/class_argonautQueue.inc:40
 msgid "Provide a mechanism to automatically activate systems"
 msgstr ""
 
-#: addons/argonaut/class_argonautQueue.inc:43
+#: addons/argonaut/class_argonautQueue.inc:47
 #: addons/argonaut/events/eventTargetSystems-list.xml:81
 msgid "Description"
 msgstr ""
 
-#: addons/argonaut/class_argonautQueue.inc:141
+#: addons/argonaut/class_argonautQueue.inc:174
 msgid "immediately"
 msgstr ""
 
-#: addons/argonaut/class_argonautQueue.inc:156
+#: addons/argonaut/class_argonautQueue.inc:189
 msgid "Waiting"
 msgstr ""
 
-#: addons/argonaut/class_argonautQueue.inc:159
+#: addons/argonaut/class_argonautQueue.inc:192
 msgid "Show error"
 msgstr ""
 
-#: addons/argonaut/class_argonautQueue.inc:163
+#: addons/argonaut/class_argonautQueue.inc:196
 msgid "Processed"
 msgstr ""
 
-#: addons/argonaut/class_argonautQueue.inc:172
+#: addons/argonaut/class_argonautQueue.inc:205
 msgid "in progress"
 msgstr ""
 
-#: addons/argonaut/class_argonautQueue.inc:180
+#: addons/argonaut/class_argonautQueue.inc:226
 msgid "Permission"
 msgstr ""
 
-#: addons/argonaut/class_argonautQueue.inc:210
+#: addons/argonaut/class_argonautQueue.inc:256
 #: addons/argonaut/events/class_DaemonEvent.inc:258
-#: addons/argonaut/deploy-list.xml:86 addons/argonaut/deploy-list.xml:136
+#: addons/argonaut/deploy-list.xml:106 addons/argonaut/deploy-list.xml:166
 msgid "Remove"
 msgstr ""
 
-#: addons/argonaut/class_argonautQueue.inc:211
+#: addons/argonaut/class_argonautQueue.inc:257
 #, php-format
 msgid "The following jobs couldn't be deleted, they have to be aborted: %s"
 msgstr ""
 
-#: addons/argonaut/class_argonautQueue.inc:257
+#: addons/argonaut/class_argonautQueue.inc:304
 msgid "Info"
 msgstr ""
 
-#: addons/argonaut/class_argonautQueue.inc:257
+#: addons/argonaut/class_argonautQueue.inc:304
 #, php-format
 msgid "%s"
 msgstr ""
 
-#: addons/argonaut/class_argonautQueue.inc:261
+#: addons/argonaut/class_argonautQueue.inc:308
 #, php-format
 msgid "Required class '%s' cannot be found: job not aborted!"
 msgstr ""
 
-#: addons/argonaut/class_argonautQueue.inc:293
+#: addons/argonaut/class_argonautQueue.inc:340
 msgid "Error detail"
 msgstr ""
 
-#: addons/argonaut/class_argonautQueue.inc:335
+#: addons/argonaut/class_argonautQueue.inc:398
 #, php-format
 msgid "Cannot update queue entries."
 msgstr ""
@@ -588,17 +559,15 @@ msgid "Winstation"
 msgstr ""
 
 #: addons/argonaut/events/eventTargetSystems-list.xml:47
-#: addons/argonaut/argonaut_import_file.tpl.c:53
 msgid "Object group"
 msgstr ""
 
 #: addons/argonaut/events/eventTargetSystems-list.xml:73
-#: addons/argonaut/events/eventTargetSystems-filter.tpl.c:20
+#: addons/argonaut/deploy-list.xml:36
 msgid "Name"
 msgstr ""
 
 #: addons/argonaut/events/eventTargetSystems-list.xml:89
-#: addons/argonaut/argonaut_import_file.tpl.c:62
 msgid "IP"
 msgstr ""
 
@@ -611,48 +580,53 @@ msgid "List of queued jobs"
 msgstr ""
 
 #: addons/argonaut/deploy-list.xml:27
-#: addons/argonaut/events/DaemonEvent.tpl.c:17
 msgid "Target"
 msgstr ""
 
-#: addons/argonaut/deploy-list.xml:35
+#: addons/argonaut/deploy-list.xml:45
 msgid "Task"
 msgstr ""
 
-#: addons/argonaut/deploy-list.xml:43
+#: addons/argonaut/deploy-list.xml:53
 msgid "Period"
 msgstr ""
 
-#: addons/argonaut/deploy-list.xml:51
-#: addons/argonaut/events/DaemonEvent.tpl.c:2
+#: addons/argonaut/deploy-list.xml:61
 msgid "Schedule"
 msgstr ""
 
-#: addons/argonaut/deploy-list.xml:59
-#: addons/argonaut/events/DaemonEvent.tpl.c:11
+#: addons/argonaut/deploy-list.xml:69
 msgid "Status"
 msgstr ""
 
-#: addons/argonaut/deploy-list.xml:67
+#: addons/argonaut/deploy-list.xml:77
 msgid "Actions"
 msgstr ""
 
-#: addons/argonaut/deploy-list.xml:97 addons/argonaut/deploy-list.xml:144
+#: addons/argonaut/deploy-list.xml:88
+msgid "Create"
+msgstr ""
+
+#: addons/argonaut/deploy-list.xml:117 addons/argonaut/deploy-list.xml:174
 msgid "Abort"
 msgstr ""
 
-#: addons/argonaut/deploy-list.xml:108
+#: addons/argonaut/deploy-list.xml:128
 msgid "Execute"
 msgstr ""
 
-#: addons/argonaut/deploy-list.xml:120
+#: addons/argonaut/deploy-list.xml:140
 msgid "Process now"
 msgstr ""
 
-#: addons/argonaut/deploy-list.xml:128
+#: addons/argonaut/deploy-list.xml:148
 msgid "View logs"
 msgstr ""
 
+#: addons/argonaut/deploy-list.xml:157
+msgid "Edit"
+msgstr ""
+
 #: include/class_supportDaemon.inc:89
 msgid "Multiple argonaut server found. Only one is supported"
 msgstr ""
@@ -670,162 +644,3 @@ msgstr ""
 #, php-format
 msgid "\"%s\" is not a file!"
 msgstr ""
-
-#: addons/argonaut/argonaut_import_file.tpl.c:2
-msgid "Import jobs"
-msgstr ""
-
-#: addons/argonaut/argonaut_import_file.tpl.c:5
-msgid ""
-"You can import a list of jobs into the FusionDirectory job queue. This "
-"should be a semicolon seperated list of items in the following format:"
-msgstr ""
-
-#: addons/argonaut/argonaut_import_file.tpl.c:8
-msgid "timestamp"
-msgstr ""
-
-#: addons/argonaut/argonaut_import_file.tpl.c:11
-msgid "MAC-address"
-msgstr ""
-
-#: addons/argonaut/argonaut_import_file.tpl.c:14
-msgid "job type"
-msgstr ""
-
-#: addons/argonaut/argonaut_import_file.tpl.c:17
-msgid "object group"
-msgstr ""
-
-#: addons/argonaut/argonaut_import_file.tpl.c:20
-msgid "import base"
-msgstr ""
-
-#: addons/argonaut/argonaut_import_file.tpl.c:23
-msgid "full hostname"
-msgstr ""
-
-#: addons/argonaut/argonaut_import_file.tpl.c:26
-msgid "IP-address"
-msgstr ""
-
-#: addons/argonaut/argonaut_import_file.tpl.c:29
-msgid "DHCP group"
-msgstr ""
-
-#: addons/argonaut/argonaut_import_file.tpl.c:32
-msgid "Example"
-msgstr ""
-
-#: addons/argonaut/argonaut_import_file.tpl.c:35
-msgid "Select list to import"
-msgstr ""
-
-#: addons/argonaut/argonaut_import_file.tpl.c:38
-msgid "Browse"
-msgstr ""
-
-#: addons/argonaut/argonaut_import_file.tpl.c:41
-msgid "Upload"
-msgstr ""
-
-#: addons/argonaut/argonaut_import_file.tpl.c:44
-#: addons/argonaut/events/DaemonEvent.tpl.c:20
-msgid "Timestamp"
-msgstr ""
-
-#: addons/argonaut/argonaut_import_file.tpl.c:56
-msgid "Base"
-msgstr ""
-
-#: addons/argonaut/argonaut_import_file.tpl.c:59
-msgid "FQDN"
-msgstr ""
-
-#: addons/argonaut/argonaut_import_file.tpl.c:65
-msgid "DHCP"
-msgstr ""
-
-#: addons/argonaut/events/target_list.tpl.c:2
-msgid "Apply"
-msgstr ""
-
-#: addons/argonaut/events/target_list.tpl.c:5
-msgid "Cancel"
-msgstr ""
-
-#: addons/argonaut/events/DaemonEvent.tpl.c:5
-msgid "System list"
-msgstr ""
-
-#: addons/argonaut/events/DaemonEvent.tpl.c:8
-msgid "ID"
-msgstr ""
-
-#: addons/argonaut/events/DaemonEvent.tpl.c:14
-msgid "Result"
-msgstr ""
-
-#: addons/argonaut/events/eventTargetSystems-filter.tpl.c:2
-msgid "Filter"
-msgstr ""
-
-#: addons/argonaut/events/eventTargetSystems-filter.tpl.c:5
-msgid "Show servers"
-msgstr ""
-
-#: addons/argonaut/events/eventTargetSystems-filter.tpl.c:8
-msgid "Show workstations"
-msgstr ""
-
-#: addons/argonaut/events/eventTargetSystems-filter.tpl.c:11
-msgid "Show terminals"
-msgstr ""
-
-#: addons/argonaut/events/eventTargetSystems-filter.tpl.c:14
-msgid "Show winstations"
-msgstr ""
-
-#: addons/argonaut/events/eventTargetSystems-filter.tpl.c:17
-msgid "Filter by IP address range"
-msgstr ""
-
-#: addons/argonaut/events/timestamp_select.tpl.c:2
-msgid "Year"
-msgstr ""
-
-#: addons/argonaut/events/timestamp_select.tpl.c:5
-msgid "Month"
-msgstr ""
-
-#: addons/argonaut/events/timestamp_select.tpl.c:8
-msgid "Day"
-msgstr ""
-
-#: addons/argonaut/events/timestamp_select.tpl.c:11
-msgid "Hour"
-msgstr ""
-
-#: addons/argonaut/events/timestamp_select.tpl.c:14
-msgid "Minute"
-msgstr ""
-
-#: addons/argonaut/events/timestamp_select.tpl.c:17
-msgid "Second"
-msgstr ""
-
-#: addons/argonaut/events/timestamp_select.tpl.c:20
-msgid "Periodical job"
-msgstr ""
-
-#: addons/argonaut/events/timestamp_select.tpl.c:23
-msgid "Job intervall"
-msgstr ""
-
-#: addons/argonaut/remove.tpl.c:2
-msgid "Warning"
-msgstr ""
-
-#: addons/argonaut/remove.tpl.c:5
-msgid "So - if you're sure - press 'Delete' to continue or 'Cancel' to abort."
-msgstr ""
diff --git a/argonaut/locale/vi_VN/fusiondirectory.po b/argonaut/locale/vi_VN/fusiondirectory.po
index 114cd3a8c1ea396419af52102b07ac693d915fe9..db9f6c1b3d48b57ab8a45d6aa6c5735c57a682bc 100644
--- a/argonaut/locale/vi_VN/fusiondirectory.po
+++ b/argonaut/locale/vi_VN/fusiondirectory.po
@@ -5,12 +5,12 @@
 # Translators:
 msgid ""
 msgstr ""
-"Project-Id-Version: FusionDirectory-108\n"
+"Project-Id-Version: FusionDirectory-109\n"
 "Report-Msgid-Bugs-To: documentation@lists.fusiondirectory.org\n"
-"POT-Creation-Date: 2015-03-31 11:49+0200\n"
-"PO-Revision-Date: 2015-03-17 17:47+0000\n"
+"POT-Creation-Date: 2014-12-15 17:47+0100\n"
+"PO-Revision-Date: 2015-02-25 16:13+0000\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>\n"
-"Language-Team: Vietnamese (Viet Nam) (http://www.transifex.com/projects/p/FusionDirectory-108/language/vi_VN/)\n"
+"Language-Team: Vietnamese (Viet Nam) (http://www.transifex.com/projects/p/FusionDirectory-109/language/vi_VN/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -47,7 +47,7 @@ msgstr ""
 
 #: admin/systems/argonaut/class_argonautClient.inc:135
 #: admin/systems/services/argonaut/class_argonautFuseConfig.inc:56
-#: admin/systems/services/argonaut/class_argonautMirrorConfig.inc:71
+#: admin/systems/services/argonaut/class_argonautMirrorConfig.inc:79
 #: admin/systems/services/argonaut/class_argonautServer.inc:79
 msgid "Log directory"
 msgstr ""
@@ -78,6 +78,7 @@ msgid "Argonaut Fuse settings"
 msgstr ""
 
 #: admin/systems/services/argonaut/class_argonautFuseConfig.inc:32
+#: admin/systems/services/argonaut/class_argonautMirrorConfig.inc:32
 #: admin/systems/services/argonaut/class_argonautFuseFAIConfig.inc:33
 #: admin/systems/services/argonaut/class_argonautServer.inc:32
 #: admin/systems/services/argonaut/class_argonautFuseOPSIConfig.inc:33
@@ -110,88 +111,60 @@ msgstr ""
 msgid "Path where argonaut-fuse should store pxelinux.cfg"
 msgstr ""
 
-#: admin/systems/services/argonaut/class_argonautMirrorConfig.inc:29
-#: admin/systems/services/argonaut/class_argonautMirrorConfig.inc:30
+#: admin/systems/services/argonaut/class_argonautMirrorConfig.inc:31
+#: admin/systems/services/argonaut/class_argonautMirrorConfig.inc:32
 msgid "Argonaut Mirror settings"
 msgstr ""
 
-#: admin/systems/services/argonaut/class_argonautMirrorConfig.inc:41
+#: admin/systems/services/argonaut/class_argonautMirrorConfig.inc:46
 msgid "Argonaut mirror settings"
 msgstr ""
 
-#: admin/systems/services/argonaut/class_argonautMirrorConfig.inc:44
-msgid "Local Debian mirror directory"
+#: admin/systems/services/argonaut/class_argonautMirrorConfig.inc:49
+msgid "Local debian mirror directory"
 msgstr ""
 
-#: admin/systems/services/argonaut/class_argonautMirrorConfig.inc:52
+#: admin/systems/services/argonaut/class_argonautMirrorConfig.inc:58
 msgid "Argonaut Debconf Crawler configuration"
 msgstr ""
 
-#: admin/systems/services/argonaut/class_argonautMirrorConfig.inc:55
+#: admin/systems/services/argonaut/class_argonautMirrorConfig.inc:61
 msgid "Local packages folder"
 msgstr ""
 
-#: admin/systems/services/argonaut/class_argonautMirrorConfig.inc:56
+#: admin/systems/services/argonaut/class_argonautMirrorConfig.inc:62
 msgid "Folder in which the crawler will store packages during analysis"
 msgstr ""
 
-#: admin/systems/services/argonaut/class_argonautMirrorConfig.inc:63
+#: admin/systems/services/argonaut/class_argonautMirrorConfig.inc:70
 msgid "Argonaut Repository configuration"
 msgstr ""
 
-#: admin/systems/services/argonaut/class_argonautMirrorConfig.inc:66
+#: admin/systems/services/argonaut/class_argonautMirrorConfig.inc:73
 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"
+#: admin/systems/services/argonaut/class_argonautMirrorConfig.inc:84
+msgid "Errors"
 msgstr ""
 
-#: admin/systems/services/argonaut/class_argonautMirrorConfig.inc:71
-msgid "Directory in which logs should be stored"
-msgstr ""
-
-#: admin/systems/services/argonaut/class_argonautMirrorConfig.inc:76
-msgid "Ignore errors"
-msgstr ""
-
-#: admin/systems/services/argonaut/class_argonautMirrorConfig.inc:77
-msgid ""
-"Causes debmirror to ignore missing or broken deb and source files but still "
-"be pedantic about checking meta files"
-msgstr ""
-
-#: admin/systems/services/argonaut/class_argonautMirrorConfig.inc:82
+#: admin/systems/services/argonaut/class_argonautMirrorConfig.inc:91
 msgid "Source"
 msgstr ""
 
-#: admin/systems/services/argonaut/class_argonautMirrorConfig.inc:82
-msgid "Include source in the mirror"
-msgstr ""
-
-#: admin/systems/services/argonaut/class_argonautMirrorConfig.inc:87
+#: admin/systems/services/argonaut/class_argonautMirrorConfig.inc:98
 msgid "GPG Check"
 msgstr ""
 
-#: admin/systems/services/argonaut/class_argonautMirrorConfig.inc:87
-msgid "Fail if the Release.gpg file is missing"
-msgstr ""
-
-#: admin/systems/services/argonaut/class_argonautMirrorConfig.inc:92
+#: admin/systems/services/argonaut/class_argonautMirrorConfig.inc:105
 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 ""
-
-#: admin/systems/services/argonaut/class_argonautMirrorConfig.inc:98
+#: admin/systems/services/argonaut/class_argonautMirrorConfig.inc:112
 msgid "Verbose"
 msgstr ""
 
-#: admin/systems/services/argonaut/class_argonautMirrorConfig.inc:98
+#: admin/systems/services/argonaut/class_argonautMirrorConfig.inc:113
 msgid "Wether to activate verbose mode"
 msgstr ""
 
@@ -398,9 +371,9 @@ msgid "LTSP server"
 msgstr ""
 
 #: addons/argonaut/class_filterArgonautEvents.inc:40
-#: addons/argonaut/class_argonautQueue.inc:160
-#: addons/argonaut/class_argonautQueue.inc:260
-#: addons/argonaut/class_argonautQueue.inc:335
+#: addons/argonaut/class_argonautQueue.inc:193
+#: addons/argonaut/class_argonautQueue.inc:307
+#: addons/argonaut/class_argonautQueue.inc:398
 msgid "Error"
 msgstr "Lá»—i"
 
@@ -412,8 +385,7 @@ msgstr ""
 #: addons/argonaut/class_argonautImportFile.inc:44
 #: addons/argonaut/class_argonautImportFile.inc:100
 #: addons/argonaut/class_argonautImportFile.inc:141
-#: addons/argonaut/deploy-list.xml:79
-#: addons/argonaut/argonaut_import_file.tpl.c:68
+#: addons/argonaut/deploy-list.xml:99
 msgid "Import"
 msgstr ""
 
@@ -427,7 +399,8 @@ msgid ""
 msgstr ""
 
 #: addons/argonaut/class_argonautImportFile.inc:134
-msgid "Infrastructure service"
+#: addons/argonaut/class_argonautQueue.inc:350
+msgid "Service infrastructure"
 msgstr ""
 
 #: addons/argonaut/class_argonautImportFile.inc:141
@@ -436,84 +409,82 @@ msgid "Import complete: %s events successfully send, %s failed"
 msgstr ""
 
 #: addons/argonaut/class_argonautImportFile.inc:177
-#: addons/argonaut/argonaut_import_file.tpl.c:47
 msgid "MAC"
 msgstr ""
 
 #: addons/argonaut/class_argonautImportFile.inc:180
 #: addons/argonaut/deploy-list.xml:14
-#: addons/argonaut/argonaut_import_file.tpl.c:50
 msgid "Event"
 msgstr ""
 
-#: addons/argonaut/class_argonautQueue.inc:35
-#: addons/argonaut/class_argonautQueue.inc:41
+#: addons/argonaut/class_argonautQueue.inc:39
+#: addons/argonaut/class_argonautQueue.inc:45
 msgid "Deployment queue"
 msgstr ""
 
-#: addons/argonaut/class_argonautQueue.inc:36
+#: addons/argonaut/class_argonautQueue.inc:40
 msgid "Provide a mechanism to automatically activate systems"
 msgstr ""
 
-#: addons/argonaut/class_argonautQueue.inc:43
+#: addons/argonaut/class_argonautQueue.inc:47
 #: addons/argonaut/events/eventTargetSystems-list.xml:81
 msgid "Description"
 msgstr "MÃ´ táº£"
 
-#: addons/argonaut/class_argonautQueue.inc:141
+#: addons/argonaut/class_argonautQueue.inc:174
 msgid "immediately"
 msgstr ""
 
-#: addons/argonaut/class_argonautQueue.inc:156
+#: addons/argonaut/class_argonautQueue.inc:189
 msgid "Waiting"
 msgstr ""
 
-#: addons/argonaut/class_argonautQueue.inc:159
+#: addons/argonaut/class_argonautQueue.inc:192
 msgid "Show error"
 msgstr ""
 
-#: addons/argonaut/class_argonautQueue.inc:163
+#: addons/argonaut/class_argonautQueue.inc:196
 msgid "Processed"
 msgstr ""
 
-#: addons/argonaut/class_argonautQueue.inc:172
+#: addons/argonaut/class_argonautQueue.inc:205
 msgid "in progress"
 msgstr ""
 
-#: addons/argonaut/class_argonautQueue.inc:180
+#: addons/argonaut/class_argonautQueue.inc:226
 msgid "Permission"
 msgstr "Cho phÃ©p"
 
-#: addons/argonaut/class_argonautQueue.inc:210
+#: addons/argonaut/class_argonautQueue.inc:256
 #: addons/argonaut/events/class_DaemonEvent.inc:258
-#: addons/argonaut/deploy-list.xml:86 addons/argonaut/deploy-list.xml:136
+#: addons/argonaut/deploy-list.xml:106 addons/argonaut/deploy-list.xml:166
 msgid "Remove"
 msgstr "XÃ³a bá»"
 
-#: addons/argonaut/class_argonautQueue.inc:211
+#: addons/argonaut/class_argonautQueue.inc:257
 #, php-format
 msgid "The following jobs couldn't be deleted, they have to be aborted: %s"
 msgstr ""
 
-#: addons/argonaut/class_argonautQueue.inc:257
+#: addons/argonaut/class_argonautQueue.inc:304
 msgid "Info"
 msgstr ""
 
-#: addons/argonaut/class_argonautQueue.inc:257
+#: addons/argonaut/class_argonautQueue.inc:304
 #, php-format
 msgid "%s"
 msgstr ""
 
-#: addons/argonaut/class_argonautQueue.inc:261
+#: addons/argonaut/class_argonautQueue.inc:308
 #, php-format
 msgid "Required class '%s' cannot be found: job not aborted!"
 msgstr ""
 
-#: addons/argonaut/class_argonautQueue.inc:293
+#: addons/argonaut/class_argonautQueue.inc:340
 msgid "Error detail"
 msgstr ""
 
-#: addons/argonaut/class_argonautQueue.inc:335
+#: addons/argonaut/class_argonautQueue.inc:398
 #, php-format
 msgid "Cannot update queue entries."
 msgstr ""
@@ -588,17 +559,15 @@ msgid "Winstation"
 msgstr ""
 
 #: addons/argonaut/events/eventTargetSystems-list.xml:47
-#: addons/argonaut/argonaut_import_file.tpl.c:53
 msgid "Object group"
 msgstr "NhÃ³m Ä‘á»‘i tÆ°á»£ng"
 
 #: addons/argonaut/events/eventTargetSystems-list.xml:73
-#: addons/argonaut/events/eventTargetSystems-filter.tpl.c:20
+#: addons/argonaut/deploy-list.xml:36
 msgid "Name"
 msgstr "TÃªn"
 
 #: addons/argonaut/events/eventTargetSystems-list.xml:89
-#: addons/argonaut/argonaut_import_file.tpl.c:62
 msgid "IP"
 msgstr ""
 
@@ -611,48 +580,53 @@ msgid "List of queued jobs"
 msgstr ""
 
 #: addons/argonaut/deploy-list.xml:27
-#: addons/argonaut/events/DaemonEvent.tpl.c:17
 msgid "Target"
 msgstr ""
 
-#: addons/argonaut/deploy-list.xml:35
+#: addons/argonaut/deploy-list.xml:45
 msgid "Task"
 msgstr ""
 
-#: addons/argonaut/deploy-list.xml:43
+#: addons/argonaut/deploy-list.xml:53
 msgid "Period"
 msgstr ""
 
-#: addons/argonaut/deploy-list.xml:51
-#: addons/argonaut/events/DaemonEvent.tpl.c:2
+#: addons/argonaut/deploy-list.xml:61
 msgid "Schedule"
 msgstr ""
 
-#: addons/argonaut/deploy-list.xml:59
-#: addons/argonaut/events/DaemonEvent.tpl.c:11
+#: addons/argonaut/deploy-list.xml:69
 msgid "Status"
 msgstr "Tráº¡ng thÃ¡i"
 
-#: addons/argonaut/deploy-list.xml:67
+#: addons/argonaut/deploy-list.xml:77
 msgid "Actions"
 msgstr "CÃ¡c thao tÃ¡c"
 
-#: addons/argonaut/deploy-list.xml:97 addons/argonaut/deploy-list.xml:144
+#: addons/argonaut/deploy-list.xml:88
+msgid "Create"
+msgstr "Táº¡o "
+
+#: addons/argonaut/deploy-list.xml:117 addons/argonaut/deploy-list.xml:174
 msgid "Abort"
 msgstr "Ngá»«ng láº¡i"
 
-#: addons/argonaut/deploy-list.xml:108
+#: addons/argonaut/deploy-list.xml:128
 msgid "Execute"
 msgstr ""
 
-#: addons/argonaut/deploy-list.xml:120
+#: addons/argonaut/deploy-list.xml:140
 msgid "Process now"
 msgstr ""
 
-#: addons/argonaut/deploy-list.xml:128
+#: addons/argonaut/deploy-list.xml:148
 msgid "View logs"
 msgstr ""
 
+#: addons/argonaut/deploy-list.xml:157
+msgid "Edit"
+msgstr "Hiá»‡u chá»‰nh"
+
 #: include/class_supportDaemon.inc:89
 msgid "Multiple argonaut server found. Only one is supported"
 msgstr ""
@@ -670,162 +644,3 @@ msgstr ""
 #, php-format
 msgid "\"%s\" is not a file!"
 msgstr ""
-
-#: addons/argonaut/argonaut_import_file.tpl.c:2
-msgid "Import jobs"
-msgstr ""
-
-#: addons/argonaut/argonaut_import_file.tpl.c:5
-msgid ""
-"You can import a list of jobs into the FusionDirectory job queue. This "
-"should be a semicolon seperated list of items in the following format:"
-msgstr ""
-
-#: addons/argonaut/argonaut_import_file.tpl.c:8
-msgid "timestamp"
-msgstr ""
-
-#: addons/argonaut/argonaut_import_file.tpl.c:11
-msgid "MAC-address"
-msgstr ""
-
-#: addons/argonaut/argonaut_import_file.tpl.c:14
-msgid "job type"
-msgstr ""
-
-#: addons/argonaut/argonaut_import_file.tpl.c:17
-msgid "object group"
-msgstr ""
-
-#: addons/argonaut/argonaut_import_file.tpl.c:20
-msgid "import base"
-msgstr ""
-
-#: addons/argonaut/argonaut_import_file.tpl.c:23
-msgid "full hostname"
-msgstr ""
-
-#: addons/argonaut/argonaut_import_file.tpl.c:26
-msgid "IP-address"
-msgstr ""
-
-#: addons/argonaut/argonaut_import_file.tpl.c:29
-msgid "DHCP group"
-msgstr ""
-
-#: addons/argonaut/argonaut_import_file.tpl.c:32
-msgid "Example"
-msgstr "VÃ dá»¥"
-
-#: addons/argonaut/argonaut_import_file.tpl.c:35
-msgid "Select list to import"
-msgstr ""
-
-#: addons/argonaut/argonaut_import_file.tpl.c:38
-msgid "Browse"
-msgstr ""
-
-#: addons/argonaut/argonaut_import_file.tpl.c:41
-msgid "Upload"
-msgstr ""
-
-#: addons/argonaut/argonaut_import_file.tpl.c:44
-#: addons/argonaut/events/DaemonEvent.tpl.c:20
-msgid "Timestamp"
-msgstr "Timestamp"
-
-#: addons/argonaut/argonaut_import_file.tpl.c:56
-msgid "Base"
-msgstr "CÆ¡ sá»Ÿ"
-
-#: addons/argonaut/argonaut_import_file.tpl.c:59
-msgid "FQDN"
-msgstr ""
-
-#: addons/argonaut/argonaut_import_file.tpl.c:65
-msgid "DHCP"
-msgstr ""
-
-#: addons/argonaut/events/target_list.tpl.c:2
-msgid "Apply"
-msgstr "Ãp dá»¥ng"
-
-#: addons/argonaut/events/target_list.tpl.c:5
-msgid "Cancel"
-msgstr "Há»§y bá»"
-
-#: addons/argonaut/events/DaemonEvent.tpl.c:5
-msgid "System list"
-msgstr ""
-
-#: addons/argonaut/events/DaemonEvent.tpl.c:8
-msgid "ID"
-msgstr ""
-
-#: addons/argonaut/events/DaemonEvent.tpl.c:14
-msgid "Result"
-msgstr ""
-
-#: addons/argonaut/events/eventTargetSystems-filter.tpl.c:2
-msgid "Filter"
-msgstr ""
-
-#: addons/argonaut/events/eventTargetSystems-filter.tpl.c:5
-msgid "Show servers"
-msgstr ""
-
-#: addons/argonaut/events/eventTargetSystems-filter.tpl.c:8
-msgid "Show workstations"
-msgstr ""
-
-#: addons/argonaut/events/eventTargetSystems-filter.tpl.c:11
-msgid "Show terminals"
-msgstr ""
-
-#: addons/argonaut/events/eventTargetSystems-filter.tpl.c:14
-msgid "Show winstations"
-msgstr ""
-
-#: addons/argonaut/events/eventTargetSystems-filter.tpl.c:17
-msgid "Filter by IP address range"
-msgstr ""
-
-#: addons/argonaut/events/timestamp_select.tpl.c:2
-msgid "Year"
-msgstr ""
-
-#: addons/argonaut/events/timestamp_select.tpl.c:5
-msgid "Month"
-msgstr ""
-
-#: addons/argonaut/events/timestamp_select.tpl.c:8
-msgid "Day"
-msgstr ""
-
-#: addons/argonaut/events/timestamp_select.tpl.c:11
-msgid "Hour"
-msgstr ""
-
-#: addons/argonaut/events/timestamp_select.tpl.c:14
-msgid "Minute"
-msgstr ""
-
-#: addons/argonaut/events/timestamp_select.tpl.c:17
-msgid "Second"
-msgstr ""
-
-#: addons/argonaut/events/timestamp_select.tpl.c:20
-msgid "Periodical job"
-msgstr ""
-
-#: addons/argonaut/events/timestamp_select.tpl.c:23
-msgid "Job intervall"
-msgstr ""
-
-#: addons/argonaut/remove.tpl.c:2
-msgid "Warning"
-msgstr "Cáº£nh bÃ¡o"
-
-#: addons/argonaut/remove.tpl.c:5
-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."
diff --git a/argonaut/locale/zh/fusiondirectory.po b/argonaut/locale/zh/fusiondirectory.po
index 6cf7fee6501fe5ece44acc4ab52752d454116f3b..b62da6dc3c4603458ef57db2a550c7e2782bdab5 100644
--- a/argonaut/locale/zh/fusiondirectory.po
+++ b/argonaut/locale/zh/fusiondirectory.po
@@ -5,12 +5,12 @@
 # Translators:
 msgid ""
 msgstr ""
-"Project-Id-Version: FusionDirectory-108\n"
+"Project-Id-Version: FusionDirectory-109\n"
 "Report-Msgid-Bugs-To: documentation@lists.fusiondirectory.org\n"
-"POT-Creation-Date: 2015-03-31 11:49+0200\n"
-"PO-Revision-Date: 2015-03-17 17:47+0000\n"
+"POT-Creation-Date: 2014-12-15 17:47+0100\n"
+"PO-Revision-Date: 2015-02-25 16:13+0000\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>\n"
-"Language-Team: Chinese (http://www.transifex.com/projects/p/FusionDirectory-108/language/zh/)\n"
+"Language-Team: Chinese (http://www.transifex.com/projects/p/FusionDirectory-109/language/zh/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -47,7 +47,7 @@ msgstr ""
 
 #: admin/systems/argonaut/class_argonautClient.inc:135
 #: admin/systems/services/argonaut/class_argonautFuseConfig.inc:56
-#: admin/systems/services/argonaut/class_argonautMirrorConfig.inc:71
+#: admin/systems/services/argonaut/class_argonautMirrorConfig.inc:79
 #: admin/systems/services/argonaut/class_argonautServer.inc:79
 msgid "Log directory"
 msgstr ""
@@ -78,6 +78,7 @@ msgid "Argonaut Fuse settings"
 msgstr ""
 
 #: admin/systems/services/argonaut/class_argonautFuseConfig.inc:32
+#: admin/systems/services/argonaut/class_argonautMirrorConfig.inc:32
 #: admin/systems/services/argonaut/class_argonautFuseFAIConfig.inc:33
 #: admin/systems/services/argonaut/class_argonautServer.inc:32
 #: admin/systems/services/argonaut/class_argonautFuseOPSIConfig.inc:33
@@ -110,88 +111,60 @@ msgstr ""
 msgid "Path where argonaut-fuse should store pxelinux.cfg"
 msgstr ""
 
-#: admin/systems/services/argonaut/class_argonautMirrorConfig.inc:29
-#: admin/systems/services/argonaut/class_argonautMirrorConfig.inc:30
+#: admin/systems/services/argonaut/class_argonautMirrorConfig.inc:31
+#: admin/systems/services/argonaut/class_argonautMirrorConfig.inc:32
 msgid "Argonaut Mirror settings"
 msgstr ""
 
-#: admin/systems/services/argonaut/class_argonautMirrorConfig.inc:41
+#: admin/systems/services/argonaut/class_argonautMirrorConfig.inc:46
 msgid "Argonaut mirror settings"
 msgstr ""
 
-#: admin/systems/services/argonaut/class_argonautMirrorConfig.inc:44
-msgid "Local Debian mirror directory"
+#: admin/systems/services/argonaut/class_argonautMirrorConfig.inc:49
+msgid "Local debian mirror directory"
 msgstr ""
 
-#: admin/systems/services/argonaut/class_argonautMirrorConfig.inc:52
+#: admin/systems/services/argonaut/class_argonautMirrorConfig.inc:58
 msgid "Argonaut Debconf Crawler configuration"
 msgstr ""
 
-#: admin/systems/services/argonaut/class_argonautMirrorConfig.inc:55
+#: admin/systems/services/argonaut/class_argonautMirrorConfig.inc:61
 msgid "Local packages folder"
 msgstr ""
 
-#: admin/systems/services/argonaut/class_argonautMirrorConfig.inc:56
+#: admin/systems/services/argonaut/class_argonautMirrorConfig.inc:62
 msgid "Folder in which the crawler will store packages during analysis"
 msgstr ""
 
-#: admin/systems/services/argonaut/class_argonautMirrorConfig.inc:63
+#: admin/systems/services/argonaut/class_argonautMirrorConfig.inc:70
 msgid "Argonaut Repository configuration"
 msgstr ""
 
-#: admin/systems/services/argonaut/class_argonautMirrorConfig.inc:66
+#: admin/systems/services/argonaut/class_argonautMirrorConfig.inc:73
 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"
+#: admin/systems/services/argonaut/class_argonautMirrorConfig.inc:84
+msgid "Errors"
 msgstr ""
 
-#: admin/systems/services/argonaut/class_argonautMirrorConfig.inc:71
-msgid "Directory in which logs should be stored"
-msgstr ""
-
-#: admin/systems/services/argonaut/class_argonautMirrorConfig.inc:76
-msgid "Ignore errors"
-msgstr ""
-
-#: admin/systems/services/argonaut/class_argonautMirrorConfig.inc:77
-msgid ""
-"Causes debmirror to ignore missing or broken deb and source files but still "
-"be pedantic about checking meta files"
-msgstr ""
-
-#: admin/systems/services/argonaut/class_argonautMirrorConfig.inc:82
+#: admin/systems/services/argonaut/class_argonautMirrorConfig.inc:91
 msgid "Source"
 msgstr "æº"
 
-#: admin/systems/services/argonaut/class_argonautMirrorConfig.inc:82
-msgid "Include source in the mirror"
-msgstr ""
-
-#: admin/systems/services/argonaut/class_argonautMirrorConfig.inc:87
+#: admin/systems/services/argonaut/class_argonautMirrorConfig.inc:98
 msgid "GPG Check"
 msgstr ""
 
-#: admin/systems/services/argonaut/class_argonautMirrorConfig.inc:87
-msgid "Fail if the Release.gpg file is missing"
-msgstr ""
-
-#: admin/systems/services/argonaut/class_argonautMirrorConfig.inc:92
+#: admin/systems/services/argonaut/class_argonautMirrorConfig.inc:105
 msgid "Contents"
 msgstr "å†…å®¹"
 
-#: admin/systems/services/argonaut/class_argonautMirrorConfig.inc:93
-msgid ""
-"Additionally download Contents.<arch>.gz files (Note that these files can be"
-" relatively big and can change frequently)"
-msgstr ""
-
-#: admin/systems/services/argonaut/class_argonautMirrorConfig.inc:98
+#: admin/systems/services/argonaut/class_argonautMirrorConfig.inc:112
 msgid "Verbose"
 msgstr ""
 
-#: admin/systems/services/argonaut/class_argonautMirrorConfig.inc:98
+#: admin/systems/services/argonaut/class_argonautMirrorConfig.inc:113
 msgid "Wether to activate verbose mode"
 msgstr ""
 
@@ -398,9 +371,9 @@ msgid "LTSP server"
 msgstr ""
 
 #: addons/argonaut/class_filterArgonautEvents.inc:40
-#: addons/argonaut/class_argonautQueue.inc:160
-#: addons/argonaut/class_argonautQueue.inc:260
-#: addons/argonaut/class_argonautQueue.inc:335
+#: addons/argonaut/class_argonautQueue.inc:193
+#: addons/argonaut/class_argonautQueue.inc:307
+#: addons/argonaut/class_argonautQueue.inc:398
 msgid "Error"
 msgstr "é”™è¯¯"
 
@@ -412,8 +385,7 @@ msgstr ""
 #: addons/argonaut/class_argonautImportFile.inc:44
 #: addons/argonaut/class_argonautImportFile.inc:100
 #: addons/argonaut/class_argonautImportFile.inc:141
-#: addons/argonaut/deploy-list.xml:79
-#: addons/argonaut/argonaut_import_file.tpl.c:68
+#: addons/argonaut/deploy-list.xml:99
 msgid "Import"
 msgstr "å¯¼å…¥"
 
@@ -427,7 +399,8 @@ msgid ""
 msgstr ""
 
 #: addons/argonaut/class_argonautImportFile.inc:134
-msgid "Infrastructure service"
+#: addons/argonaut/class_argonautQueue.inc:350
+msgid "Service infrastructure"
 msgstr ""
 
 #: addons/argonaut/class_argonautImportFile.inc:141
@@ -436,84 +409,82 @@ msgid "Import complete: %s events successfully send, %s failed"
 msgstr ""
 
 #: addons/argonaut/class_argonautImportFile.inc:177
-#: addons/argonaut/argonaut_import_file.tpl.c:47
 msgid "MAC"
 msgstr ""
 
 #: addons/argonaut/class_argonautImportFile.inc:180
 #: addons/argonaut/deploy-list.xml:14
-#: addons/argonaut/argonaut_import_file.tpl.c:50
 msgid "Event"
 msgstr ""
 
-#: addons/argonaut/class_argonautQueue.inc:35
-#: addons/argonaut/class_argonautQueue.inc:41
+#: addons/argonaut/class_argonautQueue.inc:39
+#: addons/argonaut/class_argonautQueue.inc:45
 msgid "Deployment queue"
 msgstr ""
 
-#: addons/argonaut/class_argonautQueue.inc:36
+#: addons/argonaut/class_argonautQueue.inc:40
 msgid "Provide a mechanism to automatically activate systems"
 msgstr ""
 
-#: addons/argonaut/class_argonautQueue.inc:43
+#: addons/argonaut/class_argonautQueue.inc:47
 #: addons/argonaut/events/eventTargetSystems-list.xml:81
 msgid "Description"
 msgstr "æè¿°"
 
-#: addons/argonaut/class_argonautQueue.inc:141
+#: addons/argonaut/class_argonautQueue.inc:174
 msgid "immediately"
 msgstr ""
 
-#: addons/argonaut/class_argonautQueue.inc:156
+#: addons/argonaut/class_argonautQueue.inc:189
 msgid "Waiting"
 msgstr ""
 
-#: addons/argonaut/class_argonautQueue.inc:159
+#: addons/argonaut/class_argonautQueue.inc:192
 msgid "Show error"
 msgstr ""
 
-#: addons/argonaut/class_argonautQueue.inc:163
+#: addons/argonaut/class_argonautQueue.inc:196
 msgid "Processed"
 msgstr ""
 
-#: addons/argonaut/class_argonautQueue.inc:172
+#: addons/argonaut/class_argonautQueue.inc:205
 msgid "in progress"
 msgstr ""
 
-#: addons/argonaut/class_argonautQueue.inc:180
+#: addons/argonaut/class_argonautQueue.inc:226
 msgid "Permission"
 msgstr "å…è®¸"
 
-#: addons/argonaut/class_argonautQueue.inc:210
+#: addons/argonaut/class_argonautQueue.inc:256
 #: addons/argonaut/events/class_DaemonEvent.inc:258
-#: addons/argonaut/deploy-list.xml:86 addons/argonaut/deploy-list.xml:136
+#: addons/argonaut/deploy-list.xml:106 addons/argonaut/deploy-list.xml:166
 msgid "Remove"
 msgstr "åˆ é™¤"
 
-#: addons/argonaut/class_argonautQueue.inc:211
+#: addons/argonaut/class_argonautQueue.inc:257
 #, php-format
 msgid "The following jobs couldn't be deleted, they have to be aborted: %s"
 msgstr ""
 
-#: addons/argonaut/class_argonautQueue.inc:257
+#: addons/argonaut/class_argonautQueue.inc:304
 msgid "Info"
 msgstr ""
 
-#: addons/argonaut/class_argonautQueue.inc:257
+#: addons/argonaut/class_argonautQueue.inc:304
 #, php-format
 msgid "%s"
 msgstr ""
 
-#: addons/argonaut/class_argonautQueue.inc:261
+#: addons/argonaut/class_argonautQueue.inc:308
 #, php-format
 msgid "Required class '%s' cannot be found: job not aborted!"
 msgstr ""
 
-#: addons/argonaut/class_argonautQueue.inc:293
+#: addons/argonaut/class_argonautQueue.inc:340
 msgid "Error detail"
 msgstr ""
 
-#: addons/argonaut/class_argonautQueue.inc:335
+#: addons/argonaut/class_argonautQueue.inc:398
 #, php-format
 msgid "Cannot update queue entries."
 msgstr ""
@@ -588,17 +559,15 @@ msgid "Winstation"
 msgstr "Windows å·¥ä½œç«™"
 
 #: addons/argonaut/events/eventTargetSystems-list.xml:47
-#: addons/argonaut/argonaut_import_file.tpl.c:53
 msgid "Object group"
 msgstr "å¯¹è±¡ç»„"
 
 #: addons/argonaut/events/eventTargetSystems-list.xml:73
-#: addons/argonaut/events/eventTargetSystems-filter.tpl.c:20
+#: addons/argonaut/deploy-list.xml:36
 msgid "Name"
 msgstr "åç§°"
 
 #: addons/argonaut/events/eventTargetSystems-list.xml:89
-#: addons/argonaut/argonaut_import_file.tpl.c:62
 msgid "IP"
 msgstr ""
 
@@ -611,48 +580,53 @@ msgid "List of queued jobs"
 msgstr ""
 
 #: addons/argonaut/deploy-list.xml:27
-#: addons/argonaut/events/DaemonEvent.tpl.c:17
 msgid "Target"
 msgstr ""
 
-#: addons/argonaut/deploy-list.xml:35
+#: addons/argonaut/deploy-list.xml:45
 msgid "Task"
 msgstr "ä»»åŠ¡"
 
-#: addons/argonaut/deploy-list.xml:43
+#: addons/argonaut/deploy-list.xml:53
 msgid "Period"
 msgstr ""
 
-#: addons/argonaut/deploy-list.xml:51
-#: addons/argonaut/events/DaemonEvent.tpl.c:2
+#: addons/argonaut/deploy-list.xml:61
 msgid "Schedule"
 msgstr ""
 
-#: addons/argonaut/deploy-list.xml:59
-#: addons/argonaut/events/DaemonEvent.tpl.c:11
+#: addons/argonaut/deploy-list.xml:69
 msgid "Status"
 msgstr "çŠ¶æ€"
 
-#: addons/argonaut/deploy-list.xml:67
+#: addons/argonaut/deploy-list.xml:77
 msgid "Actions"
 msgstr "åŠ¨ä½œ"
 
-#: addons/argonaut/deploy-list.xml:97 addons/argonaut/deploy-list.xml:144
+#: addons/argonaut/deploy-list.xml:88
+msgid "Create"
+msgstr "åˆ›å»º"
+
+#: addons/argonaut/deploy-list.xml:117 addons/argonaut/deploy-list.xml:174
 msgid "Abort"
 msgstr ""
 
-#: addons/argonaut/deploy-list.xml:108
+#: addons/argonaut/deploy-list.xml:128
 msgid "Execute"
 msgstr "æ‰§è¡Œ"
 
-#: addons/argonaut/deploy-list.xml:120
+#: addons/argonaut/deploy-list.xml:140
 msgid "Process now"
 msgstr ""
 
-#: addons/argonaut/deploy-list.xml:128
+#: addons/argonaut/deploy-list.xml:148
 msgid "View logs"
 msgstr ""
 
+#: addons/argonaut/deploy-list.xml:157
+msgid "Edit"
+msgstr "ç¼–è¾‘"
+
 #: include/class_supportDaemon.inc:89
 msgid "Multiple argonaut server found. Only one is supported"
 msgstr ""
@@ -670,162 +644,3 @@ msgstr ""
 #, php-format
 msgid "\"%s\" is not a file!"
 msgstr ""
-
-#: addons/argonaut/argonaut_import_file.tpl.c:2
-msgid "Import jobs"
-msgstr ""
-
-#: addons/argonaut/argonaut_import_file.tpl.c:5
-msgid ""
-"You can import a list of jobs into the FusionDirectory job queue. This "
-"should be a semicolon seperated list of items in the following format:"
-msgstr ""
-
-#: addons/argonaut/argonaut_import_file.tpl.c:8
-msgid "timestamp"
-msgstr "æ—¥æœŸ"
-
-#: addons/argonaut/argonaut_import_file.tpl.c:11
-msgid "MAC-address"
-msgstr "MAC åœ°å€"
-
-#: addons/argonaut/argonaut_import_file.tpl.c:14
-msgid "job type"
-msgstr ""
-
-#: addons/argonaut/argonaut_import_file.tpl.c:17
-msgid "object group"
-msgstr ""
-
-#: addons/argonaut/argonaut_import_file.tpl.c:20
-msgid "import base"
-msgstr ""
-
-#: addons/argonaut/argonaut_import_file.tpl.c:23
-msgid "full hostname"
-msgstr ""
-
-#: addons/argonaut/argonaut_import_file.tpl.c:26
-msgid "IP-address"
-msgstr "IP åœ°å€"
-
-#: addons/argonaut/argonaut_import_file.tpl.c:29
-msgid "DHCP group"
-msgstr ""
-
-#: addons/argonaut/argonaut_import_file.tpl.c:32
-msgid "Example"
-msgstr ""
-
-#: addons/argonaut/argonaut_import_file.tpl.c:35
-msgid "Select list to import"
-msgstr ""
-
-#: addons/argonaut/argonaut_import_file.tpl.c:38
-msgid "Browse"
-msgstr "æµè§ˆ"
-
-#: addons/argonaut/argonaut_import_file.tpl.c:41
-msgid "Upload"
-msgstr "ä¸Šä¼ "
-
-#: addons/argonaut/argonaut_import_file.tpl.c:44
-#: addons/argonaut/events/DaemonEvent.tpl.c:20
-msgid "Timestamp"
-msgstr "æ—¥æœŸ"
-
-#: addons/argonaut/argonaut_import_file.tpl.c:56
-msgid "Base"
-msgstr "ä½ç½®"
-
-#: addons/argonaut/argonaut_import_file.tpl.c:59
-msgid "FQDN"
-msgstr ""
-
-#: addons/argonaut/argonaut_import_file.tpl.c:65
-msgid "DHCP"
-msgstr ""
-
-#: addons/argonaut/events/target_list.tpl.c:2
-msgid "Apply"
-msgstr "åº”ç”¨"
-
-#: addons/argonaut/events/target_list.tpl.c:5
-msgid "Cancel"
-msgstr "å–æ¶ˆ"
-
-#: addons/argonaut/events/DaemonEvent.tpl.c:5
-msgid "System list"
-msgstr ""
-
-#: addons/argonaut/events/DaemonEvent.tpl.c:8
-msgid "ID"
-msgstr "ID"
-
-#: addons/argonaut/events/DaemonEvent.tpl.c:14
-msgid "Result"
-msgstr ""
-
-#: addons/argonaut/events/eventTargetSystems-filter.tpl.c:2
-msgid "Filter"
-msgstr "è¿‡æ»¤å™¨"
-
-#: addons/argonaut/events/eventTargetSystems-filter.tpl.c:5
-msgid "Show servers"
-msgstr "æ˜¾ç¤ºæœåŠ¡å™¨"
-
-#: addons/argonaut/events/eventTargetSystems-filter.tpl.c:8
-msgid "Show workstations"
-msgstr "æ˜¾ç¤ºå·¥ä½œç«™"
-
-#: addons/argonaut/events/eventTargetSystems-filter.tpl.c:11
-msgid "Show terminals"
-msgstr "æ˜¾ç¤ºç»ˆç«¯"
-
-#: addons/argonaut/events/eventTargetSystems-filter.tpl.c:14
-msgid "Show winstations"
-msgstr ""
-
-#: addons/argonaut/events/eventTargetSystems-filter.tpl.c:17
-msgid "Filter by IP address range"
-msgstr ""
-
-#: addons/argonaut/events/timestamp_select.tpl.c:2
-msgid "Year"
-msgstr ""
-
-#: addons/argonaut/events/timestamp_select.tpl.c:5
-msgid "Month"
-msgstr ""
-
-#: addons/argonaut/events/timestamp_select.tpl.c:8
-msgid "Day"
-msgstr ""
-
-#: addons/argonaut/events/timestamp_select.tpl.c:11
-msgid "Hour"
-msgstr "å°æ—¶"
-
-#: addons/argonaut/events/timestamp_select.tpl.c:14
-msgid "Minute"
-msgstr ""
-
-#: addons/argonaut/events/timestamp_select.tpl.c:17
-msgid "Second"
-msgstr ""
-
-#: addons/argonaut/events/timestamp_select.tpl.c:20
-msgid "Periodical job"
-msgstr ""
-
-#: addons/argonaut/events/timestamp_select.tpl.c:23
-msgid "Job intervall"
-msgstr ""
-
-#: addons/argonaut/remove.tpl.c:2
-msgid "Warning"
-msgstr "è¦å‘Š"
-
-#: addons/argonaut/remove.tpl.c:5
-msgid "So - if you're sure - press 'Delete' to continue or 'Cancel' to abort."
-msgstr "æ‰€ä»¥ï¼Œå¦‚æžœæ‚¨ç¡®å®šï¼Œè¯·æŒ‰â€œåˆ é™¤â€ç»§ç»ï¼Œå¦åˆ™æŒ‰â€œå–æ¶ˆâ€é€€å‡ºã€‚"
diff --git a/asterisk/locale/ar/fusiondirectory.po b/asterisk/locale/ar/fusiondirectory.po
index 13f85ca23b97dc6209a18202261066fbd7653f9e..dc7828271d230a0e56354059d1110d8c56c49df7 100644
--- a/asterisk/locale/ar/fusiondirectory.po
+++ b/asterisk/locale/ar/fusiondirectory.po
@@ -5,962 +5,124 @@
 # Translators:
 msgid ""
 msgstr ""
-"Project-Id-Version: FusionDirectory-108\n"
+"Project-Id-Version: FusionDirectory-109\n"
 "Report-Msgid-Bugs-To: documentation@lists.fusiondirectory.org\n"
-"POT-Creation-Date: 2015-03-31 11:49+0200\n"
-"PO-Revision-Date: 2015-02-25 16:02+0000\n"
+"POT-Creation-Date: 2014-12-15 17:47+0100\n"
+"PO-Revision-Date: 2015-02-25 16:04+0000\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>\n"
-"Language-Team: Arabic (http://www.transifex.com/projects/p/FusionDirectory-108/language/ar/)\n"
+"Language-Team: Arabic (http://www.transifex.com/projects/p/FusionDirectory-109/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/ogroups/asterisk/class_phonequeue.inc:110
-#: admin/conference/class_phoneConferenceGeneric.inc:104
-#: personal/phoneaccount/class_phoneAccount.inc:148
-msgid "Obsolete entry"
-msgstr ""
-
-#: admin/ogroups/asterisk/class_phonequeue.inc:110
-#: admin/conference/class_phoneConferenceGeneric.inc:104
-#: personal/phoneaccount/class_phoneAccount.inc:148
-#, php-format
-msgid ""
-"The current home server is not available anymore. It will be moved to '%s' "
-"if you save this entry!"
-msgstr ""
-
-#: admin/ogroups/asterisk/class_phonequeue.inc:140
-msgid "ring all"
-msgstr ""
-
-#: admin/ogroups/asterisk/class_phonequeue.inc:141
-msgid "round robin"
-msgstr ""
-
-#: admin/ogroups/asterisk/class_phonequeue.inc:142
-msgid "least recently called"
-msgstr ""
-
-#: admin/ogroups/asterisk/class_phonequeue.inc:143
-msgid "fewest completed calls"
-msgstr ""
-
-#: admin/ogroups/asterisk/class_phonequeue.inc:144
-msgid "random"
-msgstr ""
-
-#: admin/ogroups/asterisk/class_phonequeue.inc:145
-msgid "round robin with memory"
-msgstr ""
-
-#: admin/ogroups/asterisk/class_phonequeue.inc:180
-msgid "Remove the phone queue from this Account"
-msgstr ""
-
-#: admin/ogroups/asterisk/class_phonequeue.inc:181
-#: admin/ogroups/asterisk/class_phonequeue.inc:184
-msgid "phone queue"
-msgstr ""
-
-#: admin/ogroups/asterisk/class_phonequeue.inc:183
-msgid "Create phone queue"
-msgstr ""
-
-#: admin/ogroups/asterisk/class_phonequeue.inc:272
-msgid ""
-"There must be at least one server with an asterisk database to create a "
-"phone queue."
-msgstr ""
-
-#: admin/ogroups/asterisk/class_phonequeue.inc:275
-#: admin/ogroups/asterisk/class_phonequeue.inc:873
-#: admin/conference/class_phoneConferenceGeneric.inc:709
-#: personal/phoneaccount/class_phoneAccount.inc:1350
-#: personal/phoneaccount/class_phoneAccount.inc:1669
-#: admin/ogroups/asterisk/phonequeue.tpl.c:17
-#: admin/conference/generic.tpl.c:20 personal/phoneaccount/generic.tpl.c:11
-msgid "Home server"
-msgstr ""
-
-#: admin/ogroups/asterisk/class_phonequeue.inc:281
-#: admin/ogroups/asterisk/class_phonequeue.inc:871
-#: admin/ogroups/asterisk/phonequeue.tpl.c:23
-msgid "Timeout"
-msgstr ""
-
-#: admin/ogroups/asterisk/class_phonequeue.inc:284
-#: admin/ogroups/asterisk/class_phonequeue.inc:896
-#: admin/ogroups/asterisk/phonequeue.tpl.c:26
-msgid "Retry"
-msgstr ""
-
-#: admin/ogroups/asterisk/class_phonequeue.inc:287
-msgid "Queue length"
-msgstr ""
-
-#: admin/ogroups/asterisk/class_phonequeue.inc:290
-#: admin/ogroups/asterisk/class_phonequeue.inc:874
-#: admin/ogroups/asterisk/phonequeue.tpl.c:35
-msgid "Announce frequency"
-msgstr ""
-
-#: admin/ogroups/asterisk/class_phonequeue.inc:293
-#: admin/conference/class_phoneConferenceGeneric.inc:328
-msgid "Number"
-msgstr ""
-
-#: admin/ogroups/asterisk/class_phonequeue.inc:316
-#: admin/ogroups/asterisk/class_phonequeue.inc:361
-msgid "asterisk"
-msgstr ""
-
-#: admin/ogroups/asterisk/class_phonequeue.inc:345
-#: admin/ogroups/asterisk/class_phonequeue.inc:696
-#: admin/conference/class_phoneConferenceGeneric.inc:369
-#: admin/macro/class_gofonMacro.inc:381 admin/macro/class_gofonMacro.inc:465
-#: addons/fonreports/class_fonreport.inc:190
-#: addons/fonreports/class_fonreport.inc:220
-#: personal/phoneaccount/class_phoneAccount.inc:455
-#: personal/phoneaccount/class_phoneAccount.inc:1061
-msgid "GOfon"
-msgstr ""
-
-#: admin/ogroups/asterisk/class_phonequeue.inc:401
-msgid "Cannot find old queue entry!"
-msgstr ""
-
-#: admin/ogroups/asterisk/class_phonequeue.inc:487
-#, php-format
-msgid ""
-"Found more than one entry named '%s' in queue table. Please inform your "
-"system administrator!"
-msgstr ""
-
-#: admin/ogroups/asterisk/class_phonequeue.inc:728
-#: admin/ogroups/asterisk/class_phonequeue.inc:730
-msgid "telephone number"
-msgstr ""
-
-#: admin/ogroups/asterisk/class_phonequeue.inc:787
-#: admin/ogroups/asterisk/class_phonequeue.inc:829
-#: admin/conference/class_phoneConferenceGeneric.inc:229
-#: admin/conference/class_phoneConferenceGeneric.inc:233
-#: admin/conference/class_phoneConferenceGeneric.inc:271
-#: admin/macro/class_gofonMacro.inc:343 admin/macro/class_gofonMacro.inc:452
-#: admin/macro/class_gofonMacro.inc:461 admin/macro/class_gofonMacro.inc:499
-#: admin/systems/asterisk/class_phoneGeneric.inc:267
-#: admin/systems/asterisk/class_phoneGeneric.inc:308
-#: addons/fonreports/class_fonreport.inc:220
-#: personal/phoneaccount/class_phoneAccount.inc:1046
-#: personal/phoneaccount/class_phoneAccount.inc:1166
-#: personal/phoneaccount/class_phoneAccount.inc:1172
-#: personal/phoneaccount/class_phoneAccount.inc:1368
-#: personal/phoneaccount/class_phoneAccount.inc:1450
-#: personal/phoneaccount/class_phoneAccount.inc:1528
-msgid "Error"
-msgstr "Ø®Ø·Ø£"
-
-#: admin/ogroups/asterisk/class_phonequeue.inc:802
-#: admin/ogroups/asterisk/class_phonequeue.inc:857
-#: admin/conference/class_phoneConferenceGeneric.inc:682
-#: admin/macro/class_gofonMacro.inc:473 admin/macro/class_gofonMacro.inc:484
-#: admin/macro/class_gofonMacro.inc:521
-#: admin/macro/class_gofonMacroParameters.inc:435
-#: admin/systems/asterisk/class_phoneGeneric.inc:277
-#: admin/systems/asterisk/class_phoneGeneric.inc:432
-#: admin/systems/asterisk/class_phoneGeneric.inc:446
-#: admin/systems/asterisk/class_phoneGeneric.inc:463
-#: admin/systems/services/asterisk/class_serviceAsterisk.inc:121
-#: personal/phoneaccount/class_phoneAccount.inc:1476
-#: personal/phoneaccount/class_phoneAccount.inc:1609
-msgid "LDAP error"
-msgstr ""
-
-#: admin/ogroups/asterisk/class_phonequeue.inc:864
-#: admin/systems/asterisk/class_phoneGeneric.inc:472
-#: admin/systems/asterisk/class_phoneGeneric.inc:477
-#: personal/phoneaccount/class_phoneAccount.inc:999
-#: personal/phoneaccount/class_phoneAccount.inc:1012
-#: personal/phoneaccount/class_phoneAccount.inc:1024
-#: personal/phoneaccount/class_phoneAccount.inc:1028
-#: personal/phoneaccount/class_phoneAccount.inc:1031
-#: personal/phoneaccount/class_phoneAccount.inc:1657
-msgid "Phone"
-msgstr "Ø§Ù„Ù‡Ø§ØªÙ"
-
-#: admin/ogroups/asterisk/class_phonequeue.inc:865
-msgid "Phone group"
-msgstr ""
-
-#: admin/ogroups/asterisk/class_phonequeue.inc:872
-#: admin/ogroups/asterisk/phonequeue.tpl.c:32
-msgid "Max queue length"
-msgstr ""
-
-#: admin/ogroups/asterisk/class_phonequeue.inc:875
-#: admin/ogroups/asterisk/phonequeue.tpl.c:86
-msgid "Allow the called user to transfer his call"
-msgstr ""
-
-#: admin/ogroups/asterisk/class_phonequeue.inc:876
-#: admin/ogroups/asterisk/phonequeue.tpl.c:89
-msgid "Allows calling user to transfer call"
-msgstr ""
-
-#: admin/ogroups/asterisk/class_phonequeue.inc:877
-#: admin/ogroups/asterisk/phonequeue.tpl.c:92
-msgid "Allow the called to hangup by pressing *"
-msgstr ""
-
-#: admin/ogroups/asterisk/class_phonequeue.inc:878
-#: admin/ogroups/asterisk/phonequeue.tpl.c:98
-msgid "Ring instead of playing background music"
-msgstr ""
-
-#: admin/ogroups/asterisk/class_phonequeue.inc:879
-#: admin/ogroups/asterisk/phonequeue.tpl.c:95
-msgid "Allows calling to hangup by pressing *"
-msgstr ""
-
-#: admin/ogroups/asterisk/class_phonequeue.inc:881
-#: admin/ogroups/asterisk/phonequeue.tpl.c:47
-msgid "Music on hold"
-msgstr ""
-
-#: admin/ogroups/asterisk/class_phonequeue.inc:882
-msgid "Welcome music"
-msgstr ""
-
-#: admin/ogroups/asterisk/class_phonequeue.inc:883
-msgid "Report hold time"
-msgstr ""
-
-#: admin/ogroups/asterisk/class_phonequeue.inc:884
-msgid "'You are next' sound"
-msgstr ""
-
-#: admin/ogroups/asterisk/class_phonequeue.inc:885
-msgid "'There are' sound"
-msgstr ""
-
-#: admin/ogroups/asterisk/class_phonequeue.inc:886
-msgid "'Call waiting' sound"
-msgstr ""
-
-#: admin/ogroups/asterisk/class_phonequeue.inc:887
-msgid "'Thank you' sound"
-msgstr ""
-
-#: admin/ogroups/asterisk/class_phonequeue.inc:888
-msgid "'Minutes' sound"
-msgstr ""
-
-#: admin/ogroups/asterisk/class_phonequeue.inc:889
-msgid "'Seconds' sound"
-msgstr ""
-
-#: admin/ogroups/asterisk/class_phonequeue.inc:890
-msgid "'Less than' sound"
-msgstr ""
-
-#: admin/ogroups/asterisk/class_phonequeue.inc:891
-msgid "Queue phone number"
-msgstr ""
-
-#: admin/ogroups/asterisk/class_phonequeue.inc:892
-#: admin/conference/class_phoneConferenceGeneric.inc:707
-#: admin/ogroups/asterisk/phonequeue.tpl.c:20
-#: admin/conference/generic.tpl.c:23
-msgid "Language"
-msgstr ""
-
-#: admin/ogroups/asterisk/class_phonequeue.inc:893
-msgid "Method"
-msgstr ""
-
-#: admin/ogroups/asterisk/class_phonequeue.inc:894
-#: admin/ogroups/asterisk/phonequeue.tpl.c:83
-msgid "Announce holdtime"
-msgstr ""
-
-#: admin/ogroups/asterisk/class_phonequeue.inc:895
-msgid "Announce"
-msgstr ""
-
-#: admin/conference/conf-list.xml:11
-msgid "List of conference rooms"
-msgstr ""
-
-#: admin/conference/conf-list.xml:15 admin/conference/conf-list.xml:74
-msgid "Conference"
-msgstr ""
-
-#: admin/conference/conf-list.xml:41
-#: admin/conference/class_phoneConferenceGeneric.inc:324
-#: admin/conference/class_phoneConferenceGeneric.inc:347
-#: admin/conference/class_phoneConferenceGeneric.inc:702
-#: admin/macro/class_gofonMacro.inc:395 admin/macro/class_gofonMacro.inc:406
-#: admin/macro/macro-list.xml:41
-#: admin/systems/asterisk/class_phoneGeneric.inc:344
-#: admin/systems/asterisk/class_phoneGeneric.inc:348
-#: admin/systems/asterisk/class_phoneGeneric.inc:351
-#: admin/systems/asterisk/class_phoneGeneric.inc:366
-#: admin/systems/asterisk/class_phoneGeneric.inc:482
-#: admin/conference/conf-filter.tpl.c:5 admin/macro/macro-filter.tpl.c:5
-#: admin/macro/parameter.tpl.c:5
-msgid "Name"
-msgstr "Ø§Ù„Ø¥Ø³Ù…"
-
-#: admin/conference/conf-list.xml:49
-#: admin/conference/class_phoneConferenceGeneric.inc:704
-#: admin/macro/class_gofonMacro.inc:547 admin/macro/macro-list.xml:49
-#: admin/systems/asterisk/class_phoneGeneric.inc:484
-#: admin/conference/generic.tpl.c:29 admin/macro/generic.tpl.c:17
-#: admin/systems/asterisk/phone.tpl.c:8
-msgid "Description"
-msgstr "Ø§Ù„ÙˆØµÙ"
-
-#: admin/conference/conf-list.xml:57 admin/macro/macro-list.xml:57
-msgid "Actions"
-msgstr ""
-
-#: admin/conference/conf-list.xml:68 admin/macro/macro-list.xml:68
-msgid "Create"
-msgstr ""
-
-#: admin/conference/conf-list.xml:86 admin/conference/conf-list.xml:125
-#: admin/macro/macro-list.xml:86 admin/macro/macro-list.xml:125
-msgid "Edit"
-msgstr ""
-
-#: admin/conference/conf-list.xml:93 admin/conference/conf-list.xml:138
-#: admin/macro/macro-list.xml:93 admin/macro/macro-list.xml:138
-msgid "Remove"
-msgstr "Ø¥Ø²Ø§Ù„Ø©"
-
-#: admin/conference/class_phoneConferenceGeneric.inc:233
-#, php-format
-msgid "Cannot delete entry from server '%s' because it seems to be removed!"
-msgstr ""
-
-#: admin/conference/class_phoneConferenceGeneric.inc:308
-#, php-format
-msgid ""
-"The previously selected asterisk home server '%s' is no longer available!"
-msgstr ""
-
-#: admin/conference/class_phoneConferenceGeneric.inc:315
-#: admin/conference/generic.tpl.c:47
-msgid "PIN"
-msgstr ""
-
-#: admin/conference/class_phoneConferenceGeneric.inc:333
-#: admin/conference/class_phoneConferenceGeneric.inc:719
-msgid "Lifetime"
-msgstr ""
-
-#: admin/conference/class_phoneConferenceGeneric.inc:399
-#: personal/phoneaccount/class_phoneAccount.inc:346
-#: personal/phoneaccount/class_phoneAccount.inc:359
-#: personal/phoneaccount/class_phoneAccount.inc:617
-#: personal/phoneaccount/class_phoneAccount.inc:656
-#: personal/phoneaccount/class_phoneAccount.inc:1519
-#: personal/phoneaccount/class_phoneAccount.inc:1695
-#: admin/conference/remove.tpl.c:2 admin/macro/remove.tpl.c:2
-msgid "Warning"
-msgstr "ØªØØ°ÙŠØ±"
-
-#: admin/conference/class_phoneConferenceGeneric.inc:400
-#, php-format
-msgid ""
-"FusionDirectory identified problems with your MySQL table definition, please"
-" activate debugging for details."
-msgstr ""
-
-#: admin/conference/class_phoneConferenceGeneric.inc:606
-#: admin/conference/class_phoneConferenceGeneric.inc:608
-#, php-format
-msgid "'%s' is already assigned to '%s'!"
-msgstr ""
-
-#: admin/conference/class_phoneConferenceGeneric.inc:693
-msgid "Phone Conference"
-msgstr ""
-
-#: admin/conference/class_phoneConferenceGeneric.inc:694
-msgid "Phone conference management"
-msgstr ""
-
-#: admin/conference/class_phoneConferenceGeneric.inc:696
-msgid "GOfon conference"
-msgstr ""
-
-#: admin/conference/class_phoneConferenceGeneric.inc:698
-msgid "Asterisk conference"
-msgstr ""
-
-#: admin/conference/class_phoneConferenceGeneric.inc:703
-#: admin/macro/class_gofonMacro.inc:546
-#: admin/systems/asterisk/class_phoneGeneric.inc:483
-#: admin/conference/generic.tpl.c:17 admin/macro/generic.tpl.c:14
-#: admin/systems/asterisk/phone.tpl.c:5
-msgid "Base"
-msgstr ""
-
-#: admin/conference/class_phoneConferenceGeneric.inc:705
-msgid "Conference PIN"
-msgstr ""
-
-#: admin/conference/class_phoneConferenceGeneric.inc:710
-#: admin/conference/generic.tpl.c:44
-msgid "Preset PIN"
-msgstr ""
-
-#: admin/conference/class_phoneConferenceGeneric.inc:711
-#: admin/conference/generic.tpl.c:50
-msgid "Record conference"
-msgstr ""
-
-#: admin/conference/class_phoneConferenceGeneric.inc:712
-#: admin/conference/generic.tpl.c:59
-msgid "Play music on hold"
-msgstr ""
-
-#: admin/conference/class_phoneConferenceGeneric.inc:713
-msgid "Activate menu"
-msgstr ""
-
-#: admin/conference/class_phoneConferenceGeneric.inc:714
-msgid "Announce user activity"
-msgstr ""
-
-#: admin/conference/class_phoneConferenceGeneric.inc:715
-msgid "Count user"
-msgstr ""
-
-#: admin/conference/class_phoneConferenceGeneric.inc:716
-msgid "Conference type"
-msgstr ""
-
-#: admin/conference/class_phoneConferenceGeneric.inc:718
-msgid "Format"
-msgstr ""
-
-#: admin/conference/class_phoneConferenceGeneric.inc:720
-#: personal/phoneaccount/class_phoneAccount.inc:1666
-msgid "Telephone number"
-msgstr ""
-
-#: admin/conference/class_phoneConferenceGeneric.inc:721
-msgid "Owner"
-msgstr ""
-
-#: admin/conference/class_phoneConferenceManagment.inc:36
-msgid "Phone Conferences"
-msgstr ""
-
-#: admin/conference/class_phoneConferenceManagment.inc:37
-msgid "Phone Conference management"
-msgstr ""
-
-#: admin/macro/class_gofonMacro.inc:202
-#, php-format
-msgid ""
-"Macro could not be removed from server '%s', please check database "
-"consistency!"
-msgstr ""
-
-#: admin/macro/class_gofonMacro.inc:264
-#, php-format
-msgid "Application missing in line %s!"
-msgstr ""
-
-#: admin/macro/class_gofonMacro.inc:267
-#, php-format
-msgid "Priority missing in line %s!"
-msgstr ""
-
-#: admin/macro/class_gofonMacro.inc:271
-#, php-format
-msgid "Extension missing in line %s!"
-msgstr ""
-
-#: admin/macro/class_gofonMacro.inc:281
-#, php-format
-msgid "Duplicate combination of 'extension' and 'priority' in line %s!"
-msgstr ""
-
-#: admin/macro/class_gofonMacro.inc:317
-#, php-format
-msgid ""
-"Macro could not be added to server '%s', please check database consistency!"
-msgstr ""
-
-#: admin/macro/class_gofonMacro.inc:410
-msgid "Name can be 20 characters at maximum!"
-msgstr ""
-
-#: admin/macro/class_gofonMacro.inc:419
-msgid "Macro is still in use!"
-msgstr ""
-
-#: admin/macro/class_gofonMacro.inc:426
-msgid "Macro is empty!"
-msgstr ""
-
-#: admin/macro/class_gofonMacro.inc:452
-#: admin/systems/asterisk/class_phoneGeneric.inc:267
-#, php-format
-msgid "Cannot delete entry because it is still in use by '%s'!"
-msgstr ""
-
-#: admin/macro/class_gofonMacro.inc:465
-#: addons/fonreports/class_fonreport.inc:190
-#: personal/phoneaccount/class_phoneAccount.inc:455
-#: personal/phoneaccount/class_phoneAccount.inc:1061
-#: personal/phoneaccount/class_phoneAccount.inc:1567
-msgid "Configuration error"
-msgstr ""
-
-#: admin/macro/class_gofonMacro.inc:536 admin/macro/class_gofonMacro.inc:541
-msgid "Asterisk macro"
-msgstr ""
-
-#: admin/macro/class_gofonMacro.inc:537
-msgid "Asterisk macro management"
-msgstr ""
-
-#: admin/macro/class_gofonMacro.inc:539
-msgid "GOfon macro"
-msgstr ""
-
-#: admin/macro/class_gofonMacro.inc:545 admin/macro/generic.tpl.c:2
-#: admin/macro/generic.tpl.c:5 admin/macro/paste_generic.tpl.c:2
-#: admin/macro/paste_generic.tpl.c:5
-msgid "Macro name"
-msgstr ""
-
-#: admin/macro/class_gofonMacro.inc:548 admin/macro/generic.tpl.c:8
-msgid "Display name"
-msgstr ""
-
-#: admin/macro/class_gofonMacro.inc:549
-msgid "Macro content and parameter"
-msgstr ""
-
-#: admin/macro/class_gofonMacro.inc:550
-msgid "Visibility flag"
-msgstr ""
-
-#: admin/macro/class_gofonMacroManagement.inc:36
-msgid "Phone Macros"
-msgstr ""
-
-#: admin/macro/class_gofonMacroManagement.inc:37
-msgid "Phone Macros management"
-msgstr ""
-
-#: admin/macro/macro-list.xml:11
-msgid "List of macros"
-msgstr ""
-
-#: admin/macro/macro-list.xml:15 admin/macro/macro-list.xml:74
-msgid "Macro"
-msgstr ""
-
-#: admin/macro/class_gofonMacroParameters.inc:58
-msgid "Parameter"
-msgstr ""
-
-#: admin/macro/class_gofonMacroParameters.inc:59
-msgid "Asterisk macro parameter"
-msgstr ""
-
-#: admin/macro/class_gofonMacroParameters.inc:234
-#: personal/phoneaccount/generic.tpl.c:35
-msgid "Phone macro"
-msgstr ""
-
-#: admin/macro/class_gofonMacroParameters.inc:290
-msgid "String"
-msgstr ""
-
-#: admin/macro/class_gofonMacroParameters.inc:291
-msgid "Combobox"
-msgstr ""
-
-#: admin/macro/class_gofonMacroParameters.inc:292
-msgid "Bool"
-msgstr ""
-
-#: admin/macro/class_gofonMacroParameters.inc:298
-msgid "Delete unused"
-msgstr ""
-
-#: admin/macro/class_gofonMacroParameters.inc:374
-#, php-format
-msgid "Parameter %s contains invalid character. '!,#' is used as delimiter!"
-msgstr ""
-
-#: admin/macro/class_gofonMacroParameters.inc:379
-#, php-format
-msgid "Parameter %s is invalid!"
-msgstr ""
-
-#: admin/macro/class_gofonMacroParameters.inc:408
-#: personal/phoneaccount/class_phoneAccount.inc:1600
-msgid "Information"
-msgstr "Ù…Ø¹Ù„ÙˆÙ…Ø§Øª"
-
-#: admin/macro/class_gofonMacroParameters.inc:408
-msgid ""
-"Number of parameters for this macro has changed. Please update all users "
-"using it!"
-msgstr ""
-
-#: admin/systems/asterisk/class_phoneGeneric.inc:151
-msgid "phone"
-msgstr ""
-
-#: admin/systems/asterisk/class_phoneGeneric.inc:230
-msgid "yes"
-msgstr ""
-
-#: admin/systems/asterisk/class_phoneGeneric.inc:230
-msgid "no"
-msgstr ""
-
-#: admin/systems/asterisk/class_phoneGeneric.inc:247
-msgid "dynamic"
-msgstr ""
-
-#: admin/systems/asterisk/class_phoneGeneric.inc:247
-msgid "Networksettings"
-msgstr ""
-
-#: admin/systems/asterisk/class_phoneGeneric.inc:330
-#: admin/systems/asterisk/class_phoneGeneric.inc:333
-msgid "IP address"
-msgstr ""
-
-#: admin/systems/asterisk/class_phoneGeneric.inc:473
-msgid "Phone information"
-msgstr ""
-
-#: admin/systems/asterisk/class_phoneGeneric.inc:476
-#: personal/phoneaccount/class_phoneAccount.inc:1668
-msgid "Phone hardware"
-msgstr ""
-
-#: admin/systems/asterisk/class_phoneGeneric.inc:485
-msgid "SIP Mode"
-msgstr ""
-
-#: admin/systems/asterisk/class_phoneGeneric.inc:486
-msgid "SIP DTMF mode"
-msgstr ""
-
-#: admin/systems/asterisk/class_phoneGeneric.inc:487
-msgid "SIP Default ip"
-msgstr ""
-
-#: admin/systems/asterisk/class_phoneGeneric.inc:488
-msgid "SIP Qualify"
-msgstr ""
-
-#: admin/systems/asterisk/class_phoneGeneric.inc:489
-msgid "IAX authentication type"
-msgstr ""
-
-#: admin/systems/asterisk/class_phoneGeneric.inc:490
-msgid "IAX secret"
-msgstr ""
-
-#: admin/systems/asterisk/class_phoneGeneric.inc:491
-msgid "IAX account code"
-msgstr ""
-
-#: admin/systems/asterisk/class_phoneGeneric.inc:492
-msgid "IAX trunk lines"
-msgstr ""
-
-#: admin/systems/asterisk/class_phoneGeneric.inc:493
-msgid "IAX permit settings"
-msgstr ""
-
-#: admin/systems/asterisk/class_phoneGeneric.inc:494
-msgid "IAX deny settings"
-msgstr ""
-
-#: admin/systems/asterisk/class_phoneGeneric.inc:495
-msgid "CAPI MSN"
-msgstr ""
-
-#: admin/systems/asterisk/class_phoneGeneric.inc:496
-msgid "Hardware type"
-msgstr ""
-
-#: admin/systems/services/asterisk/class_serviceAsterisk.inc:35
-msgid "VoIP database information"
-msgstr ""
-
-#: admin/systems/services/asterisk/class_serviceAsterisk.inc:38
-msgid "Asterisk DB user"
-msgstr ""
-
-#: admin/systems/services/asterisk/class_serviceAsterisk.inc:38
-msgid "Login for asterisk database administrator"
-msgstr ""
-
-#: admin/systems/services/asterisk/class_serviceAsterisk.inc:42
-msgid "Password"
-msgstr ""
-
-#: admin/systems/services/asterisk/class_serviceAsterisk.inc:42
-msgid "Password for asterisk database administrator"
-msgstr ""
-
-#: admin/systems/services/asterisk/class_serviceAsterisk.inc:46
-msgid "Country dial prefix"
-msgstr ""
-
-#: admin/systems/services/asterisk/class_serviceAsterisk.inc:50
-msgid "Local dial prefix"
-msgstr ""
-
-#: admin/systems/services/asterisk/class_serviceAsterisk.inc:54
-msgid "Driver"
-msgstr ""
-
-#: admin/systems/services/asterisk/class_serviceAsterisk.inc:54
-msgid "Driver to use to contact this database."
-msgstr ""
-
-#: admin/systems/services/asterisk/class_serviceAsterisk.inc:95
-#, php-format
-msgid ""
-"You can't remove the asterisk database extension, it is still in use by "
-"these objects '%s'."
-msgstr ""
-
-#: admin/systems/services/asterisk/class_serviceAsterisk.inc:140
-msgid "VoIP service (asterisk)"
-msgstr ""
-
-#: admin/systems/services/asterisk/class_serviceAsterisk.inc:141
-msgid "VoIP - asterisk management"
-msgstr ""
-
-#: admin/systems/services/asterisk/class_serviceAsterisk.inc:141
-msgid "Services"
-msgstr "Ø®Ø¯Ù…Ø§Øª"
-
-#: addons/fonreports/class_fonreport.inc:232
-msgid "Insufficient permissions"
-msgstr ""
-
-#: addons/fonreports/class_fonreport.inc:251
-msgid "Y-M-D"
-msgstr ""
-
-#: addons/fonreports/class_fonreport.inc:418
-#: addons/fonreports/class_fonreport.inc:419
-#: addons/fonreports/class_fonreport.inc:424 addons/fonreports/main.inc:46
-msgid "Phone reports"
-msgstr ""
-
-#: addons/fonreports/class_fonreport.inc:419
-msgid "All entries are readonly"
-msgstr ""
-
-#: addons/fonreports/class_fonreport.inc:428
-#: addons/fonreports/contents.tpl.c:32
-msgid "Date"
-msgstr ""
-
-#: addons/fonreports/class_fonreport.inc:429
-#: addons/fonreports/contents.tpl.c:35
-msgid "Source"
-msgstr ""
-
-#: addons/fonreports/class_fonreport.inc:430
-#: addons/fonreports/contents.tpl.c:38
-msgid "Destination"
-msgstr ""
-
-#: addons/fonreports/class_fonreport.inc:431
-#: addons/fonreports/contents.tpl.c:41
-msgid "Channel"
-msgstr ""
-
-#: addons/fonreports/class_fonreport.inc:432
-msgid "Application called"
-msgstr ""
-
-#: addons/fonreports/class_fonreport.inc:433
-msgid "Disposition"
-msgstr ""
-
-#: addons/fonreports/class_fonreport.inc:434
-#: addons/fonreports/contents.tpl.c:50
-msgid "Duration"
-msgstr ""
-
-#: personal/phoneaccount/class_phoneAccount.inc:176
-msgid "automatic"
-msgstr "ØªÙ„Ù‚Ø§Ø¦ÙŠ"
-
-#: personal/phoneaccount/class_phoneAccount.inc:212
-msgid "no macro"
-msgstr ""
-
-#: personal/phoneaccount/class_phoneAccount.inc:240
-msgid "undefined"
-msgstr ""
-
-#: personal/phoneaccount/class_phoneAccount.inc:359
-#, php-format
-msgid ""
-"Cannot identify telephone extension in database, please try to save again."
-msgstr ""
-
-#: personal/phoneaccount/class_phoneAccount.inc:577
-#: personal/phoneaccount/class_phoneAccount.inc:595
-msgid "Abort saving entries to keep the database consistent."
-msgstr ""
+#: admin/systems/asterisk/class_phoneIAX.inc:30
+#: admin/systems/asterisk/class_phoneIAX.inc:34
+#: personal/asterisk/class_asteriskAccount.inc:45
+msgid "Phone"
+msgstr "Ø§Ù„Ù‡Ø§ØªÙ"
 
-#: personal/phoneaccount/class_phoneAccount.inc:618
-#: personal/phoneaccount/class_phoneAccount.inc:657
-#: personal/phoneaccount/class_phoneAccount.inc:1520
-#, php-format
-msgid ""
-"FusionDirectory identified problems with your database table definition!"
+#: admin/systems/asterisk/class_phoneIAX.inc:31
+msgid "Asterisk phone"
 msgstr ""
 
-#: personal/phoneaccount/class_phoneAccount.inc:1023
-msgid "Remove phone account"
+#: admin/systems/asterisk/class_phoneIAX.inc:33
+msgid "Phone hardware"
 msgstr ""
 
-#: personal/phoneaccount/class_phoneAccount.inc:1027
-#: personal/phoneaccount/class_phoneAccount.inc:1030
-msgid "Create phone account"
+#: admin/systems/asterisk/class_phoneIAX.inc:46
+#: personal/asterisk/class_asteriskAccount.inc:42
+msgid "Telephone"
 msgstr ""
 
-#: personal/phoneaccount/class_phoneAccount.inc:1028
-msgid "User uid"
-msgstr ""
+#: admin/systems/asterisk/class_phoneIAX.inc:49
+msgid "Name"
+msgstr "Ø§Ù„Ø¥Ø³Ù…"
 
-#: personal/phoneaccount/class_phoneAccount.inc:1046
-msgid "Selected macro is not available anymore!"
+#: admin/systems/asterisk/class_phoneIAX.inc:49
+msgid "Name of this phone"
 msgstr ""
 
-#: personal/phoneaccount/class_phoneAccount.inc:1221
-msgid "Choose your private phone"
+#: admin/systems/asterisk/class_phoneIAX.inc:53
+msgid "Account name"
 msgstr ""
 
-#: personal/phoneaccount/class_phoneAccount.inc:1346
-msgid ""
-"There must be at least one server with an asterisk database to create a "
-"phone account."
+#: admin/systems/asterisk/class_phoneIAX.inc:53
+msgid "Name of the account"
 msgstr ""
 
-#: personal/phoneaccount/class_phoneAccount.inc:1354
-#: personal/phoneaccount/class_phoneAccount.inc:1357
-#: personal/phoneaccount/generic.tpl.c:29
-#: personal/phoneaccount/paste_generic.tpl.c:11
-msgid "Voicemail PIN"
+#: admin/systems/services/asterisk/class_serviceAsterisk.inc:35
+msgid "VoIP database information"
 msgstr ""
 
-#: personal/phoneaccount/class_phoneAccount.inc:1354
-msgid "Between 1-4 charactes"
+#: admin/systems/services/asterisk/class_serviceAsterisk.inc:38
+msgid "Asterisk DB user"
 msgstr ""
 
-#: personal/phoneaccount/class_phoneAccount.inc:1362
-#: personal/phoneaccount/generic.tpl.c:32
-#: personal/phoneaccount/paste_generic.tpl.c:14
-msgid "Phone PIN"
+#: admin/systems/services/asterisk/class_serviceAsterisk.inc:38
+msgid "Login for asterisk database administrator"
 msgstr ""
 
-#: personal/phoneaccount/class_phoneAccount.inc:1394
-#: admin/conference/generic.tpl.c:38 admin/conference/paste_generic.tpl.c:8
-msgid "Phone number"
+#: admin/systems/services/asterisk/class_serviceAsterisk.inc:42
+msgid "Password"
 msgstr ""
 
-#: personal/phoneaccount/class_phoneAccount.inc:1402
-#, php-format
-msgid "macro parameter %s"
+#: admin/systems/services/asterisk/class_serviceAsterisk.inc:42
+msgid "Password for asterisk database administrator"
 msgstr ""
 
-#: personal/phoneaccount/class_phoneAccount.inc:1450
-msgid "An error occured while updating the database entries!"
+#: admin/systems/services/asterisk/class_serviceAsterisk.inc:46
+msgid "Country dial prefix"
 msgstr ""
 
-#: personal/phoneaccount/class_phoneAccount.inc:1567
-msgid "Was not able to found any asterisk server"
+#: admin/systems/services/asterisk/class_serviceAsterisk.inc:50
+msgid "Local dial prefix"
 msgstr ""
 
-#: personal/phoneaccount/class_phoneAccount.inc:1600
-#, php-format
-msgid "User '%s' has been removed from phone queue '%s'."
+#: admin/systems/services/asterisk/class_serviceAsterisk.inc:54
+msgid "Driver"
 msgstr ""
 
-#: personal/phoneaccount/class_phoneAccount.inc:1637
-#: personal/phoneaccount/class_phoneAccount.inc:1639
-#, php-format
-msgid "The specified telephonenumber '%s' is already assigned to '%s'."
+#: admin/systems/services/asterisk/class_serviceAsterisk.inc:54
+msgid "Driver to use to contact this database."
 msgstr ""
 
-#: personal/phoneaccount/class_phoneAccount.inc:1649
+#: admin/systems/services/asterisk/class_serviceAsterisk.inc:95
 #, php-format
 msgid ""
-"The previously selected asterisk home server (%s) is no longer available. "
-"Remove aborted."
-msgstr ""
-
-#: personal/phoneaccount/class_phoneAccount.inc:1658
-msgid "Phone account settings"
-msgstr ""
-
-#: personal/phoneaccount/class_phoneAccount.inc:1667
-msgid "Macro settings"
-msgstr ""
-
-#: personal/phoneaccount/class_phoneAccount.inc:1670
-msgid "Phone context"
+"You can't remove the asterisk database extension, it is still in use by "
+"these objects '%s'."
 msgstr ""
 
-#: personal/phoneaccount/class_phoneAccount.inc:1671
-msgid "Voice mail context"
+#: admin/systems/services/asterisk/class_serviceAsterisk.inc:121
+msgid "LDAP error"
 msgstr ""
 
-#: personal/phoneaccount/class_phoneAccount.inc:1672
-msgid "Telephone pin"
+#: admin/systems/services/asterisk/class_serviceAsterisk.inc:140
+msgid "VoIP service (asterisk)"
 msgstr ""
 
-#: personal/phoneaccount/class_phoneAccount.inc:1673
-msgid "Voicemail pin"
+#: admin/systems/services/asterisk/class_serviceAsterisk.inc:141
+msgid "VoIP - asterisk management"
 msgstr ""
 
-#: personal/phoneaccount/class_phoneAccount.inc:1695
-#, php-format
-msgid "You need to configure %s contexts first"
-msgstr ""
+#: admin/systems/services/asterisk/class_serviceAsterisk.inc:141
+msgid "Services"
+msgstr "Ø®Ø¯Ù…Ø§Øª"
 
-#: personal/phoneaccount/main.inc:124
-msgid "Click the 'Edit' button below to change informations in this dialog"
+#: personal/asterisk/class_asteriskAccount.inc:30
+#: config/asterisk/class_asteriskPluginConfig.inc:28
+#: config/asterisk/class_asteriskPluginConfig.inc:41
+msgid "Asterisk"
 msgstr ""
 
-#: personal/phoneaccount/main.inc:134
-#: personal/phoneaccount/paste_generic.tpl.c:2
-msgid "Phone settings"
+#: personal/asterisk/class_asteriskAccount.inc:31
+msgid "Asterisk account"
 msgstr ""
 
-#: config/asterisk/class_asteriskPluginConfig.inc:28
-#: config/asterisk/class_asteriskPluginConfig.inc:41
-msgid "Asterisk"
+#: personal/asterisk/class_asteriskAccount.inc:45
+msgid "Select the phone associated to this user"
 msgstr ""
 
 #: config/asterisk/class_asteriskPluginConfig.inc:29
@@ -1010,338 +172,3 @@ msgstr ""
 #: config/asterisk/class_asteriskPluginConfig.inc:72
 msgid "Available voicemail contexts"
 msgstr ""
-
-#: admin/ogroups/asterisk/phonequeue.tpl.c:2
-msgid ""
-"Only users with the same asterisk home server will be included to this "
-"queue."
-msgstr ""
-
-#: admin/ogroups/asterisk/phonequeue.tpl.c:5
-#: personal/phoneaccount/generic.tpl.c:2
-#: personal/phoneaccount/paste_generic.tpl.c:5
-msgid "Phone numbers"
-msgstr ""
-
-#: admin/ogroups/asterisk/phonequeue.tpl.c:8
-msgid "Up"
-msgstr ""
-
-#: admin/ogroups/asterisk/phonequeue.tpl.c:11
-msgid "Down"
-msgstr ""
-
-#: admin/ogroups/asterisk/phonequeue.tpl.c:14
-#: admin/conference/generic.tpl.c:41
-msgid "Options"
-msgstr ""
-
-#: admin/ogroups/asterisk/phonequeue.tpl.c:29
-msgid "Strategy"
-msgstr ""
-
-#: admin/ogroups/asterisk/phonequeue.tpl.c:38
-msgid "(in seconds)"
-msgstr ""
-
-#: admin/ogroups/asterisk/phonequeue.tpl.c:41
-msgid "Queue sound setup"
-msgstr ""
-
-#: admin/ogroups/asterisk/phonequeue.tpl.c:44
-msgid "Use music on hold instead of ringing"
-msgstr ""
-
-#: admin/ogroups/asterisk/phonequeue.tpl.c:50
-msgid "Welcome sound file"
-msgstr ""
-
-#: admin/ogroups/asterisk/phonequeue.tpl.c:53
-msgid "Announce message"
-msgstr ""
-
-#: admin/ogroups/asterisk/phonequeue.tpl.c:56
-msgid "Sound file for 'You are next ...'"
-msgstr ""
-
-#: admin/ogroups/asterisk/phonequeue.tpl.c:59
-msgid "'There are ...'"
-msgstr ""
-
-#: admin/ogroups/asterisk/phonequeue.tpl.c:62
-msgid "'... calls waiting'"
-msgstr ""
-
-#: admin/ogroups/asterisk/phonequeue.tpl.c:65
-msgid "'Thank you' message"
-msgstr ""
-
-#: admin/ogroups/asterisk/phonequeue.tpl.c:68
-msgid "'minutes' sound file"
-msgstr ""
-
-#: admin/ogroups/asterisk/phonequeue.tpl.c:71
-msgid "'seconds' sound file"
-msgstr ""
-
-#: admin/ogroups/asterisk/phonequeue.tpl.c:74
-msgid "Hold sound file"
-msgstr ""
-
-#: admin/ogroups/asterisk/phonequeue.tpl.c:77
-msgid "Less Than sound file"
-msgstr ""
-
-#: admin/ogroups/asterisk/phonequeue.tpl.c:80
-msgid "Phone attributes "
-msgstr ""
-
-#: admin/conference/conf-filter.tpl.c:2 admin/macro/macro-filter.tpl.c:2
-#: addons/fonreports/contents.tpl.c:2
-msgid "Filter"
-msgstr ""
-
-#: admin/conference/generic.tpl.c:2
-msgid "Properties"
-msgstr "Ø§Ù„Ø®ÙˆØ§Øµ"
-
-#: admin/conference/generic.tpl.c:5 admin/conference/paste_generic.tpl.c:2
-msgid "Conference name"
-msgstr ""
-
-#: admin/conference/generic.tpl.c:8 admin/conference/paste_generic.tpl.c:5
-msgid "Name of conference to create"
-msgstr ""
-
-#: admin/conference/generic.tpl.c:11
-msgid "Type"
-msgstr "Ø§Ù„Ù†ÙˆØ¹"
-
-#: admin/conference/generic.tpl.c:14
-msgid "Choose subtree to place conference in"
-msgstr ""
-
-#: admin/conference/generic.tpl.c:26
-msgid "Select language"
-msgstr ""
-
-#: admin/conference/generic.tpl.c:32
-msgid "Descriptive text for department"
-msgstr ""
-
-#: admin/conference/generic.tpl.c:35
-msgid "Lifetime (in days)"
-msgstr ""
-
-#: admin/conference/generic.tpl.c:53
-msgid "Sound file format"
-msgstr ""
-
-#: admin/conference/generic.tpl.c:56
-msgid "Choose subtree to place department in"
-msgstr ""
-
-#: admin/conference/generic.tpl.c:62
-msgid "Activate session menu"
-msgstr ""
-
-#: admin/conference/generic.tpl.c:65
-msgid "Announce users joining or leaving the conference"
-msgstr ""
-
-#: admin/conference/generic.tpl.c:68
-msgid "Count users"
-msgstr ""
-
-#: admin/conference/remove.tpl.c:5 admin/macro/remove.tpl.c:5
-msgid ""
-"Please double check if you really want to do this since there is no way for "
-"FusionDirectory to get your data back."
-msgstr ""
-
-#: admin/conference/remove.tpl.c:8 admin/macro/remove.tpl.c:8
-msgid "So - if you're sure - press 'Delete' to continue or 'Cancel' to abort."
-msgstr ""
-
-#: admin/macro/generic.tpl.c:11
-msgid "Macro name to be displayed"
-msgstr ""
-
-#: admin/macro/generic.tpl.c:20
-msgid "Visible for user"
-msgstr ""
-
-#: admin/macro/generic.tpl.c:23
-msgid "Macro text"
-msgstr ""
-
-#: admin/macro/parameter.tpl.c:2
-msgid "Argument"
-msgstr ""
-
-#: admin/macro/parameter.tpl.c:8
-msgid "type"
-msgstr ""
-
-#: admin/macro/parameter.tpl.c:11
-msgid "Default value"
-msgstr ""
-
-#: admin/macro/parameter.tpl.c:14
-msgid "You are not allowed to view the macro parameter settings"
-msgstr ""
-
-#: admin/systems/asterisk/phonesettings.tpl.c:2
-msgid "Advanced phone settings"
-msgstr ""
-
-#: admin/systems/asterisk/phonesettings.tpl.c:5
-msgid "Phone type"
-msgstr ""
-
-#: admin/systems/asterisk/phonesettings.tpl.c:8
-#: admin/systems/asterisk/phonesettings.tpl.c:14
-#: admin/systems/asterisk/phonesettings.tpl.c:20
-#: admin/systems/asterisk/phonesettings.tpl.c:26
-#: admin/systems/asterisk/phonesettings.tpl.c:35
-#: admin/systems/asterisk/phonesettings.tpl.c:47
-#: admin/systems/asterisk/phonesettings.tpl.c:65
-msgid "Choose a phone type"
-msgstr ""
-
-#: admin/systems/asterisk/phonesettings.tpl.c:11
-msgid "Mode"
-msgstr ""
-
-#: admin/systems/asterisk/phonesettings.tpl.c:17
-msgid "DTMF mode"
-msgstr ""
-
-#: admin/systems/asterisk/phonesettings.tpl.c:23
-#: admin/systems/asterisk/phonesettings.tpl.c:38
-msgid "Default IP"
-msgstr ""
-
-#: admin/systems/asterisk/phonesettings.tpl.c:29
-#: admin/systems/asterisk/phonesettings.tpl.c:41
-msgid "Response timeout"
-msgstr ""
-
-#: admin/systems/asterisk/phonesettings.tpl.c:32
-msgid "Modus"
-msgstr ""
-
-#: admin/systems/asterisk/phonesettings.tpl.c:44
-msgid "Authtype"
-msgstr ""
-
-#: admin/systems/asterisk/phonesettings.tpl.c:50
-msgid "Secret"
-msgstr ""
-
-#: admin/systems/asterisk/phonesettings.tpl.c:53
-msgid "GoFonInkeys"
-msgstr ""
-
-#: admin/systems/asterisk/phonesettings.tpl.c:56
-msgid "GoFonOutKeys"
-msgstr ""
-
-#: admin/systems/asterisk/phonesettings.tpl.c:59
-msgid "Account code"
-msgstr ""
-
-#: admin/systems/asterisk/phonesettings.tpl.c:62
-msgid "Trunk lines"
-msgstr ""
-
-#: admin/systems/asterisk/phonesettings.tpl.c:68
-msgid "Hosts that are allowed to connect"
-msgstr ""
-
-#: admin/systems/asterisk/phonesettings.tpl.c:71
-#: admin/systems/asterisk/phonesettings.tpl.c:77
-msgid "List of alternative mail addresses"
-msgstr ""
-
-#: admin/systems/asterisk/phonesettings.tpl.c:74
-msgid "Hosts that are not allowed to connect"
-msgstr ""
-
-#: admin/systems/asterisk/phonesettings.tpl.c:80
-msgid "MSN"
-msgstr ""
-
-#: admin/systems/asterisk/phone.tpl.c:2
-msgid "Phone name"
-msgstr ""
-
-#: addons/fonreports/contents.tpl.c:5
-msgid "Search for"
-msgstr ""
-
-#: addons/fonreports/contents.tpl.c:8
-msgid "Enter user name to search for"
-msgstr ""
-
-#: addons/fonreports/contents.tpl.c:11 addons/fonreports/contents.tpl.c:26
-msgid "in"
-msgstr ""
-
-#: addons/fonreports/contents.tpl.c:14
-msgid "Select subtree to base search on"
-msgstr ""
-
-#: addons/fonreports/contents.tpl.c:17
-msgid "on"
-msgstr ""
-
-#: addons/fonreports/contents.tpl.c:20
-msgid "Select server to search on"
-msgstr ""
-
-#: addons/fonreports/contents.tpl.c:23
-msgid "during"
-msgstr ""
-
-#: addons/fonreports/contents.tpl.c:29
-msgid "Search"
-msgstr ""
-
-#: addons/fonreports/contents.tpl.c:44
-msgid "Application"
-msgstr ""
-
-#: addons/fonreports/contents.tpl.c:47
-msgid "Status"
-msgstr ""
-
-#: addons/fonreports/contents.tpl.c:53
-msgid "Search returned no results..."
-msgstr ""
-
-#: personal/phoneaccount/generic.tpl.c:5
-#: personal/phoneaccount/paste_generic.tpl.c:8
-msgid "Telephone hardware"
-msgstr ""
-
-#: personal/phoneaccount/generic.tpl.c:8
-msgid "Telephone"
-msgstr ""
-
-#: personal/phoneaccount/generic.tpl.c:14
-msgid "Select the accounts home server"
-msgstr ""
-
-#: personal/phoneaccount/generic.tpl.c:17
-msgid "Context"
-msgstr ""
-
-#: personal/phoneaccount/generic.tpl.c:20
-#: personal/phoneaccount/generic.tpl.c:26
-msgid "Select the accounts context"
-msgstr ""
-
-#: personal/phoneaccount/generic.tpl.c:23
-msgid "Voicemail context"
-msgstr ""
diff --git a/asterisk/locale/ca/fusiondirectory.po b/asterisk/locale/ca/fusiondirectory.po
index 35a9be3d31ae996f0975f222bb0a6db79f533b33..7744fece1b1903e4a6a27416b7ebd2b4d6dd3f8e 100644
--- a/asterisk/locale/ca/fusiondirectory.po
+++ b/asterisk/locale/ca/fusiondirectory.po
@@ -5,962 +5,124 @@
 # Translators:
 msgid ""
 msgstr ""
-"Project-Id-Version: FusionDirectory-108\n"
+"Project-Id-Version: FusionDirectory-109\n"
 "Report-Msgid-Bugs-To: documentation@lists.fusiondirectory.org\n"
-"POT-Creation-Date: 2015-03-31 11:49+0200\n"
-"PO-Revision-Date: 2015-03-31 11:41+0000\n"
+"POT-Creation-Date: 2014-12-15 17:47+0100\n"
+"PO-Revision-Date: 2015-02-25 16:04+0000\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>\n"
-"Language-Team: Catalan (http://www.transifex.com/projects/p/FusionDirectory-108/language/ca/)\n"
+"Language-Team: Catalan (http://www.transifex.com/projects/p/FusionDirectory-109/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/ogroups/asterisk/class_phonequeue.inc:110
-#: admin/conference/class_phoneConferenceGeneric.inc:104
-#: personal/phoneaccount/class_phoneAccount.inc:148
-msgid "Obsolete entry"
-msgstr ""
-
-#: admin/ogroups/asterisk/class_phonequeue.inc:110
-#: admin/conference/class_phoneConferenceGeneric.inc:104
-#: personal/phoneaccount/class_phoneAccount.inc:148
-#, php-format
-msgid ""
-"The current home server is not available anymore. It will be moved to '%s' "
-"if you save this entry!"
-msgstr ""
-
-#: admin/ogroups/asterisk/class_phonequeue.inc:140
-msgid "ring all"
-msgstr ""
-
-#: admin/ogroups/asterisk/class_phonequeue.inc:141
-msgid "round robin"
-msgstr ""
-
-#: admin/ogroups/asterisk/class_phonequeue.inc:142
-msgid "least recently called"
-msgstr ""
-
-#: admin/ogroups/asterisk/class_phonequeue.inc:143
-msgid "fewest completed calls"
-msgstr ""
-
-#: admin/ogroups/asterisk/class_phonequeue.inc:144
-msgid "random"
-msgstr ""
-
-#: admin/ogroups/asterisk/class_phonequeue.inc:145
-msgid "round robin with memory"
-msgstr ""
-
-#: admin/ogroups/asterisk/class_phonequeue.inc:180
-msgid "Remove the phone queue from this Account"
-msgstr ""
-
-#: admin/ogroups/asterisk/class_phonequeue.inc:181
-#: admin/ogroups/asterisk/class_phonequeue.inc:184
-msgid "phone queue"
-msgstr ""
-
-#: admin/ogroups/asterisk/class_phonequeue.inc:183
-msgid "Create phone queue"
-msgstr ""
-
-#: admin/ogroups/asterisk/class_phonequeue.inc:272
-msgid ""
-"There must be at least one server with an asterisk database to create a "
-"phone queue."
-msgstr ""
-
-#: admin/ogroups/asterisk/class_phonequeue.inc:275
-#: admin/ogroups/asterisk/class_phonequeue.inc:873
-#: admin/conference/class_phoneConferenceGeneric.inc:709
-#: personal/phoneaccount/class_phoneAccount.inc:1350
-#: personal/phoneaccount/class_phoneAccount.inc:1669
-#: admin/ogroups/asterisk/phonequeue.tpl.c:17
-#: admin/conference/generic.tpl.c:20 personal/phoneaccount/generic.tpl.c:11
-msgid "Home server"
-msgstr ""
-
-#: admin/ogroups/asterisk/class_phonequeue.inc:281
-#: admin/ogroups/asterisk/class_phonequeue.inc:871
-#: admin/ogroups/asterisk/phonequeue.tpl.c:23
-msgid "Timeout"
-msgstr ""
-
-#: admin/ogroups/asterisk/class_phonequeue.inc:284
-#: admin/ogroups/asterisk/class_phonequeue.inc:896
-#: admin/ogroups/asterisk/phonequeue.tpl.c:26
-msgid "Retry"
-msgstr ""
-
-#: admin/ogroups/asterisk/class_phonequeue.inc:287
-msgid "Queue length"
-msgstr ""
-
-#: admin/ogroups/asterisk/class_phonequeue.inc:290
-#: admin/ogroups/asterisk/class_phonequeue.inc:874
-#: admin/ogroups/asterisk/phonequeue.tpl.c:35
-msgid "Announce frequency"
-msgstr ""
-
-#: admin/ogroups/asterisk/class_phonequeue.inc:293
-#: admin/conference/class_phoneConferenceGeneric.inc:328
-msgid "Number"
-msgstr ""
-
-#: admin/ogroups/asterisk/class_phonequeue.inc:316
-#: admin/ogroups/asterisk/class_phonequeue.inc:361
-msgid "asterisk"
-msgstr ""
-
-#: admin/ogroups/asterisk/class_phonequeue.inc:345
-#: admin/ogroups/asterisk/class_phonequeue.inc:696
-#: admin/conference/class_phoneConferenceGeneric.inc:369
-#: admin/macro/class_gofonMacro.inc:381 admin/macro/class_gofonMacro.inc:465
-#: addons/fonreports/class_fonreport.inc:190
-#: addons/fonreports/class_fonreport.inc:220
-#: personal/phoneaccount/class_phoneAccount.inc:455
-#: personal/phoneaccount/class_phoneAccount.inc:1061
-msgid "GOfon"
-msgstr ""
-
-#: admin/ogroups/asterisk/class_phonequeue.inc:401
-msgid "Cannot find old queue entry!"
-msgstr ""
-
-#: admin/ogroups/asterisk/class_phonequeue.inc:487
-#, php-format
-msgid ""
-"Found more than one entry named '%s' in queue table. Please inform your "
-"system administrator!"
-msgstr ""
-
-#: admin/ogroups/asterisk/class_phonequeue.inc:728
-#: admin/ogroups/asterisk/class_phonequeue.inc:730
-msgid "telephone number"
-msgstr ""
-
-#: admin/ogroups/asterisk/class_phonequeue.inc:787
-#: admin/ogroups/asterisk/class_phonequeue.inc:829
-#: admin/conference/class_phoneConferenceGeneric.inc:229
-#: admin/conference/class_phoneConferenceGeneric.inc:233
-#: admin/conference/class_phoneConferenceGeneric.inc:271
-#: admin/macro/class_gofonMacro.inc:343 admin/macro/class_gofonMacro.inc:452
-#: admin/macro/class_gofonMacro.inc:461 admin/macro/class_gofonMacro.inc:499
-#: admin/systems/asterisk/class_phoneGeneric.inc:267
-#: admin/systems/asterisk/class_phoneGeneric.inc:308
-#: addons/fonreports/class_fonreport.inc:220
-#: personal/phoneaccount/class_phoneAccount.inc:1046
-#: personal/phoneaccount/class_phoneAccount.inc:1166
-#: personal/phoneaccount/class_phoneAccount.inc:1172
-#: personal/phoneaccount/class_phoneAccount.inc:1368
-#: personal/phoneaccount/class_phoneAccount.inc:1450
-#: personal/phoneaccount/class_phoneAccount.inc:1528
-msgid "Error"
-msgstr "Error"
-
-#: admin/ogroups/asterisk/class_phonequeue.inc:802
-#: admin/ogroups/asterisk/class_phonequeue.inc:857
-#: admin/conference/class_phoneConferenceGeneric.inc:682
-#: admin/macro/class_gofonMacro.inc:473 admin/macro/class_gofonMacro.inc:484
-#: admin/macro/class_gofonMacro.inc:521
-#: admin/macro/class_gofonMacroParameters.inc:435
-#: admin/systems/asterisk/class_phoneGeneric.inc:277
-#: admin/systems/asterisk/class_phoneGeneric.inc:432
-#: admin/systems/asterisk/class_phoneGeneric.inc:446
-#: admin/systems/asterisk/class_phoneGeneric.inc:463
-#: admin/systems/services/asterisk/class_serviceAsterisk.inc:121
-#: personal/phoneaccount/class_phoneAccount.inc:1476
-#: personal/phoneaccount/class_phoneAccount.inc:1609
-msgid "LDAP error"
-msgstr "Error d'LDAP"
-
-#: admin/ogroups/asterisk/class_phonequeue.inc:864
-#: admin/systems/asterisk/class_phoneGeneric.inc:472
-#: admin/systems/asterisk/class_phoneGeneric.inc:477
-#: personal/phoneaccount/class_phoneAccount.inc:999
-#: personal/phoneaccount/class_phoneAccount.inc:1012
-#: personal/phoneaccount/class_phoneAccount.inc:1024
-#: personal/phoneaccount/class_phoneAccount.inc:1028
-#: personal/phoneaccount/class_phoneAccount.inc:1031
-#: personal/phoneaccount/class_phoneAccount.inc:1657
-msgid "Phone"
-msgstr "TelÃ¨fon"
-
-#: admin/ogroups/asterisk/class_phonequeue.inc:865
-msgid "Phone group"
-msgstr ""
-
-#: admin/ogroups/asterisk/class_phonequeue.inc:872
-#: admin/ogroups/asterisk/phonequeue.tpl.c:32
-msgid "Max queue length"
-msgstr ""
-
-#: admin/ogroups/asterisk/class_phonequeue.inc:875
-#: admin/ogroups/asterisk/phonequeue.tpl.c:86
-msgid "Allow the called user to transfer his call"
-msgstr ""
-
-#: admin/ogroups/asterisk/class_phonequeue.inc:876
-#: admin/ogroups/asterisk/phonequeue.tpl.c:89
-msgid "Allows calling user to transfer call"
-msgstr ""
-
-#: admin/ogroups/asterisk/class_phonequeue.inc:877
-#: admin/ogroups/asterisk/phonequeue.tpl.c:92
-msgid "Allow the called to hangup by pressing *"
-msgstr ""
-
-#: admin/ogroups/asterisk/class_phonequeue.inc:878
-#: admin/ogroups/asterisk/phonequeue.tpl.c:98
-msgid "Ring instead of playing background music"
-msgstr ""
-
-#: admin/ogroups/asterisk/class_phonequeue.inc:879
-#: admin/ogroups/asterisk/phonequeue.tpl.c:95
-msgid "Allows calling to hangup by pressing *"
-msgstr ""
-
-#: admin/ogroups/asterisk/class_phonequeue.inc:881
-#: admin/ogroups/asterisk/phonequeue.tpl.c:47
-msgid "Music on hold"
-msgstr ""
-
-#: admin/ogroups/asterisk/class_phonequeue.inc:882
-msgid "Welcome music"
-msgstr ""
-
-#: admin/ogroups/asterisk/class_phonequeue.inc:883
-msgid "Report hold time"
-msgstr ""
-
-#: admin/ogroups/asterisk/class_phonequeue.inc:884
-msgid "'You are next' sound"
-msgstr ""
-
-#: admin/ogroups/asterisk/class_phonequeue.inc:885
-msgid "'There are' sound"
-msgstr ""
-
-#: admin/ogroups/asterisk/class_phonequeue.inc:886
-msgid "'Call waiting' sound"
-msgstr ""
-
-#: admin/ogroups/asterisk/class_phonequeue.inc:887
-msgid "'Thank you' sound"
-msgstr ""
-
-#: admin/ogroups/asterisk/class_phonequeue.inc:888
-msgid "'Minutes' sound"
-msgstr ""
-
-#: admin/ogroups/asterisk/class_phonequeue.inc:889
-msgid "'Seconds' sound"
-msgstr ""
-
-#: admin/ogroups/asterisk/class_phonequeue.inc:890
-msgid "'Less than' sound"
-msgstr ""
-
-#: admin/ogroups/asterisk/class_phonequeue.inc:891
-msgid "Queue phone number"
-msgstr ""
-
-#: admin/ogroups/asterisk/class_phonequeue.inc:892
-#: admin/conference/class_phoneConferenceGeneric.inc:707
-#: admin/ogroups/asterisk/phonequeue.tpl.c:20
-#: admin/conference/generic.tpl.c:23
-msgid "Language"
-msgstr ""
-
-#: admin/ogroups/asterisk/class_phonequeue.inc:893
-msgid "Method"
-msgstr ""
-
-#: admin/ogroups/asterisk/class_phonequeue.inc:894
-#: admin/ogroups/asterisk/phonequeue.tpl.c:83
-msgid "Announce holdtime"
-msgstr ""
-
-#: admin/ogroups/asterisk/class_phonequeue.inc:895
-msgid "Announce"
-msgstr ""
-
-#: admin/conference/conf-list.xml:11
-msgid "List of conference rooms"
-msgstr ""
-
-#: admin/conference/conf-list.xml:15 admin/conference/conf-list.xml:74
-msgid "Conference"
-msgstr ""
-
-#: admin/conference/conf-list.xml:41
-#: admin/conference/class_phoneConferenceGeneric.inc:324
-#: admin/conference/class_phoneConferenceGeneric.inc:347
-#: admin/conference/class_phoneConferenceGeneric.inc:702
-#: admin/macro/class_gofonMacro.inc:395 admin/macro/class_gofonMacro.inc:406
-#: admin/macro/macro-list.xml:41
-#: admin/systems/asterisk/class_phoneGeneric.inc:344
-#: admin/systems/asterisk/class_phoneGeneric.inc:348
-#: admin/systems/asterisk/class_phoneGeneric.inc:351
-#: admin/systems/asterisk/class_phoneGeneric.inc:366
-#: admin/systems/asterisk/class_phoneGeneric.inc:482
-#: admin/conference/conf-filter.tpl.c:5 admin/macro/macro-filter.tpl.c:5
-#: admin/macro/parameter.tpl.c:5
-msgid "Name"
-msgstr "Nom"
-
-#: admin/conference/conf-list.xml:49
-#: admin/conference/class_phoneConferenceGeneric.inc:704
-#: admin/macro/class_gofonMacro.inc:547 admin/macro/macro-list.xml:49
-#: admin/systems/asterisk/class_phoneGeneric.inc:484
-#: admin/conference/generic.tpl.c:29 admin/macro/generic.tpl.c:17
-#: admin/systems/asterisk/phone.tpl.c:8
-msgid "Description"
-msgstr ""
-
-#: admin/conference/conf-list.xml:57 admin/macro/macro-list.xml:57
-msgid "Actions"
-msgstr ""
-
-#: admin/conference/conf-list.xml:68 admin/macro/macro-list.xml:68
-msgid "Create"
-msgstr ""
-
-#: admin/conference/conf-list.xml:86 admin/conference/conf-list.xml:125
-#: admin/macro/macro-list.xml:86 admin/macro/macro-list.xml:125
-msgid "Edit"
-msgstr ""
-
-#: admin/conference/conf-list.xml:93 admin/conference/conf-list.xml:138
-#: admin/macro/macro-list.xml:93 admin/macro/macro-list.xml:138
-msgid "Remove"
-msgstr ""
-
-#: admin/conference/class_phoneConferenceGeneric.inc:233
-#, php-format
-msgid "Cannot delete entry from server '%s' because it seems to be removed!"
-msgstr ""
-
-#: admin/conference/class_phoneConferenceGeneric.inc:308
-#, php-format
-msgid ""
-"The previously selected asterisk home server '%s' is no longer available!"
-msgstr ""
-
-#: admin/conference/class_phoneConferenceGeneric.inc:315
-#: admin/conference/generic.tpl.c:47
-msgid "PIN"
-msgstr ""
-
-#: admin/conference/class_phoneConferenceGeneric.inc:333
-#: admin/conference/class_phoneConferenceGeneric.inc:719
-msgid "Lifetime"
-msgstr ""
-
-#: admin/conference/class_phoneConferenceGeneric.inc:399
-#: personal/phoneaccount/class_phoneAccount.inc:346
-#: personal/phoneaccount/class_phoneAccount.inc:359
-#: personal/phoneaccount/class_phoneAccount.inc:617
-#: personal/phoneaccount/class_phoneAccount.inc:656
-#: personal/phoneaccount/class_phoneAccount.inc:1519
-#: personal/phoneaccount/class_phoneAccount.inc:1695
-#: admin/conference/remove.tpl.c:2 admin/macro/remove.tpl.c:2
-msgid "Warning"
-msgstr "AvÃs"
-
-#: admin/conference/class_phoneConferenceGeneric.inc:400
-#, php-format
-msgid ""
-"FusionDirectory identified problems with your MySQL table definition, please"
-" activate debugging for details."
-msgstr ""
-
-#: admin/conference/class_phoneConferenceGeneric.inc:606
-#: admin/conference/class_phoneConferenceGeneric.inc:608
-#, php-format
-msgid "'%s' is already assigned to '%s'!"
-msgstr ""
-
-#: admin/conference/class_phoneConferenceGeneric.inc:693
-msgid "Phone Conference"
-msgstr ""
-
-#: admin/conference/class_phoneConferenceGeneric.inc:694
-msgid "Phone conference management"
-msgstr ""
-
-#: admin/conference/class_phoneConferenceGeneric.inc:696
-msgid "GOfon conference"
-msgstr ""
-
-#: admin/conference/class_phoneConferenceGeneric.inc:698
-msgid "Asterisk conference"
-msgstr ""
-
-#: admin/conference/class_phoneConferenceGeneric.inc:703
-#: admin/macro/class_gofonMacro.inc:546
-#: admin/systems/asterisk/class_phoneGeneric.inc:483
-#: admin/conference/generic.tpl.c:17 admin/macro/generic.tpl.c:14
-#: admin/systems/asterisk/phone.tpl.c:5
-msgid "Base"
-msgstr "Base"
-
-#: admin/conference/class_phoneConferenceGeneric.inc:705
-msgid "Conference PIN"
-msgstr ""
-
-#: admin/conference/class_phoneConferenceGeneric.inc:710
-#: admin/conference/generic.tpl.c:44
-msgid "Preset PIN"
-msgstr ""
-
-#: admin/conference/class_phoneConferenceGeneric.inc:711
-#: admin/conference/generic.tpl.c:50
-msgid "Record conference"
-msgstr ""
-
-#: admin/conference/class_phoneConferenceGeneric.inc:712
-#: admin/conference/generic.tpl.c:59
-msgid "Play music on hold"
-msgstr ""
-
-#: admin/conference/class_phoneConferenceGeneric.inc:713
-msgid "Activate menu"
-msgstr ""
-
-#: admin/conference/class_phoneConferenceGeneric.inc:714
-msgid "Announce user activity"
-msgstr ""
-
-#: admin/conference/class_phoneConferenceGeneric.inc:715
-msgid "Count user"
-msgstr ""
-
-#: admin/conference/class_phoneConferenceGeneric.inc:716
-msgid "Conference type"
-msgstr ""
-
-#: admin/conference/class_phoneConferenceGeneric.inc:718
-msgid "Format"
-msgstr ""
-
-#: admin/conference/class_phoneConferenceGeneric.inc:720
-#: personal/phoneaccount/class_phoneAccount.inc:1666
-msgid "Telephone number"
-msgstr ""
-
-#: admin/conference/class_phoneConferenceGeneric.inc:721
-msgid "Owner"
-msgstr ""
-
-#: admin/conference/class_phoneConferenceManagment.inc:36
-msgid "Phone Conferences"
-msgstr ""
-
-#: admin/conference/class_phoneConferenceManagment.inc:37
-msgid "Phone Conference management"
-msgstr ""
-
-#: admin/macro/class_gofonMacro.inc:202
-#, php-format
-msgid ""
-"Macro could not be removed from server '%s', please check database "
-"consistency!"
-msgstr ""
-
-#: admin/macro/class_gofonMacro.inc:264
-#, php-format
-msgid "Application missing in line %s!"
-msgstr ""
-
-#: admin/macro/class_gofonMacro.inc:267
-#, php-format
-msgid "Priority missing in line %s!"
-msgstr ""
-
-#: admin/macro/class_gofonMacro.inc:271
-#, php-format
-msgid "Extension missing in line %s!"
-msgstr ""
-
-#: admin/macro/class_gofonMacro.inc:281
-#, php-format
-msgid "Duplicate combination of 'extension' and 'priority' in line %s!"
-msgstr ""
-
-#: admin/macro/class_gofonMacro.inc:317
-#, php-format
-msgid ""
-"Macro could not be added to server '%s', please check database consistency!"
-msgstr ""
-
-#: admin/macro/class_gofonMacro.inc:410
-msgid "Name can be 20 characters at maximum!"
-msgstr ""
-
-#: admin/macro/class_gofonMacro.inc:419
-msgid "Macro is still in use!"
-msgstr ""
-
-#: admin/macro/class_gofonMacro.inc:426
-msgid "Macro is empty!"
-msgstr ""
-
-#: admin/macro/class_gofonMacro.inc:452
-#: admin/systems/asterisk/class_phoneGeneric.inc:267
-#, php-format
-msgid "Cannot delete entry because it is still in use by '%s'!"
-msgstr ""
-
-#: admin/macro/class_gofonMacro.inc:465
-#: addons/fonreports/class_fonreport.inc:190
-#: personal/phoneaccount/class_phoneAccount.inc:455
-#: personal/phoneaccount/class_phoneAccount.inc:1061
-#: personal/phoneaccount/class_phoneAccount.inc:1567
-msgid "Configuration error"
-msgstr "Error de la configuraciÃ³"
-
-#: admin/macro/class_gofonMacro.inc:536 admin/macro/class_gofonMacro.inc:541
-msgid "Asterisk macro"
-msgstr ""
-
-#: admin/macro/class_gofonMacro.inc:537
-msgid "Asterisk macro management"
-msgstr ""
-
-#: admin/macro/class_gofonMacro.inc:539
-msgid "GOfon macro"
-msgstr ""
-
-#: admin/macro/class_gofonMacro.inc:545 admin/macro/generic.tpl.c:2
-#: admin/macro/generic.tpl.c:5 admin/macro/paste_generic.tpl.c:2
-#: admin/macro/paste_generic.tpl.c:5
-msgid "Macro name"
-msgstr ""
-
-#: admin/macro/class_gofonMacro.inc:548 admin/macro/generic.tpl.c:8
-msgid "Display name"
-msgstr ""
-
-#: admin/macro/class_gofonMacro.inc:549
-msgid "Macro content and parameter"
-msgstr ""
-
-#: admin/macro/class_gofonMacro.inc:550
-msgid "Visibility flag"
-msgstr ""
-
-#: admin/macro/class_gofonMacroManagement.inc:36
-msgid "Phone Macros"
-msgstr ""
-
-#: admin/macro/class_gofonMacroManagement.inc:37
-msgid "Phone Macros management"
-msgstr ""
-
-#: admin/macro/macro-list.xml:11
-msgid "List of macros"
-msgstr ""
-
-#: admin/macro/macro-list.xml:15 admin/macro/macro-list.xml:74
-msgid "Macro"
-msgstr ""
-
-#: admin/macro/class_gofonMacroParameters.inc:58
-msgid "Parameter"
-msgstr ""
-
-#: admin/macro/class_gofonMacroParameters.inc:59
-msgid "Asterisk macro parameter"
-msgstr ""
-
-#: admin/macro/class_gofonMacroParameters.inc:234
-#: personal/phoneaccount/generic.tpl.c:35
-msgid "Phone macro"
-msgstr ""
-
-#: admin/macro/class_gofonMacroParameters.inc:290
-msgid "String"
-msgstr ""
-
-#: admin/macro/class_gofonMacroParameters.inc:291
-msgid "Combobox"
-msgstr ""
-
-#: admin/macro/class_gofonMacroParameters.inc:292
-msgid "Bool"
-msgstr ""
-
-#: admin/macro/class_gofonMacroParameters.inc:298
-msgid "Delete unused"
-msgstr ""
-
-#: admin/macro/class_gofonMacroParameters.inc:374
-#, php-format
-msgid "Parameter %s contains invalid character. '!,#' is used as delimiter!"
-msgstr ""
-
-#: admin/macro/class_gofonMacroParameters.inc:379
-#, php-format
-msgid "Parameter %s is invalid!"
-msgstr ""
-
-#: admin/macro/class_gofonMacroParameters.inc:408
-#: personal/phoneaccount/class_phoneAccount.inc:1600
-msgid "Information"
-msgstr "InformaciÃ³"
-
-#: admin/macro/class_gofonMacroParameters.inc:408
-msgid ""
-"Number of parameters for this macro has changed. Please update all users "
-"using it!"
-msgstr ""
-
-#: admin/systems/asterisk/class_phoneGeneric.inc:151
-msgid "phone"
-msgstr ""
-
-#: admin/systems/asterisk/class_phoneGeneric.inc:230
-msgid "yes"
-msgstr ""
-
-#: admin/systems/asterisk/class_phoneGeneric.inc:230
-msgid "no"
-msgstr ""
-
-#: admin/systems/asterisk/class_phoneGeneric.inc:247
-msgid "dynamic"
-msgstr ""
-
-#: admin/systems/asterisk/class_phoneGeneric.inc:247
-msgid "Networksettings"
-msgstr ""
-
-#: admin/systems/asterisk/class_phoneGeneric.inc:330
-#: admin/systems/asterisk/class_phoneGeneric.inc:333
-msgid "IP address"
-msgstr ""
-
-#: admin/systems/asterisk/class_phoneGeneric.inc:473
-msgid "Phone information"
-msgstr ""
-
-#: admin/systems/asterisk/class_phoneGeneric.inc:476
-#: personal/phoneaccount/class_phoneAccount.inc:1668
-msgid "Phone hardware"
-msgstr ""
-
-#: admin/systems/asterisk/class_phoneGeneric.inc:485
-msgid "SIP Mode"
-msgstr ""
-
-#: admin/systems/asterisk/class_phoneGeneric.inc:486
-msgid "SIP DTMF mode"
-msgstr ""
-
-#: admin/systems/asterisk/class_phoneGeneric.inc:487
-msgid "SIP Default ip"
-msgstr ""
-
-#: admin/systems/asterisk/class_phoneGeneric.inc:488
-msgid "SIP Qualify"
-msgstr ""
-
-#: admin/systems/asterisk/class_phoneGeneric.inc:489
-msgid "IAX authentication type"
-msgstr ""
-
-#: admin/systems/asterisk/class_phoneGeneric.inc:490
-msgid "IAX secret"
-msgstr ""
-
-#: admin/systems/asterisk/class_phoneGeneric.inc:491
-msgid "IAX account code"
-msgstr ""
-
-#: admin/systems/asterisk/class_phoneGeneric.inc:492
-msgid "IAX trunk lines"
-msgstr ""
-
-#: admin/systems/asterisk/class_phoneGeneric.inc:493
-msgid "IAX permit settings"
-msgstr ""
-
-#: admin/systems/asterisk/class_phoneGeneric.inc:494
-msgid "IAX deny settings"
-msgstr ""
-
-#: admin/systems/asterisk/class_phoneGeneric.inc:495
-msgid "CAPI MSN"
-msgstr ""
-
-#: admin/systems/asterisk/class_phoneGeneric.inc:496
-msgid "Hardware type"
-msgstr ""
-
-#: admin/systems/services/asterisk/class_serviceAsterisk.inc:35
-msgid "VoIP database information"
-msgstr ""
-
-#: admin/systems/services/asterisk/class_serviceAsterisk.inc:38
-msgid "Asterisk DB user"
-msgstr ""
-
-#: admin/systems/services/asterisk/class_serviceAsterisk.inc:38
-msgid "Login for asterisk database administrator"
-msgstr ""
-
-#: admin/systems/services/asterisk/class_serviceAsterisk.inc:42
-msgid "Password"
-msgstr "Contrasenya"
-
-#: admin/systems/services/asterisk/class_serviceAsterisk.inc:42
-msgid "Password for asterisk database administrator"
-msgstr ""
-
-#: admin/systems/services/asterisk/class_serviceAsterisk.inc:46
-msgid "Country dial prefix"
-msgstr ""
-
-#: admin/systems/services/asterisk/class_serviceAsterisk.inc:50
-msgid "Local dial prefix"
-msgstr ""
-
-#: admin/systems/services/asterisk/class_serviceAsterisk.inc:54
-msgid "Driver"
-msgstr ""
-
-#: admin/systems/services/asterisk/class_serviceAsterisk.inc:54
-msgid "Driver to use to contact this database."
-msgstr ""
-
-#: admin/systems/services/asterisk/class_serviceAsterisk.inc:95
-#, php-format
-msgid ""
-"You can't remove the asterisk database extension, it is still in use by "
-"these objects '%s'."
-msgstr ""
-
-#: admin/systems/services/asterisk/class_serviceAsterisk.inc:140
-msgid "VoIP service (asterisk)"
-msgstr ""
-
-#: admin/systems/services/asterisk/class_serviceAsterisk.inc:141
-msgid "VoIP - asterisk management"
-msgstr ""
-
-#: admin/systems/services/asterisk/class_serviceAsterisk.inc:141
-msgid "Services"
-msgstr ""
-
-#: addons/fonreports/class_fonreport.inc:232
-msgid "Insufficient permissions"
-msgstr ""
-
-#: addons/fonreports/class_fonreport.inc:251
-msgid "Y-M-D"
-msgstr ""
-
-#: addons/fonreports/class_fonreport.inc:418
-#: addons/fonreports/class_fonreport.inc:419
-#: addons/fonreports/class_fonreport.inc:424 addons/fonreports/main.inc:46
-msgid "Phone reports"
-msgstr ""
-
-#: addons/fonreports/class_fonreport.inc:419
-msgid "All entries are readonly"
-msgstr ""
-
-#: addons/fonreports/class_fonreport.inc:428
-#: addons/fonreports/contents.tpl.c:32
-msgid "Date"
-msgstr ""
-
-#: addons/fonreports/class_fonreport.inc:429
-#: addons/fonreports/contents.tpl.c:35
-msgid "Source"
-msgstr ""
-
-#: addons/fonreports/class_fonreport.inc:430
-#: addons/fonreports/contents.tpl.c:38
-msgid "Destination"
-msgstr ""
-
-#: addons/fonreports/class_fonreport.inc:431
-#: addons/fonreports/contents.tpl.c:41
-msgid "Channel"
-msgstr ""
-
-#: addons/fonreports/class_fonreport.inc:432
-msgid "Application called"
-msgstr ""
-
-#: addons/fonreports/class_fonreport.inc:433
-msgid "Disposition"
-msgstr ""
-
-#: addons/fonreports/class_fonreport.inc:434
-#: addons/fonreports/contents.tpl.c:50
-msgid "Duration"
-msgstr ""
-
-#: personal/phoneaccount/class_phoneAccount.inc:176
-msgid "automatic"
-msgstr ""
-
-#: personal/phoneaccount/class_phoneAccount.inc:212
-msgid "no macro"
-msgstr ""
-
-#: personal/phoneaccount/class_phoneAccount.inc:240
-msgid "undefined"
-msgstr ""
-
-#: personal/phoneaccount/class_phoneAccount.inc:359
-#, php-format
-msgid ""
-"Cannot identify telephone extension in database, please try to save again."
-msgstr ""
-
-#: personal/phoneaccount/class_phoneAccount.inc:577
-#: personal/phoneaccount/class_phoneAccount.inc:595
-msgid "Abort saving entries to keep the database consistent."
-msgstr ""
+#: admin/systems/asterisk/class_phoneIAX.inc:30
+#: admin/systems/asterisk/class_phoneIAX.inc:34
+#: personal/asterisk/class_asteriskAccount.inc:45
+msgid "Phone"
+msgstr "TelÃ¨fon"
 
-#: personal/phoneaccount/class_phoneAccount.inc:618
-#: personal/phoneaccount/class_phoneAccount.inc:657
-#: personal/phoneaccount/class_phoneAccount.inc:1520
-#, php-format
-msgid ""
-"FusionDirectory identified problems with your database table definition!"
+#: admin/systems/asterisk/class_phoneIAX.inc:31
+msgid "Asterisk phone"
 msgstr ""
 
-#: personal/phoneaccount/class_phoneAccount.inc:1023
-msgid "Remove phone account"
+#: admin/systems/asterisk/class_phoneIAX.inc:33
+msgid "Phone hardware"
 msgstr ""
 
-#: personal/phoneaccount/class_phoneAccount.inc:1027
-#: personal/phoneaccount/class_phoneAccount.inc:1030
-msgid "Create phone account"
+#: admin/systems/asterisk/class_phoneIAX.inc:46
+#: personal/asterisk/class_asteriskAccount.inc:42
+msgid "Telephone"
 msgstr ""
 
-#: personal/phoneaccount/class_phoneAccount.inc:1028
-msgid "User uid"
-msgstr ""
+#: admin/systems/asterisk/class_phoneIAX.inc:49
+msgid "Name"
+msgstr "Nom"
 
-#: personal/phoneaccount/class_phoneAccount.inc:1046
-msgid "Selected macro is not available anymore!"
+#: admin/systems/asterisk/class_phoneIAX.inc:49
+msgid "Name of this phone"
 msgstr ""
 
-#: personal/phoneaccount/class_phoneAccount.inc:1221
-msgid "Choose your private phone"
+#: admin/systems/asterisk/class_phoneIAX.inc:53
+msgid "Account name"
 msgstr ""
 
-#: personal/phoneaccount/class_phoneAccount.inc:1346
-msgid ""
-"There must be at least one server with an asterisk database to create a "
-"phone account."
+#: admin/systems/asterisk/class_phoneIAX.inc:53
+msgid "Name of the account"
 msgstr ""
 
-#: personal/phoneaccount/class_phoneAccount.inc:1354
-#: personal/phoneaccount/class_phoneAccount.inc:1357
-#: personal/phoneaccount/generic.tpl.c:29
-#: personal/phoneaccount/paste_generic.tpl.c:11
-msgid "Voicemail PIN"
+#: admin/systems/services/asterisk/class_serviceAsterisk.inc:35
+msgid "VoIP database information"
 msgstr ""
 
-#: personal/phoneaccount/class_phoneAccount.inc:1354
-msgid "Between 1-4 charactes"
+#: admin/systems/services/asterisk/class_serviceAsterisk.inc:38
+msgid "Asterisk DB user"
 msgstr ""
 
-#: personal/phoneaccount/class_phoneAccount.inc:1362
-#: personal/phoneaccount/generic.tpl.c:32
-#: personal/phoneaccount/paste_generic.tpl.c:14
-msgid "Phone PIN"
+#: admin/systems/services/asterisk/class_serviceAsterisk.inc:38
+msgid "Login for asterisk database administrator"
 msgstr ""
 
-#: personal/phoneaccount/class_phoneAccount.inc:1394
-#: admin/conference/generic.tpl.c:38 admin/conference/paste_generic.tpl.c:8
-msgid "Phone number"
-msgstr "NÃºmero de telÃ¨fon"
+#: admin/systems/services/asterisk/class_serviceAsterisk.inc:42
+msgid "Password"
+msgstr "Contrasenya"
 
-#: personal/phoneaccount/class_phoneAccount.inc:1402
-#, php-format
-msgid "macro parameter %s"
+#: admin/systems/services/asterisk/class_serviceAsterisk.inc:42
+msgid "Password for asterisk database administrator"
 msgstr ""
 
-#: personal/phoneaccount/class_phoneAccount.inc:1450
-msgid "An error occured while updating the database entries!"
+#: admin/systems/services/asterisk/class_serviceAsterisk.inc:46
+msgid "Country dial prefix"
 msgstr ""
 
-#: personal/phoneaccount/class_phoneAccount.inc:1567
-msgid "Was not able to found any asterisk server"
+#: admin/systems/services/asterisk/class_serviceAsterisk.inc:50
+msgid "Local dial prefix"
 msgstr ""
 
-#: personal/phoneaccount/class_phoneAccount.inc:1600
-#, php-format
-msgid "User '%s' has been removed from phone queue '%s'."
+#: admin/systems/services/asterisk/class_serviceAsterisk.inc:54
+msgid "Driver"
 msgstr ""
 
-#: personal/phoneaccount/class_phoneAccount.inc:1637
-#: personal/phoneaccount/class_phoneAccount.inc:1639
-#, php-format
-msgid "The specified telephonenumber '%s' is already assigned to '%s'."
+#: admin/systems/services/asterisk/class_serviceAsterisk.inc:54
+msgid "Driver to use to contact this database."
 msgstr ""
 
-#: personal/phoneaccount/class_phoneAccount.inc:1649
+#: admin/systems/services/asterisk/class_serviceAsterisk.inc:95
 #, php-format
 msgid ""
-"The previously selected asterisk home server (%s) is no longer available. "
-"Remove aborted."
-msgstr ""
-
-#: personal/phoneaccount/class_phoneAccount.inc:1658
-msgid "Phone account settings"
-msgstr ""
-
-#: personal/phoneaccount/class_phoneAccount.inc:1667
-msgid "Macro settings"
+"You can't remove the asterisk database extension, it is still in use by "
+"these objects '%s'."
 msgstr ""
 
-#: personal/phoneaccount/class_phoneAccount.inc:1670
-msgid "Phone context"
-msgstr ""
+#: admin/systems/services/asterisk/class_serviceAsterisk.inc:121
+msgid "LDAP error"
+msgstr "Error d'LDAP"
 
-#: personal/phoneaccount/class_phoneAccount.inc:1671
-msgid "Voice mail context"
+#: admin/systems/services/asterisk/class_serviceAsterisk.inc:140
+msgid "VoIP service (asterisk)"
 msgstr ""
 
-#: personal/phoneaccount/class_phoneAccount.inc:1672
-msgid "Telephone pin"
+#: admin/systems/services/asterisk/class_serviceAsterisk.inc:141
+msgid "VoIP - asterisk management"
 msgstr ""
 
-#: personal/phoneaccount/class_phoneAccount.inc:1673
-msgid "Voicemail pin"
+#: admin/systems/services/asterisk/class_serviceAsterisk.inc:141
+msgid "Services"
 msgstr ""
 
-#: personal/phoneaccount/class_phoneAccount.inc:1695
-#, php-format
-msgid "You need to configure %s contexts first"
+#: personal/asterisk/class_asteriskAccount.inc:30
+#: config/asterisk/class_asteriskPluginConfig.inc:28
+#: config/asterisk/class_asteriskPluginConfig.inc:41
+msgid "Asterisk"
 msgstr ""
 
-#: personal/phoneaccount/main.inc:124
-msgid "Click the 'Edit' button below to change informations in this dialog"
-msgstr "Feu clic al botÃ³ Â«EditaÂ» a sota per canviar la informaciÃ³ d'aquest diÃ leg"
-
-#: personal/phoneaccount/main.inc:134
-#: personal/phoneaccount/paste_generic.tpl.c:2
-msgid "Phone settings"
+#: personal/asterisk/class_asteriskAccount.inc:31
+msgid "Asterisk account"
 msgstr ""
 
-#: config/asterisk/class_asteriskPluginConfig.inc:28
-#: config/asterisk/class_asteriskPluginConfig.inc:41
-msgid "Asterisk"
+#: personal/asterisk/class_asteriskAccount.inc:45
+msgid "Select the phone associated to this user"
 msgstr ""
 
 #: config/asterisk/class_asteriskPluginConfig.inc:29
@@ -1010,338 +172,3 @@ msgstr ""
 #: config/asterisk/class_asteriskPluginConfig.inc:72
 msgid "Available voicemail contexts"
 msgstr ""
-
-#: admin/ogroups/asterisk/phonequeue.tpl.c:2
-msgid ""
-"Only users with the same asterisk home server will be included to this "
-"queue."
-msgstr ""
-
-#: admin/ogroups/asterisk/phonequeue.tpl.c:5
-#: personal/phoneaccount/generic.tpl.c:2
-#: personal/phoneaccount/paste_generic.tpl.c:5
-msgid "Phone numbers"
-msgstr ""
-
-#: admin/ogroups/asterisk/phonequeue.tpl.c:8
-msgid "Up"
-msgstr ""
-
-#: admin/ogroups/asterisk/phonequeue.tpl.c:11
-msgid "Down"
-msgstr ""
-
-#: admin/ogroups/asterisk/phonequeue.tpl.c:14
-#: admin/conference/generic.tpl.c:41
-msgid "Options"
-msgstr ""
-
-#: admin/ogroups/asterisk/phonequeue.tpl.c:29
-msgid "Strategy"
-msgstr ""
-
-#: admin/ogroups/asterisk/phonequeue.tpl.c:38
-msgid "(in seconds)"
-msgstr ""
-
-#: admin/ogroups/asterisk/phonequeue.tpl.c:41
-msgid "Queue sound setup"
-msgstr ""
-
-#: admin/ogroups/asterisk/phonequeue.tpl.c:44
-msgid "Use music on hold instead of ringing"
-msgstr ""
-
-#: admin/ogroups/asterisk/phonequeue.tpl.c:50
-msgid "Welcome sound file"
-msgstr ""
-
-#: admin/ogroups/asterisk/phonequeue.tpl.c:53
-msgid "Announce message"
-msgstr ""
-
-#: admin/ogroups/asterisk/phonequeue.tpl.c:56
-msgid "Sound file for 'You are next ...'"
-msgstr ""
-
-#: admin/ogroups/asterisk/phonequeue.tpl.c:59
-msgid "'There are ...'"
-msgstr ""
-
-#: admin/ogroups/asterisk/phonequeue.tpl.c:62
-msgid "'... calls waiting'"
-msgstr ""
-
-#: admin/ogroups/asterisk/phonequeue.tpl.c:65
-msgid "'Thank you' message"
-msgstr ""
-
-#: admin/ogroups/asterisk/phonequeue.tpl.c:68
-msgid "'minutes' sound file"
-msgstr ""
-
-#: admin/ogroups/asterisk/phonequeue.tpl.c:71
-msgid "'seconds' sound file"
-msgstr ""
-
-#: admin/ogroups/asterisk/phonequeue.tpl.c:74
-msgid "Hold sound file"
-msgstr ""
-
-#: admin/ogroups/asterisk/phonequeue.tpl.c:77
-msgid "Less Than sound file"
-msgstr ""
-
-#: admin/ogroups/asterisk/phonequeue.tpl.c:80
-msgid "Phone attributes "
-msgstr ""
-
-#: admin/conference/conf-filter.tpl.c:2 admin/macro/macro-filter.tpl.c:2
-#: addons/fonreports/contents.tpl.c:2
-msgid "Filter"
-msgstr ""
-
-#: admin/conference/generic.tpl.c:2
-msgid "Properties"
-msgstr ""
-
-#: admin/conference/generic.tpl.c:5 admin/conference/paste_generic.tpl.c:2
-msgid "Conference name"
-msgstr ""
-
-#: admin/conference/generic.tpl.c:8 admin/conference/paste_generic.tpl.c:5
-msgid "Name of conference to create"
-msgstr ""
-
-#: admin/conference/generic.tpl.c:11
-msgid "Type"
-msgstr ""
-
-#: admin/conference/generic.tpl.c:14
-msgid "Choose subtree to place conference in"
-msgstr ""
-
-#: admin/conference/generic.tpl.c:26
-msgid "Select language"
-msgstr ""
-
-#: admin/conference/generic.tpl.c:32
-msgid "Descriptive text for department"
-msgstr ""
-
-#: admin/conference/generic.tpl.c:35
-msgid "Lifetime (in days)"
-msgstr ""
-
-#: admin/conference/generic.tpl.c:53
-msgid "Sound file format"
-msgstr ""
-
-#: admin/conference/generic.tpl.c:56
-msgid "Choose subtree to place department in"
-msgstr ""
-
-#: admin/conference/generic.tpl.c:62
-msgid "Activate session menu"
-msgstr ""
-
-#: admin/conference/generic.tpl.c:65
-msgid "Announce users joining or leaving the conference"
-msgstr ""
-
-#: admin/conference/generic.tpl.c:68
-msgid "Count users"
-msgstr ""
-
-#: admin/conference/remove.tpl.c:5 admin/macro/remove.tpl.c:5
-msgid ""
-"Please double check if you really want to do this since there is no way for "
-"FusionDirectory to get your data back."
-msgstr ""
-
-#: admin/conference/remove.tpl.c:8 admin/macro/remove.tpl.c:8
-msgid "So - if you're sure - press 'Delete' to continue or 'Cancel' to abort."
-msgstr ""
-
-#: admin/macro/generic.tpl.c:11
-msgid "Macro name to be displayed"
-msgstr ""
-
-#: admin/macro/generic.tpl.c:20
-msgid "Visible for user"
-msgstr ""
-
-#: admin/macro/generic.tpl.c:23
-msgid "Macro text"
-msgstr ""
-
-#: admin/macro/parameter.tpl.c:2
-msgid "Argument"
-msgstr ""
-
-#: admin/macro/parameter.tpl.c:8
-msgid "type"
-msgstr ""
-
-#: admin/macro/parameter.tpl.c:11
-msgid "Default value"
-msgstr ""
-
-#: admin/macro/parameter.tpl.c:14
-msgid "You are not allowed to view the macro parameter settings"
-msgstr ""
-
-#: admin/systems/asterisk/phonesettings.tpl.c:2
-msgid "Advanced phone settings"
-msgstr ""
-
-#: admin/systems/asterisk/phonesettings.tpl.c:5
-msgid "Phone type"
-msgstr ""
-
-#: admin/systems/asterisk/phonesettings.tpl.c:8
-#: admin/systems/asterisk/phonesettings.tpl.c:14
-#: admin/systems/asterisk/phonesettings.tpl.c:20
-#: admin/systems/asterisk/phonesettings.tpl.c:26
-#: admin/systems/asterisk/phonesettings.tpl.c:35
-#: admin/systems/asterisk/phonesettings.tpl.c:47
-#: admin/systems/asterisk/phonesettings.tpl.c:65
-msgid "Choose a phone type"
-msgstr ""
-
-#: admin/systems/asterisk/phonesettings.tpl.c:11
-msgid "Mode"
-msgstr ""
-
-#: admin/systems/asterisk/phonesettings.tpl.c:17
-msgid "DTMF mode"
-msgstr ""
-
-#: admin/systems/asterisk/phonesettings.tpl.c:23
-#: admin/systems/asterisk/phonesettings.tpl.c:38
-msgid "Default IP"
-msgstr ""
-
-#: admin/systems/asterisk/phonesettings.tpl.c:29
-#: admin/systems/asterisk/phonesettings.tpl.c:41
-msgid "Response timeout"
-msgstr ""
-
-#: admin/systems/asterisk/phonesettings.tpl.c:32
-msgid "Modus"
-msgstr ""
-
-#: admin/systems/asterisk/phonesettings.tpl.c:44
-msgid "Authtype"
-msgstr ""
-
-#: admin/systems/asterisk/phonesettings.tpl.c:50
-msgid "Secret"
-msgstr ""
-
-#: admin/systems/asterisk/phonesettings.tpl.c:53
-msgid "GoFonInkeys"
-msgstr ""
-
-#: admin/systems/asterisk/phonesettings.tpl.c:56
-msgid "GoFonOutKeys"
-msgstr ""
-
-#: admin/systems/asterisk/phonesettings.tpl.c:59
-msgid "Account code"
-msgstr ""
-
-#: admin/systems/asterisk/phonesettings.tpl.c:62
-msgid "Trunk lines"
-msgstr ""
-
-#: admin/systems/asterisk/phonesettings.tpl.c:68
-msgid "Hosts that are allowed to connect"
-msgstr ""
-
-#: admin/systems/asterisk/phonesettings.tpl.c:71
-#: admin/systems/asterisk/phonesettings.tpl.c:77
-msgid "List of alternative mail addresses"
-msgstr ""
-
-#: admin/systems/asterisk/phonesettings.tpl.c:74
-msgid "Hosts that are not allowed to connect"
-msgstr ""
-
-#: admin/systems/asterisk/phonesettings.tpl.c:80
-msgid "MSN"
-msgstr ""
-
-#: admin/systems/asterisk/phone.tpl.c:2
-msgid "Phone name"
-msgstr ""
-
-#: addons/fonreports/contents.tpl.c:5
-msgid "Search for"
-msgstr ""
-
-#: addons/fonreports/contents.tpl.c:8
-msgid "Enter user name to search for"
-msgstr ""
-
-#: addons/fonreports/contents.tpl.c:11 addons/fonreports/contents.tpl.c:26
-msgid "in"
-msgstr ""
-
-#: addons/fonreports/contents.tpl.c:14
-msgid "Select subtree to base search on"
-msgstr ""
-
-#: addons/fonreports/contents.tpl.c:17
-msgid "on"
-msgstr ""
-
-#: addons/fonreports/contents.tpl.c:20
-msgid "Select server to search on"
-msgstr ""
-
-#: addons/fonreports/contents.tpl.c:23
-msgid "during"
-msgstr ""
-
-#: addons/fonreports/contents.tpl.c:29
-msgid "Search"
-msgstr "Cerca"
-
-#: addons/fonreports/contents.tpl.c:44
-msgid "Application"
-msgstr ""
-
-#: addons/fonreports/contents.tpl.c:47
-msgid "Status"
-msgstr ""
-
-#: addons/fonreports/contents.tpl.c:53
-msgid "Search returned no results..."
-msgstr ""
-
-#: personal/phoneaccount/generic.tpl.c:5
-#: personal/phoneaccount/paste_generic.tpl.c:8
-msgid "Telephone hardware"
-msgstr ""
-
-#: personal/phoneaccount/generic.tpl.c:8
-msgid "Telephone"
-msgstr ""
-
-#: personal/phoneaccount/generic.tpl.c:14
-msgid "Select the accounts home server"
-msgstr ""
-
-#: personal/phoneaccount/generic.tpl.c:17
-msgid "Context"
-msgstr ""
-
-#: personal/phoneaccount/generic.tpl.c:20
-#: personal/phoneaccount/generic.tpl.c:26
-msgid "Select the accounts context"
-msgstr ""
-
-#: personal/phoneaccount/generic.tpl.c:23
-msgid "Voicemail context"
-msgstr ""
diff --git a/asterisk/locale/cs_CZ/fusiondirectory.po b/asterisk/locale/cs_CZ/fusiondirectory.po
index cb491e0226e6b959abfb5af528ecda9611bb997d..806a939a9b7e11e0da74fbd1b6a36f2755d033d8 100644
--- a/asterisk/locale/cs_CZ/fusiondirectory.po
+++ b/asterisk/locale/cs_CZ/fusiondirectory.po
@@ -3,708 +3,55 @@
 # This file is distributed under the same license as the PACKAGE package.
 # 
 # Translators:
-# Pavel Borecki <pavel.borecki@gmail.com>, 2012
-# Pavel Borecki <pavel.borecki@gmail.com>, 2012,2015
-# Pavel Borecki <pavel.borecki@gmail.com>, 2012
+# Pavel Borecki <pavel.borecki@gmail.com>, 2014-2015
 msgid ""
 msgstr ""
-"Project-Id-Version: FusionDirectory-108\n"
+"Project-Id-Version: FusionDirectory-109\n"
 "Report-Msgid-Bugs-To: documentation@lists.fusiondirectory.org\n"
-"POT-Creation-Date: 2015-03-31 11:49+0200\n"
-"PO-Revision-Date: 2015-03-31 11:51+0000\n"
+"POT-Creation-Date: 2014-12-15 17:47+0100\n"
+"PO-Revision-Date: 2015-04-07 19:21+0000\n"
 "Last-Translator: Pavel Borecki <pavel.borecki@gmail.com>\n"
-"Language-Team: Czech (Czech Republic) (http://www.transifex.com/projects/p/FusionDirectory-108/language/cs_CZ/)\n"
+"Language-Team: Czech (Czech Republic) (http://www.transifex.com/projects/p/FusionDirectory-109/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/ogroups/asterisk/class_phonequeue.inc:110
-#: admin/conference/class_phoneConferenceGeneric.inc:104
-#: personal/phoneaccount/class_phoneAccount.inc:148
-msgid "Obsolete entry"
-msgstr "zastaralÃ¡ poloÅ¾ka"
-
-#: admin/ogroups/asterisk/class_phonequeue.inc:110
-#: admin/conference/class_phoneConferenceGeneric.inc:104
-#: personal/phoneaccount/class_phoneAccount.inc:148
-#, php-format
-msgid ""
-"The current home server is not available anymore. It will be moved to '%s' "
-"if you save this entry!"
-msgstr "SouÄasnÃ½ domovskÃ½ server jiÅ¾ nenÃ k dispozici. UloÅ¾enÃm tÃ©to poloÅ¾ky dojde k pÅ™esunutÃ na '%s'!"
-
-#: admin/ogroups/asterisk/class_phonequeue.inc:140
-msgid "ring all"
-msgstr "zavolat vÅ¡em"
-
-#: admin/ogroups/asterisk/class_phonequeue.inc:141
-msgid "round robin"
-msgstr ""
-
-#: admin/ogroups/asterisk/class_phonequeue.inc:142
-msgid "least recently called"
-msgstr "naposledy volanÃ©"
-
-#: admin/ogroups/asterisk/class_phonequeue.inc:143
-msgid "fewest completed calls"
-msgstr "nejmÃ©nÄ› dokonÄenÃ½ch hovorÅ¯"
-
-#: admin/ogroups/asterisk/class_phonequeue.inc:144
-msgid "random"
-msgstr "nÃ¡hodnÃ©"
-
-#: admin/ogroups/asterisk/class_phonequeue.inc:145
-msgid "round robin with memory"
-msgstr "round robin s pamÄ›tÃ"
-
-#: admin/ogroups/asterisk/class_phonequeue.inc:180
-msgid "Remove the phone queue from this Account"
-msgstr "odebrat telefon z tohoto ÃºÄtu"
-
-#: admin/ogroups/asterisk/class_phonequeue.inc:181
-#: admin/ogroups/asterisk/class_phonequeue.inc:184
-msgid "phone queue"
-msgstr "telefonnÃ fronta"
-
-#: admin/ogroups/asterisk/class_phonequeue.inc:183
-msgid "Create phone queue"
-msgstr "vytvoÅ™it telefonnÃ frontu"
-
-#: admin/ogroups/asterisk/class_phonequeue.inc:272
-msgid ""
-"There must be at least one server with an asterisk database to create a "
-"phone queue."
-msgstr "Aby bylo moÅ¾nÃ© vytvoÅ™it frontu pro volajÃcÃ, musÃ existovat alespoÅˆ jeden server s databÃ¡zÃ Asterisku."
-
-#: admin/ogroups/asterisk/class_phonequeue.inc:275
-#: admin/ogroups/asterisk/class_phonequeue.inc:873
-#: admin/conference/class_phoneConferenceGeneric.inc:709
-#: personal/phoneaccount/class_phoneAccount.inc:1350
-#: personal/phoneaccount/class_phoneAccount.inc:1669
-#: admin/ogroups/asterisk/phonequeue.tpl.c:17
-#: admin/conference/generic.tpl.c:20 personal/phoneaccount/generic.tpl.c:11
-msgid "Home server"
-msgstr "domÃ¡cÃ server"
-
-#: admin/ogroups/asterisk/class_phonequeue.inc:281
-#: admin/ogroups/asterisk/class_phonequeue.inc:871
-#: admin/ogroups/asterisk/phonequeue.tpl.c:23
-msgid "Timeout"
-msgstr "ÄasovÃ½ limit"
-
-#: admin/ogroups/asterisk/class_phonequeue.inc:284
-#: admin/ogroups/asterisk/class_phonequeue.inc:896
-#: admin/ogroups/asterisk/phonequeue.tpl.c:26
-msgid "Retry"
-msgstr "znovu"
-
-#: admin/ogroups/asterisk/class_phonequeue.inc:287
-msgid "Queue length"
-msgstr "dÃ©lka fronty"
-
-#: admin/ogroups/asterisk/class_phonequeue.inc:290
-#: admin/ogroups/asterisk/class_phonequeue.inc:874
-#: admin/ogroups/asterisk/phonequeue.tpl.c:35
-msgid "Announce frequency"
-msgstr "ÄŒetnost oznamovÃ¡nÃ"
-
-#: admin/ogroups/asterisk/class_phonequeue.inc:293
-#: admin/conference/class_phoneConferenceGeneric.inc:328
-msgid "Number"
-msgstr "ÄÃslo"
-
-#: admin/ogroups/asterisk/class_phonequeue.inc:316
-#: admin/ogroups/asterisk/class_phonequeue.inc:361
-msgid "asterisk"
-msgstr "Asterisk"
-
-#: admin/ogroups/asterisk/class_phonequeue.inc:345
-#: admin/ogroups/asterisk/class_phonequeue.inc:696
-#: admin/conference/class_phoneConferenceGeneric.inc:369
-#: admin/macro/class_gofonMacro.inc:381 admin/macro/class_gofonMacro.inc:465
-#: addons/fonreports/class_fonreport.inc:190
-#: addons/fonreports/class_fonreport.inc:220
-#: personal/phoneaccount/class_phoneAccount.inc:455
-#: personal/phoneaccount/class_phoneAccount.inc:1061
-msgid "GOfon"
-msgstr "GOfon"
-
-#: admin/ogroups/asterisk/class_phonequeue.inc:401
-msgid "Cannot find old queue entry!"
-msgstr "NedaÅ™Ã se nalÃ©zt poloÅ¾ku starÃ© fronty hovorÅ¯!"
-
-#: admin/ogroups/asterisk/class_phonequeue.inc:487
-#, php-format
-msgid ""
-"Found more than one entry named '%s' in queue table. Please inform your "
-"system administrator!"
-msgstr "V tabulce fronty bylo nalezeno vÃce poloÅ¾ek s nÃ¡zvem '%s'. Kontaktujte prosÃm VaÅ¡eho sprÃ¡vce systÃ©mÅ¯!"
-
-#: admin/ogroups/asterisk/class_phonequeue.inc:728
-#: admin/ogroups/asterisk/class_phonequeue.inc:730
-msgid "telephone number"
-msgstr "telefonnÃ ÄÃslo"
-
-#: admin/ogroups/asterisk/class_phonequeue.inc:787
-#: admin/ogroups/asterisk/class_phonequeue.inc:829
-#: admin/conference/class_phoneConferenceGeneric.inc:229
-#: admin/conference/class_phoneConferenceGeneric.inc:233
-#: admin/conference/class_phoneConferenceGeneric.inc:271
-#: admin/macro/class_gofonMacro.inc:343 admin/macro/class_gofonMacro.inc:452
-#: admin/macro/class_gofonMacro.inc:461 admin/macro/class_gofonMacro.inc:499
-#: admin/systems/asterisk/class_phoneGeneric.inc:267
-#: admin/systems/asterisk/class_phoneGeneric.inc:308
-#: addons/fonreports/class_fonreport.inc:220
-#: personal/phoneaccount/class_phoneAccount.inc:1046
-#: personal/phoneaccount/class_phoneAccount.inc:1166
-#: personal/phoneaccount/class_phoneAccount.inc:1172
-#: personal/phoneaccount/class_phoneAccount.inc:1368
-#: personal/phoneaccount/class_phoneAccount.inc:1450
-#: personal/phoneaccount/class_phoneAccount.inc:1528
-msgid "Error"
-msgstr "chyba"
-
-#: admin/ogroups/asterisk/class_phonequeue.inc:802
-#: admin/ogroups/asterisk/class_phonequeue.inc:857
-#: admin/conference/class_phoneConferenceGeneric.inc:682
-#: admin/macro/class_gofonMacro.inc:473 admin/macro/class_gofonMacro.inc:484
-#: admin/macro/class_gofonMacro.inc:521
-#: admin/macro/class_gofonMacroParameters.inc:435
-#: admin/systems/asterisk/class_phoneGeneric.inc:277
-#: admin/systems/asterisk/class_phoneGeneric.inc:432
-#: admin/systems/asterisk/class_phoneGeneric.inc:446
-#: admin/systems/asterisk/class_phoneGeneric.inc:463
-#: admin/systems/services/asterisk/class_serviceAsterisk.inc:121
-#: personal/phoneaccount/class_phoneAccount.inc:1476
-#: personal/phoneaccount/class_phoneAccount.inc:1609
-msgid "LDAP error"
-msgstr "chyba LDAPu"
-
-#: admin/ogroups/asterisk/class_phonequeue.inc:864
-#: admin/systems/asterisk/class_phoneGeneric.inc:472
-#: admin/systems/asterisk/class_phoneGeneric.inc:477
-#: personal/phoneaccount/class_phoneAccount.inc:999
-#: personal/phoneaccount/class_phoneAccount.inc:1012
-#: personal/phoneaccount/class_phoneAccount.inc:1024
-#: personal/phoneaccount/class_phoneAccount.inc:1028
-#: personal/phoneaccount/class_phoneAccount.inc:1031
-#: personal/phoneaccount/class_phoneAccount.inc:1657
+#: admin/systems/asterisk/class_phoneIAX.inc:30
+#: admin/systems/asterisk/class_phoneIAX.inc:34
+#: personal/asterisk/class_asteriskAccount.inc:45
 msgid "Phone"
-msgstr "telefon"
-
-#: admin/ogroups/asterisk/class_phonequeue.inc:865
-msgid "Phone group"
-msgstr "telefonnÃ skupina"
-
-#: admin/ogroups/asterisk/class_phonequeue.inc:872
-#: admin/ogroups/asterisk/phonequeue.tpl.c:32
-msgid "Max queue length"
-msgstr "maximÃ¡lnÃ dÃ©lka fronty"
-
-#: admin/ogroups/asterisk/class_phonequeue.inc:875
-#: admin/ogroups/asterisk/phonequeue.tpl.c:86
-msgid "Allow the called user to transfer his call"
-msgstr "Dovolit volanÃ©mu uÅ¾ivateli pÅ™epojit hovor jinam."
-
-#: admin/ogroups/asterisk/class_phonequeue.inc:876
-#: admin/ogroups/asterisk/phonequeue.tpl.c:89
-msgid "Allows calling user to transfer call"
-msgstr "UmoÅ¾nit volajÃcÃmu uÅ¾ivateli pÅ™edat hovor"
-
-#: admin/ogroups/asterisk/class_phonequeue.inc:877
-#: admin/ogroups/asterisk/phonequeue.tpl.c:92
-msgid "Allow the called to hangup by pressing *"
-msgstr "Dovolit volanÃ©mu zavÄ›sit stiskem * (hvÄ›zdiÄky)"
-
-#: admin/ogroups/asterisk/class_phonequeue.inc:878
-#: admin/ogroups/asterisk/phonequeue.tpl.c:98
-msgid "Ring instead of playing background music"
-msgstr "pouÅ¾Ãt vyzvÃ¡nÄ›cÃ tÃ³n namÃsto hudby v pozadÃ"
-
-#: admin/ogroups/asterisk/class_phonequeue.inc:879
-#: admin/ogroups/asterisk/phonequeue.tpl.c:95
-msgid "Allows calling to hangup by pressing *"
-msgstr "Dovolit volajÃcÃmu zavÄ›sit stiskem * (hvÄ›zdiÄky)"
-
-#: admin/ogroups/asterisk/class_phonequeue.inc:881
-#: admin/ogroups/asterisk/phonequeue.tpl.c:47
-msgid "Music on hold"
-msgstr ""
-
-#: admin/ogroups/asterisk/class_phonequeue.inc:882
-msgid "Welcome music"
-msgstr "uvÃtacÃ melodie"
-
-#: admin/ogroups/asterisk/class_phonequeue.inc:883
-msgid "Report hold time"
-msgstr ""
-
-#: admin/ogroups/asterisk/class_phonequeue.inc:884
-msgid "'You are next' sound"
-msgstr "nahrÃ¡vka â€žjste druhÃ½ v poÅ™adÃâ€œ"
-
-#: admin/ogroups/asterisk/class_phonequeue.inc:885
-msgid "'There are' sound"
-msgstr "NahrÃ¡vka â€žjsou zdeâ€œ"
-
-#: admin/ogroups/asterisk/class_phonequeue.inc:886
-msgid "'Call waiting' sound"
-msgstr "nahrÃ¡vka â€žÄekejte prosÃmâ€œ"
-
-#: admin/ogroups/asterisk/class_phonequeue.inc:887
-msgid "'Thank you' sound"
-msgstr "nahrÃ¡vka â€ždÄ›kujeme (za zavolÃ¡nÃ)â€œ"
-
-#: admin/ogroups/asterisk/class_phonequeue.inc:888
-msgid "'Minutes' sound"
-msgstr "nahrÃ¡vka â€žminutâ€œ"
-
-#: admin/ogroups/asterisk/class_phonequeue.inc:889
-msgid "'Seconds' sound"
-msgstr "nahrÃ¡vka â€žvteÅ™inâ€œ"
-
-#: admin/ogroups/asterisk/class_phonequeue.inc:890
-msgid "'Less than' sound"
-msgstr "nahrÃ¡vka â€žmÃ©nÄ› neÅ¾â€œ"
-
-#: admin/ogroups/asterisk/class_phonequeue.inc:891
-msgid "Queue phone number"
-msgstr "telefonnÃ ÄÃslo fronty"
-
-#: admin/ogroups/asterisk/class_phonequeue.inc:892
-#: admin/conference/class_phoneConferenceGeneric.inc:707
-#: admin/ogroups/asterisk/phonequeue.tpl.c:20
-#: admin/conference/generic.tpl.c:23
-msgid "Language"
-msgstr "jazyk"
-
-#: admin/ogroups/asterisk/class_phonequeue.inc:893
-msgid "Method"
-msgstr "metoda"
-
-#: admin/ogroups/asterisk/class_phonequeue.inc:894
-#: admin/ogroups/asterisk/phonequeue.tpl.c:83
-msgid "Announce holdtime"
-msgstr ""
-
-#: admin/ogroups/asterisk/class_phonequeue.inc:895
-msgid "Announce"
-msgstr "oznÃ¡menÃ"
-
-#: admin/conference/conf-list.xml:11
-msgid "List of conference rooms"
-msgstr "seznam konferenÄnÃch â€žmÃstnostÃâ€œ"
-
-#: admin/conference/conf-list.xml:15 admin/conference/conf-list.xml:74
-msgid "Conference"
-msgstr "konference"
-
-#: admin/conference/conf-list.xml:41
-#: admin/conference/class_phoneConferenceGeneric.inc:324
-#: admin/conference/class_phoneConferenceGeneric.inc:347
-#: admin/conference/class_phoneConferenceGeneric.inc:702
-#: admin/macro/class_gofonMacro.inc:395 admin/macro/class_gofonMacro.inc:406
-#: admin/macro/macro-list.xml:41
-#: admin/systems/asterisk/class_phoneGeneric.inc:344
-#: admin/systems/asterisk/class_phoneGeneric.inc:348
-#: admin/systems/asterisk/class_phoneGeneric.inc:351
-#: admin/systems/asterisk/class_phoneGeneric.inc:366
-#: admin/systems/asterisk/class_phoneGeneric.inc:482
-#: admin/conference/conf-filter.tpl.c:5 admin/macro/macro-filter.tpl.c:5
-#: admin/macro/parameter.tpl.c:5
-msgid "Name"
-msgstr "jmÃ©no"
-
-#: admin/conference/conf-list.xml:49
-#: admin/conference/class_phoneConferenceGeneric.inc:704
-#: admin/macro/class_gofonMacro.inc:547 admin/macro/macro-list.xml:49
-#: admin/systems/asterisk/class_phoneGeneric.inc:484
-#: admin/conference/generic.tpl.c:29 admin/macro/generic.tpl.c:17
-#: admin/systems/asterisk/phone.tpl.c:8
-msgid "Description"
-msgstr "popis"
-
-#: admin/conference/conf-list.xml:57 admin/macro/macro-list.xml:57
-msgid "Actions"
-msgstr "akce"
-
-#: admin/conference/conf-list.xml:68 admin/macro/macro-list.xml:68
-msgid "Create"
-msgstr "vytvoÅ™it"
-
-#: admin/conference/conf-list.xml:86 admin/conference/conf-list.xml:125
-#: admin/macro/macro-list.xml:86 admin/macro/macro-list.xml:125
-msgid "Edit"
-msgstr "upravit"
-
-#: admin/conference/conf-list.xml:93 admin/conference/conf-list.xml:138
-#: admin/macro/macro-list.xml:93 admin/macro/macro-list.xml:138
-msgid "Remove"
-msgstr "odebrat"
-
-#: admin/conference/class_phoneConferenceGeneric.inc:233
-#, php-format
-msgid "Cannot delete entry from server '%s' because it seems to be removed!"
-msgstr "Nelze smazat poloÅ¾ku ze serveru '%s' â€“ zdÃ¡ se, Å¾e uÅ¾ byla odebrÃ¡na!"
-
-#: admin/conference/class_phoneConferenceGeneric.inc:308
-#, php-format
-msgid ""
-"The previously selected asterisk home server '%s' is no longer available!"
-msgstr "ZvolenÃ½ domovskÃ½ Asterisk server '%s' jiÅ¾ nenÃ k dispozici!"
-
-#: admin/conference/class_phoneConferenceGeneric.inc:315
-#: admin/conference/generic.tpl.c:47
-msgid "PIN"
-msgstr "PIN"
-
-#: admin/conference/class_phoneConferenceGeneric.inc:333
-#: admin/conference/class_phoneConferenceGeneric.inc:719
-msgid "Lifetime"
-msgstr "Å¾ivotnost"
-
-#: admin/conference/class_phoneConferenceGeneric.inc:399
-#: personal/phoneaccount/class_phoneAccount.inc:346
-#: personal/phoneaccount/class_phoneAccount.inc:359
-#: personal/phoneaccount/class_phoneAccount.inc:617
-#: personal/phoneaccount/class_phoneAccount.inc:656
-#: personal/phoneaccount/class_phoneAccount.inc:1519
-#: personal/phoneaccount/class_phoneAccount.inc:1695
-#: admin/conference/remove.tpl.c:2 admin/macro/remove.tpl.c:2
-msgid "Warning"
-msgstr "varovÃ¡nÃ"
-
-#: admin/conference/class_phoneConferenceGeneric.inc:400
-#, php-format
-msgid ""
-"FusionDirectory identified problems with your MySQL table definition, please"
-" activate debugging for details."
-msgstr "FusionDirectory zjistil problÃ©m s definicÃ tabulky ve VaÅ¡Ã databÃ¡zi MySQL â€“ pro zÃskÃ¡nÃ podrobnÄ›jÅ¡Ãch informacÃ zapnÄ›te reÅ¾im ladÄ›nÃ."
+msgstr "Telefon"
 
-#: admin/conference/class_phoneConferenceGeneric.inc:606
-#: admin/conference/class_phoneConferenceGeneric.inc:608
-#, php-format
-msgid "'%s' is already assigned to '%s'!"
-msgstr "'%s' je jiÅ¾ pÅ™iÅ™azeno '%s'!"
-
-#: admin/conference/class_phoneConferenceGeneric.inc:693
-msgid "Phone Conference"
-msgstr "TelefonnÃ konference"
-
-#: admin/conference/class_phoneConferenceGeneric.inc:694
-msgid "Phone conference management"
-msgstr "sprÃ¡va telefonickÃ½ch konferencÃ"
-
-#: admin/conference/class_phoneConferenceGeneric.inc:696
-msgid "GOfon conference"
-msgstr "konference GOfon"
-
-#: admin/conference/class_phoneConferenceGeneric.inc:698
-msgid "Asterisk conference"
-msgstr "Asterisk konference"
-
-#: admin/conference/class_phoneConferenceGeneric.inc:703
-#: admin/macro/class_gofonMacro.inc:546
-#: admin/systems/asterisk/class_phoneGeneric.inc:483
-#: admin/conference/generic.tpl.c:17 admin/macro/generic.tpl.c:14
-#: admin/systems/asterisk/phone.tpl.c:5
-msgid "Base"
-msgstr "ZÃ¡klad"
-
-#: admin/conference/class_phoneConferenceGeneric.inc:705
-msgid "Conference PIN"
-msgstr "PIN tÃ©to konference"
-
-#: admin/conference/class_phoneConferenceGeneric.inc:710
-#: admin/conference/generic.tpl.c:44
-msgid "Preset PIN"
-msgstr "pÅ™ednastavenÃ½ PIN"
-
-#: admin/conference/class_phoneConferenceGeneric.inc:711
-#: admin/conference/generic.tpl.c:50
-msgid "Record conference"
-msgstr "nahrÃ¡vat konferenci"
-
-#: admin/conference/class_phoneConferenceGeneric.inc:712
-#: admin/conference/generic.tpl.c:59
-msgid "Play music on hold"
-msgstr ""
-
-#: admin/conference/class_phoneConferenceGeneric.inc:713
-msgid "Activate menu"
-msgstr "aktivovat nabÃdku"
-
-#: admin/conference/class_phoneConferenceGeneric.inc:714
-msgid "Announce user activity"
-msgstr "upozorÅˆovat na aktivitu uÅ¾ivatele"
-
-#: admin/conference/class_phoneConferenceGeneric.inc:715
-msgid "Count user"
-msgstr "SpoÄÃtat uÅ¾ivatele"
-
-#: admin/conference/class_phoneConferenceGeneric.inc:716
-msgid "Conference type"
-msgstr "typ konference"
-
-#: admin/conference/class_phoneConferenceGeneric.inc:718
-msgid "Format"
-msgstr "formÃ¡t"
-
-#: admin/conference/class_phoneConferenceGeneric.inc:720
-#: personal/phoneaccount/class_phoneAccount.inc:1666
-msgid "Telephone number"
-msgstr "telefonnÃ ÄÃslo"
-
-#: admin/conference/class_phoneConferenceGeneric.inc:721
-msgid "Owner"
-msgstr "vlastnÃk"
-
-#: admin/conference/class_phoneConferenceManagment.inc:36
-msgid "Phone Conferences"
-msgstr "TelefonickÃ© konference"
-
-#: admin/conference/class_phoneConferenceManagment.inc:37
-msgid "Phone Conference management"
-msgstr "SprÃ¡va telefonickÃ© konference"
-
-#: admin/macro/class_gofonMacro.inc:202
-#, php-format
-msgid ""
-"Macro could not be removed from server '%s', please check database "
-"consistency!"
-msgstr "Makro se nezdaÅ™ilo odebrat ze serveru '%s', zkontrolujte prosÃm soudrÅ¾nost (konzistenci) databÃ¡ze!"
-
-#: admin/macro/class_gofonMacro.inc:264
-#, php-format
-msgid "Application missing in line %s!"
-msgstr "ChybÄ›jÃcÃ aplikace na Å™Ã¡dku %s!"
-
-#: admin/macro/class_gofonMacro.inc:267
-#, php-format
-msgid "Priority missing in line %s!"
-msgstr "ChybÄ›jÃcÃ priorita na Å™Ã¡dku %s!"
-
-#: admin/macro/class_gofonMacro.inc:271
-#, php-format
-msgid "Extension missing in line %s!"
-msgstr "ChybÄ›jÃcÃ rozÅ¡ÃÅ™enÃ na Å™Ã¡dku %s!"
-
-#: admin/macro/class_gofonMacro.inc:281
-#, php-format
-msgid "Duplicate combination of 'extension' and 'priority' in line %s!"
-msgstr "ZdvojenÃ¡ kombinace â€žrozÅ¡ÃÅ™enÃ (extension)â€œ a â€žpriorita (priority)â€œ na Å™Ã¡dku %s!"
-
-#: admin/macro/class_gofonMacro.inc:317
-#, php-format
-msgid ""
-"Macro could not be added to server '%s', please check database consistency!"
-msgstr "NezdaÅ™ilo se pÅ™idat makro na server '%s', zkontrolujte prosÃm neporuÅ¡enost databÃ¡ze!"
-
-#: admin/macro/class_gofonMacro.inc:410
-msgid "Name can be 20 characters at maximum!"
-msgstr "DÃ©lka nÃ¡zvu mÅ¯Å¾e bÃ½t nejvÃ½Å¡e 20 znakÅ¯!"
-
-#: admin/macro/class_gofonMacro.inc:419
-msgid "Macro is still in use!"
-msgstr "Makro je stÃ¡le pouÅ¾ÃvÃ¡no!"
-
-#: admin/macro/class_gofonMacro.inc:426
-msgid "Macro is empty!"
-msgstr "Makro je prÃ¡zdnÃ©!"
-
-#: admin/macro/class_gofonMacro.inc:452
-#: admin/systems/asterisk/class_phoneGeneric.inc:267
-#, php-format
-msgid "Cannot delete entry because it is still in use by '%s'!"
-msgstr "PoloÅ¾ku nenÃ moÅ¾nÃ© odstranit, protoÅ¾e je pouÅ¾ÃvÃ¡na %s!"
+#: admin/systems/asterisk/class_phoneIAX.inc:31
+msgid "Asterisk phone"
+msgstr "Telefon Asterisk"
 
-#: admin/macro/class_gofonMacro.inc:465
-#: addons/fonreports/class_fonreport.inc:190
-#: personal/phoneaccount/class_phoneAccount.inc:455
-#: personal/phoneaccount/class_phoneAccount.inc:1061
-#: personal/phoneaccount/class_phoneAccount.inc:1567
-msgid "Configuration error"
-msgstr "chyba nastavenÃ"
-
-#: admin/macro/class_gofonMacro.inc:536 admin/macro/class_gofonMacro.inc:541
-msgid "Asterisk macro"
-msgstr ""
-
-#: admin/macro/class_gofonMacro.inc:537
-msgid "Asterisk macro management"
-msgstr "sprÃ¡va maker Asterisku"
-
-#: admin/macro/class_gofonMacro.inc:539
-msgid "GOfon macro"
-msgstr "makro GOfonu"
-
-#: admin/macro/class_gofonMacro.inc:545 admin/macro/generic.tpl.c:2
-#: admin/macro/generic.tpl.c:5 admin/macro/paste_generic.tpl.c:2
-#: admin/macro/paste_generic.tpl.c:5
-msgid "Macro name"
-msgstr "nÃ¡zev makra"
-
-#: admin/macro/class_gofonMacro.inc:548 admin/macro/generic.tpl.c:8
-msgid "Display name"
-msgstr "zobrazovanÃ© jmÃ©no"
-
-#: admin/macro/class_gofonMacro.inc:549
-msgid "Macro content and parameter"
-msgstr "obsah a parametr makra"
-
-#: admin/macro/class_gofonMacro.inc:550
-msgid "Visibility flag"
-msgstr "pÅ™Ãznak viditelnosti"
-
-#: admin/macro/class_gofonMacroManagement.inc:36
-msgid "Phone Macros"
-msgstr "TelefonnÃ makra"
-
-#: admin/macro/class_gofonMacroManagement.inc:37
-msgid "Phone Macros management"
-msgstr ""
-
-#: admin/macro/macro-list.xml:11
-msgid "List of macros"
-msgstr "seznam maker"
-
-#: admin/macro/macro-list.xml:15 admin/macro/macro-list.xml:74
-msgid "Macro"
-msgstr "makro"
-
-#: admin/macro/class_gofonMacroParameters.inc:58
-msgid "Parameter"
-msgstr "parametr"
-
-#: admin/macro/class_gofonMacroParameters.inc:59
-msgid "Asterisk macro parameter"
-msgstr "Parametr Asterisk makra"
-
-#: admin/macro/class_gofonMacroParameters.inc:234
-#: personal/phoneaccount/generic.tpl.c:35
-msgid "Phone macro"
-msgstr "TelefonnÃ makro"
-
-#: admin/macro/class_gofonMacroParameters.inc:290
-msgid "String"
-msgstr "Å™etÄ›zec"
-
-#: admin/macro/class_gofonMacroParameters.inc:291
-msgid "Combobox"
-msgstr "roletovÃ¡ nabÃdka"
-
-#: admin/macro/class_gofonMacroParameters.inc:292
-msgid "Bool"
-msgstr "ano/ne (Boolean)"
-
-#: admin/macro/class_gofonMacroParameters.inc:298
-msgid "Delete unused"
-msgstr "smazat nepouÅ¾ÃvanÃ©"
-
-#: admin/macro/class_gofonMacroParameters.inc:374
-#, php-format
-msgid "Parameter %s contains invalid character. '!,#' is used as delimiter!"
-msgstr "Parametr %s obsahuje neplatnÃ© znaky. '!,#' nelze pouÅ¾Ãt jako oddÄ›lovaÄ!"
-
-#: admin/macro/class_gofonMacroParameters.inc:379
-#, php-format
-msgid "Parameter %s is invalid!"
-msgstr "Parametr %s je neplatnÃ½!"
-
-#: admin/macro/class_gofonMacroParameters.inc:408
-#: personal/phoneaccount/class_phoneAccount.inc:1600
-msgid "Information"
-msgstr "informace"
-
-#: admin/macro/class_gofonMacroParameters.inc:408
-msgid ""
-"Number of parameters for this macro has changed. Please update all users "
-"using it!"
-msgstr "PoÄet parametrÅ¯ tohoto makra se zmÄ›nil. ProsÃm aktualizujte nastavenÃ u vÅ¡ech, kteÅ™Ã jej vyuÅ¾ÃvajÃ!"
-
-#: admin/systems/asterisk/class_phoneGeneric.inc:151
-msgid "phone"
-msgstr "telefon"
-
-#: admin/systems/asterisk/class_phoneGeneric.inc:230
-msgid "yes"
-msgstr "ano"
-
-#: admin/systems/asterisk/class_phoneGeneric.inc:230
-msgid "no"
-msgstr "ne"
-
-#: admin/systems/asterisk/class_phoneGeneric.inc:247
-msgid "dynamic"
-msgstr "dynamickÃ©"
-
-#: admin/systems/asterisk/class_phoneGeneric.inc:247
-msgid "Networksettings"
-msgstr "nastavenÃ sÃtÄ›"
-
-#: admin/systems/asterisk/class_phoneGeneric.inc:330
-#: admin/systems/asterisk/class_phoneGeneric.inc:333
-msgid "IP address"
-msgstr "IP addresa"
-
-#: admin/systems/asterisk/class_phoneGeneric.inc:473
-msgid "Phone information"
-msgstr "Informace o telefonu"
-
-#: admin/systems/asterisk/class_phoneGeneric.inc:476
-#: personal/phoneaccount/class_phoneAccount.inc:1668
+#: admin/systems/asterisk/class_phoneIAX.inc:33
 msgid "Phone hardware"
-msgstr "typ telefonnÃho pÅ™Ãstroje"
-
-#: admin/systems/asterisk/class_phoneGeneric.inc:485
-msgid "SIP Mode"
-msgstr "reÅ¾im SIP"
-
-#: admin/systems/asterisk/class_phoneGeneric.inc:486
-msgid "SIP DTMF mode"
-msgstr "reÅ¾im SIP DTMF"
-
-#: admin/systems/asterisk/class_phoneGeneric.inc:487
-msgid "SIP Default ip"
-msgstr "vÃ½chozÃ IP pro SIP"
-
-#: admin/systems/asterisk/class_phoneGeneric.inc:488
-msgid "SIP Qualify"
-msgstr "kontrolovat dostupnost zaÅ™ÃzenÃ (SIP qualify)"
+msgstr "Typ telefonnÃho pÅ™Ãstroje"
 
-#: admin/systems/asterisk/class_phoneGeneric.inc:489
-msgid "IAX authentication type"
-msgstr "typ ovÄ›Å™ovÃ¡nÃ pro IAX"
-
-#: admin/systems/asterisk/class_phoneGeneric.inc:490
-msgid "IAX secret"
-msgstr "heslo do IAX"
-
-#: admin/systems/asterisk/class_phoneGeneric.inc:491
-msgid "IAX account code"
-msgstr "IAX â€“ identifikÃ¡tor volajÃcÃho pro ÃºÄely vyÃºÄtovÃ¡vÃ¡nÃ (account code)"
-
-#: admin/systems/asterisk/class_phoneGeneric.inc:492
-msgid "IAX trunk lines"
-msgstr "linky propojujÃcÃ ÃºstÅ™edny (trunk lines) pÅ™es IAX protokol"
+#: admin/systems/asterisk/class_phoneIAX.inc:46
+#: personal/asterisk/class_asteriskAccount.inc:42
+msgid "Telephone"
+msgstr "Telefon"
 
-#: admin/systems/asterisk/class_phoneGeneric.inc:493
-msgid "IAX permit settings"
-msgstr ""
+#: admin/systems/asterisk/class_phoneIAX.inc:49
+msgid "Name"
+msgstr "NÃ¡zev"
 
-#: admin/systems/asterisk/class_phoneGeneric.inc:494
-msgid "IAX deny settings"
-msgstr ""
+#: admin/systems/asterisk/class_phoneIAX.inc:49
+msgid "Name of this phone"
+msgstr "NÃ¡zev tohoto telefonu"
 
-#: admin/systems/asterisk/class_phoneGeneric.inc:495
-msgid "CAPI MSN"
-msgstr "CAPI MSN"
+#: admin/systems/asterisk/class_phoneIAX.inc:53
+msgid "Account name"
+msgstr "NÃ¡zev ÃºÄtu"
 
-#: admin/systems/asterisk/class_phoneGeneric.inc:496
-msgid "Hardware type"
-msgstr "typ pÅ™Ãstroje"
+#: admin/systems/asterisk/class_phoneIAX.inc:53
+msgid "Name of the account"
+msgstr "NÃ¡zev ÃºÄtu"
 
 #: admin/systems/services/asterisk/class_serviceAsterisk.inc:35
 msgid "VoIP database information"
@@ -720,7 +67,7 @@ msgstr "PÅ™ihlaÅ¡ovacÃ jmÃ©no sprÃ¡vce databÃ¡ze pro asterisk"
 
 #: admin/systems/services/asterisk/class_serviceAsterisk.inc:42
 msgid "Password"
-msgstr "heslo"
+msgstr "Heslo"
 
 #: admin/systems/services/asterisk/class_serviceAsterisk.inc:42
 msgid "Password for asterisk database administrator"
@@ -728,15 +75,15 @@ msgstr "Heslo k ÃºÄtu sprÃ¡vce databÃ¡ze pro asterisk"
 
 #: admin/systems/services/asterisk/class_serviceAsterisk.inc:46
 msgid "Country dial prefix"
-msgstr "pÅ™edvolba zemÄ›"
+msgstr "VolacÃ pÅ™edvolba zemÄ›"
 
 #: admin/systems/services/asterisk/class_serviceAsterisk.inc:50
 msgid "Local dial prefix"
-msgstr "mÃstnÃ pÅ™edvolba"
+msgstr "MÃstnÃ pÅ™edvolba"
 
 #: admin/systems/services/asterisk/class_serviceAsterisk.inc:54
 msgid "Driver"
-msgstr "ovladaÄ"
+msgstr "OvladaÄ"
 
 #: admin/systems/services/asterisk/class_serviceAsterisk.inc:54
 msgid "Driver to use to contact this database."
@@ -749,223 +96,36 @@ msgid ""
 "these objects '%s'."
 msgstr "DatabÃ¡zovÃ© rozÅ¡ÃÅ™enÃ ÃºstÅ™edny asterisk nynÃ nelze odebrat, protoÅ¾e je stÃ¡le pouÅ¾ÃvÃ¡na tÄ›mito objekty %s."
 
+#: admin/systems/services/asterisk/class_serviceAsterisk.inc:121
+msgid "LDAP error"
+msgstr "Chyba LDAP"
+
 #: admin/systems/services/asterisk/class_serviceAsterisk.inc:140
 msgid "VoIP service (asterisk)"
-msgstr "VoIP sluÅ¾ba (Asterisk)"
+msgstr "SluÅ¾ba VoIP (Asterisk)"
 
 #: admin/systems/services/asterisk/class_serviceAsterisk.inc:141
 msgid "VoIP - asterisk management"
-msgstr "VoIP - asterisk management"
+msgstr "VoIP â€“ sprÃ¡va ÃºstÅ™edny Asterisk"
 
 #: admin/systems/services/asterisk/class_serviceAsterisk.inc:141
 msgid "Services"
-msgstr "sluÅ¾by"
-
-#: addons/fonreports/class_fonreport.inc:232
-msgid "Insufficient permissions"
-msgstr "nedostateÄnÃ© oprÃ¡vnÄ›nÃ"
-
-#: addons/fonreports/class_fonreport.inc:251
-msgid "Y-M-D"
-msgstr "R-M-D"
-
-#: addons/fonreports/class_fonreport.inc:418
-#: addons/fonreports/class_fonreport.inc:419
-#: addons/fonreports/class_fonreport.inc:424 addons/fonreports/main.inc:46
-msgid "Phone reports"
-msgstr "PÅ™ehledy telefonu"
-
-#: addons/fonreports/class_fonreport.inc:419
-msgid "All entries are readonly"
-msgstr "vÅ¡echny poloÅ¾ky jsou pouze pro ÄtenÃ"
-
-#: addons/fonreports/class_fonreport.inc:428
-#: addons/fonreports/contents.tpl.c:32
-msgid "Date"
-msgstr "datum"
-
-#: addons/fonreports/class_fonreport.inc:429
-#: addons/fonreports/contents.tpl.c:35
-msgid "Source"
-msgstr "zdroj"
-
-#: addons/fonreports/class_fonreport.inc:430
-#: addons/fonreports/contents.tpl.c:38
-msgid "Destination"
-msgstr "cÃl"
-
-#: addons/fonreports/class_fonreport.inc:431
-#: addons/fonreports/contents.tpl.c:41
-msgid "Channel"
-msgstr "kanÃ¡l"
-
-#: addons/fonreports/class_fonreport.inc:432
-msgid "Application called"
-msgstr "volanÃ¡ aplikace"
-
-#: addons/fonreports/class_fonreport.inc:433
-msgid "Disposition"
-msgstr "uspoÅ™Ã¡dÃ¡nÃ"
-
-#: addons/fonreports/class_fonreport.inc:434
-#: addons/fonreports/contents.tpl.c:50
-msgid "Duration"
-msgstr "dÃ©lka trvÃ¡nÃ"
-
-#: personal/phoneaccount/class_phoneAccount.inc:176
-msgid "automatic"
-msgstr "automatickÃ©"
-
-#: personal/phoneaccount/class_phoneAccount.inc:212
-msgid "no macro"
-msgstr "Å¾Ã¡dnÃ© makro"
-
-#: personal/phoneaccount/class_phoneAccount.inc:240
-msgid "undefined"
-msgstr "nedefinovanÃ©"
-
-#: personal/phoneaccount/class_phoneAccount.inc:359
-#, php-format
-msgid ""
-"Cannot identify telephone extension in database, please try to save again."
-msgstr "NedaÅ™Ã se urÄit telefonnÃ ÄÃslo v databÃ¡zi â€“ zkuste prosÃm znovu uloÅ¾it."
-
-#: personal/phoneaccount/class_phoneAccount.inc:577
-#: personal/phoneaccount/class_phoneAccount.inc:595
-msgid "Abort saving entries to keep the database consistent."
-msgstr "ZruÅ¡te uklÃ¡dÃ¡nÃ poloÅ¾ek kvÅ¯li zachovÃ¡nÃ neporuÅ¡enosti databÃ¡ze."
-
-#: personal/phoneaccount/class_phoneAccount.inc:618
-#: personal/phoneaccount/class_phoneAccount.inc:657
-#: personal/phoneaccount/class_phoneAccount.inc:1520
-#, php-format
-msgid ""
-"FusionDirectory identified problems with your database table definition!"
-msgstr ""
-
-#: personal/phoneaccount/class_phoneAccount.inc:1023
-msgid "Remove phone account"
-msgstr "odebrat telefonnÃ ÃºÄet"
-
-#: personal/phoneaccount/class_phoneAccount.inc:1027
-#: personal/phoneaccount/class_phoneAccount.inc:1030
-msgid "Create phone account"
-msgstr "vytvoÅ™it telefonnÃ ÃºÄet"
-
-#: personal/phoneaccount/class_phoneAccount.inc:1028
-msgid "User uid"
-msgstr "UID uÅ¾ivatele"
-
-#: personal/phoneaccount/class_phoneAccount.inc:1046
-msgid "Selected macro is not available anymore!"
-msgstr "VybranÃ© makro uÅ¾ neexistuje!"
-
-#: personal/phoneaccount/class_phoneAccount.inc:1221
-msgid "Choose your private phone"
-msgstr "zvolte VÃ¡Å¡ soukromÃ½ telefon"
-
-#: personal/phoneaccount/class_phoneAccount.inc:1346
-msgid ""
-"There must be at least one server with an asterisk database to create a "
-"phone account."
-msgstr "Aby bylo moÅ¾nÃ© vytvoÅ™it telefonnÃ ÃºÄet, musÃ bÃ½t k dispozici alespoÅˆ jeden server s databÃ¡zÃ Asterisku."
-
-#: personal/phoneaccount/class_phoneAccount.inc:1354
-#: personal/phoneaccount/class_phoneAccount.inc:1357
-#: personal/phoneaccount/generic.tpl.c:29
-#: personal/phoneaccount/paste_generic.tpl.c:11
-msgid "Voicemail PIN"
-msgstr "PIN pro hlasovou schrÃ¡nku"
-
-#: personal/phoneaccount/class_phoneAccount.inc:1354
-msgid "Between 1-4 charactes"
-msgstr "1-4 znaky"
-
-#: personal/phoneaccount/class_phoneAccount.inc:1362
-#: personal/phoneaccount/generic.tpl.c:32
-#: personal/phoneaccount/paste_generic.tpl.c:14
-msgid "Phone PIN"
-msgstr "PIN telefonu"
-
-#: personal/phoneaccount/class_phoneAccount.inc:1394
-#: admin/conference/generic.tpl.c:38 admin/conference/paste_generic.tpl.c:8
-msgid "Phone number"
-msgstr "telefonnÃ ÄÃslo"
-
-#: personal/phoneaccount/class_phoneAccount.inc:1402
-#, php-format
-msgid "macro parameter %s"
-msgstr "parametr makra %s"
-
-#: personal/phoneaccount/class_phoneAccount.inc:1450
-msgid "An error occured while updating the database entries!"
-msgstr "Vyskytla se chyba pÅ™i aktualizaci poloÅ¾ek v databÃ¡zi!"
-
-#: personal/phoneaccount/class_phoneAccount.inc:1567
-msgid "Was not able to found any asterisk server"
-msgstr "Nebylo moÅ¾nÃ© najÃt jakÃ½koli Asterisk server"
-
-#: personal/phoneaccount/class_phoneAccount.inc:1600
-#, php-format
-msgid "User '%s' has been removed from phone queue '%s'."
-msgstr "UÅ¾ivatel '%s' byl odebrÃ¡n z fronty hovorÅ¯ '%s'."
-
-#: personal/phoneaccount/class_phoneAccount.inc:1637
-#: personal/phoneaccount/class_phoneAccount.inc:1639
-#, php-format
-msgid "The specified telephonenumber '%s' is already assigned to '%s'."
-msgstr "ZadanÃ© telefonnÃ ÄÃslo %s je jiÅ¾ pÅ™iÅ™azenÃ© %s."
-
-#: personal/phoneaccount/class_phoneAccount.inc:1649
-#, php-format
-msgid ""
-"The previously selected asterisk home server (%s) is no longer available. "
-"Remove aborted."
-msgstr "ZvolenÃ½ domovskÃ½ Asterisk server (%s) jiÅ¾ nenÃ k dispozici. OdebÃrÃ¡nÃ pÅ™eruÅ¡eno."
-
-#: personal/phoneaccount/class_phoneAccount.inc:1658
-msgid "Phone account settings"
-msgstr "nastavenÃ telefonnÃho ÃºÄtu"
-
-#: personal/phoneaccount/class_phoneAccount.inc:1667
-msgid "Macro settings"
-msgstr "nastavenÃ makra"
-
-#: personal/phoneaccount/class_phoneAccount.inc:1670
-msgid "Phone context"
-msgstr "TelefonnÃ kontext"
-
-#: personal/phoneaccount/class_phoneAccount.inc:1671
-msgid "Voice mail context"
-msgstr "Kontext hlasovÃ© schrÃ¡nky"
-
-#: personal/phoneaccount/class_phoneAccount.inc:1672
-msgid "Telephone pin"
-msgstr "PIN telefonu"
-
-#: personal/phoneaccount/class_phoneAccount.inc:1673
-msgid "Voicemail pin"
-msgstr "PIN hlasovÃ© schrÃ¡nky"
-
-#: personal/phoneaccount/class_phoneAccount.inc:1695
-#, php-format
-msgid "You need to configure %s contexts first"
-msgstr "Nejprve je tÅ™eba nastavit kontexty %s"
-
-#: personal/phoneaccount/main.inc:124
-msgid "Click the 'Edit' button below to change informations in this dialog"
-msgstr "pro zmÄ›nu informacÃ v tomto dialogu kliknÄ›te na 'upravit'"
-
-#: personal/phoneaccount/main.inc:134
-#: personal/phoneaccount/paste_generic.tpl.c:2
-msgid "Phone settings"
-msgstr "nastavenÃ telefonu"
+msgstr "SluÅ¾by"
 
+#: personal/asterisk/class_asteriskAccount.inc:30
 #: config/asterisk/class_asteriskPluginConfig.inc:28
 #: config/asterisk/class_asteriskPluginConfig.inc:41
 msgid "Asterisk"
 msgstr ""
 
+#: personal/asterisk/class_asteriskAccount.inc:31
+msgid "Asterisk account"
+msgstr "ÃšÄet Asterisk"
+
+#: personal/asterisk/class_asteriskAccount.inc:45
+msgid "Select the phone associated to this user"
+msgstr "Vyberte telefon, pÅ™iÅ™azenÃ½ tomuto uÅ¾ivateli"
+
 #: config/asterisk/class_asteriskPluginConfig.inc:29
 msgid "Asterisk plugin configuration"
 msgstr "NastavenÃ zÃ¡suvnÃ©ho modulu Asterisk"
@@ -988,15 +148,15 @@ msgstr "VÄ›tev, ve kterÃ© budou uklÃ¡dÃ¡na telefonnÃ makra"
 
 #: config/asterisk/class_asteriskPluginConfig.inc:54
 msgid "Phone Conference RDN"
-msgstr "RelativnÃ rozliÅ¡enÃ½ nÃ¡zev telefonickÃ© konference"
+msgstr "RelativnÃ rozliÅ¡enÃ½ nÃ¡zev telefonnÃ konference"
 
 #: config/asterisk/class_asteriskPluginConfig.inc:54
 msgid "Branch in which phone conferences will be stored"
-msgstr "VÄ›tev, ve kterÃ© budou uloÅ¾eny telefonickÃ© konference"
+msgstr "VÄ›tev, ve kterÃ© budou uloÅ¾eny telefonnÃ konference"
 
 #: config/asterisk/class_asteriskPluginConfig.inc:61
 msgid "Miscellaneous"
-msgstr "rÅ¯znÃ©"
+msgstr "RÅ¯znÃ©"
 
 #: config/asterisk/class_asteriskPluginConfig.inc:65
 msgid "SIP contexts"
@@ -1013,338 +173,3 @@ msgstr "Kontexty hlasovÃ© schrÃ¡nky"
 #: config/asterisk/class_asteriskPluginConfig.inc:72
 msgid "Available voicemail contexts"
 msgstr "DostupnÃ© kontexty hlasovÃ½ch schrÃ¡nek"
-
-#: admin/ogroups/asterisk/phonequeue.tpl.c:2
-msgid ""
-"Only users with the same asterisk home server will be included to this "
-"queue."
-msgstr "Do tÃ©to fronty budou zaÅ™azovÃ¡ni pouze uÅ¾ivatelÃ© se stejnÃ½m domovskÃ½m Asterisk serverem."
-
-#: admin/ogroups/asterisk/phonequeue.tpl.c:5
-#: personal/phoneaccount/generic.tpl.c:2
-#: personal/phoneaccount/paste_generic.tpl.c:5
-msgid "Phone numbers"
-msgstr "telefonnÃ ÄÃsla"
-
-#: admin/ogroups/asterisk/phonequeue.tpl.c:8
-msgid "Up"
-msgstr "nahoru"
-
-#: admin/ogroups/asterisk/phonequeue.tpl.c:11
-msgid "Down"
-msgstr "dolÅ¯"
-
-#: admin/ogroups/asterisk/phonequeue.tpl.c:14
-#: admin/conference/generic.tpl.c:41
-msgid "Options"
-msgstr "volby"
-
-#: admin/ogroups/asterisk/phonequeue.tpl.c:29
-msgid "Strategy"
-msgstr "strategie"
-
-#: admin/ogroups/asterisk/phonequeue.tpl.c:38
-msgid "(in seconds)"
-msgstr "(ve vteÅ™inÃ¡ch)"
-
-#: admin/ogroups/asterisk/phonequeue.tpl.c:41
-msgid "Queue sound setup"
-msgstr "nastavenÃ zvuku fronty"
-
-#: admin/ogroups/asterisk/phonequeue.tpl.c:44
-msgid "Use music on hold instead of ringing"
-msgstr ""
-
-#: admin/ogroups/asterisk/phonequeue.tpl.c:50
-msgid "Welcome sound file"
-msgstr "uvÃtacÃ zvukovÃ½ soubor"
-
-#: admin/ogroups/asterisk/phonequeue.tpl.c:53
-msgid "Announce message"
-msgstr "oznamovacÃ zprÃ¡va"
-
-#: admin/ogroups/asterisk/phonequeue.tpl.c:56
-msgid "Sound file for 'You are next ...'"
-msgstr "NahrÃ¡vka â€žJste dalÅ¡Ã v poÅ™adÃâ€¦â€œ"
-
-#: admin/ogroups/asterisk/phonequeue.tpl.c:59
-msgid "'There are ...'"
-msgstr "â€žje zdeâ€¦â€œ"
-
-#: admin/ogroups/asterisk/phonequeue.tpl.c:62
-msgid "'... calls waiting'"
-msgstr "â€žâ€¦ÄekajÃcÃch hovorÅ¯â€œ"
-
-#: admin/ogroups/asterisk/phonequeue.tpl.c:65
-msgid "'Thank you' message"
-msgstr "ZprÃ¡va â€žDÄ›kujemeâ€œ"
-
-#: admin/ogroups/asterisk/phonequeue.tpl.c:68
-msgid "'minutes' sound file"
-msgstr "nahrÃ¡vka â€žminutâ€œ"
-
-#: admin/ogroups/asterisk/phonequeue.tpl.c:71
-msgid "'seconds' sound file"
-msgstr "nahrÃ¡vka â€žvteÅ™inâ€œ"
-
-#: admin/ogroups/asterisk/phonequeue.tpl.c:74
-msgid "Hold sound file"
-msgstr ""
-
-#: admin/ogroups/asterisk/phonequeue.tpl.c:77
-msgid "Less Than sound file"
-msgstr "nahrÃ¡vka â€žmÃ©nÄ› neÅ¾â€œ"
-
-#: admin/ogroups/asterisk/phonequeue.tpl.c:80
-msgid "Phone attributes "
-msgstr "vlastnosti telefonu"
-
-#: admin/conference/conf-filter.tpl.c:2 admin/macro/macro-filter.tpl.c:2
-#: addons/fonreports/contents.tpl.c:2
-msgid "Filter"
-msgstr "filtr"
-
-#: admin/conference/generic.tpl.c:2
-msgid "Properties"
-msgstr "vlastnosti"
-
-#: admin/conference/generic.tpl.c:5 admin/conference/paste_generic.tpl.c:2
-msgid "Conference name"
-msgstr "nÃ¡zev konference"
-
-#: admin/conference/generic.tpl.c:8 admin/conference/paste_generic.tpl.c:5
-msgid "Name of conference to create"
-msgstr "nÃ¡zev novÄ› vytvÃ¡Å™enÃ© konference"
-
-#: admin/conference/generic.tpl.c:11
-msgid "Type"
-msgstr "typ"
-
-#: admin/conference/generic.tpl.c:14
-msgid "Choose subtree to place conference in"
-msgstr "vyberte podstrom pro umÃstÄ›nÃ konference"
-
-#: admin/conference/generic.tpl.c:26
-msgid "Select language"
-msgstr "zvolte jazyk"
-
-#: admin/conference/generic.tpl.c:32
-msgid "Descriptive text for department"
-msgstr "popis oddÄ›lenÃ"
-
-#: admin/conference/generic.tpl.c:35
-msgid "Lifetime (in days)"
-msgstr "Å¾ivotnost (dny)"
-
-#: admin/conference/generic.tpl.c:53
-msgid "Sound file format"
-msgstr "datovÃ½ formÃ¡t zvukovÃ©ho souboru"
-
-#: admin/conference/generic.tpl.c:56
-msgid "Choose subtree to place department in"
-msgstr "vyberte podstrom pro umÃstÄ›nÃ oddÄ›lenÃ"
-
-#: admin/conference/generic.tpl.c:62
-msgid "Activate session menu"
-msgstr "zapnout nabÃdku relace"
-
-#: admin/conference/generic.tpl.c:65
-msgid "Announce users joining or leaving the conference"
-msgstr "upozorÅˆovat na pÅ™ipojovÃ¡nÃ a odpojovÃ¡nÃ ÃºÄastnÃkÅ¯ konference"
-
-#: admin/conference/generic.tpl.c:68
-msgid "Count users"
-msgstr "spoÄÃtat uÅ¾ivatele"
-
-#: admin/conference/remove.tpl.c:5 admin/macro/remove.tpl.c:5
-msgid ""
-"Please double check if you really want to do this since there is no way for "
-"FusionDirectory to get your data back."
-msgstr "TÃ½kÃ¡ se veÅ¡kerÃ½ch informacÃ o tÃ©to poloÅ¾ce v adresÃ¡Å™i. ProsÃm velmi dobÅ™e si rozmyslete, zda to opravdu chcete udÄ›lat, protoÅ¾e provedenÃ© zmÄ›ny uÅ¾ ve FusionDirectory nepÅ¯jde vzÃt nijak jednoduÅ¡e zpÄ›t (nanejvÃ½Å¡ sloÅ¾itÄ› ze zÃ¡loh, pokud existujÃ a obsahujÃ potÅ™ebnÃ¡ data)!"
-
-#: admin/conference/remove.tpl.c:8 admin/macro/remove.tpl.c:8
-msgid "So - if you're sure - press 'Delete' to continue or 'Cancel' to abort."
-msgstr "Tedy â€“ pokud jste si jist(a), stisknÄ›te 'smazat'. V opaÄnÃ©m pÅ™ÃpadÄ› operaci zruÅ¡te pomocÃ 'zruÅ¡it'."
-
-#: admin/macro/generic.tpl.c:11
-msgid "Macro name to be displayed"
-msgstr "nÃ¡zev makra, kterÃ© mÃ¡ bÃ½t zobrazeno"
-
-#: admin/macro/generic.tpl.c:20
-msgid "Visible for user"
-msgstr "viditelnÃ© uÅ¾ivateli"
-
-#: admin/macro/generic.tpl.c:23
-msgid "Macro text"
-msgstr "text makra"
-
-#: admin/macro/parameter.tpl.c:2
-msgid "Argument"
-msgstr "argument"
-
-#: admin/macro/parameter.tpl.c:8
-msgid "type"
-msgstr "typ"
-
-#: admin/macro/parameter.tpl.c:11
-msgid "Default value"
-msgstr "vÃ½chozÃ hodnota"
-
-#: admin/macro/parameter.tpl.c:14
-msgid "You are not allowed to view the macro parameter settings"
-msgstr "nejste oprÃ¡vnÄ›n(a) zobrazit nastavenÃ parametrÅ¯ makra"
-
-#: admin/systems/asterisk/phonesettings.tpl.c:2
-msgid "Advanced phone settings"
-msgstr "pokroÄilÃ¡ nastavenÃ telefonu"
-
-#: admin/systems/asterisk/phonesettings.tpl.c:5
-msgid "Phone type"
-msgstr "typ telefonu"
-
-#: admin/systems/asterisk/phonesettings.tpl.c:8
-#: admin/systems/asterisk/phonesettings.tpl.c:14
-#: admin/systems/asterisk/phonesettings.tpl.c:20
-#: admin/systems/asterisk/phonesettings.tpl.c:26
-#: admin/systems/asterisk/phonesettings.tpl.c:35
-#: admin/systems/asterisk/phonesettings.tpl.c:47
-#: admin/systems/asterisk/phonesettings.tpl.c:65
-msgid "Choose a phone type"
-msgstr "zvolte typ telefonu"
-
-#: admin/systems/asterisk/phonesettings.tpl.c:11
-msgid "Mode"
-msgstr "reÅ¾im"
-
-#: admin/systems/asterisk/phonesettings.tpl.c:17
-msgid "DTMF mode"
-msgstr "reÅ¾im DTMF"
-
-#: admin/systems/asterisk/phonesettings.tpl.c:23
-#: admin/systems/asterisk/phonesettings.tpl.c:38
-msgid "Default IP"
-msgstr "vÃ½chozÃ IP"
-
-#: admin/systems/asterisk/phonesettings.tpl.c:29
-#: admin/systems/asterisk/phonesettings.tpl.c:41
-msgid "Response timeout"
-msgstr ""
-
-#: admin/systems/asterisk/phonesettings.tpl.c:32
-msgid "Modus"
-msgstr "reÅ¾im"
-
-#: admin/systems/asterisk/phonesettings.tpl.c:44
-msgid "Authtype"
-msgstr "typ ovÄ›Å™ovÃ¡nÃ"
-
-#: admin/systems/asterisk/phonesettings.tpl.c:50
-msgid "Secret"
-msgstr "heslo"
-
-#: admin/systems/asterisk/phonesettings.tpl.c:53
-msgid "GoFonInkeys"
-msgstr "GoFonInkeys"
-
-#: admin/systems/asterisk/phonesettings.tpl.c:56
-msgid "GoFonOutKeys"
-msgstr "GoFonOutKeys"
-
-#: admin/systems/asterisk/phonesettings.tpl.c:59
-msgid "Account code"
-msgstr "KÃ³d ÃºÄtu"
-
-#: admin/systems/asterisk/phonesettings.tpl.c:62
-msgid "Trunk lines"
-msgstr "linky propojujÃcÃ ÃºstÅ™edny (trunk lines)"
-
-#: admin/systems/asterisk/phonesettings.tpl.c:68
-msgid "Hosts that are allowed to connect"
-msgstr "systÃ©my, kterÃ½m je dovoleno se pÅ™ipojit"
-
-#: admin/systems/asterisk/phonesettings.tpl.c:71
-#: admin/systems/asterisk/phonesettings.tpl.c:77
-msgid "List of alternative mail addresses"
-msgstr "seznam alternativnÃch e-mailovÃ½ch adres"
-
-#: admin/systems/asterisk/phonesettings.tpl.c:74
-msgid "Hosts that are not allowed to connect"
-msgstr "stroje, kterÃ½m nenÃ dovoleno pÅ™ipojit se"
-
-#: admin/systems/asterisk/phonesettings.tpl.c:80
-msgid "MSN"
-msgstr ""
-
-#: admin/systems/asterisk/phone.tpl.c:2
-msgid "Phone name"
-msgstr "nÃ¡zev telefonu"
-
-#: addons/fonreports/contents.tpl.c:5
-msgid "Search for"
-msgstr "hledat"
-
-#: addons/fonreports/contents.tpl.c:8
-msgid "Enter user name to search for"
-msgstr "zadejte jmÃ©no uÅ¾ivatele, kterÃ½ mÃ¡ bÃ½t vyhledÃ¡n"
-
-#: addons/fonreports/contents.tpl.c:11 addons/fonreports/contents.tpl.c:26
-msgid "in"
-msgstr "v"
-
-#: addons/fonreports/contents.tpl.c:14
-msgid "Select subtree to base search on"
-msgstr "zvolte podstrom, ve kterÃ©m se bude hledat"
-
-#: addons/fonreports/contents.tpl.c:17
-msgid "on"
-msgstr "zapnuto"
-
-#: addons/fonreports/contents.tpl.c:20
-msgid "Select server to search on"
-msgstr "zvolte server na kterÃ©m se bude vyhledÃ¡vat"
-
-#: addons/fonreports/contents.tpl.c:23
-msgid "during"
-msgstr "bÄ›hem"
-
-#: addons/fonreports/contents.tpl.c:29
-msgid "Search"
-msgstr "hledat"
-
-#: addons/fonreports/contents.tpl.c:44
-msgid "Application"
-msgstr "aplikace"
-
-#: addons/fonreports/contents.tpl.c:47
-msgid "Status"
-msgstr "stav"
-
-#: addons/fonreports/contents.tpl.c:53
-msgid "Search returned no results..."
-msgstr "Nic nebylo nalezenoâ€¦"
-
-#: personal/phoneaccount/generic.tpl.c:5
-#: personal/phoneaccount/paste_generic.tpl.c:8
-msgid "Telephone hardware"
-msgstr ""
-
-#: personal/phoneaccount/generic.tpl.c:8
-msgid "Telephone"
-msgstr "telefon"
-
-#: personal/phoneaccount/generic.tpl.c:14
-msgid "Select the accounts home server"
-msgstr "nastavit domovskÃ½ server pro ÃºÄty"
-
-#: personal/phoneaccount/generic.tpl.c:17
-msgid "Context"
-msgstr "kontext"
-
-#: personal/phoneaccount/generic.tpl.c:20
-#: personal/phoneaccount/generic.tpl.c:26
-msgid "Select the accounts context"
-msgstr ""
-
-#: personal/phoneaccount/generic.tpl.c:23
-msgid "Voicemail context"
-msgstr ""
diff --git a/asterisk/locale/de/fusiondirectory.po b/asterisk/locale/de/fusiondirectory.po
index ebcd54183fc9f8476b8990d5c4e9c0b20b11d086..41658da03c3e7460c88fea059ee8d8f962b97681 100644
--- a/asterisk/locale/de/fusiondirectory.po
+++ b/asterisk/locale/de/fusiondirectory.po
@@ -3,706 +3,56 @@
 # This file is distributed under the same license as the PACKAGE package.
 # 
 # Translators:
-#  Stefan Koehler <stefan.koehler@GONICUS.de>, 2005
+# Ettore Atalan <atalanttore@googlemail.com>, 2014
+# Maik Wagner <maikwagner@yahoo.com>, 2013
 msgid ""
 msgstr ""
-"Project-Id-Version: FusionDirectory-108\n"
+"Project-Id-Version: FusionDirectory-109\n"
 "Report-Msgid-Bugs-To: documentation@lists.fusiondirectory.org\n"
-"POT-Creation-Date: 2015-03-31 11:49+0200\n"
-"PO-Revision-Date: 2015-03-31 11:41+0000\n"
+"POT-Creation-Date: 2014-12-15 17:47+0100\n"
+"PO-Revision-Date: 2015-02-25 16:13+0000\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>\n"
-"Language-Team: German (http://www.transifex.com/projects/p/FusionDirectory-108/language/de/)\n"
+"Language-Team: German (http://www.transifex.com/projects/p/FusionDirectory-109/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/ogroups/asterisk/class_phonequeue.inc:110
-#: admin/conference/class_phoneConferenceGeneric.inc:104
-#: personal/phoneaccount/class_phoneAccount.inc:148
-msgid "Obsolete entry"
-msgstr "Veralteter Eintrag"
-
-#: admin/ogroups/asterisk/class_phonequeue.inc:110
-#: admin/conference/class_phoneConferenceGeneric.inc:104
-#: personal/phoneaccount/class_phoneAccount.inc:148
-#, php-format
-msgid ""
-"The current home server is not available anymore. It will be moved to '%s' "
-"if you save this entry!"
-msgstr "Der momentane Anmeldeserver ist nicht mehr verfÃ¼gbar. Er wird auf '%s' gewechselt, wenn Sie diesen Eintrag speichern!"
-
-#: admin/ogroups/asterisk/class_phonequeue.inc:140
-msgid "ring all"
-msgstr "alle gleichzeitig"
-
-#: admin/ogroups/asterisk/class_phonequeue.inc:141
-msgid "round robin"
-msgstr "nacheinander"
-
-#: admin/ogroups/asterisk/class_phonequeue.inc:142
-msgid "least recently called"
-msgstr "am wenigsten Anrufe"
-
-#: admin/ogroups/asterisk/class_phonequeue.inc:143
-msgid "fewest completed calls"
-msgstr "am wenigsten abgeschlossene Anrufe"
-
-#: admin/ogroups/asterisk/class_phonequeue.inc:144
-msgid "random"
-msgstr "zufÃ¤llig"
-
-#: admin/ogroups/asterisk/class_phonequeue.inc:145
-msgid "round robin with memory"
-msgstr "nacheinander (mit Speicher)"
-
-#: admin/ogroups/asterisk/class_phonequeue.inc:180
-msgid "Remove the phone queue from this Account"
-msgstr "Warteschlange von diesem Konto entfernen"
-
-#: admin/ogroups/asterisk/class_phonequeue.inc:181
-#: admin/ogroups/asterisk/class_phonequeue.inc:184
-msgid "phone queue"
-msgstr "Telefon-Warteschlange"
-
-#: admin/ogroups/asterisk/class_phonequeue.inc:183
-msgid "Create phone queue"
-msgstr "Warteschlange erstellen"
-
-#: admin/ogroups/asterisk/class_phonequeue.inc:272
-msgid ""
-"There must be at least one server with an asterisk database to create a "
-"phone queue."
-msgstr "Es muss mindestens ein Server mit einer Asterisk-Datenbank bestehen, um eine Telefon-Warteschlange zu erstellen."
-
-#: admin/ogroups/asterisk/class_phonequeue.inc:275
-#: admin/ogroups/asterisk/class_phonequeue.inc:873
-#: admin/conference/class_phoneConferenceGeneric.inc:709
-#: personal/phoneaccount/class_phoneAccount.inc:1350
-#: personal/phoneaccount/class_phoneAccount.inc:1669
-#: admin/ogroups/asterisk/phonequeue.tpl.c:17
-#: admin/conference/generic.tpl.c:20 personal/phoneaccount/generic.tpl.c:11
-msgid "Home server"
-msgstr "Home-Server"
-
-#: admin/ogroups/asterisk/class_phonequeue.inc:281
-#: admin/ogroups/asterisk/class_phonequeue.inc:871
-#: admin/ogroups/asterisk/phonequeue.tpl.c:23
-msgid "Timeout"
-msgstr "Wartezeit"
-
-#: admin/ogroups/asterisk/class_phonequeue.inc:284
-#: admin/ogroups/asterisk/class_phonequeue.inc:896
-#: admin/ogroups/asterisk/phonequeue.tpl.c:26
-msgid "Retry"
-msgstr "Wiederholen"
-
-#: admin/ogroups/asterisk/class_phonequeue.inc:287
-msgid "Queue length"
-msgstr "GrÃ¶ÃŸe der Warteschlange"
-
-#: admin/ogroups/asterisk/class_phonequeue.inc:290
-#: admin/ogroups/asterisk/class_phonequeue.inc:874
-#: admin/ogroups/asterisk/phonequeue.tpl.c:35
-msgid "Announce frequency"
-msgstr "Benachrichtigungsfrequenz"
-
-#: admin/ogroups/asterisk/class_phonequeue.inc:293
-#: admin/conference/class_phoneConferenceGeneric.inc:328
-msgid "Number"
-msgstr "Nummer"
-
-#: admin/ogroups/asterisk/class_phonequeue.inc:316
-#: admin/ogroups/asterisk/class_phonequeue.inc:361
-msgid "asterisk"
-msgstr "Asterisk"
-
-#: admin/ogroups/asterisk/class_phonequeue.inc:345
-#: admin/ogroups/asterisk/class_phonequeue.inc:696
-#: admin/conference/class_phoneConferenceGeneric.inc:369
-#: admin/macro/class_gofonMacro.inc:381 admin/macro/class_gofonMacro.inc:465
-#: addons/fonreports/class_fonreport.inc:190
-#: addons/fonreports/class_fonreport.inc:220
-#: personal/phoneaccount/class_phoneAccount.inc:455
-#: personal/phoneaccount/class_phoneAccount.inc:1061
-msgid "GOfon"
-msgstr "GOfon"
-
-#: admin/ogroups/asterisk/class_phonequeue.inc:401
-msgid "Cannot find old queue entry!"
-msgstr "Kann alten Warteschlangen-Eintrag nicht finden!"
-
-#: admin/ogroups/asterisk/class_phonequeue.inc:487
-#, php-format
-msgid ""
-"Found more than one entry named '%s' in queue table. Please inform your "
-"system administrator!"
-msgstr "Es wurde mehr als ein Eintrag mit dem Namen '%s' in der Warteschlangen-Tabelle gefunden. Bitte informieren Sie Ihren System-Administrator!"
-
-#: admin/ogroups/asterisk/class_phonequeue.inc:728
-#: admin/ogroups/asterisk/class_phonequeue.inc:730
-msgid "telephone number"
-msgstr "Telefonnummer"
-
-#: admin/ogroups/asterisk/class_phonequeue.inc:787
-#: admin/ogroups/asterisk/class_phonequeue.inc:829
-#: admin/conference/class_phoneConferenceGeneric.inc:229
-#: admin/conference/class_phoneConferenceGeneric.inc:233
-#: admin/conference/class_phoneConferenceGeneric.inc:271
-#: admin/macro/class_gofonMacro.inc:343 admin/macro/class_gofonMacro.inc:452
-#: admin/macro/class_gofonMacro.inc:461 admin/macro/class_gofonMacro.inc:499
-#: admin/systems/asterisk/class_phoneGeneric.inc:267
-#: admin/systems/asterisk/class_phoneGeneric.inc:308
-#: addons/fonreports/class_fonreport.inc:220
-#: personal/phoneaccount/class_phoneAccount.inc:1046
-#: personal/phoneaccount/class_phoneAccount.inc:1166
-#: personal/phoneaccount/class_phoneAccount.inc:1172
-#: personal/phoneaccount/class_phoneAccount.inc:1368
-#: personal/phoneaccount/class_phoneAccount.inc:1450
-#: personal/phoneaccount/class_phoneAccount.inc:1528
-msgid "Error"
-msgstr "Fehler"
-
-#: admin/ogroups/asterisk/class_phonequeue.inc:802
-#: admin/ogroups/asterisk/class_phonequeue.inc:857
-#: admin/conference/class_phoneConferenceGeneric.inc:682
-#: admin/macro/class_gofonMacro.inc:473 admin/macro/class_gofonMacro.inc:484
-#: admin/macro/class_gofonMacro.inc:521
-#: admin/macro/class_gofonMacroParameters.inc:435
-#: admin/systems/asterisk/class_phoneGeneric.inc:277
-#: admin/systems/asterisk/class_phoneGeneric.inc:432
-#: admin/systems/asterisk/class_phoneGeneric.inc:446
-#: admin/systems/asterisk/class_phoneGeneric.inc:463
-#: admin/systems/services/asterisk/class_serviceAsterisk.inc:121
-#: personal/phoneaccount/class_phoneAccount.inc:1476
-#: personal/phoneaccount/class_phoneAccount.inc:1609
-msgid "LDAP error"
-msgstr "LDAP-Fehler"
-
-#: admin/ogroups/asterisk/class_phonequeue.inc:864
-#: admin/systems/asterisk/class_phoneGeneric.inc:472
-#: admin/systems/asterisk/class_phoneGeneric.inc:477
-#: personal/phoneaccount/class_phoneAccount.inc:999
-#: personal/phoneaccount/class_phoneAccount.inc:1012
-#: personal/phoneaccount/class_phoneAccount.inc:1024
-#: personal/phoneaccount/class_phoneAccount.inc:1028
-#: personal/phoneaccount/class_phoneAccount.inc:1031
-#: personal/phoneaccount/class_phoneAccount.inc:1657
+#: admin/systems/asterisk/class_phoneIAX.inc:30
+#: admin/systems/asterisk/class_phoneIAX.inc:34
+#: personal/asterisk/class_asteriskAccount.inc:45
 msgid "Phone"
 msgstr "Telefon"
 
-#: admin/ogroups/asterisk/class_phonequeue.inc:865
-msgid "Phone group"
-msgstr "Telefon-Gruppe"
-
-#: admin/ogroups/asterisk/class_phonequeue.inc:872
-#: admin/ogroups/asterisk/phonequeue.tpl.c:32
-msgid "Max queue length"
-msgstr "Maximale GrÃ¶sse der Warteschlange"
-
-#: admin/ogroups/asterisk/class_phonequeue.inc:875
-#: admin/ogroups/asterisk/phonequeue.tpl.c:86
-msgid "Allow the called user to transfer his call"
-msgstr "Erlaube Weiterleiten des GesprÃ¤chs (Angerufener)"
-
-#: admin/ogroups/asterisk/class_phonequeue.inc:876
-#: admin/ogroups/asterisk/phonequeue.tpl.c:89
-msgid "Allows calling user to transfer call"
-msgstr "Erlaube Weiterleiten des GesprÃ¤chs (Anrufer)"
-
-#: admin/ogroups/asterisk/class_phonequeue.inc:877
-#: admin/ogroups/asterisk/phonequeue.tpl.c:92
-msgid "Allow the called to hangup by pressing *"
-msgstr "Auflegen durch DrÃ¼cken der Taste '*' (Angerufener)"
-
-#: admin/ogroups/asterisk/class_phonequeue.inc:878
-#: admin/ogroups/asterisk/phonequeue.tpl.c:98
-msgid "Ring instead of playing background music"
-msgstr "Klingelton statt Hintergrund-Musik"
+#: admin/systems/asterisk/class_phoneIAX.inc:31
+msgid "Asterisk phone"
+msgstr "Asterisk-Telefon"
 
-#: admin/ogroups/asterisk/class_phonequeue.inc:879
-#: admin/ogroups/asterisk/phonequeue.tpl.c:95
-msgid "Allows calling to hangup by pressing *"
-msgstr "Auflegen durch DrÃ¼cken der Taste '*' (Anrufer)"
-
-#: admin/ogroups/asterisk/class_phonequeue.inc:881
-#: admin/ogroups/asterisk/phonequeue.tpl.c:47
-msgid "Music on hold"
-msgstr "Wartemusik"
-
-#: admin/ogroups/asterisk/class_phonequeue.inc:882
-msgid "Welcome music"
-msgstr "BegrÃ¼ÃŸungsmusik"
-
-#: admin/ogroups/asterisk/class_phonequeue.inc:883
-msgid "Report hold time"
-msgstr "Benachrichtige Ã¼ber Wartezeit"
-
-#: admin/ogroups/asterisk/class_phonequeue.inc:884
-msgid "'You are next' sound"
-msgstr "'Sie sind der NÃ¤chste'-Ton"
-
-#: admin/ogroups/asterisk/class_phonequeue.inc:885
-msgid "'There are' sound"
-msgstr "'Es gibt ...'-Ton"
-
-#: admin/ogroups/asterisk/class_phonequeue.inc:886
-msgid "'Call waiting' sound"
-msgstr "'wartender Anruf'-Ton"
-
-#: admin/ogroups/asterisk/class_phonequeue.inc:887
-msgid "'Thank you' sound"
-msgstr "'Vielen Dank'-Ton"
-
-#: admin/ogroups/asterisk/class_phonequeue.inc:888
-msgid "'Minutes' sound"
-msgstr "'Minuten'-Ton"
-
-#: admin/ogroups/asterisk/class_phonequeue.inc:889
-msgid "'Seconds' sound"
-msgstr "'Sekunden'-Ton"
-
-#: admin/ogroups/asterisk/class_phonequeue.inc:890
-msgid "'Less than' sound"
-msgstr "'Weniger als'-Ton"
-
-#: admin/ogroups/asterisk/class_phonequeue.inc:891
-msgid "Queue phone number"
-msgstr "Telefonnummer der Warteschlange"
-
-#: admin/ogroups/asterisk/class_phonequeue.inc:892
-#: admin/conference/class_phoneConferenceGeneric.inc:707
-#: admin/ogroups/asterisk/phonequeue.tpl.c:20
-#: admin/conference/generic.tpl.c:23
-msgid "Language"
-msgstr "Sprache"
-
-#: admin/ogroups/asterisk/class_phonequeue.inc:893
-msgid "Method"
-msgstr "Methode"
-
-#: admin/ogroups/asterisk/class_phonequeue.inc:894
-#: admin/ogroups/asterisk/phonequeue.tpl.c:83
-msgid "Announce holdtime"
-msgstr "Benachrichtige Ã¼ber Wartezeit"
-
-#: admin/ogroups/asterisk/class_phonequeue.inc:895
-msgid "Announce"
-msgstr "AnkÃ¼ndigung"
-
-#: admin/conference/conf-list.xml:11
-msgid "List of conference rooms"
-msgstr "Liste der Konferenz-RÃ¤ume"
-
-#: admin/conference/conf-list.xml:15 admin/conference/conf-list.xml:74
-msgid "Conference"
-msgstr "Konferenz"
-
-#: admin/conference/conf-list.xml:41
-#: admin/conference/class_phoneConferenceGeneric.inc:324
-#: admin/conference/class_phoneConferenceGeneric.inc:347
-#: admin/conference/class_phoneConferenceGeneric.inc:702
-#: admin/macro/class_gofonMacro.inc:395 admin/macro/class_gofonMacro.inc:406
-#: admin/macro/macro-list.xml:41
-#: admin/systems/asterisk/class_phoneGeneric.inc:344
-#: admin/systems/asterisk/class_phoneGeneric.inc:348
-#: admin/systems/asterisk/class_phoneGeneric.inc:351
-#: admin/systems/asterisk/class_phoneGeneric.inc:366
-#: admin/systems/asterisk/class_phoneGeneric.inc:482
-#: admin/conference/conf-filter.tpl.c:5 admin/macro/macro-filter.tpl.c:5
-#: admin/macro/parameter.tpl.c:5
-msgid "Name"
-msgstr "Name"
-
-#: admin/conference/conf-list.xml:49
-#: admin/conference/class_phoneConferenceGeneric.inc:704
-#: admin/macro/class_gofonMacro.inc:547 admin/macro/macro-list.xml:49
-#: admin/systems/asterisk/class_phoneGeneric.inc:484
-#: admin/conference/generic.tpl.c:29 admin/macro/generic.tpl.c:17
-#: admin/systems/asterisk/phone.tpl.c:8
-msgid "Description"
-msgstr "Beschreibung"
-
-#: admin/conference/conf-list.xml:57 admin/macro/macro-list.xml:57
-msgid "Actions"
-msgstr "Aktionen"
-
-#: admin/conference/conf-list.xml:68 admin/macro/macro-list.xml:68
-msgid "Create"
-msgstr "Anlegen"
-
-#: admin/conference/conf-list.xml:86 admin/conference/conf-list.xml:125
-#: admin/macro/macro-list.xml:86 admin/macro/macro-list.xml:125
-msgid "Edit"
-msgstr "Bearbeiten"
-
-#: admin/conference/conf-list.xml:93 admin/conference/conf-list.xml:138
-#: admin/macro/macro-list.xml:93 admin/macro/macro-list.xml:138
-msgid "Remove"
-msgstr "Entfernen"
-
-#: admin/conference/class_phoneConferenceGeneric.inc:233
-#, php-format
-msgid "Cannot delete entry from server '%s' because it seems to be removed!"
-msgstr "Kann Eintrag nicht von Server '%s' entfernen, da er scheinbar bereits entfernt wurde!"
-
-#: admin/conference/class_phoneConferenceGeneric.inc:308
-#, php-format
-msgid ""
-"The previously selected asterisk home server '%s' is no longer available!"
-msgstr "Der zuvor ausgewÃ¤hlte Asterisk Anmelde-Server '%s' ist nicht mehr verfÃ¼gbar."
-
-#: admin/conference/class_phoneConferenceGeneric.inc:315
-#: admin/conference/generic.tpl.c:47
-msgid "PIN"
-msgstr "PIN"
-
-#: admin/conference/class_phoneConferenceGeneric.inc:333
-#: admin/conference/class_phoneConferenceGeneric.inc:719
-msgid "Lifetime"
-msgstr "Lebenszeit"
-
-#: admin/conference/class_phoneConferenceGeneric.inc:399
-#: personal/phoneaccount/class_phoneAccount.inc:346
-#: personal/phoneaccount/class_phoneAccount.inc:359
-#: personal/phoneaccount/class_phoneAccount.inc:617
-#: personal/phoneaccount/class_phoneAccount.inc:656
-#: personal/phoneaccount/class_phoneAccount.inc:1519
-#: personal/phoneaccount/class_phoneAccount.inc:1695
-#: admin/conference/remove.tpl.c:2 admin/macro/remove.tpl.c:2
-msgid "Warning"
-msgstr "Warnung"
-
-#: admin/conference/class_phoneConferenceGeneric.inc:400
-#, php-format
-msgid ""
-"FusionDirectory identified problems with your MySQL table definition, please"
-" activate debugging for details."
-msgstr "FusionDirectory bemerkte Probleme mit Ihrer MySQL Tabellendefinition, bitte aktivieren Sie Debuggin fÃ¼r Details."
-
-#: admin/conference/class_phoneConferenceGeneric.inc:606
-#: admin/conference/class_phoneConferenceGeneric.inc:608
-#, php-format
-msgid "'%s' is already assigned to '%s'!"
-msgstr "'%s' wird bereits von '%s' verwendet!"
-
-#: admin/conference/class_phoneConferenceGeneric.inc:693
-msgid "Phone Conference"
-msgstr "Telefonkonferenz"
-
-#: admin/conference/class_phoneConferenceGeneric.inc:694
-msgid "Phone conference management"
-msgstr "Telefonkonferenz-Verwaltung"
-
-#: admin/conference/class_phoneConferenceGeneric.inc:696
-msgid "GOfon conference"
-msgstr "GOfon-Konferenz"
-
-#: admin/conference/class_phoneConferenceGeneric.inc:698
-msgid "Asterisk conference"
-msgstr "Asterisk-Konferenz"
-
-#: admin/conference/class_phoneConferenceGeneric.inc:703
-#: admin/macro/class_gofonMacro.inc:546
-#: admin/systems/asterisk/class_phoneGeneric.inc:483
-#: admin/conference/generic.tpl.c:17 admin/macro/generic.tpl.c:14
-#: admin/systems/asterisk/phone.tpl.c:5
-msgid "Base"
-msgstr "Basis"
-
-#: admin/conference/class_phoneConferenceGeneric.inc:705
-msgid "Conference PIN"
-msgstr "Konferenz-PIN"
-
-#: admin/conference/class_phoneConferenceGeneric.inc:710
-#: admin/conference/generic.tpl.c:44
-msgid "Preset PIN"
-msgstr "PIN voreinstellen"
-
-#: admin/conference/class_phoneConferenceGeneric.inc:711
-#: admin/conference/generic.tpl.c:50
-msgid "Record conference"
-msgstr "Konferenz aufnehmen"
-
-#: admin/conference/class_phoneConferenceGeneric.inc:712
-#: admin/conference/generic.tpl.c:59
-msgid "Play music on hold"
-msgstr "Wartemusik bei Halten"
-
-#: admin/conference/class_phoneConferenceGeneric.inc:713
-msgid "Activate menu"
-msgstr "MenÃ¼ aktivieren"
-
-#: admin/conference/class_phoneConferenceGeneric.inc:714
-msgid "Announce user activity"
-msgstr "Melde Benutzer-AktivitÃ¤t"
-
-#: admin/conference/class_phoneConferenceGeneric.inc:715
-msgid "Count user"
-msgstr "ZÃ¤hle Benutzer"
-
-#: admin/conference/class_phoneConferenceGeneric.inc:716
-msgid "Conference type"
-msgstr "Konferenz-Typ"
-
-#: admin/conference/class_phoneConferenceGeneric.inc:718
-msgid "Format"
-msgstr "Format"
-
-#: admin/conference/class_phoneConferenceGeneric.inc:720
-#: personal/phoneaccount/class_phoneAccount.inc:1666
-msgid "Telephone number"
-msgstr "Telefonnummer"
-
-#: admin/conference/class_phoneConferenceGeneric.inc:721
-msgid "Owner"
-msgstr "Besitzer"
-
-#: admin/conference/class_phoneConferenceManagment.inc:36
-msgid "Phone Conferences"
-msgstr "Telefonkonferenzen"
-
-#: admin/conference/class_phoneConferenceManagment.inc:37
-msgid "Phone Conference management"
-msgstr "Telefonkonferenzverwaltung"
-
-#: admin/macro/class_gofonMacro.inc:202
-#, php-format
-msgid ""
-"Macro could not be removed from server '%s', please check database "
-"consistency!"
-msgstr "Makro kann nicht vom Server '%s' entfernt werden, bitte prÃ¼fen Sie die Datenbank! "
-
-#: admin/macro/class_gofonMacro.inc:264
-#, php-format
-msgid "Application missing in line %s!"
-msgstr "Anwendung fehlt in Zeile %s!"
-
-#: admin/macro/class_gofonMacro.inc:267
-#, php-format
-msgid "Priority missing in line %s!"
-msgstr "PrioritÃ¤t fehlt in Zeile %s!"
-
-#: admin/macro/class_gofonMacro.inc:271
-#, php-format
-msgid "Extension missing in line %s!"
-msgstr "Erweiterung fehlt in Zeile %s!"
-
-#: admin/macro/class_gofonMacro.inc:281
-#, php-format
-msgid "Duplicate combination of 'extension' and 'priority' in line %s!"
-msgstr "Doppelte Kombination von 'extension' und 'priority' in Zeile %s!"
-
-#: admin/macro/class_gofonMacro.inc:317
-#, php-format
-msgid ""
-"Macro could not be added to server '%s', please check database consistency!"
-msgstr "Kann Makro nicht auf Server '%s' hinzufÃ¼gen, bitte prÃ¼fen Sie die Datenbank!"
-
-#: admin/macro/class_gofonMacro.inc:410
-msgid "Name can be 20 characters at maximum!"
-msgstr "Der Name kann hÃ¶chstens 20 Zeichen lang sein!"
-
-#: admin/macro/class_gofonMacro.inc:419
-msgid "Macro is still in use!"
-msgstr "Das Makro wird noch verwendet!"
-
-#: admin/macro/class_gofonMacro.inc:426
-msgid "Macro is empty!"
-msgstr "Das Makro ist leer!"
-
-#: admin/macro/class_gofonMacro.inc:452
-#: admin/systems/asterisk/class_phoneGeneric.inc:267
-#, php-format
-msgid "Cannot delete entry because it is still in use by '%s'!"
-msgstr "Konnte Eintrag nicht entfernen, da er noch von '%s' verwendet wird!"
-
-#: admin/macro/class_gofonMacro.inc:465
-#: addons/fonreports/class_fonreport.inc:190
-#: personal/phoneaccount/class_phoneAccount.inc:455
-#: personal/phoneaccount/class_phoneAccount.inc:1061
-#: personal/phoneaccount/class_phoneAccount.inc:1567
-msgid "Configuration error"
-msgstr "Konfigurationsfehler"
-
-#: admin/macro/class_gofonMacro.inc:536 admin/macro/class_gofonMacro.inc:541
-msgid "Asterisk macro"
-msgstr "Asteriskmakro"
-
-#: admin/macro/class_gofonMacro.inc:537
-msgid "Asterisk macro management"
-msgstr "Asterisk-Makro-Verwaltung"
-
-#: admin/macro/class_gofonMacro.inc:539
-msgid "GOfon macro"
-msgstr "GOfon-Makro"
-
-#: admin/macro/class_gofonMacro.inc:545 admin/macro/generic.tpl.c:2
-#: admin/macro/generic.tpl.c:5 admin/macro/paste_generic.tpl.c:2
-#: admin/macro/paste_generic.tpl.c:5
-msgid "Macro name"
-msgstr "Makro-Name"
-
-#: admin/macro/class_gofonMacro.inc:548 admin/macro/generic.tpl.c:8
-msgid "Display name"
-msgstr "Angezeigter Name"
-
-#: admin/macro/class_gofonMacro.inc:549
-msgid "Macro content and parameter"
-msgstr "Makro-Inhalt und Parameter"
-
-#: admin/macro/class_gofonMacro.inc:550
-msgid "Visibility flag"
-msgstr "Sichtbarkeits-Flag"
-
-#: admin/macro/class_gofonMacroManagement.inc:36
-msgid "Phone Macros"
-msgstr "Telefonmakros"
-
-#: admin/macro/class_gofonMacroManagement.inc:37
-msgid "Phone Macros management"
-msgstr "Telefonmakro-Verwaltung"
-
-#: admin/macro/macro-list.xml:11
-msgid "List of macros"
-msgstr "Liste der Makros"
-
-#: admin/macro/macro-list.xml:15 admin/macro/macro-list.xml:74
-msgid "Macro"
-msgstr "Makro"
-
-#: admin/macro/class_gofonMacroParameters.inc:58
-msgid "Parameter"
-msgstr "Parameter"
-
-#: admin/macro/class_gofonMacroParameters.inc:59
-msgid "Asterisk macro parameter"
-msgstr "Asterisk Makroparameter"
-
-#: admin/macro/class_gofonMacroParameters.inc:234
-#: personal/phoneaccount/generic.tpl.c:35
-msgid "Phone macro"
-msgstr "Telefon-Makro"
-
-#: admin/macro/class_gofonMacroParameters.inc:290
-msgid "String"
-msgstr "Zeichenkette"
-
-#: admin/macro/class_gofonMacroParameters.inc:291
-msgid "Combobox"
-msgstr "Auswahl-Gruppe"
-
-#: admin/macro/class_gofonMacroParameters.inc:292
-msgid "Bool"
-msgstr "Schalter"
-
-#: admin/macro/class_gofonMacroParameters.inc:298
-msgid "Delete unused"
-msgstr "Entferne"
-
-#: admin/macro/class_gofonMacroParameters.inc:374
-#, php-format
-msgid "Parameter %s contains invalid character. '!,#' is used as delimiter!"
-msgstr "Der Parameter %s enthÃ¤lt ungÃ¼ltige Zeichen. '!,#' werden als Feldtrenner verwendet!"
-
-#: admin/macro/class_gofonMacroParameters.inc:379
-#, php-format
-msgid "Parameter %s is invalid!"
-msgstr "Der Parameter %s ist ungÃ¼ltig!"
-
-#: admin/macro/class_gofonMacroParameters.inc:408
-#: personal/phoneaccount/class_phoneAccount.inc:1600
-msgid "Information"
-msgstr "Information"
-
-#: admin/macro/class_gofonMacroParameters.inc:408
-msgid ""
-"Number of parameters for this macro has changed. Please update all users "
-"using it!"
-msgstr "Die Anzahl der Parameter fÃ¼r dieses Makro wurde verÃ¤ndert. Bitte aktualisieren Sie alle Benutzer, die es verwenden!"
-
-#: admin/systems/asterisk/class_phoneGeneric.inc:151
-msgid "phone"
-msgstr "Telefon"
-
-#: admin/systems/asterisk/class_phoneGeneric.inc:230
-msgid "yes"
-msgstr "ja"
-
-#: admin/systems/asterisk/class_phoneGeneric.inc:230
-msgid "no"
-msgstr "nein"
-
-#: admin/systems/asterisk/class_phoneGeneric.inc:247
-msgid "dynamic"
-msgstr "dynamisch"
-
-#: admin/systems/asterisk/class_phoneGeneric.inc:247
-msgid "Networksettings"
-msgstr "Netzwerk-Einstellungen"
-
-#: admin/systems/asterisk/class_phoneGeneric.inc:330
-#: admin/systems/asterisk/class_phoneGeneric.inc:333
-msgid "IP address"
-msgstr "IP-Adresse"
-
-#: admin/systems/asterisk/class_phoneGeneric.inc:473
-msgid "Phone information"
-msgstr ""
-
-#: admin/systems/asterisk/class_phoneGeneric.inc:476
-#: personal/phoneaccount/class_phoneAccount.inc:1668
+#: admin/systems/asterisk/class_phoneIAX.inc:33
 msgid "Phone hardware"
 msgstr "Telefon-Hardware"
 
-#: admin/systems/asterisk/class_phoneGeneric.inc:485
-msgid "SIP Mode"
-msgstr "SIP Modus"
-
-#: admin/systems/asterisk/class_phoneGeneric.inc:486
-msgid "SIP DTMF mode"
-msgstr "SIP DTMF-Modus"
-
-#: admin/systems/asterisk/class_phoneGeneric.inc:487
-msgid "SIP Default ip"
-msgstr "SIP Standard IP-Adresse"
-
-#: admin/systems/asterisk/class_phoneGeneric.inc:488
-msgid "SIP Qualify"
-msgstr "SIP Qualifizieren"
-
-#: admin/systems/asterisk/class_phoneGeneric.inc:489
-msgid "IAX authentication type"
-msgstr "IAX Authentifikations-Typ"
-
-#: admin/systems/asterisk/class_phoneGeneric.inc:490
-msgid "IAX secret"
-msgstr "IAX Kennwort"
-
-#: admin/systems/asterisk/class_phoneGeneric.inc:491
-msgid "IAX account code"
-msgstr "IAX Konto-Identifikation"
-
-#: admin/systems/asterisk/class_phoneGeneric.inc:492
-msgid "IAX trunk lines"
-msgstr "IAX Leitungen zusammenfassen"
+#: admin/systems/asterisk/class_phoneIAX.inc:46
+#: personal/asterisk/class_asteriskAccount.inc:42
+msgid "Telephone"
+msgstr "Telefon"
 
-#: admin/systems/asterisk/class_phoneGeneric.inc:493
-msgid "IAX permit settings"
-msgstr "IAX Zulassungs-Einstellungen"
+#: admin/systems/asterisk/class_phoneIAX.inc:49
+msgid "Name"
+msgstr "Name"
 
-#: admin/systems/asterisk/class_phoneGeneric.inc:494
-msgid "IAX deny settings"
-msgstr "IAX Ablehnungs-Einstellungen"
+#: admin/systems/asterisk/class_phoneIAX.inc:49
+msgid "Name of this phone"
+msgstr "Name dieses Telefons"
 
-#: admin/systems/asterisk/class_phoneGeneric.inc:495
-msgid "CAPI MSN"
-msgstr "CAPI MSN"
+#: admin/systems/asterisk/class_phoneIAX.inc:53
+msgid "Account name"
+msgstr "Kontenname"
 
-#: admin/systems/asterisk/class_phoneGeneric.inc:496
-msgid "Hardware type"
-msgstr "Hardware-Typ"
+#: admin/systems/asterisk/class_phoneIAX.inc:53
+msgid "Name of the account"
+msgstr "Name des Kontos"
 
 #: admin/systems/services/asterisk/class_serviceAsterisk.inc:35
 msgid "VoIP database information"
@@ -747,6 +97,10 @@ msgid ""
 "these objects '%s'."
 msgstr "Sie kÃ¶nnen die Asterisk Datenbank-Erweiterung nicht entfernen, sie wird momentan noch von folgenden Objekten verwendet: '%s'."
 
+#: admin/systems/services/asterisk/class_serviceAsterisk.inc:121
+msgid "LDAP error"
+msgstr "LDAP-Fehler"
+
 #: admin/systems/services/asterisk/class_serviceAsterisk.inc:140
 msgid "VoIP service (asterisk)"
 msgstr "VoIP Dienst (asterisk)"
@@ -759,211 +113,20 @@ msgstr "VoIP - Asterisk Verwaltung"
 msgid "Services"
 msgstr "Dienste"
 
-#: addons/fonreports/class_fonreport.inc:232
-msgid "Insufficient permissions"
-msgstr "Unzureichende Berechtigungen"
-
-#: addons/fonreports/class_fonreport.inc:251
-msgid "Y-M-D"
-msgstr "D.M.Y"
-
-#: addons/fonreports/class_fonreport.inc:418
-#: addons/fonreports/class_fonreport.inc:419
-#: addons/fonreports/class_fonreport.inc:424 addons/fonreports/main.inc:46
-msgid "Phone reports"
-msgstr "Telefon-Berichte"
-
-#: addons/fonreports/class_fonreport.inc:419
-msgid "All entries are readonly"
-msgstr "Alle EintrÃ¤ge sind nur lesbar"
-
-#: addons/fonreports/class_fonreport.inc:428
-#: addons/fonreports/contents.tpl.c:32
-msgid "Date"
-msgstr "Datum"
-
-#: addons/fonreports/class_fonreport.inc:429
-#: addons/fonreports/contents.tpl.c:35
-msgid "Source"
-msgstr "Quelle"
-
-#: addons/fonreports/class_fonreport.inc:430
-#: addons/fonreports/contents.tpl.c:38
-msgid "Destination"
-msgstr "Ziel"
-
-#: addons/fonreports/class_fonreport.inc:431
-#: addons/fonreports/contents.tpl.c:41
-msgid "Channel"
-msgstr "Kanal"
-
-#: addons/fonreports/class_fonreport.inc:432
-msgid "Application called"
-msgstr "Name der Anwendung"
-
-#: addons/fonreports/class_fonreport.inc:433
-msgid "Disposition"
-msgstr "Disposition"
-
-#: addons/fonreports/class_fonreport.inc:434
-#: addons/fonreports/contents.tpl.c:50
-msgid "Duration"
-msgstr "Dauer"
-
-#: personal/phoneaccount/class_phoneAccount.inc:176
-msgid "automatic"
-msgstr "automatisch"
-
-#: personal/phoneaccount/class_phoneAccount.inc:212
-msgid "no macro"
-msgstr "kein Makro"
-
-#: personal/phoneaccount/class_phoneAccount.inc:240
-msgid "undefined"
-msgstr "nicht definiert"
-
-#: personal/phoneaccount/class_phoneAccount.inc:359
-#, php-format
-msgid ""
-"Cannot identify telephone extension in database, please try to save again."
-msgstr "Die Telefon-Erweiterung kann nicht in der Datenbank gefunden werden. Versuchen Sie noch einmal zu Speichern."
-
-#: personal/phoneaccount/class_phoneAccount.inc:577
-#: personal/phoneaccount/class_phoneAccount.inc:595
-msgid "Abort saving entries to keep the database consistent."
-msgstr "Das Speichern der EintrÃ¤ge abbrechen, um die Datenbank konsistent zu halten."
-
-#: personal/phoneaccount/class_phoneAccount.inc:618
-#: personal/phoneaccount/class_phoneAccount.inc:657
-#: personal/phoneaccount/class_phoneAccount.inc:1520
-#, php-format
-msgid ""
-"FusionDirectory identified problems with your database table definition!"
-msgstr "FusionDirectory identifizierte Probleme mit Ihrer Datenbanken Tabellen-Definition!"
-
-#: personal/phoneaccount/class_phoneAccount.inc:1023
-msgid "Remove phone account"
-msgstr "Telefon-Konto entfernen"
-
-#: personal/phoneaccount/class_phoneAccount.inc:1027
-#: personal/phoneaccount/class_phoneAccount.inc:1030
-msgid "Create phone account"
-msgstr "Telefon-Konto erstellen"
-
-#: personal/phoneaccount/class_phoneAccount.inc:1028
-msgid "User uid"
-msgstr "Benutzer uid"
-
-#: personal/phoneaccount/class_phoneAccount.inc:1046
-msgid "Selected macro is not available anymore!"
-msgstr "Das gewÃ¤hlte Makro ist nirgendwo verfÃ¼gbar!"
-
-#: personal/phoneaccount/class_phoneAccount.inc:1221
-msgid "Choose your private phone"
-msgstr "WÃ¤hlen Sie Ihr privates Telefon"
-
-#: personal/phoneaccount/class_phoneAccount.inc:1346
-msgid ""
-"There must be at least one server with an asterisk database to create a "
-"phone account."
-msgstr "Es muss mindestens ein Server mit einer Asterisk-Datenbank bestehen, um ein Telefon-Konto zu erstellen."
-
-#: personal/phoneaccount/class_phoneAccount.inc:1354
-#: personal/phoneaccount/class_phoneAccount.inc:1357
-#: personal/phoneaccount/generic.tpl.c:29
-#: personal/phoneaccount/paste_generic.tpl.c:11
-msgid "Voicemail PIN"
-msgstr "Voicemail-PIN"
-
-#: personal/phoneaccount/class_phoneAccount.inc:1354
-msgid "Between 1-4 charactes"
-msgstr "1-4 Zeichen"
-
-#: personal/phoneaccount/class_phoneAccount.inc:1362
-#: personal/phoneaccount/generic.tpl.c:32
-#: personal/phoneaccount/paste_generic.tpl.c:14
-msgid "Phone PIN"
-msgstr "Telefon-PIN"
-
-#: personal/phoneaccount/class_phoneAccount.inc:1394
-#: admin/conference/generic.tpl.c:38 admin/conference/paste_generic.tpl.c:8
-msgid "Phone number"
-msgstr "Telefonnummer"
-
-#: personal/phoneaccount/class_phoneAccount.inc:1402
-#, php-format
-msgid "macro parameter %s"
-msgstr "Makro-Parameter %s"
-
-#: personal/phoneaccount/class_phoneAccount.inc:1450
-msgid "An error occured while updating the database entries!"
-msgstr "Es ist ein Fehler beim Aktualisieren der DatenbankeintrÃ¤ge aufgetreten!"
-
-#: personal/phoneaccount/class_phoneAccount.inc:1567
-msgid "Was not able to found any asterisk server"
-msgstr "War nicht in der Lage, einen Asteriskserver zu finden"
-
-#: personal/phoneaccount/class_phoneAccount.inc:1600
-#, php-format
-msgid "User '%s' has been removed from phone queue '%s'."
-msgstr "Benutzer '%s' aus Warteschlange '%s' entfernt."
-
-#: personal/phoneaccount/class_phoneAccount.inc:1637
-#: personal/phoneaccount/class_phoneAccount.inc:1639
-#, php-format
-msgid "The specified telephonenumber '%s' is already assigned to '%s'."
-msgstr "Die angegebene Telefonnummer '%s' wird bereits von '%s' verwendet."
-
-#: personal/phoneaccount/class_phoneAccount.inc:1649
-#, php-format
-msgid ""
-"The previously selected asterisk home server (%s) is no longer available. "
-"Remove aborted."
-msgstr "Der zuvor ausgewÃ¤hlte Asterisk Home-Server ('%s') ist nicht mehr verfÃ¼gbar.Entfernen wurde abgebrochen."
-
-#: personal/phoneaccount/class_phoneAccount.inc:1658
-msgid "Phone account settings"
-msgstr "Telefon-Konto-Einstellungen"
-
-#: personal/phoneaccount/class_phoneAccount.inc:1667
-msgid "Macro settings"
-msgstr "Makro-Einstellungen"
-
-#: personal/phoneaccount/class_phoneAccount.inc:1670
-msgid "Phone context"
-msgstr "Telefon-Kontext"
-
-#: personal/phoneaccount/class_phoneAccount.inc:1671
-msgid "Voice mail context"
-msgstr "Voicemail-Kontext"
-
-#: personal/phoneaccount/class_phoneAccount.inc:1672
-msgid "Telephone pin"
-msgstr "Telefon-PIN"
-
-#: personal/phoneaccount/class_phoneAccount.inc:1673
-msgid "Voicemail pin"
-msgstr "Voicemail-PIN"
-
-#: personal/phoneaccount/class_phoneAccount.inc:1695
-#, php-format
-msgid "You need to configure %s contexts first"
-msgstr "Sie mÃ¼ssen %s Kontexte vorerst konfigurieren"
-
-#: personal/phoneaccount/main.inc:124
-msgid "Click the 'Edit' button below to change informations in this dialog"
-msgstr "BetÃ¤tigen sie den 'Bearbeiten'-Schalter unten um Informationen in diesem Dialog zu Ã¤ndern"
-
-#: personal/phoneaccount/main.inc:134
-#: personal/phoneaccount/paste_generic.tpl.c:2
-msgid "Phone settings"
-msgstr "Telefon-Einstellungen"
-
+#: personal/asterisk/class_asteriskAccount.inc:30
 #: config/asterisk/class_asteriskPluginConfig.inc:28
 #: config/asterisk/class_asteriskPluginConfig.inc:41
 msgid "Asterisk"
 msgstr "Asterisk"
 
+#: personal/asterisk/class_asteriskAccount.inc:31
+msgid "Asterisk account"
+msgstr "Asterisk-Konto"
+
+#: personal/asterisk/class_asteriskAccount.inc:45
+msgid "Select the phone associated to this user"
+msgstr ""
+
 #: config/asterisk/class_asteriskPluginConfig.inc:29
 msgid "Asterisk plugin configuration"
 msgstr "Asteriskplugin-Konfiguration"
@@ -1011,338 +174,3 @@ msgstr "Voicemail-Kontexte"
 #: config/asterisk/class_asteriskPluginConfig.inc:72
 msgid "Available voicemail contexts"
 msgstr "VerfÃ¼gbare Voicemail-Kontexte"
-
-#: admin/ogroups/asterisk/phonequeue.tpl.c:2
-msgid ""
-"Only users with the same asterisk home server will be included to this "
-"queue."
-msgstr "Nur Benutzer mit demselben Asterisk Home-Server werden in die Warteschlange aufgenommen."
-
-#: admin/ogroups/asterisk/phonequeue.tpl.c:5
-#: personal/phoneaccount/generic.tpl.c:2
-#: personal/phoneaccount/paste_generic.tpl.c:5
-msgid "Phone numbers"
-msgstr "Telefonnummern"
-
-#: admin/ogroups/asterisk/phonequeue.tpl.c:8
-msgid "Up"
-msgstr "Auf"
-
-#: admin/ogroups/asterisk/phonequeue.tpl.c:11
-msgid "Down"
-msgstr "Ab"
-
-#: admin/ogroups/asterisk/phonequeue.tpl.c:14
-#: admin/conference/generic.tpl.c:41
-msgid "Options"
-msgstr "Optionen"
-
-#: admin/ogroups/asterisk/phonequeue.tpl.c:29
-msgid "Strategy"
-msgstr "Strategie"
-
-#: admin/ogroups/asterisk/phonequeue.tpl.c:38
-msgid "(in seconds)"
-msgstr "(in Sekunden)"
-
-#: admin/ogroups/asterisk/phonequeue.tpl.c:41
-msgid "Queue sound setup"
-msgstr "Einstellung der Ansagen/TÃ¶ne"
-
-#: admin/ogroups/asterisk/phonequeue.tpl.c:44
-msgid "Use music on hold instead of ringing"
-msgstr "Benutze Wartemusik statt Klingelton"
-
-#: admin/ogroups/asterisk/phonequeue.tpl.c:50
-msgid "Welcome sound file"
-msgstr "'Willkommen'"
-
-#: admin/ogroups/asterisk/phonequeue.tpl.c:53
-msgid "Announce message"
-msgstr "Benachrichtigung"
-
-#: admin/ogroups/asterisk/phonequeue.tpl.c:56
-msgid "Sound file for 'You are next ...'"
-msgstr "Klangdatei fÃ¼r Ansage 'Sie sind der NÃ¤chste...'"
-
-#: admin/ogroups/asterisk/phonequeue.tpl.c:59
-msgid "'There are ...'"
-msgstr "'Es gibt ...'"
-
-#: admin/ogroups/asterisk/phonequeue.tpl.c:62
-msgid "'... calls waiting'"
-msgstr "'... wartende Anrufe'"
-
-#: admin/ogroups/asterisk/phonequeue.tpl.c:65
-msgid "'Thank you' message"
-msgstr "'Vielen Dank'"
-
-#: admin/ogroups/asterisk/phonequeue.tpl.c:68
-msgid "'minutes' sound file"
-msgstr "'Minuten'"
-
-#: admin/ogroups/asterisk/phonequeue.tpl.c:71
-msgid "'seconds' sound file"
-msgstr "'Sekunden'"
-
-#: admin/ogroups/asterisk/phonequeue.tpl.c:74
-msgid "Hold sound file"
-msgstr "GesprÃ¤ch halten"
-
-#: admin/ogroups/asterisk/phonequeue.tpl.c:77
-msgid "Less Than sound file"
-msgstr "'Weniger als...''"
-
-#: admin/ogroups/asterisk/phonequeue.tpl.c:80
-msgid "Phone attributes "
-msgstr "Telefon-Attribute"
-
-#: admin/conference/conf-filter.tpl.c:2 admin/macro/macro-filter.tpl.c:2
-#: addons/fonreports/contents.tpl.c:2
-msgid "Filter"
-msgstr "Filter"
-
-#: admin/conference/generic.tpl.c:2
-msgid "Properties"
-msgstr "Eigenschaften"
-
-#: admin/conference/generic.tpl.c:5 admin/conference/paste_generic.tpl.c:2
-msgid "Conference name"
-msgstr "Konferenz-Name"
-
-#: admin/conference/generic.tpl.c:8 admin/conference/paste_generic.tpl.c:5
-msgid "Name of conference to create"
-msgstr "Name der zu erzeugenden Konferenz"
-
-#: admin/conference/generic.tpl.c:11
-msgid "Type"
-msgstr "Typ"
-
-#: admin/conference/generic.tpl.c:14
-msgid "Choose subtree to place conference in"
-msgstr "WÃ¤hlen Sie den Teilbaum, in den die Konferenz eingepflegt werden soll"
-
-#: admin/conference/generic.tpl.c:26
-msgid "Select language"
-msgstr "Auswahl der Sprache"
-
-#: admin/conference/generic.tpl.c:32
-msgid "Descriptive text for department"
-msgstr "Beschreibender Text zu dieser Abteilung"
-
-#: admin/conference/generic.tpl.c:35
-msgid "Lifetime (in days)"
-msgstr "Lebenszeit (in Tagen)"
-
-#: admin/conference/generic.tpl.c:53
-msgid "Sound file format"
-msgstr "Format der Audiodatei"
-
-#: admin/conference/generic.tpl.c:56
-msgid "Choose subtree to place department in"
-msgstr "WÃ¤hlen Sie den Teilbaum, in den die Abteilung eingepflegt werden soll"
-
-#: admin/conference/generic.tpl.c:62
-msgid "Activate session menu"
-msgstr "SitzungsmenÃ¼ aktivieren"
-
-#: admin/conference/generic.tpl.c:65
-msgid "Announce users joining or leaving the conference"
-msgstr "Benachrichtige Ã¼ber Abgang/Zugang von Teilnehmern"
-
-#: admin/conference/generic.tpl.c:68
-msgid "Count users"
-msgstr "ZÃ¤hle Benutzer"
-
-#: admin/conference/remove.tpl.c:5 admin/macro/remove.tpl.c:5
-msgid ""
-"Please double check if you really want to do this since there is no way for "
-"FusionDirectory to get your data back."
-msgstr "Bitte Ã¼berprÃ¼fen Sie, ob Sie dies wirklich tun wollen, da es keinen Weg gibt, fÃ¼r FusionDirectory die Daten wieder herzustellen."
-
-#: admin/conference/remove.tpl.c:8 admin/macro/remove.tpl.c:8
-msgid "So - if you're sure - press 'Delete' to continue or 'Cancel' to abort."
-msgstr "Wenn Sie sicher sind, drÃ¼cken Sie 'Entfernen' um fortzufahren oder 'Abbrechen' zum Abbruch."
-
-#: admin/macro/generic.tpl.c:11
-msgid "Macro name to be displayed"
-msgstr "Makro-Name der angezeigt wird"
-
-#: admin/macro/generic.tpl.c:20
-msgid "Visible for user"
-msgstr "Sichtbar fÃ¼r Benutzer"
-
-#: admin/macro/generic.tpl.c:23
-msgid "Macro text"
-msgstr "Makro-Inhalt"
-
-#: admin/macro/parameter.tpl.c:2
-msgid "Argument"
-msgstr "Argument"
-
-#: admin/macro/parameter.tpl.c:8
-msgid "type"
-msgstr "Typ"
-
-#: admin/macro/parameter.tpl.c:11
-msgid "Default value"
-msgstr "Standardwert"
-
-#: admin/macro/parameter.tpl.c:14
-msgid "You are not allowed to view the macro parameter settings"
-msgstr "Sie haben keine Berechtigung, die Makro-Parameter Einstellungen anzuzeigen."
-
-#: admin/systems/asterisk/phonesettings.tpl.c:2
-msgid "Advanced phone settings"
-msgstr "Erweiterte Telefon-Einstellungen"
-
-#: admin/systems/asterisk/phonesettings.tpl.c:5
-msgid "Phone type"
-msgstr "Telefon-Modell"
-
-#: admin/systems/asterisk/phonesettings.tpl.c:8
-#: admin/systems/asterisk/phonesettings.tpl.c:14
-#: admin/systems/asterisk/phonesettings.tpl.c:20
-#: admin/systems/asterisk/phonesettings.tpl.c:26
-#: admin/systems/asterisk/phonesettings.tpl.c:35
-#: admin/systems/asterisk/phonesettings.tpl.c:47
-#: admin/systems/asterisk/phonesettings.tpl.c:65
-msgid "Choose a phone type"
-msgstr "WÃ¤hlen Sie das Telefon-Modell"
-
-#: admin/systems/asterisk/phonesettings.tpl.c:11
-msgid "Mode"
-msgstr "Modus"
-
-#: admin/systems/asterisk/phonesettings.tpl.c:17
-msgid "DTMF mode"
-msgstr "DTMF-Modus"
-
-#: admin/systems/asterisk/phonesettings.tpl.c:23
-#: admin/systems/asterisk/phonesettings.tpl.c:38
-msgid "Default IP"
-msgstr "Standard IP-Adresse"
-
-#: admin/systems/asterisk/phonesettings.tpl.c:29
-#: admin/systems/asterisk/phonesettings.tpl.c:41
-msgid "Response timeout"
-msgstr "Wartezeit bis Antwort"
-
-#: admin/systems/asterisk/phonesettings.tpl.c:32
-msgid "Modus"
-msgstr "Modus"
-
-#: admin/systems/asterisk/phonesettings.tpl.c:44
-msgid "Authtype"
-msgstr "Authentifizierung"
-
-#: admin/systems/asterisk/phonesettings.tpl.c:50
-msgid "Secret"
-msgstr "Passwort"
-
-#: admin/systems/asterisk/phonesettings.tpl.c:53
-msgid "GoFonInkeys"
-msgstr "GOFon-SchlÃ¼ssel (eingehend)"
-
-#: admin/systems/asterisk/phonesettings.tpl.c:56
-msgid "GoFonOutKeys"
-msgstr "GOFon-SchlÃ¼ssel (ausgehend)"
-
-#: admin/systems/asterisk/phonesettings.tpl.c:59
-msgid "Account code"
-msgstr "Konto-Identifikation"
-
-#: admin/systems/asterisk/phonesettings.tpl.c:62
-msgid "Trunk lines"
-msgstr "Leitungen zusammenfassen"
-
-#: admin/systems/asterisk/phonesettings.tpl.c:68
-msgid "Hosts that are allowed to connect"
-msgstr "Erlaube diesen Rechnern die Verbindung"
-
-#: admin/systems/asterisk/phonesettings.tpl.c:71
-#: admin/systems/asterisk/phonesettings.tpl.c:77
-msgid "List of alternative mail addresses"
-msgstr "Liste alternativer Mail-Adressen"
-
-#: admin/systems/asterisk/phonesettings.tpl.c:74
-msgid "Hosts that are not allowed to connect"
-msgstr "Verbiete diesen Rechnern die Verbindung"
-
-#: admin/systems/asterisk/phonesettings.tpl.c:80
-msgid "MSN"
-msgstr "MSN"
-
-#: admin/systems/asterisk/phone.tpl.c:2
-msgid "Phone name"
-msgstr "Telefon-Name"
-
-#: addons/fonreports/contents.tpl.c:5
-msgid "Search for"
-msgstr "Suche nach"
-
-#: addons/fonreports/contents.tpl.c:8
-msgid "Enter user name to search for"
-msgstr "Benutzername, nach dem gesucht werden soll"
-
-#: addons/fonreports/contents.tpl.c:11 addons/fonreports/contents.tpl.c:26
-msgid "in"
-msgstr "in"
-
-#: addons/fonreports/contents.tpl.c:14
-msgid "Select subtree to base search on"
-msgstr "WÃ¤hlen Sie den Teilbaum, in dem gesucht werden soll"
-
-#: addons/fonreports/contents.tpl.c:17
-msgid "on"
-msgstr "am"
-
-#: addons/fonreports/contents.tpl.c:20
-msgid "Select server to search on"
-msgstr "WÃ¤hlen Sie den Server, auf dem gesucht werden soll"
-
-#: addons/fonreports/contents.tpl.c:23
-msgid "during"
-msgstr "wÃ¤hrend"
-
-#: addons/fonreports/contents.tpl.c:29
-msgid "Search"
-msgstr "Suchen"
-
-#: addons/fonreports/contents.tpl.c:44
-msgid "Application"
-msgstr "Anwendung"
-
-#: addons/fonreports/contents.tpl.c:47
-msgid "Status"
-msgstr "Status"
-
-#: addons/fonreports/contents.tpl.c:53
-msgid "Search returned no results..."
-msgstr "Die Suche verlief ergebnislos..."
-
-#: personal/phoneaccount/generic.tpl.c:5
-#: personal/phoneaccount/paste_generic.tpl.c:8
-msgid "Telephone hardware"
-msgstr "Telefon-Hardware"
-
-#: personal/phoneaccount/generic.tpl.c:8
-msgid "Telephone"
-msgstr "Telefon"
-
-#: personal/phoneaccount/generic.tpl.c:14
-msgid "Select the accounts home server"
-msgstr "WÃ¤hlen Sie den Home-Server des Kontos."
-
-#: personal/phoneaccount/generic.tpl.c:17
-msgid "Context"
-msgstr "Kontext"
-
-#: personal/phoneaccount/generic.tpl.c:20
-#: personal/phoneaccount/generic.tpl.c:26
-msgid "Select the accounts context"
-msgstr "WÃ¤hlen Sie den Kontext des Kontos"
-
-#: personal/phoneaccount/generic.tpl.c:23
-msgid "Voicemail context"
-msgstr "Voicemail-Kontext"
diff --git a/asterisk/locale/el_GR/fusiondirectory.po b/asterisk/locale/el_GR/fusiondirectory.po
new file mode 100644
index 0000000000000000000000000000000000000000..d5d2a595d3512cd3849d5c5b337195fa256140c8
--- /dev/null
+++ b/asterisk/locale/el_GR/fusiondirectory.po
@@ -0,0 +1,174 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR FusionDirectory Project
+# This file is distributed under the same license as the PACKAGE package.
+# 
+# Translators:
+msgid ""
+msgstr ""
+"Project-Id-Version: FusionDirectory-109\n"
+"Report-Msgid-Bugs-To: documentation@lists.fusiondirectory.org\n"
+"POT-Creation-Date: 2014-12-15 17:47+0100\n"
+"PO-Revision-Date: 2015-05-30 11:45+0000\n"
+"Last-Translator: Benoit Mortier <benoit.mortier@opensides.be>\n"
+"Language-Team: Greek (Greece) (http://www.transifex.com/projects/p/FusionDirectory-109/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/asterisk/class_phoneIAX.inc:30
+#: admin/systems/asterisk/class_phoneIAX.inc:34
+#: personal/asterisk/class_asteriskAccount.inc:45
+msgid "Phone"
+msgstr ""
+
+#: admin/systems/asterisk/class_phoneIAX.inc:31
+msgid "Asterisk phone"
+msgstr ""
+
+#: admin/systems/asterisk/class_phoneIAX.inc:33
+msgid "Phone hardware"
+msgstr ""
+
+#: admin/systems/asterisk/class_phoneIAX.inc:46
+#: personal/asterisk/class_asteriskAccount.inc:42
+msgid "Telephone"
+msgstr ""
+
+#: admin/systems/asterisk/class_phoneIAX.inc:49
+msgid "Name"
+msgstr ""
+
+#: admin/systems/asterisk/class_phoneIAX.inc:49
+msgid "Name of this phone"
+msgstr ""
+
+#: admin/systems/asterisk/class_phoneIAX.inc:53
+msgid "Account name"
+msgstr ""
+
+#: admin/systems/asterisk/class_phoneIAX.inc:53
+msgid "Name of the account"
+msgstr ""
+
+#: admin/systems/services/asterisk/class_serviceAsterisk.inc:35
+msgid "VoIP database information"
+msgstr ""
+
+#: admin/systems/services/asterisk/class_serviceAsterisk.inc:38
+msgid "Asterisk DB user"
+msgstr ""
+
+#: admin/systems/services/asterisk/class_serviceAsterisk.inc:38
+msgid "Login for asterisk database administrator"
+msgstr ""
+
+#: admin/systems/services/asterisk/class_serviceAsterisk.inc:42
+msgid "Password"
+msgstr ""
+
+#: admin/systems/services/asterisk/class_serviceAsterisk.inc:42
+msgid "Password for asterisk database administrator"
+msgstr ""
+
+#: admin/systems/services/asterisk/class_serviceAsterisk.inc:46
+msgid "Country dial prefix"
+msgstr ""
+
+#: admin/systems/services/asterisk/class_serviceAsterisk.inc:50
+msgid "Local dial prefix"
+msgstr ""
+
+#: admin/systems/services/asterisk/class_serviceAsterisk.inc:54
+msgid "Driver"
+msgstr ""
+
+#: admin/systems/services/asterisk/class_serviceAsterisk.inc:54
+msgid "Driver to use to contact this database."
+msgstr ""
+
+#: admin/systems/services/asterisk/class_serviceAsterisk.inc:95
+#, php-format
+msgid ""
+"You can't remove the asterisk database extension, it is still in use by "
+"these objects '%s'."
+msgstr ""
+
+#: admin/systems/services/asterisk/class_serviceAsterisk.inc:121
+msgid "LDAP error"
+msgstr ""
+
+#: admin/systems/services/asterisk/class_serviceAsterisk.inc:140
+msgid "VoIP service (asterisk)"
+msgstr ""
+
+#: admin/systems/services/asterisk/class_serviceAsterisk.inc:141
+msgid "VoIP - asterisk management"
+msgstr ""
+
+#: admin/systems/services/asterisk/class_serviceAsterisk.inc:141
+msgid "Services"
+msgstr ""
+
+#: personal/asterisk/class_asteriskAccount.inc:30
+#: config/asterisk/class_asteriskPluginConfig.inc:28
+#: config/asterisk/class_asteriskPluginConfig.inc:41
+msgid "Asterisk"
+msgstr ""
+
+#: personal/asterisk/class_asteriskAccount.inc:31
+msgid "Asterisk account"
+msgstr ""
+
+#: personal/asterisk/class_asteriskAccount.inc:45
+msgid "Select the phone associated to this user"
+msgstr ""
+
+#: config/asterisk/class_asteriskPluginConfig.inc:29
+msgid "Asterisk plugin configuration"
+msgstr ""
+
+#: config/asterisk/class_asteriskPluginConfig.inc:44
+msgid "Phone RDN"
+msgstr ""
+
+#: config/asterisk/class_asteriskPluginConfig.inc:44
+msgid "Branch in which phones will be stored"
+msgstr ""
+
+#: config/asterisk/class_asteriskPluginConfig.inc:49
+msgid "Phone Macro RDN"
+msgstr ""
+
+#: config/asterisk/class_asteriskPluginConfig.inc:49
+msgid "Branch in which phone macros will be stored"
+msgstr ""
+
+#: config/asterisk/class_asteriskPluginConfig.inc:54
+msgid "Phone Conference RDN"
+msgstr ""
+
+#: config/asterisk/class_asteriskPluginConfig.inc:54
+msgid "Branch in which phone conferences will be stored"
+msgstr ""
+
+#: config/asterisk/class_asteriskPluginConfig.inc:61
+msgid "Miscellaneous"
+msgstr ""
+
+#: config/asterisk/class_asteriskPluginConfig.inc:65
+msgid "SIP contexts"
+msgstr ""
+
+#: config/asterisk/class_asteriskPluginConfig.inc:65
+msgid "Available SIP contexts"
+msgstr ""
+
+#: config/asterisk/class_asteriskPluginConfig.inc:72
+msgid "Voicemail contexts"
+msgstr ""
+
+#: config/asterisk/class_asteriskPluginConfig.inc:72
+msgid "Available voicemail contexts"
+msgstr ""
diff --git a/asterisk/locale/en/fusiondirectory.po b/asterisk/locale/en/fusiondirectory.po
index 1f2d5f658c2d675d3c0fcc36bbef599abf3c51eb..aafdb27d5c2969dcd5bb7b9b9bd1a588b70bc700 100644
--- a/asterisk/locale/en/fusiondirectory.po
+++ b/asterisk/locale/en/fusiondirectory.po
@@ -6,13 +6,13 @@
 #, fuzzy
 msgid ""
 msgstr ""
-"Project-Id-Version: PACKAGE VERSION\n"
-"Report-Msgid-Bugs-To: documentation@lists.fusiondirectory.org\n"
-"POT-Creation-Date: 2015-03-31 11:49+0200\n"
+"Project-Id-Version: FusionDirectory VERSION\n"
+"Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
+"POT-Creation-Date: 2015-05-30 15:30+0200\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
-"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
-"Language-Team: LANGUAGE <LL@li.org>\n"
-"Language: \n"
+"Last-Translator: FusionDirectory project <contact@fusiondirectory.org>\n"
+"Language-Team: English\n"
+"Language: en\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
diff --git a/asterisk/locale/es/fusiondirectory.po b/asterisk/locale/es/fusiondirectory.po
index fb75b889e9b7d46369379a1c5b4c97277fcfe6e3..6a3050c64a31d0fd12edc0b1aafae0ebceec3df2 100644
--- a/asterisk/locale/es/fusiondirectory.po
+++ b/asterisk/locale/es/fusiondirectory.po
@@ -5,704 +5,53 @@
 # Translators:
 msgid ""
 msgstr ""
-"Project-Id-Version: FusionDirectory-108\n"
+"Project-Id-Version: FusionDirectory-109\n"
 "Report-Msgid-Bugs-To: documentation@lists.fusiondirectory.org\n"
-"POT-Creation-Date: 2015-03-31 11:49+0200\n"
-"PO-Revision-Date: 2015-03-31 11:41+0000\n"
+"POT-Creation-Date: 2014-12-15 17:47+0100\n"
+"PO-Revision-Date: 2015-02-25 16:13+0000\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>\n"
-"Language-Team: Spanish (http://www.transifex.com/projects/p/FusionDirectory-108/language/es/)\n"
+"Language-Team: Spanish (http://www.transifex.com/projects/p/FusionDirectory-109/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/ogroups/asterisk/class_phonequeue.inc:110
-#: admin/conference/class_phoneConferenceGeneric.inc:104
-#: personal/phoneaccount/class_phoneAccount.inc:148
-msgid "Obsolete entry"
-msgstr "Entrada obsoleta"
-
-#: admin/ogroups/asterisk/class_phonequeue.inc:110
-#: admin/conference/class_phoneConferenceGeneric.inc:104
-#: personal/phoneaccount/class_phoneAccount.inc:148
-#, php-format
-msgid ""
-"The current home server is not available anymore. It will be moved to '%s' "
-"if you save this entry!"
-msgstr "El servidor actual no estÃ¡ disponible. Â¡SerÃ¡ movido a '%s' si usted guarda esta entrada!"
-
-#: admin/ogroups/asterisk/class_phonequeue.inc:140
-msgid "ring all"
-msgstr "llamar a todos"
-
-#: admin/ogroups/asterisk/class_phonequeue.inc:141
-msgid "round robin"
-msgstr "round robin"
-
-#: admin/ogroups/asterisk/class_phonequeue.inc:142
-msgid "least recently called"
-msgstr "que han llamado lo menos posible recientemente"
-
-#: admin/ogroups/asterisk/class_phonequeue.inc:143
-msgid "fewest completed calls"
-msgstr "pocas llamadas terminadas"
-
-#: admin/ogroups/asterisk/class_phonequeue.inc:144
-msgid "random"
-msgstr "al azar"
-
-#: admin/ogroups/asterisk/class_phonequeue.inc:145
-msgid "round robin with memory"
-msgstr "round robin en memoria"
-
-#: admin/ogroups/asterisk/class_phonequeue.inc:180
-msgid "Remove the phone queue from this Account"
-msgstr "Eliminar la cola telefÃ³nica de esta cuenta"
-
-#: admin/ogroups/asterisk/class_phonequeue.inc:181
-#: admin/ogroups/asterisk/class_phonequeue.inc:184
-msgid "phone queue"
-msgstr "cola telefÃ³nica"
-
-#: admin/ogroups/asterisk/class_phonequeue.inc:183
-msgid "Create phone queue"
-msgstr "Crear cola telefÃ³nica"
-
-#: admin/ogroups/asterisk/class_phonequeue.inc:272
-msgid ""
-"There must be at least one server with an asterisk database to create a "
-"phone queue."
-msgstr "Debe haber al menos una base de datos asterisk para crear una cola telefÃ³nica."
-
-#: admin/ogroups/asterisk/class_phonequeue.inc:275
-#: admin/ogroups/asterisk/class_phonequeue.inc:873
-#: admin/conference/class_phoneConferenceGeneric.inc:709
-#: personal/phoneaccount/class_phoneAccount.inc:1350
-#: personal/phoneaccount/class_phoneAccount.inc:1669
-#: admin/ogroups/asterisk/phonequeue.tpl.c:17
-#: admin/conference/generic.tpl.c:20 personal/phoneaccount/generic.tpl.c:11
-msgid "Home server"
-msgstr "Servidor de inicio"
-
-#: admin/ogroups/asterisk/class_phonequeue.inc:281
-#: admin/ogroups/asterisk/class_phonequeue.inc:871
-#: admin/ogroups/asterisk/phonequeue.tpl.c:23
-msgid "Timeout"
-msgstr "DesconexiÃ³n por tiempo"
-
-#: admin/ogroups/asterisk/class_phonequeue.inc:284
-#: admin/ogroups/asterisk/class_phonequeue.inc:896
-#: admin/ogroups/asterisk/phonequeue.tpl.c:26
-msgid "Retry"
-msgstr "Reintento"
-
-#: admin/ogroups/asterisk/class_phonequeue.inc:287
-msgid "Queue length"
-msgstr "Longitud de la cola"
-
-#: admin/ogroups/asterisk/class_phonequeue.inc:290
-#: admin/ogroups/asterisk/class_phonequeue.inc:874
-#: admin/ogroups/asterisk/phonequeue.tpl.c:35
-msgid "Announce frequency"
-msgstr "Frecuencia de aviso"
-
-#: admin/ogroups/asterisk/class_phonequeue.inc:293
-#: admin/conference/class_phoneConferenceGeneric.inc:328
-msgid "Number"
-msgstr "NÃºmero"
-
-#: admin/ogroups/asterisk/class_phonequeue.inc:316
-#: admin/ogroups/asterisk/class_phonequeue.inc:361
-msgid "asterisk"
-msgstr "asterisk"
-
-#: admin/ogroups/asterisk/class_phonequeue.inc:345
-#: admin/ogroups/asterisk/class_phonequeue.inc:696
-#: admin/conference/class_phoneConferenceGeneric.inc:369
-#: admin/macro/class_gofonMacro.inc:381 admin/macro/class_gofonMacro.inc:465
-#: addons/fonreports/class_fonreport.inc:190
-#: addons/fonreports/class_fonreport.inc:220
-#: personal/phoneaccount/class_phoneAccount.inc:455
-#: personal/phoneaccount/class_phoneAccount.inc:1061
-msgid "GOfon"
-msgstr "GOfon"
-
-#: admin/ogroups/asterisk/class_phonequeue.inc:401
-msgid "Cannot find old queue entry!"
-msgstr "Â¡No se puede encontrar la entrada de la cola anterior!"
-
-#: admin/ogroups/asterisk/class_phonequeue.inc:487
-#, php-format
-msgid ""
-"Found more than one entry named '%s' in queue table. Please inform your "
-"system administrator!"
-msgstr "Se ha encontrado mas de una entrada llamada '%s'. Â¡Por favor contacte con su administrador de sistemas!"
-
-#: admin/ogroups/asterisk/class_phonequeue.inc:728
-#: admin/ogroups/asterisk/class_phonequeue.inc:730
-msgid "telephone number"
-msgstr "nÃºmero de telÃ©fono"
-
-#: admin/ogroups/asterisk/class_phonequeue.inc:787
-#: admin/ogroups/asterisk/class_phonequeue.inc:829
-#: admin/conference/class_phoneConferenceGeneric.inc:229
-#: admin/conference/class_phoneConferenceGeneric.inc:233
-#: admin/conference/class_phoneConferenceGeneric.inc:271
-#: admin/macro/class_gofonMacro.inc:343 admin/macro/class_gofonMacro.inc:452
-#: admin/macro/class_gofonMacro.inc:461 admin/macro/class_gofonMacro.inc:499
-#: admin/systems/asterisk/class_phoneGeneric.inc:267
-#: admin/systems/asterisk/class_phoneGeneric.inc:308
-#: addons/fonreports/class_fonreport.inc:220
-#: personal/phoneaccount/class_phoneAccount.inc:1046
-#: personal/phoneaccount/class_phoneAccount.inc:1166
-#: personal/phoneaccount/class_phoneAccount.inc:1172
-#: personal/phoneaccount/class_phoneAccount.inc:1368
-#: personal/phoneaccount/class_phoneAccount.inc:1450
-#: personal/phoneaccount/class_phoneAccount.inc:1528
-msgid "Error"
-msgstr "Error"
-
-#: admin/ogroups/asterisk/class_phonequeue.inc:802
-#: admin/ogroups/asterisk/class_phonequeue.inc:857
-#: admin/conference/class_phoneConferenceGeneric.inc:682
-#: admin/macro/class_gofonMacro.inc:473 admin/macro/class_gofonMacro.inc:484
-#: admin/macro/class_gofonMacro.inc:521
-#: admin/macro/class_gofonMacroParameters.inc:435
-#: admin/systems/asterisk/class_phoneGeneric.inc:277
-#: admin/systems/asterisk/class_phoneGeneric.inc:432
-#: admin/systems/asterisk/class_phoneGeneric.inc:446
-#: admin/systems/asterisk/class_phoneGeneric.inc:463
-#: admin/systems/services/asterisk/class_serviceAsterisk.inc:121
-#: personal/phoneaccount/class_phoneAccount.inc:1476
-#: personal/phoneaccount/class_phoneAccount.inc:1609
-msgid "LDAP error"
-msgstr "Error LDAP"
-
-#: admin/ogroups/asterisk/class_phonequeue.inc:864
-#: admin/systems/asterisk/class_phoneGeneric.inc:472
-#: admin/systems/asterisk/class_phoneGeneric.inc:477
-#: personal/phoneaccount/class_phoneAccount.inc:999
-#: personal/phoneaccount/class_phoneAccount.inc:1012
-#: personal/phoneaccount/class_phoneAccount.inc:1024
-#: personal/phoneaccount/class_phoneAccount.inc:1028
-#: personal/phoneaccount/class_phoneAccount.inc:1031
-#: personal/phoneaccount/class_phoneAccount.inc:1657
+#: admin/systems/asterisk/class_phoneIAX.inc:30
+#: admin/systems/asterisk/class_phoneIAX.inc:34
+#: personal/asterisk/class_asteriskAccount.inc:45
 msgid "Phone"
 msgstr "TelÃ©fono"
 
-#: admin/ogroups/asterisk/class_phonequeue.inc:865
-msgid "Phone group"
-msgstr "Grupos telefÃ³nico"
-
-#: admin/ogroups/asterisk/class_phonequeue.inc:872
-#: admin/ogroups/asterisk/phonequeue.tpl.c:32
-msgid "Max queue length"
-msgstr "Longitud mÃ¡xima de la cola"
-
-#: admin/ogroups/asterisk/class_phonequeue.inc:875
-#: admin/ogroups/asterisk/phonequeue.tpl.c:86
-msgid "Allow the called user to transfer his call"
-msgstr "Permitir al receptor el transferir su llamada"
-
-#: admin/ogroups/asterisk/class_phonequeue.inc:876
-#: admin/ogroups/asterisk/phonequeue.tpl.c:89
-msgid "Allows calling user to transfer call"
-msgstr "Permitir al emisor el transferir su llamada"
-
-#: admin/ogroups/asterisk/class_phonequeue.inc:877
-#: admin/ogroups/asterisk/phonequeue.tpl.c:92
-msgid "Allow the called to hangup by pressing *"
-msgstr "Permitir al receptor colgar presionando *"
-
-#: admin/ogroups/asterisk/class_phonequeue.inc:878
-#: admin/ogroups/asterisk/phonequeue.tpl.c:98
-msgid "Ring instead of playing background music"
-msgstr "Sonar en vez de poner mÃºsica de fondo"
-
-#: admin/ogroups/asterisk/class_phonequeue.inc:879
-#: admin/ogroups/asterisk/phonequeue.tpl.c:95
-msgid "Allows calling to hangup by pressing *"
-msgstr "Permitir al emisor colgar presionando *"
-
-#: admin/ogroups/asterisk/class_phonequeue.inc:881
-#: admin/ogroups/asterisk/phonequeue.tpl.c:47
-msgid "Music on hold"
-msgstr "MÃºsica en espera"
-
-#: admin/ogroups/asterisk/class_phonequeue.inc:882
-msgid "Welcome music"
-msgstr "MÃºsica de bienvenida"
-
-#: admin/ogroups/asterisk/class_phonequeue.inc:883
-msgid "Report hold time"
-msgstr "Informe de tiempos de espera"
-
-#: admin/ogroups/asterisk/class_phonequeue.inc:884
-msgid "'You are next' sound"
-msgstr "Sonido de 'Eres el siguiente'"
-
-#: admin/ogroups/asterisk/class_phonequeue.inc:885
-msgid "'There are' sound"
-msgstr "Sonido de 'Hay'"
-
-#: admin/ogroups/asterisk/class_phonequeue.inc:886
-msgid "'Call waiting' sound"
-msgstr "Sonido de 'Llamada en espera'"
-
-#: admin/ogroups/asterisk/class_phonequeue.inc:887
-msgid "'Thank you' sound"
-msgstr "Sonido de 'Gracias'"
-
-#: admin/ogroups/asterisk/class_phonequeue.inc:888
-msgid "'Minutes' sound"
-msgstr "Sonido de 'minutos'"
-
-#: admin/ogroups/asterisk/class_phonequeue.inc:889
-msgid "'Seconds' sound"
-msgstr "Sonido de 'segundos'"
-
-#: admin/ogroups/asterisk/class_phonequeue.inc:890
-msgid "'Less than' sound"
-msgstr "Sonido de 'menos que'"
-
-#: admin/ogroups/asterisk/class_phonequeue.inc:891
-msgid "Queue phone number"
-msgstr "NÃºmero de cola telefÃ³nica"
-
-#: admin/ogroups/asterisk/class_phonequeue.inc:892
-#: admin/conference/class_phoneConferenceGeneric.inc:707
-#: admin/ogroups/asterisk/phonequeue.tpl.c:20
-#: admin/conference/generic.tpl.c:23
-msgid "Language"
-msgstr "Idioma"
-
-#: admin/ogroups/asterisk/class_phonequeue.inc:893
-msgid "Method"
-msgstr "MÃ©todo"
-
-#: admin/ogroups/asterisk/class_phonequeue.inc:894
-#: admin/ogroups/asterisk/phonequeue.tpl.c:83
-msgid "Announce holdtime"
-msgstr "Tiempo de espera de presentaciÃ³n"
-
-#: admin/ogroups/asterisk/class_phonequeue.inc:895
-msgid "Announce"
-msgstr "Anuncio"
+#: admin/systems/asterisk/class_phoneIAX.inc:31
+msgid "Asterisk phone"
+msgstr ""
 
-#: admin/conference/conf-list.xml:11
-msgid "List of conference rooms"
-msgstr "Lista de grupos de conferencias"
+#: admin/systems/asterisk/class_phoneIAX.inc:33
+msgid "Phone hardware"
+msgstr "TelÃ©fono hardware"
 
-#: admin/conference/conf-list.xml:15 admin/conference/conf-list.xml:74
-msgid "Conference"
-msgstr "Conferencia"
+#: admin/systems/asterisk/class_phoneIAX.inc:46
+#: personal/asterisk/class_asteriskAccount.inc:42
+msgid "Telephone"
+msgstr "TelÃ©fono"
 
-#: admin/conference/conf-list.xml:41
-#: admin/conference/class_phoneConferenceGeneric.inc:324
-#: admin/conference/class_phoneConferenceGeneric.inc:347
-#: admin/conference/class_phoneConferenceGeneric.inc:702
-#: admin/macro/class_gofonMacro.inc:395 admin/macro/class_gofonMacro.inc:406
-#: admin/macro/macro-list.xml:41
-#: admin/systems/asterisk/class_phoneGeneric.inc:344
-#: admin/systems/asterisk/class_phoneGeneric.inc:348
-#: admin/systems/asterisk/class_phoneGeneric.inc:351
-#: admin/systems/asterisk/class_phoneGeneric.inc:366
-#: admin/systems/asterisk/class_phoneGeneric.inc:482
-#: admin/conference/conf-filter.tpl.c:5 admin/macro/macro-filter.tpl.c:5
-#: admin/macro/parameter.tpl.c:5
+#: admin/systems/asterisk/class_phoneIAX.inc:49
 msgid "Name"
 msgstr "Nombre"
 
-#: admin/conference/conf-list.xml:49
-#: admin/conference/class_phoneConferenceGeneric.inc:704
-#: admin/macro/class_gofonMacro.inc:547 admin/macro/macro-list.xml:49
-#: admin/systems/asterisk/class_phoneGeneric.inc:484
-#: admin/conference/generic.tpl.c:29 admin/macro/generic.tpl.c:17
-#: admin/systems/asterisk/phone.tpl.c:8
-msgid "Description"
-msgstr "DescripciÃ³n"
-
-#: admin/conference/conf-list.xml:57 admin/macro/macro-list.xml:57
-msgid "Actions"
-msgstr "Acciones"
-
-#: admin/conference/conf-list.xml:68 admin/macro/macro-list.xml:68
-msgid "Create"
-msgstr "Crear"
-
-#: admin/conference/conf-list.xml:86 admin/conference/conf-list.xml:125
-#: admin/macro/macro-list.xml:86 admin/macro/macro-list.xml:125
-msgid "Edit"
-msgstr "Editar"
-
-#: admin/conference/conf-list.xml:93 admin/conference/conf-list.xml:138
-#: admin/macro/macro-list.xml:93 admin/macro/macro-list.xml:138
-msgid "Remove"
-msgstr "Eliminar"
-
-#: admin/conference/class_phoneConferenceGeneric.inc:233
-#, php-format
-msgid "Cannot delete entry from server '%s' because it seems to be removed!"
-msgstr "Â¡No se puede eliminar la entrada del servidor '%s' porque ha sido eliminada!"
-
-#: admin/conference/class_phoneConferenceGeneric.inc:308
-#, php-format
-msgid ""
-"The previously selected asterisk home server '%s' is no longer available!"
-msgstr "Â¡El servidor principal asterisk seleccionado previamente ('%s) no estÃ¡ disponible!"
-
-#: admin/conference/class_phoneConferenceGeneric.inc:315
-#: admin/conference/generic.tpl.c:47
-msgid "PIN"
-msgstr "PIN"
-
-#: admin/conference/class_phoneConferenceGeneric.inc:333
-#: admin/conference/class_phoneConferenceGeneric.inc:719
-msgid "Lifetime"
-msgstr "DuraciÃ³n"
-
-#: admin/conference/class_phoneConferenceGeneric.inc:399
-#: personal/phoneaccount/class_phoneAccount.inc:346
-#: personal/phoneaccount/class_phoneAccount.inc:359
-#: personal/phoneaccount/class_phoneAccount.inc:617
-#: personal/phoneaccount/class_phoneAccount.inc:656
-#: personal/phoneaccount/class_phoneAccount.inc:1519
-#: personal/phoneaccount/class_phoneAccount.inc:1695
-#: admin/conference/remove.tpl.c:2 admin/macro/remove.tpl.c:2
-msgid "Warning"
-msgstr "Aviso"
-
-#: admin/conference/class_phoneConferenceGeneric.inc:400
-#, php-format
-msgid ""
-"FusionDirectory identified problems with your MySQL table definition, please"
-" activate debugging for details."
+#: admin/systems/asterisk/class_phoneIAX.inc:49
+msgid "Name of this phone"
 msgstr ""
 
-#: admin/conference/class_phoneConferenceGeneric.inc:606
-#: admin/conference/class_phoneConferenceGeneric.inc:608
-#, php-format
-msgid "'%s' is already assigned to '%s'!"
-msgstr "Â¡'%s' estÃ¡ ya asignado a '%s'!"
-
-#: admin/conference/class_phoneConferenceGeneric.inc:693
-msgid "Phone Conference"
+#: admin/systems/asterisk/class_phoneIAX.inc:53
+msgid "Account name"
 msgstr ""
 
-#: admin/conference/class_phoneConferenceGeneric.inc:694
-msgid "Phone conference management"
-msgstr "AdministraciÃ³n de conferencia telefÃ³nica"
-
-#: admin/conference/class_phoneConferenceGeneric.inc:696
-msgid "GOfon conference"
-msgstr "Conferencia GOfon"
-
-#: admin/conference/class_phoneConferenceGeneric.inc:698
-msgid "Asterisk conference"
+#: admin/systems/asterisk/class_phoneIAX.inc:53
+msgid "Name of the account"
 msgstr ""
 
-#: admin/conference/class_phoneConferenceGeneric.inc:703
-#: admin/macro/class_gofonMacro.inc:546
-#: admin/systems/asterisk/class_phoneGeneric.inc:483
-#: admin/conference/generic.tpl.c:17 admin/macro/generic.tpl.c:14
-#: admin/systems/asterisk/phone.tpl.c:5
-msgid "Base"
-msgstr "Base"
-
-#: admin/conference/class_phoneConferenceGeneric.inc:705
-msgid "Conference PIN"
-msgstr "PIN de conferencia"
-
-#: admin/conference/class_phoneConferenceGeneric.inc:710
-#: admin/conference/generic.tpl.c:44
-msgid "Preset PIN"
-msgstr "PIN configurado"
-
-#: admin/conference/class_phoneConferenceGeneric.inc:711
-#: admin/conference/generic.tpl.c:50
-msgid "Record conference"
-msgstr "Grabar conferencia"
-
-#: admin/conference/class_phoneConferenceGeneric.inc:712
-#: admin/conference/generic.tpl.c:59
-msgid "Play music on hold"
-msgstr "Poner mÃºsica en espera"
-
-#: admin/conference/class_phoneConferenceGeneric.inc:713
-msgid "Activate menu"
-msgstr "Activar menÃº"
-
-#: admin/conference/class_phoneConferenceGeneric.inc:714
-msgid "Announce user activity"
-msgstr "Anunciar actividad de usuario"
-
-#: admin/conference/class_phoneConferenceGeneric.inc:715
-msgid "Count user"
-msgstr "Cuenta de usuario"
-
-#: admin/conference/class_phoneConferenceGeneric.inc:716
-msgid "Conference type"
-msgstr "Tipo de conferencia"
-
-#: admin/conference/class_phoneConferenceGeneric.inc:718
-msgid "Format"
-msgstr "Formato"
-
-#: admin/conference/class_phoneConferenceGeneric.inc:720
-#: personal/phoneaccount/class_phoneAccount.inc:1666
-msgid "Telephone number"
-msgstr "NÃºmero de telÃ©fono"
-
-#: admin/conference/class_phoneConferenceGeneric.inc:721
-msgid "Owner"
-msgstr "Propietario"
-
-#: admin/conference/class_phoneConferenceManagment.inc:36
-msgid "Phone Conferences"
-msgstr ""
-
-#: admin/conference/class_phoneConferenceManagment.inc:37
-msgid "Phone Conference management"
-msgstr ""
-
-#: admin/macro/class_gofonMacro.inc:202
-#, php-format
-msgid ""
-"Macro could not be removed from server '%s', please check database "
-"consistency!"
-msgstr ""
-
-#: admin/macro/class_gofonMacro.inc:264
-#, php-format
-msgid "Application missing in line %s!"
-msgstr "Â¡La aplicaciÃ³n falla en linea %s!"
-
-#: admin/macro/class_gofonMacro.inc:267
-#, php-format
-msgid "Priority missing in line %s!"
-msgstr ""
-
-#: admin/macro/class_gofonMacro.inc:271
-#, php-format
-msgid "Extension missing in line %s!"
-msgstr "Â¡La extensiÃ³n falla en linea %s!"
-
-#: admin/macro/class_gofonMacro.inc:281
-#, php-format
-msgid "Duplicate combination of 'extension' and 'priority' in line %s!"
-msgstr ""
-
-#: admin/macro/class_gofonMacro.inc:317
-#, php-format
-msgid ""
-"Macro could not be added to server '%s', please check database consistency!"
-msgstr ""
-
-#: admin/macro/class_gofonMacro.inc:410
-msgid "Name can be 20 characters at maximum!"
-msgstr "Â¡El nombre tiene 20 caracteres como mÃ¡ximo!"
-
-#: admin/macro/class_gofonMacro.inc:419
-msgid "Macro is still in use!"
-msgstr "La macro estÃ¡ todavÃa en uso."
-
-#: admin/macro/class_gofonMacro.inc:426
-msgid "Macro is empty!"
-msgstr "Â¡La macro estÃ¡ vacÃa!"
-
-#: admin/macro/class_gofonMacro.inc:452
-#: admin/systems/asterisk/class_phoneGeneric.inc:267
-#, php-format
-msgid "Cannot delete entry because it is still in use by '%s'!"
-msgstr "Â¡No se puede eliminar la entrada porque estÃ¡ siendo usada por '%s'!"
-
-#: admin/macro/class_gofonMacro.inc:465
-#: addons/fonreports/class_fonreport.inc:190
-#: personal/phoneaccount/class_phoneAccount.inc:455
-#: personal/phoneaccount/class_phoneAccount.inc:1061
-#: personal/phoneaccount/class_phoneAccount.inc:1567
-msgid "Configuration error"
-msgstr "Error en la configuraciÃ³n"
-
-#: admin/macro/class_gofonMacro.inc:536 admin/macro/class_gofonMacro.inc:541
-msgid "Asterisk macro"
-msgstr ""
-
-#: admin/macro/class_gofonMacro.inc:537
-msgid "Asterisk macro management"
-msgstr "AdministraciÃ³n de macros de Asterisk"
-
-#: admin/macro/class_gofonMacro.inc:539
-msgid "GOfon macro"
-msgstr "Macro GOfon"
-
-#: admin/macro/class_gofonMacro.inc:545 admin/macro/generic.tpl.c:2
-#: admin/macro/generic.tpl.c:5 admin/macro/paste_generic.tpl.c:2
-#: admin/macro/paste_generic.tpl.c:5
-msgid "Macro name"
-msgstr "Nombre de la macro"
-
-#: admin/macro/class_gofonMacro.inc:548 admin/macro/generic.tpl.c:8
-msgid "Display name"
-msgstr "Nombre a Mostrar"
-
-#: admin/macro/class_gofonMacro.inc:549
-msgid "Macro content and parameter"
-msgstr "Contenido y parÃ¡metros de la macro"
-
-#: admin/macro/class_gofonMacro.inc:550
-msgid "Visibility flag"
-msgstr "Atributo de visibilidad"
-
-#: admin/macro/class_gofonMacroManagement.inc:36
-msgid "Phone Macros"
-msgstr ""
-
-#: admin/macro/class_gofonMacroManagement.inc:37
-msgid "Phone Macros management"
-msgstr ""
-
-#: admin/macro/macro-list.xml:11
-msgid "List of macros"
-msgstr "Lista de macros"
-
-#: admin/macro/macro-list.xml:15 admin/macro/macro-list.xml:74
-msgid "Macro"
-msgstr "Macro"
-
-#: admin/macro/class_gofonMacroParameters.inc:58
-msgid "Parameter"
-msgstr "ParÃ¡metro"
-
-#: admin/macro/class_gofonMacroParameters.inc:59
-msgid "Asterisk macro parameter"
-msgstr ""
-
-#: admin/macro/class_gofonMacroParameters.inc:234
-#: personal/phoneaccount/generic.tpl.c:35
-msgid "Phone macro"
-msgstr "Macro telefÃ³nica"
-
-#: admin/macro/class_gofonMacroParameters.inc:290
-msgid "String"
-msgstr "Cadena de texto"
-
-#: admin/macro/class_gofonMacroParameters.inc:291
-msgid "Combobox"
-msgstr "Cuadro combinado"
-
-#: admin/macro/class_gofonMacroParameters.inc:292
-msgid "Bool"
-msgstr "Booleano"
-
-#: admin/macro/class_gofonMacroParameters.inc:298
-msgid "Delete unused"
-msgstr "Eliminar sin usar"
-
-#: admin/macro/class_gofonMacroParameters.inc:374
-#, php-format
-msgid "Parameter %s contains invalid character. '!,#' is used as delimiter!"
-msgstr "Â¡El campo '%s' tiene caracteres no validos, '!,#' son usados como delimitadores!"
-
-#: admin/macro/class_gofonMacroParameters.inc:379
-#, php-format
-msgid "Parameter %s is invalid!"
-msgstr "Â¡El parÃ¡metro '%s' no es vÃ¡lido!"
-
-#: admin/macro/class_gofonMacroParameters.inc:408
-#: personal/phoneaccount/class_phoneAccount.inc:1600
-msgid "Information"
-msgstr "InformaciÃ³n"
-
-#: admin/macro/class_gofonMacroParameters.inc:408
-msgid ""
-"Number of parameters for this macro has changed. Please update all users "
-"using it!"
-msgstr "El nÃºmero de parÃ¡metros para esta macro ha cambiado. Â¡Por favor actualice todos los usuarios que la usen!"
-
-#: admin/systems/asterisk/class_phoneGeneric.inc:151
-msgid "phone"
-msgstr "TelÃ©fono"
-
-#: admin/systems/asterisk/class_phoneGeneric.inc:230
-msgid "yes"
-msgstr "si"
-
-#: admin/systems/asterisk/class_phoneGeneric.inc:230
-msgid "no"
-msgstr "no"
-
-#: admin/systems/asterisk/class_phoneGeneric.inc:247
-msgid "dynamic"
-msgstr "dinÃ¡mico"
-
-#: admin/systems/asterisk/class_phoneGeneric.inc:247
-msgid "Networksettings"
-msgstr "ConfiguraciÃ³n de red"
-
-#: admin/systems/asterisk/class_phoneGeneric.inc:330
-#: admin/systems/asterisk/class_phoneGeneric.inc:333
-msgid "IP address"
-msgstr "DirecciÃ³n IP"
-
-#: admin/systems/asterisk/class_phoneGeneric.inc:473
-msgid "Phone information"
-msgstr ""
-
-#: admin/systems/asterisk/class_phoneGeneric.inc:476
-#: personal/phoneaccount/class_phoneAccount.inc:1668
-msgid "Phone hardware"
-msgstr "TelÃ©fono hardware"
-
-#: admin/systems/asterisk/class_phoneGeneric.inc:485
-msgid "SIP Mode"
-msgstr "Modo SIP"
-
-#: admin/systems/asterisk/class_phoneGeneric.inc:486
-msgid "SIP DTMF mode"
-msgstr "Modo SIP DTMF"
-
-#: admin/systems/asterisk/class_phoneGeneric.inc:487
-msgid "SIP Default ip"
-msgstr "DirecciÃ³n IP por defecto de SIP"
-
-#: admin/systems/asterisk/class_phoneGeneric.inc:488
-msgid "SIP Qualify"
-msgstr "Capacidad SIP"
-
-#: admin/systems/asterisk/class_phoneGeneric.inc:489
-msgid "IAX authentication type"
-msgstr "Tipo de autentificaciÃ³n IAX"
-
-#: admin/systems/asterisk/class_phoneGeneric.inc:490
-msgid "IAX secret"
-msgstr "contraseÃ±a IAX"
-
-#: admin/systems/asterisk/class_phoneGeneric.inc:491
-msgid "IAX account code"
-msgstr "CÃ³digo de cuenta IAX"
-
-#: admin/systems/asterisk/class_phoneGeneric.inc:492
-msgid "IAX trunk lines"
-msgstr "Lineas troncales IAX"
-
-#: admin/systems/asterisk/class_phoneGeneric.inc:493
-msgid "IAX permit settings"
-msgstr "ConfiguraciÃ³n permitida IAX"
-
-#: admin/systems/asterisk/class_phoneGeneric.inc:494
-msgid "IAX deny settings"
-msgstr "ConfiguraciÃ³n denegada IAX"
-
-#: admin/systems/asterisk/class_phoneGeneric.inc:495
-msgid "CAPI MSN"
-msgstr "CAPI MSN"
-
-#: admin/systems/asterisk/class_phoneGeneric.inc:496
-msgid "Hardware type"
-msgstr "Tipo de hardware"
-
 #: admin/systems/services/asterisk/class_serviceAsterisk.inc:35
 msgid "VoIP database information"
 msgstr "InformaciÃ³n de base de datos VoIP"
@@ -746,6 +95,10 @@ msgid ""
 "these objects '%s'."
 msgstr "No puede eliminar la extensiÃ³n de base de datos asterisk, esta todavÃa en use por los objetos '%s'."
 
+#: admin/systems/services/asterisk/class_serviceAsterisk.inc:121
+msgid "LDAP error"
+msgstr "Error LDAP"
+
 #: admin/systems/services/asterisk/class_serviceAsterisk.inc:140
 msgid "VoIP service (asterisk)"
 msgstr ""
@@ -758,209 +111,18 @@ msgstr "VoIP - AdministraciÃ³n de Asterisk PBX"
 msgid "Services"
 msgstr "Servicios"
 
-#: addons/fonreports/class_fonreport.inc:232
-msgid "Insufficient permissions"
-msgstr "Permisos insuficientes"
-
-#: addons/fonreports/class_fonreport.inc:251
-msgid "Y-M-D"
-msgstr "Y-M-D"
-
-#: addons/fonreports/class_fonreport.inc:418
-#: addons/fonreports/class_fonreport.inc:419
-#: addons/fonreports/class_fonreport.inc:424 addons/fonreports/main.inc:46
-msgid "Phone reports"
-msgstr "Informes telefÃ³nicos"
-
-#: addons/fonreports/class_fonreport.inc:419
-msgid "All entries are readonly"
-msgstr "Todas las entradas son solo lectura"
-
-#: addons/fonreports/class_fonreport.inc:428
-#: addons/fonreports/contents.tpl.c:32
-msgid "Date"
-msgstr "Fecha"
-
-#: addons/fonreports/class_fonreport.inc:429
-#: addons/fonreports/contents.tpl.c:35
-msgid "Source"
-msgstr "Origen"
-
-#: addons/fonreports/class_fonreport.inc:430
-#: addons/fonreports/contents.tpl.c:38
-msgid "Destination"
-msgstr "Destino"
-
-#: addons/fonreports/class_fonreport.inc:431
-#: addons/fonreports/contents.tpl.c:41
-msgid "Channel"
-msgstr "Canal"
-
-#: addons/fonreports/class_fonreport.inc:432
-msgid "Application called"
-msgstr "AplicaciÃ³n llamada"
-
-#: addons/fonreports/class_fonreport.inc:433
-msgid "Disposition"
-msgstr "DisposiciÃ³n"
-
-#: addons/fonreports/class_fonreport.inc:434
-#: addons/fonreports/contents.tpl.c:50
-msgid "Duration"
-msgstr "DuraciÃ³n"
-
-#: personal/phoneaccount/class_phoneAccount.inc:176
-msgid "automatic"
-msgstr "automÃ¡tico"
-
-#: personal/phoneaccount/class_phoneAccount.inc:212
-msgid "no macro"
-msgstr "sin macro"
-
-#: personal/phoneaccount/class_phoneAccount.inc:240
-msgid "undefined"
-msgstr "sin definir"
-
-#: personal/phoneaccount/class_phoneAccount.inc:359
-#, php-format
-msgid ""
-"Cannot identify telephone extension in database, please try to save again."
-msgstr "No se puede identificar la extensiÃ³n telefÃ³nica en la base de datos, por favor intente guardarla de nuevo."
-
-#: personal/phoneaccount/class_phoneAccount.inc:577
-#: personal/phoneaccount/class_phoneAccount.inc:595
-msgid "Abort saving entries to keep the database consistent."
-msgstr "Cancelar la grabaciÃ³n de las entradas para mantener la consistencia de la base de datos."
-
-#: personal/phoneaccount/class_phoneAccount.inc:618
-#: personal/phoneaccount/class_phoneAccount.inc:657
-#: personal/phoneaccount/class_phoneAccount.inc:1520
-#, php-format
-msgid ""
-"FusionDirectory identified problems with your database table definition!"
-msgstr ""
-
-#: personal/phoneaccount/class_phoneAccount.inc:1023
-msgid "Remove phone account"
-msgstr "Eliminar cuenta telefÃ³nica"
-
-#: personal/phoneaccount/class_phoneAccount.inc:1027
-#: personal/phoneaccount/class_phoneAccount.inc:1030
-msgid "Create phone account"
-msgstr "Crear cuenta telefÃ³nica"
-
-#: personal/phoneaccount/class_phoneAccount.inc:1028
-msgid "User uid"
-msgstr "Identificador (UID) de usuario"
-
-#: personal/phoneaccount/class_phoneAccount.inc:1046
-msgid "Selected macro is not available anymore!"
-msgstr "Â¡La macro seleccionada no estÃ¡ disponible!"
-
-#: personal/phoneaccount/class_phoneAccount.inc:1221
-msgid "Choose your private phone"
-msgstr "Indique su telÃ©fono particular"
-
-#: personal/phoneaccount/class_phoneAccount.inc:1346
-msgid ""
-"There must be at least one server with an asterisk database to create a "
-"phone account."
-msgstr "Debe existir al menos un servidor con una base de datos asterisk para crear una cuenta telefÃ³nica."
-
-#: personal/phoneaccount/class_phoneAccount.inc:1354
-#: personal/phoneaccount/class_phoneAccount.inc:1357
-#: personal/phoneaccount/generic.tpl.c:29
-#: personal/phoneaccount/paste_generic.tpl.c:11
-msgid "Voicemail PIN"
-msgstr "PIN del buzÃ³n de correo"
-
-#: personal/phoneaccount/class_phoneAccount.inc:1354
-msgid "Between 1-4 charactes"
-msgstr "Entre 1 a 4 caracteres"
-
-#: personal/phoneaccount/class_phoneAccount.inc:1362
-#: personal/phoneaccount/generic.tpl.c:32
-#: personal/phoneaccount/paste_generic.tpl.c:14
-msgid "Phone PIN"
-msgstr "PIN del TelÃ©fono"
-
-#: personal/phoneaccount/class_phoneAccount.inc:1394
-#: admin/conference/generic.tpl.c:38 admin/conference/paste_generic.tpl.c:8
-msgid "Phone number"
-msgstr "NÃºmero de telÃ©fono"
-
-#: personal/phoneaccount/class_phoneAccount.inc:1402
-#, php-format
-msgid "macro parameter %s"
-msgstr "parÃ¡metro de macro %s"
-
-#: personal/phoneaccount/class_phoneAccount.inc:1450
-msgid "An error occured while updating the database entries!"
-msgstr "Â¡Un error ha ocurrido mientras actualizaba las entradas en la base de datos!"
-
-#: personal/phoneaccount/class_phoneAccount.inc:1567
-msgid "Was not able to found any asterisk server"
+#: personal/asterisk/class_asteriskAccount.inc:30
+#: config/asterisk/class_asteriskPluginConfig.inc:28
+#: config/asterisk/class_asteriskPluginConfig.inc:41
+msgid "Asterisk"
 msgstr ""
 
-#: personal/phoneaccount/class_phoneAccount.inc:1600
-#, php-format
-msgid "User '%s' has been removed from phone queue '%s'."
-msgstr "Eliminado usuario '%s' de la cola de telÃ©fono '%s'."
-
-#: personal/phoneaccount/class_phoneAccount.inc:1637
-#: personal/phoneaccount/class_phoneAccount.inc:1639
-#, php-format
-msgid "The specified telephonenumber '%s' is already assigned to '%s'."
-msgstr "El nÃºmero telÃ©fono introducido '%s' ya estÃ¡ asignado a '%s'."
-
-#: personal/phoneaccount/class_phoneAccount.inc:1649
-#, php-format
-msgid ""
-"The previously selected asterisk home server (%s) is no longer available. "
-"Remove aborted."
-msgstr "El servidor principal de asterisk seleccionado anteriormente (%s) no estÃ¡ disponible. EliminaciÃ³n cancelada."
-
-#: personal/phoneaccount/class_phoneAccount.inc:1658
-msgid "Phone account settings"
-msgstr "ConfiguraciÃ³n cuenta telefÃ³nica"
-
-#: personal/phoneaccount/class_phoneAccount.inc:1667
-msgid "Macro settings"
-msgstr "ParÃ¡metros de macro"
-
-#: personal/phoneaccount/class_phoneAccount.inc:1670
-msgid "Phone context"
-msgstr "Contexto telefÃ³nico"
-
-#: personal/phoneaccount/class_phoneAccount.inc:1671
-msgid "Voice mail context"
-msgstr "Contexto de buzÃ³n de voz"
-
-#: personal/phoneaccount/class_phoneAccount.inc:1672
-msgid "Telephone pin"
-msgstr "PIN del telÃ©fono"
-
-#: personal/phoneaccount/class_phoneAccount.inc:1673
-msgid "Voicemail pin"
-msgstr "PIN del buzÃ³n de voz"
-
-#: personal/phoneaccount/class_phoneAccount.inc:1695
-#, php-format
-msgid "You need to configure %s contexts first"
+#: personal/asterisk/class_asteriskAccount.inc:31
+msgid "Asterisk account"
 msgstr ""
 
-#: personal/phoneaccount/main.inc:124
-msgid "Click the 'Edit' button below to change informations in this dialog"
-msgstr "Pulse en el botÃ³n - Editar - para cambiar la informaciÃ³n en esta ventana"
-
-#: personal/phoneaccount/main.inc:134
-#: personal/phoneaccount/paste_generic.tpl.c:2
-msgid "Phone settings"
-msgstr "ConfiguraciÃ³n telefÃ³nica"
-
-#: config/asterisk/class_asteriskPluginConfig.inc:28
-#: config/asterisk/class_asteriskPluginConfig.inc:41
-msgid "Asterisk"
+#: personal/asterisk/class_asteriskAccount.inc:45
+msgid "Select the phone associated to this user"
 msgstr ""
 
 #: config/asterisk/class_asteriskPluginConfig.inc:29
@@ -1010,338 +172,3 @@ msgstr ""
 #: config/asterisk/class_asteriskPluginConfig.inc:72
 msgid "Available voicemail contexts"
 msgstr ""
-
-#: admin/ogroups/asterisk/phonequeue.tpl.c:2
-msgid ""
-"Only users with the same asterisk home server will be included to this "
-"queue."
-msgstr "Los usuarios con el mismo servidor principal asterisk serÃ¡n incluidos en esta cola."
-
-#: admin/ogroups/asterisk/phonequeue.tpl.c:5
-#: personal/phoneaccount/generic.tpl.c:2
-#: personal/phoneaccount/paste_generic.tpl.c:5
-msgid "Phone numbers"
-msgstr "NÃºmeros de telÃ©fonos"
-
-#: admin/ogroups/asterisk/phonequeue.tpl.c:8
-msgid "Up"
-msgstr "Arriba"
-
-#: admin/ogroups/asterisk/phonequeue.tpl.c:11
-msgid "Down"
-msgstr "Abajo"
-
-#: admin/ogroups/asterisk/phonequeue.tpl.c:14
-#: admin/conference/generic.tpl.c:41
-msgid "Options"
-msgstr "Opciones"
-
-#: admin/ogroups/asterisk/phonequeue.tpl.c:29
-msgid "Strategy"
-msgstr "Estrategia"
-
-#: admin/ogroups/asterisk/phonequeue.tpl.c:38
-msgid "(in seconds)"
-msgstr "(en segundos)"
-
-#: admin/ogroups/asterisk/phonequeue.tpl.c:41
-msgid "Queue sound setup"
-msgstr "ConfiguraciÃ³n de los sonidos de la cola"
-
-#: admin/ogroups/asterisk/phonequeue.tpl.c:44
-msgid "Use music on hold instead of ringing"
-msgstr "Usar Poner mÃºsica en espera en vez de timbre de aviso"
-
-#: admin/ogroups/asterisk/phonequeue.tpl.c:50
-msgid "Welcome sound file"
-msgstr "Archivo de audio de Bienvenida"
-
-#: admin/ogroups/asterisk/phonequeue.tpl.c:53
-msgid "Announce message"
-msgstr "Mensaje de presentaciÃ³n"
-
-#: admin/ogroups/asterisk/phonequeue.tpl.c:56
-msgid "Sound file for 'You are next ...'"
-msgstr "Archivo de audio para 'Usted es el siguiente...'"
-
-#: admin/ogroups/asterisk/phonequeue.tpl.c:59
-msgid "'There are ...'"
-msgstr "'Hay...'"
-
-#: admin/ogroups/asterisk/phonequeue.tpl.c:62
-msgid "'... calls waiting'"
-msgstr "'... llamadas esperando'"
-
-#: admin/ogroups/asterisk/phonequeue.tpl.c:65
-msgid "'Thank you' message"
-msgstr "Mensaje de Despedida"
-
-#: admin/ogroups/asterisk/phonequeue.tpl.c:68
-msgid "'minutes' sound file"
-msgstr "Archivo de audio 'minutos'"
-
-#: admin/ogroups/asterisk/phonequeue.tpl.c:71
-msgid "'seconds' sound file"
-msgstr "Archivo de audio 'segundos'"
-
-#: admin/ogroups/asterisk/phonequeue.tpl.c:74
-msgid "Hold sound file"
-msgstr "Archivo de audio de espera"
-
-#: admin/ogroups/asterisk/phonequeue.tpl.c:77
-msgid "Less Than sound file"
-msgstr "Archivo de audio Menos Que"
-
-#: admin/ogroups/asterisk/phonequeue.tpl.c:80
-msgid "Phone attributes "
-msgstr "CaracterÃsticas del TelÃ©fono"
-
-#: admin/conference/conf-filter.tpl.c:2 admin/macro/macro-filter.tpl.c:2
-#: addons/fonreports/contents.tpl.c:2
-msgid "Filter"
-msgstr "Filtro"
-
-#: admin/conference/generic.tpl.c:2
-msgid "Properties"
-msgstr "Propiedades"
-
-#: admin/conference/generic.tpl.c:5 admin/conference/paste_generic.tpl.c:2
-msgid "Conference name"
-msgstr "Nombre de Conferencia"
-
-#: admin/conference/generic.tpl.c:8 admin/conference/paste_generic.tpl.c:5
-msgid "Name of conference to create"
-msgstr "Nombre del Conferencia para crear"
-
-#: admin/conference/generic.tpl.c:11
-msgid "Type"
-msgstr "Tipo"
-
-#: admin/conference/generic.tpl.c:14
-msgid "Choose subtree to place conference in"
-msgstr "Elija el subÃ¡rbol donde colocar la conferencia"
-
-#: admin/conference/generic.tpl.c:26
-msgid "Select language"
-msgstr "SelecciÃ³n de idiomas"
-
-#: admin/conference/generic.tpl.c:32
-msgid "Descriptive text for department"
-msgstr "DescripciÃ³n del departamento"
-
-#: admin/conference/generic.tpl.c:35
-msgid "Lifetime (in days)"
-msgstr "DuraciÃ³n (en dÃas)"
-
-#: admin/conference/generic.tpl.c:53
-msgid "Sound file format"
-msgstr "Formato del archivo de audio"
-
-#: admin/conference/generic.tpl.c:56
-msgid "Choose subtree to place department in"
-msgstr "Elija subÃ¡rbol para colocar el departamento"
-
-#: admin/conference/generic.tpl.c:62
-msgid "Activate session menu"
-msgstr "Activar menÃº de sesiÃ³n"
-
-#: admin/conference/generic.tpl.c:65
-msgid "Announce users joining or leaving the conference"
-msgstr "Avisar de usuarios que se unen o dejan la conferencia"
-
-#: admin/conference/generic.tpl.c:68
-msgid "Count users"
-msgstr "Contar usuarios"
-
-#: admin/conference/remove.tpl.c:5 admin/macro/remove.tpl.c:5
-msgid ""
-"Please double check if you really want to do this since there is no way for "
-"FusionDirectory to get your data back."
-msgstr "Por favor verifique si realmente quiere hacer esto ya que no hay forma para que FusionDirectory recupere la data."
-
-#: admin/conference/remove.tpl.c:8 admin/macro/remove.tpl.c:8
-msgid "So - if you're sure - press 'Delete' to continue or 'Cancel' to abort."
-msgstr "Entonces, si esta seguro, presione <i>Eliminar</i> para continuar o <i>Cancelar</i> para Abortar."
-
-#: admin/macro/generic.tpl.c:11
-msgid "Macro name to be displayed"
-msgstr "Nombre con el que se mostrara la macro"
-
-#: admin/macro/generic.tpl.c:20
-msgid "Visible for user"
-msgstr "Visible para el usuario"
-
-#: admin/macro/generic.tpl.c:23
-msgid "Macro text"
-msgstr "Macro de texto"
-
-#: admin/macro/parameter.tpl.c:2
-msgid "Argument"
-msgstr "Argumento"
-
-#: admin/macro/parameter.tpl.c:8
-msgid "type"
-msgstr "tipo"
-
-#: admin/macro/parameter.tpl.c:11
-msgid "Default value"
-msgstr "Valor por defecto"
-
-#: admin/macro/parameter.tpl.c:14
-msgid "You are not allowed to view the macro parameter settings"
-msgstr "No tiene permisos para ver la configuraciÃ³n de parÃ¡metros de la macro"
-
-#: admin/systems/asterisk/phonesettings.tpl.c:2
-msgid "Advanced phone settings"
-msgstr "ConfiguraciÃ³n telefÃ³nica avanzada"
-
-#: admin/systems/asterisk/phonesettings.tpl.c:5
-msgid "Phone type"
-msgstr "Tipo de telÃ©fono"
-
-#: admin/systems/asterisk/phonesettings.tpl.c:8
-#: admin/systems/asterisk/phonesettings.tpl.c:14
-#: admin/systems/asterisk/phonesettings.tpl.c:20
-#: admin/systems/asterisk/phonesettings.tpl.c:26
-#: admin/systems/asterisk/phonesettings.tpl.c:35
-#: admin/systems/asterisk/phonesettings.tpl.c:47
-#: admin/systems/asterisk/phonesettings.tpl.c:65
-msgid "Choose a phone type"
-msgstr "Elija tipo de telÃ©fono"
-
-#: admin/systems/asterisk/phonesettings.tpl.c:11
-msgid "Mode"
-msgstr "Modo"
-
-#: admin/systems/asterisk/phonesettings.tpl.c:17
-msgid "DTMF mode"
-msgstr "Modo DTMF"
-
-#: admin/systems/asterisk/phonesettings.tpl.c:23
-#: admin/systems/asterisk/phonesettings.tpl.c:38
-msgid "Default IP"
-msgstr "DirecciÃ³n IP por defecto"
-
-#: admin/systems/asterisk/phonesettings.tpl.c:29
-#: admin/systems/asterisk/phonesettings.tpl.c:41
-msgid "Response timeout"
-msgstr "Tiempo mÃ¡ximo de respuesta"
-
-#: admin/systems/asterisk/phonesettings.tpl.c:32
-msgid "Modus"
-msgstr "Modo"
-
-#: admin/systems/asterisk/phonesettings.tpl.c:44
-msgid "Authtype"
-msgstr "Tipo de autenticaciÃ³n"
-
-#: admin/systems/asterisk/phonesettings.tpl.c:50
-msgid "Secret"
-msgstr "Secreto"
-
-#: admin/systems/asterisk/phonesettings.tpl.c:53
-msgid "GoFonInkeys"
-msgstr "GoFonInkeys"
-
-#: admin/systems/asterisk/phonesettings.tpl.c:56
-msgid "GoFonOutKeys"
-msgstr "GoFonOutKeys"
-
-#: admin/systems/asterisk/phonesettings.tpl.c:59
-msgid "Account code"
-msgstr "CÃ³digo de cuenta"
-
-#: admin/systems/asterisk/phonesettings.tpl.c:62
-msgid "Trunk lines"
-msgstr "Lineas troncales"
-
-#: admin/systems/asterisk/phonesettings.tpl.c:68
-msgid "Hosts that are allowed to connect"
-msgstr "Equipos/Redes que tienen permiso para conectar"
-
-#: admin/systems/asterisk/phonesettings.tpl.c:71
-#: admin/systems/asterisk/phonesettings.tpl.c:77
-msgid "List of alternative mail addresses"
-msgstr "Lista de direcciones de correo alternativas."
-
-#: admin/systems/asterisk/phonesettings.tpl.c:74
-msgid "Hosts that are not allowed to connect"
-msgstr "Equipos/Redes que no tienen permisos para conectar"
-
-#: admin/systems/asterisk/phonesettings.tpl.c:80
-msgid "MSN"
-msgstr "MSN"
-
-#: admin/systems/asterisk/phone.tpl.c:2
-msgid "Phone name"
-msgstr "NÃºmero de telÃ©fono"
-
-#: addons/fonreports/contents.tpl.c:5
-msgid "Search for"
-msgstr "Buscar por"
-
-#: addons/fonreports/contents.tpl.c:8
-msgid "Enter user name to search for"
-msgstr "Introduzca el nombre de usuario para la bÃºsqueda"
-
-#: addons/fonreports/contents.tpl.c:11 addons/fonreports/contents.tpl.c:26
-msgid "in"
-msgstr "en"
-
-#: addons/fonreports/contents.tpl.c:14
-msgid "Select subtree to base search on"
-msgstr "Seleccione el subÃ¡rbol como base de la bÃºsqueda"
-
-#: addons/fonreports/contents.tpl.c:17
-msgid "on"
-msgstr "activo"
-
-#: addons/fonreports/contents.tpl.c:20
-msgid "Select server to search on"
-msgstr "Seleccione el servidor sobre el que buscar"
-
-#: addons/fonreports/contents.tpl.c:23
-msgid "during"
-msgstr "durante"
-
-#: addons/fonreports/contents.tpl.c:29
-msgid "Search"
-msgstr "Buscar"
-
-#: addons/fonreports/contents.tpl.c:44
-msgid "Application"
-msgstr "AplicaciÃ³n"
-
-#: addons/fonreports/contents.tpl.c:47
-msgid "Status"
-msgstr "Estado"
-
-#: addons/fonreports/contents.tpl.c:53
-msgid "Search returned no results..."
-msgstr "La bÃºsqueda no ha encontrado resultados..."
-
-#: personal/phoneaccount/generic.tpl.c:5
-#: personal/phoneaccount/paste_generic.tpl.c:8
-msgid "Telephone hardware"
-msgstr "TelÃ©fono hardware"
-
-#: personal/phoneaccount/generic.tpl.c:8
-msgid "Telephone"
-msgstr "TelÃ©fono"
-
-#: personal/phoneaccount/generic.tpl.c:14
-msgid "Select the accounts home server"
-msgstr "Seleccione las cuentas del servidor principal"
-
-#: personal/phoneaccount/generic.tpl.c:17
-msgid "Context"
-msgstr "Contexto"
-
-#: personal/phoneaccount/generic.tpl.c:20
-#: personal/phoneaccount/generic.tpl.c:26
-msgid "Select the accounts context"
-msgstr "Seleccione el contexto de cuentas"
-
-#: personal/phoneaccount/generic.tpl.c:23
-msgid "Voicemail context"
-msgstr "Contexto de buzÃ³n de voz"
diff --git a/asterisk/locale/es_VE/fusiondirectory.po b/asterisk/locale/es_VE/fusiondirectory.po
index 9760c0adaed3c2a39ed60051dbecfadd79aaefbc..b0f207d64b9bf394f14a6e30cbdefbbed25d58e3 100644
--- a/asterisk/locale/es_VE/fusiondirectory.po
+++ b/asterisk/locale/es_VE/fusiondirectory.po
@@ -5,704 +5,53 @@
 # Translators:
 msgid ""
 msgstr ""
-"Project-Id-Version: FusionDirectory-108\n"
+"Project-Id-Version: FusionDirectory-109\n"
 "Report-Msgid-Bugs-To: documentation@lists.fusiondirectory.org\n"
-"POT-Creation-Date: 2015-03-31 11:49+0200\n"
-"PO-Revision-Date: 2015-03-31 11:41+0000\n"
+"POT-Creation-Date: 2014-12-15 17:47+0100\n"
+"PO-Revision-Date: 2015-02-25 16:13+0000\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>\n"
-"Language-Team: Spanish (Venezuela) (http://www.transifex.com/projects/p/FusionDirectory-108/language/es_VE/)\n"
+"Language-Team: Spanish (Venezuela) (http://www.transifex.com/projects/p/FusionDirectory-109/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/ogroups/asterisk/class_phonequeue.inc:110
-#: admin/conference/class_phoneConferenceGeneric.inc:104
-#: personal/phoneaccount/class_phoneAccount.inc:148
-msgid "Obsolete entry"
-msgstr "Entrada obsoleta"
-
-#: admin/ogroups/asterisk/class_phonequeue.inc:110
-#: admin/conference/class_phoneConferenceGeneric.inc:104
-#: personal/phoneaccount/class_phoneAccount.inc:148
-#, php-format
-msgid ""
-"The current home server is not available anymore. It will be moved to '%s' "
-"if you save this entry!"
-msgstr "El servidor actual no estÃ¡ disponible. Â¡SerÃ¡ movido a '%s' si usted guarda esta entrada!"
-
-#: admin/ogroups/asterisk/class_phonequeue.inc:140
-msgid "ring all"
-msgstr "llamar a todos"
-
-#: admin/ogroups/asterisk/class_phonequeue.inc:141
-msgid "round robin"
-msgstr "round robin"
-
-#: admin/ogroups/asterisk/class_phonequeue.inc:142
-msgid "least recently called"
-msgstr "que han llamado lo menos posible recientemente"
-
-#: admin/ogroups/asterisk/class_phonequeue.inc:143
-msgid "fewest completed calls"
-msgstr "pocas llamadas terminadas"
-
-#: admin/ogroups/asterisk/class_phonequeue.inc:144
-msgid "random"
-msgstr "al azar"
-
-#: admin/ogroups/asterisk/class_phonequeue.inc:145
-msgid "round robin with memory"
-msgstr "round robin en memoria"
-
-#: admin/ogroups/asterisk/class_phonequeue.inc:180
-msgid "Remove the phone queue from this Account"
-msgstr "Eliminar la cola telefÃ³nica de esta cuenta"
-
-#: admin/ogroups/asterisk/class_phonequeue.inc:181
-#: admin/ogroups/asterisk/class_phonequeue.inc:184
-msgid "phone queue"
-msgstr "cola telefÃ³nica"
-
-#: admin/ogroups/asterisk/class_phonequeue.inc:183
-msgid "Create phone queue"
-msgstr "Crear cola telefÃ³nica"
-
-#: admin/ogroups/asterisk/class_phonequeue.inc:272
-msgid ""
-"There must be at least one server with an asterisk database to create a "
-"phone queue."
-msgstr "Debe haber al menos una base de datos asterisk para crear una cola telefÃ³nica."
-
-#: admin/ogroups/asterisk/class_phonequeue.inc:275
-#: admin/ogroups/asterisk/class_phonequeue.inc:873
-#: admin/conference/class_phoneConferenceGeneric.inc:709
-#: personal/phoneaccount/class_phoneAccount.inc:1350
-#: personal/phoneaccount/class_phoneAccount.inc:1669
-#: admin/ogroups/asterisk/phonequeue.tpl.c:17
-#: admin/conference/generic.tpl.c:20 personal/phoneaccount/generic.tpl.c:11
-msgid "Home server"
-msgstr "Servidor de inicio"
-
-#: admin/ogroups/asterisk/class_phonequeue.inc:281
-#: admin/ogroups/asterisk/class_phonequeue.inc:871
-#: admin/ogroups/asterisk/phonequeue.tpl.c:23
-msgid "Timeout"
-msgstr "DesconexiÃ³n por tiempo"
-
-#: admin/ogroups/asterisk/class_phonequeue.inc:284
-#: admin/ogroups/asterisk/class_phonequeue.inc:896
-#: admin/ogroups/asterisk/phonequeue.tpl.c:26
-msgid "Retry"
-msgstr "Reintento"
-
-#: admin/ogroups/asterisk/class_phonequeue.inc:287
-msgid "Queue length"
-msgstr "Longitud de la cola"
-
-#: admin/ogroups/asterisk/class_phonequeue.inc:290
-#: admin/ogroups/asterisk/class_phonequeue.inc:874
-#: admin/ogroups/asterisk/phonequeue.tpl.c:35
-msgid "Announce frequency"
-msgstr "Frecuencia de aviso"
-
-#: admin/ogroups/asterisk/class_phonequeue.inc:293
-#: admin/conference/class_phoneConferenceGeneric.inc:328
-msgid "Number"
-msgstr "NÃºmero"
-
-#: admin/ogroups/asterisk/class_phonequeue.inc:316
-#: admin/ogroups/asterisk/class_phonequeue.inc:361
-msgid "asterisk"
-msgstr "asterisk"
-
-#: admin/ogroups/asterisk/class_phonequeue.inc:345
-#: admin/ogroups/asterisk/class_phonequeue.inc:696
-#: admin/conference/class_phoneConferenceGeneric.inc:369
-#: admin/macro/class_gofonMacro.inc:381 admin/macro/class_gofonMacro.inc:465
-#: addons/fonreports/class_fonreport.inc:190
-#: addons/fonreports/class_fonreport.inc:220
-#: personal/phoneaccount/class_phoneAccount.inc:455
-#: personal/phoneaccount/class_phoneAccount.inc:1061
-msgid "GOfon"
-msgstr "GOfon"
-
-#: admin/ogroups/asterisk/class_phonequeue.inc:401
-msgid "Cannot find old queue entry!"
-msgstr "Â¡No se puede encontrar la entrada de la cola anterior!"
-
-#: admin/ogroups/asterisk/class_phonequeue.inc:487
-#, php-format
-msgid ""
-"Found more than one entry named '%s' in queue table. Please inform your "
-"system administrator!"
-msgstr "Se ha encontrado mas de una entrada llamada '%s'. Â¡Por favor contacte con su administrador de sistemas!"
-
-#: admin/ogroups/asterisk/class_phonequeue.inc:728
-#: admin/ogroups/asterisk/class_phonequeue.inc:730
-msgid "telephone number"
-msgstr "nÃºmero de telÃ©fono"
-
-#: admin/ogroups/asterisk/class_phonequeue.inc:787
-#: admin/ogroups/asterisk/class_phonequeue.inc:829
-#: admin/conference/class_phoneConferenceGeneric.inc:229
-#: admin/conference/class_phoneConferenceGeneric.inc:233
-#: admin/conference/class_phoneConferenceGeneric.inc:271
-#: admin/macro/class_gofonMacro.inc:343 admin/macro/class_gofonMacro.inc:452
-#: admin/macro/class_gofonMacro.inc:461 admin/macro/class_gofonMacro.inc:499
-#: admin/systems/asterisk/class_phoneGeneric.inc:267
-#: admin/systems/asterisk/class_phoneGeneric.inc:308
-#: addons/fonreports/class_fonreport.inc:220
-#: personal/phoneaccount/class_phoneAccount.inc:1046
-#: personal/phoneaccount/class_phoneAccount.inc:1166
-#: personal/phoneaccount/class_phoneAccount.inc:1172
-#: personal/phoneaccount/class_phoneAccount.inc:1368
-#: personal/phoneaccount/class_phoneAccount.inc:1450
-#: personal/phoneaccount/class_phoneAccount.inc:1528
-msgid "Error"
-msgstr "Error"
-
-#: admin/ogroups/asterisk/class_phonequeue.inc:802
-#: admin/ogroups/asterisk/class_phonequeue.inc:857
-#: admin/conference/class_phoneConferenceGeneric.inc:682
-#: admin/macro/class_gofonMacro.inc:473 admin/macro/class_gofonMacro.inc:484
-#: admin/macro/class_gofonMacro.inc:521
-#: admin/macro/class_gofonMacroParameters.inc:435
-#: admin/systems/asterisk/class_phoneGeneric.inc:277
-#: admin/systems/asterisk/class_phoneGeneric.inc:432
-#: admin/systems/asterisk/class_phoneGeneric.inc:446
-#: admin/systems/asterisk/class_phoneGeneric.inc:463
-#: admin/systems/services/asterisk/class_serviceAsterisk.inc:121
-#: personal/phoneaccount/class_phoneAccount.inc:1476
-#: personal/phoneaccount/class_phoneAccount.inc:1609
-msgid "LDAP error"
-msgstr "Error LDAP"
-
-#: admin/ogroups/asterisk/class_phonequeue.inc:864
-#: admin/systems/asterisk/class_phoneGeneric.inc:472
-#: admin/systems/asterisk/class_phoneGeneric.inc:477
-#: personal/phoneaccount/class_phoneAccount.inc:999
-#: personal/phoneaccount/class_phoneAccount.inc:1012
-#: personal/phoneaccount/class_phoneAccount.inc:1024
-#: personal/phoneaccount/class_phoneAccount.inc:1028
-#: personal/phoneaccount/class_phoneAccount.inc:1031
-#: personal/phoneaccount/class_phoneAccount.inc:1657
+#: admin/systems/asterisk/class_phoneIAX.inc:30
+#: admin/systems/asterisk/class_phoneIAX.inc:34
+#: personal/asterisk/class_asteriskAccount.inc:45
 msgid "Phone"
 msgstr "TelÃ©fono"
 
-#: admin/ogroups/asterisk/class_phonequeue.inc:865
-msgid "Phone group"
-msgstr "Grupos telefÃ³nico"
-
-#: admin/ogroups/asterisk/class_phonequeue.inc:872
-#: admin/ogroups/asterisk/phonequeue.tpl.c:32
-msgid "Max queue length"
-msgstr "Longitud mÃ¡xima de la cola"
-
-#: admin/ogroups/asterisk/class_phonequeue.inc:875
-#: admin/ogroups/asterisk/phonequeue.tpl.c:86
-msgid "Allow the called user to transfer his call"
-msgstr "Permitir al receptor el transferir su llamada"
-
-#: admin/ogroups/asterisk/class_phonequeue.inc:876
-#: admin/ogroups/asterisk/phonequeue.tpl.c:89
-msgid "Allows calling user to transfer call"
-msgstr "Permitir al emisor el transferir su llamada"
-
-#: admin/ogroups/asterisk/class_phonequeue.inc:877
-#: admin/ogroups/asterisk/phonequeue.tpl.c:92
-msgid "Allow the called to hangup by pressing *"
-msgstr "Permitir al receptor colgar presionando *"
-
-#: admin/ogroups/asterisk/class_phonequeue.inc:878
-#: admin/ogroups/asterisk/phonequeue.tpl.c:98
-msgid "Ring instead of playing background music"
-msgstr "Sonar en vez de poner mÃºsica de fondo"
-
-#: admin/ogroups/asterisk/class_phonequeue.inc:879
-#: admin/ogroups/asterisk/phonequeue.tpl.c:95
-msgid "Allows calling to hangup by pressing *"
-msgstr "Permitir al emisor colgar presionando *"
-
-#: admin/ogroups/asterisk/class_phonequeue.inc:881
-#: admin/ogroups/asterisk/phonequeue.tpl.c:47
-msgid "Music on hold"
-msgstr "MÃºsica en espera"
-
-#: admin/ogroups/asterisk/class_phonequeue.inc:882
-msgid "Welcome music"
-msgstr "MÃºsica de bienvenida"
-
-#: admin/ogroups/asterisk/class_phonequeue.inc:883
-msgid "Report hold time"
-msgstr "Informe de tiempos de espera"
-
-#: admin/ogroups/asterisk/class_phonequeue.inc:884
-msgid "'You are next' sound"
-msgstr "Sonido de 'Eres el siguiente'"
-
-#: admin/ogroups/asterisk/class_phonequeue.inc:885
-msgid "'There are' sound"
-msgstr "Sonido de 'Hay'"
-
-#: admin/ogroups/asterisk/class_phonequeue.inc:886
-msgid "'Call waiting' sound"
-msgstr "Sonido de 'Llamada en espera'"
-
-#: admin/ogroups/asterisk/class_phonequeue.inc:887
-msgid "'Thank you' sound"
-msgstr "Sonido de 'Gracias'"
-
-#: admin/ogroups/asterisk/class_phonequeue.inc:888
-msgid "'Minutes' sound"
-msgstr "Sonido de 'minutos'"
-
-#: admin/ogroups/asterisk/class_phonequeue.inc:889
-msgid "'Seconds' sound"
-msgstr "Sonido de 'segundos'"
-
-#: admin/ogroups/asterisk/class_phonequeue.inc:890
-msgid "'Less than' sound"
-msgstr "Sonido de 'menos que'"
-
-#: admin/ogroups/asterisk/class_phonequeue.inc:891
-msgid "Queue phone number"
-msgstr "NÃºmero de cola telefÃ³nica"
-
-#: admin/ogroups/asterisk/class_phonequeue.inc:892
-#: admin/conference/class_phoneConferenceGeneric.inc:707
-#: admin/ogroups/asterisk/phonequeue.tpl.c:20
-#: admin/conference/generic.tpl.c:23
-msgid "Language"
-msgstr "Idioma"
-
-#: admin/ogroups/asterisk/class_phonequeue.inc:893
-msgid "Method"
-msgstr "MÃ©todo"
-
-#: admin/ogroups/asterisk/class_phonequeue.inc:894
-#: admin/ogroups/asterisk/phonequeue.tpl.c:83
-msgid "Announce holdtime"
-msgstr "Tiempo de espera de presentaciÃ³n"
-
-#: admin/ogroups/asterisk/class_phonequeue.inc:895
-msgid "Announce"
-msgstr "Anuncio"
+#: admin/systems/asterisk/class_phoneIAX.inc:31
+msgid "Asterisk phone"
+msgstr ""
 
-#: admin/conference/conf-list.xml:11
-msgid "List of conference rooms"
-msgstr "Lista de grupos de conferencias"
+#: admin/systems/asterisk/class_phoneIAX.inc:33
+msgid "Phone hardware"
+msgstr "TelÃ©fono hardware"
 
-#: admin/conference/conf-list.xml:15 admin/conference/conf-list.xml:74
-msgid "Conference"
-msgstr "Conferencia"
+#: admin/systems/asterisk/class_phoneIAX.inc:46
+#: personal/asterisk/class_asteriskAccount.inc:42
+msgid "Telephone"
+msgstr "TelÃ©fono"
 
-#: admin/conference/conf-list.xml:41
-#: admin/conference/class_phoneConferenceGeneric.inc:324
-#: admin/conference/class_phoneConferenceGeneric.inc:347
-#: admin/conference/class_phoneConferenceGeneric.inc:702
-#: admin/macro/class_gofonMacro.inc:395 admin/macro/class_gofonMacro.inc:406
-#: admin/macro/macro-list.xml:41
-#: admin/systems/asterisk/class_phoneGeneric.inc:344
-#: admin/systems/asterisk/class_phoneGeneric.inc:348
-#: admin/systems/asterisk/class_phoneGeneric.inc:351
-#: admin/systems/asterisk/class_phoneGeneric.inc:366
-#: admin/systems/asterisk/class_phoneGeneric.inc:482
-#: admin/conference/conf-filter.tpl.c:5 admin/macro/macro-filter.tpl.c:5
-#: admin/macro/parameter.tpl.c:5
+#: admin/systems/asterisk/class_phoneIAX.inc:49
 msgid "Name"
 msgstr "Nombre"
 
-#: admin/conference/conf-list.xml:49
-#: admin/conference/class_phoneConferenceGeneric.inc:704
-#: admin/macro/class_gofonMacro.inc:547 admin/macro/macro-list.xml:49
-#: admin/systems/asterisk/class_phoneGeneric.inc:484
-#: admin/conference/generic.tpl.c:29 admin/macro/generic.tpl.c:17
-#: admin/systems/asterisk/phone.tpl.c:8
-msgid "Description"
-msgstr "DescripciÃ³n"
-
-#: admin/conference/conf-list.xml:57 admin/macro/macro-list.xml:57
-msgid "Actions"
-msgstr "Acciones"
-
-#: admin/conference/conf-list.xml:68 admin/macro/macro-list.xml:68
-msgid "Create"
-msgstr "Crear"
-
-#: admin/conference/conf-list.xml:86 admin/conference/conf-list.xml:125
-#: admin/macro/macro-list.xml:86 admin/macro/macro-list.xml:125
-msgid "Edit"
-msgstr "Editar"
-
-#: admin/conference/conf-list.xml:93 admin/conference/conf-list.xml:138
-#: admin/macro/macro-list.xml:93 admin/macro/macro-list.xml:138
-msgid "Remove"
-msgstr "Eliminar"
-
-#: admin/conference/class_phoneConferenceGeneric.inc:233
-#, php-format
-msgid "Cannot delete entry from server '%s' because it seems to be removed!"
-msgstr "Â¡No se puede eliminar la entrada del servidor '%s' porque ha sido eliminada!"
-
-#: admin/conference/class_phoneConferenceGeneric.inc:308
-#, php-format
-msgid ""
-"The previously selected asterisk home server '%s' is no longer available!"
-msgstr "Â¡El servidor principal asterisk seleccionado previamente ('%s) no estÃ¡ disponible!"
-
-#: admin/conference/class_phoneConferenceGeneric.inc:315
-#: admin/conference/generic.tpl.c:47
-msgid "PIN"
-msgstr "PIN"
-
-#: admin/conference/class_phoneConferenceGeneric.inc:333
-#: admin/conference/class_phoneConferenceGeneric.inc:719
-msgid "Lifetime"
-msgstr "DuraciÃ³n"
-
-#: admin/conference/class_phoneConferenceGeneric.inc:399
-#: personal/phoneaccount/class_phoneAccount.inc:346
-#: personal/phoneaccount/class_phoneAccount.inc:359
-#: personal/phoneaccount/class_phoneAccount.inc:617
-#: personal/phoneaccount/class_phoneAccount.inc:656
-#: personal/phoneaccount/class_phoneAccount.inc:1519
-#: personal/phoneaccount/class_phoneAccount.inc:1695
-#: admin/conference/remove.tpl.c:2 admin/macro/remove.tpl.c:2
-msgid "Warning"
-msgstr "Aviso"
-
-#: admin/conference/class_phoneConferenceGeneric.inc:400
-#, php-format
-msgid ""
-"FusionDirectory identified problems with your MySQL table definition, please"
-" activate debugging for details."
-msgstr ""
-
-#: admin/conference/class_phoneConferenceGeneric.inc:606
-#: admin/conference/class_phoneConferenceGeneric.inc:608
-#, php-format
-msgid "'%s' is already assigned to '%s'!"
-msgstr "Â¡'%s' estÃ¡ ya asignado a '%s'!"
-
-#: admin/conference/class_phoneConferenceGeneric.inc:693
-msgid "Phone Conference"
-msgstr ""
-
-#: admin/conference/class_phoneConferenceGeneric.inc:694
-msgid "Phone conference management"
-msgstr "AdministraciÃ³n de conferencia telefÃ³nica"
-
-#: admin/conference/class_phoneConferenceGeneric.inc:696
-msgid "GOfon conference"
-msgstr "Conferencia GOfon"
-
-#: admin/conference/class_phoneConferenceGeneric.inc:698
-msgid "Asterisk conference"
-msgstr ""
-
-#: admin/conference/class_phoneConferenceGeneric.inc:703
-#: admin/macro/class_gofonMacro.inc:546
-#: admin/systems/asterisk/class_phoneGeneric.inc:483
-#: admin/conference/generic.tpl.c:17 admin/macro/generic.tpl.c:14
-#: admin/systems/asterisk/phone.tpl.c:5
-msgid "Base"
-msgstr "Base"
-
-#: admin/conference/class_phoneConferenceGeneric.inc:705
-msgid "Conference PIN"
-msgstr "PIN de conferencia"
-
-#: admin/conference/class_phoneConferenceGeneric.inc:710
-#: admin/conference/generic.tpl.c:44
-msgid "Preset PIN"
-msgstr "PIN configurado"
-
-#: admin/conference/class_phoneConferenceGeneric.inc:711
-#: admin/conference/generic.tpl.c:50
-msgid "Record conference"
-msgstr "Grabar conferencia"
-
-#: admin/conference/class_phoneConferenceGeneric.inc:712
-#: admin/conference/generic.tpl.c:59
-msgid "Play music on hold"
-msgstr "Poner mÃºsica en espera"
-
-#: admin/conference/class_phoneConferenceGeneric.inc:713
-msgid "Activate menu"
-msgstr "Activar menÃº"
-
-#: admin/conference/class_phoneConferenceGeneric.inc:714
-msgid "Announce user activity"
-msgstr "Anunciar actividad de usuario"
-
-#: admin/conference/class_phoneConferenceGeneric.inc:715
-msgid "Count user"
-msgstr "Cuenta de usuario"
-
-#: admin/conference/class_phoneConferenceGeneric.inc:716
-msgid "Conference type"
-msgstr "Tipo de conferencia"
-
-#: admin/conference/class_phoneConferenceGeneric.inc:718
-msgid "Format"
-msgstr "Formato"
-
-#: admin/conference/class_phoneConferenceGeneric.inc:720
-#: personal/phoneaccount/class_phoneAccount.inc:1666
-msgid "Telephone number"
-msgstr "NÃºmero de telÃ©fono"
-
-#: admin/conference/class_phoneConferenceGeneric.inc:721
-msgid "Owner"
-msgstr "Propietario"
-
-#: admin/conference/class_phoneConferenceManagment.inc:36
-msgid "Phone Conferences"
-msgstr ""
-
-#: admin/conference/class_phoneConferenceManagment.inc:37
-msgid "Phone Conference management"
-msgstr ""
-
-#: admin/macro/class_gofonMacro.inc:202
-#, php-format
-msgid ""
-"Macro could not be removed from server '%s', please check database "
-"consistency!"
-msgstr ""
-
-#: admin/macro/class_gofonMacro.inc:264
-#, php-format
-msgid "Application missing in line %s!"
-msgstr "Â¡La aplicaciÃ³n falla en linea %s!"
-
-#: admin/macro/class_gofonMacro.inc:267
-#, php-format
-msgid "Priority missing in line %s!"
-msgstr ""
-
-#: admin/macro/class_gofonMacro.inc:271
-#, php-format
-msgid "Extension missing in line %s!"
-msgstr "Â¡La extensiÃ³n falla en linea %s!"
-
-#: admin/macro/class_gofonMacro.inc:281
-#, php-format
-msgid "Duplicate combination of 'extension' and 'priority' in line %s!"
+#: admin/systems/asterisk/class_phoneIAX.inc:49
+msgid "Name of this phone"
 msgstr ""
 
-#: admin/macro/class_gofonMacro.inc:317
-#, php-format
-msgid ""
-"Macro could not be added to server '%s', please check database consistency!"
+#: admin/systems/asterisk/class_phoneIAX.inc:53
+msgid "Account name"
 msgstr ""
 
-#: admin/macro/class_gofonMacro.inc:410
-msgid "Name can be 20 characters at maximum!"
-msgstr "Â¡El nombre tiene 20 caracteres como mÃ¡ximo!"
-
-#: admin/macro/class_gofonMacro.inc:419
-msgid "Macro is still in use!"
-msgstr "La macro estÃ¡ todavÃa en uso."
-
-#: admin/macro/class_gofonMacro.inc:426
-msgid "Macro is empty!"
-msgstr "Â¡La macro estÃ¡ vacÃa!"
-
-#: admin/macro/class_gofonMacro.inc:452
-#: admin/systems/asterisk/class_phoneGeneric.inc:267
-#, php-format
-msgid "Cannot delete entry because it is still in use by '%s'!"
-msgstr "Â¡No se puede eliminar la entrada porque estÃ¡ siendo usada por '%s'!"
-
-#: admin/macro/class_gofonMacro.inc:465
-#: addons/fonreports/class_fonreport.inc:190
-#: personal/phoneaccount/class_phoneAccount.inc:455
-#: personal/phoneaccount/class_phoneAccount.inc:1061
-#: personal/phoneaccount/class_phoneAccount.inc:1567
-msgid "Configuration error"
-msgstr "Error en la configuraciÃ³n"
-
-#: admin/macro/class_gofonMacro.inc:536 admin/macro/class_gofonMacro.inc:541
-msgid "Asterisk macro"
+#: admin/systems/asterisk/class_phoneIAX.inc:53
+msgid "Name of the account"
 msgstr ""
 
-#: admin/macro/class_gofonMacro.inc:537
-msgid "Asterisk macro management"
-msgstr "AdministraciÃ³n de macros de Asterisk"
-
-#: admin/macro/class_gofonMacro.inc:539
-msgid "GOfon macro"
-msgstr "Macro GOfon"
-
-#: admin/macro/class_gofonMacro.inc:545 admin/macro/generic.tpl.c:2
-#: admin/macro/generic.tpl.c:5 admin/macro/paste_generic.tpl.c:2
-#: admin/macro/paste_generic.tpl.c:5
-msgid "Macro name"
-msgstr "Nombre de la macro"
-
-#: admin/macro/class_gofonMacro.inc:548 admin/macro/generic.tpl.c:8
-msgid "Display name"
-msgstr "Nombre a Mostrar"
-
-#: admin/macro/class_gofonMacro.inc:549
-msgid "Macro content and parameter"
-msgstr "Contenido y parÃ¡metros de la macro"
-
-#: admin/macro/class_gofonMacro.inc:550
-msgid "Visibility flag"
-msgstr "Atributo de visibilidad"
-
-#: admin/macro/class_gofonMacroManagement.inc:36
-msgid "Phone Macros"
-msgstr ""
-
-#: admin/macro/class_gofonMacroManagement.inc:37
-msgid "Phone Macros management"
-msgstr ""
-
-#: admin/macro/macro-list.xml:11
-msgid "List of macros"
-msgstr "Lista de macros"
-
-#: admin/macro/macro-list.xml:15 admin/macro/macro-list.xml:74
-msgid "Macro"
-msgstr "Macro"
-
-#: admin/macro/class_gofonMacroParameters.inc:58
-msgid "Parameter"
-msgstr "ParÃ¡metro"
-
-#: admin/macro/class_gofonMacroParameters.inc:59
-msgid "Asterisk macro parameter"
-msgstr ""
-
-#: admin/macro/class_gofonMacroParameters.inc:234
-#: personal/phoneaccount/generic.tpl.c:35
-msgid "Phone macro"
-msgstr "Macro telefÃ³nica"
-
-#: admin/macro/class_gofonMacroParameters.inc:290
-msgid "String"
-msgstr "Cadena de texto"
-
-#: admin/macro/class_gofonMacroParameters.inc:291
-msgid "Combobox"
-msgstr "Cuadro combinado"
-
-#: admin/macro/class_gofonMacroParameters.inc:292
-msgid "Bool"
-msgstr "Booleano"
-
-#: admin/macro/class_gofonMacroParameters.inc:298
-msgid "Delete unused"
-msgstr "Eliminar sin usar"
-
-#: admin/macro/class_gofonMacroParameters.inc:374
-#, php-format
-msgid "Parameter %s contains invalid character. '!,#' is used as delimiter!"
-msgstr "Â¡El campo '%s' tiene caracteres no validos, '!,#' son usados como delimitadores!"
-
-#: admin/macro/class_gofonMacroParameters.inc:379
-#, php-format
-msgid "Parameter %s is invalid!"
-msgstr "Â¡El parÃ¡metro '%s' no es vÃ¡lido!"
-
-#: admin/macro/class_gofonMacroParameters.inc:408
-#: personal/phoneaccount/class_phoneAccount.inc:1600
-msgid "Information"
-msgstr "InformaciÃ³n"
-
-#: admin/macro/class_gofonMacroParameters.inc:408
-msgid ""
-"Number of parameters for this macro has changed. Please update all users "
-"using it!"
-msgstr "El nÃºmero de parÃ¡metros para esta macro ha cambiado. Â¡Por favor actualice todos los usuarios que la usen!"
-
-#: admin/systems/asterisk/class_phoneGeneric.inc:151
-msgid "phone"
-msgstr "TelÃ©fono"
-
-#: admin/systems/asterisk/class_phoneGeneric.inc:230
-msgid "yes"
-msgstr "si"
-
-#: admin/systems/asterisk/class_phoneGeneric.inc:230
-msgid "no"
-msgstr "no"
-
-#: admin/systems/asterisk/class_phoneGeneric.inc:247
-msgid "dynamic"
-msgstr "dinÃ¡mico"
-
-#: admin/systems/asterisk/class_phoneGeneric.inc:247
-msgid "Networksettings"
-msgstr "ConfiguraciÃ³n de red"
-
-#: admin/systems/asterisk/class_phoneGeneric.inc:330
-#: admin/systems/asterisk/class_phoneGeneric.inc:333
-msgid "IP address"
-msgstr "DirecciÃ³n IP"
-
-#: admin/systems/asterisk/class_phoneGeneric.inc:473
-msgid "Phone information"
-msgstr ""
-
-#: admin/systems/asterisk/class_phoneGeneric.inc:476
-#: personal/phoneaccount/class_phoneAccount.inc:1668
-msgid "Phone hardware"
-msgstr "TelÃ©fono hardware"
-
-#: admin/systems/asterisk/class_phoneGeneric.inc:485
-msgid "SIP Mode"
-msgstr "Modo SIP"
-
-#: admin/systems/asterisk/class_phoneGeneric.inc:486
-msgid "SIP DTMF mode"
-msgstr "Modo SIP DTMF"
-
-#: admin/systems/asterisk/class_phoneGeneric.inc:487
-msgid "SIP Default ip"
-msgstr "DirecciÃ³n IP por defecto de SIP"
-
-#: admin/systems/asterisk/class_phoneGeneric.inc:488
-msgid "SIP Qualify"
-msgstr "Capacidad SIP"
-
-#: admin/systems/asterisk/class_phoneGeneric.inc:489
-msgid "IAX authentication type"
-msgstr "Tipo de autentificaciÃ³n IAX"
-
-#: admin/systems/asterisk/class_phoneGeneric.inc:490
-msgid "IAX secret"
-msgstr "contraseÃ±a IAX"
-
-#: admin/systems/asterisk/class_phoneGeneric.inc:491
-msgid "IAX account code"
-msgstr "CÃ³digo de cuenta IAX"
-
-#: admin/systems/asterisk/class_phoneGeneric.inc:492
-msgid "IAX trunk lines"
-msgstr "Lineas troncales IAX"
-
-#: admin/systems/asterisk/class_phoneGeneric.inc:493
-msgid "IAX permit settings"
-msgstr "ConfiguraciÃ³n permitida IAX"
-
-#: admin/systems/asterisk/class_phoneGeneric.inc:494
-msgid "IAX deny settings"
-msgstr "ConfiguraciÃ³n denegada IAX"
-
-#: admin/systems/asterisk/class_phoneGeneric.inc:495
-msgid "CAPI MSN"
-msgstr "CAPI MSN"
-
-#: admin/systems/asterisk/class_phoneGeneric.inc:496
-msgid "Hardware type"
-msgstr "Tipo de hardware"
-
 #: admin/systems/services/asterisk/class_serviceAsterisk.inc:35
 msgid "VoIP database information"
 msgstr "InformaciÃ³n de base de datos VoIP"
@@ -746,6 +95,10 @@ msgid ""
 "these objects '%s'."
 msgstr "No puede eliminar la extensiÃ³n de base de datos asterisk, esta todavÃa en use por los objetos '%s'."
 
+#: admin/systems/services/asterisk/class_serviceAsterisk.inc:121
+msgid "LDAP error"
+msgstr "Error de LDAP"
+
 #: admin/systems/services/asterisk/class_serviceAsterisk.inc:140
 msgid "VoIP service (asterisk)"
 msgstr ""
@@ -758,209 +111,18 @@ msgstr "VoIP - AdministraciÃ³n de Asterisk PBX"
 msgid "Services"
 msgstr "Servicios"
 
-#: addons/fonreports/class_fonreport.inc:232
-msgid "Insufficient permissions"
-msgstr "Permisos insuficientes"
-
-#: addons/fonreports/class_fonreport.inc:251
-msgid "Y-M-D"
-msgstr "Y-M-D"
-
-#: addons/fonreports/class_fonreport.inc:418
-#: addons/fonreports/class_fonreport.inc:419
-#: addons/fonreports/class_fonreport.inc:424 addons/fonreports/main.inc:46
-msgid "Phone reports"
-msgstr "Informes telefÃ³nicos"
-
-#: addons/fonreports/class_fonreport.inc:419
-msgid "All entries are readonly"
-msgstr "Todas las entradas son solo lectura"
-
-#: addons/fonreports/class_fonreport.inc:428
-#: addons/fonreports/contents.tpl.c:32
-msgid "Date"
-msgstr "Fecha"
-
-#: addons/fonreports/class_fonreport.inc:429
-#: addons/fonreports/contents.tpl.c:35
-msgid "Source"
-msgstr "Origen"
-
-#: addons/fonreports/class_fonreport.inc:430
-#: addons/fonreports/contents.tpl.c:38
-msgid "Destination"
-msgstr "Destino"
-
-#: addons/fonreports/class_fonreport.inc:431
-#: addons/fonreports/contents.tpl.c:41
-msgid "Channel"
-msgstr "Canal"
-
-#: addons/fonreports/class_fonreport.inc:432
-msgid "Application called"
-msgstr "AplicaciÃ³n llamada"
-
-#: addons/fonreports/class_fonreport.inc:433
-msgid "Disposition"
-msgstr "DisposiciÃ³n"
-
-#: addons/fonreports/class_fonreport.inc:434
-#: addons/fonreports/contents.tpl.c:50
-msgid "Duration"
-msgstr "DuraciÃ³n"
-
-#: personal/phoneaccount/class_phoneAccount.inc:176
-msgid "automatic"
-msgstr "automÃ¡tico"
-
-#: personal/phoneaccount/class_phoneAccount.inc:212
-msgid "no macro"
-msgstr "sin macro"
-
-#: personal/phoneaccount/class_phoneAccount.inc:240
-msgid "undefined"
-msgstr "sin definir"
-
-#: personal/phoneaccount/class_phoneAccount.inc:359
-#, php-format
-msgid ""
-"Cannot identify telephone extension in database, please try to save again."
-msgstr "No se puede identificar la extensiÃ³n telefÃ³nica en la base de datos, por favor intente guardarla de nuevo."
-
-#: personal/phoneaccount/class_phoneAccount.inc:577
-#: personal/phoneaccount/class_phoneAccount.inc:595
-msgid "Abort saving entries to keep the database consistent."
-msgstr "Cancelar la grabaciÃ³n de las entradas para mantener la consistencia de la base de datos."
-
-#: personal/phoneaccount/class_phoneAccount.inc:618
-#: personal/phoneaccount/class_phoneAccount.inc:657
-#: personal/phoneaccount/class_phoneAccount.inc:1520
-#, php-format
-msgid ""
-"FusionDirectory identified problems with your database table definition!"
-msgstr ""
-
-#: personal/phoneaccount/class_phoneAccount.inc:1023
-msgid "Remove phone account"
-msgstr "Eliminar cuenta telefÃ³nica"
-
-#: personal/phoneaccount/class_phoneAccount.inc:1027
-#: personal/phoneaccount/class_phoneAccount.inc:1030
-msgid "Create phone account"
-msgstr "Crear cuenta telefÃ³nica"
-
-#: personal/phoneaccount/class_phoneAccount.inc:1028
-msgid "User uid"
-msgstr "Identificador (UID) de usuario"
-
-#: personal/phoneaccount/class_phoneAccount.inc:1046
-msgid "Selected macro is not available anymore!"
-msgstr "Â¡La macro seleccionada no estÃ¡ disponible!"
-
-#: personal/phoneaccount/class_phoneAccount.inc:1221
-msgid "Choose your private phone"
-msgstr "Indique su telÃ©fono particular"
-
-#: personal/phoneaccount/class_phoneAccount.inc:1346
-msgid ""
-"There must be at least one server with an asterisk database to create a "
-"phone account."
-msgstr "Debe existir al menos un servidor con una base de datos asterisk para crear una cuenta telefÃ³nica."
-
-#: personal/phoneaccount/class_phoneAccount.inc:1354
-#: personal/phoneaccount/class_phoneAccount.inc:1357
-#: personal/phoneaccount/generic.tpl.c:29
-#: personal/phoneaccount/paste_generic.tpl.c:11
-msgid "Voicemail PIN"
-msgstr "PIN del buzÃ³n de correo"
-
-#: personal/phoneaccount/class_phoneAccount.inc:1354
-msgid "Between 1-4 charactes"
-msgstr "Entre 1 a 4 caracteres"
-
-#: personal/phoneaccount/class_phoneAccount.inc:1362
-#: personal/phoneaccount/generic.tpl.c:32
-#: personal/phoneaccount/paste_generic.tpl.c:14
-msgid "Phone PIN"
-msgstr "PIN del TelÃ©fono"
-
-#: personal/phoneaccount/class_phoneAccount.inc:1394
-#: admin/conference/generic.tpl.c:38 admin/conference/paste_generic.tpl.c:8
-msgid "Phone number"
-msgstr "NÃºmero de telÃ©fono"
-
-#: personal/phoneaccount/class_phoneAccount.inc:1402
-#, php-format
-msgid "macro parameter %s"
-msgstr "parÃ¡metro de macro %s"
-
-#: personal/phoneaccount/class_phoneAccount.inc:1450
-msgid "An error occured while updating the database entries!"
-msgstr "Â¡Un error ha ocurrido mientras actualizaba las entradas en la base de datos!"
-
-#: personal/phoneaccount/class_phoneAccount.inc:1567
-msgid "Was not able to found any asterisk server"
+#: personal/asterisk/class_asteriskAccount.inc:30
+#: config/asterisk/class_asteriskPluginConfig.inc:28
+#: config/asterisk/class_asteriskPluginConfig.inc:41
+msgid "Asterisk"
 msgstr ""
 
-#: personal/phoneaccount/class_phoneAccount.inc:1600
-#, php-format
-msgid "User '%s' has been removed from phone queue '%s'."
-msgstr "Eliminado usuario '%s' de la cola de telÃ©fono '%s'."
-
-#: personal/phoneaccount/class_phoneAccount.inc:1637
-#: personal/phoneaccount/class_phoneAccount.inc:1639
-#, php-format
-msgid "The specified telephonenumber '%s' is already assigned to '%s'."
-msgstr "El nÃºmero telÃ©fono introducido '%s' ya estÃ¡ asignado a '%s'."
-
-#: personal/phoneaccount/class_phoneAccount.inc:1649
-#, php-format
-msgid ""
-"The previously selected asterisk home server (%s) is no longer available. "
-"Remove aborted."
-msgstr "El servidor principal de asterisk seleccionado anteriormente (%s) no estÃ¡ disponible. EliminaciÃ³n cancelada."
-
-#: personal/phoneaccount/class_phoneAccount.inc:1658
-msgid "Phone account settings"
-msgstr "ConfiguraciÃ³n cuenta telefÃ³nica"
-
-#: personal/phoneaccount/class_phoneAccount.inc:1667
-msgid "Macro settings"
-msgstr "ParÃ¡metros de macro"
-
-#: personal/phoneaccount/class_phoneAccount.inc:1670
-msgid "Phone context"
-msgstr "Contexto telefÃ³nico"
-
-#: personal/phoneaccount/class_phoneAccount.inc:1671
-msgid "Voice mail context"
-msgstr "Contexto de buzÃ³n de voz"
-
-#: personal/phoneaccount/class_phoneAccount.inc:1672
-msgid "Telephone pin"
-msgstr "PIN del telÃ©fono"
-
-#: personal/phoneaccount/class_phoneAccount.inc:1673
-msgid "Voicemail pin"
-msgstr "PIN del buzÃ³n de voz"
-
-#: personal/phoneaccount/class_phoneAccount.inc:1695
-#, php-format
-msgid "You need to configure %s contexts first"
+#: personal/asterisk/class_asteriskAccount.inc:31
+msgid "Asterisk account"
 msgstr ""
 
-#: personal/phoneaccount/main.inc:124
-msgid "Click the 'Edit' button below to change informations in this dialog"
-msgstr "Pulse en el botÃ³n - Editar - para cambiar la informaciÃ³n en esta ventana"
-
-#: personal/phoneaccount/main.inc:134
-#: personal/phoneaccount/paste_generic.tpl.c:2
-msgid "Phone settings"
-msgstr "ConfiguraciÃ³n telefÃ³nica"
-
-#: config/asterisk/class_asteriskPluginConfig.inc:28
-#: config/asterisk/class_asteriskPluginConfig.inc:41
-msgid "Asterisk"
+#: personal/asterisk/class_asteriskAccount.inc:45
+msgid "Select the phone associated to this user"
 msgstr ""
 
 #: config/asterisk/class_asteriskPluginConfig.inc:29
@@ -1010,338 +172,3 @@ msgstr ""
 #: config/asterisk/class_asteriskPluginConfig.inc:72
 msgid "Available voicemail contexts"
 msgstr ""
-
-#: admin/ogroups/asterisk/phonequeue.tpl.c:2
-msgid ""
-"Only users with the same asterisk home server will be included to this "
-"queue."
-msgstr "Los usuarios con el mismo servidor principal asterisk serÃ¡n incluidos en esta cola."
-
-#: admin/ogroups/asterisk/phonequeue.tpl.c:5
-#: personal/phoneaccount/generic.tpl.c:2
-#: personal/phoneaccount/paste_generic.tpl.c:5
-msgid "Phone numbers"
-msgstr "NÃºmeros de telÃ©fonos"
-
-#: admin/ogroups/asterisk/phonequeue.tpl.c:8
-msgid "Up"
-msgstr "Arriba"
-
-#: admin/ogroups/asterisk/phonequeue.tpl.c:11
-msgid "Down"
-msgstr "Abajo"
-
-#: admin/ogroups/asterisk/phonequeue.tpl.c:14
-#: admin/conference/generic.tpl.c:41
-msgid "Options"
-msgstr "Opciones"
-
-#: admin/ogroups/asterisk/phonequeue.tpl.c:29
-msgid "Strategy"
-msgstr "Estrategia"
-
-#: admin/ogroups/asterisk/phonequeue.tpl.c:38
-msgid "(in seconds)"
-msgstr "(en segundos)"
-
-#: admin/ogroups/asterisk/phonequeue.tpl.c:41
-msgid "Queue sound setup"
-msgstr "ConfiguraciÃ³n de los sonidos de la cola"
-
-#: admin/ogroups/asterisk/phonequeue.tpl.c:44
-msgid "Use music on hold instead of ringing"
-msgstr "Usar Poner mÃºsica en espera en vez de timbre de aviso"
-
-#: admin/ogroups/asterisk/phonequeue.tpl.c:50
-msgid "Welcome sound file"
-msgstr "Archivo de audio de Bienvenida"
-
-#: admin/ogroups/asterisk/phonequeue.tpl.c:53
-msgid "Announce message"
-msgstr "Mensaje de presentaciÃ³n"
-
-#: admin/ogroups/asterisk/phonequeue.tpl.c:56
-msgid "Sound file for 'You are next ...'"
-msgstr "Archivo de audio para 'Usted es el siguiente...'"
-
-#: admin/ogroups/asterisk/phonequeue.tpl.c:59
-msgid "'There are ...'"
-msgstr "'Hay...'"
-
-#: admin/ogroups/asterisk/phonequeue.tpl.c:62
-msgid "'... calls waiting'"
-msgstr "'... llamadas esperando'"
-
-#: admin/ogroups/asterisk/phonequeue.tpl.c:65
-msgid "'Thank you' message"
-msgstr "Mensaje de Despedida"
-
-#: admin/ogroups/asterisk/phonequeue.tpl.c:68
-msgid "'minutes' sound file"
-msgstr "Archivo de audio 'minutos'"
-
-#: admin/ogroups/asterisk/phonequeue.tpl.c:71
-msgid "'seconds' sound file"
-msgstr "Archivo de audio 'segundos'"
-
-#: admin/ogroups/asterisk/phonequeue.tpl.c:74
-msgid "Hold sound file"
-msgstr "Archivo de audio de espera"
-
-#: admin/ogroups/asterisk/phonequeue.tpl.c:77
-msgid "Less Than sound file"
-msgstr "Archivo de audio Menos Que"
-
-#: admin/ogroups/asterisk/phonequeue.tpl.c:80
-msgid "Phone attributes "
-msgstr "CaracterÃsticas del TelÃ©fono"
-
-#: admin/conference/conf-filter.tpl.c:2 admin/macro/macro-filter.tpl.c:2
-#: addons/fonreports/contents.tpl.c:2
-msgid "Filter"
-msgstr "Filtro"
-
-#: admin/conference/generic.tpl.c:2
-msgid "Properties"
-msgstr "Propiedades"
-
-#: admin/conference/generic.tpl.c:5 admin/conference/paste_generic.tpl.c:2
-msgid "Conference name"
-msgstr "Nombre de Conferencia"
-
-#: admin/conference/generic.tpl.c:8 admin/conference/paste_generic.tpl.c:5
-msgid "Name of conference to create"
-msgstr "Nombre del Conferencia para crear"
-
-#: admin/conference/generic.tpl.c:11
-msgid "Type"
-msgstr "Tipo"
-
-#: admin/conference/generic.tpl.c:14
-msgid "Choose subtree to place conference in"
-msgstr "Elija el subÃ¡rbol donde colocar la conferencia"
-
-#: admin/conference/generic.tpl.c:26
-msgid "Select language"
-msgstr "SelecciÃ³n de idiomas"
-
-#: admin/conference/generic.tpl.c:32
-msgid "Descriptive text for department"
-msgstr "DescripciÃ³n del departamento"
-
-#: admin/conference/generic.tpl.c:35
-msgid "Lifetime (in days)"
-msgstr "DuraciÃ³n (en dÃas)"
-
-#: admin/conference/generic.tpl.c:53
-msgid "Sound file format"
-msgstr "Formato del archivo de audio"
-
-#: admin/conference/generic.tpl.c:56
-msgid "Choose subtree to place department in"
-msgstr "Elija subÃ¡rbol para colocar el departamento"
-
-#: admin/conference/generic.tpl.c:62
-msgid "Activate session menu"
-msgstr "Activar menÃº de sesiÃ³n"
-
-#: admin/conference/generic.tpl.c:65
-msgid "Announce users joining or leaving the conference"
-msgstr "Avisar de usuarios que se unen o dejan la conferencia"
-
-#: admin/conference/generic.tpl.c:68
-msgid "Count users"
-msgstr "Contar usuarios"
-
-#: admin/conference/remove.tpl.c:5 admin/macro/remove.tpl.c:5
-msgid ""
-"Please double check if you really want to do this since there is no way for "
-"FusionDirectory to get your data back."
-msgstr "Por favor verifique si realmente quiere hacer esto ya que FusionDirectory no tiene forma de recuperar la data."
-
-#: admin/conference/remove.tpl.c:8 admin/macro/remove.tpl.c:8
-msgid "So - if you're sure - press 'Delete' to continue or 'Cancel' to abort."
-msgstr "Entonces, si esta seguro, presione <i>Eliminar</i> para continuar o <i>Cancelar</i> para Abortar."
-
-#: admin/macro/generic.tpl.c:11
-msgid "Macro name to be displayed"
-msgstr "Nombre con el que se mostrara la macro"
-
-#: admin/macro/generic.tpl.c:20
-msgid "Visible for user"
-msgstr "Visible para el usuario"
-
-#: admin/macro/generic.tpl.c:23
-msgid "Macro text"
-msgstr "Macro de texto"
-
-#: admin/macro/parameter.tpl.c:2
-msgid "Argument"
-msgstr "Argumento"
-
-#: admin/macro/parameter.tpl.c:8
-msgid "type"
-msgstr "tipo"
-
-#: admin/macro/parameter.tpl.c:11
-msgid "Default value"
-msgstr "Valor por defecto"
-
-#: admin/macro/parameter.tpl.c:14
-msgid "You are not allowed to view the macro parameter settings"
-msgstr "No tiene permisos para ver la configuraciÃ³n de parÃ¡metros de la macro"
-
-#: admin/systems/asterisk/phonesettings.tpl.c:2
-msgid "Advanced phone settings"
-msgstr "ConfiguraciÃ³n telefÃ³nica avanzada"
-
-#: admin/systems/asterisk/phonesettings.tpl.c:5
-msgid "Phone type"
-msgstr "Tipo de telÃ©fono"
-
-#: admin/systems/asterisk/phonesettings.tpl.c:8
-#: admin/systems/asterisk/phonesettings.tpl.c:14
-#: admin/systems/asterisk/phonesettings.tpl.c:20
-#: admin/systems/asterisk/phonesettings.tpl.c:26
-#: admin/systems/asterisk/phonesettings.tpl.c:35
-#: admin/systems/asterisk/phonesettings.tpl.c:47
-#: admin/systems/asterisk/phonesettings.tpl.c:65
-msgid "Choose a phone type"
-msgstr "Elija tipo de telÃ©fono"
-
-#: admin/systems/asterisk/phonesettings.tpl.c:11
-msgid "Mode"
-msgstr "Modo"
-
-#: admin/systems/asterisk/phonesettings.tpl.c:17
-msgid "DTMF mode"
-msgstr "Modo DTMF"
-
-#: admin/systems/asterisk/phonesettings.tpl.c:23
-#: admin/systems/asterisk/phonesettings.tpl.c:38
-msgid "Default IP"
-msgstr "DirecciÃ³n IP por defecto"
-
-#: admin/systems/asterisk/phonesettings.tpl.c:29
-#: admin/systems/asterisk/phonesettings.tpl.c:41
-msgid "Response timeout"
-msgstr "Tiempo mÃ¡ximo de respuesta"
-
-#: admin/systems/asterisk/phonesettings.tpl.c:32
-msgid "Modus"
-msgstr "Modo"
-
-#: admin/systems/asterisk/phonesettings.tpl.c:44
-msgid "Authtype"
-msgstr "Tipo de autenticaciÃ³n"
-
-#: admin/systems/asterisk/phonesettings.tpl.c:50
-msgid "Secret"
-msgstr "Secreto"
-
-#: admin/systems/asterisk/phonesettings.tpl.c:53
-msgid "GoFonInkeys"
-msgstr "GoFonInkeys"
-
-#: admin/systems/asterisk/phonesettings.tpl.c:56
-msgid "GoFonOutKeys"
-msgstr "GoFonOutKeys"
-
-#: admin/systems/asterisk/phonesettings.tpl.c:59
-msgid "Account code"
-msgstr "CÃ³digo de cuenta"
-
-#: admin/systems/asterisk/phonesettings.tpl.c:62
-msgid "Trunk lines"
-msgstr "Lineas troncales"
-
-#: admin/systems/asterisk/phonesettings.tpl.c:68
-msgid "Hosts that are allowed to connect"
-msgstr "Equipos/Redes que tienen permiso para conectar"
-
-#: admin/systems/asterisk/phonesettings.tpl.c:71
-#: admin/systems/asterisk/phonesettings.tpl.c:77
-msgid "List of alternative mail addresses"
-msgstr "Lista de direcciones de correo alternativas."
-
-#: admin/systems/asterisk/phonesettings.tpl.c:74
-msgid "Hosts that are not allowed to connect"
-msgstr "Equipos/Redes que no tienen permisos para conectar"
-
-#: admin/systems/asterisk/phonesettings.tpl.c:80
-msgid "MSN"
-msgstr "MSN"
-
-#: admin/systems/asterisk/phone.tpl.c:2
-msgid "Phone name"
-msgstr "NÃºmero de telÃ©fono"
-
-#: addons/fonreports/contents.tpl.c:5
-msgid "Search for"
-msgstr "Buscar por"
-
-#: addons/fonreports/contents.tpl.c:8
-msgid "Enter user name to search for"
-msgstr "Introduzca el nombre de usuario para la bÃºsqueda"
-
-#: addons/fonreports/contents.tpl.c:11 addons/fonreports/contents.tpl.c:26
-msgid "in"
-msgstr "en"
-
-#: addons/fonreports/contents.tpl.c:14
-msgid "Select subtree to base search on"
-msgstr "Seleccione el subÃ¡rbol como base de la bÃºsqueda"
-
-#: addons/fonreports/contents.tpl.c:17
-msgid "on"
-msgstr "activo"
-
-#: addons/fonreports/contents.tpl.c:20
-msgid "Select server to search on"
-msgstr "Seleccione el servidor sobre el que buscar"
-
-#: addons/fonreports/contents.tpl.c:23
-msgid "during"
-msgstr "durante"
-
-#: addons/fonreports/contents.tpl.c:29
-msgid "Search"
-msgstr "Buscar"
-
-#: addons/fonreports/contents.tpl.c:44
-msgid "Application"
-msgstr "AplicaciÃ³n"
-
-#: addons/fonreports/contents.tpl.c:47
-msgid "Status"
-msgstr "Estado"
-
-#: addons/fonreports/contents.tpl.c:53
-msgid "Search returned no results..."
-msgstr "La bÃºsqueda no ha encontrado resultados..."
-
-#: personal/phoneaccount/generic.tpl.c:5
-#: personal/phoneaccount/paste_generic.tpl.c:8
-msgid "Telephone hardware"
-msgstr "TelÃ©fono hardware"
-
-#: personal/phoneaccount/generic.tpl.c:8
-msgid "Telephone"
-msgstr "TelÃ©fono"
-
-#: personal/phoneaccount/generic.tpl.c:14
-msgid "Select the accounts home server"
-msgstr "Seleccione las cuentas del servidor principal"
-
-#: personal/phoneaccount/generic.tpl.c:17
-msgid "Context"
-msgstr "Contexto"
-
-#: personal/phoneaccount/generic.tpl.c:20
-#: personal/phoneaccount/generic.tpl.c:26
-msgid "Select the accounts context"
-msgstr "Seleccione el contexto de cuentas"
-
-#: personal/phoneaccount/generic.tpl.c:23
-msgid "Voicemail context"
-msgstr "Contexto de buzÃ³n de voz"
diff --git a/asterisk/locale/fa_IR/fusiondirectory.po b/asterisk/locale/fa_IR/fusiondirectory.po
index 43072588d4382c957f15e8f7cb302a332f0ba78d..81b16585c80611c1b2203cb3a0c3ad890718bdeb 100644
--- a/asterisk/locale/fa_IR/fusiondirectory.po
+++ b/asterisk/locale/fa_IR/fusiondirectory.po
@@ -5,962 +5,124 @@
 # Translators:
 msgid ""
 msgstr ""
-"Project-Id-Version: FusionDirectory-108\n"
+"Project-Id-Version: FusionDirectory-109\n"
 "Report-Msgid-Bugs-To: documentation@lists.fusiondirectory.org\n"
-"POT-Creation-Date: 2015-03-31 11:49+0200\n"
-"PO-Revision-Date: 2015-02-25 15:42+0000\n"
+"POT-Creation-Date: 2014-12-15 17:47+0100\n"
+"PO-Revision-Date: 2014-12-15 16:49+0000\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>\n"
-"Language-Team: Persian (Iran) (http://www.transifex.com/projects/p/FusionDirectory-108/language/fa_IR/)\n"
+"Language-Team: Persian (Iran) (http://www.transifex.com/projects/p/FusionDirectory-109/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/ogroups/asterisk/class_phonequeue.inc:110
-#: admin/conference/class_phoneConferenceGeneric.inc:104
-#: personal/phoneaccount/class_phoneAccount.inc:148
-msgid "Obsolete entry"
-msgstr ""
-
-#: admin/ogroups/asterisk/class_phonequeue.inc:110
-#: admin/conference/class_phoneConferenceGeneric.inc:104
-#: personal/phoneaccount/class_phoneAccount.inc:148
-#, php-format
-msgid ""
-"The current home server is not available anymore. It will be moved to '%s' "
-"if you save this entry!"
-msgstr ""
-
-#: admin/ogroups/asterisk/class_phonequeue.inc:140
-msgid "ring all"
-msgstr ""
-
-#: admin/ogroups/asterisk/class_phonequeue.inc:141
-msgid "round robin"
-msgstr ""
-
-#: admin/ogroups/asterisk/class_phonequeue.inc:142
-msgid "least recently called"
-msgstr ""
-
-#: admin/ogroups/asterisk/class_phonequeue.inc:143
-msgid "fewest completed calls"
-msgstr ""
-
-#: admin/ogroups/asterisk/class_phonequeue.inc:144
-msgid "random"
-msgstr ""
-
-#: admin/ogroups/asterisk/class_phonequeue.inc:145
-msgid "round robin with memory"
-msgstr ""
-
-#: admin/ogroups/asterisk/class_phonequeue.inc:180
-msgid "Remove the phone queue from this Account"
-msgstr ""
-
-#: admin/ogroups/asterisk/class_phonequeue.inc:181
-#: admin/ogroups/asterisk/class_phonequeue.inc:184
-msgid "phone queue"
-msgstr ""
-
-#: admin/ogroups/asterisk/class_phonequeue.inc:183
-msgid "Create phone queue"
-msgstr ""
-
-#: admin/ogroups/asterisk/class_phonequeue.inc:272
-msgid ""
-"There must be at least one server with an asterisk database to create a "
-"phone queue."
-msgstr ""
-
-#: admin/ogroups/asterisk/class_phonequeue.inc:275
-#: admin/ogroups/asterisk/class_phonequeue.inc:873
-#: admin/conference/class_phoneConferenceGeneric.inc:709
-#: personal/phoneaccount/class_phoneAccount.inc:1350
-#: personal/phoneaccount/class_phoneAccount.inc:1669
-#: admin/ogroups/asterisk/phonequeue.tpl.c:17
-#: admin/conference/generic.tpl.c:20 personal/phoneaccount/generic.tpl.c:11
-msgid "Home server"
-msgstr ""
-
-#: admin/ogroups/asterisk/class_phonequeue.inc:281
-#: admin/ogroups/asterisk/class_phonequeue.inc:871
-#: admin/ogroups/asterisk/phonequeue.tpl.c:23
-msgid "Timeout"
-msgstr ""
-
-#: admin/ogroups/asterisk/class_phonequeue.inc:284
-#: admin/ogroups/asterisk/class_phonequeue.inc:896
-#: admin/ogroups/asterisk/phonequeue.tpl.c:26
-msgid "Retry"
-msgstr ""
-
-#: admin/ogroups/asterisk/class_phonequeue.inc:287
-msgid "Queue length"
-msgstr ""
-
-#: admin/ogroups/asterisk/class_phonequeue.inc:290
-#: admin/ogroups/asterisk/class_phonequeue.inc:874
-#: admin/ogroups/asterisk/phonequeue.tpl.c:35
-msgid "Announce frequency"
-msgstr ""
-
-#: admin/ogroups/asterisk/class_phonequeue.inc:293
-#: admin/conference/class_phoneConferenceGeneric.inc:328
-msgid "Number"
-msgstr ""
-
-#: admin/ogroups/asterisk/class_phonequeue.inc:316
-#: admin/ogroups/asterisk/class_phonequeue.inc:361
-msgid "asterisk"
-msgstr ""
-
-#: admin/ogroups/asterisk/class_phonequeue.inc:345
-#: admin/ogroups/asterisk/class_phonequeue.inc:696
-#: admin/conference/class_phoneConferenceGeneric.inc:369
-#: admin/macro/class_gofonMacro.inc:381 admin/macro/class_gofonMacro.inc:465
-#: addons/fonreports/class_fonreport.inc:190
-#: addons/fonreports/class_fonreport.inc:220
-#: personal/phoneaccount/class_phoneAccount.inc:455
-#: personal/phoneaccount/class_phoneAccount.inc:1061
-msgid "GOfon"
-msgstr ""
-
-#: admin/ogroups/asterisk/class_phonequeue.inc:401
-msgid "Cannot find old queue entry!"
-msgstr ""
-
-#: admin/ogroups/asterisk/class_phonequeue.inc:487
-#, php-format
-msgid ""
-"Found more than one entry named '%s' in queue table. Please inform your "
-"system administrator!"
-msgstr ""
-
-#: admin/ogroups/asterisk/class_phonequeue.inc:728
-#: admin/ogroups/asterisk/class_phonequeue.inc:730
-msgid "telephone number"
-msgstr ""
-
-#: admin/ogroups/asterisk/class_phonequeue.inc:787
-#: admin/ogroups/asterisk/class_phonequeue.inc:829
-#: admin/conference/class_phoneConferenceGeneric.inc:229
-#: admin/conference/class_phoneConferenceGeneric.inc:233
-#: admin/conference/class_phoneConferenceGeneric.inc:271
-#: admin/macro/class_gofonMacro.inc:343 admin/macro/class_gofonMacro.inc:452
-#: admin/macro/class_gofonMacro.inc:461 admin/macro/class_gofonMacro.inc:499
-#: admin/systems/asterisk/class_phoneGeneric.inc:267
-#: admin/systems/asterisk/class_phoneGeneric.inc:308
-#: addons/fonreports/class_fonreport.inc:220
-#: personal/phoneaccount/class_phoneAccount.inc:1046
-#: personal/phoneaccount/class_phoneAccount.inc:1166
-#: personal/phoneaccount/class_phoneAccount.inc:1172
-#: personal/phoneaccount/class_phoneAccount.inc:1368
-#: personal/phoneaccount/class_phoneAccount.inc:1450
-#: personal/phoneaccount/class_phoneAccount.inc:1528
-msgid "Error"
-msgstr "Ø®Ø·Ø§"
-
-#: admin/ogroups/asterisk/class_phonequeue.inc:802
-#: admin/ogroups/asterisk/class_phonequeue.inc:857
-#: admin/conference/class_phoneConferenceGeneric.inc:682
-#: admin/macro/class_gofonMacro.inc:473 admin/macro/class_gofonMacro.inc:484
-#: admin/macro/class_gofonMacro.inc:521
-#: admin/macro/class_gofonMacroParameters.inc:435
-#: admin/systems/asterisk/class_phoneGeneric.inc:277
-#: admin/systems/asterisk/class_phoneGeneric.inc:432
-#: admin/systems/asterisk/class_phoneGeneric.inc:446
-#: admin/systems/asterisk/class_phoneGeneric.inc:463
-#: admin/systems/services/asterisk/class_serviceAsterisk.inc:121
-#: personal/phoneaccount/class_phoneAccount.inc:1476
-#: personal/phoneaccount/class_phoneAccount.inc:1609
-msgid "LDAP error"
-msgstr "Ø®Ø·Ø§ÛŒ LDAP"
-
-#: admin/ogroups/asterisk/class_phonequeue.inc:864
-#: admin/systems/asterisk/class_phoneGeneric.inc:472
-#: admin/systems/asterisk/class_phoneGeneric.inc:477
-#: personal/phoneaccount/class_phoneAccount.inc:999
-#: personal/phoneaccount/class_phoneAccount.inc:1012
-#: personal/phoneaccount/class_phoneAccount.inc:1024
-#: personal/phoneaccount/class_phoneAccount.inc:1028
-#: personal/phoneaccount/class_phoneAccount.inc:1031
-#: personal/phoneaccount/class_phoneAccount.inc:1657
-msgid "Phone"
-msgstr "ØªÙ„ÙÙ†"
-
-#: admin/ogroups/asterisk/class_phonequeue.inc:865
-msgid "Phone group"
-msgstr ""
-
-#: admin/ogroups/asterisk/class_phonequeue.inc:872
-#: admin/ogroups/asterisk/phonequeue.tpl.c:32
-msgid "Max queue length"
-msgstr ""
-
-#: admin/ogroups/asterisk/class_phonequeue.inc:875
-#: admin/ogroups/asterisk/phonequeue.tpl.c:86
-msgid "Allow the called user to transfer his call"
-msgstr ""
-
-#: admin/ogroups/asterisk/class_phonequeue.inc:876
-#: admin/ogroups/asterisk/phonequeue.tpl.c:89
-msgid "Allows calling user to transfer call"
-msgstr ""
-
-#: admin/ogroups/asterisk/class_phonequeue.inc:877
-#: admin/ogroups/asterisk/phonequeue.tpl.c:92
-msgid "Allow the called to hangup by pressing *"
-msgstr ""
-
-#: admin/ogroups/asterisk/class_phonequeue.inc:878
-#: admin/ogroups/asterisk/phonequeue.tpl.c:98
-msgid "Ring instead of playing background music"
-msgstr ""
-
-#: admin/ogroups/asterisk/class_phonequeue.inc:879
-#: admin/ogroups/asterisk/phonequeue.tpl.c:95
-msgid "Allows calling to hangup by pressing *"
-msgstr ""
-
-#: admin/ogroups/asterisk/class_phonequeue.inc:881
-#: admin/ogroups/asterisk/phonequeue.tpl.c:47
-msgid "Music on hold"
-msgstr ""
-
-#: admin/ogroups/asterisk/class_phonequeue.inc:882
-msgid "Welcome music"
-msgstr ""
-
-#: admin/ogroups/asterisk/class_phonequeue.inc:883
-msgid "Report hold time"
-msgstr ""
-
-#: admin/ogroups/asterisk/class_phonequeue.inc:884
-msgid "'You are next' sound"
-msgstr ""
-
-#: admin/ogroups/asterisk/class_phonequeue.inc:885
-msgid "'There are' sound"
-msgstr ""
-
-#: admin/ogroups/asterisk/class_phonequeue.inc:886
-msgid "'Call waiting' sound"
-msgstr ""
-
-#: admin/ogroups/asterisk/class_phonequeue.inc:887
-msgid "'Thank you' sound"
-msgstr ""
-
-#: admin/ogroups/asterisk/class_phonequeue.inc:888
-msgid "'Minutes' sound"
-msgstr ""
-
-#: admin/ogroups/asterisk/class_phonequeue.inc:889
-msgid "'Seconds' sound"
-msgstr ""
-
-#: admin/ogroups/asterisk/class_phonequeue.inc:890
-msgid "'Less than' sound"
-msgstr ""
-
-#: admin/ogroups/asterisk/class_phonequeue.inc:891
-msgid "Queue phone number"
-msgstr ""
-
-#: admin/ogroups/asterisk/class_phonequeue.inc:892
-#: admin/conference/class_phoneConferenceGeneric.inc:707
-#: admin/ogroups/asterisk/phonequeue.tpl.c:20
-#: admin/conference/generic.tpl.c:23
-msgid "Language"
-msgstr ""
-
-#: admin/ogroups/asterisk/class_phonequeue.inc:893
-msgid "Method"
-msgstr ""
-
-#: admin/ogroups/asterisk/class_phonequeue.inc:894
-#: admin/ogroups/asterisk/phonequeue.tpl.c:83
-msgid "Announce holdtime"
-msgstr ""
-
-#: admin/ogroups/asterisk/class_phonequeue.inc:895
-msgid "Announce"
-msgstr ""
-
-#: admin/conference/conf-list.xml:11
-msgid "List of conference rooms"
-msgstr ""
-
-#: admin/conference/conf-list.xml:15 admin/conference/conf-list.xml:74
-msgid "Conference"
-msgstr ""
-
-#: admin/conference/conf-list.xml:41
-#: admin/conference/class_phoneConferenceGeneric.inc:324
-#: admin/conference/class_phoneConferenceGeneric.inc:347
-#: admin/conference/class_phoneConferenceGeneric.inc:702
-#: admin/macro/class_gofonMacro.inc:395 admin/macro/class_gofonMacro.inc:406
-#: admin/macro/macro-list.xml:41
-#: admin/systems/asterisk/class_phoneGeneric.inc:344
-#: admin/systems/asterisk/class_phoneGeneric.inc:348
-#: admin/systems/asterisk/class_phoneGeneric.inc:351
-#: admin/systems/asterisk/class_phoneGeneric.inc:366
-#: admin/systems/asterisk/class_phoneGeneric.inc:482
-#: admin/conference/conf-filter.tpl.c:5 admin/macro/macro-filter.tpl.c:5
-#: admin/macro/parameter.tpl.c:5
-msgid "Name"
-msgstr ""
-
-#: admin/conference/conf-list.xml:49
-#: admin/conference/class_phoneConferenceGeneric.inc:704
-#: admin/macro/class_gofonMacro.inc:547 admin/macro/macro-list.xml:49
-#: admin/systems/asterisk/class_phoneGeneric.inc:484
-#: admin/conference/generic.tpl.c:29 admin/macro/generic.tpl.c:17
-#: admin/systems/asterisk/phone.tpl.c:8
-msgid "Description"
-msgstr ""
-
-#: admin/conference/conf-list.xml:57 admin/macro/macro-list.xml:57
-msgid "Actions"
-msgstr ""
-
-#: admin/conference/conf-list.xml:68 admin/macro/macro-list.xml:68
-msgid "Create"
-msgstr ""
-
-#: admin/conference/conf-list.xml:86 admin/conference/conf-list.xml:125
-#: admin/macro/macro-list.xml:86 admin/macro/macro-list.xml:125
-msgid "Edit"
-msgstr ""
-
-#: admin/conference/conf-list.xml:93 admin/conference/conf-list.xml:138
-#: admin/macro/macro-list.xml:93 admin/macro/macro-list.xml:138
-msgid "Remove"
-msgstr ""
-
-#: admin/conference/class_phoneConferenceGeneric.inc:233
-#, php-format
-msgid "Cannot delete entry from server '%s' because it seems to be removed!"
-msgstr ""
-
-#: admin/conference/class_phoneConferenceGeneric.inc:308
-#, php-format
-msgid ""
-"The previously selected asterisk home server '%s' is no longer available!"
-msgstr ""
-
-#: admin/conference/class_phoneConferenceGeneric.inc:315
-#: admin/conference/generic.tpl.c:47
-msgid "PIN"
-msgstr ""
-
-#: admin/conference/class_phoneConferenceGeneric.inc:333
-#: admin/conference/class_phoneConferenceGeneric.inc:719
-msgid "Lifetime"
-msgstr ""
-
-#: admin/conference/class_phoneConferenceGeneric.inc:399
-#: personal/phoneaccount/class_phoneAccount.inc:346
-#: personal/phoneaccount/class_phoneAccount.inc:359
-#: personal/phoneaccount/class_phoneAccount.inc:617
-#: personal/phoneaccount/class_phoneAccount.inc:656
-#: personal/phoneaccount/class_phoneAccount.inc:1519
-#: personal/phoneaccount/class_phoneAccount.inc:1695
-#: admin/conference/remove.tpl.c:2 admin/macro/remove.tpl.c:2
-msgid "Warning"
-msgstr ""
-
-#: admin/conference/class_phoneConferenceGeneric.inc:400
-#, php-format
-msgid ""
-"FusionDirectory identified problems with your MySQL table definition, please"
-" activate debugging for details."
-msgstr ""
-
-#: admin/conference/class_phoneConferenceGeneric.inc:606
-#: admin/conference/class_phoneConferenceGeneric.inc:608
-#, php-format
-msgid "'%s' is already assigned to '%s'!"
-msgstr ""
-
-#: admin/conference/class_phoneConferenceGeneric.inc:693
-msgid "Phone Conference"
-msgstr ""
-
-#: admin/conference/class_phoneConferenceGeneric.inc:694
-msgid "Phone conference management"
-msgstr ""
-
-#: admin/conference/class_phoneConferenceGeneric.inc:696
-msgid "GOfon conference"
-msgstr ""
-
-#: admin/conference/class_phoneConferenceGeneric.inc:698
-msgid "Asterisk conference"
-msgstr ""
-
-#: admin/conference/class_phoneConferenceGeneric.inc:703
-#: admin/macro/class_gofonMacro.inc:546
-#: admin/systems/asterisk/class_phoneGeneric.inc:483
-#: admin/conference/generic.tpl.c:17 admin/macro/generic.tpl.c:14
-#: admin/systems/asterisk/phone.tpl.c:5
-msgid "Base"
-msgstr ""
-
-#: admin/conference/class_phoneConferenceGeneric.inc:705
-msgid "Conference PIN"
-msgstr ""
-
-#: admin/conference/class_phoneConferenceGeneric.inc:710
-#: admin/conference/generic.tpl.c:44
-msgid "Preset PIN"
-msgstr ""
-
-#: admin/conference/class_phoneConferenceGeneric.inc:711
-#: admin/conference/generic.tpl.c:50
-msgid "Record conference"
-msgstr ""
-
-#: admin/conference/class_phoneConferenceGeneric.inc:712
-#: admin/conference/generic.tpl.c:59
-msgid "Play music on hold"
-msgstr ""
-
-#: admin/conference/class_phoneConferenceGeneric.inc:713
-msgid "Activate menu"
-msgstr ""
-
-#: admin/conference/class_phoneConferenceGeneric.inc:714
-msgid "Announce user activity"
-msgstr ""
-
-#: admin/conference/class_phoneConferenceGeneric.inc:715
-msgid "Count user"
-msgstr ""
-
-#: admin/conference/class_phoneConferenceGeneric.inc:716
-msgid "Conference type"
-msgstr ""
-
-#: admin/conference/class_phoneConferenceGeneric.inc:718
-msgid "Format"
-msgstr ""
-
-#: admin/conference/class_phoneConferenceGeneric.inc:720
-#: personal/phoneaccount/class_phoneAccount.inc:1666
-msgid "Telephone number"
-msgstr ""
-
-#: admin/conference/class_phoneConferenceGeneric.inc:721
-msgid "Owner"
-msgstr ""
-
-#: admin/conference/class_phoneConferenceManagment.inc:36
-msgid "Phone Conferences"
-msgstr ""
-
-#: admin/conference/class_phoneConferenceManagment.inc:37
-msgid "Phone Conference management"
-msgstr ""
-
-#: admin/macro/class_gofonMacro.inc:202
-#, php-format
-msgid ""
-"Macro could not be removed from server '%s', please check database "
-"consistency!"
-msgstr ""
-
-#: admin/macro/class_gofonMacro.inc:264
-#, php-format
-msgid "Application missing in line %s!"
-msgstr ""
-
-#: admin/macro/class_gofonMacro.inc:267
-#, php-format
-msgid "Priority missing in line %s!"
-msgstr ""
-
-#: admin/macro/class_gofonMacro.inc:271
-#, php-format
-msgid "Extension missing in line %s!"
-msgstr ""
-
-#: admin/macro/class_gofonMacro.inc:281
-#, php-format
-msgid "Duplicate combination of 'extension' and 'priority' in line %s!"
-msgstr ""
-
-#: admin/macro/class_gofonMacro.inc:317
-#, php-format
-msgid ""
-"Macro could not be added to server '%s', please check database consistency!"
-msgstr ""
-
-#: admin/macro/class_gofonMacro.inc:410
-msgid "Name can be 20 characters at maximum!"
-msgstr ""
-
-#: admin/macro/class_gofonMacro.inc:419
-msgid "Macro is still in use!"
-msgstr ""
-
-#: admin/macro/class_gofonMacro.inc:426
-msgid "Macro is empty!"
-msgstr ""
-
-#: admin/macro/class_gofonMacro.inc:452
-#: admin/systems/asterisk/class_phoneGeneric.inc:267
-#, php-format
-msgid "Cannot delete entry because it is still in use by '%s'!"
-msgstr ""
-
-#: admin/macro/class_gofonMacro.inc:465
-#: addons/fonreports/class_fonreport.inc:190
-#: personal/phoneaccount/class_phoneAccount.inc:455
-#: personal/phoneaccount/class_phoneAccount.inc:1061
-#: personal/phoneaccount/class_phoneAccount.inc:1567
-msgid "Configuration error"
-msgstr ""
-
-#: admin/macro/class_gofonMacro.inc:536 admin/macro/class_gofonMacro.inc:541
-msgid "Asterisk macro"
-msgstr ""
-
-#: admin/macro/class_gofonMacro.inc:537
-msgid "Asterisk macro management"
-msgstr ""
-
-#: admin/macro/class_gofonMacro.inc:539
-msgid "GOfon macro"
-msgstr ""
-
-#: admin/macro/class_gofonMacro.inc:545 admin/macro/generic.tpl.c:2
-#: admin/macro/generic.tpl.c:5 admin/macro/paste_generic.tpl.c:2
-#: admin/macro/paste_generic.tpl.c:5
-msgid "Macro name"
-msgstr ""
-
-#: admin/macro/class_gofonMacro.inc:548 admin/macro/generic.tpl.c:8
-msgid "Display name"
-msgstr ""
-
-#: admin/macro/class_gofonMacro.inc:549
-msgid "Macro content and parameter"
-msgstr ""
-
-#: admin/macro/class_gofonMacro.inc:550
-msgid "Visibility flag"
-msgstr ""
-
-#: admin/macro/class_gofonMacroManagement.inc:36
-msgid "Phone Macros"
-msgstr ""
-
-#: admin/macro/class_gofonMacroManagement.inc:37
-msgid "Phone Macros management"
-msgstr ""
-
-#: admin/macro/macro-list.xml:11
-msgid "List of macros"
-msgstr ""
-
-#: admin/macro/macro-list.xml:15 admin/macro/macro-list.xml:74
-msgid "Macro"
-msgstr ""
-
-#: admin/macro/class_gofonMacroParameters.inc:58
-msgid "Parameter"
-msgstr ""
-
-#: admin/macro/class_gofonMacroParameters.inc:59
-msgid "Asterisk macro parameter"
-msgstr ""
-
-#: admin/macro/class_gofonMacroParameters.inc:234
-#: personal/phoneaccount/generic.tpl.c:35
-msgid "Phone macro"
-msgstr ""
-
-#: admin/macro/class_gofonMacroParameters.inc:290
-msgid "String"
-msgstr ""
-
-#: admin/macro/class_gofonMacroParameters.inc:291
-msgid "Combobox"
-msgstr ""
-
-#: admin/macro/class_gofonMacroParameters.inc:292
-msgid "Bool"
-msgstr ""
-
-#: admin/macro/class_gofonMacroParameters.inc:298
-msgid "Delete unused"
-msgstr ""
-
-#: admin/macro/class_gofonMacroParameters.inc:374
-#, php-format
-msgid "Parameter %s contains invalid character. '!,#' is used as delimiter!"
-msgstr ""
-
-#: admin/macro/class_gofonMacroParameters.inc:379
-#, php-format
-msgid "Parameter %s is invalid!"
-msgstr ""
-
-#: admin/macro/class_gofonMacroParameters.inc:408
-#: personal/phoneaccount/class_phoneAccount.inc:1600
-msgid "Information"
-msgstr ""
-
-#: admin/macro/class_gofonMacroParameters.inc:408
-msgid ""
-"Number of parameters for this macro has changed. Please update all users "
-"using it!"
-msgstr ""
-
-#: admin/systems/asterisk/class_phoneGeneric.inc:151
-msgid "phone"
-msgstr ""
-
-#: admin/systems/asterisk/class_phoneGeneric.inc:230
-msgid "yes"
-msgstr ""
-
-#: admin/systems/asterisk/class_phoneGeneric.inc:230
-msgid "no"
-msgstr ""
-
-#: admin/systems/asterisk/class_phoneGeneric.inc:247
-msgid "dynamic"
-msgstr ""
-
-#: admin/systems/asterisk/class_phoneGeneric.inc:247
-msgid "Networksettings"
-msgstr ""
-
-#: admin/systems/asterisk/class_phoneGeneric.inc:330
-#: admin/systems/asterisk/class_phoneGeneric.inc:333
-msgid "IP address"
-msgstr ""
-
-#: admin/systems/asterisk/class_phoneGeneric.inc:473
-msgid "Phone information"
-msgstr ""
-
-#: admin/systems/asterisk/class_phoneGeneric.inc:476
-#: personal/phoneaccount/class_phoneAccount.inc:1668
-msgid "Phone hardware"
-msgstr ""
-
-#: admin/systems/asterisk/class_phoneGeneric.inc:485
-msgid "SIP Mode"
-msgstr ""
-
-#: admin/systems/asterisk/class_phoneGeneric.inc:486
-msgid "SIP DTMF mode"
-msgstr ""
-
-#: admin/systems/asterisk/class_phoneGeneric.inc:487
-msgid "SIP Default ip"
-msgstr ""
-
-#: admin/systems/asterisk/class_phoneGeneric.inc:488
-msgid "SIP Qualify"
-msgstr ""
-
-#: admin/systems/asterisk/class_phoneGeneric.inc:489
-msgid "IAX authentication type"
-msgstr ""
-
-#: admin/systems/asterisk/class_phoneGeneric.inc:490
-msgid "IAX secret"
-msgstr ""
-
-#: admin/systems/asterisk/class_phoneGeneric.inc:491
-msgid "IAX account code"
-msgstr ""
-
-#: admin/systems/asterisk/class_phoneGeneric.inc:492
-msgid "IAX trunk lines"
-msgstr ""
-
-#: admin/systems/asterisk/class_phoneGeneric.inc:493
-msgid "IAX permit settings"
-msgstr ""
-
-#: admin/systems/asterisk/class_phoneGeneric.inc:494
-msgid "IAX deny settings"
-msgstr ""
-
-#: admin/systems/asterisk/class_phoneGeneric.inc:495
-msgid "CAPI MSN"
-msgstr ""
-
-#: admin/systems/asterisk/class_phoneGeneric.inc:496
-msgid "Hardware type"
-msgstr ""
-
-#: admin/systems/services/asterisk/class_serviceAsterisk.inc:35
-msgid "VoIP database information"
-msgstr ""
-
-#: admin/systems/services/asterisk/class_serviceAsterisk.inc:38
-msgid "Asterisk DB user"
-msgstr ""
-
-#: admin/systems/services/asterisk/class_serviceAsterisk.inc:38
-msgid "Login for asterisk database administrator"
-msgstr ""
-
-#: admin/systems/services/asterisk/class_serviceAsterisk.inc:42
-msgid "Password"
-msgstr ""
-
-#: admin/systems/services/asterisk/class_serviceAsterisk.inc:42
-msgid "Password for asterisk database administrator"
-msgstr ""
-
-#: admin/systems/services/asterisk/class_serviceAsterisk.inc:46
-msgid "Country dial prefix"
-msgstr ""
-
-#: admin/systems/services/asterisk/class_serviceAsterisk.inc:50
-msgid "Local dial prefix"
-msgstr ""
-
-#: admin/systems/services/asterisk/class_serviceAsterisk.inc:54
-msgid "Driver"
-msgstr ""
-
-#: admin/systems/services/asterisk/class_serviceAsterisk.inc:54
-msgid "Driver to use to contact this database."
-msgstr ""
-
-#: admin/systems/services/asterisk/class_serviceAsterisk.inc:95
-#, php-format
-msgid ""
-"You can't remove the asterisk database extension, it is still in use by "
-"these objects '%s'."
-msgstr ""
-
-#: admin/systems/services/asterisk/class_serviceAsterisk.inc:140
-msgid "VoIP service (asterisk)"
-msgstr ""
-
-#: admin/systems/services/asterisk/class_serviceAsterisk.inc:141
-msgid "VoIP - asterisk management"
-msgstr ""
-
-#: admin/systems/services/asterisk/class_serviceAsterisk.inc:141
-msgid "Services"
-msgstr ""
-
-#: addons/fonreports/class_fonreport.inc:232
-msgid "Insufficient permissions"
-msgstr ""
-
-#: addons/fonreports/class_fonreport.inc:251
-msgid "Y-M-D"
-msgstr ""
-
-#: addons/fonreports/class_fonreport.inc:418
-#: addons/fonreports/class_fonreport.inc:419
-#: addons/fonreports/class_fonreport.inc:424 addons/fonreports/main.inc:46
-msgid "Phone reports"
-msgstr ""
-
-#: addons/fonreports/class_fonreport.inc:419
-msgid "All entries are readonly"
-msgstr ""
-
-#: addons/fonreports/class_fonreport.inc:428
-#: addons/fonreports/contents.tpl.c:32
-msgid "Date"
-msgstr ""
-
-#: addons/fonreports/class_fonreport.inc:429
-#: addons/fonreports/contents.tpl.c:35
-msgid "Source"
-msgstr ""
-
-#: addons/fonreports/class_fonreport.inc:430
-#: addons/fonreports/contents.tpl.c:38
-msgid "Destination"
-msgstr ""
-
-#: addons/fonreports/class_fonreport.inc:431
-#: addons/fonreports/contents.tpl.c:41
-msgid "Channel"
-msgstr ""
-
-#: addons/fonreports/class_fonreport.inc:432
-msgid "Application called"
-msgstr ""
-
-#: addons/fonreports/class_fonreport.inc:433
-msgid "Disposition"
-msgstr ""
-
-#: addons/fonreports/class_fonreport.inc:434
-#: addons/fonreports/contents.tpl.c:50
-msgid "Duration"
-msgstr ""
-
-#: personal/phoneaccount/class_phoneAccount.inc:176
-msgid "automatic"
-msgstr ""
-
-#: personal/phoneaccount/class_phoneAccount.inc:212
-msgid "no macro"
-msgstr ""
-
-#: personal/phoneaccount/class_phoneAccount.inc:240
-msgid "undefined"
-msgstr ""
-
-#: personal/phoneaccount/class_phoneAccount.inc:359
-#, php-format
-msgid ""
-"Cannot identify telephone extension in database, please try to save again."
-msgstr ""
-
-#: personal/phoneaccount/class_phoneAccount.inc:577
-#: personal/phoneaccount/class_phoneAccount.inc:595
-msgid "Abort saving entries to keep the database consistent."
-msgstr ""
+#: admin/systems/asterisk/class_phoneIAX.inc:30
+#: admin/systems/asterisk/class_phoneIAX.inc:34
+#: personal/asterisk/class_asteriskAccount.inc:45
+msgid "Phone"
+msgstr "ØªÙ„ÙÙ†"
 
-#: personal/phoneaccount/class_phoneAccount.inc:618
-#: personal/phoneaccount/class_phoneAccount.inc:657
-#: personal/phoneaccount/class_phoneAccount.inc:1520
-#, php-format
-msgid ""
-"FusionDirectory identified problems with your database table definition!"
+#: admin/systems/asterisk/class_phoneIAX.inc:31
+msgid "Asterisk phone"
 msgstr ""
 
-#: personal/phoneaccount/class_phoneAccount.inc:1023
-msgid "Remove phone account"
+#: admin/systems/asterisk/class_phoneIAX.inc:33
+msgid "Phone hardware"
 msgstr ""
 
-#: personal/phoneaccount/class_phoneAccount.inc:1027
-#: personal/phoneaccount/class_phoneAccount.inc:1030
-msgid "Create phone account"
+#: admin/systems/asterisk/class_phoneIAX.inc:46
+#: personal/asterisk/class_asteriskAccount.inc:42
+msgid "Telephone"
 msgstr ""
 
-#: personal/phoneaccount/class_phoneAccount.inc:1028
-msgid "User uid"
+#: admin/systems/asterisk/class_phoneIAX.inc:49
+msgid "Name"
 msgstr ""
 
-#: personal/phoneaccount/class_phoneAccount.inc:1046
-msgid "Selected macro is not available anymore!"
+#: admin/systems/asterisk/class_phoneIAX.inc:49
+msgid "Name of this phone"
 msgstr ""
 
-#: personal/phoneaccount/class_phoneAccount.inc:1221
-msgid "Choose your private phone"
+#: admin/systems/asterisk/class_phoneIAX.inc:53
+msgid "Account name"
 msgstr ""
 
-#: personal/phoneaccount/class_phoneAccount.inc:1346
-msgid ""
-"There must be at least one server with an asterisk database to create a "
-"phone account."
+#: admin/systems/asterisk/class_phoneIAX.inc:53
+msgid "Name of the account"
 msgstr ""
 
-#: personal/phoneaccount/class_phoneAccount.inc:1354
-#: personal/phoneaccount/class_phoneAccount.inc:1357
-#: personal/phoneaccount/generic.tpl.c:29
-#: personal/phoneaccount/paste_generic.tpl.c:11
-msgid "Voicemail PIN"
+#: admin/systems/services/asterisk/class_serviceAsterisk.inc:35
+msgid "VoIP database information"
 msgstr ""
 
-#: personal/phoneaccount/class_phoneAccount.inc:1354
-msgid "Between 1-4 charactes"
+#: admin/systems/services/asterisk/class_serviceAsterisk.inc:38
+msgid "Asterisk DB user"
 msgstr ""
 
-#: personal/phoneaccount/class_phoneAccount.inc:1362
-#: personal/phoneaccount/generic.tpl.c:32
-#: personal/phoneaccount/paste_generic.tpl.c:14
-msgid "Phone PIN"
+#: admin/systems/services/asterisk/class_serviceAsterisk.inc:38
+msgid "Login for asterisk database administrator"
 msgstr ""
 
-#: personal/phoneaccount/class_phoneAccount.inc:1394
-#: admin/conference/generic.tpl.c:38 admin/conference/paste_generic.tpl.c:8
-msgid "Phone number"
+#: admin/systems/services/asterisk/class_serviceAsterisk.inc:42
+msgid "Password"
 msgstr ""
 
-#: personal/phoneaccount/class_phoneAccount.inc:1402
-#, php-format
-msgid "macro parameter %s"
+#: admin/systems/services/asterisk/class_serviceAsterisk.inc:42
+msgid "Password for asterisk database administrator"
 msgstr ""
 
-#: personal/phoneaccount/class_phoneAccount.inc:1450
-msgid "An error occured while updating the database entries!"
+#: admin/systems/services/asterisk/class_serviceAsterisk.inc:46
+msgid "Country dial prefix"
 msgstr ""
 
-#: personal/phoneaccount/class_phoneAccount.inc:1567
-msgid "Was not able to found any asterisk server"
+#: admin/systems/services/asterisk/class_serviceAsterisk.inc:50
+msgid "Local dial prefix"
 msgstr ""
 
-#: personal/phoneaccount/class_phoneAccount.inc:1600
-#, php-format
-msgid "User '%s' has been removed from phone queue '%s'."
+#: admin/systems/services/asterisk/class_serviceAsterisk.inc:54
+msgid "Driver"
 msgstr ""
 
-#: personal/phoneaccount/class_phoneAccount.inc:1637
-#: personal/phoneaccount/class_phoneAccount.inc:1639
-#, php-format
-msgid "The specified telephonenumber '%s' is already assigned to '%s'."
+#: admin/systems/services/asterisk/class_serviceAsterisk.inc:54
+msgid "Driver to use to contact this database."
 msgstr ""
 
-#: personal/phoneaccount/class_phoneAccount.inc:1649
+#: admin/systems/services/asterisk/class_serviceAsterisk.inc:95
 #, php-format
 msgid ""
-"The previously selected asterisk home server (%s) is no longer available. "
-"Remove aborted."
-msgstr ""
-
-#: personal/phoneaccount/class_phoneAccount.inc:1658
-msgid "Phone account settings"
-msgstr ""
-
-#: personal/phoneaccount/class_phoneAccount.inc:1667
-msgid "Macro settings"
-msgstr ""
-
-#: personal/phoneaccount/class_phoneAccount.inc:1670
-msgid "Phone context"
+"You can't remove the asterisk database extension, it is still in use by "
+"these objects '%s'."
 msgstr ""
 
-#: personal/phoneaccount/class_phoneAccount.inc:1671
-msgid "Voice mail context"
-msgstr ""
+#: admin/systems/services/asterisk/class_serviceAsterisk.inc:121
+msgid "LDAP error"
+msgstr "Ø®Ø·Ø§ÛŒ LDAP"
 
-#: personal/phoneaccount/class_phoneAccount.inc:1672
-msgid "Telephone pin"
+#: admin/systems/services/asterisk/class_serviceAsterisk.inc:140
+msgid "VoIP service (asterisk)"
 msgstr ""
 
-#: personal/phoneaccount/class_phoneAccount.inc:1673
-msgid "Voicemail pin"
+#: admin/systems/services/asterisk/class_serviceAsterisk.inc:141
+msgid "VoIP - asterisk management"
 msgstr ""
 
-#: personal/phoneaccount/class_phoneAccount.inc:1695
-#, php-format
-msgid "You need to configure %s contexts first"
+#: admin/systems/services/asterisk/class_serviceAsterisk.inc:141
+msgid "Services"
 msgstr ""
 
-#: personal/phoneaccount/main.inc:124
-msgid "Click the 'Edit' button below to change informations in this dialog"
+#: personal/asterisk/class_asteriskAccount.inc:30
+#: config/asterisk/class_asteriskPluginConfig.inc:28
+#: config/asterisk/class_asteriskPluginConfig.inc:41
+msgid "Asterisk"
 msgstr ""
 
-#: personal/phoneaccount/main.inc:134
-#: personal/phoneaccount/paste_generic.tpl.c:2
-msgid "Phone settings"
+#: personal/asterisk/class_asteriskAccount.inc:31
+msgid "Asterisk account"
 msgstr ""
 
-#: config/asterisk/class_asteriskPluginConfig.inc:28
-#: config/asterisk/class_asteriskPluginConfig.inc:41
-msgid "Asterisk"
+#: personal/asterisk/class_asteriskAccount.inc:45
+msgid "Select the phone associated to this user"
 msgstr ""
 
 #: config/asterisk/class_asteriskPluginConfig.inc:29
@@ -1010,338 +172,3 @@ msgstr ""
 #: config/asterisk/class_asteriskPluginConfig.inc:72
 msgid "Available voicemail contexts"
 msgstr ""
-
-#: admin/ogroups/asterisk/phonequeue.tpl.c:2
-msgid ""
-"Only users with the same asterisk home server will be included to this "
-"queue."
-msgstr ""
-
-#: admin/ogroups/asterisk/phonequeue.tpl.c:5
-#: personal/phoneaccount/generic.tpl.c:2
-#: personal/phoneaccount/paste_generic.tpl.c:5
-msgid "Phone numbers"
-msgstr ""
-
-#: admin/ogroups/asterisk/phonequeue.tpl.c:8
-msgid "Up"
-msgstr ""
-
-#: admin/ogroups/asterisk/phonequeue.tpl.c:11
-msgid "Down"
-msgstr ""
-
-#: admin/ogroups/asterisk/phonequeue.tpl.c:14
-#: admin/conference/generic.tpl.c:41
-msgid "Options"
-msgstr ""
-
-#: admin/ogroups/asterisk/phonequeue.tpl.c:29
-msgid "Strategy"
-msgstr ""
-
-#: admin/ogroups/asterisk/phonequeue.tpl.c:38
-msgid "(in seconds)"
-msgstr ""
-
-#: admin/ogroups/asterisk/phonequeue.tpl.c:41
-msgid "Queue sound setup"
-msgstr ""
-
-#: admin/ogroups/asterisk/phonequeue.tpl.c:44
-msgid "Use music on hold instead of ringing"
-msgstr ""
-
-#: admin/ogroups/asterisk/phonequeue.tpl.c:50
-msgid "Welcome sound file"
-msgstr ""
-
-#: admin/ogroups/asterisk/phonequeue.tpl.c:53
-msgid "Announce message"
-msgstr ""
-
-#: admin/ogroups/asterisk/phonequeue.tpl.c:56
-msgid "Sound file for 'You are next ...'"
-msgstr ""
-
-#: admin/ogroups/asterisk/phonequeue.tpl.c:59
-msgid "'There are ...'"
-msgstr ""
-
-#: admin/ogroups/asterisk/phonequeue.tpl.c:62
-msgid "'... calls waiting'"
-msgstr ""
-
-#: admin/ogroups/asterisk/phonequeue.tpl.c:65
-msgid "'Thank you' message"
-msgstr ""
-
-#: admin/ogroups/asterisk/phonequeue.tpl.c:68
-msgid "'minutes' sound file"
-msgstr ""
-
-#: admin/ogroups/asterisk/phonequeue.tpl.c:71
-msgid "'seconds' sound file"
-msgstr ""
-
-#: admin/ogroups/asterisk/phonequeue.tpl.c:74
-msgid "Hold sound file"
-msgstr ""
-
-#: admin/ogroups/asterisk/phonequeue.tpl.c:77
-msgid "Less Than sound file"
-msgstr ""
-
-#: admin/ogroups/asterisk/phonequeue.tpl.c:80
-msgid "Phone attributes "
-msgstr ""
-
-#: admin/conference/conf-filter.tpl.c:2 admin/macro/macro-filter.tpl.c:2
-#: addons/fonreports/contents.tpl.c:2
-msgid "Filter"
-msgstr ""
-
-#: admin/conference/generic.tpl.c:2
-msgid "Properties"
-msgstr ""
-
-#: admin/conference/generic.tpl.c:5 admin/conference/paste_generic.tpl.c:2
-msgid "Conference name"
-msgstr ""
-
-#: admin/conference/generic.tpl.c:8 admin/conference/paste_generic.tpl.c:5
-msgid "Name of conference to create"
-msgstr ""
-
-#: admin/conference/generic.tpl.c:11
-msgid "Type"
-msgstr ""
-
-#: admin/conference/generic.tpl.c:14
-msgid "Choose subtree to place conference in"
-msgstr ""
-
-#: admin/conference/generic.tpl.c:26
-msgid "Select language"
-msgstr ""
-
-#: admin/conference/generic.tpl.c:32
-msgid "Descriptive text for department"
-msgstr ""
-
-#: admin/conference/generic.tpl.c:35
-msgid "Lifetime (in days)"
-msgstr ""
-
-#: admin/conference/generic.tpl.c:53
-msgid "Sound file format"
-msgstr ""
-
-#: admin/conference/generic.tpl.c:56
-msgid "Choose subtree to place department in"
-msgstr ""
-
-#: admin/conference/generic.tpl.c:62
-msgid "Activate session menu"
-msgstr ""
-
-#: admin/conference/generic.tpl.c:65
-msgid "Announce users joining or leaving the conference"
-msgstr ""
-
-#: admin/conference/generic.tpl.c:68
-msgid "Count users"
-msgstr ""
-
-#: admin/conference/remove.tpl.c:5 admin/macro/remove.tpl.c:5
-msgid ""
-"Please double check if you really want to do this since there is no way for "
-"FusionDirectory to get your data back."
-msgstr ""
-
-#: admin/conference/remove.tpl.c:8 admin/macro/remove.tpl.c:8
-msgid "So - if you're sure - press 'Delete' to continue or 'Cancel' to abort."
-msgstr ""
-
-#: admin/macro/generic.tpl.c:11
-msgid "Macro name to be displayed"
-msgstr ""
-
-#: admin/macro/generic.tpl.c:20
-msgid "Visible for user"
-msgstr ""
-
-#: admin/macro/generic.tpl.c:23
-msgid "Macro text"
-msgstr ""
-
-#: admin/macro/parameter.tpl.c:2
-msgid "Argument"
-msgstr ""
-
-#: admin/macro/parameter.tpl.c:8
-msgid "type"
-msgstr ""
-
-#: admin/macro/parameter.tpl.c:11
-msgid "Default value"
-msgstr ""
-
-#: admin/macro/parameter.tpl.c:14
-msgid "You are not allowed to view the macro parameter settings"
-msgstr ""
-
-#: admin/systems/asterisk/phonesettings.tpl.c:2
-msgid "Advanced phone settings"
-msgstr ""
-
-#: admin/systems/asterisk/phonesettings.tpl.c:5
-msgid "Phone type"
-msgstr ""
-
-#: admin/systems/asterisk/phonesettings.tpl.c:8
-#: admin/systems/asterisk/phonesettings.tpl.c:14
-#: admin/systems/asterisk/phonesettings.tpl.c:20
-#: admin/systems/asterisk/phonesettings.tpl.c:26
-#: admin/systems/asterisk/phonesettings.tpl.c:35
-#: admin/systems/asterisk/phonesettings.tpl.c:47
-#: admin/systems/asterisk/phonesettings.tpl.c:65
-msgid "Choose a phone type"
-msgstr ""
-
-#: admin/systems/asterisk/phonesettings.tpl.c:11
-msgid "Mode"
-msgstr ""
-
-#: admin/systems/asterisk/phonesettings.tpl.c:17
-msgid "DTMF mode"
-msgstr ""
-
-#: admin/systems/asterisk/phonesettings.tpl.c:23
-#: admin/systems/asterisk/phonesettings.tpl.c:38
-msgid "Default IP"
-msgstr ""
-
-#: admin/systems/asterisk/phonesettings.tpl.c:29
-#: admin/systems/asterisk/phonesettings.tpl.c:41
-msgid "Response timeout"
-msgstr ""
-
-#: admin/systems/asterisk/phonesettings.tpl.c:32
-msgid "Modus"
-msgstr ""
-
-#: admin/systems/asterisk/phonesettings.tpl.c:44
-msgid "Authtype"
-msgstr ""
-
-#: admin/systems/asterisk/phonesettings.tpl.c:50
-msgid "Secret"
-msgstr ""
-
-#: admin/systems/asterisk/phonesettings.tpl.c:53
-msgid "GoFonInkeys"
-msgstr ""
-
-#: admin/systems/asterisk/phonesettings.tpl.c:56
-msgid "GoFonOutKeys"
-msgstr ""
-
-#: admin/systems/asterisk/phonesettings.tpl.c:59
-msgid "Account code"
-msgstr ""
-
-#: admin/systems/asterisk/phonesettings.tpl.c:62
-msgid "Trunk lines"
-msgstr ""
-
-#: admin/systems/asterisk/phonesettings.tpl.c:68
-msgid "Hosts that are allowed to connect"
-msgstr ""
-
-#: admin/systems/asterisk/phonesettings.tpl.c:71
-#: admin/systems/asterisk/phonesettings.tpl.c:77
-msgid "List of alternative mail addresses"
-msgstr ""
-
-#: admin/systems/asterisk/phonesettings.tpl.c:74
-msgid "Hosts that are not allowed to connect"
-msgstr ""
-
-#: admin/systems/asterisk/phonesettings.tpl.c:80
-msgid "MSN"
-msgstr ""
-
-#: admin/systems/asterisk/phone.tpl.c:2
-msgid "Phone name"
-msgstr ""
-
-#: addons/fonreports/contents.tpl.c:5
-msgid "Search for"
-msgstr ""
-
-#: addons/fonreports/contents.tpl.c:8
-msgid "Enter user name to search for"
-msgstr ""
-
-#: addons/fonreports/contents.tpl.c:11 addons/fonreports/contents.tpl.c:26
-msgid "in"
-msgstr ""
-
-#: addons/fonreports/contents.tpl.c:14
-msgid "Select subtree to base search on"
-msgstr ""
-
-#: addons/fonreports/contents.tpl.c:17
-msgid "on"
-msgstr ""
-
-#: addons/fonreports/contents.tpl.c:20
-msgid "Select server to search on"
-msgstr ""
-
-#: addons/fonreports/contents.tpl.c:23
-msgid "during"
-msgstr ""
-
-#: addons/fonreports/contents.tpl.c:29
-msgid "Search"
-msgstr ""
-
-#: addons/fonreports/contents.tpl.c:44
-msgid "Application"
-msgstr ""
-
-#: addons/fonreports/contents.tpl.c:47
-msgid "Status"
-msgstr ""
-
-#: addons/fonreports/contents.tpl.c:53
-msgid "Search returned no results..."
-msgstr ""
-
-#: personal/phoneaccount/generic.tpl.c:5
-#: personal/phoneaccount/paste_generic.tpl.c:8
-msgid "Telephone hardware"
-msgstr ""
-
-#: personal/phoneaccount/generic.tpl.c:8
-msgid "Telephone"
-msgstr ""
-
-#: personal/phoneaccount/generic.tpl.c:14
-msgid "Select the accounts home server"
-msgstr ""
-
-#: personal/phoneaccount/generic.tpl.c:17
-msgid "Context"
-msgstr ""
-
-#: personal/phoneaccount/generic.tpl.c:20
-#: personal/phoneaccount/generic.tpl.c:26
-msgid "Select the accounts context"
-msgstr ""
-
-#: personal/phoneaccount/generic.tpl.c:23
-msgid "Voicemail context"
-msgstr ""
diff --git a/asterisk/locale/fr/fusiondirectory.po b/asterisk/locale/fr/fusiondirectory.po
index 80a4256562756de8cc4fb6c0227f8e7af2e79855..c2b7e5308741278344f2f88fed3121d8bec6cb7e 100644
--- a/asterisk/locale/fr/fusiondirectory.po
+++ b/asterisk/locale/fr/fusiondirectory.po
@@ -3,713 +3,54 @@
 # This file is distributed under the same license as the PACKAGE package.
 # 
 # Translators:
-# Benoit Mortier <benoit.mortier@opensides.be>, 2005-2011
-# Benoit Mortier <benoit.mortier@opensides.be>, 2015
-# fusiondirectory <contact@fusiondirectory.org>, 2013
-# fusiondirectory <contact@fusiondirectory.org>, 2012
-# fusiondirectory <contact@fusiondirectory.org>, 2012-2013
-# fusiondirectory <contact@fusiondirectory.org>, 2012
-# poterealpopolo <giuliano@opensides.be>, 2013
-# poterealpopolo <giuliano@opensides.be>, 2013
 msgid ""
 msgstr ""
-"Project-Id-Version: FusionDirectory-108\n"
+"Project-Id-Version: FusionDirectory-109\n"
 "Report-Msgid-Bugs-To: documentation@lists.fusiondirectory.org\n"
-"POT-Creation-Date: 2015-03-31 11:49+0200\n"
-"PO-Revision-Date: 2015-03-31 11:51+0000\n"
-"Last-Translator: Benoit Mortier <benoit.mortier@opensides.be>\n"
-"Language-Team: French (http://www.transifex.com/projects/p/FusionDirectory-108/language/fr/)\n"
+"POT-Creation-Date: 2014-12-15 17:47+0100\n"
+"PO-Revision-Date: 2015-02-25 16:13+0000\n"
+"Last-Translator: fusiondirectory <contact@fusiondirectory.org>\n"
+"Language-Team: French (http://www.transifex.com/projects/p/FusionDirectory-109/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/ogroups/asterisk/class_phonequeue.inc:110
-#: admin/conference/class_phoneConferenceGeneric.inc:104
-#: personal/phoneaccount/class_phoneAccount.inc:148
-msgid "Obsolete entry"
-msgstr "EntrÃ©e obsolÃ¨te"
-
-#: admin/ogroups/asterisk/class_phonequeue.inc:110
-#: admin/conference/class_phoneConferenceGeneric.inc:104
-#: personal/phoneaccount/class_phoneAccount.inc:148
-#, php-format
-msgid ""
-"The current home server is not available anymore. It will be moved to '%s' "
-"if you save this entry!"
-msgstr "Le serveur home n'est plus disponible. Il sera bougÃ© vers '%s' si vous sauvez cette entrÃ©e !"
-
-#: admin/ogroups/asterisk/class_phonequeue.inc:140
-msgid "ring all"
-msgstr "Tout faire sonner"
-
-#: admin/ogroups/asterisk/class_phonequeue.inc:141
-msgid "round robin"
-msgstr "les un aprÃ¨s les autres"
-
-#: admin/ogroups/asterisk/class_phonequeue.inc:142
-msgid "least recently called"
-msgstr "le moins appelÃ© "
-
-#: admin/ogroups/asterisk/class_phonequeue.inc:143
-msgid "fewest completed calls"
-msgstr "le plus petit nombre d'appel rÃ©ussi"
-
-#: admin/ogroups/asterisk/class_phonequeue.inc:144
-msgid "random"
-msgstr "au hasard"
-
-#: admin/ogroups/asterisk/class_phonequeue.inc:145
-msgid "round robin with memory"
-msgstr "les un aprÃ¨s les autres avec mÃ©morisation du dernier utilisÃ©"
-
-#: admin/ogroups/asterisk/class_phonequeue.inc:180
-msgid "Remove the phone queue from this Account"
-msgstr "Supprimer la queue tÃ©lÃ©phonique de ce compte"
-
-#: admin/ogroups/asterisk/class_phonequeue.inc:181
-#: admin/ogroups/asterisk/class_phonequeue.inc:184
-msgid "phone queue"
-msgstr "queue tÃ©lÃ©phonique"
-
-#: admin/ogroups/asterisk/class_phonequeue.inc:183
-msgid "Create phone queue"
-msgstr "CrÃ©er une queue tÃ©lÃ©phonique"
-
-#: admin/ogroups/asterisk/class_phonequeue.inc:272
-msgid ""
-"There must be at least one server with an asterisk database to create a "
-"phone queue."
-msgstr "Il doit y avoir au moins un serveur avec une base de donnÃ©es asterisk pour crÃ©er un queue tÃ©lÃ©phonique."
-
-#: admin/ogroups/asterisk/class_phonequeue.inc:275
-#: admin/ogroups/asterisk/class_phonequeue.inc:873
-#: admin/conference/class_phoneConferenceGeneric.inc:709
-#: personal/phoneaccount/class_phoneAccount.inc:1350
-#: personal/phoneaccount/class_phoneAccount.inc:1669
-#: admin/ogroups/asterisk/phonequeue.tpl.c:17
-#: admin/conference/generic.tpl.c:20 personal/phoneaccount/generic.tpl.c:11
-msgid "Home server"
-msgstr "Serveur Primaire"
-
-#: admin/ogroups/asterisk/class_phonequeue.inc:281
-#: admin/ogroups/asterisk/class_phonequeue.inc:871
-#: admin/ogroups/asterisk/phonequeue.tpl.c:23
-msgid "Timeout"
-msgstr "Temps d'attente maximum"
-
-#: admin/ogroups/asterisk/class_phonequeue.inc:284
-#: admin/ogroups/asterisk/class_phonequeue.inc:896
-#: admin/ogroups/asterisk/phonequeue.tpl.c:26
-msgid "Retry"
-msgstr "RÃ©essayer"
-
-#: admin/ogroups/asterisk/class_phonequeue.inc:287
-msgid "Queue length"
-msgstr "taille de la queue"
-
-#: admin/ogroups/asterisk/class_phonequeue.inc:290
-#: admin/ogroups/asterisk/class_phonequeue.inc:874
-#: admin/ogroups/asterisk/phonequeue.tpl.c:35
-msgid "Announce frequency"
-msgstr "FrÃ©quence du message d'annonce"
-
-#: admin/ogroups/asterisk/class_phonequeue.inc:293
-#: admin/conference/class_phoneConferenceGeneric.inc:328
-msgid "Number"
-msgstr "NumÃ©ro"
-
-#: admin/ogroups/asterisk/class_phonequeue.inc:316
-#: admin/ogroups/asterisk/class_phonequeue.inc:361
-msgid "asterisk"
-msgstr "asterisk"
-
-#: admin/ogroups/asterisk/class_phonequeue.inc:345
-#: admin/ogroups/asterisk/class_phonequeue.inc:696
-#: admin/conference/class_phoneConferenceGeneric.inc:369
-#: admin/macro/class_gofonMacro.inc:381 admin/macro/class_gofonMacro.inc:465
-#: addons/fonreports/class_fonreport.inc:190
-#: addons/fonreports/class_fonreport.inc:220
-#: personal/phoneaccount/class_phoneAccount.inc:455
-#: personal/phoneaccount/class_phoneAccount.inc:1061
-msgid "GOfon"
-msgstr "Gofon"
-
-#: admin/ogroups/asterisk/class_phonequeue.inc:401
-msgid "Cannot find old queue entry!"
-msgstr "Impossible de trouver l'entrÃ©e dans l'ancienne queue !"
-
-#: admin/ogroups/asterisk/class_phonequeue.inc:487
-#, php-format
-msgid ""
-"Found more than one entry named '%s' in queue table. Please inform your "
-"system administrator!"
-msgstr "J'ai trouvÃ© plus d'une entrÃ©e nommÃ©e '%s' dans la queue. Veuillez informer votre administrateur systÃ¨me !"
-
-#: admin/ogroups/asterisk/class_phonequeue.inc:728
-#: admin/ogroups/asterisk/class_phonequeue.inc:730
-msgid "telephone number"
-msgstr "numÃ©ro de tÃ©lÃ©phone"
-
-#: admin/ogroups/asterisk/class_phonequeue.inc:787
-#: admin/ogroups/asterisk/class_phonequeue.inc:829
-#: admin/conference/class_phoneConferenceGeneric.inc:229
-#: admin/conference/class_phoneConferenceGeneric.inc:233
-#: admin/conference/class_phoneConferenceGeneric.inc:271
-#: admin/macro/class_gofonMacro.inc:343 admin/macro/class_gofonMacro.inc:452
-#: admin/macro/class_gofonMacro.inc:461 admin/macro/class_gofonMacro.inc:499
-#: admin/systems/asterisk/class_phoneGeneric.inc:267
-#: admin/systems/asterisk/class_phoneGeneric.inc:308
-#: addons/fonreports/class_fonreport.inc:220
-#: personal/phoneaccount/class_phoneAccount.inc:1046
-#: personal/phoneaccount/class_phoneAccount.inc:1166
-#: personal/phoneaccount/class_phoneAccount.inc:1172
-#: personal/phoneaccount/class_phoneAccount.inc:1368
-#: personal/phoneaccount/class_phoneAccount.inc:1450
-#: personal/phoneaccount/class_phoneAccount.inc:1528
-msgid "Error"
-msgstr "Erreur"
-
-#: admin/ogroups/asterisk/class_phonequeue.inc:802
-#: admin/ogroups/asterisk/class_phonequeue.inc:857
-#: admin/conference/class_phoneConferenceGeneric.inc:682
-#: admin/macro/class_gofonMacro.inc:473 admin/macro/class_gofonMacro.inc:484
-#: admin/macro/class_gofonMacro.inc:521
-#: admin/macro/class_gofonMacroParameters.inc:435
-#: admin/systems/asterisk/class_phoneGeneric.inc:277
-#: admin/systems/asterisk/class_phoneGeneric.inc:432
-#: admin/systems/asterisk/class_phoneGeneric.inc:446
-#: admin/systems/asterisk/class_phoneGeneric.inc:463
-#: admin/systems/services/asterisk/class_serviceAsterisk.inc:121
-#: personal/phoneaccount/class_phoneAccount.inc:1476
-#: personal/phoneaccount/class_phoneAccount.inc:1609
-msgid "LDAP error"
-msgstr "Erreur LDAP"
-
-#: admin/ogroups/asterisk/class_phonequeue.inc:864
-#: admin/systems/asterisk/class_phoneGeneric.inc:472
-#: admin/systems/asterisk/class_phoneGeneric.inc:477
-#: personal/phoneaccount/class_phoneAccount.inc:999
-#: personal/phoneaccount/class_phoneAccount.inc:1012
-#: personal/phoneaccount/class_phoneAccount.inc:1024
-#: personal/phoneaccount/class_phoneAccount.inc:1028
-#: personal/phoneaccount/class_phoneAccount.inc:1031
-#: personal/phoneaccount/class_phoneAccount.inc:1657
+#: admin/systems/asterisk/class_phoneIAX.inc:30
+#: admin/systems/asterisk/class_phoneIAX.inc:34
+#: personal/asterisk/class_asteriskAccount.inc:45
 msgid "Phone"
 msgstr "TÃ©lÃ©phone"
 
-#: admin/ogroups/asterisk/class_phonequeue.inc:865
-msgid "Phone group"
-msgstr "Groupe tÃ©lÃ©phonique"
-
-#: admin/ogroups/asterisk/class_phonequeue.inc:872
-#: admin/ogroups/asterisk/phonequeue.tpl.c:32
-msgid "Max queue length"
-msgstr "Taille maximale de la queue"
-
-#: admin/ogroups/asterisk/class_phonequeue.inc:875
-#: admin/ogroups/asterisk/phonequeue.tpl.c:86
-msgid "Allow the called user to transfer his call"
-msgstr "Permettre Ã  l'utilisateur appelÃ© de transfÃ©rer son appel"
-
-#: admin/ogroups/asterisk/class_phonequeue.inc:876
-#: admin/ogroups/asterisk/phonequeue.tpl.c:89
-msgid "Allows calling user to transfer call"
-msgstr "Permettre Ã  l'utilisateur qui appelle de transfÃ©rer son appel"
-
-#: admin/ogroups/asterisk/class_phonequeue.inc:877
-#: admin/ogroups/asterisk/phonequeue.tpl.c:92
-msgid "Allow the called to hangup by pressing *"
-msgstr "Permettre Ã  la personne qui appelle de raccrocher en appuyant sur *"
-
-#: admin/ogroups/asterisk/class_phonequeue.inc:878
-#: admin/ogroups/asterisk/phonequeue.tpl.c:98
-msgid "Ring instead of playing background music"
-msgstr "Sonner au lieu de mettre une musique d'ambiance"
-
-#: admin/ogroups/asterisk/class_phonequeue.inc:879
-#: admin/ogroups/asterisk/phonequeue.tpl.c:95
-msgid "Allows calling to hangup by pressing *"
-msgstr "Permettre Ã  la personne qui appelle de raccrocher en appuyant sur *"
-
-#: admin/ogroups/asterisk/class_phonequeue.inc:881
-#: admin/ogroups/asterisk/phonequeue.tpl.c:47
-msgid "Music on hold"
-msgstr "Musique d'attente"
-
-#: admin/ogroups/asterisk/class_phonequeue.inc:882
-msgid "Welcome music"
-msgstr "Musique de bienvenue"
-
-#: admin/ogroups/asterisk/class_phonequeue.inc:883
-msgid "Report hold time"
-msgstr "Annonce de la durÃ©e de mise en attente"
-
-#: admin/ogroups/asterisk/class_phonequeue.inc:884
-msgid "'You are next' sound"
-msgstr "son 'Vous Ãªtes le suivant'"
-
-#: admin/ogroups/asterisk/class_phonequeue.inc:885
-msgid "'There are' sound"
-msgstr "son 'Il y a ...'"
-
-#: admin/ogroups/asterisk/class_phonequeue.inc:886
-msgid "'Call waiting' sound"
-msgstr "son '... appels en attente'"
-
-#: admin/ogroups/asterisk/class_phonequeue.inc:887
-msgid "'Thank you' sound"
-msgstr "son 'Merci'"
-
-#: admin/ogroups/asterisk/class_phonequeue.inc:888
-msgid "'Minutes' sound"
-msgstr "'minutes' du fichier son"
-
-#: admin/ogroups/asterisk/class_phonequeue.inc:889
-msgid "'Seconds' sound"
-msgstr "'secondes' du fichier son"
-
-#: admin/ogroups/asterisk/class_phonequeue.inc:890
-msgid "'Less than' sound"
-msgstr "Fichier son, 'moins de'"
-
-#: admin/ogroups/asterisk/class_phonequeue.inc:891
-msgid "Queue phone number"
-msgstr "NumÃ©ro de la queue tÃ©lÃ©phonique"
-
-#: admin/ogroups/asterisk/class_phonequeue.inc:892
-#: admin/conference/class_phoneConferenceGeneric.inc:707
-#: admin/ogroups/asterisk/phonequeue.tpl.c:20
-#: admin/conference/generic.tpl.c:23
-msgid "Language"
-msgstr "Langue"
-
-#: admin/ogroups/asterisk/class_phonequeue.inc:893
-msgid "Method"
-msgstr "MÃ©thode"
-
-#: admin/ogroups/asterisk/class_phonequeue.inc:894
-#: admin/ogroups/asterisk/phonequeue.tpl.c:83
-msgid "Announce holdtime"
-msgstr "Annonce de la durÃ©e de mise en attente"
-
-#: admin/ogroups/asterisk/class_phonequeue.inc:895
-msgid "Announce"
-msgstr "Annonce"
-
-#: admin/conference/conf-list.xml:11
-msgid "List of conference rooms"
-msgstr "Liste des salles de confÃ©rence"
-
-#: admin/conference/conf-list.xml:15 admin/conference/conf-list.xml:74
-msgid "Conference"
-msgstr "ConfÃ©rence"
-
-#: admin/conference/conf-list.xml:41
-#: admin/conference/class_phoneConferenceGeneric.inc:324
-#: admin/conference/class_phoneConferenceGeneric.inc:347
-#: admin/conference/class_phoneConferenceGeneric.inc:702
-#: admin/macro/class_gofonMacro.inc:395 admin/macro/class_gofonMacro.inc:406
-#: admin/macro/macro-list.xml:41
-#: admin/systems/asterisk/class_phoneGeneric.inc:344
-#: admin/systems/asterisk/class_phoneGeneric.inc:348
-#: admin/systems/asterisk/class_phoneGeneric.inc:351
-#: admin/systems/asterisk/class_phoneGeneric.inc:366
-#: admin/systems/asterisk/class_phoneGeneric.inc:482
-#: admin/conference/conf-filter.tpl.c:5 admin/macro/macro-filter.tpl.c:5
-#: admin/macro/parameter.tpl.c:5
-msgid "Name"
-msgstr "Nom"
-
-#: admin/conference/conf-list.xml:49
-#: admin/conference/class_phoneConferenceGeneric.inc:704
-#: admin/macro/class_gofonMacro.inc:547 admin/macro/macro-list.xml:49
-#: admin/systems/asterisk/class_phoneGeneric.inc:484
-#: admin/conference/generic.tpl.c:29 admin/macro/generic.tpl.c:17
-#: admin/systems/asterisk/phone.tpl.c:8
-msgid "Description"
-msgstr "Description"
-
-#: admin/conference/conf-list.xml:57 admin/macro/macro-list.xml:57
-msgid "Actions"
-msgstr "Actions"
-
-#: admin/conference/conf-list.xml:68 admin/macro/macro-list.xml:68
-msgid "Create"
-msgstr "CrÃ©er"
-
-#: admin/conference/conf-list.xml:86 admin/conference/conf-list.xml:125
-#: admin/macro/macro-list.xml:86 admin/macro/macro-list.xml:125
-msgid "Edit"
-msgstr "Editer"
-
-#: admin/conference/conf-list.xml:93 admin/conference/conf-list.xml:138
-#: admin/macro/macro-list.xml:93 admin/macro/macro-list.xml:138
-msgid "Remove"
-msgstr "Supprimer"
-
-#: admin/conference/class_phoneConferenceGeneric.inc:233
-#, php-format
-msgid "Cannot delete entry from server '%s' because it seems to be removed!"
-msgstr "Impossible d'effacer l'entrÃ©e du serveur '%s' parceque l'entrÃ©e semble avoir dÃ©jÃ  Ã©tÃ© effacÃ©e !"
-
-#: admin/conference/class_phoneConferenceGeneric.inc:308
-#, php-format
-msgid ""
-"The previously selected asterisk home server '%s' is no longer available!"
-msgstr "Le serveur asterisk primaire (%s) prÃ©cÃ©demment sÃ©lectionnÃ© n'est plus disponible !"
-
-#: admin/conference/class_phoneConferenceGeneric.inc:315
-#: admin/conference/generic.tpl.c:47
-msgid "PIN"
-msgstr "Code PIN"
-
-#: admin/conference/class_phoneConferenceGeneric.inc:333
-#: admin/conference/class_phoneConferenceGeneric.inc:719
-msgid "Lifetime"
-msgstr "DurÃ©e"
-
-#: admin/conference/class_phoneConferenceGeneric.inc:399
-#: personal/phoneaccount/class_phoneAccount.inc:346
-#: personal/phoneaccount/class_phoneAccount.inc:359
-#: personal/phoneaccount/class_phoneAccount.inc:617
-#: personal/phoneaccount/class_phoneAccount.inc:656
-#: personal/phoneaccount/class_phoneAccount.inc:1519
-#: personal/phoneaccount/class_phoneAccount.inc:1695
-#: admin/conference/remove.tpl.c:2 admin/macro/remove.tpl.c:2
-msgid "Warning"
-msgstr "Avertissement"
-
-#: admin/conference/class_phoneConferenceGeneric.inc:400
-#, php-format
-msgid ""
-"FusionDirectory identified problems with your MySQL table definition, please"
-" activate debugging for details."
-msgstr "FusionDirectory Ã  identifiÃ© des problÃ¨mes dans les dÃ©finitions de vos tables MySQL, veuillez activer le mode debug pour plus de dÃ©tail."
-
-#: admin/conference/class_phoneConferenceGeneric.inc:606
-#: admin/conference/class_phoneConferenceGeneric.inc:608
-#, php-format
-msgid "'%s' is already assigned to '%s'!"
-msgstr "'%s' est dÃ©jÃ  utilisÃ© par '%s' !"
-
-#: admin/conference/class_phoneConferenceGeneric.inc:693
-msgid "Phone Conference"
-msgstr "ConfÃ©rences"
-
-#: admin/conference/class_phoneConferenceGeneric.inc:694
-msgid "Phone conference management"
-msgstr "Gestion des confÃ©rences tÃ©lÃ©phoniques"
-
-#: admin/conference/class_phoneConferenceGeneric.inc:696
-msgid "GOfon conference"
-msgstr "ConfÃ©rences tÃ©lÃ©phoniques"
-
-#: admin/conference/class_phoneConferenceGeneric.inc:698
-msgid "Asterisk conference"
-msgstr "ConfÃ©rence Asterisk"
-
-#: admin/conference/class_phoneConferenceGeneric.inc:703
-#: admin/macro/class_gofonMacro.inc:546
-#: admin/systems/asterisk/class_phoneGeneric.inc:483
-#: admin/conference/generic.tpl.c:17 admin/macro/generic.tpl.c:14
-#: admin/systems/asterisk/phone.tpl.c:5
-msgid "Base"
-msgstr "Base"
-
-#: admin/conference/class_phoneConferenceGeneric.inc:705
-msgid "Conference PIN"
-msgstr "Code Pin de la confÃ©rence"
-
-#: admin/conference/class_phoneConferenceGeneric.inc:710
-#: admin/conference/generic.tpl.c:44
-msgid "Preset PIN"
-msgstr "Code PIN prÃ©selectionnÃ©"
-
-#: admin/conference/class_phoneConferenceGeneric.inc:711
-#: admin/conference/generic.tpl.c:50
-msgid "Record conference"
-msgstr "Enregistrer la confÃ©rence"
-
-#: admin/conference/class_phoneConferenceGeneric.inc:712
-#: admin/conference/generic.tpl.c:59
-msgid "Play music on hold"
-msgstr "Musique d'attente"
-
-#: admin/conference/class_phoneConferenceGeneric.inc:713
-msgid "Activate menu"
-msgstr "Activer le menu"
-
-#: admin/conference/class_phoneConferenceGeneric.inc:714
-msgid "Announce user activity"
-msgstr "Annoncer l'activitÃ© utilisateur"
-
-#: admin/conference/class_phoneConferenceGeneric.inc:715
-msgid "Count user"
-msgstr "Compter les utilisateurs"
-
-#: admin/conference/class_phoneConferenceGeneric.inc:716
-msgid "Conference type"
-msgstr "Type de confÃ©rence"
-
-#: admin/conference/class_phoneConferenceGeneric.inc:718
-msgid "Format"
-msgstr "Format"
-
-#: admin/conference/class_phoneConferenceGeneric.inc:720
-#: personal/phoneaccount/class_phoneAccount.inc:1666
-msgid "Telephone number"
-msgstr "NumÃ©ro de tÃ©lÃ©phone"
-
-#: admin/conference/class_phoneConferenceGeneric.inc:721
-msgid "Owner"
-msgstr "PropriÃ©taire"
-
-#: admin/conference/class_phoneConferenceManagment.inc:36
-msgid "Phone Conferences"
-msgstr "ConfÃ©rences"
-
-#: admin/conference/class_phoneConferenceManagment.inc:37
-msgid "Phone Conference management"
-msgstr "Gestion des confÃ©rences tÃ©lÃ©phoniques"
-
-#: admin/macro/class_gofonMacro.inc:202
-#, php-format
-msgid ""
-"Macro could not be removed from server '%s', please check database "
-"consistency!"
-msgstr "La macro ne peut pas Ãªtre enlevÃ©e du serveur '%s', veuillez vÃ©rifier la validitÃ© des donnÃ©es de la base de donnÃ©es !"
-
-#: admin/macro/class_gofonMacro.inc:264
-#, php-format
-msgid "Application missing in line %s!"
-msgstr "Il y a pas d'application indiquÃ©e Ã  la ligne '%s' !"
-
-#: admin/macro/class_gofonMacro.inc:267
-#, php-format
-msgid "Priority missing in line %s!"
-msgstr "PrioritÃ© manquante Ã  la ligne %s !"
-
-#: admin/macro/class_gofonMacro.inc:271
-#, php-format
-msgid "Extension missing in line %s!"
-msgstr "Extension manquante Ã  la ligne %s !"
-
-#: admin/macro/class_gofonMacro.inc:281
-#, php-format
-msgid "Duplicate combination of 'extension' and 'priority' in line %s!"
-msgstr "Combinaison de 'extension' et 'prioritÃ©' Ã  la ligne %s !"
-
-#: admin/macro/class_gofonMacro.inc:317
-#, php-format
-msgid ""
-"Macro could not be added to server '%s', please check database consistency!"
-msgstr "la macro ne peut Ãªtre ajoutÃ© au serveur '%s', s'il vous plaÃ®t vÃ©rifier la cohÃ©rence de base de donnÃ©es !"
-
-#: admin/macro/class_gofonMacro.inc:410
-msgid "Name can be 20 characters at maximum!"
-msgstr "Les noms ne peuvent pas dÃ©passer 20 caractÃ¨res !"
-
-#: admin/macro/class_gofonMacro.inc:419
-msgid "Macro is still in use!"
-msgstr "Macro encore en utilisation !"
-
-#: admin/macro/class_gofonMacro.inc:426
-msgid "Macro is empty!"
-msgstr "La macro est vide !"
-
-#: admin/macro/class_gofonMacro.inc:452
-#: admin/systems/asterisk/class_phoneGeneric.inc:267
-#, php-format
-msgid "Cannot delete entry because it is still in use by '%s'!"
-msgstr "Impossible d'Ã©ffacer l'entrÃ©e parcequ'elle est encore utilisÃ©e par '%s' !"
-
-#: admin/macro/class_gofonMacro.inc:465
-#: addons/fonreports/class_fonreport.inc:190
-#: personal/phoneaccount/class_phoneAccount.inc:455
-#: personal/phoneaccount/class_phoneAccount.inc:1061
-#: personal/phoneaccount/class_phoneAccount.inc:1567
-msgid "Configuration error"
-msgstr "Erreur de configuration"
-
-#: admin/macro/class_gofonMacro.inc:536 admin/macro/class_gofonMacro.inc:541
-msgid "Asterisk macro"
-msgstr "Macro Asterisk"
-
-#: admin/macro/class_gofonMacro.inc:537
-msgid "Asterisk macro management"
-msgstr "Gestion des macros d'Asterisk"
-
-#: admin/macro/class_gofonMacro.inc:539
-msgid "GOfon macro"
-msgstr "Macro GOfon"
-
-#: admin/macro/class_gofonMacro.inc:545 admin/macro/generic.tpl.c:2
-#: admin/macro/generic.tpl.c:5 admin/macro/paste_generic.tpl.c:2
-#: admin/macro/paste_generic.tpl.c:5
-msgid "Macro name"
-msgstr "Nom de la macro"
-
-#: admin/macro/class_gofonMacro.inc:548 admin/macro/generic.tpl.c:8
-msgid "Display name"
-msgstr "Nom Ã  afficher"
-
-#: admin/macro/class_gofonMacro.inc:549
-msgid "Macro content and parameter"
-msgstr "Contenu et paramÃ¨tre des macros"
-
-#: admin/macro/class_gofonMacro.inc:550
-msgid "Visibility flag"
-msgstr "Etat de visibilitÃ©"
-
-#: admin/macro/class_gofonMacroManagement.inc:36
-msgid "Phone Macros"
-msgstr "Macro tÃ©lÃ©phoniques"
-
-#: admin/macro/class_gofonMacroManagement.inc:37
-msgid "Phone Macros management"
-msgstr "Administration des macros tÃ©lÃ©phoniques"
-
-#: admin/macro/macro-list.xml:11
-msgid "List of macros"
-msgstr "Liste des macros"
-
-#: admin/macro/macro-list.xml:15 admin/macro/macro-list.xml:74
-msgid "Macro"
-msgstr "Macro"
-
-#: admin/macro/class_gofonMacroParameters.inc:58
-msgid "Parameter"
-msgstr "ParamÃ¨tres"
-
-#: admin/macro/class_gofonMacroParameters.inc:59
-msgid "Asterisk macro parameter"
-msgstr "ParamÃ¨tre de macro Asterisk"
-
-#: admin/macro/class_gofonMacroParameters.inc:234
-#: personal/phoneaccount/generic.tpl.c:35
-msgid "Phone macro"
-msgstr "Macro tÃ©lÃ©phoniques"
-
-#: admin/macro/class_gofonMacroParameters.inc:290
-msgid "String"
-msgstr "ChaÃ®ne de caractÃ¨re"
-
-#: admin/macro/class_gofonMacroParameters.inc:291
-msgid "Combobox"
-msgstr "Boite Ã  choix multiple"
-
-#: admin/macro/class_gofonMacroParameters.inc:292
-msgid "Bool"
-msgstr "BoolÃ©en"
-
-#: admin/macro/class_gofonMacroParameters.inc:298
-msgid "Delete unused"
-msgstr "Supprimer les paramÃ¨tres inutilisÃ©s"
-
-#: admin/macro/class_gofonMacroParameters.inc:374
-#, php-format
-msgid "Parameter %s contains invalid character. '!,#' is used as delimiter!"
-msgstr "Le paramÃ¨tre %s contient des caractÃ¨res invalides. '!,#' est utilisÃ© comme sÃ©parateur !"
-
-#: admin/macro/class_gofonMacroParameters.inc:379
-#, php-format
-msgid "Parameter %s is invalid!"
-msgstr "Le paramÃ¨tre %s est non valide !"
-
-#: admin/macro/class_gofonMacroParameters.inc:408
-#: personal/phoneaccount/class_phoneAccount.inc:1600
-msgid "Information"
-msgstr "Information"
-
-#: admin/macro/class_gofonMacroParameters.inc:408
-msgid ""
-"Number of parameters for this macro has changed. Please update all users "
-"using it!"
-msgstr "Le nombre de paramÃ¨tres de cette macro Ã  changÃ©. Veuillez mettre Ã  jour tout les utilisateurs qui l'utilisent !"
-
-#: admin/systems/asterisk/class_phoneGeneric.inc:151
-msgid "phone"
-msgstr "tÃ©lÃ©phone"
-
-#: admin/systems/asterisk/class_phoneGeneric.inc:230
-msgid "yes"
-msgstr "oui"
-
-#: admin/systems/asterisk/class_phoneGeneric.inc:230
-msgid "no"
-msgstr "non"
-
-#: admin/systems/asterisk/class_phoneGeneric.inc:247
-msgid "dynamic"
-msgstr "dynamique"
-
-#: admin/systems/asterisk/class_phoneGeneric.inc:247
-msgid "Networksettings"
-msgstr "Configuration rÃ©seau"
-
-#: admin/systems/asterisk/class_phoneGeneric.inc:330
-#: admin/systems/asterisk/class_phoneGeneric.inc:333
-msgid "IP address"
-msgstr "Adresse ip"
-
-#: admin/systems/asterisk/class_phoneGeneric.inc:473
-msgid "Phone information"
-msgstr "Information sur le tÃ©lÃ©phone"
+#: admin/systems/asterisk/class_phoneIAX.inc:31
+msgid "Asterisk phone"
+msgstr ""
 
-#: admin/systems/asterisk/class_phoneGeneric.inc:476
-#: personal/phoneaccount/class_phoneAccount.inc:1668
+#: admin/systems/asterisk/class_phoneIAX.inc:33
 msgid "Phone hardware"
 msgstr "MatÃ©riel tÃ©lÃ©phonique"
 
-#: admin/systems/asterisk/class_phoneGeneric.inc:485
-msgid "SIP Mode"
-msgstr "Mode SIP"
-
-#: admin/systems/asterisk/class_phoneGeneric.inc:486
-msgid "SIP DTMF mode"
-msgstr "Mode DTMF"
-
-#: admin/systems/asterisk/class_phoneGeneric.inc:487
-msgid "SIP Default ip"
-msgstr "SIP Adresse ip par dÃ©faut"
-
-#: admin/systems/asterisk/class_phoneGeneric.inc:488
-msgid "SIP Qualify"
-msgstr "Qualification SIP"
-
-#: admin/systems/asterisk/class_phoneGeneric.inc:489
-msgid "IAX authentication type"
-msgstr "Type d'authentification IAX"
-
-#: admin/systems/asterisk/class_phoneGeneric.inc:490
-msgid "IAX secret"
-msgstr "Secret IAX"
-
-#: admin/systems/asterisk/class_phoneGeneric.inc:491
-msgid "IAX account code"
-msgstr "Code du compte IAX"
-
-#: admin/systems/asterisk/class_phoneGeneric.inc:492
-msgid "IAX trunk lines"
-msgstr "Trunk IAX"
+#: admin/systems/asterisk/class_phoneIAX.inc:46
+#: personal/asterisk/class_asteriskAccount.inc:42
+msgid "Telephone"
+msgstr "TÃ©lÃ©phone"
 
-#: admin/systems/asterisk/class_phoneGeneric.inc:493
-msgid "IAX permit settings"
-msgstr "ParamÃ¨tres de permissions IAX"
+#: admin/systems/asterisk/class_phoneIAX.inc:49
+msgid "Name"
+msgstr "Nom"
 
-#: admin/systems/asterisk/class_phoneGeneric.inc:494
-msgid "IAX deny settings"
-msgstr "ParamÃ¨tres d'interdiction IAX"
+#: admin/systems/asterisk/class_phoneIAX.inc:49
+msgid "Name of this phone"
+msgstr ""
 
-#: admin/systems/asterisk/class_phoneGeneric.inc:495
-msgid "CAPI MSN"
-msgstr "MSN CAPI"
+#: admin/systems/asterisk/class_phoneIAX.inc:53
+msgid "Account name"
+msgstr "Nom du compte"
 
-#: admin/systems/asterisk/class_phoneGeneric.inc:496
-msgid "Hardware type"
-msgstr "Type de matÃ©riel"
+#: admin/systems/asterisk/class_phoneIAX.inc:53
+msgid "Name of the account"
+msgstr ""
 
 #: admin/systems/services/asterisk/class_serviceAsterisk.inc:35
 msgid "VoIP database information"
@@ -754,6 +95,10 @@ msgid ""
 "these objects '%s'."
 msgstr "Impossible d'enlever l'extension de la base de donnÃ©es asterisk ,elle est utilisÃ© par ce(s) objets '%s'."
 
+#: admin/systems/services/asterisk/class_serviceAsterisk.inc:121
+msgid "LDAP error"
+msgstr "Erreur LDAP"
+
 #: admin/systems/services/asterisk/class_serviceAsterisk.inc:140
 msgid "VoIP service (asterisk)"
 msgstr "Service VOIP (Asterisk)"
@@ -764,213 +109,22 @@ msgstr "VOIP - Gestion d'asterisk"
 
 #: admin/systems/services/asterisk/class_serviceAsterisk.inc:141
 msgid "Services"
-msgstr "Services"
-
-#: addons/fonreports/class_fonreport.inc:232
-msgid "Insufficient permissions"
-msgstr "Permission insuffisantes"
-
-#: addons/fonreports/class_fonreport.inc:251
-msgid "Y-M-D"
-msgstr "A-M-J"
-
-#: addons/fonreports/class_fonreport.inc:418
-#: addons/fonreports/class_fonreport.inc:419
-#: addons/fonreports/class_fonreport.inc:424 addons/fonreports/main.inc:46
-msgid "Phone reports"
-msgstr "Rapports tÃ©lÃ©phoniques"
-
-#: addons/fonreports/class_fonreport.inc:419
-msgid "All entries are readonly"
-msgstr "Tous les champs sont en lecture seule"
-
-#: addons/fonreports/class_fonreport.inc:428
-#: addons/fonreports/contents.tpl.c:32
-msgid "Date"
-msgstr "Date"
-
-#: addons/fonreports/class_fonreport.inc:429
-#: addons/fonreports/contents.tpl.c:35
-msgid "Source"
-msgstr "Emetteur"
-
-#: addons/fonreports/class_fonreport.inc:430
-#: addons/fonreports/contents.tpl.c:38
-msgid "Destination"
-msgstr "Destinataire"
-
-#: addons/fonreports/class_fonreport.inc:431
-#: addons/fonreports/contents.tpl.c:41
-msgid "Channel"
-msgstr "Canal"
-
-#: addons/fonreports/class_fonreport.inc:432
-msgid "Application called"
-msgstr "Application appelÃ©e"
-
-#: addons/fonreports/class_fonreport.inc:433
-msgid "Disposition"
-msgstr "Disposition"
-
-#: addons/fonreports/class_fonreport.inc:434
-#: addons/fonreports/contents.tpl.c:50
-msgid "Duration"
-msgstr "DurÃ©e"
-
-#: personal/phoneaccount/class_phoneAccount.inc:176
-msgid "automatic"
-msgstr "automatique"
-
-#: personal/phoneaccount/class_phoneAccount.inc:212
-msgid "no macro"
-msgstr "pas de macros"
-
-#: personal/phoneaccount/class_phoneAccount.inc:240
-msgid "undefined"
-msgstr "non dÃ©fini"
-
-#: personal/phoneaccount/class_phoneAccount.inc:359
-#, php-format
-msgid ""
-"Cannot identify telephone extension in database, please try to save again."
-msgstr "Impossible d'identifier l'extension tÃ©lÃ©phonique dans la base de donnÃ©es, veuillez essayer de sauver Ã  nouveau."
-
-#: personal/phoneaccount/class_phoneAccount.inc:577
-#: personal/phoneaccount/class_phoneAccount.inc:595
-msgid "Abort saving entries to keep the database consistent."
-msgstr "Abandon de la sauvegarde des donnÃ©es pour garder la base de donnÃ©es consistante."
-
-#: personal/phoneaccount/class_phoneAccount.inc:618
-#: personal/phoneaccount/class_phoneAccount.inc:657
-#: personal/phoneaccount/class_phoneAccount.inc:1520
-#, php-format
-msgid ""
-"FusionDirectory identified problems with your database table definition!"
-msgstr "FusionDirectory Ã  identifiÃ© des problÃ¨mes dans les dÃ©finitions de vos tables de votre base de donnÃ©e !"
-
-#: personal/phoneaccount/class_phoneAccount.inc:1023
-msgid "Remove phone account"
-msgstr "Supprimer l'extension tÃ©lÃ©phonique"
-
-#: personal/phoneaccount/class_phoneAccount.inc:1027
-#: personal/phoneaccount/class_phoneAccount.inc:1030
-msgid "Create phone account"
-msgstr "CrÃ©er un compte tÃ©lÃ©phone"
-
-#: personal/phoneaccount/class_phoneAccount.inc:1028
-msgid "User uid"
-msgstr "id utilisateur"
-
-#: personal/phoneaccount/class_phoneAccount.inc:1046
-msgid "Selected macro is not available anymore!"
-msgstr "la macro sÃ©lectionnÃ©e n'est plus disponible !"
-
-#: personal/phoneaccount/class_phoneAccount.inc:1221
-msgid "Choose your private phone"
-msgstr "Choisissez votre tÃ©lÃ©phone privÃ©"
-
-#: personal/phoneaccount/class_phoneAccount.inc:1346
-msgid ""
-"There must be at least one server with an asterisk database to create a "
-"phone account."
-msgstr "Il doit y avoir au moins un serveur avec une base de donnÃ©es asterisk pour crÃ©er un compte tÃ©lÃ©phonique."
-
-#: personal/phoneaccount/class_phoneAccount.inc:1354
-#: personal/phoneaccount/class_phoneAccount.inc:1357
-#: personal/phoneaccount/generic.tpl.c:29
-#: personal/phoneaccount/paste_generic.tpl.c:11
-msgid "Voicemail PIN"
-msgstr "Code PIN de la boite vocale"
-
-#: personal/phoneaccount/class_phoneAccount.inc:1354
-msgid "Between 1-4 charactes"
-msgstr "Entre 1-4 caractÃ¨res."
-
-#: personal/phoneaccount/class_phoneAccount.inc:1362
-#: personal/phoneaccount/generic.tpl.c:32
-#: personal/phoneaccount/paste_generic.tpl.c:14
-msgid "Phone PIN"
-msgstr "Code PIN du tÃ©lÃ©phone"
-
-#: personal/phoneaccount/class_phoneAccount.inc:1394
-#: admin/conference/generic.tpl.c:38 admin/conference/paste_generic.tpl.c:8
-msgid "Phone number"
-msgstr "NumÃ©ro de tÃ©lÃ©phone"
-
-#: personal/phoneaccount/class_phoneAccount.inc:1402
-#, php-format
-msgid "macro parameter %s"
-msgstr "paramÃ¨tre de la macro %s"
-
-#: personal/phoneaccount/class_phoneAccount.inc:1450
-msgid "An error occured while updating the database entries!"
-msgstr "Une erreur est survenue lors de la mise Ã  jour de la base de donnÃ©es !"
-
-#: personal/phoneaccount/class_phoneAccount.inc:1567
-msgid "Was not able to found any asterisk server"
-msgstr "Je n'ai pas rÃ©ussi Ã  trouver un serveur Asterisk"
-
-#: personal/phoneaccount/class_phoneAccount.inc:1600
-#, php-format
-msgid "User '%s' has been removed from phone queue '%s'."
-msgstr "L'utilisateur '%s' Ã  Ã©tÃ© enlevÃ© de la queue '%s'."
-
-#: personal/phoneaccount/class_phoneAccount.inc:1637
-#: personal/phoneaccount/class_phoneAccount.inc:1639
-#, php-format
-msgid "The specified telephonenumber '%s' is already assigned to '%s'."
-msgstr "Le numÃ©ro de tÃ©lÃ©phone %s est dÃ©jÃ  utilisÃ© par '%s'."
-
-#: personal/phoneaccount/class_phoneAccount.inc:1649
-#, php-format
-msgid ""
-"The previously selected asterisk home server (%s) is no longer available. "
-"Remove aborted."
-msgstr "Le serveur asterisk primaire prÃ©cÃ©demment sÃ©lectionnÃ© n'existe plus (%s). Effacement interrompu."
-
-#: personal/phoneaccount/class_phoneAccount.inc:1658
-msgid "Phone account settings"
-msgstr "ParamÃ¨tres compte tÃ©lÃ©phonique"
-
-#: personal/phoneaccount/class_phoneAccount.inc:1667
-msgid "Macro settings"
-msgstr "ParamÃ¨tres des macros"
-
-#: personal/phoneaccount/class_phoneAccount.inc:1670
-msgid "Phone context"
-msgstr "Contexte tÃ©lÃ©phonique"
-
-#: personal/phoneaccount/class_phoneAccount.inc:1671
-msgid "Voice mail context"
-msgstr "Contexte de la boite vocale"
-
-#: personal/phoneaccount/class_phoneAccount.inc:1672
-msgid "Telephone pin"
-msgstr "Code PIN du tÃ©lÃ©phone"
-
-#: personal/phoneaccount/class_phoneAccount.inc:1673
-msgid "Voicemail pin"
-msgstr "Code PIN de la boite vocale"
-
-#: personal/phoneaccount/class_phoneAccount.inc:1695
-#, php-format
-msgid "You need to configure %s contexts first"
-msgstr "Vous devez configurer en premier les contextes %s"
-
-#: personal/phoneaccount/main.inc:124
-msgid "Click the 'Edit' button below to change informations in this dialog"
-msgstr "Cliquez sur le bouton 'Editer' ci-dessous pour changer les informations dans cette boite de dialogue"
-
-#: personal/phoneaccount/main.inc:134
-#: personal/phoneaccount/paste_generic.tpl.c:2
-msgid "Phone settings"
-msgstr "Configuration du tÃ©lÃ©phone"
+msgstr "Service"
 
+#: personal/asterisk/class_asteriskAccount.inc:30
 #: config/asterisk/class_asteriskPluginConfig.inc:28
 #: config/asterisk/class_asteriskPluginConfig.inc:41
 msgid "Asterisk"
 msgstr "Asterisk"
 
+#: personal/asterisk/class_asteriskAccount.inc:31
+msgid "Asterisk account"
+msgstr ""
+
+#: personal/asterisk/class_asteriskAccount.inc:45
+msgid "Select the phone associated to this user"
+msgstr ""
+
 #: config/asterisk/class_asteriskPluginConfig.inc:29
 msgid "Asterisk plugin configuration"
 msgstr "Configuration de l'extension Asterisk"
@@ -1018,338 +172,3 @@ msgstr "Contextes voicemail"
 #: config/asterisk/class_asteriskPluginConfig.inc:72
 msgid "Available voicemail contexts"
 msgstr "Contextes voicemail disponibles"
-
-#: admin/ogroups/asterisk/phonequeue.tpl.c:2
-msgid ""
-"Only users with the same asterisk home server will be included to this "
-"queue."
-msgstr "Seulement les utilisateurs du mÃªme serveur asterisk seront inclus dans cette queue."
-
-#: admin/ogroups/asterisk/phonequeue.tpl.c:5
-#: personal/phoneaccount/generic.tpl.c:2
-#: personal/phoneaccount/paste_generic.tpl.c:5
-msgid "Phone numbers"
-msgstr "NumÃ©ros de tÃ©lÃ©phones"
-
-#: admin/ogroups/asterisk/phonequeue.tpl.c:8
-msgid "Up"
-msgstr "Haut"
-
-#: admin/ogroups/asterisk/phonequeue.tpl.c:11
-msgid "Down"
-msgstr "Bas"
-
-#: admin/ogroups/asterisk/phonequeue.tpl.c:14
-#: admin/conference/generic.tpl.c:41
-msgid "Options"
-msgstr "Options"
-
-#: admin/ogroups/asterisk/phonequeue.tpl.c:29
-msgid "Strategy"
-msgstr "StratÃ©gie"
-
-#: admin/ogroups/asterisk/phonequeue.tpl.c:38
-msgid "(in seconds)"
-msgstr "(en secondes)"
-
-#: admin/ogroups/asterisk/phonequeue.tpl.c:41
-msgid "Queue sound setup"
-msgstr "Configuration de la queue d'attente du son"
-
-#: admin/ogroups/asterisk/phonequeue.tpl.c:44
-msgid "Use music on hold instead of ringing"
-msgstr "Mettre de la musique lorsqu'on est en attente plutÃ´t que la sonnerie"
-
-#: admin/ogroups/asterisk/phonequeue.tpl.c:50
-msgid "Welcome sound file"
-msgstr "Fichier son de bienvenue"
-
-#: admin/ogroups/asterisk/phonequeue.tpl.c:53
-msgid "Announce message"
-msgstr "Message de prÃ©sentation"
-
-#: admin/ogroups/asterisk/phonequeue.tpl.c:56
-msgid "Sound file for 'You are next ...'"
-msgstr "Fichier son pour 'Vous Ãªtes le suivant ...'"
-
-#: admin/ogroups/asterisk/phonequeue.tpl.c:59
-msgid "'There are ...'"
-msgstr "'Il y a ...'"
-
-#: admin/ogroups/asterisk/phonequeue.tpl.c:62
-msgid "'... calls waiting'"
-msgstr "'... appels en attente'"
-
-#: admin/ogroups/asterisk/phonequeue.tpl.c:65
-msgid "'Thank you' message"
-msgstr "Message 'Merci'"
-
-#: admin/ogroups/asterisk/phonequeue.tpl.c:68
-msgid "'minutes' sound file"
-msgstr "'minutes' du fichier son"
-
-#: admin/ogroups/asterisk/phonequeue.tpl.c:71
-msgid "'seconds' sound file"
-msgstr "'secondes' du fichier son"
-
-#: admin/ogroups/asterisk/phonequeue.tpl.c:74
-msgid "Hold sound file"
-msgstr "Fichier son du message d'attente"
-
-#: admin/ogroups/asterisk/phonequeue.tpl.c:77
-msgid "Less Than sound file"
-msgstr "Fichier son, moins de"
-
-#: admin/ogroups/asterisk/phonequeue.tpl.c:80
-msgid "Phone attributes "
-msgstr "PropriÃ©tÃ©s du tÃ©lÃ©phone"
-
-#: admin/conference/conf-filter.tpl.c:2 admin/macro/macro-filter.tpl.c:2
-#: addons/fonreports/contents.tpl.c:2
-msgid "Filter"
-msgstr "Filtre"
-
-#: admin/conference/generic.tpl.c:2
-msgid "Properties"
-msgstr "PropriÃ©tÃ©s"
-
-#: admin/conference/generic.tpl.c:5 admin/conference/paste_generic.tpl.c:2
-msgid "Conference name"
-msgstr "Nom de la confÃ©rence"
-
-#: admin/conference/generic.tpl.c:8 admin/conference/paste_generic.tpl.c:5
-msgid "Name of conference to create"
-msgstr "Nom de la confÃ©rence Ã  crÃ©er"
-
-#: admin/conference/generic.tpl.c:11
-msgid "Type"
-msgstr "Type"
-
-#: admin/conference/generic.tpl.c:14
-msgid "Choose subtree to place conference in"
-msgstr "SÃ©lectionnez la branche oÃ¹ sera enregistrÃ©e la confÃ©rence"
-
-#: admin/conference/generic.tpl.c:26
-msgid "Select language"
-msgstr "SÃ©lectionnez la langue"
-
-#: admin/conference/generic.tpl.c:32
-msgid "Descriptive text for department"
-msgstr "Description du dÃ©partement"
-
-#: admin/conference/generic.tpl.c:35
-msgid "Lifetime (in days)"
-msgstr "DurÃ©e (en jours)"
-
-#: admin/conference/generic.tpl.c:53
-msgid "Sound file format"
-msgstr "Format du fichier son "
-
-#: admin/conference/generic.tpl.c:56
-msgid "Choose subtree to place department in"
-msgstr "SÃ©lectionnez la branche de l'annuaire dans laquelle sera placÃ©e le dÃ©partement"
-
-#: admin/conference/generic.tpl.c:62
-msgid "Activate session menu"
-msgstr "Activer le menu de session"
-
-#: admin/conference/generic.tpl.c:65
-msgid "Announce users joining or leaving the conference"
-msgstr "Annoncer les nouveaux utilisateurs et ceux qui quittent"
-
-#: admin/conference/generic.tpl.c:68
-msgid "Count users"
-msgstr "Compter les utilisateurs"
-
-#: admin/conference/remove.tpl.c:5 admin/macro/remove.tpl.c:5
-msgid ""
-"Please double check if you really want to do this since there is no way for "
-"FusionDirectory to get your data back."
-msgstr "Veuillez vÃ©rifier que vous voulez effectuer cette action. Toutes les donnÃ©es seront perdues Ã©tant donnÃ© qu'il est impossible pour FusionDirectory de rÃ©cupÃ©rer vos donnÃ©es."
-
-#: admin/conference/remove.tpl.c:8 admin/macro/remove.tpl.c:8
-msgid "So - if you're sure - press 'Delete' to continue or 'Cancel' to abort."
-msgstr "Donc - si vous Ãªtes sÃ»r - cliquez sur 'Supprimer' pour continuer ou sur 'Annuler' pour abandonner."
-
-#: admin/macro/generic.tpl.c:11
-msgid "Macro name to be displayed"
-msgstr "Nom d'affichage de la macro"
-
-#: admin/macro/generic.tpl.c:20
-msgid "Visible for user"
-msgstr "Visible pour l'utilisateur"
-
-#: admin/macro/generic.tpl.c:23
-msgid "Macro text"
-msgstr "Texte de la macro"
-
-#: admin/macro/parameter.tpl.c:2
-msgid "Argument"
-msgstr "Argument"
-
-#: admin/macro/parameter.tpl.c:8
-msgid "type"
-msgstr "type"
-
-#: admin/macro/parameter.tpl.c:11
-msgid "Default value"
-msgstr "Valeur par dÃ©faut"
-
-#: admin/macro/parameter.tpl.c:14
-msgid "You are not allowed to view the macro parameter settings"
-msgstr "Vous n'Ãªtes pas autorisÃ© Ã  voir les paramÃ¨tres de cette macro."
-
-#: admin/systems/asterisk/phonesettings.tpl.c:2
-msgid "Advanced phone settings"
-msgstr "Configuration avancÃ©e du tÃ©lÃ©phone"
-
-#: admin/systems/asterisk/phonesettings.tpl.c:5
-msgid "Phone type"
-msgstr "Type de tÃ©lÃ©phone"
-
-#: admin/systems/asterisk/phonesettings.tpl.c:8
-#: admin/systems/asterisk/phonesettings.tpl.c:14
-#: admin/systems/asterisk/phonesettings.tpl.c:20
-#: admin/systems/asterisk/phonesettings.tpl.c:26
-#: admin/systems/asterisk/phonesettings.tpl.c:35
-#: admin/systems/asterisk/phonesettings.tpl.c:47
-#: admin/systems/asterisk/phonesettings.tpl.c:65
-msgid "Choose a phone type"
-msgstr "SÃ©lectionnez un type de tÃ©lÃ©phone"
-
-#: admin/systems/asterisk/phonesettings.tpl.c:11
-msgid "Mode"
-msgstr "Mode"
-
-#: admin/systems/asterisk/phonesettings.tpl.c:17
-msgid "DTMF mode"
-msgstr "Mode DTMF"
-
-#: admin/systems/asterisk/phonesettings.tpl.c:23
-#: admin/systems/asterisk/phonesettings.tpl.c:38
-msgid "Default IP"
-msgstr "Adresse ip par dÃ©faut"
-
-#: admin/systems/asterisk/phonesettings.tpl.c:29
-#: admin/systems/asterisk/phonesettings.tpl.c:41
-msgid "Response timeout"
-msgstr "Temps de rÃ©ponse maximum"
-
-#: admin/systems/asterisk/phonesettings.tpl.c:32
-msgid "Modus"
-msgstr "Mode"
-
-#: admin/systems/asterisk/phonesettings.tpl.c:44
-msgid "Authtype"
-msgstr "Type d'authentification"
-
-#: admin/systems/asterisk/phonesettings.tpl.c:50
-msgid "Secret"
-msgstr "Secret"
-
-#: admin/systems/asterisk/phonesettings.tpl.c:53
-msgid "GoFonInkeys"
-msgstr ""
-
-#: admin/systems/asterisk/phonesettings.tpl.c:56
-msgid "GoFonOutKeys"
-msgstr ""
-
-#: admin/systems/asterisk/phonesettings.tpl.c:59
-msgid "Account code"
-msgstr "Code du compte tÃ©lÃ©phonique"
-
-#: admin/systems/asterisk/phonesettings.tpl.c:62
-msgid "Trunk lines"
-msgstr "Regrouper des lignes"
-
-#: admin/systems/asterisk/phonesettings.tpl.c:68
-msgid "Hosts that are allowed to connect"
-msgstr "Machines qui peuvent se connecter"
-
-#: admin/systems/asterisk/phonesettings.tpl.c:71
-#: admin/systems/asterisk/phonesettings.tpl.c:77
-msgid "List of alternative mail addresses"
-msgstr "Liste des adresses de courriel alternatives"
-
-#: admin/systems/asterisk/phonesettings.tpl.c:74
-msgid "Hosts that are not allowed to connect"
-msgstr "Machines qui ne peuvent pas se connecter"
-
-#: admin/systems/asterisk/phonesettings.tpl.c:80
-msgid "MSN"
-msgstr "MSN"
-
-#: admin/systems/asterisk/phone.tpl.c:2
-msgid "Phone name"
-msgstr "Nom du tÃ©lÃ©phone"
-
-#: addons/fonreports/contents.tpl.c:5
-msgid "Search for"
-msgstr "Recherche de"
-
-#: addons/fonreports/contents.tpl.c:8
-msgid "Enter user name to search for"
-msgstr "Entrez le nom recherchÃ©"
-
-#: addons/fonreports/contents.tpl.c:11 addons/fonreports/contents.tpl.c:26
-msgid "in"
-msgstr "dans"
-
-#: addons/fonreports/contents.tpl.c:14
-msgid "Select subtree to base search on"
-msgstr "SÃ©lectionnez la branche de l'annuaire oÃ¹ sera effectuÃ©e la recherche"
-
-#: addons/fonreports/contents.tpl.c:17
-msgid "on"
-msgstr "ActivÃ©"
-
-#: addons/fonreports/contents.tpl.c:20
-msgid "Select server to search on"
-msgstr "SÃ©lectionnez le serveur oÃ¹ sera effectuÃ©e la recherche"
-
-#: addons/fonreports/contents.tpl.c:23
-msgid "during"
-msgstr "pendant"
-
-#: addons/fonreports/contents.tpl.c:29
-msgid "Search"
-msgstr "Recherche"
-
-#: addons/fonreports/contents.tpl.c:44
-msgid "Application"
-msgstr "Application"
-
-#: addons/fonreports/contents.tpl.c:47
-msgid "Status"
-msgstr "Statut"
-
-#: addons/fonreports/contents.tpl.c:53
-msgid "Search returned no results..."
-msgstr "La recherche n'a renvoyÃ© aucun rÃ©sultat..."
-
-#: personal/phoneaccount/generic.tpl.c:5
-#: personal/phoneaccount/paste_generic.tpl.c:8
-msgid "Telephone hardware"
-msgstr "MatÃ©riel tÃ©lÃ©phonique"
-
-#: personal/phoneaccount/generic.tpl.c:8
-msgid "Telephone"
-msgstr "TÃ©lÃ©phone"
-
-#: personal/phoneaccount/generic.tpl.c:14
-msgid "Select the accounts home server"
-msgstr "SÃ©lectionnez le serveur primaire"
-
-#: personal/phoneaccount/generic.tpl.c:17
-msgid "Context"
-msgstr "Contexte"
-
-#: personal/phoneaccount/generic.tpl.c:20
-#: personal/phoneaccount/generic.tpl.c:26
-msgid "Select the accounts context"
-msgstr "SÃ©lectionnez le contexte du compte"
-
-#: personal/phoneaccount/generic.tpl.c:23
-msgid "Voicemail context"
-msgstr "Contexte de la boite vocale"
diff --git a/asterisk/locale/id/fusiondirectory.po b/asterisk/locale/id/fusiondirectory.po
index 0b6418b609294cac219c38c4727015b9f4bdc832..543e95aead537e15572a6366af8eb97a3ff3a7ff 100644
--- a/asterisk/locale/id/fusiondirectory.po
+++ b/asterisk/locale/id/fusiondirectory.po
@@ -5,962 +5,124 @@
 # Translators:
 msgid ""
 msgstr ""
-"Project-Id-Version: FusionDirectory-108\n"
+"Project-Id-Version: FusionDirectory-109\n"
 "Report-Msgid-Bugs-To: documentation@lists.fusiondirectory.org\n"
-"POT-Creation-Date: 2015-03-31 11:49+0200\n"
-"PO-Revision-Date: 2015-02-25 15:42+0000\n"
+"POT-Creation-Date: 2014-12-15 17:47+0100\n"
+"PO-Revision-Date: 2014-12-15 16:49+0000\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>\n"
-"Language-Team: Indonesian (http://www.transifex.com/projects/p/FusionDirectory-108/language/id/)\n"
+"Language-Team: Indonesian (http://www.transifex.com/projects/p/FusionDirectory-109/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/ogroups/asterisk/class_phonequeue.inc:110
-#: admin/conference/class_phoneConferenceGeneric.inc:104
-#: personal/phoneaccount/class_phoneAccount.inc:148
-msgid "Obsolete entry"
-msgstr ""
-
-#: admin/ogroups/asterisk/class_phonequeue.inc:110
-#: admin/conference/class_phoneConferenceGeneric.inc:104
-#: personal/phoneaccount/class_phoneAccount.inc:148
-#, php-format
-msgid ""
-"The current home server is not available anymore. It will be moved to '%s' "
-"if you save this entry!"
-msgstr ""
-
-#: admin/ogroups/asterisk/class_phonequeue.inc:140
-msgid "ring all"
-msgstr ""
-
-#: admin/ogroups/asterisk/class_phonequeue.inc:141
-msgid "round robin"
-msgstr ""
-
-#: admin/ogroups/asterisk/class_phonequeue.inc:142
-msgid "least recently called"
-msgstr ""
-
-#: admin/ogroups/asterisk/class_phonequeue.inc:143
-msgid "fewest completed calls"
-msgstr ""
-
-#: admin/ogroups/asterisk/class_phonequeue.inc:144
-msgid "random"
-msgstr ""
-
-#: admin/ogroups/asterisk/class_phonequeue.inc:145
-msgid "round robin with memory"
-msgstr ""
-
-#: admin/ogroups/asterisk/class_phonequeue.inc:180
-msgid "Remove the phone queue from this Account"
-msgstr ""
-
-#: admin/ogroups/asterisk/class_phonequeue.inc:181
-#: admin/ogroups/asterisk/class_phonequeue.inc:184
-msgid "phone queue"
-msgstr ""
-
-#: admin/ogroups/asterisk/class_phonequeue.inc:183
-msgid "Create phone queue"
-msgstr ""
-
-#: admin/ogroups/asterisk/class_phonequeue.inc:272
-msgid ""
-"There must be at least one server with an asterisk database to create a "
-"phone queue."
-msgstr ""
-
-#: admin/ogroups/asterisk/class_phonequeue.inc:275
-#: admin/ogroups/asterisk/class_phonequeue.inc:873
-#: admin/conference/class_phoneConferenceGeneric.inc:709
-#: personal/phoneaccount/class_phoneAccount.inc:1350
-#: personal/phoneaccount/class_phoneAccount.inc:1669
-#: admin/ogroups/asterisk/phonequeue.tpl.c:17
-#: admin/conference/generic.tpl.c:20 personal/phoneaccount/generic.tpl.c:11
-msgid "Home server"
-msgstr ""
-
-#: admin/ogroups/asterisk/class_phonequeue.inc:281
-#: admin/ogroups/asterisk/class_phonequeue.inc:871
-#: admin/ogroups/asterisk/phonequeue.tpl.c:23
-msgid "Timeout"
-msgstr ""
-
-#: admin/ogroups/asterisk/class_phonequeue.inc:284
-#: admin/ogroups/asterisk/class_phonequeue.inc:896
-#: admin/ogroups/asterisk/phonequeue.tpl.c:26
-msgid "Retry"
-msgstr ""
-
-#: admin/ogroups/asterisk/class_phonequeue.inc:287
-msgid "Queue length"
-msgstr ""
-
-#: admin/ogroups/asterisk/class_phonequeue.inc:290
-#: admin/ogroups/asterisk/class_phonequeue.inc:874
-#: admin/ogroups/asterisk/phonequeue.tpl.c:35
-msgid "Announce frequency"
-msgstr ""
-
-#: admin/ogroups/asterisk/class_phonequeue.inc:293
-#: admin/conference/class_phoneConferenceGeneric.inc:328
-msgid "Number"
-msgstr ""
-
-#: admin/ogroups/asterisk/class_phonequeue.inc:316
-#: admin/ogroups/asterisk/class_phonequeue.inc:361
-msgid "asterisk"
-msgstr ""
-
-#: admin/ogroups/asterisk/class_phonequeue.inc:345
-#: admin/ogroups/asterisk/class_phonequeue.inc:696
-#: admin/conference/class_phoneConferenceGeneric.inc:369
-#: admin/macro/class_gofonMacro.inc:381 admin/macro/class_gofonMacro.inc:465
-#: addons/fonreports/class_fonreport.inc:190
-#: addons/fonreports/class_fonreport.inc:220
-#: personal/phoneaccount/class_phoneAccount.inc:455
-#: personal/phoneaccount/class_phoneAccount.inc:1061
-msgid "GOfon"
-msgstr ""
-
-#: admin/ogroups/asterisk/class_phonequeue.inc:401
-msgid "Cannot find old queue entry!"
-msgstr ""
-
-#: admin/ogroups/asterisk/class_phonequeue.inc:487
-#, php-format
-msgid ""
-"Found more than one entry named '%s' in queue table. Please inform your "
-"system administrator!"
-msgstr ""
-
-#: admin/ogroups/asterisk/class_phonequeue.inc:728
-#: admin/ogroups/asterisk/class_phonequeue.inc:730
-msgid "telephone number"
-msgstr ""
-
-#: admin/ogroups/asterisk/class_phonequeue.inc:787
-#: admin/ogroups/asterisk/class_phonequeue.inc:829
-#: admin/conference/class_phoneConferenceGeneric.inc:229
-#: admin/conference/class_phoneConferenceGeneric.inc:233
-#: admin/conference/class_phoneConferenceGeneric.inc:271
-#: admin/macro/class_gofonMacro.inc:343 admin/macro/class_gofonMacro.inc:452
-#: admin/macro/class_gofonMacro.inc:461 admin/macro/class_gofonMacro.inc:499
-#: admin/systems/asterisk/class_phoneGeneric.inc:267
-#: admin/systems/asterisk/class_phoneGeneric.inc:308
-#: addons/fonreports/class_fonreport.inc:220
-#: personal/phoneaccount/class_phoneAccount.inc:1046
-#: personal/phoneaccount/class_phoneAccount.inc:1166
-#: personal/phoneaccount/class_phoneAccount.inc:1172
-#: personal/phoneaccount/class_phoneAccount.inc:1368
-#: personal/phoneaccount/class_phoneAccount.inc:1450
-#: personal/phoneaccount/class_phoneAccount.inc:1528
-msgid "Error"
-msgstr ""
-
-#: admin/ogroups/asterisk/class_phonequeue.inc:802
-#: admin/ogroups/asterisk/class_phonequeue.inc:857
-#: admin/conference/class_phoneConferenceGeneric.inc:682
-#: admin/macro/class_gofonMacro.inc:473 admin/macro/class_gofonMacro.inc:484
-#: admin/macro/class_gofonMacro.inc:521
-#: admin/macro/class_gofonMacroParameters.inc:435
-#: admin/systems/asterisk/class_phoneGeneric.inc:277
-#: admin/systems/asterisk/class_phoneGeneric.inc:432
-#: admin/systems/asterisk/class_phoneGeneric.inc:446
-#: admin/systems/asterisk/class_phoneGeneric.inc:463
-#: admin/systems/services/asterisk/class_serviceAsterisk.inc:121
-#: personal/phoneaccount/class_phoneAccount.inc:1476
-#: personal/phoneaccount/class_phoneAccount.inc:1609
-msgid "LDAP error"
-msgstr ""
-
-#: admin/ogroups/asterisk/class_phonequeue.inc:864
-#: admin/systems/asterisk/class_phoneGeneric.inc:472
-#: admin/systems/asterisk/class_phoneGeneric.inc:477
-#: personal/phoneaccount/class_phoneAccount.inc:999
-#: personal/phoneaccount/class_phoneAccount.inc:1012
-#: personal/phoneaccount/class_phoneAccount.inc:1024
-#: personal/phoneaccount/class_phoneAccount.inc:1028
-#: personal/phoneaccount/class_phoneAccount.inc:1031
-#: personal/phoneaccount/class_phoneAccount.inc:1657
-msgid "Phone"
-msgstr ""
-
-#: admin/ogroups/asterisk/class_phonequeue.inc:865
-msgid "Phone group"
-msgstr ""
-
-#: admin/ogroups/asterisk/class_phonequeue.inc:872
-#: admin/ogroups/asterisk/phonequeue.tpl.c:32
-msgid "Max queue length"
-msgstr ""
-
-#: admin/ogroups/asterisk/class_phonequeue.inc:875
-#: admin/ogroups/asterisk/phonequeue.tpl.c:86
-msgid "Allow the called user to transfer his call"
-msgstr ""
-
-#: admin/ogroups/asterisk/class_phonequeue.inc:876
-#: admin/ogroups/asterisk/phonequeue.tpl.c:89
-msgid "Allows calling user to transfer call"
-msgstr ""
-
-#: admin/ogroups/asterisk/class_phonequeue.inc:877
-#: admin/ogroups/asterisk/phonequeue.tpl.c:92
-msgid "Allow the called to hangup by pressing *"
-msgstr ""
-
-#: admin/ogroups/asterisk/class_phonequeue.inc:878
-#: admin/ogroups/asterisk/phonequeue.tpl.c:98
-msgid "Ring instead of playing background music"
-msgstr ""
-
-#: admin/ogroups/asterisk/class_phonequeue.inc:879
-#: admin/ogroups/asterisk/phonequeue.tpl.c:95
-msgid "Allows calling to hangup by pressing *"
-msgstr ""
-
-#: admin/ogroups/asterisk/class_phonequeue.inc:881
-#: admin/ogroups/asterisk/phonequeue.tpl.c:47
-msgid "Music on hold"
-msgstr ""
-
-#: admin/ogroups/asterisk/class_phonequeue.inc:882
-msgid "Welcome music"
-msgstr ""
-
-#: admin/ogroups/asterisk/class_phonequeue.inc:883
-msgid "Report hold time"
-msgstr ""
-
-#: admin/ogroups/asterisk/class_phonequeue.inc:884
-msgid "'You are next' sound"
-msgstr ""
-
-#: admin/ogroups/asterisk/class_phonequeue.inc:885
-msgid "'There are' sound"
-msgstr ""
-
-#: admin/ogroups/asterisk/class_phonequeue.inc:886
-msgid "'Call waiting' sound"
-msgstr ""
-
-#: admin/ogroups/asterisk/class_phonequeue.inc:887
-msgid "'Thank you' sound"
-msgstr ""
-
-#: admin/ogroups/asterisk/class_phonequeue.inc:888
-msgid "'Minutes' sound"
-msgstr ""
-
-#: admin/ogroups/asterisk/class_phonequeue.inc:889
-msgid "'Seconds' sound"
-msgstr ""
-
-#: admin/ogroups/asterisk/class_phonequeue.inc:890
-msgid "'Less than' sound"
-msgstr ""
-
-#: admin/ogroups/asterisk/class_phonequeue.inc:891
-msgid "Queue phone number"
-msgstr ""
-
-#: admin/ogroups/asterisk/class_phonequeue.inc:892
-#: admin/conference/class_phoneConferenceGeneric.inc:707
-#: admin/ogroups/asterisk/phonequeue.tpl.c:20
-#: admin/conference/generic.tpl.c:23
-msgid "Language"
-msgstr ""
-
-#: admin/ogroups/asterisk/class_phonequeue.inc:893
-msgid "Method"
-msgstr ""
-
-#: admin/ogroups/asterisk/class_phonequeue.inc:894
-#: admin/ogroups/asterisk/phonequeue.tpl.c:83
-msgid "Announce holdtime"
-msgstr ""
-
-#: admin/ogroups/asterisk/class_phonequeue.inc:895
-msgid "Announce"
-msgstr ""
-
-#: admin/conference/conf-list.xml:11
-msgid "List of conference rooms"
-msgstr ""
-
-#: admin/conference/conf-list.xml:15 admin/conference/conf-list.xml:74
-msgid "Conference"
-msgstr ""
-
-#: admin/conference/conf-list.xml:41
-#: admin/conference/class_phoneConferenceGeneric.inc:324
-#: admin/conference/class_phoneConferenceGeneric.inc:347
-#: admin/conference/class_phoneConferenceGeneric.inc:702
-#: admin/macro/class_gofonMacro.inc:395 admin/macro/class_gofonMacro.inc:406
-#: admin/macro/macro-list.xml:41
-#: admin/systems/asterisk/class_phoneGeneric.inc:344
-#: admin/systems/asterisk/class_phoneGeneric.inc:348
-#: admin/systems/asterisk/class_phoneGeneric.inc:351
-#: admin/systems/asterisk/class_phoneGeneric.inc:366
-#: admin/systems/asterisk/class_phoneGeneric.inc:482
-#: admin/conference/conf-filter.tpl.c:5 admin/macro/macro-filter.tpl.c:5
-#: admin/macro/parameter.tpl.c:5
-msgid "Name"
-msgstr ""
-
-#: admin/conference/conf-list.xml:49
-#: admin/conference/class_phoneConferenceGeneric.inc:704
-#: admin/macro/class_gofonMacro.inc:547 admin/macro/macro-list.xml:49
-#: admin/systems/asterisk/class_phoneGeneric.inc:484
-#: admin/conference/generic.tpl.c:29 admin/macro/generic.tpl.c:17
-#: admin/systems/asterisk/phone.tpl.c:8
-msgid "Description"
-msgstr ""
-
-#: admin/conference/conf-list.xml:57 admin/macro/macro-list.xml:57
-msgid "Actions"
-msgstr ""
-
-#: admin/conference/conf-list.xml:68 admin/macro/macro-list.xml:68
-msgid "Create"
-msgstr ""
-
-#: admin/conference/conf-list.xml:86 admin/conference/conf-list.xml:125
-#: admin/macro/macro-list.xml:86 admin/macro/macro-list.xml:125
-msgid "Edit"
-msgstr ""
-
-#: admin/conference/conf-list.xml:93 admin/conference/conf-list.xml:138
-#: admin/macro/macro-list.xml:93 admin/macro/macro-list.xml:138
-msgid "Remove"
-msgstr ""
-
-#: admin/conference/class_phoneConferenceGeneric.inc:233
-#, php-format
-msgid "Cannot delete entry from server '%s' because it seems to be removed!"
-msgstr ""
-
-#: admin/conference/class_phoneConferenceGeneric.inc:308
-#, php-format
-msgid ""
-"The previously selected asterisk home server '%s' is no longer available!"
-msgstr ""
-
-#: admin/conference/class_phoneConferenceGeneric.inc:315
-#: admin/conference/generic.tpl.c:47
-msgid "PIN"
-msgstr ""
-
-#: admin/conference/class_phoneConferenceGeneric.inc:333
-#: admin/conference/class_phoneConferenceGeneric.inc:719
-msgid "Lifetime"
-msgstr ""
-
-#: admin/conference/class_phoneConferenceGeneric.inc:399
-#: personal/phoneaccount/class_phoneAccount.inc:346
-#: personal/phoneaccount/class_phoneAccount.inc:359
-#: personal/phoneaccount/class_phoneAccount.inc:617
-#: personal/phoneaccount/class_phoneAccount.inc:656
-#: personal/phoneaccount/class_phoneAccount.inc:1519
-#: personal/phoneaccount/class_phoneAccount.inc:1695
-#: admin/conference/remove.tpl.c:2 admin/macro/remove.tpl.c:2
-msgid "Warning"
-msgstr ""
-
-#: admin/conference/class_phoneConferenceGeneric.inc:400
-#, php-format
-msgid ""
-"FusionDirectory identified problems with your MySQL table definition, please"
-" activate debugging for details."
-msgstr ""
-
-#: admin/conference/class_phoneConferenceGeneric.inc:606
-#: admin/conference/class_phoneConferenceGeneric.inc:608
-#, php-format
-msgid "'%s' is already assigned to '%s'!"
-msgstr ""
-
-#: admin/conference/class_phoneConferenceGeneric.inc:693
-msgid "Phone Conference"
-msgstr ""
-
-#: admin/conference/class_phoneConferenceGeneric.inc:694
-msgid "Phone conference management"
-msgstr ""
-
-#: admin/conference/class_phoneConferenceGeneric.inc:696
-msgid "GOfon conference"
-msgstr ""
-
-#: admin/conference/class_phoneConferenceGeneric.inc:698
-msgid "Asterisk conference"
-msgstr ""
-
-#: admin/conference/class_phoneConferenceGeneric.inc:703
-#: admin/macro/class_gofonMacro.inc:546
-#: admin/systems/asterisk/class_phoneGeneric.inc:483
-#: admin/conference/generic.tpl.c:17 admin/macro/generic.tpl.c:14
-#: admin/systems/asterisk/phone.tpl.c:5
-msgid "Base"
-msgstr ""
-
-#: admin/conference/class_phoneConferenceGeneric.inc:705
-msgid "Conference PIN"
-msgstr ""
-
-#: admin/conference/class_phoneConferenceGeneric.inc:710
-#: admin/conference/generic.tpl.c:44
-msgid "Preset PIN"
-msgstr ""
-
-#: admin/conference/class_phoneConferenceGeneric.inc:711
-#: admin/conference/generic.tpl.c:50
-msgid "Record conference"
-msgstr ""
-
-#: admin/conference/class_phoneConferenceGeneric.inc:712
-#: admin/conference/generic.tpl.c:59
-msgid "Play music on hold"
-msgstr ""
-
-#: admin/conference/class_phoneConferenceGeneric.inc:713
-msgid "Activate menu"
-msgstr ""
-
-#: admin/conference/class_phoneConferenceGeneric.inc:714
-msgid "Announce user activity"
-msgstr ""
-
-#: admin/conference/class_phoneConferenceGeneric.inc:715
-msgid "Count user"
-msgstr ""
-
-#: admin/conference/class_phoneConferenceGeneric.inc:716
-msgid "Conference type"
-msgstr ""
-
-#: admin/conference/class_phoneConferenceGeneric.inc:718
-msgid "Format"
-msgstr ""
-
-#: admin/conference/class_phoneConferenceGeneric.inc:720
-#: personal/phoneaccount/class_phoneAccount.inc:1666
-msgid "Telephone number"
-msgstr ""
-
-#: admin/conference/class_phoneConferenceGeneric.inc:721
-msgid "Owner"
-msgstr ""
-
-#: admin/conference/class_phoneConferenceManagment.inc:36
-msgid "Phone Conferences"
-msgstr ""
-
-#: admin/conference/class_phoneConferenceManagment.inc:37
-msgid "Phone Conference management"
-msgstr ""
-
-#: admin/macro/class_gofonMacro.inc:202
-#, php-format
-msgid ""
-"Macro could not be removed from server '%s', please check database "
-"consistency!"
-msgstr ""
-
-#: admin/macro/class_gofonMacro.inc:264
-#, php-format
-msgid "Application missing in line %s!"
-msgstr ""
-
-#: admin/macro/class_gofonMacro.inc:267
-#, php-format
-msgid "Priority missing in line %s!"
-msgstr ""
-
-#: admin/macro/class_gofonMacro.inc:271
-#, php-format
-msgid "Extension missing in line %s!"
-msgstr ""
-
-#: admin/macro/class_gofonMacro.inc:281
-#, php-format
-msgid "Duplicate combination of 'extension' and 'priority' in line %s!"
-msgstr ""
-
-#: admin/macro/class_gofonMacro.inc:317
-#, php-format
-msgid ""
-"Macro could not be added to server '%s', please check database consistency!"
-msgstr ""
-
-#: admin/macro/class_gofonMacro.inc:410
-msgid "Name can be 20 characters at maximum!"
-msgstr ""
-
-#: admin/macro/class_gofonMacro.inc:419
-msgid "Macro is still in use!"
-msgstr ""
-
-#: admin/macro/class_gofonMacro.inc:426
-msgid "Macro is empty!"
-msgstr ""
-
-#: admin/macro/class_gofonMacro.inc:452
-#: admin/systems/asterisk/class_phoneGeneric.inc:267
-#, php-format
-msgid "Cannot delete entry because it is still in use by '%s'!"
-msgstr ""
-
-#: admin/macro/class_gofonMacro.inc:465
-#: addons/fonreports/class_fonreport.inc:190
-#: personal/phoneaccount/class_phoneAccount.inc:455
-#: personal/phoneaccount/class_phoneAccount.inc:1061
-#: personal/phoneaccount/class_phoneAccount.inc:1567
-msgid "Configuration error"
-msgstr ""
-
-#: admin/macro/class_gofonMacro.inc:536 admin/macro/class_gofonMacro.inc:541
-msgid "Asterisk macro"
-msgstr ""
-
-#: admin/macro/class_gofonMacro.inc:537
-msgid "Asterisk macro management"
-msgstr ""
-
-#: admin/macro/class_gofonMacro.inc:539
-msgid "GOfon macro"
-msgstr ""
-
-#: admin/macro/class_gofonMacro.inc:545 admin/macro/generic.tpl.c:2
-#: admin/macro/generic.tpl.c:5 admin/macro/paste_generic.tpl.c:2
-#: admin/macro/paste_generic.tpl.c:5
-msgid "Macro name"
-msgstr ""
-
-#: admin/macro/class_gofonMacro.inc:548 admin/macro/generic.tpl.c:8
-msgid "Display name"
-msgstr ""
-
-#: admin/macro/class_gofonMacro.inc:549
-msgid "Macro content and parameter"
-msgstr ""
-
-#: admin/macro/class_gofonMacro.inc:550
-msgid "Visibility flag"
-msgstr ""
-
-#: admin/macro/class_gofonMacroManagement.inc:36
-msgid "Phone Macros"
-msgstr ""
-
-#: admin/macro/class_gofonMacroManagement.inc:37
-msgid "Phone Macros management"
-msgstr ""
-
-#: admin/macro/macro-list.xml:11
-msgid "List of macros"
-msgstr ""
-
-#: admin/macro/macro-list.xml:15 admin/macro/macro-list.xml:74
-msgid "Macro"
-msgstr ""
-
-#: admin/macro/class_gofonMacroParameters.inc:58
-msgid "Parameter"
-msgstr ""
-
-#: admin/macro/class_gofonMacroParameters.inc:59
-msgid "Asterisk macro parameter"
-msgstr ""
-
-#: admin/macro/class_gofonMacroParameters.inc:234
-#: personal/phoneaccount/generic.tpl.c:35
-msgid "Phone macro"
-msgstr ""
-
-#: admin/macro/class_gofonMacroParameters.inc:290
-msgid "String"
-msgstr ""
-
-#: admin/macro/class_gofonMacroParameters.inc:291
-msgid "Combobox"
-msgstr ""
-
-#: admin/macro/class_gofonMacroParameters.inc:292
-msgid "Bool"
-msgstr ""
-
-#: admin/macro/class_gofonMacroParameters.inc:298
-msgid "Delete unused"
-msgstr ""
-
-#: admin/macro/class_gofonMacroParameters.inc:374
-#, php-format
-msgid "Parameter %s contains invalid character. '!,#' is used as delimiter!"
-msgstr ""
-
-#: admin/macro/class_gofonMacroParameters.inc:379
-#, php-format
-msgid "Parameter %s is invalid!"
-msgstr ""
-
-#: admin/macro/class_gofonMacroParameters.inc:408
-#: personal/phoneaccount/class_phoneAccount.inc:1600
-msgid "Information"
-msgstr ""
-
-#: admin/macro/class_gofonMacroParameters.inc:408
-msgid ""
-"Number of parameters for this macro has changed. Please update all users "
-"using it!"
-msgstr ""
-
-#: admin/systems/asterisk/class_phoneGeneric.inc:151
-msgid "phone"
-msgstr ""
-
-#: admin/systems/asterisk/class_phoneGeneric.inc:230
-msgid "yes"
-msgstr ""
-
-#: admin/systems/asterisk/class_phoneGeneric.inc:230
-msgid "no"
-msgstr ""
-
-#: admin/systems/asterisk/class_phoneGeneric.inc:247
-msgid "dynamic"
-msgstr ""
-
-#: admin/systems/asterisk/class_phoneGeneric.inc:247
-msgid "Networksettings"
-msgstr ""
-
-#: admin/systems/asterisk/class_phoneGeneric.inc:330
-#: admin/systems/asterisk/class_phoneGeneric.inc:333
-msgid "IP address"
-msgstr ""
-
-#: admin/systems/asterisk/class_phoneGeneric.inc:473
-msgid "Phone information"
-msgstr ""
-
-#: admin/systems/asterisk/class_phoneGeneric.inc:476
-#: personal/phoneaccount/class_phoneAccount.inc:1668
-msgid "Phone hardware"
-msgstr ""
-
-#: admin/systems/asterisk/class_phoneGeneric.inc:485
-msgid "SIP Mode"
-msgstr ""
-
-#: admin/systems/asterisk/class_phoneGeneric.inc:486
-msgid "SIP DTMF mode"
-msgstr ""
-
-#: admin/systems/asterisk/class_phoneGeneric.inc:487
-msgid "SIP Default ip"
-msgstr ""
-
-#: admin/systems/asterisk/class_phoneGeneric.inc:488
-msgid "SIP Qualify"
-msgstr ""
-
-#: admin/systems/asterisk/class_phoneGeneric.inc:489
-msgid "IAX authentication type"
-msgstr ""
-
-#: admin/systems/asterisk/class_phoneGeneric.inc:490
-msgid "IAX secret"
-msgstr ""
-
-#: admin/systems/asterisk/class_phoneGeneric.inc:491
-msgid "IAX account code"
-msgstr ""
-
-#: admin/systems/asterisk/class_phoneGeneric.inc:492
-msgid "IAX trunk lines"
-msgstr ""
-
-#: admin/systems/asterisk/class_phoneGeneric.inc:493
-msgid "IAX permit settings"
-msgstr ""
-
-#: admin/systems/asterisk/class_phoneGeneric.inc:494
-msgid "IAX deny settings"
-msgstr ""
-
-#: admin/systems/asterisk/class_phoneGeneric.inc:495
-msgid "CAPI MSN"
-msgstr ""
-
-#: admin/systems/asterisk/class_phoneGeneric.inc:496
-msgid "Hardware type"
-msgstr ""
-
-#: admin/systems/services/asterisk/class_serviceAsterisk.inc:35
-msgid "VoIP database information"
-msgstr ""
-
-#: admin/systems/services/asterisk/class_serviceAsterisk.inc:38
-msgid "Asterisk DB user"
-msgstr ""
-
-#: admin/systems/services/asterisk/class_serviceAsterisk.inc:38
-msgid "Login for asterisk database administrator"
-msgstr ""
-
-#: admin/systems/services/asterisk/class_serviceAsterisk.inc:42
-msgid "Password"
-msgstr ""
-
-#: admin/systems/services/asterisk/class_serviceAsterisk.inc:42
-msgid "Password for asterisk database administrator"
-msgstr ""
-
-#: admin/systems/services/asterisk/class_serviceAsterisk.inc:46
-msgid "Country dial prefix"
-msgstr ""
-
-#: admin/systems/services/asterisk/class_serviceAsterisk.inc:50
-msgid "Local dial prefix"
-msgstr ""
-
-#: admin/systems/services/asterisk/class_serviceAsterisk.inc:54
-msgid "Driver"
-msgstr ""
-
-#: admin/systems/services/asterisk/class_serviceAsterisk.inc:54
-msgid "Driver to use to contact this database."
-msgstr ""
-
-#: admin/systems/services/asterisk/class_serviceAsterisk.inc:95
-#, php-format
-msgid ""
-"You can't remove the asterisk database extension, it is still in use by "
-"these objects '%s'."
-msgstr ""
-
-#: admin/systems/services/asterisk/class_serviceAsterisk.inc:140
-msgid "VoIP service (asterisk)"
-msgstr ""
-
-#: admin/systems/services/asterisk/class_serviceAsterisk.inc:141
-msgid "VoIP - asterisk management"
-msgstr ""
-
-#: admin/systems/services/asterisk/class_serviceAsterisk.inc:141
-msgid "Services"
-msgstr ""
-
-#: addons/fonreports/class_fonreport.inc:232
-msgid "Insufficient permissions"
-msgstr ""
-
-#: addons/fonreports/class_fonreport.inc:251
-msgid "Y-M-D"
-msgstr ""
-
-#: addons/fonreports/class_fonreport.inc:418
-#: addons/fonreports/class_fonreport.inc:419
-#: addons/fonreports/class_fonreport.inc:424 addons/fonreports/main.inc:46
-msgid "Phone reports"
-msgstr ""
-
-#: addons/fonreports/class_fonreport.inc:419
-msgid "All entries are readonly"
-msgstr ""
-
-#: addons/fonreports/class_fonreport.inc:428
-#: addons/fonreports/contents.tpl.c:32
-msgid "Date"
-msgstr ""
-
-#: addons/fonreports/class_fonreport.inc:429
-#: addons/fonreports/contents.tpl.c:35
-msgid "Source"
-msgstr ""
-
-#: addons/fonreports/class_fonreport.inc:430
-#: addons/fonreports/contents.tpl.c:38
-msgid "Destination"
-msgstr ""
-
-#: addons/fonreports/class_fonreport.inc:431
-#: addons/fonreports/contents.tpl.c:41
-msgid "Channel"
-msgstr ""
-
-#: addons/fonreports/class_fonreport.inc:432
-msgid "Application called"
-msgstr ""
-
-#: addons/fonreports/class_fonreport.inc:433
-msgid "Disposition"
-msgstr ""
-
-#: addons/fonreports/class_fonreport.inc:434
-#: addons/fonreports/contents.tpl.c:50
-msgid "Duration"
-msgstr ""
-
-#: personal/phoneaccount/class_phoneAccount.inc:176
-msgid "automatic"
-msgstr ""
-
-#: personal/phoneaccount/class_phoneAccount.inc:212
-msgid "no macro"
-msgstr ""
-
-#: personal/phoneaccount/class_phoneAccount.inc:240
-msgid "undefined"
-msgstr ""
-
-#: personal/phoneaccount/class_phoneAccount.inc:359
-#, php-format
-msgid ""
-"Cannot identify telephone extension in database, please try to save again."
-msgstr ""
-
-#: personal/phoneaccount/class_phoneAccount.inc:577
-#: personal/phoneaccount/class_phoneAccount.inc:595
-msgid "Abort saving entries to keep the database consistent."
+#: admin/systems/asterisk/class_phoneIAX.inc:30
+#: admin/systems/asterisk/class_phoneIAX.inc:34
+#: personal/asterisk/class_asteriskAccount.inc:45
+msgid "Phone"
 msgstr ""
 
-#: personal/phoneaccount/class_phoneAccount.inc:618
-#: personal/phoneaccount/class_phoneAccount.inc:657
-#: personal/phoneaccount/class_phoneAccount.inc:1520
-#, php-format
-msgid ""
-"FusionDirectory identified problems with your database table definition!"
+#: admin/systems/asterisk/class_phoneIAX.inc:31
+msgid "Asterisk phone"
 msgstr ""
 
-#: personal/phoneaccount/class_phoneAccount.inc:1023
-msgid "Remove phone account"
+#: admin/systems/asterisk/class_phoneIAX.inc:33
+msgid "Phone hardware"
 msgstr ""
 
-#: personal/phoneaccount/class_phoneAccount.inc:1027
-#: personal/phoneaccount/class_phoneAccount.inc:1030
-msgid "Create phone account"
+#: admin/systems/asterisk/class_phoneIAX.inc:46
+#: personal/asterisk/class_asteriskAccount.inc:42
+msgid "Telephone"
 msgstr ""
 
-#: personal/phoneaccount/class_phoneAccount.inc:1028
-msgid "User uid"
+#: admin/systems/asterisk/class_phoneIAX.inc:49
+msgid "Name"
 msgstr ""
 
-#: personal/phoneaccount/class_phoneAccount.inc:1046
-msgid "Selected macro is not available anymore!"
+#: admin/systems/asterisk/class_phoneIAX.inc:49
+msgid "Name of this phone"
 msgstr ""
 
-#: personal/phoneaccount/class_phoneAccount.inc:1221
-msgid "Choose your private phone"
+#: admin/systems/asterisk/class_phoneIAX.inc:53
+msgid "Account name"
 msgstr ""
 
-#: personal/phoneaccount/class_phoneAccount.inc:1346
-msgid ""
-"There must be at least one server with an asterisk database to create a "
-"phone account."
+#: admin/systems/asterisk/class_phoneIAX.inc:53
+msgid "Name of the account"
 msgstr ""
 
-#: personal/phoneaccount/class_phoneAccount.inc:1354
-#: personal/phoneaccount/class_phoneAccount.inc:1357
-#: personal/phoneaccount/generic.tpl.c:29
-#: personal/phoneaccount/paste_generic.tpl.c:11
-msgid "Voicemail PIN"
+#: admin/systems/services/asterisk/class_serviceAsterisk.inc:35
+msgid "VoIP database information"
 msgstr ""
 
-#: personal/phoneaccount/class_phoneAccount.inc:1354
-msgid "Between 1-4 charactes"
+#: admin/systems/services/asterisk/class_serviceAsterisk.inc:38
+msgid "Asterisk DB user"
 msgstr ""
 
-#: personal/phoneaccount/class_phoneAccount.inc:1362
-#: personal/phoneaccount/generic.tpl.c:32
-#: personal/phoneaccount/paste_generic.tpl.c:14
-msgid "Phone PIN"
+#: admin/systems/services/asterisk/class_serviceAsterisk.inc:38
+msgid "Login for asterisk database administrator"
 msgstr ""
 
-#: personal/phoneaccount/class_phoneAccount.inc:1394
-#: admin/conference/generic.tpl.c:38 admin/conference/paste_generic.tpl.c:8
-msgid "Phone number"
+#: admin/systems/services/asterisk/class_serviceAsterisk.inc:42
+msgid "Password"
 msgstr ""
 
-#: personal/phoneaccount/class_phoneAccount.inc:1402
-#, php-format
-msgid "macro parameter %s"
+#: admin/systems/services/asterisk/class_serviceAsterisk.inc:42
+msgid "Password for asterisk database administrator"
 msgstr ""
 
-#: personal/phoneaccount/class_phoneAccount.inc:1450
-msgid "An error occured while updating the database entries!"
+#: admin/systems/services/asterisk/class_serviceAsterisk.inc:46
+msgid "Country dial prefix"
 msgstr ""
 
-#: personal/phoneaccount/class_phoneAccount.inc:1567
-msgid "Was not able to found any asterisk server"
+#: admin/systems/services/asterisk/class_serviceAsterisk.inc:50
+msgid "Local dial prefix"
 msgstr ""
 
-#: personal/phoneaccount/class_phoneAccount.inc:1600
-#, php-format
-msgid "User '%s' has been removed from phone queue '%s'."
+#: admin/systems/services/asterisk/class_serviceAsterisk.inc:54
+msgid "Driver"
 msgstr ""
 
-#: personal/phoneaccount/class_phoneAccount.inc:1637
-#: personal/phoneaccount/class_phoneAccount.inc:1639
-#, php-format
-msgid "The specified telephonenumber '%s' is already assigned to '%s'."
+#: admin/systems/services/asterisk/class_serviceAsterisk.inc:54
+msgid "Driver to use to contact this database."
 msgstr ""
 
-#: personal/phoneaccount/class_phoneAccount.inc:1649
+#: admin/systems/services/asterisk/class_serviceAsterisk.inc:95
 #, php-format
 msgid ""
-"The previously selected asterisk home server (%s) is no longer available. "
-"Remove aborted."
-msgstr ""
-
-#: personal/phoneaccount/class_phoneAccount.inc:1658
-msgid "Phone account settings"
-msgstr ""
-
-#: personal/phoneaccount/class_phoneAccount.inc:1667
-msgid "Macro settings"
-msgstr ""
-
-#: personal/phoneaccount/class_phoneAccount.inc:1670
-msgid "Phone context"
+"You can't remove the asterisk database extension, it is still in use by "
+"these objects '%s'."
 msgstr ""
 
-#: personal/phoneaccount/class_phoneAccount.inc:1671
-msgid "Voice mail context"
+#: admin/systems/services/asterisk/class_serviceAsterisk.inc:121
+msgid "LDAP error"
 msgstr ""
 
-#: personal/phoneaccount/class_phoneAccount.inc:1672
-msgid "Telephone pin"
+#: admin/systems/services/asterisk/class_serviceAsterisk.inc:140
+msgid "VoIP service (asterisk)"
 msgstr ""
 
-#: personal/phoneaccount/class_phoneAccount.inc:1673
-msgid "Voicemail pin"
+#: admin/systems/services/asterisk/class_serviceAsterisk.inc:141
+msgid "VoIP - asterisk management"
 msgstr ""
 
-#: personal/phoneaccount/class_phoneAccount.inc:1695
-#, php-format
-msgid "You need to configure %s contexts first"
+#: admin/systems/services/asterisk/class_serviceAsterisk.inc:141
+msgid "Services"
 msgstr ""
 
-#: personal/phoneaccount/main.inc:124
-msgid "Click the 'Edit' button below to change informations in this dialog"
+#: personal/asterisk/class_asteriskAccount.inc:30
+#: config/asterisk/class_asteriskPluginConfig.inc:28
+#: config/asterisk/class_asteriskPluginConfig.inc:41
+msgid "Asterisk"
 msgstr ""
 
-#: personal/phoneaccount/main.inc:134
-#: personal/phoneaccount/paste_generic.tpl.c:2
-msgid "Phone settings"
+#: personal/asterisk/class_asteriskAccount.inc:31
+msgid "Asterisk account"
 msgstr ""
 
-#: config/asterisk/class_asteriskPluginConfig.inc:28
-#: config/asterisk/class_asteriskPluginConfig.inc:41
-msgid "Asterisk"
+#: personal/asterisk/class_asteriskAccount.inc:45
+msgid "Select the phone associated to this user"
 msgstr ""
 
 #: config/asterisk/class_asteriskPluginConfig.inc:29
@@ -1010,338 +172,3 @@ msgstr ""
 #: config/asterisk/class_asteriskPluginConfig.inc:72
 msgid "Available voicemail contexts"
 msgstr ""
-
-#: admin/ogroups/asterisk/phonequeue.tpl.c:2
-msgid ""
-"Only users with the same asterisk home server will be included to this "
-"queue."
-msgstr ""
-
-#: admin/ogroups/asterisk/phonequeue.tpl.c:5
-#: personal/phoneaccount/generic.tpl.c:2
-#: personal/phoneaccount/paste_generic.tpl.c:5
-msgid "Phone numbers"
-msgstr ""
-
-#: admin/ogroups/asterisk/phonequeue.tpl.c:8
-msgid "Up"
-msgstr ""
-
-#: admin/ogroups/asterisk/phonequeue.tpl.c:11
-msgid "Down"
-msgstr ""
-
-#: admin/ogroups/asterisk/phonequeue.tpl.c:14
-#: admin/conference/generic.tpl.c:41
-msgid "Options"
-msgstr ""
-
-#: admin/ogroups/asterisk/phonequeue.tpl.c:29
-msgid "Strategy"
-msgstr ""
-
-#: admin/ogroups/asterisk/phonequeue.tpl.c:38
-msgid "(in seconds)"
-msgstr ""
-
-#: admin/ogroups/asterisk/phonequeue.tpl.c:41
-msgid "Queue sound setup"
-msgstr ""
-
-#: admin/ogroups/asterisk/phonequeue.tpl.c:44
-msgid "Use music on hold instead of ringing"
-msgstr ""
-
-#: admin/ogroups/asterisk/phonequeue.tpl.c:50
-msgid "Welcome sound file"
-msgstr ""
-
-#: admin/ogroups/asterisk/phonequeue.tpl.c:53
-msgid "Announce message"
-msgstr ""
-
-#: admin/ogroups/asterisk/phonequeue.tpl.c:56
-msgid "Sound file for 'You are next ...'"
-msgstr ""
-
-#: admin/ogroups/asterisk/phonequeue.tpl.c:59
-msgid "'There are ...'"
-msgstr ""
-
-#: admin/ogroups/asterisk/phonequeue.tpl.c:62
-msgid "'... calls waiting'"
-msgstr ""
-
-#: admin/ogroups/asterisk/phonequeue.tpl.c:65
-msgid "'Thank you' message"
-msgstr ""
-
-#: admin/ogroups/asterisk/phonequeue.tpl.c:68
-msgid "'minutes' sound file"
-msgstr ""
-
-#: admin/ogroups/asterisk/phonequeue.tpl.c:71
-msgid "'seconds' sound file"
-msgstr ""
-
-#: admin/ogroups/asterisk/phonequeue.tpl.c:74
-msgid "Hold sound file"
-msgstr ""
-
-#: admin/ogroups/asterisk/phonequeue.tpl.c:77
-msgid "Less Than sound file"
-msgstr ""
-
-#: admin/ogroups/asterisk/phonequeue.tpl.c:80
-msgid "Phone attributes "
-msgstr ""
-
-#: admin/conference/conf-filter.tpl.c:2 admin/macro/macro-filter.tpl.c:2
-#: addons/fonreports/contents.tpl.c:2
-msgid "Filter"
-msgstr ""
-
-#: admin/conference/generic.tpl.c:2
-msgid "Properties"
-msgstr ""
-
-#: admin/conference/generic.tpl.c:5 admin/conference/paste_generic.tpl.c:2
-msgid "Conference name"
-msgstr ""
-
-#: admin/conference/generic.tpl.c:8 admin/conference/paste_generic.tpl.c:5
-msgid "Name of conference to create"
-msgstr ""
-
-#: admin/conference/generic.tpl.c:11
-msgid "Type"
-msgstr ""
-
-#: admin/conference/generic.tpl.c:14
-msgid "Choose subtree to place conference in"
-msgstr ""
-
-#: admin/conference/generic.tpl.c:26
-msgid "Select language"
-msgstr ""
-
-#: admin/conference/generic.tpl.c:32
-msgid "Descriptive text for department"
-msgstr ""
-
-#: admin/conference/generic.tpl.c:35
-msgid "Lifetime (in days)"
-msgstr ""
-
-#: admin/conference/generic.tpl.c:53
-msgid "Sound file format"
-msgstr ""
-
-#: admin/conference/generic.tpl.c:56
-msgid "Choose subtree to place department in"
-msgstr ""
-
-#: admin/conference/generic.tpl.c:62
-msgid "Activate session menu"
-msgstr ""
-
-#: admin/conference/generic.tpl.c:65
-msgid "Announce users joining or leaving the conference"
-msgstr ""
-
-#: admin/conference/generic.tpl.c:68
-msgid "Count users"
-msgstr ""
-
-#: admin/conference/remove.tpl.c:5 admin/macro/remove.tpl.c:5
-msgid ""
-"Please double check if you really want to do this since there is no way for "
-"FusionDirectory to get your data back."
-msgstr ""
-
-#: admin/conference/remove.tpl.c:8 admin/macro/remove.tpl.c:8
-msgid "So - if you're sure - press 'Delete' to continue or 'Cancel' to abort."
-msgstr ""
-
-#: admin/macro/generic.tpl.c:11
-msgid "Macro name to be displayed"
-msgstr ""
-
-#: admin/macro/generic.tpl.c:20
-msgid "Visible for user"
-msgstr ""
-
-#: admin/macro/generic.tpl.c:23
-msgid "Macro text"
-msgstr ""
-
-#: admin/macro/parameter.tpl.c:2
-msgid "Argument"
-msgstr ""
-
-#: admin/macro/parameter.tpl.c:8
-msgid "type"
-msgstr ""
-
-#: admin/macro/parameter.tpl.c:11
-msgid "Default value"
-msgstr ""
-
-#: admin/macro/parameter.tpl.c:14
-msgid "You are not allowed to view the macro parameter settings"
-msgstr ""
-
-#: admin/systems/asterisk/phonesettings.tpl.c:2
-msgid "Advanced phone settings"
-msgstr ""
-
-#: admin/systems/asterisk/phonesettings.tpl.c:5
-msgid "Phone type"
-msgstr ""
-
-#: admin/systems/asterisk/phonesettings.tpl.c:8
-#: admin/systems/asterisk/phonesettings.tpl.c:14
-#: admin/systems/asterisk/phonesettings.tpl.c:20
-#: admin/systems/asterisk/phonesettings.tpl.c:26
-#: admin/systems/asterisk/phonesettings.tpl.c:35
-#: admin/systems/asterisk/phonesettings.tpl.c:47
-#: admin/systems/asterisk/phonesettings.tpl.c:65
-msgid "Choose a phone type"
-msgstr ""
-
-#: admin/systems/asterisk/phonesettings.tpl.c:11
-msgid "Mode"
-msgstr ""
-
-#: admin/systems/asterisk/phonesettings.tpl.c:17
-msgid "DTMF mode"
-msgstr ""
-
-#: admin/systems/asterisk/phonesettings.tpl.c:23
-#: admin/systems/asterisk/phonesettings.tpl.c:38
-msgid "Default IP"
-msgstr ""
-
-#: admin/systems/asterisk/phonesettings.tpl.c:29
-#: admin/systems/asterisk/phonesettings.tpl.c:41
-msgid "Response timeout"
-msgstr ""
-
-#: admin/systems/asterisk/phonesettings.tpl.c:32
-msgid "Modus"
-msgstr ""
-
-#: admin/systems/asterisk/phonesettings.tpl.c:44
-msgid "Authtype"
-msgstr ""
-
-#: admin/systems/asterisk/phonesettings.tpl.c:50
-msgid "Secret"
-msgstr ""
-
-#: admin/systems/asterisk/phonesettings.tpl.c:53
-msgid "GoFonInkeys"
-msgstr ""
-
-#: admin/systems/asterisk/phonesettings.tpl.c:56
-msgid "GoFonOutKeys"
-msgstr ""
-
-#: admin/systems/asterisk/phonesettings.tpl.c:59
-msgid "Account code"
-msgstr ""
-
-#: admin/systems/asterisk/phonesettings.tpl.c:62
-msgid "Trunk lines"
-msgstr ""
-
-#: admin/systems/asterisk/phonesettings.tpl.c:68
-msgid "Hosts that are allowed to connect"
-msgstr ""
-
-#: admin/systems/asterisk/phonesettings.tpl.c:71
-#: admin/systems/asterisk/phonesettings.tpl.c:77
-msgid "List of alternative mail addresses"
-msgstr ""
-
-#: admin/systems/asterisk/phonesettings.tpl.c:74
-msgid "Hosts that are not allowed to connect"
-msgstr ""
-
-#: admin/systems/asterisk/phonesettings.tpl.c:80
-msgid "MSN"
-msgstr ""
-
-#: admin/systems/asterisk/phone.tpl.c:2
-msgid "Phone name"
-msgstr ""
-
-#: addons/fonreports/contents.tpl.c:5
-msgid "Search for"
-msgstr ""
-
-#: addons/fonreports/contents.tpl.c:8
-msgid "Enter user name to search for"
-msgstr ""
-
-#: addons/fonreports/contents.tpl.c:11 addons/fonreports/contents.tpl.c:26
-msgid "in"
-msgstr ""
-
-#: addons/fonreports/contents.tpl.c:14
-msgid "Select subtree to base search on"
-msgstr ""
-
-#: addons/fonreports/contents.tpl.c:17
-msgid "on"
-msgstr ""
-
-#: addons/fonreports/contents.tpl.c:20
-msgid "Select server to search on"
-msgstr ""
-
-#: addons/fonreports/contents.tpl.c:23
-msgid "during"
-msgstr ""
-
-#: addons/fonreports/contents.tpl.c:29
-msgid "Search"
-msgstr ""
-
-#: addons/fonreports/contents.tpl.c:44
-msgid "Application"
-msgstr ""
-
-#: addons/fonreports/contents.tpl.c:47
-msgid "Status"
-msgstr ""
-
-#: addons/fonreports/contents.tpl.c:53
-msgid "Search returned no results..."
-msgstr ""
-
-#: personal/phoneaccount/generic.tpl.c:5
-#: personal/phoneaccount/paste_generic.tpl.c:8
-msgid "Telephone hardware"
-msgstr ""
-
-#: personal/phoneaccount/generic.tpl.c:8
-msgid "Telephone"
-msgstr ""
-
-#: personal/phoneaccount/generic.tpl.c:14
-msgid "Select the accounts home server"
-msgstr ""
-
-#: personal/phoneaccount/generic.tpl.c:17
-msgid "Context"
-msgstr ""
-
-#: personal/phoneaccount/generic.tpl.c:20
-#: personal/phoneaccount/generic.tpl.c:26
-msgid "Select the accounts context"
-msgstr ""
-
-#: personal/phoneaccount/generic.tpl.c:23
-msgid "Voicemail context"
-msgstr ""
diff --git a/asterisk/locale/it/fusiondirectory.po b/asterisk/locale/it/fusiondirectory.po
index 03214f9e6492ede3a32dc38b8d1b64796dd3cd68..b32a42dad2c6d55bc345eacfc46320aa75f6fac6 100644
--- a/asterisk/locale/it/fusiondirectory.po
+++ b/asterisk/locale/it/fusiondirectory.po
@@ -3,711 +3,55 @@
 # This file is distributed under the same license as the PACKAGE package.
 # 
 # Translators:
-# Alessandro Amici <a.amici@bopen.it>, 2005
-# poterealpopolo <giuliano@opensides.be>, 2011
-# poterealpopolo <giuliano@opensides.be>, 2013
-# poterealpopolo <giuliano@opensides.be>, 2012
-# poterealpopolo <giuliano@opensides.be>, 2011-2013
 msgid ""
 msgstr ""
-"Project-Id-Version: FusionDirectory-108\n"
+"Project-Id-Version: FusionDirectory-109\n"
 "Report-Msgid-Bugs-To: documentation@lists.fusiondirectory.org\n"
-"POT-Creation-Date: 2015-03-31 11:49+0200\n"
-"PO-Revision-Date: 2015-03-31 11:41+0000\n"
+"POT-Creation-Date: 2014-12-15 17:47+0100\n"
+"PO-Revision-Date: 2015-02-25 16:13+0000\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>\n"
-"Language-Team: Italian (http://www.transifex.com/projects/p/FusionDirectory-108/language/it/)\n"
+"Language-Team: Italian (http://www.transifex.com/projects/p/FusionDirectory-109/language/it/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Language: it\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: admin/ogroups/asterisk/class_phonequeue.inc:110
-#: admin/conference/class_phoneConferenceGeneric.inc:104
-#: personal/phoneaccount/class_phoneAccount.inc:148
-msgid "Obsolete entry"
-msgstr "Entry obsoleta"
-
-#: admin/ogroups/asterisk/class_phonequeue.inc:110
-#: admin/conference/class_phoneConferenceGeneric.inc:104
-#: personal/phoneaccount/class_phoneAccount.inc:148
-#, php-format
-msgid ""
-"The current home server is not available anymore. It will be moved to '%s' "
-"if you save this entry!"
-msgstr "L'attuale server principale non Ã¨ piÃ¹ disponibile. VerrÃ  spostato verso '%s' se registri."
-
-#: admin/ogroups/asterisk/class_phonequeue.inc:140
-msgid "ring all"
-msgstr "chiama tutti i membri disponibili"
-
-#: admin/ogroups/asterisk/class_phonequeue.inc:141
-msgid "round robin"
-msgstr "chiama un membro alla volta"
-
-#: admin/ogroups/asterisk/class_phonequeue.inc:142
-msgid "least recently called"
-msgstr "imeno chiamati recentemente"
-
-#: admin/ogroups/asterisk/class_phonequeue.inc:143
-msgid "fewest completed calls"
-msgstr "minor numero di chiamate completate"
-
-#: admin/ogroups/asterisk/class_phonequeue.inc:144
-msgid "random"
-msgstr "chiama i membri in ordine casuale"
-
-#: admin/ogroups/asterisk/class_phonequeue.inc:145
-msgid "round robin with memory"
-msgstr "gli uni dopo gli altri con registrazione dell'ultimo"
-
-#: admin/ogroups/asterisk/class_phonequeue.inc:180
-msgid "Remove the phone queue from this Account"
-msgstr "Rimuovi la coda telefonica di questo Account"
-
-#: admin/ogroups/asterisk/class_phonequeue.inc:181
-#: admin/ogroups/asterisk/class_phonequeue.inc:184
-msgid "phone queue"
-msgstr "Coda telefonica"
-
-#: admin/ogroups/asterisk/class_phonequeue.inc:183
-msgid "Create phone queue"
-msgstr "Crea una coda telefonica"
-
-#: admin/ogroups/asterisk/class_phonequeue.inc:272
-msgid ""
-"There must be at least one server with an asterisk database to create a "
-"phone queue."
-msgstr "Ci deve essere almeno un server con un database asterisk per poter creare una coda telefonica."
-
-#: admin/ogroups/asterisk/class_phonequeue.inc:275
-#: admin/ogroups/asterisk/class_phonequeue.inc:873
-#: admin/conference/class_phoneConferenceGeneric.inc:709
-#: personal/phoneaccount/class_phoneAccount.inc:1350
-#: personal/phoneaccount/class_phoneAccount.inc:1669
-#: admin/ogroups/asterisk/phonequeue.tpl.c:17
-#: admin/conference/generic.tpl.c:20 personal/phoneaccount/generic.tpl.c:11
-msgid "Home server"
-msgstr "Server principale"
-
-#: admin/ogroups/asterisk/class_phonequeue.inc:281
-#: admin/ogroups/asterisk/class_phonequeue.inc:871
-#: admin/ogroups/asterisk/phonequeue.tpl.c:23
-msgid "Timeout"
-msgstr "Tempo di attesa massimo"
-
-#: admin/ogroups/asterisk/class_phonequeue.inc:284
-#: admin/ogroups/asterisk/class_phonequeue.inc:896
-#: admin/ogroups/asterisk/phonequeue.tpl.c:26
-msgid "Retry"
-msgstr "Riprova"
-
-#: admin/ogroups/asterisk/class_phonequeue.inc:287
-msgid "Queue length"
-msgstr "Lunghezza della coda"
-
-#: admin/ogroups/asterisk/class_phonequeue.inc:290
-#: admin/ogroups/asterisk/class_phonequeue.inc:874
-#: admin/ogroups/asterisk/phonequeue.tpl.c:35
-msgid "Announce frequency"
-msgstr "Frequenza di annuncio della posizione in coda"
-
-#: admin/ogroups/asterisk/class_phonequeue.inc:293
-#: admin/conference/class_phoneConferenceGeneric.inc:328
-msgid "Number"
-msgstr "Numero"
-
-#: admin/ogroups/asterisk/class_phonequeue.inc:316
-#: admin/ogroups/asterisk/class_phonequeue.inc:361
-msgid "asterisk"
-msgstr "asterisk"
-
-#: admin/ogroups/asterisk/class_phonequeue.inc:345
-#: admin/ogroups/asterisk/class_phonequeue.inc:696
-#: admin/conference/class_phoneConferenceGeneric.inc:369
-#: admin/macro/class_gofonMacro.inc:381 admin/macro/class_gofonMacro.inc:465
-#: addons/fonreports/class_fonreport.inc:190
-#: addons/fonreports/class_fonreport.inc:220
-#: personal/phoneaccount/class_phoneAccount.inc:455
-#: personal/phoneaccount/class_phoneAccount.inc:1061
-msgid "GOfon"
-msgstr "GOfon"
-
-#: admin/ogroups/asterisk/class_phonequeue.inc:401
-msgid "Cannot find old queue entry!"
-msgstr "Impossibile trovare l'entry nella vecchia coda !"
-
-#: admin/ogroups/asterisk/class_phonequeue.inc:487
-#, php-format
-msgid ""
-"Found more than one entry named '%s' in queue table. Please inform your "
-"system administrator!"
-msgstr "C'Ã¨ piÃ¹ di una entry chiamata '%s' nella coda. Informa l'amministratore della rete."
-
-#: admin/ogroups/asterisk/class_phonequeue.inc:728
-#: admin/ogroups/asterisk/class_phonequeue.inc:730
-msgid "telephone number"
-msgstr "Numero di telefono"
-
-#: admin/ogroups/asterisk/class_phonequeue.inc:787
-#: admin/ogroups/asterisk/class_phonequeue.inc:829
-#: admin/conference/class_phoneConferenceGeneric.inc:229
-#: admin/conference/class_phoneConferenceGeneric.inc:233
-#: admin/conference/class_phoneConferenceGeneric.inc:271
-#: admin/macro/class_gofonMacro.inc:343 admin/macro/class_gofonMacro.inc:452
-#: admin/macro/class_gofonMacro.inc:461 admin/macro/class_gofonMacro.inc:499
-#: admin/systems/asterisk/class_phoneGeneric.inc:267
-#: admin/systems/asterisk/class_phoneGeneric.inc:308
-#: addons/fonreports/class_fonreport.inc:220
-#: personal/phoneaccount/class_phoneAccount.inc:1046
-#: personal/phoneaccount/class_phoneAccount.inc:1166
-#: personal/phoneaccount/class_phoneAccount.inc:1172
-#: personal/phoneaccount/class_phoneAccount.inc:1368
-#: personal/phoneaccount/class_phoneAccount.inc:1450
-#: personal/phoneaccount/class_phoneAccount.inc:1528
-msgid "Error"
-msgstr "Errore"
-
-#: admin/ogroups/asterisk/class_phonequeue.inc:802
-#: admin/ogroups/asterisk/class_phonequeue.inc:857
-#: admin/conference/class_phoneConferenceGeneric.inc:682
-#: admin/macro/class_gofonMacro.inc:473 admin/macro/class_gofonMacro.inc:484
-#: admin/macro/class_gofonMacro.inc:521
-#: admin/macro/class_gofonMacroParameters.inc:435
-#: admin/systems/asterisk/class_phoneGeneric.inc:277
-#: admin/systems/asterisk/class_phoneGeneric.inc:432
-#: admin/systems/asterisk/class_phoneGeneric.inc:446
-#: admin/systems/asterisk/class_phoneGeneric.inc:463
-#: admin/systems/services/asterisk/class_serviceAsterisk.inc:121
-#: personal/phoneaccount/class_phoneAccount.inc:1476
-#: personal/phoneaccount/class_phoneAccount.inc:1609
-msgid "LDAP error"
-msgstr "Errore LDAP"
-
-#: admin/ogroups/asterisk/class_phonequeue.inc:864
-#: admin/systems/asterisk/class_phoneGeneric.inc:472
-#: admin/systems/asterisk/class_phoneGeneric.inc:477
-#: personal/phoneaccount/class_phoneAccount.inc:999
-#: personal/phoneaccount/class_phoneAccount.inc:1012
-#: personal/phoneaccount/class_phoneAccount.inc:1024
-#: personal/phoneaccount/class_phoneAccount.inc:1028
-#: personal/phoneaccount/class_phoneAccount.inc:1031
-#: personal/phoneaccount/class_phoneAccount.inc:1657
+#: admin/systems/asterisk/class_phoneIAX.inc:30
+#: admin/systems/asterisk/class_phoneIAX.inc:34
+#: personal/asterisk/class_asteriskAccount.inc:45
 msgid "Phone"
 msgstr "Telefono"
 
-#: admin/ogroups/asterisk/class_phonequeue.inc:865
-msgid "Phone group"
-msgstr "Gruppo telefonico"
-
-#: admin/ogroups/asterisk/class_phonequeue.inc:872
-#: admin/ogroups/asterisk/phonequeue.tpl.c:32
-msgid "Max queue length"
-msgstr "Dimensione massima della coda"
-
-#: admin/ogroups/asterisk/class_phonequeue.inc:875
-#: admin/ogroups/asterisk/phonequeue.tpl.c:86
-msgid "Allow the called user to transfer his call"
-msgstr "Permetti all'utente chiamato di trasferire la sua chiamata"
-
-#: admin/ogroups/asterisk/class_phonequeue.inc:876
-#: admin/ogroups/asterisk/phonequeue.tpl.c:89
-msgid "Allows calling user to transfer call"
-msgstr "Permetti all'utente che chiama di trasferire la sua chiamata"
-
-#: admin/ogroups/asterisk/class_phonequeue.inc:877
-#: admin/ogroups/asterisk/phonequeue.tpl.c:92
-msgid "Allow the called to hangup by pressing *"
-msgstr "Permetti alla persona che riceve di riattaccare premendo il tasto *"
-
-#: admin/ogroups/asterisk/class_phonequeue.inc:878
-#: admin/ogroups/asterisk/phonequeue.tpl.c:98
-msgid "Ring instead of playing background music"
-msgstr "Suona invece di mettere una musica di sottofondo"
-
-#: admin/ogroups/asterisk/class_phonequeue.inc:879
-#: admin/ogroups/asterisk/phonequeue.tpl.c:95
-msgid "Allows calling to hangup by pressing *"
-msgstr "Permetti alla persona che chiama di riattaccare premendo il tasto *"
-
-#: admin/ogroups/asterisk/class_phonequeue.inc:881
-#: admin/ogroups/asterisk/phonequeue.tpl.c:47
-msgid "Music on hold"
-msgstr "Musica d'attesa"
-
-#: admin/ogroups/asterisk/class_phonequeue.inc:882
-msgid "Welcome music"
-msgstr "Musica di benvenuto"
-
-#: admin/ogroups/asterisk/class_phonequeue.inc:883
-msgid "Report hold time"
-msgstr "Annuncio della durata del tempo d'attesa"
-
-#: admin/ogroups/asterisk/class_phonequeue.inc:884
-msgid "'You are next' sound"
-msgstr "suono 'Sei il prossimo'"
-
-#: admin/ogroups/asterisk/class_phonequeue.inc:885
-msgid "'There are' sound"
-msgstr "suono 'Ci sono ...'"
-
-#: admin/ogroups/asterisk/class_phonequeue.inc:886
-msgid "'Call waiting' sound"
-msgstr "suono 'Chiamata in attesa'"
-
-#: admin/ogroups/asterisk/class_phonequeue.inc:887
-msgid "'Thank you' sound"
-msgstr "suono 'Grazie'"
-
-#: admin/ogroups/asterisk/class_phonequeue.inc:888
-msgid "'Minutes' sound"
-msgstr "suono 'Minuti'"
-
-#: admin/ogroups/asterisk/class_phonequeue.inc:889
-msgid "'Seconds' sound"
-msgstr "suono 'Secondi'"
-
-#: admin/ogroups/asterisk/class_phonequeue.inc:890
-msgid "'Less than' sound"
-msgstr "suono 'Meno di'"
-
-#: admin/ogroups/asterisk/class_phonequeue.inc:891
-msgid "Queue phone number"
-msgstr "Numero della coda telefonica"
-
-#: admin/ogroups/asterisk/class_phonequeue.inc:892
-#: admin/conference/class_phoneConferenceGeneric.inc:707
-#: admin/ogroups/asterisk/phonequeue.tpl.c:20
-#: admin/conference/generic.tpl.c:23
-msgid "Language"
-msgstr "Lingua"
-
-#: admin/ogroups/asterisk/class_phonequeue.inc:893
-msgid "Method"
-msgstr "modalitÃ  di riproduzione "
-
-#: admin/ogroups/asterisk/class_phonequeue.inc:894
-#: admin/ogroups/asterisk/phonequeue.tpl.c:83
-msgid "Announce holdtime"
-msgstr "Messaggio della durata d'attesa"
-
-#: admin/ogroups/asterisk/class_phonequeue.inc:895
-msgid "Announce"
-msgstr "Annuncio della posizione in coda"
+#: admin/systems/asterisk/class_phoneIAX.inc:31
+msgid "Asterisk phone"
+msgstr ""
 
-#: admin/conference/conf-list.xml:11
-msgid "List of conference rooms"
-msgstr "Elenco delle sale di conferenza"
+#: admin/systems/asterisk/class_phoneIAX.inc:33
+msgid "Phone hardware"
+msgstr "Dispositivo telefonico"
 
-#: admin/conference/conf-list.xml:15 admin/conference/conf-list.xml:74
-msgid "Conference"
-msgstr "Conferenza"
+#: admin/systems/asterisk/class_phoneIAX.inc:46
+#: personal/asterisk/class_asteriskAccount.inc:42
+msgid "Telephone"
+msgstr "Telefono"
 
-#: admin/conference/conf-list.xml:41
-#: admin/conference/class_phoneConferenceGeneric.inc:324
-#: admin/conference/class_phoneConferenceGeneric.inc:347
-#: admin/conference/class_phoneConferenceGeneric.inc:702
-#: admin/macro/class_gofonMacro.inc:395 admin/macro/class_gofonMacro.inc:406
-#: admin/macro/macro-list.xml:41
-#: admin/systems/asterisk/class_phoneGeneric.inc:344
-#: admin/systems/asterisk/class_phoneGeneric.inc:348
-#: admin/systems/asterisk/class_phoneGeneric.inc:351
-#: admin/systems/asterisk/class_phoneGeneric.inc:366
-#: admin/systems/asterisk/class_phoneGeneric.inc:482
-#: admin/conference/conf-filter.tpl.c:5 admin/macro/macro-filter.tpl.c:5
-#: admin/macro/parameter.tpl.c:5
+#: admin/systems/asterisk/class_phoneIAX.inc:49
 msgid "Name"
 msgstr "Nome"
 
-#: admin/conference/conf-list.xml:49
-#: admin/conference/class_phoneConferenceGeneric.inc:704
-#: admin/macro/class_gofonMacro.inc:547 admin/macro/macro-list.xml:49
-#: admin/systems/asterisk/class_phoneGeneric.inc:484
-#: admin/conference/generic.tpl.c:29 admin/macro/generic.tpl.c:17
-#: admin/systems/asterisk/phone.tpl.c:8
-msgid "Description"
-msgstr "Descrizione"
-
-#: admin/conference/conf-list.xml:57 admin/macro/macro-list.xml:57
-msgid "Actions"
-msgstr "Azioni"
-
-#: admin/conference/conf-list.xml:68 admin/macro/macro-list.xml:68
-msgid "Create"
-msgstr "Crea"
-
-#: admin/conference/conf-list.xml:86 admin/conference/conf-list.xml:125
-#: admin/macro/macro-list.xml:86 admin/macro/macro-list.xml:125
-msgid "Edit"
-msgstr "Modifica"
-
-#: admin/conference/conf-list.xml:93 admin/conference/conf-list.xml:138
-#: admin/macro/macro-list.xml:93 admin/macro/macro-list.xml:138
-msgid "Remove"
-msgstr "Rimuovi"
-
-#: admin/conference/class_phoneConferenceGeneric.inc:233
-#, php-format
-msgid "Cannot delete entry from server '%s' because it seems to be removed!"
-msgstr "Impossibile rimuovere l'entry dal server '%s' in quanto pare sia stata giÃ  rimossa in precedenza !"
-
-#: admin/conference/class_phoneConferenceGeneric.inc:308
-#, php-format
-msgid ""
-"The previously selected asterisk home server '%s' is no longer available!"
-msgstr "Il server principale di asterisk (%s), precedentemente selezionato, non Ã¨ piÃ¹ disponibile ! "
-
-#: admin/conference/class_phoneConferenceGeneric.inc:315
-#: admin/conference/generic.tpl.c:47
-msgid "PIN"
-msgstr "PIN"
-
-#: admin/conference/class_phoneConferenceGeneric.inc:333
-#: admin/conference/class_phoneConferenceGeneric.inc:719
-msgid "Lifetime"
-msgstr "Durata"
-
-#: admin/conference/class_phoneConferenceGeneric.inc:399
-#: personal/phoneaccount/class_phoneAccount.inc:346
-#: personal/phoneaccount/class_phoneAccount.inc:359
-#: personal/phoneaccount/class_phoneAccount.inc:617
-#: personal/phoneaccount/class_phoneAccount.inc:656
-#: personal/phoneaccount/class_phoneAccount.inc:1519
-#: personal/phoneaccount/class_phoneAccount.inc:1695
-#: admin/conference/remove.tpl.c:2 admin/macro/remove.tpl.c:2
-msgid "Warning"
-msgstr "Avvertimento"
-
-#: admin/conference/class_phoneConferenceGeneric.inc:400
-#, php-format
-msgid ""
-"FusionDirectory identified problems with your MySQL table definition, please"
-" activate debugging for details."
-msgstr "FusionDirectory ha identificato dei problemi nelle definizioni della tua tavola MySQL, attiva la modalitÃ  di debug per avere piÃ¹ informazioni."
-
-#: admin/conference/class_phoneConferenceGeneric.inc:606
-#: admin/conference/class_phoneConferenceGeneric.inc:608
-#, php-format
-msgid "'%s' is already assigned to '%s'!"
-msgstr "'%s' Ã¨ giÃ  utilizzato da '%s' !"
-
-#: admin/conference/class_phoneConferenceGeneric.inc:693
-msgid "Phone Conference"
+#: admin/systems/asterisk/class_phoneIAX.inc:49
+msgid "Name of this phone"
 msgstr ""
 
-#: admin/conference/class_phoneConferenceGeneric.inc:694
-msgid "Phone conference management"
-msgstr "Gestione delle conferenze telefoniche"
-
-#: admin/conference/class_phoneConferenceGeneric.inc:696
-msgid "GOfon conference"
-msgstr "Conferenze telefoniche"
+#: admin/systems/asterisk/class_phoneIAX.inc:53
+msgid "Account name"
+msgstr "Nome dell'account"
 
-#: admin/conference/class_phoneConferenceGeneric.inc:698
-msgid "Asterisk conference"
-msgstr "Conferenze telefoniche"
-
-#: admin/conference/class_phoneConferenceGeneric.inc:703
-#: admin/macro/class_gofonMacro.inc:546
-#: admin/systems/asterisk/class_phoneGeneric.inc:483
-#: admin/conference/generic.tpl.c:17 admin/macro/generic.tpl.c:14
-#: admin/systems/asterisk/phone.tpl.c:5
-msgid "Base"
-msgstr "Base"
-
-#: admin/conference/class_phoneConferenceGeneric.inc:705
-msgid "Conference PIN"
-msgstr "Codice PIN della conferenza"
-
-#: admin/conference/class_phoneConferenceGeneric.inc:710
-#: admin/conference/generic.tpl.c:44
-msgid "Preset PIN"
-msgstr "Codice PIN preselezionato"
-
-#: admin/conference/class_phoneConferenceGeneric.inc:711
-#: admin/conference/generic.tpl.c:50
-msgid "Record conference"
-msgstr "Registra la conferenza"
-
-#: admin/conference/class_phoneConferenceGeneric.inc:712
-#: admin/conference/generic.tpl.c:59
-msgid "Play music on hold"
-msgstr "Musica d'attesa"
-
-#: admin/conference/class_phoneConferenceGeneric.inc:713
-msgid "Activate menu"
-msgstr "Attiva il menu"
-
-#: admin/conference/class_phoneConferenceGeneric.inc:714
-msgid "Announce user activity"
-msgstr "Annunciare l'attivitÃ  dell'utente"
-
-#: admin/conference/class_phoneConferenceGeneric.inc:715
-msgid "Count user"
-msgstr "Conta gli utenti"
-
-#: admin/conference/class_phoneConferenceGeneric.inc:716
-msgid "Conference type"
-msgstr "Tipo di conferenza"
-
-#: admin/conference/class_phoneConferenceGeneric.inc:718
-msgid "Format"
-msgstr "Formato"
-
-#: admin/conference/class_phoneConferenceGeneric.inc:720
-#: personal/phoneaccount/class_phoneAccount.inc:1666
-msgid "Telephone number"
-msgstr "Numero di telefono"
-
-#: admin/conference/class_phoneConferenceGeneric.inc:721
-msgid "Owner"
-msgstr "Propietario"
-
-#: admin/conference/class_phoneConferenceManagment.inc:36
-msgid "Phone Conferences"
-msgstr ""
-
-#: admin/conference/class_phoneConferenceManagment.inc:37
-msgid "Phone Conference management"
+#: admin/systems/asterisk/class_phoneIAX.inc:53
+msgid "Name of the account"
 msgstr ""
 
-#: admin/macro/class_gofonMacro.inc:202
-#, php-format
-msgid ""
-"Macro could not be removed from server '%s', please check database "
-"consistency!"
-msgstr "La macro non puÃ² essere rimossa dal server '%s', verifica la consistenza del server !"
-
-#: admin/macro/class_gofonMacro.inc:264
-#, php-format
-msgid "Application missing in line %s!"
-msgstr "Applicazione mancante alla linea %s !"
-
-#: admin/macro/class_gofonMacro.inc:267
-#, php-format
-msgid "Priority missing in line %s!"
-msgstr "PrioritÃ  mancante alla linea %s !"
-
-#: admin/macro/class_gofonMacro.inc:271
-#, php-format
-msgid "Extension missing in line %s!"
-msgstr "Estensione mancante alla linea %s !"
-
-#: admin/macro/class_gofonMacro.inc:281
-#, php-format
-msgid "Duplicate combination of 'extension' and 'priority' in line %s!"
-msgstr "Combinazione di doppioni per 'estensione' e 'prioritÃ ' alla linea %s !"
-
-#: admin/macro/class_gofonMacro.inc:317
-#, php-format
-msgid ""
-"Macro could not be added to server '%s', please check database consistency!"
-msgstr "La macro non puÃ² essere aggiunta al server '%s', verifica la consistenza del database !"
-
-#: admin/macro/class_gofonMacro.inc:410
-msgid "Name can be 20 characters at maximum!"
-msgstr "I nomi devono contenere un massimo di 20 caratteri !"
-
-#: admin/macro/class_gofonMacro.inc:419
-msgid "Macro is still in use!"
-msgstr "La macro Ã¨ attualmente utilizzata !"
-
-#: admin/macro/class_gofonMacro.inc:426
-msgid "Macro is empty!"
-msgstr "La macro Ã¨ vuota !"
-
-#: admin/macro/class_gofonMacro.inc:452
-#: admin/systems/asterisk/class_phoneGeneric.inc:267
-#, php-format
-msgid "Cannot delete entry because it is still in use by '%s'!"
-msgstr "Impossibile rimuovere l'entry in quanto Ã¨ ancora utilizzata da '%s' !"
-
-#: admin/macro/class_gofonMacro.inc:465
-#: addons/fonreports/class_fonreport.inc:190
-#: personal/phoneaccount/class_phoneAccount.inc:455
-#: personal/phoneaccount/class_phoneAccount.inc:1061
-#: personal/phoneaccount/class_phoneAccount.inc:1567
-msgid "Configuration error"
-msgstr "Errore di configurazione"
-
-#: admin/macro/class_gofonMacro.inc:536 admin/macro/class_gofonMacro.inc:541
-msgid "Asterisk macro"
-msgstr "Macro di asterisk"
-
-#: admin/macro/class_gofonMacro.inc:537
-msgid "Asterisk macro management"
-msgstr "Gestione delle macro di asterisk"
-
-#: admin/macro/class_gofonMacro.inc:539
-msgid "GOfon macro"
-msgstr "Macro di GOfon"
-
-#: admin/macro/class_gofonMacro.inc:545 admin/macro/generic.tpl.c:2
-#: admin/macro/generic.tpl.c:5 admin/macro/paste_generic.tpl.c:2
-#: admin/macro/paste_generic.tpl.c:5
-msgid "Macro name"
-msgstr "Nome della macro"
-
-#: admin/macro/class_gofonMacro.inc:548 admin/macro/generic.tpl.c:8
-msgid "Display name"
-msgstr "Mostra il nome"
-
-#: admin/macro/class_gofonMacro.inc:549
-msgid "Macro content and parameter"
-msgstr "Contenuto e parametri della macro"
-
-#: admin/macro/class_gofonMacro.inc:550
-msgid "Visibility flag"
-msgstr "Flag di visibilitÃ "
-
-#: admin/macro/class_gofonMacroManagement.inc:36
-msgid "Phone Macros"
-msgstr ""
-
-#: admin/macro/class_gofonMacroManagement.inc:37
-msgid "Phone Macros management"
-msgstr ""
-
-#: admin/macro/macro-list.xml:11
-msgid "List of macros"
-msgstr "Elenco delle macro"
-
-#: admin/macro/macro-list.xml:15 admin/macro/macro-list.xml:74
-msgid "Macro"
-msgstr "Macro"
-
-#: admin/macro/class_gofonMacroParameters.inc:58
-msgid "Parameter"
-msgstr "Parametri"
-
-#: admin/macro/class_gofonMacroParameters.inc:59
-msgid "Asterisk macro parameter"
-msgstr "Parametri delle macro di asterisk"
-
-#: admin/macro/class_gofonMacroParameters.inc:234
-#: personal/phoneaccount/generic.tpl.c:35
-msgid "Phone macro"
-msgstr "Macro telefonica"
-
-#: admin/macro/class_gofonMacroParameters.inc:290
-msgid "String"
-msgstr "Frase"
-
-#: admin/macro/class_gofonMacroParameters.inc:291
-msgid "Combobox"
-msgstr "Casella a scelta multipla"
-
-#: admin/macro/class_gofonMacroParameters.inc:292
-msgid "Bool"
-msgstr "Booleana"
-
-#: admin/macro/class_gofonMacroParameters.inc:298
-msgid "Delete unused"
-msgstr "Rimuovi i parametri non utilizzati"
-
-#: admin/macro/class_gofonMacroParameters.inc:374
-#, php-format
-msgid "Parameter %s contains invalid character. '!,#' is used as delimiter!"
-msgstr "Il parametro %s contiene dei caratteri non validi. '!,#' Ã¨ usato come separatore !"
-
-#: admin/macro/class_gofonMacroParameters.inc:379
-#, php-format
-msgid "Parameter %s is invalid!"
-msgstr "Il parametro %s non Ã¨ valido !"
-
-#: admin/macro/class_gofonMacroParameters.inc:408
-#: personal/phoneaccount/class_phoneAccount.inc:1600
-msgid "Information"
-msgstr "Informazioni"
-
-#: admin/macro/class_gofonMacroParameters.inc:408
-msgid ""
-"Number of parameters for this macro has changed. Please update all users "
-"using it!"
-msgstr "Il numero di parametri per questa macro Ã¨ cambiato. Aggiorna tutti gli utenti che li utilizzano !"
-
-#: admin/systems/asterisk/class_phoneGeneric.inc:151
-msgid "phone"
-msgstr "Telefono"
-
-#: admin/systems/asterisk/class_phoneGeneric.inc:230
-msgid "yes"
-msgstr "Si"
-
-#: admin/systems/asterisk/class_phoneGeneric.inc:230
-msgid "no"
-msgstr "no"
-
-#: admin/systems/asterisk/class_phoneGeneric.inc:247
-msgid "dynamic"
-msgstr "dinamico"
-
-#: admin/systems/asterisk/class_phoneGeneric.inc:247
-msgid "Networksettings"
-msgstr "Configurazione della rete"
-
-#: admin/systems/asterisk/class_phoneGeneric.inc:330
-#: admin/systems/asterisk/class_phoneGeneric.inc:333
-msgid "IP address"
-msgstr "Indirizzo IP"
-
-#: admin/systems/asterisk/class_phoneGeneric.inc:473
-msgid "Phone information"
-msgstr ""
-
-#: admin/systems/asterisk/class_phoneGeneric.inc:476
-#: personal/phoneaccount/class_phoneAccount.inc:1668
-msgid "Phone hardware"
-msgstr "Dispositivo telefonico"
-
-#: admin/systems/asterisk/class_phoneGeneric.inc:485
-msgid "SIP Mode"
-msgstr "ModalitÃ  SIP"
-
-#: admin/systems/asterisk/class_phoneGeneric.inc:486
-msgid "SIP DTMF mode"
-msgstr "ModalitÃ  SIP DTMF"
-
-#: admin/systems/asterisk/class_phoneGeneric.inc:487
-msgid "SIP Default ip"
-msgstr "Sip - indirizzo IP di default"
-
-#: admin/systems/asterisk/class_phoneGeneric.inc:488
-msgid "SIP Qualify"
-msgstr "Qualifica SIP"
-
-#: admin/systems/asterisk/class_phoneGeneric.inc:489
-msgid "IAX authentication type"
-msgstr "Tipo di autentificazione IAX"
-
-#: admin/systems/asterisk/class_phoneGeneric.inc:490
-msgid "IAX secret"
-msgstr "IAX secret (password)"
-
-#: admin/systems/asterisk/class_phoneGeneric.inc:491
-msgid "IAX account code"
-msgstr "Codice dell'account IAX"
-
-#: admin/systems/asterisk/class_phoneGeneric.inc:492
-msgid "IAX trunk lines"
-msgstr "IAX trunk lines"
-
-#: admin/systems/asterisk/class_phoneGeneric.inc:493
-msgid "IAX permit settings"
-msgstr "Parametri d'autorizzazione di IAX"
-
-#: admin/systems/asterisk/class_phoneGeneric.inc:494
-msgid "IAX deny settings"
-msgstr "Parametri d'interdizione di IAX"
-
-#: admin/systems/asterisk/class_phoneGeneric.inc:495
-msgid "CAPI MSN"
-msgstr "CAPI MSN"
-
-#: admin/systems/asterisk/class_phoneGeneric.inc:496
-msgid "Hardware type"
-msgstr "Tipo di materiale"
-
 #: admin/systems/services/asterisk/class_serviceAsterisk.inc:35
 msgid "VoIP database information"
 msgstr "Informazioni sul database VoIP"
@@ -751,6 +95,10 @@ msgid ""
 "these objects '%s'."
 msgstr "Impossibile rimuovere l'estensione del database asterisk in quanto Ã¨ ancora utilizzata da questo(i) oggetto(i) '%s'."
 
+#: admin/systems/services/asterisk/class_serviceAsterisk.inc:121
+msgid "LDAP error"
+msgstr "Errore LDAP"
+
 #: admin/systems/services/asterisk/class_serviceAsterisk.inc:140
 msgid "VoIP service (asterisk)"
 msgstr "servizio VoIP (asterisk)"
@@ -763,211 +111,20 @@ msgstr "VoIP - amministrazione di asterisk"
 msgid "Services"
 msgstr "Servizi"
 
-#: addons/fonreports/class_fonreport.inc:232
-msgid "Insufficient permissions"
-msgstr "Autorizzazioni insufficienti"
-
-#: addons/fonreports/class_fonreport.inc:251
-msgid "Y-M-D"
-msgstr "Anno-Mese-Giorno"
-
-#: addons/fonreports/class_fonreport.inc:418
-#: addons/fonreports/class_fonreport.inc:419
-#: addons/fonreports/class_fonreport.inc:424 addons/fonreports/main.inc:46
-msgid "Phone reports"
-msgstr "Rapporti telefonici"
-
-#: addons/fonreports/class_fonreport.inc:419
-msgid "All entries are readonly"
-msgstr "Tutte le entries sono in sola lettura"
-
-#: addons/fonreports/class_fonreport.inc:428
-#: addons/fonreports/contents.tpl.c:32
-msgid "Date"
-msgstr "Data"
-
-#: addons/fonreports/class_fonreport.inc:429
-#: addons/fonreports/contents.tpl.c:35
-msgid "Source"
-msgstr "Origine"
-
-#: addons/fonreports/class_fonreport.inc:430
-#: addons/fonreports/contents.tpl.c:38
-msgid "Destination"
-msgstr "Destinatario"
-
-#: addons/fonreports/class_fonreport.inc:431
-#: addons/fonreports/contents.tpl.c:41
-msgid "Channel"
-msgstr "Canale"
-
-#: addons/fonreports/class_fonreport.inc:432
-msgid "Application called"
-msgstr "Applicazione chiamata"
-
-#: addons/fonreports/class_fonreport.inc:433
-msgid "Disposition"
-msgstr "Disposizione"
-
-#: addons/fonreports/class_fonreport.inc:434
-#: addons/fonreports/contents.tpl.c:50
-msgid "Duration"
-msgstr "Durata"
-
-#: personal/phoneaccount/class_phoneAccount.inc:176
-msgid "automatic"
-msgstr "automatico"
-
-#: personal/phoneaccount/class_phoneAccount.inc:212
-msgid "no macro"
-msgstr "Nessuna macro"
-
-#: personal/phoneaccount/class_phoneAccount.inc:240
-msgid "undefined"
-msgstr "non definito"
-
-#: personal/phoneaccount/class_phoneAccount.inc:359
-#, php-format
-msgid ""
-"Cannot identify telephone extension in database, please try to save again."
-msgstr "Impossibile identificare l'estensione telefonica nel database, prova a registrare di nuovo."
-
-#: personal/phoneaccount/class_phoneAccount.inc:577
-#: personal/phoneaccount/class_phoneAccount.inc:595
-msgid "Abort saving entries to keep the database consistent."
-msgstr "Abbandono della registrazione per salvaguardare la consistenza del database."
-
-#: personal/phoneaccount/class_phoneAccount.inc:618
-#: personal/phoneaccount/class_phoneAccount.inc:657
-#: personal/phoneaccount/class_phoneAccount.inc:1520
-#, php-format
-msgid ""
-"FusionDirectory identified problems with your database table definition!"
-msgstr "FusionDirectory ha identificato dei problemi nelle definizioni del tuo database"
-
-#: personal/phoneaccount/class_phoneAccount.inc:1023
-msgid "Remove phone account"
-msgstr "Elimina l'account telefonico"
-
-#: personal/phoneaccount/class_phoneAccount.inc:1027
-#: personal/phoneaccount/class_phoneAccount.inc:1030
-msgid "Create phone account"
-msgstr "Crea un account telefonico"
-
-#: personal/phoneaccount/class_phoneAccount.inc:1028
-msgid "User uid"
-msgstr "uid dell'utente"
-
-#: personal/phoneaccount/class_phoneAccount.inc:1046
-msgid "Selected macro is not available anymore!"
-msgstr "La macro selezionata non Ã¨ piÃ¹ disponibile !"
-
-#: personal/phoneaccount/class_phoneAccount.inc:1221
-msgid "Choose your private phone"
-msgstr "Scegli il tuo numero di telefono personale"
-
-#: personal/phoneaccount/class_phoneAccount.inc:1346
-msgid ""
-"There must be at least one server with an asterisk database to create a "
-"phone account."
-msgstr "Ci deve essere almeno un server con un database asterisk per poter creare un account telefonico."
-
-#: personal/phoneaccount/class_phoneAccount.inc:1354
-#: personal/phoneaccount/class_phoneAccount.inc:1357
-#: personal/phoneaccount/generic.tpl.c:29
-#: personal/phoneaccount/paste_generic.tpl.c:11
-msgid "Voicemail PIN"
-msgstr "PIN della segreteria telefonica"
-
-#: personal/phoneaccount/class_phoneAccount.inc:1354
-msgid "Between 1-4 charactes"
-msgstr "Tra 1-4 caratteri"
-
-#: personal/phoneaccount/class_phoneAccount.inc:1362
-#: personal/phoneaccount/generic.tpl.c:32
-#: personal/phoneaccount/paste_generic.tpl.c:14
-msgid "Phone PIN"
-msgstr "PIN del telefono"
-
-#: personal/phoneaccount/class_phoneAccount.inc:1394
-#: admin/conference/generic.tpl.c:38 admin/conference/paste_generic.tpl.c:8
-msgid "Phone number"
-msgstr "Numero di telefono"
-
-#: personal/phoneaccount/class_phoneAccount.inc:1402
-#, php-format
-msgid "macro parameter %s"
-msgstr "Parametri della macro %s"
-
-#: personal/phoneaccount/class_phoneAccount.inc:1450
-msgid "An error occured while updating the database entries!"
-msgstr "C'Ã¨ stato un errore durante l'aggiornamento delle entries del database !"
-
-#: personal/phoneaccount/class_phoneAccount.inc:1567
-msgid "Was not able to found any asterisk server"
-msgstr ""
-
-#: personal/phoneaccount/class_phoneAccount.inc:1600
-#, php-format
-msgid "User '%s' has been removed from phone queue '%s'."
-msgstr "L'utente '%s' Ã¨ stato rimosso dalla coda '%s'."
-
-#: personal/phoneaccount/class_phoneAccount.inc:1637
-#: personal/phoneaccount/class_phoneAccount.inc:1639
-#, php-format
-msgid "The specified telephonenumber '%s' is already assigned to '%s'."
-msgstr "Il numero di telefono '%s' Ã¨ giÃ  usato da '%s'."
-
-#: personal/phoneaccount/class_phoneAccount.inc:1649
-#, php-format
-msgid ""
-"The previously selected asterisk home server (%s) is no longer available. "
-"Remove aborted."
-msgstr "Il server principale asterisk, selezionato precedentemente, non esiste piÃ¹ (%s). Rimozione  cancellata."
-
-#: personal/phoneaccount/class_phoneAccount.inc:1658
-msgid "Phone account settings"
-msgstr "Impostazioni dell'account telefonico"
-
-#: personal/phoneaccount/class_phoneAccount.inc:1667
-msgid "Macro settings"
-msgstr "Impostazioni della macro"
-
-#: personal/phoneaccount/class_phoneAccount.inc:1670
-msgid "Phone context"
-msgstr "Contesto telefonico"
-
-#: personal/phoneaccount/class_phoneAccount.inc:1671
-msgid "Voice mail context"
-msgstr "Contesto della segreteria telefonica"
-
-#: personal/phoneaccount/class_phoneAccount.inc:1672
-msgid "Telephone pin"
-msgstr "pin del telefono"
-
-#: personal/phoneaccount/class_phoneAccount.inc:1673
-msgid "Voicemail pin"
-msgstr "pin della segreteria telefonica"
-
-#: personal/phoneaccount/class_phoneAccount.inc:1695
-#, php-format
-msgid "You need to configure %s contexts first"
-msgstr "Ãˆ necessario configurare prima i contesti %s"
-
-#: personal/phoneaccount/main.inc:124
-msgid "Click the 'Edit' button below to change informations in this dialog"
-msgstr "Premi il bottone 'Modifica' qui sotto per cambiare le informazioni in questa finestra"
-
-#: personal/phoneaccount/main.inc:134
-#: personal/phoneaccount/paste_generic.tpl.c:2
-msgid "Phone settings"
-msgstr "Impostazioni del telefono"
-
+#: personal/asterisk/class_asteriskAccount.inc:30
 #: config/asterisk/class_asteriskPluginConfig.inc:28
 #: config/asterisk/class_asteriskPluginConfig.inc:41
 msgid "Asterisk"
 msgstr "Asterisk"
 
+#: personal/asterisk/class_asteriskAccount.inc:31
+msgid "Asterisk account"
+msgstr ""
+
+#: personal/asterisk/class_asteriskAccount.inc:45
+msgid "Select the phone associated to this user"
+msgstr ""
+
 #: config/asterisk/class_asteriskPluginConfig.inc:29
 msgid "Asterisk plugin configuration"
 msgstr "Configurazione del plugin Asterisk"
@@ -1015,338 +172,3 @@ msgstr "Contesti della segreteria telefonica"
 #: config/asterisk/class_asteriskPluginConfig.inc:72
 msgid "Available voicemail contexts"
 msgstr "Contesti della segreteria telefonica disponibili"
-
-#: admin/ogroups/asterisk/phonequeue.tpl.c:2
-msgid ""
-"Only users with the same asterisk home server will be included to this "
-"queue."
-msgstr "Soltanto gli utenti dello stesso server asterisk saranno inclusi in questa coda."
-
-#: admin/ogroups/asterisk/phonequeue.tpl.c:5
-#: personal/phoneaccount/generic.tpl.c:2
-#: personal/phoneaccount/paste_generic.tpl.c:5
-msgid "Phone numbers"
-msgstr "Numeri di telefono"
-
-#: admin/ogroups/asterisk/phonequeue.tpl.c:8
-msgid "Up"
-msgstr "Sopra"
-
-#: admin/ogroups/asterisk/phonequeue.tpl.c:11
-msgid "Down"
-msgstr "Sotto"
-
-#: admin/ogroups/asterisk/phonequeue.tpl.c:14
-#: admin/conference/generic.tpl.c:41
-msgid "Options"
-msgstr "Opzioni"
-
-#: admin/ogroups/asterisk/phonequeue.tpl.c:29
-msgid "Strategy"
-msgstr "Strategia"
-
-#: admin/ogroups/asterisk/phonequeue.tpl.c:38
-msgid "(in seconds)"
-msgstr "(in secondi)"
-
-#: admin/ogroups/asterisk/phonequeue.tpl.c:41
-msgid "Queue sound setup"
-msgstr "Configurazione delle musiche d'attesa"
-
-#: admin/ogroups/asterisk/phonequeue.tpl.c:44
-msgid "Use music on hold instead of ringing"
-msgstr "Attivare la musica d'attesa piuttosto che la soneria"
-
-#: admin/ogroups/asterisk/phonequeue.tpl.c:50
-msgid "Welcome sound file"
-msgstr "File musicale di benvenuto"
-
-#: admin/ogroups/asterisk/phonequeue.tpl.c:53
-msgid "Announce message"
-msgstr "Messaggio di annuncio della posizione in coda"
-
-#: admin/ogroups/asterisk/phonequeue.tpl.c:56
-msgid "Sound file for 'You are next ...'"
-msgstr "File musicale per il messaggio 'Sei il prossimo...'"
-
-#: admin/ogroups/asterisk/phonequeue.tpl.c:59
-msgid "'There are ...'"
-msgstr "'Ci sono ...'"
-
-#: admin/ogroups/asterisk/phonequeue.tpl.c:62
-msgid "'... calls waiting'"
-msgstr "'... chiamata in attesa'"
-
-#: admin/ogroups/asterisk/phonequeue.tpl.c:65
-msgid "'Thank you' message"
-msgstr "Messaggio di 'Grazie'"
-
-#: admin/ogroups/asterisk/phonequeue.tpl.c:68
-msgid "'minutes' sound file"
-msgstr "Durata in 'minuti' del file musicale"
-
-#: admin/ogroups/asterisk/phonequeue.tpl.c:71
-msgid "'seconds' sound file"
-msgstr "Durata in 'secondi' del file musicale"
-
-#: admin/ogroups/asterisk/phonequeue.tpl.c:74
-msgid "Hold sound file"
-msgstr "File musicale del messaggio d'attesa"
-
-#: admin/ogroups/asterisk/phonequeue.tpl.c:77
-msgid "Less Than sound file"
-msgstr "File musicale, meno di"
-
-#: admin/ogroups/asterisk/phonequeue.tpl.c:80
-msgid "Phone attributes "
-msgstr "Attributi del telefono"
-
-#: admin/conference/conf-filter.tpl.c:2 admin/macro/macro-filter.tpl.c:2
-#: addons/fonreports/contents.tpl.c:2
-msgid "Filter"
-msgstr "Filtro"
-
-#: admin/conference/generic.tpl.c:2
-msgid "Properties"
-msgstr "ProprietÃ "
-
-#: admin/conference/generic.tpl.c:5 admin/conference/paste_generic.tpl.c:2
-msgid "Conference name"
-msgstr "Nome della conferenza"
-
-#: admin/conference/generic.tpl.c:8 admin/conference/paste_generic.tpl.c:5
-msgid "Name of conference to create"
-msgstr "Nome della conferenza da creare"
-
-#: admin/conference/generic.tpl.c:11
-msgid "Type"
-msgstr "Tipo"
-
-#: admin/conference/generic.tpl.c:14
-msgid "Choose subtree to place conference in"
-msgstr "Scegli il ramo dell'annuario dove sarÃ  registrata la conferenza"
-
-#: admin/conference/generic.tpl.c:26
-msgid "Select language"
-msgstr "Scegli la lingua"
-
-#: admin/conference/generic.tpl.c:32
-msgid "Descriptive text for department"
-msgstr "Descrizione del dipartimento"
-
-#: admin/conference/generic.tpl.c:35
-msgid "Lifetime (in days)"
-msgstr "Durata (in giorni)"
-
-#: admin/conference/generic.tpl.c:53
-msgid "Sound file format"
-msgstr "Formato del file musicale"
-
-#: admin/conference/generic.tpl.c:56
-msgid "Choose subtree to place department in"
-msgstr "Seleziona il ramo dell'annuario nel quale sarÃ  piazzato il dipartimento"
-
-#: admin/conference/generic.tpl.c:62
-msgid "Activate session menu"
-msgstr "Attiva il menu di sessione"
-
-#: admin/conference/generic.tpl.c:65
-msgid "Announce users joining or leaving the conference"
-msgstr "Annuncia i nuovi utenti e quelli che partono dalla conferenza"
-
-#: admin/conference/generic.tpl.c:68
-msgid "Count users"
-msgstr "Conta gli utenti"
-
-#: admin/conference/remove.tpl.c:5 admin/macro/remove.tpl.c:5
-msgid ""
-"Please double check if you really want to do this since there is no way for "
-"FusionDirectory to get your data back."
-msgstr "Assicurati che vuoi davvero eseguire l'azione visto che poi sarÃ  impossibile per FusionDirectory recuperare i tuoi dati."
-
-#: admin/conference/remove.tpl.c:8 admin/macro/remove.tpl.c:8
-msgid "So - if you're sure - press 'Delete' to continue or 'Cancel' to abort."
-msgstr "Quindi - se sei sicuro - premi 'Rimuovi' per continuare oppure 'Annulla' per interrompere."
-
-#: admin/macro/generic.tpl.c:11
-msgid "Macro name to be displayed"
-msgstr "Nome da mostrare per la macro"
-
-#: admin/macro/generic.tpl.c:20
-msgid "Visible for user"
-msgstr "Visibile all'utente"
-
-#: admin/macro/generic.tpl.c:23
-msgid "Macro text"
-msgstr "Testo della macro"
-
-#: admin/macro/parameter.tpl.c:2
-msgid "Argument"
-msgstr "Argomenti"
-
-#: admin/macro/parameter.tpl.c:8
-msgid "type"
-msgstr "Tipo"
-
-#: admin/macro/parameter.tpl.c:11
-msgid "Default value"
-msgstr "Valori di default"
-
-#: admin/macro/parameter.tpl.c:14
-msgid "You are not allowed to view the macro parameter settings"
-msgstr "Non sei autorizzato a vedere i parametri di impostazione della macro"
-
-#: admin/systems/asterisk/phonesettings.tpl.c:2
-msgid "Advanced phone settings"
-msgstr "Impostazioni avanzate del telefono"
-
-#: admin/systems/asterisk/phonesettings.tpl.c:5
-msgid "Phone type"
-msgstr "Tipo di telefono"
-
-#: admin/systems/asterisk/phonesettings.tpl.c:8
-#: admin/systems/asterisk/phonesettings.tpl.c:14
-#: admin/systems/asterisk/phonesettings.tpl.c:20
-#: admin/systems/asterisk/phonesettings.tpl.c:26
-#: admin/systems/asterisk/phonesettings.tpl.c:35
-#: admin/systems/asterisk/phonesettings.tpl.c:47
-#: admin/systems/asterisk/phonesettings.tpl.c:65
-msgid "Choose a phone type"
-msgstr "Scegli un tipo di telefono"
-
-#: admin/systems/asterisk/phonesettings.tpl.c:11
-msgid "Mode"
-msgstr "ModalitÃ "
-
-#: admin/systems/asterisk/phonesettings.tpl.c:17
-msgid "DTMF mode"
-msgstr "Modo DTMF"
-
-#: admin/systems/asterisk/phonesettings.tpl.c:23
-#: admin/systems/asterisk/phonesettings.tpl.c:38
-msgid "Default IP"
-msgstr "Indirizzo IP di default"
-
-#: admin/systems/asterisk/phonesettings.tpl.c:29
-#: admin/systems/asterisk/phonesettings.tpl.c:41
-msgid "Response timeout"
-msgstr "Tempo di risposta massimo"
-
-#: admin/systems/asterisk/phonesettings.tpl.c:32
-msgid "Modus"
-msgstr "ModalitÃ "
-
-#: admin/systems/asterisk/phonesettings.tpl.c:44
-msgid "Authtype"
-msgstr "Tipo di autentificazione"
-
-#: admin/systems/asterisk/phonesettings.tpl.c:50
-msgid "Secret"
-msgstr "Secret (password)"
-
-#: admin/systems/asterisk/phonesettings.tpl.c:53
-msgid "GoFonInkeys"
-msgstr "GoFonInkeys"
-
-#: admin/systems/asterisk/phonesettings.tpl.c:56
-msgid "GoFonOutKeys"
-msgstr "GoFonOutKeys"
-
-#: admin/systems/asterisk/phonesettings.tpl.c:59
-msgid "Account code"
-msgstr "Codice dell'account telefonico"
-
-#: admin/systems/asterisk/phonesettings.tpl.c:62
-msgid "Trunk lines"
-msgstr "linee di Trunk"
-
-#: admin/systems/asterisk/phonesettings.tpl.c:68
-msgid "Hosts that are allowed to connect"
-msgstr "Hosts che possono connettersi"
-
-#: admin/systems/asterisk/phonesettings.tpl.c:71
-#: admin/systems/asterisk/phonesettings.tpl.c:77
-msgid "List of alternative mail addresses"
-msgstr "Elenco degli indirizzi alternativi"
-
-#: admin/systems/asterisk/phonesettings.tpl.c:74
-msgid "Hosts that are not allowed to connect"
-msgstr "Hosts che non possono connettersi"
-
-#: admin/systems/asterisk/phonesettings.tpl.c:80
-msgid "MSN"
-msgstr "MSN"
-
-#: admin/systems/asterisk/phone.tpl.c:2
-msgid "Phone name"
-msgstr "Nome del telefono"
-
-#: addons/fonreports/contents.tpl.c:5
-msgid "Search for"
-msgstr "Cerca"
-
-#: addons/fonreports/contents.tpl.c:8
-msgid "Enter user name to search for"
-msgstr "Inserisci il nome dell'utente da ricercare"
-
-#: addons/fonreports/contents.tpl.c:11 addons/fonreports/contents.tpl.c:26
-msgid "in"
-msgstr "nel"
-
-#: addons/fonreports/contents.tpl.c:14
-msgid "Select subtree to base search on"
-msgstr "Scegli il ramo dell'annuario dove sarÃ  effettuata la ricerca"
-
-#: addons/fonreports/contents.tpl.c:17
-msgid "on"
-msgstr "Attivato"
-
-#: addons/fonreports/contents.tpl.c:20
-msgid "Select server to search on"
-msgstr "Scegli il server in cui sarÃ  effettuata la ricerca"
-
-#: addons/fonreports/contents.tpl.c:23
-msgid "during"
-msgstr "durante"
-
-#: addons/fonreports/contents.tpl.c:29
-msgid "Search"
-msgstr "Cerca"
-
-#: addons/fonreports/contents.tpl.c:44
-msgid "Application"
-msgstr "Applicazione"
-
-#: addons/fonreports/contents.tpl.c:47
-msgid "Status"
-msgstr "Stato"
-
-#: addons/fonreports/contents.tpl.c:53
-msgid "Search returned no results..."
-msgstr "La ricerca non ha prodotto risultati ..."
-
-#: personal/phoneaccount/generic.tpl.c:5
-#: personal/phoneaccount/paste_generic.tpl.c:8
-msgid "Telephone hardware"
-msgstr "Dispositivo telefonico"
-
-#: personal/phoneaccount/generic.tpl.c:8
-msgid "Telephone"
-msgstr "Telefono"
-
-#: personal/phoneaccount/generic.tpl.c:14
-msgid "Select the accounts home server"
-msgstr "Seleziona il server principale"
-
-#: personal/phoneaccount/generic.tpl.c:17
-msgid "Context"
-msgstr "Contesto"
-
-#: personal/phoneaccount/generic.tpl.c:20
-#: personal/phoneaccount/generic.tpl.c:26
-msgid "Select the accounts context"
-msgstr "Seleziona il contesto dell'account"
-
-#: personal/phoneaccount/generic.tpl.c:23
-msgid "Voicemail context"
-msgstr "Contesto della segreteria telefonica"
diff --git a/asterisk/locale/lv/fusiondirectory.po b/asterisk/locale/lv/fusiondirectory.po
index 87ded1b35aa8a3ba22f7a1bf6009355853dea1a0..284056ba2bbfa80a1a309517a467199862ff02d7 100644
--- a/asterisk/locale/lv/fusiondirectory.po
+++ b/asterisk/locale/lv/fusiondirectory.po
@@ -5,962 +5,124 @@
 # Translators:
 msgid ""
 msgstr ""
-"Project-Id-Version: FusionDirectory-108\n"
+"Project-Id-Version: FusionDirectory-109\n"
 "Report-Msgid-Bugs-To: documentation@lists.fusiondirectory.org\n"
-"POT-Creation-Date: 2015-03-31 11:49+0200\n"
-"PO-Revision-Date: 2015-02-25 15:42+0000\n"
+"POT-Creation-Date: 2014-12-15 17:47+0100\n"
+"PO-Revision-Date: 2014-12-15 16:49+0000\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>\n"
-"Language-Team: Latvian (http://www.transifex.com/projects/p/FusionDirectory-108/language/lv/)\n"
+"Language-Team: Latvian (http://www.transifex.com/projects/p/FusionDirectory-109/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/ogroups/asterisk/class_phonequeue.inc:110
-#: admin/conference/class_phoneConferenceGeneric.inc:104
-#: personal/phoneaccount/class_phoneAccount.inc:148
-msgid "Obsolete entry"
-msgstr ""
-
-#: admin/ogroups/asterisk/class_phonequeue.inc:110
-#: admin/conference/class_phoneConferenceGeneric.inc:104
-#: personal/phoneaccount/class_phoneAccount.inc:148
-#, php-format
-msgid ""
-"The current home server is not available anymore. It will be moved to '%s' "
-"if you save this entry!"
-msgstr ""
-
-#: admin/ogroups/asterisk/class_phonequeue.inc:140
-msgid "ring all"
-msgstr ""
-
-#: admin/ogroups/asterisk/class_phonequeue.inc:141
-msgid "round robin"
-msgstr ""
-
-#: admin/ogroups/asterisk/class_phonequeue.inc:142
-msgid "least recently called"
-msgstr ""
-
-#: admin/ogroups/asterisk/class_phonequeue.inc:143
-msgid "fewest completed calls"
-msgstr ""
-
-#: admin/ogroups/asterisk/class_phonequeue.inc:144
-msgid "random"
-msgstr ""
-
-#: admin/ogroups/asterisk/class_phonequeue.inc:145
-msgid "round robin with memory"
-msgstr ""
-
-#: admin/ogroups/asterisk/class_phonequeue.inc:180
-msgid "Remove the phone queue from this Account"
-msgstr ""
-
-#: admin/ogroups/asterisk/class_phonequeue.inc:181
-#: admin/ogroups/asterisk/class_phonequeue.inc:184
-msgid "phone queue"
-msgstr ""
-
-#: admin/ogroups/asterisk/class_phonequeue.inc:183
-msgid "Create phone queue"
-msgstr ""
-
-#: admin/ogroups/asterisk/class_phonequeue.inc:272
-msgid ""
-"There must be at least one server with an asterisk database to create a "
-"phone queue."
-msgstr ""
-
-#: admin/ogroups/asterisk/class_phonequeue.inc:275
-#: admin/ogroups/asterisk/class_phonequeue.inc:873
-#: admin/conference/class_phoneConferenceGeneric.inc:709
-#: personal/phoneaccount/class_phoneAccount.inc:1350
-#: personal/phoneaccount/class_phoneAccount.inc:1669
-#: admin/ogroups/asterisk/phonequeue.tpl.c:17
-#: admin/conference/generic.tpl.c:20 personal/phoneaccount/generic.tpl.c:11
-msgid "Home server"
-msgstr ""
-
-#: admin/ogroups/asterisk/class_phonequeue.inc:281
-#: admin/ogroups/asterisk/class_phonequeue.inc:871
-#: admin/ogroups/asterisk/phonequeue.tpl.c:23
-msgid "Timeout"
-msgstr ""
-
-#: admin/ogroups/asterisk/class_phonequeue.inc:284
-#: admin/ogroups/asterisk/class_phonequeue.inc:896
-#: admin/ogroups/asterisk/phonequeue.tpl.c:26
-msgid "Retry"
-msgstr ""
-
-#: admin/ogroups/asterisk/class_phonequeue.inc:287
-msgid "Queue length"
-msgstr ""
-
-#: admin/ogroups/asterisk/class_phonequeue.inc:290
-#: admin/ogroups/asterisk/class_phonequeue.inc:874
-#: admin/ogroups/asterisk/phonequeue.tpl.c:35
-msgid "Announce frequency"
-msgstr ""
-
-#: admin/ogroups/asterisk/class_phonequeue.inc:293
-#: admin/conference/class_phoneConferenceGeneric.inc:328
-msgid "Number"
-msgstr ""
-
-#: admin/ogroups/asterisk/class_phonequeue.inc:316
-#: admin/ogroups/asterisk/class_phonequeue.inc:361
-msgid "asterisk"
-msgstr ""
-
-#: admin/ogroups/asterisk/class_phonequeue.inc:345
-#: admin/ogroups/asterisk/class_phonequeue.inc:696
-#: admin/conference/class_phoneConferenceGeneric.inc:369
-#: admin/macro/class_gofonMacro.inc:381 admin/macro/class_gofonMacro.inc:465
-#: addons/fonreports/class_fonreport.inc:190
-#: addons/fonreports/class_fonreport.inc:220
-#: personal/phoneaccount/class_phoneAccount.inc:455
-#: personal/phoneaccount/class_phoneAccount.inc:1061
-msgid "GOfon"
-msgstr ""
-
-#: admin/ogroups/asterisk/class_phonequeue.inc:401
-msgid "Cannot find old queue entry!"
-msgstr ""
-
-#: admin/ogroups/asterisk/class_phonequeue.inc:487
-#, php-format
-msgid ""
-"Found more than one entry named '%s' in queue table. Please inform your "
-"system administrator!"
-msgstr ""
-
-#: admin/ogroups/asterisk/class_phonequeue.inc:728
-#: admin/ogroups/asterisk/class_phonequeue.inc:730
-msgid "telephone number"
-msgstr ""
-
-#: admin/ogroups/asterisk/class_phonequeue.inc:787
-#: admin/ogroups/asterisk/class_phonequeue.inc:829
-#: admin/conference/class_phoneConferenceGeneric.inc:229
-#: admin/conference/class_phoneConferenceGeneric.inc:233
-#: admin/conference/class_phoneConferenceGeneric.inc:271
-#: admin/macro/class_gofonMacro.inc:343 admin/macro/class_gofonMacro.inc:452
-#: admin/macro/class_gofonMacro.inc:461 admin/macro/class_gofonMacro.inc:499
-#: admin/systems/asterisk/class_phoneGeneric.inc:267
-#: admin/systems/asterisk/class_phoneGeneric.inc:308
-#: addons/fonreports/class_fonreport.inc:220
-#: personal/phoneaccount/class_phoneAccount.inc:1046
-#: personal/phoneaccount/class_phoneAccount.inc:1166
-#: personal/phoneaccount/class_phoneAccount.inc:1172
-#: personal/phoneaccount/class_phoneAccount.inc:1368
-#: personal/phoneaccount/class_phoneAccount.inc:1450
-#: personal/phoneaccount/class_phoneAccount.inc:1528
-msgid "Error"
-msgstr ""
-
-#: admin/ogroups/asterisk/class_phonequeue.inc:802
-#: admin/ogroups/asterisk/class_phonequeue.inc:857
-#: admin/conference/class_phoneConferenceGeneric.inc:682
-#: admin/macro/class_gofonMacro.inc:473 admin/macro/class_gofonMacro.inc:484
-#: admin/macro/class_gofonMacro.inc:521
-#: admin/macro/class_gofonMacroParameters.inc:435
-#: admin/systems/asterisk/class_phoneGeneric.inc:277
-#: admin/systems/asterisk/class_phoneGeneric.inc:432
-#: admin/systems/asterisk/class_phoneGeneric.inc:446
-#: admin/systems/asterisk/class_phoneGeneric.inc:463
-#: admin/systems/services/asterisk/class_serviceAsterisk.inc:121
-#: personal/phoneaccount/class_phoneAccount.inc:1476
-#: personal/phoneaccount/class_phoneAccount.inc:1609
-msgid "LDAP error"
-msgstr ""
-
-#: admin/ogroups/asterisk/class_phonequeue.inc:864
-#: admin/systems/asterisk/class_phoneGeneric.inc:472
-#: admin/systems/asterisk/class_phoneGeneric.inc:477
-#: personal/phoneaccount/class_phoneAccount.inc:999
-#: personal/phoneaccount/class_phoneAccount.inc:1012
-#: personal/phoneaccount/class_phoneAccount.inc:1024
-#: personal/phoneaccount/class_phoneAccount.inc:1028
-#: personal/phoneaccount/class_phoneAccount.inc:1031
-#: personal/phoneaccount/class_phoneAccount.inc:1657
-msgid "Phone"
-msgstr ""
-
-#: admin/ogroups/asterisk/class_phonequeue.inc:865
-msgid "Phone group"
-msgstr ""
-
-#: admin/ogroups/asterisk/class_phonequeue.inc:872
-#: admin/ogroups/asterisk/phonequeue.tpl.c:32
-msgid "Max queue length"
-msgstr ""
-
-#: admin/ogroups/asterisk/class_phonequeue.inc:875
-#: admin/ogroups/asterisk/phonequeue.tpl.c:86
-msgid "Allow the called user to transfer his call"
-msgstr ""
-
-#: admin/ogroups/asterisk/class_phonequeue.inc:876
-#: admin/ogroups/asterisk/phonequeue.tpl.c:89
-msgid "Allows calling user to transfer call"
-msgstr ""
-
-#: admin/ogroups/asterisk/class_phonequeue.inc:877
-#: admin/ogroups/asterisk/phonequeue.tpl.c:92
-msgid "Allow the called to hangup by pressing *"
-msgstr ""
-
-#: admin/ogroups/asterisk/class_phonequeue.inc:878
-#: admin/ogroups/asterisk/phonequeue.tpl.c:98
-msgid "Ring instead of playing background music"
-msgstr ""
-
-#: admin/ogroups/asterisk/class_phonequeue.inc:879
-#: admin/ogroups/asterisk/phonequeue.tpl.c:95
-msgid "Allows calling to hangup by pressing *"
-msgstr ""
-
-#: admin/ogroups/asterisk/class_phonequeue.inc:881
-#: admin/ogroups/asterisk/phonequeue.tpl.c:47
-msgid "Music on hold"
-msgstr ""
-
-#: admin/ogroups/asterisk/class_phonequeue.inc:882
-msgid "Welcome music"
-msgstr ""
-
-#: admin/ogroups/asterisk/class_phonequeue.inc:883
-msgid "Report hold time"
-msgstr ""
-
-#: admin/ogroups/asterisk/class_phonequeue.inc:884
-msgid "'You are next' sound"
-msgstr ""
-
-#: admin/ogroups/asterisk/class_phonequeue.inc:885
-msgid "'There are' sound"
-msgstr ""
-
-#: admin/ogroups/asterisk/class_phonequeue.inc:886
-msgid "'Call waiting' sound"
-msgstr ""
-
-#: admin/ogroups/asterisk/class_phonequeue.inc:887
-msgid "'Thank you' sound"
-msgstr ""
-
-#: admin/ogroups/asterisk/class_phonequeue.inc:888
-msgid "'Minutes' sound"
-msgstr ""
-
-#: admin/ogroups/asterisk/class_phonequeue.inc:889
-msgid "'Seconds' sound"
-msgstr ""
-
-#: admin/ogroups/asterisk/class_phonequeue.inc:890
-msgid "'Less than' sound"
-msgstr ""
-
-#: admin/ogroups/asterisk/class_phonequeue.inc:891
-msgid "Queue phone number"
-msgstr ""
-
-#: admin/ogroups/asterisk/class_phonequeue.inc:892
-#: admin/conference/class_phoneConferenceGeneric.inc:707
-#: admin/ogroups/asterisk/phonequeue.tpl.c:20
-#: admin/conference/generic.tpl.c:23
-msgid "Language"
-msgstr ""
-
-#: admin/ogroups/asterisk/class_phonequeue.inc:893
-msgid "Method"
-msgstr ""
-
-#: admin/ogroups/asterisk/class_phonequeue.inc:894
-#: admin/ogroups/asterisk/phonequeue.tpl.c:83
-msgid "Announce holdtime"
-msgstr ""
-
-#: admin/ogroups/asterisk/class_phonequeue.inc:895
-msgid "Announce"
-msgstr ""
-
-#: admin/conference/conf-list.xml:11
-msgid "List of conference rooms"
-msgstr ""
-
-#: admin/conference/conf-list.xml:15 admin/conference/conf-list.xml:74
-msgid "Conference"
-msgstr ""
-
-#: admin/conference/conf-list.xml:41
-#: admin/conference/class_phoneConferenceGeneric.inc:324
-#: admin/conference/class_phoneConferenceGeneric.inc:347
-#: admin/conference/class_phoneConferenceGeneric.inc:702
-#: admin/macro/class_gofonMacro.inc:395 admin/macro/class_gofonMacro.inc:406
-#: admin/macro/macro-list.xml:41
-#: admin/systems/asterisk/class_phoneGeneric.inc:344
-#: admin/systems/asterisk/class_phoneGeneric.inc:348
-#: admin/systems/asterisk/class_phoneGeneric.inc:351
-#: admin/systems/asterisk/class_phoneGeneric.inc:366
-#: admin/systems/asterisk/class_phoneGeneric.inc:482
-#: admin/conference/conf-filter.tpl.c:5 admin/macro/macro-filter.tpl.c:5
-#: admin/macro/parameter.tpl.c:5
-msgid "Name"
-msgstr ""
-
-#: admin/conference/conf-list.xml:49
-#: admin/conference/class_phoneConferenceGeneric.inc:704
-#: admin/macro/class_gofonMacro.inc:547 admin/macro/macro-list.xml:49
-#: admin/systems/asterisk/class_phoneGeneric.inc:484
-#: admin/conference/generic.tpl.c:29 admin/macro/generic.tpl.c:17
-#: admin/systems/asterisk/phone.tpl.c:8
-msgid "Description"
-msgstr ""
-
-#: admin/conference/conf-list.xml:57 admin/macro/macro-list.xml:57
-msgid "Actions"
-msgstr ""
-
-#: admin/conference/conf-list.xml:68 admin/macro/macro-list.xml:68
-msgid "Create"
-msgstr ""
-
-#: admin/conference/conf-list.xml:86 admin/conference/conf-list.xml:125
-#: admin/macro/macro-list.xml:86 admin/macro/macro-list.xml:125
-msgid "Edit"
-msgstr ""
-
-#: admin/conference/conf-list.xml:93 admin/conference/conf-list.xml:138
-#: admin/macro/macro-list.xml:93 admin/macro/macro-list.xml:138
-msgid "Remove"
-msgstr ""
-
-#: admin/conference/class_phoneConferenceGeneric.inc:233
-#, php-format
-msgid "Cannot delete entry from server '%s' because it seems to be removed!"
-msgstr ""
-
-#: admin/conference/class_phoneConferenceGeneric.inc:308
-#, php-format
-msgid ""
-"The previously selected asterisk home server '%s' is no longer available!"
-msgstr ""
-
-#: admin/conference/class_phoneConferenceGeneric.inc:315
-#: admin/conference/generic.tpl.c:47
-msgid "PIN"
-msgstr ""
-
-#: admin/conference/class_phoneConferenceGeneric.inc:333
-#: admin/conference/class_phoneConferenceGeneric.inc:719
-msgid "Lifetime"
-msgstr ""
-
-#: admin/conference/class_phoneConferenceGeneric.inc:399
-#: personal/phoneaccount/class_phoneAccount.inc:346
-#: personal/phoneaccount/class_phoneAccount.inc:359
-#: personal/phoneaccount/class_phoneAccount.inc:617
-#: personal/phoneaccount/class_phoneAccount.inc:656
-#: personal/phoneaccount/class_phoneAccount.inc:1519
-#: personal/phoneaccount/class_phoneAccount.inc:1695
-#: admin/conference/remove.tpl.c:2 admin/macro/remove.tpl.c:2
-msgid "Warning"
-msgstr ""
-
-#: admin/conference/class_phoneConferenceGeneric.inc:400
-#, php-format
-msgid ""
-"FusionDirectory identified problems with your MySQL table definition, please"
-" activate debugging for details."
-msgstr ""
-
-#: admin/conference/class_phoneConferenceGeneric.inc:606
-#: admin/conference/class_phoneConferenceGeneric.inc:608
-#, php-format
-msgid "'%s' is already assigned to '%s'!"
-msgstr ""
-
-#: admin/conference/class_phoneConferenceGeneric.inc:693
-msgid "Phone Conference"
-msgstr ""
-
-#: admin/conference/class_phoneConferenceGeneric.inc:694
-msgid "Phone conference management"
-msgstr ""
-
-#: admin/conference/class_phoneConferenceGeneric.inc:696
-msgid "GOfon conference"
-msgstr ""
-
-#: admin/conference/class_phoneConferenceGeneric.inc:698
-msgid "Asterisk conference"
-msgstr ""
-
-#: admin/conference/class_phoneConferenceGeneric.inc:703
-#: admin/macro/class_gofonMacro.inc:546
-#: admin/systems/asterisk/class_phoneGeneric.inc:483
-#: admin/conference/generic.tpl.c:17 admin/macro/generic.tpl.c:14
-#: admin/systems/asterisk/phone.tpl.c:5
-msgid "Base"
-msgstr ""
-
-#: admin/conference/class_phoneConferenceGeneric.inc:705
-msgid "Conference PIN"
-msgstr ""
-
-#: admin/conference/class_phoneConferenceGeneric.inc:710
-#: admin/conference/generic.tpl.c:44
-msgid "Preset PIN"
-msgstr ""
-
-#: admin/conference/class_phoneConferenceGeneric.inc:711
-#: admin/conference/generic.tpl.c:50
-msgid "Record conference"
-msgstr ""
-
-#: admin/conference/class_phoneConferenceGeneric.inc:712
-#: admin/conference/generic.tpl.c:59
-msgid "Play music on hold"
-msgstr ""
-
-#: admin/conference/class_phoneConferenceGeneric.inc:713
-msgid "Activate menu"
-msgstr ""
-
-#: admin/conference/class_phoneConferenceGeneric.inc:714
-msgid "Announce user activity"
-msgstr ""
-
-#: admin/conference/class_phoneConferenceGeneric.inc:715
-msgid "Count user"
-msgstr ""
-
-#: admin/conference/class_phoneConferenceGeneric.inc:716
-msgid "Conference type"
-msgstr ""
-
-#: admin/conference/class_phoneConferenceGeneric.inc:718
-msgid "Format"
-msgstr ""
-
-#: admin/conference/class_phoneConferenceGeneric.inc:720
-#: personal/phoneaccount/class_phoneAccount.inc:1666
-msgid "Telephone number"
-msgstr ""
-
-#: admin/conference/class_phoneConferenceGeneric.inc:721
-msgid "Owner"
-msgstr ""
-
-#: admin/conference/class_phoneConferenceManagment.inc:36
-msgid "Phone Conferences"
-msgstr ""
-
-#: admin/conference/class_phoneConferenceManagment.inc:37
-msgid "Phone Conference management"
-msgstr ""
-
-#: admin/macro/class_gofonMacro.inc:202
-#, php-format
-msgid ""
-"Macro could not be removed from server '%s', please check database "
-"consistency!"
-msgstr ""
-
-#: admin/macro/class_gofonMacro.inc:264
-#, php-format
-msgid "Application missing in line %s!"
-msgstr ""
-
-#: admin/macro/class_gofonMacro.inc:267
-#, php-format
-msgid "Priority missing in line %s!"
-msgstr ""
-
-#: admin/macro/class_gofonMacro.inc:271
-#, php-format
-msgid "Extension missing in line %s!"
-msgstr ""
-
-#: admin/macro/class_gofonMacro.inc:281
-#, php-format
-msgid "Duplicate combination of 'extension' and 'priority' in line %s!"
-msgstr ""
-
-#: admin/macro/class_gofonMacro.inc:317
-#, php-format
-msgid ""
-"Macro could not be added to server '%s', please check database consistency!"
-msgstr ""
-
-#: admin/macro/class_gofonMacro.inc:410
-msgid "Name can be 20 characters at maximum!"
-msgstr ""
-
-#: admin/macro/class_gofonMacro.inc:419
-msgid "Macro is still in use!"
-msgstr ""
-
-#: admin/macro/class_gofonMacro.inc:426
-msgid "Macro is empty!"
-msgstr ""
-
-#: admin/macro/class_gofonMacro.inc:452
-#: admin/systems/asterisk/class_phoneGeneric.inc:267
-#, php-format
-msgid "Cannot delete entry because it is still in use by '%s'!"
-msgstr ""
-
-#: admin/macro/class_gofonMacro.inc:465
-#: addons/fonreports/class_fonreport.inc:190
-#: personal/phoneaccount/class_phoneAccount.inc:455
-#: personal/phoneaccount/class_phoneAccount.inc:1061
-#: personal/phoneaccount/class_phoneAccount.inc:1567
-msgid "Configuration error"
-msgstr ""
-
-#: admin/macro/class_gofonMacro.inc:536 admin/macro/class_gofonMacro.inc:541
-msgid "Asterisk macro"
-msgstr ""
-
-#: admin/macro/class_gofonMacro.inc:537
-msgid "Asterisk macro management"
-msgstr ""
-
-#: admin/macro/class_gofonMacro.inc:539
-msgid "GOfon macro"
-msgstr ""
-
-#: admin/macro/class_gofonMacro.inc:545 admin/macro/generic.tpl.c:2
-#: admin/macro/generic.tpl.c:5 admin/macro/paste_generic.tpl.c:2
-#: admin/macro/paste_generic.tpl.c:5
-msgid "Macro name"
-msgstr ""
-
-#: admin/macro/class_gofonMacro.inc:548 admin/macro/generic.tpl.c:8
-msgid "Display name"
-msgstr ""
-
-#: admin/macro/class_gofonMacro.inc:549
-msgid "Macro content and parameter"
-msgstr ""
-
-#: admin/macro/class_gofonMacro.inc:550
-msgid "Visibility flag"
-msgstr ""
-
-#: admin/macro/class_gofonMacroManagement.inc:36
-msgid "Phone Macros"
-msgstr ""
-
-#: admin/macro/class_gofonMacroManagement.inc:37
-msgid "Phone Macros management"
-msgstr ""
-
-#: admin/macro/macro-list.xml:11
-msgid "List of macros"
-msgstr ""
-
-#: admin/macro/macro-list.xml:15 admin/macro/macro-list.xml:74
-msgid "Macro"
-msgstr ""
-
-#: admin/macro/class_gofonMacroParameters.inc:58
-msgid "Parameter"
-msgstr ""
-
-#: admin/macro/class_gofonMacroParameters.inc:59
-msgid "Asterisk macro parameter"
-msgstr ""
-
-#: admin/macro/class_gofonMacroParameters.inc:234
-#: personal/phoneaccount/generic.tpl.c:35
-msgid "Phone macro"
-msgstr ""
-
-#: admin/macro/class_gofonMacroParameters.inc:290
-msgid "String"
-msgstr ""
-
-#: admin/macro/class_gofonMacroParameters.inc:291
-msgid "Combobox"
-msgstr ""
-
-#: admin/macro/class_gofonMacroParameters.inc:292
-msgid "Bool"
-msgstr ""
-
-#: admin/macro/class_gofonMacroParameters.inc:298
-msgid "Delete unused"
-msgstr ""
-
-#: admin/macro/class_gofonMacroParameters.inc:374
-#, php-format
-msgid "Parameter %s contains invalid character. '!,#' is used as delimiter!"
-msgstr ""
-
-#: admin/macro/class_gofonMacroParameters.inc:379
-#, php-format
-msgid "Parameter %s is invalid!"
-msgstr ""
-
-#: admin/macro/class_gofonMacroParameters.inc:408
-#: personal/phoneaccount/class_phoneAccount.inc:1600
-msgid "Information"
-msgstr ""
-
-#: admin/macro/class_gofonMacroParameters.inc:408
-msgid ""
-"Number of parameters for this macro has changed. Please update all users "
-"using it!"
-msgstr ""
-
-#: admin/systems/asterisk/class_phoneGeneric.inc:151
-msgid "phone"
-msgstr ""
-
-#: admin/systems/asterisk/class_phoneGeneric.inc:230
-msgid "yes"
-msgstr ""
-
-#: admin/systems/asterisk/class_phoneGeneric.inc:230
-msgid "no"
-msgstr ""
-
-#: admin/systems/asterisk/class_phoneGeneric.inc:247
-msgid "dynamic"
-msgstr ""
-
-#: admin/systems/asterisk/class_phoneGeneric.inc:247
-msgid "Networksettings"
-msgstr ""
-
-#: admin/systems/asterisk/class_phoneGeneric.inc:330
-#: admin/systems/asterisk/class_phoneGeneric.inc:333
-msgid "IP address"
-msgstr ""
-
-#: admin/systems/asterisk/class_phoneGeneric.inc:473
-msgid "Phone information"
-msgstr ""
-
-#: admin/systems/asterisk/class_phoneGeneric.inc:476
-#: personal/phoneaccount/class_phoneAccount.inc:1668
-msgid "Phone hardware"
-msgstr ""
-
-#: admin/systems/asterisk/class_phoneGeneric.inc:485
-msgid "SIP Mode"
-msgstr ""
-
-#: admin/systems/asterisk/class_phoneGeneric.inc:486
-msgid "SIP DTMF mode"
-msgstr ""
-
-#: admin/systems/asterisk/class_phoneGeneric.inc:487
-msgid "SIP Default ip"
-msgstr ""
-
-#: admin/systems/asterisk/class_phoneGeneric.inc:488
-msgid "SIP Qualify"
-msgstr ""
-
-#: admin/systems/asterisk/class_phoneGeneric.inc:489
-msgid "IAX authentication type"
-msgstr ""
-
-#: admin/systems/asterisk/class_phoneGeneric.inc:490
-msgid "IAX secret"
-msgstr ""
-
-#: admin/systems/asterisk/class_phoneGeneric.inc:491
-msgid "IAX account code"
-msgstr ""
-
-#: admin/systems/asterisk/class_phoneGeneric.inc:492
-msgid "IAX trunk lines"
-msgstr ""
-
-#: admin/systems/asterisk/class_phoneGeneric.inc:493
-msgid "IAX permit settings"
-msgstr ""
-
-#: admin/systems/asterisk/class_phoneGeneric.inc:494
-msgid "IAX deny settings"
-msgstr ""
-
-#: admin/systems/asterisk/class_phoneGeneric.inc:495
-msgid "CAPI MSN"
-msgstr ""
-
-#: admin/systems/asterisk/class_phoneGeneric.inc:496
-msgid "Hardware type"
-msgstr ""
-
-#: admin/systems/services/asterisk/class_serviceAsterisk.inc:35
-msgid "VoIP database information"
-msgstr ""
-
-#: admin/systems/services/asterisk/class_serviceAsterisk.inc:38
-msgid "Asterisk DB user"
-msgstr ""
-
-#: admin/systems/services/asterisk/class_serviceAsterisk.inc:38
-msgid "Login for asterisk database administrator"
-msgstr ""
-
-#: admin/systems/services/asterisk/class_serviceAsterisk.inc:42
-msgid "Password"
-msgstr ""
-
-#: admin/systems/services/asterisk/class_serviceAsterisk.inc:42
-msgid "Password for asterisk database administrator"
-msgstr ""
-
-#: admin/systems/services/asterisk/class_serviceAsterisk.inc:46
-msgid "Country dial prefix"
-msgstr ""
-
-#: admin/systems/services/asterisk/class_serviceAsterisk.inc:50
-msgid "Local dial prefix"
-msgstr ""
-
-#: admin/systems/services/asterisk/class_serviceAsterisk.inc:54
-msgid "Driver"
-msgstr ""
-
-#: admin/systems/services/asterisk/class_serviceAsterisk.inc:54
-msgid "Driver to use to contact this database."
-msgstr ""
-
-#: admin/systems/services/asterisk/class_serviceAsterisk.inc:95
-#, php-format
-msgid ""
-"You can't remove the asterisk database extension, it is still in use by "
-"these objects '%s'."
-msgstr ""
-
-#: admin/systems/services/asterisk/class_serviceAsterisk.inc:140
-msgid "VoIP service (asterisk)"
-msgstr ""
-
-#: admin/systems/services/asterisk/class_serviceAsterisk.inc:141
-msgid "VoIP - asterisk management"
-msgstr ""
-
-#: admin/systems/services/asterisk/class_serviceAsterisk.inc:141
-msgid "Services"
-msgstr ""
-
-#: addons/fonreports/class_fonreport.inc:232
-msgid "Insufficient permissions"
-msgstr ""
-
-#: addons/fonreports/class_fonreport.inc:251
-msgid "Y-M-D"
-msgstr ""
-
-#: addons/fonreports/class_fonreport.inc:418
-#: addons/fonreports/class_fonreport.inc:419
-#: addons/fonreports/class_fonreport.inc:424 addons/fonreports/main.inc:46
-msgid "Phone reports"
-msgstr ""
-
-#: addons/fonreports/class_fonreport.inc:419
-msgid "All entries are readonly"
-msgstr ""
-
-#: addons/fonreports/class_fonreport.inc:428
-#: addons/fonreports/contents.tpl.c:32
-msgid "Date"
-msgstr ""
-
-#: addons/fonreports/class_fonreport.inc:429
-#: addons/fonreports/contents.tpl.c:35
-msgid "Source"
-msgstr ""
-
-#: addons/fonreports/class_fonreport.inc:430
-#: addons/fonreports/contents.tpl.c:38
-msgid "Destination"
-msgstr ""
-
-#: addons/fonreports/class_fonreport.inc:431
-#: addons/fonreports/contents.tpl.c:41
-msgid "Channel"
-msgstr ""
-
-#: addons/fonreports/class_fonreport.inc:432
-msgid "Application called"
-msgstr ""
-
-#: addons/fonreports/class_fonreport.inc:433
-msgid "Disposition"
-msgstr ""
-
-#: addons/fonreports/class_fonreport.inc:434
-#: addons/fonreports/contents.tpl.c:50
-msgid "Duration"
-msgstr ""
-
-#: personal/phoneaccount/class_phoneAccount.inc:176
-msgid "automatic"
-msgstr ""
-
-#: personal/phoneaccount/class_phoneAccount.inc:212
-msgid "no macro"
-msgstr ""
-
-#: personal/phoneaccount/class_phoneAccount.inc:240
-msgid "undefined"
-msgstr ""
-
-#: personal/phoneaccount/class_phoneAccount.inc:359
-#, php-format
-msgid ""
-"Cannot identify telephone extension in database, please try to save again."
-msgstr ""
-
-#: personal/phoneaccount/class_phoneAccount.inc:577
-#: personal/phoneaccount/class_phoneAccount.inc:595
-msgid "Abort saving entries to keep the database consistent."
+#: admin/systems/asterisk/class_phoneIAX.inc:30
+#: admin/systems/asterisk/class_phoneIAX.inc:34
+#: personal/asterisk/class_asteriskAccount.inc:45
+msgid "Phone"
 msgstr ""
 
-#: personal/phoneaccount/class_phoneAccount.inc:618
-#: personal/phoneaccount/class_phoneAccount.inc:657
-#: personal/phoneaccount/class_phoneAccount.inc:1520
-#, php-format
-msgid ""
-"FusionDirectory identified problems with your database table definition!"
+#: admin/systems/asterisk/class_phoneIAX.inc:31
+msgid "Asterisk phone"
 msgstr ""
 
-#: personal/phoneaccount/class_phoneAccount.inc:1023
-msgid "Remove phone account"
+#: admin/systems/asterisk/class_phoneIAX.inc:33
+msgid "Phone hardware"
 msgstr ""
 
-#: personal/phoneaccount/class_phoneAccount.inc:1027
-#: personal/phoneaccount/class_phoneAccount.inc:1030
-msgid "Create phone account"
+#: admin/systems/asterisk/class_phoneIAX.inc:46
+#: personal/asterisk/class_asteriskAccount.inc:42
+msgid "Telephone"
 msgstr ""
 
-#: personal/phoneaccount/class_phoneAccount.inc:1028
-msgid "User uid"
+#: admin/systems/asterisk/class_phoneIAX.inc:49
+msgid "Name"
 msgstr ""
 
-#: personal/phoneaccount/class_phoneAccount.inc:1046
-msgid "Selected macro is not available anymore!"
+#: admin/systems/asterisk/class_phoneIAX.inc:49
+msgid "Name of this phone"
 msgstr ""
 
-#: personal/phoneaccount/class_phoneAccount.inc:1221
-msgid "Choose your private phone"
+#: admin/systems/asterisk/class_phoneIAX.inc:53
+msgid "Account name"
 msgstr ""
 
-#: personal/phoneaccount/class_phoneAccount.inc:1346
-msgid ""
-"There must be at least one server with an asterisk database to create a "
-"phone account."
+#: admin/systems/asterisk/class_phoneIAX.inc:53
+msgid "Name of the account"
 msgstr ""
 
-#: personal/phoneaccount/class_phoneAccount.inc:1354
-#: personal/phoneaccount/class_phoneAccount.inc:1357
-#: personal/phoneaccount/generic.tpl.c:29
-#: personal/phoneaccount/paste_generic.tpl.c:11
-msgid "Voicemail PIN"
+#: admin/systems/services/asterisk/class_serviceAsterisk.inc:35
+msgid "VoIP database information"
 msgstr ""
 
-#: personal/phoneaccount/class_phoneAccount.inc:1354
-msgid "Between 1-4 charactes"
+#: admin/systems/services/asterisk/class_serviceAsterisk.inc:38
+msgid "Asterisk DB user"
 msgstr ""
 
-#: personal/phoneaccount/class_phoneAccount.inc:1362
-#: personal/phoneaccount/generic.tpl.c:32
-#: personal/phoneaccount/paste_generic.tpl.c:14
-msgid "Phone PIN"
+#: admin/systems/services/asterisk/class_serviceAsterisk.inc:38
+msgid "Login for asterisk database administrator"
 msgstr ""
 
-#: personal/phoneaccount/class_phoneAccount.inc:1394
-#: admin/conference/generic.tpl.c:38 admin/conference/paste_generic.tpl.c:8
-msgid "Phone number"
+#: admin/systems/services/asterisk/class_serviceAsterisk.inc:42
+msgid "Password"
 msgstr ""
 
-#: personal/phoneaccount/class_phoneAccount.inc:1402
-#, php-format
-msgid "macro parameter %s"
+#: admin/systems/services/asterisk/class_serviceAsterisk.inc:42
+msgid "Password for asterisk database administrator"
 msgstr ""
 
-#: personal/phoneaccount/class_phoneAccount.inc:1450
-msgid "An error occured while updating the database entries!"
+#: admin/systems/services/asterisk/class_serviceAsterisk.inc:46
+msgid "Country dial prefix"
 msgstr ""
 
-#: personal/phoneaccount/class_phoneAccount.inc:1567
-msgid "Was not able to found any asterisk server"
+#: admin/systems/services/asterisk/class_serviceAsterisk.inc:50
+msgid "Local dial prefix"
 msgstr ""
 
-#: personal/phoneaccount/class_phoneAccount.inc:1600
-#, php-format
-msgid "User '%s' has been removed from phone queue '%s'."
+#: admin/systems/services/asterisk/class_serviceAsterisk.inc:54
+msgid "Driver"
 msgstr ""
 
-#: personal/phoneaccount/class_phoneAccount.inc:1637
-#: personal/phoneaccount/class_phoneAccount.inc:1639
-#, php-format
-msgid "The specified telephonenumber '%s' is already assigned to '%s'."
+#: admin/systems/services/asterisk/class_serviceAsterisk.inc:54
+msgid "Driver to use to contact this database."
 msgstr ""
 
-#: personal/phoneaccount/class_phoneAccount.inc:1649
+#: admin/systems/services/asterisk/class_serviceAsterisk.inc:95
 #, php-format
 msgid ""
-"The previously selected asterisk home server (%s) is no longer available. "
-"Remove aborted."
-msgstr ""
-
-#: personal/phoneaccount/class_phoneAccount.inc:1658
-msgid "Phone account settings"
-msgstr ""
-
-#: personal/phoneaccount/class_phoneAccount.inc:1667
-msgid "Macro settings"
-msgstr ""
-
-#: personal/phoneaccount/class_phoneAccount.inc:1670
-msgid "Phone context"
+"You can't remove the asterisk database extension, it is still in use by "
+"these objects '%s'."
 msgstr ""
 
-#: personal/phoneaccount/class_phoneAccount.inc:1671
-msgid "Voice mail context"
+#: admin/systems/services/asterisk/class_serviceAsterisk.inc:121
+msgid "LDAP error"
 msgstr ""
 
-#: personal/phoneaccount/class_phoneAccount.inc:1672
-msgid "Telephone pin"
+#: admin/systems/services/asterisk/class_serviceAsterisk.inc:140
+msgid "VoIP service (asterisk)"
 msgstr ""
 
-#: personal/phoneaccount/class_phoneAccount.inc:1673
-msgid "Voicemail pin"
+#: admin/systems/services/asterisk/class_serviceAsterisk.inc:141
+msgid "VoIP - asterisk management"
 msgstr ""
 
-#: personal/phoneaccount/class_phoneAccount.inc:1695
-#, php-format
-msgid "You need to configure %s contexts first"
+#: admin/systems/services/asterisk/class_serviceAsterisk.inc:141
+msgid "Services"
 msgstr ""
 
-#: personal/phoneaccount/main.inc:124
-msgid "Click the 'Edit' button below to change informations in this dialog"
+#: personal/asterisk/class_asteriskAccount.inc:30
+#: config/asterisk/class_asteriskPluginConfig.inc:28
+#: config/asterisk/class_asteriskPluginConfig.inc:41
+msgid "Asterisk"
 msgstr ""
 
-#: personal/phoneaccount/main.inc:134
-#: personal/phoneaccount/paste_generic.tpl.c:2
-msgid "Phone settings"
+#: personal/asterisk/class_asteriskAccount.inc:31
+msgid "Asterisk account"
 msgstr ""
 
-#: config/asterisk/class_asteriskPluginConfig.inc:28
-#: config/asterisk/class_asteriskPluginConfig.inc:41
-msgid "Asterisk"
+#: personal/asterisk/class_asteriskAccount.inc:45
+msgid "Select the phone associated to this user"
 msgstr ""
 
 #: config/asterisk/class_asteriskPluginConfig.inc:29
@@ -1010,338 +172,3 @@ msgstr ""
 #: config/asterisk/class_asteriskPluginConfig.inc:72
 msgid "Available voicemail contexts"
 msgstr ""
-
-#: admin/ogroups/asterisk/phonequeue.tpl.c:2
-msgid ""
-"Only users with the same asterisk home server will be included to this "
-"queue."
-msgstr ""
-
-#: admin/ogroups/asterisk/phonequeue.tpl.c:5
-#: personal/phoneaccount/generic.tpl.c:2
-#: personal/phoneaccount/paste_generic.tpl.c:5
-msgid "Phone numbers"
-msgstr ""
-
-#: admin/ogroups/asterisk/phonequeue.tpl.c:8
-msgid "Up"
-msgstr ""
-
-#: admin/ogroups/asterisk/phonequeue.tpl.c:11
-msgid "Down"
-msgstr ""
-
-#: admin/ogroups/asterisk/phonequeue.tpl.c:14
-#: admin/conference/generic.tpl.c:41
-msgid "Options"
-msgstr ""
-
-#: admin/ogroups/asterisk/phonequeue.tpl.c:29
-msgid "Strategy"
-msgstr ""
-
-#: admin/ogroups/asterisk/phonequeue.tpl.c:38
-msgid "(in seconds)"
-msgstr ""
-
-#: admin/ogroups/asterisk/phonequeue.tpl.c:41
-msgid "Queue sound setup"
-msgstr ""
-
-#: admin/ogroups/asterisk/phonequeue.tpl.c:44
-msgid "Use music on hold instead of ringing"
-msgstr ""
-
-#: admin/ogroups/asterisk/phonequeue.tpl.c:50
-msgid "Welcome sound file"
-msgstr ""
-
-#: admin/ogroups/asterisk/phonequeue.tpl.c:53
-msgid "Announce message"
-msgstr ""
-
-#: admin/ogroups/asterisk/phonequeue.tpl.c:56
-msgid "Sound file for 'You are next ...'"
-msgstr ""
-
-#: admin/ogroups/asterisk/phonequeue.tpl.c:59
-msgid "'There are ...'"
-msgstr ""
-
-#: admin/ogroups/asterisk/phonequeue.tpl.c:62
-msgid "'... calls waiting'"
-msgstr ""
-
-#: admin/ogroups/asterisk/phonequeue.tpl.c:65
-msgid "'Thank you' message"
-msgstr ""
-
-#: admin/ogroups/asterisk/phonequeue.tpl.c:68
-msgid "'minutes' sound file"
-msgstr ""
-
-#: admin/ogroups/asterisk/phonequeue.tpl.c:71
-msgid "'seconds' sound file"
-msgstr ""
-
-#: admin/ogroups/asterisk/phonequeue.tpl.c:74
-msgid "Hold sound file"
-msgstr ""
-
-#: admin/ogroups/asterisk/phonequeue.tpl.c:77
-msgid "Less Than sound file"
-msgstr ""
-
-#: admin/ogroups/asterisk/phonequeue.tpl.c:80
-msgid "Phone attributes "
-msgstr ""
-
-#: admin/conference/conf-filter.tpl.c:2 admin/macro/macro-filter.tpl.c:2
-#: addons/fonreports/contents.tpl.c:2
-msgid "Filter"
-msgstr ""
-
-#: admin/conference/generic.tpl.c:2
-msgid "Properties"
-msgstr ""
-
-#: admin/conference/generic.tpl.c:5 admin/conference/paste_generic.tpl.c:2
-msgid "Conference name"
-msgstr ""
-
-#: admin/conference/generic.tpl.c:8 admin/conference/paste_generic.tpl.c:5
-msgid "Name of conference to create"
-msgstr ""
-
-#: admin/conference/generic.tpl.c:11
-msgid "Type"
-msgstr ""
-
-#: admin/conference/generic.tpl.c:14
-msgid "Choose subtree to place conference in"
-msgstr ""
-
-#: admin/conference/generic.tpl.c:26
-msgid "Select language"
-msgstr ""
-
-#: admin/conference/generic.tpl.c:32
-msgid "Descriptive text for department"
-msgstr ""
-
-#: admin/conference/generic.tpl.c:35
-msgid "Lifetime (in days)"
-msgstr ""
-
-#: admin/conference/generic.tpl.c:53
-msgid "Sound file format"
-msgstr ""
-
-#: admin/conference/generic.tpl.c:56
-msgid "Choose subtree to place department in"
-msgstr ""
-
-#: admin/conference/generic.tpl.c:62
-msgid "Activate session menu"
-msgstr ""
-
-#: admin/conference/generic.tpl.c:65
-msgid "Announce users joining or leaving the conference"
-msgstr ""
-
-#: admin/conference/generic.tpl.c:68
-msgid "Count users"
-msgstr ""
-
-#: admin/conference/remove.tpl.c:5 admin/macro/remove.tpl.c:5
-msgid ""
-"Please double check if you really want to do this since there is no way for "
-"FusionDirectory to get your data back."
-msgstr ""
-
-#: admin/conference/remove.tpl.c:8 admin/macro/remove.tpl.c:8
-msgid "So - if you're sure - press 'Delete' to continue or 'Cancel' to abort."
-msgstr ""
-
-#: admin/macro/generic.tpl.c:11
-msgid "Macro name to be displayed"
-msgstr ""
-
-#: admin/macro/generic.tpl.c:20
-msgid "Visible for user"
-msgstr ""
-
-#: admin/macro/generic.tpl.c:23
-msgid "Macro text"
-msgstr ""
-
-#: admin/macro/parameter.tpl.c:2
-msgid "Argument"
-msgstr ""
-
-#: admin/macro/parameter.tpl.c:8
-msgid "type"
-msgstr ""
-
-#: admin/macro/parameter.tpl.c:11
-msgid "Default value"
-msgstr ""
-
-#: admin/macro/parameter.tpl.c:14
-msgid "You are not allowed to view the macro parameter settings"
-msgstr ""
-
-#: admin/systems/asterisk/phonesettings.tpl.c:2
-msgid "Advanced phone settings"
-msgstr ""
-
-#: admin/systems/asterisk/phonesettings.tpl.c:5
-msgid "Phone type"
-msgstr ""
-
-#: admin/systems/asterisk/phonesettings.tpl.c:8
-#: admin/systems/asterisk/phonesettings.tpl.c:14
-#: admin/systems/asterisk/phonesettings.tpl.c:20
-#: admin/systems/asterisk/phonesettings.tpl.c:26
-#: admin/systems/asterisk/phonesettings.tpl.c:35
-#: admin/systems/asterisk/phonesettings.tpl.c:47
-#: admin/systems/asterisk/phonesettings.tpl.c:65
-msgid "Choose a phone type"
-msgstr ""
-
-#: admin/systems/asterisk/phonesettings.tpl.c:11
-msgid "Mode"
-msgstr ""
-
-#: admin/systems/asterisk/phonesettings.tpl.c:17
-msgid "DTMF mode"
-msgstr ""
-
-#: admin/systems/asterisk/phonesettings.tpl.c:23
-#: admin/systems/asterisk/phonesettings.tpl.c:38
-msgid "Default IP"
-msgstr ""
-
-#: admin/systems/asterisk/phonesettings.tpl.c:29
-#: admin/systems/asterisk/phonesettings.tpl.c:41
-msgid "Response timeout"
-msgstr ""
-
-#: admin/systems/asterisk/phonesettings.tpl.c:32
-msgid "Modus"
-msgstr ""
-
-#: admin/systems/asterisk/phonesettings.tpl.c:44
-msgid "Authtype"
-msgstr ""
-
-#: admin/systems/asterisk/phonesettings.tpl.c:50
-msgid "Secret"
-msgstr ""
-
-#: admin/systems/asterisk/phonesettings.tpl.c:53
-msgid "GoFonInkeys"
-msgstr ""
-
-#: admin/systems/asterisk/phonesettings.tpl.c:56
-msgid "GoFonOutKeys"
-msgstr ""
-
-#: admin/systems/asterisk/phonesettings.tpl.c:59
-msgid "Account code"
-msgstr ""
-
-#: admin/systems/asterisk/phonesettings.tpl.c:62
-msgid "Trunk lines"
-msgstr ""
-
-#: admin/systems/asterisk/phonesettings.tpl.c:68
-msgid "Hosts that are allowed to connect"
-msgstr ""
-
-#: admin/systems/asterisk/phonesettings.tpl.c:71
-#: admin/systems/asterisk/phonesettings.tpl.c:77
-msgid "List of alternative mail addresses"
-msgstr ""
-
-#: admin/systems/asterisk/phonesettings.tpl.c:74
-msgid "Hosts that are not allowed to connect"
-msgstr ""
-
-#: admin/systems/asterisk/phonesettings.tpl.c:80
-msgid "MSN"
-msgstr ""
-
-#: admin/systems/asterisk/phone.tpl.c:2
-msgid "Phone name"
-msgstr ""
-
-#: addons/fonreports/contents.tpl.c:5
-msgid "Search for"
-msgstr ""
-
-#: addons/fonreports/contents.tpl.c:8
-msgid "Enter user name to search for"
-msgstr ""
-
-#: addons/fonreports/contents.tpl.c:11 addons/fonreports/contents.tpl.c:26
-msgid "in"
-msgstr ""
-
-#: addons/fonreports/contents.tpl.c:14
-msgid "Select subtree to base search on"
-msgstr ""
-
-#: addons/fonreports/contents.tpl.c:17
-msgid "on"
-msgstr ""
-
-#: addons/fonreports/contents.tpl.c:20
-msgid "Select server to search on"
-msgstr ""
-
-#: addons/fonreports/contents.tpl.c:23
-msgid "during"
-msgstr ""
-
-#: addons/fonreports/contents.tpl.c:29
-msgid "Search"
-msgstr ""
-
-#: addons/fonreports/contents.tpl.c:44
-msgid "Application"
-msgstr ""
-
-#: addons/fonreports/contents.tpl.c:47
-msgid "Status"
-msgstr ""
-
-#: addons/fonreports/contents.tpl.c:53
-msgid "Search returned no results..."
-msgstr ""
-
-#: personal/phoneaccount/generic.tpl.c:5
-#: personal/phoneaccount/paste_generic.tpl.c:8
-msgid "Telephone hardware"
-msgstr ""
-
-#: personal/phoneaccount/generic.tpl.c:8
-msgid "Telephone"
-msgstr ""
-
-#: personal/phoneaccount/generic.tpl.c:14
-msgid "Select the accounts home server"
-msgstr ""
-
-#: personal/phoneaccount/generic.tpl.c:17
-msgid "Context"
-msgstr ""
-
-#: personal/phoneaccount/generic.tpl.c:20
-#: personal/phoneaccount/generic.tpl.c:26
-msgid "Select the accounts context"
-msgstr ""
-
-#: personal/phoneaccount/generic.tpl.c:23
-msgid "Voicemail context"
-msgstr ""
diff --git a/asterisk/locale/nb/fusiondirectory.po b/asterisk/locale/nb/fusiondirectory.po
index 1182d2fa14126c75d7a4cafa55a8dbceed753787..63d3feb037c18c4256a1ba6f5dc08b5a8ea5f4f6 100644
--- a/asterisk/locale/nb/fusiondirectory.po
+++ b/asterisk/locale/nb/fusiondirectory.po
@@ -5,962 +5,124 @@
 # Translators:
 msgid ""
 msgstr ""
-"Project-Id-Version: FusionDirectory-108\n"
+"Project-Id-Version: FusionDirectory-109\n"
 "Report-Msgid-Bugs-To: documentation@lists.fusiondirectory.org\n"
-"POT-Creation-Date: 2015-03-31 11:49+0200\n"
-"PO-Revision-Date: 2015-02-25 16:12+0000\n"
+"POT-Creation-Date: 2014-12-15 17:47+0100\n"
+"PO-Revision-Date: 2015-02-25 16:04+0000\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>\n"
-"Language-Team: Norwegian BokmÃ¥l (http://www.transifex.com/projects/p/FusionDirectory-108/language/nb/)\n"
+"Language-Team: Norwegian BokmÃ¥l (http://www.transifex.com/projects/p/FusionDirectory-109/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/ogroups/asterisk/class_phonequeue.inc:110
-#: admin/conference/class_phoneConferenceGeneric.inc:104
-#: personal/phoneaccount/class_phoneAccount.inc:148
-msgid "Obsolete entry"
-msgstr ""
-
-#: admin/ogroups/asterisk/class_phonequeue.inc:110
-#: admin/conference/class_phoneConferenceGeneric.inc:104
-#: personal/phoneaccount/class_phoneAccount.inc:148
-#, php-format
-msgid ""
-"The current home server is not available anymore. It will be moved to '%s' "
-"if you save this entry!"
-msgstr ""
-
-#: admin/ogroups/asterisk/class_phonequeue.inc:140
-msgid "ring all"
-msgstr ""
-
-#: admin/ogroups/asterisk/class_phonequeue.inc:141
-msgid "round robin"
-msgstr ""
-
-#: admin/ogroups/asterisk/class_phonequeue.inc:142
-msgid "least recently called"
-msgstr ""
-
-#: admin/ogroups/asterisk/class_phonequeue.inc:143
-msgid "fewest completed calls"
-msgstr ""
-
-#: admin/ogroups/asterisk/class_phonequeue.inc:144
-msgid "random"
-msgstr ""
-
-#: admin/ogroups/asterisk/class_phonequeue.inc:145
-msgid "round robin with memory"
-msgstr ""
-
-#: admin/ogroups/asterisk/class_phonequeue.inc:180
-msgid "Remove the phone queue from this Account"
-msgstr ""
-
-#: admin/ogroups/asterisk/class_phonequeue.inc:181
-#: admin/ogroups/asterisk/class_phonequeue.inc:184
-msgid "phone queue"
-msgstr ""
-
-#: admin/ogroups/asterisk/class_phonequeue.inc:183
-msgid "Create phone queue"
-msgstr ""
-
-#: admin/ogroups/asterisk/class_phonequeue.inc:272
-msgid ""
-"There must be at least one server with an asterisk database to create a "
-"phone queue."
-msgstr ""
-
-#: admin/ogroups/asterisk/class_phonequeue.inc:275
-#: admin/ogroups/asterisk/class_phonequeue.inc:873
-#: admin/conference/class_phoneConferenceGeneric.inc:709
-#: personal/phoneaccount/class_phoneAccount.inc:1350
-#: personal/phoneaccount/class_phoneAccount.inc:1669
-#: admin/ogroups/asterisk/phonequeue.tpl.c:17
-#: admin/conference/generic.tpl.c:20 personal/phoneaccount/generic.tpl.c:11
-msgid "Home server"
-msgstr ""
-
-#: admin/ogroups/asterisk/class_phonequeue.inc:281
-#: admin/ogroups/asterisk/class_phonequeue.inc:871
-#: admin/ogroups/asterisk/phonequeue.tpl.c:23
-msgid "Timeout"
-msgstr ""
-
-#: admin/ogroups/asterisk/class_phonequeue.inc:284
-#: admin/ogroups/asterisk/class_phonequeue.inc:896
-#: admin/ogroups/asterisk/phonequeue.tpl.c:26
-msgid "Retry"
-msgstr ""
-
-#: admin/ogroups/asterisk/class_phonequeue.inc:287
-msgid "Queue length"
-msgstr ""
-
-#: admin/ogroups/asterisk/class_phonequeue.inc:290
-#: admin/ogroups/asterisk/class_phonequeue.inc:874
-#: admin/ogroups/asterisk/phonequeue.tpl.c:35
-msgid "Announce frequency"
-msgstr ""
-
-#: admin/ogroups/asterisk/class_phonequeue.inc:293
-#: admin/conference/class_phoneConferenceGeneric.inc:328
-msgid "Number"
-msgstr ""
-
-#: admin/ogroups/asterisk/class_phonequeue.inc:316
-#: admin/ogroups/asterisk/class_phonequeue.inc:361
-msgid "asterisk"
-msgstr ""
-
-#: admin/ogroups/asterisk/class_phonequeue.inc:345
-#: admin/ogroups/asterisk/class_phonequeue.inc:696
-#: admin/conference/class_phoneConferenceGeneric.inc:369
-#: admin/macro/class_gofonMacro.inc:381 admin/macro/class_gofonMacro.inc:465
-#: addons/fonreports/class_fonreport.inc:190
-#: addons/fonreports/class_fonreport.inc:220
-#: personal/phoneaccount/class_phoneAccount.inc:455
-#: personal/phoneaccount/class_phoneAccount.inc:1061
-msgid "GOfon"
-msgstr ""
-
-#: admin/ogroups/asterisk/class_phonequeue.inc:401
-msgid "Cannot find old queue entry!"
-msgstr ""
-
-#: admin/ogroups/asterisk/class_phonequeue.inc:487
-#, php-format
-msgid ""
-"Found more than one entry named '%s' in queue table. Please inform your "
-"system administrator!"
-msgstr ""
-
-#: admin/ogroups/asterisk/class_phonequeue.inc:728
-#: admin/ogroups/asterisk/class_phonequeue.inc:730
-msgid "telephone number"
-msgstr ""
-
-#: admin/ogroups/asterisk/class_phonequeue.inc:787
-#: admin/ogroups/asterisk/class_phonequeue.inc:829
-#: admin/conference/class_phoneConferenceGeneric.inc:229
-#: admin/conference/class_phoneConferenceGeneric.inc:233
-#: admin/conference/class_phoneConferenceGeneric.inc:271
-#: admin/macro/class_gofonMacro.inc:343 admin/macro/class_gofonMacro.inc:452
-#: admin/macro/class_gofonMacro.inc:461 admin/macro/class_gofonMacro.inc:499
-#: admin/systems/asterisk/class_phoneGeneric.inc:267
-#: admin/systems/asterisk/class_phoneGeneric.inc:308
-#: addons/fonreports/class_fonreport.inc:220
-#: personal/phoneaccount/class_phoneAccount.inc:1046
-#: personal/phoneaccount/class_phoneAccount.inc:1166
-#: personal/phoneaccount/class_phoneAccount.inc:1172
-#: personal/phoneaccount/class_phoneAccount.inc:1368
-#: personal/phoneaccount/class_phoneAccount.inc:1450
-#: personal/phoneaccount/class_phoneAccount.inc:1528
-msgid "Error"
-msgstr "Feil"
-
-#: admin/ogroups/asterisk/class_phonequeue.inc:802
-#: admin/ogroups/asterisk/class_phonequeue.inc:857
-#: admin/conference/class_phoneConferenceGeneric.inc:682
-#: admin/macro/class_gofonMacro.inc:473 admin/macro/class_gofonMacro.inc:484
-#: admin/macro/class_gofonMacro.inc:521
-#: admin/macro/class_gofonMacroParameters.inc:435
-#: admin/systems/asterisk/class_phoneGeneric.inc:277
-#: admin/systems/asterisk/class_phoneGeneric.inc:432
-#: admin/systems/asterisk/class_phoneGeneric.inc:446
-#: admin/systems/asterisk/class_phoneGeneric.inc:463
-#: admin/systems/services/asterisk/class_serviceAsterisk.inc:121
-#: personal/phoneaccount/class_phoneAccount.inc:1476
-#: personal/phoneaccount/class_phoneAccount.inc:1609
-msgid "LDAP error"
-msgstr "LDAP-feil"
-
-#: admin/ogroups/asterisk/class_phonequeue.inc:864
-#: admin/systems/asterisk/class_phoneGeneric.inc:472
-#: admin/systems/asterisk/class_phoneGeneric.inc:477
-#: personal/phoneaccount/class_phoneAccount.inc:999
-#: personal/phoneaccount/class_phoneAccount.inc:1012
-#: personal/phoneaccount/class_phoneAccount.inc:1024
-#: personal/phoneaccount/class_phoneAccount.inc:1028
-#: personal/phoneaccount/class_phoneAccount.inc:1031
-#: personal/phoneaccount/class_phoneAccount.inc:1657
-msgid "Phone"
-msgstr ""
-
-#: admin/ogroups/asterisk/class_phonequeue.inc:865
-msgid "Phone group"
-msgstr ""
-
-#: admin/ogroups/asterisk/class_phonequeue.inc:872
-#: admin/ogroups/asterisk/phonequeue.tpl.c:32
-msgid "Max queue length"
-msgstr ""
-
-#: admin/ogroups/asterisk/class_phonequeue.inc:875
-#: admin/ogroups/asterisk/phonequeue.tpl.c:86
-msgid "Allow the called user to transfer his call"
-msgstr ""
-
-#: admin/ogroups/asterisk/class_phonequeue.inc:876
-#: admin/ogroups/asterisk/phonequeue.tpl.c:89
-msgid "Allows calling user to transfer call"
-msgstr ""
-
-#: admin/ogroups/asterisk/class_phonequeue.inc:877
-#: admin/ogroups/asterisk/phonequeue.tpl.c:92
-msgid "Allow the called to hangup by pressing *"
-msgstr ""
-
-#: admin/ogroups/asterisk/class_phonequeue.inc:878
-#: admin/ogroups/asterisk/phonequeue.tpl.c:98
-msgid "Ring instead of playing background music"
-msgstr ""
-
-#: admin/ogroups/asterisk/class_phonequeue.inc:879
-#: admin/ogroups/asterisk/phonequeue.tpl.c:95
-msgid "Allows calling to hangup by pressing *"
-msgstr ""
-
-#: admin/ogroups/asterisk/class_phonequeue.inc:881
-#: admin/ogroups/asterisk/phonequeue.tpl.c:47
-msgid "Music on hold"
-msgstr ""
-
-#: admin/ogroups/asterisk/class_phonequeue.inc:882
-msgid "Welcome music"
-msgstr ""
-
-#: admin/ogroups/asterisk/class_phonequeue.inc:883
-msgid "Report hold time"
-msgstr ""
-
-#: admin/ogroups/asterisk/class_phonequeue.inc:884
-msgid "'You are next' sound"
-msgstr ""
-
-#: admin/ogroups/asterisk/class_phonequeue.inc:885
-msgid "'There are' sound"
-msgstr ""
-
-#: admin/ogroups/asterisk/class_phonequeue.inc:886
-msgid "'Call waiting' sound"
-msgstr ""
-
-#: admin/ogroups/asterisk/class_phonequeue.inc:887
-msgid "'Thank you' sound"
-msgstr ""
-
-#: admin/ogroups/asterisk/class_phonequeue.inc:888
-msgid "'Minutes' sound"
-msgstr ""
-
-#: admin/ogroups/asterisk/class_phonequeue.inc:889
-msgid "'Seconds' sound"
-msgstr ""
-
-#: admin/ogroups/asterisk/class_phonequeue.inc:890
-msgid "'Less than' sound"
-msgstr ""
-
-#: admin/ogroups/asterisk/class_phonequeue.inc:891
-msgid "Queue phone number"
-msgstr ""
-
-#: admin/ogroups/asterisk/class_phonequeue.inc:892
-#: admin/conference/class_phoneConferenceGeneric.inc:707
-#: admin/ogroups/asterisk/phonequeue.tpl.c:20
-#: admin/conference/generic.tpl.c:23
-msgid "Language"
-msgstr ""
-
-#: admin/ogroups/asterisk/class_phonequeue.inc:893
-msgid "Method"
-msgstr ""
-
-#: admin/ogroups/asterisk/class_phonequeue.inc:894
-#: admin/ogroups/asterisk/phonequeue.tpl.c:83
-msgid "Announce holdtime"
-msgstr ""
-
-#: admin/ogroups/asterisk/class_phonequeue.inc:895
-msgid "Announce"
-msgstr ""
-
-#: admin/conference/conf-list.xml:11
-msgid "List of conference rooms"
-msgstr ""
-
-#: admin/conference/conf-list.xml:15 admin/conference/conf-list.xml:74
-msgid "Conference"
-msgstr ""
-
-#: admin/conference/conf-list.xml:41
-#: admin/conference/class_phoneConferenceGeneric.inc:324
-#: admin/conference/class_phoneConferenceGeneric.inc:347
-#: admin/conference/class_phoneConferenceGeneric.inc:702
-#: admin/macro/class_gofonMacro.inc:395 admin/macro/class_gofonMacro.inc:406
-#: admin/macro/macro-list.xml:41
-#: admin/systems/asterisk/class_phoneGeneric.inc:344
-#: admin/systems/asterisk/class_phoneGeneric.inc:348
-#: admin/systems/asterisk/class_phoneGeneric.inc:351
-#: admin/systems/asterisk/class_phoneGeneric.inc:366
-#: admin/systems/asterisk/class_phoneGeneric.inc:482
-#: admin/conference/conf-filter.tpl.c:5 admin/macro/macro-filter.tpl.c:5
-#: admin/macro/parameter.tpl.c:5
-msgid "Name"
-msgstr "Navn"
-
-#: admin/conference/conf-list.xml:49
-#: admin/conference/class_phoneConferenceGeneric.inc:704
-#: admin/macro/class_gofonMacro.inc:547 admin/macro/macro-list.xml:49
-#: admin/systems/asterisk/class_phoneGeneric.inc:484
-#: admin/conference/generic.tpl.c:29 admin/macro/generic.tpl.c:17
-#: admin/systems/asterisk/phone.tpl.c:8
-msgid "Description"
-msgstr "Beskrivelse"
-
-#: admin/conference/conf-list.xml:57 admin/macro/macro-list.xml:57
-msgid "Actions"
-msgstr ""
-
-#: admin/conference/conf-list.xml:68 admin/macro/macro-list.xml:68
-msgid "Create"
-msgstr "Opprett"
-
-#: admin/conference/conf-list.xml:86 admin/conference/conf-list.xml:125
-#: admin/macro/macro-list.xml:86 admin/macro/macro-list.xml:125
-msgid "Edit"
-msgstr "Endre"
-
-#: admin/conference/conf-list.xml:93 admin/conference/conf-list.xml:138
-#: admin/macro/macro-list.xml:93 admin/macro/macro-list.xml:138
-msgid "Remove"
-msgstr "Fjern"
-
-#: admin/conference/class_phoneConferenceGeneric.inc:233
-#, php-format
-msgid "Cannot delete entry from server '%s' because it seems to be removed!"
-msgstr ""
-
-#: admin/conference/class_phoneConferenceGeneric.inc:308
-#, php-format
-msgid ""
-"The previously selected asterisk home server '%s' is no longer available!"
-msgstr ""
-
-#: admin/conference/class_phoneConferenceGeneric.inc:315
-#: admin/conference/generic.tpl.c:47
-msgid "PIN"
-msgstr ""
-
-#: admin/conference/class_phoneConferenceGeneric.inc:333
-#: admin/conference/class_phoneConferenceGeneric.inc:719
-msgid "Lifetime"
-msgstr ""
-
-#: admin/conference/class_phoneConferenceGeneric.inc:399
-#: personal/phoneaccount/class_phoneAccount.inc:346
-#: personal/phoneaccount/class_phoneAccount.inc:359
-#: personal/phoneaccount/class_phoneAccount.inc:617
-#: personal/phoneaccount/class_phoneAccount.inc:656
-#: personal/phoneaccount/class_phoneAccount.inc:1519
-#: personal/phoneaccount/class_phoneAccount.inc:1695
-#: admin/conference/remove.tpl.c:2 admin/macro/remove.tpl.c:2
-msgid "Warning"
-msgstr ""
-
-#: admin/conference/class_phoneConferenceGeneric.inc:400
-#, php-format
-msgid ""
-"FusionDirectory identified problems with your MySQL table definition, please"
-" activate debugging for details."
-msgstr ""
-
-#: admin/conference/class_phoneConferenceGeneric.inc:606
-#: admin/conference/class_phoneConferenceGeneric.inc:608
-#, php-format
-msgid "'%s' is already assigned to '%s'!"
-msgstr ""
-
-#: admin/conference/class_phoneConferenceGeneric.inc:693
-msgid "Phone Conference"
-msgstr ""
-
-#: admin/conference/class_phoneConferenceGeneric.inc:694
-msgid "Phone conference management"
-msgstr ""
-
-#: admin/conference/class_phoneConferenceGeneric.inc:696
-msgid "GOfon conference"
-msgstr ""
-
-#: admin/conference/class_phoneConferenceGeneric.inc:698
-msgid "Asterisk conference"
-msgstr ""
-
-#: admin/conference/class_phoneConferenceGeneric.inc:703
-#: admin/macro/class_gofonMacro.inc:546
-#: admin/systems/asterisk/class_phoneGeneric.inc:483
-#: admin/conference/generic.tpl.c:17 admin/macro/generic.tpl.c:14
-#: admin/systems/asterisk/phone.tpl.c:5
-msgid "Base"
-msgstr ""
-
-#: admin/conference/class_phoneConferenceGeneric.inc:705
-msgid "Conference PIN"
-msgstr ""
-
-#: admin/conference/class_phoneConferenceGeneric.inc:710
-#: admin/conference/generic.tpl.c:44
-msgid "Preset PIN"
-msgstr ""
-
-#: admin/conference/class_phoneConferenceGeneric.inc:711
-#: admin/conference/generic.tpl.c:50
-msgid "Record conference"
-msgstr ""
-
-#: admin/conference/class_phoneConferenceGeneric.inc:712
-#: admin/conference/generic.tpl.c:59
-msgid "Play music on hold"
-msgstr ""
-
-#: admin/conference/class_phoneConferenceGeneric.inc:713
-msgid "Activate menu"
-msgstr ""
-
-#: admin/conference/class_phoneConferenceGeneric.inc:714
-msgid "Announce user activity"
-msgstr ""
-
-#: admin/conference/class_phoneConferenceGeneric.inc:715
-msgid "Count user"
-msgstr ""
-
-#: admin/conference/class_phoneConferenceGeneric.inc:716
-msgid "Conference type"
-msgstr ""
-
-#: admin/conference/class_phoneConferenceGeneric.inc:718
-msgid "Format"
-msgstr ""
-
-#: admin/conference/class_phoneConferenceGeneric.inc:720
-#: personal/phoneaccount/class_phoneAccount.inc:1666
-msgid "Telephone number"
-msgstr ""
-
-#: admin/conference/class_phoneConferenceGeneric.inc:721
-msgid "Owner"
-msgstr ""
-
-#: admin/conference/class_phoneConferenceManagment.inc:36
-msgid "Phone Conferences"
-msgstr ""
-
-#: admin/conference/class_phoneConferenceManagment.inc:37
-msgid "Phone Conference management"
-msgstr ""
-
-#: admin/macro/class_gofonMacro.inc:202
-#, php-format
-msgid ""
-"Macro could not be removed from server '%s', please check database "
-"consistency!"
-msgstr ""
-
-#: admin/macro/class_gofonMacro.inc:264
-#, php-format
-msgid "Application missing in line %s!"
-msgstr ""
-
-#: admin/macro/class_gofonMacro.inc:267
-#, php-format
-msgid "Priority missing in line %s!"
-msgstr ""
-
-#: admin/macro/class_gofonMacro.inc:271
-#, php-format
-msgid "Extension missing in line %s!"
-msgstr ""
-
-#: admin/macro/class_gofonMacro.inc:281
-#, php-format
-msgid "Duplicate combination of 'extension' and 'priority' in line %s!"
-msgstr ""
-
-#: admin/macro/class_gofonMacro.inc:317
-#, php-format
-msgid ""
-"Macro could not be added to server '%s', please check database consistency!"
-msgstr ""
-
-#: admin/macro/class_gofonMacro.inc:410
-msgid "Name can be 20 characters at maximum!"
-msgstr ""
-
-#: admin/macro/class_gofonMacro.inc:419
-msgid "Macro is still in use!"
-msgstr ""
-
-#: admin/macro/class_gofonMacro.inc:426
-msgid "Macro is empty!"
-msgstr ""
-
-#: admin/macro/class_gofonMacro.inc:452
-#: admin/systems/asterisk/class_phoneGeneric.inc:267
-#, php-format
-msgid "Cannot delete entry because it is still in use by '%s'!"
-msgstr ""
-
-#: admin/macro/class_gofonMacro.inc:465
-#: addons/fonreports/class_fonreport.inc:190
-#: personal/phoneaccount/class_phoneAccount.inc:455
-#: personal/phoneaccount/class_phoneAccount.inc:1061
-#: personal/phoneaccount/class_phoneAccount.inc:1567
-msgid "Configuration error"
-msgstr ""
-
-#: admin/macro/class_gofonMacro.inc:536 admin/macro/class_gofonMacro.inc:541
-msgid "Asterisk macro"
-msgstr ""
-
-#: admin/macro/class_gofonMacro.inc:537
-msgid "Asterisk macro management"
-msgstr ""
-
-#: admin/macro/class_gofonMacro.inc:539
-msgid "GOfon macro"
-msgstr ""
-
-#: admin/macro/class_gofonMacro.inc:545 admin/macro/generic.tpl.c:2
-#: admin/macro/generic.tpl.c:5 admin/macro/paste_generic.tpl.c:2
-#: admin/macro/paste_generic.tpl.c:5
-msgid "Macro name"
-msgstr ""
-
-#: admin/macro/class_gofonMacro.inc:548 admin/macro/generic.tpl.c:8
-msgid "Display name"
-msgstr ""
-
-#: admin/macro/class_gofonMacro.inc:549
-msgid "Macro content and parameter"
-msgstr ""
-
-#: admin/macro/class_gofonMacro.inc:550
-msgid "Visibility flag"
-msgstr ""
-
-#: admin/macro/class_gofonMacroManagement.inc:36
-msgid "Phone Macros"
-msgstr ""
-
-#: admin/macro/class_gofonMacroManagement.inc:37
-msgid "Phone Macros management"
-msgstr ""
-
-#: admin/macro/macro-list.xml:11
-msgid "List of macros"
-msgstr ""
-
-#: admin/macro/macro-list.xml:15 admin/macro/macro-list.xml:74
-msgid "Macro"
-msgstr ""
-
-#: admin/macro/class_gofonMacroParameters.inc:58
-msgid "Parameter"
-msgstr ""
-
-#: admin/macro/class_gofonMacroParameters.inc:59
-msgid "Asterisk macro parameter"
-msgstr ""
-
-#: admin/macro/class_gofonMacroParameters.inc:234
-#: personal/phoneaccount/generic.tpl.c:35
-msgid "Phone macro"
-msgstr ""
-
-#: admin/macro/class_gofonMacroParameters.inc:290
-msgid "String"
-msgstr ""
-
-#: admin/macro/class_gofonMacroParameters.inc:291
-msgid "Combobox"
-msgstr ""
-
-#: admin/macro/class_gofonMacroParameters.inc:292
-msgid "Bool"
-msgstr ""
-
-#: admin/macro/class_gofonMacroParameters.inc:298
-msgid "Delete unused"
-msgstr ""
-
-#: admin/macro/class_gofonMacroParameters.inc:374
-#, php-format
-msgid "Parameter %s contains invalid character. '!,#' is used as delimiter!"
-msgstr ""
-
-#: admin/macro/class_gofonMacroParameters.inc:379
-#, php-format
-msgid "Parameter %s is invalid!"
-msgstr ""
-
-#: admin/macro/class_gofonMacroParameters.inc:408
-#: personal/phoneaccount/class_phoneAccount.inc:1600
-msgid "Information"
-msgstr ""
-
-#: admin/macro/class_gofonMacroParameters.inc:408
-msgid ""
-"Number of parameters for this macro has changed. Please update all users "
-"using it!"
-msgstr ""
-
-#: admin/systems/asterisk/class_phoneGeneric.inc:151
-msgid "phone"
-msgstr ""
-
-#: admin/systems/asterisk/class_phoneGeneric.inc:230
-msgid "yes"
-msgstr ""
-
-#: admin/systems/asterisk/class_phoneGeneric.inc:230
-msgid "no"
-msgstr ""
-
-#: admin/systems/asterisk/class_phoneGeneric.inc:247
-msgid "dynamic"
-msgstr ""
-
-#: admin/systems/asterisk/class_phoneGeneric.inc:247
-msgid "Networksettings"
-msgstr ""
-
-#: admin/systems/asterisk/class_phoneGeneric.inc:330
-#: admin/systems/asterisk/class_phoneGeneric.inc:333
-msgid "IP address"
-msgstr ""
-
-#: admin/systems/asterisk/class_phoneGeneric.inc:473
-msgid "Phone information"
-msgstr ""
-
-#: admin/systems/asterisk/class_phoneGeneric.inc:476
-#: personal/phoneaccount/class_phoneAccount.inc:1668
-msgid "Phone hardware"
-msgstr ""
-
-#: admin/systems/asterisk/class_phoneGeneric.inc:485
-msgid "SIP Mode"
-msgstr ""
-
-#: admin/systems/asterisk/class_phoneGeneric.inc:486
-msgid "SIP DTMF mode"
-msgstr ""
-
-#: admin/systems/asterisk/class_phoneGeneric.inc:487
-msgid "SIP Default ip"
-msgstr ""
-
-#: admin/systems/asterisk/class_phoneGeneric.inc:488
-msgid "SIP Qualify"
-msgstr ""
-
-#: admin/systems/asterisk/class_phoneGeneric.inc:489
-msgid "IAX authentication type"
-msgstr ""
-
-#: admin/systems/asterisk/class_phoneGeneric.inc:490
-msgid "IAX secret"
-msgstr ""
-
-#: admin/systems/asterisk/class_phoneGeneric.inc:491
-msgid "IAX account code"
-msgstr ""
-
-#: admin/systems/asterisk/class_phoneGeneric.inc:492
-msgid "IAX trunk lines"
-msgstr ""
-
-#: admin/systems/asterisk/class_phoneGeneric.inc:493
-msgid "IAX permit settings"
-msgstr ""
-
-#: admin/systems/asterisk/class_phoneGeneric.inc:494
-msgid "IAX deny settings"
-msgstr ""
-
-#: admin/systems/asterisk/class_phoneGeneric.inc:495
-msgid "CAPI MSN"
-msgstr ""
-
-#: admin/systems/asterisk/class_phoneGeneric.inc:496
-msgid "Hardware type"
-msgstr ""
-
-#: admin/systems/services/asterisk/class_serviceAsterisk.inc:35
-msgid "VoIP database information"
-msgstr ""
-
-#: admin/systems/services/asterisk/class_serviceAsterisk.inc:38
-msgid "Asterisk DB user"
-msgstr ""
-
-#: admin/systems/services/asterisk/class_serviceAsterisk.inc:38
-msgid "Login for asterisk database administrator"
-msgstr ""
-
-#: admin/systems/services/asterisk/class_serviceAsterisk.inc:42
-msgid "Password"
-msgstr ""
-
-#: admin/systems/services/asterisk/class_serviceAsterisk.inc:42
-msgid "Password for asterisk database administrator"
-msgstr ""
-
-#: admin/systems/services/asterisk/class_serviceAsterisk.inc:46
-msgid "Country dial prefix"
-msgstr ""
-
-#: admin/systems/services/asterisk/class_serviceAsterisk.inc:50
-msgid "Local dial prefix"
-msgstr ""
-
-#: admin/systems/services/asterisk/class_serviceAsterisk.inc:54
-msgid "Driver"
-msgstr ""
-
-#: admin/systems/services/asterisk/class_serviceAsterisk.inc:54
-msgid "Driver to use to contact this database."
-msgstr ""
-
-#: admin/systems/services/asterisk/class_serviceAsterisk.inc:95
-#, php-format
-msgid ""
-"You can't remove the asterisk database extension, it is still in use by "
-"these objects '%s'."
-msgstr ""
-
-#: admin/systems/services/asterisk/class_serviceAsterisk.inc:140
-msgid "VoIP service (asterisk)"
-msgstr ""
-
-#: admin/systems/services/asterisk/class_serviceAsterisk.inc:141
-msgid "VoIP - asterisk management"
-msgstr ""
-
-#: admin/systems/services/asterisk/class_serviceAsterisk.inc:141
-msgid "Services"
-msgstr ""
-
-#: addons/fonreports/class_fonreport.inc:232
-msgid "Insufficient permissions"
-msgstr ""
-
-#: addons/fonreports/class_fonreport.inc:251
-msgid "Y-M-D"
-msgstr ""
-
-#: addons/fonreports/class_fonreport.inc:418
-#: addons/fonreports/class_fonreport.inc:419
-#: addons/fonreports/class_fonreport.inc:424 addons/fonreports/main.inc:46
-msgid "Phone reports"
-msgstr ""
-
-#: addons/fonreports/class_fonreport.inc:419
-msgid "All entries are readonly"
-msgstr ""
-
-#: addons/fonreports/class_fonreport.inc:428
-#: addons/fonreports/contents.tpl.c:32
-msgid "Date"
-msgstr ""
-
-#: addons/fonreports/class_fonreport.inc:429
-#: addons/fonreports/contents.tpl.c:35
-msgid "Source"
-msgstr ""
-
-#: addons/fonreports/class_fonreport.inc:430
-#: addons/fonreports/contents.tpl.c:38
-msgid "Destination"
-msgstr ""
-
-#: addons/fonreports/class_fonreport.inc:431
-#: addons/fonreports/contents.tpl.c:41
-msgid "Channel"
-msgstr ""
-
-#: addons/fonreports/class_fonreport.inc:432
-msgid "Application called"
-msgstr ""
-
-#: addons/fonreports/class_fonreport.inc:433
-msgid "Disposition"
-msgstr ""
-
-#: addons/fonreports/class_fonreport.inc:434
-#: addons/fonreports/contents.tpl.c:50
-msgid "Duration"
-msgstr ""
-
-#: personal/phoneaccount/class_phoneAccount.inc:176
-msgid "automatic"
-msgstr ""
-
-#: personal/phoneaccount/class_phoneAccount.inc:212
-msgid "no macro"
-msgstr ""
-
-#: personal/phoneaccount/class_phoneAccount.inc:240
-msgid "undefined"
-msgstr ""
-
-#: personal/phoneaccount/class_phoneAccount.inc:359
-#, php-format
-msgid ""
-"Cannot identify telephone extension in database, please try to save again."
-msgstr ""
-
-#: personal/phoneaccount/class_phoneAccount.inc:577
-#: personal/phoneaccount/class_phoneAccount.inc:595
-msgid "Abort saving entries to keep the database consistent."
+#: admin/systems/asterisk/class_phoneIAX.inc:30
+#: admin/systems/asterisk/class_phoneIAX.inc:34
+#: personal/asterisk/class_asteriskAccount.inc:45
+msgid "Phone"
 msgstr ""
 
-#: personal/phoneaccount/class_phoneAccount.inc:618
-#: personal/phoneaccount/class_phoneAccount.inc:657
-#: personal/phoneaccount/class_phoneAccount.inc:1520
-#, php-format
-msgid ""
-"FusionDirectory identified problems with your database table definition!"
+#: admin/systems/asterisk/class_phoneIAX.inc:31
+msgid "Asterisk phone"
 msgstr ""
 
-#: personal/phoneaccount/class_phoneAccount.inc:1023
-msgid "Remove phone account"
+#: admin/systems/asterisk/class_phoneIAX.inc:33
+msgid "Phone hardware"
 msgstr ""
 
-#: personal/phoneaccount/class_phoneAccount.inc:1027
-#: personal/phoneaccount/class_phoneAccount.inc:1030
-msgid "Create phone account"
+#: admin/systems/asterisk/class_phoneIAX.inc:46
+#: personal/asterisk/class_asteriskAccount.inc:42
+msgid "Telephone"
 msgstr ""
 
-#: personal/phoneaccount/class_phoneAccount.inc:1028
-msgid "User uid"
-msgstr ""
+#: admin/systems/asterisk/class_phoneIAX.inc:49
+msgid "Name"
+msgstr "Navn"
 
-#: personal/phoneaccount/class_phoneAccount.inc:1046
-msgid "Selected macro is not available anymore!"
+#: admin/systems/asterisk/class_phoneIAX.inc:49
+msgid "Name of this phone"
 msgstr ""
 
-#: personal/phoneaccount/class_phoneAccount.inc:1221
-msgid "Choose your private phone"
+#: admin/systems/asterisk/class_phoneIAX.inc:53
+msgid "Account name"
 msgstr ""
 
-#: personal/phoneaccount/class_phoneAccount.inc:1346
-msgid ""
-"There must be at least one server with an asterisk database to create a "
-"phone account."
+#: admin/systems/asterisk/class_phoneIAX.inc:53
+msgid "Name of the account"
 msgstr ""
 
-#: personal/phoneaccount/class_phoneAccount.inc:1354
-#: personal/phoneaccount/class_phoneAccount.inc:1357
-#: personal/phoneaccount/generic.tpl.c:29
-#: personal/phoneaccount/paste_generic.tpl.c:11
-msgid "Voicemail PIN"
+#: admin/systems/services/asterisk/class_serviceAsterisk.inc:35
+msgid "VoIP database information"
 msgstr ""
 
-#: personal/phoneaccount/class_phoneAccount.inc:1354
-msgid "Between 1-4 charactes"
+#: admin/systems/services/asterisk/class_serviceAsterisk.inc:38
+msgid "Asterisk DB user"
 msgstr ""
 
-#: personal/phoneaccount/class_phoneAccount.inc:1362
-#: personal/phoneaccount/generic.tpl.c:32
-#: personal/phoneaccount/paste_generic.tpl.c:14
-msgid "Phone PIN"
+#: admin/systems/services/asterisk/class_serviceAsterisk.inc:38
+msgid "Login for asterisk database administrator"
 msgstr ""
 
-#: personal/phoneaccount/class_phoneAccount.inc:1394
-#: admin/conference/generic.tpl.c:38 admin/conference/paste_generic.tpl.c:8
-msgid "Phone number"
+#: admin/systems/services/asterisk/class_serviceAsterisk.inc:42
+msgid "Password"
 msgstr ""
 
-#: personal/phoneaccount/class_phoneAccount.inc:1402
-#, php-format
-msgid "macro parameter %s"
+#: admin/systems/services/asterisk/class_serviceAsterisk.inc:42
+msgid "Password for asterisk database administrator"
 msgstr ""
 
-#: personal/phoneaccount/class_phoneAccount.inc:1450
-msgid "An error occured while updating the database entries!"
+#: admin/systems/services/asterisk/class_serviceAsterisk.inc:46
+msgid "Country dial prefix"
 msgstr ""
 
-#: personal/phoneaccount/class_phoneAccount.inc:1567
-msgid "Was not able to found any asterisk server"
+#: admin/systems/services/asterisk/class_serviceAsterisk.inc:50
+msgid "Local dial prefix"
 msgstr ""
 
-#: personal/phoneaccount/class_phoneAccount.inc:1600
-#, php-format
-msgid "User '%s' has been removed from phone queue '%s'."
+#: admin/systems/services/asterisk/class_serviceAsterisk.inc:54
+msgid "Driver"
 msgstr ""
 
-#: personal/phoneaccount/class_phoneAccount.inc:1637
-#: personal/phoneaccount/class_phoneAccount.inc:1639
-#, php-format
-msgid "The specified telephonenumber '%s' is already assigned to '%s'."
+#: admin/systems/services/asterisk/class_serviceAsterisk.inc:54
+msgid "Driver to use to contact this database."
 msgstr ""
 
-#: personal/phoneaccount/class_phoneAccount.inc:1649
+#: admin/systems/services/asterisk/class_serviceAsterisk.inc:95
 #, php-format
 msgid ""
-"The previously selected asterisk home server (%s) is no longer available. "
-"Remove aborted."
-msgstr ""
-
-#: personal/phoneaccount/class_phoneAccount.inc:1658
-msgid "Phone account settings"
-msgstr ""
-
-#: personal/phoneaccount/class_phoneAccount.inc:1667
-msgid "Macro settings"
-msgstr ""
-
-#: personal/phoneaccount/class_phoneAccount.inc:1670
-msgid "Phone context"
+"You can't remove the asterisk database extension, it is still in use by "
+"these objects '%s'."
 msgstr ""
 
-#: personal/phoneaccount/class_phoneAccount.inc:1671
-msgid "Voice mail context"
-msgstr ""
+#: admin/systems/services/asterisk/class_serviceAsterisk.inc:121
+msgid "LDAP error"
+msgstr "LDAP-feil"
 
-#: personal/phoneaccount/class_phoneAccount.inc:1672
-msgid "Telephone pin"
+#: admin/systems/services/asterisk/class_serviceAsterisk.inc:140
+msgid "VoIP service (asterisk)"
 msgstr ""
 
-#: personal/phoneaccount/class_phoneAccount.inc:1673
-msgid "Voicemail pin"
+#: admin/systems/services/asterisk/class_serviceAsterisk.inc:141
+msgid "VoIP - asterisk management"
 msgstr ""
 
-#: personal/phoneaccount/class_phoneAccount.inc:1695
-#, php-format
-msgid "You need to configure %s contexts first"
+#: admin/systems/services/asterisk/class_serviceAsterisk.inc:141
+msgid "Services"
 msgstr ""
 
-#: personal/phoneaccount/main.inc:124
-msgid "Click the 'Edit' button below to change informations in this dialog"
+#: personal/asterisk/class_asteriskAccount.inc:30
+#: config/asterisk/class_asteriskPluginConfig.inc:28
+#: config/asterisk/class_asteriskPluginConfig.inc:41
+msgid "Asterisk"
 msgstr ""
 
-#: personal/phoneaccount/main.inc:134
-#: personal/phoneaccount/paste_generic.tpl.c:2
-msgid "Phone settings"
+#: personal/asterisk/class_asteriskAccount.inc:31
+msgid "Asterisk account"
 msgstr ""
 
-#: config/asterisk/class_asteriskPluginConfig.inc:28
-#: config/asterisk/class_asteriskPluginConfig.inc:41
-msgid "Asterisk"
+#: personal/asterisk/class_asteriskAccount.inc:45
+msgid "Select the phone associated to this user"
 msgstr ""
 
 #: config/asterisk/class_asteriskPluginConfig.inc:29
@@ -1010,338 +172,3 @@ msgstr ""
 #: config/asterisk/class_asteriskPluginConfig.inc:72
 msgid "Available voicemail contexts"
 msgstr ""
-
-#: admin/ogroups/asterisk/phonequeue.tpl.c:2
-msgid ""
-"Only users with the same asterisk home server will be included to this "
-"queue."
-msgstr ""
-
-#: admin/ogroups/asterisk/phonequeue.tpl.c:5
-#: personal/phoneaccount/generic.tpl.c:2
-#: personal/phoneaccount/paste_generic.tpl.c:5
-msgid "Phone numbers"
-msgstr ""
-
-#: admin/ogroups/asterisk/phonequeue.tpl.c:8
-msgid "Up"
-msgstr ""
-
-#: admin/ogroups/asterisk/phonequeue.tpl.c:11
-msgid "Down"
-msgstr ""
-
-#: admin/ogroups/asterisk/phonequeue.tpl.c:14
-#: admin/conference/generic.tpl.c:41
-msgid "Options"
-msgstr ""
-
-#: admin/ogroups/asterisk/phonequeue.tpl.c:29
-msgid "Strategy"
-msgstr ""
-
-#: admin/ogroups/asterisk/phonequeue.tpl.c:38
-msgid "(in seconds)"
-msgstr ""
-
-#: admin/ogroups/asterisk/phonequeue.tpl.c:41
-msgid "Queue sound setup"
-msgstr ""
-
-#: admin/ogroups/asterisk/phonequeue.tpl.c:44
-msgid "Use music on hold instead of ringing"
-msgstr ""
-
-#: admin/ogroups/asterisk/phonequeue.tpl.c:50
-msgid "Welcome sound file"
-msgstr ""
-
-#: admin/ogroups/asterisk/phonequeue.tpl.c:53
-msgid "Announce message"
-msgstr ""
-
-#: admin/ogroups/asterisk/phonequeue.tpl.c:56
-msgid "Sound file for 'You are next ...'"
-msgstr ""
-
-#: admin/ogroups/asterisk/phonequeue.tpl.c:59
-msgid "'There are ...'"
-msgstr ""
-
-#: admin/ogroups/asterisk/phonequeue.tpl.c:62
-msgid "'... calls waiting'"
-msgstr ""
-
-#: admin/ogroups/asterisk/phonequeue.tpl.c:65
-msgid "'Thank you' message"
-msgstr ""
-
-#: admin/ogroups/asterisk/phonequeue.tpl.c:68
-msgid "'minutes' sound file"
-msgstr ""
-
-#: admin/ogroups/asterisk/phonequeue.tpl.c:71
-msgid "'seconds' sound file"
-msgstr ""
-
-#: admin/ogroups/asterisk/phonequeue.tpl.c:74
-msgid "Hold sound file"
-msgstr ""
-
-#: admin/ogroups/asterisk/phonequeue.tpl.c:77
-msgid "Less Than sound file"
-msgstr ""
-
-#: admin/ogroups/asterisk/phonequeue.tpl.c:80
-msgid "Phone attributes "
-msgstr ""
-
-#: admin/conference/conf-filter.tpl.c:2 admin/macro/macro-filter.tpl.c:2
-#: addons/fonreports/contents.tpl.c:2
-msgid "Filter"
-msgstr "Filter"
-
-#: admin/conference/generic.tpl.c:2
-msgid "Properties"
-msgstr "Egenskaper"
-
-#: admin/conference/generic.tpl.c:5 admin/conference/paste_generic.tpl.c:2
-msgid "Conference name"
-msgstr ""
-
-#: admin/conference/generic.tpl.c:8 admin/conference/paste_generic.tpl.c:5
-msgid "Name of conference to create"
-msgstr ""
-
-#: admin/conference/generic.tpl.c:11
-msgid "Type"
-msgstr ""
-
-#: admin/conference/generic.tpl.c:14
-msgid "Choose subtree to place conference in"
-msgstr ""
-
-#: admin/conference/generic.tpl.c:26
-msgid "Select language"
-msgstr ""
-
-#: admin/conference/generic.tpl.c:32
-msgid "Descriptive text for department"
-msgstr ""
-
-#: admin/conference/generic.tpl.c:35
-msgid "Lifetime (in days)"
-msgstr ""
-
-#: admin/conference/generic.tpl.c:53
-msgid "Sound file format"
-msgstr ""
-
-#: admin/conference/generic.tpl.c:56
-msgid "Choose subtree to place department in"
-msgstr ""
-
-#: admin/conference/generic.tpl.c:62
-msgid "Activate session menu"
-msgstr ""
-
-#: admin/conference/generic.tpl.c:65
-msgid "Announce users joining or leaving the conference"
-msgstr ""
-
-#: admin/conference/generic.tpl.c:68
-msgid "Count users"
-msgstr ""
-
-#: admin/conference/remove.tpl.c:5 admin/macro/remove.tpl.c:5
-msgid ""
-"Please double check if you really want to do this since there is no way for "
-"FusionDirectory to get your data back."
-msgstr ""
-
-#: admin/conference/remove.tpl.c:8 admin/macro/remove.tpl.c:8
-msgid "So - if you're sure - press 'Delete' to continue or 'Cancel' to abort."
-msgstr ""
-
-#: admin/macro/generic.tpl.c:11
-msgid "Macro name to be displayed"
-msgstr ""
-
-#: admin/macro/generic.tpl.c:20
-msgid "Visible for user"
-msgstr ""
-
-#: admin/macro/generic.tpl.c:23
-msgid "Macro text"
-msgstr ""
-
-#: admin/macro/parameter.tpl.c:2
-msgid "Argument"
-msgstr ""
-
-#: admin/macro/parameter.tpl.c:8
-msgid "type"
-msgstr ""
-
-#: admin/macro/parameter.tpl.c:11
-msgid "Default value"
-msgstr ""
-
-#: admin/macro/parameter.tpl.c:14
-msgid "You are not allowed to view the macro parameter settings"
-msgstr ""
-
-#: admin/systems/asterisk/phonesettings.tpl.c:2
-msgid "Advanced phone settings"
-msgstr ""
-
-#: admin/systems/asterisk/phonesettings.tpl.c:5
-msgid "Phone type"
-msgstr ""
-
-#: admin/systems/asterisk/phonesettings.tpl.c:8
-#: admin/systems/asterisk/phonesettings.tpl.c:14
-#: admin/systems/asterisk/phonesettings.tpl.c:20
-#: admin/systems/asterisk/phonesettings.tpl.c:26
-#: admin/systems/asterisk/phonesettings.tpl.c:35
-#: admin/systems/asterisk/phonesettings.tpl.c:47
-#: admin/systems/asterisk/phonesettings.tpl.c:65
-msgid "Choose a phone type"
-msgstr ""
-
-#: admin/systems/asterisk/phonesettings.tpl.c:11
-msgid "Mode"
-msgstr ""
-
-#: admin/systems/asterisk/phonesettings.tpl.c:17
-msgid "DTMF mode"
-msgstr ""
-
-#: admin/systems/asterisk/phonesettings.tpl.c:23
-#: admin/systems/asterisk/phonesettings.tpl.c:38
-msgid "Default IP"
-msgstr ""
-
-#: admin/systems/asterisk/phonesettings.tpl.c:29
-#: admin/systems/asterisk/phonesettings.tpl.c:41
-msgid "Response timeout"
-msgstr ""
-
-#: admin/systems/asterisk/phonesettings.tpl.c:32
-msgid "Modus"
-msgstr ""
-
-#: admin/systems/asterisk/phonesettings.tpl.c:44
-msgid "Authtype"
-msgstr ""
-
-#: admin/systems/asterisk/phonesettings.tpl.c:50
-msgid "Secret"
-msgstr ""
-
-#: admin/systems/asterisk/phonesettings.tpl.c:53
-msgid "GoFonInkeys"
-msgstr ""
-
-#: admin/systems/asterisk/phonesettings.tpl.c:56
-msgid "GoFonOutKeys"
-msgstr ""
-
-#: admin/systems/asterisk/phonesettings.tpl.c:59
-msgid "Account code"
-msgstr ""
-
-#: admin/systems/asterisk/phonesettings.tpl.c:62
-msgid "Trunk lines"
-msgstr ""
-
-#: admin/systems/asterisk/phonesettings.tpl.c:68
-msgid "Hosts that are allowed to connect"
-msgstr ""
-
-#: admin/systems/asterisk/phonesettings.tpl.c:71
-#: admin/systems/asterisk/phonesettings.tpl.c:77
-msgid "List of alternative mail addresses"
-msgstr ""
-
-#: admin/systems/asterisk/phonesettings.tpl.c:74
-msgid "Hosts that are not allowed to connect"
-msgstr ""
-
-#: admin/systems/asterisk/phonesettings.tpl.c:80
-msgid "MSN"
-msgstr ""
-
-#: admin/systems/asterisk/phone.tpl.c:2
-msgid "Phone name"
-msgstr ""
-
-#: addons/fonreports/contents.tpl.c:5
-msgid "Search for"
-msgstr ""
-
-#: addons/fonreports/contents.tpl.c:8
-msgid "Enter user name to search for"
-msgstr ""
-
-#: addons/fonreports/contents.tpl.c:11 addons/fonreports/contents.tpl.c:26
-msgid "in"
-msgstr ""
-
-#: addons/fonreports/contents.tpl.c:14
-msgid "Select subtree to base search on"
-msgstr ""
-
-#: addons/fonreports/contents.tpl.c:17
-msgid "on"
-msgstr ""
-
-#: addons/fonreports/contents.tpl.c:20
-msgid "Select server to search on"
-msgstr ""
-
-#: addons/fonreports/contents.tpl.c:23
-msgid "during"
-msgstr ""
-
-#: addons/fonreports/contents.tpl.c:29
-msgid "Search"
-msgstr ""
-
-#: addons/fonreports/contents.tpl.c:44
-msgid "Application"
-msgstr ""
-
-#: addons/fonreports/contents.tpl.c:47
-msgid "Status"
-msgstr ""
-
-#: addons/fonreports/contents.tpl.c:53
-msgid "Search returned no results..."
-msgstr ""
-
-#: personal/phoneaccount/generic.tpl.c:5
-#: personal/phoneaccount/paste_generic.tpl.c:8
-msgid "Telephone hardware"
-msgstr ""
-
-#: personal/phoneaccount/generic.tpl.c:8
-msgid "Telephone"
-msgstr ""
-
-#: personal/phoneaccount/generic.tpl.c:14
-msgid "Select the accounts home server"
-msgstr ""
-
-#: personal/phoneaccount/generic.tpl.c:17
-msgid "Context"
-msgstr ""
-
-#: personal/phoneaccount/generic.tpl.c:20
-#: personal/phoneaccount/generic.tpl.c:26
-msgid "Select the accounts context"
-msgstr ""
-
-#: personal/phoneaccount/generic.tpl.c:23
-msgid "Voicemail context"
-msgstr ""
diff --git a/asterisk/locale/nl/fusiondirectory.po b/asterisk/locale/nl/fusiondirectory.po
index 4c37c36c17803a80d6b6766ca0357a26adf5e373..84647589d534749696fe4a797decbec0c9e7f5ac 100644
--- a/asterisk/locale/nl/fusiondirectory.po
+++ b/asterisk/locale/nl/fusiondirectory.po
@@ -3,708 +3,55 @@
 # This file is distributed under the same license as the PACKAGE package.
 # 
 # Translators:
-# Kenny Tordeurs <tordeurskenny@gmail.com>, 2012-2013
-#  Niels Klomp (CareWorks ICT Services) <nk@careworks.nl>, 2005
 msgid ""
 msgstr ""
-"Project-Id-Version: FusionDirectory-108\n"
+"Project-Id-Version: FusionDirectory-109\n"
 "Report-Msgid-Bugs-To: documentation@lists.fusiondirectory.org\n"
-"POT-Creation-Date: 2015-03-31 11:49+0200\n"
-"PO-Revision-Date: 2015-03-31 11:41+0000\n"
+"POT-Creation-Date: 2014-12-15 17:47+0100\n"
+"PO-Revision-Date: 2015-02-25 16:13+0000\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>\n"
-"Language-Team: Dutch (http://www.transifex.com/projects/p/FusionDirectory-108/language/nl/)\n"
+"Language-Team: Dutch (http://www.transifex.com/projects/p/FusionDirectory-109/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/ogroups/asterisk/class_phonequeue.inc:110
-#: admin/conference/class_phoneConferenceGeneric.inc:104
-#: personal/phoneaccount/class_phoneAccount.inc:148
-msgid "Obsolete entry"
-msgstr "Obsolete inzending"
-
-#: admin/ogroups/asterisk/class_phonequeue.inc:110
-#: admin/conference/class_phoneConferenceGeneric.inc:104
-#: personal/phoneaccount/class_phoneAccount.inc:148
-#, php-format
-msgid ""
-"The current home server is not available anymore. It will be moved to '%s' "
-"if you save this entry!"
-msgstr "De huidige home server is niet meer beschikbaar. Het zal naar '%s' worden verplaatst als je deze inzending opslaagd!"
-
-#: admin/ogroups/asterisk/class_phonequeue.inc:140
-msgid "ring all"
-msgstr "rinkel allemaal"
-
-#: admin/ogroups/asterisk/class_phonequeue.inc:141
-msgid "round robin"
-msgstr "om en om"
-
-#: admin/ogroups/asterisk/class_phonequeue.inc:142
-msgid "least recently called"
-msgstr "minst recent gebelde"
-
-#: admin/ogroups/asterisk/class_phonequeue.inc:143
-msgid "fewest completed calls"
-msgstr "minst afgeronde gesprekken"
-
-#: admin/ogroups/asterisk/class_phonequeue.inc:144
-msgid "random"
-msgstr "willekeurig"
-
-#: admin/ogroups/asterisk/class_phonequeue.inc:145
-msgid "round robin with memory"
-msgstr "om en om met geheugen"
-
-#: admin/ogroups/asterisk/class_phonequeue.inc:180
-msgid "Remove the phone queue from this Account"
-msgstr "Verwijder telefoonwachtrij van dit account"
-
-#: admin/ogroups/asterisk/class_phonequeue.inc:181
-#: admin/ogroups/asterisk/class_phonequeue.inc:184
-msgid "phone queue"
-msgstr "Telefoon wachtrij"
-
-#: admin/ogroups/asterisk/class_phonequeue.inc:183
-msgid "Create phone queue"
-msgstr "Telefoonwachtrij aanmaken"
-
-#: admin/ogroups/asterisk/class_phonequeue.inc:272
-msgid ""
-"There must be at least one server with an asterisk database to create a "
-"phone queue."
-msgstr "Er moet minstens 1 server met een asterisk databank bestaan om een telefoon wachtrij aan te maken"
-
-#: admin/ogroups/asterisk/class_phonequeue.inc:275
-#: admin/ogroups/asterisk/class_phonequeue.inc:873
-#: admin/conference/class_phoneConferenceGeneric.inc:709
-#: personal/phoneaccount/class_phoneAccount.inc:1350
-#: personal/phoneaccount/class_phoneAccount.inc:1669
-#: admin/ogroups/asterisk/phonequeue.tpl.c:17
-#: admin/conference/generic.tpl.c:20 personal/phoneaccount/generic.tpl.c:11
-msgid "Home server"
-msgstr "Home server"
-
-#: admin/ogroups/asterisk/class_phonequeue.inc:281
-#: admin/ogroups/asterisk/class_phonequeue.inc:871
-#: admin/ogroups/asterisk/phonequeue.tpl.c:23
-msgid "Timeout"
-msgstr "Timeout"
-
-#: admin/ogroups/asterisk/class_phonequeue.inc:284
-#: admin/ogroups/asterisk/class_phonequeue.inc:896
-#: admin/ogroups/asterisk/phonequeue.tpl.c:26
-msgid "Retry"
-msgstr "Opnieuw proberen"
-
-#: admin/ogroups/asterisk/class_phonequeue.inc:287
-msgid "Queue length"
-msgstr "Wachtrij lengte"
-
-#: admin/ogroups/asterisk/class_phonequeue.inc:290
-#: admin/ogroups/asterisk/class_phonequeue.inc:874
-#: admin/ogroups/asterisk/phonequeue.tpl.c:35
-msgid "Announce frequency"
-msgstr "Aankondigingsfrequentie"
-
-#: admin/ogroups/asterisk/class_phonequeue.inc:293
-#: admin/conference/class_phoneConferenceGeneric.inc:328
-msgid "Number"
-msgstr "Nummer"
-
-#: admin/ogroups/asterisk/class_phonequeue.inc:316
-#: admin/ogroups/asterisk/class_phonequeue.inc:361
-msgid "asterisk"
-msgstr "asterisk"
-
-#: admin/ogroups/asterisk/class_phonequeue.inc:345
-#: admin/ogroups/asterisk/class_phonequeue.inc:696
-#: admin/conference/class_phoneConferenceGeneric.inc:369
-#: admin/macro/class_gofonMacro.inc:381 admin/macro/class_gofonMacro.inc:465
-#: addons/fonreports/class_fonreport.inc:190
-#: addons/fonreports/class_fonreport.inc:220
-#: personal/phoneaccount/class_phoneAccount.inc:455
-#: personal/phoneaccount/class_phoneAccount.inc:1061
-msgid "GOfon"
-msgstr "GOfon"
-
-#: admin/ogroups/asterisk/class_phonequeue.inc:401
-msgid "Cannot find old queue entry!"
-msgstr "Kon geen oude wachtrij inzending vinden!"
-
-#: admin/ogroups/asterisk/class_phonequeue.inc:487
-#, php-format
-msgid ""
-"Found more than one entry named '%s' in queue table. Please inform your "
-"system administrator!"
-msgstr "Er is meer dan 1 inzending gevonden on de naam '%s' in de wachtrij tabel. Gelieve je systeem beheerder op de hoogte te brengen!"
-
-#: admin/ogroups/asterisk/class_phonequeue.inc:728
-#: admin/ogroups/asterisk/class_phonequeue.inc:730
-msgid "telephone number"
-msgstr "telefoonnummer"
-
-#: admin/ogroups/asterisk/class_phonequeue.inc:787
-#: admin/ogroups/asterisk/class_phonequeue.inc:829
-#: admin/conference/class_phoneConferenceGeneric.inc:229
-#: admin/conference/class_phoneConferenceGeneric.inc:233
-#: admin/conference/class_phoneConferenceGeneric.inc:271
-#: admin/macro/class_gofonMacro.inc:343 admin/macro/class_gofonMacro.inc:452
-#: admin/macro/class_gofonMacro.inc:461 admin/macro/class_gofonMacro.inc:499
-#: admin/systems/asterisk/class_phoneGeneric.inc:267
-#: admin/systems/asterisk/class_phoneGeneric.inc:308
-#: addons/fonreports/class_fonreport.inc:220
-#: personal/phoneaccount/class_phoneAccount.inc:1046
-#: personal/phoneaccount/class_phoneAccount.inc:1166
-#: personal/phoneaccount/class_phoneAccount.inc:1172
-#: personal/phoneaccount/class_phoneAccount.inc:1368
-#: personal/phoneaccount/class_phoneAccount.inc:1450
-#: personal/phoneaccount/class_phoneAccount.inc:1528
-msgid "Error"
-msgstr "Fout"
-
-#: admin/ogroups/asterisk/class_phonequeue.inc:802
-#: admin/ogroups/asterisk/class_phonequeue.inc:857
-#: admin/conference/class_phoneConferenceGeneric.inc:682
-#: admin/macro/class_gofonMacro.inc:473 admin/macro/class_gofonMacro.inc:484
-#: admin/macro/class_gofonMacro.inc:521
-#: admin/macro/class_gofonMacroParameters.inc:435
-#: admin/systems/asterisk/class_phoneGeneric.inc:277
-#: admin/systems/asterisk/class_phoneGeneric.inc:432
-#: admin/systems/asterisk/class_phoneGeneric.inc:446
-#: admin/systems/asterisk/class_phoneGeneric.inc:463
-#: admin/systems/services/asterisk/class_serviceAsterisk.inc:121
-#: personal/phoneaccount/class_phoneAccount.inc:1476
-#: personal/phoneaccount/class_phoneAccount.inc:1609
-msgid "LDAP error"
-msgstr "LDAP fout"
-
-#: admin/ogroups/asterisk/class_phonequeue.inc:864
-#: admin/systems/asterisk/class_phoneGeneric.inc:472
-#: admin/systems/asterisk/class_phoneGeneric.inc:477
-#: personal/phoneaccount/class_phoneAccount.inc:999
-#: personal/phoneaccount/class_phoneAccount.inc:1012
-#: personal/phoneaccount/class_phoneAccount.inc:1024
-#: personal/phoneaccount/class_phoneAccount.inc:1028
-#: personal/phoneaccount/class_phoneAccount.inc:1031
-#: personal/phoneaccount/class_phoneAccount.inc:1657
+#: admin/systems/asterisk/class_phoneIAX.inc:30
+#: admin/systems/asterisk/class_phoneIAX.inc:34
+#: personal/asterisk/class_asteriskAccount.inc:45
 msgid "Phone"
 msgstr "Telefoon"
 
-#: admin/ogroups/asterisk/class_phonequeue.inc:865
-msgid "Phone group"
-msgstr "Telefoon groep"
-
-#: admin/ogroups/asterisk/class_phonequeue.inc:872
-#: admin/ogroups/asterisk/phonequeue.tpl.c:32
-msgid "Max queue length"
-msgstr "Maximale wachtrij lengte"
-
-#: admin/ogroups/asterisk/class_phonequeue.inc:875
-#: admin/ogroups/asterisk/phonequeue.tpl.c:86
-msgid "Allow the called user to transfer his call"
-msgstr "Sta de gebelde gebruiker toe het gesprek over te zetten"
-
-#: admin/ogroups/asterisk/class_phonequeue.inc:876
-#: admin/ogroups/asterisk/phonequeue.tpl.c:89
-msgid "Allows calling user to transfer call"
-msgstr "Sta de bellende gebruiker toe het gesprek over te zetten"
-
-#: admin/ogroups/asterisk/class_phonequeue.inc:877
-#: admin/ogroups/asterisk/phonequeue.tpl.c:92
-msgid "Allow the called to hangup by pressing *"
-msgstr "Sta de gebelde gebruiker toe op te hangen door * in te drukken"
-
-#: admin/ogroups/asterisk/class_phonequeue.inc:878
-#: admin/ogroups/asterisk/phonequeue.tpl.c:98
-msgid "Ring instead of playing background music"
-msgstr "Rinkel i.p.v. achtergrond muziek afspelen"
-
-#: admin/ogroups/asterisk/class_phonequeue.inc:879
-#: admin/ogroups/asterisk/phonequeue.tpl.c:95
-msgid "Allows calling to hangup by pressing *"
-msgstr "Sta de bellende gebruiker toe op te hangen door * in te drukken"
-
-#: admin/ogroups/asterisk/class_phonequeue.inc:881
-#: admin/ogroups/asterisk/phonequeue.tpl.c:47
-msgid "Music on hold"
-msgstr "Wachtstand muziek"
-
-#: admin/ogroups/asterisk/class_phonequeue.inc:882
-msgid "Welcome music"
-msgstr "Welkomstmuziek"
-
-#: admin/ogroups/asterisk/class_phonequeue.inc:883
-msgid "Report hold time"
-msgstr "Rapporteer wachttijd"
-
-#: admin/ogroups/asterisk/class_phonequeue.inc:884
-msgid "'You are next' sound"
-msgstr "'Je bent de volgende' geluid"
-
-#: admin/ogroups/asterisk/class_phonequeue.inc:885
-msgid "'There are' sound"
-msgstr "'Er zijn' geluid"
-
-#: admin/ogroups/asterisk/class_phonequeue.inc:886
-msgid "'Call waiting' sound"
-msgstr "'Telefoon wachtend' geluid"
-
-#: admin/ogroups/asterisk/class_phonequeue.inc:887
-msgid "'Thank you' sound"
-msgstr "'Bedankt' geluid"
-
-#: admin/ogroups/asterisk/class_phonequeue.inc:888
-msgid "'Minutes' sound"
-msgstr "'Minuten' geluid"
-
-#: admin/ogroups/asterisk/class_phonequeue.inc:889
-msgid "'Seconds' sound"
-msgstr "'Seconden' geluid"
-
-#: admin/ogroups/asterisk/class_phonequeue.inc:890
-msgid "'Less than' sound"
-msgstr "'Minder dan' geluid"
-
-#: admin/ogroups/asterisk/class_phonequeue.inc:891
-msgid "Queue phone number"
-msgstr "Wachtrij telefoonnummer"
-
-#: admin/ogroups/asterisk/class_phonequeue.inc:892
-#: admin/conference/class_phoneConferenceGeneric.inc:707
-#: admin/ogroups/asterisk/phonequeue.tpl.c:20
-#: admin/conference/generic.tpl.c:23
-msgid "Language"
-msgstr "Taal"
-
-#: admin/ogroups/asterisk/class_phonequeue.inc:893
-msgid "Method"
-msgstr "Methode"
-
-#: admin/ogroups/asterisk/class_phonequeue.inc:894
-#: admin/ogroups/asterisk/phonequeue.tpl.c:83
-msgid "Announce holdtime"
-msgstr "Aankondigings wachttijd"
-
-#: admin/ogroups/asterisk/class_phonequeue.inc:895
-msgid "Announce"
-msgstr "Vermelding"
+#: admin/systems/asterisk/class_phoneIAX.inc:31
+msgid "Asterisk phone"
+msgstr ""
 
-#: admin/conference/conf-list.xml:11
-msgid "List of conference rooms"
-msgstr "Lijst met conferentie kamers"
+#: admin/systems/asterisk/class_phoneIAX.inc:33
+msgid "Phone hardware"
+msgstr "Telefoon hardware"
 
-#: admin/conference/conf-list.xml:15 admin/conference/conf-list.xml:74
-msgid "Conference"
-msgstr "Conferentie"
+#: admin/systems/asterisk/class_phoneIAX.inc:46
+#: personal/asterisk/class_asteriskAccount.inc:42
+msgid "Telephone"
+msgstr "Telefoon"
 
-#: admin/conference/conf-list.xml:41
-#: admin/conference/class_phoneConferenceGeneric.inc:324
-#: admin/conference/class_phoneConferenceGeneric.inc:347
-#: admin/conference/class_phoneConferenceGeneric.inc:702
-#: admin/macro/class_gofonMacro.inc:395 admin/macro/class_gofonMacro.inc:406
-#: admin/macro/macro-list.xml:41
-#: admin/systems/asterisk/class_phoneGeneric.inc:344
-#: admin/systems/asterisk/class_phoneGeneric.inc:348
-#: admin/systems/asterisk/class_phoneGeneric.inc:351
-#: admin/systems/asterisk/class_phoneGeneric.inc:366
-#: admin/systems/asterisk/class_phoneGeneric.inc:482
-#: admin/conference/conf-filter.tpl.c:5 admin/macro/macro-filter.tpl.c:5
-#: admin/macro/parameter.tpl.c:5
+#: admin/systems/asterisk/class_phoneIAX.inc:49
 msgid "Name"
 msgstr "Naam"
 
-#: admin/conference/conf-list.xml:49
-#: admin/conference/class_phoneConferenceGeneric.inc:704
-#: admin/macro/class_gofonMacro.inc:547 admin/macro/macro-list.xml:49
-#: admin/systems/asterisk/class_phoneGeneric.inc:484
-#: admin/conference/generic.tpl.c:29 admin/macro/generic.tpl.c:17
-#: admin/systems/asterisk/phone.tpl.c:8
-msgid "Description"
-msgstr "Omschrijving"
-
-#: admin/conference/conf-list.xml:57 admin/macro/macro-list.xml:57
-msgid "Actions"
-msgstr "Acties"
-
-#: admin/conference/conf-list.xml:68 admin/macro/macro-list.xml:68
-msgid "Create"
-msgstr "Aanmaken"
-
-#: admin/conference/conf-list.xml:86 admin/conference/conf-list.xml:125
-#: admin/macro/macro-list.xml:86 admin/macro/macro-list.xml:125
-msgid "Edit"
-msgstr "Bewerken"
-
-#: admin/conference/conf-list.xml:93 admin/conference/conf-list.xml:138
-#: admin/macro/macro-list.xml:93 admin/macro/macro-list.xml:138
-msgid "Remove"
-msgstr "Verwijderen"
-
-#: admin/conference/class_phoneConferenceGeneric.inc:233
-#, php-format
-msgid "Cannot delete entry from server '%s' because it seems to be removed!"
-msgstr "Kan inzending niet van server '%s' verwijderen want het bestaat niet!"
-
-#: admin/conference/class_phoneConferenceGeneric.inc:308
-#, php-format
-msgid ""
-"The previously selected asterisk home server '%s' is no longer available!"
-msgstr "De vorige geselecteerde asterisk home server '%s' is niet langer beschikbaar!"
-
-#: admin/conference/class_phoneConferenceGeneric.inc:315
-#: admin/conference/generic.tpl.c:47
-msgid "PIN"
-msgstr "PIN-code"
-
-#: admin/conference/class_phoneConferenceGeneric.inc:333
-#: admin/conference/class_phoneConferenceGeneric.inc:719
-msgid "Lifetime"
-msgstr "Levensduur"
-
-#: admin/conference/class_phoneConferenceGeneric.inc:399
-#: personal/phoneaccount/class_phoneAccount.inc:346
-#: personal/phoneaccount/class_phoneAccount.inc:359
-#: personal/phoneaccount/class_phoneAccount.inc:617
-#: personal/phoneaccount/class_phoneAccount.inc:656
-#: personal/phoneaccount/class_phoneAccount.inc:1519
-#: personal/phoneaccount/class_phoneAccount.inc:1695
-#: admin/conference/remove.tpl.c:2 admin/macro/remove.tpl.c:2
-msgid "Warning"
-msgstr "Waarschuwing"
-
-#: admin/conference/class_phoneConferenceGeneric.inc:400
-#, php-format
-msgid ""
-"FusionDirectory identified problems with your MySQL table definition, please"
-" activate debugging for details."
-msgstr "FusionDirectory heeft problemen met je MySQL tabel definitie gevonden, gelieve de debug te activeren voor details"
-
-#: admin/conference/class_phoneConferenceGeneric.inc:606
-#: admin/conference/class_phoneConferenceGeneric.inc:608
-#, php-format
-msgid "'%s' is already assigned to '%s'!"
-msgstr "'%s' is reeds toegewezen aan '%s'!"
-
-#: admin/conference/class_phoneConferenceGeneric.inc:693
-msgid "Phone Conference"
-msgstr ""
-
-#: admin/conference/class_phoneConferenceGeneric.inc:694
-msgid "Phone conference management"
-msgstr "Telefoon vergadering beheer"
-
-#: admin/conference/class_phoneConferenceGeneric.inc:696
-msgid "GOfon conference"
-msgstr "Gofon conferentie"
-
-#: admin/conference/class_phoneConferenceGeneric.inc:698
-msgid "Asterisk conference"
-msgstr "Asterisk conferentie"
-
-#: admin/conference/class_phoneConferenceGeneric.inc:703
-#: admin/macro/class_gofonMacro.inc:546
-#: admin/systems/asterisk/class_phoneGeneric.inc:483
-#: admin/conference/generic.tpl.c:17 admin/macro/generic.tpl.c:14
-#: admin/systems/asterisk/phone.tpl.c:5
-msgid "Base"
-msgstr "Basis"
-
-#: admin/conference/class_phoneConferenceGeneric.inc:705
-msgid "Conference PIN"
-msgstr "Conferentie PIN"
-
-#: admin/conference/class_phoneConferenceGeneric.inc:710
-#: admin/conference/generic.tpl.c:44
-msgid "Preset PIN"
-msgstr "Voorgedefinieerde PIN-code"
-
-#: admin/conference/class_phoneConferenceGeneric.inc:711
-#: admin/conference/generic.tpl.c:50
-msgid "Record conference"
-msgstr "Conferentie opnemen"
-
-#: admin/conference/class_phoneConferenceGeneric.inc:712
-#: admin/conference/generic.tpl.c:59
-msgid "Play music on hold"
-msgstr "Muziek afspelen bij wachtstand"
-
-#: admin/conference/class_phoneConferenceGeneric.inc:713
-msgid "Activate menu"
-msgstr "Activeer menu"
-
-#: admin/conference/class_phoneConferenceGeneric.inc:714
-msgid "Announce user activity"
-msgstr "Verkondig user activiteit"
-
-#: admin/conference/class_phoneConferenceGeneric.inc:715
-msgid "Count user"
-msgstr "Tel gebruiker"
-
-#: admin/conference/class_phoneConferenceGeneric.inc:716
-msgid "Conference type"
-msgstr "Conferentie type"
-
-#: admin/conference/class_phoneConferenceGeneric.inc:718
-msgid "Format"
-msgstr "Formaat"
-
-#: admin/conference/class_phoneConferenceGeneric.inc:720
-#: personal/phoneaccount/class_phoneAccount.inc:1666
-msgid "Telephone number"
-msgstr "Telefoonnummer"
-
-#: admin/conference/class_phoneConferenceGeneric.inc:721
-msgid "Owner"
-msgstr "Eigenaar"
-
-#: admin/conference/class_phoneConferenceManagment.inc:36
-msgid "Phone Conferences"
-msgstr ""
-
-#: admin/conference/class_phoneConferenceManagment.inc:37
-msgid "Phone Conference management"
-msgstr ""
-
-#: admin/macro/class_gofonMacro.inc:202
-#, php-format
-msgid ""
-"Macro could not be removed from server '%s', please check database "
-"consistency!"
-msgstr "Macro kon niet worden verwijderd van de server '%s', verifieer aub de databank consistentie!"
-
-#: admin/macro/class_gofonMacro.inc:264
-#, php-format
-msgid "Application missing in line %s!"
-msgstr "Applicatie ontbreekt op lijn %s!"
-
-#: admin/macro/class_gofonMacro.inc:267
-#, php-format
-msgid "Priority missing in line %s!"
-msgstr "Prioriteit ontbreekt op lijn %s!"
-
-#: admin/macro/class_gofonMacro.inc:271
-#, php-format
-msgid "Extension missing in line %s!"
-msgstr "Extensie ontbreekt op lijn %s!"
-
-#: admin/macro/class_gofonMacro.inc:281
-#, php-format
-msgid "Duplicate combination of 'extension' and 'priority' in line %s!"
-msgstr "Duplicate combinatie van 'extensie' en 'prioriteit' op lijn %s!"
-
-#: admin/macro/class_gofonMacro.inc:317
-#, php-format
-msgid ""
-"Macro could not be added to server '%s', please check database consistency!"
-msgstr "Macro kon niet worden toegevoegd aan de server '%s', verifieer de databank consistentie"
-
-#: admin/macro/class_gofonMacro.inc:410
-msgid "Name can be 20 characters at maximum!"
-msgstr "Naam kan niet meer dan 20 karakters maximum bevatten!"
-
-#: admin/macro/class_gofonMacro.inc:419
-msgid "Macro is still in use!"
-msgstr "Macro is nog steeds in gebruik!"
-
-#: admin/macro/class_gofonMacro.inc:426
-msgid "Macro is empty!"
-msgstr "Macro is leeg!"
-
-#: admin/macro/class_gofonMacro.inc:452
-#: admin/systems/asterisk/class_phoneGeneric.inc:267
-#, php-format
-msgid "Cannot delete entry because it is still in use by '%s'!"
-msgstr "Kan inzending niet verwijderen want het is in gebruik door '%s'!"
-
-#: admin/macro/class_gofonMacro.inc:465
-#: addons/fonreports/class_fonreport.inc:190
-#: personal/phoneaccount/class_phoneAccount.inc:455
-#: personal/phoneaccount/class_phoneAccount.inc:1061
-#: personal/phoneaccount/class_phoneAccount.inc:1567
-msgid "Configuration error"
-msgstr "Configuratie error"
-
-#: admin/macro/class_gofonMacro.inc:536 admin/macro/class_gofonMacro.inc:541
-msgid "Asterisk macro"
-msgstr "Asterisk macro"
-
-#: admin/macro/class_gofonMacro.inc:537
-msgid "Asterisk macro management"
-msgstr "Asterisk macro beheer"
-
-#: admin/macro/class_gofonMacro.inc:539
-msgid "GOfon macro"
-msgstr "Gofon macro"
-
-#: admin/macro/class_gofonMacro.inc:545 admin/macro/generic.tpl.c:2
-#: admin/macro/generic.tpl.c:5 admin/macro/paste_generic.tpl.c:2
-#: admin/macro/paste_generic.tpl.c:5
-msgid "Macro name"
-msgstr "Macronaam"
-
-#: admin/macro/class_gofonMacro.inc:548 admin/macro/generic.tpl.c:8
-msgid "Display name"
-msgstr "Getoonde naam"
-
-#: admin/macro/class_gofonMacro.inc:549
-msgid "Macro content and parameter"
-msgstr "Macro inhoud en parameter"
-
-#: admin/macro/class_gofonMacro.inc:550
-msgid "Visibility flag"
-msgstr "Zichtbaarheid flag"
-
-#: admin/macro/class_gofonMacroManagement.inc:36
-msgid "Phone Macros"
-msgstr ""
-
-#: admin/macro/class_gofonMacroManagement.inc:37
-msgid "Phone Macros management"
+#: admin/systems/asterisk/class_phoneIAX.inc:49
+msgid "Name of this phone"
 msgstr ""
 
-#: admin/macro/macro-list.xml:11
-msgid "List of macros"
-msgstr "Lijst met macro's"
-
-#: admin/macro/macro-list.xml:15 admin/macro/macro-list.xml:74
-msgid "Macro"
-msgstr "Macro"
-
-#: admin/macro/class_gofonMacroParameters.inc:58
-msgid "Parameter"
-msgstr "Parameters"
-
-#: admin/macro/class_gofonMacroParameters.inc:59
-msgid "Asterisk macro parameter"
-msgstr "Asterisk macro parameter"
-
-#: admin/macro/class_gofonMacroParameters.inc:234
-#: personal/phoneaccount/generic.tpl.c:35
-msgid "Phone macro"
-msgstr "Telefoon macro"
-
-#: admin/macro/class_gofonMacroParameters.inc:290
-msgid "String"
-msgstr "Tekstregel"
-
-#: admin/macro/class_gofonMacroParameters.inc:291
-msgid "Combobox"
-msgstr "Combobox"
-
-#: admin/macro/class_gofonMacroParameters.inc:292
-msgid "Bool"
-msgstr "Bool"
-
-#: admin/macro/class_gofonMacroParameters.inc:298
-msgid "Delete unused"
-msgstr "Verwijder ongebruikte"
-
-#: admin/macro/class_gofonMacroParameters.inc:374
-#, php-format
-msgid "Parameter %s contains invalid character. '!,#' is used as delimiter!"
-msgstr "Parameter %s bevat ongeldige karakters. '!,#' word gebruikt als delimeter!"
+#: admin/systems/asterisk/class_phoneIAX.inc:53
+msgid "Account name"
+msgstr "Account naam"
 
-#: admin/macro/class_gofonMacroParameters.inc:379
-#, php-format
-msgid "Parameter %s is invalid!"
-msgstr "Parameter %s is ongeldig"
-
-#: admin/macro/class_gofonMacroParameters.inc:408
-#: personal/phoneaccount/class_phoneAccount.inc:1600
-msgid "Information"
-msgstr "Informatie"
-
-#: admin/macro/class_gofonMacroParameters.inc:408
-msgid ""
-"Number of parameters for this macro has changed. Please update all users "
-"using it!"
-msgstr "Aantal parameters voor deze macro zijn gewijzigd. Gelieve alle gebruikers die dit gebruiken up te daten!"
-
-#: admin/systems/asterisk/class_phoneGeneric.inc:151
-msgid "phone"
-msgstr "Telefoon"
-
-#: admin/systems/asterisk/class_phoneGeneric.inc:230
-msgid "yes"
-msgstr "ja"
-
-#: admin/systems/asterisk/class_phoneGeneric.inc:230
-msgid "no"
-msgstr "nee"
-
-#: admin/systems/asterisk/class_phoneGeneric.inc:247
-msgid "dynamic"
-msgstr "dynamisch"
-
-#: admin/systems/asterisk/class_phoneGeneric.inc:247
-msgid "Networksettings"
-msgstr "Netwerk instellingen"
-
-#: admin/systems/asterisk/class_phoneGeneric.inc:330
-#: admin/systems/asterisk/class_phoneGeneric.inc:333
-msgid "IP address"
-msgstr "IP adres"
-
-#: admin/systems/asterisk/class_phoneGeneric.inc:473
-msgid "Phone information"
+#: admin/systems/asterisk/class_phoneIAX.inc:53
+msgid "Name of the account"
 msgstr ""
 
-#: admin/systems/asterisk/class_phoneGeneric.inc:476
-#: personal/phoneaccount/class_phoneAccount.inc:1668
-msgid "Phone hardware"
-msgstr "Telefoon hardware"
-
-#: admin/systems/asterisk/class_phoneGeneric.inc:485
-msgid "SIP Mode"
-msgstr "SIP Mode"
-
-#: admin/systems/asterisk/class_phoneGeneric.inc:486
-msgid "SIP DTMF mode"
-msgstr "SIP DTMF mode"
-
-#: admin/systems/asterisk/class_phoneGeneric.inc:487
-msgid "SIP Default ip"
-msgstr "SIP Standaard ip"
-
-#: admin/systems/asterisk/class_phoneGeneric.inc:488
-msgid "SIP Qualify"
-msgstr "SIP Qualify"
-
-#: admin/systems/asterisk/class_phoneGeneric.inc:489
-msgid "IAX authentication type"
-msgstr "IAX authentificatie type"
-
-#: admin/systems/asterisk/class_phoneGeneric.inc:490
-msgid "IAX secret"
-msgstr "IAX secret"
-
-#: admin/systems/asterisk/class_phoneGeneric.inc:491
-msgid "IAX account code"
-msgstr "IAX account code"
-
-#: admin/systems/asterisk/class_phoneGeneric.inc:492
-msgid "IAX trunk lines"
-msgstr "IAX trunk lijnen"
-
-#: admin/systems/asterisk/class_phoneGeneric.inc:493
-msgid "IAX permit settings"
-msgstr "IAX toegangs opties"
-
-#: admin/systems/asterisk/class_phoneGeneric.inc:494
-msgid "IAX deny settings"
-msgstr "IAX weiger opties"
-
-#: admin/systems/asterisk/class_phoneGeneric.inc:495
-msgid "CAPI MSN"
-msgstr "CAPI MSN"
-
-#: admin/systems/asterisk/class_phoneGeneric.inc:496
-msgid "Hardware type"
-msgstr "Hardware type"
-
 #: admin/systems/services/asterisk/class_serviceAsterisk.inc:35
 msgid "VoIP database information"
 msgstr "Voip databank informatie"
@@ -748,6 +95,10 @@ msgid ""
 "these objects '%s'."
 msgstr "Je kan de asterisk databank niet verwijderen, het is in gebruik door deze objecten '%s'."
 
+#: admin/systems/services/asterisk/class_serviceAsterisk.inc:121
+msgid "LDAP error"
+msgstr "LDAP fout"
+
 #: admin/systems/services/asterisk/class_serviceAsterisk.inc:140
 msgid "VoIP service (asterisk)"
 msgstr "VoIP dienst (asterisk)"
@@ -760,211 +111,20 @@ msgstr "VoIP - asterisk beheer"
 msgid "Services"
 msgstr "Services"
 
-#: addons/fonreports/class_fonreport.inc:232
-msgid "Insufficient permissions"
-msgstr "Onvoldoende rechten"
-
-#: addons/fonreports/class_fonreport.inc:251
-msgid "Y-M-D"
-msgstr "J-M-D"
-
-#: addons/fonreports/class_fonreport.inc:418
-#: addons/fonreports/class_fonreport.inc:419
-#: addons/fonreports/class_fonreport.inc:424 addons/fonreports/main.inc:46
-msgid "Phone reports"
-msgstr "Tel. rapporten"
-
-#: addons/fonreports/class_fonreport.inc:419
-msgid "All entries are readonly"
-msgstr "Alle inzendingen zijn lees-enkel"
-
-#: addons/fonreports/class_fonreport.inc:428
-#: addons/fonreports/contents.tpl.c:32
-msgid "Date"
-msgstr "Datum"
-
-#: addons/fonreports/class_fonreport.inc:429
-#: addons/fonreports/contents.tpl.c:35
-msgid "Source"
-msgstr "Bron"
-
-#: addons/fonreports/class_fonreport.inc:430
-#: addons/fonreports/contents.tpl.c:38
-msgid "Destination"
-msgstr "Doel"
-
-#: addons/fonreports/class_fonreport.inc:431
-#: addons/fonreports/contents.tpl.c:41
-msgid "Channel"
-msgstr "Kanaal"
-
-#: addons/fonreports/class_fonreport.inc:432
-msgid "Application called"
-msgstr "Applicatie opgeroepen"
-
-#: addons/fonreports/class_fonreport.inc:433
-msgid "Disposition"
-msgstr "Dispositie"
-
-#: addons/fonreports/class_fonreport.inc:434
-#: addons/fonreports/contents.tpl.c:50
-msgid "Duration"
-msgstr "Tijdsduur"
-
-#: personal/phoneaccount/class_phoneAccount.inc:176
-msgid "automatic"
-msgstr "automatisch"
-
-#: personal/phoneaccount/class_phoneAccount.inc:212
-msgid "no macro"
-msgstr "geen macro"
-
-#: personal/phoneaccount/class_phoneAccount.inc:240
-msgid "undefined"
-msgstr "niet gedefiniÃ«erd"
-
-#: personal/phoneaccount/class_phoneAccount.inc:359
-#, php-format
-msgid ""
-"Cannot identify telephone extension in database, please try to save again."
-msgstr "Kan telefoon extensie niet identificeren in databank, probeer aub opnieuw."
-
-#: personal/phoneaccount/class_phoneAccount.inc:577
-#: personal/phoneaccount/class_phoneAccount.inc:595
-msgid "Abort saving entries to keep the database consistent."
-msgstr "Stop met inzendingen op te slaan om de databank consistentie te behouden"
-
-#: personal/phoneaccount/class_phoneAccount.inc:618
-#: personal/phoneaccount/class_phoneAccount.inc:657
-#: personal/phoneaccount/class_phoneAccount.inc:1520
-#, php-format
-msgid ""
-"FusionDirectory identified problems with your database table definition!"
-msgstr "FusionDirectory heeft problemen met je databank tabel definitie gevonden!"
-
-#: personal/phoneaccount/class_phoneAccount.inc:1023
-msgid "Remove phone account"
-msgstr "Verwijder telefoon account"
-
-#: personal/phoneaccount/class_phoneAccount.inc:1027
-#: personal/phoneaccount/class_phoneAccount.inc:1030
-msgid "Create phone account"
-msgstr "Telefoon account aanmaken"
-
-#: personal/phoneaccount/class_phoneAccount.inc:1028
-msgid "User uid"
-msgstr "Gebruikers uid"
-
-#: personal/phoneaccount/class_phoneAccount.inc:1046
-msgid "Selected macro is not available anymore!"
-msgstr "Geselecteerde macro is niet meet beschikbaar!"
-
-#: personal/phoneaccount/class_phoneAccount.inc:1221
-msgid "Choose your private phone"
-msgstr "Kies uw privÃ© telefoon"
-
-#: personal/phoneaccount/class_phoneAccount.inc:1346
-msgid ""
-"There must be at least one server with an asterisk database to create a "
-"phone account."
-msgstr "Er moet minstens 1 server met asterisk databank bestaan om een telefoon account te maken"
-
-#: personal/phoneaccount/class_phoneAccount.inc:1354
-#: personal/phoneaccount/class_phoneAccount.inc:1357
-#: personal/phoneaccount/generic.tpl.c:29
-#: personal/phoneaccount/paste_generic.tpl.c:11
-msgid "Voicemail PIN"
-msgstr "Voicemail PIN-code"
-
-#: personal/phoneaccount/class_phoneAccount.inc:1354
-msgid "Between 1-4 charactes"
-msgstr "Tussen 1-4 karakters"
-
-#: personal/phoneaccount/class_phoneAccount.inc:1362
-#: personal/phoneaccount/generic.tpl.c:32
-#: personal/phoneaccount/paste_generic.tpl.c:14
-msgid "Phone PIN"
-msgstr "Telefoon PIN-code"
-
-#: personal/phoneaccount/class_phoneAccount.inc:1394
-#: admin/conference/generic.tpl.c:38 admin/conference/paste_generic.tpl.c:8
-msgid "Phone number"
-msgstr "Telefoonnummer"
-
-#: personal/phoneaccount/class_phoneAccount.inc:1402
-#, php-format
-msgid "macro parameter %s"
-msgstr "macro parameter %s"
-
-#: personal/phoneaccount/class_phoneAccount.inc:1450
-msgid "An error occured while updating the database entries!"
-msgstr "Een error vond plaats tijdens het updaten van de databank inzendingen!"
-
-#: personal/phoneaccount/class_phoneAccount.inc:1567
-msgid "Was not able to found any asterisk server"
-msgstr ""
-
-#: personal/phoneaccount/class_phoneAccount.inc:1600
-#, php-format
-msgid "User '%s' has been removed from phone queue '%s'."
-msgstr "Gebruiker '%s' is verwijderd van de telefoon wachtrij '%s'.'"
-
-#: personal/phoneaccount/class_phoneAccount.inc:1637
-#: personal/phoneaccount/class_phoneAccount.inc:1639
-#, php-format
-msgid "The specified telephonenumber '%s' is already assigned to '%s'."
-msgstr "Het opgegeven telefoonnummer '%s' is al toegekend aan '%s'."
-
-#: personal/phoneaccount/class_phoneAccount.inc:1649
-#, php-format
-msgid ""
-"The previously selected asterisk home server (%s) is no longer available. "
-"Remove aborted."
-msgstr "De vorige geselecteerde asterisk home server (%s) is niet meer beschikbaar. Verwijdering is geannuleerd."
-
-#: personal/phoneaccount/class_phoneAccount.inc:1658
-msgid "Phone account settings"
-msgstr "Telefoon account opties"
-
-#: personal/phoneaccount/class_phoneAccount.inc:1667
-msgid "Macro settings"
-msgstr "Macro opties"
-
-#: personal/phoneaccount/class_phoneAccount.inc:1670
-msgid "Phone context"
-msgstr "Telefoon context"
-
-#: personal/phoneaccount/class_phoneAccount.inc:1671
-msgid "Voice mail context"
-msgstr "Voice mail context"
-
-#: personal/phoneaccount/class_phoneAccount.inc:1672
-msgid "Telephone pin"
-msgstr "Telephone pin"
-
-#: personal/phoneaccount/class_phoneAccount.inc:1673
-msgid "Voicemail pin"
-msgstr "Voicemail pin"
-
-#: personal/phoneaccount/class_phoneAccount.inc:1695
-#, php-format
-msgid "You need to configure %s contexts first"
-msgstr "U moet %s eerst configureren"
-
-#: personal/phoneaccount/main.inc:124
-msgid "Click the 'Edit' button below to change informations in this dialog"
-msgstr "Gebruik de 'Bewerk' knop hieronder om de informatie in deze dialoog te veranderen"
-
-#: personal/phoneaccount/main.inc:134
-#: personal/phoneaccount/paste_generic.tpl.c:2
-msgid "Phone settings"
-msgstr "Telefoon instellingen"
-
+#: personal/asterisk/class_asteriskAccount.inc:30
 #: config/asterisk/class_asteriskPluginConfig.inc:28
 #: config/asterisk/class_asteriskPluginConfig.inc:41
 msgid "Asterisk"
 msgstr "Asterisk"
 
+#: personal/asterisk/class_asteriskAccount.inc:31
+msgid "Asterisk account"
+msgstr ""
+
+#: personal/asterisk/class_asteriskAccount.inc:45
+msgid "Select the phone associated to this user"
+msgstr ""
+
 #: config/asterisk/class_asteriskPluginConfig.inc:29
 msgid "Asterisk plugin configuration"
 msgstr "Asterisk plugin configuratie"
@@ -1012,338 +172,3 @@ msgstr "Voicemail contexten"
 #: config/asterisk/class_asteriskPluginConfig.inc:72
 msgid "Available voicemail contexts"
 msgstr "Beschikbare voicemail contexten"
-
-#: admin/ogroups/asterisk/phonequeue.tpl.c:2
-msgid ""
-"Only users with the same asterisk home server will be included to this "
-"queue."
-msgstr "Enkel gebruikers met dezelfde asterisk home server worden toegevoegd aan deze wachtrij"
-
-#: admin/ogroups/asterisk/phonequeue.tpl.c:5
-#: personal/phoneaccount/generic.tpl.c:2
-#: personal/phoneaccount/paste_generic.tpl.c:5
-msgid "Phone numbers"
-msgstr "Telefoonnummers"
-
-#: admin/ogroups/asterisk/phonequeue.tpl.c:8
-msgid "Up"
-msgstr "Omhoog"
-
-#: admin/ogroups/asterisk/phonequeue.tpl.c:11
-msgid "Down"
-msgstr "Omlaag"
-
-#: admin/ogroups/asterisk/phonequeue.tpl.c:14
-#: admin/conference/generic.tpl.c:41
-msgid "Options"
-msgstr "Opties"
-
-#: admin/ogroups/asterisk/phonequeue.tpl.c:29
-msgid "Strategy"
-msgstr "Strategie"
-
-#: admin/ogroups/asterisk/phonequeue.tpl.c:38
-msgid "(in seconds)"
-msgstr "(in seconden)"
-
-#: admin/ogroups/asterisk/phonequeue.tpl.c:41
-msgid "Queue sound setup"
-msgstr "Wachtrij geluidsinstellingen"
-
-#: admin/ogroups/asterisk/phonequeue.tpl.c:44
-msgid "Use music on hold instead of ringing"
-msgstr "Gebruik wachtstand muziek i.p.v. rinkelen"
-
-#: admin/ogroups/asterisk/phonequeue.tpl.c:50
-msgid "Welcome sound file"
-msgstr "Welkomst geluidsbestand"
-
-#: admin/ogroups/asterisk/phonequeue.tpl.c:53
-msgid "Announce message"
-msgstr "Aankondigings bericht"
-
-#: admin/ogroups/asterisk/phonequeue.tpl.c:56
-msgid "Sound file for 'You are next ...'"
-msgstr "Geluidsbestand voor 'U bent de volgende ...'"
-
-#: admin/ogroups/asterisk/phonequeue.tpl.c:59
-msgid "'There are ...'"
-msgstr "'Er zijn ...'"
-
-#: admin/ogroups/asterisk/phonequeue.tpl.c:62
-msgid "'... calls waiting'"
-msgstr "'...oproepen wachtend'"
-
-#: admin/ogroups/asterisk/phonequeue.tpl.c:65
-msgid "'Thank you' message"
-msgstr "'Dank U' bericht"
-
-#: admin/ogroups/asterisk/phonequeue.tpl.c:68
-msgid "'minutes' sound file"
-msgstr "'minuten' geluidsbestand"
-
-#: admin/ogroups/asterisk/phonequeue.tpl.c:71
-msgid "'seconds' sound file"
-msgstr "'seconden' geluidsbestand"
-
-#: admin/ogroups/asterisk/phonequeue.tpl.c:74
-msgid "Hold sound file"
-msgstr "Wachtstand geluidsbestand"
-
-#: admin/ogroups/asterisk/phonequeue.tpl.c:77
-msgid "Less Than sound file"
-msgstr "Minder Dan geluidsbestand"
-
-#: admin/ogroups/asterisk/phonequeue.tpl.c:80
-msgid "Phone attributes "
-msgstr "Telefoon attributen "
-
-#: admin/conference/conf-filter.tpl.c:2 admin/macro/macro-filter.tpl.c:2
-#: addons/fonreports/contents.tpl.c:2
-msgid "Filter"
-msgstr "Filter"
-
-#: admin/conference/generic.tpl.c:2
-msgid "Properties"
-msgstr "Eigenschappen"
-
-#: admin/conference/generic.tpl.c:5 admin/conference/paste_generic.tpl.c:2
-msgid "Conference name"
-msgstr "Conferentienaam"
-
-#: admin/conference/generic.tpl.c:8 admin/conference/paste_generic.tpl.c:5
-msgid "Name of conference to create"
-msgstr "Naam van de aan te maken conferentie"
-
-#: admin/conference/generic.tpl.c:11
-msgid "Type"
-msgstr "Type"
-
-#: admin/conference/generic.tpl.c:14
-msgid "Choose subtree to place conference in"
-msgstr "Kies de subtree waaronder de conferentie geplaatst wordt"
-
-#: admin/conference/generic.tpl.c:26
-msgid "Select language"
-msgstr "Selecteer taal"
-
-#: admin/conference/generic.tpl.c:32
-msgid "Descriptive text for department"
-msgstr "Omschrijving voor de afdeling"
-
-#: admin/conference/generic.tpl.c:35
-msgid "Lifetime (in days)"
-msgstr "Geldigheidsduur (in dagen)"
-
-#: admin/conference/generic.tpl.c:53
-msgid "Sound file format"
-msgstr "Geluidsbestand formaat"
-
-#: admin/conference/generic.tpl.c:56
-msgid "Choose subtree to place department in"
-msgstr "Selecteer de subtree waaronder deze afdeling geplaatst wordt"
-
-#: admin/conference/generic.tpl.c:62
-msgid "Activate session menu"
-msgstr "Activeer sessiemenu"
-
-#: admin/conference/generic.tpl.c:65
-msgid "Announce users joining or leaving the conference"
-msgstr "Kondig binnenkomende en verlatende gebruikers aan"
-
-#: admin/conference/generic.tpl.c:68
-msgid "Count users"
-msgstr "Tel het aantal gebruikers"
-
-#: admin/conference/remove.tpl.c:5 admin/macro/remove.tpl.c:5
-msgid ""
-"Please double check if you really want to do this since there is no way for "
-"FusionDirectory to get your data back."
-msgstr "Controleer a.u.b. of u dit daadwerkelijk wil doen, aangezien er geen mogelijkheid voor FusionDirectory is om uw data terug te krijgen."
-
-#: admin/conference/remove.tpl.c:8 admin/macro/remove.tpl.c:8
-msgid "So - if you're sure - press 'Delete' to continue or 'Cancel' to abort."
-msgstr "Indien u zeker bent drukt u dan 'Verwijderen' om door te gaan of 'Annuleren' om te annuleren."
-
-#: admin/macro/generic.tpl.c:11
-msgid "Macro name to be displayed"
-msgstr "Weer te geven macronaam"
-
-#: admin/macro/generic.tpl.c:20
-msgid "Visible for user"
-msgstr "Zichtbaar voor gebruikers"
-
-#: admin/macro/generic.tpl.c:23
-msgid "Macro text"
-msgstr "Macro tekst"
-
-#: admin/macro/parameter.tpl.c:2
-msgid "Argument"
-msgstr "Argument"
-
-#: admin/macro/parameter.tpl.c:8
-msgid "type"
-msgstr "type"
-
-#: admin/macro/parameter.tpl.c:11
-msgid "Default value"
-msgstr "Standaard waarde"
-
-#: admin/macro/parameter.tpl.c:14
-msgid "You are not allowed to view the macro parameter settings"
-msgstr "Je hebt geen toelating om de macro parameter te bekijken"
-
-#: admin/systems/asterisk/phonesettings.tpl.c:2
-msgid "Advanced phone settings"
-msgstr "Geavanceerde telefoon instellingen"
-
-#: admin/systems/asterisk/phonesettings.tpl.c:5
-msgid "Phone type"
-msgstr "Telefoontype"
-
-#: admin/systems/asterisk/phonesettings.tpl.c:8
-#: admin/systems/asterisk/phonesettings.tpl.c:14
-#: admin/systems/asterisk/phonesettings.tpl.c:20
-#: admin/systems/asterisk/phonesettings.tpl.c:26
-#: admin/systems/asterisk/phonesettings.tpl.c:35
-#: admin/systems/asterisk/phonesettings.tpl.c:47
-#: admin/systems/asterisk/phonesettings.tpl.c:65
-msgid "Choose a phone type"
-msgstr "Kies een telefoontype"
-
-#: admin/systems/asterisk/phonesettings.tpl.c:11
-msgid "Mode"
-msgstr "Modus"
-
-#: admin/systems/asterisk/phonesettings.tpl.c:17
-msgid "DTMF mode"
-msgstr "DTMF modus"
-
-#: admin/systems/asterisk/phonesettings.tpl.c:23
-#: admin/systems/asterisk/phonesettings.tpl.c:38
-msgid "Default IP"
-msgstr "Standaard IP"
-
-#: admin/systems/asterisk/phonesettings.tpl.c:29
-#: admin/systems/asterisk/phonesettings.tpl.c:41
-msgid "Response timeout"
-msgstr "Reageer timeout"
-
-#: admin/systems/asterisk/phonesettings.tpl.c:32
-msgid "Modus"
-msgstr "Modus"
-
-#: admin/systems/asterisk/phonesettings.tpl.c:44
-msgid "Authtype"
-msgstr "Authorisatietype"
-
-#: admin/systems/asterisk/phonesettings.tpl.c:50
-msgid "Secret"
-msgstr "Wachtwoord"
-
-#: admin/systems/asterisk/phonesettings.tpl.c:53
-msgid "GoFonInkeys"
-msgstr "GOFonInKeys"
-
-#: admin/systems/asterisk/phonesettings.tpl.c:56
-msgid "GoFonOutKeys"
-msgstr "GoFonOutKeys"
-
-#: admin/systems/asterisk/phonesettings.tpl.c:59
-msgid "Account code"
-msgstr "Account code"
-
-#: admin/systems/asterisk/phonesettings.tpl.c:62
-msgid "Trunk lines"
-msgstr "Trunk lijnen"
-
-#: admin/systems/asterisk/phonesettings.tpl.c:68
-msgid "Hosts that are allowed to connect"
-msgstr "Hosts die mogen verbinden"
-
-#: admin/systems/asterisk/phonesettings.tpl.c:71
-#: admin/systems/asterisk/phonesettings.tpl.c:77
-msgid "List of alternative mail addresses"
-msgstr "Lijst met alternatieve E-mail adressen"
-
-#: admin/systems/asterisk/phonesettings.tpl.c:74
-msgid "Hosts that are not allowed to connect"
-msgstr "Hosts die niet mogen verbinden"
-
-#: admin/systems/asterisk/phonesettings.tpl.c:80
-msgid "MSN"
-msgstr "MSN"
-
-#: admin/systems/asterisk/phone.tpl.c:2
-msgid "Phone name"
-msgstr "Telefoonnaam"
-
-#: addons/fonreports/contents.tpl.c:5
-msgid "Search for"
-msgstr "Zoek naar"
-
-#: addons/fonreports/contents.tpl.c:8
-msgid "Enter user name to search for"
-msgstr "Voer de te zoeken gebruikersnaam in"
-
-#: addons/fonreports/contents.tpl.c:11 addons/fonreports/contents.tpl.c:26
-msgid "in"
-msgstr "in"
-
-#: addons/fonreports/contents.tpl.c:14
-msgid "Select subtree to base search on"
-msgstr "Selecteer de subtree waarbinnen de zoekopdracht plaatsvindt"
-
-#: addons/fonreports/contents.tpl.c:17
-msgid "on"
-msgstr "aan"
-
-#: addons/fonreports/contents.tpl.c:20
-msgid "Select server to search on"
-msgstr "Selecteer de server om opzoekingen op te doen"
-
-#: addons/fonreports/contents.tpl.c:23
-msgid "during"
-msgstr "gedurende"
-
-#: addons/fonreports/contents.tpl.c:29
-msgid "Search"
-msgstr "Zoeken"
-
-#: addons/fonreports/contents.tpl.c:44
-msgid "Application"
-msgstr "Programma"
-
-#: addons/fonreports/contents.tpl.c:47
-msgid "Status"
-msgstr "Status"
-
-#: addons/fonreports/contents.tpl.c:53
-msgid "Search returned no results..."
-msgstr "De zoekopdracht gaf geen resultaten terug..."
-
-#: personal/phoneaccount/generic.tpl.c:5
-#: personal/phoneaccount/paste_generic.tpl.c:8
-msgid "Telephone hardware"
-msgstr "Telefoon hardware"
-
-#: personal/phoneaccount/generic.tpl.c:8
-msgid "Telephone"
-msgstr "Telefoon"
-
-#: personal/phoneaccount/generic.tpl.c:14
-msgid "Select the accounts home server"
-msgstr "Selecteer de accounts home server"
-
-#: personal/phoneaccount/generic.tpl.c:17
-msgid "Context"
-msgstr "Context"
-
-#: personal/phoneaccount/generic.tpl.c:20
-#: personal/phoneaccount/generic.tpl.c:26
-msgid "Select the accounts context"
-msgstr "Selecteer de account context"
-
-#: personal/phoneaccount/generic.tpl.c:23
-msgid "Voicemail context"
-msgstr "Voicemail context"
diff --git a/asterisk/locale/pl/fusiondirectory.po b/asterisk/locale/pl/fusiondirectory.po
index fef1a34cbac6f5d75c0398ab544afdb93b6cfcc0..dddc257d8dee7f9b00c5cefc133f7d1001e58ee3 100644
--- a/asterisk/locale/pl/fusiondirectory.po
+++ b/asterisk/locale/pl/fusiondirectory.po
@@ -5,704 +5,53 @@
 # Translators:
 msgid ""
 msgstr ""
-"Project-Id-Version: FusionDirectory-108\n"
+"Project-Id-Version: FusionDirectory-109\n"
 "Report-Msgid-Bugs-To: documentation@lists.fusiondirectory.org\n"
-"POT-Creation-Date: 2015-03-31 11:49+0200\n"
-"PO-Revision-Date: 2015-03-31 11:41+0000\n"
+"POT-Creation-Date: 2014-12-15 17:47+0100\n"
+"PO-Revision-Date: 2015-02-25 16:13+0000\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>\n"
-"Language-Team: Polish (http://www.transifex.com/projects/p/FusionDirectory-108/language/pl/)\n"
+"Language-Team: Polish (http://www.transifex.com/projects/p/FusionDirectory-109/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/ogroups/asterisk/class_phonequeue.inc:110
-#: admin/conference/class_phoneConferenceGeneric.inc:104
-#: personal/phoneaccount/class_phoneAccount.inc:148
-msgid "Obsolete entry"
-msgstr ""
-
-#: admin/ogroups/asterisk/class_phonequeue.inc:110
-#: admin/conference/class_phoneConferenceGeneric.inc:104
-#: personal/phoneaccount/class_phoneAccount.inc:148
-#, php-format
-msgid ""
-"The current home server is not available anymore. It will be moved to '%s' "
-"if you save this entry!"
-msgstr ""
-
-#: admin/ogroups/asterisk/class_phonequeue.inc:140
-msgid "ring all"
-msgstr "dzwoÅ„ do wszystkich"
-
-#: admin/ogroups/asterisk/class_phonequeue.inc:141
-msgid "round robin"
-msgstr "round robin"
-
-#: admin/ogroups/asterisk/class_phonequeue.inc:142
-msgid "least recently called"
-msgstr "ostatnio wdzwaniany"
-
-#: admin/ogroups/asterisk/class_phonequeue.inc:143
-msgid "fewest completed calls"
-msgstr "najmniej ukoÅ„czonych poÅ‚Ä…czeÅ„"
-
-#: admin/ogroups/asterisk/class_phonequeue.inc:144
-msgid "random"
-msgstr "losowy"
-
-#: admin/ogroups/asterisk/class_phonequeue.inc:145
-msgid "round robin with memory"
-msgstr "round robin z zapamiÄ™tywaniem"
-
-#: admin/ogroups/asterisk/class_phonequeue.inc:180
-msgid "Remove the phone queue from this Account"
-msgstr "UsuÅ„ kolejkÄ™ telefonicznÄ… z tego konta"
-
-#: admin/ogroups/asterisk/class_phonequeue.inc:181
-#: admin/ogroups/asterisk/class_phonequeue.inc:184
-msgid "phone queue"
-msgstr ""
-
-#: admin/ogroups/asterisk/class_phonequeue.inc:183
-msgid "Create phone queue"
-msgstr "UtwÃ³rz kolejkÄ™ telefonicznÄ…"
-
-#: admin/ogroups/asterisk/class_phonequeue.inc:272
-msgid ""
-"There must be at least one server with an asterisk database to create a "
-"phone queue."
-msgstr ""
-
-#: admin/ogroups/asterisk/class_phonequeue.inc:275
-#: admin/ogroups/asterisk/class_phonequeue.inc:873
-#: admin/conference/class_phoneConferenceGeneric.inc:709
-#: personal/phoneaccount/class_phoneAccount.inc:1350
-#: personal/phoneaccount/class_phoneAccount.inc:1669
-#: admin/ogroups/asterisk/phonequeue.tpl.c:17
-#: admin/conference/generic.tpl.c:20 personal/phoneaccount/generic.tpl.c:11
-msgid "Home server"
-msgstr ""
-
-#: admin/ogroups/asterisk/class_phonequeue.inc:281
-#: admin/ogroups/asterisk/class_phonequeue.inc:871
-#: admin/ogroups/asterisk/phonequeue.tpl.c:23
-msgid "Timeout"
-msgstr "Timeout"
-
-#: admin/ogroups/asterisk/class_phonequeue.inc:284
-#: admin/ogroups/asterisk/class_phonequeue.inc:896
-#: admin/ogroups/asterisk/phonequeue.tpl.c:26
-msgid "Retry"
-msgstr "Ponawia"
-
-#: admin/ogroups/asterisk/class_phonequeue.inc:287
-msgid "Queue length"
-msgstr ""
-
-#: admin/ogroups/asterisk/class_phonequeue.inc:290
-#: admin/ogroups/asterisk/class_phonequeue.inc:874
-#: admin/ogroups/asterisk/phonequeue.tpl.c:35
-msgid "Announce frequency"
-msgstr "CzÄ™stotliwoÅ›Ä‡ zapowiedzi"
-
-#: admin/ogroups/asterisk/class_phonequeue.inc:293
-#: admin/conference/class_phoneConferenceGeneric.inc:328
-msgid "Number"
-msgstr ""
-
-#: admin/ogroups/asterisk/class_phonequeue.inc:316
-#: admin/ogroups/asterisk/class_phonequeue.inc:361
-msgid "asterisk"
-msgstr "asterisk"
-
-#: admin/ogroups/asterisk/class_phonequeue.inc:345
-#: admin/ogroups/asterisk/class_phonequeue.inc:696
-#: admin/conference/class_phoneConferenceGeneric.inc:369
-#: admin/macro/class_gofonMacro.inc:381 admin/macro/class_gofonMacro.inc:465
-#: addons/fonreports/class_fonreport.inc:190
-#: addons/fonreports/class_fonreport.inc:220
-#: personal/phoneaccount/class_phoneAccount.inc:455
-#: personal/phoneaccount/class_phoneAccount.inc:1061
-msgid "GOfon"
-msgstr "GOfon"
-
-#: admin/ogroups/asterisk/class_phonequeue.inc:401
-msgid "Cannot find old queue entry!"
-msgstr ""
-
-#: admin/ogroups/asterisk/class_phonequeue.inc:487
-#, php-format
-msgid ""
-"Found more than one entry named '%s' in queue table. Please inform your "
-"system administrator!"
-msgstr ""
-
-#: admin/ogroups/asterisk/class_phonequeue.inc:728
-#: admin/ogroups/asterisk/class_phonequeue.inc:730
-msgid "telephone number"
-msgstr "numer telefonu"
-
-#: admin/ogroups/asterisk/class_phonequeue.inc:787
-#: admin/ogroups/asterisk/class_phonequeue.inc:829
-#: admin/conference/class_phoneConferenceGeneric.inc:229
-#: admin/conference/class_phoneConferenceGeneric.inc:233
-#: admin/conference/class_phoneConferenceGeneric.inc:271
-#: admin/macro/class_gofonMacro.inc:343 admin/macro/class_gofonMacro.inc:452
-#: admin/macro/class_gofonMacro.inc:461 admin/macro/class_gofonMacro.inc:499
-#: admin/systems/asterisk/class_phoneGeneric.inc:267
-#: admin/systems/asterisk/class_phoneGeneric.inc:308
-#: addons/fonreports/class_fonreport.inc:220
-#: personal/phoneaccount/class_phoneAccount.inc:1046
-#: personal/phoneaccount/class_phoneAccount.inc:1166
-#: personal/phoneaccount/class_phoneAccount.inc:1172
-#: personal/phoneaccount/class_phoneAccount.inc:1368
-#: personal/phoneaccount/class_phoneAccount.inc:1450
-#: personal/phoneaccount/class_phoneAccount.inc:1528
-msgid "Error"
-msgstr "BÅ‚Ä…d"
-
-#: admin/ogroups/asterisk/class_phonequeue.inc:802
-#: admin/ogroups/asterisk/class_phonequeue.inc:857
-#: admin/conference/class_phoneConferenceGeneric.inc:682
-#: admin/macro/class_gofonMacro.inc:473 admin/macro/class_gofonMacro.inc:484
-#: admin/macro/class_gofonMacro.inc:521
-#: admin/macro/class_gofonMacroParameters.inc:435
-#: admin/systems/asterisk/class_phoneGeneric.inc:277
-#: admin/systems/asterisk/class_phoneGeneric.inc:432
-#: admin/systems/asterisk/class_phoneGeneric.inc:446
-#: admin/systems/asterisk/class_phoneGeneric.inc:463
-#: admin/systems/services/asterisk/class_serviceAsterisk.inc:121
-#: personal/phoneaccount/class_phoneAccount.inc:1476
-#: personal/phoneaccount/class_phoneAccount.inc:1609
-msgid "LDAP error"
-msgstr "bÅ‚Ä…d LDAP"
-
-#: admin/ogroups/asterisk/class_phonequeue.inc:864
-#: admin/systems/asterisk/class_phoneGeneric.inc:472
-#: admin/systems/asterisk/class_phoneGeneric.inc:477
-#: personal/phoneaccount/class_phoneAccount.inc:999
-#: personal/phoneaccount/class_phoneAccount.inc:1012
-#: personal/phoneaccount/class_phoneAccount.inc:1024
-#: personal/phoneaccount/class_phoneAccount.inc:1028
-#: personal/phoneaccount/class_phoneAccount.inc:1031
-#: personal/phoneaccount/class_phoneAccount.inc:1657
+#: admin/systems/asterisk/class_phoneIAX.inc:30
+#: admin/systems/asterisk/class_phoneIAX.inc:34
+#: personal/asterisk/class_asteriskAccount.inc:45
 msgid "Phone"
 msgstr "Telefon"
 
-#: admin/ogroups/asterisk/class_phonequeue.inc:865
-msgid "Phone group"
-msgstr "Grupa telefoniczna"
-
-#: admin/ogroups/asterisk/class_phonequeue.inc:872
-#: admin/ogroups/asterisk/phonequeue.tpl.c:32
-msgid "Max queue length"
-msgstr "Maksymalna dÅ‚ugoÅ›Ä‡ kolejki"
-
-#: admin/ogroups/asterisk/class_phonequeue.inc:875
-#: admin/ogroups/asterisk/phonequeue.tpl.c:86
-msgid "Allow the called user to transfer his call"
-msgstr "ZezwÃ³l dodzwanianemu uÅ¼ytkownikowi na przekazanie tej rozmowy"
-
-#: admin/ogroups/asterisk/class_phonequeue.inc:876
-#: admin/ogroups/asterisk/phonequeue.tpl.c:89
-msgid "Allows calling user to transfer call"
-msgstr "Zezwala dzwoniÄ…cemu uÅ¼ytkownikowi na przekazanie rozmowy"
-
-#: admin/ogroups/asterisk/class_phonequeue.inc:877
-#: admin/ogroups/asterisk/phonequeue.tpl.c:92
-msgid "Allow the called to hangup by pressing *"
-msgstr "ZezwÃ³l dodzanianemu uÅ¼ytkownikowi na rozÅ‚Ä…czenie przez wciÅ›niÄ™cie *"
-
-#: admin/ogroups/asterisk/class_phonequeue.inc:878
-#: admin/ogroups/asterisk/phonequeue.tpl.c:98
-msgid "Ring instead of playing background music"
-msgstr "DzwoÅ„ zamiast odtwarzaÄ‡ muzyki w tle"
-
-#: admin/ogroups/asterisk/class_phonequeue.inc:879
-#: admin/ogroups/asterisk/phonequeue.tpl.c:95
-msgid "Allows calling to hangup by pressing *"
-msgstr "Zezwala dzwoniÄ…cemu na rozÅ‚Ä…czenie poprzez wciÅ›niÄ™cie *"
-
-#: admin/ogroups/asterisk/class_phonequeue.inc:881
-#: admin/ogroups/asterisk/phonequeue.tpl.c:47
-msgid "Music on hold"
-msgstr "Muzyka podczas oczekiwania"
-
-#: admin/ogroups/asterisk/class_phonequeue.inc:882
-msgid "Welcome music"
-msgstr "Muzyka powitalna"
-
-#: admin/ogroups/asterisk/class_phonequeue.inc:883
-msgid "Report hold time"
-msgstr "OgÅ‚aszaj czas wstrzymania"
-
-#: admin/ogroups/asterisk/class_phonequeue.inc:884
-msgid "'You are next' sound"
-msgstr "DÅºwiÄ™k 'jesteÅ› nastÄ™pny'"
-
-#: admin/ogroups/asterisk/class_phonequeue.inc:885
-msgid "'There are' sound"
-msgstr "DÅºwiÄ™k 'IstniejÄ…'"
-
-#: admin/ogroups/asterisk/class_phonequeue.inc:886
-msgid "'Call waiting' sound"
-msgstr "DÅºwiÄ™k 'rozmowa oczekujÄ…ca'"
-
-#: admin/ogroups/asterisk/class_phonequeue.inc:887
-msgid "'Thank you' sound"
-msgstr "DÅºwiÄ™k 'dziÄ™kujemy'"
-
-#: admin/ogroups/asterisk/class_phonequeue.inc:888
-msgid "'Minutes' sound"
-msgstr "DÅºwiÄ™k 'minut'"
-
-#: admin/ogroups/asterisk/class_phonequeue.inc:889
-msgid "'Seconds' sound"
-msgstr "DÅºwiÄ™k 'sekund'"
-
-#: admin/ogroups/asterisk/class_phonequeue.inc:890
-msgid "'Less than' sound"
-msgstr "DÅºwiÄ™k 'mniej niÅ¼'"
-
-#: admin/ogroups/asterisk/class_phonequeue.inc:891
-msgid "Queue phone number"
-msgstr "Kolejkuj numer telefonu"
-
-#: admin/ogroups/asterisk/class_phonequeue.inc:892
-#: admin/conference/class_phoneConferenceGeneric.inc:707
-#: admin/ogroups/asterisk/phonequeue.tpl.c:20
-#: admin/conference/generic.tpl.c:23
-msgid "Language"
-msgstr "JÄ™zyk"
-
-#: admin/ogroups/asterisk/class_phonequeue.inc:893
-msgid "Method"
-msgstr "Metoda"
-
-#: admin/ogroups/asterisk/class_phonequeue.inc:894
-#: admin/ogroups/asterisk/phonequeue.tpl.c:83
-msgid "Announce holdtime"
-msgstr "OgÅ‚aszaj czas podtrzymania"
-
-#: admin/ogroups/asterisk/class_phonequeue.inc:895
-msgid "Announce"
-msgstr "Zapowiadanie"
-
-#: admin/conference/conf-list.xml:11
-msgid "List of conference rooms"
-msgstr "Lista sal konferencyjnych"
-
-#: admin/conference/conf-list.xml:15 admin/conference/conf-list.xml:74
-msgid "Conference"
-msgstr "Konferencja"
-
-#: admin/conference/conf-list.xml:41
-#: admin/conference/class_phoneConferenceGeneric.inc:324
-#: admin/conference/class_phoneConferenceGeneric.inc:347
-#: admin/conference/class_phoneConferenceGeneric.inc:702
-#: admin/macro/class_gofonMacro.inc:395 admin/macro/class_gofonMacro.inc:406
-#: admin/macro/macro-list.xml:41
-#: admin/systems/asterisk/class_phoneGeneric.inc:344
-#: admin/systems/asterisk/class_phoneGeneric.inc:348
-#: admin/systems/asterisk/class_phoneGeneric.inc:351
-#: admin/systems/asterisk/class_phoneGeneric.inc:366
-#: admin/systems/asterisk/class_phoneGeneric.inc:482
-#: admin/conference/conf-filter.tpl.c:5 admin/macro/macro-filter.tpl.c:5
-#: admin/macro/parameter.tpl.c:5
-msgid "Name"
-msgstr "ImiÄ™"
-
-#: admin/conference/conf-list.xml:49
-#: admin/conference/class_phoneConferenceGeneric.inc:704
-#: admin/macro/class_gofonMacro.inc:547 admin/macro/macro-list.xml:49
-#: admin/systems/asterisk/class_phoneGeneric.inc:484
-#: admin/conference/generic.tpl.c:29 admin/macro/generic.tpl.c:17
-#: admin/systems/asterisk/phone.tpl.c:8
-msgid "Description"
-msgstr "Opis"
-
-#: admin/conference/conf-list.xml:57 admin/macro/macro-list.xml:57
-msgid "Actions"
-msgstr "Akcje"
-
-#: admin/conference/conf-list.xml:68 admin/macro/macro-list.xml:68
-msgid "Create"
-msgstr "UtwÃ³rz"
-
-#: admin/conference/conf-list.xml:86 admin/conference/conf-list.xml:125
-#: admin/macro/macro-list.xml:86 admin/macro/macro-list.xml:125
-msgid "Edit"
-msgstr "Edytuj"
-
-#: admin/conference/conf-list.xml:93 admin/conference/conf-list.xml:138
-#: admin/macro/macro-list.xml:93 admin/macro/macro-list.xml:138
-msgid "Remove"
-msgstr "UsuÅ„"
-
-#: admin/conference/class_phoneConferenceGeneric.inc:233
-#, php-format
-msgid "Cannot delete entry from server '%s' because it seems to be removed!"
-msgstr ""
-
-#: admin/conference/class_phoneConferenceGeneric.inc:308
-#, php-format
-msgid ""
-"The previously selected asterisk home server '%s' is no longer available!"
+#: admin/systems/asterisk/class_phoneIAX.inc:31
+msgid "Asterisk phone"
 msgstr ""
 
-#: admin/conference/class_phoneConferenceGeneric.inc:315
-#: admin/conference/generic.tpl.c:47
-msgid "PIN"
-msgstr "PIN"
-
-#: admin/conference/class_phoneConferenceGeneric.inc:333
-#: admin/conference/class_phoneConferenceGeneric.inc:719
-msgid "Lifetime"
-msgstr "Wiek"
-
-#: admin/conference/class_phoneConferenceGeneric.inc:399
-#: personal/phoneaccount/class_phoneAccount.inc:346
-#: personal/phoneaccount/class_phoneAccount.inc:359
-#: personal/phoneaccount/class_phoneAccount.inc:617
-#: personal/phoneaccount/class_phoneAccount.inc:656
-#: personal/phoneaccount/class_phoneAccount.inc:1519
-#: personal/phoneaccount/class_phoneAccount.inc:1695
-#: admin/conference/remove.tpl.c:2 admin/macro/remove.tpl.c:2
-msgid "Warning"
-msgstr "OstrzeÅ¼enie"
-
-#: admin/conference/class_phoneConferenceGeneric.inc:400
-#, php-format
-msgid ""
-"FusionDirectory identified problems with your MySQL table definition, please"
-" activate debugging for details."
-msgstr ""
-
-#: admin/conference/class_phoneConferenceGeneric.inc:606
-#: admin/conference/class_phoneConferenceGeneric.inc:608
-#, php-format
-msgid "'%s' is already assigned to '%s'!"
-msgstr ""
-
-#: admin/conference/class_phoneConferenceGeneric.inc:693
-msgid "Phone Conference"
-msgstr ""
-
-#: admin/conference/class_phoneConferenceGeneric.inc:694
-msgid "Phone conference management"
-msgstr "ZarzÄ…dzanie konferencjÄ… telefonicznÄ…"
-
-#: admin/conference/class_phoneConferenceGeneric.inc:696
-msgid "GOfon conference"
-msgstr ""
-
-#: admin/conference/class_phoneConferenceGeneric.inc:698
-msgid "Asterisk conference"
-msgstr ""
-
-#: admin/conference/class_phoneConferenceGeneric.inc:703
-#: admin/macro/class_gofonMacro.inc:546
-#: admin/systems/asterisk/class_phoneGeneric.inc:483
-#: admin/conference/generic.tpl.c:17 admin/macro/generic.tpl.c:14
-#: admin/systems/asterisk/phone.tpl.c:5
-msgid "Base"
-msgstr "Kontener"
-
-#: admin/conference/class_phoneConferenceGeneric.inc:705
-msgid "Conference PIN"
-msgstr "PIN Konferencji"
-
-#: admin/conference/class_phoneConferenceGeneric.inc:710
-#: admin/conference/generic.tpl.c:44
-msgid "Preset PIN"
-msgstr "Prekonfiturowany PIN"
-
-#: admin/conference/class_phoneConferenceGeneric.inc:711
-#: admin/conference/generic.tpl.c:50
-msgid "Record conference"
-msgstr "Nagrywanie konferencji"
-
-#: admin/conference/class_phoneConferenceGeneric.inc:712
-#: admin/conference/generic.tpl.c:59
-msgid "Play music on hold"
-msgstr "Odtwarzaj muzykÄ™ podczas zawieszenia"
-
-#: admin/conference/class_phoneConferenceGeneric.inc:713
-msgid "Activate menu"
-msgstr "Aktywuj menu"
-
-#: admin/conference/class_phoneConferenceGeneric.inc:714
-msgid "Announce user activity"
-msgstr "Zapowiadaj aktywnoÅ›Ä‡ uÅ¼ytkownika"
-
-#: admin/conference/class_phoneConferenceGeneric.inc:715
-msgid "Count user"
-msgstr "Zlicz uÅ¼ytkownika"
-
-#: admin/conference/class_phoneConferenceGeneric.inc:716
-msgid "Conference type"
-msgstr "Typ konferencji"
-
-#: admin/conference/class_phoneConferenceGeneric.inc:718
-msgid "Format"
-msgstr "format"
-
-#: admin/conference/class_phoneConferenceGeneric.inc:720
-#: personal/phoneaccount/class_phoneAccount.inc:1666
-msgid "Telephone number"
-msgstr "Numer telefonu"
-
-#: admin/conference/class_phoneConferenceGeneric.inc:721
-msgid "Owner"
-msgstr "WÅ‚aÅ›ciciel"
-
-#: admin/conference/class_phoneConferenceManagment.inc:36
-msgid "Phone Conferences"
-msgstr ""
-
-#: admin/conference/class_phoneConferenceManagment.inc:37
-msgid "Phone Conference management"
-msgstr ""
-
-#: admin/macro/class_gofonMacro.inc:202
-#, php-format
-msgid ""
-"Macro could not be removed from server '%s', please check database "
-"consistency!"
-msgstr ""
-
-#: admin/macro/class_gofonMacro.inc:264
-#, php-format
-msgid "Application missing in line %s!"
-msgstr ""
-
-#: admin/macro/class_gofonMacro.inc:267
-#, php-format
-msgid "Priority missing in line %s!"
-msgstr ""
-
-#: admin/macro/class_gofonMacro.inc:271
-#, php-format
-msgid "Extension missing in line %s!"
-msgstr ""
-
-#: admin/macro/class_gofonMacro.inc:281
-#, php-format
-msgid "Duplicate combination of 'extension' and 'priority' in line %s!"
-msgstr ""
-
-#: admin/macro/class_gofonMacro.inc:317
-#, php-format
-msgid ""
-"Macro could not be added to server '%s', please check database consistency!"
-msgstr ""
-
-#: admin/macro/class_gofonMacro.inc:410
-msgid "Name can be 20 characters at maximum!"
-msgstr ""
-
-#: admin/macro/class_gofonMacro.inc:419
-msgid "Macro is still in use!"
-msgstr ""
-
-#: admin/macro/class_gofonMacro.inc:426
-msgid "Macro is empty!"
-msgstr "Makro jest puste!"
-
-#: admin/macro/class_gofonMacro.inc:452
-#: admin/systems/asterisk/class_phoneGeneric.inc:267
-#, php-format
-msgid "Cannot delete entry because it is still in use by '%s'!"
-msgstr ""
-
-#: admin/macro/class_gofonMacro.inc:465
-#: addons/fonreports/class_fonreport.inc:190
-#: personal/phoneaccount/class_phoneAccount.inc:455
-#: personal/phoneaccount/class_phoneAccount.inc:1061
-#: personal/phoneaccount/class_phoneAccount.inc:1567
-msgid "Configuration error"
-msgstr "BÅ‚Ä…d konfiguracji"
-
-#: admin/macro/class_gofonMacro.inc:536 admin/macro/class_gofonMacro.inc:541
-msgid "Asterisk macro"
-msgstr ""
-
-#: admin/macro/class_gofonMacro.inc:537
-msgid "Asterisk macro management"
-msgstr "ZarzÄ…dzanie makro Asterisk"
-
-#: admin/macro/class_gofonMacro.inc:539
-msgid "GOfon macro"
-msgstr "GOfon makro"
-
-#: admin/macro/class_gofonMacro.inc:545 admin/macro/generic.tpl.c:2
-#: admin/macro/generic.tpl.c:5 admin/macro/paste_generic.tpl.c:2
-#: admin/macro/paste_generic.tpl.c:5
-msgid "Macro name"
-msgstr "Nazwa makra"
-
-#: admin/macro/class_gofonMacro.inc:548 admin/macro/generic.tpl.c:8
-msgid "Display name"
-msgstr "WyÅ›wietl nazwÄ™"
-
-#: admin/macro/class_gofonMacro.inc:549
-msgid "Macro content and parameter"
-msgstr ""
-
-#: admin/macro/class_gofonMacro.inc:550
-msgid "Visibility flag"
-msgstr "Flaga widocznoÅ›ci"
-
-#: admin/macro/class_gofonMacroManagement.inc:36
-msgid "Phone Macros"
-msgstr ""
-
-#: admin/macro/class_gofonMacroManagement.inc:37
-msgid "Phone Macros management"
-msgstr ""
-
-#: admin/macro/macro-list.xml:11
-msgid "List of macros"
-msgstr "Lista makr"
-
-#: admin/macro/macro-list.xml:15 admin/macro/macro-list.xml:74
-msgid "Macro"
-msgstr "Makro"
-
-#: admin/macro/class_gofonMacroParameters.inc:58
-msgid "Parameter"
-msgstr "Parametr"
-
-#: admin/macro/class_gofonMacroParameters.inc:59
-msgid "Asterisk macro parameter"
-msgstr ""
-
-#: admin/macro/class_gofonMacroParameters.inc:234
-#: personal/phoneaccount/generic.tpl.c:35
-msgid "Phone macro"
-msgstr "Makro telefoniczne"
-
-#: admin/macro/class_gofonMacroParameters.inc:290
-msgid "String"
-msgstr "Napis"
-
-#: admin/macro/class_gofonMacroParameters.inc:291
-msgid "Combobox"
-msgstr "Lista rozwijana"
-
-#: admin/macro/class_gofonMacroParameters.inc:292
-msgid "Bool"
-msgstr "Bool"
-
-#: admin/macro/class_gofonMacroParameters.inc:298
-msgid "Delete unused"
-msgstr "UsuÅ„ nieuÅ¼ywane"
-
-#: admin/macro/class_gofonMacroParameters.inc:374
-#, php-format
-msgid "Parameter %s contains invalid character. '!,#' is used as delimiter!"
-msgstr ""
-
-#: admin/macro/class_gofonMacroParameters.inc:379
-#, php-format
-msgid "Parameter %s is invalid!"
-msgstr ""
-
-#: admin/macro/class_gofonMacroParameters.inc:408
-#: personal/phoneaccount/class_phoneAccount.inc:1600
-msgid "Information"
-msgstr "Informacja"
-
-#: admin/macro/class_gofonMacroParameters.inc:408
-msgid ""
-"Number of parameters for this macro has changed. Please update all users "
-"using it!"
-msgstr ""
-
-#: admin/systems/asterisk/class_phoneGeneric.inc:151
-msgid "phone"
-msgstr "telefon"
-
-#: admin/systems/asterisk/class_phoneGeneric.inc:230
-msgid "yes"
-msgstr "tak"
-
-#: admin/systems/asterisk/class_phoneGeneric.inc:230
-msgid "no"
-msgstr "nie"
-
-#: admin/systems/asterisk/class_phoneGeneric.inc:247
-msgid "dynamic"
-msgstr "dynamiczne"
-
-#: admin/systems/asterisk/class_phoneGeneric.inc:247
-msgid "Networksettings"
-msgstr "Ustawienia sieci"
-
-#: admin/systems/asterisk/class_phoneGeneric.inc:330
-#: admin/systems/asterisk/class_phoneGeneric.inc:333
-msgid "IP address"
-msgstr "Adres IP"
-
-#: admin/systems/asterisk/class_phoneGeneric.inc:473
-msgid "Phone information"
-msgstr ""
-
-#: admin/systems/asterisk/class_phoneGeneric.inc:476
-#: personal/phoneaccount/class_phoneAccount.inc:1668
+#: admin/systems/asterisk/class_phoneIAX.inc:33
 msgid "Phone hardware"
 msgstr "SprzÄ™t telefoniczny"
 
-#: admin/systems/asterisk/class_phoneGeneric.inc:485
-msgid "SIP Mode"
-msgstr ""
-
-#: admin/systems/asterisk/class_phoneGeneric.inc:486
-msgid "SIP DTMF mode"
-msgstr ""
-
-#: admin/systems/asterisk/class_phoneGeneric.inc:487
-msgid "SIP Default ip"
-msgstr ""
-
-#: admin/systems/asterisk/class_phoneGeneric.inc:488
-msgid "SIP Qualify"
-msgstr ""
-
-#: admin/systems/asterisk/class_phoneGeneric.inc:489
-msgid "IAX authentication type"
-msgstr ""
-
-#: admin/systems/asterisk/class_phoneGeneric.inc:490
-msgid "IAX secret"
-msgstr ""
+#: admin/systems/asterisk/class_phoneIAX.inc:46
+#: personal/asterisk/class_asteriskAccount.inc:42
+msgid "Telephone"
+msgstr "Telefon"
 
-#: admin/systems/asterisk/class_phoneGeneric.inc:491
-msgid "IAX account code"
-msgstr ""
+#: admin/systems/asterisk/class_phoneIAX.inc:49
+msgid "Name"
+msgstr "ImiÄ™"
 
-#: admin/systems/asterisk/class_phoneGeneric.inc:492
-msgid "IAX trunk lines"
+#: admin/systems/asterisk/class_phoneIAX.inc:49
+msgid "Name of this phone"
 msgstr ""
 
-#: admin/systems/asterisk/class_phoneGeneric.inc:493
-msgid "IAX permit settings"
+#: admin/systems/asterisk/class_phoneIAX.inc:53
+msgid "Account name"
 msgstr ""
 
-#: admin/systems/asterisk/class_phoneGeneric.inc:494
-msgid "IAX deny settings"
+#: admin/systems/asterisk/class_phoneIAX.inc:53
+msgid "Name of the account"
 msgstr ""
 
-#: admin/systems/asterisk/class_phoneGeneric.inc:495
-msgid "CAPI MSN"
-msgstr "CAPI MSN"
-
-#: admin/systems/asterisk/class_phoneGeneric.inc:496
-msgid "Hardware type"
-msgstr "Typ sprzÄ™tu"
-
 #: admin/systems/services/asterisk/class_serviceAsterisk.inc:35
 msgid "VoIP database information"
 msgstr "Informacje bazy danych VoIP"
@@ -746,6 +95,10 @@ msgid ""
 "these objects '%s'."
 msgstr ""
 
+#: admin/systems/services/asterisk/class_serviceAsterisk.inc:121
+msgid "LDAP error"
+msgstr "bÅ‚Ä…d LDAP"
+
 #: admin/systems/services/asterisk/class_serviceAsterisk.inc:140
 msgid "VoIP service (asterisk)"
 msgstr ""
@@ -758,209 +111,18 @@ msgstr ""
 msgid "Services"
 msgstr "UsÅ‚ugi"
 
-#: addons/fonreports/class_fonreport.inc:232
-msgid "Insufficient permissions"
-msgstr "NiewystarczajÄ…ce uprawnienia"
-
-#: addons/fonreports/class_fonreport.inc:251
-msgid "Y-M-D"
-msgstr "R-M-D"
-
-#: addons/fonreports/class_fonreport.inc:418
-#: addons/fonreports/class_fonreport.inc:419
-#: addons/fonreports/class_fonreport.inc:424 addons/fonreports/main.inc:46
-msgid "Phone reports"
-msgstr "Raporty telefoniczne"
-
-#: addons/fonreports/class_fonreport.inc:419
-msgid "All entries are readonly"
-msgstr "Wszystkie pola sÄ… tylko do odczytu"
-
-#: addons/fonreports/class_fonreport.inc:428
-#: addons/fonreports/contents.tpl.c:32
-msgid "Date"
-msgstr "Data"
-
-#: addons/fonreports/class_fonreport.inc:429
-#: addons/fonreports/contents.tpl.c:35
-msgid "Source"
-msgstr "Å¹rÃ³dÅ‚o"
-
-#: addons/fonreports/class_fonreport.inc:430
-#: addons/fonreports/contents.tpl.c:38
-msgid "Destination"
-msgstr "Cel"
-
-#: addons/fonreports/class_fonreport.inc:431
-#: addons/fonreports/contents.tpl.c:41
-msgid "Channel"
-msgstr "KanaÅ‚"
-
-#: addons/fonreports/class_fonreport.inc:432
-msgid "Application called"
-msgstr ""
-
-#: addons/fonreports/class_fonreport.inc:433
-msgid "Disposition"
-msgstr ""
-
-#: addons/fonreports/class_fonreport.inc:434
-#: addons/fonreports/contents.tpl.c:50
-msgid "Duration"
-msgstr "Czas trwania"
-
-#: personal/phoneaccount/class_phoneAccount.inc:176
-msgid "automatic"
-msgstr "automatyczne"
-
-#: personal/phoneaccount/class_phoneAccount.inc:212
-msgid "no macro"
-msgstr "brak makra"
-
-#: personal/phoneaccount/class_phoneAccount.inc:240
-msgid "undefined"
-msgstr "niezdefiniowany"
-
-#: personal/phoneaccount/class_phoneAccount.inc:359
-#, php-format
-msgid ""
-"Cannot identify telephone extension in database, please try to save again."
-msgstr ""
-
-#: personal/phoneaccount/class_phoneAccount.inc:577
-#: personal/phoneaccount/class_phoneAccount.inc:595
-msgid "Abort saving entries to keep the database consistent."
-msgstr ""
-
-#: personal/phoneaccount/class_phoneAccount.inc:618
-#: personal/phoneaccount/class_phoneAccount.inc:657
-#: personal/phoneaccount/class_phoneAccount.inc:1520
-#, php-format
-msgid ""
-"FusionDirectory identified problems with your database table definition!"
-msgstr ""
-
-#: personal/phoneaccount/class_phoneAccount.inc:1023
-msgid "Remove phone account"
-msgstr "UsuÅ„ konto telefoniczne"
-
-#: personal/phoneaccount/class_phoneAccount.inc:1027
-#: personal/phoneaccount/class_phoneAccount.inc:1030
-msgid "Create phone account"
-msgstr "UtwÃ³rz konto telefoniczne"
-
-#: personal/phoneaccount/class_phoneAccount.inc:1028
-msgid "User uid"
-msgstr ""
-
-#: personal/phoneaccount/class_phoneAccount.inc:1046
-msgid "Selected macro is not available anymore!"
-msgstr ""
-
-#: personal/phoneaccount/class_phoneAccount.inc:1221
-msgid "Choose your private phone"
-msgstr "Wybierz swÃ³j telefon prywatny"
-
-#: personal/phoneaccount/class_phoneAccount.inc:1346
-msgid ""
-"There must be at least one server with an asterisk database to create a "
-"phone account."
-msgstr ""
-
-#: personal/phoneaccount/class_phoneAccount.inc:1354
-#: personal/phoneaccount/class_phoneAccount.inc:1357
-#: personal/phoneaccount/generic.tpl.c:29
-#: personal/phoneaccount/paste_generic.tpl.c:11
-msgid "Voicemail PIN"
-msgstr "PIN poczty gÅ‚osowej"
-
-#: personal/phoneaccount/class_phoneAccount.inc:1354
-msgid "Between 1-4 charactes"
-msgstr ""
-
-#: personal/phoneaccount/class_phoneAccount.inc:1362
-#: personal/phoneaccount/generic.tpl.c:32
-#: personal/phoneaccount/paste_generic.tpl.c:14
-msgid "Phone PIN"
-msgstr "PIN telefonu"
-
-#: personal/phoneaccount/class_phoneAccount.inc:1394
-#: admin/conference/generic.tpl.c:38 admin/conference/paste_generic.tpl.c:8
-msgid "Phone number"
-msgstr "Numer telefonu"
-
-#: personal/phoneaccount/class_phoneAccount.inc:1402
-#, php-format
-msgid "macro parameter %s"
-msgstr ""
-
-#: personal/phoneaccount/class_phoneAccount.inc:1450
-msgid "An error occured while updating the database entries!"
-msgstr ""
-
-#: personal/phoneaccount/class_phoneAccount.inc:1567
-msgid "Was not able to found any asterisk server"
-msgstr ""
-
-#: personal/phoneaccount/class_phoneAccount.inc:1600
-#, php-format
-msgid "User '%s' has been removed from phone queue '%s'."
-msgstr ""
-
-#: personal/phoneaccount/class_phoneAccount.inc:1637
-#: personal/phoneaccount/class_phoneAccount.inc:1639
-#, php-format
-msgid "The specified telephonenumber '%s' is already assigned to '%s'."
-msgstr "Podany numer telefonu '%s' jest juÅ¼ przypisany do '%s'."
-
-#: personal/phoneaccount/class_phoneAccount.inc:1649
-#, php-format
-msgid ""
-"The previously selected asterisk home server (%s) is no longer available. "
-"Remove aborted."
-msgstr ""
-
-#: personal/phoneaccount/class_phoneAccount.inc:1658
-msgid "Phone account settings"
-msgstr "Ustawienia konta telefonicznego"
-
-#: personal/phoneaccount/class_phoneAccount.inc:1667
-msgid "Macro settings"
-msgstr "Ustawienia makra"
-
-#: personal/phoneaccount/class_phoneAccount.inc:1670
-msgid "Phone context"
-msgstr ""
-
-#: personal/phoneaccount/class_phoneAccount.inc:1671
-msgid "Voice mail context"
+#: personal/asterisk/class_asteriskAccount.inc:30
+#: config/asterisk/class_asteriskPluginConfig.inc:28
+#: config/asterisk/class_asteriskPluginConfig.inc:41
+msgid "Asterisk"
 msgstr ""
 
-#: personal/phoneaccount/class_phoneAccount.inc:1672
-msgid "Telephone pin"
-msgstr "PIN Telefonu"
-
-#: personal/phoneaccount/class_phoneAccount.inc:1673
-msgid "Voicemail pin"
-msgstr "PIN poczty gÅ‚osowej"
-
-#: personal/phoneaccount/class_phoneAccount.inc:1695
-#, php-format
-msgid "You need to configure %s contexts first"
+#: personal/asterisk/class_asteriskAccount.inc:31
+msgid "Asterisk account"
 msgstr ""
 
-#: personal/phoneaccount/main.inc:124
-msgid "Click the 'Edit' button below to change informations in this dialog"
-msgstr "Kliknij przycisk 'Edytuj' poniÅ¼ej, aby zmieniÄ‡ informacje w tym oknie"
-
-#: personal/phoneaccount/main.inc:134
-#: personal/phoneaccount/paste_generic.tpl.c:2
-msgid "Phone settings"
-msgstr "Ustawienia telefonu"
-
-#: config/asterisk/class_asteriskPluginConfig.inc:28
-#: config/asterisk/class_asteriskPluginConfig.inc:41
-msgid "Asterisk"
+#: personal/asterisk/class_asteriskAccount.inc:45
+msgid "Select the phone associated to this user"
 msgstr ""
 
 #: config/asterisk/class_asteriskPluginConfig.inc:29
@@ -1010,338 +172,3 @@ msgstr ""
 #: config/asterisk/class_asteriskPluginConfig.inc:72
 msgid "Available voicemail contexts"
 msgstr ""
-
-#: admin/ogroups/asterisk/phonequeue.tpl.c:2
-msgid ""
-"Only users with the same asterisk home server will be included to this "
-"queue."
-msgstr ""
-
-#: admin/ogroups/asterisk/phonequeue.tpl.c:5
-#: personal/phoneaccount/generic.tpl.c:2
-#: personal/phoneaccount/paste_generic.tpl.c:5
-msgid "Phone numbers"
-msgstr "Numery telefonÃ³w"
-
-#: admin/ogroups/asterisk/phonequeue.tpl.c:8
-msgid "Up"
-msgstr "GÃ³ra"
-
-#: admin/ogroups/asterisk/phonequeue.tpl.c:11
-msgid "Down"
-msgstr "W dÃ³Å‚"
-
-#: admin/ogroups/asterisk/phonequeue.tpl.c:14
-#: admin/conference/generic.tpl.c:41
-msgid "Options"
-msgstr "Opcje"
-
-#: admin/ogroups/asterisk/phonequeue.tpl.c:29
-msgid "Strategy"
-msgstr "Strategia"
-
-#: admin/ogroups/asterisk/phonequeue.tpl.c:38
-msgid "(in seconds)"
-msgstr "(w sekundach)"
-
-#: admin/ogroups/asterisk/phonequeue.tpl.c:41
-msgid "Queue sound setup"
-msgstr "Ustawienia dÅºwiÄ™ku kolejki"
-
-#: admin/ogroups/asterisk/phonequeue.tpl.c:44
-msgid "Use music on hold instead of ringing"
-msgstr "UÅ¼yj muzyki zamiast dzwonienia podczas oczenikwania"
-
-#: admin/ogroups/asterisk/phonequeue.tpl.c:50
-msgid "Welcome sound file"
-msgstr "Plik dÅºwiÄ™kowy powitania"
-
-#: admin/ogroups/asterisk/phonequeue.tpl.c:53
-msgid "Announce message"
-msgstr "Komunikat zapowiadajÄ…cy"
-
-#: admin/ogroups/asterisk/phonequeue.tpl.c:56
-msgid "Sound file for 'You are next ...'"
-msgstr "Plik dÅºwiÄ™kowy 'JesteÅ› nastÄ™pny ...'"
-
-#: admin/ogroups/asterisk/phonequeue.tpl.c:59
-msgid "'There are ...'"
-msgstr "'IstniejÄ… ...'"
-
-#: admin/ogroups/asterisk/phonequeue.tpl.c:62
-msgid "'... calls waiting'"
-msgstr "'... rozmÃ³w oczekujÄ…cych'"
-
-#: admin/ogroups/asterisk/phonequeue.tpl.c:65
-msgid "'Thank you' message"
-msgstr "WiadomoÅ›Ä‡ 'dziÄ™kujemy'"
-
-#: admin/ogroups/asterisk/phonequeue.tpl.c:68
-msgid "'minutes' sound file"
-msgstr "plik dÅºwiÄ™kowy 'minut'"
-
-#: admin/ogroups/asterisk/phonequeue.tpl.c:71
-msgid "'seconds' sound file"
-msgstr "plik dÅºwiÄ™kowy 'sekund'"
-
-#: admin/ogroups/asterisk/phonequeue.tpl.c:74
-msgid "Hold sound file"
-msgstr "Plik dÅºwiÄ™kowy podtrzymania"
-
-#: admin/ogroups/asterisk/phonequeue.tpl.c:77
-msgid "Less Than sound file"
-msgstr "Plik dÅºwiÄ™kowy 'mniej niÅ¼'"
-
-#: admin/ogroups/asterisk/phonequeue.tpl.c:80
-msgid "Phone attributes "
-msgstr "Atrybuty telefonu"
-
-#: admin/conference/conf-filter.tpl.c:2 admin/macro/macro-filter.tpl.c:2
-#: addons/fonreports/contents.tpl.c:2
-msgid "Filter"
-msgstr "Filtr"
-
-#: admin/conference/generic.tpl.c:2
-msgid "Properties"
-msgstr "WÅ‚aÅ›ciwoÅ›ci"
-
-#: admin/conference/generic.tpl.c:5 admin/conference/paste_generic.tpl.c:2
-msgid "Conference name"
-msgstr "Nazwa konferencji"
-
-#: admin/conference/generic.tpl.c:8 admin/conference/paste_generic.tpl.c:5
-msgid "Name of conference to create"
-msgstr "Nazwa tworzonej konferencji"
-
-#: admin/conference/generic.tpl.c:11
-msgid "Type"
-msgstr "Typ"
-
-#: admin/conference/generic.tpl.c:14
-msgid "Choose subtree to place conference in"
-msgstr "Wybierz poddrzewo do umieszczenia konferencji"
-
-#: admin/conference/generic.tpl.c:26
-msgid "Select language"
-msgstr ""
-
-#: admin/conference/generic.tpl.c:32
-msgid "Descriptive text for department"
-msgstr "Tekst opisujÄ…cy departament"
-
-#: admin/conference/generic.tpl.c:35
-msgid "Lifetime (in days)"
-msgstr "Wiek (w dniach)"
-
-#: admin/conference/generic.tpl.c:53
-msgid "Sound file format"
-msgstr "Format pliku dÅºwiÄ™kowego"
-
-#: admin/conference/generic.tpl.c:56
-msgid "Choose subtree to place department in"
-msgstr "Wybierz poddrzewo do umieszczenia departamentu"
-
-#: admin/conference/generic.tpl.c:62
-msgid "Activate session menu"
-msgstr "Aktywuj menu sesji"
-
-#: admin/conference/generic.tpl.c:65
-msgid "Announce users joining or leaving the conference"
-msgstr "Zapowiadaj uÅ¼ytkownikÃ³w doÅ‚Ä…czajÄ…cych lub opuszczajÄ…cych konferencjÄ™"
-
-#: admin/conference/generic.tpl.c:68
-msgid "Count users"
-msgstr "Zlicz uÅ¼ytkownikÃ³w"
-
-#: admin/conference/remove.tpl.c:5 admin/macro/remove.tpl.c:5
-msgid ""
-"Please double check if you really want to do this since there is no way for "
-"FusionDirectory to get your data back."
-msgstr ""
-
-#: admin/conference/remove.tpl.c:8 admin/macro/remove.tpl.c:8
-msgid "So - if you're sure - press 'Delete' to continue or 'Cancel' to abort."
-msgstr "JeÅ›li jesteÅ› pewien - naciÅ›nij 'UsuÅ„' aby kontynuowaÄ‡ lub 'Anuluj' aby anulowaÄ‡."
-
-#: admin/macro/generic.tpl.c:11
-msgid "Macro name to be displayed"
-msgstr "Nazwa makra do wyÅ›wietlenia"
-
-#: admin/macro/generic.tpl.c:20
-msgid "Visible for user"
-msgstr "Widoczne dla uÅ¼ytkownika"
-
-#: admin/macro/generic.tpl.c:23
-msgid "Macro text"
-msgstr "Tekst makro"
-
-#: admin/macro/parameter.tpl.c:2
-msgid "Argument"
-msgstr "Argument"
-
-#: admin/macro/parameter.tpl.c:8
-msgid "type"
-msgstr "typ"
-
-#: admin/macro/parameter.tpl.c:11
-msgid "Default value"
-msgstr "DomyÅ›lna wartoÅ›Ä‡"
-
-#: admin/macro/parameter.tpl.c:14
-msgid "You are not allowed to view the macro parameter settings"
-msgstr ""
-
-#: admin/systems/asterisk/phonesettings.tpl.c:2
-msgid "Advanced phone settings"
-msgstr "Zaawansowane ustawienia telefonu"
-
-#: admin/systems/asterisk/phonesettings.tpl.c:5
-msgid "Phone type"
-msgstr "Typ telefonu"
-
-#: admin/systems/asterisk/phonesettings.tpl.c:8
-#: admin/systems/asterisk/phonesettings.tpl.c:14
-#: admin/systems/asterisk/phonesettings.tpl.c:20
-#: admin/systems/asterisk/phonesettings.tpl.c:26
-#: admin/systems/asterisk/phonesettings.tpl.c:35
-#: admin/systems/asterisk/phonesettings.tpl.c:47
-#: admin/systems/asterisk/phonesettings.tpl.c:65
-msgid "Choose a phone type"
-msgstr "ProszÄ™ wybraÄ‡ typ telefonu"
-
-#: admin/systems/asterisk/phonesettings.tpl.c:11
-msgid "Mode"
-msgstr "Tryb"
-
-#: admin/systems/asterisk/phonesettings.tpl.c:17
-msgid "DTMF mode"
-msgstr "Tryb DTMF"
-
-#: admin/systems/asterisk/phonesettings.tpl.c:23
-#: admin/systems/asterisk/phonesettings.tpl.c:38
-msgid "Default IP"
-msgstr "DomyÅ›lny IP"
-
-#: admin/systems/asterisk/phonesettings.tpl.c:29
-#: admin/systems/asterisk/phonesettings.tpl.c:41
-msgid "Response timeout"
-msgstr "Przekroczony limit czasu odpowiedzi"
-
-#: admin/systems/asterisk/phonesettings.tpl.c:32
-msgid "Modus"
-msgstr "Modus"
-
-#: admin/systems/asterisk/phonesettings.tpl.c:44
-msgid "Authtype"
-msgstr "Typ autoryzacji"
-
-#: admin/systems/asterisk/phonesettings.tpl.c:50
-msgid "Secret"
-msgstr "Tajny"
-
-#: admin/systems/asterisk/phonesettings.tpl.c:53
-msgid "GoFonInkeys"
-msgstr "GoFonInkeys"
-
-#: admin/systems/asterisk/phonesettings.tpl.c:56
-msgid "GoFonOutKeys"
-msgstr "GoFonOutkeys"
-
-#: admin/systems/asterisk/phonesettings.tpl.c:59
-msgid "Account code"
-msgstr "Kod konta"
-
-#: admin/systems/asterisk/phonesettings.tpl.c:62
-msgid "Trunk lines"
-msgstr "Zmniejsz linie"
-
-#: admin/systems/asterisk/phonesettings.tpl.c:68
-msgid "Hosts that are allowed to connect"
-msgstr "Hosty ktÃ³re mogÄ… siÄ™ poÅ‚Ä…czyÄ‡."
-
-#: admin/systems/asterisk/phonesettings.tpl.c:71
-#: admin/systems/asterisk/phonesettings.tpl.c:77
-msgid "List of alternative mail addresses"
-msgstr "Lista alternatywnych adresÃ³w pocztowych"
-
-#: admin/systems/asterisk/phonesettings.tpl.c:74
-msgid "Hosts that are not allowed to connect"
-msgstr "Hosty ktÃ³re nie mogÄ… siÄ™ poÅ‚Ä…czyÄ‡."
-
-#: admin/systems/asterisk/phonesettings.tpl.c:80
-msgid "MSN"
-msgstr "MSN"
-
-#: admin/systems/asterisk/phone.tpl.c:2
-msgid "Phone name"
-msgstr "Nazwa telefonu"
-
-#: addons/fonreports/contents.tpl.c:5
-msgid "Search for"
-msgstr "Szukaj dla"
-
-#: addons/fonreports/contents.tpl.c:8
-msgid "Enter user name to search for"
-msgstr "WprowadÅº poszukiwanÄ… nazwÄ™ uÅ¼ytkownika"
-
-#: addons/fonreports/contents.tpl.c:11 addons/fonreports/contents.tpl.c:26
-msgid "in"
-msgstr "w"
-
-#: addons/fonreports/contents.tpl.c:14
-msgid "Select subtree to base search on"
-msgstr "Wybierz poddrzewo od ktÃ³rego zaczÄ…Ä‡ szukanie"
-
-#: addons/fonreports/contents.tpl.c:17
-msgid "on"
-msgstr ""
-
-#: addons/fonreports/contents.tpl.c:20
-msgid "Select server to search on"
-msgstr ""
-
-#: addons/fonreports/contents.tpl.c:23
-msgid "during"
-msgstr "podczas"
-
-#: addons/fonreports/contents.tpl.c:29
-msgid "Search"
-msgstr "Szukaj"
-
-#: addons/fonreports/contents.tpl.c:44
-msgid "Application"
-msgstr "Aplikacja"
-
-#: addons/fonreports/contents.tpl.c:47
-msgid "Status"
-msgstr "Status"
-
-#: addons/fonreports/contents.tpl.c:53
-msgid "Search returned no results..."
-msgstr "Wyszukiwanie nie zwrÃ³ciÅ‚o Å¼adnych wynikÃ³w..."
-
-#: personal/phoneaccount/generic.tpl.c:5
-#: personal/phoneaccount/paste_generic.tpl.c:8
-msgid "Telephone hardware"
-msgstr "SprzÄ™t telefoniczny"
-
-#: personal/phoneaccount/generic.tpl.c:8
-msgid "Telephone"
-msgstr "Telefon"
-
-#: personal/phoneaccount/generic.tpl.c:14
-msgid "Select the accounts home server"
-msgstr ""
-
-#: personal/phoneaccount/generic.tpl.c:17
-msgid "Context"
-msgstr "Kontekst"
-
-#: personal/phoneaccount/generic.tpl.c:20
-#: personal/phoneaccount/generic.tpl.c:26
-msgid "Select the accounts context"
-msgstr ""
-
-#: personal/phoneaccount/generic.tpl.c:23
-msgid "Voicemail context"
-msgstr ""
diff --git a/asterisk/locale/pt/fusiondirectory.po b/asterisk/locale/pt/fusiondirectory.po
index 584095d8584789dbe37d0cdc49c0ed299efa7049..9dfa0cedb60ecfa02406a1a08024296cd388aef8 100644
--- a/asterisk/locale/pt/fusiondirectory.po
+++ b/asterisk/locale/pt/fusiondirectory.po
@@ -5,702 +5,51 @@
 # Translators:
 msgid ""
 msgstr ""
-"Project-Id-Version: FusionDirectory-108\n"
+"Project-Id-Version: FusionDirectory-109\n"
 "Report-Msgid-Bugs-To: documentation@lists.fusiondirectory.org\n"
-"POT-Creation-Date: 2015-03-31 11:49+0200\n"
-"PO-Revision-Date: 2015-03-31 11:41+0000\n"
+"POT-Creation-Date: 2014-12-15 17:47+0100\n"
+"PO-Revision-Date: 2015-02-25 16:04+0000\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>\n"
-"Language-Team: Portuguese (http://www.transifex.com/projects/p/FusionDirectory-108/language/pt/)\n"
+"Language-Team: Portuguese (http://www.transifex.com/projects/p/FusionDirectory-109/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/ogroups/asterisk/class_phonequeue.inc:110
-#: admin/conference/class_phoneConferenceGeneric.inc:104
-#: personal/phoneaccount/class_phoneAccount.inc:148
-msgid "Obsolete entry"
-msgstr ""
-
-#: admin/ogroups/asterisk/class_phonequeue.inc:110
-#: admin/conference/class_phoneConferenceGeneric.inc:104
-#: personal/phoneaccount/class_phoneAccount.inc:148
-#, php-format
-msgid ""
-"The current home server is not available anymore. It will be moved to '%s' "
-"if you save this entry!"
-msgstr ""
-
-#: admin/ogroups/asterisk/class_phonequeue.inc:140
-msgid "ring all"
-msgstr ""
-
-#: admin/ogroups/asterisk/class_phonequeue.inc:141
-msgid "round robin"
-msgstr ""
-
-#: admin/ogroups/asterisk/class_phonequeue.inc:142
-msgid "least recently called"
-msgstr ""
-
-#: admin/ogroups/asterisk/class_phonequeue.inc:143
-msgid "fewest completed calls"
-msgstr ""
-
-#: admin/ogroups/asterisk/class_phonequeue.inc:144
-msgid "random"
-msgstr ""
-
-#: admin/ogroups/asterisk/class_phonequeue.inc:145
-msgid "round robin with memory"
-msgstr ""
-
-#: admin/ogroups/asterisk/class_phonequeue.inc:180
-msgid "Remove the phone queue from this Account"
-msgstr ""
-
-#: admin/ogroups/asterisk/class_phonequeue.inc:181
-#: admin/ogroups/asterisk/class_phonequeue.inc:184
-msgid "phone queue"
-msgstr ""
-
-#: admin/ogroups/asterisk/class_phonequeue.inc:183
-msgid "Create phone queue"
-msgstr ""
-
-#: admin/ogroups/asterisk/class_phonequeue.inc:272
-msgid ""
-"There must be at least one server with an asterisk database to create a "
-"phone queue."
-msgstr ""
-
-#: admin/ogroups/asterisk/class_phonequeue.inc:275
-#: admin/ogroups/asterisk/class_phonequeue.inc:873
-#: admin/conference/class_phoneConferenceGeneric.inc:709
-#: personal/phoneaccount/class_phoneAccount.inc:1350
-#: personal/phoneaccount/class_phoneAccount.inc:1669
-#: admin/ogroups/asterisk/phonequeue.tpl.c:17
-#: admin/conference/generic.tpl.c:20 personal/phoneaccount/generic.tpl.c:11
-msgid "Home server"
-msgstr ""
-
-#: admin/ogroups/asterisk/class_phonequeue.inc:281
-#: admin/ogroups/asterisk/class_phonequeue.inc:871
-#: admin/ogroups/asterisk/phonequeue.tpl.c:23
-msgid "Timeout"
-msgstr ""
-
-#: admin/ogroups/asterisk/class_phonequeue.inc:284
-#: admin/ogroups/asterisk/class_phonequeue.inc:896
-#: admin/ogroups/asterisk/phonequeue.tpl.c:26
-msgid "Retry"
-msgstr ""
-
-#: admin/ogroups/asterisk/class_phonequeue.inc:287
-msgid "Queue length"
-msgstr ""
-
-#: admin/ogroups/asterisk/class_phonequeue.inc:290
-#: admin/ogroups/asterisk/class_phonequeue.inc:874
-#: admin/ogroups/asterisk/phonequeue.tpl.c:35
-msgid "Announce frequency"
-msgstr ""
-
-#: admin/ogroups/asterisk/class_phonequeue.inc:293
-#: admin/conference/class_phoneConferenceGeneric.inc:328
-msgid "Number"
-msgstr ""
-
-#: admin/ogroups/asterisk/class_phonequeue.inc:316
-#: admin/ogroups/asterisk/class_phonequeue.inc:361
-msgid "asterisk"
-msgstr ""
-
-#: admin/ogroups/asterisk/class_phonequeue.inc:345
-#: admin/ogroups/asterisk/class_phonequeue.inc:696
-#: admin/conference/class_phoneConferenceGeneric.inc:369
-#: admin/macro/class_gofonMacro.inc:381 admin/macro/class_gofonMacro.inc:465
-#: addons/fonreports/class_fonreport.inc:190
-#: addons/fonreports/class_fonreport.inc:220
-#: personal/phoneaccount/class_phoneAccount.inc:455
-#: personal/phoneaccount/class_phoneAccount.inc:1061
-msgid "GOfon"
-msgstr ""
-
-#: admin/ogroups/asterisk/class_phonequeue.inc:401
-msgid "Cannot find old queue entry!"
-msgstr ""
-
-#: admin/ogroups/asterisk/class_phonequeue.inc:487
-#, php-format
-msgid ""
-"Found more than one entry named '%s' in queue table. Please inform your "
-"system administrator!"
-msgstr ""
-
-#: admin/ogroups/asterisk/class_phonequeue.inc:728
-#: admin/ogroups/asterisk/class_phonequeue.inc:730
-msgid "telephone number"
-msgstr ""
-
-#: admin/ogroups/asterisk/class_phonequeue.inc:787
-#: admin/ogroups/asterisk/class_phonequeue.inc:829
-#: admin/conference/class_phoneConferenceGeneric.inc:229
-#: admin/conference/class_phoneConferenceGeneric.inc:233
-#: admin/conference/class_phoneConferenceGeneric.inc:271
-#: admin/macro/class_gofonMacro.inc:343 admin/macro/class_gofonMacro.inc:452
-#: admin/macro/class_gofonMacro.inc:461 admin/macro/class_gofonMacro.inc:499
-#: admin/systems/asterisk/class_phoneGeneric.inc:267
-#: admin/systems/asterisk/class_phoneGeneric.inc:308
-#: addons/fonreports/class_fonreport.inc:220
-#: personal/phoneaccount/class_phoneAccount.inc:1046
-#: personal/phoneaccount/class_phoneAccount.inc:1166
-#: personal/phoneaccount/class_phoneAccount.inc:1172
-#: personal/phoneaccount/class_phoneAccount.inc:1368
-#: personal/phoneaccount/class_phoneAccount.inc:1450
-#: personal/phoneaccount/class_phoneAccount.inc:1528
-msgid "Error"
-msgstr "Erro"
-
-#: admin/ogroups/asterisk/class_phonequeue.inc:802
-#: admin/ogroups/asterisk/class_phonequeue.inc:857
-#: admin/conference/class_phoneConferenceGeneric.inc:682
-#: admin/macro/class_gofonMacro.inc:473 admin/macro/class_gofonMacro.inc:484
-#: admin/macro/class_gofonMacro.inc:521
-#: admin/macro/class_gofonMacroParameters.inc:435
-#: admin/systems/asterisk/class_phoneGeneric.inc:277
-#: admin/systems/asterisk/class_phoneGeneric.inc:432
-#: admin/systems/asterisk/class_phoneGeneric.inc:446
-#: admin/systems/asterisk/class_phoneGeneric.inc:463
-#: admin/systems/services/asterisk/class_serviceAsterisk.inc:121
-#: personal/phoneaccount/class_phoneAccount.inc:1476
-#: personal/phoneaccount/class_phoneAccount.inc:1609
-msgid "LDAP error"
-msgstr "Erro de LDAP"
-
-#: admin/ogroups/asterisk/class_phonequeue.inc:864
-#: admin/systems/asterisk/class_phoneGeneric.inc:472
-#: admin/systems/asterisk/class_phoneGeneric.inc:477
-#: personal/phoneaccount/class_phoneAccount.inc:999
-#: personal/phoneaccount/class_phoneAccount.inc:1012
-#: personal/phoneaccount/class_phoneAccount.inc:1024
-#: personal/phoneaccount/class_phoneAccount.inc:1028
-#: personal/phoneaccount/class_phoneAccount.inc:1031
-#: personal/phoneaccount/class_phoneAccount.inc:1657
+#: admin/systems/asterisk/class_phoneIAX.inc:30
+#: admin/systems/asterisk/class_phoneIAX.inc:34
+#: personal/asterisk/class_asteriskAccount.inc:45
 msgid "Phone"
 msgstr "Fone"
 
-#: admin/ogroups/asterisk/class_phonequeue.inc:865
-msgid "Phone group"
-msgstr ""
-
-#: admin/ogroups/asterisk/class_phonequeue.inc:872
-#: admin/ogroups/asterisk/phonequeue.tpl.c:32
-msgid "Max queue length"
-msgstr ""
-
-#: admin/ogroups/asterisk/class_phonequeue.inc:875
-#: admin/ogroups/asterisk/phonequeue.tpl.c:86
-msgid "Allow the called user to transfer his call"
-msgstr ""
-
-#: admin/ogroups/asterisk/class_phonequeue.inc:876
-#: admin/ogroups/asterisk/phonequeue.tpl.c:89
-msgid "Allows calling user to transfer call"
-msgstr ""
-
-#: admin/ogroups/asterisk/class_phonequeue.inc:877
-#: admin/ogroups/asterisk/phonequeue.tpl.c:92
-msgid "Allow the called to hangup by pressing *"
-msgstr ""
-
-#: admin/ogroups/asterisk/class_phonequeue.inc:878
-#: admin/ogroups/asterisk/phonequeue.tpl.c:98
-msgid "Ring instead of playing background music"
-msgstr ""
-
-#: admin/ogroups/asterisk/class_phonequeue.inc:879
-#: admin/ogroups/asterisk/phonequeue.tpl.c:95
-msgid "Allows calling to hangup by pressing *"
-msgstr ""
-
-#: admin/ogroups/asterisk/class_phonequeue.inc:881
-#: admin/ogroups/asterisk/phonequeue.tpl.c:47
-msgid "Music on hold"
-msgstr ""
-
-#: admin/ogroups/asterisk/class_phonequeue.inc:882
-msgid "Welcome music"
-msgstr ""
-
-#: admin/ogroups/asterisk/class_phonequeue.inc:883
-msgid "Report hold time"
-msgstr ""
-
-#: admin/ogroups/asterisk/class_phonequeue.inc:884
-msgid "'You are next' sound"
-msgstr ""
-
-#: admin/ogroups/asterisk/class_phonequeue.inc:885
-msgid "'There are' sound"
-msgstr ""
-
-#: admin/ogroups/asterisk/class_phonequeue.inc:886
-msgid "'Call waiting' sound"
-msgstr ""
-
-#: admin/ogroups/asterisk/class_phonequeue.inc:887
-msgid "'Thank you' sound"
-msgstr ""
-
-#: admin/ogroups/asterisk/class_phonequeue.inc:888
-msgid "'Minutes' sound"
-msgstr ""
-
-#: admin/ogroups/asterisk/class_phonequeue.inc:889
-msgid "'Seconds' sound"
-msgstr ""
-
-#: admin/ogroups/asterisk/class_phonequeue.inc:890
-msgid "'Less than' sound"
-msgstr ""
-
-#: admin/ogroups/asterisk/class_phonequeue.inc:891
-msgid "Queue phone number"
-msgstr ""
-
-#: admin/ogroups/asterisk/class_phonequeue.inc:892
-#: admin/conference/class_phoneConferenceGeneric.inc:707
-#: admin/ogroups/asterisk/phonequeue.tpl.c:20
-#: admin/conference/generic.tpl.c:23
-msgid "Language"
-msgstr ""
-
-#: admin/ogroups/asterisk/class_phonequeue.inc:893
-msgid "Method"
-msgstr ""
-
-#: admin/ogroups/asterisk/class_phonequeue.inc:894
-#: admin/ogroups/asterisk/phonequeue.tpl.c:83
-msgid "Announce holdtime"
-msgstr ""
-
-#: admin/ogroups/asterisk/class_phonequeue.inc:895
-msgid "Announce"
-msgstr ""
-
-#: admin/conference/conf-list.xml:11
-msgid "List of conference rooms"
-msgstr ""
-
-#: admin/conference/conf-list.xml:15 admin/conference/conf-list.xml:74
-msgid "Conference"
-msgstr ""
-
-#: admin/conference/conf-list.xml:41
-#: admin/conference/class_phoneConferenceGeneric.inc:324
-#: admin/conference/class_phoneConferenceGeneric.inc:347
-#: admin/conference/class_phoneConferenceGeneric.inc:702
-#: admin/macro/class_gofonMacro.inc:395 admin/macro/class_gofonMacro.inc:406
-#: admin/macro/macro-list.xml:41
-#: admin/systems/asterisk/class_phoneGeneric.inc:344
-#: admin/systems/asterisk/class_phoneGeneric.inc:348
-#: admin/systems/asterisk/class_phoneGeneric.inc:351
-#: admin/systems/asterisk/class_phoneGeneric.inc:366
-#: admin/systems/asterisk/class_phoneGeneric.inc:482
-#: admin/conference/conf-filter.tpl.c:5 admin/macro/macro-filter.tpl.c:5
-#: admin/macro/parameter.tpl.c:5
-msgid "Name"
-msgstr "Nome"
-
-#: admin/conference/conf-list.xml:49
-#: admin/conference/class_phoneConferenceGeneric.inc:704
-#: admin/macro/class_gofonMacro.inc:547 admin/macro/macro-list.xml:49
-#: admin/systems/asterisk/class_phoneGeneric.inc:484
-#: admin/conference/generic.tpl.c:29 admin/macro/generic.tpl.c:17
-#: admin/systems/asterisk/phone.tpl.c:8
-msgid "Description"
-msgstr "DescriÃ§Ã£o"
-
-#: admin/conference/conf-list.xml:57 admin/macro/macro-list.xml:57
-msgid "Actions"
-msgstr "AÃ§Ãµes"
-
-#: admin/conference/conf-list.xml:68 admin/macro/macro-list.xml:68
-msgid "Create"
-msgstr "Criar"
-
-#: admin/conference/conf-list.xml:86 admin/conference/conf-list.xml:125
-#: admin/macro/macro-list.xml:86 admin/macro/macro-list.xml:125
-msgid "Edit"
-msgstr "Editar"
-
-#: admin/conference/conf-list.xml:93 admin/conference/conf-list.xml:138
-#: admin/macro/macro-list.xml:93 admin/macro/macro-list.xml:138
-msgid "Remove"
-msgstr "Remover"
-
-#: admin/conference/class_phoneConferenceGeneric.inc:233
-#, php-format
-msgid "Cannot delete entry from server '%s' because it seems to be removed!"
-msgstr ""
-
-#: admin/conference/class_phoneConferenceGeneric.inc:308
-#, php-format
-msgid ""
-"The previously selected asterisk home server '%s' is no longer available!"
-msgstr ""
-
-#: admin/conference/class_phoneConferenceGeneric.inc:315
-#: admin/conference/generic.tpl.c:47
-msgid "PIN"
-msgstr ""
-
-#: admin/conference/class_phoneConferenceGeneric.inc:333
-#: admin/conference/class_phoneConferenceGeneric.inc:719
-msgid "Lifetime"
-msgstr ""
-
-#: admin/conference/class_phoneConferenceGeneric.inc:399
-#: personal/phoneaccount/class_phoneAccount.inc:346
-#: personal/phoneaccount/class_phoneAccount.inc:359
-#: personal/phoneaccount/class_phoneAccount.inc:617
-#: personal/phoneaccount/class_phoneAccount.inc:656
-#: personal/phoneaccount/class_phoneAccount.inc:1519
-#: personal/phoneaccount/class_phoneAccount.inc:1695
-#: admin/conference/remove.tpl.c:2 admin/macro/remove.tpl.c:2
-msgid "Warning"
-msgstr "AtenÃ§Ã£o"
-
-#: admin/conference/class_phoneConferenceGeneric.inc:400
-#, php-format
-msgid ""
-"FusionDirectory identified problems with your MySQL table definition, please"
-" activate debugging for details."
-msgstr ""
-
-#: admin/conference/class_phoneConferenceGeneric.inc:606
-#: admin/conference/class_phoneConferenceGeneric.inc:608
-#, php-format
-msgid "'%s' is already assigned to '%s'!"
-msgstr ""
-
-#: admin/conference/class_phoneConferenceGeneric.inc:693
-msgid "Phone Conference"
-msgstr ""
-
-#: admin/conference/class_phoneConferenceGeneric.inc:694
-msgid "Phone conference management"
-msgstr ""
-
-#: admin/conference/class_phoneConferenceGeneric.inc:696
-msgid "GOfon conference"
-msgstr ""
-
-#: admin/conference/class_phoneConferenceGeneric.inc:698
-msgid "Asterisk conference"
-msgstr ""
-
-#: admin/conference/class_phoneConferenceGeneric.inc:703
-#: admin/macro/class_gofonMacro.inc:546
-#: admin/systems/asterisk/class_phoneGeneric.inc:483
-#: admin/conference/generic.tpl.c:17 admin/macro/generic.tpl.c:14
-#: admin/systems/asterisk/phone.tpl.c:5
-msgid "Base"
-msgstr "Base"
-
-#: admin/conference/class_phoneConferenceGeneric.inc:705
-msgid "Conference PIN"
-msgstr ""
-
-#: admin/conference/class_phoneConferenceGeneric.inc:710
-#: admin/conference/generic.tpl.c:44
-msgid "Preset PIN"
-msgstr ""
-
-#: admin/conference/class_phoneConferenceGeneric.inc:711
-#: admin/conference/generic.tpl.c:50
-msgid "Record conference"
-msgstr ""
-
-#: admin/conference/class_phoneConferenceGeneric.inc:712
-#: admin/conference/generic.tpl.c:59
-msgid "Play music on hold"
-msgstr ""
-
-#: admin/conference/class_phoneConferenceGeneric.inc:713
-msgid "Activate menu"
-msgstr ""
-
-#: admin/conference/class_phoneConferenceGeneric.inc:714
-msgid "Announce user activity"
-msgstr ""
-
-#: admin/conference/class_phoneConferenceGeneric.inc:715
-msgid "Count user"
-msgstr ""
-
-#: admin/conference/class_phoneConferenceGeneric.inc:716
-msgid "Conference type"
-msgstr ""
-
-#: admin/conference/class_phoneConferenceGeneric.inc:718
-msgid "Format"
-msgstr ""
-
-#: admin/conference/class_phoneConferenceGeneric.inc:720
-#: personal/phoneaccount/class_phoneAccount.inc:1666
-msgid "Telephone number"
-msgstr ""
-
-#: admin/conference/class_phoneConferenceGeneric.inc:721
-msgid "Owner"
-msgstr ""
-
-#: admin/conference/class_phoneConferenceManagment.inc:36
-msgid "Phone Conferences"
-msgstr ""
-
-#: admin/conference/class_phoneConferenceManagment.inc:37
-msgid "Phone Conference management"
-msgstr ""
-
-#: admin/macro/class_gofonMacro.inc:202
-#, php-format
-msgid ""
-"Macro could not be removed from server '%s', please check database "
-"consistency!"
-msgstr ""
-
-#: admin/macro/class_gofonMacro.inc:264
-#, php-format
-msgid "Application missing in line %s!"
-msgstr ""
-
-#: admin/macro/class_gofonMacro.inc:267
-#, php-format
-msgid "Priority missing in line %s!"
-msgstr ""
-
-#: admin/macro/class_gofonMacro.inc:271
-#, php-format
-msgid "Extension missing in line %s!"
-msgstr ""
-
-#: admin/macro/class_gofonMacro.inc:281
-#, php-format
-msgid "Duplicate combination of 'extension' and 'priority' in line %s!"
-msgstr ""
-
-#: admin/macro/class_gofonMacro.inc:317
-#, php-format
-msgid ""
-"Macro could not be added to server '%s', please check database consistency!"
-msgstr ""
-
-#: admin/macro/class_gofonMacro.inc:410
-msgid "Name can be 20 characters at maximum!"
-msgstr ""
-
-#: admin/macro/class_gofonMacro.inc:419
-msgid "Macro is still in use!"
-msgstr ""
-
-#: admin/macro/class_gofonMacro.inc:426
-msgid "Macro is empty!"
-msgstr ""
-
-#: admin/macro/class_gofonMacro.inc:452
-#: admin/systems/asterisk/class_phoneGeneric.inc:267
-#, php-format
-msgid "Cannot delete entry because it is still in use by '%s'!"
-msgstr ""
-
-#: admin/macro/class_gofonMacro.inc:465
-#: addons/fonreports/class_fonreport.inc:190
-#: personal/phoneaccount/class_phoneAccount.inc:455
-#: personal/phoneaccount/class_phoneAccount.inc:1061
-#: personal/phoneaccount/class_phoneAccount.inc:1567
-msgid "Configuration error"
-msgstr "Erro de configuraÃ§Ã£o"
-
-#: admin/macro/class_gofonMacro.inc:536 admin/macro/class_gofonMacro.inc:541
-msgid "Asterisk macro"
-msgstr ""
-
-#: admin/macro/class_gofonMacro.inc:537
-msgid "Asterisk macro management"
-msgstr ""
-
-#: admin/macro/class_gofonMacro.inc:539
-msgid "GOfon macro"
-msgstr ""
-
-#: admin/macro/class_gofonMacro.inc:545 admin/macro/generic.tpl.c:2
-#: admin/macro/generic.tpl.c:5 admin/macro/paste_generic.tpl.c:2
-#: admin/macro/paste_generic.tpl.c:5
-msgid "Macro name"
-msgstr ""
-
-#: admin/macro/class_gofonMacro.inc:548 admin/macro/generic.tpl.c:8
-msgid "Display name"
-msgstr ""
-
-#: admin/macro/class_gofonMacro.inc:549
-msgid "Macro content and parameter"
-msgstr ""
-
-#: admin/macro/class_gofonMacro.inc:550
-msgid "Visibility flag"
-msgstr ""
-
-#: admin/macro/class_gofonMacroManagement.inc:36
-msgid "Phone Macros"
-msgstr ""
-
-#: admin/macro/class_gofonMacroManagement.inc:37
-msgid "Phone Macros management"
-msgstr ""
-
-#: admin/macro/macro-list.xml:11
-msgid "List of macros"
-msgstr ""
-
-#: admin/macro/macro-list.xml:15 admin/macro/macro-list.xml:74
-msgid "Macro"
-msgstr ""
-
-#: admin/macro/class_gofonMacroParameters.inc:58
-msgid "Parameter"
+#: admin/systems/asterisk/class_phoneIAX.inc:31
+msgid "Asterisk phone"
 msgstr ""
 
-#: admin/macro/class_gofonMacroParameters.inc:59
-msgid "Asterisk macro parameter"
-msgstr ""
-
-#: admin/macro/class_gofonMacroParameters.inc:234
-#: personal/phoneaccount/generic.tpl.c:35
-msgid "Phone macro"
-msgstr ""
-
-#: admin/macro/class_gofonMacroParameters.inc:290
-msgid "String"
-msgstr ""
-
-#: admin/macro/class_gofonMacroParameters.inc:291
-msgid "Combobox"
-msgstr ""
-
-#: admin/macro/class_gofonMacroParameters.inc:292
-msgid "Bool"
-msgstr ""
-
-#: admin/macro/class_gofonMacroParameters.inc:298
-msgid "Delete unused"
-msgstr ""
-
-#: admin/macro/class_gofonMacroParameters.inc:374
-#, php-format
-msgid "Parameter %s contains invalid character. '!,#' is used as delimiter!"
-msgstr ""
-
-#: admin/macro/class_gofonMacroParameters.inc:379
-#, php-format
-msgid "Parameter %s is invalid!"
-msgstr ""
-
-#: admin/macro/class_gofonMacroParameters.inc:408
-#: personal/phoneaccount/class_phoneAccount.inc:1600
-msgid "Information"
-msgstr "InformaÃ§Ã£o"
-
-#: admin/macro/class_gofonMacroParameters.inc:408
-msgid ""
-"Number of parameters for this macro has changed. Please update all users "
-"using it!"
-msgstr ""
-
-#: admin/systems/asterisk/class_phoneGeneric.inc:151
-msgid "phone"
-msgstr ""
-
-#: admin/systems/asterisk/class_phoneGeneric.inc:230
-msgid "yes"
-msgstr ""
-
-#: admin/systems/asterisk/class_phoneGeneric.inc:230
-msgid "no"
-msgstr ""
-
-#: admin/systems/asterisk/class_phoneGeneric.inc:247
-msgid "dynamic"
-msgstr ""
-
-#: admin/systems/asterisk/class_phoneGeneric.inc:247
-msgid "Networksettings"
-msgstr ""
-
-#: admin/systems/asterisk/class_phoneGeneric.inc:330
-#: admin/systems/asterisk/class_phoneGeneric.inc:333
-msgid "IP address"
-msgstr ""
-
-#: admin/systems/asterisk/class_phoneGeneric.inc:473
-msgid "Phone information"
-msgstr ""
-
-#: admin/systems/asterisk/class_phoneGeneric.inc:476
-#: personal/phoneaccount/class_phoneAccount.inc:1668
+#: admin/systems/asterisk/class_phoneIAX.inc:33
 msgid "Phone hardware"
 msgstr ""
 
-#: admin/systems/asterisk/class_phoneGeneric.inc:485
-msgid "SIP Mode"
-msgstr ""
-
-#: admin/systems/asterisk/class_phoneGeneric.inc:486
-msgid "SIP DTMF mode"
-msgstr ""
-
-#: admin/systems/asterisk/class_phoneGeneric.inc:487
-msgid "SIP Default ip"
-msgstr ""
-
-#: admin/systems/asterisk/class_phoneGeneric.inc:488
-msgid "SIP Qualify"
-msgstr ""
-
-#: admin/systems/asterisk/class_phoneGeneric.inc:489
-msgid "IAX authentication type"
-msgstr ""
-
-#: admin/systems/asterisk/class_phoneGeneric.inc:490
-msgid "IAX secret"
-msgstr ""
-
-#: admin/systems/asterisk/class_phoneGeneric.inc:491
-msgid "IAX account code"
-msgstr ""
-
-#: admin/systems/asterisk/class_phoneGeneric.inc:492
-msgid "IAX trunk lines"
+#: admin/systems/asterisk/class_phoneIAX.inc:46
+#: personal/asterisk/class_asteriskAccount.inc:42
+msgid "Telephone"
 msgstr ""
 
-#: admin/systems/asterisk/class_phoneGeneric.inc:493
-msgid "IAX permit settings"
-msgstr ""
+#: admin/systems/asterisk/class_phoneIAX.inc:49
+msgid "Name"
+msgstr "Nome"
 
-#: admin/systems/asterisk/class_phoneGeneric.inc:494
-msgid "IAX deny settings"
+#: admin/systems/asterisk/class_phoneIAX.inc:49
+msgid "Name of this phone"
 msgstr ""
 
-#: admin/systems/asterisk/class_phoneGeneric.inc:495
-msgid "CAPI MSN"
+#: admin/systems/asterisk/class_phoneIAX.inc:53
+msgid "Account name"
 msgstr ""
 
-#: admin/systems/asterisk/class_phoneGeneric.inc:496
-msgid "Hardware type"
+#: admin/systems/asterisk/class_phoneIAX.inc:53
+msgid "Name of the account"
 msgstr ""
 
 #: admin/systems/services/asterisk/class_serviceAsterisk.inc:35
@@ -746,6 +95,10 @@ msgid ""
 "these objects '%s'."
 msgstr ""
 
+#: admin/systems/services/asterisk/class_serviceAsterisk.inc:121
+msgid "LDAP error"
+msgstr "Erro de LDAP"
+
 #: admin/systems/services/asterisk/class_serviceAsterisk.inc:140
 msgid "VoIP service (asterisk)"
 msgstr ""
@@ -758,209 +111,18 @@ msgstr ""
 msgid "Services"
 msgstr ""
 
-#: addons/fonreports/class_fonreport.inc:232
-msgid "Insufficient permissions"
-msgstr ""
-
-#: addons/fonreports/class_fonreport.inc:251
-msgid "Y-M-D"
-msgstr ""
-
-#: addons/fonreports/class_fonreport.inc:418
-#: addons/fonreports/class_fonreport.inc:419
-#: addons/fonreports/class_fonreport.inc:424 addons/fonreports/main.inc:46
-msgid "Phone reports"
-msgstr ""
-
-#: addons/fonreports/class_fonreport.inc:419
-msgid "All entries are readonly"
-msgstr ""
-
-#: addons/fonreports/class_fonreport.inc:428
-#: addons/fonreports/contents.tpl.c:32
-msgid "Date"
-msgstr ""
-
-#: addons/fonreports/class_fonreport.inc:429
-#: addons/fonreports/contents.tpl.c:35
-msgid "Source"
-msgstr ""
-
-#: addons/fonreports/class_fonreport.inc:430
-#: addons/fonreports/contents.tpl.c:38
-msgid "Destination"
-msgstr ""
-
-#: addons/fonreports/class_fonreport.inc:431
-#: addons/fonreports/contents.tpl.c:41
-msgid "Channel"
-msgstr ""
-
-#: addons/fonreports/class_fonreport.inc:432
-msgid "Application called"
-msgstr ""
-
-#: addons/fonreports/class_fonreport.inc:433
-msgid "Disposition"
-msgstr ""
-
-#: addons/fonreports/class_fonreport.inc:434
-#: addons/fonreports/contents.tpl.c:50
-msgid "Duration"
-msgstr ""
-
-#: personal/phoneaccount/class_phoneAccount.inc:176
-msgid "automatic"
-msgstr "automÃ¡tico"
-
-#: personal/phoneaccount/class_phoneAccount.inc:212
-msgid "no macro"
-msgstr ""
-
-#: personal/phoneaccount/class_phoneAccount.inc:240
-msgid "undefined"
-msgstr ""
-
-#: personal/phoneaccount/class_phoneAccount.inc:359
-#, php-format
-msgid ""
-"Cannot identify telephone extension in database, please try to save again."
-msgstr ""
-
-#: personal/phoneaccount/class_phoneAccount.inc:577
-#: personal/phoneaccount/class_phoneAccount.inc:595
-msgid "Abort saving entries to keep the database consistent."
-msgstr ""
-
-#: personal/phoneaccount/class_phoneAccount.inc:618
-#: personal/phoneaccount/class_phoneAccount.inc:657
-#: personal/phoneaccount/class_phoneAccount.inc:1520
-#, php-format
-msgid ""
-"FusionDirectory identified problems with your database table definition!"
-msgstr ""
-
-#: personal/phoneaccount/class_phoneAccount.inc:1023
-msgid "Remove phone account"
-msgstr ""
-
-#: personal/phoneaccount/class_phoneAccount.inc:1027
-#: personal/phoneaccount/class_phoneAccount.inc:1030
-msgid "Create phone account"
-msgstr ""
-
-#: personal/phoneaccount/class_phoneAccount.inc:1028
-msgid "User uid"
-msgstr ""
-
-#: personal/phoneaccount/class_phoneAccount.inc:1046
-msgid "Selected macro is not available anymore!"
-msgstr ""
-
-#: personal/phoneaccount/class_phoneAccount.inc:1221
-msgid "Choose your private phone"
-msgstr ""
-
-#: personal/phoneaccount/class_phoneAccount.inc:1346
-msgid ""
-"There must be at least one server with an asterisk database to create a "
-"phone account."
-msgstr ""
-
-#: personal/phoneaccount/class_phoneAccount.inc:1354
-#: personal/phoneaccount/class_phoneAccount.inc:1357
-#: personal/phoneaccount/generic.tpl.c:29
-#: personal/phoneaccount/paste_generic.tpl.c:11
-msgid "Voicemail PIN"
-msgstr ""
-
-#: personal/phoneaccount/class_phoneAccount.inc:1354
-msgid "Between 1-4 charactes"
-msgstr ""
-
-#: personal/phoneaccount/class_phoneAccount.inc:1362
-#: personal/phoneaccount/generic.tpl.c:32
-#: personal/phoneaccount/paste_generic.tpl.c:14
-msgid "Phone PIN"
-msgstr ""
-
-#: personal/phoneaccount/class_phoneAccount.inc:1394
-#: admin/conference/generic.tpl.c:38 admin/conference/paste_generic.tpl.c:8
-msgid "Phone number"
-msgstr ""
-
-#: personal/phoneaccount/class_phoneAccount.inc:1402
-#, php-format
-msgid "macro parameter %s"
-msgstr ""
-
-#: personal/phoneaccount/class_phoneAccount.inc:1450
-msgid "An error occured while updating the database entries!"
-msgstr ""
-
-#: personal/phoneaccount/class_phoneAccount.inc:1567
-msgid "Was not able to found any asterisk server"
-msgstr ""
-
-#: personal/phoneaccount/class_phoneAccount.inc:1600
-#, php-format
-msgid "User '%s' has been removed from phone queue '%s'."
-msgstr ""
-
-#: personal/phoneaccount/class_phoneAccount.inc:1637
-#: personal/phoneaccount/class_phoneAccount.inc:1639
-#, php-format
-msgid "The specified telephonenumber '%s' is already assigned to '%s'."
-msgstr ""
-
-#: personal/phoneaccount/class_phoneAccount.inc:1649
-#, php-format
-msgid ""
-"The previously selected asterisk home server (%s) is no longer available. "
-"Remove aborted."
-msgstr ""
-
-#: personal/phoneaccount/class_phoneAccount.inc:1658
-msgid "Phone account settings"
-msgstr ""
-
-#: personal/phoneaccount/class_phoneAccount.inc:1667
-msgid "Macro settings"
-msgstr ""
-
-#: personal/phoneaccount/class_phoneAccount.inc:1670
-msgid "Phone context"
-msgstr ""
-
-#: personal/phoneaccount/class_phoneAccount.inc:1671
-msgid "Voice mail context"
-msgstr ""
-
-#: personal/phoneaccount/class_phoneAccount.inc:1672
-msgid "Telephone pin"
-msgstr ""
-
-#: personal/phoneaccount/class_phoneAccount.inc:1673
-msgid "Voicemail pin"
-msgstr ""
-
-#: personal/phoneaccount/class_phoneAccount.inc:1695
-#, php-format
-msgid "You need to configure %s contexts first"
+#: personal/asterisk/class_asteriskAccount.inc:30
+#: config/asterisk/class_asteriskPluginConfig.inc:28
+#: config/asterisk/class_asteriskPluginConfig.inc:41
+msgid "Asterisk"
 msgstr ""
 
-#: personal/phoneaccount/main.inc:124
-msgid "Click the 'Edit' button below to change informations in this dialog"
-msgstr "Clique em Editar para alterar as informaÃ§Ãµes desta janela"
-
-#: personal/phoneaccount/main.inc:134
-#: personal/phoneaccount/paste_generic.tpl.c:2
-msgid "Phone settings"
+#: personal/asterisk/class_asteriskAccount.inc:31
+msgid "Asterisk account"
 msgstr ""
 
-#: config/asterisk/class_asteriskPluginConfig.inc:28
-#: config/asterisk/class_asteriskPluginConfig.inc:41
-msgid "Asterisk"
+#: personal/asterisk/class_asteriskAccount.inc:45
+msgid "Select the phone associated to this user"
 msgstr ""
 
 #: config/asterisk/class_asteriskPluginConfig.inc:29
@@ -1010,338 +172,3 @@ msgstr ""
 #: config/asterisk/class_asteriskPluginConfig.inc:72
 msgid "Available voicemail contexts"
 msgstr ""
-
-#: admin/ogroups/asterisk/phonequeue.tpl.c:2
-msgid ""
-"Only users with the same asterisk home server will be included to this "
-"queue."
-msgstr ""
-
-#: admin/ogroups/asterisk/phonequeue.tpl.c:5
-#: personal/phoneaccount/generic.tpl.c:2
-#: personal/phoneaccount/paste_generic.tpl.c:5
-msgid "Phone numbers"
-msgstr ""
-
-#: admin/ogroups/asterisk/phonequeue.tpl.c:8
-msgid "Up"
-msgstr "Para cima"
-
-#: admin/ogroups/asterisk/phonequeue.tpl.c:11
-msgid "Down"
-msgstr "Para baixo"
-
-#: admin/ogroups/asterisk/phonequeue.tpl.c:14
-#: admin/conference/generic.tpl.c:41
-msgid "Options"
-msgstr ""
-
-#: admin/ogroups/asterisk/phonequeue.tpl.c:29
-msgid "Strategy"
-msgstr ""
-
-#: admin/ogroups/asterisk/phonequeue.tpl.c:38
-msgid "(in seconds)"
-msgstr ""
-
-#: admin/ogroups/asterisk/phonequeue.tpl.c:41
-msgid "Queue sound setup"
-msgstr ""
-
-#: admin/ogroups/asterisk/phonequeue.tpl.c:44
-msgid "Use music on hold instead of ringing"
-msgstr ""
-
-#: admin/ogroups/asterisk/phonequeue.tpl.c:50
-msgid "Welcome sound file"
-msgstr ""
-
-#: admin/ogroups/asterisk/phonequeue.tpl.c:53
-msgid "Announce message"
-msgstr ""
-
-#: admin/ogroups/asterisk/phonequeue.tpl.c:56
-msgid "Sound file for 'You are next ...'"
-msgstr ""
-
-#: admin/ogroups/asterisk/phonequeue.tpl.c:59
-msgid "'There are ...'"
-msgstr ""
-
-#: admin/ogroups/asterisk/phonequeue.tpl.c:62
-msgid "'... calls waiting'"
-msgstr ""
-
-#: admin/ogroups/asterisk/phonequeue.tpl.c:65
-msgid "'Thank you' message"
-msgstr ""
-
-#: admin/ogroups/asterisk/phonequeue.tpl.c:68
-msgid "'minutes' sound file"
-msgstr ""
-
-#: admin/ogroups/asterisk/phonequeue.tpl.c:71
-msgid "'seconds' sound file"
-msgstr ""
-
-#: admin/ogroups/asterisk/phonequeue.tpl.c:74
-msgid "Hold sound file"
-msgstr ""
-
-#: admin/ogroups/asterisk/phonequeue.tpl.c:77
-msgid "Less Than sound file"
-msgstr ""
-
-#: admin/ogroups/asterisk/phonequeue.tpl.c:80
-msgid "Phone attributes "
-msgstr ""
-
-#: admin/conference/conf-filter.tpl.c:2 admin/macro/macro-filter.tpl.c:2
-#: addons/fonreports/contents.tpl.c:2
-msgid "Filter"
-msgstr ""
-
-#: admin/conference/generic.tpl.c:2
-msgid "Properties"
-msgstr "Propriedades"
-
-#: admin/conference/generic.tpl.c:5 admin/conference/paste_generic.tpl.c:2
-msgid "Conference name"
-msgstr ""
-
-#: admin/conference/generic.tpl.c:8 admin/conference/paste_generic.tpl.c:5
-msgid "Name of conference to create"
-msgstr ""
-
-#: admin/conference/generic.tpl.c:11
-msgid "Type"
-msgstr "Tipo"
-
-#: admin/conference/generic.tpl.c:14
-msgid "Choose subtree to place conference in"
-msgstr ""
-
-#: admin/conference/generic.tpl.c:26
-msgid "Select language"
-msgstr ""
-
-#: admin/conference/generic.tpl.c:32
-msgid "Descriptive text for department"
-msgstr ""
-
-#: admin/conference/generic.tpl.c:35
-msgid "Lifetime (in days)"
-msgstr ""
-
-#: admin/conference/generic.tpl.c:53
-msgid "Sound file format"
-msgstr ""
-
-#: admin/conference/generic.tpl.c:56
-msgid "Choose subtree to place department in"
-msgstr ""
-
-#: admin/conference/generic.tpl.c:62
-msgid "Activate session menu"
-msgstr ""
-
-#: admin/conference/generic.tpl.c:65
-msgid "Announce users joining or leaving the conference"
-msgstr ""
-
-#: admin/conference/generic.tpl.c:68
-msgid "Count users"
-msgstr ""
-
-#: admin/conference/remove.tpl.c:5 admin/macro/remove.tpl.c:5
-msgid ""
-"Please double check if you really want to do this since there is no way for "
-"FusionDirectory to get your data back."
-msgstr ""
-
-#: admin/conference/remove.tpl.c:8 admin/macro/remove.tpl.c:8
-msgid "So - if you're sure - press 'Delete' to continue or 'Cancel' to abort."
-msgstr "EntÃ£o, se vocÃª tem certeza, pressione 'Deletar' para continuar ou 'Cancelar' para abortar."
-
-#: admin/macro/generic.tpl.c:11
-msgid "Macro name to be displayed"
-msgstr ""
-
-#: admin/macro/generic.tpl.c:20
-msgid "Visible for user"
-msgstr ""
-
-#: admin/macro/generic.tpl.c:23
-msgid "Macro text"
-msgstr ""
-
-#: admin/macro/parameter.tpl.c:2
-msgid "Argument"
-msgstr ""
-
-#: admin/macro/parameter.tpl.c:8
-msgid "type"
-msgstr ""
-
-#: admin/macro/parameter.tpl.c:11
-msgid "Default value"
-msgstr ""
-
-#: admin/macro/parameter.tpl.c:14
-msgid "You are not allowed to view the macro parameter settings"
-msgstr ""
-
-#: admin/systems/asterisk/phonesettings.tpl.c:2
-msgid "Advanced phone settings"
-msgstr ""
-
-#: admin/systems/asterisk/phonesettings.tpl.c:5
-msgid "Phone type"
-msgstr ""
-
-#: admin/systems/asterisk/phonesettings.tpl.c:8
-#: admin/systems/asterisk/phonesettings.tpl.c:14
-#: admin/systems/asterisk/phonesettings.tpl.c:20
-#: admin/systems/asterisk/phonesettings.tpl.c:26
-#: admin/systems/asterisk/phonesettings.tpl.c:35
-#: admin/systems/asterisk/phonesettings.tpl.c:47
-#: admin/systems/asterisk/phonesettings.tpl.c:65
-msgid "Choose a phone type"
-msgstr ""
-
-#: admin/systems/asterisk/phonesettings.tpl.c:11
-msgid "Mode"
-msgstr ""
-
-#: admin/systems/asterisk/phonesettings.tpl.c:17
-msgid "DTMF mode"
-msgstr ""
-
-#: admin/systems/asterisk/phonesettings.tpl.c:23
-#: admin/systems/asterisk/phonesettings.tpl.c:38
-msgid "Default IP"
-msgstr ""
-
-#: admin/systems/asterisk/phonesettings.tpl.c:29
-#: admin/systems/asterisk/phonesettings.tpl.c:41
-msgid "Response timeout"
-msgstr ""
-
-#: admin/systems/asterisk/phonesettings.tpl.c:32
-msgid "Modus"
-msgstr ""
-
-#: admin/systems/asterisk/phonesettings.tpl.c:44
-msgid "Authtype"
-msgstr ""
-
-#: admin/systems/asterisk/phonesettings.tpl.c:50
-msgid "Secret"
-msgstr ""
-
-#: admin/systems/asterisk/phonesettings.tpl.c:53
-msgid "GoFonInkeys"
-msgstr ""
-
-#: admin/systems/asterisk/phonesettings.tpl.c:56
-msgid "GoFonOutKeys"
-msgstr ""
-
-#: admin/systems/asterisk/phonesettings.tpl.c:59
-msgid "Account code"
-msgstr ""
-
-#: admin/systems/asterisk/phonesettings.tpl.c:62
-msgid "Trunk lines"
-msgstr ""
-
-#: admin/systems/asterisk/phonesettings.tpl.c:68
-msgid "Hosts that are allowed to connect"
-msgstr ""
-
-#: admin/systems/asterisk/phonesettings.tpl.c:71
-#: admin/systems/asterisk/phonesettings.tpl.c:77
-msgid "List of alternative mail addresses"
-msgstr ""
-
-#: admin/systems/asterisk/phonesettings.tpl.c:74
-msgid "Hosts that are not allowed to connect"
-msgstr ""
-
-#: admin/systems/asterisk/phonesettings.tpl.c:80
-msgid "MSN"
-msgstr ""
-
-#: admin/systems/asterisk/phone.tpl.c:2
-msgid "Phone name"
-msgstr ""
-
-#: addons/fonreports/contents.tpl.c:5
-msgid "Search for"
-msgstr ""
-
-#: addons/fonreports/contents.tpl.c:8
-msgid "Enter user name to search for"
-msgstr ""
-
-#: addons/fonreports/contents.tpl.c:11 addons/fonreports/contents.tpl.c:26
-msgid "in"
-msgstr ""
-
-#: addons/fonreports/contents.tpl.c:14
-msgid "Select subtree to base search on"
-msgstr ""
-
-#: addons/fonreports/contents.tpl.c:17
-msgid "on"
-msgstr ""
-
-#: addons/fonreports/contents.tpl.c:20
-msgid "Select server to search on"
-msgstr ""
-
-#: addons/fonreports/contents.tpl.c:23
-msgid "during"
-msgstr ""
-
-#: addons/fonreports/contents.tpl.c:29
-msgid "Search"
-msgstr "Procura"
-
-#: addons/fonreports/contents.tpl.c:44
-msgid "Application"
-msgstr "AplicaÃ§Ã£o"
-
-#: addons/fonreports/contents.tpl.c:47
-msgid "Status"
-msgstr "Estatus"
-
-#: addons/fonreports/contents.tpl.c:53
-msgid "Search returned no results..."
-msgstr ""
-
-#: personal/phoneaccount/generic.tpl.c:5
-#: personal/phoneaccount/paste_generic.tpl.c:8
-msgid "Telephone hardware"
-msgstr ""
-
-#: personal/phoneaccount/generic.tpl.c:8
-msgid "Telephone"
-msgstr ""
-
-#: personal/phoneaccount/generic.tpl.c:14
-msgid "Select the accounts home server"
-msgstr ""
-
-#: personal/phoneaccount/generic.tpl.c:17
-msgid "Context"
-msgstr ""
-
-#: personal/phoneaccount/generic.tpl.c:20
-#: personal/phoneaccount/generic.tpl.c:26
-msgid "Select the accounts context"
-msgstr ""
-
-#: personal/phoneaccount/generic.tpl.c:23
-msgid "Voicemail context"
-msgstr ""
diff --git a/asterisk/locale/pt_BR/fusiondirectory.po b/asterisk/locale/pt_BR/fusiondirectory.po
index 4a0939851596883e833c84b6cba4d3c4fafdf1d0..f63be630fd105aa38af5fc9ad09585e080cfd9d9 100644
--- a/asterisk/locale/pt_BR/fusiondirectory.po
+++ b/asterisk/locale/pt_BR/fusiondirectory.po
@@ -3,709 +3,54 @@
 # This file is distributed under the same license as the PACKAGE package.
 # 
 # Translators:
-# kayocarneiro <kayomatheus@gmail.com>, 2014
-# kayocarneiro <kayomatheus@gmail.com>, 2014
-# marcosantos <marcoa.csantos@yahoo.it>, 2014
-# marcosantos <marcoa.csantos@yahoo.it>, 2014
 msgid ""
 msgstr ""
-"Project-Id-Version: FusionDirectory-108\n"
+"Project-Id-Version: FusionDirectory-109\n"
 "Report-Msgid-Bugs-To: documentation@lists.fusiondirectory.org\n"
-"POT-Creation-Date: 2015-03-31 11:49+0200\n"
-"PO-Revision-Date: 2015-03-31 11:41+0000\n"
+"POT-Creation-Date: 2014-12-15 17:47+0100\n"
+"PO-Revision-Date: 2015-02-25 16:13+0000\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>\n"
-"Language-Team: Portuguese (Brazil) (http://www.transifex.com/projects/p/FusionDirectory-108/language/pt_BR/)\n"
+"Language-Team: Portuguese (Brazil) (http://www.transifex.com/projects/p/FusionDirectory-109/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/ogroups/asterisk/class_phonequeue.inc:110
-#: admin/conference/class_phoneConferenceGeneric.inc:104
-#: personal/phoneaccount/class_phoneAccount.inc:148
-msgid "Obsolete entry"
-msgstr "Entrada obsoleta"
-
-#: admin/ogroups/asterisk/class_phonequeue.inc:110
-#: admin/conference/class_phoneConferenceGeneric.inc:104
-#: personal/phoneaccount/class_phoneAccount.inc:148
-#, php-format
-msgid ""
-"The current home server is not available anymore. It will be moved to '%s' "
-"if you save this entry!"
-msgstr "O servidor domÃ©stico atual nÃ£o estÃ¡ mais disponÃvel. Ele serÃ¡ movido para '%s' se vocÃª salvar esta entrada!"
-
-#: admin/ogroups/asterisk/class_phonequeue.inc:140
-msgid "ring all"
-msgstr "tocar em todos"
-
-#: admin/ogroups/asterisk/class_phonequeue.inc:141
-msgid "round robin"
-msgstr "Em volta do robin"
-
-#: admin/ogroups/asterisk/class_phonequeue.inc:142
-msgid "least recently called"
-msgstr "Ãºltima chamada recente"
-
-#: admin/ogroups/asterisk/class_phonequeue.inc:143
-msgid "fewest completed calls"
-msgstr "menor nÃºmero de chamadas completadas"
-
-#: admin/ogroups/asterisk/class_phonequeue.inc:144
-msgid "random"
-msgstr "aleatÃ³rio"
-
-#: admin/ogroups/asterisk/class_phonequeue.inc:145
-msgid "round robin with memory"
-msgstr "Em volta do robin com memÃ³ria"
-
-#: admin/ogroups/asterisk/class_phonequeue.inc:180
-msgid "Remove the phone queue from this Account"
-msgstr "Remova o telefone da fila a partir desta Conta"
-
-#: admin/ogroups/asterisk/class_phonequeue.inc:181
-#: admin/ogroups/asterisk/class_phonequeue.inc:184
-msgid "phone queue"
-msgstr "fila de telefone"
-
-#: admin/ogroups/asterisk/class_phonequeue.inc:183
-msgid "Create phone queue"
-msgstr "Criar fila de telefone"
-
-#: admin/ogroups/asterisk/class_phonequeue.inc:272
-msgid ""
-"There must be at least one server with an asterisk database to create a "
-"phone queue."
-msgstr "Deve haver pelo menos um servidor com banco de dados asterisk para criar uma fila de telefone."
-
-#: admin/ogroups/asterisk/class_phonequeue.inc:275
-#: admin/ogroups/asterisk/class_phonequeue.inc:873
-#: admin/conference/class_phoneConferenceGeneric.inc:709
-#: personal/phoneaccount/class_phoneAccount.inc:1350
-#: personal/phoneaccount/class_phoneAccount.inc:1669
-#: admin/ogroups/asterisk/phonequeue.tpl.c:17
-#: admin/conference/generic.tpl.c:20 personal/phoneaccount/generic.tpl.c:11
-msgid "Home server"
-msgstr "Servidor domÃ©stico"
-
-#: admin/ogroups/asterisk/class_phonequeue.inc:281
-#: admin/ogroups/asterisk/class_phonequeue.inc:871
-#: admin/ogroups/asterisk/phonequeue.tpl.c:23
-msgid "Timeout"
-msgstr "Tempo limite"
-
-#: admin/ogroups/asterisk/class_phonequeue.inc:284
-#: admin/ogroups/asterisk/class_phonequeue.inc:896
-#: admin/ogroups/asterisk/phonequeue.tpl.c:26
-msgid "Retry"
-msgstr "Tente novamente"
-
-#: admin/ogroups/asterisk/class_phonequeue.inc:287
-msgid "Queue length"
-msgstr "Tamanho da fila"
-
-#: admin/ogroups/asterisk/class_phonequeue.inc:290
-#: admin/ogroups/asterisk/class_phonequeue.inc:874
-#: admin/ogroups/asterisk/phonequeue.tpl.c:35
-msgid "Announce frequency"
-msgstr "Anunciar freqÃ¼Ãªncia"
-
-#: admin/ogroups/asterisk/class_phonequeue.inc:293
-#: admin/conference/class_phoneConferenceGeneric.inc:328
-msgid "Number"
-msgstr "NÃºmero"
-
-#: admin/ogroups/asterisk/class_phonequeue.inc:316
-#: admin/ogroups/asterisk/class_phonequeue.inc:361
-msgid "asterisk"
-msgstr "asterisk"
-
-#: admin/ogroups/asterisk/class_phonequeue.inc:345
-#: admin/ogroups/asterisk/class_phonequeue.inc:696
-#: admin/conference/class_phoneConferenceGeneric.inc:369
-#: admin/macro/class_gofonMacro.inc:381 admin/macro/class_gofonMacro.inc:465
-#: addons/fonreports/class_fonreport.inc:190
-#: addons/fonreports/class_fonreport.inc:220
-#: personal/phoneaccount/class_phoneAccount.inc:455
-#: personal/phoneaccount/class_phoneAccount.inc:1061
-msgid "GOfon"
-msgstr "GOfon"
-
-#: admin/ogroups/asterisk/class_phonequeue.inc:401
-msgid "Cannot find old queue entry!"
-msgstr "NÃ£o Ã© possÃvel encontrar a entrada da fila antiga!"
-
-#: admin/ogroups/asterisk/class_phonequeue.inc:487
-#, php-format
-msgid ""
-"Found more than one entry named '%s' in queue table. Please inform your "
-"system administrator!"
-msgstr "Encontrada mais de uma entrada com o nome '%s' na tabela de fila. Por favor, informe o administrador do sistema!"
-
-#: admin/ogroups/asterisk/class_phonequeue.inc:728
-#: admin/ogroups/asterisk/class_phonequeue.inc:730
-msgid "telephone number"
-msgstr "nÃºmero de telefone"
-
-#: admin/ogroups/asterisk/class_phonequeue.inc:787
-#: admin/ogroups/asterisk/class_phonequeue.inc:829
-#: admin/conference/class_phoneConferenceGeneric.inc:229
-#: admin/conference/class_phoneConferenceGeneric.inc:233
-#: admin/conference/class_phoneConferenceGeneric.inc:271
-#: admin/macro/class_gofonMacro.inc:343 admin/macro/class_gofonMacro.inc:452
-#: admin/macro/class_gofonMacro.inc:461 admin/macro/class_gofonMacro.inc:499
-#: admin/systems/asterisk/class_phoneGeneric.inc:267
-#: admin/systems/asterisk/class_phoneGeneric.inc:308
-#: addons/fonreports/class_fonreport.inc:220
-#: personal/phoneaccount/class_phoneAccount.inc:1046
-#: personal/phoneaccount/class_phoneAccount.inc:1166
-#: personal/phoneaccount/class_phoneAccount.inc:1172
-#: personal/phoneaccount/class_phoneAccount.inc:1368
-#: personal/phoneaccount/class_phoneAccount.inc:1450
-#: personal/phoneaccount/class_phoneAccount.inc:1528
-msgid "Error"
-msgstr "Erro"
-
-#: admin/ogroups/asterisk/class_phonequeue.inc:802
-#: admin/ogroups/asterisk/class_phonequeue.inc:857
-#: admin/conference/class_phoneConferenceGeneric.inc:682
-#: admin/macro/class_gofonMacro.inc:473 admin/macro/class_gofonMacro.inc:484
-#: admin/macro/class_gofonMacro.inc:521
-#: admin/macro/class_gofonMacroParameters.inc:435
-#: admin/systems/asterisk/class_phoneGeneric.inc:277
-#: admin/systems/asterisk/class_phoneGeneric.inc:432
-#: admin/systems/asterisk/class_phoneGeneric.inc:446
-#: admin/systems/asterisk/class_phoneGeneric.inc:463
-#: admin/systems/services/asterisk/class_serviceAsterisk.inc:121
-#: personal/phoneaccount/class_phoneAccount.inc:1476
-#: personal/phoneaccount/class_phoneAccount.inc:1609
-msgid "LDAP error"
-msgstr "Erro de LDAP"
-
-#: admin/ogroups/asterisk/class_phonequeue.inc:864
-#: admin/systems/asterisk/class_phoneGeneric.inc:472
-#: admin/systems/asterisk/class_phoneGeneric.inc:477
-#: personal/phoneaccount/class_phoneAccount.inc:999
-#: personal/phoneaccount/class_phoneAccount.inc:1012
-#: personal/phoneaccount/class_phoneAccount.inc:1024
-#: personal/phoneaccount/class_phoneAccount.inc:1028
-#: personal/phoneaccount/class_phoneAccount.inc:1031
-#: personal/phoneaccount/class_phoneAccount.inc:1657
+#: admin/systems/asterisk/class_phoneIAX.inc:30
+#: admin/systems/asterisk/class_phoneIAX.inc:34
+#: personal/asterisk/class_asteriskAccount.inc:45
 msgid "Phone"
 msgstr "Telefone"
 
-#: admin/ogroups/asterisk/class_phonequeue.inc:865
-msgid "Phone group"
-msgstr "Grupo de telefone"
-
-#: admin/ogroups/asterisk/class_phonequeue.inc:872
-#: admin/ogroups/asterisk/phonequeue.tpl.c:32
-msgid "Max queue length"
-msgstr "Tamanho mÃ¡ximo da fila"
-
-#: admin/ogroups/asterisk/class_phonequeue.inc:875
-#: admin/ogroups/asterisk/phonequeue.tpl.c:86
-msgid "Allow the called user to transfer his call"
-msgstr "Permitir ao usuÃ¡rio chamado transferir sua chamada"
-
-#: admin/ogroups/asterisk/class_phonequeue.inc:876
-#: admin/ogroups/asterisk/phonequeue.tpl.c:89
-msgid "Allows calling user to transfer call"
-msgstr "Permitir o usuÃ¡rio transferir chamada"
-
-#: admin/ogroups/asterisk/class_phonequeue.inc:877
-#: admin/ogroups/asterisk/phonequeue.tpl.c:92
-msgid "Allow the called to hangup by pressing *"
-msgstr "Permite apertar * para suspender chamado"
-
-#: admin/ogroups/asterisk/class_phonequeue.inc:878
-#: admin/ogroups/asterisk/phonequeue.tpl.c:98
-msgid "Ring instead of playing background music"
-msgstr "Toca ao invÃ©s de tocar a mÃºsica de fundo"
-
-#: admin/ogroups/asterisk/class_phonequeue.inc:879
-#: admin/ogroups/asterisk/phonequeue.tpl.c:95
-msgid "Allows calling to hangup by pressing *"
-msgstr "Permite ligar para suspender pressionando *"
-
-#: admin/ogroups/asterisk/class_phonequeue.inc:881
-#: admin/ogroups/asterisk/phonequeue.tpl.c:47
-msgid "Music on hold"
-msgstr "MÃºsica em espera"
-
-#: admin/ogroups/asterisk/class_phonequeue.inc:882
-msgid "Welcome music"
-msgstr "MÃºsica de boas-vindas"
-
-#: admin/ogroups/asterisk/class_phonequeue.inc:883
-msgid "Report hold time"
-msgstr "RelatÃ³rio do tempo de espera"
-
-#: admin/ogroups/asterisk/class_phonequeue.inc:884
-msgid "'You are next' sound"
-msgstr "Som 'VocÃª Ã© o prÃ³ximo'"
-
-#: admin/ogroups/asterisk/class_phonequeue.inc:885
-msgid "'There are' sound"
-msgstr "Som 'Tem'"
-
-#: admin/ogroups/asterisk/class_phonequeue.inc:886
-msgid "'Call waiting' sound"
-msgstr "Som 'chamada em espera'"
-
-#: admin/ogroups/asterisk/class_phonequeue.inc:887
-msgid "'Thank you' sound"
-msgstr "Som 'obrigado'"
-
-#: admin/ogroups/asterisk/class_phonequeue.inc:888
-msgid "'Minutes' sound"
-msgstr "Som 'minutos'"
-
-#: admin/ogroups/asterisk/class_phonequeue.inc:889
-msgid "'Seconds' sound"
-msgstr "Som 'segundos'"
-
-#: admin/ogroups/asterisk/class_phonequeue.inc:890
-msgid "'Less than' sound"
-msgstr "Som 'menor que'"
-
-#: admin/ogroups/asterisk/class_phonequeue.inc:891
-msgid "Queue phone number"
-msgstr "NÃºmero da fila de telefone"
-
-#: admin/ogroups/asterisk/class_phonequeue.inc:892
-#: admin/conference/class_phoneConferenceGeneric.inc:707
-#: admin/ogroups/asterisk/phonequeue.tpl.c:20
-#: admin/conference/generic.tpl.c:23
-msgid "Language"
-msgstr "Idioma"
-
-#: admin/ogroups/asterisk/class_phonequeue.inc:893
-msgid "Method"
-msgstr "MÃ©todo"
-
-#: admin/ogroups/asterisk/class_phonequeue.inc:894
-#: admin/ogroups/asterisk/phonequeue.tpl.c:83
-msgid "Announce holdtime"
-msgstr "Anunciar tempo de espera"
-
-#: admin/ogroups/asterisk/class_phonequeue.inc:895
-msgid "Announce"
-msgstr "Anunciar"
-
-#: admin/conference/conf-list.xml:11
-msgid "List of conference rooms"
-msgstr "Lista de salas de conferÃªncias"
-
-#: admin/conference/conf-list.xml:15 admin/conference/conf-list.xml:74
-msgid "Conference"
-msgstr "ConferÃªncia"
-
-#: admin/conference/conf-list.xml:41
-#: admin/conference/class_phoneConferenceGeneric.inc:324
-#: admin/conference/class_phoneConferenceGeneric.inc:347
-#: admin/conference/class_phoneConferenceGeneric.inc:702
-#: admin/macro/class_gofonMacro.inc:395 admin/macro/class_gofonMacro.inc:406
-#: admin/macro/macro-list.xml:41
-#: admin/systems/asterisk/class_phoneGeneric.inc:344
-#: admin/systems/asterisk/class_phoneGeneric.inc:348
-#: admin/systems/asterisk/class_phoneGeneric.inc:351
-#: admin/systems/asterisk/class_phoneGeneric.inc:366
-#: admin/systems/asterisk/class_phoneGeneric.inc:482
-#: admin/conference/conf-filter.tpl.c:5 admin/macro/macro-filter.tpl.c:5
-#: admin/macro/parameter.tpl.c:5
-msgid "Name"
-msgstr "Nome"
-
-#: admin/conference/conf-list.xml:49
-#: admin/conference/class_phoneConferenceGeneric.inc:704
-#: admin/macro/class_gofonMacro.inc:547 admin/macro/macro-list.xml:49
-#: admin/systems/asterisk/class_phoneGeneric.inc:484
-#: admin/conference/generic.tpl.c:29 admin/macro/generic.tpl.c:17
-#: admin/systems/asterisk/phone.tpl.c:8
-msgid "Description"
-msgstr "DescriÃ§Ã£o"
-
-#: admin/conference/conf-list.xml:57 admin/macro/macro-list.xml:57
-msgid "Actions"
-msgstr "AÃ§Ãµes"
-
-#: admin/conference/conf-list.xml:68 admin/macro/macro-list.xml:68
-msgid "Create"
-msgstr "Criar"
-
-#: admin/conference/conf-list.xml:86 admin/conference/conf-list.xml:125
-#: admin/macro/macro-list.xml:86 admin/macro/macro-list.xml:125
-msgid "Edit"
-msgstr "Editar"
-
-#: admin/conference/conf-list.xml:93 admin/conference/conf-list.xml:138
-#: admin/macro/macro-list.xml:93 admin/macro/macro-list.xml:138
-msgid "Remove"
-msgstr "Remover"
-
-#: admin/conference/class_phoneConferenceGeneric.inc:233
-#, php-format
-msgid "Cannot delete entry from server '%s' because it seems to be removed!"
-msgstr "NÃ£o Ã© possÃvel deletar entrado do servidor '%s', parece que jÃ¡ foi removido!"
-
-#: admin/conference/class_phoneConferenceGeneric.inc:308
-#, php-format
-msgid ""
-"The previously selected asterisk home server '%s' is no longer available!"
-msgstr "O asterisco do servidor domÃ©stico '%s' previamente selecionado nÃ£o estÃ¡ mais disponÃvel!"
-
-#: admin/conference/class_phoneConferenceGeneric.inc:315
-#: admin/conference/generic.tpl.c:47
-msgid "PIN"
-msgstr "PIN"
-
-#: admin/conference/class_phoneConferenceGeneric.inc:333
-#: admin/conference/class_phoneConferenceGeneric.inc:719
-msgid "Lifetime"
-msgstr "Tempo de vida"
-
-#: admin/conference/class_phoneConferenceGeneric.inc:399
-#: personal/phoneaccount/class_phoneAccount.inc:346
-#: personal/phoneaccount/class_phoneAccount.inc:359
-#: personal/phoneaccount/class_phoneAccount.inc:617
-#: personal/phoneaccount/class_phoneAccount.inc:656
-#: personal/phoneaccount/class_phoneAccount.inc:1519
-#: personal/phoneaccount/class_phoneAccount.inc:1695
-#: admin/conference/remove.tpl.c:2 admin/macro/remove.tpl.c:2
-msgid "Warning"
-msgstr "Aviso"
-
-#: admin/conference/class_phoneConferenceGeneric.inc:400
-#, php-format
-msgid ""
-"FusionDirectory identified problems with your MySQL table definition, please"
-" activate debugging for details."
-msgstr "FusionDirectory identificou problemas com sua tabela definiÃ§Ã£o MySQL, por favor ative o debugging para detalhes"
-
-#: admin/conference/class_phoneConferenceGeneric.inc:606
-#: admin/conference/class_phoneConferenceGeneric.inc:608
-#, php-format
-msgid "'%s' is already assigned to '%s'!"
-msgstr "'%s' jÃ¡ foi atribuÃdo a '%s'!"
-
-#: admin/conference/class_phoneConferenceGeneric.inc:693
-msgid "Phone Conference"
-msgstr "ConferÃªncia telefÃ´nica"
-
-#: admin/conference/class_phoneConferenceGeneric.inc:694
-msgid "Phone conference management"
-msgstr "Gerenciamento da conferÃªncia de telefones"
-
-#: admin/conference/class_phoneConferenceGeneric.inc:696
-msgid "GOfon conference"
-msgstr "Conferencia GOfon"
-
-#: admin/conference/class_phoneConferenceGeneric.inc:698
-msgid "Asterisk conference"
-msgstr "ConferÃªncia asterisk"
-
-#: admin/conference/class_phoneConferenceGeneric.inc:703
-#: admin/macro/class_gofonMacro.inc:546
-#: admin/systems/asterisk/class_phoneGeneric.inc:483
-#: admin/conference/generic.tpl.c:17 admin/macro/generic.tpl.c:14
-#: admin/systems/asterisk/phone.tpl.c:5
-msgid "Base"
-msgstr "Base"
-
-#: admin/conference/class_phoneConferenceGeneric.inc:705
-msgid "Conference PIN"
-msgstr "PIN da conferencia"
-
-#: admin/conference/class_phoneConferenceGeneric.inc:710
-#: admin/conference/generic.tpl.c:44
-msgid "Preset PIN"
-msgstr "PIN predefinido"
-
-#: admin/conference/class_phoneConferenceGeneric.inc:711
-#: admin/conference/generic.tpl.c:50
-msgid "Record conference"
-msgstr "Registro de conferÃªncia"
-
-#: admin/conference/class_phoneConferenceGeneric.inc:712
-#: admin/conference/generic.tpl.c:59
-msgid "Play music on hold"
-msgstr "Tocar mÃºsica em espera"
-
-#: admin/conference/class_phoneConferenceGeneric.inc:713
-msgid "Activate menu"
-msgstr "Ativar menu"
-
-#: admin/conference/class_phoneConferenceGeneric.inc:714
-msgid "Announce user activity"
-msgstr "Anunciar atividade do usuÃ¡rio"
-
-#: admin/conference/class_phoneConferenceGeneric.inc:715
-msgid "Count user"
-msgstr "Conta de usuÃ¡rio"
-
-#: admin/conference/class_phoneConferenceGeneric.inc:716
-msgid "Conference type"
-msgstr "Tipo de conferÃªncia"
-
-#: admin/conference/class_phoneConferenceGeneric.inc:718
-msgid "Format"
-msgstr "Formato"
-
-#: admin/conference/class_phoneConferenceGeneric.inc:720
-#: personal/phoneaccount/class_phoneAccount.inc:1666
-msgid "Telephone number"
-msgstr "NÃºmero de telefone"
-
-#: admin/conference/class_phoneConferenceGeneric.inc:721
-msgid "Owner"
-msgstr "ProprietÃ¡rio"
-
-#: admin/conference/class_phoneConferenceManagment.inc:36
-msgid "Phone Conferences"
-msgstr "ConferÃªncias por telefone"
-
-#: admin/conference/class_phoneConferenceManagment.inc:37
-msgid "Phone Conference management"
-msgstr "Gerenciamento da ConferÃªncia de telefones"
-
-#: admin/macro/class_gofonMacro.inc:202
-#, php-format
-msgid ""
-"Macro could not be removed from server '%s', please check database "
-"consistency!"
-msgstr "Macro nÃ£o pode removida do servidor '%s', favor verificar a consistÃªnsia da base de dados!"
-
-#: admin/macro/class_gofonMacro.inc:264
-#, php-format
-msgid "Application missing in line %s!"
-msgstr "Faltando aplicaÃ§Ã£o na linha %s!"
-
-#: admin/macro/class_gofonMacro.inc:267
-#, php-format
-msgid "Priority missing in line %s!"
-msgstr "Faltando prioridade na linha %s!"
-
-#: admin/macro/class_gofonMacro.inc:271
-#, php-format
-msgid "Extension missing in line %s!"
-msgstr "Faltando extensÃ£o na linha %s!"
-
-#: admin/macro/class_gofonMacro.inc:281
-#, php-format
-msgid "Duplicate combination of 'extension' and 'priority' in line %s!"
-msgstr "Duplicadr combinaÃ§Ã£o da 'extensÃ£o' e da 'prioridade' na linha %s!"
-
-#: admin/macro/class_gofonMacro.inc:317
-#, php-format
-msgid ""
-"Macro could not be added to server '%s', please check database consistency!"
-msgstr "Macro nÃ£o pode ser adicionada ao servidor '%s', por favor, verifique a consistÃªncia do seu banco de dados!"
-
-#: admin/macro/class_gofonMacro.inc:410
-msgid "Name can be 20 characters at maximum!"
-msgstr "Nome pode ter no mÃ¡ximo 20 caracteres!"
-
-#: admin/macro/class_gofonMacro.inc:419
-msgid "Macro is still in use!"
-msgstr "Macro continua em uso!"
-
-#: admin/macro/class_gofonMacro.inc:426
-msgid "Macro is empty!"
-msgstr "Macro estÃ¡ vazia!"
-
-#: admin/macro/class_gofonMacro.inc:452
-#: admin/systems/asterisk/class_phoneGeneric.inc:267
-#, php-format
-msgid "Cannot delete entry because it is still in use by '%s'!"
-msgstr "NÃ£o Ã© possivel excluir a entrada, pois ela estÃ¡ em uso por '%s'!"
-
-#: admin/macro/class_gofonMacro.inc:465
-#: addons/fonreports/class_fonreport.inc:190
-#: personal/phoneaccount/class_phoneAccount.inc:455
-#: personal/phoneaccount/class_phoneAccount.inc:1061
-#: personal/phoneaccount/class_phoneAccount.inc:1567
-msgid "Configuration error"
-msgstr "Erro de configuraÃ§Ã£o"
-
-#: admin/macro/class_gofonMacro.inc:536 admin/macro/class_gofonMacro.inc:541
-msgid "Asterisk macro"
-msgstr "Macro asterisk"
-
-#: admin/macro/class_gofonMacro.inc:537
-msgid "Asterisk macro management"
-msgstr "GestÃ£o macro do Asterisk"
-
-#: admin/macro/class_gofonMacro.inc:539
-msgid "GOfon macro"
-msgstr "Macro GOfon"
-
-#: admin/macro/class_gofonMacro.inc:545 admin/macro/generic.tpl.c:2
-#: admin/macro/generic.tpl.c:5 admin/macro/paste_generic.tpl.c:2
-#: admin/macro/paste_generic.tpl.c:5
-msgid "Macro name"
-msgstr "Nome da macro"
-
-#: admin/macro/class_gofonMacro.inc:548 admin/macro/generic.tpl.c:8
-msgid "Display name"
-msgstr "Nome de exibiÃ§Ã£o"
-
-#: admin/macro/class_gofonMacro.inc:549
-msgid "Macro content and parameter"
-msgstr "ConteÃºdo e parÃ¢metro da macro"
-
-#: admin/macro/class_gofonMacro.inc:550
-msgid "Visibility flag"
-msgstr "Visibilidade da bandeira"
-
-#: admin/macro/class_gofonMacroManagement.inc:36
-msgid "Phone Macros"
-msgstr "Macros de telefones"
-
-#: admin/macro/class_gofonMacroManagement.inc:37
-msgid "Phone Macros management"
-msgstr "Gerenciador de macros de telefones"
-
-#: admin/macro/macro-list.xml:11
-msgid "List of macros"
-msgstr "Lista de macros"
-
-#: admin/macro/macro-list.xml:15 admin/macro/macro-list.xml:74
-msgid "Macro"
-msgstr "Macro"
-
-#: admin/macro/class_gofonMacroParameters.inc:58
-msgid "Parameter"
-msgstr "ParÃ¢metro"
-
-#: admin/macro/class_gofonMacroParameters.inc:59
-msgid "Asterisk macro parameter"
-msgstr "ParÃ¢metro macro asterisk"
-
-#: admin/macro/class_gofonMacroParameters.inc:234
-#: personal/phoneaccount/generic.tpl.c:35
-msgid "Phone macro"
-msgstr "Macro de telefones"
-
-#: admin/macro/class_gofonMacroParameters.inc:290
-msgid "String"
-msgstr "String"
-
-#: admin/macro/class_gofonMacroParameters.inc:291
-msgid "Combobox"
-msgstr "Combobox"
-
-#: admin/macro/class_gofonMacroParameters.inc:292
-msgid "Bool"
-msgstr "Bool"
-
-#: admin/macro/class_gofonMacroParameters.inc:298
-msgid "Delete unused"
-msgstr "Excluir nÃ£o utilizados"
-
-#: admin/macro/class_gofonMacroParameters.inc:374
-#, php-format
-msgid "Parameter %s contains invalid character. '!,#' is used as delimiter!"
-msgstr "ParÃ¢metro %s contem um caracter invÃ¡lido. '!,#' Ã© usado como delimitador!"
-
-#: admin/macro/class_gofonMacroParameters.inc:379
-#, php-format
-msgid "Parameter %s is invalid!"
-msgstr "ParÃ¢metro %s Ã© invÃ¡lido!"
-
-#: admin/macro/class_gofonMacroParameters.inc:408
-#: personal/phoneaccount/class_phoneAccount.inc:1600
-msgid "Information"
-msgstr "InformaÃ§Ã£o"
-
-#: admin/macro/class_gofonMacroParameters.inc:408
-msgid ""
-"Number of parameters for this macro has changed. Please update all users "
-"using it!"
-msgstr "NÃºmero de parÃ¢metros para esta macro mudou. Por favor, atualize todos usuÃ¡rios usando-a!"
-
-#: admin/systems/asterisk/class_phoneGeneric.inc:151
-msgid "phone"
-msgstr "telefone"
-
-#: admin/systems/asterisk/class_phoneGeneric.inc:230
-msgid "yes"
-msgstr "sim"
-
-#: admin/systems/asterisk/class_phoneGeneric.inc:230
-msgid "no"
-msgstr "nÃ£o"
-
-#: admin/systems/asterisk/class_phoneGeneric.inc:247
-msgid "dynamic"
-msgstr "dinÃ¢mico"
-
-#: admin/systems/asterisk/class_phoneGeneric.inc:247
-msgid "Networksettings"
-msgstr "ConfiguraÃ§Ãµes de rede"
-
-#: admin/systems/asterisk/class_phoneGeneric.inc:330
-#: admin/systems/asterisk/class_phoneGeneric.inc:333
-msgid "IP address"
-msgstr "EndereÃ§o IP"
-
-#: admin/systems/asterisk/class_phoneGeneric.inc:473
-msgid "Phone information"
+#: admin/systems/asterisk/class_phoneIAX.inc:31
+msgid "Asterisk phone"
 msgstr ""
 
-#: admin/systems/asterisk/class_phoneGeneric.inc:476
-#: personal/phoneaccount/class_phoneAccount.inc:1668
+#: admin/systems/asterisk/class_phoneIAX.inc:33
 msgid "Phone hardware"
 msgstr "Hardware de telefone"
 
-#: admin/systems/asterisk/class_phoneGeneric.inc:485
-msgid "SIP Mode"
-msgstr "Modo SIP"
-
-#: admin/systems/asterisk/class_phoneGeneric.inc:486
-msgid "SIP DTMF mode"
-msgstr "Modo DTMF SIP"
-
-#: admin/systems/asterisk/class_phoneGeneric.inc:487
-msgid "SIP Default ip"
-msgstr "Ip SIP padrÃ£o"
-
-#: admin/systems/asterisk/class_phoneGeneric.inc:488
-msgid "SIP Qualify"
-msgstr "QualificaÃ§Ã£o SIP"
-
-#: admin/systems/asterisk/class_phoneGeneric.inc:489
-msgid "IAX authentication type"
-msgstr "Tipo de autenticaÃ§Ã£o IAX"
-
-#: admin/systems/asterisk/class_phoneGeneric.inc:490
-msgid "IAX secret"
-msgstr "Segredo IAX"
-
-#: admin/systems/asterisk/class_phoneGeneric.inc:491
-msgid "IAX account code"
-msgstr "CÃ³digo de conta IAX"
-
-#: admin/systems/asterisk/class_phoneGeneric.inc:492
-msgid "IAX trunk lines"
-msgstr "Linhas de tronco IAX"
+#: admin/systems/asterisk/class_phoneIAX.inc:46
+#: personal/asterisk/class_asteriskAccount.inc:42
+msgid "Telephone"
+msgstr "Telefone"
 
-#: admin/systems/asterisk/class_phoneGeneric.inc:493
-msgid "IAX permit settings"
-msgstr "Permitir configuraÃ§Ãµes IAX"
+#: admin/systems/asterisk/class_phoneIAX.inc:49
+msgid "Name"
+msgstr "Nome"
 
-#: admin/systems/asterisk/class_phoneGeneric.inc:494
-msgid "IAX deny settings"
-msgstr "Negar definiÃ§Ãµes IAX"
+#: admin/systems/asterisk/class_phoneIAX.inc:49
+msgid "Name of this phone"
+msgstr ""
 
-#: admin/systems/asterisk/class_phoneGeneric.inc:495
-msgid "CAPI MSN"
-msgstr "CAPI MSN"
+#: admin/systems/asterisk/class_phoneIAX.inc:53
+msgid "Account name"
+msgstr "Nome de conta"
 
-#: admin/systems/asterisk/class_phoneGeneric.inc:496
-msgid "Hardware type"
-msgstr "Tipo de hardware"
+#: admin/systems/asterisk/class_phoneIAX.inc:53
+msgid "Name of the account"
+msgstr ""
 
 #: admin/systems/services/asterisk/class_serviceAsterisk.inc:35
 msgid "VoIP database information"
@@ -750,6 +95,10 @@ msgid ""
 "these objects '%s'."
 msgstr "VocÃª nÃ£o pode remover a extensÃ£o do banco de dados asterisk, ele ainda estÃ¡ em uso por esses objetos '%s'."
 
+#: admin/systems/services/asterisk/class_serviceAsterisk.inc:121
+msgid "LDAP error"
+msgstr "Erro de LDAP"
+
 #: admin/systems/services/asterisk/class_serviceAsterisk.inc:140
 msgid "VoIP service (asterisk)"
 msgstr "ServiÃ§o VoIP (asterisk)"
@@ -762,211 +111,20 @@ msgstr "VoIP - gerenciamento do asterisk"
 msgid "Services"
 msgstr "ServiÃ§os"
 
-#: addons/fonreports/class_fonreport.inc:232
-msgid "Insufficient permissions"
-msgstr "PermissÃµes insuficientes"
-
-#: addons/fonreports/class_fonreport.inc:251
-msgid "Y-M-D"
-msgstr "A-M-D"
-
-#: addons/fonreports/class_fonreport.inc:418
-#: addons/fonreports/class_fonreport.inc:419
-#: addons/fonreports/class_fonreport.inc:424 addons/fonreports/main.inc:46
-msgid "Phone reports"
-msgstr "RelatÃ³rios d"
-
-#: addons/fonreports/class_fonreport.inc:419
-msgid "All entries are readonly"
-msgstr "Todas as entradas somente leitura"
-
-#: addons/fonreports/class_fonreport.inc:428
-#: addons/fonreports/contents.tpl.c:32
-msgid "Date"
-msgstr "Data"
-
-#: addons/fonreports/class_fonreport.inc:429
-#: addons/fonreports/contents.tpl.c:35
-msgid "Source"
-msgstr "Fonte"
-
-#: addons/fonreports/class_fonreport.inc:430
-#: addons/fonreports/contents.tpl.c:38
-msgid "Destination"
-msgstr "Destino"
-
-#: addons/fonreports/class_fonreport.inc:431
-#: addons/fonreports/contents.tpl.c:41
-msgid "Channel"
-msgstr "Canal"
-
-#: addons/fonreports/class_fonreport.inc:432
-msgid "Application called"
-msgstr "Chamado de aplicaÃ§Ã£o"
-
-#: addons/fonreports/class_fonreport.inc:433
-msgid "Disposition"
-msgstr "DisposiÃ§Ã£o"
-
-#: addons/fonreports/class_fonreport.inc:434
-#: addons/fonreports/contents.tpl.c:50
-msgid "Duration"
-msgstr "DuraÃ§Ã£o"
-
-#: personal/phoneaccount/class_phoneAccount.inc:176
-msgid "automatic"
-msgstr "automÃ¡tico"
-
-#: personal/phoneaccount/class_phoneAccount.inc:212
-msgid "no macro"
-msgstr "Nenhuma macro"
-
-#: personal/phoneaccount/class_phoneAccount.inc:240
-msgid "undefined"
-msgstr "indefinido"
-
-#: personal/phoneaccount/class_phoneAccount.inc:359
-#, php-format
-msgid ""
-"Cannot identify telephone extension in database, please try to save again."
-msgstr "NÃ£o Ã© possÃvel identificar a extensÃ£o do telefone no banco de dados, por favor, tente salvar novamente."
-
-#: personal/phoneaccount/class_phoneAccount.inc:577
-#: personal/phoneaccount/class_phoneAccount.inc:595
-msgid "Abort saving entries to keep the database consistent."
-msgstr "Abortar o processo de salvar as entradas para manter o banco de dados consistente."
-
-#: personal/phoneaccount/class_phoneAccount.inc:618
-#: personal/phoneaccount/class_phoneAccount.inc:657
-#: personal/phoneaccount/class_phoneAccount.inc:1520
-#, php-format
-msgid ""
-"FusionDirectory identified problems with your database table definition!"
-msgstr "FusionDirectory identificou problemas com a definiÃ§Ã£o da tabela do seu banco de dados!"
-
-#: personal/phoneaccount/class_phoneAccount.inc:1023
-msgid "Remove phone account"
-msgstr "Remover conta de telefone"
-
-#: personal/phoneaccount/class_phoneAccount.inc:1027
-#: personal/phoneaccount/class_phoneAccount.inc:1030
-msgid "Create phone account"
-msgstr "Criar conta de telefone"
-
-#: personal/phoneaccount/class_phoneAccount.inc:1028
-msgid "User uid"
-msgstr "UsuÃ¡rio uid"
-
-#: personal/phoneaccount/class_phoneAccount.inc:1046
-msgid "Selected macro is not available anymore!"
-msgstr "A macro selecionada nÃ£o estÃ¡ mais disponÃvel!"
-
-#: personal/phoneaccount/class_phoneAccount.inc:1221
-msgid "Choose your private phone"
-msgstr "Escolha seu telefone privado"
-
-#: personal/phoneaccount/class_phoneAccount.inc:1346
-msgid ""
-"There must be at least one server with an asterisk database to create a "
-"phone account."
-msgstr "Deve haver pelo menos um servidor com um banco de dados asterisk para criar uma conta de telefone"
-
-#: personal/phoneaccount/class_phoneAccount.inc:1354
-#: personal/phoneaccount/class_phoneAccount.inc:1357
-#: personal/phoneaccount/generic.tpl.c:29
-#: personal/phoneaccount/paste_generic.tpl.c:11
-msgid "Voicemail PIN"
-msgstr "PIN do correio de voz"
-
-#: personal/phoneaccount/class_phoneAccount.inc:1354
-msgid "Between 1-4 charactes"
-msgstr "Entre 1-4 caracteres"
-
-#: personal/phoneaccount/class_phoneAccount.inc:1362
-#: personal/phoneaccount/generic.tpl.c:32
-#: personal/phoneaccount/paste_generic.tpl.c:14
-msgid "Phone PIN"
-msgstr "PIN do telefone"
-
-#: personal/phoneaccount/class_phoneAccount.inc:1394
-#: admin/conference/generic.tpl.c:38 admin/conference/paste_generic.tpl.c:8
-msgid "Phone number"
-msgstr "NÃºmero de telefone"
-
-#: personal/phoneaccount/class_phoneAccount.inc:1402
-#, php-format
-msgid "macro parameter %s"
-msgstr "%s parÃ¢metro macro"
-
-#: personal/phoneaccount/class_phoneAccount.inc:1450
-msgid "An error occured while updating the database entries!"
-msgstr "Ocorreu um erro durante a atualizaÃ§Ã£o das entradas do banco de dados!"
-
-#: personal/phoneaccount/class_phoneAccount.inc:1567
-msgid "Was not able to found any asterisk server"
-msgstr "NÃ£o foi capaz de encontrar nenhum servidor asterisk"
-
-#: personal/phoneaccount/class_phoneAccount.inc:1600
-#, php-format
-msgid "User '%s' has been removed from phone queue '%s'."
-msgstr "UsuÃ¡rio '%s' foi removido da fila de telefones '%s'."
-
-#: personal/phoneaccount/class_phoneAccount.inc:1637
-#: personal/phoneaccount/class_phoneAccount.inc:1639
-#, php-format
-msgid "The specified telephonenumber '%s' is already assigned to '%s'."
-msgstr "O nÃºmero de telefone '%s' especificado jÃ¡ foi atribuÃdo para '%s'."
-
-#: personal/phoneaccount/class_phoneAccount.inc:1649
-#, php-format
-msgid ""
-"The previously selected asterisk home server (%s) is no longer available. "
-"Remove aborted."
-msgstr "O servidor asterisk previamente selecionado(%s) nÃ£o estÃ¡ disponÃvel. Remover abortado."
-
-#: personal/phoneaccount/class_phoneAccount.inc:1658
-msgid "Phone account settings"
-msgstr "DefiniÃ§Ãµes da conta de telefone"
-
-#: personal/phoneaccount/class_phoneAccount.inc:1667
-msgid "Macro settings"
-msgstr "DefiniÃ§Ãµes maiores"
-
-#: personal/phoneaccount/class_phoneAccount.inc:1670
-msgid "Phone context"
-msgstr "Contexto de telefone"
-
-#: personal/phoneaccount/class_phoneAccount.inc:1671
-msgid "Voice mail context"
-msgstr "Contexto de correio de voz"
-
-#: personal/phoneaccount/class_phoneAccount.inc:1672
-msgid "Telephone pin"
-msgstr "Pin do telefone"
-
-#: personal/phoneaccount/class_phoneAccount.inc:1673
-msgid "Voicemail pin"
-msgstr "PIN correio de voz"
-
-#: personal/phoneaccount/class_phoneAccount.inc:1695
-#, php-format
-msgid "You need to configure %s contexts first"
-msgstr "VocÃª precisa configurar o contexto %s primeiro."
-
-#: personal/phoneaccount/main.inc:124
-msgid "Click the 'Edit' button below to change informations in this dialog"
-msgstr "Clique no botÃ£o 'Editar' abaixo para mudar as informaÃ§Ãµes neste diÃ¡logo"
-
-#: personal/phoneaccount/main.inc:134
-#: personal/phoneaccount/paste_generic.tpl.c:2
-msgid "Phone settings"
-msgstr "ConfiguraÃ§Ãµes de telefone"
-
+#: personal/asterisk/class_asteriskAccount.inc:30
 #: config/asterisk/class_asteriskPluginConfig.inc:28
 #: config/asterisk/class_asteriskPluginConfig.inc:41
 msgid "Asterisk"
 msgstr "Asterisk"
 
+#: personal/asterisk/class_asteriskAccount.inc:31
+msgid "Asterisk account"
+msgstr ""
+
+#: personal/asterisk/class_asteriskAccount.inc:45
+msgid "Select the phone associated to this user"
+msgstr ""
+
 #: config/asterisk/class_asteriskPluginConfig.inc:29
 msgid "Asterisk plugin configuration"
 msgstr "ConfiguraÃ§Ã£o do plugin asterisk"
@@ -1014,338 +172,3 @@ msgstr "Contexto de correio de voz"
 #: config/asterisk/class_asteriskPluginConfig.inc:72
 msgid "Available voicemail contexts"
 msgstr "Contextos disponÃveis no correio de voz"
-
-#: admin/ogroups/asterisk/phonequeue.tpl.c:2
-msgid ""
-"Only users with the same asterisk home server will be included to this "
-"queue."
-msgstr "Apenas usuÃ¡rios com o mesmo servidor home asteriskvÃ£o ser inclusos nesse grupo"
-
-#: admin/ogroups/asterisk/phonequeue.tpl.c:5
-#: personal/phoneaccount/generic.tpl.c:2
-#: personal/phoneaccount/paste_generic.tpl.c:5
-msgid "Phone numbers"
-msgstr "NÃºmeros de telefone"
-
-#: admin/ogroups/asterisk/phonequeue.tpl.c:8
-msgid "Up"
-msgstr "Subir"
-
-#: admin/ogroups/asterisk/phonequeue.tpl.c:11
-msgid "Down"
-msgstr "Descer"
-
-#: admin/ogroups/asterisk/phonequeue.tpl.c:14
-#: admin/conference/generic.tpl.c:41
-msgid "Options"
-msgstr "OpÃ§Ãµes"
-
-#: admin/ogroups/asterisk/phonequeue.tpl.c:29
-msgid "Strategy"
-msgstr "EstratÃ©gia"
-
-#: admin/ogroups/asterisk/phonequeue.tpl.c:38
-msgid "(in seconds)"
-msgstr "(em segundos)"
-
-#: admin/ogroups/asterisk/phonequeue.tpl.c:41
-msgid "Queue sound setup"
-msgstr "ConfiguraÃ§Ãµes da fila de som"
-
-#: admin/ogroups/asterisk/phonequeue.tpl.c:44
-msgid "Use music on hold instead of ringing"
-msgstr "Use a mÃºsica em espera ao invÃ©s de tocar"
-
-#: admin/ogroups/asterisk/phonequeue.tpl.c:50
-msgid "Welcome sound file"
-msgstr "Arquivo de som de boas-vindas"
-
-#: admin/ogroups/asterisk/phonequeue.tpl.c:53
-msgid "Announce message"
-msgstr "Mensagem de anÃºncio"
-
-#: admin/ogroups/asterisk/phonequeue.tpl.c:56
-msgid "Sound file for 'You are next ...'"
-msgstr "Arquivo de som 'VocÃª Ã© o prÃ³ximo ...'"
-
-#: admin/ogroups/asterisk/phonequeue.tpl.c:59
-msgid "'There are ...'"
-msgstr "'Tem ...'"
-
-#: admin/ogroups/asterisk/phonequeue.tpl.c:62
-msgid "'... calls waiting'"
-msgstr "'... chamada esperando'"
-
-#: admin/ogroups/asterisk/phonequeue.tpl.c:65
-msgid "'Thank you' message"
-msgstr "Mensagem 'Obrigado'"
-
-#: admin/ogroups/asterisk/phonequeue.tpl.c:68
-msgid "'minutes' sound file"
-msgstr "Arquivo de som 'minutos'"
-
-#: admin/ogroups/asterisk/phonequeue.tpl.c:71
-msgid "'seconds' sound file"
-msgstr "Arquivo de som 'segundos'"
-
-#: admin/ogroups/asterisk/phonequeue.tpl.c:74
-msgid "Hold sound file"
-msgstr "Manter arquivo de som"
-
-#: admin/ogroups/asterisk/phonequeue.tpl.c:77
-msgid "Less Than sound file"
-msgstr "Sem tal arquivo de som"
-
-#: admin/ogroups/asterisk/phonequeue.tpl.c:80
-msgid "Phone attributes "
-msgstr "Atributos do telefone"
-
-#: admin/conference/conf-filter.tpl.c:2 admin/macro/macro-filter.tpl.c:2
-#: addons/fonreports/contents.tpl.c:2
-msgid "Filter"
-msgstr "Filtro"
-
-#: admin/conference/generic.tpl.c:2
-msgid "Properties"
-msgstr "Propriedades"
-
-#: admin/conference/generic.tpl.c:5 admin/conference/paste_generic.tpl.c:2
-msgid "Conference name"
-msgstr "Nome da conferÃªncia"
-
-#: admin/conference/generic.tpl.c:8 admin/conference/paste_generic.tpl.c:5
-msgid "Name of conference to create"
-msgstr "Nome da conferÃªncia a ser criada"
-
-#: admin/conference/generic.tpl.c:11
-msgid "Type"
-msgstr "Tipo"
-
-#: admin/conference/generic.tpl.c:14
-msgid "Choose subtree to place conference in"
-msgstr "Escolher sub-Ã¡rvore para local da conferencia"
-
-#: admin/conference/generic.tpl.c:26
-msgid "Select language"
-msgstr "Selecione o idioma"
-
-#: admin/conference/generic.tpl.c:32
-msgid "Descriptive text for department"
-msgstr "Texto descritivo para o departamento"
-
-#: admin/conference/generic.tpl.c:35
-msgid "Lifetime (in days)"
-msgstr "Tempo de vida (em dias)"
-
-#: admin/conference/generic.tpl.c:53
-msgid "Sound file format"
-msgstr "Formato do arquivo de som"
-
-#: admin/conference/generic.tpl.c:56
-msgid "Choose subtree to place department in"
-msgstr "Escolha a sub-arvore para o local do departamento"
-
-#: admin/conference/generic.tpl.c:62
-msgid "Activate session menu"
-msgstr "Ative o menu de sessÃ£o"
-
-#: admin/conference/generic.tpl.c:65
-msgid "Announce users joining or leaving the conference"
-msgstr "Anunciar usuÃ¡rios que entram e deixam a conferÃªncia"
-
-#: admin/conference/generic.tpl.c:68
-msgid "Count users"
-msgstr "Contagem de usuÃ¡rios"
-
-#: admin/conference/remove.tpl.c:5 admin/macro/remove.tpl.c:5
-msgid ""
-"Please double check if you really want to do this since there is no way for "
-"FusionDirectory to get your data back."
-msgstr "Favor clicar duas vezes se vocÃª quer realmete executar esta aÃ§Ã£o. O FusionDirectory nÃ£o poderÃ¡ desfazÃª-la."
-
-#: admin/conference/remove.tpl.c:8 admin/macro/remove.tpl.c:8
-msgid "So - if you're sure - press 'Delete' to continue or 'Cancel' to abort."
-msgstr "Se vocÃª tem certeza, pressione 'Delete' para continuar ou 'Cancel' para desistir."
-
-#: admin/macro/generic.tpl.c:11
-msgid "Macro name to be displayed"
-msgstr "Nome da macro a ser exibido"
-
-#: admin/macro/generic.tpl.c:20
-msgid "Visible for user"
-msgstr "VisÃvel para o usuÃ¡rio"
-
-#: admin/macro/generic.tpl.c:23
-msgid "Macro text"
-msgstr "Texto da macro"
-
-#: admin/macro/parameter.tpl.c:2
-msgid "Argument"
-msgstr "Argumento"
-
-#: admin/macro/parameter.tpl.c:8
-msgid "type"
-msgstr "tipo"
-
-#: admin/macro/parameter.tpl.c:11
-msgid "Default value"
-msgstr "Valor padrÃ£o"
-
-#: admin/macro/parameter.tpl.c:14
-msgid "You are not allowed to view the macro parameter settings"
-msgstr "VocÃª nÃ£o tem permissÃ£o para exibir as configuraÃ§Ãµes de parÃ¢metros macro"
-
-#: admin/systems/asterisk/phonesettings.tpl.c:2
-msgid "Advanced phone settings"
-msgstr "ConfiguraÃ§Ãµes avanÃ§adas de telefone"
-
-#: admin/systems/asterisk/phonesettings.tpl.c:5
-msgid "Phone type"
-msgstr "Tipo de telefone"
-
-#: admin/systems/asterisk/phonesettings.tpl.c:8
-#: admin/systems/asterisk/phonesettings.tpl.c:14
-#: admin/systems/asterisk/phonesettings.tpl.c:20
-#: admin/systems/asterisk/phonesettings.tpl.c:26
-#: admin/systems/asterisk/phonesettings.tpl.c:35
-#: admin/systems/asterisk/phonesettings.tpl.c:47
-#: admin/systems/asterisk/phonesettings.tpl.c:65
-msgid "Choose a phone type"
-msgstr "Escolha um tipo de telefone"
-
-#: admin/systems/asterisk/phonesettings.tpl.c:11
-msgid "Mode"
-msgstr "Modo"
-
-#: admin/systems/asterisk/phonesettings.tpl.c:17
-msgid "DTMF mode"
-msgstr "Modo DTMF"
-
-#: admin/systems/asterisk/phonesettings.tpl.c:23
-#: admin/systems/asterisk/phonesettings.tpl.c:38
-msgid "Default IP"
-msgstr "IP padrÃ£o"
-
-#: admin/systems/asterisk/phonesettings.tpl.c:29
-#: admin/systems/asterisk/phonesettings.tpl.c:41
-msgid "Response timeout"
-msgstr "Tempo limite de resposta"
-
-#: admin/systems/asterisk/phonesettings.tpl.c:32
-msgid "Modus"
-msgstr "Modo"
-
-#: admin/systems/asterisk/phonesettings.tpl.c:44
-msgid "Authtype"
-msgstr "Tipo de autenticaÃ§Ã£o"
-
-#: admin/systems/asterisk/phonesettings.tpl.c:50
-msgid "Secret"
-msgstr "Secreto"
-
-#: admin/systems/asterisk/phonesettings.tpl.c:53
-msgid "GoFonInkeys"
-msgstr "GoFoninkeys"
-
-#: admin/systems/asterisk/phonesettings.tpl.c:56
-msgid "GoFonOutKeys"
-msgstr "GoFonOutKeys"
-
-#: admin/systems/asterisk/phonesettings.tpl.c:59
-msgid "Account code"
-msgstr "CÃ³digo da conta"
-
-#: admin/systems/asterisk/phonesettings.tpl.c:62
-msgid "Trunk lines"
-msgstr "Linhas de tronco"
-
-#: admin/systems/asterisk/phonesettings.tpl.c:68
-msgid "Hosts that are allowed to connect"
-msgstr "Os hosts que tÃªm permissÃ£o pra conectar"
-
-#: admin/systems/asterisk/phonesettings.tpl.c:71
-#: admin/systems/asterisk/phonesettings.tpl.c:77
-msgid "List of alternative mail addresses"
-msgstr "Lista de endereÃ§os alternativos de correio"
-
-#: admin/systems/asterisk/phonesettings.tpl.c:74
-msgid "Hosts that are not allowed to connect"
-msgstr "Hospedagem que nÃ£o Ã© possÃvel se conectar"
-
-#: admin/systems/asterisk/phonesettings.tpl.c:80
-msgid "MSN"
-msgstr "MSN"
-
-#: admin/systems/asterisk/phone.tpl.c:2
-msgid "Phone name"
-msgstr "Nome do telefone"
-
-#: addons/fonreports/contents.tpl.c:5
-msgid "Search for"
-msgstr "Procurar por"
-
-#: addons/fonreports/contents.tpl.c:8
-msgid "Enter user name to search for"
-msgstr "Digite o nome de usuÃ¡rio a ser pesquisado"
-
-#: addons/fonreports/contents.tpl.c:11 addons/fonreports/contents.tpl.c:26
-msgid "in"
-msgstr "dentro"
-
-#: addons/fonreports/contents.tpl.c:14
-msgid "Select subtree to base search on"
-msgstr "Selecionar sub-arvore para busca"
-
-#: addons/fonreports/contents.tpl.c:17
-msgid "on"
-msgstr "em"
-
-#: addons/fonreports/contents.tpl.c:20
-msgid "Select server to search on"
-msgstr "Selecione o servidor para pesquisar em"
-
-#: addons/fonreports/contents.tpl.c:23
-msgid "during"
-msgstr "durante"
-
-#: addons/fonreports/contents.tpl.c:29
-msgid "Search"
-msgstr "Pesquisar"
-
-#: addons/fonreports/contents.tpl.c:44
-msgid "Application"
-msgstr "AplicaÃ§Ã£o"
-
-#: addons/fonreports/contents.tpl.c:47
-msgid "Status"
-msgstr "Estado"
-
-#: addons/fonreports/contents.tpl.c:53
-msgid "Search returned no results..."
-msgstr "A pesquisa nÃ£o retornou resultados..."
-
-#: personal/phoneaccount/generic.tpl.c:5
-#: personal/phoneaccount/paste_generic.tpl.c:8
-msgid "Telephone hardware"
-msgstr "Hardware do telefone"
-
-#: personal/phoneaccount/generic.tpl.c:8
-msgid "Telephone"
-msgstr "Telefone"
-
-#: personal/phoneaccount/generic.tpl.c:14
-msgid "Select the accounts home server"
-msgstr "Selecionar as contas do servidor principal"
-
-#: personal/phoneaccount/generic.tpl.c:17
-msgid "Context"
-msgstr "Contexto"
-
-#: personal/phoneaccount/generic.tpl.c:20
-#: personal/phoneaccount/generic.tpl.c:26
-msgid "Select the accounts context"
-msgstr "Selecionar as contas de contexto"
-
-#: personal/phoneaccount/generic.tpl.c:23
-msgid "Voicemail context"
-msgstr "Contexto de correio de voz"
diff --git a/asterisk/locale/ru/fusiondirectory.po b/asterisk/locale/ru/fusiondirectory.po
index 488ccfc48703aef018d7a52decf76b7d3379c263..df32b1fc063b2f054785b7ec9d0f788eb27e814c 100644
--- a/asterisk/locale/ru/fusiondirectory.po
+++ b/asterisk/locale/ru/fusiondirectory.po
@@ -3,705 +3,53 @@
 # This file is distributed under the same license as the PACKAGE package.
 # 
 # Translators:
-#  Valia V. Vaneeva <fattie@altlinux.ru>, 2004
 msgid ""
 msgstr ""
-"Project-Id-Version: FusionDirectory-108\n"
+"Project-Id-Version: FusionDirectory-109\n"
 "Report-Msgid-Bugs-To: documentation@lists.fusiondirectory.org\n"
-"POT-Creation-Date: 2015-03-31 11:49+0200\n"
-"PO-Revision-Date: 2015-03-31 10:03+0000\n"
+"POT-Creation-Date: 2014-12-15 17:47+0100\n"
+"PO-Revision-Date: 2015-04-07 13:01+0000\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>\n"
-"Language-Team: Russian (http://www.transifex.com/projects/p/FusionDirectory-108/language/ru/)\n"
+"Language-Team: Russian (http://www.transifex.com/projects/p/FusionDirectory-109/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=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);\n"
+"Plural-Forms: nplurals=4; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%10<=4 && (n%100<12 || n%100>14) ? 1 : n%10==0 || (n%10>=5 && n%10<=9) || (n%100>=11 && n%100<=14)? 2 : 3);\n"
 
-#: admin/ogroups/asterisk/class_phonequeue.inc:110
-#: admin/conference/class_phoneConferenceGeneric.inc:104
-#: personal/phoneaccount/class_phoneAccount.inc:148
-msgid "Obsolete entry"
-msgstr ""
-
-#: admin/ogroups/asterisk/class_phonequeue.inc:110
-#: admin/conference/class_phoneConferenceGeneric.inc:104
-#: personal/phoneaccount/class_phoneAccount.inc:148
-#, php-format
-msgid ""
-"The current home server is not available anymore. It will be moved to '%s' "
-"if you save this entry!"
-msgstr ""
-
-#: admin/ogroups/asterisk/class_phonequeue.inc:140
-msgid "ring all"
-msgstr ""
-
-#: admin/ogroups/asterisk/class_phonequeue.inc:141
-msgid "round robin"
-msgstr ""
-
-#: admin/ogroups/asterisk/class_phonequeue.inc:142
-msgid "least recently called"
-msgstr ""
-
-#: admin/ogroups/asterisk/class_phonequeue.inc:143
-msgid "fewest completed calls"
-msgstr ""
-
-#: admin/ogroups/asterisk/class_phonequeue.inc:144
-msgid "random"
-msgstr ""
-
-#: admin/ogroups/asterisk/class_phonequeue.inc:145
-msgid "round robin with memory"
-msgstr ""
-
-#: admin/ogroups/asterisk/class_phonequeue.inc:180
-msgid "Remove the phone queue from this Account"
-msgstr ""
-
-#: admin/ogroups/asterisk/class_phonequeue.inc:181
-#: admin/ogroups/asterisk/class_phonequeue.inc:184
-msgid "phone queue"
-msgstr ""
-
-#: admin/ogroups/asterisk/class_phonequeue.inc:183
-msgid "Create phone queue"
-msgstr ""
-
-#: admin/ogroups/asterisk/class_phonequeue.inc:272
-msgid ""
-"There must be at least one server with an asterisk database to create a "
-"phone queue."
-msgstr ""
-
-#: admin/ogroups/asterisk/class_phonequeue.inc:275
-#: admin/ogroups/asterisk/class_phonequeue.inc:873
-#: admin/conference/class_phoneConferenceGeneric.inc:709
-#: personal/phoneaccount/class_phoneAccount.inc:1350
-#: personal/phoneaccount/class_phoneAccount.inc:1669
-#: admin/ogroups/asterisk/phonequeue.tpl.c:17
-#: admin/conference/generic.tpl.c:20 personal/phoneaccount/generic.tpl.c:11
-msgid "Home server"
-msgstr ""
-
-#: admin/ogroups/asterisk/class_phonequeue.inc:281
-#: admin/ogroups/asterisk/class_phonequeue.inc:871
-#: admin/ogroups/asterisk/phonequeue.tpl.c:23
-msgid "Timeout"
-msgstr ""
-
-#: admin/ogroups/asterisk/class_phonequeue.inc:284
-#: admin/ogroups/asterisk/class_phonequeue.inc:896
-#: admin/ogroups/asterisk/phonequeue.tpl.c:26
-msgid "Retry"
-msgstr "ÐŸÐ¾Ð²Ñ‚Ð¾Ñ€Ð¸Ñ‚ÑŒ"
-
-#: admin/ogroups/asterisk/class_phonequeue.inc:287
-msgid "Queue length"
-msgstr ""
-
-#: admin/ogroups/asterisk/class_phonequeue.inc:290
-#: admin/ogroups/asterisk/class_phonequeue.inc:874
-#: admin/ogroups/asterisk/phonequeue.tpl.c:35
-msgid "Announce frequency"
-msgstr ""
-
-#: admin/ogroups/asterisk/class_phonequeue.inc:293
-#: admin/conference/class_phoneConferenceGeneric.inc:328
-msgid "Number"
-msgstr ""
-
-#: admin/ogroups/asterisk/class_phonequeue.inc:316
-#: admin/ogroups/asterisk/class_phonequeue.inc:361
-msgid "asterisk"
-msgstr ""
-
-#: admin/ogroups/asterisk/class_phonequeue.inc:345
-#: admin/ogroups/asterisk/class_phonequeue.inc:696
-#: admin/conference/class_phoneConferenceGeneric.inc:369
-#: admin/macro/class_gofonMacro.inc:381 admin/macro/class_gofonMacro.inc:465
-#: addons/fonreports/class_fonreport.inc:190
-#: addons/fonreports/class_fonreport.inc:220
-#: personal/phoneaccount/class_phoneAccount.inc:455
-#: personal/phoneaccount/class_phoneAccount.inc:1061
-msgid "GOfon"
-msgstr ""
-
-#: admin/ogroups/asterisk/class_phonequeue.inc:401
-msgid "Cannot find old queue entry!"
-msgstr ""
-
-#: admin/ogroups/asterisk/class_phonequeue.inc:487
-#, php-format
-msgid ""
-"Found more than one entry named '%s' in queue table. Please inform your "
-"system administrator!"
-msgstr ""
-
-#: admin/ogroups/asterisk/class_phonequeue.inc:728
-#: admin/ogroups/asterisk/class_phonequeue.inc:730
-msgid "telephone number"
-msgstr ""
-
-#: admin/ogroups/asterisk/class_phonequeue.inc:787
-#: admin/ogroups/asterisk/class_phonequeue.inc:829
-#: admin/conference/class_phoneConferenceGeneric.inc:229
-#: admin/conference/class_phoneConferenceGeneric.inc:233
-#: admin/conference/class_phoneConferenceGeneric.inc:271
-#: admin/macro/class_gofonMacro.inc:343 admin/macro/class_gofonMacro.inc:452
-#: admin/macro/class_gofonMacro.inc:461 admin/macro/class_gofonMacro.inc:499
-#: admin/systems/asterisk/class_phoneGeneric.inc:267
-#: admin/systems/asterisk/class_phoneGeneric.inc:308
-#: addons/fonreports/class_fonreport.inc:220
-#: personal/phoneaccount/class_phoneAccount.inc:1046
-#: personal/phoneaccount/class_phoneAccount.inc:1166
-#: personal/phoneaccount/class_phoneAccount.inc:1172
-#: personal/phoneaccount/class_phoneAccount.inc:1368
-#: personal/phoneaccount/class_phoneAccount.inc:1450
-#: personal/phoneaccount/class_phoneAccount.inc:1528
-msgid "Error"
-msgstr "ÐžÑˆÐ¸Ð±ÐºÐ°"
-
-#: admin/ogroups/asterisk/class_phonequeue.inc:802
-#: admin/ogroups/asterisk/class_phonequeue.inc:857
-#: admin/conference/class_phoneConferenceGeneric.inc:682
-#: admin/macro/class_gofonMacro.inc:473 admin/macro/class_gofonMacro.inc:484
-#: admin/macro/class_gofonMacro.inc:521
-#: admin/macro/class_gofonMacroParameters.inc:435
-#: admin/systems/asterisk/class_phoneGeneric.inc:277
-#: admin/systems/asterisk/class_phoneGeneric.inc:432
-#: admin/systems/asterisk/class_phoneGeneric.inc:446
-#: admin/systems/asterisk/class_phoneGeneric.inc:463
-#: admin/systems/services/asterisk/class_serviceAsterisk.inc:121
-#: personal/phoneaccount/class_phoneAccount.inc:1476
-#: personal/phoneaccount/class_phoneAccount.inc:1609
-msgid "LDAP error"
-msgstr "ÐžÑˆÐ¸Ð±ÐºÐ° LDAP"
-
-#: admin/ogroups/asterisk/class_phonequeue.inc:864
-#: admin/systems/asterisk/class_phoneGeneric.inc:472
-#: admin/systems/asterisk/class_phoneGeneric.inc:477
-#: personal/phoneaccount/class_phoneAccount.inc:999
-#: personal/phoneaccount/class_phoneAccount.inc:1012
-#: personal/phoneaccount/class_phoneAccount.inc:1024
-#: personal/phoneaccount/class_phoneAccount.inc:1028
-#: personal/phoneaccount/class_phoneAccount.inc:1031
-#: personal/phoneaccount/class_phoneAccount.inc:1657
+#: admin/systems/asterisk/class_phoneIAX.inc:30
+#: admin/systems/asterisk/class_phoneIAX.inc:34
+#: personal/asterisk/class_asteriskAccount.inc:45
 msgid "Phone"
 msgstr "Ð¢ÐµÐ»ÐµÑ„Ð¾Ð½"
 
-#: admin/ogroups/asterisk/class_phonequeue.inc:865
-msgid "Phone group"
+#: admin/systems/asterisk/class_phoneIAX.inc:31
+msgid "Asterisk phone"
 msgstr ""
 
-#: admin/ogroups/asterisk/class_phonequeue.inc:872
-#: admin/ogroups/asterisk/phonequeue.tpl.c:32
-msgid "Max queue length"
-msgstr ""
-
-#: admin/ogroups/asterisk/class_phonequeue.inc:875
-#: admin/ogroups/asterisk/phonequeue.tpl.c:86
-msgid "Allow the called user to transfer his call"
-msgstr ""
-
-#: admin/ogroups/asterisk/class_phonequeue.inc:876
-#: admin/ogroups/asterisk/phonequeue.tpl.c:89
-msgid "Allows calling user to transfer call"
-msgstr ""
-
-#: admin/ogroups/asterisk/class_phonequeue.inc:877
-#: admin/ogroups/asterisk/phonequeue.tpl.c:92
-msgid "Allow the called to hangup by pressing *"
-msgstr ""
-
-#: admin/ogroups/asterisk/class_phonequeue.inc:878
-#: admin/ogroups/asterisk/phonequeue.tpl.c:98
-msgid "Ring instead of playing background music"
-msgstr ""
-
-#: admin/ogroups/asterisk/class_phonequeue.inc:879
-#: admin/ogroups/asterisk/phonequeue.tpl.c:95
-msgid "Allows calling to hangup by pressing *"
-msgstr ""
-
-#: admin/ogroups/asterisk/class_phonequeue.inc:881
-#: admin/ogroups/asterisk/phonequeue.tpl.c:47
-msgid "Music on hold"
-msgstr ""
-
-#: admin/ogroups/asterisk/class_phonequeue.inc:882
-msgid "Welcome music"
-msgstr ""
-
-#: admin/ogroups/asterisk/class_phonequeue.inc:883
-msgid "Report hold time"
-msgstr ""
-
-#: admin/ogroups/asterisk/class_phonequeue.inc:884
-msgid "'You are next' sound"
-msgstr ""
-
-#: admin/ogroups/asterisk/class_phonequeue.inc:885
-msgid "'There are' sound"
-msgstr ""
-
-#: admin/ogroups/asterisk/class_phonequeue.inc:886
-msgid "'Call waiting' sound"
-msgstr ""
-
-#: admin/ogroups/asterisk/class_phonequeue.inc:887
-msgid "'Thank you' sound"
-msgstr ""
-
-#: admin/ogroups/asterisk/class_phonequeue.inc:888
-msgid "'Minutes' sound"
-msgstr ""
-
-#: admin/ogroups/asterisk/class_phonequeue.inc:889
-msgid "'Seconds' sound"
-msgstr ""
-
-#: admin/ogroups/asterisk/class_phonequeue.inc:890
-msgid "'Less than' sound"
-msgstr ""
-
-#: admin/ogroups/asterisk/class_phonequeue.inc:891
-msgid "Queue phone number"
-msgstr ""
-
-#: admin/ogroups/asterisk/class_phonequeue.inc:892
-#: admin/conference/class_phoneConferenceGeneric.inc:707
-#: admin/ogroups/asterisk/phonequeue.tpl.c:20
-#: admin/conference/generic.tpl.c:23
-msgid "Language"
-msgstr "Ð¯Ð·Ñ‹Ðº"
-
-#: admin/ogroups/asterisk/class_phonequeue.inc:893
-msgid "Method"
-msgstr ""
-
-#: admin/ogroups/asterisk/class_phonequeue.inc:894
-#: admin/ogroups/asterisk/phonequeue.tpl.c:83
-msgid "Announce holdtime"
-msgstr ""
-
-#: admin/ogroups/asterisk/class_phonequeue.inc:895
-msgid "Announce"
-msgstr ""
-
-#: admin/conference/conf-list.xml:11
-msgid "List of conference rooms"
+#: admin/systems/asterisk/class_phoneIAX.inc:33
+msgid "Phone hardware"
 msgstr ""
 
-#: admin/conference/conf-list.xml:15 admin/conference/conf-list.xml:74
-msgid "Conference"
-msgstr ""
+#: admin/systems/asterisk/class_phoneIAX.inc:46
+#: personal/asterisk/class_asteriskAccount.inc:42
+msgid "Telephone"
+msgstr "Ð¢ÐµÐ»ÐµÑ„Ð¾Ð½"
 
-#: admin/conference/conf-list.xml:41
-#: admin/conference/class_phoneConferenceGeneric.inc:324
-#: admin/conference/class_phoneConferenceGeneric.inc:347
-#: admin/conference/class_phoneConferenceGeneric.inc:702
-#: admin/macro/class_gofonMacro.inc:395 admin/macro/class_gofonMacro.inc:406
-#: admin/macro/macro-list.xml:41
-#: admin/systems/asterisk/class_phoneGeneric.inc:344
-#: admin/systems/asterisk/class_phoneGeneric.inc:348
-#: admin/systems/asterisk/class_phoneGeneric.inc:351
-#: admin/systems/asterisk/class_phoneGeneric.inc:366
-#: admin/systems/asterisk/class_phoneGeneric.inc:482
-#: admin/conference/conf-filter.tpl.c:5 admin/macro/macro-filter.tpl.c:5
-#: admin/macro/parameter.tpl.c:5
+#: admin/systems/asterisk/class_phoneIAX.inc:49
 msgid "Name"
 msgstr "Ð¤Ð°Ð¼Ð¸Ð»Ð¸Ñ"
 
-#: admin/conference/conf-list.xml:49
-#: admin/conference/class_phoneConferenceGeneric.inc:704
-#: admin/macro/class_gofonMacro.inc:547 admin/macro/macro-list.xml:49
-#: admin/systems/asterisk/class_phoneGeneric.inc:484
-#: admin/conference/generic.tpl.c:29 admin/macro/generic.tpl.c:17
-#: admin/systems/asterisk/phone.tpl.c:8
-msgid "Description"
-msgstr "ÐžÐ¿Ð¸ÑÐ°Ð½Ð¸Ðµ"
-
-#: admin/conference/conf-list.xml:57 admin/macro/macro-list.xml:57
-msgid "Actions"
-msgstr "Ð”ÐµÐ¹ÑÑ‚Ð²Ð¸Ñ"
-
-#: admin/conference/conf-list.xml:68 admin/macro/macro-list.xml:68
-msgid "Create"
-msgstr "Ð¡Ð¾Ð·Ð´Ð°Ñ‚ÑŒ"
-
-#: admin/conference/conf-list.xml:86 admin/conference/conf-list.xml:125
-#: admin/macro/macro-list.xml:86 admin/macro/macro-list.xml:125
-msgid "Edit"
-msgstr "Ð˜Ð·Ð¼ÐµÐ½Ð¸Ñ‚ÑŒ"
-
-#: admin/conference/conf-list.xml:93 admin/conference/conf-list.xml:138
-#: admin/macro/macro-list.xml:93 admin/macro/macro-list.xml:138
-msgid "Remove"
-msgstr "Ð£Ð´Ð°Ð»Ð¸Ñ‚ÑŒ"
-
-#: admin/conference/class_phoneConferenceGeneric.inc:233
-#, php-format
-msgid "Cannot delete entry from server '%s' because it seems to be removed!"
-msgstr ""
-
-#: admin/conference/class_phoneConferenceGeneric.inc:308
-#, php-format
-msgid ""
-"The previously selected asterisk home server '%s' is no longer available!"
-msgstr ""
-
-#: admin/conference/class_phoneConferenceGeneric.inc:315
-#: admin/conference/generic.tpl.c:47
-msgid "PIN"
-msgstr ""
-
-#: admin/conference/class_phoneConferenceGeneric.inc:333
-#: admin/conference/class_phoneConferenceGeneric.inc:719
-msgid "Lifetime"
-msgstr ""
-
-#: admin/conference/class_phoneConferenceGeneric.inc:399
-#: personal/phoneaccount/class_phoneAccount.inc:346
-#: personal/phoneaccount/class_phoneAccount.inc:359
-#: personal/phoneaccount/class_phoneAccount.inc:617
-#: personal/phoneaccount/class_phoneAccount.inc:656
-#: personal/phoneaccount/class_phoneAccount.inc:1519
-#: personal/phoneaccount/class_phoneAccount.inc:1695
-#: admin/conference/remove.tpl.c:2 admin/macro/remove.tpl.c:2
-msgid "Warning"
-msgstr "ÐŸÑ€ÐµÐ´ÑƒÐ¿Ñ€ÐµÐ¶Ð´ÐµÐ½Ð¸Ðµ"
-
-#: admin/conference/class_phoneConferenceGeneric.inc:400
-#, php-format
-msgid ""
-"FusionDirectory identified problems with your MySQL table definition, please"
-" activate debugging for details."
-msgstr ""
-
-#: admin/conference/class_phoneConferenceGeneric.inc:606
-#: admin/conference/class_phoneConferenceGeneric.inc:608
-#, php-format
-msgid "'%s' is already assigned to '%s'!"
-msgstr ""
-
-#: admin/conference/class_phoneConferenceGeneric.inc:693
-msgid "Phone Conference"
-msgstr ""
-
-#: admin/conference/class_phoneConferenceGeneric.inc:694
-msgid "Phone conference management"
-msgstr ""
-
-#: admin/conference/class_phoneConferenceGeneric.inc:696
-msgid "GOfon conference"
-msgstr ""
-
-#: admin/conference/class_phoneConferenceGeneric.inc:698
-msgid "Asterisk conference"
-msgstr ""
-
-#: admin/conference/class_phoneConferenceGeneric.inc:703
-#: admin/macro/class_gofonMacro.inc:546
-#: admin/systems/asterisk/class_phoneGeneric.inc:483
-#: admin/conference/generic.tpl.c:17 admin/macro/generic.tpl.c:14
-#: admin/systems/asterisk/phone.tpl.c:5
-msgid "Base"
-msgstr "Ð’ÐµÑ‚ÐºÐ°"
-
-#: admin/conference/class_phoneConferenceGeneric.inc:705
-msgid "Conference PIN"
-msgstr ""
-
-#: admin/conference/class_phoneConferenceGeneric.inc:710
-#: admin/conference/generic.tpl.c:44
-msgid "Preset PIN"
-msgstr ""
-
-#: admin/conference/class_phoneConferenceGeneric.inc:711
-#: admin/conference/generic.tpl.c:50
-msgid "Record conference"
-msgstr ""
-
-#: admin/conference/class_phoneConferenceGeneric.inc:712
-#: admin/conference/generic.tpl.c:59
-msgid "Play music on hold"
-msgstr ""
-
-#: admin/conference/class_phoneConferenceGeneric.inc:713
-msgid "Activate menu"
-msgstr ""
-
-#: admin/conference/class_phoneConferenceGeneric.inc:714
-msgid "Announce user activity"
-msgstr ""
-
-#: admin/conference/class_phoneConferenceGeneric.inc:715
-msgid "Count user"
-msgstr ""
-
-#: admin/conference/class_phoneConferenceGeneric.inc:716
-msgid "Conference type"
-msgstr ""
-
-#: admin/conference/class_phoneConferenceGeneric.inc:718
-msgid "Format"
-msgstr ""
-
-#: admin/conference/class_phoneConferenceGeneric.inc:720
-#: personal/phoneaccount/class_phoneAccount.inc:1666
-msgid "Telephone number"
-msgstr "ÐÐ¾Ð¼ÐµÑ€ Ñ‚ÐµÐ»ÐµÑ„Ð¾Ð½Ð°"
-
-#: admin/conference/class_phoneConferenceGeneric.inc:721
-msgid "Owner"
-msgstr ""
-
-#: admin/conference/class_phoneConferenceManagment.inc:36
-msgid "Phone Conferences"
-msgstr ""
-
-#: admin/conference/class_phoneConferenceManagment.inc:37
-msgid "Phone Conference management"
-msgstr ""
-
-#: admin/macro/class_gofonMacro.inc:202
-#, php-format
-msgid ""
-"Macro could not be removed from server '%s', please check database "
-"consistency!"
-msgstr ""
-
-#: admin/macro/class_gofonMacro.inc:264
-#, php-format
-msgid "Application missing in line %s!"
-msgstr ""
-
-#: admin/macro/class_gofonMacro.inc:267
-#, php-format
-msgid "Priority missing in line %s!"
-msgstr ""
-
-#: admin/macro/class_gofonMacro.inc:271
-#, php-format
-msgid "Extension missing in line %s!"
-msgstr ""
-
-#: admin/macro/class_gofonMacro.inc:281
-#, php-format
-msgid "Duplicate combination of 'extension' and 'priority' in line %s!"
-msgstr ""
-
-#: admin/macro/class_gofonMacro.inc:317
-#, php-format
-msgid ""
-"Macro could not be added to server '%s', please check database consistency!"
-msgstr ""
-
-#: admin/macro/class_gofonMacro.inc:410
-msgid "Name can be 20 characters at maximum!"
-msgstr ""
-
-#: admin/macro/class_gofonMacro.inc:419
-msgid "Macro is still in use!"
-msgstr ""
-
-#: admin/macro/class_gofonMacro.inc:426
-msgid "Macro is empty!"
-msgstr ""
-
-#: admin/macro/class_gofonMacro.inc:452
-#: admin/systems/asterisk/class_phoneGeneric.inc:267
-#, php-format
-msgid "Cannot delete entry because it is still in use by '%s'!"
-msgstr ""
-
-#: admin/macro/class_gofonMacro.inc:465
-#: addons/fonreports/class_fonreport.inc:190
-#: personal/phoneaccount/class_phoneAccount.inc:455
-#: personal/phoneaccount/class_phoneAccount.inc:1061
-#: personal/phoneaccount/class_phoneAccount.inc:1567
-msgid "Configuration error"
-msgstr ""
-
-#: admin/macro/class_gofonMacro.inc:536 admin/macro/class_gofonMacro.inc:541
-msgid "Asterisk macro"
-msgstr ""
-
-#: admin/macro/class_gofonMacro.inc:537
-msgid "Asterisk macro management"
-msgstr ""
-
-#: admin/macro/class_gofonMacro.inc:539
-msgid "GOfon macro"
-msgstr ""
-
-#: admin/macro/class_gofonMacro.inc:545 admin/macro/generic.tpl.c:2
-#: admin/macro/generic.tpl.c:5 admin/macro/paste_generic.tpl.c:2
-#: admin/macro/paste_generic.tpl.c:5
-msgid "Macro name"
-msgstr ""
-
-#: admin/macro/class_gofonMacro.inc:548 admin/macro/generic.tpl.c:8
-msgid "Display name"
-msgstr "ÐžÑ‚Ð¾Ð±Ñ€Ð°Ð¶Ð°ÐµÐ¼Ð¾Ðµ Ð¸Ð¼Ñ"
-
-#: admin/macro/class_gofonMacro.inc:549
-msgid "Macro content and parameter"
-msgstr ""
-
-#: admin/macro/class_gofonMacro.inc:550
-msgid "Visibility flag"
-msgstr ""
-
-#: admin/macro/class_gofonMacroManagement.inc:36
-msgid "Phone Macros"
-msgstr ""
-
-#: admin/macro/class_gofonMacroManagement.inc:37
-msgid "Phone Macros management"
-msgstr ""
-
-#: admin/macro/macro-list.xml:11
-msgid "List of macros"
-msgstr ""
-
-#: admin/macro/macro-list.xml:15 admin/macro/macro-list.xml:74
-msgid "Macro"
-msgstr ""
-
-#: admin/macro/class_gofonMacroParameters.inc:58
-msgid "Parameter"
-msgstr ""
-
-#: admin/macro/class_gofonMacroParameters.inc:59
-msgid "Asterisk macro parameter"
-msgstr ""
-
-#: admin/macro/class_gofonMacroParameters.inc:234
-#: personal/phoneaccount/generic.tpl.c:35
-msgid "Phone macro"
-msgstr ""
-
-#: admin/macro/class_gofonMacroParameters.inc:290
-msgid "String"
-msgstr ""
-
-#: admin/macro/class_gofonMacroParameters.inc:291
-msgid "Combobox"
-msgstr ""
-
-#: admin/macro/class_gofonMacroParameters.inc:292
-msgid "Bool"
-msgstr ""
-
-#: admin/macro/class_gofonMacroParameters.inc:298
-msgid "Delete unused"
-msgstr ""
-
-#: admin/macro/class_gofonMacroParameters.inc:374
-#, php-format
-msgid "Parameter %s contains invalid character. '!,#' is used as delimiter!"
-msgstr ""
-
-#: admin/macro/class_gofonMacroParameters.inc:379
-#, php-format
-msgid "Parameter %s is invalid!"
-msgstr ""
-
-#: admin/macro/class_gofonMacroParameters.inc:408
-#: personal/phoneaccount/class_phoneAccount.inc:1600
-msgid "Information"
-msgstr "Ð˜Ð½Ñ„Ð¾Ñ€Ð¼Ð°Ñ†Ð¸Ñ"
-
-#: admin/macro/class_gofonMacroParameters.inc:408
-msgid ""
-"Number of parameters for this macro has changed. Please update all users "
-"using it!"
-msgstr ""
-
-#: admin/systems/asterisk/class_phoneGeneric.inc:151
-msgid "phone"
-msgstr ""
-
-#: admin/systems/asterisk/class_phoneGeneric.inc:230
-msgid "yes"
-msgstr ""
-
-#: admin/systems/asterisk/class_phoneGeneric.inc:230
-msgid "no"
-msgstr ""
-
-#: admin/systems/asterisk/class_phoneGeneric.inc:247
-msgid "dynamic"
-msgstr ""
-
-#: admin/systems/asterisk/class_phoneGeneric.inc:247
-msgid "Networksettings"
-msgstr ""
-
-#: admin/systems/asterisk/class_phoneGeneric.inc:330
-#: admin/systems/asterisk/class_phoneGeneric.inc:333
-msgid "IP address"
-msgstr "IP Ð°Ð´Ñ€ÐµÑ"
-
-#: admin/systems/asterisk/class_phoneGeneric.inc:473
-msgid "Phone information"
-msgstr ""
-
-#: admin/systems/asterisk/class_phoneGeneric.inc:476
-#: personal/phoneaccount/class_phoneAccount.inc:1668
-msgid "Phone hardware"
-msgstr ""
-
-#: admin/systems/asterisk/class_phoneGeneric.inc:485
-msgid "SIP Mode"
-msgstr ""
-
-#: admin/systems/asterisk/class_phoneGeneric.inc:486
-msgid "SIP DTMF mode"
-msgstr ""
-
-#: admin/systems/asterisk/class_phoneGeneric.inc:487
-msgid "SIP Default ip"
-msgstr ""
-
-#: admin/systems/asterisk/class_phoneGeneric.inc:488
-msgid "SIP Qualify"
-msgstr ""
-
-#: admin/systems/asterisk/class_phoneGeneric.inc:489
-msgid "IAX authentication type"
-msgstr ""
-
-#: admin/systems/asterisk/class_phoneGeneric.inc:490
-msgid "IAX secret"
-msgstr ""
-
-#: admin/systems/asterisk/class_phoneGeneric.inc:491
-msgid "IAX account code"
+#: admin/systems/asterisk/class_phoneIAX.inc:49
+msgid "Name of this phone"
 msgstr ""
 
-#: admin/systems/asterisk/class_phoneGeneric.inc:492
-msgid "IAX trunk lines"
+#: admin/systems/asterisk/class_phoneIAX.inc:53
+msgid "Account name"
 msgstr ""
 
-#: admin/systems/asterisk/class_phoneGeneric.inc:493
-msgid "IAX permit settings"
-msgstr ""
-
-#: admin/systems/asterisk/class_phoneGeneric.inc:494
-msgid "IAX deny settings"
-msgstr ""
-
-#: admin/systems/asterisk/class_phoneGeneric.inc:495
-msgid "CAPI MSN"
-msgstr ""
-
-#: admin/systems/asterisk/class_phoneGeneric.inc:496
-msgid "Hardware type"
+#: admin/systems/asterisk/class_phoneIAX.inc:53
+msgid "Name of the account"
 msgstr ""
 
 #: admin/systems/services/asterisk/class_serviceAsterisk.inc:35
@@ -747,6 +95,10 @@ msgid ""
 "these objects '%s'."
 msgstr ""
 
+#: admin/systems/services/asterisk/class_serviceAsterisk.inc:121
+msgid "LDAP error"
+msgstr "ÐžÑˆÐ¸Ð±ÐºÐ° LDAP"
+
 #: admin/systems/services/asterisk/class_serviceAsterisk.inc:140
 msgid "VoIP service (asterisk)"
 msgstr ""
@@ -759,209 +111,18 @@ msgstr ""
 msgid "Services"
 msgstr "Ð¡ÐµÑ€Ð²Ð¸ÑÑ‹"
 
-#: addons/fonreports/class_fonreport.inc:232
-msgid "Insufficient permissions"
-msgstr ""
-
-#: addons/fonreports/class_fonreport.inc:251
-msgid "Y-M-D"
-msgstr "Ð“-Ðœ-Ð”"
-
-#: addons/fonreports/class_fonreport.inc:418
-#: addons/fonreports/class_fonreport.inc:419
-#: addons/fonreports/class_fonreport.inc:424 addons/fonreports/main.inc:46
-msgid "Phone reports"
-msgstr "Ð¢ÐµÐ»ÐµÑ„Ð¾Ð½Ð½Ñ‹Ðµ Ð¾Ñ‚Ñ‡ÐµÑ‚Ñ‹"
-
-#: addons/fonreports/class_fonreport.inc:419
-msgid "All entries are readonly"
-msgstr ""
-
-#: addons/fonreports/class_fonreport.inc:428
-#: addons/fonreports/contents.tpl.c:32
-msgid "Date"
-msgstr "Ð”Ð°Ñ‚Ð°"
-
-#: addons/fonreports/class_fonreport.inc:429
-#: addons/fonreports/contents.tpl.c:35
-msgid "Source"
-msgstr "Ð˜ÑÑ‚Ð¾Ñ‡Ð½Ð¸Ðº"
-
-#: addons/fonreports/class_fonreport.inc:430
-#: addons/fonreports/contents.tpl.c:38
-msgid "Destination"
-msgstr "ÐÐ°Ð·Ð½Ð°Ñ‡ÐµÐ½Ð¸Ðµ"
-
-#: addons/fonreports/class_fonreport.inc:431
-#: addons/fonreports/contents.tpl.c:41
-msgid "Channel"
-msgstr "ÐšÐ°Ð½Ð°Ð»"
-
-#: addons/fonreports/class_fonreport.inc:432
-msgid "Application called"
-msgstr ""
-
-#: addons/fonreports/class_fonreport.inc:433
-msgid "Disposition"
-msgstr ""
-
-#: addons/fonreports/class_fonreport.inc:434
-#: addons/fonreports/contents.tpl.c:50
-msgid "Duration"
-msgstr "ÐŸÑ€Ð¾Ð´Ð¾Ð»Ð¶Ð¸Ñ‚ÐµÐ»ÑŒÐ½Ð¾ÑÑ‚ÑŒ"
-
-#: personal/phoneaccount/class_phoneAccount.inc:176
-msgid "automatic"
-msgstr "Ð°Ð²Ñ‚Ð¾Ð¼Ð°Ñ‚Ð¸Ñ‡ÐµÑÐºÐ¸"
-
-#: personal/phoneaccount/class_phoneAccount.inc:212
-msgid "no macro"
-msgstr ""
-
-#: personal/phoneaccount/class_phoneAccount.inc:240
-msgid "undefined"
-msgstr ""
-
-#: personal/phoneaccount/class_phoneAccount.inc:359
-#, php-format
-msgid ""
-"Cannot identify telephone extension in database, please try to save again."
-msgstr ""
-
-#: personal/phoneaccount/class_phoneAccount.inc:577
-#: personal/phoneaccount/class_phoneAccount.inc:595
-msgid "Abort saving entries to keep the database consistent."
-msgstr ""
-
-#: personal/phoneaccount/class_phoneAccount.inc:618
-#: personal/phoneaccount/class_phoneAccount.inc:657
-#: personal/phoneaccount/class_phoneAccount.inc:1520
-#, php-format
-msgid ""
-"FusionDirectory identified problems with your database table definition!"
-msgstr ""
-
-#: personal/phoneaccount/class_phoneAccount.inc:1023
-msgid "Remove phone account"
-msgstr "Ð£Ð´Ð°Ð»Ð¸Ñ‚ÑŒ Ñ‚ÐµÐ»ÐµÑ„Ð¾Ð½Ð½Ñ‹Ð¹ Ð°ÐºÐºÐ°ÑƒÐ½Ñ‚"
-
-#: personal/phoneaccount/class_phoneAccount.inc:1027
-#: personal/phoneaccount/class_phoneAccount.inc:1030
-msgid "Create phone account"
-msgstr "Ð¡Ð¾Ð·Ð´Ð°Ñ‚ÑŒ Ñ‚ÐµÐ»ÐµÑ„Ð¾Ð½Ð½Ñ‹Ð¹ Ð°ÐºÐºÐ°ÑƒÐ½Ñ‚"
-
-#: personal/phoneaccount/class_phoneAccount.inc:1028
-msgid "User uid"
-msgstr ""
-
-#: personal/phoneaccount/class_phoneAccount.inc:1046
-msgid "Selected macro is not available anymore!"
-msgstr ""
-
-#: personal/phoneaccount/class_phoneAccount.inc:1221
-msgid "Choose your private phone"
-msgstr "Ð£ÐºÐ°Ð¶Ð¸Ñ‚Ðµ Ð»Ð¸Ñ‡Ð½Ñ‹Ð¹ Ñ‚ÐµÐ»ÐµÑ„Ð¾Ð½"
-
-#: personal/phoneaccount/class_phoneAccount.inc:1346
-msgid ""
-"There must be at least one server with an asterisk database to create a "
-"phone account."
-msgstr ""
-
-#: personal/phoneaccount/class_phoneAccount.inc:1354
-#: personal/phoneaccount/class_phoneAccount.inc:1357
-#: personal/phoneaccount/generic.tpl.c:29
-#: personal/phoneaccount/paste_generic.tpl.c:11
-msgid "Voicemail PIN"
-msgstr ""
-
-#: personal/phoneaccount/class_phoneAccount.inc:1354
-msgid "Between 1-4 charactes"
-msgstr ""
-
-#: personal/phoneaccount/class_phoneAccount.inc:1362
-#: personal/phoneaccount/generic.tpl.c:32
-#: personal/phoneaccount/paste_generic.tpl.c:14
-msgid "Phone PIN"
-msgstr ""
-
-#: personal/phoneaccount/class_phoneAccount.inc:1394
-#: admin/conference/generic.tpl.c:38 admin/conference/paste_generic.tpl.c:8
-msgid "Phone number"
-msgstr "Ð¢ÐµÐ»ÐµÑ„Ð¾Ð½"
-
-#: personal/phoneaccount/class_phoneAccount.inc:1402
-#, php-format
-msgid "macro parameter %s"
-msgstr ""
-
-#: personal/phoneaccount/class_phoneAccount.inc:1450
-msgid "An error occured while updating the database entries!"
-msgstr ""
-
-#: personal/phoneaccount/class_phoneAccount.inc:1567
-msgid "Was not able to found any asterisk server"
-msgstr ""
-
-#: personal/phoneaccount/class_phoneAccount.inc:1600
-#, php-format
-msgid "User '%s' has been removed from phone queue '%s'."
-msgstr ""
-
-#: personal/phoneaccount/class_phoneAccount.inc:1637
-#: personal/phoneaccount/class_phoneAccount.inc:1639
-#, php-format
-msgid "The specified telephonenumber '%s' is already assigned to '%s'."
-msgstr ""
-
-#: personal/phoneaccount/class_phoneAccount.inc:1649
-#, php-format
-msgid ""
-"The previously selected asterisk home server (%s) is no longer available. "
-"Remove aborted."
-msgstr ""
-
-#: personal/phoneaccount/class_phoneAccount.inc:1658
-msgid "Phone account settings"
-msgstr ""
-
-#: personal/phoneaccount/class_phoneAccount.inc:1667
-msgid "Macro settings"
-msgstr ""
-
-#: personal/phoneaccount/class_phoneAccount.inc:1670
-msgid "Phone context"
-msgstr ""
-
-#: personal/phoneaccount/class_phoneAccount.inc:1671
-msgid "Voice mail context"
-msgstr ""
-
-#: personal/phoneaccount/class_phoneAccount.inc:1672
-msgid "Telephone pin"
-msgstr ""
-
-#: personal/phoneaccount/class_phoneAccount.inc:1673
-msgid "Voicemail pin"
+#: personal/asterisk/class_asteriskAccount.inc:30
+#: config/asterisk/class_asteriskPluginConfig.inc:28
+#: config/asterisk/class_asteriskPluginConfig.inc:41
+msgid "Asterisk"
 msgstr ""
 
-#: personal/phoneaccount/class_phoneAccount.inc:1695
-#, php-format
-msgid "You need to configure %s contexts first"
+#: personal/asterisk/class_asteriskAccount.inc:31
+msgid "Asterisk account"
 msgstr ""
 
-#: personal/phoneaccount/main.inc:124
-msgid "Click the 'Edit' button below to change informations in this dialog"
-msgstr "ÐÐ°Ð¶Ð¼Ð¸Ñ‚Ðµ 'Ð˜Ð·Ð¼ÐµÐ½Ð¸Ñ‚ÑŒ' Ñ‡Ñ‚Ð¾Ð±Ñ‹ Ð¾Ñ‚Ñ€ÐµÐ´Ð°ÐºÑ‚Ð¸Ñ€Ð¾Ð²Ð°Ñ‚ÑŒ Ð´Ð°Ð½Ð½Ñ‹Ðµ Ð² ÑÑ‚Ð¾Ð¹ Ñ„Ð¾Ñ€Ð¼Ðµ."
-
-#: personal/phoneaccount/main.inc:134
-#: personal/phoneaccount/paste_generic.tpl.c:2
-msgid "Phone settings"
-msgstr "ÐÐ°ÑÑ‚Ñ€Ð¾Ð¹ÐºÐ¸ Ñ‚ÐµÐ»ÐµÑ„Ð¾Ð½Ð°"
-
-#: config/asterisk/class_asteriskPluginConfig.inc:28
-#: config/asterisk/class_asteriskPluginConfig.inc:41
-msgid "Asterisk"
+#: personal/asterisk/class_asteriskAccount.inc:45
+msgid "Select the phone associated to this user"
 msgstr ""
 
 #: config/asterisk/class_asteriskPluginConfig.inc:29
@@ -1011,338 +172,3 @@ msgstr ""
 #: config/asterisk/class_asteriskPluginConfig.inc:72
 msgid "Available voicemail contexts"
 msgstr ""
-
-#: admin/ogroups/asterisk/phonequeue.tpl.c:2
-msgid ""
-"Only users with the same asterisk home server will be included to this "
-"queue."
-msgstr ""
-
-#: admin/ogroups/asterisk/phonequeue.tpl.c:5
-#: personal/phoneaccount/generic.tpl.c:2
-#: personal/phoneaccount/paste_generic.tpl.c:5
-msgid "Phone numbers"
-msgstr "Ð¢ÐµÐ»ÐµÑ„Ð¾Ð½Ð½Ñ‹Ðµ Ð½Ð¾Ð¼ÐµÑ€Ð°"
-
-#: admin/ogroups/asterisk/phonequeue.tpl.c:8
-msgid "Up"
-msgstr "ÐŸÐ¾ ÑƒÐ±Ñ‹Ð²Ð°Ð½Ð¸ÑŽ"
-
-#: admin/ogroups/asterisk/phonequeue.tpl.c:11
-msgid "Down"
-msgstr "Ð’Ð½Ð¸Ð·"
-
-#: admin/ogroups/asterisk/phonequeue.tpl.c:14
-#: admin/conference/generic.tpl.c:41
-msgid "Options"
-msgstr "ÐŸÐ°Ñ€Ð°Ð¼ÐµÑ‚Ñ€Ñ‹"
-
-#: admin/ogroups/asterisk/phonequeue.tpl.c:29
-msgid "Strategy"
-msgstr ""
-
-#: admin/ogroups/asterisk/phonequeue.tpl.c:38
-msgid "(in seconds)"
-msgstr ""
-
-#: admin/ogroups/asterisk/phonequeue.tpl.c:41
-msgid "Queue sound setup"
-msgstr ""
-
-#: admin/ogroups/asterisk/phonequeue.tpl.c:44
-msgid "Use music on hold instead of ringing"
-msgstr ""
-
-#: admin/ogroups/asterisk/phonequeue.tpl.c:50
-msgid "Welcome sound file"
-msgstr ""
-
-#: admin/ogroups/asterisk/phonequeue.tpl.c:53
-msgid "Announce message"
-msgstr ""
-
-#: admin/ogroups/asterisk/phonequeue.tpl.c:56
-msgid "Sound file for 'You are next ...'"
-msgstr ""
-
-#: admin/ogroups/asterisk/phonequeue.tpl.c:59
-msgid "'There are ...'"
-msgstr ""
-
-#: admin/ogroups/asterisk/phonequeue.tpl.c:62
-msgid "'... calls waiting'"
-msgstr ""
-
-#: admin/ogroups/asterisk/phonequeue.tpl.c:65
-msgid "'Thank you' message"
-msgstr ""
-
-#: admin/ogroups/asterisk/phonequeue.tpl.c:68
-msgid "'minutes' sound file"
-msgstr ""
-
-#: admin/ogroups/asterisk/phonequeue.tpl.c:71
-msgid "'seconds' sound file"
-msgstr ""
-
-#: admin/ogroups/asterisk/phonequeue.tpl.c:74
-msgid "Hold sound file"
-msgstr ""
-
-#: admin/ogroups/asterisk/phonequeue.tpl.c:77
-msgid "Less Than sound file"
-msgstr ""
-
-#: admin/ogroups/asterisk/phonequeue.tpl.c:80
-msgid "Phone attributes "
-msgstr ""
-
-#: admin/conference/conf-filter.tpl.c:2 admin/macro/macro-filter.tpl.c:2
-#: addons/fonreports/contents.tpl.c:2
-msgid "Filter"
-msgstr "Ð¤Ð¸Ð»ÑŒÑ‚Ñ€"
-
-#: admin/conference/generic.tpl.c:2
-msgid "Properties"
-msgstr "Ð¡Ð²Ð¾Ð¹ÑÑ‚Ð²Ð°"
-
-#: admin/conference/generic.tpl.c:5 admin/conference/paste_generic.tpl.c:2
-msgid "Conference name"
-msgstr ""
-
-#: admin/conference/generic.tpl.c:8 admin/conference/paste_generic.tpl.c:5
-msgid "Name of conference to create"
-msgstr ""
-
-#: admin/conference/generic.tpl.c:11
-msgid "Type"
-msgstr "Ð¢Ð¸Ð¿"
-
-#: admin/conference/generic.tpl.c:14
-msgid "Choose subtree to place conference in"
-msgstr ""
-
-#: admin/conference/generic.tpl.c:26
-msgid "Select language"
-msgstr ""
-
-#: admin/conference/generic.tpl.c:32
-msgid "Descriptive text for department"
-msgstr "ÐžÐ¿Ð¸ÑÐ°Ð½Ð¸Ðµ Ð¿Ð¾Ð´Ñ€Ð°Ð·Ð´ÐµÐ»ÐµÐ½Ð¸Ñ"
-
-#: admin/conference/generic.tpl.c:35
-msgid "Lifetime (in days)"
-msgstr ""
-
-#: admin/conference/generic.tpl.c:53
-msgid "Sound file format"
-msgstr ""
-
-#: admin/conference/generic.tpl.c:56
-msgid "Choose subtree to place department in"
-msgstr "Ð’Ñ‹Ð±ÐµÑ€Ð¸Ñ‚Ðµ Ð²ÐµÑ‚ÐºÑƒ Ð´Ð»Ñ Ð¿Ð¾Ð´Ñ€Ð°Ð·Ð´ÐµÐ»ÐµÐ½Ð¸Ñ"
-
-#: admin/conference/generic.tpl.c:62
-msgid "Activate session menu"
-msgstr ""
-
-#: admin/conference/generic.tpl.c:65
-msgid "Announce users joining or leaving the conference"
-msgstr ""
-
-#: admin/conference/generic.tpl.c:68
-msgid "Count users"
-msgstr ""
-
-#: admin/conference/remove.tpl.c:5 admin/macro/remove.tpl.c:5
-msgid ""
-"Please double check if you really want to do this since there is no way for "
-"FusionDirectory to get your data back."
-msgstr ""
-
-#: admin/conference/remove.tpl.c:8 admin/macro/remove.tpl.c:8
-msgid "So - if you're sure - press 'Delete' to continue or 'Cancel' to abort."
-msgstr "Ð˜Ñ‚Ð°Ðº - ÐµÑÐ»Ð¸ Ð²Ñ‹ ÑƒÐ²ÐµÑ€ÐµÐ½Ñ‹ - Ð½Ð°Ð¶Ð¼Ð¸Ñ‚Ðµ 'Ð£Ð´Ð°Ð»Ð¸Ñ‚ÑŒ', Ñ‡Ñ‚Ð¾Ð±Ñ‹ Ð¿Ñ€Ð¾Ð´Ð¾Ð»Ð¶Ð¸Ñ‚ÑŒ Ð¸Ð»Ð¸ 'ÐžÑ‚Ð¼ÐµÐ½Ð°' Ñ‡Ñ‚Ð¾Ð±Ñ‹ Ð¿Ñ€ÐµÑ€Ð²Ð°Ñ‚ÑŒ."
-
-#: admin/macro/generic.tpl.c:11
-msgid "Macro name to be displayed"
-msgstr ""
-
-#: admin/macro/generic.tpl.c:20
-msgid "Visible for user"
-msgstr ""
-
-#: admin/macro/generic.tpl.c:23
-msgid "Macro text"
-msgstr ""
-
-#: admin/macro/parameter.tpl.c:2
-msgid "Argument"
-msgstr ""
-
-#: admin/macro/parameter.tpl.c:8
-msgid "type"
-msgstr ""
-
-#: admin/macro/parameter.tpl.c:11
-msgid "Default value"
-msgstr "ÐŸÐ¾ ÑƒÐ¼Ð¾Ð»Ñ‡Ð°Ð½Ð¸ÑŽ"
-
-#: admin/macro/parameter.tpl.c:14
-msgid "You are not allowed to view the macro parameter settings"
-msgstr ""
-
-#: admin/systems/asterisk/phonesettings.tpl.c:2
-msgid "Advanced phone settings"
-msgstr ""
-
-#: admin/systems/asterisk/phonesettings.tpl.c:5
-msgid "Phone type"
-msgstr ""
-
-#: admin/systems/asterisk/phonesettings.tpl.c:8
-#: admin/systems/asterisk/phonesettings.tpl.c:14
-#: admin/systems/asterisk/phonesettings.tpl.c:20
-#: admin/systems/asterisk/phonesettings.tpl.c:26
-#: admin/systems/asterisk/phonesettings.tpl.c:35
-#: admin/systems/asterisk/phonesettings.tpl.c:47
-#: admin/systems/asterisk/phonesettings.tpl.c:65
-msgid "Choose a phone type"
-msgstr ""
-
-#: admin/systems/asterisk/phonesettings.tpl.c:11
-msgid "Mode"
-msgstr "Ð ÐµÐ¶Ð¸Ð¼"
-
-#: admin/systems/asterisk/phonesettings.tpl.c:17
-msgid "DTMF mode"
-msgstr ""
-
-#: admin/systems/asterisk/phonesettings.tpl.c:23
-#: admin/systems/asterisk/phonesettings.tpl.c:38
-msgid "Default IP"
-msgstr ""
-
-#: admin/systems/asterisk/phonesettings.tpl.c:29
-#: admin/systems/asterisk/phonesettings.tpl.c:41
-msgid "Response timeout"
-msgstr ""
-
-#: admin/systems/asterisk/phonesettings.tpl.c:32
-msgid "Modus"
-msgstr "Ð ÐµÐ¶Ð¸Ð¼"
-
-#: admin/systems/asterisk/phonesettings.tpl.c:44
-msgid "Authtype"
-msgstr ""
-
-#: admin/systems/asterisk/phonesettings.tpl.c:50
-msgid "Secret"
-msgstr ""
-
-#: admin/systems/asterisk/phonesettings.tpl.c:53
-msgid "GoFonInkeys"
-msgstr ""
-
-#: admin/systems/asterisk/phonesettings.tpl.c:56
-msgid "GoFonOutKeys"
-msgstr ""
-
-#: admin/systems/asterisk/phonesettings.tpl.c:59
-msgid "Account code"
-msgstr ""
-
-#: admin/systems/asterisk/phonesettings.tpl.c:62
-msgid "Trunk lines"
-msgstr ""
-
-#: admin/systems/asterisk/phonesettings.tpl.c:68
-msgid "Hosts that are allowed to connect"
-msgstr ""
-
-#: admin/systems/asterisk/phonesettings.tpl.c:71
-#: admin/systems/asterisk/phonesettings.tpl.c:77
-msgid "List of alternative mail addresses"
-msgstr "Ð¡Ð¿Ð¸ÑÐ¾Ðº Ð°Ð»ÑŒÑ‚ÐµÑ€Ð½Ð°Ñ‚Ð¸Ð²Ð½Ñ‹Ñ… Ð°Ð´Ñ€ÐµÑÐ¾Ð² ÑÐ». Ð¿Ð¾Ñ‡Ñ‚Ñ‹"
-
-#: admin/systems/asterisk/phonesettings.tpl.c:74
-msgid "Hosts that are not allowed to connect"
-msgstr ""
-
-#: admin/systems/asterisk/phonesettings.tpl.c:80
-msgid "MSN"
-msgstr ""
-
-#: admin/systems/asterisk/phone.tpl.c:2
-msgid "Phone name"
-msgstr "ÐÐ°Ð·Ð²Ð°Ð½Ð¸Ðµ"
-
-#: addons/fonreports/contents.tpl.c:5
-msgid "Search for"
-msgstr "ÐŸÐ¾Ð¸ÑÐº"
-
-#: addons/fonreports/contents.tpl.c:8
-msgid "Enter user name to search for"
-msgstr "Ð’Ð²ÐµÐ´Ð¸Ñ‚Ðµ Ð¸ÑÐºÐ¾Ð¼Ð¾Ðµ Ð¸Ð¼Ñ Ð¿Ð¾Ð»ÑŒÐ·Ð¾Ð²Ð°Ñ‚ÐµÐ»Ñ"
-
-#: addons/fonreports/contents.tpl.c:11 addons/fonreports/contents.tpl.c:26
-msgid "in"
-msgstr "Ð²"
-
-#: addons/fonreports/contents.tpl.c:14
-msgid "Select subtree to base search on"
-msgstr "Ð’Ñ‹Ð±ÐµÑ€Ð¸Ñ‚Ðµ Ð²ÐµÑ‚ÐºÑƒ Ð´Ð»Ñ Ð¿Ð¾Ð¸ÑÐºÐ°"
-
-#: addons/fonreports/contents.tpl.c:17
-msgid "on"
-msgstr ""
-
-#: addons/fonreports/contents.tpl.c:20
-msgid "Select server to search on"
-msgstr ""
-
-#: addons/fonreports/contents.tpl.c:23
-msgid "during"
-msgstr "Ð² Ñ‚ÐµÑ‡ÐµÐ½Ð¸Ðµ"
-
-#: addons/fonreports/contents.tpl.c:29
-msgid "Search"
-msgstr "ÐŸÐ¾Ð¸ÑÐº"
-
-#: addons/fonreports/contents.tpl.c:44
-msgid "Application"
-msgstr "ÐŸÑ€Ð¸Ð»Ð¾Ð¶ÐµÐ½Ð¸Ðµ"
-
-#: addons/fonreports/contents.tpl.c:47
-msgid "Status"
-msgstr "Ð¡Ð¾ÑÑ‚Ð¾ÑÐ½Ð¸Ðµ"
-
-#: addons/fonreports/contents.tpl.c:53
-msgid "Search returned no results..."
-msgstr "ÐÐµ Ð½Ð°Ð¹Ð´ÐµÐ½Ð¾..."
-
-#: personal/phoneaccount/generic.tpl.c:5
-#: personal/phoneaccount/paste_generic.tpl.c:8
-msgid "Telephone hardware"
-msgstr "Ð¢ÐµÐ»ÐµÑ„Ð¾Ð½Ð½Ð¾Ðµ Ð¾Ð±Ð¾Ñ€ÑƒÐ´Ð¾Ð²Ð°Ð½Ð¸Ðµ"
-
-#: personal/phoneaccount/generic.tpl.c:8
-msgid "Telephone"
-msgstr "Ð¢ÐµÐ»ÐµÑ„Ð¾Ð½"
-
-#: personal/phoneaccount/generic.tpl.c:14
-msgid "Select the accounts home server"
-msgstr ""
-
-#: personal/phoneaccount/generic.tpl.c:17
-msgid "Context"
-msgstr ""
-
-#: personal/phoneaccount/generic.tpl.c:20
-#: personal/phoneaccount/generic.tpl.c:26
-msgid "Select the accounts context"
-msgstr ""
-
-#: personal/phoneaccount/generic.tpl.c:23
-msgid "Voicemail context"
-msgstr ""
diff --git a/asterisk/locale/ru@petr1708/fusiondirectory.po b/asterisk/locale/ru@petr1708/fusiondirectory.po
index 8ae80dd7293edf4d103e0851f23b7eab4855d7ef..0f1c5c9f9d49ee21eb8e36ae2f7f592b04c64cfa 100644
--- a/asterisk/locale/ru@petr1708/fusiondirectory.po
+++ b/asterisk/locale/ru@petr1708/fusiondirectory.po
@@ -5,962 +5,124 @@
 # Translators:
 msgid ""
 msgstr ""
-"Project-Id-Version: FusionDirectory-108\n"
+"Project-Id-Version: FusionDirectory-109\n"
 "Report-Msgid-Bugs-To: documentation@lists.fusiondirectory.org\n"
-"POT-Creation-Date: 2015-03-31 11:49+0200\n"
-"PO-Revision-Date: 2015-02-25 15:42+0000\n"
+"POT-Creation-Date: 2014-12-15 17:47+0100\n"
+"PO-Revision-Date: 2014-12-15 16:49+0000\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>\n"
-"Language-Team: Russian Petrine orthography (http://www.transifex.com/projects/p/FusionDirectory-108/language/ru@petr1708/)\n"
+"Language-Team: Russian Petrine orthography (http://www.transifex.com/projects/p/FusionDirectory-109/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=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);\n"
+"Plural-Forms: nplurals=4; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%10<=4 && (n%100<12 || n%100>14) ? 1 : n%10==0 || (n%10>=5 && n%10<=9) || (n%100>=11 && n%100<=14)? 2 : 3);\n"
 
-#: admin/ogroups/asterisk/class_phonequeue.inc:110
-#: admin/conference/class_phoneConferenceGeneric.inc:104
-#: personal/phoneaccount/class_phoneAccount.inc:148
-msgid "Obsolete entry"
-msgstr ""
-
-#: admin/ogroups/asterisk/class_phonequeue.inc:110
-#: admin/conference/class_phoneConferenceGeneric.inc:104
-#: personal/phoneaccount/class_phoneAccount.inc:148
-#, php-format
-msgid ""
-"The current home server is not available anymore. It will be moved to '%s' "
-"if you save this entry!"
-msgstr ""
-
-#: admin/ogroups/asterisk/class_phonequeue.inc:140
-msgid "ring all"
-msgstr ""
-
-#: admin/ogroups/asterisk/class_phonequeue.inc:141
-msgid "round robin"
-msgstr ""
-
-#: admin/ogroups/asterisk/class_phonequeue.inc:142
-msgid "least recently called"
-msgstr ""
-
-#: admin/ogroups/asterisk/class_phonequeue.inc:143
-msgid "fewest completed calls"
-msgstr ""
-
-#: admin/ogroups/asterisk/class_phonequeue.inc:144
-msgid "random"
-msgstr ""
-
-#: admin/ogroups/asterisk/class_phonequeue.inc:145
-msgid "round robin with memory"
-msgstr ""
-
-#: admin/ogroups/asterisk/class_phonequeue.inc:180
-msgid "Remove the phone queue from this Account"
-msgstr ""
-
-#: admin/ogroups/asterisk/class_phonequeue.inc:181
-#: admin/ogroups/asterisk/class_phonequeue.inc:184
-msgid "phone queue"
-msgstr ""
-
-#: admin/ogroups/asterisk/class_phonequeue.inc:183
-msgid "Create phone queue"
-msgstr ""
-
-#: admin/ogroups/asterisk/class_phonequeue.inc:272
-msgid ""
-"There must be at least one server with an asterisk database to create a "
-"phone queue."
-msgstr ""
-
-#: admin/ogroups/asterisk/class_phonequeue.inc:275
-#: admin/ogroups/asterisk/class_phonequeue.inc:873
-#: admin/conference/class_phoneConferenceGeneric.inc:709
-#: personal/phoneaccount/class_phoneAccount.inc:1350
-#: personal/phoneaccount/class_phoneAccount.inc:1669
-#: admin/ogroups/asterisk/phonequeue.tpl.c:17
-#: admin/conference/generic.tpl.c:20 personal/phoneaccount/generic.tpl.c:11
-msgid "Home server"
-msgstr ""
-
-#: admin/ogroups/asterisk/class_phonequeue.inc:281
-#: admin/ogroups/asterisk/class_phonequeue.inc:871
-#: admin/ogroups/asterisk/phonequeue.tpl.c:23
-msgid "Timeout"
-msgstr ""
-
-#: admin/ogroups/asterisk/class_phonequeue.inc:284
-#: admin/ogroups/asterisk/class_phonequeue.inc:896
-#: admin/ogroups/asterisk/phonequeue.tpl.c:26
-msgid "Retry"
-msgstr ""
-
-#: admin/ogroups/asterisk/class_phonequeue.inc:287
-msgid "Queue length"
-msgstr ""
-
-#: admin/ogroups/asterisk/class_phonequeue.inc:290
-#: admin/ogroups/asterisk/class_phonequeue.inc:874
-#: admin/ogroups/asterisk/phonequeue.tpl.c:35
-msgid "Announce frequency"
-msgstr ""
-
-#: admin/ogroups/asterisk/class_phonequeue.inc:293
-#: admin/conference/class_phoneConferenceGeneric.inc:328
-msgid "Number"
-msgstr ""
-
-#: admin/ogroups/asterisk/class_phonequeue.inc:316
-#: admin/ogroups/asterisk/class_phonequeue.inc:361
-msgid "asterisk"
-msgstr ""
-
-#: admin/ogroups/asterisk/class_phonequeue.inc:345
-#: admin/ogroups/asterisk/class_phonequeue.inc:696
-#: admin/conference/class_phoneConferenceGeneric.inc:369
-#: admin/macro/class_gofonMacro.inc:381 admin/macro/class_gofonMacro.inc:465
-#: addons/fonreports/class_fonreport.inc:190
-#: addons/fonreports/class_fonreport.inc:220
-#: personal/phoneaccount/class_phoneAccount.inc:455
-#: personal/phoneaccount/class_phoneAccount.inc:1061
-msgid "GOfon"
-msgstr ""
-
-#: admin/ogroups/asterisk/class_phonequeue.inc:401
-msgid "Cannot find old queue entry!"
-msgstr ""
-
-#: admin/ogroups/asterisk/class_phonequeue.inc:487
-#, php-format
-msgid ""
-"Found more than one entry named '%s' in queue table. Please inform your "
-"system administrator!"
-msgstr ""
-
-#: admin/ogroups/asterisk/class_phonequeue.inc:728
-#: admin/ogroups/asterisk/class_phonequeue.inc:730
-msgid "telephone number"
-msgstr ""
-
-#: admin/ogroups/asterisk/class_phonequeue.inc:787
-#: admin/ogroups/asterisk/class_phonequeue.inc:829
-#: admin/conference/class_phoneConferenceGeneric.inc:229
-#: admin/conference/class_phoneConferenceGeneric.inc:233
-#: admin/conference/class_phoneConferenceGeneric.inc:271
-#: admin/macro/class_gofonMacro.inc:343 admin/macro/class_gofonMacro.inc:452
-#: admin/macro/class_gofonMacro.inc:461 admin/macro/class_gofonMacro.inc:499
-#: admin/systems/asterisk/class_phoneGeneric.inc:267
-#: admin/systems/asterisk/class_phoneGeneric.inc:308
-#: addons/fonreports/class_fonreport.inc:220
-#: personal/phoneaccount/class_phoneAccount.inc:1046
-#: personal/phoneaccount/class_phoneAccount.inc:1166
-#: personal/phoneaccount/class_phoneAccount.inc:1172
-#: personal/phoneaccount/class_phoneAccount.inc:1368
-#: personal/phoneaccount/class_phoneAccount.inc:1450
-#: personal/phoneaccount/class_phoneAccount.inc:1528
-msgid "Error"
-msgstr ""
-
-#: admin/ogroups/asterisk/class_phonequeue.inc:802
-#: admin/ogroups/asterisk/class_phonequeue.inc:857
-#: admin/conference/class_phoneConferenceGeneric.inc:682
-#: admin/macro/class_gofonMacro.inc:473 admin/macro/class_gofonMacro.inc:484
-#: admin/macro/class_gofonMacro.inc:521
-#: admin/macro/class_gofonMacroParameters.inc:435
-#: admin/systems/asterisk/class_phoneGeneric.inc:277
-#: admin/systems/asterisk/class_phoneGeneric.inc:432
-#: admin/systems/asterisk/class_phoneGeneric.inc:446
-#: admin/systems/asterisk/class_phoneGeneric.inc:463
-#: admin/systems/services/asterisk/class_serviceAsterisk.inc:121
-#: personal/phoneaccount/class_phoneAccount.inc:1476
-#: personal/phoneaccount/class_phoneAccount.inc:1609
-msgid "LDAP error"
-msgstr ""
-
-#: admin/ogroups/asterisk/class_phonequeue.inc:864
-#: admin/systems/asterisk/class_phoneGeneric.inc:472
-#: admin/systems/asterisk/class_phoneGeneric.inc:477
-#: personal/phoneaccount/class_phoneAccount.inc:999
-#: personal/phoneaccount/class_phoneAccount.inc:1012
-#: personal/phoneaccount/class_phoneAccount.inc:1024
-#: personal/phoneaccount/class_phoneAccount.inc:1028
-#: personal/phoneaccount/class_phoneAccount.inc:1031
-#: personal/phoneaccount/class_phoneAccount.inc:1657
-msgid "Phone"
-msgstr ""
-
-#: admin/ogroups/asterisk/class_phonequeue.inc:865
-msgid "Phone group"
-msgstr ""
-
-#: admin/ogroups/asterisk/class_phonequeue.inc:872
-#: admin/ogroups/asterisk/phonequeue.tpl.c:32
-msgid "Max queue length"
-msgstr ""
-
-#: admin/ogroups/asterisk/class_phonequeue.inc:875
-#: admin/ogroups/asterisk/phonequeue.tpl.c:86
-msgid "Allow the called user to transfer his call"
-msgstr ""
-
-#: admin/ogroups/asterisk/class_phonequeue.inc:876
-#: admin/ogroups/asterisk/phonequeue.tpl.c:89
-msgid "Allows calling user to transfer call"
-msgstr ""
-
-#: admin/ogroups/asterisk/class_phonequeue.inc:877
-#: admin/ogroups/asterisk/phonequeue.tpl.c:92
-msgid "Allow the called to hangup by pressing *"
-msgstr ""
-
-#: admin/ogroups/asterisk/class_phonequeue.inc:878
-#: admin/ogroups/asterisk/phonequeue.tpl.c:98
-msgid "Ring instead of playing background music"
-msgstr ""
-
-#: admin/ogroups/asterisk/class_phonequeue.inc:879
-#: admin/ogroups/asterisk/phonequeue.tpl.c:95
-msgid "Allows calling to hangup by pressing *"
-msgstr ""
-
-#: admin/ogroups/asterisk/class_phonequeue.inc:881
-#: admin/ogroups/asterisk/phonequeue.tpl.c:47
-msgid "Music on hold"
-msgstr ""
-
-#: admin/ogroups/asterisk/class_phonequeue.inc:882
-msgid "Welcome music"
-msgstr ""
-
-#: admin/ogroups/asterisk/class_phonequeue.inc:883
-msgid "Report hold time"
-msgstr ""
-
-#: admin/ogroups/asterisk/class_phonequeue.inc:884
-msgid "'You are next' sound"
-msgstr ""
-
-#: admin/ogroups/asterisk/class_phonequeue.inc:885
-msgid "'There are' sound"
-msgstr ""
-
-#: admin/ogroups/asterisk/class_phonequeue.inc:886
-msgid "'Call waiting' sound"
-msgstr ""
-
-#: admin/ogroups/asterisk/class_phonequeue.inc:887
-msgid "'Thank you' sound"
-msgstr ""
-
-#: admin/ogroups/asterisk/class_phonequeue.inc:888
-msgid "'Minutes' sound"
-msgstr ""
-
-#: admin/ogroups/asterisk/class_phonequeue.inc:889
-msgid "'Seconds' sound"
-msgstr ""
-
-#: admin/ogroups/asterisk/class_phonequeue.inc:890
-msgid "'Less than' sound"
-msgstr ""
-
-#: admin/ogroups/asterisk/class_phonequeue.inc:891
-msgid "Queue phone number"
-msgstr ""
-
-#: admin/ogroups/asterisk/class_phonequeue.inc:892
-#: admin/conference/class_phoneConferenceGeneric.inc:707
-#: admin/ogroups/asterisk/phonequeue.tpl.c:20
-#: admin/conference/generic.tpl.c:23
-msgid "Language"
-msgstr ""
-
-#: admin/ogroups/asterisk/class_phonequeue.inc:893
-msgid "Method"
-msgstr ""
-
-#: admin/ogroups/asterisk/class_phonequeue.inc:894
-#: admin/ogroups/asterisk/phonequeue.tpl.c:83
-msgid "Announce holdtime"
-msgstr ""
-
-#: admin/ogroups/asterisk/class_phonequeue.inc:895
-msgid "Announce"
-msgstr ""
-
-#: admin/conference/conf-list.xml:11
-msgid "List of conference rooms"
-msgstr ""
-
-#: admin/conference/conf-list.xml:15 admin/conference/conf-list.xml:74
-msgid "Conference"
-msgstr ""
-
-#: admin/conference/conf-list.xml:41
-#: admin/conference/class_phoneConferenceGeneric.inc:324
-#: admin/conference/class_phoneConferenceGeneric.inc:347
-#: admin/conference/class_phoneConferenceGeneric.inc:702
-#: admin/macro/class_gofonMacro.inc:395 admin/macro/class_gofonMacro.inc:406
-#: admin/macro/macro-list.xml:41
-#: admin/systems/asterisk/class_phoneGeneric.inc:344
-#: admin/systems/asterisk/class_phoneGeneric.inc:348
-#: admin/systems/asterisk/class_phoneGeneric.inc:351
-#: admin/systems/asterisk/class_phoneGeneric.inc:366
-#: admin/systems/asterisk/class_phoneGeneric.inc:482
-#: admin/conference/conf-filter.tpl.c:5 admin/macro/macro-filter.tpl.c:5
-#: admin/macro/parameter.tpl.c:5
-msgid "Name"
-msgstr ""
-
-#: admin/conference/conf-list.xml:49
-#: admin/conference/class_phoneConferenceGeneric.inc:704
-#: admin/macro/class_gofonMacro.inc:547 admin/macro/macro-list.xml:49
-#: admin/systems/asterisk/class_phoneGeneric.inc:484
-#: admin/conference/generic.tpl.c:29 admin/macro/generic.tpl.c:17
-#: admin/systems/asterisk/phone.tpl.c:8
-msgid "Description"
-msgstr ""
-
-#: admin/conference/conf-list.xml:57 admin/macro/macro-list.xml:57
-msgid "Actions"
-msgstr ""
-
-#: admin/conference/conf-list.xml:68 admin/macro/macro-list.xml:68
-msgid "Create"
-msgstr ""
-
-#: admin/conference/conf-list.xml:86 admin/conference/conf-list.xml:125
-#: admin/macro/macro-list.xml:86 admin/macro/macro-list.xml:125
-msgid "Edit"
-msgstr ""
-
-#: admin/conference/conf-list.xml:93 admin/conference/conf-list.xml:138
-#: admin/macro/macro-list.xml:93 admin/macro/macro-list.xml:138
-msgid "Remove"
-msgstr ""
-
-#: admin/conference/class_phoneConferenceGeneric.inc:233
-#, php-format
-msgid "Cannot delete entry from server '%s' because it seems to be removed!"
-msgstr ""
-
-#: admin/conference/class_phoneConferenceGeneric.inc:308
-#, php-format
-msgid ""
-"The previously selected asterisk home server '%s' is no longer available!"
-msgstr ""
-
-#: admin/conference/class_phoneConferenceGeneric.inc:315
-#: admin/conference/generic.tpl.c:47
-msgid "PIN"
-msgstr ""
-
-#: admin/conference/class_phoneConferenceGeneric.inc:333
-#: admin/conference/class_phoneConferenceGeneric.inc:719
-msgid "Lifetime"
-msgstr ""
-
-#: admin/conference/class_phoneConferenceGeneric.inc:399
-#: personal/phoneaccount/class_phoneAccount.inc:346
-#: personal/phoneaccount/class_phoneAccount.inc:359
-#: personal/phoneaccount/class_phoneAccount.inc:617
-#: personal/phoneaccount/class_phoneAccount.inc:656
-#: personal/phoneaccount/class_phoneAccount.inc:1519
-#: personal/phoneaccount/class_phoneAccount.inc:1695
-#: admin/conference/remove.tpl.c:2 admin/macro/remove.tpl.c:2
-msgid "Warning"
-msgstr ""
-
-#: admin/conference/class_phoneConferenceGeneric.inc:400
-#, php-format
-msgid ""
-"FusionDirectory identified problems with your MySQL table definition, please"
-" activate debugging for details."
-msgstr ""
-
-#: admin/conference/class_phoneConferenceGeneric.inc:606
-#: admin/conference/class_phoneConferenceGeneric.inc:608
-#, php-format
-msgid "'%s' is already assigned to '%s'!"
-msgstr ""
-
-#: admin/conference/class_phoneConferenceGeneric.inc:693
-msgid "Phone Conference"
-msgstr ""
-
-#: admin/conference/class_phoneConferenceGeneric.inc:694
-msgid "Phone conference management"
-msgstr ""
-
-#: admin/conference/class_phoneConferenceGeneric.inc:696
-msgid "GOfon conference"
-msgstr ""
-
-#: admin/conference/class_phoneConferenceGeneric.inc:698
-msgid "Asterisk conference"
-msgstr ""
-
-#: admin/conference/class_phoneConferenceGeneric.inc:703
-#: admin/macro/class_gofonMacro.inc:546
-#: admin/systems/asterisk/class_phoneGeneric.inc:483
-#: admin/conference/generic.tpl.c:17 admin/macro/generic.tpl.c:14
-#: admin/systems/asterisk/phone.tpl.c:5
-msgid "Base"
-msgstr ""
-
-#: admin/conference/class_phoneConferenceGeneric.inc:705
-msgid "Conference PIN"
-msgstr ""
-
-#: admin/conference/class_phoneConferenceGeneric.inc:710
-#: admin/conference/generic.tpl.c:44
-msgid "Preset PIN"
-msgstr ""
-
-#: admin/conference/class_phoneConferenceGeneric.inc:711
-#: admin/conference/generic.tpl.c:50
-msgid "Record conference"
-msgstr ""
-
-#: admin/conference/class_phoneConferenceGeneric.inc:712
-#: admin/conference/generic.tpl.c:59
-msgid "Play music on hold"
-msgstr ""
-
-#: admin/conference/class_phoneConferenceGeneric.inc:713
-msgid "Activate menu"
-msgstr ""
-
-#: admin/conference/class_phoneConferenceGeneric.inc:714
-msgid "Announce user activity"
-msgstr ""
-
-#: admin/conference/class_phoneConferenceGeneric.inc:715
-msgid "Count user"
-msgstr ""
-
-#: admin/conference/class_phoneConferenceGeneric.inc:716
-msgid "Conference type"
-msgstr ""
-
-#: admin/conference/class_phoneConferenceGeneric.inc:718
-msgid "Format"
-msgstr ""
-
-#: admin/conference/class_phoneConferenceGeneric.inc:720
-#: personal/phoneaccount/class_phoneAccount.inc:1666
-msgid "Telephone number"
-msgstr ""
-
-#: admin/conference/class_phoneConferenceGeneric.inc:721
-msgid "Owner"
-msgstr ""
-
-#: admin/conference/class_phoneConferenceManagment.inc:36
-msgid "Phone Conferences"
-msgstr ""
-
-#: admin/conference/class_phoneConferenceManagment.inc:37
-msgid "Phone Conference management"
-msgstr ""
-
-#: admin/macro/class_gofonMacro.inc:202
-#, php-format
-msgid ""
-"Macro could not be removed from server '%s', please check database "
-"consistency!"
-msgstr ""
-
-#: admin/macro/class_gofonMacro.inc:264
-#, php-format
-msgid "Application missing in line %s!"
-msgstr ""
-
-#: admin/macro/class_gofonMacro.inc:267
-#, php-format
-msgid "Priority missing in line %s!"
-msgstr ""
-
-#: admin/macro/class_gofonMacro.inc:271
-#, php-format
-msgid "Extension missing in line %s!"
-msgstr ""
-
-#: admin/macro/class_gofonMacro.inc:281
-#, php-format
-msgid "Duplicate combination of 'extension' and 'priority' in line %s!"
-msgstr ""
-
-#: admin/macro/class_gofonMacro.inc:317
-#, php-format
-msgid ""
-"Macro could not be added to server '%s', please check database consistency!"
-msgstr ""
-
-#: admin/macro/class_gofonMacro.inc:410
-msgid "Name can be 20 characters at maximum!"
-msgstr ""
-
-#: admin/macro/class_gofonMacro.inc:419
-msgid "Macro is still in use!"
-msgstr ""
-
-#: admin/macro/class_gofonMacro.inc:426
-msgid "Macro is empty!"
-msgstr ""
-
-#: admin/macro/class_gofonMacro.inc:452
-#: admin/systems/asterisk/class_phoneGeneric.inc:267
-#, php-format
-msgid "Cannot delete entry because it is still in use by '%s'!"
-msgstr ""
-
-#: admin/macro/class_gofonMacro.inc:465
-#: addons/fonreports/class_fonreport.inc:190
-#: personal/phoneaccount/class_phoneAccount.inc:455
-#: personal/phoneaccount/class_phoneAccount.inc:1061
-#: personal/phoneaccount/class_phoneAccount.inc:1567
-msgid "Configuration error"
-msgstr ""
-
-#: admin/macro/class_gofonMacro.inc:536 admin/macro/class_gofonMacro.inc:541
-msgid "Asterisk macro"
-msgstr ""
-
-#: admin/macro/class_gofonMacro.inc:537
-msgid "Asterisk macro management"
-msgstr ""
-
-#: admin/macro/class_gofonMacro.inc:539
-msgid "GOfon macro"
-msgstr ""
-
-#: admin/macro/class_gofonMacro.inc:545 admin/macro/generic.tpl.c:2
-#: admin/macro/generic.tpl.c:5 admin/macro/paste_generic.tpl.c:2
-#: admin/macro/paste_generic.tpl.c:5
-msgid "Macro name"
-msgstr ""
-
-#: admin/macro/class_gofonMacro.inc:548 admin/macro/generic.tpl.c:8
-msgid "Display name"
-msgstr ""
-
-#: admin/macro/class_gofonMacro.inc:549
-msgid "Macro content and parameter"
-msgstr ""
-
-#: admin/macro/class_gofonMacro.inc:550
-msgid "Visibility flag"
-msgstr ""
-
-#: admin/macro/class_gofonMacroManagement.inc:36
-msgid "Phone Macros"
-msgstr ""
-
-#: admin/macro/class_gofonMacroManagement.inc:37
-msgid "Phone Macros management"
-msgstr ""
-
-#: admin/macro/macro-list.xml:11
-msgid "List of macros"
-msgstr ""
-
-#: admin/macro/macro-list.xml:15 admin/macro/macro-list.xml:74
-msgid "Macro"
-msgstr ""
-
-#: admin/macro/class_gofonMacroParameters.inc:58
-msgid "Parameter"
-msgstr ""
-
-#: admin/macro/class_gofonMacroParameters.inc:59
-msgid "Asterisk macro parameter"
-msgstr ""
-
-#: admin/macro/class_gofonMacroParameters.inc:234
-#: personal/phoneaccount/generic.tpl.c:35
-msgid "Phone macro"
-msgstr ""
-
-#: admin/macro/class_gofonMacroParameters.inc:290
-msgid "String"
-msgstr ""
-
-#: admin/macro/class_gofonMacroParameters.inc:291
-msgid "Combobox"
-msgstr ""
-
-#: admin/macro/class_gofonMacroParameters.inc:292
-msgid "Bool"
-msgstr ""
-
-#: admin/macro/class_gofonMacroParameters.inc:298
-msgid "Delete unused"
-msgstr ""
-
-#: admin/macro/class_gofonMacroParameters.inc:374
-#, php-format
-msgid "Parameter %s contains invalid character. '!,#' is used as delimiter!"
-msgstr ""
-
-#: admin/macro/class_gofonMacroParameters.inc:379
-#, php-format
-msgid "Parameter %s is invalid!"
-msgstr ""
-
-#: admin/macro/class_gofonMacroParameters.inc:408
-#: personal/phoneaccount/class_phoneAccount.inc:1600
-msgid "Information"
-msgstr ""
-
-#: admin/macro/class_gofonMacroParameters.inc:408
-msgid ""
-"Number of parameters for this macro has changed. Please update all users "
-"using it!"
-msgstr ""
-
-#: admin/systems/asterisk/class_phoneGeneric.inc:151
-msgid "phone"
-msgstr ""
-
-#: admin/systems/asterisk/class_phoneGeneric.inc:230
-msgid "yes"
-msgstr ""
-
-#: admin/systems/asterisk/class_phoneGeneric.inc:230
-msgid "no"
-msgstr ""
-
-#: admin/systems/asterisk/class_phoneGeneric.inc:247
-msgid "dynamic"
-msgstr ""
-
-#: admin/systems/asterisk/class_phoneGeneric.inc:247
-msgid "Networksettings"
-msgstr ""
-
-#: admin/systems/asterisk/class_phoneGeneric.inc:330
-#: admin/systems/asterisk/class_phoneGeneric.inc:333
-msgid "IP address"
-msgstr ""
-
-#: admin/systems/asterisk/class_phoneGeneric.inc:473
-msgid "Phone information"
-msgstr ""
-
-#: admin/systems/asterisk/class_phoneGeneric.inc:476
-#: personal/phoneaccount/class_phoneAccount.inc:1668
-msgid "Phone hardware"
-msgstr ""
-
-#: admin/systems/asterisk/class_phoneGeneric.inc:485
-msgid "SIP Mode"
-msgstr ""
-
-#: admin/systems/asterisk/class_phoneGeneric.inc:486
-msgid "SIP DTMF mode"
-msgstr ""
-
-#: admin/systems/asterisk/class_phoneGeneric.inc:487
-msgid "SIP Default ip"
-msgstr ""
-
-#: admin/systems/asterisk/class_phoneGeneric.inc:488
-msgid "SIP Qualify"
-msgstr ""
-
-#: admin/systems/asterisk/class_phoneGeneric.inc:489
-msgid "IAX authentication type"
-msgstr ""
-
-#: admin/systems/asterisk/class_phoneGeneric.inc:490
-msgid "IAX secret"
-msgstr ""
-
-#: admin/systems/asterisk/class_phoneGeneric.inc:491
-msgid "IAX account code"
-msgstr ""
-
-#: admin/systems/asterisk/class_phoneGeneric.inc:492
-msgid "IAX trunk lines"
-msgstr ""
-
-#: admin/systems/asterisk/class_phoneGeneric.inc:493
-msgid "IAX permit settings"
-msgstr ""
-
-#: admin/systems/asterisk/class_phoneGeneric.inc:494
-msgid "IAX deny settings"
-msgstr ""
-
-#: admin/systems/asterisk/class_phoneGeneric.inc:495
-msgid "CAPI MSN"
-msgstr ""
-
-#: admin/systems/asterisk/class_phoneGeneric.inc:496
-msgid "Hardware type"
-msgstr ""
-
-#: admin/systems/services/asterisk/class_serviceAsterisk.inc:35
-msgid "VoIP database information"
-msgstr ""
-
-#: admin/systems/services/asterisk/class_serviceAsterisk.inc:38
-msgid "Asterisk DB user"
-msgstr ""
-
-#: admin/systems/services/asterisk/class_serviceAsterisk.inc:38
-msgid "Login for asterisk database administrator"
-msgstr ""
-
-#: admin/systems/services/asterisk/class_serviceAsterisk.inc:42
-msgid "Password"
-msgstr ""
-
-#: admin/systems/services/asterisk/class_serviceAsterisk.inc:42
-msgid "Password for asterisk database administrator"
-msgstr ""
-
-#: admin/systems/services/asterisk/class_serviceAsterisk.inc:46
-msgid "Country dial prefix"
-msgstr ""
-
-#: admin/systems/services/asterisk/class_serviceAsterisk.inc:50
-msgid "Local dial prefix"
-msgstr ""
-
-#: admin/systems/services/asterisk/class_serviceAsterisk.inc:54
-msgid "Driver"
-msgstr ""
-
-#: admin/systems/services/asterisk/class_serviceAsterisk.inc:54
-msgid "Driver to use to contact this database."
-msgstr ""
-
-#: admin/systems/services/asterisk/class_serviceAsterisk.inc:95
-#, php-format
-msgid ""
-"You can't remove the asterisk database extension, it is still in use by "
-"these objects '%s'."
-msgstr ""
-
-#: admin/systems/services/asterisk/class_serviceAsterisk.inc:140
-msgid "VoIP service (asterisk)"
-msgstr ""
-
-#: admin/systems/services/asterisk/class_serviceAsterisk.inc:141
-msgid "VoIP - asterisk management"
-msgstr ""
-
-#: admin/systems/services/asterisk/class_serviceAsterisk.inc:141
-msgid "Services"
-msgstr ""
-
-#: addons/fonreports/class_fonreport.inc:232
-msgid "Insufficient permissions"
-msgstr ""
-
-#: addons/fonreports/class_fonreport.inc:251
-msgid "Y-M-D"
-msgstr ""
-
-#: addons/fonreports/class_fonreport.inc:418
-#: addons/fonreports/class_fonreport.inc:419
-#: addons/fonreports/class_fonreport.inc:424 addons/fonreports/main.inc:46
-msgid "Phone reports"
-msgstr ""
-
-#: addons/fonreports/class_fonreport.inc:419
-msgid "All entries are readonly"
-msgstr ""
-
-#: addons/fonreports/class_fonreport.inc:428
-#: addons/fonreports/contents.tpl.c:32
-msgid "Date"
-msgstr ""
-
-#: addons/fonreports/class_fonreport.inc:429
-#: addons/fonreports/contents.tpl.c:35
-msgid "Source"
-msgstr ""
-
-#: addons/fonreports/class_fonreport.inc:430
-#: addons/fonreports/contents.tpl.c:38
-msgid "Destination"
-msgstr ""
-
-#: addons/fonreports/class_fonreport.inc:431
-#: addons/fonreports/contents.tpl.c:41
-msgid "Channel"
-msgstr ""
-
-#: addons/fonreports/class_fonreport.inc:432
-msgid "Application called"
-msgstr ""
-
-#: addons/fonreports/class_fonreport.inc:433
-msgid "Disposition"
-msgstr ""
-
-#: addons/fonreports/class_fonreport.inc:434
-#: addons/fonreports/contents.tpl.c:50
-msgid "Duration"
-msgstr ""
-
-#: personal/phoneaccount/class_phoneAccount.inc:176
-msgid "automatic"
-msgstr ""
-
-#: personal/phoneaccount/class_phoneAccount.inc:212
-msgid "no macro"
-msgstr ""
-
-#: personal/phoneaccount/class_phoneAccount.inc:240
-msgid "undefined"
-msgstr ""
-
-#: personal/phoneaccount/class_phoneAccount.inc:359
-#, php-format
-msgid ""
-"Cannot identify telephone extension in database, please try to save again."
-msgstr ""
-
-#: personal/phoneaccount/class_phoneAccount.inc:577
-#: personal/phoneaccount/class_phoneAccount.inc:595
-msgid "Abort saving entries to keep the database consistent."
+#: admin/systems/asterisk/class_phoneIAX.inc:30
+#: admin/systems/asterisk/class_phoneIAX.inc:34
+#: personal/asterisk/class_asteriskAccount.inc:45
+msgid "Phone"
 msgstr ""
 
-#: personal/phoneaccount/class_phoneAccount.inc:618
-#: personal/phoneaccount/class_phoneAccount.inc:657
-#: personal/phoneaccount/class_phoneAccount.inc:1520
-#, php-format
-msgid ""
-"FusionDirectory identified problems with your database table definition!"
+#: admin/systems/asterisk/class_phoneIAX.inc:31
+msgid "Asterisk phone"
 msgstr ""
 
-#: personal/phoneaccount/class_phoneAccount.inc:1023
-msgid "Remove phone account"
+#: admin/systems/asterisk/class_phoneIAX.inc:33
+msgid "Phone hardware"
 msgstr ""
 
-#: personal/phoneaccount/class_phoneAccount.inc:1027
-#: personal/phoneaccount/class_phoneAccount.inc:1030
-msgid "Create phone account"
+#: admin/systems/asterisk/class_phoneIAX.inc:46
+#: personal/asterisk/class_asteriskAccount.inc:42
+msgid "Telephone"
 msgstr ""
 
-#: personal/phoneaccount/class_phoneAccount.inc:1028
-msgid "User uid"
+#: admin/systems/asterisk/class_phoneIAX.inc:49
+msgid "Name"
 msgstr ""
 
-#: personal/phoneaccount/class_phoneAccount.inc:1046
-msgid "Selected macro is not available anymore!"
+#: admin/systems/asterisk/class_phoneIAX.inc:49
+msgid "Name of this phone"
 msgstr ""
 
-#: personal/phoneaccount/class_phoneAccount.inc:1221
-msgid "Choose your private phone"
+#: admin/systems/asterisk/class_phoneIAX.inc:53
+msgid "Account name"
 msgstr ""
 
-#: personal/phoneaccount/class_phoneAccount.inc:1346
-msgid ""
-"There must be at least one server with an asterisk database to create a "
-"phone account."
+#: admin/systems/asterisk/class_phoneIAX.inc:53
+msgid "Name of the account"
 msgstr ""
 
-#: personal/phoneaccount/class_phoneAccount.inc:1354
-#: personal/phoneaccount/class_phoneAccount.inc:1357
-#: personal/phoneaccount/generic.tpl.c:29
-#: personal/phoneaccount/paste_generic.tpl.c:11
-msgid "Voicemail PIN"
+#: admin/systems/services/asterisk/class_serviceAsterisk.inc:35
+msgid "VoIP database information"
 msgstr ""
 
-#: personal/phoneaccount/class_phoneAccount.inc:1354
-msgid "Between 1-4 charactes"
+#: admin/systems/services/asterisk/class_serviceAsterisk.inc:38
+msgid "Asterisk DB user"
 msgstr ""
 
-#: personal/phoneaccount/class_phoneAccount.inc:1362
-#: personal/phoneaccount/generic.tpl.c:32
-#: personal/phoneaccount/paste_generic.tpl.c:14
-msgid "Phone PIN"
+#: admin/systems/services/asterisk/class_serviceAsterisk.inc:38
+msgid "Login for asterisk database administrator"
 msgstr ""
 
-#: personal/phoneaccount/class_phoneAccount.inc:1394
-#: admin/conference/generic.tpl.c:38 admin/conference/paste_generic.tpl.c:8
-msgid "Phone number"
+#: admin/systems/services/asterisk/class_serviceAsterisk.inc:42
+msgid "Password"
 msgstr ""
 
-#: personal/phoneaccount/class_phoneAccount.inc:1402
-#, php-format
-msgid "macro parameter %s"
+#: admin/systems/services/asterisk/class_serviceAsterisk.inc:42
+msgid "Password for asterisk database administrator"
 msgstr ""
 
-#: personal/phoneaccount/class_phoneAccount.inc:1450
-msgid "An error occured while updating the database entries!"
+#: admin/systems/services/asterisk/class_serviceAsterisk.inc:46
+msgid "Country dial prefix"
 msgstr ""
 
-#: personal/phoneaccount/class_phoneAccount.inc:1567
-msgid "Was not able to found any asterisk server"
+#: admin/systems/services/asterisk/class_serviceAsterisk.inc:50
+msgid "Local dial prefix"
 msgstr ""
 
-#: personal/phoneaccount/class_phoneAccount.inc:1600
-#, php-format
-msgid "User '%s' has been removed from phone queue '%s'."
+#: admin/systems/services/asterisk/class_serviceAsterisk.inc:54
+msgid "Driver"
 msgstr ""
 
-#: personal/phoneaccount/class_phoneAccount.inc:1637
-#: personal/phoneaccount/class_phoneAccount.inc:1639
-#, php-format
-msgid "The specified telephonenumber '%s' is already assigned to '%s'."
+#: admin/systems/services/asterisk/class_serviceAsterisk.inc:54
+msgid "Driver to use to contact this database."
 msgstr ""
 
-#: personal/phoneaccount/class_phoneAccount.inc:1649
+#: admin/systems/services/asterisk/class_serviceAsterisk.inc:95
 #, php-format
 msgid ""
-"The previously selected asterisk home server (%s) is no longer available. "
-"Remove aborted."
-msgstr ""
-
-#: personal/phoneaccount/class_phoneAccount.inc:1658
-msgid "Phone account settings"
-msgstr ""
-
-#: personal/phoneaccount/class_phoneAccount.inc:1667
-msgid "Macro settings"
-msgstr ""
-
-#: personal/phoneaccount/class_phoneAccount.inc:1670
-msgid "Phone context"
+"You can't remove the asterisk database extension, it is still in use by "
+"these objects '%s'."
 msgstr ""
 
-#: personal/phoneaccount/class_phoneAccount.inc:1671
-msgid "Voice mail context"
+#: admin/systems/services/asterisk/class_serviceAsterisk.inc:121
+msgid "LDAP error"
 msgstr ""
 
-#: personal/phoneaccount/class_phoneAccount.inc:1672
-msgid "Telephone pin"
+#: admin/systems/services/asterisk/class_serviceAsterisk.inc:140
+msgid "VoIP service (asterisk)"
 msgstr ""
 
-#: personal/phoneaccount/class_phoneAccount.inc:1673
-msgid "Voicemail pin"
+#: admin/systems/services/asterisk/class_serviceAsterisk.inc:141
+msgid "VoIP - asterisk management"
 msgstr ""
 
-#: personal/phoneaccount/class_phoneAccount.inc:1695
-#, php-format
-msgid "You need to configure %s contexts first"
+#: admin/systems/services/asterisk/class_serviceAsterisk.inc:141
+msgid "Services"
 msgstr ""
 
-#: personal/phoneaccount/main.inc:124
-msgid "Click the 'Edit' button below to change informations in this dialog"
+#: personal/asterisk/class_asteriskAccount.inc:30
+#: config/asterisk/class_asteriskPluginConfig.inc:28
+#: config/asterisk/class_asteriskPluginConfig.inc:41
+msgid "Asterisk"
 msgstr ""
 
-#: personal/phoneaccount/main.inc:134
-#: personal/phoneaccount/paste_generic.tpl.c:2
-msgid "Phone settings"
+#: personal/asterisk/class_asteriskAccount.inc:31
+msgid "Asterisk account"
 msgstr ""
 
-#: config/asterisk/class_asteriskPluginConfig.inc:28
-#: config/asterisk/class_asteriskPluginConfig.inc:41
-msgid "Asterisk"
+#: personal/asterisk/class_asteriskAccount.inc:45
+msgid "Select the phone associated to this user"
 msgstr ""
 
 #: config/asterisk/class_asteriskPluginConfig.inc:29
@@ -1010,338 +172,3 @@ msgstr ""
 #: config/asterisk/class_asteriskPluginConfig.inc:72
 msgid "Available voicemail contexts"
 msgstr ""
-
-#: admin/ogroups/asterisk/phonequeue.tpl.c:2
-msgid ""
-"Only users with the same asterisk home server will be included to this "
-"queue."
-msgstr ""
-
-#: admin/ogroups/asterisk/phonequeue.tpl.c:5
-#: personal/phoneaccount/generic.tpl.c:2
-#: personal/phoneaccount/paste_generic.tpl.c:5
-msgid "Phone numbers"
-msgstr ""
-
-#: admin/ogroups/asterisk/phonequeue.tpl.c:8
-msgid "Up"
-msgstr ""
-
-#: admin/ogroups/asterisk/phonequeue.tpl.c:11
-msgid "Down"
-msgstr ""
-
-#: admin/ogroups/asterisk/phonequeue.tpl.c:14
-#: admin/conference/generic.tpl.c:41
-msgid "Options"
-msgstr ""
-
-#: admin/ogroups/asterisk/phonequeue.tpl.c:29
-msgid "Strategy"
-msgstr ""
-
-#: admin/ogroups/asterisk/phonequeue.tpl.c:38
-msgid "(in seconds)"
-msgstr ""
-
-#: admin/ogroups/asterisk/phonequeue.tpl.c:41
-msgid "Queue sound setup"
-msgstr ""
-
-#: admin/ogroups/asterisk/phonequeue.tpl.c:44
-msgid "Use music on hold instead of ringing"
-msgstr ""
-
-#: admin/ogroups/asterisk/phonequeue.tpl.c:50
-msgid "Welcome sound file"
-msgstr ""
-
-#: admin/ogroups/asterisk/phonequeue.tpl.c:53
-msgid "Announce message"
-msgstr ""
-
-#: admin/ogroups/asterisk/phonequeue.tpl.c:56
-msgid "Sound file for 'You are next ...'"
-msgstr ""
-
-#: admin/ogroups/asterisk/phonequeue.tpl.c:59
-msgid "'There are ...'"
-msgstr ""
-
-#: admin/ogroups/asterisk/phonequeue.tpl.c:62
-msgid "'... calls waiting'"
-msgstr ""
-
-#: admin/ogroups/asterisk/phonequeue.tpl.c:65
-msgid "'Thank you' message"
-msgstr ""
-
-#: admin/ogroups/asterisk/phonequeue.tpl.c:68
-msgid "'minutes' sound file"
-msgstr ""
-
-#: admin/ogroups/asterisk/phonequeue.tpl.c:71
-msgid "'seconds' sound file"
-msgstr ""
-
-#: admin/ogroups/asterisk/phonequeue.tpl.c:74
-msgid "Hold sound file"
-msgstr ""
-
-#: admin/ogroups/asterisk/phonequeue.tpl.c:77
-msgid "Less Than sound file"
-msgstr ""
-
-#: admin/ogroups/asterisk/phonequeue.tpl.c:80
-msgid "Phone attributes "
-msgstr ""
-
-#: admin/conference/conf-filter.tpl.c:2 admin/macro/macro-filter.tpl.c:2
-#: addons/fonreports/contents.tpl.c:2
-msgid "Filter"
-msgstr ""
-
-#: admin/conference/generic.tpl.c:2
-msgid "Properties"
-msgstr ""
-
-#: admin/conference/generic.tpl.c:5 admin/conference/paste_generic.tpl.c:2
-msgid "Conference name"
-msgstr ""
-
-#: admin/conference/generic.tpl.c:8 admin/conference/paste_generic.tpl.c:5
-msgid "Name of conference to create"
-msgstr ""
-
-#: admin/conference/generic.tpl.c:11
-msgid "Type"
-msgstr ""
-
-#: admin/conference/generic.tpl.c:14
-msgid "Choose subtree to place conference in"
-msgstr ""
-
-#: admin/conference/generic.tpl.c:26
-msgid "Select language"
-msgstr ""
-
-#: admin/conference/generic.tpl.c:32
-msgid "Descriptive text for department"
-msgstr ""
-
-#: admin/conference/generic.tpl.c:35
-msgid "Lifetime (in days)"
-msgstr ""
-
-#: admin/conference/generic.tpl.c:53
-msgid "Sound file format"
-msgstr ""
-
-#: admin/conference/generic.tpl.c:56
-msgid "Choose subtree to place department in"
-msgstr ""
-
-#: admin/conference/generic.tpl.c:62
-msgid "Activate session menu"
-msgstr ""
-
-#: admin/conference/generic.tpl.c:65
-msgid "Announce users joining or leaving the conference"
-msgstr ""
-
-#: admin/conference/generic.tpl.c:68
-msgid "Count users"
-msgstr ""
-
-#: admin/conference/remove.tpl.c:5 admin/macro/remove.tpl.c:5
-msgid ""
-"Please double check if you really want to do this since there is no way for "
-"FusionDirectory to get your data back."
-msgstr ""
-
-#: admin/conference/remove.tpl.c:8 admin/macro/remove.tpl.c:8
-msgid "So - if you're sure - press 'Delete' to continue or 'Cancel' to abort."
-msgstr ""
-
-#: admin/macro/generic.tpl.c:11
-msgid "Macro name to be displayed"
-msgstr ""
-
-#: admin/macro/generic.tpl.c:20
-msgid "Visible for user"
-msgstr ""
-
-#: admin/macro/generic.tpl.c:23
-msgid "Macro text"
-msgstr ""
-
-#: admin/macro/parameter.tpl.c:2
-msgid "Argument"
-msgstr ""
-
-#: admin/macro/parameter.tpl.c:8
-msgid "type"
-msgstr ""
-
-#: admin/macro/parameter.tpl.c:11
-msgid "Default value"
-msgstr ""
-
-#: admin/macro/parameter.tpl.c:14
-msgid "You are not allowed to view the macro parameter settings"
-msgstr ""
-
-#: admin/systems/asterisk/phonesettings.tpl.c:2
-msgid "Advanced phone settings"
-msgstr ""
-
-#: admin/systems/asterisk/phonesettings.tpl.c:5
-msgid "Phone type"
-msgstr ""
-
-#: admin/systems/asterisk/phonesettings.tpl.c:8
-#: admin/systems/asterisk/phonesettings.tpl.c:14
-#: admin/systems/asterisk/phonesettings.tpl.c:20
-#: admin/systems/asterisk/phonesettings.tpl.c:26
-#: admin/systems/asterisk/phonesettings.tpl.c:35
-#: admin/systems/asterisk/phonesettings.tpl.c:47
-#: admin/systems/asterisk/phonesettings.tpl.c:65
-msgid "Choose a phone type"
-msgstr ""
-
-#: admin/systems/asterisk/phonesettings.tpl.c:11
-msgid "Mode"
-msgstr ""
-
-#: admin/systems/asterisk/phonesettings.tpl.c:17
-msgid "DTMF mode"
-msgstr ""
-
-#: admin/systems/asterisk/phonesettings.tpl.c:23
-#: admin/systems/asterisk/phonesettings.tpl.c:38
-msgid "Default IP"
-msgstr ""
-
-#: admin/systems/asterisk/phonesettings.tpl.c:29
-#: admin/systems/asterisk/phonesettings.tpl.c:41
-msgid "Response timeout"
-msgstr ""
-
-#: admin/systems/asterisk/phonesettings.tpl.c:32
-msgid "Modus"
-msgstr ""
-
-#: admin/systems/asterisk/phonesettings.tpl.c:44
-msgid "Authtype"
-msgstr ""
-
-#: admin/systems/asterisk/phonesettings.tpl.c:50
-msgid "Secret"
-msgstr ""
-
-#: admin/systems/asterisk/phonesettings.tpl.c:53
-msgid "GoFonInkeys"
-msgstr ""
-
-#: admin/systems/asterisk/phonesettings.tpl.c:56
-msgid "GoFonOutKeys"
-msgstr ""
-
-#: admin/systems/asterisk/phonesettings.tpl.c:59
-msgid "Account code"
-msgstr ""
-
-#: admin/systems/asterisk/phonesettings.tpl.c:62
-msgid "Trunk lines"
-msgstr ""
-
-#: admin/systems/asterisk/phonesettings.tpl.c:68
-msgid "Hosts that are allowed to connect"
-msgstr ""
-
-#: admin/systems/asterisk/phonesettings.tpl.c:71
-#: admin/systems/asterisk/phonesettings.tpl.c:77
-msgid "List of alternative mail addresses"
-msgstr ""
-
-#: admin/systems/asterisk/phonesettings.tpl.c:74
-msgid "Hosts that are not allowed to connect"
-msgstr ""
-
-#: admin/systems/asterisk/phonesettings.tpl.c:80
-msgid "MSN"
-msgstr ""
-
-#: admin/systems/asterisk/phone.tpl.c:2
-msgid "Phone name"
-msgstr ""
-
-#: addons/fonreports/contents.tpl.c:5
-msgid "Search for"
-msgstr ""
-
-#: addons/fonreports/contents.tpl.c:8
-msgid "Enter user name to search for"
-msgstr ""
-
-#: addons/fonreports/contents.tpl.c:11 addons/fonreports/contents.tpl.c:26
-msgid "in"
-msgstr ""
-
-#: addons/fonreports/contents.tpl.c:14
-msgid "Select subtree to base search on"
-msgstr ""
-
-#: addons/fonreports/contents.tpl.c:17
-msgid "on"
-msgstr ""
-
-#: addons/fonreports/contents.tpl.c:20
-msgid "Select server to search on"
-msgstr ""
-
-#: addons/fonreports/contents.tpl.c:23
-msgid "during"
-msgstr ""
-
-#: addons/fonreports/contents.tpl.c:29
-msgid "Search"
-msgstr ""
-
-#: addons/fonreports/contents.tpl.c:44
-msgid "Application"
-msgstr ""
-
-#: addons/fonreports/contents.tpl.c:47
-msgid "Status"
-msgstr ""
-
-#: addons/fonreports/contents.tpl.c:53
-msgid "Search returned no results..."
-msgstr ""
-
-#: personal/phoneaccount/generic.tpl.c:5
-#: personal/phoneaccount/paste_generic.tpl.c:8
-msgid "Telephone hardware"
-msgstr ""
-
-#: personal/phoneaccount/generic.tpl.c:8
-msgid "Telephone"
-msgstr ""
-
-#: personal/phoneaccount/generic.tpl.c:14
-msgid "Select the accounts home server"
-msgstr ""
-
-#: personal/phoneaccount/generic.tpl.c:17
-msgid "Context"
-msgstr ""
-
-#: personal/phoneaccount/generic.tpl.c:20
-#: personal/phoneaccount/generic.tpl.c:26
-msgid "Select the accounts context"
-msgstr ""
-
-#: personal/phoneaccount/generic.tpl.c:23
-msgid "Voicemail context"
-msgstr ""
diff --git a/asterisk/locale/sv/fusiondirectory.po b/asterisk/locale/sv/fusiondirectory.po
index 151ffa7284f6a76b1573d46c0b7b71826f3263f8..b91b047ea5da51c89bec5be22f436f86622dfd43 100644
--- a/asterisk/locale/sv/fusiondirectory.po
+++ b/asterisk/locale/sv/fusiondirectory.po
@@ -5,704 +5,53 @@
 # Translators:
 msgid ""
 msgstr ""
-"Project-Id-Version: FusionDirectory-108\n"
+"Project-Id-Version: FusionDirectory-109\n"
 "Report-Msgid-Bugs-To: documentation@lists.fusiondirectory.org\n"
-"POT-Creation-Date: 2015-03-31 11:49+0200\n"
-"PO-Revision-Date: 2015-03-31 11:41+0000\n"
+"POT-Creation-Date: 2014-12-15 17:47+0100\n"
+"PO-Revision-Date: 2015-02-25 16:04+0000\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>\n"
-"Language-Team: Swedish (http://www.transifex.com/projects/p/FusionDirectory-108/language/sv/)\n"
+"Language-Team: Swedish (http://www.transifex.com/projects/p/FusionDirectory-109/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/ogroups/asterisk/class_phonequeue.inc:110
-#: admin/conference/class_phoneConferenceGeneric.inc:104
-#: personal/phoneaccount/class_phoneAccount.inc:148
-msgid "Obsolete entry"
-msgstr ""
-
-#: admin/ogroups/asterisk/class_phonequeue.inc:110
-#: admin/conference/class_phoneConferenceGeneric.inc:104
-#: personal/phoneaccount/class_phoneAccount.inc:148
-#, php-format
-msgid ""
-"The current home server is not available anymore. It will be moved to '%s' "
-"if you save this entry!"
-msgstr ""
-
-#: admin/ogroups/asterisk/class_phonequeue.inc:140
-msgid "ring all"
-msgstr ""
-
-#: admin/ogroups/asterisk/class_phonequeue.inc:141
-msgid "round robin"
-msgstr ""
-
-#: admin/ogroups/asterisk/class_phonequeue.inc:142
-msgid "least recently called"
-msgstr ""
-
-#: admin/ogroups/asterisk/class_phonequeue.inc:143
-msgid "fewest completed calls"
-msgstr ""
-
-#: admin/ogroups/asterisk/class_phonequeue.inc:144
-msgid "random"
-msgstr ""
-
-#: admin/ogroups/asterisk/class_phonequeue.inc:145
-msgid "round robin with memory"
-msgstr ""
-
-#: admin/ogroups/asterisk/class_phonequeue.inc:180
-msgid "Remove the phone queue from this Account"
-msgstr ""
-
-#: admin/ogroups/asterisk/class_phonequeue.inc:181
-#: admin/ogroups/asterisk/class_phonequeue.inc:184
-msgid "phone queue"
-msgstr ""
-
-#: admin/ogroups/asterisk/class_phonequeue.inc:183
-msgid "Create phone queue"
-msgstr ""
-
-#: admin/ogroups/asterisk/class_phonequeue.inc:272
-msgid ""
-"There must be at least one server with an asterisk database to create a "
-"phone queue."
-msgstr ""
-
-#: admin/ogroups/asterisk/class_phonequeue.inc:275
-#: admin/ogroups/asterisk/class_phonequeue.inc:873
-#: admin/conference/class_phoneConferenceGeneric.inc:709
-#: personal/phoneaccount/class_phoneAccount.inc:1350
-#: personal/phoneaccount/class_phoneAccount.inc:1669
-#: admin/ogroups/asterisk/phonequeue.tpl.c:17
-#: admin/conference/generic.tpl.c:20 personal/phoneaccount/generic.tpl.c:11
-msgid "Home server"
-msgstr ""
-
-#: admin/ogroups/asterisk/class_phonequeue.inc:281
-#: admin/ogroups/asterisk/class_phonequeue.inc:871
-#: admin/ogroups/asterisk/phonequeue.tpl.c:23
-msgid "Timeout"
-msgstr ""
-
-#: admin/ogroups/asterisk/class_phonequeue.inc:284
-#: admin/ogroups/asterisk/class_phonequeue.inc:896
-#: admin/ogroups/asterisk/phonequeue.tpl.c:26
-msgid "Retry"
-msgstr ""
-
-#: admin/ogroups/asterisk/class_phonequeue.inc:287
-msgid "Queue length"
-msgstr ""
-
-#: admin/ogroups/asterisk/class_phonequeue.inc:290
-#: admin/ogroups/asterisk/class_phonequeue.inc:874
-#: admin/ogroups/asterisk/phonequeue.tpl.c:35
-msgid "Announce frequency"
-msgstr ""
-
-#: admin/ogroups/asterisk/class_phonequeue.inc:293
-#: admin/conference/class_phoneConferenceGeneric.inc:328
-msgid "Number"
-msgstr ""
-
-#: admin/ogroups/asterisk/class_phonequeue.inc:316
-#: admin/ogroups/asterisk/class_phonequeue.inc:361
-msgid "asterisk"
-msgstr ""
-
-#: admin/ogroups/asterisk/class_phonequeue.inc:345
-#: admin/ogroups/asterisk/class_phonequeue.inc:696
-#: admin/conference/class_phoneConferenceGeneric.inc:369
-#: admin/macro/class_gofonMacro.inc:381 admin/macro/class_gofonMacro.inc:465
-#: addons/fonreports/class_fonreport.inc:190
-#: addons/fonreports/class_fonreport.inc:220
-#: personal/phoneaccount/class_phoneAccount.inc:455
-#: personal/phoneaccount/class_phoneAccount.inc:1061
-msgid "GOfon"
-msgstr ""
-
-#: admin/ogroups/asterisk/class_phonequeue.inc:401
-msgid "Cannot find old queue entry!"
-msgstr ""
-
-#: admin/ogroups/asterisk/class_phonequeue.inc:487
-#, php-format
-msgid ""
-"Found more than one entry named '%s' in queue table. Please inform your "
-"system administrator!"
-msgstr ""
-
-#: admin/ogroups/asterisk/class_phonequeue.inc:728
-#: admin/ogroups/asterisk/class_phonequeue.inc:730
-msgid "telephone number"
-msgstr ""
-
-#: admin/ogroups/asterisk/class_phonequeue.inc:787
-#: admin/ogroups/asterisk/class_phonequeue.inc:829
-#: admin/conference/class_phoneConferenceGeneric.inc:229
-#: admin/conference/class_phoneConferenceGeneric.inc:233
-#: admin/conference/class_phoneConferenceGeneric.inc:271
-#: admin/macro/class_gofonMacro.inc:343 admin/macro/class_gofonMacro.inc:452
-#: admin/macro/class_gofonMacro.inc:461 admin/macro/class_gofonMacro.inc:499
-#: admin/systems/asterisk/class_phoneGeneric.inc:267
-#: admin/systems/asterisk/class_phoneGeneric.inc:308
-#: addons/fonreports/class_fonreport.inc:220
-#: personal/phoneaccount/class_phoneAccount.inc:1046
-#: personal/phoneaccount/class_phoneAccount.inc:1166
-#: personal/phoneaccount/class_phoneAccount.inc:1172
-#: personal/phoneaccount/class_phoneAccount.inc:1368
-#: personal/phoneaccount/class_phoneAccount.inc:1450
-#: personal/phoneaccount/class_phoneAccount.inc:1528
-msgid "Error"
-msgstr "Fel"
-
-#: admin/ogroups/asterisk/class_phonequeue.inc:802
-#: admin/ogroups/asterisk/class_phonequeue.inc:857
-#: admin/conference/class_phoneConferenceGeneric.inc:682
-#: admin/macro/class_gofonMacro.inc:473 admin/macro/class_gofonMacro.inc:484
-#: admin/macro/class_gofonMacro.inc:521
-#: admin/macro/class_gofonMacroParameters.inc:435
-#: admin/systems/asterisk/class_phoneGeneric.inc:277
-#: admin/systems/asterisk/class_phoneGeneric.inc:432
-#: admin/systems/asterisk/class_phoneGeneric.inc:446
-#: admin/systems/asterisk/class_phoneGeneric.inc:463
-#: admin/systems/services/asterisk/class_serviceAsterisk.inc:121
-#: personal/phoneaccount/class_phoneAccount.inc:1476
-#: personal/phoneaccount/class_phoneAccount.inc:1609
-msgid "LDAP error"
-msgstr "LDAP-fel"
-
-#: admin/ogroups/asterisk/class_phonequeue.inc:864
-#: admin/systems/asterisk/class_phoneGeneric.inc:472
-#: admin/systems/asterisk/class_phoneGeneric.inc:477
-#: personal/phoneaccount/class_phoneAccount.inc:999
-#: personal/phoneaccount/class_phoneAccount.inc:1012
-#: personal/phoneaccount/class_phoneAccount.inc:1024
-#: personal/phoneaccount/class_phoneAccount.inc:1028
-#: personal/phoneaccount/class_phoneAccount.inc:1031
-#: personal/phoneaccount/class_phoneAccount.inc:1657
-msgid "Phone"
-msgstr "Telefon"
-
-#: admin/ogroups/asterisk/class_phonequeue.inc:865
-msgid "Phone group"
-msgstr ""
-
-#: admin/ogroups/asterisk/class_phonequeue.inc:872
-#: admin/ogroups/asterisk/phonequeue.tpl.c:32
-msgid "Max queue length"
-msgstr ""
-
-#: admin/ogroups/asterisk/class_phonequeue.inc:875
-#: admin/ogroups/asterisk/phonequeue.tpl.c:86
-msgid "Allow the called user to transfer his call"
-msgstr ""
-
-#: admin/ogroups/asterisk/class_phonequeue.inc:876
-#: admin/ogroups/asterisk/phonequeue.tpl.c:89
-msgid "Allows calling user to transfer call"
-msgstr ""
-
-#: admin/ogroups/asterisk/class_phonequeue.inc:877
-#: admin/ogroups/asterisk/phonequeue.tpl.c:92
-msgid "Allow the called to hangup by pressing *"
-msgstr ""
-
-#: admin/ogroups/asterisk/class_phonequeue.inc:878
-#: admin/ogroups/asterisk/phonequeue.tpl.c:98
-msgid "Ring instead of playing background music"
-msgstr ""
-
-#: admin/ogroups/asterisk/class_phonequeue.inc:879
-#: admin/ogroups/asterisk/phonequeue.tpl.c:95
-msgid "Allows calling to hangup by pressing *"
-msgstr ""
-
-#: admin/ogroups/asterisk/class_phonequeue.inc:881
-#: admin/ogroups/asterisk/phonequeue.tpl.c:47
-msgid "Music on hold"
-msgstr ""
-
-#: admin/ogroups/asterisk/class_phonequeue.inc:882
-msgid "Welcome music"
-msgstr ""
-
-#: admin/ogroups/asterisk/class_phonequeue.inc:883
-msgid "Report hold time"
-msgstr ""
-
-#: admin/ogroups/asterisk/class_phonequeue.inc:884
-msgid "'You are next' sound"
-msgstr ""
-
-#: admin/ogroups/asterisk/class_phonequeue.inc:885
-msgid "'There are' sound"
-msgstr ""
-
-#: admin/ogroups/asterisk/class_phonequeue.inc:886
-msgid "'Call waiting' sound"
-msgstr ""
-
-#: admin/ogroups/asterisk/class_phonequeue.inc:887
-msgid "'Thank you' sound"
-msgstr ""
-
-#: admin/ogroups/asterisk/class_phonequeue.inc:888
-msgid "'Minutes' sound"
-msgstr ""
-
-#: admin/ogroups/asterisk/class_phonequeue.inc:889
-msgid "'Seconds' sound"
-msgstr ""
-
-#: admin/ogroups/asterisk/class_phonequeue.inc:890
-msgid "'Less than' sound"
-msgstr ""
-
-#: admin/ogroups/asterisk/class_phonequeue.inc:891
-msgid "Queue phone number"
-msgstr ""
-
-#: admin/ogroups/asterisk/class_phonequeue.inc:892
-#: admin/conference/class_phoneConferenceGeneric.inc:707
-#: admin/ogroups/asterisk/phonequeue.tpl.c:20
-#: admin/conference/generic.tpl.c:23
-msgid "Language"
-msgstr "SprÃ¥k"
-
-#: admin/ogroups/asterisk/class_phonequeue.inc:893
-msgid "Method"
-msgstr ""
-
-#: admin/ogroups/asterisk/class_phonequeue.inc:894
-#: admin/ogroups/asterisk/phonequeue.tpl.c:83
-msgid "Announce holdtime"
-msgstr ""
-
-#: admin/ogroups/asterisk/class_phonequeue.inc:895
-msgid "Announce"
-msgstr ""
-
-#: admin/conference/conf-list.xml:11
-msgid "List of conference rooms"
-msgstr ""
-
-#: admin/conference/conf-list.xml:15 admin/conference/conf-list.xml:74
-msgid "Conference"
-msgstr ""
-
-#: admin/conference/conf-list.xml:41
-#: admin/conference/class_phoneConferenceGeneric.inc:324
-#: admin/conference/class_phoneConferenceGeneric.inc:347
-#: admin/conference/class_phoneConferenceGeneric.inc:702
-#: admin/macro/class_gofonMacro.inc:395 admin/macro/class_gofonMacro.inc:406
-#: admin/macro/macro-list.xml:41
-#: admin/systems/asterisk/class_phoneGeneric.inc:344
-#: admin/systems/asterisk/class_phoneGeneric.inc:348
-#: admin/systems/asterisk/class_phoneGeneric.inc:351
-#: admin/systems/asterisk/class_phoneGeneric.inc:366
-#: admin/systems/asterisk/class_phoneGeneric.inc:482
-#: admin/conference/conf-filter.tpl.c:5 admin/macro/macro-filter.tpl.c:5
-#: admin/macro/parameter.tpl.c:5
-msgid "Name"
-msgstr "Namn"
-
-#: admin/conference/conf-list.xml:49
-#: admin/conference/class_phoneConferenceGeneric.inc:704
-#: admin/macro/class_gofonMacro.inc:547 admin/macro/macro-list.xml:49
-#: admin/systems/asterisk/class_phoneGeneric.inc:484
-#: admin/conference/generic.tpl.c:29 admin/macro/generic.tpl.c:17
-#: admin/systems/asterisk/phone.tpl.c:8
-msgid "Description"
-msgstr "Beskrivning"
-
-#: admin/conference/conf-list.xml:57 admin/macro/macro-list.xml:57
-msgid "Actions"
-msgstr "Ã…tgÃ¤rder"
-
-#: admin/conference/conf-list.xml:68 admin/macro/macro-list.xml:68
-msgid "Create"
-msgstr "Skapa"
-
-#: admin/conference/conf-list.xml:86 admin/conference/conf-list.xml:125
-#: admin/macro/macro-list.xml:86 admin/macro/macro-list.xml:125
-msgid "Edit"
-msgstr "Redigera"
-
-#: admin/conference/conf-list.xml:93 admin/conference/conf-list.xml:138
-#: admin/macro/macro-list.xml:93 admin/macro/macro-list.xml:138
-msgid "Remove"
-msgstr "Ta bort"
-
-#: admin/conference/class_phoneConferenceGeneric.inc:233
-#, php-format
-msgid "Cannot delete entry from server '%s' because it seems to be removed!"
-msgstr ""
-
-#: admin/conference/class_phoneConferenceGeneric.inc:308
-#, php-format
-msgid ""
-"The previously selected asterisk home server '%s' is no longer available!"
-msgstr ""
-
-#: admin/conference/class_phoneConferenceGeneric.inc:315
-#: admin/conference/generic.tpl.c:47
-msgid "PIN"
-msgstr ""
-
-#: admin/conference/class_phoneConferenceGeneric.inc:333
-#: admin/conference/class_phoneConferenceGeneric.inc:719
-msgid "Lifetime"
-msgstr ""
-
-#: admin/conference/class_phoneConferenceGeneric.inc:399
-#: personal/phoneaccount/class_phoneAccount.inc:346
-#: personal/phoneaccount/class_phoneAccount.inc:359
-#: personal/phoneaccount/class_phoneAccount.inc:617
-#: personal/phoneaccount/class_phoneAccount.inc:656
-#: personal/phoneaccount/class_phoneAccount.inc:1519
-#: personal/phoneaccount/class_phoneAccount.inc:1695
-#: admin/conference/remove.tpl.c:2 admin/macro/remove.tpl.c:2
-msgid "Warning"
-msgstr "Varning"
-
-#: admin/conference/class_phoneConferenceGeneric.inc:400
-#, php-format
-msgid ""
-"FusionDirectory identified problems with your MySQL table definition, please"
-" activate debugging for details."
-msgstr ""
-
-#: admin/conference/class_phoneConferenceGeneric.inc:606
-#: admin/conference/class_phoneConferenceGeneric.inc:608
-#, php-format
-msgid "'%s' is already assigned to '%s'!"
-msgstr ""
-
-#: admin/conference/class_phoneConferenceGeneric.inc:693
-msgid "Phone Conference"
-msgstr ""
-
-#: admin/conference/class_phoneConferenceGeneric.inc:694
-msgid "Phone conference management"
-msgstr ""
-
-#: admin/conference/class_phoneConferenceGeneric.inc:696
-msgid "GOfon conference"
-msgstr ""
-
-#: admin/conference/class_phoneConferenceGeneric.inc:698
-msgid "Asterisk conference"
-msgstr ""
-
-#: admin/conference/class_phoneConferenceGeneric.inc:703
-#: admin/macro/class_gofonMacro.inc:546
-#: admin/systems/asterisk/class_phoneGeneric.inc:483
-#: admin/conference/generic.tpl.c:17 admin/macro/generic.tpl.c:14
-#: admin/systems/asterisk/phone.tpl.c:5
-msgid "Base"
-msgstr "Bas"
-
-#: admin/conference/class_phoneConferenceGeneric.inc:705
-msgid "Conference PIN"
-msgstr ""
-
-#: admin/conference/class_phoneConferenceGeneric.inc:710
-#: admin/conference/generic.tpl.c:44
-msgid "Preset PIN"
-msgstr ""
-
-#: admin/conference/class_phoneConferenceGeneric.inc:711
-#: admin/conference/generic.tpl.c:50
-msgid "Record conference"
-msgstr ""
-
-#: admin/conference/class_phoneConferenceGeneric.inc:712
-#: admin/conference/generic.tpl.c:59
-msgid "Play music on hold"
-msgstr ""
-
-#: admin/conference/class_phoneConferenceGeneric.inc:713
-msgid "Activate menu"
-msgstr ""
-
-#: admin/conference/class_phoneConferenceGeneric.inc:714
-msgid "Announce user activity"
-msgstr ""
-
-#: admin/conference/class_phoneConferenceGeneric.inc:715
-msgid "Count user"
-msgstr ""
-
-#: admin/conference/class_phoneConferenceGeneric.inc:716
-msgid "Conference type"
-msgstr ""
-
-#: admin/conference/class_phoneConferenceGeneric.inc:718
-msgid "Format"
-msgstr ""
-
-#: admin/conference/class_phoneConferenceGeneric.inc:720
-#: personal/phoneaccount/class_phoneAccount.inc:1666
-msgid "Telephone number"
-msgstr ""
-
-#: admin/conference/class_phoneConferenceGeneric.inc:721
-msgid "Owner"
-msgstr "Ã„gare"
-
-#: admin/conference/class_phoneConferenceManagment.inc:36
-msgid "Phone Conferences"
-msgstr ""
-
-#: admin/conference/class_phoneConferenceManagment.inc:37
-msgid "Phone Conference management"
-msgstr ""
-
-#: admin/macro/class_gofonMacro.inc:202
-#, php-format
-msgid ""
-"Macro could not be removed from server '%s', please check database "
-"consistency!"
-msgstr ""
-
-#: admin/macro/class_gofonMacro.inc:264
-#, php-format
-msgid "Application missing in line %s!"
-msgstr ""
-
-#: admin/macro/class_gofonMacro.inc:267
-#, php-format
-msgid "Priority missing in line %s!"
-msgstr ""
-
-#: admin/macro/class_gofonMacro.inc:271
-#, php-format
-msgid "Extension missing in line %s!"
-msgstr ""
-
-#: admin/macro/class_gofonMacro.inc:281
-#, php-format
-msgid "Duplicate combination of 'extension' and 'priority' in line %s!"
-msgstr ""
-
-#: admin/macro/class_gofonMacro.inc:317
-#, php-format
-msgid ""
-"Macro could not be added to server '%s', please check database consistency!"
-msgstr ""
-
-#: admin/macro/class_gofonMacro.inc:410
-msgid "Name can be 20 characters at maximum!"
-msgstr ""
-
-#: admin/macro/class_gofonMacro.inc:419
-msgid "Macro is still in use!"
-msgstr ""
-
-#: admin/macro/class_gofonMacro.inc:426
-msgid "Macro is empty!"
-msgstr ""
-
-#: admin/macro/class_gofonMacro.inc:452
-#: admin/systems/asterisk/class_phoneGeneric.inc:267
-#, php-format
-msgid "Cannot delete entry because it is still in use by '%s'!"
-msgstr ""
-
-#: admin/macro/class_gofonMacro.inc:465
-#: addons/fonreports/class_fonreport.inc:190
-#: personal/phoneaccount/class_phoneAccount.inc:455
-#: personal/phoneaccount/class_phoneAccount.inc:1061
-#: personal/phoneaccount/class_phoneAccount.inc:1567
-msgid "Configuration error"
-msgstr "Konfigurationsfel"
-
-#: admin/macro/class_gofonMacro.inc:536 admin/macro/class_gofonMacro.inc:541
-msgid "Asterisk macro"
-msgstr ""
-
-#: admin/macro/class_gofonMacro.inc:537
-msgid "Asterisk macro management"
-msgstr ""
-
-#: admin/macro/class_gofonMacro.inc:539
-msgid "GOfon macro"
-msgstr ""
-
-#: admin/macro/class_gofonMacro.inc:545 admin/macro/generic.tpl.c:2
-#: admin/macro/generic.tpl.c:5 admin/macro/paste_generic.tpl.c:2
-#: admin/macro/paste_generic.tpl.c:5
-msgid "Macro name"
-msgstr ""
-
-#: admin/macro/class_gofonMacro.inc:548 admin/macro/generic.tpl.c:8
-msgid "Display name"
-msgstr ""
-
-#: admin/macro/class_gofonMacro.inc:549
-msgid "Macro content and parameter"
-msgstr ""
-
-#: admin/macro/class_gofonMacro.inc:550
-msgid "Visibility flag"
-msgstr ""
-
-#: admin/macro/class_gofonMacroManagement.inc:36
-msgid "Phone Macros"
-msgstr ""
-
-#: admin/macro/class_gofonMacroManagement.inc:37
-msgid "Phone Macros management"
-msgstr ""
-
-#: admin/macro/macro-list.xml:11
-msgid "List of macros"
-msgstr ""
-
-#: admin/macro/macro-list.xml:15 admin/macro/macro-list.xml:74
-msgid "Macro"
-msgstr ""
-
-#: admin/macro/class_gofonMacroParameters.inc:58
-msgid "Parameter"
-msgstr ""
-
-#: admin/macro/class_gofonMacroParameters.inc:59
-msgid "Asterisk macro parameter"
-msgstr ""
-
-#: admin/macro/class_gofonMacroParameters.inc:234
-#: personal/phoneaccount/generic.tpl.c:35
-msgid "Phone macro"
-msgstr ""
-
-#: admin/macro/class_gofonMacroParameters.inc:290
-msgid "String"
-msgstr ""
-
-#: admin/macro/class_gofonMacroParameters.inc:291
-msgid "Combobox"
-msgstr ""
-
-#: admin/macro/class_gofonMacroParameters.inc:292
-msgid "Bool"
-msgstr ""
-
-#: admin/macro/class_gofonMacroParameters.inc:298
-msgid "Delete unused"
-msgstr ""
-
-#: admin/macro/class_gofonMacroParameters.inc:374
-#, php-format
-msgid "Parameter %s contains invalid character. '!,#' is used as delimiter!"
-msgstr ""
-
-#: admin/macro/class_gofonMacroParameters.inc:379
-#, php-format
-msgid "Parameter %s is invalid!"
-msgstr ""
-
-#: admin/macro/class_gofonMacroParameters.inc:408
-#: personal/phoneaccount/class_phoneAccount.inc:1600
-msgid "Information"
-msgstr "Information"
-
-#: admin/macro/class_gofonMacroParameters.inc:408
-msgid ""
-"Number of parameters for this macro has changed. Please update all users "
-"using it!"
-msgstr ""
-
-#: admin/systems/asterisk/class_phoneGeneric.inc:151
-msgid "phone"
-msgstr ""
-
-#: admin/systems/asterisk/class_phoneGeneric.inc:230
-msgid "yes"
-msgstr ""
-
-#: admin/systems/asterisk/class_phoneGeneric.inc:230
-msgid "no"
-msgstr ""
-
-#: admin/systems/asterisk/class_phoneGeneric.inc:247
-msgid "dynamic"
-msgstr "dynamisk"
-
-#: admin/systems/asterisk/class_phoneGeneric.inc:247
-msgid "Networksettings"
-msgstr ""
-
-#: admin/systems/asterisk/class_phoneGeneric.inc:330
-#: admin/systems/asterisk/class_phoneGeneric.inc:333
-msgid "IP address"
-msgstr ""
-
-#: admin/systems/asterisk/class_phoneGeneric.inc:473
-msgid "Phone information"
-msgstr ""
-
-#: admin/systems/asterisk/class_phoneGeneric.inc:476
-#: personal/phoneaccount/class_phoneAccount.inc:1668
-msgid "Phone hardware"
-msgstr ""
-
-#: admin/systems/asterisk/class_phoneGeneric.inc:485
-msgid "SIP Mode"
-msgstr ""
-
-#: admin/systems/asterisk/class_phoneGeneric.inc:486
-msgid "SIP DTMF mode"
-msgstr ""
-
-#: admin/systems/asterisk/class_phoneGeneric.inc:487
-msgid "SIP Default ip"
-msgstr ""
-
-#: admin/systems/asterisk/class_phoneGeneric.inc:488
-msgid "SIP Qualify"
-msgstr ""
+#: admin/systems/asterisk/class_phoneIAX.inc:30
+#: admin/systems/asterisk/class_phoneIAX.inc:34
+#: personal/asterisk/class_asteriskAccount.inc:45
+msgid "Phone"
+msgstr "Telefon"
 
-#: admin/systems/asterisk/class_phoneGeneric.inc:489
-msgid "IAX authentication type"
+#: admin/systems/asterisk/class_phoneIAX.inc:31
+msgid "Asterisk phone"
 msgstr ""
 
-#: admin/systems/asterisk/class_phoneGeneric.inc:490
-msgid "IAX secret"
+#: admin/systems/asterisk/class_phoneIAX.inc:33
+msgid "Phone hardware"
 msgstr ""
 
-#: admin/systems/asterisk/class_phoneGeneric.inc:491
-msgid "IAX account code"
-msgstr ""
+#: admin/systems/asterisk/class_phoneIAX.inc:46
+#: personal/asterisk/class_asteriskAccount.inc:42
+msgid "Telephone"
+msgstr "Telefon"
 
-#: admin/systems/asterisk/class_phoneGeneric.inc:492
-msgid "IAX trunk lines"
-msgstr ""
+#: admin/systems/asterisk/class_phoneIAX.inc:49
+msgid "Name"
+msgstr "Namn"
 
-#: admin/systems/asterisk/class_phoneGeneric.inc:493
-msgid "IAX permit settings"
+#: admin/systems/asterisk/class_phoneIAX.inc:49
+msgid "Name of this phone"
 msgstr ""
 
-#: admin/systems/asterisk/class_phoneGeneric.inc:494
-msgid "IAX deny settings"
+#: admin/systems/asterisk/class_phoneIAX.inc:53
+msgid "Account name"
 msgstr ""
 
-#: admin/systems/asterisk/class_phoneGeneric.inc:495
-msgid "CAPI MSN"
+#: admin/systems/asterisk/class_phoneIAX.inc:53
+msgid "Name of the account"
 msgstr ""
 
-#: admin/systems/asterisk/class_phoneGeneric.inc:496
-msgid "Hardware type"
-msgstr "HÃ¥rdvarutyp"
-
 #: admin/systems/services/asterisk/class_serviceAsterisk.inc:35
 msgid "VoIP database information"
 msgstr ""
@@ -746,6 +95,10 @@ msgid ""
 "these objects '%s'."
 msgstr ""
 
+#: admin/systems/services/asterisk/class_serviceAsterisk.inc:121
+msgid "LDAP error"
+msgstr "LDAP-fel"
+
 #: admin/systems/services/asterisk/class_serviceAsterisk.inc:140
 msgid "VoIP service (asterisk)"
 msgstr ""
@@ -758,209 +111,18 @@ msgstr ""
 msgid "Services"
 msgstr "TjÃ¤nster"
 
-#: addons/fonreports/class_fonreport.inc:232
-msgid "Insufficient permissions"
-msgstr ""
-
-#: addons/fonreports/class_fonreport.inc:251
-msgid "Y-M-D"
-msgstr ""
-
-#: addons/fonreports/class_fonreport.inc:418
-#: addons/fonreports/class_fonreport.inc:419
-#: addons/fonreports/class_fonreport.inc:424 addons/fonreports/main.inc:46
-msgid "Phone reports"
-msgstr ""
-
-#: addons/fonreports/class_fonreport.inc:419
-msgid "All entries are readonly"
-msgstr ""
-
-#: addons/fonreports/class_fonreport.inc:428
-#: addons/fonreports/contents.tpl.c:32
-msgid "Date"
-msgstr ""
-
-#: addons/fonreports/class_fonreport.inc:429
-#: addons/fonreports/contents.tpl.c:35
-msgid "Source"
-msgstr ""
-
-#: addons/fonreports/class_fonreport.inc:430
-#: addons/fonreports/contents.tpl.c:38
-msgid "Destination"
-msgstr ""
-
-#: addons/fonreports/class_fonreport.inc:431
-#: addons/fonreports/contents.tpl.c:41
-msgid "Channel"
-msgstr ""
-
-#: addons/fonreports/class_fonreport.inc:432
-msgid "Application called"
-msgstr ""
-
-#: addons/fonreports/class_fonreport.inc:433
-msgid "Disposition"
-msgstr ""
-
-#: addons/fonreports/class_fonreport.inc:434
-#: addons/fonreports/contents.tpl.c:50
-msgid "Duration"
-msgstr ""
-
-#: personal/phoneaccount/class_phoneAccount.inc:176
-msgid "automatic"
-msgstr "automatisk"
-
-#: personal/phoneaccount/class_phoneAccount.inc:212
-msgid "no macro"
-msgstr ""
-
-#: personal/phoneaccount/class_phoneAccount.inc:240
-msgid "undefined"
-msgstr ""
-
-#: personal/phoneaccount/class_phoneAccount.inc:359
-#, php-format
-msgid ""
-"Cannot identify telephone extension in database, please try to save again."
-msgstr ""
-
-#: personal/phoneaccount/class_phoneAccount.inc:577
-#: personal/phoneaccount/class_phoneAccount.inc:595
-msgid "Abort saving entries to keep the database consistent."
-msgstr ""
-
-#: personal/phoneaccount/class_phoneAccount.inc:618
-#: personal/phoneaccount/class_phoneAccount.inc:657
-#: personal/phoneaccount/class_phoneAccount.inc:1520
-#, php-format
-msgid ""
-"FusionDirectory identified problems with your database table definition!"
-msgstr ""
-
-#: personal/phoneaccount/class_phoneAccount.inc:1023
-msgid "Remove phone account"
-msgstr ""
-
-#: personal/phoneaccount/class_phoneAccount.inc:1027
-#: personal/phoneaccount/class_phoneAccount.inc:1030
-msgid "Create phone account"
-msgstr ""
-
-#: personal/phoneaccount/class_phoneAccount.inc:1028
-msgid "User uid"
-msgstr ""
-
-#: personal/phoneaccount/class_phoneAccount.inc:1046
-msgid "Selected macro is not available anymore!"
-msgstr ""
-
-#: personal/phoneaccount/class_phoneAccount.inc:1221
-msgid "Choose your private phone"
-msgstr ""
-
-#: personal/phoneaccount/class_phoneAccount.inc:1346
-msgid ""
-"There must be at least one server with an asterisk database to create a "
-"phone account."
-msgstr ""
-
-#: personal/phoneaccount/class_phoneAccount.inc:1354
-#: personal/phoneaccount/class_phoneAccount.inc:1357
-#: personal/phoneaccount/generic.tpl.c:29
-#: personal/phoneaccount/paste_generic.tpl.c:11
-msgid "Voicemail PIN"
-msgstr ""
-
-#: personal/phoneaccount/class_phoneAccount.inc:1354
-msgid "Between 1-4 charactes"
-msgstr ""
-
-#: personal/phoneaccount/class_phoneAccount.inc:1362
-#: personal/phoneaccount/generic.tpl.c:32
-#: personal/phoneaccount/paste_generic.tpl.c:14
-msgid "Phone PIN"
-msgstr ""
-
-#: personal/phoneaccount/class_phoneAccount.inc:1394
-#: admin/conference/generic.tpl.c:38 admin/conference/paste_generic.tpl.c:8
-msgid "Phone number"
-msgstr "Telefonnummer"
-
-#: personal/phoneaccount/class_phoneAccount.inc:1402
-#, php-format
-msgid "macro parameter %s"
-msgstr ""
-
-#: personal/phoneaccount/class_phoneAccount.inc:1450
-msgid "An error occured while updating the database entries!"
-msgstr ""
-
-#: personal/phoneaccount/class_phoneAccount.inc:1567
-msgid "Was not able to found any asterisk server"
-msgstr ""
-
-#: personal/phoneaccount/class_phoneAccount.inc:1600
-#, php-format
-msgid "User '%s' has been removed from phone queue '%s'."
-msgstr ""
-
-#: personal/phoneaccount/class_phoneAccount.inc:1637
-#: personal/phoneaccount/class_phoneAccount.inc:1639
-#, php-format
-msgid "The specified telephonenumber '%s' is already assigned to '%s'."
-msgstr ""
-
-#: personal/phoneaccount/class_phoneAccount.inc:1649
-#, php-format
-msgid ""
-"The previously selected asterisk home server (%s) is no longer available. "
-"Remove aborted."
-msgstr ""
-
-#: personal/phoneaccount/class_phoneAccount.inc:1658
-msgid "Phone account settings"
-msgstr ""
-
-#: personal/phoneaccount/class_phoneAccount.inc:1667
-msgid "Macro settings"
-msgstr ""
-
-#: personal/phoneaccount/class_phoneAccount.inc:1670
-msgid "Phone context"
-msgstr ""
-
-#: personal/phoneaccount/class_phoneAccount.inc:1671
-msgid "Voice mail context"
-msgstr ""
-
-#: personal/phoneaccount/class_phoneAccount.inc:1672
-msgid "Telephone pin"
-msgstr ""
-
-#: personal/phoneaccount/class_phoneAccount.inc:1673
-msgid "Voicemail pin"
-msgstr ""
-
-#: personal/phoneaccount/class_phoneAccount.inc:1695
-#, php-format
-msgid "You need to configure %s contexts first"
+#: personal/asterisk/class_asteriskAccount.inc:30
+#: config/asterisk/class_asteriskPluginConfig.inc:28
+#: config/asterisk/class_asteriskPluginConfig.inc:41
+msgid "Asterisk"
 msgstr ""
 
-#: personal/phoneaccount/main.inc:124
-msgid "Click the 'Edit' button below to change informations in this dialog"
-msgstr "Klicka pÃ¥ 'Redigera'-knappen nedan fÃ¶r att Ã¤ndra information i den hÃ¤r dialogrutan"
-
-#: personal/phoneaccount/main.inc:134
-#: personal/phoneaccount/paste_generic.tpl.c:2
-msgid "Phone settings"
+#: personal/asterisk/class_asteriskAccount.inc:31
+msgid "Asterisk account"
 msgstr ""
 
-#: config/asterisk/class_asteriskPluginConfig.inc:28
-#: config/asterisk/class_asteriskPluginConfig.inc:41
-msgid "Asterisk"
+#: personal/asterisk/class_asteriskAccount.inc:45
+msgid "Select the phone associated to this user"
 msgstr ""
 
 #: config/asterisk/class_asteriskPluginConfig.inc:29
@@ -1010,338 +172,3 @@ msgstr ""
 #: config/asterisk/class_asteriskPluginConfig.inc:72
 msgid "Available voicemail contexts"
 msgstr ""
-
-#: admin/ogroups/asterisk/phonequeue.tpl.c:2
-msgid ""
-"Only users with the same asterisk home server will be included to this "
-"queue."
-msgstr ""
-
-#: admin/ogroups/asterisk/phonequeue.tpl.c:5
-#: personal/phoneaccount/generic.tpl.c:2
-#: personal/phoneaccount/paste_generic.tpl.c:5
-msgid "Phone numbers"
-msgstr ""
-
-#: admin/ogroups/asterisk/phonequeue.tpl.c:8
-msgid "Up"
-msgstr "Upp"
-
-#: admin/ogroups/asterisk/phonequeue.tpl.c:11
-msgid "Down"
-msgstr "Ner"
-
-#: admin/ogroups/asterisk/phonequeue.tpl.c:14
-#: admin/conference/generic.tpl.c:41
-msgid "Options"
-msgstr "Alternativ"
-
-#: admin/ogroups/asterisk/phonequeue.tpl.c:29
-msgid "Strategy"
-msgstr ""
-
-#: admin/ogroups/asterisk/phonequeue.tpl.c:38
-msgid "(in seconds)"
-msgstr ""
-
-#: admin/ogroups/asterisk/phonequeue.tpl.c:41
-msgid "Queue sound setup"
-msgstr ""
-
-#: admin/ogroups/asterisk/phonequeue.tpl.c:44
-msgid "Use music on hold instead of ringing"
-msgstr ""
-
-#: admin/ogroups/asterisk/phonequeue.tpl.c:50
-msgid "Welcome sound file"
-msgstr ""
-
-#: admin/ogroups/asterisk/phonequeue.tpl.c:53
-msgid "Announce message"
-msgstr ""
-
-#: admin/ogroups/asterisk/phonequeue.tpl.c:56
-msgid "Sound file for 'You are next ...'"
-msgstr ""
-
-#: admin/ogroups/asterisk/phonequeue.tpl.c:59
-msgid "'There are ...'"
-msgstr ""
-
-#: admin/ogroups/asterisk/phonequeue.tpl.c:62
-msgid "'... calls waiting'"
-msgstr ""
-
-#: admin/ogroups/asterisk/phonequeue.tpl.c:65
-msgid "'Thank you' message"
-msgstr ""
-
-#: admin/ogroups/asterisk/phonequeue.tpl.c:68
-msgid "'minutes' sound file"
-msgstr ""
-
-#: admin/ogroups/asterisk/phonequeue.tpl.c:71
-msgid "'seconds' sound file"
-msgstr ""
-
-#: admin/ogroups/asterisk/phonequeue.tpl.c:74
-msgid "Hold sound file"
-msgstr ""
-
-#: admin/ogroups/asterisk/phonequeue.tpl.c:77
-msgid "Less Than sound file"
-msgstr ""
-
-#: admin/ogroups/asterisk/phonequeue.tpl.c:80
-msgid "Phone attributes "
-msgstr ""
-
-#: admin/conference/conf-filter.tpl.c:2 admin/macro/macro-filter.tpl.c:2
-#: addons/fonreports/contents.tpl.c:2
-msgid "Filter"
-msgstr "Filter"
-
-#: admin/conference/generic.tpl.c:2
-msgid "Properties"
-msgstr "Egenskaper"
-
-#: admin/conference/generic.tpl.c:5 admin/conference/paste_generic.tpl.c:2
-msgid "Conference name"
-msgstr ""
-
-#: admin/conference/generic.tpl.c:8 admin/conference/paste_generic.tpl.c:5
-msgid "Name of conference to create"
-msgstr ""
-
-#: admin/conference/generic.tpl.c:11
-msgid "Type"
-msgstr "Typ"
-
-#: admin/conference/generic.tpl.c:14
-msgid "Choose subtree to place conference in"
-msgstr ""
-
-#: admin/conference/generic.tpl.c:26
-msgid "Select language"
-msgstr ""
-
-#: admin/conference/generic.tpl.c:32
-msgid "Descriptive text for department"
-msgstr "Beskrivande text pÃ¥ avdelning"
-
-#: admin/conference/generic.tpl.c:35
-msgid "Lifetime (in days)"
-msgstr ""
-
-#: admin/conference/generic.tpl.c:53
-msgid "Sound file format"
-msgstr ""
-
-#: admin/conference/generic.tpl.c:56
-msgid "Choose subtree to place department in"
-msgstr ""
-
-#: admin/conference/generic.tpl.c:62
-msgid "Activate session menu"
-msgstr ""
-
-#: admin/conference/generic.tpl.c:65
-msgid "Announce users joining or leaving the conference"
-msgstr ""
-
-#: admin/conference/generic.tpl.c:68
-msgid "Count users"
-msgstr ""
-
-#: admin/conference/remove.tpl.c:5 admin/macro/remove.tpl.c:5
-msgid ""
-"Please double check if you really want to do this since there is no way for "
-"FusionDirectory to get your data back."
-msgstr "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/conference/remove.tpl.c:8 admin/macro/remove.tpl.c:8
-msgid "So - if you're sure - press 'Delete' to continue or 'Cancel' to abort."
-msgstr "SÃ¥ - om du Ã¤r sÃ¤ker - tryck 'Ta bort' fÃ¶r att fortsÃ¤tta och 'Avbryt' fÃ¶r att avbryta."
-
-#: admin/macro/generic.tpl.c:11
-msgid "Macro name to be displayed"
-msgstr ""
-
-#: admin/macro/generic.tpl.c:20
-msgid "Visible for user"
-msgstr ""
-
-#: admin/macro/generic.tpl.c:23
-msgid "Macro text"
-msgstr ""
-
-#: admin/macro/parameter.tpl.c:2
-msgid "Argument"
-msgstr ""
-
-#: admin/macro/parameter.tpl.c:8
-msgid "type"
-msgstr ""
-
-#: admin/macro/parameter.tpl.c:11
-msgid "Default value"
-msgstr ""
-
-#: admin/macro/parameter.tpl.c:14
-msgid "You are not allowed to view the macro parameter settings"
-msgstr ""
-
-#: admin/systems/asterisk/phonesettings.tpl.c:2
-msgid "Advanced phone settings"
-msgstr ""
-
-#: admin/systems/asterisk/phonesettings.tpl.c:5
-msgid "Phone type"
-msgstr ""
-
-#: admin/systems/asterisk/phonesettings.tpl.c:8
-#: admin/systems/asterisk/phonesettings.tpl.c:14
-#: admin/systems/asterisk/phonesettings.tpl.c:20
-#: admin/systems/asterisk/phonesettings.tpl.c:26
-#: admin/systems/asterisk/phonesettings.tpl.c:35
-#: admin/systems/asterisk/phonesettings.tpl.c:47
-#: admin/systems/asterisk/phonesettings.tpl.c:65
-msgid "Choose a phone type"
-msgstr ""
-
-#: admin/systems/asterisk/phonesettings.tpl.c:11
-msgid "Mode"
-msgstr ""
-
-#: admin/systems/asterisk/phonesettings.tpl.c:17
-msgid "DTMF mode"
-msgstr ""
-
-#: admin/systems/asterisk/phonesettings.tpl.c:23
-#: admin/systems/asterisk/phonesettings.tpl.c:38
-msgid "Default IP"
-msgstr ""
-
-#: admin/systems/asterisk/phonesettings.tpl.c:29
-#: admin/systems/asterisk/phonesettings.tpl.c:41
-msgid "Response timeout"
-msgstr ""
-
-#: admin/systems/asterisk/phonesettings.tpl.c:32
-msgid "Modus"
-msgstr ""
-
-#: admin/systems/asterisk/phonesettings.tpl.c:44
-msgid "Authtype"
-msgstr ""
-
-#: admin/systems/asterisk/phonesettings.tpl.c:50
-msgid "Secret"
-msgstr ""
-
-#: admin/systems/asterisk/phonesettings.tpl.c:53
-msgid "GoFonInkeys"
-msgstr ""
-
-#: admin/systems/asterisk/phonesettings.tpl.c:56
-msgid "GoFonOutKeys"
-msgstr ""
-
-#: admin/systems/asterisk/phonesettings.tpl.c:59
-msgid "Account code"
-msgstr ""
-
-#: admin/systems/asterisk/phonesettings.tpl.c:62
-msgid "Trunk lines"
-msgstr ""
-
-#: admin/systems/asterisk/phonesettings.tpl.c:68
-msgid "Hosts that are allowed to connect"
-msgstr ""
-
-#: admin/systems/asterisk/phonesettings.tpl.c:71
-#: admin/systems/asterisk/phonesettings.tpl.c:77
-msgid "List of alternative mail addresses"
-msgstr ""
-
-#: admin/systems/asterisk/phonesettings.tpl.c:74
-msgid "Hosts that are not allowed to connect"
-msgstr ""
-
-#: admin/systems/asterisk/phonesettings.tpl.c:80
-msgid "MSN"
-msgstr ""
-
-#: admin/systems/asterisk/phone.tpl.c:2
-msgid "Phone name"
-msgstr ""
-
-#: addons/fonreports/contents.tpl.c:5
-msgid "Search for"
-msgstr ""
-
-#: addons/fonreports/contents.tpl.c:8
-msgid "Enter user name to search for"
-msgstr ""
-
-#: addons/fonreports/contents.tpl.c:11 addons/fonreports/contents.tpl.c:26
-msgid "in"
-msgstr "i"
-
-#: addons/fonreports/contents.tpl.c:14
-msgid "Select subtree to base search on"
-msgstr ""
-
-#: addons/fonreports/contents.tpl.c:17
-msgid "on"
-msgstr ""
-
-#: addons/fonreports/contents.tpl.c:20
-msgid "Select server to search on"
-msgstr ""
-
-#: addons/fonreports/contents.tpl.c:23
-msgid "during"
-msgstr ""
-
-#: addons/fonreports/contents.tpl.c:29
-msgid "Search"
-msgstr "SÃ¶k"
-
-#: addons/fonreports/contents.tpl.c:44
-msgid "Application"
-msgstr "Applikation"
-
-#: addons/fonreports/contents.tpl.c:47
-msgid "Status"
-msgstr "Status"
-
-#: addons/fonreports/contents.tpl.c:53
-msgid "Search returned no results..."
-msgstr ""
-
-#: personal/phoneaccount/generic.tpl.c:5
-#: personal/phoneaccount/paste_generic.tpl.c:8
-msgid "Telephone hardware"
-msgstr ""
-
-#: personal/phoneaccount/generic.tpl.c:8
-msgid "Telephone"
-msgstr "Telefon"
-
-#: personal/phoneaccount/generic.tpl.c:14
-msgid "Select the accounts home server"
-msgstr ""
-
-#: personal/phoneaccount/generic.tpl.c:17
-msgid "Context"
-msgstr ""
-
-#: personal/phoneaccount/generic.tpl.c:20
-#: personal/phoneaccount/generic.tpl.c:26
-msgid "Select the accounts context"
-msgstr ""
-
-#: personal/phoneaccount/generic.tpl.c:23
-msgid "Voicemail context"
-msgstr ""
diff --git a/asterisk/locale/ug/fusiondirectory.po b/asterisk/locale/ug/fusiondirectory.po
index e6e3a8bc8a893d9694025793afc335018a4cd7ea..0216fdab3f66454d2ea9e96f1a6d3f0c5cb82a1d 100644
--- a/asterisk/locale/ug/fusiondirectory.po
+++ b/asterisk/locale/ug/fusiondirectory.po
@@ -5,962 +5,124 @@
 # Translators:
 msgid ""
 msgstr ""
-"Project-Id-Version: FusionDirectory-108\n"
+"Project-Id-Version: FusionDirectory-109\n"
 "Report-Msgid-Bugs-To: documentation@lists.fusiondirectory.org\n"
-"POT-Creation-Date: 2015-03-31 11:49+0200\n"
-"PO-Revision-Date: 2015-02-25 15:42+0000\n"
+"POT-Creation-Date: 2014-12-15 17:47+0100\n"
+"PO-Revision-Date: 2014-12-15 16:49+0000\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>\n"
-"Language-Team: Uighur (http://www.transifex.com/projects/p/FusionDirectory-108/language/ug/)\n"
+"Language-Team: Uighur (http://www.transifex.com/projects/p/FusionDirectory-109/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/ogroups/asterisk/class_phonequeue.inc:110
-#: admin/conference/class_phoneConferenceGeneric.inc:104
-#: personal/phoneaccount/class_phoneAccount.inc:148
-msgid "Obsolete entry"
-msgstr ""
-
-#: admin/ogroups/asterisk/class_phonequeue.inc:110
-#: admin/conference/class_phoneConferenceGeneric.inc:104
-#: personal/phoneaccount/class_phoneAccount.inc:148
-#, php-format
-msgid ""
-"The current home server is not available anymore. It will be moved to '%s' "
-"if you save this entry!"
-msgstr ""
-
-#: admin/ogroups/asterisk/class_phonequeue.inc:140
-msgid "ring all"
-msgstr ""
-
-#: admin/ogroups/asterisk/class_phonequeue.inc:141
-msgid "round robin"
-msgstr ""
-
-#: admin/ogroups/asterisk/class_phonequeue.inc:142
-msgid "least recently called"
-msgstr ""
-
-#: admin/ogroups/asterisk/class_phonequeue.inc:143
-msgid "fewest completed calls"
-msgstr ""
-
-#: admin/ogroups/asterisk/class_phonequeue.inc:144
-msgid "random"
-msgstr ""
-
-#: admin/ogroups/asterisk/class_phonequeue.inc:145
-msgid "round robin with memory"
-msgstr ""
-
-#: admin/ogroups/asterisk/class_phonequeue.inc:180
-msgid "Remove the phone queue from this Account"
-msgstr ""
-
-#: admin/ogroups/asterisk/class_phonequeue.inc:181
-#: admin/ogroups/asterisk/class_phonequeue.inc:184
-msgid "phone queue"
-msgstr ""
-
-#: admin/ogroups/asterisk/class_phonequeue.inc:183
-msgid "Create phone queue"
-msgstr ""
-
-#: admin/ogroups/asterisk/class_phonequeue.inc:272
-msgid ""
-"There must be at least one server with an asterisk database to create a "
-"phone queue."
-msgstr ""
-
-#: admin/ogroups/asterisk/class_phonequeue.inc:275
-#: admin/ogroups/asterisk/class_phonequeue.inc:873
-#: admin/conference/class_phoneConferenceGeneric.inc:709
-#: personal/phoneaccount/class_phoneAccount.inc:1350
-#: personal/phoneaccount/class_phoneAccount.inc:1669
-#: admin/ogroups/asterisk/phonequeue.tpl.c:17
-#: admin/conference/generic.tpl.c:20 personal/phoneaccount/generic.tpl.c:11
-msgid "Home server"
-msgstr ""
-
-#: admin/ogroups/asterisk/class_phonequeue.inc:281
-#: admin/ogroups/asterisk/class_phonequeue.inc:871
-#: admin/ogroups/asterisk/phonequeue.tpl.c:23
-msgid "Timeout"
-msgstr ""
-
-#: admin/ogroups/asterisk/class_phonequeue.inc:284
-#: admin/ogroups/asterisk/class_phonequeue.inc:896
-#: admin/ogroups/asterisk/phonequeue.tpl.c:26
-msgid "Retry"
-msgstr ""
-
-#: admin/ogroups/asterisk/class_phonequeue.inc:287
-msgid "Queue length"
-msgstr ""
-
-#: admin/ogroups/asterisk/class_phonequeue.inc:290
-#: admin/ogroups/asterisk/class_phonequeue.inc:874
-#: admin/ogroups/asterisk/phonequeue.tpl.c:35
-msgid "Announce frequency"
-msgstr ""
-
-#: admin/ogroups/asterisk/class_phonequeue.inc:293
-#: admin/conference/class_phoneConferenceGeneric.inc:328
-msgid "Number"
-msgstr ""
-
-#: admin/ogroups/asterisk/class_phonequeue.inc:316
-#: admin/ogroups/asterisk/class_phonequeue.inc:361
-msgid "asterisk"
-msgstr ""
-
-#: admin/ogroups/asterisk/class_phonequeue.inc:345
-#: admin/ogroups/asterisk/class_phonequeue.inc:696
-#: admin/conference/class_phoneConferenceGeneric.inc:369
-#: admin/macro/class_gofonMacro.inc:381 admin/macro/class_gofonMacro.inc:465
-#: addons/fonreports/class_fonreport.inc:190
-#: addons/fonreports/class_fonreport.inc:220
-#: personal/phoneaccount/class_phoneAccount.inc:455
-#: personal/phoneaccount/class_phoneAccount.inc:1061
-msgid "GOfon"
-msgstr ""
-
-#: admin/ogroups/asterisk/class_phonequeue.inc:401
-msgid "Cannot find old queue entry!"
-msgstr ""
-
-#: admin/ogroups/asterisk/class_phonequeue.inc:487
-#, php-format
-msgid ""
-"Found more than one entry named '%s' in queue table. Please inform your "
-"system administrator!"
-msgstr ""
-
-#: admin/ogroups/asterisk/class_phonequeue.inc:728
-#: admin/ogroups/asterisk/class_phonequeue.inc:730
-msgid "telephone number"
-msgstr ""
-
-#: admin/ogroups/asterisk/class_phonequeue.inc:787
-#: admin/ogroups/asterisk/class_phonequeue.inc:829
-#: admin/conference/class_phoneConferenceGeneric.inc:229
-#: admin/conference/class_phoneConferenceGeneric.inc:233
-#: admin/conference/class_phoneConferenceGeneric.inc:271
-#: admin/macro/class_gofonMacro.inc:343 admin/macro/class_gofonMacro.inc:452
-#: admin/macro/class_gofonMacro.inc:461 admin/macro/class_gofonMacro.inc:499
-#: admin/systems/asterisk/class_phoneGeneric.inc:267
-#: admin/systems/asterisk/class_phoneGeneric.inc:308
-#: addons/fonreports/class_fonreport.inc:220
-#: personal/phoneaccount/class_phoneAccount.inc:1046
-#: personal/phoneaccount/class_phoneAccount.inc:1166
-#: personal/phoneaccount/class_phoneAccount.inc:1172
-#: personal/phoneaccount/class_phoneAccount.inc:1368
-#: personal/phoneaccount/class_phoneAccount.inc:1450
-#: personal/phoneaccount/class_phoneAccount.inc:1528
-msgid "Error"
-msgstr ""
-
-#: admin/ogroups/asterisk/class_phonequeue.inc:802
-#: admin/ogroups/asterisk/class_phonequeue.inc:857
-#: admin/conference/class_phoneConferenceGeneric.inc:682
-#: admin/macro/class_gofonMacro.inc:473 admin/macro/class_gofonMacro.inc:484
-#: admin/macro/class_gofonMacro.inc:521
-#: admin/macro/class_gofonMacroParameters.inc:435
-#: admin/systems/asterisk/class_phoneGeneric.inc:277
-#: admin/systems/asterisk/class_phoneGeneric.inc:432
-#: admin/systems/asterisk/class_phoneGeneric.inc:446
-#: admin/systems/asterisk/class_phoneGeneric.inc:463
-#: admin/systems/services/asterisk/class_serviceAsterisk.inc:121
-#: personal/phoneaccount/class_phoneAccount.inc:1476
-#: personal/phoneaccount/class_phoneAccount.inc:1609
-msgid "LDAP error"
-msgstr ""
-
-#: admin/ogroups/asterisk/class_phonequeue.inc:864
-#: admin/systems/asterisk/class_phoneGeneric.inc:472
-#: admin/systems/asterisk/class_phoneGeneric.inc:477
-#: personal/phoneaccount/class_phoneAccount.inc:999
-#: personal/phoneaccount/class_phoneAccount.inc:1012
-#: personal/phoneaccount/class_phoneAccount.inc:1024
-#: personal/phoneaccount/class_phoneAccount.inc:1028
-#: personal/phoneaccount/class_phoneAccount.inc:1031
-#: personal/phoneaccount/class_phoneAccount.inc:1657
-msgid "Phone"
-msgstr ""
-
-#: admin/ogroups/asterisk/class_phonequeue.inc:865
-msgid "Phone group"
-msgstr ""
-
-#: admin/ogroups/asterisk/class_phonequeue.inc:872
-#: admin/ogroups/asterisk/phonequeue.tpl.c:32
-msgid "Max queue length"
-msgstr ""
-
-#: admin/ogroups/asterisk/class_phonequeue.inc:875
-#: admin/ogroups/asterisk/phonequeue.tpl.c:86
-msgid "Allow the called user to transfer his call"
-msgstr ""
-
-#: admin/ogroups/asterisk/class_phonequeue.inc:876
-#: admin/ogroups/asterisk/phonequeue.tpl.c:89
-msgid "Allows calling user to transfer call"
-msgstr ""
-
-#: admin/ogroups/asterisk/class_phonequeue.inc:877
-#: admin/ogroups/asterisk/phonequeue.tpl.c:92
-msgid "Allow the called to hangup by pressing *"
-msgstr ""
-
-#: admin/ogroups/asterisk/class_phonequeue.inc:878
-#: admin/ogroups/asterisk/phonequeue.tpl.c:98
-msgid "Ring instead of playing background music"
-msgstr ""
-
-#: admin/ogroups/asterisk/class_phonequeue.inc:879
-#: admin/ogroups/asterisk/phonequeue.tpl.c:95
-msgid "Allows calling to hangup by pressing *"
-msgstr ""
-
-#: admin/ogroups/asterisk/class_phonequeue.inc:881
-#: admin/ogroups/asterisk/phonequeue.tpl.c:47
-msgid "Music on hold"
-msgstr ""
-
-#: admin/ogroups/asterisk/class_phonequeue.inc:882
-msgid "Welcome music"
-msgstr ""
-
-#: admin/ogroups/asterisk/class_phonequeue.inc:883
-msgid "Report hold time"
-msgstr ""
-
-#: admin/ogroups/asterisk/class_phonequeue.inc:884
-msgid "'You are next' sound"
-msgstr ""
-
-#: admin/ogroups/asterisk/class_phonequeue.inc:885
-msgid "'There are' sound"
-msgstr ""
-
-#: admin/ogroups/asterisk/class_phonequeue.inc:886
-msgid "'Call waiting' sound"
-msgstr ""
-
-#: admin/ogroups/asterisk/class_phonequeue.inc:887
-msgid "'Thank you' sound"
-msgstr ""
-
-#: admin/ogroups/asterisk/class_phonequeue.inc:888
-msgid "'Minutes' sound"
-msgstr ""
-
-#: admin/ogroups/asterisk/class_phonequeue.inc:889
-msgid "'Seconds' sound"
-msgstr ""
-
-#: admin/ogroups/asterisk/class_phonequeue.inc:890
-msgid "'Less than' sound"
-msgstr ""
-
-#: admin/ogroups/asterisk/class_phonequeue.inc:891
-msgid "Queue phone number"
-msgstr ""
-
-#: admin/ogroups/asterisk/class_phonequeue.inc:892
-#: admin/conference/class_phoneConferenceGeneric.inc:707
-#: admin/ogroups/asterisk/phonequeue.tpl.c:20
-#: admin/conference/generic.tpl.c:23
-msgid "Language"
-msgstr ""
-
-#: admin/ogroups/asterisk/class_phonequeue.inc:893
-msgid "Method"
-msgstr ""
-
-#: admin/ogroups/asterisk/class_phonequeue.inc:894
-#: admin/ogroups/asterisk/phonequeue.tpl.c:83
-msgid "Announce holdtime"
-msgstr ""
-
-#: admin/ogroups/asterisk/class_phonequeue.inc:895
-msgid "Announce"
-msgstr ""
-
-#: admin/conference/conf-list.xml:11
-msgid "List of conference rooms"
-msgstr ""
-
-#: admin/conference/conf-list.xml:15 admin/conference/conf-list.xml:74
-msgid "Conference"
-msgstr ""
-
-#: admin/conference/conf-list.xml:41
-#: admin/conference/class_phoneConferenceGeneric.inc:324
-#: admin/conference/class_phoneConferenceGeneric.inc:347
-#: admin/conference/class_phoneConferenceGeneric.inc:702
-#: admin/macro/class_gofonMacro.inc:395 admin/macro/class_gofonMacro.inc:406
-#: admin/macro/macro-list.xml:41
-#: admin/systems/asterisk/class_phoneGeneric.inc:344
-#: admin/systems/asterisk/class_phoneGeneric.inc:348
-#: admin/systems/asterisk/class_phoneGeneric.inc:351
-#: admin/systems/asterisk/class_phoneGeneric.inc:366
-#: admin/systems/asterisk/class_phoneGeneric.inc:482
-#: admin/conference/conf-filter.tpl.c:5 admin/macro/macro-filter.tpl.c:5
-#: admin/macro/parameter.tpl.c:5
-msgid "Name"
-msgstr ""
-
-#: admin/conference/conf-list.xml:49
-#: admin/conference/class_phoneConferenceGeneric.inc:704
-#: admin/macro/class_gofonMacro.inc:547 admin/macro/macro-list.xml:49
-#: admin/systems/asterisk/class_phoneGeneric.inc:484
-#: admin/conference/generic.tpl.c:29 admin/macro/generic.tpl.c:17
-#: admin/systems/asterisk/phone.tpl.c:8
-msgid "Description"
-msgstr ""
-
-#: admin/conference/conf-list.xml:57 admin/macro/macro-list.xml:57
-msgid "Actions"
-msgstr ""
-
-#: admin/conference/conf-list.xml:68 admin/macro/macro-list.xml:68
-msgid "Create"
-msgstr ""
-
-#: admin/conference/conf-list.xml:86 admin/conference/conf-list.xml:125
-#: admin/macro/macro-list.xml:86 admin/macro/macro-list.xml:125
-msgid "Edit"
-msgstr ""
-
-#: admin/conference/conf-list.xml:93 admin/conference/conf-list.xml:138
-#: admin/macro/macro-list.xml:93 admin/macro/macro-list.xml:138
-msgid "Remove"
-msgstr ""
-
-#: admin/conference/class_phoneConferenceGeneric.inc:233
-#, php-format
-msgid "Cannot delete entry from server '%s' because it seems to be removed!"
-msgstr ""
-
-#: admin/conference/class_phoneConferenceGeneric.inc:308
-#, php-format
-msgid ""
-"The previously selected asterisk home server '%s' is no longer available!"
-msgstr ""
-
-#: admin/conference/class_phoneConferenceGeneric.inc:315
-#: admin/conference/generic.tpl.c:47
-msgid "PIN"
-msgstr ""
-
-#: admin/conference/class_phoneConferenceGeneric.inc:333
-#: admin/conference/class_phoneConferenceGeneric.inc:719
-msgid "Lifetime"
-msgstr ""
-
-#: admin/conference/class_phoneConferenceGeneric.inc:399
-#: personal/phoneaccount/class_phoneAccount.inc:346
-#: personal/phoneaccount/class_phoneAccount.inc:359
-#: personal/phoneaccount/class_phoneAccount.inc:617
-#: personal/phoneaccount/class_phoneAccount.inc:656
-#: personal/phoneaccount/class_phoneAccount.inc:1519
-#: personal/phoneaccount/class_phoneAccount.inc:1695
-#: admin/conference/remove.tpl.c:2 admin/macro/remove.tpl.c:2
-msgid "Warning"
-msgstr ""
-
-#: admin/conference/class_phoneConferenceGeneric.inc:400
-#, php-format
-msgid ""
-"FusionDirectory identified problems with your MySQL table definition, please"
-" activate debugging for details."
-msgstr ""
-
-#: admin/conference/class_phoneConferenceGeneric.inc:606
-#: admin/conference/class_phoneConferenceGeneric.inc:608
-#, php-format
-msgid "'%s' is already assigned to '%s'!"
-msgstr ""
-
-#: admin/conference/class_phoneConferenceGeneric.inc:693
-msgid "Phone Conference"
-msgstr ""
-
-#: admin/conference/class_phoneConferenceGeneric.inc:694
-msgid "Phone conference management"
-msgstr ""
-
-#: admin/conference/class_phoneConferenceGeneric.inc:696
-msgid "GOfon conference"
-msgstr ""
-
-#: admin/conference/class_phoneConferenceGeneric.inc:698
-msgid "Asterisk conference"
-msgstr ""
-
-#: admin/conference/class_phoneConferenceGeneric.inc:703
-#: admin/macro/class_gofonMacro.inc:546
-#: admin/systems/asterisk/class_phoneGeneric.inc:483
-#: admin/conference/generic.tpl.c:17 admin/macro/generic.tpl.c:14
-#: admin/systems/asterisk/phone.tpl.c:5
-msgid "Base"
-msgstr ""
-
-#: admin/conference/class_phoneConferenceGeneric.inc:705
-msgid "Conference PIN"
-msgstr ""
-
-#: admin/conference/class_phoneConferenceGeneric.inc:710
-#: admin/conference/generic.tpl.c:44
-msgid "Preset PIN"
-msgstr ""
-
-#: admin/conference/class_phoneConferenceGeneric.inc:711
-#: admin/conference/generic.tpl.c:50
-msgid "Record conference"
-msgstr ""
-
-#: admin/conference/class_phoneConferenceGeneric.inc:712
-#: admin/conference/generic.tpl.c:59
-msgid "Play music on hold"
-msgstr ""
-
-#: admin/conference/class_phoneConferenceGeneric.inc:713
-msgid "Activate menu"
-msgstr ""
-
-#: admin/conference/class_phoneConferenceGeneric.inc:714
-msgid "Announce user activity"
-msgstr ""
-
-#: admin/conference/class_phoneConferenceGeneric.inc:715
-msgid "Count user"
-msgstr ""
-
-#: admin/conference/class_phoneConferenceGeneric.inc:716
-msgid "Conference type"
-msgstr ""
-
-#: admin/conference/class_phoneConferenceGeneric.inc:718
-msgid "Format"
-msgstr ""
-
-#: admin/conference/class_phoneConferenceGeneric.inc:720
-#: personal/phoneaccount/class_phoneAccount.inc:1666
-msgid "Telephone number"
-msgstr ""
-
-#: admin/conference/class_phoneConferenceGeneric.inc:721
-msgid "Owner"
-msgstr ""
-
-#: admin/conference/class_phoneConferenceManagment.inc:36
-msgid "Phone Conferences"
-msgstr ""
-
-#: admin/conference/class_phoneConferenceManagment.inc:37
-msgid "Phone Conference management"
-msgstr ""
-
-#: admin/macro/class_gofonMacro.inc:202
-#, php-format
-msgid ""
-"Macro could not be removed from server '%s', please check database "
-"consistency!"
-msgstr ""
-
-#: admin/macro/class_gofonMacro.inc:264
-#, php-format
-msgid "Application missing in line %s!"
-msgstr ""
-
-#: admin/macro/class_gofonMacro.inc:267
-#, php-format
-msgid "Priority missing in line %s!"
-msgstr ""
-
-#: admin/macro/class_gofonMacro.inc:271
-#, php-format
-msgid "Extension missing in line %s!"
-msgstr ""
-
-#: admin/macro/class_gofonMacro.inc:281
-#, php-format
-msgid "Duplicate combination of 'extension' and 'priority' in line %s!"
-msgstr ""
-
-#: admin/macro/class_gofonMacro.inc:317
-#, php-format
-msgid ""
-"Macro could not be added to server '%s', please check database consistency!"
-msgstr ""
-
-#: admin/macro/class_gofonMacro.inc:410
-msgid "Name can be 20 characters at maximum!"
-msgstr ""
-
-#: admin/macro/class_gofonMacro.inc:419
-msgid "Macro is still in use!"
-msgstr ""
-
-#: admin/macro/class_gofonMacro.inc:426
-msgid "Macro is empty!"
-msgstr ""
-
-#: admin/macro/class_gofonMacro.inc:452
-#: admin/systems/asterisk/class_phoneGeneric.inc:267
-#, php-format
-msgid "Cannot delete entry because it is still in use by '%s'!"
-msgstr ""
-
-#: admin/macro/class_gofonMacro.inc:465
-#: addons/fonreports/class_fonreport.inc:190
-#: personal/phoneaccount/class_phoneAccount.inc:455
-#: personal/phoneaccount/class_phoneAccount.inc:1061
-#: personal/phoneaccount/class_phoneAccount.inc:1567
-msgid "Configuration error"
-msgstr ""
-
-#: admin/macro/class_gofonMacro.inc:536 admin/macro/class_gofonMacro.inc:541
-msgid "Asterisk macro"
-msgstr ""
-
-#: admin/macro/class_gofonMacro.inc:537
-msgid "Asterisk macro management"
-msgstr ""
-
-#: admin/macro/class_gofonMacro.inc:539
-msgid "GOfon macro"
-msgstr ""
-
-#: admin/macro/class_gofonMacro.inc:545 admin/macro/generic.tpl.c:2
-#: admin/macro/generic.tpl.c:5 admin/macro/paste_generic.tpl.c:2
-#: admin/macro/paste_generic.tpl.c:5
-msgid "Macro name"
-msgstr ""
-
-#: admin/macro/class_gofonMacro.inc:548 admin/macro/generic.tpl.c:8
-msgid "Display name"
-msgstr ""
-
-#: admin/macro/class_gofonMacro.inc:549
-msgid "Macro content and parameter"
-msgstr ""
-
-#: admin/macro/class_gofonMacro.inc:550
-msgid "Visibility flag"
-msgstr ""
-
-#: admin/macro/class_gofonMacroManagement.inc:36
-msgid "Phone Macros"
-msgstr ""
-
-#: admin/macro/class_gofonMacroManagement.inc:37
-msgid "Phone Macros management"
-msgstr ""
-
-#: admin/macro/macro-list.xml:11
-msgid "List of macros"
-msgstr ""
-
-#: admin/macro/macro-list.xml:15 admin/macro/macro-list.xml:74
-msgid "Macro"
-msgstr ""
-
-#: admin/macro/class_gofonMacroParameters.inc:58
-msgid "Parameter"
-msgstr ""
-
-#: admin/macro/class_gofonMacroParameters.inc:59
-msgid "Asterisk macro parameter"
-msgstr ""
-
-#: admin/macro/class_gofonMacroParameters.inc:234
-#: personal/phoneaccount/generic.tpl.c:35
-msgid "Phone macro"
-msgstr ""
-
-#: admin/macro/class_gofonMacroParameters.inc:290
-msgid "String"
-msgstr ""
-
-#: admin/macro/class_gofonMacroParameters.inc:291
-msgid "Combobox"
-msgstr ""
-
-#: admin/macro/class_gofonMacroParameters.inc:292
-msgid "Bool"
-msgstr ""
-
-#: admin/macro/class_gofonMacroParameters.inc:298
-msgid "Delete unused"
-msgstr ""
-
-#: admin/macro/class_gofonMacroParameters.inc:374
-#, php-format
-msgid "Parameter %s contains invalid character. '!,#' is used as delimiter!"
-msgstr ""
-
-#: admin/macro/class_gofonMacroParameters.inc:379
-#, php-format
-msgid "Parameter %s is invalid!"
-msgstr ""
-
-#: admin/macro/class_gofonMacroParameters.inc:408
-#: personal/phoneaccount/class_phoneAccount.inc:1600
-msgid "Information"
-msgstr ""
-
-#: admin/macro/class_gofonMacroParameters.inc:408
-msgid ""
-"Number of parameters for this macro has changed. Please update all users "
-"using it!"
-msgstr ""
-
-#: admin/systems/asterisk/class_phoneGeneric.inc:151
-msgid "phone"
-msgstr ""
-
-#: admin/systems/asterisk/class_phoneGeneric.inc:230
-msgid "yes"
-msgstr ""
-
-#: admin/systems/asterisk/class_phoneGeneric.inc:230
-msgid "no"
-msgstr ""
-
-#: admin/systems/asterisk/class_phoneGeneric.inc:247
-msgid "dynamic"
-msgstr ""
-
-#: admin/systems/asterisk/class_phoneGeneric.inc:247
-msgid "Networksettings"
-msgstr ""
-
-#: admin/systems/asterisk/class_phoneGeneric.inc:330
-#: admin/systems/asterisk/class_phoneGeneric.inc:333
-msgid "IP address"
-msgstr ""
-
-#: admin/systems/asterisk/class_phoneGeneric.inc:473
-msgid "Phone information"
-msgstr ""
-
-#: admin/systems/asterisk/class_phoneGeneric.inc:476
-#: personal/phoneaccount/class_phoneAccount.inc:1668
-msgid "Phone hardware"
-msgstr ""
-
-#: admin/systems/asterisk/class_phoneGeneric.inc:485
-msgid "SIP Mode"
-msgstr ""
-
-#: admin/systems/asterisk/class_phoneGeneric.inc:486
-msgid "SIP DTMF mode"
-msgstr ""
-
-#: admin/systems/asterisk/class_phoneGeneric.inc:487
-msgid "SIP Default ip"
-msgstr ""
-
-#: admin/systems/asterisk/class_phoneGeneric.inc:488
-msgid "SIP Qualify"
-msgstr ""
-
-#: admin/systems/asterisk/class_phoneGeneric.inc:489
-msgid "IAX authentication type"
-msgstr ""
-
-#: admin/systems/asterisk/class_phoneGeneric.inc:490
-msgid "IAX secret"
-msgstr ""
-
-#: admin/systems/asterisk/class_phoneGeneric.inc:491
-msgid "IAX account code"
-msgstr ""
-
-#: admin/systems/asterisk/class_phoneGeneric.inc:492
-msgid "IAX trunk lines"
-msgstr ""
-
-#: admin/systems/asterisk/class_phoneGeneric.inc:493
-msgid "IAX permit settings"
-msgstr ""
-
-#: admin/systems/asterisk/class_phoneGeneric.inc:494
-msgid "IAX deny settings"
-msgstr ""
-
-#: admin/systems/asterisk/class_phoneGeneric.inc:495
-msgid "CAPI MSN"
-msgstr ""
-
-#: admin/systems/asterisk/class_phoneGeneric.inc:496
-msgid "Hardware type"
-msgstr ""
-
-#: admin/systems/services/asterisk/class_serviceAsterisk.inc:35
-msgid "VoIP database information"
-msgstr ""
-
-#: admin/systems/services/asterisk/class_serviceAsterisk.inc:38
-msgid "Asterisk DB user"
-msgstr ""
-
-#: admin/systems/services/asterisk/class_serviceAsterisk.inc:38
-msgid "Login for asterisk database administrator"
-msgstr ""
-
-#: admin/systems/services/asterisk/class_serviceAsterisk.inc:42
-msgid "Password"
-msgstr ""
-
-#: admin/systems/services/asterisk/class_serviceAsterisk.inc:42
-msgid "Password for asterisk database administrator"
-msgstr ""
-
-#: admin/systems/services/asterisk/class_serviceAsterisk.inc:46
-msgid "Country dial prefix"
-msgstr ""
-
-#: admin/systems/services/asterisk/class_serviceAsterisk.inc:50
-msgid "Local dial prefix"
-msgstr ""
-
-#: admin/systems/services/asterisk/class_serviceAsterisk.inc:54
-msgid "Driver"
-msgstr ""
-
-#: admin/systems/services/asterisk/class_serviceAsterisk.inc:54
-msgid "Driver to use to contact this database."
-msgstr ""
-
-#: admin/systems/services/asterisk/class_serviceAsterisk.inc:95
-#, php-format
-msgid ""
-"You can't remove the asterisk database extension, it is still in use by "
-"these objects '%s'."
-msgstr ""
-
-#: admin/systems/services/asterisk/class_serviceAsterisk.inc:140
-msgid "VoIP service (asterisk)"
-msgstr ""
-
-#: admin/systems/services/asterisk/class_serviceAsterisk.inc:141
-msgid "VoIP - asterisk management"
-msgstr ""
-
-#: admin/systems/services/asterisk/class_serviceAsterisk.inc:141
-msgid "Services"
-msgstr ""
-
-#: addons/fonreports/class_fonreport.inc:232
-msgid "Insufficient permissions"
-msgstr ""
-
-#: addons/fonreports/class_fonreport.inc:251
-msgid "Y-M-D"
-msgstr ""
-
-#: addons/fonreports/class_fonreport.inc:418
-#: addons/fonreports/class_fonreport.inc:419
-#: addons/fonreports/class_fonreport.inc:424 addons/fonreports/main.inc:46
-msgid "Phone reports"
-msgstr ""
-
-#: addons/fonreports/class_fonreport.inc:419
-msgid "All entries are readonly"
-msgstr ""
-
-#: addons/fonreports/class_fonreport.inc:428
-#: addons/fonreports/contents.tpl.c:32
-msgid "Date"
-msgstr ""
-
-#: addons/fonreports/class_fonreport.inc:429
-#: addons/fonreports/contents.tpl.c:35
-msgid "Source"
-msgstr ""
-
-#: addons/fonreports/class_fonreport.inc:430
-#: addons/fonreports/contents.tpl.c:38
-msgid "Destination"
-msgstr ""
-
-#: addons/fonreports/class_fonreport.inc:431
-#: addons/fonreports/contents.tpl.c:41
-msgid "Channel"
-msgstr ""
-
-#: addons/fonreports/class_fonreport.inc:432
-msgid "Application called"
-msgstr ""
-
-#: addons/fonreports/class_fonreport.inc:433
-msgid "Disposition"
-msgstr ""
-
-#: addons/fonreports/class_fonreport.inc:434
-#: addons/fonreports/contents.tpl.c:50
-msgid "Duration"
-msgstr ""
-
-#: personal/phoneaccount/class_phoneAccount.inc:176
-msgid "automatic"
-msgstr ""
-
-#: personal/phoneaccount/class_phoneAccount.inc:212
-msgid "no macro"
-msgstr ""
-
-#: personal/phoneaccount/class_phoneAccount.inc:240
-msgid "undefined"
-msgstr ""
-
-#: personal/phoneaccount/class_phoneAccount.inc:359
-#, php-format
-msgid ""
-"Cannot identify telephone extension in database, please try to save again."
-msgstr ""
-
-#: personal/phoneaccount/class_phoneAccount.inc:577
-#: personal/phoneaccount/class_phoneAccount.inc:595
-msgid "Abort saving entries to keep the database consistent."
+#: admin/systems/asterisk/class_phoneIAX.inc:30
+#: admin/systems/asterisk/class_phoneIAX.inc:34
+#: personal/asterisk/class_asteriskAccount.inc:45
+msgid "Phone"
 msgstr ""
 
-#: personal/phoneaccount/class_phoneAccount.inc:618
-#: personal/phoneaccount/class_phoneAccount.inc:657
-#: personal/phoneaccount/class_phoneAccount.inc:1520
-#, php-format
-msgid ""
-"FusionDirectory identified problems with your database table definition!"
+#: admin/systems/asterisk/class_phoneIAX.inc:31
+msgid "Asterisk phone"
 msgstr ""
 
-#: personal/phoneaccount/class_phoneAccount.inc:1023
-msgid "Remove phone account"
+#: admin/systems/asterisk/class_phoneIAX.inc:33
+msgid "Phone hardware"
 msgstr ""
 
-#: personal/phoneaccount/class_phoneAccount.inc:1027
-#: personal/phoneaccount/class_phoneAccount.inc:1030
-msgid "Create phone account"
+#: admin/systems/asterisk/class_phoneIAX.inc:46
+#: personal/asterisk/class_asteriskAccount.inc:42
+msgid "Telephone"
 msgstr ""
 
-#: personal/phoneaccount/class_phoneAccount.inc:1028
-msgid "User uid"
+#: admin/systems/asterisk/class_phoneIAX.inc:49
+msgid "Name"
 msgstr ""
 
-#: personal/phoneaccount/class_phoneAccount.inc:1046
-msgid "Selected macro is not available anymore!"
+#: admin/systems/asterisk/class_phoneIAX.inc:49
+msgid "Name of this phone"
 msgstr ""
 
-#: personal/phoneaccount/class_phoneAccount.inc:1221
-msgid "Choose your private phone"
+#: admin/systems/asterisk/class_phoneIAX.inc:53
+msgid "Account name"
 msgstr ""
 
-#: personal/phoneaccount/class_phoneAccount.inc:1346
-msgid ""
-"There must be at least one server with an asterisk database to create a "
-"phone account."
+#: admin/systems/asterisk/class_phoneIAX.inc:53
+msgid "Name of the account"
 msgstr ""
 
-#: personal/phoneaccount/class_phoneAccount.inc:1354
-#: personal/phoneaccount/class_phoneAccount.inc:1357
-#: personal/phoneaccount/generic.tpl.c:29
-#: personal/phoneaccount/paste_generic.tpl.c:11
-msgid "Voicemail PIN"
+#: admin/systems/services/asterisk/class_serviceAsterisk.inc:35
+msgid "VoIP database information"
 msgstr ""
 
-#: personal/phoneaccount/class_phoneAccount.inc:1354
-msgid "Between 1-4 charactes"
+#: admin/systems/services/asterisk/class_serviceAsterisk.inc:38
+msgid "Asterisk DB user"
 msgstr ""
 
-#: personal/phoneaccount/class_phoneAccount.inc:1362
-#: personal/phoneaccount/generic.tpl.c:32
-#: personal/phoneaccount/paste_generic.tpl.c:14
-msgid "Phone PIN"
+#: admin/systems/services/asterisk/class_serviceAsterisk.inc:38
+msgid "Login for asterisk database administrator"
 msgstr ""
 
-#: personal/phoneaccount/class_phoneAccount.inc:1394
-#: admin/conference/generic.tpl.c:38 admin/conference/paste_generic.tpl.c:8
-msgid "Phone number"
+#: admin/systems/services/asterisk/class_serviceAsterisk.inc:42
+msgid "Password"
 msgstr ""
 
-#: personal/phoneaccount/class_phoneAccount.inc:1402
-#, php-format
-msgid "macro parameter %s"
+#: admin/systems/services/asterisk/class_serviceAsterisk.inc:42
+msgid "Password for asterisk database administrator"
 msgstr ""
 
-#: personal/phoneaccount/class_phoneAccount.inc:1450
-msgid "An error occured while updating the database entries!"
+#: admin/systems/services/asterisk/class_serviceAsterisk.inc:46
+msgid "Country dial prefix"
 msgstr ""
 
-#: personal/phoneaccount/class_phoneAccount.inc:1567
-msgid "Was not able to found any asterisk server"
+#: admin/systems/services/asterisk/class_serviceAsterisk.inc:50
+msgid "Local dial prefix"
 msgstr ""
 
-#: personal/phoneaccount/class_phoneAccount.inc:1600
-#, php-format
-msgid "User '%s' has been removed from phone queue '%s'."
+#: admin/systems/services/asterisk/class_serviceAsterisk.inc:54
+msgid "Driver"
 msgstr ""
 
-#: personal/phoneaccount/class_phoneAccount.inc:1637
-#: personal/phoneaccount/class_phoneAccount.inc:1639
-#, php-format
-msgid "The specified telephonenumber '%s' is already assigned to '%s'."
+#: admin/systems/services/asterisk/class_serviceAsterisk.inc:54
+msgid "Driver to use to contact this database."
 msgstr ""
 
-#: personal/phoneaccount/class_phoneAccount.inc:1649
+#: admin/systems/services/asterisk/class_serviceAsterisk.inc:95
 #, php-format
 msgid ""
-"The previously selected asterisk home server (%s) is no longer available. "
-"Remove aborted."
-msgstr ""
-
-#: personal/phoneaccount/class_phoneAccount.inc:1658
-msgid "Phone account settings"
-msgstr ""
-
-#: personal/phoneaccount/class_phoneAccount.inc:1667
-msgid "Macro settings"
-msgstr ""
-
-#: personal/phoneaccount/class_phoneAccount.inc:1670
-msgid "Phone context"
+"You can't remove the asterisk database extension, it is still in use by "
+"these objects '%s'."
 msgstr ""
 
-#: personal/phoneaccount/class_phoneAccount.inc:1671
-msgid "Voice mail context"
+#: admin/systems/services/asterisk/class_serviceAsterisk.inc:121
+msgid "LDAP error"
 msgstr ""
 
-#: personal/phoneaccount/class_phoneAccount.inc:1672
-msgid "Telephone pin"
+#: admin/systems/services/asterisk/class_serviceAsterisk.inc:140
+msgid "VoIP service (asterisk)"
 msgstr ""
 
-#: personal/phoneaccount/class_phoneAccount.inc:1673
-msgid "Voicemail pin"
+#: admin/systems/services/asterisk/class_serviceAsterisk.inc:141
+msgid "VoIP - asterisk management"
 msgstr ""
 
-#: personal/phoneaccount/class_phoneAccount.inc:1695
-#, php-format
-msgid "You need to configure %s contexts first"
+#: admin/systems/services/asterisk/class_serviceAsterisk.inc:141
+msgid "Services"
 msgstr ""
 
-#: personal/phoneaccount/main.inc:124
-msgid "Click the 'Edit' button below to change informations in this dialog"
+#: personal/asterisk/class_asteriskAccount.inc:30
+#: config/asterisk/class_asteriskPluginConfig.inc:28
+#: config/asterisk/class_asteriskPluginConfig.inc:41
+msgid "Asterisk"
 msgstr ""
 
-#: personal/phoneaccount/main.inc:134
-#: personal/phoneaccount/paste_generic.tpl.c:2
-msgid "Phone settings"
+#: personal/asterisk/class_asteriskAccount.inc:31
+msgid "Asterisk account"
 msgstr ""
 
-#: config/asterisk/class_asteriskPluginConfig.inc:28
-#: config/asterisk/class_asteriskPluginConfig.inc:41
-msgid "Asterisk"
+#: personal/asterisk/class_asteriskAccount.inc:45
+msgid "Select the phone associated to this user"
 msgstr ""
 
 #: config/asterisk/class_asteriskPluginConfig.inc:29
@@ -1010,338 +172,3 @@ msgstr ""
 #: config/asterisk/class_asteriskPluginConfig.inc:72
 msgid "Available voicemail contexts"
 msgstr ""
-
-#: admin/ogroups/asterisk/phonequeue.tpl.c:2
-msgid ""
-"Only users with the same asterisk home server will be included to this "
-"queue."
-msgstr ""
-
-#: admin/ogroups/asterisk/phonequeue.tpl.c:5
-#: personal/phoneaccount/generic.tpl.c:2
-#: personal/phoneaccount/paste_generic.tpl.c:5
-msgid "Phone numbers"
-msgstr ""
-
-#: admin/ogroups/asterisk/phonequeue.tpl.c:8
-msgid "Up"
-msgstr ""
-
-#: admin/ogroups/asterisk/phonequeue.tpl.c:11
-msgid "Down"
-msgstr ""
-
-#: admin/ogroups/asterisk/phonequeue.tpl.c:14
-#: admin/conference/generic.tpl.c:41
-msgid "Options"
-msgstr ""
-
-#: admin/ogroups/asterisk/phonequeue.tpl.c:29
-msgid "Strategy"
-msgstr ""
-
-#: admin/ogroups/asterisk/phonequeue.tpl.c:38
-msgid "(in seconds)"
-msgstr ""
-
-#: admin/ogroups/asterisk/phonequeue.tpl.c:41
-msgid "Queue sound setup"
-msgstr ""
-
-#: admin/ogroups/asterisk/phonequeue.tpl.c:44
-msgid "Use music on hold instead of ringing"
-msgstr ""
-
-#: admin/ogroups/asterisk/phonequeue.tpl.c:50
-msgid "Welcome sound file"
-msgstr ""
-
-#: admin/ogroups/asterisk/phonequeue.tpl.c:53
-msgid "Announce message"
-msgstr ""
-
-#: admin/ogroups/asterisk/phonequeue.tpl.c:56
-msgid "Sound file for 'You are next ...'"
-msgstr ""
-
-#: admin/ogroups/asterisk/phonequeue.tpl.c:59
-msgid "'There are ...'"
-msgstr ""
-
-#: admin/ogroups/asterisk/phonequeue.tpl.c:62
-msgid "'... calls waiting'"
-msgstr ""
-
-#: admin/ogroups/asterisk/phonequeue.tpl.c:65
-msgid "'Thank you' message"
-msgstr ""
-
-#: admin/ogroups/asterisk/phonequeue.tpl.c:68
-msgid "'minutes' sound file"
-msgstr ""
-
-#: admin/ogroups/asterisk/phonequeue.tpl.c:71
-msgid "'seconds' sound file"
-msgstr ""
-
-#: admin/ogroups/asterisk/phonequeue.tpl.c:74
-msgid "Hold sound file"
-msgstr ""
-
-#: admin/ogroups/asterisk/phonequeue.tpl.c:77
-msgid "Less Than sound file"
-msgstr ""
-
-#: admin/ogroups/asterisk/phonequeue.tpl.c:80
-msgid "Phone attributes "
-msgstr ""
-
-#: admin/conference/conf-filter.tpl.c:2 admin/macro/macro-filter.tpl.c:2
-#: addons/fonreports/contents.tpl.c:2
-msgid "Filter"
-msgstr ""
-
-#: admin/conference/generic.tpl.c:2
-msgid "Properties"
-msgstr ""
-
-#: admin/conference/generic.tpl.c:5 admin/conference/paste_generic.tpl.c:2
-msgid "Conference name"
-msgstr ""
-
-#: admin/conference/generic.tpl.c:8 admin/conference/paste_generic.tpl.c:5
-msgid "Name of conference to create"
-msgstr ""
-
-#: admin/conference/generic.tpl.c:11
-msgid "Type"
-msgstr ""
-
-#: admin/conference/generic.tpl.c:14
-msgid "Choose subtree to place conference in"
-msgstr ""
-
-#: admin/conference/generic.tpl.c:26
-msgid "Select language"
-msgstr ""
-
-#: admin/conference/generic.tpl.c:32
-msgid "Descriptive text for department"
-msgstr ""
-
-#: admin/conference/generic.tpl.c:35
-msgid "Lifetime (in days)"
-msgstr ""
-
-#: admin/conference/generic.tpl.c:53
-msgid "Sound file format"
-msgstr ""
-
-#: admin/conference/generic.tpl.c:56
-msgid "Choose subtree to place department in"
-msgstr ""
-
-#: admin/conference/generic.tpl.c:62
-msgid "Activate session menu"
-msgstr ""
-
-#: admin/conference/generic.tpl.c:65
-msgid "Announce users joining or leaving the conference"
-msgstr ""
-
-#: admin/conference/generic.tpl.c:68
-msgid "Count users"
-msgstr ""
-
-#: admin/conference/remove.tpl.c:5 admin/macro/remove.tpl.c:5
-msgid ""
-"Please double check if you really want to do this since there is no way for "
-"FusionDirectory to get your data back."
-msgstr ""
-
-#: admin/conference/remove.tpl.c:8 admin/macro/remove.tpl.c:8
-msgid "So - if you're sure - press 'Delete' to continue or 'Cancel' to abort."
-msgstr ""
-
-#: admin/macro/generic.tpl.c:11
-msgid "Macro name to be displayed"
-msgstr ""
-
-#: admin/macro/generic.tpl.c:20
-msgid "Visible for user"
-msgstr ""
-
-#: admin/macro/generic.tpl.c:23
-msgid "Macro text"
-msgstr ""
-
-#: admin/macro/parameter.tpl.c:2
-msgid "Argument"
-msgstr ""
-
-#: admin/macro/parameter.tpl.c:8
-msgid "type"
-msgstr ""
-
-#: admin/macro/parameter.tpl.c:11
-msgid "Default value"
-msgstr ""
-
-#: admin/macro/parameter.tpl.c:14
-msgid "You are not allowed to view the macro parameter settings"
-msgstr ""
-
-#: admin/systems/asterisk/phonesettings.tpl.c:2
-msgid "Advanced phone settings"
-msgstr ""
-
-#: admin/systems/asterisk/phonesettings.tpl.c:5
-msgid "Phone type"
-msgstr ""
-
-#: admin/systems/asterisk/phonesettings.tpl.c:8
-#: admin/systems/asterisk/phonesettings.tpl.c:14
-#: admin/systems/asterisk/phonesettings.tpl.c:20
-#: admin/systems/asterisk/phonesettings.tpl.c:26
-#: admin/systems/asterisk/phonesettings.tpl.c:35
-#: admin/systems/asterisk/phonesettings.tpl.c:47
-#: admin/systems/asterisk/phonesettings.tpl.c:65
-msgid "Choose a phone type"
-msgstr ""
-
-#: admin/systems/asterisk/phonesettings.tpl.c:11
-msgid "Mode"
-msgstr ""
-
-#: admin/systems/asterisk/phonesettings.tpl.c:17
-msgid "DTMF mode"
-msgstr ""
-
-#: admin/systems/asterisk/phonesettings.tpl.c:23
-#: admin/systems/asterisk/phonesettings.tpl.c:38
-msgid "Default IP"
-msgstr ""
-
-#: admin/systems/asterisk/phonesettings.tpl.c:29
-#: admin/systems/asterisk/phonesettings.tpl.c:41
-msgid "Response timeout"
-msgstr ""
-
-#: admin/systems/asterisk/phonesettings.tpl.c:32
-msgid "Modus"
-msgstr ""
-
-#: admin/systems/asterisk/phonesettings.tpl.c:44
-msgid "Authtype"
-msgstr ""
-
-#: admin/systems/asterisk/phonesettings.tpl.c:50
-msgid "Secret"
-msgstr ""
-
-#: admin/systems/asterisk/phonesettings.tpl.c:53
-msgid "GoFonInkeys"
-msgstr ""
-
-#: admin/systems/asterisk/phonesettings.tpl.c:56
-msgid "GoFonOutKeys"
-msgstr ""
-
-#: admin/systems/asterisk/phonesettings.tpl.c:59
-msgid "Account code"
-msgstr ""
-
-#: admin/systems/asterisk/phonesettings.tpl.c:62
-msgid "Trunk lines"
-msgstr ""
-
-#: admin/systems/asterisk/phonesettings.tpl.c:68
-msgid "Hosts that are allowed to connect"
-msgstr ""
-
-#: admin/systems/asterisk/phonesettings.tpl.c:71
-#: admin/systems/asterisk/phonesettings.tpl.c:77
-msgid "List of alternative mail addresses"
-msgstr ""
-
-#: admin/systems/asterisk/phonesettings.tpl.c:74
-msgid "Hosts that are not allowed to connect"
-msgstr ""
-
-#: admin/systems/asterisk/phonesettings.tpl.c:80
-msgid "MSN"
-msgstr ""
-
-#: admin/systems/asterisk/phone.tpl.c:2
-msgid "Phone name"
-msgstr ""
-
-#: addons/fonreports/contents.tpl.c:5
-msgid "Search for"
-msgstr ""
-
-#: addons/fonreports/contents.tpl.c:8
-msgid "Enter user name to search for"
-msgstr ""
-
-#: addons/fonreports/contents.tpl.c:11 addons/fonreports/contents.tpl.c:26
-msgid "in"
-msgstr ""
-
-#: addons/fonreports/contents.tpl.c:14
-msgid "Select subtree to base search on"
-msgstr ""
-
-#: addons/fonreports/contents.tpl.c:17
-msgid "on"
-msgstr ""
-
-#: addons/fonreports/contents.tpl.c:20
-msgid "Select server to search on"
-msgstr ""
-
-#: addons/fonreports/contents.tpl.c:23
-msgid "during"
-msgstr ""
-
-#: addons/fonreports/contents.tpl.c:29
-msgid "Search"
-msgstr ""
-
-#: addons/fonreports/contents.tpl.c:44
-msgid "Application"
-msgstr ""
-
-#: addons/fonreports/contents.tpl.c:47
-msgid "Status"
-msgstr ""
-
-#: addons/fonreports/contents.tpl.c:53
-msgid "Search returned no results..."
-msgstr ""
-
-#: personal/phoneaccount/generic.tpl.c:5
-#: personal/phoneaccount/paste_generic.tpl.c:8
-msgid "Telephone hardware"
-msgstr ""
-
-#: personal/phoneaccount/generic.tpl.c:8
-msgid "Telephone"
-msgstr ""
-
-#: personal/phoneaccount/generic.tpl.c:14
-msgid "Select the accounts home server"
-msgstr ""
-
-#: personal/phoneaccount/generic.tpl.c:17
-msgid "Context"
-msgstr ""
-
-#: personal/phoneaccount/generic.tpl.c:20
-#: personal/phoneaccount/generic.tpl.c:26
-msgid "Select the accounts context"
-msgstr ""
-
-#: personal/phoneaccount/generic.tpl.c:23
-msgid "Voicemail context"
-msgstr ""
diff --git a/asterisk/locale/vi_VN/fusiondirectory.po b/asterisk/locale/vi_VN/fusiondirectory.po
index 6d2b727fe6ecfbbef97e580b563d0b55aa7f2777..7fde3c4b504a757e2c8c8eef06997b80e1f113dd 100644
--- a/asterisk/locale/vi_VN/fusiondirectory.po
+++ b/asterisk/locale/vi_VN/fusiondirectory.po
@@ -5,702 +5,51 @@
 # Translators:
 msgid ""
 msgstr ""
-"Project-Id-Version: FusionDirectory-108\n"
+"Project-Id-Version: FusionDirectory-109\n"
 "Report-Msgid-Bugs-To: documentation@lists.fusiondirectory.org\n"
-"POT-Creation-Date: 2015-03-31 11:49+0200\n"
-"PO-Revision-Date: 2015-03-31 11:41+0000\n"
+"POT-Creation-Date: 2014-12-15 17:47+0100\n"
+"PO-Revision-Date: 2015-02-25 16:04+0000\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>\n"
-"Language-Team: Vietnamese (Viet Nam) (http://www.transifex.com/projects/p/FusionDirectory-108/language/vi_VN/)\n"
+"Language-Team: Vietnamese (Viet Nam) (http://www.transifex.com/projects/p/FusionDirectory-109/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/ogroups/asterisk/class_phonequeue.inc:110
-#: admin/conference/class_phoneConferenceGeneric.inc:104
-#: personal/phoneaccount/class_phoneAccount.inc:148
-msgid "Obsolete entry"
-msgstr ""
-
-#: admin/ogroups/asterisk/class_phonequeue.inc:110
-#: admin/conference/class_phoneConferenceGeneric.inc:104
-#: personal/phoneaccount/class_phoneAccount.inc:148
-#, php-format
-msgid ""
-"The current home server is not available anymore. It will be moved to '%s' "
-"if you save this entry!"
-msgstr ""
-
-#: admin/ogroups/asterisk/class_phonequeue.inc:140
-msgid "ring all"
-msgstr ""
-
-#: admin/ogroups/asterisk/class_phonequeue.inc:141
-msgid "round robin"
-msgstr ""
-
-#: admin/ogroups/asterisk/class_phonequeue.inc:142
-msgid "least recently called"
-msgstr ""
-
-#: admin/ogroups/asterisk/class_phonequeue.inc:143
-msgid "fewest completed calls"
-msgstr ""
-
-#: admin/ogroups/asterisk/class_phonequeue.inc:144
-msgid "random"
-msgstr ""
-
-#: admin/ogroups/asterisk/class_phonequeue.inc:145
-msgid "round robin with memory"
-msgstr ""
-
-#: admin/ogroups/asterisk/class_phonequeue.inc:180
-msgid "Remove the phone queue from this Account"
-msgstr ""
-
-#: admin/ogroups/asterisk/class_phonequeue.inc:181
-#: admin/ogroups/asterisk/class_phonequeue.inc:184
-msgid "phone queue"
-msgstr ""
-
-#: admin/ogroups/asterisk/class_phonequeue.inc:183
-msgid "Create phone queue"
-msgstr ""
-
-#: admin/ogroups/asterisk/class_phonequeue.inc:272
-msgid ""
-"There must be at least one server with an asterisk database to create a "
-"phone queue."
-msgstr ""
-
-#: admin/ogroups/asterisk/class_phonequeue.inc:275
-#: admin/ogroups/asterisk/class_phonequeue.inc:873
-#: admin/conference/class_phoneConferenceGeneric.inc:709
-#: personal/phoneaccount/class_phoneAccount.inc:1350
-#: personal/phoneaccount/class_phoneAccount.inc:1669
-#: admin/ogroups/asterisk/phonequeue.tpl.c:17
-#: admin/conference/generic.tpl.c:20 personal/phoneaccount/generic.tpl.c:11
-msgid "Home server"
-msgstr ""
-
-#: admin/ogroups/asterisk/class_phonequeue.inc:281
-#: admin/ogroups/asterisk/class_phonequeue.inc:871
-#: admin/ogroups/asterisk/phonequeue.tpl.c:23
-msgid "Timeout"
-msgstr ""
-
-#: admin/ogroups/asterisk/class_phonequeue.inc:284
-#: admin/ogroups/asterisk/class_phonequeue.inc:896
-#: admin/ogroups/asterisk/phonequeue.tpl.c:26
-msgid "Retry"
-msgstr ""
-
-#: admin/ogroups/asterisk/class_phonequeue.inc:287
-msgid "Queue length"
-msgstr ""
-
-#: admin/ogroups/asterisk/class_phonequeue.inc:290
-#: admin/ogroups/asterisk/class_phonequeue.inc:874
-#: admin/ogroups/asterisk/phonequeue.tpl.c:35
-msgid "Announce frequency"
-msgstr ""
-
-#: admin/ogroups/asterisk/class_phonequeue.inc:293
-#: admin/conference/class_phoneConferenceGeneric.inc:328
-msgid "Number"
-msgstr ""
-
-#: admin/ogroups/asterisk/class_phonequeue.inc:316
-#: admin/ogroups/asterisk/class_phonequeue.inc:361
-msgid "asterisk"
-msgstr ""
-
-#: admin/ogroups/asterisk/class_phonequeue.inc:345
-#: admin/ogroups/asterisk/class_phonequeue.inc:696
-#: admin/conference/class_phoneConferenceGeneric.inc:369
-#: admin/macro/class_gofonMacro.inc:381 admin/macro/class_gofonMacro.inc:465
-#: addons/fonreports/class_fonreport.inc:190
-#: addons/fonreports/class_fonreport.inc:220
-#: personal/phoneaccount/class_phoneAccount.inc:455
-#: personal/phoneaccount/class_phoneAccount.inc:1061
-msgid "GOfon"
-msgstr ""
-
-#: admin/ogroups/asterisk/class_phonequeue.inc:401
-msgid "Cannot find old queue entry!"
-msgstr ""
-
-#: admin/ogroups/asterisk/class_phonequeue.inc:487
-#, php-format
-msgid ""
-"Found more than one entry named '%s' in queue table. Please inform your "
-"system administrator!"
-msgstr ""
-
-#: admin/ogroups/asterisk/class_phonequeue.inc:728
-#: admin/ogroups/asterisk/class_phonequeue.inc:730
-msgid "telephone number"
-msgstr ""
-
-#: admin/ogroups/asterisk/class_phonequeue.inc:787
-#: admin/ogroups/asterisk/class_phonequeue.inc:829
-#: admin/conference/class_phoneConferenceGeneric.inc:229
-#: admin/conference/class_phoneConferenceGeneric.inc:233
-#: admin/conference/class_phoneConferenceGeneric.inc:271
-#: admin/macro/class_gofonMacro.inc:343 admin/macro/class_gofonMacro.inc:452
-#: admin/macro/class_gofonMacro.inc:461 admin/macro/class_gofonMacro.inc:499
-#: admin/systems/asterisk/class_phoneGeneric.inc:267
-#: admin/systems/asterisk/class_phoneGeneric.inc:308
-#: addons/fonreports/class_fonreport.inc:220
-#: personal/phoneaccount/class_phoneAccount.inc:1046
-#: personal/phoneaccount/class_phoneAccount.inc:1166
-#: personal/phoneaccount/class_phoneAccount.inc:1172
-#: personal/phoneaccount/class_phoneAccount.inc:1368
-#: personal/phoneaccount/class_phoneAccount.inc:1450
-#: personal/phoneaccount/class_phoneAccount.inc:1528
-msgid "Error"
-msgstr "Lá»—i"
-
-#: admin/ogroups/asterisk/class_phonequeue.inc:802
-#: admin/ogroups/asterisk/class_phonequeue.inc:857
-#: admin/conference/class_phoneConferenceGeneric.inc:682
-#: admin/macro/class_gofonMacro.inc:473 admin/macro/class_gofonMacro.inc:484
-#: admin/macro/class_gofonMacro.inc:521
-#: admin/macro/class_gofonMacroParameters.inc:435
-#: admin/systems/asterisk/class_phoneGeneric.inc:277
-#: admin/systems/asterisk/class_phoneGeneric.inc:432
-#: admin/systems/asterisk/class_phoneGeneric.inc:446
-#: admin/systems/asterisk/class_phoneGeneric.inc:463
-#: admin/systems/services/asterisk/class_serviceAsterisk.inc:121
-#: personal/phoneaccount/class_phoneAccount.inc:1476
-#: personal/phoneaccount/class_phoneAccount.inc:1609
-msgid "LDAP error"
-msgstr "Lá»—i LDAP"
-
-#: admin/ogroups/asterisk/class_phonequeue.inc:864
-#: admin/systems/asterisk/class_phoneGeneric.inc:472
-#: admin/systems/asterisk/class_phoneGeneric.inc:477
-#: personal/phoneaccount/class_phoneAccount.inc:999
-#: personal/phoneaccount/class_phoneAccount.inc:1012
-#: personal/phoneaccount/class_phoneAccount.inc:1024
-#: personal/phoneaccount/class_phoneAccount.inc:1028
-#: personal/phoneaccount/class_phoneAccount.inc:1031
-#: personal/phoneaccount/class_phoneAccount.inc:1657
+#: admin/systems/asterisk/class_phoneIAX.inc:30
+#: admin/systems/asterisk/class_phoneIAX.inc:34
+#: personal/asterisk/class_asteriskAccount.inc:45
 msgid "Phone"
 msgstr "Sá»‘ Ä‘iá»‡n thoáº¡i"
 
-#: admin/ogroups/asterisk/class_phonequeue.inc:865
-msgid "Phone group"
-msgstr ""
-
-#: admin/ogroups/asterisk/class_phonequeue.inc:872
-#: admin/ogroups/asterisk/phonequeue.tpl.c:32
-msgid "Max queue length"
-msgstr ""
-
-#: admin/ogroups/asterisk/class_phonequeue.inc:875
-#: admin/ogroups/asterisk/phonequeue.tpl.c:86
-msgid "Allow the called user to transfer his call"
-msgstr ""
-
-#: admin/ogroups/asterisk/class_phonequeue.inc:876
-#: admin/ogroups/asterisk/phonequeue.tpl.c:89
-msgid "Allows calling user to transfer call"
-msgstr ""
-
-#: admin/ogroups/asterisk/class_phonequeue.inc:877
-#: admin/ogroups/asterisk/phonequeue.tpl.c:92
-msgid "Allow the called to hangup by pressing *"
-msgstr ""
-
-#: admin/ogroups/asterisk/class_phonequeue.inc:878
-#: admin/ogroups/asterisk/phonequeue.tpl.c:98
-msgid "Ring instead of playing background music"
-msgstr ""
-
-#: admin/ogroups/asterisk/class_phonequeue.inc:879
-#: admin/ogroups/asterisk/phonequeue.tpl.c:95
-msgid "Allows calling to hangup by pressing *"
-msgstr ""
-
-#: admin/ogroups/asterisk/class_phonequeue.inc:881
-#: admin/ogroups/asterisk/phonequeue.tpl.c:47
-msgid "Music on hold"
-msgstr ""
-
-#: admin/ogroups/asterisk/class_phonequeue.inc:882
-msgid "Welcome music"
-msgstr ""
-
-#: admin/ogroups/asterisk/class_phonequeue.inc:883
-msgid "Report hold time"
-msgstr ""
-
-#: admin/ogroups/asterisk/class_phonequeue.inc:884
-msgid "'You are next' sound"
-msgstr ""
-
-#: admin/ogroups/asterisk/class_phonequeue.inc:885
-msgid "'There are' sound"
-msgstr ""
-
-#: admin/ogroups/asterisk/class_phonequeue.inc:886
-msgid "'Call waiting' sound"
-msgstr ""
-
-#: admin/ogroups/asterisk/class_phonequeue.inc:887
-msgid "'Thank you' sound"
-msgstr ""
-
-#: admin/ogroups/asterisk/class_phonequeue.inc:888
-msgid "'Minutes' sound"
-msgstr ""
-
-#: admin/ogroups/asterisk/class_phonequeue.inc:889
-msgid "'Seconds' sound"
-msgstr ""
-
-#: admin/ogroups/asterisk/class_phonequeue.inc:890
-msgid "'Less than' sound"
-msgstr ""
-
-#: admin/ogroups/asterisk/class_phonequeue.inc:891
-msgid "Queue phone number"
-msgstr ""
-
-#: admin/ogroups/asterisk/class_phonequeue.inc:892
-#: admin/conference/class_phoneConferenceGeneric.inc:707
-#: admin/ogroups/asterisk/phonequeue.tpl.c:20
-#: admin/conference/generic.tpl.c:23
-msgid "Language"
-msgstr ""
-
-#: admin/ogroups/asterisk/class_phonequeue.inc:893
-msgid "Method"
-msgstr ""
-
-#: admin/ogroups/asterisk/class_phonequeue.inc:894
-#: admin/ogroups/asterisk/phonequeue.tpl.c:83
-msgid "Announce holdtime"
-msgstr ""
-
-#: admin/ogroups/asterisk/class_phonequeue.inc:895
-msgid "Announce"
-msgstr ""
-
-#: admin/conference/conf-list.xml:11
-msgid "List of conference rooms"
-msgstr ""
-
-#: admin/conference/conf-list.xml:15 admin/conference/conf-list.xml:74
-msgid "Conference"
-msgstr ""
-
-#: admin/conference/conf-list.xml:41
-#: admin/conference/class_phoneConferenceGeneric.inc:324
-#: admin/conference/class_phoneConferenceGeneric.inc:347
-#: admin/conference/class_phoneConferenceGeneric.inc:702
-#: admin/macro/class_gofonMacro.inc:395 admin/macro/class_gofonMacro.inc:406
-#: admin/macro/macro-list.xml:41
-#: admin/systems/asterisk/class_phoneGeneric.inc:344
-#: admin/systems/asterisk/class_phoneGeneric.inc:348
-#: admin/systems/asterisk/class_phoneGeneric.inc:351
-#: admin/systems/asterisk/class_phoneGeneric.inc:366
-#: admin/systems/asterisk/class_phoneGeneric.inc:482
-#: admin/conference/conf-filter.tpl.c:5 admin/macro/macro-filter.tpl.c:5
-#: admin/macro/parameter.tpl.c:5
-msgid "Name"
-msgstr "TÃªn"
-
-#: admin/conference/conf-list.xml:49
-#: admin/conference/class_phoneConferenceGeneric.inc:704
-#: admin/macro/class_gofonMacro.inc:547 admin/macro/macro-list.xml:49
-#: admin/systems/asterisk/class_phoneGeneric.inc:484
-#: admin/conference/generic.tpl.c:29 admin/macro/generic.tpl.c:17
-#: admin/systems/asterisk/phone.tpl.c:8
-msgid "Description"
-msgstr "MÃ´ táº£"
-
-#: admin/conference/conf-list.xml:57 admin/macro/macro-list.xml:57
-msgid "Actions"
-msgstr "CÃ¡c thao tÃ¡c"
-
-#: admin/conference/conf-list.xml:68 admin/macro/macro-list.xml:68
-msgid "Create"
-msgstr "Táº¡o "
-
-#: admin/conference/conf-list.xml:86 admin/conference/conf-list.xml:125
-#: admin/macro/macro-list.xml:86 admin/macro/macro-list.xml:125
-msgid "Edit"
-msgstr "Hiá»‡u chá»‰nh"
-
-#: admin/conference/conf-list.xml:93 admin/conference/conf-list.xml:138
-#: admin/macro/macro-list.xml:93 admin/macro/macro-list.xml:138
-msgid "Remove"
-msgstr "XÃ³a bá»"
-
-#: admin/conference/class_phoneConferenceGeneric.inc:233
-#, php-format
-msgid "Cannot delete entry from server '%s' because it seems to be removed!"
-msgstr ""
-
-#: admin/conference/class_phoneConferenceGeneric.inc:308
-#, php-format
-msgid ""
-"The previously selected asterisk home server '%s' is no longer available!"
-msgstr ""
-
-#: admin/conference/class_phoneConferenceGeneric.inc:315
-#: admin/conference/generic.tpl.c:47
-msgid "PIN"
-msgstr ""
-
-#: admin/conference/class_phoneConferenceGeneric.inc:333
-#: admin/conference/class_phoneConferenceGeneric.inc:719
-msgid "Lifetime"
-msgstr ""
-
-#: admin/conference/class_phoneConferenceGeneric.inc:399
-#: personal/phoneaccount/class_phoneAccount.inc:346
-#: personal/phoneaccount/class_phoneAccount.inc:359
-#: personal/phoneaccount/class_phoneAccount.inc:617
-#: personal/phoneaccount/class_phoneAccount.inc:656
-#: personal/phoneaccount/class_phoneAccount.inc:1519
-#: personal/phoneaccount/class_phoneAccount.inc:1695
-#: admin/conference/remove.tpl.c:2 admin/macro/remove.tpl.c:2
-msgid "Warning"
-msgstr "Cáº£nh bÃ¡o"
-
-#: admin/conference/class_phoneConferenceGeneric.inc:400
-#, php-format
-msgid ""
-"FusionDirectory identified problems with your MySQL table definition, please"
-" activate debugging for details."
-msgstr ""
-
-#: admin/conference/class_phoneConferenceGeneric.inc:606
-#: admin/conference/class_phoneConferenceGeneric.inc:608
-#, php-format
-msgid "'%s' is already assigned to '%s'!"
-msgstr ""
-
-#: admin/conference/class_phoneConferenceGeneric.inc:693
-msgid "Phone Conference"
-msgstr ""
-
-#: admin/conference/class_phoneConferenceGeneric.inc:694
-msgid "Phone conference management"
-msgstr ""
-
-#: admin/conference/class_phoneConferenceGeneric.inc:696
-msgid "GOfon conference"
+#: admin/systems/asterisk/class_phoneIAX.inc:31
+msgid "Asterisk phone"
 msgstr ""
 
-#: admin/conference/class_phoneConferenceGeneric.inc:698
-msgid "Asterisk conference"
-msgstr ""
-
-#: admin/conference/class_phoneConferenceGeneric.inc:703
-#: admin/macro/class_gofonMacro.inc:546
-#: admin/systems/asterisk/class_phoneGeneric.inc:483
-#: admin/conference/generic.tpl.c:17 admin/macro/generic.tpl.c:14
-#: admin/systems/asterisk/phone.tpl.c:5
-msgid "Base"
-msgstr "CÆ¡ sá»Ÿ"
-
-#: admin/conference/class_phoneConferenceGeneric.inc:705
-msgid "Conference PIN"
-msgstr ""
-
-#: admin/conference/class_phoneConferenceGeneric.inc:710
-#: admin/conference/generic.tpl.c:44
-msgid "Preset PIN"
-msgstr ""
-
-#: admin/conference/class_phoneConferenceGeneric.inc:711
-#: admin/conference/generic.tpl.c:50
-msgid "Record conference"
-msgstr ""
-
-#: admin/conference/class_phoneConferenceGeneric.inc:712
-#: admin/conference/generic.tpl.c:59
-msgid "Play music on hold"
-msgstr ""
-
-#: admin/conference/class_phoneConferenceGeneric.inc:713
-msgid "Activate menu"
-msgstr ""
-
-#: admin/conference/class_phoneConferenceGeneric.inc:714
-msgid "Announce user activity"
-msgstr ""
-
-#: admin/conference/class_phoneConferenceGeneric.inc:715
-msgid "Count user"
-msgstr ""
-
-#: admin/conference/class_phoneConferenceGeneric.inc:716
-msgid "Conference type"
-msgstr ""
-
-#: admin/conference/class_phoneConferenceGeneric.inc:718
-msgid "Format"
-msgstr ""
-
-#: admin/conference/class_phoneConferenceGeneric.inc:720
-#: personal/phoneaccount/class_phoneAccount.inc:1666
-msgid "Telephone number"
-msgstr ""
-
-#: admin/conference/class_phoneConferenceGeneric.inc:721
-msgid "Owner"
-msgstr ""
-
-#: admin/conference/class_phoneConferenceManagment.inc:36
-msgid "Phone Conferences"
-msgstr ""
-
-#: admin/conference/class_phoneConferenceManagment.inc:37
-msgid "Phone Conference management"
-msgstr ""
-
-#: admin/macro/class_gofonMacro.inc:202
-#, php-format
-msgid ""
-"Macro could not be removed from server '%s', please check database "
-"consistency!"
-msgstr ""
-
-#: admin/macro/class_gofonMacro.inc:264
-#, php-format
-msgid "Application missing in line %s!"
-msgstr ""
-
-#: admin/macro/class_gofonMacro.inc:267
-#, php-format
-msgid "Priority missing in line %s!"
-msgstr ""
-
-#: admin/macro/class_gofonMacro.inc:271
-#, php-format
-msgid "Extension missing in line %s!"
-msgstr ""
-
-#: admin/macro/class_gofonMacro.inc:281
-#, php-format
-msgid "Duplicate combination of 'extension' and 'priority' in line %s!"
-msgstr ""
-
-#: admin/macro/class_gofonMacro.inc:317
-#, php-format
-msgid ""
-"Macro could not be added to server '%s', please check database consistency!"
-msgstr ""
-
-#: admin/macro/class_gofonMacro.inc:410
-msgid "Name can be 20 characters at maximum!"
-msgstr ""
-
-#: admin/macro/class_gofonMacro.inc:419
-msgid "Macro is still in use!"
-msgstr ""
-
-#: admin/macro/class_gofonMacro.inc:426
-msgid "Macro is empty!"
-msgstr ""
-
-#: admin/macro/class_gofonMacro.inc:452
-#: admin/systems/asterisk/class_phoneGeneric.inc:267
-#, php-format
-msgid "Cannot delete entry because it is still in use by '%s'!"
-msgstr ""
-
-#: admin/macro/class_gofonMacro.inc:465
-#: addons/fonreports/class_fonreport.inc:190
-#: personal/phoneaccount/class_phoneAccount.inc:455
-#: personal/phoneaccount/class_phoneAccount.inc:1061
-#: personal/phoneaccount/class_phoneAccount.inc:1567
-msgid "Configuration error"
-msgstr "Lá»—i cáº¥u hÃ¬nh"
-
-#: admin/macro/class_gofonMacro.inc:536 admin/macro/class_gofonMacro.inc:541
-msgid "Asterisk macro"
-msgstr ""
-
-#: admin/macro/class_gofonMacro.inc:537
-msgid "Asterisk macro management"
-msgstr ""
-
-#: admin/macro/class_gofonMacro.inc:539
-msgid "GOfon macro"
-msgstr ""
-
-#: admin/macro/class_gofonMacro.inc:545 admin/macro/generic.tpl.c:2
-#: admin/macro/generic.tpl.c:5 admin/macro/paste_generic.tpl.c:2
-#: admin/macro/paste_generic.tpl.c:5
-msgid "Macro name"
-msgstr ""
-
-#: admin/macro/class_gofonMacro.inc:548 admin/macro/generic.tpl.c:8
-msgid "Display name"
-msgstr ""
-
-#: admin/macro/class_gofonMacro.inc:549
-msgid "Macro content and parameter"
-msgstr ""
-
-#: admin/macro/class_gofonMacro.inc:550
-msgid "Visibility flag"
-msgstr ""
-
-#: admin/macro/class_gofonMacroManagement.inc:36
-msgid "Phone Macros"
-msgstr ""
-
-#: admin/macro/class_gofonMacroManagement.inc:37
-msgid "Phone Macros management"
-msgstr ""
-
-#: admin/macro/macro-list.xml:11
-msgid "List of macros"
-msgstr ""
-
-#: admin/macro/macro-list.xml:15 admin/macro/macro-list.xml:74
-msgid "Macro"
-msgstr ""
-
-#: admin/macro/class_gofonMacroParameters.inc:58
-msgid "Parameter"
-msgstr ""
-
-#: admin/macro/class_gofonMacroParameters.inc:59
-msgid "Asterisk macro parameter"
-msgstr ""
-
-#: admin/macro/class_gofonMacroParameters.inc:234
-#: personal/phoneaccount/generic.tpl.c:35
-msgid "Phone macro"
-msgstr ""
-
-#: admin/macro/class_gofonMacroParameters.inc:290
-msgid "String"
-msgstr ""
-
-#: admin/macro/class_gofonMacroParameters.inc:291
-msgid "Combobox"
-msgstr ""
-
-#: admin/macro/class_gofonMacroParameters.inc:292
-msgid "Bool"
-msgstr ""
-
-#: admin/macro/class_gofonMacroParameters.inc:298
-msgid "Delete unused"
-msgstr ""
-
-#: admin/macro/class_gofonMacroParameters.inc:374
-#, php-format
-msgid "Parameter %s contains invalid character. '!,#' is used as delimiter!"
-msgstr ""
-
-#: admin/macro/class_gofonMacroParameters.inc:379
-#, php-format
-msgid "Parameter %s is invalid!"
-msgstr ""
-
-#: admin/macro/class_gofonMacroParameters.inc:408
-#: personal/phoneaccount/class_phoneAccount.inc:1600
-msgid "Information"
-msgstr "ThÃ´ng tin"
-
-#: admin/macro/class_gofonMacroParameters.inc:408
-msgid ""
-"Number of parameters for this macro has changed. Please update all users "
-"using it!"
-msgstr ""
-
-#: admin/systems/asterisk/class_phoneGeneric.inc:151
-msgid "phone"
-msgstr ""
-
-#: admin/systems/asterisk/class_phoneGeneric.inc:230
-msgid "yes"
-msgstr ""
-
-#: admin/systems/asterisk/class_phoneGeneric.inc:230
-msgid "no"
-msgstr ""
-
-#: admin/systems/asterisk/class_phoneGeneric.inc:247
-msgid "dynamic"
-msgstr ""
-
-#: admin/systems/asterisk/class_phoneGeneric.inc:247
-msgid "Networksettings"
-msgstr ""
-
-#: admin/systems/asterisk/class_phoneGeneric.inc:330
-#: admin/systems/asterisk/class_phoneGeneric.inc:333
-msgid "IP address"
-msgstr ""
-
-#: admin/systems/asterisk/class_phoneGeneric.inc:473
-msgid "Phone information"
-msgstr ""
-
-#: admin/systems/asterisk/class_phoneGeneric.inc:476
-#: personal/phoneaccount/class_phoneAccount.inc:1668
+#: admin/systems/asterisk/class_phoneIAX.inc:33
 msgid "Phone hardware"
 msgstr ""
 
-#: admin/systems/asterisk/class_phoneGeneric.inc:485
-msgid "SIP Mode"
-msgstr ""
-
-#: admin/systems/asterisk/class_phoneGeneric.inc:486
-msgid "SIP DTMF mode"
-msgstr ""
-
-#: admin/systems/asterisk/class_phoneGeneric.inc:487
-msgid "SIP Default ip"
-msgstr ""
-
-#: admin/systems/asterisk/class_phoneGeneric.inc:488
-msgid "SIP Qualify"
-msgstr ""
-
-#: admin/systems/asterisk/class_phoneGeneric.inc:489
-msgid "IAX authentication type"
-msgstr ""
-
-#: admin/systems/asterisk/class_phoneGeneric.inc:490
-msgid "IAX secret"
-msgstr ""
-
-#: admin/systems/asterisk/class_phoneGeneric.inc:491
-msgid "IAX account code"
-msgstr ""
-
-#: admin/systems/asterisk/class_phoneGeneric.inc:492
-msgid "IAX trunk lines"
-msgstr ""
+#: admin/systems/asterisk/class_phoneIAX.inc:46
+#: personal/asterisk/class_asteriskAccount.inc:42
+msgid "Telephone"
+msgstr "Sá»‘ Ä‘iá»‡n thoáº¡i"
 
-#: admin/systems/asterisk/class_phoneGeneric.inc:493
-msgid "IAX permit settings"
-msgstr ""
+#: admin/systems/asterisk/class_phoneIAX.inc:49
+msgid "Name"
+msgstr "TÃªn"
 
-#: admin/systems/asterisk/class_phoneGeneric.inc:494
-msgid "IAX deny settings"
+#: admin/systems/asterisk/class_phoneIAX.inc:49
+msgid "Name of this phone"
 msgstr ""
 
-#: admin/systems/asterisk/class_phoneGeneric.inc:495
-msgid "CAPI MSN"
+#: admin/systems/asterisk/class_phoneIAX.inc:53
+msgid "Account name"
 msgstr ""
 
-#: admin/systems/asterisk/class_phoneGeneric.inc:496
-msgid "Hardware type"
+#: admin/systems/asterisk/class_phoneIAX.inc:53
+msgid "Name of the account"
 msgstr ""
 
 #: admin/systems/services/asterisk/class_serviceAsterisk.inc:35
@@ -746,6 +95,10 @@ msgid ""
 "these objects '%s'."
 msgstr ""
 
+#: admin/systems/services/asterisk/class_serviceAsterisk.inc:121
+msgid "LDAP error"
+msgstr "Lá»—i LDAP"
+
 #: admin/systems/services/asterisk/class_serviceAsterisk.inc:140
 msgid "VoIP service (asterisk)"
 msgstr ""
@@ -758,209 +111,18 @@ msgstr ""
 msgid "Services"
 msgstr ""
 
-#: addons/fonreports/class_fonreport.inc:232
-msgid "Insufficient permissions"
-msgstr ""
-
-#: addons/fonreports/class_fonreport.inc:251
-msgid "Y-M-D"
-msgstr ""
-
-#: addons/fonreports/class_fonreport.inc:418
-#: addons/fonreports/class_fonreport.inc:419
-#: addons/fonreports/class_fonreport.inc:424 addons/fonreports/main.inc:46
-msgid "Phone reports"
-msgstr ""
-
-#: addons/fonreports/class_fonreport.inc:419
-msgid "All entries are readonly"
-msgstr ""
-
-#: addons/fonreports/class_fonreport.inc:428
-#: addons/fonreports/contents.tpl.c:32
-msgid "Date"
-msgstr ""
-
-#: addons/fonreports/class_fonreport.inc:429
-#: addons/fonreports/contents.tpl.c:35
-msgid "Source"
-msgstr ""
-
-#: addons/fonreports/class_fonreport.inc:430
-#: addons/fonreports/contents.tpl.c:38
-msgid "Destination"
-msgstr ""
-
-#: addons/fonreports/class_fonreport.inc:431
-#: addons/fonreports/contents.tpl.c:41
-msgid "Channel"
-msgstr ""
-
-#: addons/fonreports/class_fonreport.inc:432
-msgid "Application called"
-msgstr ""
-
-#: addons/fonreports/class_fonreport.inc:433
-msgid "Disposition"
-msgstr ""
-
-#: addons/fonreports/class_fonreport.inc:434
-#: addons/fonreports/contents.tpl.c:50
-msgid "Duration"
-msgstr ""
-
-#: personal/phoneaccount/class_phoneAccount.inc:176
-msgid "automatic"
-msgstr "tá»± Ä‘á»™ng"
-
-#: personal/phoneaccount/class_phoneAccount.inc:212
-msgid "no macro"
-msgstr ""
-
-#: personal/phoneaccount/class_phoneAccount.inc:240
-msgid "undefined"
-msgstr ""
-
-#: personal/phoneaccount/class_phoneAccount.inc:359
-#, php-format
-msgid ""
-"Cannot identify telephone extension in database, please try to save again."
-msgstr ""
-
-#: personal/phoneaccount/class_phoneAccount.inc:577
-#: personal/phoneaccount/class_phoneAccount.inc:595
-msgid "Abort saving entries to keep the database consistent."
-msgstr ""
-
-#: personal/phoneaccount/class_phoneAccount.inc:618
-#: personal/phoneaccount/class_phoneAccount.inc:657
-#: personal/phoneaccount/class_phoneAccount.inc:1520
-#, php-format
-msgid ""
-"FusionDirectory identified problems with your database table definition!"
-msgstr ""
-
-#: personal/phoneaccount/class_phoneAccount.inc:1023
-msgid "Remove phone account"
-msgstr ""
-
-#: personal/phoneaccount/class_phoneAccount.inc:1027
-#: personal/phoneaccount/class_phoneAccount.inc:1030
-msgid "Create phone account"
-msgstr ""
-
-#: personal/phoneaccount/class_phoneAccount.inc:1028
-msgid "User uid"
-msgstr ""
-
-#: personal/phoneaccount/class_phoneAccount.inc:1046
-msgid "Selected macro is not available anymore!"
-msgstr ""
-
-#: personal/phoneaccount/class_phoneAccount.inc:1221
-msgid "Choose your private phone"
-msgstr ""
-
-#: personal/phoneaccount/class_phoneAccount.inc:1346
-msgid ""
-"There must be at least one server with an asterisk database to create a "
-"phone account."
-msgstr ""
-
-#: personal/phoneaccount/class_phoneAccount.inc:1354
-#: personal/phoneaccount/class_phoneAccount.inc:1357
-#: personal/phoneaccount/generic.tpl.c:29
-#: personal/phoneaccount/paste_generic.tpl.c:11
-msgid "Voicemail PIN"
-msgstr ""
-
-#: personal/phoneaccount/class_phoneAccount.inc:1354
-msgid "Between 1-4 charactes"
-msgstr ""
-
-#: personal/phoneaccount/class_phoneAccount.inc:1362
-#: personal/phoneaccount/generic.tpl.c:32
-#: personal/phoneaccount/paste_generic.tpl.c:14
-msgid "Phone PIN"
-msgstr ""
-
-#: personal/phoneaccount/class_phoneAccount.inc:1394
-#: admin/conference/generic.tpl.c:38 admin/conference/paste_generic.tpl.c:8
-msgid "Phone number"
-msgstr ""
-
-#: personal/phoneaccount/class_phoneAccount.inc:1402
-#, php-format
-msgid "macro parameter %s"
-msgstr ""
-
-#: personal/phoneaccount/class_phoneAccount.inc:1450
-msgid "An error occured while updating the database entries!"
-msgstr ""
-
-#: personal/phoneaccount/class_phoneAccount.inc:1567
-msgid "Was not able to found any asterisk server"
-msgstr ""
-
-#: personal/phoneaccount/class_phoneAccount.inc:1600
-#, php-format
-msgid "User '%s' has been removed from phone queue '%s'."
-msgstr ""
-
-#: personal/phoneaccount/class_phoneAccount.inc:1637
-#: personal/phoneaccount/class_phoneAccount.inc:1639
-#, php-format
-msgid "The specified telephonenumber '%s' is already assigned to '%s'."
-msgstr ""
-
-#: personal/phoneaccount/class_phoneAccount.inc:1649
-#, php-format
-msgid ""
-"The previously selected asterisk home server (%s) is no longer available. "
-"Remove aborted."
-msgstr ""
-
-#: personal/phoneaccount/class_phoneAccount.inc:1658
-msgid "Phone account settings"
-msgstr ""
-
-#: personal/phoneaccount/class_phoneAccount.inc:1667
-msgid "Macro settings"
-msgstr ""
-
-#: personal/phoneaccount/class_phoneAccount.inc:1670
-msgid "Phone context"
-msgstr ""
-
-#: personal/phoneaccount/class_phoneAccount.inc:1671
-msgid "Voice mail context"
-msgstr ""
-
-#: personal/phoneaccount/class_phoneAccount.inc:1672
-msgid "Telephone pin"
-msgstr ""
-
-#: personal/phoneaccount/class_phoneAccount.inc:1673
-msgid "Voicemail pin"
-msgstr ""
-
-#: personal/phoneaccount/class_phoneAccount.inc:1695
-#, php-format
-msgid "You need to configure %s contexts first"
+#: personal/asterisk/class_asteriskAccount.inc:30
+#: config/asterisk/class_asteriskPluginConfig.inc:28
+#: config/asterisk/class_asteriskPluginConfig.inc:41
+msgid "Asterisk"
 msgstr ""
 
-#: personal/phoneaccount/main.inc:124
-msgid "Click the 'Edit' button below to change informations in this dialog"
-msgstr "KÃch phÃm 'Hiá»‡u chá»‰nh' bÃªn dÆ°á»›i Ä‘á»ƒ thay Ä‘á»•i thÃ´ng tin trong há»™p thoáº¡i nÃ y "
-
-#: personal/phoneaccount/main.inc:134
-#: personal/phoneaccount/paste_generic.tpl.c:2
-msgid "Phone settings"
+#: personal/asterisk/class_asteriskAccount.inc:31
+msgid "Asterisk account"
 msgstr ""
 
-#: config/asterisk/class_asteriskPluginConfig.inc:28
-#: config/asterisk/class_asteriskPluginConfig.inc:41
-msgid "Asterisk"
+#: personal/asterisk/class_asteriskAccount.inc:45
+msgid "Select the phone associated to this user"
 msgstr ""
 
 #: config/asterisk/class_asteriskPluginConfig.inc:29
@@ -1010,338 +172,3 @@ msgstr ""
 #: config/asterisk/class_asteriskPluginConfig.inc:72
 msgid "Available voicemail contexts"
 msgstr ""
-
-#: admin/ogroups/asterisk/phonequeue.tpl.c:2
-msgid ""
-"Only users with the same asterisk home server will be included to this "
-"queue."
-msgstr ""
-
-#: admin/ogroups/asterisk/phonequeue.tpl.c:5
-#: personal/phoneaccount/generic.tpl.c:2
-#: personal/phoneaccount/paste_generic.tpl.c:5
-msgid "Phone numbers"
-msgstr ""
-
-#: admin/ogroups/asterisk/phonequeue.tpl.c:8
-msgid "Up"
-msgstr "LÃªn"
-
-#: admin/ogroups/asterisk/phonequeue.tpl.c:11
-msgid "Down"
-msgstr "Xuá»‘ng"
-
-#: admin/ogroups/asterisk/phonequeue.tpl.c:14
-#: admin/conference/generic.tpl.c:41
-msgid "Options"
-msgstr ""
-
-#: admin/ogroups/asterisk/phonequeue.tpl.c:29
-msgid "Strategy"
-msgstr ""
-
-#: admin/ogroups/asterisk/phonequeue.tpl.c:38
-msgid "(in seconds)"
-msgstr ""
-
-#: admin/ogroups/asterisk/phonequeue.tpl.c:41
-msgid "Queue sound setup"
-msgstr ""
-
-#: admin/ogroups/asterisk/phonequeue.tpl.c:44
-msgid "Use music on hold instead of ringing"
-msgstr ""
-
-#: admin/ogroups/asterisk/phonequeue.tpl.c:50
-msgid "Welcome sound file"
-msgstr ""
-
-#: admin/ogroups/asterisk/phonequeue.tpl.c:53
-msgid "Announce message"
-msgstr ""
-
-#: admin/ogroups/asterisk/phonequeue.tpl.c:56
-msgid "Sound file for 'You are next ...'"
-msgstr ""
-
-#: admin/ogroups/asterisk/phonequeue.tpl.c:59
-msgid "'There are ...'"
-msgstr ""
-
-#: admin/ogroups/asterisk/phonequeue.tpl.c:62
-msgid "'... calls waiting'"
-msgstr ""
-
-#: admin/ogroups/asterisk/phonequeue.tpl.c:65
-msgid "'Thank you' message"
-msgstr ""
-
-#: admin/ogroups/asterisk/phonequeue.tpl.c:68
-msgid "'minutes' sound file"
-msgstr ""
-
-#: admin/ogroups/asterisk/phonequeue.tpl.c:71
-msgid "'seconds' sound file"
-msgstr ""
-
-#: admin/ogroups/asterisk/phonequeue.tpl.c:74
-msgid "Hold sound file"
-msgstr ""
-
-#: admin/ogroups/asterisk/phonequeue.tpl.c:77
-msgid "Less Than sound file"
-msgstr ""
-
-#: admin/ogroups/asterisk/phonequeue.tpl.c:80
-msgid "Phone attributes "
-msgstr ""
-
-#: admin/conference/conf-filter.tpl.c:2 admin/macro/macro-filter.tpl.c:2
-#: addons/fonreports/contents.tpl.c:2
-msgid "Filter"
-msgstr ""
-
-#: admin/conference/generic.tpl.c:2
-msgid "Properties"
-msgstr "Properties"
-
-#: admin/conference/generic.tpl.c:5 admin/conference/paste_generic.tpl.c:2
-msgid "Conference name"
-msgstr ""
-
-#: admin/conference/generic.tpl.c:8 admin/conference/paste_generic.tpl.c:5
-msgid "Name of conference to create"
-msgstr ""
-
-#: admin/conference/generic.tpl.c:11
-msgid "Type"
-msgstr "Loáº¡i"
-
-#: admin/conference/generic.tpl.c:14
-msgid "Choose subtree to place conference in"
-msgstr ""
-
-#: admin/conference/generic.tpl.c:26
-msgid "Select language"
-msgstr ""
-
-#: admin/conference/generic.tpl.c:32
-msgid "Descriptive text for department"
-msgstr "VÄƒn báº£n mÃ´ táº£ cho bá»™ pháºn"
-
-#: admin/conference/generic.tpl.c:35
-msgid "Lifetime (in days)"
-msgstr ""
-
-#: admin/conference/generic.tpl.c:53
-msgid "Sound file format"
-msgstr ""
-
-#: admin/conference/generic.tpl.c:56
-msgid "Choose subtree to place department in"
-msgstr ""
-
-#: admin/conference/generic.tpl.c:62
-msgid "Activate session menu"
-msgstr ""
-
-#: admin/conference/generic.tpl.c:65
-msgid "Announce users joining or leaving the conference"
-msgstr ""
-
-#: admin/conference/generic.tpl.c:68
-msgid "Count users"
-msgstr ""
-
-#: admin/conference/remove.tpl.c:5 admin/macro/remove.tpl.c:5
-msgid ""
-"Please double check if you really want to do this since there is no way for "
-"FusionDirectory to get your data back."
-msgstr ""
-
-#: admin/conference/remove.tpl.c:8 admin/macro/remove.tpl.c:8
-msgid "So - if you're sure - press 'Delete' to continue or 'Cancel' to abort."
-msgstr "VÃ¬ tháº¿ náº¿u báº¡n cháº¯c cháº¯n hÃ£y nháº¥n \"XÃ³a bá»\" Ä‘á»ƒ tiáº¿p tá»¥c hoáº·c'Há»§y bá»' Ä‘á»ƒ dá»«ng láº¡i."
-
-#: admin/macro/generic.tpl.c:11
-msgid "Macro name to be displayed"
-msgstr ""
-
-#: admin/macro/generic.tpl.c:20
-msgid "Visible for user"
-msgstr ""
-
-#: admin/macro/generic.tpl.c:23
-msgid "Macro text"
-msgstr ""
-
-#: admin/macro/parameter.tpl.c:2
-msgid "Argument"
-msgstr ""
-
-#: admin/macro/parameter.tpl.c:8
-msgid "type"
-msgstr ""
-
-#: admin/macro/parameter.tpl.c:11
-msgid "Default value"
-msgstr ""
-
-#: admin/macro/parameter.tpl.c:14
-msgid "You are not allowed to view the macro parameter settings"
-msgstr ""
-
-#: admin/systems/asterisk/phonesettings.tpl.c:2
-msgid "Advanced phone settings"
-msgstr ""
-
-#: admin/systems/asterisk/phonesettings.tpl.c:5
-msgid "Phone type"
-msgstr ""
-
-#: admin/systems/asterisk/phonesettings.tpl.c:8
-#: admin/systems/asterisk/phonesettings.tpl.c:14
-#: admin/systems/asterisk/phonesettings.tpl.c:20
-#: admin/systems/asterisk/phonesettings.tpl.c:26
-#: admin/systems/asterisk/phonesettings.tpl.c:35
-#: admin/systems/asterisk/phonesettings.tpl.c:47
-#: admin/systems/asterisk/phonesettings.tpl.c:65
-msgid "Choose a phone type"
-msgstr ""
-
-#: admin/systems/asterisk/phonesettings.tpl.c:11
-msgid "Mode"
-msgstr ""
-
-#: admin/systems/asterisk/phonesettings.tpl.c:17
-msgid "DTMF mode"
-msgstr ""
-
-#: admin/systems/asterisk/phonesettings.tpl.c:23
-#: admin/systems/asterisk/phonesettings.tpl.c:38
-msgid "Default IP"
-msgstr ""
-
-#: admin/systems/asterisk/phonesettings.tpl.c:29
-#: admin/systems/asterisk/phonesettings.tpl.c:41
-msgid "Response timeout"
-msgstr ""
-
-#: admin/systems/asterisk/phonesettings.tpl.c:32
-msgid "Modus"
-msgstr ""
-
-#: admin/systems/asterisk/phonesettings.tpl.c:44
-msgid "Authtype"
-msgstr ""
-
-#: admin/systems/asterisk/phonesettings.tpl.c:50
-msgid "Secret"
-msgstr ""
-
-#: admin/systems/asterisk/phonesettings.tpl.c:53
-msgid "GoFonInkeys"
-msgstr ""
-
-#: admin/systems/asterisk/phonesettings.tpl.c:56
-msgid "GoFonOutKeys"
-msgstr ""
-
-#: admin/systems/asterisk/phonesettings.tpl.c:59
-msgid "Account code"
-msgstr ""
-
-#: admin/systems/asterisk/phonesettings.tpl.c:62
-msgid "Trunk lines"
-msgstr ""
-
-#: admin/systems/asterisk/phonesettings.tpl.c:68
-msgid "Hosts that are allowed to connect"
-msgstr ""
-
-#: admin/systems/asterisk/phonesettings.tpl.c:71
-#: admin/systems/asterisk/phonesettings.tpl.c:77
-msgid "List of alternative mail addresses"
-msgstr ""
-
-#: admin/systems/asterisk/phonesettings.tpl.c:74
-msgid "Hosts that are not allowed to connect"
-msgstr ""
-
-#: admin/systems/asterisk/phonesettings.tpl.c:80
-msgid "MSN"
-msgstr ""
-
-#: admin/systems/asterisk/phone.tpl.c:2
-msgid "Phone name"
-msgstr ""
-
-#: addons/fonreports/contents.tpl.c:5
-msgid "Search for"
-msgstr ""
-
-#: addons/fonreports/contents.tpl.c:8
-msgid "Enter user name to search for"
-msgstr ""
-
-#: addons/fonreports/contents.tpl.c:11 addons/fonreports/contents.tpl.c:26
-msgid "in"
-msgstr ""
-
-#: addons/fonreports/contents.tpl.c:14
-msgid "Select subtree to base search on"
-msgstr ""
-
-#: addons/fonreports/contents.tpl.c:17
-msgid "on"
-msgstr ""
-
-#: addons/fonreports/contents.tpl.c:20
-msgid "Select server to search on"
-msgstr ""
-
-#: addons/fonreports/contents.tpl.c:23
-msgid "during"
-msgstr ""
-
-#: addons/fonreports/contents.tpl.c:29
-msgid "Search"
-msgstr "TÃ¬m kiáº¿m"
-
-#: addons/fonreports/contents.tpl.c:44
-msgid "Application"
-msgstr "á»¨ng dá»¥ng"
-
-#: addons/fonreports/contents.tpl.c:47
-msgid "Status"
-msgstr "Tráº¡ng thÃ¡i"
-
-#: addons/fonreports/contents.tpl.c:53
-msgid "Search returned no results..."
-msgstr ""
-
-#: personal/phoneaccount/generic.tpl.c:5
-#: personal/phoneaccount/paste_generic.tpl.c:8
-msgid "Telephone hardware"
-msgstr ""
-
-#: personal/phoneaccount/generic.tpl.c:8
-msgid "Telephone"
-msgstr "Sá»‘ Ä‘iá»‡n thoáº¡i"
-
-#: personal/phoneaccount/generic.tpl.c:14
-msgid "Select the accounts home server"
-msgstr ""
-
-#: personal/phoneaccount/generic.tpl.c:17
-msgid "Context"
-msgstr ""
-
-#: personal/phoneaccount/generic.tpl.c:20
-#: personal/phoneaccount/generic.tpl.c:26
-msgid "Select the accounts context"
-msgstr ""
-
-#: personal/phoneaccount/generic.tpl.c:23
-msgid "Voicemail context"
-msgstr ""
diff --git a/asterisk/locale/zh/fusiondirectory.po b/asterisk/locale/zh/fusiondirectory.po
index 05e36db4f9b29155056611dcd42e01b454b5b297..0c170028eb5004b71e0b1883be456595011a564e 100644
--- a/asterisk/locale/zh/fusiondirectory.po
+++ b/asterisk/locale/zh/fusiondirectory.po
@@ -3,705 +3,53 @@
 # This file is distributed under the same license as the PACKAGE package.
 # 
 # Translators:
-#  Jiang Xin <worldhello.net@gmail.com>, 2007
 msgid ""
 msgstr ""
-"Project-Id-Version: FusionDirectory-108\n"
+"Project-Id-Version: FusionDirectory-109\n"
 "Report-Msgid-Bugs-To: documentation@lists.fusiondirectory.org\n"
-"POT-Creation-Date: 2015-03-31 11:49+0200\n"
-"PO-Revision-Date: 2015-02-25 16:12+0000\n"
+"POT-Creation-Date: 2014-12-15 17:47+0100\n"
+"PO-Revision-Date: 2015-02-25 16:13+0000\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>\n"
-"Language-Team: Chinese (http://www.transifex.com/projects/p/FusionDirectory-108/language/zh/)\n"
+"Language-Team: Chinese (http://www.transifex.com/projects/p/FusionDirectory-109/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/ogroups/asterisk/class_phonequeue.inc:110
-#: admin/conference/class_phoneConferenceGeneric.inc:104
-#: personal/phoneaccount/class_phoneAccount.inc:148
-msgid "Obsolete entry"
-msgstr ""
-
-#: admin/ogroups/asterisk/class_phonequeue.inc:110
-#: admin/conference/class_phoneConferenceGeneric.inc:104
-#: personal/phoneaccount/class_phoneAccount.inc:148
-#, php-format
-msgid ""
-"The current home server is not available anymore. It will be moved to '%s' "
-"if you save this entry!"
-msgstr ""
-
-#: admin/ogroups/asterisk/class_phonequeue.inc:140
-msgid "ring all"
-msgstr "å…¨éƒ¨å“é“ƒ"
-
-#: admin/ogroups/asterisk/class_phonequeue.inc:141
-msgid "round robin"
-msgstr "round robin"
-
-#: admin/ogroups/asterisk/class_phonequeue.inc:142
-msgid "least recently called"
-msgstr ""
-
-#: admin/ogroups/asterisk/class_phonequeue.inc:143
-msgid "fewest completed calls"
-msgstr ""
-
-#: admin/ogroups/asterisk/class_phonequeue.inc:144
-msgid "random"
-msgstr "éšæœº"
-
-#: admin/ogroups/asterisk/class_phonequeue.inc:145
-msgid "round robin with memory"
-msgstr "å†…å˜ round robin"
-
-#: admin/ogroups/asterisk/class_phonequeue.inc:180
-msgid "Remove the phone queue from this Account"
-msgstr "åˆ é™¤æ¥è‡ªè¯¥è´¦å·çš„ç”µè¯é˜Ÿåˆ—"
-
-#: admin/ogroups/asterisk/class_phonequeue.inc:181
-#: admin/ogroups/asterisk/class_phonequeue.inc:184
-msgid "phone queue"
-msgstr ""
-
-#: admin/ogroups/asterisk/class_phonequeue.inc:183
-msgid "Create phone queue"
-msgstr "åˆ›å»ºç”µè¯é˜Ÿåˆ—"
-
-#: admin/ogroups/asterisk/class_phonequeue.inc:272
-msgid ""
-"There must be at least one server with an asterisk database to create a "
-"phone queue."
-msgstr "å¿…é¡»æœ‰è‡³å°‘ä¸€ä¸ªå¸¦æœ‰ asterisk æ•°æ®åº“çš„æœåŠ¡å™¨æ¥åˆ›å»ºä¸€ä¸ªç”µè¯é˜Ÿåˆ—ã€‚"
-
-#: admin/ogroups/asterisk/class_phonequeue.inc:275
-#: admin/ogroups/asterisk/class_phonequeue.inc:873
-#: admin/conference/class_phoneConferenceGeneric.inc:709
-#: personal/phoneaccount/class_phoneAccount.inc:1350
-#: personal/phoneaccount/class_phoneAccount.inc:1669
-#: admin/ogroups/asterisk/phonequeue.tpl.c:17
-#: admin/conference/generic.tpl.c:20 personal/phoneaccount/generic.tpl.c:11
-msgid "Home server"
-msgstr "ä¸»æœåŠ¡å™¨"
-
-#: admin/ogroups/asterisk/class_phonequeue.inc:281
-#: admin/ogroups/asterisk/class_phonequeue.inc:871
-#: admin/ogroups/asterisk/phonequeue.tpl.c:23
-msgid "Timeout"
-msgstr "è¿‡æœŸ"
-
-#: admin/ogroups/asterisk/class_phonequeue.inc:284
-#: admin/ogroups/asterisk/class_phonequeue.inc:896
-#: admin/ogroups/asterisk/phonequeue.tpl.c:26
-msgid "Retry"
-msgstr "é‡è¯•"
-
-#: admin/ogroups/asterisk/class_phonequeue.inc:287
-msgid "Queue length"
-msgstr ""
-
-#: admin/ogroups/asterisk/class_phonequeue.inc:290
-#: admin/ogroups/asterisk/class_phonequeue.inc:874
-#: admin/ogroups/asterisk/phonequeue.tpl.c:35
-msgid "Announce frequency"
-msgstr "å…¬å‘Šé¢‘çŽ‡"
-
-#: admin/ogroups/asterisk/class_phonequeue.inc:293
-#: admin/conference/class_phoneConferenceGeneric.inc:328
-msgid "Number"
-msgstr ""
-
-#: admin/ogroups/asterisk/class_phonequeue.inc:316
-#: admin/ogroups/asterisk/class_phonequeue.inc:361
-msgid "asterisk"
-msgstr ""
-
-#: admin/ogroups/asterisk/class_phonequeue.inc:345
-#: admin/ogroups/asterisk/class_phonequeue.inc:696
-#: admin/conference/class_phoneConferenceGeneric.inc:369
-#: admin/macro/class_gofonMacro.inc:381 admin/macro/class_gofonMacro.inc:465
-#: addons/fonreports/class_fonreport.inc:190
-#: addons/fonreports/class_fonreport.inc:220
-#: personal/phoneaccount/class_phoneAccount.inc:455
-#: personal/phoneaccount/class_phoneAccount.inc:1061
-msgid "GOfon"
-msgstr ""
-
-#: admin/ogroups/asterisk/class_phonequeue.inc:401
-msgid "Cannot find old queue entry!"
-msgstr ""
-
-#: admin/ogroups/asterisk/class_phonequeue.inc:487
-#, php-format
-msgid ""
-"Found more than one entry named '%s' in queue table. Please inform your "
-"system administrator!"
-msgstr ""
-
-#: admin/ogroups/asterisk/class_phonequeue.inc:728
-#: admin/ogroups/asterisk/class_phonequeue.inc:730
-msgid "telephone number"
-msgstr ""
-
-#: admin/ogroups/asterisk/class_phonequeue.inc:787
-#: admin/ogroups/asterisk/class_phonequeue.inc:829
-#: admin/conference/class_phoneConferenceGeneric.inc:229
-#: admin/conference/class_phoneConferenceGeneric.inc:233
-#: admin/conference/class_phoneConferenceGeneric.inc:271
-#: admin/macro/class_gofonMacro.inc:343 admin/macro/class_gofonMacro.inc:452
-#: admin/macro/class_gofonMacro.inc:461 admin/macro/class_gofonMacro.inc:499
-#: admin/systems/asterisk/class_phoneGeneric.inc:267
-#: admin/systems/asterisk/class_phoneGeneric.inc:308
-#: addons/fonreports/class_fonreport.inc:220
-#: personal/phoneaccount/class_phoneAccount.inc:1046
-#: personal/phoneaccount/class_phoneAccount.inc:1166
-#: personal/phoneaccount/class_phoneAccount.inc:1172
-#: personal/phoneaccount/class_phoneAccount.inc:1368
-#: personal/phoneaccount/class_phoneAccount.inc:1450
-#: personal/phoneaccount/class_phoneAccount.inc:1528
-msgid "Error"
-msgstr "é”™è¯¯"
-
-#: admin/ogroups/asterisk/class_phonequeue.inc:802
-#: admin/ogroups/asterisk/class_phonequeue.inc:857
-#: admin/conference/class_phoneConferenceGeneric.inc:682
-#: admin/macro/class_gofonMacro.inc:473 admin/macro/class_gofonMacro.inc:484
-#: admin/macro/class_gofonMacro.inc:521
-#: admin/macro/class_gofonMacroParameters.inc:435
-#: admin/systems/asterisk/class_phoneGeneric.inc:277
-#: admin/systems/asterisk/class_phoneGeneric.inc:432
-#: admin/systems/asterisk/class_phoneGeneric.inc:446
-#: admin/systems/asterisk/class_phoneGeneric.inc:463
-#: admin/systems/services/asterisk/class_serviceAsterisk.inc:121
-#: personal/phoneaccount/class_phoneAccount.inc:1476
-#: personal/phoneaccount/class_phoneAccount.inc:1609
-msgid "LDAP error"
-msgstr "LDAP é”™è¯¯"
-
-#: admin/ogroups/asterisk/class_phonequeue.inc:864
-#: admin/systems/asterisk/class_phoneGeneric.inc:472
-#: admin/systems/asterisk/class_phoneGeneric.inc:477
-#: personal/phoneaccount/class_phoneAccount.inc:999
-#: personal/phoneaccount/class_phoneAccount.inc:1012
-#: personal/phoneaccount/class_phoneAccount.inc:1024
-#: personal/phoneaccount/class_phoneAccount.inc:1028
-#: personal/phoneaccount/class_phoneAccount.inc:1031
-#: personal/phoneaccount/class_phoneAccount.inc:1657
+#: admin/systems/asterisk/class_phoneIAX.inc:30
+#: admin/systems/asterisk/class_phoneIAX.inc:34
+#: personal/asterisk/class_asteriskAccount.inc:45
 msgid "Phone"
 msgstr "ç”µè¯"
 
-#: admin/ogroups/asterisk/class_phonequeue.inc:865
-msgid "Phone group"
-msgstr ""
-
-#: admin/ogroups/asterisk/class_phonequeue.inc:872
-#: admin/ogroups/asterisk/phonequeue.tpl.c:32
-msgid "Max queue length"
-msgstr "æœ€å¤§é˜Ÿåˆ—é•¿åº¦"
-
-#: admin/ogroups/asterisk/class_phonequeue.inc:875
-#: admin/ogroups/asterisk/phonequeue.tpl.c:86
-msgid "Allow the called user to transfer his call"
-msgstr "å…è®¸è¢«å«ç”¨æˆ·è½¬ç§»å‘¼å«"
-
-#: admin/ogroups/asterisk/class_phonequeue.inc:876
-#: admin/ogroups/asterisk/phonequeue.tpl.c:89
-msgid "Allows calling user to transfer call"
-msgstr "å…è®¸æ‹¨å«ç”¨æˆ·è½¬ç§»å‘¼å«"
-
-#: admin/ogroups/asterisk/class_phonequeue.inc:877
-#: admin/ogroups/asterisk/phonequeue.tpl.c:92
-msgid "Allow the called to hangup by pressing *"
-msgstr "å…è®¸è¢«å«ç”¨æˆ·æŒ‰ * é”®æŒ‚èµ·"
-
-#: admin/ogroups/asterisk/class_phonequeue.inc:878
-#: admin/ogroups/asterisk/phonequeue.tpl.c:98
-msgid "Ring instead of playing background music"
-msgstr "æŒ¯é“ƒè€Œéžæ’æ”¾èƒŒæ™¯éŸ³ä¹"
-
-#: admin/ogroups/asterisk/class_phonequeue.inc:879
-#: admin/ogroups/asterisk/phonequeue.tpl.c:95
-msgid "Allows calling to hangup by pressing *"
-msgstr "å…è®¸æ‹¨å«ç”¨æˆ·æŒ‰ * é”®æŒ‚èµ·"
-
-#: admin/ogroups/asterisk/class_phonequeue.inc:881
-#: admin/ogroups/asterisk/phonequeue.tpl.c:47
-msgid "Music on hold"
-msgstr "æš‚åœçš„éŸ³ä¹"
-
-#: admin/ogroups/asterisk/class_phonequeue.inc:882
-msgid "Welcome music"
-msgstr ""
-
-#: admin/ogroups/asterisk/class_phonequeue.inc:883
-msgid "Report hold time"
-msgstr ""
-
-#: admin/ogroups/asterisk/class_phonequeue.inc:884
-msgid "'You are next' sound"
-msgstr ""
-
-#: admin/ogroups/asterisk/class_phonequeue.inc:885
-msgid "'There are' sound"
-msgstr ""
-
-#: admin/ogroups/asterisk/class_phonequeue.inc:886
-msgid "'Call waiting' sound"
-msgstr ""
-
-#: admin/ogroups/asterisk/class_phonequeue.inc:887
-msgid "'Thank you' sound"
+#: admin/systems/asterisk/class_phoneIAX.inc:31
+msgid "Asterisk phone"
 msgstr ""
 
-#: admin/ogroups/asterisk/class_phonequeue.inc:888
-msgid "'Minutes' sound"
-msgstr ""
-
-#: admin/ogroups/asterisk/class_phonequeue.inc:889
-msgid "'Seconds' sound"
-msgstr ""
-
-#: admin/ogroups/asterisk/class_phonequeue.inc:890
-msgid "'Less than' sound"
-msgstr ""
-
-#: admin/ogroups/asterisk/class_phonequeue.inc:891
-msgid "Queue phone number"
-msgstr ""
-
-#: admin/ogroups/asterisk/class_phonequeue.inc:892
-#: admin/conference/class_phoneConferenceGeneric.inc:707
-#: admin/ogroups/asterisk/phonequeue.tpl.c:20
-#: admin/conference/generic.tpl.c:23
-msgid "Language"
-msgstr "è¯è¨€"
-
-#: admin/ogroups/asterisk/class_phonequeue.inc:893
-msgid "Method"
-msgstr ""
-
-#: admin/ogroups/asterisk/class_phonequeue.inc:894
-#: admin/ogroups/asterisk/phonequeue.tpl.c:83
-msgid "Announce holdtime"
-msgstr "å…¬å‘ŠæœŸé™"
-
-#: admin/ogroups/asterisk/class_phonequeue.inc:895
-msgid "Announce"
+#: admin/systems/asterisk/class_phoneIAX.inc:33
+msgid "Phone hardware"
 msgstr ""
 
-#: admin/conference/conf-list.xml:11
-msgid "List of conference rooms"
-msgstr "ä¼šè®®å®¤åˆ—è¡¨"
-
-#: admin/conference/conf-list.xml:15 admin/conference/conf-list.xml:74
-msgid "Conference"
-msgstr "ä¼šè®®"
+#: admin/systems/asterisk/class_phoneIAX.inc:46
+#: personal/asterisk/class_asteriskAccount.inc:42
+msgid "Telephone"
+msgstr "ç”µè¯"
 
-#: admin/conference/conf-list.xml:41
-#: admin/conference/class_phoneConferenceGeneric.inc:324
-#: admin/conference/class_phoneConferenceGeneric.inc:347
-#: admin/conference/class_phoneConferenceGeneric.inc:702
-#: admin/macro/class_gofonMacro.inc:395 admin/macro/class_gofonMacro.inc:406
-#: admin/macro/macro-list.xml:41
-#: admin/systems/asterisk/class_phoneGeneric.inc:344
-#: admin/systems/asterisk/class_phoneGeneric.inc:348
-#: admin/systems/asterisk/class_phoneGeneric.inc:351
-#: admin/systems/asterisk/class_phoneGeneric.inc:366
-#: admin/systems/asterisk/class_phoneGeneric.inc:482
-#: admin/conference/conf-filter.tpl.c:5 admin/macro/macro-filter.tpl.c:5
-#: admin/macro/parameter.tpl.c:5
+#: admin/systems/asterisk/class_phoneIAX.inc:49
 msgid "Name"
 msgstr "åç§°"
 
-#: admin/conference/conf-list.xml:49
-#: admin/conference/class_phoneConferenceGeneric.inc:704
-#: admin/macro/class_gofonMacro.inc:547 admin/macro/macro-list.xml:49
-#: admin/systems/asterisk/class_phoneGeneric.inc:484
-#: admin/conference/generic.tpl.c:29 admin/macro/generic.tpl.c:17
-#: admin/systems/asterisk/phone.tpl.c:8
-msgid "Description"
-msgstr "æè¿°"
-
-#: admin/conference/conf-list.xml:57 admin/macro/macro-list.xml:57
-msgid "Actions"
-msgstr "åŠ¨ä½œ"
-
-#: admin/conference/conf-list.xml:68 admin/macro/macro-list.xml:68
-msgid "Create"
-msgstr "åˆ›å»º"
-
-#: admin/conference/conf-list.xml:86 admin/conference/conf-list.xml:125
-#: admin/macro/macro-list.xml:86 admin/macro/macro-list.xml:125
-msgid "Edit"
-msgstr "ç¼–è¾‘"
-
-#: admin/conference/conf-list.xml:93 admin/conference/conf-list.xml:138
-#: admin/macro/macro-list.xml:93 admin/macro/macro-list.xml:138
-msgid "Remove"
-msgstr "åˆ é™¤"
-
-#: admin/conference/class_phoneConferenceGeneric.inc:233
-#, php-format
-msgid "Cannot delete entry from server '%s' because it seems to be removed!"
-msgstr ""
-
-#: admin/conference/class_phoneConferenceGeneric.inc:308
-#, php-format
-msgid ""
-"The previously selected asterisk home server '%s' is no longer available!"
-msgstr ""
-
-#: admin/conference/class_phoneConferenceGeneric.inc:315
-#: admin/conference/generic.tpl.c:47
-msgid "PIN"
-msgstr "PIN"
-
-#: admin/conference/class_phoneConferenceGeneric.inc:333
-#: admin/conference/class_phoneConferenceGeneric.inc:719
-msgid "Lifetime"
-msgstr ""
-
-#: admin/conference/class_phoneConferenceGeneric.inc:399
-#: personal/phoneaccount/class_phoneAccount.inc:346
-#: personal/phoneaccount/class_phoneAccount.inc:359
-#: personal/phoneaccount/class_phoneAccount.inc:617
-#: personal/phoneaccount/class_phoneAccount.inc:656
-#: personal/phoneaccount/class_phoneAccount.inc:1519
-#: personal/phoneaccount/class_phoneAccount.inc:1695
-#: admin/conference/remove.tpl.c:2 admin/macro/remove.tpl.c:2
-msgid "Warning"
-msgstr "è¦å‘Š"
-
-#: admin/conference/class_phoneConferenceGeneric.inc:400
-#, php-format
-msgid ""
-"FusionDirectory identified problems with your MySQL table definition, please"
-" activate debugging for details."
-msgstr ""
-
-#: admin/conference/class_phoneConferenceGeneric.inc:606
-#: admin/conference/class_phoneConferenceGeneric.inc:608
-#, php-format
-msgid "'%s' is already assigned to '%s'!"
-msgstr ""
-
-#: admin/conference/class_phoneConferenceGeneric.inc:693
-msgid "Phone Conference"
-msgstr ""
-
-#: admin/conference/class_phoneConferenceGeneric.inc:694
-msgid "Phone conference management"
-msgstr ""
-
-#: admin/conference/class_phoneConferenceGeneric.inc:696
-msgid "GOfon conference"
-msgstr ""
-
-#: admin/conference/class_phoneConferenceGeneric.inc:698
-msgid "Asterisk conference"
-msgstr ""
-
-#: admin/conference/class_phoneConferenceGeneric.inc:703
-#: admin/macro/class_gofonMacro.inc:546
-#: admin/systems/asterisk/class_phoneGeneric.inc:483
-#: admin/conference/generic.tpl.c:17 admin/macro/generic.tpl.c:14
-#: admin/systems/asterisk/phone.tpl.c:5
-msgid "Base"
-msgstr "ä½ç½®"
-
-#: admin/conference/class_phoneConferenceGeneric.inc:705
-msgid "Conference PIN"
-msgstr ""
-
-#: admin/conference/class_phoneConferenceGeneric.inc:710
-#: admin/conference/generic.tpl.c:44
-msgid "Preset PIN"
-msgstr "é¢„ç½® PIN"
-
-#: admin/conference/class_phoneConferenceGeneric.inc:711
-#: admin/conference/generic.tpl.c:50
-msgid "Record conference"
-msgstr "ä¼šè®®è®°å½•"
-
-#: admin/conference/class_phoneConferenceGeneric.inc:712
-#: admin/conference/generic.tpl.c:59
-msgid "Play music on hold"
-msgstr "æ’æ”¾æš‚åœéŸ³ä¹"
-
-#: admin/conference/class_phoneConferenceGeneric.inc:713
-msgid "Activate menu"
-msgstr ""
-
-#: admin/conference/class_phoneConferenceGeneric.inc:714
-msgid "Announce user activity"
-msgstr ""
-
-#: admin/conference/class_phoneConferenceGeneric.inc:715
-msgid "Count user"
-msgstr ""
-
-#: admin/conference/class_phoneConferenceGeneric.inc:716
-msgid "Conference type"
-msgstr ""
-
-#: admin/conference/class_phoneConferenceGeneric.inc:718
-msgid "Format"
-msgstr ""
-
-#: admin/conference/class_phoneConferenceGeneric.inc:720
-#: personal/phoneaccount/class_phoneAccount.inc:1666
-msgid "Telephone number"
-msgstr ""
-
-#: admin/conference/class_phoneConferenceGeneric.inc:721
-msgid "Owner"
-msgstr "æ‰€æœ‰è€…"
-
-#: admin/conference/class_phoneConferenceManagment.inc:36
-msgid "Phone Conferences"
-msgstr ""
-
-#: admin/conference/class_phoneConferenceManagment.inc:37
-msgid "Phone Conference management"
-msgstr ""
-
-#: admin/macro/class_gofonMacro.inc:202
-#, php-format
-msgid ""
-"Macro could not be removed from server '%s', please check database "
-"consistency!"
-msgstr ""
-
-#: admin/macro/class_gofonMacro.inc:264
-#, php-format
-msgid "Application missing in line %s!"
-msgstr ""
-
-#: admin/macro/class_gofonMacro.inc:267
-#, php-format
-msgid "Priority missing in line %s!"
-msgstr ""
-
-#: admin/macro/class_gofonMacro.inc:271
-#, php-format
-msgid "Extension missing in line %s!"
-msgstr ""
-
-#: admin/macro/class_gofonMacro.inc:281
-#, php-format
-msgid "Duplicate combination of 'extension' and 'priority' in line %s!"
-msgstr ""
-
-#: admin/macro/class_gofonMacro.inc:317
-#, php-format
-msgid ""
-"Macro could not be added to server '%s', please check database consistency!"
-msgstr ""
-
-#: admin/macro/class_gofonMacro.inc:410
-msgid "Name can be 20 characters at maximum!"
-msgstr ""
-
-#: admin/macro/class_gofonMacro.inc:419
-msgid "Macro is still in use!"
-msgstr ""
-
-#: admin/macro/class_gofonMacro.inc:426
-msgid "Macro is empty!"
-msgstr ""
-
-#: admin/macro/class_gofonMacro.inc:452
-#: admin/systems/asterisk/class_phoneGeneric.inc:267
-#, php-format
-msgid "Cannot delete entry because it is still in use by '%s'!"
-msgstr ""
-
-#: admin/macro/class_gofonMacro.inc:465
-#: addons/fonreports/class_fonreport.inc:190
-#: personal/phoneaccount/class_phoneAccount.inc:455
-#: personal/phoneaccount/class_phoneAccount.inc:1061
-#: personal/phoneaccount/class_phoneAccount.inc:1567
-msgid "Configuration error"
-msgstr ""
-
-#: admin/macro/class_gofonMacro.inc:536 admin/macro/class_gofonMacro.inc:541
-msgid "Asterisk macro"
-msgstr ""
-
-#: admin/macro/class_gofonMacro.inc:537
-msgid "Asterisk macro management"
-msgstr ""
-
-#: admin/macro/class_gofonMacro.inc:539
-msgid "GOfon macro"
-msgstr ""
-
-#: admin/macro/class_gofonMacro.inc:545 admin/macro/generic.tpl.c:2
-#: admin/macro/generic.tpl.c:5 admin/macro/paste_generic.tpl.c:2
-#: admin/macro/paste_generic.tpl.c:5
-msgid "Macro name"
-msgstr "å®åç§°"
-
-#: admin/macro/class_gofonMacro.inc:548 admin/macro/generic.tpl.c:8
-msgid "Display name"
-msgstr "æ˜¾ç¤ºåç§°"
-
-#: admin/macro/class_gofonMacro.inc:549
-msgid "Macro content and parameter"
+#: admin/systems/asterisk/class_phoneIAX.inc:49
+msgid "Name of this phone"
 msgstr ""
 
-#: admin/macro/class_gofonMacro.inc:550
-msgid "Visibility flag"
+#: admin/systems/asterisk/class_phoneIAX.inc:53
+msgid "Account name"
 msgstr ""
 
-#: admin/macro/class_gofonMacroManagement.inc:36
-msgid "Phone Macros"
-msgstr ""
-
-#: admin/macro/class_gofonMacroManagement.inc:37
-msgid "Phone Macros management"
-msgstr ""
-
-#: admin/macro/macro-list.xml:11
-msgid "List of macros"
-msgstr "å®åˆ—è¡¨"
-
-#: admin/macro/macro-list.xml:15 admin/macro/macro-list.xml:74
-msgid "Macro"
-msgstr "å®"
-
-#: admin/macro/class_gofonMacroParameters.inc:58
-msgid "Parameter"
-msgstr "å‚æ•°"
-
-#: admin/macro/class_gofonMacroParameters.inc:59
-msgid "Asterisk macro parameter"
-msgstr ""
-
-#: admin/macro/class_gofonMacroParameters.inc:234
-#: personal/phoneaccount/generic.tpl.c:35
-msgid "Phone macro"
-msgstr "ç”µè¯å®"
-
-#: admin/macro/class_gofonMacroParameters.inc:290
-msgid "String"
-msgstr "å—ç¬¦ä¸²"
-
-#: admin/macro/class_gofonMacroParameters.inc:291
-msgid "Combobox"
-msgstr "å•é€‰æ¡†"
-
-#: admin/macro/class_gofonMacroParameters.inc:292
-msgid "Bool"
-msgstr "å¸ƒå°”å€¼"
-
-#: admin/macro/class_gofonMacroParameters.inc:298
-msgid "Delete unused"
-msgstr "åˆ é™¤æœªä½¿ç”¨çš„"
-
-#: admin/macro/class_gofonMacroParameters.inc:374
-#, php-format
-msgid "Parameter %s contains invalid character. '!,#' is used as delimiter!"
-msgstr ""
-
-#: admin/macro/class_gofonMacroParameters.inc:379
-#, php-format
-msgid "Parameter %s is invalid!"
-msgstr ""
-
-#: admin/macro/class_gofonMacroParameters.inc:408
-#: personal/phoneaccount/class_phoneAccount.inc:1600
-msgid "Information"
-msgstr "æç¤ºä¿¡æ¯"
-
-#: admin/macro/class_gofonMacroParameters.inc:408
-msgid ""
-"Number of parameters for this macro has changed. Please update all users "
-"using it!"
-msgstr ""
-
-#: admin/systems/asterisk/class_phoneGeneric.inc:151
-msgid "phone"
-msgstr ""
-
-#: admin/systems/asterisk/class_phoneGeneric.inc:230
-msgid "yes"
-msgstr "æ˜¯"
-
-#: admin/systems/asterisk/class_phoneGeneric.inc:230
-msgid "no"
-msgstr "å¦"
-
-#: admin/systems/asterisk/class_phoneGeneric.inc:247
-msgid "dynamic"
-msgstr "åŠ¨æ€"
-
-#: admin/systems/asterisk/class_phoneGeneric.inc:247
-msgid "Networksettings"
-msgstr "ç½‘ç»œè®¾ç½®"
-
-#: admin/systems/asterisk/class_phoneGeneric.inc:330
-#: admin/systems/asterisk/class_phoneGeneric.inc:333
-msgid "IP address"
-msgstr ""
-
-#: admin/systems/asterisk/class_phoneGeneric.inc:473
-msgid "Phone information"
-msgstr ""
-
-#: admin/systems/asterisk/class_phoneGeneric.inc:476
-#: personal/phoneaccount/class_phoneAccount.inc:1668
-msgid "Phone hardware"
-msgstr ""
-
-#: admin/systems/asterisk/class_phoneGeneric.inc:485
-msgid "SIP Mode"
-msgstr ""
-
-#: admin/systems/asterisk/class_phoneGeneric.inc:486
-msgid "SIP DTMF mode"
-msgstr ""
-
-#: admin/systems/asterisk/class_phoneGeneric.inc:487
-msgid "SIP Default ip"
-msgstr ""
-
-#: admin/systems/asterisk/class_phoneGeneric.inc:488
-msgid "SIP Qualify"
-msgstr ""
-
-#: admin/systems/asterisk/class_phoneGeneric.inc:489
-msgid "IAX authentication type"
-msgstr ""
-
-#: admin/systems/asterisk/class_phoneGeneric.inc:490
-msgid "IAX secret"
-msgstr ""
-
-#: admin/systems/asterisk/class_phoneGeneric.inc:491
-msgid "IAX account code"
-msgstr ""
-
-#: admin/systems/asterisk/class_phoneGeneric.inc:492
-msgid "IAX trunk lines"
-msgstr ""
-
-#: admin/systems/asterisk/class_phoneGeneric.inc:493
-msgid "IAX permit settings"
-msgstr ""
-
-#: admin/systems/asterisk/class_phoneGeneric.inc:494
-msgid "IAX deny settings"
-msgstr ""
-
-#: admin/systems/asterisk/class_phoneGeneric.inc:495
-msgid "CAPI MSN"
-msgstr ""
-
-#: admin/systems/asterisk/class_phoneGeneric.inc:496
-msgid "Hardware type"
+#: admin/systems/asterisk/class_phoneIAX.inc:53
+msgid "Name of the account"
 msgstr ""
 
 #: admin/systems/services/asterisk/class_serviceAsterisk.inc:35
@@ -747,6 +95,10 @@ msgid ""
 "these objects '%s'."
 msgstr "æ‚¨ä¸èƒ½åˆ é™¤ asterisk æ•°æ®åº“æ‰©å±•ï¼Œå®ƒä»è¢«è¿™äº›å¯¹è±¡ '%s' ä½¿ç”¨ã€‚"
 
+#: admin/systems/services/asterisk/class_serviceAsterisk.inc:121
+msgid "LDAP error"
+msgstr "LDAP é”™è¯¯"
+
 #: admin/systems/services/asterisk/class_serviceAsterisk.inc:140
 msgid "VoIP service (asterisk)"
 msgstr ""
@@ -759,209 +111,18 @@ msgstr ""
 msgid "Services"
 msgstr "æœåŠ¡"
 
-#: addons/fonreports/class_fonreport.inc:232
-msgid "Insufficient permissions"
-msgstr ""
-
-#: addons/fonreports/class_fonreport.inc:251
-msgid "Y-M-D"
-msgstr "Y-M-D"
-
-#: addons/fonreports/class_fonreport.inc:418
-#: addons/fonreports/class_fonreport.inc:419
-#: addons/fonreports/class_fonreport.inc:424 addons/fonreports/main.inc:46
-msgid "Phone reports"
-msgstr "ç”µè¯è®°å½•"
-
-#: addons/fonreports/class_fonreport.inc:419
-msgid "All entries are readonly"
-msgstr ""
-
-#: addons/fonreports/class_fonreport.inc:428
-#: addons/fonreports/contents.tpl.c:32
-msgid "Date"
-msgstr "æ—¥æœŸ"
-
-#: addons/fonreports/class_fonreport.inc:429
-#: addons/fonreports/contents.tpl.c:35
-msgid "Source"
-msgstr "æº"
-
-#: addons/fonreports/class_fonreport.inc:430
-#: addons/fonreports/contents.tpl.c:38
-msgid "Destination"
-msgstr "ç›®æ ‡"
-
-#: addons/fonreports/class_fonreport.inc:431
-#: addons/fonreports/contents.tpl.c:41
-msgid "Channel"
-msgstr "é¢‘é“"
-
-#: addons/fonreports/class_fonreport.inc:432
-msgid "Application called"
-msgstr ""
-
-#: addons/fonreports/class_fonreport.inc:433
-msgid "Disposition"
-msgstr ""
-
-#: addons/fonreports/class_fonreport.inc:434
-#: addons/fonreports/contents.tpl.c:50
-msgid "Duration"
-msgstr "æŒç»æ—¶é—´"
-
-#: personal/phoneaccount/class_phoneAccount.inc:176
-msgid "automatic"
-msgstr "è‡ªåŠ¨"
-
-#: personal/phoneaccount/class_phoneAccount.inc:212
-msgid "no macro"
-msgstr "æ²¡æœ‰å®"
-
-#: personal/phoneaccount/class_phoneAccount.inc:240
-msgid "undefined"
-msgstr "æœªå®šä¹‰"
-
-#: personal/phoneaccount/class_phoneAccount.inc:359
-#, php-format
-msgid ""
-"Cannot identify telephone extension in database, please try to save again."
-msgstr ""
-
-#: personal/phoneaccount/class_phoneAccount.inc:577
-#: personal/phoneaccount/class_phoneAccount.inc:595
-msgid "Abort saving entries to keep the database consistent."
-msgstr ""
-
-#: personal/phoneaccount/class_phoneAccount.inc:618
-#: personal/phoneaccount/class_phoneAccount.inc:657
-#: personal/phoneaccount/class_phoneAccount.inc:1520
-#, php-format
-msgid ""
-"FusionDirectory identified problems with your database table definition!"
-msgstr ""
-
-#: personal/phoneaccount/class_phoneAccount.inc:1023
-msgid "Remove phone account"
-msgstr "åˆ é™¤ç”µè¯è´¦å·"
-
-#: personal/phoneaccount/class_phoneAccount.inc:1027
-#: personal/phoneaccount/class_phoneAccount.inc:1030
-msgid "Create phone account"
-msgstr "åˆ›å»ºç”µè¯è´¦å·"
-
-#: personal/phoneaccount/class_phoneAccount.inc:1028
-msgid "User uid"
-msgstr ""
-
-#: personal/phoneaccount/class_phoneAccount.inc:1046
-msgid "Selected macro is not available anymore!"
-msgstr ""
-
-#: personal/phoneaccount/class_phoneAccount.inc:1221
-msgid "Choose your private phone"
-msgstr "é€‰æ‹©æ‚¨ç§äººç”µè¯"
-
-#: personal/phoneaccount/class_phoneAccount.inc:1346
-msgid ""
-"There must be at least one server with an asterisk database to create a "
-"phone account."
-msgstr "å¿…é¡»æœ‰è‡³å°‘ä¸€ä¸ªå¸¦æœ‰ asterisk æ•°æ®åº“çš„æœåŠ¡å™¨æ¥åˆ›å»ºä¸€ä¸ªç”µè¯è´¦å·ã€‚"
-
-#: personal/phoneaccount/class_phoneAccount.inc:1354
-#: personal/phoneaccount/class_phoneAccount.inc:1357
-#: personal/phoneaccount/generic.tpl.c:29
-#: personal/phoneaccount/paste_generic.tpl.c:11
-msgid "Voicemail PIN"
-msgstr "è¯éŸ³é‚®ä»¶ PIN"
-
-#: personal/phoneaccount/class_phoneAccount.inc:1354
-msgid "Between 1-4 charactes"
-msgstr ""
-
-#: personal/phoneaccount/class_phoneAccount.inc:1362
-#: personal/phoneaccount/generic.tpl.c:32
-#: personal/phoneaccount/paste_generic.tpl.c:14
-msgid "Phone PIN"
-msgstr "ç”µè¯ PIN"
-
-#: personal/phoneaccount/class_phoneAccount.inc:1394
-#: admin/conference/generic.tpl.c:38 admin/conference/paste_generic.tpl.c:8
-msgid "Phone number"
-msgstr "ç”µè¯å·ç "
-
-#: personal/phoneaccount/class_phoneAccount.inc:1402
-#, php-format
-msgid "macro parameter %s"
-msgstr ""
-
-#: personal/phoneaccount/class_phoneAccount.inc:1450
-msgid "An error occured while updating the database entries!"
-msgstr ""
-
-#: personal/phoneaccount/class_phoneAccount.inc:1567
-msgid "Was not able to found any asterisk server"
-msgstr ""
-
-#: personal/phoneaccount/class_phoneAccount.inc:1600
-#, php-format
-msgid "User '%s' has been removed from phone queue '%s'."
-msgstr ""
-
-#: personal/phoneaccount/class_phoneAccount.inc:1637
-#: personal/phoneaccount/class_phoneAccount.inc:1639
-#, php-format
-msgid "The specified telephonenumber '%s' is already assigned to '%s'."
-msgstr "æŒ‡å®šçš„ç”µè¯å·ç  '%s' å·²ç»åˆ†é…ç»™äº† '%s'ã€‚"
-
-#: personal/phoneaccount/class_phoneAccount.inc:1649
-#, php-format
-msgid ""
-"The previously selected asterisk home server (%s) is no longer available. "
-"Remove aborted."
-msgstr "ä¹‹å‰é€‰æ‹©çš„ asterisk ä¸»æœåŠ¡å™¨ (%s) ä¸å˜åœ¨äº†ã€‚åˆ é™¤ç»ˆæ¢ã€‚"
-
-#: personal/phoneaccount/class_phoneAccount.inc:1658
-msgid "Phone account settings"
-msgstr ""
-
-#: personal/phoneaccount/class_phoneAccount.inc:1667
-msgid "Macro settings"
-msgstr ""
-
-#: personal/phoneaccount/class_phoneAccount.inc:1670
-msgid "Phone context"
-msgstr ""
-
-#: personal/phoneaccount/class_phoneAccount.inc:1671
-msgid "Voice mail context"
-msgstr ""
-
-#: personal/phoneaccount/class_phoneAccount.inc:1672
-msgid "Telephone pin"
+#: personal/asterisk/class_asteriskAccount.inc:30
+#: config/asterisk/class_asteriskPluginConfig.inc:28
+#: config/asterisk/class_asteriskPluginConfig.inc:41
+msgid "Asterisk"
 msgstr ""
 
-#: personal/phoneaccount/class_phoneAccount.inc:1673
-msgid "Voicemail pin"
+#: personal/asterisk/class_asteriskAccount.inc:31
+msgid "Asterisk account"
 msgstr ""
 
-#: personal/phoneaccount/class_phoneAccount.inc:1695
-#, php-format
-msgid "You need to configure %s contexts first"
-msgstr ""
-
-#: personal/phoneaccount/main.inc:124
-msgid "Click the 'Edit' button below to change informations in this dialog"
-msgstr "ç‚¹å‡»ä¸‹é¢çš„â€œç¼–è¾‘â€æŒ‰é’®ä¿®æ”¹è¯¥å¯¹è¯æ¡†å†…çš„ä¿¡æ¯"
-
-#: personal/phoneaccount/main.inc:134
-#: personal/phoneaccount/paste_generic.tpl.c:2
-msgid "Phone settings"
-msgstr "ç”µè¯è®¾ç½®"
-
-#: config/asterisk/class_asteriskPluginConfig.inc:28
-#: config/asterisk/class_asteriskPluginConfig.inc:41
-msgid "Asterisk"
+#: personal/asterisk/class_asteriskAccount.inc:45
+msgid "Select the phone associated to this user"
 msgstr ""
 
 #: config/asterisk/class_asteriskPluginConfig.inc:29
@@ -1011,338 +172,3 @@ msgstr ""
 #: config/asterisk/class_asteriskPluginConfig.inc:72
 msgid "Available voicemail contexts"
 msgstr ""
-
-#: admin/ogroups/asterisk/phonequeue.tpl.c:2
-msgid ""
-"Only users with the same asterisk home server will be included to this "
-"queue."
-msgstr "åªæœ‰æœ‰ç€ç›¸åŒ asterisk ä¸»æœåŠ¡å™¨çš„ç”¨æˆ·æ‰ä¼šè¢«åŒ…å«åœ¨è¿™ä¸ªé˜Ÿåˆ—ä¸ã€‚"
-
-#: admin/ogroups/asterisk/phonequeue.tpl.c:5
-#: personal/phoneaccount/generic.tpl.c:2
-#: personal/phoneaccount/paste_generic.tpl.c:5
-msgid "Phone numbers"
-msgstr "ç”µè¯å·ç "
-
-#: admin/ogroups/asterisk/phonequeue.tpl.c:8
-msgid "Up"
-msgstr "ä¸Š"
-
-#: admin/ogroups/asterisk/phonequeue.tpl.c:11
-msgid "Down"
-msgstr "å…³é—"
-
-#: admin/ogroups/asterisk/phonequeue.tpl.c:14
-#: admin/conference/generic.tpl.c:41
-msgid "Options"
-msgstr "é€‰é¡¹"
-
-#: admin/ogroups/asterisk/phonequeue.tpl.c:29
-msgid "Strategy"
-msgstr "ç–ç•¥"
-
-#: admin/ogroups/asterisk/phonequeue.tpl.c:38
-msgid "(in seconds)"
-msgstr "(ç§’)"
-
-#: admin/ogroups/asterisk/phonequeue.tpl.c:41
-msgid "Queue sound setup"
-msgstr "é˜Ÿåˆ—å£°éŸ³è®¾ç½®"
-
-#: admin/ogroups/asterisk/phonequeue.tpl.c:44
-msgid "Use music on hold instead of ringing"
-msgstr "æ’æ”¾éŸ³ä¹ä¿æŒé”å®šè€Œéžæ’æ”¾"
-
-#: admin/ogroups/asterisk/phonequeue.tpl.c:50
-msgid "Welcome sound file"
-msgstr "æ¬¢è¿Žå£°éŸ³æ–‡ä»¶"
-
-#: admin/ogroups/asterisk/phonequeue.tpl.c:53
-msgid "Announce message"
-msgstr "å…¬å‘Šä¿¡æ¯"
-
-#: admin/ogroups/asterisk/phonequeue.tpl.c:56
-msgid "Sound file for 'You are next ...'"
-msgstr "å£°éŸ³æ–‡ä»¶â€œæ‚¨æ˜¯ä¸‹ä¸€ä¸ª...â€"
-
-#: admin/ogroups/asterisk/phonequeue.tpl.c:59
-msgid "'There are ...'"
-msgstr "'è¿™é‡Œæœ‰ ...'"
-
-#: admin/ogroups/asterisk/phonequeue.tpl.c:62
-msgid "'... calls waiting'"
-msgstr "'... ç”µè¯åœ¨ç‰å¾…'"
-
-#: admin/ogroups/asterisk/phonequeue.tpl.c:65
-msgid "'Thank you' message"
-msgstr "'è°¢è°¢æ‚¨' æ¶ˆæ¯"
-
-#: admin/ogroups/asterisk/phonequeue.tpl.c:68
-msgid "'minutes' sound file"
-msgstr "'åˆ†é’Ÿ' å£°éŸ³æ–‡ä»¶"
-
-#: admin/ogroups/asterisk/phonequeue.tpl.c:71
-msgid "'seconds' sound file"
-msgstr "'ç§’' å£°éŸ³æ–‡ä»¶"
-
-#: admin/ogroups/asterisk/phonequeue.tpl.c:74
-msgid "Hold sound file"
-msgstr "æš‚åœå£°éŸ³æ–‡ä»¶"
-
-#: admin/ogroups/asterisk/phonequeue.tpl.c:77
-msgid "Less Than sound file"
-msgstr "å£°éŸ³æ–‡ä»¶â€œå°äºŽ...â€"
-
-#: admin/ogroups/asterisk/phonequeue.tpl.c:80
-msgid "Phone attributes "
-msgstr "ç”µè¯å±žæ€§"
-
-#: admin/conference/conf-filter.tpl.c:2 admin/macro/macro-filter.tpl.c:2
-#: addons/fonreports/contents.tpl.c:2
-msgid "Filter"
-msgstr "è¿‡æ»¤å™¨"
-
-#: admin/conference/generic.tpl.c:2
-msgid "Properties"
-msgstr "å±žæ€§"
-
-#: admin/conference/generic.tpl.c:5 admin/conference/paste_generic.tpl.c:2
-msgid "Conference name"
-msgstr "ä¼šè®®åç§°"
-
-#: admin/conference/generic.tpl.c:8 admin/conference/paste_generic.tpl.c:5
-msgid "Name of conference to create"
-msgstr "è¦åˆ›å»ºä¼šè®®çš„åç§°"
-
-#: admin/conference/generic.tpl.c:11
-msgid "Type"
-msgstr "ç±»åž‹"
-
-#: admin/conference/generic.tpl.c:14
-msgid "Choose subtree to place conference in"
-msgstr "é€‰æ‹©æ”¾ç½®ä¼šè®®çš„åæ ‘"
-
-#: admin/conference/generic.tpl.c:26
-msgid "Select language"
-msgstr ""
-
-#: admin/conference/generic.tpl.c:32
-msgid "Descriptive text for department"
-msgstr "éƒ¨é—¨æè¿°æ–‡ä»¶"
-
-#: admin/conference/generic.tpl.c:35
-msgid "Lifetime (in days)"
-msgstr "ç”Ÿå˜æœŸï¼ˆå¤©ï¼‰"
-
-#: admin/conference/generic.tpl.c:53
-msgid "Sound file format"
-msgstr "å£°éŸ³æ–‡ä»¶ç±»åž‹"
-
-#: admin/conference/generic.tpl.c:56
-msgid "Choose subtree to place department in"
-msgstr "é€‰æ‹©æ”¾ç½®éƒ¨é—¨çš„åæ ‘"
-
-#: admin/conference/generic.tpl.c:62
-msgid "Activate session menu"
-msgstr "æ¿€æ´»ä¼šè¯èœå•"
-
-#: admin/conference/generic.tpl.c:65
-msgid "Announce users joining or leaving the conference"
-msgstr "é€šçŸ¥ç”¨æˆ·åŠ å…¥æˆ–è€…ç¦»å¼€ä¼šè®®"
-
-#: admin/conference/generic.tpl.c:68
-msgid "Count users"
-msgstr ""
-
-#: admin/conference/remove.tpl.c:5 admin/macro/remove.tpl.c:5
-msgid ""
-"Please double check if you really want to do this since there is no way for "
-"FusionDirectory to get your data back."
-msgstr ""
-
-#: admin/conference/remove.tpl.c:8 admin/macro/remove.tpl.c:8
-msgid "So - if you're sure - press 'Delete' to continue or 'Cancel' to abort."
-msgstr "æ‰€ä»¥ï¼Œå¦‚æžœæ‚¨ç¡®å®šï¼Œè¯·æŒ‰â€œåˆ é™¤â€ç»§ç»ï¼Œå¦åˆ™æŒ‰â€œå–æ¶ˆâ€é€€å‡ºã€‚"
-
-#: admin/macro/generic.tpl.c:11
-msgid "Macro name to be displayed"
-msgstr "è¦æ˜¾ç¤ºçš„å®åç§°"
-
-#: admin/macro/generic.tpl.c:20
-msgid "Visible for user"
-msgstr "ç”¨æˆ·å¯è§"
-
-#: admin/macro/generic.tpl.c:23
-msgid "Macro text"
-msgstr "å®æ–‡æœ¬"
-
-#: admin/macro/parameter.tpl.c:2
-msgid "Argument"
-msgstr "å‚æ•°"
-
-#: admin/macro/parameter.tpl.c:8
-msgid "type"
-msgstr "ç±»åž‹"
-
-#: admin/macro/parameter.tpl.c:11
-msgid "Default value"
-msgstr "ç¼ºçœå€¼"
-
-#: admin/macro/parameter.tpl.c:14
-msgid "You are not allowed to view the macro parameter settings"
-msgstr ""
-
-#: admin/systems/asterisk/phonesettings.tpl.c:2
-msgid "Advanced phone settings"
-msgstr "é«˜çº§ç”µè¯è®¾ç½®"
-
-#: admin/systems/asterisk/phonesettings.tpl.c:5
-msgid "Phone type"
-msgstr "ç”µè¯ç±»åž‹"
-
-#: admin/systems/asterisk/phonesettings.tpl.c:8
-#: admin/systems/asterisk/phonesettings.tpl.c:14
-#: admin/systems/asterisk/phonesettings.tpl.c:20
-#: admin/systems/asterisk/phonesettings.tpl.c:26
-#: admin/systems/asterisk/phonesettings.tpl.c:35
-#: admin/systems/asterisk/phonesettings.tpl.c:47
-#: admin/systems/asterisk/phonesettings.tpl.c:65
-msgid "Choose a phone type"
-msgstr "é€‰æ‹©ä¸€ä¸ªç”µè¯ç±»åž‹"
-
-#: admin/systems/asterisk/phonesettings.tpl.c:11
-msgid "Mode"
-msgstr "æ¨¡å¼"
-
-#: admin/systems/asterisk/phonesettings.tpl.c:17
-msgid "DTMF mode"
-msgstr "DTMF æ¨¡å¼"
-
-#: admin/systems/asterisk/phonesettings.tpl.c:23
-#: admin/systems/asterisk/phonesettings.tpl.c:38
-msgid "Default IP"
-msgstr "ç¼ºçœ IP"
-
-#: admin/systems/asterisk/phonesettings.tpl.c:29
-#: admin/systems/asterisk/phonesettings.tpl.c:41
-msgid "Response timeout"
-msgstr "å“åº”è¶…æ—¶"
-
-#: admin/systems/asterisk/phonesettings.tpl.c:32
-msgid "Modus"
-msgstr "æ¨¡å—"
-
-#: admin/systems/asterisk/phonesettings.tpl.c:44
-msgid "Authtype"
-msgstr "è®¤è¯ç±»åž‹"
-
-#: admin/systems/asterisk/phonesettings.tpl.c:50
-msgid "Secret"
-msgstr "ç§˜å¯†"
-
-#: admin/systems/asterisk/phonesettings.tpl.c:53
-msgid "GoFonInkeys"
-msgstr ""
-
-#: admin/systems/asterisk/phonesettings.tpl.c:56
-msgid "GoFonOutKeys"
-msgstr ""
-
-#: admin/systems/asterisk/phonesettings.tpl.c:59
-msgid "Account code"
-msgstr "è´¦å·å·ç "
-
-#: admin/systems/asterisk/phonesettings.tpl.c:62
-msgid "Trunk lines"
-msgstr ""
-
-#: admin/systems/asterisk/phonesettings.tpl.c:68
-msgid "Hosts that are allowed to connect"
-msgstr "å…è®¸è¿žæŽ¥çš„ä¸»æœº"
-
-#: admin/systems/asterisk/phonesettings.tpl.c:71
-#: admin/systems/asterisk/phonesettings.tpl.c:77
-msgid "List of alternative mail addresses"
-msgstr "æ›¿ä»£é‚®ä»¶åœ°å€åˆ—è¡¨"
-
-#: admin/systems/asterisk/phonesettings.tpl.c:74
-msgid "Hosts that are not allowed to connect"
-msgstr "ä¸å…è®¸è¿žæŽ¥çš„ä¸»æœº"
-
-#: admin/systems/asterisk/phonesettings.tpl.c:80
-msgid "MSN"
-msgstr "MSN"
-
-#: admin/systems/asterisk/phone.tpl.c:2
-msgid "Phone name"
-msgstr "ç”µè¯åç§°"
-
-#: addons/fonreports/contents.tpl.c:5
-msgid "Search for"
-msgstr "æŸ¥è¯¢"
-
-#: addons/fonreports/contents.tpl.c:8
-msgid "Enter user name to search for"
-msgstr "è¾“å…¥è¦æŸ¥è¯¢çš„ç”¨æˆ·å"
-
-#: addons/fonreports/contents.tpl.c:11 addons/fonreports/contents.tpl.c:26
-msgid "in"
-msgstr "äºŽ"
-
-#: addons/fonreports/contents.tpl.c:14
-msgid "Select subtree to base search on"
-msgstr "é€‰æ‹©æŸ¥è¯¢åŸºäºŽçš„åæ ‘"
-
-#: addons/fonreports/contents.tpl.c:17
-msgid "on"
-msgstr ""
-
-#: addons/fonreports/contents.tpl.c:20
-msgid "Select server to search on"
-msgstr ""
-
-#: addons/fonreports/contents.tpl.c:23
-msgid "during"
-msgstr "åœ¨"
-
-#: addons/fonreports/contents.tpl.c:29
-msgid "Search"
-msgstr "æŸ¥æ‰¾"
-
-#: addons/fonreports/contents.tpl.c:44
-msgid "Application"
-msgstr "åº”ç”¨ç¨‹åº"
-
-#: addons/fonreports/contents.tpl.c:47
-msgid "Status"
-msgstr "çŠ¶æ€"
-
-#: addons/fonreports/contents.tpl.c:53
-msgid "Search returned no results..."
-msgstr "æŸ¥æ— ç»“æžœ..."
-
-#: personal/phoneaccount/generic.tpl.c:5
-#: personal/phoneaccount/paste_generic.tpl.c:8
-msgid "Telephone hardware"
-msgstr "ç”µè¯ç¡¬ä»¶"
-
-#: personal/phoneaccount/generic.tpl.c:8
-msgid "Telephone"
-msgstr "ç”µè¯"
-
-#: personal/phoneaccount/generic.tpl.c:14
-msgid "Select the accounts home server"
-msgstr "é€‰æ‹©è´¦å·çš„ä¸»æœåŠ¡å™¨"
-
-#: personal/phoneaccount/generic.tpl.c:17
-msgid "Context"
-msgstr ""
-
-#: personal/phoneaccount/generic.tpl.c:20
-#: personal/phoneaccount/generic.tpl.c:26
-msgid "Select the accounts context"
-msgstr ""
-
-#: personal/phoneaccount/generic.tpl.c:23
-msgid "Voicemail context"
-msgstr ""
diff --git a/autofs/locale/ar/fusiondirectory.po b/autofs/locale/ar/fusiondirectory.po
index 97264dd39e38a4d06dfb44a30cbf942ddaa68630..5a8c995c86fc4b64846c58d2340ba86fa009c6af 100644
--- a/autofs/locale/ar/fusiondirectory.po
+++ b/autofs/locale/ar/fusiondirectory.po
@@ -5,12 +5,12 @@
 # Translators:
 msgid ""
 msgstr ""
-"Project-Id-Version: FusionDirectory-108\n"
+"Project-Id-Version: FusionDirectory-109\n"
 "Report-Msgid-Bugs-To: documentation@lists.fusiondirectory.org\n"
-"POT-Creation-Date: 2015-03-19 21:45+0100\n"
-"PO-Revision-Date: 2015-02-25 16:03+0000\n"
+"POT-Creation-Date: 2014-12-15 17:47+0100\n"
+"PO-Revision-Date: 2015-02-25 16:04+0000\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>\n"
-"Language-Team: Arabic (http://www.transifex.com/projects/p/FusionDirectory-108/language/ar/)\n"
+"Language-Team: Arabic (http://www.transifex.com/projects/p/FusionDirectory-109/language/ar/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
diff --git a/autofs/locale/ca/fusiondirectory.po b/autofs/locale/ca/fusiondirectory.po
index 07dbc0be45e710cda858714c347532f0a36d57de..cb3b35ade1f7adb3cee17eba1201e190f9f8b52f 100644
--- a/autofs/locale/ca/fusiondirectory.po
+++ b/autofs/locale/ca/fusiondirectory.po
@@ -5,12 +5,12 @@
 # Translators:
 msgid ""
 msgstr ""
-"Project-Id-Version: FusionDirectory-108\n"
+"Project-Id-Version: FusionDirectory-109\n"
 "Report-Msgid-Bugs-To: documentation@lists.fusiondirectory.org\n"
-"POT-Creation-Date: 2015-03-19 21:45+0100\n"
-"PO-Revision-Date: 2015-02-25 16:03+0000\n"
+"POT-Creation-Date: 2014-12-15 17:47+0100\n"
+"PO-Revision-Date: 2015-02-25 16:04+0000\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>\n"
-"Language-Team: Catalan (http://www.transifex.com/projects/p/FusionDirectory-108/language/ca/)\n"
+"Language-Team: Catalan (http://www.transifex.com/projects/p/FusionDirectory-109/language/ca/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
diff --git a/autofs/locale/cs_CZ/fusiondirectory.po b/autofs/locale/cs_CZ/fusiondirectory.po
index 7bd299d1d726a96ef754c30c71c7daf0b952317c..45618e3f7dadd13224a54398ebf8484d63ca447d 100644
--- a/autofs/locale/cs_CZ/fusiondirectory.po
+++ b/autofs/locale/cs_CZ/fusiondirectory.po
@@ -3,14 +3,15 @@
 # This file is distributed under the same license as the PACKAGE package.
 # 
 # Translators:
+# Pavel Borecki <pavel.borecki@gmail.com>, 2014-2015
 msgid ""
 msgstr ""
-"Project-Id-Version: FusionDirectory-108\n"
+"Project-Id-Version: FusionDirectory-109\n"
 "Report-Msgid-Bugs-To: documentation@lists.fusiondirectory.org\n"
-"POT-Creation-Date: 2015-03-19 21:45+0100\n"
-"PO-Revision-Date: 2015-02-25 16:03+0000\n"
-"Last-Translator: fusiondirectory <contact@fusiondirectory.org>\n"
-"Language-Team: Czech (Czech Republic) (http://www.transifex.com/projects/p/FusionDirectory-108/language/cs_CZ/)\n"
+"POT-Creation-Date: 2014-12-15 17:47+0100\n"
+"PO-Revision-Date: 2015-04-07 19:41+0000\n"
+"Last-Translator: Pavel Borecki <pavel.borecki@gmail.com>\n"
+"Language-Team: Czech (Czech Republic) (http://www.transifex.com/projects/p/FusionDirectory-109/language/cs_CZ/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -20,42 +21,42 @@ msgstr ""
 #: admin/autofs/class_nisObject.inc:31 admin/autofs/class_nisObject.inc:32
 #: admin/autofs/class_nisObject.inc:34 admin/autofs/class_nisObject.inc:49
 msgid "Directory"
-msgstr "adresÃ¡Å™"
+msgstr "SloÅ¾ka"
 
 #: admin/autofs/class_nisObject.inc:53 admin/autofs/class_nisMap.inc:53
 msgid "Name"
-msgstr "nÃ¡zev"
+msgstr "NÃ¡zev"
 
 #: admin/autofs/class_nisObject.inc:53
 msgid "Name of this directory"
-msgstr "NÃ¡zev tohoto adresÃ¡Å™e"
+msgstr "NÃ¡zev tÃ©to sloÅ¾ky"
 
 #: admin/autofs/class_nisObject.inc:57
 msgid "Automount entry"
-msgstr ""
+msgstr "PoloÅ¾ka automatickÃ©ho pÅ™ipojenÃ (automount)"
 
 #: admin/autofs/class_nisObject.inc:57
 msgid ""
 "The entry of this directory for the automount daemon.\n"
 " For instance 'auto.u' or '-fstype=nfs domaine.tld:/mount/directory'"
-msgstr ""
+msgstr "PoloÅ¾ka tÃ©to sloÅ¾ky pro systÃ©movou sluÅ¾bu automount.\nNapÅ™Ãklad auto.u nebo -fstype=nfs nazevdomeny.tld:/pripojna/sloÅ¾ka"
 
 #: admin/autofs/class_nisObject.inc:61 admin/autofs/class_nisMap.inc:31
 #: admin/autofs/class_nisMap.inc:34 admin/autofs/class_nisMap.inc:49
 msgid "Mount point"
-msgstr "pÅ™ÃpojnÃ½ bod"
+msgstr "PÅ™ÃpojnÃ½ bod"
 
 #: admin/autofs/class_nisObject.inc:61
 msgid "The mount point this directory will be placed in"
-msgstr ""
+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 ""
+msgstr "PÅ™ÃpojnÃ½ bod pro autofs"
 
 #: admin/autofs/class_nisMap.inc:53
 msgid "Name of the mount point"
-msgstr ""
+msgstr "NÃ¡zev pÅ™ÃpojnÃ©ho bodu"
 
 #: admin/autofs/class_autofsManagement.inc:31
 msgid "Auto fs"
@@ -63,15 +64,15 @@ msgstr ""
 
 #: admin/autofs/class_autofsManagement.inc:32
 msgid "Auto fs management"
-msgstr ""
+msgstr "SprÃ¡va auto fs"
 
 #: config/autofs/class_autofsConfig.inc:28
 msgid "Autofs configuration"
-msgstr ""
+msgstr "NastavenÃ Autofs"
 
 #: config/autofs/class_autofsConfig.inc:29
 msgid "FusionDirectory autofs plugin configuration"
-msgstr ""
+msgstr "NastavenÃ zÃ¡suvnÃ©ho modulu autofs pro FusionDirectory"
 
 #: config/autofs/class_autofsConfig.inc:42
 msgid "AutoFS"
@@ -79,8 +80,8 @@ msgstr ""
 
 #: config/autofs/class_autofsConfig.inc:45
 msgid "AutoFS RDN"
-msgstr ""
+msgstr "RelativnÃ rozliÅ¡enÃ½ nÃ¡zev AutoFS"
 
 #: config/autofs/class_autofsConfig.inc:45
 msgid "Branch in which automount info will be stored"
-msgstr ""
+msgstr "VÄ›tev, ve kterÃ© budou uklÃ¡dÃ¡ny Ãºdaje pro samoÄinnÃ© pÅ™ipojovÃ¡nÃ souborovÃ½ch systÃ©mÅ¯"
diff --git a/autofs/locale/de/fusiondirectory.po b/autofs/locale/de/fusiondirectory.po
index 0bf4bc0ce32b7c86479fc1db550f04feeebd5024..674d8c8b7203d8c50ec9cff66ce9dc37c6e5cca2 100644
--- a/autofs/locale/de/fusiondirectory.po
+++ b/autofs/locale/de/fusiondirectory.po
@@ -3,15 +3,15 @@
 # This file is distributed under the same license as the PACKAGE package.
 # 
 # Translators:
-# Maik Wagner <maikwagner@yahoo.com>, 2013
+# Ettore Atalan <atalanttore@googlemail.com>, 2014
 msgid ""
 msgstr ""
-"Project-Id-Version: FusionDirectory-108\n"
+"Project-Id-Version: FusionDirectory-109\n"
 "Report-Msgid-Bugs-To: documentation@lists.fusiondirectory.org\n"
-"POT-Creation-Date: 2015-03-19 21:45+0100\n"
-"PO-Revision-Date: 2015-02-25 16:03+0000\n"
-"Last-Translator: fusiondirectory <contact@fusiondirectory.org>\n"
-"Language-Team: German (http://www.transifex.com/projects/p/FusionDirectory-108/language/de/)\n"
+"POT-Creation-Date: 2014-12-15 17:47+0100\n"
+"PO-Revision-Date: 2015-02-25 16:04+0000\n"
+"Last-Translator: Ettore Atalan <atalanttore@googlemail.com>\n"
+"Language-Team: German (http://www.transifex.com/projects/p/FusionDirectory-109/language/de/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
diff --git a/autofs/locale/el_GR/fusiondirectory.po b/autofs/locale/el_GR/fusiondirectory.po
new file mode 100644
index 0000000000000000000000000000000000000000..4f5dc8bb96335f57e22b7ba9947cb946d68cb2d1
--- /dev/null
+++ b/autofs/locale/el_GR/fusiondirectory.po
@@ -0,0 +1,86 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR FusionDirectory Project
+# This file is distributed under the same license as the PACKAGE package.
+# 
+# Translators:
+msgid ""
+msgstr ""
+"Project-Id-Version: FusionDirectory-109\n"
+"Report-Msgid-Bugs-To: documentation@lists.fusiondirectory.org\n"
+"POT-Creation-Date: 2014-12-15 17:47+0100\n"
+"PO-Revision-Date: 2015-05-30 11:45+0000\n"
+"Last-Translator: Benoit Mortier <benoit.mortier@opensides.be>\n"
+"Language-Team: Greek (Greece) (http://www.transifex.com/projects/p/FusionDirectory-109/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/autofs/class_nisObject.inc:31 admin/autofs/class_nisObject.inc:32
+#: admin/autofs/class_nisObject.inc:34 admin/autofs/class_nisObject.inc:49
+msgid "Directory"
+msgstr ""
+
+#: admin/autofs/class_nisObject.inc:53 admin/autofs/class_nisMap.inc:53
+msgid "Name"
+msgstr ""
+
+#: admin/autofs/class_nisObject.inc:53
+msgid "Name of this directory"
+msgstr ""
+
+#: admin/autofs/class_nisObject.inc:57
+msgid "Automount entry"
+msgstr ""
+
+#: admin/autofs/class_nisObject.inc:57
+msgid ""
+"The entry of this directory for the automount daemon.\n"
+" For instance 'auto.u' or '-fstype=nfs domaine.tld:/mount/directory'"
+msgstr ""
+
+#: admin/autofs/class_nisObject.inc:61 admin/autofs/class_nisMap.inc:31
+#: admin/autofs/class_nisMap.inc:34 admin/autofs/class_nisMap.inc:49
+msgid "Mount point"
+msgstr ""
+
+#: admin/autofs/class_nisObject.inc:61
+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 ""
+
+#: admin/autofs/class_autofsManagement.inc:32
+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"
+msgstr ""
+
+#: config/autofs/class_autofsConfig.inc:45
+msgid "Branch in which automount info will be stored"
+msgstr ""
diff --git a/autofs/locale/en/fusiondirectory.po b/autofs/locale/en/fusiondirectory.po
index 2f84eb4c3e8d8da11d5c1da8db80b9fd3d573cfc..fe4769362dc6b301c59ed750e95d90b5b6e1d4fd 100644
--- a/autofs/locale/en/fusiondirectory.po
+++ b/autofs/locale/en/fusiondirectory.po
@@ -6,13 +6,13 @@
 #, fuzzy
 msgid ""
 msgstr ""
-"Project-Id-Version: PACKAGE VERSION\n"
-"Report-Msgid-Bugs-To: documentation@lists.fusiondirectory.org\n"
-"POT-Creation-Date: 2015-03-31 11:49+0200\n"
+"Project-Id-Version: FusionDirectory VERSION\n"
+"Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
+"POT-Creation-Date: 2015-05-30 15:30+0200\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
-"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
-"Language-Team: LANGUAGE <LL@li.org>\n"
-"Language: \n"
+"Last-Translator: FusionDirectory project <contact@fusiondirectory.org>\n"
+"Language-Team: English\n"
+"Language: en\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
diff --git a/autofs/locale/es/fusiondirectory.po b/autofs/locale/es/fusiondirectory.po
index 41230c4918380af4148dfcd79370ebbe64da7ab6..8d949c704b1871478354ae6225524a1bd08cb202 100644
--- a/autofs/locale/es/fusiondirectory.po
+++ b/autofs/locale/es/fusiondirectory.po
@@ -5,12 +5,12 @@
 # Translators:
 msgid ""
 msgstr ""
-"Project-Id-Version: FusionDirectory-108\n"
+"Project-Id-Version: FusionDirectory-109\n"
 "Report-Msgid-Bugs-To: documentation@lists.fusiondirectory.org\n"
-"POT-Creation-Date: 2015-03-19 21:45+0100\n"
-"PO-Revision-Date: 2015-02-25 16:03+0000\n"
+"POT-Creation-Date: 2014-12-15 17:47+0100\n"
+"PO-Revision-Date: 2015-02-25 16:04+0000\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>\n"
-"Language-Team: Spanish (http://www.transifex.com/projects/p/FusionDirectory-108/language/es/)\n"
+"Language-Team: Spanish (http://www.transifex.com/projects/p/FusionDirectory-109/language/es/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
diff --git a/autofs/locale/es_VE/fusiondirectory.po b/autofs/locale/es_VE/fusiondirectory.po
index 307222aa57db43705c9070f5994a7c83c64551d2..b50fff0aea5d90e685d88aed6355139526cf684f 100644
--- a/autofs/locale/es_VE/fusiondirectory.po
+++ b/autofs/locale/es_VE/fusiondirectory.po
@@ -5,12 +5,12 @@
 # Translators:
 msgid ""
 msgstr ""
-"Project-Id-Version: FusionDirectory-108\n"
+"Project-Id-Version: FusionDirectory-109\n"
 "Report-Msgid-Bugs-To: documentation@lists.fusiondirectory.org\n"
-"POT-Creation-Date: 2015-03-19 21:45+0100\n"
-"PO-Revision-Date: 2015-02-25 16:03+0000\n"
+"POT-Creation-Date: 2014-12-15 17:47+0100\n"
+"PO-Revision-Date: 2015-02-25 16:04+0000\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>\n"
-"Language-Team: Spanish (Venezuela) (http://www.transifex.com/projects/p/FusionDirectory-108/language/es_VE/)\n"
+"Language-Team: Spanish (Venezuela) (http://www.transifex.com/projects/p/FusionDirectory-109/language/es_VE/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
diff --git a/autofs/locale/fa_IR/fusiondirectory.po b/autofs/locale/fa_IR/fusiondirectory.po
index 64e734fe24046144d5a543f945218495a3b7e1f7..b9e89bb8c8405371e5f28d0c44f82aa6d40d3b28 100644
--- a/autofs/locale/fa_IR/fusiondirectory.po
+++ b/autofs/locale/fa_IR/fusiondirectory.po
@@ -5,12 +5,12 @@
 # Translators:
 msgid ""
 msgstr ""
-"Project-Id-Version: FusionDirectory-108\n"
+"Project-Id-Version: FusionDirectory-109\n"
 "Report-Msgid-Bugs-To: documentation@lists.fusiondirectory.org\n"
-"POT-Creation-Date: 2015-03-19 21:45+0100\n"
-"PO-Revision-Date: 2014-12-12 07:35+0000\n"
+"POT-Creation-Date: 2014-12-15 17:47+0100\n"
+"PO-Revision-Date: 2014-12-15 16:49+0000\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>\n"
-"Language-Team: Persian (Iran) (http://www.transifex.com/projects/p/FusionDirectory-108/language/fa_IR/)\n"
+"Language-Team: Persian (Iran) (http://www.transifex.com/projects/p/FusionDirectory-109/language/fa_IR/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
diff --git a/autofs/locale/fr/fusiondirectory.po b/autofs/locale/fr/fusiondirectory.po
index b76efb5726fbc4592fe1089a33c2891761b4e9a0..188c732c580ad7f1eec9a5653431491aaa5b47bf 100644
--- a/autofs/locale/fr/fusiondirectory.po
+++ b/autofs/locale/fr/fusiondirectory.po
@@ -3,18 +3,14 @@
 # This file is distributed under the same license as the PACKAGE package.
 # 
 # Translators:
-# MCMic, 2014
-# fusiondirectory <contact@fusiondirectory.org>, 2013
-# fusiondirectory <contact@fusiondirectory.org>, 2013
-# MCMic, 2014
 msgid ""
 msgstr ""
-"Project-Id-Version: FusionDirectory-108\n"
+"Project-Id-Version: FusionDirectory-109\n"
 "Report-Msgid-Bugs-To: documentation@lists.fusiondirectory.org\n"
-"POT-Creation-Date: 2015-03-19 21:45+0100\n"
-"PO-Revision-Date: 2015-02-25 16:03+0000\n"
-"Last-Translator: MCMic\n"
-"Language-Team: French (http://www.transifex.com/projects/p/FusionDirectory-108/language/fr/)\n"
+"POT-Creation-Date: 2014-12-15 17:47+0100\n"
+"PO-Revision-Date: 2015-02-25 16:04+0000\n"
+"Last-Translator: fusiondirectory <contact@fusiondirectory.org>\n"
+"Language-Team: French (http://www.transifex.com/projects/p/FusionDirectory-109/language/fr/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -42,7 +38,7 @@ msgstr "EntrÃ©e automount"
 msgid ""
 "The entry of this directory for the automount daemon.\n"
 " For instance 'auto.u' or '-fstype=nfs domaine.tld:/mount/directory'"
-msgstr "L'entrÃ©e de ce rÃ©pertoire pour le dÃ©mon automount.\nPar exemple Â«auto.uÂ» ou Â«-fstype=nfs domaine.tld mount/rÃ©pertoireÂ»"
+msgstr "L'entrÃ©e de ce rÃ©pertoire pour le dÃ©mon automount. âŽ\nPar exemple Â«auto.uÂ» ou Â«-fstype=nfs domaine.tld mount/rÃ©pertoire '"
 
 #: admin/autofs/class_nisObject.inc:61 admin/autofs/class_nisMap.inc:31
 #: admin/autofs/class_nisMap.inc:34 admin/autofs/class_nisMap.inc:49
@@ -63,7 +59,7 @@ msgstr "Nom du point de montage"
 
 #: admin/autofs/class_autofsManagement.inc:31
 msgid "Auto fs"
-msgstr "Auto fs"
+msgstr "Automount"
 
 #: admin/autofs/class_autofsManagement.inc:32
 msgid "Auto fs management"
@@ -71,11 +67,11 @@ msgstr "Gestion Autofs"
 
 #: config/autofs/class_autofsConfig.inc:28
 msgid "Autofs configuration"
-msgstr "Configuration Autofs"
+msgstr "Configuration Automount"
 
 #: config/autofs/class_autofsConfig.inc:29
 msgid "FusionDirectory autofs plugin configuration"
-msgstr "Configuration du plugin autofs"
+msgstr "Configuration du plugin automount"
 
 #: config/autofs/class_autofsConfig.inc:42
 msgid "AutoFS"
@@ -83,8 +79,8 @@ msgstr "AutoFS"
 
 #: config/autofs/class_autofsConfig.inc:45
 msgid "AutoFS RDN"
-msgstr "Branche Autofs"
+msgstr "RDN Automount"
 
 #: config/autofs/class_autofsConfig.inc:45
 msgid "Branch in which automount info will be stored"
-msgstr "Branche oÃ¹ seront stockÃ©es les informations automount"
+msgstr "Branche oÃ¹ seront stockÃ©s  les point de montage automount"
diff --git a/autofs/locale/id/fusiondirectory.po b/autofs/locale/id/fusiondirectory.po
index 29b40fe340539c47855e238b18f5c2ec9f750eb7..0a3be0d924ffa9542f943c0cb34652811ce33021 100644
--- a/autofs/locale/id/fusiondirectory.po
+++ b/autofs/locale/id/fusiondirectory.po
@@ -5,12 +5,12 @@
 # Translators:
 msgid ""
 msgstr ""
-"Project-Id-Version: FusionDirectory-108\n"
+"Project-Id-Version: FusionDirectory-109\n"
 "Report-Msgid-Bugs-To: documentation@lists.fusiondirectory.org\n"
-"POT-Creation-Date: 2015-03-19 21:45+0100\n"
-"PO-Revision-Date: 2014-12-12 07:35+0000\n"
+"POT-Creation-Date: 2014-12-15 17:47+0100\n"
+"PO-Revision-Date: 2014-12-15 16:49+0000\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>\n"
-"Language-Team: Indonesian (http://www.transifex.com/projects/p/FusionDirectory-108/language/id/)\n"
+"Language-Team: Indonesian (http://www.transifex.com/projects/p/FusionDirectory-109/language/id/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
diff --git a/autofs/locale/it/fusiondirectory.po b/autofs/locale/it/fusiondirectory.po
index 0a4e8a91b3f117597c9b2aa09c9a73ed08343d4f..133e1d706ce103bc2fc9e08307736ff714031c3c 100644
--- a/autofs/locale/it/fusiondirectory.po
+++ b/autofs/locale/it/fusiondirectory.po
@@ -3,16 +3,14 @@
 # This file is distributed under the same license as the PACKAGE package.
 # 
 # Translators:
-# poterealpopolo <giuliano@opensides.be>, 2013
-# poterealpopolo <giuliano@opensides.be>, 2013
 msgid ""
 msgstr ""
-"Project-Id-Version: FusionDirectory-108\n"
+"Project-Id-Version: FusionDirectory-109\n"
 "Report-Msgid-Bugs-To: documentation@lists.fusiondirectory.org\n"
-"POT-Creation-Date: 2015-03-19 21:45+0100\n"
-"PO-Revision-Date: 2015-02-25 16:03+0000\n"
+"POT-Creation-Date: 2014-12-15 17:47+0100\n"
+"PO-Revision-Date: 2015-02-25 16:04+0000\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>\n"
-"Language-Team: Italian (http://www.transifex.com/projects/p/FusionDirectory-108/language/it/)\n"
+"Language-Team: Italian (http://www.transifex.com/projects/p/FusionDirectory-109/language/it/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
diff --git a/autofs/locale/lv/fusiondirectory.po b/autofs/locale/lv/fusiondirectory.po
index c61fb6724b4aec72788bf0c6e6d72cb81f643bee..cba348a0b99229a217415f18ab6e16aee7dc7129 100644
--- a/autofs/locale/lv/fusiondirectory.po
+++ b/autofs/locale/lv/fusiondirectory.po
@@ -5,12 +5,12 @@
 # Translators:
 msgid ""
 msgstr ""
-"Project-Id-Version: FusionDirectory-108\n"
+"Project-Id-Version: FusionDirectory-109\n"
 "Report-Msgid-Bugs-To: documentation@lists.fusiondirectory.org\n"
-"POT-Creation-Date: 2015-03-19 21:45+0100\n"
-"PO-Revision-Date: 2014-12-12 07:35+0000\n"
+"POT-Creation-Date: 2014-12-15 17:47+0100\n"
+"PO-Revision-Date: 2014-12-15 16:49+0000\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>\n"
-"Language-Team: Latvian (http://www.transifex.com/projects/p/FusionDirectory-108/language/lv/)\n"
+"Language-Team: Latvian (http://www.transifex.com/projects/p/FusionDirectory-109/language/lv/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
diff --git a/autofs/locale/nb/fusiondirectory.po b/autofs/locale/nb/fusiondirectory.po
index 943ce6a7843c1343107bd7498757319bae696cb5..38475572b9ea9305d10d7956460e36faa0fed0e2 100644
--- a/autofs/locale/nb/fusiondirectory.po
+++ b/autofs/locale/nb/fusiondirectory.po
@@ -5,12 +5,12 @@
 # Translators:
 msgid ""
 msgstr ""
-"Project-Id-Version: FusionDirectory-108\n"
+"Project-Id-Version: FusionDirectory-109\n"
 "Report-Msgid-Bugs-To: documentation@lists.fusiondirectory.org\n"
-"POT-Creation-Date: 2015-03-19 21:45+0100\n"
-"PO-Revision-Date: 2015-02-25 16:03+0000\n"
+"POT-Creation-Date: 2014-12-15 17:47+0100\n"
+"PO-Revision-Date: 2015-02-25 16:04+0000\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>\n"
-"Language-Team: Norwegian BokmÃ¥l (http://www.transifex.com/projects/p/FusionDirectory-108/language/nb/)\n"
+"Language-Team: Norwegian BokmÃ¥l (http://www.transifex.com/projects/p/FusionDirectory-109/language/nb/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
diff --git a/autofs/locale/nl/fusiondirectory.po b/autofs/locale/nl/fusiondirectory.po
index 9f5a3c5299e4779385de18bcae397214ac3c8e2c..93b118e5704d1207d02f2e3c7c41361b8b7132a6 100644
--- a/autofs/locale/nl/fusiondirectory.po
+++ b/autofs/locale/nl/fusiondirectory.po
@@ -5,12 +5,12 @@
 # Translators:
 msgid ""
 msgstr ""
-"Project-Id-Version: FusionDirectory-108\n"
+"Project-Id-Version: FusionDirectory-109\n"
 "Report-Msgid-Bugs-To: documentation@lists.fusiondirectory.org\n"
-"POT-Creation-Date: 2015-03-19 21:45+0100\n"
-"PO-Revision-Date: 2015-02-25 16:03+0000\n"
+"POT-Creation-Date: 2014-12-15 17:47+0100\n"
+"PO-Revision-Date: 2015-02-25 16:04+0000\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>\n"
-"Language-Team: Dutch (http://www.transifex.com/projects/p/FusionDirectory-108/language/nl/)\n"
+"Language-Team: Dutch (http://www.transifex.com/projects/p/FusionDirectory-109/language/nl/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
diff --git a/autofs/locale/pl/fusiondirectory.po b/autofs/locale/pl/fusiondirectory.po
index 3105733f38d54c264103792bb49410276509d160..807707e82baaedbfdf46a996dc75e98332041545 100644
--- a/autofs/locale/pl/fusiondirectory.po
+++ b/autofs/locale/pl/fusiondirectory.po
@@ -5,12 +5,12 @@
 # Translators:
 msgid ""
 msgstr ""
-"Project-Id-Version: FusionDirectory-108\n"
+"Project-Id-Version: FusionDirectory-109\n"
 "Report-Msgid-Bugs-To: documentation@lists.fusiondirectory.org\n"
-"POT-Creation-Date: 2015-03-19 21:45+0100\n"
-"PO-Revision-Date: 2015-02-25 16:03+0000\n"
+"POT-Creation-Date: 2014-12-15 17:47+0100\n"
+"PO-Revision-Date: 2015-02-25 16:04+0000\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>\n"
-"Language-Team: Polish (http://www.transifex.com/projects/p/FusionDirectory-108/language/pl/)\n"
+"Language-Team: Polish (http://www.transifex.com/projects/p/FusionDirectory-109/language/pl/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
diff --git a/autofs/locale/pt/fusiondirectory.po b/autofs/locale/pt/fusiondirectory.po
index 63976fedc78111caafff0a4f081ce841f30d2e67..6d31612953fa6bff5b4570a2a91ad51d92c0d344 100644
--- a/autofs/locale/pt/fusiondirectory.po
+++ b/autofs/locale/pt/fusiondirectory.po
@@ -5,12 +5,12 @@
 # Translators:
 msgid ""
 msgstr ""
-"Project-Id-Version: FusionDirectory-108\n"
+"Project-Id-Version: FusionDirectory-109\n"
 "Report-Msgid-Bugs-To: documentation@lists.fusiondirectory.org\n"
-"POT-Creation-Date: 2015-03-19 21:45+0100\n"
-"PO-Revision-Date: 2015-02-25 16:03+0000\n"
+"POT-Creation-Date: 2014-12-15 17:47+0100\n"
+"PO-Revision-Date: 2015-02-25 16:04+0000\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>\n"
-"Language-Team: Portuguese (http://www.transifex.com/projects/p/FusionDirectory-108/language/pt/)\n"
+"Language-Team: Portuguese (http://www.transifex.com/projects/p/FusionDirectory-109/language/pt/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
diff --git a/autofs/locale/pt_BR/fusiondirectory.po b/autofs/locale/pt_BR/fusiondirectory.po
index 721ed3f6aea1d8af1f0fe8f697ed79c007ce3095..1b782cde5cfd04cf449e27c1146eb3879d2a40f6 100644
--- a/autofs/locale/pt_BR/fusiondirectory.po
+++ b/autofs/locale/pt_BR/fusiondirectory.po
@@ -5,12 +5,12 @@
 # Translators:
 msgid ""
 msgstr ""
-"Project-Id-Version: FusionDirectory-108\n"
+"Project-Id-Version: FusionDirectory-109\n"
 "Report-Msgid-Bugs-To: documentation@lists.fusiondirectory.org\n"
-"POT-Creation-Date: 2015-03-19 21:45+0100\n"
-"PO-Revision-Date: 2015-02-25 16:03+0000\n"
+"POT-Creation-Date: 2014-12-15 17:47+0100\n"
+"PO-Revision-Date: 2015-02-25 16:04+0000\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>\n"
-"Language-Team: Portuguese (Brazil) (http://www.transifex.com/projects/p/FusionDirectory-108/language/pt_BR/)\n"
+"Language-Team: Portuguese (Brazil) (http://www.transifex.com/projects/p/FusionDirectory-109/language/pt_BR/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
diff --git a/autofs/locale/ru/fusiondirectory.po b/autofs/locale/ru/fusiondirectory.po
index 10d1307235af2001c0951edcece729c79b5e98b8..f982be58d88788755b608f9cd1577519194de954 100644
--- a/autofs/locale/ru/fusiondirectory.po
+++ b/autofs/locale/ru/fusiondirectory.po
@@ -5,17 +5,17 @@
 # Translators:
 msgid ""
 msgstr ""
-"Project-Id-Version: FusionDirectory-108\n"
+"Project-Id-Version: FusionDirectory-109\n"
 "Report-Msgid-Bugs-To: documentation@lists.fusiondirectory.org\n"
-"POT-Creation-Date: 2015-03-19 21:45+0100\n"
-"PO-Revision-Date: 2015-02-25 16:03+0000\n"
+"POT-Creation-Date: 2014-12-15 17:47+0100\n"
+"PO-Revision-Date: 2015-04-07 13:01+0000\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>\n"
-"Language-Team: Russian (http://www.transifex.com/projects/p/FusionDirectory-108/language/ru/)\n"
+"Language-Team: Russian (http://www.transifex.com/projects/p/FusionDirectory-109/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=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);\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/autofs/class_nisObject.inc:31 admin/autofs/class_nisObject.inc:32
 #: admin/autofs/class_nisObject.inc:34 admin/autofs/class_nisObject.inc:49
@@ -28,7 +28,7 @@ msgstr "Ð¤Ð°Ð¼Ð¸Ð»Ð¸Ñ"
 
 #: admin/autofs/class_nisObject.inc:53
 msgid "Name of this directory"
-msgstr ""
+msgstr "ÐÐ°Ð·Ð²Ð°Ð½Ð¸Ðµ ÐºÐ°Ñ‚Ð°Ð»Ð¾Ð³Ð°"
 
 #: admin/autofs/class_nisObject.inc:57
 msgid "Automount entry"
@@ -43,7 +43,7 @@ msgstr ""
 #: admin/autofs/class_nisObject.inc:61 admin/autofs/class_nisMap.inc:31
 #: admin/autofs/class_nisMap.inc:34 admin/autofs/class_nisMap.inc:49
 msgid "Mount point"
-msgstr ""
+msgstr "Ð¢Ð¾Ñ‡ÐºÐ° Ð¼Ð¾Ð½Ñ‚Ð¸Ñ€Ð¾Ð²Ð°Ð½Ð¸Ñ"
 
 #: admin/autofs/class_nisObject.inc:61
 msgid "The mount point this directory will be placed in"
@@ -55,7 +55,7 @@ msgstr ""
 
 #: admin/autofs/class_nisMap.inc:53
 msgid "Name of the mount point"
-msgstr ""
+msgstr "ÐÐ°Ð·Ð²Ð°Ð½Ð¸Ðµ Ñ‚Ð¾Ñ‡ÐºÐ¸ Ð¼Ð¾Ð½Ñ‚Ð¸Ñ€Ð¾Ð²Ð°Ð½Ð¸Ñ"
 
 #: admin/autofs/class_autofsManagement.inc:31
 msgid "Auto fs"
@@ -67,11 +67,11 @@ msgstr ""
 
 #: config/autofs/class_autofsConfig.inc:28
 msgid "Autofs configuration"
-msgstr ""
+msgstr "ÐÐ°ÑÑ‚Ñ€Ð¾Ð¹ÐºÐ¸ autofs"
 
 #: config/autofs/class_autofsConfig.inc:29
 msgid "FusionDirectory autofs plugin configuration"
-msgstr ""
+msgstr "FusionDirectory Ð½Ð°ÑÑ‚Ñ€Ð¾Ð¹ÐºÐ° Ð¿Ð»Ð°Ð³Ð¸Ð½Ð° autofs"
 
 #: config/autofs/class_autofsConfig.inc:42
 msgid "AutoFS"
@@ -83,4 +83,4 @@ msgstr ""
 
 #: config/autofs/class_autofsConfig.inc:45
 msgid "Branch in which automount info will be stored"
-msgstr ""
+msgstr "Ð’ÐµÑ‚ÐºÐ°, Ð² ÐºÐ¾Ñ‚Ð¾Ñ€Ð¾Ð¹ Ð¸Ð½Ñ„Ð¾Ñ€Ð¼Ð°Ñ†Ð¸Ñ Ð¾Ð± automount Ð±ÑƒÐ´ÐµÑ‚ Ñ…Ñ€Ð°Ð½Ð¸Ñ‚ÑŒÑÑ"
diff --git a/autofs/locale/ru@petr1708/fusiondirectory.po b/autofs/locale/ru@petr1708/fusiondirectory.po
index 9372341765b63b45bf7b85d1c58c41183078782d..a27fc1573be54eae545f0127e27ed82679c2aadf 100644
--- a/autofs/locale/ru@petr1708/fusiondirectory.po
+++ b/autofs/locale/ru@petr1708/fusiondirectory.po
@@ -5,17 +5,17 @@
 # Translators:
 msgid ""
 msgstr ""
-"Project-Id-Version: FusionDirectory-108\n"
+"Project-Id-Version: FusionDirectory-109\n"
 "Report-Msgid-Bugs-To: documentation@lists.fusiondirectory.org\n"
-"POT-Creation-Date: 2015-03-19 21:45+0100\n"
-"PO-Revision-Date: 2014-12-12 07:35+0000\n"
+"POT-Creation-Date: 2014-12-15 17:47+0100\n"
+"PO-Revision-Date: 2014-12-15 16:49+0000\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>\n"
-"Language-Team: Russian Petrine orthography (http://www.transifex.com/projects/p/FusionDirectory-108/language/ru@petr1708/)\n"
+"Language-Team: Russian Petrine orthography (http://www.transifex.com/projects/p/FusionDirectory-109/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=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);\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/autofs/class_nisObject.inc:31 admin/autofs/class_nisObject.inc:32
 #: admin/autofs/class_nisObject.inc:34 admin/autofs/class_nisObject.inc:49
diff --git a/autofs/locale/sv/fusiondirectory.po b/autofs/locale/sv/fusiondirectory.po
index 1e0141a4d72ce28f970e40964cfe59f994ca743d..0475ca5e8c58f583f16e353141958eac7a8a5fec 100644
--- a/autofs/locale/sv/fusiondirectory.po
+++ b/autofs/locale/sv/fusiondirectory.po
@@ -3,15 +3,14 @@
 # This file is distributed under the same license as the PACKAGE package.
 # 
 # Translators:
-# Mathias Friman <mathias.friman@knorca.se>, 2014
 msgid ""
 msgstr ""
-"Project-Id-Version: FusionDirectory-108\n"
+"Project-Id-Version: FusionDirectory-109\n"
 "Report-Msgid-Bugs-To: documentation@lists.fusiondirectory.org\n"
-"POT-Creation-Date: 2015-03-19 21:45+0100\n"
-"PO-Revision-Date: 2015-02-25 16:03+0000\n"
+"POT-Creation-Date: 2014-12-15 17:47+0100\n"
+"PO-Revision-Date: 2015-02-25 16:04+0000\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>\n"
-"Language-Team: Swedish (http://www.transifex.com/projects/p/FusionDirectory-108/language/sv/)\n"
+"Language-Team: Swedish (http://www.transifex.com/projects/p/FusionDirectory-109/language/sv/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
diff --git a/autofs/locale/ug/fusiondirectory.po b/autofs/locale/ug/fusiondirectory.po
index ccbf5f20d4016df3b32bc2b0e53606e172e96892..8bc559096f4286f93726b4f5aff97e52d3b7ec49 100644
--- a/autofs/locale/ug/fusiondirectory.po
+++ b/autofs/locale/ug/fusiondirectory.po
@@ -5,12 +5,12 @@
 # Translators:
 msgid ""
 msgstr ""
-"Project-Id-Version: FusionDirectory-108\n"
+"Project-Id-Version: FusionDirectory-109\n"
 "Report-Msgid-Bugs-To: documentation@lists.fusiondirectory.org\n"
-"POT-Creation-Date: 2015-03-19 21:45+0100\n"
-"PO-Revision-Date: 2014-12-12 07:35+0000\n"
+"POT-Creation-Date: 2014-12-15 17:47+0100\n"
+"PO-Revision-Date: 2014-12-15 16:49+0000\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>\n"
-"Language-Team: Uighur (http://www.transifex.com/projects/p/FusionDirectory-108/language/ug/)\n"
+"Language-Team: Uighur (http://www.transifex.com/projects/p/FusionDirectory-109/language/ug/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
diff --git a/autofs/locale/vi_VN/fusiondirectory.po b/autofs/locale/vi_VN/fusiondirectory.po
index dfd787386e4fcd73fc913701ea69442e31ad23e8..2999783a1aa61fa97941c15e3397c2b4d08f6ed2 100644
--- a/autofs/locale/vi_VN/fusiondirectory.po
+++ b/autofs/locale/vi_VN/fusiondirectory.po
@@ -5,12 +5,12 @@
 # Translators:
 msgid ""
 msgstr ""
-"Project-Id-Version: FusionDirectory-108\n"
+"Project-Id-Version: FusionDirectory-109\n"
 "Report-Msgid-Bugs-To: documentation@lists.fusiondirectory.org\n"
-"POT-Creation-Date: 2015-03-19 21:45+0100\n"
-"PO-Revision-Date: 2015-02-25 16:03+0000\n"
+"POT-Creation-Date: 2014-12-15 17:47+0100\n"
+"PO-Revision-Date: 2015-02-25 16:04+0000\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>\n"
-"Language-Team: Vietnamese (Viet Nam) (http://www.transifex.com/projects/p/FusionDirectory-108/language/vi_VN/)\n"
+"Language-Team: Vietnamese (Viet Nam) (http://www.transifex.com/projects/p/FusionDirectory-109/language/vi_VN/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
diff --git a/autofs/locale/zh/fusiondirectory.po b/autofs/locale/zh/fusiondirectory.po
index b8f49a602acea7860227035f024a2429e3c8ecb8..1c1caf712acaebe45cc1d84a4e731a4a47d09e17 100644
--- a/autofs/locale/zh/fusiondirectory.po
+++ b/autofs/locale/zh/fusiondirectory.po
@@ -5,12 +5,12 @@
 # Translators:
 msgid ""
 msgstr ""
-"Project-Id-Version: FusionDirectory-108\n"
+"Project-Id-Version: FusionDirectory-109\n"
 "Report-Msgid-Bugs-To: documentation@lists.fusiondirectory.org\n"
-"POT-Creation-Date: 2015-03-19 21:45+0100\n"
-"PO-Revision-Date: 2015-02-25 16:03+0000\n"
+"POT-Creation-Date: 2014-12-15 17:47+0100\n"
+"PO-Revision-Date: 2015-02-25 16:04+0000\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>\n"
-"Language-Team: Chinese (http://www.transifex.com/projects/p/FusionDirectory-108/language/zh/)\n"
+"Language-Team: Chinese (http://www.transifex.com/projects/p/FusionDirectory-109/language/zh/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
diff --git a/certificates/locale/ar/fusiondirectory.po b/certificates/locale/ar/fusiondirectory.po
new file mode 100644
index 0000000000000000000000000000000000000000..42f5f1b97be7ec8b1c06d971f5139ac95f76cfa0
--- /dev/null
+++ b/certificates/locale/ar/fusiondirectory.po
@@ -0,0 +1,35 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR FusionDirectory Project
+# This file is distributed under the same license as the PACKAGE package.
+# 
+# Translators:
+msgid ""
+msgstr ""
+"Project-Id-Version: FusionDirectory-109\n"
+"Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
+"POT-Creation-Date: 2015-05-29 10:42+0200\n"
+"PO-Revision-Date: 2015-05-29 08:51+0000\n"
+"Last-Translator: FusionDirectory project <contact@fusiondirectory.org>\n"
+"Language-Team: Arabic (http://www.transifex.com/projects/p/FusionDirectory-109/language/ar/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: ar\n"
+"Plural-Forms: nplurals=6; plural=n==0 ? 0 : n==1 ? 1 : n==2 ? 2 : n%100>=3 && n%100<=10 ? 3 : n%100>=11 && n%100<=99 ? 4 : 5;\n"
+
+#: personal/certificates/class_userCertificates.inc:29
+msgid "Unknown format"
+msgstr ""
+
+#: personal/certificates/class_userCertificates.inc:60
+#: personal/certificates/class_userCertificates.inc:75
+msgid "Certificates"
+msgstr ""
+
+#: personal/certificates/class_userCertificates.inc:61
+msgid "User certificates"
+msgstr ""
+
+#: personal/certificates/class_userCertificates.inc:79
+msgid "Certificate content"
+msgstr ""
diff --git a/certificates/locale/ca/fusiondirectory.po b/certificates/locale/ca/fusiondirectory.po
new file mode 100644
index 0000000000000000000000000000000000000000..8c02d24620111569f218c924b56e16b4dceac894
--- /dev/null
+++ b/certificates/locale/ca/fusiondirectory.po
@@ -0,0 +1,35 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR FusionDirectory Project
+# This file is distributed under the same license as the PACKAGE package.
+# 
+# Translators:
+msgid ""
+msgstr ""
+"Project-Id-Version: FusionDirectory-109\n"
+"Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
+"POT-Creation-Date: 2015-05-29 10:42+0200\n"
+"PO-Revision-Date: 2015-05-29 08:51+0000\n"
+"Last-Translator: FusionDirectory project <contact@fusiondirectory.org>\n"
+"Language-Team: Catalan (http://www.transifex.com/projects/p/FusionDirectory-109/language/ca/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: ca\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
+
+#: personal/certificates/class_userCertificates.inc:29
+msgid "Unknown format"
+msgstr ""
+
+#: personal/certificates/class_userCertificates.inc:60
+#: personal/certificates/class_userCertificates.inc:75
+msgid "Certificates"
+msgstr "Certificats"
+
+#: personal/certificates/class_userCertificates.inc:61
+msgid "User certificates"
+msgstr "Certificats de l'usuari"
+
+#: personal/certificates/class_userCertificates.inc:79
+msgid "Certificate content"
+msgstr ""
diff --git a/certificates/locale/cs_CZ/fusiondirectory.po b/certificates/locale/cs_CZ/fusiondirectory.po
new file mode 100644
index 0000000000000000000000000000000000000000..762dd1d3b9172fb299608a2ccf59e1f3853c9b46
--- /dev/null
+++ b/certificates/locale/cs_CZ/fusiondirectory.po
@@ -0,0 +1,35 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR FusionDirectory Project
+# This file is distributed under the same license as the PACKAGE package.
+# 
+# Translators:
+msgid ""
+msgstr ""
+"Project-Id-Version: FusionDirectory-109\n"
+"Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
+"POT-Creation-Date: 2015-05-29 10:42+0200\n"
+"PO-Revision-Date: 2015-05-29 08:51+0000\n"
+"Last-Translator: FusionDirectory project <contact@fusiondirectory.org>\n"
+"Language-Team: Czech (Czech Republic) (http://www.transifex.com/projects/p/FusionDirectory-109/language/cs_CZ/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: cs_CZ\n"
+"Plural-Forms: nplurals=3; plural=(n==1) ? 0 : (n>=2 && n<=4) ? 1 : 2;\n"
+
+#: personal/certificates/class_userCertificates.inc:29
+msgid "Unknown format"
+msgstr ""
+
+#: personal/certificates/class_userCertificates.inc:60
+#: personal/certificates/class_userCertificates.inc:75
+msgid "Certificates"
+msgstr "CertifikÃ¡ty"
+
+#: personal/certificates/class_userCertificates.inc:61
+msgid "User certificates"
+msgstr "el. certifikÃ¡ty uÅ¾ivatele"
+
+#: personal/certificates/class_userCertificates.inc:79
+msgid "Certificate content"
+msgstr "Obsah certifikÃ¡tu"
diff --git a/certificates/locale/de/fusiondirectory.po b/certificates/locale/de/fusiondirectory.po
new file mode 100644
index 0000000000000000000000000000000000000000..0d49c444242a428417fa2d46b46da64da802ed55
--- /dev/null
+++ b/certificates/locale/de/fusiondirectory.po
@@ -0,0 +1,36 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR FusionDirectory Project
+# This file is distributed under the same license as the PACKAGE package.
+# 
+# Translators:
+# Ettore Atalan <atalanttore@googlemail.com>, 2015
+msgid ""
+msgstr ""
+"Project-Id-Version: FusionDirectory-109\n"
+"Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
+"POT-Creation-Date: 2015-05-29 10:42+0200\n"
+"PO-Revision-Date: 2015-05-29 17:40+0000\n"
+"Last-Translator: Ettore Atalan <atalanttore@googlemail.com>\n"
+"Language-Team: German (http://www.transifex.com/projects/p/FusionDirectory-109/language/de/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: de\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
+
+#: personal/certificates/class_userCertificates.inc:29
+msgid "Unknown format"
+msgstr "Unbekanntes Format"
+
+#: personal/certificates/class_userCertificates.inc:60
+#: personal/certificates/class_userCertificates.inc:75
+msgid "Certificates"
+msgstr "Zertifikate"
+
+#: personal/certificates/class_userCertificates.inc:61
+msgid "User certificates"
+msgstr "Benutzer-Zertifikate"
+
+#: personal/certificates/class_userCertificates.inc:79
+msgid "Certificate content"
+msgstr "Zertifikatsinhalt"
diff --git a/certificates/locale/el_GR/fusiondirectory.po b/certificates/locale/el_GR/fusiondirectory.po
new file mode 100644
index 0000000000000000000000000000000000000000..8a273167778bc4e0616f57d81e328709bd94554a
--- /dev/null
+++ b/certificates/locale/el_GR/fusiondirectory.po
@@ -0,0 +1,35 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR FusionDirectory Project
+# This file is distributed under the same license as the PACKAGE package.
+# 
+# Translators:
+msgid ""
+msgstr ""
+"Project-Id-Version: FusionDirectory-109\n"
+"Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
+"POT-Creation-Date: 2015-05-29 10:42+0200\n"
+"PO-Revision-Date: 2015-05-30 11:45+0000\n"
+"Last-Translator: Benoit Mortier <benoit.mortier@opensides.be>\n"
+"Language-Team: Greek (Greece) (http://www.transifex.com/projects/p/FusionDirectory-109/language/el_GR/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: el_GR\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
+
+#: personal/certificates/class_userCertificates.inc:29
+msgid "Unknown format"
+msgstr ""
+
+#: personal/certificates/class_userCertificates.inc:60
+#: personal/certificates/class_userCertificates.inc:75
+msgid "Certificates"
+msgstr ""
+
+#: personal/certificates/class_userCertificates.inc:61
+msgid "User certificates"
+msgstr ""
+
+#: personal/certificates/class_userCertificates.inc:79
+msgid "Certificate content"
+msgstr ""
diff --git a/certificates/locale/en/fusiondirectory.po b/certificates/locale/en/fusiondirectory.po
index 09ae8e8a6e4315163e067cbb70a148822d260cfc..971cb13abddc0b74f785aebd0d5de0ac058d3dc0 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: 2015-05-29 10:42+0200\n"
+"POT-Creation-Date: 2015-05-30 15:30+0200\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FusionDirectory project <contact@fusiondirectory.org>\n"
 "Language-Team: English\n"
diff --git a/certificates/locale/es/fusiondirectory.po b/certificates/locale/es/fusiondirectory.po
new file mode 100644
index 0000000000000000000000000000000000000000..2b81ba9892b338d7bf0e93dec712e12cdada2917
--- /dev/null
+++ b/certificates/locale/es/fusiondirectory.po
@@ -0,0 +1,35 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR FusionDirectory Project
+# This file is distributed under the same license as the PACKAGE package.
+# 
+# Translators:
+msgid ""
+msgstr ""
+"Project-Id-Version: FusionDirectory-109\n"
+"Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
+"POT-Creation-Date: 2015-05-29 10:42+0200\n"
+"PO-Revision-Date: 2015-05-29 08:51+0000\n"
+"Last-Translator: FusionDirectory project <contact@fusiondirectory.org>\n"
+"Language-Team: Spanish (http://www.transifex.com/projects/p/FusionDirectory-109/language/es/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: es\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
+
+#: personal/certificates/class_userCertificates.inc:29
+msgid "Unknown format"
+msgstr ""
+
+#: personal/certificates/class_userCertificates.inc:60
+#: personal/certificates/class_userCertificates.inc:75
+msgid "Certificates"
+msgstr "Certificados"
+
+#: personal/certificates/class_userCertificates.inc:61
+msgid "User certificates"
+msgstr "Certificados de usuario"
+
+#: personal/certificates/class_userCertificates.inc:79
+msgid "Certificate content"
+msgstr ""
diff --git a/certificates/locale/es_VE/fusiondirectory.po b/certificates/locale/es_VE/fusiondirectory.po
new file mode 100644
index 0000000000000000000000000000000000000000..3a10980b64d0cfcdc0562ceb86864f9b92e889e3
--- /dev/null
+++ b/certificates/locale/es_VE/fusiondirectory.po
@@ -0,0 +1,35 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR FusionDirectory Project
+# This file is distributed under the same license as the PACKAGE package.
+# 
+# Translators:
+msgid ""
+msgstr ""
+"Project-Id-Version: FusionDirectory-109\n"
+"Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
+"POT-Creation-Date: 2015-05-29 10:42+0200\n"
+"PO-Revision-Date: 2015-05-29 08:51+0000\n"
+"Last-Translator: FusionDirectory project <contact@fusiondirectory.org>\n"
+"Language-Team: Spanish (Venezuela) (http://www.transifex.com/projects/p/FusionDirectory-109/language/es_VE/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: es_VE\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
+
+#: personal/certificates/class_userCertificates.inc:29
+msgid "Unknown format"
+msgstr ""
+
+#: personal/certificates/class_userCertificates.inc:60
+#: personal/certificates/class_userCertificates.inc:75
+msgid "Certificates"
+msgstr "Certificados"
+
+#: personal/certificates/class_userCertificates.inc:61
+msgid "User certificates"
+msgstr "Certificados de usuario"
+
+#: personal/certificates/class_userCertificates.inc:79
+msgid "Certificate content"
+msgstr ""
diff --git a/certificates/locale/fa_IR/fusiondirectory.po b/certificates/locale/fa_IR/fusiondirectory.po
new file mode 100644
index 0000000000000000000000000000000000000000..b808106c0f5091805f36945ce3753e106d1e507d
--- /dev/null
+++ b/certificates/locale/fa_IR/fusiondirectory.po
@@ -0,0 +1,35 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR FusionDirectory Project
+# This file is distributed under the same license as the PACKAGE package.
+# 
+# Translators:
+msgid ""
+msgstr ""
+"Project-Id-Version: FusionDirectory-109\n"
+"Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
+"POT-Creation-Date: 2015-05-29 10:42+0200\n"
+"PO-Revision-Date: 2015-05-29 08:51+0000\n"
+"Last-Translator: FusionDirectory project <contact@fusiondirectory.org>\n"
+"Language-Team: Persian (Iran) (http://www.transifex.com/projects/p/FusionDirectory-109/language/fa_IR/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: fa_IR\n"
+"Plural-Forms: nplurals=1; plural=0;\n"
+
+#: personal/certificates/class_userCertificates.inc:29
+msgid "Unknown format"
+msgstr ""
+
+#: personal/certificates/class_userCertificates.inc:60
+#: personal/certificates/class_userCertificates.inc:75
+msgid "Certificates"
+msgstr ""
+
+#: personal/certificates/class_userCertificates.inc:61
+msgid "User certificates"
+msgstr ""
+
+#: personal/certificates/class_userCertificates.inc:79
+msgid "Certificate content"
+msgstr ""
diff --git a/certificates/locale/fr/fusiondirectory.po b/certificates/locale/fr/fusiondirectory.po
new file mode 100644
index 0000000000000000000000000000000000000000..6e60473ac0ae7c98a36c2a6e11a351ba2097e991
--- /dev/null
+++ b/certificates/locale/fr/fusiondirectory.po
@@ -0,0 +1,35 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR FusionDirectory Project
+# This file is distributed under the same license as the PACKAGE package.
+# 
+# Translators:
+msgid ""
+msgstr ""
+"Project-Id-Version: FusionDirectory-109\n"
+"Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
+"POT-Creation-Date: 2015-05-29 10:42+0200\n"
+"PO-Revision-Date: 2015-05-29 08:51+0000\n"
+"Last-Translator: FusionDirectory project <contact@fusiondirectory.org>\n"
+"Language-Team: French (http://www.transifex.com/projects/p/FusionDirectory-109/language/fr/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: fr\n"
+"Plural-Forms: nplurals=2; plural=(n > 1);\n"
+
+#: personal/certificates/class_userCertificates.inc:29
+msgid "Unknown format"
+msgstr "Format Inconnu"
+
+#: personal/certificates/class_userCertificates.inc:60
+#: personal/certificates/class_userCertificates.inc:75
+msgid "Certificates"
+msgstr "Certificats"
+
+#: personal/certificates/class_userCertificates.inc:61
+msgid "User certificates"
+msgstr "Certificats utilisateurs"
+
+#: personal/certificates/class_userCertificates.inc:79
+msgid "Certificate content"
+msgstr "Contenu du certificat"
diff --git a/certificates/locale/id/fusiondirectory.po b/certificates/locale/id/fusiondirectory.po
new file mode 100644
index 0000000000000000000000000000000000000000..0604dec1eb4513956e17757648234ed9fcaa77f8
--- /dev/null
+++ b/certificates/locale/id/fusiondirectory.po
@@ -0,0 +1,35 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR FusionDirectory Project
+# This file is distributed under the same license as the PACKAGE package.
+# 
+# Translators:
+msgid ""
+msgstr ""
+"Project-Id-Version: FusionDirectory-109\n"
+"Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
+"POT-Creation-Date: 2015-05-29 10:42+0200\n"
+"PO-Revision-Date: 2015-05-29 08:51+0000\n"
+"Last-Translator: FusionDirectory project <contact@fusiondirectory.org>\n"
+"Language-Team: Indonesian (http://www.transifex.com/projects/p/FusionDirectory-109/language/id/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: id\n"
+"Plural-Forms: nplurals=1; plural=0;\n"
+
+#: personal/certificates/class_userCertificates.inc:29
+msgid "Unknown format"
+msgstr ""
+
+#: personal/certificates/class_userCertificates.inc:60
+#: personal/certificates/class_userCertificates.inc:75
+msgid "Certificates"
+msgstr ""
+
+#: personal/certificates/class_userCertificates.inc:61
+msgid "User certificates"
+msgstr ""
+
+#: personal/certificates/class_userCertificates.inc:79
+msgid "Certificate content"
+msgstr ""
diff --git a/certificates/locale/it/fusiondirectory.po b/certificates/locale/it/fusiondirectory.po
new file mode 100644
index 0000000000000000000000000000000000000000..269748c092902cf260030b4a4161e529bd5919d3
--- /dev/null
+++ b/certificates/locale/it/fusiondirectory.po
@@ -0,0 +1,35 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR FusionDirectory Project
+# This file is distributed under the same license as the PACKAGE package.
+# 
+# Translators:
+msgid ""
+msgstr ""
+"Project-Id-Version: FusionDirectory-109\n"
+"Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
+"POT-Creation-Date: 2015-05-29 10:42+0200\n"
+"PO-Revision-Date: 2015-05-29 08:51+0000\n"
+"Last-Translator: FusionDirectory project <contact@fusiondirectory.org>\n"
+"Language-Team: Italian (http://www.transifex.com/projects/p/FusionDirectory-109/language/it/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: it\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
+
+#: personal/certificates/class_userCertificates.inc:29
+msgid "Unknown format"
+msgstr ""
+
+#: personal/certificates/class_userCertificates.inc:60
+#: personal/certificates/class_userCertificates.inc:75
+msgid "Certificates"
+msgstr "Certificati"
+
+#: personal/certificates/class_userCertificates.inc:61
+msgid "User certificates"
+msgstr "Certificati dell'utente"
+
+#: personal/certificates/class_userCertificates.inc:79
+msgid "Certificate content"
+msgstr ""
diff --git a/certificates/locale/lv/fusiondirectory.po b/certificates/locale/lv/fusiondirectory.po
new file mode 100644
index 0000000000000000000000000000000000000000..f4c8421996f34cf06254ec318f3d98c310fa9c64
--- /dev/null
+++ b/certificates/locale/lv/fusiondirectory.po
@@ -0,0 +1,35 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR FusionDirectory Project
+# This file is distributed under the same license as the PACKAGE package.
+# 
+# Translators:
+msgid ""
+msgstr ""
+"Project-Id-Version: FusionDirectory-109\n"
+"Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
+"POT-Creation-Date: 2015-05-29 10:42+0200\n"
+"PO-Revision-Date: 2015-05-29 08:51+0000\n"
+"Last-Translator: FusionDirectory project <contact@fusiondirectory.org>\n"
+"Language-Team: Latvian (http://www.transifex.com/projects/p/FusionDirectory-109/language/lv/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: lv\n"
+"Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n != 0 ? 1 : 2);\n"
+
+#: personal/certificates/class_userCertificates.inc:29
+msgid "Unknown format"
+msgstr ""
+
+#: personal/certificates/class_userCertificates.inc:60
+#: personal/certificates/class_userCertificates.inc:75
+msgid "Certificates"
+msgstr ""
+
+#: personal/certificates/class_userCertificates.inc:61
+msgid "User certificates"
+msgstr ""
+
+#: personal/certificates/class_userCertificates.inc:79
+msgid "Certificate content"
+msgstr ""
diff --git a/certificates/locale/nb/fusiondirectory.po b/certificates/locale/nb/fusiondirectory.po
new file mode 100644
index 0000000000000000000000000000000000000000..2cb58f457b4e60ab961ca79b3892d06bfd203c2f
--- /dev/null
+++ b/certificates/locale/nb/fusiondirectory.po
@@ -0,0 +1,35 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR FusionDirectory Project
+# This file is distributed under the same license as the PACKAGE package.
+# 
+# Translators:
+msgid ""
+msgstr ""
+"Project-Id-Version: FusionDirectory-109\n"
+"Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
+"POT-Creation-Date: 2015-05-29 10:42+0200\n"
+"PO-Revision-Date: 2015-05-29 08:51+0000\n"
+"Last-Translator: FusionDirectory project <contact@fusiondirectory.org>\n"
+"Language-Team: Norwegian BokmÃ¥l (http://www.transifex.com/projects/p/FusionDirectory-109/language/nb/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: nb\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
+
+#: personal/certificates/class_userCertificates.inc:29
+msgid "Unknown format"
+msgstr ""
+
+#: personal/certificates/class_userCertificates.inc:60
+#: personal/certificates/class_userCertificates.inc:75
+msgid "Certificates"
+msgstr ""
+
+#: personal/certificates/class_userCertificates.inc:61
+msgid "User certificates"
+msgstr ""
+
+#: personal/certificates/class_userCertificates.inc:79
+msgid "Certificate content"
+msgstr ""
diff --git a/certificates/locale/nl/fusiondirectory.po b/certificates/locale/nl/fusiondirectory.po
new file mode 100644
index 0000000000000000000000000000000000000000..bae6270380e93fcc3649bc2c437309eab386686f
--- /dev/null
+++ b/certificates/locale/nl/fusiondirectory.po
@@ -0,0 +1,35 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR FusionDirectory Project
+# This file is distributed under the same license as the PACKAGE package.
+# 
+# Translators:
+msgid ""
+msgstr ""
+"Project-Id-Version: FusionDirectory-109\n"
+"Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
+"POT-Creation-Date: 2015-05-29 10:42+0200\n"
+"PO-Revision-Date: 2015-05-29 08:51+0000\n"
+"Last-Translator: FusionDirectory project <contact@fusiondirectory.org>\n"
+"Language-Team: Dutch (http://www.transifex.com/projects/p/FusionDirectory-109/language/nl/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: nl\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
+
+#: personal/certificates/class_userCertificates.inc:29
+msgid "Unknown format"
+msgstr ""
+
+#: personal/certificates/class_userCertificates.inc:60
+#: personal/certificates/class_userCertificates.inc:75
+msgid "Certificates"
+msgstr "Certificaten"
+
+#: personal/certificates/class_userCertificates.inc:61
+msgid "User certificates"
+msgstr "Gebruikerscertificaten"
+
+#: personal/certificates/class_userCertificates.inc:79
+msgid "Certificate content"
+msgstr ""
diff --git a/certificates/locale/pl/fusiondirectory.po b/certificates/locale/pl/fusiondirectory.po
new file mode 100644
index 0000000000000000000000000000000000000000..3d557d06bd69a9ec5b5ca18d25232f4147d60a6a
--- /dev/null
+++ b/certificates/locale/pl/fusiondirectory.po
@@ -0,0 +1,35 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR FusionDirectory Project
+# This file is distributed under the same license as the PACKAGE package.
+# 
+# Translators:
+msgid ""
+msgstr ""
+"Project-Id-Version: FusionDirectory-109\n"
+"Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
+"POT-Creation-Date: 2015-05-29 10:42+0200\n"
+"PO-Revision-Date: 2015-05-29 08:51+0000\n"
+"Last-Translator: FusionDirectory project <contact@fusiondirectory.org>\n"
+"Language-Team: Polish (http://www.transifex.com/projects/p/FusionDirectory-109/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"
+
+#: personal/certificates/class_userCertificates.inc:29
+msgid "Unknown format"
+msgstr ""
+
+#: personal/certificates/class_userCertificates.inc:60
+#: personal/certificates/class_userCertificates.inc:75
+msgid "Certificates"
+msgstr "Certyfikaty"
+
+#: personal/certificates/class_userCertificates.inc:61
+msgid "User certificates"
+msgstr "Certyfikaty uÅ¼ytkownika"
+
+#: personal/certificates/class_userCertificates.inc:79
+msgid "Certificate content"
+msgstr ""
diff --git a/certificates/locale/pt/fusiondirectory.po b/certificates/locale/pt/fusiondirectory.po
new file mode 100644
index 0000000000000000000000000000000000000000..2152e268b55cc397e65f80d252e8338a39f6d834
--- /dev/null
+++ b/certificates/locale/pt/fusiondirectory.po
@@ -0,0 +1,35 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR FusionDirectory Project
+# This file is distributed under the same license as the PACKAGE package.
+# 
+# Translators:
+msgid ""
+msgstr ""
+"Project-Id-Version: FusionDirectory-109\n"
+"Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
+"POT-Creation-Date: 2015-05-29 10:42+0200\n"
+"PO-Revision-Date: 2015-05-29 08:51+0000\n"
+"Last-Translator: FusionDirectory project <contact@fusiondirectory.org>\n"
+"Language-Team: Portuguese (http://www.transifex.com/projects/p/FusionDirectory-109/language/pt/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: pt\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
+
+#: personal/certificates/class_userCertificates.inc:29
+msgid "Unknown format"
+msgstr ""
+
+#: personal/certificates/class_userCertificates.inc:60
+#: personal/certificates/class_userCertificates.inc:75
+msgid "Certificates"
+msgstr "Certificados"
+
+#: personal/certificates/class_userCertificates.inc:61
+msgid "User certificates"
+msgstr ""
+
+#: personal/certificates/class_userCertificates.inc:79
+msgid "Certificate content"
+msgstr ""
diff --git a/certificates/locale/pt_BR/fusiondirectory.po b/certificates/locale/pt_BR/fusiondirectory.po
new file mode 100644
index 0000000000000000000000000000000000000000..3f19d3ae70687deae27e574af824028b05e0b54f
--- /dev/null
+++ b/certificates/locale/pt_BR/fusiondirectory.po
@@ -0,0 +1,35 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR FusionDirectory Project
+# This file is distributed under the same license as the PACKAGE package.
+# 
+# Translators:
+msgid ""
+msgstr ""
+"Project-Id-Version: FusionDirectory-109\n"
+"Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
+"POT-Creation-Date: 2015-05-29 10:42+0200\n"
+"PO-Revision-Date: 2015-05-29 08:51+0000\n"
+"Last-Translator: FusionDirectory project <contact@fusiondirectory.org>\n"
+"Language-Team: Portuguese (Brazil) (http://www.transifex.com/projects/p/FusionDirectory-109/language/pt_BR/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: pt_BR\n"
+"Plural-Forms: nplurals=2; plural=(n > 1);\n"
+
+#: personal/certificates/class_userCertificates.inc:29
+msgid "Unknown format"
+msgstr ""
+
+#: personal/certificates/class_userCertificates.inc:60
+#: personal/certificates/class_userCertificates.inc:75
+msgid "Certificates"
+msgstr ""
+
+#: personal/certificates/class_userCertificates.inc:61
+msgid "User certificates"
+msgstr ""
+
+#: personal/certificates/class_userCertificates.inc:79
+msgid "Certificate content"
+msgstr ""
diff --git a/certificates/locale/ru/fusiondirectory.po b/certificates/locale/ru/fusiondirectory.po
new file mode 100644
index 0000000000000000000000000000000000000000..93e56d9ec256a722922cfc9cf84c12b906a131e3
--- /dev/null
+++ b/certificates/locale/ru/fusiondirectory.po
@@ -0,0 +1,35 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR FusionDirectory Project
+# This file is distributed under the same license as the PACKAGE package.
+# 
+# Translators:
+msgid ""
+msgstr ""
+"Project-Id-Version: FusionDirectory-109\n"
+"Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
+"POT-Creation-Date: 2015-05-29 10:42+0200\n"
+"PO-Revision-Date: 2015-05-29 08:51+0000\n"
+"Last-Translator: FusionDirectory project <contact@fusiondirectory.org>\n"
+"Language-Team: Russian (http://www.transifex.com/projects/p/FusionDirectory-109/language/ru/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: ru\n"
+"Plural-Forms: nplurals=4; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%10<=4 && (n%100<12 || n%100>14) ? 1 : n%10==0 || (n%10>=5 && n%10<=9) || (n%100>=11 && n%100<=14)? 2 : 3);\n"
+
+#: personal/certificates/class_userCertificates.inc:29
+msgid "Unknown format"
+msgstr ""
+
+#: personal/certificates/class_userCertificates.inc:60
+#: personal/certificates/class_userCertificates.inc:75
+msgid "Certificates"
+msgstr "Ð¡ÐµÑ€Ñ‚Ð¸Ñ„Ð¸ÐºÐ°Ñ‚Ñ‹"
+
+#: personal/certificates/class_userCertificates.inc:61
+msgid "User certificates"
+msgstr ""
+
+#: personal/certificates/class_userCertificates.inc:79
+msgid "Certificate content"
+msgstr ""
diff --git a/certificates/locale/ru@petr1708/fusiondirectory.po b/certificates/locale/ru@petr1708/fusiondirectory.po
new file mode 100644
index 0000000000000000000000000000000000000000..b3d2188b1fe42ccaef252964b9989b1acf81a855
--- /dev/null
+++ b/certificates/locale/ru@petr1708/fusiondirectory.po
@@ -0,0 +1,35 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR FusionDirectory Project
+# This file is distributed under the same license as the PACKAGE package.
+# 
+# Translators:
+msgid ""
+msgstr ""
+"Project-Id-Version: FusionDirectory-109\n"
+"Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
+"POT-Creation-Date: 2015-05-29 10:42+0200\n"
+"PO-Revision-Date: 2015-05-29 08:51+0000\n"
+"Last-Translator: FusionDirectory project <contact@fusiondirectory.org>\n"
+"Language-Team: Russian Petrine orthography (http://www.transifex.com/projects/p/FusionDirectory-109/language/ru@petr1708/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: ru@petr1708\n"
+"Plural-Forms: nplurals=4; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%10<=4 && (n%100<12 || n%100>14) ? 1 : n%10==0 || (n%10>=5 && n%10<=9) || (n%100>=11 && n%100<=14)? 2 : 3);\n"
+
+#: personal/certificates/class_userCertificates.inc:29
+msgid "Unknown format"
+msgstr ""
+
+#: personal/certificates/class_userCertificates.inc:60
+#: personal/certificates/class_userCertificates.inc:75
+msgid "Certificates"
+msgstr ""
+
+#: personal/certificates/class_userCertificates.inc:61
+msgid "User certificates"
+msgstr ""
+
+#: personal/certificates/class_userCertificates.inc:79
+msgid "Certificate content"
+msgstr ""
diff --git a/certificates/locale/sv/fusiondirectory.po b/certificates/locale/sv/fusiondirectory.po
new file mode 100644
index 0000000000000000000000000000000000000000..6d33db2a5f832b0f9a4b7ffbae293e7a5382c4ed
--- /dev/null
+++ b/certificates/locale/sv/fusiondirectory.po
@@ -0,0 +1,35 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR FusionDirectory Project
+# This file is distributed under the same license as the PACKAGE package.
+# 
+# Translators:
+msgid ""
+msgstr ""
+"Project-Id-Version: FusionDirectory-109\n"
+"Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
+"POT-Creation-Date: 2015-05-29 10:42+0200\n"
+"PO-Revision-Date: 2015-05-29 08:51+0000\n"
+"Last-Translator: FusionDirectory project <contact@fusiondirectory.org>\n"
+"Language-Team: Swedish (http://www.transifex.com/projects/p/FusionDirectory-109/language/sv/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: sv\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
+
+#: personal/certificates/class_userCertificates.inc:29
+msgid "Unknown format"
+msgstr ""
+
+#: personal/certificates/class_userCertificates.inc:60
+#: personal/certificates/class_userCertificates.inc:75
+msgid "Certificates"
+msgstr "Certifikat"
+
+#: personal/certificates/class_userCertificates.inc:61
+msgid "User certificates"
+msgstr ""
+
+#: personal/certificates/class_userCertificates.inc:79
+msgid "Certificate content"
+msgstr ""
diff --git a/certificates/locale/ug/fusiondirectory.po b/certificates/locale/ug/fusiondirectory.po
new file mode 100644
index 0000000000000000000000000000000000000000..e621bab546f3886a32d26b1bee3b8cd23c6222d4
--- /dev/null
+++ b/certificates/locale/ug/fusiondirectory.po
@@ -0,0 +1,35 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR FusionDirectory Project
+# This file is distributed under the same license as the PACKAGE package.
+# 
+# Translators:
+msgid ""
+msgstr ""
+"Project-Id-Version: FusionDirectory-109\n"
+"Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
+"POT-Creation-Date: 2015-05-29 10:42+0200\n"
+"PO-Revision-Date: 2015-05-29 08:51+0000\n"
+"Last-Translator: FusionDirectory project <contact@fusiondirectory.org>\n"
+"Language-Team: Uighur (http://www.transifex.com/projects/p/FusionDirectory-109/language/ug/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: ug\n"
+"Plural-Forms: nplurals=1; plural=0;\n"
+
+#: personal/certificates/class_userCertificates.inc:29
+msgid "Unknown format"
+msgstr ""
+
+#: personal/certificates/class_userCertificates.inc:60
+#: personal/certificates/class_userCertificates.inc:75
+msgid "Certificates"
+msgstr ""
+
+#: personal/certificates/class_userCertificates.inc:61
+msgid "User certificates"
+msgstr ""
+
+#: personal/certificates/class_userCertificates.inc:79
+msgid "Certificate content"
+msgstr ""
diff --git a/certificates/locale/vi_VN/fusiondirectory.po b/certificates/locale/vi_VN/fusiondirectory.po
new file mode 100644
index 0000000000000000000000000000000000000000..383db8aa07e95699c63048040c34aac2b903e69c
--- /dev/null
+++ b/certificates/locale/vi_VN/fusiondirectory.po
@@ -0,0 +1,35 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR FusionDirectory Project
+# This file is distributed under the same license as the PACKAGE package.
+# 
+# Translators:
+msgid ""
+msgstr ""
+"Project-Id-Version: FusionDirectory-109\n"
+"Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
+"POT-Creation-Date: 2015-05-29 10:42+0200\n"
+"PO-Revision-Date: 2015-05-29 08:51+0000\n"
+"Last-Translator: FusionDirectory project <contact@fusiondirectory.org>\n"
+"Language-Team: Vietnamese (Viet Nam) (http://www.transifex.com/projects/p/FusionDirectory-109/language/vi_VN/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: vi_VN\n"
+"Plural-Forms: nplurals=1; plural=0;\n"
+
+#: personal/certificates/class_userCertificates.inc:29
+msgid "Unknown format"
+msgstr ""
+
+#: personal/certificates/class_userCertificates.inc:60
+#: personal/certificates/class_userCertificates.inc:75
+msgid "Certificates"
+msgstr "CÃ¡c giáº¥y phÃ©p"
+
+#: personal/certificates/class_userCertificates.inc:61
+msgid "User certificates"
+msgstr ""
+
+#: personal/certificates/class_userCertificates.inc:79
+msgid "Certificate content"
+msgstr ""
diff --git a/certificates/locale/zh/fusiondirectory.po b/certificates/locale/zh/fusiondirectory.po
new file mode 100644
index 0000000000000000000000000000000000000000..04751f3144241db34a88952b41018b10b0bc4832
--- /dev/null
+++ b/certificates/locale/zh/fusiondirectory.po
@@ -0,0 +1,35 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR FusionDirectory Project
+# This file is distributed under the same license as the PACKAGE package.
+# 
+# Translators:
+msgid ""
+msgstr ""
+"Project-Id-Version: FusionDirectory-109\n"
+"Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
+"POT-Creation-Date: 2015-05-29 10:42+0200\n"
+"PO-Revision-Date: 2015-05-29 08:51+0000\n"
+"Last-Translator: FusionDirectory project <contact@fusiondirectory.org>\n"
+"Language-Team: Chinese (http://www.transifex.com/projects/p/FusionDirectory-109/language/zh/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: zh\n"
+"Plural-Forms: nplurals=1; plural=0;\n"
+
+#: personal/certificates/class_userCertificates.inc:29
+msgid "Unknown format"
+msgstr ""
+
+#: personal/certificates/class_userCertificates.inc:60
+#: personal/certificates/class_userCertificates.inc:75
+msgid "Certificates"
+msgstr "è¯ä¹¦"
+
+#: personal/certificates/class_userCertificates.inc:61
+msgid "User certificates"
+msgstr ""
+
+#: personal/certificates/class_userCertificates.inc:79
+msgid "Certificate content"
+msgstr ""
diff --git a/cyrus/locale/ar/fusiondirectory.po b/cyrus/locale/ar/fusiondirectory.po
index 3749a25ffb4721c3d042db97746ec92c13f19e20..fbf9435d1175eb3c981b3098a3618f318af77a5a 100644
--- a/cyrus/locale/ar/fusiondirectory.po
+++ b/cyrus/locale/ar/fusiondirectory.po
@@ -5,12 +5,12 @@
 # Translators:
 msgid ""
 msgstr ""
-"Project-Id-Version: FusionDirectory-108\n"
+"Project-Id-Version: FusionDirectory-109\n"
 "Report-Msgid-Bugs-To: documentation@lists.fusiondirectory.org\n"
-"POT-Creation-Date: 2015-03-19 21:45+0100\n"
-"PO-Revision-Date: 2014-08-28 10:49+0000\n"
-"Last-Translator: fusiondirectory <contact@fusiondirectory.org>\n"
-"Language-Team: Arabic (http://www.transifex.com/projects/p/FusionDirectory-108/language/ar/)\n"
+"POT-Creation-Date: 2014-12-15 17:47+0100\n"
+"PO-Revision-Date: 2014-08-28 10:27+0000\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: Arabic (http://www.transifex.com/projects/p/FusionDirectory-109/language/ar/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
diff --git a/cyrus/locale/ca/fusiondirectory.po b/cyrus/locale/ca/fusiondirectory.po
index 977f040c951656216d1fe8bd4870231fb61e9ade..2cfc7cb89a3d47f869027f0daffffb28a6e36fe9 100644
--- a/cyrus/locale/ca/fusiondirectory.po
+++ b/cyrus/locale/ca/fusiondirectory.po
@@ -5,12 +5,12 @@
 # Translators:
 msgid ""
 msgstr ""
-"Project-Id-Version: FusionDirectory-108\n"
+"Project-Id-Version: FusionDirectory-109\n"
 "Report-Msgid-Bugs-To: documentation@lists.fusiondirectory.org\n"
-"POT-Creation-Date: 2015-03-19 21:45+0100\n"
-"PO-Revision-Date: 2014-08-28 10:49+0000\n"
-"Last-Translator: fusiondirectory <contact@fusiondirectory.org>\n"
-"Language-Team: Catalan (http://www.transifex.com/projects/p/FusionDirectory-108/language/ca/)\n"
+"POT-Creation-Date: 2014-12-15 17:47+0100\n"
+"PO-Revision-Date: 2014-08-28 10:27+0000\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: Catalan (http://www.transifex.com/projects/p/FusionDirectory-109/language/ca/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
diff --git a/cyrus/locale/cs_CZ/fusiondirectory.po b/cyrus/locale/cs_CZ/fusiondirectory.po
index c2d80722a809e2e2427e19ddc0dba7be8a3b03f0..93be73812c99b8444cc586642e58173195ff0de4 100644
--- a/cyrus/locale/cs_CZ/fusiondirectory.po
+++ b/cyrus/locale/cs_CZ/fusiondirectory.po
@@ -3,14 +3,15 @@
 # This file is distributed under the same license as the PACKAGE package.
 # 
 # Translators:
+# Pavel Borecki <pavel.borecki@gmail.com>, 2014-2015
 msgid ""
 msgstr ""
-"Project-Id-Version: FusionDirectory-108\n"
+"Project-Id-Version: FusionDirectory-109\n"
 "Report-Msgid-Bugs-To: documentation@lists.fusiondirectory.org\n"
-"POT-Creation-Date: 2015-03-19 21:45+0100\n"
-"PO-Revision-Date: 2014-12-08 21:51+0000\n"
-"Last-Translator: fusiondirectory <contact@fusiondirectory.org>\n"
-"Language-Team: Czech (Czech Republic) (http://www.transifex.com/projects/p/FusionDirectory-108/language/cs_CZ/)\n"
+"POT-Creation-Date: 2014-12-15 17:47+0100\n"
+"PO-Revision-Date: 2015-04-04 14:22+0000\n"
+"Last-Translator: Pavel Borecki <pavel.borecki@gmail.com>\n"
+"Language-Team: Czech (Czech Republic) (http://www.transifex.com/projects/p/FusionDirectory-109/language/cs_CZ/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -24,7 +25,7 @@ msgstr ""
 
 #: admin/systems/services/cyrus/class_serviceCyrus.inc:34
 msgid "Services"
-msgstr "sluÅ¾by"
+msgstr "SluÅ¾by"
 
 #: admin/systems/services/cyrus/class_serviceCyrus.inc:57
 msgid "Cyrus settings"
@@ -32,7 +33,7 @@ msgstr "NastavenÃ Cyrus"
 
 #: admin/systems/services/cyrus/class_serviceCyrus.inc:60
 msgid "Connect URL for Cyrus server"
-msgstr ""
+msgstr "URL adresa pro pÅ™ipojenÃ k Cyrus serveru"
 
 #: admin/systems/services/cyrus/class_serviceCyrus.inc:63
 #: admin/systems/services/cyrus/class_serviceCyrus.inc:88
@@ -41,69 +42,69 @@ msgstr "NÃ¡zev poÄÃtaÄe"
 
 #: admin/systems/services/cyrus/class_serviceCyrus.inc:63
 msgid "Hostname of the Cyrus server"
-msgstr ""
+msgstr "NÃ¡zev poÄÃtaÄe s Cyrus serverem"
 
 #: admin/systems/services/cyrus/class_serviceCyrus.inc:64
 #: admin/systems/services/cyrus/class_serviceCyrus.inc:89
 msgid "Port"
-msgstr "port"
+msgstr "Port"
 
 #: admin/systems/services/cyrus/class_serviceCyrus.inc:64
 msgid "Port number on which Cyrus server should be contacted"
-msgstr ""
+msgstr "ÄŒÃslo portu, na kterÃ©m by mÄ›l bÃ½t kontaktovÃ¡n server Cyrus"
 
 #: admin/systems/services/cyrus/class_serviceCyrus.inc:65
 #: admin/systems/services/cyrus/class_serviceCyrus.inc:90
 msgid "Option"
-msgstr "volba"
+msgstr "PÅ™edvolba"
 
 #: admin/systems/services/cyrus/class_serviceCyrus.inc:65
 msgid "Options for contacting Cyrus server"
-msgstr ""
+msgstr "PÅ™edvolby pro kontaktovÃ¡nÃ Cyrus serveru"
 
 #: admin/systems/services/cyrus/class_serviceCyrus.inc:66
 msgid "Valide certificats"
-msgstr ""
+msgstr "OvÄ›Å™it certifikÃ¡ty"
 
 #: admin/systems/services/cyrus/class_serviceCyrus.inc:66
 msgid "Weither or not to validate server certificate on connexion"
-msgstr ""
+msgstr "Zda pÅ™i spojovÃ¡nÃ ovÄ›Å™ovat certifikÃ¡t serveru"
 
 #: admin/systems/services/cyrus/class_serviceCyrus.inc:72
 msgid "Admin user"
-msgstr "sprÃ¡vce"
+msgstr "SprÃ¡vce"
 
 #: admin/systems/services/cyrus/class_serviceCyrus.inc:72
 msgid "Imap server admin user"
-msgstr ""
+msgstr "ÃšÄet sprÃ¡vce IMAP serveru"
 
 #: admin/systems/services/cyrus/class_serviceCyrus.inc:76
 msgid "Password"
-msgstr "heslo"
+msgstr "Heslo"
 
 #: admin/systems/services/cyrus/class_serviceCyrus.inc:76
 msgid "Admin user password"
-msgstr ""
+msgstr "Heslo ÃºÄtu sprÃ¡vce"
 
 #: admin/systems/services/cyrus/class_serviceCyrus.inc:82
 msgid "Sieve settings"
-msgstr ""
+msgstr "NastavenÃ pro Sieve"
 
 #: admin/systems/services/cyrus/class_serviceCyrus.inc:85
 msgid "Sieve connect URL for Cyrus server"
-msgstr ""
+msgstr "SpojovacÃ URL adresa Sieve pro Cyrus server"
 
 #: admin/systems/services/cyrus/class_serviceCyrus.inc:88
 msgid "Hostname of the Cyrus sieve server"
-msgstr ""
+msgstr "NÃ¡zev stroje, na kterÃ©m je provozovÃ¡n server Cyrus sieve"
 
 #: admin/systems/services/cyrus/class_serviceCyrus.inc:89
 msgid "Port number on which Cyrus sieve server should be contacted"
-msgstr ""
+msgstr "ÄŒÃslo portu, na kterÃ©m by mÄ›l bÃ½t Cyrus sieve server kontaktovÃ¡n"
 
 #: admin/systems/services/cyrus/class_serviceCyrus.inc:90
 msgid "Options for contacting Cyrus sieve server"
-msgstr ""
+msgstr "PÅ™edvolby pro kontaktovÃ¡nÃ serveru Cyrus sieve"
 
 #: personal/mail/mail-methods/class_mail-methods-cyrus.inc:58
 msgid "There are no IMAP compatible mail servers defined!"
@@ -115,7 +116,7 @@ msgstr "PoÅ¡tovnÃ server pro tento ÃºÄet je neplatnÃ½!"
 
 #: personal/mail/mail-methods/class_mail-methods-cyrus.inc:251
 msgid "IMAP error"
-msgstr "chyba IMAPu"
+msgstr "Chyba IMAP"
 
 #: personal/mail/mail-methods/class_mail-methods-cyrus.inc:251
 #, php-format
diff --git a/cyrus/locale/de/fusiondirectory.po b/cyrus/locale/de/fusiondirectory.po
index c3d7d96c1bdac74a67ef6542d59d45bccefc5968..b9cac28e6743aea894209dc87b5e70f7bfd7dc56 100644
--- a/cyrus/locale/de/fusiondirectory.po
+++ b/cyrus/locale/de/fusiondirectory.po
@@ -3,15 +3,14 @@
 # This file is distributed under the same license as the PACKAGE package.
 # 
 # Translators:
-# Maik Wagner <maikwagner@yahoo.com>, 2013
 msgid ""
 msgstr ""
-"Project-Id-Version: FusionDirectory-108\n"
+"Project-Id-Version: FusionDirectory-109\n"
 "Report-Msgid-Bugs-To: documentation@lists.fusiondirectory.org\n"
-"POT-Creation-Date: 2015-03-19 21:45+0100\n"
-"PO-Revision-Date: 2014-08-28 10:49+0000\n"
-"Last-Translator: fusiondirectory <contact@fusiondirectory.org>\n"
-"Language-Team: German (http://www.transifex.com/projects/p/FusionDirectory-108/language/de/)\n"
+"POT-Creation-Date: 2014-12-15 17:47+0100\n"
+"PO-Revision-Date: 2014-08-28 10:27+0000\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: German (http://www.transifex.com/projects/p/FusionDirectory-109/language/de/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
diff --git a/cyrus/locale/el_GR/fusiondirectory.po b/cyrus/locale/el_GR/fusiondirectory.po
new file mode 100644
index 0000000000000000000000000000000000000000..66de81d239bdfaf531b6143d5225694aba67a90d
--- /dev/null
+++ b/cyrus/locale/el_GR/fusiondirectory.po
@@ -0,0 +1,154 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR FusionDirectory Project
+# This file is distributed under the same license as the PACKAGE package.
+# 
+# Translators:
+msgid ""
+msgstr ""
+"Project-Id-Version: FusionDirectory-109\n"
+"Report-Msgid-Bugs-To: documentation@lists.fusiondirectory.org\n"
+"POT-Creation-Date: 2014-12-15 17:47+0100\n"
+"PO-Revision-Date: 2015-05-30 11:45+0000\n"
+"Last-Translator: Benoit Mortier <benoit.mortier@opensides.be>\n"
+"Language-Team: Greek (Greece) (http://www.transifex.com/projects/p/FusionDirectory-109/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/services/cyrus/class_serviceCyrus.inc:33
+#: admin/systems/services/cyrus/class_serviceCyrus.inc:34
+msgid "Cyrus (IMAP/POP3)"
+msgstr ""
+
+#: admin/systems/services/cyrus/class_serviceCyrus.inc:34
+msgid "Services"
+msgstr ""
+
+#: admin/systems/services/cyrus/class_serviceCyrus.inc:57
+msgid "Cyrus settings"
+msgstr ""
+
+#: admin/systems/services/cyrus/class_serviceCyrus.inc:60
+msgid "Connect URL for Cyrus server"
+msgstr ""
+
+#: admin/systems/services/cyrus/class_serviceCyrus.inc:63
+#: admin/systems/services/cyrus/class_serviceCyrus.inc:88
+msgid "Hostname"
+msgstr ""
+
+#: admin/systems/services/cyrus/class_serviceCyrus.inc:63
+msgid "Hostname of the Cyrus server"
+msgstr ""
+
+#: admin/systems/services/cyrus/class_serviceCyrus.inc:64
+#: admin/systems/services/cyrus/class_serviceCyrus.inc:89
+msgid "Port"
+msgstr ""
+
+#: admin/systems/services/cyrus/class_serviceCyrus.inc:64
+msgid "Port number on which Cyrus server should be contacted"
+msgstr ""
+
+#: admin/systems/services/cyrus/class_serviceCyrus.inc:65
+#: admin/systems/services/cyrus/class_serviceCyrus.inc:90
+msgid "Option"
+msgstr ""
+
+#: admin/systems/services/cyrus/class_serviceCyrus.inc:65
+msgid "Options for contacting Cyrus server"
+msgstr ""
+
+#: admin/systems/services/cyrus/class_serviceCyrus.inc:66
+msgid "Valide certificats"
+msgstr ""
+
+#: admin/systems/services/cyrus/class_serviceCyrus.inc:66
+msgid "Weither or not to validate server certificate on connexion"
+msgstr ""
+
+#: admin/systems/services/cyrus/class_serviceCyrus.inc:72
+msgid "Admin user"
+msgstr ""
+
+#: admin/systems/services/cyrus/class_serviceCyrus.inc:72
+msgid "Imap server admin user"
+msgstr ""
+
+#: admin/systems/services/cyrus/class_serviceCyrus.inc:76
+msgid "Password"
+msgstr ""
+
+#: admin/systems/services/cyrus/class_serviceCyrus.inc:76
+msgid "Admin user password"
+msgstr ""
+
+#: admin/systems/services/cyrus/class_serviceCyrus.inc:82
+msgid "Sieve settings"
+msgstr ""
+
+#: admin/systems/services/cyrus/class_serviceCyrus.inc:85
+msgid "Sieve connect URL for Cyrus server"
+msgstr ""
+
+#: admin/systems/services/cyrus/class_serviceCyrus.inc:88
+msgid "Hostname of the Cyrus sieve server"
+msgstr ""
+
+#: admin/systems/services/cyrus/class_serviceCyrus.inc:89
+msgid "Port number on which Cyrus sieve server should be contacted"
+msgstr ""
+
+#: admin/systems/services/cyrus/class_serviceCyrus.inc:90
+msgid "Options for contacting Cyrus sieve server"
+msgstr ""
+
+#: personal/mail/mail-methods/class_mail-methods-cyrus.inc:58
+msgid "There are no IMAP compatible mail servers defined!"
+msgstr ""
+
+#: personal/mail/mail-methods/class_mail-methods-cyrus.inc:63
+msgid "Mail server for this account is invalid!"
+msgstr ""
+
+#: personal/mail/mail-methods/class_mail-methods-cyrus.inc:251
+msgid "IMAP error"
+msgstr ""
+
+#: personal/mail/mail-methods/class_mail-methods-cyrus.inc:251
+#, php-format
+msgid "Cannot modify IMAP mailbox quota: %s"
+msgstr ""
+
+#: personal/mail/mail-methods/class_mail-methods-cyrus.inc:326
+msgid "Mail info"
+msgstr ""
+
+#: personal/mail/mail-methods/class_mail-methods-cyrus.inc:327
+#, 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:419
+#: personal/mail/mail-methods/class_mail-methods-cyrus.inc:458
+msgid "The module imap_getacl is not implemented!"
+msgstr ""
+
+#: personal/mail/mail-methods/class_mail-methods-cyrus.inc:535
+#, php-format
+msgid "Cannot retrieve SIEVE script: %s"
+msgstr ""
+
+#: personal/mail/mail-methods/class_mail-methods-cyrus.inc:615
+#, php-format
+msgid "Cannot store SIEVE script: %s"
+msgstr ""
+
+#: personal/mail/mail-methods/class_mail-methods-cyrus.inc:622
+#, php-format
+msgid "Cannot activate SIEVE script: %s"
+msgstr ""
diff --git a/cyrus/locale/en/fusiondirectory.po b/cyrus/locale/en/fusiondirectory.po
index ecc3148ca3b2bb6f7a7b924936aa2809ef17341c..2765630b93e04dca92d40759cdb43a7f38e991e8 100644
--- a/cyrus/locale/en/fusiondirectory.po
+++ b/cyrus/locale/en/fusiondirectory.po
@@ -6,13 +6,13 @@
 #, fuzzy
 msgid ""
 msgstr ""
-"Project-Id-Version: PACKAGE VERSION\n"
-"Report-Msgid-Bugs-To: documentation@lists.fusiondirectory.org\n"
-"POT-Creation-Date: 2015-03-31 11:49+0200\n"
+"Project-Id-Version: FusionDirectory VERSION\n"
+"Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
+"POT-Creation-Date: 2015-05-30 15:30+0200\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
-"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
-"Language-Team: LANGUAGE <LL@li.org>\n"
-"Language: \n"
+"Last-Translator: FusionDirectory project <contact@fusiondirectory.org>\n"
+"Language-Team: English\n"
+"Language: en\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
diff --git a/cyrus/locale/es/fusiondirectory.po b/cyrus/locale/es/fusiondirectory.po
index cf0aa47ee41b8b82849f9cc0e059a24702c75230..2b58b4a826aee50ef95f54da6bf657d591897be1 100644
--- a/cyrus/locale/es/fusiondirectory.po
+++ b/cyrus/locale/es/fusiondirectory.po
@@ -5,12 +5,12 @@
 # Translators:
 msgid ""
 msgstr ""
-"Project-Id-Version: FusionDirectory-108\n"
+"Project-Id-Version: FusionDirectory-109\n"
 "Report-Msgid-Bugs-To: documentation@lists.fusiondirectory.org\n"
-"POT-Creation-Date: 2015-03-19 21:45+0100\n"
-"PO-Revision-Date: 2014-08-28 10:49+0000\n"
-"Last-Translator: fusiondirectory <contact@fusiondirectory.org>\n"
-"Language-Team: Spanish (http://www.transifex.com/projects/p/FusionDirectory-108/language/es/)\n"
+"POT-Creation-Date: 2014-12-15 17:47+0100\n"
+"PO-Revision-Date: 2014-08-28 10:27+0000\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: Spanish (http://www.transifex.com/projects/p/FusionDirectory-109/language/es/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
diff --git a/cyrus/locale/es_VE/fusiondirectory.po b/cyrus/locale/es_VE/fusiondirectory.po
index bbcb24203b7e51068016eebc7276351aaccd5926..0d3eede7963afb08db90c1811dd8b18a5635a0bc 100644
--- a/cyrus/locale/es_VE/fusiondirectory.po
+++ b/cyrus/locale/es_VE/fusiondirectory.po
@@ -5,12 +5,12 @@
 # Translators:
 msgid ""
 msgstr ""
-"Project-Id-Version: FusionDirectory-108\n"
+"Project-Id-Version: FusionDirectory-109\n"
 "Report-Msgid-Bugs-To: documentation@lists.fusiondirectory.org\n"
-"POT-Creation-Date: 2015-03-19 21:45+0100\n"
-"PO-Revision-Date: 2014-08-28 10:49+0000\n"
-"Last-Translator: fusiondirectory <contact@fusiondirectory.org>\n"
-"Language-Team: Spanish (Venezuela) (http://www.transifex.com/projects/p/FusionDirectory-108/language/es_VE/)\n"
+"POT-Creation-Date: 2014-12-15 17:47+0100\n"
+"PO-Revision-Date: 2014-08-28 10:27+0000\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: Spanish (Venezuela) (http://www.transifex.com/projects/p/FusionDirectory-109/language/es_VE/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
diff --git a/cyrus/locale/fa_IR/fusiondirectory.po b/cyrus/locale/fa_IR/fusiondirectory.po
index 5ca64571cf42e59b433df1abd0952d7808bc56bb..5df02c37b08e01ca6d5e5319aeb8cdbf27eb2ca1 100644
--- a/cyrus/locale/fa_IR/fusiondirectory.po
+++ b/cyrus/locale/fa_IR/fusiondirectory.po
@@ -5,12 +5,12 @@
 # Translators:
 msgid ""
 msgstr ""
-"Project-Id-Version: FusionDirectory-108\n"
+"Project-Id-Version: FusionDirectory-109\n"
 "Report-Msgid-Bugs-To: documentation@lists.fusiondirectory.org\n"
-"POT-Creation-Date: 2015-03-19 21:45+0100\n"
-"PO-Revision-Date: 2014-08-26 14:14+0000\n"
-"Last-Translator: fusiondirectory <contact@fusiondirectory.org>\n"
-"Language-Team: Persian (Iran) (http://www.transifex.com/projects/p/FusionDirectory-108/language/fa_IR/)\n"
+"POT-Creation-Date: 2014-12-15 17:47+0100\n"
+"PO-Revision-Date: 2014-08-28 10:27+0000\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: Persian (Iran) (http://www.transifex.com/projects/p/FusionDirectory-109/language/fa_IR/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
diff --git a/cyrus/locale/fr/fusiondirectory.po b/cyrus/locale/fr/fusiondirectory.po
index 4bf01857008c701d787c9c974f9128361bae3983..1ce44c4a9e5832cca06b592828cf541b4e4e6ef4 100644
--- a/cyrus/locale/fr/fusiondirectory.po
+++ b/cyrus/locale/fr/fusiondirectory.po
@@ -3,21 +3,14 @@
 # This file is distributed under the same license as the PACKAGE package.
 # 
 # Translators:
-# gallak <antoine.gallavardin@free.fr>, 2013
-# MCMic, 2014
-# fusiondirectory <contact@fusiondirectory.org>, 2013
-# fusiondirectory <contact@fusiondirectory.org>, 2012-2013
-# fusiondirectory <contact@fusiondirectory.org>, 2012
-# gallak <antoine.gallavardin@free.fr>, 2013
-# MCMic, 2014
 msgid ""
 msgstr ""
-"Project-Id-Version: FusionDirectory-108\n"
+"Project-Id-Version: FusionDirectory-109\n"
 "Report-Msgid-Bugs-To: documentation@lists.fusiondirectory.org\n"
-"POT-Creation-Date: 2015-03-19 21:45+0100\n"
+"POT-Creation-Date: 2014-12-15 17:47+0100\n"
 "PO-Revision-Date: 2014-12-16 11:31+0000\n"
-"Last-Translator: MCMic\n"
-"Language-Team: French (http://www.transifex.com/projects/p/FusionDirectory-108/language/fr/)\n"
+"Last-Translator: fusiondirectory <contact@fusiondirectory.org>\n"
+"Language-Team: French (http://www.transifex.com/projects/p/FusionDirectory-109/language/fr/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -31,7 +24,7 @@ msgstr "Cyrus (IMAP/POP3)"
 
 #: admin/systems/services/cyrus/class_serviceCyrus.inc:34
 msgid "Services"
-msgstr "Services"
+msgstr "Service"
 
 #: admin/systems/services/cyrus/class_serviceCyrus.inc:57
 msgid "Cyrus settings"
@@ -44,7 +37,7 @@ msgstr "URL de connexion au serveur Cyrus"
 #: admin/systems/services/cyrus/class_serviceCyrus.inc:63
 #: admin/systems/services/cyrus/class_serviceCyrus.inc:88
 msgid "Hostname"
-msgstr "Nom dâ€™hÃ´te"
+msgstr "Nom de l'hÃ´te"
 
 #: admin/systems/services/cyrus/class_serviceCyrus.inc:63
 msgid "Hostname of the Cyrus server"
@@ -74,7 +67,7 @@ msgstr "Valider les certificats"
 
 #: admin/systems/services/cyrus/class_serviceCyrus.inc:66
 msgid "Weither or not to validate server certificate on connexion"
-msgstr "Sâ€™il faut ou non valider le certificat du serveur Ã  la connexion"
+msgstr "Valider ou ne pas valider le certificat du serveur Ã  la connexion"
 
 #: admin/systems/services/cyrus/class_serviceCyrus.inc:72
 msgid "Admin user"
@@ -82,7 +75,7 @@ msgstr "Administrateur"
 
 #: admin/systems/services/cyrus/class_serviceCyrus.inc:72
 msgid "Imap server admin user"
-msgstr "Administrateur du serveur IMAP"
+msgstr "Administrateur du serveur Imap"
 
 #: admin/systems/services/cyrus/class_serviceCyrus.inc:76
 msgid "Password"
@@ -90,7 +83,7 @@ msgstr "Mot de passe"
 
 #: admin/systems/services/cyrus/class_serviceCyrus.inc:76
 msgid "Admin user password"
-msgstr "Mot de passe de lâ€™administrateur"
+msgstr "Mot de passe utilisateur Administrateur"
 
 #: admin/systems/services/cyrus/class_serviceCyrus.inc:82
 msgid "Sieve settings"
@@ -98,11 +91,11 @@ msgstr "ParamÃ¨tres Sieve"
 
 #: admin/systems/services/cyrus/class_serviceCyrus.inc:85
 msgid "Sieve connect URL for Cyrus server"
-msgstr "URL de connexion Sieve pour le serveur Cyrus"
+msgstr "URL de connexion pour le serveur Sieve de Cyrus"
 
 #: admin/systems/services/cyrus/class_serviceCyrus.inc:88
 msgid "Hostname of the Cyrus sieve server"
-msgstr "Nom d'hÃ´te du serveur Sieve Cyrus"
+msgstr "Nom d'hÃ´te du serveur sieve Cyrus"
 
 #: admin/systems/services/cyrus/class_serviceCyrus.inc:89
 msgid "Port number on which Cyrus sieve server should be contacted"
@@ -114,11 +107,11 @@ msgstr "Options pour contacter le serveur Sieve de Cyrus"
 
 #: personal/mail/mail-methods/class_mail-methods-cyrus.inc:58
 msgid "There are no IMAP compatible mail servers defined!"
-msgstr "Il n'y a aucun serveur IMAP compatible dÃ©finiâ€¯!"
+msgstr "Il n'y a aucun serveur IMAP compatibles dÃ©finis !"
 
 #: personal/mail/mail-methods/class_mail-methods-cyrus.inc:63
 msgid "Mail server for this account is invalid!"
-msgstr "Le serveur de messagerie pour ce compte est invalideâ€¯!"
+msgstr "Le serveur de messagerie pour ce compte est non valide !"
 
 #: personal/mail/mail-methods/class_mail-methods-cyrus.inc:251
 msgid "IMAP error"
@@ -127,7 +120,7 @@ msgstr "Erreur IMAP"
 #: personal/mail/mail-methods/class_mail-methods-cyrus.inc:251
 #, php-format
 msgid "Cannot modify IMAP mailbox quota: %s"
-msgstr "Impossible de modifier le quota de la boite IMAPâ€¯: %s"
+msgstr "Impossible de modifier le quota de la boite de messagerie IMAP. Le serveur rÃ©pond : %s"
 
 #: personal/mail/mail-methods/class_mail-methods-cyrus.inc:326
 msgid "Mail info"
@@ -138,17 +131,17 @@ msgstr "Informations de messagerie"
 msgid ""
 "LDAP entry has been removed but cyrus mailbox (%s) is kept.\n"
 "Please delete it manually!"
-msgstr "L'entrÃ©e LDAP Ã  Ã©tÃ© supprimÃ©e mais le compte de messagerie (%s) est toujours prÃ©sent dans cyrus.\nVeuillez le supprimer manuellementâ€¯!"
+msgstr "L'entrÃ©e LDAP Ã  Ã©tÃ© supprimÃ©e mais le compte de messagerie (%s) est toujours prÃ©sent dans cyrus.\nVeuillez l'effacer manuellement !"
 
 #: personal/mail/mail-methods/class_mail-methods-cyrus.inc:419
 #: personal/mail/mail-methods/class_mail-methods-cyrus.inc:458
 msgid "The module imap_getacl is not implemented!"
-msgstr "Le module imap_getacl n'est pas implÃ©mentÃ©â€¯!"
+msgstr "Le module imap_getacl n'est pas implÃ©mentÃ© !"
 
 #: personal/mail/mail-methods/class_mail-methods-cyrus.inc:535
 #, php-format
 msgid "Cannot retrieve SIEVE script: %s"
-msgstr "Impossible de rÃ©cupÃ©rer le script SIEVEâ€¯: %s"
+msgstr "Impossible de rÃ©cupÃ©rer le script SIEVE : %s"
 
 #: personal/mail/mail-methods/class_mail-methods-cyrus.inc:615
 #, php-format
@@ -158,4 +151,4 @@ msgstr "Impossible de stocker le script SIEVE : %s"
 #: personal/mail/mail-methods/class_mail-methods-cyrus.inc:622
 #, php-format
 msgid "Cannot activate SIEVE script: %s"
-msgstr "Impossible d'activer le script SIEVEâ€¯: %s"
+msgstr "Impossible d'activer le script SIEVE : %s"
diff --git a/cyrus/locale/id/fusiondirectory.po b/cyrus/locale/id/fusiondirectory.po
index 4da3df2c170463c0c6044083d3ae03f4e4696325..12994c9e5e5add47a45b8759f8ca4ad231f6c53f 100644
--- a/cyrus/locale/id/fusiondirectory.po
+++ b/cyrus/locale/id/fusiondirectory.po
@@ -5,12 +5,12 @@
 # Translators:
 msgid ""
 msgstr ""
-"Project-Id-Version: FusionDirectory-108\n"
+"Project-Id-Version: FusionDirectory-109\n"
 "Report-Msgid-Bugs-To: documentation@lists.fusiondirectory.org\n"
-"POT-Creation-Date: 2015-03-19 21:45+0100\n"
-"PO-Revision-Date: 2014-08-26 14:14+0000\n"
-"Last-Translator: fusiondirectory <contact@fusiondirectory.org>\n"
-"Language-Team: Indonesian (http://www.transifex.com/projects/p/FusionDirectory-108/language/id/)\n"
+"POT-Creation-Date: 2014-12-15 17:47+0100\n"
+"PO-Revision-Date: 2014-08-28 10:27+0000\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: Indonesian (http://www.transifex.com/projects/p/FusionDirectory-109/language/id/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
diff --git a/cyrus/locale/it/fusiondirectory.po b/cyrus/locale/it/fusiondirectory.po
index 19c912be8d084f32d7b8619f861b99167e972c06..8247f9c664e2c66ca725f04542385fb7cfc8448e 100644
--- a/cyrus/locale/it/fusiondirectory.po
+++ b/cyrus/locale/it/fusiondirectory.po
@@ -3,16 +3,14 @@
 # This file is distributed under the same license as the PACKAGE package.
 # 
 # Translators:
-# poterealpopolo <giuliano@opensides.be>, 2013
-# poterealpopolo <giuliano@opensides.be>, 2013
 msgid ""
 msgstr ""
-"Project-Id-Version: FusionDirectory-108\n"
+"Project-Id-Version: FusionDirectory-109\n"
 "Report-Msgid-Bugs-To: documentation@lists.fusiondirectory.org\n"
-"POT-Creation-Date: 2015-03-19 21:45+0100\n"
-"PO-Revision-Date: 2014-08-28 10:49+0000\n"
-"Last-Translator: fusiondirectory <contact@fusiondirectory.org>\n"
-"Language-Team: Italian (http://www.transifex.com/projects/p/FusionDirectory-108/language/it/)\n"
+"POT-Creation-Date: 2014-12-15 17:47+0100\n"
+"PO-Revision-Date: 2014-08-28 10:27+0000\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: Italian (http://www.transifex.com/projects/p/FusionDirectory-109/language/it/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -69,7 +67,7 @@ msgstr "Certificati validi"
 
 #: admin/systems/services/cyrus/class_serviceCyrus.inc:66
 msgid "Weither or not to validate server certificate on connexion"
-msgstr "Convalidare oppure no il certificato del server di connessione"
+msgstr "Convalidare oppure no il certificato del server alla connessione"
 
 #: admin/systems/services/cyrus/class_serviceCyrus.inc:72
 msgid "Admin user"
diff --git a/cyrus/locale/lv/fusiondirectory.po b/cyrus/locale/lv/fusiondirectory.po
index 045bcf289ce66fae78d0a2bc97c0ef7f60f19767..1a6b962bcb850b80efe93bb2ca9809427555dc57 100644
--- a/cyrus/locale/lv/fusiondirectory.po
+++ b/cyrus/locale/lv/fusiondirectory.po
@@ -5,12 +5,12 @@
 # Translators:
 msgid ""
 msgstr ""
-"Project-Id-Version: FusionDirectory-108\n"
+"Project-Id-Version: FusionDirectory-109\n"
 "Report-Msgid-Bugs-To: documentation@lists.fusiondirectory.org\n"
-"POT-Creation-Date: 2015-03-19 21:45+0100\n"
-"PO-Revision-Date: 2014-08-26 14:14+0000\n"
-"Last-Translator: fusiondirectory <contact@fusiondirectory.org>\n"
-"Language-Team: Latvian (http://www.transifex.com/projects/p/FusionDirectory-108/language/lv/)\n"
+"POT-Creation-Date: 2014-12-15 17:47+0100\n"
+"PO-Revision-Date: 2014-08-28 10:27+0000\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: Latvian (http://www.transifex.com/projects/p/FusionDirectory-109/language/lv/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
diff --git a/cyrus/locale/nb/fusiondirectory.po b/cyrus/locale/nb/fusiondirectory.po
index 65fa198b1a35ca076c5eb144e7b1dc135d56be61..82face74158abf6281dfed717329235617236159 100644
--- a/cyrus/locale/nb/fusiondirectory.po
+++ b/cyrus/locale/nb/fusiondirectory.po
@@ -5,12 +5,12 @@
 # Translators:
 msgid ""
 msgstr ""
-"Project-Id-Version: FusionDirectory-108\n"
+"Project-Id-Version: FusionDirectory-109\n"
 "Report-Msgid-Bugs-To: documentation@lists.fusiondirectory.org\n"
-"POT-Creation-Date: 2015-03-19 21:45+0100\n"
-"PO-Revision-Date: 2014-08-26 14:14+0000\n"
-"Last-Translator: fusiondirectory <contact@fusiondirectory.org>\n"
-"Language-Team: Norwegian BokmÃ¥l (http://www.transifex.com/projects/p/FusionDirectory-108/language/nb/)\n"
+"POT-Creation-Date: 2014-12-15 17:47+0100\n"
+"PO-Revision-Date: 2014-08-28 10:27+0000\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: Norwegian BokmÃ¥l (http://www.transifex.com/projects/p/FusionDirectory-109/language/nb/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
diff --git a/cyrus/locale/nl/fusiondirectory.po b/cyrus/locale/nl/fusiondirectory.po
index 35676c96b0cd9375d335f93667db48e1eb798599..331e43b7c38e017302c7d849a40e37ceae7fc31c 100644
--- a/cyrus/locale/nl/fusiondirectory.po
+++ b/cyrus/locale/nl/fusiondirectory.po
@@ -5,12 +5,12 @@
 # Translators:
 msgid ""
 msgstr ""
-"Project-Id-Version: FusionDirectory-108\n"
+"Project-Id-Version: FusionDirectory-109\n"
 "Report-Msgid-Bugs-To: documentation@lists.fusiondirectory.org\n"
-"POT-Creation-Date: 2015-03-19 21:45+0100\n"
-"PO-Revision-Date: 2014-08-28 10:49+0000\n"
-"Last-Translator: fusiondirectory <contact@fusiondirectory.org>\n"
-"Language-Team: Dutch (http://www.transifex.com/projects/p/FusionDirectory-108/language/nl/)\n"
+"POT-Creation-Date: 2014-12-15 17:47+0100\n"
+"PO-Revision-Date: 2014-08-28 10:27+0000\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: Dutch (http://www.transifex.com/projects/p/FusionDirectory-109/language/nl/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
diff --git a/cyrus/locale/pl/fusiondirectory.po b/cyrus/locale/pl/fusiondirectory.po
index 6d7390122d96e123ce2eea8c09a16aef389c04ce..91cb994974120f4b43acb6d1d350ddf7f5e03103 100644
--- a/cyrus/locale/pl/fusiondirectory.po
+++ b/cyrus/locale/pl/fusiondirectory.po
@@ -5,12 +5,12 @@
 # Translators:
 msgid ""
 msgstr ""
-"Project-Id-Version: FusionDirectory-108\n"
+"Project-Id-Version: FusionDirectory-109\n"
 "Report-Msgid-Bugs-To: documentation@lists.fusiondirectory.org\n"
-"POT-Creation-Date: 2015-03-19 21:45+0100\n"
-"PO-Revision-Date: 2014-08-28 10:49+0000\n"
-"Last-Translator: fusiondirectory <contact@fusiondirectory.org>\n"
-"Language-Team: Polish (http://www.transifex.com/projects/p/FusionDirectory-108/language/pl/)\n"
+"POT-Creation-Date: 2014-12-15 17:47+0100\n"
+"PO-Revision-Date: 2014-08-28 10:27+0000\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: Polish (http://www.transifex.com/projects/p/FusionDirectory-109/language/pl/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
diff --git a/cyrus/locale/pt/fusiondirectory.po b/cyrus/locale/pt/fusiondirectory.po
index fb825ea2ce14e5dd5bafacd6021b4b5e2b5e2e55..a5a5dc9de40636633513dda4de20cf199a60dc90 100644
--- a/cyrus/locale/pt/fusiondirectory.po
+++ b/cyrus/locale/pt/fusiondirectory.po
@@ -5,12 +5,12 @@
 # Translators:
 msgid ""
 msgstr ""
-"Project-Id-Version: FusionDirectory-108\n"
+"Project-Id-Version: FusionDirectory-109\n"
 "Report-Msgid-Bugs-To: documentation@lists.fusiondirectory.org\n"
-"POT-Creation-Date: 2015-03-19 21:45+0100\n"
-"PO-Revision-Date: 2014-08-28 10:49+0000\n"
-"Last-Translator: fusiondirectory <contact@fusiondirectory.org>\n"
-"Language-Team: Portuguese (http://www.transifex.com/projects/p/FusionDirectory-108/language/pt/)\n"
+"POT-Creation-Date: 2014-12-15 17:47+0100\n"
+"PO-Revision-Date: 2014-08-28 10:27+0000\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: Portuguese (http://www.transifex.com/projects/p/FusionDirectory-109/language/pt/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
diff --git a/cyrus/locale/pt_BR/fusiondirectory.po b/cyrus/locale/pt_BR/fusiondirectory.po
index a3a942c8c248fe0b410b6ae530aec2f093ae2020..c06f5a0513a71ee108a120cf96f827f3c91dc1ff 100644
--- a/cyrus/locale/pt_BR/fusiondirectory.po
+++ b/cyrus/locale/pt_BR/fusiondirectory.po
@@ -3,15 +3,14 @@
 # This file is distributed under the same license as the PACKAGE package.
 # 
 # Translators:
-# ALEJANDRO BARRIOS <alejandrobarrios@interlegis.leg.br>, 2014
 msgid ""
 msgstr ""
-"Project-Id-Version: FusionDirectory-108\n"
+"Project-Id-Version: FusionDirectory-109\n"
 "Report-Msgid-Bugs-To: documentation@lists.fusiondirectory.org\n"
-"POT-Creation-Date: 2015-03-19 21:45+0100\n"
-"PO-Revision-Date: 2014-09-03 13:01+0000\n"
-"Last-Translator: fusiondirectory <contact@fusiondirectory.org>\n"
-"Language-Team: Portuguese (Brazil) (http://www.transifex.com/projects/p/FusionDirectory-108/language/pt_BR/)\n"
+"POT-Creation-Date: 2014-12-15 17:47+0100\n"
+"PO-Revision-Date: 2014-08-28 10:27+0000\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: Portuguese (Brazil) (http://www.transifex.com/projects/p/FusionDirectory-109/language/pt_BR/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
diff --git a/cyrus/locale/ru/fusiondirectory.po b/cyrus/locale/ru/fusiondirectory.po
index 40a1d2449cbebcb768785349a791ed468bac1985..12d82c059d10d3717a99d55e9cb4479ddf90e8d3 100644
--- a/cyrus/locale/ru/fusiondirectory.po
+++ b/cyrus/locale/ru/fusiondirectory.po
@@ -5,17 +5,17 @@
 # Translators:
 msgid ""
 msgstr ""
-"Project-Id-Version: FusionDirectory-108\n"
+"Project-Id-Version: FusionDirectory-109\n"
 "Report-Msgid-Bugs-To: documentation@lists.fusiondirectory.org\n"
-"POT-Creation-Date: 2015-03-19 21:45+0100\n"
-"PO-Revision-Date: 2014-08-28 10:49+0000\n"
-"Last-Translator: fusiondirectory <contact@fusiondirectory.org>\n"
-"Language-Team: Russian (http://www.transifex.com/projects/p/FusionDirectory-108/language/ru/)\n"
+"POT-Creation-Date: 2014-12-15 17:47+0100\n"
+"PO-Revision-Date: 2014-08-28 10:27+0000\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: Russian (http://www.transifex.com/projects/p/FusionDirectory-109/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=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);\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/cyrus/class_serviceCyrus.inc:33
 #: admin/systems/services/cyrus/class_serviceCyrus.inc:34
@@ -55,7 +55,7 @@ msgstr ""
 #: admin/systems/services/cyrus/class_serviceCyrus.inc:65
 #: admin/systems/services/cyrus/class_serviceCyrus.inc:90
 msgid "Option"
-msgstr ""
+msgstr "ÐžÐ¿Ñ†Ð¸Ð¸"
 
 #: admin/systems/services/cyrus/class_serviceCyrus.inc:65
 msgid "Options for contacting Cyrus server"
diff --git a/cyrus/locale/ru@petr1708/fusiondirectory.po b/cyrus/locale/ru@petr1708/fusiondirectory.po
index d554f093f90d8455aabdaaa46a31ec3083dd5b03..d2f383c463dfdf0e73dd6a56b205cc8835b827f1 100644
--- a/cyrus/locale/ru@petr1708/fusiondirectory.po
+++ b/cyrus/locale/ru@petr1708/fusiondirectory.po
@@ -5,17 +5,17 @@
 # Translators:
 msgid ""
 msgstr ""
-"Project-Id-Version: FusionDirectory-108\n"
+"Project-Id-Version: FusionDirectory-109\n"
 "Report-Msgid-Bugs-To: documentation@lists.fusiondirectory.org\n"
-"POT-Creation-Date: 2015-03-19 21:45+0100\n"
-"PO-Revision-Date: 2014-08-26 14:14+0000\n"
-"Last-Translator: fusiondirectory <contact@fusiondirectory.org>\n"
-"Language-Team: Russian Petrine orthography (http://www.transifex.com/projects/p/FusionDirectory-108/language/ru@petr1708/)\n"
+"POT-Creation-Date: 2014-12-15 17:47+0100\n"
+"PO-Revision-Date: 2014-08-28 10:27+0000\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: Russian Petrine orthography (http://www.transifex.com/projects/p/FusionDirectory-109/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=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);\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/cyrus/class_serviceCyrus.inc:33
 #: admin/systems/services/cyrus/class_serviceCyrus.inc:34
diff --git a/cyrus/locale/sv/fusiondirectory.po b/cyrus/locale/sv/fusiondirectory.po
index 97390f5e3d96e3cd2227fbbd4ee873e3a06a8597..b7691920d8cae6231151832fcf41b921978a0805 100644
--- a/cyrus/locale/sv/fusiondirectory.po
+++ b/cyrus/locale/sv/fusiondirectory.po
@@ -5,12 +5,12 @@
 # Translators:
 msgid ""
 msgstr ""
-"Project-Id-Version: FusionDirectory-108\n"
+"Project-Id-Version: FusionDirectory-109\n"
 "Report-Msgid-Bugs-To: documentation@lists.fusiondirectory.org\n"
-"POT-Creation-Date: 2015-03-19 21:45+0100\n"
-"PO-Revision-Date: 2014-08-28 10:49+0000\n"
-"Last-Translator: fusiondirectory <contact@fusiondirectory.org>\n"
-"Language-Team: Swedish (http://www.transifex.com/projects/p/FusionDirectory-108/language/sv/)\n"
+"POT-Creation-Date: 2014-12-15 17:47+0100\n"
+"PO-Revision-Date: 2014-08-28 10:27+0000\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: Swedish (http://www.transifex.com/projects/p/FusionDirectory-109/language/sv/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
diff --git a/cyrus/locale/ug/fusiondirectory.po b/cyrus/locale/ug/fusiondirectory.po
index 1aba8bcff1c54d0ebd4af31a8dddc17c37cae60c..a21f445c136987c5075ba8d83dcfad0c443bd3ed 100644
--- a/cyrus/locale/ug/fusiondirectory.po
+++ b/cyrus/locale/ug/fusiondirectory.po
@@ -5,12 +5,12 @@
 # Translators:
 msgid ""
 msgstr ""
-"Project-Id-Version: FusionDirectory-108\n"
+"Project-Id-Version: FusionDirectory-109\n"
 "Report-Msgid-Bugs-To: documentation@lists.fusiondirectory.org\n"
-"POT-Creation-Date: 2015-03-19 21:45+0100\n"
-"PO-Revision-Date: 2014-08-26 14:14+0000\n"
-"Last-Translator: fusiondirectory <contact@fusiondirectory.org>\n"
-"Language-Team: Uighur (http://www.transifex.com/projects/p/FusionDirectory-108/language/ug/)\n"
+"POT-Creation-Date: 2014-12-15 17:47+0100\n"
+"PO-Revision-Date: 2014-08-28 10:27+0000\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: Uighur (http://www.transifex.com/projects/p/FusionDirectory-109/language/ug/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
diff --git a/cyrus/locale/vi_VN/fusiondirectory.po b/cyrus/locale/vi_VN/fusiondirectory.po
index c72650ea2bdfe412b47d533acd7588c9b1ec7fe9..5381c9ea87a6b805e69e329fa645b9685c8e01a1 100644
--- a/cyrus/locale/vi_VN/fusiondirectory.po
+++ b/cyrus/locale/vi_VN/fusiondirectory.po
@@ -5,12 +5,12 @@
 # Translators:
 msgid ""
 msgstr ""
-"Project-Id-Version: FusionDirectory-108\n"
+"Project-Id-Version: FusionDirectory-109\n"
 "Report-Msgid-Bugs-To: documentation@lists.fusiondirectory.org\n"
-"POT-Creation-Date: 2015-03-19 21:45+0100\n"
-"PO-Revision-Date: 2014-08-28 10:49+0000\n"
-"Last-Translator: fusiondirectory <contact@fusiondirectory.org>\n"
-"Language-Team: Vietnamese (Viet Nam) (http://www.transifex.com/projects/p/FusionDirectory-108/language/vi_VN/)\n"
+"POT-Creation-Date: 2014-12-15 17:47+0100\n"
+"PO-Revision-Date: 2014-08-28 10:27+0000\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: Vietnamese (Viet Nam) (http://www.transifex.com/projects/p/FusionDirectory-109/language/vi_VN/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
diff --git a/cyrus/locale/zh/fusiondirectory.po b/cyrus/locale/zh/fusiondirectory.po
index 688582bd1074b932dfe5b7bdb3a138370667cf70..813c1e70b28e71eb075c81f418caa53c3ff32c91 100644
--- a/cyrus/locale/zh/fusiondirectory.po
+++ b/cyrus/locale/zh/fusiondirectory.po
@@ -5,12 +5,12 @@
 # Translators:
 msgid ""
 msgstr ""
-"Project-Id-Version: FusionDirectory-108\n"
+"Project-Id-Version: FusionDirectory-109\n"
 "Report-Msgid-Bugs-To: documentation@lists.fusiondirectory.org\n"
-"POT-Creation-Date: 2015-03-19 21:45+0100\n"
-"PO-Revision-Date: 2014-08-28 10:49+0000\n"
-"Last-Translator: fusiondirectory <contact@fusiondirectory.org>\n"
-"Language-Team: Chinese (http://www.transifex.com/projects/p/FusionDirectory-108/language/zh/)\n"
+"POT-Creation-Date: 2014-12-15 17:47+0100\n"
+"PO-Revision-Date: 2014-08-28 10:27+0000\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: Chinese (http://www.transifex.com/projects/p/FusionDirectory-109/language/zh/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
diff --git a/debconf/locale/ar/fusiondirectory.po b/debconf/locale/ar/fusiondirectory.po
index 1dd599bb2c50e2a1c54f8331954ecbbea5c6e70b..b9f10619703287ef94bc9977e3f15ec0b89c2915 100644
--- a/debconf/locale/ar/fusiondirectory.po
+++ b/debconf/locale/ar/fusiondirectory.po
@@ -5,12 +5,12 @@
 # Translators:
 msgid ""
 msgstr ""
-"Project-Id-Version: FusionDirectory-108\n"
+"Project-Id-Version: FusionDirectory-109\n"
 "Report-Msgid-Bugs-To: documentation@lists.fusiondirectory.org\n"
-"POT-Creation-Date: 2015-03-19 21:45+0100\n"
-"PO-Revision-Date: 2015-02-25 16:02+0000\n"
+"POT-Creation-Date: 2014-12-15 17:47+0100\n"
+"PO-Revision-Date: 2015-02-25 16:04+0000\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>\n"
-"Language-Team: Arabic (http://www.transifex.com/projects/p/FusionDirectory-108/language/ar/)\n"
+"Language-Team: Arabic (http://www.transifex.com/projects/p/FusionDirectory-109/language/ar/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -68,7 +68,6 @@ msgstr ""
 
 #: admin/debconfProfile/class_debconfProfileGeneric.inc:181
 #: admin/debconfProfile/class_debconfProfileGeneric.inc:184
-#: admin/debconfProfile/debconfProfile-filter.tpl.c:5
 msgid "Name"
 msgstr "Ø§Ù„Ø¥Ø³Ù…"
 
@@ -131,7 +130,3 @@ msgstr ""
 #: admin/systems/debconf/class_debconfStartup.inc:112
 msgid "Debconf preseed startup"
 msgstr ""
-
-#: admin/debconfProfile/debconfProfile-filter.tpl.c:2
-msgid "Filter"
-msgstr ""
diff --git a/debconf/locale/ca/fusiondirectory.po b/debconf/locale/ca/fusiondirectory.po
index 3761ad1870d73a76b24409206bbbb008d716ab45..12c970fb4246f349a65333d3c66fea64f399d1b8 100644
--- a/debconf/locale/ca/fusiondirectory.po
+++ b/debconf/locale/ca/fusiondirectory.po
@@ -5,12 +5,12 @@
 # Translators:
 msgid ""
 msgstr ""
-"Project-Id-Version: FusionDirectory-108\n"
+"Project-Id-Version: FusionDirectory-109\n"
 "Report-Msgid-Bugs-To: documentation@lists.fusiondirectory.org\n"
-"POT-Creation-Date: 2015-03-19 21:45+0100\n"
-"PO-Revision-Date: 2015-02-25 16:02+0000\n"
+"POT-Creation-Date: 2014-12-15 17:47+0100\n"
+"PO-Revision-Date: 2015-02-25 16:04+0000\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>\n"
-"Language-Team: Catalan (http://www.transifex.com/projects/p/FusionDirectory-108/language/ca/)\n"
+"Language-Team: Catalan (http://www.transifex.com/projects/p/FusionDirectory-109/language/ca/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -68,7 +68,6 @@ msgstr ""
 
 #: admin/debconfProfile/class_debconfProfileGeneric.inc:181
 #: admin/debconfProfile/class_debconfProfileGeneric.inc:184
-#: admin/debconfProfile/debconfProfile-filter.tpl.c:5
 msgid "Name"
 msgstr "Nom"
 
@@ -131,7 +130,3 @@ msgstr ""
 #: admin/systems/debconf/class_debconfStartup.inc:112
 msgid "Debconf preseed startup"
 msgstr ""
-
-#: admin/debconfProfile/debconfProfile-filter.tpl.c:2
-msgid "Filter"
-msgstr ""
diff --git a/debconf/locale/cs_CZ/fusiondirectory.po b/debconf/locale/cs_CZ/fusiondirectory.po
index 7b051a2c568e5606f07c42ab005588753144f5db..3d790e028ab94f2825bd4ef5db8cf6a67e2c1e0f 100644
--- a/debconf/locale/cs_CZ/fusiondirectory.po
+++ b/debconf/locale/cs_CZ/fusiondirectory.po
@@ -3,14 +3,15 @@
 # This file is distributed under the same license as the PACKAGE package.
 # 
 # Translators:
+# Pavel Borecki <pavel.borecki@gmail.com>, 2014-2015
 msgid ""
 msgstr ""
-"Project-Id-Version: FusionDirectory-108\n"
+"Project-Id-Version: FusionDirectory-109\n"
 "Report-Msgid-Bugs-To: documentation@lists.fusiondirectory.org\n"
-"POT-Creation-Date: 2015-03-19 21:45+0100\n"
-"PO-Revision-Date: 2015-02-25 16:12+0000\n"
-"Last-Translator: fusiondirectory <contact@fusiondirectory.org>\n"
-"Language-Team: Czech (Czech Republic) (http://www.transifex.com/projects/p/FusionDirectory-108/language/cs_CZ/)\n"
+"POT-Creation-Date: 2014-12-15 17:47+0100\n"
+"PO-Revision-Date: 2015-04-04 09:01+0000\n"
+"Last-Translator: Pavel Borecki <pavel.borecki@gmail.com>\n"
+"Language-Team: Czech (Czech Republic) (http://www.transifex.com/projects/p/FusionDirectory-109/language/cs_CZ/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -24,12 +25,12 @@ msgstr ""
 
 #: admin/debconfProfile/class_debconfProfileManagement.inc:33
 msgid "Debconf profile management"
-msgstr ""
+msgstr "SprÃ¡va profilu Debconf"
 
 #: admin/debconfProfile/class_debconfProfileGeneric.inc:71
 #: admin/debconfProfile/class_debconfProfileGeneric.inc:84
 msgid "Error"
-msgstr "chyba"
+msgstr "Chyba"
 
 #: admin/debconfProfile/class_debconfProfileGeneric.inc:71
 msgid "There is no template for this profile"
@@ -38,15 +39,15 @@ msgstr "Pro tento profil neexistuje Å¡ablona"
 #: admin/debconfProfile/class_debconfProfileGeneric.inc:85
 #, php-format
 msgid "Can't find entry %s in LDAP for profile %s"
-msgstr ""
+msgstr "Nelze nalÃ©zt poloÅ¾ku %s v LDAP pro profil %s"
 
 #: admin/debconfProfile/class_debconfProfileGeneric.inc:134
 msgid "LDAP error"
-msgstr "chyba LDAPu"
+msgstr "Chyba LDAP"
 
 #: admin/debconfProfile/class_debconfProfileGeneric.inc:137
 msgid "LDIF error"
-msgstr ""
+msgstr "Chyba v LDIF"
 
 #: admin/debconfProfile/class_debconfProfileGeneric.inc:146
 #, php-format
@@ -55,30 +56,29 @@ msgid ""
 "<br/><i>debconf2ldif.pl -b ou=<b>name</b>,%s -k <b>filename</b> > "
 "template.ldif </i><br/>With <b>filename</b> the file name, and <b>name</b> "
 "the desired name for the template.<br/>"
-msgstr ""
+msgstr "Debconf soubor importujete spuÅ¡tÄ›nÃm nÃ¡sledujÃcÃho pÅ™Ãkazu : <br/><i>debconf2ldif.pl -b ou=<b>nazev</b>,%s -k <b>nazev_souboru</b> > sablona.ldif </i><br/>S nazvem souboru <b>nazev_souboru</b> a poÅ¾adovanÃ½m nÃ¡zvem Å¡ablony <b>nazev</b>.<br/>"
 
 #: admin/debconfProfile/class_debconfProfileGeneric.inc:162
 #: admin/debconfProfile/class_debconfProfileGeneric.inc:166
 msgid "Debconf profile"
-msgstr ""
+msgstr "Profil Debconf"
 
 #: admin/debconfProfile/class_debconfProfileGeneric.inc:163
 msgid "Debconf profile information"
-msgstr ""
+msgstr "Ãšdaje o sadÄ› nastavenÃ Debconf"
 
 #: admin/debconfProfile/class_debconfProfileGeneric.inc:181
 #: admin/debconfProfile/class_debconfProfileGeneric.inc:184
-#: admin/debconfProfile/debconfProfile-filter.tpl.c:5
 msgid "Name"
-msgstr "nÃ¡zev"
+msgstr "NÃ¡zev"
 
 #: admin/debconfProfile/class_debconfProfileGeneric.inc:183
 msgid "Import a debconf file"
-msgstr ""
+msgstr "Importovat soubor debconf"
 
 #: admin/debconfProfile/class_debconfProfileGeneric.inc:184
 msgid "Name of this debconf template"
-msgstr ""
+msgstr "NÃ¡zev tÃ©to Å¡ablony debconf"
 
 #: admin/debconfProfile/class_debconfProfileGeneric.inc:188
 msgid "Entries"
@@ -86,7 +86,7 @@ msgstr "PoloÅ¾ky"
 
 #: admin/debconfProfile/class_debconfProfileGeneric.inc:190
 msgid "Debconf template answers"
-msgstr ""
+msgstr "OdpovÄ›di Debconf Å¡ablony"
 
 #: admin/debconfProfile/class_debconfProfileGeneric.inc:205
 msgid "Import"
@@ -94,7 +94,7 @@ msgstr "import(ovat)"
 
 #: admin/systems/debconf/class_debconfStartup.inc:65
 msgid "Debconf settings"
-msgstr ""
+msgstr "NastavenÃ pro Debconf"
 
 #: admin/systems/debconf/class_debconfStartup.inc:68
 msgid "Profile"
@@ -102,15 +102,15 @@ msgstr "profil"
 
 #: admin/systems/debconf/class_debconfStartup.inc:68
 msgid "Debconf preseed profile to be used for installation"
-msgstr ""
+msgstr "Sada pÅ™ednastavenÃ Debconf, pouÅ¾itÃ¡ pro tuto instalaci"
 
 #: admin/systems/debconf/class_debconfStartup.inc:72
 msgid "Release"
-msgstr "vydÃ¡nÃ"
+msgstr "VydÃ¡nÃ"
 
 #: admin/systems/debconf/class_debconfStartup.inc:72
 msgid "Debian release to install"
-msgstr ""
+msgstr "VydÃ¡nÃ systÃ©mu Debian, kterÃ© mÃ¡ bÃ½t nainstalovÃ¡no"
 
 #: admin/systems/debconf/class_debconfStartup.inc:77
 msgid "Boot kernel"
@@ -126,12 +126,8 @@ msgstr "Parametry zavÃ¡dÄ›nÃ jÃ¡dra"
 
 #: admin/systems/debconf/class_debconfStartup.inc:81
 msgid "Linux kernel parameters to be ran"
-msgstr ""
+msgstr "Parametry jÃ¡dra Linux, se kterÃ½mi mÃ¡ bÃ½t spuÅ¡tÄ›no"
 
 #: admin/systems/debconf/class_debconfStartup.inc:112
 msgid "Debconf preseed startup"
-msgstr ""
-
-#: admin/debconfProfile/debconfProfile-filter.tpl.c:2
-msgid "Filter"
-msgstr "filtr"
+msgstr "SpuÅ¡tÄ›nÃ pÅ™ednastavenÃ Debconf"
diff --git a/debconf/locale/de/fusiondirectory.po b/debconf/locale/de/fusiondirectory.po
index 52261ae070ab7c8f4474fa5a8b1c9e30dfaa33b6..ecf80ab62c860a502079c532fc9451f6cfa6cfe4 100644
--- a/debconf/locale/de/fusiondirectory.po
+++ b/debconf/locale/de/fusiondirectory.po
@@ -3,15 +3,15 @@
 # This file is distributed under the same license as the PACKAGE package.
 # 
 # Translators:
-# Maik Wagner <maikwagner@yahoo.com>, 2014
+# Ettore Atalan <atalanttore@googlemail.com>, 2014
 msgid ""
 msgstr ""
-"Project-Id-Version: FusionDirectory-108\n"
+"Project-Id-Version: FusionDirectory-109\n"
 "Report-Msgid-Bugs-To: documentation@lists.fusiondirectory.org\n"
-"POT-Creation-Date: 2015-03-19 21:45+0100\n"
-"PO-Revision-Date: 2015-02-25 16:12+0000\n"
-"Last-Translator: fusiondirectory <contact@fusiondirectory.org>\n"
-"Language-Team: German (http://www.transifex.com/projects/p/FusionDirectory-108/language/de/)\n"
+"POT-Creation-Date: 2014-12-15 17:47+0100\n"
+"PO-Revision-Date: 2015-02-25 16:04+0000\n"
+"Last-Translator: Ettore Atalan <atalanttore@googlemail.com>\n"
+"Language-Team: German (http://www.transifex.com/projects/p/FusionDirectory-109/language/de/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -69,7 +69,6 @@ msgstr "Debconf-Profilinformation"
 
 #: admin/debconfProfile/class_debconfProfileGeneric.inc:181
 #: admin/debconfProfile/class_debconfProfileGeneric.inc:184
-#: admin/debconfProfile/debconfProfile-filter.tpl.c:5
 msgid "Name"
 msgstr "Name"
 
@@ -132,7 +131,3 @@ msgstr "Linux Kernel Parameter, die gestartet werden sollen"
 #: admin/systems/debconf/class_debconfStartup.inc:112
 msgid "Debconf preseed startup"
 msgstr "Debconf preseed startup"
-
-#: admin/debconfProfile/debconfProfile-filter.tpl.c:2
-msgid "Filter"
-msgstr "Filter"
diff --git a/debconf/locale/el_GR/fusiondirectory.po b/debconf/locale/el_GR/fusiondirectory.po
new file mode 100644
index 0000000000000000000000000000000000000000..7aa93d990840ece14d9b39bc46c5ce10ca0fd020
--- /dev/null
+++ b/debconf/locale/el_GR/fusiondirectory.po
@@ -0,0 +1,132 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR FusionDirectory Project
+# This file is distributed under the same license as the PACKAGE package.
+# 
+# Translators:
+msgid ""
+msgstr ""
+"Project-Id-Version: FusionDirectory-109\n"
+"Report-Msgid-Bugs-To: documentation@lists.fusiondirectory.org\n"
+"POT-Creation-Date: 2014-12-15 17:47+0100\n"
+"PO-Revision-Date: 2015-05-30 11:45+0000\n"
+"Last-Translator: Benoit Mortier <benoit.mortier@opensides.be>\n"
+"Language-Team: Greek (Greece) (http://www.transifex.com/projects/p/FusionDirectory-109/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/debconfProfile/class_debconfProfileManagement.inc:32
+#: admin/systems/debconf/class_debconfStartup.inc:111
+msgid "Debconf"
+msgstr ""
+
+#: admin/debconfProfile/class_debconfProfileManagement.inc:33
+msgid "Debconf profile management"
+msgstr ""
+
+#: admin/debconfProfile/class_debconfProfileGeneric.inc:71
+#: admin/debconfProfile/class_debconfProfileGeneric.inc:84
+msgid "Error"
+msgstr ""
+
+#: admin/debconfProfile/class_debconfProfileGeneric.inc:71
+msgid "There is no template for this profile"
+msgstr ""
+
+#: admin/debconfProfile/class_debconfProfileGeneric.inc:85
+#, php-format
+msgid "Can't find entry %s in LDAP for profile %s"
+msgstr ""
+
+#: admin/debconfProfile/class_debconfProfileGeneric.inc:134
+msgid "LDAP error"
+msgstr ""
+
+#: admin/debconfProfile/class_debconfProfileGeneric.inc:137
+msgid "LDIF error"
+msgstr ""
+
+#: admin/debconfProfile/class_debconfProfileGeneric.inc:146
+#, php-format
+msgid ""
+"In order to import a debconf file, please run the following command : "
+"<br/><i>debconf2ldif.pl -b ou=<b>name</b>,%s -k <b>filename</b> > "
+"template.ldif </i><br/>With <b>filename</b> the file name, and <b>name</b> "
+"the desired name for the template.<br/>"
+msgstr ""
+
+#: admin/debconfProfile/class_debconfProfileGeneric.inc:162
+#: admin/debconfProfile/class_debconfProfileGeneric.inc:166
+msgid "Debconf profile"
+msgstr ""
+
+#: admin/debconfProfile/class_debconfProfileGeneric.inc:163
+msgid "Debconf profile information"
+msgstr ""
+
+#: admin/debconfProfile/class_debconfProfileGeneric.inc:181
+#: admin/debconfProfile/class_debconfProfileGeneric.inc:184
+msgid "Name"
+msgstr ""
+
+#: admin/debconfProfile/class_debconfProfileGeneric.inc:183
+msgid "Import a debconf file"
+msgstr ""
+
+#: admin/debconfProfile/class_debconfProfileGeneric.inc:184
+msgid "Name of this debconf template"
+msgstr ""
+
+#: admin/debconfProfile/class_debconfProfileGeneric.inc:188
+msgid "Entries"
+msgstr ""
+
+#: admin/debconfProfile/class_debconfProfileGeneric.inc:190
+msgid "Debconf template answers"
+msgstr ""
+
+#: admin/debconfProfile/class_debconfProfileGeneric.inc:205
+msgid "Import"
+msgstr ""
+
+#: admin/systems/debconf/class_debconfStartup.inc:65
+msgid "Debconf settings"
+msgstr ""
+
+#: admin/systems/debconf/class_debconfStartup.inc:68
+msgid "Profile"
+msgstr ""
+
+#: admin/systems/debconf/class_debconfStartup.inc:68
+msgid "Debconf preseed profile to be used for installation"
+msgstr ""
+
+#: admin/systems/debconf/class_debconfStartup.inc:72
+msgid "Release"
+msgstr ""
+
+#: admin/systems/debconf/class_debconfStartup.inc:72
+msgid "Debian release to install"
+msgstr ""
+
+#: admin/systems/debconf/class_debconfStartup.inc:77
+msgid "Boot kernel"
+msgstr ""
+
+#: admin/systems/debconf/class_debconfStartup.inc:77
+msgid "Linux kernel to be installed and booted"
+msgstr ""
+
+#: admin/systems/debconf/class_debconfStartup.inc:81
+msgid "Boot kernel parameters"
+msgstr ""
+
+#: admin/systems/debconf/class_debconfStartup.inc:81
+msgid "Linux kernel parameters to be ran"
+msgstr ""
+
+#: admin/systems/debconf/class_debconfStartup.inc:112
+msgid "Debconf preseed startup"
+msgstr ""
diff --git a/debconf/locale/en/fusiondirectory.po b/debconf/locale/en/fusiondirectory.po
index adfc73cbe4c86bd70680c073e34b4c304bf16480..205d2d8b83bc7ef6c7122feca9e879b5dda42e34 100644
--- a/debconf/locale/en/fusiondirectory.po
+++ b/debconf/locale/en/fusiondirectory.po
@@ -6,13 +6,13 @@
 #, fuzzy
 msgid ""
 msgstr ""
-"Project-Id-Version: PACKAGE VERSION\n"
-"Report-Msgid-Bugs-To: documentation@lists.fusiondirectory.org\n"
-"POT-Creation-Date: 2015-03-31 11:49+0200\n"
+"Project-Id-Version: FusionDirectory VERSION\n"
+"Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
+"POT-Creation-Date: 2015-05-30 15:30+0200\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
-"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
-"Language-Team: LANGUAGE <LL@li.org>\n"
-"Language: \n"
+"Last-Translator: FusionDirectory project <contact@fusiondirectory.org>\n"
+"Language-Team: English\n"
+"Language: en\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
diff --git a/debconf/locale/es/fusiondirectory.po b/debconf/locale/es/fusiondirectory.po
index 79af611184f7336adcf34b31e4f8b2f2ec0a90eb..f268e49dd7250973d98f1541e8280a3988cf4a77 100644
--- a/debconf/locale/es/fusiondirectory.po
+++ b/debconf/locale/es/fusiondirectory.po
@@ -5,12 +5,12 @@
 # Translators:
 msgid ""
 msgstr ""
-"Project-Id-Version: FusionDirectory-108\n"
+"Project-Id-Version: FusionDirectory-109\n"
 "Report-Msgid-Bugs-To: documentation@lists.fusiondirectory.org\n"
-"POT-Creation-Date: 2015-03-19 21:45+0100\n"
-"PO-Revision-Date: 2015-02-25 16:12+0000\n"
+"POT-Creation-Date: 2014-12-15 17:47+0100\n"
+"PO-Revision-Date: 2015-02-25 16:04+0000\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>\n"
-"Language-Team: Spanish (http://www.transifex.com/projects/p/FusionDirectory-108/language/es/)\n"
+"Language-Team: Spanish (http://www.transifex.com/projects/p/FusionDirectory-109/language/es/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -42,7 +42,7 @@ msgstr ""
 
 #: admin/debconfProfile/class_debconfProfileGeneric.inc:134
 msgid "LDAP error"
-msgstr "Error de LDAP"
+msgstr "Error LDAP"
 
 #: admin/debconfProfile/class_debconfProfileGeneric.inc:137
 msgid "LDIF error"
@@ -68,7 +68,6 @@ msgstr ""
 
 #: admin/debconfProfile/class_debconfProfileGeneric.inc:181
 #: admin/debconfProfile/class_debconfProfileGeneric.inc:184
-#: admin/debconfProfile/debconfProfile-filter.tpl.c:5
 msgid "Name"
 msgstr "Nombre"
 
@@ -131,7 +130,3 @@ msgstr ""
 #: admin/systems/debconf/class_debconfStartup.inc:112
 msgid "Debconf preseed startup"
 msgstr ""
-
-#: admin/debconfProfile/debconfProfile-filter.tpl.c:2
-msgid "Filter"
-msgstr "Filtro"
diff --git a/debconf/locale/es_VE/fusiondirectory.po b/debconf/locale/es_VE/fusiondirectory.po
index 07f10e06778e6748c39211ca69ae2448af56f0d2..2d6589970973fba43c75bb703c302c718bbb0ddd 100644
--- a/debconf/locale/es_VE/fusiondirectory.po
+++ b/debconf/locale/es_VE/fusiondirectory.po
@@ -5,12 +5,12 @@
 # Translators:
 msgid ""
 msgstr ""
-"Project-Id-Version: FusionDirectory-108\n"
+"Project-Id-Version: FusionDirectory-109\n"
 "Report-Msgid-Bugs-To: documentation@lists.fusiondirectory.org\n"
-"POT-Creation-Date: 2015-03-19 21:45+0100\n"
-"PO-Revision-Date: 2015-02-25 16:12+0000\n"
+"POT-Creation-Date: 2014-12-15 17:47+0100\n"
+"PO-Revision-Date: 2015-02-25 16:04+0000\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>\n"
-"Language-Team: Spanish (Venezuela) (http://www.transifex.com/projects/p/FusionDirectory-108/language/es_VE/)\n"
+"Language-Team: Spanish (Venezuela) (http://www.transifex.com/projects/p/FusionDirectory-109/language/es_VE/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -68,7 +68,6 @@ msgstr ""
 
 #: admin/debconfProfile/class_debconfProfileGeneric.inc:181
 #: admin/debconfProfile/class_debconfProfileGeneric.inc:184
-#: admin/debconfProfile/debconfProfile-filter.tpl.c:5
 msgid "Name"
 msgstr "Nombre"
 
@@ -131,7 +130,3 @@ msgstr ""
 #: admin/systems/debconf/class_debconfStartup.inc:112
 msgid "Debconf preseed startup"
 msgstr ""
-
-#: admin/debconfProfile/debconfProfile-filter.tpl.c:2
-msgid "Filter"
-msgstr "Filtro"
diff --git a/debconf/locale/fa_IR/fusiondirectory.po b/debconf/locale/fa_IR/fusiondirectory.po
index 5fb67e4ab9e2774b1fb042830ae1b0552e02be0f..8a819f87615c81a6c050c0dc56b62cf261ffb43e 100644
--- a/debconf/locale/fa_IR/fusiondirectory.po
+++ b/debconf/locale/fa_IR/fusiondirectory.po
@@ -5,12 +5,12 @@
 # Translators:
 msgid ""
 msgstr ""
-"Project-Id-Version: FusionDirectory-108\n"
+"Project-Id-Version: FusionDirectory-109\n"
 "Report-Msgid-Bugs-To: documentation@lists.fusiondirectory.org\n"
-"POT-Creation-Date: 2015-03-19 21:45+0100\n"
-"PO-Revision-Date: 2015-02-25 15:43+0000\n"
+"POT-Creation-Date: 2014-12-15 17:47+0100\n"
+"PO-Revision-Date: 2014-12-15 16:50+0000\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>\n"
-"Language-Team: Persian (Iran) (http://www.transifex.com/projects/p/FusionDirectory-108/language/fa_IR/)\n"
+"Language-Team: Persian (Iran) (http://www.transifex.com/projects/p/FusionDirectory-109/language/fa_IR/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -68,7 +68,6 @@ msgstr ""
 
 #: admin/debconfProfile/class_debconfProfileGeneric.inc:181
 #: admin/debconfProfile/class_debconfProfileGeneric.inc:184
-#: admin/debconfProfile/debconfProfile-filter.tpl.c:5
 msgid "Name"
 msgstr ""
 
@@ -131,7 +130,3 @@ msgstr ""
 #: admin/systems/debconf/class_debconfStartup.inc:112
 msgid "Debconf preseed startup"
 msgstr ""
-
-#: admin/debconfProfile/debconfProfile-filter.tpl.c:2
-msgid "Filter"
-msgstr ""
diff --git a/debconf/locale/fr/fusiondirectory.po b/debconf/locale/fr/fusiondirectory.po
index 9a1a6dee8b2115d8abcc16b53ab7f91f27978252..94d779e903243f96f208cb2e220c3dc335e25134 100644
--- a/debconf/locale/fr/fusiondirectory.po
+++ b/debconf/locale/fr/fusiondirectory.po
@@ -3,20 +3,14 @@
 # This file is distributed under the same license as the PACKAGE package.
 # 
 # Translators:
-# gallak <antoine.gallavardin@free.fr>, 2013
-# MCMic, 2014
-# fusiondirectory <contact@fusiondirectory.org>, 2012
-# fusiondirectory <contact@fusiondirectory.org>, 2012
-# gallak <antoine.gallavardin@free.fr>, 2013
-# MCMic, 2014
 msgid ""
 msgstr ""
-"Project-Id-Version: FusionDirectory-108\n"
+"Project-Id-Version: FusionDirectory-109\n"
 "Report-Msgid-Bugs-To: documentation@lists.fusiondirectory.org\n"
-"POT-Creation-Date: 2015-03-19 21:45+0100\n"
-"PO-Revision-Date: 2015-02-25 16:12+0000\n"
+"POT-Creation-Date: 2014-12-15 17:47+0100\n"
+"PO-Revision-Date: 2015-02-25 16:04+0000\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>\n"
-"Language-Team: French (http://www.transifex.com/projects/p/FusionDirectory-108/language/fr/)\n"
+"Language-Team: French (http://www.transifex.com/projects/p/FusionDirectory-109/language/fr/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -44,7 +38,7 @@ msgstr "Il n'y a pas de modÃ¨le pour ce profil"
 #: admin/debconfProfile/class_debconfProfileGeneric.inc:85
 #, php-format
 msgid "Can't find entry %s in LDAP for profile %s"
-msgstr "Impossible de trouver l'entrÃ©e %s dans le LDAP pour le profil %s"
+msgstr "Impossible de trouver l'entrÃ©e %s dans l'annuaire pour le profil %s"
 
 #: admin/debconfProfile/class_debconfProfileGeneric.inc:134
 msgid "LDAP error"
@@ -61,7 +55,7 @@ msgid ""
 "<br/><i>debconf2ldif.pl -b ou=<b>name</b>,%s -k <b>filename</b> > "
 "template.ldif </i><br/>With <b>filename</b> the file name, and <b>name</b> "
 "the desired name for the template.<br/>"
-msgstr "Afin d'importer un fichier debconf, merci dâ€™exÃ©cuter la commande suivanteâ€¯: <br/><i>debconf2ldif.pl -b ou=<b>nom</b>,%s -k <b>nom_du_fichier</b> > template.ldif </i><br/>Avec <b>nom_du_fichier</b> le nom du fichier debconf, et <b>nom</b> le nom dÃ©sirÃ© pour le modÃ¨le.<br/>"
+msgstr "Afin d'importer un fichier \"debconf\", Merci d'executer la commande suivante: <br/><i>debconf2ldif.pl -b ou=<b>nom</b>,%s -k <b>nom du fichier</b> > template.ldif </i><br/>Avec <b>nom du fichier</b> le nom du fichier debconf, et <b>nom</b> le nom dÃ©sirÃ© pour le modÃ¨le.<br/>"
 
 #: admin/debconfProfile/class_debconfProfileGeneric.inc:162
 #: admin/debconfProfile/class_debconfProfileGeneric.inc:166
@@ -74,7 +68,6 @@ msgstr "Information du profil Debconf"
 
 #: admin/debconfProfile/class_debconfProfileGeneric.inc:181
 #: admin/debconfProfile/class_debconfProfileGeneric.inc:184
-#: admin/debconfProfile/debconfProfile-filter.tpl.c:5
 msgid "Name"
 msgstr "Nom"
 
@@ -92,7 +85,7 @@ msgstr "EntrÃ©es"
 
 #: admin/debconfProfile/class_debconfProfileGeneric.inc:190
 msgid "Debconf template answers"
-msgstr "RÃ©ponses du modÃ¨le Debconf"
+msgstr "RÃ©ponse du modÃ¨le Debconf"
 
 #: admin/debconfProfile/class_debconfProfileGeneric.inc:205
 msgid "Import"
@@ -108,7 +101,7 @@ msgstr "Profil"
 
 #: admin/systems/debconf/class_debconfStartup.inc:68
 msgid "Debconf preseed profile to be used for installation"
-msgstr "Profil Debconf preseed Ã  utiliser pour l'installation"
+msgstr "Profil Debconf du fichier preseed Ã  utiliser pour l'installation"
 
 #: admin/systems/debconf/class_debconfStartup.inc:72
 msgid "Release"
@@ -116,28 +109,24 @@ msgstr "Version"
 
 #: admin/systems/debconf/class_debconfStartup.inc:72
 msgid "Debian release to install"
-msgstr "Version de Debian Ã  installer"
+msgstr "Release Debian Ã  installer"
 
 #: admin/systems/debconf/class_debconfStartup.inc:77
 msgid "Boot kernel"
-msgstr "Noyau de dÃ©marrage"
+msgstr "Kernel utilisÃ© au dÃ©marrage"
 
 #: admin/systems/debconf/class_debconfStartup.inc:77
 msgid "Linux kernel to be installed and booted"
-msgstr "Noyau Linux Ã  installer et Ã  dÃ©marrer"
+msgstr "Kernel linux Ã  installer et Ã  demarrer"
 
 #: admin/systems/debconf/class_debconfStartup.inc:81
 msgid "Boot kernel parameters"
-msgstr "ParamÃ¨tres de dÃ©marrage du noyau"
+msgstr "ParamÃ¨tres de demarrage pour ce kernel"
 
 #: admin/systems/debconf/class_debconfStartup.inc:81
 msgid "Linux kernel parameters to be ran"
-msgstr "ParamÃ¨tres de dÃ©marrage Ã  passer au noyau Linux"
+msgstr "ParamÃ¨tres de dÃ©marrage pour ce kernel"
 
 #: admin/systems/debconf/class_debconfStartup.inc:112
 msgid "Debconf preseed startup"
-msgstr "DÃ©marrage par preseed Debconf"
-
-#: admin/debconfProfile/debconfProfile-filter.tpl.c:2
-msgid "Filter"
-msgstr "Filtre"
+msgstr "DÃ©marrage du preseed Debconf"
diff --git a/debconf/locale/id/fusiondirectory.po b/debconf/locale/id/fusiondirectory.po
index 8e18d6f4c04b4329ade647e4d5f83d01b4635fc6..2a86af6cca9b7670b293dc0517b9c184f72a99f3 100644
--- a/debconf/locale/id/fusiondirectory.po
+++ b/debconf/locale/id/fusiondirectory.po
@@ -5,12 +5,12 @@
 # Translators:
 msgid ""
 msgstr ""
-"Project-Id-Version: FusionDirectory-108\n"
+"Project-Id-Version: FusionDirectory-109\n"
 "Report-Msgid-Bugs-To: documentation@lists.fusiondirectory.org\n"
-"POT-Creation-Date: 2015-03-19 21:45+0100\n"
-"PO-Revision-Date: 2015-02-25 15:43+0000\n"
+"POT-Creation-Date: 2014-12-15 17:47+0100\n"
+"PO-Revision-Date: 2014-12-15 16:50+0000\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>\n"
-"Language-Team: Indonesian (http://www.transifex.com/projects/p/FusionDirectory-108/language/id/)\n"
+"Language-Team: Indonesian (http://www.transifex.com/projects/p/FusionDirectory-109/language/id/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -68,7 +68,6 @@ msgstr ""
 
 #: admin/debconfProfile/class_debconfProfileGeneric.inc:181
 #: admin/debconfProfile/class_debconfProfileGeneric.inc:184
-#: admin/debconfProfile/debconfProfile-filter.tpl.c:5
 msgid "Name"
 msgstr ""
 
@@ -131,7 +130,3 @@ msgstr ""
 #: admin/systems/debconf/class_debconfStartup.inc:112
 msgid "Debconf preseed startup"
 msgstr ""
-
-#: admin/debconfProfile/debconfProfile-filter.tpl.c:2
-msgid "Filter"
-msgstr ""
diff --git a/debconf/locale/it/fusiondirectory.po b/debconf/locale/it/fusiondirectory.po
index f83bb15f166012342dde3eeb19ed18ae5d3d9c04..95a5fc9a52696d3c117b5c1452cc15af987b5fec 100644
--- a/debconf/locale/it/fusiondirectory.po
+++ b/debconf/locale/it/fusiondirectory.po
@@ -3,16 +3,14 @@
 # This file is distributed under the same license as the PACKAGE package.
 # 
 # Translators:
-# poterealpopolo <giuliano@opensides.be>, 2013
-# poterealpopolo <giuliano@opensides.be>, 2013
 msgid ""
 msgstr ""
-"Project-Id-Version: FusionDirectory-108\n"
+"Project-Id-Version: FusionDirectory-109\n"
 "Report-Msgid-Bugs-To: documentation@lists.fusiondirectory.org\n"
-"POT-Creation-Date: 2015-03-19 21:45+0100\n"
-"PO-Revision-Date: 2015-02-25 16:12+0000\n"
+"POT-Creation-Date: 2014-12-15 17:47+0100\n"
+"PO-Revision-Date: 2015-02-25 16:04+0000\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>\n"
-"Language-Team: Italian (http://www.transifex.com/projects/p/FusionDirectory-108/language/it/)\n"
+"Language-Team: Italian (http://www.transifex.com/projects/p/FusionDirectory-109/language/it/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -70,7 +68,6 @@ msgstr ""
 
 #: admin/debconfProfile/class_debconfProfileGeneric.inc:181
 #: admin/debconfProfile/class_debconfProfileGeneric.inc:184
-#: admin/debconfProfile/debconfProfile-filter.tpl.c:5
 msgid "Name"
 msgstr "Nome"
 
@@ -133,7 +130,3 @@ msgstr "Parametri del kernel d'avvio da eseguire"
 #: admin/systems/debconf/class_debconfStartup.inc:112
 msgid "Debconf preseed startup"
 msgstr "Avvio Debconf preconfigurato"
-
-#: admin/debconfProfile/debconfProfile-filter.tpl.c:2
-msgid "Filter"
-msgstr "Filtro"
diff --git a/debconf/locale/lv/fusiondirectory.po b/debconf/locale/lv/fusiondirectory.po
index ad3c661f67c96b7b8503c82a91c1f6234c2f086a..e2fd54136f9e9d416658e0350d44f2c011ab485a 100644
--- a/debconf/locale/lv/fusiondirectory.po
+++ b/debconf/locale/lv/fusiondirectory.po
@@ -5,12 +5,12 @@
 # Translators:
 msgid ""
 msgstr ""
-"Project-Id-Version: FusionDirectory-108\n"
+"Project-Id-Version: FusionDirectory-109\n"
 "Report-Msgid-Bugs-To: documentation@lists.fusiondirectory.org\n"
-"POT-Creation-Date: 2015-03-19 21:45+0100\n"
-"PO-Revision-Date: 2015-02-25 15:43+0000\n"
+"POT-Creation-Date: 2014-12-15 17:47+0100\n"
+"PO-Revision-Date: 2014-12-15 16:50+0000\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>\n"
-"Language-Team: Latvian (http://www.transifex.com/projects/p/FusionDirectory-108/language/lv/)\n"
+"Language-Team: Latvian (http://www.transifex.com/projects/p/FusionDirectory-109/language/lv/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -68,7 +68,6 @@ msgstr ""
 
 #: admin/debconfProfile/class_debconfProfileGeneric.inc:181
 #: admin/debconfProfile/class_debconfProfileGeneric.inc:184
-#: admin/debconfProfile/debconfProfile-filter.tpl.c:5
 msgid "Name"
 msgstr ""
 
@@ -131,7 +130,3 @@ msgstr ""
 #: admin/systems/debconf/class_debconfStartup.inc:112
 msgid "Debconf preseed startup"
 msgstr ""
-
-#: admin/debconfProfile/debconfProfile-filter.tpl.c:2
-msgid "Filter"
-msgstr ""
diff --git a/debconf/locale/nb/fusiondirectory.po b/debconf/locale/nb/fusiondirectory.po
index be9687f08ce81ffbaf78267597be77745259be1d..2a1eea8a35180ee51188a7da44a802b4d3776c41 100644
--- a/debconf/locale/nb/fusiondirectory.po
+++ b/debconf/locale/nb/fusiondirectory.po
@@ -5,12 +5,12 @@
 # Translators:
 msgid ""
 msgstr ""
-"Project-Id-Version: FusionDirectory-108\n"
+"Project-Id-Version: FusionDirectory-109\n"
 "Report-Msgid-Bugs-To: documentation@lists.fusiondirectory.org\n"
-"POT-Creation-Date: 2015-03-19 21:45+0100\n"
-"PO-Revision-Date: 2015-02-25 16:12+0000\n"
+"POT-Creation-Date: 2014-12-15 17:47+0100\n"
+"PO-Revision-Date: 2015-02-25 16:04+0000\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>\n"
-"Language-Team: Norwegian BokmÃ¥l (http://www.transifex.com/projects/p/FusionDirectory-108/language/nb/)\n"
+"Language-Team: Norwegian BokmÃ¥l (http://www.transifex.com/projects/p/FusionDirectory-109/language/nb/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -68,7 +68,6 @@ msgstr ""
 
 #: admin/debconfProfile/class_debconfProfileGeneric.inc:181
 #: admin/debconfProfile/class_debconfProfileGeneric.inc:184
-#: admin/debconfProfile/debconfProfile-filter.tpl.c:5
 msgid "Name"
 msgstr "Navn"
 
@@ -131,7 +130,3 @@ msgstr ""
 #: admin/systems/debconf/class_debconfStartup.inc:112
 msgid "Debconf preseed startup"
 msgstr ""
-
-#: admin/debconfProfile/debconfProfile-filter.tpl.c:2
-msgid "Filter"
-msgstr "Filter"
diff --git a/debconf/locale/nl/fusiondirectory.po b/debconf/locale/nl/fusiondirectory.po
index 7527c14c3b38b7a60408ec650fae70131ef78322..d74b319ce597c777d1242b1494a1410bfd1ebdbc 100644
--- a/debconf/locale/nl/fusiondirectory.po
+++ b/debconf/locale/nl/fusiondirectory.po
@@ -5,12 +5,12 @@
 # Translators:
 msgid ""
 msgstr ""
-"Project-Id-Version: FusionDirectory-108\n"
+"Project-Id-Version: FusionDirectory-109\n"
 "Report-Msgid-Bugs-To: documentation@lists.fusiondirectory.org\n"
-"POT-Creation-Date: 2015-03-19 21:45+0100\n"
-"PO-Revision-Date: 2015-02-25 16:12+0000\n"
+"POT-Creation-Date: 2014-12-15 17:47+0100\n"
+"PO-Revision-Date: 2015-02-25 16:04+0000\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>\n"
-"Language-Team: Dutch (http://www.transifex.com/projects/p/FusionDirectory-108/language/nl/)\n"
+"Language-Team: Dutch (http://www.transifex.com/projects/p/FusionDirectory-109/language/nl/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -68,7 +68,6 @@ msgstr ""
 
 #: admin/debconfProfile/class_debconfProfileGeneric.inc:181
 #: admin/debconfProfile/class_debconfProfileGeneric.inc:184
-#: admin/debconfProfile/debconfProfile-filter.tpl.c:5
 msgid "Name"
 msgstr "Naam"
 
@@ -131,7 +130,3 @@ msgstr "Linux kernel parameters om te draaien"
 #: admin/systems/debconf/class_debconfStartup.inc:112
 msgid "Debconf preseed startup"
 msgstr ""
-
-#: admin/debconfProfile/debconfProfile-filter.tpl.c:2
-msgid "Filter"
-msgstr "Filter"
diff --git a/debconf/locale/pl/fusiondirectory.po b/debconf/locale/pl/fusiondirectory.po
index c2881d60926b1ca329395f9bb8c5dd6a9f0faf58..3ba6cd0cf63d4103d0e3c07da2f17c8d477cef75 100644
--- a/debconf/locale/pl/fusiondirectory.po
+++ b/debconf/locale/pl/fusiondirectory.po
@@ -5,12 +5,12 @@
 # Translators:
 msgid ""
 msgstr ""
-"Project-Id-Version: FusionDirectory-108\n"
+"Project-Id-Version: FusionDirectory-109\n"
 "Report-Msgid-Bugs-To: documentation@lists.fusiondirectory.org\n"
-"POT-Creation-Date: 2015-03-19 21:45+0100\n"
-"PO-Revision-Date: 2015-02-25 16:12+0000\n"
+"POT-Creation-Date: 2014-12-15 17:47+0100\n"
+"PO-Revision-Date: 2015-02-25 16:04+0000\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>\n"
-"Language-Team: Polish (http://www.transifex.com/projects/p/FusionDirectory-108/language/pl/)\n"
+"Language-Team: Polish (http://www.transifex.com/projects/p/FusionDirectory-109/language/pl/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -68,7 +68,6 @@ msgstr ""
 
 #: admin/debconfProfile/class_debconfProfileGeneric.inc:181
 #: admin/debconfProfile/class_debconfProfileGeneric.inc:184
-#: admin/debconfProfile/debconfProfile-filter.tpl.c:5
 msgid "Name"
 msgstr "ImiÄ™"
 
@@ -131,7 +130,3 @@ msgstr ""
 #: admin/systems/debconf/class_debconfStartup.inc:112
 msgid "Debconf preseed startup"
 msgstr ""
-
-#: admin/debconfProfile/debconfProfile-filter.tpl.c:2
-msgid "Filter"
-msgstr "Filtr"
diff --git a/debconf/locale/pt/fusiondirectory.po b/debconf/locale/pt/fusiondirectory.po
index 521e3b3c692fd339115aedbf5c9d1d3cff4f102e..c778b81a61ab7c052fbecdb38904d9791ffca80f 100644
--- a/debconf/locale/pt/fusiondirectory.po
+++ b/debconf/locale/pt/fusiondirectory.po
@@ -5,12 +5,12 @@
 # Translators:
 msgid ""
 msgstr ""
-"Project-Id-Version: FusionDirectory-108\n"
+"Project-Id-Version: FusionDirectory-109\n"
 "Report-Msgid-Bugs-To: documentation@lists.fusiondirectory.org\n"
-"POT-Creation-Date: 2015-03-19 21:45+0100\n"
-"PO-Revision-Date: 2015-02-25 16:02+0000\n"
+"POT-Creation-Date: 2014-12-15 17:47+0100\n"
+"PO-Revision-Date: 2015-02-25 16:04+0000\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>\n"
-"Language-Team: Portuguese (http://www.transifex.com/projects/p/FusionDirectory-108/language/pt/)\n"
+"Language-Team: Portuguese (http://www.transifex.com/projects/p/FusionDirectory-109/language/pt/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -68,7 +68,6 @@ msgstr ""
 
 #: admin/debconfProfile/class_debconfProfileGeneric.inc:181
 #: admin/debconfProfile/class_debconfProfileGeneric.inc:184
-#: admin/debconfProfile/debconfProfile-filter.tpl.c:5
 msgid "Name"
 msgstr "Nome"
 
@@ -131,7 +130,3 @@ msgstr ""
 #: admin/systems/debconf/class_debconfStartup.inc:112
 msgid "Debconf preseed startup"
 msgstr ""
-
-#: admin/debconfProfile/debconfProfile-filter.tpl.c:2
-msgid "Filter"
-msgstr ""
diff --git a/debconf/locale/pt_BR/fusiondirectory.po b/debconf/locale/pt_BR/fusiondirectory.po
index c76ab2d6f6be3d622685ef40b5138860c969e896..8ca32b85d7f0e522f80bb0be71de305513d6eec5 100644
--- a/debconf/locale/pt_BR/fusiondirectory.po
+++ b/debconf/locale/pt_BR/fusiondirectory.po
@@ -3,16 +3,14 @@
 # This file is distributed under the same license as the PACKAGE package.
 # 
 # Translators:
-# kayocarneiro <kayomatheus@gmail.com>, 2014
-# kayocarneiro <kayomatheus@gmail.com>, 2014
 msgid ""
 msgstr ""
-"Project-Id-Version: FusionDirectory-108\n"
+"Project-Id-Version: FusionDirectory-109\n"
 "Report-Msgid-Bugs-To: documentation@lists.fusiondirectory.org\n"
-"POT-Creation-Date: 2015-03-19 21:45+0100\n"
-"PO-Revision-Date: 2015-02-25 16:12+0000\n"
+"POT-Creation-Date: 2014-12-15 17:47+0100\n"
+"PO-Revision-Date: 2015-02-25 16:04+0000\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>\n"
-"Language-Team: Portuguese (Brazil) (http://www.transifex.com/projects/p/FusionDirectory-108/language/pt_BR/)\n"
+"Language-Team: Portuguese (Brazil) (http://www.transifex.com/projects/p/FusionDirectory-109/language/pt_BR/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -70,7 +68,6 @@ msgstr ""
 
 #: admin/debconfProfile/class_debconfProfileGeneric.inc:181
 #: admin/debconfProfile/class_debconfProfileGeneric.inc:184
-#: admin/debconfProfile/debconfProfile-filter.tpl.c:5
 msgid "Name"
 msgstr "Nome"
 
@@ -133,7 +130,3 @@ msgstr "ParÃ¢metros do kernel Linux para ser executado"
 #: admin/systems/debconf/class_debconfStartup.inc:112
 msgid "Debconf preseed startup"
 msgstr "Debconf precisa comeÃ§ar"
-
-#: admin/debconfProfile/debconfProfile-filter.tpl.c:2
-msgid "Filter"
-msgstr "Filtro"
diff --git a/debconf/locale/ru/fusiondirectory.po b/debconf/locale/ru/fusiondirectory.po
index 32782bd6144126848929ceaa2311b90a340b3a01..7b2fb834e25a9b24a3848320c9e27232b035f783 100644
--- a/debconf/locale/ru/fusiondirectory.po
+++ b/debconf/locale/ru/fusiondirectory.po
@@ -5,17 +5,17 @@
 # Translators:
 msgid ""
 msgstr ""
-"Project-Id-Version: FusionDirectory-108\n"
+"Project-Id-Version: FusionDirectory-109\n"
 "Report-Msgid-Bugs-To: documentation@lists.fusiondirectory.org\n"
-"POT-Creation-Date: 2015-03-19 21:45+0100\n"
-"PO-Revision-Date: 2015-03-10 08:21+0000\n"
+"POT-Creation-Date: 2014-12-15 17:47+0100\n"
+"PO-Revision-Date: 2015-04-13 01:05+0000\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>\n"
-"Language-Team: Russian (http://www.transifex.com/projects/p/FusionDirectory-108/language/ru/)\n"
+"Language-Team: Russian (http://www.transifex.com/projects/p/FusionDirectory-109/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=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);\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:111
@@ -68,7 +68,6 @@ msgstr ""
 
 #: admin/debconfProfile/class_debconfProfileGeneric.inc:181
 #: admin/debconfProfile/class_debconfProfileGeneric.inc:184
-#: admin/debconfProfile/debconfProfile-filter.tpl.c:5
 msgid "Name"
 msgstr "Ð¤Ð°Ð¼Ð¸Ð»Ð¸Ñ"
 
@@ -118,20 +117,16 @@ msgstr "Ð¯Ð´Ñ€Ð¾ Ð´Ð»Ñ Ð·Ð°Ð³Ñ€ÑƒÐ·ÐºÐ¸"
 
 #: admin/systems/debconf/class_debconfStartup.inc:77
 msgid "Linux kernel to be installed and booted"
-msgstr ""
+msgstr "Linux ÑÐ´Ñ€Ð¾, ÐºÐ¾Ñ‚Ð¾Ñ€Ð¾Ðµ ÑƒÑÑ‚Ð°Ð½Ð¾Ð²Ð»ÐµÐ½Ð¾ Ð¸ Ð·Ð°Ð³Ñ€ÑƒÐ¶ÐµÐ½Ð¾"
 
 #: admin/systems/debconf/class_debconfStartup.inc:81
 msgid "Boot kernel parameters"
-msgstr ""
+msgstr "ÐŸÐ°Ñ€Ð°Ð¼ÐµÑ‚Ñ€Ñ‹ Ð·Ð°Ð³Ñ€ÑƒÐ·ÐºÐ¸ ÑÐ´Ñ€Ð°"
 
 #: admin/systems/debconf/class_debconfStartup.inc:81
 msgid "Linux kernel parameters to be ran"
-msgstr ""
+msgstr "ÐŸÐ°Ñ€Ð°Ð¼ÐµÑ‚Ñ€Ñ‹ Ñ ÐºÐ¾Ñ‚Ð¾Ñ€Ñ‹Ð¼Ð¸ Linux ÑÐ´Ñ€Ð¾ Ð±Ñ‹Ð»Ð¾ Ð·Ð°Ð¿ÑƒÑ‰ÐµÐ½Ð¾"
 
 #: admin/systems/debconf/class_debconfStartup.inc:112
 msgid "Debconf preseed startup"
 msgstr ""
-
-#: admin/debconfProfile/debconfProfile-filter.tpl.c:2
-msgid "Filter"
-msgstr "Ð¤Ð¸Ð»ÑŒÑ‚Ñ€"
diff --git a/debconf/locale/ru@petr1708/fusiondirectory.po b/debconf/locale/ru@petr1708/fusiondirectory.po
index a7e1d1d2de221f86e5e244cb69845ca9d64a0f51..6100fda7bca5e4db7b7de74509c78b99cbeba1f8 100644
--- a/debconf/locale/ru@petr1708/fusiondirectory.po
+++ b/debconf/locale/ru@petr1708/fusiondirectory.po
@@ -5,17 +5,17 @@
 # Translators:
 msgid ""
 msgstr ""
-"Project-Id-Version: FusionDirectory-108\n"
+"Project-Id-Version: FusionDirectory-109\n"
 "Report-Msgid-Bugs-To: documentation@lists.fusiondirectory.org\n"
-"POT-Creation-Date: 2015-03-19 21:45+0100\n"
-"PO-Revision-Date: 2015-02-25 15:43+0000\n"
+"POT-Creation-Date: 2014-12-15 17:47+0100\n"
+"PO-Revision-Date: 2014-12-15 16:50+0000\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>\n"
-"Language-Team: Russian Petrine orthography (http://www.transifex.com/projects/p/FusionDirectory-108/language/ru@petr1708/)\n"
+"Language-Team: Russian Petrine orthography (http://www.transifex.com/projects/p/FusionDirectory-109/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=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);\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:111
@@ -68,7 +68,6 @@ msgstr ""
 
 #: admin/debconfProfile/class_debconfProfileGeneric.inc:181
 #: admin/debconfProfile/class_debconfProfileGeneric.inc:184
-#: admin/debconfProfile/debconfProfile-filter.tpl.c:5
 msgid "Name"
 msgstr ""
 
@@ -131,7 +130,3 @@ msgstr ""
 #: admin/systems/debconf/class_debconfStartup.inc:112
 msgid "Debconf preseed startup"
 msgstr ""
-
-#: admin/debconfProfile/debconfProfile-filter.tpl.c:2
-msgid "Filter"
-msgstr ""
diff --git a/debconf/locale/sv/fusiondirectory.po b/debconf/locale/sv/fusiondirectory.po
index 059f871d43159e30b39cc2a8cd9c6442d4b6e769..4fdfff46b1849f0027f267ffe429af1c4973d821 100644
--- a/debconf/locale/sv/fusiondirectory.po
+++ b/debconf/locale/sv/fusiondirectory.po
@@ -5,12 +5,12 @@
 # Translators:
 msgid ""
 msgstr ""
-"Project-Id-Version: FusionDirectory-108\n"
+"Project-Id-Version: FusionDirectory-109\n"
 "Report-Msgid-Bugs-To: documentation@lists.fusiondirectory.org\n"
-"POT-Creation-Date: 2015-03-19 21:45+0100\n"
-"PO-Revision-Date: 2015-02-25 16:12+0000\n"
+"POT-Creation-Date: 2014-12-15 17:47+0100\n"
+"PO-Revision-Date: 2015-02-25 16:04+0000\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>\n"
-"Language-Team: Swedish (http://www.transifex.com/projects/p/FusionDirectory-108/language/sv/)\n"
+"Language-Team: Swedish (http://www.transifex.com/projects/p/FusionDirectory-109/language/sv/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -68,7 +68,6 @@ msgstr ""
 
 #: admin/debconfProfile/class_debconfProfileGeneric.inc:181
 #: admin/debconfProfile/class_debconfProfileGeneric.inc:184
-#: admin/debconfProfile/debconfProfile-filter.tpl.c:5
 msgid "Name"
 msgstr "Namn"
 
@@ -131,7 +130,3 @@ msgstr "Linux kÃ¤rnparametrar att kÃ¶ra"
 #: admin/systems/debconf/class_debconfStartup.inc:112
 msgid "Debconf preseed startup"
 msgstr ""
-
-#: admin/debconfProfile/debconfProfile-filter.tpl.c:2
-msgid "Filter"
-msgstr "Filter"
diff --git a/debconf/locale/ug/fusiondirectory.po b/debconf/locale/ug/fusiondirectory.po
index 76e7da8b4972de060f4462bb59959f22f7e816d5..29899289b6f0ac32a797b3f9c1bd848dd33bf2e9 100644
--- a/debconf/locale/ug/fusiondirectory.po
+++ b/debconf/locale/ug/fusiondirectory.po
@@ -5,12 +5,12 @@
 # Translators:
 msgid ""
 msgstr ""
-"Project-Id-Version: FusionDirectory-108\n"
+"Project-Id-Version: FusionDirectory-109\n"
 "Report-Msgid-Bugs-To: documentation@lists.fusiondirectory.org\n"
-"POT-Creation-Date: 2015-03-19 21:45+0100\n"
-"PO-Revision-Date: 2015-02-25 15:43+0000\n"
+"POT-Creation-Date: 2014-12-15 17:47+0100\n"
+"PO-Revision-Date: 2014-12-15 16:50+0000\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>\n"
-"Language-Team: Uighur (http://www.transifex.com/projects/p/FusionDirectory-108/language/ug/)\n"
+"Language-Team: Uighur (http://www.transifex.com/projects/p/FusionDirectory-109/language/ug/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -68,7 +68,6 @@ msgstr ""
 
 #: admin/debconfProfile/class_debconfProfileGeneric.inc:181
 #: admin/debconfProfile/class_debconfProfileGeneric.inc:184
-#: admin/debconfProfile/debconfProfile-filter.tpl.c:5
 msgid "Name"
 msgstr ""
 
@@ -131,7 +130,3 @@ msgstr ""
 #: admin/systems/debconf/class_debconfStartup.inc:112
 msgid "Debconf preseed startup"
 msgstr ""
-
-#: admin/debconfProfile/debconfProfile-filter.tpl.c:2
-msgid "Filter"
-msgstr ""
diff --git a/debconf/locale/vi_VN/fusiondirectory.po b/debconf/locale/vi_VN/fusiondirectory.po
index 5b9a2479409ae7fbd8d7c5b24f388117d51032d2..2829e7f4ced7f2f14a252cd5ac54475d9c3a344c 100644
--- a/debconf/locale/vi_VN/fusiondirectory.po
+++ b/debconf/locale/vi_VN/fusiondirectory.po
@@ -5,12 +5,12 @@
 # Translators:
 msgid ""
 msgstr ""
-"Project-Id-Version: FusionDirectory-108\n"
+"Project-Id-Version: FusionDirectory-109\n"
 "Report-Msgid-Bugs-To: documentation@lists.fusiondirectory.org\n"
-"POT-Creation-Date: 2015-03-19 21:45+0100\n"
-"PO-Revision-Date: 2015-02-25 16:02+0000\n"
+"POT-Creation-Date: 2014-12-15 17:47+0100\n"
+"PO-Revision-Date: 2015-02-25 16:04+0000\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>\n"
-"Language-Team: Vietnamese (Viet Nam) (http://www.transifex.com/projects/p/FusionDirectory-108/language/vi_VN/)\n"
+"Language-Team: Vietnamese (Viet Nam) (http://www.transifex.com/projects/p/FusionDirectory-109/language/vi_VN/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -68,7 +68,6 @@ msgstr ""
 
 #: admin/debconfProfile/class_debconfProfileGeneric.inc:181
 #: admin/debconfProfile/class_debconfProfileGeneric.inc:184
-#: admin/debconfProfile/debconfProfile-filter.tpl.c:5
 msgid "Name"
 msgstr "TÃªn"
 
@@ -131,7 +130,3 @@ msgstr ""
 #: admin/systems/debconf/class_debconfStartup.inc:112
 msgid "Debconf preseed startup"
 msgstr ""
-
-#: admin/debconfProfile/debconfProfile-filter.tpl.c:2
-msgid "Filter"
-msgstr ""
diff --git a/debconf/locale/zh/fusiondirectory.po b/debconf/locale/zh/fusiondirectory.po
index 9d07d6a4fd8c3e0c705beb2196892c4bdb4da49f..de601dbb096c4742efd2cba822dcef53af8cf951 100644
--- a/debconf/locale/zh/fusiondirectory.po
+++ b/debconf/locale/zh/fusiondirectory.po
@@ -5,12 +5,12 @@
 # Translators:
 msgid ""
 msgstr ""
-"Project-Id-Version: FusionDirectory-108\n"
+"Project-Id-Version: FusionDirectory-109\n"
 "Report-Msgid-Bugs-To: documentation@lists.fusiondirectory.org\n"
-"POT-Creation-Date: 2015-03-19 21:45+0100\n"
-"PO-Revision-Date: 2015-02-25 16:12+0000\n"
+"POT-Creation-Date: 2014-12-15 17:47+0100\n"
+"PO-Revision-Date: 2015-02-25 16:04+0000\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>\n"
-"Language-Team: Chinese (http://www.transifex.com/projects/p/FusionDirectory-108/language/zh/)\n"
+"Language-Team: Chinese (http://www.transifex.com/projects/p/FusionDirectory-109/language/zh/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -68,7 +68,6 @@ msgstr ""
 
 #: admin/debconfProfile/class_debconfProfileGeneric.inc:181
 #: admin/debconfProfile/class_debconfProfileGeneric.inc:184
-#: admin/debconfProfile/debconfProfile-filter.tpl.c:5
 msgid "Name"
 msgstr "åç§°"
 
@@ -131,7 +130,3 @@ msgstr ""
 #: admin/systems/debconf/class_debconfStartup.inc:112
 msgid "Debconf preseed startup"
 msgstr ""
-
-#: admin/debconfProfile/debconfProfile-filter.tpl.c:2
-msgid "Filter"
-msgstr "è¿‡æ»¤å™¨"
diff --git a/developers/locale/ar/fusiondirectory.po b/developers/locale/ar/fusiondirectory.po
index 2c862236789eae741a49e74927e47b3018132ae6..4a810faa7c5bdc6bc07ddabd15a0196fdc3f06a9 100644
--- a/developers/locale/ar/fusiondirectory.po
+++ b/developers/locale/ar/fusiondirectory.po
@@ -5,12 +5,12 @@
 # Translators:
 msgid ""
 msgstr ""
-"Project-Id-Version: FusionDirectory-108\n"
+"Project-Id-Version: FusionDirectory-109\n"
 "Report-Msgid-Bugs-To: documentation@lists.fusiondirectory.org\n"
-"POT-Creation-Date: 2015-03-19 21:45+0100\n"
-"PO-Revision-Date: 2015-02-25 15:43+0000\n"
+"POT-Creation-Date: 2014-12-15 17:47+0100\n"
+"PO-Revision-Date: 2014-12-15 16:51+0000\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>\n"
-"Language-Team: Arabic (http://www.transifex.com/projects/p/FusionDirectory-108/language/ar/)\n"
+"Language-Team: Arabic (http://www.transifex.com/projects/p/FusionDirectory-109/language/ar/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -25,23 +25,23 @@ msgstr ""
 msgid "Debug help tools"
 msgstr ""
 
-#: debug-help/addons/debug-help/class_debugHelp.inc:33
+#: debug-help/addons/debug-help/class_debugHelp.inc:32
 msgid "Diagram"
 msgstr ""
 
-#: debug-help/addons/debug-help/class_debugHelp.inc:43
+#: debug-help/addons/debug-help/class_debugHelp.inc:42
 msgid "Diagrams"
 msgstr ""
 
-#: debug-help/addons/debug-help/class_debugHelp.inc:47
+#: debug-help/addons/debug-help/class_debugHelp.inc:46
 msgid "Object types diagram"
 msgstr ""
 
-#: debug-help/addons/debug-help/class_debugHelp.inc:49
+#: debug-help/addons/debug-help/class_debugHelp.inc:48
 msgid "Get"
 msgstr ""
 
-#: debug-help/addons/debug-help/class_debugHelp.inc:54
+#: debug-help/addons/debug-help/class_debugHelp.inc:53
 msgid "Object Types"
 msgstr ""
 
@@ -132,7 +132,3 @@ msgstr ""
 #: simple-plugin/demoPlugin/class_demoPlugin.inc:108
 msgid "Edit some useless personal information"
 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 750c2b5fdfe37cae199ae102a6111ab15f07e24b..9e9511246ab72c5a4b9ca41456cd7b1672c981f6 100644
--- a/developers/locale/ca/fusiondirectory.po
+++ b/developers/locale/ca/fusiondirectory.po
@@ -5,12 +5,12 @@
 # Translators:
 msgid ""
 msgstr ""
-"Project-Id-Version: FusionDirectory-108\n"
+"Project-Id-Version: FusionDirectory-109\n"
 "Report-Msgid-Bugs-To: documentation@lists.fusiondirectory.org\n"
-"POT-Creation-Date: 2015-03-19 21:45+0100\n"
-"PO-Revision-Date: 2015-02-25 15:43+0000\n"
+"POT-Creation-Date: 2014-12-15 17:47+0100\n"
+"PO-Revision-Date: 2014-12-15 16:51+0000\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>\n"
-"Language-Team: Catalan (http://www.transifex.com/projects/p/FusionDirectory-108/language/ca/)\n"
+"Language-Team: Catalan (http://www.transifex.com/projects/p/FusionDirectory-109/language/ca/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -25,23 +25,23 @@ msgstr ""
 msgid "Debug help tools"
 msgstr ""
 
-#: debug-help/addons/debug-help/class_debugHelp.inc:33
+#: debug-help/addons/debug-help/class_debugHelp.inc:32
 msgid "Diagram"
 msgstr ""
 
-#: debug-help/addons/debug-help/class_debugHelp.inc:43
+#: debug-help/addons/debug-help/class_debugHelp.inc:42
 msgid "Diagrams"
 msgstr ""
 
-#: debug-help/addons/debug-help/class_debugHelp.inc:47
+#: debug-help/addons/debug-help/class_debugHelp.inc:46
 msgid "Object types diagram"
 msgstr ""
 
-#: debug-help/addons/debug-help/class_debugHelp.inc:49
+#: debug-help/addons/debug-help/class_debugHelp.inc:48
 msgid "Get"
 msgstr ""
 
-#: debug-help/addons/debug-help/class_debugHelp.inc:54
+#: debug-help/addons/debug-help/class_debugHelp.inc:53
 msgid "Object Types"
 msgstr ""
 
@@ -132,7 +132,3 @@ msgstr ""
 #: simple-plugin/demoPlugin/class_demoPlugin.inc:108
 msgid "Edit some useless personal information"
 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 60f43a94045494037fa6f16a8a2cc9f3a804d7e3..a001bd6260560e312e27bb837445a647808c5571 100644
--- a/developers/locale/cs_CZ/fusiondirectory.po
+++ b/developers/locale/cs_CZ/fusiondirectory.po
@@ -3,14 +3,15 @@
 # This file is distributed under the same license as the PACKAGE package.
 # 
 # Translators:
+# Pavel Borecki <pavel.borecki@gmail.com>, 2014-2015
 msgid ""
 msgstr ""
-"Project-Id-Version: FusionDirectory-108\n"
+"Project-Id-Version: FusionDirectory-109\n"
 "Report-Msgid-Bugs-To: documentation@lists.fusiondirectory.org\n"
-"POT-Creation-Date: 2015-03-19 21:45+0100\n"
-"PO-Revision-Date: 2015-02-25 16:13+0000\n"
-"Last-Translator: fusiondirectory <contact@fusiondirectory.org>\n"
-"Language-Team: Czech (Czech Republic) (http://www.transifex.com/projects/p/FusionDirectory-108/language/cs_CZ/)\n"
+"POT-Creation-Date: 2014-12-15 17:47+0100\n"
+"PO-Revision-Date: 2015-04-04 09:01+0000\n"
+"Last-Translator: Pavel Borecki <pavel.borecki@gmail.com>\n"
+"Language-Team: Czech (Czech Republic) (http://www.transifex.com/projects/p/FusionDirectory-109/language/cs_CZ/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -19,39 +20,39 @@ msgstr ""
 
 #: debug-help/addons/debug-help/class_debugHelp.inc:28
 msgid "Debug help"
-msgstr ""
+msgstr "PomocnÃ¡ diagnostika"
 
 #: debug-help/addons/debug-help/class_debugHelp.inc:29
 msgid "Debug help tools"
-msgstr ""
+msgstr "PomocnÃ© diagnostickÃ© nÃ¡stroje"
 
-#: debug-help/addons/debug-help/class_debugHelp.inc:33
+#: debug-help/addons/debug-help/class_debugHelp.inc:32
 msgid "Diagram"
 msgstr ""
 
-#: debug-help/addons/debug-help/class_debugHelp.inc:43
+#: debug-help/addons/debug-help/class_debugHelp.inc:42
 msgid "Diagrams"
 msgstr "Diagramy"
 
-#: debug-help/addons/debug-help/class_debugHelp.inc:47
+#: debug-help/addons/debug-help/class_debugHelp.inc:46
 msgid "Object types diagram"
-msgstr ""
+msgstr "Diagram typÅ¯ objektÅ¯"
 
-#: debug-help/addons/debug-help/class_debugHelp.inc:49
+#: debug-help/addons/debug-help/class_debugHelp.inc:48
 msgid "Get"
-msgstr ""
+msgstr "ZÃskat"
 
-#: debug-help/addons/debug-help/class_debugHelp.inc:54
+#: debug-help/addons/debug-help/class_debugHelp.inc:53
 msgid "Object Types"
-msgstr ""
+msgstr "Typy objektÅ¯"
 
 #: simple-plugin/demoPlugin/class_demoPlugin.inc:40
 msgid "Hair Information"
-msgstr ""
+msgstr "Ãšdaje o vlasech"
 
 #: simple-plugin/demoPlugin/class_demoPlugin.inc:44
 msgid "Color"
-msgstr ""
+msgstr "Barva"
 
 #: simple-plugin/demoPlugin/class_demoPlugin.inc:45
 msgid "Color of the hair"
@@ -59,15 +60,15 @@ msgstr "Barva vlasÅ¯"
 
 #: simple-plugin/demoPlugin/class_demoPlugin.inc:54
 msgid "Length"
-msgstr ""
+msgstr "DÃ©lka"
 
 #: simple-plugin/demoPlugin/class_demoPlugin.inc:55
 msgid "Length of the hair in cm"
-msgstr ""
+msgstr "DÃ©lka vlasÅ¯ v centimetrech"
 
 #: simple-plugin/demoPlugin/class_demoPlugin.inc:65
 msgid "Bicycle"
-msgstr ""
+msgstr "JÃzdnÃ kolo"
 
 #: simple-plugin/demoPlugin/class_demoPlugin.inc:68
 msgid "Brand"
@@ -75,23 +76,23 @@ msgstr "ZnaÄka"
 
 #: simple-plugin/demoPlugin/class_demoPlugin.inc:69
 msgid "Brand of the bicycle"
-msgstr ""
+msgstr "ZnaÄka jÃzdnÃho kola"
 
 #: simple-plugin/demoPlugin/class_demoPlugin.inc:75
 msgid "Has a bell"
-msgstr ""
+msgstr "MÃ¡ zvonek"
 
 #: simple-plugin/demoPlugin/class_demoPlugin.inc:76
 msgid "Does the bicycle have a bell"
-msgstr ""
+msgstr "MÃ¡ jÃzdnÃ kolo zvonek?"
 
 #: simple-plugin/demoPlugin/class_demoPlugin.inc:84
 msgid "FTP informations"
-msgstr ""
+msgstr "Ãšdaje FTP"
 
 #: simple-plugin/demoPlugin/class_demoPlugin.inc:87
 msgid "Informations for ftp login"
-msgstr ""
+msgstr "Ãšdaje pro pÅ™ihlaÅ¡ovÃ¡nÃ ke sluÅ¾bÄ› FTP"
 
 #: simple-plugin/demoPlugin/class_demoPlugin.inc:90
 msgid "Login"
@@ -99,15 +100,15 @@ msgstr "uÅ¾ivatelskÃ© jmÃ©no"
 
 #: simple-plugin/demoPlugin/class_demoPlugin.inc:90
 msgid "Login for FTP"
-msgstr ""
+msgstr "ÃšÄet pro FTP"
 
 #: simple-plugin/demoPlugin/class_demoPlugin.inc:91
 msgid "Password"
-msgstr "heslo"
+msgstr "Heslo"
 
 #: simple-plugin/demoPlugin/class_demoPlugin.inc:91
 msgid "Password for FTP"
-msgstr ""
+msgstr "Heslo pro FTP"
 
 #: simple-plugin/demoPlugin/class_demoPlugin.inc:92
 msgid "Host"
@@ -115,24 +116,20 @@ msgstr "stroj"
 
 #: simple-plugin/demoPlugin/class_demoPlugin.inc:92
 msgid "Host for FTP"
-msgstr ""
+msgstr "PoÄÃtaÄ pro sluÅ¾bu FTP"
 
 #: simple-plugin/demoPlugin/class_demoPlugin.inc:93
 msgid "Port"
-msgstr "port"
+msgstr "Port"
 
 #: simple-plugin/demoPlugin/class_demoPlugin.inc:93
 msgid "Port for FTP"
-msgstr ""
+msgstr "ÄŒÃslo portu por FTP"
 
 #: simple-plugin/demoPlugin/class_demoPlugin.inc:107
 msgid "Demo Plugin"
-msgstr ""
+msgstr "UkÃ¡zkovÃ½ zÃ¡suvnÃ½ modul"
 
 #: simple-plugin/demoPlugin/class_demoPlugin.inc:108
 msgid "Edit some useless personal information"
-msgstr ""
-
-#: debug-help/addons/debug-help/debughelp.tpl.c:2
-msgid "Insufficient rights"
-msgstr "NedostaÄujÃcÃ oprÃ¡vnÄ›nÃ"
+msgstr "Upravit nÄ›jakÃ© neuÅ¾iteÄnÃ© osobnÃ Ãºdaje"
diff --git a/developers/locale/de/fusiondirectory.po b/developers/locale/de/fusiondirectory.po
index d947f9a8a6692eb363007bce3ca90dcd1243f29e..28b4169684d229e2f1b662e5c0309cc0e330baf6 100644
--- a/developers/locale/de/fusiondirectory.po
+++ b/developers/locale/de/fusiondirectory.po
@@ -3,14 +3,15 @@
 # This file is distributed under the same license as the PACKAGE package.
 # 
 # Translators:
+# Ettore Atalan <atalanttore@googlemail.com>, 2014
 msgid ""
 msgstr ""
-"Project-Id-Version: FusionDirectory-108\n"
+"Project-Id-Version: FusionDirectory-109\n"
 "Report-Msgid-Bugs-To: documentation@lists.fusiondirectory.org\n"
-"POT-Creation-Date: 2015-03-19 21:45+0100\n"
+"POT-Creation-Date: 2014-12-15 17:47+0100\n"
 "PO-Revision-Date: 2015-02-25 16:13+0000\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>\n"
-"Language-Team: German (http://www.transifex.com/projects/p/FusionDirectory-108/language/de/)\n"
+"Language-Team: German (http://www.transifex.com/projects/p/FusionDirectory-109/language/de/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -25,23 +26,23 @@ msgstr "Debug-Hilfe"
 msgid "Debug help tools"
 msgstr "Debug-Hilfewerkzeuge"
 
-#: debug-help/addons/debug-help/class_debugHelp.inc:33
+#: debug-help/addons/debug-help/class_debugHelp.inc:32
 msgid "Diagram"
 msgstr "Diagramm"
 
-#: debug-help/addons/debug-help/class_debugHelp.inc:43
+#: debug-help/addons/debug-help/class_debugHelp.inc:42
 msgid "Diagrams"
 msgstr "Diagramme"
 
-#: debug-help/addons/debug-help/class_debugHelp.inc:47
+#: debug-help/addons/debug-help/class_debugHelp.inc:46
 msgid "Object types diagram"
 msgstr "Objektartendiagramm"
 
-#: debug-help/addons/debug-help/class_debugHelp.inc:49
+#: debug-help/addons/debug-help/class_debugHelp.inc:48
 msgid "Get"
 msgstr "Erhalten"
 
-#: debug-help/addons/debug-help/class_debugHelp.inc:54
+#: debug-help/addons/debug-help/class_debugHelp.inc:53
 msgid "Object Types"
 msgstr "Objekttypen"
 
@@ -132,7 +133,3 @@ msgstr "Demo Plugin"
 #: simple-plugin/demoPlugin/class_demoPlugin.inc:108
 msgid "Edit some useless personal information"
 msgstr "Bearbeiten Sie einige nutzlose persÃ¶nliche Informationen"
-
-#: 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
new file mode 100644
index 0000000000000000000000000000000000000000..e6ba162d5c20ae8ce1c9f2967801c18c20fde768
--- /dev/null
+++ b/developers/locale/el_GR/fusiondirectory.po
@@ -0,0 +1,134 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR FusionDirectory Project
+# This file is distributed under the same license as the PACKAGE package.
+# 
+# Translators:
+msgid ""
+msgstr ""
+"Project-Id-Version: FusionDirectory-109\n"
+"Report-Msgid-Bugs-To: documentation@lists.fusiondirectory.org\n"
+"POT-Creation-Date: 2014-12-15 17:47+0100\n"
+"PO-Revision-Date: 2015-05-30 11:45+0000\n"
+"Last-Translator: Benoit Mortier <benoit.mortier@opensides.be>\n"
+"Language-Team: Greek (Greece) (http://www.transifex.com/projects/p/FusionDirectory-109/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"
+
+#: debug-help/addons/debug-help/class_debugHelp.inc:28
+msgid "Debug help"
+msgstr ""
+
+#: debug-help/addons/debug-help/class_debugHelp.inc:29
+msgid "Debug help tools"
+msgstr ""
+
+#: debug-help/addons/debug-help/class_debugHelp.inc:32
+msgid "Diagram"
+msgstr ""
+
+#: debug-help/addons/debug-help/class_debugHelp.inc:42
+msgid "Diagrams"
+msgstr ""
+
+#: debug-help/addons/debug-help/class_debugHelp.inc:46
+msgid "Object types diagram"
+msgstr ""
+
+#: debug-help/addons/debug-help/class_debugHelp.inc:48
+msgid "Get"
+msgstr ""
+
+#: debug-help/addons/debug-help/class_debugHelp.inc:53
+msgid "Object Types"
+msgstr ""
+
+#: simple-plugin/demoPlugin/class_demoPlugin.inc:40
+msgid "Hair Information"
+msgstr ""
+
+#: simple-plugin/demoPlugin/class_demoPlugin.inc:44
+msgid "Color"
+msgstr ""
+
+#: simple-plugin/demoPlugin/class_demoPlugin.inc:45
+msgid "Color of the hair"
+msgstr ""
+
+#: simple-plugin/demoPlugin/class_demoPlugin.inc:54
+msgid "Length"
+msgstr ""
+
+#: simple-plugin/demoPlugin/class_demoPlugin.inc:55
+msgid "Length of the hair in cm"
+msgstr ""
+
+#: simple-plugin/demoPlugin/class_demoPlugin.inc:65
+msgid "Bicycle"
+msgstr ""
+
+#: simple-plugin/demoPlugin/class_demoPlugin.inc:68
+msgid "Brand"
+msgstr ""
+
+#: simple-plugin/demoPlugin/class_demoPlugin.inc:69
+msgid "Brand of the bicycle"
+msgstr ""
+
+#: simple-plugin/demoPlugin/class_demoPlugin.inc:75
+msgid "Has a bell"
+msgstr ""
+
+#: simple-plugin/demoPlugin/class_demoPlugin.inc:76
+msgid "Does the bicycle have a bell"
+msgstr ""
+
+#: simple-plugin/demoPlugin/class_demoPlugin.inc:84
+msgid "FTP informations"
+msgstr ""
+
+#: simple-plugin/demoPlugin/class_demoPlugin.inc:87
+msgid "Informations for ftp login"
+msgstr ""
+
+#: simple-plugin/demoPlugin/class_demoPlugin.inc:90
+msgid "Login"
+msgstr ""
+
+#: simple-plugin/demoPlugin/class_demoPlugin.inc:90
+msgid "Login for FTP"
+msgstr ""
+
+#: simple-plugin/demoPlugin/class_demoPlugin.inc:91
+msgid "Password"
+msgstr ""
+
+#: simple-plugin/demoPlugin/class_demoPlugin.inc:91
+msgid "Password for FTP"
+msgstr ""
+
+#: simple-plugin/demoPlugin/class_demoPlugin.inc:92
+msgid "Host"
+msgstr ""
+
+#: simple-plugin/demoPlugin/class_demoPlugin.inc:92
+msgid "Host for FTP"
+msgstr ""
+
+#: simple-plugin/demoPlugin/class_demoPlugin.inc:93
+msgid "Port"
+msgstr ""
+
+#: simple-plugin/demoPlugin/class_demoPlugin.inc:93
+msgid "Port for FTP"
+msgstr ""
+
+#: simple-plugin/demoPlugin/class_demoPlugin.inc:107
+msgid "Demo Plugin"
+msgstr ""
+
+#: simple-plugin/demoPlugin/class_demoPlugin.inc:108
+msgid "Edit some useless personal information"
+msgstr ""
diff --git a/developers/locale/en/fusiondirectory.po b/developers/locale/en/fusiondirectory.po
index 0e2b2f07244d46efb46b02e1c8406854ad3f51a5..c1ac4a037d9d114a7cc8858ab400094219746fc5 100644
--- a/developers/locale/en/fusiondirectory.po
+++ b/developers/locale/en/fusiondirectory.po
@@ -6,13 +6,13 @@
 #, fuzzy
 msgid ""
 msgstr ""
-"Project-Id-Version: PACKAGE VERSION\n"
-"Report-Msgid-Bugs-To: documentation@lists.fusiondirectory.org\n"
-"POT-Creation-Date: 2015-03-31 11:49+0200\n"
+"Project-Id-Version: FusionDirectory VERSION\n"
+"Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
+"POT-Creation-Date: 2015-05-30 15:30+0200\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
-"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
-"Language-Team: LANGUAGE <LL@li.org>\n"
-"Language: \n"
+"Last-Translator: FusionDirectory project <contact@fusiondirectory.org>\n"
+"Language-Team: English\n"
+"Language: en\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
diff --git a/developers/locale/es/fusiondirectory.po b/developers/locale/es/fusiondirectory.po
index 016d5068a9a2e79937b09e217960d8812205acd4..88df9d8741053bcd9ac651c893f61c24403e3f62 100644
--- a/developers/locale/es/fusiondirectory.po
+++ b/developers/locale/es/fusiondirectory.po
@@ -5,12 +5,12 @@
 # Translators:
 msgid ""
 msgstr ""
-"Project-Id-Version: FusionDirectory-108\n"
+"Project-Id-Version: FusionDirectory-109\n"
 "Report-Msgid-Bugs-To: documentation@lists.fusiondirectory.org\n"
-"POT-Creation-Date: 2015-03-19 21:45+0100\n"
+"POT-Creation-Date: 2014-12-15 17:47+0100\n"
 "PO-Revision-Date: 2015-02-25 16:13+0000\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>\n"
-"Language-Team: Spanish (http://www.transifex.com/projects/p/FusionDirectory-108/language/es/)\n"
+"Language-Team: Spanish (http://www.transifex.com/projects/p/FusionDirectory-109/language/es/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -25,23 +25,23 @@ msgstr ""
 msgid "Debug help tools"
 msgstr ""
 
-#: debug-help/addons/debug-help/class_debugHelp.inc:33
+#: debug-help/addons/debug-help/class_debugHelp.inc:32
 msgid "Diagram"
 msgstr ""
 
-#: debug-help/addons/debug-help/class_debugHelp.inc:43
+#: debug-help/addons/debug-help/class_debugHelp.inc:42
 msgid "Diagrams"
 msgstr ""
 
-#: debug-help/addons/debug-help/class_debugHelp.inc:47
+#: debug-help/addons/debug-help/class_debugHelp.inc:46
 msgid "Object types diagram"
 msgstr ""
 
-#: debug-help/addons/debug-help/class_debugHelp.inc:49
+#: debug-help/addons/debug-help/class_debugHelp.inc:48
 msgid "Get"
 msgstr ""
 
-#: debug-help/addons/debug-help/class_debugHelp.inc:54
+#: debug-help/addons/debug-help/class_debugHelp.inc:53
 msgid "Object Types"
 msgstr ""
 
@@ -132,7 +132,3 @@ msgstr ""
 #: simple-plugin/demoPlugin/class_demoPlugin.inc:108
 msgid "Edit some useless personal information"
 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 5455066306a795c5fbd0d0bb01eb3458b004c8be..1959dd875b74c04fe3db7732c013c9cfbcead805 100644
--- a/developers/locale/es_VE/fusiondirectory.po
+++ b/developers/locale/es_VE/fusiondirectory.po
@@ -5,12 +5,12 @@
 # Translators:
 msgid ""
 msgstr ""
-"Project-Id-Version: FusionDirectory-108\n"
+"Project-Id-Version: FusionDirectory-109\n"
 "Report-Msgid-Bugs-To: documentation@lists.fusiondirectory.org\n"
-"POT-Creation-Date: 2015-03-19 21:45+0100\n"
+"POT-Creation-Date: 2014-12-15 17:47+0100\n"
 "PO-Revision-Date: 2015-02-25 16:13+0000\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>\n"
-"Language-Team: Spanish (Venezuela) (http://www.transifex.com/projects/p/FusionDirectory-108/language/es_VE/)\n"
+"Language-Team: Spanish (Venezuela) (http://www.transifex.com/projects/p/FusionDirectory-109/language/es_VE/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -25,23 +25,23 @@ msgstr ""
 msgid "Debug help tools"
 msgstr ""
 
-#: debug-help/addons/debug-help/class_debugHelp.inc:33
+#: debug-help/addons/debug-help/class_debugHelp.inc:32
 msgid "Diagram"
 msgstr ""
 
-#: debug-help/addons/debug-help/class_debugHelp.inc:43
+#: debug-help/addons/debug-help/class_debugHelp.inc:42
 msgid "Diagrams"
 msgstr ""
 
-#: debug-help/addons/debug-help/class_debugHelp.inc:47
+#: debug-help/addons/debug-help/class_debugHelp.inc:46
 msgid "Object types diagram"
 msgstr ""
 
-#: debug-help/addons/debug-help/class_debugHelp.inc:49
+#: debug-help/addons/debug-help/class_debugHelp.inc:48
 msgid "Get"
 msgstr ""
 
-#: debug-help/addons/debug-help/class_debugHelp.inc:54
+#: debug-help/addons/debug-help/class_debugHelp.inc:53
 msgid "Object Types"
 msgstr ""
 
@@ -132,7 +132,3 @@ msgstr ""
 #: simple-plugin/demoPlugin/class_demoPlugin.inc:108
 msgid "Edit some useless personal information"
 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 db7804c468847aa797db911975e56ccfc0db744e..b56d89e1bdafc2bffe1a08f5b19ddb9a4c7aae88 100644
--- a/developers/locale/fa_IR/fusiondirectory.po
+++ b/developers/locale/fa_IR/fusiondirectory.po
@@ -5,12 +5,12 @@
 # Translators:
 msgid ""
 msgstr ""
-"Project-Id-Version: FusionDirectory-108\n"
+"Project-Id-Version: FusionDirectory-109\n"
 "Report-Msgid-Bugs-To: documentation@lists.fusiondirectory.org\n"
-"POT-Creation-Date: 2015-03-19 21:45+0100\n"
-"PO-Revision-Date: 2015-02-25 15:43+0000\n"
+"POT-Creation-Date: 2014-12-15 17:47+0100\n"
+"PO-Revision-Date: 2014-12-15 16:51+0000\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>\n"
-"Language-Team: Persian (Iran) (http://www.transifex.com/projects/p/FusionDirectory-108/language/fa_IR/)\n"
+"Language-Team: Persian (Iran) (http://www.transifex.com/projects/p/FusionDirectory-109/language/fa_IR/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -25,23 +25,23 @@ msgstr ""
 msgid "Debug help tools"
 msgstr ""
 
-#: debug-help/addons/debug-help/class_debugHelp.inc:33
+#: debug-help/addons/debug-help/class_debugHelp.inc:32
 msgid "Diagram"
 msgstr ""
 
-#: debug-help/addons/debug-help/class_debugHelp.inc:43
+#: debug-help/addons/debug-help/class_debugHelp.inc:42
 msgid "Diagrams"
 msgstr ""
 
-#: debug-help/addons/debug-help/class_debugHelp.inc:47
+#: debug-help/addons/debug-help/class_debugHelp.inc:46
 msgid "Object types diagram"
 msgstr ""
 
-#: debug-help/addons/debug-help/class_debugHelp.inc:49
+#: debug-help/addons/debug-help/class_debugHelp.inc:48
 msgid "Get"
 msgstr ""
 
-#: debug-help/addons/debug-help/class_debugHelp.inc:54
+#: debug-help/addons/debug-help/class_debugHelp.inc:53
 msgid "Object Types"
 msgstr ""
 
@@ -132,7 +132,3 @@ msgstr ""
 #: simple-plugin/demoPlugin/class_demoPlugin.inc:108
 msgid "Edit some useless personal information"
 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 4383e4d25bd553a3b5803805823f22aae3b0b733..57a17000c3396ccdaba2fb33f17ec9edf78424dd 100644
--- a/developers/locale/fr/fusiondirectory.po
+++ b/developers/locale/fr/fusiondirectory.po
@@ -3,16 +3,14 @@
 # This file is distributed under the same license as the PACKAGE package.
 # 
 # Translators:
-# fusiondirectory <contact@fusiondirectory.org>, 2014
-# fusiondirectory <contact@fusiondirectory.org>, 2014
 msgid ""
 msgstr ""
-"Project-Id-Version: FusionDirectory-108\n"
+"Project-Id-Version: FusionDirectory-109\n"
 "Report-Msgid-Bugs-To: documentation@lists.fusiondirectory.org\n"
-"POT-Creation-Date: 2015-03-19 21:45+0100\n"
+"POT-Creation-Date: 2014-12-15 17:47+0100\n"
 "PO-Revision-Date: 2015-02-25 16:13+0000\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>\n"
-"Language-Team: French (http://www.transifex.com/projects/p/FusionDirectory-108/language/fr/)\n"
+"Language-Team: French (http://www.transifex.com/projects/p/FusionDirectory-109/language/fr/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -27,23 +25,23 @@ msgstr "Aide au dÃ©bogage "
 msgid "Debug help tools"
 msgstr "Des outils d'aide au dÃ©bogage "
 
-#: debug-help/addons/debug-help/class_debugHelp.inc:33
+#: debug-help/addons/debug-help/class_debugHelp.inc:32
 msgid "Diagram"
 msgstr "Diagrammes"
 
-#: debug-help/addons/debug-help/class_debugHelp.inc:43
+#: debug-help/addons/debug-help/class_debugHelp.inc:42
 msgid "Diagrams"
 msgstr "Diagrammes"
 
-#: debug-help/addons/debug-help/class_debugHelp.inc:47
+#: debug-help/addons/debug-help/class_debugHelp.inc:46
 msgid "Object types diagram"
 msgstr "schÃ©ma des types d'objets "
 
-#: debug-help/addons/debug-help/class_debugHelp.inc:49
+#: debug-help/addons/debug-help/class_debugHelp.inc:48
 msgid "Get"
 msgstr "CrÃ©er"
 
-#: debug-help/addons/debug-help/class_debugHelp.inc:54
+#: debug-help/addons/debug-help/class_debugHelp.inc:53
 msgid "Object Types"
 msgstr "Types d'objets"
 
@@ -134,7 +132,3 @@ msgstr "Plugin de dÃ©monstration"
 #: simple-plugin/demoPlugin/class_demoPlugin.inc:108
 msgid "Edit some useless personal information"
 msgstr "Editer des Informations personnelles"
-
-#: debug-help/addons/debug-help/debughelp.tpl.c:2
-msgid "Insufficient rights"
-msgstr "Permission insuffisantes"
diff --git a/developers/locale/id/fusiondirectory.po b/developers/locale/id/fusiondirectory.po
index 970d46469803566543a96ec964662289720add6b..fab61619bbf6d3bf50c985b34e0f4c0d5542d90e 100644
--- a/developers/locale/id/fusiondirectory.po
+++ b/developers/locale/id/fusiondirectory.po
@@ -5,12 +5,12 @@
 # Translators:
 msgid ""
 msgstr ""
-"Project-Id-Version: FusionDirectory-108\n"
+"Project-Id-Version: FusionDirectory-109\n"
 "Report-Msgid-Bugs-To: documentation@lists.fusiondirectory.org\n"
-"POT-Creation-Date: 2015-03-19 21:45+0100\n"
-"PO-Revision-Date: 2015-02-25 15:43+0000\n"
+"POT-Creation-Date: 2014-12-15 17:47+0100\n"
+"PO-Revision-Date: 2014-12-15 16:51+0000\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>\n"
-"Language-Team: Indonesian (http://www.transifex.com/projects/p/FusionDirectory-108/language/id/)\n"
+"Language-Team: Indonesian (http://www.transifex.com/projects/p/FusionDirectory-109/language/id/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -25,23 +25,23 @@ msgstr ""
 msgid "Debug help tools"
 msgstr ""
 
-#: debug-help/addons/debug-help/class_debugHelp.inc:33
+#: debug-help/addons/debug-help/class_debugHelp.inc:32
 msgid "Diagram"
 msgstr ""
 
-#: debug-help/addons/debug-help/class_debugHelp.inc:43
+#: debug-help/addons/debug-help/class_debugHelp.inc:42
 msgid "Diagrams"
 msgstr ""
 
-#: debug-help/addons/debug-help/class_debugHelp.inc:47
+#: debug-help/addons/debug-help/class_debugHelp.inc:46
 msgid "Object types diagram"
 msgstr ""
 
-#: debug-help/addons/debug-help/class_debugHelp.inc:49
+#: debug-help/addons/debug-help/class_debugHelp.inc:48
 msgid "Get"
 msgstr ""
 
-#: debug-help/addons/debug-help/class_debugHelp.inc:54
+#: debug-help/addons/debug-help/class_debugHelp.inc:53
 msgid "Object Types"
 msgstr ""
 
@@ -132,7 +132,3 @@ msgstr ""
 #: simple-plugin/demoPlugin/class_demoPlugin.inc:108
 msgid "Edit some useless personal information"
 msgstr ""
-
-#: debug-help/addons/debug-help/debughelp.tpl.c:2
-msgid "Insufficient rights"
-msgstr ""
diff --git a/developers/locale/it/fusiondirectory.po b/developers/locale/it/fusiondirectory.po
index 38fbdad170955eac977f5ff02738af19ffdde324..35af6f5c65370f59516a019299ebad07e2821b8d 100644
--- a/developers/locale/it/fusiondirectory.po
+++ b/developers/locale/it/fusiondirectory.po
@@ -5,12 +5,12 @@
 # Translators:
 msgid ""
 msgstr ""
-"Project-Id-Version: FusionDirectory-108\n"
+"Project-Id-Version: FusionDirectory-109\n"
 "Report-Msgid-Bugs-To: documentation@lists.fusiondirectory.org\n"
-"POT-Creation-Date: 2015-03-19 21:45+0100\n"
+"POT-Creation-Date: 2014-12-15 17:47+0100\n"
 "PO-Revision-Date: 2015-02-25 16:13+0000\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>\n"
-"Language-Team: Italian (http://www.transifex.com/projects/p/FusionDirectory-108/language/it/)\n"
+"Language-Team: Italian (http://www.transifex.com/projects/p/FusionDirectory-109/language/it/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -25,23 +25,23 @@ msgstr ""
 msgid "Debug help tools"
 msgstr ""
 
-#: debug-help/addons/debug-help/class_debugHelp.inc:33
+#: debug-help/addons/debug-help/class_debugHelp.inc:32
 msgid "Diagram"
 msgstr ""
 
-#: debug-help/addons/debug-help/class_debugHelp.inc:43
+#: debug-help/addons/debug-help/class_debugHelp.inc:42
 msgid "Diagrams"
 msgstr ""
 
-#: debug-help/addons/debug-help/class_debugHelp.inc:47
+#: debug-help/addons/debug-help/class_debugHelp.inc:46
 msgid "Object types diagram"
 msgstr ""
 
-#: debug-help/addons/debug-help/class_debugHelp.inc:49
+#: debug-help/addons/debug-help/class_debugHelp.inc:48
 msgid "Get"
 msgstr ""
 
-#: debug-help/addons/debug-help/class_debugHelp.inc:54
+#: debug-help/addons/debug-help/class_debugHelp.inc:53
 msgid "Object Types"
 msgstr ""
 
@@ -132,7 +132,3 @@ msgstr "Plugin Demo"
 #: simple-plugin/demoPlugin/class_demoPlugin.inc:108
 msgid "Edit some useless personal information"
 msgstr "Modificare alcune informazioni personali inutili"
-
-#: debug-help/addons/debug-help/debughelp.tpl.c:2
-msgid "Insufficient rights"
-msgstr ""
diff --git a/developers/locale/lv/fusiondirectory.po b/developers/locale/lv/fusiondirectory.po
index c07afdc42adf96e4dbc51b3c0136d7335c97739f..d43f8eb638087b752d64fa00a1217ca346845532 100644
--- a/developers/locale/lv/fusiondirectory.po
+++ b/developers/locale/lv/fusiondirectory.po
@@ -5,12 +5,12 @@
 # Translators:
 msgid ""
 msgstr ""
-"Project-Id-Version: FusionDirectory-108\n"
+"Project-Id-Version: FusionDirectory-109\n"
 "Report-Msgid-Bugs-To: documentation@lists.fusiondirectory.org\n"
-"POT-Creation-Date: 2015-03-19 21:45+0100\n"
-"PO-Revision-Date: 2015-02-25 15:43+0000\n"
+"POT-Creation-Date: 2014-12-15 17:47+0100\n"
+"PO-Revision-Date: 2014-12-15 16:51+0000\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>\n"
-"Language-Team: Latvian (http://www.transifex.com/projects/p/FusionDirectory-108/language/lv/)\n"
+"Language-Team: Latvian (http://www.transifex.com/projects/p/FusionDirectory-109/language/lv/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -25,23 +25,23 @@ msgstr ""
 msgid "Debug help tools"
 msgstr ""
 
-#: debug-help/addons/debug-help/class_debugHelp.inc:33
+#: debug-help/addons/debug-help/class_debugHelp.inc:32
 msgid "Diagram"
 msgstr ""
 
-#: debug-help/addons/debug-help/class_debugHelp.inc:43
+#: debug-help/addons/debug-help/class_debugHelp.inc:42
 msgid "Diagrams"
 msgstr ""
 
-#: debug-help/addons/debug-help/class_debugHelp.inc:47
+#: debug-help/addons/debug-help/class_debugHelp.inc:46
 msgid "Object types diagram"
 msgstr ""
 
-#: debug-help/addons/debug-help/class_debugHelp.inc:49
+#: debug-help/addons/debug-help/class_debugHelp.inc:48
 msgid "Get"
 msgstr ""
 
-#: debug-help/addons/debug-help/class_debugHelp.inc:54
+#: debug-help/addons/debug-help/class_debugHelp.inc:53
 msgid "Object Types"
 msgstr ""
 
@@ -132,7 +132,3 @@ msgstr ""
 #: simple-plugin/demoPlugin/class_demoPlugin.inc:108
 msgid "Edit some useless personal information"
 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 0c9da765afd6f60fa560b76ebbdd65964fb0f859..c7253a55cf77de6402c23c475fd7a60b429adb76 100644
--- a/developers/locale/nb/fusiondirectory.po
+++ b/developers/locale/nb/fusiondirectory.po
@@ -5,12 +5,12 @@
 # Translators:
 msgid ""
 msgstr ""
-"Project-Id-Version: FusionDirectory-108\n"
+"Project-Id-Version: FusionDirectory-109\n"
 "Report-Msgid-Bugs-To: documentation@lists.fusiondirectory.org\n"
-"POT-Creation-Date: 2015-03-19 21:45+0100\n"
+"POT-Creation-Date: 2014-12-15 17:47+0100\n"
 "PO-Revision-Date: 2015-02-25 16:13+0000\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>\n"
-"Language-Team: Norwegian BokmÃ¥l (http://www.transifex.com/projects/p/FusionDirectory-108/language/nb/)\n"
+"Language-Team: Norwegian BokmÃ¥l (http://www.transifex.com/projects/p/FusionDirectory-109/language/nb/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -25,23 +25,23 @@ msgstr ""
 msgid "Debug help tools"
 msgstr ""
 
-#: debug-help/addons/debug-help/class_debugHelp.inc:33
+#: debug-help/addons/debug-help/class_debugHelp.inc:32
 msgid "Diagram"
 msgstr ""
 
-#: debug-help/addons/debug-help/class_debugHelp.inc:43
+#: debug-help/addons/debug-help/class_debugHelp.inc:42
 msgid "Diagrams"
 msgstr ""
 
-#: debug-help/addons/debug-help/class_debugHelp.inc:47
+#: debug-help/addons/debug-help/class_debugHelp.inc:46
 msgid "Object types diagram"
 msgstr ""
 
-#: debug-help/addons/debug-help/class_debugHelp.inc:49
+#: debug-help/addons/debug-help/class_debugHelp.inc:48
 msgid "Get"
 msgstr ""
 
-#: debug-help/addons/debug-help/class_debugHelp.inc:54
+#: debug-help/addons/debug-help/class_debugHelp.inc:53
 msgid "Object Types"
 msgstr ""
 
@@ -132,7 +132,3 @@ msgstr ""
 #: simple-plugin/demoPlugin/class_demoPlugin.inc:108
 msgid "Edit some useless personal information"
 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 7f75111319fb2a59ffb815a73753ba6299882494..2e11f64ede4ff3a5ac65c112ed5b13e36a2890eb 100644
--- a/developers/locale/nl/fusiondirectory.po
+++ b/developers/locale/nl/fusiondirectory.po
@@ -5,12 +5,12 @@
 # Translators:
 msgid ""
 msgstr ""
-"Project-Id-Version: FusionDirectory-108\n"
+"Project-Id-Version: FusionDirectory-109\n"
 "Report-Msgid-Bugs-To: documentation@lists.fusiondirectory.org\n"
-"POT-Creation-Date: 2015-03-19 21:45+0100\n"
+"POT-Creation-Date: 2014-12-15 17:47+0100\n"
 "PO-Revision-Date: 2015-02-25 16:13+0000\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>\n"
-"Language-Team: Dutch (http://www.transifex.com/projects/p/FusionDirectory-108/language/nl/)\n"
+"Language-Team: Dutch (http://www.transifex.com/projects/p/FusionDirectory-109/language/nl/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -25,23 +25,23 @@ msgstr ""
 msgid "Debug help tools"
 msgstr ""
 
-#: debug-help/addons/debug-help/class_debugHelp.inc:33
+#: debug-help/addons/debug-help/class_debugHelp.inc:32
 msgid "Diagram"
 msgstr ""
 
-#: debug-help/addons/debug-help/class_debugHelp.inc:43
+#: debug-help/addons/debug-help/class_debugHelp.inc:42
 msgid "Diagrams"
 msgstr ""
 
-#: debug-help/addons/debug-help/class_debugHelp.inc:47
+#: debug-help/addons/debug-help/class_debugHelp.inc:46
 msgid "Object types diagram"
 msgstr ""
 
-#: debug-help/addons/debug-help/class_debugHelp.inc:49
+#: debug-help/addons/debug-help/class_debugHelp.inc:48
 msgid "Get"
 msgstr ""
 
-#: debug-help/addons/debug-help/class_debugHelp.inc:54
+#: debug-help/addons/debug-help/class_debugHelp.inc:53
 msgid "Object Types"
 msgstr ""
 
@@ -132,7 +132,3 @@ msgstr ""
 #: simple-plugin/demoPlugin/class_demoPlugin.inc:108
 msgid "Edit some useless personal information"
 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 9f8ff5c269917d74dcc1c2dd430119e8f702198d..202997fd3e33dc8ba404c97d003e337b5abf0e25 100644
--- a/developers/locale/pl/fusiondirectory.po
+++ b/developers/locale/pl/fusiondirectory.po
@@ -5,12 +5,12 @@
 # Translators:
 msgid ""
 msgstr ""
-"Project-Id-Version: FusionDirectory-108\n"
+"Project-Id-Version: FusionDirectory-109\n"
 "Report-Msgid-Bugs-To: documentation@lists.fusiondirectory.org\n"
-"POT-Creation-Date: 2015-03-19 21:45+0100\n"
-"PO-Revision-Date: 2015-02-25 15:43+0000\n"
+"POT-Creation-Date: 2014-12-15 17:47+0100\n"
+"PO-Revision-Date: 2014-12-15 16:51+0000\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>\n"
-"Language-Team: Polish (http://www.transifex.com/projects/p/FusionDirectory-108/language/pl/)\n"
+"Language-Team: Polish (http://www.transifex.com/projects/p/FusionDirectory-109/language/pl/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -25,23 +25,23 @@ msgstr ""
 msgid "Debug help tools"
 msgstr ""
 
-#: debug-help/addons/debug-help/class_debugHelp.inc:33
+#: debug-help/addons/debug-help/class_debugHelp.inc:32
 msgid "Diagram"
 msgstr ""
 
-#: debug-help/addons/debug-help/class_debugHelp.inc:43
+#: debug-help/addons/debug-help/class_debugHelp.inc:42
 msgid "Diagrams"
 msgstr ""
 
-#: debug-help/addons/debug-help/class_debugHelp.inc:47
+#: debug-help/addons/debug-help/class_debugHelp.inc:46
 msgid "Object types diagram"
 msgstr ""
 
-#: debug-help/addons/debug-help/class_debugHelp.inc:49
+#: debug-help/addons/debug-help/class_debugHelp.inc:48
 msgid "Get"
 msgstr ""
 
-#: debug-help/addons/debug-help/class_debugHelp.inc:54
+#: debug-help/addons/debug-help/class_debugHelp.inc:53
 msgid "Object Types"
 msgstr ""
 
@@ -132,7 +132,3 @@ msgstr ""
 #: simple-plugin/demoPlugin/class_demoPlugin.inc:108
 msgid "Edit some useless personal information"
 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 a3e635adbdb3d77f895b6fb3d5ff9a027dbb48ea..7cf4cbd9fb0c4bad7b2144494a9525fcda8c01f9 100644
--- a/developers/locale/pt/fusiondirectory.po
+++ b/developers/locale/pt/fusiondirectory.po
@@ -5,12 +5,12 @@
 # Translators:
 msgid ""
 msgstr ""
-"Project-Id-Version: FusionDirectory-108\n"
+"Project-Id-Version: FusionDirectory-109\n"
 "Report-Msgid-Bugs-To: documentation@lists.fusiondirectory.org\n"
-"POT-Creation-Date: 2015-03-19 21:45+0100\n"
-"PO-Revision-Date: 2015-02-25 15:43+0000\n"
+"POT-Creation-Date: 2014-12-15 17:47+0100\n"
+"PO-Revision-Date: 2014-12-15 16:51+0000\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>\n"
-"Language-Team: Portuguese (http://www.transifex.com/projects/p/FusionDirectory-108/language/pt/)\n"
+"Language-Team: Portuguese (http://www.transifex.com/projects/p/FusionDirectory-109/language/pt/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -25,23 +25,23 @@ msgstr ""
 msgid "Debug help tools"
 msgstr ""
 
-#: debug-help/addons/debug-help/class_debugHelp.inc:33
+#: debug-help/addons/debug-help/class_debugHelp.inc:32
 msgid "Diagram"
 msgstr ""
 
-#: debug-help/addons/debug-help/class_debugHelp.inc:43
+#: debug-help/addons/debug-help/class_debugHelp.inc:42
 msgid "Diagrams"
 msgstr ""
 
-#: debug-help/addons/debug-help/class_debugHelp.inc:47
+#: debug-help/addons/debug-help/class_debugHelp.inc:46
 msgid "Object types diagram"
 msgstr ""
 
-#: debug-help/addons/debug-help/class_debugHelp.inc:49
+#: debug-help/addons/debug-help/class_debugHelp.inc:48
 msgid "Get"
 msgstr ""
 
-#: debug-help/addons/debug-help/class_debugHelp.inc:54
+#: debug-help/addons/debug-help/class_debugHelp.inc:53
 msgid "Object Types"
 msgstr ""
 
@@ -132,7 +132,3 @@ msgstr ""
 #: simple-plugin/demoPlugin/class_demoPlugin.inc:108
 msgid "Edit some useless personal information"
 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 57f085114f03a0801e746b729343a3a3343c8cdb..ea4a8135787483d031eceed6212cbcd2fc541f5b 100644
--- a/developers/locale/pt_BR/fusiondirectory.po
+++ b/developers/locale/pt_BR/fusiondirectory.po
@@ -5,12 +5,12 @@
 # Translators:
 msgid ""
 msgstr ""
-"Project-Id-Version: FusionDirectory-108\n"
+"Project-Id-Version: FusionDirectory-109\n"
 "Report-Msgid-Bugs-To: documentation@lists.fusiondirectory.org\n"
-"POT-Creation-Date: 2015-03-19 21:45+0100\n"
+"POT-Creation-Date: 2014-12-15 17:47+0100\n"
 "PO-Revision-Date: 2015-02-25 16:13+0000\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>\n"
-"Language-Team: Portuguese (Brazil) (http://www.transifex.com/projects/p/FusionDirectory-108/language/pt_BR/)\n"
+"Language-Team: Portuguese (Brazil) (http://www.transifex.com/projects/p/FusionDirectory-109/language/pt_BR/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -25,23 +25,23 @@ msgstr ""
 msgid "Debug help tools"
 msgstr ""
 
-#: debug-help/addons/debug-help/class_debugHelp.inc:33
+#: debug-help/addons/debug-help/class_debugHelp.inc:32
 msgid "Diagram"
 msgstr "Diagrama"
 
-#: debug-help/addons/debug-help/class_debugHelp.inc:43
+#: debug-help/addons/debug-help/class_debugHelp.inc:42
 msgid "Diagrams"
 msgstr "Diagramas"
 
-#: debug-help/addons/debug-help/class_debugHelp.inc:47
+#: debug-help/addons/debug-help/class_debugHelp.inc:46
 msgid "Object types diagram"
 msgstr "Diagrama de tipos de objeto"
 
-#: debug-help/addons/debug-help/class_debugHelp.inc:49
+#: debug-help/addons/debug-help/class_debugHelp.inc:48
 msgid "Get"
 msgstr "Obter"
 
-#: debug-help/addons/debug-help/class_debugHelp.inc:54
+#: debug-help/addons/debug-help/class_debugHelp.inc:53
 msgid "Object Types"
 msgstr ""
 
@@ -132,7 +132,3 @@ msgstr "Plugin Demo"
 #: simple-plugin/demoPlugin/class_demoPlugin.inc:108
 msgid "Edit some useless personal information"
 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 4655f9ce192a53fda31bdbf2346bcac8ba9b70ab..aded8951ccf65128593d4a85149d45aefed87d5b 100644
--- a/developers/locale/ru/fusiondirectory.po
+++ b/developers/locale/ru/fusiondirectory.po
@@ -5,17 +5,17 @@
 # Translators:
 msgid ""
 msgstr ""
-"Project-Id-Version: FusionDirectory-108\n"
+"Project-Id-Version: FusionDirectory-109\n"
 "Report-Msgid-Bugs-To: documentation@lists.fusiondirectory.org\n"
-"POT-Creation-Date: 2015-03-19 21:45+0100\n"
-"PO-Revision-Date: 2015-02-25 15:43+0000\n"
+"POT-Creation-Date: 2014-12-15 17:47+0100\n"
+"PO-Revision-Date: 2015-03-21 23:49+0000\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>\n"
-"Language-Team: Russian (http://www.transifex.com/projects/p/FusionDirectory-108/language/ru/)\n"
+"Language-Team: Russian (http://www.transifex.com/projects/p/FusionDirectory-109/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=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);\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:28
 msgid "Debug help"
@@ -25,23 +25,23 @@ msgstr ""
 msgid "Debug help tools"
 msgstr ""
 
-#: debug-help/addons/debug-help/class_debugHelp.inc:33
+#: debug-help/addons/debug-help/class_debugHelp.inc:32
 msgid "Diagram"
 msgstr ""
 
-#: debug-help/addons/debug-help/class_debugHelp.inc:43
+#: debug-help/addons/debug-help/class_debugHelp.inc:42
 msgid "Diagrams"
 msgstr ""
 
-#: debug-help/addons/debug-help/class_debugHelp.inc:47
+#: debug-help/addons/debug-help/class_debugHelp.inc:46
 msgid "Object types diagram"
 msgstr ""
 
-#: debug-help/addons/debug-help/class_debugHelp.inc:49
+#: debug-help/addons/debug-help/class_debugHelp.inc:48
 msgid "Get"
 msgstr ""
 
-#: debug-help/addons/debug-help/class_debugHelp.inc:54
+#: debug-help/addons/debug-help/class_debugHelp.inc:53
 msgid "Object Types"
 msgstr ""
 
@@ -111,7 +111,7 @@ msgstr ""
 
 #: simple-plugin/demoPlugin/class_demoPlugin.inc:92
 msgid "Host"
-msgstr ""
+msgstr "Ð¥Ð¾ÑÑ‚"
 
 #: simple-plugin/demoPlugin/class_demoPlugin.inc:92
 msgid "Host for FTP"
@@ -132,7 +132,3 @@ msgstr ""
 #: simple-plugin/demoPlugin/class_demoPlugin.inc:108
 msgid "Edit some useless personal information"
 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 fca6f91d2f2c677630b98f40d01f0b4307b5ab2d..ed720d43a7e52f3fe1e7d2328ee8e1d3f44afdea 100644
--- a/developers/locale/ru@petr1708/fusiondirectory.po
+++ b/developers/locale/ru@petr1708/fusiondirectory.po
@@ -5,17 +5,17 @@
 # Translators:
 msgid ""
 msgstr ""
-"Project-Id-Version: FusionDirectory-108\n"
+"Project-Id-Version: FusionDirectory-109\n"
 "Report-Msgid-Bugs-To: documentation@lists.fusiondirectory.org\n"
-"POT-Creation-Date: 2015-03-19 21:45+0100\n"
-"PO-Revision-Date: 2015-02-25 15:43+0000\n"
+"POT-Creation-Date: 2014-12-15 17:47+0100\n"
+"PO-Revision-Date: 2014-12-15 16:51+0000\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>\n"
-"Language-Team: Russian Petrine orthography (http://www.transifex.com/projects/p/FusionDirectory-108/language/ru@petr1708/)\n"
+"Language-Team: Russian Petrine orthography (http://www.transifex.com/projects/p/FusionDirectory-109/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=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);\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:28
 msgid "Debug help"
@@ -25,23 +25,23 @@ msgstr ""
 msgid "Debug help tools"
 msgstr ""
 
-#: debug-help/addons/debug-help/class_debugHelp.inc:33
+#: debug-help/addons/debug-help/class_debugHelp.inc:32
 msgid "Diagram"
 msgstr ""
 
-#: debug-help/addons/debug-help/class_debugHelp.inc:43
+#: debug-help/addons/debug-help/class_debugHelp.inc:42
 msgid "Diagrams"
 msgstr ""
 
-#: debug-help/addons/debug-help/class_debugHelp.inc:47
+#: debug-help/addons/debug-help/class_debugHelp.inc:46
 msgid "Object types diagram"
 msgstr ""
 
-#: debug-help/addons/debug-help/class_debugHelp.inc:49
+#: debug-help/addons/debug-help/class_debugHelp.inc:48
 msgid "Get"
 msgstr ""
 
-#: debug-help/addons/debug-help/class_debugHelp.inc:54
+#: debug-help/addons/debug-help/class_debugHelp.inc:53
 msgid "Object Types"
 msgstr ""
 
@@ -132,7 +132,3 @@ msgstr ""
 #: simple-plugin/demoPlugin/class_demoPlugin.inc:108
 msgid "Edit some useless personal information"
 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 47638db94783e17c2dd1fd0ca390e12da18728e8..a2feb3e83db25a662e1cf8c70742dc551ba441c7 100644
--- a/developers/locale/sv/fusiondirectory.po
+++ b/developers/locale/sv/fusiondirectory.po
@@ -5,12 +5,12 @@
 # Translators:
 msgid ""
 msgstr ""
-"Project-Id-Version: FusionDirectory-108\n"
+"Project-Id-Version: FusionDirectory-109\n"
 "Report-Msgid-Bugs-To: documentation@lists.fusiondirectory.org\n"
-"POT-Creation-Date: 2015-03-19 21:45+0100\n"
+"POT-Creation-Date: 2014-12-15 17:47+0100\n"
 "PO-Revision-Date: 2015-02-25 16:13+0000\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>\n"
-"Language-Team: Swedish (http://www.transifex.com/projects/p/FusionDirectory-108/language/sv/)\n"
+"Language-Team: Swedish (http://www.transifex.com/projects/p/FusionDirectory-109/language/sv/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -25,23 +25,23 @@ msgstr ""
 msgid "Debug help tools"
 msgstr ""
 
-#: debug-help/addons/debug-help/class_debugHelp.inc:33
+#: debug-help/addons/debug-help/class_debugHelp.inc:32
 msgid "Diagram"
 msgstr "Diagram"
 
-#: debug-help/addons/debug-help/class_debugHelp.inc:43
+#: debug-help/addons/debug-help/class_debugHelp.inc:42
 msgid "Diagrams"
 msgstr "Diagram"
 
-#: debug-help/addons/debug-help/class_debugHelp.inc:47
+#: debug-help/addons/debug-help/class_debugHelp.inc:46
 msgid "Object types diagram"
 msgstr "Objekttyps-diagram"
 
-#: debug-help/addons/debug-help/class_debugHelp.inc:49
+#: debug-help/addons/debug-help/class_debugHelp.inc:48
 msgid "Get"
 msgstr "HÃ¤mta"
 
-#: debug-help/addons/debug-help/class_debugHelp.inc:54
+#: debug-help/addons/debug-help/class_debugHelp.inc:53
 msgid "Object Types"
 msgstr ""
 
@@ -132,7 +132,3 @@ msgstr "Demo-plugin"
 #: simple-plugin/demoPlugin/class_demoPlugin.inc:108
 msgid "Edit some useless personal information"
 msgstr "Redigera nÃ¥gon meningslÃ¶s personlig information"
-
-#: 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 1f14e6b71dfc2b762edd9bc9aaeca1dbf70f6941..76a57040b6c92b4a4db6e191ee4bbb0ee027b209 100644
--- a/developers/locale/ug/fusiondirectory.po
+++ b/developers/locale/ug/fusiondirectory.po
@@ -5,12 +5,12 @@
 # Translators:
 msgid ""
 msgstr ""
-"Project-Id-Version: FusionDirectory-108\n"
+"Project-Id-Version: FusionDirectory-109\n"
 "Report-Msgid-Bugs-To: documentation@lists.fusiondirectory.org\n"
-"POT-Creation-Date: 2015-03-19 21:45+0100\n"
-"PO-Revision-Date: 2015-02-25 15:43+0000\n"
+"POT-Creation-Date: 2014-12-15 17:47+0100\n"
+"PO-Revision-Date: 2014-12-15 16:51+0000\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>\n"
-"Language-Team: Uighur (http://www.transifex.com/projects/p/FusionDirectory-108/language/ug/)\n"
+"Language-Team: Uighur (http://www.transifex.com/projects/p/FusionDirectory-109/language/ug/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -25,23 +25,23 @@ msgstr ""
 msgid "Debug help tools"
 msgstr ""
 
-#: debug-help/addons/debug-help/class_debugHelp.inc:33
+#: debug-help/addons/debug-help/class_debugHelp.inc:32
 msgid "Diagram"
 msgstr ""
 
-#: debug-help/addons/debug-help/class_debugHelp.inc:43
+#: debug-help/addons/debug-help/class_debugHelp.inc:42
 msgid "Diagrams"
 msgstr ""
 
-#: debug-help/addons/debug-help/class_debugHelp.inc:47
+#: debug-help/addons/debug-help/class_debugHelp.inc:46
 msgid "Object types diagram"
 msgstr ""
 
-#: debug-help/addons/debug-help/class_debugHelp.inc:49
+#: debug-help/addons/debug-help/class_debugHelp.inc:48
 msgid "Get"
 msgstr ""
 
-#: debug-help/addons/debug-help/class_debugHelp.inc:54
+#: debug-help/addons/debug-help/class_debugHelp.inc:53
 msgid "Object Types"
 msgstr ""
 
@@ -132,7 +132,3 @@ msgstr ""
 #: simple-plugin/demoPlugin/class_demoPlugin.inc:108
 msgid "Edit some useless personal information"
 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 9e8444f550acc840217a1d419c8a43c840ba4f9d..a3a8baaa0d7b10af132bc47739da877bd63449a6 100644
--- a/developers/locale/vi_VN/fusiondirectory.po
+++ b/developers/locale/vi_VN/fusiondirectory.po
@@ -5,12 +5,12 @@
 # Translators:
 msgid ""
 msgstr ""
-"Project-Id-Version: FusionDirectory-108\n"
+"Project-Id-Version: FusionDirectory-109\n"
 "Report-Msgid-Bugs-To: documentation@lists.fusiondirectory.org\n"
-"POT-Creation-Date: 2015-03-19 21:45+0100\n"
-"PO-Revision-Date: 2015-02-25 15:43+0000\n"
+"POT-Creation-Date: 2014-12-15 17:47+0100\n"
+"PO-Revision-Date: 2014-12-15 16:51+0000\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>\n"
-"Language-Team: Vietnamese (Viet Nam) (http://www.transifex.com/projects/p/FusionDirectory-108/language/vi_VN/)\n"
+"Language-Team: Vietnamese (Viet Nam) (http://www.transifex.com/projects/p/FusionDirectory-109/language/vi_VN/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -25,23 +25,23 @@ msgstr ""
 msgid "Debug help tools"
 msgstr ""
 
-#: debug-help/addons/debug-help/class_debugHelp.inc:33
+#: debug-help/addons/debug-help/class_debugHelp.inc:32
 msgid "Diagram"
 msgstr ""
 
-#: debug-help/addons/debug-help/class_debugHelp.inc:43
+#: debug-help/addons/debug-help/class_debugHelp.inc:42
 msgid "Diagrams"
 msgstr ""
 
-#: debug-help/addons/debug-help/class_debugHelp.inc:47
+#: debug-help/addons/debug-help/class_debugHelp.inc:46
 msgid "Object types diagram"
 msgstr ""
 
-#: debug-help/addons/debug-help/class_debugHelp.inc:49
+#: debug-help/addons/debug-help/class_debugHelp.inc:48
 msgid "Get"
 msgstr ""
 
-#: debug-help/addons/debug-help/class_debugHelp.inc:54
+#: debug-help/addons/debug-help/class_debugHelp.inc:53
 msgid "Object Types"
 msgstr ""
 
@@ -132,7 +132,3 @@ msgstr ""
 #: simple-plugin/demoPlugin/class_demoPlugin.inc:108
 msgid "Edit some useless personal information"
 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 71666087e798d240ff263baf6bdbba7771ca50eb..17dbcbab6d6fcd1e6b477d888d0dc72cf068ed62 100644
--- a/developers/locale/zh/fusiondirectory.po
+++ b/developers/locale/zh/fusiondirectory.po
@@ -5,12 +5,12 @@
 # Translators:
 msgid ""
 msgstr ""
-"Project-Id-Version: FusionDirectory-108\n"
+"Project-Id-Version: FusionDirectory-109\n"
 "Report-Msgid-Bugs-To: documentation@lists.fusiondirectory.org\n"
-"POT-Creation-Date: 2015-03-19 21:45+0100\n"
-"PO-Revision-Date: 2015-02-25 15:43+0000\n"
+"POT-Creation-Date: 2014-12-15 17:47+0100\n"
+"PO-Revision-Date: 2014-12-15 16:51+0000\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>\n"
-"Language-Team: Chinese (http://www.transifex.com/projects/p/FusionDirectory-108/language/zh/)\n"
+"Language-Team: Chinese (http://www.transifex.com/projects/p/FusionDirectory-109/language/zh/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -25,23 +25,23 @@ msgstr ""
 msgid "Debug help tools"
 msgstr ""
 
-#: debug-help/addons/debug-help/class_debugHelp.inc:33
+#: debug-help/addons/debug-help/class_debugHelp.inc:32
 msgid "Diagram"
 msgstr ""
 
-#: debug-help/addons/debug-help/class_debugHelp.inc:43
+#: debug-help/addons/debug-help/class_debugHelp.inc:42
 msgid "Diagrams"
 msgstr ""
 
-#: debug-help/addons/debug-help/class_debugHelp.inc:47
+#: debug-help/addons/debug-help/class_debugHelp.inc:46
 msgid "Object types diagram"
 msgstr ""
 
-#: debug-help/addons/debug-help/class_debugHelp.inc:49
+#: debug-help/addons/debug-help/class_debugHelp.inc:48
 msgid "Get"
 msgstr ""
 
-#: debug-help/addons/debug-help/class_debugHelp.inc:54
+#: debug-help/addons/debug-help/class_debugHelp.inc:53
 msgid "Object Types"
 msgstr ""
 
@@ -132,7 +132,3 @@ msgstr ""
 #: simple-plugin/demoPlugin/class_demoPlugin.inc:108
 msgid "Edit some useless personal information"
 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 2cf4be347ac6bf062abba56f78a7b1b55b8d1ddf..e1b6813506f527fc83d91038f98152e9ada94be6 100644
--- a/dhcp/locale/ar/fusiondirectory.po
+++ b/dhcp/locale/ar/fusiondirectory.po
@@ -5,12 +5,12 @@
 # Translators:
 msgid ""
 msgstr ""
-"Project-Id-Version: FusionDirectory-108\n"
+"Project-Id-Version: FusionDirectory-109\n"
 "Report-Msgid-Bugs-To: documentation@lists.fusiondirectory.org\n"
-"POT-Creation-Date: 2015-03-19 21:45+0100\n"
-"PO-Revision-Date: 2015-02-25 16:02+0000\n"
+"POT-Creation-Date: 2014-12-15 17:47+0100\n"
+"PO-Revision-Date: 2015-02-25 16:04+0000\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>\n"
-"Language-Team: Arabic (http://www.transifex.com/projects/p/FusionDirectory-108/language/ar/)\n"
+"Language-Team: Arabic (http://www.transifex.com/projects/p/FusionDirectory-109/language/ar/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -19,7 +19,7 @@ msgstr ""
 
 #: admin/systems/services/dhcp/class_dhcpAdvanced.inc:59
 #: admin/systems/services/dhcp/class_dhcpAdvanced.inc:73
-#: admin/systems/services/dhcp/class_serviceDHCP.inc:776
+#: admin/systems/services/dhcp/class_serviceDHCP.inc:774
 #: admin/systems/services/dhcp/class_dhcpNetwork.inc:48
 msgid "Error"
 msgstr "Ø®Ø·Ø£"
@@ -52,10 +52,6 @@ msgstr "ØªÙ„Ù‚Ø§Ø¦ÙŠ"
 #: 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 "Ø§Ù„Ø¥Ø³Ù…"
 
@@ -64,7 +60,6 @@ msgstr "Ø§Ù„Ø¥Ø³Ù…"
 #: 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 ""
 
@@ -75,15 +70,12 @@ 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 ""
 
@@ -94,7 +86,7 @@ msgstr ""
 #: admin/systems/services/dhcp/class_dhcpNewSectionDialog.inc:48
 #: admin/systems/services/dhcp/class_serviceDHCP.inc:62
 #: admin/systems/services/dhcp/class_serviceDHCP.inc:103
-#: admin/systems/services/dhcp/class_serviceDHCP.inc:731
+#: admin/systems/services/dhcp/class_serviceDHCP.inc:729
 msgid "Global options"
 msgstr ""
 
@@ -135,7 +127,6 @@ msgstr ""
 
 #: admin/systems/services/dhcp/class_dhcpNewSectionDialog.inc:56
 #: admin/systems/services/dhcp/class_serviceDHCP.inc:71
-#: admin/systems/services/dhcp/dhcp_tsigkey.tpl.c:2
 msgid "DNS update key"
 msgstr ""
 
@@ -145,18 +136,14 @@ msgid "DNS update zones"
 msgstr ""
 
 #: admin/systems/services/dhcp/class_dhcpDnsZone.inc:150
-#: admin/systems/services/dhcp/dhcp_dnszone.tpl.c:5
 msgid "DNS zone"
 msgstr ""
 
 #: admin/systems/services/dhcp/class_dhcpDnsZone.inc:154
-#: 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:158
-#: admin/systems/services/dhcp/dhcp_dnszone.tpl.c:11
 msgid "Key DN"
 msgstr ""
 
@@ -173,7 +160,6 @@ msgid "Token Ring"
 msgstr ""
 
 #: admin/systems/services/dhcp/class_dhcpHost.inc:149
-#: admin/systems/services/dhcp/dhcp_host.tpl.c:20
 msgid "Hardware address"
 msgstr ""
 
@@ -187,20 +173,17 @@ 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_dhcpService.inc:134
-#: admin/systems/services/dhcp/dhcp_sharedNetwork.tpl.c:38
 msgid "Maximum lease time"
 msgstr ""
 
 #: admin/systems/services/dhcp/class_serviceDHCP.inc:59
-#: admin/systems/services/dhcp/class_serviceDHCP.inc:787
-#: admin/systems/services/dhcp/class_serviceDHCP.inc:788
-#: admin/systems/services/dhcp/class_serviceDHCP.inc:830
+#: admin/systems/services/dhcp/class_serviceDHCP.inc:785
+#: admin/systems/services/dhcp/class_serviceDHCP.inc:786
+#: admin/systems/services/dhcp/class_serviceDHCP.inc:828
 msgid "DHCP service"
 msgstr ""
 
@@ -224,75 +207,73 @@ msgid "The migration will be started when you save this system."
 msgstr ""
 
 #: admin/systems/services/dhcp/class_serviceDHCP.inc:154
-#: admin/systems/services/dhcp/remove_dhcp.tpl.c:2
 msgid "Warning"
 msgstr "ØªØØ°ÙŠØ±"
 
-#: admin/systems/services/dhcp/class_serviceDHCP.inc:247
+#: admin/systems/services/dhcp/class_serviceDHCP.inc:246
 msgid "Permission error"
 msgstr ""
 
-#: admin/systems/services/dhcp/class_serviceDHCP.inc:284
+#: admin/systems/services/dhcp/class_serviceDHCP.inc:283
 msgid "DHCP section"
 msgstr ""
 
-#: admin/systems/services/dhcp/class_serviceDHCP.inc:340
-#: admin/systems/services/dhcp/class_serviceDHCP.inc:343
+#: admin/systems/services/dhcp/class_serviceDHCP.inc:339
+#: admin/systems/services/dhcp/class_serviceDHCP.inc:342
 msgid "Insert new DHCP section"
 msgstr ""
 
-#: admin/systems/services/dhcp/class_serviceDHCP.inc:341
+#: admin/systems/services/dhcp/class_serviceDHCP.inc:340
+#: admin/systems/services/dhcp/class_serviceDHCP.inc:343
 #: admin/systems/services/dhcp/class_serviceDHCP.inc:344
-#: admin/systems/services/dhcp/class_serviceDHCP.inc:345
 msgid "Edit DHCP section"
 msgstr ""
 
-#: admin/systems/services/dhcp/class_serviceDHCP.inc:342
-#: admin/systems/services/dhcp/class_serviceDHCP.inc:346
+#: admin/systems/services/dhcp/class_serviceDHCP.inc:341
+#: admin/systems/services/dhcp/class_serviceDHCP.inc:345
 msgid "Remove DHCP section"
 msgstr ""
 
-#: admin/systems/services/dhcp/class_serviceDHCP.inc:347
+#: admin/systems/services/dhcp/class_serviceDHCP.inc:346
 msgid "Expand DHCP subnet"
 msgstr ""
 
-#: admin/systems/services/dhcp/class_serviceDHCP.inc:348
+#: admin/systems/services/dhcp/class_serviceDHCP.inc:347
 msgid "Fold DHCP subnet"
 msgstr ""
 
-#: admin/systems/services/dhcp/class_serviceDHCP.inc:425
-#: admin/systems/services/dhcp/class_serviceDHCP.inc:442
-#: admin/systems/services/dhcp/class_serviceDHCP.inc:497
-#: admin/systems/services/dhcp/class_serviceDHCP.inc:573
-#: admin/systems/services/dhcp/class_serviceDHCP.inc:581
-#: admin/systems/services/dhcp/class_serviceDHCP.inc:608
+#: admin/systems/services/dhcp/class_serviceDHCP.inc:422
+#: admin/systems/services/dhcp/class_serviceDHCP.inc:439
+#: admin/systems/services/dhcp/class_serviceDHCP.inc:494
+#: admin/systems/services/dhcp/class_serviceDHCP.inc:570
+#: admin/systems/services/dhcp/class_serviceDHCP.inc:578
+#: admin/systems/services/dhcp/class_serviceDHCP.inc:605
 msgid "LDAP error"
 msgstr ""
 
-#: admin/systems/services/dhcp/class_serviceDHCP.inc:776
+#: admin/systems/services/dhcp/class_serviceDHCP.inc:774
 msgid ""
 "The DHCP configuration set is unkown. Please contact your system "
 "administrator."
 msgstr ""
 
-#: admin/systems/services/dhcp/class_serviceDHCP.inc:788
+#: admin/systems/services/dhcp/class_serviceDHCP.inc:786
 msgid "Services"
 msgstr "Ø®Ø¯Ù…Ø§Øª"
 
-#: admin/systems/services/dhcp/class_serviceDHCP.inc:795
+#: admin/systems/services/dhcp/class_serviceDHCP.inc:793
 msgid "Start service"
 msgstr ""
 
-#: admin/systems/services/dhcp/class_serviceDHCP.inc:796
+#: admin/systems/services/dhcp/class_serviceDHCP.inc:794
 msgid "Stop service"
 msgstr ""
 
-#: admin/systems/services/dhcp/class_serviceDHCP.inc:797
+#: admin/systems/services/dhcp/class_serviceDHCP.inc:795
 msgid "Restart service"
 msgstr ""
 
 #: admin/systems/services/dhcp/class_dhcpNetwork.inc:197
-#: admin/systems/services/dhcp/dhcp_network.tpl.c:14
 msgid "Broadcast"
 msgstr ""
 
@@ -323,297 +304,17 @@ msgstr ""
 
 #: admin/systems/services/dhcp/class_dhcpTSigKey.inc:114
 #: admin/systems/services/dhcp/class_dhcpTSigKey.inc:127
-#: admin/systems/services/dhcp/dhcp_tsigkey.tpl.c:5
 msgid "Key name"
 msgstr ""
 
 #: admin/systems/services/dhcp/class_dhcpTSigKey.inc:118
-#: 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/serviceDHCP.tpl.c:2
-msgid ""
-"DHCP take over will take place when saving this entry. Choose 'Cancel' to "
-"abort."
-msgstr ""
-
-#: admin/systems/services/dhcp/serviceDHCP.tpl.c:5
-msgid "Take over dhcp configuration from following server"
-msgstr ""
-
-#: admin/systems/services/dhcp/serviceDHCP.tpl.c:8
-msgid "DHCP sections"
-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 ""
-
-#: 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"
-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 ""
-
-#: 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 ""
-
-#: 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"
-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
-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 ""
-
-#: 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"
-msgstr ""
-
-#: admin/systems/services/dhcp/dhcp_advanced.tpl.c:11
-msgid "Show advanced settings"
-msgstr ""
-
-#: admin/systems/services/dhcp/dhcp_host.tpl.c:8
-msgid "Name of host"
-msgstr ""
-
-#: admin/systems/services/dhcp/dhcp_host.tpl.c:11
-msgid "Fixed address"
-msgstr ""
-
-#: admin/systems/services/dhcp/dhcp_host.tpl.c:14
-msgid "Use hostname or IP-address to assign fixed address"
-msgstr ""
-
-#: admin/systems/services/dhcp/dhcp_host.tpl.c:17
-msgid "Hardware type"
-msgstr ""
-
-#: admin/systems/services/dhcp/dhcp_sharedNetwork.tpl.c:8
-msgid "Name for shared network"
-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"
-msgstr ""
-
-#: admin/systems/services/dhcp/dhcp_sharedNetwork.tpl.c:17
-msgid "Select if this server is authoritative for this shared network"
-msgstr ""
-
-#: admin/systems/services/dhcp/dhcp_sharedNetwork.tpl.c:20
-msgid "Authoritative server"
-msgstr ""
-
-#: admin/systems/services/dhcp/dhcp_sharedNetwork.tpl.c:23
-msgid "Leases"
-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 ""
-
-#: 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"
-msgstr ""
-
-#: admin/systems/services/dhcp/dhcp_sharedNetwork.tpl.c:65
-msgid "Allow bootp clients"
-msgstr ""
-
-#: admin/systems/services/dhcp/dhcp_sharedNetwork.tpl.c:68
-msgid "Select if clients are allowed to boot using this DHCP server"
-msgstr ""
-
-#: admin/systems/services/dhcp/dhcp_sharedNetwork.tpl.c:71
-msgid "Allow booting"
-msgstr ""
diff --git a/dhcp/locale/ca/fusiondirectory.po b/dhcp/locale/ca/fusiondirectory.po
index caf8cd06d0fc496ed22fd91f7191078cbdbed185..547c01757e7740506ac28f6ef2621ff939a8194c 100644
--- a/dhcp/locale/ca/fusiondirectory.po
+++ b/dhcp/locale/ca/fusiondirectory.po
@@ -5,12 +5,12 @@
 # Translators:
 msgid ""
 msgstr ""
-"Project-Id-Version: FusionDirectory-108\n"
+"Project-Id-Version: FusionDirectory-109\n"
 "Report-Msgid-Bugs-To: documentation@lists.fusiondirectory.org\n"
-"POT-Creation-Date: 2015-03-19 21:45+0100\n"
-"PO-Revision-Date: 2015-02-25 16:12+0000\n"
+"POT-Creation-Date: 2014-12-15 17:47+0100\n"
+"PO-Revision-Date: 2015-02-25 16:04+0000\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>\n"
-"Language-Team: Catalan (http://www.transifex.com/projects/p/FusionDirectory-108/language/ca/)\n"
+"Language-Team: Catalan (http://www.transifex.com/projects/p/FusionDirectory-109/language/ca/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -19,7 +19,7 @@ msgstr ""
 
 #: admin/systems/services/dhcp/class_dhcpAdvanced.inc:59
 #: admin/systems/services/dhcp/class_dhcpAdvanced.inc:73
-#: admin/systems/services/dhcp/class_serviceDHCP.inc:776
+#: admin/systems/services/dhcp/class_serviceDHCP.inc:774
 #: admin/systems/services/dhcp/class_dhcpNetwork.inc:48
 msgid "Error"
 msgstr "Error"
@@ -52,10 +52,6 @@ msgstr ""
 #: 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"
 
@@ -64,7 +60,6 @@ msgstr "Nom"
 #: 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 ""
 
@@ -75,15 +70,12 @@ 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 ""
 
@@ -94,7 +86,7 @@ msgstr ""
 #: admin/systems/services/dhcp/class_dhcpNewSectionDialog.inc:48
 #: admin/systems/services/dhcp/class_serviceDHCP.inc:62
 #: admin/systems/services/dhcp/class_serviceDHCP.inc:103
-#: admin/systems/services/dhcp/class_serviceDHCP.inc:731
+#: admin/systems/services/dhcp/class_serviceDHCP.inc:729
 msgid "Global options"
 msgstr ""
 
@@ -135,7 +127,6 @@ msgstr ""
 
 #: admin/systems/services/dhcp/class_dhcpNewSectionDialog.inc:56
 #: admin/systems/services/dhcp/class_serviceDHCP.inc:71
-#: admin/systems/services/dhcp/dhcp_tsigkey.tpl.c:2
 msgid "DNS update key"
 msgstr ""
 
@@ -145,18 +136,14 @@ msgid "DNS update zones"
 msgstr ""
 
 #: admin/systems/services/dhcp/class_dhcpDnsZone.inc:150
-#: admin/systems/services/dhcp/dhcp_dnszone.tpl.c:5
 msgid "DNS zone"
 msgstr ""
 
 #: admin/systems/services/dhcp/class_dhcpDnsZone.inc:154
-#: 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:158
-#: admin/systems/services/dhcp/dhcp_dnszone.tpl.c:11
 msgid "Key DN"
 msgstr ""
 
@@ -173,7 +160,6 @@ msgid "Token Ring"
 msgstr ""
 
 #: admin/systems/services/dhcp/class_dhcpHost.inc:149
-#: admin/systems/services/dhcp/dhcp_host.tpl.c:20
 msgid "Hardware address"
 msgstr ""
 
@@ -187,20 +173,17 @@ 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_dhcpService.inc:134
-#: admin/systems/services/dhcp/dhcp_sharedNetwork.tpl.c:38
 msgid "Maximum lease time"
 msgstr ""
 
 #: admin/systems/services/dhcp/class_serviceDHCP.inc:59
-#: admin/systems/services/dhcp/class_serviceDHCP.inc:787
-#: admin/systems/services/dhcp/class_serviceDHCP.inc:788
-#: admin/systems/services/dhcp/class_serviceDHCP.inc:830
+#: admin/systems/services/dhcp/class_serviceDHCP.inc:785
+#: admin/systems/services/dhcp/class_serviceDHCP.inc:786
+#: admin/systems/services/dhcp/class_serviceDHCP.inc:828
 msgid "DHCP service"
 msgstr ""
 
@@ -224,75 +207,73 @@ msgid "The migration will be started when you save this system."
 msgstr ""
 
 #: admin/systems/services/dhcp/class_serviceDHCP.inc:154
-#: admin/systems/services/dhcp/remove_dhcp.tpl.c:2
 msgid "Warning"
 msgstr "AvÃs"
 
-#: admin/systems/services/dhcp/class_serviceDHCP.inc:247
+#: admin/systems/services/dhcp/class_serviceDHCP.inc:246
 msgid "Permission error"
 msgstr ""
 
-#: admin/systems/services/dhcp/class_serviceDHCP.inc:284
+#: admin/systems/services/dhcp/class_serviceDHCP.inc:283
 msgid "DHCP section"
 msgstr ""
 
-#: admin/systems/services/dhcp/class_serviceDHCP.inc:340
-#: admin/systems/services/dhcp/class_serviceDHCP.inc:343
+#: admin/systems/services/dhcp/class_serviceDHCP.inc:339
+#: admin/systems/services/dhcp/class_serviceDHCP.inc:342
 msgid "Insert new DHCP section"
 msgstr ""
 
-#: admin/systems/services/dhcp/class_serviceDHCP.inc:341
+#: admin/systems/services/dhcp/class_serviceDHCP.inc:340
+#: admin/systems/services/dhcp/class_serviceDHCP.inc:343
 #: admin/systems/services/dhcp/class_serviceDHCP.inc:344
-#: admin/systems/services/dhcp/class_serviceDHCP.inc:345
 msgid "Edit DHCP section"
 msgstr ""
 
-#: admin/systems/services/dhcp/class_serviceDHCP.inc:342
-#: admin/systems/services/dhcp/class_serviceDHCP.inc:346
+#: admin/systems/services/dhcp/class_serviceDHCP.inc:341
+#: admin/systems/services/dhcp/class_serviceDHCP.inc:345
 msgid "Remove DHCP section"
 msgstr ""
 
-#: admin/systems/services/dhcp/class_serviceDHCP.inc:347
+#: admin/systems/services/dhcp/class_serviceDHCP.inc:346
 msgid "Expand DHCP subnet"
 msgstr ""
 
-#: admin/systems/services/dhcp/class_serviceDHCP.inc:348
+#: admin/systems/services/dhcp/class_serviceDHCP.inc:347
 msgid "Fold DHCP subnet"
 msgstr ""
 
-#: admin/systems/services/dhcp/class_serviceDHCP.inc:425
-#: admin/systems/services/dhcp/class_serviceDHCP.inc:442
-#: admin/systems/services/dhcp/class_serviceDHCP.inc:497
-#: admin/systems/services/dhcp/class_serviceDHCP.inc:573
-#: admin/systems/services/dhcp/class_serviceDHCP.inc:581
-#: admin/systems/services/dhcp/class_serviceDHCP.inc:608
+#: admin/systems/services/dhcp/class_serviceDHCP.inc:422
+#: admin/systems/services/dhcp/class_serviceDHCP.inc:439
+#: admin/systems/services/dhcp/class_serviceDHCP.inc:494
+#: admin/systems/services/dhcp/class_serviceDHCP.inc:570
+#: admin/systems/services/dhcp/class_serviceDHCP.inc:578
+#: admin/systems/services/dhcp/class_serviceDHCP.inc:605
 msgid "LDAP error"
 msgstr "Error d'LDAP"
 
-#: admin/systems/services/dhcp/class_serviceDHCP.inc:776
+#: admin/systems/services/dhcp/class_serviceDHCP.inc:774
 msgid ""
 "The DHCP configuration set is unkown. Please contact your system "
 "administrator."
 msgstr ""
 
-#: admin/systems/services/dhcp/class_serviceDHCP.inc:788
+#: admin/systems/services/dhcp/class_serviceDHCP.inc:786
 msgid "Services"
 msgstr ""
 
-#: admin/systems/services/dhcp/class_serviceDHCP.inc:795
+#: admin/systems/services/dhcp/class_serviceDHCP.inc:793
 msgid "Start service"
 msgstr ""
 
-#: admin/systems/services/dhcp/class_serviceDHCP.inc:796
+#: admin/systems/services/dhcp/class_serviceDHCP.inc:794
 msgid "Stop service"
 msgstr ""
 
-#: admin/systems/services/dhcp/class_serviceDHCP.inc:797
+#: admin/systems/services/dhcp/class_serviceDHCP.inc:795
 msgid "Restart service"
 msgstr ""
 
 #: admin/systems/services/dhcp/class_dhcpNetwork.inc:197
-#: admin/systems/services/dhcp/dhcp_network.tpl.c:14
 msgid "Broadcast"
 msgstr ""
 
@@ -323,297 +304,17 @@ msgstr ""
 
 #: admin/systems/services/dhcp/class_dhcpTSigKey.inc:114
 #: admin/systems/services/dhcp/class_dhcpTSigKey.inc:127
-#: admin/systems/services/dhcp/dhcp_tsigkey.tpl.c:5
 msgid "Key name"
 msgstr ""
 
 #: admin/systems/services/dhcp/class_dhcpTSigKey.inc:118
-#: 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/serviceDHCP.tpl.c:2
-msgid ""
-"DHCP take over will take place when saving this entry. Choose 'Cancel' to "
-"abort."
-msgstr ""
-
-#: admin/systems/services/dhcp/serviceDHCP.tpl.c:5
-msgid "Take over dhcp configuration from following server"
-msgstr ""
-
-#: admin/systems/services/dhcp/serviceDHCP.tpl.c:8
-msgid "DHCP sections"
-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"
-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"
-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 ""
-
-#: 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 ""
-
-#: 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"
-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
-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 ""
-
-#: 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"
-msgstr ""
-
-#: admin/systems/services/dhcp/dhcp_advanced.tpl.c:11
-msgid "Show advanced settings"
-msgstr ""
-
-#: admin/systems/services/dhcp/dhcp_host.tpl.c:8
-msgid "Name of host"
-msgstr ""
-
-#: admin/systems/services/dhcp/dhcp_host.tpl.c:11
-msgid "Fixed address"
-msgstr ""
-
-#: admin/systems/services/dhcp/dhcp_host.tpl.c:14
-msgid "Use hostname or IP-address to assign fixed address"
-msgstr ""
-
-#: admin/systems/services/dhcp/dhcp_host.tpl.c:17
-msgid "Hardware type"
-msgstr ""
-
-#: admin/systems/services/dhcp/dhcp_sharedNetwork.tpl.c:8
-msgid "Name for shared network"
-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"
-msgstr ""
-
-#: admin/systems/services/dhcp/dhcp_sharedNetwork.tpl.c:17
-msgid "Select if this server is authoritative for this shared network"
-msgstr ""
-
-#: admin/systems/services/dhcp/dhcp_sharedNetwork.tpl.c:20
-msgid "Authoritative server"
-msgstr ""
-
-#: admin/systems/services/dhcp/dhcp_sharedNetwork.tpl.c:23
-msgid "Leases"
-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 ""
-
-#: 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"
-msgstr ""
-
-#: admin/systems/services/dhcp/dhcp_sharedNetwork.tpl.c:65
-msgid "Allow bootp clients"
-msgstr ""
-
-#: admin/systems/services/dhcp/dhcp_sharedNetwork.tpl.c:68
-msgid "Select if clients are allowed to boot using this DHCP server"
-msgstr ""
-
-#: admin/systems/services/dhcp/dhcp_sharedNetwork.tpl.c:71
-msgid "Allow booting"
-msgstr ""
diff --git a/dhcp/locale/cs_CZ/fusiondirectory.po b/dhcp/locale/cs_CZ/fusiondirectory.po
index ae57ddd5c547334dddbca796ed1553ab2729a5e4..84fcf2a0ffbf104a7d9c4ca9e6e29fe38cb15c44 100644
--- a/dhcp/locale/cs_CZ/fusiondirectory.po
+++ b/dhcp/locale/cs_CZ/fusiondirectory.po
@@ -3,17 +3,15 @@
 # This file is distributed under the same license as the PACKAGE package.
 # 
 # Translators:
-# Pavel Borecki <pavel.borecki@gmail.com>, 2012
-# Pavel Borecki <pavel.borecki@gmail.com>, 2012
-# Pavel Borecki <pavel.borecki@gmail.com>, 2012
+# Pavel Borecki <pavel.borecki@gmail.com>, 2015
 msgid ""
 msgstr ""
-"Project-Id-Version: FusionDirectory-108\n"
+"Project-Id-Version: FusionDirectory-109\n"
 "Report-Msgid-Bugs-To: documentation@lists.fusiondirectory.org\n"
-"POT-Creation-Date: 2015-03-19 21:45+0100\n"
-"PO-Revision-Date: 2015-02-25 16:51+0000\n"
-"Last-Translator: fusiondirectory <contact@fusiondirectory.org>\n"
-"Language-Team: Czech (Czech Republic) (http://www.transifex.com/projects/p/FusionDirectory-108/language/cs_CZ/)\n"
+"POT-Creation-Date: 2014-12-15 17:47+0100\n"
+"PO-Revision-Date: 2015-04-07 18:02+0000\n"
+"Last-Translator: Pavel Borecki <pavel.borecki@gmail.com>\n"
+"Language-Team: Czech (Czech Republic) (http://www.transifex.com/projects/p/FusionDirectory-109/language/cs_CZ/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -22,20 +20,20 @@ msgstr ""
 
 #: admin/systems/services/dhcp/class_dhcpAdvanced.inc:59
 #: admin/systems/services/dhcp/class_dhcpAdvanced.inc:73
-#: admin/systems/services/dhcp/class_serviceDHCP.inc:776
+#: admin/systems/services/dhcp/class_serviceDHCP.inc:774
 #: admin/systems/services/dhcp/class_dhcpNetwork.inc:48
 msgid "Error"
-msgstr "chyba"
+msgstr "Chyba"
 
 #: admin/systems/services/dhcp/class_dhcpAdvanced.inc:59
 #: admin/systems/services/dhcp/class_dhcpAdvanced.inc:73
 msgid "Cannot delete automatic statements!"
-msgstr "automatickÃ© zprÃ¡vy nelze mazat!"
+msgstr "SamoÄinnÄ› 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 "automatickÃ©"
+msgstr "samoÄinnÃ©"
 
 #: admin/systems/services/dhcp/class_dhcpPool.inc:104
 #: admin/systems/services/dhcp/class_dhcpPool.inc:112
@@ -55,40 +53,32 @@ msgstr "automatickÃ©"
 #: 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"
+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/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Ä›."
+msgstr "Rozsah nespadÃ¡ do nastavenÃ© sÃtÄ›."
 
 #: 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"
+msgstr "SÃÅ¥ovÃ¡ adresa"
 
 #: 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"
+msgstr "SÃÅ¥ovÃ¡ maska"
 
 #: admin/systems/services/dhcp/class_dhcpSubnet.inc:170
 msgid "Network range"
@@ -97,24 +87,24 @@ msgstr "sÃÅ¥ovÃ½ rozsah"
 #: admin/systems/services/dhcp/class_dhcpNewSectionDialog.inc:48
 #: admin/systems/services/dhcp/class_serviceDHCP.inc:62
 #: admin/systems/services/dhcp/class_serviceDHCP.inc:103
-#: admin/systems/services/dhcp/class_serviceDHCP.inc:731
+#: admin/systems/services/dhcp/class_serviceDHCP.inc:729
 msgid "Global options"
 msgstr "globÃ¡lnÃ volby"
 
 #: admin/systems/services/dhcp/class_dhcpNewSectionDialog.inc:49
 #: admin/systems/services/dhcp/class_serviceDHCP.inc:63
 msgid "Class"
-msgstr "tÅ™Ãda"
+msgstr "TÅ™Ãda"
 
 #: admin/systems/services/dhcp/class_dhcpNewSectionDialog.inc:50
 #: admin/systems/services/dhcp/class_serviceDHCP.inc:64
 msgid "Subclass"
-msgstr "podtÅ™Ãda"
+msgstr "PodtÅ™Ãda"
 
 #: admin/systems/services/dhcp/class_dhcpNewSectionDialog.inc:51
 #: admin/systems/services/dhcp/class_serviceDHCP.inc:65
 msgid "Host"
-msgstr "stroj"
+msgstr "PoÄÃtaÄ"
 
 #: admin/systems/services/dhcp/class_dhcpNewSectionDialog.inc:52
 #: admin/systems/services/dhcp/class_serviceDHCP.inc:66
@@ -129,16 +119,15 @@ msgstr "rozsah"
 #: admin/systems/services/dhcp/class_dhcpNewSectionDialog.inc:54
 #: admin/systems/services/dhcp/class_serviceDHCP.inc:68
 msgid "Subnet"
-msgstr "podsÃÅ¥"
+msgstr "PodsÃÅ¥"
 
 #: admin/systems/services/dhcp/class_dhcpNewSectionDialog.inc:55
 #: admin/systems/services/dhcp/class_serviceDHCP.inc:70
 msgid "Shared network"
-msgstr "sdÃlenÃ¡ sÃÅ¥"
+msgstr "SdÃlenÃ¡ sÃÅ¥"
 
 #: admin/systems/services/dhcp/class_dhcpNewSectionDialog.inc:56
 #: admin/systems/services/dhcp/class_serviceDHCP.inc:71
-#: admin/systems/services/dhcp/dhcp_tsigkey.tpl.c:2
 msgid "DNS update key"
 msgstr "klÃÄ pro aktualizaci DNS"
 
@@ -148,24 +137,20 @@ msgid "DNS update zones"
 msgstr "zÃ³ny aktualizace DNS"
 
 #: admin/systems/services/dhcp/class_dhcpDnsZone.inc:150
-#: admin/systems/services/dhcp/dhcp_dnszone.tpl.c:5
 msgid "DNS zone"
 msgstr "DNS zÃ³na"
 
 #: admin/systems/services/dhcp/class_dhcpDnsZone.inc:154
-#: admin/systems/services/dhcp/dhcp_network.tpl.c:41
-#: admin/systems/services/dhcp/dhcp_dnszone.tpl.c:8
 msgid "DNS server"
-msgstr "DNS server"
+msgstr ""
 
 #: admin/systems/services/dhcp/class_dhcpDnsZone.inc:158
-#: admin/systems/services/dhcp/dhcp_dnszone.tpl.c:11
 msgid "Key DN"
 msgstr "DN klÃÄe"
 
 #: admin/systems/services/dhcp/class_dhcpHost.inc:64
 msgid "Ethernet"
-msgstr "ethernet"
+msgstr ""
 
 #: admin/systems/services/dhcp/class_dhcpHost.inc:65
 msgid "FDDI"
@@ -176,13 +161,12 @@ msgid "Token Ring"
 msgstr "Token Ring"
 
 #: admin/systems/services/dhcp/class_dhcpHost.inc:149
-#: admin/systems/services/dhcp/dhcp_host.tpl.c:20
 msgid "Hardware address"
-msgstr "hardwarovÃ¡ adresa (MAC)"
+msgstr "FyzickÃ¡ adresa zaÅ™ÃzenÃ (MAC)"
 
 #: admin/systems/services/dhcp/class_dhcpService.inc:128
 msgid "Lease time"
-msgstr "vÃ½pÅ¯jÄnÃ doba"
+msgstr "ZÃ¡pÅ¯jÄnÃ doba"
 
 #: admin/systems/services/dhcp/class_dhcpService.inc:131
 msgid "Max lease time"
@@ -190,119 +174,114 @@ msgstr "nejdelÅ¡Ã vÃ½pÅ¯jÄnÃ doba"
 
 #: 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_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:59
-#: admin/systems/services/dhcp/class_serviceDHCP.inc:787
-#: admin/systems/services/dhcp/class_serviceDHCP.inc:788
-#: admin/systems/services/dhcp/class_serviceDHCP.inc:830
+#: admin/systems/services/dhcp/class_serviceDHCP.inc:785
+#: admin/systems/services/dhcp/class_serviceDHCP.inc:786
+#: admin/systems/services/dhcp/class_serviceDHCP.inc:828
 msgid "DHCP service"
-msgstr "sluÅ¾ba DHCP"
+msgstr "SluÅ¾ba DHCP"
 
 #: admin/systems/services/dhcp/class_serviceDHCP.inc:61
 msgid "Logging"
-msgstr "poÅ™izovÃ¡nÃ protokolovacÃch zÃ¡znamÅ¯ (logÅ¯)"
+msgstr "ProtokolovÃ¡nÃ"
 
 #: admin/systems/services/dhcp/class_serviceDHCP.inc:69
 msgid "Failover peer"
-msgstr "zÃ¡loÅ¾nÃ server"
+msgstr "ProtÄ›jÅ¡ek, kterÃ½ pÅ™evezme sluÅ¾by v pÅ™ÃpadÄ› selhÃ¡nÃ"
 
 #: admin/systems/services/dhcp/class_serviceDHCP.inc:149
 #, php-format
 msgid ""
 "You have requested a migration of the DHCP setup from server '%s' to the "
 "current one."
-msgstr "PoÅ¾adujete pÅ™esun nastavenÃ DNCP serveru '%s' na tento."
+msgstr "PoÅ¾adujete pÅ™esun nastavenÃ DHCP serveru %s na tento."
 
 #: admin/systems/services/dhcp/class_serviceDHCP.inc:151
 msgid "The migration will be started when you save this system."
-msgstr "Migrace zapoÄne jakmile tento systÃ©m uloÅ¾Ãte."
+msgstr "S pÅ™emisÅ¥ovÃ¡nÃm se zaÄne jakmile tento systÃ©m uloÅ¾Ãte."
 
 #: admin/systems/services/dhcp/class_serviceDHCP.inc:154
-#: admin/systems/services/dhcp/remove_dhcp.tpl.c:2
 msgid "Warning"
-msgstr "varovÃ¡nÃ"
+msgstr "VarovÃ¡nÃ"
 
-#: admin/systems/services/dhcp/class_serviceDHCP.inc:247
+#: admin/systems/services/dhcp/class_serviceDHCP.inc:246
 msgid "Permission error"
-msgstr "chyba oprÃ¡vnÄ›nÃ"
+msgstr "Chyba pÅ™ÃstupovÃ½ch prÃ¡v"
 
-#: admin/systems/services/dhcp/class_serviceDHCP.inc:284
+#: admin/systems/services/dhcp/class_serviceDHCP.inc:283
 msgid "DHCP section"
 msgstr "DHCP sekce"
 
-#: admin/systems/services/dhcp/class_serviceDHCP.inc:340
-#: admin/systems/services/dhcp/class_serviceDHCP.inc:343
+#: admin/systems/services/dhcp/class_serviceDHCP.inc:339
+#: admin/systems/services/dhcp/class_serviceDHCP.inc:342
 msgid "Insert new DHCP section"
-msgstr "vloÅ¾it novou DHCP sekci"
+msgstr "VloÅ¾it novou DHCP sekci"
 
-#: admin/systems/services/dhcp/class_serviceDHCP.inc:341
+#: admin/systems/services/dhcp/class_serviceDHCP.inc:340
+#: admin/systems/services/dhcp/class_serviceDHCP.inc:343
 #: admin/systems/services/dhcp/class_serviceDHCP.inc:344
-#: admin/systems/services/dhcp/class_serviceDHCP.inc:345
 msgid "Edit DHCP section"
-msgstr "upravit DHCP sekci"
+msgstr "Upravit DHCP sekci"
 
-#: admin/systems/services/dhcp/class_serviceDHCP.inc:342
-#: admin/systems/services/dhcp/class_serviceDHCP.inc:346
+#: admin/systems/services/dhcp/class_serviceDHCP.inc:341
+#: admin/systems/services/dhcp/class_serviceDHCP.inc:345
 msgid "Remove DHCP section"
-msgstr "odebrat DHCP sekci"
+msgstr "Odebrat DHCP sekci"
 
-#: admin/systems/services/dhcp/class_serviceDHCP.inc:347
+#: admin/systems/services/dhcp/class_serviceDHCP.inc:346
 msgid "Expand DHCP subnet"
-msgstr ""
+msgstr "RozÅ¡ÃÅ™it DHCP podsÃÅ¥"
 
-#: admin/systems/services/dhcp/class_serviceDHCP.inc:348
+#: admin/systems/services/dhcp/class_serviceDHCP.inc:347
 msgid "Fold DHCP subnet"
-msgstr ""
-
-#: admin/systems/services/dhcp/class_serviceDHCP.inc:425
-#: admin/systems/services/dhcp/class_serviceDHCP.inc:442
-#: admin/systems/services/dhcp/class_serviceDHCP.inc:497
-#: admin/systems/services/dhcp/class_serviceDHCP.inc:573
-#: admin/systems/services/dhcp/class_serviceDHCP.inc:581
-#: admin/systems/services/dhcp/class_serviceDHCP.inc:608
+msgstr "Sbalit DHCP podsÃÅ¥"
+
+#: admin/systems/services/dhcp/class_serviceDHCP.inc:422
+#: admin/systems/services/dhcp/class_serviceDHCP.inc:439
+#: admin/systems/services/dhcp/class_serviceDHCP.inc:494
+#: admin/systems/services/dhcp/class_serviceDHCP.inc:570
+#: admin/systems/services/dhcp/class_serviceDHCP.inc:578
+#: admin/systems/services/dhcp/class_serviceDHCP.inc:605
 msgid "LDAP error"
-msgstr "chyba LDAPu"
+msgstr "Chyba LDAP"
 
-#: admin/systems/services/dhcp/class_serviceDHCP.inc:776
+#: admin/systems/services/dhcp/class_serviceDHCP.inc:774
 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/systems/services/dhcp/class_serviceDHCP.inc:788
+#: admin/systems/services/dhcp/class_serviceDHCP.inc:786
 msgid "Services"
-msgstr "sluÅ¾by"
+msgstr "SluÅ¾by"
 
-#: admin/systems/services/dhcp/class_serviceDHCP.inc:795
+#: admin/systems/services/dhcp/class_serviceDHCP.inc:793
 msgid "Start service"
-msgstr "spustit sluÅ¾bu"
+msgstr "Spustit sluÅ¾bu"
 
-#: admin/systems/services/dhcp/class_serviceDHCP.inc:796
+#: admin/systems/services/dhcp/class_serviceDHCP.inc:794
 msgid "Stop service"
-msgstr "zastavit sluÅ¾bu"
+msgstr "Zastavit sluÅ¾bu"
 
-#: admin/systems/services/dhcp/class_serviceDHCP.inc:797
+#: admin/systems/services/dhcp/class_serviceDHCP.inc:795
 msgid "Restart service"
-msgstr "restartovat sluÅ¾bu"
+msgstr "Restartovat sluÅ¾bu"
 
 #: 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)"
+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'!"
+msgstr "Chyba v definici %s!"
 
 #: admin/systems/services/dhcp/class_dhcpTSigKey.inc:51
 msgid "HMAC-MD5"
@@ -326,297 +305,17 @@ msgstr "DH"
 
 #: admin/systems/services/dhcp/class_dhcpTSigKey.inc:114
 #: admin/systems/services/dhcp/class_dhcpTSigKey.inc:127
-#: admin/systems/services/dhcp/dhcp_tsigkey.tpl.c:5
 msgid "Key name"
-msgstr "nÃ¡zev klÃÄe"
+msgstr "NÃ¡zev klÃÄe"
 
 #: admin/systems/services/dhcp/class_dhcpTSigKey.inc:118
-#: admin/systems/services/dhcp/dhcp_tsigkey.tpl.c:14
 msgid "Key"
-msgstr "klÃÄ"
+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"
+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/serviceDHCP.tpl.c:2
-msgid ""
-"DHCP take over will take place when saving this entry. Choose 'Cancel' to "
-"abort."
-msgstr "UloÅ¾enÃ tÃ©to poloÅ¾ky spustÃ pÅ™evzetÃ DHCP. Pro pÅ™eruÅ¡enÃ akce kliknÄ›te na 'zruÅ¡it'."
-
-#: admin/systems/services/dhcp/serviceDHCP.tpl.c:5
-msgid "Take over dhcp configuration from following server"
-msgstr "pÅ™evzÃt nastavenÃ DHCP z tohoto serveru"
-
-#: admin/systems/services/dhcp/serviceDHCP.tpl.c:8
-msgid "DHCP sections"
-msgstr "sekce DHCP"
-
-#: 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 "dynamickÃ¡ aktualizace DNS"
-
-#: admin/systems/services/dhcp/dhcp_service.tpl.c:11
-msgid "Dynamic DNS update style"
-msgstr "zpÅ¯sob aktualizace dynamickÃ©ho 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 ve vteÅ™inÃ¡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 ve vteÅ™inÃ¡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Ä (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 "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 prtokol) 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 "pro pÅ™idÃ¡nÃ zvolenÃ½ch serverÅ¯ na seznam kliknÄ›te sem"
-
-#: admin/systems/services/dhcp/dhcp_network.tpl.c:53
-msgid "Click here remove the selected servers from the list"
-msgstr "pro odebrÃ¡nÃ zvolenÃ½ch serverÅ¯ ze seznamu kliknÄ›te sem"
-
-#: admin/systems/services/dhcp/dhcp_network.tpl.c:56
-msgid "Domain Name Service options"
-msgstr "pÅ™edvolby 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 strojÅ¯ 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/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/systems/services/dhcp/dhcp_dnszone.tpl.c:2
-msgid "DNS update zone"
-msgstr "zÃ³na aktualizace DNS"
-
-#: 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. ProsÃm 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/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 LDAPu do souboru. Pokud jste tak jiÅ¾ uÄinil(a), kliknÄ›te na 'smazat' â€“ v opaÄnÃ©m pÅ™ÃpadÄ› celou akci zruÅ¡te kliknutÃm na 'zruÅ¡it'."
-
-#: admin/systems/services/dhcp/dhcp_tsigkey.tpl.c:8
-msgid "Name of Key"
-msgstr "nÃ¡zev klÃÄe"
-
-#: admin/systems/services/dhcp/dhcp_tsigkey.tpl.c:11
-msgid "Encryption method"
-msgstr "metoda Å¡ifrovÃ¡nÃ"
-
-#: admin/systems/services/dhcp/dhcp_pool.tpl.c:8
-msgid "Name of pool"
-msgstr "VaÅ¡e pojmenovÃ¡nÃ rozsahu"
-
-#: admin/systems/services/dhcp/dhcpNewSection.tpl.c:2
-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 prosÃm jeden z nÃ¡sledujÃcÃch typÅ¯ sekcÃ DHCP."
-
-#: admin/systems/services/dhcp/dhcpNewSection.tpl.c:8
-msgid "Section"
-msgstr "sekce"
-
-#: admin/systems/services/dhcp/dhcpNewSection.tpl.c:11
-msgid "Choose section type to create"
-msgstr "zvolte typ sekce, kterÃ½ mÃ¡ bÃ½t vytvoÅ™en"
-
-#: admin/systems/services/dhcp/dhcpNewSection.tpl.c:14
-msgid "Create"
-msgstr "vytvoÅ™it"
-
-#: admin/systems/services/dhcp/dhcp_advanced.tpl.c:2
-msgid "Hide advanced settings"
-msgstr "skrÃ½t pokroÄilÃ¡ nastavenÃ"
-
-#: admin/systems/services/dhcp/dhcp_advanced.tpl.c:5
-msgid "DHCP statements"
-msgstr "zprÃ¡vy DHCP"
-
-#: admin/systems/services/dhcp/dhcp_advanced.tpl.c:8
-msgid "DHCP options"
-msgstr "pÅ™edvolby DHCP"
-
-#: admin/systems/services/dhcp/dhcp_advanced.tpl.c:11
-msgid "Show advanced settings"
-msgstr "zobrazit pokroÄilÃ¡ nastavenÃ"
-
-#: admin/systems/services/dhcp/dhcp_host.tpl.c:8
-msgid "Name of host"
-msgstr "nÃ¡zev stroje"
-
-#: admin/systems/services/dhcp/dhcp_host.tpl.c:11
-msgid "Fixed address"
-msgstr "nemÄ›nnÃ¡ (pevnÃ¡) adresa"
-
-#: 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 jmÃ©no nebo IP adresu"
-
-#: admin/systems/services/dhcp/dhcp_host.tpl.c:17
-msgid "Hardware type"
-msgstr "typ pÅ™Ãstroje"
-
-#: admin/systems/services/dhcp/dhcp_sharedNetwork.tpl.c:8
-msgid "Name for shared network"
-msgstr "nÃ¡zev sdÃlenÃ© sÃtÄ›"
-
-#: admin/systems/services/dhcp/dhcp_sharedNetwork.tpl.c:11
-msgid "Server identifier"
-msgstr "identifikÃ¡tor serveru"
-
-#: 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/systems/services/dhcp/dhcp_sharedNetwork.tpl.c:17
-msgid "Select if this server is authoritative for this shared network"
-msgstr "zadejte, zda je server autoritativnÃm pro tuto sdÃlenou sÃÅ¥"
-
-#: admin/systems/services/dhcp/dhcp_sharedNetwork.tpl.c:20
-msgid "Authoritative server"
-msgstr "autoritativnÃ server"
-
-#: admin/systems/services/dhcp/dhcp_sharedNetwork.tpl.c:23
-msgid "Leases"
-msgstr "zÃ¡pÅ¯jÄky"
-
-#: 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 "vteÅ™iny"
-
-#: admin/systems/services/dhcp/dhcp_sharedNetwork.tpl.c:47
-msgid "Minimum lease time"
-msgstr "nejkratÅ¡Ã vÃ½pÅ¯jÄnÃ doba"
-
-#: admin/systems/services/dhcp/dhcp_sharedNetwork.tpl.c:53
-msgid "Access control"
-msgstr "Å™ÃzenÃ pÅ™Ãstupu"
-
-#: admin/systems/services/dhcp/dhcp_sharedNetwork.tpl.c:56
-msgid "Select if unknown clients should get dynamic IP addresses"
-msgstr "zadejte, zda budou IP adresy poskytovÃ¡ny i neznÃ¡mÃ½m strojÅ¯m"
-
-#: admin/systems/services/dhcp/dhcp_sharedNetwork.tpl.c:59
-msgid "Allow unknown clients"
-msgstr "povolit neznÃ¡mÃ© stroje"
-
-#: admin/systems/services/dhcp/dhcp_sharedNetwork.tpl.c:62
-msgid "Select if bootp clients should get dynamic IP addresses"
-msgstr "zadejte, zda budou stroje, startujÃcÃ pÅ™es protokol bootp, dostÃ¡vat dynamickou IP adresu"
-
-#: admin/systems/services/dhcp/dhcp_sharedNetwork.tpl.c:65
-msgid "Allow bootp clients"
-msgstr "zapnout podporu pro stroje startujÃcÃ s protokolem bootp"
-
-#: admin/systems/services/dhcp/dhcp_sharedNetwork.tpl.c:68
-msgid "Select if clients are allowed to boot using this DHCP server"
-msgstr "zadejte, zda tento DHCP server bude ostatnÃm strojÅ¯m poskytovat zavÃ¡dÄ›nÃ jejich systÃ©mu ze sÃtÄ›"
-
-#: admin/systems/services/dhcp/dhcp_sharedNetwork.tpl.c:71
-msgid "Allow booting"
-msgstr "povolit zavÃ¡dÄ›nÃ systÃ©mu"
+msgstr "NejkratÅ¡Ã vÃ½pÅ¯jÄnÃ doba"
diff --git a/dhcp/locale/de/fusiondirectory.po b/dhcp/locale/de/fusiondirectory.po
index d996ef36fbf68483bbd20db4be193362a0b14f19..2eaed8305d621b0e94840c39924d21b6f6980470 100644
--- a/dhcp/locale/de/fusiondirectory.po
+++ b/dhcp/locale/de/fusiondirectory.po
@@ -3,15 +3,15 @@
 # This file is distributed under the same license as the PACKAGE package.
 # 
 # Translators:
-#  Stefan Koehler <stefan.koehler@GONICUS.de>, 2005
+# Maik Wagner <maikwagner@yahoo.com>, 2013
 msgid ""
 msgstr ""
-"Project-Id-Version: FusionDirectory-108\n"
+"Project-Id-Version: FusionDirectory-109\n"
 "Report-Msgid-Bugs-To: documentation@lists.fusiondirectory.org\n"
-"POT-Creation-Date: 2015-03-19 21:45+0100\n"
-"PO-Revision-Date: 2015-02-25 16:51+0000\n"
+"POT-Creation-Date: 2014-12-15 17:47+0100\n"
+"PO-Revision-Date: 2015-02-25 16:13+0000\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>\n"
-"Language-Team: German (http://www.transifex.com/projects/p/FusionDirectory-108/language/de/)\n"
+"Language-Team: German (http://www.transifex.com/projects/p/FusionDirectory-109/language/de/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -20,7 +20,7 @@ msgstr ""
 
 #: admin/systems/services/dhcp/class_dhcpAdvanced.inc:59
 #: admin/systems/services/dhcp/class_dhcpAdvanced.inc:73
-#: admin/systems/services/dhcp/class_serviceDHCP.inc:776
+#: admin/systems/services/dhcp/class_serviceDHCP.inc:774
 #: admin/systems/services/dhcp/class_dhcpNetwork.inc:48
 msgid "Error"
 msgstr "Fehler"
@@ -53,10 +53,6 @@ msgstr "automatisch"
 #: 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"
 
@@ -65,7 +61,6 @@ msgstr "Name"
 #: 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"
 
@@ -76,15 +71,12 @@ msgstr "Der Bereich befindet sich nicht innerhalb des konfigurierten Netzwerks."
 
 #: 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/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"
 
@@ -95,7 +87,7 @@ msgstr "Netzwerk-Bereich"
 #: admin/systems/services/dhcp/class_dhcpNewSectionDialog.inc:48
 #: admin/systems/services/dhcp/class_serviceDHCP.inc:62
 #: admin/systems/services/dhcp/class_serviceDHCP.inc:103
-#: admin/systems/services/dhcp/class_serviceDHCP.inc:731
+#: admin/systems/services/dhcp/class_serviceDHCP.inc:729
 msgid "Global options"
 msgstr "Globale Optionen"
 
@@ -112,7 +104,7 @@ msgstr "Subklasse"
 #: admin/systems/services/dhcp/class_dhcpNewSectionDialog.inc:51
 #: admin/systems/services/dhcp/class_serviceDHCP.inc:65
 msgid "Host"
-msgstr "Host"
+msgstr "System"
 
 #: admin/systems/services/dhcp/class_dhcpNewSectionDialog.inc:52
 #: admin/systems/services/dhcp/class_serviceDHCP.inc:66
@@ -136,7 +128,6 @@ msgstr "Verteiltes Netzwerk"
 
 #: admin/systems/services/dhcp/class_dhcpNewSectionDialog.inc:56
 #: admin/systems/services/dhcp/class_serviceDHCP.inc:71
-#: admin/systems/services/dhcp/dhcp_tsigkey.tpl.c:2
 msgid "DNS update key"
 msgstr "DNS-Update-SchlÃ¼ssel"
 
@@ -146,18 +137,14 @@ msgid "DNS update zones"
 msgstr "DNS-Update-Zonen"
 
 #: admin/systems/services/dhcp/class_dhcpDnsZone.inc:150
-#: admin/systems/services/dhcp/dhcp_dnszone.tpl.c:5
 msgid "DNS zone"
 msgstr "DNS-Zone"
 
 #: admin/systems/services/dhcp/class_dhcpDnsZone.inc:154
-#: 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:158
-#: admin/systems/services/dhcp/dhcp_dnszone.tpl.c:11
 msgid "Key DN"
 msgstr "SchlÃ¼ssel-DN"
 
@@ -174,7 +161,6 @@ msgid "Token Ring"
 msgstr "Token Ring"
 
 #: admin/systems/services/dhcp/class_dhcpHost.inc:149
-#: admin/systems/services/dhcp/dhcp_host.tpl.c:20
 msgid "Hardware address"
 msgstr "Hardware-Adresse"
 
@@ -188,20 +174,17 @@ msgstr "Max. Lease-GÃ¼ltigkeit"
 
 #: 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_dhcpService.inc:134
-#: admin/systems/services/dhcp/dhcp_sharedNetwork.tpl.c:38
 msgid "Maximum lease time"
 msgstr "Maximale Lease-GÃ¼ltigkeit"
 
 #: admin/systems/services/dhcp/class_serviceDHCP.inc:59
-#: admin/systems/services/dhcp/class_serviceDHCP.inc:787
-#: admin/systems/services/dhcp/class_serviceDHCP.inc:788
-#: admin/systems/services/dhcp/class_serviceDHCP.inc:830
+#: admin/systems/services/dhcp/class_serviceDHCP.inc:785
+#: admin/systems/services/dhcp/class_serviceDHCP.inc:786
+#: admin/systems/services/dhcp/class_serviceDHCP.inc:828
 msgid "DHCP service"
 msgstr "DHCP Dienst"
 
@@ -225,75 +208,73 @@ msgid "The migration will be started when you save this system."
 msgstr "Die Migratione wird gestartet, wenn Sie dieses System speichern."
 
 #: admin/systems/services/dhcp/class_serviceDHCP.inc:154
-#: admin/systems/services/dhcp/remove_dhcp.tpl.c:2
 msgid "Warning"
 msgstr "Warnung"
 
-#: admin/systems/services/dhcp/class_serviceDHCP.inc:247
+#: admin/systems/services/dhcp/class_serviceDHCP.inc:246
 msgid "Permission error"
 msgstr "Berechtigungsfehler"
 
-#: admin/systems/services/dhcp/class_serviceDHCP.inc:284
+#: admin/systems/services/dhcp/class_serviceDHCP.inc:283
 msgid "DHCP section"
 msgstr "DHCP-Sektion"
 
-#: admin/systems/services/dhcp/class_serviceDHCP.inc:340
-#: admin/systems/services/dhcp/class_serviceDHCP.inc:343
+#: admin/systems/services/dhcp/class_serviceDHCP.inc:339
+#: admin/systems/services/dhcp/class_serviceDHCP.inc:342
 msgid "Insert new DHCP section"
 msgstr "FÃ¼ge neue DHCP-Sektion ein"
 
-#: admin/systems/services/dhcp/class_serviceDHCP.inc:341
+#: admin/systems/services/dhcp/class_serviceDHCP.inc:340
+#: admin/systems/services/dhcp/class_serviceDHCP.inc:343
 #: admin/systems/services/dhcp/class_serviceDHCP.inc:344
-#: admin/systems/services/dhcp/class_serviceDHCP.inc:345
 msgid "Edit DHCP section"
 msgstr "Bearbeite DHCP-Sektion"
 
-#: admin/systems/services/dhcp/class_serviceDHCP.inc:342
-#: admin/systems/services/dhcp/class_serviceDHCP.inc:346
+#: admin/systems/services/dhcp/class_serviceDHCP.inc:341
+#: admin/systems/services/dhcp/class_serviceDHCP.inc:345
 msgid "Remove DHCP section"
 msgstr "Entferne DHCP-Sektion"
 
-#: admin/systems/services/dhcp/class_serviceDHCP.inc:347
+#: admin/systems/services/dhcp/class_serviceDHCP.inc:346
 msgid "Expand DHCP subnet"
 msgstr "DHCP Subnetz erweitern"
 
-#: admin/systems/services/dhcp/class_serviceDHCP.inc:348
+#: admin/systems/services/dhcp/class_serviceDHCP.inc:347
 msgid "Fold DHCP subnet"
 msgstr "DHCP Subnetz verwerfen"
 
-#: admin/systems/services/dhcp/class_serviceDHCP.inc:425
-#: admin/systems/services/dhcp/class_serviceDHCP.inc:442
-#: admin/systems/services/dhcp/class_serviceDHCP.inc:497
-#: admin/systems/services/dhcp/class_serviceDHCP.inc:573
-#: admin/systems/services/dhcp/class_serviceDHCP.inc:581
-#: admin/systems/services/dhcp/class_serviceDHCP.inc:608
+#: admin/systems/services/dhcp/class_serviceDHCP.inc:422
+#: admin/systems/services/dhcp/class_serviceDHCP.inc:439
+#: admin/systems/services/dhcp/class_serviceDHCP.inc:494
+#: admin/systems/services/dhcp/class_serviceDHCP.inc:570
+#: admin/systems/services/dhcp/class_serviceDHCP.inc:578
+#: admin/systems/services/dhcp/class_serviceDHCP.inc:605
 msgid "LDAP error"
 msgstr "LDAP-Fehler"
 
-#: admin/systems/services/dhcp/class_serviceDHCP.inc:776
+#: admin/systems/services/dhcp/class_serviceDHCP.inc:774
 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:788
+#: admin/systems/services/dhcp/class_serviceDHCP.inc:786
 msgid "Services"
 msgstr "Dienste"
 
-#: admin/systems/services/dhcp/class_serviceDHCP.inc:795
+#: admin/systems/services/dhcp/class_serviceDHCP.inc:793
 msgid "Start service"
 msgstr "Dienst starten"
 
-#: admin/systems/services/dhcp/class_serviceDHCP.inc:796
+#: admin/systems/services/dhcp/class_serviceDHCP.inc:794
 msgid "Stop service"
 msgstr "Dienst stoppen"
 
-#: admin/systems/services/dhcp/class_serviceDHCP.inc:797
+#: admin/systems/services/dhcp/class_serviceDHCP.inc:795
 msgid "Restart service"
 msgstr "Dienst neustarten"
 
 #: admin/systems/services/dhcp/class_dhcpNetwork.inc:197
-#: admin/systems/services/dhcp/dhcp_network.tpl.c:14
 msgid "Broadcast"
 msgstr "Broadcast"
 
@@ -324,297 +305,17 @@ msgstr "DH"
 
 #: admin/systems/services/dhcp/class_dhcpTSigKey.inc:114
 #: admin/systems/services/dhcp/class_dhcpTSigKey.inc:127
-#: admin/systems/services/dhcp/dhcp_tsigkey.tpl.c:5
 msgid "Key name"
 msgstr "SchlÃ¼ssel-Name"
 
 #: admin/systems/services/dhcp/class_dhcpTSigKey.inc:118
-#: 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/serviceDHCP.tpl.c:2
-msgid ""
-"DHCP take over will take place when saving this entry. Choose 'Cancel' to "
-"abort."
-msgstr "DHCP-Ãœbernahme wird durchgefÃ¼hrt, wenn der Eintrag gespeichert wird. WÃ¤hlen Sie 'Abbrechen', um den Vorgang abzubrechen."
-
-#: admin/systems/services/dhcp/serviceDHCP.tpl.c:5
-msgid "Take over dhcp configuration from following server"
-msgstr "Ãœbernehme DHCP-Konfiguration von folgendem Server"
-
-#: admin/systems/services/dhcp/serviceDHCP.tpl.c:8
-msgid "DHCP sections"
-msgstr "DHCP-Sektionen"
-
-#: 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/systems/services/dhcp/dhcp_subnet.tpl.c:11
-msgid "Range for dynamic address assignment"
-msgstr "Bereich fÃ¼r dynamische Adresszuweisung"
-
-#: admin/systems/services/dhcp/dhcp_dnszone.tpl.c:2
-msgid "DNS update zone"
-msgstr "DNS-Update-Zone"
-
-#: 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/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/systems/services/dhcp/dhcp_tsigkey.tpl.c:8
-msgid "Name of Key"
-msgstr "Name des SchlÃ¼ssels"
-
-#: admin/systems/services/dhcp/dhcp_tsigkey.tpl.c:11
-msgid "Encryption method"
-msgstr "VerschlÃ¼sselungsmethode"
-
-#: admin/systems/services/dhcp/dhcp_pool.tpl.c:8
-msgid "Name of pool"
-msgstr "Name des Vorrats"
-
-#: admin/systems/services/dhcp/dhcpNewSection.tpl.c:2
-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/systems/services/dhcp/dhcpNewSection.tpl.c:11
-msgid "Choose section type to create"
-msgstr "WÃ¤hlen Sie den zu erzeugenden Sektions-Typ"
-
-#: admin/systems/services/dhcp/dhcpNewSection.tpl.c:14
-msgid "Create"
-msgstr "Anlegen"
-
-#: admin/systems/services/dhcp/dhcp_advanced.tpl.c:2
-msgid "Hide advanced settings"
-msgstr "Verstecke Erweiterte Einstellungen"
-
-#: admin/systems/services/dhcp/dhcp_advanced.tpl.c:5
-msgid "DHCP statements"
-msgstr "DHCP-Anweisungen"
-
-#: admin/systems/services/dhcp/dhcp_advanced.tpl.c:8
-msgid "DHCP options"
-msgstr "DHCP-Optionen"
-
-#: admin/systems/services/dhcp/dhcp_advanced.tpl.c:11
-msgid "Show advanced settings"
-msgstr "Zeige Erweiterte Einstellungen"
-
-#: admin/systems/services/dhcp/dhcp_host.tpl.c:8
-msgid "Name of host"
-msgstr "Name des Hosts"
-
-#: admin/systems/services/dhcp/dhcp_host.tpl.c:11
-msgid "Fixed address"
-msgstr "Feste Adresse"
-
-#: 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/systems/services/dhcp/dhcp_host.tpl.c:17
-msgid "Hardware type"
-msgstr "Hardware-Typ"
-
-#: admin/systems/services/dhcp/dhcp_sharedNetwork.tpl.c:8
-msgid "Name for shared network"
-msgstr "Name des Verteilten Netzwerks"
-
-#: admin/systems/services/dhcp/dhcp_sharedNetwork.tpl.c:11
-msgid "Server identifier"
-msgstr "Serverbezeichnung"
-
-#: 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/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/systems/services/dhcp/dhcp_sharedNetwork.tpl.c:20
-msgid "Authoritative server"
-msgstr "Authoritativer Server"
-
-#: admin/systems/services/dhcp/dhcp_sharedNetwork.tpl.c:23
-msgid "Leases"
-msgstr "Leases"
-
-#: 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/systems/services/dhcp/dhcp_sharedNetwork.tpl.c:47
-msgid "Minimum lease time"
-msgstr "Minimale Lease-GÃ¼ltigkeit"
-
-#: admin/systems/services/dhcp/dhcp_sharedNetwork.tpl.c:53
-msgid "Access control"
-msgstr "Zugriffskontrolle"
-
-#: 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/systems/services/dhcp/dhcp_sharedNetwork.tpl.c:59
-msgid "Allow unknown clients"
-msgstr "Erlaube unbekannte Clients"
-
-#: 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"
-
-#: admin/systems/services/dhcp/dhcp_sharedNetwork.tpl.c:65
-msgid "Allow bootp clients"
-msgstr "Erlaube Bootp Clients"
-
-#: 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"
-
-#: admin/systems/services/dhcp/dhcp_sharedNetwork.tpl.c:71
-msgid "Allow booting"
-msgstr "Erlaube Booten"
diff --git a/dhcp/locale/el_GR/fusiondirectory.po b/dhcp/locale/el_GR/fusiondirectory.po
new file mode 100644
index 0000000000000000000000000000000000000000..1188d80d915be79aad366873f6598bb15409b75c
--- /dev/null
+++ b/dhcp/locale/el_GR/fusiondirectory.po
@@ -0,0 +1,320 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR FusionDirectory Project
+# This file is distributed under the same license as the PACKAGE package.
+# 
+# Translators:
+msgid ""
+msgstr ""
+"Project-Id-Version: FusionDirectory-109\n"
+"Report-Msgid-Bugs-To: documentation@lists.fusiondirectory.org\n"
+"POT-Creation-Date: 2014-12-15 17:47+0100\n"
+"PO-Revision-Date: 2015-05-30 11:45+0000\n"
+"Last-Translator: Benoit Mortier <benoit.mortier@opensides.be>\n"
+"Language-Team: Greek (Greece) (http://www.transifex.com/projects/p/FusionDirectory-109/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/services/dhcp/class_dhcpAdvanced.inc:59
+#: admin/systems/services/dhcp/class_dhcpAdvanced.inc:73
+#: admin/systems/services/dhcp/class_serviceDHCP.inc:774
+#: 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:167
+#: 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:132
+#: admin/systems/services/dhcp/class_dhcpHost.inc:140
+#: 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
+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
+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
+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
+msgid "Netmask"
+msgstr ""
+
+#: admin/systems/services/dhcp/class_dhcpSubnet.inc:170
+msgid "Network range"
+msgstr ""
+
+#: admin/systems/services/dhcp/class_dhcpNewSectionDialog.inc:48
+#: admin/systems/services/dhcp/class_serviceDHCP.inc:62
+#: admin/systems/services/dhcp/class_serviceDHCP.inc:103
+#: admin/systems/services/dhcp/class_serviceDHCP.inc:729
+msgid "Global options"
+msgstr ""
+
+#: admin/systems/services/dhcp/class_dhcpNewSectionDialog.inc:49
+#: admin/systems/services/dhcp/class_serviceDHCP.inc:63
+msgid "Class"
+msgstr ""
+
+#: admin/systems/services/dhcp/class_dhcpNewSectionDialog.inc:50
+#: admin/systems/services/dhcp/class_serviceDHCP.inc:64
+msgid "Subclass"
+msgstr ""
+
+#: admin/systems/services/dhcp/class_dhcpNewSectionDialog.inc:51
+#: admin/systems/services/dhcp/class_serviceDHCP.inc:65
+msgid "Host"
+msgstr ""
+
+#: admin/systems/services/dhcp/class_dhcpNewSectionDialog.inc:52
+#: admin/systems/services/dhcp/class_serviceDHCP.inc:66
+msgid "Group"
+msgstr ""
+
+#: admin/systems/services/dhcp/class_dhcpNewSectionDialog.inc:53
+#: admin/systems/services/dhcp/class_serviceDHCP.inc:67
+msgid "Pool"
+msgstr ""
+
+#: admin/systems/services/dhcp/class_dhcpNewSectionDialog.inc:54
+#: admin/systems/services/dhcp/class_serviceDHCP.inc:68
+msgid "Subnet"
+msgstr ""
+
+#: admin/systems/services/dhcp/class_dhcpNewSectionDialog.inc:55
+#: admin/systems/services/dhcp/class_serviceDHCP.inc:70
+msgid "Shared network"
+msgstr ""
+
+#: admin/systems/services/dhcp/class_dhcpNewSectionDialog.inc:56
+#: admin/systems/services/dhcp/class_serviceDHCP.inc:71
+msgid "DNS update key"
+msgstr ""
+
+#: admin/systems/services/dhcp/class_dhcpNewSectionDialog.inc:57
+#: admin/systems/services/dhcp/class_serviceDHCP.inc:72
+msgid "DNS update zones"
+msgstr ""
+
+#: admin/systems/services/dhcp/class_dhcpDnsZone.inc:150
+msgid "DNS zone"
+msgstr ""
+
+#: admin/systems/services/dhcp/class_dhcpDnsZone.inc:154
+msgid "DNS server"
+msgstr ""
+
+#: admin/systems/services/dhcp/class_dhcpDnsZone.inc:158
+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"
+msgstr ""
+
+#: admin/systems/services/dhcp/class_dhcpHost.inc:149
+msgid "Hardware address"
+msgstr ""
+
+#: admin/systems/services/dhcp/class_dhcpService.inc:128
+msgid "Lease time"
+msgstr ""
+
+#: admin/systems/services/dhcp/class_dhcpService.inc:131
+msgid "Max lease time"
+msgstr ""
+
+#: admin/systems/services/dhcp/class_dhcpService.inc:134
+#: admin/systems/services/dhcp/class_dhcpSharedNetwork.inc:156
+msgid "Default lease time"
+msgstr ""
+
+#: admin/systems/services/dhcp/class_dhcpService.inc:134
+msgid "Maximum lease time"
+msgstr ""
+
+#: admin/systems/services/dhcp/class_serviceDHCP.inc:59
+#: admin/systems/services/dhcp/class_serviceDHCP.inc:785
+#: admin/systems/services/dhcp/class_serviceDHCP.inc:786
+#: admin/systems/services/dhcp/class_serviceDHCP.inc:828
+msgid "DHCP service"
+msgstr ""
+
+#: admin/systems/services/dhcp/class_serviceDHCP.inc:61
+msgid "Logging"
+msgstr ""
+
+#: admin/systems/services/dhcp/class_serviceDHCP.inc:69
+msgid "Failover peer"
+msgstr ""
+
+#: admin/systems/services/dhcp/class_serviceDHCP.inc:149
+#, php-format
+msgid ""
+"You have requested a migration of the DHCP setup from server '%s' to the "
+"current one."
+msgstr ""
+
+#: admin/systems/services/dhcp/class_serviceDHCP.inc:151
+msgid "The migration will be started when you save this system."
+msgstr ""
+
+#: admin/systems/services/dhcp/class_serviceDHCP.inc:154
+msgid "Warning"
+msgstr ""
+
+#: admin/systems/services/dhcp/class_serviceDHCP.inc:246
+msgid "Permission error"
+msgstr ""
+
+#: admin/systems/services/dhcp/class_serviceDHCP.inc:283
+msgid "DHCP section"
+msgstr ""
+
+#: admin/systems/services/dhcp/class_serviceDHCP.inc:339
+#: admin/systems/services/dhcp/class_serviceDHCP.inc:342
+msgid "Insert new DHCP section"
+msgstr ""
+
+#: admin/systems/services/dhcp/class_serviceDHCP.inc:340
+#: admin/systems/services/dhcp/class_serviceDHCP.inc:343
+#: admin/systems/services/dhcp/class_serviceDHCP.inc:344
+msgid "Edit DHCP section"
+msgstr ""
+
+#: admin/systems/services/dhcp/class_serviceDHCP.inc:341
+#: admin/systems/services/dhcp/class_serviceDHCP.inc:345
+msgid "Remove DHCP section"
+msgstr ""
+
+#: admin/systems/services/dhcp/class_serviceDHCP.inc:346
+msgid "Expand DHCP subnet"
+msgstr ""
+
+#: admin/systems/services/dhcp/class_serviceDHCP.inc:347
+msgid "Fold DHCP subnet"
+msgstr ""
+
+#: admin/systems/services/dhcp/class_serviceDHCP.inc:422
+#: admin/systems/services/dhcp/class_serviceDHCP.inc:439
+#: admin/systems/services/dhcp/class_serviceDHCP.inc:494
+#: admin/systems/services/dhcp/class_serviceDHCP.inc:570
+#: admin/systems/services/dhcp/class_serviceDHCP.inc:578
+#: admin/systems/services/dhcp/class_serviceDHCP.inc:605
+msgid "LDAP error"
+msgstr ""
+
+#: admin/systems/services/dhcp/class_serviceDHCP.inc:774
+msgid ""
+"The DHCP configuration set is unkown. Please contact your system "
+"administrator."
+msgstr ""
+
+#: admin/systems/services/dhcp/class_serviceDHCP.inc:786
+msgid "Services"
+msgstr ""
+
+#: admin/systems/services/dhcp/class_serviceDHCP.inc:793
+msgid "Start service"
+msgstr ""
+
+#: admin/systems/services/dhcp/class_serviceDHCP.inc:794
+msgid "Stop service"
+msgstr ""
+
+#: admin/systems/services/dhcp/class_serviceDHCP.inc:795
+msgid "Restart service"
+msgstr ""
+
+#: admin/systems/services/dhcp/class_dhcpNetwork.inc:197
+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:114
+#: admin/systems/services/dhcp/class_dhcpTSigKey.inc:127
+msgid "Key name"
+msgstr ""
+
+#: admin/systems/services/dhcp/class_dhcpTSigKey.inc:118
+msgid "Key"
+msgstr ""
+
+#: admin/systems/services/dhcp/class_dhcpSharedNetwork.inc:157
+msgid "Max. lease time"
+msgstr ""
+
+#: admin/systems/services/dhcp/class_dhcpSharedNetwork.inc:158
+msgid "Min. lease time"
+msgstr ""
diff --git a/dhcp/locale/es/fusiondirectory.po b/dhcp/locale/es/fusiondirectory.po
index 89c607ce6af4d1440e0a4361f0a0f0925df3b033..18963d29552311104f01cc23096caf7a2520fe07 100644
--- a/dhcp/locale/es/fusiondirectory.po
+++ b/dhcp/locale/es/fusiondirectory.po
@@ -3,16 +3,14 @@
 # This file is distributed under the same license as the PACKAGE package.
 # 
 # Translators:
-# lars_g <lars.gold@gmail.com>, 2012
-# lars_g <lars.gold@gmail.com>, 2012
 msgid ""
 msgstr ""
-"Project-Id-Version: FusionDirectory-108\n"
+"Project-Id-Version: FusionDirectory-109\n"
 "Report-Msgid-Bugs-To: documentation@lists.fusiondirectory.org\n"
-"POT-Creation-Date: 2015-03-19 21:45+0100\n"
-"PO-Revision-Date: 2015-02-25 16:51+0000\n"
+"POT-Creation-Date: 2014-12-15 17:47+0100\n"
+"PO-Revision-Date: 2015-02-25 16:13+0000\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>\n"
-"Language-Team: Spanish (http://www.transifex.com/projects/p/FusionDirectory-108/language/es/)\n"
+"Language-Team: Spanish (http://www.transifex.com/projects/p/FusionDirectory-109/language/es/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -21,7 +19,7 @@ msgstr ""
 
 #: admin/systems/services/dhcp/class_dhcpAdvanced.inc:59
 #: admin/systems/services/dhcp/class_dhcpAdvanced.inc:73
-#: admin/systems/services/dhcp/class_serviceDHCP.inc:776
+#: admin/systems/services/dhcp/class_serviceDHCP.inc:774
 #: admin/systems/services/dhcp/class_dhcpNetwork.inc:48
 msgid "Error"
 msgstr "Error"
@@ -54,10 +52,6 @@ msgstr "automÃ¡tico"
 #: 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"
 
@@ -66,7 +60,6 @@ msgstr "Nombre"
 #: 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"
 
@@ -77,15 +70,12 @@ msgstr "El rango no estÃ¡ dentro de la red 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 "DirecciÃ³n de red"
 
 #: 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"
 
@@ -96,7 +86,7 @@ msgstr "Rango de red"
 #: admin/systems/services/dhcp/class_dhcpNewSectionDialog.inc:48
 #: admin/systems/services/dhcp/class_serviceDHCP.inc:62
 #: admin/systems/services/dhcp/class_serviceDHCP.inc:103
-#: admin/systems/services/dhcp/class_serviceDHCP.inc:731
+#: admin/systems/services/dhcp/class_serviceDHCP.inc:729
 msgid "Global options"
 msgstr "Opciones globales"
 
@@ -137,7 +127,6 @@ msgstr "Red compartida"
 
 #: admin/systems/services/dhcp/class_dhcpNewSectionDialog.inc:56
 #: admin/systems/services/dhcp/class_serviceDHCP.inc:71
-#: admin/systems/services/dhcp/dhcp_tsigkey.tpl.c:2
 msgid "DNS update key"
 msgstr "Llave de actualizaciÃ³n DNS"
 
@@ -147,18 +136,14 @@ msgid "DNS update zones"
 msgstr "Zonas de actualizaciÃ³n DNS"
 
 #: admin/systems/services/dhcp/class_dhcpDnsZone.inc:150
-#: admin/systems/services/dhcp/dhcp_dnszone.tpl.c:5
 msgid "DNS zone"
 msgstr "Zona DNS"
 
 #: admin/systems/services/dhcp/class_dhcpDnsZone.inc:154
-#: 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:158
-#: admin/systems/services/dhcp/dhcp_dnszone.tpl.c:11
 msgid "Key DN"
 msgstr "Llave DN"
 
@@ -175,7 +160,6 @@ msgid "Token Ring"
 msgstr "Token Ring"
 
 #: admin/systems/services/dhcp/class_dhcpHost.inc:149
-#: admin/systems/services/dhcp/dhcp_host.tpl.c:20
 msgid "Hardware address"
 msgstr "DirecciÃ³n hardware"
 
@@ -189,20 +173,17 @@ msgstr "Tiempo de asignaciÃ³n mÃ¡ximo"
 
 #: 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_dhcpService.inc:134
-#: admin/systems/services/dhcp/dhcp_sharedNetwork.tpl.c:38
 msgid "Maximum lease time"
 msgstr "Tiempo de asignaciÃ³n mÃ¡ximo"
 
 #: admin/systems/services/dhcp/class_serviceDHCP.inc:59
-#: admin/systems/services/dhcp/class_serviceDHCP.inc:787
-#: admin/systems/services/dhcp/class_serviceDHCP.inc:788
-#: admin/systems/services/dhcp/class_serviceDHCP.inc:830
+#: admin/systems/services/dhcp/class_serviceDHCP.inc:785
+#: admin/systems/services/dhcp/class_serviceDHCP.inc:786
+#: admin/systems/services/dhcp/class_serviceDHCP.inc:828
 msgid "DHCP service"
 msgstr "Servicio DHCP"
 
@@ -226,75 +207,73 @@ msgid "The migration will be started when you save this system."
 msgstr "La migraciÃ³n se iniciarÃ¡ cuando grabe este sistema."
 
 #: admin/systems/services/dhcp/class_serviceDHCP.inc:154
-#: admin/systems/services/dhcp/remove_dhcp.tpl.c:2
 msgid "Warning"
 msgstr "Aviso"
 
-#: admin/systems/services/dhcp/class_serviceDHCP.inc:247
+#: admin/systems/services/dhcp/class_serviceDHCP.inc:246
 msgid "Permission error"
 msgstr "Error de permisos"
 
-#: admin/systems/services/dhcp/class_serviceDHCP.inc:284
+#: admin/systems/services/dhcp/class_serviceDHCP.inc:283
 msgid "DHCP section"
 msgstr "SecciÃ³n DHCP"
 
-#: admin/systems/services/dhcp/class_serviceDHCP.inc:340
-#: admin/systems/services/dhcp/class_serviceDHCP.inc:343
+#: admin/systems/services/dhcp/class_serviceDHCP.inc:339
+#: admin/systems/services/dhcp/class_serviceDHCP.inc:342
 msgid "Insert new DHCP section"
 msgstr "Insertar nueva secciÃ³n DHCP"
 
-#: admin/systems/services/dhcp/class_serviceDHCP.inc:341
+#: admin/systems/services/dhcp/class_serviceDHCP.inc:340
+#: admin/systems/services/dhcp/class_serviceDHCP.inc:343
 #: admin/systems/services/dhcp/class_serviceDHCP.inc:344
-#: admin/systems/services/dhcp/class_serviceDHCP.inc:345
 msgid "Edit DHCP section"
 msgstr "Editar secciÃ³n DHCP"
 
-#: admin/systems/services/dhcp/class_serviceDHCP.inc:342
-#: admin/systems/services/dhcp/class_serviceDHCP.inc:346
+#: admin/systems/services/dhcp/class_serviceDHCP.inc:341
+#: admin/systems/services/dhcp/class_serviceDHCP.inc:345
 msgid "Remove DHCP section"
 msgstr "Eliminar secciÃ³n DHCP"
 
-#: admin/systems/services/dhcp/class_serviceDHCP.inc:347
+#: admin/systems/services/dhcp/class_serviceDHCP.inc:346
 msgid "Expand DHCP subnet"
 msgstr ""
 
-#: admin/systems/services/dhcp/class_serviceDHCP.inc:348
+#: admin/systems/services/dhcp/class_serviceDHCP.inc:347
 msgid "Fold DHCP subnet"
 msgstr ""
 
-#: admin/systems/services/dhcp/class_serviceDHCP.inc:425
-#: admin/systems/services/dhcp/class_serviceDHCP.inc:442
-#: admin/systems/services/dhcp/class_serviceDHCP.inc:497
-#: admin/systems/services/dhcp/class_serviceDHCP.inc:573
-#: admin/systems/services/dhcp/class_serviceDHCP.inc:581
-#: admin/systems/services/dhcp/class_serviceDHCP.inc:608
+#: admin/systems/services/dhcp/class_serviceDHCP.inc:422
+#: admin/systems/services/dhcp/class_serviceDHCP.inc:439
+#: admin/systems/services/dhcp/class_serviceDHCP.inc:494
+#: admin/systems/services/dhcp/class_serviceDHCP.inc:570
+#: admin/systems/services/dhcp/class_serviceDHCP.inc:578
+#: admin/systems/services/dhcp/class_serviceDHCP.inc:605
 msgid "LDAP error"
 msgstr "Error LDAP"
 
-#: admin/systems/services/dhcp/class_serviceDHCP.inc:776
+#: admin/systems/services/dhcp/class_serviceDHCP.inc:774
 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:788
+#: admin/systems/services/dhcp/class_serviceDHCP.inc:786
 msgid "Services"
 msgstr "Servicios"
 
-#: admin/systems/services/dhcp/class_serviceDHCP.inc:795
+#: admin/systems/services/dhcp/class_serviceDHCP.inc:793
 msgid "Start service"
 msgstr "Iniciar servicio"
 
-#: admin/systems/services/dhcp/class_serviceDHCP.inc:796
+#: admin/systems/services/dhcp/class_serviceDHCP.inc:794
 msgid "Stop service"
 msgstr "Parar servicio"
 
-#: admin/systems/services/dhcp/class_serviceDHCP.inc:797
+#: admin/systems/services/dhcp/class_serviceDHCP.inc:795
 msgid "Restart service"
 msgstr "Reiniciar servicio"
 
 #: 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"
 
@@ -325,297 +304,17 @@ msgstr "DH"
 
 #: admin/systems/services/dhcp/class_dhcpTSigKey.inc:114
 #: admin/systems/services/dhcp/class_dhcpTSigKey.inc:127
-#: admin/systems/services/dhcp/dhcp_tsigkey.tpl.c:5
 msgid "Key name"
 msgstr "Nombre de la llave"
 
 #: admin/systems/services/dhcp/class_dhcpTSigKey.inc:118
-#: 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/serviceDHCP.tpl.c:2
-msgid ""
-"DHCP take over will take place when saving this entry. Choose 'Cancel' to "
-"abort."
-msgstr "DHCP tomara el control cuando grabe esta entrada. Elija 'Cancelar' para anular."
-
-#: admin/systems/services/dhcp/serviceDHCP.tpl.c:5
-msgid "Take over dhcp configuration from following server"
-msgstr "Gestionar configuraciÃ³n de dhcp desde el siguiente servidor"
-
-#: admin/systems/services/dhcp/serviceDHCP.tpl.c:8
-msgid "DHCP sections"
-msgstr "Secciones DHCP"
-
-#: 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/systems/services/dhcp/dhcp_subnet.tpl.c:11
-msgid "Range for dynamic address assignment"
-msgstr "Rango de asignaciÃ³n de direcciones dinÃ¡micas"
-
-#: admin/systems/services/dhcp/dhcp_dnszone.tpl.c:2
-msgid "DNS update zone"
-msgstr "Zona de actualizaciÃ³n DNS"
-
-#: 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/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/systems/services/dhcp/dhcp_tsigkey.tpl.c:8
-msgid "Name of Key"
-msgstr "Nombre de la llave"
-
-#: admin/systems/services/dhcp/dhcp_tsigkey.tpl.c:11
-msgid "Encryption method"
-msgstr "MÃ©todo de encripciÃ³n"
-
-#: admin/systems/services/dhcp/dhcp_pool.tpl.c:8
-msgid "Name of pool"
-msgstr "Nombre del Conjunto (Pool)"
-
-#: admin/systems/services/dhcp/dhcpNewSection.tpl.c:2
-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/systems/services/dhcp/dhcpNewSection.tpl.c:11
-msgid "Choose section type to create"
-msgstr "Seleccione el tipo de secciÃ³n para crear"
-
-#: 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 "Ocultar configuraciÃ³n avanzada"
-
-#: admin/systems/services/dhcp/dhcp_advanced.tpl.c:5
-msgid "DHCP statements"
-msgstr "Informes DHCP"
-
-#: admin/systems/services/dhcp/dhcp_advanced.tpl.c:8
-msgid "DHCP options"
-msgstr "Opciones DHCP"
-
-#: admin/systems/services/dhcp/dhcp_advanced.tpl.c:11
-msgid "Show advanced settings"
-msgstr "Mostrar configuraciÃ³n avanzada"
-
-#: admin/systems/services/dhcp/dhcp_host.tpl.c:8
-msgid "Name of host"
-msgstr "Nombre de la mÃ¡quina"
-
-#: admin/systems/services/dhcp/dhcp_host.tpl.c:11
-msgid "Fixed address"
-msgstr "DirecciÃ³n estÃ¡tica"
-
-#: 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/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 "Nombre para la Red compartida"
-
-#: admin/systems/services/dhcp/dhcp_sharedNetwork.tpl.c:11
-msgid "Server identifier"
-msgstr "Identificador de servidor"
-
-#: 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/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/systems/services/dhcp/dhcp_sharedNetwork.tpl.c:20
-msgid "Authoritative server"
-msgstr "Servidor autorizado"
-
-#: admin/systems/services/dhcp/dhcp_sharedNetwork.tpl.c:23
-msgid "Leases"
-msgstr "Asignaciones"
-
-#: 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"
-msgstr "Tiempo de asignaciÃ³n mÃnimo"
-
-#: admin/systems/services/dhcp/dhcp_sharedNetwork.tpl.c:53
-msgid "Access control"
-msgstr "Control de acceso"
-
-#: 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/systems/services/dhcp/dhcp_sharedNetwork.tpl.c:59
-msgid "Allow unknown clients"
-msgstr "Permitir clientes desconocidos"
-
-#: 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"
-
-#: admin/systems/services/dhcp/dhcp_sharedNetwork.tpl.c:65
-msgid "Allow bootp clients"
-msgstr "Permitir clientes BOOTP"
-
-#: 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"
-
-#: admin/systems/services/dhcp/dhcp_sharedNetwork.tpl.c:71
-msgid "Allow booting"
-msgstr "Permitir inicializaciÃ³n"
diff --git a/dhcp/locale/es_VE/fusiondirectory.po b/dhcp/locale/es_VE/fusiondirectory.po
index 5a96f09d8f9435d9c6c8037b82c9541b6c03a37c..0865ec245caa0e1d98701d507051437399572e7a 100644
--- a/dhcp/locale/es_VE/fusiondirectory.po
+++ b/dhcp/locale/es_VE/fusiondirectory.po
@@ -3,17 +3,14 @@
 # This file is distributed under the same license as the PACKAGE package.
 # 
 # Translators:
-# lars_g <lars.gold@gmail.com>, 2012-2013
-# lars_g <lars.gold@gmail.com>, 2013
-# lars_g <lars.gold@gmail.com>, 2012
 msgid ""
 msgstr ""
-"Project-Id-Version: FusionDirectory-108\n"
+"Project-Id-Version: FusionDirectory-109\n"
 "Report-Msgid-Bugs-To: documentation@lists.fusiondirectory.org\n"
-"POT-Creation-Date: 2015-03-19 21:45+0100\n"
-"PO-Revision-Date: 2015-02-25 16:51+0000\n"
+"POT-Creation-Date: 2014-12-15 17:47+0100\n"
+"PO-Revision-Date: 2015-02-25 16:13+0000\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>\n"
-"Language-Team: Spanish (Venezuela) (http://www.transifex.com/projects/p/FusionDirectory-108/language/es_VE/)\n"
+"Language-Team: Spanish (Venezuela) (http://www.transifex.com/projects/p/FusionDirectory-109/language/es_VE/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -22,7 +19,7 @@ msgstr ""
 
 #: admin/systems/services/dhcp/class_dhcpAdvanced.inc:59
 #: admin/systems/services/dhcp/class_dhcpAdvanced.inc:73
-#: admin/systems/services/dhcp/class_serviceDHCP.inc:776
+#: admin/systems/services/dhcp/class_serviceDHCP.inc:774
 #: admin/systems/services/dhcp/class_dhcpNetwork.inc:48
 msgid "Error"
 msgstr "Error"
@@ -55,10 +52,6 @@ msgstr "automÃ¡tico"
 #: 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"
 
@@ -67,7 +60,6 @@ msgstr "Nombre"
 #: 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"
 
@@ -78,15 +70,12 @@ msgstr "El rango no estÃ¡ dentro de la red 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 "DirecciÃ³n de red"
 
 #: 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"
 
@@ -97,7 +86,7 @@ msgstr "Rango de red"
 #: admin/systems/services/dhcp/class_dhcpNewSectionDialog.inc:48
 #: admin/systems/services/dhcp/class_serviceDHCP.inc:62
 #: admin/systems/services/dhcp/class_serviceDHCP.inc:103
-#: admin/systems/services/dhcp/class_serviceDHCP.inc:731
+#: admin/systems/services/dhcp/class_serviceDHCP.inc:729
 msgid "Global options"
 msgstr "Opciones globales"
 
@@ -138,7 +127,6 @@ msgstr "Red compartida"
 
 #: admin/systems/services/dhcp/class_dhcpNewSectionDialog.inc:56
 #: admin/systems/services/dhcp/class_serviceDHCP.inc:71
-#: admin/systems/services/dhcp/dhcp_tsigkey.tpl.c:2
 msgid "DNS update key"
 msgstr "Llave de actualizaciÃ³n DNS"
 
@@ -148,18 +136,14 @@ msgid "DNS update zones"
 msgstr "Zonas de actualizaciÃ³n DNS"
 
 #: admin/systems/services/dhcp/class_dhcpDnsZone.inc:150
-#: admin/systems/services/dhcp/dhcp_dnszone.tpl.c:5
 msgid "DNS zone"
 msgstr "Zona DNS"
 
 #: admin/systems/services/dhcp/class_dhcpDnsZone.inc:154
-#: 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:158
-#: admin/systems/services/dhcp/dhcp_dnszone.tpl.c:11
 msgid "Key DN"
 msgstr "Llave DN"
 
@@ -176,7 +160,6 @@ msgid "Token Ring"
 msgstr "Token Ring"
 
 #: admin/systems/services/dhcp/class_dhcpHost.inc:149
-#: admin/systems/services/dhcp/dhcp_host.tpl.c:20
 msgid "Hardware address"
 msgstr "DirecciÃ³n hardware"
 
@@ -190,20 +173,17 @@ msgstr "Tiempo de asignaciÃ³n mÃ¡ximo"
 
 #: 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_dhcpService.inc:134
-#: admin/systems/services/dhcp/dhcp_sharedNetwork.tpl.c:38
 msgid "Maximum lease time"
 msgstr "Tiempo de asignaciÃ³n mÃ¡ximo"
 
 #: admin/systems/services/dhcp/class_serviceDHCP.inc:59
-#: admin/systems/services/dhcp/class_serviceDHCP.inc:787
-#: admin/systems/services/dhcp/class_serviceDHCP.inc:788
-#: admin/systems/services/dhcp/class_serviceDHCP.inc:830
+#: admin/systems/services/dhcp/class_serviceDHCP.inc:785
+#: admin/systems/services/dhcp/class_serviceDHCP.inc:786
+#: admin/systems/services/dhcp/class_serviceDHCP.inc:828
 msgid "DHCP service"
 msgstr "Servicio DHCP"
 
@@ -227,75 +207,73 @@ msgid "The migration will be started when you save this system."
 msgstr "La migraciÃ³n se iniciarÃ¡ cuando grabe este sistema."
 
 #: admin/systems/services/dhcp/class_serviceDHCP.inc:154
-#: admin/systems/services/dhcp/remove_dhcp.tpl.c:2
 msgid "Warning"
 msgstr "Aviso"
 
-#: admin/systems/services/dhcp/class_serviceDHCP.inc:247
+#: admin/systems/services/dhcp/class_serviceDHCP.inc:246
 msgid "Permission error"
 msgstr "Error de permisos"
 
-#: admin/systems/services/dhcp/class_serviceDHCP.inc:284
+#: admin/systems/services/dhcp/class_serviceDHCP.inc:283
 msgid "DHCP section"
 msgstr "SecciÃ³n DHCP"
 
-#: admin/systems/services/dhcp/class_serviceDHCP.inc:340
-#: admin/systems/services/dhcp/class_serviceDHCP.inc:343
+#: admin/systems/services/dhcp/class_serviceDHCP.inc:339
+#: admin/systems/services/dhcp/class_serviceDHCP.inc:342
 msgid "Insert new DHCP section"
 msgstr "Insertar nueva secciÃ³n DHCP"
 
-#: admin/systems/services/dhcp/class_serviceDHCP.inc:341
+#: admin/systems/services/dhcp/class_serviceDHCP.inc:340
+#: admin/systems/services/dhcp/class_serviceDHCP.inc:343
 #: admin/systems/services/dhcp/class_serviceDHCP.inc:344
-#: admin/systems/services/dhcp/class_serviceDHCP.inc:345
 msgid "Edit DHCP section"
 msgstr "Editar secciÃ³n DHCP"
 
-#: admin/systems/services/dhcp/class_serviceDHCP.inc:342
-#: admin/systems/services/dhcp/class_serviceDHCP.inc:346
+#: admin/systems/services/dhcp/class_serviceDHCP.inc:341
+#: admin/systems/services/dhcp/class_serviceDHCP.inc:345
 msgid "Remove DHCP section"
 msgstr "Eliminar secciÃ³n DHCP"
 
-#: admin/systems/services/dhcp/class_serviceDHCP.inc:347
+#: admin/systems/services/dhcp/class_serviceDHCP.inc:346
 msgid "Expand DHCP subnet"
 msgstr "Expandir subred DHCP"
 
-#: admin/systems/services/dhcp/class_serviceDHCP.inc:348
+#: admin/systems/services/dhcp/class_serviceDHCP.inc:347
 msgid "Fold DHCP subnet"
 msgstr ""
 
-#: admin/systems/services/dhcp/class_serviceDHCP.inc:425
-#: admin/systems/services/dhcp/class_serviceDHCP.inc:442
-#: admin/systems/services/dhcp/class_serviceDHCP.inc:497
-#: admin/systems/services/dhcp/class_serviceDHCP.inc:573
-#: admin/systems/services/dhcp/class_serviceDHCP.inc:581
-#: admin/systems/services/dhcp/class_serviceDHCP.inc:608
+#: admin/systems/services/dhcp/class_serviceDHCP.inc:422
+#: admin/systems/services/dhcp/class_serviceDHCP.inc:439
+#: admin/systems/services/dhcp/class_serviceDHCP.inc:494
+#: admin/systems/services/dhcp/class_serviceDHCP.inc:570
+#: admin/systems/services/dhcp/class_serviceDHCP.inc:578
+#: admin/systems/services/dhcp/class_serviceDHCP.inc:605
 msgid "LDAP error"
-msgstr "Error LDAP"
+msgstr "Error de LDAP"
 
-#: admin/systems/services/dhcp/class_serviceDHCP.inc:776
+#: admin/systems/services/dhcp/class_serviceDHCP.inc:774
 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:788
+#: admin/systems/services/dhcp/class_serviceDHCP.inc:786
 msgid "Services"
 msgstr "Servicios"
 
-#: admin/systems/services/dhcp/class_serviceDHCP.inc:795
+#: admin/systems/services/dhcp/class_serviceDHCP.inc:793
 msgid "Start service"
 msgstr "Iniciar servicio"
 
-#: admin/systems/services/dhcp/class_serviceDHCP.inc:796
+#: admin/systems/services/dhcp/class_serviceDHCP.inc:794
 msgid "Stop service"
 msgstr "Parar servicio"
 
-#: admin/systems/services/dhcp/class_serviceDHCP.inc:797
+#: admin/systems/services/dhcp/class_serviceDHCP.inc:795
 msgid "Restart service"
 msgstr "Reiniciar servicio"
 
 #: 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"
 
@@ -326,297 +304,17 @@ msgstr "DH"
 
 #: admin/systems/services/dhcp/class_dhcpTSigKey.inc:114
 #: admin/systems/services/dhcp/class_dhcpTSigKey.inc:127
-#: admin/systems/services/dhcp/dhcp_tsigkey.tpl.c:5
 msgid "Key name"
 msgstr "Nombre de la llave"
 
 #: admin/systems/services/dhcp/class_dhcpTSigKey.inc:118
-#: 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/serviceDHCP.tpl.c:2
-msgid ""
-"DHCP take over will take place when saving this entry. Choose 'Cancel' to "
-"abort."
-msgstr "DHCP tomara el control cuando grabe esta entrada. Elija 'Cancelar' para anular."
-
-#: admin/systems/services/dhcp/serviceDHCP.tpl.c:5
-msgid "Take over dhcp configuration from following server"
-msgstr "Gestionar configuraciÃ³n de dhcp desde el siguiente servidor"
-
-#: admin/systems/services/dhcp/serviceDHCP.tpl.c:8
-msgid "DHCP sections"
-msgstr "Secciones DHCP"
-
-#: 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/systems/services/dhcp/dhcp_subnet.tpl.c:11
-msgid "Range for dynamic address assignment"
-msgstr "Rango de asignaciÃ³n de direcciones dinÃ¡micas"
-
-#: admin/systems/services/dhcp/dhcp_dnszone.tpl.c:2
-msgid "DNS update zone"
-msgstr "Zona de actualizaciÃ³n DNS"
-
-#: 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/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/systems/services/dhcp/dhcp_tsigkey.tpl.c:8
-msgid "Name of Key"
-msgstr "Nombre de la llave"
-
-#: admin/systems/services/dhcp/dhcp_tsigkey.tpl.c:11
-msgid "Encryption method"
-msgstr "MÃ©todo de encripciÃ³n"
-
-#: admin/systems/services/dhcp/dhcp_pool.tpl.c:8
-msgid "Name of pool"
-msgstr "Nombre del Conjunto (Pool)"
-
-#: admin/systems/services/dhcp/dhcpNewSection.tpl.c:2
-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/systems/services/dhcp/dhcpNewSection.tpl.c:11
-msgid "Choose section type to create"
-msgstr "Seleccione el tipo de secciÃ³n para crear"
-
-#: 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 "Ocultar configuraciÃ³n avanzada"
-
-#: admin/systems/services/dhcp/dhcp_advanced.tpl.c:5
-msgid "DHCP statements"
-msgstr "Informes DHCP"
-
-#: admin/systems/services/dhcp/dhcp_advanced.tpl.c:8
-msgid "DHCP options"
-msgstr "Opciones DHCP"
-
-#: admin/systems/services/dhcp/dhcp_advanced.tpl.c:11
-msgid "Show advanced settings"
-msgstr "Mostrar configuraciÃ³n avanzada"
-
-#: admin/systems/services/dhcp/dhcp_host.tpl.c:8
-msgid "Name of host"
-msgstr "Nombre de la mÃ¡quina"
-
-#: admin/systems/services/dhcp/dhcp_host.tpl.c:11
-msgid "Fixed address"
-msgstr "DirecciÃ³n estÃ¡tica"
-
-#: 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/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 "Nombre para la Red compartida"
-
-#: admin/systems/services/dhcp/dhcp_sharedNetwork.tpl.c:11
-msgid "Server identifier"
-msgstr "Identificador de servidor"
-
-#: 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/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/systems/services/dhcp/dhcp_sharedNetwork.tpl.c:20
-msgid "Authoritative server"
-msgstr "Servidor autorizado"
-
-#: admin/systems/services/dhcp/dhcp_sharedNetwork.tpl.c:23
-msgid "Leases"
-msgstr "Asignaciones"
-
-#: 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"
-msgstr "Tiempo de asignaciÃ³n mÃnimo"
-
-#: admin/systems/services/dhcp/dhcp_sharedNetwork.tpl.c:53
-msgid "Access control"
-msgstr "Control de acceso"
-
-#: 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/systems/services/dhcp/dhcp_sharedNetwork.tpl.c:59
-msgid "Allow unknown clients"
-msgstr "Permitir clientes desconocidos"
-
-#: 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"
-
-#: admin/systems/services/dhcp/dhcp_sharedNetwork.tpl.c:65
-msgid "Allow bootp clients"
-msgstr "Permitir clientes BOOTP"
-
-#: 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"
-
-#: admin/systems/services/dhcp/dhcp_sharedNetwork.tpl.c:71
-msgid "Allow booting"
-msgstr "Permitir inicializaciÃ³n"
diff --git a/dhcp/locale/fa_IR/fusiondirectory.po b/dhcp/locale/fa_IR/fusiondirectory.po
index d2ad651d2673ed9356ae40a2f8ae4103c5e12cfc..b59585282949a5cadf89f947db032c00b1c19998 100644
--- a/dhcp/locale/fa_IR/fusiondirectory.po
+++ b/dhcp/locale/fa_IR/fusiondirectory.po
@@ -5,12 +5,12 @@
 # Translators:
 msgid ""
 msgstr ""
-"Project-Id-Version: FusionDirectory-108\n"
+"Project-Id-Version: FusionDirectory-109\n"
 "Report-Msgid-Bugs-To: documentation@lists.fusiondirectory.org\n"
-"POT-Creation-Date: 2015-03-19 21:45+0100\n"
-"PO-Revision-Date: 2015-02-25 15:44+0000\n"
+"POT-Creation-Date: 2014-12-15 17:47+0100\n"
+"PO-Revision-Date: 2014-12-15 16:51+0000\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>\n"
-"Language-Team: Persian (Iran) (http://www.transifex.com/projects/p/FusionDirectory-108/language/fa_IR/)\n"
+"Language-Team: Persian (Iran) (http://www.transifex.com/projects/p/FusionDirectory-109/language/fa_IR/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -19,7 +19,7 @@ msgstr ""
 
 #: admin/systems/services/dhcp/class_dhcpAdvanced.inc:59
 #: admin/systems/services/dhcp/class_dhcpAdvanced.inc:73
-#: admin/systems/services/dhcp/class_serviceDHCP.inc:776
+#: admin/systems/services/dhcp/class_serviceDHCP.inc:774
 #: admin/systems/services/dhcp/class_dhcpNetwork.inc:48
 msgid "Error"
 msgstr "Ø®Ø·Ø§"
@@ -52,10 +52,6 @@ msgstr ""
 #: 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 ""
 
@@ -64,7 +60,6 @@ msgstr ""
 #: 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 ""
 
@@ -75,15 +70,12 @@ 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 ""
 
@@ -94,7 +86,7 @@ msgstr ""
 #: admin/systems/services/dhcp/class_dhcpNewSectionDialog.inc:48
 #: admin/systems/services/dhcp/class_serviceDHCP.inc:62
 #: admin/systems/services/dhcp/class_serviceDHCP.inc:103
-#: admin/systems/services/dhcp/class_serviceDHCP.inc:731
+#: admin/systems/services/dhcp/class_serviceDHCP.inc:729
 msgid "Global options"
 msgstr ""
 
@@ -135,7 +127,6 @@ msgstr ""
 
 #: admin/systems/services/dhcp/class_dhcpNewSectionDialog.inc:56
 #: admin/systems/services/dhcp/class_serviceDHCP.inc:71
-#: admin/systems/services/dhcp/dhcp_tsigkey.tpl.c:2
 msgid "DNS update key"
 msgstr ""
 
@@ -145,18 +136,14 @@ msgid "DNS update zones"
 msgstr ""
 
 #: admin/systems/services/dhcp/class_dhcpDnsZone.inc:150
-#: admin/systems/services/dhcp/dhcp_dnszone.tpl.c:5
 msgid "DNS zone"
 msgstr ""
 
 #: admin/systems/services/dhcp/class_dhcpDnsZone.inc:154
-#: 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:158
-#: admin/systems/services/dhcp/dhcp_dnszone.tpl.c:11
 msgid "Key DN"
 msgstr ""
 
@@ -173,7 +160,6 @@ msgid "Token Ring"
 msgstr ""
 
 #: admin/systems/services/dhcp/class_dhcpHost.inc:149
-#: admin/systems/services/dhcp/dhcp_host.tpl.c:20
 msgid "Hardware address"
 msgstr ""
 
@@ -187,20 +173,17 @@ 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_dhcpService.inc:134
-#: admin/systems/services/dhcp/dhcp_sharedNetwork.tpl.c:38
 msgid "Maximum lease time"
 msgstr ""
 
 #: admin/systems/services/dhcp/class_serviceDHCP.inc:59
-#: admin/systems/services/dhcp/class_serviceDHCP.inc:787
-#: admin/systems/services/dhcp/class_serviceDHCP.inc:788
-#: admin/systems/services/dhcp/class_serviceDHCP.inc:830
+#: admin/systems/services/dhcp/class_serviceDHCP.inc:785
+#: admin/systems/services/dhcp/class_serviceDHCP.inc:786
+#: admin/systems/services/dhcp/class_serviceDHCP.inc:828
 msgid "DHCP service"
 msgstr ""
 
@@ -224,75 +207,73 @@ msgid "The migration will be started when you save this system."
 msgstr ""
 
 #: admin/systems/services/dhcp/class_serviceDHCP.inc:154
-#: admin/systems/services/dhcp/remove_dhcp.tpl.c:2
 msgid "Warning"
 msgstr ""
 
-#: admin/systems/services/dhcp/class_serviceDHCP.inc:247
+#: admin/systems/services/dhcp/class_serviceDHCP.inc:246
 msgid "Permission error"
 msgstr ""
 
-#: admin/systems/services/dhcp/class_serviceDHCP.inc:284
+#: admin/systems/services/dhcp/class_serviceDHCP.inc:283
 msgid "DHCP section"
 msgstr ""
 
-#: admin/systems/services/dhcp/class_serviceDHCP.inc:340
-#: admin/systems/services/dhcp/class_serviceDHCP.inc:343
+#: admin/systems/services/dhcp/class_serviceDHCP.inc:339
+#: admin/systems/services/dhcp/class_serviceDHCP.inc:342
 msgid "Insert new DHCP section"
 msgstr ""
 
-#: admin/systems/services/dhcp/class_serviceDHCP.inc:341
+#: admin/systems/services/dhcp/class_serviceDHCP.inc:340
+#: admin/systems/services/dhcp/class_serviceDHCP.inc:343
 #: admin/systems/services/dhcp/class_serviceDHCP.inc:344
-#: admin/systems/services/dhcp/class_serviceDHCP.inc:345
 msgid "Edit DHCP section"
 msgstr ""
 
-#: admin/systems/services/dhcp/class_serviceDHCP.inc:342
-#: admin/systems/services/dhcp/class_serviceDHCP.inc:346
+#: admin/systems/services/dhcp/class_serviceDHCP.inc:341
+#: admin/systems/services/dhcp/class_serviceDHCP.inc:345
 msgid "Remove DHCP section"
 msgstr ""
 
-#: admin/systems/services/dhcp/class_serviceDHCP.inc:347
+#: admin/systems/services/dhcp/class_serviceDHCP.inc:346
 msgid "Expand DHCP subnet"
 msgstr ""
 
-#: admin/systems/services/dhcp/class_serviceDHCP.inc:348
+#: admin/systems/services/dhcp/class_serviceDHCP.inc:347
 msgid "Fold DHCP subnet"
 msgstr ""
 
-#: admin/systems/services/dhcp/class_serviceDHCP.inc:425
-#: admin/systems/services/dhcp/class_serviceDHCP.inc:442
-#: admin/systems/services/dhcp/class_serviceDHCP.inc:497
-#: admin/systems/services/dhcp/class_serviceDHCP.inc:573
-#: admin/systems/services/dhcp/class_serviceDHCP.inc:581
-#: admin/systems/services/dhcp/class_serviceDHCP.inc:608
+#: admin/systems/services/dhcp/class_serviceDHCP.inc:422
+#: admin/systems/services/dhcp/class_serviceDHCP.inc:439
+#: admin/systems/services/dhcp/class_serviceDHCP.inc:494
+#: admin/systems/services/dhcp/class_serviceDHCP.inc:570
+#: admin/systems/services/dhcp/class_serviceDHCP.inc:578
+#: admin/systems/services/dhcp/class_serviceDHCP.inc:605
 msgid "LDAP error"
 msgstr "Ø®Ø·Ø§ÛŒ LDAP"
 
-#: admin/systems/services/dhcp/class_serviceDHCP.inc:776
+#: admin/systems/services/dhcp/class_serviceDHCP.inc:774
 msgid ""
 "The DHCP configuration set is unkown. Please contact your system "
 "administrator."
 msgstr ""
 
-#: admin/systems/services/dhcp/class_serviceDHCP.inc:788
+#: admin/systems/services/dhcp/class_serviceDHCP.inc:786
 msgid "Services"
 msgstr ""
 
-#: admin/systems/services/dhcp/class_serviceDHCP.inc:795
+#: admin/systems/services/dhcp/class_serviceDHCP.inc:793
 msgid "Start service"
 msgstr ""
 
-#: admin/systems/services/dhcp/class_serviceDHCP.inc:796
+#: admin/systems/services/dhcp/class_serviceDHCP.inc:794
 msgid "Stop service"
 msgstr ""
 
-#: admin/systems/services/dhcp/class_serviceDHCP.inc:797
+#: admin/systems/services/dhcp/class_serviceDHCP.inc:795
 msgid "Restart service"
 msgstr ""
 
 #: admin/systems/services/dhcp/class_dhcpNetwork.inc:197
-#: admin/systems/services/dhcp/dhcp_network.tpl.c:14
 msgid "Broadcast"
 msgstr ""
 
@@ -323,297 +304,17 @@ msgstr ""
 
 #: admin/systems/services/dhcp/class_dhcpTSigKey.inc:114
 #: admin/systems/services/dhcp/class_dhcpTSigKey.inc:127
-#: admin/systems/services/dhcp/dhcp_tsigkey.tpl.c:5
 msgid "Key name"
 msgstr ""
 
 #: admin/systems/services/dhcp/class_dhcpTSigKey.inc:118
-#: 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/serviceDHCP.tpl.c:2
-msgid ""
-"DHCP take over will take place when saving this entry. Choose 'Cancel' to "
-"abort."
-msgstr ""
-
-#: admin/systems/services/dhcp/serviceDHCP.tpl.c:5
-msgid "Take over dhcp configuration from following server"
-msgstr ""
-
-#: admin/systems/services/dhcp/serviceDHCP.tpl.c:8
-msgid "DHCP sections"
-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 ""
-
-#: 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"
-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 ""
-
-#: 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 ""
-
-#: 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"
-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
-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 ""
-
-#: 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"
-msgstr ""
-
-#: admin/systems/services/dhcp/dhcp_advanced.tpl.c:11
-msgid "Show advanced settings"
-msgstr ""
-
-#: admin/systems/services/dhcp/dhcp_host.tpl.c:8
-msgid "Name of host"
-msgstr ""
-
-#: admin/systems/services/dhcp/dhcp_host.tpl.c:11
-msgid "Fixed address"
-msgstr ""
-
-#: admin/systems/services/dhcp/dhcp_host.tpl.c:14
-msgid "Use hostname or IP-address to assign fixed address"
-msgstr ""
-
-#: admin/systems/services/dhcp/dhcp_host.tpl.c:17
-msgid "Hardware type"
-msgstr ""
-
-#: admin/systems/services/dhcp/dhcp_sharedNetwork.tpl.c:8
-msgid "Name for shared network"
-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"
-msgstr ""
-
-#: admin/systems/services/dhcp/dhcp_sharedNetwork.tpl.c:17
-msgid "Select if this server is authoritative for this shared network"
-msgstr ""
-
-#: admin/systems/services/dhcp/dhcp_sharedNetwork.tpl.c:20
-msgid "Authoritative server"
-msgstr ""
-
-#: admin/systems/services/dhcp/dhcp_sharedNetwork.tpl.c:23
-msgid "Leases"
-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 ""
-
-#: 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"
-msgstr ""
-
-#: admin/systems/services/dhcp/dhcp_sharedNetwork.tpl.c:65
-msgid "Allow bootp clients"
-msgstr ""
-
-#: admin/systems/services/dhcp/dhcp_sharedNetwork.tpl.c:68
-msgid "Select if clients are allowed to boot using this DHCP server"
-msgstr ""
-
-#: admin/systems/services/dhcp/dhcp_sharedNetwork.tpl.c:71
-msgid "Allow booting"
-msgstr ""
diff --git a/dhcp/locale/fr/fusiondirectory.po b/dhcp/locale/fr/fusiondirectory.po
index f3b986aa709fc9bcde6dedb8c4b53ee346389f69..7bfff0eb17a76044f9932dbeeb0d0ab2561705e2 100644
--- a/dhcp/locale/fr/fusiondirectory.po
+++ b/dhcp/locale/fr/fusiondirectory.po
@@ -3,20 +3,14 @@
 # This file is distributed under the same license as the PACKAGE package.
 # 
 # Translators:
-# Benoit Mortier <benoit.mortier@opensides.be>, 2005-2009,2011
-# MCMic, 2014
-# fusiondirectory <contact@fusiondirectory.org>, 2012
-# fusiondirectory <contact@fusiondirectory.org>, 2012
-# fusiondirectory <contact@fusiondirectory.org>, 2012
-# MCMic, 2014
 msgid ""
 msgstr ""
-"Project-Id-Version: FusionDirectory-108\n"
+"Project-Id-Version: FusionDirectory-109\n"
 "Report-Msgid-Bugs-To: documentation@lists.fusiondirectory.org\n"
-"POT-Creation-Date: 2015-03-19 21:45+0100\n"
-"PO-Revision-Date: 2015-02-25 16:51+0000\n"
+"POT-Creation-Date: 2014-12-15 17:47+0100\n"
+"PO-Revision-Date: 2015-02-25 16:13+0000\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>\n"
-"Language-Team: French (http://www.transifex.com/projects/p/FusionDirectory-108/language/fr/)\n"
+"Language-Team: French (http://www.transifex.com/projects/p/FusionDirectory-109/language/fr/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -25,7 +19,7 @@ msgstr ""
 
 #: admin/systems/services/dhcp/class_dhcpAdvanced.inc:59
 #: admin/systems/services/dhcp/class_dhcpAdvanced.inc:73
-#: admin/systems/services/dhcp/class_serviceDHCP.inc:776
+#: admin/systems/services/dhcp/class_serviceDHCP.inc:774
 #: admin/systems/services/dhcp/class_dhcpNetwork.inc:48
 msgid "Error"
 msgstr "Erreur"
@@ -33,7 +27,7 @@ msgstr "Erreur"
 #: 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â€¯!"
+msgstr "Impossible d'effacer les dÃ©clarations automatiques !"
 
 #: admin/systems/services/dhcp/class_dhcpAdvanced.inc:89
 #: admin/systems/services/dhcp/class_dhcpAdvanced.inc:104
@@ -58,10 +52,6 @@ msgstr "automatique"
 #: 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"
 
@@ -70,9 +60,8 @@ msgstr "Nom"
 #: 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 "Ã‰tendue"
+msgstr "Etendue"
 
 #: admin/systems/services/dhcp/class_dhcpPool.inc:141
 #: admin/systems/services/dhcp/class_dhcpSubnet.inc:176
@@ -81,28 +70,25 @@ msgstr "L'Ã©tendue rÃ©seau n'est pas comprise dans le rÃ©seau configurÃ©."
 
 #: 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/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 "Ã‰tendue rÃ©seau"
+msgstr "Etendue rÃ©seau"
 
 #: admin/systems/services/dhcp/class_dhcpNewSectionDialog.inc:48
 #: admin/systems/services/dhcp/class_serviceDHCP.inc:62
 #: admin/systems/services/dhcp/class_serviceDHCP.inc:103
-#: admin/systems/services/dhcp/class_serviceDHCP.inc:731
+#: admin/systems/services/dhcp/class_serviceDHCP.inc:729
 msgid "Global options"
-msgstr "Options globales"
+msgstr "Options Globales"
 
 #: admin/systems/services/dhcp/class_dhcpNewSectionDialog.inc:49
 #: admin/systems/services/dhcp/class_serviceDHCP.inc:63
@@ -112,7 +98,7 @@ msgstr "Classe"
 #: admin/systems/services/dhcp/class_dhcpNewSectionDialog.inc:50
 #: admin/systems/services/dhcp/class_serviceDHCP.inc:64
 msgid "Subclass"
-msgstr "Sous classe"
+msgstr "sous classe"
 
 #: admin/systems/services/dhcp/class_dhcpNewSectionDialog.inc:51
 #: admin/systems/services/dhcp/class_serviceDHCP.inc:65
@@ -122,12 +108,12 @@ msgstr "HÃ´te"
 #: admin/systems/services/dhcp/class_dhcpNewSectionDialog.inc:52
 #: admin/systems/services/dhcp/class_serviceDHCP.inc:66
 msgid "Group"
-msgstr "Groupe"
+msgstr "Groupes"
 
 #: admin/systems/services/dhcp/class_dhcpNewSectionDialog.inc:53
 #: admin/systems/services/dhcp/class_serviceDHCP.inc:67
 msgid "Pool"
-msgstr "RÃ©servoir"
+msgstr "rÃ©servoir"
 
 #: admin/systems/services/dhcp/class_dhcpNewSectionDialog.inc:54
 #: admin/systems/services/dhcp/class_serviceDHCP.inc:68
@@ -137,34 +123,29 @@ msgstr "Sous rÃ©seau"
 #: admin/systems/services/dhcp/class_dhcpNewSectionDialog.inc:55
 #: admin/systems/services/dhcp/class_serviceDHCP.inc:70
 msgid "Shared network"
-msgstr "RÃ©seau partagÃ©"
+msgstr "RÃ©seaux partagÃ©s"
 
 #: admin/systems/services/dhcp/class_dhcpNewSectionDialog.inc:56
 #: admin/systems/services/dhcp/class_serviceDHCP.inc:71
-#: admin/systems/services/dhcp/dhcp_tsigkey.tpl.c:2
 msgid "DNS update key"
 msgstr "Clef de mise Ã  jour du DNS"
 
 #: admin/systems/services/dhcp/class_dhcpNewSectionDialog.inc:57
 #: admin/systems/services/dhcp/class_serviceDHCP.inc:72
 msgid "DNS update zones"
-msgstr "Zones DNS Ã  mettre Ã  jour"
+msgstr "Zones DNS a mettre a jour"
 
 #: admin/systems/services/dhcp/class_dhcpDnsZone.inc:150
-#: admin/systems/services/dhcp/dhcp_dnszone.tpl.c:5
 msgid "DNS zone"
 msgstr "Zone DNS"
 
 #: admin/systems/services/dhcp/class_dhcpDnsZone.inc:154
-#: 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:158
-#: admin/systems/services/dhcp/dhcp_dnszone.tpl.c:11
 msgid "Key DN"
-msgstr "DN de la clef"
+msgstr "Clef pour ce DN"
 
 #: admin/systems/services/dhcp/class_dhcpHost.inc:64
 msgid "Ethernet"
@@ -179,9 +160,8 @@ msgid "Token Ring"
 msgstr "Token Ring"
 
 #: admin/systems/services/dhcp/class_dhcpHost.inc:149
-#: admin/systems/services/dhcp/dhcp_host.tpl.c:20
 msgid "Hardware address"
-msgstr "Adresse matÃ©rielle"
+msgstr "Adresse hardware"
 
 #: admin/systems/services/dhcp/class_dhcpService.inc:128
 msgid "Lease time"
@@ -193,20 +173,17 @@ msgstr "Temps maximum du bail"
 
 #: 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_dhcpService.inc:134
-#: admin/systems/services/dhcp/dhcp_sharedNetwork.tpl.c:38
 msgid "Maximum lease time"
-msgstr "DurÃ©e maximum du bail"
+msgstr "Temps maximum du bail"
 
 #: admin/systems/services/dhcp/class_serviceDHCP.inc:59
-#: admin/systems/services/dhcp/class_serviceDHCP.inc:787
-#: admin/systems/services/dhcp/class_serviceDHCP.inc:788
-#: admin/systems/services/dhcp/class_serviceDHCP.inc:830
+#: admin/systems/services/dhcp/class_serviceDHCP.inc:785
+#: admin/systems/services/dhcp/class_serviceDHCP.inc:786
+#: admin/systems/services/dhcp/class_serviceDHCP.inc:828
 msgid "DHCP service"
 msgstr "Service DHCP"
 
@@ -216,7 +193,7 @@ msgstr "Journaux systÃ¨mes"
 
 #: admin/systems/services/dhcp/class_serviceDHCP.inc:69
 msgid "Failover peer"
-msgstr "Pair de reprise sur panne"
+msgstr "Partenaire pour la prise de contrÃ´le"
 
 #: admin/systems/services/dhcp/class_serviceDHCP.inc:149
 #, php-format
@@ -230,82 +207,80 @@ msgid "The migration will be started when you save this system."
 msgstr "La migration sera dÃ©marrÃ©e lorsque vous sauverez ce systÃ¨me."
 
 #: admin/systems/services/dhcp/class_serviceDHCP.inc:154
-#: admin/systems/services/dhcp/remove_dhcp.tpl.c:2
 msgid "Warning"
 msgstr "Avertissement"
 
-#: admin/systems/services/dhcp/class_serviceDHCP.inc:247
+#: admin/systems/services/dhcp/class_serviceDHCP.inc:246
 msgid "Permission error"
-msgstr "Erreur de permission"
+msgstr "Erreur de permissions"
 
-#: admin/systems/services/dhcp/class_serviceDHCP.inc:284
+#: admin/systems/services/dhcp/class_serviceDHCP.inc:283
 msgid "DHCP section"
 msgstr "Section DHCP"
 
-#: admin/systems/services/dhcp/class_serviceDHCP.inc:340
-#: admin/systems/services/dhcp/class_serviceDHCP.inc:343
+#: admin/systems/services/dhcp/class_serviceDHCP.inc:339
+#: admin/systems/services/dhcp/class_serviceDHCP.inc:342
 msgid "Insert new DHCP section"
 msgstr "InsÃ©rer une nouvelle section DHCP"
 
-#: admin/systems/services/dhcp/class_serviceDHCP.inc:341
+#: admin/systems/services/dhcp/class_serviceDHCP.inc:340
+#: admin/systems/services/dhcp/class_serviceDHCP.inc:343
 #: admin/systems/services/dhcp/class_serviceDHCP.inc:344
-#: admin/systems/services/dhcp/class_serviceDHCP.inc:345
 msgid "Edit DHCP section"
-msgstr "Ã‰diter la section DHCP"
+msgstr "Editer une section DHCP"
 
-#: admin/systems/services/dhcp/class_serviceDHCP.inc:342
-#: admin/systems/services/dhcp/class_serviceDHCP.inc:346
+#: admin/systems/services/dhcp/class_serviceDHCP.inc:341
+#: admin/systems/services/dhcp/class_serviceDHCP.inc:345
 msgid "Remove DHCP section"
-msgstr "Supprimer la section DHCP"
+msgstr "Suppression d'une section DHCP"
 
-#: admin/systems/services/dhcp/class_serviceDHCP.inc:347
+#: admin/systems/services/dhcp/class_serviceDHCP.inc:346
 msgid "Expand DHCP subnet"
 msgstr "DÃ©plier le sous rÃ©seau"
 
-#: admin/systems/services/dhcp/class_serviceDHCP.inc:348
+#: admin/systems/services/dhcp/class_serviceDHCP.inc:347
 msgid "Fold DHCP subnet"
 msgstr "Replier le sous rÃ©seau"
 
-#: admin/systems/services/dhcp/class_serviceDHCP.inc:425
-#: admin/systems/services/dhcp/class_serviceDHCP.inc:442
-#: admin/systems/services/dhcp/class_serviceDHCP.inc:497
-#: admin/systems/services/dhcp/class_serviceDHCP.inc:573
-#: admin/systems/services/dhcp/class_serviceDHCP.inc:581
-#: admin/systems/services/dhcp/class_serviceDHCP.inc:608
+#: admin/systems/services/dhcp/class_serviceDHCP.inc:422
+#: admin/systems/services/dhcp/class_serviceDHCP.inc:439
+#: admin/systems/services/dhcp/class_serviceDHCP.inc:494
+#: admin/systems/services/dhcp/class_serviceDHCP.inc:570
+#: admin/systems/services/dhcp/class_serviceDHCP.inc:578
+#: admin/systems/services/dhcp/class_serviceDHCP.inc:605
 msgid "LDAP error"
 msgstr "Erreur LDAP"
 
-#: admin/systems/services/dhcp/class_serviceDHCP.inc:776
+#: admin/systems/services/dhcp/class_serviceDHCP.inc:774
 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/systems/services/dhcp/class_serviceDHCP.inc:788
+#: admin/systems/services/dhcp/class_serviceDHCP.inc:786
 msgid "Services"
-msgstr "Services"
+msgstr "Service"
 
-#: admin/systems/services/dhcp/class_serviceDHCP.inc:795
+#: admin/systems/services/dhcp/class_serviceDHCP.inc:793
 msgid "Start service"
 msgstr "DÃ©marrer le service"
 
-#: admin/systems/services/dhcp/class_serviceDHCP.inc:796
+#: admin/systems/services/dhcp/class_serviceDHCP.inc:794
 msgid "Stop service"
-msgstr "ArrÃªter le service"
+msgstr "ArrÃªter le Service"
 
-#: admin/systems/services/dhcp/class_serviceDHCP.inc:797
+#: admin/systems/services/dhcp/class_serviceDHCP.inc:795
 msgid "Restart service"
 msgstr "RedÃ©marrer le service"
 
 #: 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'â€¯!"
+msgstr "Erreur lors de la dÃ©finition de '%s' !"
 
 #: admin/systems/services/dhcp/class_dhcpTSigKey.inc:51
 msgid "HMAC-MD5"
@@ -329,297 +304,17 @@ msgstr "DH"
 
 #: admin/systems/services/dhcp/class_dhcpTSigKey.inc:114
 #: admin/systems/services/dhcp/class_dhcpTSigKey.inc:127
-#: admin/systems/services/dhcp/dhcp_tsigkey.tpl.c:5
 msgid "Key name"
 msgstr "Nom de la clef"
 
 #: admin/systems/services/dhcp/class_dhcpTSigKey.inc:118
-#: 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"
+msgstr "Temps 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/serviceDHCP.tpl.c:2
-msgid ""
-"DHCP take over will take place when saving this entry. Choose 'Cancel' to "
-"abort."
-msgstr "La prise de contrÃ´le du DHCP s'exÃ©cutera quand vous sauverez cette entrÃ©e. Choisissez 'Annuler' pour l'annuler."
-
-#: admin/systems/services/dhcp/serviceDHCP.tpl.c:5
-msgid "Take over dhcp configuration from following server"
-msgstr "Prendre le contrÃ´le de la configuration DHCP du serveur suivant"
-
-#: admin/systems/services/dhcp/serviceDHCP.tpl.c:8
-msgid "DHCP sections"
-msgstr "Sections DHCP"
-
-#: 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 autoritatif"
-
-#: 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 "Temps par dÃ©faut pour le bail"
-
-#: admin/systems/services/dhcp/dhcp_service.tpl.c:17
-msgid "Enter default lease time in seconds."
-msgstr "Entrer le temps par dÃ©faut du bail en secondes"
-
-#: admin/systems/services/dhcp/dhcp_service.tpl.c:20
-msgid "Maximum lease time (s)"
-msgstr "Temps maximum du bail"
-
-#: admin/systems/services/dhcp/dhcp_service.tpl.c:23
-msgid "Enter maximum lease time in seconds."
-msgstr "Entrer le temps 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 "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 "Entrez le nom ou l'adresse ip du router 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 aie 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 DNS"
-
-#: 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/systems/services/dhcp/dhcp_network.tpl.c:56
-msgid "Domain Name Service options"
-msgstr "Options du serveur DNS"
-
-#: admin/systems/services/dhcp/dhcp_network.tpl.c:59
-msgid "Assign hostnames found via reverse mapping"
-msgstr "Assigner les nom trouvÃ©s avec un lookup inverse"
-
-#: admin/systems/services/dhcp/dhcp_network.tpl.c:62
-msgid "Assign hostnames from host declarations"
-msgstr "Attribuer les nom d'hÃ´tes grÃ¢ce au dÃ©clarations des hÃ´tes"
-
-#: 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 a mettre a jour"
-
-#: 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/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/systems/services/dhcp/dhcp_tsigkey.tpl.c:8
-msgid "Name of Key"
-msgstr "Nom de la clef"
-
-#: admin/systems/services/dhcp/dhcp_tsigkey.tpl.c:11
-msgid "Encryption method"
-msgstr "MÃ©thode de cryptage"
-
-#: admin/systems/services/dhcp/dhcp_pool.tpl.c:8
-msgid "Name of pool"
-msgstr "Nom du pool d'adresses"
-
-#: admin/systems/services/dhcp/dhcpNewSection.tpl.c:2
-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 une des sections DHCP suivantes."
-
-#: admin/systems/services/dhcp/dhcpNewSection.tpl.c:8
-msgid "Section"
-msgstr "Section"
-
-#: admin/systems/services/dhcp/dhcpNewSection.tpl.c:11
-msgid "Choose section type to create"
-msgstr "Choisissez le type de section Ã  crÃ©er"
-
-#: admin/systems/services/dhcp/dhcpNewSection.tpl.c:14
-msgid "Create"
-msgstr "CrÃ©er"
-
-#: admin/systems/services/dhcp/dhcp_advanced.tpl.c:2
-msgid "Hide advanced settings"
-msgstr "Cacher la configuration avancÃ©e"
-
-#: admin/systems/services/dhcp/dhcp_advanced.tpl.c:5
-msgid "DHCP statements"
-msgstr "Directives DHCP"
-
-#: admin/systems/services/dhcp/dhcp_advanced.tpl.c:8
-msgid "DHCP options"
-msgstr "Options dhcp"
-
-#: admin/systems/services/dhcp/dhcp_advanced.tpl.c:11
-msgid "Show advanced settings"
-msgstr "Afficher la configuration avancÃ©e"
-
-#: admin/systems/services/dhcp/dhcp_host.tpl.c:8
-msgid "Name of host"
-msgstr "Nom de l'hÃ´te"
-
-#: admin/systems/services/dhcp/dhcp_host.tpl.c:11
-msgid "Fixed address"
-msgstr "Adresse fixe"
-
-#: 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 de l'adresse ip pour assigner une adresse fixe"
-
-#: admin/systems/services/dhcp/dhcp_host.tpl.c:17
-msgid "Hardware type"
-msgstr "Type de matÃ©riel"
-
-#: admin/systems/services/dhcp/dhcp_sharedNetwork.tpl.c:8
-msgid "Name for shared network"
-msgstr "Nom du rÃ©seau partagÃ©"
-
-#: admin/systems/services/dhcp/dhcp_sharedNetwork.tpl.c:11
-msgid "Server identifier"
-msgstr "Identifiant du serveur"
-
-#: 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/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/systems/services/dhcp/dhcp_sharedNetwork.tpl.c:20
-msgid "Authoritative server"
-msgstr "Serveur autoritatif"
-
-#: admin/systems/services/dhcp/dhcp_sharedNetwork.tpl.c:23
-msgid "Leases"
-msgstr "Bail"
-
-#: 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/systems/services/dhcp/dhcp_sharedNetwork.tpl.c:47
-msgid "Minimum lease time"
 msgstr "Temps minimum du bail"
-
-#: admin/systems/services/dhcp/dhcp_sharedNetwork.tpl.c:53
-msgid "Access control"
-msgstr "ContrÃ´le d'accÃ¨s"
-
-#: 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/systems/services/dhcp/dhcp_sharedNetwork.tpl.c:59
-msgid "Allow unknown clients"
-msgstr "Accepter les clients inconnus"
-
-#: 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"
-
-#: admin/systems/services/dhcp/dhcp_sharedNetwork.tpl.c:65
-msgid "Allow bootp clients"
-msgstr "Accepter les clients bootp"
-
-#: 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 Ã  utiliser ce serveur dhcp"
-
-#: admin/systems/services/dhcp/dhcp_sharedNetwork.tpl.c:71
-msgid "Allow booting"
-msgstr "Permettre le dÃ©marrage"
diff --git a/dhcp/locale/id/fusiondirectory.po b/dhcp/locale/id/fusiondirectory.po
index da6dedc6f1a1b1eca758a04776603a69a858a597..c64574a51005572ff15f20f79fa29185f246ad57 100644
--- a/dhcp/locale/id/fusiondirectory.po
+++ b/dhcp/locale/id/fusiondirectory.po
@@ -5,12 +5,12 @@
 # Translators:
 msgid ""
 msgstr ""
-"Project-Id-Version: FusionDirectory-108\n"
+"Project-Id-Version: FusionDirectory-109\n"
 "Report-Msgid-Bugs-To: documentation@lists.fusiondirectory.org\n"
-"POT-Creation-Date: 2015-03-19 21:45+0100\n"
-"PO-Revision-Date: 2015-02-25 15:44+0000\n"
+"POT-Creation-Date: 2014-12-15 17:47+0100\n"
+"PO-Revision-Date: 2014-12-15 16:51+0000\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>\n"
-"Language-Team: Indonesian (http://www.transifex.com/projects/p/FusionDirectory-108/language/id/)\n"
+"Language-Team: Indonesian (http://www.transifex.com/projects/p/FusionDirectory-109/language/id/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -19,7 +19,7 @@ msgstr ""
 
 #: admin/systems/services/dhcp/class_dhcpAdvanced.inc:59
 #: admin/systems/services/dhcp/class_dhcpAdvanced.inc:73
-#: admin/systems/services/dhcp/class_serviceDHCP.inc:776
+#: admin/systems/services/dhcp/class_serviceDHCP.inc:774
 #: admin/systems/services/dhcp/class_dhcpNetwork.inc:48
 msgid "Error"
 msgstr ""
@@ -52,10 +52,6 @@ msgstr ""
 #: 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 ""
 
@@ -64,7 +60,6 @@ msgstr ""
 #: 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 ""
 
@@ -75,15 +70,12 @@ 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 ""
 
@@ -94,7 +86,7 @@ msgstr ""
 #: admin/systems/services/dhcp/class_dhcpNewSectionDialog.inc:48
 #: admin/systems/services/dhcp/class_serviceDHCP.inc:62
 #: admin/systems/services/dhcp/class_serviceDHCP.inc:103
-#: admin/systems/services/dhcp/class_serviceDHCP.inc:731
+#: admin/systems/services/dhcp/class_serviceDHCP.inc:729
 msgid "Global options"
 msgstr ""
 
@@ -135,7 +127,6 @@ msgstr ""
 
 #: admin/systems/services/dhcp/class_dhcpNewSectionDialog.inc:56
 #: admin/systems/services/dhcp/class_serviceDHCP.inc:71
-#: admin/systems/services/dhcp/dhcp_tsigkey.tpl.c:2
 msgid "DNS update key"
 msgstr ""
 
@@ -145,18 +136,14 @@ msgid "DNS update zones"
 msgstr ""
 
 #: admin/systems/services/dhcp/class_dhcpDnsZone.inc:150
-#: admin/systems/services/dhcp/dhcp_dnszone.tpl.c:5
 msgid "DNS zone"
 msgstr ""
 
 #: admin/systems/services/dhcp/class_dhcpDnsZone.inc:154
-#: 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:158
-#: admin/systems/services/dhcp/dhcp_dnszone.tpl.c:11
 msgid "Key DN"
 msgstr ""
 
@@ -173,7 +160,6 @@ msgid "Token Ring"
 msgstr ""
 
 #: admin/systems/services/dhcp/class_dhcpHost.inc:149
-#: admin/systems/services/dhcp/dhcp_host.tpl.c:20
 msgid "Hardware address"
 msgstr ""
 
@@ -187,20 +173,17 @@ 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_dhcpService.inc:134
-#: admin/systems/services/dhcp/dhcp_sharedNetwork.tpl.c:38
 msgid "Maximum lease time"
 msgstr ""
 
 #: admin/systems/services/dhcp/class_serviceDHCP.inc:59
-#: admin/systems/services/dhcp/class_serviceDHCP.inc:787
-#: admin/systems/services/dhcp/class_serviceDHCP.inc:788
-#: admin/systems/services/dhcp/class_serviceDHCP.inc:830
+#: admin/systems/services/dhcp/class_serviceDHCP.inc:785
+#: admin/systems/services/dhcp/class_serviceDHCP.inc:786
+#: admin/systems/services/dhcp/class_serviceDHCP.inc:828
 msgid "DHCP service"
 msgstr ""
 
@@ -224,75 +207,73 @@ msgid "The migration will be started when you save this system."
 msgstr ""
 
 #: admin/systems/services/dhcp/class_serviceDHCP.inc:154
-#: admin/systems/services/dhcp/remove_dhcp.tpl.c:2
 msgid "Warning"
 msgstr ""
 
-#: admin/systems/services/dhcp/class_serviceDHCP.inc:247
+#: admin/systems/services/dhcp/class_serviceDHCP.inc:246
 msgid "Permission error"
 msgstr ""
 
-#: admin/systems/services/dhcp/class_serviceDHCP.inc:284
+#: admin/systems/services/dhcp/class_serviceDHCP.inc:283
 msgid "DHCP section"
 msgstr ""
 
-#: admin/systems/services/dhcp/class_serviceDHCP.inc:340
-#: admin/systems/services/dhcp/class_serviceDHCP.inc:343
+#: admin/systems/services/dhcp/class_serviceDHCP.inc:339
+#: admin/systems/services/dhcp/class_serviceDHCP.inc:342
 msgid "Insert new DHCP section"
 msgstr ""
 
-#: admin/systems/services/dhcp/class_serviceDHCP.inc:341
+#: admin/systems/services/dhcp/class_serviceDHCP.inc:340
+#: admin/systems/services/dhcp/class_serviceDHCP.inc:343
 #: admin/systems/services/dhcp/class_serviceDHCP.inc:344
-#: admin/systems/services/dhcp/class_serviceDHCP.inc:345
 msgid "Edit DHCP section"
 msgstr ""
 
-#: admin/systems/services/dhcp/class_serviceDHCP.inc:342
-#: admin/systems/services/dhcp/class_serviceDHCP.inc:346
+#: admin/systems/services/dhcp/class_serviceDHCP.inc:341
+#: admin/systems/services/dhcp/class_serviceDHCP.inc:345
 msgid "Remove DHCP section"
 msgstr ""
 
-#: admin/systems/services/dhcp/class_serviceDHCP.inc:347
+#: admin/systems/services/dhcp/class_serviceDHCP.inc:346
 msgid "Expand DHCP subnet"
 msgstr ""
 
-#: admin/systems/services/dhcp/class_serviceDHCP.inc:348
+#: admin/systems/services/dhcp/class_serviceDHCP.inc:347
 msgid "Fold DHCP subnet"
 msgstr ""
 
-#: admin/systems/services/dhcp/class_serviceDHCP.inc:425
-#: admin/systems/services/dhcp/class_serviceDHCP.inc:442
-#: admin/systems/services/dhcp/class_serviceDHCP.inc:497
-#: admin/systems/services/dhcp/class_serviceDHCP.inc:573
-#: admin/systems/services/dhcp/class_serviceDHCP.inc:581
-#: admin/systems/services/dhcp/class_serviceDHCP.inc:608
+#: admin/systems/services/dhcp/class_serviceDHCP.inc:422
+#: admin/systems/services/dhcp/class_serviceDHCP.inc:439
+#: admin/systems/services/dhcp/class_serviceDHCP.inc:494
+#: admin/systems/services/dhcp/class_serviceDHCP.inc:570
+#: admin/systems/services/dhcp/class_serviceDHCP.inc:578
+#: admin/systems/services/dhcp/class_serviceDHCP.inc:605
 msgid "LDAP error"
 msgstr ""
 
-#: admin/systems/services/dhcp/class_serviceDHCP.inc:776
+#: admin/systems/services/dhcp/class_serviceDHCP.inc:774
 msgid ""
 "The DHCP configuration set is unkown. Please contact your system "
 "administrator."
 msgstr ""
 
-#: admin/systems/services/dhcp/class_serviceDHCP.inc:788
+#: admin/systems/services/dhcp/class_serviceDHCP.inc:786
 msgid "Services"
 msgstr ""
 
-#: admin/systems/services/dhcp/class_serviceDHCP.inc:795
+#: admin/systems/services/dhcp/class_serviceDHCP.inc:793
 msgid "Start service"
 msgstr ""
 
-#: admin/systems/services/dhcp/class_serviceDHCP.inc:796
+#: admin/systems/services/dhcp/class_serviceDHCP.inc:794
 msgid "Stop service"
 msgstr ""
 
-#: admin/systems/services/dhcp/class_serviceDHCP.inc:797
+#: admin/systems/services/dhcp/class_serviceDHCP.inc:795
 msgid "Restart service"
 msgstr ""
 
 #: admin/systems/services/dhcp/class_dhcpNetwork.inc:197
-#: admin/systems/services/dhcp/dhcp_network.tpl.c:14
 msgid "Broadcast"
 msgstr ""
 
@@ -323,297 +304,17 @@ msgstr ""
 
 #: admin/systems/services/dhcp/class_dhcpTSigKey.inc:114
 #: admin/systems/services/dhcp/class_dhcpTSigKey.inc:127
-#: admin/systems/services/dhcp/dhcp_tsigkey.tpl.c:5
 msgid "Key name"
 msgstr ""
 
 #: admin/systems/services/dhcp/class_dhcpTSigKey.inc:118
-#: 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/serviceDHCP.tpl.c:2
-msgid ""
-"DHCP take over will take place when saving this entry. Choose 'Cancel' to "
-"abort."
-msgstr ""
-
-#: admin/systems/services/dhcp/serviceDHCP.tpl.c:5
-msgid "Take over dhcp configuration from following server"
-msgstr ""
-
-#: admin/systems/services/dhcp/serviceDHCP.tpl.c:8
-msgid "DHCP sections"
-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 ""
-
-#: 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"
-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 ""
-
-#: 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 ""
-
-#: 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"
-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
-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 ""
-
-#: 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"
-msgstr ""
-
-#: admin/systems/services/dhcp/dhcp_advanced.tpl.c:11
-msgid "Show advanced settings"
-msgstr ""
-
-#: admin/systems/services/dhcp/dhcp_host.tpl.c:8
-msgid "Name of host"
-msgstr ""
-
-#: admin/systems/services/dhcp/dhcp_host.tpl.c:11
-msgid "Fixed address"
-msgstr ""
-
-#: admin/systems/services/dhcp/dhcp_host.tpl.c:14
-msgid "Use hostname or IP-address to assign fixed address"
-msgstr ""
-
-#: admin/systems/services/dhcp/dhcp_host.tpl.c:17
-msgid "Hardware type"
-msgstr ""
-
-#: admin/systems/services/dhcp/dhcp_sharedNetwork.tpl.c:8
-msgid "Name for shared network"
-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"
-msgstr ""
-
-#: admin/systems/services/dhcp/dhcp_sharedNetwork.tpl.c:17
-msgid "Select if this server is authoritative for this shared network"
-msgstr ""
-
-#: admin/systems/services/dhcp/dhcp_sharedNetwork.tpl.c:20
-msgid "Authoritative server"
-msgstr ""
-
-#: admin/systems/services/dhcp/dhcp_sharedNetwork.tpl.c:23
-msgid "Leases"
-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 ""
-
-#: 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"
-msgstr ""
-
-#: admin/systems/services/dhcp/dhcp_sharedNetwork.tpl.c:65
-msgid "Allow bootp clients"
-msgstr ""
-
-#: admin/systems/services/dhcp/dhcp_sharedNetwork.tpl.c:68
-msgid "Select if clients are allowed to boot using this DHCP server"
-msgstr ""
-
-#: admin/systems/services/dhcp/dhcp_sharedNetwork.tpl.c:71
-msgid "Allow booting"
-msgstr ""
diff --git a/dhcp/locale/it/fusiondirectory.po b/dhcp/locale/it/fusiondirectory.po
index f600072c37d92881b64f864ed80ce7c036127dbb..829e3776e07342732d135a69e976f085ffa32f9f 100644
--- a/dhcp/locale/it/fusiondirectory.po
+++ b/dhcp/locale/it/fusiondirectory.po
@@ -3,19 +3,14 @@
 # This file is distributed under the same license as the PACKAGE package.
 # 
 # Translators:
-# Alessandro Amici <a.amici@bopen.it>, 2005
-# poterealpopolo <giuliano@opensides.be>, 2011
-# poterealpopolo <giuliano@opensides.be>, 2013
-# poterealpopolo <giuliano@opensides.be>, 2012
-# poterealpopolo <giuliano@opensides.be>, 2011-2013
 msgid ""
 msgstr ""
-"Project-Id-Version: FusionDirectory-108\n"
+"Project-Id-Version: FusionDirectory-109\n"
 "Report-Msgid-Bugs-To: documentation@lists.fusiondirectory.org\n"
-"POT-Creation-Date: 2015-03-19 21:45+0100\n"
-"PO-Revision-Date: 2015-02-25 16:51+0000\n"
+"POT-Creation-Date: 2014-12-15 17:47+0100\n"
+"PO-Revision-Date: 2015-02-25 16:13+0000\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>\n"
-"Language-Team: Italian (http://www.transifex.com/projects/p/FusionDirectory-108/language/it/)\n"
+"Language-Team: Italian (http://www.transifex.com/projects/p/FusionDirectory-109/language/it/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -24,7 +19,7 @@ msgstr ""
 
 #: admin/systems/services/dhcp/class_dhcpAdvanced.inc:59
 #: admin/systems/services/dhcp/class_dhcpAdvanced.inc:73
-#: admin/systems/services/dhcp/class_serviceDHCP.inc:776
+#: admin/systems/services/dhcp/class_serviceDHCP.inc:774
 #: admin/systems/services/dhcp/class_dhcpNetwork.inc:48
 msgid "Error"
 msgstr "Errore"
@@ -57,19 +52,14 @@ msgstr "automatico"
 #: 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 "Cognome"
+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 "Intervallo (Range)"
 
@@ -80,17 +70,14 @@ msgstr "\"L'intervallo\" non Ã¨ compreso nella rete configurata. "
 
 #: 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/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 (Netmask)"
+msgstr "Maschera di sottorete"
 
 #: admin/systems/services/dhcp/class_dhcpSubnet.inc:170
 msgid "Network range"
@@ -99,14 +86,14 @@ msgstr "Intervallo della  sottorete (Network range)"
 #: admin/systems/services/dhcp/class_dhcpNewSectionDialog.inc:48
 #: admin/systems/services/dhcp/class_serviceDHCP.inc:62
 #: admin/systems/services/dhcp/class_serviceDHCP.inc:103
-#: admin/systems/services/dhcp/class_serviceDHCP.inc:731
+#: admin/systems/services/dhcp/class_serviceDHCP.inc:729
 msgid "Global options"
 msgstr "Opzioni globali"
 
 #: admin/systems/services/dhcp/class_dhcpNewSectionDialog.inc:49
 #: admin/systems/services/dhcp/class_serviceDHCP.inc:63
 msgid "Class"
-msgstr "Classe"
+msgstr "Categoria"
 
 #: admin/systems/services/dhcp/class_dhcpNewSectionDialog.inc:50
 #: admin/systems/services/dhcp/class_serviceDHCP.inc:64
@@ -140,7 +127,6 @@ msgstr "Rete condivisa"
 
 #: admin/systems/services/dhcp/class_dhcpNewSectionDialog.inc:56
 #: admin/systems/services/dhcp/class_serviceDHCP.inc:71
-#: admin/systems/services/dhcp/dhcp_tsigkey.tpl.c:2
 msgid "DNS update key"
 msgstr "Stile di aggiornamento dinamico del DNS"
 
@@ -150,18 +136,14 @@ msgid "DNS update zones"
 msgstr "Aggiornamento delle zone DNS"
 
 #: admin/systems/services/dhcp/class_dhcpDnsZone.inc:150
-#: admin/systems/services/dhcp/dhcp_dnszone.tpl.c:5
 msgid "DNS zone"
 msgstr "Zona DNS"
 
 #: admin/systems/services/dhcp/class_dhcpDnsZone.inc:154
-#: 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:158
-#: admin/systems/services/dhcp/dhcp_dnszone.tpl.c:11
 msgid "Key DN"
 msgstr "Key DN"
 
@@ -178,7 +160,6 @@ msgid "Token Ring"
 msgstr "Token Ring"
 
 #: admin/systems/services/dhcp/class_dhcpHost.inc:149
-#: admin/systems/services/dhcp/dhcp_host.tpl.c:20
 msgid "Hardware address"
 msgstr "Indirizzo hardware"
 
@@ -192,20 +173,17 @@ msgstr "Tempo di lease massimo"
 
 #: 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_dhcpService.inc:134
-#: admin/systems/services/dhcp/dhcp_sharedNetwork.tpl.c:38
 msgid "Maximum lease time"
 msgstr "Tempo di lease massimo"
 
 #: admin/systems/services/dhcp/class_serviceDHCP.inc:59
-#: admin/systems/services/dhcp/class_serviceDHCP.inc:787
-#: admin/systems/services/dhcp/class_serviceDHCP.inc:788
-#: admin/systems/services/dhcp/class_serviceDHCP.inc:830
+#: admin/systems/services/dhcp/class_serviceDHCP.inc:785
+#: admin/systems/services/dhcp/class_serviceDHCP.inc:786
+#: admin/systems/services/dhcp/class_serviceDHCP.inc:828
 msgid "DHCP service"
 msgstr "Servizio DHCP"
 
@@ -229,75 +207,73 @@ msgid "The migration will be started when you save this system."
 msgstr "La migrazione avrÃ  inizio quando registrerai questo sistema."
 
 #: admin/systems/services/dhcp/class_serviceDHCP.inc:154
-#: admin/systems/services/dhcp/remove_dhcp.tpl.c:2
 msgid "Warning"
 msgstr "Avvertimento"
 
-#: admin/systems/services/dhcp/class_serviceDHCP.inc:247
+#: admin/systems/services/dhcp/class_serviceDHCP.inc:246
 msgid "Permission error"
 msgstr "Errore d'autorizzazione"
 
-#: admin/systems/services/dhcp/class_serviceDHCP.inc:284
+#: admin/systems/services/dhcp/class_serviceDHCP.inc:283
 msgid "DHCP section"
 msgstr "Sezione DHCP"
 
-#: admin/systems/services/dhcp/class_serviceDHCP.inc:340
-#: admin/systems/services/dhcp/class_serviceDHCP.inc:343
+#: admin/systems/services/dhcp/class_serviceDHCP.inc:339
+#: admin/systems/services/dhcp/class_serviceDHCP.inc:342
 msgid "Insert new DHCP section"
 msgstr "Inserisci una nuova sezione DHCP"
 
-#: admin/systems/services/dhcp/class_serviceDHCP.inc:341
+#: admin/systems/services/dhcp/class_serviceDHCP.inc:340
+#: admin/systems/services/dhcp/class_serviceDHCP.inc:343
 #: admin/systems/services/dhcp/class_serviceDHCP.inc:344
-#: admin/systems/services/dhcp/class_serviceDHCP.inc:345
 msgid "Edit DHCP section"
 msgstr "Modifica una sezione DHCP"
 
-#: admin/systems/services/dhcp/class_serviceDHCP.inc:342
-#: admin/systems/services/dhcp/class_serviceDHCP.inc:346
+#: admin/systems/services/dhcp/class_serviceDHCP.inc:341
+#: admin/systems/services/dhcp/class_serviceDHCP.inc:345
 msgid "Remove DHCP section"
 msgstr "Elimina una sezione DHCP"
 
-#: admin/systems/services/dhcp/class_serviceDHCP.inc:347
+#: admin/systems/services/dhcp/class_serviceDHCP.inc:346
 msgid "Expand DHCP subnet"
 msgstr "Espandi la sottorete DHCP"
 
-#: admin/systems/services/dhcp/class_serviceDHCP.inc:348
+#: admin/systems/services/dhcp/class_serviceDHCP.inc:347
 msgid "Fold DHCP subnet"
 msgstr "Ripiega la sottorete DHCP"
 
-#: admin/systems/services/dhcp/class_serviceDHCP.inc:425
-#: admin/systems/services/dhcp/class_serviceDHCP.inc:442
-#: admin/systems/services/dhcp/class_serviceDHCP.inc:497
-#: admin/systems/services/dhcp/class_serviceDHCP.inc:573
-#: admin/systems/services/dhcp/class_serviceDHCP.inc:581
-#: admin/systems/services/dhcp/class_serviceDHCP.inc:608
+#: admin/systems/services/dhcp/class_serviceDHCP.inc:422
+#: admin/systems/services/dhcp/class_serviceDHCP.inc:439
+#: admin/systems/services/dhcp/class_serviceDHCP.inc:494
+#: admin/systems/services/dhcp/class_serviceDHCP.inc:570
+#: admin/systems/services/dhcp/class_serviceDHCP.inc:578
+#: admin/systems/services/dhcp/class_serviceDHCP.inc:605
 msgid "LDAP error"
 msgstr "Errore LDAP"
 
-#: admin/systems/services/dhcp/class_serviceDHCP.inc:776
+#: admin/systems/services/dhcp/class_serviceDHCP.inc:774
 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:788
+#: admin/systems/services/dhcp/class_serviceDHCP.inc:786
 msgid "Services"
 msgstr "Servizi"
 
-#: admin/systems/services/dhcp/class_serviceDHCP.inc:795
+#: admin/systems/services/dhcp/class_serviceDHCP.inc:793
 msgid "Start service"
 msgstr "Avvia il servizio"
 
-#: admin/systems/services/dhcp/class_serviceDHCP.inc:796
+#: admin/systems/services/dhcp/class_serviceDHCP.inc:794
 msgid "Stop service"
 msgstr "Ferma il servizio"
 
-#: admin/systems/services/dhcp/class_serviceDHCP.inc:797
+#: admin/systems/services/dhcp/class_serviceDHCP.inc:795
 msgid "Restart service"
 msgstr "Riavvia il servizio"
 
 #: admin/systems/services/dhcp/class_dhcpNetwork.inc:197
-#: admin/systems/services/dhcp/dhcp_network.tpl.c:14
 msgid "Broadcast"
 msgstr "Indirizzo Broadcast"
 
@@ -328,297 +304,17 @@ msgstr "DH"
 
 #: admin/systems/services/dhcp/class_dhcpTSigKey.inc:114
 #: admin/systems/services/dhcp/class_dhcpTSigKey.inc:127
-#: admin/systems/services/dhcp/dhcp_tsigkey.tpl.c:5
 msgid "Key name"
 msgstr "Nome"
 
 #: admin/systems/services/dhcp/class_dhcpTSigKey.inc:118
-#: 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/serviceDHCP.tpl.c:2
-msgid ""
-"DHCP take over will take place when saving this entry. Choose 'Cancel' to "
-"abort."
-msgstr "La presa di controllo del DHCP avverrÃ  nel momento in cui registrerai questa entry. Scegli 'Cancella 'per interrompere."
-
-#: admin/systems/services/dhcp/serviceDHCP.tpl.c:5
-msgid "Take over dhcp configuration from following server"
-msgstr "Prendi il controllo della configurazione DHCP a partire dal server seguente"
-
-#: admin/systems/services/dhcp/serviceDHCP.tpl.c:8
-msgid "DHCP sections"
-msgstr "Sezioni DHCP"
-
-#: 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/systems/services/dhcp/dhcp_subnet.tpl.c:11
-msgid "Range for dynamic address assignment"
-msgstr "Intervallo per l'assegnazione dinamica degli indirizzi"
-
-#: admin/systems/services/dhcp/dhcp_dnszone.tpl.c:2
-msgid "DNS update zone"
-msgstr "Aggiornamento della zona DNS"
-
-#: 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/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/systems/services/dhcp/dhcp_tsigkey.tpl.c:8
-msgid "Name of Key"
-msgstr "Nome dell'host"
-
-#: admin/systems/services/dhcp/dhcp_tsigkey.tpl.c:11
-msgid "Encryption method"
-msgstr "Algoritmo di criptaggio"
-
-#: admin/systems/services/dhcp/dhcp_pool.tpl.c:8
-msgid "Name of pool"
-msgstr "Nome del pool d'indirizzi"
-
-#: admin/systems/services/dhcp/dhcpNewSection.tpl.c:2
-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/systems/services/dhcp/dhcpNewSection.tpl.c:11
-msgid "Choose section type to create"
-msgstr "Scegli il tipo di sezione da creare"
-
-#: admin/systems/services/dhcp/dhcpNewSection.tpl.c:14
-msgid "Create"
-msgstr "Crea"
-
-#: admin/systems/services/dhcp/dhcp_advanced.tpl.c:2
-msgid "Hide advanced settings"
-msgstr "Nascondi le impostazioni avanzate"
-
-#: admin/systems/services/dhcp/dhcp_advanced.tpl.c:5
-msgid "DHCP statements"
-msgstr "Istruzioni DHCP"
-
-#: admin/systems/services/dhcp/dhcp_advanced.tpl.c:8
-msgid "DHCP options"
-msgstr "Opzioni DHCP"
-
-#: admin/systems/services/dhcp/dhcp_advanced.tpl.c:11
-msgid "Show advanced settings"
-msgstr "Mostra le opzioni avanzate"
-
-#: admin/systems/services/dhcp/dhcp_host.tpl.c:8
-msgid "Name of host"
-msgstr "Nome dell'host"
-
-#: admin/systems/services/dhcp/dhcp_host.tpl.c:11
-msgid "Fixed address"
-msgstr "Indirizzo fisso"
-
-#: 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/systems/services/dhcp/dhcp_host.tpl.c:17
-msgid "Hardware type"
-msgstr "Tipo di materiale"
-
-#: admin/systems/services/dhcp/dhcp_sharedNetwork.tpl.c:8
-msgid "Name for shared network"
-msgstr "Nome della rete condivisa"
-
-#: admin/systems/services/dhcp/dhcp_sharedNetwork.tpl.c:11
-msgid "Server identifier"
-msgstr "Identificativo del server"
-
-#: 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/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/systems/services/dhcp/dhcp_sharedNetwork.tpl.c:20
-msgid "Authoritative server"
-msgstr "Server autoritativo"
-
-#: admin/systems/services/dhcp/dhcp_sharedNetwork.tpl.c:23
-msgid "Leases"
-msgstr "Leases"
-
-#: 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/systems/services/dhcp/dhcp_sharedNetwork.tpl.c:47
-msgid "Minimum lease time"
-msgstr "Tempo di lease minimo"
-
-#: admin/systems/services/dhcp/dhcp_sharedNetwork.tpl.c:53
-msgid "Access control"
-msgstr "Controllo degli accessi"
-
-#: 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/systems/services/dhcp/dhcp_sharedNetwork.tpl.c:59
-msgid "Allow unknown clients"
-msgstr "Accetta i client sconosciuti"
-
-#: 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"
-
-#: admin/systems/services/dhcp/dhcp_sharedNetwork.tpl.c:65
-msgid "Allow bootp clients"
-msgstr "Accetta i client bootp"
-
-#: 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"
-
-#: admin/systems/services/dhcp/dhcp_sharedNetwork.tpl.c:71
-msgid "Allow booting"
-msgstr "Consenti l'Avvio"
diff --git a/dhcp/locale/lv/fusiondirectory.po b/dhcp/locale/lv/fusiondirectory.po
index f1b006341db3b0cea77fdda6925deb18a085ed25..9597901b0463627ecc99d02d9efa66c3a2e00b2a 100644
--- a/dhcp/locale/lv/fusiondirectory.po
+++ b/dhcp/locale/lv/fusiondirectory.po
@@ -5,12 +5,12 @@
 # Translators:
 msgid ""
 msgstr ""
-"Project-Id-Version: FusionDirectory-108\n"
+"Project-Id-Version: FusionDirectory-109\n"
 "Report-Msgid-Bugs-To: documentation@lists.fusiondirectory.org\n"
-"POT-Creation-Date: 2015-03-19 21:45+0100\n"
-"PO-Revision-Date: 2015-02-25 15:44+0000\n"
+"POT-Creation-Date: 2014-12-15 17:47+0100\n"
+"PO-Revision-Date: 2014-12-15 16:51+0000\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>\n"
-"Language-Team: Latvian (http://www.transifex.com/projects/p/FusionDirectory-108/language/lv/)\n"
+"Language-Team: Latvian (http://www.transifex.com/projects/p/FusionDirectory-109/language/lv/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -19,7 +19,7 @@ msgstr ""
 
 #: admin/systems/services/dhcp/class_dhcpAdvanced.inc:59
 #: admin/systems/services/dhcp/class_dhcpAdvanced.inc:73
-#: admin/systems/services/dhcp/class_serviceDHCP.inc:776
+#: admin/systems/services/dhcp/class_serviceDHCP.inc:774
 #: admin/systems/services/dhcp/class_dhcpNetwork.inc:48
 msgid "Error"
 msgstr ""
@@ -52,10 +52,6 @@ msgstr ""
 #: 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 ""
 
@@ -64,7 +60,6 @@ msgstr ""
 #: 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 ""
 
@@ -75,15 +70,12 @@ 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 ""
 
@@ -94,7 +86,7 @@ msgstr ""
 #: admin/systems/services/dhcp/class_dhcpNewSectionDialog.inc:48
 #: admin/systems/services/dhcp/class_serviceDHCP.inc:62
 #: admin/systems/services/dhcp/class_serviceDHCP.inc:103
-#: admin/systems/services/dhcp/class_serviceDHCP.inc:731
+#: admin/systems/services/dhcp/class_serviceDHCP.inc:729
 msgid "Global options"
 msgstr ""
 
@@ -135,7 +127,6 @@ msgstr ""
 
 #: admin/systems/services/dhcp/class_dhcpNewSectionDialog.inc:56
 #: admin/systems/services/dhcp/class_serviceDHCP.inc:71
-#: admin/systems/services/dhcp/dhcp_tsigkey.tpl.c:2
 msgid "DNS update key"
 msgstr ""
 
@@ -145,18 +136,14 @@ msgid "DNS update zones"
 msgstr ""
 
 #: admin/systems/services/dhcp/class_dhcpDnsZone.inc:150
-#: admin/systems/services/dhcp/dhcp_dnszone.tpl.c:5
 msgid "DNS zone"
 msgstr ""
 
 #: admin/systems/services/dhcp/class_dhcpDnsZone.inc:154
-#: 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:158
-#: admin/systems/services/dhcp/dhcp_dnszone.tpl.c:11
 msgid "Key DN"
 msgstr ""
 
@@ -173,7 +160,6 @@ msgid "Token Ring"
 msgstr ""
 
 #: admin/systems/services/dhcp/class_dhcpHost.inc:149
-#: admin/systems/services/dhcp/dhcp_host.tpl.c:20
 msgid "Hardware address"
 msgstr ""
 
@@ -187,20 +173,17 @@ 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_dhcpService.inc:134
-#: admin/systems/services/dhcp/dhcp_sharedNetwork.tpl.c:38
 msgid "Maximum lease time"
 msgstr ""
 
 #: admin/systems/services/dhcp/class_serviceDHCP.inc:59
-#: admin/systems/services/dhcp/class_serviceDHCP.inc:787
-#: admin/systems/services/dhcp/class_serviceDHCP.inc:788
-#: admin/systems/services/dhcp/class_serviceDHCP.inc:830
+#: admin/systems/services/dhcp/class_serviceDHCP.inc:785
+#: admin/systems/services/dhcp/class_serviceDHCP.inc:786
+#: admin/systems/services/dhcp/class_serviceDHCP.inc:828
 msgid "DHCP service"
 msgstr ""
 
@@ -224,75 +207,73 @@ msgid "The migration will be started when you save this system."
 msgstr ""
 
 #: admin/systems/services/dhcp/class_serviceDHCP.inc:154
-#: admin/systems/services/dhcp/remove_dhcp.tpl.c:2
 msgid "Warning"
 msgstr ""
 
-#: admin/systems/services/dhcp/class_serviceDHCP.inc:247
+#: admin/systems/services/dhcp/class_serviceDHCP.inc:246
 msgid "Permission error"
 msgstr ""
 
-#: admin/systems/services/dhcp/class_serviceDHCP.inc:284
+#: admin/systems/services/dhcp/class_serviceDHCP.inc:283
 msgid "DHCP section"
 msgstr ""
 
-#: admin/systems/services/dhcp/class_serviceDHCP.inc:340
-#: admin/systems/services/dhcp/class_serviceDHCP.inc:343
+#: admin/systems/services/dhcp/class_serviceDHCP.inc:339
+#: admin/systems/services/dhcp/class_serviceDHCP.inc:342
 msgid "Insert new DHCP section"
 msgstr ""
 
-#: admin/systems/services/dhcp/class_serviceDHCP.inc:341
+#: admin/systems/services/dhcp/class_serviceDHCP.inc:340
+#: admin/systems/services/dhcp/class_serviceDHCP.inc:343
 #: admin/systems/services/dhcp/class_serviceDHCP.inc:344
-#: admin/systems/services/dhcp/class_serviceDHCP.inc:345
 msgid "Edit DHCP section"
 msgstr ""
 
-#: admin/systems/services/dhcp/class_serviceDHCP.inc:342
-#: admin/systems/services/dhcp/class_serviceDHCP.inc:346
+#: admin/systems/services/dhcp/class_serviceDHCP.inc:341
+#: admin/systems/services/dhcp/class_serviceDHCP.inc:345
 msgid "Remove DHCP section"
 msgstr ""
 
-#: admin/systems/services/dhcp/class_serviceDHCP.inc:347
+#: admin/systems/services/dhcp/class_serviceDHCP.inc:346
 msgid "Expand DHCP subnet"
 msgstr ""
 
-#: admin/systems/services/dhcp/class_serviceDHCP.inc:348
+#: admin/systems/services/dhcp/class_serviceDHCP.inc:347
 msgid "Fold DHCP subnet"
 msgstr ""
 
-#: admin/systems/services/dhcp/class_serviceDHCP.inc:425
-#: admin/systems/services/dhcp/class_serviceDHCP.inc:442
-#: admin/systems/services/dhcp/class_serviceDHCP.inc:497
-#: admin/systems/services/dhcp/class_serviceDHCP.inc:573
-#: admin/systems/services/dhcp/class_serviceDHCP.inc:581
-#: admin/systems/services/dhcp/class_serviceDHCP.inc:608
+#: admin/systems/services/dhcp/class_serviceDHCP.inc:422
+#: admin/systems/services/dhcp/class_serviceDHCP.inc:439
+#: admin/systems/services/dhcp/class_serviceDHCP.inc:494
+#: admin/systems/services/dhcp/class_serviceDHCP.inc:570
+#: admin/systems/services/dhcp/class_serviceDHCP.inc:578
+#: admin/systems/services/dhcp/class_serviceDHCP.inc:605
 msgid "LDAP error"
 msgstr ""
 
-#: admin/systems/services/dhcp/class_serviceDHCP.inc:776
+#: admin/systems/services/dhcp/class_serviceDHCP.inc:774
 msgid ""
 "The DHCP configuration set is unkown. Please contact your system "
 "administrator."
 msgstr ""
 
-#: admin/systems/services/dhcp/class_serviceDHCP.inc:788
+#: admin/systems/services/dhcp/class_serviceDHCP.inc:786
 msgid "Services"
 msgstr ""
 
-#: admin/systems/services/dhcp/class_serviceDHCP.inc:795
+#: admin/systems/services/dhcp/class_serviceDHCP.inc:793
 msgid "Start service"
 msgstr ""
 
-#: admin/systems/services/dhcp/class_serviceDHCP.inc:796
+#: admin/systems/services/dhcp/class_serviceDHCP.inc:794
 msgid "Stop service"
 msgstr ""
 
-#: admin/systems/services/dhcp/class_serviceDHCP.inc:797
+#: admin/systems/services/dhcp/class_serviceDHCP.inc:795
 msgid "Restart service"
 msgstr ""
 
 #: admin/systems/services/dhcp/class_dhcpNetwork.inc:197
-#: admin/systems/services/dhcp/dhcp_network.tpl.c:14
 msgid "Broadcast"
 msgstr ""
 
@@ -323,297 +304,17 @@ msgstr ""
 
 #: admin/systems/services/dhcp/class_dhcpTSigKey.inc:114
 #: admin/systems/services/dhcp/class_dhcpTSigKey.inc:127
-#: admin/systems/services/dhcp/dhcp_tsigkey.tpl.c:5
 msgid "Key name"
 msgstr ""
 
 #: admin/systems/services/dhcp/class_dhcpTSigKey.inc:118
-#: 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/serviceDHCP.tpl.c:2
-msgid ""
-"DHCP take over will take place when saving this entry. Choose 'Cancel' to "
-"abort."
-msgstr ""
-
-#: admin/systems/services/dhcp/serviceDHCP.tpl.c:5
-msgid "Take over dhcp configuration from following server"
-msgstr ""
-
-#: admin/systems/services/dhcp/serviceDHCP.tpl.c:8
-msgid "DHCP sections"
-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 ""
-
-#: 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"
-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 ""
-
-#: 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 ""
-
-#: 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"
-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
-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 ""
-
-#: 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"
-msgstr ""
-
-#: admin/systems/services/dhcp/dhcp_advanced.tpl.c:11
-msgid "Show advanced settings"
-msgstr ""
-
-#: admin/systems/services/dhcp/dhcp_host.tpl.c:8
-msgid "Name of host"
-msgstr ""
-
-#: admin/systems/services/dhcp/dhcp_host.tpl.c:11
-msgid "Fixed address"
-msgstr ""
-
-#: admin/systems/services/dhcp/dhcp_host.tpl.c:14
-msgid "Use hostname or IP-address to assign fixed address"
-msgstr ""
-
-#: admin/systems/services/dhcp/dhcp_host.tpl.c:17
-msgid "Hardware type"
-msgstr ""
-
-#: admin/systems/services/dhcp/dhcp_sharedNetwork.tpl.c:8
-msgid "Name for shared network"
-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"
-msgstr ""
-
-#: admin/systems/services/dhcp/dhcp_sharedNetwork.tpl.c:17
-msgid "Select if this server is authoritative for this shared network"
-msgstr ""
-
-#: admin/systems/services/dhcp/dhcp_sharedNetwork.tpl.c:20
-msgid "Authoritative server"
-msgstr ""
-
-#: admin/systems/services/dhcp/dhcp_sharedNetwork.tpl.c:23
-msgid "Leases"
-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 ""
-
-#: 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"
-msgstr ""
-
-#: admin/systems/services/dhcp/dhcp_sharedNetwork.tpl.c:65
-msgid "Allow bootp clients"
-msgstr ""
-
-#: admin/systems/services/dhcp/dhcp_sharedNetwork.tpl.c:68
-msgid "Select if clients are allowed to boot using this DHCP server"
-msgstr ""
-
-#: admin/systems/services/dhcp/dhcp_sharedNetwork.tpl.c:71
-msgid "Allow booting"
-msgstr ""
diff --git a/dhcp/locale/nb/fusiondirectory.po b/dhcp/locale/nb/fusiondirectory.po
index ea96542a4b213d8559707dc3bedece1401be3280..572a2d6705fab344cde27f1af7441829fd96dae2 100644
--- a/dhcp/locale/nb/fusiondirectory.po
+++ b/dhcp/locale/nb/fusiondirectory.po
@@ -5,12 +5,12 @@
 # Translators:
 msgid ""
 msgstr ""
-"Project-Id-Version: FusionDirectory-108\n"
+"Project-Id-Version: FusionDirectory-109\n"
 "Report-Msgid-Bugs-To: documentation@lists.fusiondirectory.org\n"
-"POT-Creation-Date: 2015-03-19 21:45+0100\n"
-"PO-Revision-Date: 2015-02-25 16:12+0000\n"
+"POT-Creation-Date: 2014-12-15 17:47+0100\n"
+"PO-Revision-Date: 2015-02-25 16:13+0000\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>\n"
-"Language-Team: Norwegian BokmÃ¥l (http://www.transifex.com/projects/p/FusionDirectory-108/language/nb/)\n"
+"Language-Team: Norwegian BokmÃ¥l (http://www.transifex.com/projects/p/FusionDirectory-109/language/nb/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -19,7 +19,7 @@ msgstr ""
 
 #: admin/systems/services/dhcp/class_dhcpAdvanced.inc:59
 #: admin/systems/services/dhcp/class_dhcpAdvanced.inc:73
-#: admin/systems/services/dhcp/class_serviceDHCP.inc:776
+#: admin/systems/services/dhcp/class_serviceDHCP.inc:774
 #: admin/systems/services/dhcp/class_dhcpNetwork.inc:48
 msgid "Error"
 msgstr "Feil"
@@ -52,10 +52,6 @@ msgstr ""
 #: 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"
 
@@ -64,7 +60,6 @@ msgstr "Navn"
 #: 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 ""
 
@@ -75,15 +70,12 @@ 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 ""
 
@@ -94,7 +86,7 @@ msgstr ""
 #: admin/systems/services/dhcp/class_dhcpNewSectionDialog.inc:48
 #: admin/systems/services/dhcp/class_serviceDHCP.inc:62
 #: admin/systems/services/dhcp/class_serviceDHCP.inc:103
-#: admin/systems/services/dhcp/class_serviceDHCP.inc:731
+#: admin/systems/services/dhcp/class_serviceDHCP.inc:729
 msgid "Global options"
 msgstr ""
 
@@ -135,7 +127,6 @@ msgstr ""
 
 #: admin/systems/services/dhcp/class_dhcpNewSectionDialog.inc:56
 #: admin/systems/services/dhcp/class_serviceDHCP.inc:71
-#: admin/systems/services/dhcp/dhcp_tsigkey.tpl.c:2
 msgid "DNS update key"
 msgstr ""
 
@@ -145,18 +136,14 @@ msgid "DNS update zones"
 msgstr ""
 
 #: admin/systems/services/dhcp/class_dhcpDnsZone.inc:150
-#: admin/systems/services/dhcp/dhcp_dnszone.tpl.c:5
 msgid "DNS zone"
 msgstr ""
 
 #: admin/systems/services/dhcp/class_dhcpDnsZone.inc:154
-#: 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:158
-#: admin/systems/services/dhcp/dhcp_dnszone.tpl.c:11
 msgid "Key DN"
 msgstr ""
 
@@ -173,7 +160,6 @@ msgid "Token Ring"
 msgstr ""
 
 #: admin/systems/services/dhcp/class_dhcpHost.inc:149
-#: admin/systems/services/dhcp/dhcp_host.tpl.c:20
 msgid "Hardware address"
 msgstr ""
 
@@ -187,20 +173,17 @@ 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_dhcpService.inc:134
-#: admin/systems/services/dhcp/dhcp_sharedNetwork.tpl.c:38
 msgid "Maximum lease time"
 msgstr ""
 
 #: admin/systems/services/dhcp/class_serviceDHCP.inc:59
-#: admin/systems/services/dhcp/class_serviceDHCP.inc:787
-#: admin/systems/services/dhcp/class_serviceDHCP.inc:788
-#: admin/systems/services/dhcp/class_serviceDHCP.inc:830
+#: admin/systems/services/dhcp/class_serviceDHCP.inc:785
+#: admin/systems/services/dhcp/class_serviceDHCP.inc:786
+#: admin/systems/services/dhcp/class_serviceDHCP.inc:828
 msgid "DHCP service"
 msgstr ""
 
@@ -224,75 +207,73 @@ msgid "The migration will be started when you save this system."
 msgstr ""
 
 #: admin/systems/services/dhcp/class_serviceDHCP.inc:154
-#: admin/systems/services/dhcp/remove_dhcp.tpl.c:2
 msgid "Warning"
 msgstr ""
 
-#: admin/systems/services/dhcp/class_serviceDHCP.inc:247
+#: admin/systems/services/dhcp/class_serviceDHCP.inc:246
 msgid "Permission error"
 msgstr ""
 
-#: admin/systems/services/dhcp/class_serviceDHCP.inc:284
+#: admin/systems/services/dhcp/class_serviceDHCP.inc:283
 msgid "DHCP section"
 msgstr ""
 
-#: admin/systems/services/dhcp/class_serviceDHCP.inc:340
-#: admin/systems/services/dhcp/class_serviceDHCP.inc:343
+#: admin/systems/services/dhcp/class_serviceDHCP.inc:339
+#: admin/systems/services/dhcp/class_serviceDHCP.inc:342
 msgid "Insert new DHCP section"
 msgstr ""
 
-#: admin/systems/services/dhcp/class_serviceDHCP.inc:341
+#: admin/systems/services/dhcp/class_serviceDHCP.inc:340
+#: admin/systems/services/dhcp/class_serviceDHCP.inc:343
 #: admin/systems/services/dhcp/class_serviceDHCP.inc:344
-#: admin/systems/services/dhcp/class_serviceDHCP.inc:345
 msgid "Edit DHCP section"
 msgstr ""
 
-#: admin/systems/services/dhcp/class_serviceDHCP.inc:342
-#: admin/systems/services/dhcp/class_serviceDHCP.inc:346
+#: admin/systems/services/dhcp/class_serviceDHCP.inc:341
+#: admin/systems/services/dhcp/class_serviceDHCP.inc:345
 msgid "Remove DHCP section"
 msgstr ""
 
-#: admin/systems/services/dhcp/class_serviceDHCP.inc:347
+#: admin/systems/services/dhcp/class_serviceDHCP.inc:346
 msgid "Expand DHCP subnet"
 msgstr ""
 
-#: admin/systems/services/dhcp/class_serviceDHCP.inc:348
+#: admin/systems/services/dhcp/class_serviceDHCP.inc:347
 msgid "Fold DHCP subnet"
 msgstr ""
 
-#: admin/systems/services/dhcp/class_serviceDHCP.inc:425
-#: admin/systems/services/dhcp/class_serviceDHCP.inc:442
-#: admin/systems/services/dhcp/class_serviceDHCP.inc:497
-#: admin/systems/services/dhcp/class_serviceDHCP.inc:573
-#: admin/systems/services/dhcp/class_serviceDHCP.inc:581
-#: admin/systems/services/dhcp/class_serviceDHCP.inc:608
+#: admin/systems/services/dhcp/class_serviceDHCP.inc:422
+#: admin/systems/services/dhcp/class_serviceDHCP.inc:439
+#: admin/systems/services/dhcp/class_serviceDHCP.inc:494
+#: admin/systems/services/dhcp/class_serviceDHCP.inc:570
+#: admin/systems/services/dhcp/class_serviceDHCP.inc:578
+#: admin/systems/services/dhcp/class_serviceDHCP.inc:605
 msgid "LDAP error"
 msgstr "LDAP-feil"
 
-#: admin/systems/services/dhcp/class_serviceDHCP.inc:776
+#: admin/systems/services/dhcp/class_serviceDHCP.inc:774
 msgid ""
 "The DHCP configuration set is unkown. Please contact your system "
 "administrator."
 msgstr ""
 
-#: admin/systems/services/dhcp/class_serviceDHCP.inc:788
+#: admin/systems/services/dhcp/class_serviceDHCP.inc:786
 msgid "Services"
 msgstr ""
 
-#: admin/systems/services/dhcp/class_serviceDHCP.inc:795
+#: admin/systems/services/dhcp/class_serviceDHCP.inc:793
 msgid "Start service"
 msgstr ""
 
-#: admin/systems/services/dhcp/class_serviceDHCP.inc:796
+#: admin/systems/services/dhcp/class_serviceDHCP.inc:794
 msgid "Stop service"
 msgstr ""
 
-#: admin/systems/services/dhcp/class_serviceDHCP.inc:797
+#: admin/systems/services/dhcp/class_serviceDHCP.inc:795
 msgid "Restart service"
 msgstr ""
 
 #: admin/systems/services/dhcp/class_dhcpNetwork.inc:197
-#: admin/systems/services/dhcp/dhcp_network.tpl.c:14
 msgid "Broadcast"
 msgstr ""
 
@@ -323,297 +304,17 @@ msgstr ""
 
 #: admin/systems/services/dhcp/class_dhcpTSigKey.inc:114
 #: admin/systems/services/dhcp/class_dhcpTSigKey.inc:127
-#: admin/systems/services/dhcp/dhcp_tsigkey.tpl.c:5
 msgid "Key name"
 msgstr ""
 
 #: admin/systems/services/dhcp/class_dhcpTSigKey.inc:118
-#: 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/serviceDHCP.tpl.c:2
-msgid ""
-"DHCP take over will take place when saving this entry. Choose 'Cancel' to "
-"abort."
-msgstr ""
-
-#: admin/systems/services/dhcp/serviceDHCP.tpl.c:5
-msgid "Take over dhcp configuration from following server"
-msgstr ""
-
-#: admin/systems/services/dhcp/serviceDHCP.tpl.c:8
-msgid "DHCP sections"
-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"
-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"
-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 ""
-
-#: 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 ""
-
-#: 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"
-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
-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"
-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"
-msgstr ""
-
-#: admin/systems/services/dhcp/dhcp_advanced.tpl.c:11
-msgid "Show advanced settings"
-msgstr ""
-
-#: admin/systems/services/dhcp/dhcp_host.tpl.c:8
-msgid "Name of host"
-msgstr ""
-
-#: admin/systems/services/dhcp/dhcp_host.tpl.c:11
-msgid "Fixed address"
-msgstr ""
-
-#: admin/systems/services/dhcp/dhcp_host.tpl.c:14
-msgid "Use hostname or IP-address to assign fixed address"
-msgstr ""
-
-#: admin/systems/services/dhcp/dhcp_host.tpl.c:17
-msgid "Hardware type"
-msgstr ""
-
-#: admin/systems/services/dhcp/dhcp_sharedNetwork.tpl.c:8
-msgid "Name for shared network"
-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"
-msgstr ""
-
-#: admin/systems/services/dhcp/dhcp_sharedNetwork.tpl.c:17
-msgid "Select if this server is authoritative for this shared network"
-msgstr ""
-
-#: admin/systems/services/dhcp/dhcp_sharedNetwork.tpl.c:20
-msgid "Authoritative server"
-msgstr ""
-
-#: admin/systems/services/dhcp/dhcp_sharedNetwork.tpl.c:23
-msgid "Leases"
-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 ""
-
-#: 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"
-msgstr ""
-
-#: admin/systems/services/dhcp/dhcp_sharedNetwork.tpl.c:65
-msgid "Allow bootp clients"
-msgstr ""
-
-#: admin/systems/services/dhcp/dhcp_sharedNetwork.tpl.c:68
-msgid "Select if clients are allowed to boot using this DHCP server"
-msgstr ""
-
-#: admin/systems/services/dhcp/dhcp_sharedNetwork.tpl.c:71
-msgid "Allow booting"
-msgstr ""
diff --git a/dhcp/locale/nl/fusiondirectory.po b/dhcp/locale/nl/fusiondirectory.po
index 1d625402c4c77a00399d954427e07b8bf74708cb..1e9cee2a5fa521f696feb8dd816466ff721fea0a 100644
--- a/dhcp/locale/nl/fusiondirectory.po
+++ b/dhcp/locale/nl/fusiondirectory.po
@@ -3,17 +3,14 @@
 # This file is distributed under the same license as the PACKAGE package.
 # 
 # Translators:
-# Kenny Tordeurs <tordeurskenny@gmail.com>, 2012
-#  Niels Klomp (CareWorks ICT Services) <nk@careworks.nl>, 2005-2008
-# Kenny Tordeurs <tordeurskenny@gmail.com>, 2012
 msgid ""
 msgstr ""
-"Project-Id-Version: FusionDirectory-108\n"
+"Project-Id-Version: FusionDirectory-109\n"
 "Report-Msgid-Bugs-To: documentation@lists.fusiondirectory.org\n"
-"POT-Creation-Date: 2015-03-19 21:45+0100\n"
-"PO-Revision-Date: 2015-02-25 16:51+0000\n"
+"POT-Creation-Date: 2014-12-15 17:47+0100\n"
+"PO-Revision-Date: 2015-02-25 16:13+0000\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>\n"
-"Language-Team: Dutch (http://www.transifex.com/projects/p/FusionDirectory-108/language/nl/)\n"
+"Language-Team: Dutch (http://www.transifex.com/projects/p/FusionDirectory-109/language/nl/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -22,7 +19,7 @@ msgstr ""
 
 #: admin/systems/services/dhcp/class_dhcpAdvanced.inc:59
 #: admin/systems/services/dhcp/class_dhcpAdvanced.inc:73
-#: admin/systems/services/dhcp/class_serviceDHCP.inc:776
+#: admin/systems/services/dhcp/class_serviceDHCP.inc:774
 #: admin/systems/services/dhcp/class_dhcpNetwork.inc:48
 msgid "Error"
 msgstr "Fout"
@@ -55,10 +52,6 @@ msgstr "automatisch"
 #: 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"
 
@@ -67,7 +60,6 @@ msgstr "Naam"
 #: 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"
 
@@ -78,15 +70,12 @@ msgstr "De reeks ligt niet binnen het geconfigureerde netwerk."
 
 #: 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/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"
 
@@ -97,7 +86,7 @@ msgstr "Netwerkreeks"
 #: admin/systems/services/dhcp/class_dhcpNewSectionDialog.inc:48
 #: admin/systems/services/dhcp/class_serviceDHCP.inc:62
 #: admin/systems/services/dhcp/class_serviceDHCP.inc:103
-#: admin/systems/services/dhcp/class_serviceDHCP.inc:731
+#: admin/systems/services/dhcp/class_serviceDHCP.inc:729
 msgid "Global options"
 msgstr "Globale opties"
 
@@ -138,7 +127,6 @@ msgstr "Gedeeld netwerk"
 
 #: admin/systems/services/dhcp/class_dhcpNewSectionDialog.inc:56
 #: admin/systems/services/dhcp/class_serviceDHCP.inc:71
-#: admin/systems/services/dhcp/dhcp_tsigkey.tpl.c:2
 msgid "DNS update key"
 msgstr "DNS update sleutel"
 
@@ -148,18 +136,14 @@ msgid "DNS update zones"
 msgstr "DNS update zones"
 
 #: admin/systems/services/dhcp/class_dhcpDnsZone.inc:150
-#: admin/systems/services/dhcp/dhcp_dnszone.tpl.c:5
 msgid "DNS zone"
 msgstr "DNZ zone"
 
 #: admin/systems/services/dhcp/class_dhcpDnsZone.inc:154
-#: 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:158
-#: admin/systems/services/dhcp/dhcp_dnszone.tpl.c:11
 msgid "Key DN"
 msgstr "Sleutel DN"
 
@@ -176,7 +160,6 @@ msgid "Token Ring"
 msgstr "Token ring"
 
 #: admin/systems/services/dhcp/class_dhcpHost.inc:149
-#: admin/systems/services/dhcp/dhcp_host.tpl.c:20
 msgid "Hardware address"
 msgstr "Hardware adres"
 
@@ -190,20 +173,17 @@ msgstr "Maximale leasetijd"
 
 #: 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_dhcpService.inc:134
-#: admin/systems/services/dhcp/dhcp_sharedNetwork.tpl.c:38
 msgid "Maximum lease time"
 msgstr "Maximale leasetijd"
 
 #: admin/systems/services/dhcp/class_serviceDHCP.inc:59
-#: admin/systems/services/dhcp/class_serviceDHCP.inc:787
-#: admin/systems/services/dhcp/class_serviceDHCP.inc:788
-#: admin/systems/services/dhcp/class_serviceDHCP.inc:830
+#: admin/systems/services/dhcp/class_serviceDHCP.inc:785
+#: admin/systems/services/dhcp/class_serviceDHCP.inc:786
+#: admin/systems/services/dhcp/class_serviceDHCP.inc:828
 msgid "DHCP service"
 msgstr "DHCP service"
 
@@ -227,75 +207,73 @@ msgid "The migration will be started when you save this system."
 msgstr "De migratie zal gestart worden, zodra u dit systeem bewaart."
 
 #: admin/systems/services/dhcp/class_serviceDHCP.inc:154
-#: admin/systems/services/dhcp/remove_dhcp.tpl.c:2
 msgid "Warning"
 msgstr "Waarschuwing"
 
-#: admin/systems/services/dhcp/class_serviceDHCP.inc:247
+#: admin/systems/services/dhcp/class_serviceDHCP.inc:246
 msgid "Permission error"
 msgstr "Permissiefout"
 
-#: admin/systems/services/dhcp/class_serviceDHCP.inc:284
+#: admin/systems/services/dhcp/class_serviceDHCP.inc:283
 msgid "DHCP section"
 msgstr "DHCP sectie"
 
-#: admin/systems/services/dhcp/class_serviceDHCP.inc:340
-#: admin/systems/services/dhcp/class_serviceDHCP.inc:343
+#: admin/systems/services/dhcp/class_serviceDHCP.inc:339
+#: admin/systems/services/dhcp/class_serviceDHCP.inc:342
 msgid "Insert new DHCP section"
 msgstr "Voer nieuwe DHCP sectie in"
 
-#: admin/systems/services/dhcp/class_serviceDHCP.inc:341
+#: admin/systems/services/dhcp/class_serviceDHCP.inc:340
+#: admin/systems/services/dhcp/class_serviceDHCP.inc:343
 #: admin/systems/services/dhcp/class_serviceDHCP.inc:344
-#: admin/systems/services/dhcp/class_serviceDHCP.inc:345
 msgid "Edit DHCP section"
 msgstr "Bewerk DCHP sectie"
 
-#: admin/systems/services/dhcp/class_serviceDHCP.inc:342
-#: admin/systems/services/dhcp/class_serviceDHCP.inc:346
+#: admin/systems/services/dhcp/class_serviceDHCP.inc:341
+#: admin/systems/services/dhcp/class_serviceDHCP.inc:345
 msgid "Remove DHCP section"
 msgstr "Verwijder DHCP sectie"
 
-#: admin/systems/services/dhcp/class_serviceDHCP.inc:347
+#: admin/systems/services/dhcp/class_serviceDHCP.inc:346
 msgid "Expand DHCP subnet"
 msgstr "Vergroot DHCP subnet"
 
-#: admin/systems/services/dhcp/class_serviceDHCP.inc:348
+#: admin/systems/services/dhcp/class_serviceDHCP.inc:347
 msgid "Fold DHCP subnet"
 msgstr "Verklein DHCP subnet"
 
-#: admin/systems/services/dhcp/class_serviceDHCP.inc:425
-#: admin/systems/services/dhcp/class_serviceDHCP.inc:442
-#: admin/systems/services/dhcp/class_serviceDHCP.inc:497
-#: admin/systems/services/dhcp/class_serviceDHCP.inc:573
-#: admin/systems/services/dhcp/class_serviceDHCP.inc:581
-#: admin/systems/services/dhcp/class_serviceDHCP.inc:608
+#: admin/systems/services/dhcp/class_serviceDHCP.inc:422
+#: admin/systems/services/dhcp/class_serviceDHCP.inc:439
+#: admin/systems/services/dhcp/class_serviceDHCP.inc:494
+#: admin/systems/services/dhcp/class_serviceDHCP.inc:570
+#: admin/systems/services/dhcp/class_serviceDHCP.inc:578
+#: admin/systems/services/dhcp/class_serviceDHCP.inc:605
 msgid "LDAP error"
 msgstr "LDAP fout"
 
-#: admin/systems/services/dhcp/class_serviceDHCP.inc:776
+#: admin/systems/services/dhcp/class_serviceDHCP.inc:774
 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:788
+#: admin/systems/services/dhcp/class_serviceDHCP.inc:786
 msgid "Services"
 msgstr "Services"
 
-#: admin/systems/services/dhcp/class_serviceDHCP.inc:795
+#: admin/systems/services/dhcp/class_serviceDHCP.inc:793
 msgid "Start service"
-msgstr "Start dienst"
+msgstr "Start service"
 
-#: admin/systems/services/dhcp/class_serviceDHCP.inc:796
+#: admin/systems/services/dhcp/class_serviceDHCP.inc:794
 msgid "Stop service"
-msgstr "Stop dienst"
+msgstr "Stop service"
 
-#: admin/systems/services/dhcp/class_serviceDHCP.inc:797
+#: admin/systems/services/dhcp/class_serviceDHCP.inc:795
 msgid "Restart service"
-msgstr "Herstart dienst"
+msgstr "Restart service"
 
 #: admin/systems/services/dhcp/class_dhcpNetwork.inc:197
-#: admin/systems/services/dhcp/dhcp_network.tpl.c:14
 msgid "Broadcast"
 msgstr "Broadcast"
 
@@ -326,297 +304,17 @@ msgstr "DH"
 
 #: admin/systems/services/dhcp/class_dhcpTSigKey.inc:114
 #: admin/systems/services/dhcp/class_dhcpTSigKey.inc:127
-#: admin/systems/services/dhcp/dhcp_tsigkey.tpl.c:5
 msgid "Key name"
 msgstr "Sleutelnaam"
 
 #: admin/systems/services/dhcp/class_dhcpTSigKey.inc:118
-#: 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/serviceDHCP.tpl.c:2
-msgid ""
-"DHCP take over will take place when saving this entry. Choose 'Cancel' to "
-"abort."
-msgstr "Een DHCP overname zal plaatsvinden, zodra deze invoer opgeslagen wordt. Selecteer 'Annuleren' om de annuleren."
-
-#: admin/systems/services/dhcp/serviceDHCP.tpl.c:5
-msgid "Take over dhcp configuration from following server"
-msgstr "Neem DHCP configuratie over van de volgende server"
-
-#: admin/systems/services/dhcp/serviceDHCP.tpl.c:8
-msgid "DHCP sections"
-msgstr "DHCP secties"
-
-#: 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/systems/services/dhcp/dhcp_subnet.tpl.c:11
-msgid "Range for dynamic address assignment"
-msgstr "Reeks voor dynamische adres toekenning"
-
-#: admin/systems/services/dhcp/dhcp_dnszone.tpl.c:2
-msgid "DNS update zone"
-msgstr "DNS update zone"
-
-#: 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/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/systems/services/dhcp/dhcp_tsigkey.tpl.c:8
-msgid "Name of Key"
-msgstr "Naam van de sleutel"
-
-#: admin/systems/services/dhcp/dhcp_tsigkey.tpl.c:11
-msgid "Encryption method"
-msgstr "Encryptie methode"
-
-#: admin/systems/services/dhcp/dhcp_pool.tpl.c:8
-msgid "Name of pool"
-msgstr "Poolnaam"
-
-#: admin/systems/services/dhcp/dhcpNewSection.tpl.c:2
-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/systems/services/dhcp/dhcpNewSection.tpl.c:11
-msgid "Choose section type to create"
-msgstr "Selecteer het aan te maken sectie type"
-
-#: admin/systems/services/dhcp/dhcpNewSection.tpl.c:14
-msgid "Create"
-msgstr "Aanmaken"
-
-#: admin/systems/services/dhcp/dhcp_advanced.tpl.c:2
-msgid "Hide advanced settings"
-msgstr "Verberg geavanceerde instellingen"
-
-#: admin/systems/services/dhcp/dhcp_advanced.tpl.c:5
-msgid "DHCP statements"
-msgstr "DHCP regels"
-
-#: admin/systems/services/dhcp/dhcp_advanced.tpl.c:8
-msgid "DHCP options"
-msgstr "DHCP opties"
-
-#: admin/systems/services/dhcp/dhcp_advanced.tpl.c:11
-msgid "Show advanced settings"
-msgstr "Toon geavanceerde instellingen"
-
-#: admin/systems/services/dhcp/dhcp_host.tpl.c:8
-msgid "Name of host"
-msgstr "Hostnaam"
-
-#: admin/systems/services/dhcp/dhcp_host.tpl.c:11
-msgid "Fixed address"
-msgstr "Vast adres"
-
-#: 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/systems/services/dhcp/dhcp_host.tpl.c:17
-msgid "Hardware type"
-msgstr "Hardware type"
-
-#: admin/systems/services/dhcp/dhcp_sharedNetwork.tpl.c:8
-msgid "Name for shared network"
-msgstr "Naam voor gedeeld netwerk"
-
-#: admin/systems/services/dhcp/dhcp_sharedNetwork.tpl.c:11
-msgid "Server identifier"
-msgstr "Server identificatie"
-
-#: 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/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/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"
-msgstr "Leases"
-
-#: 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/systems/services/dhcp/dhcp_sharedNetwork.tpl.c:47
-msgid "Minimum lease time"
-msgstr "Minimale leasetijd"
-
-#: admin/systems/services/dhcp/dhcp_sharedNetwork.tpl.c:53
-msgid "Access control"
-msgstr "Toegangsbeheer"
-
-#: 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/systems/services/dhcp/dhcp_sharedNetwork.tpl.c:59
-msgid "Allow unknown clients"
-msgstr "Sta onbekende clients toe"
-
-#: 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"
-
-#: admin/systems/services/dhcp/dhcp_sharedNetwork.tpl.c:65
-msgid "Allow bootp clients"
-msgstr "bootp clients toestaan"
-
-#: 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"
-
-#: admin/systems/services/dhcp/dhcp_sharedNetwork.tpl.c:71
-msgid "Allow booting"
-msgstr "Opstarten toestaan"
diff --git a/dhcp/locale/pl/fusiondirectory.po b/dhcp/locale/pl/fusiondirectory.po
index 1031c9fef70bce23dc004f4bcf6430d07c713d18..ef2d9725686e43f28a748ac85809e2c6d324b5b3 100644
--- a/dhcp/locale/pl/fusiondirectory.po
+++ b/dhcp/locale/pl/fusiondirectory.po
@@ -5,12 +5,12 @@
 # Translators:
 msgid ""
 msgstr ""
-"Project-Id-Version: FusionDirectory-108\n"
+"Project-Id-Version: FusionDirectory-109\n"
 "Report-Msgid-Bugs-To: documentation@lists.fusiondirectory.org\n"
-"POT-Creation-Date: 2015-03-19 21:45+0100\n"
-"PO-Revision-Date: 2015-02-25 16:12+0000\n"
+"POT-Creation-Date: 2014-12-15 17:47+0100\n"
+"PO-Revision-Date: 2015-02-25 16:04+0000\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>\n"
-"Language-Team: Polish (http://www.transifex.com/projects/p/FusionDirectory-108/language/pl/)\n"
+"Language-Team: Polish (http://www.transifex.com/projects/p/FusionDirectory-109/language/pl/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -19,7 +19,7 @@ msgstr ""
 
 #: admin/systems/services/dhcp/class_dhcpAdvanced.inc:59
 #: admin/systems/services/dhcp/class_dhcpAdvanced.inc:73
-#: admin/systems/services/dhcp/class_serviceDHCP.inc:776
+#: admin/systems/services/dhcp/class_serviceDHCP.inc:774
 #: admin/systems/services/dhcp/class_dhcpNetwork.inc:48
 msgid "Error"
 msgstr "BÅ‚Ä…d"
@@ -52,10 +52,6 @@ msgstr "automatyczne"
 #: 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Ä™"
 
@@ -64,7 +60,6 @@ msgstr "ImiÄ™"
 #: 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 ""
 
@@ -75,15 +70,12 @@ 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"
 
@@ -94,7 +86,7 @@ msgstr ""
 #: admin/systems/services/dhcp/class_dhcpNewSectionDialog.inc:48
 #: admin/systems/services/dhcp/class_serviceDHCP.inc:62
 #: admin/systems/services/dhcp/class_serviceDHCP.inc:103
-#: admin/systems/services/dhcp/class_serviceDHCP.inc:731
+#: admin/systems/services/dhcp/class_serviceDHCP.inc:729
 msgid "Global options"
 msgstr ""
 
@@ -135,7 +127,6 @@ msgstr ""
 
 #: admin/systems/services/dhcp/class_dhcpNewSectionDialog.inc:56
 #: admin/systems/services/dhcp/class_serviceDHCP.inc:71
-#: admin/systems/services/dhcp/dhcp_tsigkey.tpl.c:2
 msgid "DNS update key"
 msgstr ""
 
@@ -145,18 +136,14 @@ msgid "DNS update zones"
 msgstr ""
 
 #: admin/systems/services/dhcp/class_dhcpDnsZone.inc:150
-#: admin/systems/services/dhcp/dhcp_dnszone.tpl.c:5
 msgid "DNS zone"
 msgstr ""
 
 #: admin/systems/services/dhcp/class_dhcpDnsZone.inc:154
-#: 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:158
-#: admin/systems/services/dhcp/dhcp_dnszone.tpl.c:11
 msgid "Key DN"
 msgstr ""
 
@@ -173,7 +160,6 @@ msgid "Token Ring"
 msgstr ""
 
 #: admin/systems/services/dhcp/class_dhcpHost.inc:149
-#: admin/systems/services/dhcp/dhcp_host.tpl.c:20
 msgid "Hardware address"
 msgstr ""
 
@@ -187,20 +173,17 @@ 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_dhcpService.inc:134
-#: admin/systems/services/dhcp/dhcp_sharedNetwork.tpl.c:38
 msgid "Maximum lease time"
 msgstr ""
 
 #: admin/systems/services/dhcp/class_serviceDHCP.inc:59
-#: admin/systems/services/dhcp/class_serviceDHCP.inc:787
-#: admin/systems/services/dhcp/class_serviceDHCP.inc:788
-#: admin/systems/services/dhcp/class_serviceDHCP.inc:830
+#: admin/systems/services/dhcp/class_serviceDHCP.inc:785
+#: admin/systems/services/dhcp/class_serviceDHCP.inc:786
+#: admin/systems/services/dhcp/class_serviceDHCP.inc:828
 msgid "DHCP service"
 msgstr ""
 
@@ -224,75 +207,73 @@ msgid "The migration will be started when you save this system."
 msgstr ""
 
 #: admin/systems/services/dhcp/class_serviceDHCP.inc:154
-#: admin/systems/services/dhcp/remove_dhcp.tpl.c:2
 msgid "Warning"
 msgstr "OstrzeÅ¼enie"
 
-#: admin/systems/services/dhcp/class_serviceDHCP.inc:247
+#: admin/systems/services/dhcp/class_serviceDHCP.inc:246
 msgid "Permission error"
 msgstr ""
 
-#: admin/systems/services/dhcp/class_serviceDHCP.inc:284
+#: admin/systems/services/dhcp/class_serviceDHCP.inc:283
 msgid "DHCP section"
 msgstr ""
 
-#: admin/systems/services/dhcp/class_serviceDHCP.inc:340
-#: admin/systems/services/dhcp/class_serviceDHCP.inc:343
+#: admin/systems/services/dhcp/class_serviceDHCP.inc:339
+#: admin/systems/services/dhcp/class_serviceDHCP.inc:342
 msgid "Insert new DHCP section"
 msgstr ""
 
-#: admin/systems/services/dhcp/class_serviceDHCP.inc:341
+#: admin/systems/services/dhcp/class_serviceDHCP.inc:340
+#: admin/systems/services/dhcp/class_serviceDHCP.inc:343
 #: admin/systems/services/dhcp/class_serviceDHCP.inc:344
-#: admin/systems/services/dhcp/class_serviceDHCP.inc:345
 msgid "Edit DHCP section"
 msgstr ""
 
-#: admin/systems/services/dhcp/class_serviceDHCP.inc:342
-#: admin/systems/services/dhcp/class_serviceDHCP.inc:346
+#: admin/systems/services/dhcp/class_serviceDHCP.inc:341
+#: admin/systems/services/dhcp/class_serviceDHCP.inc:345
 msgid "Remove DHCP section"
 msgstr ""
 
-#: admin/systems/services/dhcp/class_serviceDHCP.inc:347
+#: admin/systems/services/dhcp/class_serviceDHCP.inc:346
 msgid "Expand DHCP subnet"
 msgstr ""
 
-#: admin/systems/services/dhcp/class_serviceDHCP.inc:348
+#: admin/systems/services/dhcp/class_serviceDHCP.inc:347
 msgid "Fold DHCP subnet"
 msgstr ""
 
-#: admin/systems/services/dhcp/class_serviceDHCP.inc:425
-#: admin/systems/services/dhcp/class_serviceDHCP.inc:442
-#: admin/systems/services/dhcp/class_serviceDHCP.inc:497
-#: admin/systems/services/dhcp/class_serviceDHCP.inc:573
-#: admin/systems/services/dhcp/class_serviceDHCP.inc:581
-#: admin/systems/services/dhcp/class_serviceDHCP.inc:608
+#: admin/systems/services/dhcp/class_serviceDHCP.inc:422
+#: admin/systems/services/dhcp/class_serviceDHCP.inc:439
+#: admin/systems/services/dhcp/class_serviceDHCP.inc:494
+#: admin/systems/services/dhcp/class_serviceDHCP.inc:570
+#: admin/systems/services/dhcp/class_serviceDHCP.inc:578
+#: admin/systems/services/dhcp/class_serviceDHCP.inc:605
 msgid "LDAP error"
 msgstr "bÅ‚Ä…d LDAP"
 
-#: admin/systems/services/dhcp/class_serviceDHCP.inc:776
+#: admin/systems/services/dhcp/class_serviceDHCP.inc:774
 msgid ""
 "The DHCP configuration set is unkown. Please contact your system "
 "administrator."
 msgstr ""
 
-#: admin/systems/services/dhcp/class_serviceDHCP.inc:788
+#: admin/systems/services/dhcp/class_serviceDHCP.inc:786
 msgid "Services"
 msgstr "UsÅ‚ugi"
 
-#: admin/systems/services/dhcp/class_serviceDHCP.inc:795
+#: admin/systems/services/dhcp/class_serviceDHCP.inc:793
 msgid "Start service"
 msgstr "Uruchom usÅ‚ugÄ™"
 
-#: admin/systems/services/dhcp/class_serviceDHCP.inc:796
+#: admin/systems/services/dhcp/class_serviceDHCP.inc:794
 msgid "Stop service"
 msgstr "Zatrzymaj usÅ‚ugÄ™"
 
-#: admin/systems/services/dhcp/class_serviceDHCP.inc:797
+#: admin/systems/services/dhcp/class_serviceDHCP.inc:795
 msgid "Restart service"
 msgstr "Restartuj usÅ‚ugÄ™"
 
 #: admin/systems/services/dhcp/class_dhcpNetwork.inc:197
-#: admin/systems/services/dhcp/dhcp_network.tpl.c:14
 msgid "Broadcast"
 msgstr ""
 
@@ -323,297 +304,17 @@ msgstr ""
 
 #: admin/systems/services/dhcp/class_dhcpTSigKey.inc:114
 #: admin/systems/services/dhcp/class_dhcpTSigKey.inc:127
-#: admin/systems/services/dhcp/dhcp_tsigkey.tpl.c:5
 msgid "Key name"
 msgstr ""
 
 #: admin/systems/services/dhcp/class_dhcpTSigKey.inc:118
-#: 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/serviceDHCP.tpl.c:2
-msgid ""
-"DHCP take over will take place when saving this entry. Choose 'Cancel' to "
-"abort."
-msgstr ""
-
-#: admin/systems/services/dhcp/serviceDHCP.tpl.c:5
-msgid "Take over dhcp configuration from following server"
-msgstr ""
-
-#: admin/systems/services/dhcp/serviceDHCP.tpl.c:8
-msgid "DHCP sections"
-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/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"
-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 ""
-
-#: admin/systems/services/dhcp/dhcp_network.tpl.c:17
-msgid "Bootup"
-msgstr ""
-
-#: admin/systems/services/dhcp/dhcp_network.tpl.c:20
-msgid "Filename"
-msgstr "Nazwa pliku"
-
-#: 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 ""
-
-#: 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"
-msgstr ""
-
-#: admin/systems/services/dhcp/dhcp_dnszone.tpl.c:2
-msgid "DNS update zone"
-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
-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"
-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 "Sekcja"
-
-#: 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 "UtwÃ³rz"
-
-#: 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"
-msgstr ""
-
-#: admin/systems/services/dhcp/dhcp_advanced.tpl.c:11
-msgid "Show advanced settings"
-msgstr ""
-
-#: admin/systems/services/dhcp/dhcp_host.tpl.c:8
-msgid "Name of host"
-msgstr ""
-
-#: admin/systems/services/dhcp/dhcp_host.tpl.c:11
-msgid "Fixed address"
-msgstr ""
-
-#: admin/systems/services/dhcp/dhcp_host.tpl.c:14
-msgid "Use hostname or IP-address to assign fixed 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"
-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"
-msgstr ""
-
-#: admin/systems/services/dhcp/dhcp_sharedNetwork.tpl.c:17
-msgid "Select if this server is authoritative for this shared network"
-msgstr ""
-
-#: admin/systems/services/dhcp/dhcp_sharedNetwork.tpl.c:20
-msgid "Authoritative server"
-msgstr ""
-
-#: admin/systems/services/dhcp/dhcp_sharedNetwork.tpl.c:23
-msgid "Leases"
-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 "Kontrola dostÄ™pu"
-
-#: admin/systems/services/dhcp/dhcp_sharedNetwork.tpl.c:56
-msgid "Select if unknown clients should get dynamic IP addresses"
-msgstr ""
-
-#: 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"
-msgstr ""
-
-#: admin/systems/services/dhcp/dhcp_sharedNetwork.tpl.c:65
-msgid "Allow bootp clients"
-msgstr ""
-
-#: admin/systems/services/dhcp/dhcp_sharedNetwork.tpl.c:68
-msgid "Select if clients are allowed to boot using this DHCP server"
-msgstr ""
-
-#: admin/systems/services/dhcp/dhcp_sharedNetwork.tpl.c:71
-msgid "Allow booting"
-msgstr ""
diff --git a/dhcp/locale/pt/fusiondirectory.po b/dhcp/locale/pt/fusiondirectory.po
index 97edbe486e2cec5fa6e4a014197224bf1b1fbc49..e88c6a4081b88887d2fe0648824707d21be95181 100644
--- a/dhcp/locale/pt/fusiondirectory.po
+++ b/dhcp/locale/pt/fusiondirectory.po
@@ -5,12 +5,12 @@
 # Translators:
 msgid ""
 msgstr ""
-"Project-Id-Version: FusionDirectory-108\n"
+"Project-Id-Version: FusionDirectory-109\n"
 "Report-Msgid-Bugs-To: documentation@lists.fusiondirectory.org\n"
-"POT-Creation-Date: 2015-03-19 21:45+0100\n"
-"PO-Revision-Date: 2015-02-25 16:12+0000\n"
+"POT-Creation-Date: 2014-12-15 17:47+0100\n"
+"PO-Revision-Date: 2015-02-25 16:04+0000\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>\n"
-"Language-Team: Portuguese (http://www.transifex.com/projects/p/FusionDirectory-108/language/pt/)\n"
+"Language-Team: Portuguese (http://www.transifex.com/projects/p/FusionDirectory-109/language/pt/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -19,7 +19,7 @@ msgstr ""
 
 #: admin/systems/services/dhcp/class_dhcpAdvanced.inc:59
 #: admin/systems/services/dhcp/class_dhcpAdvanced.inc:73
-#: admin/systems/services/dhcp/class_serviceDHCP.inc:776
+#: admin/systems/services/dhcp/class_serviceDHCP.inc:774
 #: admin/systems/services/dhcp/class_dhcpNetwork.inc:48
 msgid "Error"
 msgstr "Erro"
@@ -52,10 +52,6 @@ msgstr "automÃ¡tico"
 #: 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"
 
@@ -64,7 +60,6 @@ msgstr "Nome"
 #: 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 ""
 
@@ -75,15 +70,12 @@ 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 ""
 
@@ -94,7 +86,7 @@ msgstr ""
 #: admin/systems/services/dhcp/class_dhcpNewSectionDialog.inc:48
 #: admin/systems/services/dhcp/class_serviceDHCP.inc:62
 #: admin/systems/services/dhcp/class_serviceDHCP.inc:103
-#: admin/systems/services/dhcp/class_serviceDHCP.inc:731
+#: admin/systems/services/dhcp/class_serviceDHCP.inc:729
 msgid "Global options"
 msgstr ""
 
@@ -135,7 +127,6 @@ msgstr ""
 
 #: admin/systems/services/dhcp/class_dhcpNewSectionDialog.inc:56
 #: admin/systems/services/dhcp/class_serviceDHCP.inc:71
-#: admin/systems/services/dhcp/dhcp_tsigkey.tpl.c:2
 msgid "DNS update key"
 msgstr ""
 
@@ -145,18 +136,14 @@ msgid "DNS update zones"
 msgstr ""
 
 #: admin/systems/services/dhcp/class_dhcpDnsZone.inc:150
-#: admin/systems/services/dhcp/dhcp_dnszone.tpl.c:5
 msgid "DNS zone"
 msgstr ""
 
 #: admin/systems/services/dhcp/class_dhcpDnsZone.inc:154
-#: 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:158
-#: admin/systems/services/dhcp/dhcp_dnszone.tpl.c:11
 msgid "Key DN"
 msgstr ""
 
@@ -173,7 +160,6 @@ msgid "Token Ring"
 msgstr ""
 
 #: admin/systems/services/dhcp/class_dhcpHost.inc:149
-#: admin/systems/services/dhcp/dhcp_host.tpl.c:20
 msgid "Hardware address"
 msgstr ""
 
@@ -187,20 +173,17 @@ 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_dhcpService.inc:134
-#: admin/systems/services/dhcp/dhcp_sharedNetwork.tpl.c:38
 msgid "Maximum lease time"
 msgstr ""
 
 #: admin/systems/services/dhcp/class_serviceDHCP.inc:59
-#: admin/systems/services/dhcp/class_serviceDHCP.inc:787
-#: admin/systems/services/dhcp/class_serviceDHCP.inc:788
-#: admin/systems/services/dhcp/class_serviceDHCP.inc:830
+#: admin/systems/services/dhcp/class_serviceDHCP.inc:785
+#: admin/systems/services/dhcp/class_serviceDHCP.inc:786
+#: admin/systems/services/dhcp/class_serviceDHCP.inc:828
 msgid "DHCP service"
 msgstr ""
 
@@ -224,75 +207,73 @@ msgid "The migration will be started when you save this system."
 msgstr ""
 
 #: admin/systems/services/dhcp/class_serviceDHCP.inc:154
-#: admin/systems/services/dhcp/remove_dhcp.tpl.c:2
 msgid "Warning"
 msgstr "AtenÃ§Ã£o"
 
-#: admin/systems/services/dhcp/class_serviceDHCP.inc:247
+#: admin/systems/services/dhcp/class_serviceDHCP.inc:246
 msgid "Permission error"
 msgstr ""
 
-#: admin/systems/services/dhcp/class_serviceDHCP.inc:284
+#: admin/systems/services/dhcp/class_serviceDHCP.inc:283
 msgid "DHCP section"
 msgstr ""
 
-#: admin/systems/services/dhcp/class_serviceDHCP.inc:340
-#: admin/systems/services/dhcp/class_serviceDHCP.inc:343
+#: admin/systems/services/dhcp/class_serviceDHCP.inc:339
+#: admin/systems/services/dhcp/class_serviceDHCP.inc:342
 msgid "Insert new DHCP section"
 msgstr ""
 
-#: admin/systems/services/dhcp/class_serviceDHCP.inc:341
+#: admin/systems/services/dhcp/class_serviceDHCP.inc:340
+#: admin/systems/services/dhcp/class_serviceDHCP.inc:343
 #: admin/systems/services/dhcp/class_serviceDHCP.inc:344
-#: admin/systems/services/dhcp/class_serviceDHCP.inc:345
 msgid "Edit DHCP section"
 msgstr ""
 
-#: admin/systems/services/dhcp/class_serviceDHCP.inc:342
-#: admin/systems/services/dhcp/class_serviceDHCP.inc:346
+#: admin/systems/services/dhcp/class_serviceDHCP.inc:341
+#: admin/systems/services/dhcp/class_serviceDHCP.inc:345
 msgid "Remove DHCP section"
 msgstr ""
 
-#: admin/systems/services/dhcp/class_serviceDHCP.inc:347
+#: admin/systems/services/dhcp/class_serviceDHCP.inc:346
 msgid "Expand DHCP subnet"
 msgstr ""
 
-#: admin/systems/services/dhcp/class_serviceDHCP.inc:348
+#: admin/systems/services/dhcp/class_serviceDHCP.inc:347
 msgid "Fold DHCP subnet"
 msgstr ""
 
-#: admin/systems/services/dhcp/class_serviceDHCP.inc:425
-#: admin/systems/services/dhcp/class_serviceDHCP.inc:442
-#: admin/systems/services/dhcp/class_serviceDHCP.inc:497
-#: admin/systems/services/dhcp/class_serviceDHCP.inc:573
-#: admin/systems/services/dhcp/class_serviceDHCP.inc:581
-#: admin/systems/services/dhcp/class_serviceDHCP.inc:608
+#: admin/systems/services/dhcp/class_serviceDHCP.inc:422
+#: admin/systems/services/dhcp/class_serviceDHCP.inc:439
+#: admin/systems/services/dhcp/class_serviceDHCP.inc:494
+#: admin/systems/services/dhcp/class_serviceDHCP.inc:570
+#: admin/systems/services/dhcp/class_serviceDHCP.inc:578
+#: admin/systems/services/dhcp/class_serviceDHCP.inc:605
 msgid "LDAP error"
 msgstr "Erro de LDAP"
 
-#: admin/systems/services/dhcp/class_serviceDHCP.inc:776
+#: admin/systems/services/dhcp/class_serviceDHCP.inc:774
 msgid ""
 "The DHCP configuration set is unkown. Please contact your system "
 "administrator."
 msgstr ""
 
-#: admin/systems/services/dhcp/class_serviceDHCP.inc:788
+#: admin/systems/services/dhcp/class_serviceDHCP.inc:786
 msgid "Services"
 msgstr ""
 
-#: admin/systems/services/dhcp/class_serviceDHCP.inc:795
+#: admin/systems/services/dhcp/class_serviceDHCP.inc:793
 msgid "Start service"
 msgstr ""
 
-#: admin/systems/services/dhcp/class_serviceDHCP.inc:796
+#: admin/systems/services/dhcp/class_serviceDHCP.inc:794
 msgid "Stop service"
 msgstr ""
 
-#: admin/systems/services/dhcp/class_serviceDHCP.inc:797
+#: admin/systems/services/dhcp/class_serviceDHCP.inc:795
 msgid "Restart service"
 msgstr ""
 
 #: admin/systems/services/dhcp/class_dhcpNetwork.inc:197
-#: admin/systems/services/dhcp/dhcp_network.tpl.c:14
 msgid "Broadcast"
 msgstr ""
 
@@ -323,297 +304,17 @@ msgstr ""
 
 #: admin/systems/services/dhcp/class_dhcpTSigKey.inc:114
 #: admin/systems/services/dhcp/class_dhcpTSigKey.inc:127
-#: admin/systems/services/dhcp/dhcp_tsigkey.tpl.c:5
 msgid "Key name"
 msgstr ""
 
 #: admin/systems/services/dhcp/class_dhcpTSigKey.inc:118
-#: 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/serviceDHCP.tpl.c:2
-msgid ""
-"DHCP take over will take place when saving this entry. Choose 'Cancel' to "
-"abort."
-msgstr ""
-
-#: admin/systems/services/dhcp/serviceDHCP.tpl.c:5
-msgid "Take over dhcp configuration from following server"
-msgstr ""
-
-#: admin/systems/services/dhcp/serviceDHCP.tpl.c:8
-msgid "DHCP sections"
-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"
-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 ""
-
-#: 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 ""
-
-#: 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"
-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
-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"
-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 "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"
-msgstr ""
-
-#: admin/systems/services/dhcp/dhcp_advanced.tpl.c:8
-msgid "DHCP options"
-msgstr ""
-
-#: admin/systems/services/dhcp/dhcp_advanced.tpl.c:11
-msgid "Show advanced settings"
-msgstr ""
-
-#: admin/systems/services/dhcp/dhcp_host.tpl.c:8
-msgid "Name of host"
-msgstr ""
-
-#: admin/systems/services/dhcp/dhcp_host.tpl.c:11
-msgid "Fixed address"
-msgstr ""
-
-#: admin/systems/services/dhcp/dhcp_host.tpl.c:14
-msgid "Use hostname or IP-address to assign fixed address"
-msgstr ""
-
-#: admin/systems/services/dhcp/dhcp_host.tpl.c:17
-msgid "Hardware type"
-msgstr ""
-
-#: admin/systems/services/dhcp/dhcp_sharedNetwork.tpl.c:8
-msgid "Name for shared network"
-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"
-msgstr ""
-
-#: admin/systems/services/dhcp/dhcp_sharedNetwork.tpl.c:17
-msgid "Select if this server is authoritative for this shared network"
-msgstr ""
-
-#: admin/systems/services/dhcp/dhcp_sharedNetwork.tpl.c:20
-msgid "Authoritative server"
-msgstr ""
-
-#: admin/systems/services/dhcp/dhcp_sharedNetwork.tpl.c:23
-msgid "Leases"
-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 "Controle de acesso"
-
-#: admin/systems/services/dhcp/dhcp_sharedNetwork.tpl.c:56
-msgid "Select if unknown clients should get dynamic IP addresses"
-msgstr ""
-
-#: 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"
-msgstr ""
-
-#: admin/systems/services/dhcp/dhcp_sharedNetwork.tpl.c:65
-msgid "Allow bootp clients"
-msgstr ""
-
-#: admin/systems/services/dhcp/dhcp_sharedNetwork.tpl.c:68
-msgid "Select if clients are allowed to boot using this DHCP server"
-msgstr ""
-
-#: admin/systems/services/dhcp/dhcp_sharedNetwork.tpl.c:71
-msgid "Allow booting"
-msgstr ""
diff --git a/dhcp/locale/pt_BR/fusiondirectory.po b/dhcp/locale/pt_BR/fusiondirectory.po
index de0f3bc983532474b55ff5fec5422f70a2ded9f7..7ca16ed7d76325046bc054e887a82764238c4a95 100644
--- a/dhcp/locale/pt_BR/fusiondirectory.po
+++ b/dhcp/locale/pt_BR/fusiondirectory.po
@@ -3,15 +3,14 @@
 # This file is distributed under the same license as the PACKAGE package.
 # 
 # Translators:
-# ALEJANDRO BARRIOS <alejandrobarrios@interlegis.leg.br>, 2014
 msgid ""
 msgstr ""
-"Project-Id-Version: FusionDirectory-108\n"
+"Project-Id-Version: FusionDirectory-109\n"
 "Report-Msgid-Bugs-To: documentation@lists.fusiondirectory.org\n"
-"POT-Creation-Date: 2015-03-19 21:45+0100\n"
-"PO-Revision-Date: 2015-02-25 16:51+0000\n"
+"POT-Creation-Date: 2014-12-15 17:47+0100\n"
+"PO-Revision-Date: 2015-02-25 16:13+0000\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>\n"
-"Language-Team: Portuguese (Brazil) (http://www.transifex.com/projects/p/FusionDirectory-108/language/pt_BR/)\n"
+"Language-Team: Portuguese (Brazil) (http://www.transifex.com/projects/p/FusionDirectory-109/language/pt_BR/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -20,7 +19,7 @@ msgstr ""
 
 #: admin/systems/services/dhcp/class_dhcpAdvanced.inc:59
 #: admin/systems/services/dhcp/class_dhcpAdvanced.inc:73
-#: admin/systems/services/dhcp/class_serviceDHCP.inc:776
+#: admin/systems/services/dhcp/class_serviceDHCP.inc:774
 #: admin/systems/services/dhcp/class_dhcpNetwork.inc:48
 msgid "Error"
 msgstr "Erro"
@@ -53,10 +52,6 @@ msgstr "automÃ¡tico"
 #: 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"
 
@@ -65,7 +60,6 @@ msgstr "Nome"
 #: 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"
 
@@ -76,15 +70,12 @@ 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"
 msgstr ""
 
@@ -95,7 +86,7 @@ msgstr "Faixa de IP's da rede"
 #: admin/systems/services/dhcp/class_dhcpNewSectionDialog.inc:48
 #: admin/systems/services/dhcp/class_serviceDHCP.inc:62
 #: admin/systems/services/dhcp/class_serviceDHCP.inc:103
-#: admin/systems/services/dhcp/class_serviceDHCP.inc:731
+#: admin/systems/services/dhcp/class_serviceDHCP.inc:729
 msgid "Global options"
 msgstr ""
 
@@ -136,7 +127,6 @@ msgstr ""
 
 #: admin/systems/services/dhcp/class_dhcpNewSectionDialog.inc:56
 #: admin/systems/services/dhcp/class_serviceDHCP.inc:71
-#: admin/systems/services/dhcp/dhcp_tsigkey.tpl.c:2
 msgid "DNS update key"
 msgstr ""
 
@@ -146,18 +136,14 @@ msgid "DNS update zones"
 msgstr ""
 
 #: admin/systems/services/dhcp/class_dhcpDnsZone.inc:150
-#: admin/systems/services/dhcp/dhcp_dnszone.tpl.c:5
 msgid "DNS zone"
 msgstr "Zona DNS"
 
 #: admin/systems/services/dhcp/class_dhcpDnsZone.inc:154
-#: 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:158
-#: admin/systems/services/dhcp/dhcp_dnszone.tpl.c:11
 msgid "Key DN"
 msgstr ""
 
@@ -174,7 +160,6 @@ msgid "Token Ring"
 msgstr ""
 
 #: admin/systems/services/dhcp/class_dhcpHost.inc:149
-#: admin/systems/services/dhcp/dhcp_host.tpl.c:20
 msgid "Hardware address"
 msgstr ""
 
@@ -188,20 +173,17 @@ 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_dhcpService.inc:134
-#: admin/systems/services/dhcp/dhcp_sharedNetwork.tpl.c:38
 msgid "Maximum lease time"
 msgstr ""
 
 #: admin/systems/services/dhcp/class_serviceDHCP.inc:59
-#: admin/systems/services/dhcp/class_serviceDHCP.inc:787
-#: admin/systems/services/dhcp/class_serviceDHCP.inc:788
-#: admin/systems/services/dhcp/class_serviceDHCP.inc:830
+#: admin/systems/services/dhcp/class_serviceDHCP.inc:785
+#: admin/systems/services/dhcp/class_serviceDHCP.inc:786
+#: admin/systems/services/dhcp/class_serviceDHCP.inc:828
 msgid "DHCP service"
 msgstr "ServiÃ§o DHCP"
 
@@ -225,75 +207,73 @@ msgid "The migration will be started when you save this system."
 msgstr "A migraÃ§Ã£o serÃ¡ iniciada quando vocÃª salvar este sistema."
 
 #: admin/systems/services/dhcp/class_serviceDHCP.inc:154
-#: admin/systems/services/dhcp/remove_dhcp.tpl.c:2
 msgid "Warning"
 msgstr "Aviso"
 
-#: admin/systems/services/dhcp/class_serviceDHCP.inc:247
+#: admin/systems/services/dhcp/class_serviceDHCP.inc:246
 msgid "Permission error"
 msgstr "Erro de permissÃ£o"
 
-#: admin/systems/services/dhcp/class_serviceDHCP.inc:284
+#: admin/systems/services/dhcp/class_serviceDHCP.inc:283
 msgid "DHCP section"
 msgstr "SeÃ§Ã£o DHCP"
 
-#: admin/systems/services/dhcp/class_serviceDHCP.inc:340
-#: admin/systems/services/dhcp/class_serviceDHCP.inc:343
+#: admin/systems/services/dhcp/class_serviceDHCP.inc:339
+#: admin/systems/services/dhcp/class_serviceDHCP.inc:342
 msgid "Insert new DHCP section"
 msgstr "Inserir nova seÃ§Ã£o DHCP"
 
-#: admin/systems/services/dhcp/class_serviceDHCP.inc:341
+#: admin/systems/services/dhcp/class_serviceDHCP.inc:340
+#: admin/systems/services/dhcp/class_serviceDHCP.inc:343
 #: admin/systems/services/dhcp/class_serviceDHCP.inc:344
-#: admin/systems/services/dhcp/class_serviceDHCP.inc:345
 msgid "Edit DHCP section"
 msgstr "Editar seÃ§Ã£o DHCP"
 
-#: admin/systems/services/dhcp/class_serviceDHCP.inc:342
-#: admin/systems/services/dhcp/class_serviceDHCP.inc:346
+#: admin/systems/services/dhcp/class_serviceDHCP.inc:341
+#: admin/systems/services/dhcp/class_serviceDHCP.inc:345
 msgid "Remove DHCP section"
 msgstr "Remover seÃ§Ã£o DHCP"
 
-#: admin/systems/services/dhcp/class_serviceDHCP.inc:347
+#: admin/systems/services/dhcp/class_serviceDHCP.inc:346
 msgid "Expand DHCP subnet"
 msgstr "Expandir DHCP de subrede"
 
-#: admin/systems/services/dhcp/class_serviceDHCP.inc:348
+#: admin/systems/services/dhcp/class_serviceDHCP.inc:347
 msgid "Fold DHCP subnet"
 msgstr ""
 
-#: admin/systems/services/dhcp/class_serviceDHCP.inc:425
-#: admin/systems/services/dhcp/class_serviceDHCP.inc:442
-#: admin/systems/services/dhcp/class_serviceDHCP.inc:497
-#: admin/systems/services/dhcp/class_serviceDHCP.inc:573
-#: admin/systems/services/dhcp/class_serviceDHCP.inc:581
-#: admin/systems/services/dhcp/class_serviceDHCP.inc:608
+#: admin/systems/services/dhcp/class_serviceDHCP.inc:422
+#: admin/systems/services/dhcp/class_serviceDHCP.inc:439
+#: admin/systems/services/dhcp/class_serviceDHCP.inc:494
+#: admin/systems/services/dhcp/class_serviceDHCP.inc:570
+#: admin/systems/services/dhcp/class_serviceDHCP.inc:578
+#: admin/systems/services/dhcp/class_serviceDHCP.inc:605
 msgid "LDAP error"
 msgstr "Erro de LDAP"
 
-#: admin/systems/services/dhcp/class_serviceDHCP.inc:776
+#: admin/systems/services/dhcp/class_serviceDHCP.inc:774
 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/systems/services/dhcp/class_serviceDHCP.inc:788
+#: admin/systems/services/dhcp/class_serviceDHCP.inc:786
 msgid "Services"
 msgstr "ServiÃ§os"
 
-#: admin/systems/services/dhcp/class_serviceDHCP.inc:795
+#: admin/systems/services/dhcp/class_serviceDHCP.inc:793
 msgid "Start service"
 msgstr "Iniciar serviÃ§o"
 
-#: admin/systems/services/dhcp/class_serviceDHCP.inc:796
+#: admin/systems/services/dhcp/class_serviceDHCP.inc:794
 msgid "Stop service"
 msgstr "Parar serviÃ§o"
 
-#: admin/systems/services/dhcp/class_serviceDHCP.inc:797
+#: admin/systems/services/dhcp/class_serviceDHCP.inc:795
 msgid "Restart service"
 msgstr "Reiniciar serviÃ§o"
 
 #: admin/systems/services/dhcp/class_dhcpNetwork.inc:197
-#: admin/systems/services/dhcp/dhcp_network.tpl.c:14
 msgid "Broadcast"
 msgstr ""
 
@@ -324,297 +304,17 @@ msgstr "DH"
 
 #: admin/systems/services/dhcp/class_dhcpTSigKey.inc:114
 #: admin/systems/services/dhcp/class_dhcpTSigKey.inc:127
-#: admin/systems/services/dhcp/dhcp_tsigkey.tpl.c:5
 msgid "Key name"
 msgstr ""
 
 #: admin/systems/services/dhcp/class_dhcpTSigKey.inc:118
-#: admin/systems/services/dhcp/dhcp_tsigkey.tpl.c:14
 msgid "Key"
 msgstr "Chave"
 
 #: 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/serviceDHCP.tpl.c:2
-msgid ""
-"DHCP take over will take place when saving this entry. Choose 'Cancel' to "
-"abort."
-msgstr ""
-
-#: admin/systems/services/dhcp/serviceDHCP.tpl.c:5
-msgid "Take over dhcp configuration from following server"
-msgstr ""
-
-#: admin/systems/services/dhcp/serviceDHCP.tpl.c:8
-msgid "DHCP sections"
-msgstr "SeÃ§Ãµes DHCP"
-
-#: 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"
-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"
-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"
-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 ""
-
-#: 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 ""
-
-#: 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 "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"
-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"
-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 "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: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"
-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"
-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"
-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"
-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"
-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"
-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"
-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"
-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/systems/services/dhcp/dhcp_sharedNetwork.tpl.c:59
-msgid "Allow unknown clients"
-msgstr "Permitir clientes desconhecidos"
-
-#: admin/systems/services/dhcp/dhcp_sharedNetwork.tpl.c:62
-msgid "Select if bootp clients should get dynamic IP addresses"
-msgstr ""
-
-#: admin/systems/services/dhcp/dhcp_sharedNetwork.tpl.c:65
-msgid "Allow bootp clients"
-msgstr ""
-
-#: admin/systems/services/dhcp/dhcp_sharedNetwork.tpl.c:68
-msgid "Select if clients are allowed to boot using this DHCP server"
-msgstr ""
-
-#: admin/systems/services/dhcp/dhcp_sharedNetwork.tpl.c:71
-msgid "Allow booting"
-msgstr ""
diff --git a/dhcp/locale/ru/fusiondirectory.po b/dhcp/locale/ru/fusiondirectory.po
index ede5eddfd7fe97687a8d58d7f3bd3003588324d4..502edf6d963873a775593ec82ff2477ea1de583e 100644
--- a/dhcp/locale/ru/fusiondirectory.po
+++ b/dhcp/locale/ru/fusiondirectory.po
@@ -3,26 +3,23 @@
 # This file is distributed under the same license as the PACKAGE package.
 # 
 # Translators:
-# Alexey, 2015
-# Alexey, 2015
-#  Valia V. Vaneeva <fattie@altlinux.ru>, 2004
 msgid ""
 msgstr ""
-"Project-Id-Version: FusionDirectory-108\n"
+"Project-Id-Version: FusionDirectory-109\n"
 "Report-Msgid-Bugs-To: documentation@lists.fusiondirectory.org\n"
-"POT-Creation-Date: 2015-03-19 21:45+0100\n"
-"PO-Revision-Date: 2015-03-18 19:43+0000\n"
-"Last-Translator: Alexey\n"
-"Language-Team: Russian (http://www.transifex.com/projects/p/FusionDirectory-108/language/ru/)\n"
+"POT-Creation-Date: 2014-12-15 17:47+0100\n"
+"PO-Revision-Date: 2015-04-12 22:01+0000\n"
+"Last-Translator: fusiondirectory <contact@fusiondirectory.org>\n"
+"Language-Team: Russian (http://www.transifex.com/projects/p/FusionDirectory-109/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=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);\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:776
+#: admin/systems/services/dhcp/class_serviceDHCP.inc:774
 #: admin/systems/services/dhcp/class_dhcpNetwork.inc:48
 msgid "Error"
 msgstr "ÐžÑˆÐ¸Ð±ÐºÐ°"
@@ -55,10 +52,6 @@ msgstr "Ð°Ð²Ñ‚Ð¾Ð¼Ð°Ñ‚Ð¸Ñ‡ÐµÑÐºÐ¸"
 #: 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 "Ð¤Ð°Ð¼Ð¸Ð»Ð¸Ñ"
 
@@ -67,7 +60,6 @@ msgstr "Ð¤Ð°Ð¼Ð¸Ð»Ð¸Ñ"
 #: 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 "Ð”Ð¸Ð°Ð¿Ð¾Ð·Ð¾Ð½"
 
@@ -78,15 +70,12 @@ 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 "Ð¡ÐµÑ‚ÐµÐ²Ð°Ñ Ð¼Ð°ÑÐºÐ°"
 
@@ -97,7 +86,7 @@ msgstr ""
 #: admin/systems/services/dhcp/class_dhcpNewSectionDialog.inc:48
 #: admin/systems/services/dhcp/class_serviceDHCP.inc:62
 #: admin/systems/services/dhcp/class_serviceDHCP.inc:103
-#: admin/systems/services/dhcp/class_serviceDHCP.inc:731
+#: admin/systems/services/dhcp/class_serviceDHCP.inc:729
 msgid "Global options"
 msgstr ""
 
@@ -138,7 +127,6 @@ msgstr ""
 
 #: admin/systems/services/dhcp/class_dhcpNewSectionDialog.inc:56
 #: admin/systems/services/dhcp/class_serviceDHCP.inc:71
-#: admin/systems/services/dhcp/dhcp_tsigkey.tpl.c:2
 msgid "DNS update key"
 msgstr ""
 
@@ -148,18 +136,14 @@ msgid "DNS update zones"
 msgstr ""
 
 #: admin/systems/services/dhcp/class_dhcpDnsZone.inc:150
-#: admin/systems/services/dhcp/dhcp_dnszone.tpl.c:5
 msgid "DNS zone"
 msgstr " DNZ Ð·Ð¾Ð½Ð°"
 
 #: admin/systems/services/dhcp/class_dhcpDnsZone.inc:154
-#: 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:158
-#: admin/systems/services/dhcp/dhcp_dnszone.tpl.c:11
 msgid "Key DN"
 msgstr ""
 
@@ -176,7 +160,6 @@ msgid "Token Ring"
 msgstr "Token Ring"
 
 #: admin/systems/services/dhcp/class_dhcpHost.inc:149
-#: admin/systems/services/dhcp/dhcp_host.tpl.c:20
 msgid "Hardware address"
 msgstr ""
 
@@ -190,20 +173,17 @@ 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_dhcpService.inc:134
-#: admin/systems/services/dhcp/dhcp_sharedNetwork.tpl.c:38
 msgid "Maximum lease time"
 msgstr ""
 
 #: admin/systems/services/dhcp/class_serviceDHCP.inc:59
-#: admin/systems/services/dhcp/class_serviceDHCP.inc:787
-#: admin/systems/services/dhcp/class_serviceDHCP.inc:788
-#: admin/systems/services/dhcp/class_serviceDHCP.inc:830
+#: admin/systems/services/dhcp/class_serviceDHCP.inc:785
+#: admin/systems/services/dhcp/class_serviceDHCP.inc:786
+#: admin/systems/services/dhcp/class_serviceDHCP.inc:828
 msgid "DHCP service"
 msgstr ""
 
@@ -227,75 +207,73 @@ msgid "The migration will be started when you save this system."
 msgstr ""
 
 #: admin/systems/services/dhcp/class_serviceDHCP.inc:154
-#: admin/systems/services/dhcp/remove_dhcp.tpl.c:2
 msgid "Warning"
 msgstr "ÐŸÑ€ÐµÐ´ÑƒÐ¿Ñ€ÐµÐ¶Ð´ÐµÐ½Ð¸Ðµ"
 
-#: admin/systems/services/dhcp/class_serviceDHCP.inc:247
+#: admin/systems/services/dhcp/class_serviceDHCP.inc:246
 msgid "Permission error"
-msgstr ""
+msgstr "ÐžÑˆÐ¸Ð±ÐºÐ° Ð´Ð¾ÑÑ‚ÑƒÐ¿Ð°"
 
-#: admin/systems/services/dhcp/class_serviceDHCP.inc:284
+#: admin/systems/services/dhcp/class_serviceDHCP.inc:283
 msgid "DHCP section"
 msgstr ""
 
-#: admin/systems/services/dhcp/class_serviceDHCP.inc:340
-#: admin/systems/services/dhcp/class_serviceDHCP.inc:343
+#: admin/systems/services/dhcp/class_serviceDHCP.inc:339
+#: admin/systems/services/dhcp/class_serviceDHCP.inc:342
 msgid "Insert new DHCP section"
 msgstr ""
 
-#: admin/systems/services/dhcp/class_serviceDHCP.inc:341
+#: admin/systems/services/dhcp/class_serviceDHCP.inc:340
+#: admin/systems/services/dhcp/class_serviceDHCP.inc:343
 #: admin/systems/services/dhcp/class_serviceDHCP.inc:344
-#: admin/systems/services/dhcp/class_serviceDHCP.inc:345
 msgid "Edit DHCP section"
 msgstr ""
 
-#: admin/systems/services/dhcp/class_serviceDHCP.inc:342
-#: admin/systems/services/dhcp/class_serviceDHCP.inc:346
+#: admin/systems/services/dhcp/class_serviceDHCP.inc:341
+#: admin/systems/services/dhcp/class_serviceDHCP.inc:345
 msgid "Remove DHCP section"
 msgstr ""
 
-#: admin/systems/services/dhcp/class_serviceDHCP.inc:347
+#: admin/systems/services/dhcp/class_serviceDHCP.inc:346
 msgid "Expand DHCP subnet"
 msgstr ""
 
-#: admin/systems/services/dhcp/class_serviceDHCP.inc:348
+#: admin/systems/services/dhcp/class_serviceDHCP.inc:347
 msgid "Fold DHCP subnet"
 msgstr ""
 
-#: admin/systems/services/dhcp/class_serviceDHCP.inc:425
-#: admin/systems/services/dhcp/class_serviceDHCP.inc:442
-#: admin/systems/services/dhcp/class_serviceDHCP.inc:497
-#: admin/systems/services/dhcp/class_serviceDHCP.inc:573
-#: admin/systems/services/dhcp/class_serviceDHCP.inc:581
-#: admin/systems/services/dhcp/class_serviceDHCP.inc:608
+#: admin/systems/services/dhcp/class_serviceDHCP.inc:422
+#: admin/systems/services/dhcp/class_serviceDHCP.inc:439
+#: admin/systems/services/dhcp/class_serviceDHCP.inc:494
+#: admin/systems/services/dhcp/class_serviceDHCP.inc:570
+#: admin/systems/services/dhcp/class_serviceDHCP.inc:578
+#: admin/systems/services/dhcp/class_serviceDHCP.inc:605
 msgid "LDAP error"
 msgstr "ÐžÑˆÐ¸Ð±ÐºÐ° LDAP"
 
-#: admin/systems/services/dhcp/class_serviceDHCP.inc:776
+#: admin/systems/services/dhcp/class_serviceDHCP.inc:774
 msgid ""
 "The DHCP configuration set is unkown. Please contact your system "
 "administrator."
 msgstr ""
 
-#: admin/systems/services/dhcp/class_serviceDHCP.inc:788
+#: admin/systems/services/dhcp/class_serviceDHCP.inc:786
 msgid "Services"
 msgstr "Ð¡ÐµÑ€Ð²Ð¸ÑÑ‹"
 
-#: admin/systems/services/dhcp/class_serviceDHCP.inc:795
+#: admin/systems/services/dhcp/class_serviceDHCP.inc:793
 msgid "Start service"
-msgstr ""
+msgstr "Ð—Ð°Ð¿ÑƒÑÑ‚Ð¸Ñ‚ÑŒ ÑÐ»ÑƒÐ¶Ð±Ñƒ"
 
-#: admin/systems/services/dhcp/class_serviceDHCP.inc:796
+#: admin/systems/services/dhcp/class_serviceDHCP.inc:794
 msgid "Stop service"
-msgstr ""
+msgstr "ÐžÑÑ‚Ð°Ð½Ð¾Ð²Ð¸Ñ‚ÑŒ ÑÐ»ÑƒÐ¶Ð±Ñƒ"
 
-#: admin/systems/services/dhcp/class_serviceDHCP.inc:797
+#: admin/systems/services/dhcp/class_serviceDHCP.inc:795
 msgid "Restart service"
-msgstr ""
+msgstr "ÐŸÐµÑ€ÐµÐ·Ð°Ð¿ÑƒÑÑ‚Ð¸Ñ‚ÑŒ ÑÐ»ÑƒÐ¶Ð±Ñƒ"
 
 #: admin/systems/services/dhcp/class_dhcpNetwork.inc:197
-#: admin/systems/services/dhcp/dhcp_network.tpl.c:14
 msgid "Broadcast"
 msgstr ""
 
@@ -326,297 +304,17 @@ msgstr ""
 
 #: admin/systems/services/dhcp/class_dhcpTSigKey.inc:114
 #: admin/systems/services/dhcp/class_dhcpTSigKey.inc:127
-#: admin/systems/services/dhcp/dhcp_tsigkey.tpl.c:5
 msgid "Key name"
 msgstr ""
 
 #: admin/systems/services/dhcp/class_dhcpTSigKey.inc:118
-#: 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/serviceDHCP.tpl.c:2
-msgid ""
-"DHCP take over will take place when saving this entry. Choose 'Cancel' to "
-"abort."
-msgstr ""
-
-#: admin/systems/services/dhcp/serviceDHCP.tpl.c:5
-msgid "Take over dhcp configuration from following server"
-msgstr ""
-
-#: admin/systems/services/dhcp/serviceDHCP.tpl.c:8
-msgid "DHCP sections"
-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 ""
-
-#: 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"
-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 ""
-
-#: 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 ""
-
-#: 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"
-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
-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 "Ð¡Ð¾Ð·Ð´Ð°Ñ‚ÑŒ"
-
-#: 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"
-msgstr ""
-
-#: admin/systems/services/dhcp/dhcp_advanced.tpl.c:11
-msgid "Show advanced settings"
-msgstr ""
-
-#: admin/systems/services/dhcp/dhcp_host.tpl.c:8
-msgid "Name of host"
-msgstr ""
-
-#: admin/systems/services/dhcp/dhcp_host.tpl.c:11
-msgid "Fixed address"
-msgstr ""
-
-#: admin/systems/services/dhcp/dhcp_host.tpl.c:14
-msgid "Use hostname or IP-address to assign fixed address"
-msgstr ""
-
-#: admin/systems/services/dhcp/dhcp_host.tpl.c:17
-msgid "Hardware type"
-msgstr ""
-
-#: admin/systems/services/dhcp/dhcp_sharedNetwork.tpl.c:8
-msgid "Name for shared network"
-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"
-msgstr ""
-
-#: admin/systems/services/dhcp/dhcp_sharedNetwork.tpl.c:17
-msgid "Select if this server is authoritative for this shared network"
-msgstr ""
-
-#: admin/systems/services/dhcp/dhcp_sharedNetwork.tpl.c:20
-msgid "Authoritative server"
-msgstr ""
-
-#: admin/systems/services/dhcp/dhcp_sharedNetwork.tpl.c:23
-msgid "Leases"
-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 ""
-
-#: 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"
-msgstr ""
-
-#: admin/systems/services/dhcp/dhcp_sharedNetwork.tpl.c:65
-msgid "Allow bootp clients"
-msgstr ""
-
-#: admin/systems/services/dhcp/dhcp_sharedNetwork.tpl.c:68
-msgid "Select if clients are allowed to boot using this DHCP server"
-msgstr ""
-
-#: admin/systems/services/dhcp/dhcp_sharedNetwork.tpl.c:71
-msgid "Allow booting"
-msgstr ""
diff --git a/dhcp/locale/ru@petr1708/fusiondirectory.po b/dhcp/locale/ru@petr1708/fusiondirectory.po
index b9050bc06cc1cd21ba39ce3e202ab4ebe42f88ed..b5ae680374ee63176e2225ad694d943ee61ae987 100644
--- a/dhcp/locale/ru@petr1708/fusiondirectory.po
+++ b/dhcp/locale/ru@petr1708/fusiondirectory.po
@@ -5,21 +5,21 @@
 # Translators:
 msgid ""
 msgstr ""
-"Project-Id-Version: FusionDirectory-108\n"
+"Project-Id-Version: FusionDirectory-109\n"
 "Report-Msgid-Bugs-To: documentation@lists.fusiondirectory.org\n"
-"POT-Creation-Date: 2015-03-19 21:45+0100\n"
-"PO-Revision-Date: 2015-02-25 15:44+0000\n"
+"POT-Creation-Date: 2014-12-15 17:47+0100\n"
+"PO-Revision-Date: 2014-12-15 16:51+0000\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>\n"
-"Language-Team: Russian Petrine orthography (http://www.transifex.com/projects/p/FusionDirectory-108/language/ru@petr1708/)\n"
+"Language-Team: Russian Petrine orthography (http://www.transifex.com/projects/p/FusionDirectory-109/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=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);\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:776
+#: admin/systems/services/dhcp/class_serviceDHCP.inc:774
 #: admin/systems/services/dhcp/class_dhcpNetwork.inc:48
 msgid "Error"
 msgstr ""
@@ -52,10 +52,6 @@ msgstr ""
 #: 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 ""
 
@@ -64,7 +60,6 @@ msgstr ""
 #: 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 ""
 
@@ -75,15 +70,12 @@ 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 ""
 
@@ -94,7 +86,7 @@ msgstr ""
 #: admin/systems/services/dhcp/class_dhcpNewSectionDialog.inc:48
 #: admin/systems/services/dhcp/class_serviceDHCP.inc:62
 #: admin/systems/services/dhcp/class_serviceDHCP.inc:103
-#: admin/systems/services/dhcp/class_serviceDHCP.inc:731
+#: admin/systems/services/dhcp/class_serviceDHCP.inc:729
 msgid "Global options"
 msgstr ""
 
@@ -135,7 +127,6 @@ msgstr ""
 
 #: admin/systems/services/dhcp/class_dhcpNewSectionDialog.inc:56
 #: admin/systems/services/dhcp/class_serviceDHCP.inc:71
-#: admin/systems/services/dhcp/dhcp_tsigkey.tpl.c:2
 msgid "DNS update key"
 msgstr ""
 
@@ -145,18 +136,14 @@ msgid "DNS update zones"
 msgstr ""
 
 #: admin/systems/services/dhcp/class_dhcpDnsZone.inc:150
-#: admin/systems/services/dhcp/dhcp_dnszone.tpl.c:5
 msgid "DNS zone"
 msgstr ""
 
 #: admin/systems/services/dhcp/class_dhcpDnsZone.inc:154
-#: 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:158
-#: admin/systems/services/dhcp/dhcp_dnszone.tpl.c:11
 msgid "Key DN"
 msgstr ""
 
@@ -173,7 +160,6 @@ msgid "Token Ring"
 msgstr ""
 
 #: admin/systems/services/dhcp/class_dhcpHost.inc:149
-#: admin/systems/services/dhcp/dhcp_host.tpl.c:20
 msgid "Hardware address"
 msgstr ""
 
@@ -187,20 +173,17 @@ 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_dhcpService.inc:134
-#: admin/systems/services/dhcp/dhcp_sharedNetwork.tpl.c:38
 msgid "Maximum lease time"
 msgstr ""
 
 #: admin/systems/services/dhcp/class_serviceDHCP.inc:59
-#: admin/systems/services/dhcp/class_serviceDHCP.inc:787
-#: admin/systems/services/dhcp/class_serviceDHCP.inc:788
-#: admin/systems/services/dhcp/class_serviceDHCP.inc:830
+#: admin/systems/services/dhcp/class_serviceDHCP.inc:785
+#: admin/systems/services/dhcp/class_serviceDHCP.inc:786
+#: admin/systems/services/dhcp/class_serviceDHCP.inc:828
 msgid "DHCP service"
 msgstr ""
 
@@ -224,75 +207,73 @@ msgid "The migration will be started when you save this system."
 msgstr ""
 
 #: admin/systems/services/dhcp/class_serviceDHCP.inc:154
-#: admin/systems/services/dhcp/remove_dhcp.tpl.c:2
 msgid "Warning"
 msgstr ""
 
-#: admin/systems/services/dhcp/class_serviceDHCP.inc:247
+#: admin/systems/services/dhcp/class_serviceDHCP.inc:246
 msgid "Permission error"
 msgstr ""
 
-#: admin/systems/services/dhcp/class_serviceDHCP.inc:284
+#: admin/systems/services/dhcp/class_serviceDHCP.inc:283
 msgid "DHCP section"
 msgstr ""
 
-#: admin/systems/services/dhcp/class_serviceDHCP.inc:340
-#: admin/systems/services/dhcp/class_serviceDHCP.inc:343
+#: admin/systems/services/dhcp/class_serviceDHCP.inc:339
+#: admin/systems/services/dhcp/class_serviceDHCP.inc:342
 msgid "Insert new DHCP section"
 msgstr ""
 
-#: admin/systems/services/dhcp/class_serviceDHCP.inc:341
+#: admin/systems/services/dhcp/class_serviceDHCP.inc:340
+#: admin/systems/services/dhcp/class_serviceDHCP.inc:343
 #: admin/systems/services/dhcp/class_serviceDHCP.inc:344
-#: admin/systems/services/dhcp/class_serviceDHCP.inc:345
 msgid "Edit DHCP section"
 msgstr ""
 
-#: admin/systems/services/dhcp/class_serviceDHCP.inc:342
-#: admin/systems/services/dhcp/class_serviceDHCP.inc:346
+#: admin/systems/services/dhcp/class_serviceDHCP.inc:341
+#: admin/systems/services/dhcp/class_serviceDHCP.inc:345
 msgid "Remove DHCP section"
 msgstr ""
 
-#: admin/systems/services/dhcp/class_serviceDHCP.inc:347
+#: admin/systems/services/dhcp/class_serviceDHCP.inc:346
 msgid "Expand DHCP subnet"
 msgstr ""
 
-#: admin/systems/services/dhcp/class_serviceDHCP.inc:348
+#: admin/systems/services/dhcp/class_serviceDHCP.inc:347
 msgid "Fold DHCP subnet"
 msgstr ""
 
-#: admin/systems/services/dhcp/class_serviceDHCP.inc:425
-#: admin/systems/services/dhcp/class_serviceDHCP.inc:442
-#: admin/systems/services/dhcp/class_serviceDHCP.inc:497
-#: admin/systems/services/dhcp/class_serviceDHCP.inc:573
-#: admin/systems/services/dhcp/class_serviceDHCP.inc:581
-#: admin/systems/services/dhcp/class_serviceDHCP.inc:608
+#: admin/systems/services/dhcp/class_serviceDHCP.inc:422
+#: admin/systems/services/dhcp/class_serviceDHCP.inc:439
+#: admin/systems/services/dhcp/class_serviceDHCP.inc:494
+#: admin/systems/services/dhcp/class_serviceDHCP.inc:570
+#: admin/systems/services/dhcp/class_serviceDHCP.inc:578
+#: admin/systems/services/dhcp/class_serviceDHCP.inc:605
 msgid "LDAP error"
 msgstr ""
 
-#: admin/systems/services/dhcp/class_serviceDHCP.inc:776
+#: admin/systems/services/dhcp/class_serviceDHCP.inc:774
 msgid ""
 "The DHCP configuration set is unkown. Please contact your system "
 "administrator."
 msgstr ""
 
-#: admin/systems/services/dhcp/class_serviceDHCP.inc:788
+#: admin/systems/services/dhcp/class_serviceDHCP.inc:786
 msgid "Services"
 msgstr ""
 
-#: admin/systems/services/dhcp/class_serviceDHCP.inc:795
+#: admin/systems/services/dhcp/class_serviceDHCP.inc:793
 msgid "Start service"
 msgstr ""
 
-#: admin/systems/services/dhcp/class_serviceDHCP.inc:796
+#: admin/systems/services/dhcp/class_serviceDHCP.inc:794
 msgid "Stop service"
 msgstr ""
 
-#: admin/systems/services/dhcp/class_serviceDHCP.inc:797
+#: admin/systems/services/dhcp/class_serviceDHCP.inc:795
 msgid "Restart service"
 msgstr ""
 
 #: admin/systems/services/dhcp/class_dhcpNetwork.inc:197
-#: admin/systems/services/dhcp/dhcp_network.tpl.c:14
 msgid "Broadcast"
 msgstr ""
 
@@ -323,297 +304,17 @@ msgstr ""
 
 #: admin/systems/services/dhcp/class_dhcpTSigKey.inc:114
 #: admin/systems/services/dhcp/class_dhcpTSigKey.inc:127
-#: admin/systems/services/dhcp/dhcp_tsigkey.tpl.c:5
 msgid "Key name"
 msgstr ""
 
 #: admin/systems/services/dhcp/class_dhcpTSigKey.inc:118
-#: 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/serviceDHCP.tpl.c:2
-msgid ""
-"DHCP take over will take place when saving this entry. Choose 'Cancel' to "
-"abort."
-msgstr ""
-
-#: admin/systems/services/dhcp/serviceDHCP.tpl.c:5
-msgid "Take over dhcp configuration from following server"
-msgstr ""
-
-#: admin/systems/services/dhcp/serviceDHCP.tpl.c:8
-msgid "DHCP sections"
-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 ""
-
-#: 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"
-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 ""
-
-#: 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 ""
-
-#: 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"
-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
-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 ""
-
-#: 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"
-msgstr ""
-
-#: admin/systems/services/dhcp/dhcp_advanced.tpl.c:11
-msgid "Show advanced settings"
-msgstr ""
-
-#: admin/systems/services/dhcp/dhcp_host.tpl.c:8
-msgid "Name of host"
-msgstr ""
-
-#: admin/systems/services/dhcp/dhcp_host.tpl.c:11
-msgid "Fixed address"
-msgstr ""
-
-#: admin/systems/services/dhcp/dhcp_host.tpl.c:14
-msgid "Use hostname or IP-address to assign fixed address"
-msgstr ""
-
-#: admin/systems/services/dhcp/dhcp_host.tpl.c:17
-msgid "Hardware type"
-msgstr ""
-
-#: admin/systems/services/dhcp/dhcp_sharedNetwork.tpl.c:8
-msgid "Name for shared network"
-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"
-msgstr ""
-
-#: admin/systems/services/dhcp/dhcp_sharedNetwork.tpl.c:17
-msgid "Select if this server is authoritative for this shared network"
-msgstr ""
-
-#: admin/systems/services/dhcp/dhcp_sharedNetwork.tpl.c:20
-msgid "Authoritative server"
-msgstr ""
-
-#: admin/systems/services/dhcp/dhcp_sharedNetwork.tpl.c:23
-msgid "Leases"
-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 ""
-
-#: 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"
-msgstr ""
-
-#: admin/systems/services/dhcp/dhcp_sharedNetwork.tpl.c:65
-msgid "Allow bootp clients"
-msgstr ""
-
-#: admin/systems/services/dhcp/dhcp_sharedNetwork.tpl.c:68
-msgid "Select if clients are allowed to boot using this DHCP server"
-msgstr ""
-
-#: admin/systems/services/dhcp/dhcp_sharedNetwork.tpl.c:71
-msgid "Allow booting"
-msgstr ""
diff --git a/dhcp/locale/sv/fusiondirectory.po b/dhcp/locale/sv/fusiondirectory.po
index 0555cf67002ad0346bed1eeea6e2a06cf70843f3..4928a39aa0a1938033c68ace57eb998070a2d9ab 100644
--- a/dhcp/locale/sv/fusiondirectory.po
+++ b/dhcp/locale/sv/fusiondirectory.po
@@ -3,15 +3,14 @@
 # This file is distributed under the same license as the PACKAGE package.
 # 
 # Translators:
-# Mathias Friman <mathias.friman@knorca.se>, 2014
 msgid ""
 msgstr ""
-"Project-Id-Version: FusionDirectory-108\n"
+"Project-Id-Version: FusionDirectory-109\n"
 "Report-Msgid-Bugs-To: documentation@lists.fusiondirectory.org\n"
-"POT-Creation-Date: 2015-03-19 21:45+0100\n"
-"PO-Revision-Date: 2015-02-25 16:51+0000\n"
+"POT-Creation-Date: 2014-12-15 17:47+0100\n"
+"PO-Revision-Date: 2015-02-25 16:13+0000\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>\n"
-"Language-Team: Swedish (http://www.transifex.com/projects/p/FusionDirectory-108/language/sv/)\n"
+"Language-Team: Swedish (http://www.transifex.com/projects/p/FusionDirectory-109/language/sv/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -20,7 +19,7 @@ msgstr ""
 
 #: admin/systems/services/dhcp/class_dhcpAdvanced.inc:59
 #: admin/systems/services/dhcp/class_dhcpAdvanced.inc:73
-#: admin/systems/services/dhcp/class_serviceDHCP.inc:776
+#: admin/systems/services/dhcp/class_serviceDHCP.inc:774
 #: admin/systems/services/dhcp/class_dhcpNetwork.inc:48
 msgid "Error"
 msgstr "Fel"
@@ -53,10 +52,6 @@ msgstr "automatisk"
 #: 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"
 
@@ -65,7 +60,6 @@ msgstr "Namn"
 #: 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"
 
@@ -76,15 +70,12 @@ msgstr "'Range' Ã¤r inte inom det konfigurerade nÃ¤tverket."
 
 #: 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/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"
 
@@ -95,7 +86,7 @@ msgstr "NÃ¤tverks-range"
 #: admin/systems/services/dhcp/class_dhcpNewSectionDialog.inc:48
 #: admin/systems/services/dhcp/class_serviceDHCP.inc:62
 #: admin/systems/services/dhcp/class_serviceDHCP.inc:103
-#: admin/systems/services/dhcp/class_serviceDHCP.inc:731
+#: admin/systems/services/dhcp/class_serviceDHCP.inc:729
 msgid "Global options"
 msgstr "Globala instÃ¤llningar"
 
@@ -136,7 +127,6 @@ msgstr "Delat nÃ¤tverk"
 
 #: admin/systems/services/dhcp/class_dhcpNewSectionDialog.inc:56
 #: admin/systems/services/dhcp/class_serviceDHCP.inc:71
-#: admin/systems/services/dhcp/dhcp_tsigkey.tpl.c:2
 msgid "DNS update key"
 msgstr "DNS-uppdateringsnyckel"
 
@@ -146,18 +136,14 @@ msgid "DNS update zones"
 msgstr "DNS-uppdateringszoner"
 
 #: admin/systems/services/dhcp/class_dhcpDnsZone.inc:150
-#: admin/systems/services/dhcp/dhcp_dnszone.tpl.c:5
 msgid "DNS zone"
 msgstr "DNS-zon"
 
 #: admin/systems/services/dhcp/class_dhcpDnsZone.inc:154
-#: 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:158
-#: admin/systems/services/dhcp/dhcp_dnszone.tpl.c:11
 msgid "Key DN"
 msgstr "Key DN"
 
@@ -174,7 +160,6 @@ msgid "Token Ring"
 msgstr "Token Ring"
 
 #: admin/systems/services/dhcp/class_dhcpHost.inc:149
-#: admin/systems/services/dhcp/dhcp_host.tpl.c:20
 msgid "Hardware address"
 msgstr "HÃ¥rdvaruadress"
 
@@ -188,20 +173,17 @@ msgstr "Max Lease-tid"
 
 #: 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_dhcpService.inc:134
-#: admin/systems/services/dhcp/dhcp_sharedNetwork.tpl.c:38
 msgid "Maximum lease time"
 msgstr "Maximal lease-tid"
 
 #: admin/systems/services/dhcp/class_serviceDHCP.inc:59
-#: admin/systems/services/dhcp/class_serviceDHCP.inc:787
-#: admin/systems/services/dhcp/class_serviceDHCP.inc:788
-#: admin/systems/services/dhcp/class_serviceDHCP.inc:830
+#: admin/systems/services/dhcp/class_serviceDHCP.inc:785
+#: admin/systems/services/dhcp/class_serviceDHCP.inc:786
+#: admin/systems/services/dhcp/class_serviceDHCP.inc:828
 msgid "DHCP service"
 msgstr "DHCP-tjÃ¤nst"
 
@@ -225,75 +207,73 @@ msgid "The migration will be started when you save this system."
 msgstr "Denna migrering kommer att startas nÃ¤r du sparar det hÃ¤r systemet."
 
 #: admin/systems/services/dhcp/class_serviceDHCP.inc:154
-#: admin/systems/services/dhcp/remove_dhcp.tpl.c:2
 msgid "Warning"
 msgstr "Varning"
 
-#: admin/systems/services/dhcp/class_serviceDHCP.inc:247
+#: admin/systems/services/dhcp/class_serviceDHCP.inc:246
 msgid "Permission error"
 msgstr "RÃ¤ttighetsfel"
 
-#: admin/systems/services/dhcp/class_serviceDHCP.inc:284
+#: admin/systems/services/dhcp/class_serviceDHCP.inc:283
 msgid "DHCP section"
 msgstr "DHCP-sektion"
 
-#: admin/systems/services/dhcp/class_serviceDHCP.inc:340
-#: admin/systems/services/dhcp/class_serviceDHCP.inc:343
+#: admin/systems/services/dhcp/class_serviceDHCP.inc:339
+#: admin/systems/services/dhcp/class_serviceDHCP.inc:342
 msgid "Insert new DHCP section"
 msgstr "Infoga ny DHCP-sektion"
 
-#: admin/systems/services/dhcp/class_serviceDHCP.inc:341
+#: admin/systems/services/dhcp/class_serviceDHCP.inc:340
+#: admin/systems/services/dhcp/class_serviceDHCP.inc:343
 #: admin/systems/services/dhcp/class_serviceDHCP.inc:344
-#: admin/systems/services/dhcp/class_serviceDHCP.inc:345
 msgid "Edit DHCP section"
 msgstr "Redigera DHCP-sektion"
 
-#: admin/systems/services/dhcp/class_serviceDHCP.inc:342
-#: admin/systems/services/dhcp/class_serviceDHCP.inc:346
+#: admin/systems/services/dhcp/class_serviceDHCP.inc:341
+#: admin/systems/services/dhcp/class_serviceDHCP.inc:345
 msgid "Remove DHCP section"
 msgstr "Ta bort DHCP-sektion"
 
-#: admin/systems/services/dhcp/class_serviceDHCP.inc:347
+#: admin/systems/services/dhcp/class_serviceDHCP.inc:346
 msgid "Expand DHCP subnet"
 msgstr "Expandera DHCP-subnÃ¤t"
 
-#: admin/systems/services/dhcp/class_serviceDHCP.inc:348
+#: admin/systems/services/dhcp/class_serviceDHCP.inc:347
 msgid "Fold DHCP subnet"
 msgstr "Minimera DHCP-subnÃ¤t"
 
-#: admin/systems/services/dhcp/class_serviceDHCP.inc:425
-#: admin/systems/services/dhcp/class_serviceDHCP.inc:442
-#: admin/systems/services/dhcp/class_serviceDHCP.inc:497
-#: admin/systems/services/dhcp/class_serviceDHCP.inc:573
-#: admin/systems/services/dhcp/class_serviceDHCP.inc:581
-#: admin/systems/services/dhcp/class_serviceDHCP.inc:608
+#: admin/systems/services/dhcp/class_serviceDHCP.inc:422
+#: admin/systems/services/dhcp/class_serviceDHCP.inc:439
+#: admin/systems/services/dhcp/class_serviceDHCP.inc:494
+#: admin/systems/services/dhcp/class_serviceDHCP.inc:570
+#: admin/systems/services/dhcp/class_serviceDHCP.inc:578
+#: admin/systems/services/dhcp/class_serviceDHCP.inc:605
 msgid "LDAP error"
 msgstr "LDAP-fel"
 
-#: admin/systems/services/dhcp/class_serviceDHCP.inc:776
+#: admin/systems/services/dhcp/class_serviceDHCP.inc:774
 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:788
+#: admin/systems/services/dhcp/class_serviceDHCP.inc:786
 msgid "Services"
 msgstr "TjÃ¤nster"
 
-#: admin/systems/services/dhcp/class_serviceDHCP.inc:795
+#: admin/systems/services/dhcp/class_serviceDHCP.inc:793
 msgid "Start service"
 msgstr "Starta tjÃ¤nsten"
 
-#: admin/systems/services/dhcp/class_serviceDHCP.inc:796
+#: admin/systems/services/dhcp/class_serviceDHCP.inc:794
 msgid "Stop service"
 msgstr "Stoppa tjÃ¤nsten"
 
-#: admin/systems/services/dhcp/class_serviceDHCP.inc:797
+#: admin/systems/services/dhcp/class_serviceDHCP.inc:795
 msgid "Restart service"
 msgstr "Starta om tjÃ¤nsten"
 
 #: admin/systems/services/dhcp/class_dhcpNetwork.inc:197
-#: admin/systems/services/dhcp/dhcp_network.tpl.c:14
 msgid "Broadcast"
 msgstr "Broadcast"
 
@@ -324,297 +304,17 @@ msgstr "DH"
 
 #: admin/systems/services/dhcp/class_dhcpTSigKey.inc:114
 #: admin/systems/services/dhcp/class_dhcpTSigKey.inc:127
-#: admin/systems/services/dhcp/dhcp_tsigkey.tpl.c:5
 msgid "Key name"
 msgstr "Nyckel-namn"
 
 #: admin/systems/services/dhcp/class_dhcpTSigKey.inc:118
-#: 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/serviceDHCP.tpl.c:2
-msgid ""
-"DHCP take over will take place when saving this entry. Choose 'Cancel' to "
-"abort."
-msgstr "Ã–vertagning av DHCP kommer att trÃ¤da i kraft nÃ¤r du sparar. VÃ¤lj 'Avbryt' fÃ¶r att avbryta."
-
-#: admin/systems/services/dhcp/serviceDHCP.tpl.c:5
-msgid "Take over dhcp configuration from following server"
-msgstr "Ta Ã¶ver DHCP-konfiguration frÃ¥n fÃ¶ljande server"
-
-#: admin/systems/services/dhcp/serviceDHCP.tpl.c:8
-msgid "DHCP sections"
-msgstr "DHCP-sektioner"
-
-#: 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/systems/services/dhcp/dhcp_subnet.tpl.c:11
-msgid "Range for dynamic address assignment"
-msgstr "Range fÃ¶r dynamisk adresstilldelning"
-
-#: admin/systems/services/dhcp/dhcp_dnszone.tpl.c:2
-msgid "DNS update zone"
-msgstr "DNS-uppdateringszon"
-
-#: 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/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/systems/services/dhcp/dhcp_tsigkey.tpl.c:8
-msgid "Name of Key"
-msgstr "Namn pÃ¥ nyckel"
-
-#: admin/systems/services/dhcp/dhcp_tsigkey.tpl.c:11
-msgid "Encryption method"
-msgstr "Krypteringsmetod"
-
-#: admin/systems/services/dhcp/dhcp_pool.tpl.c:8
-msgid "Name of pool"
-msgstr "Pool-namn"
-
-#: admin/systems/services/dhcp/dhcpNewSection.tpl.c:2
-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/systems/services/dhcp/dhcpNewSection.tpl.c:11
-msgid "Choose section type to create"
-msgstr "VÃ¤lj sektionstyp att skapa"
-
-#: admin/systems/services/dhcp/dhcpNewSection.tpl.c:14
-msgid "Create"
-msgstr "Skapa"
-
-#: admin/systems/services/dhcp/dhcp_advanced.tpl.c:2
-msgid "Hide advanced settings"
-msgstr "GÃ¶m avancerade instÃ¤llningar"
-
-#: admin/systems/services/dhcp/dhcp_advanced.tpl.c:5
-msgid "DHCP statements"
-msgstr "DHCP-statements"
-
-#: admin/systems/services/dhcp/dhcp_advanced.tpl.c:8
-msgid "DHCP options"
-msgstr "DHCP-alternativ"
-
-#: admin/systems/services/dhcp/dhcp_advanced.tpl.c:11
-msgid "Show advanced settings"
-msgstr "Visa avancerade instÃ¤llningar"
-
-#: admin/systems/services/dhcp/dhcp_host.tpl.c:8
-msgid "Name of host"
-msgstr "Namn pÃ¥ host"
-
-#: admin/systems/services/dhcp/dhcp_host.tpl.c:11
-msgid "Fixed address"
-msgstr "Fast adress"
-
-#: 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/systems/services/dhcp/dhcp_host.tpl.c:17
-msgid "Hardware type"
-msgstr "HÃ¥rdvarutyp"
-
-#: admin/systems/services/dhcp/dhcp_sharedNetwork.tpl.c:8
-msgid "Name for shared network"
-msgstr "Namn pÃ¥ delat nÃ¤tverk"
-
-#: admin/systems/services/dhcp/dhcp_sharedNetwork.tpl.c:11
-msgid "Server identifier"
-msgstr "Server-identifierare"
-
-#: 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/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/systems/services/dhcp/dhcp_sharedNetwork.tpl.c:20
-msgid "Authoritative server"
-msgstr "AuktoritÃ¤r server"
-
-#: admin/systems/services/dhcp/dhcp_sharedNetwork.tpl.c:23
-msgid "Leases"
-msgstr "Tilldelningar"
-
-#: 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/systems/services/dhcp/dhcp_sharedNetwork.tpl.c:47
-msgid "Minimum lease time"
-msgstr "Minimum lease-tid"
-
-#: admin/systems/services/dhcp/dhcp_sharedNetwork.tpl.c:53
-msgid "Access control"
-msgstr "Ã…tkomstkontroll"
-
-#: 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/systems/services/dhcp/dhcp_sharedNetwork.tpl.c:59
-msgid "Allow unknown clients"
-msgstr "TillÃ¥t okÃ¤nda klienter"
-
-#: 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"
-
-#: admin/systems/services/dhcp/dhcp_sharedNetwork.tpl.c:65
-msgid "Allow bootp clients"
-msgstr "TillÃ¥t bootp-klienter"
-
-#: 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"
-
-#: admin/systems/services/dhcp/dhcp_sharedNetwork.tpl.c:71
-msgid "Allow booting"
-msgstr "TillÃ¥t boot"
diff --git a/dhcp/locale/ug/fusiondirectory.po b/dhcp/locale/ug/fusiondirectory.po
index d0a7fb16e474b41673dad684291cad42b0dc8789..b3b82dfdcf2c8b0e6255ef65cf59f0d0d11d54a3 100644
--- a/dhcp/locale/ug/fusiondirectory.po
+++ b/dhcp/locale/ug/fusiondirectory.po
@@ -5,12 +5,12 @@
 # Translators:
 msgid ""
 msgstr ""
-"Project-Id-Version: FusionDirectory-108\n"
+"Project-Id-Version: FusionDirectory-109\n"
 "Report-Msgid-Bugs-To: documentation@lists.fusiondirectory.org\n"
-"POT-Creation-Date: 2015-03-19 21:45+0100\n"
-"PO-Revision-Date: 2015-02-25 15:44+0000\n"
+"POT-Creation-Date: 2014-12-15 17:47+0100\n"
+"PO-Revision-Date: 2014-12-15 16:51+0000\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>\n"
-"Language-Team: Uighur (http://www.transifex.com/projects/p/FusionDirectory-108/language/ug/)\n"
+"Language-Team: Uighur (http://www.transifex.com/projects/p/FusionDirectory-109/language/ug/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -19,7 +19,7 @@ msgstr ""
 
 #: admin/systems/services/dhcp/class_dhcpAdvanced.inc:59
 #: admin/systems/services/dhcp/class_dhcpAdvanced.inc:73
-#: admin/systems/services/dhcp/class_serviceDHCP.inc:776
+#: admin/systems/services/dhcp/class_serviceDHCP.inc:774
 #: admin/systems/services/dhcp/class_dhcpNetwork.inc:48
 msgid "Error"
 msgstr ""
@@ -52,10 +52,6 @@ msgstr ""
 #: 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 ""
 
@@ -64,7 +60,6 @@ msgstr ""
 #: 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 ""
 
@@ -75,15 +70,12 @@ 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 ""
 
@@ -94,7 +86,7 @@ msgstr ""
 #: admin/systems/services/dhcp/class_dhcpNewSectionDialog.inc:48
 #: admin/systems/services/dhcp/class_serviceDHCP.inc:62
 #: admin/systems/services/dhcp/class_serviceDHCP.inc:103
-#: admin/systems/services/dhcp/class_serviceDHCP.inc:731
+#: admin/systems/services/dhcp/class_serviceDHCP.inc:729
 msgid "Global options"
 msgstr ""
 
@@ -135,7 +127,6 @@ msgstr ""
 
 #: admin/systems/services/dhcp/class_dhcpNewSectionDialog.inc:56
 #: admin/systems/services/dhcp/class_serviceDHCP.inc:71
-#: admin/systems/services/dhcp/dhcp_tsigkey.tpl.c:2
 msgid "DNS update key"
 msgstr ""
 
@@ -145,18 +136,14 @@ msgid "DNS update zones"
 msgstr ""
 
 #: admin/systems/services/dhcp/class_dhcpDnsZone.inc:150
-#: admin/systems/services/dhcp/dhcp_dnszone.tpl.c:5
 msgid "DNS zone"
 msgstr ""
 
 #: admin/systems/services/dhcp/class_dhcpDnsZone.inc:154
-#: 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:158
-#: admin/systems/services/dhcp/dhcp_dnszone.tpl.c:11
 msgid "Key DN"
 msgstr ""
 
@@ -173,7 +160,6 @@ msgid "Token Ring"
 msgstr ""
 
 #: admin/systems/services/dhcp/class_dhcpHost.inc:149
-#: admin/systems/services/dhcp/dhcp_host.tpl.c:20
 msgid "Hardware address"
 msgstr ""
 
@@ -187,20 +173,17 @@ 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_dhcpService.inc:134
-#: admin/systems/services/dhcp/dhcp_sharedNetwork.tpl.c:38
 msgid "Maximum lease time"
 msgstr ""
 
 #: admin/systems/services/dhcp/class_serviceDHCP.inc:59
-#: admin/systems/services/dhcp/class_serviceDHCP.inc:787
-#: admin/systems/services/dhcp/class_serviceDHCP.inc:788
-#: admin/systems/services/dhcp/class_serviceDHCP.inc:830
+#: admin/systems/services/dhcp/class_serviceDHCP.inc:785
+#: admin/systems/services/dhcp/class_serviceDHCP.inc:786
+#: admin/systems/services/dhcp/class_serviceDHCP.inc:828
 msgid "DHCP service"
 msgstr ""
 
@@ -224,75 +207,73 @@ msgid "The migration will be started when you save this system."
 msgstr ""
 
 #: admin/systems/services/dhcp/class_serviceDHCP.inc:154
-#: admin/systems/services/dhcp/remove_dhcp.tpl.c:2
 msgid "Warning"
 msgstr ""
 
-#: admin/systems/services/dhcp/class_serviceDHCP.inc:247
+#: admin/systems/services/dhcp/class_serviceDHCP.inc:246
 msgid "Permission error"
 msgstr ""
 
-#: admin/systems/services/dhcp/class_serviceDHCP.inc:284
+#: admin/systems/services/dhcp/class_serviceDHCP.inc:283
 msgid "DHCP section"
 msgstr ""
 
-#: admin/systems/services/dhcp/class_serviceDHCP.inc:340
-#: admin/systems/services/dhcp/class_serviceDHCP.inc:343
+#: admin/systems/services/dhcp/class_serviceDHCP.inc:339
+#: admin/systems/services/dhcp/class_serviceDHCP.inc:342
 msgid "Insert new DHCP section"
 msgstr ""
 
-#: admin/systems/services/dhcp/class_serviceDHCP.inc:341
+#: admin/systems/services/dhcp/class_serviceDHCP.inc:340
+#: admin/systems/services/dhcp/class_serviceDHCP.inc:343
 #: admin/systems/services/dhcp/class_serviceDHCP.inc:344
-#: admin/systems/services/dhcp/class_serviceDHCP.inc:345
 msgid "Edit DHCP section"
 msgstr ""
 
-#: admin/systems/services/dhcp/class_serviceDHCP.inc:342
-#: admin/systems/services/dhcp/class_serviceDHCP.inc:346
+#: admin/systems/services/dhcp/class_serviceDHCP.inc:341
+#: admin/systems/services/dhcp/class_serviceDHCP.inc:345
 msgid "Remove DHCP section"
 msgstr ""
 
-#: admin/systems/services/dhcp/class_serviceDHCP.inc:347
+#: admin/systems/services/dhcp/class_serviceDHCP.inc:346
 msgid "Expand DHCP subnet"
 msgstr ""
 
-#: admin/systems/services/dhcp/class_serviceDHCP.inc:348
+#: admin/systems/services/dhcp/class_serviceDHCP.inc:347
 msgid "Fold DHCP subnet"
 msgstr ""
 
-#: admin/systems/services/dhcp/class_serviceDHCP.inc:425
-#: admin/systems/services/dhcp/class_serviceDHCP.inc:442
-#: admin/systems/services/dhcp/class_serviceDHCP.inc:497
-#: admin/systems/services/dhcp/class_serviceDHCP.inc:573
-#: admin/systems/services/dhcp/class_serviceDHCP.inc:581
-#: admin/systems/services/dhcp/class_serviceDHCP.inc:608
+#: admin/systems/services/dhcp/class_serviceDHCP.inc:422
+#: admin/systems/services/dhcp/class_serviceDHCP.inc:439
+#: admin/systems/services/dhcp/class_serviceDHCP.inc:494
+#: admin/systems/services/dhcp/class_serviceDHCP.inc:570
+#: admin/systems/services/dhcp/class_serviceDHCP.inc:578
+#: admin/systems/services/dhcp/class_serviceDHCP.inc:605
 msgid "LDAP error"
 msgstr ""
 
-#: admin/systems/services/dhcp/class_serviceDHCP.inc:776
+#: admin/systems/services/dhcp/class_serviceDHCP.inc:774
 msgid ""
 "The DHCP configuration set is unkown. Please contact your system "
 "administrator."
 msgstr ""
 
-#: admin/systems/services/dhcp/class_serviceDHCP.inc:788
+#: admin/systems/services/dhcp/class_serviceDHCP.inc:786
 msgid "Services"
 msgstr ""
 
-#: admin/systems/services/dhcp/class_serviceDHCP.inc:795
+#: admin/systems/services/dhcp/class_serviceDHCP.inc:793
 msgid "Start service"
 msgstr ""
 
-#: admin/systems/services/dhcp/class_serviceDHCP.inc:796
+#: admin/systems/services/dhcp/class_serviceDHCP.inc:794
 msgid "Stop service"
 msgstr ""
 
-#: admin/systems/services/dhcp/class_serviceDHCP.inc:797
+#: admin/systems/services/dhcp/class_serviceDHCP.inc:795
 msgid "Restart service"
 msgstr ""
 
 #: admin/systems/services/dhcp/class_dhcpNetwork.inc:197
-#: admin/systems/services/dhcp/dhcp_network.tpl.c:14
 msgid "Broadcast"
 msgstr ""
 
@@ -323,297 +304,17 @@ msgstr ""
 
 #: admin/systems/services/dhcp/class_dhcpTSigKey.inc:114
 #: admin/systems/services/dhcp/class_dhcpTSigKey.inc:127
-#: admin/systems/services/dhcp/dhcp_tsigkey.tpl.c:5
 msgid "Key name"
 msgstr ""
 
 #: admin/systems/services/dhcp/class_dhcpTSigKey.inc:118
-#: 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/serviceDHCP.tpl.c:2
-msgid ""
-"DHCP take over will take place when saving this entry. Choose 'Cancel' to "
-"abort."
-msgstr ""
-
-#: admin/systems/services/dhcp/serviceDHCP.tpl.c:5
-msgid "Take over dhcp configuration from following server"
-msgstr ""
-
-#: admin/systems/services/dhcp/serviceDHCP.tpl.c:8
-msgid "DHCP sections"
-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 ""
-
-#: 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"
-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 ""
-
-#: 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 ""
-
-#: 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"
-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
-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 ""
-
-#: 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"
-msgstr ""
-
-#: admin/systems/services/dhcp/dhcp_advanced.tpl.c:11
-msgid "Show advanced settings"
-msgstr ""
-
-#: admin/systems/services/dhcp/dhcp_host.tpl.c:8
-msgid "Name of host"
-msgstr ""
-
-#: admin/systems/services/dhcp/dhcp_host.tpl.c:11
-msgid "Fixed address"
-msgstr ""
-
-#: admin/systems/services/dhcp/dhcp_host.tpl.c:14
-msgid "Use hostname or IP-address to assign fixed address"
-msgstr ""
-
-#: admin/systems/services/dhcp/dhcp_host.tpl.c:17
-msgid "Hardware type"
-msgstr ""
-
-#: admin/systems/services/dhcp/dhcp_sharedNetwork.tpl.c:8
-msgid "Name for shared network"
-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"
-msgstr ""
-
-#: admin/systems/services/dhcp/dhcp_sharedNetwork.tpl.c:17
-msgid "Select if this server is authoritative for this shared network"
-msgstr ""
-
-#: admin/systems/services/dhcp/dhcp_sharedNetwork.tpl.c:20
-msgid "Authoritative server"
-msgstr ""
-
-#: admin/systems/services/dhcp/dhcp_sharedNetwork.tpl.c:23
-msgid "Leases"
-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 ""
-
-#: 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"
-msgstr ""
-
-#: admin/systems/services/dhcp/dhcp_sharedNetwork.tpl.c:65
-msgid "Allow bootp clients"
-msgstr ""
-
-#: admin/systems/services/dhcp/dhcp_sharedNetwork.tpl.c:68
-msgid "Select if clients are allowed to boot using this DHCP server"
-msgstr ""
-
-#: admin/systems/services/dhcp/dhcp_sharedNetwork.tpl.c:71
-msgid "Allow booting"
-msgstr ""
diff --git a/dhcp/locale/vi_VN/fusiondirectory.po b/dhcp/locale/vi_VN/fusiondirectory.po
index 693fc574753d4596ddd13bda0d9bee9d458e92e4..b476fe299d5eb79fb347ef01229fdcd2e09cbd2c 100644
--- a/dhcp/locale/vi_VN/fusiondirectory.po
+++ b/dhcp/locale/vi_VN/fusiondirectory.po
@@ -5,12 +5,12 @@
 # Translators:
 msgid ""
 msgstr ""
-"Project-Id-Version: FusionDirectory-108\n"
+"Project-Id-Version: FusionDirectory-109\n"
 "Report-Msgid-Bugs-To: documentation@lists.fusiondirectory.org\n"
-"POT-Creation-Date: 2015-03-19 21:45+0100\n"
-"PO-Revision-Date: 2015-02-25 16:12+0000\n"
+"POT-Creation-Date: 2014-12-15 17:47+0100\n"
+"PO-Revision-Date: 2015-02-25 16:04+0000\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>\n"
-"Language-Team: Vietnamese (Viet Nam) (http://www.transifex.com/projects/p/FusionDirectory-108/language/vi_VN/)\n"
+"Language-Team: Vietnamese (Viet Nam) (http://www.transifex.com/projects/p/FusionDirectory-109/language/vi_VN/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -19,7 +19,7 @@ msgstr ""
 
 #: admin/systems/services/dhcp/class_dhcpAdvanced.inc:59
 #: admin/systems/services/dhcp/class_dhcpAdvanced.inc:73
-#: admin/systems/services/dhcp/class_serviceDHCP.inc:776
+#: admin/systems/services/dhcp/class_serviceDHCP.inc:774
 #: admin/systems/services/dhcp/class_dhcpNetwork.inc:48
 msgid "Error"
 msgstr "Lá»—i"
@@ -52,10 +52,6 @@ msgstr "tá»± Ä‘á»™ng"
 #: 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"
 
@@ -64,7 +60,6 @@ msgstr "TÃªn"
 #: 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 ""
 
@@ -75,15 +70,12 @@ 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 ""
 
@@ -94,7 +86,7 @@ msgstr ""
 #: admin/systems/services/dhcp/class_dhcpNewSectionDialog.inc:48
 #: admin/systems/services/dhcp/class_serviceDHCP.inc:62
 #: admin/systems/services/dhcp/class_serviceDHCP.inc:103
-#: admin/systems/services/dhcp/class_serviceDHCP.inc:731
+#: admin/systems/services/dhcp/class_serviceDHCP.inc:729
 msgid "Global options"
 msgstr ""
 
@@ -135,7 +127,6 @@ msgstr ""
 
 #: admin/systems/services/dhcp/class_dhcpNewSectionDialog.inc:56
 #: admin/systems/services/dhcp/class_serviceDHCP.inc:71
-#: admin/systems/services/dhcp/dhcp_tsigkey.tpl.c:2
 msgid "DNS update key"
 msgstr ""
 
@@ -145,18 +136,14 @@ msgid "DNS update zones"
 msgstr ""
 
 #: admin/systems/services/dhcp/class_dhcpDnsZone.inc:150
-#: admin/systems/services/dhcp/dhcp_dnszone.tpl.c:5
 msgid "DNS zone"
 msgstr ""
 
 #: admin/systems/services/dhcp/class_dhcpDnsZone.inc:154
-#: 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:158
-#: admin/systems/services/dhcp/dhcp_dnszone.tpl.c:11
 msgid "Key DN"
 msgstr ""
 
@@ -173,7 +160,6 @@ msgid "Token Ring"
 msgstr ""
 
 #: admin/systems/services/dhcp/class_dhcpHost.inc:149
-#: admin/systems/services/dhcp/dhcp_host.tpl.c:20
 msgid "Hardware address"
 msgstr ""
 
@@ -187,20 +173,17 @@ 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_dhcpService.inc:134
-#: admin/systems/services/dhcp/dhcp_sharedNetwork.tpl.c:38
 msgid "Maximum lease time"
 msgstr ""
 
 #: admin/systems/services/dhcp/class_serviceDHCP.inc:59
-#: admin/systems/services/dhcp/class_serviceDHCP.inc:787
-#: admin/systems/services/dhcp/class_serviceDHCP.inc:788
-#: admin/systems/services/dhcp/class_serviceDHCP.inc:830
+#: admin/systems/services/dhcp/class_serviceDHCP.inc:785
+#: admin/systems/services/dhcp/class_serviceDHCP.inc:786
+#: admin/systems/services/dhcp/class_serviceDHCP.inc:828
 msgid "DHCP service"
 msgstr ""
 
@@ -224,75 +207,73 @@ msgid "The migration will be started when you save this system."
 msgstr ""
 
 #: admin/systems/services/dhcp/class_serviceDHCP.inc:154
-#: admin/systems/services/dhcp/remove_dhcp.tpl.c:2
 msgid "Warning"
 msgstr "Cáº£nh bÃ¡o"
 
-#: admin/systems/services/dhcp/class_serviceDHCP.inc:247
+#: admin/systems/services/dhcp/class_serviceDHCP.inc:246
 msgid "Permission error"
 msgstr "Lá»—i vá» cáº¥p phÃ©p"
 
-#: admin/systems/services/dhcp/class_serviceDHCP.inc:284
+#: admin/systems/services/dhcp/class_serviceDHCP.inc:283
 msgid "DHCP section"
 msgstr ""
 
-#: admin/systems/services/dhcp/class_serviceDHCP.inc:340
-#: admin/systems/services/dhcp/class_serviceDHCP.inc:343
+#: admin/systems/services/dhcp/class_serviceDHCP.inc:339
+#: admin/systems/services/dhcp/class_serviceDHCP.inc:342
 msgid "Insert new DHCP section"
 msgstr ""
 
-#: admin/systems/services/dhcp/class_serviceDHCP.inc:341
+#: admin/systems/services/dhcp/class_serviceDHCP.inc:340
+#: admin/systems/services/dhcp/class_serviceDHCP.inc:343
 #: admin/systems/services/dhcp/class_serviceDHCP.inc:344
-#: admin/systems/services/dhcp/class_serviceDHCP.inc:345
 msgid "Edit DHCP section"
 msgstr ""
 
-#: admin/systems/services/dhcp/class_serviceDHCP.inc:342
-#: admin/systems/services/dhcp/class_serviceDHCP.inc:346
+#: admin/systems/services/dhcp/class_serviceDHCP.inc:341
+#: admin/systems/services/dhcp/class_serviceDHCP.inc:345
 msgid "Remove DHCP section"
 msgstr ""
 
-#: admin/systems/services/dhcp/class_serviceDHCP.inc:347
+#: admin/systems/services/dhcp/class_serviceDHCP.inc:346
 msgid "Expand DHCP subnet"
 msgstr ""
 
-#: admin/systems/services/dhcp/class_serviceDHCP.inc:348
+#: admin/systems/services/dhcp/class_serviceDHCP.inc:347
 msgid "Fold DHCP subnet"
 msgstr ""
 
-#: admin/systems/services/dhcp/class_serviceDHCP.inc:425
-#: admin/systems/services/dhcp/class_serviceDHCP.inc:442
-#: admin/systems/services/dhcp/class_serviceDHCP.inc:497
-#: admin/systems/services/dhcp/class_serviceDHCP.inc:573
-#: admin/systems/services/dhcp/class_serviceDHCP.inc:581
-#: admin/systems/services/dhcp/class_serviceDHCP.inc:608
+#: admin/systems/services/dhcp/class_serviceDHCP.inc:422
+#: admin/systems/services/dhcp/class_serviceDHCP.inc:439
+#: admin/systems/services/dhcp/class_serviceDHCP.inc:494
+#: admin/systems/services/dhcp/class_serviceDHCP.inc:570
+#: admin/systems/services/dhcp/class_serviceDHCP.inc:578
+#: admin/systems/services/dhcp/class_serviceDHCP.inc:605
 msgid "LDAP error"
 msgstr "Lá»—i LDAP"
 
-#: admin/systems/services/dhcp/class_serviceDHCP.inc:776
+#: admin/systems/services/dhcp/class_serviceDHCP.inc:774
 msgid ""
 "The DHCP configuration set is unkown. Please contact your system "
 "administrator."
 msgstr ""
 
-#: admin/systems/services/dhcp/class_serviceDHCP.inc:788
+#: admin/systems/services/dhcp/class_serviceDHCP.inc:786
 msgid "Services"
 msgstr ""
 
-#: admin/systems/services/dhcp/class_serviceDHCP.inc:795
+#: admin/systems/services/dhcp/class_serviceDHCP.inc:793
 msgid "Start service"
 msgstr ""
 
-#: admin/systems/services/dhcp/class_serviceDHCP.inc:796
+#: admin/systems/services/dhcp/class_serviceDHCP.inc:794
 msgid "Stop service"
 msgstr ""
 
-#: admin/systems/services/dhcp/class_serviceDHCP.inc:797
+#: admin/systems/services/dhcp/class_serviceDHCP.inc:795
 msgid "Restart service"
 msgstr ""
 
 #: admin/systems/services/dhcp/class_dhcpNetwork.inc:197
-#: admin/systems/services/dhcp/dhcp_network.tpl.c:14
 msgid "Broadcast"
 msgstr ""
 
@@ -323,297 +304,17 @@ msgstr ""
 
 #: admin/systems/services/dhcp/class_dhcpTSigKey.inc:114
 #: admin/systems/services/dhcp/class_dhcpTSigKey.inc:127
-#: admin/systems/services/dhcp/dhcp_tsigkey.tpl.c:5
 msgid "Key name"
 msgstr ""
 
 #: admin/systems/services/dhcp/class_dhcpTSigKey.inc:118
-#: 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/serviceDHCP.tpl.c:2
-msgid ""
-"DHCP take over will take place when saving this entry. Choose 'Cancel' to "
-"abort."
-msgstr ""
-
-#: admin/systems/services/dhcp/serviceDHCP.tpl.c:5
-msgid "Take over dhcp configuration from following server"
-msgstr ""
-
-#: admin/systems/services/dhcp/serviceDHCP.tpl.c:8
-msgid "DHCP sections"
-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"
-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 ""
-
-#: 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 ""
-
-#: 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"
-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
-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"
-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 "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"
-msgstr ""
-
-#: admin/systems/services/dhcp/dhcp_advanced.tpl.c:8
-msgid "DHCP options"
-msgstr ""
-
-#: admin/systems/services/dhcp/dhcp_advanced.tpl.c:11
-msgid "Show advanced settings"
-msgstr ""
-
-#: admin/systems/services/dhcp/dhcp_host.tpl.c:8
-msgid "Name of host"
-msgstr ""
-
-#: admin/systems/services/dhcp/dhcp_host.tpl.c:11
-msgid "Fixed address"
-msgstr ""
-
-#: admin/systems/services/dhcp/dhcp_host.tpl.c:14
-msgid "Use hostname or IP-address to assign fixed address"
-msgstr ""
-
-#: admin/systems/services/dhcp/dhcp_host.tpl.c:17
-msgid "Hardware type"
-msgstr ""
-
-#: admin/systems/services/dhcp/dhcp_sharedNetwork.tpl.c:8
-msgid "Name for shared network"
-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"
-msgstr ""
-
-#: admin/systems/services/dhcp/dhcp_sharedNetwork.tpl.c:17
-msgid "Select if this server is authoritative for this shared network"
-msgstr ""
-
-#: admin/systems/services/dhcp/dhcp_sharedNetwork.tpl.c:20
-msgid "Authoritative server"
-msgstr ""
-
-#: admin/systems/services/dhcp/dhcp_sharedNetwork.tpl.c:23
-msgid "Leases"
-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 "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"
-msgstr ""
-
-#: 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"
-msgstr ""
-
-#: admin/systems/services/dhcp/dhcp_sharedNetwork.tpl.c:65
-msgid "Allow bootp clients"
-msgstr ""
-
-#: admin/systems/services/dhcp/dhcp_sharedNetwork.tpl.c:68
-msgid "Select if clients are allowed to boot using this DHCP server"
-msgstr ""
-
-#: admin/systems/services/dhcp/dhcp_sharedNetwork.tpl.c:71
-msgid "Allow booting"
-msgstr ""
diff --git a/dhcp/locale/zh/fusiondirectory.po b/dhcp/locale/zh/fusiondirectory.po
index daa2c6397ed1a4acbf6fb24ccaa083a642ef587a..5a9f78d72a127dd2978bef3d3362a99f74870c13 100644
--- a/dhcp/locale/zh/fusiondirectory.po
+++ b/dhcp/locale/zh/fusiondirectory.po
@@ -3,15 +3,14 @@
 # This file is distributed under the same license as the PACKAGE package.
 # 
 # Translators:
-#  Jiang Xin <worldhello.net@gmail.com>, 2007
 msgid ""
 msgstr ""
-"Project-Id-Version: FusionDirectory-108\n"
+"Project-Id-Version: FusionDirectory-109\n"
 "Report-Msgid-Bugs-To: documentation@lists.fusiondirectory.org\n"
-"POT-Creation-Date: 2015-03-19 21:45+0100\n"
-"PO-Revision-Date: 2015-02-25 16:12+0000\n"
+"POT-Creation-Date: 2014-12-15 17:47+0100\n"
+"PO-Revision-Date: 2015-02-25 16:04+0000\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>\n"
-"Language-Team: Chinese (http://www.transifex.com/projects/p/FusionDirectory-108/language/zh/)\n"
+"Language-Team: Chinese (http://www.transifex.com/projects/p/FusionDirectory-109/language/zh/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -20,7 +19,7 @@ msgstr ""
 
 #: admin/systems/services/dhcp/class_dhcpAdvanced.inc:59
 #: admin/systems/services/dhcp/class_dhcpAdvanced.inc:73
-#: admin/systems/services/dhcp/class_serviceDHCP.inc:776
+#: admin/systems/services/dhcp/class_serviceDHCP.inc:774
 #: admin/systems/services/dhcp/class_dhcpNetwork.inc:48
 msgid "Error"
 msgstr "é”™è¯¯"
@@ -53,10 +52,6 @@ msgstr "è‡ªåŠ¨"
 #: 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 "åç§°"
 
@@ -65,7 +60,6 @@ msgstr "åç§°"
 #: 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 ""
 
@@ -76,15 +70,12 @@ 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 ""
 
@@ -95,7 +86,7 @@ msgstr ""
 #: admin/systems/services/dhcp/class_dhcpNewSectionDialog.inc:48
 #: admin/systems/services/dhcp/class_serviceDHCP.inc:62
 #: admin/systems/services/dhcp/class_serviceDHCP.inc:103
-#: admin/systems/services/dhcp/class_serviceDHCP.inc:731
+#: admin/systems/services/dhcp/class_serviceDHCP.inc:729
 msgid "Global options"
 msgstr ""
 
@@ -136,7 +127,6 @@ msgstr ""
 
 #: admin/systems/services/dhcp/class_dhcpNewSectionDialog.inc:56
 #: admin/systems/services/dhcp/class_serviceDHCP.inc:71
-#: admin/systems/services/dhcp/dhcp_tsigkey.tpl.c:2
 msgid "DNS update key"
 msgstr ""
 
@@ -146,18 +136,14 @@ msgid "DNS update zones"
 msgstr ""
 
 #: admin/systems/services/dhcp/class_dhcpDnsZone.inc:150
-#: admin/systems/services/dhcp/dhcp_dnszone.tpl.c:5
 msgid "DNS zone"
 msgstr ""
 
 #: admin/systems/services/dhcp/class_dhcpDnsZone.inc:154
-#: 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:158
-#: admin/systems/services/dhcp/dhcp_dnszone.tpl.c:11
 msgid "Key DN"
 msgstr ""
 
@@ -174,7 +160,6 @@ msgid "Token Ring"
 msgstr ""
 
 #: admin/systems/services/dhcp/class_dhcpHost.inc:149
-#: admin/systems/services/dhcp/dhcp_host.tpl.c:20
 msgid "Hardware address"
 msgstr ""
 
@@ -188,20 +173,17 @@ 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_dhcpService.inc:134
-#: admin/systems/services/dhcp/dhcp_sharedNetwork.tpl.c:38
 msgid "Maximum lease time"
 msgstr ""
 
 #: admin/systems/services/dhcp/class_serviceDHCP.inc:59
-#: admin/systems/services/dhcp/class_serviceDHCP.inc:787
-#: admin/systems/services/dhcp/class_serviceDHCP.inc:788
-#: admin/systems/services/dhcp/class_serviceDHCP.inc:830
+#: admin/systems/services/dhcp/class_serviceDHCP.inc:785
+#: admin/systems/services/dhcp/class_serviceDHCP.inc:786
+#: admin/systems/services/dhcp/class_serviceDHCP.inc:828
 msgid "DHCP service"
 msgstr ""
 
@@ -225,75 +207,73 @@ msgid "The migration will be started when you save this system."
 msgstr ""
 
 #: admin/systems/services/dhcp/class_serviceDHCP.inc:154
-#: admin/systems/services/dhcp/remove_dhcp.tpl.c:2
 msgid "Warning"
 msgstr "è¦å‘Š"
 
-#: admin/systems/services/dhcp/class_serviceDHCP.inc:247
+#: admin/systems/services/dhcp/class_serviceDHCP.inc:246
 msgid "Permission error"
 msgstr ""
 
-#: admin/systems/services/dhcp/class_serviceDHCP.inc:284
+#: admin/systems/services/dhcp/class_serviceDHCP.inc:283
 msgid "DHCP section"
 msgstr ""
 
-#: admin/systems/services/dhcp/class_serviceDHCP.inc:340
-#: admin/systems/services/dhcp/class_serviceDHCP.inc:343
+#: admin/systems/services/dhcp/class_serviceDHCP.inc:339
+#: admin/systems/services/dhcp/class_serviceDHCP.inc:342
 msgid "Insert new DHCP section"
 msgstr ""
 
-#: admin/systems/services/dhcp/class_serviceDHCP.inc:341
+#: admin/systems/services/dhcp/class_serviceDHCP.inc:340
+#: admin/systems/services/dhcp/class_serviceDHCP.inc:343
 #: admin/systems/services/dhcp/class_serviceDHCP.inc:344
-#: admin/systems/services/dhcp/class_serviceDHCP.inc:345
 msgid "Edit DHCP section"
 msgstr ""
 
-#: admin/systems/services/dhcp/class_serviceDHCP.inc:342
-#: admin/systems/services/dhcp/class_serviceDHCP.inc:346
+#: admin/systems/services/dhcp/class_serviceDHCP.inc:341
+#: admin/systems/services/dhcp/class_serviceDHCP.inc:345
 msgid "Remove DHCP section"
 msgstr ""
 
-#: admin/systems/services/dhcp/class_serviceDHCP.inc:347
+#: admin/systems/services/dhcp/class_serviceDHCP.inc:346
 msgid "Expand DHCP subnet"
 msgstr ""
 
-#: admin/systems/services/dhcp/class_serviceDHCP.inc:348
+#: admin/systems/services/dhcp/class_serviceDHCP.inc:347
 msgid "Fold DHCP subnet"
 msgstr ""
 
-#: admin/systems/services/dhcp/class_serviceDHCP.inc:425
-#: admin/systems/services/dhcp/class_serviceDHCP.inc:442
-#: admin/systems/services/dhcp/class_serviceDHCP.inc:497
-#: admin/systems/services/dhcp/class_serviceDHCP.inc:573
-#: admin/systems/services/dhcp/class_serviceDHCP.inc:581
-#: admin/systems/services/dhcp/class_serviceDHCP.inc:608
+#: admin/systems/services/dhcp/class_serviceDHCP.inc:422
+#: admin/systems/services/dhcp/class_serviceDHCP.inc:439
+#: admin/systems/services/dhcp/class_serviceDHCP.inc:494
+#: admin/systems/services/dhcp/class_serviceDHCP.inc:570
+#: admin/systems/services/dhcp/class_serviceDHCP.inc:578
+#: admin/systems/services/dhcp/class_serviceDHCP.inc:605
 msgid "LDAP error"
 msgstr "LDAP é”™è¯¯"
 
-#: admin/systems/services/dhcp/class_serviceDHCP.inc:776
+#: admin/systems/services/dhcp/class_serviceDHCP.inc:774
 msgid ""
 "The DHCP configuration set is unkown. Please contact your system "
 "administrator."
 msgstr ""
 
-#: admin/systems/services/dhcp/class_serviceDHCP.inc:788
+#: admin/systems/services/dhcp/class_serviceDHCP.inc:786
 msgid "Services"
 msgstr "æœåŠ¡"
 
-#: admin/systems/services/dhcp/class_serviceDHCP.inc:795
+#: admin/systems/services/dhcp/class_serviceDHCP.inc:793
 msgid "Start service"
 msgstr ""
 
-#: admin/systems/services/dhcp/class_serviceDHCP.inc:796
+#: admin/systems/services/dhcp/class_serviceDHCP.inc:794
 msgid "Stop service"
 msgstr ""
 
-#: admin/systems/services/dhcp/class_serviceDHCP.inc:797
+#: admin/systems/services/dhcp/class_serviceDHCP.inc:795
 msgid "Restart service"
 msgstr ""
 
 #: admin/systems/services/dhcp/class_dhcpNetwork.inc:197
-#: admin/systems/services/dhcp/dhcp_network.tpl.c:14
 msgid "Broadcast"
 msgstr ""
 
@@ -324,297 +304,17 @@ msgstr ""
 
 #: admin/systems/services/dhcp/class_dhcpTSigKey.inc:114
 #: admin/systems/services/dhcp/class_dhcpTSigKey.inc:127
-#: admin/systems/services/dhcp/dhcp_tsigkey.tpl.c:5
 msgid "Key name"
 msgstr ""
 
 #: admin/systems/services/dhcp/class_dhcpTSigKey.inc:118
-#: 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/serviceDHCP.tpl.c:2
-msgid ""
-"DHCP take over will take place when saving this entry. Choose 'Cancel' to "
-"abort."
-msgstr ""
-
-#: admin/systems/services/dhcp/serviceDHCP.tpl.c:5
-msgid "Take over dhcp configuration from following server"
-msgstr ""
-
-#: admin/systems/services/dhcp/serviceDHCP.tpl.c:8
-msgid "DHCP sections"
-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 ""
-
-#: 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"
-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 ""
-
-#: 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 ""
-
-#: 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"
-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
-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."
-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"
-msgstr ""
-
-#: admin/systems/services/dhcp/dhcp_advanced.tpl.c:11
-msgid "Show advanced settings"
-msgstr ""
-
-#: admin/systems/services/dhcp/dhcp_host.tpl.c:8
-msgid "Name of host"
-msgstr ""
-
-#: admin/systems/services/dhcp/dhcp_host.tpl.c:11
-msgid "Fixed address"
-msgstr ""
-
-#: admin/systems/services/dhcp/dhcp_host.tpl.c:14
-msgid "Use hostname or IP-address to assign fixed address"
-msgstr ""
-
-#: admin/systems/services/dhcp/dhcp_host.tpl.c:17
-msgid "Hardware type"
-msgstr ""
-
-#: admin/systems/services/dhcp/dhcp_sharedNetwork.tpl.c:8
-msgid "Name for shared network"
-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"
-msgstr ""
-
-#: admin/systems/services/dhcp/dhcp_sharedNetwork.tpl.c:17
-msgid "Select if this server is authoritative for this shared network"
-msgstr ""
-
-#: admin/systems/services/dhcp/dhcp_sharedNetwork.tpl.c:20
-msgid "Authoritative server"
-msgstr ""
-
-#: admin/systems/services/dhcp/dhcp_sharedNetwork.tpl.c:23
-msgid "Leases"
-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 ""
-
-#: 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"
-msgstr ""
-
-#: admin/systems/services/dhcp/dhcp_sharedNetwork.tpl.c:65
-msgid "Allow bootp clients"
-msgstr ""
-
-#: admin/systems/services/dhcp/dhcp_sharedNetwork.tpl.c:68
-msgid "Select if clients are allowed to boot using this DHCP server"
-msgstr ""
-
-#: admin/systems/services/dhcp/dhcp_sharedNetwork.tpl.c:71
-msgid "Allow booting"
-msgstr ""
diff --git a/dns/locale/ar/fusiondirectory.po b/dns/locale/ar/fusiondirectory.po
index 7b6d55ea53092be2e109af40c2477e1341290df1..dafb82db62fac24e6a284357344a2e6a25f6b24f 100644
--- a/dns/locale/ar/fusiondirectory.po
+++ b/dns/locale/ar/fusiondirectory.po
@@ -5,29 +5,19 @@
 # Translators:
 msgid ""
 msgstr ""
-"Project-Id-Version: FusionDirectory-108\n"
+"Project-Id-Version: FusionDirectory-109\n"
 "Report-Msgid-Bugs-To: documentation@lists.fusiondirectory.org\n"
-"POT-Creation-Date: 2015-03-19 21:45+0100\n"
-"PO-Revision-Date: 2015-02-25 16:02+0000\n"
+"POT-Creation-Date: 2014-12-15 17:47+0100\n"
+"PO-Revision-Date: 2015-02-25 16:04+0000\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>\n"
-"Language-Team: Arabic (http://www.transifex.com/projects/p/FusionDirectory-108/language/ar/)\n"
+"Language-Team: Arabic (http://www.transifex.com/projects/p/FusionDirectory-109/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/services/dns/class_serviceDNS.inc:45
-#: admin/systems/services/dns/class_serviceDNS.inc:386
-#: admin/systems/services/dns/class_serviceDNS.inc:394
-#: admin/systems/services/dns/class_serviceDNS.inc:395
-msgid "DNS service"
-msgstr ""
-
-#: admin/systems/services/dns/class_serviceDNS.inc:101
-#: admin/systems/services/dns/class_serviceDNS.inc:258
-#: admin/systems/services/dns/class_serviceDNS.inc:271
-#: admin/systems/services/dns/class_serviceDNS.inc:277
+#: admin/systems/services/dns/class_serviceDNS.inc:49
 #: admin/systems/services/dns/class_DNS.inc:167
 #: admin/systems/services/dns/class_DNS.inc:172
 #: admin/systems/services/dns/class_DNS.inc:617
@@ -36,120 +26,101 @@ msgstr ""
 msgid "Error"
 msgstr "Ø®Ø·Ø£"
 
-#: admin/systems/services/dns/class_serviceDNS.inc:195
-#: admin/systems/services/dns/class_serviceDNS.inc:406
-#: admin/systems/services/dns/class_serviceDNSeditZone.inc:352
-msgid "Reverse zone"
-msgstr ""
-
-#: admin/systems/services/dns/class_serviceDNS.inc:196
-#: admin/systems/services/dns/class_serviceDNS.inc:415
-#: admin/systems/services/dns/serviceDNSeditZone.tpl.c:47
-msgid "TTL"
-msgstr ""
-
-#: admin/systems/services/dns/class_serviceDNS.inc:197
-msgid "Class"
+#: admin/systems/services/dns/class_serviceDNS.inc:98
+msgid "DNS zones"
 msgstr ""
 
-#: admin/systems/services/dns/class_serviceDNS.inc:258
-#, php-format
-msgid "Cannot delete the selected zone. It is still in use by '%s'"
-msgstr ""
-
-#: admin/systems/services/dns/class_serviceDNS.inc:271
-#, php-format
-msgid "Was not able to contact argonaut server: %s"
-msgstr ""
-
-#: admin/systems/services/dns/class_serviceDNS.inc:277
-#, php-format
-msgid "Was not able to launch ldap2zone: %s"
+#: admin/systems/services/dns/class_serviceDNS.inc:102
+msgid "The DNS zones"
 msgstr ""
 
-#: admin/systems/services/dns/class_serviceDNS.inc:339
-#: admin/systems/services/dns/class_serviceDNS.inc:353
-#: admin/systems/services/dns/class_serviceDNS.inc:370
-#: admin/systems/services/dns/class_serviceDNS.inc:376
-#: admin/systems/services/dns/class_DNS.inc:730
-msgid "LDAP error"
+#: admin/systems/services/dns/class_serviceDNS.inc:114
+#: admin/systems/services/dns/class_serviceDNS.inc:115
+msgid "DNS service"
 msgstr ""
 
-#: admin/systems/services/dns/class_serviceDNS.inc:395
-msgid "Services"
-msgstr "Ø®Ø¯Ù…Ø§Øª"
-
-#: admin/systems/services/dns/class_serviceDNS.inc:401
+#: admin/systems/services/dns/class_serviceDNS.inc:119
 msgid "Start service"
 msgstr ""
 
-#: admin/systems/services/dns/class_serviceDNS.inc:402
+#: admin/systems/services/dns/class_serviceDNS.inc:120
 msgid "Stop service"
 msgstr ""
 
-#: admin/systems/services/dns/class_serviceDNS.inc:403
+#: admin/systems/services/dns/class_serviceDNS.inc:121
 msgid "Restart service"
 msgstr ""
 
-#: admin/systems/services/dns/class_serviceDNS.inc:405
-#: admin/systems/services/dns/class_serviceDNSeditZone.inc:343
-#: admin/systems/services/dns/class_serviceDNSeditZone.inc:348
-#: admin/systems/services/dns/class_serviceDNSeditZone.inc:356
-#: admin/systems/services/dns/serviceDNSeditZone.tpl.c:5
+#: admin/systems/services/dns/class_serviceDNS.inc:123
+#: admin/systems/services/dns/class_serviceDNSeditZone.inc:339
+#: admin/systems/services/dns/class_serviceDNSeditZone.inc:344
+#: admin/systems/services/dns/class_serviceDNSeditZone.inc:352
 msgid "Zone name"
 msgstr ""
 
-#: admin/systems/services/dns/class_serviceDNS.inc:407
-#: admin/systems/services/dns/class_serviceDNSeditZone.inc:436
+#: admin/systems/services/dns/class_serviceDNS.inc:124
+#: admin/systems/services/dns/class_serviceDNSeditZone.inc:348
+msgid "Reverse zone"
+msgstr ""
+
+#: admin/systems/services/dns/class_serviceDNS.inc:125
+#: admin/systems/services/dns/class_serviceDNSeditZone.inc:432
 msgid "Network class"
 msgstr ""
 
-#: admin/systems/services/dns/class_serviceDNS.inc:408
+#: admin/systems/services/dns/class_serviceDNS.inc:126
 msgid "Zone entry editor"
 msgstr ""
 
-#: admin/systems/services/dns/class_serviceDNS.inc:409
-#: admin/systems/services/dns/class_serviceDNSeditZone.inc:360
+#: admin/systems/services/dns/class_serviceDNS.inc:127
+#: admin/systems/services/dns/class_serviceDNSeditZone.inc:356
 msgid "Primary dns server"
 msgstr ""
 
-#: admin/systems/services/dns/class_serviceDNS.inc:410
-#: admin/systems/services/dns/serviceDNSeditZone.tpl.c:32
+#: admin/systems/services/dns/class_serviceDNS.inc:128
 msgid "Mail address"
 msgstr ""
 
-#: admin/systems/services/dns/class_serviceDNS.inc:411
-#: admin/systems/services/dns/class_serviceDNSeditZone.inc:364
+#: admin/systems/services/dns/class_serviceDNS.inc:129
+#: admin/systems/services/dns/class_serviceDNSeditZone.inc:360
 msgid "Serial"
 msgstr ""
 
-#: admin/systems/services/dns/class_serviceDNS.inc:412
-#: admin/systems/services/dns/class_serviceDNSeditZone.inc:368
-#: admin/systems/services/dns/serviceDNSeditZone.tpl.c:38
+#: admin/systems/services/dns/class_serviceDNS.inc:130
+#: admin/systems/services/dns/class_serviceDNSeditZone.inc:364
 msgid "Refresh"
 msgstr ""
 
-#: admin/systems/services/dns/class_serviceDNS.inc:413
-#: admin/systems/services/dns/class_serviceDNSeditZone.inc:380
-#: admin/systems/services/dns/serviceDNSeditZone.tpl.c:41
+#: admin/systems/services/dns/class_serviceDNS.inc:131
+#: admin/systems/services/dns/class_serviceDNSeditZone.inc:376
 msgid "Retry"
 msgstr ""
 
-#: admin/systems/services/dns/class_serviceDNS.inc:414
-#: admin/systems/services/dns/class_serviceDNSeditZone.inc:376
-#: admin/systems/services/dns/serviceDNSeditZone.tpl.c:44
+#: admin/systems/services/dns/class_serviceDNS.inc:132
+#: admin/systems/services/dns/class_serviceDNSeditZone.inc:372
 msgid "Expire"
 msgstr ""
 
-#: admin/systems/services/dns/class_serviceDNS.inc:416
+#: admin/systems/services/dns/class_serviceDNS.inc:133
+msgid "TTL"
+msgstr ""
+
+#: admin/systems/services/dns/class_serviceDNS.inc:134
 msgid "MX records"
 msgstr ""
 
-#: admin/systems/services/dns/class_serviceDNS.inc:417
-#: admin/systems/services/dns/serviceDNSeditZone.tpl.c:17
+#: admin/systems/services/dns/class_serviceDNS.inc:135
 msgid "Zone records"
 msgstr ""
 
+#: admin/systems/services/dns/class_serviceDNS.inc:198
+#: admin/systems/services/dns/class_serviceDNS.inc:212
+#: admin/systems/services/dns/class_serviceDNS.inc:229
+#: admin/systems/services/dns/class_serviceDNS.inc:235
+#: admin/systems/services/dns/class_DNS.inc:730
+msgid "LDAP error"
+msgstr ""
+
 #: admin/systems/services/dns/class_DNS.inc:167
 #, php-format
 msgid "Cannot find reverse zone for DNS zone '%s'. Parsing zone aborted."
@@ -174,44 +145,42 @@ msgid "MxRecord"
 msgstr ""
 
 #: admin/systems/services/dns/class_serviceDNSeditZone.inc:274
-#: admin/systems/services/dns/class_serviceDNSeditZone.inc:518
+#: admin/systems/services/dns/class_serviceDNSeditZone.inc:514
 msgid "Delete"
 msgstr ""
 
-#: admin/systems/services/dns/class_serviceDNSeditZone.inc:356
-#: admin/systems/services/dns/class_serviceDNSeditZone.inc:386
+#: admin/systems/services/dns/class_serviceDNSeditZone.inc:352
+#: admin/systems/services/dns/class_serviceDNSeditZone.inc:382
 msgid "Only lowercase allowed"
 msgstr ""
 
-#: admin/systems/services/dns/class_serviceDNSeditZone.inc:360
+#: admin/systems/services/dns/class_serviceDNSeditZone.inc:356
 msgid "This field should be a domain name"
 msgstr ""
 
-#: admin/systems/services/dns/class_serviceDNSeditZone.inc:372
+#: admin/systems/services/dns/class_serviceDNSeditZone.inc:368
 msgid "Time to life"
 msgstr ""
 
-#: admin/systems/services/dns/class_serviceDNSeditZone.inc:395
-#: admin/systems/services/dns/class_serviceDNSeditZone.inc:415
-#: admin/systems/services/dns/serviceDNSeditZone.tpl.c:8
+#: admin/systems/services/dns/class_serviceDNSeditZone.inc:391
+#: admin/systems/services/dns/class_serviceDNSeditZone.inc:411
 msgid "Network address"
 msgstr ""
 
-#: admin/systems/services/dns/class_serviceDNSeditZone.inc:423
-#: admin/systems/services/dns/class_serviceDNSeditZone.inc:428
-#: admin/systems/services/dns/class_serviceDNSeditZone.inc:433
+#: admin/systems/services/dns/class_serviceDNSeditZone.inc:419
+#: admin/systems/services/dns/class_serviceDNSeditZone.inc:424
+#: admin/systems/services/dns/class_serviceDNSeditZone.inc:429
 #, php-format
 msgid ""
 "The specified network address and the network class (%s/%s) do not match!"
 msgstr ""
 
-#: admin/systems/services/dns/class_serviceDNSeditZone.inc:524
+#: admin/systems/services/dns/class_serviceDNSeditZone.inc:520
 #: admin/systems/services/dns/class_serviceDNSeditZoneEntries.inc:439
 msgid "Add"
 msgstr ""
 
 #: admin/systems/services/dns/class_serviceDNSeditZoneEntries.inc:121
-#: admin/systems/services/dns/serviceDNSeditZoneEntries.tpl.c:8
 msgid "New entry"
 msgstr ""
 
@@ -339,63 +308,3 @@ msgstr ""
 #: config/dns/class_dnsConfig.inc:45
 msgid "Should FD store a final dot at the end of domains?"
 msgstr ""
-
-#: admin/systems/services/dns/serviceDNSeditZone.tpl.c:2
-msgid "Generic"
-msgstr ""
-
-#: admin/systems/services/dns/serviceDNSeditZone.tpl.c:11
-msgid "Netmask"
-msgstr ""
-
-#: admin/systems/services/dns/serviceDNSeditZone.tpl.c:14
-msgid "Zone is in use, network settings can't be modified."
-msgstr ""
-
-#: admin/systems/services/dns/serviceDNSeditZone.tpl.c:20
-msgid "Can't be edited because the zone wasn't saved right now."
-msgstr ""
-
-#: admin/systems/services/dns/serviceDNSeditZone.tpl.c:23
-msgid "Edit"
-msgstr ""
-
-#: admin/systems/services/dns/serviceDNSeditZone.tpl.c:26
-msgid "SOA record"
-msgstr ""
-
-#: admin/systems/services/dns/serviceDNSeditZone.tpl.c:29
-msgid "Primary dns server for this zone"
-msgstr ""
-
-#: admin/systems/services/dns/serviceDNSeditZone.tpl.c:35
-msgid "Serial number (automatically incremented)"
-msgstr ""
-
-#: admin/systems/services/dns/serviceDNSeditZone.tpl.c:50
-msgid "MxRecords"
-msgstr ""
-
-#: admin/systems/services/dns/serviceDNSeditZone.tpl.c:53
-msgid "Global zone records"
-msgstr ""
-
-#: admin/systems/services/dns/serviceDNS.tpl.c:2
-msgid "Zones"
-msgstr ""
-
-#: admin/systems/services/dns/serviceDNSeditZoneEntries.tpl.c:2
-msgid ""
-"This dialog allows you to configure all components of this DNS zone on a "
-"single list."
-msgstr ""
-
-#: admin/systems/services/dns/serviceDNSeditZoneEntries.tpl.c:5
-msgid ""
-"This dialog can't be used until the currently edited zone was saved or the "
-"zone entry exists in the ldap database."
-msgstr ""
-
-#: admin/systems/services/dns/serviceDNSeditZoneEntries.tpl.c:11
-msgid "Create a new DNS zone entry"
-msgstr ""
diff --git a/dns/locale/ca/fusiondirectory.po b/dns/locale/ca/fusiondirectory.po
index 974496fad1ca44678ac7ad14b2dab5a80d39f401..a2d84de787c41cd7a611ac1e197783b535f0adf7 100644
--- a/dns/locale/ca/fusiondirectory.po
+++ b/dns/locale/ca/fusiondirectory.po
@@ -5,29 +5,19 @@
 # Translators:
 msgid ""
 msgstr ""
-"Project-Id-Version: FusionDirectory-108\n"
+"Project-Id-Version: FusionDirectory-109\n"
 "Report-Msgid-Bugs-To: documentation@lists.fusiondirectory.org\n"
-"POT-Creation-Date: 2015-03-19 21:45+0100\n"
-"PO-Revision-Date: 2015-02-25 16:12+0000\n"
+"POT-Creation-Date: 2014-12-15 17:47+0100\n"
+"PO-Revision-Date: 2015-02-25 16:04+0000\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>\n"
-"Language-Team: Catalan (http://www.transifex.com/projects/p/FusionDirectory-108/language/ca/)\n"
+"Language-Team: Catalan (http://www.transifex.com/projects/p/FusionDirectory-109/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/services/dns/class_serviceDNS.inc:45
-#: admin/systems/services/dns/class_serviceDNS.inc:386
-#: admin/systems/services/dns/class_serviceDNS.inc:394
-#: admin/systems/services/dns/class_serviceDNS.inc:395
-msgid "DNS service"
-msgstr ""
-
-#: admin/systems/services/dns/class_serviceDNS.inc:101
-#: admin/systems/services/dns/class_serviceDNS.inc:258
-#: admin/systems/services/dns/class_serviceDNS.inc:271
-#: admin/systems/services/dns/class_serviceDNS.inc:277
+#: admin/systems/services/dns/class_serviceDNS.inc:49
 #: admin/systems/services/dns/class_DNS.inc:167
 #: admin/systems/services/dns/class_DNS.inc:172
 #: admin/systems/services/dns/class_DNS.inc:617
@@ -36,120 +26,101 @@ msgstr ""
 msgid "Error"
 msgstr "Error"
 
-#: admin/systems/services/dns/class_serviceDNS.inc:195
-#: admin/systems/services/dns/class_serviceDNS.inc:406
-#: admin/systems/services/dns/class_serviceDNSeditZone.inc:352
-msgid "Reverse zone"
-msgstr ""
-
-#: admin/systems/services/dns/class_serviceDNS.inc:196
-#: admin/systems/services/dns/class_serviceDNS.inc:415
-#: admin/systems/services/dns/serviceDNSeditZone.tpl.c:47
-msgid "TTL"
-msgstr ""
-
-#: admin/systems/services/dns/class_serviceDNS.inc:197
-msgid "Class"
+#: admin/systems/services/dns/class_serviceDNS.inc:98
+msgid "DNS zones"
 msgstr ""
 
-#: admin/systems/services/dns/class_serviceDNS.inc:258
-#, php-format
-msgid "Cannot delete the selected zone. It is still in use by '%s'"
-msgstr ""
-
-#: admin/systems/services/dns/class_serviceDNS.inc:271
-#, php-format
-msgid "Was not able to contact argonaut server: %s"
-msgstr ""
-
-#: admin/systems/services/dns/class_serviceDNS.inc:277
-#, php-format
-msgid "Was not able to launch ldap2zone: %s"
+#: admin/systems/services/dns/class_serviceDNS.inc:102
+msgid "The DNS zones"
 msgstr ""
 
-#: admin/systems/services/dns/class_serviceDNS.inc:339
-#: admin/systems/services/dns/class_serviceDNS.inc:353
-#: admin/systems/services/dns/class_serviceDNS.inc:370
-#: admin/systems/services/dns/class_serviceDNS.inc:376
-#: admin/systems/services/dns/class_DNS.inc:730
-msgid "LDAP error"
-msgstr "Error d'LDAP"
-
-#: admin/systems/services/dns/class_serviceDNS.inc:395
-msgid "Services"
+#: admin/systems/services/dns/class_serviceDNS.inc:114
+#: admin/systems/services/dns/class_serviceDNS.inc:115
+msgid "DNS service"
 msgstr ""
 
-#: admin/systems/services/dns/class_serviceDNS.inc:401
+#: admin/systems/services/dns/class_serviceDNS.inc:119
 msgid "Start service"
 msgstr ""
 
-#: admin/systems/services/dns/class_serviceDNS.inc:402
+#: admin/systems/services/dns/class_serviceDNS.inc:120
 msgid "Stop service"
 msgstr ""
 
-#: admin/systems/services/dns/class_serviceDNS.inc:403
+#: admin/systems/services/dns/class_serviceDNS.inc:121
 msgid "Restart service"
 msgstr ""
 
-#: admin/systems/services/dns/class_serviceDNS.inc:405
-#: admin/systems/services/dns/class_serviceDNSeditZone.inc:343
-#: admin/systems/services/dns/class_serviceDNSeditZone.inc:348
-#: admin/systems/services/dns/class_serviceDNSeditZone.inc:356
-#: admin/systems/services/dns/serviceDNSeditZone.tpl.c:5
+#: admin/systems/services/dns/class_serviceDNS.inc:123
+#: admin/systems/services/dns/class_serviceDNSeditZone.inc:339
+#: admin/systems/services/dns/class_serviceDNSeditZone.inc:344
+#: admin/systems/services/dns/class_serviceDNSeditZone.inc:352
 msgid "Zone name"
 msgstr ""
 
-#: admin/systems/services/dns/class_serviceDNS.inc:407
-#: admin/systems/services/dns/class_serviceDNSeditZone.inc:436
+#: admin/systems/services/dns/class_serviceDNS.inc:124
+#: admin/systems/services/dns/class_serviceDNSeditZone.inc:348
+msgid "Reverse zone"
+msgstr ""
+
+#: admin/systems/services/dns/class_serviceDNS.inc:125
+#: admin/systems/services/dns/class_serviceDNSeditZone.inc:432
 msgid "Network class"
 msgstr ""
 
-#: admin/systems/services/dns/class_serviceDNS.inc:408
+#: admin/systems/services/dns/class_serviceDNS.inc:126
 msgid "Zone entry editor"
 msgstr ""
 
-#: admin/systems/services/dns/class_serviceDNS.inc:409
-#: admin/systems/services/dns/class_serviceDNSeditZone.inc:360
+#: admin/systems/services/dns/class_serviceDNS.inc:127
+#: admin/systems/services/dns/class_serviceDNSeditZone.inc:356
 msgid "Primary dns server"
 msgstr ""
 
-#: admin/systems/services/dns/class_serviceDNS.inc:410
-#: admin/systems/services/dns/serviceDNSeditZone.tpl.c:32
+#: admin/systems/services/dns/class_serviceDNS.inc:128
 msgid "Mail address"
 msgstr "AdreÃ§a de correu"
 
-#: admin/systems/services/dns/class_serviceDNS.inc:411
-#: admin/systems/services/dns/class_serviceDNSeditZone.inc:364
+#: admin/systems/services/dns/class_serviceDNS.inc:129
+#: admin/systems/services/dns/class_serviceDNSeditZone.inc:360
 msgid "Serial"
 msgstr ""
 
-#: admin/systems/services/dns/class_serviceDNS.inc:412
-#: admin/systems/services/dns/class_serviceDNSeditZone.inc:368
-#: admin/systems/services/dns/serviceDNSeditZone.tpl.c:38
+#: admin/systems/services/dns/class_serviceDNS.inc:130
+#: admin/systems/services/dns/class_serviceDNSeditZone.inc:364
 msgid "Refresh"
 msgstr ""
 
-#: admin/systems/services/dns/class_serviceDNS.inc:413
-#: admin/systems/services/dns/class_serviceDNSeditZone.inc:380
-#: admin/systems/services/dns/serviceDNSeditZone.tpl.c:41
+#: admin/systems/services/dns/class_serviceDNS.inc:131
+#: admin/systems/services/dns/class_serviceDNSeditZone.inc:376
 msgid "Retry"
 msgstr ""
 
-#: admin/systems/services/dns/class_serviceDNS.inc:414
-#: admin/systems/services/dns/class_serviceDNSeditZone.inc:376
-#: admin/systems/services/dns/serviceDNSeditZone.tpl.c:44
+#: admin/systems/services/dns/class_serviceDNS.inc:132
+#: admin/systems/services/dns/class_serviceDNSeditZone.inc:372
 msgid "Expire"
 msgstr ""
 
-#: admin/systems/services/dns/class_serviceDNS.inc:416
+#: admin/systems/services/dns/class_serviceDNS.inc:133
+msgid "TTL"
+msgstr ""
+
+#: admin/systems/services/dns/class_serviceDNS.inc:134
 msgid "MX records"
 msgstr ""
 
-#: admin/systems/services/dns/class_serviceDNS.inc:417
-#: admin/systems/services/dns/serviceDNSeditZone.tpl.c:17
+#: admin/systems/services/dns/class_serviceDNS.inc:135
 msgid "Zone records"
 msgstr ""
 
+#: admin/systems/services/dns/class_serviceDNS.inc:198
+#: admin/systems/services/dns/class_serviceDNS.inc:212
+#: admin/systems/services/dns/class_serviceDNS.inc:229
+#: admin/systems/services/dns/class_serviceDNS.inc:235
+#: admin/systems/services/dns/class_DNS.inc:730
+msgid "LDAP error"
+msgstr "Error d'LDAP"
+
 #: admin/systems/services/dns/class_DNS.inc:167
 #, php-format
 msgid "Cannot find reverse zone for DNS zone '%s'. Parsing zone aborted."
@@ -174,44 +145,42 @@ msgid "MxRecord"
 msgstr ""
 
 #: admin/systems/services/dns/class_serviceDNSeditZone.inc:274
-#: admin/systems/services/dns/class_serviceDNSeditZone.inc:518
+#: admin/systems/services/dns/class_serviceDNSeditZone.inc:514
 msgid "Delete"
 msgstr ""
 
-#: admin/systems/services/dns/class_serviceDNSeditZone.inc:356
-#: admin/systems/services/dns/class_serviceDNSeditZone.inc:386
+#: admin/systems/services/dns/class_serviceDNSeditZone.inc:352
+#: admin/systems/services/dns/class_serviceDNSeditZone.inc:382
 msgid "Only lowercase allowed"
 msgstr ""
 
-#: admin/systems/services/dns/class_serviceDNSeditZone.inc:360
+#: admin/systems/services/dns/class_serviceDNSeditZone.inc:356
 msgid "This field should be a domain name"
 msgstr ""
 
-#: admin/systems/services/dns/class_serviceDNSeditZone.inc:372
+#: admin/systems/services/dns/class_serviceDNSeditZone.inc:368
 msgid "Time to life"
 msgstr ""
 
-#: admin/systems/services/dns/class_serviceDNSeditZone.inc:395
-#: admin/systems/services/dns/class_serviceDNSeditZone.inc:415
-#: admin/systems/services/dns/serviceDNSeditZone.tpl.c:8
+#: admin/systems/services/dns/class_serviceDNSeditZone.inc:391
+#: admin/systems/services/dns/class_serviceDNSeditZone.inc:411
 msgid "Network address"
 msgstr ""
 
-#: admin/systems/services/dns/class_serviceDNSeditZone.inc:423
-#: admin/systems/services/dns/class_serviceDNSeditZone.inc:428
-#: admin/systems/services/dns/class_serviceDNSeditZone.inc:433
+#: admin/systems/services/dns/class_serviceDNSeditZone.inc:419
+#: admin/systems/services/dns/class_serviceDNSeditZone.inc:424
+#: admin/systems/services/dns/class_serviceDNSeditZone.inc:429
 #, php-format
 msgid ""
 "The specified network address and the network class (%s/%s) do not match!"
 msgstr ""
 
-#: admin/systems/services/dns/class_serviceDNSeditZone.inc:524
+#: admin/systems/services/dns/class_serviceDNSeditZone.inc:520
 #: admin/systems/services/dns/class_serviceDNSeditZoneEntries.inc:439
 msgid "Add"
 msgstr ""
 
 #: admin/systems/services/dns/class_serviceDNSeditZoneEntries.inc:121
-#: admin/systems/services/dns/serviceDNSeditZoneEntries.tpl.c:8
 msgid "New entry"
 msgstr ""
 
@@ -339,63 +308,3 @@ msgstr ""
 #: config/dns/class_dnsConfig.inc:45
 msgid "Should FD store a final dot at the end of domains?"
 msgstr ""
-
-#: admin/systems/services/dns/serviceDNSeditZone.tpl.c:2
-msgid "Generic"
-msgstr "GenÃ¨ric"
-
-#: admin/systems/services/dns/serviceDNSeditZone.tpl.c:11
-msgid "Netmask"
-msgstr ""
-
-#: admin/systems/services/dns/serviceDNSeditZone.tpl.c:14
-msgid "Zone is in use, network settings can't be modified."
-msgstr ""
-
-#: admin/systems/services/dns/serviceDNSeditZone.tpl.c:20
-msgid "Can't be edited because the zone wasn't saved right now."
-msgstr ""
-
-#: admin/systems/services/dns/serviceDNSeditZone.tpl.c:23
-msgid "Edit"
-msgstr ""
-
-#: admin/systems/services/dns/serviceDNSeditZone.tpl.c:26
-msgid "SOA record"
-msgstr ""
-
-#: admin/systems/services/dns/serviceDNSeditZone.tpl.c:29
-msgid "Primary dns server for this zone"
-msgstr ""
-
-#: admin/systems/services/dns/serviceDNSeditZone.tpl.c:35
-msgid "Serial number (automatically incremented)"
-msgstr ""
-
-#: admin/systems/services/dns/serviceDNSeditZone.tpl.c:50
-msgid "MxRecords"
-msgstr ""
-
-#: admin/systems/services/dns/serviceDNSeditZone.tpl.c:53
-msgid "Global zone records"
-msgstr ""
-
-#: admin/systems/services/dns/serviceDNS.tpl.c:2
-msgid "Zones"
-msgstr ""
-
-#: admin/systems/services/dns/serviceDNSeditZoneEntries.tpl.c:2
-msgid ""
-"This dialog allows you to configure all components of this DNS zone on a "
-"single list."
-msgstr ""
-
-#: admin/systems/services/dns/serviceDNSeditZoneEntries.tpl.c:5
-msgid ""
-"This dialog can't be used until the currently edited zone was saved or the "
-"zone entry exists in the ldap database."
-msgstr ""
-
-#: admin/systems/services/dns/serviceDNSeditZoneEntries.tpl.c:11
-msgid "Create a new DNS zone entry"
-msgstr ""
diff --git a/dns/locale/cs_CZ/fusiondirectory.po b/dns/locale/cs_CZ/fusiondirectory.po
index 0cad75a1872509aadaac856f64b2c1fb61ab1995..2ea9d06a9f134e4b3182b90c00bee1081d542052 100644
--- a/dns/locale/cs_CZ/fusiondirectory.po
+++ b/dns/locale/cs_CZ/fusiondirectory.po
@@ -3,156 +3,125 @@
 # This file is distributed under the same license as the PACKAGE package.
 # 
 # Translators:
-# Pavel Borecki <pavel.borecki@gmail.com>, 2012
-# Pavel Borecki <pavel.borecki@gmail.com>, 2012
-# Pavel Borecki <pavel.borecki@gmail.com>, 2012
+# Pavel Borecki <pavel.borecki@gmail.com>, 2015
 msgid ""
 msgstr ""
-"Project-Id-Version: FusionDirectory-108\n"
+"Project-Id-Version: FusionDirectory-109\n"
 "Report-Msgid-Bugs-To: documentation@lists.fusiondirectory.org\n"
-"POT-Creation-Date: 2015-03-19 21:45+0100\n"
-"PO-Revision-Date: 2015-02-25 16:12+0000\n"
-"Last-Translator: fusiondirectory <contact@fusiondirectory.org>\n"
-"Language-Team: Czech (Czech Republic) (http://www.transifex.com/projects/p/FusionDirectory-108/language/cs_CZ/)\n"
+"POT-Creation-Date: 2014-12-15 17:47+0100\n"
+"PO-Revision-Date: 2015-04-05 17:21+0000\n"
+"Last-Translator: Pavel Borecki <pavel.borecki@gmail.com>\n"
+"Language-Team: Czech (Czech Republic) (http://www.transifex.com/projects/p/FusionDirectory-109/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/services/dns/class_serviceDNS.inc:45
-#: admin/systems/services/dns/class_serviceDNS.inc:386
-#: admin/systems/services/dns/class_serviceDNS.inc:394
-#: admin/systems/services/dns/class_serviceDNS.inc:395
-msgid "DNS service"
-msgstr "sluÅ¾ba DNS"
-
-#: admin/systems/services/dns/class_serviceDNS.inc:101
-#: admin/systems/services/dns/class_serviceDNS.inc:258
-#: admin/systems/services/dns/class_serviceDNS.inc:271
-#: admin/systems/services/dns/class_serviceDNS.inc:277
+#: admin/systems/services/dns/class_serviceDNS.inc:49
 #: admin/systems/services/dns/class_DNS.inc:167
 #: admin/systems/services/dns/class_DNS.inc:172
 #: admin/systems/services/dns/class_DNS.inc:617
 #: admin/systems/services/dns/class_serviceDNSeditZone.inc:200
 #: admin/systems/services/dns/class_serviceDNSeditZoneEntries.inc:229
 msgid "Error"
-msgstr "chyba"
+msgstr "Chyba"
 
-#: admin/systems/services/dns/class_serviceDNS.inc:195
-#: admin/systems/services/dns/class_serviceDNS.inc:406
-#: admin/systems/services/dns/class_serviceDNSeditZone.inc:352
-msgid "Reverse zone"
-msgstr "obrÃ¡cenÃ¡ zÃ³na"
+#: admin/systems/services/dns/class_serviceDNS.inc:98
+msgid "DNS zones"
+msgstr "DNS zÃ³ny"
 
-#: admin/systems/services/dns/class_serviceDNS.inc:196
-#: admin/systems/services/dns/class_serviceDNS.inc:415
-#: admin/systems/services/dns/serviceDNSeditZone.tpl.c:47
-msgid "TTL"
-msgstr "TTL"
-
-#: admin/systems/services/dns/class_serviceDNS.inc:197
-msgid "Class"
-msgstr "tÅ™Ãda"
-
-#: admin/systems/services/dns/class_serviceDNS.inc:258
-#, php-format
-msgid "Cannot delete the selected zone. It is still in use by '%s'"
-msgstr "Nelze smazat vybranou zÃ³nu. StÃ¡le ji vyuÅ¾ÃvÃ¡ '%s'."
+#: admin/systems/services/dns/class_serviceDNS.inc:102
+msgid "The DNS zones"
+msgstr "ZÃ³ny DNS"
 
-#: admin/systems/services/dns/class_serviceDNS.inc:271
-#, php-format
-msgid "Was not able to contact argonaut server: %s"
-msgstr "Nebyl schopen kontaktovat Argonaut server: %s"
-
-#: admin/systems/services/dns/class_serviceDNS.inc:277
-#, php-format
-msgid "Was not able to launch ldap2zone: %s"
-msgstr "Nebyl schopen spustit ldap2zone: %s"
-
-#: admin/systems/services/dns/class_serviceDNS.inc:339
-#: admin/systems/services/dns/class_serviceDNS.inc:353
-#: admin/systems/services/dns/class_serviceDNS.inc:370
-#: admin/systems/services/dns/class_serviceDNS.inc:376
-#: admin/systems/services/dns/class_DNS.inc:730
-msgid "LDAP error"
-msgstr "chyba LDAPu"
-
-#: admin/systems/services/dns/class_serviceDNS.inc:395
-msgid "Services"
-msgstr "sluÅ¾by"
+#: admin/systems/services/dns/class_serviceDNS.inc:114
+#: admin/systems/services/dns/class_serviceDNS.inc:115
+msgid "DNS service"
+msgstr "SluÅ¾ba DNS"
 
-#: admin/systems/services/dns/class_serviceDNS.inc:401
+#: admin/systems/services/dns/class_serviceDNS.inc:119
 msgid "Start service"
 msgstr "spustit sluÅ¾bu"
 
-#: admin/systems/services/dns/class_serviceDNS.inc:402
+#: admin/systems/services/dns/class_serviceDNS.inc:120
 msgid "Stop service"
-msgstr "zastavit sluÅ¾bu"
+msgstr "Zastavit sluÅ¾bu"
 
-#: admin/systems/services/dns/class_serviceDNS.inc:403
+#: admin/systems/services/dns/class_serviceDNS.inc:121
 msgid "Restart service"
-msgstr "restartovat sluÅ¾bu"
+msgstr "Restartovat sluÅ¾bu"
 
-#: admin/systems/services/dns/class_serviceDNS.inc:405
-#: admin/systems/services/dns/class_serviceDNSeditZone.inc:343
-#: admin/systems/services/dns/class_serviceDNSeditZone.inc:348
-#: admin/systems/services/dns/class_serviceDNSeditZone.inc:356
-#: admin/systems/services/dns/serviceDNSeditZone.tpl.c:5
+#: admin/systems/services/dns/class_serviceDNS.inc:123
+#: admin/systems/services/dns/class_serviceDNSeditZone.inc:339
+#: admin/systems/services/dns/class_serviceDNSeditZone.inc:344
+#: admin/systems/services/dns/class_serviceDNSeditZone.inc:352
 msgid "Zone name"
-msgstr "nÃ¡zev zÃ³ny"
+msgstr "NÃ¡zev zÃ³ny"
+
+#: admin/systems/services/dns/class_serviceDNS.inc:124
+#: admin/systems/services/dns/class_serviceDNSeditZone.inc:348
+msgid "Reverse zone"
+msgstr "ObrÃ¡cenÃ¡ zÃ³na"
 
-#: admin/systems/services/dns/class_serviceDNS.inc:407
-#: admin/systems/services/dns/class_serviceDNSeditZone.inc:436
+#: admin/systems/services/dns/class_serviceDNS.inc:125
+#: admin/systems/services/dns/class_serviceDNSeditZone.inc:432
 msgid "Network class"
-msgstr "tÅ™Ãda sÃtÄ›"
+msgstr "TÅ™Ãda sÃtÄ›"
 
-#: admin/systems/services/dns/class_serviceDNS.inc:408
+#: admin/systems/services/dns/class_serviceDNS.inc:126
 msgid "Zone entry editor"
-msgstr "editor poloÅ¾ek zÃ³n"
+msgstr "Editor poloÅ¾ek zÃ³ny"
 
-#: admin/systems/services/dns/class_serviceDNS.inc:409
-#: admin/systems/services/dns/class_serviceDNSeditZone.inc:360
+#: admin/systems/services/dns/class_serviceDNS.inc:127
+#: admin/systems/services/dns/class_serviceDNSeditZone.inc:356
 msgid "Primary dns server"
-msgstr "hlavnÃ DNS server"
+msgstr "HlavnÃ DNS server"
 
-#: admin/systems/services/dns/class_serviceDNS.inc:410
-#: admin/systems/services/dns/serviceDNSeditZone.tpl.c:32
+#: admin/systems/services/dns/class_serviceDNS.inc:128
 msgid "Mail address"
-msgstr "e-mailovÃ¡ adresa"
+msgstr "E-mailovÃ¡ adresa"
 
-#: admin/systems/services/dns/class_serviceDNS.inc:411
-#: admin/systems/services/dns/class_serviceDNSeditZone.inc:364
+#: admin/systems/services/dns/class_serviceDNS.inc:129
+#: admin/systems/services/dns/class_serviceDNSeditZone.inc:360
 msgid "Serial"
-msgstr "sÃ©riovÃ© ÄÃslo"
+msgstr "SÃ©riovÃ© ÄÃslo"
 
-#: admin/systems/services/dns/class_serviceDNS.inc:412
-#: admin/systems/services/dns/class_serviceDNSeditZone.inc:368
-#: admin/systems/services/dns/serviceDNSeditZone.tpl.c:38
+#: admin/systems/services/dns/class_serviceDNS.inc:130
+#: admin/systems/services/dns/class_serviceDNSeditZone.inc:364
 msgid "Refresh"
-msgstr "obnovenÃ"
+msgstr "Obnovit"
 
-#: admin/systems/services/dns/class_serviceDNS.inc:413
-#: admin/systems/services/dns/class_serviceDNSeditZone.inc:380
-#: admin/systems/services/dns/serviceDNSeditZone.tpl.c:41
+#: admin/systems/services/dns/class_serviceDNS.inc:131
+#: admin/systems/services/dns/class_serviceDNSeditZone.inc:376
 msgid "Retry"
-msgstr "zkusit znovu"
+msgstr "Znovu"
 
-#: admin/systems/services/dns/class_serviceDNS.inc:414
-#: admin/systems/services/dns/class_serviceDNSeditZone.inc:376
-#: admin/systems/services/dns/serviceDNSeditZone.tpl.c:44
+#: admin/systems/services/dns/class_serviceDNS.inc:132
+#: admin/systems/services/dns/class_serviceDNSeditZone.inc:372
 msgid "Expire"
-msgstr "vyprÅ¡Ã"
+msgstr "Platnost skonÄÃ"
+
+#: admin/systems/services/dns/class_serviceDNS.inc:133
+msgid "TTL"
+msgstr "TTL"
 
-#: admin/systems/services/dns/class_serviceDNS.inc:416
+#: admin/systems/services/dns/class_serviceDNS.inc:134
 msgid "MX records"
 msgstr "zÃ¡znamy MX"
 
-#: admin/systems/services/dns/class_serviceDNS.inc:417
-#: admin/systems/services/dns/serviceDNSeditZone.tpl.c:17
+#: admin/systems/services/dns/class_serviceDNS.inc:135
 msgid "Zone records"
 msgstr "zÃ¡znamy zÃ³ny"
 
+#: admin/systems/services/dns/class_serviceDNS.inc:198
+#: admin/systems/services/dns/class_serviceDNS.inc:212
+#: admin/systems/services/dns/class_serviceDNS.inc:229
+#: admin/systems/services/dns/class_serviceDNS.inc:235
+#: admin/systems/services/dns/class_DNS.inc:730
+msgid "LDAP error"
+msgstr "Chyba LDAP"
+
 #: admin/systems/services/dns/class_DNS.inc:167
 #, php-format
 msgid "Cannot find reverse zone for DNS zone '%s'. Parsing zone aborted."
@@ -166,100 +135,98 @@ msgstr "ZjiÅ¡tÄ›na vÃce neÅ¾ jedna obrÃ¡cenÃ¡ zÃ³na pro '%s'. AnalyzovÃ¡nÃ zÃ³
 #: admin/systems/services/dns/class_DNS.inc:617
 #, php-format
 msgid "Undefined zone name '%s'!"
-msgstr "NedefinovanÃ½ nÃ¡zev zÃ³ny '%s'!"
+msgstr "NeurÄenÃ½ nÃ¡zev zÃ³ny %s!"
 
 #: admin/systems/services/dns/class_serviceDNSeditZone.inc:244
 msgid "Warning"
-msgstr "varovÃ¡nÃ"
+msgstr "VarovÃ¡nÃ"
 
 #: admin/systems/services/dns/class_serviceDNSeditZone.inc:244
 msgid "MxRecord"
 msgstr "zÃ¡znam MX"
 
 #: admin/systems/services/dns/class_serviceDNSeditZone.inc:274
-#: admin/systems/services/dns/class_serviceDNSeditZone.inc:518
+#: admin/systems/services/dns/class_serviceDNSeditZone.inc:514
 msgid "Delete"
-msgstr "smazat"
+msgstr "Smazat"
 
-#: admin/systems/services/dns/class_serviceDNSeditZone.inc:356
-#: admin/systems/services/dns/class_serviceDNSeditZone.inc:386
+#: admin/systems/services/dns/class_serviceDNSeditZone.inc:352
+#: admin/systems/services/dns/class_serviceDNSeditZone.inc:382
 msgid "Only lowercase allowed"
-msgstr "je moÅ¾nÃ© pouÅ¾Ãt jen malÃ¡ pÃsmena"
+msgstr "PouÅ¾Ãt je moÅ¾nÃ© jen malÃ¡ pÃsmena"
 
-#: admin/systems/services/dns/class_serviceDNSeditZone.inc:360
+#: admin/systems/services/dns/class_serviceDNSeditZone.inc:356
 msgid "This field should be a domain name"
-msgstr ""
+msgstr "Toto polÃÄko by mÄ›lo obsahovat domÃ©novÃ½ nÃ¡zev"
 
-#: admin/systems/services/dns/class_serviceDNSeditZone.inc:372
+#: admin/systems/services/dns/class_serviceDNSeditZone.inc:368
 msgid "Time to life"
 msgstr "doba platnosti (TTL)"
 
-#: admin/systems/services/dns/class_serviceDNSeditZone.inc:395
-#: admin/systems/services/dns/class_serviceDNSeditZone.inc:415
-#: admin/systems/services/dns/serviceDNSeditZone.tpl.c:8
+#: admin/systems/services/dns/class_serviceDNSeditZone.inc:391
+#: admin/systems/services/dns/class_serviceDNSeditZone.inc:411
 msgid "Network address"
-msgstr "sÃÅ¥ovÃ¡ adresa"
+msgstr "SÃÅ¥ovÃ¡ adresa"
 
-#: admin/systems/services/dns/class_serviceDNSeditZone.inc:423
-#: admin/systems/services/dns/class_serviceDNSeditZone.inc:428
-#: admin/systems/services/dns/class_serviceDNSeditZone.inc:433
+#: admin/systems/services/dns/class_serviceDNSeditZone.inc:419
+#: admin/systems/services/dns/class_serviceDNSeditZone.inc:424
+#: admin/systems/services/dns/class_serviceDNSeditZone.inc:429
 #, php-format
 msgid ""
 "The specified network address and the network class (%s/%s) do not match!"
 msgstr "ZadanÃ¡ sÃÅ¥ovÃ¡ adresa neodpovÃdÃ¡ tÅ™ÃdÄ› sÃtÄ› (%s/%s)!"
 
-#: admin/systems/services/dns/class_serviceDNSeditZone.inc:524
+#: admin/systems/services/dns/class_serviceDNSeditZone.inc:520
 #: admin/systems/services/dns/class_serviceDNSeditZoneEntries.inc:439
 msgid "Add"
-msgstr "pÅ™idat"
+msgstr "PÅ™idat"
 
 #: admin/systems/services/dns/class_serviceDNSeditZoneEntries.inc:121
-#: admin/systems/services/dns/serviceDNSeditZoneEntries.tpl.c:8
 msgid "New entry"
-msgstr "novÃ¡ poloÅ¾ka"
+msgstr "NovÃ¡ poloÅ¾ka"
 
 #: admin/systems/services/dns/class_serviceDNSeditZoneEntries.inc:229
 #, php-format
 msgid "Cannot rename '%s' to '%s'. Name is already in use!"
-msgstr "Nemohu pÅ™ejmenovat '%s' na '%s'. Tento nÃ¡zev uÅ¾ je pouÅ¾it!"
+msgstr "%s nelze pÅ™ejmenovat na %s. Tento nÃ¡zev je jiÅ¾ pouÅ¾ÃvÃ¡n!"
 
 #: admin/systems/services/dns/class_serviceDNSeditZoneEntries.inc:260
 msgid "Name"
-msgstr "nÃ¡zev"
+msgstr "NÃ¡zev"
 
 #: admin/systems/services/dns/class_serviceDNSeditZoneEntries.inc:268
 #, php-format
 msgid "Cannot rename '%s' to '%s'. Entry is already in use."
-msgstr "Nemohu pÅ™ejmenovat '%s' na '%s'. Tento nÃ¡zev uÅ¾ byl pouÅ¾it pro jinou existujÃcÃ poloÅ¾ku!"
+msgstr "%s nelze pÅ™ejmenovat na %s. Tento nÃ¡zev uÅ¾ byl pouÅ¾it pro jinou existujÃcÃ poloÅ¾ku!"
 
 #: admin/systems/services/dns/class_serviceDNSeditZoneEntries.inc:274
 #, php-format
 msgid "Cannot create '%s'. Entry is already in use."
-msgstr "Nemohu vytvoÅ™it '%s'. Takto nazvanÃ¡ poloÅ¾ka uÅ¾ existuje."
+msgstr "%s nelze vytvoÅ™it. Takto nazvanÃ¡ poloÅ¾ka jiÅ¾ existuje."
 
 #: admin/systems/services/dns/class_serviceDNSeditZoneEntries.inc:282
 #, php-format
 msgid "Entry '%s' is used more than once."
-msgstr "PoloÅ¾ka '%s' je pouÅ¾ita vÃcekrÃ¡t."
+msgstr "PoloÅ¾ka %s je pouÅ¾ita vÃcekrÃ¡t."
 
 #: admin/systems/services/dns/class_serviceDNSeditZoneEntries.inc:299
 #, php-format
 msgid "%s records cannot be used more than once."
-msgstr "%s zÃ¡znamy nelze pouÅ¾Ãt vÃcekrÃ¡t."
+msgstr "%s zÃ¡znamy nemohou bÃ½t pouÅ¾ity vÃcekrÃ¡t."
 
 #: admin/systems/services/dns/class_serviceDNSeditZoneEntries.inc:305
 #, php-format
 msgid "Please fix the empty %s record for entry '%s'."
-msgstr "Opravte prosÃm nevyplnÄ›nÃ½ zÃ¡znam %s u poloÅ¾ky '%s'."
+msgstr "Opravte nevyplnÄ›nÃ½ zÃ¡znam %s u poloÅ¾ky %s."
 
 #: admin/systems/services/dns/class_serviceDNSeditZoneEntries.inc:312
 #, php-format
 msgid "Please fix the duplicate %s record for entry '%s'."
-msgstr "Opravte prosÃm zdvojenÃ½ zÃ¡znam %s u poloÅ¾ky '%s'."
+msgstr "Opravte zdvojenÃ½ zÃ¡znam %s poloÅ¾ky %s."
 
 #: admin/systems/services/dns/class_serviceDNSeditZoneEntries.inc:441
 msgid "Remove"
-msgstr "odebrat"
+msgstr "Odstranit"
 
 #: admin/systems/services/dns/class_serviceDNSeditZoneEntries.inc:492
 #, php-format
@@ -268,32 +235,32 @@ msgstr "Forma zÃ¡pisu poloÅ¾ky %s (typ zÃ¡znamu %s, hodnota %s) nenÃ platnÃ¡!"
 
 #: admin/systems/services/dns/class_serviceDNSeditZoneEntries.inc:492
 msgid "Example"
-msgstr "ukÃ¡zka"
+msgstr "UkÃ¡zka"
 
 #: admin/systems/services/dns/class_serviceDNSeditZoneEntries.inc:498
 #: admin/systems/services/dns/class_serviceDNSeditZoneEntries.inc:506
 #: admin/systems/services/dns/class_serviceDNSeditZoneEntries.inc:514
 #: admin/systems/services/dns/class_serviceDNSeditZoneEntries.inc:545
 msgid "Entry should be a DNS name."
-msgstr "poloÅ¾ka musÃ bÃ½t DNS nÃ¡zvem"
+msgstr "PoloÅ¾ka by mÄ›la bÃ½t DNS nÃ¡zev."
 
 #: admin/systems/services/dns/class_serviceDNSeditZoneEntries.inc:501
 msgid "Value should be an IPv6 address."
-msgstr "Hodnota musÃ bÃ½t IPv6 adresou."
+msgstr "Tato hodnota by mÄ›la bÃ½t IPv6 adresa."
 
 #: admin/systems/services/dns/class_serviceDNSeditZoneEntries.inc:509
 msgid "Value should be an IPv4 address."
-msgstr "Hodnota musÃ bÃ½t IPv4 adresou."
+msgstr "Hodnota by mÄ›la bÃ½t IPv4 adresa."
 
 #: admin/systems/services/dns/class_serviceDNSeditZoneEntries.inc:517
 #: admin/systems/services/dns/class_serviceDNSeditZoneEntries.inc:535
 #: admin/systems/services/dns/class_serviceDNSeditZoneEntries.inc:540
 msgid "Value should be a DNS name."
-msgstr "Hodnota musÃ bÃ½t DNS jmÃ©nem."
+msgstr "Hodnota by mÄ›la bÃ½t DNS nÃ¡zev."
 
 #: admin/systems/services/dns/class_serviceDNSeditZoneEntries.inc:524
 msgid "Value 1 should be a number."
-msgstr "Hodnota 1 musÃ bÃ½t ÄÃslo."
+msgstr "Hodnota 1 by mÄ›la bÃ½t ÄÃslo."
 
 #: admin/systems/services/dns/class_serviceDNSeditZoneEntries.inc:527
 msgid "Value 2 should be a DNS name."
@@ -301,23 +268,23 @@ msgstr "Hodnota 2 musÃ bÃ½t DNS jmÃ©no."
 
 #: admin/systems/services/dns/class_serviceDNSeditZoneEntries.inc:530
 msgid "Value should be composed of 'preference target'."
-msgstr "Hodnota se musÃ sklÃ¡dat z: 'upÅ™ednostÅˆovanÃ© cÃl'."
+msgstr "Hodnota by se mÄ›la sestÃ¡vat z: upÅ™ednostÅˆovanÃ© cÃl."
 
 #: admin/systems/services/dns/class_serviceDNSeditZoneEntries.inc:550
 msgid "Value 1 (priority) should be a number."
-msgstr "Hodnota 1 (priorita) musÃ bÃ½t ÄÃslo."
+msgstr "Hodnota 1 (priorita) by mÄ›la bÃ½t ÄÃslo."
 
 #: admin/systems/services/dns/class_serviceDNSeditZoneEntries.inc:553
 msgid "Value 2 (weight) should be a number."
-msgstr "Hodnota 2 (vÃ¡ha) musÃ bÃ½t ÄÃslo."
+msgstr "Hodnota 2 (vÃ¡ha) by mÄ›la bÃ½t ÄÃslo."
 
 #: admin/systems/services/dns/class_serviceDNSeditZoneEntries.inc:556
 msgid "Value 3 (port) should be a number."
-msgstr "Hodnota 3 (port) musÃ bÃ½t ÄÃslo."
+msgstr "Hodnota 3 (port) by mÄ›la bÃ½t ÄÃslo."
 
 #: admin/systems/services/dns/class_serviceDNSeditZoneEntries.inc:559
 msgid "Value 4 (target) should be a DNS name."
-msgstr "Hodnota 4 (cÃl) musÃ bÃ½t DNS nÃ¡zev."
+msgstr "Hodnota 4 (cÃl) by mÄ›la bÃ½t DNS nÃ¡zev."
 
 #: admin/systems/services/dns/class_serviceDNSeditZoneEntries.inc:562
 msgid "Value should be composed of 'priority weight port target'."
@@ -325,80 +292,20 @@ msgstr "Hodnota se musÃ sklÃ¡dat z: â€žpriorita vÃ¡ha port cÃlâ€œ."
 
 #: config/dns/class_dnsConfig.inc:28
 msgid "DNS configuration"
-msgstr "nastavenÃ DNS"
+msgstr "NastavenÃ DNS"
 
 #: config/dns/class_dnsConfig.inc:29
 msgid "FusionDirectory dns plugin configuration"
-msgstr ""
+msgstr "NastavenÃ zÃ¡suvnÃ©ho modulu dns pro FusionDirectory"
 
 #: config/dns/class_dnsConfig.inc:42
 msgid "DNS config"
-msgstr ""
+msgstr "NastavenÃ DNS"
 
 #: config/dns/class_dnsConfig.inc:45
 msgid "Store final dot in domains"
-msgstr ""
+msgstr "DomÃ©ny uklÃ¡dat vÄetnÄ› teÄek na samÃ©m konci"
 
 #: config/dns/class_dnsConfig.inc:45
 msgid "Should FD store a final dot at the end of domains?"
-msgstr ""
-
-#: admin/systems/services/dns/serviceDNSeditZone.tpl.c:2
-msgid "Generic"
-msgstr "obecnÃ©"
-
-#: admin/systems/services/dns/serviceDNSeditZone.tpl.c:11
-msgid "Netmask"
-msgstr "sÃÅ¥ovÃ¡ maska"
-
-#: admin/systems/services/dns/serviceDNSeditZone.tpl.c:14
-msgid "Zone is in use, network settings can't be modified."
-msgstr "ZÃ³na je vyuÅ¾ÃvÃ¡na, sÃÅ¥ovÃ¡ nastavenÃ proto nelze mÄ›nit."
-
-#: admin/systems/services/dns/serviceDNSeditZone.tpl.c:20
-msgid "Can't be edited because the zone wasn't saved right now."
-msgstr "Nelze upravovat protoÅ¾e zÃ³na jeÅ¡tÄ› nebyla uloÅ¾ena."
-
-#: admin/systems/services/dns/serviceDNSeditZone.tpl.c:23
-msgid "Edit"
-msgstr "upravit"
-
-#: admin/systems/services/dns/serviceDNSeditZone.tpl.c:26
-msgid "SOA record"
-msgstr "zÃ¡znam SOA"
-
-#: admin/systems/services/dns/serviceDNSeditZone.tpl.c:29
-msgid "Primary dns server for this zone"
-msgstr "hlavnÃ DNS server pro tuto zÃ³nu"
-
-#: admin/systems/services/dns/serviceDNSeditZone.tpl.c:35
-msgid "Serial number (automatically incremented)"
-msgstr "sÃ©riovÃ© ÄÃslo (automaticky navyÅ¡ovÃ¡no)"
-
-#: admin/systems/services/dns/serviceDNSeditZone.tpl.c:50
-msgid "MxRecords"
-msgstr "zÃ¡znamy MX"
-
-#: admin/systems/services/dns/serviceDNSeditZone.tpl.c:53
-msgid "Global zone records"
-msgstr "globÃ¡lnÃ zÃ¡znamy zÃ³ny"
-
-#: admin/systems/services/dns/serviceDNS.tpl.c:2
-msgid "Zones"
-msgstr "zÃ³ny"
-
-#: admin/systems/services/dns/serviceDNSeditZoneEntries.tpl.c:2
-msgid ""
-"This dialog allows you to configure all components of this DNS zone on a "
-"single list."
-msgstr "Tento dialog umoÅ¾Åˆuje nastavovat vÅ¡echny souÄÃ¡sti tÃ©to DNS zÃ³ny v jedinÃ©m seznamu."
-
-#: admin/systems/services/dns/serviceDNSeditZoneEntries.tpl.c:5
-msgid ""
-"This dialog can't be used until the currently edited zone was saved or the "
-"zone entry exists in the ldap database."
-msgstr "Tento dialog je v tuto chvÃli nedostupnÃ½. BuÄ se ÄekÃ¡ na uloÅ¾enÃ aktuÃ¡lnÄ› upravovanÃ© zÃ³ny nebo v databÃ¡zi LDAPu uÅ¾ existuje stejnojmennÃ¡ poloÅ¾ka."
-
-#: admin/systems/services/dns/serviceDNSeditZoneEntries.tpl.c:11
-msgid "Create a new DNS zone entry"
-msgstr "vytvoÅ™it novou poloÅ¾ku zÃ³ny DNS"
+msgstr "MÃ¡ F.D uklÃ¡dat teÄku ÃºplnÄ› na konci domÃ©ny?"
diff --git a/dns/locale/de/fusiondirectory.po b/dns/locale/de/fusiondirectory.po
index 03f917c1d639088e59307ad11239e29992603d56..74d2ec04ad30bba1a6ac9dc4a050391b40cfe651 100644
--- a/dns/locale/de/fusiondirectory.po
+++ b/dns/locale/de/fusiondirectory.po
@@ -3,33 +3,23 @@
 # This file is distributed under the same license as the PACKAGE package.
 # 
 # Translators:
+# Ettore Atalan <atalanttore@googlemail.com>, 2014
 # Maik Wagner <maikwagner@yahoo.com>, 2013
-#  Stefan Koehler <stefan.koehler@GONICUS.de>, 2005
 msgid ""
 msgstr ""
-"Project-Id-Version: FusionDirectory-108\n"
+"Project-Id-Version: FusionDirectory-109\n"
 "Report-Msgid-Bugs-To: documentation@lists.fusiondirectory.org\n"
-"POT-Creation-Date: 2015-03-19 21:45+0100\n"
-"PO-Revision-Date: 2015-02-25 16:12+0000\n"
-"Last-Translator: fusiondirectory <contact@fusiondirectory.org>\n"
-"Language-Team: German (http://www.transifex.com/projects/p/FusionDirectory-108/language/de/)\n"
+"POT-Creation-Date: 2014-12-15 17:47+0100\n"
+"PO-Revision-Date: 2015-02-25 16:13+0000\n"
+"Last-Translator: Ettore Atalan <atalanttore@googlemail.com>\n"
+"Language-Team: German (http://www.transifex.com/projects/p/FusionDirectory-109/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/services/dns/class_serviceDNS.inc:45
-#: admin/systems/services/dns/class_serviceDNS.inc:386
-#: admin/systems/services/dns/class_serviceDNS.inc:394
-#: admin/systems/services/dns/class_serviceDNS.inc:395
-msgid "DNS service"
-msgstr "DNS-Dienst"
-
-#: admin/systems/services/dns/class_serviceDNS.inc:101
-#: admin/systems/services/dns/class_serviceDNS.inc:258
-#: admin/systems/services/dns/class_serviceDNS.inc:271
-#: admin/systems/services/dns/class_serviceDNS.inc:277
+#: admin/systems/services/dns/class_serviceDNS.inc:49
 #: admin/systems/services/dns/class_DNS.inc:167
 #: admin/systems/services/dns/class_DNS.inc:172
 #: admin/systems/services/dns/class_DNS.inc:617
@@ -38,120 +28,101 @@ msgstr "DNS-Dienst"
 msgid "Error"
 msgstr "Fehler"
 
-#: admin/systems/services/dns/class_serviceDNS.inc:195
-#: admin/systems/services/dns/class_serviceDNS.inc:406
-#: admin/systems/services/dns/class_serviceDNSeditZone.inc:352
-msgid "Reverse zone"
-msgstr "Reverse Zone"
-
-#: admin/systems/services/dns/class_serviceDNS.inc:196
-#: admin/systems/services/dns/class_serviceDNS.inc:415
-#: admin/systems/services/dns/serviceDNSeditZone.tpl.c:47
-msgid "TTL"
-msgstr "TTL"
+#: admin/systems/services/dns/class_serviceDNS.inc:98
+msgid "DNS zones"
+msgstr "DNS-Zonen"
 
-#: admin/systems/services/dns/class_serviceDNS.inc:197
-msgid "Class"
-msgstr "Klasse"
-
-#: admin/systems/services/dns/class_serviceDNS.inc:258
-#, php-format
-msgid "Cannot delete the selected zone. It is still in use by '%s'"
-msgstr "Sie kÃ¶nnen die gewÃ¤hlte Zone nicht entfernen, sie wird noch von folgendem(n) Eintrag / EintrÃ¤gen verwendet: '%s'"
-
-#: admin/systems/services/dns/class_serviceDNS.inc:271
-#, php-format
-msgid "Was not able to contact argonaut server: %s"
-msgstr "Es ist nicht mÃ¶glich gewesen, argonaut server: %s zu kontaktieren"
-
-#: admin/systems/services/dns/class_serviceDNS.inc:277
-#, php-format
-msgid "Was not able to launch ldap2zone: %s"
-msgstr "Es ist nicht mÃ¶glich gewesen, ldap2zone: %s zu starten "
-
-#: admin/systems/services/dns/class_serviceDNS.inc:339
-#: admin/systems/services/dns/class_serviceDNS.inc:353
-#: admin/systems/services/dns/class_serviceDNS.inc:370
-#: admin/systems/services/dns/class_serviceDNS.inc:376
-#: admin/systems/services/dns/class_DNS.inc:730
-msgid "LDAP error"
-msgstr "LDAP-Fehler"
+#: admin/systems/services/dns/class_serviceDNS.inc:102
+msgid "The DNS zones"
+msgstr "Die DNS-Zonen"
 
-#: admin/systems/services/dns/class_serviceDNS.inc:395
-msgid "Services"
-msgstr "Dienste"
+#: admin/systems/services/dns/class_serviceDNS.inc:114
+#: admin/systems/services/dns/class_serviceDNS.inc:115
+msgid "DNS service"
+msgstr "DNS-Dienst"
 
-#: admin/systems/services/dns/class_serviceDNS.inc:401
+#: admin/systems/services/dns/class_serviceDNS.inc:119
 msgid "Start service"
 msgstr "Dienst starten"
 
-#: admin/systems/services/dns/class_serviceDNS.inc:402
+#: admin/systems/services/dns/class_serviceDNS.inc:120
 msgid "Stop service"
 msgstr "Dienst stoppen"
 
-#: admin/systems/services/dns/class_serviceDNS.inc:403
+#: admin/systems/services/dns/class_serviceDNS.inc:121
 msgid "Restart service"
-msgstr "Dienst neustarten"
+msgstr "Dienst neu starten"
 
-#: admin/systems/services/dns/class_serviceDNS.inc:405
-#: admin/systems/services/dns/class_serviceDNSeditZone.inc:343
-#: admin/systems/services/dns/class_serviceDNSeditZone.inc:348
-#: admin/systems/services/dns/class_serviceDNSeditZone.inc:356
-#: admin/systems/services/dns/serviceDNSeditZone.tpl.c:5
+#: admin/systems/services/dns/class_serviceDNS.inc:123
+#: admin/systems/services/dns/class_serviceDNSeditZone.inc:339
+#: admin/systems/services/dns/class_serviceDNSeditZone.inc:344
+#: admin/systems/services/dns/class_serviceDNSeditZone.inc:352
 msgid "Zone name"
 msgstr "Zonenname"
 
-#: admin/systems/services/dns/class_serviceDNS.inc:407
-#: admin/systems/services/dns/class_serviceDNSeditZone.inc:436
+#: admin/systems/services/dns/class_serviceDNS.inc:124
+#: admin/systems/services/dns/class_serviceDNSeditZone.inc:348
+msgid "Reverse zone"
+msgstr "Reverse Zone"
+
+#: admin/systems/services/dns/class_serviceDNS.inc:125
+#: admin/systems/services/dns/class_serviceDNSeditZone.inc:432
 msgid "Network class"
-msgstr "Netzwerk-Klasse"
+msgstr "Netzwerkklasse"
 
-#: admin/systems/services/dns/class_serviceDNS.inc:408
+#: admin/systems/services/dns/class_serviceDNS.inc:126
 msgid "Zone entry editor"
-msgstr "Zonen-Editor"
+msgstr "Zoneneditor"
 
-#: admin/systems/services/dns/class_serviceDNS.inc:409
-#: admin/systems/services/dns/class_serviceDNSeditZone.inc:360
+#: admin/systems/services/dns/class_serviceDNS.inc:127
+#: admin/systems/services/dns/class_serviceDNSeditZone.inc:356
 msgid "Primary dns server"
 msgstr "PrimÃ¤rer DNS-Server"
 
-#: admin/systems/services/dns/class_serviceDNS.inc:410
-#: admin/systems/services/dns/serviceDNSeditZone.tpl.c:32
+#: admin/systems/services/dns/class_serviceDNS.inc:128
 msgid "Mail address"
 msgstr "Mail-Adresse"
 
-#: admin/systems/services/dns/class_serviceDNS.inc:411
-#: admin/systems/services/dns/class_serviceDNSeditZone.inc:364
+#: admin/systems/services/dns/class_serviceDNS.inc:129
+#: admin/systems/services/dns/class_serviceDNSeditZone.inc:360
 msgid "Serial"
-msgstr "Serial"
+msgstr "Seriell"
 
-#: admin/systems/services/dns/class_serviceDNS.inc:412
-#: admin/systems/services/dns/class_serviceDNSeditZone.inc:368
-#: admin/systems/services/dns/serviceDNSeditZone.tpl.c:38
+#: admin/systems/services/dns/class_serviceDNS.inc:130
+#: admin/systems/services/dns/class_serviceDNSeditZone.inc:364
 msgid "Refresh"
 msgstr "Aktualisieren"
 
-#: admin/systems/services/dns/class_serviceDNS.inc:413
-#: admin/systems/services/dns/class_serviceDNSeditZone.inc:380
-#: admin/systems/services/dns/serviceDNSeditZone.tpl.c:41
+#: admin/systems/services/dns/class_serviceDNS.inc:131
+#: admin/systems/services/dns/class_serviceDNSeditZone.inc:376
 msgid "Retry"
 msgstr "Wiederholen"
 
-#: admin/systems/services/dns/class_serviceDNS.inc:414
-#: admin/systems/services/dns/class_serviceDNSeditZone.inc:376
-#: admin/systems/services/dns/serviceDNSeditZone.tpl.c:44
+#: admin/systems/services/dns/class_serviceDNS.inc:132
+#: admin/systems/services/dns/class_serviceDNSeditZone.inc:372
 msgid "Expire"
 msgstr "Ablauf"
 
-#: admin/systems/services/dns/class_serviceDNS.inc:416
+#: admin/systems/services/dns/class_serviceDNS.inc:133
+msgid "TTL"
+msgstr "TTL"
+
+#: admin/systems/services/dns/class_serviceDNS.inc:134
 msgid "MX records"
 msgstr "MX-DatensÃ¤tze"
 
-#: admin/systems/services/dns/class_serviceDNS.inc:417
-#: admin/systems/services/dns/serviceDNSeditZone.tpl.c:17
+#: admin/systems/services/dns/class_serviceDNS.inc:135
 msgid "Zone records"
 msgstr "Zonen-DatensÃ¤tze"
 
+#: admin/systems/services/dns/class_serviceDNS.inc:198
+#: admin/systems/services/dns/class_serviceDNS.inc:212
+#: admin/systems/services/dns/class_serviceDNS.inc:229
+#: admin/systems/services/dns/class_serviceDNS.inc:235
+#: admin/systems/services/dns/class_DNS.inc:730
+msgid "LDAP error"
+msgstr "LDAP-Fehler"
+
 #: admin/systems/services/dns/class_DNS.inc:167
 #, php-format
 msgid "Cannot find reverse zone for DNS zone '%s'. Parsing zone aborted."
@@ -176,44 +147,42 @@ msgid "MxRecord"
 msgstr "MX-Eintrag"
 
 #: admin/systems/services/dns/class_serviceDNSeditZone.inc:274
-#: admin/systems/services/dns/class_serviceDNSeditZone.inc:518
+#: admin/systems/services/dns/class_serviceDNSeditZone.inc:514
 msgid "Delete"
 msgstr "Entfernen"
 
-#: admin/systems/services/dns/class_serviceDNSeditZone.inc:356
-#: admin/systems/services/dns/class_serviceDNSeditZone.inc:386
+#: admin/systems/services/dns/class_serviceDNSeditZone.inc:352
+#: admin/systems/services/dns/class_serviceDNSeditZone.inc:382
 msgid "Only lowercase allowed"
 msgstr "Nur Kleinbuchstaben sind erlaubt."
 
-#: admin/systems/services/dns/class_serviceDNSeditZone.inc:360
+#: admin/systems/services/dns/class_serviceDNSeditZone.inc:356
 msgid "This field should be a domain name"
 msgstr "Dieses Feld sollte ein Domainname sein"
 
-#: admin/systems/services/dns/class_serviceDNSeditZone.inc:372
+#: admin/systems/services/dns/class_serviceDNSeditZone.inc:368
 msgid "Time to life"
 msgstr "Lebensdauer"
 
-#: admin/systems/services/dns/class_serviceDNSeditZone.inc:395
-#: admin/systems/services/dns/class_serviceDNSeditZone.inc:415
-#: admin/systems/services/dns/serviceDNSeditZone.tpl.c:8
+#: admin/systems/services/dns/class_serviceDNSeditZone.inc:391
+#: admin/systems/services/dns/class_serviceDNSeditZone.inc:411
 msgid "Network address"
 msgstr "Netzwerk-Adresse"
 
-#: admin/systems/services/dns/class_serviceDNSeditZone.inc:423
-#: admin/systems/services/dns/class_serviceDNSeditZone.inc:428
-#: admin/systems/services/dns/class_serviceDNSeditZone.inc:433
+#: admin/systems/services/dns/class_serviceDNSeditZone.inc:419
+#: admin/systems/services/dns/class_serviceDNSeditZone.inc:424
+#: admin/systems/services/dns/class_serviceDNSeditZone.inc:429
 #, php-format
 msgid ""
 "The specified network address and the network class (%s/%s) do not match!"
 msgstr "Die angegebene Netzwerkaddresse und die Netzwerkklasse (%s/%s) passen nicht zueinander!"
 
-#: admin/systems/services/dns/class_serviceDNSeditZone.inc:524
+#: admin/systems/services/dns/class_serviceDNSeditZone.inc:520
 #: admin/systems/services/dns/class_serviceDNSeditZoneEntries.inc:439
 msgid "Add"
 msgstr "HinzufÃ¼gen"
 
 #: admin/systems/services/dns/class_serviceDNSeditZoneEntries.inc:121
-#: admin/systems/services/dns/serviceDNSeditZoneEntries.tpl.c:8
 msgid "New entry"
 msgstr "Neuer Eintrag"
 
@@ -336,68 +305,8 @@ msgstr "DNS Konfiguration"
 
 #: config/dns/class_dnsConfig.inc:45
 msgid "Store final dot in domains"
-msgstr "Letzten dot in Domains speichern"
+msgstr "Letzten Punkt in Domains speichern"
 
 #: config/dns/class_dnsConfig.inc:45
 msgid "Should FD store a final dot at the end of domains?"
-msgstr "Soll FD einen letzten Dot am Ende von Domains speichern?"
-
-#: admin/systems/services/dns/serviceDNSeditZone.tpl.c:2
-msgid "Generic"
-msgstr "Allgemein"
-
-#: admin/systems/services/dns/serviceDNSeditZone.tpl.c:11
-msgid "Netmask"
-msgstr "Netzmaske"
-
-#: admin/systems/services/dns/serviceDNSeditZone.tpl.c:14
-msgid "Zone is in use, network settings can't be modified."
-msgstr "Die Zone wird gerade verwendet, die Einstellungen kÃ¶nnen nicht verÃ¤ndert werden."
-
-#: admin/systems/services/dns/serviceDNSeditZone.tpl.c:20
-msgid "Can't be edited because the zone wasn't saved right now."
-msgstr "Kann nicht bearbeitet werden, da die Zone bis jetzt nicht gespeichert wurde."
-
-#: admin/systems/services/dns/serviceDNSeditZone.tpl.c:23
-msgid "Edit"
-msgstr "Bearbeiten"
-
-#: admin/systems/services/dns/serviceDNSeditZone.tpl.c:26
-msgid "SOA record"
-msgstr "SOA-Eintrag"
-
-#: admin/systems/services/dns/serviceDNSeditZone.tpl.c:29
-msgid "Primary dns server for this zone"
-msgstr "PrimÃ¤rer DNS-Server fÃ¼r diese Zone"
-
-#: admin/systems/services/dns/serviceDNSeditZone.tpl.c:35
-msgid "Serial number (automatically incremented)"
-msgstr "Seriennummer (automatisch erhÃ¶ht)"
-
-#: admin/systems/services/dns/serviceDNSeditZone.tpl.c:50
-msgid "MxRecords"
-msgstr "MX-DatensÃ¤tze"
-
-#: admin/systems/services/dns/serviceDNSeditZone.tpl.c:53
-msgid "Global zone records"
-msgstr "Globale Zonen-DatensÃ¤tze"
-
-#: admin/systems/services/dns/serviceDNS.tpl.c:2
-msgid "Zones"
-msgstr "Zonen"
-
-#: admin/systems/services/dns/serviceDNSeditZoneEntries.tpl.c:2
-msgid ""
-"This dialog allows you to configure all components of this DNS zone on a "
-"single list."
-msgstr "Dieser Dialog erlaubt es Ihnen, alle Komponenten dieser DNS-Zone mithilfe einer einzelnen Liste zu konfigurieren."
-
-#: admin/systems/services/dns/serviceDNSeditZoneEntries.tpl.c:5
-msgid ""
-"This dialog can't be used until the currently edited zone was saved or the "
-"zone entry exists in the ldap database."
-msgstr "Dieser Dialog kann nicht verwendet werden, bis die momentan geÃ¶ffnete Zone gespeichert wurde und/oder der passende Eintrag in der LDAP-Datenbank existiert."
-
-#: admin/systems/services/dns/serviceDNSeditZoneEntries.tpl.c:11
-msgid "Create a new DNS zone entry"
-msgstr "Einen neuen DNS-Zonen-Eintrag erstellen"
+msgstr "Soll FD einen letzten Punkt am Ende von Domains speichern?"
diff --git a/dns/locale/el_GR/fusiondirectory.po b/dns/locale/el_GR/fusiondirectory.po
new file mode 100644
index 0000000000000000000000000000000000000000..5eb03707413a8fa1104fee3a5425c9889ea76fdd
--- /dev/null
+++ b/dns/locale/el_GR/fusiondirectory.po
@@ -0,0 +1,310 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR FusionDirectory Project
+# This file is distributed under the same license as the PACKAGE package.
+# 
+# Translators:
+msgid ""
+msgstr ""
+"Project-Id-Version: FusionDirectory-109\n"
+"Report-Msgid-Bugs-To: documentation@lists.fusiondirectory.org\n"
+"POT-Creation-Date: 2014-12-15 17:47+0100\n"
+"PO-Revision-Date: 2015-05-30 11:45+0000\n"
+"Last-Translator: Benoit Mortier <benoit.mortier@opensides.be>\n"
+"Language-Team: Greek (Greece) (http://www.transifex.com/projects/p/FusionDirectory-109/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/services/dns/class_serviceDNS.inc:49
+#: admin/systems/services/dns/class_DNS.inc:167
+#: admin/systems/services/dns/class_DNS.inc:172
+#: admin/systems/services/dns/class_DNS.inc:617
+#: admin/systems/services/dns/class_serviceDNSeditZone.inc:200
+#: admin/systems/services/dns/class_serviceDNSeditZoneEntries.inc:229
+msgid "Error"
+msgstr ""
+
+#: admin/systems/services/dns/class_serviceDNS.inc:98
+msgid "DNS zones"
+msgstr ""
+
+#: admin/systems/services/dns/class_serviceDNS.inc:102
+msgid "The DNS zones"
+msgstr ""
+
+#: admin/systems/services/dns/class_serviceDNS.inc:114
+#: admin/systems/services/dns/class_serviceDNS.inc:115
+msgid "DNS service"
+msgstr ""
+
+#: admin/systems/services/dns/class_serviceDNS.inc:119
+msgid "Start service"
+msgstr ""
+
+#: admin/systems/services/dns/class_serviceDNS.inc:120
+msgid "Stop service"
+msgstr ""
+
+#: admin/systems/services/dns/class_serviceDNS.inc:121
+msgid "Restart service"
+msgstr ""
+
+#: admin/systems/services/dns/class_serviceDNS.inc:123
+#: admin/systems/services/dns/class_serviceDNSeditZone.inc:339
+#: admin/systems/services/dns/class_serviceDNSeditZone.inc:344
+#: admin/systems/services/dns/class_serviceDNSeditZone.inc:352
+msgid "Zone name"
+msgstr ""
+
+#: admin/systems/services/dns/class_serviceDNS.inc:124
+#: admin/systems/services/dns/class_serviceDNSeditZone.inc:348
+msgid "Reverse zone"
+msgstr ""
+
+#: admin/systems/services/dns/class_serviceDNS.inc:125
+#: admin/systems/services/dns/class_serviceDNSeditZone.inc:432
+msgid "Network class"
+msgstr ""
+
+#: admin/systems/services/dns/class_serviceDNS.inc:126
+msgid "Zone entry editor"
+msgstr ""
+
+#: admin/systems/services/dns/class_serviceDNS.inc:127
+#: admin/systems/services/dns/class_serviceDNSeditZone.inc:356
+msgid "Primary dns server"
+msgstr ""
+
+#: admin/systems/services/dns/class_serviceDNS.inc:128
+msgid "Mail address"
+msgstr ""
+
+#: admin/systems/services/dns/class_serviceDNS.inc:129
+#: admin/systems/services/dns/class_serviceDNSeditZone.inc:360
+msgid "Serial"
+msgstr ""
+
+#: admin/systems/services/dns/class_serviceDNS.inc:130
+#: admin/systems/services/dns/class_serviceDNSeditZone.inc:364
+msgid "Refresh"
+msgstr ""
+
+#: admin/systems/services/dns/class_serviceDNS.inc:131
+#: admin/systems/services/dns/class_serviceDNSeditZone.inc:376
+msgid "Retry"
+msgstr ""
+
+#: admin/systems/services/dns/class_serviceDNS.inc:132
+#: admin/systems/services/dns/class_serviceDNSeditZone.inc:372
+msgid "Expire"
+msgstr ""
+
+#: admin/systems/services/dns/class_serviceDNS.inc:133
+msgid "TTL"
+msgstr ""
+
+#: admin/systems/services/dns/class_serviceDNS.inc:134
+msgid "MX records"
+msgstr ""
+
+#: admin/systems/services/dns/class_serviceDNS.inc:135
+msgid "Zone records"
+msgstr ""
+
+#: admin/systems/services/dns/class_serviceDNS.inc:198
+#: admin/systems/services/dns/class_serviceDNS.inc:212
+#: admin/systems/services/dns/class_serviceDNS.inc:229
+#: admin/systems/services/dns/class_serviceDNS.inc:235
+#: admin/systems/services/dns/class_DNS.inc:730
+msgid "LDAP error"
+msgstr ""
+
+#: admin/systems/services/dns/class_DNS.inc:167
+#, php-format
+msgid "Cannot find reverse zone for DNS zone '%s'. Parsing zone aborted."
+msgstr ""
+
+#: admin/systems/services/dns/class_DNS.inc:172
+#, php-format
+msgid "Found more than one reverse zone for '%s'. Parsing zone aborted."
+msgstr ""
+
+#: admin/systems/services/dns/class_DNS.inc:617
+#, php-format
+msgid "Undefined zone name '%s'!"
+msgstr ""
+
+#: admin/systems/services/dns/class_serviceDNSeditZone.inc:244
+msgid "Warning"
+msgstr ""
+
+#: admin/systems/services/dns/class_serviceDNSeditZone.inc:244
+msgid "MxRecord"
+msgstr ""
+
+#: admin/systems/services/dns/class_serviceDNSeditZone.inc:274
+#: admin/systems/services/dns/class_serviceDNSeditZone.inc:514
+msgid "Delete"
+msgstr ""
+
+#: admin/systems/services/dns/class_serviceDNSeditZone.inc:352
+#: admin/systems/services/dns/class_serviceDNSeditZone.inc:382
+msgid "Only lowercase allowed"
+msgstr ""
+
+#: admin/systems/services/dns/class_serviceDNSeditZone.inc:356
+msgid "This field should be a domain name"
+msgstr ""
+
+#: admin/systems/services/dns/class_serviceDNSeditZone.inc:368
+msgid "Time to life"
+msgstr ""
+
+#: admin/systems/services/dns/class_serviceDNSeditZone.inc:391
+#: admin/systems/services/dns/class_serviceDNSeditZone.inc:411
+msgid "Network address"
+msgstr ""
+
+#: admin/systems/services/dns/class_serviceDNSeditZone.inc:419
+#: admin/systems/services/dns/class_serviceDNSeditZone.inc:424
+#: admin/systems/services/dns/class_serviceDNSeditZone.inc:429
+#, php-format
+msgid ""
+"The specified network address and the network class (%s/%s) do not match!"
+msgstr ""
+
+#: admin/systems/services/dns/class_serviceDNSeditZone.inc:520
+#: admin/systems/services/dns/class_serviceDNSeditZoneEntries.inc:439
+msgid "Add"
+msgstr ""
+
+#: admin/systems/services/dns/class_serviceDNSeditZoneEntries.inc:121
+msgid "New entry"
+msgstr ""
+
+#: admin/systems/services/dns/class_serviceDNSeditZoneEntries.inc:229
+#, php-format
+msgid "Cannot rename '%s' to '%s'. Name is already in use!"
+msgstr ""
+
+#: admin/systems/services/dns/class_serviceDNSeditZoneEntries.inc:260
+msgid "Name"
+msgstr ""
+
+#: admin/systems/services/dns/class_serviceDNSeditZoneEntries.inc:268
+#, php-format
+msgid "Cannot rename '%s' to '%s'. Entry is already in use."
+msgstr ""
+
+#: admin/systems/services/dns/class_serviceDNSeditZoneEntries.inc:274
+#, php-format
+msgid "Cannot create '%s'. Entry is already in use."
+msgstr ""
+
+#: admin/systems/services/dns/class_serviceDNSeditZoneEntries.inc:282
+#, php-format
+msgid "Entry '%s' is used more than once."
+msgstr ""
+
+#: admin/systems/services/dns/class_serviceDNSeditZoneEntries.inc:299
+#, php-format
+msgid "%s records cannot be used more than once."
+msgstr ""
+
+#: admin/systems/services/dns/class_serviceDNSeditZoneEntries.inc:305
+#, php-format
+msgid "Please fix the empty %s record for entry '%s'."
+msgstr ""
+
+#: admin/systems/services/dns/class_serviceDNSeditZoneEntries.inc:312
+#, php-format
+msgid "Please fix the duplicate %s record for entry '%s'."
+msgstr ""
+
+#: admin/systems/services/dns/class_serviceDNSeditZoneEntries.inc:441
+msgid "Remove"
+msgstr ""
+
+#: admin/systems/services/dns/class_serviceDNSeditZoneEntries.inc:492
+#, php-format
+msgid "The syntax of entry %s (record type %s, value %s) is invalid!"
+msgstr ""
+
+#: admin/systems/services/dns/class_serviceDNSeditZoneEntries.inc:492
+msgid "Example"
+msgstr ""
+
+#: admin/systems/services/dns/class_serviceDNSeditZoneEntries.inc:498
+#: admin/systems/services/dns/class_serviceDNSeditZoneEntries.inc:506
+#: admin/systems/services/dns/class_serviceDNSeditZoneEntries.inc:514
+#: admin/systems/services/dns/class_serviceDNSeditZoneEntries.inc:545
+msgid "Entry should be a DNS name."
+msgstr ""
+
+#: admin/systems/services/dns/class_serviceDNSeditZoneEntries.inc:501
+msgid "Value should be an IPv6 address."
+msgstr ""
+
+#: admin/systems/services/dns/class_serviceDNSeditZoneEntries.inc:509
+msgid "Value should be an IPv4 address."
+msgstr ""
+
+#: admin/systems/services/dns/class_serviceDNSeditZoneEntries.inc:517
+#: admin/systems/services/dns/class_serviceDNSeditZoneEntries.inc:535
+#: admin/systems/services/dns/class_serviceDNSeditZoneEntries.inc:540
+msgid "Value should be a DNS name."
+msgstr ""
+
+#: admin/systems/services/dns/class_serviceDNSeditZoneEntries.inc:524
+msgid "Value 1 should be a number."
+msgstr ""
+
+#: admin/systems/services/dns/class_serviceDNSeditZoneEntries.inc:527
+msgid "Value 2 should be a DNS name."
+msgstr ""
+
+#: admin/systems/services/dns/class_serviceDNSeditZoneEntries.inc:530
+msgid "Value should be composed of 'preference target'."
+msgstr ""
+
+#: admin/systems/services/dns/class_serviceDNSeditZoneEntries.inc:550
+msgid "Value 1 (priority) should be a number."
+msgstr ""
+
+#: admin/systems/services/dns/class_serviceDNSeditZoneEntries.inc:553
+msgid "Value 2 (weight) should be a number."
+msgstr ""
+
+#: admin/systems/services/dns/class_serviceDNSeditZoneEntries.inc:556
+msgid "Value 3 (port) should be a number."
+msgstr ""
+
+#: admin/systems/services/dns/class_serviceDNSeditZoneEntries.inc:559
+msgid "Value 4 (target) should be a DNS name."
+msgstr ""
+
+#: admin/systems/services/dns/class_serviceDNSeditZoneEntries.inc:562
+msgid "Value should be composed of 'priority weight port target'."
+msgstr ""
+
+#: config/dns/class_dnsConfig.inc:28
+msgid "DNS configuration"
+msgstr ""
+
+#: config/dns/class_dnsConfig.inc:29
+msgid "FusionDirectory dns plugin configuration"
+msgstr ""
+
+#: config/dns/class_dnsConfig.inc:42
+msgid "DNS config"
+msgstr ""
+
+#: config/dns/class_dnsConfig.inc:45
+msgid "Store final dot in domains"
+msgstr ""
+
+#: config/dns/class_dnsConfig.inc:45
+msgid "Should FD store a final dot at the end of domains?"
+msgstr ""
diff --git a/dns/locale/en/fusiondirectory.po b/dns/locale/en/fusiondirectory.po
index c1c79ed56c840bc9629222dd9548b0de5a776f66..350b85e6b9fd3818d3d7df4c0fa155dce972430e 100644
--- a/dns/locale/en/fusiondirectory.po
+++ b/dns/locale/en/fusiondirectory.po
@@ -6,92 +6,69 @@
 #, fuzzy
 msgid ""
 msgstr ""
-"Project-Id-Version: PACKAGE VERSION\n"
-"Report-Msgid-Bugs-To: documentation@lists.fusiondirectory.org\n"
-"POT-Creation-Date: 2015-03-31 11:49+0200\n"
+"Project-Id-Version: FusionDirectory VERSION\n"
+"Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
+"POT-Creation-Date: 2015-05-30 15:30+0200\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
-"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
-"Language-Team: LANGUAGE <LL@li.org>\n"
-"Language: \n"
+"Last-Translator: FusionDirectory project <contact@fusiondirectory.org>\n"
+"Language-Team: English\n"
+"Language: en\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: admin/systems/services/dns/class_serviceDNS.inc:45
-#: admin/systems/services/dns/class_serviceDNS.inc:386
-#: admin/systems/services/dns/class_serviceDNS.inc:394
-#: admin/systems/services/dns/class_serviceDNS.inc:395
-msgid "DNS service"
-msgstr ""
-
-#: admin/systems/services/dns/class_serviceDNS.inc:101
-#: admin/systems/services/dns/class_serviceDNS.inc:258
-#: admin/systems/services/dns/class_serviceDNS.inc:271
-#: admin/systems/services/dns/class_serviceDNS.inc:277
-#: admin/systems/services/dns/class_DNS.inc:167
-#: admin/systems/services/dns/class_DNS.inc:172
-#: admin/systems/services/dns/class_DNS.inc:617
+#: admin/systems/services/dns/class_serviceDNS.inc:54
+#: admin/systems/services/dns/class_serviceDNS.inc:305
+#: admin/systems/services/dns/class_serviceDNS.inc:313
+#: admin/systems/services/dns/class_DNS.inc:165
+#: admin/systems/services/dns/class_DNS.inc:170
+#: admin/systems/services/dns/class_DNS.inc:621
 #: admin/systems/services/dns/class_serviceDNSeditZone.inc:200
 #: admin/systems/services/dns/class_serviceDNSeditZoneEntries.inc:229
 msgid "Error"
 msgstr ""
 
-#: admin/systems/services/dns/class_serviceDNS.inc:195
-#: admin/systems/services/dns/class_serviceDNS.inc:406
-#: admin/systems/services/dns/class_serviceDNSeditZone.inc:352
-msgid "Reverse zone"
-msgstr ""
-
-#: admin/systems/services/dns/class_serviceDNS.inc:196
-#: admin/systems/services/dns/class_serviceDNS.inc:415
-#: admin/systems/services/dns/serviceDNSeditZone.tpl.c:47
-msgid "TTL"
-msgstr ""
-
-#: admin/systems/services/dns/class_serviceDNS.inc:197
-msgid "Class"
+#: admin/systems/services/dns/class_serviceDNS.inc:82
+#, php-format
+msgid "Reverse zone: %s"
 msgstr ""
 
-#: admin/systems/services/dns/class_serviceDNS.inc:258
+#: admin/systems/services/dns/class_serviceDNS.inc:83
 #, php-format
-msgid "Cannot delete the selected zone. It is still in use by '%s'"
+msgid "TTL: %s"
 msgstr ""
 
-#: admin/systems/services/dns/class_serviceDNS.inc:271
-#, php-format
-msgid "Was not able to contact argonaut server: %s"
+#: admin/systems/services/dns/class_serviceDNS.inc:106
+#: admin/systems/services/dns/class_serviceDNS.inc:107
+msgid "ldap2zone"
 msgstr ""
 
-#: admin/systems/services/dns/class_serviceDNS.inc:277
-#, php-format
-msgid "Was not able to launch ldap2zone: %s"
+#: admin/systems/services/dns/class_serviceDNS.inc:140
+msgid "DNS zones"
 msgstr ""
 
-#: admin/systems/services/dns/class_serviceDNS.inc:339
-#: admin/systems/services/dns/class_serviceDNS.inc:353
-#: admin/systems/services/dns/class_serviceDNS.inc:370
-#: admin/systems/services/dns/class_serviceDNS.inc:376
-#: admin/systems/services/dns/class_DNS.inc:730
-msgid "LDAP error"
+#: admin/systems/services/dns/class_serviceDNS.inc:144
+msgid "The DNS zones"
 msgstr ""
 
-#: admin/systems/services/dns/class_serviceDNS.inc:395
-msgid "Services"
+#: admin/systems/services/dns/class_serviceDNS.inc:156
+#: admin/systems/services/dns/class_serviceDNS.inc:157
+msgid "DNS service"
 msgstr ""
 
-#: admin/systems/services/dns/class_serviceDNS.inc:401
+#: admin/systems/services/dns/class_serviceDNS.inc:161
 msgid "Start service"
 msgstr ""
 
-#: admin/systems/services/dns/class_serviceDNS.inc:402
+#: admin/systems/services/dns/class_serviceDNS.inc:162
 msgid "Stop service"
 msgstr ""
 
-#: admin/systems/services/dns/class_serviceDNS.inc:403
+#: admin/systems/services/dns/class_serviceDNS.inc:163
 msgid "Restart service"
 msgstr ""
 
-#: admin/systems/services/dns/class_serviceDNS.inc:405
+#: admin/systems/services/dns/class_serviceDNS.inc:165
 #: admin/systems/services/dns/class_serviceDNSeditZone.inc:343
 #: admin/systems/services/dns/class_serviceDNSeditZone.inc:348
 #: admin/systems/services/dns/class_serviceDNSeditZone.inc:356
@@ -99,68 +76,96 @@ msgstr ""
 msgid "Zone name"
 msgstr ""
 
-#: admin/systems/services/dns/class_serviceDNS.inc:407
+#: admin/systems/services/dns/class_serviceDNS.inc:166
+#: admin/systems/services/dns/class_serviceDNSeditZone.inc:352
+msgid "Reverse zone"
+msgstr ""
+
+#: admin/systems/services/dns/class_serviceDNS.inc:167
 #: admin/systems/services/dns/class_serviceDNSeditZone.inc:436
 msgid "Network class"
 msgstr ""
 
-#: admin/systems/services/dns/class_serviceDNS.inc:408
+#: admin/systems/services/dns/class_serviceDNS.inc:168
 msgid "Zone entry editor"
 msgstr ""
 
-#: admin/systems/services/dns/class_serviceDNS.inc:409
+#: admin/systems/services/dns/class_serviceDNS.inc:169
 #: admin/systems/services/dns/class_serviceDNSeditZone.inc:360
 msgid "Primary dns server"
 msgstr ""
 
-#: admin/systems/services/dns/class_serviceDNS.inc:410
+#: admin/systems/services/dns/class_serviceDNS.inc:170
 #: admin/systems/services/dns/serviceDNSeditZone.tpl.c:32
 msgid "Mail address"
 msgstr ""
 
-#: admin/systems/services/dns/class_serviceDNS.inc:411
+#: admin/systems/services/dns/class_serviceDNS.inc:171
 #: admin/systems/services/dns/class_serviceDNSeditZone.inc:364
 msgid "Serial"
 msgstr ""
 
-#: admin/systems/services/dns/class_serviceDNS.inc:412
+#: admin/systems/services/dns/class_serviceDNS.inc:172
 #: admin/systems/services/dns/class_serviceDNSeditZone.inc:368
 #: admin/systems/services/dns/serviceDNSeditZone.tpl.c:38
 msgid "Refresh"
 msgstr ""
 
-#: admin/systems/services/dns/class_serviceDNS.inc:413
+#: admin/systems/services/dns/class_serviceDNS.inc:173
 #: admin/systems/services/dns/class_serviceDNSeditZone.inc:380
 #: admin/systems/services/dns/serviceDNSeditZone.tpl.c:41
 msgid "Retry"
 msgstr ""
 
-#: admin/systems/services/dns/class_serviceDNS.inc:414
+#: admin/systems/services/dns/class_serviceDNS.inc:174
 #: admin/systems/services/dns/class_serviceDNSeditZone.inc:376
 #: admin/systems/services/dns/serviceDNSeditZone.tpl.c:44
 msgid "Expire"
 msgstr ""
 
-#: admin/systems/services/dns/class_serviceDNS.inc:416
+#: admin/systems/services/dns/class_serviceDNS.inc:175
+#: admin/systems/services/dns/serviceDNSeditZone.tpl.c:47
+msgid "TTL"
+msgstr ""
+
+#: admin/systems/services/dns/class_serviceDNS.inc:176
 msgid "MX records"
 msgstr ""
 
-#: admin/systems/services/dns/class_serviceDNS.inc:417
+#: admin/systems/services/dns/class_serviceDNS.inc:177
 #: admin/systems/services/dns/serviceDNSeditZone.tpl.c:17
 msgid "Zone records"
 msgstr ""
 
-#: admin/systems/services/dns/class_DNS.inc:167
+#: admin/systems/services/dns/class_serviceDNS.inc:239
+#: admin/systems/services/dns/class_serviceDNS.inc:253
+#: admin/systems/services/dns/class_serviceDNS.inc:270
+#: admin/systems/services/dns/class_serviceDNS.inc:276
+#: admin/systems/services/dns/class_DNS.inc:734
+msgid "LDAP error"
+msgstr ""
+
+#: admin/systems/services/dns/class_serviceDNS.inc:305
+#, php-format
+msgid "Was not able to contact argonaut server: <br/><br/>%s"
+msgstr ""
+
+#: admin/systems/services/dns/class_serviceDNS.inc:313
+#, php-format
+msgid "Was not able to launch ldap2zone: <br/><br/>%s"
+msgstr ""
+
+#: admin/systems/services/dns/class_DNS.inc:165
 #, php-format
 msgid "Cannot find reverse zone for DNS zone '%s'. Parsing zone aborted."
 msgstr ""
 
-#: admin/systems/services/dns/class_DNS.inc:172
+#: admin/systems/services/dns/class_DNS.inc:170
 #, php-format
 msgid "Found more than one reverse zone for '%s'. Parsing zone aborted."
 msgstr ""
 
-#: admin/systems/services/dns/class_DNS.inc:617
+#: admin/systems/services/dns/class_DNS.inc:621
 #, php-format
 msgid "Undefined zone name '%s'!"
 msgstr ""
diff --git a/dns/locale/es/fusiondirectory.po b/dns/locale/es/fusiondirectory.po
index ac5c716aecd0a00993226a0afa3b86493133172e..3c6e7b95b01ef062efb80f0f360c4033def61256 100644
--- a/dns/locale/es/fusiondirectory.po
+++ b/dns/locale/es/fusiondirectory.po
@@ -3,32 +3,21 @@
 # This file is distributed under the same license as the PACKAGE package.
 # 
 # Translators:
-# Benoit Mortier <benoit.mortier@opensides.be>, 2012
 msgid ""
 msgstr ""
-"Project-Id-Version: FusionDirectory-108\n"
+"Project-Id-Version: FusionDirectory-109\n"
 "Report-Msgid-Bugs-To: documentation@lists.fusiondirectory.org\n"
-"POT-Creation-Date: 2015-03-19 21:45+0100\n"
-"PO-Revision-Date: 2015-02-25 16:12+0000\n"
+"POT-Creation-Date: 2014-12-15 17:47+0100\n"
+"PO-Revision-Date: 2015-02-25 16:13+0000\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>\n"
-"Language-Team: Spanish (http://www.transifex.com/projects/p/FusionDirectory-108/language/es/)\n"
+"Language-Team: Spanish (http://www.transifex.com/projects/p/FusionDirectory-109/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/services/dns/class_serviceDNS.inc:45
-#: admin/systems/services/dns/class_serviceDNS.inc:386
-#: admin/systems/services/dns/class_serviceDNS.inc:394
-#: admin/systems/services/dns/class_serviceDNS.inc:395
-msgid "DNS service"
-msgstr "Servicio DNS"
-
-#: admin/systems/services/dns/class_serviceDNS.inc:101
-#: admin/systems/services/dns/class_serviceDNS.inc:258
-#: admin/systems/services/dns/class_serviceDNS.inc:271
-#: admin/systems/services/dns/class_serviceDNS.inc:277
+#: admin/systems/services/dns/class_serviceDNS.inc:49
 #: admin/systems/services/dns/class_DNS.inc:167
 #: admin/systems/services/dns/class_DNS.inc:172
 #: admin/systems/services/dns/class_DNS.inc:617
@@ -37,120 +26,101 @@ msgstr "Servicio DNS"
 msgid "Error"
 msgstr "Error"
 
-#: admin/systems/services/dns/class_serviceDNS.inc:195
-#: admin/systems/services/dns/class_serviceDNS.inc:406
-#: admin/systems/services/dns/class_serviceDNSeditZone.inc:352
-msgid "Reverse zone"
-msgstr "Zona Inversa"
-
-#: admin/systems/services/dns/class_serviceDNS.inc:196
-#: admin/systems/services/dns/class_serviceDNS.inc:415
-#: admin/systems/services/dns/serviceDNSeditZone.tpl.c:47
-msgid "TTL"
-msgstr "TTL"
-
-#: admin/systems/services/dns/class_serviceDNS.inc:197
-msgid "Class"
-msgstr "Clase"
-
-#: admin/systems/services/dns/class_serviceDNS.inc:258
-#, php-format
-msgid "Cannot delete the selected zone. It is still in use by '%s'"
-msgstr "No se puede eliminar la zona seleccionada, porque estÃ¡ siendo usada por '%s'"
-
-#: admin/systems/services/dns/class_serviceDNS.inc:271
-#, php-format
-msgid "Was not able to contact argonaut server: %s"
+#: admin/systems/services/dns/class_serviceDNS.inc:98
+msgid "DNS zones"
 msgstr ""
 
-#: admin/systems/services/dns/class_serviceDNS.inc:277
-#, php-format
-msgid "Was not able to launch ldap2zone: %s"
+#: admin/systems/services/dns/class_serviceDNS.inc:102
+msgid "The DNS zones"
 msgstr ""
 
-#: admin/systems/services/dns/class_serviceDNS.inc:339
-#: admin/systems/services/dns/class_serviceDNS.inc:353
-#: admin/systems/services/dns/class_serviceDNS.inc:370
-#: admin/systems/services/dns/class_serviceDNS.inc:376
-#: admin/systems/services/dns/class_DNS.inc:730
-msgid "LDAP error"
-msgstr "Error LDAP"
-
-#: admin/systems/services/dns/class_serviceDNS.inc:395
-msgid "Services"
-msgstr "Servicios"
+#: admin/systems/services/dns/class_serviceDNS.inc:114
+#: admin/systems/services/dns/class_serviceDNS.inc:115
+msgid "DNS service"
+msgstr "Servicio DNS"
 
-#: admin/systems/services/dns/class_serviceDNS.inc:401
+#: admin/systems/services/dns/class_serviceDNS.inc:119
 msgid "Start service"
 msgstr "Iniciar servicio"
 
-#: admin/systems/services/dns/class_serviceDNS.inc:402
+#: admin/systems/services/dns/class_serviceDNS.inc:120
 msgid "Stop service"
 msgstr "Parar servicio"
 
-#: admin/systems/services/dns/class_serviceDNS.inc:403
+#: admin/systems/services/dns/class_serviceDNS.inc:121
 msgid "Restart service"
 msgstr "Reiniciar servicio"
 
-#: admin/systems/services/dns/class_serviceDNS.inc:405
-#: admin/systems/services/dns/class_serviceDNSeditZone.inc:343
-#: admin/systems/services/dns/class_serviceDNSeditZone.inc:348
-#: admin/systems/services/dns/class_serviceDNSeditZone.inc:356
-#: admin/systems/services/dns/serviceDNSeditZone.tpl.c:5
+#: admin/systems/services/dns/class_serviceDNS.inc:123
+#: admin/systems/services/dns/class_serviceDNSeditZone.inc:339
+#: admin/systems/services/dns/class_serviceDNSeditZone.inc:344
+#: admin/systems/services/dns/class_serviceDNSeditZone.inc:352
 msgid "Zone name"
 msgstr "Nombre de la zona"
 
-#: admin/systems/services/dns/class_serviceDNS.inc:407
-#: admin/systems/services/dns/class_serviceDNSeditZone.inc:436
+#: admin/systems/services/dns/class_serviceDNS.inc:124
+#: admin/systems/services/dns/class_serviceDNSeditZone.inc:348
+msgid "Reverse zone"
+msgstr "Zona Inversa"
+
+#: admin/systems/services/dns/class_serviceDNS.inc:125
+#: admin/systems/services/dns/class_serviceDNSeditZone.inc:432
 msgid "Network class"
 msgstr "Mascara de Red"
 
-#: admin/systems/services/dns/class_serviceDNS.inc:408
+#: admin/systems/services/dns/class_serviceDNS.inc:126
 msgid "Zone entry editor"
 msgstr "Editor de entrada de zona"
 
-#: admin/systems/services/dns/class_serviceDNS.inc:409
-#: admin/systems/services/dns/class_serviceDNSeditZone.inc:360
+#: admin/systems/services/dns/class_serviceDNS.inc:127
+#: admin/systems/services/dns/class_serviceDNSeditZone.inc:356
 msgid "Primary dns server"
 msgstr "Servidor DNS primario"
 
-#: admin/systems/services/dns/class_serviceDNS.inc:410
-#: admin/systems/services/dns/serviceDNSeditZone.tpl.c:32
+#: admin/systems/services/dns/class_serviceDNS.inc:128
 msgid "Mail address"
 msgstr "DirecciÃ³n correo electrÃ³nico"
 
-#: admin/systems/services/dns/class_serviceDNS.inc:411
-#: admin/systems/services/dns/class_serviceDNSeditZone.inc:364
+#: admin/systems/services/dns/class_serviceDNS.inc:129
+#: admin/systems/services/dns/class_serviceDNSeditZone.inc:360
 msgid "Serial"
 msgstr "Serie"
 
-#: admin/systems/services/dns/class_serviceDNS.inc:412
-#: admin/systems/services/dns/class_serviceDNSeditZone.inc:368
-#: admin/systems/services/dns/serviceDNSeditZone.tpl.c:38
+#: admin/systems/services/dns/class_serviceDNS.inc:130
+#: admin/systems/services/dns/class_serviceDNSeditZone.inc:364
 msgid "Refresh"
 msgstr "Refresco"
 
-#: admin/systems/services/dns/class_serviceDNS.inc:413
-#: admin/systems/services/dns/class_serviceDNSeditZone.inc:380
-#: admin/systems/services/dns/serviceDNSeditZone.tpl.c:41
+#: admin/systems/services/dns/class_serviceDNS.inc:131
+#: admin/systems/services/dns/class_serviceDNSeditZone.inc:376
 msgid "Retry"
 msgstr "Reintento"
 
-#: admin/systems/services/dns/class_serviceDNS.inc:414
-#: admin/systems/services/dns/class_serviceDNSeditZone.inc:376
-#: admin/systems/services/dns/serviceDNSeditZone.tpl.c:44
+#: admin/systems/services/dns/class_serviceDNS.inc:132
+#: admin/systems/services/dns/class_serviceDNSeditZone.inc:372
 msgid "Expire"
 msgstr "ExpiraciÃ³n"
 
-#: admin/systems/services/dns/class_serviceDNS.inc:416
+#: admin/systems/services/dns/class_serviceDNS.inc:133
+msgid "TTL"
+msgstr "TTL"
+
+#: admin/systems/services/dns/class_serviceDNS.inc:134
 msgid "MX records"
 msgstr "Registros MX"
 
-#: admin/systems/services/dns/class_serviceDNS.inc:417
-#: admin/systems/services/dns/serviceDNSeditZone.tpl.c:17
+#: admin/systems/services/dns/class_serviceDNS.inc:135
 msgid "Zone records"
 msgstr "Registros de zona"
 
+#: admin/systems/services/dns/class_serviceDNS.inc:198
+#: admin/systems/services/dns/class_serviceDNS.inc:212
+#: admin/systems/services/dns/class_serviceDNS.inc:229
+#: admin/systems/services/dns/class_serviceDNS.inc:235
+#: admin/systems/services/dns/class_DNS.inc:730
+msgid "LDAP error"
+msgstr "Error LDAP"
+
 #: admin/systems/services/dns/class_DNS.inc:167
 #, php-format
 msgid "Cannot find reverse zone for DNS zone '%s'. Parsing zone aborted."
@@ -175,44 +145,42 @@ msgid "MxRecord"
 msgstr ""
 
 #: admin/systems/services/dns/class_serviceDNSeditZone.inc:274
-#: admin/systems/services/dns/class_serviceDNSeditZone.inc:518
+#: admin/systems/services/dns/class_serviceDNSeditZone.inc:514
 msgid "Delete"
 msgstr "Eliminar"
 
-#: admin/systems/services/dns/class_serviceDNSeditZone.inc:356
-#: admin/systems/services/dns/class_serviceDNSeditZone.inc:386
+#: admin/systems/services/dns/class_serviceDNSeditZone.inc:352
+#: admin/systems/services/dns/class_serviceDNSeditZone.inc:382
 msgid "Only lowercase allowed"
 msgstr "Solo se permiten minÃºsculas"
 
-#: admin/systems/services/dns/class_serviceDNSeditZone.inc:360
+#: admin/systems/services/dns/class_serviceDNSeditZone.inc:356
 msgid "This field should be a domain name"
 msgstr ""
 
-#: admin/systems/services/dns/class_serviceDNSeditZone.inc:372
+#: admin/systems/services/dns/class_serviceDNSeditZone.inc:368
 msgid "Time to life"
 msgstr "DuraciÃ³n"
 
-#: admin/systems/services/dns/class_serviceDNSeditZone.inc:395
-#: admin/systems/services/dns/class_serviceDNSeditZone.inc:415
-#: admin/systems/services/dns/serviceDNSeditZone.tpl.c:8
+#: admin/systems/services/dns/class_serviceDNSeditZone.inc:391
+#: admin/systems/services/dns/class_serviceDNSeditZone.inc:411
 msgid "Network address"
 msgstr "DirecciÃ³n de red"
 
-#: admin/systems/services/dns/class_serviceDNSeditZone.inc:423
-#: admin/systems/services/dns/class_serviceDNSeditZone.inc:428
-#: admin/systems/services/dns/class_serviceDNSeditZone.inc:433
+#: admin/systems/services/dns/class_serviceDNSeditZone.inc:419
+#: admin/systems/services/dns/class_serviceDNSeditZone.inc:424
+#: admin/systems/services/dns/class_serviceDNSeditZone.inc:429
 #, php-format
 msgid ""
 "The specified network address and the network class (%s/%s) do not match!"
 msgstr "Â¡La direcciÃ³n de red indicada y la mascara de red (%s/%s) no corresponden!"
 
-#: admin/systems/services/dns/class_serviceDNSeditZone.inc:524
+#: admin/systems/services/dns/class_serviceDNSeditZone.inc:520
 #: admin/systems/services/dns/class_serviceDNSeditZoneEntries.inc:439
 msgid "Add"
 msgstr "AÃ±adir"
 
 #: admin/systems/services/dns/class_serviceDNSeditZoneEntries.inc:121
-#: admin/systems/services/dns/serviceDNSeditZoneEntries.tpl.c:8
 msgid "New entry"
 msgstr "Nueva entrada"
 
@@ -340,63 +308,3 @@ msgstr ""
 #: config/dns/class_dnsConfig.inc:45
 msgid "Should FD store a final dot at the end of domains?"
 msgstr ""
-
-#: admin/systems/services/dns/serviceDNSeditZone.tpl.c:2
-msgid "Generic"
-msgstr "GenÃ©rico"
-
-#: admin/systems/services/dns/serviceDNSeditZone.tpl.c:11
-msgid "Netmask"
-msgstr "Mascara de red"
-
-#: admin/systems/services/dns/serviceDNSeditZone.tpl.c:14
-msgid "Zone is in use, network settings can't be modified."
-msgstr "Zona en uso, no se pueden modificar los parÃ¡metros de red."
-
-#: admin/systems/services/dns/serviceDNSeditZone.tpl.c:20
-msgid "Can't be edited because the zone wasn't saved right now."
-msgstr "No se puede editar porque la zona estÃ¡ en proceso de grabaciÃ³n."
-
-#: admin/systems/services/dns/serviceDNSeditZone.tpl.c:23
-msgid "Edit"
-msgstr "Editar"
-
-#: admin/systems/services/dns/serviceDNSeditZone.tpl.c:26
-msgid "SOA record"
-msgstr "Registro SOA"
-
-#: admin/systems/services/dns/serviceDNSeditZone.tpl.c:29
-msgid "Primary dns server for this zone"
-msgstr "Servidor DNS primario para esta zona"
-
-#: admin/systems/services/dns/serviceDNSeditZone.tpl.c:35
-msgid "Serial number (automatically incremented)"
-msgstr "NÃºmero de serie (incrementado automÃ¡ticamente)"
-
-#: admin/systems/services/dns/serviceDNSeditZone.tpl.c:50
-msgid "MxRecords"
-msgstr "Registros MX"
-
-#: admin/systems/services/dns/serviceDNSeditZone.tpl.c:53
-msgid "Global zone records"
-msgstr "Registros de zona global"
-
-#: admin/systems/services/dns/serviceDNS.tpl.c:2
-msgid "Zones"
-msgstr "Zonas"
-
-#: admin/systems/services/dns/serviceDNSeditZoneEntries.tpl.c:2
-msgid ""
-"This dialog allows you to configure all components of this DNS zone on a "
-"single list."
-msgstr "Este diÃ¡logo le permite configurar todos los componente de la zona DNS en una sola lista."
-
-#: admin/systems/services/dns/serviceDNSeditZoneEntries.tpl.c:5
-msgid ""
-"This dialog can't be used until the currently edited zone was saved or the "
-"zone entry exists in the ldap database."
-msgstr "Este diÃ¡logo no puede ser ser usado hasta que la zona que actualmente estÃ¡ editando sea guardada o exista una entrada de zona en la base de datos LDAP."
-
-#: admin/systems/services/dns/serviceDNSeditZoneEntries.tpl.c:11
-msgid "Create a new DNS zone entry"
-msgstr "Crear una nueva entrada de zona DNS"
diff --git a/dns/locale/es_VE/fusiondirectory.po b/dns/locale/es_VE/fusiondirectory.po
index 1cd74ecaf9136daf0c3e14876de1d6f1f2991eb3..f604963d91e654c7428e3393ffac7a4259b75051 100644
--- a/dns/locale/es_VE/fusiondirectory.po
+++ b/dns/locale/es_VE/fusiondirectory.po
@@ -3,34 +3,21 @@
 # This file is distributed under the same license as the PACKAGE package.
 # 
 # Translators:
-# Benoit Mortier <benoit.mortier@opensides.be>, 2012
-# lars_g <lars.gold@gmail.com>, 2012
-# lars_g <lars.gold@gmail.com>, 2012
 msgid ""
 msgstr ""
-"Project-Id-Version: FusionDirectory-108\n"
+"Project-Id-Version: FusionDirectory-109\n"
 "Report-Msgid-Bugs-To: documentation@lists.fusiondirectory.org\n"
-"POT-Creation-Date: 2015-03-19 21:45+0100\n"
-"PO-Revision-Date: 2015-02-25 16:12+0000\n"
+"POT-Creation-Date: 2014-12-15 17:47+0100\n"
+"PO-Revision-Date: 2015-02-25 16:13+0000\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>\n"
-"Language-Team: Spanish (Venezuela) (http://www.transifex.com/projects/p/FusionDirectory-108/language/es_VE/)\n"
+"Language-Team: Spanish (Venezuela) (http://www.transifex.com/projects/p/FusionDirectory-109/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/services/dns/class_serviceDNS.inc:45
-#: admin/systems/services/dns/class_serviceDNS.inc:386
-#: admin/systems/services/dns/class_serviceDNS.inc:394
-#: admin/systems/services/dns/class_serviceDNS.inc:395
-msgid "DNS service"
-msgstr "Servicio DNS"
-
-#: admin/systems/services/dns/class_serviceDNS.inc:101
-#: admin/systems/services/dns/class_serviceDNS.inc:258
-#: admin/systems/services/dns/class_serviceDNS.inc:271
-#: admin/systems/services/dns/class_serviceDNS.inc:277
+#: admin/systems/services/dns/class_serviceDNS.inc:49
 #: admin/systems/services/dns/class_DNS.inc:167
 #: admin/systems/services/dns/class_DNS.inc:172
 #: admin/systems/services/dns/class_DNS.inc:617
@@ -39,120 +26,101 @@ msgstr "Servicio DNS"
 msgid "Error"
 msgstr "Error"
 
-#: admin/systems/services/dns/class_serviceDNS.inc:195
-#: admin/systems/services/dns/class_serviceDNS.inc:406
-#: admin/systems/services/dns/class_serviceDNSeditZone.inc:352
-msgid "Reverse zone"
-msgstr "Zona Inversa"
-
-#: admin/systems/services/dns/class_serviceDNS.inc:196
-#: admin/systems/services/dns/class_serviceDNS.inc:415
-#: admin/systems/services/dns/serviceDNSeditZone.tpl.c:47
-msgid "TTL"
-msgstr "TTL"
-
-#: admin/systems/services/dns/class_serviceDNS.inc:197
-msgid "Class"
-msgstr "Clase"
-
-#: admin/systems/services/dns/class_serviceDNS.inc:258
-#, php-format
-msgid "Cannot delete the selected zone. It is still in use by '%s'"
-msgstr "No se puede eliminar la zona seleccionada, porque estÃ¡ siendo usada por '%s'"
-
-#: admin/systems/services/dns/class_serviceDNS.inc:271
-#, php-format
-msgid "Was not able to contact argonaut server: %s"
-msgstr "No fue posible contactar el servidor Argonaut: %s"
-
-#: admin/systems/services/dns/class_serviceDNS.inc:277
-#, php-format
-msgid "Was not able to launch ldap2zone: %s"
-msgstr "No fue posible lanzar ldap2zone: %s"
+#: admin/systems/services/dns/class_serviceDNS.inc:98
+msgid "DNS zones"
+msgstr ""
 
-#: admin/systems/services/dns/class_serviceDNS.inc:339
-#: admin/systems/services/dns/class_serviceDNS.inc:353
-#: admin/systems/services/dns/class_serviceDNS.inc:370
-#: admin/systems/services/dns/class_serviceDNS.inc:376
-#: admin/systems/services/dns/class_DNS.inc:730
-msgid "LDAP error"
-msgstr "Error LDAP"
+#: admin/systems/services/dns/class_serviceDNS.inc:102
+msgid "The DNS zones"
+msgstr ""
 
-#: admin/systems/services/dns/class_serviceDNS.inc:395
-msgid "Services"
-msgstr "Servicios"
+#: admin/systems/services/dns/class_serviceDNS.inc:114
+#: admin/systems/services/dns/class_serviceDNS.inc:115
+msgid "DNS service"
+msgstr "Servicio DNS"
 
-#: admin/systems/services/dns/class_serviceDNS.inc:401
+#: admin/systems/services/dns/class_serviceDNS.inc:119
 msgid "Start service"
 msgstr "Iniciar servicio"
 
-#: admin/systems/services/dns/class_serviceDNS.inc:402
+#: admin/systems/services/dns/class_serviceDNS.inc:120
 msgid "Stop service"
 msgstr "Parar servicio"
 
-#: admin/systems/services/dns/class_serviceDNS.inc:403
+#: admin/systems/services/dns/class_serviceDNS.inc:121
 msgid "Restart service"
 msgstr "Reiniciar servicio"
 
-#: admin/systems/services/dns/class_serviceDNS.inc:405
-#: admin/systems/services/dns/class_serviceDNSeditZone.inc:343
-#: admin/systems/services/dns/class_serviceDNSeditZone.inc:348
-#: admin/systems/services/dns/class_serviceDNSeditZone.inc:356
-#: admin/systems/services/dns/serviceDNSeditZone.tpl.c:5
+#: admin/systems/services/dns/class_serviceDNS.inc:123
+#: admin/systems/services/dns/class_serviceDNSeditZone.inc:339
+#: admin/systems/services/dns/class_serviceDNSeditZone.inc:344
+#: admin/systems/services/dns/class_serviceDNSeditZone.inc:352
 msgid "Zone name"
 msgstr "Nombre de la zona"
 
-#: admin/systems/services/dns/class_serviceDNS.inc:407
-#: admin/systems/services/dns/class_serviceDNSeditZone.inc:436
+#: admin/systems/services/dns/class_serviceDNS.inc:124
+#: admin/systems/services/dns/class_serviceDNSeditZone.inc:348
+msgid "Reverse zone"
+msgstr "Zona Inversa"
+
+#: admin/systems/services/dns/class_serviceDNS.inc:125
+#: admin/systems/services/dns/class_serviceDNSeditZone.inc:432
 msgid "Network class"
 msgstr "Mascara de Red"
 
-#: admin/systems/services/dns/class_serviceDNS.inc:408
+#: admin/systems/services/dns/class_serviceDNS.inc:126
 msgid "Zone entry editor"
 msgstr "Editor de entrada de zona"
 
-#: admin/systems/services/dns/class_serviceDNS.inc:409
-#: admin/systems/services/dns/class_serviceDNSeditZone.inc:360
+#: admin/systems/services/dns/class_serviceDNS.inc:127
+#: admin/systems/services/dns/class_serviceDNSeditZone.inc:356
 msgid "Primary dns server"
 msgstr "Servidor DNS primario"
 
-#: admin/systems/services/dns/class_serviceDNS.inc:410
-#: admin/systems/services/dns/serviceDNSeditZone.tpl.c:32
+#: admin/systems/services/dns/class_serviceDNS.inc:128
 msgid "Mail address"
 msgstr "DirecciÃ³n correo electrÃ³nico"
 
-#: admin/systems/services/dns/class_serviceDNS.inc:411
-#: admin/systems/services/dns/class_serviceDNSeditZone.inc:364
+#: admin/systems/services/dns/class_serviceDNS.inc:129
+#: admin/systems/services/dns/class_serviceDNSeditZone.inc:360
 msgid "Serial"
 msgstr "Serie"
 
-#: admin/systems/services/dns/class_serviceDNS.inc:412
-#: admin/systems/services/dns/class_serviceDNSeditZone.inc:368
-#: admin/systems/services/dns/serviceDNSeditZone.tpl.c:38
+#: admin/systems/services/dns/class_serviceDNS.inc:130
+#: admin/systems/services/dns/class_serviceDNSeditZone.inc:364
 msgid "Refresh"
 msgstr "Refresco"
 
-#: admin/systems/services/dns/class_serviceDNS.inc:413
-#: admin/systems/services/dns/class_serviceDNSeditZone.inc:380
-#: admin/systems/services/dns/serviceDNSeditZone.tpl.c:41
+#: admin/systems/services/dns/class_serviceDNS.inc:131
+#: admin/systems/services/dns/class_serviceDNSeditZone.inc:376
 msgid "Retry"
 msgstr "Reintento"
 
-#: admin/systems/services/dns/class_serviceDNS.inc:414
-#: admin/systems/services/dns/class_serviceDNSeditZone.inc:376
-#: admin/systems/services/dns/serviceDNSeditZone.tpl.c:44
+#: admin/systems/services/dns/class_serviceDNS.inc:132
+#: admin/systems/services/dns/class_serviceDNSeditZone.inc:372
 msgid "Expire"
 msgstr "ExpiraciÃ³n"
 
-#: admin/systems/services/dns/class_serviceDNS.inc:416
+#: admin/systems/services/dns/class_serviceDNS.inc:133
+msgid "TTL"
+msgstr "TTL"
+
+#: admin/systems/services/dns/class_serviceDNS.inc:134
 msgid "MX records"
 msgstr "Registros MX"
 
-#: admin/systems/services/dns/class_serviceDNS.inc:417
-#: admin/systems/services/dns/serviceDNSeditZone.tpl.c:17
+#: admin/systems/services/dns/class_serviceDNS.inc:135
 msgid "Zone records"
 msgstr "Registros de zona"
 
+#: admin/systems/services/dns/class_serviceDNS.inc:198
+#: admin/systems/services/dns/class_serviceDNS.inc:212
+#: admin/systems/services/dns/class_serviceDNS.inc:229
+#: admin/systems/services/dns/class_serviceDNS.inc:235
+#: admin/systems/services/dns/class_DNS.inc:730
+msgid "LDAP error"
+msgstr "Error de LDAP"
+
 #: admin/systems/services/dns/class_DNS.inc:167
 #, php-format
 msgid "Cannot find reverse zone for DNS zone '%s'. Parsing zone aborted."
@@ -177,44 +145,42 @@ msgid "MxRecord"
 msgstr "Registro MX"
 
 #: admin/systems/services/dns/class_serviceDNSeditZone.inc:274
-#: admin/systems/services/dns/class_serviceDNSeditZone.inc:518
+#: admin/systems/services/dns/class_serviceDNSeditZone.inc:514
 msgid "Delete"
 msgstr "Eliminar"
 
-#: admin/systems/services/dns/class_serviceDNSeditZone.inc:356
-#: admin/systems/services/dns/class_serviceDNSeditZone.inc:386
+#: admin/systems/services/dns/class_serviceDNSeditZone.inc:352
+#: admin/systems/services/dns/class_serviceDNSeditZone.inc:382
 msgid "Only lowercase allowed"
 msgstr "Solo se permiten minÃºsculas"
 
-#: admin/systems/services/dns/class_serviceDNSeditZone.inc:360
+#: admin/systems/services/dns/class_serviceDNSeditZone.inc:356
 msgid "This field should be a domain name"
 msgstr ""
 
-#: admin/systems/services/dns/class_serviceDNSeditZone.inc:372
+#: admin/systems/services/dns/class_serviceDNSeditZone.inc:368
 msgid "Time to life"
 msgstr "DuraciÃ³n"
 
-#: admin/systems/services/dns/class_serviceDNSeditZone.inc:395
-#: admin/systems/services/dns/class_serviceDNSeditZone.inc:415
-#: admin/systems/services/dns/serviceDNSeditZone.tpl.c:8
+#: admin/systems/services/dns/class_serviceDNSeditZone.inc:391
+#: admin/systems/services/dns/class_serviceDNSeditZone.inc:411
 msgid "Network address"
 msgstr "DirecciÃ³n de red"
 
-#: admin/systems/services/dns/class_serviceDNSeditZone.inc:423
-#: admin/systems/services/dns/class_serviceDNSeditZone.inc:428
-#: admin/systems/services/dns/class_serviceDNSeditZone.inc:433
+#: admin/systems/services/dns/class_serviceDNSeditZone.inc:419
+#: admin/systems/services/dns/class_serviceDNSeditZone.inc:424
+#: admin/systems/services/dns/class_serviceDNSeditZone.inc:429
 #, php-format
 msgid ""
 "The specified network address and the network class (%s/%s) do not match!"
 msgstr "Â¡La direcciÃ³n de red indicada y la mascara de red (%s/%s) no corresponden!"
 
-#: admin/systems/services/dns/class_serviceDNSeditZone.inc:524
+#: admin/systems/services/dns/class_serviceDNSeditZone.inc:520
 #: admin/systems/services/dns/class_serviceDNSeditZoneEntries.inc:439
 msgid "Add"
 msgstr "AÃ±adir"
 
 #: admin/systems/services/dns/class_serviceDNSeditZoneEntries.inc:121
-#: admin/systems/services/dns/serviceDNSeditZoneEntries.tpl.c:8
 msgid "New entry"
 msgstr "Nueva entrada"
 
@@ -342,63 +308,3 @@ msgstr ""
 #: config/dns/class_dnsConfig.inc:45
 msgid "Should FD store a final dot at the end of domains?"
 msgstr ""
-
-#: admin/systems/services/dns/serviceDNSeditZone.tpl.c:2
-msgid "Generic"
-msgstr "GenÃ©rico"
-
-#: admin/systems/services/dns/serviceDNSeditZone.tpl.c:11
-msgid "Netmask"
-msgstr "Mascara de red"
-
-#: admin/systems/services/dns/serviceDNSeditZone.tpl.c:14
-msgid "Zone is in use, network settings can't be modified."
-msgstr "Zona en uso, no se pueden modificar los parÃ¡metros de red."
-
-#: admin/systems/services/dns/serviceDNSeditZone.tpl.c:20
-msgid "Can't be edited because the zone wasn't saved right now."
-msgstr "No se puede editar porque la zona estÃ¡ en proceso de grabaciÃ³n."
-
-#: admin/systems/services/dns/serviceDNSeditZone.tpl.c:23
-msgid "Edit"
-msgstr "Editar"
-
-#: admin/systems/services/dns/serviceDNSeditZone.tpl.c:26
-msgid "SOA record"
-msgstr "Registro SOA"
-
-#: admin/systems/services/dns/serviceDNSeditZone.tpl.c:29
-msgid "Primary dns server for this zone"
-msgstr "Servidor DNS primario para esta zona"
-
-#: admin/systems/services/dns/serviceDNSeditZone.tpl.c:35
-msgid "Serial number (automatically incremented)"
-msgstr "NÃºmero de serie (incrementado automÃ¡ticamente)"
-
-#: admin/systems/services/dns/serviceDNSeditZone.tpl.c:50
-msgid "MxRecords"
-msgstr "Registros MX"
-
-#: admin/systems/services/dns/serviceDNSeditZone.tpl.c:53
-msgid "Global zone records"
-msgstr "Registros de zona global"
-
-#: admin/systems/services/dns/serviceDNS.tpl.c:2
-msgid "Zones"
-msgstr "Zonas"
-
-#: admin/systems/services/dns/serviceDNSeditZoneEntries.tpl.c:2
-msgid ""
-"This dialog allows you to configure all components of this DNS zone on a "
-"single list."
-msgstr "Este diÃ¡logo le permite configurar todos los componente de la zona DNS en una sola lista."
-
-#: admin/systems/services/dns/serviceDNSeditZoneEntries.tpl.c:5
-msgid ""
-"This dialog can't be used until the currently edited zone was saved or the "
-"zone entry exists in the ldap database."
-msgstr "Este diÃ¡logo no puede ser ser usado hasta que la zona que actualmente estÃ¡ editando sea guardada o exista una entrada de zona en la base de datos LDAP."
-
-#: admin/systems/services/dns/serviceDNSeditZoneEntries.tpl.c:11
-msgid "Create a new DNS zone entry"
-msgstr "Crear una nueva entrada de zona DNS"
diff --git a/dns/locale/fa_IR/fusiondirectory.po b/dns/locale/fa_IR/fusiondirectory.po
index 37661f526ba1954db036fb14f53a451e0653447f..2e21797d71654514468f7b6936a2490f8add8095 100644
--- a/dns/locale/fa_IR/fusiondirectory.po
+++ b/dns/locale/fa_IR/fusiondirectory.po
@@ -5,29 +5,19 @@
 # Translators:
 msgid ""
 msgstr ""
-"Project-Id-Version: FusionDirectory-108\n"
+"Project-Id-Version: FusionDirectory-109\n"
 "Report-Msgid-Bugs-To: documentation@lists.fusiondirectory.org\n"
-"POT-Creation-Date: 2015-03-19 21:45+0100\n"
-"PO-Revision-Date: 2015-02-25 15:44+0000\n"
+"POT-Creation-Date: 2014-12-15 17:47+0100\n"
+"PO-Revision-Date: 2014-12-15 16:52+0000\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>\n"
-"Language-Team: Persian (Iran) (http://www.transifex.com/projects/p/FusionDirectory-108/language/fa_IR/)\n"
+"Language-Team: Persian (Iran) (http://www.transifex.com/projects/p/FusionDirectory-109/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/services/dns/class_serviceDNS.inc:45
-#: admin/systems/services/dns/class_serviceDNS.inc:386
-#: admin/systems/services/dns/class_serviceDNS.inc:394
-#: admin/systems/services/dns/class_serviceDNS.inc:395
-msgid "DNS service"
-msgstr ""
-
-#: admin/systems/services/dns/class_serviceDNS.inc:101
-#: admin/systems/services/dns/class_serviceDNS.inc:258
-#: admin/systems/services/dns/class_serviceDNS.inc:271
-#: admin/systems/services/dns/class_serviceDNS.inc:277
+#: admin/systems/services/dns/class_serviceDNS.inc:49
 #: admin/systems/services/dns/class_DNS.inc:167
 #: admin/systems/services/dns/class_DNS.inc:172
 #: admin/systems/services/dns/class_DNS.inc:617
@@ -36,120 +26,101 @@ msgstr ""
 msgid "Error"
 msgstr "Ø®Ø·Ø§"
 
-#: admin/systems/services/dns/class_serviceDNS.inc:195
-#: admin/systems/services/dns/class_serviceDNS.inc:406
-#: admin/systems/services/dns/class_serviceDNSeditZone.inc:352
-msgid "Reverse zone"
+#: admin/systems/services/dns/class_serviceDNS.inc:98
+msgid "DNS zones"
 msgstr ""
 
-#: admin/systems/services/dns/class_serviceDNS.inc:196
-#: admin/systems/services/dns/class_serviceDNS.inc:415
-#: admin/systems/services/dns/serviceDNSeditZone.tpl.c:47
-msgid "TTL"
-msgstr ""
-
-#: admin/systems/services/dns/class_serviceDNS.inc:197
-msgid "Class"
-msgstr ""
-
-#: admin/systems/services/dns/class_serviceDNS.inc:258
-#, php-format
-msgid "Cannot delete the selected zone. It is still in use by '%s'"
+#: admin/systems/services/dns/class_serviceDNS.inc:102
+msgid "The DNS zones"
 msgstr ""
 
-#: admin/systems/services/dns/class_serviceDNS.inc:271
-#, php-format
-msgid "Was not able to contact argonaut server: %s"
-msgstr ""
-
-#: admin/systems/services/dns/class_serviceDNS.inc:277
-#, php-format
-msgid "Was not able to launch ldap2zone: %s"
-msgstr ""
-
-#: admin/systems/services/dns/class_serviceDNS.inc:339
-#: admin/systems/services/dns/class_serviceDNS.inc:353
-#: admin/systems/services/dns/class_serviceDNS.inc:370
-#: admin/systems/services/dns/class_serviceDNS.inc:376
-#: admin/systems/services/dns/class_DNS.inc:730
-msgid "LDAP error"
-msgstr "Ø®Ø·Ø§ÛŒ LDAP"
-
-#: admin/systems/services/dns/class_serviceDNS.inc:395
-msgid "Services"
+#: admin/systems/services/dns/class_serviceDNS.inc:114
+#: admin/systems/services/dns/class_serviceDNS.inc:115
+msgid "DNS service"
 msgstr ""
 
-#: admin/systems/services/dns/class_serviceDNS.inc:401
+#: admin/systems/services/dns/class_serviceDNS.inc:119
 msgid "Start service"
 msgstr ""
 
-#: admin/systems/services/dns/class_serviceDNS.inc:402
+#: admin/systems/services/dns/class_serviceDNS.inc:120
 msgid "Stop service"
 msgstr ""
 
-#: admin/systems/services/dns/class_serviceDNS.inc:403
+#: admin/systems/services/dns/class_serviceDNS.inc:121
 msgid "Restart service"
 msgstr ""
 
-#: admin/systems/services/dns/class_serviceDNS.inc:405
-#: admin/systems/services/dns/class_serviceDNSeditZone.inc:343
-#: admin/systems/services/dns/class_serviceDNSeditZone.inc:348
-#: admin/systems/services/dns/class_serviceDNSeditZone.inc:356
-#: admin/systems/services/dns/serviceDNSeditZone.tpl.c:5
+#: admin/systems/services/dns/class_serviceDNS.inc:123
+#: admin/systems/services/dns/class_serviceDNSeditZone.inc:339
+#: admin/systems/services/dns/class_serviceDNSeditZone.inc:344
+#: admin/systems/services/dns/class_serviceDNSeditZone.inc:352
 msgid "Zone name"
 msgstr ""
 
-#: admin/systems/services/dns/class_serviceDNS.inc:407
-#: admin/systems/services/dns/class_serviceDNSeditZone.inc:436
+#: admin/systems/services/dns/class_serviceDNS.inc:124
+#: admin/systems/services/dns/class_serviceDNSeditZone.inc:348
+msgid "Reverse zone"
+msgstr ""
+
+#: admin/systems/services/dns/class_serviceDNS.inc:125
+#: admin/systems/services/dns/class_serviceDNSeditZone.inc:432
 msgid "Network class"
 msgstr ""
 
-#: admin/systems/services/dns/class_serviceDNS.inc:408
+#: admin/systems/services/dns/class_serviceDNS.inc:126
 msgid "Zone entry editor"
 msgstr ""
 
-#: admin/systems/services/dns/class_serviceDNS.inc:409
-#: admin/systems/services/dns/class_serviceDNSeditZone.inc:360
+#: admin/systems/services/dns/class_serviceDNS.inc:127
+#: admin/systems/services/dns/class_serviceDNSeditZone.inc:356
 msgid "Primary dns server"
 msgstr ""
 
-#: admin/systems/services/dns/class_serviceDNS.inc:410
-#: admin/systems/services/dns/serviceDNSeditZone.tpl.c:32
+#: admin/systems/services/dns/class_serviceDNS.inc:128
 msgid "Mail address"
 msgstr ""
 
-#: admin/systems/services/dns/class_serviceDNS.inc:411
-#: admin/systems/services/dns/class_serviceDNSeditZone.inc:364
+#: admin/systems/services/dns/class_serviceDNS.inc:129
+#: admin/systems/services/dns/class_serviceDNSeditZone.inc:360
 msgid "Serial"
 msgstr ""
 
-#: admin/systems/services/dns/class_serviceDNS.inc:412
-#: admin/systems/services/dns/class_serviceDNSeditZone.inc:368
-#: admin/systems/services/dns/serviceDNSeditZone.tpl.c:38
+#: admin/systems/services/dns/class_serviceDNS.inc:130
+#: admin/systems/services/dns/class_serviceDNSeditZone.inc:364
 msgid "Refresh"
 msgstr ""
 
-#: admin/systems/services/dns/class_serviceDNS.inc:413
-#: admin/systems/services/dns/class_serviceDNSeditZone.inc:380
-#: admin/systems/services/dns/serviceDNSeditZone.tpl.c:41
+#: admin/systems/services/dns/class_serviceDNS.inc:131
+#: admin/systems/services/dns/class_serviceDNSeditZone.inc:376
 msgid "Retry"
 msgstr ""
 
-#: admin/systems/services/dns/class_serviceDNS.inc:414
-#: admin/systems/services/dns/class_serviceDNSeditZone.inc:376
-#: admin/systems/services/dns/serviceDNSeditZone.tpl.c:44
+#: admin/systems/services/dns/class_serviceDNS.inc:132
+#: admin/systems/services/dns/class_serviceDNSeditZone.inc:372
 msgid "Expire"
 msgstr ""
 
-#: admin/systems/services/dns/class_serviceDNS.inc:416
+#: admin/systems/services/dns/class_serviceDNS.inc:133
+msgid "TTL"
+msgstr ""
+
+#: admin/systems/services/dns/class_serviceDNS.inc:134
 msgid "MX records"
 msgstr ""
 
-#: admin/systems/services/dns/class_serviceDNS.inc:417
-#: admin/systems/services/dns/serviceDNSeditZone.tpl.c:17
+#: admin/systems/services/dns/class_serviceDNS.inc:135
 msgid "Zone records"
 msgstr ""
 
+#: admin/systems/services/dns/class_serviceDNS.inc:198
+#: admin/systems/services/dns/class_serviceDNS.inc:212
+#: admin/systems/services/dns/class_serviceDNS.inc:229
+#: admin/systems/services/dns/class_serviceDNS.inc:235
+#: admin/systems/services/dns/class_DNS.inc:730
+msgid "LDAP error"
+msgstr "Ø®Ø·Ø§ÛŒ LDAP"
+
 #: admin/systems/services/dns/class_DNS.inc:167
 #, php-format
 msgid "Cannot find reverse zone for DNS zone '%s'. Parsing zone aborted."
@@ -174,44 +145,42 @@ msgid "MxRecord"
 msgstr ""
 
 #: admin/systems/services/dns/class_serviceDNSeditZone.inc:274
-#: admin/systems/services/dns/class_serviceDNSeditZone.inc:518
+#: admin/systems/services/dns/class_serviceDNSeditZone.inc:514
 msgid "Delete"
 msgstr ""
 
-#: admin/systems/services/dns/class_serviceDNSeditZone.inc:356
-#: admin/systems/services/dns/class_serviceDNSeditZone.inc:386
+#: admin/systems/services/dns/class_serviceDNSeditZone.inc:352
+#: admin/systems/services/dns/class_serviceDNSeditZone.inc:382
 msgid "Only lowercase allowed"
 msgstr ""
 
-#: admin/systems/services/dns/class_serviceDNSeditZone.inc:360
+#: admin/systems/services/dns/class_serviceDNSeditZone.inc:356
 msgid "This field should be a domain name"
 msgstr ""
 
-#: admin/systems/services/dns/class_serviceDNSeditZone.inc:372
+#: admin/systems/services/dns/class_serviceDNSeditZone.inc:368
 msgid "Time to life"
 msgstr ""
 
-#: admin/systems/services/dns/class_serviceDNSeditZone.inc:395
-#: admin/systems/services/dns/class_serviceDNSeditZone.inc:415
-#: admin/systems/services/dns/serviceDNSeditZone.tpl.c:8
+#: admin/systems/services/dns/class_serviceDNSeditZone.inc:391
+#: admin/systems/services/dns/class_serviceDNSeditZone.inc:411
 msgid "Network address"
 msgstr ""
 
-#: admin/systems/services/dns/class_serviceDNSeditZone.inc:423
-#: admin/systems/services/dns/class_serviceDNSeditZone.inc:428
-#: admin/systems/services/dns/class_serviceDNSeditZone.inc:433
+#: admin/systems/services/dns/class_serviceDNSeditZone.inc:419
+#: admin/systems/services/dns/class_serviceDNSeditZone.inc:424
+#: admin/systems/services/dns/class_serviceDNSeditZone.inc:429
 #, php-format
 msgid ""
 "The specified network address and the network class (%s/%s) do not match!"
 msgstr ""
 
-#: admin/systems/services/dns/class_serviceDNSeditZone.inc:524
+#: admin/systems/services/dns/class_serviceDNSeditZone.inc:520
 #: admin/systems/services/dns/class_serviceDNSeditZoneEntries.inc:439
 msgid "Add"
 msgstr ""
 
 #: admin/systems/services/dns/class_serviceDNSeditZoneEntries.inc:121
-#: admin/systems/services/dns/serviceDNSeditZoneEntries.tpl.c:8
 msgid "New entry"
 msgstr ""
 
@@ -339,63 +308,3 @@ msgstr ""
 #: config/dns/class_dnsConfig.inc:45
 msgid "Should FD store a final dot at the end of domains?"
 msgstr ""
-
-#: admin/systems/services/dns/serviceDNSeditZone.tpl.c:2
-msgid "Generic"
-msgstr ""
-
-#: admin/systems/services/dns/serviceDNSeditZone.tpl.c:11
-msgid "Netmask"
-msgstr ""
-
-#: admin/systems/services/dns/serviceDNSeditZone.tpl.c:14
-msgid "Zone is in use, network settings can't be modified."
-msgstr ""
-
-#: admin/systems/services/dns/serviceDNSeditZone.tpl.c:20
-msgid "Can't be edited because the zone wasn't saved right now."
-msgstr ""
-
-#: admin/systems/services/dns/serviceDNSeditZone.tpl.c:23
-msgid "Edit"
-msgstr ""
-
-#: admin/systems/services/dns/serviceDNSeditZone.tpl.c:26
-msgid "SOA record"
-msgstr ""
-
-#: admin/systems/services/dns/serviceDNSeditZone.tpl.c:29
-msgid "Primary dns server for this zone"
-msgstr ""
-
-#: admin/systems/services/dns/serviceDNSeditZone.tpl.c:35
-msgid "Serial number (automatically incremented)"
-msgstr ""
-
-#: admin/systems/services/dns/serviceDNSeditZone.tpl.c:50
-msgid "MxRecords"
-msgstr ""
-
-#: admin/systems/services/dns/serviceDNSeditZone.tpl.c:53
-msgid "Global zone records"
-msgstr ""
-
-#: admin/systems/services/dns/serviceDNS.tpl.c:2
-msgid "Zones"
-msgstr ""
-
-#: admin/systems/services/dns/serviceDNSeditZoneEntries.tpl.c:2
-msgid ""
-"This dialog allows you to configure all components of this DNS zone on a "
-"single list."
-msgstr ""
-
-#: admin/systems/services/dns/serviceDNSeditZoneEntries.tpl.c:5
-msgid ""
-"This dialog can't be used until the currently edited zone was saved or the "
-"zone entry exists in the ldap database."
-msgstr ""
-
-#: admin/systems/services/dns/serviceDNSeditZoneEntries.tpl.c:11
-msgid "Create a new DNS zone entry"
-msgstr ""
diff --git a/dns/locale/fr/fusiondirectory.po b/dns/locale/fr/fusiondirectory.po
index 2911d830957b371f183b4bca042117c8ece8bca5..54195e0ceff6a897af9c632924c75084be559976 100644
--- a/dns/locale/fr/fusiondirectory.po
+++ b/dns/locale/fr/fusiondirectory.po
@@ -3,37 +3,21 @@
 # This file is distributed under the same license as the PACKAGE package.
 # 
 # Translators:
-# Benoit Mortier <benoit.mortier@opensides.be>, 2005-2008,2010-2011
-# MCMic, 2014
-# fusiondirectory <contact@fusiondirectory.org>, 2013
-# fusiondirectory <contact@fusiondirectory.org>, 2012
-# fusiondirectory <contact@fusiondirectory.org>, 2012-2013
-# MCMic, 2014
 msgid ""
 msgstr ""
-"Project-Id-Version: FusionDirectory-108\n"
+"Project-Id-Version: FusionDirectory-109\n"
 "Report-Msgid-Bugs-To: documentation@lists.fusiondirectory.org\n"
-"POT-Creation-Date: 2015-03-19 21:45+0100\n"
-"PO-Revision-Date: 2015-02-25 16:12+0000\n"
+"POT-Creation-Date: 2014-12-15 17:47+0100\n"
+"PO-Revision-Date: 2015-02-25 16:13+0000\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>\n"
-"Language-Team: French (http://www.transifex.com/projects/p/FusionDirectory-108/language/fr/)\n"
+"Language-Team: French (http://www.transifex.com/projects/p/FusionDirectory-109/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/services/dns/class_serviceDNS.inc:45
-#: admin/systems/services/dns/class_serviceDNS.inc:386
-#: admin/systems/services/dns/class_serviceDNS.inc:394
-#: admin/systems/services/dns/class_serviceDNS.inc:395
-msgid "DNS service"
-msgstr "Service DNS"
-
-#: admin/systems/services/dns/class_serviceDNS.inc:101
-#: admin/systems/services/dns/class_serviceDNS.inc:258
-#: admin/systems/services/dns/class_serviceDNS.inc:271
-#: admin/systems/services/dns/class_serviceDNS.inc:277
+#: admin/systems/services/dns/class_serviceDNS.inc:49
 #: admin/systems/services/dns/class_DNS.inc:167
 #: admin/systems/services/dns/class_DNS.inc:172
 #: admin/systems/services/dns/class_DNS.inc:617
@@ -42,129 +26,110 @@ msgstr "Service DNS"
 msgid "Error"
 msgstr "Erreur"
 
-#: admin/systems/services/dns/class_serviceDNS.inc:195
-#: admin/systems/services/dns/class_serviceDNS.inc:406
-#: admin/systems/services/dns/class_serviceDNSeditZone.inc:352
-msgid "Reverse zone"
-msgstr "Zone inverse"
-
-#: admin/systems/services/dns/class_serviceDNS.inc:196
-#: admin/systems/services/dns/class_serviceDNS.inc:415
-#: admin/systems/services/dns/serviceDNSeditZone.tpl.c:47
-msgid "TTL"
-msgstr "TTL"
-
-#: admin/systems/services/dns/class_serviceDNS.inc:197
-msgid "Class"
-msgstr "Classe"
-
-#: admin/systems/services/dns/class_serviceDNS.inc:258
-#, php-format
-msgid "Cannot delete the selected zone. It is still in use by '%s'"
-msgstr "Vous ne pouvez pas effacer cette zone car elle est encore utilisÃ©e par '%s'"
-
-#: admin/systems/services/dns/class_serviceDNS.inc:271
-#, php-format
-msgid "Was not able to contact argonaut server: %s"
-msgstr "Impossible de contacter le serveur Argonaut : %s"
-
-#: admin/systems/services/dns/class_serviceDNS.inc:277
-#, php-format
-msgid "Was not able to launch ldap2zone: %s"
-msgstr "Impossible de lancer ldap2zoneâ€¯: %s"
+#: admin/systems/services/dns/class_serviceDNS.inc:98
+msgid "DNS zones"
+msgstr ""
 
-#: admin/systems/services/dns/class_serviceDNS.inc:339
-#: admin/systems/services/dns/class_serviceDNS.inc:353
-#: admin/systems/services/dns/class_serviceDNS.inc:370
-#: admin/systems/services/dns/class_serviceDNS.inc:376
-#: admin/systems/services/dns/class_DNS.inc:730
-msgid "LDAP error"
-msgstr "Erreur LDAP"
+#: admin/systems/services/dns/class_serviceDNS.inc:102
+msgid "The DNS zones"
+msgstr ""
 
-#: admin/systems/services/dns/class_serviceDNS.inc:395
-msgid "Services"
-msgstr "Services"
+#: admin/systems/services/dns/class_serviceDNS.inc:114
+#: admin/systems/services/dns/class_serviceDNS.inc:115
+msgid "DNS service"
+msgstr "Service DNS"
 
-#: admin/systems/services/dns/class_serviceDNS.inc:401
+#: admin/systems/services/dns/class_serviceDNS.inc:119
 msgid "Start service"
 msgstr "DÃ©marrer le service"
 
-#: admin/systems/services/dns/class_serviceDNS.inc:402
+#: admin/systems/services/dns/class_serviceDNS.inc:120
 msgid "Stop service"
 msgstr "ArrÃªter le Service"
 
-#: admin/systems/services/dns/class_serviceDNS.inc:403
+#: admin/systems/services/dns/class_serviceDNS.inc:121
 msgid "Restart service"
 msgstr "RedÃ©marrer le service"
 
-#: admin/systems/services/dns/class_serviceDNS.inc:405
-#: admin/systems/services/dns/class_serviceDNSeditZone.inc:343
-#: admin/systems/services/dns/class_serviceDNSeditZone.inc:348
-#: admin/systems/services/dns/class_serviceDNSeditZone.inc:356
-#: admin/systems/services/dns/serviceDNSeditZone.tpl.c:5
+#: admin/systems/services/dns/class_serviceDNS.inc:123
+#: admin/systems/services/dns/class_serviceDNSeditZone.inc:339
+#: admin/systems/services/dns/class_serviceDNSeditZone.inc:344
+#: admin/systems/services/dns/class_serviceDNSeditZone.inc:352
 msgid "Zone name"
 msgstr "Nom de la zone"
 
-#: admin/systems/services/dns/class_serviceDNS.inc:407
-#: admin/systems/services/dns/class_serviceDNSeditZone.inc:436
+#: admin/systems/services/dns/class_serviceDNS.inc:124
+#: admin/systems/services/dns/class_serviceDNSeditZone.inc:348
+msgid "Reverse zone"
+msgstr "Zone inverse"
+
+#: admin/systems/services/dns/class_serviceDNS.inc:125
+#: admin/systems/services/dns/class_serviceDNSeditZone.inc:432
 msgid "Network class"
 msgstr "Classe rÃ©seau"
 
-#: admin/systems/services/dns/class_serviceDNS.inc:408
+#: admin/systems/services/dns/class_serviceDNS.inc:126
 msgid "Zone entry editor"
-msgstr "Ã‰diteur de zone"
+msgstr "Editeur de zone"
 
-#: admin/systems/services/dns/class_serviceDNS.inc:409
-#: admin/systems/services/dns/class_serviceDNSeditZone.inc:360
+#: admin/systems/services/dns/class_serviceDNS.inc:127
+#: admin/systems/services/dns/class_serviceDNSeditZone.inc:356
 msgid "Primary dns server"
 msgstr "Serveur dns primaire"
 
-#: admin/systems/services/dns/class_serviceDNS.inc:410
-#: admin/systems/services/dns/serviceDNSeditZone.tpl.c:32
+#: admin/systems/services/dns/class_serviceDNS.inc:128
 msgid "Mail address"
-msgstr "Courriel"
+msgstr "Adresse de messagerie"
 
-#: admin/systems/services/dns/class_serviceDNS.inc:411
-#: admin/systems/services/dns/class_serviceDNSeditZone.inc:364
+#: admin/systems/services/dns/class_serviceDNS.inc:129
+#: admin/systems/services/dns/class_serviceDNSeditZone.inc:360
 msgid "Serial"
-msgstr "NumÃ©ro de sÃ©rie"
+msgstr "SÃ©rie"
 
-#: admin/systems/services/dns/class_serviceDNS.inc:412
-#: admin/systems/services/dns/class_serviceDNSeditZone.inc:368
-#: admin/systems/services/dns/serviceDNSeditZone.tpl.c:38
+#: admin/systems/services/dns/class_serviceDNS.inc:130
+#: admin/systems/services/dns/class_serviceDNSeditZone.inc:364
 msgid "Refresh"
 msgstr "RafraÃ®chir"
 
-#: admin/systems/services/dns/class_serviceDNS.inc:413
-#: admin/systems/services/dns/class_serviceDNSeditZone.inc:380
-#: admin/systems/services/dns/serviceDNSeditZone.tpl.c:41
+#: admin/systems/services/dns/class_serviceDNS.inc:131
+#: admin/systems/services/dns/class_serviceDNSeditZone.inc:376
 msgid "Retry"
 msgstr "RÃ©essayer"
 
-#: admin/systems/services/dns/class_serviceDNS.inc:414
-#: admin/systems/services/dns/class_serviceDNSeditZone.inc:376
-#: admin/systems/services/dns/serviceDNSeditZone.tpl.c:44
+#: admin/systems/services/dns/class_serviceDNS.inc:132
+#: admin/systems/services/dns/class_serviceDNSeditZone.inc:372
 msgid "Expire"
 msgstr "Expirer"
 
-#: admin/systems/services/dns/class_serviceDNS.inc:416
+#: admin/systems/services/dns/class_serviceDNS.inc:133
+msgid "TTL"
+msgstr "TTL"
+
+#: admin/systems/services/dns/class_serviceDNS.inc:134
 msgid "MX records"
 msgstr "Enregistrements MX"
 
-#: admin/systems/services/dns/class_serviceDNS.inc:417
-#: admin/systems/services/dns/serviceDNSeditZone.tpl.c:17
+#: admin/systems/services/dns/class_serviceDNS.inc:135
 msgid "Zone records"
-msgstr "Enregistrements de zone"
+msgstr "Enregistrement de zone"
+
+#: admin/systems/services/dns/class_serviceDNS.inc:198
+#: admin/systems/services/dns/class_serviceDNS.inc:212
+#: admin/systems/services/dns/class_serviceDNS.inc:229
+#: admin/systems/services/dns/class_serviceDNS.inc:235
+#: admin/systems/services/dns/class_DNS.inc:730
+msgid "LDAP error"
+msgstr "Erreur LDAP"
 
 #: admin/systems/services/dns/class_DNS.inc:167
 #, php-format
 msgid "Cannot find reverse zone for DNS zone '%s'. Parsing zone aborted."
-msgstr "Impossible de trouver la zone inverse pour la zone DNS '%s'. ArrÃªt de la lecture de la zone."
+msgstr "Impossible de trouver la zone inverse pour la zone dns '%s'. ArrÃªt de la lecture de la zone."
 
 #: admin/systems/services/dns/class_DNS.inc:172
 #, php-format
 msgid "Found more than one reverse zone for '%s'. Parsing zone aborted."
-msgstr "Plus d'une zone inverse existe pour la zone '%s'. ArrÃªt de la lecture de la zone."
+msgstr "Plus d'un zone inverse existe pour la zone dns '%s'. ArrÃªt de la lecture de la zone."
 
 #: admin/systems/services/dns/class_DNS.inc:617
 #, php-format
@@ -180,44 +145,42 @@ msgid "MxRecord"
 msgstr "Enregistrements mx"
 
 #: admin/systems/services/dns/class_serviceDNSeditZone.inc:274
-#: admin/systems/services/dns/class_serviceDNSeditZone.inc:518
+#: admin/systems/services/dns/class_serviceDNSeditZone.inc:514
 msgid "Delete"
 msgstr "Supprimer"
 
-#: admin/systems/services/dns/class_serviceDNSeditZone.inc:356
-#: admin/systems/services/dns/class_serviceDNSeditZone.inc:386
+#: admin/systems/services/dns/class_serviceDNSeditZone.inc:352
+#: admin/systems/services/dns/class_serviceDNSeditZone.inc:382
 msgid "Only lowercase allowed"
-msgstr "Seule les minuscules sont autorisÃ©es"
+msgstr "Seule les minuscules sont autorisÃ©es."
 
-#: admin/systems/services/dns/class_serviceDNSeditZone.inc:360
+#: admin/systems/services/dns/class_serviceDNSeditZone.inc:356
 msgid "This field should be a domain name"
 msgstr "Ce champ devrait Ãªtre un nom de domaine"
 
-#: admin/systems/services/dns/class_serviceDNSeditZone.inc:372
+#: admin/systems/services/dns/class_serviceDNSeditZone.inc:368
 msgid "Time to life"
-msgstr "Temps de vie (TTL)"
+msgstr "Temps de vie"
 
-#: admin/systems/services/dns/class_serviceDNSeditZone.inc:395
-#: admin/systems/services/dns/class_serviceDNSeditZone.inc:415
-#: admin/systems/services/dns/serviceDNSeditZone.tpl.c:8
+#: admin/systems/services/dns/class_serviceDNSeditZone.inc:391
+#: admin/systems/services/dns/class_serviceDNSeditZone.inc:411
 msgid "Network address"
 msgstr "Adresse rÃ©seau"
 
-#: admin/systems/services/dns/class_serviceDNSeditZone.inc:423
-#: admin/systems/services/dns/class_serviceDNSeditZone.inc:428
-#: admin/systems/services/dns/class_serviceDNSeditZone.inc:433
+#: admin/systems/services/dns/class_serviceDNSeditZone.inc:419
+#: admin/systems/services/dns/class_serviceDNSeditZone.inc:424
+#: admin/systems/services/dns/class_serviceDNSeditZone.inc:429
 #, php-format
 msgid ""
 "The specified network address and the network class (%s/%s) do not match!"
 msgstr "L'adresse rÃ©seau spÃ©cifiÃ©e et la classe rÃ©seau (%s/%s) ne concordent pas !"
 
-#: admin/systems/services/dns/class_serviceDNSeditZone.inc:524
+#: admin/systems/services/dns/class_serviceDNSeditZone.inc:520
 #: admin/systems/services/dns/class_serviceDNSeditZoneEntries.inc:439
 msgid "Add"
 msgstr "Ajouter"
 
 #: admin/systems/services/dns/class_serviceDNSeditZoneEntries.inc:121
-#: admin/systems/services/dns/serviceDNSeditZoneEntries.tpl.c:8
 msgid "New entry"
 msgstr "Nouvelle entrÃ©e"
 
@@ -233,7 +196,7 @@ msgstr "Nom"
 #: admin/systems/services/dns/class_serviceDNSeditZoneEntries.inc:268
 #, php-format
 msgid "Cannot rename '%s' to '%s'. Entry is already in use."
-msgstr "Impossible de renommer '%s' en '%s'. L'entrÃ©e est dÃ©jÃ  en cours dâ€™utilisation."
+msgstr "Impossible de renommer '%s' en '%s'. L'enregistrement existe dÃ©jÃ ."
 
 #: admin/systems/services/dns/class_serviceDNSeditZoneEntries.inc:274
 #, php-format
@@ -253,12 +216,12 @@ msgstr "Les enregistrements '%s' ne peuvent pas Ãªtre utilisÃ©s plus d'une fois.
 #: admin/systems/services/dns/class_serviceDNSeditZoneEntries.inc:305
 #, php-format
 msgid "Please fix the empty %s record for entry '%s'."
-msgstr "Veuillez corriger l'enregistrement vide '%s' pour l'entrÃ©e '%s'."
+msgstr "Veuillez corriger l'enregistrement vide '%s' pour l'enregistrement '%s'."
 
 #: admin/systems/services/dns/class_serviceDNSeditZoneEntries.inc:312
 #, php-format
 msgid "Please fix the duplicate %s record for entry '%s'."
-msgstr "Veuillez corriger l'enregistrement double '%s' pour l'entrÃ©e '%s'."
+msgstr "Veuillez corriger l'enregistrement double '%s' pour l'enregistrement '%s'."
 
 #: admin/systems/services/dns/class_serviceDNSeditZoneEntries.inc:441
 msgid "Remove"
@@ -267,7 +230,7 @@ msgstr "Supprimer"
 #: admin/systems/services/dns/class_serviceDNSeditZoneEntries.inc:492
 #, php-format
 msgid "The syntax of entry %s (record type %s, value %s) is invalid!"
-msgstr "La syntaxe de l'entrÃ©e %s (enregistrement de type %s, valeur %s) est invalide !"
+msgstr "La syntaxe de l'entrÃ©e %s (enregistrement de type %s, valeur %s) est non valide !"
 
 #: admin/systems/services/dns/class_serviceDNSeditZoneEntries.inc:492
 msgid "Example"
@@ -278,7 +241,7 @@ msgstr "Exemple"
 #: admin/systems/services/dns/class_serviceDNSeditZoneEntries.inc:514
 #: admin/systems/services/dns/class_serviceDNSeditZoneEntries.inc:545
 msgid "Entry should be a DNS name."
-msgstr "L'entrÃ©e doit Ãªtre un nom DNS."
+msgstr "L'enregistrement doit Ãªtre un nom DNS."
 
 #: admin/systems/services/dns/class_serviceDNSeditZoneEntries.inc:501
 msgid "Value should be an IPv6 address."
@@ -304,7 +267,7 @@ msgstr "La valeur doit Ãªtre un nom DNS."
 
 #: admin/systems/services/dns/class_serviceDNSeditZoneEntries.inc:530
 msgid "Value should be composed of 'preference target'."
-msgstr "Les valeur devraient Ãªtre de la forme 'prÃ©fÃ©rence cible'."
+msgstr "Les valeur devraient Ãªtre composÃ©e de 'prÃ©fÃ©rence cible'"
 
 #: admin/systems/services/dns/class_serviceDNSeditZoneEntries.inc:550
 msgid "Value 1 (priority) should be a number."
@@ -324,7 +287,7 @@ msgstr "La valeur 4 (cible) doit Ãªtre un nom DNS."
 
 #: admin/systems/services/dns/class_serviceDNSeditZoneEntries.inc:562
 msgid "Value should be composed of 'priority weight port target'."
-msgstr "Les valeurs doivent Ãªtre de la forme 'prioritÃ© poids port cible'."
+msgstr "Les valeurs doivent Ãªtre composÃ©e de 'prioritÃ© poids port et cible'."
 
 #: config/dns/class_dnsConfig.inc:28
 msgid "DNS configuration"
@@ -344,64 +307,4 @@ msgstr "Stocker le point final dans des domaines"
 
 #: config/dns/class_dnsConfig.inc:45
 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/services/dns/serviceDNSeditZone.tpl.c:2
-msgid "Generic"
-msgstr "Application"
-
-#: admin/systems/services/dns/serviceDNSeditZone.tpl.c:11
-msgid "Netmask"
-msgstr "Masque rÃ©seau"
-
-#: admin/systems/services/dns/serviceDNSeditZone.tpl.c:14
-msgid "Zone is in use, network settings can't be modified."
-msgstr "La zone est utilisÃ©e, les paramÃ¨tres rÃ©seau ne peuvent pas Ãªtre modifiÃ©s."
-
-#: admin/systems/services/dns/serviceDNSeditZone.tpl.c:20
-msgid "Can't be edited because the zone wasn't saved right now."
-msgstr "Impossible d'Ã©diter la zone car elle est actuellement sauvegardÃ©e."
-
-#: admin/systems/services/dns/serviceDNSeditZone.tpl.c:23
-msgid "Edit"
-msgstr "Ã‰diter"
-
-#: admin/systems/services/dns/serviceDNSeditZone.tpl.c:26
-msgid "SOA record"
-msgstr "Enregistrement SOA"
-
-#: admin/systems/services/dns/serviceDNSeditZone.tpl.c:29
-msgid "Primary dns server for this zone"
-msgstr "Serveur dns primaire pour cette zone"
-
-#: admin/systems/services/dns/serviceDNSeditZone.tpl.c:35
-msgid "Serial number (automatically incremented)"
-msgstr "NumÃ©ro de sÃ©rie (incrÃ©mentÃ© automatiquement)"
-
-#: admin/systems/services/dns/serviceDNSeditZone.tpl.c:50
-msgid "MxRecords"
-msgstr "Enregistrements mx"
-
-#: admin/systems/services/dns/serviceDNSeditZone.tpl.c:53
-msgid "Global zone records"
-msgstr "Enregistrements pour la zone globale"
-
-#: admin/systems/services/dns/serviceDNS.tpl.c:2
-msgid "Zones"
-msgstr "Zones"
-
-#: admin/systems/services/dns/serviceDNSeditZoneEntries.tpl.c:2
-msgid ""
-"This dialog allows you to configure all components of this DNS zone on a "
-"single list."
-msgstr "Ce dialogue vous permet de configurer tout les composants d'une zone DNS dans une simple liste."
-
-#: admin/systems/services/dns/serviceDNSeditZoneEntries.tpl.c:5
-msgid ""
-"This dialog can't be used until the currently edited zone was saved or the "
-"zone entry exists in the ldap database."
-msgstr "Cette boite de dialogue ne peut pas Ãªtre tant que la zone n'a pas Ã©tÃ© sauvÃ©e ou que l'enregistrement existe dans la base de donnÃ©es ldap."
-
-#: admin/systems/services/dns/serviceDNSeditZoneEntries.tpl.c:11
-msgid "Create a new DNS zone entry"
-msgstr "CrÃ©er une nouvelle zone DNS"
+msgstr "Est ce que FusionDirectory doit stocker un point final Ã  la fin de domaines?"
diff --git a/dns/locale/id/fusiondirectory.po b/dns/locale/id/fusiondirectory.po
index 8f1f91cc044374e090af2c8831fa1ace159f2651..b0d0103aba910fcdec8de337109a725a16fff6b2 100644
--- a/dns/locale/id/fusiondirectory.po
+++ b/dns/locale/id/fusiondirectory.po
@@ -5,29 +5,19 @@
 # Translators:
 msgid ""
 msgstr ""
-"Project-Id-Version: FusionDirectory-108\n"
+"Project-Id-Version: FusionDirectory-109\n"
 "Report-Msgid-Bugs-To: documentation@lists.fusiondirectory.org\n"
-"POT-Creation-Date: 2015-03-19 21:45+0100\n"
-"PO-Revision-Date: 2015-02-25 15:44+0000\n"
+"POT-Creation-Date: 2014-12-15 17:47+0100\n"
+"PO-Revision-Date: 2014-12-15 16:52+0000\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>\n"
-"Language-Team: Indonesian (http://www.transifex.com/projects/p/FusionDirectory-108/language/id/)\n"
+"Language-Team: Indonesian (http://www.transifex.com/projects/p/FusionDirectory-109/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/services/dns/class_serviceDNS.inc:45
-#: admin/systems/services/dns/class_serviceDNS.inc:386
-#: admin/systems/services/dns/class_serviceDNS.inc:394
-#: admin/systems/services/dns/class_serviceDNS.inc:395
-msgid "DNS service"
-msgstr ""
-
-#: admin/systems/services/dns/class_serviceDNS.inc:101
-#: admin/systems/services/dns/class_serviceDNS.inc:258
-#: admin/systems/services/dns/class_serviceDNS.inc:271
-#: admin/systems/services/dns/class_serviceDNS.inc:277
+#: admin/systems/services/dns/class_serviceDNS.inc:49
 #: admin/systems/services/dns/class_DNS.inc:167
 #: admin/systems/services/dns/class_DNS.inc:172
 #: admin/systems/services/dns/class_DNS.inc:617
@@ -36,120 +26,101 @@ msgstr ""
 msgid "Error"
 msgstr ""
 
-#: admin/systems/services/dns/class_serviceDNS.inc:195
-#: admin/systems/services/dns/class_serviceDNS.inc:406
-#: admin/systems/services/dns/class_serviceDNSeditZone.inc:352
-msgid "Reverse zone"
+#: admin/systems/services/dns/class_serviceDNS.inc:98
+msgid "DNS zones"
 msgstr ""
 
-#: admin/systems/services/dns/class_serviceDNS.inc:196
-#: admin/systems/services/dns/class_serviceDNS.inc:415
-#: admin/systems/services/dns/serviceDNSeditZone.tpl.c:47
-msgid "TTL"
-msgstr ""
-
-#: admin/systems/services/dns/class_serviceDNS.inc:197
-msgid "Class"
-msgstr ""
-
-#: admin/systems/services/dns/class_serviceDNS.inc:258
-#, php-format
-msgid "Cannot delete the selected zone. It is still in use by '%s'"
-msgstr ""
-
-#: admin/systems/services/dns/class_serviceDNS.inc:271
-#, php-format
-msgid "Was not able to contact argonaut server: %s"
-msgstr ""
-
-#: admin/systems/services/dns/class_serviceDNS.inc:277
-#, php-format
-msgid "Was not able to launch ldap2zone: %s"
-msgstr ""
-
-#: admin/systems/services/dns/class_serviceDNS.inc:339
-#: admin/systems/services/dns/class_serviceDNS.inc:353
-#: admin/systems/services/dns/class_serviceDNS.inc:370
-#: admin/systems/services/dns/class_serviceDNS.inc:376
-#: admin/systems/services/dns/class_DNS.inc:730
-msgid "LDAP error"
+#: admin/systems/services/dns/class_serviceDNS.inc:102
+msgid "The DNS zones"
 msgstr ""
 
-#: admin/systems/services/dns/class_serviceDNS.inc:395
-msgid "Services"
+#: admin/systems/services/dns/class_serviceDNS.inc:114
+#: admin/systems/services/dns/class_serviceDNS.inc:115
+msgid "DNS service"
 msgstr ""
 
-#: admin/systems/services/dns/class_serviceDNS.inc:401
+#: admin/systems/services/dns/class_serviceDNS.inc:119
 msgid "Start service"
 msgstr ""
 
-#: admin/systems/services/dns/class_serviceDNS.inc:402
+#: admin/systems/services/dns/class_serviceDNS.inc:120
 msgid "Stop service"
 msgstr ""
 
-#: admin/systems/services/dns/class_serviceDNS.inc:403
+#: admin/systems/services/dns/class_serviceDNS.inc:121
 msgid "Restart service"
 msgstr ""
 
-#: admin/systems/services/dns/class_serviceDNS.inc:405
-#: admin/systems/services/dns/class_serviceDNSeditZone.inc:343
-#: admin/systems/services/dns/class_serviceDNSeditZone.inc:348
-#: admin/systems/services/dns/class_serviceDNSeditZone.inc:356
-#: admin/systems/services/dns/serviceDNSeditZone.tpl.c:5
+#: admin/systems/services/dns/class_serviceDNS.inc:123
+#: admin/systems/services/dns/class_serviceDNSeditZone.inc:339
+#: admin/systems/services/dns/class_serviceDNSeditZone.inc:344
+#: admin/systems/services/dns/class_serviceDNSeditZone.inc:352
 msgid "Zone name"
 msgstr ""
 
-#: admin/systems/services/dns/class_serviceDNS.inc:407
-#: admin/systems/services/dns/class_serviceDNSeditZone.inc:436
+#: admin/systems/services/dns/class_serviceDNS.inc:124
+#: admin/systems/services/dns/class_serviceDNSeditZone.inc:348
+msgid "Reverse zone"
+msgstr ""
+
+#: admin/systems/services/dns/class_serviceDNS.inc:125
+#: admin/systems/services/dns/class_serviceDNSeditZone.inc:432
 msgid "Network class"
 msgstr ""
 
-#: admin/systems/services/dns/class_serviceDNS.inc:408
+#: admin/systems/services/dns/class_serviceDNS.inc:126
 msgid "Zone entry editor"
 msgstr ""
 
-#: admin/systems/services/dns/class_serviceDNS.inc:409
-#: admin/systems/services/dns/class_serviceDNSeditZone.inc:360
+#: admin/systems/services/dns/class_serviceDNS.inc:127
+#: admin/systems/services/dns/class_serviceDNSeditZone.inc:356
 msgid "Primary dns server"
 msgstr ""
 
-#: admin/systems/services/dns/class_serviceDNS.inc:410
-#: admin/systems/services/dns/serviceDNSeditZone.tpl.c:32
+#: admin/systems/services/dns/class_serviceDNS.inc:128
 msgid "Mail address"
 msgstr ""
 
-#: admin/systems/services/dns/class_serviceDNS.inc:411
-#: admin/systems/services/dns/class_serviceDNSeditZone.inc:364
+#: admin/systems/services/dns/class_serviceDNS.inc:129
+#: admin/systems/services/dns/class_serviceDNSeditZone.inc:360
 msgid "Serial"
 msgstr ""
 
-#: admin/systems/services/dns/class_serviceDNS.inc:412
-#: admin/systems/services/dns/class_serviceDNSeditZone.inc:368
-#: admin/systems/services/dns/serviceDNSeditZone.tpl.c:38
+#: admin/systems/services/dns/class_serviceDNS.inc:130
+#: admin/systems/services/dns/class_serviceDNSeditZone.inc:364
 msgid "Refresh"
 msgstr ""
 
-#: admin/systems/services/dns/class_serviceDNS.inc:413
-#: admin/systems/services/dns/class_serviceDNSeditZone.inc:380
-#: admin/systems/services/dns/serviceDNSeditZone.tpl.c:41
+#: admin/systems/services/dns/class_serviceDNS.inc:131
+#: admin/systems/services/dns/class_serviceDNSeditZone.inc:376
 msgid "Retry"
 msgstr ""
 
-#: admin/systems/services/dns/class_serviceDNS.inc:414
-#: admin/systems/services/dns/class_serviceDNSeditZone.inc:376
-#: admin/systems/services/dns/serviceDNSeditZone.tpl.c:44
+#: admin/systems/services/dns/class_serviceDNS.inc:132
+#: admin/systems/services/dns/class_serviceDNSeditZone.inc:372
 msgid "Expire"
 msgstr ""
 
-#: admin/systems/services/dns/class_serviceDNS.inc:416
+#: admin/systems/services/dns/class_serviceDNS.inc:133
+msgid "TTL"
+msgstr ""
+
+#: admin/systems/services/dns/class_serviceDNS.inc:134
 msgid "MX records"
 msgstr ""
 
-#: admin/systems/services/dns/class_serviceDNS.inc:417
-#: admin/systems/services/dns/serviceDNSeditZone.tpl.c:17
+#: admin/systems/services/dns/class_serviceDNS.inc:135
 msgid "Zone records"
 msgstr ""
 
+#: admin/systems/services/dns/class_serviceDNS.inc:198
+#: admin/systems/services/dns/class_serviceDNS.inc:212
+#: admin/systems/services/dns/class_serviceDNS.inc:229
+#: admin/systems/services/dns/class_serviceDNS.inc:235
+#: admin/systems/services/dns/class_DNS.inc:730
+msgid "LDAP error"
+msgstr ""
+
 #: admin/systems/services/dns/class_DNS.inc:167
 #, php-format
 msgid "Cannot find reverse zone for DNS zone '%s'. Parsing zone aborted."
@@ -174,44 +145,42 @@ msgid "MxRecord"
 msgstr ""
 
 #: admin/systems/services/dns/class_serviceDNSeditZone.inc:274
-#: admin/systems/services/dns/class_serviceDNSeditZone.inc:518
+#: admin/systems/services/dns/class_serviceDNSeditZone.inc:514
 msgid "Delete"
 msgstr ""
 
-#: admin/systems/services/dns/class_serviceDNSeditZone.inc:356
-#: admin/systems/services/dns/class_serviceDNSeditZone.inc:386
+#: admin/systems/services/dns/class_serviceDNSeditZone.inc:352
+#: admin/systems/services/dns/class_serviceDNSeditZone.inc:382
 msgid "Only lowercase allowed"
 msgstr ""
 
-#: admin/systems/services/dns/class_serviceDNSeditZone.inc:360
+#: admin/systems/services/dns/class_serviceDNSeditZone.inc:356
 msgid "This field should be a domain name"
 msgstr ""
 
-#: admin/systems/services/dns/class_serviceDNSeditZone.inc:372
+#: admin/systems/services/dns/class_serviceDNSeditZone.inc:368
 msgid "Time to life"
 msgstr ""
 
-#: admin/systems/services/dns/class_serviceDNSeditZone.inc:395
-#: admin/systems/services/dns/class_serviceDNSeditZone.inc:415
-#: admin/systems/services/dns/serviceDNSeditZone.tpl.c:8
+#: admin/systems/services/dns/class_serviceDNSeditZone.inc:391
+#: admin/systems/services/dns/class_serviceDNSeditZone.inc:411
 msgid "Network address"
 msgstr ""
 
-#: admin/systems/services/dns/class_serviceDNSeditZone.inc:423
-#: admin/systems/services/dns/class_serviceDNSeditZone.inc:428
-#: admin/systems/services/dns/class_serviceDNSeditZone.inc:433
+#: admin/systems/services/dns/class_serviceDNSeditZone.inc:419
+#: admin/systems/services/dns/class_serviceDNSeditZone.inc:424
+#: admin/systems/services/dns/class_serviceDNSeditZone.inc:429
 #, php-format
 msgid ""
 "The specified network address and the network class (%s/%s) do not match!"
 msgstr ""
 
-#: admin/systems/services/dns/class_serviceDNSeditZone.inc:524
+#: admin/systems/services/dns/class_serviceDNSeditZone.inc:520
 #: admin/systems/services/dns/class_serviceDNSeditZoneEntries.inc:439
 msgid "Add"
 msgstr ""
 
 #: admin/systems/services/dns/class_serviceDNSeditZoneEntries.inc:121
-#: admin/systems/services/dns/serviceDNSeditZoneEntries.tpl.c:8
 msgid "New entry"
 msgstr ""
 
@@ -339,63 +308,3 @@ msgstr ""
 #: config/dns/class_dnsConfig.inc:45
 msgid "Should FD store a final dot at the end of domains?"
 msgstr ""
-
-#: admin/systems/services/dns/serviceDNSeditZone.tpl.c:2
-msgid "Generic"
-msgstr ""
-
-#: admin/systems/services/dns/serviceDNSeditZone.tpl.c:11
-msgid "Netmask"
-msgstr ""
-
-#: admin/systems/services/dns/serviceDNSeditZone.tpl.c:14
-msgid "Zone is in use, network settings can't be modified."
-msgstr ""
-
-#: admin/systems/services/dns/serviceDNSeditZone.tpl.c:20
-msgid "Can't be edited because the zone wasn't saved right now."
-msgstr ""
-
-#: admin/systems/services/dns/serviceDNSeditZone.tpl.c:23
-msgid "Edit"
-msgstr ""
-
-#: admin/systems/services/dns/serviceDNSeditZone.tpl.c:26
-msgid "SOA record"
-msgstr ""
-
-#: admin/systems/services/dns/serviceDNSeditZone.tpl.c:29
-msgid "Primary dns server for this zone"
-msgstr ""
-
-#: admin/systems/services/dns/serviceDNSeditZone.tpl.c:35
-msgid "Serial number (automatically incremented)"
-msgstr ""
-
-#: admin/systems/services/dns/serviceDNSeditZone.tpl.c:50
-msgid "MxRecords"
-msgstr ""
-
-#: admin/systems/services/dns/serviceDNSeditZone.tpl.c:53
-msgid "Global zone records"
-msgstr ""
-
-#: admin/systems/services/dns/serviceDNS.tpl.c:2
-msgid "Zones"
-msgstr ""
-
-#: admin/systems/services/dns/serviceDNSeditZoneEntries.tpl.c:2
-msgid ""
-"This dialog allows you to configure all components of this DNS zone on a "
-"single list."
-msgstr ""
-
-#: admin/systems/services/dns/serviceDNSeditZoneEntries.tpl.c:5
-msgid ""
-"This dialog can't be used until the currently edited zone was saved or the "
-"zone entry exists in the ldap database."
-msgstr ""
-
-#: admin/systems/services/dns/serviceDNSeditZoneEntries.tpl.c:11
-msgid "Create a new DNS zone entry"
-msgstr ""
diff --git a/dns/locale/it/fusiondirectory.po b/dns/locale/it/fusiondirectory.po
index ca0cb16b797c61f5f47d0257c948b997e4e0c34c..a2eed8b68cce3d26fc3dd051ae974ce37d68cc28 100644
--- a/dns/locale/it/fusiondirectory.po
+++ b/dns/locale/it/fusiondirectory.po
@@ -3,35 +3,21 @@
 # This file is distributed under the same license as the PACKAGE package.
 # 
 # Translators:
-# Alessandro Amici <a.amici@bopen.it>, 2005
-# poterealpopolo <giuliano@opensides.be>, 2011
-# poterealpopolo <giuliano@opensides.be>, 2012
-# poterealpopolo <giuliano@opensides.be>, 2011-2012
 msgid ""
 msgstr ""
-"Project-Id-Version: FusionDirectory-108\n"
+"Project-Id-Version: FusionDirectory-109\n"
 "Report-Msgid-Bugs-To: documentation@lists.fusiondirectory.org\n"
-"POT-Creation-Date: 2015-03-19 21:45+0100\n"
-"PO-Revision-Date: 2015-02-25 16:12+0000\n"
+"POT-Creation-Date: 2014-12-15 17:47+0100\n"
+"PO-Revision-Date: 2015-02-25 16:13+0000\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>\n"
-"Language-Team: Italian (http://www.transifex.com/projects/p/FusionDirectory-108/language/it/)\n"
+"Language-Team: Italian (http://www.transifex.com/projects/p/FusionDirectory-109/language/it/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Language: it\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: admin/systems/services/dns/class_serviceDNS.inc:45
-#: admin/systems/services/dns/class_serviceDNS.inc:386
-#: admin/systems/services/dns/class_serviceDNS.inc:394
-#: admin/systems/services/dns/class_serviceDNS.inc:395
-msgid "DNS service"
-msgstr "Servizio DNS"
-
-#: admin/systems/services/dns/class_serviceDNS.inc:101
-#: admin/systems/services/dns/class_serviceDNS.inc:258
-#: admin/systems/services/dns/class_serviceDNS.inc:271
-#: admin/systems/services/dns/class_serviceDNS.inc:277
+#: admin/systems/services/dns/class_serviceDNS.inc:49
 #: admin/systems/services/dns/class_DNS.inc:167
 #: admin/systems/services/dns/class_DNS.inc:172
 #: admin/systems/services/dns/class_DNS.inc:617
@@ -40,120 +26,101 @@ msgstr "Servizio DNS"
 msgid "Error"
 msgstr "Errore"
 
-#: admin/systems/services/dns/class_serviceDNS.inc:195
-#: admin/systems/services/dns/class_serviceDNS.inc:406
-#: admin/systems/services/dns/class_serviceDNSeditZone.inc:352
-msgid "Reverse zone"
-msgstr "Zona inversa"
-
-#: admin/systems/services/dns/class_serviceDNS.inc:196
-#: admin/systems/services/dns/class_serviceDNS.inc:415
-#: admin/systems/services/dns/serviceDNSeditZone.tpl.c:47
-msgid "TTL"
-msgstr "TTL"
-
-#: admin/systems/services/dns/class_serviceDNS.inc:197
-msgid "Class"
-msgstr "Categoria"
-
-#: admin/systems/services/dns/class_serviceDNS.inc:258
-#, php-format
-msgid "Cannot delete the selected zone. It is still in use by '%s'"
-msgstr "Non puoi rimuovere la zona selezionata perchÃ¨ Ã¨ ancora utilizzata da '%s'"
-
-#: admin/systems/services/dns/class_serviceDNS.inc:271
-#, php-format
-msgid "Was not able to contact argonaut server: %s"
-msgstr "Non Ã¨ stato in grado di contattare il server argonaut: %s"
-
-#: admin/systems/services/dns/class_serviceDNS.inc:277
-#, php-format
-msgid "Was not able to launch ldap2zone: %s"
-msgstr "Non Ã¨ stato in grado di avviare ldap2zone: %s"
+#: admin/systems/services/dns/class_serviceDNS.inc:98
+msgid "DNS zones"
+msgstr ""
 
-#: admin/systems/services/dns/class_serviceDNS.inc:339
-#: admin/systems/services/dns/class_serviceDNS.inc:353
-#: admin/systems/services/dns/class_serviceDNS.inc:370
-#: admin/systems/services/dns/class_serviceDNS.inc:376
-#: admin/systems/services/dns/class_DNS.inc:730
-msgid "LDAP error"
-msgstr "Errore LDAP"
+#: admin/systems/services/dns/class_serviceDNS.inc:102
+msgid "The DNS zones"
+msgstr ""
 
-#: admin/systems/services/dns/class_serviceDNS.inc:395
-msgid "Services"
-msgstr "Servizi"
+#: admin/systems/services/dns/class_serviceDNS.inc:114
+#: admin/systems/services/dns/class_serviceDNS.inc:115
+msgid "DNS service"
+msgstr "Servizio DNS"
 
-#: admin/systems/services/dns/class_serviceDNS.inc:401
+#: admin/systems/services/dns/class_serviceDNS.inc:119
 msgid "Start service"
 msgstr "Avvia il servizio"
 
-#: admin/systems/services/dns/class_serviceDNS.inc:402
+#: admin/systems/services/dns/class_serviceDNS.inc:120
 msgid "Stop service"
 msgstr "Ferma il servizio"
 
-#: admin/systems/services/dns/class_serviceDNS.inc:403
+#: admin/systems/services/dns/class_serviceDNS.inc:121
 msgid "Restart service"
 msgstr "Riavvia il servizio"
 
-#: admin/systems/services/dns/class_serviceDNS.inc:405
-#: admin/systems/services/dns/class_serviceDNSeditZone.inc:343
-#: admin/systems/services/dns/class_serviceDNSeditZone.inc:348
-#: admin/systems/services/dns/class_serviceDNSeditZone.inc:356
-#: admin/systems/services/dns/serviceDNSeditZone.tpl.c:5
+#: admin/systems/services/dns/class_serviceDNS.inc:123
+#: admin/systems/services/dns/class_serviceDNSeditZone.inc:339
+#: admin/systems/services/dns/class_serviceDNSeditZone.inc:344
+#: admin/systems/services/dns/class_serviceDNSeditZone.inc:352
 msgid "Zone name"
 msgstr "Nome della zona"
 
-#: admin/systems/services/dns/class_serviceDNS.inc:407
-#: admin/systems/services/dns/class_serviceDNSeditZone.inc:436
+#: admin/systems/services/dns/class_serviceDNS.inc:124
+#: admin/systems/services/dns/class_serviceDNSeditZone.inc:348
+msgid "Reverse zone"
+msgstr "Zona inversa"
+
+#: admin/systems/services/dns/class_serviceDNS.inc:125
+#: admin/systems/services/dns/class_serviceDNSeditZone.inc:432
 msgid "Network class"
 msgstr "Classe di rete"
 
-#: admin/systems/services/dns/class_serviceDNS.inc:408
+#: admin/systems/services/dns/class_serviceDNS.inc:126
 msgid "Zone entry editor"
 msgstr "Editor della zona"
 
-#: admin/systems/services/dns/class_serviceDNS.inc:409
-#: admin/systems/services/dns/class_serviceDNSeditZone.inc:360
+#: admin/systems/services/dns/class_serviceDNS.inc:127
+#: admin/systems/services/dns/class_serviceDNSeditZone.inc:356
 msgid "Primary dns server"
 msgstr "Server DNS primario"
 
-#: admin/systems/services/dns/class_serviceDNS.inc:410
-#: admin/systems/services/dns/serviceDNSeditZone.tpl.c:32
+#: admin/systems/services/dns/class_serviceDNS.inc:128
 msgid "Mail address"
 msgstr "Indirizzo di posta elettronica"
 
-#: admin/systems/services/dns/class_serviceDNS.inc:411
-#: admin/systems/services/dns/class_serviceDNSeditZone.inc:364
+#: admin/systems/services/dns/class_serviceDNS.inc:129
+#: admin/systems/services/dns/class_serviceDNSeditZone.inc:360
 msgid "Serial"
 msgstr "Serie"
 
-#: admin/systems/services/dns/class_serviceDNS.inc:412
-#: admin/systems/services/dns/class_serviceDNSeditZone.inc:368
-#: admin/systems/services/dns/serviceDNSeditZone.tpl.c:38
+#: admin/systems/services/dns/class_serviceDNS.inc:130
+#: admin/systems/services/dns/class_serviceDNSeditZone.inc:364
 msgid "Refresh"
-msgstr "Rigenera"
+msgstr "Aggiorna"
 
-#: admin/systems/services/dns/class_serviceDNS.inc:413
-#: admin/systems/services/dns/class_serviceDNSeditZone.inc:380
-#: admin/systems/services/dns/serviceDNSeditZone.tpl.c:41
+#: admin/systems/services/dns/class_serviceDNS.inc:131
+#: admin/systems/services/dns/class_serviceDNSeditZone.inc:376
 msgid "Retry"
 msgstr "Riprova"
 
-#: admin/systems/services/dns/class_serviceDNS.inc:414
-#: admin/systems/services/dns/class_serviceDNSeditZone.inc:376
-#: admin/systems/services/dns/serviceDNSeditZone.tpl.c:44
+#: admin/systems/services/dns/class_serviceDNS.inc:132
+#: admin/systems/services/dns/class_serviceDNSeditZone.inc:372
 msgid "Expire"
 msgstr "Scadenza"
 
-#: admin/systems/services/dns/class_serviceDNS.inc:416
+#: admin/systems/services/dns/class_serviceDNS.inc:133
+msgid "TTL"
+msgstr "TTL"
+
+#: admin/systems/services/dns/class_serviceDNS.inc:134
 msgid "MX records"
 msgstr "Record MX"
 
-#: admin/systems/services/dns/class_serviceDNS.inc:417
-#: admin/systems/services/dns/serviceDNSeditZone.tpl.c:17
+#: admin/systems/services/dns/class_serviceDNS.inc:135
 msgid "Zone records"
 msgstr "Record della zona"
 
+#: admin/systems/services/dns/class_serviceDNS.inc:198
+#: admin/systems/services/dns/class_serviceDNS.inc:212
+#: admin/systems/services/dns/class_serviceDNS.inc:229
+#: admin/systems/services/dns/class_serviceDNS.inc:235
+#: admin/systems/services/dns/class_DNS.inc:730
+msgid "LDAP error"
+msgstr "Errore LDAP"
+
 #: admin/systems/services/dns/class_DNS.inc:167
 #, php-format
 msgid "Cannot find reverse zone for DNS zone '%s'. Parsing zone aborted."
@@ -178,44 +145,42 @@ msgid "MxRecord"
 msgstr "Record MX"
 
 #: admin/systems/services/dns/class_serviceDNSeditZone.inc:274
-#: admin/systems/services/dns/class_serviceDNSeditZone.inc:518
+#: admin/systems/services/dns/class_serviceDNSeditZone.inc:514
 msgid "Delete"
-msgstr "Rimuovi"
+msgstr "Elimina"
 
-#: admin/systems/services/dns/class_serviceDNSeditZone.inc:356
-#: admin/systems/services/dns/class_serviceDNSeditZone.inc:386
+#: admin/systems/services/dns/class_serviceDNSeditZone.inc:352
+#: admin/systems/services/dns/class_serviceDNSeditZone.inc:382
 msgid "Only lowercase allowed"
 msgstr "Solo i caratteri minuscoli sono autorizzati"
 
-#: admin/systems/services/dns/class_serviceDNSeditZone.inc:360
+#: admin/systems/services/dns/class_serviceDNSeditZone.inc:356
 msgid "This field should be a domain name"
 msgstr ""
 
-#: admin/systems/services/dns/class_serviceDNSeditZone.inc:372
+#: admin/systems/services/dns/class_serviceDNSeditZone.inc:368
 msgid "Time to life"
 msgstr "Durata"
 
-#: admin/systems/services/dns/class_serviceDNSeditZone.inc:395
-#: admin/systems/services/dns/class_serviceDNSeditZone.inc:415
-#: admin/systems/services/dns/serviceDNSeditZone.tpl.c:8
+#: admin/systems/services/dns/class_serviceDNSeditZone.inc:391
+#: admin/systems/services/dns/class_serviceDNSeditZone.inc:411
 msgid "Network address"
 msgstr "Indirizzo di rete"
 
-#: admin/systems/services/dns/class_serviceDNSeditZone.inc:423
-#: admin/systems/services/dns/class_serviceDNSeditZone.inc:428
-#: admin/systems/services/dns/class_serviceDNSeditZone.inc:433
+#: admin/systems/services/dns/class_serviceDNSeditZone.inc:419
+#: admin/systems/services/dns/class_serviceDNSeditZone.inc:424
+#: admin/systems/services/dns/class_serviceDNSeditZone.inc:429
 #, php-format
 msgid ""
 "The specified network address and the network class (%s/%s) do not match!"
 msgstr "L'indirizzo e la classe di rete (%s/%s) specificati, non corrispondono !"
 
-#: admin/systems/services/dns/class_serviceDNSeditZone.inc:524
+#: admin/systems/services/dns/class_serviceDNSeditZone.inc:520
 #: admin/systems/services/dns/class_serviceDNSeditZoneEntries.inc:439
 msgid "Add"
 msgstr "Aggiungi"
 
 #: admin/systems/services/dns/class_serviceDNSeditZoneEntries.inc:121
-#: admin/systems/services/dns/serviceDNSeditZoneEntries.tpl.c:8
 msgid "New entry"
 msgstr "Nuova entry"
 
@@ -260,7 +225,7 @@ msgstr "Correggi il record %s che Ã¨ un doppione per l'entry '%s'."
 
 #: admin/systems/services/dns/class_serviceDNSeditZoneEntries.inc:441
 msgid "Remove"
-msgstr "Rimuovi"
+msgstr "Elimina"
 
 #: admin/systems/services/dns/class_serviceDNSeditZoneEntries.inc:492
 #, php-format
@@ -343,63 +308,3 @@ msgstr ""
 #: config/dns/class_dnsConfig.inc:45
 msgid "Should FD store a final dot at the end of domains?"
 msgstr ""
-
-#: admin/systems/services/dns/serviceDNSeditZone.tpl.c:2
-msgid "Generic"
-msgstr "Informazioni"
-
-#: admin/systems/services/dns/serviceDNSeditZone.tpl.c:11
-msgid "Netmask"
-msgstr "Maschera di sottorete"
-
-#: admin/systems/services/dns/serviceDNSeditZone.tpl.c:14
-msgid "Zone is in use, network settings can't be modified."
-msgstr "La zona Ã¨ utilizzata, i parametri di rete non possono essere modificati."
-
-#: admin/systems/services/dns/serviceDNSeditZone.tpl.c:20
-msgid "Can't be edited because the zone wasn't saved right now."
-msgstr "Impossibile modificare la zona DNS perchÃ© in questo momento viene registrata."
-
-#: admin/systems/services/dns/serviceDNSeditZone.tpl.c:23
-msgid "Edit"
-msgstr "Modifica"
-
-#: admin/systems/services/dns/serviceDNSeditZone.tpl.c:26
-msgid "SOA record"
-msgstr "Record SOA"
-
-#: admin/systems/services/dns/serviceDNSeditZone.tpl.c:29
-msgid "Primary dns server for this zone"
-msgstr "Server DNS primario per questa zona"
-
-#: admin/systems/services/dns/serviceDNSeditZone.tpl.c:35
-msgid "Serial number (automatically incremented)"
-msgstr "Numero di serie (incrementato automaticamente)"
-
-#: admin/systems/services/dns/serviceDNSeditZone.tpl.c:50
-msgid "MxRecords"
-msgstr "Records MX"
-
-#: admin/systems/services/dns/serviceDNSeditZone.tpl.c:53
-msgid "Global zone records"
-msgstr "Record per la zona globale"
-
-#: admin/systems/services/dns/serviceDNS.tpl.c:2
-msgid "Zones"
-msgstr "Zone"
-
-#: admin/systems/services/dns/serviceDNSeditZoneEntries.tpl.c:2
-msgid ""
-"This dialog allows you to configure all components of this DNS zone on a "
-"single list."
-msgstr "Questa finestra ti permetterÃ  di configurare tutti i componenti di una zona DNS in un semplice elenco."
-
-#: admin/systems/services/dns/serviceDNSeditZoneEntries.tpl.c:5
-msgid ""
-"This dialog can't be used until the currently edited zone was saved or the "
-"zone entry exists in the ldap database."
-msgstr "Questa finestra non potrÃ  essere usata finchÃ© la zona non sarÃ  registrata oppure se l'entry esiste giÃ  nell'annuario LDAP."
-
-#: admin/systems/services/dns/serviceDNSeditZoneEntries.tpl.c:11
-msgid "Create a new DNS zone entry"
-msgstr "Crea una nuova zona DNS"
diff --git a/dns/locale/lv/fusiondirectory.po b/dns/locale/lv/fusiondirectory.po
index f09b52c2516f46548c9902210a7e327cf51ad49f..0a3750f2a63e5c921619a40416235a951aae0cf4 100644
--- a/dns/locale/lv/fusiondirectory.po
+++ b/dns/locale/lv/fusiondirectory.po
@@ -5,29 +5,19 @@
 # Translators:
 msgid ""
 msgstr ""
-"Project-Id-Version: FusionDirectory-108\n"
+"Project-Id-Version: FusionDirectory-109\n"
 "Report-Msgid-Bugs-To: documentation@lists.fusiondirectory.org\n"
-"POT-Creation-Date: 2015-03-19 21:45+0100\n"
-"PO-Revision-Date: 2015-02-25 15:44+0000\n"
+"POT-Creation-Date: 2014-12-15 17:47+0100\n"
+"PO-Revision-Date: 2014-12-15 16:52+0000\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>\n"
-"Language-Team: Latvian (http://www.transifex.com/projects/p/FusionDirectory-108/language/lv/)\n"
+"Language-Team: Latvian (http://www.transifex.com/projects/p/FusionDirectory-109/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/services/dns/class_serviceDNS.inc:45
-#: admin/systems/services/dns/class_serviceDNS.inc:386
-#: admin/systems/services/dns/class_serviceDNS.inc:394
-#: admin/systems/services/dns/class_serviceDNS.inc:395
-msgid "DNS service"
-msgstr ""
-
-#: admin/systems/services/dns/class_serviceDNS.inc:101
-#: admin/systems/services/dns/class_serviceDNS.inc:258
-#: admin/systems/services/dns/class_serviceDNS.inc:271
-#: admin/systems/services/dns/class_serviceDNS.inc:277
+#: admin/systems/services/dns/class_serviceDNS.inc:49
 #: admin/systems/services/dns/class_DNS.inc:167
 #: admin/systems/services/dns/class_DNS.inc:172
 #: admin/systems/services/dns/class_DNS.inc:617
@@ -36,120 +26,101 @@ msgstr ""
 msgid "Error"
 msgstr ""
 
-#: admin/systems/services/dns/class_serviceDNS.inc:195
-#: admin/systems/services/dns/class_serviceDNS.inc:406
-#: admin/systems/services/dns/class_serviceDNSeditZone.inc:352
-msgid "Reverse zone"
+#: admin/systems/services/dns/class_serviceDNS.inc:98
+msgid "DNS zones"
 msgstr ""
 
-#: admin/systems/services/dns/class_serviceDNS.inc:196
-#: admin/systems/services/dns/class_serviceDNS.inc:415
-#: admin/systems/services/dns/serviceDNSeditZone.tpl.c:47
-msgid "TTL"
-msgstr ""
-
-#: admin/systems/services/dns/class_serviceDNS.inc:197
-msgid "Class"
-msgstr ""
-
-#: admin/systems/services/dns/class_serviceDNS.inc:258
-#, php-format
-msgid "Cannot delete the selected zone. It is still in use by '%s'"
-msgstr ""
-
-#: admin/systems/services/dns/class_serviceDNS.inc:271
-#, php-format
-msgid "Was not able to contact argonaut server: %s"
-msgstr ""
-
-#: admin/systems/services/dns/class_serviceDNS.inc:277
-#, php-format
-msgid "Was not able to launch ldap2zone: %s"
-msgstr ""
-
-#: admin/systems/services/dns/class_serviceDNS.inc:339
-#: admin/systems/services/dns/class_serviceDNS.inc:353
-#: admin/systems/services/dns/class_serviceDNS.inc:370
-#: admin/systems/services/dns/class_serviceDNS.inc:376
-#: admin/systems/services/dns/class_DNS.inc:730
-msgid "LDAP error"
+#: admin/systems/services/dns/class_serviceDNS.inc:102
+msgid "The DNS zones"
 msgstr ""
 
-#: admin/systems/services/dns/class_serviceDNS.inc:395
-msgid "Services"
+#: admin/systems/services/dns/class_serviceDNS.inc:114
+#: admin/systems/services/dns/class_serviceDNS.inc:115
+msgid "DNS service"
 msgstr ""
 
-#: admin/systems/services/dns/class_serviceDNS.inc:401
+#: admin/systems/services/dns/class_serviceDNS.inc:119
 msgid "Start service"
 msgstr ""
 
-#: admin/systems/services/dns/class_serviceDNS.inc:402
+#: admin/systems/services/dns/class_serviceDNS.inc:120
 msgid "Stop service"
 msgstr ""
 
-#: admin/systems/services/dns/class_serviceDNS.inc:403
+#: admin/systems/services/dns/class_serviceDNS.inc:121
 msgid "Restart service"
 msgstr ""
 
-#: admin/systems/services/dns/class_serviceDNS.inc:405
-#: admin/systems/services/dns/class_serviceDNSeditZone.inc:343
-#: admin/systems/services/dns/class_serviceDNSeditZone.inc:348
-#: admin/systems/services/dns/class_serviceDNSeditZone.inc:356
-#: admin/systems/services/dns/serviceDNSeditZone.tpl.c:5
+#: admin/systems/services/dns/class_serviceDNS.inc:123
+#: admin/systems/services/dns/class_serviceDNSeditZone.inc:339
+#: admin/systems/services/dns/class_serviceDNSeditZone.inc:344
+#: admin/systems/services/dns/class_serviceDNSeditZone.inc:352
 msgid "Zone name"
 msgstr ""
 
-#: admin/systems/services/dns/class_serviceDNS.inc:407
-#: admin/systems/services/dns/class_serviceDNSeditZone.inc:436
+#: admin/systems/services/dns/class_serviceDNS.inc:124
+#: admin/systems/services/dns/class_serviceDNSeditZone.inc:348
+msgid "Reverse zone"
+msgstr ""
+
+#: admin/systems/services/dns/class_serviceDNS.inc:125
+#: admin/systems/services/dns/class_serviceDNSeditZone.inc:432
 msgid "Network class"
 msgstr ""
 
-#: admin/systems/services/dns/class_serviceDNS.inc:408
+#: admin/systems/services/dns/class_serviceDNS.inc:126
 msgid "Zone entry editor"
 msgstr ""
 
-#: admin/systems/services/dns/class_serviceDNS.inc:409
-#: admin/systems/services/dns/class_serviceDNSeditZone.inc:360
+#: admin/systems/services/dns/class_serviceDNS.inc:127
+#: admin/systems/services/dns/class_serviceDNSeditZone.inc:356
 msgid "Primary dns server"
 msgstr ""
 
-#: admin/systems/services/dns/class_serviceDNS.inc:410
-#: admin/systems/services/dns/serviceDNSeditZone.tpl.c:32
+#: admin/systems/services/dns/class_serviceDNS.inc:128
 msgid "Mail address"
 msgstr ""
 
-#: admin/systems/services/dns/class_serviceDNS.inc:411
-#: admin/systems/services/dns/class_serviceDNSeditZone.inc:364
+#: admin/systems/services/dns/class_serviceDNS.inc:129
+#: admin/systems/services/dns/class_serviceDNSeditZone.inc:360
 msgid "Serial"
 msgstr ""
 
-#: admin/systems/services/dns/class_serviceDNS.inc:412
-#: admin/systems/services/dns/class_serviceDNSeditZone.inc:368
-#: admin/systems/services/dns/serviceDNSeditZone.tpl.c:38
+#: admin/systems/services/dns/class_serviceDNS.inc:130
+#: admin/systems/services/dns/class_serviceDNSeditZone.inc:364
 msgid "Refresh"
 msgstr ""
 
-#: admin/systems/services/dns/class_serviceDNS.inc:413
-#: admin/systems/services/dns/class_serviceDNSeditZone.inc:380
-#: admin/systems/services/dns/serviceDNSeditZone.tpl.c:41
+#: admin/systems/services/dns/class_serviceDNS.inc:131
+#: admin/systems/services/dns/class_serviceDNSeditZone.inc:376
 msgid "Retry"
 msgstr ""
 
-#: admin/systems/services/dns/class_serviceDNS.inc:414
-#: admin/systems/services/dns/class_serviceDNSeditZone.inc:376
-#: admin/systems/services/dns/serviceDNSeditZone.tpl.c:44
+#: admin/systems/services/dns/class_serviceDNS.inc:132
+#: admin/systems/services/dns/class_serviceDNSeditZone.inc:372
 msgid "Expire"
 msgstr ""
 
-#: admin/systems/services/dns/class_serviceDNS.inc:416
+#: admin/systems/services/dns/class_serviceDNS.inc:133
+msgid "TTL"
+msgstr ""
+
+#: admin/systems/services/dns/class_serviceDNS.inc:134
 msgid "MX records"
 msgstr ""
 
-#: admin/systems/services/dns/class_serviceDNS.inc:417
-#: admin/systems/services/dns/serviceDNSeditZone.tpl.c:17
+#: admin/systems/services/dns/class_serviceDNS.inc:135
 msgid "Zone records"
 msgstr ""
 
+#: admin/systems/services/dns/class_serviceDNS.inc:198
+#: admin/systems/services/dns/class_serviceDNS.inc:212
+#: admin/systems/services/dns/class_serviceDNS.inc:229
+#: admin/systems/services/dns/class_serviceDNS.inc:235
+#: admin/systems/services/dns/class_DNS.inc:730
+msgid "LDAP error"
+msgstr ""
+
 #: admin/systems/services/dns/class_DNS.inc:167
 #, php-format
 msgid "Cannot find reverse zone for DNS zone '%s'. Parsing zone aborted."
@@ -174,44 +145,42 @@ msgid "MxRecord"
 msgstr ""
 
 #: admin/systems/services/dns/class_serviceDNSeditZone.inc:274
-#: admin/systems/services/dns/class_serviceDNSeditZone.inc:518
+#: admin/systems/services/dns/class_serviceDNSeditZone.inc:514
 msgid "Delete"
 msgstr ""
 
-#: admin/systems/services/dns/class_serviceDNSeditZone.inc:356
-#: admin/systems/services/dns/class_serviceDNSeditZone.inc:386
+#: admin/systems/services/dns/class_serviceDNSeditZone.inc:352
+#: admin/systems/services/dns/class_serviceDNSeditZone.inc:382
 msgid "Only lowercase allowed"
 msgstr ""
 
-#: admin/systems/services/dns/class_serviceDNSeditZone.inc:360
+#: admin/systems/services/dns/class_serviceDNSeditZone.inc:356
 msgid "This field should be a domain name"
 msgstr ""
 
-#: admin/systems/services/dns/class_serviceDNSeditZone.inc:372
+#: admin/systems/services/dns/class_serviceDNSeditZone.inc:368
 msgid "Time to life"
 msgstr ""
 
-#: admin/systems/services/dns/class_serviceDNSeditZone.inc:395
-#: admin/systems/services/dns/class_serviceDNSeditZone.inc:415
-#: admin/systems/services/dns/serviceDNSeditZone.tpl.c:8
+#: admin/systems/services/dns/class_serviceDNSeditZone.inc:391
+#: admin/systems/services/dns/class_serviceDNSeditZone.inc:411
 msgid "Network address"
 msgstr ""
 
-#: admin/systems/services/dns/class_serviceDNSeditZone.inc:423
-#: admin/systems/services/dns/class_serviceDNSeditZone.inc:428
-#: admin/systems/services/dns/class_serviceDNSeditZone.inc:433
+#: admin/systems/services/dns/class_serviceDNSeditZone.inc:419
+#: admin/systems/services/dns/class_serviceDNSeditZone.inc:424
+#: admin/systems/services/dns/class_serviceDNSeditZone.inc:429
 #, php-format
 msgid ""
 "The specified network address and the network class (%s/%s) do not match!"
 msgstr ""
 
-#: admin/systems/services/dns/class_serviceDNSeditZone.inc:524
+#: admin/systems/services/dns/class_serviceDNSeditZone.inc:520
 #: admin/systems/services/dns/class_serviceDNSeditZoneEntries.inc:439
 msgid "Add"
 msgstr ""
 
 #: admin/systems/services/dns/class_serviceDNSeditZoneEntries.inc:121
-#: admin/systems/services/dns/serviceDNSeditZoneEntries.tpl.c:8
 msgid "New entry"
 msgstr ""
 
@@ -339,63 +308,3 @@ msgstr ""
 #: config/dns/class_dnsConfig.inc:45
 msgid "Should FD store a final dot at the end of domains?"
 msgstr ""
-
-#: admin/systems/services/dns/serviceDNSeditZone.tpl.c:2
-msgid "Generic"
-msgstr ""
-
-#: admin/systems/services/dns/serviceDNSeditZone.tpl.c:11
-msgid "Netmask"
-msgstr ""
-
-#: admin/systems/services/dns/serviceDNSeditZone.tpl.c:14
-msgid "Zone is in use, network settings can't be modified."
-msgstr ""
-
-#: admin/systems/services/dns/serviceDNSeditZone.tpl.c:20
-msgid "Can't be edited because the zone wasn't saved right now."
-msgstr ""
-
-#: admin/systems/services/dns/serviceDNSeditZone.tpl.c:23
-msgid "Edit"
-msgstr ""
-
-#: admin/systems/services/dns/serviceDNSeditZone.tpl.c:26
-msgid "SOA record"
-msgstr ""
-
-#: admin/systems/services/dns/serviceDNSeditZone.tpl.c:29
-msgid "Primary dns server for this zone"
-msgstr ""
-
-#: admin/systems/services/dns/serviceDNSeditZone.tpl.c:35
-msgid "Serial number (automatically incremented)"
-msgstr ""
-
-#: admin/systems/services/dns/serviceDNSeditZone.tpl.c:50
-msgid "MxRecords"
-msgstr ""
-
-#: admin/systems/services/dns/serviceDNSeditZone.tpl.c:53
-msgid "Global zone records"
-msgstr ""
-
-#: admin/systems/services/dns/serviceDNS.tpl.c:2
-msgid "Zones"
-msgstr ""
-
-#: admin/systems/services/dns/serviceDNSeditZoneEntries.tpl.c:2
-msgid ""
-"This dialog allows you to configure all components of this DNS zone on a "
-"single list."
-msgstr ""
-
-#: admin/systems/services/dns/serviceDNSeditZoneEntries.tpl.c:5
-msgid ""
-"This dialog can't be used until the currently edited zone was saved or the "
-"zone entry exists in the ldap database."
-msgstr ""
-
-#: admin/systems/services/dns/serviceDNSeditZoneEntries.tpl.c:11
-msgid "Create a new DNS zone entry"
-msgstr ""
diff --git a/dns/locale/nb/fusiondirectory.po b/dns/locale/nb/fusiondirectory.po
index 93659cd7b492136e13994c780c58a33ce3df8a17..65d420ed8d151c8e85e4f393c880be947e44ef1a 100644
--- a/dns/locale/nb/fusiondirectory.po
+++ b/dns/locale/nb/fusiondirectory.po
@@ -5,29 +5,19 @@
 # Translators:
 msgid ""
 msgstr ""
-"Project-Id-Version: FusionDirectory-108\n"
+"Project-Id-Version: FusionDirectory-109\n"
 "Report-Msgid-Bugs-To: documentation@lists.fusiondirectory.org\n"
-"POT-Creation-Date: 2015-03-19 21:45+0100\n"
-"PO-Revision-Date: 2015-02-25 16:12+0000\n"
+"POT-Creation-Date: 2014-12-15 17:47+0100\n"
+"PO-Revision-Date: 2015-02-25 16:04+0000\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>\n"
-"Language-Team: Norwegian BokmÃ¥l (http://www.transifex.com/projects/p/FusionDirectory-108/language/nb/)\n"
+"Language-Team: Norwegian BokmÃ¥l (http://www.transifex.com/projects/p/FusionDirectory-109/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/services/dns/class_serviceDNS.inc:45
-#: admin/systems/services/dns/class_serviceDNS.inc:386
-#: admin/systems/services/dns/class_serviceDNS.inc:394
-#: admin/systems/services/dns/class_serviceDNS.inc:395
-msgid "DNS service"
-msgstr ""
-
-#: admin/systems/services/dns/class_serviceDNS.inc:101
-#: admin/systems/services/dns/class_serviceDNS.inc:258
-#: admin/systems/services/dns/class_serviceDNS.inc:271
-#: admin/systems/services/dns/class_serviceDNS.inc:277
+#: admin/systems/services/dns/class_serviceDNS.inc:49
 #: admin/systems/services/dns/class_DNS.inc:167
 #: admin/systems/services/dns/class_DNS.inc:172
 #: admin/systems/services/dns/class_DNS.inc:617
@@ -36,120 +26,101 @@ msgstr ""
 msgid "Error"
 msgstr "Feil"
 
-#: admin/systems/services/dns/class_serviceDNS.inc:195
-#: admin/systems/services/dns/class_serviceDNS.inc:406
-#: admin/systems/services/dns/class_serviceDNSeditZone.inc:352
-msgid "Reverse zone"
-msgstr ""
-
-#: admin/systems/services/dns/class_serviceDNS.inc:196
-#: admin/systems/services/dns/class_serviceDNS.inc:415
-#: admin/systems/services/dns/serviceDNSeditZone.tpl.c:47
-msgid "TTL"
-msgstr ""
-
-#: admin/systems/services/dns/class_serviceDNS.inc:197
-msgid "Class"
+#: admin/systems/services/dns/class_serviceDNS.inc:98
+msgid "DNS zones"
 msgstr ""
 
-#: admin/systems/services/dns/class_serviceDNS.inc:258
-#, php-format
-msgid "Cannot delete the selected zone. It is still in use by '%s'"
-msgstr ""
-
-#: admin/systems/services/dns/class_serviceDNS.inc:271
-#, php-format
-msgid "Was not able to contact argonaut server: %s"
-msgstr ""
-
-#: admin/systems/services/dns/class_serviceDNS.inc:277
-#, php-format
-msgid "Was not able to launch ldap2zone: %s"
+#: admin/systems/services/dns/class_serviceDNS.inc:102
+msgid "The DNS zones"
 msgstr ""
 
-#: admin/systems/services/dns/class_serviceDNS.inc:339
-#: admin/systems/services/dns/class_serviceDNS.inc:353
-#: admin/systems/services/dns/class_serviceDNS.inc:370
-#: admin/systems/services/dns/class_serviceDNS.inc:376
-#: admin/systems/services/dns/class_DNS.inc:730
-msgid "LDAP error"
-msgstr "LDAP-feil"
-
-#: admin/systems/services/dns/class_serviceDNS.inc:395
-msgid "Services"
+#: admin/systems/services/dns/class_serviceDNS.inc:114
+#: admin/systems/services/dns/class_serviceDNS.inc:115
+msgid "DNS service"
 msgstr ""
 
-#: admin/systems/services/dns/class_serviceDNS.inc:401
+#: admin/systems/services/dns/class_serviceDNS.inc:119
 msgid "Start service"
 msgstr ""
 
-#: admin/systems/services/dns/class_serviceDNS.inc:402
+#: admin/systems/services/dns/class_serviceDNS.inc:120
 msgid "Stop service"
 msgstr ""
 
-#: admin/systems/services/dns/class_serviceDNS.inc:403
+#: admin/systems/services/dns/class_serviceDNS.inc:121
 msgid "Restart service"
 msgstr ""
 
-#: admin/systems/services/dns/class_serviceDNS.inc:405
-#: admin/systems/services/dns/class_serviceDNSeditZone.inc:343
-#: admin/systems/services/dns/class_serviceDNSeditZone.inc:348
-#: admin/systems/services/dns/class_serviceDNSeditZone.inc:356
-#: admin/systems/services/dns/serviceDNSeditZone.tpl.c:5
+#: admin/systems/services/dns/class_serviceDNS.inc:123
+#: admin/systems/services/dns/class_serviceDNSeditZone.inc:339
+#: admin/systems/services/dns/class_serviceDNSeditZone.inc:344
+#: admin/systems/services/dns/class_serviceDNSeditZone.inc:352
 msgid "Zone name"
 msgstr ""
 
-#: admin/systems/services/dns/class_serviceDNS.inc:407
-#: admin/systems/services/dns/class_serviceDNSeditZone.inc:436
+#: admin/systems/services/dns/class_serviceDNS.inc:124
+#: admin/systems/services/dns/class_serviceDNSeditZone.inc:348
+msgid "Reverse zone"
+msgstr ""
+
+#: admin/systems/services/dns/class_serviceDNS.inc:125
+#: admin/systems/services/dns/class_serviceDNSeditZone.inc:432
 msgid "Network class"
 msgstr ""
 
-#: admin/systems/services/dns/class_serviceDNS.inc:408
+#: admin/systems/services/dns/class_serviceDNS.inc:126
 msgid "Zone entry editor"
 msgstr ""
 
-#: admin/systems/services/dns/class_serviceDNS.inc:409
-#: admin/systems/services/dns/class_serviceDNSeditZone.inc:360
+#: admin/systems/services/dns/class_serviceDNS.inc:127
+#: admin/systems/services/dns/class_serviceDNSeditZone.inc:356
 msgid "Primary dns server"
 msgstr ""
 
-#: admin/systems/services/dns/class_serviceDNS.inc:410
-#: admin/systems/services/dns/serviceDNSeditZone.tpl.c:32
+#: admin/systems/services/dns/class_serviceDNS.inc:128
 msgid "Mail address"
 msgstr ""
 
-#: admin/systems/services/dns/class_serviceDNS.inc:411
-#: admin/systems/services/dns/class_serviceDNSeditZone.inc:364
+#: admin/systems/services/dns/class_serviceDNS.inc:129
+#: admin/systems/services/dns/class_serviceDNSeditZone.inc:360
 msgid "Serial"
 msgstr ""
 
-#: admin/systems/services/dns/class_serviceDNS.inc:412
-#: admin/systems/services/dns/class_serviceDNSeditZone.inc:368
-#: admin/systems/services/dns/serviceDNSeditZone.tpl.c:38
+#: admin/systems/services/dns/class_serviceDNS.inc:130
+#: admin/systems/services/dns/class_serviceDNSeditZone.inc:364
 msgid "Refresh"
 msgstr ""
 
-#: admin/systems/services/dns/class_serviceDNS.inc:413
-#: admin/systems/services/dns/class_serviceDNSeditZone.inc:380
-#: admin/systems/services/dns/serviceDNSeditZone.tpl.c:41
+#: admin/systems/services/dns/class_serviceDNS.inc:131
+#: admin/systems/services/dns/class_serviceDNSeditZone.inc:376
 msgid "Retry"
 msgstr ""
 
-#: admin/systems/services/dns/class_serviceDNS.inc:414
-#: admin/systems/services/dns/class_serviceDNSeditZone.inc:376
-#: admin/systems/services/dns/serviceDNSeditZone.tpl.c:44
+#: admin/systems/services/dns/class_serviceDNS.inc:132
+#: admin/systems/services/dns/class_serviceDNSeditZone.inc:372
 msgid "Expire"
 msgstr ""
 
-#: admin/systems/services/dns/class_serviceDNS.inc:416
+#: admin/systems/services/dns/class_serviceDNS.inc:133
+msgid "TTL"
+msgstr ""
+
+#: admin/systems/services/dns/class_serviceDNS.inc:134
 msgid "MX records"
 msgstr ""
 
-#: admin/systems/services/dns/class_serviceDNS.inc:417
-#: admin/systems/services/dns/serviceDNSeditZone.tpl.c:17
+#: admin/systems/services/dns/class_serviceDNS.inc:135
 msgid "Zone records"
 msgstr ""
 
+#: admin/systems/services/dns/class_serviceDNS.inc:198
+#: admin/systems/services/dns/class_serviceDNS.inc:212
+#: admin/systems/services/dns/class_serviceDNS.inc:229
+#: admin/systems/services/dns/class_serviceDNS.inc:235
+#: admin/systems/services/dns/class_DNS.inc:730
+msgid "LDAP error"
+msgstr "LDAP-feil"
+
 #: admin/systems/services/dns/class_DNS.inc:167
 #, php-format
 msgid "Cannot find reverse zone for DNS zone '%s'. Parsing zone aborted."
@@ -174,44 +145,42 @@ msgid "MxRecord"
 msgstr ""
 
 #: admin/systems/services/dns/class_serviceDNSeditZone.inc:274
-#: admin/systems/services/dns/class_serviceDNSeditZone.inc:518
+#: admin/systems/services/dns/class_serviceDNSeditZone.inc:514
 msgid "Delete"
 msgstr ""
 
-#: admin/systems/services/dns/class_serviceDNSeditZone.inc:356
-#: admin/systems/services/dns/class_serviceDNSeditZone.inc:386
+#: admin/systems/services/dns/class_serviceDNSeditZone.inc:352
+#: admin/systems/services/dns/class_serviceDNSeditZone.inc:382
 msgid "Only lowercase allowed"
 msgstr ""
 
-#: admin/systems/services/dns/class_serviceDNSeditZone.inc:360
+#: admin/systems/services/dns/class_serviceDNSeditZone.inc:356
 msgid "This field should be a domain name"
 msgstr ""
 
-#: admin/systems/services/dns/class_serviceDNSeditZone.inc:372
+#: admin/systems/services/dns/class_serviceDNSeditZone.inc:368
 msgid "Time to life"
 msgstr ""
 
-#: admin/systems/services/dns/class_serviceDNSeditZone.inc:395
-#: admin/systems/services/dns/class_serviceDNSeditZone.inc:415
-#: admin/systems/services/dns/serviceDNSeditZone.tpl.c:8
+#: admin/systems/services/dns/class_serviceDNSeditZone.inc:391
+#: admin/systems/services/dns/class_serviceDNSeditZone.inc:411
 msgid "Network address"
 msgstr ""
 
-#: admin/systems/services/dns/class_serviceDNSeditZone.inc:423
-#: admin/systems/services/dns/class_serviceDNSeditZone.inc:428
-#: admin/systems/services/dns/class_serviceDNSeditZone.inc:433
+#: admin/systems/services/dns/class_serviceDNSeditZone.inc:419
+#: admin/systems/services/dns/class_serviceDNSeditZone.inc:424
+#: admin/systems/services/dns/class_serviceDNSeditZone.inc:429
 #, php-format
 msgid ""
 "The specified network address and the network class (%s/%s) do not match!"
 msgstr ""
 
-#: admin/systems/services/dns/class_serviceDNSeditZone.inc:524
+#: admin/systems/services/dns/class_serviceDNSeditZone.inc:520
 #: admin/systems/services/dns/class_serviceDNSeditZoneEntries.inc:439
 msgid "Add"
 msgstr ""
 
 #: admin/systems/services/dns/class_serviceDNSeditZoneEntries.inc:121
-#: admin/systems/services/dns/serviceDNSeditZoneEntries.tpl.c:8
 msgid "New entry"
 msgstr ""
 
@@ -339,63 +308,3 @@ msgstr ""
 #: config/dns/class_dnsConfig.inc:45
 msgid "Should FD store a final dot at the end of domains?"
 msgstr ""
-
-#: admin/systems/services/dns/serviceDNSeditZone.tpl.c:2
-msgid "Generic"
-msgstr "Generisk"
-
-#: admin/systems/services/dns/serviceDNSeditZone.tpl.c:11
-msgid "Netmask"
-msgstr ""
-
-#: admin/systems/services/dns/serviceDNSeditZone.tpl.c:14
-msgid "Zone is in use, network settings can't be modified."
-msgstr ""
-
-#: admin/systems/services/dns/serviceDNSeditZone.tpl.c:20
-msgid "Can't be edited because the zone wasn't saved right now."
-msgstr ""
-
-#: admin/systems/services/dns/serviceDNSeditZone.tpl.c:23
-msgid "Edit"
-msgstr "Endre"
-
-#: admin/systems/services/dns/serviceDNSeditZone.tpl.c:26
-msgid "SOA record"
-msgstr ""
-
-#: admin/systems/services/dns/serviceDNSeditZone.tpl.c:29
-msgid "Primary dns server for this zone"
-msgstr ""
-
-#: admin/systems/services/dns/serviceDNSeditZone.tpl.c:35
-msgid "Serial number (automatically incremented)"
-msgstr ""
-
-#: admin/systems/services/dns/serviceDNSeditZone.tpl.c:50
-msgid "MxRecords"
-msgstr ""
-
-#: admin/systems/services/dns/serviceDNSeditZone.tpl.c:53
-msgid "Global zone records"
-msgstr ""
-
-#: admin/systems/services/dns/serviceDNS.tpl.c:2
-msgid "Zones"
-msgstr ""
-
-#: admin/systems/services/dns/serviceDNSeditZoneEntries.tpl.c:2
-msgid ""
-"This dialog allows you to configure all components of this DNS zone on a "
-"single list."
-msgstr ""
-
-#: admin/systems/services/dns/serviceDNSeditZoneEntries.tpl.c:5
-msgid ""
-"This dialog can't be used until the currently edited zone was saved or the "
-"zone entry exists in the ldap database."
-msgstr ""
-
-#: admin/systems/services/dns/serviceDNSeditZoneEntries.tpl.c:11
-msgid "Create a new DNS zone entry"
-msgstr ""
diff --git a/dns/locale/nl/fusiondirectory.po b/dns/locale/nl/fusiondirectory.po
index ba21b8aa82af1dad09868dda37e2231a626b57d8..861c9b1c9c8e61cd17c50315afa06543a342aa5e 100644
--- a/dns/locale/nl/fusiondirectory.po
+++ b/dns/locale/nl/fusiondirectory.po
@@ -3,33 +3,21 @@
 # This file is distributed under the same license as the PACKAGE package.
 # 
 # Translators:
-# Christophe Augello <christophe@augello.be>, 2012
-#  Niels Klomp (CareWorks ICT Services) <nk@careworks.nl>, 2005
 msgid ""
 msgstr ""
-"Project-Id-Version: FusionDirectory-108\n"
+"Project-Id-Version: FusionDirectory-109\n"
 "Report-Msgid-Bugs-To: documentation@lists.fusiondirectory.org\n"
-"POT-Creation-Date: 2015-03-19 21:45+0100\n"
-"PO-Revision-Date: 2015-02-25 16:12+0000\n"
+"POT-Creation-Date: 2014-12-15 17:47+0100\n"
+"PO-Revision-Date: 2015-02-25 16:13+0000\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>\n"
-"Language-Team: Dutch (http://www.transifex.com/projects/p/FusionDirectory-108/language/nl/)\n"
+"Language-Team: Dutch (http://www.transifex.com/projects/p/FusionDirectory-109/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/services/dns/class_serviceDNS.inc:45
-#: admin/systems/services/dns/class_serviceDNS.inc:386
-#: admin/systems/services/dns/class_serviceDNS.inc:394
-#: admin/systems/services/dns/class_serviceDNS.inc:395
-msgid "DNS service"
-msgstr "DNS service"
-
-#: admin/systems/services/dns/class_serviceDNS.inc:101
-#: admin/systems/services/dns/class_serviceDNS.inc:258
-#: admin/systems/services/dns/class_serviceDNS.inc:271
-#: admin/systems/services/dns/class_serviceDNS.inc:277
+#: admin/systems/services/dns/class_serviceDNS.inc:49
 #: admin/systems/services/dns/class_DNS.inc:167
 #: admin/systems/services/dns/class_DNS.inc:172
 #: admin/systems/services/dns/class_DNS.inc:617
@@ -38,120 +26,101 @@ msgstr "DNS service"
 msgid "Error"
 msgstr "Fout"
 
-#: admin/systems/services/dns/class_serviceDNS.inc:195
-#: admin/systems/services/dns/class_serviceDNS.inc:406
-#: admin/systems/services/dns/class_serviceDNSeditZone.inc:352
-msgid "Reverse zone"
-msgstr "Reverse zone"
-
-#: admin/systems/services/dns/class_serviceDNS.inc:196
-#: admin/systems/services/dns/class_serviceDNS.inc:415
-#: admin/systems/services/dns/serviceDNSeditZone.tpl.c:47
-msgid "TTL"
-msgstr "TTL"
-
-#: admin/systems/services/dns/class_serviceDNS.inc:197
-msgid "Class"
-msgstr "Klasse"
-
-#: admin/systems/services/dns/class_serviceDNS.inc:258
-#, php-format
-msgid "Cannot delete the selected zone. It is still in use by '%s'"
-msgstr "Kan de geselecteerde zone niet verwijderen, aangezien deze nog gebruikt wordt door '%s'"
-
-#: admin/systems/services/dns/class_serviceDNS.inc:271
-#, php-format
-msgid "Was not able to contact argonaut server: %s"
-msgstr "Kan argonaut server : %s niet contacteren"
-
-#: admin/systems/services/dns/class_serviceDNS.inc:277
-#, php-format
-msgid "Was not able to launch ldap2zone: %s"
-msgstr "Kan ldap2zone : %s niet starten"
+#: admin/systems/services/dns/class_serviceDNS.inc:98
+msgid "DNS zones"
+msgstr ""
 
-#: admin/systems/services/dns/class_serviceDNS.inc:339
-#: admin/systems/services/dns/class_serviceDNS.inc:353
-#: admin/systems/services/dns/class_serviceDNS.inc:370
-#: admin/systems/services/dns/class_serviceDNS.inc:376
-#: admin/systems/services/dns/class_DNS.inc:730
-msgid "LDAP error"
-msgstr "LDAP fout"
+#: admin/systems/services/dns/class_serviceDNS.inc:102
+msgid "The DNS zones"
+msgstr ""
 
-#: admin/systems/services/dns/class_serviceDNS.inc:395
-msgid "Services"
-msgstr "Services"
+#: admin/systems/services/dns/class_serviceDNS.inc:114
+#: admin/systems/services/dns/class_serviceDNS.inc:115
+msgid "DNS service"
+msgstr "DNS service"
 
-#: admin/systems/services/dns/class_serviceDNS.inc:401
+#: admin/systems/services/dns/class_serviceDNS.inc:119
 msgid "Start service"
 msgstr "Start service"
 
-#: admin/systems/services/dns/class_serviceDNS.inc:402
+#: admin/systems/services/dns/class_serviceDNS.inc:120
 msgid "Stop service"
 msgstr "Stop service"
 
-#: admin/systems/services/dns/class_serviceDNS.inc:403
+#: admin/systems/services/dns/class_serviceDNS.inc:121
 msgid "Restart service"
 msgstr "Restart service"
 
-#: admin/systems/services/dns/class_serviceDNS.inc:405
-#: admin/systems/services/dns/class_serviceDNSeditZone.inc:343
-#: admin/systems/services/dns/class_serviceDNSeditZone.inc:348
-#: admin/systems/services/dns/class_serviceDNSeditZone.inc:356
-#: admin/systems/services/dns/serviceDNSeditZone.tpl.c:5
+#: admin/systems/services/dns/class_serviceDNS.inc:123
+#: admin/systems/services/dns/class_serviceDNSeditZone.inc:339
+#: admin/systems/services/dns/class_serviceDNSeditZone.inc:344
+#: admin/systems/services/dns/class_serviceDNSeditZone.inc:352
 msgid "Zone name"
 msgstr "Zone-naam"
 
-#: admin/systems/services/dns/class_serviceDNS.inc:407
-#: admin/systems/services/dns/class_serviceDNSeditZone.inc:436
+#: admin/systems/services/dns/class_serviceDNS.inc:124
+#: admin/systems/services/dns/class_serviceDNSeditZone.inc:348
+msgid "Reverse zone"
+msgstr "Reverse zone"
+
+#: admin/systems/services/dns/class_serviceDNS.inc:125
+#: admin/systems/services/dns/class_serviceDNSeditZone.inc:432
 msgid "Network class"
 msgstr "Netwerk klasse"
 
-#: admin/systems/services/dns/class_serviceDNS.inc:408
+#: admin/systems/services/dns/class_serviceDNS.inc:126
 msgid "Zone entry editor"
 msgstr "Zone invoer editor"
 
-#: admin/systems/services/dns/class_serviceDNS.inc:409
-#: admin/systems/services/dns/class_serviceDNSeditZone.inc:360
+#: admin/systems/services/dns/class_serviceDNS.inc:127
+#: admin/systems/services/dns/class_serviceDNSeditZone.inc:356
 msgid "Primary dns server"
 msgstr "Primaire dns server"
 
-#: admin/systems/services/dns/class_serviceDNS.inc:410
-#: admin/systems/services/dns/serviceDNSeditZone.tpl.c:32
+#: admin/systems/services/dns/class_serviceDNS.inc:128
 msgid "Mail address"
 msgstr "E-mail adres"
 
-#: admin/systems/services/dns/class_serviceDNS.inc:411
-#: admin/systems/services/dns/class_serviceDNSeditZone.inc:364
+#: admin/systems/services/dns/class_serviceDNS.inc:129
+#: admin/systems/services/dns/class_serviceDNSeditZone.inc:360
 msgid "Serial"
 msgstr "Serieel"
 
-#: admin/systems/services/dns/class_serviceDNS.inc:412
-#: admin/systems/services/dns/class_serviceDNSeditZone.inc:368
-#: admin/systems/services/dns/serviceDNSeditZone.tpl.c:38
+#: admin/systems/services/dns/class_serviceDNS.inc:130
+#: admin/systems/services/dns/class_serviceDNSeditZone.inc:364
 msgid "Refresh"
 msgstr "Ververs"
 
-#: admin/systems/services/dns/class_serviceDNS.inc:413
-#: admin/systems/services/dns/class_serviceDNSeditZone.inc:380
-#: admin/systems/services/dns/serviceDNSeditZone.tpl.c:41
+#: admin/systems/services/dns/class_serviceDNS.inc:131
+#: admin/systems/services/dns/class_serviceDNSeditZone.inc:376
 msgid "Retry"
 msgstr "Opnieuw proberen"
 
-#: admin/systems/services/dns/class_serviceDNS.inc:414
-#: admin/systems/services/dns/class_serviceDNSeditZone.inc:376
-#: admin/systems/services/dns/serviceDNSeditZone.tpl.c:44
+#: admin/systems/services/dns/class_serviceDNS.inc:132
+#: admin/systems/services/dns/class_serviceDNSeditZone.inc:372
 msgid "Expire"
 msgstr "Vervaltijd"
 
-#: admin/systems/services/dns/class_serviceDNS.inc:416
+#: admin/systems/services/dns/class_serviceDNS.inc:133
+msgid "TTL"
+msgstr "TTL"
+
+#: admin/systems/services/dns/class_serviceDNS.inc:134
 msgid "MX records"
 msgstr "MX records"
 
-#: admin/systems/services/dns/class_serviceDNS.inc:417
-#: admin/systems/services/dns/serviceDNSeditZone.tpl.c:17
+#: admin/systems/services/dns/class_serviceDNS.inc:135
 msgid "Zone records"
 msgstr "Zone records"
 
+#: admin/systems/services/dns/class_serviceDNS.inc:198
+#: admin/systems/services/dns/class_serviceDNS.inc:212
+#: admin/systems/services/dns/class_serviceDNS.inc:229
+#: admin/systems/services/dns/class_serviceDNS.inc:235
+#: admin/systems/services/dns/class_DNS.inc:730
+msgid "LDAP error"
+msgstr "LDAP fout"
+
 #: admin/systems/services/dns/class_DNS.inc:167
 #, php-format
 msgid "Cannot find reverse zone for DNS zone '%s'. Parsing zone aborted."
@@ -176,44 +145,42 @@ msgid "MxRecord"
 msgstr "MxRecord"
 
 #: admin/systems/services/dns/class_serviceDNSeditZone.inc:274
-#: admin/systems/services/dns/class_serviceDNSeditZone.inc:518
+#: admin/systems/services/dns/class_serviceDNSeditZone.inc:514
 msgid "Delete"
 msgstr "Verwijderen"
 
-#: admin/systems/services/dns/class_serviceDNSeditZone.inc:356
-#: admin/systems/services/dns/class_serviceDNSeditZone.inc:386
+#: admin/systems/services/dns/class_serviceDNSeditZone.inc:352
+#: admin/systems/services/dns/class_serviceDNSeditZone.inc:382
 msgid "Only lowercase allowed"
 msgstr "Hoofdletter zijn niet toegestaan voor de zone-naam."
 
-#: admin/systems/services/dns/class_serviceDNSeditZone.inc:360
+#: admin/systems/services/dns/class_serviceDNSeditZone.inc:356
 msgid "This field should be a domain name"
 msgstr ""
 
-#: admin/systems/services/dns/class_serviceDNSeditZone.inc:372
+#: admin/systems/services/dns/class_serviceDNSeditZone.inc:368
 msgid "Time to life"
 msgstr "Time to life"
 
-#: admin/systems/services/dns/class_serviceDNSeditZone.inc:395
-#: admin/systems/services/dns/class_serviceDNSeditZone.inc:415
-#: admin/systems/services/dns/serviceDNSeditZone.tpl.c:8
+#: admin/systems/services/dns/class_serviceDNSeditZone.inc:391
+#: admin/systems/services/dns/class_serviceDNSeditZone.inc:411
 msgid "Network address"
 msgstr "Netwerkadres"
 
-#: admin/systems/services/dns/class_serviceDNSeditZone.inc:423
-#: admin/systems/services/dns/class_serviceDNSeditZone.inc:428
-#: admin/systems/services/dns/class_serviceDNSeditZone.inc:433
+#: admin/systems/services/dns/class_serviceDNSeditZone.inc:419
+#: admin/systems/services/dns/class_serviceDNSeditZone.inc:424
+#: admin/systems/services/dns/class_serviceDNSeditZone.inc:429
 #, php-format
 msgid ""
 "The specified network address and the network class (%s/%s) do not match!"
 msgstr "De bepaalde netwerkelementen adres en het netwerk klasse (%s/%s) komen niet overeen!"
 
-#: admin/systems/services/dns/class_serviceDNSeditZone.inc:524
+#: admin/systems/services/dns/class_serviceDNSeditZone.inc:520
 #: admin/systems/services/dns/class_serviceDNSeditZoneEntries.inc:439
 msgid "Add"
 msgstr "Toevoegen"
 
 #: admin/systems/services/dns/class_serviceDNSeditZoneEntries.inc:121
-#: admin/systems/services/dns/serviceDNSeditZoneEntries.tpl.c:8
 msgid "New entry"
 msgstr "Nieuwe regel"
 
@@ -341,63 +308,3 @@ msgstr ""
 #: config/dns/class_dnsConfig.inc:45
 msgid "Should FD store a final dot at the end of domains?"
 msgstr ""
-
-#: admin/systems/services/dns/serviceDNSeditZone.tpl.c:2
-msgid "Generic"
-msgstr "Algemeen"
-
-#: admin/systems/services/dns/serviceDNSeditZone.tpl.c:11
-msgid "Netmask"
-msgstr "Netmask"
-
-#: admin/systems/services/dns/serviceDNSeditZone.tpl.c:14
-msgid "Zone is in use, network settings can't be modified."
-msgstr "Zone in gebruik, kan netwerk instellingen niet wijzigen"
-
-#: admin/systems/services/dns/serviceDNSeditZone.tpl.c:20
-msgid "Can't be edited because the zone wasn't saved right now."
-msgstr "Kan niet bewerkt worden, aangezien de zone momenteel niet opgeslagen is."
-
-#: admin/systems/services/dns/serviceDNSeditZone.tpl.c:23
-msgid "Edit"
-msgstr "Bewerken"
-
-#: admin/systems/services/dns/serviceDNSeditZone.tpl.c:26
-msgid "SOA record"
-msgstr "SOA record"
-
-#: admin/systems/services/dns/serviceDNSeditZone.tpl.c:29
-msgid "Primary dns server for this zone"
-msgstr "Primaire DNS server voor deze zone"
-
-#: admin/systems/services/dns/serviceDNSeditZone.tpl.c:35
-msgid "Serial number (automatically incremented)"
-msgstr "Serienummer (automatisch opgehoogd)"
-
-#: admin/systems/services/dns/serviceDNSeditZone.tpl.c:50
-msgid "MxRecords"
-msgstr "MX records"
-
-#: admin/systems/services/dns/serviceDNSeditZone.tpl.c:53
-msgid "Global zone records"
-msgstr "Globale zone records"
-
-#: admin/systems/services/dns/serviceDNS.tpl.c:2
-msgid "Zones"
-msgstr "Zones"
-
-#: admin/systems/services/dns/serviceDNSeditZoneEntries.tpl.c:2
-msgid ""
-"This dialog allows you to configure all components of this DNS zone on a "
-"single list."
-msgstr "Deze dialoog maakt het mogelijk om alle componenten van deze DNS zone binnen een enkele lijst te configureren"
-
-#: admin/systems/services/dns/serviceDNSeditZoneEntries.tpl.c:5
-msgid ""
-"This dialog can't be used until the currently edited zone was saved or the "
-"zone entry exists in the ldap database."
-msgstr "Deze dialoog kan niet gebruikt worden, totdat de zone die nu bewerkt wordt opgeslagen wordt of de zone invoerregel in de LDAP database bestaat."
-
-#: admin/systems/services/dns/serviceDNSeditZoneEntries.tpl.c:11
-msgid "Create a new DNS zone entry"
-msgstr "Een nieuwe DNS zone regel aanmaken"
diff --git a/dns/locale/pl/fusiondirectory.po b/dns/locale/pl/fusiondirectory.po
index 6e055c59e5d43b57eb2867e1c404d34c9e88789e..a266db9ddd73c01c2f02c0880b6ef41f1a9567a3 100644
--- a/dns/locale/pl/fusiondirectory.po
+++ b/dns/locale/pl/fusiondirectory.po
@@ -5,29 +5,19 @@
 # Translators:
 msgid ""
 msgstr ""
-"Project-Id-Version: FusionDirectory-108\n"
+"Project-Id-Version: FusionDirectory-109\n"
 "Report-Msgid-Bugs-To: documentation@lists.fusiondirectory.org\n"
-"POT-Creation-Date: 2015-03-19 21:45+0100\n"
-"PO-Revision-Date: 2015-02-25 16:12+0000\n"
+"POT-Creation-Date: 2014-12-15 17:47+0100\n"
+"PO-Revision-Date: 2015-02-25 16:13+0000\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>\n"
-"Language-Team: Polish (http://www.transifex.com/projects/p/FusionDirectory-108/language/pl/)\n"
+"Language-Team: Polish (http://www.transifex.com/projects/p/FusionDirectory-109/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/services/dns/class_serviceDNS.inc:45
-#: admin/systems/services/dns/class_serviceDNS.inc:386
-#: admin/systems/services/dns/class_serviceDNS.inc:394
-#: admin/systems/services/dns/class_serviceDNS.inc:395
-msgid "DNS service"
-msgstr "UsÅ‚uga DNS"
-
-#: admin/systems/services/dns/class_serviceDNS.inc:101
-#: admin/systems/services/dns/class_serviceDNS.inc:258
-#: admin/systems/services/dns/class_serviceDNS.inc:271
-#: admin/systems/services/dns/class_serviceDNS.inc:277
+#: admin/systems/services/dns/class_serviceDNS.inc:49
 #: admin/systems/services/dns/class_DNS.inc:167
 #: admin/systems/services/dns/class_DNS.inc:172
 #: admin/systems/services/dns/class_DNS.inc:617
@@ -36,120 +26,101 @@ msgstr "UsÅ‚uga DNS"
 msgid "Error"
 msgstr "BÅ‚Ä…d"
 
-#: admin/systems/services/dns/class_serviceDNS.inc:195
-#: admin/systems/services/dns/class_serviceDNS.inc:406
-#: admin/systems/services/dns/class_serviceDNSeditZone.inc:352
-msgid "Reverse zone"
-msgstr "Strefa odwrotna"
-
-#: admin/systems/services/dns/class_serviceDNS.inc:196
-#: admin/systems/services/dns/class_serviceDNS.inc:415
-#: admin/systems/services/dns/serviceDNSeditZone.tpl.c:47
-msgid "TTL"
-msgstr "TTL"
-
-#: admin/systems/services/dns/class_serviceDNS.inc:197
-msgid "Class"
-msgstr "Klasa"
-
-#: admin/systems/services/dns/class_serviceDNS.inc:258
-#, php-format
-msgid "Cannot delete the selected zone. It is still in use by '%s'"
-msgstr "Nie moÅ¼na usunÄ…Ä‡ wybranej strefy.Jest wciÄ…Å¼ uÅ¼ywana przez '%s'"
-
-#: admin/systems/services/dns/class_serviceDNS.inc:271
-#, php-format
-msgid "Was not able to contact argonaut server: %s"
+#: admin/systems/services/dns/class_serviceDNS.inc:98
+msgid "DNS zones"
 msgstr ""
 
-#: admin/systems/services/dns/class_serviceDNS.inc:277
-#, php-format
-msgid "Was not able to launch ldap2zone: %s"
+#: admin/systems/services/dns/class_serviceDNS.inc:102
+msgid "The DNS zones"
 msgstr ""
 
-#: admin/systems/services/dns/class_serviceDNS.inc:339
-#: admin/systems/services/dns/class_serviceDNS.inc:353
-#: admin/systems/services/dns/class_serviceDNS.inc:370
-#: admin/systems/services/dns/class_serviceDNS.inc:376
-#: admin/systems/services/dns/class_DNS.inc:730
-msgid "LDAP error"
-msgstr "bÅ‚Ä…d LDAP"
-
-#: admin/systems/services/dns/class_serviceDNS.inc:395
-msgid "Services"
-msgstr "UsÅ‚ugi"
+#: admin/systems/services/dns/class_serviceDNS.inc:114
+#: admin/systems/services/dns/class_serviceDNS.inc:115
+msgid "DNS service"
+msgstr "UsÅ‚uga DNS"
 
-#: admin/systems/services/dns/class_serviceDNS.inc:401
+#: admin/systems/services/dns/class_serviceDNS.inc:119
 msgid "Start service"
 msgstr "Uruchom usÅ‚ugÄ™"
 
-#: admin/systems/services/dns/class_serviceDNS.inc:402
+#: admin/systems/services/dns/class_serviceDNS.inc:120
 msgid "Stop service"
 msgstr "Zatrzymaj usÅ‚ugÄ™"
 
-#: admin/systems/services/dns/class_serviceDNS.inc:403
+#: admin/systems/services/dns/class_serviceDNS.inc:121
 msgid "Restart service"
 msgstr "Restartuj usÅ‚ugÄ™"
 
-#: admin/systems/services/dns/class_serviceDNS.inc:405
-#: admin/systems/services/dns/class_serviceDNSeditZone.inc:343
-#: admin/systems/services/dns/class_serviceDNSeditZone.inc:348
-#: admin/systems/services/dns/class_serviceDNSeditZone.inc:356
-#: admin/systems/services/dns/serviceDNSeditZone.tpl.c:5
+#: admin/systems/services/dns/class_serviceDNS.inc:123
+#: admin/systems/services/dns/class_serviceDNSeditZone.inc:339
+#: admin/systems/services/dns/class_serviceDNSeditZone.inc:344
+#: admin/systems/services/dns/class_serviceDNSeditZone.inc:352
 msgid "Zone name"
 msgstr "Nazwa strefy"
 
-#: admin/systems/services/dns/class_serviceDNS.inc:407
-#: admin/systems/services/dns/class_serviceDNSeditZone.inc:436
+#: admin/systems/services/dns/class_serviceDNS.inc:124
+#: admin/systems/services/dns/class_serviceDNSeditZone.inc:348
+msgid "Reverse zone"
+msgstr "Strefa odwrotna"
+
+#: admin/systems/services/dns/class_serviceDNS.inc:125
+#: admin/systems/services/dns/class_serviceDNSeditZone.inc:432
 msgid "Network class"
 msgstr "Klasa sieciowa"
 
-#: admin/systems/services/dns/class_serviceDNS.inc:408
+#: admin/systems/services/dns/class_serviceDNS.inc:126
 msgid "Zone entry editor"
 msgstr "Edytor wpisÃ³w strefy"
 
-#: admin/systems/services/dns/class_serviceDNS.inc:409
-#: admin/systems/services/dns/class_serviceDNSeditZone.inc:360
+#: admin/systems/services/dns/class_serviceDNS.inc:127
+#: admin/systems/services/dns/class_serviceDNSeditZone.inc:356
 msgid "Primary dns server"
 msgstr "Podstawowy serwer DNS"
 
-#: admin/systems/services/dns/class_serviceDNS.inc:410
-#: admin/systems/services/dns/serviceDNSeditZone.tpl.c:32
+#: admin/systems/services/dns/class_serviceDNS.inc:128
 msgid "Mail address"
 msgstr "Adres email"
 
-#: admin/systems/services/dns/class_serviceDNS.inc:411
-#: admin/systems/services/dns/class_serviceDNSeditZone.inc:364
+#: admin/systems/services/dns/class_serviceDNS.inc:129
+#: admin/systems/services/dns/class_serviceDNSeditZone.inc:360
 msgid "Serial"
 msgstr "Szeregowy"
 
-#: admin/systems/services/dns/class_serviceDNS.inc:412
-#: admin/systems/services/dns/class_serviceDNSeditZone.inc:368
-#: admin/systems/services/dns/serviceDNSeditZone.tpl.c:38
+#: admin/systems/services/dns/class_serviceDNS.inc:130
+#: admin/systems/services/dns/class_serviceDNSeditZone.inc:364
 msgid "Refresh"
 msgstr "OdÅ›wieÅ¼"
 
-#: admin/systems/services/dns/class_serviceDNS.inc:413
-#: admin/systems/services/dns/class_serviceDNSeditZone.inc:380
-#: admin/systems/services/dns/serviceDNSeditZone.tpl.c:41
+#: admin/systems/services/dns/class_serviceDNS.inc:131
+#: admin/systems/services/dns/class_serviceDNSeditZone.inc:376
 msgid "Retry"
 msgstr "Ponawia"
 
-#: admin/systems/services/dns/class_serviceDNS.inc:414
-#: admin/systems/services/dns/class_serviceDNSeditZone.inc:376
-#: admin/systems/services/dns/serviceDNSeditZone.tpl.c:44
+#: admin/systems/services/dns/class_serviceDNS.inc:132
+#: admin/systems/services/dns/class_serviceDNSeditZone.inc:372
 msgid "Expire"
 msgstr "Wygasa"
 
-#: admin/systems/services/dns/class_serviceDNS.inc:416
+#: admin/systems/services/dns/class_serviceDNS.inc:133
+msgid "TTL"
+msgstr "TTL"
+
+#: admin/systems/services/dns/class_serviceDNS.inc:134
 msgid "MX records"
 msgstr "Rekordy MX"
 
-#: admin/systems/services/dns/class_serviceDNS.inc:417
-#: admin/systems/services/dns/serviceDNSeditZone.tpl.c:17
+#: admin/systems/services/dns/class_serviceDNS.inc:135
 msgid "Zone records"
 msgstr "Rekordy strefy"
 
+#: admin/systems/services/dns/class_serviceDNS.inc:198
+#: admin/systems/services/dns/class_serviceDNS.inc:212
+#: admin/systems/services/dns/class_serviceDNS.inc:229
+#: admin/systems/services/dns/class_serviceDNS.inc:235
+#: admin/systems/services/dns/class_DNS.inc:730
+msgid "LDAP error"
+msgstr "bÅ‚Ä…d LDAP"
+
 #: admin/systems/services/dns/class_DNS.inc:167
 #, php-format
 msgid "Cannot find reverse zone for DNS zone '%s'. Parsing zone aborted."
@@ -174,44 +145,42 @@ msgid "MxRecord"
 msgstr ""
 
 #: admin/systems/services/dns/class_serviceDNSeditZone.inc:274
-#: admin/systems/services/dns/class_serviceDNSeditZone.inc:518
+#: admin/systems/services/dns/class_serviceDNSeditZone.inc:514
 msgid "Delete"
 msgstr "UsuÅ„"
 
-#: admin/systems/services/dns/class_serviceDNSeditZone.inc:356
-#: admin/systems/services/dns/class_serviceDNSeditZone.inc:386
+#: admin/systems/services/dns/class_serviceDNSeditZone.inc:352
+#: admin/systems/services/dns/class_serviceDNSeditZone.inc:382
 msgid "Only lowercase allowed"
 msgstr "Tylko maÅ‚e liter sÄ… dozwolone"
 
-#: admin/systems/services/dns/class_serviceDNSeditZone.inc:360
+#: admin/systems/services/dns/class_serviceDNSeditZone.inc:356
 msgid "This field should be a domain name"
 msgstr ""
 
-#: admin/systems/services/dns/class_serviceDNSeditZone.inc:372
+#: admin/systems/services/dns/class_serviceDNSeditZone.inc:368
 msgid "Time to life"
 msgstr "Czas Å¼ycia"
 
-#: admin/systems/services/dns/class_serviceDNSeditZone.inc:395
-#: admin/systems/services/dns/class_serviceDNSeditZone.inc:415
-#: admin/systems/services/dns/serviceDNSeditZone.tpl.c:8
+#: admin/systems/services/dns/class_serviceDNSeditZone.inc:391
+#: admin/systems/services/dns/class_serviceDNSeditZone.inc:411
 msgid "Network address"
 msgstr "Adres sieciowy"
 
-#: admin/systems/services/dns/class_serviceDNSeditZone.inc:423
-#: admin/systems/services/dns/class_serviceDNSeditZone.inc:428
-#: admin/systems/services/dns/class_serviceDNSeditZone.inc:433
+#: admin/systems/services/dns/class_serviceDNSeditZone.inc:419
+#: admin/systems/services/dns/class_serviceDNSeditZone.inc:424
+#: admin/systems/services/dns/class_serviceDNSeditZone.inc:429
 #, php-format
 msgid ""
 "The specified network address and the network class (%s/%s) do not match!"
 msgstr "Podany adres sieciowe i klasa sieciowa (%s/%s) nie zgadzajÄ… siÄ™!"
 
-#: admin/systems/services/dns/class_serviceDNSeditZone.inc:524
+#: admin/systems/services/dns/class_serviceDNSeditZone.inc:520
 #: admin/systems/services/dns/class_serviceDNSeditZoneEntries.inc:439
 msgid "Add"
 msgstr "Dodaj"
 
 #: admin/systems/services/dns/class_serviceDNSeditZoneEntries.inc:121
-#: admin/systems/services/dns/serviceDNSeditZoneEntries.tpl.c:8
 msgid "New entry"
 msgstr "Nowy wpis"
 
@@ -339,63 +308,3 @@ msgstr ""
 #: config/dns/class_dnsConfig.inc:45
 msgid "Should FD store a final dot at the end of domains?"
 msgstr ""
-
-#: admin/systems/services/dns/serviceDNSeditZone.tpl.c:2
-msgid "Generic"
-msgstr "OgÃ³lne"
-
-#: admin/systems/services/dns/serviceDNSeditZone.tpl.c:11
-msgid "Netmask"
-msgstr "Maska sieciowa"
-
-#: admin/systems/services/dns/serviceDNSeditZone.tpl.c:14
-msgid "Zone is in use, network settings can't be modified."
-msgstr "Strefa w uÅ¼yciu, nie moÅ¼na modyfikowaÄ‡ ustawieÅ„ sieci."
-
-#: admin/systems/services/dns/serviceDNSeditZone.tpl.c:20
-msgid "Can't be edited because the zone wasn't saved right now."
-msgstr "Nie moÅ¼na edytowaÄ‡ poniewaÅ¼ strefa nie zostaÅ‚a zapisana."
-
-#: admin/systems/services/dns/serviceDNSeditZone.tpl.c:23
-msgid "Edit"
-msgstr "Edytuj"
-
-#: admin/systems/services/dns/serviceDNSeditZone.tpl.c:26
-msgid "SOA record"
-msgstr "Rekord SOA"
-
-#: admin/systems/services/dns/serviceDNSeditZone.tpl.c:29
-msgid "Primary dns server for this zone"
-msgstr "Podstawowy serwer DNS dla tej strefy"
-
-#: admin/systems/services/dns/serviceDNSeditZone.tpl.c:35
-msgid "Serial number (automatically incremented)"
-msgstr "Numer seryjny (atumatycznie zwiÄ™kszany)"
-
-#: admin/systems/services/dns/serviceDNSeditZone.tpl.c:50
-msgid "MxRecords"
-msgstr "Rekordy MX"
-
-#: admin/systems/services/dns/serviceDNSeditZone.tpl.c:53
-msgid "Global zone records"
-msgstr "Globalne rekordy strefy"
-
-#: admin/systems/services/dns/serviceDNS.tpl.c:2
-msgid "Zones"
-msgstr "Strefy"
-
-#: admin/systems/services/dns/serviceDNSeditZoneEntries.tpl.c:2
-msgid ""
-"This dialog allows you to configure all components of this DNS zone on a "
-"single list."
-msgstr "Ten dialog umoÅ¼liwia konfigurachÄ™ wszystkich elementÃ³w tej strefy DNS w pojedyÅ„czej liÅ›cie."
-
-#: admin/systems/services/dns/serviceDNSeditZoneEntries.tpl.c:5
-msgid ""
-"This dialog can't be used until the currently edited zone was saved or the "
-"zone entry exists in the ldap database."
-msgstr "Ten dialog nie moÅ¼e zostaÄ‡ uÅ¼yty dopÃ³ki edytowana strefa zostanie zapisana lub ta strefa bÄ™dzie istniaÅ‚a w bazie LDAP."
-
-#: admin/systems/services/dns/serviceDNSeditZoneEntries.tpl.c:11
-msgid "Create a new DNS zone entry"
-msgstr "UtwÃ³rz nowy wpis strefy DNS"
diff --git a/dns/locale/pt/fusiondirectory.po b/dns/locale/pt/fusiondirectory.po
index 71da33ad4583b118980160d40457882c87d45a67..6a89efce7372b4e2090f43c5738add993529a886 100644
--- a/dns/locale/pt/fusiondirectory.po
+++ b/dns/locale/pt/fusiondirectory.po
@@ -5,29 +5,19 @@
 # Translators:
 msgid ""
 msgstr ""
-"Project-Id-Version: FusionDirectory-108\n"
+"Project-Id-Version: FusionDirectory-109\n"
 "Report-Msgid-Bugs-To: documentation@lists.fusiondirectory.org\n"
-"POT-Creation-Date: 2015-03-19 21:45+0100\n"
-"PO-Revision-Date: 2015-02-25 16:12+0000\n"
+"POT-Creation-Date: 2014-12-15 17:47+0100\n"
+"PO-Revision-Date: 2015-02-25 16:04+0000\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>\n"
-"Language-Team: Portuguese (http://www.transifex.com/projects/p/FusionDirectory-108/language/pt/)\n"
+"Language-Team: Portuguese (http://www.transifex.com/projects/p/FusionDirectory-109/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/services/dns/class_serviceDNS.inc:45
-#: admin/systems/services/dns/class_serviceDNS.inc:386
-#: admin/systems/services/dns/class_serviceDNS.inc:394
-#: admin/systems/services/dns/class_serviceDNS.inc:395
-msgid "DNS service"
-msgstr ""
-
-#: admin/systems/services/dns/class_serviceDNS.inc:101
-#: admin/systems/services/dns/class_serviceDNS.inc:258
-#: admin/systems/services/dns/class_serviceDNS.inc:271
-#: admin/systems/services/dns/class_serviceDNS.inc:277
+#: admin/systems/services/dns/class_serviceDNS.inc:49
 #: admin/systems/services/dns/class_DNS.inc:167
 #: admin/systems/services/dns/class_DNS.inc:172
 #: admin/systems/services/dns/class_DNS.inc:617
@@ -36,120 +26,101 @@ msgstr ""
 msgid "Error"
 msgstr "Erro"
 
-#: admin/systems/services/dns/class_serviceDNS.inc:195
-#: admin/systems/services/dns/class_serviceDNS.inc:406
-#: admin/systems/services/dns/class_serviceDNSeditZone.inc:352
-msgid "Reverse zone"
-msgstr ""
-
-#: admin/systems/services/dns/class_serviceDNS.inc:196
-#: admin/systems/services/dns/class_serviceDNS.inc:415
-#: admin/systems/services/dns/serviceDNSeditZone.tpl.c:47
-msgid "TTL"
-msgstr ""
-
-#: admin/systems/services/dns/class_serviceDNS.inc:197
-msgid "Class"
+#: admin/systems/services/dns/class_serviceDNS.inc:98
+msgid "DNS zones"
 msgstr ""
 
-#: admin/systems/services/dns/class_serviceDNS.inc:258
-#, php-format
-msgid "Cannot delete the selected zone. It is still in use by '%s'"
-msgstr ""
-
-#: admin/systems/services/dns/class_serviceDNS.inc:271
-#, php-format
-msgid "Was not able to contact argonaut server: %s"
-msgstr ""
-
-#: admin/systems/services/dns/class_serviceDNS.inc:277
-#, php-format
-msgid "Was not able to launch ldap2zone: %s"
+#: admin/systems/services/dns/class_serviceDNS.inc:102
+msgid "The DNS zones"
 msgstr ""
 
-#: admin/systems/services/dns/class_serviceDNS.inc:339
-#: admin/systems/services/dns/class_serviceDNS.inc:353
-#: admin/systems/services/dns/class_serviceDNS.inc:370
-#: admin/systems/services/dns/class_serviceDNS.inc:376
-#: admin/systems/services/dns/class_DNS.inc:730
-msgid "LDAP error"
-msgstr "Erro de LDAP"
-
-#: admin/systems/services/dns/class_serviceDNS.inc:395
-msgid "Services"
+#: admin/systems/services/dns/class_serviceDNS.inc:114
+#: admin/systems/services/dns/class_serviceDNS.inc:115
+msgid "DNS service"
 msgstr ""
 
-#: admin/systems/services/dns/class_serviceDNS.inc:401
+#: admin/systems/services/dns/class_serviceDNS.inc:119
 msgid "Start service"
 msgstr ""
 
-#: admin/systems/services/dns/class_serviceDNS.inc:402
+#: admin/systems/services/dns/class_serviceDNS.inc:120
 msgid "Stop service"
 msgstr ""
 
-#: admin/systems/services/dns/class_serviceDNS.inc:403
+#: admin/systems/services/dns/class_serviceDNS.inc:121
 msgid "Restart service"
 msgstr ""
 
-#: admin/systems/services/dns/class_serviceDNS.inc:405
-#: admin/systems/services/dns/class_serviceDNSeditZone.inc:343
-#: admin/systems/services/dns/class_serviceDNSeditZone.inc:348
-#: admin/systems/services/dns/class_serviceDNSeditZone.inc:356
-#: admin/systems/services/dns/serviceDNSeditZone.tpl.c:5
+#: admin/systems/services/dns/class_serviceDNS.inc:123
+#: admin/systems/services/dns/class_serviceDNSeditZone.inc:339
+#: admin/systems/services/dns/class_serviceDNSeditZone.inc:344
+#: admin/systems/services/dns/class_serviceDNSeditZone.inc:352
 msgid "Zone name"
 msgstr ""
 
-#: admin/systems/services/dns/class_serviceDNS.inc:407
-#: admin/systems/services/dns/class_serviceDNSeditZone.inc:436
+#: admin/systems/services/dns/class_serviceDNS.inc:124
+#: admin/systems/services/dns/class_serviceDNSeditZone.inc:348
+msgid "Reverse zone"
+msgstr ""
+
+#: admin/systems/services/dns/class_serviceDNS.inc:125
+#: admin/systems/services/dns/class_serviceDNSeditZone.inc:432
 msgid "Network class"
 msgstr ""
 
-#: admin/systems/services/dns/class_serviceDNS.inc:408
+#: admin/systems/services/dns/class_serviceDNS.inc:126
 msgid "Zone entry editor"
 msgstr ""
 
-#: admin/systems/services/dns/class_serviceDNS.inc:409
-#: admin/systems/services/dns/class_serviceDNSeditZone.inc:360
+#: admin/systems/services/dns/class_serviceDNS.inc:127
+#: admin/systems/services/dns/class_serviceDNSeditZone.inc:356
 msgid "Primary dns server"
 msgstr ""
 
-#: admin/systems/services/dns/class_serviceDNS.inc:410
-#: admin/systems/services/dns/serviceDNSeditZone.tpl.c:32
+#: admin/systems/services/dns/class_serviceDNS.inc:128
 msgid "Mail address"
 msgstr "EndereÃ§o de Correio"
 
-#: admin/systems/services/dns/class_serviceDNS.inc:411
-#: admin/systems/services/dns/class_serviceDNSeditZone.inc:364
+#: admin/systems/services/dns/class_serviceDNS.inc:129
+#: admin/systems/services/dns/class_serviceDNSeditZone.inc:360
 msgid "Serial"
 msgstr ""
 
-#: admin/systems/services/dns/class_serviceDNS.inc:412
-#: admin/systems/services/dns/class_serviceDNSeditZone.inc:368
-#: admin/systems/services/dns/serviceDNSeditZone.tpl.c:38
+#: admin/systems/services/dns/class_serviceDNS.inc:130
+#: admin/systems/services/dns/class_serviceDNSeditZone.inc:364
 msgid "Refresh"
 msgstr "Recarregar"
 
-#: admin/systems/services/dns/class_serviceDNS.inc:413
-#: admin/systems/services/dns/class_serviceDNSeditZone.inc:380
-#: admin/systems/services/dns/serviceDNSeditZone.tpl.c:41
+#: admin/systems/services/dns/class_serviceDNS.inc:131
+#: admin/systems/services/dns/class_serviceDNSeditZone.inc:376
 msgid "Retry"
 msgstr ""
 
-#: admin/systems/services/dns/class_serviceDNS.inc:414
-#: admin/systems/services/dns/class_serviceDNSeditZone.inc:376
-#: admin/systems/services/dns/serviceDNSeditZone.tpl.c:44
+#: admin/systems/services/dns/class_serviceDNS.inc:132
+#: admin/systems/services/dns/class_serviceDNSeditZone.inc:372
 msgid "Expire"
 msgstr ""
 
-#: admin/systems/services/dns/class_serviceDNS.inc:416
+#: admin/systems/services/dns/class_serviceDNS.inc:133
+msgid "TTL"
+msgstr ""
+
+#: admin/systems/services/dns/class_serviceDNS.inc:134
 msgid "MX records"
 msgstr ""
 
-#: admin/systems/services/dns/class_serviceDNS.inc:417
-#: admin/systems/services/dns/serviceDNSeditZone.tpl.c:17
+#: admin/systems/services/dns/class_serviceDNS.inc:135
 msgid "Zone records"
 msgstr ""
 
+#: admin/systems/services/dns/class_serviceDNS.inc:198
+#: admin/systems/services/dns/class_serviceDNS.inc:212
+#: admin/systems/services/dns/class_serviceDNS.inc:229
+#: admin/systems/services/dns/class_serviceDNS.inc:235
+#: admin/systems/services/dns/class_DNS.inc:730
+msgid "LDAP error"
+msgstr "Erro de LDAP"
+
 #: admin/systems/services/dns/class_DNS.inc:167
 #, php-format
 msgid "Cannot find reverse zone for DNS zone '%s'. Parsing zone aborted."
@@ -174,44 +145,42 @@ msgid "MxRecord"
 msgstr ""
 
 #: admin/systems/services/dns/class_serviceDNSeditZone.inc:274
-#: admin/systems/services/dns/class_serviceDNSeditZone.inc:518
+#: admin/systems/services/dns/class_serviceDNSeditZone.inc:514
 msgid "Delete"
 msgstr "Deletar"
 
-#: admin/systems/services/dns/class_serviceDNSeditZone.inc:356
-#: admin/systems/services/dns/class_serviceDNSeditZone.inc:386
+#: admin/systems/services/dns/class_serviceDNSeditZone.inc:352
+#: admin/systems/services/dns/class_serviceDNSeditZone.inc:382
 msgid "Only lowercase allowed"
 msgstr ""
 
-#: admin/systems/services/dns/class_serviceDNSeditZone.inc:360
+#: admin/systems/services/dns/class_serviceDNSeditZone.inc:356
 msgid "This field should be a domain name"
 msgstr ""
 
-#: admin/systems/services/dns/class_serviceDNSeditZone.inc:372
+#: admin/systems/services/dns/class_serviceDNSeditZone.inc:368
 msgid "Time to life"
 msgstr ""
 
-#: admin/systems/services/dns/class_serviceDNSeditZone.inc:395
-#: admin/systems/services/dns/class_serviceDNSeditZone.inc:415
-#: admin/systems/services/dns/serviceDNSeditZone.tpl.c:8
+#: admin/systems/services/dns/class_serviceDNSeditZone.inc:391
+#: admin/systems/services/dns/class_serviceDNSeditZone.inc:411
 msgid "Network address"
 msgstr ""
 
-#: admin/systems/services/dns/class_serviceDNSeditZone.inc:423
-#: admin/systems/services/dns/class_serviceDNSeditZone.inc:428
-#: admin/systems/services/dns/class_serviceDNSeditZone.inc:433
+#: admin/systems/services/dns/class_serviceDNSeditZone.inc:419
+#: admin/systems/services/dns/class_serviceDNSeditZone.inc:424
+#: admin/systems/services/dns/class_serviceDNSeditZone.inc:429
 #, php-format
 msgid ""
 "The specified network address and the network class (%s/%s) do not match!"
 msgstr ""
 
-#: admin/systems/services/dns/class_serviceDNSeditZone.inc:524
+#: admin/systems/services/dns/class_serviceDNSeditZone.inc:520
 #: admin/systems/services/dns/class_serviceDNSeditZoneEntries.inc:439
 msgid "Add"
 msgstr "Adicionar"
 
 #: admin/systems/services/dns/class_serviceDNSeditZoneEntries.inc:121
-#: admin/systems/services/dns/serviceDNSeditZoneEntries.tpl.c:8
 msgid "New entry"
 msgstr ""
 
@@ -339,63 +308,3 @@ msgstr ""
 #: config/dns/class_dnsConfig.inc:45
 msgid "Should FD store a final dot at the end of domains?"
 msgstr ""
-
-#: admin/systems/services/dns/serviceDNSeditZone.tpl.c:2
-msgid "Generic"
-msgstr "Geral"
-
-#: admin/systems/services/dns/serviceDNSeditZone.tpl.c:11
-msgid "Netmask"
-msgstr ""
-
-#: admin/systems/services/dns/serviceDNSeditZone.tpl.c:14
-msgid "Zone is in use, network settings can't be modified."
-msgstr ""
-
-#: admin/systems/services/dns/serviceDNSeditZone.tpl.c:20
-msgid "Can't be edited because the zone wasn't saved right now."
-msgstr ""
-
-#: admin/systems/services/dns/serviceDNSeditZone.tpl.c:23
-msgid "Edit"
-msgstr "Editar"
-
-#: admin/systems/services/dns/serviceDNSeditZone.tpl.c:26
-msgid "SOA record"
-msgstr ""
-
-#: admin/systems/services/dns/serviceDNSeditZone.tpl.c:29
-msgid "Primary dns server for this zone"
-msgstr ""
-
-#: admin/systems/services/dns/serviceDNSeditZone.tpl.c:35
-msgid "Serial number (automatically incremented)"
-msgstr ""
-
-#: admin/systems/services/dns/serviceDNSeditZone.tpl.c:50
-msgid "MxRecords"
-msgstr ""
-
-#: admin/systems/services/dns/serviceDNSeditZone.tpl.c:53
-msgid "Global zone records"
-msgstr ""
-
-#: admin/systems/services/dns/serviceDNS.tpl.c:2
-msgid "Zones"
-msgstr ""
-
-#: admin/systems/services/dns/serviceDNSeditZoneEntries.tpl.c:2
-msgid ""
-"This dialog allows you to configure all components of this DNS zone on a "
-"single list."
-msgstr ""
-
-#: admin/systems/services/dns/serviceDNSeditZoneEntries.tpl.c:5
-msgid ""
-"This dialog can't be used until the currently edited zone was saved or the "
-"zone entry exists in the ldap database."
-msgstr ""
-
-#: admin/systems/services/dns/serviceDNSeditZoneEntries.tpl.c:11
-msgid "Create a new DNS zone entry"
-msgstr ""
diff --git a/dns/locale/pt_BR/fusiondirectory.po b/dns/locale/pt_BR/fusiondirectory.po
index 94b176c63cbfa3a8226061938646c56a536f0ea5..4212fd4606cc5db56a6cec228ac11ba644a44dda 100644
--- a/dns/locale/pt_BR/fusiondirectory.po
+++ b/dns/locale/pt_BR/fusiondirectory.po
@@ -3,32 +3,21 @@
 # This file is distributed under the same license as the PACKAGE package.
 # 
 # Translators:
-# ALEJANDRO BARRIOS <alejandrobarrios@interlegis.leg.br>, 2014
 msgid ""
 msgstr ""
-"Project-Id-Version: FusionDirectory-108\n"
+"Project-Id-Version: FusionDirectory-109\n"
 "Report-Msgid-Bugs-To: documentation@lists.fusiondirectory.org\n"
-"POT-Creation-Date: 2015-03-19 21:45+0100\n"
-"PO-Revision-Date: 2015-02-25 16:12+0000\n"
+"POT-Creation-Date: 2014-12-15 17:47+0100\n"
+"PO-Revision-Date: 2015-02-25 16:13+0000\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>\n"
-"Language-Team: Portuguese (Brazil) (http://www.transifex.com/projects/p/FusionDirectory-108/language/pt_BR/)\n"
+"Language-Team: Portuguese (Brazil) (http://www.transifex.com/projects/p/FusionDirectory-109/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/services/dns/class_serviceDNS.inc:45
-#: admin/systems/services/dns/class_serviceDNS.inc:386
-#: admin/systems/services/dns/class_serviceDNS.inc:394
-#: admin/systems/services/dns/class_serviceDNS.inc:395
-msgid "DNS service"
-msgstr "ServiÃ§o DNS"
-
-#: admin/systems/services/dns/class_serviceDNS.inc:101
-#: admin/systems/services/dns/class_serviceDNS.inc:258
-#: admin/systems/services/dns/class_serviceDNS.inc:271
-#: admin/systems/services/dns/class_serviceDNS.inc:277
+#: admin/systems/services/dns/class_serviceDNS.inc:49
 #: admin/systems/services/dns/class_DNS.inc:167
 #: admin/systems/services/dns/class_DNS.inc:172
 #: admin/systems/services/dns/class_DNS.inc:617
@@ -37,120 +26,101 @@ msgstr "ServiÃ§o DNS"
 msgid "Error"
 msgstr "Erro"
 
-#: admin/systems/services/dns/class_serviceDNS.inc:195
-#: admin/systems/services/dns/class_serviceDNS.inc:406
-#: admin/systems/services/dns/class_serviceDNSeditZone.inc:352
-msgid "Reverse zone"
-msgstr "Zona reversa"
-
-#: admin/systems/services/dns/class_serviceDNS.inc:196
-#: admin/systems/services/dns/class_serviceDNS.inc:415
-#: admin/systems/services/dns/serviceDNSeditZone.tpl.c:47
-msgid "TTL"
-msgstr "TTL"
-
-#: admin/systems/services/dns/class_serviceDNS.inc:197
-msgid "Class"
-msgstr "Classe"
-
-#: admin/systems/services/dns/class_serviceDNS.inc:258
-#, php-format
-msgid "Cannot delete the selected zone. It is still in use by '%s'"
-msgstr "NÃ£o foi possÃvel deletar a zona selecionada. EstÃ¡ sendo usada por '%s'"
-
-#: admin/systems/services/dns/class_serviceDNS.inc:271
-#, php-format
-msgid "Was not able to contact argonaut server: %s"
+#: admin/systems/services/dns/class_serviceDNS.inc:98
+msgid "DNS zones"
 msgstr ""
 
-#: admin/systems/services/dns/class_serviceDNS.inc:277
-#, php-format
-msgid "Was not able to launch ldap2zone: %s"
+#: admin/systems/services/dns/class_serviceDNS.inc:102
+msgid "The DNS zones"
 msgstr ""
 
-#: admin/systems/services/dns/class_serviceDNS.inc:339
-#: admin/systems/services/dns/class_serviceDNS.inc:353
-#: admin/systems/services/dns/class_serviceDNS.inc:370
-#: admin/systems/services/dns/class_serviceDNS.inc:376
-#: admin/systems/services/dns/class_DNS.inc:730
-msgid "LDAP error"
-msgstr "Erro de LDAP"
-
-#: admin/systems/services/dns/class_serviceDNS.inc:395
-msgid "Services"
-msgstr "ServiÃ§os"
+#: admin/systems/services/dns/class_serviceDNS.inc:114
+#: admin/systems/services/dns/class_serviceDNS.inc:115
+msgid "DNS service"
+msgstr "ServiÃ§o DNS"
 
-#: admin/systems/services/dns/class_serviceDNS.inc:401
+#: admin/systems/services/dns/class_serviceDNS.inc:119
 msgid "Start service"
 msgstr "Iniciar serviÃ§o"
 
-#: admin/systems/services/dns/class_serviceDNS.inc:402
+#: admin/systems/services/dns/class_serviceDNS.inc:120
 msgid "Stop service"
 msgstr "Parar serviÃ§o"
 
-#: admin/systems/services/dns/class_serviceDNS.inc:403
+#: admin/systems/services/dns/class_serviceDNS.inc:121
 msgid "Restart service"
 msgstr "Reiniciar serviÃ§o"
 
-#: admin/systems/services/dns/class_serviceDNS.inc:405
-#: admin/systems/services/dns/class_serviceDNSeditZone.inc:343
-#: admin/systems/services/dns/class_serviceDNSeditZone.inc:348
-#: admin/systems/services/dns/class_serviceDNSeditZone.inc:356
-#: admin/systems/services/dns/serviceDNSeditZone.tpl.c:5
+#: admin/systems/services/dns/class_serviceDNS.inc:123
+#: admin/systems/services/dns/class_serviceDNSeditZone.inc:339
+#: admin/systems/services/dns/class_serviceDNSeditZone.inc:344
+#: admin/systems/services/dns/class_serviceDNSeditZone.inc:352
 msgid "Zone name"
 msgstr "Nome da zona"
 
-#: admin/systems/services/dns/class_serviceDNS.inc:407
-#: admin/systems/services/dns/class_serviceDNSeditZone.inc:436
+#: admin/systems/services/dns/class_serviceDNS.inc:124
+#: admin/systems/services/dns/class_serviceDNSeditZone.inc:348
+msgid "Reverse zone"
+msgstr "Zona reversa"
+
+#: admin/systems/services/dns/class_serviceDNS.inc:125
+#: admin/systems/services/dns/class_serviceDNSeditZone.inc:432
 msgid "Network class"
 msgstr "Classe da rede"
 
-#: admin/systems/services/dns/class_serviceDNS.inc:408
+#: admin/systems/services/dns/class_serviceDNS.inc:126
 msgid "Zone entry editor"
 msgstr "Editor da zona de entrada"
 
-#: admin/systems/services/dns/class_serviceDNS.inc:409
-#: admin/systems/services/dns/class_serviceDNSeditZone.inc:360
+#: admin/systems/services/dns/class_serviceDNS.inc:127
+#: admin/systems/services/dns/class_serviceDNSeditZone.inc:356
 msgid "Primary dns server"
 msgstr ""
 
-#: admin/systems/services/dns/class_serviceDNS.inc:410
-#: admin/systems/services/dns/serviceDNSeditZone.tpl.c:32
+#: admin/systems/services/dns/class_serviceDNS.inc:128
 msgid "Mail address"
 msgstr "E-mail"
 
-#: admin/systems/services/dns/class_serviceDNS.inc:411
-#: admin/systems/services/dns/class_serviceDNSeditZone.inc:364
+#: admin/systems/services/dns/class_serviceDNS.inc:129
+#: admin/systems/services/dns/class_serviceDNSeditZone.inc:360
 msgid "Serial"
 msgstr ""
 
-#: admin/systems/services/dns/class_serviceDNS.inc:412
-#: admin/systems/services/dns/class_serviceDNSeditZone.inc:368
-#: admin/systems/services/dns/serviceDNSeditZone.tpl.c:38
+#: admin/systems/services/dns/class_serviceDNS.inc:130
+#: admin/systems/services/dns/class_serviceDNSeditZone.inc:364
 msgid "Refresh"
 msgstr "Atualizar"
 
-#: admin/systems/services/dns/class_serviceDNS.inc:413
-#: admin/systems/services/dns/class_serviceDNSeditZone.inc:380
-#: admin/systems/services/dns/serviceDNSeditZone.tpl.c:41
+#: admin/systems/services/dns/class_serviceDNS.inc:131
+#: admin/systems/services/dns/class_serviceDNSeditZone.inc:376
 msgid "Retry"
 msgstr "Tente novamente"
 
-#: admin/systems/services/dns/class_serviceDNS.inc:414
-#: admin/systems/services/dns/class_serviceDNSeditZone.inc:376
-#: admin/systems/services/dns/serviceDNSeditZone.tpl.c:44
+#: admin/systems/services/dns/class_serviceDNS.inc:132
+#: admin/systems/services/dns/class_serviceDNSeditZone.inc:372
 msgid "Expire"
 msgstr ""
 
-#: admin/systems/services/dns/class_serviceDNS.inc:416
+#: admin/systems/services/dns/class_serviceDNS.inc:133
+msgid "TTL"
+msgstr "TTL"
+
+#: admin/systems/services/dns/class_serviceDNS.inc:134
 msgid "MX records"
 msgstr ""
 
-#: admin/systems/services/dns/class_serviceDNS.inc:417
-#: admin/systems/services/dns/serviceDNSeditZone.tpl.c:17
+#: admin/systems/services/dns/class_serviceDNS.inc:135
 msgid "Zone records"
 msgstr ""
 
+#: admin/systems/services/dns/class_serviceDNS.inc:198
+#: admin/systems/services/dns/class_serviceDNS.inc:212
+#: admin/systems/services/dns/class_serviceDNS.inc:229
+#: admin/systems/services/dns/class_serviceDNS.inc:235
+#: admin/systems/services/dns/class_DNS.inc:730
+msgid "LDAP error"
+msgstr "Erro de LDAP"
+
 #: admin/systems/services/dns/class_DNS.inc:167
 #, php-format
 msgid "Cannot find reverse zone for DNS zone '%s'. Parsing zone aborted."
@@ -175,44 +145,42 @@ msgid "MxRecord"
 msgstr ""
 
 #: admin/systems/services/dns/class_serviceDNSeditZone.inc:274
-#: admin/systems/services/dns/class_serviceDNSeditZone.inc:518
+#: admin/systems/services/dns/class_serviceDNSeditZone.inc:514
 msgid "Delete"
 msgstr "Deletar"
 
-#: admin/systems/services/dns/class_serviceDNSeditZone.inc:356
-#: admin/systems/services/dns/class_serviceDNSeditZone.inc:386
+#: admin/systems/services/dns/class_serviceDNSeditZone.inc:352
+#: admin/systems/services/dns/class_serviceDNSeditZone.inc:382
 msgid "Only lowercase allowed"
 msgstr ""
 
-#: admin/systems/services/dns/class_serviceDNSeditZone.inc:360
+#: admin/systems/services/dns/class_serviceDNSeditZone.inc:356
 msgid "This field should be a domain name"
 msgstr ""
 
-#: admin/systems/services/dns/class_serviceDNSeditZone.inc:372
+#: admin/systems/services/dns/class_serviceDNSeditZone.inc:368
 msgid "Time to life"
 msgstr ""
 
-#: admin/systems/services/dns/class_serviceDNSeditZone.inc:395
-#: admin/systems/services/dns/class_serviceDNSeditZone.inc:415
-#: admin/systems/services/dns/serviceDNSeditZone.tpl.c:8
+#: admin/systems/services/dns/class_serviceDNSeditZone.inc:391
+#: admin/systems/services/dns/class_serviceDNSeditZone.inc:411
 msgid "Network address"
 msgstr "EndereÃ§o de rede"
 
-#: admin/systems/services/dns/class_serviceDNSeditZone.inc:423
-#: admin/systems/services/dns/class_serviceDNSeditZone.inc:428
-#: admin/systems/services/dns/class_serviceDNSeditZone.inc:433
+#: admin/systems/services/dns/class_serviceDNSeditZone.inc:419
+#: admin/systems/services/dns/class_serviceDNSeditZone.inc:424
+#: admin/systems/services/dns/class_serviceDNSeditZone.inc:429
 #, php-format
 msgid ""
 "The specified network address and the network class (%s/%s) do not match!"
 msgstr ""
 
-#: admin/systems/services/dns/class_serviceDNSeditZone.inc:524
+#: admin/systems/services/dns/class_serviceDNSeditZone.inc:520
 #: admin/systems/services/dns/class_serviceDNSeditZoneEntries.inc:439
 msgid "Add"
 msgstr "Adicionar"
 
 #: admin/systems/services/dns/class_serviceDNSeditZoneEntries.inc:121
-#: admin/systems/services/dns/serviceDNSeditZoneEntries.tpl.c:8
 msgid "New entry"
 msgstr "Nova entrada"
 
@@ -340,63 +308,3 @@ msgstr ""
 #: config/dns/class_dnsConfig.inc:45
 msgid "Should FD store a final dot at the end of domains?"
 msgstr ""
-
-#: admin/systems/services/dns/serviceDNSeditZone.tpl.c:2
-msgid "Generic"
-msgstr "GenÃ©rico"
-
-#: admin/systems/services/dns/serviceDNSeditZone.tpl.c:11
-msgid "Netmask"
-msgstr ""
-
-#: admin/systems/services/dns/serviceDNSeditZone.tpl.c:14
-msgid "Zone is in use, network settings can't be modified."
-msgstr ""
-
-#: admin/systems/services/dns/serviceDNSeditZone.tpl.c:20
-msgid "Can't be edited because the zone wasn't saved right now."
-msgstr ""
-
-#: admin/systems/services/dns/serviceDNSeditZone.tpl.c:23
-msgid "Edit"
-msgstr "Editar"
-
-#: admin/systems/services/dns/serviceDNSeditZone.tpl.c:26
-msgid "SOA record"
-msgstr ""
-
-#: admin/systems/services/dns/serviceDNSeditZone.tpl.c:29
-msgid "Primary dns server for this zone"
-msgstr ""
-
-#: admin/systems/services/dns/serviceDNSeditZone.tpl.c:35
-msgid "Serial number (automatically incremented)"
-msgstr ""
-
-#: admin/systems/services/dns/serviceDNSeditZone.tpl.c:50
-msgid "MxRecords"
-msgstr ""
-
-#: admin/systems/services/dns/serviceDNSeditZone.tpl.c:53
-msgid "Global zone records"
-msgstr ""
-
-#: admin/systems/services/dns/serviceDNS.tpl.c:2
-msgid "Zones"
-msgstr ""
-
-#: admin/systems/services/dns/serviceDNSeditZoneEntries.tpl.c:2
-msgid ""
-"This dialog allows you to configure all components of this DNS zone on a "
-"single list."
-msgstr ""
-
-#: admin/systems/services/dns/serviceDNSeditZoneEntries.tpl.c:5
-msgid ""
-"This dialog can't be used until the currently edited zone was saved or the "
-"zone entry exists in the ldap database."
-msgstr ""
-
-#: admin/systems/services/dns/serviceDNSeditZoneEntries.tpl.c:11
-msgid "Create a new DNS zone entry"
-msgstr ""
diff --git a/dns/locale/ru/fusiondirectory.po b/dns/locale/ru/fusiondirectory.po
index dfc69e17e4129e5e8451e405cde63b0302c492df..d9d64124cc42a4fc4d8a392f65a6388b4481a4c6 100644
--- a/dns/locale/ru/fusiondirectory.po
+++ b/dns/locale/ru/fusiondirectory.po
@@ -3,34 +3,21 @@
 # This file is distributed under the same license as the PACKAGE package.
 # 
 # Translators:
-# Alexey, 2015
-# Alexey, 2015
-#  Valia V. Vaneeva <fattie@altlinux.ru>, 2004
 msgid ""
 msgstr ""
-"Project-Id-Version: FusionDirectory-108\n"
+"Project-Id-Version: FusionDirectory-109\n"
 "Report-Msgid-Bugs-To: documentation@lists.fusiondirectory.org\n"
-"POT-Creation-Date: 2015-03-19 21:45+0100\n"
-"PO-Revision-Date: 2015-03-18 19:48+0000\n"
-"Last-Translator: Alexey\n"
-"Language-Team: Russian (http://www.transifex.com/projects/p/FusionDirectory-108/language/ru/)\n"
+"POT-Creation-Date: 2014-12-15 17:47+0100\n"
+"PO-Revision-Date: 2015-04-12 22:01+0000\n"
+"Last-Translator: fusiondirectory <contact@fusiondirectory.org>\n"
+"Language-Team: Russian (http://www.transifex.com/projects/p/FusionDirectory-109/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=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);\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/dns/class_serviceDNS.inc:45
-#: admin/systems/services/dns/class_serviceDNS.inc:386
-#: admin/systems/services/dns/class_serviceDNS.inc:394
-#: admin/systems/services/dns/class_serviceDNS.inc:395
-msgid "DNS service"
-msgstr "Ð¡Ð»ÑƒÐ¶Ð±Ð° DNS"
-
-#: admin/systems/services/dns/class_serviceDNS.inc:101
-#: admin/systems/services/dns/class_serviceDNS.inc:258
-#: admin/systems/services/dns/class_serviceDNS.inc:271
-#: admin/systems/services/dns/class_serviceDNS.inc:277
+#: admin/systems/services/dns/class_serviceDNS.inc:49
 #: admin/systems/services/dns/class_DNS.inc:167
 #: admin/systems/services/dns/class_DNS.inc:172
 #: admin/systems/services/dns/class_DNS.inc:617
@@ -39,120 +26,101 @@ msgstr "Ð¡Ð»ÑƒÐ¶Ð±Ð° DNS"
 msgid "Error"
 msgstr "ÐžÑˆÐ¸Ð±ÐºÐ°"
 
-#: admin/systems/services/dns/class_serviceDNS.inc:195
-#: admin/systems/services/dns/class_serviceDNS.inc:406
-#: admin/systems/services/dns/class_serviceDNSeditZone.inc:352
-msgid "Reverse zone"
-msgstr "ÐžÐ±Ñ€Ð°Ñ‚Ð½Ð°Ñ Ð·Ð¾Ð½Ð°"
-
-#: admin/systems/services/dns/class_serviceDNS.inc:196
-#: admin/systems/services/dns/class_serviceDNS.inc:415
-#: admin/systems/services/dns/serviceDNSeditZone.tpl.c:47
-msgid "TTL"
-msgstr "TTL"
-
-#: admin/systems/services/dns/class_serviceDNS.inc:197
-msgid "Class"
-msgstr ""
-
-#: admin/systems/services/dns/class_serviceDNS.inc:258
-#, php-format
-msgid "Cannot delete the selected zone. It is still in use by '%s'"
-msgstr "ÐÐµ Ð¼Ð¾Ð³Ñƒ ÑƒÐ´Ð°Ð»Ð¸Ñ‚ÑŒ Ð²Ñ‹Ð±Ñ€Ð°Ð½Ð½ÑƒÑŽ Ð·Ð¾Ð½Ñƒ. ÐžÐ½Ð° Ð´Ð¾ ÑÐ¸Ñ… Ð¿Ð¾Ñ€ Ð¸ÑÐ¿Ð¾Ð»ÑŒÐ·ÑƒÐµÑ‚ÑÑ Ð² '%s'"
-
-#: admin/systems/services/dns/class_serviceDNS.inc:271
-#, php-format
-msgid "Was not able to contact argonaut server: %s"
+#: admin/systems/services/dns/class_serviceDNS.inc:98
+msgid "DNS zones"
 msgstr ""
 
-#: admin/systems/services/dns/class_serviceDNS.inc:277
-#, php-format
-msgid "Was not able to launch ldap2zone: %s"
+#: admin/systems/services/dns/class_serviceDNS.inc:102
+msgid "The DNS zones"
 msgstr ""
 
-#: admin/systems/services/dns/class_serviceDNS.inc:339
-#: admin/systems/services/dns/class_serviceDNS.inc:353
-#: admin/systems/services/dns/class_serviceDNS.inc:370
-#: admin/systems/services/dns/class_serviceDNS.inc:376
-#: admin/systems/services/dns/class_DNS.inc:730
-msgid "LDAP error"
-msgstr "ÐžÑˆÐ¸Ð±ÐºÐ° LDAP"
-
-#: admin/systems/services/dns/class_serviceDNS.inc:395
-msgid "Services"
-msgstr "Ð¡ÐµÑ€Ð²Ð¸ÑÑ‹"
+#: admin/systems/services/dns/class_serviceDNS.inc:114
+#: admin/systems/services/dns/class_serviceDNS.inc:115
+msgid "DNS service"
+msgstr "Ð¡Ð»ÑƒÐ¶Ð±Ð° DNS"
 
-#: admin/systems/services/dns/class_serviceDNS.inc:401
+#: admin/systems/services/dns/class_serviceDNS.inc:119
 msgid "Start service"
-msgstr ""
+msgstr "Ð—Ð°Ð¿ÑƒÑÑ‚Ð¸Ñ‚ÑŒ ÑÐ»ÑƒÐ¶Ð±Ñƒ"
 
-#: admin/systems/services/dns/class_serviceDNS.inc:402
+#: admin/systems/services/dns/class_serviceDNS.inc:120
 msgid "Stop service"
-msgstr ""
+msgstr "ÐžÑÑ‚Ð°Ð½Ð¾Ð²Ð¸Ñ‚ÑŒ ÑÐ»ÑƒÐ¶Ð±Ñƒ"
 
-#: admin/systems/services/dns/class_serviceDNS.inc:403
+#: admin/systems/services/dns/class_serviceDNS.inc:121
 msgid "Restart service"
-msgstr ""
+msgstr "ÐŸÐµÑ€ÐµÐ·Ð°Ð¿ÑƒÑÑ‚Ð¸Ñ‚ÑŒ ÑÐ»ÑƒÐ¶Ð±Ñƒ"
 
-#: admin/systems/services/dns/class_serviceDNS.inc:405
-#: admin/systems/services/dns/class_serviceDNSeditZone.inc:343
-#: admin/systems/services/dns/class_serviceDNSeditZone.inc:348
-#: admin/systems/services/dns/class_serviceDNSeditZone.inc:356
-#: admin/systems/services/dns/serviceDNSeditZone.tpl.c:5
+#: admin/systems/services/dns/class_serviceDNS.inc:123
+#: admin/systems/services/dns/class_serviceDNSeditZone.inc:339
+#: admin/systems/services/dns/class_serviceDNSeditZone.inc:344
+#: admin/systems/services/dns/class_serviceDNSeditZone.inc:352
 msgid "Zone name"
 msgstr "Ð˜Ð¼Ñ Ð·Ð¾Ð½Ñ‹"
 
-#: admin/systems/services/dns/class_serviceDNS.inc:407
-#: admin/systems/services/dns/class_serviceDNSeditZone.inc:436
+#: admin/systems/services/dns/class_serviceDNS.inc:124
+#: admin/systems/services/dns/class_serviceDNSeditZone.inc:348
+msgid "Reverse zone"
+msgstr "ÐžÐ±Ñ€Ð°Ñ‚Ð½Ð°Ñ Ð·Ð¾Ð½Ð°"
+
+#: admin/systems/services/dns/class_serviceDNS.inc:125
+#: admin/systems/services/dns/class_serviceDNSeditZone.inc:432
 msgid "Network class"
-msgstr ""
+msgstr "ÐšÐ»Ð°ÑÑ ÑÐµÑ‚Ð¸"
 
-#: admin/systems/services/dns/class_serviceDNS.inc:408
+#: admin/systems/services/dns/class_serviceDNS.inc:126
 msgid "Zone entry editor"
 msgstr ""
 
-#: admin/systems/services/dns/class_serviceDNS.inc:409
-#: admin/systems/services/dns/class_serviceDNSeditZone.inc:360
+#: admin/systems/services/dns/class_serviceDNS.inc:127
+#: admin/systems/services/dns/class_serviceDNSeditZone.inc:356
 msgid "Primary dns server"
 msgstr "ÐžÑÐ½Ð¾Ð²Ð½Ð¾Ð¹ dns ÑÐµÑ€Ð²ÐµÑ€"
 
-#: admin/systems/services/dns/class_serviceDNS.inc:410
-#: admin/systems/services/dns/serviceDNSeditZone.tpl.c:32
+#: admin/systems/services/dns/class_serviceDNS.inc:128
 msgid "Mail address"
 msgstr "ÐÐ´Ñ€ÐµÑ ÑÐ»ÐµÐºÑ‚Ñ€Ð¾Ð½Ð½Ð¾Ð¹ Ð¿Ð¾Ñ‡Ñ‚Ñ‹"
 
-#: admin/systems/services/dns/class_serviceDNS.inc:411
-#: admin/systems/services/dns/class_serviceDNSeditZone.inc:364
+#: admin/systems/services/dns/class_serviceDNS.inc:129
+#: admin/systems/services/dns/class_serviceDNSeditZone.inc:360
 msgid "Serial"
 msgstr ""
 
-#: admin/systems/services/dns/class_serviceDNS.inc:412
-#: admin/systems/services/dns/class_serviceDNSeditZone.inc:368
-#: admin/systems/services/dns/serviceDNSeditZone.tpl.c:38
+#: admin/systems/services/dns/class_serviceDNS.inc:130
+#: admin/systems/services/dns/class_serviceDNSeditZone.inc:364
 msgid "Refresh"
 msgstr "ÐžÐ±Ð½Ð¾Ð²Ð¸Ñ‚ÑŒ"
 
-#: admin/systems/services/dns/class_serviceDNS.inc:413
-#: admin/systems/services/dns/class_serviceDNSeditZone.inc:380
-#: admin/systems/services/dns/serviceDNSeditZone.tpl.c:41
+#: admin/systems/services/dns/class_serviceDNS.inc:131
+#: admin/systems/services/dns/class_serviceDNSeditZone.inc:376
 msgid "Retry"
 msgstr "ÐŸÐ¾Ð²Ñ‚Ð¾Ñ€Ð¸Ñ‚ÑŒ"
 
-#: admin/systems/services/dns/class_serviceDNS.inc:414
-#: admin/systems/services/dns/class_serviceDNSeditZone.inc:376
-#: admin/systems/services/dns/serviceDNSeditZone.tpl.c:44
+#: admin/systems/services/dns/class_serviceDNS.inc:132
+#: admin/systems/services/dns/class_serviceDNSeditZone.inc:372
 msgid "Expire"
 msgstr ""
 
-#: admin/systems/services/dns/class_serviceDNS.inc:416
+#: admin/systems/services/dns/class_serviceDNS.inc:133
+msgid "TTL"
+msgstr "TTL"
+
+#: admin/systems/services/dns/class_serviceDNS.inc:134
 msgid "MX records"
 msgstr "MX Ð·Ð°Ð¿Ð¸ÑÐ¸"
 
-#: admin/systems/services/dns/class_serviceDNS.inc:417
-#: admin/systems/services/dns/serviceDNSeditZone.tpl.c:17
+#: admin/systems/services/dns/class_serviceDNS.inc:135
 msgid "Zone records"
 msgstr ""
 
+#: admin/systems/services/dns/class_serviceDNS.inc:198
+#: admin/systems/services/dns/class_serviceDNS.inc:212
+#: admin/systems/services/dns/class_serviceDNS.inc:229
+#: admin/systems/services/dns/class_serviceDNS.inc:235
+#: admin/systems/services/dns/class_DNS.inc:730
+msgid "LDAP error"
+msgstr "ÐžÑˆÐ¸Ð±ÐºÐ° LDAP"
+
 #: admin/systems/services/dns/class_DNS.inc:167
 #, php-format
 msgid "Cannot find reverse zone for DNS zone '%s'. Parsing zone aborted."
@@ -174,54 +142,52 @@ msgstr "ÐŸÑ€ÐµÐ´ÑƒÐ¿Ñ€ÐµÐ¶Ð´ÐµÐ½Ð¸Ðµ"
 
 #: admin/systems/services/dns/class_serviceDNSeditZone.inc:244
 msgid "MxRecord"
-msgstr ""
+msgstr "MX Ð·Ð°Ð¿Ð¸ÑÑŒ"
 
 #: admin/systems/services/dns/class_serviceDNSeditZone.inc:274
-#: admin/systems/services/dns/class_serviceDNSeditZone.inc:518
+#: admin/systems/services/dns/class_serviceDNSeditZone.inc:514
 msgid "Delete"
 msgstr "Ð£Ð´Ð°Ð»Ð¸Ñ‚ÑŒ"
 
-#: admin/systems/services/dns/class_serviceDNSeditZone.inc:356
-#: admin/systems/services/dns/class_serviceDNSeditZone.inc:386
+#: admin/systems/services/dns/class_serviceDNSeditZone.inc:352
+#: admin/systems/services/dns/class_serviceDNSeditZone.inc:382
 msgid "Only lowercase allowed"
-msgstr ""
+msgstr "Ð Ð°Ð·Ñ€ÐµÑˆÐµÐ½Ñ‹ Ñ‚Ð¾Ð»ÑŒÐºÐ¾ ÑÑ‚Ñ€Ð¾Ñ‡Ð½Ñ‹Ðµ Ð±ÑƒÐºÐ²Ñ‹"
 
-#: admin/systems/services/dns/class_serviceDNSeditZone.inc:360
+#: admin/systems/services/dns/class_serviceDNSeditZone.inc:356
 msgid "This field should be a domain name"
 msgstr ""
 
-#: admin/systems/services/dns/class_serviceDNSeditZone.inc:372
+#: admin/systems/services/dns/class_serviceDNSeditZone.inc:368
 msgid "Time to life"
-msgstr ""
+msgstr "Ð’Ñ€ÐµÐ¼Ñ Ð¶Ð¸Ð·Ð½Ð¸"
 
-#: admin/systems/services/dns/class_serviceDNSeditZone.inc:395
-#: admin/systems/services/dns/class_serviceDNSeditZone.inc:415
-#: admin/systems/services/dns/serviceDNSeditZone.tpl.c:8
+#: admin/systems/services/dns/class_serviceDNSeditZone.inc:391
+#: admin/systems/services/dns/class_serviceDNSeditZone.inc:411
 msgid "Network address"
-msgstr ""
+msgstr "Ð¡ÐµÑ‚ÐµÐ²Ð¾Ð¹ Ð°Ð´Ñ€ÐµÑ"
 
-#: admin/systems/services/dns/class_serviceDNSeditZone.inc:423
-#: admin/systems/services/dns/class_serviceDNSeditZone.inc:428
-#: admin/systems/services/dns/class_serviceDNSeditZone.inc:433
+#: admin/systems/services/dns/class_serviceDNSeditZone.inc:419
+#: admin/systems/services/dns/class_serviceDNSeditZone.inc:424
+#: admin/systems/services/dns/class_serviceDNSeditZone.inc:429
 #, php-format
 msgid ""
 "The specified network address and the network class (%s/%s) do not match!"
 msgstr ""
 
-#: admin/systems/services/dns/class_serviceDNSeditZone.inc:524
+#: admin/systems/services/dns/class_serviceDNSeditZone.inc:520
 #: admin/systems/services/dns/class_serviceDNSeditZoneEntries.inc:439
 msgid "Add"
 msgstr "Ð”Ð¾Ð±Ð°Ð²Ð¸Ñ‚ÑŒ"
 
 #: admin/systems/services/dns/class_serviceDNSeditZoneEntries.inc:121
-#: admin/systems/services/dns/serviceDNSeditZoneEntries.tpl.c:8
 msgid "New entry"
-msgstr ""
+msgstr "ÐÐ¾Ð²Ð°Ñ Ð·Ð°Ð¿Ð¸ÑÑŒ"
 
 #: admin/systems/services/dns/class_serviceDNSeditZoneEntries.inc:229
 #, php-format
 msgid "Cannot rename '%s' to '%s'. Name is already in use!"
-msgstr ""
+msgstr "ÐÐµ Ð¼Ð¾Ð³Ñƒ Ð¿ÐµÑ€ÐµÐ¸Ð¼ÐµÐ½Ð¾Ð²Ð°Ñ‚ÑŒ '%s' Ð² '%s'. Ð˜Ð¼Ñ ÑƒÐ¶Ðµ Ð¸ÑÐ¿Ð¾Ð»ÑŒÐ·ÑƒÐµÑ‚ÑÑ!"
 
 #: admin/systems/services/dns/class_serviceDNSeditZoneEntries.inc:260
 msgid "Name"
@@ -230,12 +196,12 @@ msgstr "Ð¤Ð°Ð¼Ð¸Ð»Ð¸Ñ"
 #: admin/systems/services/dns/class_serviceDNSeditZoneEntries.inc:268
 #, php-format
 msgid "Cannot rename '%s' to '%s'. Entry is already in use."
-msgstr ""
+msgstr "ÐÐµ Ð¼Ð¾Ð³Ñƒ Ð¿ÐµÑ€ÐµÐ¸Ð¼ÐµÐ½Ð¾Ð²Ð°Ñ‚ÑŒ '%s' Ð² '%s'. Ð—Ð°Ð¿Ð¸ÑÑŒ ÑƒÐ¶Ðµ Ð¸ÑÐ¿Ð¾Ð»ÑŒÐ·ÑƒÐµÑ‚ÑÑ."
 
 #: admin/systems/services/dns/class_serviceDNSeditZoneEntries.inc:274
 #, php-format
 msgid "Cannot create '%s'. Entry is already in use."
-msgstr ""
+msgstr "ÐÐµ Ð¼Ð¾Ð³Ñƒ ÑÐ¾Ð·Ð´Ð°Ñ‚ÑŒ '%s'. Ð—Ð°Ð¿Ð¸ÑÑŒ ÑƒÐ¶Ðµ Ð¸ÑÐ¿Ð¾Ð»ÑŒÐ·ÑƒÐµÑ‚ÑÑ."
 
 #: admin/systems/services/dns/class_serviceDNSeditZoneEntries.inc:282
 #, php-format
@@ -275,21 +241,21 @@ msgstr "ÐŸÑ€Ð¸Ð¼ÐµÑ€"
 #: admin/systems/services/dns/class_serviceDNSeditZoneEntries.inc:514
 #: admin/systems/services/dns/class_serviceDNSeditZoneEntries.inc:545
 msgid "Entry should be a DNS name."
-msgstr ""
+msgstr "Ð—Ð°Ð¿Ð¸ÑÑŒ Ð´Ð¾Ð»Ð¶Ð½Ð° Ð±Ñ‹Ñ‚ÑŒ DNS Ð¸Ð¼ÐµÐ½ÐµÐ¼."
 
 #: admin/systems/services/dns/class_serviceDNSeditZoneEntries.inc:501
 msgid "Value should be an IPv6 address."
-msgstr ""
+msgstr "Ð—Ð½Ð°Ñ‡ÐµÐ½Ð¸Ðµ Ð´Ð¾Ð»Ð¶Ð½Ð¾ Ð±Ñ‹Ñ‚ÑŒ IPv6 Ð°Ð´Ñ€ÐµÑÐ¾Ð¼."
 
 #: admin/systems/services/dns/class_serviceDNSeditZoneEntries.inc:509
 msgid "Value should be an IPv4 address."
-msgstr ""
+msgstr "Ð—Ð½Ð°Ñ‡ÐµÐ½Ð¸Ðµ Ð´Ð¾Ð»Ð¶Ð½Ð¾ Ð±Ñ‹Ñ‚ÑŒ IPv4 Ð°Ð´Ñ€ÐµÑÐ¾Ð¼."
 
 #: admin/systems/services/dns/class_serviceDNSeditZoneEntries.inc:517
 #: admin/systems/services/dns/class_serviceDNSeditZoneEntries.inc:535
 #: admin/systems/services/dns/class_serviceDNSeditZoneEntries.inc:540
 msgid "Value should be a DNS name."
-msgstr ""
+msgstr "Ð—Ð½Ð°Ñ‡ÐµÐ½Ð¸Ðµ Ð´Ð¾Ð»Ð¶Ð½Ð¾ Ð±Ñ‹Ñ‚ÑŒ DNS Ð¸Ð¼ÐµÐ½ÐµÐ¼."
 
 #: admin/systems/services/dns/class_serviceDNSeditZoneEntries.inc:524
 msgid "Value 1 should be a number."
@@ -325,11 +291,11 @@ msgstr ""
 
 #: config/dns/class_dnsConfig.inc:28
 msgid "DNS configuration"
-msgstr ""
+msgstr "ÐšÐ¾Ð½Ñ„Ð¸Ð³ÑƒÑ€Ð°Ñ†Ð¸Ñ DNS"
 
 #: config/dns/class_dnsConfig.inc:29
 msgid "FusionDirectory dns plugin configuration"
-msgstr ""
+msgstr "FusionDirectory ÐºÐ¾Ð½Ñ„Ð¸Ð³ÑƒÑ€Ð°Ñ†Ð¸Ñ dns Ð¿Ð»Ð°Ð³Ð¸Ð½Ð°"
 
 #: config/dns/class_dnsConfig.inc:42
 msgid "DNS config"
@@ -342,63 +308,3 @@ msgstr ""
 #: config/dns/class_dnsConfig.inc:45
 msgid "Should FD store a final dot at the end of domains?"
 msgstr ""
-
-#: admin/systems/services/dns/serviceDNSeditZone.tpl.c:2
-msgid "Generic"
-msgstr "ÐžÐ±Ñ‰ÐµÐµ"
-
-#: admin/systems/services/dns/serviceDNSeditZone.tpl.c:11
-msgid "Netmask"
-msgstr ""
-
-#: admin/systems/services/dns/serviceDNSeditZone.tpl.c:14
-msgid "Zone is in use, network settings can't be modified."
-msgstr ""
-
-#: admin/systems/services/dns/serviceDNSeditZone.tpl.c:20
-msgid "Can't be edited because the zone wasn't saved right now."
-msgstr ""
-
-#: admin/systems/services/dns/serviceDNSeditZone.tpl.c:23
-msgid "Edit"
-msgstr "Ð˜Ð·Ð¼ÐµÐ½Ð¸Ñ‚ÑŒ"
-
-#: admin/systems/services/dns/serviceDNSeditZone.tpl.c:26
-msgid "SOA record"
-msgstr "SOA Ð·Ð°Ð¿Ð¸ÑÑŒ"
-
-#: admin/systems/services/dns/serviceDNSeditZone.tpl.c:29
-msgid "Primary dns server for this zone"
-msgstr ""
-
-#: admin/systems/services/dns/serviceDNSeditZone.tpl.c:35
-msgid "Serial number (automatically incremented)"
-msgstr ""
-
-#: admin/systems/services/dns/serviceDNSeditZone.tpl.c:50
-msgid "MxRecords"
-msgstr ""
-
-#: admin/systems/services/dns/serviceDNSeditZone.tpl.c:53
-msgid "Global zone records"
-msgstr ""
-
-#: admin/systems/services/dns/serviceDNS.tpl.c:2
-msgid "Zones"
-msgstr ""
-
-#: admin/systems/services/dns/serviceDNSeditZoneEntries.tpl.c:2
-msgid ""
-"This dialog allows you to configure all components of this DNS zone on a "
-"single list."
-msgstr ""
-
-#: admin/systems/services/dns/serviceDNSeditZoneEntries.tpl.c:5
-msgid ""
-"This dialog can't be used until the currently edited zone was saved or the "
-"zone entry exists in the ldap database."
-msgstr ""
-
-#: admin/systems/services/dns/serviceDNSeditZoneEntries.tpl.c:11
-msgid "Create a new DNS zone entry"
-msgstr ""
diff --git a/dns/locale/ru@petr1708/fusiondirectory.po b/dns/locale/ru@petr1708/fusiondirectory.po
index 7bd8711207a10aab588aa347065aa93da9502138..090c1306f5565bff971e00ab0fc6fe6bd9dc2bbc 100644
--- a/dns/locale/ru@petr1708/fusiondirectory.po
+++ b/dns/locale/ru@petr1708/fusiondirectory.po
@@ -5,29 +5,19 @@
 # Translators:
 msgid ""
 msgstr ""
-"Project-Id-Version: FusionDirectory-108\n"
+"Project-Id-Version: FusionDirectory-109\n"
 "Report-Msgid-Bugs-To: documentation@lists.fusiondirectory.org\n"
-"POT-Creation-Date: 2015-03-19 21:45+0100\n"
-"PO-Revision-Date: 2015-02-25 15:44+0000\n"
+"POT-Creation-Date: 2014-12-15 17:47+0100\n"
+"PO-Revision-Date: 2014-12-15 16:52+0000\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>\n"
-"Language-Team: Russian Petrine orthography (http://www.transifex.com/projects/p/FusionDirectory-108/language/ru@petr1708/)\n"
+"Language-Team: Russian Petrine orthography (http://www.transifex.com/projects/p/FusionDirectory-109/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=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);\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/dns/class_serviceDNS.inc:45
-#: admin/systems/services/dns/class_serviceDNS.inc:386
-#: admin/systems/services/dns/class_serviceDNS.inc:394
-#: admin/systems/services/dns/class_serviceDNS.inc:395
-msgid "DNS service"
-msgstr ""
-
-#: admin/systems/services/dns/class_serviceDNS.inc:101
-#: admin/systems/services/dns/class_serviceDNS.inc:258
-#: admin/systems/services/dns/class_serviceDNS.inc:271
-#: admin/systems/services/dns/class_serviceDNS.inc:277
+#: admin/systems/services/dns/class_serviceDNS.inc:49
 #: admin/systems/services/dns/class_DNS.inc:167
 #: admin/systems/services/dns/class_DNS.inc:172
 #: admin/systems/services/dns/class_DNS.inc:617
@@ -36,120 +26,101 @@ msgstr ""
 msgid "Error"
 msgstr ""
 
-#: admin/systems/services/dns/class_serviceDNS.inc:195
-#: admin/systems/services/dns/class_serviceDNS.inc:406
-#: admin/systems/services/dns/class_serviceDNSeditZone.inc:352
-msgid "Reverse zone"
+#: admin/systems/services/dns/class_serviceDNS.inc:98
+msgid "DNS zones"
 msgstr ""
 
-#: admin/systems/services/dns/class_serviceDNS.inc:196
-#: admin/systems/services/dns/class_serviceDNS.inc:415
-#: admin/systems/services/dns/serviceDNSeditZone.tpl.c:47
-msgid "TTL"
-msgstr ""
-
-#: admin/systems/services/dns/class_serviceDNS.inc:197
-msgid "Class"
-msgstr ""
-
-#: admin/systems/services/dns/class_serviceDNS.inc:258
-#, php-format
-msgid "Cannot delete the selected zone. It is still in use by '%s'"
-msgstr ""
-
-#: admin/systems/services/dns/class_serviceDNS.inc:271
-#, php-format
-msgid "Was not able to contact argonaut server: %s"
-msgstr ""
-
-#: admin/systems/services/dns/class_serviceDNS.inc:277
-#, php-format
-msgid "Was not able to launch ldap2zone: %s"
-msgstr ""
-
-#: admin/systems/services/dns/class_serviceDNS.inc:339
-#: admin/systems/services/dns/class_serviceDNS.inc:353
-#: admin/systems/services/dns/class_serviceDNS.inc:370
-#: admin/systems/services/dns/class_serviceDNS.inc:376
-#: admin/systems/services/dns/class_DNS.inc:730
-msgid "LDAP error"
+#: admin/systems/services/dns/class_serviceDNS.inc:102
+msgid "The DNS zones"
 msgstr ""
 
-#: admin/systems/services/dns/class_serviceDNS.inc:395
-msgid "Services"
+#: admin/systems/services/dns/class_serviceDNS.inc:114
+#: admin/systems/services/dns/class_serviceDNS.inc:115
+msgid "DNS service"
 msgstr ""
 
-#: admin/systems/services/dns/class_serviceDNS.inc:401
+#: admin/systems/services/dns/class_serviceDNS.inc:119
 msgid "Start service"
 msgstr ""
 
-#: admin/systems/services/dns/class_serviceDNS.inc:402
+#: admin/systems/services/dns/class_serviceDNS.inc:120
 msgid "Stop service"
 msgstr ""
 
-#: admin/systems/services/dns/class_serviceDNS.inc:403
+#: admin/systems/services/dns/class_serviceDNS.inc:121
 msgid "Restart service"
 msgstr ""
 
-#: admin/systems/services/dns/class_serviceDNS.inc:405
-#: admin/systems/services/dns/class_serviceDNSeditZone.inc:343
-#: admin/systems/services/dns/class_serviceDNSeditZone.inc:348
-#: admin/systems/services/dns/class_serviceDNSeditZone.inc:356
-#: admin/systems/services/dns/serviceDNSeditZone.tpl.c:5
+#: admin/systems/services/dns/class_serviceDNS.inc:123
+#: admin/systems/services/dns/class_serviceDNSeditZone.inc:339
+#: admin/systems/services/dns/class_serviceDNSeditZone.inc:344
+#: admin/systems/services/dns/class_serviceDNSeditZone.inc:352
 msgid "Zone name"
 msgstr ""
 
-#: admin/systems/services/dns/class_serviceDNS.inc:407
-#: admin/systems/services/dns/class_serviceDNSeditZone.inc:436
+#: admin/systems/services/dns/class_serviceDNS.inc:124
+#: admin/systems/services/dns/class_serviceDNSeditZone.inc:348
+msgid "Reverse zone"
+msgstr ""
+
+#: admin/systems/services/dns/class_serviceDNS.inc:125
+#: admin/systems/services/dns/class_serviceDNSeditZone.inc:432
 msgid "Network class"
 msgstr ""
 
-#: admin/systems/services/dns/class_serviceDNS.inc:408
+#: admin/systems/services/dns/class_serviceDNS.inc:126
 msgid "Zone entry editor"
 msgstr ""
 
-#: admin/systems/services/dns/class_serviceDNS.inc:409
-#: admin/systems/services/dns/class_serviceDNSeditZone.inc:360
+#: admin/systems/services/dns/class_serviceDNS.inc:127
+#: admin/systems/services/dns/class_serviceDNSeditZone.inc:356
 msgid "Primary dns server"
 msgstr ""
 
-#: admin/systems/services/dns/class_serviceDNS.inc:410
-#: admin/systems/services/dns/serviceDNSeditZone.tpl.c:32
+#: admin/systems/services/dns/class_serviceDNS.inc:128
 msgid "Mail address"
 msgstr ""
 
-#: admin/systems/services/dns/class_serviceDNS.inc:411
-#: admin/systems/services/dns/class_serviceDNSeditZone.inc:364
+#: admin/systems/services/dns/class_serviceDNS.inc:129
+#: admin/systems/services/dns/class_serviceDNSeditZone.inc:360
 msgid "Serial"
 msgstr ""
 
-#: admin/systems/services/dns/class_serviceDNS.inc:412
-#: admin/systems/services/dns/class_serviceDNSeditZone.inc:368
-#: admin/systems/services/dns/serviceDNSeditZone.tpl.c:38
+#: admin/systems/services/dns/class_serviceDNS.inc:130
+#: admin/systems/services/dns/class_serviceDNSeditZone.inc:364
 msgid "Refresh"
 msgstr ""
 
-#: admin/systems/services/dns/class_serviceDNS.inc:413
-#: admin/systems/services/dns/class_serviceDNSeditZone.inc:380
-#: admin/systems/services/dns/serviceDNSeditZone.tpl.c:41
+#: admin/systems/services/dns/class_serviceDNS.inc:131
+#: admin/systems/services/dns/class_serviceDNSeditZone.inc:376
 msgid "Retry"
 msgstr ""
 
-#: admin/systems/services/dns/class_serviceDNS.inc:414
-#: admin/systems/services/dns/class_serviceDNSeditZone.inc:376
-#: admin/systems/services/dns/serviceDNSeditZone.tpl.c:44
+#: admin/systems/services/dns/class_serviceDNS.inc:132
+#: admin/systems/services/dns/class_serviceDNSeditZone.inc:372
 msgid "Expire"
 msgstr ""
 
-#: admin/systems/services/dns/class_serviceDNS.inc:416
+#: admin/systems/services/dns/class_serviceDNS.inc:133
+msgid "TTL"
+msgstr ""
+
+#: admin/systems/services/dns/class_serviceDNS.inc:134
 msgid "MX records"
 msgstr ""
 
-#: admin/systems/services/dns/class_serviceDNS.inc:417
-#: admin/systems/services/dns/serviceDNSeditZone.tpl.c:17
+#: admin/systems/services/dns/class_serviceDNS.inc:135
 msgid "Zone records"
 msgstr ""
 
+#: admin/systems/services/dns/class_serviceDNS.inc:198
+#: admin/systems/services/dns/class_serviceDNS.inc:212
+#: admin/systems/services/dns/class_serviceDNS.inc:229
+#: admin/systems/services/dns/class_serviceDNS.inc:235
+#: admin/systems/services/dns/class_DNS.inc:730
+msgid "LDAP error"
+msgstr ""
+
 #: admin/systems/services/dns/class_DNS.inc:167
 #, php-format
 msgid "Cannot find reverse zone for DNS zone '%s'. Parsing zone aborted."
@@ -174,44 +145,42 @@ msgid "MxRecord"
 msgstr ""
 
 #: admin/systems/services/dns/class_serviceDNSeditZone.inc:274
-#: admin/systems/services/dns/class_serviceDNSeditZone.inc:518
+#: admin/systems/services/dns/class_serviceDNSeditZone.inc:514
 msgid "Delete"
 msgstr ""
 
-#: admin/systems/services/dns/class_serviceDNSeditZone.inc:356
-#: admin/systems/services/dns/class_serviceDNSeditZone.inc:386
+#: admin/systems/services/dns/class_serviceDNSeditZone.inc:352
+#: admin/systems/services/dns/class_serviceDNSeditZone.inc:382
 msgid "Only lowercase allowed"
 msgstr ""
 
-#: admin/systems/services/dns/class_serviceDNSeditZone.inc:360
+#: admin/systems/services/dns/class_serviceDNSeditZone.inc:356
 msgid "This field should be a domain name"
 msgstr ""
 
-#: admin/systems/services/dns/class_serviceDNSeditZone.inc:372
+#: admin/systems/services/dns/class_serviceDNSeditZone.inc:368
 msgid "Time to life"
 msgstr ""
 
-#: admin/systems/services/dns/class_serviceDNSeditZone.inc:395
-#: admin/systems/services/dns/class_serviceDNSeditZone.inc:415
-#: admin/systems/services/dns/serviceDNSeditZone.tpl.c:8
+#: admin/systems/services/dns/class_serviceDNSeditZone.inc:391
+#: admin/systems/services/dns/class_serviceDNSeditZone.inc:411
 msgid "Network address"
 msgstr ""
 
-#: admin/systems/services/dns/class_serviceDNSeditZone.inc:423
-#: admin/systems/services/dns/class_serviceDNSeditZone.inc:428
-#: admin/systems/services/dns/class_serviceDNSeditZone.inc:433
+#: admin/systems/services/dns/class_serviceDNSeditZone.inc:419
+#: admin/systems/services/dns/class_serviceDNSeditZone.inc:424
+#: admin/systems/services/dns/class_serviceDNSeditZone.inc:429
 #, php-format
 msgid ""
 "The specified network address and the network class (%s/%s) do not match!"
 msgstr ""
 
-#: admin/systems/services/dns/class_serviceDNSeditZone.inc:524
+#: admin/systems/services/dns/class_serviceDNSeditZone.inc:520
 #: admin/systems/services/dns/class_serviceDNSeditZoneEntries.inc:439
 msgid "Add"
 msgstr ""
 
 #: admin/systems/services/dns/class_serviceDNSeditZoneEntries.inc:121
-#: admin/systems/services/dns/serviceDNSeditZoneEntries.tpl.c:8
 msgid "New entry"
 msgstr ""
 
@@ -339,63 +308,3 @@ msgstr ""
 #: config/dns/class_dnsConfig.inc:45
 msgid "Should FD store a final dot at the end of domains?"
 msgstr ""
-
-#: admin/systems/services/dns/serviceDNSeditZone.tpl.c:2
-msgid "Generic"
-msgstr ""
-
-#: admin/systems/services/dns/serviceDNSeditZone.tpl.c:11
-msgid "Netmask"
-msgstr ""
-
-#: admin/systems/services/dns/serviceDNSeditZone.tpl.c:14
-msgid "Zone is in use, network settings can't be modified."
-msgstr ""
-
-#: admin/systems/services/dns/serviceDNSeditZone.tpl.c:20
-msgid "Can't be edited because the zone wasn't saved right now."
-msgstr ""
-
-#: admin/systems/services/dns/serviceDNSeditZone.tpl.c:23
-msgid "Edit"
-msgstr ""
-
-#: admin/systems/services/dns/serviceDNSeditZone.tpl.c:26
-msgid "SOA record"
-msgstr ""
-
-#: admin/systems/services/dns/serviceDNSeditZone.tpl.c:29
-msgid "Primary dns server for this zone"
-msgstr ""
-
-#: admin/systems/services/dns/serviceDNSeditZone.tpl.c:35
-msgid "Serial number (automatically incremented)"
-msgstr ""
-
-#: admin/systems/services/dns/serviceDNSeditZone.tpl.c:50
-msgid "MxRecords"
-msgstr ""
-
-#: admin/systems/services/dns/serviceDNSeditZone.tpl.c:53
-msgid "Global zone records"
-msgstr ""
-
-#: admin/systems/services/dns/serviceDNS.tpl.c:2
-msgid "Zones"
-msgstr ""
-
-#: admin/systems/services/dns/serviceDNSeditZoneEntries.tpl.c:2
-msgid ""
-"This dialog allows you to configure all components of this DNS zone on a "
-"single list."
-msgstr ""
-
-#: admin/systems/services/dns/serviceDNSeditZoneEntries.tpl.c:5
-msgid ""
-"This dialog can't be used until the currently edited zone was saved or the "
-"zone entry exists in the ldap database."
-msgstr ""
-
-#: admin/systems/services/dns/serviceDNSeditZoneEntries.tpl.c:11
-msgid "Create a new DNS zone entry"
-msgstr ""
diff --git a/dns/locale/sv/fusiondirectory.po b/dns/locale/sv/fusiondirectory.po
index 60f1d666d2da8d7485907e087fe30886011c0b07..2a78e4c31819249e5b452c6c2fa02c527b8498e8 100644
--- a/dns/locale/sv/fusiondirectory.po
+++ b/dns/locale/sv/fusiondirectory.po
@@ -5,29 +5,19 @@
 # Translators:
 msgid ""
 msgstr ""
-"Project-Id-Version: FusionDirectory-108\n"
+"Project-Id-Version: FusionDirectory-109\n"
 "Report-Msgid-Bugs-To: documentation@lists.fusiondirectory.org\n"
-"POT-Creation-Date: 2015-03-19 21:45+0100\n"
-"PO-Revision-Date: 2015-02-25 16:12+0000\n"
+"POT-Creation-Date: 2014-12-15 17:47+0100\n"
+"PO-Revision-Date: 2015-02-25 16:04+0000\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>\n"
-"Language-Team: Swedish (http://www.transifex.com/projects/p/FusionDirectory-108/language/sv/)\n"
+"Language-Team: Swedish (http://www.transifex.com/projects/p/FusionDirectory-109/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/services/dns/class_serviceDNS.inc:45
-#: admin/systems/services/dns/class_serviceDNS.inc:386
-#: admin/systems/services/dns/class_serviceDNS.inc:394
-#: admin/systems/services/dns/class_serviceDNS.inc:395
-msgid "DNS service"
-msgstr ""
-
-#: admin/systems/services/dns/class_serviceDNS.inc:101
-#: admin/systems/services/dns/class_serviceDNS.inc:258
-#: admin/systems/services/dns/class_serviceDNS.inc:271
-#: admin/systems/services/dns/class_serviceDNS.inc:277
+#: admin/systems/services/dns/class_serviceDNS.inc:49
 #: admin/systems/services/dns/class_DNS.inc:167
 #: admin/systems/services/dns/class_DNS.inc:172
 #: admin/systems/services/dns/class_DNS.inc:617
@@ -36,120 +26,101 @@ msgstr ""
 msgid "Error"
 msgstr "Fel"
 
-#: admin/systems/services/dns/class_serviceDNS.inc:195
-#: admin/systems/services/dns/class_serviceDNS.inc:406
-#: admin/systems/services/dns/class_serviceDNSeditZone.inc:352
-msgid "Reverse zone"
-msgstr ""
-
-#: admin/systems/services/dns/class_serviceDNS.inc:196
-#: admin/systems/services/dns/class_serviceDNS.inc:415
-#: admin/systems/services/dns/serviceDNSeditZone.tpl.c:47
-msgid "TTL"
+#: admin/systems/services/dns/class_serviceDNS.inc:98
+msgid "DNS zones"
 msgstr ""
 
-#: admin/systems/services/dns/class_serviceDNS.inc:197
-msgid "Class"
-msgstr "Klass"
-
-#: admin/systems/services/dns/class_serviceDNS.inc:258
-#, php-format
-msgid "Cannot delete the selected zone. It is still in use by '%s'"
+#: admin/systems/services/dns/class_serviceDNS.inc:102
+msgid "The DNS zones"
 msgstr ""
 
-#: admin/systems/services/dns/class_serviceDNS.inc:271
-#, php-format
-msgid "Was not able to contact argonaut server: %s"
-msgstr ""
-
-#: admin/systems/services/dns/class_serviceDNS.inc:277
-#, php-format
-msgid "Was not able to launch ldap2zone: %s"
+#: admin/systems/services/dns/class_serviceDNS.inc:114
+#: admin/systems/services/dns/class_serviceDNS.inc:115
+msgid "DNS service"
 msgstr ""
 
-#: admin/systems/services/dns/class_serviceDNS.inc:339
-#: admin/systems/services/dns/class_serviceDNS.inc:353
-#: admin/systems/services/dns/class_serviceDNS.inc:370
-#: admin/systems/services/dns/class_serviceDNS.inc:376
-#: admin/systems/services/dns/class_DNS.inc:730
-msgid "LDAP error"
-msgstr "LDAP-fel"
-
-#: admin/systems/services/dns/class_serviceDNS.inc:395
-msgid "Services"
-msgstr "TjÃ¤nster"
-
-#: admin/systems/services/dns/class_serviceDNS.inc:401
+#: admin/systems/services/dns/class_serviceDNS.inc:119
 msgid "Start service"
 msgstr "Starta tjÃ¤nsten"
 
-#: admin/systems/services/dns/class_serviceDNS.inc:402
+#: admin/systems/services/dns/class_serviceDNS.inc:120
 msgid "Stop service"
 msgstr "Stoppa tjÃ¤nsten"
 
-#: admin/systems/services/dns/class_serviceDNS.inc:403
+#: admin/systems/services/dns/class_serviceDNS.inc:121
 msgid "Restart service"
 msgstr "Starta om tjÃ¤nsten"
 
-#: admin/systems/services/dns/class_serviceDNS.inc:405
-#: admin/systems/services/dns/class_serviceDNSeditZone.inc:343
-#: admin/systems/services/dns/class_serviceDNSeditZone.inc:348
-#: admin/systems/services/dns/class_serviceDNSeditZone.inc:356
-#: admin/systems/services/dns/serviceDNSeditZone.tpl.c:5
+#: admin/systems/services/dns/class_serviceDNS.inc:123
+#: admin/systems/services/dns/class_serviceDNSeditZone.inc:339
+#: admin/systems/services/dns/class_serviceDNSeditZone.inc:344
+#: admin/systems/services/dns/class_serviceDNSeditZone.inc:352
 msgid "Zone name"
 msgstr ""
 
-#: admin/systems/services/dns/class_serviceDNS.inc:407
-#: admin/systems/services/dns/class_serviceDNSeditZone.inc:436
+#: admin/systems/services/dns/class_serviceDNS.inc:124
+#: admin/systems/services/dns/class_serviceDNSeditZone.inc:348
+msgid "Reverse zone"
+msgstr ""
+
+#: admin/systems/services/dns/class_serviceDNS.inc:125
+#: admin/systems/services/dns/class_serviceDNSeditZone.inc:432
 msgid "Network class"
 msgstr ""
 
-#: admin/systems/services/dns/class_serviceDNS.inc:408
+#: admin/systems/services/dns/class_serviceDNS.inc:126
 msgid "Zone entry editor"
 msgstr ""
 
-#: admin/systems/services/dns/class_serviceDNS.inc:409
-#: admin/systems/services/dns/class_serviceDNSeditZone.inc:360
+#: admin/systems/services/dns/class_serviceDNS.inc:127
+#: admin/systems/services/dns/class_serviceDNSeditZone.inc:356
 msgid "Primary dns server"
 msgstr ""
 
-#: admin/systems/services/dns/class_serviceDNS.inc:410
-#: admin/systems/services/dns/serviceDNSeditZone.tpl.c:32
+#: admin/systems/services/dns/class_serviceDNS.inc:128
 msgid "Mail address"
 msgstr "Epostadress"
 
-#: admin/systems/services/dns/class_serviceDNS.inc:411
-#: admin/systems/services/dns/class_serviceDNSeditZone.inc:364
+#: admin/systems/services/dns/class_serviceDNS.inc:129
+#: admin/systems/services/dns/class_serviceDNSeditZone.inc:360
 msgid "Serial"
 msgstr ""
 
-#: admin/systems/services/dns/class_serviceDNS.inc:412
-#: admin/systems/services/dns/class_serviceDNSeditZone.inc:368
-#: admin/systems/services/dns/serviceDNSeditZone.tpl.c:38
+#: admin/systems/services/dns/class_serviceDNS.inc:130
+#: admin/systems/services/dns/class_serviceDNSeditZone.inc:364
 msgid "Refresh"
 msgstr "Uppdatera"
 
-#: admin/systems/services/dns/class_serviceDNS.inc:413
-#: admin/systems/services/dns/class_serviceDNSeditZone.inc:380
-#: admin/systems/services/dns/serviceDNSeditZone.tpl.c:41
+#: admin/systems/services/dns/class_serviceDNS.inc:131
+#: admin/systems/services/dns/class_serviceDNSeditZone.inc:376
 msgid "Retry"
 msgstr ""
 
-#: admin/systems/services/dns/class_serviceDNS.inc:414
-#: admin/systems/services/dns/class_serviceDNSeditZone.inc:376
-#: admin/systems/services/dns/serviceDNSeditZone.tpl.c:44
+#: admin/systems/services/dns/class_serviceDNS.inc:132
+#: admin/systems/services/dns/class_serviceDNSeditZone.inc:372
 msgid "Expire"
 msgstr ""
 
-#: admin/systems/services/dns/class_serviceDNS.inc:416
+#: admin/systems/services/dns/class_serviceDNS.inc:133
+msgid "TTL"
+msgstr ""
+
+#: admin/systems/services/dns/class_serviceDNS.inc:134
 msgid "MX records"
 msgstr ""
 
-#: admin/systems/services/dns/class_serviceDNS.inc:417
-#: admin/systems/services/dns/serviceDNSeditZone.tpl.c:17
+#: admin/systems/services/dns/class_serviceDNS.inc:135
 msgid "Zone records"
 msgstr ""
 
+#: admin/systems/services/dns/class_serviceDNS.inc:198
+#: admin/systems/services/dns/class_serviceDNS.inc:212
+#: admin/systems/services/dns/class_serviceDNS.inc:229
+#: admin/systems/services/dns/class_serviceDNS.inc:235
+#: admin/systems/services/dns/class_DNS.inc:730
+msgid "LDAP error"
+msgstr "LDAP-fel"
+
 #: admin/systems/services/dns/class_DNS.inc:167
 #, php-format
 msgid "Cannot find reverse zone for DNS zone '%s'. Parsing zone aborted."
@@ -174,44 +145,42 @@ msgid "MxRecord"
 msgstr ""
 
 #: admin/systems/services/dns/class_serviceDNSeditZone.inc:274
-#: admin/systems/services/dns/class_serviceDNSeditZone.inc:518
+#: admin/systems/services/dns/class_serviceDNSeditZone.inc:514
 msgid "Delete"
 msgstr "Ta bort"
 
-#: admin/systems/services/dns/class_serviceDNSeditZone.inc:356
-#: admin/systems/services/dns/class_serviceDNSeditZone.inc:386
+#: admin/systems/services/dns/class_serviceDNSeditZone.inc:352
+#: admin/systems/services/dns/class_serviceDNSeditZone.inc:382
 msgid "Only lowercase allowed"
 msgstr ""
 
-#: admin/systems/services/dns/class_serviceDNSeditZone.inc:360
+#: admin/systems/services/dns/class_serviceDNSeditZone.inc:356
 msgid "This field should be a domain name"
 msgstr ""
 
-#: admin/systems/services/dns/class_serviceDNSeditZone.inc:372
+#: admin/systems/services/dns/class_serviceDNSeditZone.inc:368
 msgid "Time to life"
 msgstr ""
 
-#: admin/systems/services/dns/class_serviceDNSeditZone.inc:395
-#: admin/systems/services/dns/class_serviceDNSeditZone.inc:415
-#: admin/systems/services/dns/serviceDNSeditZone.tpl.c:8
+#: admin/systems/services/dns/class_serviceDNSeditZone.inc:391
+#: admin/systems/services/dns/class_serviceDNSeditZone.inc:411
 msgid "Network address"
 msgstr "NÃ¤tverksadress"
 
-#: admin/systems/services/dns/class_serviceDNSeditZone.inc:423
-#: admin/systems/services/dns/class_serviceDNSeditZone.inc:428
-#: admin/systems/services/dns/class_serviceDNSeditZone.inc:433
+#: admin/systems/services/dns/class_serviceDNSeditZone.inc:419
+#: admin/systems/services/dns/class_serviceDNSeditZone.inc:424
+#: admin/systems/services/dns/class_serviceDNSeditZone.inc:429
 #, php-format
 msgid ""
 "The specified network address and the network class (%s/%s) do not match!"
 msgstr ""
 
-#: admin/systems/services/dns/class_serviceDNSeditZone.inc:524
+#: admin/systems/services/dns/class_serviceDNSeditZone.inc:520
 #: admin/systems/services/dns/class_serviceDNSeditZoneEntries.inc:439
 msgid "Add"
 msgstr "LÃ¤gg till"
 
 #: admin/systems/services/dns/class_serviceDNSeditZoneEntries.inc:121
-#: admin/systems/services/dns/serviceDNSeditZoneEntries.tpl.c:8
 msgid "New entry"
 msgstr ""
 
@@ -339,63 +308,3 @@ msgstr ""
 #: config/dns/class_dnsConfig.inc:45
 msgid "Should FD store a final dot at the end of domains?"
 msgstr ""
-
-#: admin/systems/services/dns/serviceDNSeditZone.tpl.c:2
-msgid "Generic"
-msgstr "Generisk"
-
-#: admin/systems/services/dns/serviceDNSeditZone.tpl.c:11
-msgid "Netmask"
-msgstr "NÃ¤tmask"
-
-#: admin/systems/services/dns/serviceDNSeditZone.tpl.c:14
-msgid "Zone is in use, network settings can't be modified."
-msgstr ""
-
-#: admin/systems/services/dns/serviceDNSeditZone.tpl.c:20
-msgid "Can't be edited because the zone wasn't saved right now."
-msgstr ""
-
-#: admin/systems/services/dns/serviceDNSeditZone.tpl.c:23
-msgid "Edit"
-msgstr "Redigera"
-
-#: admin/systems/services/dns/serviceDNSeditZone.tpl.c:26
-msgid "SOA record"
-msgstr ""
-
-#: admin/systems/services/dns/serviceDNSeditZone.tpl.c:29
-msgid "Primary dns server for this zone"
-msgstr ""
-
-#: admin/systems/services/dns/serviceDNSeditZone.tpl.c:35
-msgid "Serial number (automatically incremented)"
-msgstr ""
-
-#: admin/systems/services/dns/serviceDNSeditZone.tpl.c:50
-msgid "MxRecords"
-msgstr ""
-
-#: admin/systems/services/dns/serviceDNSeditZone.tpl.c:53
-msgid "Global zone records"
-msgstr ""
-
-#: admin/systems/services/dns/serviceDNS.tpl.c:2
-msgid "Zones"
-msgstr ""
-
-#: admin/systems/services/dns/serviceDNSeditZoneEntries.tpl.c:2
-msgid ""
-"This dialog allows you to configure all components of this DNS zone on a "
-"single list."
-msgstr ""
-
-#: admin/systems/services/dns/serviceDNSeditZoneEntries.tpl.c:5
-msgid ""
-"This dialog can't be used until the currently edited zone was saved or the "
-"zone entry exists in the ldap database."
-msgstr ""
-
-#: admin/systems/services/dns/serviceDNSeditZoneEntries.tpl.c:11
-msgid "Create a new DNS zone entry"
-msgstr ""
diff --git a/dns/locale/ug/fusiondirectory.po b/dns/locale/ug/fusiondirectory.po
index 61334a66e984084a3ffd8eb86bd0a76004de6a6e..abf3ff3e301e9579ed7c691f2b7bd24db8513973 100644
--- a/dns/locale/ug/fusiondirectory.po
+++ b/dns/locale/ug/fusiondirectory.po
@@ -5,29 +5,19 @@
 # Translators:
 msgid ""
 msgstr ""
-"Project-Id-Version: FusionDirectory-108\n"
+"Project-Id-Version: FusionDirectory-109\n"
 "Report-Msgid-Bugs-To: documentation@lists.fusiondirectory.org\n"
-"POT-Creation-Date: 2015-03-19 21:45+0100\n"
-"PO-Revision-Date: 2015-02-25 15:44+0000\n"
+"POT-Creation-Date: 2014-12-15 17:47+0100\n"
+"PO-Revision-Date: 2014-12-15 16:52+0000\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>\n"
-"Language-Team: Uighur (http://www.transifex.com/projects/p/FusionDirectory-108/language/ug/)\n"
+"Language-Team: Uighur (http://www.transifex.com/projects/p/FusionDirectory-109/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/services/dns/class_serviceDNS.inc:45
-#: admin/systems/services/dns/class_serviceDNS.inc:386
-#: admin/systems/services/dns/class_serviceDNS.inc:394
-#: admin/systems/services/dns/class_serviceDNS.inc:395
-msgid "DNS service"
-msgstr ""
-
-#: admin/systems/services/dns/class_serviceDNS.inc:101
-#: admin/systems/services/dns/class_serviceDNS.inc:258
-#: admin/systems/services/dns/class_serviceDNS.inc:271
-#: admin/systems/services/dns/class_serviceDNS.inc:277
+#: admin/systems/services/dns/class_serviceDNS.inc:49
 #: admin/systems/services/dns/class_DNS.inc:167
 #: admin/systems/services/dns/class_DNS.inc:172
 #: admin/systems/services/dns/class_DNS.inc:617
@@ -36,120 +26,101 @@ msgstr ""
 msgid "Error"
 msgstr ""
 
-#: admin/systems/services/dns/class_serviceDNS.inc:195
-#: admin/systems/services/dns/class_serviceDNS.inc:406
-#: admin/systems/services/dns/class_serviceDNSeditZone.inc:352
-msgid "Reverse zone"
+#: admin/systems/services/dns/class_serviceDNS.inc:98
+msgid "DNS zones"
 msgstr ""
 
-#: admin/systems/services/dns/class_serviceDNS.inc:196
-#: admin/systems/services/dns/class_serviceDNS.inc:415
-#: admin/systems/services/dns/serviceDNSeditZone.tpl.c:47
-msgid "TTL"
-msgstr ""
-
-#: admin/systems/services/dns/class_serviceDNS.inc:197
-msgid "Class"
-msgstr ""
-
-#: admin/systems/services/dns/class_serviceDNS.inc:258
-#, php-format
-msgid "Cannot delete the selected zone. It is still in use by '%s'"
-msgstr ""
-
-#: admin/systems/services/dns/class_serviceDNS.inc:271
-#, php-format
-msgid "Was not able to contact argonaut server: %s"
-msgstr ""
-
-#: admin/systems/services/dns/class_serviceDNS.inc:277
-#, php-format
-msgid "Was not able to launch ldap2zone: %s"
-msgstr ""
-
-#: admin/systems/services/dns/class_serviceDNS.inc:339
-#: admin/systems/services/dns/class_serviceDNS.inc:353
-#: admin/systems/services/dns/class_serviceDNS.inc:370
-#: admin/systems/services/dns/class_serviceDNS.inc:376
-#: admin/systems/services/dns/class_DNS.inc:730
-msgid "LDAP error"
+#: admin/systems/services/dns/class_serviceDNS.inc:102
+msgid "The DNS zones"
 msgstr ""
 
-#: admin/systems/services/dns/class_serviceDNS.inc:395
-msgid "Services"
+#: admin/systems/services/dns/class_serviceDNS.inc:114
+#: admin/systems/services/dns/class_serviceDNS.inc:115
+msgid "DNS service"
 msgstr ""
 
-#: admin/systems/services/dns/class_serviceDNS.inc:401
+#: admin/systems/services/dns/class_serviceDNS.inc:119
 msgid "Start service"
 msgstr ""
 
-#: admin/systems/services/dns/class_serviceDNS.inc:402
+#: admin/systems/services/dns/class_serviceDNS.inc:120
 msgid "Stop service"
 msgstr ""
 
-#: admin/systems/services/dns/class_serviceDNS.inc:403
+#: admin/systems/services/dns/class_serviceDNS.inc:121
 msgid "Restart service"
 msgstr ""
 
-#: admin/systems/services/dns/class_serviceDNS.inc:405
-#: admin/systems/services/dns/class_serviceDNSeditZone.inc:343
-#: admin/systems/services/dns/class_serviceDNSeditZone.inc:348
-#: admin/systems/services/dns/class_serviceDNSeditZone.inc:356
-#: admin/systems/services/dns/serviceDNSeditZone.tpl.c:5
+#: admin/systems/services/dns/class_serviceDNS.inc:123
+#: admin/systems/services/dns/class_serviceDNSeditZone.inc:339
+#: admin/systems/services/dns/class_serviceDNSeditZone.inc:344
+#: admin/systems/services/dns/class_serviceDNSeditZone.inc:352
 msgid "Zone name"
 msgstr ""
 
-#: admin/systems/services/dns/class_serviceDNS.inc:407
-#: admin/systems/services/dns/class_serviceDNSeditZone.inc:436
+#: admin/systems/services/dns/class_serviceDNS.inc:124
+#: admin/systems/services/dns/class_serviceDNSeditZone.inc:348
+msgid "Reverse zone"
+msgstr ""
+
+#: admin/systems/services/dns/class_serviceDNS.inc:125
+#: admin/systems/services/dns/class_serviceDNSeditZone.inc:432
 msgid "Network class"
 msgstr ""
 
-#: admin/systems/services/dns/class_serviceDNS.inc:408
+#: admin/systems/services/dns/class_serviceDNS.inc:126
 msgid "Zone entry editor"
 msgstr ""
 
-#: admin/systems/services/dns/class_serviceDNS.inc:409
-#: admin/systems/services/dns/class_serviceDNSeditZone.inc:360
+#: admin/systems/services/dns/class_serviceDNS.inc:127
+#: admin/systems/services/dns/class_serviceDNSeditZone.inc:356
 msgid "Primary dns server"
 msgstr ""
 
-#: admin/systems/services/dns/class_serviceDNS.inc:410
-#: admin/systems/services/dns/serviceDNSeditZone.tpl.c:32
+#: admin/systems/services/dns/class_serviceDNS.inc:128
 msgid "Mail address"
 msgstr ""
 
-#: admin/systems/services/dns/class_serviceDNS.inc:411
-#: admin/systems/services/dns/class_serviceDNSeditZone.inc:364
+#: admin/systems/services/dns/class_serviceDNS.inc:129
+#: admin/systems/services/dns/class_serviceDNSeditZone.inc:360
 msgid "Serial"
 msgstr ""
 
-#: admin/systems/services/dns/class_serviceDNS.inc:412
-#: admin/systems/services/dns/class_serviceDNSeditZone.inc:368
-#: admin/systems/services/dns/serviceDNSeditZone.tpl.c:38
+#: admin/systems/services/dns/class_serviceDNS.inc:130
+#: admin/systems/services/dns/class_serviceDNSeditZone.inc:364
 msgid "Refresh"
 msgstr ""
 
-#: admin/systems/services/dns/class_serviceDNS.inc:413
-#: admin/systems/services/dns/class_serviceDNSeditZone.inc:380
-#: admin/systems/services/dns/serviceDNSeditZone.tpl.c:41
+#: admin/systems/services/dns/class_serviceDNS.inc:131
+#: admin/systems/services/dns/class_serviceDNSeditZone.inc:376
 msgid "Retry"
 msgstr ""
 
-#: admin/systems/services/dns/class_serviceDNS.inc:414
-#: admin/systems/services/dns/class_serviceDNSeditZone.inc:376
-#: admin/systems/services/dns/serviceDNSeditZone.tpl.c:44
+#: admin/systems/services/dns/class_serviceDNS.inc:132
+#: admin/systems/services/dns/class_serviceDNSeditZone.inc:372
 msgid "Expire"
 msgstr ""
 
-#: admin/systems/services/dns/class_serviceDNS.inc:416
+#: admin/systems/services/dns/class_serviceDNS.inc:133
+msgid "TTL"
+msgstr ""
+
+#: admin/systems/services/dns/class_serviceDNS.inc:134
 msgid "MX records"
 msgstr ""
 
-#: admin/systems/services/dns/class_serviceDNS.inc:417
-#: admin/systems/services/dns/serviceDNSeditZone.tpl.c:17
+#: admin/systems/services/dns/class_serviceDNS.inc:135
 msgid "Zone records"
 msgstr ""
 
+#: admin/systems/services/dns/class_serviceDNS.inc:198
+#: admin/systems/services/dns/class_serviceDNS.inc:212
+#: admin/systems/services/dns/class_serviceDNS.inc:229
+#: admin/systems/services/dns/class_serviceDNS.inc:235
+#: admin/systems/services/dns/class_DNS.inc:730
+msgid "LDAP error"
+msgstr ""
+
 #: admin/systems/services/dns/class_DNS.inc:167
 #, php-format
 msgid "Cannot find reverse zone for DNS zone '%s'. Parsing zone aborted."
@@ -174,44 +145,42 @@ msgid "MxRecord"
 msgstr ""
 
 #: admin/systems/services/dns/class_serviceDNSeditZone.inc:274
-#: admin/systems/services/dns/class_serviceDNSeditZone.inc:518
+#: admin/systems/services/dns/class_serviceDNSeditZone.inc:514
 msgid "Delete"
 msgstr ""
 
-#: admin/systems/services/dns/class_serviceDNSeditZone.inc:356
-#: admin/systems/services/dns/class_serviceDNSeditZone.inc:386
+#: admin/systems/services/dns/class_serviceDNSeditZone.inc:352
+#: admin/systems/services/dns/class_serviceDNSeditZone.inc:382
 msgid "Only lowercase allowed"
 msgstr ""
 
-#: admin/systems/services/dns/class_serviceDNSeditZone.inc:360
+#: admin/systems/services/dns/class_serviceDNSeditZone.inc:356
 msgid "This field should be a domain name"
 msgstr ""
 
-#: admin/systems/services/dns/class_serviceDNSeditZone.inc:372
+#: admin/systems/services/dns/class_serviceDNSeditZone.inc:368
 msgid "Time to life"
 msgstr ""
 
-#: admin/systems/services/dns/class_serviceDNSeditZone.inc:395
-#: admin/systems/services/dns/class_serviceDNSeditZone.inc:415
-#: admin/systems/services/dns/serviceDNSeditZone.tpl.c:8
+#: admin/systems/services/dns/class_serviceDNSeditZone.inc:391
+#: admin/systems/services/dns/class_serviceDNSeditZone.inc:411
 msgid "Network address"
 msgstr ""
 
-#: admin/systems/services/dns/class_serviceDNSeditZone.inc:423
-#: admin/systems/services/dns/class_serviceDNSeditZone.inc:428
-#: admin/systems/services/dns/class_serviceDNSeditZone.inc:433
+#: admin/systems/services/dns/class_serviceDNSeditZone.inc:419
+#: admin/systems/services/dns/class_serviceDNSeditZone.inc:424
+#: admin/systems/services/dns/class_serviceDNSeditZone.inc:429
 #, php-format
 msgid ""
 "The specified network address and the network class (%s/%s) do not match!"
 msgstr ""
 
-#: admin/systems/services/dns/class_serviceDNSeditZone.inc:524
+#: admin/systems/services/dns/class_serviceDNSeditZone.inc:520
 #: admin/systems/services/dns/class_serviceDNSeditZoneEntries.inc:439
 msgid "Add"
 msgstr ""
 
 #: admin/systems/services/dns/class_serviceDNSeditZoneEntries.inc:121
-#: admin/systems/services/dns/serviceDNSeditZoneEntries.tpl.c:8
 msgid "New entry"
 msgstr ""
 
@@ -339,63 +308,3 @@ msgstr ""
 #: config/dns/class_dnsConfig.inc:45
 msgid "Should FD store a final dot at the end of domains?"
 msgstr ""
-
-#: admin/systems/services/dns/serviceDNSeditZone.tpl.c:2
-msgid "Generic"
-msgstr ""
-
-#: admin/systems/services/dns/serviceDNSeditZone.tpl.c:11
-msgid "Netmask"
-msgstr ""
-
-#: admin/systems/services/dns/serviceDNSeditZone.tpl.c:14
-msgid "Zone is in use, network settings can't be modified."
-msgstr ""
-
-#: admin/systems/services/dns/serviceDNSeditZone.tpl.c:20
-msgid "Can't be edited because the zone wasn't saved right now."
-msgstr ""
-
-#: admin/systems/services/dns/serviceDNSeditZone.tpl.c:23
-msgid "Edit"
-msgstr ""
-
-#: admin/systems/services/dns/serviceDNSeditZone.tpl.c:26
-msgid "SOA record"
-msgstr ""
-
-#: admin/systems/services/dns/serviceDNSeditZone.tpl.c:29
-msgid "Primary dns server for this zone"
-msgstr ""
-
-#: admin/systems/services/dns/serviceDNSeditZone.tpl.c:35
-msgid "Serial number (automatically incremented)"
-msgstr ""
-
-#: admin/systems/services/dns/serviceDNSeditZone.tpl.c:50
-msgid "MxRecords"
-msgstr ""
-
-#: admin/systems/services/dns/serviceDNSeditZone.tpl.c:53
-msgid "Global zone records"
-msgstr ""
-
-#: admin/systems/services/dns/serviceDNS.tpl.c:2
-msgid "Zones"
-msgstr ""
-
-#: admin/systems/services/dns/serviceDNSeditZoneEntries.tpl.c:2
-msgid ""
-"This dialog allows you to configure all components of this DNS zone on a "
-"single list."
-msgstr ""
-
-#: admin/systems/services/dns/serviceDNSeditZoneEntries.tpl.c:5
-msgid ""
-"This dialog can't be used until the currently edited zone was saved or the "
-"zone entry exists in the ldap database."
-msgstr ""
-
-#: admin/systems/services/dns/serviceDNSeditZoneEntries.tpl.c:11
-msgid "Create a new DNS zone entry"
-msgstr ""
diff --git a/dns/locale/vi_VN/fusiondirectory.po b/dns/locale/vi_VN/fusiondirectory.po
index ee0d926fbe36b8edf74fdf3ebeca0ab4a04ab86d..99a1871963afca5303bdc4f71a36d069e9a3150f 100644
--- a/dns/locale/vi_VN/fusiondirectory.po
+++ b/dns/locale/vi_VN/fusiondirectory.po
@@ -5,29 +5,19 @@
 # Translators:
 msgid ""
 msgstr ""
-"Project-Id-Version: FusionDirectory-108\n"
+"Project-Id-Version: FusionDirectory-109\n"
 "Report-Msgid-Bugs-To: documentation@lists.fusiondirectory.org\n"
-"POT-Creation-Date: 2015-03-19 21:45+0100\n"
-"PO-Revision-Date: 2015-02-25 16:12+0000\n"
+"POT-Creation-Date: 2014-12-15 17:47+0100\n"
+"PO-Revision-Date: 2015-02-25 16:04+0000\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>\n"
-"Language-Team: Vietnamese (Viet Nam) (http://www.transifex.com/projects/p/FusionDirectory-108/language/vi_VN/)\n"
+"Language-Team: Vietnamese (Viet Nam) (http://www.transifex.com/projects/p/FusionDirectory-109/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/services/dns/class_serviceDNS.inc:45
-#: admin/systems/services/dns/class_serviceDNS.inc:386
-#: admin/systems/services/dns/class_serviceDNS.inc:394
-#: admin/systems/services/dns/class_serviceDNS.inc:395
-msgid "DNS service"
-msgstr ""
-
-#: admin/systems/services/dns/class_serviceDNS.inc:101
-#: admin/systems/services/dns/class_serviceDNS.inc:258
-#: admin/systems/services/dns/class_serviceDNS.inc:271
-#: admin/systems/services/dns/class_serviceDNS.inc:277
+#: admin/systems/services/dns/class_serviceDNS.inc:49
 #: admin/systems/services/dns/class_DNS.inc:167
 #: admin/systems/services/dns/class_DNS.inc:172
 #: admin/systems/services/dns/class_DNS.inc:617
@@ -36,120 +26,101 @@ msgstr ""
 msgid "Error"
 msgstr "Lá»—i"
 
-#: admin/systems/services/dns/class_serviceDNS.inc:195
-#: admin/systems/services/dns/class_serviceDNS.inc:406
-#: admin/systems/services/dns/class_serviceDNSeditZone.inc:352
-msgid "Reverse zone"
-msgstr ""
-
-#: admin/systems/services/dns/class_serviceDNS.inc:196
-#: admin/systems/services/dns/class_serviceDNS.inc:415
-#: admin/systems/services/dns/serviceDNSeditZone.tpl.c:47
-msgid "TTL"
-msgstr ""
-
-#: admin/systems/services/dns/class_serviceDNS.inc:197
-msgid "Class"
+#: admin/systems/services/dns/class_serviceDNS.inc:98
+msgid "DNS zones"
 msgstr ""
 
-#: admin/systems/services/dns/class_serviceDNS.inc:258
-#, php-format
-msgid "Cannot delete the selected zone. It is still in use by '%s'"
-msgstr ""
-
-#: admin/systems/services/dns/class_serviceDNS.inc:271
-#, php-format
-msgid "Was not able to contact argonaut server: %s"
-msgstr ""
-
-#: admin/systems/services/dns/class_serviceDNS.inc:277
-#, php-format
-msgid "Was not able to launch ldap2zone: %s"
+#: admin/systems/services/dns/class_serviceDNS.inc:102
+msgid "The DNS zones"
 msgstr ""
 
-#: admin/systems/services/dns/class_serviceDNS.inc:339
-#: admin/systems/services/dns/class_serviceDNS.inc:353
-#: admin/systems/services/dns/class_serviceDNS.inc:370
-#: admin/systems/services/dns/class_serviceDNS.inc:376
-#: admin/systems/services/dns/class_DNS.inc:730
-msgid "LDAP error"
-msgstr "Lá»—i LDAP"
-
-#: admin/systems/services/dns/class_serviceDNS.inc:395
-msgid "Services"
+#: admin/systems/services/dns/class_serviceDNS.inc:114
+#: admin/systems/services/dns/class_serviceDNS.inc:115
+msgid "DNS service"
 msgstr ""
 
-#: admin/systems/services/dns/class_serviceDNS.inc:401
+#: admin/systems/services/dns/class_serviceDNS.inc:119
 msgid "Start service"
 msgstr ""
 
-#: admin/systems/services/dns/class_serviceDNS.inc:402
+#: admin/systems/services/dns/class_serviceDNS.inc:120
 msgid "Stop service"
 msgstr ""
 
-#: admin/systems/services/dns/class_serviceDNS.inc:403
+#: admin/systems/services/dns/class_serviceDNS.inc:121
 msgid "Restart service"
 msgstr ""
 
-#: admin/systems/services/dns/class_serviceDNS.inc:405
-#: admin/systems/services/dns/class_serviceDNSeditZone.inc:343
-#: admin/systems/services/dns/class_serviceDNSeditZone.inc:348
-#: admin/systems/services/dns/class_serviceDNSeditZone.inc:356
-#: admin/systems/services/dns/serviceDNSeditZone.tpl.c:5
+#: admin/systems/services/dns/class_serviceDNS.inc:123
+#: admin/systems/services/dns/class_serviceDNSeditZone.inc:339
+#: admin/systems/services/dns/class_serviceDNSeditZone.inc:344
+#: admin/systems/services/dns/class_serviceDNSeditZone.inc:352
 msgid "Zone name"
 msgstr ""
 
-#: admin/systems/services/dns/class_serviceDNS.inc:407
-#: admin/systems/services/dns/class_serviceDNSeditZone.inc:436
+#: admin/systems/services/dns/class_serviceDNS.inc:124
+#: admin/systems/services/dns/class_serviceDNSeditZone.inc:348
+msgid "Reverse zone"
+msgstr ""
+
+#: admin/systems/services/dns/class_serviceDNS.inc:125
+#: admin/systems/services/dns/class_serviceDNSeditZone.inc:432
 msgid "Network class"
 msgstr ""
 
-#: admin/systems/services/dns/class_serviceDNS.inc:408
+#: admin/systems/services/dns/class_serviceDNS.inc:126
 msgid "Zone entry editor"
 msgstr ""
 
-#: admin/systems/services/dns/class_serviceDNS.inc:409
-#: admin/systems/services/dns/class_serviceDNSeditZone.inc:360
+#: admin/systems/services/dns/class_serviceDNS.inc:127
+#: admin/systems/services/dns/class_serviceDNSeditZone.inc:356
 msgid "Primary dns server"
 msgstr ""
 
-#: admin/systems/services/dns/class_serviceDNS.inc:410
-#: admin/systems/services/dns/serviceDNSeditZone.tpl.c:32
+#: admin/systems/services/dns/class_serviceDNS.inc:128
 msgid "Mail address"
 msgstr "Äá»‹a chá»‰ thÆ°"
 
-#: admin/systems/services/dns/class_serviceDNS.inc:411
-#: admin/systems/services/dns/class_serviceDNSeditZone.inc:364
+#: admin/systems/services/dns/class_serviceDNS.inc:129
+#: admin/systems/services/dns/class_serviceDNSeditZone.inc:360
 msgid "Serial"
 msgstr ""
 
-#: admin/systems/services/dns/class_serviceDNS.inc:412
-#: admin/systems/services/dns/class_serviceDNSeditZone.inc:368
-#: admin/systems/services/dns/serviceDNSeditZone.tpl.c:38
+#: admin/systems/services/dns/class_serviceDNS.inc:130
+#: admin/systems/services/dns/class_serviceDNSeditZone.inc:364
 msgid "Refresh"
 msgstr ""
 
-#: admin/systems/services/dns/class_serviceDNS.inc:413
-#: admin/systems/services/dns/class_serviceDNSeditZone.inc:380
-#: admin/systems/services/dns/serviceDNSeditZone.tpl.c:41
+#: admin/systems/services/dns/class_serviceDNS.inc:131
+#: admin/systems/services/dns/class_serviceDNSeditZone.inc:376
 msgid "Retry"
 msgstr ""
 
-#: admin/systems/services/dns/class_serviceDNS.inc:414
-#: admin/systems/services/dns/class_serviceDNSeditZone.inc:376
-#: admin/systems/services/dns/serviceDNSeditZone.tpl.c:44
+#: admin/systems/services/dns/class_serviceDNS.inc:132
+#: admin/systems/services/dns/class_serviceDNSeditZone.inc:372
 msgid "Expire"
 msgstr ""
 
-#: admin/systems/services/dns/class_serviceDNS.inc:416
+#: admin/systems/services/dns/class_serviceDNS.inc:133
+msgid "TTL"
+msgstr ""
+
+#: admin/systems/services/dns/class_serviceDNS.inc:134
 msgid "MX records"
 msgstr ""
 
-#: admin/systems/services/dns/class_serviceDNS.inc:417
-#: admin/systems/services/dns/serviceDNSeditZone.tpl.c:17
+#: admin/systems/services/dns/class_serviceDNS.inc:135
 msgid "Zone records"
 msgstr ""
 
+#: admin/systems/services/dns/class_serviceDNS.inc:198
+#: admin/systems/services/dns/class_serviceDNS.inc:212
+#: admin/systems/services/dns/class_serviceDNS.inc:229
+#: admin/systems/services/dns/class_serviceDNS.inc:235
+#: admin/systems/services/dns/class_DNS.inc:730
+msgid "LDAP error"
+msgstr "Lá»—i LDAP"
+
 #: admin/systems/services/dns/class_DNS.inc:167
 #, php-format
 msgid "Cannot find reverse zone for DNS zone '%s'. Parsing zone aborted."
@@ -174,44 +145,42 @@ msgid "MxRecord"
 msgstr ""
 
 #: admin/systems/services/dns/class_serviceDNSeditZone.inc:274
-#: admin/systems/services/dns/class_serviceDNSeditZone.inc:518
+#: admin/systems/services/dns/class_serviceDNSeditZone.inc:514
 msgid "Delete"
 msgstr "XÃ³a"
 
-#: admin/systems/services/dns/class_serviceDNSeditZone.inc:356
-#: admin/systems/services/dns/class_serviceDNSeditZone.inc:386
+#: admin/systems/services/dns/class_serviceDNSeditZone.inc:352
+#: admin/systems/services/dns/class_serviceDNSeditZone.inc:382
 msgid "Only lowercase allowed"
 msgstr ""
 
-#: admin/systems/services/dns/class_serviceDNSeditZone.inc:360
+#: admin/systems/services/dns/class_serviceDNSeditZone.inc:356
 msgid "This field should be a domain name"
 msgstr ""
 
-#: admin/systems/services/dns/class_serviceDNSeditZone.inc:372
+#: admin/systems/services/dns/class_serviceDNSeditZone.inc:368
 msgid "Time to life"
 msgstr ""
 
-#: admin/systems/services/dns/class_serviceDNSeditZone.inc:395
-#: admin/systems/services/dns/class_serviceDNSeditZone.inc:415
-#: admin/systems/services/dns/serviceDNSeditZone.tpl.c:8
+#: admin/systems/services/dns/class_serviceDNSeditZone.inc:391
+#: admin/systems/services/dns/class_serviceDNSeditZone.inc:411
 msgid "Network address"
 msgstr ""
 
-#: admin/systems/services/dns/class_serviceDNSeditZone.inc:423
-#: admin/systems/services/dns/class_serviceDNSeditZone.inc:428
-#: admin/systems/services/dns/class_serviceDNSeditZone.inc:433
+#: admin/systems/services/dns/class_serviceDNSeditZone.inc:419
+#: admin/systems/services/dns/class_serviceDNSeditZone.inc:424
+#: admin/systems/services/dns/class_serviceDNSeditZone.inc:429
 #, php-format
 msgid ""
 "The specified network address and the network class (%s/%s) do not match!"
 msgstr ""
 
-#: admin/systems/services/dns/class_serviceDNSeditZone.inc:524
+#: admin/systems/services/dns/class_serviceDNSeditZone.inc:520
 #: admin/systems/services/dns/class_serviceDNSeditZoneEntries.inc:439
 msgid "Add"
 msgstr "ThÃªm vÃ o"
 
 #: admin/systems/services/dns/class_serviceDNSeditZoneEntries.inc:121
-#: admin/systems/services/dns/serviceDNSeditZoneEntries.tpl.c:8
 msgid "New entry"
 msgstr ""
 
@@ -339,63 +308,3 @@ msgstr ""
 #: config/dns/class_dnsConfig.inc:45
 msgid "Should FD store a final dot at the end of domains?"
 msgstr ""
-
-#: admin/systems/services/dns/serviceDNSeditZone.tpl.c:2
-msgid "Generic"
-msgstr "ThÃ´ng tin chung"
-
-#: admin/systems/services/dns/serviceDNSeditZone.tpl.c:11
-msgid "Netmask"
-msgstr ""
-
-#: admin/systems/services/dns/serviceDNSeditZone.tpl.c:14
-msgid "Zone is in use, network settings can't be modified."
-msgstr ""
-
-#: admin/systems/services/dns/serviceDNSeditZone.tpl.c:20
-msgid "Can't be edited because the zone wasn't saved right now."
-msgstr ""
-
-#: admin/systems/services/dns/serviceDNSeditZone.tpl.c:23
-msgid "Edit"
-msgstr "Hiá»‡u chá»‰nh"
-
-#: admin/systems/services/dns/serviceDNSeditZone.tpl.c:26
-msgid "SOA record"
-msgstr ""
-
-#: admin/systems/services/dns/serviceDNSeditZone.tpl.c:29
-msgid "Primary dns server for this zone"
-msgstr ""
-
-#: admin/systems/services/dns/serviceDNSeditZone.tpl.c:35
-msgid "Serial number (automatically incremented)"
-msgstr ""
-
-#: admin/systems/services/dns/serviceDNSeditZone.tpl.c:50
-msgid "MxRecords"
-msgstr ""
-
-#: admin/systems/services/dns/serviceDNSeditZone.tpl.c:53
-msgid "Global zone records"
-msgstr ""
-
-#: admin/systems/services/dns/serviceDNS.tpl.c:2
-msgid "Zones"
-msgstr ""
-
-#: admin/systems/services/dns/serviceDNSeditZoneEntries.tpl.c:2
-msgid ""
-"This dialog allows you to configure all components of this DNS zone on a "
-"single list."
-msgstr ""
-
-#: admin/systems/services/dns/serviceDNSeditZoneEntries.tpl.c:5
-msgid ""
-"This dialog can't be used until the currently edited zone was saved or the "
-"zone entry exists in the ldap database."
-msgstr ""
-
-#: admin/systems/services/dns/serviceDNSeditZoneEntries.tpl.c:11
-msgid "Create a new DNS zone entry"
-msgstr ""
diff --git a/dns/locale/zh/fusiondirectory.po b/dns/locale/zh/fusiondirectory.po
index a18cb0015576b15ebedd4e5c82c7ce599e6cd211..cbcf9ce8b5ccecd5cde7fd28b2c72219b226ce4f 100644
--- a/dns/locale/zh/fusiondirectory.po
+++ b/dns/locale/zh/fusiondirectory.po
@@ -3,32 +3,21 @@
 # This file is distributed under the same license as the PACKAGE package.
 # 
 # Translators:
-#  Jiang Xin <worldhello.net@gmail.com>, 2007
 msgid ""
 msgstr ""
-"Project-Id-Version: FusionDirectory-108\n"
+"Project-Id-Version: FusionDirectory-109\n"
 "Report-Msgid-Bugs-To: documentation@lists.fusiondirectory.org\n"
-"POT-Creation-Date: 2015-03-19 21:45+0100\n"
-"PO-Revision-Date: 2015-02-25 16:12+0000\n"
+"POT-Creation-Date: 2014-12-15 17:47+0100\n"
+"PO-Revision-Date: 2015-02-25 16:13+0000\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>\n"
-"Language-Team: Chinese (http://www.transifex.com/projects/p/FusionDirectory-108/language/zh/)\n"
+"Language-Team: Chinese (http://www.transifex.com/projects/p/FusionDirectory-109/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/services/dns/class_serviceDNS.inc:45
-#: admin/systems/services/dns/class_serviceDNS.inc:386
-#: admin/systems/services/dns/class_serviceDNS.inc:394
-#: admin/systems/services/dns/class_serviceDNS.inc:395
-msgid "DNS service"
-msgstr ""
-
-#: admin/systems/services/dns/class_serviceDNS.inc:101
-#: admin/systems/services/dns/class_serviceDNS.inc:258
-#: admin/systems/services/dns/class_serviceDNS.inc:271
-#: admin/systems/services/dns/class_serviceDNS.inc:277
+#: admin/systems/services/dns/class_serviceDNS.inc:49
 #: admin/systems/services/dns/class_DNS.inc:167
 #: admin/systems/services/dns/class_DNS.inc:172
 #: admin/systems/services/dns/class_DNS.inc:617
@@ -37,120 +26,101 @@ msgstr ""
 msgid "Error"
 msgstr "é”™è¯¯"
 
-#: admin/systems/services/dns/class_serviceDNS.inc:195
-#: admin/systems/services/dns/class_serviceDNS.inc:406
-#: admin/systems/services/dns/class_serviceDNSeditZone.inc:352
-msgid "Reverse zone"
-msgstr "åå‘è§£æžåŸŸ"
-
-#: admin/systems/services/dns/class_serviceDNS.inc:196
-#: admin/systems/services/dns/class_serviceDNS.inc:415
-#: admin/systems/services/dns/serviceDNSeditZone.tpl.c:47
-msgid "TTL"
-msgstr "TTL"
-
-#: admin/systems/services/dns/class_serviceDNS.inc:197
-msgid "Class"
-msgstr "ç±»"
-
-#: admin/systems/services/dns/class_serviceDNS.inc:258
-#, php-format
-msgid "Cannot delete the selected zone. It is still in use by '%s'"
+#: admin/systems/services/dns/class_serviceDNS.inc:98
+msgid "DNS zones"
 msgstr ""
 
-#: admin/systems/services/dns/class_serviceDNS.inc:271
-#, php-format
-msgid "Was not able to contact argonaut server: %s"
+#: admin/systems/services/dns/class_serviceDNS.inc:102
+msgid "The DNS zones"
 msgstr ""
 
-#: admin/systems/services/dns/class_serviceDNS.inc:277
-#, php-format
-msgid "Was not able to launch ldap2zone: %s"
+#: admin/systems/services/dns/class_serviceDNS.inc:114
+#: admin/systems/services/dns/class_serviceDNS.inc:115
+msgid "DNS service"
 msgstr ""
 
-#: admin/systems/services/dns/class_serviceDNS.inc:339
-#: admin/systems/services/dns/class_serviceDNS.inc:353
-#: admin/systems/services/dns/class_serviceDNS.inc:370
-#: admin/systems/services/dns/class_serviceDNS.inc:376
-#: admin/systems/services/dns/class_DNS.inc:730
-msgid "LDAP error"
-msgstr "LDAP é”™è¯¯"
-
-#: admin/systems/services/dns/class_serviceDNS.inc:395
-msgid "Services"
-msgstr "æœåŠ¡"
-
-#: admin/systems/services/dns/class_serviceDNS.inc:401
+#: admin/systems/services/dns/class_serviceDNS.inc:119
 msgid "Start service"
 msgstr ""
 
-#: admin/systems/services/dns/class_serviceDNS.inc:402
+#: admin/systems/services/dns/class_serviceDNS.inc:120
 msgid "Stop service"
 msgstr ""
 
-#: admin/systems/services/dns/class_serviceDNS.inc:403
+#: admin/systems/services/dns/class_serviceDNS.inc:121
 msgid "Restart service"
 msgstr ""
 
-#: admin/systems/services/dns/class_serviceDNS.inc:405
-#: admin/systems/services/dns/class_serviceDNSeditZone.inc:343
-#: admin/systems/services/dns/class_serviceDNSeditZone.inc:348
-#: admin/systems/services/dns/class_serviceDNSeditZone.inc:356
-#: admin/systems/services/dns/serviceDNSeditZone.tpl.c:5
+#: admin/systems/services/dns/class_serviceDNS.inc:123
+#: admin/systems/services/dns/class_serviceDNSeditZone.inc:339
+#: admin/systems/services/dns/class_serviceDNSeditZone.inc:344
+#: admin/systems/services/dns/class_serviceDNSeditZone.inc:352
 msgid "Zone name"
 msgstr "åŸŸåç§°"
 
-#: admin/systems/services/dns/class_serviceDNS.inc:407
-#: admin/systems/services/dns/class_serviceDNSeditZone.inc:436
+#: admin/systems/services/dns/class_serviceDNS.inc:124
+#: admin/systems/services/dns/class_serviceDNSeditZone.inc:348
+msgid "Reverse zone"
+msgstr "åå‘è§£æžåŸŸ"
+
+#: admin/systems/services/dns/class_serviceDNS.inc:125
+#: admin/systems/services/dns/class_serviceDNSeditZone.inc:432
 msgid "Network class"
 msgstr ""
 
-#: admin/systems/services/dns/class_serviceDNS.inc:408
+#: admin/systems/services/dns/class_serviceDNS.inc:126
 msgid "Zone entry editor"
 msgstr ""
 
-#: admin/systems/services/dns/class_serviceDNS.inc:409
-#: admin/systems/services/dns/class_serviceDNSeditZone.inc:360
+#: admin/systems/services/dns/class_serviceDNS.inc:127
+#: admin/systems/services/dns/class_serviceDNSeditZone.inc:356
 msgid "Primary dns server"
 msgstr ""
 
-#: admin/systems/services/dns/class_serviceDNS.inc:410
-#: admin/systems/services/dns/serviceDNSeditZone.tpl.c:32
+#: admin/systems/services/dns/class_serviceDNS.inc:128
 msgid "Mail address"
 msgstr "é‚®ä»¶åœ°å€"
 
-#: admin/systems/services/dns/class_serviceDNS.inc:411
-#: admin/systems/services/dns/class_serviceDNSeditZone.inc:364
+#: admin/systems/services/dns/class_serviceDNS.inc:129
+#: admin/systems/services/dns/class_serviceDNSeditZone.inc:360
 msgid "Serial"
 msgstr "ä¸²è¡Œ"
 
-#: admin/systems/services/dns/class_serviceDNS.inc:412
-#: admin/systems/services/dns/class_serviceDNSeditZone.inc:368
-#: admin/systems/services/dns/serviceDNSeditZone.tpl.c:38
+#: admin/systems/services/dns/class_serviceDNS.inc:130
+#: admin/systems/services/dns/class_serviceDNSeditZone.inc:364
 msgid "Refresh"
 msgstr "åˆ·æ–°"
 
-#: admin/systems/services/dns/class_serviceDNS.inc:413
-#: admin/systems/services/dns/class_serviceDNSeditZone.inc:380
-#: admin/systems/services/dns/serviceDNSeditZone.tpl.c:41
+#: admin/systems/services/dns/class_serviceDNS.inc:131
+#: admin/systems/services/dns/class_serviceDNSeditZone.inc:376
 msgid "Retry"
 msgstr "é‡è¯•"
 
-#: admin/systems/services/dns/class_serviceDNS.inc:414
-#: admin/systems/services/dns/class_serviceDNSeditZone.inc:376
-#: admin/systems/services/dns/serviceDNSeditZone.tpl.c:44
+#: admin/systems/services/dns/class_serviceDNS.inc:132
+#: admin/systems/services/dns/class_serviceDNSeditZone.inc:372
 msgid "Expire"
 msgstr "è¿‡æœŸ"
 
-#: admin/systems/services/dns/class_serviceDNS.inc:416
+#: admin/systems/services/dns/class_serviceDNS.inc:133
+msgid "TTL"
+msgstr "TTL"
+
+#: admin/systems/services/dns/class_serviceDNS.inc:134
 msgid "MX records"
 msgstr ""
 
-#: admin/systems/services/dns/class_serviceDNS.inc:417
-#: admin/systems/services/dns/serviceDNSeditZone.tpl.c:17
+#: admin/systems/services/dns/class_serviceDNS.inc:135
 msgid "Zone records"
 msgstr "åŸŸè®°å½•"
 
+#: admin/systems/services/dns/class_serviceDNS.inc:198
+#: admin/systems/services/dns/class_serviceDNS.inc:212
+#: admin/systems/services/dns/class_serviceDNS.inc:229
+#: admin/systems/services/dns/class_serviceDNS.inc:235
+#: admin/systems/services/dns/class_DNS.inc:730
+msgid "LDAP error"
+msgstr "LDAP é”™è¯¯"
+
 #: admin/systems/services/dns/class_DNS.inc:167
 #, php-format
 msgid "Cannot find reverse zone for DNS zone '%s'. Parsing zone aborted."
@@ -175,44 +145,42 @@ msgid "MxRecord"
 msgstr ""
 
 #: admin/systems/services/dns/class_serviceDNSeditZone.inc:274
-#: admin/systems/services/dns/class_serviceDNSeditZone.inc:518
+#: admin/systems/services/dns/class_serviceDNSeditZone.inc:514
 msgid "Delete"
 msgstr "åˆ é™¤"
 
-#: admin/systems/services/dns/class_serviceDNSeditZone.inc:356
-#: admin/systems/services/dns/class_serviceDNSeditZone.inc:386
+#: admin/systems/services/dns/class_serviceDNSeditZone.inc:352
+#: admin/systems/services/dns/class_serviceDNSeditZone.inc:382
 msgid "Only lowercase allowed"
 msgstr ""
 
-#: admin/systems/services/dns/class_serviceDNSeditZone.inc:360
+#: admin/systems/services/dns/class_serviceDNSeditZone.inc:356
 msgid "This field should be a domain name"
 msgstr ""
 
-#: admin/systems/services/dns/class_serviceDNSeditZone.inc:372
+#: admin/systems/services/dns/class_serviceDNSeditZone.inc:368
 msgid "Time to life"
 msgstr ""
 
-#: admin/systems/services/dns/class_serviceDNSeditZone.inc:395
-#: admin/systems/services/dns/class_serviceDNSeditZone.inc:415
-#: admin/systems/services/dns/serviceDNSeditZone.tpl.c:8
+#: admin/systems/services/dns/class_serviceDNSeditZone.inc:391
+#: admin/systems/services/dns/class_serviceDNSeditZone.inc:411
 msgid "Network address"
 msgstr "ç½‘ç»œåœ°å€"
 
-#: admin/systems/services/dns/class_serviceDNSeditZone.inc:423
-#: admin/systems/services/dns/class_serviceDNSeditZone.inc:428
-#: admin/systems/services/dns/class_serviceDNSeditZone.inc:433
+#: admin/systems/services/dns/class_serviceDNSeditZone.inc:419
+#: admin/systems/services/dns/class_serviceDNSeditZone.inc:424
+#: admin/systems/services/dns/class_serviceDNSeditZone.inc:429
 #, php-format
 msgid ""
 "The specified network address and the network class (%s/%s) do not match!"
 msgstr ""
 
-#: admin/systems/services/dns/class_serviceDNSeditZone.inc:524
+#: admin/systems/services/dns/class_serviceDNSeditZone.inc:520
 #: admin/systems/services/dns/class_serviceDNSeditZoneEntries.inc:439
 msgid "Add"
 msgstr "æ·»åŠ "
 
 #: admin/systems/services/dns/class_serviceDNSeditZoneEntries.inc:121
-#: admin/systems/services/dns/serviceDNSeditZoneEntries.tpl.c:8
 msgid "New entry"
 msgstr "æ–°æ¡ç›®"
 
@@ -340,63 +308,3 @@ msgstr ""
 #: config/dns/class_dnsConfig.inc:45
 msgid "Should FD store a final dot at the end of domains?"
 msgstr ""
-
-#: admin/systems/services/dns/serviceDNSeditZone.tpl.c:2
-msgid "Generic"
-msgstr "é€šç”¨é…ç½®"
-
-#: admin/systems/services/dns/serviceDNSeditZone.tpl.c:11
-msgid "Netmask"
-msgstr ""
-
-#: admin/systems/services/dns/serviceDNSeditZone.tpl.c:14
-msgid "Zone is in use, network settings can't be modified."
-msgstr ""
-
-#: admin/systems/services/dns/serviceDNSeditZone.tpl.c:20
-msgid "Can't be edited because the zone wasn't saved right now."
-msgstr "æ— æ³•ç¼–è¾‘å› ä¸ºåŸŸçŽ°åœ¨ä¸èƒ½ä¿å˜ã€‚"
-
-#: admin/systems/services/dns/serviceDNSeditZone.tpl.c:23
-msgid "Edit"
-msgstr "ç¼–è¾‘"
-
-#: admin/systems/services/dns/serviceDNSeditZone.tpl.c:26
-msgid "SOA record"
-msgstr "SOA è®°å½•"
-
-#: admin/systems/services/dns/serviceDNSeditZone.tpl.c:29
-msgid "Primary dns server for this zone"
-msgstr "è¿™ä¸ªåŸŸçš„ä¸»è¦ dns æœåŠ¡å™¨"
-
-#: admin/systems/services/dns/serviceDNSeditZone.tpl.c:35
-msgid "Serial number (automatically incremented)"
-msgstr "ç³»åˆ—å·ï¼ˆè‡ªå¢žï¼‰"
-
-#: admin/systems/services/dns/serviceDNSeditZone.tpl.c:50
-msgid "MxRecords"
-msgstr "Mxè®°å½•"
-
-#: admin/systems/services/dns/serviceDNSeditZone.tpl.c:53
-msgid "Global zone records"
-msgstr "å…¨å±€åŸŸè®°å½•"
-
-#: admin/systems/services/dns/serviceDNS.tpl.c:2
-msgid "Zones"
-msgstr "åŸŸ"
-
-#: admin/systems/services/dns/serviceDNSeditZoneEntries.tpl.c:2
-msgid ""
-"This dialog allows you to configure all components of this DNS zone on a "
-"single list."
-msgstr "æ¤å¯¹è¯æ¡†å…è®¸æ‚¨ä¿®æ”¹è¿™ä¸ª DNS åŒºåŸŸä¸æ‰€æœ‰å†…å®¹ã€‚"
-
-#: admin/systems/services/dns/serviceDNSeditZoneEntries.tpl.c:5
-msgid ""
-"This dialog can't be used until the currently edited zone was saved or the "
-"zone entry exists in the ldap database."
-msgstr "è¿™ä¸ªå¯¹è¯æ¡†ä¸èƒ½ä½¿ç”¨ï¼Œé™¤éžå½“å‰ç¼–è¾‘çš„åŸŸè¢«ä¿å˜æˆ–è€…åŸŸä¸æ¡ç›®å·²ç»å˜åœ¨äºŽ ldap æ•°æ®åº“ä¸ã€‚"
-
-#: admin/systems/services/dns/serviceDNSeditZoneEntries.tpl.c:11
-msgid "Create a new DNS zone entry"
-msgstr "åˆ›å»ºä¸€ä¸ªæ–° DNS zone æ¡ç›®"
diff --git a/dovecot/locale/ar/fusiondirectory.po b/dovecot/locale/ar/fusiondirectory.po
index 64beeecf4b4c79a3bf56c9285a55539add25d328..e52d4da8046290e4a8f72ddb8cb93f402f30cc88 100644
--- a/dovecot/locale/ar/fusiondirectory.po
+++ b/dovecot/locale/ar/fusiondirectory.po
@@ -5,12 +5,12 @@
 # Translators:
 msgid ""
 msgstr ""
-"Project-Id-Version: FusionDirectory-108\n"
+"Project-Id-Version: FusionDirectory-109\n"
 "Report-Msgid-Bugs-To: documentation@lists.fusiondirectory.org\n"
-"POT-Creation-Date: 2015-03-19 21:45+0100\n"
-"PO-Revision-Date: 2014-08-28 10:50+0000\n"
-"Last-Translator: fusiondirectory <contact@fusiondirectory.org>\n"
-"Language-Team: Arabic (http://www.transifex.com/projects/p/FusionDirectory-108/language/ar/)\n"
+"POT-Creation-Date: 2014-12-15 17:47+0100\n"
+"PO-Revision-Date: 2014-08-28 10:28+0000\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: Arabic (http://www.transifex.com/projects/p/FusionDirectory-109/language/ar/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
diff --git a/dovecot/locale/ca/fusiondirectory.po b/dovecot/locale/ca/fusiondirectory.po
index 70ce864fd902cf01c5b29d45b4decc3ebc66feb1..0ef07bc5a4fe4880082d086833bf32bcf7397e8b 100644
--- a/dovecot/locale/ca/fusiondirectory.po
+++ b/dovecot/locale/ca/fusiondirectory.po
@@ -5,12 +5,12 @@
 # Translators:
 msgid ""
 msgstr ""
-"Project-Id-Version: FusionDirectory-108\n"
+"Project-Id-Version: FusionDirectory-109\n"
 "Report-Msgid-Bugs-To: documentation@lists.fusiondirectory.org\n"
-"POT-Creation-Date: 2015-03-19 21:45+0100\n"
-"PO-Revision-Date: 2014-08-28 10:50+0000\n"
-"Last-Translator: fusiondirectory <contact@fusiondirectory.org>\n"
-"Language-Team: Catalan (http://www.transifex.com/projects/p/FusionDirectory-108/language/ca/)\n"
+"POT-Creation-Date: 2014-12-15 17:47+0100\n"
+"PO-Revision-Date: 2014-08-28 10:28+0000\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: Catalan (http://www.transifex.com/projects/p/FusionDirectory-109/language/ca/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
diff --git a/dovecot/locale/cs_CZ/fusiondirectory.po b/dovecot/locale/cs_CZ/fusiondirectory.po
index 72ad4dc8b18f60b28bbbce2e7d754940d31b598f..9cad5638a934f26b2dc9ad6b1e3b93cd95c89afa 100644
--- a/dovecot/locale/cs_CZ/fusiondirectory.po
+++ b/dovecot/locale/cs_CZ/fusiondirectory.po
@@ -3,14 +3,15 @@
 # This file is distributed under the same license as the PACKAGE package.
 # 
 # Translators:
+# Pavel Borecki <pavel.borecki@gmail.com>, 2014-2015
 msgid ""
 msgstr ""
-"Project-Id-Version: FusionDirectory-108\n"
+"Project-Id-Version: FusionDirectory-109\n"
 "Report-Msgid-Bugs-To: documentation@lists.fusiondirectory.org\n"
-"POT-Creation-Date: 2015-03-19 21:45+0100\n"
-"PO-Revision-Date: 2015-02-25 16:12+0000\n"
-"Last-Translator: fusiondirectory <contact@fusiondirectory.org>\n"
-"Language-Team: Czech (Czech Republic) (http://www.transifex.com/projects/p/FusionDirectory-108/language/cs_CZ/)\n"
+"POT-Creation-Date: 2014-12-15 17:47+0100\n"
+"PO-Revision-Date: 2015-04-07 19:21+0000\n"
+"Last-Translator: Pavel Borecki <pavel.borecki@gmail.com>\n"
+"Language-Team: Czech (Czech Republic) (http://www.transifex.com/projects/p/FusionDirectory-109/language/cs_CZ/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -24,15 +25,15 @@ msgstr ""
 
 #: admin/systems/services/dovecot/class_serviceDovecot.inc:29
 msgid "Services"
-msgstr "sluÅ¾by"
+msgstr "SluÅ¾by"
 
 #: admin/systems/services/dovecot/class_serviceDovecot.inc:43
 msgid "Dovecot connexion"
-msgstr ""
+msgstr "PÅ™ipojenÃ Dovecot"
 
 #: admin/systems/services/dovecot/class_serviceDovecot.inc:46
 msgid "Connect URL for Dovecot server"
-msgstr ""
+msgstr "URL adrea pro pÅ™ipojenÃ k Dovecot serveru"
 
 #: admin/systems/services/dovecot/class_serviceDovecot.inc:49
 msgid "Hostname"
@@ -40,15 +41,15 @@ msgstr "NÃ¡zev poÄÃtaÄe"
 
 #: admin/systems/services/dovecot/class_serviceDovecot.inc:49
 msgid "Hostname of the Dovecot server"
-msgstr ""
+msgstr "NÃ¡zev poÄÃtaÄe, na kterÃ©m je provozovÃ¡n Dovecot"
 
 #: admin/systems/services/dovecot/class_serviceDovecot.inc:50
 msgid "Port"
-msgstr "port"
+msgstr "Port"
 
 #: admin/systems/services/dovecot/class_serviceDovecot.inc:50
 msgid "Port number on which Dovecot server should be contacted"
-msgstr ""
+msgstr "ÄŒÃslo portu na kterÃ©m by mÄ›l bÃ½t kontaktovÃ¡n server Dovecot"
 
 #: admin/systems/services/dovecot/class_serviceDovecot.inc:51
 msgid "Option"
@@ -56,43 +57,43 @@ msgstr "volba"
 
 #: admin/systems/services/dovecot/class_serviceDovecot.inc:51
 msgid "Options for contacting Dovecot server"
-msgstr ""
+msgstr "PÅ™edvolby pro kontaktovÃ¡nÃ Dovecot serveru"
 
 #: admin/systems/services/dovecot/class_serviceDovecot.inc:52
 msgid "Valide certificats"
-msgstr ""
+msgstr "OvÄ›Å™it certifikÃ¡ty"
 
 #: admin/systems/services/dovecot/class_serviceDovecot.inc:52
 msgid "Weither or not to validate server certificate on connexion"
-msgstr ""
+msgstr "Zda pÅ™i spojovÃ¡nÃ ovÄ›Å™ovat certifikÃ¡t serveru"
 
 #: admin/systems/services/dovecot/class_serviceDovecot.inc:60
 msgid "Master credentials"
-msgstr ""
+msgstr "HlavnÃ pÅ™ihlaÅ¡ovacÃ Ãºdaje"
 
 #: admin/systems/services/dovecot/class_serviceDovecot.inc:63
 msgid "Admin user"
-msgstr "sprÃ¡vce"
+msgstr "SprÃ¡vce"
 
 #: admin/systems/services/dovecot/class_serviceDovecot.inc:63
 msgid "Dovecot server admin user"
-msgstr ""
+msgstr "ÃšÄet sprÃ¡vce Dovecot serveru"
 
 #: admin/systems/services/dovecot/class_serviceDovecot.inc:67
 msgid "Password"
-msgstr "heslo"
+msgstr "Heslo"
 
 #: admin/systems/services/dovecot/class_serviceDovecot.inc:67
 msgid "Admin user password"
-msgstr ""
+msgstr "Heslo ÃºÄtu sprÃ¡vce"
 
 #: admin/systems/services/dovecot/class_serviceDovecot.inc:71
 msgid "Mail directory"
-msgstr ""
+msgstr "SloÅ¾ka s poÅ¡tou"
 
 #: admin/systems/services/dovecot/class_serviceDovecot.inc:71
 msgid "Path to the directory in which user maildirs must be created"
-msgstr ""
+msgstr "UmÃstÄ›nÃ sloÅ¾ky ve kterÃ© je tÅ™eba vytvoÅ™it e-mailovÃ© sloÅ¾ky uÅ¾ivatele"
 
 #: admin/systems/services/dovecot/class_serviceDovecot.inc:78
 msgid "Options"
@@ -100,11 +101,11 @@ msgstr "volby"
 
 #: admin/systems/services/dovecot/class_serviceDovecot.inc:81
 msgid "Create the user folder throught Argonaut"
-msgstr ""
+msgstr "VytvoÅ™it sloÅ¾ku uÅ¾ivatele pomocÃ Argonaut"
 
 #: admin/systems/services/dovecot/class_serviceDovecot.inc:81
 msgid "Use argonaut to create the user mailbox on the Dovecot server"
-msgstr ""
+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:47
 msgid "There are no IMAP compatible mail servers defined!"
@@ -117,4 +118,4 @@ msgstr "PoÅ¡tovnÃ server pro tento ÃºÄet je neplatnÃ½!"
 #: personal/mail/mail-methods/class_mail-methods-dovecot.inc:189
 #, php-format
 msgid "Error while trying to contact Dovecot server through Argonaut: %s"
-msgstr ""
+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 8f1dc42b0d318bf87503bf48b57dea746a33762e..f397246a54bb5c35de8c2828a41927dfe92d7bdc 100644
--- a/dovecot/locale/de/fusiondirectory.po
+++ b/dovecot/locale/de/fusiondirectory.po
@@ -3,14 +3,15 @@
 # This file is distributed under the same license as the PACKAGE package.
 # 
 # Translators:
+# Ettore Atalan <atalanttore@googlemail.com>, 2014-2015
 msgid ""
 msgstr ""
-"Project-Id-Version: FusionDirectory-108\n"
+"Project-Id-Version: FusionDirectory-109\n"
 "Report-Msgid-Bugs-To: documentation@lists.fusiondirectory.org\n"
-"POT-Creation-Date: 2015-03-19 21:45+0100\n"
-"PO-Revision-Date: 2015-02-25 16:12+0000\n"
-"Last-Translator: fusiondirectory <contact@fusiondirectory.org>\n"
-"Language-Team: German (http://www.transifex.com/projects/p/FusionDirectory-108/language/de/)\n"
+"POT-Creation-Date: 2014-12-15 17:47+0100\n"
+"PO-Revision-Date: 2015-05-30 13:10+0000\n"
+"Last-Translator: Ettore Atalan <atalanttore@googlemail.com>\n"
+"Language-Team: German (http://www.transifex.com/projects/p/FusionDirectory-109/language/de/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -68,7 +69,7 @@ msgstr "Ob Serverzertifikate bei der Verbindung Ã¼berprÃ¼ft werden sollen"
 
 #: admin/systems/services/dovecot/class_serviceDovecot.inc:60
 msgid "Master credentials"
-msgstr ""
+msgstr "Hauptanmeldedaten"
 
 #: admin/systems/services/dovecot/class_serviceDovecot.inc:63
 msgid "Admin user"
diff --git a/dovecot/locale/el_GR/fusiondirectory.po b/dovecot/locale/el_GR/fusiondirectory.po
new file mode 100644
index 0000000000000000000000000000000000000000..94f6bcef208324eb4ce38ff612ee87c7a187c0c3
--- /dev/null
+++ b/dovecot/locale/el_GR/fusiondirectory.po
@@ -0,0 +1,120 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR FusionDirectory Project
+# This file is distributed under the same license as the PACKAGE package.
+# 
+# Translators:
+msgid ""
+msgstr ""
+"Project-Id-Version: FusionDirectory-109\n"
+"Report-Msgid-Bugs-To: documentation@lists.fusiondirectory.org\n"
+"POT-Creation-Date: 2014-12-15 17:47+0100\n"
+"PO-Revision-Date: 2015-05-30 11:45+0000\n"
+"Last-Translator: Benoit Mortier <benoit.mortier@opensides.be>\n"
+"Language-Team: Greek (Greece) (http://www.transifex.com/projects/p/FusionDirectory-109/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/services/dovecot/class_serviceDovecot.inc:28
+#: admin/systems/services/dovecot/class_serviceDovecot.inc:29
+msgid "Dovecot (IMAP/POP3)"
+msgstr ""
+
+#: admin/systems/services/dovecot/class_serviceDovecot.inc:29
+msgid "Services"
+msgstr ""
+
+#: admin/systems/services/dovecot/class_serviceDovecot.inc:43
+msgid "Dovecot connexion"
+msgstr ""
+
+#: admin/systems/services/dovecot/class_serviceDovecot.inc:46
+msgid "Connect URL for Dovecot server"
+msgstr ""
+
+#: admin/systems/services/dovecot/class_serviceDovecot.inc:49
+msgid "Hostname"
+msgstr ""
+
+#: admin/systems/services/dovecot/class_serviceDovecot.inc:49
+msgid "Hostname of the Dovecot server"
+msgstr ""
+
+#: admin/systems/services/dovecot/class_serviceDovecot.inc:50
+msgid "Port"
+msgstr ""
+
+#: admin/systems/services/dovecot/class_serviceDovecot.inc:50
+msgid "Port number on which Dovecot server should be contacted"
+msgstr ""
+
+#: admin/systems/services/dovecot/class_serviceDovecot.inc:51
+msgid "Option"
+msgstr ""
+
+#: admin/systems/services/dovecot/class_serviceDovecot.inc:51
+msgid "Options for contacting Dovecot server"
+msgstr ""
+
+#: admin/systems/services/dovecot/class_serviceDovecot.inc:52
+msgid "Valide certificats"
+msgstr ""
+
+#: admin/systems/services/dovecot/class_serviceDovecot.inc:52
+msgid "Weither or not to validate server certificate on connexion"
+msgstr ""
+
+#: admin/systems/services/dovecot/class_serviceDovecot.inc:60
+msgid "Master credentials"
+msgstr ""
+
+#: admin/systems/services/dovecot/class_serviceDovecot.inc:63
+msgid "Admin user"
+msgstr ""
+
+#: admin/systems/services/dovecot/class_serviceDovecot.inc:63
+msgid "Dovecot server admin user"
+msgstr ""
+
+#: admin/systems/services/dovecot/class_serviceDovecot.inc:67
+msgid "Password"
+msgstr ""
+
+#: admin/systems/services/dovecot/class_serviceDovecot.inc:67
+msgid "Admin user password"
+msgstr ""
+
+#: admin/systems/services/dovecot/class_serviceDovecot.inc:71
+msgid "Mail directory"
+msgstr ""
+
+#: admin/systems/services/dovecot/class_serviceDovecot.inc:71
+msgid "Path to the directory in which user maildirs must be created"
+msgstr ""
+
+#: admin/systems/services/dovecot/class_serviceDovecot.inc:78
+msgid "Options"
+msgstr ""
+
+#: admin/systems/services/dovecot/class_serviceDovecot.inc:81
+msgid "Create the user folder throught Argonaut"
+msgstr ""
+
+#: admin/systems/services/dovecot/class_serviceDovecot.inc:81
+msgid "Use argonaut to create the user mailbox on the Dovecot server"
+msgstr ""
+
+#: personal/mail/mail-methods/class_mail-methods-dovecot.inc:47
+msgid "There are no IMAP compatible mail servers defined!"
+msgstr ""
+
+#: personal/mail/mail-methods/class_mail-methods-dovecot.inc:52
+msgid "Mail server for this account is invalid!"
+msgstr ""
+
+#: personal/mail/mail-methods/class_mail-methods-dovecot.inc:189
+#, php-format
+msgid "Error while trying to contact Dovecot server through Argonaut: %s"
+msgstr ""
diff --git a/dovecot/locale/en/fusiondirectory.po b/dovecot/locale/en/fusiondirectory.po
index 987edd4ed0984d0967284f81b3359623c0d32528..ec2312bb14968339987a11f8b6a4b4a69a44e6c6 100644
--- a/dovecot/locale/en/fusiondirectory.po
+++ b/dovecot/locale/en/fusiondirectory.po
@@ -6,13 +6,13 @@
 #, fuzzy
 msgid ""
 msgstr ""
-"Project-Id-Version: PACKAGE VERSION\n"
-"Report-Msgid-Bugs-To: documentation@lists.fusiondirectory.org\n"
-"POT-Creation-Date: 2015-03-31 11:49+0200\n"
+"Project-Id-Version: FusionDirectory VERSION\n"
+"Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
+"POT-Creation-Date: 2015-05-30 15:30+0200\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
-"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
-"Language-Team: LANGUAGE <LL@li.org>\n"
-"Language: \n"
+"Last-Translator: FusionDirectory project <contact@fusiondirectory.org>\n"
+"Language-Team: English\n"
+"Language: en\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
diff --git a/dovecot/locale/es/fusiondirectory.po b/dovecot/locale/es/fusiondirectory.po
index acd1b96d8bb2528d40dd6d3998da56b5af1ca5b7..6ac260a578062030717f1241a9d474a20a0fe832 100644
--- a/dovecot/locale/es/fusiondirectory.po
+++ b/dovecot/locale/es/fusiondirectory.po
@@ -5,12 +5,12 @@
 # Translators:
 msgid ""
 msgstr ""
-"Project-Id-Version: FusionDirectory-108\n"
+"Project-Id-Version: FusionDirectory-109\n"
 "Report-Msgid-Bugs-To: documentation@lists.fusiondirectory.org\n"
-"POT-Creation-Date: 2015-03-19 21:45+0100\n"
-"PO-Revision-Date: 2015-02-25 16:12+0000\n"
-"Last-Translator: fusiondirectory <contact@fusiondirectory.org>\n"
-"Language-Team: Spanish (http://www.transifex.com/projects/p/FusionDirectory-108/language/es/)\n"
+"POT-Creation-Date: 2014-12-15 17:47+0100\n"
+"PO-Revision-Date: 2014-08-28 10:28+0000\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: Spanish (http://www.transifex.com/projects/p/FusionDirectory-109/language/es/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
diff --git a/dovecot/locale/es_VE/fusiondirectory.po b/dovecot/locale/es_VE/fusiondirectory.po
index becafa6e9d14b4faada4157f6c1cb91ea1c7bd18..ec50774e1f587e0b14a9aca3d74acebdadad1a17 100644
--- a/dovecot/locale/es_VE/fusiondirectory.po
+++ b/dovecot/locale/es_VE/fusiondirectory.po
@@ -5,12 +5,12 @@
 # Translators:
 msgid ""
 msgstr ""
-"Project-Id-Version: FusionDirectory-108\n"
+"Project-Id-Version: FusionDirectory-109\n"
 "Report-Msgid-Bugs-To: documentation@lists.fusiondirectory.org\n"
-"POT-Creation-Date: 2015-03-19 21:45+0100\n"
-"PO-Revision-Date: 2015-02-25 16:12+0000\n"
-"Last-Translator: fusiondirectory <contact@fusiondirectory.org>\n"
-"Language-Team: Spanish (Venezuela) (http://www.transifex.com/projects/p/FusionDirectory-108/language/es_VE/)\n"
+"POT-Creation-Date: 2014-12-15 17:47+0100\n"
+"PO-Revision-Date: 2014-08-28 10:28+0000\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: Spanish (Venezuela) (http://www.transifex.com/projects/p/FusionDirectory-109/language/es_VE/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
diff --git a/dovecot/locale/fa_IR/fusiondirectory.po b/dovecot/locale/fa_IR/fusiondirectory.po
index b486098ab0872cf711f039825d37fee9f8cbf013..30f094ccea002685ad227f84da6be04d5c8b1f60 100644
--- a/dovecot/locale/fa_IR/fusiondirectory.po
+++ b/dovecot/locale/fa_IR/fusiondirectory.po
@@ -5,12 +5,12 @@
 # Translators:
 msgid ""
 msgstr ""
-"Project-Id-Version: FusionDirectory-108\n"
+"Project-Id-Version: FusionDirectory-109\n"
 "Report-Msgid-Bugs-To: documentation@lists.fusiondirectory.org\n"
-"POT-Creation-Date: 2015-03-19 21:45+0100\n"
-"PO-Revision-Date: 2014-08-26 14:14+0000\n"
-"Last-Translator: fusiondirectory <contact@fusiondirectory.org>\n"
-"Language-Team: Persian (Iran) (http://www.transifex.com/projects/p/FusionDirectory-108/language/fa_IR/)\n"
+"POT-Creation-Date: 2014-12-15 17:47+0100\n"
+"PO-Revision-Date: 2014-08-28 10:28+0000\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: Persian (Iran) (http://www.transifex.com/projects/p/FusionDirectory-109/language/fa_IR/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
diff --git a/dovecot/locale/fr/fusiondirectory.po b/dovecot/locale/fr/fusiondirectory.po
index a3fa7933b0afe6e19ce5b90de8c28fe6681772dd..c1cd04f70dfda9166421e185548e2181f1a0da96 100644
--- a/dovecot/locale/fr/fusiondirectory.po
+++ b/dovecot/locale/fr/fusiondirectory.po
@@ -3,16 +3,14 @@
 # This file is distributed under the same license as the PACKAGE package.
 # 
 # Translators:
-# MCMic, 2014
-# MCMic, 2014
 msgid ""
 msgstr ""
-"Project-Id-Version: FusionDirectory-108\n"
+"Project-Id-Version: FusionDirectory-109\n"
 "Report-Msgid-Bugs-To: documentation@lists.fusiondirectory.org\n"
-"POT-Creation-Date: 2015-03-19 21:45+0100\n"
-"PO-Revision-Date: 2015-02-25 16:12+0000\n"
-"Last-Translator: MCMic\n"
-"Language-Team: French (http://www.transifex.com/projects/p/FusionDirectory-108/language/fr/)\n"
+"POT-Creation-Date: 2014-12-15 17:47+0100\n"
+"PO-Revision-Date: 2015-02-25 16:13+0000\n"
+"Last-Translator: fusiondirectory <contact@fusiondirectory.org>\n"
+"Language-Team: French (http://www.transifex.com/projects/p/FusionDirectory-109/language/fr/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -26,7 +24,7 @@ msgstr "Dovecot (IMAP/POP3)"
 
 #: admin/systems/services/dovecot/class_serviceDovecot.inc:29
 msgid "Services"
-msgstr "Services"
+msgstr "Service"
 
 #: admin/systems/services/dovecot/class_serviceDovecot.inc:43
 msgid "Dovecot connexion"
@@ -38,7 +36,7 @@ msgstr "URL de connexion au serveur Dovecot"
 
 #: admin/systems/services/dovecot/class_serviceDovecot.inc:49
 msgid "Hostname"
-msgstr "Nom dâ€™hÃ´te"
+msgstr "Nom de l'hÃ´te"
 
 #: admin/systems/services/dovecot/class_serviceDovecot.inc:49
 msgid "Hostname of the Dovecot server"
@@ -66,19 +64,19 @@ msgstr "Valider les certificats"
 
 #: admin/systems/services/dovecot/class_serviceDovecot.inc:52
 msgid "Weither or not to validate server certificate on connexion"
-msgstr "Sâ€™il faut ou non valider le certificat du serveur Ã  la connexion"
+msgstr "Valider ou ne pas valider le certificat du serveur Ã  la connexion"
 
 #: admin/systems/services/dovecot/class_serviceDovecot.inc:60
 msgid "Master credentials"
-msgstr "Compte Master"
+msgstr "Mot de passe du compte Master"
 
 #: admin/systems/services/dovecot/class_serviceDovecot.inc:63
 msgid "Admin user"
-msgstr "Login administrateur"
+msgstr "Administrateur"
 
 #: admin/systems/services/dovecot/class_serviceDovecot.inc:63
 msgid "Dovecot server admin user"
-msgstr "Utilisateur administrateur du serveur Dovecot"
+msgstr "Administrateur du serveur Dovecot"
 
 #: admin/systems/services/dovecot/class_serviceDovecot.inc:67
 msgid "Password"
@@ -86,15 +84,15 @@ msgstr "Mot de passe"
 
 #: admin/systems/services/dovecot/class_serviceDovecot.inc:67
 msgid "Admin user password"
-msgstr "Mot de passe du compte administrateur"
+msgstr "Mot de passe utilisateur Administrateur"
 
 #: admin/systems/services/dovecot/class_serviceDovecot.inc:71
 msgid "Mail directory"
-msgstr "RÃ©pertoire des courriels"
+msgstr "RÃ©pertoire du mail"
 
 #: admin/systems/services/dovecot/class_serviceDovecot.inc:71
 msgid "Path to the directory in which user maildirs must be created"
-msgstr "Chemin vers le rÃ©pertoire contenant les boites de courriel"
+msgstr "Chemin vers le rÃ©pertoire contenant les boites de messagerie"
 
 #: admin/systems/services/dovecot/class_serviceDovecot.inc:78
 msgid "Options"
@@ -102,21 +100,21 @@ msgstr "Options"
 
 #: admin/systems/services/dovecot/class_serviceDovecot.inc:81
 msgid "Create the user folder throught Argonaut"
-msgstr "CrÃ©er le rÃ©pertoire utilisateur via Argonaut"
+msgstr "CrÃ©er le rÃ©pertoire grÃ¢ce Ã  Argonaut"
 
 #: admin/systems/services/dovecot/class_serviceDovecot.inc:81
 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"
+msgstr "Utiliser Argonaut pour crÃ©er la boite email sur le serveur Dovecot"
 
 #: personal/mail/mail-methods/class_mail-methods-dovecot.inc:47
 msgid "There are no IMAP compatible mail servers defined!"
-msgstr "Il n'y a aucun serveur IMAP compatible dÃ©finiâ€¯!"
+msgstr "Il n'y a aucun serveur IMAP compatibles dÃ©finis !"
 
 #: personal/mail/mail-methods/class_mail-methods-dovecot.inc:52
 msgid "Mail server for this account is invalid!"
-msgstr "Le serveur de courriel pour ce compte est invalideâ€¯!"
+msgstr "Le serveur de messagerie pour ce compte est non valide !"
 
 #: personal/mail/mail-methods/class_mail-methods-dovecot.inc:189
 #, 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"
+msgstr "Erreur lors de la connexion au serveur Dovecot grÃ¢ce Ã  Argonaut: %s"
diff --git a/dovecot/locale/id/fusiondirectory.po b/dovecot/locale/id/fusiondirectory.po
index e1cd381158f80774a288e0e7a70810523869e668..35b37ae286f1e7cd83f0b981cb961816dbf50e65 100644
--- a/dovecot/locale/id/fusiondirectory.po
+++ b/dovecot/locale/id/fusiondirectory.po
@@ -5,12 +5,12 @@
 # Translators:
 msgid ""
 msgstr ""
-"Project-Id-Version: FusionDirectory-108\n"
+"Project-Id-Version: FusionDirectory-109\n"
 "Report-Msgid-Bugs-To: documentation@lists.fusiondirectory.org\n"
-"POT-Creation-Date: 2015-03-19 21:45+0100\n"
-"PO-Revision-Date: 2014-08-26 14:14+0000\n"
-"Last-Translator: fusiondirectory <contact@fusiondirectory.org>\n"
-"Language-Team: Indonesian (http://www.transifex.com/projects/p/FusionDirectory-108/language/id/)\n"
+"POT-Creation-Date: 2014-12-15 17:47+0100\n"
+"PO-Revision-Date: 2014-08-28 10:28+0000\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: Indonesian (http://www.transifex.com/projects/p/FusionDirectory-109/language/id/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
diff --git a/dovecot/locale/it/fusiondirectory.po b/dovecot/locale/it/fusiondirectory.po
index ac7c64b491a23ed36e50f993518fd5dc19d54053..0878d9d9be467d436dd3261a7a492fae2ea0fabc 100644
--- a/dovecot/locale/it/fusiondirectory.po
+++ b/dovecot/locale/it/fusiondirectory.po
@@ -5,12 +5,12 @@
 # Translators:
 msgid ""
 msgstr ""
-"Project-Id-Version: FusionDirectory-108\n"
+"Project-Id-Version: FusionDirectory-109\n"
 "Report-Msgid-Bugs-To: documentation@lists.fusiondirectory.org\n"
-"POT-Creation-Date: 2015-03-19 21:45+0100\n"
-"PO-Revision-Date: 2015-02-25 16:12+0000\n"
-"Last-Translator: fusiondirectory <contact@fusiondirectory.org>\n"
-"Language-Team: Italian (http://www.transifex.com/projects/p/FusionDirectory-108/language/it/)\n"
+"POT-Creation-Date: 2014-12-15 17:47+0100\n"
+"PO-Revision-Date: 2014-08-28 10:28+0000\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: Italian (http://www.transifex.com/projects/p/FusionDirectory-109/language/it/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
diff --git a/dovecot/locale/lv/fusiondirectory.po b/dovecot/locale/lv/fusiondirectory.po
index 94809bf783f2f31e843f7878320476ec1b866e1d..9808a2fa4e14bfb3b78e526dcf1af0eeb2f1b56c 100644
--- a/dovecot/locale/lv/fusiondirectory.po
+++ b/dovecot/locale/lv/fusiondirectory.po
@@ -5,12 +5,12 @@
 # Translators:
 msgid ""
 msgstr ""
-"Project-Id-Version: FusionDirectory-108\n"
+"Project-Id-Version: FusionDirectory-109\n"
 "Report-Msgid-Bugs-To: documentation@lists.fusiondirectory.org\n"
-"POT-Creation-Date: 2015-03-19 21:45+0100\n"
-"PO-Revision-Date: 2014-08-26 14:14+0000\n"
-"Last-Translator: fusiondirectory <contact@fusiondirectory.org>\n"
-"Language-Team: Latvian (http://www.transifex.com/projects/p/FusionDirectory-108/language/lv/)\n"
+"POT-Creation-Date: 2014-12-15 17:47+0100\n"
+"PO-Revision-Date: 2014-08-28 10:28+0000\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: Latvian (http://www.transifex.com/projects/p/FusionDirectory-109/language/lv/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
diff --git a/dovecot/locale/nb/fusiondirectory.po b/dovecot/locale/nb/fusiondirectory.po
index ddb32be37f50856bf89c37780ea8a762cc0d2aee..707dcd9958fa805c9c613de73234bb0b1c155689 100644
--- a/dovecot/locale/nb/fusiondirectory.po
+++ b/dovecot/locale/nb/fusiondirectory.po
@@ -5,12 +5,12 @@
 # Translators:
 msgid ""
 msgstr ""
-"Project-Id-Version: FusionDirectory-108\n"
+"Project-Id-Version: FusionDirectory-109\n"
 "Report-Msgid-Bugs-To: documentation@lists.fusiondirectory.org\n"
-"POT-Creation-Date: 2015-03-19 21:45+0100\n"
-"PO-Revision-Date: 2014-08-26 14:14+0000\n"
-"Last-Translator: fusiondirectory <contact@fusiondirectory.org>\n"
-"Language-Team: Norwegian BokmÃ¥l (http://www.transifex.com/projects/p/FusionDirectory-108/language/nb/)\n"
+"POT-Creation-Date: 2014-12-15 17:47+0100\n"
+"PO-Revision-Date: 2014-08-28 10:28+0000\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: Norwegian BokmÃ¥l (http://www.transifex.com/projects/p/FusionDirectory-109/language/nb/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
diff --git a/dovecot/locale/nl/fusiondirectory.po b/dovecot/locale/nl/fusiondirectory.po
index e3af7a028fe93e7c3ee70fd2e529d74f5978b33e..880578668e74e43492102b51343a5eba4d3e5dc9 100644
--- a/dovecot/locale/nl/fusiondirectory.po
+++ b/dovecot/locale/nl/fusiondirectory.po
@@ -5,12 +5,12 @@
 # Translators:
 msgid ""
 msgstr ""
-"Project-Id-Version: FusionDirectory-108\n"
+"Project-Id-Version: FusionDirectory-109\n"
 "Report-Msgid-Bugs-To: documentation@lists.fusiondirectory.org\n"
-"POT-Creation-Date: 2015-03-19 21:45+0100\n"
-"PO-Revision-Date: 2015-02-25 16:12+0000\n"
-"Last-Translator: fusiondirectory <contact@fusiondirectory.org>\n"
-"Language-Team: Dutch (http://www.transifex.com/projects/p/FusionDirectory-108/language/nl/)\n"
+"POT-Creation-Date: 2014-12-15 17:47+0100\n"
+"PO-Revision-Date: 2014-08-28 10:28+0000\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: Dutch (http://www.transifex.com/projects/p/FusionDirectory-109/language/nl/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
diff --git a/dovecot/locale/pl/fusiondirectory.po b/dovecot/locale/pl/fusiondirectory.po
index 3750ef32f94d3c1c41d4f1ee11f03619f3674641..f0e83baf82e2f1c969f15c92ca9f098a13987c2f 100644
--- a/dovecot/locale/pl/fusiondirectory.po
+++ b/dovecot/locale/pl/fusiondirectory.po
@@ -5,12 +5,12 @@
 # Translators:
 msgid ""
 msgstr ""
-"Project-Id-Version: FusionDirectory-108\n"
+"Project-Id-Version: FusionDirectory-109\n"
 "Report-Msgid-Bugs-To: documentation@lists.fusiondirectory.org\n"
-"POT-Creation-Date: 2015-03-19 21:45+0100\n"
-"PO-Revision-Date: 2015-02-25 16:12+0000\n"
-"Last-Translator: fusiondirectory <contact@fusiondirectory.org>\n"
-"Language-Team: Polish (http://www.transifex.com/projects/p/FusionDirectory-108/language/pl/)\n"
+"POT-Creation-Date: 2014-12-15 17:47+0100\n"
+"PO-Revision-Date: 2014-08-28 10:28+0000\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: Polish (http://www.transifex.com/projects/p/FusionDirectory-109/language/pl/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
diff --git a/dovecot/locale/pt/fusiondirectory.po b/dovecot/locale/pt/fusiondirectory.po
index 29cc187ed81bf9b5e94d26c0267a2350cb2df7f7..726e504cff94277fad500d4ab9c0550462a76668 100644
--- a/dovecot/locale/pt/fusiondirectory.po
+++ b/dovecot/locale/pt/fusiondirectory.po
@@ -5,12 +5,12 @@
 # Translators:
 msgid ""
 msgstr ""
-"Project-Id-Version: FusionDirectory-108\n"
+"Project-Id-Version: FusionDirectory-109\n"
 "Report-Msgid-Bugs-To: documentation@lists.fusiondirectory.org\n"
-"POT-Creation-Date: 2015-03-19 21:45+0100\n"
-"PO-Revision-Date: 2014-08-28 10:50+0000\n"
-"Last-Translator: fusiondirectory <contact@fusiondirectory.org>\n"
-"Language-Team: Portuguese (http://www.transifex.com/projects/p/FusionDirectory-108/language/pt/)\n"
+"POT-Creation-Date: 2014-12-15 17:47+0100\n"
+"PO-Revision-Date: 2014-08-28 10:28+0000\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: Portuguese (http://www.transifex.com/projects/p/FusionDirectory-109/language/pt/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
diff --git a/dovecot/locale/pt_BR/fusiondirectory.po b/dovecot/locale/pt_BR/fusiondirectory.po
index 896bdbc6a0ea83a03f43cd0ca5faf3a4a2011fae..1afae2ce400d7cef349875f6fcb1a91d4d360fea 100644
--- a/dovecot/locale/pt_BR/fusiondirectory.po
+++ b/dovecot/locale/pt_BR/fusiondirectory.po
@@ -5,12 +5,12 @@
 # Translators:
 msgid ""
 msgstr ""
-"Project-Id-Version: FusionDirectory-108\n"
+"Project-Id-Version: FusionDirectory-109\n"
 "Report-Msgid-Bugs-To: documentation@lists.fusiondirectory.org\n"
-"POT-Creation-Date: 2015-03-19 21:45+0100\n"
-"PO-Revision-Date: 2015-02-25 16:12+0000\n"
-"Last-Translator: fusiondirectory <contact@fusiondirectory.org>\n"
-"Language-Team: Portuguese (Brazil) (http://www.transifex.com/projects/p/FusionDirectory-108/language/pt_BR/)\n"
+"POT-Creation-Date: 2014-12-15 17:47+0100\n"
+"PO-Revision-Date: 2014-08-28 10:28+0000\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: Portuguese (Brazil) (http://www.transifex.com/projects/p/FusionDirectory-109/language/pt_BR/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
diff --git a/dovecot/locale/ru/fusiondirectory.po b/dovecot/locale/ru/fusiondirectory.po
index c186a0c92b257479a536aad740320f3444e9c379..bc35fb45900c19bc49d79102868100b4fff06e0a 100644
--- a/dovecot/locale/ru/fusiondirectory.po
+++ b/dovecot/locale/ru/fusiondirectory.po
@@ -5,17 +5,17 @@
 # Translators:
 msgid ""
 msgstr ""
-"Project-Id-Version: FusionDirectory-108\n"
+"Project-Id-Version: FusionDirectory-109\n"
 "Report-Msgid-Bugs-To: documentation@lists.fusiondirectory.org\n"
-"POT-Creation-Date: 2015-03-19 21:45+0100\n"
-"PO-Revision-Date: 2015-02-25 16:12+0000\n"
-"Last-Translator: fusiondirectory <contact@fusiondirectory.org>\n"
-"Language-Team: Russian (http://www.transifex.com/projects/p/FusionDirectory-108/language/ru/)\n"
+"POT-Creation-Date: 2014-12-15 17:47+0100\n"
+"PO-Revision-Date: 2014-08-28 10:28+0000\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: Russian (http://www.transifex.com/projects/p/FusionDirectory-109/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=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);\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/dovecot/class_serviceDovecot.inc:28
 #: admin/systems/services/dovecot/class_serviceDovecot.inc:29
@@ -52,7 +52,7 @@ msgstr ""
 
 #: admin/systems/services/dovecot/class_serviceDovecot.inc:51
 msgid "Option"
-msgstr ""
+msgstr "ÐžÐ¿Ñ†Ð¸Ð¸"
 
 #: admin/systems/services/dovecot/class_serviceDovecot.inc:51
 msgid "Options for contacting Dovecot server"
diff --git a/dovecot/locale/ru@petr1708/fusiondirectory.po b/dovecot/locale/ru@petr1708/fusiondirectory.po
index c04df531e2221fcc23647731326174cc1cfef6bc..19c0a0f8d8340dc58769cc0725fe3858e546ca58 100644
--- a/dovecot/locale/ru@petr1708/fusiondirectory.po
+++ b/dovecot/locale/ru@petr1708/fusiondirectory.po
@@ -5,17 +5,17 @@
 # Translators:
 msgid ""
 msgstr ""
-"Project-Id-Version: FusionDirectory-108\n"
+"Project-Id-Version: FusionDirectory-109\n"
 "Report-Msgid-Bugs-To: documentation@lists.fusiondirectory.org\n"
-"POT-Creation-Date: 2015-03-19 21:45+0100\n"
-"PO-Revision-Date: 2014-08-26 14:14+0000\n"
-"Last-Translator: fusiondirectory <contact@fusiondirectory.org>\n"
-"Language-Team: Russian Petrine orthography (http://www.transifex.com/projects/p/FusionDirectory-108/language/ru@petr1708/)\n"
+"POT-Creation-Date: 2014-12-15 17:47+0100\n"
+"PO-Revision-Date: 2014-08-28 10:28+0000\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: Russian Petrine orthography (http://www.transifex.com/projects/p/FusionDirectory-109/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=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);\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/dovecot/class_serviceDovecot.inc:28
 #: admin/systems/services/dovecot/class_serviceDovecot.inc:29
diff --git a/dovecot/locale/sv/fusiondirectory.po b/dovecot/locale/sv/fusiondirectory.po
index f10470cbc4ff700dad733842c7fbf9798c810fbe..e549e4a3b4ff084d60a478ad975b524017bd22bc 100644
--- a/dovecot/locale/sv/fusiondirectory.po
+++ b/dovecot/locale/sv/fusiondirectory.po
@@ -5,12 +5,12 @@
 # Translators:
 msgid ""
 msgstr ""
-"Project-Id-Version: FusionDirectory-108\n"
+"Project-Id-Version: FusionDirectory-109\n"
 "Report-Msgid-Bugs-To: documentation@lists.fusiondirectory.org\n"
-"POT-Creation-Date: 2015-03-19 21:45+0100\n"
-"PO-Revision-Date: 2015-02-25 16:12+0000\n"
-"Last-Translator: fusiondirectory <contact@fusiondirectory.org>\n"
-"Language-Team: Swedish (http://www.transifex.com/projects/p/FusionDirectory-108/language/sv/)\n"
+"POT-Creation-Date: 2014-12-15 17:47+0100\n"
+"PO-Revision-Date: 2014-08-28 10:28+0000\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: Swedish (http://www.transifex.com/projects/p/FusionDirectory-109/language/sv/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
diff --git a/dovecot/locale/ug/fusiondirectory.po b/dovecot/locale/ug/fusiondirectory.po
index 5b3449da43b58bbaedb0ee2b4b19e8f3353465f3..647f88190a63e486884479703c3b15f5d24034e8 100644
--- a/dovecot/locale/ug/fusiondirectory.po
+++ b/dovecot/locale/ug/fusiondirectory.po
@@ -5,12 +5,12 @@
 # Translators:
 msgid ""
 msgstr ""
-"Project-Id-Version: FusionDirectory-108\n"
+"Project-Id-Version: FusionDirectory-109\n"
 "Report-Msgid-Bugs-To: documentation@lists.fusiondirectory.org\n"
-"POT-Creation-Date: 2015-03-19 21:45+0100\n"
-"PO-Revision-Date: 2014-08-26 14:14+0000\n"
-"Last-Translator: fusiondirectory <contact@fusiondirectory.org>\n"
-"Language-Team: Uighur (http://www.transifex.com/projects/p/FusionDirectory-108/language/ug/)\n"
+"POT-Creation-Date: 2014-12-15 17:47+0100\n"
+"PO-Revision-Date: 2014-08-28 10:28+0000\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: Uighur (http://www.transifex.com/projects/p/FusionDirectory-109/language/ug/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
diff --git a/dovecot/locale/vi_VN/fusiondirectory.po b/dovecot/locale/vi_VN/fusiondirectory.po
index 77bb486d2359fca944195644e7ae48b4bb91e873..ab831c47f8f077dcc1bef17ba8845f7667eea26c 100644
--- a/dovecot/locale/vi_VN/fusiondirectory.po
+++ b/dovecot/locale/vi_VN/fusiondirectory.po
@@ -5,12 +5,12 @@
 # Translators:
 msgid ""
 msgstr ""
-"Project-Id-Version: FusionDirectory-108\n"
+"Project-Id-Version: FusionDirectory-109\n"
 "Report-Msgid-Bugs-To: documentation@lists.fusiondirectory.org\n"
-"POT-Creation-Date: 2015-03-19 21:45+0100\n"
-"PO-Revision-Date: 2014-08-28 10:50+0000\n"
-"Last-Translator: fusiondirectory <contact@fusiondirectory.org>\n"
-"Language-Team: Vietnamese (Viet Nam) (http://www.transifex.com/projects/p/FusionDirectory-108/language/vi_VN/)\n"
+"POT-Creation-Date: 2014-12-15 17:47+0100\n"
+"PO-Revision-Date: 2014-08-28 10:28+0000\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: Vietnamese (Viet Nam) (http://www.transifex.com/projects/p/FusionDirectory-109/language/vi_VN/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
diff --git a/dovecot/locale/zh/fusiondirectory.po b/dovecot/locale/zh/fusiondirectory.po
index 2077e3acba05124976137c8ed4e8fcc11a8e62b0..47e0c55b1b5bec2e03cc0db443f146ac2877facd 100644
--- a/dovecot/locale/zh/fusiondirectory.po
+++ b/dovecot/locale/zh/fusiondirectory.po
@@ -5,12 +5,12 @@
 # Translators:
 msgid ""
 msgstr ""
-"Project-Id-Version: FusionDirectory-108\n"
+"Project-Id-Version: FusionDirectory-109\n"
 "Report-Msgid-Bugs-To: documentation@lists.fusiondirectory.org\n"
-"POT-Creation-Date: 2015-03-19 21:45+0100\n"
-"PO-Revision-Date: 2015-02-25 16:12+0000\n"
-"Last-Translator: fusiondirectory <contact@fusiondirectory.org>\n"
-"Language-Team: Chinese (http://www.transifex.com/projects/p/FusionDirectory-108/language/zh/)\n"
+"POT-Creation-Date: 2014-12-15 17:47+0100\n"
+"PO-Revision-Date: 2014-08-28 10:28+0000\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: Chinese (http://www.transifex.com/projects/p/FusionDirectory-109/language/zh/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
diff --git a/dsa/locale/ar/fusiondirectory.po b/dsa/locale/ar/fusiondirectory.po
index aa933c0fbac457e0ff8278869b1727fa0a66cd16..4629f1e64a204bb651bf5546842635a30a6fb656 100644
--- a/dsa/locale/ar/fusiondirectory.po
+++ b/dsa/locale/ar/fusiondirectory.po
@@ -5,12 +5,12 @@
 # Translators:
 msgid ""
 msgstr ""
-"Project-Id-Version: FusionDirectory-108\n"
+"Project-Id-Version: FusionDirectory-109\n"
 "Report-Msgid-Bugs-To: documentation@lists.fusiondirectory.org\n"
-"POT-Creation-Date: 2015-03-19 21:45+0100\n"
-"PO-Revision-Date: 2014-12-16 21:01+0000\n"
+"POT-Creation-Date: 2014-12-15 17:47+0100\n"
+"PO-Revision-Date: 2014-12-15 16:53+0000\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>\n"
-"Language-Team: Arabic (http://www.transifex.com/projects/p/FusionDirectory-108/language/ar/)\n"
+"Language-Team: Arabic (http://www.transifex.com/projects/p/FusionDirectory-109/language/ar/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
diff --git a/dsa/locale/ca/fusiondirectory.po b/dsa/locale/ca/fusiondirectory.po
index 74eeb83e79ac2e3e7da45c66dec4b3756f6e9e3a..0dd81dce7049baf980fa7ddd6e2c0e92fb58b02d 100644
--- a/dsa/locale/ca/fusiondirectory.po
+++ b/dsa/locale/ca/fusiondirectory.po
@@ -5,12 +5,12 @@
 # Translators:
 msgid ""
 msgstr ""
-"Project-Id-Version: FusionDirectory-108\n"
+"Project-Id-Version: FusionDirectory-109\n"
 "Report-Msgid-Bugs-To: documentation@lists.fusiondirectory.org\n"
-"POT-Creation-Date: 2015-03-19 21:45+0100\n"
-"PO-Revision-Date: 2014-12-16 21:01+0000\n"
+"POT-Creation-Date: 2014-12-15 17:47+0100\n"
+"PO-Revision-Date: 2014-12-15 16:53+0000\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>\n"
-"Language-Team: Catalan (http://www.transifex.com/projects/p/FusionDirectory-108/language/ca/)\n"
+"Language-Team: Catalan (http://www.transifex.com/projects/p/FusionDirectory-109/language/ca/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
diff --git a/dsa/locale/cs_CZ/fusiondirectory.po b/dsa/locale/cs_CZ/fusiondirectory.po
index 7048c529478be54d59cd198ab8ec2c79406c13a1..499b995b1ab5545ec02a8e3e0fb606d175ab941a 100644
--- a/dsa/locale/cs_CZ/fusiondirectory.po
+++ b/dsa/locale/cs_CZ/fusiondirectory.po
@@ -3,14 +3,15 @@
 # This file is distributed under the same license as the PACKAGE package.
 # 
 # Translators:
+# Pavel Borecki <pavel.borecki@gmail.com>, 2014-2015
 msgid ""
 msgstr ""
-"Project-Id-Version: FusionDirectory-108\n"
+"Project-Id-Version: FusionDirectory-109\n"
 "Report-Msgid-Bugs-To: documentation@lists.fusiondirectory.org\n"
-"POT-Creation-Date: 2015-03-19 21:45+0100\n"
-"PO-Revision-Date: 2014-12-16 21:01+0000\n"
-"Last-Translator: fusiondirectory <contact@fusiondirectory.org>\n"
-"Language-Team: Czech (Czech Republic) (http://www.transifex.com/projects/p/FusionDirectory-108/language/cs_CZ/)\n"
+"POT-Creation-Date: 2014-12-15 17:47+0100\n"
+"PO-Revision-Date: 2015-04-04 09:01+0000\n"
+"Last-Translator: Pavel Borecki <pavel.borecki@gmail.com>\n"
+"Language-Team: Czech (Czech Republic) (http://www.transifex.com/projects/p/FusionDirectory-109/language/cs_CZ/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -22,7 +23,7 @@ msgstr ""
 #: admin/dsa/class_simpleSecurityObject.inc:34
 #: admin/dsa/class_simpleSecurityObject.inc:51
 msgid "Simple security object"
-msgstr ""
+msgstr "Objekt jednoduchÃ©ho zabezpeÄenÃ"
 
 #: admin/dsa/class_simpleSecurityObject.inc:55
 msgid "Entry name"
@@ -34,11 +35,11 @@ msgstr "NÃ¡zev ÃºÄtu"
 
 #: admin/dsa/class_simpleSecurityObject.inc:61
 msgid "Change password"
-msgstr "zmÄ›Åˆit heslo"
+msgstr "ZmÄ›nit heslo"
 
 #: admin/dsa/class_simpleSecurityObject.inc:64
 msgid "Password"
-msgstr "heslo"
+msgstr "Heslo"
 
 #: admin/dsa/class_dsaManagement.inc:34 admin/dsa/class_dsaManagement.inc:39
 #: config/dsa/class_dsaConfig.inc:42
@@ -47,20 +48,20 @@ msgstr "DSA"
 
 #: admin/dsa/class_dsaManagement.inc:35
 msgid "DSA management"
-msgstr ""
+msgstr "SprÃ¡va DSA"
 
 #: config/dsa/class_dsaConfig.inc:28
 msgid "DSA configuration"
-msgstr ""
+msgstr "NastavenÃ DSA"
 
 #: config/dsa/class_dsaConfig.inc:29
 msgid "FusionDirectory dsa plugin configuration"
-msgstr ""
+msgstr "NastavenÃ zÃ¡suvnÃ©ho modulu dsa pro FusionDirectory"
 
 #: config/dsa/class_dsaConfig.inc:45
 msgid "DSA RDN"
-msgstr ""
+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 ""
+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 2a12e8ce7d296abeed701ef5601d1a46e8a4f612..39f1e325d2431bc6f81a1fd5ef54a4c7d7bfbebf 100644
--- a/dsa/locale/de/fusiondirectory.po
+++ b/dsa/locale/de/fusiondirectory.po
@@ -3,15 +3,15 @@
 # This file is distributed under the same license as the PACKAGE package.
 # 
 # Translators:
-# Maik Wagner <maikwagner@yahoo.com>, 2013
+# Ettore Atalan <atalanttore@googlemail.com>, 2014
 msgid ""
 msgstr ""
-"Project-Id-Version: FusionDirectory-108\n"
+"Project-Id-Version: FusionDirectory-109\n"
 "Report-Msgid-Bugs-To: documentation@lists.fusiondirectory.org\n"
-"POT-Creation-Date: 2015-03-19 21:45+0100\n"
+"POT-Creation-Date: 2014-12-15 17:47+0100\n"
 "PO-Revision-Date: 2014-12-16 21:21+0000\n"
-"Last-Translator: fusiondirectory <contact@fusiondirectory.org>\n"
-"Language-Team: German (http://www.transifex.com/projects/p/FusionDirectory-108/language/de/)\n"
+"Last-Translator: Ettore Atalan <atalanttore@googlemail.com>\n"
+"Language-Team: German (http://www.transifex.com/projects/p/FusionDirectory-109/language/de/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -48,11 +48,11 @@ msgstr "DSA"
 
 #: admin/dsa/class_dsaManagement.inc:35
 msgid "DSA management"
-msgstr "DSA Verwaltung"
+msgstr "DSA-Verwaltung"
 
 #: config/dsa/class_dsaConfig.inc:28
 msgid "DSA configuration"
-msgstr "DSA Konfiguration"
+msgstr "DSA-Konfiguration"
 
 #: config/dsa/class_dsaConfig.inc:29
 msgid "FusionDirectory dsa plugin configuration"
diff --git a/dsa/locale/el_GR/fusiondirectory.po b/dsa/locale/el_GR/fusiondirectory.po
new file mode 100644
index 0000000000000000000000000000000000000000..a6ce7f1783a0d77e92b31f8b512f8b13ffa1c49c
--- /dev/null
+++ b/dsa/locale/el_GR/fusiondirectory.po
@@ -0,0 +1,66 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR FusionDirectory Project
+# This file is distributed under the same license as the PACKAGE package.
+# 
+# Translators:
+msgid ""
+msgstr ""
+"Project-Id-Version: FusionDirectory-109\n"
+"Report-Msgid-Bugs-To: documentation@lists.fusiondirectory.org\n"
+"POT-Creation-Date: 2014-12-15 17:47+0100\n"
+"PO-Revision-Date: 2015-05-30 11:45+0000\n"
+"Last-Translator: Benoit Mortier <benoit.mortier@opensides.be>\n"
+"Language-Team: Greek (Greece) (http://www.transifex.com/projects/p/FusionDirectory-109/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/dsa/class_simpleSecurityObject.inc:31
+#: admin/dsa/class_simpleSecurityObject.inc:32
+#: admin/dsa/class_simpleSecurityObject.inc:34
+#: admin/dsa/class_simpleSecurityObject.inc:51
+msgid "Simple security object"
+msgstr ""
+
+#: admin/dsa/class_simpleSecurityObject.inc:55
+msgid "Entry name"
+msgstr ""
+
+#: admin/dsa/class_simpleSecurityObject.inc:55
+msgid "Account name"
+msgstr ""
+
+#: admin/dsa/class_simpleSecurityObject.inc:61
+msgid "Change password"
+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/en/fusiondirectory.po b/dsa/locale/en/fusiondirectory.po
index a4a9b7145ea195dc3f9c9ebe8cdfdc0289671dfc..6b5b18a0fde5d9e60946c28306b5a2c2e78dd1bb 100644
--- a/dsa/locale/en/fusiondirectory.po
+++ b/dsa/locale/en/fusiondirectory.po
@@ -6,13 +6,13 @@
 #, fuzzy
 msgid ""
 msgstr ""
-"Project-Id-Version: PACKAGE VERSION\n"
-"Report-Msgid-Bugs-To: documentation@lists.fusiondirectory.org\n"
-"POT-Creation-Date: 2015-03-31 11:49+0200\n"
+"Project-Id-Version: FusionDirectory VERSION\n"
+"Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
+"POT-Creation-Date: 2015-05-30 15:30+0200\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
-"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
-"Language-Team: LANGUAGE <LL@li.org>\n"
-"Language: \n"
+"Last-Translator: FusionDirectory project <contact@fusiondirectory.org>\n"
+"Language-Team: English\n"
+"Language: en\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
diff --git a/dsa/locale/es/fusiondirectory.po b/dsa/locale/es/fusiondirectory.po
index 6c175e3fd0ac1ba812b93275bb3b875731bdf083..9e09b3ef7a262c9b39f19590c210e0833da86c13 100644
--- a/dsa/locale/es/fusiondirectory.po
+++ b/dsa/locale/es/fusiondirectory.po
@@ -5,12 +5,12 @@
 # Translators:
 msgid ""
 msgstr ""
-"Project-Id-Version: FusionDirectory-108\n"
+"Project-Id-Version: FusionDirectory-109\n"
 "Report-Msgid-Bugs-To: documentation@lists.fusiondirectory.org\n"
-"POT-Creation-Date: 2015-03-19 21:45+0100\n"
-"PO-Revision-Date: 2014-12-16 21:01+0000\n"
+"POT-Creation-Date: 2014-12-15 17:47+0100\n"
+"PO-Revision-Date: 2014-12-15 16:53+0000\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>\n"
-"Language-Team: Spanish (http://www.transifex.com/projects/p/FusionDirectory-108/language/es/)\n"
+"Language-Team: Spanish (http://www.transifex.com/projects/p/FusionDirectory-109/language/es/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
diff --git a/dsa/locale/es_VE/fusiondirectory.po b/dsa/locale/es_VE/fusiondirectory.po
index 3701c80257f172eead3b85bdae39fadc2f622eaf..4c16e94e7d15a019a8e5326f096f81d929a3ca9f 100644
--- a/dsa/locale/es_VE/fusiondirectory.po
+++ b/dsa/locale/es_VE/fusiondirectory.po
@@ -5,12 +5,12 @@
 # Translators:
 msgid ""
 msgstr ""
-"Project-Id-Version: FusionDirectory-108\n"
+"Project-Id-Version: FusionDirectory-109\n"
 "Report-Msgid-Bugs-To: documentation@lists.fusiondirectory.org\n"
-"POT-Creation-Date: 2015-03-19 21:45+0100\n"
-"PO-Revision-Date: 2014-12-16 21:01+0000\n"
+"POT-Creation-Date: 2014-12-15 17:47+0100\n"
+"PO-Revision-Date: 2014-12-15 16:53+0000\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>\n"
-"Language-Team: Spanish (Venezuela) (http://www.transifex.com/projects/p/FusionDirectory-108/language/es_VE/)\n"
+"Language-Team: Spanish (Venezuela) (http://www.transifex.com/projects/p/FusionDirectory-109/language/es_VE/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
diff --git a/dsa/locale/fa_IR/fusiondirectory.po b/dsa/locale/fa_IR/fusiondirectory.po
index 20690ccf21cc8efe8ead4b1c2a700ab6457f381f..412a4a2bed1163d9058845a0bb611d8c68017561 100644
--- a/dsa/locale/fa_IR/fusiondirectory.po
+++ b/dsa/locale/fa_IR/fusiondirectory.po
@@ -5,12 +5,12 @@
 # Translators:
 msgid ""
 msgstr ""
-"Project-Id-Version: FusionDirectory-108\n"
+"Project-Id-Version: FusionDirectory-109\n"
 "Report-Msgid-Bugs-To: documentation@lists.fusiondirectory.org\n"
-"POT-Creation-Date: 2015-03-19 21:45+0100\n"
-"PO-Revision-Date: 2014-12-16 21:01+0000\n"
+"POT-Creation-Date: 2014-12-15 17:47+0100\n"
+"PO-Revision-Date: 2014-12-15 16:53+0000\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>\n"
-"Language-Team: Persian (Iran) (http://www.transifex.com/projects/p/FusionDirectory-108/language/fa_IR/)\n"
+"Language-Team: Persian (Iran) (http://www.transifex.com/projects/p/FusionDirectory-109/language/fa_IR/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
diff --git a/dsa/locale/fr/fusiondirectory.po b/dsa/locale/fr/fusiondirectory.po
index ad65b6c36a26decd6cfef0c3704885fce567d1e8..d0c1451a8cb5fcb6b7383c2756e32c6b56937560 100644
--- a/dsa/locale/fr/fusiondirectory.po
+++ b/dsa/locale/fr/fusiondirectory.po
@@ -3,19 +3,14 @@
 # This file is distributed under the same license as the PACKAGE package.
 # 
 # Translators:
-# MCMic, 2014
-# fusiondirectory <contact@fusiondirectory.org>, 2013
-# fusiondirectory <contact@fusiondirectory.org>, 2012
-# fusiondirectory <contact@fusiondirectory.org>, 2012-2013
-# MCMic, 2014
 msgid ""
 msgstr ""
-"Project-Id-Version: FusionDirectory-108\n"
+"Project-Id-Version: FusionDirectory-109\n"
 "Report-Msgid-Bugs-To: documentation@lists.fusiondirectory.org\n"
-"POT-Creation-Date: 2015-03-19 21:45+0100\n"
+"POT-Creation-Date: 2014-12-15 17:47+0100\n"
 "PO-Revision-Date: 2014-12-17 09:30+0000\n"
-"Last-Translator: MCMic\n"
-"Language-Team: French (http://www.transifex.com/projects/p/FusionDirectory-108/language/fr/)\n"
+"Last-Translator: fusiondirectory <contact@fusiondirectory.org>\n"
+"Language-Team: French (http://www.transifex.com/projects/p/FusionDirectory-109/language/fr/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -27,7 +22,7 @@ msgstr ""
 #: admin/dsa/class_simpleSecurityObject.inc:34
 #: admin/dsa/class_simpleSecurityObject.inc:51
 msgid "Simple security object"
-msgstr "Simple objet de sÃ©curitÃ©"
+msgstr "simple objet de sÃ©curitÃ©"
 
 #: admin/dsa/class_simpleSecurityObject.inc:55
 msgid "Entry name"
@@ -52,7 +47,7 @@ msgstr "DSA"
 
 #: admin/dsa/class_dsaManagement.inc:35
 msgid "DSA management"
-msgstr "Gestion DSA"
+msgstr "Gestion des objets de sÃ©curitÃ©"
 
 #: config/dsa/class_dsaConfig.inc:28
 msgid "DSA configuration"
@@ -64,7 +59,7 @@ msgstr "Configuration du plugin dsa"
 
 #: config/dsa/class_dsaConfig.inc:45
 msgid "DSA RDN"
-msgstr "Branche DSA"
+msgstr "DSA RDN"
 
 #: config/dsa/class_dsaConfig.inc:45
 msgid "Branch in which Directory Service Account (dsa) will be stored"
diff --git a/dsa/locale/id/fusiondirectory.po b/dsa/locale/id/fusiondirectory.po
index 178c3e456cb6db00d4a2a6eb8507688b6252eb9a..0067abb9ed9ddca67e97e9b58a439232e4b40003 100644
--- a/dsa/locale/id/fusiondirectory.po
+++ b/dsa/locale/id/fusiondirectory.po
@@ -5,12 +5,12 @@
 # Translators:
 msgid ""
 msgstr ""
-"Project-Id-Version: FusionDirectory-108\n"
+"Project-Id-Version: FusionDirectory-109\n"
 "Report-Msgid-Bugs-To: documentation@lists.fusiondirectory.org\n"
-"POT-Creation-Date: 2015-03-19 21:45+0100\n"
-"PO-Revision-Date: 2014-12-16 21:01+0000\n"
+"POT-Creation-Date: 2014-12-15 17:47+0100\n"
+"PO-Revision-Date: 2014-12-15 16:53+0000\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>\n"
-"Language-Team: Indonesian (http://www.transifex.com/projects/p/FusionDirectory-108/language/id/)\n"
+"Language-Team: Indonesian (http://www.transifex.com/projects/p/FusionDirectory-109/language/id/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
diff --git a/dsa/locale/it/fusiondirectory.po b/dsa/locale/it/fusiondirectory.po
index 08a536468e249183181db17bf1a9ec5521f2e720..0a979cd15713bf0fbacbc5bff8353a265183251e 100644
--- a/dsa/locale/it/fusiondirectory.po
+++ b/dsa/locale/it/fusiondirectory.po
@@ -3,16 +3,14 @@
 # This file is distributed under the same license as the PACKAGE package.
 # 
 # Translators:
-# poterealpopolo <giuliano@opensides.be>, 2013
-# poterealpopolo <giuliano@opensides.be>, 2013
 msgid ""
 msgstr ""
-"Project-Id-Version: FusionDirectory-108\n"
+"Project-Id-Version: FusionDirectory-109\n"
 "Report-Msgid-Bugs-To: documentation@lists.fusiondirectory.org\n"
-"POT-Creation-Date: 2015-03-19 21:45+0100\n"
-"PO-Revision-Date: 2014-12-16 21:01+0000\n"
+"POT-Creation-Date: 2014-12-15 17:47+0100\n"
+"PO-Revision-Date: 2014-12-15 16:53+0000\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>\n"
-"Language-Team: Italian (http://www.transifex.com/projects/p/FusionDirectory-108/language/it/)\n"
+"Language-Team: Italian (http://www.transifex.com/projects/p/FusionDirectory-109/language/it/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -32,7 +30,7 @@ msgstr "nome della voce"
 
 #: admin/dsa/class_simpleSecurityObject.inc:55
 msgid "Account name"
-msgstr "Nome account"
+msgstr "Nome dell'account"
 
 #: admin/dsa/class_simpleSecurityObject.inc:61
 msgid "Change password"
diff --git a/dsa/locale/lv/fusiondirectory.po b/dsa/locale/lv/fusiondirectory.po
index 52cbe0cb878092fcdb0be1d3649f2ed65bcbd2ec..3d7aa1f437ba8acddf0f975752af86940000aea4 100644
--- a/dsa/locale/lv/fusiondirectory.po
+++ b/dsa/locale/lv/fusiondirectory.po
@@ -5,12 +5,12 @@
 # Translators:
 msgid ""
 msgstr ""
-"Project-Id-Version: FusionDirectory-108\n"
+"Project-Id-Version: FusionDirectory-109\n"
 "Report-Msgid-Bugs-To: documentation@lists.fusiondirectory.org\n"
-"POT-Creation-Date: 2015-03-19 21:45+0100\n"
-"PO-Revision-Date: 2014-12-16 21:01+0000\n"
+"POT-Creation-Date: 2014-12-15 17:47+0100\n"
+"PO-Revision-Date: 2014-12-15 16:53+0000\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>\n"
-"Language-Team: Latvian (http://www.transifex.com/projects/p/FusionDirectory-108/language/lv/)\n"
+"Language-Team: Latvian (http://www.transifex.com/projects/p/FusionDirectory-109/language/lv/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
diff --git a/dsa/locale/nb/fusiondirectory.po b/dsa/locale/nb/fusiondirectory.po
index dd0f40893b3ab63cb62b7c7d6bdd88791b50b6ea..ba1990c820b1023616e13759b7a22ec724ffce7c 100644
--- a/dsa/locale/nb/fusiondirectory.po
+++ b/dsa/locale/nb/fusiondirectory.po
@@ -5,12 +5,12 @@
 # Translators:
 msgid ""
 msgstr ""
-"Project-Id-Version: FusionDirectory-108\n"
+"Project-Id-Version: FusionDirectory-109\n"
 "Report-Msgid-Bugs-To: documentation@lists.fusiondirectory.org\n"
-"POT-Creation-Date: 2015-03-19 21:45+0100\n"
-"PO-Revision-Date: 2014-12-16 21:01+0000\n"
+"POT-Creation-Date: 2014-12-15 17:47+0100\n"
+"PO-Revision-Date: 2014-12-15 16:53+0000\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>\n"
-"Language-Team: Norwegian BokmÃ¥l (http://www.transifex.com/projects/p/FusionDirectory-108/language/nb/)\n"
+"Language-Team: Norwegian BokmÃ¥l (http://www.transifex.com/projects/p/FusionDirectory-109/language/nb/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
diff --git a/dsa/locale/nl/fusiondirectory.po b/dsa/locale/nl/fusiondirectory.po
index a21093367dd9e6f7941ef5ce3962acde61d503d1..a6ec62b2b88e001c06f2f89e13cc8eb1e12f1e30 100644
--- a/dsa/locale/nl/fusiondirectory.po
+++ b/dsa/locale/nl/fusiondirectory.po
@@ -3,15 +3,14 @@
 # This file is distributed under the same license as the PACKAGE package.
 # 
 # Translators:
-# Kenny Tordeurs <tordeurskenny@gmail.com>, 2013
 msgid ""
 msgstr ""
-"Project-Id-Version: FusionDirectory-108\n"
+"Project-Id-Version: FusionDirectory-109\n"
 "Report-Msgid-Bugs-To: documentation@lists.fusiondirectory.org\n"
-"POT-Creation-Date: 2015-03-19 21:45+0100\n"
-"PO-Revision-Date: 2014-12-16 21:01+0000\n"
+"POT-Creation-Date: 2014-12-15 17:47+0100\n"
+"PO-Revision-Date: 2014-12-15 16:53+0000\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>\n"
-"Language-Team: Dutch (http://www.transifex.com/projects/p/FusionDirectory-108/language/nl/)\n"
+"Language-Team: Dutch (http://www.transifex.com/projects/p/FusionDirectory-109/language/nl/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
diff --git a/dsa/locale/pl/fusiondirectory.po b/dsa/locale/pl/fusiondirectory.po
index 2848e7d0462c8dc48c4fabd0b5beebead6678609..2eb6846628a8feadbbf6f5f2e686eedd08df9346 100644
--- a/dsa/locale/pl/fusiondirectory.po
+++ b/dsa/locale/pl/fusiondirectory.po
@@ -5,12 +5,12 @@
 # Translators:
 msgid ""
 msgstr ""
-"Project-Id-Version: FusionDirectory-108\n"
+"Project-Id-Version: FusionDirectory-109\n"
 "Report-Msgid-Bugs-To: documentation@lists.fusiondirectory.org\n"
-"POT-Creation-Date: 2015-03-19 21:45+0100\n"
-"PO-Revision-Date: 2014-12-16 21:01+0000\n"
+"POT-Creation-Date: 2014-12-15 17:47+0100\n"
+"PO-Revision-Date: 2014-12-15 16:53+0000\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>\n"
-"Language-Team: Polish (http://www.transifex.com/projects/p/FusionDirectory-108/language/pl/)\n"
+"Language-Team: Polish (http://www.transifex.com/projects/p/FusionDirectory-109/language/pl/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
diff --git a/dsa/locale/pt/fusiondirectory.po b/dsa/locale/pt/fusiondirectory.po
index 93f6d69d835fa4c46e9d566a69601775f23cd145..c1c800c59c9aab481f2c09a66d5ab16ebe2b04cd 100644
--- a/dsa/locale/pt/fusiondirectory.po
+++ b/dsa/locale/pt/fusiondirectory.po
@@ -5,12 +5,12 @@
 # Translators:
 msgid ""
 msgstr ""
-"Project-Id-Version: FusionDirectory-108\n"
+"Project-Id-Version: FusionDirectory-109\n"
 "Report-Msgid-Bugs-To: documentation@lists.fusiondirectory.org\n"
-"POT-Creation-Date: 2015-03-19 21:45+0100\n"
-"PO-Revision-Date: 2014-12-16 21:01+0000\n"
+"POT-Creation-Date: 2014-12-15 17:47+0100\n"
+"PO-Revision-Date: 2014-12-15 16:53+0000\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>\n"
-"Language-Team: Portuguese (http://www.transifex.com/projects/p/FusionDirectory-108/language/pt/)\n"
+"Language-Team: Portuguese (http://www.transifex.com/projects/p/FusionDirectory-109/language/pt/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
diff --git a/dsa/locale/pt_BR/fusiondirectory.po b/dsa/locale/pt_BR/fusiondirectory.po
index f97983ddecf4fd2e8b48da4bc0ac31ff3154b732..eee0e2172b24250a6692787e77e51cf70f4e86ac 100644
--- a/dsa/locale/pt_BR/fusiondirectory.po
+++ b/dsa/locale/pt_BR/fusiondirectory.po
@@ -5,12 +5,12 @@
 # Translators:
 msgid ""
 msgstr ""
-"Project-Id-Version: FusionDirectory-108\n"
+"Project-Id-Version: FusionDirectory-109\n"
 "Report-Msgid-Bugs-To: documentation@lists.fusiondirectory.org\n"
-"POT-Creation-Date: 2015-03-19 21:45+0100\n"
-"PO-Revision-Date: 2014-12-16 21:01+0000\n"
+"POT-Creation-Date: 2014-12-15 17:47+0100\n"
+"PO-Revision-Date: 2014-12-15 16:53+0000\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>\n"
-"Language-Team: Portuguese (Brazil) (http://www.transifex.com/projects/p/FusionDirectory-108/language/pt_BR/)\n"
+"Language-Team: Portuguese (Brazil) (http://www.transifex.com/projects/p/FusionDirectory-109/language/pt_BR/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
diff --git a/dsa/locale/ru/fusiondirectory.po b/dsa/locale/ru/fusiondirectory.po
index faae1cde2d920bfb211b5a1278df7df43bf0f0b2..82e5b5cf06015b6806370940a398f2eec7c2aa7a 100644
--- a/dsa/locale/ru/fusiondirectory.po
+++ b/dsa/locale/ru/fusiondirectory.po
@@ -5,17 +5,17 @@
 # Translators:
 msgid ""
 msgstr ""
-"Project-Id-Version: FusionDirectory-108\n"
+"Project-Id-Version: FusionDirectory-109\n"
 "Report-Msgid-Bugs-To: documentation@lists.fusiondirectory.org\n"
-"POT-Creation-Date: 2015-03-19 21:45+0100\n"
-"PO-Revision-Date: 2014-12-16 21:01+0000\n"
+"POT-Creation-Date: 2014-12-15 17:47+0100\n"
+"PO-Revision-Date: 2014-12-15 16:53+0000\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>\n"
-"Language-Team: Russian (http://www.transifex.com/projects/p/FusionDirectory-108/language/ru/)\n"
+"Language-Team: Russian (http://www.transifex.com/projects/p/FusionDirectory-109/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=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);\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/dsa/class_simpleSecurityObject.inc:31
 #: admin/dsa/class_simpleSecurityObject.inc:32
diff --git a/dsa/locale/ru@petr1708/fusiondirectory.po b/dsa/locale/ru@petr1708/fusiondirectory.po
index 278c074450771e98dd71c408221d4f626077cb70..d9b28d49036bdf9b3fcbd36e5d89c396d0a8f7fa 100644
--- a/dsa/locale/ru@petr1708/fusiondirectory.po
+++ b/dsa/locale/ru@petr1708/fusiondirectory.po
@@ -5,17 +5,17 @@
 # Translators:
 msgid ""
 msgstr ""
-"Project-Id-Version: FusionDirectory-108\n"
+"Project-Id-Version: FusionDirectory-109\n"
 "Report-Msgid-Bugs-To: documentation@lists.fusiondirectory.org\n"
-"POT-Creation-Date: 2015-03-19 21:45+0100\n"
-"PO-Revision-Date: 2014-12-16 21:01+0000\n"
+"POT-Creation-Date: 2014-12-15 17:47+0100\n"
+"PO-Revision-Date: 2014-12-15 16:53+0000\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>\n"
-"Language-Team: Russian Petrine orthography (http://www.transifex.com/projects/p/FusionDirectory-108/language/ru@petr1708/)\n"
+"Language-Team: Russian Petrine orthography (http://www.transifex.com/projects/p/FusionDirectory-109/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=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);\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/dsa/class_simpleSecurityObject.inc:31
 #: admin/dsa/class_simpleSecurityObject.inc:32
diff --git a/dsa/locale/sv/fusiondirectory.po b/dsa/locale/sv/fusiondirectory.po
index 7dde203ca1cd8e696285f6109c72297fcaf37fed..cc0f6ff1249e7b7b82816a69cfac7e2784039d94 100644
--- a/dsa/locale/sv/fusiondirectory.po
+++ b/dsa/locale/sv/fusiondirectory.po
@@ -5,12 +5,12 @@
 # Translators:
 msgid ""
 msgstr ""
-"Project-Id-Version: FusionDirectory-108\n"
+"Project-Id-Version: FusionDirectory-109\n"
 "Report-Msgid-Bugs-To: documentation@lists.fusiondirectory.org\n"
-"POT-Creation-Date: 2015-03-19 21:45+0100\n"
-"PO-Revision-Date: 2014-12-16 21:01+0000\n"
+"POT-Creation-Date: 2014-12-15 17:47+0100\n"
+"PO-Revision-Date: 2014-12-15 16:53+0000\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>\n"
-"Language-Team: Swedish (http://www.transifex.com/projects/p/FusionDirectory-108/language/sv/)\n"
+"Language-Team: Swedish (http://www.transifex.com/projects/p/FusionDirectory-109/language/sv/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
diff --git a/dsa/locale/ug/fusiondirectory.po b/dsa/locale/ug/fusiondirectory.po
index 87a1dd31e06400a6b2df0b8c73c669cbd1dcd74d..0539aff0d4adbf13c28066d095d62e0bb93d7f39 100644
--- a/dsa/locale/ug/fusiondirectory.po
+++ b/dsa/locale/ug/fusiondirectory.po
@@ -5,12 +5,12 @@
 # Translators:
 msgid ""
 msgstr ""
-"Project-Id-Version: FusionDirectory-108\n"
+"Project-Id-Version: FusionDirectory-109\n"
 "Report-Msgid-Bugs-To: documentation@lists.fusiondirectory.org\n"
-"POT-Creation-Date: 2015-03-19 21:45+0100\n"
-"PO-Revision-Date: 2014-12-16 21:01+0000\n"
+"POT-Creation-Date: 2014-12-15 17:47+0100\n"
+"PO-Revision-Date: 2014-12-15 16:53+0000\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>\n"
-"Language-Team: Uighur (http://www.transifex.com/projects/p/FusionDirectory-108/language/ug/)\n"
+"Language-Team: Uighur (http://www.transifex.com/projects/p/FusionDirectory-109/language/ug/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
diff --git a/dsa/locale/vi_VN/fusiondirectory.po b/dsa/locale/vi_VN/fusiondirectory.po
index 59db7bc4804d72d955777d7840c7e8e7e7cde26b..79f5d43887b1e4d49a7c877a8cd0a1a3af7902f1 100644
--- a/dsa/locale/vi_VN/fusiondirectory.po
+++ b/dsa/locale/vi_VN/fusiondirectory.po
@@ -5,12 +5,12 @@
 # Translators:
 msgid ""
 msgstr ""
-"Project-Id-Version: FusionDirectory-108\n"
+"Project-Id-Version: FusionDirectory-109\n"
 "Report-Msgid-Bugs-To: documentation@lists.fusiondirectory.org\n"
-"POT-Creation-Date: 2015-03-19 21:45+0100\n"
-"PO-Revision-Date: 2014-12-16 21:01+0000\n"
+"POT-Creation-Date: 2014-12-15 17:47+0100\n"
+"PO-Revision-Date: 2014-12-15 16:53+0000\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>\n"
-"Language-Team: Vietnamese (Viet Nam) (http://www.transifex.com/projects/p/FusionDirectory-108/language/vi_VN/)\n"
+"Language-Team: Vietnamese (Viet Nam) (http://www.transifex.com/projects/p/FusionDirectory-109/language/vi_VN/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
diff --git a/dsa/locale/zh/fusiondirectory.po b/dsa/locale/zh/fusiondirectory.po
index b6215555904a4d2fe55192b0fd65c4db65898452..0e3bfdee6977b81b6cd7e5e09f554e4642083007 100644
--- a/dsa/locale/zh/fusiondirectory.po
+++ b/dsa/locale/zh/fusiondirectory.po
@@ -5,12 +5,12 @@
 # Translators:
 msgid ""
 msgstr ""
-"Project-Id-Version: FusionDirectory-108\n"
+"Project-Id-Version: FusionDirectory-109\n"
 "Report-Msgid-Bugs-To: documentation@lists.fusiondirectory.org\n"
-"POT-Creation-Date: 2015-03-19 21:45+0100\n"
-"PO-Revision-Date: 2014-12-16 21:01+0000\n"
+"POT-Creation-Date: 2014-12-15 17:47+0100\n"
+"PO-Revision-Date: 2014-12-15 16:53+0000\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>\n"
-"Language-Team: Chinese (http://www.transifex.com/projects/p/FusionDirectory-108/language/zh/)\n"
+"Language-Team: Chinese (http://www.transifex.com/projects/p/FusionDirectory-109/language/zh/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
diff --git a/ejbca/locale/ar/fusiondirectory.po b/ejbca/locale/ar/fusiondirectory.po
index bd7ec30da34db615b32165f38ecfc1eae82eff14..cb326a8e554e74ce65fa86c698152a1c49e1818b 100644
--- a/ejbca/locale/ar/fusiondirectory.po
+++ b/ejbca/locale/ar/fusiondirectory.po
@@ -5,32 +5,32 @@
 # Translators:
 msgid ""
 msgstr ""
-"Project-Id-Version: FusionDirectory-108\n"
+"Project-Id-Version: FusionDirectory-109\n"
 "Report-Msgid-Bugs-To: documentation@lists.fusiondirectory.org\n"
-"POT-Creation-Date: 2015-03-19 21:45+0100\n"
-"PO-Revision-Date: 2014-12-03 16:33+0000\n"
+"POT-Creation-Date: 2014-12-15 17:47+0100\n"
+"PO-Revision-Date: 2014-12-15 16:54+0000\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
-"Language-Team: Arabic (http://www.transifex.com/projects/p/FusionDirectory-108/language/ar/)\n"
+"Language-Team: Arabic (http://www.transifex.com/projects/p/FusionDirectory-109/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/ejbca/certificates/class_ejbcaCertificates.inc:31
+#: admin/ejbca/class_ejbcaCertificates.inc:31
 msgid "EJBCA certs"
 msgstr ""
 
-#: admin/ejbca/certificates/class_ejbcaCertificates.inc:35
+#: admin/ejbca/class_ejbcaCertificates.inc:35
 msgid "Certificates associated to this object"
 msgstr ""
 
-#: admin/ejbca/certificates/class_ejbcaCertificates.inc:46
+#: admin/ejbca/class_ejbcaCertificates.inc:46
 #: admin/ejbca/class_ejbcaManagement.inc:32
 msgid "EJBCA"
 msgstr ""
 
-#: admin/ejbca/certificates/class_ejbcaCertificates.inc:47
+#: admin/ejbca/class_ejbcaCertificates.inc:47
 msgid "Assign EJBCA certificates to a user"
 msgstr ""
 
@@ -38,7 +38,7 @@ msgstr ""
 msgid "EJBCA certificates management"
 msgstr ""
 
-#: admin/ejbca/class_ejbcaManagement.inc:52
+#: admin/ejbca/class_ejbcaManagement.inc:51
 msgid "Download"
 msgstr ""
 
diff --git a/ejbca/locale/ca/fusiondirectory.po b/ejbca/locale/ca/fusiondirectory.po
index b749f444891f142cce57eb1812312e448fb614dd..9a3cbbeee7aa50029da90a20dd191b8d6c858aa9 100644
--- a/ejbca/locale/ca/fusiondirectory.po
+++ b/ejbca/locale/ca/fusiondirectory.po
@@ -5,32 +5,32 @@
 # Translators:
 msgid ""
 msgstr ""
-"Project-Id-Version: FusionDirectory-108\n"
+"Project-Id-Version: FusionDirectory-109\n"
 "Report-Msgid-Bugs-To: documentation@lists.fusiondirectory.org\n"
-"POT-Creation-Date: 2015-03-19 21:45+0100\n"
-"PO-Revision-Date: 2014-12-03 16:33+0000\n"
+"POT-Creation-Date: 2014-12-15 17:47+0100\n"
+"PO-Revision-Date: 2014-12-15 16:54+0000\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
-"Language-Team: Catalan (http://www.transifex.com/projects/p/FusionDirectory-108/language/ca/)\n"
+"Language-Team: Catalan (http://www.transifex.com/projects/p/FusionDirectory-109/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/ejbca/certificates/class_ejbcaCertificates.inc:31
+#: admin/ejbca/class_ejbcaCertificates.inc:31
 msgid "EJBCA certs"
 msgstr ""
 
-#: admin/ejbca/certificates/class_ejbcaCertificates.inc:35
+#: admin/ejbca/class_ejbcaCertificates.inc:35
 msgid "Certificates associated to this object"
 msgstr ""
 
-#: admin/ejbca/certificates/class_ejbcaCertificates.inc:46
+#: admin/ejbca/class_ejbcaCertificates.inc:46
 #: admin/ejbca/class_ejbcaManagement.inc:32
 msgid "EJBCA"
 msgstr ""
 
-#: admin/ejbca/certificates/class_ejbcaCertificates.inc:47
+#: admin/ejbca/class_ejbcaCertificates.inc:47
 msgid "Assign EJBCA certificates to a user"
 msgstr ""
 
@@ -38,7 +38,7 @@ msgstr ""
 msgid "EJBCA certificates management"
 msgstr ""
 
-#: admin/ejbca/class_ejbcaManagement.inc:52
+#: admin/ejbca/class_ejbcaManagement.inc:51
 msgid "Download"
 msgstr ""
 
diff --git a/ejbca/locale/cs_CZ/fusiondirectory.po b/ejbca/locale/cs_CZ/fusiondirectory.po
index c080f16aa10b8d978cb34a60630fe8f852299498..f219e41912d643a9131f15539d3dfded0843b97d 100644
--- a/ejbca/locale/cs_CZ/fusiondirectory.po
+++ b/ejbca/locale/cs_CZ/fusiondirectory.po
@@ -3,59 +3,60 @@
 # This file is distributed under the same license as the PACKAGE package.
 # 
 # Translators:
+# Pavel Borecki <pavel.borecki@gmail.com>, 2015
 msgid ""
 msgstr ""
-"Project-Id-Version: FusionDirectory-108\n"
+"Project-Id-Version: FusionDirectory-109\n"
 "Report-Msgid-Bugs-To: documentation@lists.fusiondirectory.org\n"
-"POT-Creation-Date: 2015-03-19 21:45+0100\n"
-"PO-Revision-Date: 2014-12-03 16:33+0000\n"
-"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
-"Language-Team: Czech (Czech Republic) (http://www.transifex.com/projects/p/FusionDirectory-108/language/cs_CZ/)\n"
+"POT-Creation-Date: 2014-12-15 17:47+0100\n"
+"PO-Revision-Date: 2015-05-29 09:11+0000\n"
+"Last-Translator: Pavel Borecki <pavel.borecki@gmail.com>\n"
+"Language-Team: Czech (Czech Republic) (http://www.transifex.com/projects/p/FusionDirectory-109/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/ejbca/certificates/class_ejbcaCertificates.inc:31
+#: admin/ejbca/class_ejbcaCertificates.inc:31
 msgid "EJBCA certs"
-msgstr ""
+msgstr "CertifikÃ¡ty EJBCA"
 
-#: admin/ejbca/certificates/class_ejbcaCertificates.inc:35
+#: admin/ejbca/class_ejbcaCertificates.inc:35
 msgid "Certificates associated to this object"
-msgstr ""
+msgstr "CertifikÃ¡ty pÅ™iÅ™azenÃ© tomuto objektu"
 
-#: admin/ejbca/certificates/class_ejbcaCertificates.inc:46
+#: admin/ejbca/class_ejbcaCertificates.inc:46
 #: admin/ejbca/class_ejbcaManagement.inc:32
 msgid "EJBCA"
 msgstr ""
 
-#: admin/ejbca/certificates/class_ejbcaCertificates.inc:47
+#: admin/ejbca/class_ejbcaCertificates.inc:47
 msgid "Assign EJBCA certificates to a user"
-msgstr ""
+msgstr "PÅ™iÅ™adit uÅ¾ivateli EJBCA certifikÃ¡ty"
 
 #: admin/ejbca/class_ejbcaManagement.inc:33
 msgid "EJBCA certificates management"
-msgstr ""
+msgstr "SprÃ¡va EJBCA certifikÃ¡tÅ¯"
 
-#: admin/ejbca/class_ejbcaManagement.inc:52
+#: admin/ejbca/class_ejbcaManagement.inc:51
 msgid "Download"
-msgstr "staÅ¾enÃ"
+msgstr "StaÅ¾enÃ"
 
 #: admin/ejbca/class_ejbcaCertificate.inc:30
 #: admin/ejbca/class_ejbcaCertificate.inc:31
 #: admin/ejbca/class_ejbcaCertificate.inc:33
 msgid "EJBCA certificate"
-msgstr ""
+msgstr "EJBCA certifikÃ¡t"
 
 #: admin/ejbca/class_ejbcaCertificate.inc:47
 #: admin/ejbca/class_ejbcaCertificate.inc:55
 msgid "Certificate"
-msgstr ""
+msgstr "CertifikÃ¡t"
 
 #: admin/ejbca/class_ejbcaCertificate.inc:51
 msgid "Name"
-msgstr "nÃ¡zev"
+msgstr "NÃ¡zev"
 
 #: admin/ejbca/class_ejbcaCertificate.inc:51
 msgid "Common name"
@@ -63,24 +64,24 @@ msgstr "bÄ›Å¾nÃ© jmÃ©no (CN)"
 
 #: admin/ejbca/class_ejbcaCertificate.inc:55
 msgid "Certificate content"
-msgstr ""
+msgstr "Obsah certifikÃ¡tu"
 
 #: config/ejbca/class_ejbcaConfig.inc:28
 msgid "EJBCA plugin configuration"
-msgstr ""
+msgstr "NastavenÃ zÃ¡suvnÃ©ho modulu EJBCA"
 
 #: config/ejbca/class_ejbcaConfig.inc:29
 msgid "FusionDirectory ejbca plugin configuration"
-msgstr ""
+msgstr "NastavenÃ zÃ¡suvnÃ©ho modulu ejbca pro FusionDirectory"
 
 #: config/ejbca/class_ejbcaConfig.inc:42
 msgid "EJBCA plugin"
-msgstr ""
+msgstr "ZÃ¡suvnÃ½ modul EJBCA"
 
 #: config/ejbca/class_ejbcaConfig.inc:45
 msgid "EJBCA RDN"
-msgstr ""
+msgstr "RelativnÃ rozliÅ¡enÃ½ nÃ¡zev pro EJBCA"
 
 #: config/ejbca/class_ejbcaConfig.inc:45
 msgid "Branch in which ejbca certificates are stored"
-msgstr ""
+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 dd187eabaadb3ef3c55ff4afb5c1b9a7f992dc07..22c8d88fd8bcd98e1d7916bf87c648300213d213 100644
--- a/ejbca/locale/de/fusiondirectory.po
+++ b/ejbca/locale/de/fusiondirectory.po
@@ -3,34 +3,35 @@
 # This file is distributed under the same license as the PACKAGE package.
 # 
 # Translators:
+# Ettore Atalan <atalanttore@googlemail.com>, 2014
 msgid ""
 msgstr ""
-"Project-Id-Version: FusionDirectory-108\n"
+"Project-Id-Version: FusionDirectory-109\n"
 "Report-Msgid-Bugs-To: documentation@lists.fusiondirectory.org\n"
-"POT-Creation-Date: 2015-03-19 21:45+0100\n"
-"PO-Revision-Date: 2014-12-03 16:33+0000\n"
-"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
-"Language-Team: German (http://www.transifex.com/projects/p/FusionDirectory-108/language/de/)\n"
+"POT-Creation-Date: 2014-12-15 17:47+0100\n"
+"PO-Revision-Date: 2015-05-29 09:11+0000\n"
+"Last-Translator: Ettore Atalan <atalanttore@googlemail.com>\n"
+"Language-Team: German (http://www.transifex.com/projects/p/FusionDirectory-109/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/ejbca/certificates/class_ejbcaCertificates.inc:31
+#: admin/ejbca/class_ejbcaCertificates.inc:31
 msgid "EJBCA certs"
 msgstr "EJBCA-Zertifikate"
 
-#: admin/ejbca/certificates/class_ejbcaCertificates.inc:35
+#: admin/ejbca/class_ejbcaCertificates.inc:35
 msgid "Certificates associated to this object"
 msgstr ""
 
-#: admin/ejbca/certificates/class_ejbcaCertificates.inc:46
+#: admin/ejbca/class_ejbcaCertificates.inc:46
 #: admin/ejbca/class_ejbcaManagement.inc:32
 msgid "EJBCA"
 msgstr "EJBCA"
 
-#: admin/ejbca/certificates/class_ejbcaCertificates.inc:47
+#: admin/ejbca/class_ejbcaCertificates.inc:47
 msgid "Assign EJBCA certificates to a user"
 msgstr ""
 
@@ -38,7 +39,7 @@ msgstr ""
 msgid "EJBCA certificates management"
 msgstr "EJBCA-Zertifikateverwaltung"
 
-#: admin/ejbca/class_ejbcaManagement.inc:52
+#: admin/ejbca/class_ejbcaManagement.inc:51
 msgid "Download"
 msgstr "Herunterladen"
 
diff --git a/ejbca/locale/el_GR/fusiondirectory.po b/ejbca/locale/el_GR/fusiondirectory.po
new file mode 100644
index 0000000000000000000000000000000000000000..206d6ba1e97a1d7416163eaa9abcf950b12ed509
--- /dev/null
+++ b/ejbca/locale/el_GR/fusiondirectory.po
@@ -0,0 +1,86 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR FusionDirectory Project
+# This file is distributed under the same license as the PACKAGE package.
+# 
+# Translators:
+msgid ""
+msgstr ""
+"Project-Id-Version: FusionDirectory-109\n"
+"Report-Msgid-Bugs-To: documentation@lists.fusiondirectory.org\n"
+"POT-Creation-Date: 2014-12-15 17:47+0100\n"
+"PO-Revision-Date: 2015-05-30 11:45+0000\n"
+"Last-Translator: Benoit Mortier <benoit.mortier@opensides.be>\n"
+"Language-Team: Greek (Greece) (http://www.transifex.com/projects/p/FusionDirectory-109/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/ejbca/class_ejbcaCertificates.inc:31
+msgid "EJBCA certs"
+msgstr ""
+
+#: admin/ejbca/class_ejbcaCertificates.inc:35
+msgid "Certificates associated to this object"
+msgstr ""
+
+#: admin/ejbca/class_ejbcaCertificates.inc:46
+#: admin/ejbca/class_ejbcaManagement.inc:32
+msgid "EJBCA"
+msgstr ""
+
+#: admin/ejbca/class_ejbcaCertificates.inc:47
+msgid "Assign EJBCA certificates to a user"
+msgstr ""
+
+#: admin/ejbca/class_ejbcaManagement.inc:33
+msgid "EJBCA certificates management"
+msgstr ""
+
+#: admin/ejbca/class_ejbcaManagement.inc:51
+msgid "Download"
+msgstr ""
+
+#: admin/ejbca/class_ejbcaCertificate.inc:30
+#: admin/ejbca/class_ejbcaCertificate.inc:31
+#: admin/ejbca/class_ejbcaCertificate.inc:33
+msgid "EJBCA certificate"
+msgstr ""
+
+#: admin/ejbca/class_ejbcaCertificate.inc:47
+#: admin/ejbca/class_ejbcaCertificate.inc:55
+msgid "Certificate"
+msgstr ""
+
+#: admin/ejbca/class_ejbcaCertificate.inc:51
+msgid "Name"
+msgstr ""
+
+#: admin/ejbca/class_ejbcaCertificate.inc:51
+msgid "Common name"
+msgstr ""
+
+#: admin/ejbca/class_ejbcaCertificate.inc:55
+msgid "Certificate content"
+msgstr ""
+
+#: config/ejbca/class_ejbcaConfig.inc:28
+msgid "EJBCA plugin configuration"
+msgstr ""
+
+#: config/ejbca/class_ejbcaConfig.inc:29
+msgid "FusionDirectory ejbca plugin configuration"
+msgstr ""
+
+#: config/ejbca/class_ejbcaConfig.inc:42
+msgid "EJBCA plugin"
+msgstr ""
+
+#: config/ejbca/class_ejbcaConfig.inc:45
+msgid "EJBCA RDN"
+msgstr ""
+
+#: config/ejbca/class_ejbcaConfig.inc:45
+msgid "Branch in which ejbca certificates are stored"
+msgstr ""
diff --git a/ejbca/locale/en/fusiondirectory.po b/ejbca/locale/en/fusiondirectory.po
index 65d83b44eabdb248f4bd357398b17e945f4c3d29..13057a2885dba03cbf35dfc7d08de3c6abb35ae6 100644
--- a/ejbca/locale/en/fusiondirectory.po
+++ b/ejbca/locale/en/fusiondirectory.po
@@ -6,13 +6,13 @@
 #, fuzzy
 msgid ""
 msgstr ""
-"Project-Id-Version: PACKAGE VERSION\n"
-"Report-Msgid-Bugs-To: documentation@lists.fusiondirectory.org\n"
-"POT-Creation-Date: 2015-03-31 11:49+0200\n"
+"Project-Id-Version: FusionDirectory VERSION\n"
+"Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
+"POT-Creation-Date: 2015-05-30 15:30+0200\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
-"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
-"Language-Team: LANGUAGE <LL@li.org>\n"
-"Language: \n"
+"Last-Translator: FusionDirectory project <contact@fusiondirectory.org>\n"
+"Language-Team: English\n"
+"Language: en\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
diff --git a/ejbca/locale/es/fusiondirectory.po b/ejbca/locale/es/fusiondirectory.po
index 003d1e34390f5a2a7e435b06bacb5fcc0b9d370c..6fc321cb7ae30a97e114c4b61b64744252a5f022 100644
--- a/ejbca/locale/es/fusiondirectory.po
+++ b/ejbca/locale/es/fusiondirectory.po
@@ -5,32 +5,32 @@
 # Translators:
 msgid ""
 msgstr ""
-"Project-Id-Version: FusionDirectory-108\n"
+"Project-Id-Version: FusionDirectory-109\n"
 "Report-Msgid-Bugs-To: documentation@lists.fusiondirectory.org\n"
-"POT-Creation-Date: 2015-03-19 21:45+0100\n"
-"PO-Revision-Date: 2014-12-03 16:33+0000\n"
+"POT-Creation-Date: 2014-12-15 17:47+0100\n"
+"PO-Revision-Date: 2014-12-15 16:54+0000\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
-"Language-Team: Spanish (http://www.transifex.com/projects/p/FusionDirectory-108/language/es/)\n"
+"Language-Team: Spanish (http://www.transifex.com/projects/p/FusionDirectory-109/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/ejbca/certificates/class_ejbcaCertificates.inc:31
+#: admin/ejbca/class_ejbcaCertificates.inc:31
 msgid "EJBCA certs"
 msgstr ""
 
-#: admin/ejbca/certificates/class_ejbcaCertificates.inc:35
+#: admin/ejbca/class_ejbcaCertificates.inc:35
 msgid "Certificates associated to this object"
 msgstr ""
 
-#: admin/ejbca/certificates/class_ejbcaCertificates.inc:46
+#: admin/ejbca/class_ejbcaCertificates.inc:46
 #: admin/ejbca/class_ejbcaManagement.inc:32
 msgid "EJBCA"
 msgstr ""
 
-#: admin/ejbca/certificates/class_ejbcaCertificates.inc:47
+#: admin/ejbca/class_ejbcaCertificates.inc:47
 msgid "Assign EJBCA certificates to a user"
 msgstr ""
 
@@ -38,7 +38,7 @@ msgstr ""
 msgid "EJBCA certificates management"
 msgstr ""
 
-#: admin/ejbca/class_ejbcaManagement.inc:52
+#: admin/ejbca/class_ejbcaManagement.inc:51
 msgid "Download"
 msgstr "Descargar"
 
diff --git a/ejbca/locale/es_VE/fusiondirectory.po b/ejbca/locale/es_VE/fusiondirectory.po
index c8dda49eb92c01561fb33edb35c49147e683835f..cd77e371fc7f004455b8a2e243868ff780c1c930 100644
--- a/ejbca/locale/es_VE/fusiondirectory.po
+++ b/ejbca/locale/es_VE/fusiondirectory.po
@@ -5,32 +5,32 @@
 # Translators:
 msgid ""
 msgstr ""
-"Project-Id-Version: FusionDirectory-108\n"
+"Project-Id-Version: FusionDirectory-109\n"
 "Report-Msgid-Bugs-To: documentation@lists.fusiondirectory.org\n"
-"POT-Creation-Date: 2015-03-19 21:45+0100\n"
-"PO-Revision-Date: 2014-12-03 16:33+0000\n"
+"POT-Creation-Date: 2014-12-15 17:47+0100\n"
+"PO-Revision-Date: 2014-12-15 16:54+0000\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
-"Language-Team: Spanish (Venezuela) (http://www.transifex.com/projects/p/FusionDirectory-108/language/es_VE/)\n"
+"Language-Team: Spanish (Venezuela) (http://www.transifex.com/projects/p/FusionDirectory-109/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/ejbca/certificates/class_ejbcaCertificates.inc:31
+#: admin/ejbca/class_ejbcaCertificates.inc:31
 msgid "EJBCA certs"
 msgstr ""
 
-#: admin/ejbca/certificates/class_ejbcaCertificates.inc:35
+#: admin/ejbca/class_ejbcaCertificates.inc:35
 msgid "Certificates associated to this object"
 msgstr ""
 
-#: admin/ejbca/certificates/class_ejbcaCertificates.inc:46
+#: admin/ejbca/class_ejbcaCertificates.inc:46
 #: admin/ejbca/class_ejbcaManagement.inc:32
 msgid "EJBCA"
 msgstr ""
 
-#: admin/ejbca/certificates/class_ejbcaCertificates.inc:47
+#: admin/ejbca/class_ejbcaCertificates.inc:47
 msgid "Assign EJBCA certificates to a user"
 msgstr ""
 
@@ -38,7 +38,7 @@ msgstr ""
 msgid "EJBCA certificates management"
 msgstr ""
 
-#: admin/ejbca/class_ejbcaManagement.inc:52
+#: admin/ejbca/class_ejbcaManagement.inc:51
 msgid "Download"
 msgstr "Descargar"
 
diff --git a/ejbca/locale/fa_IR/fusiondirectory.po b/ejbca/locale/fa_IR/fusiondirectory.po
index 7d0fe56366228838bc6e835021b66295540f75b1..228d8d348e2e62cf47bd81d9c6cc16b81a104a54 100644
--- a/ejbca/locale/fa_IR/fusiondirectory.po
+++ b/ejbca/locale/fa_IR/fusiondirectory.po
@@ -5,32 +5,32 @@
 # Translators:
 msgid ""
 msgstr ""
-"Project-Id-Version: FusionDirectory-108\n"
+"Project-Id-Version: FusionDirectory-109\n"
 "Report-Msgid-Bugs-To: documentation@lists.fusiondirectory.org\n"
-"POT-Creation-Date: 2015-03-19 21:45+0100\n"
-"PO-Revision-Date: 2014-12-03 16:33+0000\n"
+"POT-Creation-Date: 2014-12-15 17:47+0100\n"
+"PO-Revision-Date: 2014-12-15 16:54+0000\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
-"Language-Team: Persian (Iran) (http://www.transifex.com/projects/p/FusionDirectory-108/language/fa_IR/)\n"
+"Language-Team: Persian (Iran) (http://www.transifex.com/projects/p/FusionDirectory-109/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/ejbca/certificates/class_ejbcaCertificates.inc:31
+#: admin/ejbca/class_ejbcaCertificates.inc:31
 msgid "EJBCA certs"
 msgstr ""
 
-#: admin/ejbca/certificates/class_ejbcaCertificates.inc:35
+#: admin/ejbca/class_ejbcaCertificates.inc:35
 msgid "Certificates associated to this object"
 msgstr ""
 
-#: admin/ejbca/certificates/class_ejbcaCertificates.inc:46
+#: admin/ejbca/class_ejbcaCertificates.inc:46
 #: admin/ejbca/class_ejbcaManagement.inc:32
 msgid "EJBCA"
 msgstr ""
 
-#: admin/ejbca/certificates/class_ejbcaCertificates.inc:47
+#: admin/ejbca/class_ejbcaCertificates.inc:47
 msgid "Assign EJBCA certificates to a user"
 msgstr ""
 
@@ -38,7 +38,7 @@ msgstr ""
 msgid "EJBCA certificates management"
 msgstr ""
 
-#: admin/ejbca/class_ejbcaManagement.inc:52
+#: admin/ejbca/class_ejbcaManagement.inc:51
 msgid "Download"
 msgstr ""
 
diff --git a/ejbca/locale/fr/fusiondirectory.po b/ejbca/locale/fr/fusiondirectory.po
index 281087b1c9314eaa48e14b63464f6caef40275e7..a8abcf5afd62a631b5efdc59f82dfb249f20e8c1 100644
--- a/ejbca/locale/fr/fusiondirectory.po
+++ b/ejbca/locale/fr/fusiondirectory.po
@@ -3,35 +3,34 @@
 # This file is distributed under the same license as the PACKAGE package.
 # 
 # Translators:
-# Benoit Mortier <benoit.mortier@opensides.be>, 2015
 msgid ""
 msgstr ""
-"Project-Id-Version: FusionDirectory-108\n"
+"Project-Id-Version: FusionDirectory-109\n"
 "Report-Msgid-Bugs-To: documentation@lists.fusiondirectory.org\n"
-"POT-Creation-Date: 2015-03-19 21:45+0100\n"
-"PO-Revision-Date: 2015-02-25 17:32+0000\n"
-"Last-Translator: Benoit Mortier <benoit.mortier@opensides.be>\n"
-"Language-Team: French (http://www.transifex.com/projects/p/FusionDirectory-108/language/fr/)\n"
+"POT-Creation-Date: 2014-12-15 17:47+0100\n"
+"PO-Revision-Date: 2014-12-15 16:54+0000\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: French (http://www.transifex.com/projects/p/FusionDirectory-109/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/ejbca/certificates/class_ejbcaCertificates.inc:31
+#: admin/ejbca/class_ejbcaCertificates.inc:31
 msgid "EJBCA certs"
 msgstr "Certificats EJBCA"
 
-#: admin/ejbca/certificates/class_ejbcaCertificates.inc:35
+#: admin/ejbca/class_ejbcaCertificates.inc:35
 msgid "Certificates associated to this object"
 msgstr "Certificats associÃ©s a cet objet"
 
-#: admin/ejbca/certificates/class_ejbcaCertificates.inc:46
+#: admin/ejbca/class_ejbcaCertificates.inc:46
 #: admin/ejbca/class_ejbcaManagement.inc:32
 msgid "EJBCA"
 msgstr "EJBCA"
 
-#: admin/ejbca/certificates/class_ejbcaCertificates.inc:47
+#: admin/ejbca/class_ejbcaCertificates.inc:47
 msgid "Assign EJBCA certificates to a user"
 msgstr "Assigner un certificat EJBCA Ã  un utilisateur"
 
@@ -39,9 +38,9 @@ msgstr "Assigner un certificat EJBCA Ã  un utilisateur"
 msgid "EJBCA certificates management"
 msgstr "Gestion des certificats EJBCA"
 
-#: admin/ejbca/class_ejbcaManagement.inc:52
+#: admin/ejbca/class_ejbcaManagement.inc:51
 msgid "Download"
-msgstr "TÃ©lÃ©chargement"
+msgstr "TÃ©lÃ©charger"
 
 #: admin/ejbca/class_ejbcaCertificate.inc:30
 #: admin/ejbca/class_ejbcaCertificate.inc:31
diff --git a/ejbca/locale/id/fusiondirectory.po b/ejbca/locale/id/fusiondirectory.po
index 788b73358ca42b4608ce3067dc9780c749fe7c1a..9fce0c0e3a31af25c35461f87c96b9ba46bc81a3 100644
--- a/ejbca/locale/id/fusiondirectory.po
+++ b/ejbca/locale/id/fusiondirectory.po
@@ -5,32 +5,32 @@
 # Translators:
 msgid ""
 msgstr ""
-"Project-Id-Version: FusionDirectory-108\n"
+"Project-Id-Version: FusionDirectory-109\n"
 "Report-Msgid-Bugs-To: documentation@lists.fusiondirectory.org\n"
-"POT-Creation-Date: 2015-03-19 21:45+0100\n"
-"PO-Revision-Date: 2014-12-03 16:33+0000\n"
+"POT-Creation-Date: 2014-12-15 17:47+0100\n"
+"PO-Revision-Date: 2014-12-15 16:54+0000\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
-"Language-Team: Indonesian (http://www.transifex.com/projects/p/FusionDirectory-108/language/id/)\n"
+"Language-Team: Indonesian (http://www.transifex.com/projects/p/FusionDirectory-109/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/ejbca/certificates/class_ejbcaCertificates.inc:31
+#: admin/ejbca/class_ejbcaCertificates.inc:31
 msgid "EJBCA certs"
 msgstr ""
 
-#: admin/ejbca/certificates/class_ejbcaCertificates.inc:35
+#: admin/ejbca/class_ejbcaCertificates.inc:35
 msgid "Certificates associated to this object"
 msgstr ""
 
-#: admin/ejbca/certificates/class_ejbcaCertificates.inc:46
+#: admin/ejbca/class_ejbcaCertificates.inc:46
 #: admin/ejbca/class_ejbcaManagement.inc:32
 msgid "EJBCA"
 msgstr ""
 
-#: admin/ejbca/certificates/class_ejbcaCertificates.inc:47
+#: admin/ejbca/class_ejbcaCertificates.inc:47
 msgid "Assign EJBCA certificates to a user"
 msgstr ""
 
@@ -38,7 +38,7 @@ msgstr ""
 msgid "EJBCA certificates management"
 msgstr ""
 
-#: admin/ejbca/class_ejbcaManagement.inc:52
+#: admin/ejbca/class_ejbcaManagement.inc:51
 msgid "Download"
 msgstr ""
 
diff --git a/ejbca/locale/it/fusiondirectory.po b/ejbca/locale/it/fusiondirectory.po
index ed97f6e8863b02b0f9e5d2ba3110041f97a68fd2..43e5f54281e4ede2b1ed09ca4cb1234a9eb242fd 100644
--- a/ejbca/locale/it/fusiondirectory.po
+++ b/ejbca/locale/it/fusiondirectory.po
@@ -5,32 +5,32 @@
 # Translators:
 msgid ""
 msgstr ""
-"Project-Id-Version: FusionDirectory-108\n"
+"Project-Id-Version: FusionDirectory-109\n"
 "Report-Msgid-Bugs-To: documentation@lists.fusiondirectory.org\n"
-"POT-Creation-Date: 2015-03-19 21:45+0100\n"
-"PO-Revision-Date: 2014-12-03 16:33+0000\n"
+"POT-Creation-Date: 2014-12-15 17:47+0100\n"
+"PO-Revision-Date: 2014-12-15 16:54+0000\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
-"Language-Team: Italian (http://www.transifex.com/projects/p/FusionDirectory-108/language/it/)\n"
+"Language-Team: Italian (http://www.transifex.com/projects/p/FusionDirectory-109/language/it/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Language: it\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: admin/ejbca/certificates/class_ejbcaCertificates.inc:31
+#: admin/ejbca/class_ejbcaCertificates.inc:31
 msgid "EJBCA certs"
 msgstr ""
 
-#: admin/ejbca/certificates/class_ejbcaCertificates.inc:35
+#: admin/ejbca/class_ejbcaCertificates.inc:35
 msgid "Certificates associated to this object"
 msgstr ""
 
-#: admin/ejbca/certificates/class_ejbcaCertificates.inc:46
+#: admin/ejbca/class_ejbcaCertificates.inc:46
 #: admin/ejbca/class_ejbcaManagement.inc:32
 msgid "EJBCA"
 msgstr ""
 
-#: admin/ejbca/certificates/class_ejbcaCertificates.inc:47
+#: admin/ejbca/class_ejbcaCertificates.inc:47
 msgid "Assign EJBCA certificates to a user"
 msgstr ""
 
@@ -38,7 +38,7 @@ msgstr ""
 msgid "EJBCA certificates management"
 msgstr ""
 
-#: admin/ejbca/class_ejbcaManagement.inc:52
+#: admin/ejbca/class_ejbcaManagement.inc:51
 msgid "Download"
 msgstr "Scarica"
 
diff --git a/ejbca/locale/lv/fusiondirectory.po b/ejbca/locale/lv/fusiondirectory.po
index 0ff801d2bf17e9e055a32b0e676d2b025f7f3ac6..970be8efd3bf0e9696418ce9dfbdf81c98d39a6d 100644
--- a/ejbca/locale/lv/fusiondirectory.po
+++ b/ejbca/locale/lv/fusiondirectory.po
@@ -5,32 +5,32 @@
 # Translators:
 msgid ""
 msgstr ""
-"Project-Id-Version: FusionDirectory-108\n"
+"Project-Id-Version: FusionDirectory-109\n"
 "Report-Msgid-Bugs-To: documentation@lists.fusiondirectory.org\n"
-"POT-Creation-Date: 2015-03-19 21:45+0100\n"
-"PO-Revision-Date: 2014-12-03 16:33+0000\n"
+"POT-Creation-Date: 2014-12-15 17:47+0100\n"
+"PO-Revision-Date: 2014-12-15 16:54+0000\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
-"Language-Team: Latvian (http://www.transifex.com/projects/p/FusionDirectory-108/language/lv/)\n"
+"Language-Team: Latvian (http://www.transifex.com/projects/p/FusionDirectory-109/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/ejbca/certificates/class_ejbcaCertificates.inc:31
+#: admin/ejbca/class_ejbcaCertificates.inc:31
 msgid "EJBCA certs"
 msgstr ""
 
-#: admin/ejbca/certificates/class_ejbcaCertificates.inc:35
+#: admin/ejbca/class_ejbcaCertificates.inc:35
 msgid "Certificates associated to this object"
 msgstr ""
 
-#: admin/ejbca/certificates/class_ejbcaCertificates.inc:46
+#: admin/ejbca/class_ejbcaCertificates.inc:46
 #: admin/ejbca/class_ejbcaManagement.inc:32
 msgid "EJBCA"
 msgstr ""
 
-#: admin/ejbca/certificates/class_ejbcaCertificates.inc:47
+#: admin/ejbca/class_ejbcaCertificates.inc:47
 msgid "Assign EJBCA certificates to a user"
 msgstr ""
 
@@ -38,7 +38,7 @@ msgstr ""
 msgid "EJBCA certificates management"
 msgstr ""
 
-#: admin/ejbca/class_ejbcaManagement.inc:52
+#: admin/ejbca/class_ejbcaManagement.inc:51
 msgid "Download"
 msgstr ""
 
diff --git a/ejbca/locale/nb/fusiondirectory.po b/ejbca/locale/nb/fusiondirectory.po
index cd5ec7ef63336859f01e14822410d7c85d912588..c3343fba1c697903deccadd97f19ef79d23b63f0 100644
--- a/ejbca/locale/nb/fusiondirectory.po
+++ b/ejbca/locale/nb/fusiondirectory.po
@@ -5,32 +5,32 @@
 # Translators:
 msgid ""
 msgstr ""
-"Project-Id-Version: FusionDirectory-108\n"
+"Project-Id-Version: FusionDirectory-109\n"
 "Report-Msgid-Bugs-To: documentation@lists.fusiondirectory.org\n"
-"POT-Creation-Date: 2015-03-19 21:45+0100\n"
-"PO-Revision-Date: 2014-12-03 16:33+0000\n"
+"POT-Creation-Date: 2014-12-15 17:47+0100\n"
+"PO-Revision-Date: 2014-12-15 16:54+0000\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
-"Language-Team: Norwegian BokmÃ¥l (http://www.transifex.com/projects/p/FusionDirectory-108/language/nb/)\n"
+"Language-Team: Norwegian BokmÃ¥l (http://www.transifex.com/projects/p/FusionDirectory-109/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/ejbca/certificates/class_ejbcaCertificates.inc:31
+#: admin/ejbca/class_ejbcaCertificates.inc:31
 msgid "EJBCA certs"
 msgstr ""
 
-#: admin/ejbca/certificates/class_ejbcaCertificates.inc:35
+#: admin/ejbca/class_ejbcaCertificates.inc:35
 msgid "Certificates associated to this object"
 msgstr ""
 
-#: admin/ejbca/certificates/class_ejbcaCertificates.inc:46
+#: admin/ejbca/class_ejbcaCertificates.inc:46
 #: admin/ejbca/class_ejbcaManagement.inc:32
 msgid "EJBCA"
 msgstr ""
 
-#: admin/ejbca/certificates/class_ejbcaCertificates.inc:47
+#: admin/ejbca/class_ejbcaCertificates.inc:47
 msgid "Assign EJBCA certificates to a user"
 msgstr ""
 
@@ -38,7 +38,7 @@ msgstr ""
 msgid "EJBCA certificates management"
 msgstr ""
 
-#: admin/ejbca/class_ejbcaManagement.inc:52
+#: admin/ejbca/class_ejbcaManagement.inc:51
 msgid "Download"
 msgstr ""
 
diff --git a/ejbca/locale/nl/fusiondirectory.po b/ejbca/locale/nl/fusiondirectory.po
index 06c231ddde037ef4cf4b554521b18d0681fadcd4..b5efc98bb1cb3e31a32ece10c8fec97f684cffc1 100644
--- a/ejbca/locale/nl/fusiondirectory.po
+++ b/ejbca/locale/nl/fusiondirectory.po
@@ -5,32 +5,32 @@
 # Translators:
 msgid ""
 msgstr ""
-"Project-Id-Version: FusionDirectory-108\n"
+"Project-Id-Version: FusionDirectory-109\n"
 "Report-Msgid-Bugs-To: documentation@lists.fusiondirectory.org\n"
-"POT-Creation-Date: 2015-03-19 21:45+0100\n"
-"PO-Revision-Date: 2014-12-03 16:33+0000\n"
+"POT-Creation-Date: 2014-12-15 17:47+0100\n"
+"PO-Revision-Date: 2014-12-15 16:54+0000\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
-"Language-Team: Dutch (http://www.transifex.com/projects/p/FusionDirectory-108/language/nl/)\n"
+"Language-Team: Dutch (http://www.transifex.com/projects/p/FusionDirectory-109/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/ejbca/certificates/class_ejbcaCertificates.inc:31
+#: admin/ejbca/class_ejbcaCertificates.inc:31
 msgid "EJBCA certs"
 msgstr ""
 
-#: admin/ejbca/certificates/class_ejbcaCertificates.inc:35
+#: admin/ejbca/class_ejbcaCertificates.inc:35
 msgid "Certificates associated to this object"
 msgstr ""
 
-#: admin/ejbca/certificates/class_ejbcaCertificates.inc:46
+#: admin/ejbca/class_ejbcaCertificates.inc:46
 #: admin/ejbca/class_ejbcaManagement.inc:32
 msgid "EJBCA"
 msgstr ""
 
-#: admin/ejbca/certificates/class_ejbcaCertificates.inc:47
+#: admin/ejbca/class_ejbcaCertificates.inc:47
 msgid "Assign EJBCA certificates to a user"
 msgstr ""
 
@@ -38,7 +38,7 @@ msgstr ""
 msgid "EJBCA certificates management"
 msgstr ""
 
-#: admin/ejbca/class_ejbcaManagement.inc:52
+#: admin/ejbca/class_ejbcaManagement.inc:51
 msgid "Download"
 msgstr "Downloaden"
 
diff --git a/ejbca/locale/pl/fusiondirectory.po b/ejbca/locale/pl/fusiondirectory.po
index 21c19c706344a34f0d086f9d790b7cf85aab1837..75ec6f69901e3c707f60c0b9830329f18251b556 100644
--- a/ejbca/locale/pl/fusiondirectory.po
+++ b/ejbca/locale/pl/fusiondirectory.po
@@ -5,32 +5,32 @@
 # Translators:
 msgid ""
 msgstr ""
-"Project-Id-Version: FusionDirectory-108\n"
+"Project-Id-Version: FusionDirectory-109\n"
 "Report-Msgid-Bugs-To: documentation@lists.fusiondirectory.org\n"
-"POT-Creation-Date: 2015-03-19 21:45+0100\n"
-"PO-Revision-Date: 2014-12-03 16:33+0000\n"
+"POT-Creation-Date: 2014-12-15 17:47+0100\n"
+"PO-Revision-Date: 2014-12-15 16:54+0000\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
-"Language-Team: Polish (http://www.transifex.com/projects/p/FusionDirectory-108/language/pl/)\n"
+"Language-Team: Polish (http://www.transifex.com/projects/p/FusionDirectory-109/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/ejbca/certificates/class_ejbcaCertificates.inc:31
+#: admin/ejbca/class_ejbcaCertificates.inc:31
 msgid "EJBCA certs"
 msgstr ""
 
-#: admin/ejbca/certificates/class_ejbcaCertificates.inc:35
+#: admin/ejbca/class_ejbcaCertificates.inc:35
 msgid "Certificates associated to this object"
 msgstr ""
 
-#: admin/ejbca/certificates/class_ejbcaCertificates.inc:46
+#: admin/ejbca/class_ejbcaCertificates.inc:46
 #: admin/ejbca/class_ejbcaManagement.inc:32
 msgid "EJBCA"
 msgstr ""
 
-#: admin/ejbca/certificates/class_ejbcaCertificates.inc:47
+#: admin/ejbca/class_ejbcaCertificates.inc:47
 msgid "Assign EJBCA certificates to a user"
 msgstr ""
 
@@ -38,7 +38,7 @@ msgstr ""
 msgid "EJBCA certificates management"
 msgstr ""
 
-#: admin/ejbca/class_ejbcaManagement.inc:52
+#: admin/ejbca/class_ejbcaManagement.inc:51
 msgid "Download"
 msgstr "ÅšciÄ…gnij"
 
diff --git a/ejbca/locale/pt/fusiondirectory.po b/ejbca/locale/pt/fusiondirectory.po
index 5ca46809701c0d29fe51bbbecf0a1e942e5b500f..98a0d738e5e5ce27fbdf2eddbc7f045f6436c713 100644
--- a/ejbca/locale/pt/fusiondirectory.po
+++ b/ejbca/locale/pt/fusiondirectory.po
@@ -5,32 +5,32 @@
 # Translators:
 msgid ""
 msgstr ""
-"Project-Id-Version: FusionDirectory-108\n"
+"Project-Id-Version: FusionDirectory-109\n"
 "Report-Msgid-Bugs-To: documentation@lists.fusiondirectory.org\n"
-"POT-Creation-Date: 2015-03-19 21:45+0100\n"
-"PO-Revision-Date: 2014-12-03 16:33+0000\n"
+"POT-Creation-Date: 2014-12-15 17:47+0100\n"
+"PO-Revision-Date: 2014-12-15 16:54+0000\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
-"Language-Team: Portuguese (http://www.transifex.com/projects/p/FusionDirectory-108/language/pt/)\n"
+"Language-Team: Portuguese (http://www.transifex.com/projects/p/FusionDirectory-109/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/ejbca/certificates/class_ejbcaCertificates.inc:31
+#: admin/ejbca/class_ejbcaCertificates.inc:31
 msgid "EJBCA certs"
 msgstr ""
 
-#: admin/ejbca/certificates/class_ejbcaCertificates.inc:35
+#: admin/ejbca/class_ejbcaCertificates.inc:35
 msgid "Certificates associated to this object"
 msgstr ""
 
-#: admin/ejbca/certificates/class_ejbcaCertificates.inc:46
+#: admin/ejbca/class_ejbcaCertificates.inc:46
 #: admin/ejbca/class_ejbcaManagement.inc:32
 msgid "EJBCA"
 msgstr ""
 
-#: admin/ejbca/certificates/class_ejbcaCertificates.inc:47
+#: admin/ejbca/class_ejbcaCertificates.inc:47
 msgid "Assign EJBCA certificates to a user"
 msgstr ""
 
@@ -38,7 +38,7 @@ msgstr ""
 msgid "EJBCA certificates management"
 msgstr ""
 
-#: admin/ejbca/class_ejbcaManagement.inc:52
+#: admin/ejbca/class_ejbcaManagement.inc:51
 msgid "Download"
 msgstr ""
 
diff --git a/ejbca/locale/pt_BR/fusiondirectory.po b/ejbca/locale/pt_BR/fusiondirectory.po
index b746772f50c2df3556b0ab560e8912592f61b97d..2075ab1d55e883c609401cfca5c0976810000af5 100644
--- a/ejbca/locale/pt_BR/fusiondirectory.po
+++ b/ejbca/locale/pt_BR/fusiondirectory.po
@@ -5,32 +5,32 @@
 # Translators:
 msgid ""
 msgstr ""
-"Project-Id-Version: FusionDirectory-108\n"
+"Project-Id-Version: FusionDirectory-109\n"
 "Report-Msgid-Bugs-To: documentation@lists.fusiondirectory.org\n"
-"POT-Creation-Date: 2015-03-19 21:45+0100\n"
-"PO-Revision-Date: 2014-12-03 16:33+0000\n"
+"POT-Creation-Date: 2014-12-15 17:47+0100\n"
+"PO-Revision-Date: 2014-12-15 16:54+0000\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
-"Language-Team: Portuguese (Brazil) (http://www.transifex.com/projects/p/FusionDirectory-108/language/pt_BR/)\n"
+"Language-Team: Portuguese (Brazil) (http://www.transifex.com/projects/p/FusionDirectory-109/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/ejbca/certificates/class_ejbcaCertificates.inc:31
+#: admin/ejbca/class_ejbcaCertificates.inc:31
 msgid "EJBCA certs"
 msgstr ""
 
-#: admin/ejbca/certificates/class_ejbcaCertificates.inc:35
+#: admin/ejbca/class_ejbcaCertificates.inc:35
 msgid "Certificates associated to this object"
 msgstr ""
 
-#: admin/ejbca/certificates/class_ejbcaCertificates.inc:46
+#: admin/ejbca/class_ejbcaCertificates.inc:46
 #: admin/ejbca/class_ejbcaManagement.inc:32
 msgid "EJBCA"
 msgstr ""
 
-#: admin/ejbca/certificates/class_ejbcaCertificates.inc:47
+#: admin/ejbca/class_ejbcaCertificates.inc:47
 msgid "Assign EJBCA certificates to a user"
 msgstr ""
 
@@ -38,7 +38,7 @@ msgstr ""
 msgid "EJBCA certificates management"
 msgstr ""
 
-#: admin/ejbca/class_ejbcaManagement.inc:52
+#: admin/ejbca/class_ejbcaManagement.inc:51
 msgid "Download"
 msgstr "Download"
 
diff --git a/ejbca/locale/ru/fusiondirectory.po b/ejbca/locale/ru/fusiondirectory.po
index f325496f00a6ed1ea4fcb4a9c32c7f1b950d121d..5788b533949c087059182dbf639f2d72ee1c3355 100644
--- a/ejbca/locale/ru/fusiondirectory.po
+++ b/ejbca/locale/ru/fusiondirectory.po
@@ -5,32 +5,32 @@
 # Translators:
 msgid ""
 msgstr ""
-"Project-Id-Version: FusionDirectory-108\n"
+"Project-Id-Version: FusionDirectory-109\n"
 "Report-Msgid-Bugs-To: documentation@lists.fusiondirectory.org\n"
-"POT-Creation-Date: 2015-03-19 21:45+0100\n"
-"PO-Revision-Date: 2014-12-03 16:33+0000\n"
+"POT-Creation-Date: 2014-12-15 17:47+0100\n"
+"PO-Revision-Date: 2014-12-15 16:54+0000\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
-"Language-Team: Russian (http://www.transifex.com/projects/p/FusionDirectory-108/language/ru/)\n"
+"Language-Team: Russian (http://www.transifex.com/projects/p/FusionDirectory-109/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=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);\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/ejbca/certificates/class_ejbcaCertificates.inc:31
+#: admin/ejbca/class_ejbcaCertificates.inc:31
 msgid "EJBCA certs"
 msgstr ""
 
-#: admin/ejbca/certificates/class_ejbcaCertificates.inc:35
+#: admin/ejbca/class_ejbcaCertificates.inc:35
 msgid "Certificates associated to this object"
 msgstr ""
 
-#: admin/ejbca/certificates/class_ejbcaCertificates.inc:46
+#: admin/ejbca/class_ejbcaCertificates.inc:46
 #: admin/ejbca/class_ejbcaManagement.inc:32
 msgid "EJBCA"
 msgstr ""
 
-#: admin/ejbca/certificates/class_ejbcaCertificates.inc:47
+#: admin/ejbca/class_ejbcaCertificates.inc:47
 msgid "Assign EJBCA certificates to a user"
 msgstr ""
 
@@ -38,7 +38,7 @@ msgstr ""
 msgid "EJBCA certificates management"
 msgstr ""
 
-#: admin/ejbca/class_ejbcaManagement.inc:52
+#: admin/ejbca/class_ejbcaManagement.inc:51
 msgid "Download"
 msgstr "Ð¡ÐºÐ°Ñ‡Ð°Ñ‚ÑŒ"
 
diff --git a/ejbca/locale/ru@petr1708/fusiondirectory.po b/ejbca/locale/ru@petr1708/fusiondirectory.po
index 62d26560a4d5755ce5687c565d93fcc8333d4029..47d5da282d67cb3efdb181d65539ce7b624be194 100644
--- a/ejbca/locale/ru@petr1708/fusiondirectory.po
+++ b/ejbca/locale/ru@petr1708/fusiondirectory.po
@@ -5,32 +5,32 @@
 # Translators:
 msgid ""
 msgstr ""
-"Project-Id-Version: FusionDirectory-108\n"
+"Project-Id-Version: FusionDirectory-109\n"
 "Report-Msgid-Bugs-To: documentation@lists.fusiondirectory.org\n"
-"POT-Creation-Date: 2015-03-19 21:45+0100\n"
-"PO-Revision-Date: 2014-12-03 16:33+0000\n"
+"POT-Creation-Date: 2014-12-15 17:47+0100\n"
+"PO-Revision-Date: 2014-12-15 16:54+0000\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
-"Language-Team: Russian Petrine orthography (http://www.transifex.com/projects/p/FusionDirectory-108/language/ru@petr1708/)\n"
+"Language-Team: Russian Petrine orthography (http://www.transifex.com/projects/p/FusionDirectory-109/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=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);\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/ejbca/certificates/class_ejbcaCertificates.inc:31
+#: admin/ejbca/class_ejbcaCertificates.inc:31
 msgid "EJBCA certs"
 msgstr ""
 
-#: admin/ejbca/certificates/class_ejbcaCertificates.inc:35
+#: admin/ejbca/class_ejbcaCertificates.inc:35
 msgid "Certificates associated to this object"
 msgstr ""
 
-#: admin/ejbca/certificates/class_ejbcaCertificates.inc:46
+#: admin/ejbca/class_ejbcaCertificates.inc:46
 #: admin/ejbca/class_ejbcaManagement.inc:32
 msgid "EJBCA"
 msgstr ""
 
-#: admin/ejbca/certificates/class_ejbcaCertificates.inc:47
+#: admin/ejbca/class_ejbcaCertificates.inc:47
 msgid "Assign EJBCA certificates to a user"
 msgstr ""
 
@@ -38,7 +38,7 @@ msgstr ""
 msgid "EJBCA certificates management"
 msgstr ""
 
-#: admin/ejbca/class_ejbcaManagement.inc:52
+#: admin/ejbca/class_ejbcaManagement.inc:51
 msgid "Download"
 msgstr ""
 
diff --git a/ejbca/locale/sv/fusiondirectory.po b/ejbca/locale/sv/fusiondirectory.po
index 56166099a967d85e4616351633a7bb378ea18599..20b1cbfe9e4e0b0c286a93a665f726f00f49eb99 100644
--- a/ejbca/locale/sv/fusiondirectory.po
+++ b/ejbca/locale/sv/fusiondirectory.po
@@ -5,32 +5,32 @@
 # Translators:
 msgid ""
 msgstr ""
-"Project-Id-Version: FusionDirectory-108\n"
+"Project-Id-Version: FusionDirectory-109\n"
 "Report-Msgid-Bugs-To: documentation@lists.fusiondirectory.org\n"
-"POT-Creation-Date: 2015-03-19 21:45+0100\n"
-"PO-Revision-Date: 2014-12-03 16:33+0000\n"
+"POT-Creation-Date: 2014-12-15 17:47+0100\n"
+"PO-Revision-Date: 2014-12-15 16:54+0000\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
-"Language-Team: Swedish (http://www.transifex.com/projects/p/FusionDirectory-108/language/sv/)\n"
+"Language-Team: Swedish (http://www.transifex.com/projects/p/FusionDirectory-109/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/ejbca/certificates/class_ejbcaCertificates.inc:31
+#: admin/ejbca/class_ejbcaCertificates.inc:31
 msgid "EJBCA certs"
 msgstr ""
 
-#: admin/ejbca/certificates/class_ejbcaCertificates.inc:35
+#: admin/ejbca/class_ejbcaCertificates.inc:35
 msgid "Certificates associated to this object"
 msgstr ""
 
-#: admin/ejbca/certificates/class_ejbcaCertificates.inc:46
+#: admin/ejbca/class_ejbcaCertificates.inc:46
 #: admin/ejbca/class_ejbcaManagement.inc:32
 msgid "EJBCA"
 msgstr ""
 
-#: admin/ejbca/certificates/class_ejbcaCertificates.inc:47
+#: admin/ejbca/class_ejbcaCertificates.inc:47
 msgid "Assign EJBCA certificates to a user"
 msgstr ""
 
@@ -38,7 +38,7 @@ msgstr ""
 msgid "EJBCA certificates management"
 msgstr ""
 
-#: admin/ejbca/class_ejbcaManagement.inc:52
+#: admin/ejbca/class_ejbcaManagement.inc:51
 msgid "Download"
 msgstr "Ladda ner"
 
diff --git a/ejbca/locale/ug/fusiondirectory.po b/ejbca/locale/ug/fusiondirectory.po
index e2fcd3e8740a60d904a70722fc232c66fea19c8d..0edd118c7ab1649b911394d221600b18af08696d 100644
--- a/ejbca/locale/ug/fusiondirectory.po
+++ b/ejbca/locale/ug/fusiondirectory.po
@@ -5,32 +5,32 @@
 # Translators:
 msgid ""
 msgstr ""
-"Project-Id-Version: FusionDirectory-108\n"
+"Project-Id-Version: FusionDirectory-109\n"
 "Report-Msgid-Bugs-To: documentation@lists.fusiondirectory.org\n"
-"POT-Creation-Date: 2015-03-19 21:45+0100\n"
-"PO-Revision-Date: 2014-12-03 16:33+0000\n"
+"POT-Creation-Date: 2014-12-15 17:47+0100\n"
+"PO-Revision-Date: 2014-12-15 16:54+0000\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
-"Language-Team: Uighur (http://www.transifex.com/projects/p/FusionDirectory-108/language/ug/)\n"
+"Language-Team: Uighur (http://www.transifex.com/projects/p/FusionDirectory-109/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/ejbca/certificates/class_ejbcaCertificates.inc:31
+#: admin/ejbca/class_ejbcaCertificates.inc:31
 msgid "EJBCA certs"
 msgstr ""
 
-#: admin/ejbca/certificates/class_ejbcaCertificates.inc:35
+#: admin/ejbca/class_ejbcaCertificates.inc:35
 msgid "Certificates associated to this object"
 msgstr ""
 
-#: admin/ejbca/certificates/class_ejbcaCertificates.inc:46
+#: admin/ejbca/class_ejbcaCertificates.inc:46
 #: admin/ejbca/class_ejbcaManagement.inc:32
 msgid "EJBCA"
 msgstr ""
 
-#: admin/ejbca/certificates/class_ejbcaCertificates.inc:47
+#: admin/ejbca/class_ejbcaCertificates.inc:47
 msgid "Assign EJBCA certificates to a user"
 msgstr ""
 
@@ -38,7 +38,7 @@ msgstr ""
 msgid "EJBCA certificates management"
 msgstr ""
 
-#: admin/ejbca/class_ejbcaManagement.inc:52
+#: admin/ejbca/class_ejbcaManagement.inc:51
 msgid "Download"
 msgstr ""
 
diff --git a/ejbca/locale/vi_VN/fusiondirectory.po b/ejbca/locale/vi_VN/fusiondirectory.po
index 4e658bb270bd263794e952aa2050414ee58a5373..23d859d3c5cd54856f7f27b12d4fcc42b4b280a2 100644
--- a/ejbca/locale/vi_VN/fusiondirectory.po
+++ b/ejbca/locale/vi_VN/fusiondirectory.po
@@ -5,32 +5,32 @@
 # Translators:
 msgid ""
 msgstr ""
-"Project-Id-Version: FusionDirectory-108\n"
+"Project-Id-Version: FusionDirectory-109\n"
 "Report-Msgid-Bugs-To: documentation@lists.fusiondirectory.org\n"
-"POT-Creation-Date: 2015-03-19 21:45+0100\n"
-"PO-Revision-Date: 2014-12-03 16:33+0000\n"
+"POT-Creation-Date: 2014-12-15 17:47+0100\n"
+"PO-Revision-Date: 2014-12-15 16:54+0000\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
-"Language-Team: Vietnamese (Viet Nam) (http://www.transifex.com/projects/p/FusionDirectory-108/language/vi_VN/)\n"
+"Language-Team: Vietnamese (Viet Nam) (http://www.transifex.com/projects/p/FusionDirectory-109/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/ejbca/certificates/class_ejbcaCertificates.inc:31
+#: admin/ejbca/class_ejbcaCertificates.inc:31
 msgid "EJBCA certs"
 msgstr ""
 
-#: admin/ejbca/certificates/class_ejbcaCertificates.inc:35
+#: admin/ejbca/class_ejbcaCertificates.inc:35
 msgid "Certificates associated to this object"
 msgstr ""
 
-#: admin/ejbca/certificates/class_ejbcaCertificates.inc:46
+#: admin/ejbca/class_ejbcaCertificates.inc:46
 #: admin/ejbca/class_ejbcaManagement.inc:32
 msgid "EJBCA"
 msgstr ""
 
-#: admin/ejbca/certificates/class_ejbcaCertificates.inc:47
+#: admin/ejbca/class_ejbcaCertificates.inc:47
 msgid "Assign EJBCA certificates to a user"
 msgstr ""
 
@@ -38,7 +38,7 @@ msgstr ""
 msgid "EJBCA certificates management"
 msgstr ""
 
-#: admin/ejbca/class_ejbcaManagement.inc:52
+#: admin/ejbca/class_ejbcaManagement.inc:51
 msgid "Download"
 msgstr ""
 
diff --git a/ejbca/locale/zh/fusiondirectory.po b/ejbca/locale/zh/fusiondirectory.po
index 0ac7569905db5848479cff7d9c0684e1cb390658..d7c4231334a8ec3db4e410bd5a0722617e04bb3a 100644
--- a/ejbca/locale/zh/fusiondirectory.po
+++ b/ejbca/locale/zh/fusiondirectory.po
@@ -5,32 +5,32 @@
 # Translators:
 msgid ""
 msgstr ""
-"Project-Id-Version: FusionDirectory-108\n"
+"Project-Id-Version: FusionDirectory-109\n"
 "Report-Msgid-Bugs-To: documentation@lists.fusiondirectory.org\n"
-"POT-Creation-Date: 2015-03-19 21:45+0100\n"
-"PO-Revision-Date: 2014-12-03 16:33+0000\n"
+"POT-Creation-Date: 2014-12-15 17:47+0100\n"
+"PO-Revision-Date: 2014-12-15 16:54+0000\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
-"Language-Team: Chinese (http://www.transifex.com/projects/p/FusionDirectory-108/language/zh/)\n"
+"Language-Team: Chinese (http://www.transifex.com/projects/p/FusionDirectory-109/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/ejbca/certificates/class_ejbcaCertificates.inc:31
+#: admin/ejbca/class_ejbcaCertificates.inc:31
 msgid "EJBCA certs"
 msgstr ""
 
-#: admin/ejbca/certificates/class_ejbcaCertificates.inc:35
+#: admin/ejbca/class_ejbcaCertificates.inc:35
 msgid "Certificates associated to this object"
 msgstr ""
 
-#: admin/ejbca/certificates/class_ejbcaCertificates.inc:46
+#: admin/ejbca/class_ejbcaCertificates.inc:46
 #: admin/ejbca/class_ejbcaManagement.inc:32
 msgid "EJBCA"
 msgstr ""
 
-#: admin/ejbca/certificates/class_ejbcaCertificates.inc:47
+#: admin/ejbca/class_ejbcaCertificates.inc:47
 msgid "Assign EJBCA certificates to a user"
 msgstr ""
 
@@ -38,7 +38,7 @@ msgstr ""
 msgid "EJBCA certificates management"
 msgstr ""
 
-#: admin/ejbca/class_ejbcaManagement.inc:52
+#: admin/ejbca/class_ejbcaManagement.inc:51
 msgid "Download"
 msgstr "ä¸‹è½½"
 
diff --git a/fai/locale/ar/fusiondirectory.po b/fai/locale/ar/fusiondirectory.po
index a3ccd270c24521a13dc58abc96818a423fb762d7..48361b08d6f8f4c18d27acd8d980ce13aee7efef 100644
--- a/fai/locale/ar/fusiondirectory.po
+++ b/fai/locale/ar/fusiondirectory.po
@@ -5,379 +5,188 @@
 # Translators:
 msgid ""
 msgstr ""
-"Project-Id-Version: FusionDirectory-108\n"
+"Project-Id-Version: FusionDirectory-109\n"
 "Report-Msgid-Bugs-To: documentation@lists.fusiondirectory.org\n"
-"POT-Creation-Date: 2015-03-19 21:45+0100\n"
-"PO-Revision-Date: 2015-02-25 16:02+0000\n"
+"POT-Creation-Date: 2014-12-15 17:47+0100\n"
+"PO-Revision-Date: 2015-02-25 16:04+0000\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>\n"
-"Language-Team: Arabic (http://www.transifex.com/projects/p/FusionDirectory-108/language/ar/)\n"
+"Language-Team: Arabic (http://www.transifex.com/projects/p/FusionDirectory-109/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/fai/class_faiScriptEntry.inc:79 admin/fai/class_faiScriptEntry.inc:82
-#: admin/fai/class_faiManagement.inc:240 admin/fai/class_faiManagement.inc:768
-#: admin/fai/class_faiManagement.inc:774
-#: admin/fai/class_faiPartitionTable.inc:268
-#: admin/fai/class_faiPartitionTable.inc:331
-#: admin/fai/class_faiDiskEntry.inc:445 admin/fai/class_FAI.inc:570
-#: admin/fai/class_faiHookEntry.inc:83 admin/fai/class_faiHookEntry.inc:86
-#: admin/fai/class_faiScript.inc:249 admin/fai/class_faiTemplate.inc:232
-#: admin/fai/class_faiHook.inc:259 admin/fai/class_faiVariable.inc:162
-#: admin/systems/class_faiLogView.inc:207
-#: admin/systems/class_faiLogView.inc:242
-msgid "Error"
-msgstr "Ø®Ø·Ø£"
-
-#: admin/fai/class_faiScriptEntry.inc:82 admin/fai/class_faiHookEntry.inc:86
-msgid "file is empty"
-msgstr ""
-
-#: admin/fai/class_faiScriptEntry.inc:102 admin/fai/class_faiHookEntry.inc:102
-#: admin/fai/class_faiScript.inc:349 admin/fai/class_faiScript.inc:374
-#: admin/fai/class_faiTemplate.inc:320 admin/fai/class_faiHook.inc:346
-msgid "Download"
-msgstr ""
-
-#: admin/fai/class_faiScriptEntry.inc:147
-#: admin/fai/class_faiScriptEntry.inc:151
-#: admin/fai/class_faiScriptEntry.inc:154
-#: admin/fai/class_faiScriptEntry.inc:197
-#: admin/fai/class_faiManagement.inc:768 admin/fai/class_faiManagement.inc:774
-#: admin/fai/class_faiPackage.inc:685
-#: admin/fai/class_faiPartitionTable.inc:779
-#: admin/fai/class_faiDiskEntry.inc:702 admin/fai/class_faiDiskEntry.inc:705
-#: admin/fai/class_faiDiskEntry.inc:758
-#: admin/fai/class_faiTemplateEntry.inc:247
-#: admin/fai/class_faiTemplateEntry.inc:312
-#: admin/fai/class_faiPartitionTableEntry.inc:353
-#: admin/fai/class_faiPartitionTableEntry.inc:356
-#: admin/fai/class_faiPartitionTableEntry.inc:360
-#: admin/fai/class_faiPartitionTableEntry.inc:455
-#: admin/fai/packageSelect/selectPackage-list.xml:40
-#: admin/fai/class_faiProfile.inc:414 admin/fai/class_faiProfile.inc:463
-#: admin/fai/class_faiHookEntry.inc:157 admin/fai/class_faiHookEntry.inc:162
-#: admin/fai/class_faiHookEntry.inc:165 admin/fai/class_faiHookEntry.inc:207
-#: admin/fai/class_askClassName.inc:163 admin/fai/class_askClassName.inc:167
-#: admin/fai/class_askClassName.inc:171 admin/fai/class_askClassName.inc:198
-#: admin/fai/class_faiScript.inc:347 admin/fai/class_faiScript.inc:605
-#: admin/fai/classSelect/selectClass-list.xml:28
-#: admin/fai/class_faiTemplate.inc:512
-#: admin/fai/class_faiVariableEntry.inc:103
-#: admin/fai/class_faiVariableEntry.inc:112
-#: admin/fai/class_faiVariableEntry.inc:115
-#: admin/fai/class_faiVariableEntry.inc:149 admin/fai/class_faiHook.inc:531
-#: admin/fai/class_faiVariable.inc:398 admin/fai/fai-list.xml:80
-#: admin/fai/faiPartitionTableEntry.tpl.c:8 admin/fai/faiPartition.tpl.c:5
-#: admin/fai/faiVariableEntry.tpl.c:8 admin/fai/faiDiskEntry.tpl.c:8
-#: admin/fai/faiTemplate.tpl.c:8 admin/fai/faiVariable.tpl.c:8
-#: admin/fai/faiHook.tpl.c:8
-#: admin/fai/packageSelect/selectPackage-filter.tpl.c:8
-#: admin/fai/faiPackage.tpl.c:8 admin/fai/faiScriptEntry.tpl.c:8
-#: admin/fai/classSelect/selectClass-filter.tpl.c:5
-#: admin/fai/fai-filter.tpl.c:50 admin/fai/faiPartitionTable.tpl.c:8
-#: admin/fai/faiScript.tpl.c:8 admin/fai/faiProfile.tpl.c:8
-#: admin/fai/faiHookEntry.tpl.c:8
-msgid "Name"
-msgstr "Ø§Ù„Ø¥Ø³Ù…"
-
-#: admin/fai/class_faiScriptEntry.inc:159 admin/fai/class_faiHookEntry.inc:170
-#: admin/fai/class_faiScript.inc:594 admin/fai/fai-list.xml:122
-#: admin/fai/faiScriptEntry.tpl.c:29 admin/fai/faiHookEntry.tpl.c:29
-msgid "Script"
-msgstr ""
-
-#: admin/fai/class_faiScriptEntry.inc:190
-#: admin/fai/class_faiScriptEntry.inc:199
-msgid "Script entry"
-msgstr ""
-
-#: admin/fai/class_faiScriptEntry.inc:191
-msgid "FAI script entry"
-msgstr ""
-
-#: admin/fai/class_faiScriptEntry.inc:198 admin/fai/class_faiPackage.inc:686
-#: admin/fai/class_faiPartitionTable.inc:780
-#: admin/fai/class_faiDiskEntry.inc:759
-#: admin/fai/class_faiTemplateEntry.inc:313
-#: admin/fai/class_faiPartitionTableEntry.inc:456
-#: admin/fai/class_faiProfile.inc:464 admin/fai/class_faiHookEntry.inc:208
-#: admin/fai/class_faiScript.inc:606 admin/fai/class_faiTemplate.inc:513
-#: admin/fai/class_faiVariableEntry.inc:150 admin/fai/class_faiHook.inc:532
-#: admin/fai/class_faiVariable.inc:399
-#: admin/fai/faiPartitionTableEntry.tpl.c:11 admin/fai/faiPartition.tpl.c:11
-#: admin/fai/faiVariableEntry.tpl.c:11 admin/fai/faiDiskEntry.tpl.c:14
-#: admin/fai/faiTemplate.tpl.c:11 admin/fai/faiVariable.tpl.c:11
-#: admin/fai/faiHook.tpl.c:11 admin/fai/faiPackage.tpl.c:11
-#: admin/fai/faiTemplateEntry.tpl.c:14 admin/fai/faiScriptEntry.tpl.c:11
-#: admin/fai/faiPartitionTable.tpl.c:11 admin/fai/faiScript.tpl.c:11
-#: admin/fai/faiProfile.tpl.c:11 admin/fai/faiHookEntry.tpl.c:11
-msgid "Description"
-msgstr "Ø§Ù„ÙˆØµÙ"
-
-#: admin/fai/class_faiScriptEntry.inc:200
-msgid "Script Priority"
-msgstr ""
-
-#: admin/fai/class_faiManagement.inc:188
-msgid "partition table"
-msgstr ""
-
-#: admin/fai/class_faiManagement.inc:189 admin/fai/fai-list.xml:31
-msgid "script"
-msgstr ""
-
-#: admin/fai/class_faiManagement.inc:190 admin/fai/fai-list.xml:47
-msgid "hook"
-msgstr ""
-
-#: admin/fai/class_faiManagement.inc:191 admin/fai/fai-list.xml:39
-msgid "variable"
-msgstr ""
-
-#: admin/fai/class_faiManagement.inc:192 admin/fai/fai-list.xml:63
-msgid "template"
-msgstr ""
-
-#: admin/fai/class_faiManagement.inc:193
-msgid "package list"
-msgstr ""
-
-#: admin/fai/class_faiManagement.inc:210 admin/fai/class_faiManagement.inc:226
-#: admin/fai/class_faiManagement.inc:332 admin/fai/class_faiManagement.inc:390
-#: admin/fai/class_faiManagement.inc:480 admin/fai/class_faiManagement.inc:575
-#: admin/fai/class_faiManagement.inc:598 admin/fai/class_faiManagement.inc:619
-msgid "Permission error"
-msgstr ""
-
-#: admin/fai/class_faiManagement.inc:211 admin/fai/class_faiManagement.inc:226
-#, php-format
-msgid "You have no permission to create a new %s!"
-msgstr ""
-
-#: admin/fai/class_faiManagement.inc:226 admin/fai/fai-list.xml:55
-msgid "profile"
-msgstr ""
-
-#: admin/fai/class_faiManagement.inc:328
-msgid "Branch locked"
-msgstr ""
-
-#: admin/fai/class_faiManagement.inc:329
-#, php-format
-msgid "The following entries are locked, you can't remove them %s."
-msgstr ""
-
-#: admin/fai/class_faiManagement.inc:346
-msgid "FAI object"
-msgstr ""
-
-#: admin/fai/class_faiManagement.inc:477
-msgid "FAI branch/freeze"
-msgstr ""
-
-#: admin/fai/class_faiManagement.inc:480
-msgid "You have no permission to delete this release!"
-msgstr ""
-
-#: admin/fai/class_faiManagement.inc:496 admin/fai/remove.tpl.c:2
-#: admin/fai/remove_branch.tpl.c:2
-msgid "Warning"
-msgstr "ØªØØ°ÙŠØ±"
-
-#: admin/fai/class_faiManagement.inc:496
-msgid "Release remove aborted because the release name check failed!"
-msgstr ""
-
-#: admin/fai/class_faiManagement.inc:573 admin/fai/class_faiManagement.inc:596
-msgid "Configuration"
-msgstr ""
-
-#: admin/fai/class_faiManagement.inc:575 admin/fai/class_faiManagement.inc:598
-#: admin/fai/class_faiManagement.inc:619
-msgid "Branch"
-msgstr ""
-
-#: admin/fai/class_faiManagement.inc:725 admin/fai/askClassName.tpl.c:23
-msgid "Continue"
-msgstr ""
-
-#: admin/fai/class_faiManagement.inc:926
-#: admin/fai/class_faiPartitionTable.inc:768
-#: admin/fai/class_faiProfile.inc:318 admin/fai/class_askClassName.inc:99
-#: admin/fai/classSelect/class_classSelect.inc:58
-#: admin/fai/class_faiGroupHandle.inc:120
-#: admin/fai/class_faiProfileEntry.inc:163 admin/fai/fai-list.xml:146
-msgid "Partition table"
+#: admin/fai/class_faiManagement.inc:117 admin/fai/class_faiManagement.inc:122
+#: admin/fai/packageSelect/selectPackage-list.xml:14
+#: admin/systems/class_faiStartup.inc:178 config/fai/class_faiConfig.inc:41
+msgid "FAI"
 msgstr ""
 
-#: admin/fai/class_faiManagement.inc:928
-#: admin/fai/class_faiGroupHandle.inc:122 admin/fai/fai-list.xml:140
-msgid "Package list"
+#: admin/fai/class_faiManagement.inc:118
+msgid "Manage FAI software packages and deployment recipes"
 msgstr ""
 
-#: admin/fai/class_faiManagement.inc:930
-#: admin/fai/class_faiGroupHandle.inc:124
-msgid "Scripts"
+#: admin/fai/class_faiPackage.inc:157
+msgid "Mark for installation"
 msgstr ""
 
-#: admin/fai/class_faiManagement.inc:932
-#: admin/fai/class_faiGroupHandle.inc:126
-msgid "Variables"
+#: admin/fai/class_faiPackage.inc:161
+msgid "Mark for removal"
 msgstr ""
 
-#: admin/fai/class_faiManagement.inc:934
-#: admin/fai/class_faiGroupHandle.inc:128
-msgid "Hooks"
+#: admin/fai/class_faiPackage.inc:166
+msgid "Edit configuration"
 msgstr ""
 
-#: admin/fai/class_faiManagement.inc:936 admin/fai/class_faiProfile.inc:454
-#: admin/fai/class_askClassName.inc:104 admin/fai/class_faiGroupHandle.inc:130
-#: admin/fai/fai-list.xml:110
-msgid "Profile"
+#: admin/fai/class_faiPackage.inc:247
+#: admin/fai/class_faiPartitionTable.inc:209
+#: admin/fai/class_faiPartitionTable.inc:250
+#: admin/fai/class_faiTemplate.inc:114
+#: admin/systems/services/repository/class_serviceDebianRepository.inc:172
+#: admin/systems/services/repository/class_serviceDebianRepository.inc:189
+#: admin/systems/services/repository/class_serviceDebianRepository.inc:193
+msgid "LDAP error"
 msgstr ""
 
-#: admin/fai/class_faiManagement.inc:938
-#: admin/fai/class_faiGroupHandle.inc:132
-msgid "Templates"
+#: admin/fai/class_faiPackage.inc:279
+#: admin/fai/packageSelect/class_filterFAIPackages.inc:41
+#: admin/fai/packageSelect/class_filterFAIPackages.inc:46
+#: admin/fai/class_faiPackageConfiguration.inc:55
+#: admin/systems/class_faiStartup.inc:133
+#: admin/systems/class_faiStartup.inc:160
+msgid "Service infrastructure"
 msgstr ""
 
-#: admin/fai/class_faiManagement.inc:1039
-#: admin/fai/class_faiManagement.inc:1045
-#: admin/fai/packageSelect/selectPackage-list.xml:14
-#: admin/fai/classSelect/selectClass-list.xml:15
-#: admin/systems/class_faiStartup.inc:177 config/fai/class_faiConfig.inc:41
-msgid "FAI"
+#: admin/fai/class_faiPackage.inc:294
+msgid "Unkown packages"
 msgstr ""
 
-#: admin/fai/class_faiManagement.inc:1040
-msgid "Manage FAI software packages and deployment recipes"
+#: admin/fai/class_faiPackage.inc:365
+msgid "Package"
 msgstr ""
 
-#: admin/fai/class_faiPackage.inc:261
-msgid "Invalid package names"
+#: admin/fai/class_faiPackage.inc:366
+msgid "FAI Package list"
 msgstr ""
 
-#: admin/fai/class_faiPackage.inc:262
-#, php-format
-msgid "The following package names don't match the Debian policy: %s"
+#: admin/fai/class_faiPackage.inc:369
+msgid "FAI Package"
 msgstr ""
 
-#: admin/fai/class_faiPackage.inc:421 admin/fai/class_faiPackage.inc:422
-msgid "Configured"
-msgstr ""
+#: admin/fai/class_faiPackage.inc:385
+#: admin/fai/class_faiPartitionTable.inc:304
+#: admin/fai/class_faiTemplateEntry.inc:140 admin/fai/class_faiProfile.inc:47
+#: admin/fai/class_faiScript.inc:50 admin/fai/class_faiTemplate.inc:173
+#: admin/fai/class_faiHook.inc:50 admin/fai/class_faiVariable.inc:50
+msgid "Properties"
+msgstr "Ø§Ù„Ø®ÙˆØ§Øµ"
 
-#: admin/fai/class_faiPackage.inc:428 admin/fai/class_faiPackage.inc:429
-msgid "Package marked for removal"
+#: admin/fai/class_faiPackage.inc:388
+#: admin/fai/class_faiPartitionTable.inc:307 admin/fai/class_faiProfile.inc:50
+#: admin/fai/class_faiScript.inc:53 admin/fai/class_faiTemplate.inc:176
+#: admin/fai/class_faiHook.inc:53 admin/fai/class_faiVariable.inc:53
+msgid "Class name"
 msgstr ""
 
-#: admin/fai/class_faiPackage.inc:445
-msgid "Mark package for removal"
+#: admin/fai/class_faiPackage.inc:388 admin/fai/class_faiScript.inc:53
+#: admin/fai/class_faiHook.inc:53 admin/fai/class_faiVariable.inc:53
+msgid "Variables class name"
 msgstr ""
 
-#: admin/fai/class_faiPackage.inc:451
-msgid "Configure this package"
-msgstr ""
+#: admin/fai/class_faiPackage.inc:392
+#: admin/fai/class_faiPartitionTable.inc:311
+#: admin/fai/class_faiDiskEntry.inc:738
+#: admin/fai/class_faiTemplateEntry.inc:147 admin/fai/class_faiProfile.inc:54
+#: admin/fai/class_faiScript.inc:57 admin/fai/class_faiScript.inc:75
+#: admin/fai/class_faiTemplate.inc:180 admin/fai/class_faiHook.inc:57
+#: admin/fai/class_faiHook.inc:75 admin/fai/class_faiVariable.inc:57
+#: admin/fai/class_faiVariable.inc:75
+msgid "Description"
+msgstr "Ø§Ù„ÙˆØµÙ"
 
-#: admin/fai/class_faiPackage.inc:455
-msgid "Remove this package"
+#: admin/fai/class_faiPackage.inc:392
+#: admin/fai/class_faiPartitionTable.inc:311 admin/fai/class_faiProfile.inc:54
+#: admin/fai/class_faiScript.inc:57 admin/fai/class_faiTemplate.inc:180
+#: admin/fai/class_faiHook.inc:57 admin/fai/class_faiVariable.inc:57
+msgid "Short description of the class"
 msgstr ""
 
-#: admin/fai/class_faiPackage.inc:534
-msgid "Please select a least one package!"
+#: admin/fai/class_faiPackage.inc:398 admin/systems/class_faiStartup.inc:90
+msgid "Repository"
 msgstr ""
 
-#: admin/fai/class_faiPackage.inc:538
-msgid ""
-"Please choose a valid release/section combination for your repository setup!"
+#: admin/fai/class_faiPackage.inc:401 admin/systems/class_faiStartup.inc:78
+#: admin/systems/services/repository/class_serviceDebianRepository.inc:52
+#: admin/systems/services/repository/class_serviceCentosRepository.inc:49
+msgid "Release"
 msgstr ""
 
-#: admin/fai/class_faiPackage.inc:571
-#: admin/fai/packageSelect/class_filterFAIPackages.inc:41
-#: admin/fai/packageSelect/class_filterFAIPackages.inc:46
-#: admin/fai/class_faiPackageConfiguration.inc:55
-#: admin/systems/class_faiStartup.inc:132
-#: admin/systems/class_faiStartup.inc:159
-msgid "Infrastructure service"
+#: admin/fai/class_faiPackage.inc:401
+msgid "Debian release concerned"
 msgstr ""
 
-#: admin/fai/class_faiPackage.inc:587
-msgid "Unkown packages"
+#: admin/fai/class_faiPackage.inc:405
+#: admin/systems/services/repository/class_serviceDebianRepository.inc:58
+msgid "Sections"
 msgstr ""
 
-#: admin/fai/class_faiPackage.inc:674
-#: admin/fai/faiPackageConfiguration.tpl.c:2
-msgid "Package"
+#: admin/fai/class_faiPackage.inc:405
+msgid "Sections concerned"
 msgstr ""
 
-#: admin/fai/class_faiPackage.inc:675
-msgid "FAI Package list"
+#: admin/fai/class_faiPackage.inc:409
+msgid "Install method"
 msgstr ""
 
-#: admin/fai/class_faiPackage.inc:679
-msgid "FAI Package"
+#: admin/fai/class_faiPackage.inc:409
+msgid "Install method to use for this package list"
 msgstr ""
 
-#: admin/fai/class_faiPackage.inc:687
+#: admin/fai/class_faiPackage.inc:420
 msgid "Packages"
 msgstr ""
 
-#: admin/fai/class_faiPackage.inc:688 admin/fai/faiPackage.tpl.c:23
-msgid "Section"
-msgstr ""
-
-#: admin/fai/class_faiPackage.inc:688 admin/fai/class_faiPackage.inc:691
-#: admin/fai/class_faiScript.inc:605 admin/fai/class_faiTemplate.inc:512
-msgid "Readonly"
+#: admin/fai/class_faiPackage.inc:424
+msgid "Packages in this class"
 msgstr ""
 
-#: admin/fai/class_faiPackage.inc:689
-msgid "Install Method"
-msgstr ""
+#: admin/fai/class_faiPartitionTable.inc:61
+#: admin/fai/class_faiDiskEntry.inc:442 admin/systems/class_faiLogView.inc:207
+#: admin/systems/class_faiLogView.inc:242
+msgid "Error"
+msgstr "Ø®Ø·Ø£"
 
-#: admin/fai/class_faiPackage.inc:690
-msgid "Package configuration"
+#: admin/fai/class_faiPartitionTable.inc:112
+msgid "Add RAID"
 msgstr ""
 
-#: admin/fai/class_faiPackage.inc:691 admin/systems/class_faiStartup.inc:78
-#: admin/systems/services/repository/class_serviceRepository.inc:40
-#: admin/fai/branch_selector.tpl.c:14 admin/fai/faiPackage.tpl.c:20
-#: admin/fai/fai-filter.tpl.c:5 admin/fai/fai-filter.tpl.c:14
-msgid "Release"
+#: admin/fai/class_faiPartitionTable.inc:116
+msgid "Add LVM"
 msgstr ""
 
-#: admin/fai/class_faiPartitionTable.inc:269
-#: admin/fai/class_faiDiskEntry.inc:446
-#, php-format
-msgid ""
-"The disk cannot be deleted while it is used in the '%s' disk definition!"
+#: admin/fai/class_faiPartitionTable.inc:284
+msgid "Partition table"
 msgstr ""
 
-#: admin/fai/class_faiPartitionTable.inc:416 admin/fai/class_faiScript.inc:360
-#: admin/fai/class_faiScript.inc:362 admin/fai/class_faiTemplate.inc:306
-#: admin/fai/class_faiTemplate.inc:308
-msgid "edit"
+#: admin/fai/class_faiPartitionTable.inc:285
+#: admin/fai/class_faiPartitionTable.inc:288
+msgid "FAI partition table"
 msgstr ""
 
-#: admin/fai/class_faiPartitionTable.inc:418 admin/fai/class_faiScript.inc:364
-#: admin/fai/class_faiTemplate.inc:310
-msgid "delete"
+#: admin/fai/class_faiPartitionTable.inc:307 admin/fai/class_faiProfile.inc:50
+msgid "Partition table class name"
 msgstr ""
 
-#: admin/fai/class_faiPartitionTable.inc:769
-#: admin/fai/class_faiPartitionTable.inc:773
-msgid "FAI partition table"
+#: admin/fai/class_faiPartitionTable.inc:317
+msgid "Discs"
 msgstr ""
 
-#: admin/fai/class_faiPartitionTable.inc:779 admin/fai/class_faiHook.inc:531
-#: admin/fai/class_faiVariable.inc:398
-msgid "Read only"
+#: admin/fai/class_faiPartitionTable.inc:324
+msgid "Partitions in this class"
 msgstr ""
 
 #: admin/fai/class_faiDiskEntry.inc:273
-#: admin/fai/faiPartitionTableEntry.tpl.c:5 admin/fai/faiDiskEntry.tpl.c:5
 msgid "Device"
 msgstr ""
 
@@ -389,103 +198,103 @@ msgstr ""
 msgid "UUID"
 msgstr ""
 
-#: admin/fai/class_faiDiskEntry.inc:345
+#: admin/fai/class_faiDiskEntry.inc:344
 msgid "Disks"
 msgstr ""
 
-#: admin/fai/class_faiDiskEntry.inc:348 admin/fai/class_faiPartition.inc:321
-#: admin/fai/faiPartition.tpl.c:14
+#: admin/fai/class_faiDiskEntry.inc:347 admin/fai/class_faiPartition.inc:319
 msgid "Size"
 msgstr ""
 
-#: admin/fai/class_faiDiskEntry.inc:544
+#: admin/fai/class_faiDiskEntry.inc:443
+#, php-format
+msgid ""
+"The disk cannot be deleted while it is used in the '%s' disk definition!"
+msgstr ""
+
+#: admin/fai/class_faiDiskEntry.inc:536
 msgid "encrypted"
 msgstr ""
 
-#: admin/fai/class_faiDiskEntry.inc:547
+#: admin/fai/class_faiDiskEntry.inc:539
 msgid "bootable"
 msgstr ""
 
-#: admin/fai/class_faiDiskEntry.inc:550
+#: admin/fai/class_faiDiskEntry.inc:542
 msgid "preserve"
 msgstr ""
 
-#: admin/fai/class_faiDiskEntry.inc:735
+#: admin/fai/class_faiDiskEntry.inc:687 admin/fai/class_faiDiskEntry.inc:690
+#: admin/fai/class_faiDiskEntry.inc:737
+#: admin/fai/packageSelect/selectPackage-list.xml:40
+#: admin/fai/class_faiScript.inc:71 admin/fai/class_faiHook.inc:71
+#: admin/fai/class_faiVariable.inc:71
+#: admin/fai/class_faiSimplePluginClass.inc:50
+msgid "Name"
+msgstr "Ø§Ù„Ø¥Ø³Ù…"
+
+#: admin/fai/class_faiDiskEntry.inc:717
 msgid ""
 "You have more than four primary partition table entries in your "
 "configuration, please check your configuration twice."
 msgstr ""
 
-#: admin/fai/class_faiDiskEntry.inc:739
+#: admin/fai/class_faiDiskEntry.inc:721
 msgid ""
 "You cannot have more than three primary partition while using logical "
 "partitions, please check your configuration twice."
 msgstr ""
 
-#: admin/fai/class_faiDiskEntry.inc:752
-#: admin/fai/class_faiPartitionTableEntry.inc:448
+#: admin/fai/class_faiDiskEntry.inc:733
 msgid "Partition table entry"
 msgstr ""
 
-#: admin/fai/class_faiDiskEntry.inc:753
-#: admin/fai/class_faiPartitionTableEntry.inc:449
+#: admin/fai/class_faiDiskEntry.inc:734
 msgid "FAI partition table entry"
 msgstr ""
 
-#: admin/fai/class_faiDiskEntry.inc:760
+#: admin/fai/class_faiDiskEntry.inc:739
 msgid "Disk options"
 msgstr ""
 
-#: admin/fai/class_faiDiskEntry.inc:761
-#: admin/fai/class_faiPartitionTableEntry.inc:457
+#: admin/fai/class_faiDiskEntry.inc:740
 msgid "Partition type"
 msgstr ""
 
-#: admin/fai/class_faiDiskEntry.inc:762
-#: admin/fai/class_faiPartitionTableEntry.inc:458
+#: admin/fai/class_faiDiskEntry.inc:741
 msgid "Partition no."
 msgstr ""
 
-#: admin/fai/class_faiDiskEntry.inc:763
-#: admin/fai/class_faiPartitionTableEntry.inc:459
+#: admin/fai/class_faiDiskEntry.inc:742
 msgid "File system type"
 msgstr ""
 
-#: admin/fai/class_faiDiskEntry.inc:764
-#: admin/fai/class_faiPartitionTableEntry.inc:171
-#: admin/fai/class_faiPartitionTableEntry.inc:460
-#: admin/fai/class_faiPartition.inc:437 admin/fai/faiPartition.tpl.c:47
+#: admin/fai/class_faiDiskEntry.inc:743 admin/fai/class_faiPartition.inc:432
 msgid "Mount point"
 msgstr ""
 
-#: admin/fai/class_faiDiskEntry.inc:765
-#: admin/fai/class_faiPartitionTableEntry.inc:461
-#: admin/fai/class_faiPartition.inc:402 admin/fai/class_faiPartition.inc:407
+#: admin/fai/class_faiDiskEntry.inc:744 admin/fai/class_faiPartition.inc:397
+#: admin/fai/class_faiPartition.inc:402
 msgid "Partition size"
 msgstr ""
 
-#: admin/fai/class_faiDiskEntry.inc:766
-#: admin/fai/class_faiPartitionTableEntry.inc:173
-#: admin/fai/class_faiPartitionTableEntry.inc:462
-#: admin/fai/faiPartition.tpl.c:50
+#: admin/fai/class_faiDiskEntry.inc:745
 msgid "Mount options"
 msgstr ""
 
-#: admin/fai/class_faiDiskEntry.inc:767
-#: admin/fai/class_faiPartitionTableEntry.inc:463
+#: admin/fai/class_faiDiskEntry.inc:746
 msgid "File system options"
 msgstr ""
 
-#: admin/fai/class_faiDiskEntry.inc:768
-#: admin/fai/class_faiPartitionTableEntry.inc:464
+#: admin/fai/class_faiDiskEntry.inc:747
 msgid "Partition flags"
 msgstr ""
 
-#: admin/fai/class_debconfTemplate.inc:227
+#: admin/fai/class_debconfTemplate.inc:225
 msgid "This package has no debconf options."
 msgstr ""
 
-#: admin/fai/class_debconfTemplate.inc:264
+#: admin/fai/class_debconfTemplate.inc:262
 msgid ""
 "This debconf question is dynamically generated during package installation "
 "and requires choosing between specific options which cannot be presented "
@@ -493,217 +302,59 @@ msgid ""
 " effect."
 msgstr ""
 
-#: admin/fai/class_faiTemplateEntry.inc:139
-msgid "no file uploaded yet"
+#: admin/fai/class_faiTemplateEntry.inc:143
+msgid "File path"
 msgstr ""
 
-#: admin/fai/class_faiTemplateEntry.inc:142
-#, php-format
-msgid "exists in database (size: %s bytes)"
-msgstr ""
-
-#: admin/fai/class_faiTemplateEntry.inc:251
-#: admin/systems/class_faiLogView.inc:70 admin/fai/faiTemplateEntry.tpl.c:23
-msgid "File"
+#: admin/fai/class_faiTemplateEntry.inc:143
+msgid "Complete absolute template file path and name"
 msgstr ""
 
-#: admin/fai/class_faiTemplateEntry.inc:255
-#: admin/fai/faiTemplateEntry.tpl.c:11
-msgid "Destination path"
+#: admin/fai/class_faiTemplateEntry.inc:147
+msgid "Short description of the file"
 msgstr ""
 
-#: admin/fai/class_faiTemplateEntry.inc:260 admin/fai/faiTemplateEntry.tpl.c:8
-msgid "File name"
-msgstr ""
-
-#: admin/fai/class_faiTemplateEntry.inc:264
-#: admin/fai/class_faiTemplateEntry.inc:266
-#: admin/fai/faiTemplateEntry.tpl.c:68
-msgid "User"
+#: admin/fai/class_faiTemplateEntry.inc:156
+msgid "Template attributes"
 msgstr ""
 
-#: admin/fai/class_faiTemplateEntry.inc:270
-#: admin/fai/class_faiTemplateEntry.inc:273
-#: admin/fai/class_faiTemplateEntry.inc:275
-#: admin/fai/faiTemplateEntry.tpl.c:47 admin/fai/faiTemplateEntry.tpl.c:74
-msgid "Group"
-msgstr "Ù…Ø¬Ù…ÙˆØ¹Ø©"
-
-#: admin/fai/class_faiTemplateEntry.inc:305
-msgid "Template entry"
+#: admin/fai/class_faiTemplateEntry.inc:160
+msgid "Template file content"
 msgstr ""
 
-#: admin/fai/class_faiTemplateEntry.inc:306
-msgid "FAI template entry"
+#: admin/fai/class_faiTemplateEntry.inc:160
+msgid "Content of the template file"
 msgstr ""
 
-#: admin/fai/class_faiTemplateEntry.inc:314
-msgid "Template file"
+#: admin/fai/class_faiTemplateEntry.inc:164
+msgid "Owner and group of the file"
 msgstr ""
 
-#: admin/fai/class_faiTemplateEntry.inc:315
-msgid "Template path"
+#: admin/fai/class_faiTemplateEntry.inc:167
+msgid "Owner"
 msgstr ""
 
-#: admin/fai/class_faiTemplateEntry.inc:316
+#: admin/fai/class_faiTemplateEntry.inc:167
 msgid "File owner"
 msgstr ""
 
-#: admin/fai/class_faiTemplateEntry.inc:317
-msgid "File permissions"
-msgstr ""
-
-#: admin/fai/class_FAI.inc:287 admin/fai/class_FAI.inc:679
-#: admin/fai/class_FAI.inc:1266 admin/fai/class_FAI.inc:1283
-#: admin/fai/class_FAI.inc:1287
-msgid "LDAP error"
-msgstr ""
-
-#: admin/fai/class_FAI.inc:570
-#, php-format
-msgid "Error, following objects should be equal '%s' and '%s'"
-msgstr ""
-
-#: admin/fai/class_FAI.inc:891
-#, php-format
-msgid "Creating group application release for %s"
-msgstr ""
-
-#: admin/fai/class_FAI.inc:960 admin/fai/class_FAI.inc:982
-#: admin/fai/class_FAI.inc:1022 admin/fai/class_FAI.inc:1027
-#: admin/fai/class_FAI.inc:1065
-msgid "Object"
-msgstr ""
-
-#: admin/fai/class_FAI.inc:961
-#, php-format
-msgid "Adding missing group application release container %s."
-msgstr ""
-
-#: admin/fai/class_FAI.inc:983
-#, php-format
-msgid "Adding group application release container %s."
-msgstr ""
-
-#: admin/fai/class_FAI.inc:1023
-#, php-format
-msgid "Could not create menu entry %s. (Already exists)."
-msgstr ""
-
-#: admin/fai/class_FAI.inc:1028
-#, php-format
-msgid "Created group application menu entry for %s."
-msgstr ""
-
-#: admin/fai/class_FAI.inc:1059
-#, php-format
-msgid "Creating copy of %s"
-msgstr ""
-
-#: admin/fai/class_FAI.inc:1062
-msgid "Processing"
-msgstr ""
-
-#: admin/fai/class_FAI.inc:1080
-msgid "Could not create new release, the destination dn is already in use."
-msgstr ""
-
-#: admin/fai/class_FAI.inc:1093
-msgid "Error while fetching source dn - aborted!"
-msgstr ""
-
-#: admin/fai/class_FAI.inc:1174
-msgid "Fatal error"
-msgstr ""
-
-#: admin/fai/class_FAI.inc:1175
-#, php-format
-msgid ""
-"Release creation failed due to ldap errors. Additional informations '%s'."
-msgstr ""
-
-#: admin/fai/class_faiPartitionTableEntry.inc:162
-msgid "primary"
-msgstr ""
-
-#: admin/fai/class_faiPartitionTableEntry.inc:162
-msgid "logical"
-msgstr ""
-
-#: admin/fai/class_faiPartitionTableEntry.inc:169
-#: admin/fai/faiPartition.tpl.c:8
-msgid "Type"
-msgstr "Ø§Ù„Ù†ÙˆØ¹"
-
-#: admin/fai/class_faiPartitionTableEntry.inc:170
-msgid "FS type"
-msgstr ""
-
-#: admin/fai/class_faiPartitionTableEntry.inc:172
-msgid "Size in MB"
-msgstr ""
-
-#: admin/fai/class_faiPartitionTableEntry.inc:174
-msgid "FS option"
-msgstr ""
-
-#: admin/fai/class_faiPartitionTableEntry.inc:175
-#: admin/fai/faiPartition.tpl.c:23
-msgid "Preserve"
-msgstr ""
-
-#: admin/fai/class_faiPartitionTableEntry.inc:266
-msgid "False"
-msgstr ""
-
-#: admin/fai/class_faiPartitionTableEntry.inc:268
-msgid "True"
-msgstr ""
-
-#: admin/fai/class_faiPartitionTableEntry.inc:272
-#: admin/fai/class_faiPartitionTableEntry.inc:274 admin/fai/fai-list.xml:159
-#: admin/fai/fai-list.xml:198
-msgid "Remove"
-msgstr "Ø¥Ø²Ø§Ù„Ø©"
-
-#: admin/fai/class_faiPartitionTableEntry.inc:384
-#, php-format
-msgid "please enter a unique mount point for partition %s"
-msgstr ""
-
-#: admin/fai/class_faiPartitionTableEntry.inc:389
-#, php-format
-msgid "partition %s mount point"
-msgstr ""
-
-#: admin/fai/class_faiPartitionTableEntry.inc:394
-#, php-format
-msgid ""
-"File system type 'swap' is already used, change file system type for "
-"partition %s."
-msgstr ""
+#: admin/fai/class_faiTemplateEntry.inc:172
+msgid "Group"
+msgstr "Ù…Ø¬Ù…ÙˆØ¹Ø©"
 
-#: admin/fai/class_faiPartitionTableEntry.inc:398
-msgid "Please use 'swap' as mount point, if 'swap' is used as fs-type."
+#: admin/fai/class_faiTemplateEntry.inc:172
+msgid "File group"
 msgstr ""
 
-#: admin/fai/class_faiPartitionTableEntry.inc:404
-#: admin/fai/class_faiPartitionTableEntry.inc:408
-#: admin/fai/class_faiPartitionTableEntry.inc:414
-#: admin/fai/class_faiPartitionTableEntry.inc:416
-#: admin/fai/class_faiPartitionTableEntry.inc:421
-#, php-format
-msgid "partition %s size"
+#: admin/fai/class_faiTemplateEntry.inc:181
+msgid "Access"
 msgstr ""
 
-#: admin/fai/class_faiPartitionTableEntry.inc:436
-msgid ""
-"You have more than 3 primary partition table entries in your configuration, "
-"please check your configuration twice."
+#: admin/fai/class_faiTemplateEntry.inc:181
+msgid "Access rights"
 msgstr ""
 
 #: admin/fai/packageSelect/selectPackage-list.xml:10
-#: admin/fai/classSelect/selectClass-list.xml:11
 msgid "Please select the desired entries"
 msgstr ""
 
@@ -711,147 +362,94 @@ msgstr ""
 msgid "Version"
 msgstr ""
 
-#: admin/fai/class_faiProfile.inc:310
-msgid "This list displays all assigned class names for this profile."
-msgstr ""
-
-#: admin/fai/class_faiProfile.inc:313 admin/fai/class_askClassName.inc:103
-#: admin/fai/classSelect/class_classSelect.inc:53
-#: admin/fai/class_faiProfileEntry.inc:158
-msgid "Hook bundle"
-msgstr ""
-
-#: admin/fai/class_faiProfile.inc:314 admin/fai/class_askClassName.inc:105
-#: admin/fai/classSelect/class_classSelect.inc:54
-#: admin/fai/class_faiProfileEntry.inc:159
-msgid "Template bundle"
-msgstr ""
-
-#: admin/fai/class_faiProfile.inc:315 admin/fai/class_askClassName.inc:101
-#: admin/fai/classSelect/class_classSelect.inc:55
-#: admin/fai/class_faiProfileEntry.inc:160
-msgid "Script bundle"
-msgstr ""
-
-#: admin/fai/class_faiProfile.inc:316 admin/fai/class_askClassName.inc:102
-#: admin/fai/classSelect/class_classSelect.inc:56
-#: admin/fai/class_faiProfileEntry.inc:161
-msgid "Variable bundle"
-msgstr ""
-
-#: admin/fai/class_faiProfile.inc:317 admin/fai/class_askClassName.inc:100
-#: admin/fai/classSelect/class_classSelect.inc:57
-#: admin/fai/class_faiProfileEntry.inc:162
-msgid "Package bundle"
-msgstr ""
-
-#: admin/fai/class_faiProfile.inc:321
-msgid "Remove class from profile"
-msgstr ""
-
-#: admin/fai/class_faiProfile.inc:324
-msgid "Up"
-msgstr ""
-
-#: admin/fai/class_faiProfile.inc:325
-msgid "Down"
-msgstr ""
-
-#: admin/fai/class_faiProfile.inc:410
-msgid "No class specified for this profile!"
-msgstr ""
-
-#: admin/fai/class_faiProfile.inc:419
-msgid "You can't use the same name for a class and a profile!"
+#: admin/fai/class_faiProfile.inc:28
+msgid "Profile"
 msgstr ""
 
-#: admin/fai/class_faiProfile.inc:455
+#: admin/fai/class_faiProfile.inc:29
 msgid "FAI profile"
 msgstr ""
 
-#: admin/fai/class_faiProfile.inc:458
+#: admin/fai/class_faiProfile.inc:32
 msgid "FAI Profile"
 msgstr ""
 
-#: admin/fai/class_faiProfile.inc:465 admin/fai/faiProfile.tpl.c:17
+#: admin/fai/class_faiProfile.inc:61
 msgid "FAI classes"
 msgstr ""
 
-#: admin/fai/class_faiHookEntry.inc:200
-msgid "Hook entry"
+#: admin/fai/class_faiProfile.inc:61
+msgid "FAI classes which are part of this profile"
 msgstr ""
 
-#: admin/fai/class_faiHookEntry.inc:201
-msgid "FAI hook entry"
+#: admin/fai/class_faiPackageConfiguration.inc:88
+#, php-format
+msgid "Debconf information for package '%s'"
 msgstr ""
 
-#: admin/fai/class_faiHookEntry.inc:209 admin/fai/faiHookEntry.tpl.c:20
-msgid "Task"
+#: admin/fai/class_faiScript.inc:30 admin/fai/class_faiScript.inc:84
+#: admin/fai/class_faiHook.inc:87
+msgid "Script"
 msgstr ""
 
-#: admin/fai/class_faiHookEntry.inc:210 admin/fai/class_faiScript.inc:595
-#: admin/fai/class_faiScript.inc:599
+#: admin/fai/class_faiScript.inc:31 admin/fai/class_faiScript.inc:34
 msgid "FAI script"
 msgstr ""
 
-#: admin/fai/class_faiPackageConfiguration.inc:88
-#, php-format
-msgid "Debconf information for package '%s'"
+#: admin/fai/class_faiScript.inc:63
+msgid "Scripts"
 msgstr ""
 
-#: admin/fai/class_askClassName.inc:99 admin/fai/class_askClassName.inc:100
-#: admin/fai/class_askClassName.inc:101 admin/fai/class_askClassName.inc:102
-#: admin/fai/class_askClassName.inc:103 admin/fai/class_askClassName.inc:104
-#: admin/fai/class_askClassName.inc:105 admin/fai/class_askClassName.inc:106
-msgid "Create new FAI object"
+#: admin/fai/class_faiScript.inc:67 admin/fai/class_faiHook.inc:67
+#: admin/fai/class_faiVariable.inc:67
+msgid "Variables in this class"
 msgstr ""
 
-#: admin/fai/class_faiTemplateEdit.inc:80
-#, php-format
-msgid ""
-"The file encodig has changed from '%s' to '%s'. Do you really want to save?"
+#: admin/fai/class_faiScript.inc:71 admin/fai/class_faiHook.inc:71
+#: admin/fai/class_faiVariable.inc:71
+msgid "The name of the variable"
 msgstr ""
 
-#: admin/fai/class_faiScript.inc:333 admin/fai/class_faiScript.inc:335
-msgid "Sort direction"
+#: admin/fai/class_faiScript.inc:75 admin/fai/class_faiHook.inc:75
+#: admin/fai/class_faiVariable.inc:75
+msgid "A short description of the variable"
 msgstr ""
 
-#: admin/fai/class_faiScript.inc:348 admin/fai/faiScriptEntry.tpl.c:20
+#: admin/fai/class_faiScript.inc:79
 msgid "Priority"
 msgstr ""
 
-#: admin/fai/class_faiScript.inc:350
-msgid "Action"
+#: admin/fai/class_faiScript.inc:79
+msgid "Priority of this script (FIXME: less is done first?)"
 msgstr ""
 
-#: admin/fai/classSelect/selectClass-list.xml:36 admin/fai/fai-list.xml:88
-#: admin/fai/faiScriptEntry.tpl.c:14
-msgid "Properties"
-msgstr "Ø§Ù„Ø®ÙˆØ§Øµ"
+#: admin/fai/class_faiScript.inc:84
+msgid "The script itself"
+msgstr ""
 
-#: admin/fai/class_faiTemplate.inc:501 admin/fai/fai-list.xml:116
-msgid "Template"
+#: admin/fai/class_faiTemplate.inc:136
+#, php-format
+msgid "There are several files with the same path: %s"
 msgstr ""
 
-#: admin/fai/class_faiTemplate.inc:502 admin/fai/class_faiTemplate.inc:506
-msgid "FAI template"
+#: admin/fai/class_faiTemplate.inc:153
+msgid "Template"
 msgstr ""
 
-#: admin/fai/class_faiVariableEntry.inc:107
-msgid "Content"
+#: admin/fai/class_faiTemplate.inc:154 admin/fai/class_faiTemplate.inc:157
+msgid "FAI template"
 msgstr ""
 
-#: admin/fai/class_faiVariableEntry.inc:142
-msgid "Variable entry"
+#: admin/fai/class_faiTemplate.inc:176
+msgid "Template class name"
 msgstr ""
 
-#: admin/fai/class_faiVariableEntry.inc:143
-msgid "FAI variable entry "
+#: admin/fai/class_faiTemplate.inc:186
+msgid "Template files"
 msgstr ""
 
-#: admin/fai/class_faiVariableEntry.inc:151
-#: admin/fai/faiVariableEntry.tpl.c:20
-msgid "Variable content"
+#: admin/fai/class_faiTemplate.inc:190
+msgid "Template files in this class"
 msgstr ""
 
 #: admin/fai/class_faiPartition.inc:176 admin/fai/class_faiPartition.inc:180
@@ -950,94 +548,73 @@ msgstr ""
 msgid "btrfs"
 msgstr ""
 
-#: admin/fai/class_faiPartition.inc:224
-msgid "LVM/RAID"
-msgstr ""
-
-#: admin/fai/class_faiPartition.inc:327
+#: admin/fai/class_faiPartition.inc:325
 msgid "spare"
 msgstr ""
 
-#: admin/fai/class_faiPartition.inc:330
+#: admin/fai/class_faiPartition.inc:328
 msgid "missing"
 msgstr ""
 
-#: admin/fai/class_faiPartition.inc:333
+#: admin/fai/class_faiPartition.inc:331
 msgid "Options"
 msgstr ""
 
-#: admin/fai/class_faiPartition.inc:420
+#: admin/fai/class_faiPartition.inc:415
 msgid "Minimum partition size"
 msgstr ""
 
-#: admin/fai/class_faiPartition.inc:420
+#: admin/fai/class_faiPartition.inc:415
 msgid "Maximum partition size"
 msgstr ""
 
-#: admin/fai/class_faiPartition.inc:428
+#: admin/fai/class_faiPartition.inc:423
 msgid "Raid arrays must contain at least two partitions!"
 msgstr ""
 
-#: admin/fai/class_faiPartition.inc:430
+#: admin/fai/class_faiPartition.inc:425
 msgid ""
 "Raid 0 arrays can only be realized with a combination of two partitions!"
 msgstr ""
 
-#: admin/fai/class_faiHook.inc:332 admin/fai/class_faiHook.inc:334
-#: admin/fai/fai-list.xml:190 admin/fai/faiVariable.tpl.c:23
-#: admin/fai/faiVariable.tpl.c:26
-msgid "Edit"
-msgstr ""
-
-#: admin/fai/class_faiHook.inc:336
-msgid "Delete"
-msgstr ""
-
-#: admin/fai/class_faiHook.inc:521 admin/fai/fai-list.xml:128
+#: admin/fai/class_faiHook.inc:30
 msgid "Hook"
 msgstr ""
 
-#: admin/fai/class_faiHook.inc:522 admin/fai/class_faiHook.inc:526
+#: admin/fai/class_faiHook.inc:31 admin/fai/class_faiHook.inc:34
 msgid "FAI hook"
 msgstr ""
 
-#: admin/fai/class_faiVariable.inc:387 admin/fai/fai-list.xml:134
-msgid "Variable"
-msgstr ""
-
-#: admin/fai/class_faiVariable.inc:388 admin/fai/class_faiVariable.inc:392
-msgid "FAI variable"
+#: admin/fai/class_faiHook.inc:63
+msgid "Hooks"
 msgstr ""
 
-#: admin/fai/class_faiProfileEntry.inc:184 admin/fai/askClassName.tpl.c:11
-#: admin/fai/askClassName.tpl.c:17 admin/fai/paste_generic.tpl.c:5
-msgid "Class name"
+#: admin/fai/class_faiHook.inc:79
+msgid "Task"
 msgstr ""
 
-#: admin/fai/class_faiProfileEntry.inc:184 admin/fai/faiTemplate.tpl.c:14
-#: admin/fai/faiVariable.tpl.c:14 admin/fai/faiHook.tpl.c:14
-#: admin/fai/faiPartitionTable.tpl.c:17 admin/fai/faiScript.tpl.c:14
-msgid "Objects"
+#: admin/fai/class_faiHook.inc:87
+msgid "The script of this hook"
 msgstr ""
 
-#: admin/fai/fai-list.xml:11
-msgid "List of deployment classes and products"
+#: admin/fai/class_faiVariable.inc:30
+msgid "Variable"
 msgstr ""
 
-#: admin/fai/fai-list.xml:15
-msgid "partitionTable"
+#: admin/fai/class_faiVariable.inc:31 admin/fai/class_faiVariable.inc:34
+msgid "FAI variable"
 msgstr ""
 
-#: admin/fai/fai-list.xml:23
-msgid "packagelist"
+#: admin/fai/class_faiVariable.inc:63
+msgid "Variables"
 msgstr ""
 
-#: admin/fai/fai-list.xml:93
-msgid "Actions"
+#: admin/fai/class_faiVariable.inc:79
+msgid "Content"
 msgstr ""
 
-#: admin/fai/fai-list.xml:104
-msgid "Create"
+#: admin/fai/class_faiVariable.inc:79
+msgid "The content of the variable"
 msgstr ""
 
 #: admin/systems/class_faiLogView.inc:56
@@ -1048,6 +625,10 @@ msgstr ""
 msgid "Sort up"
 msgstr ""
 
+#: admin/systems/class_faiLogView.inc:70
+msgid "File"
+msgstr ""
+
 #: admin/systems/class_faiLogView.inc:71
 msgid "Date"
 msgstr ""
@@ -1082,7 +663,7 @@ msgstr ""
 msgid "Selected file: %s"
 msgstr ""
 
-#: admin/systems/class_faiStartup.inc:70 admin/fai/paste_generic.tpl.c:2
+#: admin/systems/class_faiStartup.inc:70
 msgid "FAI settings"
 msgstr ""
 
@@ -1102,11 +683,6 @@ msgstr ""
 msgid "FAI profil to be applied to this computer"
 msgstr ""
 
-#: admin/systems/class_faiStartup.inc:90 admin/fai/faiPackage.tpl.c:14
-#: admin/fai/faiPackage.tpl.c:17
-msgid "Repository"
-msgstr ""
-
 #: admin/systems/class_faiStartup.inc:90
 msgid "FAI Debian repository to be used for installation"
 msgstr ""
@@ -1131,85 +707,96 @@ msgstr ""
 msgid "Linux kernel parameters to be ran"
 msgstr ""
 
-#: admin/systems/class_faiStartup.inc:178
+#: admin/systems/class_faiStartup.inc:179
 msgid "Full automated installation"
 msgstr ""
 
-#: admin/systems/services/repository/class_serviceRepository.inc:31
+#: admin/systems/services/repository/class_serviceDebianRepository.inc:34
+#: admin/systems/services/repository/class_serviceCentosRepository.inc:31
+msgid "Repositories"
+msgstr ""
+
+#: admin/systems/services/repository/class_serviceDebianRepository.inc:39
+#: admin/systems/services/repository/class_serviceCentosRepository.inc:36
+msgid "Repositories this server hosts"
+msgstr ""
+
+#: admin/systems/services/repository/class_serviceDebianRepository.inc:43
+#: admin/systems/services/repository/class_serviceCentosRepository.inc:40
 msgid "URL"
 msgstr ""
 
-#: admin/systems/services/repository/class_serviceRepository.inc:31
+#: admin/systems/services/repository/class_serviceDebianRepository.inc:43
+#: admin/systems/services/repository/class_serviceCentosRepository.inc:40
 msgid "Repository url"
 msgstr ""
 
-#: admin/systems/services/repository/class_serviceRepository.inc:35
+#: admin/systems/services/repository/class_serviceDebianRepository.inc:47
+#: admin/systems/services/repository/class_serviceCentosRepository.inc:44
 msgid "Parent server"
 msgstr ""
 
-#: admin/systems/services/repository/class_serviceRepository.inc:35
+#: admin/systems/services/repository/class_serviceDebianRepository.inc:47
+#: admin/systems/services/repository/class_serviceCentosRepository.inc:44
 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"
+#: admin/systems/services/repository/class_serviceDebianRepository.inc:52
+msgid "Debian release used on this repository"
 msgstr ""
 
-#: admin/systems/services/repository/class_serviceRepository.inc:47
-msgid "Sections available on this repository"
+#: admin/systems/services/repository/class_serviceDebianRepository.inc:58
+msgid "Debian sections available on this repository"
 msgstr ""
 
-#: admin/systems/services/repository/class_serviceRepository.inc:52
+#: admin/systems/services/repository/class_serviceDebianRepository.inc:63
+#: admin/systems/services/repository/class_serviceCentosRepository.inc:57
 msgid "Mirror mode"
 msgstr ""
 
-#: admin/systems/services/repository/class_serviceRepository.inc:52
+#: admin/systems/services/repository/class_serviceDebianRepository.inc:63
+#: admin/systems/services/repository/class_serviceCentosRepository.inc:57
 msgid ""
 "Is this mirror an installation repository? Is its release a custom one?"
 msgstr ""
 
-#: admin/systems/services/repository/class_serviceRepository.inc:57
+#: admin/systems/services/repository/class_serviceDebianRepository.inc:68
+#: admin/systems/services/repository/class_serviceCentosRepository.inc:62
 msgid "Local mirror"
 msgstr ""
 
-#: admin/systems/services/repository/class_serviceRepository.inc:57
+#: admin/systems/services/repository/class_serviceDebianRepository.inc:68
+#: admin/systems/services/repository/class_serviceCentosRepository.inc:62
 msgid "Is this mirror a local or a network mirror?"
 msgstr ""
 
-#: admin/systems/services/repository/class_serviceRepository.inc:66
+#: admin/systems/services/repository/class_serviceDebianRepository.inc:77
+#: admin/systems/services/repository/class_serviceCentosRepository.inc:71
 msgid "Architectures"
 msgstr ""
 
-#: admin/systems/services/repository/class_serviceRepository.inc:66
+#: admin/systems/services/repository/class_serviceDebianRepository.inc:77
+#: admin/systems/services/repository/class_serviceCentosRepository.inc:71
 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:140
-msgid "Repositories"
+#: admin/systems/services/repository/class_serviceDebianRepository.inc:99
+#: admin/systems/services/repository/class_serviceDebianRepository.inc:100
+msgid "Debian repository"
 msgstr ""
 
-#: admin/systems/services/repository/class_serviceRepository.inc:145
-msgid "Repositories this server hosts"
-msgstr ""
+#: admin/systems/services/repository/class_serviceDebianRepository.inc:100
+#: admin/systems/services/repository/class_serviceCentosRepository.inc:96
+msgid "Services"
+msgstr "Ø®Ø¯Ù…Ø§Øª"
 
-#: admin/systems/services/repository/class_serviceRepository.inc:160
-msgid "Package repository"
+#: admin/systems/services/repository/class_serviceCentosRepository.inc:49
+msgid "Centos release used on this repository"
 msgstr ""
 
-#: admin/systems/services/repository/class_serviceRepository.inc:161
-msgid "Package repository information"
+#: admin/systems/services/repository/class_serviceCentosRepository.inc:95
+#: admin/systems/services/repository/class_serviceCentosRepository.inc:96
+msgid "Centos repository"
 msgstr ""
 
 #: config/fai/class_faiConfig.inc:28
@@ -1241,476 +828,3 @@ msgstr ""
 #: config/fai/class_faiConfig.inc:60
 msgid "s"
 msgstr ""
-
-#: admin/fai/faiPartitionTableEntry.tpl.c:2 admin/fai/faiVariableEntry.tpl.c:2
-#: admin/fai/faiVariableEntry.tpl.c:5 admin/fai/faiDiskEntry.tpl.c:2
-#: admin/fai/faiTemplate.tpl.c:2 admin/fai/faiTemplate.tpl.c:5
-#: admin/fai/faiVariable.tpl.c:2 admin/fai/faiVariable.tpl.c:5
-#: admin/fai/faiHook.tpl.c:2 admin/fai/faiHook.tpl.c:5
-#: admin/fai/faiPackage.tpl.c:2 admin/fai/faiPackage.tpl.c:5
-#: admin/fai/faiTemplateEntry.tpl.c:2 admin/fai/faiTemplateEntry.tpl.c:5
-#: admin/fai/faiScriptEntry.tpl.c:2 admin/fai/faiScriptEntry.tpl.c:5
-#: admin/fai/faiPartitionTable.tpl.c:2 admin/fai/faiPartitionTable.tpl.c:5
-#: admin/fai/faiScript.tpl.c:2 admin/fai/faiScript.tpl.c:5
-#: admin/fai/faiProfile.tpl.c:2 admin/fai/faiProfile.tpl.c:5
-#: admin/fai/faiProfile.tpl.c:14 admin/fai/faiHookEntry.tpl.c:2
-#: admin/fai/faiHookEntry.tpl.c:5
-msgid "Generic"
-msgstr ""
-
-#: admin/fai/faiPartitionTableEntry.tpl.c:14
-#: admin/fai/faiPartitionTableEntry.tpl.c:17 admin/fai/faiDiskEntry.tpl.c:23
-#: admin/fai/faiDiskEntry.tpl.c:26
-msgid "Partition entries"
-msgstr ""
-
-#: admin/fai/faiPartitionTableEntry.tpl.c:20
-#: admin/fai/faiPartitionTableEntry.tpl.c:23 admin/fai/faiDiskEntry.tpl.c:29
-#: admin/fai/faiDiskEntry.tpl.c:32
-msgid "Add partition"
-msgstr ""
-
-#: admin/fai/branch_selector.tpl.c:2
-msgid "Releases"
-msgstr ""
-
-#: admin/fai/branch_selector.tpl.c:5
-msgid "Current release"
-msgstr ""
-
-#: admin/fai/branch_selector.tpl.c:8 admin/fai/branch_selector.tpl.c:17
-#: admin/fai/fai-filter.tpl.c:8 admin/fai/fai-filter.tpl.c:17
-msgid "Create release"
-msgstr ""
-
-#: admin/fai/branch_selector.tpl.c:11 admin/fai/branch_selector.tpl.c:23
-#: admin/fai/fai-filter.tpl.c:11 admin/fai/fai-filter.tpl.c:23
-msgid "Create read-only release"
-msgstr ""
-
-#: admin/fai/branch_selector.tpl.c:20 admin/fai/fai-filter.tpl.c:20
-msgid "Freeze"
-msgstr ""
-
-#: admin/fai/branch_selector.tpl.c:26 admin/fai/fai-filter.tpl.c:26
-msgid "Delete current release"
-msgstr ""
-
-#: admin/fai/faiPartition.tpl.c:2
-msgid "Partition"
-msgstr ""
-
-#: admin/fai/faiPartition.tpl.c:17
-msgid "Resize existing partition"
-msgstr ""
-
-#: admin/fai/faiPartition.tpl.c:20
-msgid "Bootable"
-msgstr ""
-
-#: admin/fai/faiPartition.tpl.c:26 admin/fai/faiDiskEntry.tpl.c:20
-msgid "Combined physical partitions"
-msgstr ""
-
-#: admin/fai/faiPartition.tpl.c:29
-msgid "Toggle missing"
-msgstr ""
-
-#: admin/fai/faiPartition.tpl.c:32
-msgid "Toggle spare"
-msgstr ""
-
-#: admin/fai/faiPartition.tpl.c:35
-msgid "Filesystem"
-msgstr ""
-
-#: admin/fai/faiPartition.tpl.c:38
-msgid "Filesystem create options"
-msgstr ""
-
-#: admin/fai/faiPartition.tpl.c:41
-msgid "Encrypted"
-msgstr ""
-
-#: admin/fai/faiPartition.tpl.c:44
-msgid "Tune options"
-msgstr ""
-
-#: admin/fai/faiNewBranch.tpl.c:2
-msgid ""
-"You are now going to create a branch or locked branch. This action clones "
-"the existing release to another release name. Branches can be modified as "
-"usual. FAI classes of locked branches cannot be modified, just additional "
-"classes are possible. Branch names should be alphanumeric, excluding the "
-"reserved names 'scripts', 'hooks', 'partitions', 'variables', 'templates' "
-"and 'fai'."
-msgstr ""
-
-#: admin/fai/faiNewBranch.tpl.c:5
-msgid ""
-"Branches are created as subreleases of the currently selected branch. "
-"Creating a new branch named 1.0.2 in SARGE for example, will result in a new"
-" release called SARGE/1.0.2."
-msgstr ""
-
-#: admin/fai/faiNewBranch.tpl.c:8
-msgid "Please enter a name for the branch"
-msgstr ""
-
-#: admin/fai/faiNewBranch.tpl.c:11
-msgid "Processing the requested operation"
-msgstr ""
-
-#: admin/fai/faiNewBranch.tpl.c:14
-msgid ""
-"As soon as the copy operation has finished, you can scroll down to end of "
-"the page and press the 'Continue' button to continue with the fai management"
-" dialog."
-msgstr ""
-
-#: admin/fai/faiNewBranch.tpl.c:17
-msgid ""
-"Your browser doesn't support iframes, please use this link to perform the "
-"requested operation."
-msgstr ""
-
-#: admin/fai/faiNewBranch.tpl.c:20
-msgid "Perform requested operation."
-msgstr ""
-
-#: admin/fai/faiNewBranch.tpl.c:23
-msgid "Initiate operation"
-msgstr ""
-
-#: admin/fai/faiVariableEntry.tpl.c:14 admin/fai/faiVariableEntry.tpl.c:17
-msgid "Variable attributes"
-msgstr ""
-
-#: admin/fai/faiDiskEntry.tpl.c:11
-msgid "fstab key"
-msgstr ""
-
-#: admin/fai/faiDiskEntry.tpl.c:17
-msgid "Disk label"
-msgstr ""
-
-#: admin/fai/faiTemplate.tpl.c:17
-msgid "List of template files"
-msgstr ""
-
-#: admin/fai/faiVariable.tpl.c:17
-msgid "List of assigned variables"
-msgstr ""
-
-#: admin/fai/faiVariable.tpl.c:20
-msgid "Choose a variable to delete or edit"
-msgstr ""
-
-#: admin/fai/askClassName.tpl.c:2
-msgid ""
-"Adding a new class to the FAI management, requires a class name. You have to"
-" specify a unique class name for unique types of FAI classes, while you can "
-"use the same class name for different types of FAI classes. In the laste "
-"case, FAI will automatically enclose all these different class types to one "
-"unique class name."
-msgstr ""
-
-#: admin/fai/askClassName.tpl.c:5
-msgid ""
-"Please use one of the following methods to choose the name for the new FAI "
-"class."
-msgstr ""
-
-#: admin/fai/askClassName.tpl.c:8
-msgid "Enter FAI class name manually"
-msgstr ""
-
-#: admin/fai/askClassName.tpl.c:14
-msgid "Choose FAI class name from a list of existing classes"
-msgstr ""
-
-#: admin/fai/askClassName.tpl.c:20
-msgid "Choose class name"
-msgstr ""
-
-#: admin/fai/faiGroupHandle.tpl.c:2
-msgid "Please select the objects you want to remove:"
-msgstr ""
-
-#: admin/fai/faiGroupHandle.tpl.c:5
-msgid "Freezed"
-msgstr ""
-
-#: admin/fai/faiGroupHandle.tpl.c:8
-msgid "Select the object you want to edit:"
-msgstr ""
-
-#: admin/fai/faiGroupHandle.tpl.c:11
-msgid "Select the object you want to copy:"
-msgstr ""
-
-#: admin/fai/remove.tpl.c:5
-msgid ""
-"This includes all account data, system access rules, imap settings, etc. for"
-" this user. Please double check if your really want to do this since there "
-"is no way for FusionDirectory to get your data back."
-msgstr ""
-
-#: admin/fai/remove.tpl.c:8 admin/fai/remove_branch.tpl.c:8
-msgid "So - if you're sure - press 'Delete' to continue or 'Cancel' to abort."
-msgstr ""
-
-#: admin/fai/faiHook.tpl.c:17
-msgid "List of hook scripts"
-msgstr ""
-
-#: admin/fai/packageSelect/selectPackage-list.tpl.c:2
-#: admin/fai/classSelect/selectClass-list.tpl.c:5
-msgid "Update"
-msgstr ""
-
-#: admin/fai/packageSelect/selectPackage-list.tpl.c:5
-#: admin/fai/classSelect/selectClass-list.tpl.c:8
-msgid "Submit"
-msgstr ""
-
-#: admin/fai/packageSelect/selectPackage-filter.tpl.c:2
-#: admin/fai/classSelect/selectClass-filter.tpl.c:2
-#: admin/fai/fai-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/remove_branch.tpl.c:5
-msgid ""
-"This includes all account data, system access, etc. for this branch. Please "
-"double check if your really want to do this since there is no way for "
-"FusionDirectory to get your data back."
-msgstr ""
-
-#: admin/fai/faiPackage.tpl.c:26
-msgid "Install method"
-msgstr ""
-
-#: admin/fai/faiPackage.tpl.c:29
-msgid "Please select the installation method"
-msgstr ""
-
-#: admin/fai/faiPackage.tpl.c:32 admin/fai/faiPackage.tpl.c:35
-msgid "Used packages"
-msgstr ""
-
-#: admin/fai/faiPackage.tpl.c:38
-msgid "Add from list"
-msgstr ""
-
-#: admin/fai/faiProfileEntry.tpl.c:2
-msgid "List of FAI objects (Fully Automatic Installation)"
-msgstr ""
-
-#: admin/fai/faiProfileEntry.tpl.c:5
-msgid "Information"
-msgstr "Ù…Ø¹Ù„ÙˆÙ…Ø§Øª"
-
-#: admin/fai/faiProfileEntry.tpl.c:8
-msgid ""
-"This menu allows you to select FAI class names and to add them to the "
-"currently edited profile."
-msgstr ""
-
-#: admin/fai/faiProfileEntry.tpl.c:11
-msgid "Filters"
-msgstr ""
-
-#: admin/fai/faiProfileEntry.tpl.c:14
-msgid "Show only classes with templates"
-msgstr ""
-
-#: admin/fai/faiProfileEntry.tpl.c:17
-msgid "Show only classes with scripts"
-msgstr ""
-
-#: admin/fai/faiProfileEntry.tpl.c:20
-msgid "Show only classes with hooks"
-msgstr ""
-
-#: admin/fai/faiProfileEntry.tpl.c:23
-msgid "Show only classes with variables"
-msgstr ""
-
-#: admin/fai/faiProfileEntry.tpl.c:26
-msgid "Show only classes with packages"
-msgstr ""
-
-#: admin/fai/faiProfileEntry.tpl.c:29
-msgid "Show only classes with partitions"
-msgstr ""
-
-#: admin/fai/faiProfileEntry.tpl.c:32 admin/fai/faiProfileEntry.tpl.c:35
-msgid "Display objects matching"
-msgstr ""
-
-#: admin/fai/faiProfileEntry.tpl.c:38
-msgid "Regular expression for matching object names"
-msgstr ""
-
-#: admin/fai/faiTemplateEntry.tpl.c:17 admin/fai/faiTemplateEntry.tpl.c:20
-msgid "Template attributes"
-msgstr ""
-
-#: admin/fai/faiTemplateEntry.tpl.c:26 admin/fai/faiTemplateEntry.tpl.c:29
-msgid "Save template"
-msgstr ""
-
-#: admin/fai/faiTemplateEntry.tpl.c:32 admin/fai/faiTemplateEntry.tpl.c:35
-msgid "Edit template"
-msgstr ""
-
-#: admin/fai/faiTemplateEntry.tpl.c:38
-msgid "Full path"
-msgstr ""
-
-#: admin/fai/faiTemplateEntry.tpl.c:41
-msgid "Upload"
-msgstr ""
-
-#: admin/fai/faiTemplateEntry.tpl.c:44
-msgid "Owner"
-msgstr ""
-
-#: admin/fai/faiTemplateEntry.tpl.c:50
-msgid "Access"
-msgstr ""
-
-#: admin/fai/faiTemplateEntry.tpl.c:53
-msgid "Class"
-msgstr ""
-
-#: admin/fai/faiTemplateEntry.tpl.c:56
-msgid "Read"
-msgstr ""
-
-#: admin/fai/faiTemplateEntry.tpl.c:59
-msgid "Write"
-msgstr ""
-
-#: admin/fai/faiTemplateEntry.tpl.c:62
-msgid "Execute"
-msgstr ""
-
-#: admin/fai/faiTemplateEntry.tpl.c:65
-msgid "Special"
-msgstr ""
-
-#: admin/fai/faiTemplateEntry.tpl.c:71
-msgid "SUID"
-msgstr ""
-
-#: admin/fai/faiTemplateEntry.tpl.c:77
-msgid "SGID"
-msgstr ""
-
-#: admin/fai/faiTemplateEntry.tpl.c:80
-msgid "Others"
-msgstr ""
-
-#: admin/fai/faiTemplateEntry.tpl.c:83
-msgid "sticky"
-msgstr ""
-
-#: admin/fai/faiScriptEntry.tpl.c:17 admin/fai/faiScriptEntry.tpl.c:26
-msgid "Script attributes"
-msgstr ""
-
-#: admin/fai/faiScriptEntry.tpl.c:23
-msgid ""
-"Choose a priority. Low values result in an earlier, high values in a later "
-"execution."
-msgstr ""
-
-#: admin/fai/faiScriptEntry.tpl.c:32 admin/fai/faiHookEntry.tpl.c:32
-msgid "Import script"
-msgstr ""
-
-#: admin/fai/classSelect/selectClass-list.tpl.c:2
-msgid "Base"
-msgstr ""
-
-#: admin/fai/fai-filter.tpl.c:29
-msgid "Show profiles"
-msgstr ""
-
-#: admin/fai/fai-filter.tpl.c:32
-msgid "Show templates"
-msgstr ""
-
-#: admin/fai/fai-filter.tpl.c:35
-msgid "Show scripts"
-msgstr ""
-
-#: admin/fai/fai-filter.tpl.c:38
-msgid "Show hooks"
-msgstr ""
-
-#: admin/fai/fai-filter.tpl.c:41
-msgid "Show variables"
-msgstr ""
-
-#: admin/fai/fai-filter.tpl.c:44
-msgid "Show packages"
-msgstr ""
-
-#: admin/fai/fai-filter.tpl.c:47
-msgid "Show partitions"
-msgstr ""
-
-#: admin/fai/faiTemplateEdit.tpl.c:2
-msgid "This FAI template is write protected. Editing may break it!"
-msgstr ""
-
-#: admin/fai/faiTemplateEdit.tpl.c:5
-msgid "Edit anyway"
-msgstr ""
-
-#: admin/fai/faiPartitionTable.tpl.c:14
-msgid "Use 'setup-storage' to partition the disk"
-msgstr ""
-
-#: admin/fai/faiPartitionTable.tpl.c:20
-msgid "Discs"
-msgstr ""
-
-#: admin/fai/faiPartitionTable.tpl.c:23 admin/fai/faiPartitionTable.tpl.c:26
-#: admin/fai/faiPartitionTable.tpl.c:41 admin/fai/faiPartitionTable.tpl.c:44
-msgid "Add disk"
-msgstr ""
-
-#: admin/fai/faiPartitionTable.tpl.c:29 admin/fai/faiPartitionTable.tpl.c:32
-#: admin/fai/faiPartitionTable.tpl.c:47 admin/fai/faiPartitionTable.tpl.c:50
-msgid "Add RAID"
-msgstr ""
-
-#: admin/fai/faiPartitionTable.tpl.c:35 admin/fai/faiPartitionTable.tpl.c:38
-#: admin/fai/faiPartitionTable.tpl.c:53 admin/fai/faiPartitionTable.tpl.c:56
-msgid "Add volume group"
-msgstr ""
-
-#: admin/fai/faiScript.tpl.c:17
-msgid "List of scripts"
-msgstr ""
-
-#: admin/fai/faiProfile.tpl.c:20
-msgid "Choose a priority"
-msgstr ""
-
-#: admin/fai/faiHookEntry.tpl.c:14 admin/fai/faiHookEntry.tpl.c:17
-#: admin/fai/faiHookEntry.tpl.c:26
-msgid "Hook attributes"
-msgstr ""
-
-#: admin/fai/faiHookEntry.tpl.c:23
-msgid "Choose an existing FAI task"
-msgstr ""
diff --git a/fai/locale/ca/fusiondirectory.po b/fai/locale/ca/fusiondirectory.po
index 1b5e6204175d7867b80d1b820417a9d35c07782c..cc471c3a830c430f7c8c8974ff32c33dba0989ce 100644
--- a/fai/locale/ca/fusiondirectory.po
+++ b/fai/locale/ca/fusiondirectory.po
@@ -5,379 +5,188 @@
 # Translators:
 msgid ""
 msgstr ""
-"Project-Id-Version: FusionDirectory-108\n"
+"Project-Id-Version: FusionDirectory-109\n"
 "Report-Msgid-Bugs-To: documentation@lists.fusiondirectory.org\n"
-"POT-Creation-Date: 2015-03-19 21:45+0100\n"
-"PO-Revision-Date: 2015-02-25 16:12+0000\n"
+"POT-Creation-Date: 2014-12-15 17:47+0100\n"
+"PO-Revision-Date: 2015-02-25 16:04+0000\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>\n"
-"Language-Team: Catalan (http://www.transifex.com/projects/p/FusionDirectory-108/language/ca/)\n"
+"Language-Team: Catalan (http://www.transifex.com/projects/p/FusionDirectory-109/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/fai/class_faiScriptEntry.inc:79 admin/fai/class_faiScriptEntry.inc:82
-#: admin/fai/class_faiManagement.inc:240 admin/fai/class_faiManagement.inc:768
-#: admin/fai/class_faiManagement.inc:774
-#: admin/fai/class_faiPartitionTable.inc:268
-#: admin/fai/class_faiPartitionTable.inc:331
-#: admin/fai/class_faiDiskEntry.inc:445 admin/fai/class_FAI.inc:570
-#: admin/fai/class_faiHookEntry.inc:83 admin/fai/class_faiHookEntry.inc:86
-#: admin/fai/class_faiScript.inc:249 admin/fai/class_faiTemplate.inc:232
-#: admin/fai/class_faiHook.inc:259 admin/fai/class_faiVariable.inc:162
-#: admin/systems/class_faiLogView.inc:207
-#: admin/systems/class_faiLogView.inc:242
-msgid "Error"
-msgstr "Error"
-
-#: admin/fai/class_faiScriptEntry.inc:82 admin/fai/class_faiHookEntry.inc:86
-msgid "file is empty"
-msgstr ""
-
-#: admin/fai/class_faiScriptEntry.inc:102 admin/fai/class_faiHookEntry.inc:102
-#: admin/fai/class_faiScript.inc:349 admin/fai/class_faiScript.inc:374
-#: admin/fai/class_faiTemplate.inc:320 admin/fai/class_faiHook.inc:346
-msgid "Download"
-msgstr ""
-
-#: admin/fai/class_faiScriptEntry.inc:147
-#: admin/fai/class_faiScriptEntry.inc:151
-#: admin/fai/class_faiScriptEntry.inc:154
-#: admin/fai/class_faiScriptEntry.inc:197
-#: admin/fai/class_faiManagement.inc:768 admin/fai/class_faiManagement.inc:774
-#: admin/fai/class_faiPackage.inc:685
-#: admin/fai/class_faiPartitionTable.inc:779
-#: admin/fai/class_faiDiskEntry.inc:702 admin/fai/class_faiDiskEntry.inc:705
-#: admin/fai/class_faiDiskEntry.inc:758
-#: admin/fai/class_faiTemplateEntry.inc:247
-#: admin/fai/class_faiTemplateEntry.inc:312
-#: admin/fai/class_faiPartitionTableEntry.inc:353
-#: admin/fai/class_faiPartitionTableEntry.inc:356
-#: admin/fai/class_faiPartitionTableEntry.inc:360
-#: admin/fai/class_faiPartitionTableEntry.inc:455
-#: admin/fai/packageSelect/selectPackage-list.xml:40
-#: admin/fai/class_faiProfile.inc:414 admin/fai/class_faiProfile.inc:463
-#: admin/fai/class_faiHookEntry.inc:157 admin/fai/class_faiHookEntry.inc:162
-#: admin/fai/class_faiHookEntry.inc:165 admin/fai/class_faiHookEntry.inc:207
-#: admin/fai/class_askClassName.inc:163 admin/fai/class_askClassName.inc:167
-#: admin/fai/class_askClassName.inc:171 admin/fai/class_askClassName.inc:198
-#: admin/fai/class_faiScript.inc:347 admin/fai/class_faiScript.inc:605
-#: admin/fai/classSelect/selectClass-list.xml:28
-#: admin/fai/class_faiTemplate.inc:512
-#: admin/fai/class_faiVariableEntry.inc:103
-#: admin/fai/class_faiVariableEntry.inc:112
-#: admin/fai/class_faiVariableEntry.inc:115
-#: admin/fai/class_faiVariableEntry.inc:149 admin/fai/class_faiHook.inc:531
-#: admin/fai/class_faiVariable.inc:398 admin/fai/fai-list.xml:80
-#: admin/fai/faiPartitionTableEntry.tpl.c:8 admin/fai/faiPartition.tpl.c:5
-#: admin/fai/faiVariableEntry.tpl.c:8 admin/fai/faiDiskEntry.tpl.c:8
-#: admin/fai/faiTemplate.tpl.c:8 admin/fai/faiVariable.tpl.c:8
-#: admin/fai/faiHook.tpl.c:8
-#: admin/fai/packageSelect/selectPackage-filter.tpl.c:8
-#: admin/fai/faiPackage.tpl.c:8 admin/fai/faiScriptEntry.tpl.c:8
-#: admin/fai/classSelect/selectClass-filter.tpl.c:5
-#: admin/fai/fai-filter.tpl.c:50 admin/fai/faiPartitionTable.tpl.c:8
-#: admin/fai/faiScript.tpl.c:8 admin/fai/faiProfile.tpl.c:8
-#: admin/fai/faiHookEntry.tpl.c:8
-msgid "Name"
-msgstr "Nom"
-
-#: admin/fai/class_faiScriptEntry.inc:159 admin/fai/class_faiHookEntry.inc:170
-#: admin/fai/class_faiScript.inc:594 admin/fai/fai-list.xml:122
-#: admin/fai/faiScriptEntry.tpl.c:29 admin/fai/faiHookEntry.tpl.c:29
-msgid "Script"
-msgstr ""
-
-#: admin/fai/class_faiScriptEntry.inc:190
-#: admin/fai/class_faiScriptEntry.inc:199
-msgid "Script entry"
-msgstr ""
-
-#: admin/fai/class_faiScriptEntry.inc:191
-msgid "FAI script entry"
-msgstr ""
-
-#: admin/fai/class_faiScriptEntry.inc:198 admin/fai/class_faiPackage.inc:686
-#: admin/fai/class_faiPartitionTable.inc:780
-#: admin/fai/class_faiDiskEntry.inc:759
-#: admin/fai/class_faiTemplateEntry.inc:313
-#: admin/fai/class_faiPartitionTableEntry.inc:456
-#: admin/fai/class_faiProfile.inc:464 admin/fai/class_faiHookEntry.inc:208
-#: admin/fai/class_faiScript.inc:606 admin/fai/class_faiTemplate.inc:513
-#: admin/fai/class_faiVariableEntry.inc:150 admin/fai/class_faiHook.inc:532
-#: admin/fai/class_faiVariable.inc:399
-#: admin/fai/faiPartitionTableEntry.tpl.c:11 admin/fai/faiPartition.tpl.c:11
-#: admin/fai/faiVariableEntry.tpl.c:11 admin/fai/faiDiskEntry.tpl.c:14
-#: admin/fai/faiTemplate.tpl.c:11 admin/fai/faiVariable.tpl.c:11
-#: admin/fai/faiHook.tpl.c:11 admin/fai/faiPackage.tpl.c:11
-#: admin/fai/faiTemplateEntry.tpl.c:14 admin/fai/faiScriptEntry.tpl.c:11
-#: admin/fai/faiPartitionTable.tpl.c:11 admin/fai/faiScript.tpl.c:11
-#: admin/fai/faiProfile.tpl.c:11 admin/fai/faiHookEntry.tpl.c:11
-msgid "Description"
-msgstr ""
-
-#: admin/fai/class_faiScriptEntry.inc:200
-msgid "Script Priority"
-msgstr ""
-
-#: admin/fai/class_faiManagement.inc:188
-msgid "partition table"
-msgstr ""
-
-#: admin/fai/class_faiManagement.inc:189 admin/fai/fai-list.xml:31
-msgid "script"
-msgstr ""
-
-#: admin/fai/class_faiManagement.inc:190 admin/fai/fai-list.xml:47
-msgid "hook"
-msgstr ""
-
-#: admin/fai/class_faiManagement.inc:191 admin/fai/fai-list.xml:39
-msgid "variable"
-msgstr ""
-
-#: admin/fai/class_faiManagement.inc:192 admin/fai/fai-list.xml:63
-msgid "template"
-msgstr ""
-
-#: admin/fai/class_faiManagement.inc:193
-msgid "package list"
-msgstr ""
-
-#: admin/fai/class_faiManagement.inc:210 admin/fai/class_faiManagement.inc:226
-#: admin/fai/class_faiManagement.inc:332 admin/fai/class_faiManagement.inc:390
-#: admin/fai/class_faiManagement.inc:480 admin/fai/class_faiManagement.inc:575
-#: admin/fai/class_faiManagement.inc:598 admin/fai/class_faiManagement.inc:619
-msgid "Permission error"
-msgstr ""
-
-#: admin/fai/class_faiManagement.inc:211 admin/fai/class_faiManagement.inc:226
-#, php-format
-msgid "You have no permission to create a new %s!"
-msgstr ""
-
-#: admin/fai/class_faiManagement.inc:226 admin/fai/fai-list.xml:55
-msgid "profile"
-msgstr ""
-
-#: admin/fai/class_faiManagement.inc:328
-msgid "Branch locked"
-msgstr ""
-
-#: admin/fai/class_faiManagement.inc:329
-#, php-format
-msgid "The following entries are locked, you can't remove them %s."
-msgstr ""
-
-#: admin/fai/class_faiManagement.inc:346
-msgid "FAI object"
-msgstr ""
-
-#: admin/fai/class_faiManagement.inc:477
-msgid "FAI branch/freeze"
-msgstr ""
-
-#: admin/fai/class_faiManagement.inc:480
-msgid "You have no permission to delete this release!"
-msgstr ""
-
-#: admin/fai/class_faiManagement.inc:496 admin/fai/remove.tpl.c:2
-#: admin/fai/remove_branch.tpl.c:2
-msgid "Warning"
-msgstr "AvÃs"
-
-#: admin/fai/class_faiManagement.inc:496
-msgid "Release remove aborted because the release name check failed!"
-msgstr ""
-
-#: admin/fai/class_faiManagement.inc:573 admin/fai/class_faiManagement.inc:596
-msgid "Configuration"
-msgstr ""
-
-#: admin/fai/class_faiManagement.inc:575 admin/fai/class_faiManagement.inc:598
-#: admin/fai/class_faiManagement.inc:619
-msgid "Branch"
+#: admin/fai/class_faiManagement.inc:117 admin/fai/class_faiManagement.inc:122
+#: admin/fai/packageSelect/selectPackage-list.xml:14
+#: admin/systems/class_faiStartup.inc:178 config/fai/class_faiConfig.inc:41
+msgid "FAI"
 msgstr ""
 
-#: admin/fai/class_faiManagement.inc:725 admin/fai/askClassName.tpl.c:23
-msgid "Continue"
-msgstr "Continua"
-
-#: admin/fai/class_faiManagement.inc:926
-#: admin/fai/class_faiPartitionTable.inc:768
-#: admin/fai/class_faiProfile.inc:318 admin/fai/class_askClassName.inc:99
-#: admin/fai/classSelect/class_classSelect.inc:58
-#: admin/fai/class_faiGroupHandle.inc:120
-#: admin/fai/class_faiProfileEntry.inc:163 admin/fai/fai-list.xml:146
-msgid "Partition table"
+#: admin/fai/class_faiManagement.inc:118
+msgid "Manage FAI software packages and deployment recipes"
 msgstr ""
 
-#: admin/fai/class_faiManagement.inc:928
-#: admin/fai/class_faiGroupHandle.inc:122 admin/fai/fai-list.xml:140
-msgid "Package list"
+#: admin/fai/class_faiPackage.inc:157
+msgid "Mark for installation"
 msgstr ""
 
-#: admin/fai/class_faiManagement.inc:930
-#: admin/fai/class_faiGroupHandle.inc:124
-msgid "Scripts"
+#: admin/fai/class_faiPackage.inc:161
+msgid "Mark for removal"
 msgstr ""
 
-#: admin/fai/class_faiManagement.inc:932
-#: admin/fai/class_faiGroupHandle.inc:126
-msgid "Variables"
+#: admin/fai/class_faiPackage.inc:166
+msgid "Edit configuration"
 msgstr ""
 
-#: admin/fai/class_faiManagement.inc:934
-#: admin/fai/class_faiGroupHandle.inc:128
-msgid "Hooks"
-msgstr ""
-
-#: admin/fai/class_faiManagement.inc:936 admin/fai/class_faiProfile.inc:454
-#: admin/fai/class_askClassName.inc:104 admin/fai/class_faiGroupHandle.inc:130
-#: admin/fai/fai-list.xml:110
-msgid "Profile"
-msgstr ""
+#: admin/fai/class_faiPackage.inc:247
+#: admin/fai/class_faiPartitionTable.inc:209
+#: admin/fai/class_faiPartitionTable.inc:250
+#: admin/fai/class_faiTemplate.inc:114
+#: admin/systems/services/repository/class_serviceDebianRepository.inc:172
+#: admin/systems/services/repository/class_serviceDebianRepository.inc:189
+#: admin/systems/services/repository/class_serviceDebianRepository.inc:193
+msgid "LDAP error"
+msgstr "Error d'LDAP"
 
-#: admin/fai/class_faiManagement.inc:938
-#: admin/fai/class_faiGroupHandle.inc:132
-msgid "Templates"
+#: admin/fai/class_faiPackage.inc:279
+#: admin/fai/packageSelect/class_filterFAIPackages.inc:41
+#: admin/fai/packageSelect/class_filterFAIPackages.inc:46
+#: admin/fai/class_faiPackageConfiguration.inc:55
+#: admin/systems/class_faiStartup.inc:133
+#: admin/systems/class_faiStartup.inc:160
+msgid "Service infrastructure"
 msgstr ""
 
-#: admin/fai/class_faiManagement.inc:1039
-#: admin/fai/class_faiManagement.inc:1045
-#: admin/fai/packageSelect/selectPackage-list.xml:14
-#: admin/fai/classSelect/selectClass-list.xml:15
-#: admin/systems/class_faiStartup.inc:177 config/fai/class_faiConfig.inc:41
-msgid "FAI"
+#: admin/fai/class_faiPackage.inc:294
+msgid "Unkown packages"
 msgstr ""
 
-#: admin/fai/class_faiManagement.inc:1040
-msgid "Manage FAI software packages and deployment recipes"
+#: admin/fai/class_faiPackage.inc:365
+msgid "Package"
 msgstr ""
 
-#: admin/fai/class_faiPackage.inc:261
-msgid "Invalid package names"
+#: admin/fai/class_faiPackage.inc:366
+msgid "FAI Package list"
 msgstr ""
 
-#: admin/fai/class_faiPackage.inc:262
-#, php-format
-msgid "The following package names don't match the Debian policy: %s"
+#: admin/fai/class_faiPackage.inc:369
+msgid "FAI Package"
 msgstr ""
 
-#: admin/fai/class_faiPackage.inc:421 admin/fai/class_faiPackage.inc:422
-msgid "Configured"
+#: admin/fai/class_faiPackage.inc:385
+#: admin/fai/class_faiPartitionTable.inc:304
+#: admin/fai/class_faiTemplateEntry.inc:140 admin/fai/class_faiProfile.inc:47
+#: admin/fai/class_faiScript.inc:50 admin/fai/class_faiTemplate.inc:173
+#: admin/fai/class_faiHook.inc:50 admin/fai/class_faiVariable.inc:50
+msgid "Properties"
 msgstr ""
 
-#: admin/fai/class_faiPackage.inc:428 admin/fai/class_faiPackage.inc:429
-msgid "Package marked for removal"
+#: admin/fai/class_faiPackage.inc:388
+#: admin/fai/class_faiPartitionTable.inc:307 admin/fai/class_faiProfile.inc:50
+#: admin/fai/class_faiScript.inc:53 admin/fai/class_faiTemplate.inc:176
+#: admin/fai/class_faiHook.inc:53 admin/fai/class_faiVariable.inc:53
+msgid "Class name"
 msgstr ""
 
-#: admin/fai/class_faiPackage.inc:445
-msgid "Mark package for removal"
+#: admin/fai/class_faiPackage.inc:388 admin/fai/class_faiScript.inc:53
+#: admin/fai/class_faiHook.inc:53 admin/fai/class_faiVariable.inc:53
+msgid "Variables class name"
 msgstr ""
 
-#: admin/fai/class_faiPackage.inc:451
-msgid "Configure this package"
+#: admin/fai/class_faiPackage.inc:392
+#: admin/fai/class_faiPartitionTable.inc:311
+#: admin/fai/class_faiDiskEntry.inc:738
+#: admin/fai/class_faiTemplateEntry.inc:147 admin/fai/class_faiProfile.inc:54
+#: admin/fai/class_faiScript.inc:57 admin/fai/class_faiScript.inc:75
+#: admin/fai/class_faiTemplate.inc:180 admin/fai/class_faiHook.inc:57
+#: admin/fai/class_faiHook.inc:75 admin/fai/class_faiVariable.inc:57
+#: admin/fai/class_faiVariable.inc:75
+msgid "Description"
 msgstr ""
 
-#: admin/fai/class_faiPackage.inc:455
-msgid "Remove this package"
+#: admin/fai/class_faiPackage.inc:392
+#: admin/fai/class_faiPartitionTable.inc:311 admin/fai/class_faiProfile.inc:54
+#: admin/fai/class_faiScript.inc:57 admin/fai/class_faiTemplate.inc:180
+#: admin/fai/class_faiHook.inc:57 admin/fai/class_faiVariable.inc:57
+msgid "Short description of the class"
 msgstr ""
 
-#: admin/fai/class_faiPackage.inc:534
-msgid "Please select a least one package!"
+#: admin/fai/class_faiPackage.inc:398 admin/systems/class_faiStartup.inc:90
+msgid "Repository"
 msgstr ""
 
-#: admin/fai/class_faiPackage.inc:538
-msgid ""
-"Please choose a valid release/section combination for your repository setup!"
+#: admin/fai/class_faiPackage.inc:401 admin/systems/class_faiStartup.inc:78
+#: admin/systems/services/repository/class_serviceDebianRepository.inc:52
+#: admin/systems/services/repository/class_serviceCentosRepository.inc:49
+msgid "Release"
 msgstr ""
 
-#: admin/fai/class_faiPackage.inc:571
-#: admin/fai/packageSelect/class_filterFAIPackages.inc:41
-#: admin/fai/packageSelect/class_filterFAIPackages.inc:46
-#: admin/fai/class_faiPackageConfiguration.inc:55
-#: admin/systems/class_faiStartup.inc:132
-#: admin/systems/class_faiStartup.inc:159
-msgid "Infrastructure service"
+#: admin/fai/class_faiPackage.inc:401
+msgid "Debian release concerned"
 msgstr ""
 
-#: admin/fai/class_faiPackage.inc:587
-msgid "Unkown packages"
+#: admin/fai/class_faiPackage.inc:405
+#: admin/systems/services/repository/class_serviceDebianRepository.inc:58
+msgid "Sections"
 msgstr ""
 
-#: admin/fai/class_faiPackage.inc:674
-#: admin/fai/faiPackageConfiguration.tpl.c:2
-msgid "Package"
+#: admin/fai/class_faiPackage.inc:405
+msgid "Sections concerned"
 msgstr ""
 
-#: admin/fai/class_faiPackage.inc:675
-msgid "FAI Package list"
+#: admin/fai/class_faiPackage.inc:409
+msgid "Install method"
 msgstr ""
 
-#: admin/fai/class_faiPackage.inc:679
-msgid "FAI Package"
+#: admin/fai/class_faiPackage.inc:409
+msgid "Install method to use for this package list"
 msgstr ""
 
-#: admin/fai/class_faiPackage.inc:687
+#: admin/fai/class_faiPackage.inc:420
 msgid "Packages"
 msgstr ""
 
-#: admin/fai/class_faiPackage.inc:688 admin/fai/faiPackage.tpl.c:23
-msgid "Section"
+#: admin/fai/class_faiPackage.inc:424
+msgid "Packages in this class"
 msgstr ""
 
-#: admin/fai/class_faiPackage.inc:688 admin/fai/class_faiPackage.inc:691
-#: admin/fai/class_faiScript.inc:605 admin/fai/class_faiTemplate.inc:512
-msgid "Readonly"
-msgstr ""
+#: admin/fai/class_faiPartitionTable.inc:61
+#: admin/fai/class_faiDiskEntry.inc:442 admin/systems/class_faiLogView.inc:207
+#: admin/systems/class_faiLogView.inc:242
+msgid "Error"
+msgstr "Error"
 
-#: admin/fai/class_faiPackage.inc:689
-msgid "Install Method"
+#: admin/fai/class_faiPartitionTable.inc:112
+msgid "Add RAID"
 msgstr ""
 
-#: admin/fai/class_faiPackage.inc:690
-msgid "Package configuration"
+#: admin/fai/class_faiPartitionTable.inc:116
+msgid "Add LVM"
 msgstr ""
 
-#: admin/fai/class_faiPackage.inc:691 admin/systems/class_faiStartup.inc:78
-#: admin/systems/services/repository/class_serviceRepository.inc:40
-#: admin/fai/branch_selector.tpl.c:14 admin/fai/faiPackage.tpl.c:20
-#: admin/fai/fai-filter.tpl.c:5 admin/fai/fai-filter.tpl.c:14
-msgid "Release"
+#: admin/fai/class_faiPartitionTable.inc:284
+msgid "Partition table"
 msgstr ""
 
-#: admin/fai/class_faiPartitionTable.inc:269
-#: admin/fai/class_faiDiskEntry.inc:446
-#, php-format
-msgid ""
-"The disk cannot be deleted while it is used in the '%s' disk definition!"
+#: admin/fai/class_faiPartitionTable.inc:285
+#: admin/fai/class_faiPartitionTable.inc:288
+msgid "FAI partition table"
 msgstr ""
 
-#: admin/fai/class_faiPartitionTable.inc:416 admin/fai/class_faiScript.inc:360
-#: admin/fai/class_faiScript.inc:362 admin/fai/class_faiTemplate.inc:306
-#: admin/fai/class_faiTemplate.inc:308
-msgid "edit"
+#: admin/fai/class_faiPartitionTable.inc:307 admin/fai/class_faiProfile.inc:50
+msgid "Partition table class name"
 msgstr ""
 
-#: admin/fai/class_faiPartitionTable.inc:418 admin/fai/class_faiScript.inc:364
-#: admin/fai/class_faiTemplate.inc:310
-msgid "delete"
+#: admin/fai/class_faiPartitionTable.inc:317
+msgid "Discs"
 msgstr ""
 
-#: admin/fai/class_faiPartitionTable.inc:769
-#: admin/fai/class_faiPartitionTable.inc:773
-msgid "FAI partition table"
+#: admin/fai/class_faiPartitionTable.inc:324
+msgid "Partitions in this class"
 msgstr ""
 
-#: admin/fai/class_faiPartitionTable.inc:779 admin/fai/class_faiHook.inc:531
-#: admin/fai/class_faiVariable.inc:398
-msgid "Read only"
-msgstr "NomÃ©s lectura"
-
 #: admin/fai/class_faiDiskEntry.inc:273
-#: admin/fai/faiPartitionTableEntry.tpl.c:5 admin/fai/faiDiskEntry.tpl.c:5
 msgid "Device"
 msgstr ""
 
@@ -389,103 +198,103 @@ msgstr ""
 msgid "UUID"
 msgstr ""
 
-#: admin/fai/class_faiDiskEntry.inc:345
+#: admin/fai/class_faiDiskEntry.inc:344
 msgid "Disks"
 msgstr ""
 
-#: admin/fai/class_faiDiskEntry.inc:348 admin/fai/class_faiPartition.inc:321
-#: admin/fai/faiPartition.tpl.c:14
+#: admin/fai/class_faiDiskEntry.inc:347 admin/fai/class_faiPartition.inc:319
 msgid "Size"
 msgstr ""
 
-#: admin/fai/class_faiDiskEntry.inc:544
+#: admin/fai/class_faiDiskEntry.inc:443
+#, php-format
+msgid ""
+"The disk cannot be deleted while it is used in the '%s' disk definition!"
+msgstr ""
+
+#: admin/fai/class_faiDiskEntry.inc:536
 msgid "encrypted"
 msgstr ""
 
-#: admin/fai/class_faiDiskEntry.inc:547
+#: admin/fai/class_faiDiskEntry.inc:539
 msgid "bootable"
 msgstr ""
 
-#: admin/fai/class_faiDiskEntry.inc:550
+#: admin/fai/class_faiDiskEntry.inc:542
 msgid "preserve"
 msgstr ""
 
-#: admin/fai/class_faiDiskEntry.inc:735
+#: admin/fai/class_faiDiskEntry.inc:687 admin/fai/class_faiDiskEntry.inc:690
+#: admin/fai/class_faiDiskEntry.inc:737
+#: admin/fai/packageSelect/selectPackage-list.xml:40
+#: admin/fai/class_faiScript.inc:71 admin/fai/class_faiHook.inc:71
+#: admin/fai/class_faiVariable.inc:71
+#: admin/fai/class_faiSimplePluginClass.inc:50
+msgid "Name"
+msgstr "Nom"
+
+#: admin/fai/class_faiDiskEntry.inc:717
 msgid ""
 "You have more than four primary partition table entries in your "
 "configuration, please check your configuration twice."
 msgstr ""
 
-#: admin/fai/class_faiDiskEntry.inc:739
+#: admin/fai/class_faiDiskEntry.inc:721
 msgid ""
 "You cannot have more than three primary partition while using logical "
 "partitions, please check your configuration twice."
 msgstr ""
 
-#: admin/fai/class_faiDiskEntry.inc:752
-#: admin/fai/class_faiPartitionTableEntry.inc:448
+#: admin/fai/class_faiDiskEntry.inc:733
 msgid "Partition table entry"
 msgstr ""
 
-#: admin/fai/class_faiDiskEntry.inc:753
-#: admin/fai/class_faiPartitionTableEntry.inc:449
+#: admin/fai/class_faiDiskEntry.inc:734
 msgid "FAI partition table entry"
 msgstr ""
 
-#: admin/fai/class_faiDiskEntry.inc:760
+#: admin/fai/class_faiDiskEntry.inc:739
 msgid "Disk options"
 msgstr ""
 
-#: admin/fai/class_faiDiskEntry.inc:761
-#: admin/fai/class_faiPartitionTableEntry.inc:457
+#: admin/fai/class_faiDiskEntry.inc:740
 msgid "Partition type"
 msgstr ""
 
-#: admin/fai/class_faiDiskEntry.inc:762
-#: admin/fai/class_faiPartitionTableEntry.inc:458
+#: admin/fai/class_faiDiskEntry.inc:741
 msgid "Partition no."
 msgstr ""
 
-#: admin/fai/class_faiDiskEntry.inc:763
-#: admin/fai/class_faiPartitionTableEntry.inc:459
+#: admin/fai/class_faiDiskEntry.inc:742
 msgid "File system type"
 msgstr ""
 
-#: admin/fai/class_faiDiskEntry.inc:764
-#: admin/fai/class_faiPartitionTableEntry.inc:171
-#: admin/fai/class_faiPartitionTableEntry.inc:460
-#: admin/fai/class_faiPartition.inc:437 admin/fai/faiPartition.tpl.c:47
+#: admin/fai/class_faiDiskEntry.inc:743 admin/fai/class_faiPartition.inc:432
 msgid "Mount point"
 msgstr ""
 
-#: admin/fai/class_faiDiskEntry.inc:765
-#: admin/fai/class_faiPartitionTableEntry.inc:461
-#: admin/fai/class_faiPartition.inc:402 admin/fai/class_faiPartition.inc:407
+#: admin/fai/class_faiDiskEntry.inc:744 admin/fai/class_faiPartition.inc:397
+#: admin/fai/class_faiPartition.inc:402
 msgid "Partition size"
 msgstr ""
 
-#: admin/fai/class_faiDiskEntry.inc:766
-#: admin/fai/class_faiPartitionTableEntry.inc:173
-#: admin/fai/class_faiPartitionTableEntry.inc:462
-#: admin/fai/faiPartition.tpl.c:50
+#: admin/fai/class_faiDiskEntry.inc:745
 msgid "Mount options"
 msgstr ""
 
-#: admin/fai/class_faiDiskEntry.inc:767
-#: admin/fai/class_faiPartitionTableEntry.inc:463
+#: admin/fai/class_faiDiskEntry.inc:746
 msgid "File system options"
 msgstr ""
 
-#: admin/fai/class_faiDiskEntry.inc:768
-#: admin/fai/class_faiPartitionTableEntry.inc:464
+#: admin/fai/class_faiDiskEntry.inc:747
 msgid "Partition flags"
 msgstr ""
 
-#: admin/fai/class_debconfTemplate.inc:227
+#: admin/fai/class_debconfTemplate.inc:225
 msgid "This package has no debconf options."
 msgstr ""
 
-#: admin/fai/class_debconfTemplate.inc:264
+#: admin/fai/class_debconfTemplate.inc:262
 msgid ""
 "This debconf question is dynamically generated during package installation "
 "and requires choosing between specific options which cannot be presented "
@@ -493,217 +302,59 @@ msgid ""
 " effect."
 msgstr ""
 
-#: admin/fai/class_faiTemplateEntry.inc:139
-msgid "no file uploaded yet"
-msgstr ""
-
-#: admin/fai/class_faiTemplateEntry.inc:142
-#, php-format
-msgid "exists in database (size: %s bytes)"
-msgstr ""
-
-#: admin/fai/class_faiTemplateEntry.inc:251
-#: admin/systems/class_faiLogView.inc:70 admin/fai/faiTemplateEntry.tpl.c:23
-msgid "File"
-msgstr ""
-
-#: admin/fai/class_faiTemplateEntry.inc:255
-#: admin/fai/faiTemplateEntry.tpl.c:11
-msgid "Destination path"
+#: admin/fai/class_faiTemplateEntry.inc:143
+msgid "File path"
 msgstr ""
 
-#: admin/fai/class_faiTemplateEntry.inc:260 admin/fai/faiTemplateEntry.tpl.c:8
-msgid "File name"
+#: admin/fai/class_faiTemplateEntry.inc:143
+msgid "Complete absolute template file path and name"
 msgstr ""
 
-#: admin/fai/class_faiTemplateEntry.inc:264
-#: admin/fai/class_faiTemplateEntry.inc:266
-#: admin/fai/faiTemplateEntry.tpl.c:68
-msgid "User"
+#: admin/fai/class_faiTemplateEntry.inc:147
+msgid "Short description of the file"
 msgstr ""
 
-#: admin/fai/class_faiTemplateEntry.inc:270
-#: admin/fai/class_faiTemplateEntry.inc:273
-#: admin/fai/class_faiTemplateEntry.inc:275
-#: admin/fai/faiTemplateEntry.tpl.c:47 admin/fai/faiTemplateEntry.tpl.c:74
-msgid "Group"
+#: admin/fai/class_faiTemplateEntry.inc:156
+msgid "Template attributes"
 msgstr ""
 
-#: admin/fai/class_faiTemplateEntry.inc:305
-msgid "Template entry"
+#: admin/fai/class_faiTemplateEntry.inc:160
+msgid "Template file content"
 msgstr ""
 
-#: admin/fai/class_faiTemplateEntry.inc:306
-msgid "FAI template entry"
+#: admin/fai/class_faiTemplateEntry.inc:160
+msgid "Content of the template file"
 msgstr ""
 
-#: admin/fai/class_faiTemplateEntry.inc:314
-msgid "Template file"
+#: admin/fai/class_faiTemplateEntry.inc:164
+msgid "Owner and group of the file"
 msgstr ""
 
-#: admin/fai/class_faiTemplateEntry.inc:315
-msgid "Template path"
+#: admin/fai/class_faiTemplateEntry.inc:167
+msgid "Owner"
 msgstr ""
 
-#: admin/fai/class_faiTemplateEntry.inc:316
+#: admin/fai/class_faiTemplateEntry.inc:167
 msgid "File owner"
 msgstr ""
 
-#: admin/fai/class_faiTemplateEntry.inc:317
-msgid "File permissions"
-msgstr ""
-
-#: admin/fai/class_FAI.inc:287 admin/fai/class_FAI.inc:679
-#: admin/fai/class_FAI.inc:1266 admin/fai/class_FAI.inc:1283
-#: admin/fai/class_FAI.inc:1287
-msgid "LDAP error"
-msgstr "Error d'LDAP"
-
-#: admin/fai/class_FAI.inc:570
-#, php-format
-msgid "Error, following objects should be equal '%s' and '%s'"
-msgstr ""
-
-#: admin/fai/class_FAI.inc:891
-#, php-format
-msgid "Creating group application release for %s"
-msgstr ""
-
-#: admin/fai/class_FAI.inc:960 admin/fai/class_FAI.inc:982
-#: admin/fai/class_FAI.inc:1022 admin/fai/class_FAI.inc:1027
-#: admin/fai/class_FAI.inc:1065
-msgid "Object"
-msgstr "Objecte"
-
-#: admin/fai/class_FAI.inc:961
-#, php-format
-msgid "Adding missing group application release container %s."
-msgstr ""
-
-#: admin/fai/class_FAI.inc:983
-#, php-format
-msgid "Adding group application release container %s."
-msgstr ""
-
-#: admin/fai/class_FAI.inc:1023
-#, php-format
-msgid "Could not create menu entry %s. (Already exists)."
-msgstr ""
-
-#: admin/fai/class_FAI.inc:1028
-#, php-format
-msgid "Created group application menu entry for %s."
-msgstr ""
-
-#: admin/fai/class_FAI.inc:1059
-#, php-format
-msgid "Creating copy of %s"
-msgstr ""
-
-#: admin/fai/class_FAI.inc:1062
-msgid "Processing"
-msgstr ""
-
-#: admin/fai/class_FAI.inc:1080
-msgid "Could not create new release, the destination dn is already in use."
-msgstr ""
-
-#: admin/fai/class_FAI.inc:1093
-msgid "Error while fetching source dn - aborted!"
-msgstr ""
-
-#: admin/fai/class_FAI.inc:1174
-msgid "Fatal error"
-msgstr "Error fatal"
-
-#: admin/fai/class_FAI.inc:1175
-#, php-format
-msgid ""
-"Release creation failed due to ldap errors. Additional informations '%s'."
-msgstr ""
-
-#: admin/fai/class_faiPartitionTableEntry.inc:162
-msgid "primary"
-msgstr ""
-
-#: admin/fai/class_faiPartitionTableEntry.inc:162
-msgid "logical"
-msgstr ""
-
-#: admin/fai/class_faiPartitionTableEntry.inc:169
-#: admin/fai/faiPartition.tpl.c:8
-msgid "Type"
-msgstr ""
-
-#: admin/fai/class_faiPartitionTableEntry.inc:170
-msgid "FS type"
-msgstr ""
-
-#: admin/fai/class_faiPartitionTableEntry.inc:172
-msgid "Size in MB"
-msgstr ""
-
-#: admin/fai/class_faiPartitionTableEntry.inc:174
-msgid "FS option"
-msgstr ""
-
-#: admin/fai/class_faiPartitionTableEntry.inc:175
-#: admin/fai/faiPartition.tpl.c:23
-msgid "Preserve"
-msgstr ""
-
-#: admin/fai/class_faiPartitionTableEntry.inc:266
-msgid "False"
-msgstr ""
-
-#: admin/fai/class_faiPartitionTableEntry.inc:268
-msgid "True"
-msgstr ""
-
-#: admin/fai/class_faiPartitionTableEntry.inc:272
-#: admin/fai/class_faiPartitionTableEntry.inc:274 admin/fai/fai-list.xml:159
-#: admin/fai/fai-list.xml:198
-msgid "Remove"
-msgstr ""
-
-#: admin/fai/class_faiPartitionTableEntry.inc:384
-#, php-format
-msgid "please enter a unique mount point for partition %s"
-msgstr ""
-
-#: admin/fai/class_faiPartitionTableEntry.inc:389
-#, php-format
-msgid "partition %s mount point"
-msgstr ""
-
-#: admin/fai/class_faiPartitionTableEntry.inc:394
-#, php-format
-msgid ""
-"File system type 'swap' is already used, change file system type for "
-"partition %s."
+#: admin/fai/class_faiTemplateEntry.inc:172
+msgid "Group"
 msgstr ""
 
-#: admin/fai/class_faiPartitionTableEntry.inc:398
-msgid "Please use 'swap' as mount point, if 'swap' is used as fs-type."
+#: admin/fai/class_faiTemplateEntry.inc:172
+msgid "File group"
 msgstr ""
 
-#: admin/fai/class_faiPartitionTableEntry.inc:404
-#: admin/fai/class_faiPartitionTableEntry.inc:408
-#: admin/fai/class_faiPartitionTableEntry.inc:414
-#: admin/fai/class_faiPartitionTableEntry.inc:416
-#: admin/fai/class_faiPartitionTableEntry.inc:421
-#, php-format
-msgid "partition %s size"
+#: admin/fai/class_faiTemplateEntry.inc:181
+msgid "Access"
 msgstr ""
 
-#: admin/fai/class_faiPartitionTableEntry.inc:436
-msgid ""
-"You have more than 3 primary partition table entries in your configuration, "
-"please check your configuration twice."
+#: admin/fai/class_faiTemplateEntry.inc:181
+msgid "Access rights"
 msgstr ""
 
 #: admin/fai/packageSelect/selectPackage-list.xml:10
-#: admin/fai/classSelect/selectClass-list.xml:11
 msgid "Please select the desired entries"
 msgstr ""
 
@@ -711,147 +362,94 @@ msgstr ""
 msgid "Version"
 msgstr ""
 
-#: admin/fai/class_faiProfile.inc:310
-msgid "This list displays all assigned class names for this profile."
-msgstr ""
-
-#: admin/fai/class_faiProfile.inc:313 admin/fai/class_askClassName.inc:103
-#: admin/fai/classSelect/class_classSelect.inc:53
-#: admin/fai/class_faiProfileEntry.inc:158
-msgid "Hook bundle"
-msgstr ""
-
-#: admin/fai/class_faiProfile.inc:314 admin/fai/class_askClassName.inc:105
-#: admin/fai/classSelect/class_classSelect.inc:54
-#: admin/fai/class_faiProfileEntry.inc:159
-msgid "Template bundle"
-msgstr ""
-
-#: admin/fai/class_faiProfile.inc:315 admin/fai/class_askClassName.inc:101
-#: admin/fai/classSelect/class_classSelect.inc:55
-#: admin/fai/class_faiProfileEntry.inc:160
-msgid "Script bundle"
-msgstr ""
-
-#: admin/fai/class_faiProfile.inc:316 admin/fai/class_askClassName.inc:102
-#: admin/fai/classSelect/class_classSelect.inc:56
-#: admin/fai/class_faiProfileEntry.inc:161
-msgid "Variable bundle"
-msgstr ""
-
-#: admin/fai/class_faiProfile.inc:317 admin/fai/class_askClassName.inc:100
-#: admin/fai/classSelect/class_classSelect.inc:57
-#: admin/fai/class_faiProfileEntry.inc:162
-msgid "Package bundle"
-msgstr ""
-
-#: admin/fai/class_faiProfile.inc:321
-msgid "Remove class from profile"
-msgstr ""
-
-#: admin/fai/class_faiProfile.inc:324
-msgid "Up"
-msgstr ""
-
-#: admin/fai/class_faiProfile.inc:325
-msgid "Down"
-msgstr ""
-
-#: admin/fai/class_faiProfile.inc:410
-msgid "No class specified for this profile!"
-msgstr ""
-
-#: admin/fai/class_faiProfile.inc:419
-msgid "You can't use the same name for a class and a profile!"
+#: admin/fai/class_faiProfile.inc:28
+msgid "Profile"
 msgstr ""
 
-#: admin/fai/class_faiProfile.inc:455
+#: admin/fai/class_faiProfile.inc:29
 msgid "FAI profile"
 msgstr ""
 
-#: admin/fai/class_faiProfile.inc:458
+#: admin/fai/class_faiProfile.inc:32
 msgid "FAI Profile"
 msgstr ""
 
-#: admin/fai/class_faiProfile.inc:465 admin/fai/faiProfile.tpl.c:17
+#: admin/fai/class_faiProfile.inc:61
 msgid "FAI classes"
 msgstr ""
 
-#: admin/fai/class_faiHookEntry.inc:200
-msgid "Hook entry"
+#: admin/fai/class_faiProfile.inc:61
+msgid "FAI classes which are part of this profile"
 msgstr ""
 
-#: admin/fai/class_faiHookEntry.inc:201
-msgid "FAI hook entry"
+#: admin/fai/class_faiPackageConfiguration.inc:88
+#, php-format
+msgid "Debconf information for package '%s'"
 msgstr ""
 
-#: admin/fai/class_faiHookEntry.inc:209 admin/fai/faiHookEntry.tpl.c:20
-msgid "Task"
+#: admin/fai/class_faiScript.inc:30 admin/fai/class_faiScript.inc:84
+#: admin/fai/class_faiHook.inc:87
+msgid "Script"
 msgstr ""
 
-#: admin/fai/class_faiHookEntry.inc:210 admin/fai/class_faiScript.inc:595
-#: admin/fai/class_faiScript.inc:599
+#: admin/fai/class_faiScript.inc:31 admin/fai/class_faiScript.inc:34
 msgid "FAI script"
 msgstr ""
 
-#: admin/fai/class_faiPackageConfiguration.inc:88
-#, php-format
-msgid "Debconf information for package '%s'"
+#: admin/fai/class_faiScript.inc:63
+msgid "Scripts"
 msgstr ""
 
-#: admin/fai/class_askClassName.inc:99 admin/fai/class_askClassName.inc:100
-#: admin/fai/class_askClassName.inc:101 admin/fai/class_askClassName.inc:102
-#: admin/fai/class_askClassName.inc:103 admin/fai/class_askClassName.inc:104
-#: admin/fai/class_askClassName.inc:105 admin/fai/class_askClassName.inc:106
-msgid "Create new FAI object"
+#: admin/fai/class_faiScript.inc:67 admin/fai/class_faiHook.inc:67
+#: admin/fai/class_faiVariable.inc:67
+msgid "Variables in this class"
 msgstr ""
 
-#: admin/fai/class_faiTemplateEdit.inc:80
-#, php-format
-msgid ""
-"The file encodig has changed from '%s' to '%s'. Do you really want to save?"
+#: admin/fai/class_faiScript.inc:71 admin/fai/class_faiHook.inc:71
+#: admin/fai/class_faiVariable.inc:71
+msgid "The name of the variable"
 msgstr ""
 
-#: admin/fai/class_faiScript.inc:333 admin/fai/class_faiScript.inc:335
-msgid "Sort direction"
+#: admin/fai/class_faiScript.inc:75 admin/fai/class_faiHook.inc:75
+#: admin/fai/class_faiVariable.inc:75
+msgid "A short description of the variable"
 msgstr ""
 
-#: admin/fai/class_faiScript.inc:348 admin/fai/faiScriptEntry.tpl.c:20
+#: admin/fai/class_faiScript.inc:79
 msgid "Priority"
 msgstr ""
 
-#: admin/fai/class_faiScript.inc:350
-msgid "Action"
+#: admin/fai/class_faiScript.inc:79
+msgid "Priority of this script (FIXME: less is done first?)"
 msgstr ""
 
-#: admin/fai/classSelect/selectClass-list.xml:36 admin/fai/fai-list.xml:88
-#: admin/fai/faiScriptEntry.tpl.c:14
-msgid "Properties"
+#: admin/fai/class_faiScript.inc:84
+msgid "The script itself"
 msgstr ""
 
-#: admin/fai/class_faiTemplate.inc:501 admin/fai/fai-list.xml:116
-msgid "Template"
+#: admin/fai/class_faiTemplate.inc:136
+#, php-format
+msgid "There are several files with the same path: %s"
 msgstr ""
 
-#: admin/fai/class_faiTemplate.inc:502 admin/fai/class_faiTemplate.inc:506
-msgid "FAI template"
+#: admin/fai/class_faiTemplate.inc:153
+msgid "Template"
 msgstr ""
 
-#: admin/fai/class_faiVariableEntry.inc:107
-msgid "Content"
+#: admin/fai/class_faiTemplate.inc:154 admin/fai/class_faiTemplate.inc:157
+msgid "FAI template"
 msgstr ""
 
-#: admin/fai/class_faiVariableEntry.inc:142
-msgid "Variable entry"
+#: admin/fai/class_faiTemplate.inc:176
+msgid "Template class name"
 msgstr ""
 
-#: admin/fai/class_faiVariableEntry.inc:143
-msgid "FAI variable entry "
+#: admin/fai/class_faiTemplate.inc:186
+msgid "Template files"
 msgstr ""
 
-#: admin/fai/class_faiVariableEntry.inc:151
-#: admin/fai/faiVariableEntry.tpl.c:20
-msgid "Variable content"
+#: admin/fai/class_faiTemplate.inc:190
+msgid "Template files in this class"
 msgstr ""
 
 #: admin/fai/class_faiPartition.inc:176 admin/fai/class_faiPartition.inc:180
@@ -950,94 +548,73 @@ msgstr ""
 msgid "btrfs"
 msgstr ""
 
-#: admin/fai/class_faiPartition.inc:224
-msgid "LVM/RAID"
-msgstr ""
-
-#: admin/fai/class_faiPartition.inc:327
+#: admin/fai/class_faiPartition.inc:325
 msgid "spare"
 msgstr ""
 
-#: admin/fai/class_faiPartition.inc:330
+#: admin/fai/class_faiPartition.inc:328
 msgid "missing"
 msgstr ""
 
-#: admin/fai/class_faiPartition.inc:333
+#: admin/fai/class_faiPartition.inc:331
 msgid "Options"
 msgstr ""
 
-#: admin/fai/class_faiPartition.inc:420
+#: admin/fai/class_faiPartition.inc:415
 msgid "Minimum partition size"
 msgstr ""
 
-#: admin/fai/class_faiPartition.inc:420
+#: admin/fai/class_faiPartition.inc:415
 msgid "Maximum partition size"
 msgstr ""
 
-#: admin/fai/class_faiPartition.inc:428
+#: admin/fai/class_faiPartition.inc:423
 msgid "Raid arrays must contain at least two partitions!"
 msgstr ""
 
-#: admin/fai/class_faiPartition.inc:430
+#: admin/fai/class_faiPartition.inc:425
 msgid ""
 "Raid 0 arrays can only be realized with a combination of two partitions!"
 msgstr ""
 
-#: admin/fai/class_faiHook.inc:332 admin/fai/class_faiHook.inc:334
-#: admin/fai/fai-list.xml:190 admin/fai/faiVariable.tpl.c:23
-#: admin/fai/faiVariable.tpl.c:26
-msgid "Edit"
-msgstr ""
-
-#: admin/fai/class_faiHook.inc:336
-msgid "Delete"
-msgstr ""
-
-#: admin/fai/class_faiHook.inc:521 admin/fai/fai-list.xml:128
+#: admin/fai/class_faiHook.inc:30
 msgid "Hook"
 msgstr ""
 
-#: admin/fai/class_faiHook.inc:522 admin/fai/class_faiHook.inc:526
+#: admin/fai/class_faiHook.inc:31 admin/fai/class_faiHook.inc:34
 msgid "FAI hook"
 msgstr ""
 
-#: admin/fai/class_faiVariable.inc:387 admin/fai/fai-list.xml:134
-msgid "Variable"
-msgstr ""
-
-#: admin/fai/class_faiVariable.inc:388 admin/fai/class_faiVariable.inc:392
-msgid "FAI variable"
+#: admin/fai/class_faiHook.inc:63
+msgid "Hooks"
 msgstr ""
 
-#: admin/fai/class_faiProfileEntry.inc:184 admin/fai/askClassName.tpl.c:11
-#: admin/fai/askClassName.tpl.c:17 admin/fai/paste_generic.tpl.c:5
-msgid "Class name"
+#: admin/fai/class_faiHook.inc:79
+msgid "Task"
 msgstr ""
 
-#: admin/fai/class_faiProfileEntry.inc:184 admin/fai/faiTemplate.tpl.c:14
-#: admin/fai/faiVariable.tpl.c:14 admin/fai/faiHook.tpl.c:14
-#: admin/fai/faiPartitionTable.tpl.c:17 admin/fai/faiScript.tpl.c:14
-msgid "Objects"
+#: admin/fai/class_faiHook.inc:87
+msgid "The script of this hook"
 msgstr ""
 
-#: admin/fai/fai-list.xml:11
-msgid "List of deployment classes and products"
+#: admin/fai/class_faiVariable.inc:30
+msgid "Variable"
 msgstr ""
 
-#: admin/fai/fai-list.xml:15
-msgid "partitionTable"
+#: admin/fai/class_faiVariable.inc:31 admin/fai/class_faiVariable.inc:34
+msgid "FAI variable"
 msgstr ""
 
-#: admin/fai/fai-list.xml:23
-msgid "packagelist"
+#: admin/fai/class_faiVariable.inc:63
+msgid "Variables"
 msgstr ""
 
-#: admin/fai/fai-list.xml:93
-msgid "Actions"
+#: admin/fai/class_faiVariable.inc:79
+msgid "Content"
 msgstr ""
 
-#: admin/fai/fai-list.xml:104
-msgid "Create"
+#: admin/fai/class_faiVariable.inc:79
+msgid "The content of the variable"
 msgstr ""
 
 #: admin/systems/class_faiLogView.inc:56
@@ -1048,6 +625,10 @@ msgstr ""
 msgid "Sort up"
 msgstr ""
 
+#: admin/systems/class_faiLogView.inc:70
+msgid "File"
+msgstr ""
+
 #: admin/systems/class_faiLogView.inc:71
 msgid "Date"
 msgstr ""
@@ -1082,7 +663,7 @@ msgstr ""
 msgid "Selected file: %s"
 msgstr ""
 
-#: admin/systems/class_faiStartup.inc:70 admin/fai/paste_generic.tpl.c:2
+#: admin/systems/class_faiStartup.inc:70
 msgid "FAI settings"
 msgstr ""
 
@@ -1102,11 +683,6 @@ msgstr ""
 msgid "FAI profil to be applied to this computer"
 msgstr ""
 
-#: admin/systems/class_faiStartup.inc:90 admin/fai/faiPackage.tpl.c:14
-#: admin/fai/faiPackage.tpl.c:17
-msgid "Repository"
-msgstr ""
-
 #: admin/systems/class_faiStartup.inc:90
 msgid "FAI Debian repository to be used for installation"
 msgstr ""
@@ -1131,85 +707,96 @@ msgstr ""
 msgid "Linux kernel parameters to be ran"
 msgstr ""
 
-#: admin/systems/class_faiStartup.inc:178
+#: admin/systems/class_faiStartup.inc:179
 msgid "Full automated installation"
 msgstr ""
 
-#: admin/systems/services/repository/class_serviceRepository.inc:31
+#: admin/systems/services/repository/class_serviceDebianRepository.inc:34
+#: admin/systems/services/repository/class_serviceCentosRepository.inc:31
+msgid "Repositories"
+msgstr ""
+
+#: admin/systems/services/repository/class_serviceDebianRepository.inc:39
+#: admin/systems/services/repository/class_serviceCentosRepository.inc:36
+msgid "Repositories this server hosts"
+msgstr ""
+
+#: admin/systems/services/repository/class_serviceDebianRepository.inc:43
+#: admin/systems/services/repository/class_serviceCentosRepository.inc:40
 msgid "URL"
 msgstr ""
 
-#: admin/systems/services/repository/class_serviceRepository.inc:31
+#: admin/systems/services/repository/class_serviceDebianRepository.inc:43
+#: admin/systems/services/repository/class_serviceCentosRepository.inc:40
 msgid "Repository url"
 msgstr ""
 
-#: admin/systems/services/repository/class_serviceRepository.inc:35
+#: admin/systems/services/repository/class_serviceDebianRepository.inc:47
+#: admin/systems/services/repository/class_serviceCentosRepository.inc:44
 msgid "Parent server"
 msgstr ""
 
-#: admin/systems/services/repository/class_serviceRepository.inc:35
+#: admin/systems/services/repository/class_serviceDebianRepository.inc:47
+#: admin/systems/services/repository/class_serviceCentosRepository.inc:44
 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"
+#: admin/systems/services/repository/class_serviceDebianRepository.inc:52
+msgid "Debian release used on this repository"
 msgstr ""
 
-#: admin/systems/services/repository/class_serviceRepository.inc:47
-msgid "Sections available on this repository"
+#: admin/systems/services/repository/class_serviceDebianRepository.inc:58
+msgid "Debian sections available on this repository"
 msgstr ""
 
-#: admin/systems/services/repository/class_serviceRepository.inc:52
+#: admin/systems/services/repository/class_serviceDebianRepository.inc:63
+#: admin/systems/services/repository/class_serviceCentosRepository.inc:57
 msgid "Mirror mode"
 msgstr ""
 
-#: admin/systems/services/repository/class_serviceRepository.inc:52
+#: admin/systems/services/repository/class_serviceDebianRepository.inc:63
+#: admin/systems/services/repository/class_serviceCentosRepository.inc:57
 msgid ""
 "Is this mirror an installation repository? Is its release a custom one?"
 msgstr ""
 
-#: admin/systems/services/repository/class_serviceRepository.inc:57
+#: admin/systems/services/repository/class_serviceDebianRepository.inc:68
+#: admin/systems/services/repository/class_serviceCentosRepository.inc:62
 msgid "Local mirror"
 msgstr ""
 
-#: admin/systems/services/repository/class_serviceRepository.inc:57
+#: admin/systems/services/repository/class_serviceDebianRepository.inc:68
+#: admin/systems/services/repository/class_serviceCentosRepository.inc:62
 msgid "Is this mirror a local or a network mirror?"
 msgstr ""
 
-#: admin/systems/services/repository/class_serviceRepository.inc:66
+#: admin/systems/services/repository/class_serviceDebianRepository.inc:77
+#: admin/systems/services/repository/class_serviceCentosRepository.inc:71
 msgid "Architectures"
 msgstr ""
 
-#: admin/systems/services/repository/class_serviceRepository.inc:66
+#: admin/systems/services/repository/class_serviceDebianRepository.inc:77
+#: admin/systems/services/repository/class_serviceCentosRepository.inc:71
 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"
+#: admin/systems/services/repository/class_serviceDebianRepository.inc:99
+#: admin/systems/services/repository/class_serviceDebianRepository.inc:100
+msgid "Debian repository"
 msgstr ""
 
-#: admin/systems/services/repository/class_serviceRepository.inc:140
-msgid "Repositories"
-msgstr ""
-
-#: admin/systems/services/repository/class_serviceRepository.inc:145
-msgid "Repositories this server hosts"
+#: admin/systems/services/repository/class_serviceDebianRepository.inc:100
+#: admin/systems/services/repository/class_serviceCentosRepository.inc:96
+msgid "Services"
 msgstr ""
 
-#: admin/systems/services/repository/class_serviceRepository.inc:160
-msgid "Package repository"
+#: admin/systems/services/repository/class_serviceCentosRepository.inc:49
+msgid "Centos release used on this repository"
 msgstr ""
 
-#: admin/systems/services/repository/class_serviceRepository.inc:161
-msgid "Package repository information"
+#: admin/systems/services/repository/class_serviceCentosRepository.inc:95
+#: admin/systems/services/repository/class_serviceCentosRepository.inc:96
+msgid "Centos repository"
 msgstr ""
 
 #: config/fai/class_faiConfig.inc:28
@@ -1241,476 +828,3 @@ msgstr ""
 #: config/fai/class_faiConfig.inc:60
 msgid "s"
 msgstr ""
-
-#: admin/fai/faiPartitionTableEntry.tpl.c:2 admin/fai/faiVariableEntry.tpl.c:2
-#: admin/fai/faiVariableEntry.tpl.c:5 admin/fai/faiDiskEntry.tpl.c:2
-#: admin/fai/faiTemplate.tpl.c:2 admin/fai/faiTemplate.tpl.c:5
-#: admin/fai/faiVariable.tpl.c:2 admin/fai/faiVariable.tpl.c:5
-#: admin/fai/faiHook.tpl.c:2 admin/fai/faiHook.tpl.c:5
-#: admin/fai/faiPackage.tpl.c:2 admin/fai/faiPackage.tpl.c:5
-#: admin/fai/faiTemplateEntry.tpl.c:2 admin/fai/faiTemplateEntry.tpl.c:5
-#: admin/fai/faiScriptEntry.tpl.c:2 admin/fai/faiScriptEntry.tpl.c:5
-#: admin/fai/faiPartitionTable.tpl.c:2 admin/fai/faiPartitionTable.tpl.c:5
-#: admin/fai/faiScript.tpl.c:2 admin/fai/faiScript.tpl.c:5
-#: admin/fai/faiProfile.tpl.c:2 admin/fai/faiProfile.tpl.c:5
-#: admin/fai/faiProfile.tpl.c:14 admin/fai/faiHookEntry.tpl.c:2
-#: admin/fai/faiHookEntry.tpl.c:5
-msgid "Generic"
-msgstr "GenÃ¨ric"
-
-#: admin/fai/faiPartitionTableEntry.tpl.c:14
-#: admin/fai/faiPartitionTableEntry.tpl.c:17 admin/fai/faiDiskEntry.tpl.c:23
-#: admin/fai/faiDiskEntry.tpl.c:26
-msgid "Partition entries"
-msgstr ""
-
-#: admin/fai/faiPartitionTableEntry.tpl.c:20
-#: admin/fai/faiPartitionTableEntry.tpl.c:23 admin/fai/faiDiskEntry.tpl.c:29
-#: admin/fai/faiDiskEntry.tpl.c:32
-msgid "Add partition"
-msgstr ""
-
-#: admin/fai/branch_selector.tpl.c:2
-msgid "Releases"
-msgstr ""
-
-#: admin/fai/branch_selector.tpl.c:5
-msgid "Current release"
-msgstr ""
-
-#: admin/fai/branch_selector.tpl.c:8 admin/fai/branch_selector.tpl.c:17
-#: admin/fai/fai-filter.tpl.c:8 admin/fai/fai-filter.tpl.c:17
-msgid "Create release"
-msgstr ""
-
-#: admin/fai/branch_selector.tpl.c:11 admin/fai/branch_selector.tpl.c:23
-#: admin/fai/fai-filter.tpl.c:11 admin/fai/fai-filter.tpl.c:23
-msgid "Create read-only release"
-msgstr ""
-
-#: admin/fai/branch_selector.tpl.c:20 admin/fai/fai-filter.tpl.c:20
-msgid "Freeze"
-msgstr ""
-
-#: admin/fai/branch_selector.tpl.c:26 admin/fai/fai-filter.tpl.c:26
-msgid "Delete current release"
-msgstr ""
-
-#: admin/fai/faiPartition.tpl.c:2
-msgid "Partition"
-msgstr ""
-
-#: admin/fai/faiPartition.tpl.c:17
-msgid "Resize existing partition"
-msgstr ""
-
-#: admin/fai/faiPartition.tpl.c:20
-msgid "Bootable"
-msgstr ""
-
-#: admin/fai/faiPartition.tpl.c:26 admin/fai/faiDiskEntry.tpl.c:20
-msgid "Combined physical partitions"
-msgstr ""
-
-#: admin/fai/faiPartition.tpl.c:29
-msgid "Toggle missing"
-msgstr ""
-
-#: admin/fai/faiPartition.tpl.c:32
-msgid "Toggle spare"
-msgstr ""
-
-#: admin/fai/faiPartition.tpl.c:35
-msgid "Filesystem"
-msgstr ""
-
-#: admin/fai/faiPartition.tpl.c:38
-msgid "Filesystem create options"
-msgstr ""
-
-#: admin/fai/faiPartition.tpl.c:41
-msgid "Encrypted"
-msgstr ""
-
-#: admin/fai/faiPartition.tpl.c:44
-msgid "Tune options"
-msgstr ""
-
-#: admin/fai/faiNewBranch.tpl.c:2
-msgid ""
-"You are now going to create a branch or locked branch. This action clones "
-"the existing release to another release name. Branches can be modified as "
-"usual. FAI classes of locked branches cannot be modified, just additional "
-"classes are possible. Branch names should be alphanumeric, excluding the "
-"reserved names 'scripts', 'hooks', 'partitions', 'variables', 'templates' "
-"and 'fai'."
-msgstr ""
-
-#: admin/fai/faiNewBranch.tpl.c:5
-msgid ""
-"Branches are created as subreleases of the currently selected branch. "
-"Creating a new branch named 1.0.2 in SARGE for example, will result in a new"
-" release called SARGE/1.0.2."
-msgstr ""
-
-#: admin/fai/faiNewBranch.tpl.c:8
-msgid "Please enter a name for the branch"
-msgstr ""
-
-#: admin/fai/faiNewBranch.tpl.c:11
-msgid "Processing the requested operation"
-msgstr ""
-
-#: admin/fai/faiNewBranch.tpl.c:14
-msgid ""
-"As soon as the copy operation has finished, you can scroll down to end of "
-"the page and press the 'Continue' button to continue with the fai management"
-" dialog."
-msgstr ""
-
-#: admin/fai/faiNewBranch.tpl.c:17
-msgid ""
-"Your browser doesn't support iframes, please use this link to perform the "
-"requested operation."
-msgstr ""
-
-#: admin/fai/faiNewBranch.tpl.c:20
-msgid "Perform requested operation."
-msgstr ""
-
-#: admin/fai/faiNewBranch.tpl.c:23
-msgid "Initiate operation"
-msgstr ""
-
-#: admin/fai/faiVariableEntry.tpl.c:14 admin/fai/faiVariableEntry.tpl.c:17
-msgid "Variable attributes"
-msgstr ""
-
-#: admin/fai/faiDiskEntry.tpl.c:11
-msgid "fstab key"
-msgstr ""
-
-#: admin/fai/faiDiskEntry.tpl.c:17
-msgid "Disk label"
-msgstr ""
-
-#: admin/fai/faiTemplate.tpl.c:17
-msgid "List of template files"
-msgstr ""
-
-#: admin/fai/faiVariable.tpl.c:17
-msgid "List of assigned variables"
-msgstr ""
-
-#: admin/fai/faiVariable.tpl.c:20
-msgid "Choose a variable to delete or edit"
-msgstr ""
-
-#: admin/fai/askClassName.tpl.c:2
-msgid ""
-"Adding a new class to the FAI management, requires a class name. You have to"
-" specify a unique class name for unique types of FAI classes, while you can "
-"use the same class name for different types of FAI classes. In the laste "
-"case, FAI will automatically enclose all these different class types to one "
-"unique class name."
-msgstr ""
-
-#: admin/fai/askClassName.tpl.c:5
-msgid ""
-"Please use one of the following methods to choose the name for the new FAI "
-"class."
-msgstr ""
-
-#: admin/fai/askClassName.tpl.c:8
-msgid "Enter FAI class name manually"
-msgstr ""
-
-#: admin/fai/askClassName.tpl.c:14
-msgid "Choose FAI class name from a list of existing classes"
-msgstr ""
-
-#: admin/fai/askClassName.tpl.c:20
-msgid "Choose class name"
-msgstr ""
-
-#: admin/fai/faiGroupHandle.tpl.c:2
-msgid "Please select the objects you want to remove:"
-msgstr ""
-
-#: admin/fai/faiGroupHandle.tpl.c:5
-msgid "Freezed"
-msgstr ""
-
-#: admin/fai/faiGroupHandle.tpl.c:8
-msgid "Select the object you want to edit:"
-msgstr ""
-
-#: admin/fai/faiGroupHandle.tpl.c:11
-msgid "Select the object you want to copy:"
-msgstr ""
-
-#: admin/fai/remove.tpl.c:5
-msgid ""
-"This includes all account data, system access rules, imap settings, etc. for"
-" this user. Please double check if your really want to do this since there "
-"is no way for FusionDirectory to get your data back."
-msgstr ""
-
-#: admin/fai/remove.tpl.c:8 admin/fai/remove_branch.tpl.c:8
-msgid "So - if you're sure - press 'Delete' to continue or 'Cancel' to abort."
-msgstr ""
-
-#: admin/fai/faiHook.tpl.c:17
-msgid "List of hook scripts"
-msgstr ""
-
-#: admin/fai/packageSelect/selectPackage-list.tpl.c:2
-#: admin/fai/classSelect/selectClass-list.tpl.c:5
-msgid "Update"
-msgstr ""
-
-#: admin/fai/packageSelect/selectPackage-list.tpl.c:5
-#: admin/fai/classSelect/selectClass-list.tpl.c:8
-msgid "Submit"
-msgstr ""
-
-#: admin/fai/packageSelect/selectPackage-filter.tpl.c:2
-#: admin/fai/classSelect/selectClass-filter.tpl.c:2
-#: admin/fai/fai-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/remove_branch.tpl.c:5
-msgid ""
-"This includes all account data, system access, etc. for this branch. Please "
-"double check if your really want to do this since there is no way for "
-"FusionDirectory to get your data back."
-msgstr ""
-
-#: admin/fai/faiPackage.tpl.c:26
-msgid "Install method"
-msgstr ""
-
-#: admin/fai/faiPackage.tpl.c:29
-msgid "Please select the installation method"
-msgstr ""
-
-#: admin/fai/faiPackage.tpl.c:32 admin/fai/faiPackage.tpl.c:35
-msgid "Used packages"
-msgstr ""
-
-#: admin/fai/faiPackage.tpl.c:38
-msgid "Add from list"
-msgstr ""
-
-#: admin/fai/faiProfileEntry.tpl.c:2
-msgid "List of FAI objects (Fully Automatic Installation)"
-msgstr ""
-
-#: admin/fai/faiProfileEntry.tpl.c:5
-msgid "Information"
-msgstr "InformaciÃ³"
-
-#: admin/fai/faiProfileEntry.tpl.c:8
-msgid ""
-"This menu allows you to select FAI class names and to add them to the "
-"currently edited profile."
-msgstr ""
-
-#: admin/fai/faiProfileEntry.tpl.c:11
-msgid "Filters"
-msgstr ""
-
-#: admin/fai/faiProfileEntry.tpl.c:14
-msgid "Show only classes with templates"
-msgstr ""
-
-#: admin/fai/faiProfileEntry.tpl.c:17
-msgid "Show only classes with scripts"
-msgstr ""
-
-#: admin/fai/faiProfileEntry.tpl.c:20
-msgid "Show only classes with hooks"
-msgstr ""
-
-#: admin/fai/faiProfileEntry.tpl.c:23
-msgid "Show only classes with variables"
-msgstr ""
-
-#: admin/fai/faiProfileEntry.tpl.c:26
-msgid "Show only classes with packages"
-msgstr ""
-
-#: admin/fai/faiProfileEntry.tpl.c:29
-msgid "Show only classes with partitions"
-msgstr ""
-
-#: admin/fai/faiProfileEntry.tpl.c:32 admin/fai/faiProfileEntry.tpl.c:35
-msgid "Display objects matching"
-msgstr ""
-
-#: admin/fai/faiProfileEntry.tpl.c:38
-msgid "Regular expression for matching object names"
-msgstr ""
-
-#: admin/fai/faiTemplateEntry.tpl.c:17 admin/fai/faiTemplateEntry.tpl.c:20
-msgid "Template attributes"
-msgstr ""
-
-#: admin/fai/faiTemplateEntry.tpl.c:26 admin/fai/faiTemplateEntry.tpl.c:29
-msgid "Save template"
-msgstr ""
-
-#: admin/fai/faiTemplateEntry.tpl.c:32 admin/fai/faiTemplateEntry.tpl.c:35
-msgid "Edit template"
-msgstr ""
-
-#: admin/fai/faiTemplateEntry.tpl.c:38
-msgid "Full path"
-msgstr ""
-
-#: admin/fai/faiTemplateEntry.tpl.c:41
-msgid "Upload"
-msgstr ""
-
-#: admin/fai/faiTemplateEntry.tpl.c:44
-msgid "Owner"
-msgstr ""
-
-#: admin/fai/faiTemplateEntry.tpl.c:50
-msgid "Access"
-msgstr ""
-
-#: admin/fai/faiTemplateEntry.tpl.c:53
-msgid "Class"
-msgstr ""
-
-#: admin/fai/faiTemplateEntry.tpl.c:56
-msgid "Read"
-msgstr ""
-
-#: admin/fai/faiTemplateEntry.tpl.c:59
-msgid "Write"
-msgstr ""
-
-#: admin/fai/faiTemplateEntry.tpl.c:62
-msgid "Execute"
-msgstr ""
-
-#: admin/fai/faiTemplateEntry.tpl.c:65
-msgid "Special"
-msgstr ""
-
-#: admin/fai/faiTemplateEntry.tpl.c:71
-msgid "SUID"
-msgstr ""
-
-#: admin/fai/faiTemplateEntry.tpl.c:77
-msgid "SGID"
-msgstr ""
-
-#: admin/fai/faiTemplateEntry.tpl.c:80
-msgid "Others"
-msgstr ""
-
-#: admin/fai/faiTemplateEntry.tpl.c:83
-msgid "sticky"
-msgstr ""
-
-#: admin/fai/faiScriptEntry.tpl.c:17 admin/fai/faiScriptEntry.tpl.c:26
-msgid "Script attributes"
-msgstr ""
-
-#: admin/fai/faiScriptEntry.tpl.c:23
-msgid ""
-"Choose a priority. Low values result in an earlier, high values in a later "
-"execution."
-msgstr ""
-
-#: admin/fai/faiScriptEntry.tpl.c:32 admin/fai/faiHookEntry.tpl.c:32
-msgid "Import script"
-msgstr ""
-
-#: admin/fai/classSelect/selectClass-list.tpl.c:2
-msgid "Base"
-msgstr "Base"
-
-#: admin/fai/fai-filter.tpl.c:29
-msgid "Show profiles"
-msgstr ""
-
-#: admin/fai/fai-filter.tpl.c:32
-msgid "Show templates"
-msgstr ""
-
-#: admin/fai/fai-filter.tpl.c:35
-msgid "Show scripts"
-msgstr ""
-
-#: admin/fai/fai-filter.tpl.c:38
-msgid "Show hooks"
-msgstr ""
-
-#: admin/fai/fai-filter.tpl.c:41
-msgid "Show variables"
-msgstr ""
-
-#: admin/fai/fai-filter.tpl.c:44
-msgid "Show packages"
-msgstr ""
-
-#: admin/fai/fai-filter.tpl.c:47
-msgid "Show partitions"
-msgstr ""
-
-#: admin/fai/faiTemplateEdit.tpl.c:2
-msgid "This FAI template is write protected. Editing may break it!"
-msgstr ""
-
-#: admin/fai/faiTemplateEdit.tpl.c:5
-msgid "Edit anyway"
-msgstr ""
-
-#: admin/fai/faiPartitionTable.tpl.c:14
-msgid "Use 'setup-storage' to partition the disk"
-msgstr ""
-
-#: admin/fai/faiPartitionTable.tpl.c:20
-msgid "Discs"
-msgstr ""
-
-#: admin/fai/faiPartitionTable.tpl.c:23 admin/fai/faiPartitionTable.tpl.c:26
-#: admin/fai/faiPartitionTable.tpl.c:41 admin/fai/faiPartitionTable.tpl.c:44
-msgid "Add disk"
-msgstr ""
-
-#: admin/fai/faiPartitionTable.tpl.c:29 admin/fai/faiPartitionTable.tpl.c:32
-#: admin/fai/faiPartitionTable.tpl.c:47 admin/fai/faiPartitionTable.tpl.c:50
-msgid "Add RAID"
-msgstr ""
-
-#: admin/fai/faiPartitionTable.tpl.c:35 admin/fai/faiPartitionTable.tpl.c:38
-#: admin/fai/faiPartitionTable.tpl.c:53 admin/fai/faiPartitionTable.tpl.c:56
-msgid "Add volume group"
-msgstr ""
-
-#: admin/fai/faiScript.tpl.c:17
-msgid "List of scripts"
-msgstr ""
-
-#: admin/fai/faiProfile.tpl.c:20
-msgid "Choose a priority"
-msgstr ""
-
-#: admin/fai/faiHookEntry.tpl.c:14 admin/fai/faiHookEntry.tpl.c:17
-#: admin/fai/faiHookEntry.tpl.c:26
-msgid "Hook attributes"
-msgstr ""
-
-#: admin/fai/faiHookEntry.tpl.c:23
-msgid "Choose an existing FAI task"
-msgstr ""
diff --git a/fai/locale/cs_CZ/fusiondirectory.po b/fai/locale/cs_CZ/fusiondirectory.po
index 4d0aee8b3ec02f0d631760eecf3fecf9a292ae11..8811e24d56af97906074f02d674de6e054de9e1b 100644
--- a/fai/locale/cs_CZ/fusiondirectory.po
+++ b/fai/locale/cs_CZ/fusiondirectory.po
@@ -3,492 +3,299 @@
 # This file is distributed under the same license as the PACKAGE package.
 # 
 # Translators:
-# Pavel Borecki <pavel.borecki@gmail.com>, 2012
-# Pavel Borecki <pavel.borecki@gmail.com>, 2012
-# Pavel Borecki <pavel.borecki@gmail.com>, 2012
+# Pavel Borecki <pavel.borecki@gmail.com>, 2014-2015
 msgid ""
 msgstr ""
-"Project-Id-Version: FusionDirectory-108\n"
+"Project-Id-Version: FusionDirectory-109\n"
 "Report-Msgid-Bugs-To: documentation@lists.fusiondirectory.org\n"
-"POT-Creation-Date: 2015-03-19 21:45+0100\n"
-"PO-Revision-Date: 2015-02-25 16:12+0000\n"
-"Last-Translator: fusiondirectory <contact@fusiondirectory.org>\n"
-"Language-Team: Czech (Czech Republic) (http://www.transifex.com/projects/p/FusionDirectory-108/language/cs_CZ/)\n"
+"POT-Creation-Date: 2014-12-15 17:47+0100\n"
+"PO-Revision-Date: 2015-04-07 19:31+0000\n"
+"Last-Translator: Pavel Borecki <pavel.borecki@gmail.com>\n"
+"Language-Team: Czech (Czech Republic) (http://www.transifex.com/projects/p/FusionDirectory-109/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/fai/class_faiScriptEntry.inc:79 admin/fai/class_faiScriptEntry.inc:82
-#: admin/fai/class_faiManagement.inc:240 admin/fai/class_faiManagement.inc:768
-#: admin/fai/class_faiManagement.inc:774
-#: admin/fai/class_faiPartitionTable.inc:268
-#: admin/fai/class_faiPartitionTable.inc:331
-#: admin/fai/class_faiDiskEntry.inc:445 admin/fai/class_FAI.inc:570
-#: admin/fai/class_faiHookEntry.inc:83 admin/fai/class_faiHookEntry.inc:86
-#: admin/fai/class_faiScript.inc:249 admin/fai/class_faiTemplate.inc:232
-#: admin/fai/class_faiHook.inc:259 admin/fai/class_faiVariable.inc:162
-#: admin/systems/class_faiLogView.inc:207
-#: admin/systems/class_faiLogView.inc:242
-msgid "Error"
-msgstr "chyba"
-
-#: admin/fai/class_faiScriptEntry.inc:82 admin/fai/class_faiHookEntry.inc:86
-msgid "file is empty"
-msgstr "soubor je prÃ¡zdnÃ½"
-
-#: admin/fai/class_faiScriptEntry.inc:102 admin/fai/class_faiHookEntry.inc:102
-#: admin/fai/class_faiScript.inc:349 admin/fai/class_faiScript.inc:374
-#: admin/fai/class_faiTemplate.inc:320 admin/fai/class_faiHook.inc:346
-msgid "Download"
-msgstr "staÅ¾enÃ"
-
-#: admin/fai/class_faiScriptEntry.inc:147
-#: admin/fai/class_faiScriptEntry.inc:151
-#: admin/fai/class_faiScriptEntry.inc:154
-#: admin/fai/class_faiScriptEntry.inc:197
-#: admin/fai/class_faiManagement.inc:768 admin/fai/class_faiManagement.inc:774
-#: admin/fai/class_faiPackage.inc:685
-#: admin/fai/class_faiPartitionTable.inc:779
-#: admin/fai/class_faiDiskEntry.inc:702 admin/fai/class_faiDiskEntry.inc:705
-#: admin/fai/class_faiDiskEntry.inc:758
-#: admin/fai/class_faiTemplateEntry.inc:247
-#: admin/fai/class_faiTemplateEntry.inc:312
-#: admin/fai/class_faiPartitionTableEntry.inc:353
-#: admin/fai/class_faiPartitionTableEntry.inc:356
-#: admin/fai/class_faiPartitionTableEntry.inc:360
-#: admin/fai/class_faiPartitionTableEntry.inc:455
-#: admin/fai/packageSelect/selectPackage-list.xml:40
-#: admin/fai/class_faiProfile.inc:414 admin/fai/class_faiProfile.inc:463
-#: admin/fai/class_faiHookEntry.inc:157 admin/fai/class_faiHookEntry.inc:162
-#: admin/fai/class_faiHookEntry.inc:165 admin/fai/class_faiHookEntry.inc:207
-#: admin/fai/class_askClassName.inc:163 admin/fai/class_askClassName.inc:167
-#: admin/fai/class_askClassName.inc:171 admin/fai/class_askClassName.inc:198
-#: admin/fai/class_faiScript.inc:347 admin/fai/class_faiScript.inc:605
-#: admin/fai/classSelect/selectClass-list.xml:28
-#: admin/fai/class_faiTemplate.inc:512
-#: admin/fai/class_faiVariableEntry.inc:103
-#: admin/fai/class_faiVariableEntry.inc:112
-#: admin/fai/class_faiVariableEntry.inc:115
-#: admin/fai/class_faiVariableEntry.inc:149 admin/fai/class_faiHook.inc:531
-#: admin/fai/class_faiVariable.inc:398 admin/fai/fai-list.xml:80
-#: admin/fai/faiPartitionTableEntry.tpl.c:8 admin/fai/faiPartition.tpl.c:5
-#: admin/fai/faiVariableEntry.tpl.c:8 admin/fai/faiDiskEntry.tpl.c:8
-#: admin/fai/faiTemplate.tpl.c:8 admin/fai/faiVariable.tpl.c:8
-#: admin/fai/faiHook.tpl.c:8
-#: admin/fai/packageSelect/selectPackage-filter.tpl.c:8
-#: admin/fai/faiPackage.tpl.c:8 admin/fai/faiScriptEntry.tpl.c:8
-#: admin/fai/classSelect/selectClass-filter.tpl.c:5
-#: admin/fai/fai-filter.tpl.c:50 admin/fai/faiPartitionTable.tpl.c:8
-#: admin/fai/faiScript.tpl.c:8 admin/fai/faiProfile.tpl.c:8
-#: admin/fai/faiHookEntry.tpl.c:8
-msgid "Name"
-msgstr "nÃ¡zev"
-
-#: admin/fai/class_faiScriptEntry.inc:159 admin/fai/class_faiHookEntry.inc:170
-#: admin/fai/class_faiScript.inc:594 admin/fai/fai-list.xml:122
-#: admin/fai/faiScriptEntry.tpl.c:29 admin/fai/faiHookEntry.tpl.c:29
-msgid "Script"
-msgstr "skript"
-
-#: admin/fai/class_faiScriptEntry.inc:190
-#: admin/fai/class_faiScriptEntry.inc:199
-msgid "Script entry"
-msgstr "poloÅ¾ka skriptu"
-
-#: admin/fai/class_faiScriptEntry.inc:191
-msgid "FAI script entry"
-msgstr "poloÅ¾ka skriptu FAI"
-
-#: admin/fai/class_faiScriptEntry.inc:198 admin/fai/class_faiPackage.inc:686
-#: admin/fai/class_faiPartitionTable.inc:780
-#: admin/fai/class_faiDiskEntry.inc:759
-#: admin/fai/class_faiTemplateEntry.inc:313
-#: admin/fai/class_faiPartitionTableEntry.inc:456
-#: admin/fai/class_faiProfile.inc:464 admin/fai/class_faiHookEntry.inc:208
-#: admin/fai/class_faiScript.inc:606 admin/fai/class_faiTemplate.inc:513
-#: admin/fai/class_faiVariableEntry.inc:150 admin/fai/class_faiHook.inc:532
-#: admin/fai/class_faiVariable.inc:399
-#: admin/fai/faiPartitionTableEntry.tpl.c:11 admin/fai/faiPartition.tpl.c:11
-#: admin/fai/faiVariableEntry.tpl.c:11 admin/fai/faiDiskEntry.tpl.c:14
-#: admin/fai/faiTemplate.tpl.c:11 admin/fai/faiVariable.tpl.c:11
-#: admin/fai/faiHook.tpl.c:11 admin/fai/faiPackage.tpl.c:11
-#: admin/fai/faiTemplateEntry.tpl.c:14 admin/fai/faiScriptEntry.tpl.c:11
-#: admin/fai/faiPartitionTable.tpl.c:11 admin/fai/faiScript.tpl.c:11
-#: admin/fai/faiProfile.tpl.c:11 admin/fai/faiHookEntry.tpl.c:11
-msgid "Description"
-msgstr "popis"
-
-#: admin/fai/class_faiScriptEntry.inc:200
-msgid "Script Priority"
-msgstr "priorita skriptu"
-
-#: admin/fai/class_faiManagement.inc:188
-msgid "partition table"
-msgstr "tabulka rozdÄ›lenÃ ÃºloÅ¾iÅ¡tÄ›"
-
-#: admin/fai/class_faiManagement.inc:189 admin/fai/fai-list.xml:31
-msgid "script"
-msgstr "skript"
-
-#: admin/fai/class_faiManagement.inc:190 admin/fai/fai-list.xml:47
-msgid "hook"
-msgstr "hÃ¡Äek"
-
-#: admin/fai/class_faiManagement.inc:191 admin/fai/fai-list.xml:39
-msgid "variable"
-msgstr "promÄ›nnÃ¡"
-
-#: admin/fai/class_faiManagement.inc:192 admin/fai/fai-list.xml:63
-msgid "template"
-msgstr "Å¡ablona"
-
-#: admin/fai/class_faiManagement.inc:193
-msgid "package list"
-msgstr "seznam balÃÄkÅ¯"
-
-#: admin/fai/class_faiManagement.inc:210 admin/fai/class_faiManagement.inc:226
-#: admin/fai/class_faiManagement.inc:332 admin/fai/class_faiManagement.inc:390
-#: admin/fai/class_faiManagement.inc:480 admin/fai/class_faiManagement.inc:575
-#: admin/fai/class_faiManagement.inc:598 admin/fai/class_faiManagement.inc:619
-msgid "Permission error"
-msgstr "chyba oprÃ¡vnÄ›nÃ"
-
-#: admin/fai/class_faiManagement.inc:211 admin/fai/class_faiManagement.inc:226
-#, php-format
-msgid "You have no permission to create a new %s!"
-msgstr "Nejste oprÃ¡vnÄ›n(a) vytvoÅ™it novÃ© %s!"
-
-#: admin/fai/class_faiManagement.inc:226 admin/fai/fai-list.xml:55
-msgid "profile"
-msgstr "profil"
-
-#: admin/fai/class_faiManagement.inc:328
-msgid "Branch locked"
-msgstr "vÄ›tev uzamÄena"
-
-#: admin/fai/class_faiManagement.inc:329
-#, php-format
-msgid "The following entries are locked, you can't remove them %s."
-msgstr "Tyto poloÅ¾ky nemÅ¯Å¾ete odebrat, protoÅ¾e jsou uzamÄeny %s."
-
-#: admin/fai/class_faiManagement.inc:346
-msgid "FAI object"
-msgstr "Objekt FAI"
-
-#: admin/fai/class_faiManagement.inc:477
-msgid "FAI branch/freeze"
-msgstr "FAI vÄ›tvenÃ / â€žzmrazenÃâ€œ"
-
-#: admin/fai/class_faiManagement.inc:480
-msgid "You have no permission to delete this release!"
-msgstr "Nejste oprÃ¡vnÄ›n(a) smazat toto vydÃ¡nÃ!"
-
-#: admin/fai/class_faiManagement.inc:496 admin/fai/remove.tpl.c:2
-#: admin/fai/remove_branch.tpl.c:2
-msgid "Warning"
-msgstr "varovÃ¡nÃ"
-
-#: admin/fai/class_faiManagement.inc:496
-msgid "Release remove aborted because the release name check failed!"
-msgstr "OdebrÃ¡nÃ vydÃ¡nÃ bylo pÅ™eruÅ¡eno z dÅ¯vodu selhÃ¡nÃ kontroly jeho nÃ¡zvu!"
-
-#: admin/fai/class_faiManagement.inc:573 admin/fai/class_faiManagement.inc:596
-msgid "Configuration"
-msgstr "nastavenÃ"
-
-#: admin/fai/class_faiManagement.inc:575 admin/fai/class_faiManagement.inc:598
-#: admin/fai/class_faiManagement.inc:619
-msgid "Branch"
-msgstr "vÄ›tev"
-
-#: admin/fai/class_faiManagement.inc:725 admin/fai/askClassName.tpl.c:23
-msgid "Continue"
-msgstr "pokraÄuj"
-
-#: admin/fai/class_faiManagement.inc:926
-#: admin/fai/class_faiPartitionTable.inc:768
-#: admin/fai/class_faiProfile.inc:318 admin/fai/class_askClassName.inc:99
-#: admin/fai/classSelect/class_classSelect.inc:58
-#: admin/fai/class_faiGroupHandle.inc:120
-#: admin/fai/class_faiProfileEntry.inc:163 admin/fai/fai-list.xml:146
-msgid "Partition table"
-msgstr "tabulka rozdÄ›lenÃ ÃºloÅ¾iÅ¡tÄ›"
-
-#: admin/fai/class_faiManagement.inc:928
-#: admin/fai/class_faiGroupHandle.inc:122 admin/fai/fai-list.xml:140
-msgid "Package list"
-msgstr "seznam balÃÄkÅ¯"
-
-#: admin/fai/class_faiManagement.inc:930
-#: admin/fai/class_faiGroupHandle.inc:124
-msgid "Scripts"
-msgstr "skripty"
-
-#: admin/fai/class_faiManagement.inc:932
-#: admin/fai/class_faiGroupHandle.inc:126
-msgid "Variables"
-msgstr "promÄ›nnÃ©"
-
-#: admin/fai/class_faiManagement.inc:934
-#: admin/fai/class_faiGroupHandle.inc:128
-msgid "Hooks"
-msgstr "hÃ¡Äky"
-
-#: admin/fai/class_faiManagement.inc:936 admin/fai/class_faiProfile.inc:454
-#: admin/fai/class_askClassName.inc:104 admin/fai/class_faiGroupHandle.inc:130
-#: admin/fai/fai-list.xml:110
-msgid "Profile"
-msgstr "profil"
-
-#: admin/fai/class_faiManagement.inc:938
-#: admin/fai/class_faiGroupHandle.inc:132
-msgid "Templates"
-msgstr "Å¡ablony"
-
-#: admin/fai/class_faiManagement.inc:1039
-#: admin/fai/class_faiManagement.inc:1045
+#: admin/fai/class_faiManagement.inc:117 admin/fai/class_faiManagement.inc:122
 #: admin/fai/packageSelect/selectPackage-list.xml:14
-#: admin/fai/classSelect/selectClass-list.xml:15
-#: admin/systems/class_faiStartup.inc:177 config/fai/class_faiConfig.inc:41
+#: admin/systems/class_faiStartup.inc:178 config/fai/class_faiConfig.inc:41
 msgid "FAI"
-msgstr "FAI"
-
-#: admin/fai/class_faiManagement.inc:1040
-msgid "Manage FAI software packages and deployment recipes"
 msgstr ""
 
-#: admin/fai/class_faiPackage.inc:261
-msgid "Invalid package names"
-msgstr "neplatnÃ© nÃ¡zvy balÃÄkÅ¯"
-
-#: admin/fai/class_faiPackage.inc:262
-#, php-format
-msgid "The following package names don't match the Debian policy: %s"
-msgstr "tyto nÃ¡zvy balÃÄkÅ¯ neodpovÃdajÃ pravidlÅ¯m stanovenÃ½m Debianem: %s"
-
-#: admin/fai/class_faiPackage.inc:421 admin/fai/class_faiPackage.inc:422
-msgid "Configured"
-msgstr "nastaveno"
-
-#: admin/fai/class_faiPackage.inc:428 admin/fai/class_faiPackage.inc:429
-msgid "Package marked for removal"
-msgstr "balÃÄky oznaÄenÃ© pro odebrÃ¡nÃ"
-
-#: admin/fai/class_faiPackage.inc:445
-msgid "Mark package for removal"
-msgstr "oznaÄit balÃÄek pro odebrÃ¡nÃ"
-
-#: admin/fai/class_faiPackage.inc:451
-msgid "Configure this package"
-msgstr "nastavit tento balÃÄek"
-
-#: admin/fai/class_faiPackage.inc:455
-msgid "Remove this package"
-msgstr "odebrat tento balÃÄek"
-
-#: admin/fai/class_faiPackage.inc:534
-msgid "Please select a least one package!"
-msgstr "Vyberte alespoÅˆ jeden balÃÄek, prosÃm!"
-
-#: admin/fai/class_faiPackage.inc:538
-msgid ""
-"Please choose a valid release/section combination for your repository setup!"
-msgstr "V nastavenÃch repozitÃ¡Å™Å¯ pouÅ¾ijte sprÃ¡vnou kombinaci vydÃ¡nÃ/sekce!"
+#: 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/fai/class_faiPackage.inc:157
+msgid "Mark for installation"
+msgstr "OznaÄit k instalaci"
+
+#: admin/fai/class_faiPackage.inc:161
+msgid "Mark for removal"
+msgstr "OznaÄit k odstranÄ›nÃ"
+
+#: admin/fai/class_faiPackage.inc:166
+msgid "Edit configuration"
+msgstr "Upravit nastavenÃ"
+
+#: admin/fai/class_faiPackage.inc:247
+#: admin/fai/class_faiPartitionTable.inc:209
+#: admin/fai/class_faiPartitionTable.inc:250
+#: admin/fai/class_faiTemplate.inc:114
+#: admin/systems/services/repository/class_serviceDebianRepository.inc:172
+#: admin/systems/services/repository/class_serviceDebianRepository.inc:189
+#: admin/systems/services/repository/class_serviceDebianRepository.inc:193
+msgid "LDAP error"
+msgstr "Chyba LDAP"
 
-#: admin/fai/class_faiPackage.inc:571
+#: admin/fai/class_faiPackage.inc:279
 #: admin/fai/packageSelect/class_filterFAIPackages.inc:41
 #: admin/fai/packageSelect/class_filterFAIPackages.inc:46
 #: admin/fai/class_faiPackageConfiguration.inc:55
-#: admin/systems/class_faiStartup.inc:132
-#: admin/systems/class_faiStartup.inc:159
-msgid "Infrastructure service"
-msgstr ""
+#: admin/systems/class_faiStartup.inc:133
+#: admin/systems/class_faiStartup.inc:160
+msgid "Service infrastructure"
+msgstr "servisnÃ infrastruktura"
 
-#: admin/fai/class_faiPackage.inc:587
+#: admin/fai/class_faiPackage.inc:294
 msgid "Unkown packages"
 msgstr "NeznÃ¡mÃ© balÃÄky"
 
-#: admin/fai/class_faiPackage.inc:674
-#: admin/fai/faiPackageConfiguration.tpl.c:2
+#: admin/fai/class_faiPackage.inc:365
 msgid "Package"
-msgstr "balÃÄek"
+msgstr "BalÃÄek"
 
-#: admin/fai/class_faiPackage.inc:675
+#: admin/fai/class_faiPackage.inc:366
 msgid "FAI Package list"
-msgstr "seznam balÃÄkÅ¯ pro FAI"
+msgstr "Seznam balÃÄkÅ¯ pro FAI instalaci"
 
-#: admin/fai/class_faiPackage.inc:679
+#: admin/fai/class_faiPackage.inc:369
 msgid "FAI Package"
-msgstr ""
+msgstr "FAI balÃÄek"
 
-#: admin/fai/class_faiPackage.inc:687
-msgid "Packages"
-msgstr "balÃÄky"
+#: admin/fai/class_faiPackage.inc:385
+#: admin/fai/class_faiPartitionTable.inc:304
+#: admin/fai/class_faiTemplateEntry.inc:140 admin/fai/class_faiProfile.inc:47
+#: admin/fai/class_faiScript.inc:50 admin/fai/class_faiTemplate.inc:173
+#: admin/fai/class_faiHook.inc:50 admin/fai/class_faiVariable.inc:50
+msgid "Properties"
+msgstr "Vlastnosti"
+
+#: admin/fai/class_faiPackage.inc:388
+#: admin/fai/class_faiPartitionTable.inc:307 admin/fai/class_faiProfile.inc:50
+#: admin/fai/class_faiScript.inc:53 admin/fai/class_faiTemplate.inc:176
+#: admin/fai/class_faiHook.inc:53 admin/fai/class_faiVariable.inc:53
+msgid "Class name"
+msgstr "NÃ¡zev tÅ™Ãdy"
+
+#: admin/fai/class_faiPackage.inc:388 admin/fai/class_faiScript.inc:53
+#: admin/fai/class_faiHook.inc:53 admin/fai/class_faiVariable.inc:53
+msgid "Variables class name"
+msgstr "NÃ¡zev tÅ™Ãdy promÄ›nnÃ½ch"
+
+#: admin/fai/class_faiPackage.inc:392
+#: admin/fai/class_faiPartitionTable.inc:311
+#: admin/fai/class_faiDiskEntry.inc:738
+#: admin/fai/class_faiTemplateEntry.inc:147 admin/fai/class_faiProfile.inc:54
+#: admin/fai/class_faiScript.inc:57 admin/fai/class_faiScript.inc:75
+#: admin/fai/class_faiTemplate.inc:180 admin/fai/class_faiHook.inc:57
+#: admin/fai/class_faiHook.inc:75 admin/fai/class_faiVariable.inc:57
+#: admin/fai/class_faiVariable.inc:75
+msgid "Description"
+msgstr "Popis"
 
-#: admin/fai/class_faiPackage.inc:688 admin/fai/faiPackage.tpl.c:23
-msgid "Section"
-msgstr "oddÃl"
+#: admin/fai/class_faiPackage.inc:392
+#: admin/fai/class_faiPartitionTable.inc:311 admin/fai/class_faiProfile.inc:54
+#: admin/fai/class_faiScript.inc:57 admin/fai/class_faiTemplate.inc:180
+#: admin/fai/class_faiHook.inc:57 admin/fai/class_faiVariable.inc:57
+msgid "Short description of the class"
+msgstr "StruÄnÃ½ popis tÅ™Ãdy"
 
-#: admin/fai/class_faiPackage.inc:688 admin/fai/class_faiPackage.inc:691
-#: admin/fai/class_faiScript.inc:605 admin/fai/class_faiTemplate.inc:512
-msgid "Readonly"
-msgstr "pouze pro ÄtenÃ"
+#: admin/fai/class_faiPackage.inc:398 admin/systems/class_faiStartup.inc:90
+msgid "Repository"
+msgstr "RepozitÃ¡Å™"
 
-#: admin/fai/class_faiPackage.inc:689
-msgid "Install Method"
+#: admin/fai/class_faiPackage.inc:401 admin/systems/class_faiStartup.inc:78
+#: admin/systems/services/repository/class_serviceDebianRepository.inc:52
+#: admin/systems/services/repository/class_serviceCentosRepository.inc:49
+msgid "Release"
+msgstr "VydÃ¡nÃ"
+
+#: admin/fai/class_faiPackage.inc:401
+msgid "Debian release concerned"
+msgstr "TÃ½kajÃcÃ se vydÃ¡nÃ distribuce Debian"
+
+#: admin/fai/class_faiPackage.inc:405
+#: admin/systems/services/repository/class_serviceDebianRepository.inc:58
+msgid "Sections"
+msgstr "oddÃly"
+
+#: admin/fai/class_faiPackage.inc:405
+msgid "Sections concerned"
+msgstr "Sekce, kterÃ½ch se tÃ½kÃ¡"
+
+#: admin/fai/class_faiPackage.inc:409
+msgid "Install method"
 msgstr "zpÅ¯sob instalace"
 
-#: admin/fai/class_faiPackage.inc:690
-msgid "Package configuration"
-msgstr "nastavenÃ balÃÄku"
+#: admin/fai/class_faiPackage.inc:409
+msgid "Install method to use for this package list"
+msgstr "ZpÅ¯sob kterÃ½m majÃ bÃ½t nainstalovÃ¡ny balÃÄky z tohoto seznamu"
 
-#: admin/fai/class_faiPackage.inc:691 admin/systems/class_faiStartup.inc:78
-#: admin/systems/services/repository/class_serviceRepository.inc:40
-#: admin/fai/branch_selector.tpl.c:14 admin/fai/faiPackage.tpl.c:20
-#: admin/fai/fai-filter.tpl.c:5 admin/fai/fai-filter.tpl.c:14
-msgid "Release"
-msgstr "vydÃ¡nÃ"
+#: admin/fai/class_faiPackage.inc:420
+msgid "Packages"
+msgstr "balÃÄky"
 
-#: admin/fai/class_faiPartitionTable.inc:269
-#: admin/fai/class_faiDiskEntry.inc:446
-#, php-format
-msgid ""
-"The disk cannot be deleted while it is used in the '%s' disk definition!"
-msgstr "ÃšloÅ¾iÅ¡tÄ› nenÃ moÅ¾nÃ© odebrat, protoÅ¾e je pouÅ¾ito v definici ÃºloÅ¾iÅ¡tÄ› '%s'!"
+#: admin/fai/class_faiPackage.inc:424
+msgid "Packages in this class"
+msgstr "BalÃÄky v tÃ©to tÅ™ÃdÄ›"
 
-#: admin/fai/class_faiPartitionTable.inc:416 admin/fai/class_faiScript.inc:360
-#: admin/fai/class_faiScript.inc:362 admin/fai/class_faiTemplate.inc:306
-#: admin/fai/class_faiTemplate.inc:308
-msgid "edit"
-msgstr "upravit"
+#: admin/fai/class_faiPartitionTable.inc:61
+#: admin/fai/class_faiDiskEntry.inc:442 admin/systems/class_faiLogView.inc:207
+#: admin/systems/class_faiLogView.inc:242
+msgid "Error"
+msgstr "Chyba"
 
-#: admin/fai/class_faiPartitionTable.inc:418 admin/fai/class_faiScript.inc:364
-#: admin/fai/class_faiTemplate.inc:310
-msgid "delete"
-msgstr "smazat"
+#: admin/fai/class_faiPartitionTable.inc:112
+msgid "Add RAID"
+msgstr "PÅ™idat RAID"
+
+#: admin/fai/class_faiPartitionTable.inc:116
+msgid "Add LVM"
+msgstr "PÅ™idat LVM"
 
-#: admin/fai/class_faiPartitionTable.inc:769
-#: admin/fai/class_faiPartitionTable.inc:773
+#: admin/fai/class_faiPartitionTable.inc:284
+msgid "Partition table"
+msgstr "Tabulka rozdÄ›lenÃ jednotky datovÃ©ho ÃºloÅ¾iÅ¡tÄ›"
+
+#: admin/fai/class_faiPartitionTable.inc:285
+#: admin/fai/class_faiPartitionTable.inc:288
 msgid "FAI partition table"
 msgstr "tabulka dÄ›lenÃ ÃºloÅ¾iÅ¡tÄ› pro FAI"
 
-#: admin/fai/class_faiPartitionTable.inc:779 admin/fai/class_faiHook.inc:531
-#: admin/fai/class_faiVariable.inc:398
-msgid "Read only"
-msgstr "pouze pro ÄtenÃ"
+#: admin/fai/class_faiPartitionTable.inc:307 admin/fai/class_faiProfile.inc:50
+msgid "Partition table class name"
+msgstr "NÃ¡zev tÅ™Ãdy tabulky oddÃlÅ¯"
+
+#: admin/fai/class_faiPartitionTable.inc:317
+msgid "Discs"
+msgstr "Jednotky datovÃ©ho ÃºloÅ¾iÅ¡tÄ›"
+
+#: admin/fai/class_faiPartitionTable.inc:324
+msgid "Partitions in this class"
+msgstr "OddÃly v tÃ©to tÅ™ÃdÄ›"
 
 #: admin/fai/class_faiDiskEntry.inc:273
-#: admin/fai/faiPartitionTableEntry.tpl.c:5 admin/fai/faiDiskEntry.tpl.c:5
 msgid "Device"
-msgstr "zaÅ™ÃzenÃ"
+msgstr "ZaÅ™ÃzenÃ"
 
 #: admin/fai/class_faiDiskEntry.inc:273
 msgid "Label"
-msgstr "jmenovka"
+msgstr "Å tÃtek"
 
 #: admin/fai/class_faiDiskEntry.inc:273
 msgid "UUID"
-msgstr "UUID"
+msgstr "JedineÄnÃ½ identifikÃ¡tor uÅ¾ivatele (UUID)"
 
-#: admin/fai/class_faiDiskEntry.inc:345
+#: admin/fai/class_faiDiskEntry.inc:344
 msgid "Disks"
-msgstr "ÃºloÅ¾iÅ¡tÄ›"
+msgstr "Jednotky datovÃ©ho ÃºloÅ¾iÅ¡tÄ›"
 
-#: admin/fai/class_faiDiskEntry.inc:348 admin/fai/class_faiPartition.inc:321
-#: admin/fai/faiPartition.tpl.c:14
+#: admin/fai/class_faiDiskEntry.inc:347 admin/fai/class_faiPartition.inc:319
 msgid "Size"
-msgstr "velikost"
+msgstr "Velikost"
 
-#: admin/fai/class_faiDiskEntry.inc:544
+#: admin/fai/class_faiDiskEntry.inc:443
+#, php-format
+msgid ""
+"The disk cannot be deleted while it is used in the '%s' disk definition!"
+msgstr "Jednotku datovÃ©ho ÃºloÅ¾iÅ¡tÄ› nenÃ moÅ¾nÃ© odebrat, protoÅ¾e je pouÅ¾ita v definici ÃºloÅ¾iÅ¡tÄ› %s!"
+
+#: admin/fai/class_faiDiskEntry.inc:536
 msgid "encrypted"
 msgstr "Å¡ifrovanÃ©"
 
-#: admin/fai/class_faiDiskEntry.inc:547
+#: admin/fai/class_faiDiskEntry.inc:539
 msgid "bootable"
-msgstr "zaveditelnÃ© (bootovatelnÃ©)"
+msgstr "zaveditelnÃ©"
 
-#: admin/fai/class_faiDiskEntry.inc:550
+#: admin/fai/class_faiDiskEntry.inc:542
 msgid "preserve"
 msgstr "zachovat"
 
-#: admin/fai/class_faiDiskEntry.inc:735
+#: admin/fai/class_faiDiskEntry.inc:687 admin/fai/class_faiDiskEntry.inc:690
+#: admin/fai/class_faiDiskEntry.inc:737
+#: admin/fai/packageSelect/selectPackage-list.xml:40
+#: admin/fai/class_faiScript.inc:71 admin/fai/class_faiHook.inc:71
+#: admin/fai/class_faiVariable.inc:71
+#: admin/fai/class_faiSimplePluginClass.inc:50
+msgid "Name"
+msgstr "NÃ¡zev"
+
+#: admin/fai/class_faiDiskEntry.inc:717
 msgid ""
 "You have more than four primary partition table entries in your "
 "configuration, please check your configuration twice."
-msgstr "Ve VaÅ¡em nastavenÃ mÃ¡te definovÃ¡ny vÃce neÅ¾ 4 hlavnÃ oddÃly (coÅ¾ je technicky nerealizovatelnÃ©) â€“ pÅ™ekontrolujte prosÃm nastavenÃ."
+msgstr "V nastavenÃ mÃ¡te zadÃ¡ny vÃce neÅ¾ 4 hlavnÃ oddÃly (coÅ¾ je technicky nerealizovatelnÃ©) â€“ pÅ™ekontrolujte jej."
 
-#: admin/fai/class_faiDiskEntry.inc:739
+#: admin/fai/class_faiDiskEntry.inc:721
 msgid ""
 "You cannot have more than three primary partition while using logical "
 "partitions, please check your configuration twice."
-msgstr "Pokud chcete pouÅ¾Ãt i logickÃ½ oddÃl, nemÅ¯Å¾ete mÃt souÄasnÄ› vÃce neÅ¾ 3 hlavnÃ oddÃly â€“ pÅ™ekontrolujte prosÃm nastavenÃ."
+msgstr "Pokud chcete pouÅ¾Ãt i logickÃ© oddÃly, nemÅ¯Å¾ete mÃt souÄasnÄ› vÃce neÅ¾ 3 hlavnÃ oddÃly â€“ pÅ™ekontrolujte nastavenÃ."
 
-#: admin/fai/class_faiDiskEntry.inc:752
-#: admin/fai/class_faiPartitionTableEntry.inc:448
+#: admin/fai/class_faiDiskEntry.inc:733
 msgid "Partition table entry"
-msgstr "poloÅ¾ka tabulky rozdÄ›lenÃ ÃºloÅ¾iÅ¡tÄ›"
+msgstr "PoloÅ¾ka tabulky rozdÄ›lenÃ ÃºloÅ¾iÅ¡tÄ›"
 
-#: admin/fai/class_faiDiskEntry.inc:753
-#: admin/fai/class_faiPartitionTableEntry.inc:449
+#: admin/fai/class_faiDiskEntry.inc:734
 msgid "FAI partition table entry"
-msgstr "poloÅ¾ka tabulky rozdÄ›lenÃ ÃºloÅ¾iÅ¡tÄ› pro FAI"
+msgstr "PoloÅ¾ka tabulky rozdÄ›lenÃ ÃºloÅ¾iÅ¡tÄ› pro FAI"
 
-#: admin/fai/class_faiDiskEntry.inc:760
+#: admin/fai/class_faiDiskEntry.inc:739
 msgid "Disk options"
-msgstr "pÅ™edvolby ÃºloÅ¾iÅ¡tÄ›"
+msgstr "PÅ™edvolby jednotky datovÃ©ho ÃºloÅ¾iÅ¡tÄ›"
 
-#: admin/fai/class_faiDiskEntry.inc:761
-#: admin/fai/class_faiPartitionTableEntry.inc:457
+#: admin/fai/class_faiDiskEntry.inc:740
 msgid "Partition type"
-msgstr "typ oddÃlu"
+msgstr "Typ oddÃlu"
 
-#: admin/fai/class_faiDiskEntry.inc:762
-#: admin/fai/class_faiPartitionTableEntry.inc:458
+#: admin/fai/class_faiDiskEntry.inc:741
 msgid "Partition no."
-msgstr "ÄÃslo oddÃlu"
+msgstr "ÄŒÃslo oddÃlu"
 
-#: admin/fai/class_faiDiskEntry.inc:763
-#: admin/fai/class_faiPartitionTableEntry.inc:459
+#: admin/fai/class_faiDiskEntry.inc:742
 msgid "File system type"
-msgstr "typ souborovÃ©ho systÃ©mu"
+msgstr "Typ souborovÃ©ho systÃ©mu"
 
-#: admin/fai/class_faiDiskEntry.inc:764
-#: admin/fai/class_faiPartitionTableEntry.inc:171
-#: admin/fai/class_faiPartitionTableEntry.inc:460
-#: admin/fai/class_faiPartition.inc:437 admin/fai/faiPartition.tpl.c:47
+#: admin/fai/class_faiDiskEntry.inc:743 admin/fai/class_faiPartition.inc:432
 msgid "Mount point"
-msgstr "pÅ™ÃpojnÃ½ bod"
+msgstr "PÅ™ÃpojnÃ½ bod"
 
-#: admin/fai/class_faiDiskEntry.inc:765
-#: admin/fai/class_faiPartitionTableEntry.inc:461
-#: admin/fai/class_faiPartition.inc:402 admin/fai/class_faiPartition.inc:407
+#: admin/fai/class_faiDiskEntry.inc:744 admin/fai/class_faiPartition.inc:397
+#: admin/fai/class_faiPartition.inc:402
 msgid "Partition size"
-msgstr "velikost oddÃlu"
+msgstr "Velikost oddÃlu"
 
-#: admin/fai/class_faiDiskEntry.inc:766
-#: admin/fai/class_faiPartitionTableEntry.inc:173
-#: admin/fai/class_faiPartitionTableEntry.inc:462
-#: admin/fai/faiPartition.tpl.c:50
+#: admin/fai/class_faiDiskEntry.inc:745
 msgid "Mount options"
-msgstr "volby pÅ™ipojovÃ¡nÃ"
+msgstr "PÅ™edvolby pÅ™ipojovÃ¡nÃ (mount)"
 
-#: admin/fai/class_faiDiskEntry.inc:767
-#: admin/fai/class_faiPartitionTableEntry.inc:463
+#: admin/fai/class_faiDiskEntry.inc:746
 msgid "File system options"
-msgstr "pÅ™edvolby souborovÃ©ho systÃ©mu"
+msgstr "PÅ™edvolby souborovÃ©ho systÃ©mu"
 
-#: admin/fai/class_faiDiskEntry.inc:768
-#: admin/fai/class_faiPartitionTableEntry.inc:464
+#: admin/fai/class_faiDiskEntry.inc:747
 msgid "Partition flags"
 msgstr "oznaÄenÃ oddÃlu"
 
-#: admin/fai/class_debconfTemplate.inc:227
+#: admin/fai/class_debconfTemplate.inc:225
 msgid "This package has no debconf options."
 msgstr "Tento balÃÄek nemÃ¡ Å¾Ã¡dnÃ© volby pro debconf."
 
-#: admin/fai/class_debconfTemplate.inc:264
+#: admin/fai/class_debconfTemplate.inc:262
 msgid ""
 "This debconf question is dynamically generated during package installation "
 "and requires choosing between specific options which cannot be presented "
@@ -496,374 +303,163 @@ msgid ""
 " effect."
 msgstr "Obsah tohoto dotazu je vytvÃ¡Å™en v prÅ¯bÄ›hu instalace balÃÄkÅ¯ a proto je odpovÄ›Ä na nÄ›j tÅ™eba specificky vytvoÅ™it tak, aby odpovÃdal."
 
-#: admin/fai/class_faiTemplateEntry.inc:139
-msgid "no file uploaded yet"
-msgstr "doposud nebyl nahrÃ¡n Å¾Ã¡dnÃ½ soubor"
-
-#: admin/fai/class_faiTemplateEntry.inc:142
-#, php-format
-msgid "exists in database (size: %s bytes)"
-msgstr "je pÅ™Ãtomno v databÃ¡zi (velikost: %s bytÅ¯)"
-
-#: admin/fai/class_faiTemplateEntry.inc:251
-#: admin/systems/class_faiLogView.inc:70 admin/fai/faiTemplateEntry.tpl.c:23
-msgid "File"
-msgstr "soubor"
-
-#: admin/fai/class_faiTemplateEntry.inc:255
-#: admin/fai/faiTemplateEntry.tpl.c:11
-msgid "Destination path"
-msgstr "cÃlovÃ© umÃstÄ›nÃ"
-
-#: admin/fai/class_faiTemplateEntry.inc:260 admin/fai/faiTemplateEntry.tpl.c:8
-msgid "File name"
-msgstr "nÃ¡zev souboru"
-
-#: admin/fai/class_faiTemplateEntry.inc:264
-#: admin/fai/class_faiTemplateEntry.inc:266
-#: admin/fai/faiTemplateEntry.tpl.c:68
-msgid "User"
-msgstr "uÅ¾ivatel"
-
-#: admin/fai/class_faiTemplateEntry.inc:270
-#: admin/fai/class_faiTemplateEntry.inc:273
-#: admin/fai/class_faiTemplateEntry.inc:275
-#: admin/fai/faiTemplateEntry.tpl.c:47 admin/fai/faiTemplateEntry.tpl.c:74
-msgid "Group"
-msgstr "skupina"
-
-#: admin/fai/class_faiTemplateEntry.inc:305
-msgid "Template entry"
-msgstr "smazat poloÅ¾ku"
-
-#: admin/fai/class_faiTemplateEntry.inc:306
-msgid "FAI template entry"
-msgstr "poloÅ¾ka Å¡ablony FAI"
-
-#: admin/fai/class_faiTemplateEntry.inc:314
-msgid "Template file"
-msgstr "soubor Å¡ablony"
-
-#: admin/fai/class_faiTemplateEntry.inc:315
-msgid "Template path"
-msgstr "umÃstÄ›nÃ Å¡ablony"
-
-#: admin/fai/class_faiTemplateEntry.inc:316
-msgid "File owner"
-msgstr "vlastnÃk souboru"
+#: admin/fai/class_faiTemplateEntry.inc:143
+msgid "File path"
+msgstr "UmÃstÄ›nÃ souboru"
 
-#: admin/fai/class_faiTemplateEntry.inc:317
-msgid "File permissions"
-msgstr "prÃ¡va na souboru"
+#: admin/fai/class_faiTemplateEntry.inc:143
+msgid "Complete absolute template file path and name"
+msgstr "ÃšplnÃ½ popis umÃstÄ›nÃ souboru a nÃ¡zev"
 
-#: admin/fai/class_FAI.inc:287 admin/fai/class_FAI.inc:679
-#: admin/fai/class_FAI.inc:1266 admin/fai/class_FAI.inc:1283
-#: admin/fai/class_FAI.inc:1287
-msgid "LDAP error"
-msgstr "chyba LDAPu"
-
-#: admin/fai/class_FAI.inc:570
-#, php-format
-msgid "Error, following objects should be equal '%s' and '%s'"
-msgstr "chyba â€“ tyto objekty by mÄ›ly bÃ½t shodnÃ©: '%s' a '%s'"
-
-#: admin/fai/class_FAI.inc:891
-#, php-format
-msgid "Creating group application release for %s"
-msgstr ""
-
-#: admin/fai/class_FAI.inc:960 admin/fai/class_FAI.inc:982
-#: admin/fai/class_FAI.inc:1022 admin/fai/class_FAI.inc:1027
-#: admin/fai/class_FAI.inc:1065
-msgid "Object"
-msgstr "objekt"
-
-#: admin/fai/class_FAI.inc:961
-#, php-format
-msgid "Adding missing group application release container %s."
-msgstr ""
-
-#: admin/fai/class_FAI.inc:983
-#, php-format
-msgid "Adding group application release container %s."
-msgstr ""
-
-#: admin/fai/class_FAI.inc:1023
-#, php-format
-msgid "Could not create menu entry %s. (Already exists)."
-msgstr "Nelze vytvoÅ™it poloÅ¾ku nabÃdky %s (jiÅ¾ existuje)."
-
-#: admin/fai/class_FAI.inc:1028
-#, php-format
-msgid "Created group application menu entry for %s."
-msgstr "V nabÃdce byla vytvoÅ™ena poloÅ¾ka skupiny aplikacÃ pro %s."
-
-#: admin/fai/class_FAI.inc:1059
-#, php-format
-msgid "Creating copy of %s"
-msgstr "probÃhÃ¡ vytvoÅ™enÃ kopie %s"
-
-#: admin/fai/class_FAI.inc:1062
-msgid "Processing"
-msgstr "zpracovÃ¡vÃ¡m"
-
-#: admin/fai/class_FAI.inc:1080
-msgid "Could not create new release, the destination dn is already in use."
-msgstr "Nelze vytvoÅ™it novÃ© vydÃ¡nÃ â€“ cÃlovÃ© DN je jiÅ¾ pouÅ¾ÃvÃ¡no."
-
-#: admin/fai/class_FAI.inc:1093
-msgid "Error while fetching source dn - aborted!"
-msgstr "DoÅ¡lo k chybÄ› pÅ™i zÃskÃ¡vÃ¡nÃ DN zdroje â€“ pÅ™eruÅ¡eno!"
-
-#: admin/fai/class_FAI.inc:1174
-msgid "Fatal error"
-msgstr "fatÃ¡lnÃ chyba"
-
-#: admin/fai/class_FAI.inc:1175
-#, php-format
-msgid ""
-"Release creation failed due to ldap errors. Additional informations '%s'."
-msgstr "VytvoÅ™enÃ vydÃ¡nÃ selhalo vinou chyb v LDAPu. BliÅ¾Å¡Ã informace viz '%s'."
+#: admin/fai/class_faiTemplateEntry.inc:147
+msgid "Short description of the file"
+msgstr "StruÄnÃ½ popis souboru"
 
-#: admin/fai/class_faiPartitionTableEntry.inc:162
-msgid "primary"
-msgstr "hlavnÃ"
-
-#: admin/fai/class_faiPartitionTableEntry.inc:162
-msgid "logical"
-msgstr "logickÃ½"
-
-#: admin/fai/class_faiPartitionTableEntry.inc:169
-#: admin/fai/faiPartition.tpl.c:8
-msgid "Type"
-msgstr "typ"
-
-#: admin/fai/class_faiPartitionTableEntry.inc:170
-msgid "FS type"
-msgstr "typ souborovÃ©ho systÃ©mu"
-
-#: admin/fai/class_faiPartitionTableEntry.inc:172
-msgid "Size in MB"
-msgstr "velikost v MB"
+#: admin/fai/class_faiTemplateEntry.inc:156
+msgid "Template attributes"
+msgstr "Atributy Å¡ablony"
 
-#: admin/fai/class_faiPartitionTableEntry.inc:174
-msgid "FS option"
-msgstr "volby souborovÃ©ho systÃ©mu"
+#: admin/fai/class_faiTemplateEntry.inc:160
+msgid "Template file content"
+msgstr "Obsah souboru se Å¡ablonou"
 
-#: admin/fai/class_faiPartitionTableEntry.inc:175
-#: admin/fai/faiPartition.tpl.c:23
-msgid "Preserve"
-msgstr "zachovat"
+#: admin/fai/class_faiTemplateEntry.inc:160
+msgid "Content of the template file"
+msgstr "Obsah souboru se Å¡ablonou"
 
-#: admin/fai/class_faiPartitionTableEntry.inc:266
-msgid "False"
-msgstr "ne"
+#: admin/fai/class_faiTemplateEntry.inc:164
+msgid "Owner and group of the file"
+msgstr "VlastnÃk a skupina souboru"
 
-#: admin/fai/class_faiPartitionTableEntry.inc:268
-msgid "True"
-msgstr "ano"
+#: admin/fai/class_faiTemplateEntry.inc:167
+msgid "Owner"
+msgstr "VlastnÃk"
 
-#: admin/fai/class_faiPartitionTableEntry.inc:272
-#: admin/fai/class_faiPartitionTableEntry.inc:274 admin/fai/fai-list.xml:159
-#: admin/fai/fai-list.xml:198
-msgid "Remove"
-msgstr "odebrat"
+#: admin/fai/class_faiTemplateEntry.inc:167
+msgid "File owner"
+msgstr "VlastnÃk souboru"
 
-#: admin/fai/class_faiPartitionTableEntry.inc:384
-#, php-format
-msgid "please enter a unique mount point for partition %s"
-msgstr "zadejte prosÃm jinÃ½ pÅ™ÃpojnÃ½ bod pro oddÃl %s â€“ tento je jiÅ¾ pouÅ¾ÃvÃ¡n"
+#: admin/fai/class_faiTemplateEntry.inc:172
+msgid "Group"
+msgstr "Skupina"
 
-#: admin/fai/class_faiPartitionTableEntry.inc:389
-#, php-format
-msgid "partition %s mount point"
-msgstr "pÅ™ÃpojnÃ½ bod oddÃlu %s"
+#: admin/fai/class_faiTemplateEntry.inc:172
+msgid "File group"
+msgstr "Skupina souboru"
 
-#: admin/fai/class_faiPartitionTableEntry.inc:394
-#, php-format
-msgid ""
-"File system type 'swap' is already used, change file system type for "
-"partition %s."
-msgstr "SouborovÃ½ systÃ©m typu â€žswapâ€œ zde uÅ¾ existuje â€“ zmÄ›Åˆte typ souborovÃ©ho systÃ©mu pro oddÃl %s."
-
-#: admin/fai/class_faiPartitionTableEntry.inc:398
-msgid "Please use 'swap' as mount point, if 'swap' is used as fs-type."
-msgstr "Pro souborovÃ© systÃ©my typu â€žswapâ€œ prosÃm pouÅ¾ijte jako pÅ™ÃpojnÃ½ bod tÃ©Å¾ â€žswapâ€œ."
-
-#: admin/fai/class_faiPartitionTableEntry.inc:404
-#: admin/fai/class_faiPartitionTableEntry.inc:408
-#: admin/fai/class_faiPartitionTableEntry.inc:414
-#: admin/fai/class_faiPartitionTableEntry.inc:416
-#: admin/fai/class_faiPartitionTableEntry.inc:421
-#, php-format
-msgid "partition %s size"
-msgstr "velikost oddÃlu %s"
+#: admin/fai/class_faiTemplateEntry.inc:181
+msgid "Access"
+msgstr "PÅ™Ãstup"
 
-#: admin/fai/class_faiPartitionTableEntry.inc:436
-msgid ""
-"You have more than 3 primary partition table entries in your configuration, "
-"please check your configuration twice."
-msgstr "Nastavil(a) jste vÃce neÅ¾ 3 hlavnÃ oddÃly â€“ prosÃm pÅ™ekontrolujte to."
+#: admin/fai/class_faiTemplateEntry.inc:181
+msgid "Access rights"
+msgstr "PÅ™ÃstupovÃ¡ prÃ¡va"
 
 #: admin/fai/packageSelect/selectPackage-list.xml:10
-#: admin/fai/classSelect/selectClass-list.xml:11
 msgid "Please select the desired entries"
-msgstr "vyberte prosÃm poÅ¾adovanÃ© poloÅ¾ky"
+msgstr "Vyberte poÅ¾adovanÃ© poloÅ¾ky"
 
 #: admin/fai/packageSelect/selectPackage-list.xml:48
 msgid "Version"
-msgstr "verze"
-
-#: admin/fai/class_faiProfile.inc:310
-msgid "This list displays all assigned class names for this profile."
-msgstr "Tento seznam zobrazuje nÃ¡zvy vÅ¡ech tÅ™Ãd, pÅ™iÅ™azenÃ½ch k tomuto profilu."
-
-#: admin/fai/class_faiProfile.inc:313 admin/fai/class_askClassName.inc:103
-#: admin/fai/classSelect/class_classSelect.inc:53
-#: admin/fai/class_faiProfileEntry.inc:158
-msgid "Hook bundle"
-msgstr ""
-
-#: admin/fai/class_faiProfile.inc:314 admin/fai/class_askClassName.inc:105
-#: admin/fai/classSelect/class_classSelect.inc:54
-#: admin/fai/class_faiProfileEntry.inc:159
-msgid "Template bundle"
-msgstr ""
+msgstr "Verze"
 
-#: admin/fai/class_faiProfile.inc:315 admin/fai/class_askClassName.inc:101
-#: admin/fai/classSelect/class_classSelect.inc:55
-#: admin/fai/class_faiProfileEntry.inc:160
-msgid "Script bundle"
-msgstr ""
-
-#: admin/fai/class_faiProfile.inc:316 admin/fai/class_askClassName.inc:102
-#: admin/fai/classSelect/class_classSelect.inc:56
-#: admin/fai/class_faiProfileEntry.inc:161
-msgid "Variable bundle"
-msgstr ""
-
-#: admin/fai/class_faiProfile.inc:317 admin/fai/class_askClassName.inc:100
-#: admin/fai/classSelect/class_classSelect.inc:57
-#: admin/fai/class_faiProfileEntry.inc:162
-msgid "Package bundle"
-msgstr ""
-
-#: admin/fai/class_faiProfile.inc:321
-msgid "Remove class from profile"
-msgstr "odeber druh z profilu"
-
-#: admin/fai/class_faiProfile.inc:324
-msgid "Up"
-msgstr "nahoru"
-
-#: admin/fai/class_faiProfile.inc:325
-msgid "Down"
-msgstr "dolÅ¯"
-
-#: admin/fai/class_faiProfile.inc:410
-msgid "No class specified for this profile!"
-msgstr "Pro tento profil nenÃ specifikovÃ¡n druh!"
-
-#: admin/fai/class_faiProfile.inc:419
-msgid "You can't use the same name for a class and a profile!"
-msgstr ""
+#: admin/fai/class_faiProfile.inc:28
+msgid "Profile"
+msgstr "profil"
 
-#: admin/fai/class_faiProfile.inc:455
+#: admin/fai/class_faiProfile.inc:29
 msgid "FAI profile"
 msgstr "profil FAI"
 
-#: admin/fai/class_faiProfile.inc:458
+#: admin/fai/class_faiProfile.inc:32
 msgid "FAI Profile"
-msgstr ""
+msgstr "Sada nastavenÃ FAI"
 
-#: admin/fai/class_faiProfile.inc:465 admin/fai/faiProfile.tpl.c:17
+#: admin/fai/class_faiProfile.inc:61
 msgid "FAI classes"
-msgstr "druhy FAI"
-
-#: admin/fai/class_faiHookEntry.inc:200
-msgid "Hook entry"
-msgstr "poloÅ¾ka hÃ¡Äku"
-
-#: admin/fai/class_faiHookEntry.inc:201
-msgid "FAI hook entry"
-msgstr "poloÅ¾ka hÃ¡Äku FAI"
+msgstr "TÅ™Ãdy FAI"
 
-#: admin/fai/class_faiHookEntry.inc:209 admin/fai/faiHookEntry.tpl.c:20
-msgid "Task"
-msgstr "Ãºkol"
-
-#: admin/fai/class_faiHookEntry.inc:210 admin/fai/class_faiScript.inc:595
-#: admin/fai/class_faiScript.inc:599
-msgid "FAI script"
-msgstr "skript FAI"
+#: admin/fai/class_faiProfile.inc:61
+msgid "FAI classes which are part of this profile"
+msgstr "FAI tÅ™Ãdy, kterÃ© jsou ÄÃ¡stmi tohoto profilu"
 
 #: admin/fai/class_faiPackageConfiguration.inc:88
 #, php-format
 msgid "Debconf information for package '%s'"
 msgstr "informace ohlednÄ› Debconfu pro balÃÄek '%s'"
 
-#: admin/fai/class_askClassName.inc:99 admin/fai/class_askClassName.inc:100
-#: admin/fai/class_askClassName.inc:101 admin/fai/class_askClassName.inc:102
-#: admin/fai/class_askClassName.inc:103 admin/fai/class_askClassName.inc:104
-#: admin/fai/class_askClassName.inc:105 admin/fai/class_askClassName.inc:106
-msgid "Create new FAI object"
-msgstr "vytvoÅ™it novÃ½ objekt FAI"
+#: admin/fai/class_faiScript.inc:30 admin/fai/class_faiScript.inc:84
+#: admin/fai/class_faiHook.inc:87
+msgid "Script"
+msgstr "Skript"
 
-#: admin/fai/class_faiTemplateEdit.inc:80
-#, php-format
-msgid ""
-"The file encodig has changed from '%s' to '%s'. Do you really want to save?"
-msgstr "ZnakovÃ¡ sada souboru byla zmÄ›nÄ›na z '%s' na '%s'. Opravdu chcete provÃ©st uloÅ¾enÃ?"
+#: admin/fai/class_faiScript.inc:31 admin/fai/class_faiScript.inc:34
+msgid "FAI script"
+msgstr "Skript FAI"
+
+#: admin/fai/class_faiScript.inc:63
+msgid "Scripts"
+msgstr "Skripty"
+
+#: admin/fai/class_faiScript.inc:67 admin/fai/class_faiHook.inc:67
+#: admin/fai/class_faiVariable.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:71
+#: admin/fai/class_faiVariable.inc:71
+msgid "The name of the variable"
+msgstr "NÃ¡zev promÄ›nnÃ©"
 
-#: admin/fai/class_faiScript.inc:333 admin/fai/class_faiScript.inc:335
-msgid "Sort direction"
-msgstr "smÄ›r setÅ™ÃdÄ›nÃ"
+#: admin/fai/class_faiScript.inc:75 admin/fai/class_faiHook.inc:75
+#: admin/fai/class_faiVariable.inc:75
+msgid "A short description of the variable"
+msgstr "StruÄnÃ½ popis promÄ›nnÃ©"
 
-#: admin/fai/class_faiScript.inc:348 admin/fai/faiScriptEntry.tpl.c:20
+#: admin/fai/class_faiScript.inc:79
 msgid "Priority"
-msgstr "priorita"
+msgstr "PoÅ™adÃ pÅ™ednosti"
 
-#: admin/fai/class_faiScript.inc:350
-msgid "Action"
-msgstr "akce"
+#: admin/fai/class_faiScript.inc:79
+msgid "Priority of this script (FIXME: less is done first?)"
+msgstr "PoÅ™adÃ pÅ™ednosti tohoto skriptu (DOPLNIT: nejniÅ¾Å¡Ã jsou dokonÄeny nejdÅ™Ãve?)"
 
-#: admin/fai/classSelect/selectClass-list.xml:36 admin/fai/fai-list.xml:88
-#: admin/fai/faiScriptEntry.tpl.c:14
-msgid "Properties"
-msgstr "vlastnosti"
+#: admin/fai/class_faiScript.inc:84
+msgid "The script itself"
+msgstr "Skript samotnÃ½"
+
+#: admin/fai/class_faiTemplate.inc:136
+#, php-format
+msgid "There are several files with the same path: %s"
+msgstr "Hned nÄ›kolik souborÅ¯ se vyskytuje v tomto umÃstÄ›nÃ: %s"
 
-#: admin/fai/class_faiTemplate.inc:501 admin/fai/fai-list.xml:116
+#: admin/fai/class_faiTemplate.inc:153
 msgid "Template"
-msgstr "Å¡ablona"
+msgstr "Å ablona"
 
-#: admin/fai/class_faiTemplate.inc:502 admin/fai/class_faiTemplate.inc:506
+#: admin/fai/class_faiTemplate.inc:154 admin/fai/class_faiTemplate.inc:157
 msgid "FAI template"
-msgstr "Å¡ablona pro FAI"
-
-#: admin/fai/class_faiVariableEntry.inc:107
-msgid "Content"
-msgstr "obsah"
+msgstr "Å ablona pro FAI"
 
-#: admin/fai/class_faiVariableEntry.inc:142
-msgid "Variable entry"
-msgstr "poloÅ¾ka promÄ›nnÃ©"
+#: admin/fai/class_faiTemplate.inc:176
+msgid "Template class name"
+msgstr "NÃ¡zev tÅ™Ãdy Å¡ablon"
 
-#: admin/fai/class_faiVariableEntry.inc:143
-msgid "FAI variable entry "
-msgstr "poloÅ¾ka promÄ›nnÃ© pro FAI"
+#: admin/fai/class_faiTemplate.inc:186
+msgid "Template files"
+msgstr "Soubory se Å¡ablonami"
 
-#: admin/fai/class_faiVariableEntry.inc:151
-#: admin/fai/faiVariableEntry.tpl.c:20
-msgid "Variable content"
-msgstr "obsah promÄ›nnÃ©"
+#: admin/fai/class_faiTemplate.inc:190
+msgid "Template files in this class"
+msgstr "Soubory Å¡ablon v tÃ©to tÅ™ÃdÄ›"
 
 #: admin/fai/class_faiPartition.inc:176 admin/fai/class_faiPartition.inc:180
 msgid "Logical"
-msgstr "logickÃ½"
+msgstr "LogickÃ©"
 
 #: admin/fai/class_faiPartition.inc:179
 msgid "Primary"
-msgstr "hlavnÃ"
+msgstr "HlavnÃ"
 
 #: admin/fai/class_faiPartition.inc:185
 msgid "RAID 0"
@@ -871,15 +467,15 @@ msgstr "RAID 0"
 
 #: admin/fai/class_faiPartition.inc:186
 msgid "RAID 1"
-msgstr "RAID 1"
+msgstr ""
 
 #: admin/fai/class_faiPartition.inc:187
 msgid "RAID 5"
-msgstr "RAID 5"
+msgstr ""
 
 #: admin/fai/class_faiPartition.inc:188
 msgid "RAID 6"
-msgstr "RAID 6"
+msgstr ""
 
 #: admin/fai/class_faiPartition.inc:195
 msgid "fixed"
@@ -887,35 +483,35 @@ msgstr "napevno"
 
 #: admin/fai/class_faiPartition.inc:196
 msgid "dynamic"
-msgstr "mÄ›nitelnÃ½"
+msgstr "pohyblivÃ©"
 
 #: admin/fai/class_faiPartition.inc:197
 msgid "remaining space"
-msgstr "zbÃ½vajÃcÃ datovÃ¡ kapacita"
+msgstr "zbÃ½vajÃcÃ volnÃ¡ datovÃ¡ kapacita"
 
 #: admin/fai/class_faiPartition.inc:202
 msgid "KB"
-msgstr "KB"
+msgstr ""
 
 #: admin/fai/class_faiPartition.inc:203
 msgid "MB"
-msgstr "MB"
+msgstr ""
 
 #: admin/fai/class_faiPartition.inc:204
 msgid "GB"
-msgstr "GB"
+msgstr ""
 
 #: admin/fai/class_faiPartition.inc:205
 msgid "TB"
-msgstr "TB"
+msgstr ""
 
 #: admin/fai/class_faiPartition.inc:206
 msgid "PB"
-msgstr "PB"
+msgstr ""
 
 #: admin/fai/class_faiPartition.inc:207
 msgid "%"
-msgstr "%"
+msgstr ""
 
 #: admin/fai/class_faiPartition.inc:212
 msgid "always"
@@ -931,15 +527,15 @@ msgstr "prostor pro odloÅ¾enÃ pamÄ›Å¥ovÃ½ch strÃ¡nek (swap)"
 
 #: admin/fai/class_faiPartition.inc:218
 msgid "ext2"
-msgstr "ext2"
+msgstr ""
 
 #: admin/fai/class_faiPartition.inc:219
 msgid "ext3"
-msgstr "ext3"
+msgstr ""
 
 #: admin/fai/class_faiPartition.inc:220
 msgid "ext4"
-msgstr "ext4"
+msgstr ""
 
 #: admin/fai/class_faiPartition.inc:221
 msgid "reiser fs"
@@ -953,95 +549,74 @@ msgstr "xfs"
 msgid "btrfs"
 msgstr "btrfs"
 
-#: admin/fai/class_faiPartition.inc:224
-msgid "LVM/RAID"
-msgstr ""
-
-#: admin/fai/class_faiPartition.inc:327
+#: admin/fai/class_faiPartition.inc:325
 msgid "spare"
 msgstr "nÃ¡hradnÃ"
 
-#: admin/fai/class_faiPartition.inc:330
+#: admin/fai/class_faiPartition.inc:328
 msgid "missing"
 msgstr "chybÄ›jÃcÃ"
 
-#: admin/fai/class_faiPartition.inc:333
+#: admin/fai/class_faiPartition.inc:331
 msgid "Options"
-msgstr "volby"
+msgstr "MoÅ¾nosti"
 
-#: admin/fai/class_faiPartition.inc:420
+#: admin/fai/class_faiPartition.inc:415
 msgid "Minimum partition size"
-msgstr "nejmenÅ¡Ã velikost oddÃlu"
+msgstr "NejmenÅ¡Ã moÅ¾nÃ¡ velikost oddÃlu"
 
-#: admin/fai/class_faiPartition.inc:420
+#: admin/fai/class_faiPartition.inc:415
 msgid "Maximum partition size"
 msgstr "nejvÄ›tÅ¡Ã velikost oddÃlu"
 
-#: admin/fai/class_faiPartition.inc:428
+#: admin/fai/class_faiPartition.inc:423
 msgid "Raid arrays must contain at least two partitions!"
-msgstr "Pole RAID nelze vytvoÅ™it z mÃ©nÄ› neÅ¾ dvou oddÃlÅ¯!"
+msgstr "Pole RAID nemÅ¯Å¾e bÃ½t tvoÅ™eno mÃ©nÄ› neÅ¾ dvÄ›ma oddÃly!"
 
-#: admin/fai/class_faiPartition.inc:430
+#: admin/fai/class_faiPartition.inc:425
 msgid ""
 "Raid 0 arrays can only be realized with a combination of two partitions!"
-msgstr "Pole RAID 0 mÅ¯Å¾e obsahovat pouze a jedinÄ› dva oddÃly!"
+msgstr "Pole RAID 0 mÅ¯Å¾e tvoÅ™eno jedinÄ› a pouze dvÄ›ma oddÃly!"
 
-#: admin/fai/class_faiHook.inc:332 admin/fai/class_faiHook.inc:334
-#: admin/fai/fai-list.xml:190 admin/fai/faiVariable.tpl.c:23
-#: admin/fai/faiVariable.tpl.c:26
-msgid "Edit"
-msgstr "upravit"
-
-#: admin/fai/class_faiHook.inc:336
-msgid "Delete"
-msgstr "smazat"
-
-#: admin/fai/class_faiHook.inc:521 admin/fai/fai-list.xml:128
+#: admin/fai/class_faiHook.inc:30
 msgid "Hook"
 msgstr "hÃ¡Äek"
 
-#: admin/fai/class_faiHook.inc:522 admin/fai/class_faiHook.inc:526
+#: admin/fai/class_faiHook.inc:31 admin/fai/class_faiHook.inc:34
 msgid "FAI hook"
 msgstr "hÃ¡Äek FAI"
 
-#: admin/fai/class_faiVariable.inc:387 admin/fai/fai-list.xml:134
-msgid "Variable"
-msgstr "promÄ›nnÃ¡"
-
-#: admin/fai/class_faiVariable.inc:388 admin/fai/class_faiVariable.inc:392
-msgid "FAI variable"
-msgstr "promÄ›nnÃ¡ pro FAI"
+#: admin/fai/class_faiHook.inc:63
+msgid "Hooks"
+msgstr "hÃ¡Äky"
 
-#: admin/fai/class_faiProfileEntry.inc:184 admin/fai/askClassName.tpl.c:11
-#: admin/fai/askClassName.tpl.c:17 admin/fai/paste_generic.tpl.c:5
-msgid "Class name"
-msgstr "nÃ¡zev tÅ™Ãdy"
+#: admin/fai/class_faiHook.inc:79
+msgid "Task"
+msgstr "Ãškol"
 
-#: admin/fai/class_faiProfileEntry.inc:184 admin/fai/faiTemplate.tpl.c:14
-#: admin/fai/faiVariable.tpl.c:14 admin/fai/faiHook.tpl.c:14
-#: admin/fai/faiPartitionTable.tpl.c:17 admin/fai/faiScript.tpl.c:14
-msgid "Objects"
-msgstr "objekty"
+#: admin/fai/class_faiHook.inc:87
+msgid "The script of this hook"
+msgstr "Skript tohoto hÃ¡Äku"
 
-#: admin/fai/fai-list.xml:11
-msgid "List of deployment classes and products"
-msgstr "seznam tÅ™Ãd nasazenÃ a produktÅ¯"
+#: admin/fai/class_faiVariable.inc:30
+msgid "Variable"
+msgstr "PromÄ›nnÃ¡"
 
-#: admin/fai/fai-list.xml:15
-msgid "partitionTable"
-msgstr ""
+#: admin/fai/class_faiVariable.inc:31 admin/fai/class_faiVariable.inc:34
+msgid "FAI variable"
+msgstr "PromÄ›nnÃ¡ pro FAI"
 
-#: admin/fai/fai-list.xml:23
-msgid "packagelist"
-msgstr ""
+#: admin/fai/class_faiVariable.inc:63
+msgid "Variables"
+msgstr "PromÄ›nnÃ©"
 
-#: admin/fai/fai-list.xml:93
-msgid "Actions"
-msgstr "akce"
+#: admin/fai/class_faiVariable.inc:79
+msgid "Content"
+msgstr "Obsah"
 
-#: admin/fai/fai-list.xml:104
-msgid "Create"
-msgstr "vytvoÅ™it"
+#: admin/fai/class_faiVariable.inc:79
+msgid "The content of the variable"
+msgstr "Obsah promÄ›nnÃ©"
 
 #: admin/systems/class_faiLogView.inc:56
 msgid "Sort down"
@@ -1051,30 +626,34 @@ msgstr "SeÅ™adit sestupnÄ›"
 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"
+msgstr "Datum"
 
 #: admin/systems/class_faiLogView.inc:150
 #: admin/systems/class_faiLogView.inc:153
 msgid "Available logs"
-msgstr "ProvoznÃ zÃ¡znamy k dispozici"
+msgstr "Protokoly k dispozici"
 
 #: admin/systems/class_faiLogView.inc:158
 msgid "Selected log"
-msgstr ""
+msgstr "VybranÃ½ protokol"
 
 #: admin/systems/class_faiLogView.inc:162
 msgid "Content of the selected log"
-msgstr "Obsah zvolenÃ©ho provoznÃho zÃ¡znamu"
+msgstr "Obsah zvolenÃ©ho protokolu"
 
 #: admin/systems/class_faiLogView.inc:174
 msgid "FAI Logs"
-msgstr "ProvoznÃ zÃ¡znamy FAI"
+msgstr "Protokoly FAI"
 
 #: admin/systems/class_faiLogView.inc:175
 msgid "FAI Logs Viewer"
-msgstr "ProhlÃÅ¾eÄ provoznÃch zÃ¡znamÅ¯ FAI"
+msgstr "ProhlÃÅ¾eÄ protokolu FAI"
 
 #: admin/systems/class_faiLogView.inc:222
 msgid "Selected file"
@@ -1085,7 +664,7 @@ msgstr "ZvolenÃ½ soubor"
 msgid "Selected file: %s"
 msgstr "ZvolenÃ½ soubor: %s"
 
-#: admin/systems/class_faiStartup.inc:70 admin/fai/paste_generic.tpl.c:2
+#: admin/systems/class_faiStartup.inc:70
 msgid "FAI settings"
 msgstr "nastavenÃ FAI"
 
@@ -1099,17 +678,12 @@ msgstr "FAI vydÃ¡nÃ systÃ©mu Debian, kterÃ© mÃ¡ bÃ½t nainstalovÃ¡no na tento po
 
 #: admin/systems/class_faiStartup.inc:82
 msgid "Profil"
-msgstr ""
+msgstr "Sada nastavenÃ"
 
 #: admin/systems/class_faiStartup.inc:82
 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:90 admin/fai/faiPackage.tpl.c:14
-#: admin/fai/faiPackage.tpl.c:17
-msgid "Repository"
-msgstr "repozitÃ¡Å™"
-
 #: admin/systems/class_faiStartup.inc:90
 msgid "FAI Debian repository to be used for installation"
 msgstr "FAI repozitÃ¡Å™ systÃ©mu Debian, kterÃ½ mÃ¡ bÃ½t pouÅ¾it pro instalaci"
@@ -1120,7 +694,7 @@ msgstr "Parametry zavÃ¡dÄ›nÃ systÃ©mu"
 
 #: admin/systems/class_faiStartup.inc:99
 msgid "Boot kernel"
-msgstr "zavÃ¡dÄ›nÃ© jÃ¡dro"
+msgstr "ZavÃ¡dÄ›nÃ© jÃ¡dro"
 
 #: admin/systems/class_faiStartup.inc:99
 msgid "Linux kernel to be installed and booted"
@@ -1132,88 +706,99 @@ msgstr "Parametry zavÃ¡dÄ›nÃ jÃ¡dra"
 
 #: admin/systems/class_faiStartup.inc:103
 msgid "Linux kernel parameters to be ran"
-msgstr ""
+msgstr "Parametry jÃ¡dra Linux, se kterÃ½mi mÃ¡ bÃ½t zavedeno"
 
-#: admin/systems/class_faiStartup.inc:178
+#: admin/systems/class_faiStartup.inc:179
 msgid "Full automated installation"
-msgstr "PlnÄ› samoÄinnÃ¡ instalace"
+msgstr "PlnÄ› samoÄinnÃ¡ instalace (FAI)"
 
-#: admin/systems/services/repository/class_serviceRepository.inc:31
+#: admin/systems/services/repository/class_serviceDebianRepository.inc:34
+#: admin/systems/services/repository/class_serviceCentosRepository.inc:31
+msgid "Repositories"
+msgstr "RepozitÃ¡Å™e"
+
+#: admin/systems/services/repository/class_serviceDebianRepository.inc:39
+#: admin/systems/services/repository/class_serviceCentosRepository.inc:36
+msgid "Repositories this server hosts"
+msgstr "RepozitÃ¡Å™e, kterÃ© se nachÃ¡zejÃ na tomto serveru"
+
+#: admin/systems/services/repository/class_serviceDebianRepository.inc:43
+#: admin/systems/services/repository/class_serviceCentosRepository.inc:40
 msgid "URL"
 msgstr "URL"
 
-#: admin/systems/services/repository/class_serviceRepository.inc:31
+#: admin/systems/services/repository/class_serviceDebianRepository.inc:43
+#: admin/systems/services/repository/class_serviceCentosRepository.inc:40
 msgid "Repository url"
-msgstr "Adresa repozitÃ¡Å™e"
+msgstr "URL adresa repozitÃ¡Å™e"
 
-#: admin/systems/services/repository/class_serviceRepository.inc:35
+#: admin/systems/services/repository/class_serviceDebianRepository.inc:47
+#: admin/systems/services/repository/class_serviceCentosRepository.inc:44
 msgid "Parent server"
-msgstr "nadÅ™azenÃ½ server"
+msgstr "NadÅ™azenÃ½ server"
 
-#: admin/systems/services/repository/class_serviceRepository.inc:35
+#: admin/systems/services/repository/class_serviceDebianRepository.inc:47
+#: admin/systems/services/repository/class_serviceCentosRepository.inc:44
 msgid "Parent repository server"
-msgstr ""
+msgstr "Server nadÅ™azenÃ©ho repozitÃ¡Å™e"
 
-#: 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"
-msgstr "oddÃly"
+#: admin/systems/services/repository/class_serviceDebianRepository.inc:52
+msgid "Debian release used on this repository"
+msgstr "VydÃ¡nÃ systÃ©mu Debian, pouÅ¾itÃ© v tomto repozitÃ¡Å™i"
 
-#: admin/systems/services/repository/class_serviceRepository.inc:47
-msgid "Sections available on this repository"
-msgstr ""
+#: admin/systems/services/repository/class_serviceDebianRepository.inc:58
+msgid "Debian sections available on this repository"
+msgstr "Sekce distribuce Debian, dostupnÃ© z tohoto repozitÃ¡Å™e"
 
-#: admin/systems/services/repository/class_serviceRepository.inc:52
+#: admin/systems/services/repository/class_serviceDebianRepository.inc:63
+#: admin/systems/services/repository/class_serviceCentosRepository.inc:57
 msgid "Mirror mode"
 msgstr "ReÅ¾im zrcadla"
 
-#: admin/systems/services/repository/class_serviceRepository.inc:52
+#: admin/systems/services/repository/class_serviceDebianRepository.inc:63
+#: admin/systems/services/repository/class_serviceCentosRepository.inc:57
 msgid ""
 "Is this mirror an installation repository? Is its release a custom one?"
-msgstr ""
+msgstr "Je toto zrcadlo instalaÄnÃm repozitÃ¡Å™em? Je zdejÅ¡Ã vydÃ¡nÃ upravenÃ©?"
 
-#: admin/systems/services/repository/class_serviceRepository.inc:57
+#: admin/systems/services/repository/class_serviceDebianRepository.inc:68
+#: admin/systems/services/repository/class_serviceCentosRepository.inc:62
 msgid "Local mirror"
 msgstr "MÃstnÃ zrcadlo"
 
-#: admin/systems/services/repository/class_serviceRepository.inc:57
+#: admin/systems/services/repository/class_serviceDebianRepository.inc:68
+#: admin/systems/services/repository/class_serviceCentosRepository.inc:62
 msgid "Is this mirror a local or a network mirror?"
-msgstr "Je toto zrcadlo mÃstnÃ Äi sÃÅ¥ovÃ©"
+msgstr "Je toto zrcadlo mÃstnÃ Äi sÃÅ¥ovÃ©?"
 
-#: admin/systems/services/repository/class_serviceRepository.inc:66
+#: admin/systems/services/repository/class_serviceDebianRepository.inc:77
+#: admin/systems/services/repository/class_serviceCentosRepository.inc:71
 msgid "Architectures"
 msgstr "Architektury"
 
-#: admin/systems/services/repository/class_serviceRepository.inc:66
+#: admin/systems/services/repository/class_serviceDebianRepository.inc:77
+#: admin/systems/services/repository/class_serviceCentosRepository.inc:71
 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 ""
+#: admin/systems/services/repository/class_serviceDebianRepository.inc:99
+#: admin/systems/services/repository/class_serviceDebianRepository.inc:100
+msgid "Debian repository"
+msgstr "RepozitÃ¡Å™ distribuce Debian"
 
-#: admin/systems/services/repository/class_serviceRepository.inc:72
-msgid "Which distribution is this repository for"
-msgstr ""
+#: admin/systems/services/repository/class_serviceDebianRepository.inc:100
+#: admin/systems/services/repository/class_serviceCentosRepository.inc:96
+msgid "Services"
+msgstr "SluÅ¾by"
 
-#: admin/systems/services/repository/class_serviceRepository.inc:140
-msgid "Repositories"
-msgstr "RepozitÃ¡Å™e"
+#: admin/systems/services/repository/class_serviceCentosRepository.inc:49
+msgid "Centos release used on this repository"
+msgstr "VydÃ¡nÃ distribuce CentOS, pouÅ¾ÃvanÃ© tÃmto repozitÃ¡Å™em"
 
-#: admin/systems/services/repository/class_serviceRepository.inc:145
-msgid "Repositories this server hosts"
-msgstr "RepozitÃ¡Å™e, kterÃ© se nachÃ¡zejÃ na tomto serveru"
-
-#: 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_serviceCentosRepository.inc:95
+#: admin/systems/services/repository/class_serviceCentosRepository.inc:96
+msgid "Centos repository"
+msgstr "RepozitÃ¡Å™ distribuce CentOS"
 
 #: config/fai/class_faiConfig.inc:28
 msgid "FAI configuration"
@@ -1225,495 +810,22 @@ msgstr "NastavenÃ zÃ¡suvnÃ©ho modulu fai pro FusionDirectory"
 
 #: config/fai/class_faiConfig.inc:44
 msgid "Fai base RDN"
-msgstr ""
+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 ""
+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 ""
+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 ""
+msgstr "RelativnÃ vÄ›tev ve kterÃ© bude uloÅ¾ena fai %s"
 
 #: config/fai/class_faiConfig.inc:60
 msgid "s"
 msgstr ""
-
-#: admin/fai/faiPartitionTableEntry.tpl.c:2 admin/fai/faiVariableEntry.tpl.c:2
-#: admin/fai/faiVariableEntry.tpl.c:5 admin/fai/faiDiskEntry.tpl.c:2
-#: admin/fai/faiTemplate.tpl.c:2 admin/fai/faiTemplate.tpl.c:5
-#: admin/fai/faiVariable.tpl.c:2 admin/fai/faiVariable.tpl.c:5
-#: admin/fai/faiHook.tpl.c:2 admin/fai/faiHook.tpl.c:5
-#: admin/fai/faiPackage.tpl.c:2 admin/fai/faiPackage.tpl.c:5
-#: admin/fai/faiTemplateEntry.tpl.c:2 admin/fai/faiTemplateEntry.tpl.c:5
-#: admin/fai/faiScriptEntry.tpl.c:2 admin/fai/faiScriptEntry.tpl.c:5
-#: admin/fai/faiPartitionTable.tpl.c:2 admin/fai/faiPartitionTable.tpl.c:5
-#: admin/fai/faiScript.tpl.c:2 admin/fai/faiScript.tpl.c:5
-#: admin/fai/faiProfile.tpl.c:2 admin/fai/faiProfile.tpl.c:5
-#: admin/fai/faiProfile.tpl.c:14 admin/fai/faiHookEntry.tpl.c:2
-#: admin/fai/faiHookEntry.tpl.c:5
-msgid "Generic"
-msgstr "obecnÃ©"
-
-#: admin/fai/faiPartitionTableEntry.tpl.c:14
-#: admin/fai/faiPartitionTableEntry.tpl.c:17 admin/fai/faiDiskEntry.tpl.c:23
-#: admin/fai/faiDiskEntry.tpl.c:26
-msgid "Partition entries"
-msgstr "poloÅ¾ky oddÃlÅ¯"
-
-#: admin/fai/faiPartitionTableEntry.tpl.c:20
-#: admin/fai/faiPartitionTableEntry.tpl.c:23 admin/fai/faiDiskEntry.tpl.c:29
-#: admin/fai/faiDiskEntry.tpl.c:32
-msgid "Add partition"
-msgstr "pÅ™idat oddÃl"
-
-#: admin/fai/branch_selector.tpl.c:2
-msgid "Releases"
-msgstr "vydÃ¡nÃ"
-
-#: admin/fai/branch_selector.tpl.c:5
-msgid "Current release"
-msgstr "souÄasnÃ© vydÃ¡nÃ"
-
-#: admin/fai/branch_selector.tpl.c:8 admin/fai/branch_selector.tpl.c:17
-#: admin/fai/fai-filter.tpl.c:8 admin/fai/fai-filter.tpl.c:17
-msgid "Create release"
-msgstr "vytvoÅ™it vydÃ¡nÃ"
-
-#: admin/fai/branch_selector.tpl.c:11 admin/fai/branch_selector.tpl.c:23
-#: admin/fai/fai-filter.tpl.c:11 admin/fai/fai-filter.tpl.c:23
-msgid "Create read-only release"
-msgstr "vytvoÅ™it vydÃ¡nÃ pouze pro ÄtenÃ"
-
-#: admin/fai/branch_selector.tpl.c:20 admin/fai/fai-filter.tpl.c:20
-msgid "Freeze"
-msgstr "zmrazit"
-
-#: admin/fai/branch_selector.tpl.c:26 admin/fai/fai-filter.tpl.c:26
-msgid "Delete current release"
-msgstr "smazat souÄasnÃ© vydÃ¡nÃ"
-
-#: admin/fai/faiPartition.tpl.c:2
-msgid "Partition"
-msgstr "oddÃl"
-
-#: admin/fai/faiPartition.tpl.c:17
-msgid "Resize existing partition"
-msgstr "zmÄ›nit velikost stÃ¡vajÃcÃho oddÃlu"
-
-#: admin/fai/faiPartition.tpl.c:20
-msgid "Bootable"
-msgstr "zaveditelnÃ½ (bootovatelnÃ½)"
-
-#: admin/fai/faiPartition.tpl.c:26 admin/fai/faiDiskEntry.tpl.c:20
-msgid "Combined physical partitions"
-msgstr "kombinovanÃ© fyzickÃ© oddÃly"
-
-#: admin/fai/faiPartition.tpl.c:29
-msgid "Toggle missing"
-msgstr "pÅ™epnout chybÄ›jÃcÃ"
-
-#: admin/fai/faiPartition.tpl.c:32
-msgid "Toggle spare"
-msgstr "pÅ™epnout nÃ¡hradnÃ"
-
-#: admin/fai/faiPartition.tpl.c:35
-msgid "Filesystem"
-msgstr "souborovÃ½ systÃ©m"
-
-#: admin/fai/faiPartition.tpl.c:38
-msgid "Filesystem create options"
-msgstr "volby vytvÃ¡Å™enÃ souborovÃ©ho systÃ©mu"
-
-#: admin/fai/faiPartition.tpl.c:41
-msgid "Encrypted"
-msgstr "Å¡ifrovanÃ©"
-
-#: admin/fai/faiPartition.tpl.c:44
-msgid "Tune options"
-msgstr "vyladÄ›nÃ voleb"
-
-#: admin/fai/faiNewBranch.tpl.c:2
-msgid ""
-"You are now going to create a branch or locked branch. This action clones "
-"the existing release to another release name. Branches can be modified as "
-"usual. FAI classes of locked branches cannot be modified, just additional "
-"classes are possible. Branch names should be alphanumeric, excluding the "
-"reserved names 'scripts', 'hooks', 'partitions', 'variables', 'templates' "
-"and 'fai'."
-msgstr "ChystÃ¡te se vytvoÅ™it vÄ›tev Äi uzamÄenou vÄ›tev. Tato akce naklonuje jiÅ¾ existujÃcÃ vydÃ¡nÃ do jinÃ©ho, jinak pojmenovanÃ©ho. VÄ›tve pak mohou bÃ½t upravovÃ¡ny jako obvykle. TÅ™Ãdy FAI uzamÄenÃ½ch vÄ›tvÃ se nedajÃ upravovat, je moÅ¾nÃ© jen pÅ™idÃ¡vat dalÅ¡Ã. NÃ¡zvy vÄ›tvÃ by mÄ›ly bÃ½t tvoÅ™eny pÃsmeny a ÄÃsly, vyjma rezervovanÃ½ch nÃ¡zvÅ¯ 'scripts', 'hooks', 'partitions', 'variables', 'templates' a 'fai'."
-
-#: admin/fai/faiNewBranch.tpl.c:5
-msgid ""
-"Branches are created as subreleases of the currently selected branch. "
-"Creating a new branch named 1.0.2 in SARGE for example, will result in a new"
-" release called SARGE/1.0.2."
-msgstr ""
-
-#: admin/fai/faiNewBranch.tpl.c:8
-msgid "Please enter a name for the branch"
-msgstr "Zadejte nÃ¡zev vÄ›tve"
-
-#: admin/fai/faiNewBranch.tpl.c:11
-msgid "Processing the requested operation"
-msgstr "zpracovÃ¡vÃ¡m poÅ¾adovanou operaci"
-
-#: admin/fai/faiNewBranch.tpl.c:14
-msgid ""
-"As soon as the copy operation has finished, you can scroll down to end of "
-"the page and press the 'Continue' button to continue with the fai management"
-" dialog."
-msgstr "Jakmile bude kopÃrovÃ¡nÃ dokonÄeno, mÅ¯Å¾ete se pÅ™esunout na spodnÃ ÄÃ¡st strÃ¡nky a kliknout na â€žpokraÄovatâ€œ a pokraÄovat tak dialogem sprÃ¡vy FAI."
-
-#: admin/fai/faiNewBranch.tpl.c:17
-msgid ""
-"Your browser doesn't support iframes, please use this link to perform the "
-"requested operation."
-msgstr "VÃ¡Å¡ webovÃ½ prohlÃÅ¾eÄ nepodporuje prvek iframes â€“ pro provedenÃ poÅ¾adovanÃ© operace kliknÄ›te na tento odkaz."
-
-#: admin/fai/faiNewBranch.tpl.c:20
-msgid "Perform requested operation."
-msgstr "provÃ©st poÅ¾adovanou operaci"
-
-#: admin/fai/faiNewBranch.tpl.c:23
-msgid "Initiate operation"
-msgstr "spustit operaci"
-
-#: admin/fai/faiVariableEntry.tpl.c:14 admin/fai/faiVariableEntry.tpl.c:17
-msgid "Variable attributes"
-msgstr "atributy promÄ›nnÃ©"
-
-#: admin/fai/faiDiskEntry.tpl.c:11
-msgid "fstab key"
-msgstr "poloÅ¾ka v fstab"
-
-#: admin/fai/faiDiskEntry.tpl.c:17
-msgid "Disk label"
-msgstr "identifikÃ¡tor ÃºloÅ¾iÅ¡tÄ›"
-
-#: admin/fai/faiTemplate.tpl.c:17
-msgid "List of template files"
-msgstr "seznam souborÅ¯ Å¡ablon"
-
-#: admin/fai/faiVariable.tpl.c:17
-msgid "List of assigned variables"
-msgstr "seznam pÅ™iÅ™azenÃ½ch promÄ›nnÃ½ch"
-
-#: admin/fai/faiVariable.tpl.c:20
-msgid "Choose a variable to delete or edit"
-msgstr "zvolte promÄ›nnou, kterou chcete vymazat nebo upravit"
-
-#: admin/fai/askClassName.tpl.c:2
-msgid ""
-"Adding a new class to the FAI management, requires a class name. You have to"
-" specify a unique class name for unique types of FAI classes, while you can "
-"use the same class name for different types of FAI classes. In the laste "
-"case, FAI will automatically enclose all these different class types to one "
-"unique class name."
-msgstr " "
-
-#: admin/fai/askClassName.tpl.c:5
-msgid ""
-"Please use one of the following methods to choose the name for the new FAI "
-"class."
-msgstr "PouÅ¾ijte jeden z nÃ¡sledujÃcÃch zpÅ¯sobÅ¯ tvorby jmÃ©na novÃ© tÅ™Ãdy FAI."
-
-#: admin/fai/askClassName.tpl.c:8
-msgid "Enter FAI class name manually"
-msgstr "zadat nÃ¡zev tÅ™Ãdy FAI ruÄnÄ› "
-
-#: admin/fai/askClassName.tpl.c:14
-msgid "Choose FAI class name from a list of existing classes"
-msgstr "zvolit nÃ¡zev tÅ™Ãdy FAI ze seznamu jiÅ¾ existujÃcÃch"
-
-#: admin/fai/askClassName.tpl.c:20
-msgid "Choose class name"
-msgstr "zvolte nÃ¡zev tÅ™Ãdy"
-
-#: admin/fai/faiGroupHandle.tpl.c:2
-msgid "Please select the objects you want to remove:"
-msgstr "vyberte prosÃm objekty, kterÃ© chcete odebrat:"
-
-#: admin/fai/faiGroupHandle.tpl.c:5
-msgid "Freezed"
-msgstr "â€žzmrazenoâ€œ"
-
-#: admin/fai/faiGroupHandle.tpl.c:8
-msgid "Select the object you want to edit:"
-msgstr "Vyberte objekt, kterÃ½ chcete upravit:"
-
-#: admin/fai/faiGroupHandle.tpl.c:11
-msgid "Select the object you want to copy:"
-msgstr "Vyberte objekt, kterÃ½ chcete zkopÃrovat:"
-
-#: admin/fai/remove.tpl.c:5
-msgid ""
-"This includes all account data, system access rules, imap settings, etc. for"
-" this user. Please double check if your really want to do this since there "
-"is no way for FusionDirectory to get your data back."
-msgstr "TÃ½kÃ¡ se veÅ¡kerÃ½ch informacÃ o tÃ©to poloÅ¾ce v adresÃ¡Å™i. ProsÃm velmi dobÅ™e si rozmyslete, zda to opravdu chcete udÄ›lat, protoÅ¾e provedenÃ© zmÄ›ny uÅ¾ ve FusionDirectory nepÅ¯jde vzÃt nijak jednoduÅ¡e zpÄ›t (nanejvÃ½Å¡ sloÅ¾itÄ› ze zÃ¡loh, pokud existujÃ a obsahujÃ potÅ™ebnÃ¡ data)!"
-
-#: admin/fai/remove.tpl.c:8 admin/fai/remove_branch.tpl.c:8
-msgid "So - if you're sure - press 'Delete' to continue or 'Cancel' to abort."
-msgstr "Tedy â€“ pokud jste si jist(a), stisknÄ›te 'smazat'. V opaÄnÃ©m pÅ™ÃpadÄ› operaci zruÅ¡te pomocÃ 'zruÅ¡it'."
-
-#: admin/fai/faiHook.tpl.c:17
-msgid "List of hook scripts"
-msgstr "seznam zahÃ¡ÄkovanÃ½ch skriptÅ¯"
-
-#: admin/fai/packageSelect/selectPackage-list.tpl.c:2
-#: admin/fai/classSelect/selectClass-list.tpl.c:5
-msgid "Update"
-msgstr "aktualizovat"
-
-#: admin/fai/packageSelect/selectPackage-list.tpl.c:5
-#: admin/fai/classSelect/selectClass-list.tpl.c:8
-msgid "Submit"
-msgstr "potvrdit"
-
-#: admin/fai/packageSelect/selectPackage-filter.tpl.c:2
-#: admin/fai/classSelect/selectClass-filter.tpl.c:2
-#: admin/fai/fai-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 "Nebude zobrazeno vÃce neÅ¾ 200 poloÅ¾ek."
-
-#: admin/fai/remove_branch.tpl.c:5
-msgid ""
-"This includes all account data, system access, etc. for this branch. 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 veÅ¡kerÃ½ch dat ÃºÄtu, pÅ™Ãstupu do systÃ©mu a dalÅ¡Ãho pro celou tuto vÄ›tev. ProsÃm velmi dobÅ™e si rozmyslete, zda to opravdu chcete udÄ›lat, protoÅ¾e provedenÃ© zmÄ›ny uÅ¾ ve FusionDirectory nepÅ¯jde vzÃt nijak jednoduÅ¡e zpÄ›t (nanejvÃ½Å¡ sloÅ¾itÄ› ze zÃ¡loh, pokud existujÃ a obsahujÃ potÅ™ebnÃ¡ data)!"
-
-#: admin/fai/faiPackage.tpl.c:26
-msgid "Install method"
-msgstr "zpÅ¯sob instalace"
-
-#: admin/fai/faiPackage.tpl.c:29
-msgid "Please select the installation method"
-msgstr "zvolte prosÃm zpÅ¯sob instalace"
-
-#: admin/fai/faiPackage.tpl.c:32 admin/fai/faiPackage.tpl.c:35
-msgid "Used packages"
-msgstr "balÃÄky, kterÃ© byly pouÅ¾ity"
-
-#: admin/fai/faiPackage.tpl.c:38
-msgid "Add from list"
-msgstr "pÅ™idej ze seznamu"
-
-#: admin/fai/faiProfileEntry.tpl.c:2
-msgid "List of FAI objects (Fully Automatic Installation)"
-msgstr "seznam ogjektÅ¯ FAI (Fully Automatic Installation â€“ zcela automatickÃ© instalace)"
-
-#: admin/fai/faiProfileEntry.tpl.c:5
-msgid "Information"
-msgstr "informace"
-
-#: admin/fai/faiProfileEntry.tpl.c:8
-msgid ""
-"This menu allows you to select FAI class names and to add them to the "
-"currently edited profile."
-msgstr "Tato nabÃdka VÃ¡m umoÅ¾nÃ vybrat nÃ¡zvy tÅ™Ãd FAI a pÅ™idat je k prÃ¡vÄ› upravovanÃ©mu profilu."
-
-#: admin/fai/faiProfileEntry.tpl.c:11
-msgid "Filters"
-msgstr "filtry"
-
-#: admin/fai/faiProfileEntry.tpl.c:14
-msgid "Show only classes with templates"
-msgstr "zobrazovat pouze tÅ™Ãdy, kterÃ© majÃ definovÃ¡ny Å¡ablony"
-
-#: admin/fai/faiProfileEntry.tpl.c:17
-msgid "Show only classes with scripts"
-msgstr "zobrazovat pouze tÅ™Ãdy, kterÃ© majÃ definovÃ¡ny skripty"
-
-#: admin/fai/faiProfileEntry.tpl.c:20
-msgid "Show only classes with hooks"
-msgstr "zobrazovat pouze tÅ™Ãdy, kterÃ© majÃ definovÃ¡ny hÃ¡Äky"
-
-#: admin/fai/faiProfileEntry.tpl.c:23
-msgid "Show only classes with variables"
-msgstr "zobrazovat pouze tÅ™Ãdy, kterÃ© majÃ definovÃ¡ny promÄ›nnÃ©"
-
-#: admin/fai/faiProfileEntry.tpl.c:26
-msgid "Show only classes with packages"
-msgstr "zobrazovat pouze tÅ™Ãdy, kterÃ© majÃ definovÃ¡ny balÃÄky"
-
-#: admin/fai/faiProfileEntry.tpl.c:29
-msgid "Show only classes with partitions"
-msgstr "zobrazovat pouze tÅ™Ãdy, kterÃ© majÃ definovÃ¡ny oddÃly"
-
-#: admin/fai/faiProfileEntry.tpl.c:32 admin/fai/faiProfileEntry.tpl.c:35
-msgid "Display objects matching"
-msgstr "zobrazit odpovÃdajÃcÃ objekty"
-
-#: admin/fai/faiProfileEntry.tpl.c:38
-msgid "Regular expression for matching object names"
-msgstr "regulÃ¡rnÃ vÃ½raz pro hledÃ¡nÃ objektÅ¯ s odpovÃdajÃcÃmi nÃ¡zvy"
-
-#: admin/fai/faiTemplateEntry.tpl.c:17 admin/fai/faiTemplateEntry.tpl.c:20
-msgid "Template attributes"
-msgstr "vlastnosti Å¡ablony"
-
-#: admin/fai/faiTemplateEntry.tpl.c:26 admin/fai/faiTemplateEntry.tpl.c:29
-msgid "Save template"
-msgstr "uloÅ¾it Å¡ablonu"
-
-#: admin/fai/faiTemplateEntry.tpl.c:32 admin/fai/faiTemplateEntry.tpl.c:35
-msgid "Edit template"
-msgstr "upravit Å¡ablonu"
-
-#: admin/fai/faiTemplateEntry.tpl.c:38
-msgid "Full path"
-msgstr "ÃºplnÃ¡ cesta"
-
-#: admin/fai/faiTemplateEntry.tpl.c:41
-msgid "Upload"
-msgstr "nahrÃ¡t"
-
-#: admin/fai/faiTemplateEntry.tpl.c:44
-msgid "Owner"
-msgstr "vlastnÃk"
-
-#: admin/fai/faiTemplateEntry.tpl.c:50
-msgid "Access"
-msgstr "pÅ™Ãstup"
-
-#: admin/fai/faiTemplateEntry.tpl.c:53
-msgid "Class"
-msgstr "tÅ™Ãda"
-
-#: admin/fai/faiTemplateEntry.tpl.c:56
-msgid "Read"
-msgstr "ÄtenÃ"
-
-#: admin/fai/faiTemplateEntry.tpl.c:59
-msgid "Write"
-msgstr "zÃ¡pis"
-
-#: admin/fai/faiTemplateEntry.tpl.c:62
-msgid "Execute"
-msgstr "spustit"
-
-#: admin/fai/faiTemplateEntry.tpl.c:65
-msgid "Special"
-msgstr "speciÃ¡lnÃ"
-
-#: admin/fai/faiTemplateEntry.tpl.c:71
-msgid "SUID"
-msgstr "SUID"
-
-#: admin/fai/faiTemplateEntry.tpl.c:77
-msgid "SGID"
-msgstr "SGID"
-
-#: admin/fai/faiTemplateEntry.tpl.c:80
-msgid "Others"
-msgstr "ostatnÃ"
-
-#: admin/fai/faiTemplateEntry.tpl.c:83
-msgid "sticky"
-msgstr "â€žlepkavÃ½â€œ (sticky)"
-
-#: admin/fai/faiScriptEntry.tpl.c:17 admin/fai/faiScriptEntry.tpl.c:26
-msgid "Script attributes"
-msgstr "vlastnosti skriptu"
-
-#: admin/fai/faiScriptEntry.tpl.c:23
-msgid ""
-"Choose a priority. Low values result in an earlier, high values in a later "
-"execution."
-msgstr "Zvolte prioritu â€“ ty niÅ¾Å¡Ãch ÄÃselnÃ½ch hodnot budou spuÅ¡tÄ›ny dÅ™Ãve neÅ¾ tÄ›ch vyÅ¡Å¡Ãch."
-
-#: admin/fai/faiScriptEntry.tpl.c:32 admin/fai/faiHookEntry.tpl.c:32
-msgid "Import script"
-msgstr "importovat skript"
-
-#: admin/fai/classSelect/selectClass-list.tpl.c:2
-msgid "Base"
-msgstr "zÃ¡klad"
-
-#: admin/fai/fai-filter.tpl.c:29
-msgid "Show profiles"
-msgstr "zobrazit profily"
-
-#: admin/fai/fai-filter.tpl.c:32
-msgid "Show templates"
-msgstr "zobrazit Å¡ablony"
-
-#: admin/fai/fai-filter.tpl.c:35
-msgid "Show scripts"
-msgstr "zobrazit skripty"
-
-#: admin/fai/fai-filter.tpl.c:38
-msgid "Show hooks"
-msgstr "zobrazit hÃ¡Äky"
-
-#: admin/fai/fai-filter.tpl.c:41
-msgid "Show variables"
-msgstr "zobrazit promÄ›nnÃ©"
-
-#: admin/fai/fai-filter.tpl.c:44
-msgid "Show packages"
-msgstr "zobrazit balÃÄky"
-
-#: admin/fai/fai-filter.tpl.c:47
-msgid "Show partitions"
-msgstr "zobrazit oddÃly"
-
-#: admin/fai/faiTemplateEdit.tpl.c:2
-msgid "This FAI template is write protected. Editing may break it!"
-msgstr "Tato Å¡ablona FAI je chrÃ¡nÄ›na proti zÃ¡pisu. JakÃ©koli Ãºpravy ji mohou rozbÃt!"
-
-#: admin/fai/faiTemplateEdit.tpl.c:5
-msgid "Edit anyway"
-msgstr "pÅ™esto upravit"
-
-#: admin/fai/faiPartitionTable.tpl.c:14
-msgid "Use 'setup-storage' to partition the disk"
-msgstr "Pro rozdÄ›lenÃ ÃºloÅ¾iÅ¡tÄ› pouÅ¾ij â€žsetup-storageâ€œ"
-
-#: admin/fai/faiPartitionTable.tpl.c:20
-msgid "Discs"
-msgstr "ÃºloÅ¾nÃ© jednotky"
-
-#: admin/fai/faiPartitionTable.tpl.c:23 admin/fai/faiPartitionTable.tpl.c:26
-#: admin/fai/faiPartitionTable.tpl.c:41 admin/fai/faiPartitionTable.tpl.c:44
-msgid "Add disk"
-msgstr "pÅ™idat ÃºloÅ¾nou jednotku"
-
-#: admin/fai/faiPartitionTable.tpl.c:29 admin/fai/faiPartitionTable.tpl.c:32
-#: admin/fai/faiPartitionTable.tpl.c:47 admin/fai/faiPartitionTable.tpl.c:50
-msgid "Add RAID"
-msgstr "pÅ™idat RAID"
-
-#: admin/fai/faiPartitionTable.tpl.c:35 admin/fai/faiPartitionTable.tpl.c:38
-#: admin/fai/faiPartitionTable.tpl.c:53 admin/fai/faiPartitionTable.tpl.c:56
-msgid "Add volume group"
-msgstr "pÅ™idat skupinu svazkÅ¯"
-
-#: admin/fai/faiScript.tpl.c:17
-msgid "List of scripts"
-msgstr "seznam skriptÅ¯"
-
-#: admin/fai/faiProfile.tpl.c:20
-msgid "Choose a priority"
-msgstr "zvolte prioritu"
-
-#: admin/fai/faiHookEntry.tpl.c:14 admin/fai/faiHookEntry.tpl.c:17
-#: admin/fai/faiHookEntry.tpl.c:26
-msgid "Hook attributes"
-msgstr "atributy hÃ¡Äku"
-
-#: admin/fai/faiHookEntry.tpl.c:23
-msgid "Choose an existing FAI task"
-msgstr "zvolit existujÃcÃ Ãºlohu FAI"
diff --git a/fai/locale/de/fusiondirectory.po b/fai/locale/de/fusiondirectory.po
index 181aab2692843a2120d0321657354ed872552240..f5c4f275c4d602b3452aabe939ad5aa9e7139e6a 100644
--- a/fai/locale/de/fusiondirectory.po
+++ b/fai/locale/de/fusiondirectory.po
@@ -3,383 +3,191 @@
 # This file is distributed under the same license as the PACKAGE package.
 # 
 # Translators:
-# Maik Wagner <maikwagner@yahoo.com>, 2013
-#  Stefan Koehler <stefan.koehler@GONICUS.de>, 2005
+# Ettore Atalan <atalanttore@googlemail.com>, 2014
 msgid ""
 msgstr ""
-"Project-Id-Version: FusionDirectory-108\n"
+"Project-Id-Version: FusionDirectory-109\n"
 "Report-Msgid-Bugs-To: documentation@lists.fusiondirectory.org\n"
-"POT-Creation-Date: 2015-03-19 21:45+0100\n"
+"POT-Creation-Date: 2014-12-15 17:47+0100\n"
 "PO-Revision-Date: 2015-03-08 14:10+0000\n"
-"Last-Translator: fusiondirectory <contact@fusiondirectory.org>\n"
-"Language-Team: German (http://www.transifex.com/projects/p/FusionDirectory-108/language/de/)\n"
+"Last-Translator: Ettore Atalan <atalanttore@googlemail.com>\n"
+"Language-Team: German (http://www.transifex.com/projects/p/FusionDirectory-109/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/fai/class_faiScriptEntry.inc:79 admin/fai/class_faiScriptEntry.inc:82
-#: admin/fai/class_faiManagement.inc:240 admin/fai/class_faiManagement.inc:768
-#: admin/fai/class_faiManagement.inc:774
-#: admin/fai/class_faiPartitionTable.inc:268
-#: admin/fai/class_faiPartitionTable.inc:331
-#: admin/fai/class_faiDiskEntry.inc:445 admin/fai/class_FAI.inc:570
-#: admin/fai/class_faiHookEntry.inc:83 admin/fai/class_faiHookEntry.inc:86
-#: admin/fai/class_faiScript.inc:249 admin/fai/class_faiTemplate.inc:232
-#: admin/fai/class_faiHook.inc:259 admin/fai/class_faiVariable.inc:162
-#: admin/systems/class_faiLogView.inc:207
-#: admin/systems/class_faiLogView.inc:242
-msgid "Error"
-msgstr "Fehler"
-
-#: admin/fai/class_faiScriptEntry.inc:82 admin/fai/class_faiHookEntry.inc:86
-msgid "file is empty"
-msgstr "Datei ist leer"
-
-#: admin/fai/class_faiScriptEntry.inc:102 admin/fai/class_faiHookEntry.inc:102
-#: admin/fai/class_faiScript.inc:349 admin/fai/class_faiScript.inc:374
-#: admin/fai/class_faiTemplate.inc:320 admin/fai/class_faiHook.inc:346
-msgid "Download"
-msgstr "Herunterladen"
-
-#: admin/fai/class_faiScriptEntry.inc:147
-#: admin/fai/class_faiScriptEntry.inc:151
-#: admin/fai/class_faiScriptEntry.inc:154
-#: admin/fai/class_faiScriptEntry.inc:197
-#: admin/fai/class_faiManagement.inc:768 admin/fai/class_faiManagement.inc:774
-#: admin/fai/class_faiPackage.inc:685
-#: admin/fai/class_faiPartitionTable.inc:779
-#: admin/fai/class_faiDiskEntry.inc:702 admin/fai/class_faiDiskEntry.inc:705
-#: admin/fai/class_faiDiskEntry.inc:758
-#: admin/fai/class_faiTemplateEntry.inc:247
-#: admin/fai/class_faiTemplateEntry.inc:312
-#: admin/fai/class_faiPartitionTableEntry.inc:353
-#: admin/fai/class_faiPartitionTableEntry.inc:356
-#: admin/fai/class_faiPartitionTableEntry.inc:360
-#: admin/fai/class_faiPartitionTableEntry.inc:455
-#: admin/fai/packageSelect/selectPackage-list.xml:40
-#: admin/fai/class_faiProfile.inc:414 admin/fai/class_faiProfile.inc:463
-#: admin/fai/class_faiHookEntry.inc:157 admin/fai/class_faiHookEntry.inc:162
-#: admin/fai/class_faiHookEntry.inc:165 admin/fai/class_faiHookEntry.inc:207
-#: admin/fai/class_askClassName.inc:163 admin/fai/class_askClassName.inc:167
-#: admin/fai/class_askClassName.inc:171 admin/fai/class_askClassName.inc:198
-#: admin/fai/class_faiScript.inc:347 admin/fai/class_faiScript.inc:605
-#: admin/fai/classSelect/selectClass-list.xml:28
-#: admin/fai/class_faiTemplate.inc:512
-#: admin/fai/class_faiVariableEntry.inc:103
-#: admin/fai/class_faiVariableEntry.inc:112
-#: admin/fai/class_faiVariableEntry.inc:115
-#: admin/fai/class_faiVariableEntry.inc:149 admin/fai/class_faiHook.inc:531
-#: admin/fai/class_faiVariable.inc:398 admin/fai/fai-list.xml:80
-#: admin/fai/faiPartitionTableEntry.tpl.c:8 admin/fai/faiPartition.tpl.c:5
-#: admin/fai/faiVariableEntry.tpl.c:8 admin/fai/faiDiskEntry.tpl.c:8
-#: admin/fai/faiTemplate.tpl.c:8 admin/fai/faiVariable.tpl.c:8
-#: admin/fai/faiHook.tpl.c:8
-#: admin/fai/packageSelect/selectPackage-filter.tpl.c:8
-#: admin/fai/faiPackage.tpl.c:8 admin/fai/faiScriptEntry.tpl.c:8
-#: admin/fai/classSelect/selectClass-filter.tpl.c:5
-#: admin/fai/fai-filter.tpl.c:50 admin/fai/faiPartitionTable.tpl.c:8
-#: admin/fai/faiScript.tpl.c:8 admin/fai/faiProfile.tpl.c:8
-#: admin/fai/faiHookEntry.tpl.c:8
-msgid "Name"
-msgstr "Name"
-
-#: admin/fai/class_faiScriptEntry.inc:159 admin/fai/class_faiHookEntry.inc:170
-#: admin/fai/class_faiScript.inc:594 admin/fai/fai-list.xml:122
-#: admin/fai/faiScriptEntry.tpl.c:29 admin/fai/faiHookEntry.tpl.c:29
-msgid "Script"
-msgstr "Skript"
-
-#: admin/fai/class_faiScriptEntry.inc:190
-#: admin/fai/class_faiScriptEntry.inc:199
-msgid "Script entry"
-msgstr "Skript-Eintrag"
-
-#: admin/fai/class_faiScriptEntry.inc:191
-msgid "FAI script entry"
-msgstr "FAI Skript-Eintrag"
-
-#: admin/fai/class_faiScriptEntry.inc:198 admin/fai/class_faiPackage.inc:686
-#: admin/fai/class_faiPartitionTable.inc:780
-#: admin/fai/class_faiDiskEntry.inc:759
-#: admin/fai/class_faiTemplateEntry.inc:313
-#: admin/fai/class_faiPartitionTableEntry.inc:456
-#: admin/fai/class_faiProfile.inc:464 admin/fai/class_faiHookEntry.inc:208
-#: admin/fai/class_faiScript.inc:606 admin/fai/class_faiTemplate.inc:513
-#: admin/fai/class_faiVariableEntry.inc:150 admin/fai/class_faiHook.inc:532
-#: admin/fai/class_faiVariable.inc:399
-#: admin/fai/faiPartitionTableEntry.tpl.c:11 admin/fai/faiPartition.tpl.c:11
-#: admin/fai/faiVariableEntry.tpl.c:11 admin/fai/faiDiskEntry.tpl.c:14
-#: admin/fai/faiTemplate.tpl.c:11 admin/fai/faiVariable.tpl.c:11
-#: admin/fai/faiHook.tpl.c:11 admin/fai/faiPackage.tpl.c:11
-#: admin/fai/faiTemplateEntry.tpl.c:14 admin/fai/faiScriptEntry.tpl.c:11
-#: admin/fai/faiPartitionTable.tpl.c:11 admin/fai/faiScript.tpl.c:11
-#: admin/fai/faiProfile.tpl.c:11 admin/fai/faiHookEntry.tpl.c:11
-msgid "Description"
-msgstr "Beschreibung"
-
-#: admin/fai/class_faiScriptEntry.inc:200
-msgid "Script Priority"
-msgstr "Skript-PrioritÃ¤t"
-
-#: admin/fai/class_faiManagement.inc:188
-msgid "partition table"
-msgstr "Partitionstabelle"
-
-#: admin/fai/class_faiManagement.inc:189 admin/fai/fai-list.xml:31
-msgid "script"
-msgstr "Skript"
-
-#: admin/fai/class_faiManagement.inc:190 admin/fai/fai-list.xml:47
-msgid "hook"
-msgstr "Hook"
-
-#: admin/fai/class_faiManagement.inc:191 admin/fai/fai-list.xml:39
-msgid "variable"
-msgstr "Variable"
-
-#: admin/fai/class_faiManagement.inc:192 admin/fai/fai-list.xml:63
-msgid "template"
-msgstr "Vorlage"
-
-#: admin/fai/class_faiManagement.inc:193
-msgid "package list"
-msgstr "Paketliste"
-
-#: admin/fai/class_faiManagement.inc:210 admin/fai/class_faiManagement.inc:226
-#: admin/fai/class_faiManagement.inc:332 admin/fai/class_faiManagement.inc:390
-#: admin/fai/class_faiManagement.inc:480 admin/fai/class_faiManagement.inc:575
-#: admin/fai/class_faiManagement.inc:598 admin/fai/class_faiManagement.inc:619
-msgid "Permission error"
-msgstr "Berechtigungsfehler"
-
-#: admin/fai/class_faiManagement.inc:211 admin/fai/class_faiManagement.inc:226
-#, php-format
-msgid "You have no permission to create a new %s!"
-msgstr "Sie besitzen keine Berechtigung, um ein Objekt des Typs '%s' zu erstellen!"
-
-#: admin/fai/class_faiManagement.inc:226 admin/fai/fai-list.xml:55
-msgid "profile"
-msgstr "Profil"
-
-#: admin/fai/class_faiManagement.inc:328
-msgid "Branch locked"
-msgstr "Teilbaum gesperrt"
-
-#: admin/fai/class_faiManagement.inc:329
-#, php-format
-msgid "The following entries are locked, you can't remove them %s."
-msgstr "Die folgenden EintrÃ¤ge sind gesperrt, Sie kÃ¶nnen diese nicht entfernen: %s."
-
-#: admin/fai/class_faiManagement.inc:346
-msgid "FAI object"
-msgstr "FAI-Objekt"
-
-#: admin/fai/class_faiManagement.inc:477
-msgid "FAI branch/freeze"
-msgstr "FAI Teilbaum/Freeze"
-
-#: admin/fai/class_faiManagement.inc:480
-msgid "You have no permission to delete this release!"
-msgstr "Sie haben keine Berechtigung, dieses Release zu lÃ¶schen!"
-
-#: admin/fai/class_faiManagement.inc:496 admin/fai/remove.tpl.c:2
-#: admin/fai/remove_branch.tpl.c:2
-msgid "Warning"
-msgstr "Warnung"
-
-#: admin/fai/class_faiManagement.inc:496
-msgid "Release remove aborted because the release name check failed!"
-msgstr "Das Entfernen der Release ist aufgrund einer fehlgeschlagenen NamensÃ¼berprÃ¼fung fehlgeschlagen!"
-
-#: admin/fai/class_faiManagement.inc:573 admin/fai/class_faiManagement.inc:596
-msgid "Configuration"
-msgstr "Konfiguration"
-
-#: admin/fai/class_faiManagement.inc:575 admin/fai/class_faiManagement.inc:598
-#: admin/fai/class_faiManagement.inc:619
-msgid "Branch"
-msgstr "Teilbaum"
-
-#: admin/fai/class_faiManagement.inc:725 admin/fai/askClassName.tpl.c:23
-msgid "Continue"
-msgstr "Fortsetzen"
-
-#: admin/fai/class_faiManagement.inc:926
-#: admin/fai/class_faiPartitionTable.inc:768
-#: admin/fai/class_faiProfile.inc:318 admin/fai/class_askClassName.inc:99
-#: admin/fai/classSelect/class_classSelect.inc:58
-#: admin/fai/class_faiGroupHandle.inc:120
-#: admin/fai/class_faiProfileEntry.inc:163 admin/fai/fai-list.xml:146
-msgid "Partition table"
-msgstr "Partitionstabelle"
-
-#: admin/fai/class_faiManagement.inc:928
-#: admin/fai/class_faiGroupHandle.inc:122 admin/fai/fai-list.xml:140
-msgid "Package list"
-msgstr "Paketliste"
-
-#: admin/fai/class_faiManagement.inc:930
-#: admin/fai/class_faiGroupHandle.inc:124
-msgid "Scripts"
-msgstr "Skripte"
-
-#: admin/fai/class_faiManagement.inc:932
-#: admin/fai/class_faiGroupHandle.inc:126
-msgid "Variables"
-msgstr "Variablen"
-
-#: admin/fai/class_faiManagement.inc:934
-#: admin/fai/class_faiGroupHandle.inc:128
-msgid "Hooks"
-msgstr "Hooks"
-
-#: admin/fai/class_faiManagement.inc:936 admin/fai/class_faiProfile.inc:454
-#: admin/fai/class_askClassName.inc:104 admin/fai/class_faiGroupHandle.inc:130
-#: admin/fai/fai-list.xml:110
-msgid "Profile"
-msgstr "Profil"
-
-#: admin/fai/class_faiManagement.inc:938
-#: admin/fai/class_faiGroupHandle.inc:132
-msgid "Templates"
-msgstr "Vorlagen"
-
-#: admin/fai/class_faiManagement.inc:1039
-#: admin/fai/class_faiManagement.inc:1045
+#: admin/fai/class_faiManagement.inc:117 admin/fai/class_faiManagement.inc:122
 #: admin/fai/packageSelect/selectPackage-list.xml:14
-#: admin/fai/classSelect/selectClass-list.xml:15
-#: admin/systems/class_faiStartup.inc:177 config/fai/class_faiConfig.inc:41
+#: admin/systems/class_faiStartup.inc:178 config/fai/class_faiConfig.inc:41
 msgid "FAI"
 msgstr "FAI"
 
-#: admin/fai/class_faiManagement.inc:1040
+#: admin/fai/class_faiManagement.inc:118
 msgid "Manage FAI software packages and deployment recipes"
 msgstr "Verwaltung von FAI Softwarepaketen und Deployment-Recipes"
 
-#: admin/fai/class_faiPackage.inc:261
-msgid "Invalid package names"
-msgstr "UngÃ¼ltiger Paketname"
-
-#: admin/fai/class_faiPackage.inc:262
-#, php-format
-msgid "The following package names don't match the Debian policy: %s"
-msgstr "Der folgende Paketname erfÃ¼llt nicht die Debian-Richtlinie: %s"
-
-#: admin/fai/class_faiPackage.inc:421 admin/fai/class_faiPackage.inc:422
-msgid "Configured"
-msgstr "Konfiguriert"
-
-#: admin/fai/class_faiPackage.inc:428 admin/fai/class_faiPackage.inc:429
-msgid "Package marked for removal"
-msgstr "Paket zum Entfernen vorgemerkt"
-
-#: admin/fai/class_faiPackage.inc:445
-msgid "Mark package for removal"
-msgstr "Paket zum Entfernen vormerken"
-
-#: admin/fai/class_faiPackage.inc:451
-msgid "Configure this package"
-msgstr "Dieses Paket konfigurieren"
-
-#: admin/fai/class_faiPackage.inc:455
-msgid "Remove this package"
-msgstr "Dieses Paket entfernen"
-
-#: admin/fai/class_faiPackage.inc:534
-msgid "Please select a least one package!"
-msgstr "Bitte wÃ¤hlen Sie mindestens ein Paket!"
-
-#: admin/fai/class_faiPackage.inc:538
-msgid ""
-"Please choose a valid release/section combination for your repository setup!"
-msgstr "Bitte wÃ¤hlen Sie eine gÃ¼ltige Kombination aus Release und Sektion fÃ¼r Ihr gewÃ¼nschtes Repository!"
+#: admin/fai/class_faiPackage.inc:157
+msgid "Mark for installation"
+msgstr "Zur Installation markieren"
+
+#: admin/fai/class_faiPackage.inc:161
+msgid "Mark for removal"
+msgstr "Zum entfernen vormerken"
+
+#: admin/fai/class_faiPackage.inc:166
+msgid "Edit configuration"
+msgstr "Konfiguration bearbeiten"
+
+#: admin/fai/class_faiPackage.inc:247
+#: admin/fai/class_faiPartitionTable.inc:209
+#: admin/fai/class_faiPartitionTable.inc:250
+#: admin/fai/class_faiTemplate.inc:114
+#: admin/systems/services/repository/class_serviceDebianRepository.inc:172
+#: admin/systems/services/repository/class_serviceDebianRepository.inc:189
+#: admin/systems/services/repository/class_serviceDebianRepository.inc:193
+msgid "LDAP error"
+msgstr "LDAP-Fehler"
 
-#: admin/fai/class_faiPackage.inc:571
+#: admin/fai/class_faiPackage.inc:279
 #: admin/fai/packageSelect/class_filterFAIPackages.inc:41
 #: admin/fai/packageSelect/class_filterFAIPackages.inc:46
 #: admin/fai/class_faiPackageConfiguration.inc:55
-#: admin/systems/class_faiStartup.inc:132
-#: admin/systems/class_faiStartup.inc:159
-msgid "Infrastructure service"
-msgstr ""
+#: admin/systems/class_faiStartup.inc:133
+#: admin/systems/class_faiStartup.inc:160
+msgid "Service infrastructure"
+msgstr "Dienst-Infrastruktur"
 
-#: admin/fai/class_faiPackage.inc:587
+#: admin/fai/class_faiPackage.inc:294
 msgid "Unkown packages"
 msgstr "Unbekannte Pakete"
 
-#: admin/fai/class_faiPackage.inc:674
-#: admin/fai/faiPackageConfiguration.tpl.c:2
+#: admin/fai/class_faiPackage.inc:365
 msgid "Package"
 msgstr "Paket"
 
-#: admin/fai/class_faiPackage.inc:675
+#: admin/fai/class_faiPackage.inc:366
 msgid "FAI Package list"
 msgstr "FAI-Paketliste"
 
-#: admin/fai/class_faiPackage.inc:679
+#: admin/fai/class_faiPackage.inc:369
 msgid "FAI Package"
 msgstr "FAI Paket"
 
-#: admin/fai/class_faiPackage.inc:687
-msgid "Packages"
-msgstr "Pakete"
+#: admin/fai/class_faiPackage.inc:385
+#: admin/fai/class_faiPartitionTable.inc:304
+#: admin/fai/class_faiTemplateEntry.inc:140 admin/fai/class_faiProfile.inc:47
+#: admin/fai/class_faiScript.inc:50 admin/fai/class_faiTemplate.inc:173
+#: admin/fai/class_faiHook.inc:50 admin/fai/class_faiVariable.inc:50
+msgid "Properties"
+msgstr "Eigenschaften"
 
-#: admin/fai/class_faiPackage.inc:688 admin/fai/faiPackage.tpl.c:23
-msgid "Section"
-msgstr "Section"
+#: admin/fai/class_faiPackage.inc:388
+#: admin/fai/class_faiPartitionTable.inc:307 admin/fai/class_faiProfile.inc:50
+#: admin/fai/class_faiScript.inc:53 admin/fai/class_faiTemplate.inc:176
+#: admin/fai/class_faiHook.inc:53 admin/fai/class_faiVariable.inc:53
+msgid "Class name"
+msgstr "Klassen-Name"
 
-#: admin/fai/class_faiPackage.inc:688 admin/fai/class_faiPackage.inc:691
-#: admin/fai/class_faiScript.inc:605 admin/fai/class_faiTemplate.inc:512
-msgid "Readonly"
-msgstr "Nur Lesen"
+#: admin/fai/class_faiPackage.inc:388 admin/fai/class_faiScript.inc:53
+#: admin/fai/class_faiHook.inc:53 admin/fai/class_faiVariable.inc:53
+msgid "Variables class name"
+msgstr "Variablenklassenname"
+
+#: admin/fai/class_faiPackage.inc:392
+#: admin/fai/class_faiPartitionTable.inc:311
+#: admin/fai/class_faiDiskEntry.inc:738
+#: admin/fai/class_faiTemplateEntry.inc:147 admin/fai/class_faiProfile.inc:54
+#: admin/fai/class_faiScript.inc:57 admin/fai/class_faiScript.inc:75
+#: admin/fai/class_faiTemplate.inc:180 admin/fai/class_faiHook.inc:57
+#: admin/fai/class_faiHook.inc:75 admin/fai/class_faiVariable.inc:57
+#: admin/fai/class_faiVariable.inc:75
+msgid "Description"
+msgstr "Beschreibung"
 
-#: admin/fai/class_faiPackage.inc:689
-msgid "Install Method"
-msgstr "Installations-Methode"
+#: admin/fai/class_faiPackage.inc:392
+#: admin/fai/class_faiPartitionTable.inc:311 admin/fai/class_faiProfile.inc:54
+#: admin/fai/class_faiScript.inc:57 admin/fai/class_faiTemplate.inc:180
+#: admin/fai/class_faiHook.inc:57 admin/fai/class_faiVariable.inc:57
+msgid "Short description of the class"
+msgstr "Kurze Beschreibung von der Klasse"
 
-#: admin/fai/class_faiPackage.inc:690
-msgid "Package configuration"
-msgstr "Paket-Konfiguration"
+#: admin/fai/class_faiPackage.inc:398 admin/systems/class_faiStartup.inc:90
+msgid "Repository"
+msgstr "Repository"
 
-#: admin/fai/class_faiPackage.inc:691 admin/systems/class_faiStartup.inc:78
-#: admin/systems/services/repository/class_serviceRepository.inc:40
-#: admin/fai/branch_selector.tpl.c:14 admin/fai/faiPackage.tpl.c:20
-#: admin/fai/fai-filter.tpl.c:5 admin/fai/fai-filter.tpl.c:14
+#: admin/fai/class_faiPackage.inc:401 admin/systems/class_faiStartup.inc:78
+#: admin/systems/services/repository/class_serviceDebianRepository.inc:52
+#: admin/systems/services/repository/class_serviceCentosRepository.inc:49
 msgid "Release"
 msgstr "Release"
 
-#: admin/fai/class_faiPartitionTable.inc:269
-#: admin/fai/class_faiDiskEntry.inc:446
-#, php-format
-msgid ""
-"The disk cannot be deleted while it is used in the '%s' disk definition!"
-msgstr "Diese Festplatte kann nicht gelÃ¶scht werden solange sie von '%s' benutzt wird!"
+#: admin/fai/class_faiPackage.inc:401
+msgid "Debian release concerned"
+msgstr ""
 
-#: admin/fai/class_faiPartitionTable.inc:416 admin/fai/class_faiScript.inc:360
-#: admin/fai/class_faiScript.inc:362 admin/fai/class_faiTemplate.inc:306
-#: admin/fai/class_faiTemplate.inc:308
-msgid "edit"
-msgstr "Bearbeiten"
+#: admin/fai/class_faiPackage.inc:405
+#: admin/systems/services/repository/class_serviceDebianRepository.inc:58
+msgid "Sections"
+msgstr "Sektionen"
 
-#: admin/fai/class_faiPartitionTable.inc:418 admin/fai/class_faiScript.inc:364
-#: admin/fai/class_faiTemplate.inc:310
-msgid "delete"
-msgstr "Entfernen"
+#: admin/fai/class_faiPackage.inc:405
+msgid "Sections concerned"
+msgstr ""
 
-#: admin/fai/class_faiPartitionTable.inc:769
-#: admin/fai/class_faiPartitionTable.inc:773
+#: admin/fai/class_faiPackage.inc:409
+msgid "Install method"
+msgstr "Installations-Methode"
+
+#: admin/fai/class_faiPackage.inc:409
+msgid "Install method to use for this package list"
+msgstr ""
+
+#: admin/fai/class_faiPackage.inc:420
+msgid "Packages"
+msgstr "Pakete"
+
+#: admin/fai/class_faiPackage.inc:424
+msgid "Packages in this class"
+msgstr "Pakete in dieser Klasse"
+
+#: admin/fai/class_faiPartitionTable.inc:61
+#: admin/fai/class_faiDiskEntry.inc:442 admin/systems/class_faiLogView.inc:207
+#: admin/systems/class_faiLogView.inc:242
+msgid "Error"
+msgstr "Fehler"
+
+#: admin/fai/class_faiPartitionTable.inc:112
+msgid "Add RAID"
+msgstr "RAID hinzufÃ¼gen"
+
+#: admin/fai/class_faiPartitionTable.inc:116
+msgid "Add LVM"
+msgstr "LVM hinzufÃ¼gen"
+
+#: admin/fai/class_faiPartitionTable.inc:284
+msgid "Partition table"
+msgstr "Partitionstabelle"
+
+#: admin/fai/class_faiPartitionTable.inc:285
+#: admin/fai/class_faiPartitionTable.inc:288
 msgid "FAI partition table"
 msgstr "FAI-Partitionstabelle"
 
-#: admin/fai/class_faiPartitionTable.inc:779 admin/fai/class_faiHook.inc:531
-#: admin/fai/class_faiVariable.inc:398
-msgid "Read only"
-msgstr "Nur Lesen"
+#: admin/fai/class_faiPartitionTable.inc:307 admin/fai/class_faiProfile.inc:50
+msgid "Partition table class name"
+msgstr ""
+
+#: admin/fai/class_faiPartitionTable.inc:317
+msgid "Discs"
+msgstr "Festplatten"
+
+#: admin/fai/class_faiPartitionTable.inc:324
+msgid "Partitions in this class"
+msgstr "Partitionen in dieser Klasse"
 
 #: admin/fai/class_faiDiskEntry.inc:273
-#: admin/fai/faiPartitionTableEntry.tpl.c:5 admin/fai/faiDiskEntry.tpl.c:5
 msgid "Device"
 msgstr "GerÃ¤t"
 
@@ -391,103 +199,103 @@ msgstr "Label"
 msgid "UUID"
 msgstr "UUID"
 
-#: admin/fai/class_faiDiskEntry.inc:345
+#: admin/fai/class_faiDiskEntry.inc:344
 msgid "Disks"
 msgstr "Festplatten"
 
-#: admin/fai/class_faiDiskEntry.inc:348 admin/fai/class_faiPartition.inc:321
-#: admin/fai/faiPartition.tpl.c:14
+#: admin/fai/class_faiDiskEntry.inc:347 admin/fai/class_faiPartition.inc:319
 msgid "Size"
 msgstr "GrÃ¶ÃŸe"
 
-#: admin/fai/class_faiDiskEntry.inc:544
+#: admin/fai/class_faiDiskEntry.inc:443
+#, php-format
+msgid ""
+"The disk cannot be deleted while it is used in the '%s' disk definition!"
+msgstr "Diese Festplatte kann nicht gelÃ¶scht werden solange sie von '%s' benutzt wird!"
+
+#: admin/fai/class_faiDiskEntry.inc:536
 msgid "encrypted"
 msgstr "verschlÃ¼sselt"
 
-#: admin/fai/class_faiDiskEntry.inc:547
+#: admin/fai/class_faiDiskEntry.inc:539
 msgid "bootable"
 msgstr "bootbar"
 
-#: admin/fai/class_faiDiskEntry.inc:550
+#: admin/fai/class_faiDiskEntry.inc:542
 msgid "preserve"
 msgstr "bewahren"
 
-#: admin/fai/class_faiDiskEntry.inc:735
+#: admin/fai/class_faiDiskEntry.inc:687 admin/fai/class_faiDiskEntry.inc:690
+#: admin/fai/class_faiDiskEntry.inc:737
+#: admin/fai/packageSelect/selectPackage-list.xml:40
+#: admin/fai/class_faiScript.inc:71 admin/fai/class_faiHook.inc:71
+#: admin/fai/class_faiVariable.inc:71
+#: admin/fai/class_faiSimplePluginClass.inc:50
+msgid "Name"
+msgstr "Name"
+
+#: admin/fai/class_faiDiskEntry.inc:717
 msgid ""
 "You have more than four primary partition table entries in your "
 "configuration, please check your configuration twice."
 msgstr "Sie haben mehr als 4 primÃ¤re Partitionen in ihrer Konfiguration. Bitte prÃ¼fen Sie die Konfiguration."
 
-#: admin/fai/class_faiDiskEntry.inc:739
+#: admin/fai/class_faiDiskEntry.inc:721
 msgid ""
 "You cannot have more than three primary partition while using logical "
 "partitions, please check your configuration twice."
 msgstr "Sie haben mehr als 3 primÃ¤re Partitionen bei gleichzeitiger Nutzung von logischen Partitionen in ihrer Konfiguration. Bitte prÃ¼fen Sie die Konfiguration."
 
-#: admin/fai/class_faiDiskEntry.inc:752
-#: admin/fai/class_faiPartitionTableEntry.inc:448
+#: admin/fai/class_faiDiskEntry.inc:733
 msgid "Partition table entry"
 msgstr "Partitionstabellen-Eintrag"
 
-#: admin/fai/class_faiDiskEntry.inc:753
-#: admin/fai/class_faiPartitionTableEntry.inc:449
+#: admin/fai/class_faiDiskEntry.inc:734
 msgid "FAI partition table entry"
 msgstr "FAI-Partitionstabellen-Eintrag"
 
-#: admin/fai/class_faiDiskEntry.inc:760
+#: admin/fai/class_faiDiskEntry.inc:739
 msgid "Disk options"
 msgstr "Platten-Optionen"
 
-#: admin/fai/class_faiDiskEntry.inc:761
-#: admin/fai/class_faiPartitionTableEntry.inc:457
+#: admin/fai/class_faiDiskEntry.inc:740
 msgid "Partition type"
 msgstr "Partitionstyp"
 
-#: admin/fai/class_faiDiskEntry.inc:762
-#: admin/fai/class_faiPartitionTableEntry.inc:458
+#: admin/fai/class_faiDiskEntry.inc:741
 msgid "Partition no."
 msgstr "Partitionsnummer"
 
-#: admin/fai/class_faiDiskEntry.inc:763
-#: admin/fai/class_faiPartitionTableEntry.inc:459
+#: admin/fai/class_faiDiskEntry.inc:742
 msgid "File system type"
 msgstr "Dateisystem-Typ"
 
-#: admin/fai/class_faiDiskEntry.inc:764
-#: admin/fai/class_faiPartitionTableEntry.inc:171
-#: admin/fai/class_faiPartitionTableEntry.inc:460
-#: admin/fai/class_faiPartition.inc:437 admin/fai/faiPartition.tpl.c:47
+#: admin/fai/class_faiDiskEntry.inc:743 admin/fai/class_faiPartition.inc:432
 msgid "Mount point"
-msgstr "Mount-Punkt"
+msgstr "EinhÃ¤nge-Pfad"
 
-#: admin/fai/class_faiDiskEntry.inc:765
-#: admin/fai/class_faiPartitionTableEntry.inc:461
-#: admin/fai/class_faiPartition.inc:402 admin/fai/class_faiPartition.inc:407
+#: admin/fai/class_faiDiskEntry.inc:744 admin/fai/class_faiPartition.inc:397
+#: admin/fai/class_faiPartition.inc:402
 msgid "Partition size"
 msgstr "PartitionsgrÃ¶ÃŸe"
 
-#: admin/fai/class_faiDiskEntry.inc:766
-#: admin/fai/class_faiPartitionTableEntry.inc:173
-#: admin/fai/class_faiPartitionTableEntry.inc:462
-#: admin/fai/faiPartition.tpl.c:50
+#: admin/fai/class_faiDiskEntry.inc:745
 msgid "Mount options"
 msgstr "Mount-Optionen"
 
-#: admin/fai/class_faiDiskEntry.inc:767
-#: admin/fai/class_faiPartitionTableEntry.inc:463
+#: admin/fai/class_faiDiskEntry.inc:746
 msgid "File system options"
 msgstr "Dateisystem-Optionen"
 
-#: admin/fai/class_faiDiskEntry.inc:768
-#: admin/fai/class_faiPartitionTableEntry.inc:464
+#: admin/fai/class_faiDiskEntry.inc:747
 msgid "Partition flags"
 msgstr "Partitions-Flags"
 
-#: admin/fai/class_debconfTemplate.inc:227
+#: admin/fai/class_debconfTemplate.inc:225
 msgid "This package has no debconf options."
 msgstr "Dieses Paket verfÃ¼gt Ã¼ber keine debconf-Optionen."
 
-#: admin/fai/class_debconfTemplate.inc:264
+#: admin/fai/class_debconfTemplate.inc:262
 msgid ""
 "This debconf question is dynamically generated during package installation "
 "and requires choosing between specific options which cannot be presented "
@@ -495,217 +303,59 @@ msgid ""
 " effect."
 msgstr "Diese Debconf-Frage wird wÃ¤hrend der Paket-Installation automatisch generiert und erfordert die Auswahl aus MÃ¶glichkeiten, die hier nicht dargestellt werden kÃ¶nnen. Der angegebene Wert muss einer dieser gÃ¼ltigen AuswahlmÃ¶glichkeiten entsprechen."
 
-#: admin/fai/class_faiTemplateEntry.inc:139
-msgid "no file uploaded yet"
-msgstr "es wurde noch keine Datei hochgeladen."
+#: admin/fai/class_faiTemplateEntry.inc:143
+msgid "File path"
+msgstr "Dateipfad"
 
-#: admin/fai/class_faiTemplateEntry.inc:142
-#, php-format
-msgid "exists in database (size: %s bytes)"
-msgstr "existiert in der Datenbank (GrÃ¶ÃŸe: %s Bytes)"
+#: admin/fai/class_faiTemplateEntry.inc:143
+msgid "Complete absolute template file path and name"
+msgstr ""
 
-#: admin/fai/class_faiTemplateEntry.inc:251
-#: admin/systems/class_faiLogView.inc:70 admin/fai/faiTemplateEntry.tpl.c:23
-msgid "File"
-msgstr "Datei"
+#: admin/fai/class_faiTemplateEntry.inc:147
+msgid "Short description of the file"
+msgstr "Kurze Beschreibung von der Datei"
 
-#: admin/fai/class_faiTemplateEntry.inc:255
-#: admin/fai/faiTemplateEntry.tpl.c:11
-msgid "Destination path"
-msgstr "Ziel-Pfad"
-
-#: admin/fai/class_faiTemplateEntry.inc:260 admin/fai/faiTemplateEntry.tpl.c:8
-msgid "File name"
-msgstr "Dateiname"
-
-#: admin/fai/class_faiTemplateEntry.inc:264
-#: admin/fai/class_faiTemplateEntry.inc:266
-#: admin/fai/faiTemplateEntry.tpl.c:68
-msgid "User"
-msgstr "Benutzer"
-
-#: admin/fai/class_faiTemplateEntry.inc:270
-#: admin/fai/class_faiTemplateEntry.inc:273
-#: admin/fai/class_faiTemplateEntry.inc:275
-#: admin/fai/faiTemplateEntry.tpl.c:47 admin/fai/faiTemplateEntry.tpl.c:74
-msgid "Group"
-msgstr "Gruppe"
+#: admin/fai/class_faiTemplateEntry.inc:156
+msgid "Template attributes"
+msgstr "Vorlagen-Attribute"
 
-#: admin/fai/class_faiTemplateEntry.inc:305
-msgid "Template entry"
-msgstr "Vorlagen-Eintrag"
+#: admin/fai/class_faiTemplateEntry.inc:160
+msgid "Template file content"
+msgstr "Vorlagendateiinhalt"
 
-#: admin/fai/class_faiTemplateEntry.inc:306
-msgid "FAI template entry"
-msgstr "FAI-Vorlagen-Eintrag"
+#: admin/fai/class_faiTemplateEntry.inc:160
+msgid "Content of the template file"
+msgstr "Inhalt der Vorlagendatei"
 
-#: admin/fai/class_faiTemplateEntry.inc:314
-msgid "Template file"
-msgstr "Vorlagen-Datei"
+#: admin/fai/class_faiTemplateEntry.inc:164
+msgid "Owner and group of the file"
+msgstr "EigentÃ¼mer und Gruppe von der Datei"
 
-#: admin/fai/class_faiTemplateEntry.inc:315
-msgid "Template path"
-msgstr "Vorlagen-Pfad"
+#: admin/fai/class_faiTemplateEntry.inc:167
+msgid "Owner"
+msgstr "Besitzer"
 
-#: admin/fai/class_faiTemplateEntry.inc:316
+#: admin/fai/class_faiTemplateEntry.inc:167
 msgid "File owner"
 msgstr "Datei-Besitzer"
 
-#: admin/fai/class_faiTemplateEntry.inc:317
-msgid "File permissions"
-msgstr "Datei-Berechtigungen"
-
-#: admin/fai/class_FAI.inc:287 admin/fai/class_FAI.inc:679
-#: admin/fai/class_FAI.inc:1266 admin/fai/class_FAI.inc:1283
-#: admin/fai/class_FAI.inc:1287
-msgid "LDAP error"
-msgstr "LDAP-Fehler"
-
-#: admin/fai/class_FAI.inc:570
-#, php-format
-msgid "Error, following objects should be equal '%s' and '%s'"
-msgstr "Fehler, die folgenden Objekte sollten gleich sein: '%s' und '%s'"
-
-#: admin/fai/class_FAI.inc:891
-#, php-format
-msgid "Creating group application release for %s"
-msgstr "Erstelle Gruppenanwendungsrelease fÃ¼r %s"
-
-#: admin/fai/class_FAI.inc:960 admin/fai/class_FAI.inc:982
-#: admin/fai/class_FAI.inc:1022 admin/fai/class_FAI.inc:1027
-#: admin/fai/class_FAI.inc:1065
-msgid "Object"
-msgstr "Objekt"
-
-#: admin/fai/class_FAI.inc:961
-#, php-format
-msgid "Adding missing group application release container %s."
-msgstr "FÃ¼ge fehlenden Gruppenanwendungsrelease-Container %s hinzu."
-
-#: admin/fai/class_FAI.inc:983
-#, php-format
-msgid "Adding group application release container %s."
-msgstr "FÃ¼ge Gruppenanwendungsrelease-Container %s hinzu."
-
-#: admin/fai/class_FAI.inc:1023
-#, php-format
-msgid "Could not create menu entry %s. (Already exists)."
-msgstr "Kann den MenÃ¼eintrag %s nicht anlegen (existiert bereits)."
-
-#: admin/fai/class_FAI.inc:1028
-#, php-format
-msgid "Created group application menu entry for %s."
-msgstr "MenÃ¼eintrag fÃ¼r die Gruppenanwendung %s erstellt."
-
-#: admin/fai/class_FAI.inc:1059
-#, php-format
-msgid "Creating copy of %s"
-msgstr "Erstelle Kopie von %s"
-
-#: admin/fai/class_FAI.inc:1062
-msgid "Processing"
-msgstr "Verarbeite"
-
-#: admin/fai/class_FAI.inc:1080
-msgid "Could not create new release, the destination dn is already in use."
-msgstr "Kann neues Release nicht erstellen, die Ziel-DN wird bereits verwendet."
-
-#: admin/fai/class_FAI.inc:1093
-msgid "Error while fetching source dn - aborted!"
-msgstr "Fehler beim Abrufen des Quell-DN, der Vorgang wurde abgebrochen!"
-
-#: admin/fai/class_FAI.inc:1174
-msgid "Fatal error"
-msgstr "Schwerer Fehler"
-
-#: admin/fai/class_FAI.inc:1175
-#, php-format
-msgid ""
-"Release creation failed due to ldap errors. Additional informations '%s'."
-msgstr "Das Erstellen des Releases ist fehlgeschlagen: '%s'."
-
-#: admin/fai/class_faiPartitionTableEntry.inc:162
-msgid "primary"
-msgstr "primÃ¤r"
-
-#: admin/fai/class_faiPartitionTableEntry.inc:162
-msgid "logical"
-msgstr "logisch"
-
-#: admin/fai/class_faiPartitionTableEntry.inc:169
-#: admin/fai/faiPartition.tpl.c:8
-msgid "Type"
-msgstr "Typ"
-
-#: admin/fai/class_faiPartitionTableEntry.inc:170
-msgid "FS type"
-msgstr "Dateisystem"
-
-#: admin/fai/class_faiPartitionTableEntry.inc:172
-msgid "Size in MB"
-msgstr "GrÃ¶ÃŸe in MB"
-
-#: admin/fai/class_faiPartitionTableEntry.inc:174
-msgid "FS option"
-msgstr "Dateisystem-Option"
-
-#: admin/fai/class_faiPartitionTableEntry.inc:175
-#: admin/fai/faiPartition.tpl.c:23
-msgid "Preserve"
-msgstr "Bewahren"
-
-#: admin/fai/class_faiPartitionTableEntry.inc:266
-msgid "False"
-msgstr "falsch"
-
-#: admin/fai/class_faiPartitionTableEntry.inc:268
-msgid "True"
-msgstr "wahr"
-
-#: admin/fai/class_faiPartitionTableEntry.inc:272
-#: admin/fai/class_faiPartitionTableEntry.inc:274 admin/fai/fai-list.xml:159
-#: admin/fai/fai-list.xml:198
-msgid "Remove"
-msgstr "Entfernen"
+#: admin/fai/class_faiTemplateEntry.inc:172
+msgid "Group"
+msgstr "Gruppe"
 
-#: admin/fai/class_faiPartitionTableEntry.inc:384
-#, php-format
-msgid "please enter a unique mount point for partition %s"
-msgstr "Bitte geben Sie einen eindeutigen Mount-Punkt fÃ¼r Partition %s ein."
+#: admin/fai/class_faiTemplateEntry.inc:172
+msgid "File group"
+msgstr "Dateigruppe"
 
-#: admin/fai/class_faiPartitionTableEntry.inc:389
-#, php-format
-msgid "partition %s mount point"
-msgstr "EinhÃ¤ngepfad fÃ¼r Partition %s"
+#: admin/fai/class_faiTemplateEntry.inc:181
+msgid "Access"
+msgstr "Zugriff"
 
-#: admin/fai/class_faiPartitionTableEntry.inc:394
-#, php-format
-msgid ""
-"File system type 'swap' is already used, change file system type for "
-"partition %s."
-msgstr "Dateisystem 'swap' wird bereits benutzt, Ã¤ndern Sie bitte das Dateisystem fÃ¼r Partition %s."
-
-#: admin/fai/class_faiPartitionTableEntry.inc:398
-msgid "Please use 'swap' as mount point, if 'swap' is used as fs-type."
-msgstr "Bitte wÃ¤hlen Sie 'swap' als Mount-Punkt, wenn Dateisystem 'swap' gewÃ¤hlt wurde."
-
-#: admin/fai/class_faiPartitionTableEntry.inc:404
-#: admin/fai/class_faiPartitionTableEntry.inc:408
-#: admin/fai/class_faiPartitionTableEntry.inc:414
-#: admin/fai/class_faiPartitionTableEntry.inc:416
-#: admin/fai/class_faiPartitionTableEntry.inc:421
-#, php-format
-msgid "partition %s size"
-msgstr "GrÃ¶ÃŸe der Partition %s"
-
-#: admin/fai/class_faiPartitionTableEntry.inc:436
-msgid ""
-"You have more than 3 primary partition table entries in your configuration, "
-"please check your configuration twice."
-msgstr "Sie haben mehr als 3 primÃ¤re Partitionen in ihrer Konfiguration. Bitte prÃ¼fen Sie die Konfiguration."
+#: admin/fai/class_faiTemplateEntry.inc:181
+msgid "Access rights"
+msgstr "Zugriffsrechte"
 
 #: admin/fai/packageSelect/selectPackage-list.xml:10
-#: admin/fai/classSelect/selectClass-list.xml:11
 msgid "Please select the desired entries"
 msgstr "Bitte wÃ¤hlen Sie die gewÃ¼nschten EintrÃ¤ge"
 
@@ -713,148 +363,95 @@ msgstr "Bitte wÃ¤hlen Sie die gewÃ¼nschten EintrÃ¤ge"
 msgid "Version"
 msgstr "Version"
 
-#: admin/fai/class_faiProfile.inc:310
-msgid "This list displays all assigned class names for this profile."
-msgstr "Diese Liste zeigt alle diesem Profil zugeordneten Klassen-Namen."
-
-#: admin/fai/class_faiProfile.inc:313 admin/fai/class_askClassName.inc:103
-#: admin/fai/classSelect/class_classSelect.inc:53
-#: admin/fai/class_faiProfileEntry.inc:158
-msgid "Hook bundle"
-msgstr "Hook-Gruppe"
-
-#: admin/fai/class_faiProfile.inc:314 admin/fai/class_askClassName.inc:105
-#: admin/fai/classSelect/class_classSelect.inc:54
-#: admin/fai/class_faiProfileEntry.inc:159
-msgid "Template bundle"
-msgstr "Vorlagen-Gruppe"
-
-#: admin/fai/class_faiProfile.inc:315 admin/fai/class_askClassName.inc:101
-#: admin/fai/classSelect/class_classSelect.inc:55
-#: admin/fai/class_faiProfileEntry.inc:160
-msgid "Script bundle"
-msgstr "Skript-Gruppe"
-
-#: admin/fai/class_faiProfile.inc:316 admin/fai/class_askClassName.inc:102
-#: admin/fai/classSelect/class_classSelect.inc:56
-#: admin/fai/class_faiProfileEntry.inc:161
-msgid "Variable bundle"
-msgstr "Variablen-Gruppe"
-
-#: admin/fai/class_faiProfile.inc:317 admin/fai/class_askClassName.inc:100
-#: admin/fai/classSelect/class_classSelect.inc:57
-#: admin/fai/class_faiProfileEntry.inc:162
-msgid "Package bundle"
-msgstr "Paket-Gruppe"
-
-#: admin/fai/class_faiProfile.inc:321
-msgid "Remove class from profile"
-msgstr "Entferne Klasse von Profil"
-
-#: admin/fai/class_faiProfile.inc:324
-msgid "Up"
-msgstr "Auf"
-
-#: admin/fai/class_faiProfile.inc:325
-msgid "Down"
-msgstr "Ab"
-
-#: admin/fai/class_faiProfile.inc:410
-msgid "No class specified for this profile!"
-msgstr "Es wurde fÃ¼r dieses Profil keine Klasse definiert!"
-
-#: admin/fai/class_faiProfile.inc:419
-msgid "You can't use the same name for a class and a profile!"
-msgstr ""
+#: admin/fai/class_faiProfile.inc:28
+msgid "Profile"
+msgstr "Profil"
 
-#: admin/fai/class_faiProfile.inc:455
+#: admin/fai/class_faiProfile.inc:29
 msgid "FAI profile"
 msgstr "FAI-Profil"
 
-#: admin/fai/class_faiProfile.inc:458
+#: admin/fai/class_faiProfile.inc:32
 msgid "FAI Profile"
 msgstr "FAI Profil"
 
-#: admin/fai/class_faiProfile.inc:465 admin/fai/faiProfile.tpl.c:17
+#: admin/fai/class_faiProfile.inc:61
 msgid "FAI classes"
 msgstr "FAI-Klassen"
 
-#: admin/fai/class_faiHookEntry.inc:200
-msgid "Hook entry"
-msgstr "Hook-Eintrag"
+#: admin/fai/class_faiProfile.inc:61
+msgid "FAI classes which are part of this profile"
+msgstr ""
 
-#: admin/fai/class_faiHookEntry.inc:201
-msgid "FAI hook entry"
-msgstr "FAI-Hook-Eintrag"
+#: admin/fai/class_faiPackageConfiguration.inc:88
+#, php-format
+msgid "Debconf information for package '%s'"
+msgstr "Debconf-Information fÃ¼r Paket '%s'"
 
-#: admin/fai/class_faiHookEntry.inc:209 admin/fai/faiHookEntry.tpl.c:20
-msgid "Task"
-msgstr "Aufgabe"
+#: admin/fai/class_faiScript.inc:30 admin/fai/class_faiScript.inc:84
+#: admin/fai/class_faiHook.inc:87
+msgid "Script"
+msgstr "Skript"
 
-#: admin/fai/class_faiHookEntry.inc:210 admin/fai/class_faiScript.inc:595
-#: admin/fai/class_faiScript.inc:599
+#: admin/fai/class_faiScript.inc:31 admin/fai/class_faiScript.inc:34
 msgid "FAI script"
 msgstr "FAI-Skript"
 
-#: admin/fai/class_faiPackageConfiguration.inc:88
-#, php-format
-msgid "Debconf information for package '%s'"
-msgstr "Debconf-Information fÃ¼r Paket '%s'"
+#: admin/fai/class_faiScript.inc:63
+msgid "Scripts"
+msgstr "Skripte"
 
-#: admin/fai/class_askClassName.inc:99 admin/fai/class_askClassName.inc:100
-#: admin/fai/class_askClassName.inc:101 admin/fai/class_askClassName.inc:102
-#: admin/fai/class_askClassName.inc:103 admin/fai/class_askClassName.inc:104
-#: admin/fai/class_askClassName.inc:105 admin/fai/class_askClassName.inc:106
-msgid "Create new FAI object"
-msgstr "Erstelle neues FAI-Objekt"
+#: admin/fai/class_faiScript.inc:67 admin/fai/class_faiHook.inc:67
+#: admin/fai/class_faiVariable.inc:67
+msgid "Variables in this class"
+msgstr "Variablen in dieser Klasse"
 
-#: admin/fai/class_faiTemplateEdit.inc:80
-#, php-format
-msgid ""
-"The file encodig has changed from '%s' to '%s'. Do you really want to save?"
-msgstr "Die Datei-Kodierung hat sich von '%s' nach '%s' geÃ¤ndert. Wollen Sie sie speichern?"
+#: admin/fai/class_faiScript.inc:71 admin/fai/class_faiHook.inc:71
+#: admin/fai/class_faiVariable.inc:71
+msgid "The name of the variable"
+msgstr "Der Name der Variable"
 
-#: admin/fai/class_faiScript.inc:333 admin/fai/class_faiScript.inc:335
-msgid "Sort direction"
-msgstr "Sortierrichtung"
+#: admin/fai/class_faiScript.inc:75 admin/fai/class_faiHook.inc:75
+#: admin/fai/class_faiVariable.inc:75
+msgid "A short description of the variable"
+msgstr "Eine kurze Beschreibung von der Variable"
 
-#: admin/fai/class_faiScript.inc:348 admin/fai/faiScriptEntry.tpl.c:20
+#: admin/fai/class_faiScript.inc:79
 msgid "Priority"
 msgstr "PrioritÃ¤t"
 
-#: admin/fai/class_faiScript.inc:350
-msgid "Action"
-msgstr "Aktion"
+#: admin/fai/class_faiScript.inc:79
+msgid "Priority of this script (FIXME: less is done first?)"
+msgstr ""
 
-#: admin/fai/classSelect/selectClass-list.xml:36 admin/fai/fai-list.xml:88
-#: admin/fai/faiScriptEntry.tpl.c:14
-msgid "Properties"
-msgstr "Eigenschaften"
+#: admin/fai/class_faiScript.inc:84
+msgid "The script itself"
+msgstr "Das Skript selbst"
+
+#: admin/fai/class_faiTemplate.inc:136
+#, php-format
+msgid "There are several files with the same path: %s"
+msgstr ""
 
-#: admin/fai/class_faiTemplate.inc:501 admin/fai/fai-list.xml:116
+#: admin/fai/class_faiTemplate.inc:153
 msgid "Template"
 msgstr "Vorlage"
 
-#: admin/fai/class_faiTemplate.inc:502 admin/fai/class_faiTemplate.inc:506
+#: admin/fai/class_faiTemplate.inc:154 admin/fai/class_faiTemplate.inc:157
 msgid "FAI template"
 msgstr "FAI-Vorlage"
 
-#: admin/fai/class_faiVariableEntry.inc:107
-msgid "Content"
-msgstr "Inhalt"
+#: admin/fai/class_faiTemplate.inc:176
+msgid "Template class name"
+msgstr "Vorlagenklassenname"
 
-#: admin/fai/class_faiVariableEntry.inc:142
-msgid "Variable entry"
-msgstr "Variablen-Eintrag"
+#: admin/fai/class_faiTemplate.inc:186
+msgid "Template files"
+msgstr "Vorlagendateien"
 
-#: admin/fai/class_faiVariableEntry.inc:143
-msgid "FAI variable entry "
-msgstr "FAI-Variablen-Eintrag"
-
-#: admin/fai/class_faiVariableEntry.inc:151
-#: admin/fai/faiVariableEntry.tpl.c:20
-msgid "Variable content"
-msgstr "Variablen-Inhalt"
+#: admin/fai/class_faiTemplate.inc:190
+msgid "Template files in this class"
+msgstr "Vorlagendateien in dieser Klasse"
 
 #: admin/fai/class_faiPartition.inc:176 admin/fai/class_faiPartition.inc:180
 msgid "Logical"
@@ -952,95 +549,74 @@ msgstr "xfs"
 msgid "btrfs"
 msgstr "btrfs"
 
-#: admin/fai/class_faiPartition.inc:224
-msgid "LVM/RAID"
-msgstr ""
-
-#: admin/fai/class_faiPartition.inc:327
+#: admin/fai/class_faiPartition.inc:325
 msgid "spare"
 msgstr "Reserve"
 
-#: admin/fai/class_faiPartition.inc:330
+#: admin/fai/class_faiPartition.inc:328
 msgid "missing"
 msgstr "fehlt"
 
-#: admin/fai/class_faiPartition.inc:333
+#: admin/fai/class_faiPartition.inc:331
 msgid "Options"
 msgstr "Optionen"
 
-#: admin/fai/class_faiPartition.inc:420
+#: admin/fai/class_faiPartition.inc:415
 msgid "Minimum partition size"
 msgstr "PartitionsgrÃ¶ÃŸe"
 
-#: admin/fai/class_faiPartition.inc:420
+#: admin/fai/class_faiPartition.inc:415
 msgid "Maximum partition size"
 msgstr "PartitionsgrÃ¶ÃŸe"
 
-#: admin/fai/class_faiPartition.inc:428
+#: admin/fai/class_faiPartition.inc:423
 msgid "Raid arrays must contain at least two partitions!"
 msgstr "RAID-Arrays mÃ¼ssen mindestens zwei Partitionen enthalten!"
 
-#: admin/fai/class_faiPartition.inc:430
+#: admin/fai/class_faiPartition.inc:425
 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:332 admin/fai/class_faiHook.inc:334
-#: admin/fai/fai-list.xml:190 admin/fai/faiVariable.tpl.c:23
-#: admin/fai/faiVariable.tpl.c:26
-msgid "Edit"
-msgstr "Bearbeiten"
-
-#: admin/fai/class_faiHook.inc:336
-msgid "Delete"
-msgstr "Entfernen"
-
-#: admin/fai/class_faiHook.inc:521 admin/fai/fai-list.xml:128
+#: admin/fai/class_faiHook.inc:30
 msgid "Hook"
 msgstr "Hook"
 
-#: admin/fai/class_faiHook.inc:522 admin/fai/class_faiHook.inc:526
+#: admin/fai/class_faiHook.inc:31 admin/fai/class_faiHook.inc:34
 msgid "FAI hook"
 msgstr "FAI-Hook"
 
-#: admin/fai/class_faiVariable.inc:387 admin/fai/fai-list.xml:134
+#: admin/fai/class_faiHook.inc:63
+msgid "Hooks"
+msgstr "Hooks"
+
+#: admin/fai/class_faiHook.inc:79
+msgid "Task"
+msgstr "Vorgang"
+
+#: admin/fai/class_faiHook.inc:87
+msgid "The script of this hook"
+msgstr ""
+
+#: admin/fai/class_faiVariable.inc:30
 msgid "Variable"
 msgstr "Variable"
 
-#: admin/fai/class_faiVariable.inc:388 admin/fai/class_faiVariable.inc:392
+#: admin/fai/class_faiVariable.inc:31 admin/fai/class_faiVariable.inc:34
 msgid "FAI variable"
 msgstr "FAI-Variable"
 
-#: admin/fai/class_faiProfileEntry.inc:184 admin/fai/askClassName.tpl.c:11
-#: admin/fai/askClassName.tpl.c:17 admin/fai/paste_generic.tpl.c:5
-msgid "Class name"
-msgstr "Klassen-Name"
-
-#: admin/fai/class_faiProfileEntry.inc:184 admin/fai/faiTemplate.tpl.c:14
-#: admin/fai/faiVariable.tpl.c:14 admin/fai/faiHook.tpl.c:14
-#: admin/fai/faiPartitionTable.tpl.c:17 admin/fai/faiScript.tpl.c:14
-msgid "Objects"
-msgstr "Objekte"
-
-#: admin/fai/fai-list.xml:11
-msgid "List of deployment classes and products"
-msgstr "Liste von zu verteilenden Klassen und Produkten"
-
-#: admin/fai/fai-list.xml:15
-msgid "partitionTable"
-msgstr "partitionTable"
-
-#: admin/fai/fai-list.xml:23
-msgid "packagelist"
-msgstr "packagelist"
+#: admin/fai/class_faiVariable.inc:63
+msgid "Variables"
+msgstr "Variablen"
 
-#: admin/fai/fai-list.xml:93
-msgid "Actions"
-msgstr "Aktionen"
+#: admin/fai/class_faiVariable.inc:79
+msgid "Content"
+msgstr "Inhalt"
 
-#: admin/fai/fai-list.xml:104
-msgid "Create"
-msgstr "Anlegen"
+#: admin/fai/class_faiVariable.inc:79
+msgid "The content of the variable"
+msgstr "Der Inhalt der Variable"
 
 #: admin/systems/class_faiLogView.inc:56
 msgid "Sort down"
@@ -1050,6 +626,10 @@ msgstr "Absteigend sortieren"
 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"
@@ -1084,7 +664,7 @@ msgstr "AusgewÃ¤hlte Datei"
 msgid "Selected file: %s"
 msgstr "AusgewÃ¤hlte Datei: %s"
 
-#: admin/systems/class_faiStartup.inc:70 admin/fai/paste_generic.tpl.c:2
+#: admin/systems/class_faiStartup.inc:70
 msgid "FAI settings"
 msgstr "FAI-Einstellungen"
 
@@ -1104,11 +684,6 @@ msgstr "Profil"
 msgid "FAI profil to be applied to this computer"
 msgstr "FAI-Profil welches auf diesem Rechner angewendet werden soll"
 
-#: admin/systems/class_faiStartup.inc:90 admin/fai/faiPackage.tpl.c:14
-#: admin/fai/faiPackage.tpl.c:17
-msgid "Repository"
-msgstr "Repository"
-
 #: admin/systems/class_faiStartup.inc:90
 msgid "FAI Debian repository to be used for installation"
 msgstr "FAI Debian-Repository, welches fÃ¼r die Installation verwendet werden soll"
@@ -1133,86 +708,97 @@ msgstr "Boot Kernel Parameter"
 msgid "Linux kernel parameters to be ran"
 msgstr "Linux Kernel Parameter, die gestartet werden sollen"
 
-#: admin/systems/class_faiStartup.inc:178
+#: admin/systems/class_faiStartup.inc:179
 msgid "Full automated installation"
 msgstr "Full Automated Installation"
 
-#: admin/systems/services/repository/class_serviceRepository.inc:31
+#: admin/systems/services/repository/class_serviceDebianRepository.inc:34
+#: admin/systems/services/repository/class_serviceCentosRepository.inc:31
+msgid "Repositories"
+msgstr "Repositories"
+
+#: admin/systems/services/repository/class_serviceDebianRepository.inc:39
+#: admin/systems/services/repository/class_serviceCentosRepository.inc:36
+msgid "Repositories this server hosts"
+msgstr "Repositories, die dieser Server bereitstellt"
+
+#: admin/systems/services/repository/class_serviceDebianRepository.inc:43
+#: admin/systems/services/repository/class_serviceCentosRepository.inc:40
 msgid "URL"
 msgstr "URL"
 
-#: admin/systems/services/repository/class_serviceRepository.inc:31
+#: admin/systems/services/repository/class_serviceDebianRepository.inc:43
+#: admin/systems/services/repository/class_serviceCentosRepository.inc:40
 msgid "Repository url"
 msgstr "Repository URL"
 
-#: admin/systems/services/repository/class_serviceRepository.inc:35
+#: admin/systems/services/repository/class_serviceDebianRepository.inc:47
+#: admin/systems/services/repository/class_serviceCentosRepository.inc:44
 msgid "Parent server"
 msgstr "Quell-Server"
 
-#: admin/systems/services/repository/class_serviceRepository.inc:35
+#: admin/systems/services/repository/class_serviceDebianRepository.inc:47
+#: admin/systems/services/repository/class_serviceCentosRepository.inc:44
 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_serviceDebianRepository.inc:52
+msgid "Debian release used on this repository"
+msgstr "Verwendete Debian-VerÃ¶ffentlichung in diesem Repository"
 
-#: admin/systems/services/repository/class_serviceRepository.inc:47
-msgid "Sections"
-msgstr "Sektionen"
+#: admin/systems/services/repository/class_serviceDebianRepository.inc:58
+msgid "Debian sections available on this repository"
+msgstr "Debian-Sektionen, die in diesem Repository verfÃ¼gbar sind"
 
-#: admin/systems/services/repository/class_serviceRepository.inc:47
-msgid "Sections available on this repository"
-msgstr ""
-
-#: admin/systems/services/repository/class_serviceRepository.inc:52
+#: admin/systems/services/repository/class_serviceDebianRepository.inc:63
+#: admin/systems/services/repository/class_serviceCentosRepository.inc:57
 msgid "Mirror mode"
 msgstr "Mirror-Modus"
 
-#: admin/systems/services/repository/class_serviceRepository.inc:52
+#: admin/systems/services/repository/class_serviceDebianRepository.inc:63
+#: admin/systems/services/repository/class_serviceCentosRepository.inc:57
 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
+#: admin/systems/services/repository/class_serviceDebianRepository.inc:68
+#: admin/systems/services/repository/class_serviceCentosRepository.inc:62
 msgid "Local mirror"
 msgstr "Lokaler Mirror"
 
-#: admin/systems/services/repository/class_serviceRepository.inc:57
+#: admin/systems/services/repository/class_serviceDebianRepository.inc:68
+#: admin/systems/services/repository/class_serviceCentosRepository.inc:62
 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
+#: admin/systems/services/repository/class_serviceDebianRepository.inc:77
+#: admin/systems/services/repository/class_serviceCentosRepository.inc:71
 msgid "Architectures"
 msgstr "Architekturen"
 
-#: admin/systems/services/repository/class_serviceRepository.inc:66
+#: admin/systems/services/repository/class_serviceDebianRepository.inc:77
+#: admin/systems/services/repository/class_serviceCentosRepository.inc:71
 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 ""
-
-#: admin/systems/services/repository/class_serviceRepository.inc:72
-msgid "Which distribution is this repository for"
-msgstr ""
+#: admin/systems/services/repository/class_serviceDebianRepository.inc:99
+#: admin/systems/services/repository/class_serviceDebianRepository.inc:100
+msgid "Debian repository"
+msgstr "Debian Repository"
 
-#: admin/systems/services/repository/class_serviceRepository.inc:140
-msgid "Repositories"
-msgstr "Repositories"
+#: admin/systems/services/repository/class_serviceDebianRepository.inc:100
+#: admin/systems/services/repository/class_serviceCentosRepository.inc:96
+msgid "Services"
+msgstr "Dienste"
 
-#: admin/systems/services/repository/class_serviceRepository.inc:145
-msgid "Repositories this server hosts"
-msgstr "Repositories, die dieser Server bereitstellt"
-
-#: admin/systems/services/repository/class_serviceRepository.inc:160
-msgid "Package repository"
+#: admin/systems/services/repository/class_serviceCentosRepository.inc:49
+msgid "Centos release used on this repository"
 msgstr ""
 
-#: admin/systems/services/repository/class_serviceRepository.inc:161
-msgid "Package repository information"
-msgstr ""
+#: admin/systems/services/repository/class_serviceCentosRepository.inc:95
+#: admin/systems/services/repository/class_serviceCentosRepository.inc:96
+msgid "Centos repository"
+msgstr "CentOS-Repositorium"
 
 #: config/fai/class_faiConfig.inc:28
 msgid "FAI configuration"
@@ -1243,476 +829,3 @@ msgstr "Relativer Zweig in welchem fai %s gespeichert werden"
 #: config/fai/class_faiConfig.inc:60
 msgid "s"
 msgstr "s"
-
-#: admin/fai/faiPartitionTableEntry.tpl.c:2 admin/fai/faiVariableEntry.tpl.c:2
-#: admin/fai/faiVariableEntry.tpl.c:5 admin/fai/faiDiskEntry.tpl.c:2
-#: admin/fai/faiTemplate.tpl.c:2 admin/fai/faiTemplate.tpl.c:5
-#: admin/fai/faiVariable.tpl.c:2 admin/fai/faiVariable.tpl.c:5
-#: admin/fai/faiHook.tpl.c:2 admin/fai/faiHook.tpl.c:5
-#: admin/fai/faiPackage.tpl.c:2 admin/fai/faiPackage.tpl.c:5
-#: admin/fai/faiTemplateEntry.tpl.c:2 admin/fai/faiTemplateEntry.tpl.c:5
-#: admin/fai/faiScriptEntry.tpl.c:2 admin/fai/faiScriptEntry.tpl.c:5
-#: admin/fai/faiPartitionTable.tpl.c:2 admin/fai/faiPartitionTable.tpl.c:5
-#: admin/fai/faiScript.tpl.c:2 admin/fai/faiScript.tpl.c:5
-#: admin/fai/faiProfile.tpl.c:2 admin/fai/faiProfile.tpl.c:5
-#: admin/fai/faiProfile.tpl.c:14 admin/fai/faiHookEntry.tpl.c:2
-#: admin/fai/faiHookEntry.tpl.c:5
-msgid "Generic"
-msgstr "Allgemein"
-
-#: admin/fai/faiPartitionTableEntry.tpl.c:14
-#: admin/fai/faiPartitionTableEntry.tpl.c:17 admin/fai/faiDiskEntry.tpl.c:23
-#: admin/fai/faiDiskEntry.tpl.c:26
-msgid "Partition entries"
-msgstr "Partitions-EintrÃ¤ge"
-
-#: admin/fai/faiPartitionTableEntry.tpl.c:20
-#: admin/fai/faiPartitionTableEntry.tpl.c:23 admin/fai/faiDiskEntry.tpl.c:29
-#: admin/fai/faiDiskEntry.tpl.c:32
-msgid "Add partition"
-msgstr "Partition hinzufÃ¼gen"
-
-#: admin/fai/branch_selector.tpl.c:2
-msgid "Releases"
-msgstr "Releases"
-
-#: admin/fai/branch_selector.tpl.c:5
-msgid "Current release"
-msgstr "Momentanes Release"
-
-#: admin/fai/branch_selector.tpl.c:8 admin/fai/branch_selector.tpl.c:17
-#: admin/fai/fai-filter.tpl.c:8 admin/fai/fai-filter.tpl.c:17
-msgid "Create release"
-msgstr "Release erzeugen"
-
-#: admin/fai/branch_selector.tpl.c:11 admin/fai/branch_selector.tpl.c:23
-#: admin/fai/fai-filter.tpl.c:11 admin/fai/fai-filter.tpl.c:23
-msgid "Create read-only release"
-msgstr "UnverÃ¤nderbares Release erzeugen"
-
-#: admin/fai/branch_selector.tpl.c:20 admin/fai/fai-filter.tpl.c:20
-msgid "Freeze"
-msgstr "Freeze"
-
-#: admin/fai/branch_selector.tpl.c:26 admin/fai/fai-filter.tpl.c:26
-msgid "Delete current release"
-msgstr "Momentanes Release entfernen"
-
-#: admin/fai/faiPartition.tpl.c:2
-msgid "Partition"
-msgstr "Partition"
-
-#: admin/fai/faiPartition.tpl.c:17
-msgid "Resize existing partition"
-msgstr "Existierende Partition in GrÃ¶ÃŸe anpassen"
-
-#: admin/fai/faiPartition.tpl.c:20
-msgid "Bootable"
-msgstr "Bootbar"
-
-#: admin/fai/faiPartition.tpl.c:26 admin/fai/faiDiskEntry.tpl.c:20
-msgid "Combined physical partitions"
-msgstr "Kombinierte physikalische Partitionen"
-
-#: admin/fai/faiPartition.tpl.c:29
-msgid "Toggle missing"
-msgstr "Platte fehlt"
-
-#: admin/fai/faiPartition.tpl.c:32
-msgid "Toggle spare"
-msgstr "Reserveplatte"
-
-#: admin/fai/faiPartition.tpl.c:35
-msgid "Filesystem"
-msgstr "Dateisystem"
-
-#: admin/fai/faiPartition.tpl.c:38
-msgid "Filesystem create options"
-msgstr "Dateisystem Erstell-Optionen"
-
-#: admin/fai/faiPartition.tpl.c:41
-msgid "Encrypted"
-msgstr "VerschlÃ¼sselt"
-
-#: admin/fai/faiPartition.tpl.c:44
-msgid "Tune options"
-msgstr "Optimierungs-Optionen"
-
-#: admin/fai/faiNewBranch.tpl.c:2
-msgid ""
-"You are now going to create a branch or locked branch. This action clones "
-"the existing release to another release name. Branches can be modified as "
-"usual. FAI classes of locked branches cannot be modified, just additional "
-"classes are possible. Branch names should be alphanumeric, excluding the "
-"reserved names 'scripts', 'hooks', 'partitions', 'variables', 'templates' "
-"and 'fai'."
-msgstr "Sie sind dabei, einen neuen (evtl. gesperrten) Teilbaum zu erstellen. Diese Aktion klont das existierende Release auf einen anderen Releasenamen. TeilbÃ¤ume kÃ¶nnen wie gewohnt bearbeitet werden. FAI-Klassen von gesperrten TeilbÃ¤umen kÃ¶nnen nicht bearbeitet werden, lediglich das HinzufÃ¼gen von Klassen ist mÃ¶glich.Teilbaumnamen sollten alphanumerisch sein, reservierte Namen sind 'scripts', 'hooks', 'partitions', 'variables', 'templates' und 'fai'. Diese kÃ¶nnen nicht verwendet werden."
-
-#: admin/fai/faiNewBranch.tpl.c:5
-msgid ""
-"Branches are created as subreleases of the currently selected branch. "
-"Creating a new branch named 1.0.2 in SARGE for example, will result in a new"
-" release called SARGE/1.0.2."
-msgstr "TeilbÃ¤ume werden als Subrelease des momentan gewÃ¤hlten Teilbaums erstellt. Wenn Sie bspw. einen neuen Teilbaum namens 1.0.2 in SARGE erstellen, wird dieses Release SARGE/1.0.2 heissen."
-
-#: admin/fai/faiNewBranch.tpl.c:8
-msgid "Please enter a name for the branch"
-msgstr "Bitte geben Sie einen Namen fÃ¼r den Teilbaum ein"
-
-#: admin/fai/faiNewBranch.tpl.c:11
-msgid "Processing the requested operation"
-msgstr "GewÃ¼nschte Operation wird durchgefÃ¼hrt"
-
-#: admin/fai/faiNewBranch.tpl.c:14
-msgid ""
-"As soon as the copy operation has finished, you can scroll down to end of "
-"the page and press the 'Continue' button to continue with the fai management"
-" dialog."
-msgstr "Sobald der Vorgang abgeschlossen wurde, kÃ¶nnen Sie zum unteren Ende der Seite blÃ¤ttern und auf den 'Weiter'-Knopf drÃ¼cken, um zum FAI-Verwaltungs-Dialog zu gelangen."
-
-#: admin/fai/faiNewBranch.tpl.c:17
-msgid ""
-"Your browser doesn't support iframes, please use this link to perform the "
-"requested operation."
-msgstr "Ihr Browser unterstÃ¼tzt keine IFrames - bitte wÃ¤hlen Sie diesen Link, um die gewÃ¼nschte Operation durchzufÃ¼hren."
-
-#: admin/fai/faiNewBranch.tpl.c:20
-msgid "Perform requested operation."
-msgstr "GewÃ¼nschte Operation durchfÃ¼hren."
-
-#: admin/fai/faiNewBranch.tpl.c:23
-msgid "Initiate operation"
-msgstr "Operation initiieren"
-
-#: admin/fai/faiVariableEntry.tpl.c:14 admin/fai/faiVariableEntry.tpl.c:17
-msgid "Variable attributes"
-msgstr "Variablen-Attribute"
-
-#: admin/fai/faiDiskEntry.tpl.c:11
-msgid "fstab key"
-msgstr "fstab-SchlÃ¼ssel"
-
-#: admin/fai/faiDiskEntry.tpl.c:17
-msgid "Disk label"
-msgstr "Disk-Label"
-
-#: admin/fai/faiTemplate.tpl.c:17
-msgid "List of template files"
-msgstr "Liste der Vorlagen"
-
-#: admin/fai/faiVariable.tpl.c:17
-msgid "List of assigned variables"
-msgstr "Liste benutzter Variablen"
-
-#: admin/fai/faiVariable.tpl.c:20
-msgid "Choose a variable to delete or edit"
-msgstr "WÃ¤hlen Sie eine Variable zum Entfernen oder Bearbeiten"
-
-#: admin/fai/askClassName.tpl.c:2
-msgid ""
-"Adding a new class to the FAI management, requires a class name. You have to"
-" specify a unique class name for unique types of FAI classes, while you can "
-"use the same class name for different types of FAI classes. In the laste "
-"case, FAI will automatically enclose all these different class types to one "
-"unique class name."
-msgstr "Es wird ein Klassen-Name benÃ¶tigt, um der FAI-Verwaltung eine neue Klasse hinzuzufÃ¼gen. Dieser Klassen-Name muss lediglich fÃ¼r jeden Typ der FAI-Klasse eindeutig sein, d.h. Sie kÃ¶nnen den gleichen Klassen-Namen fÃ¼r verschiedene Typen von FAI-Klassen verwenden. In diesem Fall wird FAI automatisch all diese verschiedenen Typen mit einem eindeutigen Namen versehen."
-
-#: admin/fai/askClassName.tpl.c:5
-msgid ""
-"Please use one of the following methods to choose the name for the new FAI "
-"class."
-msgstr "Bitte verwenden Sie eine der folgenden Methoden um den Namen der neuen FAI-Klasse zu bestimmen."
-
-#: admin/fai/askClassName.tpl.c:8
-msgid "Enter FAI class name manually"
-msgstr "FAI-Klassen-Name manuell eingeben"
-
-#: admin/fai/askClassName.tpl.c:14
-msgid "Choose FAI class name from a list of existing classes"
-msgstr "Verwenden Sie den Namen aus einer Liste bestehender Klassen."
-
-#: admin/fai/askClassName.tpl.c:20
-msgid "Choose class name"
-msgstr "WÃ¤hlen Sie den Klassen-Namen"
-
-#: admin/fai/faiGroupHandle.tpl.c:2
-msgid "Please select the objects you want to remove:"
-msgstr "Bitte wÃ¤hlen Sie die zu entfernenden Objekte:"
-
-#: admin/fai/faiGroupHandle.tpl.c:5
-msgid "Freezed"
-msgstr "Eingefroren"
-
-#: admin/fai/faiGroupHandle.tpl.c:8
-msgid "Select the object you want to edit:"
-msgstr "WÃ¤hlen Sie die zu bearbeitenden Objekte"
-
-#: admin/fai/faiGroupHandle.tpl.c:11
-msgid "Select the object you want to copy:"
-msgstr "WÃ¤hlen Sie die zu kopierenden Objekte"
-
-#: admin/fai/remove.tpl.c:5
-msgid ""
-"This includes all account data, system access rules, imap settings, etc. for"
-" this user. Please double check if your really want to do this since there "
-"is no way for FusionDirectory to get your data back."
-msgstr "Dies beinhaltet alle Kontendaten, Systemzugangsregeln, Imap-Einstellungen etc. fÃ¼r diesen Benutzer. Bitte Ã¼berprÃ¼fen Sie nochmals ob Sie dies tun wollen, da es keinen Weg fÃ¼r FusionDirectory gibt Ihre Daten zurÃ¼ck zu bekommen."
-
-#: admin/fai/remove.tpl.c:8 admin/fai/remove_branch.tpl.c:8
-msgid "So - if you're sure - press 'Delete' to continue or 'Cancel' to abort."
-msgstr "Wenn Sie sicher sind, drÃ¼cken Sie 'Entfernen' um fortzufahren oder 'Abbrechen' zum Abbruch."
-
-#: admin/fai/faiHook.tpl.c:17
-msgid "List of hook scripts"
-msgstr "Liste der Hook-Skripte"
-
-#: admin/fai/packageSelect/selectPackage-list.tpl.c:2
-#: admin/fai/classSelect/selectClass-list.tpl.c:5
-msgid "Update"
-msgstr "Aktualisieren"
-
-#: admin/fai/packageSelect/selectPackage-list.tpl.c:5
-#: admin/fai/classSelect/selectClass-list.tpl.c:8
-msgid "Submit"
-msgstr "Ãœbertragen"
-
-#: admin/fai/packageSelect/selectPackage-filter.tpl.c:2
-#: admin/fai/classSelect/selectClass-filter.tpl.c:2
-#: admin/fai/fai-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 "Es werden maximal 200 EintrÃ¤ge angezeigt."
-
-#: admin/fai/remove_branch.tpl.c:5
-msgid ""
-"This includes all account data, system access, etc. for this branch. Please "
-"double check if your really want to do this since there is no way for "
-"FusionDirectory to get your data back."
-msgstr "Dies beinhaltet alle Kontendaten, Systemzugang etc. fÃ¼r diesen Zweig. Bitte Ã¼berprÃ¼fen Sie ob Sie dies wirklich tun wollen, da es keinen Weg fÃ¼r FusionDirectory gibt, Ihre Daten zurÃ¼ck zu bekommen."
-
-#: admin/fai/faiPackage.tpl.c:26
-msgid "Install method"
-msgstr "Installations-Methode"
-
-#: admin/fai/faiPackage.tpl.c:29
-msgid "Please select the installation method"
-msgstr "Bitte wÃ¤hlen Sie die Installations-Methode"
-
-#: admin/fai/faiPackage.tpl.c:32 admin/fai/faiPackage.tpl.c:35
-msgid "Used packages"
-msgstr "Verwendete Pakete"
-
-#: admin/fai/faiPackage.tpl.c:38
-msgid "Add from list"
-msgstr "Aus Liste hinzufÃ¼gen"
-
-#: admin/fai/faiProfileEntry.tpl.c:2
-msgid "List of FAI objects (Fully Automatic Installation)"
-msgstr "Liste von FAI-Objekten"
-
-#: admin/fai/faiProfileEntry.tpl.c:5
-msgid "Information"
-msgstr "Information"
-
-#: admin/fai/faiProfileEntry.tpl.c:8
-msgid ""
-"This menu allows you to select FAI class names and to add them to the "
-"currently edited profile."
-msgstr "Dieses MenÃ¼ erlaubt es Ihnen, FAI Klassen-Namen auszuwÃ¤hlen und zum gegenwÃ¤rtig bearbeiteten Profil hinzuzufÃ¼gen."
-
-#: admin/fai/faiProfileEntry.tpl.c:11
-msgid "Filters"
-msgstr "Filter"
-
-#: admin/fai/faiProfileEntry.tpl.c:14
-msgid "Show only classes with templates"
-msgstr "Zeige nur Klassen mit Vorlagen"
-
-#: admin/fai/faiProfileEntry.tpl.c:17
-msgid "Show only classes with scripts"
-msgstr "Zeige nur Klassen mit Skripten"
-
-#: admin/fai/faiProfileEntry.tpl.c:20
-msgid "Show only classes with hooks"
-msgstr "Zeige nur Klassen mit Hooks"
-
-#: admin/fai/faiProfileEntry.tpl.c:23
-msgid "Show only classes with variables"
-msgstr "Zeige nur Klassen mit Variablen"
-
-#: admin/fai/faiProfileEntry.tpl.c:26
-msgid "Show only classes with packages"
-msgstr "Zeige nur Klassen mit Paketen"
-
-#: admin/fai/faiProfileEntry.tpl.c:29
-msgid "Show only classes with partitions"
-msgstr "Zeige nur Klassen mit Partitionen"
-
-#: admin/fai/faiProfileEntry.tpl.c:32 admin/fai/faiProfileEntry.tpl.c:35
-msgid "Display objects matching"
-msgstr "Zeige die Objekte, auf die Folgendes passt"
-
-#: admin/fai/faiProfileEntry.tpl.c:38
-msgid "Regular expression for matching object names"
-msgstr "RegulÃ¤rer Ausdruck zum Erkennen von Objekt-Namen"
-
-#: admin/fai/faiTemplateEntry.tpl.c:17 admin/fai/faiTemplateEntry.tpl.c:20
-msgid "Template attributes"
-msgstr "Vorlagen-Attribute"
-
-#: admin/fai/faiTemplateEntry.tpl.c:26 admin/fai/faiTemplateEntry.tpl.c:29
-msgid "Save template"
-msgstr "Vorlage speichern"
-
-#: admin/fai/faiTemplateEntry.tpl.c:32 admin/fai/faiTemplateEntry.tpl.c:35
-msgid "Edit template"
-msgstr "Vorlage bearbeiten"
-
-#: admin/fai/faiTemplateEntry.tpl.c:38
-msgid "Full path"
-msgstr "Voller Pfad"
-
-#: admin/fai/faiTemplateEntry.tpl.c:41
-msgid "Upload"
-msgstr "Hochladen"
-
-#: admin/fai/faiTemplateEntry.tpl.c:44
-msgid "Owner"
-msgstr "Besitzer"
-
-#: admin/fai/faiTemplateEntry.tpl.c:50
-msgid "Access"
-msgstr "Zugriff"
-
-#: admin/fai/faiTemplateEntry.tpl.c:53
-msgid "Class"
-msgstr "Klasse"
-
-#: admin/fai/faiTemplateEntry.tpl.c:56
-msgid "Read"
-msgstr "Lesen"
-
-#: admin/fai/faiTemplateEntry.tpl.c:59
-msgid "Write"
-msgstr "Schreiben"
-
-#: admin/fai/faiTemplateEntry.tpl.c:62
-msgid "Execute"
-msgstr "AusfÃ¼hren"
-
-#: admin/fai/faiTemplateEntry.tpl.c:65
-msgid "Special"
-msgstr "Speziell"
-
-#: admin/fai/faiTemplateEntry.tpl.c:71
-msgid "SUID"
-msgstr "SUID"
-
-#: admin/fai/faiTemplateEntry.tpl.c:77
-msgid "SGID"
-msgstr "SGID"
-
-#: admin/fai/faiTemplateEntry.tpl.c:80
-msgid "Others"
-msgstr "Andere"
-
-#: admin/fai/faiTemplateEntry.tpl.c:83
-msgid "sticky"
-msgstr "sticky"
-
-#: admin/fai/faiScriptEntry.tpl.c:17 admin/fai/faiScriptEntry.tpl.c:26
-msgid "Script attributes"
-msgstr "Skript-Attribute"
-
-#: admin/fai/faiScriptEntry.tpl.c:23
-msgid ""
-"Choose a priority. Low values result in an earlier, high values in a later "
-"execution."
-msgstr "WÃ¤hlen Sie eine PrioritÃ¤t. Niedrige Werte bedeuten eine frÃ¼he, hÃ¶here Werte eine spÃ¤tere AusfÃ¼hrung."
-
-#: admin/fai/faiScriptEntry.tpl.c:32 admin/fai/faiHookEntry.tpl.c:32
-msgid "Import script"
-msgstr "Skript importieren"
-
-#: admin/fai/classSelect/selectClass-list.tpl.c:2
-msgid "Base"
-msgstr "Basis"
-
-#: admin/fai/fai-filter.tpl.c:29
-msgid "Show profiles"
-msgstr "Zeige Profile"
-
-#: admin/fai/fai-filter.tpl.c:32
-msgid "Show templates"
-msgstr "Zeige Vorlagen"
-
-#: admin/fai/fai-filter.tpl.c:35
-msgid "Show scripts"
-msgstr "Zeige Skripte"
-
-#: admin/fai/fai-filter.tpl.c:38
-msgid "Show hooks"
-msgstr "Zeige Hooks"
-
-#: admin/fai/fai-filter.tpl.c:41
-msgid "Show variables"
-msgstr "Zeige Variablen"
-
-#: admin/fai/fai-filter.tpl.c:44
-msgid "Show packages"
-msgstr "Zeige Pakete"
-
-#: admin/fai/fai-filter.tpl.c:47
-msgid "Show partitions"
-msgstr "Zeige Partitionen"
-
-#: admin/fai/faiTemplateEdit.tpl.c:2
-msgid "This FAI template is write protected. Editing may break it!"
-msgstr "Diese Vorlage ist schreibgeschÃ¼tzt. Eine Bearbeitung kann sie zerstÃ¶ren!"
-
-#: admin/fai/faiTemplateEdit.tpl.c:5
-msgid "Edit anyway"
-msgstr "Trotzdem bearbeiten"
-
-#: admin/fai/faiPartitionTable.tpl.c:14
-msgid "Use 'setup-storage' to partition the disk"
-msgstr "Benutze 'setup-storage' um die Platte zu partitionieren"
-
-#: admin/fai/faiPartitionTable.tpl.c:20
-msgid "Discs"
-msgstr "Festplatten"
-
-#: admin/fai/faiPartitionTable.tpl.c:23 admin/fai/faiPartitionTable.tpl.c:26
-#: admin/fai/faiPartitionTable.tpl.c:41 admin/fai/faiPartitionTable.tpl.c:44
-msgid "Add disk"
-msgstr "Platte hinzufÃ¼gen"
-
-#: admin/fai/faiPartitionTable.tpl.c:29 admin/fai/faiPartitionTable.tpl.c:32
-#: admin/fai/faiPartitionTable.tpl.c:47 admin/fai/faiPartitionTable.tpl.c:50
-msgid "Add RAID"
-msgstr "RAID hinzufÃ¼gen"
-
-#: admin/fai/faiPartitionTable.tpl.c:35 admin/fai/faiPartitionTable.tpl.c:38
-#: admin/fai/faiPartitionTable.tpl.c:53 admin/fai/faiPartitionTable.tpl.c:56
-msgid "Add volume group"
-msgstr "Volume-Gruppe hinzufÃ¼gen"
-
-#: admin/fai/faiScript.tpl.c:17
-msgid "List of scripts"
-msgstr "Liste der Skripte"
-
-#: admin/fai/faiProfile.tpl.c:20
-msgid "Choose a priority"
-msgstr "WÃ¤hlen Sie eine PrioritÃ¤t"
-
-#: admin/fai/faiHookEntry.tpl.c:14 admin/fai/faiHookEntry.tpl.c:17
-#: admin/fai/faiHookEntry.tpl.c:26
-msgid "Hook attributes"
-msgstr "Hook-Attribute"
-
-#: admin/fai/faiHookEntry.tpl.c:23
-msgid "Choose an existing FAI task"
-msgstr "Einen existierenden Task wÃ¤hlen"
diff --git a/fai/locale/el_GR/fusiondirectory.po b/fai/locale/el_GR/fusiondirectory.po
new file mode 100644
index 0000000000000000000000000000000000000000..bc502d7a0e133e66924dae5c6390a1759074a3ce
--- /dev/null
+++ b/fai/locale/el_GR/fusiondirectory.po
@@ -0,0 +1,830 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR FusionDirectory Project
+# This file is distributed under the same license as the PACKAGE package.
+# 
+# Translators:
+msgid ""
+msgstr ""
+"Project-Id-Version: FusionDirectory-109\n"
+"Report-Msgid-Bugs-To: documentation@lists.fusiondirectory.org\n"
+"POT-Creation-Date: 2014-12-15 17:47+0100\n"
+"PO-Revision-Date: 2015-05-30 11:45+0000\n"
+"Last-Translator: Benoit Mortier <benoit.mortier@opensides.be>\n"
+"Language-Team: Greek (Greece) (http://www.transifex.com/projects/p/FusionDirectory-109/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/fai/class_faiManagement.inc:117 admin/fai/class_faiManagement.inc:122
+#: admin/fai/packageSelect/selectPackage-list.xml:14
+#: admin/systems/class_faiStartup.inc:178 config/fai/class_faiConfig.inc:41
+msgid "FAI"
+msgstr ""
+
+#: admin/fai/class_faiManagement.inc:118
+msgid "Manage FAI software packages and deployment recipes"
+msgstr ""
+
+#: admin/fai/class_faiPackage.inc:157
+msgid "Mark for installation"
+msgstr ""
+
+#: admin/fai/class_faiPackage.inc:161
+msgid "Mark for removal"
+msgstr ""
+
+#: admin/fai/class_faiPackage.inc:166
+msgid "Edit configuration"
+msgstr ""
+
+#: admin/fai/class_faiPackage.inc:247
+#: admin/fai/class_faiPartitionTable.inc:209
+#: admin/fai/class_faiPartitionTable.inc:250
+#: admin/fai/class_faiTemplate.inc:114
+#: admin/systems/services/repository/class_serviceDebianRepository.inc:172
+#: admin/systems/services/repository/class_serviceDebianRepository.inc:189
+#: admin/systems/services/repository/class_serviceDebianRepository.inc:193
+msgid "LDAP error"
+msgstr ""
+
+#: admin/fai/class_faiPackage.inc:279
+#: admin/fai/packageSelect/class_filterFAIPackages.inc:41
+#: admin/fai/packageSelect/class_filterFAIPackages.inc:46
+#: admin/fai/class_faiPackageConfiguration.inc:55
+#: admin/systems/class_faiStartup.inc:133
+#: admin/systems/class_faiStartup.inc:160
+msgid "Service infrastructure"
+msgstr ""
+
+#: admin/fai/class_faiPackage.inc:294
+msgid "Unkown packages"
+msgstr ""
+
+#: admin/fai/class_faiPackage.inc:365
+msgid "Package"
+msgstr ""
+
+#: admin/fai/class_faiPackage.inc:366
+msgid "FAI Package list"
+msgstr ""
+
+#: admin/fai/class_faiPackage.inc:369
+msgid "FAI Package"
+msgstr ""
+
+#: admin/fai/class_faiPackage.inc:385
+#: admin/fai/class_faiPartitionTable.inc:304
+#: admin/fai/class_faiTemplateEntry.inc:140 admin/fai/class_faiProfile.inc:47
+#: admin/fai/class_faiScript.inc:50 admin/fai/class_faiTemplate.inc:173
+#: admin/fai/class_faiHook.inc:50 admin/fai/class_faiVariable.inc:50
+msgid "Properties"
+msgstr ""
+
+#: admin/fai/class_faiPackage.inc:388
+#: admin/fai/class_faiPartitionTable.inc:307 admin/fai/class_faiProfile.inc:50
+#: admin/fai/class_faiScript.inc:53 admin/fai/class_faiTemplate.inc:176
+#: admin/fai/class_faiHook.inc:53 admin/fai/class_faiVariable.inc:53
+msgid "Class name"
+msgstr ""
+
+#: admin/fai/class_faiPackage.inc:388 admin/fai/class_faiScript.inc:53
+#: admin/fai/class_faiHook.inc:53 admin/fai/class_faiVariable.inc:53
+msgid "Variables class name"
+msgstr ""
+
+#: admin/fai/class_faiPackage.inc:392
+#: admin/fai/class_faiPartitionTable.inc:311
+#: admin/fai/class_faiDiskEntry.inc:738
+#: admin/fai/class_faiTemplateEntry.inc:147 admin/fai/class_faiProfile.inc:54
+#: admin/fai/class_faiScript.inc:57 admin/fai/class_faiScript.inc:75
+#: admin/fai/class_faiTemplate.inc:180 admin/fai/class_faiHook.inc:57
+#: admin/fai/class_faiHook.inc:75 admin/fai/class_faiVariable.inc:57
+#: admin/fai/class_faiVariable.inc:75
+msgid "Description"
+msgstr ""
+
+#: admin/fai/class_faiPackage.inc:392
+#: admin/fai/class_faiPartitionTable.inc:311 admin/fai/class_faiProfile.inc:54
+#: admin/fai/class_faiScript.inc:57 admin/fai/class_faiTemplate.inc:180
+#: admin/fai/class_faiHook.inc:57 admin/fai/class_faiVariable.inc:57
+msgid "Short description of the class"
+msgstr ""
+
+#: admin/fai/class_faiPackage.inc:398 admin/systems/class_faiStartup.inc:90
+msgid "Repository"
+msgstr ""
+
+#: admin/fai/class_faiPackage.inc:401 admin/systems/class_faiStartup.inc:78
+#: admin/systems/services/repository/class_serviceDebianRepository.inc:52
+#: admin/systems/services/repository/class_serviceCentosRepository.inc:49
+msgid "Release"
+msgstr ""
+
+#: admin/fai/class_faiPackage.inc:401
+msgid "Debian release concerned"
+msgstr ""
+
+#: admin/fai/class_faiPackage.inc:405
+#: admin/systems/services/repository/class_serviceDebianRepository.inc:58
+msgid "Sections"
+msgstr ""
+
+#: admin/fai/class_faiPackage.inc:405
+msgid "Sections concerned"
+msgstr ""
+
+#: admin/fai/class_faiPackage.inc:409
+msgid "Install method"
+msgstr ""
+
+#: admin/fai/class_faiPackage.inc:409
+msgid "Install method to use for this package list"
+msgstr ""
+
+#: admin/fai/class_faiPackage.inc:420
+msgid "Packages"
+msgstr ""
+
+#: admin/fai/class_faiPackage.inc:424
+msgid "Packages in this class"
+msgstr ""
+
+#: admin/fai/class_faiPartitionTable.inc:61
+#: admin/fai/class_faiDiskEntry.inc:442 admin/systems/class_faiLogView.inc:207
+#: admin/systems/class_faiLogView.inc:242
+msgid "Error"
+msgstr ""
+
+#: admin/fai/class_faiPartitionTable.inc:112
+msgid "Add RAID"
+msgstr ""
+
+#: admin/fai/class_faiPartitionTable.inc:116
+msgid "Add LVM"
+msgstr ""
+
+#: admin/fai/class_faiPartitionTable.inc:284
+msgid "Partition table"
+msgstr ""
+
+#: admin/fai/class_faiPartitionTable.inc:285
+#: admin/fai/class_faiPartitionTable.inc:288
+msgid "FAI partition table"
+msgstr ""
+
+#: admin/fai/class_faiPartitionTable.inc:307 admin/fai/class_faiProfile.inc:50
+msgid "Partition table class name"
+msgstr ""
+
+#: admin/fai/class_faiPartitionTable.inc:317
+msgid "Discs"
+msgstr ""
+
+#: admin/fai/class_faiPartitionTable.inc:324
+msgid "Partitions in this class"
+msgstr ""
+
+#: admin/fai/class_faiDiskEntry.inc:273
+msgid "Device"
+msgstr ""
+
+#: admin/fai/class_faiDiskEntry.inc:273
+msgid "Label"
+msgstr ""
+
+#: admin/fai/class_faiDiskEntry.inc:273
+msgid "UUID"
+msgstr ""
+
+#: admin/fai/class_faiDiskEntry.inc:344
+msgid "Disks"
+msgstr ""
+
+#: admin/fai/class_faiDiskEntry.inc:347 admin/fai/class_faiPartition.inc:319
+msgid "Size"
+msgstr ""
+
+#: admin/fai/class_faiDiskEntry.inc:443
+#, php-format
+msgid ""
+"The disk cannot be deleted while it is used in the '%s' disk definition!"
+msgstr ""
+
+#: admin/fai/class_faiDiskEntry.inc:536
+msgid "encrypted"
+msgstr ""
+
+#: admin/fai/class_faiDiskEntry.inc:539
+msgid "bootable"
+msgstr ""
+
+#: admin/fai/class_faiDiskEntry.inc:542
+msgid "preserve"
+msgstr ""
+
+#: admin/fai/class_faiDiskEntry.inc:687 admin/fai/class_faiDiskEntry.inc:690
+#: admin/fai/class_faiDiskEntry.inc:737
+#: admin/fai/packageSelect/selectPackage-list.xml:40
+#: admin/fai/class_faiScript.inc:71 admin/fai/class_faiHook.inc:71
+#: admin/fai/class_faiVariable.inc:71
+#: admin/fai/class_faiSimplePluginClass.inc:50
+msgid "Name"
+msgstr ""
+
+#: admin/fai/class_faiDiskEntry.inc:717
+msgid ""
+"You have more than four primary partition table entries in your "
+"configuration, please check your configuration twice."
+msgstr ""
+
+#: admin/fai/class_faiDiskEntry.inc:721
+msgid ""
+"You cannot have more than three primary partition while using logical "
+"partitions, please check your configuration twice."
+msgstr ""
+
+#: admin/fai/class_faiDiskEntry.inc:733
+msgid "Partition table entry"
+msgstr ""
+
+#: admin/fai/class_faiDiskEntry.inc:734
+msgid "FAI partition table entry"
+msgstr ""
+
+#: admin/fai/class_faiDiskEntry.inc:739
+msgid "Disk options"
+msgstr ""
+
+#: admin/fai/class_faiDiskEntry.inc:740
+msgid "Partition type"
+msgstr ""
+
+#: admin/fai/class_faiDiskEntry.inc:741
+msgid "Partition no."
+msgstr ""
+
+#: admin/fai/class_faiDiskEntry.inc:742
+msgid "File system type"
+msgstr ""
+
+#: admin/fai/class_faiDiskEntry.inc:743 admin/fai/class_faiPartition.inc:432
+msgid "Mount point"
+msgstr ""
+
+#: admin/fai/class_faiDiskEntry.inc:744 admin/fai/class_faiPartition.inc:397
+#: admin/fai/class_faiPartition.inc:402
+msgid "Partition size"
+msgstr ""
+
+#: admin/fai/class_faiDiskEntry.inc:745
+msgid "Mount options"
+msgstr ""
+
+#: admin/fai/class_faiDiskEntry.inc:746
+msgid "File system options"
+msgstr ""
+
+#: admin/fai/class_faiDiskEntry.inc:747
+msgid "Partition flags"
+msgstr ""
+
+#: admin/fai/class_debconfTemplate.inc:225
+msgid "This package has no debconf options."
+msgstr ""
+
+#: admin/fai/class_debconfTemplate.inc:262
+msgid ""
+"This debconf question is 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_faiTemplateEntry.inc:143
+msgid "File path"
+msgstr ""
+
+#: admin/fai/class_faiTemplateEntry.inc:143
+msgid "Complete absolute template file path and name"
+msgstr ""
+
+#: admin/fai/class_faiTemplateEntry.inc:147
+msgid "Short description of the file"
+msgstr ""
+
+#: admin/fai/class_faiTemplateEntry.inc:156
+msgid "Template attributes"
+msgstr ""
+
+#: admin/fai/class_faiTemplateEntry.inc:160
+msgid "Template file content"
+msgstr ""
+
+#: admin/fai/class_faiTemplateEntry.inc:160
+msgid "Content of the template file"
+msgstr ""
+
+#: admin/fai/class_faiTemplateEntry.inc:164
+msgid "Owner and group of the file"
+msgstr ""
+
+#: admin/fai/class_faiTemplateEntry.inc:167
+msgid "Owner"
+msgstr ""
+
+#: admin/fai/class_faiTemplateEntry.inc:167
+msgid "File owner"
+msgstr ""
+
+#: admin/fai/class_faiTemplateEntry.inc:172
+msgid "Group"
+msgstr ""
+
+#: admin/fai/class_faiTemplateEntry.inc:172
+msgid "File group"
+msgstr ""
+
+#: admin/fai/class_faiTemplateEntry.inc:181
+msgid "Access"
+msgstr ""
+
+#: admin/fai/class_faiTemplateEntry.inc:181
+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:28
+msgid "Profile"
+msgstr ""
+
+#: admin/fai/class_faiProfile.inc:29
+msgid "FAI profile"
+msgstr ""
+
+#: admin/fai/class_faiProfile.inc:32
+msgid "FAI Profile"
+msgstr ""
+
+#: admin/fai/class_faiProfile.inc:61
+msgid "FAI classes"
+msgstr ""
+
+#: admin/fai/class_faiProfile.inc:61
+msgid "FAI classes which are part of this profile"
+msgstr ""
+
+#: admin/fai/class_faiPackageConfiguration.inc:88
+#, php-format
+msgid "Debconf information for package '%s'"
+msgstr ""
+
+#: admin/fai/class_faiScript.inc:30 admin/fai/class_faiScript.inc:84
+#: admin/fai/class_faiHook.inc:87
+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:67
+#: admin/fai/class_faiVariable.inc:67
+msgid "Variables in this class"
+msgstr ""
+
+#: admin/fai/class_faiScript.inc:71 admin/fai/class_faiHook.inc:71
+#: admin/fai/class_faiVariable.inc:71
+msgid "The name of the variable"
+msgstr ""
+
+#: admin/fai/class_faiScript.inc:75 admin/fai/class_faiHook.inc:75
+#: admin/fai/class_faiVariable.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 (FIXME: less 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:153
+msgid "Template"
+msgstr ""
+
+#: admin/fai/class_faiTemplate.inc:154 admin/fai/class_faiTemplate.inc:157
+msgid "FAI template"
+msgstr ""
+
+#: admin/fai/class_faiTemplate.inc:176
+msgid "Template class name"
+msgstr ""
+
+#: admin/fai/class_faiTemplate.inc:186
+msgid "Template files"
+msgstr ""
+
+#: admin/fai/class_faiTemplate.inc:190
+msgid "Template files in this class"
+msgstr ""
+
+#: admin/fai/class_faiPartition.inc:176 admin/fai/class_faiPartition.inc:180
+msgid "Logical"
+msgstr ""
+
+#: admin/fai/class_faiPartition.inc:179
+msgid "Primary"
+msgstr ""
+
+#: admin/fai/class_faiPartition.inc:185
+msgid "RAID 0"
+msgstr ""
+
+#: admin/fai/class_faiPartition.inc:186
+msgid "RAID 1"
+msgstr ""
+
+#: admin/fai/class_faiPartition.inc:187
+msgid "RAID 5"
+msgstr ""
+
+#: admin/fai/class_faiPartition.inc:188
+msgid "RAID 6"
+msgstr ""
+
+#: admin/fai/class_faiPartition.inc:195
+msgid "fixed"
+msgstr ""
+
+#: admin/fai/class_faiPartition.inc:196
+msgid "dynamic"
+msgstr ""
+
+#: admin/fai/class_faiPartition.inc:197
+msgid "remaining space"
+msgstr ""
+
+#: admin/fai/class_faiPartition.inc:202
+msgid "KB"
+msgstr ""
+
+#: admin/fai/class_faiPartition.inc:203
+msgid "MB"
+msgstr ""
+
+#: admin/fai/class_faiPartition.inc:204
+msgid "GB"
+msgstr ""
+
+#: admin/fai/class_faiPartition.inc:205
+msgid "TB"
+msgstr ""
+
+#: admin/fai/class_faiPartition.inc:206
+msgid "PB"
+msgstr ""
+
+#: admin/fai/class_faiPartition.inc:207
+msgid "%"
+msgstr ""
+
+#: admin/fai/class_faiPartition.inc:212
+msgid "always"
+msgstr ""
+
+#: admin/fai/class_faiPartition.inc:213
+msgid "reinstall"
+msgstr ""
+
+#: admin/fai/class_faiPartition.inc:217
+msgid "swap space"
+msgstr ""
+
+#: admin/fai/class_faiPartition.inc:218
+msgid "ext2"
+msgstr ""
+
+#: admin/fai/class_faiPartition.inc:219
+msgid "ext3"
+msgstr ""
+
+#: admin/fai/class_faiPartition.inc:220
+msgid "ext4"
+msgstr ""
+
+#: admin/fai/class_faiPartition.inc:221
+msgid "reiser fs"
+msgstr ""
+
+#: admin/fai/class_faiPartition.inc:222
+msgid "xfs"
+msgstr ""
+
+#: admin/fai/class_faiPartition.inc:223
+msgid "btrfs"
+msgstr ""
+
+#: admin/fai/class_faiPartition.inc:325
+msgid "spare"
+msgstr ""
+
+#: admin/fai/class_faiPartition.inc:328
+msgid "missing"
+msgstr ""
+
+#: admin/fai/class_faiPartition.inc:331
+msgid "Options"
+msgstr ""
+
+#: admin/fai/class_faiPartition.inc:415
+msgid "Minimum partition size"
+msgstr ""
+
+#: admin/fai/class_faiPartition.inc:415
+msgid "Maximum partition size"
+msgstr ""
+
+#: admin/fai/class_faiPartition.inc:423
+msgid "Raid arrays must contain at least two partitions!"
+msgstr ""
+
+#: admin/fai/class_faiPartition.inc:425
+msgid ""
+"Raid 0 arrays can only be realized with a combination of two partitions!"
+msgstr ""
+
+#: admin/fai/class_faiHook.inc:30
+msgid "Hook"
+msgstr ""
+
+#: admin/fai/class_faiHook.inc:31 admin/fai/class_faiHook.inc:34
+msgid "FAI hook"
+msgstr ""
+
+#: admin/fai/class_faiHook.inc:63
+msgid "Hooks"
+msgstr ""
+
+#: admin/fai/class_faiHook.inc:79
+msgid "Task"
+msgstr ""
+
+#: admin/fai/class_faiHook.inc:87
+msgid "The script of this hook"
+msgstr ""
+
+#: admin/fai/class_faiVariable.inc:30
+msgid "Variable"
+msgstr ""
+
+#: admin/fai/class_faiVariable.inc:31 admin/fai/class_faiVariable.inc:34
+msgid "FAI variable"
+msgstr ""
+
+#: admin/fai/class_faiVariable.inc:63
+msgid "Variables"
+msgstr ""
+
+#: admin/fai/class_faiVariable.inc:79
+msgid "Content"
+msgstr ""
+
+#: admin/fai/class_faiVariable.inc:79
+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:222
+msgid "Selected file"
+msgstr ""
+
+#: admin/systems/class_faiLogView.inc:230
+#, php-format
+msgid "Selected file: %s"
+msgstr ""
+
+#: admin/systems/class_faiStartup.inc:70
+msgid "FAI settings"
+msgstr ""
+
+#: admin/systems/class_faiStartup.inc:74
+msgid "FAI profil and release to be applied to this computer"
+msgstr ""
+
+#: admin/systems/class_faiStartup.inc:78
+msgid "FAI debian release to be installed on this computer"
+msgstr ""
+
+#: admin/systems/class_faiStartup.inc:82
+msgid "Profil"
+msgstr ""
+
+#: admin/systems/class_faiStartup.inc:82
+msgid "FAI profil to be applied to this computer"
+msgstr ""
+
+#: admin/systems/class_faiStartup.inc:90
+msgid "FAI Debian repository to be used for installation"
+msgstr ""
+
+#: admin/systems/class_faiStartup.inc:96
+msgid "Startup parameters"
+msgstr ""
+
+#: admin/systems/class_faiStartup.inc:99
+msgid "Boot kernel"
+msgstr ""
+
+#: admin/systems/class_faiStartup.inc:99
+msgid "Linux kernel to be installed and booted"
+msgstr ""
+
+#: admin/systems/class_faiStartup.inc:103
+msgid "Boot kernel parameters"
+msgstr ""
+
+#: admin/systems/class_faiStartup.inc:103
+msgid "Linux kernel parameters to be ran"
+msgstr ""
+
+#: admin/systems/class_faiStartup.inc:179
+msgid "Full automated installation"
+msgstr ""
+
+#: admin/systems/services/repository/class_serviceDebianRepository.inc:34
+#: admin/systems/services/repository/class_serviceCentosRepository.inc:31
+msgid "Repositories"
+msgstr ""
+
+#: admin/systems/services/repository/class_serviceDebianRepository.inc:39
+#: admin/systems/services/repository/class_serviceCentosRepository.inc:36
+msgid "Repositories this server hosts"
+msgstr ""
+
+#: admin/systems/services/repository/class_serviceDebianRepository.inc:43
+#: admin/systems/services/repository/class_serviceCentosRepository.inc:40
+msgid "URL"
+msgstr ""
+
+#: admin/systems/services/repository/class_serviceDebianRepository.inc:43
+#: admin/systems/services/repository/class_serviceCentosRepository.inc:40
+msgid "Repository url"
+msgstr ""
+
+#: admin/systems/services/repository/class_serviceDebianRepository.inc:47
+#: admin/systems/services/repository/class_serviceCentosRepository.inc:44
+msgid "Parent server"
+msgstr ""
+
+#: admin/systems/services/repository/class_serviceDebianRepository.inc:47
+#: admin/systems/services/repository/class_serviceCentosRepository.inc:44
+msgid "Parent repository server"
+msgstr ""
+
+#: admin/systems/services/repository/class_serviceDebianRepository.inc:52
+msgid "Debian release used on this repository"
+msgstr ""
+
+#: admin/systems/services/repository/class_serviceDebianRepository.inc:58
+msgid "Debian sections available on this repository"
+msgstr ""
+
+#: admin/systems/services/repository/class_serviceDebianRepository.inc:63
+#: admin/systems/services/repository/class_serviceCentosRepository.inc:57
+msgid "Mirror mode"
+msgstr ""
+
+#: admin/systems/services/repository/class_serviceDebianRepository.inc:63
+#: admin/systems/services/repository/class_serviceCentosRepository.inc:57
+msgid ""
+"Is this mirror an installation repository? Is its release a custom one?"
+msgstr ""
+
+#: admin/systems/services/repository/class_serviceDebianRepository.inc:68
+#: admin/systems/services/repository/class_serviceCentosRepository.inc:62
+msgid "Local mirror"
+msgstr ""
+
+#: admin/systems/services/repository/class_serviceDebianRepository.inc:68
+#: admin/systems/services/repository/class_serviceCentosRepository.inc:62
+msgid "Is this mirror a local or a network mirror?"
+msgstr ""
+
+#: admin/systems/services/repository/class_serviceDebianRepository.inc:77
+#: admin/systems/services/repository/class_serviceCentosRepository.inc:71
+msgid "Architectures"
+msgstr ""
+
+#: admin/systems/services/repository/class_serviceDebianRepository.inc:77
+#: admin/systems/services/repository/class_serviceCentosRepository.inc:71
+msgid "Processor architectures available on this repository"
+msgstr ""
+
+#: admin/systems/services/repository/class_serviceDebianRepository.inc:99
+#: admin/systems/services/repository/class_serviceDebianRepository.inc:100
+msgid "Debian repository"
+msgstr ""
+
+#: admin/systems/services/repository/class_serviceDebianRepository.inc:100
+#: admin/systems/services/repository/class_serviceCentosRepository.inc:96
+msgid "Services"
+msgstr ""
+
+#: admin/systems/services/repository/class_serviceCentosRepository.inc:49
+msgid "Centos release used on this repository"
+msgstr ""
+
+#: admin/systems/services/repository/class_serviceCentosRepository.inc:95
+#: admin/systems/services/repository/class_serviceCentosRepository.inc:96
+msgid "Centos repository"
+msgstr ""
+
+#: config/fai/class_faiConfig.inc:28
+msgid "FAI configuration"
+msgstr ""
+
+#: config/fai/class_faiConfig.inc:29
+msgid "FusionDirectory fai plugin configuration"
+msgstr ""
+
+#: config/fai/class_faiConfig.inc:44
+msgid "Fai base RDN"
+msgstr ""
+
+#: config/fai/class_faiConfig.inc:44
+msgid "Branch in which fai branches will be stored"
+msgstr ""
+
+#: config/fai/class_faiConfig.inc:59
+#, php-format
+msgid "Fai %s RDN"
+msgstr ""
+
+#: config/fai/class_faiConfig.inc:60
+#, php-format
+msgid "Relative branch in which fai %s will be stored"
+msgstr ""
+
+#: config/fai/class_faiConfig.inc:60
+msgid "s"
+msgstr ""
diff --git a/fai/locale/en/fusiondirectory.po b/fai/locale/en/fusiondirectory.po
index 0db8565128bc5e22a88b39b72801a5c4a88c7058..9f4b37a0648fc67022e4a369153394b7a08e453a 100644
--- a/fai/locale/en/fusiondirectory.po
+++ b/fai/locale/en/fusiondirectory.po
@@ -6,378 +6,196 @@
 #, fuzzy
 msgid ""
 msgstr ""
-"Project-Id-Version: PACKAGE VERSION\n"
-"Report-Msgid-Bugs-To: documentation@lists.fusiondirectory.org\n"
-"POT-Creation-Date: 2015-03-31 11:49+0200\n"
+"Project-Id-Version: FusionDirectory VERSION\n"
+"Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
+"POT-Creation-Date: 2015-05-30 15:30+0200\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
-"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
-"Language-Team: LANGUAGE <LL@li.org>\n"
-"Language: \n"
+"Last-Translator: FusionDirectory project <contact@fusiondirectory.org>\n"
+"Language-Team: English\n"
+"Language: en\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: admin/fai/class_faiScriptEntry.inc:79 admin/fai/class_faiScriptEntry.inc:82
-#: admin/fai/class_faiManagement.inc:240 admin/fai/class_faiManagement.inc:768
-#: admin/fai/class_faiManagement.inc:774
-#: admin/fai/class_faiPartitionTable.inc:268
-#: admin/fai/class_faiPartitionTable.inc:331
-#: admin/fai/class_faiDiskEntry.inc:445 admin/fai/class_FAI.inc:570
-#: admin/fai/class_faiHookEntry.inc:83 admin/fai/class_faiHookEntry.inc:86
-#: admin/fai/class_faiScript.inc:249 admin/fai/class_faiTemplate.inc:232
-#: admin/fai/class_faiHook.inc:259 admin/fai/class_faiVariable.inc:162
-#: admin/systems/class_faiLogView.inc:207
-#: admin/systems/class_faiLogView.inc:242
-msgid "Error"
-msgstr ""
-
-#: admin/fai/class_faiScriptEntry.inc:82 admin/fai/class_faiHookEntry.inc:86
-msgid "file is empty"
-msgstr ""
-
-#: admin/fai/class_faiScriptEntry.inc:102 admin/fai/class_faiHookEntry.inc:102
-#: admin/fai/class_faiScript.inc:349 admin/fai/class_faiScript.inc:374
-#: admin/fai/class_faiTemplate.inc:320 admin/fai/class_faiHook.inc:346
-msgid "Download"
-msgstr ""
-
-#: admin/fai/class_faiScriptEntry.inc:147
-#: admin/fai/class_faiScriptEntry.inc:151
-#: admin/fai/class_faiScriptEntry.inc:154
-#: admin/fai/class_faiScriptEntry.inc:197
-#: admin/fai/class_faiManagement.inc:768 admin/fai/class_faiManagement.inc:774
-#: admin/fai/class_faiPackage.inc:686
-#: admin/fai/class_faiPartitionTable.inc:780
-#: admin/fai/class_faiDiskEntry.inc:702 admin/fai/class_faiDiskEntry.inc:705
-#: admin/fai/class_faiDiskEntry.inc:758
-#: admin/fai/class_faiTemplateEntry.inc:247
-#: admin/fai/class_faiTemplateEntry.inc:312
-#: admin/fai/class_faiPartitionTableEntry.inc:353
-#: admin/fai/class_faiPartitionTableEntry.inc:356
-#: admin/fai/class_faiPartitionTableEntry.inc:360
-#: admin/fai/class_faiPartitionTableEntry.inc:455
-#: admin/fai/packageSelect/selectPackage-list.xml:40
-#: admin/fai/class_faiProfile.inc:414 admin/fai/class_faiProfile.inc:464
-#: admin/fai/class_faiHookEntry.inc:157 admin/fai/class_faiHookEntry.inc:162
-#: admin/fai/class_faiHookEntry.inc:165 admin/fai/class_faiHookEntry.inc:207
-#: admin/fai/class_askClassName.inc:163 admin/fai/class_askClassName.inc:167
-#: admin/fai/class_askClassName.inc:171 admin/fai/class_askClassName.inc:198
-#: admin/fai/class_faiScript.inc:347 admin/fai/class_faiScript.inc:606
-#: admin/fai/classSelect/selectClass-list.xml:28
-#: admin/fai/class_faiTemplate.inc:513
-#: admin/fai/class_faiVariableEntry.inc:103
-#: admin/fai/class_faiVariableEntry.inc:112
-#: admin/fai/class_faiVariableEntry.inc:115
-#: admin/fai/class_faiVariableEntry.inc:149 admin/fai/class_faiHook.inc:532
-#: admin/fai/class_faiVariable.inc:399 admin/fai/fai-list.xml:80
-#: admin/fai/faiPartitionTableEntry.tpl.c:8 admin/fai/faiPartition.tpl.c:5
-#: admin/fai/faiVariableEntry.tpl.c:8 admin/fai/faiDiskEntry.tpl.c:8
-#: admin/fai/faiTemplate.tpl.c:8 admin/fai/faiVariable.tpl.c:8
-#: admin/fai/faiHook.tpl.c:8
-#: admin/fai/packageSelect/selectPackage-filter.tpl.c:8
-#: admin/fai/faiPackage.tpl.c:8 admin/fai/faiScriptEntry.tpl.c:8
-#: admin/fai/classSelect/selectClass-filter.tpl.c:5
-#: admin/fai/fai-filter.tpl.c:50 admin/fai/faiPartitionTable.tpl.c:8
-#: admin/fai/faiScript.tpl.c:8 admin/fai/faiProfile.tpl.c:8
-#: admin/fai/faiHookEntry.tpl.c:8
-msgid "Name"
-msgstr ""
-
-#: admin/fai/class_faiScriptEntry.inc:159 admin/fai/class_faiHookEntry.inc:170
-#: admin/fai/class_faiScript.inc:594 admin/fai/fai-list.xml:122
-#: admin/fai/faiScriptEntry.tpl.c:29 admin/fai/faiHookEntry.tpl.c:29
-msgid "Script"
-msgstr ""
-
-#: admin/fai/class_faiScriptEntry.inc:190
-#: admin/fai/class_faiScriptEntry.inc:199
-msgid "Script entry"
-msgstr ""
-
-#: admin/fai/class_faiScriptEntry.inc:191
-msgid "FAI script entry"
-msgstr ""
-
-#: admin/fai/class_faiScriptEntry.inc:198 admin/fai/class_faiPackage.inc:687
-#: admin/fai/class_faiPartitionTable.inc:781
-#: admin/fai/class_faiDiskEntry.inc:759
-#: admin/fai/class_faiTemplateEntry.inc:313
-#: admin/fai/class_faiPartitionTableEntry.inc:456
-#: admin/fai/class_faiProfile.inc:465 admin/fai/class_faiHookEntry.inc:208
-#: admin/fai/class_faiScript.inc:607 admin/fai/class_faiTemplate.inc:514
-#: admin/fai/class_faiVariableEntry.inc:150 admin/fai/class_faiHook.inc:533
-#: admin/fai/class_faiVariable.inc:400
-#: admin/fai/faiPartitionTableEntry.tpl.c:11 admin/fai/faiPartition.tpl.c:11
-#: admin/fai/faiVariableEntry.tpl.c:11 admin/fai/faiDiskEntry.tpl.c:14
-#: admin/fai/faiTemplate.tpl.c:11 admin/fai/faiVariable.tpl.c:11
-#: admin/fai/faiHook.tpl.c:11 admin/fai/faiPackage.tpl.c:11
-#: admin/fai/faiTemplateEntry.tpl.c:14 admin/fai/faiScriptEntry.tpl.c:11
-#: admin/fai/faiPartitionTable.tpl.c:11 admin/fai/faiScript.tpl.c:11
-#: admin/fai/faiProfile.tpl.c:11 admin/fai/faiHookEntry.tpl.c:11
-msgid "Description"
-msgstr ""
-
-#: admin/fai/class_faiScriptEntry.inc:200
-msgid "Script Priority"
-msgstr ""
-
-#: admin/fai/class_faiManagement.inc:188
-msgid "partition table"
-msgstr ""
-
-#: admin/fai/class_faiManagement.inc:189 admin/fai/fai-list.xml:31
-msgid "script"
-msgstr ""
-
-#: admin/fai/class_faiManagement.inc:190 admin/fai/fai-list.xml:47
-msgid "hook"
-msgstr ""
-
-#: admin/fai/class_faiManagement.inc:191 admin/fai/fai-list.xml:39
-msgid "variable"
-msgstr ""
-
-#: admin/fai/class_faiManagement.inc:192 admin/fai/fai-list.xml:63
-msgid "template"
-msgstr ""
-
-#: admin/fai/class_faiManagement.inc:193
-msgid "package list"
-msgstr ""
-
-#: admin/fai/class_faiManagement.inc:210 admin/fai/class_faiManagement.inc:226
-#: admin/fai/class_faiManagement.inc:332 admin/fai/class_faiManagement.inc:390
-#: admin/fai/class_faiManagement.inc:480 admin/fai/class_faiManagement.inc:575
-#: admin/fai/class_faiManagement.inc:598 admin/fai/class_faiManagement.inc:619
-msgid "Permission error"
-msgstr ""
-
-#: admin/fai/class_faiManagement.inc:211 admin/fai/class_faiManagement.inc:226
-#, php-format
-msgid "You have no permission to create a new %s!"
-msgstr ""
-
-#: admin/fai/class_faiManagement.inc:226 admin/fai/fai-list.xml:55
-msgid "profile"
-msgstr ""
-
-#: admin/fai/class_faiManagement.inc:328
-msgid "Branch locked"
-msgstr ""
-
-#: admin/fai/class_faiManagement.inc:329
-#, php-format
-msgid "The following entries are locked, you can't remove them %s."
-msgstr ""
-
-#: admin/fai/class_faiManagement.inc:346
-msgid "FAI object"
-msgstr ""
-
-#: admin/fai/class_faiManagement.inc:477
-msgid "FAI branch/freeze"
-msgstr ""
-
-#: admin/fai/class_faiManagement.inc:480
-msgid "You have no permission to delete this release!"
-msgstr ""
-
-#: admin/fai/class_faiManagement.inc:496 admin/fai/remove.tpl.c:2
-#: admin/fai/remove_branch.tpl.c:2
-msgid "Warning"
-msgstr ""
-
-#: admin/fai/class_faiManagement.inc:496
-msgid "Release remove aborted because the release name check failed!"
-msgstr ""
-
-#: admin/fai/class_faiManagement.inc:573 admin/fai/class_faiManagement.inc:596
-msgid "Configuration"
-msgstr ""
-
-#: admin/fai/class_faiManagement.inc:575 admin/fai/class_faiManagement.inc:598
-#: admin/fai/class_faiManagement.inc:619
-msgid "Branch"
+#: admin/fai/class_faiManagement.inc:117 admin/fai/class_faiManagement.inc:122
+#: admin/fai/packageSelect/selectPackage-list.xml:14
+#: admin/systems/class_faiStartup.inc:177 config/fai/class_faiConfig.inc:41
+msgid "FAI"
 msgstr ""
 
-#: admin/fai/class_faiManagement.inc:725 admin/fai/askClassName.tpl.c:23
-msgid "Continue"
+#: admin/fai/class_faiManagement.inc:118
+msgid "Manage FAI software packages and deployment recipes"
 msgstr ""
 
-#: admin/fai/class_faiManagement.inc:926
-#: admin/fai/class_faiPartitionTable.inc:768
-#: admin/fai/class_faiProfile.inc:318 admin/fai/class_askClassName.inc:99
-#: admin/fai/classSelect/class_classSelect.inc:58
-#: admin/fai/class_faiGroupHandle.inc:120
-#: admin/fai/class_faiProfileEntry.inc:163 admin/fai/fai-list.xml:146
-msgid "Partition table"
+#: admin/fai/class_faiManagement.inc:138
+msgid "There are no FAI branches"
 msgstr ""
 
-#: admin/fai/class_faiManagement.inc:928
-#: admin/fai/class_faiGroupHandle.inc:122 admin/fai/fai-list.xml:140
-msgid "Package list"
+#: admin/fai/class_faiManagement.inc:141
+msgid " Please add at least one repository service to create those."
 msgstr ""
 
-#: admin/fai/class_faiManagement.inc:930
-#: admin/fai/class_faiGroupHandle.inc:124
-msgid "Scripts"
+#: admin/fai/class_faiPackage.inc:157
+msgid "Mark for installation"
 msgstr ""
 
-#: admin/fai/class_faiManagement.inc:932
-#: admin/fai/class_faiGroupHandle.inc:126
-msgid "Variables"
+#: admin/fai/class_faiPackage.inc:161
+msgid "Mark for removal"
 msgstr ""
 
-#: admin/fai/class_faiManagement.inc:934
-#: admin/fai/class_faiGroupHandle.inc:128
-msgid "Hooks"
+#: admin/fai/class_faiPackage.inc:166
+msgid "Edit configuration"
 msgstr ""
 
-#: admin/fai/class_faiManagement.inc:936 admin/fai/class_faiProfile.inc:454
-#: admin/fai/class_askClassName.inc:104 admin/fai/class_faiGroupHandle.inc:130
-#: admin/fai/fai-list.xml:110
-msgid "Profile"
+#: admin/fai/class_faiPackage.inc:247
+#: 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:214
+#: admin/systems/services/repository/class_serviceRepository.inc:231
+#: admin/systems/services/repository/class_serviceRepository.inc:235
+msgid "LDAP error"
 msgstr ""
 
-#: admin/fai/class_faiManagement.inc:938
-#: admin/fai/class_faiGroupHandle.inc:132
-msgid "Templates"
+#: admin/fai/class_faiPackage.inc:279
+#: admin/fai/packageSelect/class_filterFAIPackages.inc:41
+#: admin/fai/packageSelect/class_filterFAIPackages.inc:46
+#: admin/fai/class_faiPackageConfiguration.inc:55
+#: admin/systems/class_faiStartup.inc:132
+#: admin/systems/class_faiStartup.inc:159
+msgid "Infrastructure service"
 msgstr ""
 
-#: admin/fai/class_faiManagement.inc:1039
-#: admin/fai/class_faiManagement.inc:1045
-#: admin/fai/packageSelect/selectPackage-list.xml:14
-#: admin/fai/classSelect/selectClass-list.xml:15
-#: admin/systems/class_faiStartup.inc:177 config/fai/class_faiConfig.inc:41
-msgid "FAI"
+#: admin/fai/class_faiPackage.inc:294
+msgid "Unkown packages"
 msgstr ""
 
-#: admin/fai/class_faiManagement.inc:1040
-msgid "Manage FAI software packages and deployment recipes"
+#: admin/fai/class_faiPackage.inc:365
+#: admin/fai/faiPackageConfiguration.tpl.c:2
+msgid "Package"
 msgstr ""
 
-#: admin/fai/class_faiPackage.inc:261
-msgid "Invalid package names"
+#: admin/fai/class_faiPackage.inc:366
+msgid "FAI Package list"
 msgstr ""
 
-#: admin/fai/class_faiPackage.inc:262
-#, php-format
-msgid "The following package names don't match the Debian policy: %s"
+#: admin/fai/class_faiPackage.inc:369
+msgid "FAI Package"
 msgstr ""
 
-#: admin/fai/class_faiPackage.inc:421 admin/fai/class_faiPackage.inc:422
-msgid "Configured"
+#: admin/fai/class_faiPackage.inc:385
+#: admin/fai/class_faiPartitionTable.inc:304
+#: admin/fai/class_faiTemplateEntry.inc:140 admin/fai/class_faiProfile.inc:49
+#: admin/fai/class_faiScript.inc:50 admin/fai/class_faiTemplate.inc:173
+#: admin/fai/class_faiHook.inc:50 admin/fai/class_faiVariable.inc:50
+msgid "Properties"
 msgstr ""
 
-#: admin/fai/class_faiPackage.inc:428 admin/fai/class_faiPackage.inc:429
-msgid "Package marked for removal"
+#: admin/fai/class_faiPackage.inc:388
+#: admin/fai/class_faiPartitionTable.inc:307 admin/fai/class_faiProfile.inc:52
+#: admin/fai/class_faiScript.inc:53 admin/fai/class_faiTemplate.inc:176
+#: admin/fai/class_faiHook.inc:53 admin/fai/class_faiVariable.inc:53
+msgid "Class name"
 msgstr ""
 
-#: admin/fai/class_faiPackage.inc:445
-msgid "Mark package for removal"
+#: admin/fai/class_faiPackage.inc:388 admin/fai/class_faiScript.inc:53
+#: admin/fai/class_faiHook.inc:53 admin/fai/class_faiVariable.inc:53
+msgid "Variables class name"
 msgstr ""
 
-#: admin/fai/class_faiPackage.inc:451
-msgid "Configure this package"
+#: admin/fai/class_faiPackage.inc:392
+#: admin/fai/class_faiPartitionTable.inc:311
+#: admin/fai/class_faiDiskEntry.inc:742
+#: admin/fai/class_faiTemplateEntry.inc:147 admin/fai/class_faiProfile.inc:56
+#: admin/fai/class_faiScript.inc:57 admin/fai/class_faiScript.inc:75
+#: admin/fai/class_faiTemplate.inc:180 admin/fai/class_faiHook.inc:57
+#: admin/fai/class_faiHook.inc:75 admin/fai/class_faiVariable.inc:57
+#: admin/fai/class_faiVariable.inc:75 admin/fai/faiPartition.tpl.c:11
+#: admin/fai/faiDiskEntry.tpl.c:14
+msgid "Description"
 msgstr ""
 
-#: admin/fai/class_faiPackage.inc:455
-msgid "Remove this package"
+#: admin/fai/class_faiPackage.inc:392
+#: admin/fai/class_faiPartitionTable.inc:311 admin/fai/class_faiProfile.inc:56
+#: admin/fai/class_faiScript.inc:57 admin/fai/class_faiTemplate.inc:180
+#: admin/fai/class_faiHook.inc:57 admin/fai/class_faiVariable.inc:57
+msgid "Short description of the class"
 msgstr ""
 
-#: admin/fai/class_faiPackage.inc:534
-msgid "Please select a least one package!"
+#: admin/fai/class_faiPackage.inc:398 admin/systems/class_faiStartup.inc:90
+msgid "Repository"
 msgstr ""
 
-#: admin/fai/class_faiPackage.inc:538
-msgid ""
-"Please choose a valid release/section combination for your repository setup!"
+#: admin/fai/class_faiPackage.inc:401 admin/systems/class_faiStartup.inc:78
+#: admin/systems/services/repository/class_serviceRepository.inc:40
+msgid "Release"
 msgstr ""
 
-#: admin/fai/class_faiPackage.inc:571
-#: admin/fai/packageSelect/class_filterFAIPackages.inc:41
-#: admin/fai/packageSelect/class_filterFAIPackages.inc:46
-#: admin/fai/class_faiPackageConfiguration.inc:55
-#: admin/systems/class_faiStartup.inc:132
-#: admin/systems/class_faiStartup.inc:159
-msgid "Infrastructure service"
+#: admin/fai/class_faiPackage.inc:401
+msgid "Debian release concerned"
 msgstr ""
 
-#: admin/fai/class_faiPackage.inc:587
-msgid "Unkown packages"
+#: admin/fai/class_faiPackage.inc:405
+#: admin/systems/services/repository/class_serviceRepository.inc:47
+msgid "Sections"
 msgstr ""
 
-#: admin/fai/class_faiPackage.inc:674
-#: admin/fai/faiPackageConfiguration.tpl.c:2
-msgid "Package"
+#: admin/fai/class_faiPackage.inc:405
+msgid "Sections concerned"
 msgstr ""
 
-#: admin/fai/class_faiPackage.inc:675
-msgid "FAI Package list"
+#: admin/fai/class_faiPackage.inc:409
+msgid "Install method"
 msgstr ""
 
-#: admin/fai/class_faiPackage.inc:679
-msgid "FAI Package"
+#: admin/fai/class_faiPackage.inc:409
+msgid "Install method to use for this package list"
 msgstr ""
 
-#: admin/fai/class_faiPackage.inc:688
+#: admin/fai/class_faiPackage.inc:420
 msgid "Packages"
 msgstr ""
 
-#: admin/fai/class_faiPackage.inc:689 admin/fai/faiPackage.tpl.c:23
-msgid "Section"
+#: admin/fai/class_faiPackage.inc:424
+msgid "Packages in this class"
 msgstr ""
 
-#: admin/fai/class_faiPackage.inc:689 admin/fai/class_faiPackage.inc:692
-#: admin/fai/class_faiScript.inc:606 admin/fai/class_faiTemplate.inc:513
-msgid "Readonly"
+#: admin/fai/class_faiPartitionTable.inc:61
+#: admin/fai/class_faiDiskEntry.inc:442 admin/systems/class_faiLogView.inc:207
+#: admin/systems/class_faiLogView.inc:242
+msgid "Error"
 msgstr ""
 
-#: admin/fai/class_faiPackage.inc:690
-msgid "Install Method"
+#: admin/fai/class_faiPartitionTable.inc:112
+msgid "Add RAID"
 msgstr ""
 
-#: admin/fai/class_faiPackage.inc:691
-msgid "Package configuration"
+#: admin/fai/class_faiPartitionTable.inc:116
+msgid "Add LVM"
 msgstr ""
 
-#: admin/fai/class_faiPackage.inc:692 admin/systems/class_faiStartup.inc:78
-#: admin/systems/services/repository/class_serviceRepository.inc:40
-#: admin/fai/branch_selector.tpl.c:14 admin/fai/faiPackage.tpl.c:20
-#: admin/fai/fai-filter.tpl.c:5 admin/fai/fai-filter.tpl.c:14
-msgid "Release"
-msgstr ""
-
-#: admin/fai/class_faiPartitionTable.inc:269
-#: admin/fai/class_faiDiskEntry.inc:446
-#, php-format
-msgid ""
-"The disk cannot be deleted while it is used in the '%s' disk definition!"
+#: admin/fai/class_faiPartitionTable.inc:284
+msgid "Partition table"
 msgstr ""
 
-#: admin/fai/class_faiPartitionTable.inc:416 admin/fai/class_faiScript.inc:360
-#: admin/fai/class_faiScript.inc:362 admin/fai/class_faiTemplate.inc:306
-#: admin/fai/class_faiTemplate.inc:308
-msgid "edit"
+#: admin/fai/class_faiPartitionTable.inc:285
+#: admin/fai/class_faiPartitionTable.inc:288
+msgid "FAI partition table"
 msgstr ""
 
-#: admin/fai/class_faiPartitionTable.inc:418 admin/fai/class_faiScript.inc:364
-#: admin/fai/class_faiTemplate.inc:310
-msgid "delete"
+#: admin/fai/class_faiPartitionTable.inc:307 admin/fai/class_faiProfile.inc:52
+msgid "Partition table class name"
 msgstr ""
 
-#: admin/fai/class_faiPartitionTable.inc:769
-#: admin/fai/class_faiPartitionTable.inc:773
-msgid "FAI partition table"
+#: admin/fai/class_faiPartitionTable.inc:317
+msgid "Discs"
 msgstr ""
 
-#: admin/fai/class_faiPartitionTable.inc:780 admin/fai/class_faiHook.inc:532
-#: admin/fai/class_faiVariable.inc:399
-msgid "Read only"
+#: admin/fai/class_faiPartitionTable.inc:324
+msgid "Partitions in this class"
 msgstr ""
 
-#: admin/fai/class_faiDiskEntry.inc:273
-#: admin/fai/faiPartitionTableEntry.tpl.c:5 admin/fai/faiDiskEntry.tpl.c:5
+#: admin/fai/class_faiDiskEntry.inc:273 admin/fai/faiDiskEntry.tpl.c:5
 msgid "Device"
 msgstr ""
 
@@ -389,103 +207,107 @@ msgstr ""
 msgid "UUID"
 msgstr ""
 
-#: admin/fai/class_faiDiskEntry.inc:345
+#: admin/fai/class_faiDiskEntry.inc:344
 msgid "Disks"
 msgstr ""
 
-#: admin/fai/class_faiDiskEntry.inc:348 admin/fai/class_faiPartition.inc:321
+#: admin/fai/class_faiDiskEntry.inc:347 admin/fai/class_faiPartition.inc:321
 #: admin/fai/faiPartition.tpl.c:14
 msgid "Size"
 msgstr ""
 
-#: admin/fai/class_faiDiskEntry.inc:544
+#: admin/fai/class_faiDiskEntry.inc:443
+#, php-format
+msgid ""
+"The disk cannot be deleted while it is used in the '%s' disk definition!"
+msgstr ""
+
+#: admin/fai/class_faiDiskEntry.inc:536
 msgid "encrypted"
 msgstr ""
 
-#: admin/fai/class_faiDiskEntry.inc:547
+#: admin/fai/class_faiDiskEntry.inc:539
 msgid "bootable"
 msgstr ""
 
-#: admin/fai/class_faiDiskEntry.inc:550
+#: admin/fai/class_faiDiskEntry.inc:542
 msgid "preserve"
 msgstr ""
 
-#: admin/fai/class_faiDiskEntry.inc:735
+#: admin/fai/class_faiDiskEntry.inc:691 admin/fai/class_faiDiskEntry.inc:694
+#: admin/fai/class_faiDiskEntry.inc:741
+#: admin/fai/packageSelect/selectPackage-list.xml:40
+#: admin/fai/class_faiScript.inc:71 admin/fai/class_faiHook.inc:71
+#: admin/fai/class_faiVariable.inc:71
+#: admin/fai/class_faiSimplePluginClass.inc:50 admin/fai/faiPartition.tpl.c:5
+#: admin/fai/faiDiskEntry.tpl.c:8
+#: admin/fai/packageSelect/selectPackage-filter.tpl.c:8
+msgid "Name"
+msgstr ""
+
+#: admin/fai/class_faiDiskEntry.inc:721
 msgid ""
 "You have more than four primary partition table entries in your "
 "configuration, please check your configuration twice."
 msgstr ""
 
-#: admin/fai/class_faiDiskEntry.inc:739
+#: admin/fai/class_faiDiskEntry.inc:725
 msgid ""
 "You cannot have more than three primary partition while using logical "
 "partitions, please check your configuration twice."
 msgstr ""
 
-#: admin/fai/class_faiDiskEntry.inc:752
-#: admin/fai/class_faiPartitionTableEntry.inc:448
+#: admin/fai/class_faiDiskEntry.inc:737
 msgid "Partition table entry"
 msgstr ""
 
-#: admin/fai/class_faiDiskEntry.inc:753
-#: admin/fai/class_faiPartitionTableEntry.inc:449
+#: admin/fai/class_faiDiskEntry.inc:738
 msgid "FAI partition table entry"
 msgstr ""
 
-#: admin/fai/class_faiDiskEntry.inc:760
+#: admin/fai/class_faiDiskEntry.inc:743
 msgid "Disk options"
 msgstr ""
 
-#: admin/fai/class_faiDiskEntry.inc:761
-#: admin/fai/class_faiPartitionTableEntry.inc:457
+#: admin/fai/class_faiDiskEntry.inc:744
 msgid "Partition type"
 msgstr ""
 
-#: admin/fai/class_faiDiskEntry.inc:762
-#: admin/fai/class_faiPartitionTableEntry.inc:458
+#: admin/fai/class_faiDiskEntry.inc:745
 msgid "Partition no."
 msgstr ""
 
-#: admin/fai/class_faiDiskEntry.inc:763
-#: admin/fai/class_faiPartitionTableEntry.inc:459
+#: admin/fai/class_faiDiskEntry.inc:746
 msgid "File system type"
 msgstr ""
 
-#: admin/fai/class_faiDiskEntry.inc:764
-#: admin/fai/class_faiPartitionTableEntry.inc:171
-#: admin/fai/class_faiPartitionTableEntry.inc:460
-#: admin/fai/class_faiPartition.inc:437 admin/fai/faiPartition.tpl.c:47
+#: admin/fai/class_faiDiskEntry.inc:747 admin/fai/class_faiPartition.inc:437
+#: admin/fai/faiPartition.tpl.c:47
 msgid "Mount point"
 msgstr ""
 
-#: admin/fai/class_faiDiskEntry.inc:765
-#: admin/fai/class_faiPartitionTableEntry.inc:461
-#: admin/fai/class_faiPartition.inc:402 admin/fai/class_faiPartition.inc:407
+#: admin/fai/class_faiDiskEntry.inc:748 admin/fai/class_faiPartition.inc:402
+#: admin/fai/class_faiPartition.inc:407
 msgid "Partition size"
 msgstr ""
 
-#: admin/fai/class_faiDiskEntry.inc:766
-#: admin/fai/class_faiPartitionTableEntry.inc:173
-#: admin/fai/class_faiPartitionTableEntry.inc:462
-#: admin/fai/faiPartition.tpl.c:50
+#: admin/fai/class_faiDiskEntry.inc:749 admin/fai/faiPartition.tpl.c:50
 msgid "Mount options"
 msgstr ""
 
-#: admin/fai/class_faiDiskEntry.inc:767
-#: admin/fai/class_faiPartitionTableEntry.inc:463
+#: admin/fai/class_faiDiskEntry.inc:750
 msgid "File system options"
 msgstr ""
 
-#: admin/fai/class_faiDiskEntry.inc:768
-#: admin/fai/class_faiPartitionTableEntry.inc:464
+#: admin/fai/class_faiDiskEntry.inc:751
 msgid "Partition flags"
 msgstr ""
 
-#: admin/fai/class_debconfTemplate.inc:227
+#: admin/fai/class_debconfTemplate.inc:225
 msgid "This package has no debconf options."
 msgstr ""
 
-#: admin/fai/class_debconfTemplate.inc:264
+#: admin/fai/class_debconfTemplate.inc:262
 msgid ""
 "This debconf question is dynamically generated during package installation "
 "and requires choosing between specific options which cannot be presented "
@@ -493,217 +315,59 @@ msgid ""
 "effect."
 msgstr ""
 
-#: admin/fai/class_faiTemplateEntry.inc:139
-msgid "no file uploaded yet"
+#: admin/fai/class_faiTemplateEntry.inc:143
+msgid "File path"
 msgstr ""
 
-#: admin/fai/class_faiTemplateEntry.inc:142
-#, php-format
-msgid "exists in database (size: %s bytes)"
-msgstr ""
-
-#: admin/fai/class_faiTemplateEntry.inc:251
-#: admin/systems/class_faiLogView.inc:70 admin/fai/faiTemplateEntry.tpl.c:23
-msgid "File"
+#: admin/fai/class_faiTemplateEntry.inc:143
+msgid "Complete absolute template file path and name"
 msgstr ""
 
-#: admin/fai/class_faiTemplateEntry.inc:255
-#: admin/fai/faiTemplateEntry.tpl.c:11
-msgid "Destination path"
+#: admin/fai/class_faiTemplateEntry.inc:147
+msgid "Short description of the file"
 msgstr ""
 
-#: admin/fai/class_faiTemplateEntry.inc:260 admin/fai/faiTemplateEntry.tpl.c:8
-msgid "File name"
-msgstr ""
-
-#: admin/fai/class_faiTemplateEntry.inc:264
-#: admin/fai/class_faiTemplateEntry.inc:266
-#: admin/fai/faiTemplateEntry.tpl.c:68
-msgid "User"
-msgstr ""
-
-#: admin/fai/class_faiTemplateEntry.inc:270
-#: admin/fai/class_faiTemplateEntry.inc:273
-#: admin/fai/class_faiTemplateEntry.inc:275
-#: admin/fai/faiTemplateEntry.tpl.c:47 admin/fai/faiTemplateEntry.tpl.c:74
-msgid "Group"
+#: admin/fai/class_faiTemplateEntry.inc:156
+msgid "Template attributes"
 msgstr ""
 
-#: admin/fai/class_faiTemplateEntry.inc:305
-msgid "Template entry"
+#: admin/fai/class_faiTemplateEntry.inc:160
+msgid "Template file content"
 msgstr ""
 
-#: admin/fai/class_faiTemplateEntry.inc:306
-msgid "FAI template entry"
+#: admin/fai/class_faiTemplateEntry.inc:160
+msgid "Content of the template file"
 msgstr ""
 
-#: admin/fai/class_faiTemplateEntry.inc:314
-msgid "Template file"
+#: admin/fai/class_faiTemplateEntry.inc:164
+msgid "Owner and group of the file"
 msgstr ""
 
-#: admin/fai/class_faiTemplateEntry.inc:315
-msgid "Template path"
+#: admin/fai/class_faiTemplateEntry.inc:167
+msgid "Owner"
 msgstr ""
 
-#: admin/fai/class_faiTemplateEntry.inc:316
+#: admin/fai/class_faiTemplateEntry.inc:167
 msgid "File owner"
 msgstr ""
 
-#: admin/fai/class_faiTemplateEntry.inc:317
-msgid "File permissions"
-msgstr ""
-
-#: admin/fai/class_FAI.inc:287 admin/fai/class_FAI.inc:679
-#: admin/fai/class_FAI.inc:1266 admin/fai/class_FAI.inc:1283
-#: admin/fai/class_FAI.inc:1287
-msgid "LDAP error"
-msgstr ""
-
-#: admin/fai/class_FAI.inc:570
-#, php-format
-msgid "Error, following objects should be equal '%s' and '%s'"
-msgstr ""
-
-#: admin/fai/class_FAI.inc:891
-#, php-format
-msgid "Creating group application release for %s"
-msgstr ""
-
-#: admin/fai/class_FAI.inc:960 admin/fai/class_FAI.inc:982
-#: admin/fai/class_FAI.inc:1022 admin/fai/class_FAI.inc:1027
-#: admin/fai/class_FAI.inc:1065
-msgid "Object"
-msgstr ""
-
-#: admin/fai/class_FAI.inc:961
-#, php-format
-msgid "Adding missing group application release container %s."
-msgstr ""
-
-#: admin/fai/class_FAI.inc:983
-#, php-format
-msgid "Adding group application release container %s."
-msgstr ""
-
-#: admin/fai/class_FAI.inc:1023
-#, php-format
-msgid "Could not create menu entry %s. (Already exists)."
-msgstr ""
-
-#: admin/fai/class_FAI.inc:1028
-#, php-format
-msgid "Created group application menu entry for %s."
-msgstr ""
-
-#: admin/fai/class_FAI.inc:1059
-#, php-format
-msgid "Creating copy of %s"
-msgstr ""
-
-#: admin/fai/class_FAI.inc:1062
-msgid "Processing"
-msgstr ""
-
-#: admin/fai/class_FAI.inc:1080
-msgid "Could not create new release, the destination dn is already in use."
-msgstr ""
-
-#: admin/fai/class_FAI.inc:1093
-msgid "Error while fetching source dn - aborted!"
-msgstr ""
-
-#: admin/fai/class_FAI.inc:1174
-msgid "Fatal error"
-msgstr ""
-
-#: admin/fai/class_FAI.inc:1175
-#, php-format
-msgid ""
-"Release creation failed due to ldap errors. Additional informations '%s'."
-msgstr ""
-
-#: admin/fai/class_faiPartitionTableEntry.inc:162
-msgid "primary"
-msgstr ""
-
-#: admin/fai/class_faiPartitionTableEntry.inc:162
-msgid "logical"
-msgstr ""
-
-#: admin/fai/class_faiPartitionTableEntry.inc:169
-#: admin/fai/faiPartition.tpl.c:8
-msgid "Type"
-msgstr ""
-
-#: admin/fai/class_faiPartitionTableEntry.inc:170
-msgid "FS type"
-msgstr ""
-
-#: admin/fai/class_faiPartitionTableEntry.inc:172
-msgid "Size in MB"
-msgstr ""
-
-#: admin/fai/class_faiPartitionTableEntry.inc:174
-msgid "FS option"
-msgstr ""
-
-#: admin/fai/class_faiPartitionTableEntry.inc:175
-#: admin/fai/faiPartition.tpl.c:23
-msgid "Preserve"
-msgstr ""
-
-#: admin/fai/class_faiPartitionTableEntry.inc:266
-msgid "False"
-msgstr ""
-
-#: admin/fai/class_faiPartitionTableEntry.inc:268
-msgid "True"
-msgstr ""
-
-#: admin/fai/class_faiPartitionTableEntry.inc:272
-#: admin/fai/class_faiPartitionTableEntry.inc:274 admin/fai/fai-list.xml:159
-#: admin/fai/fai-list.xml:198
-msgid "Remove"
-msgstr ""
-
-#: admin/fai/class_faiPartitionTableEntry.inc:384
-#, php-format
-msgid "please enter a unique mount point for partition %s"
-msgstr ""
-
-#: admin/fai/class_faiPartitionTableEntry.inc:389
-#, php-format
-msgid "partition %s mount point"
-msgstr ""
-
-#: admin/fai/class_faiPartitionTableEntry.inc:394
-#, php-format
-msgid ""
-"File system type 'swap' is already used, change file system type for "
-"partition %s."
+#: admin/fai/class_faiTemplateEntry.inc:172
+msgid "Group"
 msgstr ""
 
-#: admin/fai/class_faiPartitionTableEntry.inc:398
-msgid "Please use 'swap' as mount point, if 'swap' is used as fs-type."
+#: admin/fai/class_faiTemplateEntry.inc:172
+msgid "File group"
 msgstr ""
 
-#: admin/fai/class_faiPartitionTableEntry.inc:404
-#: admin/fai/class_faiPartitionTableEntry.inc:408
-#: admin/fai/class_faiPartitionTableEntry.inc:414
-#: admin/fai/class_faiPartitionTableEntry.inc:416
-#: admin/fai/class_faiPartitionTableEntry.inc:421
-#, php-format
-msgid "partition %s size"
+#: admin/fai/class_faiTemplateEntry.inc:181
+msgid "Access"
 msgstr ""
 
-#: admin/fai/class_faiPartitionTableEntry.inc:436
-msgid ""
-"You have more than 3 primary partition table entries in your configuration, "
-"please check your configuration twice."
+#: admin/fai/class_faiTemplateEntry.inc:181
+msgid "Access rights"
 msgstr ""
 
 #: admin/fai/packageSelect/selectPackage-list.xml:10
-#: admin/fai/classSelect/selectClass-list.xml:11
 msgid "Please select the desired entries"
 msgstr ""
 
@@ -711,147 +375,94 @@ msgstr ""
 msgid "Version"
 msgstr ""
 
-#: admin/fai/class_faiProfile.inc:310
-msgid "This list displays all assigned class names for this profile."
-msgstr ""
-
-#: admin/fai/class_faiProfile.inc:313 admin/fai/class_askClassName.inc:103
-#: admin/fai/classSelect/class_classSelect.inc:53
-#: admin/fai/class_faiProfileEntry.inc:158
-msgid "Hook bundle"
-msgstr ""
-
-#: admin/fai/class_faiProfile.inc:314 admin/fai/class_askClassName.inc:105
-#: admin/fai/classSelect/class_classSelect.inc:54
-#: admin/fai/class_faiProfileEntry.inc:159
-msgid "Template bundle"
-msgstr ""
-
-#: admin/fai/class_faiProfile.inc:315 admin/fai/class_askClassName.inc:101
-#: admin/fai/classSelect/class_classSelect.inc:55
-#: admin/fai/class_faiProfileEntry.inc:160
-msgid "Script bundle"
-msgstr ""
-
-#: admin/fai/class_faiProfile.inc:316 admin/fai/class_askClassName.inc:102
-#: admin/fai/classSelect/class_classSelect.inc:56
-#: admin/fai/class_faiProfileEntry.inc:161
-msgid "Variable bundle"
-msgstr ""
-
-#: admin/fai/class_faiProfile.inc:317 admin/fai/class_askClassName.inc:100
-#: admin/fai/classSelect/class_classSelect.inc:57
-#: admin/fai/class_faiProfileEntry.inc:162
-msgid "Package bundle"
-msgstr ""
-
-#: admin/fai/class_faiProfile.inc:321
-msgid "Remove class from profile"
-msgstr ""
-
-#: admin/fai/class_faiProfile.inc:324
-msgid "Up"
-msgstr ""
-
-#: admin/fai/class_faiProfile.inc:325
-msgid "Down"
-msgstr ""
-
-#: admin/fai/class_faiProfile.inc:410
-msgid "No class specified for this profile!"
-msgstr ""
-
-#: admin/fai/class_faiProfile.inc:419
-msgid "You can't use the same name for a class and a profile!"
+#: admin/fai/class_faiProfile.inc:30
+msgid "Profile"
 msgstr ""
 
-#: admin/fai/class_faiProfile.inc:455
+#: admin/fai/class_faiProfile.inc:31
 msgid "FAI profile"
 msgstr ""
 
-#: admin/fai/class_faiProfile.inc:458
+#: admin/fai/class_faiProfile.inc:34
 msgid "FAI Profile"
 msgstr ""
 
-#: admin/fai/class_faiProfile.inc:466 admin/fai/faiProfile.tpl.c:17
+#: admin/fai/class_faiProfile.inc:63
 msgid "FAI classes"
 msgstr ""
 
-#: admin/fai/class_faiHookEntry.inc:200
-msgid "Hook entry"
+#: admin/fai/class_faiProfile.inc:63
+msgid "FAI classes which are part of this profile"
 msgstr ""
 
-#: admin/fai/class_faiHookEntry.inc:201
-msgid "FAI hook entry"
+#: admin/fai/class_faiPackageConfiguration.inc:88
+#, php-format
+msgid "Debconf information for package '%s'"
 msgstr ""
 
-#: admin/fai/class_faiHookEntry.inc:209 admin/fai/faiHookEntry.tpl.c:20
-msgid "Task"
+#: admin/fai/class_faiScript.inc:30 admin/fai/class_faiScript.inc:84
+#: admin/fai/class_faiHook.inc:87
+msgid "Script"
 msgstr ""
 
-#: admin/fai/class_faiHookEntry.inc:210 admin/fai/class_faiScript.inc:595
-#: admin/fai/class_faiScript.inc:599
+#: admin/fai/class_faiScript.inc:31 admin/fai/class_faiScript.inc:34
 msgid "FAI script"
 msgstr ""
 
-#: admin/fai/class_faiPackageConfiguration.inc:88
-#, php-format
-msgid "Debconf information for package '%s'"
+#: admin/fai/class_faiScript.inc:63
+msgid "Scripts"
 msgstr ""
 
-#: admin/fai/class_askClassName.inc:99 admin/fai/class_askClassName.inc:100
-#: admin/fai/class_askClassName.inc:101 admin/fai/class_askClassName.inc:102
-#: admin/fai/class_askClassName.inc:103 admin/fai/class_askClassName.inc:104
-#: admin/fai/class_askClassName.inc:105 admin/fai/class_askClassName.inc:106
-msgid "Create new FAI object"
+#: admin/fai/class_faiScript.inc:67 admin/fai/class_faiHook.inc:67
+#: admin/fai/class_faiVariable.inc:67
+msgid "Variables in this class"
 msgstr ""
 
-#: admin/fai/class_faiTemplateEdit.inc:80
-#, php-format
-msgid ""
-"The file encodig has changed from '%s' to '%s'. Do you really want to save?"
+#: admin/fai/class_faiScript.inc:71 admin/fai/class_faiHook.inc:71
+#: admin/fai/class_faiVariable.inc:71
+msgid "The name of the variable"
 msgstr ""
 
-#: admin/fai/class_faiScript.inc:333 admin/fai/class_faiScript.inc:335
-msgid "Sort direction"
+#: admin/fai/class_faiScript.inc:75 admin/fai/class_faiHook.inc:75
+#: admin/fai/class_faiVariable.inc:75
+msgid "A short description of the variable"
 msgstr ""
 
-#: admin/fai/class_faiScript.inc:348 admin/fai/faiScriptEntry.tpl.c:20
+#: admin/fai/class_faiScript.inc:79
 msgid "Priority"
 msgstr ""
 
-#: admin/fai/class_faiScript.inc:350
-msgid "Action"
+#: admin/fai/class_faiScript.inc:79
+msgid "Priority of this script (FIXME: less is done first?)"
 msgstr ""
 
-#: admin/fai/classSelect/selectClass-list.xml:36 admin/fai/fai-list.xml:88
-#: admin/fai/faiScriptEntry.tpl.c:14
-msgid "Properties"
+#: admin/fai/class_faiScript.inc:84
+msgid "The script itself"
 msgstr ""
 
-#: admin/fai/class_faiTemplate.inc:501 admin/fai/fai-list.xml:116
-msgid "Template"
+#: admin/fai/class_faiTemplate.inc:136
+#, php-format
+msgid "There are several files with the same path: %s"
 msgstr ""
 
-#: admin/fai/class_faiTemplate.inc:502 admin/fai/class_faiTemplate.inc:506
-msgid "FAI template"
+#: admin/fai/class_faiTemplate.inc:153
+msgid "Template"
 msgstr ""
 
-#: admin/fai/class_faiVariableEntry.inc:107
-msgid "Content"
+#: admin/fai/class_faiTemplate.inc:154 admin/fai/class_faiTemplate.inc:157
+msgid "FAI template"
 msgstr ""
 
-#: admin/fai/class_faiVariableEntry.inc:142
-msgid "Variable entry"
+#: admin/fai/class_faiTemplate.inc:176
+msgid "Template class name"
 msgstr ""
 
-#: admin/fai/class_faiVariableEntry.inc:143
-msgid "FAI variable entry "
+#: admin/fai/class_faiTemplate.inc:186
+msgid "Template files"
 msgstr ""
 
-#: admin/fai/class_faiVariableEntry.inc:151
-#: admin/fai/faiVariableEntry.tpl.c:20
-msgid "Variable content"
+#: admin/fai/class_faiTemplate.inc:190
+msgid "Template files in this class"
 msgstr ""
 
 #: admin/fai/class_faiPartition.inc:176 admin/fai/class_faiPartition.inc:180
@@ -983,61 +594,44 @@ msgid ""
 "Raid 0 arrays can only be realized with a combination of two partitions!"
 msgstr ""
 
-#: admin/fai/class_faiHook.inc:332 admin/fai/class_faiHook.inc:334
-#: admin/fai/fai-list.xml:190 admin/fai/faiVariable.tpl.c:23
-#: admin/fai/faiVariable.tpl.c:26
-msgid "Edit"
-msgstr ""
-
-#: admin/fai/class_faiHook.inc:336
-msgid "Delete"
-msgstr ""
-
-#: admin/fai/class_faiHook.inc:521 admin/fai/fai-list.xml:128
+#: admin/fai/class_faiHook.inc:30
 msgid "Hook"
 msgstr ""
 
-#: admin/fai/class_faiHook.inc:522 admin/fai/class_faiHook.inc:526
+#: admin/fai/class_faiHook.inc:31 admin/fai/class_faiHook.inc:34
 msgid "FAI hook"
 msgstr ""
 
-#: admin/fai/class_faiVariable.inc:387 admin/fai/fai-list.xml:134
-msgid "Variable"
-msgstr ""
-
-#: admin/fai/class_faiVariable.inc:388 admin/fai/class_faiVariable.inc:392
-msgid "FAI variable"
+#: admin/fai/class_faiHook.inc:63
+msgid "Hooks"
 msgstr ""
 
-#: admin/fai/class_faiProfileEntry.inc:184 admin/fai/askClassName.tpl.c:11
-#: admin/fai/askClassName.tpl.c:17 admin/fai/paste_generic.tpl.c:5
-msgid "Class name"
+#: admin/fai/class_faiHook.inc:79
+msgid "Task"
 msgstr ""
 
-#: admin/fai/class_faiProfileEntry.inc:184 admin/fai/faiTemplate.tpl.c:14
-#: admin/fai/faiVariable.tpl.c:14 admin/fai/faiHook.tpl.c:14
-#: admin/fai/faiPartitionTable.tpl.c:17 admin/fai/faiScript.tpl.c:14
-msgid "Objects"
+#: admin/fai/class_faiHook.inc:87
+msgid "The script of this hook"
 msgstr ""
 
-#: admin/fai/fai-list.xml:11
-msgid "List of deployment classes and products"
+#: admin/fai/class_faiVariable.inc:30
+msgid "Variable"
 msgstr ""
 
-#: admin/fai/fai-list.xml:15
-msgid "partitionTable"
+#: admin/fai/class_faiVariable.inc:31 admin/fai/class_faiVariable.inc:34
+msgid "FAI variable"
 msgstr ""
 
-#: admin/fai/fai-list.xml:23
-msgid "packagelist"
+#: admin/fai/class_faiVariable.inc:63
+msgid "Variables"
 msgstr ""
 
-#: admin/fai/fai-list.xml:93
-msgid "Actions"
+#: admin/fai/class_faiVariable.inc:79
+msgid "Content"
 msgstr ""
 
-#: admin/fai/fai-list.xml:104
-msgid "Create"
+#: admin/fai/class_faiVariable.inc:79
+msgid "The content of the variable"
 msgstr ""
 
 #: admin/systems/class_faiLogView.inc:56
@@ -1048,6 +642,10 @@ msgstr ""
 msgid "Sort up"
 msgstr ""
 
+#: admin/systems/class_faiLogView.inc:70
+msgid "File"
+msgstr ""
+
 #: admin/systems/class_faiLogView.inc:71
 msgid "Date"
 msgstr ""
@@ -1082,7 +680,7 @@ msgstr ""
 msgid "Selected file: %s"
 msgstr ""
 
-#: admin/systems/class_faiStartup.inc:70 admin/fai/paste_generic.tpl.c:2
+#: admin/systems/class_faiStartup.inc:70
 msgid "FAI settings"
 msgstr ""
 
@@ -1102,11 +700,6 @@ msgstr ""
 msgid "FAI profil to be applied to this computer"
 msgstr ""
 
-#: admin/systems/class_faiStartup.inc:90 admin/fai/faiPackage.tpl.c:14
-#: admin/fai/faiPackage.tpl.c:17
-msgid "Repository"
-msgstr ""
-
 #: admin/systems/class_faiStartup.inc:90
 msgid "FAI Debian repository to be used for installation"
 msgstr ""
@@ -1155,10 +748,6 @@ msgstr ""
 msgid "Release used on this repository"
 msgstr ""
 
-#: admin/systems/services/repository/class_serviceRepository.inc:47
-msgid "Sections"
-msgstr ""
-
 #: admin/systems/services/repository/class_serviceRepository.inc:47
 msgid "Sections available on this repository"
 msgstr ""
@@ -1241,64 +830,14 @@ msgstr ""
 msgid "s"
 msgstr ""
 
-#: admin/fai/faiPartitionTableEntry.tpl.c:2 admin/fai/faiVariableEntry.tpl.c:2
-#: admin/fai/faiVariableEntry.tpl.c:5 admin/fai/faiDiskEntry.tpl.c:2
-#: admin/fai/faiTemplate.tpl.c:2 admin/fai/faiTemplate.tpl.c:5
-#: admin/fai/faiVariable.tpl.c:2 admin/fai/faiVariable.tpl.c:5
-#: admin/fai/faiHook.tpl.c:2 admin/fai/faiHook.tpl.c:5
-#: admin/fai/faiPackage.tpl.c:2 admin/fai/faiPackage.tpl.c:5
-#: admin/fai/faiTemplateEntry.tpl.c:2 admin/fai/faiTemplateEntry.tpl.c:5
-#: admin/fai/faiScriptEntry.tpl.c:2 admin/fai/faiScriptEntry.tpl.c:5
-#: admin/fai/faiPartitionTable.tpl.c:2 admin/fai/faiPartitionTable.tpl.c:5
-#: admin/fai/faiScript.tpl.c:2 admin/fai/faiScript.tpl.c:5
-#: admin/fai/faiProfile.tpl.c:2 admin/fai/faiProfile.tpl.c:5
-#: admin/fai/faiProfile.tpl.c:14 admin/fai/faiHookEntry.tpl.c:2
-#: admin/fai/faiHookEntry.tpl.c:5
-msgid "Generic"
-msgstr ""
-
-#: admin/fai/faiPartitionTableEntry.tpl.c:14
-#: admin/fai/faiPartitionTableEntry.tpl.c:17 admin/fai/faiDiskEntry.tpl.c:23
-#: admin/fai/faiDiskEntry.tpl.c:26
-msgid "Partition entries"
-msgstr ""
-
-#: admin/fai/faiPartitionTableEntry.tpl.c:20
-#: admin/fai/faiPartitionTableEntry.tpl.c:23 admin/fai/faiDiskEntry.tpl.c:29
-#: admin/fai/faiDiskEntry.tpl.c:32
-msgid "Add partition"
-msgstr ""
-
-#: admin/fai/branch_selector.tpl.c:2
-msgid "Releases"
-msgstr ""
-
-#: admin/fai/branch_selector.tpl.c:5
-msgid "Current release"
-msgstr ""
-
-#: admin/fai/branch_selector.tpl.c:8 admin/fai/branch_selector.tpl.c:17
-#: admin/fai/fai-filter.tpl.c:8 admin/fai/fai-filter.tpl.c:17
-msgid "Create release"
-msgstr ""
-
-#: admin/fai/branch_selector.tpl.c:11 admin/fai/branch_selector.tpl.c:23
-#: admin/fai/fai-filter.tpl.c:11 admin/fai/fai-filter.tpl.c:23
-msgid "Create read-only release"
-msgstr ""
-
-#: admin/fai/branch_selector.tpl.c:20 admin/fai/fai-filter.tpl.c:20
-msgid "Freeze"
-msgstr ""
-
-#: admin/fai/branch_selector.tpl.c:26 admin/fai/fai-filter.tpl.c:26
-msgid "Delete current release"
-msgstr ""
-
 #: admin/fai/faiPartition.tpl.c:2
 msgid "Partition"
 msgstr ""
 
+#: admin/fai/faiPartition.tpl.c:8
+msgid "Type"
+msgstr ""
+
 #: admin/fai/faiPartition.tpl.c:17
 msgid "Resize existing partition"
 msgstr ""
@@ -1307,6 +846,10 @@ msgstr ""
 msgid "Bootable"
 msgstr ""
 
+#: admin/fai/faiPartition.tpl.c:23
+msgid "Preserve"
+msgstr ""
+
 #: admin/fai/faiPartition.tpl.c:26 admin/fai/faiDiskEntry.tpl.c:20
 msgid "Combined physical partitions"
 msgstr ""
@@ -1335,54 +878,8 @@ msgstr ""
 msgid "Tune options"
 msgstr ""
 
-#: admin/fai/faiNewBranch.tpl.c:2
-msgid ""
-"You are now going to create a branch or locked branch. This action clones "
-"the existing release to another release name. Branches can be modified as "
-"usual. FAI classes of locked branches cannot be modified, just additional "
-"classes are possible. Branch names should be alphanumeric, excluding the "
-"reserved names 'scripts', 'hooks', 'partitions', 'variables', 'templates' "
-"and 'fai'."
-msgstr ""
-
-#: admin/fai/faiNewBranch.tpl.c:5
-msgid ""
-"Branches are created as subreleases of the currently selected branch. "
-"Creating a new branch named 1.0.2 in SARGE for example, will result in a new "
-"release called SARGE/1.0.2."
-msgstr ""
-
-#: admin/fai/faiNewBranch.tpl.c:8
-msgid "Please enter a name for the branch"
-msgstr ""
-
-#: admin/fai/faiNewBranch.tpl.c:11
-msgid "Processing the requested operation"
-msgstr ""
-
-#: admin/fai/faiNewBranch.tpl.c:14
-msgid ""
-"As soon as the copy operation has finished, you can scroll down to end of "
-"the page and press the 'Continue' button to continue with the fai management "
-"dialog."
-msgstr ""
-
-#: admin/fai/faiNewBranch.tpl.c:17
-msgid ""
-"Your browser doesn't support iframes, please use this link to perform the "
-"requested operation."
-msgstr ""
-
-#: admin/fai/faiNewBranch.tpl.c:20
-msgid "Perform requested operation."
-msgstr ""
-
-#: admin/fai/faiNewBranch.tpl.c:23
-msgid "Initiate operation"
-msgstr ""
-
-#: admin/fai/faiVariableEntry.tpl.c:14 admin/fai/faiVariableEntry.tpl.c:17
-msgid "Variable attributes"
+#: admin/fai/faiDiskEntry.tpl.c:2
+msgid "Generic"
 msgstr ""
 
 #: admin/fai/faiDiskEntry.tpl.c:11
@@ -1393,323 +890,26 @@ msgstr ""
 msgid "Disk label"
 msgstr ""
 
-#: admin/fai/faiTemplate.tpl.c:17
-msgid "List of template files"
-msgstr ""
-
-#: admin/fai/faiVariable.tpl.c:17
-msgid "List of assigned variables"
-msgstr ""
-
-#: admin/fai/faiVariable.tpl.c:20
-msgid "Choose a variable to delete or edit"
-msgstr ""
-
-#: admin/fai/askClassName.tpl.c:2
-msgid ""
-"Adding a new class to the FAI management, requires a class name. You have to "
-"specify a unique class name for unique types of FAI classes, while you can "
-"use the same class name for different types of FAI classes. In the laste "
-"case, FAI will automatically enclose all these different class types to one "
-"unique class name."
-msgstr ""
-
-#: admin/fai/askClassName.tpl.c:5
-msgid ""
-"Please use one of the following methods to choose the name for the new FAI "
-"class."
-msgstr ""
-
-#: admin/fai/askClassName.tpl.c:8
-msgid "Enter FAI class name manually"
-msgstr ""
-
-#: admin/fai/askClassName.tpl.c:14
-msgid "Choose FAI class name from a list of existing classes"
-msgstr ""
-
-#: admin/fai/askClassName.tpl.c:20
-msgid "Choose class name"
-msgstr ""
-
-#: admin/fai/faiGroupHandle.tpl.c:2
-msgid "Please select the objects you want to remove:"
-msgstr ""
-
-#: admin/fai/faiGroupHandle.tpl.c:5
-msgid "Freezed"
-msgstr ""
-
-#: admin/fai/faiGroupHandle.tpl.c:8
-msgid "Select the object you want to edit:"
-msgstr ""
-
-#: admin/fai/faiGroupHandle.tpl.c:11
-msgid "Select the object you want to copy:"
-msgstr ""
-
-#: admin/fai/remove.tpl.c:5
-msgid ""
-"This includes all account data, system access rules, imap settings, etc. for "
-"this user. Please double check if your really want to do this since there is "
-"no way for FusionDirectory to get your data back."
-msgstr ""
-
-#: admin/fai/remove.tpl.c:8 admin/fai/remove_branch.tpl.c:8
-msgid "So - if you're sure - press 'Delete' to continue or 'Cancel' to abort."
+#: admin/fai/faiDiskEntry.tpl.c:23 admin/fai/faiDiskEntry.tpl.c:26
+msgid "Partition entries"
 msgstr ""
 
-#: admin/fai/faiHook.tpl.c:17
-msgid "List of hook scripts"
+#: admin/fai/faiDiskEntry.tpl.c:29 admin/fai/faiDiskEntry.tpl.c:32
+msgid "Add partition"
 msgstr ""
 
 #: admin/fai/packageSelect/selectPackage-list.tpl.c:2
-#: admin/fai/classSelect/selectClass-list.tpl.c:5
 msgid "Update"
 msgstr ""
 
 #: admin/fai/packageSelect/selectPackage-list.tpl.c:5
-#: admin/fai/classSelect/selectClass-list.tpl.c:8
 msgid "Submit"
 msgstr ""
 
 #: admin/fai/packageSelect/selectPackage-filter.tpl.c:2
-#: admin/fai/classSelect/selectClass-filter.tpl.c:2
-#: admin/fai/fai-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/remove_branch.tpl.c:5
-msgid ""
-"This includes all account data, system access, etc. for this branch. Please "
-"double check if your really want to do this since there is no way for "
-"FusionDirectory to get your data back."
-msgstr ""
-
-#: admin/fai/faiPackage.tpl.c:26
-msgid "Install method"
-msgstr ""
-
-#: admin/fai/faiPackage.tpl.c:29
-msgid "Please select the installation method"
-msgstr ""
-
-#: admin/fai/faiPackage.tpl.c:32 admin/fai/faiPackage.tpl.c:35
-msgid "Used packages"
-msgstr ""
-
-#: admin/fai/faiPackage.tpl.c:38
-msgid "Add from list"
-msgstr ""
-
-#: admin/fai/faiProfileEntry.tpl.c:2
-msgid "List of FAI objects (Fully Automatic Installation)"
-msgstr ""
-
-#: admin/fai/faiProfileEntry.tpl.c:5
-msgid "Information"
-msgstr ""
-
-#: admin/fai/faiProfileEntry.tpl.c:8
-msgid ""
-"This menu allows you to select FAI class names and to add them to the "
-"currently edited profile."
-msgstr ""
-
-#: admin/fai/faiProfileEntry.tpl.c:11
-msgid "Filters"
-msgstr ""
-
-#: admin/fai/faiProfileEntry.tpl.c:14
-msgid "Show only classes with templates"
-msgstr ""
-
-#: admin/fai/faiProfileEntry.tpl.c:17
-msgid "Show only classes with scripts"
-msgstr ""
-
-#: admin/fai/faiProfileEntry.tpl.c:20
-msgid "Show only classes with hooks"
-msgstr ""
-
-#: admin/fai/faiProfileEntry.tpl.c:23
-msgid "Show only classes with variables"
-msgstr ""
-
-#: admin/fai/faiProfileEntry.tpl.c:26
-msgid "Show only classes with packages"
-msgstr ""
-
-#: admin/fai/faiProfileEntry.tpl.c:29
-msgid "Show only classes with partitions"
-msgstr ""
-
-#: admin/fai/faiProfileEntry.tpl.c:32 admin/fai/faiProfileEntry.tpl.c:35
-msgid "Display objects matching"
-msgstr ""
-
-#: admin/fai/faiProfileEntry.tpl.c:38
-msgid "Regular expression for matching object names"
-msgstr ""
-
-#: admin/fai/faiTemplateEntry.tpl.c:17 admin/fai/faiTemplateEntry.tpl.c:20
-msgid "Template attributes"
-msgstr ""
-
-#: admin/fai/faiTemplateEntry.tpl.c:26 admin/fai/faiTemplateEntry.tpl.c:29
-msgid "Save template"
-msgstr ""
-
-#: admin/fai/faiTemplateEntry.tpl.c:32 admin/fai/faiTemplateEntry.tpl.c:35
-msgid "Edit template"
-msgstr ""
-
-#: admin/fai/faiTemplateEntry.tpl.c:38
-msgid "Full path"
-msgstr ""
-
-#: admin/fai/faiTemplateEntry.tpl.c:41
-msgid "Upload"
-msgstr ""
-
-#: admin/fai/faiTemplateEntry.tpl.c:44
-msgid "Owner"
-msgstr ""
-
-#: admin/fai/faiTemplateEntry.tpl.c:50
-msgid "Access"
-msgstr ""
-
-#: admin/fai/faiTemplateEntry.tpl.c:53
-msgid "Class"
-msgstr ""
-
-#: admin/fai/faiTemplateEntry.tpl.c:56
-msgid "Read"
-msgstr ""
-
-#: admin/fai/faiTemplateEntry.tpl.c:59
-msgid "Write"
-msgstr ""
-
-#: admin/fai/faiTemplateEntry.tpl.c:62
-msgid "Execute"
-msgstr ""
-
-#: admin/fai/faiTemplateEntry.tpl.c:65
-msgid "Special"
-msgstr ""
-
-#: admin/fai/faiTemplateEntry.tpl.c:71
-msgid "SUID"
-msgstr ""
-
-#: admin/fai/faiTemplateEntry.tpl.c:77
-msgid "SGID"
-msgstr ""
-
-#: admin/fai/faiTemplateEntry.tpl.c:80
-msgid "Others"
-msgstr ""
-
-#: admin/fai/faiTemplateEntry.tpl.c:83
-msgid "sticky"
-msgstr ""
-
-#: admin/fai/faiScriptEntry.tpl.c:17 admin/fai/faiScriptEntry.tpl.c:26
-msgid "Script attributes"
-msgstr ""
-
-#: admin/fai/faiScriptEntry.tpl.c:23
-msgid ""
-"Choose a priority. Low values result in an earlier, high values in a later "
-"execution."
-msgstr ""
-
-#: admin/fai/faiScriptEntry.tpl.c:32 admin/fai/faiHookEntry.tpl.c:32
-msgid "Import script"
-msgstr ""
-
-#: admin/fai/classSelect/selectClass-list.tpl.c:2
-msgid "Base"
-msgstr ""
-
-#: admin/fai/fai-filter.tpl.c:29
-msgid "Show profiles"
-msgstr ""
-
-#: admin/fai/fai-filter.tpl.c:32
-msgid "Show templates"
-msgstr ""
-
-#: admin/fai/fai-filter.tpl.c:35
-msgid "Show scripts"
-msgstr ""
-
-#: admin/fai/fai-filter.tpl.c:38
-msgid "Show hooks"
-msgstr ""
-
-#: admin/fai/fai-filter.tpl.c:41
-msgid "Show variables"
-msgstr ""
-
-#: admin/fai/fai-filter.tpl.c:44
-msgid "Show packages"
-msgstr ""
-
-#: admin/fai/fai-filter.tpl.c:47
-msgid "Show partitions"
-msgstr ""
-
-#: admin/fai/faiTemplateEdit.tpl.c:2
-msgid "This FAI template is write protected. Editing may break it!"
-msgstr ""
-
-#: admin/fai/faiTemplateEdit.tpl.c:5
-msgid "Edit anyway"
-msgstr ""
-
-#: admin/fai/faiPartitionTable.tpl.c:14
-msgid "Use 'setup-storage' to partition the disk"
-msgstr ""
-
-#: admin/fai/faiPartitionTable.tpl.c:20
-msgid "Discs"
-msgstr ""
-
-#: admin/fai/faiPartitionTable.tpl.c:23 admin/fai/faiPartitionTable.tpl.c:26
-#: admin/fai/faiPartitionTable.tpl.c:41 admin/fai/faiPartitionTable.tpl.c:44
-msgid "Add disk"
-msgstr ""
-
-#: admin/fai/faiPartitionTable.tpl.c:29 admin/fai/faiPartitionTable.tpl.c:32
-#: admin/fai/faiPartitionTable.tpl.c:47 admin/fai/faiPartitionTable.tpl.c:50
-msgid "Add RAID"
-msgstr ""
-
-#: admin/fai/faiPartitionTable.tpl.c:35 admin/fai/faiPartitionTable.tpl.c:38
-#: admin/fai/faiPartitionTable.tpl.c:53 admin/fai/faiPartitionTable.tpl.c:56
-msgid "Add volume group"
-msgstr ""
-
-#: admin/fai/faiScript.tpl.c:17
-msgid "List of scripts"
-msgstr ""
-
-#: admin/fai/faiProfile.tpl.c:20
-msgid "Choose a priority"
-msgstr ""
-
-#: admin/fai/faiHookEntry.tpl.c:14 admin/fai/faiHookEntry.tpl.c:17
-#: admin/fai/faiHookEntry.tpl.c:26
-msgid "Hook attributes"
-msgstr ""
-
-#: admin/fai/faiHookEntry.tpl.c:23
-msgid "Choose an existing FAI task"
-msgstr ""
diff --git a/fai/locale/es/fusiondirectory.po b/fai/locale/es/fusiondirectory.po
index efee7a5af1ff4f2c053f198cd20bfc22d1f5242f..103636a98fd03236a47b176b417ce02cd872197c 100644
--- a/fai/locale/es/fusiondirectory.po
+++ b/fai/locale/es/fusiondirectory.po
@@ -5,379 +5,188 @@
 # Translators:
 msgid ""
 msgstr ""
-"Project-Id-Version: FusionDirectory-108\n"
+"Project-Id-Version: FusionDirectory-109\n"
 "Report-Msgid-Bugs-To: documentation@lists.fusiondirectory.org\n"
-"POT-Creation-Date: 2015-03-19 21:45+0100\n"
-"PO-Revision-Date: 2015-02-25 16:12+0000\n"
+"POT-Creation-Date: 2014-12-15 17:47+0100\n"
+"PO-Revision-Date: 2015-02-25 16:13+0000\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>\n"
-"Language-Team: Spanish (http://www.transifex.com/projects/p/FusionDirectory-108/language/es/)\n"
+"Language-Team: Spanish (http://www.transifex.com/projects/p/FusionDirectory-109/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/fai/class_faiScriptEntry.inc:79 admin/fai/class_faiScriptEntry.inc:82
-#: admin/fai/class_faiManagement.inc:240 admin/fai/class_faiManagement.inc:768
-#: admin/fai/class_faiManagement.inc:774
-#: admin/fai/class_faiPartitionTable.inc:268
-#: admin/fai/class_faiPartitionTable.inc:331
-#: admin/fai/class_faiDiskEntry.inc:445 admin/fai/class_FAI.inc:570
-#: admin/fai/class_faiHookEntry.inc:83 admin/fai/class_faiHookEntry.inc:86
-#: admin/fai/class_faiScript.inc:249 admin/fai/class_faiTemplate.inc:232
-#: admin/fai/class_faiHook.inc:259 admin/fai/class_faiVariable.inc:162
-#: admin/systems/class_faiLogView.inc:207
-#: admin/systems/class_faiLogView.inc:242
-msgid "Error"
-msgstr "Error"
-
-#: admin/fai/class_faiScriptEntry.inc:82 admin/fai/class_faiHookEntry.inc:86
-msgid "file is empty"
-msgstr "el archivo estÃ¡ vacÃo"
-
-#: admin/fai/class_faiScriptEntry.inc:102 admin/fai/class_faiHookEntry.inc:102
-#: admin/fai/class_faiScript.inc:349 admin/fai/class_faiScript.inc:374
-#: admin/fai/class_faiTemplate.inc:320 admin/fai/class_faiHook.inc:346
-msgid "Download"
-msgstr "Descargar"
-
-#: admin/fai/class_faiScriptEntry.inc:147
-#: admin/fai/class_faiScriptEntry.inc:151
-#: admin/fai/class_faiScriptEntry.inc:154
-#: admin/fai/class_faiScriptEntry.inc:197
-#: admin/fai/class_faiManagement.inc:768 admin/fai/class_faiManagement.inc:774
-#: admin/fai/class_faiPackage.inc:685
-#: admin/fai/class_faiPartitionTable.inc:779
-#: admin/fai/class_faiDiskEntry.inc:702 admin/fai/class_faiDiskEntry.inc:705
-#: admin/fai/class_faiDiskEntry.inc:758
-#: admin/fai/class_faiTemplateEntry.inc:247
-#: admin/fai/class_faiTemplateEntry.inc:312
-#: admin/fai/class_faiPartitionTableEntry.inc:353
-#: admin/fai/class_faiPartitionTableEntry.inc:356
-#: admin/fai/class_faiPartitionTableEntry.inc:360
-#: admin/fai/class_faiPartitionTableEntry.inc:455
-#: admin/fai/packageSelect/selectPackage-list.xml:40
-#: admin/fai/class_faiProfile.inc:414 admin/fai/class_faiProfile.inc:463
-#: admin/fai/class_faiHookEntry.inc:157 admin/fai/class_faiHookEntry.inc:162
-#: admin/fai/class_faiHookEntry.inc:165 admin/fai/class_faiHookEntry.inc:207
-#: admin/fai/class_askClassName.inc:163 admin/fai/class_askClassName.inc:167
-#: admin/fai/class_askClassName.inc:171 admin/fai/class_askClassName.inc:198
-#: admin/fai/class_faiScript.inc:347 admin/fai/class_faiScript.inc:605
-#: admin/fai/classSelect/selectClass-list.xml:28
-#: admin/fai/class_faiTemplate.inc:512
-#: admin/fai/class_faiVariableEntry.inc:103
-#: admin/fai/class_faiVariableEntry.inc:112
-#: admin/fai/class_faiVariableEntry.inc:115
-#: admin/fai/class_faiVariableEntry.inc:149 admin/fai/class_faiHook.inc:531
-#: admin/fai/class_faiVariable.inc:398 admin/fai/fai-list.xml:80
-#: admin/fai/faiPartitionTableEntry.tpl.c:8 admin/fai/faiPartition.tpl.c:5
-#: admin/fai/faiVariableEntry.tpl.c:8 admin/fai/faiDiskEntry.tpl.c:8
-#: admin/fai/faiTemplate.tpl.c:8 admin/fai/faiVariable.tpl.c:8
-#: admin/fai/faiHook.tpl.c:8
-#: admin/fai/packageSelect/selectPackage-filter.tpl.c:8
-#: admin/fai/faiPackage.tpl.c:8 admin/fai/faiScriptEntry.tpl.c:8
-#: admin/fai/classSelect/selectClass-filter.tpl.c:5
-#: admin/fai/fai-filter.tpl.c:50 admin/fai/faiPartitionTable.tpl.c:8
-#: admin/fai/faiScript.tpl.c:8 admin/fai/faiProfile.tpl.c:8
-#: admin/fai/faiHookEntry.tpl.c:8
-msgid "Name"
-msgstr "Nombre"
-
-#: admin/fai/class_faiScriptEntry.inc:159 admin/fai/class_faiHookEntry.inc:170
-#: admin/fai/class_faiScript.inc:594 admin/fai/fai-list.xml:122
-#: admin/fai/faiScriptEntry.tpl.c:29 admin/fai/faiHookEntry.tpl.c:29
-msgid "Script"
-msgstr "Script"
-
-#: admin/fai/class_faiScriptEntry.inc:190
-#: admin/fai/class_faiScriptEntry.inc:199
-msgid "Script entry"
-msgstr "Entrada de script"
-
-#: admin/fai/class_faiScriptEntry.inc:191
-msgid "FAI script entry"
-msgstr "Entrada de script FAI"
-
-#: admin/fai/class_faiScriptEntry.inc:198 admin/fai/class_faiPackage.inc:686
-#: admin/fai/class_faiPartitionTable.inc:780
-#: admin/fai/class_faiDiskEntry.inc:759
-#: admin/fai/class_faiTemplateEntry.inc:313
-#: admin/fai/class_faiPartitionTableEntry.inc:456
-#: admin/fai/class_faiProfile.inc:464 admin/fai/class_faiHookEntry.inc:208
-#: admin/fai/class_faiScript.inc:606 admin/fai/class_faiTemplate.inc:513
-#: admin/fai/class_faiVariableEntry.inc:150 admin/fai/class_faiHook.inc:532
-#: admin/fai/class_faiVariable.inc:399
-#: admin/fai/faiPartitionTableEntry.tpl.c:11 admin/fai/faiPartition.tpl.c:11
-#: admin/fai/faiVariableEntry.tpl.c:11 admin/fai/faiDiskEntry.tpl.c:14
-#: admin/fai/faiTemplate.tpl.c:11 admin/fai/faiVariable.tpl.c:11
-#: admin/fai/faiHook.tpl.c:11 admin/fai/faiPackage.tpl.c:11
-#: admin/fai/faiTemplateEntry.tpl.c:14 admin/fai/faiScriptEntry.tpl.c:11
-#: admin/fai/faiPartitionTable.tpl.c:11 admin/fai/faiScript.tpl.c:11
-#: admin/fai/faiProfile.tpl.c:11 admin/fai/faiHookEntry.tpl.c:11
-msgid "Description"
-msgstr "DescripciÃ³n"
-
-#: admin/fai/class_faiScriptEntry.inc:200
-msgid "Script Priority"
-msgstr "Prioridad de script"
-
-#: admin/fai/class_faiManagement.inc:188
-msgid "partition table"
-msgstr "Tabla de particiones"
-
-#: admin/fai/class_faiManagement.inc:189 admin/fai/fai-list.xml:31
-msgid "script"
-msgstr "Script"
-
-#: admin/fai/class_faiManagement.inc:190 admin/fai/fai-list.xml:47
-msgid "hook"
-msgstr "mÃ©todo"
-
-#: admin/fai/class_faiManagement.inc:191 admin/fai/fai-list.xml:39
-msgid "variable"
-msgstr "Variable"
-
-#: admin/fai/class_faiManagement.inc:192 admin/fai/fai-list.xml:63
-msgid "template"
-msgstr "plantilla"
-
-#: admin/fai/class_faiManagement.inc:193
-msgid "package list"
-msgstr "lista de paquetes"
-
-#: admin/fai/class_faiManagement.inc:210 admin/fai/class_faiManagement.inc:226
-#: admin/fai/class_faiManagement.inc:332 admin/fai/class_faiManagement.inc:390
-#: admin/fai/class_faiManagement.inc:480 admin/fai/class_faiManagement.inc:575
-#: admin/fai/class_faiManagement.inc:598 admin/fai/class_faiManagement.inc:619
-msgid "Permission error"
-msgstr "Error de permisos"
-
-#: admin/fai/class_faiManagement.inc:211 admin/fai/class_faiManagement.inc:226
-#, php-format
-msgid "You have no permission to create a new %s!"
-msgstr "Â¡No tiene permisos para crear un nuevo %s!"
-
-#: admin/fai/class_faiManagement.inc:226 admin/fai/fai-list.xml:55
-msgid "profile"
-msgstr "perfil"
-
-#: admin/fai/class_faiManagement.inc:328
-msgid "Branch locked"
-msgstr "Rama bloqueada"
-
-#: admin/fai/class_faiManagement.inc:329
-#, php-format
-msgid "The following entries are locked, you can't remove them %s."
-msgstr "Las siguientes entradas estÃ¡n bloqueadas, no puede eliminar %s."
-
-#: admin/fai/class_faiManagement.inc:346
-msgid "FAI object"
-msgstr "Objeto FAI"
-
-#: admin/fai/class_faiManagement.inc:477
-msgid "FAI branch/freeze"
-msgstr "Rama congelada FAI"
-
-#: admin/fai/class_faiManagement.inc:480
-msgid "You have no permission to delete this release!"
-msgstr "Â¡No tiene permisos para eliminar esta versiÃ³n!"
-
-#: admin/fai/class_faiManagement.inc:496 admin/fai/remove.tpl.c:2
-#: admin/fai/remove_branch.tpl.c:2
-msgid "Warning"
-msgstr "Aviso"
-
-#: admin/fai/class_faiManagement.inc:496
-msgid "Release remove aborted because the release name check failed!"
-msgstr "Â¡La eliminaciÃ³n de la versiÃ³n ha sido cancelada al fallar la comprobaciÃ³n del nombre de la versiÃ³n!"
-
-#: admin/fai/class_faiManagement.inc:573 admin/fai/class_faiManagement.inc:596
-msgid "Configuration"
-msgstr "ConfiguraciÃ³n"
-
-#: admin/fai/class_faiManagement.inc:575 admin/fai/class_faiManagement.inc:598
-#: admin/fai/class_faiManagement.inc:619
-msgid "Branch"
-msgstr "Rama"
-
-#: admin/fai/class_faiManagement.inc:725 admin/fai/askClassName.tpl.c:23
-msgid "Continue"
-msgstr "Continuar"
-
-#: admin/fai/class_faiManagement.inc:926
-#: admin/fai/class_faiPartitionTable.inc:768
-#: admin/fai/class_faiProfile.inc:318 admin/fai/class_askClassName.inc:99
-#: admin/fai/classSelect/class_classSelect.inc:58
-#: admin/fai/class_faiGroupHandle.inc:120
-#: admin/fai/class_faiProfileEntry.inc:163 admin/fai/fai-list.xml:146
-msgid "Partition table"
-msgstr "Tabla de particiones"
-
-#: admin/fai/class_faiManagement.inc:928
-#: admin/fai/class_faiGroupHandle.inc:122 admin/fai/fai-list.xml:140
-msgid "Package list"
-msgstr "Lista de paquetes"
-
-#: admin/fai/class_faiManagement.inc:930
-#: admin/fai/class_faiGroupHandle.inc:124
-msgid "Scripts"
-msgstr "Scripts"
-
-#: admin/fai/class_faiManagement.inc:932
-#: admin/fai/class_faiGroupHandle.inc:126
-msgid "Variables"
-msgstr "Variables"
-
-#: admin/fai/class_faiManagement.inc:934
-#: admin/fai/class_faiGroupHandle.inc:128
-msgid "Hooks"
-msgstr "MÃ©todos"
-
-#: admin/fai/class_faiManagement.inc:936 admin/fai/class_faiProfile.inc:454
-#: admin/fai/class_askClassName.inc:104 admin/fai/class_faiGroupHandle.inc:130
-#: admin/fai/fai-list.xml:110
-msgid "Profile"
-msgstr "Perfil"
-
-#: admin/fai/class_faiManagement.inc:938
-#: admin/fai/class_faiGroupHandle.inc:132
-msgid "Templates"
-msgstr "Plantillas"
-
-#: admin/fai/class_faiManagement.inc:1039
-#: admin/fai/class_faiManagement.inc:1045
+#: admin/fai/class_faiManagement.inc:117 admin/fai/class_faiManagement.inc:122
 #: admin/fai/packageSelect/selectPackage-list.xml:14
-#: admin/fai/classSelect/selectClass-list.xml:15
-#: admin/systems/class_faiStartup.inc:177 config/fai/class_faiConfig.inc:41
+#: admin/systems/class_faiStartup.inc:178 config/fai/class_faiConfig.inc:41
 msgid "FAI"
 msgstr "FAI"
 
-#: admin/fai/class_faiManagement.inc:1040
+#: admin/fai/class_faiManagement.inc:118
 msgid "Manage FAI software packages and deployment recipes"
 msgstr ""
 
-#: admin/fai/class_faiPackage.inc:261
-msgid "Invalid package names"
-msgstr "Nombre de paquete no vÃ¡lido"
-
-#: admin/fai/class_faiPackage.inc:262
-#, php-format
-msgid "The following package names don't match the Debian policy: %s"
-msgstr "Los siguientes nombres de paquetes no cumplen la polÃtica Debian: %s"
-
-#: admin/fai/class_faiPackage.inc:421 admin/fai/class_faiPackage.inc:422
-msgid "Configured"
-msgstr "Configurado"
-
-#: admin/fai/class_faiPackage.inc:428 admin/fai/class_faiPackage.inc:429
-msgid "Package marked for removal"
-msgstr "El paquete estÃ¡ marcado para eliminaciÃ³n"
-
-#: admin/fai/class_faiPackage.inc:445
-msgid "Mark package for removal"
-msgstr "Marcar paquetes para eliminaciÃ³n"
-
-#: admin/fai/class_faiPackage.inc:451
-msgid "Configure this package"
-msgstr "Configurar este paquete"
+#: admin/fai/class_faiPackage.inc:157
+msgid "Mark for installation"
+msgstr ""
 
-#: admin/fai/class_faiPackage.inc:455
-msgid "Remove this package"
-msgstr "Eliminar este paquete"
+#: admin/fai/class_faiPackage.inc:161
+msgid "Mark for removal"
+msgstr ""
 
-#: admin/fai/class_faiPackage.inc:534
-msgid "Please select a least one package!"
-msgstr "Â¡Por favor seleccione al menos un Paquete!"
+#: admin/fai/class_faiPackage.inc:166
+msgid "Edit configuration"
+msgstr ""
 
-#: admin/fai/class_faiPackage.inc:538
-msgid ""
-"Please choose a valid release/section combination for your repository setup!"
-msgstr "Â¡Por favor elija una versiÃ³n/secciÃ³n valida para la configuraciÃ³n de su catÃ¡logo!"
+#: admin/fai/class_faiPackage.inc:247
+#: admin/fai/class_faiPartitionTable.inc:209
+#: admin/fai/class_faiPartitionTable.inc:250
+#: admin/fai/class_faiTemplate.inc:114
+#: admin/systems/services/repository/class_serviceDebianRepository.inc:172
+#: admin/systems/services/repository/class_serviceDebianRepository.inc:189
+#: admin/systems/services/repository/class_serviceDebianRepository.inc:193
+msgid "LDAP error"
+msgstr "Error LDAP"
 
-#: admin/fai/class_faiPackage.inc:571
+#: admin/fai/class_faiPackage.inc:279
 #: admin/fai/packageSelect/class_filterFAIPackages.inc:41
 #: admin/fai/packageSelect/class_filterFAIPackages.inc:46
 #: admin/fai/class_faiPackageConfiguration.inc:55
-#: admin/systems/class_faiStartup.inc:132
-#: admin/systems/class_faiStartup.inc:159
-msgid "Infrastructure service"
-msgstr ""
+#: admin/systems/class_faiStartup.inc:133
+#: admin/systems/class_faiStartup.inc:160
+msgid "Service infrastructure"
+msgstr "Infraestructura de servicio"
 
-#: admin/fai/class_faiPackage.inc:587
+#: admin/fai/class_faiPackage.inc:294
 msgid "Unkown packages"
 msgstr ""
 
-#: admin/fai/class_faiPackage.inc:674
-#: admin/fai/faiPackageConfiguration.tpl.c:2
+#: admin/fai/class_faiPackage.inc:365
 msgid "Package"
 msgstr "Paquete"
 
-#: admin/fai/class_faiPackage.inc:675
+#: admin/fai/class_faiPackage.inc:366
 msgid "FAI Package list"
 msgstr "Lista de paquetes FAI"
 
-#: admin/fai/class_faiPackage.inc:679
+#: admin/fai/class_faiPackage.inc:369
 msgid "FAI Package"
 msgstr ""
 
-#: admin/fai/class_faiPackage.inc:687
-msgid "Packages"
-msgstr "Paquetes"
+#: admin/fai/class_faiPackage.inc:385
+#: admin/fai/class_faiPartitionTable.inc:304
+#: admin/fai/class_faiTemplateEntry.inc:140 admin/fai/class_faiProfile.inc:47
+#: admin/fai/class_faiScript.inc:50 admin/fai/class_faiTemplate.inc:173
+#: admin/fai/class_faiHook.inc:50 admin/fai/class_faiVariable.inc:50
+msgid "Properties"
+msgstr "Propiedades"
 
-#: admin/fai/class_faiPackage.inc:688 admin/fai/faiPackage.tpl.c:23
-msgid "Section"
-msgstr "SecciÃ³n"
+#: admin/fai/class_faiPackage.inc:388
+#: admin/fai/class_faiPartitionTable.inc:307 admin/fai/class_faiProfile.inc:50
+#: admin/fai/class_faiScript.inc:53 admin/fai/class_faiTemplate.inc:176
+#: admin/fai/class_faiHook.inc:53 admin/fai/class_faiVariable.inc:53
+msgid "Class name"
+msgstr "Nombre de clase"
 
-#: admin/fai/class_faiPackage.inc:688 admin/fai/class_faiPackage.inc:691
-#: admin/fai/class_faiScript.inc:605 admin/fai/class_faiTemplate.inc:512
-msgid "Readonly"
-msgstr "Solo lectura"
+#: admin/fai/class_faiPackage.inc:388 admin/fai/class_faiScript.inc:53
+#: admin/fai/class_faiHook.inc:53 admin/fai/class_faiVariable.inc:53
+msgid "Variables class name"
+msgstr ""
 
-#: admin/fai/class_faiPackage.inc:689
-msgid "Install Method"
-msgstr "MÃ©todo de instalaciÃ³n"
+#: admin/fai/class_faiPackage.inc:392
+#: admin/fai/class_faiPartitionTable.inc:311
+#: admin/fai/class_faiDiskEntry.inc:738
+#: admin/fai/class_faiTemplateEntry.inc:147 admin/fai/class_faiProfile.inc:54
+#: admin/fai/class_faiScript.inc:57 admin/fai/class_faiScript.inc:75
+#: admin/fai/class_faiTemplate.inc:180 admin/fai/class_faiHook.inc:57
+#: admin/fai/class_faiHook.inc:75 admin/fai/class_faiVariable.inc:57
+#: admin/fai/class_faiVariable.inc:75
+msgid "Description"
+msgstr "DescripciÃ³n"
+
+#: admin/fai/class_faiPackage.inc:392
+#: admin/fai/class_faiPartitionTable.inc:311 admin/fai/class_faiProfile.inc:54
+#: admin/fai/class_faiScript.inc:57 admin/fai/class_faiTemplate.inc:180
+#: admin/fai/class_faiHook.inc:57 admin/fai/class_faiVariable.inc:57
+msgid "Short description of the class"
+msgstr ""
 
-#: admin/fai/class_faiPackage.inc:690
-msgid "Package configuration"
-msgstr "ConfiguraciÃ³n paquete"
+#: admin/fai/class_faiPackage.inc:398 admin/systems/class_faiStartup.inc:90
+msgid "Repository"
+msgstr "Repositorio"
 
-#: admin/fai/class_faiPackage.inc:691 admin/systems/class_faiStartup.inc:78
-#: admin/systems/services/repository/class_serviceRepository.inc:40
-#: admin/fai/branch_selector.tpl.c:14 admin/fai/faiPackage.tpl.c:20
-#: admin/fai/fai-filter.tpl.c:5 admin/fai/fai-filter.tpl.c:14
+#: admin/fai/class_faiPackage.inc:401 admin/systems/class_faiStartup.inc:78
+#: admin/systems/services/repository/class_serviceDebianRepository.inc:52
+#: admin/systems/services/repository/class_serviceCentosRepository.inc:49
 msgid "Release"
 msgstr "VersiÃ³n"
 
-#: admin/fai/class_faiPartitionTable.inc:269
-#: admin/fai/class_faiDiskEntry.inc:446
-#, php-format
-msgid ""
-"The disk cannot be deleted while it is used in the '%s' disk definition!"
-msgstr "Â¡El disco no podrÃ¡ ser eliminado mientras este usado por la definiciÃ³n de disco '%s'!"
+#: admin/fai/class_faiPackage.inc:401
+msgid "Debian release concerned"
+msgstr ""
 
-#: admin/fai/class_faiPartitionTable.inc:416 admin/fai/class_faiScript.inc:360
-#: admin/fai/class_faiScript.inc:362 admin/fai/class_faiTemplate.inc:306
-#: admin/fai/class_faiTemplate.inc:308
-msgid "edit"
-msgstr "editar"
+#: admin/fai/class_faiPackage.inc:405
+#: admin/systems/services/repository/class_serviceDebianRepository.inc:58
+msgid "Sections"
+msgstr "Secciones"
 
-#: admin/fai/class_faiPartitionTable.inc:418 admin/fai/class_faiScript.inc:364
-#: admin/fai/class_faiTemplate.inc:310
-msgid "delete"
-msgstr "eliminar"
+#: admin/fai/class_faiPackage.inc:405
+msgid "Sections concerned"
+msgstr ""
+
+#: admin/fai/class_faiPackage.inc:409
+msgid "Install method"
+msgstr "MÃ©todo de instalaciÃ³n"
+
+#: admin/fai/class_faiPackage.inc:409
+msgid "Install method to use for this package list"
+msgstr ""
+
+#: admin/fai/class_faiPackage.inc:420
+msgid "Packages"
+msgstr "Paquetes"
+
+#: admin/fai/class_faiPackage.inc:424
+msgid "Packages in this class"
+msgstr ""
 
-#: admin/fai/class_faiPartitionTable.inc:769
-#: admin/fai/class_faiPartitionTable.inc:773
+#: admin/fai/class_faiPartitionTable.inc:61
+#: admin/fai/class_faiDiskEntry.inc:442 admin/systems/class_faiLogView.inc:207
+#: admin/systems/class_faiLogView.inc:242
+msgid "Error"
+msgstr "Error"
+
+#: admin/fai/class_faiPartitionTable.inc:112
+msgid "Add RAID"
+msgstr "AÃ±adir RAID"
+
+#: admin/fai/class_faiPartitionTable.inc:116
+msgid "Add LVM"
+msgstr ""
+
+#: admin/fai/class_faiPartitionTable.inc:284
+msgid "Partition table"
+msgstr "Tabla de particiones"
+
+#: admin/fai/class_faiPartitionTable.inc:285
+#: admin/fai/class_faiPartitionTable.inc:288
 msgid "FAI partition table"
 msgstr "Tabla de particiones FAI"
 
-#: admin/fai/class_faiPartitionTable.inc:779 admin/fai/class_faiHook.inc:531
-#: admin/fai/class_faiVariable.inc:398
-msgid "Read only"
-msgstr "Solo lectura"
+#: admin/fai/class_faiPartitionTable.inc:307 admin/fai/class_faiProfile.inc:50
+msgid "Partition table class name"
+msgstr ""
+
+#: admin/fai/class_faiPartitionTable.inc:317
+msgid "Discs"
+msgstr "Discos"
+
+#: admin/fai/class_faiPartitionTable.inc:324
+msgid "Partitions in this class"
+msgstr ""
 
 #: admin/fai/class_faiDiskEntry.inc:273
-#: admin/fai/faiPartitionTableEntry.tpl.c:5 admin/fai/faiDiskEntry.tpl.c:5
 msgid "Device"
 msgstr "Dispositivo"
 
@@ -389,103 +198,103 @@ msgstr "Etiqueta"
 msgid "UUID"
 msgstr "UUID"
 
-#: admin/fai/class_faiDiskEntry.inc:345
+#: admin/fai/class_faiDiskEntry.inc:344
 msgid "Disks"
 msgstr "Discos"
 
-#: admin/fai/class_faiDiskEntry.inc:348 admin/fai/class_faiPartition.inc:321
-#: admin/fai/faiPartition.tpl.c:14
+#: admin/fai/class_faiDiskEntry.inc:347 admin/fai/class_faiPartition.inc:319
 msgid "Size"
 msgstr "TamaÃ±o"
 
-#: admin/fai/class_faiDiskEntry.inc:544
+#: admin/fai/class_faiDiskEntry.inc:443
+#, php-format
+msgid ""
+"The disk cannot be deleted while it is used in the '%s' disk definition!"
+msgstr "Â¡El disco no podrÃ¡ ser eliminado mientras este usado por la definiciÃ³n de disco '%s'!"
+
+#: admin/fai/class_faiDiskEntry.inc:536
 msgid "encrypted"
 msgstr "encriptado"
 
-#: admin/fai/class_faiDiskEntry.inc:547
+#: admin/fai/class_faiDiskEntry.inc:539
 msgid "bootable"
 msgstr "inicializable"
 
-#: admin/fai/class_faiDiskEntry.inc:550
+#: admin/fai/class_faiDiskEntry.inc:542
 msgid "preserve"
 msgstr "preservar"
 
-#: admin/fai/class_faiDiskEntry.inc:735
+#: admin/fai/class_faiDiskEntry.inc:687 admin/fai/class_faiDiskEntry.inc:690
+#: admin/fai/class_faiDiskEntry.inc:737
+#: admin/fai/packageSelect/selectPackage-list.xml:40
+#: admin/fai/class_faiScript.inc:71 admin/fai/class_faiHook.inc:71
+#: admin/fai/class_faiVariable.inc:71
+#: admin/fai/class_faiSimplePluginClass.inc:50
+msgid "Name"
+msgstr "Nombre"
+
+#: admin/fai/class_faiDiskEntry.inc:717
 msgid ""
 "You have more than four primary partition table entries in your "
 "configuration, please check your configuration twice."
 msgstr "Tiene en la configuraciÃ³n mas de 4 entradas primarias en la tabla de particiones, por favor vuelva a comprobar la configuraciÃ³n."
 
-#: admin/fai/class_faiDiskEntry.inc:739
+#: admin/fai/class_faiDiskEntry.inc:721
 msgid ""
 "You cannot have more than three primary partition while using logical "
 "partitions, please check your configuration twice."
 msgstr "Tiene en la configuraciÃ³n mas de 3 entradas primarias usando particiones lÃ³gicas, por favor vuelva a comprobar la configuraciÃ³n."
 
-#: admin/fai/class_faiDiskEntry.inc:752
-#: admin/fai/class_faiPartitionTableEntry.inc:448
+#: admin/fai/class_faiDiskEntry.inc:733
 msgid "Partition table entry"
 msgstr "Entrada en la tabla de particiones"
 
-#: admin/fai/class_faiDiskEntry.inc:753
-#: admin/fai/class_faiPartitionTableEntry.inc:449
+#: admin/fai/class_faiDiskEntry.inc:734
 msgid "FAI partition table entry"
 msgstr "Entrada en la tabla de particiones FAI"
 
-#: admin/fai/class_faiDiskEntry.inc:760
+#: admin/fai/class_faiDiskEntry.inc:739
 msgid "Disk options"
 msgstr "Opciones de disco"
 
-#: admin/fai/class_faiDiskEntry.inc:761
-#: admin/fai/class_faiPartitionTableEntry.inc:457
+#: admin/fai/class_faiDiskEntry.inc:740
 msgid "Partition type"
 msgstr "Tipo de particiÃ³n"
 
-#: admin/fai/class_faiDiskEntry.inc:762
-#: admin/fai/class_faiPartitionTableEntry.inc:458
+#: admin/fai/class_faiDiskEntry.inc:741
 msgid "Partition no."
 msgstr "NÂº de particiÃ³n."
 
-#: admin/fai/class_faiDiskEntry.inc:763
-#: admin/fai/class_faiPartitionTableEntry.inc:459
+#: admin/fai/class_faiDiskEntry.inc:742
 msgid "File system type"
 msgstr "Tipo de sistema de archivos"
 
-#: admin/fai/class_faiDiskEntry.inc:764
-#: admin/fai/class_faiPartitionTableEntry.inc:171
-#: admin/fai/class_faiPartitionTableEntry.inc:460
-#: admin/fai/class_faiPartition.inc:437 admin/fai/faiPartition.tpl.c:47
+#: admin/fai/class_faiDiskEntry.inc:743 admin/fai/class_faiPartition.inc:432
 msgid "Mount point"
 msgstr "Punto de montaje"
 
-#: admin/fai/class_faiDiskEntry.inc:765
-#: admin/fai/class_faiPartitionTableEntry.inc:461
-#: admin/fai/class_faiPartition.inc:402 admin/fai/class_faiPartition.inc:407
+#: admin/fai/class_faiDiskEntry.inc:744 admin/fai/class_faiPartition.inc:397
+#: admin/fai/class_faiPartition.inc:402
 msgid "Partition size"
 msgstr "TamaÃ±o de la particiÃ³n"
 
-#: admin/fai/class_faiDiskEntry.inc:766
-#: admin/fai/class_faiPartitionTableEntry.inc:173
-#: admin/fai/class_faiPartitionTableEntry.inc:462
-#: admin/fai/faiPartition.tpl.c:50
+#: admin/fai/class_faiDiskEntry.inc:745
 msgid "Mount options"
 msgstr "Opciones de Montaje"
 
-#: admin/fai/class_faiDiskEntry.inc:767
-#: admin/fai/class_faiPartitionTableEntry.inc:463
+#: admin/fai/class_faiDiskEntry.inc:746
 msgid "File system options"
 msgstr "Opciones del sistema de archivos"
 
-#: admin/fai/class_faiDiskEntry.inc:768
-#: admin/fai/class_faiPartitionTableEntry.inc:464
+#: admin/fai/class_faiDiskEntry.inc:747
 msgid "Partition flags"
 msgstr "Atributos de la particiÃ³n"
 
-#: admin/fai/class_debconfTemplate.inc:227
+#: admin/fai/class_debconfTemplate.inc:225
 msgid "This package has no debconf options."
 msgstr "Este paquete no tiene opciones de debconf."
 
-#: admin/fai/class_debconfTemplate.inc:264
+#: admin/fai/class_debconfTemplate.inc:262
 msgid ""
 "This debconf question is dynamically generated during package installation "
 "and requires choosing between specific options which cannot be presented "
@@ -493,217 +302,59 @@ msgid ""
 " effect."
 msgstr "La cuestiÃ³n debconf es generada dinÃ¡micamente durante la instalaciÃ³n del paquete y requiere elegir entre opciones especificas las cuales no pueden ser mostradas aquÃ. El texto introducido necesita ser una de las opciones vÃ¡lidas para tener funcionalidad."
 
-#: admin/fai/class_faiTemplateEntry.inc:139
-msgid "no file uploaded yet"
-msgstr "no se ha subido ningÃºn archivo todavÃa"
+#: admin/fai/class_faiTemplateEntry.inc:143
+msgid "File path"
+msgstr ""
 
-#: admin/fai/class_faiTemplateEntry.inc:142
-#, php-format
-msgid "exists in database (size: %s bytes)"
-msgstr "existe en la base de datos (tamaÃ±o: %s bytes)"
+#: admin/fai/class_faiTemplateEntry.inc:143
+msgid "Complete absolute template file path and name"
+msgstr ""
 
-#: admin/fai/class_faiTemplateEntry.inc:251
-#: admin/systems/class_faiLogView.inc:70 admin/fai/faiTemplateEntry.tpl.c:23
-msgid "File"
-msgstr "Archivo"
+#: admin/fai/class_faiTemplateEntry.inc:147
+msgid "Short description of the file"
+msgstr ""
 
-#: admin/fai/class_faiTemplateEntry.inc:255
-#: admin/fai/faiTemplateEntry.tpl.c:11
-msgid "Destination path"
-msgstr "Ruta de destino"
-
-#: admin/fai/class_faiTemplateEntry.inc:260 admin/fai/faiTemplateEntry.tpl.c:8
-msgid "File name"
-msgstr "Nombre de archivo"
-
-#: admin/fai/class_faiTemplateEntry.inc:264
-#: admin/fai/class_faiTemplateEntry.inc:266
-#: admin/fai/faiTemplateEntry.tpl.c:68
-msgid "User"
-msgstr "Usuario"
-
-#: admin/fai/class_faiTemplateEntry.inc:270
-#: admin/fai/class_faiTemplateEntry.inc:273
-#: admin/fai/class_faiTemplateEntry.inc:275
-#: admin/fai/faiTemplateEntry.tpl.c:47 admin/fai/faiTemplateEntry.tpl.c:74
-msgid "Group"
-msgstr "Grupo"
+#: admin/fai/class_faiTemplateEntry.inc:156
+msgid "Template attributes"
+msgstr "Atributos de la plantilla"
 
-#: admin/fai/class_faiTemplateEntry.inc:305
-msgid "Template entry"
-msgstr "Entrada de plantilla"
+#: admin/fai/class_faiTemplateEntry.inc:160
+msgid "Template file content"
+msgstr ""
 
-#: admin/fai/class_faiTemplateEntry.inc:306
-msgid "FAI template entry"
-msgstr "Entrada de plantilla FAI"
+#: admin/fai/class_faiTemplateEntry.inc:160
+msgid "Content of the template file"
+msgstr ""
 
-#: admin/fai/class_faiTemplateEntry.inc:314
-msgid "Template file"
-msgstr "Fichero de plantilla"
+#: admin/fai/class_faiTemplateEntry.inc:164
+msgid "Owner and group of the file"
+msgstr ""
 
-#: admin/fai/class_faiTemplateEntry.inc:315
-msgid "Template path"
-msgstr "Ruta de la plantilla"
+#: admin/fai/class_faiTemplateEntry.inc:167
+msgid "Owner"
+msgstr "Propietario"
 
-#: admin/fai/class_faiTemplateEntry.inc:316
+#: admin/fai/class_faiTemplateEntry.inc:167
 msgid "File owner"
 msgstr "Propietario del archivo"
 
-#: admin/fai/class_faiTemplateEntry.inc:317
-msgid "File permissions"
-msgstr "Permisos del archivo"
-
-#: admin/fai/class_FAI.inc:287 admin/fai/class_FAI.inc:679
-#: admin/fai/class_FAI.inc:1266 admin/fai/class_FAI.inc:1283
-#: admin/fai/class_FAI.inc:1287
-msgid "LDAP error"
-msgstr "Error LDAP"
-
-#: admin/fai/class_FAI.inc:570
-#, php-format
-msgid "Error, following objects should be equal '%s' and '%s'"
-msgstr "Error, los siguientes objetos deberÃan ser iguales '%s' y '%s'"
-
-#: admin/fai/class_FAI.inc:891
-#, php-format
-msgid "Creating group application release for %s"
-msgstr "Creando versiÃ³n del grupo de aplicaciones para %s"
-
-#: admin/fai/class_FAI.inc:960 admin/fai/class_FAI.inc:982
-#: admin/fai/class_FAI.inc:1022 admin/fai/class_FAI.inc:1027
-#: admin/fai/class_FAI.inc:1065
-msgid "Object"
-msgstr "Objeto"
-
-#: admin/fai/class_FAI.inc:961
-#, php-format
-msgid "Adding missing group application release container %s."
-msgstr "AÃ±adiendo contenedor de la versiÃ³n del grupo de aplicaciones %s."
-
-#: admin/fai/class_FAI.inc:983
-#, php-format
-msgid "Adding group application release container %s."
-msgstr "AÃ±adiendo contenedor de la versiÃ³n del grupo de aplicaciones %s."
-
-#: admin/fai/class_FAI.inc:1023
-#, php-format
-msgid "Could not create menu entry %s. (Already exists)."
-msgstr "No se puede crear la entrada de menÃº '%s', el nombre de destino ya existe."
-
-#: admin/fai/class_FAI.inc:1028
-#, php-format
-msgid "Created group application menu entry for %s."
-msgstr "Creado entrada del menÃº del grupo de aplicaciones para %s."
-
-#: admin/fai/class_FAI.inc:1059
-#, php-format
-msgid "Creating copy of %s"
-msgstr "Creando una copia de %s"
-
-#: admin/fai/class_FAI.inc:1062
-msgid "Processing"
-msgstr "Procesando"
-
-#: admin/fai/class_FAI.inc:1080
-msgid "Could not create new release, the destination dn is already in use."
-msgstr "No se puede crear nueva versiÃ³n, el 'dn' de destino ya estÃ¡ en uso."
-
-#: admin/fai/class_FAI.inc:1093
-msgid "Error while fetching source dn - aborted!"
-msgstr "Â¡Se ha cancelado, ha habido un error mientras accedÃa al dn origen!"
-
-#: admin/fai/class_FAI.inc:1174
-msgid "Fatal error"
-msgstr "Error fatal"
-
-#: admin/fai/class_FAI.inc:1175
-#, php-format
-msgid ""
-"Release creation failed due to ldap errors. Additional informations '%s'."
-msgstr "La creaciÃ³n de la versiÃ³n ha fallado debido a errores ldap. Mas informaciÃ³n '%s'."
-
-#: admin/fai/class_faiPartitionTableEntry.inc:162
-msgid "primary"
-msgstr "primario"
-
-#: admin/fai/class_faiPartitionTableEntry.inc:162
-msgid "logical"
-msgstr "lÃ³gico"
-
-#: admin/fai/class_faiPartitionTableEntry.inc:169
-#: admin/fai/faiPartition.tpl.c:8
-msgid "Type"
-msgstr "Tipo"
-
-#: admin/fai/class_faiPartitionTableEntry.inc:170
-msgid "FS type"
-msgstr "Tipo de FS"
-
-#: admin/fai/class_faiPartitionTableEntry.inc:172
-msgid "Size in MB"
-msgstr "TamaÃ±o en Mb"
-
-#: admin/fai/class_faiPartitionTableEntry.inc:174
-msgid "FS option"
-msgstr "OpciÃ³n de FS"
-
-#: admin/fai/class_faiPartitionTableEntry.inc:175
-#: admin/fai/faiPartition.tpl.c:23
-msgid "Preserve"
-msgstr "Preservar"
-
-#: admin/fai/class_faiPartitionTableEntry.inc:266
-msgid "False"
-msgstr "Falso"
-
-#: admin/fai/class_faiPartitionTableEntry.inc:268
-msgid "True"
-msgstr "Verdadero"
-
-#: admin/fai/class_faiPartitionTableEntry.inc:272
-#: admin/fai/class_faiPartitionTableEntry.inc:274 admin/fai/fai-list.xml:159
-#: admin/fai/fai-list.xml:198
-msgid "Remove"
-msgstr "Eliminar"
-
-#: admin/fai/class_faiPartitionTableEntry.inc:384
-#, php-format
-msgid "please enter a unique mount point for partition %s"
-msgstr "por favor introduzca un Ãºnico punto de montaje para la particiÃ³n %s"
+#: admin/fai/class_faiTemplateEntry.inc:172
+msgid "Group"
+msgstr "Grupo"
 
-#: admin/fai/class_faiPartitionTableEntry.inc:389
-#, php-format
-msgid "partition %s mount point"
-msgstr "punto de montaje de la particiÃ³n %s"
+#: admin/fai/class_faiTemplateEntry.inc:172
+msgid "File group"
+msgstr ""
 
-#: admin/fai/class_faiPartitionTableEntry.inc:394
-#, php-format
-msgid ""
-"File system type 'swap' is already used, change file system type for "
-"partition %s."
-msgstr "El tipo de sistema de archivos 'swap' ya estÃ¡ en uso. Cambie el tipo de sistema de archivos para la particiÃ³n %s."
-
-#: admin/fai/class_faiPartitionTableEntry.inc:398
-msgid "Please use 'swap' as mount point, if 'swap' is used as fs-type."
-msgstr "Por favor, si usa 'swap' como sistema de archivos, use 'swap' como punto de montaje."
-
-#: admin/fai/class_faiPartitionTableEntry.inc:404
-#: admin/fai/class_faiPartitionTableEntry.inc:408
-#: admin/fai/class_faiPartitionTableEntry.inc:414
-#: admin/fai/class_faiPartitionTableEntry.inc:416
-#: admin/fai/class_faiPartitionTableEntry.inc:421
-#, php-format
-msgid "partition %s size"
-msgstr "tamaÃ±o particiÃ³n %s"
+#: admin/fai/class_faiTemplateEntry.inc:181
+msgid "Access"
+msgstr "Acceso"
 
-#: admin/fai/class_faiPartitionTableEntry.inc:436
-msgid ""
-"You have more than 3 primary partition table entries in your configuration, "
-"please check your configuration twice."
-msgstr "Tiene en la configuraciÃ³n mas de 3 entradas primarias en la tabla de particiones, por favor vuelva a comprobar la configuraciÃ³n."
+#: admin/fai/class_faiTemplateEntry.inc:181
+msgid "Access rights"
+msgstr ""
 
 #: admin/fai/packageSelect/selectPackage-list.xml:10
-#: admin/fai/classSelect/selectClass-list.xml:11
 msgid "Please select the desired entries"
 msgstr "Por favor seleccione las entradas que desee"
 
@@ -711,148 +362,95 @@ msgstr "Por favor seleccione las entradas que desee"
 msgid "Version"
 msgstr "VersiÃ³n"
 
-#: admin/fai/class_faiProfile.inc:310
-msgid "This list displays all assigned class names for this profile."
-msgstr "Esta lista muestra todos las clases asignadas a este perfil."
-
-#: admin/fai/class_faiProfile.inc:313 admin/fai/class_askClassName.inc:103
-#: admin/fai/classSelect/class_classSelect.inc:53
-#: admin/fai/class_faiProfileEntry.inc:158
-msgid "Hook bundle"
-msgstr "Paquete de mÃ©todos"
-
-#: admin/fai/class_faiProfile.inc:314 admin/fai/class_askClassName.inc:105
-#: admin/fai/classSelect/class_classSelect.inc:54
-#: admin/fai/class_faiProfileEntry.inc:159
-msgid "Template bundle"
-msgstr "Paquete de plantillas"
-
-#: admin/fai/class_faiProfile.inc:315 admin/fai/class_askClassName.inc:101
-#: admin/fai/classSelect/class_classSelect.inc:55
-#: admin/fai/class_faiProfileEntry.inc:160
-msgid "Script bundle"
-msgstr "Paquete de scripts"
-
-#: admin/fai/class_faiProfile.inc:316 admin/fai/class_askClassName.inc:102
-#: admin/fai/classSelect/class_classSelect.inc:56
-#: admin/fai/class_faiProfileEntry.inc:161
-msgid "Variable bundle"
-msgstr "Paquete de variables"
-
-#: admin/fai/class_faiProfile.inc:317 admin/fai/class_askClassName.inc:100
-#: admin/fai/classSelect/class_classSelect.inc:57
-#: admin/fai/class_faiProfileEntry.inc:162
-msgid "Package bundle"
-msgstr "Conjunto de paquetes"
-
-#: admin/fai/class_faiProfile.inc:321
-msgid "Remove class from profile"
-msgstr "Eliminar clase del perfil"
-
-#: admin/fai/class_faiProfile.inc:324
-msgid "Up"
-msgstr "Arriba"
-
-#: admin/fai/class_faiProfile.inc:325
-msgid "Down"
-msgstr "Abajo"
-
-#: admin/fai/class_faiProfile.inc:410
-msgid "No class specified for this profile!"
-msgstr "Â¡No se ha especificado una clase para este perfil!"
-
-#: admin/fai/class_faiProfile.inc:419
-msgid "You can't use the same name for a class and a profile!"
-msgstr ""
-
-#: admin/fai/class_faiProfile.inc:455
+#: admin/fai/class_faiProfile.inc:28
+msgid "Profile"
+msgstr "Perfil"
+
+#: admin/fai/class_faiProfile.inc:29
 msgid "FAI profile"
 msgstr "Perfil FAI"
 
-#: admin/fai/class_faiProfile.inc:458
+#: admin/fai/class_faiProfile.inc:32
 msgid "FAI Profile"
 msgstr ""
 
-#: admin/fai/class_faiProfile.inc:465 admin/fai/faiProfile.tpl.c:17
+#: admin/fai/class_faiProfile.inc:61
 msgid "FAI classes"
 msgstr "Clases FAI"
 
-#: admin/fai/class_faiHookEntry.inc:200
-msgid "Hook entry"
-msgstr "Entrada de mÃ©todo"
+#: admin/fai/class_faiProfile.inc:61
+msgid "FAI classes which are part of this profile"
+msgstr ""
 
-#: admin/fai/class_faiHookEntry.inc:201
-msgid "FAI hook entry"
-msgstr "Entrada de mÃ©todo FAI"
+#: admin/fai/class_faiPackageConfiguration.inc:88
+#, php-format
+msgid "Debconf information for package '%s'"
+msgstr "InformaciÃ³n debconf para el paquete '%s'"
 
-#: admin/fai/class_faiHookEntry.inc:209 admin/fai/faiHookEntry.tpl.c:20
-msgid "Task"
-msgstr "Tarea"
+#: admin/fai/class_faiScript.inc:30 admin/fai/class_faiScript.inc:84
+#: admin/fai/class_faiHook.inc:87
+msgid "Script"
+msgstr "Script"
 
-#: admin/fai/class_faiHookEntry.inc:210 admin/fai/class_faiScript.inc:595
-#: admin/fai/class_faiScript.inc:599
+#: admin/fai/class_faiScript.inc:31 admin/fai/class_faiScript.inc:34
 msgid "FAI script"
 msgstr "Script FAI"
 
-#: admin/fai/class_faiPackageConfiguration.inc:88
-#, php-format
-msgid "Debconf information for package '%s'"
-msgstr "InformaciÃ³n debconf para el paquete '%s'"
+#: admin/fai/class_faiScript.inc:63
+msgid "Scripts"
+msgstr "Scripts"
 
-#: admin/fai/class_askClassName.inc:99 admin/fai/class_askClassName.inc:100
-#: admin/fai/class_askClassName.inc:101 admin/fai/class_askClassName.inc:102
-#: admin/fai/class_askClassName.inc:103 admin/fai/class_askClassName.inc:104
-#: admin/fai/class_askClassName.inc:105 admin/fai/class_askClassName.inc:106
-msgid "Create new FAI object"
-msgstr "Crear nuevo objeto FAI"
+#: admin/fai/class_faiScript.inc:67 admin/fai/class_faiHook.inc:67
+#: admin/fai/class_faiVariable.inc:67
+msgid "Variables in this class"
+msgstr ""
 
-#: admin/fai/class_faiTemplateEdit.inc:80
-#, php-format
-msgid ""
-"The file encodig has changed from '%s' to '%s'. Do you really want to save?"
-msgstr "La codificaciÃ³n del archivo ha cambiado de '%s' a '%s'.Â¿Quiere realmente grabarlo?"
+#: admin/fai/class_faiScript.inc:71 admin/fai/class_faiHook.inc:71
+#: admin/fai/class_faiVariable.inc:71
+msgid "The name of the variable"
+msgstr ""
 
-#: admin/fai/class_faiScript.inc:333 admin/fai/class_faiScript.inc:335
-msgid "Sort direction"
-msgstr "DirecciÃ³n de ordenaciÃ³n"
+#: admin/fai/class_faiScript.inc:75 admin/fai/class_faiHook.inc:75
+#: admin/fai/class_faiVariable.inc:75
+msgid "A short description of the variable"
+msgstr ""
 
-#: admin/fai/class_faiScript.inc:348 admin/fai/faiScriptEntry.tpl.c:20
+#: admin/fai/class_faiScript.inc:79
 msgid "Priority"
 msgstr "Prioridad"
 
-#: admin/fai/class_faiScript.inc:350
-msgid "Action"
-msgstr "AcciÃ³n"
+#: admin/fai/class_faiScript.inc:79
+msgid "Priority of this script (FIXME: less is done first?)"
+msgstr ""
 
-#: admin/fai/classSelect/selectClass-list.xml:36 admin/fai/fai-list.xml:88
-#: admin/fai/faiScriptEntry.tpl.c:14
-msgid "Properties"
-msgstr "Propiedades"
+#: admin/fai/class_faiScript.inc:84
+msgid "The script itself"
+msgstr ""
 
-#: admin/fai/class_faiTemplate.inc:501 admin/fai/fai-list.xml:116
+#: admin/fai/class_faiTemplate.inc:136
+#, php-format
+msgid "There are several files with the same path: %s"
+msgstr ""
+
+#: admin/fai/class_faiTemplate.inc:153
 msgid "Template"
 msgstr "Plantilla"
 
-#: admin/fai/class_faiTemplate.inc:502 admin/fai/class_faiTemplate.inc:506
+#: admin/fai/class_faiTemplate.inc:154 admin/fai/class_faiTemplate.inc:157
 msgid "FAI template"
 msgstr "Plantilla FAI"
 
-#: admin/fai/class_faiVariableEntry.inc:107
-msgid "Content"
-msgstr "Contenido"
-
-#: admin/fai/class_faiVariableEntry.inc:142
-msgid "Variable entry"
-msgstr "Entrada de variable"
+#: admin/fai/class_faiTemplate.inc:176
+msgid "Template class name"
+msgstr ""
 
-#: admin/fai/class_faiVariableEntry.inc:143
-msgid "FAI variable entry "
-msgstr "Entrada de variable FAI"
+#: admin/fai/class_faiTemplate.inc:186
+msgid "Template files"
+msgstr ""
 
-#: admin/fai/class_faiVariableEntry.inc:151
-#: admin/fai/faiVariableEntry.tpl.c:20
-msgid "Variable content"
-msgstr "Contenido de variable"
+#: admin/fai/class_faiTemplate.inc:190
+msgid "Template files in this class"
+msgstr ""
 
 #: admin/fai/class_faiPartition.inc:176 admin/fai/class_faiPartition.inc:180
 msgid "Logical"
@@ -892,11 +490,11 @@ msgstr "espacio disponible"
 
 #: admin/fai/class_faiPartition.inc:202
 msgid "KB"
-msgstr "KB"
+msgstr "Kb"
 
 #: admin/fai/class_faiPartition.inc:203
 msgid "MB"
-msgstr "MB"
+msgstr "Mb"
 
 #: admin/fai/class_faiPartition.inc:204
 msgid "GB"
@@ -950,96 +548,75 @@ msgstr "xfs"
 msgid "btrfs"
 msgstr "btrfs"
 
-#: admin/fai/class_faiPartition.inc:224
-msgid "LVM/RAID"
-msgstr ""
-
-#: admin/fai/class_faiPartition.inc:327
+#: admin/fai/class_faiPartition.inc:325
 msgid "spare"
 msgstr "repuesto"
 
-#: admin/fai/class_faiPartition.inc:330
+#: admin/fai/class_faiPartition.inc:328
 msgid "missing"
 msgstr "falta"
 
-#: admin/fai/class_faiPartition.inc:333
+#: admin/fai/class_faiPartition.inc:331
 msgid "Options"
 msgstr "Opciones"
 
-#: admin/fai/class_faiPartition.inc:420
+#: admin/fai/class_faiPartition.inc:415
 msgid "Minimum partition size"
 msgstr "TamaÃ±o mÃnimo de la particiÃ³n"
 
-#: admin/fai/class_faiPartition.inc:420
+#: admin/fai/class_faiPartition.inc:415
 msgid "Maximum partition size"
 msgstr "TamaÃ±o mÃ¡ximo de la particiÃ³n"
 
-#: admin/fai/class_faiPartition.inc:428
+#: admin/fai/class_faiPartition.inc:423
 msgid "Raid arrays must contain at least two partitions!"
 msgstr "Â¡La matriz de discos RAID debe tener al menos dos particiones!"
 
-#: admin/fai/class_faiPartition.inc:430
+#: admin/fai/class_faiPartition.inc:425
 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:332 admin/fai/class_faiHook.inc:334
-#: admin/fai/fai-list.xml:190 admin/fai/faiVariable.tpl.c:23
-#: admin/fai/faiVariable.tpl.c:26
-msgid "Edit"
-msgstr "Editar"
-
-#: admin/fai/class_faiHook.inc:336
-msgid "Delete"
-msgstr "Eliminar"
-
-#: admin/fai/class_faiHook.inc:521 admin/fai/fai-list.xml:128
+#: admin/fai/class_faiHook.inc:30
 msgid "Hook"
 msgstr "MÃ©todo"
 
-#: admin/fai/class_faiHook.inc:522 admin/fai/class_faiHook.inc:526
+#: admin/fai/class_faiHook.inc:31 admin/fai/class_faiHook.inc:34
 msgid "FAI hook"
 msgstr "MÃ©todo FAI"
 
-#: admin/fai/class_faiVariable.inc:387 admin/fai/fai-list.xml:134
+#: admin/fai/class_faiHook.inc:63
+msgid "Hooks"
+msgstr "MÃ©todos"
+
+#: admin/fai/class_faiHook.inc:79
+msgid "Task"
+msgstr "Tarea"
+
+#: admin/fai/class_faiHook.inc:87
+msgid "The script of this hook"
+msgstr ""
+
+#: admin/fai/class_faiVariable.inc:30
 msgid "Variable"
 msgstr "Variable"
 
-#: admin/fai/class_faiVariable.inc:388 admin/fai/class_faiVariable.inc:392
+#: admin/fai/class_faiVariable.inc:31 admin/fai/class_faiVariable.inc:34
 msgid "FAI variable"
 msgstr "Variable FAI"
 
-#: admin/fai/class_faiProfileEntry.inc:184 admin/fai/askClassName.tpl.c:11
-#: admin/fai/askClassName.tpl.c:17 admin/fai/paste_generic.tpl.c:5
-msgid "Class name"
-msgstr "Nombre de clase"
-
-#: admin/fai/class_faiProfileEntry.inc:184 admin/fai/faiTemplate.tpl.c:14
-#: admin/fai/faiVariable.tpl.c:14 admin/fai/faiHook.tpl.c:14
-#: admin/fai/faiPartitionTable.tpl.c:17 admin/fai/faiScript.tpl.c:14
-msgid "Objects"
-msgstr "Objetos"
-
-#: admin/fai/fai-list.xml:11
-msgid "List of deployment classes and products"
-msgstr "Lista de despliegue de clases y productos"
+#: admin/fai/class_faiVariable.inc:63
+msgid "Variables"
+msgstr "Variables"
 
-#: admin/fai/fai-list.xml:15
-msgid "partitionTable"
-msgstr ""
+#: admin/fai/class_faiVariable.inc:79
+msgid "Content"
+msgstr "Contenido"
 
-#: admin/fai/fai-list.xml:23
-msgid "packagelist"
+#: admin/fai/class_faiVariable.inc:79
+msgid "The content of the variable"
 msgstr ""
 
-#: admin/fai/fai-list.xml:93
-msgid "Actions"
-msgstr "Acciones"
-
-#: admin/fai/fai-list.xml:104
-msgid "Create"
-msgstr "Crear"
-
 #: admin/systems/class_faiLogView.inc:56
 msgid "Sort down"
 msgstr ""
@@ -1048,6 +625,10 @@ msgstr ""
 msgid "Sort up"
 msgstr ""
 
+#: admin/systems/class_faiLogView.inc:70
+msgid "File"
+msgstr "Archivo"
+
 #: admin/systems/class_faiLogView.inc:71
 msgid "Date"
 msgstr "Fecha"
@@ -1082,7 +663,7 @@ msgstr ""
 msgid "Selected file: %s"
 msgstr ""
 
-#: admin/systems/class_faiStartup.inc:70 admin/fai/paste_generic.tpl.c:2
+#: admin/systems/class_faiStartup.inc:70
 msgid "FAI settings"
 msgstr "ParÃ¡metros FAI"
 
@@ -1102,11 +683,6 @@ msgstr ""
 msgid "FAI profil to be applied to this computer"
 msgstr ""
 
-#: admin/systems/class_faiStartup.inc:90 admin/fai/faiPackage.tpl.c:14
-#: admin/fai/faiPackage.tpl.c:17
-msgid "Repository"
-msgstr "Repositorio"
-
 #: admin/systems/class_faiStartup.inc:90
 msgid "FAI Debian repository to be used for installation"
 msgstr ""
@@ -1131,85 +707,96 @@ msgstr ""
 msgid "Linux kernel parameters to be ran"
 msgstr ""
 
-#: admin/systems/class_faiStartup.inc:178
+#: admin/systems/class_faiStartup.inc:179
 msgid "Full automated installation"
 msgstr ""
 
-#: admin/systems/services/repository/class_serviceRepository.inc:31
+#: admin/systems/services/repository/class_serviceDebianRepository.inc:34
+#: admin/systems/services/repository/class_serviceCentosRepository.inc:31
+msgid "Repositories"
+msgstr ""
+
+#: admin/systems/services/repository/class_serviceDebianRepository.inc:39
+#: admin/systems/services/repository/class_serviceCentosRepository.inc:36
+msgid "Repositories this server hosts"
+msgstr ""
+
+#: admin/systems/services/repository/class_serviceDebianRepository.inc:43
+#: admin/systems/services/repository/class_serviceCentosRepository.inc:40
 msgid "URL"
 msgstr "URL"
 
-#: admin/systems/services/repository/class_serviceRepository.inc:31
+#: admin/systems/services/repository/class_serviceDebianRepository.inc:43
+#: admin/systems/services/repository/class_serviceCentosRepository.inc:40
 msgid "Repository url"
 msgstr ""
 
-#: admin/systems/services/repository/class_serviceRepository.inc:35
+#: admin/systems/services/repository/class_serviceDebianRepository.inc:47
+#: admin/systems/services/repository/class_serviceCentosRepository.inc:44
 msgid "Parent server"
 msgstr "Servidor Origen"
 
-#: admin/systems/services/repository/class_serviceRepository.inc:35
+#: admin/systems/services/repository/class_serviceDebianRepository.inc:47
+#: admin/systems/services/repository/class_serviceCentosRepository.inc:44
 msgid "Parent repository server"
 msgstr ""
 
-#: admin/systems/services/repository/class_serviceRepository.inc:40
-msgid "Release used on this repository"
+#: admin/systems/services/repository/class_serviceDebianRepository.inc:52
+msgid "Debian release used on this repository"
 msgstr ""
 
-#: admin/systems/services/repository/class_serviceRepository.inc:47
-msgid "Sections"
-msgstr "Secciones"
-
-#: admin/systems/services/repository/class_serviceRepository.inc:47
-msgid "Sections available on this repository"
+#: admin/systems/services/repository/class_serviceDebianRepository.inc:58
+msgid "Debian sections available on this repository"
 msgstr ""
 
-#: admin/systems/services/repository/class_serviceRepository.inc:52
+#: admin/systems/services/repository/class_serviceDebianRepository.inc:63
+#: admin/systems/services/repository/class_serviceCentosRepository.inc:57
 msgid "Mirror mode"
 msgstr ""
 
-#: admin/systems/services/repository/class_serviceRepository.inc:52
+#: admin/systems/services/repository/class_serviceDebianRepository.inc:63
+#: admin/systems/services/repository/class_serviceCentosRepository.inc:57
 msgid ""
 "Is this mirror an installation repository? Is its release a custom one?"
 msgstr ""
 
-#: admin/systems/services/repository/class_serviceRepository.inc:57
+#: admin/systems/services/repository/class_serviceDebianRepository.inc:68
+#: admin/systems/services/repository/class_serviceCentosRepository.inc:62
 msgid "Local mirror"
 msgstr ""
 
-#: admin/systems/services/repository/class_serviceRepository.inc:57
+#: admin/systems/services/repository/class_serviceDebianRepository.inc:68
+#: admin/systems/services/repository/class_serviceCentosRepository.inc:62
 msgid "Is this mirror a local or a network mirror?"
 msgstr ""
 
-#: admin/systems/services/repository/class_serviceRepository.inc:66
+#: admin/systems/services/repository/class_serviceDebianRepository.inc:77
+#: admin/systems/services/repository/class_serviceCentosRepository.inc:71
 msgid "Architectures"
 msgstr ""
 
-#: admin/systems/services/repository/class_serviceRepository.inc:66
+#: admin/systems/services/repository/class_serviceDebianRepository.inc:77
+#: admin/systems/services/repository/class_serviceCentosRepository.inc:71
 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:140
-msgid "Repositories"
+#: admin/systems/services/repository/class_serviceDebianRepository.inc:99
+#: admin/systems/services/repository/class_serviceDebianRepository.inc:100
+msgid "Debian repository"
 msgstr ""
 
-#: admin/systems/services/repository/class_serviceRepository.inc:145
-msgid "Repositories this server hosts"
-msgstr ""
+#: admin/systems/services/repository/class_serviceDebianRepository.inc:100
+#: admin/systems/services/repository/class_serviceCentosRepository.inc:96
+msgid "Services"
+msgstr "Servicios"
 
-#: admin/systems/services/repository/class_serviceRepository.inc:160
-msgid "Package repository"
+#: admin/systems/services/repository/class_serviceCentosRepository.inc:49
+msgid "Centos release used on this repository"
 msgstr ""
 
-#: admin/systems/services/repository/class_serviceRepository.inc:161
-msgid "Package repository information"
+#: admin/systems/services/repository/class_serviceCentosRepository.inc:95
+#: admin/systems/services/repository/class_serviceCentosRepository.inc:96
+msgid "Centos repository"
 msgstr ""
 
 #: config/fai/class_faiConfig.inc:28
@@ -1241,476 +828,3 @@ msgstr ""
 #: config/fai/class_faiConfig.inc:60
 msgid "s"
 msgstr ""
-
-#: admin/fai/faiPartitionTableEntry.tpl.c:2 admin/fai/faiVariableEntry.tpl.c:2
-#: admin/fai/faiVariableEntry.tpl.c:5 admin/fai/faiDiskEntry.tpl.c:2
-#: admin/fai/faiTemplate.tpl.c:2 admin/fai/faiTemplate.tpl.c:5
-#: admin/fai/faiVariable.tpl.c:2 admin/fai/faiVariable.tpl.c:5
-#: admin/fai/faiHook.tpl.c:2 admin/fai/faiHook.tpl.c:5
-#: admin/fai/faiPackage.tpl.c:2 admin/fai/faiPackage.tpl.c:5
-#: admin/fai/faiTemplateEntry.tpl.c:2 admin/fai/faiTemplateEntry.tpl.c:5
-#: admin/fai/faiScriptEntry.tpl.c:2 admin/fai/faiScriptEntry.tpl.c:5
-#: admin/fai/faiPartitionTable.tpl.c:2 admin/fai/faiPartitionTable.tpl.c:5
-#: admin/fai/faiScript.tpl.c:2 admin/fai/faiScript.tpl.c:5
-#: admin/fai/faiProfile.tpl.c:2 admin/fai/faiProfile.tpl.c:5
-#: admin/fai/faiProfile.tpl.c:14 admin/fai/faiHookEntry.tpl.c:2
-#: admin/fai/faiHookEntry.tpl.c:5
-msgid "Generic"
-msgstr "GenÃ©rico"
-
-#: admin/fai/faiPartitionTableEntry.tpl.c:14
-#: admin/fai/faiPartitionTableEntry.tpl.c:17 admin/fai/faiDiskEntry.tpl.c:23
-#: admin/fai/faiDiskEntry.tpl.c:26
-msgid "Partition entries"
-msgstr "Entradas en la particiÃ³n"
-
-#: admin/fai/faiPartitionTableEntry.tpl.c:20
-#: admin/fai/faiPartitionTableEntry.tpl.c:23 admin/fai/faiDiskEntry.tpl.c:29
-#: admin/fai/faiDiskEntry.tpl.c:32
-msgid "Add partition"
-msgstr "AÃ±adir particiÃ³n"
-
-#: admin/fai/branch_selector.tpl.c:2
-msgid "Releases"
-msgstr "Versiones"
-
-#: admin/fai/branch_selector.tpl.c:5
-msgid "Current release"
-msgstr "VersiÃ³n actual"
-
-#: admin/fai/branch_selector.tpl.c:8 admin/fai/branch_selector.tpl.c:17
-#: admin/fai/fai-filter.tpl.c:8 admin/fai/fai-filter.tpl.c:17
-msgid "Create release"
-msgstr "Crear versiÃ³n"
-
-#: admin/fai/branch_selector.tpl.c:11 admin/fai/branch_selector.tpl.c:23
-#: admin/fai/fai-filter.tpl.c:11 admin/fai/fai-filter.tpl.c:23
-msgid "Create read-only release"
-msgstr "Crear versiÃ³n de solo lectura"
-
-#: admin/fai/branch_selector.tpl.c:20 admin/fai/fai-filter.tpl.c:20
-msgid "Freeze"
-msgstr "Suspendido"
-
-#: admin/fai/branch_selector.tpl.c:26 admin/fai/fai-filter.tpl.c:26
-msgid "Delete current release"
-msgstr "Eliminar la versiÃ³n actual"
-
-#: admin/fai/faiPartition.tpl.c:2
-msgid "Partition"
-msgstr "ParticiÃ³n"
-
-#: admin/fai/faiPartition.tpl.c:17
-msgid "Resize existing partition"
-msgstr "Redimensionar particiÃ³n existente"
-
-#: admin/fai/faiPartition.tpl.c:20
-msgid "Bootable"
-msgstr "Inicializable"
-
-#: admin/fai/faiPartition.tpl.c:26 admin/fai/faiDiskEntry.tpl.c:20
-msgid "Combined physical partitions"
-msgstr "Particiones fÃsicas combinadas"
-
-#: admin/fai/faiPartition.tpl.c:29
-msgid "Toggle missing"
-msgstr "Cambiar fallo"
-
-#: admin/fai/faiPartition.tpl.c:32
-msgid "Toggle spare"
-msgstr "Cambiar repuesto"
-
-#: admin/fai/faiPartition.tpl.c:35
-msgid "Filesystem"
-msgstr "Sistemas de archivos"
-
-#: admin/fai/faiPartition.tpl.c:38
-msgid "Filesystem create options"
-msgstr "Crear opciones del sistema de archivos"
-
-#: admin/fai/faiPartition.tpl.c:41
-msgid "Encrypted"
-msgstr "Encriptado"
-
-#: admin/fai/faiPartition.tpl.c:44
-msgid "Tune options"
-msgstr "Opciones de ajuste"
-
-#: admin/fai/faiNewBranch.tpl.c:2
-msgid ""
-"You are now going to create a branch or locked branch. This action clones "
-"the existing release to another release name. Branches can be modified as "
-"usual. FAI classes of locked branches cannot be modified, just additional "
-"classes are possible. Branch names should be alphanumeric, excluding the "
-"reserved names 'scripts', 'hooks', 'partitions', 'variables', 'templates' "
-"and 'fai'."
-msgstr "Va a crear una rama o una rama suspendida. Esta acciÃ³n clona la versiÃ³n actual a otro nombre de versiÃ³n. Las ramas se pueden modificar de la forma usual. Las clases FAI en ramas suspendidas no podrÃ¡n se modificadas, solo sera posible aÃ±adir clases. Los nombres de las ramas deberÃ¡n ser alfanumÃ©ricos, excluyendo las palabras reservadas 'scripts','hooks','partitions','variables' y 'fai'."
-
-#: admin/fai/faiNewBranch.tpl.c:5
-msgid ""
-"Branches are created as subreleases of the currently selected branch. "
-"Creating a new branch named 1.0.2 in SARGE for example, will result in a new"
-" release called SARGE/1.0.2."
-msgstr "Las ramas son creadas como subversiones de la rama seleccionada actualmente. Por ejemplo creando una nueva rama llamada 1.0.2 en SARGE, darÃ¡ como resultado una nueva versiÃ³n llamada SARGE/1.0.2."
-
-#: admin/fai/faiNewBranch.tpl.c:8
-msgid "Please enter a name for the branch"
-msgstr "Por favor introduzca un nombre para la rama"
-
-#: admin/fai/faiNewBranch.tpl.c:11
-msgid "Processing the requested operation"
-msgstr "Procesando la operaciÃ³n solicitada"
-
-#: admin/fai/faiNewBranch.tpl.c:14
-msgid ""
-"As soon as the copy operation has finished, you can scroll down to end of "
-"the page and press the 'Continue' button to continue with the fai management"
-" dialog."
-msgstr "Tan pronto como la termine la operaciÃ³n copiar, podrÃ¡ bajar al final de la pÃ¡gina y presionar el botÃ³n 'Continuar' para continuar con el asistente de administraciÃ³n FAI."
-
-#: admin/fai/faiNewBranch.tpl.c:17
-msgid ""
-"Your browser doesn't support iframes, please use this link to perform the "
-"requested operation."
-msgstr "Su navegador no soporta IFRAMES, porfavor use este enlace para ejecutar la operaciÃ³n solicitada."
-
-#: admin/fai/faiNewBranch.tpl.c:20
-msgid "Perform requested operation."
-msgstr "Ejecutar la operaciÃ³n solicitada"
-
-#: admin/fai/faiNewBranch.tpl.c:23
-msgid "Initiate operation"
-msgstr "Iniciando operaciÃ³n"
-
-#: admin/fai/faiVariableEntry.tpl.c:14 admin/fai/faiVariableEntry.tpl.c:17
-msgid "Variable attributes"
-msgstr "Atributos de las variables"
-
-#: admin/fai/faiDiskEntry.tpl.c:11
-msgid "fstab key"
-msgstr "clave fstab"
-
-#: admin/fai/faiDiskEntry.tpl.c:17
-msgid "Disk label"
-msgstr "Etiqueta de disco"
-
-#: admin/fai/faiTemplate.tpl.c:17
-msgid "List of template files"
-msgstr "Lista de ficheros plantillas"
-
-#: admin/fai/faiVariable.tpl.c:17
-msgid "List of assigned variables"
-msgstr "Lista de variables asignadas"
-
-#: admin/fai/faiVariable.tpl.c:20
-msgid "Choose a variable to delete or edit"
-msgstr "Elegir una variable para eliminar o editar"
-
-#: admin/fai/askClassName.tpl.c:2
-msgid ""
-"Adding a new class to the FAI management, requires a class name. You have to"
-" specify a unique class name for unique types of FAI classes, while you can "
-"use the same class name for different types of FAI classes. In the laste "
-"case, FAI will automatically enclose all these different class types to one "
-"unique class name."
-msgstr "AÃ±adir una nueva clase FAI al administrador FAI necesita un nombre de clase. Debe introducir un nombre de clase Ãºnico para los tipos Ãºnicos de clases FAI, mientras puede usar el mismo nombre de clase para tipos diferentes de clases FAI. En este ultimo caso, FAI incluirÃ¡ todos los tipos de clases diferentes en un nombre de clase Ãºnico."
-
-#: admin/fai/askClassName.tpl.c:5
-msgid ""
-"Please use one of the following methods to choose the name for the new FAI "
-"class."
-msgstr "Por favor elija uno de los siguientes mÃ©todos para seleccionar el nombre de la nueva clase FAI."
-
-#: admin/fai/askClassName.tpl.c:8
-msgid "Enter FAI class name manually"
-msgstr "Introduzca el nombre de la clase FAI manualmente"
-
-#: admin/fai/askClassName.tpl.c:14
-msgid "Choose FAI class name from a list of existing classes"
-msgstr "Elija un nombre de clase FAI de la lista de clases existentes"
-
-#: admin/fai/askClassName.tpl.c:20
-msgid "Choose class name"
-msgstr "Elija nombre de clase"
-
-#: admin/fai/faiGroupHandle.tpl.c:2
-msgid "Please select the objects you want to remove:"
-msgstr "Por favor seleccione los objetos que quiere eliminar:"
-
-#: admin/fai/faiGroupHandle.tpl.c:5
-msgid "Freezed"
-msgstr "Congelado"
-
-#: admin/fai/faiGroupHandle.tpl.c:8
-msgid "Select the object you want to edit:"
-msgstr "Seleccione el objeto que quiere editar:"
-
-#: admin/fai/faiGroupHandle.tpl.c:11
-msgid "Select the object you want to copy:"
-msgstr "Seleccione el objeto que quiere copiar:"
-
-#: admin/fai/remove.tpl.c:5
-msgid ""
-"This includes all account data, system access rules, imap settings, etc. for"
-" this user. Please double check if your really want to do this since there "
-"is no way for FusionDirectory to get your data back."
-msgstr "Esto incluye toda la data de la cuenta, las reglas de acceso de sistema, opciones de imap, etc. Para este usuario. Por favor verifique bien si quiere hacer esto ya que no hay forma para que FusionDirectory recupere la data."
-
-#: admin/fai/remove.tpl.c:8 admin/fai/remove_branch.tpl.c:8
-msgid "So - if you're sure - press 'Delete' to continue or 'Cancel' to abort."
-msgstr "Entonces, si esta seguro, presione <i>Eliminar</i> para continuar o <i>Cancelar</i> para Abortar."
-
-#: admin/fai/faiHook.tpl.c:17
-msgid "List of hook scripts"
-msgstr "Lista de scripts de mÃ©todos"
-
-#: admin/fai/packageSelect/selectPackage-list.tpl.c:2
-#: admin/fai/classSelect/selectClass-list.tpl.c:5
-msgid "Update"
-msgstr "Actualizar"
-
-#: admin/fai/packageSelect/selectPackage-list.tpl.c:5
-#: admin/fai/classSelect/selectClass-list.tpl.c:8
-msgid "Submit"
-msgstr "Enviar"
-
-#: admin/fai/packageSelect/selectPackage-filter.tpl.c:2
-#: admin/fai/classSelect/selectClass-filter.tpl.c:2
-#: admin/fai/fai-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."
-
-#: admin/fai/remove_branch.tpl.c:5
-msgid ""
-"This includes all account data, system access, etc. for this branch. Please "
-"double check if your really want to do this since there is no way for "
-"FusionDirectory to get your data back."
-msgstr ""
-
-#: admin/fai/faiPackage.tpl.c:26
-msgid "Install method"
-msgstr "MÃ©todo de instalaciÃ³n"
-
-#: admin/fai/faiPackage.tpl.c:29
-msgid "Please select the installation method"
-msgstr "Por favor seleccione un mÃ©todo de instalaciÃ³n."
-
-#: admin/fai/faiPackage.tpl.c:32 admin/fai/faiPackage.tpl.c:35
-msgid "Used packages"
-msgstr "Paquetes usados"
-
-#: admin/fai/faiPackage.tpl.c:38
-msgid "Add from list"
-msgstr "AÃ±adir de la lista"
-
-#: admin/fai/faiProfileEntry.tpl.c:2
-msgid "List of FAI objects (Fully Automatic Installation)"
-msgstr "Lista de objetos FAI (InstalaciÃ³n Completamente automÃ¡tica)"
-
-#: admin/fai/faiProfileEntry.tpl.c:5
-msgid "Information"
-msgstr "InformaciÃ³n"
-
-#: admin/fai/faiProfileEntry.tpl.c:8
-msgid ""
-"This menu allows you to select FAI class names and to add them to the "
-"currently edited profile."
-msgstr "Este menÃº le permite seleccionar nombres de clases FAI y aÃ±adirlas a el perfil editado actualmente."
-
-#: admin/fai/faiProfileEntry.tpl.c:11
-msgid "Filters"
-msgstr "Filtros"
-
-#: admin/fai/faiProfileEntry.tpl.c:14
-msgid "Show only classes with templates"
-msgstr "Mostrar solo clases con plantillas"
-
-#: admin/fai/faiProfileEntry.tpl.c:17
-msgid "Show only classes with scripts"
-msgstr "Solo mostrar clases con scripts"
-
-#: admin/fai/faiProfileEntry.tpl.c:20
-msgid "Show only classes with hooks"
-msgstr "Solo mostrar clases con mÃ©todos"
-
-#: admin/fai/faiProfileEntry.tpl.c:23
-msgid "Show only classes with variables"
-msgstr "Mostrar solo clases con variables"
-
-#: admin/fai/faiProfileEntry.tpl.c:26
-msgid "Show only classes with packages"
-msgstr "Mostrar solo clases con paquetes"
-
-#: admin/fai/faiProfileEntry.tpl.c:29
-msgid "Show only classes with partitions"
-msgstr "Mostrar solo clases con particiones"
-
-#: admin/fai/faiProfileEntry.tpl.c:32 admin/fai/faiProfileEntry.tpl.c:35
-msgid "Display objects matching"
-msgstr "Mostrar objetos que coincidan"
-
-#: admin/fai/faiProfileEntry.tpl.c:38
-msgid "Regular expression for matching object names"
-msgstr "Expresiones regulares para buscar nombre de objetos"
-
-#: admin/fai/faiTemplateEntry.tpl.c:17 admin/fai/faiTemplateEntry.tpl.c:20
-msgid "Template attributes"
-msgstr "Atributos de la plantilla"
-
-#: admin/fai/faiTemplateEntry.tpl.c:26 admin/fai/faiTemplateEntry.tpl.c:29
-msgid "Save template"
-msgstr "Guardar plantilla"
-
-#: admin/fai/faiTemplateEntry.tpl.c:32 admin/fai/faiTemplateEntry.tpl.c:35
-msgid "Edit template"
-msgstr "Editar plantilla"
-
-#: admin/fai/faiTemplateEntry.tpl.c:38
-msgid "Full path"
-msgstr "Ruta completa"
-
-#: admin/fai/faiTemplateEntry.tpl.c:41
-msgid "Upload"
-msgstr "Enviar"
-
-#: admin/fai/faiTemplateEntry.tpl.c:44
-msgid "Owner"
-msgstr "Propietario"
-
-#: admin/fai/faiTemplateEntry.tpl.c:50
-msgid "Access"
-msgstr "Acceso"
-
-#: admin/fai/faiTemplateEntry.tpl.c:53
-msgid "Class"
-msgstr "Clase"
-
-#: admin/fai/faiTemplateEntry.tpl.c:56
-msgid "Read"
-msgstr "Lectura"
-
-#: admin/fai/faiTemplateEntry.tpl.c:59
-msgid "Write"
-msgstr "Escritura"
-
-#: admin/fai/faiTemplateEntry.tpl.c:62
-msgid "Execute"
-msgstr "Ejecute"
-
-#: admin/fai/faiTemplateEntry.tpl.c:65
-msgid "Special"
-msgstr "Especial"
-
-#: admin/fai/faiTemplateEntry.tpl.c:71
-msgid "SUID"
-msgstr "SUID"
-
-#: admin/fai/faiTemplateEntry.tpl.c:77
-msgid "SGID"
-msgstr "SGID"
-
-#: admin/fai/faiTemplateEntry.tpl.c:80
-msgid "Others"
-msgstr "Otros"
-
-#: admin/fai/faiTemplateEntry.tpl.c:83
-msgid "sticky"
-msgstr "estatico"
-
-#: admin/fai/faiScriptEntry.tpl.c:17 admin/fai/faiScriptEntry.tpl.c:26
-msgid "Script attributes"
-msgstr "ParÃ¡metros del script"
-
-#: admin/fai/faiScriptEntry.tpl.c:23
-msgid ""
-"Choose a priority. Low values result in an earlier, high values in a later "
-"execution."
-msgstr "Elija una prioridad. Valores bajos iniciarÃ¡n antes y valores altos mas tarde, la ejecuciÃ³n."
-
-#: admin/fai/faiScriptEntry.tpl.c:32 admin/fai/faiHookEntry.tpl.c:32
-msgid "Import script"
-msgstr "Importar script"
-
-#: admin/fai/classSelect/selectClass-list.tpl.c:2
-msgid "Base"
-msgstr "Base"
-
-#: admin/fai/fai-filter.tpl.c:29
-msgid "Show profiles"
-msgstr "Mostrar perfiles"
-
-#: admin/fai/fai-filter.tpl.c:32
-msgid "Show templates"
-msgstr "Mostrar plantillas"
-
-#: admin/fai/fai-filter.tpl.c:35
-msgid "Show scripts"
-msgstr "Mostrar scrips"
-
-#: admin/fai/fai-filter.tpl.c:38
-msgid "Show hooks"
-msgstr "Mostrar metodos"
-
-#: admin/fai/fai-filter.tpl.c:41
-msgid "Show variables"
-msgstr "Mostrar variables"
-
-#: admin/fai/fai-filter.tpl.c:44
-msgid "Show packages"
-msgstr "Mostrar paquetes"
-
-#: admin/fai/fai-filter.tpl.c:47
-msgid "Show partitions"
-msgstr "Mostrar particiones"
-
-#: admin/fai/faiTemplateEdit.tpl.c:2
-msgid "This FAI template is write protected. Editing may break it!"
-msgstr "Esta plantilla FAS estÃ¡ protegida contra escritura. Â¡Editarla puede corromperla!"
-
-#: admin/fai/faiTemplateEdit.tpl.c:5
-msgid "Edit anyway"
-msgstr "Editar de cualquier manera"
-
-#: admin/fai/faiPartitionTable.tpl.c:14
-msgid "Use 'setup-storage' to partition the disk"
-msgstr "Use 'configurar-almacenamiento' para particionar el disco"
-
-#: admin/fai/faiPartitionTable.tpl.c:20
-msgid "Discs"
-msgstr "Discos"
-
-#: admin/fai/faiPartitionTable.tpl.c:23 admin/fai/faiPartitionTable.tpl.c:26
-#: admin/fai/faiPartitionTable.tpl.c:41 admin/fai/faiPartitionTable.tpl.c:44
-msgid "Add disk"
-msgstr "AÃ±adir disco"
-
-#: admin/fai/faiPartitionTable.tpl.c:29 admin/fai/faiPartitionTable.tpl.c:32
-#: admin/fai/faiPartitionTable.tpl.c:47 admin/fai/faiPartitionTable.tpl.c:50
-msgid "Add RAID"
-msgstr "AÃ±adir RAID"
-
-#: admin/fai/faiPartitionTable.tpl.c:35 admin/fai/faiPartitionTable.tpl.c:38
-#: admin/fai/faiPartitionTable.tpl.c:53 admin/fai/faiPartitionTable.tpl.c:56
-msgid "Add volume group"
-msgstr "AÃ±adir grupo de volumen"
-
-#: admin/fai/faiScript.tpl.c:17
-msgid "List of scripts"
-msgstr "Lista de scripts"
-
-#: admin/fai/faiProfile.tpl.c:20
-msgid "Choose a priority"
-msgstr "Elija una prioridad"
-
-#: admin/fai/faiHookEntry.tpl.c:14 admin/fai/faiHookEntry.tpl.c:17
-#: admin/fai/faiHookEntry.tpl.c:26
-msgid "Hook attributes"
-msgstr "CaracterÃsticas del mÃ©todo"
-
-#: admin/fai/faiHookEntry.tpl.c:23
-msgid "Choose an existing FAI task"
-msgstr "Seleccionar una tarea FAI existente"
diff --git a/fai/locale/es_VE/fusiondirectory.po b/fai/locale/es_VE/fusiondirectory.po
index e693a47f2b6edd67793e995141b92ccc27ae8441..e2acc2bfd8008232e9d3a42a932f7ca23b7e0ce5 100644
--- a/fai/locale/es_VE/fusiondirectory.po
+++ b/fai/locale/es_VE/fusiondirectory.po
@@ -5,379 +5,188 @@
 # Translators:
 msgid ""
 msgstr ""
-"Project-Id-Version: FusionDirectory-108\n"
+"Project-Id-Version: FusionDirectory-109\n"
 "Report-Msgid-Bugs-To: documentation@lists.fusiondirectory.org\n"
-"POT-Creation-Date: 2015-03-19 21:45+0100\n"
-"PO-Revision-Date: 2015-02-25 16:12+0000\n"
+"POT-Creation-Date: 2014-12-15 17:47+0100\n"
+"PO-Revision-Date: 2015-02-25 16:13+0000\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>\n"
-"Language-Team: Spanish (Venezuela) (http://www.transifex.com/projects/p/FusionDirectory-108/language/es_VE/)\n"
+"Language-Team: Spanish (Venezuela) (http://www.transifex.com/projects/p/FusionDirectory-109/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/fai/class_faiScriptEntry.inc:79 admin/fai/class_faiScriptEntry.inc:82
-#: admin/fai/class_faiManagement.inc:240 admin/fai/class_faiManagement.inc:768
-#: admin/fai/class_faiManagement.inc:774
-#: admin/fai/class_faiPartitionTable.inc:268
-#: admin/fai/class_faiPartitionTable.inc:331
-#: admin/fai/class_faiDiskEntry.inc:445 admin/fai/class_FAI.inc:570
-#: admin/fai/class_faiHookEntry.inc:83 admin/fai/class_faiHookEntry.inc:86
-#: admin/fai/class_faiScript.inc:249 admin/fai/class_faiTemplate.inc:232
-#: admin/fai/class_faiHook.inc:259 admin/fai/class_faiVariable.inc:162
-#: admin/systems/class_faiLogView.inc:207
-#: admin/systems/class_faiLogView.inc:242
-msgid "Error"
-msgstr "Error"
-
-#: admin/fai/class_faiScriptEntry.inc:82 admin/fai/class_faiHookEntry.inc:86
-msgid "file is empty"
-msgstr "el archivo estÃ¡ vacÃo"
-
-#: admin/fai/class_faiScriptEntry.inc:102 admin/fai/class_faiHookEntry.inc:102
-#: admin/fai/class_faiScript.inc:349 admin/fai/class_faiScript.inc:374
-#: admin/fai/class_faiTemplate.inc:320 admin/fai/class_faiHook.inc:346
-msgid "Download"
-msgstr "Descargar"
-
-#: admin/fai/class_faiScriptEntry.inc:147
-#: admin/fai/class_faiScriptEntry.inc:151
-#: admin/fai/class_faiScriptEntry.inc:154
-#: admin/fai/class_faiScriptEntry.inc:197
-#: admin/fai/class_faiManagement.inc:768 admin/fai/class_faiManagement.inc:774
-#: admin/fai/class_faiPackage.inc:685
-#: admin/fai/class_faiPartitionTable.inc:779
-#: admin/fai/class_faiDiskEntry.inc:702 admin/fai/class_faiDiskEntry.inc:705
-#: admin/fai/class_faiDiskEntry.inc:758
-#: admin/fai/class_faiTemplateEntry.inc:247
-#: admin/fai/class_faiTemplateEntry.inc:312
-#: admin/fai/class_faiPartitionTableEntry.inc:353
-#: admin/fai/class_faiPartitionTableEntry.inc:356
-#: admin/fai/class_faiPartitionTableEntry.inc:360
-#: admin/fai/class_faiPartitionTableEntry.inc:455
-#: admin/fai/packageSelect/selectPackage-list.xml:40
-#: admin/fai/class_faiProfile.inc:414 admin/fai/class_faiProfile.inc:463
-#: admin/fai/class_faiHookEntry.inc:157 admin/fai/class_faiHookEntry.inc:162
-#: admin/fai/class_faiHookEntry.inc:165 admin/fai/class_faiHookEntry.inc:207
-#: admin/fai/class_askClassName.inc:163 admin/fai/class_askClassName.inc:167
-#: admin/fai/class_askClassName.inc:171 admin/fai/class_askClassName.inc:198
-#: admin/fai/class_faiScript.inc:347 admin/fai/class_faiScript.inc:605
-#: admin/fai/classSelect/selectClass-list.xml:28
-#: admin/fai/class_faiTemplate.inc:512
-#: admin/fai/class_faiVariableEntry.inc:103
-#: admin/fai/class_faiVariableEntry.inc:112
-#: admin/fai/class_faiVariableEntry.inc:115
-#: admin/fai/class_faiVariableEntry.inc:149 admin/fai/class_faiHook.inc:531
-#: admin/fai/class_faiVariable.inc:398 admin/fai/fai-list.xml:80
-#: admin/fai/faiPartitionTableEntry.tpl.c:8 admin/fai/faiPartition.tpl.c:5
-#: admin/fai/faiVariableEntry.tpl.c:8 admin/fai/faiDiskEntry.tpl.c:8
-#: admin/fai/faiTemplate.tpl.c:8 admin/fai/faiVariable.tpl.c:8
-#: admin/fai/faiHook.tpl.c:8
-#: admin/fai/packageSelect/selectPackage-filter.tpl.c:8
-#: admin/fai/faiPackage.tpl.c:8 admin/fai/faiScriptEntry.tpl.c:8
-#: admin/fai/classSelect/selectClass-filter.tpl.c:5
-#: admin/fai/fai-filter.tpl.c:50 admin/fai/faiPartitionTable.tpl.c:8
-#: admin/fai/faiScript.tpl.c:8 admin/fai/faiProfile.tpl.c:8
-#: admin/fai/faiHookEntry.tpl.c:8
-msgid "Name"
-msgstr "Nombre"
-
-#: admin/fai/class_faiScriptEntry.inc:159 admin/fai/class_faiHookEntry.inc:170
-#: admin/fai/class_faiScript.inc:594 admin/fai/fai-list.xml:122
-#: admin/fai/faiScriptEntry.tpl.c:29 admin/fai/faiHookEntry.tpl.c:29
-msgid "Script"
-msgstr "Script"
-
-#: admin/fai/class_faiScriptEntry.inc:190
-#: admin/fai/class_faiScriptEntry.inc:199
-msgid "Script entry"
-msgstr "Entrada de script"
-
-#: admin/fai/class_faiScriptEntry.inc:191
-msgid "FAI script entry"
-msgstr "Entrada de script FAI"
-
-#: admin/fai/class_faiScriptEntry.inc:198 admin/fai/class_faiPackage.inc:686
-#: admin/fai/class_faiPartitionTable.inc:780
-#: admin/fai/class_faiDiskEntry.inc:759
-#: admin/fai/class_faiTemplateEntry.inc:313
-#: admin/fai/class_faiPartitionTableEntry.inc:456
-#: admin/fai/class_faiProfile.inc:464 admin/fai/class_faiHookEntry.inc:208
-#: admin/fai/class_faiScript.inc:606 admin/fai/class_faiTemplate.inc:513
-#: admin/fai/class_faiVariableEntry.inc:150 admin/fai/class_faiHook.inc:532
-#: admin/fai/class_faiVariable.inc:399
-#: admin/fai/faiPartitionTableEntry.tpl.c:11 admin/fai/faiPartition.tpl.c:11
-#: admin/fai/faiVariableEntry.tpl.c:11 admin/fai/faiDiskEntry.tpl.c:14
-#: admin/fai/faiTemplate.tpl.c:11 admin/fai/faiVariable.tpl.c:11
-#: admin/fai/faiHook.tpl.c:11 admin/fai/faiPackage.tpl.c:11
-#: admin/fai/faiTemplateEntry.tpl.c:14 admin/fai/faiScriptEntry.tpl.c:11
-#: admin/fai/faiPartitionTable.tpl.c:11 admin/fai/faiScript.tpl.c:11
-#: admin/fai/faiProfile.tpl.c:11 admin/fai/faiHookEntry.tpl.c:11
-msgid "Description"
-msgstr "DescripciÃ³n"
-
-#: admin/fai/class_faiScriptEntry.inc:200
-msgid "Script Priority"
-msgstr "Prioridad de script"
-
-#: admin/fai/class_faiManagement.inc:188
-msgid "partition table"
-msgstr "Tabla de particiones"
-
-#: admin/fai/class_faiManagement.inc:189 admin/fai/fai-list.xml:31
-msgid "script"
-msgstr "Script"
-
-#: admin/fai/class_faiManagement.inc:190 admin/fai/fai-list.xml:47
-msgid "hook"
-msgstr "mÃ©todo"
-
-#: admin/fai/class_faiManagement.inc:191 admin/fai/fai-list.xml:39
-msgid "variable"
-msgstr "Variable"
-
-#: admin/fai/class_faiManagement.inc:192 admin/fai/fai-list.xml:63
-msgid "template"
-msgstr "plantilla"
-
-#: admin/fai/class_faiManagement.inc:193
-msgid "package list"
-msgstr "lista de paquetes"
-
-#: admin/fai/class_faiManagement.inc:210 admin/fai/class_faiManagement.inc:226
-#: admin/fai/class_faiManagement.inc:332 admin/fai/class_faiManagement.inc:390
-#: admin/fai/class_faiManagement.inc:480 admin/fai/class_faiManagement.inc:575
-#: admin/fai/class_faiManagement.inc:598 admin/fai/class_faiManagement.inc:619
-msgid "Permission error"
-msgstr "Error de permisos"
-
-#: admin/fai/class_faiManagement.inc:211 admin/fai/class_faiManagement.inc:226
-#, php-format
-msgid "You have no permission to create a new %s!"
-msgstr "Â¡No tiene permisos para crear un nuevo %s!"
-
-#: admin/fai/class_faiManagement.inc:226 admin/fai/fai-list.xml:55
-msgid "profile"
-msgstr "perfil"
-
-#: admin/fai/class_faiManagement.inc:328
-msgid "Branch locked"
-msgstr "Rama bloqueada"
-
-#: admin/fai/class_faiManagement.inc:329
-#, php-format
-msgid "The following entries are locked, you can't remove them %s."
-msgstr "Las siguientes entradas estÃ¡n bloqueadas, no puede eliminar %s."
-
-#: admin/fai/class_faiManagement.inc:346
-msgid "FAI object"
-msgstr "Objeto FAI"
-
-#: admin/fai/class_faiManagement.inc:477
-msgid "FAI branch/freeze"
-msgstr "Rama congelada FAI"
-
-#: admin/fai/class_faiManagement.inc:480
-msgid "You have no permission to delete this release!"
-msgstr "Â¡No tiene permisos para eliminar esta versiÃ³n!"
-
-#: admin/fai/class_faiManagement.inc:496 admin/fai/remove.tpl.c:2
-#: admin/fai/remove_branch.tpl.c:2
-msgid "Warning"
-msgstr "Aviso"
-
-#: admin/fai/class_faiManagement.inc:496
-msgid "Release remove aborted because the release name check failed!"
-msgstr "Â¡La eliminaciÃ³n de la versiÃ³n ha sido cancelada al fallar la comprobaciÃ³n del nombre de la versiÃ³n!"
-
-#: admin/fai/class_faiManagement.inc:573 admin/fai/class_faiManagement.inc:596
-msgid "Configuration"
-msgstr "ConfiguraciÃ³n"
-
-#: admin/fai/class_faiManagement.inc:575 admin/fai/class_faiManagement.inc:598
-#: admin/fai/class_faiManagement.inc:619
-msgid "Branch"
-msgstr "Rama"
-
-#: admin/fai/class_faiManagement.inc:725 admin/fai/askClassName.tpl.c:23
-msgid "Continue"
-msgstr "Continuar"
-
-#: admin/fai/class_faiManagement.inc:926
-#: admin/fai/class_faiPartitionTable.inc:768
-#: admin/fai/class_faiProfile.inc:318 admin/fai/class_askClassName.inc:99
-#: admin/fai/classSelect/class_classSelect.inc:58
-#: admin/fai/class_faiGroupHandle.inc:120
-#: admin/fai/class_faiProfileEntry.inc:163 admin/fai/fai-list.xml:146
-msgid "Partition table"
-msgstr "Tabla de particiones"
-
-#: admin/fai/class_faiManagement.inc:928
-#: admin/fai/class_faiGroupHandle.inc:122 admin/fai/fai-list.xml:140
-msgid "Package list"
-msgstr "Lista de paquetes"
-
-#: admin/fai/class_faiManagement.inc:930
-#: admin/fai/class_faiGroupHandle.inc:124
-msgid "Scripts"
-msgstr "Scripts"
-
-#: admin/fai/class_faiManagement.inc:932
-#: admin/fai/class_faiGroupHandle.inc:126
-msgid "Variables"
-msgstr "Variables"
-
-#: admin/fai/class_faiManagement.inc:934
-#: admin/fai/class_faiGroupHandle.inc:128
-msgid "Hooks"
-msgstr "MÃ©todos"
-
-#: admin/fai/class_faiManagement.inc:936 admin/fai/class_faiProfile.inc:454
-#: admin/fai/class_askClassName.inc:104 admin/fai/class_faiGroupHandle.inc:130
-#: admin/fai/fai-list.xml:110
-msgid "Profile"
-msgstr "Perfil"
-
-#: admin/fai/class_faiManagement.inc:938
-#: admin/fai/class_faiGroupHandle.inc:132
-msgid "Templates"
-msgstr "Plantillas"
-
-#: admin/fai/class_faiManagement.inc:1039
-#: admin/fai/class_faiManagement.inc:1045
+#: admin/fai/class_faiManagement.inc:117 admin/fai/class_faiManagement.inc:122
 #: admin/fai/packageSelect/selectPackage-list.xml:14
-#: admin/fai/classSelect/selectClass-list.xml:15
-#: admin/systems/class_faiStartup.inc:177 config/fai/class_faiConfig.inc:41
+#: admin/systems/class_faiStartup.inc:178 config/fai/class_faiConfig.inc:41
 msgid "FAI"
 msgstr "FAI"
 
-#: admin/fai/class_faiManagement.inc:1040
+#: admin/fai/class_faiManagement.inc:118
 msgid "Manage FAI software packages and deployment recipes"
 msgstr ""
 
-#: admin/fai/class_faiPackage.inc:261
-msgid "Invalid package names"
-msgstr "Nombre de paquete no vÃ¡lido"
-
-#: admin/fai/class_faiPackage.inc:262
-#, php-format
-msgid "The following package names don't match the Debian policy: %s"
-msgstr "Los siguientes nombres de paquetes no cumplen la polÃtica Debian: %s"
-
-#: admin/fai/class_faiPackage.inc:421 admin/fai/class_faiPackage.inc:422
-msgid "Configured"
-msgstr "Configurado"
-
-#: admin/fai/class_faiPackage.inc:428 admin/fai/class_faiPackage.inc:429
-msgid "Package marked for removal"
-msgstr "El paquete estÃ¡ marcado para eliminaciÃ³n"
-
-#: admin/fai/class_faiPackage.inc:445
-msgid "Mark package for removal"
-msgstr "Marcar paquetes para eliminaciÃ³n"
-
-#: admin/fai/class_faiPackage.inc:451
-msgid "Configure this package"
-msgstr "Configurar este paquete"
+#: admin/fai/class_faiPackage.inc:157
+msgid "Mark for installation"
+msgstr ""
 
-#: admin/fai/class_faiPackage.inc:455
-msgid "Remove this package"
-msgstr "Eliminar este paquete"
+#: admin/fai/class_faiPackage.inc:161
+msgid "Mark for removal"
+msgstr ""
 
-#: admin/fai/class_faiPackage.inc:534
-msgid "Please select a least one package!"
-msgstr "Â¡Por favor seleccione al menos un Paquete!"
+#: admin/fai/class_faiPackage.inc:166
+msgid "Edit configuration"
+msgstr ""
 
-#: admin/fai/class_faiPackage.inc:538
-msgid ""
-"Please choose a valid release/section combination for your repository setup!"
-msgstr "Â¡Por favor elija una versiÃ³n/secciÃ³n valida para la configuraciÃ³n de su catÃ¡logo!"
+#: admin/fai/class_faiPackage.inc:247
+#: admin/fai/class_faiPartitionTable.inc:209
+#: admin/fai/class_faiPartitionTable.inc:250
+#: admin/fai/class_faiTemplate.inc:114
+#: admin/systems/services/repository/class_serviceDebianRepository.inc:172
+#: admin/systems/services/repository/class_serviceDebianRepository.inc:189
+#: admin/systems/services/repository/class_serviceDebianRepository.inc:193
+msgid "LDAP error"
+msgstr "Error de LDAP"
 
-#: admin/fai/class_faiPackage.inc:571
+#: admin/fai/class_faiPackage.inc:279
 #: admin/fai/packageSelect/class_filterFAIPackages.inc:41
 #: admin/fai/packageSelect/class_filterFAIPackages.inc:46
 #: admin/fai/class_faiPackageConfiguration.inc:55
-#: admin/systems/class_faiStartup.inc:132
-#: admin/systems/class_faiStartup.inc:159
-msgid "Infrastructure service"
-msgstr ""
+#: admin/systems/class_faiStartup.inc:133
+#: admin/systems/class_faiStartup.inc:160
+msgid "Service infrastructure"
+msgstr "Infraestructura de servicio"
 
-#: admin/fai/class_faiPackage.inc:587
+#: admin/fai/class_faiPackage.inc:294
 msgid "Unkown packages"
 msgstr ""
 
-#: admin/fai/class_faiPackage.inc:674
-#: admin/fai/faiPackageConfiguration.tpl.c:2
+#: admin/fai/class_faiPackage.inc:365
 msgid "Package"
 msgstr "Paquete"
 
-#: admin/fai/class_faiPackage.inc:675
+#: admin/fai/class_faiPackage.inc:366
 msgid "FAI Package list"
 msgstr "Lista de paquetes FAI"
 
-#: admin/fai/class_faiPackage.inc:679
+#: admin/fai/class_faiPackage.inc:369
 msgid "FAI Package"
 msgstr ""
 
-#: admin/fai/class_faiPackage.inc:687
-msgid "Packages"
-msgstr "Paquetes"
+#: admin/fai/class_faiPackage.inc:385
+#: admin/fai/class_faiPartitionTable.inc:304
+#: admin/fai/class_faiTemplateEntry.inc:140 admin/fai/class_faiProfile.inc:47
+#: admin/fai/class_faiScript.inc:50 admin/fai/class_faiTemplate.inc:173
+#: admin/fai/class_faiHook.inc:50 admin/fai/class_faiVariable.inc:50
+msgid "Properties"
+msgstr "Propiedades"
 
-#: admin/fai/class_faiPackage.inc:688 admin/fai/faiPackage.tpl.c:23
-msgid "Section"
-msgstr "SecciÃ³n"
+#: admin/fai/class_faiPackage.inc:388
+#: admin/fai/class_faiPartitionTable.inc:307 admin/fai/class_faiProfile.inc:50
+#: admin/fai/class_faiScript.inc:53 admin/fai/class_faiTemplate.inc:176
+#: admin/fai/class_faiHook.inc:53 admin/fai/class_faiVariable.inc:53
+msgid "Class name"
+msgstr "Nombre de clase"
 
-#: admin/fai/class_faiPackage.inc:688 admin/fai/class_faiPackage.inc:691
-#: admin/fai/class_faiScript.inc:605 admin/fai/class_faiTemplate.inc:512
-msgid "Readonly"
-msgstr "Solo lectura"
+#: admin/fai/class_faiPackage.inc:388 admin/fai/class_faiScript.inc:53
+#: admin/fai/class_faiHook.inc:53 admin/fai/class_faiVariable.inc:53
+msgid "Variables class name"
+msgstr ""
 
-#: admin/fai/class_faiPackage.inc:689
-msgid "Install Method"
-msgstr "MÃ©todo de instalaciÃ³n"
+#: admin/fai/class_faiPackage.inc:392
+#: admin/fai/class_faiPartitionTable.inc:311
+#: admin/fai/class_faiDiskEntry.inc:738
+#: admin/fai/class_faiTemplateEntry.inc:147 admin/fai/class_faiProfile.inc:54
+#: admin/fai/class_faiScript.inc:57 admin/fai/class_faiScript.inc:75
+#: admin/fai/class_faiTemplate.inc:180 admin/fai/class_faiHook.inc:57
+#: admin/fai/class_faiHook.inc:75 admin/fai/class_faiVariable.inc:57
+#: admin/fai/class_faiVariable.inc:75
+msgid "Description"
+msgstr "DescripciÃ³n"
 
-#: admin/fai/class_faiPackage.inc:690
-msgid "Package configuration"
-msgstr "ConfiguraciÃ³n paquete"
+#: admin/fai/class_faiPackage.inc:392
+#: admin/fai/class_faiPartitionTable.inc:311 admin/fai/class_faiProfile.inc:54
+#: admin/fai/class_faiScript.inc:57 admin/fai/class_faiTemplate.inc:180
+#: admin/fai/class_faiHook.inc:57 admin/fai/class_faiVariable.inc:57
+msgid "Short description of the class"
+msgstr ""
+
+#: admin/fai/class_faiPackage.inc:398 admin/systems/class_faiStartup.inc:90
+msgid "Repository"
+msgstr "Repositorio"
 
-#: admin/fai/class_faiPackage.inc:691 admin/systems/class_faiStartup.inc:78
-#: admin/systems/services/repository/class_serviceRepository.inc:40
-#: admin/fai/branch_selector.tpl.c:14 admin/fai/faiPackage.tpl.c:20
-#: admin/fai/fai-filter.tpl.c:5 admin/fai/fai-filter.tpl.c:14
+#: admin/fai/class_faiPackage.inc:401 admin/systems/class_faiStartup.inc:78
+#: admin/systems/services/repository/class_serviceDebianRepository.inc:52
+#: admin/systems/services/repository/class_serviceCentosRepository.inc:49
 msgid "Release"
 msgstr "VersiÃ³n"
 
-#: admin/fai/class_faiPartitionTable.inc:269
-#: admin/fai/class_faiDiskEntry.inc:446
-#, php-format
-msgid ""
-"The disk cannot be deleted while it is used in the '%s' disk definition!"
-msgstr "Â¡El disco no podrÃ¡ ser eliminado mientras este usado por la definiciÃ³n de disco '%s'!"
+#: admin/fai/class_faiPackage.inc:401
+msgid "Debian release concerned"
+msgstr ""
+
+#: admin/fai/class_faiPackage.inc:405
+#: admin/systems/services/repository/class_serviceDebianRepository.inc:58
+msgid "Sections"
+msgstr "Secciones"
+
+#: admin/fai/class_faiPackage.inc:405
+msgid "Sections concerned"
+msgstr ""
+
+#: admin/fai/class_faiPackage.inc:409
+msgid "Install method"
+msgstr "MÃ©todo de instalaciÃ³n"
+
+#: admin/fai/class_faiPackage.inc:409
+msgid "Install method to use for this package list"
+msgstr ""
+
+#: admin/fai/class_faiPackage.inc:420
+msgid "Packages"
+msgstr "Paquetes"
 
-#: admin/fai/class_faiPartitionTable.inc:416 admin/fai/class_faiScript.inc:360
-#: admin/fai/class_faiScript.inc:362 admin/fai/class_faiTemplate.inc:306
-#: admin/fai/class_faiTemplate.inc:308
-msgid "edit"
-msgstr "editar"
+#: admin/fai/class_faiPackage.inc:424
+msgid "Packages in this class"
+msgstr ""
+
+#: admin/fai/class_faiPartitionTable.inc:61
+#: admin/fai/class_faiDiskEntry.inc:442 admin/systems/class_faiLogView.inc:207
+#: admin/systems/class_faiLogView.inc:242
+msgid "Error"
+msgstr "Error"
+
+#: admin/fai/class_faiPartitionTable.inc:112
+msgid "Add RAID"
+msgstr "AÃ±adir RAID"
+
+#: admin/fai/class_faiPartitionTable.inc:116
+msgid "Add LVM"
+msgstr ""
 
-#: admin/fai/class_faiPartitionTable.inc:418 admin/fai/class_faiScript.inc:364
-#: admin/fai/class_faiTemplate.inc:310
-msgid "delete"
-msgstr "eliminar"
+#: admin/fai/class_faiPartitionTable.inc:284
+msgid "Partition table"
+msgstr "Tabla de particiones"
 
-#: admin/fai/class_faiPartitionTable.inc:769
-#: admin/fai/class_faiPartitionTable.inc:773
+#: admin/fai/class_faiPartitionTable.inc:285
+#: admin/fai/class_faiPartitionTable.inc:288
 msgid "FAI partition table"
 msgstr "Tabla de particiones FAI"
 
-#: admin/fai/class_faiPartitionTable.inc:779 admin/fai/class_faiHook.inc:531
-#: admin/fai/class_faiVariable.inc:398
-msgid "Read only"
-msgstr "Solo lectura"
+#: admin/fai/class_faiPartitionTable.inc:307 admin/fai/class_faiProfile.inc:50
+msgid "Partition table class name"
+msgstr ""
+
+#: admin/fai/class_faiPartitionTable.inc:317
+msgid "Discs"
+msgstr "Discos"
+
+#: admin/fai/class_faiPartitionTable.inc:324
+msgid "Partitions in this class"
+msgstr ""
 
 #: admin/fai/class_faiDiskEntry.inc:273
-#: admin/fai/faiPartitionTableEntry.tpl.c:5 admin/fai/faiDiskEntry.tpl.c:5
 msgid "Device"
 msgstr "Dispositivo"
 
@@ -389,103 +198,103 @@ msgstr "Etiqueta"
 msgid "UUID"
 msgstr "UUID"
 
-#: admin/fai/class_faiDiskEntry.inc:345
+#: admin/fai/class_faiDiskEntry.inc:344
 msgid "Disks"
 msgstr "Discos"
 
-#: admin/fai/class_faiDiskEntry.inc:348 admin/fai/class_faiPartition.inc:321
-#: admin/fai/faiPartition.tpl.c:14
+#: admin/fai/class_faiDiskEntry.inc:347 admin/fai/class_faiPartition.inc:319
 msgid "Size"
 msgstr "TamaÃ±o"
 
-#: admin/fai/class_faiDiskEntry.inc:544
+#: admin/fai/class_faiDiskEntry.inc:443
+#, php-format
+msgid ""
+"The disk cannot be deleted while it is used in the '%s' disk definition!"
+msgstr "Â¡El disco no podrÃ¡ ser eliminado mientras este usado por la definiciÃ³n de disco '%s'!"
+
+#: admin/fai/class_faiDiskEntry.inc:536
 msgid "encrypted"
 msgstr "encriptado"
 
-#: admin/fai/class_faiDiskEntry.inc:547
+#: admin/fai/class_faiDiskEntry.inc:539
 msgid "bootable"
 msgstr "inicializable"
 
-#: admin/fai/class_faiDiskEntry.inc:550
+#: admin/fai/class_faiDiskEntry.inc:542
 msgid "preserve"
 msgstr "preservar"
 
-#: admin/fai/class_faiDiskEntry.inc:735
+#: admin/fai/class_faiDiskEntry.inc:687 admin/fai/class_faiDiskEntry.inc:690
+#: admin/fai/class_faiDiskEntry.inc:737
+#: admin/fai/packageSelect/selectPackage-list.xml:40
+#: admin/fai/class_faiScript.inc:71 admin/fai/class_faiHook.inc:71
+#: admin/fai/class_faiVariable.inc:71
+#: admin/fai/class_faiSimplePluginClass.inc:50
+msgid "Name"
+msgstr "Nombre"
+
+#: admin/fai/class_faiDiskEntry.inc:717
 msgid ""
 "You have more than four primary partition table entries in your "
 "configuration, please check your configuration twice."
 msgstr "Tiene en la configuraciÃ³n mas de 4 entradas primarias en la tabla de particiones, por favor vuelva a comprobar la configuraciÃ³n."
 
-#: admin/fai/class_faiDiskEntry.inc:739
+#: admin/fai/class_faiDiskEntry.inc:721
 msgid ""
 "You cannot have more than three primary partition while using logical "
 "partitions, please check your configuration twice."
 msgstr "Tiene en la configuraciÃ³n mas de 3 entradas primarias usando particiones lÃ³gicas, por favor vuelva a comprobar la configuraciÃ³n."
 
-#: admin/fai/class_faiDiskEntry.inc:752
-#: admin/fai/class_faiPartitionTableEntry.inc:448
+#: admin/fai/class_faiDiskEntry.inc:733
 msgid "Partition table entry"
 msgstr "Entrada en la tabla de particiones"
 
-#: admin/fai/class_faiDiskEntry.inc:753
-#: admin/fai/class_faiPartitionTableEntry.inc:449
+#: admin/fai/class_faiDiskEntry.inc:734
 msgid "FAI partition table entry"
 msgstr "Entrada en la tabla de particiones FAI"
 
-#: admin/fai/class_faiDiskEntry.inc:760
+#: admin/fai/class_faiDiskEntry.inc:739
 msgid "Disk options"
 msgstr "Opciones de disco"
 
-#: admin/fai/class_faiDiskEntry.inc:761
-#: admin/fai/class_faiPartitionTableEntry.inc:457
+#: admin/fai/class_faiDiskEntry.inc:740
 msgid "Partition type"
 msgstr "Tipo de particiÃ³n"
 
-#: admin/fai/class_faiDiskEntry.inc:762
-#: admin/fai/class_faiPartitionTableEntry.inc:458
+#: admin/fai/class_faiDiskEntry.inc:741
 msgid "Partition no."
 msgstr "NÂº de particiÃ³n."
 
-#: admin/fai/class_faiDiskEntry.inc:763
-#: admin/fai/class_faiPartitionTableEntry.inc:459
+#: admin/fai/class_faiDiskEntry.inc:742
 msgid "File system type"
 msgstr "Tipo de sistema de archivos"
 
-#: admin/fai/class_faiDiskEntry.inc:764
-#: admin/fai/class_faiPartitionTableEntry.inc:171
-#: admin/fai/class_faiPartitionTableEntry.inc:460
-#: admin/fai/class_faiPartition.inc:437 admin/fai/faiPartition.tpl.c:47
+#: admin/fai/class_faiDiskEntry.inc:743 admin/fai/class_faiPartition.inc:432
 msgid "Mount point"
 msgstr "Punto de montaje"
 
-#: admin/fai/class_faiDiskEntry.inc:765
-#: admin/fai/class_faiPartitionTableEntry.inc:461
-#: admin/fai/class_faiPartition.inc:402 admin/fai/class_faiPartition.inc:407
+#: admin/fai/class_faiDiskEntry.inc:744 admin/fai/class_faiPartition.inc:397
+#: admin/fai/class_faiPartition.inc:402
 msgid "Partition size"
 msgstr "TamaÃ±o de la particiÃ³n"
 
-#: admin/fai/class_faiDiskEntry.inc:766
-#: admin/fai/class_faiPartitionTableEntry.inc:173
-#: admin/fai/class_faiPartitionTableEntry.inc:462
-#: admin/fai/faiPartition.tpl.c:50
+#: admin/fai/class_faiDiskEntry.inc:745
 msgid "Mount options"
 msgstr "Opciones de Montaje"
 
-#: admin/fai/class_faiDiskEntry.inc:767
-#: admin/fai/class_faiPartitionTableEntry.inc:463
+#: admin/fai/class_faiDiskEntry.inc:746
 msgid "File system options"
 msgstr "Opciones del sistema de archivos"
 
-#: admin/fai/class_faiDiskEntry.inc:768
-#: admin/fai/class_faiPartitionTableEntry.inc:464
+#: admin/fai/class_faiDiskEntry.inc:747
 msgid "Partition flags"
 msgstr "Atributos de la particiÃ³n"
 
-#: admin/fai/class_debconfTemplate.inc:227
+#: admin/fai/class_debconfTemplate.inc:225
 msgid "This package has no debconf options."
 msgstr "Este paquete no tiene opciones de debconf."
 
-#: admin/fai/class_debconfTemplate.inc:264
+#: admin/fai/class_debconfTemplate.inc:262
 msgid ""
 "This debconf question is dynamically generated during package installation "
 "and requires choosing between specific options which cannot be presented "
@@ -493,217 +302,59 @@ msgid ""
 " effect."
 msgstr "La cuestiÃ³n debconf es generada dinÃ¡micamente durante la instalaciÃ³n del paquete y requiere elegir entre opciones especificas las cuales no pueden ser mostradas aquÃ. El texto introducido necesita ser una de las opciones vÃ¡lidas para tener funcionalidad."
 
-#: admin/fai/class_faiTemplateEntry.inc:139
-msgid "no file uploaded yet"
-msgstr "no se ha subido ningÃºn archivo todavÃa"
+#: admin/fai/class_faiTemplateEntry.inc:143
+msgid "File path"
+msgstr ""
 
-#: admin/fai/class_faiTemplateEntry.inc:142
-#, php-format
-msgid "exists in database (size: %s bytes)"
-msgstr "existe en la base de datos (tamaÃ±o: %s bytes)"
+#: admin/fai/class_faiTemplateEntry.inc:143
+msgid "Complete absolute template file path and name"
+msgstr ""
 
-#: admin/fai/class_faiTemplateEntry.inc:251
-#: admin/systems/class_faiLogView.inc:70 admin/fai/faiTemplateEntry.tpl.c:23
-msgid "File"
-msgstr "Archivo"
+#: admin/fai/class_faiTemplateEntry.inc:147
+msgid "Short description of the file"
+msgstr ""
 
-#: admin/fai/class_faiTemplateEntry.inc:255
-#: admin/fai/faiTemplateEntry.tpl.c:11
-msgid "Destination path"
-msgstr "Ruta de destino"
-
-#: admin/fai/class_faiTemplateEntry.inc:260 admin/fai/faiTemplateEntry.tpl.c:8
-msgid "File name"
-msgstr "Nombre de archivo"
-
-#: admin/fai/class_faiTemplateEntry.inc:264
-#: admin/fai/class_faiTemplateEntry.inc:266
-#: admin/fai/faiTemplateEntry.tpl.c:68
-msgid "User"
-msgstr "Usuario"
-
-#: admin/fai/class_faiTemplateEntry.inc:270
-#: admin/fai/class_faiTemplateEntry.inc:273
-#: admin/fai/class_faiTemplateEntry.inc:275
-#: admin/fai/faiTemplateEntry.tpl.c:47 admin/fai/faiTemplateEntry.tpl.c:74
-msgid "Group"
-msgstr "Grupo"
+#: admin/fai/class_faiTemplateEntry.inc:156
+msgid "Template attributes"
+msgstr "Atributos de la plantilla"
 
-#: admin/fai/class_faiTemplateEntry.inc:305
-msgid "Template entry"
-msgstr "Entrada de plantilla"
+#: admin/fai/class_faiTemplateEntry.inc:160
+msgid "Template file content"
+msgstr ""
 
-#: admin/fai/class_faiTemplateEntry.inc:306
-msgid "FAI template entry"
-msgstr "Entrada de plantilla FAI"
+#: admin/fai/class_faiTemplateEntry.inc:160
+msgid "Content of the template file"
+msgstr ""
 
-#: admin/fai/class_faiTemplateEntry.inc:314
-msgid "Template file"
-msgstr "Fichero de plantilla"
+#: admin/fai/class_faiTemplateEntry.inc:164
+msgid "Owner and group of the file"
+msgstr ""
 
-#: admin/fai/class_faiTemplateEntry.inc:315
-msgid "Template path"
-msgstr "Ruta de la plantilla"
+#: admin/fai/class_faiTemplateEntry.inc:167
+msgid "Owner"
+msgstr "Propietario"
 
-#: admin/fai/class_faiTemplateEntry.inc:316
+#: admin/fai/class_faiTemplateEntry.inc:167
 msgid "File owner"
 msgstr "Propietario del archivo"
 
-#: admin/fai/class_faiTemplateEntry.inc:317
-msgid "File permissions"
-msgstr "Permisos del archivo"
-
-#: admin/fai/class_FAI.inc:287 admin/fai/class_FAI.inc:679
-#: admin/fai/class_FAI.inc:1266 admin/fai/class_FAI.inc:1283
-#: admin/fai/class_FAI.inc:1287
-msgid "LDAP error"
-msgstr "Error LDAP"
-
-#: admin/fai/class_FAI.inc:570
-#, php-format
-msgid "Error, following objects should be equal '%s' and '%s'"
-msgstr "Error, los siguientes objetos deberÃan ser iguales '%s' y '%s'"
-
-#: admin/fai/class_FAI.inc:891
-#, php-format
-msgid "Creating group application release for %s"
-msgstr "Creando versiÃ³n del grupo de aplicaciones para %s"
-
-#: admin/fai/class_FAI.inc:960 admin/fai/class_FAI.inc:982
-#: admin/fai/class_FAI.inc:1022 admin/fai/class_FAI.inc:1027
-#: admin/fai/class_FAI.inc:1065
-msgid "Object"
-msgstr "Objeto"
-
-#: admin/fai/class_FAI.inc:961
-#, php-format
-msgid "Adding missing group application release container %s."
-msgstr "AÃ±adiendo contenedor de la versiÃ³n del grupo de aplicaciones %s."
-
-#: admin/fai/class_FAI.inc:983
-#, php-format
-msgid "Adding group application release container %s."
-msgstr "AÃ±adiendo contenedor de la versiÃ³n del grupo de aplicaciones %s."
-
-#: admin/fai/class_FAI.inc:1023
-#, php-format
-msgid "Could not create menu entry %s. (Already exists)."
-msgstr "No se puede crear la entrada de menÃº '%s', el nombre de destino ya existe."
-
-#: admin/fai/class_FAI.inc:1028
-#, php-format
-msgid "Created group application menu entry for %s."
-msgstr "Creado entrada del menÃº del grupo de aplicaciones para %s."
-
-#: admin/fai/class_FAI.inc:1059
-#, php-format
-msgid "Creating copy of %s"
-msgstr "Creando una copia de %s"
-
-#: admin/fai/class_FAI.inc:1062
-msgid "Processing"
-msgstr "Procesando"
-
-#: admin/fai/class_FAI.inc:1080
-msgid "Could not create new release, the destination dn is already in use."
-msgstr "No se puede crear nueva versiÃ³n, el 'dn' de destino ya estÃ¡ en uso."
-
-#: admin/fai/class_FAI.inc:1093
-msgid "Error while fetching source dn - aborted!"
-msgstr "Â¡Se ha cancelado, ha habido un error mientras accedÃa al dn origen!"
-
-#: admin/fai/class_FAI.inc:1174
-msgid "Fatal error"
-msgstr "Error fatal"
-
-#: admin/fai/class_FAI.inc:1175
-#, php-format
-msgid ""
-"Release creation failed due to ldap errors. Additional informations '%s'."
-msgstr "La creaciÃ³n de la versiÃ³n ha fallado debido a errores ldap. Mas informaciÃ³n '%s'."
-
-#: admin/fai/class_faiPartitionTableEntry.inc:162
-msgid "primary"
-msgstr "primario"
-
-#: admin/fai/class_faiPartitionTableEntry.inc:162
-msgid "logical"
-msgstr "lÃ³gico"
-
-#: admin/fai/class_faiPartitionTableEntry.inc:169
-#: admin/fai/faiPartition.tpl.c:8
-msgid "Type"
-msgstr "Tipo"
-
-#: admin/fai/class_faiPartitionTableEntry.inc:170
-msgid "FS type"
-msgstr "Tipo de FS"
-
-#: admin/fai/class_faiPartitionTableEntry.inc:172
-msgid "Size in MB"
-msgstr "TamaÃ±o en Mb"
-
-#: admin/fai/class_faiPartitionTableEntry.inc:174
-msgid "FS option"
-msgstr "OpciÃ³n de FS"
-
-#: admin/fai/class_faiPartitionTableEntry.inc:175
-#: admin/fai/faiPartition.tpl.c:23
-msgid "Preserve"
-msgstr "Preservar"
-
-#: admin/fai/class_faiPartitionTableEntry.inc:266
-msgid "False"
-msgstr "Falso"
-
-#: admin/fai/class_faiPartitionTableEntry.inc:268
-msgid "True"
-msgstr "Verdadero"
-
-#: admin/fai/class_faiPartitionTableEntry.inc:272
-#: admin/fai/class_faiPartitionTableEntry.inc:274 admin/fai/fai-list.xml:159
-#: admin/fai/fai-list.xml:198
-msgid "Remove"
-msgstr "Eliminar"
-
-#: admin/fai/class_faiPartitionTableEntry.inc:384
-#, php-format
-msgid "please enter a unique mount point for partition %s"
-msgstr "por favor introduzca un Ãºnico punto de montaje para la particiÃ³n %s"
+#: admin/fai/class_faiTemplateEntry.inc:172
+msgid "Group"
+msgstr "Grupo"
 
-#: admin/fai/class_faiPartitionTableEntry.inc:389
-#, php-format
-msgid "partition %s mount point"
-msgstr "punto de montaje de la particiÃ³n %s"
+#: admin/fai/class_faiTemplateEntry.inc:172
+msgid "File group"
+msgstr ""
 
-#: admin/fai/class_faiPartitionTableEntry.inc:394
-#, php-format
-msgid ""
-"File system type 'swap' is already used, change file system type for "
-"partition %s."
-msgstr "El tipo de sistema de archivos 'swap' ya estÃ¡ en uso. Cambie el tipo de sistema de archivos para la particiÃ³n %s."
-
-#: admin/fai/class_faiPartitionTableEntry.inc:398
-msgid "Please use 'swap' as mount point, if 'swap' is used as fs-type."
-msgstr "Por favor, si usa 'swap' como sistema de archivos, use 'swap' como punto de montaje."
-
-#: admin/fai/class_faiPartitionTableEntry.inc:404
-#: admin/fai/class_faiPartitionTableEntry.inc:408
-#: admin/fai/class_faiPartitionTableEntry.inc:414
-#: admin/fai/class_faiPartitionTableEntry.inc:416
-#: admin/fai/class_faiPartitionTableEntry.inc:421
-#, php-format
-msgid "partition %s size"
-msgstr "tamaÃ±o particiÃ³n %s"
+#: admin/fai/class_faiTemplateEntry.inc:181
+msgid "Access"
+msgstr "Acceso"
 
-#: admin/fai/class_faiPartitionTableEntry.inc:436
-msgid ""
-"You have more than 3 primary partition table entries in your configuration, "
-"please check your configuration twice."
-msgstr "Tiene en la configuraciÃ³n mas de 3 entradas primarias en la tabla de particiones, por favor vuelva a comprobar la configuraciÃ³n."
+#: admin/fai/class_faiTemplateEntry.inc:181
+msgid "Access rights"
+msgstr ""
 
 #: admin/fai/packageSelect/selectPackage-list.xml:10
-#: admin/fai/classSelect/selectClass-list.xml:11
 msgid "Please select the desired entries"
 msgstr "Por favor seleccione las entradas que desee"
 
@@ -711,148 +362,95 @@ msgstr "Por favor seleccione las entradas que desee"
 msgid "Version"
 msgstr "VersiÃ³n"
 
-#: admin/fai/class_faiProfile.inc:310
-msgid "This list displays all assigned class names for this profile."
-msgstr "Esta lista muestra todos las clases asignadas a este perfil."
-
-#: admin/fai/class_faiProfile.inc:313 admin/fai/class_askClassName.inc:103
-#: admin/fai/classSelect/class_classSelect.inc:53
-#: admin/fai/class_faiProfileEntry.inc:158
-msgid "Hook bundle"
-msgstr "Paquete de mÃ©todos"
-
-#: admin/fai/class_faiProfile.inc:314 admin/fai/class_askClassName.inc:105
-#: admin/fai/classSelect/class_classSelect.inc:54
-#: admin/fai/class_faiProfileEntry.inc:159
-msgid "Template bundle"
-msgstr "Paquete de plantillas"
-
-#: admin/fai/class_faiProfile.inc:315 admin/fai/class_askClassName.inc:101
-#: admin/fai/classSelect/class_classSelect.inc:55
-#: admin/fai/class_faiProfileEntry.inc:160
-msgid "Script bundle"
-msgstr "Paquete de scripts"
-
-#: admin/fai/class_faiProfile.inc:316 admin/fai/class_askClassName.inc:102
-#: admin/fai/classSelect/class_classSelect.inc:56
-#: admin/fai/class_faiProfileEntry.inc:161
-msgid "Variable bundle"
-msgstr "Paquete de variables"
-
-#: admin/fai/class_faiProfile.inc:317 admin/fai/class_askClassName.inc:100
-#: admin/fai/classSelect/class_classSelect.inc:57
-#: admin/fai/class_faiProfileEntry.inc:162
-msgid "Package bundle"
-msgstr "Conjunto de paquetes"
-
-#: admin/fai/class_faiProfile.inc:321
-msgid "Remove class from profile"
-msgstr "Eliminar clase del perfil"
-
-#: admin/fai/class_faiProfile.inc:324
-msgid "Up"
-msgstr "Arriba"
-
-#: admin/fai/class_faiProfile.inc:325
-msgid "Down"
-msgstr "Abajo"
-
-#: admin/fai/class_faiProfile.inc:410
-msgid "No class specified for this profile!"
-msgstr "Â¡No se ha especificado una clase para este perfil!"
-
-#: admin/fai/class_faiProfile.inc:419
-msgid "You can't use the same name for a class and a profile!"
-msgstr ""
-
-#: admin/fai/class_faiProfile.inc:455
+#: admin/fai/class_faiProfile.inc:28
+msgid "Profile"
+msgstr "Perfil"
+
+#: admin/fai/class_faiProfile.inc:29
 msgid "FAI profile"
 msgstr "Perfil FAI"
 
-#: admin/fai/class_faiProfile.inc:458
+#: admin/fai/class_faiProfile.inc:32
 msgid "FAI Profile"
 msgstr ""
 
-#: admin/fai/class_faiProfile.inc:465 admin/fai/faiProfile.tpl.c:17
+#: admin/fai/class_faiProfile.inc:61
 msgid "FAI classes"
 msgstr "Clases FAI"
 
-#: admin/fai/class_faiHookEntry.inc:200
-msgid "Hook entry"
-msgstr "Entrada de mÃ©todo"
+#: admin/fai/class_faiProfile.inc:61
+msgid "FAI classes which are part of this profile"
+msgstr ""
 
-#: admin/fai/class_faiHookEntry.inc:201
-msgid "FAI hook entry"
-msgstr "Entrada de mÃ©todo FAI"
+#: admin/fai/class_faiPackageConfiguration.inc:88
+#, php-format
+msgid "Debconf information for package '%s'"
+msgstr "InformaciÃ³n debconf para el paquete '%s'"
 
-#: admin/fai/class_faiHookEntry.inc:209 admin/fai/faiHookEntry.tpl.c:20
-msgid "Task"
-msgstr "Tarea"
+#: admin/fai/class_faiScript.inc:30 admin/fai/class_faiScript.inc:84
+#: admin/fai/class_faiHook.inc:87
+msgid "Script"
+msgstr "Script"
 
-#: admin/fai/class_faiHookEntry.inc:210 admin/fai/class_faiScript.inc:595
-#: admin/fai/class_faiScript.inc:599
+#: admin/fai/class_faiScript.inc:31 admin/fai/class_faiScript.inc:34
 msgid "FAI script"
 msgstr "Script FAI"
 
-#: admin/fai/class_faiPackageConfiguration.inc:88
-#, php-format
-msgid "Debconf information for package '%s'"
-msgstr "InformaciÃ³n debconf para el paquete '%s'"
+#: admin/fai/class_faiScript.inc:63
+msgid "Scripts"
+msgstr "Scripts"
 
-#: admin/fai/class_askClassName.inc:99 admin/fai/class_askClassName.inc:100
-#: admin/fai/class_askClassName.inc:101 admin/fai/class_askClassName.inc:102
-#: admin/fai/class_askClassName.inc:103 admin/fai/class_askClassName.inc:104
-#: admin/fai/class_askClassName.inc:105 admin/fai/class_askClassName.inc:106
-msgid "Create new FAI object"
-msgstr "Crear nuevo objeto FAI"
+#: admin/fai/class_faiScript.inc:67 admin/fai/class_faiHook.inc:67
+#: admin/fai/class_faiVariable.inc:67
+msgid "Variables in this class"
+msgstr ""
 
-#: admin/fai/class_faiTemplateEdit.inc:80
-#, php-format
-msgid ""
-"The file encodig has changed from '%s' to '%s'. Do you really want to save?"
-msgstr "La codificaciÃ³n del archivo ha cambiado de '%s' a '%s'.Â¿Quiere realmente grabarlo?"
+#: admin/fai/class_faiScript.inc:71 admin/fai/class_faiHook.inc:71
+#: admin/fai/class_faiVariable.inc:71
+msgid "The name of the variable"
+msgstr ""
 
-#: admin/fai/class_faiScript.inc:333 admin/fai/class_faiScript.inc:335
-msgid "Sort direction"
-msgstr "DirecciÃ³n de ordenaciÃ³n"
+#: admin/fai/class_faiScript.inc:75 admin/fai/class_faiHook.inc:75
+#: admin/fai/class_faiVariable.inc:75
+msgid "A short description of the variable"
+msgstr ""
 
-#: admin/fai/class_faiScript.inc:348 admin/fai/faiScriptEntry.tpl.c:20
+#: admin/fai/class_faiScript.inc:79
 msgid "Priority"
 msgstr "Prioridad"
 
-#: admin/fai/class_faiScript.inc:350
-msgid "Action"
-msgstr "AcciÃ³n"
+#: admin/fai/class_faiScript.inc:79
+msgid "Priority of this script (FIXME: less is done first?)"
+msgstr ""
 
-#: admin/fai/classSelect/selectClass-list.xml:36 admin/fai/fai-list.xml:88
-#: admin/fai/faiScriptEntry.tpl.c:14
-msgid "Properties"
-msgstr "Propiedades"
+#: 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:501 admin/fai/fai-list.xml:116
+#: admin/fai/class_faiTemplate.inc:153
 msgid "Template"
 msgstr "Plantilla"
 
-#: admin/fai/class_faiTemplate.inc:502 admin/fai/class_faiTemplate.inc:506
+#: admin/fai/class_faiTemplate.inc:154 admin/fai/class_faiTemplate.inc:157
 msgid "FAI template"
 msgstr "Plantilla FAI"
 
-#: admin/fai/class_faiVariableEntry.inc:107
-msgid "Content"
-msgstr "Contenido"
-
-#: admin/fai/class_faiVariableEntry.inc:142
-msgid "Variable entry"
-msgstr "Entrada de variable"
+#: admin/fai/class_faiTemplate.inc:176
+msgid "Template class name"
+msgstr ""
 
-#: admin/fai/class_faiVariableEntry.inc:143
-msgid "FAI variable entry "
-msgstr "Entrada de variable FAI"
+#: admin/fai/class_faiTemplate.inc:186
+msgid "Template files"
+msgstr ""
 
-#: admin/fai/class_faiVariableEntry.inc:151
-#: admin/fai/faiVariableEntry.tpl.c:20
-msgid "Variable content"
-msgstr "Contenido de variable"
+#: admin/fai/class_faiTemplate.inc:190
+msgid "Template files in this class"
+msgstr ""
 
 #: admin/fai/class_faiPartition.inc:176 admin/fai/class_faiPartition.inc:180
 msgid "Logical"
@@ -896,7 +494,7 @@ msgstr "KB"
 
 #: admin/fai/class_faiPartition.inc:203
 msgid "MB"
-msgstr "MB"
+msgstr "Mb"
 
 #: admin/fai/class_faiPartition.inc:204
 msgid "GB"
@@ -950,96 +548,75 @@ msgstr "xfs"
 msgid "btrfs"
 msgstr "btrfs"
 
-#: admin/fai/class_faiPartition.inc:224
-msgid "LVM/RAID"
-msgstr ""
-
-#: admin/fai/class_faiPartition.inc:327
+#: admin/fai/class_faiPartition.inc:325
 msgid "spare"
 msgstr "repuesto"
 
-#: admin/fai/class_faiPartition.inc:330
+#: admin/fai/class_faiPartition.inc:328
 msgid "missing"
 msgstr "falta"
 
-#: admin/fai/class_faiPartition.inc:333
+#: admin/fai/class_faiPartition.inc:331
 msgid "Options"
 msgstr "Opciones"
 
-#: admin/fai/class_faiPartition.inc:420
+#: admin/fai/class_faiPartition.inc:415
 msgid "Minimum partition size"
 msgstr "TamaÃ±o mÃnimo de la particiÃ³n"
 
-#: admin/fai/class_faiPartition.inc:420
+#: admin/fai/class_faiPartition.inc:415
 msgid "Maximum partition size"
 msgstr "TamaÃ±o mÃ¡ximo de la particiÃ³n"
 
-#: admin/fai/class_faiPartition.inc:428
+#: admin/fai/class_faiPartition.inc:423
 msgid "Raid arrays must contain at least two partitions!"
 msgstr "Â¡La matriz de discos RAID debe tener al menos dos particiones!"
 
-#: admin/fai/class_faiPartition.inc:430
+#: admin/fai/class_faiPartition.inc:425
 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:332 admin/fai/class_faiHook.inc:334
-#: admin/fai/fai-list.xml:190 admin/fai/faiVariable.tpl.c:23
-#: admin/fai/faiVariable.tpl.c:26
-msgid "Edit"
-msgstr "Editar"
-
-#: admin/fai/class_faiHook.inc:336
-msgid "Delete"
-msgstr "Eliminar"
-
-#: admin/fai/class_faiHook.inc:521 admin/fai/fai-list.xml:128
+#: admin/fai/class_faiHook.inc:30
 msgid "Hook"
 msgstr "MÃ©todo"
 
-#: admin/fai/class_faiHook.inc:522 admin/fai/class_faiHook.inc:526
+#: admin/fai/class_faiHook.inc:31 admin/fai/class_faiHook.inc:34
 msgid "FAI hook"
 msgstr "MÃ©todo FAI"
 
-#: admin/fai/class_faiVariable.inc:387 admin/fai/fai-list.xml:134
+#: admin/fai/class_faiHook.inc:63
+msgid "Hooks"
+msgstr "MÃ©todos"
+
+#: admin/fai/class_faiHook.inc:79
+msgid "Task"
+msgstr "Tarea"
+
+#: admin/fai/class_faiHook.inc:87
+msgid "The script of this hook"
+msgstr ""
+
+#: admin/fai/class_faiVariable.inc:30
 msgid "Variable"
 msgstr "Variable"
 
-#: admin/fai/class_faiVariable.inc:388 admin/fai/class_faiVariable.inc:392
+#: admin/fai/class_faiVariable.inc:31 admin/fai/class_faiVariable.inc:34
 msgid "FAI variable"
 msgstr "Variable FAI"
 
-#: admin/fai/class_faiProfileEntry.inc:184 admin/fai/askClassName.tpl.c:11
-#: admin/fai/askClassName.tpl.c:17 admin/fai/paste_generic.tpl.c:5
-msgid "Class name"
-msgstr "Nombre de clase"
-
-#: admin/fai/class_faiProfileEntry.inc:184 admin/fai/faiTemplate.tpl.c:14
-#: admin/fai/faiVariable.tpl.c:14 admin/fai/faiHook.tpl.c:14
-#: admin/fai/faiPartitionTable.tpl.c:17 admin/fai/faiScript.tpl.c:14
-msgid "Objects"
-msgstr "Objetos"
-
-#: admin/fai/fai-list.xml:11
-msgid "List of deployment classes and products"
-msgstr "Lista de despliegue de clases y productos"
+#: admin/fai/class_faiVariable.inc:63
+msgid "Variables"
+msgstr "Variables"
 
-#: admin/fai/fai-list.xml:15
-msgid "partitionTable"
-msgstr ""
+#: admin/fai/class_faiVariable.inc:79
+msgid "Content"
+msgstr "Contenido"
 
-#: admin/fai/fai-list.xml:23
-msgid "packagelist"
+#: admin/fai/class_faiVariable.inc:79
+msgid "The content of the variable"
 msgstr ""
 
-#: admin/fai/fai-list.xml:93
-msgid "Actions"
-msgstr "Acciones"
-
-#: admin/fai/fai-list.xml:104
-msgid "Create"
-msgstr "Crear"
-
 #: admin/systems/class_faiLogView.inc:56
 msgid "Sort down"
 msgstr ""
@@ -1048,6 +625,10 @@ msgstr ""
 msgid "Sort up"
 msgstr ""
 
+#: admin/systems/class_faiLogView.inc:70
+msgid "File"
+msgstr "Archivo"
+
 #: admin/systems/class_faiLogView.inc:71
 msgid "Date"
 msgstr "Fecha"
@@ -1082,7 +663,7 @@ msgstr ""
 msgid "Selected file: %s"
 msgstr ""
 
-#: admin/systems/class_faiStartup.inc:70 admin/fai/paste_generic.tpl.c:2
+#: admin/systems/class_faiStartup.inc:70
 msgid "FAI settings"
 msgstr "ParÃ¡metros FAI"
 
@@ -1102,11 +683,6 @@ msgstr ""
 msgid "FAI profil to be applied to this computer"
 msgstr ""
 
-#: admin/systems/class_faiStartup.inc:90 admin/fai/faiPackage.tpl.c:14
-#: admin/fai/faiPackage.tpl.c:17
-msgid "Repository"
-msgstr "Repositorio"
-
 #: admin/systems/class_faiStartup.inc:90
 msgid "FAI Debian repository to be used for installation"
 msgstr ""
@@ -1131,85 +707,96 @@ msgstr ""
 msgid "Linux kernel parameters to be ran"
 msgstr ""
 
-#: admin/systems/class_faiStartup.inc:178
+#: admin/systems/class_faiStartup.inc:179
 msgid "Full automated installation"
 msgstr ""
 
-#: admin/systems/services/repository/class_serviceRepository.inc:31
+#: admin/systems/services/repository/class_serviceDebianRepository.inc:34
+#: admin/systems/services/repository/class_serviceCentosRepository.inc:31
+msgid "Repositories"
+msgstr ""
+
+#: admin/systems/services/repository/class_serviceDebianRepository.inc:39
+#: admin/systems/services/repository/class_serviceCentosRepository.inc:36
+msgid "Repositories this server hosts"
+msgstr ""
+
+#: admin/systems/services/repository/class_serviceDebianRepository.inc:43
+#: admin/systems/services/repository/class_serviceCentosRepository.inc:40
 msgid "URL"
 msgstr "URL"
 
-#: admin/systems/services/repository/class_serviceRepository.inc:31
+#: admin/systems/services/repository/class_serviceDebianRepository.inc:43
+#: admin/systems/services/repository/class_serviceCentosRepository.inc:40
 msgid "Repository url"
 msgstr ""
 
-#: admin/systems/services/repository/class_serviceRepository.inc:35
+#: admin/systems/services/repository/class_serviceDebianRepository.inc:47
+#: admin/systems/services/repository/class_serviceCentosRepository.inc:44
 msgid "Parent server"
 msgstr "Servidor Origen"
 
-#: admin/systems/services/repository/class_serviceRepository.inc:35
+#: admin/systems/services/repository/class_serviceDebianRepository.inc:47
+#: admin/systems/services/repository/class_serviceCentosRepository.inc:44
 msgid "Parent repository server"
 msgstr ""
 
-#: admin/systems/services/repository/class_serviceRepository.inc:40
-msgid "Release used on this repository"
+#: admin/systems/services/repository/class_serviceDebianRepository.inc:52
+msgid "Debian release used on this repository"
 msgstr ""
 
-#: admin/systems/services/repository/class_serviceRepository.inc:47
-msgid "Sections"
-msgstr "Secciones"
-
-#: admin/systems/services/repository/class_serviceRepository.inc:47
-msgid "Sections available on this repository"
+#: admin/systems/services/repository/class_serviceDebianRepository.inc:58
+msgid "Debian sections available on this repository"
 msgstr ""
 
-#: admin/systems/services/repository/class_serviceRepository.inc:52
+#: admin/systems/services/repository/class_serviceDebianRepository.inc:63
+#: admin/systems/services/repository/class_serviceCentosRepository.inc:57
 msgid "Mirror mode"
 msgstr ""
 
-#: admin/systems/services/repository/class_serviceRepository.inc:52
+#: admin/systems/services/repository/class_serviceDebianRepository.inc:63
+#: admin/systems/services/repository/class_serviceCentosRepository.inc:57
 msgid ""
 "Is this mirror an installation repository? Is its release a custom one?"
 msgstr ""
 
-#: admin/systems/services/repository/class_serviceRepository.inc:57
+#: admin/systems/services/repository/class_serviceDebianRepository.inc:68
+#: admin/systems/services/repository/class_serviceCentosRepository.inc:62
 msgid "Local mirror"
 msgstr ""
 
-#: admin/systems/services/repository/class_serviceRepository.inc:57
+#: admin/systems/services/repository/class_serviceDebianRepository.inc:68
+#: admin/systems/services/repository/class_serviceCentosRepository.inc:62
 msgid "Is this mirror a local or a network mirror?"
 msgstr ""
 
-#: admin/systems/services/repository/class_serviceRepository.inc:66
+#: admin/systems/services/repository/class_serviceDebianRepository.inc:77
+#: admin/systems/services/repository/class_serviceCentosRepository.inc:71
 msgid "Architectures"
 msgstr ""
 
-#: admin/systems/services/repository/class_serviceRepository.inc:66
+#: admin/systems/services/repository/class_serviceDebianRepository.inc:77
+#: admin/systems/services/repository/class_serviceCentosRepository.inc:71
 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:140
-msgid "Repositories"
+#: admin/systems/services/repository/class_serviceDebianRepository.inc:99
+#: admin/systems/services/repository/class_serviceDebianRepository.inc:100
+msgid "Debian repository"
 msgstr ""
 
-#: admin/systems/services/repository/class_serviceRepository.inc:145
-msgid "Repositories this server hosts"
-msgstr ""
+#: admin/systems/services/repository/class_serviceDebianRepository.inc:100
+#: admin/systems/services/repository/class_serviceCentosRepository.inc:96
+msgid "Services"
+msgstr "Servicios"
 
-#: admin/systems/services/repository/class_serviceRepository.inc:160
-msgid "Package repository"
+#: admin/systems/services/repository/class_serviceCentosRepository.inc:49
+msgid "Centos release used on this repository"
 msgstr ""
 
-#: admin/systems/services/repository/class_serviceRepository.inc:161
-msgid "Package repository information"
+#: admin/systems/services/repository/class_serviceCentosRepository.inc:95
+#: admin/systems/services/repository/class_serviceCentosRepository.inc:96
+msgid "Centos repository"
 msgstr ""
 
 #: config/fai/class_faiConfig.inc:28
@@ -1241,476 +828,3 @@ msgstr ""
 #: config/fai/class_faiConfig.inc:60
 msgid "s"
 msgstr ""
-
-#: admin/fai/faiPartitionTableEntry.tpl.c:2 admin/fai/faiVariableEntry.tpl.c:2
-#: admin/fai/faiVariableEntry.tpl.c:5 admin/fai/faiDiskEntry.tpl.c:2
-#: admin/fai/faiTemplate.tpl.c:2 admin/fai/faiTemplate.tpl.c:5
-#: admin/fai/faiVariable.tpl.c:2 admin/fai/faiVariable.tpl.c:5
-#: admin/fai/faiHook.tpl.c:2 admin/fai/faiHook.tpl.c:5
-#: admin/fai/faiPackage.tpl.c:2 admin/fai/faiPackage.tpl.c:5
-#: admin/fai/faiTemplateEntry.tpl.c:2 admin/fai/faiTemplateEntry.tpl.c:5
-#: admin/fai/faiScriptEntry.tpl.c:2 admin/fai/faiScriptEntry.tpl.c:5
-#: admin/fai/faiPartitionTable.tpl.c:2 admin/fai/faiPartitionTable.tpl.c:5
-#: admin/fai/faiScript.tpl.c:2 admin/fai/faiScript.tpl.c:5
-#: admin/fai/faiProfile.tpl.c:2 admin/fai/faiProfile.tpl.c:5
-#: admin/fai/faiProfile.tpl.c:14 admin/fai/faiHookEntry.tpl.c:2
-#: admin/fai/faiHookEntry.tpl.c:5
-msgid "Generic"
-msgstr "GenÃ©rico"
-
-#: admin/fai/faiPartitionTableEntry.tpl.c:14
-#: admin/fai/faiPartitionTableEntry.tpl.c:17 admin/fai/faiDiskEntry.tpl.c:23
-#: admin/fai/faiDiskEntry.tpl.c:26
-msgid "Partition entries"
-msgstr "Entradas en la particiÃ³n"
-
-#: admin/fai/faiPartitionTableEntry.tpl.c:20
-#: admin/fai/faiPartitionTableEntry.tpl.c:23 admin/fai/faiDiskEntry.tpl.c:29
-#: admin/fai/faiDiskEntry.tpl.c:32
-msgid "Add partition"
-msgstr "AÃ±adir particiÃ³n"
-
-#: admin/fai/branch_selector.tpl.c:2
-msgid "Releases"
-msgstr "Versiones"
-
-#: admin/fai/branch_selector.tpl.c:5
-msgid "Current release"
-msgstr "VersiÃ³n actual"
-
-#: admin/fai/branch_selector.tpl.c:8 admin/fai/branch_selector.tpl.c:17
-#: admin/fai/fai-filter.tpl.c:8 admin/fai/fai-filter.tpl.c:17
-msgid "Create release"
-msgstr "Crear versiÃ³n"
-
-#: admin/fai/branch_selector.tpl.c:11 admin/fai/branch_selector.tpl.c:23
-#: admin/fai/fai-filter.tpl.c:11 admin/fai/fai-filter.tpl.c:23
-msgid "Create read-only release"
-msgstr "Crear versiÃ³n de solo lectura"
-
-#: admin/fai/branch_selector.tpl.c:20 admin/fai/fai-filter.tpl.c:20
-msgid "Freeze"
-msgstr "Suspendido"
-
-#: admin/fai/branch_selector.tpl.c:26 admin/fai/fai-filter.tpl.c:26
-msgid "Delete current release"
-msgstr "Eliminar la versiÃ³n actual"
-
-#: admin/fai/faiPartition.tpl.c:2
-msgid "Partition"
-msgstr "ParticiÃ³n"
-
-#: admin/fai/faiPartition.tpl.c:17
-msgid "Resize existing partition"
-msgstr "Redimensionar particiÃ³n existente"
-
-#: admin/fai/faiPartition.tpl.c:20
-msgid "Bootable"
-msgstr "Inicializable"
-
-#: admin/fai/faiPartition.tpl.c:26 admin/fai/faiDiskEntry.tpl.c:20
-msgid "Combined physical partitions"
-msgstr "Particiones fÃsicas combinadas"
-
-#: admin/fai/faiPartition.tpl.c:29
-msgid "Toggle missing"
-msgstr "Cambiar fallo"
-
-#: admin/fai/faiPartition.tpl.c:32
-msgid "Toggle spare"
-msgstr "Cambiar repuesto"
-
-#: admin/fai/faiPartition.tpl.c:35
-msgid "Filesystem"
-msgstr "Sistemas de archivos"
-
-#: admin/fai/faiPartition.tpl.c:38
-msgid "Filesystem create options"
-msgstr "Crear opciones del sistema de archivos"
-
-#: admin/fai/faiPartition.tpl.c:41
-msgid "Encrypted"
-msgstr "Encriptado"
-
-#: admin/fai/faiPartition.tpl.c:44
-msgid "Tune options"
-msgstr "Opciones de ajuste"
-
-#: admin/fai/faiNewBranch.tpl.c:2
-msgid ""
-"You are now going to create a branch or locked branch. This action clones "
-"the existing release to another release name. Branches can be modified as "
-"usual. FAI classes of locked branches cannot be modified, just additional "
-"classes are possible. Branch names should be alphanumeric, excluding the "
-"reserved names 'scripts', 'hooks', 'partitions', 'variables', 'templates' "
-"and 'fai'."
-msgstr "Va a crear una rama o una rama suspendida. Esta acciÃ³n clona la versiÃ³n actual a otro nombre de versiÃ³n. Las ramas se pueden modificar de la forma usual. Las clases FAI en ramas suspendidas no podrÃ¡n se modificadas, solo sera posible aÃ±adir clases. Los nombres de las ramas deberÃ¡n ser alfanumÃ©ricos, excluyendo las palabras reservadas 'scripts','hooks','partitions','variables' y 'fai'."
-
-#: admin/fai/faiNewBranch.tpl.c:5
-msgid ""
-"Branches are created as subreleases of the currently selected branch. "
-"Creating a new branch named 1.0.2 in SARGE for example, will result in a new"
-" release called SARGE/1.0.2."
-msgstr "Las ramas son creadas como subversiones de la rama seleccionada actualmente. Por ejemplo creando una nueva rama llamada 1.0.2 en SARGE, darÃ¡ como resultado una nueva versiÃ³n llamada SARGE/1.0.2."
-
-#: admin/fai/faiNewBranch.tpl.c:8
-msgid "Please enter a name for the branch"
-msgstr "Por favor introduzca un nombre para la rama"
-
-#: admin/fai/faiNewBranch.tpl.c:11
-msgid "Processing the requested operation"
-msgstr "Procesando la operaciÃ³n solicitada"
-
-#: admin/fai/faiNewBranch.tpl.c:14
-msgid ""
-"As soon as the copy operation has finished, you can scroll down to end of "
-"the page and press the 'Continue' button to continue with the fai management"
-" dialog."
-msgstr "Tan pronto como la termine la operaciÃ³n copiar, podrÃ¡ bajar al final de la pÃ¡gina y presionar el botÃ³n 'Continuar' para continuar con el asistente de administraciÃ³n FAI."
-
-#: admin/fai/faiNewBranch.tpl.c:17
-msgid ""
-"Your browser doesn't support iframes, please use this link to perform the "
-"requested operation."
-msgstr "Su navegador no soporta IFRAMES, porfavor use este enlace para ejecutar la operaciÃ³n solicitada."
-
-#: admin/fai/faiNewBranch.tpl.c:20
-msgid "Perform requested operation."
-msgstr "Ejecutar la operaciÃ³n solicitada"
-
-#: admin/fai/faiNewBranch.tpl.c:23
-msgid "Initiate operation"
-msgstr "Iniciando operaciÃ³n"
-
-#: admin/fai/faiVariableEntry.tpl.c:14 admin/fai/faiVariableEntry.tpl.c:17
-msgid "Variable attributes"
-msgstr "Atributos de las variables"
-
-#: admin/fai/faiDiskEntry.tpl.c:11
-msgid "fstab key"
-msgstr "clave fstab"
-
-#: admin/fai/faiDiskEntry.tpl.c:17
-msgid "Disk label"
-msgstr "Etiqueta de disco"
-
-#: admin/fai/faiTemplate.tpl.c:17
-msgid "List of template files"
-msgstr "Lista de ficheros plantillas"
-
-#: admin/fai/faiVariable.tpl.c:17
-msgid "List of assigned variables"
-msgstr "Lista de variables asignadas"
-
-#: admin/fai/faiVariable.tpl.c:20
-msgid "Choose a variable to delete or edit"
-msgstr "Elegir una variable para eliminar o editar"
-
-#: admin/fai/askClassName.tpl.c:2
-msgid ""
-"Adding a new class to the FAI management, requires a class name. You have to"
-" specify a unique class name for unique types of FAI classes, while you can "
-"use the same class name for different types of FAI classes. In the laste "
-"case, FAI will automatically enclose all these different class types to one "
-"unique class name."
-msgstr "AÃ±adir una nueva clase FAI al administrador FAI necesita un nombre de clase. Debe introducir un nombre de clase Ãºnico para los tipos Ãºnicos de clases FAI, mientras puede usar el mismo nombre de clase para tipos diferentes de clases FAI. En este ultimo caso, FAI incluirÃ¡ todos los tipos de clases diferentes en un nombre de clase Ãºnico."
-
-#: admin/fai/askClassName.tpl.c:5
-msgid ""
-"Please use one of the following methods to choose the name for the new FAI "
-"class."
-msgstr "Por favor elija uno de los siguientes mÃ©todos para seleccionar el nombre de la nueva clase FAI."
-
-#: admin/fai/askClassName.tpl.c:8
-msgid "Enter FAI class name manually"
-msgstr "Introduzca el nombre de la clase FAI manualmente"
-
-#: admin/fai/askClassName.tpl.c:14
-msgid "Choose FAI class name from a list of existing classes"
-msgstr "Elija un nombre de clase FAI de la lista de clases existentes"
-
-#: admin/fai/askClassName.tpl.c:20
-msgid "Choose class name"
-msgstr "Elija nombre de clase"
-
-#: admin/fai/faiGroupHandle.tpl.c:2
-msgid "Please select the objects you want to remove:"
-msgstr "Por favor seleccione los objetos que quiere eliminar:"
-
-#: admin/fai/faiGroupHandle.tpl.c:5
-msgid "Freezed"
-msgstr "Congelado"
-
-#: admin/fai/faiGroupHandle.tpl.c:8
-msgid "Select the object you want to edit:"
-msgstr "Seleccione el objeto que quiere editar:"
-
-#: admin/fai/faiGroupHandle.tpl.c:11
-msgid "Select the object you want to copy:"
-msgstr "Seleccione el objeto que quiere copiar:"
-
-#: admin/fai/remove.tpl.c:5
-msgid ""
-"This includes all account data, system access rules, imap settings, etc. for"
-" this user. Please double check if your really want to do this since there "
-"is no way for FusionDirectory to get your data back."
-msgstr "Esto incluye toda la data de la cuenta, reglas de acceso de sistema, opciones imap, etc. para este usuario. Por favor verifique que realmente desea hacer esto ya que FusionDirectory no tiene forma de recuperar la data"
-
-#: admin/fai/remove.tpl.c:8 admin/fai/remove_branch.tpl.c:8
-msgid "So - if you're sure - press 'Delete' to continue or 'Cancel' to abort."
-msgstr "Entonces, si esta seguro, presione <i>Eliminar</i> para continuar o <i>Cancelar</i> para Abortar."
-
-#: admin/fai/faiHook.tpl.c:17
-msgid "List of hook scripts"
-msgstr "Lista de scripts de mÃ©todos"
-
-#: admin/fai/packageSelect/selectPackage-list.tpl.c:2
-#: admin/fai/classSelect/selectClass-list.tpl.c:5
-msgid "Update"
-msgstr "Actualizar"
-
-#: admin/fai/packageSelect/selectPackage-list.tpl.c:5
-#: admin/fai/classSelect/selectClass-list.tpl.c:8
-msgid "Submit"
-msgstr "Enviar"
-
-#: admin/fai/packageSelect/selectPackage-filter.tpl.c:2
-#: admin/fai/classSelect/selectClass-filter.tpl.c:2
-#: admin/fai/fai-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."
-
-#: admin/fai/remove_branch.tpl.c:5
-msgid ""
-"This includes all account data, system access, etc. for this branch. Please "
-"double check if your really want to do this since there is no way for "
-"FusionDirectory to get your data back."
-msgstr ""
-
-#: admin/fai/faiPackage.tpl.c:26
-msgid "Install method"
-msgstr "MÃ©todo de instalaciÃ³n"
-
-#: admin/fai/faiPackage.tpl.c:29
-msgid "Please select the installation method"
-msgstr "Por favor seleccione un mÃ©todo de instalaciÃ³n."
-
-#: admin/fai/faiPackage.tpl.c:32 admin/fai/faiPackage.tpl.c:35
-msgid "Used packages"
-msgstr "Paquetes usados"
-
-#: admin/fai/faiPackage.tpl.c:38
-msgid "Add from list"
-msgstr "AÃ±adir de la lista"
-
-#: admin/fai/faiProfileEntry.tpl.c:2
-msgid "List of FAI objects (Fully Automatic Installation)"
-msgstr "Lista de objetos FAI (InstalaciÃ³n Completamente automÃ¡tica)"
-
-#: admin/fai/faiProfileEntry.tpl.c:5
-msgid "Information"
-msgstr "InformaciÃ³n"
-
-#: admin/fai/faiProfileEntry.tpl.c:8
-msgid ""
-"This menu allows you to select FAI class names and to add them to the "
-"currently edited profile."
-msgstr "Este menÃº le permite seleccionar nombres de clases FAI y aÃ±adirlas a el perfil editado actualmente."
-
-#: admin/fai/faiProfileEntry.tpl.c:11
-msgid "Filters"
-msgstr "Filtros"
-
-#: admin/fai/faiProfileEntry.tpl.c:14
-msgid "Show only classes with templates"
-msgstr "Mostrar solo clases con plantillas"
-
-#: admin/fai/faiProfileEntry.tpl.c:17
-msgid "Show only classes with scripts"
-msgstr "Solo mostrar clases con scripts"
-
-#: admin/fai/faiProfileEntry.tpl.c:20
-msgid "Show only classes with hooks"
-msgstr "Solo mostrar clases con mÃ©todos"
-
-#: admin/fai/faiProfileEntry.tpl.c:23
-msgid "Show only classes with variables"
-msgstr "Mostrar solo clases con variables"
-
-#: admin/fai/faiProfileEntry.tpl.c:26
-msgid "Show only classes with packages"
-msgstr "Mostrar solo clases con paquetes"
-
-#: admin/fai/faiProfileEntry.tpl.c:29
-msgid "Show only classes with partitions"
-msgstr "Mostrar solo clases con particiones"
-
-#: admin/fai/faiProfileEntry.tpl.c:32 admin/fai/faiProfileEntry.tpl.c:35
-msgid "Display objects matching"
-msgstr "Mostrar objetos que coincidan"
-
-#: admin/fai/faiProfileEntry.tpl.c:38
-msgid "Regular expression for matching object names"
-msgstr "Expresiones regulares para buscar nombre de objetos"
-
-#: admin/fai/faiTemplateEntry.tpl.c:17 admin/fai/faiTemplateEntry.tpl.c:20
-msgid "Template attributes"
-msgstr "Atributos de la plantilla"
-
-#: admin/fai/faiTemplateEntry.tpl.c:26 admin/fai/faiTemplateEntry.tpl.c:29
-msgid "Save template"
-msgstr "Guardar plantilla"
-
-#: admin/fai/faiTemplateEntry.tpl.c:32 admin/fai/faiTemplateEntry.tpl.c:35
-msgid "Edit template"
-msgstr "Editar plantilla"
-
-#: admin/fai/faiTemplateEntry.tpl.c:38
-msgid "Full path"
-msgstr "Ruta completa"
-
-#: admin/fai/faiTemplateEntry.tpl.c:41
-msgid "Upload"
-msgstr "Enviar"
-
-#: admin/fai/faiTemplateEntry.tpl.c:44
-msgid "Owner"
-msgstr "Propietario"
-
-#: admin/fai/faiTemplateEntry.tpl.c:50
-msgid "Access"
-msgstr "Acceso"
-
-#: admin/fai/faiTemplateEntry.tpl.c:53
-msgid "Class"
-msgstr "Clase"
-
-#: admin/fai/faiTemplateEntry.tpl.c:56
-msgid "Read"
-msgstr "Lectura"
-
-#: admin/fai/faiTemplateEntry.tpl.c:59
-msgid "Write"
-msgstr "Escritura"
-
-#: admin/fai/faiTemplateEntry.tpl.c:62
-msgid "Execute"
-msgstr "Ejecute"
-
-#: admin/fai/faiTemplateEntry.tpl.c:65
-msgid "Special"
-msgstr "Especial"
-
-#: admin/fai/faiTemplateEntry.tpl.c:71
-msgid "SUID"
-msgstr "SUID"
-
-#: admin/fai/faiTemplateEntry.tpl.c:77
-msgid "SGID"
-msgstr "SGID"
-
-#: admin/fai/faiTemplateEntry.tpl.c:80
-msgid "Others"
-msgstr "Otros"
-
-#: admin/fai/faiTemplateEntry.tpl.c:83
-msgid "sticky"
-msgstr "estatico"
-
-#: admin/fai/faiScriptEntry.tpl.c:17 admin/fai/faiScriptEntry.tpl.c:26
-msgid "Script attributes"
-msgstr "ParÃ¡metros del script"
-
-#: admin/fai/faiScriptEntry.tpl.c:23
-msgid ""
-"Choose a priority. Low values result in an earlier, high values in a later "
-"execution."
-msgstr "Elija una prioridad. Valores bajos iniciarÃ¡n antes y valores altos mas tarde, la ejecuciÃ³n."
-
-#: admin/fai/faiScriptEntry.tpl.c:32 admin/fai/faiHookEntry.tpl.c:32
-msgid "Import script"
-msgstr "Importar script"
-
-#: admin/fai/classSelect/selectClass-list.tpl.c:2
-msgid "Base"
-msgstr "Base"
-
-#: admin/fai/fai-filter.tpl.c:29
-msgid "Show profiles"
-msgstr "Mostrar perfiles"
-
-#: admin/fai/fai-filter.tpl.c:32
-msgid "Show templates"
-msgstr "Mostrar plantillas"
-
-#: admin/fai/fai-filter.tpl.c:35
-msgid "Show scripts"
-msgstr "Mostrar scrips"
-
-#: admin/fai/fai-filter.tpl.c:38
-msgid "Show hooks"
-msgstr "Mostrar metodos"
-
-#: admin/fai/fai-filter.tpl.c:41
-msgid "Show variables"
-msgstr "Mostrar variables"
-
-#: admin/fai/fai-filter.tpl.c:44
-msgid "Show packages"
-msgstr "Mostrar paquetes"
-
-#: admin/fai/fai-filter.tpl.c:47
-msgid "Show partitions"
-msgstr "Mostrar particiones"
-
-#: admin/fai/faiTemplateEdit.tpl.c:2
-msgid "This FAI template is write protected. Editing may break it!"
-msgstr "Esta plantilla FAS estÃ¡ protegida contra escritura. Â¡Editarla puede corromperla!"
-
-#: admin/fai/faiTemplateEdit.tpl.c:5
-msgid "Edit anyway"
-msgstr "Editar de cualquier manera"
-
-#: admin/fai/faiPartitionTable.tpl.c:14
-msgid "Use 'setup-storage' to partition the disk"
-msgstr "Use 'configurar-almacenamiento' para particionar el disco"
-
-#: admin/fai/faiPartitionTable.tpl.c:20
-msgid "Discs"
-msgstr "Discos"
-
-#: admin/fai/faiPartitionTable.tpl.c:23 admin/fai/faiPartitionTable.tpl.c:26
-#: admin/fai/faiPartitionTable.tpl.c:41 admin/fai/faiPartitionTable.tpl.c:44
-msgid "Add disk"
-msgstr "AÃ±adir disco"
-
-#: admin/fai/faiPartitionTable.tpl.c:29 admin/fai/faiPartitionTable.tpl.c:32
-#: admin/fai/faiPartitionTable.tpl.c:47 admin/fai/faiPartitionTable.tpl.c:50
-msgid "Add RAID"
-msgstr "AÃ±adir RAID"
-
-#: admin/fai/faiPartitionTable.tpl.c:35 admin/fai/faiPartitionTable.tpl.c:38
-#: admin/fai/faiPartitionTable.tpl.c:53 admin/fai/faiPartitionTable.tpl.c:56
-msgid "Add volume group"
-msgstr "AÃ±adir grupo de volumen"
-
-#: admin/fai/faiScript.tpl.c:17
-msgid "List of scripts"
-msgstr "Lista de scripts"
-
-#: admin/fai/faiProfile.tpl.c:20
-msgid "Choose a priority"
-msgstr "Elija una prioridad"
-
-#: admin/fai/faiHookEntry.tpl.c:14 admin/fai/faiHookEntry.tpl.c:17
-#: admin/fai/faiHookEntry.tpl.c:26
-msgid "Hook attributes"
-msgstr "CaracterÃsticas del mÃ©todo"
-
-#: admin/fai/faiHookEntry.tpl.c:23
-msgid "Choose an existing FAI task"
-msgstr "Seleccionar una tarea FAI existente"
diff --git a/fai/locale/fa_IR/fusiondirectory.po b/fai/locale/fa_IR/fusiondirectory.po
index bf5dae77e456aaf4c6e251f8cb9c735f4a64b6fb..f6b9a8e27c0535c286140534b5b34fb5d3d33310 100644
--- a/fai/locale/fa_IR/fusiondirectory.po
+++ b/fai/locale/fa_IR/fusiondirectory.po
@@ -5,379 +5,188 @@
 # Translators:
 msgid ""
 msgstr ""
-"Project-Id-Version: FusionDirectory-108\n"
+"Project-Id-Version: FusionDirectory-109\n"
 "Report-Msgid-Bugs-To: documentation@lists.fusiondirectory.org\n"
-"POT-Creation-Date: 2015-03-19 21:45+0100\n"
-"PO-Revision-Date: 2015-02-25 15:46+0000\n"
+"POT-Creation-Date: 2014-12-15 17:47+0100\n"
+"PO-Revision-Date: 2014-12-15 16:54+0000\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>\n"
-"Language-Team: Persian (Iran) (http://www.transifex.com/projects/p/FusionDirectory-108/language/fa_IR/)\n"
+"Language-Team: Persian (Iran) (http://www.transifex.com/projects/p/FusionDirectory-109/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/fai/class_faiScriptEntry.inc:79 admin/fai/class_faiScriptEntry.inc:82
-#: admin/fai/class_faiManagement.inc:240 admin/fai/class_faiManagement.inc:768
-#: admin/fai/class_faiManagement.inc:774
-#: admin/fai/class_faiPartitionTable.inc:268
-#: admin/fai/class_faiPartitionTable.inc:331
-#: admin/fai/class_faiDiskEntry.inc:445 admin/fai/class_FAI.inc:570
-#: admin/fai/class_faiHookEntry.inc:83 admin/fai/class_faiHookEntry.inc:86
-#: admin/fai/class_faiScript.inc:249 admin/fai/class_faiTemplate.inc:232
-#: admin/fai/class_faiHook.inc:259 admin/fai/class_faiVariable.inc:162
-#: admin/systems/class_faiLogView.inc:207
-#: admin/systems/class_faiLogView.inc:242
-msgid "Error"
-msgstr "Ø®Ø·Ø§"
-
-#: admin/fai/class_faiScriptEntry.inc:82 admin/fai/class_faiHookEntry.inc:86
-msgid "file is empty"
-msgstr ""
-
-#: admin/fai/class_faiScriptEntry.inc:102 admin/fai/class_faiHookEntry.inc:102
-#: admin/fai/class_faiScript.inc:349 admin/fai/class_faiScript.inc:374
-#: admin/fai/class_faiTemplate.inc:320 admin/fai/class_faiHook.inc:346
-msgid "Download"
-msgstr ""
-
-#: admin/fai/class_faiScriptEntry.inc:147
-#: admin/fai/class_faiScriptEntry.inc:151
-#: admin/fai/class_faiScriptEntry.inc:154
-#: admin/fai/class_faiScriptEntry.inc:197
-#: admin/fai/class_faiManagement.inc:768 admin/fai/class_faiManagement.inc:774
-#: admin/fai/class_faiPackage.inc:685
-#: admin/fai/class_faiPartitionTable.inc:779
-#: admin/fai/class_faiDiskEntry.inc:702 admin/fai/class_faiDiskEntry.inc:705
-#: admin/fai/class_faiDiskEntry.inc:758
-#: admin/fai/class_faiTemplateEntry.inc:247
-#: admin/fai/class_faiTemplateEntry.inc:312
-#: admin/fai/class_faiPartitionTableEntry.inc:353
-#: admin/fai/class_faiPartitionTableEntry.inc:356
-#: admin/fai/class_faiPartitionTableEntry.inc:360
-#: admin/fai/class_faiPartitionTableEntry.inc:455
-#: admin/fai/packageSelect/selectPackage-list.xml:40
-#: admin/fai/class_faiProfile.inc:414 admin/fai/class_faiProfile.inc:463
-#: admin/fai/class_faiHookEntry.inc:157 admin/fai/class_faiHookEntry.inc:162
-#: admin/fai/class_faiHookEntry.inc:165 admin/fai/class_faiHookEntry.inc:207
-#: admin/fai/class_askClassName.inc:163 admin/fai/class_askClassName.inc:167
-#: admin/fai/class_askClassName.inc:171 admin/fai/class_askClassName.inc:198
-#: admin/fai/class_faiScript.inc:347 admin/fai/class_faiScript.inc:605
-#: admin/fai/classSelect/selectClass-list.xml:28
-#: admin/fai/class_faiTemplate.inc:512
-#: admin/fai/class_faiVariableEntry.inc:103
-#: admin/fai/class_faiVariableEntry.inc:112
-#: admin/fai/class_faiVariableEntry.inc:115
-#: admin/fai/class_faiVariableEntry.inc:149 admin/fai/class_faiHook.inc:531
-#: admin/fai/class_faiVariable.inc:398 admin/fai/fai-list.xml:80
-#: admin/fai/faiPartitionTableEntry.tpl.c:8 admin/fai/faiPartition.tpl.c:5
-#: admin/fai/faiVariableEntry.tpl.c:8 admin/fai/faiDiskEntry.tpl.c:8
-#: admin/fai/faiTemplate.tpl.c:8 admin/fai/faiVariable.tpl.c:8
-#: admin/fai/faiHook.tpl.c:8
-#: admin/fai/packageSelect/selectPackage-filter.tpl.c:8
-#: admin/fai/faiPackage.tpl.c:8 admin/fai/faiScriptEntry.tpl.c:8
-#: admin/fai/classSelect/selectClass-filter.tpl.c:5
-#: admin/fai/fai-filter.tpl.c:50 admin/fai/faiPartitionTable.tpl.c:8
-#: admin/fai/faiScript.tpl.c:8 admin/fai/faiProfile.tpl.c:8
-#: admin/fai/faiHookEntry.tpl.c:8
-msgid "Name"
-msgstr ""
-
-#: admin/fai/class_faiScriptEntry.inc:159 admin/fai/class_faiHookEntry.inc:170
-#: admin/fai/class_faiScript.inc:594 admin/fai/fai-list.xml:122
-#: admin/fai/faiScriptEntry.tpl.c:29 admin/fai/faiHookEntry.tpl.c:29
-msgid "Script"
-msgstr ""
-
-#: admin/fai/class_faiScriptEntry.inc:190
-#: admin/fai/class_faiScriptEntry.inc:199
-msgid "Script entry"
-msgstr ""
-
-#: admin/fai/class_faiScriptEntry.inc:191
-msgid "FAI script entry"
-msgstr ""
-
-#: admin/fai/class_faiScriptEntry.inc:198 admin/fai/class_faiPackage.inc:686
-#: admin/fai/class_faiPartitionTable.inc:780
-#: admin/fai/class_faiDiskEntry.inc:759
-#: admin/fai/class_faiTemplateEntry.inc:313
-#: admin/fai/class_faiPartitionTableEntry.inc:456
-#: admin/fai/class_faiProfile.inc:464 admin/fai/class_faiHookEntry.inc:208
-#: admin/fai/class_faiScript.inc:606 admin/fai/class_faiTemplate.inc:513
-#: admin/fai/class_faiVariableEntry.inc:150 admin/fai/class_faiHook.inc:532
-#: admin/fai/class_faiVariable.inc:399
-#: admin/fai/faiPartitionTableEntry.tpl.c:11 admin/fai/faiPartition.tpl.c:11
-#: admin/fai/faiVariableEntry.tpl.c:11 admin/fai/faiDiskEntry.tpl.c:14
-#: admin/fai/faiTemplate.tpl.c:11 admin/fai/faiVariable.tpl.c:11
-#: admin/fai/faiHook.tpl.c:11 admin/fai/faiPackage.tpl.c:11
-#: admin/fai/faiTemplateEntry.tpl.c:14 admin/fai/faiScriptEntry.tpl.c:11
-#: admin/fai/faiPartitionTable.tpl.c:11 admin/fai/faiScript.tpl.c:11
-#: admin/fai/faiProfile.tpl.c:11 admin/fai/faiHookEntry.tpl.c:11
-msgid "Description"
-msgstr ""
-
-#: admin/fai/class_faiScriptEntry.inc:200
-msgid "Script Priority"
-msgstr ""
-
-#: admin/fai/class_faiManagement.inc:188
-msgid "partition table"
-msgstr ""
-
-#: admin/fai/class_faiManagement.inc:189 admin/fai/fai-list.xml:31
-msgid "script"
-msgstr ""
-
-#: admin/fai/class_faiManagement.inc:190 admin/fai/fai-list.xml:47
-msgid "hook"
-msgstr ""
-
-#: admin/fai/class_faiManagement.inc:191 admin/fai/fai-list.xml:39
-msgid "variable"
-msgstr ""
-
-#: admin/fai/class_faiManagement.inc:192 admin/fai/fai-list.xml:63
-msgid "template"
-msgstr ""
-
-#: admin/fai/class_faiManagement.inc:193
-msgid "package list"
-msgstr ""
-
-#: admin/fai/class_faiManagement.inc:210 admin/fai/class_faiManagement.inc:226
-#: admin/fai/class_faiManagement.inc:332 admin/fai/class_faiManagement.inc:390
-#: admin/fai/class_faiManagement.inc:480 admin/fai/class_faiManagement.inc:575
-#: admin/fai/class_faiManagement.inc:598 admin/fai/class_faiManagement.inc:619
-msgid "Permission error"
-msgstr ""
-
-#: admin/fai/class_faiManagement.inc:211 admin/fai/class_faiManagement.inc:226
-#, php-format
-msgid "You have no permission to create a new %s!"
-msgstr ""
-
-#: admin/fai/class_faiManagement.inc:226 admin/fai/fai-list.xml:55
-msgid "profile"
-msgstr ""
-
-#: admin/fai/class_faiManagement.inc:328
-msgid "Branch locked"
-msgstr ""
-
-#: admin/fai/class_faiManagement.inc:329
-#, php-format
-msgid "The following entries are locked, you can't remove them %s."
-msgstr ""
-
-#: admin/fai/class_faiManagement.inc:346
-msgid "FAI object"
-msgstr ""
-
-#: admin/fai/class_faiManagement.inc:477
-msgid "FAI branch/freeze"
-msgstr ""
-
-#: admin/fai/class_faiManagement.inc:480
-msgid "You have no permission to delete this release!"
-msgstr ""
-
-#: admin/fai/class_faiManagement.inc:496 admin/fai/remove.tpl.c:2
-#: admin/fai/remove_branch.tpl.c:2
-msgid "Warning"
-msgstr ""
-
-#: admin/fai/class_faiManagement.inc:496
-msgid "Release remove aborted because the release name check failed!"
-msgstr ""
-
-#: admin/fai/class_faiManagement.inc:573 admin/fai/class_faiManagement.inc:596
-msgid "Configuration"
-msgstr ""
-
-#: admin/fai/class_faiManagement.inc:575 admin/fai/class_faiManagement.inc:598
-#: admin/fai/class_faiManagement.inc:619
-msgid "Branch"
-msgstr ""
-
-#: admin/fai/class_faiManagement.inc:725 admin/fai/askClassName.tpl.c:23
-msgid "Continue"
+#: admin/fai/class_faiManagement.inc:117 admin/fai/class_faiManagement.inc:122
+#: admin/fai/packageSelect/selectPackage-list.xml:14
+#: admin/systems/class_faiStartup.inc:178 config/fai/class_faiConfig.inc:41
+msgid "FAI"
 msgstr ""
 
-#: admin/fai/class_faiManagement.inc:926
-#: admin/fai/class_faiPartitionTable.inc:768
-#: admin/fai/class_faiProfile.inc:318 admin/fai/class_askClassName.inc:99
-#: admin/fai/classSelect/class_classSelect.inc:58
-#: admin/fai/class_faiGroupHandle.inc:120
-#: admin/fai/class_faiProfileEntry.inc:163 admin/fai/fai-list.xml:146
-msgid "Partition table"
+#: admin/fai/class_faiManagement.inc:118
+msgid "Manage FAI software packages and deployment recipes"
 msgstr ""
 
-#: admin/fai/class_faiManagement.inc:928
-#: admin/fai/class_faiGroupHandle.inc:122 admin/fai/fai-list.xml:140
-msgid "Package list"
+#: admin/fai/class_faiPackage.inc:157
+msgid "Mark for installation"
 msgstr ""
 
-#: admin/fai/class_faiManagement.inc:930
-#: admin/fai/class_faiGroupHandle.inc:124
-msgid "Scripts"
+#: admin/fai/class_faiPackage.inc:161
+msgid "Mark for removal"
 msgstr ""
 
-#: admin/fai/class_faiManagement.inc:932
-#: admin/fai/class_faiGroupHandle.inc:126
-msgid "Variables"
+#: admin/fai/class_faiPackage.inc:166
+msgid "Edit configuration"
 msgstr ""
 
-#: admin/fai/class_faiManagement.inc:934
-#: admin/fai/class_faiGroupHandle.inc:128
-msgid "Hooks"
-msgstr ""
+#: admin/fai/class_faiPackage.inc:247
+#: admin/fai/class_faiPartitionTable.inc:209
+#: admin/fai/class_faiPartitionTable.inc:250
+#: admin/fai/class_faiTemplate.inc:114
+#: admin/systems/services/repository/class_serviceDebianRepository.inc:172
+#: admin/systems/services/repository/class_serviceDebianRepository.inc:189
+#: admin/systems/services/repository/class_serviceDebianRepository.inc:193
+msgid "LDAP error"
+msgstr "Ø®Ø·Ø§ÛŒ LDAP"
 
-#: admin/fai/class_faiManagement.inc:936 admin/fai/class_faiProfile.inc:454
-#: admin/fai/class_askClassName.inc:104 admin/fai/class_faiGroupHandle.inc:130
-#: admin/fai/fai-list.xml:110
-msgid "Profile"
+#: admin/fai/class_faiPackage.inc:279
+#: admin/fai/packageSelect/class_filterFAIPackages.inc:41
+#: admin/fai/packageSelect/class_filterFAIPackages.inc:46
+#: admin/fai/class_faiPackageConfiguration.inc:55
+#: admin/systems/class_faiStartup.inc:133
+#: admin/systems/class_faiStartup.inc:160
+msgid "Service infrastructure"
 msgstr ""
 
-#: admin/fai/class_faiManagement.inc:938
-#: admin/fai/class_faiGroupHandle.inc:132
-msgid "Templates"
+#: admin/fai/class_faiPackage.inc:294
+msgid "Unkown packages"
 msgstr ""
 
-#: admin/fai/class_faiManagement.inc:1039
-#: admin/fai/class_faiManagement.inc:1045
-#: admin/fai/packageSelect/selectPackage-list.xml:14
-#: admin/fai/classSelect/selectClass-list.xml:15
-#: admin/systems/class_faiStartup.inc:177 config/fai/class_faiConfig.inc:41
-msgid "FAI"
+#: admin/fai/class_faiPackage.inc:365
+msgid "Package"
 msgstr ""
 
-#: admin/fai/class_faiManagement.inc:1040
-msgid "Manage FAI software packages and deployment recipes"
+#: admin/fai/class_faiPackage.inc:366
+msgid "FAI Package list"
 msgstr ""
 
-#: admin/fai/class_faiPackage.inc:261
-msgid "Invalid package names"
+#: admin/fai/class_faiPackage.inc:369
+msgid "FAI Package"
 msgstr ""
 
-#: admin/fai/class_faiPackage.inc:262
-#, php-format
-msgid "The following package names don't match the Debian policy: %s"
+#: admin/fai/class_faiPackage.inc:385
+#: admin/fai/class_faiPartitionTable.inc:304
+#: admin/fai/class_faiTemplateEntry.inc:140 admin/fai/class_faiProfile.inc:47
+#: admin/fai/class_faiScript.inc:50 admin/fai/class_faiTemplate.inc:173
+#: admin/fai/class_faiHook.inc:50 admin/fai/class_faiVariable.inc:50
+msgid "Properties"
 msgstr ""
 
-#: admin/fai/class_faiPackage.inc:421 admin/fai/class_faiPackage.inc:422
-msgid "Configured"
+#: admin/fai/class_faiPackage.inc:388
+#: admin/fai/class_faiPartitionTable.inc:307 admin/fai/class_faiProfile.inc:50
+#: admin/fai/class_faiScript.inc:53 admin/fai/class_faiTemplate.inc:176
+#: admin/fai/class_faiHook.inc:53 admin/fai/class_faiVariable.inc:53
+msgid "Class name"
 msgstr ""
 
-#: admin/fai/class_faiPackage.inc:428 admin/fai/class_faiPackage.inc:429
-msgid "Package marked for removal"
+#: admin/fai/class_faiPackage.inc:388 admin/fai/class_faiScript.inc:53
+#: admin/fai/class_faiHook.inc:53 admin/fai/class_faiVariable.inc:53
+msgid "Variables class name"
 msgstr ""
 
-#: admin/fai/class_faiPackage.inc:445
-msgid "Mark package for removal"
+#: admin/fai/class_faiPackage.inc:392
+#: admin/fai/class_faiPartitionTable.inc:311
+#: admin/fai/class_faiDiskEntry.inc:738
+#: admin/fai/class_faiTemplateEntry.inc:147 admin/fai/class_faiProfile.inc:54
+#: admin/fai/class_faiScript.inc:57 admin/fai/class_faiScript.inc:75
+#: admin/fai/class_faiTemplate.inc:180 admin/fai/class_faiHook.inc:57
+#: admin/fai/class_faiHook.inc:75 admin/fai/class_faiVariable.inc:57
+#: admin/fai/class_faiVariable.inc:75
+msgid "Description"
 msgstr ""
 
-#: admin/fai/class_faiPackage.inc:451
-msgid "Configure this package"
+#: admin/fai/class_faiPackage.inc:392
+#: admin/fai/class_faiPartitionTable.inc:311 admin/fai/class_faiProfile.inc:54
+#: admin/fai/class_faiScript.inc:57 admin/fai/class_faiTemplate.inc:180
+#: admin/fai/class_faiHook.inc:57 admin/fai/class_faiVariable.inc:57
+msgid "Short description of the class"
 msgstr ""
 
-#: admin/fai/class_faiPackage.inc:455
-msgid "Remove this package"
+#: admin/fai/class_faiPackage.inc:398 admin/systems/class_faiStartup.inc:90
+msgid "Repository"
 msgstr ""
 
-#: admin/fai/class_faiPackage.inc:534
-msgid "Please select a least one package!"
+#: admin/fai/class_faiPackage.inc:401 admin/systems/class_faiStartup.inc:78
+#: admin/systems/services/repository/class_serviceDebianRepository.inc:52
+#: admin/systems/services/repository/class_serviceCentosRepository.inc:49
+msgid "Release"
 msgstr ""
 
-#: admin/fai/class_faiPackage.inc:538
-msgid ""
-"Please choose a valid release/section combination for your repository setup!"
+#: admin/fai/class_faiPackage.inc:401
+msgid "Debian release concerned"
 msgstr ""
 
-#: admin/fai/class_faiPackage.inc:571
-#: admin/fai/packageSelect/class_filterFAIPackages.inc:41
-#: admin/fai/packageSelect/class_filterFAIPackages.inc:46
-#: admin/fai/class_faiPackageConfiguration.inc:55
-#: admin/systems/class_faiStartup.inc:132
-#: admin/systems/class_faiStartup.inc:159
-msgid "Infrastructure service"
+#: admin/fai/class_faiPackage.inc:405
+#: admin/systems/services/repository/class_serviceDebianRepository.inc:58
+msgid "Sections"
 msgstr ""
 
-#: admin/fai/class_faiPackage.inc:587
-msgid "Unkown packages"
+#: admin/fai/class_faiPackage.inc:405
+msgid "Sections concerned"
 msgstr ""
 
-#: admin/fai/class_faiPackage.inc:674
-#: admin/fai/faiPackageConfiguration.tpl.c:2
-msgid "Package"
+#: admin/fai/class_faiPackage.inc:409
+msgid "Install method"
 msgstr ""
 
-#: admin/fai/class_faiPackage.inc:675
-msgid "FAI Package list"
+#: admin/fai/class_faiPackage.inc:409
+msgid "Install method to use for this package list"
 msgstr ""
 
-#: admin/fai/class_faiPackage.inc:679
-msgid "FAI Package"
-msgstr ""
-
-#: admin/fai/class_faiPackage.inc:687
+#: admin/fai/class_faiPackage.inc:420
 msgid "Packages"
 msgstr ""
 
-#: admin/fai/class_faiPackage.inc:688 admin/fai/faiPackage.tpl.c:23
-msgid "Section"
-msgstr ""
-
-#: admin/fai/class_faiPackage.inc:688 admin/fai/class_faiPackage.inc:691
-#: admin/fai/class_faiScript.inc:605 admin/fai/class_faiTemplate.inc:512
-msgid "Readonly"
+#: admin/fai/class_faiPackage.inc:424
+msgid "Packages in this class"
 msgstr ""
 
-#: admin/fai/class_faiPackage.inc:689
-msgid "Install Method"
-msgstr ""
+#: admin/fai/class_faiPartitionTable.inc:61
+#: admin/fai/class_faiDiskEntry.inc:442 admin/systems/class_faiLogView.inc:207
+#: admin/systems/class_faiLogView.inc:242
+msgid "Error"
+msgstr "Ø®Ø·Ø§"
 
-#: admin/fai/class_faiPackage.inc:690
-msgid "Package configuration"
+#: admin/fai/class_faiPartitionTable.inc:112
+msgid "Add RAID"
 msgstr ""
 
-#: admin/fai/class_faiPackage.inc:691 admin/systems/class_faiStartup.inc:78
-#: admin/systems/services/repository/class_serviceRepository.inc:40
-#: admin/fai/branch_selector.tpl.c:14 admin/fai/faiPackage.tpl.c:20
-#: admin/fai/fai-filter.tpl.c:5 admin/fai/fai-filter.tpl.c:14
-msgid "Release"
+#: admin/fai/class_faiPartitionTable.inc:116
+msgid "Add LVM"
 msgstr ""
 
-#: admin/fai/class_faiPartitionTable.inc:269
-#: admin/fai/class_faiDiskEntry.inc:446
-#, php-format
-msgid ""
-"The disk cannot be deleted while it is used in the '%s' disk definition!"
+#: admin/fai/class_faiPartitionTable.inc:284
+msgid "Partition table"
 msgstr ""
 
-#: admin/fai/class_faiPartitionTable.inc:416 admin/fai/class_faiScript.inc:360
-#: admin/fai/class_faiScript.inc:362 admin/fai/class_faiTemplate.inc:306
-#: admin/fai/class_faiTemplate.inc:308
-msgid "edit"
+#: admin/fai/class_faiPartitionTable.inc:285
+#: admin/fai/class_faiPartitionTable.inc:288
+msgid "FAI partition table"
 msgstr ""
 
-#: admin/fai/class_faiPartitionTable.inc:418 admin/fai/class_faiScript.inc:364
-#: admin/fai/class_faiTemplate.inc:310
-msgid "delete"
+#: admin/fai/class_faiPartitionTable.inc:307 admin/fai/class_faiProfile.inc:50
+msgid "Partition table class name"
 msgstr ""
 
-#: admin/fai/class_faiPartitionTable.inc:769
-#: admin/fai/class_faiPartitionTable.inc:773
-msgid "FAI partition table"
+#: admin/fai/class_faiPartitionTable.inc:317
+msgid "Discs"
 msgstr ""
 
-#: admin/fai/class_faiPartitionTable.inc:779 admin/fai/class_faiHook.inc:531
-#: admin/fai/class_faiVariable.inc:398
-msgid "Read only"
+#: admin/fai/class_faiPartitionTable.inc:324
+msgid "Partitions in this class"
 msgstr ""
 
 #: admin/fai/class_faiDiskEntry.inc:273
-#: admin/fai/faiPartitionTableEntry.tpl.c:5 admin/fai/faiDiskEntry.tpl.c:5
 msgid "Device"
 msgstr ""
 
@@ -389,103 +198,103 @@ msgstr ""
 msgid "UUID"
 msgstr ""
 
-#: admin/fai/class_faiDiskEntry.inc:345
+#: admin/fai/class_faiDiskEntry.inc:344
 msgid "Disks"
 msgstr ""
 
-#: admin/fai/class_faiDiskEntry.inc:348 admin/fai/class_faiPartition.inc:321
-#: admin/fai/faiPartition.tpl.c:14
+#: admin/fai/class_faiDiskEntry.inc:347 admin/fai/class_faiPartition.inc:319
 msgid "Size"
 msgstr ""
 
-#: admin/fai/class_faiDiskEntry.inc:544
+#: admin/fai/class_faiDiskEntry.inc:443
+#, php-format
+msgid ""
+"The disk cannot be deleted while it is used in the '%s' disk definition!"
+msgstr ""
+
+#: admin/fai/class_faiDiskEntry.inc:536
 msgid "encrypted"
 msgstr ""
 
-#: admin/fai/class_faiDiskEntry.inc:547
+#: admin/fai/class_faiDiskEntry.inc:539
 msgid "bootable"
 msgstr ""
 
-#: admin/fai/class_faiDiskEntry.inc:550
+#: admin/fai/class_faiDiskEntry.inc:542
 msgid "preserve"
 msgstr ""
 
-#: admin/fai/class_faiDiskEntry.inc:735
+#: admin/fai/class_faiDiskEntry.inc:687 admin/fai/class_faiDiskEntry.inc:690
+#: admin/fai/class_faiDiskEntry.inc:737
+#: admin/fai/packageSelect/selectPackage-list.xml:40
+#: admin/fai/class_faiScript.inc:71 admin/fai/class_faiHook.inc:71
+#: admin/fai/class_faiVariable.inc:71
+#: admin/fai/class_faiSimplePluginClass.inc:50
+msgid "Name"
+msgstr ""
+
+#: admin/fai/class_faiDiskEntry.inc:717
 msgid ""
 "You have more than four primary partition table entries in your "
 "configuration, please check your configuration twice."
 msgstr ""
 
-#: admin/fai/class_faiDiskEntry.inc:739
+#: admin/fai/class_faiDiskEntry.inc:721
 msgid ""
 "You cannot have more than three primary partition while using logical "
 "partitions, please check your configuration twice."
 msgstr ""
 
-#: admin/fai/class_faiDiskEntry.inc:752
-#: admin/fai/class_faiPartitionTableEntry.inc:448
+#: admin/fai/class_faiDiskEntry.inc:733
 msgid "Partition table entry"
 msgstr ""
 
-#: admin/fai/class_faiDiskEntry.inc:753
-#: admin/fai/class_faiPartitionTableEntry.inc:449
+#: admin/fai/class_faiDiskEntry.inc:734
 msgid "FAI partition table entry"
 msgstr ""
 
-#: admin/fai/class_faiDiskEntry.inc:760
+#: admin/fai/class_faiDiskEntry.inc:739
 msgid "Disk options"
 msgstr ""
 
-#: admin/fai/class_faiDiskEntry.inc:761
-#: admin/fai/class_faiPartitionTableEntry.inc:457
+#: admin/fai/class_faiDiskEntry.inc:740
 msgid "Partition type"
 msgstr ""
 
-#: admin/fai/class_faiDiskEntry.inc:762
-#: admin/fai/class_faiPartitionTableEntry.inc:458
+#: admin/fai/class_faiDiskEntry.inc:741
 msgid "Partition no."
 msgstr ""
 
-#: admin/fai/class_faiDiskEntry.inc:763
-#: admin/fai/class_faiPartitionTableEntry.inc:459
+#: admin/fai/class_faiDiskEntry.inc:742
 msgid "File system type"
 msgstr ""
 
-#: admin/fai/class_faiDiskEntry.inc:764
-#: admin/fai/class_faiPartitionTableEntry.inc:171
-#: admin/fai/class_faiPartitionTableEntry.inc:460
-#: admin/fai/class_faiPartition.inc:437 admin/fai/faiPartition.tpl.c:47
+#: admin/fai/class_faiDiskEntry.inc:743 admin/fai/class_faiPartition.inc:432
 msgid "Mount point"
 msgstr ""
 
-#: admin/fai/class_faiDiskEntry.inc:765
-#: admin/fai/class_faiPartitionTableEntry.inc:461
-#: admin/fai/class_faiPartition.inc:402 admin/fai/class_faiPartition.inc:407
+#: admin/fai/class_faiDiskEntry.inc:744 admin/fai/class_faiPartition.inc:397
+#: admin/fai/class_faiPartition.inc:402
 msgid "Partition size"
 msgstr ""
 
-#: admin/fai/class_faiDiskEntry.inc:766
-#: admin/fai/class_faiPartitionTableEntry.inc:173
-#: admin/fai/class_faiPartitionTableEntry.inc:462
-#: admin/fai/faiPartition.tpl.c:50
+#: admin/fai/class_faiDiskEntry.inc:745
 msgid "Mount options"
 msgstr ""
 
-#: admin/fai/class_faiDiskEntry.inc:767
-#: admin/fai/class_faiPartitionTableEntry.inc:463
+#: admin/fai/class_faiDiskEntry.inc:746
 msgid "File system options"
 msgstr ""
 
-#: admin/fai/class_faiDiskEntry.inc:768
-#: admin/fai/class_faiPartitionTableEntry.inc:464
+#: admin/fai/class_faiDiskEntry.inc:747
 msgid "Partition flags"
 msgstr ""
 
-#: admin/fai/class_debconfTemplate.inc:227
+#: admin/fai/class_debconfTemplate.inc:225
 msgid "This package has no debconf options."
 msgstr ""
 
-#: admin/fai/class_debconfTemplate.inc:264
+#: admin/fai/class_debconfTemplate.inc:262
 msgid ""
 "This debconf question is dynamically generated during package installation "
 "and requires choosing between specific options which cannot be presented "
@@ -493,217 +302,59 @@ msgid ""
 " effect."
 msgstr ""
 
-#: admin/fai/class_faiTemplateEntry.inc:139
-msgid "no file uploaded yet"
-msgstr ""
-
-#: admin/fai/class_faiTemplateEntry.inc:142
-#, php-format
-msgid "exists in database (size: %s bytes)"
-msgstr ""
-
-#: admin/fai/class_faiTemplateEntry.inc:251
-#: admin/systems/class_faiLogView.inc:70 admin/fai/faiTemplateEntry.tpl.c:23
-msgid "File"
-msgstr ""
-
-#: admin/fai/class_faiTemplateEntry.inc:255
-#: admin/fai/faiTemplateEntry.tpl.c:11
-msgid "Destination path"
+#: admin/fai/class_faiTemplateEntry.inc:143
+msgid "File path"
 msgstr ""
 
-#: admin/fai/class_faiTemplateEntry.inc:260 admin/fai/faiTemplateEntry.tpl.c:8
-msgid "File name"
+#: admin/fai/class_faiTemplateEntry.inc:143
+msgid "Complete absolute template file path and name"
 msgstr ""
 
-#: admin/fai/class_faiTemplateEntry.inc:264
-#: admin/fai/class_faiTemplateEntry.inc:266
-#: admin/fai/faiTemplateEntry.tpl.c:68
-msgid "User"
+#: admin/fai/class_faiTemplateEntry.inc:147
+msgid "Short description of the file"
 msgstr ""
 
-#: admin/fai/class_faiTemplateEntry.inc:270
-#: admin/fai/class_faiTemplateEntry.inc:273
-#: admin/fai/class_faiTemplateEntry.inc:275
-#: admin/fai/faiTemplateEntry.tpl.c:47 admin/fai/faiTemplateEntry.tpl.c:74
-msgid "Group"
+#: admin/fai/class_faiTemplateEntry.inc:156
+msgid "Template attributes"
 msgstr ""
 
-#: admin/fai/class_faiTemplateEntry.inc:305
-msgid "Template entry"
+#: admin/fai/class_faiTemplateEntry.inc:160
+msgid "Template file content"
 msgstr ""
 
-#: admin/fai/class_faiTemplateEntry.inc:306
-msgid "FAI template entry"
+#: admin/fai/class_faiTemplateEntry.inc:160
+msgid "Content of the template file"
 msgstr ""
 
-#: admin/fai/class_faiTemplateEntry.inc:314
-msgid "Template file"
+#: admin/fai/class_faiTemplateEntry.inc:164
+msgid "Owner and group of the file"
 msgstr ""
 
-#: admin/fai/class_faiTemplateEntry.inc:315
-msgid "Template path"
+#: admin/fai/class_faiTemplateEntry.inc:167
+msgid "Owner"
 msgstr ""
 
-#: admin/fai/class_faiTemplateEntry.inc:316
+#: admin/fai/class_faiTemplateEntry.inc:167
 msgid "File owner"
 msgstr ""
 
-#: admin/fai/class_faiTemplateEntry.inc:317
-msgid "File permissions"
-msgstr ""
-
-#: admin/fai/class_FAI.inc:287 admin/fai/class_FAI.inc:679
-#: admin/fai/class_FAI.inc:1266 admin/fai/class_FAI.inc:1283
-#: admin/fai/class_FAI.inc:1287
-msgid "LDAP error"
-msgstr "Ø®Ø·Ø§ÛŒ LDAP"
-
-#: admin/fai/class_FAI.inc:570
-#, php-format
-msgid "Error, following objects should be equal '%s' and '%s'"
-msgstr ""
-
-#: admin/fai/class_FAI.inc:891
-#, php-format
-msgid "Creating group application release for %s"
-msgstr ""
-
-#: admin/fai/class_FAI.inc:960 admin/fai/class_FAI.inc:982
-#: admin/fai/class_FAI.inc:1022 admin/fai/class_FAI.inc:1027
-#: admin/fai/class_FAI.inc:1065
-msgid "Object"
-msgstr ""
-
-#: admin/fai/class_FAI.inc:961
-#, php-format
-msgid "Adding missing group application release container %s."
-msgstr ""
-
-#: admin/fai/class_FAI.inc:983
-#, php-format
-msgid "Adding group application release container %s."
-msgstr ""
-
-#: admin/fai/class_FAI.inc:1023
-#, php-format
-msgid "Could not create menu entry %s. (Already exists)."
-msgstr ""
-
-#: admin/fai/class_FAI.inc:1028
-#, php-format
-msgid "Created group application menu entry for %s."
-msgstr ""
-
-#: admin/fai/class_FAI.inc:1059
-#, php-format
-msgid "Creating copy of %s"
-msgstr ""
-
-#: admin/fai/class_FAI.inc:1062
-msgid "Processing"
-msgstr ""
-
-#: admin/fai/class_FAI.inc:1080
-msgid "Could not create new release, the destination dn is already in use."
-msgstr ""
-
-#: admin/fai/class_FAI.inc:1093
-msgid "Error while fetching source dn - aborted!"
-msgstr ""
-
-#: admin/fai/class_FAI.inc:1174
-msgid "Fatal error"
-msgstr "Ø®Ø·Ø§"
-
-#: admin/fai/class_FAI.inc:1175
-#, php-format
-msgid ""
-"Release creation failed due to ldap errors. Additional informations '%s'."
-msgstr ""
-
-#: admin/fai/class_faiPartitionTableEntry.inc:162
-msgid "primary"
-msgstr ""
-
-#: admin/fai/class_faiPartitionTableEntry.inc:162
-msgid "logical"
-msgstr ""
-
-#: admin/fai/class_faiPartitionTableEntry.inc:169
-#: admin/fai/faiPartition.tpl.c:8
-msgid "Type"
-msgstr ""
-
-#: admin/fai/class_faiPartitionTableEntry.inc:170
-msgid "FS type"
-msgstr ""
-
-#: admin/fai/class_faiPartitionTableEntry.inc:172
-msgid "Size in MB"
-msgstr ""
-
-#: admin/fai/class_faiPartitionTableEntry.inc:174
-msgid "FS option"
-msgstr ""
-
-#: admin/fai/class_faiPartitionTableEntry.inc:175
-#: admin/fai/faiPartition.tpl.c:23
-msgid "Preserve"
-msgstr ""
-
-#: admin/fai/class_faiPartitionTableEntry.inc:266
-msgid "False"
-msgstr ""
-
-#: admin/fai/class_faiPartitionTableEntry.inc:268
-msgid "True"
-msgstr ""
-
-#: admin/fai/class_faiPartitionTableEntry.inc:272
-#: admin/fai/class_faiPartitionTableEntry.inc:274 admin/fai/fai-list.xml:159
-#: admin/fai/fai-list.xml:198
-msgid "Remove"
-msgstr ""
-
-#: admin/fai/class_faiPartitionTableEntry.inc:384
-#, php-format
-msgid "please enter a unique mount point for partition %s"
-msgstr ""
-
-#: admin/fai/class_faiPartitionTableEntry.inc:389
-#, php-format
-msgid "partition %s mount point"
-msgstr ""
-
-#: admin/fai/class_faiPartitionTableEntry.inc:394
-#, php-format
-msgid ""
-"File system type 'swap' is already used, change file system type for "
-"partition %s."
+#: admin/fai/class_faiTemplateEntry.inc:172
+msgid "Group"
 msgstr ""
 
-#: admin/fai/class_faiPartitionTableEntry.inc:398
-msgid "Please use 'swap' as mount point, if 'swap' is used as fs-type."
+#: admin/fai/class_faiTemplateEntry.inc:172
+msgid "File group"
 msgstr ""
 
-#: admin/fai/class_faiPartitionTableEntry.inc:404
-#: admin/fai/class_faiPartitionTableEntry.inc:408
-#: admin/fai/class_faiPartitionTableEntry.inc:414
-#: admin/fai/class_faiPartitionTableEntry.inc:416
-#: admin/fai/class_faiPartitionTableEntry.inc:421
-#, php-format
-msgid "partition %s size"
+#: admin/fai/class_faiTemplateEntry.inc:181
+msgid "Access"
 msgstr ""
 
-#: admin/fai/class_faiPartitionTableEntry.inc:436
-msgid ""
-"You have more than 3 primary partition table entries in your configuration, "
-"please check your configuration twice."
+#: admin/fai/class_faiTemplateEntry.inc:181
+msgid "Access rights"
 msgstr ""
 
 #: admin/fai/packageSelect/selectPackage-list.xml:10
-#: admin/fai/classSelect/selectClass-list.xml:11
 msgid "Please select the desired entries"
 msgstr ""
 
@@ -711,147 +362,94 @@ msgstr ""
 msgid "Version"
 msgstr ""
 
-#: admin/fai/class_faiProfile.inc:310
-msgid "This list displays all assigned class names for this profile."
-msgstr ""
-
-#: admin/fai/class_faiProfile.inc:313 admin/fai/class_askClassName.inc:103
-#: admin/fai/classSelect/class_classSelect.inc:53
-#: admin/fai/class_faiProfileEntry.inc:158
-msgid "Hook bundle"
-msgstr ""
-
-#: admin/fai/class_faiProfile.inc:314 admin/fai/class_askClassName.inc:105
-#: admin/fai/classSelect/class_classSelect.inc:54
-#: admin/fai/class_faiProfileEntry.inc:159
-msgid "Template bundle"
-msgstr ""
-
-#: admin/fai/class_faiProfile.inc:315 admin/fai/class_askClassName.inc:101
-#: admin/fai/classSelect/class_classSelect.inc:55
-#: admin/fai/class_faiProfileEntry.inc:160
-msgid "Script bundle"
-msgstr ""
-
-#: admin/fai/class_faiProfile.inc:316 admin/fai/class_askClassName.inc:102
-#: admin/fai/classSelect/class_classSelect.inc:56
-#: admin/fai/class_faiProfileEntry.inc:161
-msgid "Variable bundle"
-msgstr ""
-
-#: admin/fai/class_faiProfile.inc:317 admin/fai/class_askClassName.inc:100
-#: admin/fai/classSelect/class_classSelect.inc:57
-#: admin/fai/class_faiProfileEntry.inc:162
-msgid "Package bundle"
-msgstr ""
-
-#: admin/fai/class_faiProfile.inc:321
-msgid "Remove class from profile"
-msgstr ""
-
-#: admin/fai/class_faiProfile.inc:324
-msgid "Up"
-msgstr ""
-
-#: admin/fai/class_faiProfile.inc:325
-msgid "Down"
-msgstr ""
-
-#: admin/fai/class_faiProfile.inc:410
-msgid "No class specified for this profile!"
-msgstr ""
-
-#: admin/fai/class_faiProfile.inc:419
-msgid "You can't use the same name for a class and a profile!"
+#: admin/fai/class_faiProfile.inc:28
+msgid "Profile"
 msgstr ""
 
-#: admin/fai/class_faiProfile.inc:455
+#: admin/fai/class_faiProfile.inc:29
 msgid "FAI profile"
 msgstr ""
 
-#: admin/fai/class_faiProfile.inc:458
+#: admin/fai/class_faiProfile.inc:32
 msgid "FAI Profile"
 msgstr ""
 
-#: admin/fai/class_faiProfile.inc:465 admin/fai/faiProfile.tpl.c:17
+#: admin/fai/class_faiProfile.inc:61
 msgid "FAI classes"
 msgstr ""
 
-#: admin/fai/class_faiHookEntry.inc:200
-msgid "Hook entry"
+#: admin/fai/class_faiProfile.inc:61
+msgid "FAI classes which are part of this profile"
 msgstr ""
 
-#: admin/fai/class_faiHookEntry.inc:201
-msgid "FAI hook entry"
+#: admin/fai/class_faiPackageConfiguration.inc:88
+#, php-format
+msgid "Debconf information for package '%s'"
 msgstr ""
 
-#: admin/fai/class_faiHookEntry.inc:209 admin/fai/faiHookEntry.tpl.c:20
-msgid "Task"
+#: admin/fai/class_faiScript.inc:30 admin/fai/class_faiScript.inc:84
+#: admin/fai/class_faiHook.inc:87
+msgid "Script"
 msgstr ""
 
-#: admin/fai/class_faiHookEntry.inc:210 admin/fai/class_faiScript.inc:595
-#: admin/fai/class_faiScript.inc:599
+#: admin/fai/class_faiScript.inc:31 admin/fai/class_faiScript.inc:34
 msgid "FAI script"
 msgstr ""
 
-#: admin/fai/class_faiPackageConfiguration.inc:88
-#, php-format
-msgid "Debconf information for package '%s'"
+#: admin/fai/class_faiScript.inc:63
+msgid "Scripts"
 msgstr ""
 
-#: admin/fai/class_askClassName.inc:99 admin/fai/class_askClassName.inc:100
-#: admin/fai/class_askClassName.inc:101 admin/fai/class_askClassName.inc:102
-#: admin/fai/class_askClassName.inc:103 admin/fai/class_askClassName.inc:104
-#: admin/fai/class_askClassName.inc:105 admin/fai/class_askClassName.inc:106
-msgid "Create new FAI object"
+#: admin/fai/class_faiScript.inc:67 admin/fai/class_faiHook.inc:67
+#: admin/fai/class_faiVariable.inc:67
+msgid "Variables in this class"
 msgstr ""
 
-#: admin/fai/class_faiTemplateEdit.inc:80
-#, php-format
-msgid ""
-"The file encodig has changed from '%s' to '%s'. Do you really want to save?"
+#: admin/fai/class_faiScript.inc:71 admin/fai/class_faiHook.inc:71
+#: admin/fai/class_faiVariable.inc:71
+msgid "The name of the variable"
 msgstr ""
 
-#: admin/fai/class_faiScript.inc:333 admin/fai/class_faiScript.inc:335
-msgid "Sort direction"
+#: admin/fai/class_faiScript.inc:75 admin/fai/class_faiHook.inc:75
+#: admin/fai/class_faiVariable.inc:75
+msgid "A short description of the variable"
 msgstr ""
 
-#: admin/fai/class_faiScript.inc:348 admin/fai/faiScriptEntry.tpl.c:20
+#: admin/fai/class_faiScript.inc:79
 msgid "Priority"
 msgstr ""
 
-#: admin/fai/class_faiScript.inc:350
-msgid "Action"
+#: admin/fai/class_faiScript.inc:79
+msgid "Priority of this script (FIXME: less is done first?)"
 msgstr ""
 
-#: admin/fai/classSelect/selectClass-list.xml:36 admin/fai/fai-list.xml:88
-#: admin/fai/faiScriptEntry.tpl.c:14
-msgid "Properties"
+#: admin/fai/class_faiScript.inc:84
+msgid "The script itself"
 msgstr ""
 
-#: admin/fai/class_faiTemplate.inc:501 admin/fai/fai-list.xml:116
-msgid "Template"
+#: admin/fai/class_faiTemplate.inc:136
+#, php-format
+msgid "There are several files with the same path: %s"
 msgstr ""
 
-#: admin/fai/class_faiTemplate.inc:502 admin/fai/class_faiTemplate.inc:506
-msgid "FAI template"
+#: admin/fai/class_faiTemplate.inc:153
+msgid "Template"
 msgstr ""
 
-#: admin/fai/class_faiVariableEntry.inc:107
-msgid "Content"
+#: admin/fai/class_faiTemplate.inc:154 admin/fai/class_faiTemplate.inc:157
+msgid "FAI template"
 msgstr ""
 
-#: admin/fai/class_faiVariableEntry.inc:142
-msgid "Variable entry"
+#: admin/fai/class_faiTemplate.inc:176
+msgid "Template class name"
 msgstr ""
 
-#: admin/fai/class_faiVariableEntry.inc:143
-msgid "FAI variable entry "
+#: admin/fai/class_faiTemplate.inc:186
+msgid "Template files"
 msgstr ""
 
-#: admin/fai/class_faiVariableEntry.inc:151
-#: admin/fai/faiVariableEntry.tpl.c:20
-msgid "Variable content"
+#: admin/fai/class_faiTemplate.inc:190
+msgid "Template files in this class"
 msgstr ""
 
 #: admin/fai/class_faiPartition.inc:176 admin/fai/class_faiPartition.inc:180
@@ -950,94 +548,73 @@ msgstr ""
 msgid "btrfs"
 msgstr ""
 
-#: admin/fai/class_faiPartition.inc:224
-msgid "LVM/RAID"
-msgstr ""
-
-#: admin/fai/class_faiPartition.inc:327
+#: admin/fai/class_faiPartition.inc:325
 msgid "spare"
 msgstr ""
 
-#: admin/fai/class_faiPartition.inc:330
+#: admin/fai/class_faiPartition.inc:328
 msgid "missing"
 msgstr ""
 
-#: admin/fai/class_faiPartition.inc:333
+#: admin/fai/class_faiPartition.inc:331
 msgid "Options"
 msgstr ""
 
-#: admin/fai/class_faiPartition.inc:420
+#: admin/fai/class_faiPartition.inc:415
 msgid "Minimum partition size"
 msgstr ""
 
-#: admin/fai/class_faiPartition.inc:420
+#: admin/fai/class_faiPartition.inc:415
 msgid "Maximum partition size"
 msgstr ""
 
-#: admin/fai/class_faiPartition.inc:428
+#: admin/fai/class_faiPartition.inc:423
 msgid "Raid arrays must contain at least two partitions!"
 msgstr ""
 
-#: admin/fai/class_faiPartition.inc:430
+#: admin/fai/class_faiPartition.inc:425
 msgid ""
 "Raid 0 arrays can only be realized with a combination of two partitions!"
 msgstr ""
 
-#: admin/fai/class_faiHook.inc:332 admin/fai/class_faiHook.inc:334
-#: admin/fai/fai-list.xml:190 admin/fai/faiVariable.tpl.c:23
-#: admin/fai/faiVariable.tpl.c:26
-msgid "Edit"
-msgstr ""
-
-#: admin/fai/class_faiHook.inc:336
-msgid "Delete"
-msgstr ""
-
-#: admin/fai/class_faiHook.inc:521 admin/fai/fai-list.xml:128
+#: admin/fai/class_faiHook.inc:30
 msgid "Hook"
 msgstr ""
 
-#: admin/fai/class_faiHook.inc:522 admin/fai/class_faiHook.inc:526
+#: admin/fai/class_faiHook.inc:31 admin/fai/class_faiHook.inc:34
 msgid "FAI hook"
 msgstr ""
 
-#: admin/fai/class_faiVariable.inc:387 admin/fai/fai-list.xml:134
-msgid "Variable"
-msgstr ""
-
-#: admin/fai/class_faiVariable.inc:388 admin/fai/class_faiVariable.inc:392
-msgid "FAI variable"
+#: admin/fai/class_faiHook.inc:63
+msgid "Hooks"
 msgstr ""
 
-#: admin/fai/class_faiProfileEntry.inc:184 admin/fai/askClassName.tpl.c:11
-#: admin/fai/askClassName.tpl.c:17 admin/fai/paste_generic.tpl.c:5
-msgid "Class name"
+#: admin/fai/class_faiHook.inc:79
+msgid "Task"
 msgstr ""
 
-#: admin/fai/class_faiProfileEntry.inc:184 admin/fai/faiTemplate.tpl.c:14
-#: admin/fai/faiVariable.tpl.c:14 admin/fai/faiHook.tpl.c:14
-#: admin/fai/faiPartitionTable.tpl.c:17 admin/fai/faiScript.tpl.c:14
-msgid "Objects"
+#: admin/fai/class_faiHook.inc:87
+msgid "The script of this hook"
 msgstr ""
 
-#: admin/fai/fai-list.xml:11
-msgid "List of deployment classes and products"
+#: admin/fai/class_faiVariable.inc:30
+msgid "Variable"
 msgstr ""
 
-#: admin/fai/fai-list.xml:15
-msgid "partitionTable"
+#: admin/fai/class_faiVariable.inc:31 admin/fai/class_faiVariable.inc:34
+msgid "FAI variable"
 msgstr ""
 
-#: admin/fai/fai-list.xml:23
-msgid "packagelist"
+#: admin/fai/class_faiVariable.inc:63
+msgid "Variables"
 msgstr ""
 
-#: admin/fai/fai-list.xml:93
-msgid "Actions"
+#: admin/fai/class_faiVariable.inc:79
+msgid "Content"
 msgstr ""
 
-#: admin/fai/fai-list.xml:104
-msgid "Create"
+#: admin/fai/class_faiVariable.inc:79
+msgid "The content of the variable"
 msgstr ""
 
 #: admin/systems/class_faiLogView.inc:56
@@ -1048,6 +625,10 @@ msgstr ""
 msgid "Sort up"
 msgstr ""
 
+#: admin/systems/class_faiLogView.inc:70
+msgid "File"
+msgstr ""
+
 #: admin/systems/class_faiLogView.inc:71
 msgid "Date"
 msgstr ""
@@ -1082,7 +663,7 @@ msgstr ""
 msgid "Selected file: %s"
 msgstr ""
 
-#: admin/systems/class_faiStartup.inc:70 admin/fai/paste_generic.tpl.c:2
+#: admin/systems/class_faiStartup.inc:70
 msgid "FAI settings"
 msgstr ""
 
@@ -1102,11 +683,6 @@ msgstr ""
 msgid "FAI profil to be applied to this computer"
 msgstr ""
 
-#: admin/systems/class_faiStartup.inc:90 admin/fai/faiPackage.tpl.c:14
-#: admin/fai/faiPackage.tpl.c:17
-msgid "Repository"
-msgstr ""
-
 #: admin/systems/class_faiStartup.inc:90
 msgid "FAI Debian repository to be used for installation"
 msgstr ""
@@ -1131,85 +707,96 @@ msgstr ""
 msgid "Linux kernel parameters to be ran"
 msgstr ""
 
-#: admin/systems/class_faiStartup.inc:178
+#: admin/systems/class_faiStartup.inc:179
 msgid "Full automated installation"
 msgstr ""
 
-#: admin/systems/services/repository/class_serviceRepository.inc:31
+#: admin/systems/services/repository/class_serviceDebianRepository.inc:34
+#: admin/systems/services/repository/class_serviceCentosRepository.inc:31
+msgid "Repositories"
+msgstr ""
+
+#: admin/systems/services/repository/class_serviceDebianRepository.inc:39
+#: admin/systems/services/repository/class_serviceCentosRepository.inc:36
+msgid "Repositories this server hosts"
+msgstr ""
+
+#: admin/systems/services/repository/class_serviceDebianRepository.inc:43
+#: admin/systems/services/repository/class_serviceCentosRepository.inc:40
 msgid "URL"
 msgstr ""
 
-#: admin/systems/services/repository/class_serviceRepository.inc:31
+#: admin/systems/services/repository/class_serviceDebianRepository.inc:43
+#: admin/systems/services/repository/class_serviceCentosRepository.inc:40
 msgid "Repository url"
 msgstr ""
 
-#: admin/systems/services/repository/class_serviceRepository.inc:35
+#: admin/systems/services/repository/class_serviceDebianRepository.inc:47
+#: admin/systems/services/repository/class_serviceCentosRepository.inc:44
 msgid "Parent server"
 msgstr ""
 
-#: admin/systems/services/repository/class_serviceRepository.inc:35
+#: admin/systems/services/repository/class_serviceDebianRepository.inc:47
+#: admin/systems/services/repository/class_serviceCentosRepository.inc:44
 msgid "Parent repository server"
 msgstr ""
 
-#: admin/systems/services/repository/class_serviceRepository.inc:40
-msgid "Release used on this repository"
+#: admin/systems/services/repository/class_serviceDebianRepository.inc:52
+msgid "Debian release used on this repository"
 msgstr ""
 
-#: admin/systems/services/repository/class_serviceRepository.inc:47
-msgid "Sections"
-msgstr ""
-
-#: admin/systems/services/repository/class_serviceRepository.inc:47
-msgid "Sections available on this repository"
+#: admin/systems/services/repository/class_serviceDebianRepository.inc:58
+msgid "Debian sections available on this repository"
 msgstr ""
 
-#: admin/systems/services/repository/class_serviceRepository.inc:52
+#: admin/systems/services/repository/class_serviceDebianRepository.inc:63
+#: admin/systems/services/repository/class_serviceCentosRepository.inc:57
 msgid "Mirror mode"
 msgstr ""
 
-#: admin/systems/services/repository/class_serviceRepository.inc:52
+#: admin/systems/services/repository/class_serviceDebianRepository.inc:63
+#: admin/systems/services/repository/class_serviceCentosRepository.inc:57
 msgid ""
 "Is this mirror an installation repository? Is its release a custom one?"
 msgstr ""
 
-#: admin/systems/services/repository/class_serviceRepository.inc:57
+#: admin/systems/services/repository/class_serviceDebianRepository.inc:68
+#: admin/systems/services/repository/class_serviceCentosRepository.inc:62
 msgid "Local mirror"
 msgstr ""
 
-#: admin/systems/services/repository/class_serviceRepository.inc:57
+#: admin/systems/services/repository/class_serviceDebianRepository.inc:68
+#: admin/systems/services/repository/class_serviceCentosRepository.inc:62
 msgid "Is this mirror a local or a network mirror?"
 msgstr ""
 
-#: admin/systems/services/repository/class_serviceRepository.inc:66
+#: admin/systems/services/repository/class_serviceDebianRepository.inc:77
+#: admin/systems/services/repository/class_serviceCentosRepository.inc:71
 msgid "Architectures"
 msgstr ""
 
-#: admin/systems/services/repository/class_serviceRepository.inc:66
+#: admin/systems/services/repository/class_serviceDebianRepository.inc:77
+#: admin/systems/services/repository/class_serviceCentosRepository.inc:71
 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:140
-msgid "Repositories"
+#: admin/systems/services/repository/class_serviceDebianRepository.inc:99
+#: admin/systems/services/repository/class_serviceDebianRepository.inc:100
+msgid "Debian repository"
 msgstr ""
 
-#: admin/systems/services/repository/class_serviceRepository.inc:145
-msgid "Repositories this server hosts"
+#: admin/systems/services/repository/class_serviceDebianRepository.inc:100
+#: admin/systems/services/repository/class_serviceCentosRepository.inc:96
+msgid "Services"
 msgstr ""
 
-#: admin/systems/services/repository/class_serviceRepository.inc:160
-msgid "Package repository"
+#: admin/systems/services/repository/class_serviceCentosRepository.inc:49
+msgid "Centos release used on this repository"
 msgstr ""
 
-#: admin/systems/services/repository/class_serviceRepository.inc:161
-msgid "Package repository information"
+#: admin/systems/services/repository/class_serviceCentosRepository.inc:95
+#: admin/systems/services/repository/class_serviceCentosRepository.inc:96
+msgid "Centos repository"
 msgstr ""
 
 #: config/fai/class_faiConfig.inc:28
@@ -1241,476 +828,3 @@ msgstr ""
 #: config/fai/class_faiConfig.inc:60
 msgid "s"
 msgstr ""
-
-#: admin/fai/faiPartitionTableEntry.tpl.c:2 admin/fai/faiVariableEntry.tpl.c:2
-#: admin/fai/faiVariableEntry.tpl.c:5 admin/fai/faiDiskEntry.tpl.c:2
-#: admin/fai/faiTemplate.tpl.c:2 admin/fai/faiTemplate.tpl.c:5
-#: admin/fai/faiVariable.tpl.c:2 admin/fai/faiVariable.tpl.c:5
-#: admin/fai/faiHook.tpl.c:2 admin/fai/faiHook.tpl.c:5
-#: admin/fai/faiPackage.tpl.c:2 admin/fai/faiPackage.tpl.c:5
-#: admin/fai/faiTemplateEntry.tpl.c:2 admin/fai/faiTemplateEntry.tpl.c:5
-#: admin/fai/faiScriptEntry.tpl.c:2 admin/fai/faiScriptEntry.tpl.c:5
-#: admin/fai/faiPartitionTable.tpl.c:2 admin/fai/faiPartitionTable.tpl.c:5
-#: admin/fai/faiScript.tpl.c:2 admin/fai/faiScript.tpl.c:5
-#: admin/fai/faiProfile.tpl.c:2 admin/fai/faiProfile.tpl.c:5
-#: admin/fai/faiProfile.tpl.c:14 admin/fai/faiHookEntry.tpl.c:2
-#: admin/fai/faiHookEntry.tpl.c:5
-msgid "Generic"
-msgstr ""
-
-#: admin/fai/faiPartitionTableEntry.tpl.c:14
-#: admin/fai/faiPartitionTableEntry.tpl.c:17 admin/fai/faiDiskEntry.tpl.c:23
-#: admin/fai/faiDiskEntry.tpl.c:26
-msgid "Partition entries"
-msgstr ""
-
-#: admin/fai/faiPartitionTableEntry.tpl.c:20
-#: admin/fai/faiPartitionTableEntry.tpl.c:23 admin/fai/faiDiskEntry.tpl.c:29
-#: admin/fai/faiDiskEntry.tpl.c:32
-msgid "Add partition"
-msgstr ""
-
-#: admin/fai/branch_selector.tpl.c:2
-msgid "Releases"
-msgstr ""
-
-#: admin/fai/branch_selector.tpl.c:5
-msgid "Current release"
-msgstr ""
-
-#: admin/fai/branch_selector.tpl.c:8 admin/fai/branch_selector.tpl.c:17
-#: admin/fai/fai-filter.tpl.c:8 admin/fai/fai-filter.tpl.c:17
-msgid "Create release"
-msgstr ""
-
-#: admin/fai/branch_selector.tpl.c:11 admin/fai/branch_selector.tpl.c:23
-#: admin/fai/fai-filter.tpl.c:11 admin/fai/fai-filter.tpl.c:23
-msgid "Create read-only release"
-msgstr ""
-
-#: admin/fai/branch_selector.tpl.c:20 admin/fai/fai-filter.tpl.c:20
-msgid "Freeze"
-msgstr ""
-
-#: admin/fai/branch_selector.tpl.c:26 admin/fai/fai-filter.tpl.c:26
-msgid "Delete current release"
-msgstr ""
-
-#: admin/fai/faiPartition.tpl.c:2
-msgid "Partition"
-msgstr ""
-
-#: admin/fai/faiPartition.tpl.c:17
-msgid "Resize existing partition"
-msgstr ""
-
-#: admin/fai/faiPartition.tpl.c:20
-msgid "Bootable"
-msgstr ""
-
-#: admin/fai/faiPartition.tpl.c:26 admin/fai/faiDiskEntry.tpl.c:20
-msgid "Combined physical partitions"
-msgstr ""
-
-#: admin/fai/faiPartition.tpl.c:29
-msgid "Toggle missing"
-msgstr ""
-
-#: admin/fai/faiPartition.tpl.c:32
-msgid "Toggle spare"
-msgstr ""
-
-#: admin/fai/faiPartition.tpl.c:35
-msgid "Filesystem"
-msgstr ""
-
-#: admin/fai/faiPartition.tpl.c:38
-msgid "Filesystem create options"
-msgstr ""
-
-#: admin/fai/faiPartition.tpl.c:41
-msgid "Encrypted"
-msgstr ""
-
-#: admin/fai/faiPartition.tpl.c:44
-msgid "Tune options"
-msgstr ""
-
-#: admin/fai/faiNewBranch.tpl.c:2
-msgid ""
-"You are now going to create a branch or locked branch. This action clones "
-"the existing release to another release name. Branches can be modified as "
-"usual. FAI classes of locked branches cannot be modified, just additional "
-"classes are possible. Branch names should be alphanumeric, excluding the "
-"reserved names 'scripts', 'hooks', 'partitions', 'variables', 'templates' "
-"and 'fai'."
-msgstr ""
-
-#: admin/fai/faiNewBranch.tpl.c:5
-msgid ""
-"Branches are created as subreleases of the currently selected branch. "
-"Creating a new branch named 1.0.2 in SARGE for example, will result in a new"
-" release called SARGE/1.0.2."
-msgstr ""
-
-#: admin/fai/faiNewBranch.tpl.c:8
-msgid "Please enter a name for the branch"
-msgstr ""
-
-#: admin/fai/faiNewBranch.tpl.c:11
-msgid "Processing the requested operation"
-msgstr ""
-
-#: admin/fai/faiNewBranch.tpl.c:14
-msgid ""
-"As soon as the copy operation has finished, you can scroll down to end of "
-"the page and press the 'Continue' button to continue with the fai management"
-" dialog."
-msgstr ""
-
-#: admin/fai/faiNewBranch.tpl.c:17
-msgid ""
-"Your browser doesn't support iframes, please use this link to perform the "
-"requested operation."
-msgstr ""
-
-#: admin/fai/faiNewBranch.tpl.c:20
-msgid "Perform requested operation."
-msgstr ""
-
-#: admin/fai/faiNewBranch.tpl.c:23
-msgid "Initiate operation"
-msgstr ""
-
-#: admin/fai/faiVariableEntry.tpl.c:14 admin/fai/faiVariableEntry.tpl.c:17
-msgid "Variable attributes"
-msgstr ""
-
-#: admin/fai/faiDiskEntry.tpl.c:11
-msgid "fstab key"
-msgstr ""
-
-#: admin/fai/faiDiskEntry.tpl.c:17
-msgid "Disk label"
-msgstr ""
-
-#: admin/fai/faiTemplate.tpl.c:17
-msgid "List of template files"
-msgstr ""
-
-#: admin/fai/faiVariable.tpl.c:17
-msgid "List of assigned variables"
-msgstr ""
-
-#: admin/fai/faiVariable.tpl.c:20
-msgid "Choose a variable to delete or edit"
-msgstr ""
-
-#: admin/fai/askClassName.tpl.c:2
-msgid ""
-"Adding a new class to the FAI management, requires a class name. You have to"
-" specify a unique class name for unique types of FAI classes, while you can "
-"use the same class name for different types of FAI classes. In the laste "
-"case, FAI will automatically enclose all these different class types to one "
-"unique class name."
-msgstr ""
-
-#: admin/fai/askClassName.tpl.c:5
-msgid ""
-"Please use one of the following methods to choose the name for the new FAI "
-"class."
-msgstr ""
-
-#: admin/fai/askClassName.tpl.c:8
-msgid "Enter FAI class name manually"
-msgstr ""
-
-#: admin/fai/askClassName.tpl.c:14
-msgid "Choose FAI class name from a list of existing classes"
-msgstr ""
-
-#: admin/fai/askClassName.tpl.c:20
-msgid "Choose class name"
-msgstr ""
-
-#: admin/fai/faiGroupHandle.tpl.c:2
-msgid "Please select the objects you want to remove:"
-msgstr ""
-
-#: admin/fai/faiGroupHandle.tpl.c:5
-msgid "Freezed"
-msgstr ""
-
-#: admin/fai/faiGroupHandle.tpl.c:8
-msgid "Select the object you want to edit:"
-msgstr ""
-
-#: admin/fai/faiGroupHandle.tpl.c:11
-msgid "Select the object you want to copy:"
-msgstr ""
-
-#: admin/fai/remove.tpl.c:5
-msgid ""
-"This includes all account data, system access rules, imap settings, etc. for"
-" this user. Please double check if your really want to do this since there "
-"is no way for FusionDirectory to get your data back."
-msgstr ""
-
-#: admin/fai/remove.tpl.c:8 admin/fai/remove_branch.tpl.c:8
-msgid "So - if you're sure - press 'Delete' to continue or 'Cancel' to abort."
-msgstr ""
-
-#: admin/fai/faiHook.tpl.c:17
-msgid "List of hook scripts"
-msgstr ""
-
-#: admin/fai/packageSelect/selectPackage-list.tpl.c:2
-#: admin/fai/classSelect/selectClass-list.tpl.c:5
-msgid "Update"
-msgstr ""
-
-#: admin/fai/packageSelect/selectPackage-list.tpl.c:5
-#: admin/fai/classSelect/selectClass-list.tpl.c:8
-msgid "Submit"
-msgstr ""
-
-#: admin/fai/packageSelect/selectPackage-filter.tpl.c:2
-#: admin/fai/classSelect/selectClass-filter.tpl.c:2
-#: admin/fai/fai-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/remove_branch.tpl.c:5
-msgid ""
-"This includes all account data, system access, etc. for this branch. Please "
-"double check if your really want to do this since there is no way for "
-"FusionDirectory to get your data back."
-msgstr ""
-
-#: admin/fai/faiPackage.tpl.c:26
-msgid "Install method"
-msgstr ""
-
-#: admin/fai/faiPackage.tpl.c:29
-msgid "Please select the installation method"
-msgstr ""
-
-#: admin/fai/faiPackage.tpl.c:32 admin/fai/faiPackage.tpl.c:35
-msgid "Used packages"
-msgstr ""
-
-#: admin/fai/faiPackage.tpl.c:38
-msgid "Add from list"
-msgstr ""
-
-#: admin/fai/faiProfileEntry.tpl.c:2
-msgid "List of FAI objects (Fully Automatic Installation)"
-msgstr ""
-
-#: admin/fai/faiProfileEntry.tpl.c:5
-msgid "Information"
-msgstr ""
-
-#: admin/fai/faiProfileEntry.tpl.c:8
-msgid ""
-"This menu allows you to select FAI class names and to add them to the "
-"currently edited profile."
-msgstr ""
-
-#: admin/fai/faiProfileEntry.tpl.c:11
-msgid "Filters"
-msgstr ""
-
-#: admin/fai/faiProfileEntry.tpl.c:14
-msgid "Show only classes with templates"
-msgstr ""
-
-#: admin/fai/faiProfileEntry.tpl.c:17
-msgid "Show only classes with scripts"
-msgstr ""
-
-#: admin/fai/faiProfileEntry.tpl.c:20
-msgid "Show only classes with hooks"
-msgstr ""
-
-#: admin/fai/faiProfileEntry.tpl.c:23
-msgid "Show only classes with variables"
-msgstr ""
-
-#: admin/fai/faiProfileEntry.tpl.c:26
-msgid "Show only classes with packages"
-msgstr ""
-
-#: admin/fai/faiProfileEntry.tpl.c:29
-msgid "Show only classes with partitions"
-msgstr ""
-
-#: admin/fai/faiProfileEntry.tpl.c:32 admin/fai/faiProfileEntry.tpl.c:35
-msgid "Display objects matching"
-msgstr ""
-
-#: admin/fai/faiProfileEntry.tpl.c:38
-msgid "Regular expression for matching object names"
-msgstr ""
-
-#: admin/fai/faiTemplateEntry.tpl.c:17 admin/fai/faiTemplateEntry.tpl.c:20
-msgid "Template attributes"
-msgstr ""
-
-#: admin/fai/faiTemplateEntry.tpl.c:26 admin/fai/faiTemplateEntry.tpl.c:29
-msgid "Save template"
-msgstr ""
-
-#: admin/fai/faiTemplateEntry.tpl.c:32 admin/fai/faiTemplateEntry.tpl.c:35
-msgid "Edit template"
-msgstr ""
-
-#: admin/fai/faiTemplateEntry.tpl.c:38
-msgid "Full path"
-msgstr ""
-
-#: admin/fai/faiTemplateEntry.tpl.c:41
-msgid "Upload"
-msgstr ""
-
-#: admin/fai/faiTemplateEntry.tpl.c:44
-msgid "Owner"
-msgstr ""
-
-#: admin/fai/faiTemplateEntry.tpl.c:50
-msgid "Access"
-msgstr ""
-
-#: admin/fai/faiTemplateEntry.tpl.c:53
-msgid "Class"
-msgstr ""
-
-#: admin/fai/faiTemplateEntry.tpl.c:56
-msgid "Read"
-msgstr ""
-
-#: admin/fai/faiTemplateEntry.tpl.c:59
-msgid "Write"
-msgstr ""
-
-#: admin/fai/faiTemplateEntry.tpl.c:62
-msgid "Execute"
-msgstr ""
-
-#: admin/fai/faiTemplateEntry.tpl.c:65
-msgid "Special"
-msgstr ""
-
-#: admin/fai/faiTemplateEntry.tpl.c:71
-msgid "SUID"
-msgstr ""
-
-#: admin/fai/faiTemplateEntry.tpl.c:77
-msgid "SGID"
-msgstr ""
-
-#: admin/fai/faiTemplateEntry.tpl.c:80
-msgid "Others"
-msgstr ""
-
-#: admin/fai/faiTemplateEntry.tpl.c:83
-msgid "sticky"
-msgstr ""
-
-#: admin/fai/faiScriptEntry.tpl.c:17 admin/fai/faiScriptEntry.tpl.c:26
-msgid "Script attributes"
-msgstr ""
-
-#: admin/fai/faiScriptEntry.tpl.c:23
-msgid ""
-"Choose a priority. Low values result in an earlier, high values in a later "
-"execution."
-msgstr ""
-
-#: admin/fai/faiScriptEntry.tpl.c:32 admin/fai/faiHookEntry.tpl.c:32
-msgid "Import script"
-msgstr ""
-
-#: admin/fai/classSelect/selectClass-list.tpl.c:2
-msgid "Base"
-msgstr ""
-
-#: admin/fai/fai-filter.tpl.c:29
-msgid "Show profiles"
-msgstr ""
-
-#: admin/fai/fai-filter.tpl.c:32
-msgid "Show templates"
-msgstr ""
-
-#: admin/fai/fai-filter.tpl.c:35
-msgid "Show scripts"
-msgstr ""
-
-#: admin/fai/fai-filter.tpl.c:38
-msgid "Show hooks"
-msgstr ""
-
-#: admin/fai/fai-filter.tpl.c:41
-msgid "Show variables"
-msgstr ""
-
-#: admin/fai/fai-filter.tpl.c:44
-msgid "Show packages"
-msgstr ""
-
-#: admin/fai/fai-filter.tpl.c:47
-msgid "Show partitions"
-msgstr ""
-
-#: admin/fai/faiTemplateEdit.tpl.c:2
-msgid "This FAI template is write protected. Editing may break it!"
-msgstr ""
-
-#: admin/fai/faiTemplateEdit.tpl.c:5
-msgid "Edit anyway"
-msgstr ""
-
-#: admin/fai/faiPartitionTable.tpl.c:14
-msgid "Use 'setup-storage' to partition the disk"
-msgstr ""
-
-#: admin/fai/faiPartitionTable.tpl.c:20
-msgid "Discs"
-msgstr ""
-
-#: admin/fai/faiPartitionTable.tpl.c:23 admin/fai/faiPartitionTable.tpl.c:26
-#: admin/fai/faiPartitionTable.tpl.c:41 admin/fai/faiPartitionTable.tpl.c:44
-msgid "Add disk"
-msgstr ""
-
-#: admin/fai/faiPartitionTable.tpl.c:29 admin/fai/faiPartitionTable.tpl.c:32
-#: admin/fai/faiPartitionTable.tpl.c:47 admin/fai/faiPartitionTable.tpl.c:50
-msgid "Add RAID"
-msgstr ""
-
-#: admin/fai/faiPartitionTable.tpl.c:35 admin/fai/faiPartitionTable.tpl.c:38
-#: admin/fai/faiPartitionTable.tpl.c:53 admin/fai/faiPartitionTable.tpl.c:56
-msgid "Add volume group"
-msgstr ""
-
-#: admin/fai/faiScript.tpl.c:17
-msgid "List of scripts"
-msgstr ""
-
-#: admin/fai/faiProfile.tpl.c:20
-msgid "Choose a priority"
-msgstr ""
-
-#: admin/fai/faiHookEntry.tpl.c:14 admin/fai/faiHookEntry.tpl.c:17
-#: admin/fai/faiHookEntry.tpl.c:26
-msgid "Hook attributes"
-msgstr ""
-
-#: admin/fai/faiHookEntry.tpl.c:23
-msgid "Choose an existing FAI task"
-msgstr ""
diff --git a/fai/locale/fr/fusiondirectory.po b/fai/locale/fr/fusiondirectory.po
index 47df327b65daa6895185607dbf795ac613ca0d25..52de1693d4abf991dd349697267d8b193fa0b2ba 100644
--- a/fai/locale/fr/fusiondirectory.po
+++ b/fai/locale/fr/fusiondirectory.po
@@ -3,497 +3,298 @@
 # This file is distributed under the same license as the PACKAGE package.
 # 
 # Translators:
-# Benoit Mortier <benoit.mortier@opensides.be>, 2005-2011
-# Benoit Mortier <benoit.mortier@opensides.be>, 2015
-# MCMic, 2014
-# fusiondirectory <contact@fusiondirectory.org>, 2013-2014
-# fusiondirectory <contact@fusiondirectory.org>, 2012
-# fusiondirectory <contact@fusiondirectory.org>, 2012
-# fusiondirectory <contact@fusiondirectory.org>, 2012
-# MCMic, 2014
 msgid ""
 msgstr ""
-"Project-Id-Version: FusionDirectory-108\n"
+"Project-Id-Version: FusionDirectory-109\n"
 "Report-Msgid-Bugs-To: documentation@lists.fusiondirectory.org\n"
-"POT-Creation-Date: 2015-03-19 21:45+0100\n"
-"PO-Revision-Date: 2015-03-20 08:24+0000\n"
-"Last-Translator: Benoit Mortier <benoit.mortier@opensides.be>\n"
-"Language-Team: French (http://www.transifex.com/projects/p/FusionDirectory-108/language/fr/)\n"
+"POT-Creation-Date: 2014-12-15 17:47+0100\n"
+"PO-Revision-Date: 2015-02-25 16:13+0000\n"
+"Last-Translator: fusiondirectory <contact@fusiondirectory.org>\n"
+"Language-Team: French (http://www.transifex.com/projects/p/FusionDirectory-109/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/fai/class_faiScriptEntry.inc:79 admin/fai/class_faiScriptEntry.inc:82
-#: admin/fai/class_faiManagement.inc:240 admin/fai/class_faiManagement.inc:768
-#: admin/fai/class_faiManagement.inc:774
-#: admin/fai/class_faiPartitionTable.inc:268
-#: admin/fai/class_faiPartitionTable.inc:331
-#: admin/fai/class_faiDiskEntry.inc:445 admin/fai/class_FAI.inc:570
-#: admin/fai/class_faiHookEntry.inc:83 admin/fai/class_faiHookEntry.inc:86
-#: admin/fai/class_faiScript.inc:249 admin/fai/class_faiTemplate.inc:232
-#: admin/fai/class_faiHook.inc:259 admin/fai/class_faiVariable.inc:162
-#: admin/systems/class_faiLogView.inc:207
-#: admin/systems/class_faiLogView.inc:242
-msgid "Error"
-msgstr "Erreur"
-
-#: admin/fai/class_faiScriptEntry.inc:82 admin/fai/class_faiHookEntry.inc:86
-msgid "file is empty"
-msgstr "Le fichier est vide"
-
-#: admin/fai/class_faiScriptEntry.inc:102 admin/fai/class_faiHookEntry.inc:102
-#: admin/fai/class_faiScript.inc:349 admin/fai/class_faiScript.inc:374
-#: admin/fai/class_faiTemplate.inc:320 admin/fai/class_faiHook.inc:346
-msgid "Download"
-msgstr "TÃ©lÃ©chargement"
-
-#: admin/fai/class_faiScriptEntry.inc:147
-#: admin/fai/class_faiScriptEntry.inc:151
-#: admin/fai/class_faiScriptEntry.inc:154
-#: admin/fai/class_faiScriptEntry.inc:197
-#: admin/fai/class_faiManagement.inc:768 admin/fai/class_faiManagement.inc:774
-#: admin/fai/class_faiPackage.inc:685
-#: admin/fai/class_faiPartitionTable.inc:779
-#: admin/fai/class_faiDiskEntry.inc:702 admin/fai/class_faiDiskEntry.inc:705
-#: admin/fai/class_faiDiskEntry.inc:758
-#: admin/fai/class_faiTemplateEntry.inc:247
-#: admin/fai/class_faiTemplateEntry.inc:312
-#: admin/fai/class_faiPartitionTableEntry.inc:353
-#: admin/fai/class_faiPartitionTableEntry.inc:356
-#: admin/fai/class_faiPartitionTableEntry.inc:360
-#: admin/fai/class_faiPartitionTableEntry.inc:455
-#: admin/fai/packageSelect/selectPackage-list.xml:40
-#: admin/fai/class_faiProfile.inc:414 admin/fai/class_faiProfile.inc:463
-#: admin/fai/class_faiHookEntry.inc:157 admin/fai/class_faiHookEntry.inc:162
-#: admin/fai/class_faiHookEntry.inc:165 admin/fai/class_faiHookEntry.inc:207
-#: admin/fai/class_askClassName.inc:163 admin/fai/class_askClassName.inc:167
-#: admin/fai/class_askClassName.inc:171 admin/fai/class_askClassName.inc:198
-#: admin/fai/class_faiScript.inc:347 admin/fai/class_faiScript.inc:605
-#: admin/fai/classSelect/selectClass-list.xml:28
-#: admin/fai/class_faiTemplate.inc:512
-#: admin/fai/class_faiVariableEntry.inc:103
-#: admin/fai/class_faiVariableEntry.inc:112
-#: admin/fai/class_faiVariableEntry.inc:115
-#: admin/fai/class_faiVariableEntry.inc:149 admin/fai/class_faiHook.inc:531
-#: admin/fai/class_faiVariable.inc:398 admin/fai/fai-list.xml:80
-#: admin/fai/faiPartitionTableEntry.tpl.c:8 admin/fai/faiPartition.tpl.c:5
-#: admin/fai/faiVariableEntry.tpl.c:8 admin/fai/faiDiskEntry.tpl.c:8
-#: admin/fai/faiTemplate.tpl.c:8 admin/fai/faiVariable.tpl.c:8
-#: admin/fai/faiHook.tpl.c:8
-#: admin/fai/packageSelect/selectPackage-filter.tpl.c:8
-#: admin/fai/faiPackage.tpl.c:8 admin/fai/faiScriptEntry.tpl.c:8
-#: admin/fai/classSelect/selectClass-filter.tpl.c:5
-#: admin/fai/fai-filter.tpl.c:50 admin/fai/faiPartitionTable.tpl.c:8
-#: admin/fai/faiScript.tpl.c:8 admin/fai/faiProfile.tpl.c:8
-#: admin/fai/faiHookEntry.tpl.c:8
-msgid "Name"
-msgstr "Nom"
-
-#: admin/fai/class_faiScriptEntry.inc:159 admin/fai/class_faiHookEntry.inc:170
-#: admin/fai/class_faiScript.inc:594 admin/fai/fai-list.xml:122
-#: admin/fai/faiScriptEntry.tpl.c:29 admin/fai/faiHookEntry.tpl.c:29
-msgid "Script"
-msgstr "Script"
-
-#: admin/fai/class_faiScriptEntry.inc:190
-#: admin/fai/class_faiScriptEntry.inc:199
-msgid "Script entry"
-msgstr "Script"
-
-#: admin/fai/class_faiScriptEntry.inc:191
-msgid "FAI script entry"
-msgstr "Script FAI"
-
-#: admin/fai/class_faiScriptEntry.inc:198 admin/fai/class_faiPackage.inc:686
-#: admin/fai/class_faiPartitionTable.inc:780
-#: admin/fai/class_faiDiskEntry.inc:759
-#: admin/fai/class_faiTemplateEntry.inc:313
-#: admin/fai/class_faiPartitionTableEntry.inc:456
-#: admin/fai/class_faiProfile.inc:464 admin/fai/class_faiHookEntry.inc:208
-#: admin/fai/class_faiScript.inc:606 admin/fai/class_faiTemplate.inc:513
-#: admin/fai/class_faiVariableEntry.inc:150 admin/fai/class_faiHook.inc:532
-#: admin/fai/class_faiVariable.inc:399
-#: admin/fai/faiPartitionTableEntry.tpl.c:11 admin/fai/faiPartition.tpl.c:11
-#: admin/fai/faiVariableEntry.tpl.c:11 admin/fai/faiDiskEntry.tpl.c:14
-#: admin/fai/faiTemplate.tpl.c:11 admin/fai/faiVariable.tpl.c:11
-#: admin/fai/faiHook.tpl.c:11 admin/fai/faiPackage.tpl.c:11
-#: admin/fai/faiTemplateEntry.tpl.c:14 admin/fai/faiScriptEntry.tpl.c:11
-#: admin/fai/faiPartitionTable.tpl.c:11 admin/fai/faiScript.tpl.c:11
-#: admin/fai/faiProfile.tpl.c:11 admin/fai/faiHookEntry.tpl.c:11
-msgid "Description"
-msgstr "Description"
-
-#: admin/fai/class_faiScriptEntry.inc:200
-msgid "Script Priority"
-msgstr "PrioritÃ© du script"
-
-#: admin/fai/class_faiManagement.inc:188
-msgid "partition table"
-msgstr "table des partitions"
-
-#: admin/fai/class_faiManagement.inc:189 admin/fai/fai-list.xml:31
-msgid "script"
-msgstr "script"
-
-#: admin/fai/class_faiManagement.inc:190 admin/fai/fai-list.xml:47
-msgid "hook"
-msgstr "hook"
-
-#: admin/fai/class_faiManagement.inc:191 admin/fai/fai-list.xml:39
-msgid "variable"
-msgstr "variable"
-
-#: admin/fai/class_faiManagement.inc:192 admin/fai/fai-list.xml:63
-msgid "template"
-msgstr "modÃ¨le"
-
-#: admin/fai/class_faiManagement.inc:193
-msgid "package list"
-msgstr "liste de paquets"
-
-#: admin/fai/class_faiManagement.inc:210 admin/fai/class_faiManagement.inc:226
-#: admin/fai/class_faiManagement.inc:332 admin/fai/class_faiManagement.inc:390
-#: admin/fai/class_faiManagement.inc:480 admin/fai/class_faiManagement.inc:575
-#: admin/fai/class_faiManagement.inc:598 admin/fai/class_faiManagement.inc:619
-msgid "Permission error"
-msgstr "Erreur de permission"
-
-#: admin/fai/class_faiManagement.inc:211 admin/fai/class_faiManagement.inc:226
-#, php-format
-msgid "You have no permission to create a new %s!"
-msgstr "Vous n'Ãªtes pas autorisÃ© Ã  crÃ©er un nouveau %sâ€¯!"
-
-#: admin/fai/class_faiManagement.inc:226 admin/fai/fai-list.xml:55
-msgid "profile"
-msgstr "profil"
-
-#: admin/fai/class_faiManagement.inc:328
-msgid "Branch locked"
-msgstr "Branche verrouillÃ©e"
-
-#: admin/fai/class_faiManagement.inc:329
-#, php-format
-msgid "The following entries are locked, you can't remove them %s."
-msgstr "Les entrÃ©es suivantes sont verrouillÃ©es, vous ne pouvez pas les effacerâ€¯: %s."
-
-#: admin/fai/class_faiManagement.inc:346
-msgid "FAI object"
-msgstr "Objet FAI"
-
-#: admin/fai/class_faiManagement.inc:477
-msgid "FAI branch/freeze"
-msgstr "Branche FAI/freeze"
-
-#: admin/fai/class_faiManagement.inc:480
-msgid "You have no permission to delete this release!"
-msgstr "Vous n'Ãªtes pas autorisÃ© Ã  supprimer cette versionâ€¯!"
-
-#: admin/fai/class_faiManagement.inc:496 admin/fai/remove.tpl.c:2
-#: admin/fai/remove_branch.tpl.c:2
-msgid "Warning"
-msgstr "Avertissement"
-
-#: admin/fai/class_faiManagement.inc:496
-msgid "Release remove aborted because the release name check failed!"
-msgstr "Abandon de la suppression de version, la vÃ©rification du nom de la version a Ã©chouÃ©â€¯!"
-
-#: admin/fai/class_faiManagement.inc:573 admin/fai/class_faiManagement.inc:596
-msgid "Configuration"
-msgstr "Configuration"
-
-#: admin/fai/class_faiManagement.inc:575 admin/fai/class_faiManagement.inc:598
-#: admin/fai/class_faiManagement.inc:619
-msgid "Branch"
-msgstr "Branche"
-
-#: admin/fai/class_faiManagement.inc:725 admin/fai/askClassName.tpl.c:23
-msgid "Continue"
-msgstr "Continuer"
-
-#: admin/fai/class_faiManagement.inc:926
-#: admin/fai/class_faiPartitionTable.inc:768
-#: admin/fai/class_faiProfile.inc:318 admin/fai/class_askClassName.inc:99
-#: admin/fai/classSelect/class_classSelect.inc:58
-#: admin/fai/class_faiGroupHandle.inc:120
-#: admin/fai/class_faiProfileEntry.inc:163 admin/fai/fai-list.xml:146
-msgid "Partition table"
-msgstr "Table des partitions"
-
-#: admin/fai/class_faiManagement.inc:928
-#: admin/fai/class_faiGroupHandle.inc:122 admin/fai/fai-list.xml:140
-msgid "Package list"
-msgstr "Liste de paquets"
-
-#: admin/fai/class_faiManagement.inc:930
-#: admin/fai/class_faiGroupHandle.inc:124
-msgid "Scripts"
-msgstr "Scripts"
-
-#: admin/fai/class_faiManagement.inc:932
-#: admin/fai/class_faiGroupHandle.inc:126
-msgid "Variables"
-msgstr "Variables"
-
-#: admin/fai/class_faiManagement.inc:934
-#: admin/fai/class_faiGroupHandle.inc:128
-msgid "Hooks"
-msgstr "Hooks"
-
-#: admin/fai/class_faiManagement.inc:936 admin/fai/class_faiProfile.inc:454
-#: admin/fai/class_askClassName.inc:104 admin/fai/class_faiGroupHandle.inc:130
-#: admin/fai/fai-list.xml:110
-msgid "Profile"
-msgstr "Profil"
-
-#: admin/fai/class_faiManagement.inc:938
-#: admin/fai/class_faiGroupHandle.inc:132
-msgid "Templates"
-msgstr "ModÃ¨les"
-
-#: admin/fai/class_faiManagement.inc:1039
-#: admin/fai/class_faiManagement.inc:1045
+#: admin/fai/class_faiManagement.inc:117 admin/fai/class_faiManagement.inc:122
 #: admin/fai/packageSelect/selectPackage-list.xml:14
-#: admin/fai/classSelect/selectClass-list.xml:15
-#: admin/systems/class_faiStartup.inc:177 config/fai/class_faiConfig.inc:41
+#: admin/systems/class_faiStartup.inc:178 config/fai/class_faiConfig.inc:41
 msgid "FAI"
 msgstr "FAI"
 
-#: admin/fai/class_faiManagement.inc:1040
+#: admin/fai/class_faiManagement.inc:118
 msgid "Manage FAI software packages and deployment recipes"
 msgstr "Gestion des mÃ©thodes de dÃ©ploiement avec FAI"
 
-#: admin/fai/class_faiPackage.inc:261
-msgid "Invalid package names"
-msgstr "Noms de paquets invalides"
-
-#: admin/fai/class_faiPackage.inc:262
-#, php-format
-msgid "The following package names don't match the Debian policy: %s"
-msgstr "Les paquets suivants ne correspondent pas Ã  la politique Debianâ€¯: %s"
-
-#: admin/fai/class_faiPackage.inc:421 admin/fai/class_faiPackage.inc:422
-msgid "Configured"
-msgstr "ConfigurÃ©"
-
-#: admin/fai/class_faiPackage.inc:428 admin/fai/class_faiPackage.inc:429
-msgid "Package marked for removal"
-msgstr "Paquet marquÃ© Ã  enlever"
-
-#: admin/fai/class_faiPackage.inc:445
-msgid "Mark package for removal"
-msgstr "Marquer le paquet Ã  enlever"
-
-#: admin/fai/class_faiPackage.inc:451
-msgid "Configure this package"
-msgstr "Configurer ce paquet"
+#: admin/fai/class_faiPackage.inc:157
+msgid "Mark for installation"
+msgstr ""
 
-#: admin/fai/class_faiPackage.inc:455
-msgid "Remove this package"
-msgstr "Retirer ce paquet"
+#: admin/fai/class_faiPackage.inc:161
+msgid "Mark for removal"
+msgstr ""
 
-#: admin/fai/class_faiPackage.inc:534
-msgid "Please select a least one package!"
-msgstr "Veuillez sÃ©lectionner au moins un paquetâ€¯!"
+#: admin/fai/class_faiPackage.inc:166
+msgid "Edit configuration"
+msgstr ""
 
-#: admin/fai/class_faiPackage.inc:538
-msgid ""
-"Please choose a valid release/section combination for your repository setup!"
-msgstr "Veuillez choisir une combinaison valable version/section pour la crÃ©ation de votre dÃ©pÃ´t de paquetsâ€¯!"
+#: admin/fai/class_faiPackage.inc:247
+#: admin/fai/class_faiPartitionTable.inc:209
+#: admin/fai/class_faiPartitionTable.inc:250
+#: admin/fai/class_faiTemplate.inc:114
+#: admin/systems/services/repository/class_serviceDebianRepository.inc:172
+#: admin/systems/services/repository/class_serviceDebianRepository.inc:189
+#: admin/systems/services/repository/class_serviceDebianRepository.inc:193
+msgid "LDAP error"
+msgstr "Erreur LDAP"
 
-#: admin/fai/class_faiPackage.inc:571
+#: admin/fai/class_faiPackage.inc:279
 #: admin/fai/packageSelect/class_filterFAIPackages.inc:41
 #: admin/fai/packageSelect/class_filterFAIPackages.inc:46
 #: admin/fai/class_faiPackageConfiguration.inc:55
-#: admin/systems/class_faiStartup.inc:132
-#: admin/systems/class_faiStartup.inc:159
-msgid "Infrastructure service"
-msgstr "Service dâ€™infrastructure"
+#: admin/systems/class_faiStartup.inc:133
+#: admin/systems/class_faiStartup.inc:160
+msgid "Service infrastructure"
+msgstr "Service d'infrastructure"
 
-#: admin/fai/class_faiPackage.inc:587
+#: admin/fai/class_faiPackage.inc:294
 msgid "Unkown packages"
 msgstr "Paquets inconnus"
 
-#: admin/fai/class_faiPackage.inc:674
-#: admin/fai/faiPackageConfiguration.tpl.c:2
+#: admin/fai/class_faiPackage.inc:365
 msgid "Package"
 msgstr "Paquet"
 
-#: admin/fai/class_faiPackage.inc:675
+#: admin/fai/class_faiPackage.inc:366
 msgid "FAI Package list"
-msgstr "Liste de paquets"
+msgstr "Liste des paquets"
 
-#: admin/fai/class_faiPackage.inc:679
+#: admin/fai/class_faiPackage.inc:369
 msgid "FAI Package"
-msgstr "Paquet FAI"
+msgstr "Paquets FAI"
 
-#: admin/fai/class_faiPackage.inc:687
-msgid "Packages"
-msgstr "Paquets"
+#: admin/fai/class_faiPackage.inc:385
+#: admin/fai/class_faiPartitionTable.inc:304
+#: admin/fai/class_faiTemplateEntry.inc:140 admin/fai/class_faiProfile.inc:47
+#: admin/fai/class_faiScript.inc:50 admin/fai/class_faiTemplate.inc:173
+#: admin/fai/class_faiHook.inc:50 admin/fai/class_faiVariable.inc:50
+msgid "Properties"
+msgstr "PropriÃ©tÃ©s"
 
-#: admin/fai/class_faiPackage.inc:688 admin/fai/faiPackage.tpl.c:23
-msgid "Section"
-msgstr "Section"
+#: admin/fai/class_faiPackage.inc:388
+#: admin/fai/class_faiPartitionTable.inc:307 admin/fai/class_faiProfile.inc:50
+#: admin/fai/class_faiScript.inc:53 admin/fai/class_faiTemplate.inc:176
+#: admin/fai/class_faiHook.inc:53 admin/fai/class_faiVariable.inc:53
+msgid "Class name"
+msgstr "Nom de la classe"
 
-#: admin/fai/class_faiPackage.inc:688 admin/fai/class_faiPackage.inc:691
-#: admin/fai/class_faiScript.inc:605 admin/fai/class_faiTemplate.inc:512
-msgid "Readonly"
-msgstr "Lecture seule"
+#: admin/fai/class_faiPackage.inc:388 admin/fai/class_faiScript.inc:53
+#: admin/fai/class_faiHook.inc:53 admin/fai/class_faiVariable.inc:53
+msgid "Variables class name"
+msgstr ""
 
-#: admin/fai/class_faiPackage.inc:689
-msgid "Install Method"
-msgstr "MÃ©thode d'installation"
+#: admin/fai/class_faiPackage.inc:392
+#: admin/fai/class_faiPartitionTable.inc:311
+#: admin/fai/class_faiDiskEntry.inc:738
+#: admin/fai/class_faiTemplateEntry.inc:147 admin/fai/class_faiProfile.inc:54
+#: admin/fai/class_faiScript.inc:57 admin/fai/class_faiScript.inc:75
+#: admin/fai/class_faiTemplate.inc:180 admin/fai/class_faiHook.inc:57
+#: admin/fai/class_faiHook.inc:75 admin/fai/class_faiVariable.inc:57
+#: admin/fai/class_faiVariable.inc:75
+msgid "Description"
+msgstr "Description"
 
-#: admin/fai/class_faiPackage.inc:690
-msgid "Package configuration"
-msgstr "Configuration des paquets"
+#: admin/fai/class_faiPackage.inc:392
+#: admin/fai/class_faiPartitionTable.inc:311 admin/fai/class_faiProfile.inc:54
+#: admin/fai/class_faiScript.inc:57 admin/fai/class_faiTemplate.inc:180
+#: admin/fai/class_faiHook.inc:57 admin/fai/class_faiVariable.inc:57
+msgid "Short description of the class"
+msgstr ""
 
-#: admin/fai/class_faiPackage.inc:691 admin/systems/class_faiStartup.inc:78
-#: admin/systems/services/repository/class_serviceRepository.inc:40
-#: admin/fai/branch_selector.tpl.c:14 admin/fai/faiPackage.tpl.c:20
-#: admin/fai/fai-filter.tpl.c:5 admin/fai/fai-filter.tpl.c:14
+#: admin/fai/class_faiPackage.inc:398 admin/systems/class_faiStartup.inc:90
+msgid "Repository"
+msgstr "DÃ©pÃ´t"
+
+#: admin/fai/class_faiPackage.inc:401 admin/systems/class_faiStartup.inc:78
+#: admin/systems/services/repository/class_serviceDebianRepository.inc:52
+#: admin/systems/services/repository/class_serviceCentosRepository.inc:49
 msgid "Release"
 msgstr "Version"
 
-#: admin/fai/class_faiPartitionTable.inc:269
-#: admin/fai/class_faiDiskEntry.inc:446
-#, php-format
-msgid ""
-"The disk cannot be deleted while it is used in the '%s' disk definition!"
-msgstr "Ce disque ne peut pas Ãªtre supprimÃ© car il est utilisÃ© par la dÃ©finition de disque '%s'â€¯!"
+#: admin/fai/class_faiPackage.inc:401
+msgid "Debian release concerned"
+msgstr ""
+
+#: admin/fai/class_faiPackage.inc:405
+#: admin/systems/services/repository/class_serviceDebianRepository.inc:58
+msgid "Sections"
+msgstr "Sections"
+
+#: admin/fai/class_faiPackage.inc:405
+msgid "Sections concerned"
+msgstr ""
+
+#: admin/fai/class_faiPackage.inc:409
+msgid "Install method"
+msgstr "MÃ©thode d'installation"
+
+#: admin/fai/class_faiPackage.inc:409
+msgid "Install method to use for this package list"
+msgstr ""
+
+#: admin/fai/class_faiPackage.inc:420
+msgid "Packages"
+msgstr "Paquets"
+
+#: admin/fai/class_faiPackage.inc:424
+msgid "Packages in this class"
+msgstr ""
+
+#: admin/fai/class_faiPartitionTable.inc:61
+#: admin/fai/class_faiDiskEntry.inc:442 admin/systems/class_faiLogView.inc:207
+#: admin/systems/class_faiLogView.inc:242
+msgid "Error"
+msgstr "Erreur"
+
+#: admin/fai/class_faiPartitionTable.inc:112
+msgid "Add RAID"
+msgstr "Ajouter du RAID"
 
-#: admin/fai/class_faiPartitionTable.inc:416 admin/fai/class_faiScript.inc:360
-#: admin/fai/class_faiScript.inc:362 admin/fai/class_faiTemplate.inc:306
-#: admin/fai/class_faiTemplate.inc:308
-msgid "edit"
-msgstr "Ã©diter"
+#: admin/fai/class_faiPartitionTable.inc:116
+msgid "Add LVM"
+msgstr ""
 
-#: admin/fai/class_faiPartitionTable.inc:418 admin/fai/class_faiScript.inc:364
-#: admin/fai/class_faiTemplate.inc:310
-msgid "delete"
-msgstr "supprimer"
+#: admin/fai/class_faiPartitionTable.inc:284
+msgid "Partition table"
+msgstr "Table des partitions"
 
-#: admin/fai/class_faiPartitionTable.inc:769
-#: admin/fai/class_faiPartitionTable.inc:773
+#: admin/fai/class_faiPartitionTable.inc:285
+#: admin/fai/class_faiPartitionTable.inc:288
 msgid "FAI partition table"
 msgstr "Table des partitions FAI"
 
-#: admin/fai/class_faiPartitionTable.inc:779 admin/fai/class_faiHook.inc:531
-#: admin/fai/class_faiVariable.inc:398
-msgid "Read only"
-msgstr "Lecture seule"
+#: admin/fai/class_faiPartitionTable.inc:307 admin/fai/class_faiProfile.inc:50
+msgid "Partition table class name"
+msgstr ""
+
+#: admin/fai/class_faiPartitionTable.inc:317
+msgid "Discs"
+msgstr "Disques"
+
+#: admin/fai/class_faiPartitionTable.inc:324
+msgid "Partitions in this class"
+msgstr ""
 
 #: admin/fai/class_faiDiskEntry.inc:273
-#: admin/fai/faiPartitionTableEntry.tpl.c:5 admin/fai/faiDiskEntry.tpl.c:5
 msgid "Device"
-msgstr "PÃ©riphÃ©rique"
+msgstr "Partition"
 
 #: admin/fai/class_faiDiskEntry.inc:273
 msgid "Label"
-msgstr "Ã‰tiquette"
+msgstr "Etiquette"
 
 #: admin/fai/class_faiDiskEntry.inc:273
 msgid "UUID"
 msgstr "UUID"
 
-#: admin/fai/class_faiDiskEntry.inc:345
+#: admin/fai/class_faiDiskEntry.inc:344
 msgid "Disks"
 msgstr "Disques"
 
-#: admin/fai/class_faiDiskEntry.inc:348 admin/fai/class_faiPartition.inc:321
-#: admin/fai/faiPartition.tpl.c:14
+#: admin/fai/class_faiDiskEntry.inc:347 admin/fai/class_faiPartition.inc:319
 msgid "Size"
 msgstr "Taille"
 
-#: admin/fai/class_faiDiskEntry.inc:544
+#: admin/fai/class_faiDiskEntry.inc:443
+#, php-format
+msgid ""
+"The disk cannot be deleted while it is used in the '%s' disk definition!"
+msgstr "Ce disque ne peut pas Ãªtre supprimÃ© car il est utilisÃ© par la dÃ©finition de disque '%s' !"
+
+#: admin/fai/class_faiDiskEntry.inc:536
 msgid "encrypted"
-msgstr "cryptÃ©"
+msgstr "CryptÃ©"
 
-#: admin/fai/class_faiDiskEntry.inc:547
+#: admin/fai/class_faiDiskEntry.inc:539
 msgid "bootable"
-msgstr "amorÃ§able"
+msgstr "AmorÃ§able"
 
-#: admin/fai/class_faiDiskEntry.inc:550
+#: admin/fai/class_faiDiskEntry.inc:542
 msgid "preserve"
-msgstr "prÃ©server"
+msgstr "PrÃ©server"
 
-#: admin/fai/class_faiDiskEntry.inc:735
+#: admin/fai/class_faiDiskEntry.inc:687 admin/fai/class_faiDiskEntry.inc:690
+#: admin/fai/class_faiDiskEntry.inc:737
+#: admin/fai/packageSelect/selectPackage-list.xml:40
+#: admin/fai/class_faiScript.inc:71 admin/fai/class_faiHook.inc:71
+#: admin/fai/class_faiVariable.inc:71
+#: admin/fai/class_faiSimplePluginClass.inc:50
+msgid "Name"
+msgstr "Nom"
+
+#: admin/fai/class_faiDiskEntry.inc:717
 msgid ""
 "You have more than four primary partition table entries in your "
 "configuration, please check your configuration twice."
 msgstr "Vous avez plus de 4 partitions primaires dans votre configuration, veuillez vÃ©rifier votre configuration."
 
-#: admin/fai/class_faiDiskEntry.inc:739
+#: admin/fai/class_faiDiskEntry.inc:721
 msgid ""
 "You cannot have more than three primary partition while using logical "
 "partitions, please check your configuration twice."
 msgstr "Vous ne pouvez pas avoir plus de 3 partitions primaires quand vous utilisez des partitions logiques, veuillez vÃ©rifier votre configuration."
 
-#: admin/fai/class_faiDiskEntry.inc:752
-#: admin/fai/class_faiPartitionTableEntry.inc:448
+#: admin/fai/class_faiDiskEntry.inc:733
 msgid "Partition table entry"
 msgstr "EntrÃ©e de la table des partitions"
 
-#: admin/fai/class_faiDiskEntry.inc:753
-#: admin/fai/class_faiPartitionTableEntry.inc:449
+#: admin/fai/class_faiDiskEntry.inc:734
 msgid "FAI partition table entry"
 msgstr "EntrÃ©e de la table de partition FAI"
 
-#: admin/fai/class_faiDiskEntry.inc:760
+#: admin/fai/class_faiDiskEntry.inc:739
 msgid "Disk options"
 msgstr "Options des disques"
 
-#: admin/fai/class_faiDiskEntry.inc:761
-#: admin/fai/class_faiPartitionTableEntry.inc:457
+#: admin/fai/class_faiDiskEntry.inc:740
 msgid "Partition type"
 msgstr "Type de partition"
 
-#: admin/fai/class_faiDiskEntry.inc:762
-#: admin/fai/class_faiPartitionTableEntry.inc:458
+#: admin/fai/class_faiDiskEntry.inc:741
 msgid "Partition no."
 msgstr "Partition nÂ°."
 
-#: admin/fai/class_faiDiskEntry.inc:763
-#: admin/fai/class_faiPartitionTableEntry.inc:459
+#: admin/fai/class_faiDiskEntry.inc:742
 msgid "File system type"
 msgstr "Type de systÃ¨me de fichiers"
 
-#: admin/fai/class_faiDiskEntry.inc:764
-#: admin/fai/class_faiPartitionTableEntry.inc:171
-#: admin/fai/class_faiPartitionTableEntry.inc:460
-#: admin/fai/class_faiPartition.inc:437 admin/fai/faiPartition.tpl.c:47
+#: admin/fai/class_faiDiskEntry.inc:743 admin/fai/class_faiPartition.inc:432
 msgid "Mount point"
 msgstr "Point de montage"
 
-#: admin/fai/class_faiDiskEntry.inc:765
-#: admin/fai/class_faiPartitionTableEntry.inc:461
-#: admin/fai/class_faiPartition.inc:402 admin/fai/class_faiPartition.inc:407
+#: admin/fai/class_faiDiskEntry.inc:744 admin/fai/class_faiPartition.inc:397
+#: admin/fai/class_faiPartition.inc:402
 msgid "Partition size"
 msgstr "Taille de la partition"
 
-#: admin/fai/class_faiDiskEntry.inc:766
-#: admin/fai/class_faiPartitionTableEntry.inc:173
-#: admin/fai/class_faiPartitionTableEntry.inc:462
-#: admin/fai/faiPartition.tpl.c:50
+#: admin/fai/class_faiDiskEntry.inc:745
 msgid "Mount options"
 msgstr "Options de montage"
 
-#: admin/fai/class_faiDiskEntry.inc:767
-#: admin/fai/class_faiPartitionTableEntry.inc:463
+#: admin/fai/class_faiDiskEntry.inc:746
 msgid "File system options"
-msgstr "Options du systÃ¨mes de fichier"
+msgstr "Options des systÃ¨mes de fichier"
 
-#: admin/fai/class_faiDiskEntry.inc:768
-#: admin/fai/class_faiPartitionTableEntry.inc:464
+#: admin/fai/class_faiDiskEntry.inc:747
 msgid "Partition flags"
 msgstr "Indicateur des partitions"
 
-#: admin/fai/class_debconfTemplate.inc:227
+#: admin/fai/class_debconfTemplate.inc:225
 msgid "This package has no debconf options."
 msgstr "Ce paquet n'a pas d'options debconf."
 
-#: admin/fai/class_debconfTemplate.inc:264
+#: admin/fai/class_debconfTemplate.inc:262
 msgid ""
 "This debconf question is dynamically generated during package installation "
 "and requires choosing between specific options which cannot be presented "
@@ -501,217 +302,59 @@ msgid ""
 " effect."
 msgstr "Cette question debconf est 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_faiTemplateEntry.inc:139
-msgid "no file uploaded yet"
-msgstr "pas encore de fichier tÃ©lÃ©versÃ©"
+#: admin/fai/class_faiTemplateEntry.inc:143
+msgid "File path"
+msgstr ""
 
-#: admin/fai/class_faiTemplateEntry.inc:142
-#, php-format
-msgid "exists in database (size: %s bytes)"
-msgstr "existe dans la base de donnÃ©es (tailleâ€¯: %s octets)"
+#: admin/fai/class_faiTemplateEntry.inc:143
+msgid "Complete absolute template file path and name"
+msgstr ""
 
-#: admin/fai/class_faiTemplateEntry.inc:251
-#: admin/systems/class_faiLogView.inc:70 admin/fai/faiTemplateEntry.tpl.c:23
-msgid "File"
-msgstr "Fichier"
+#: admin/fai/class_faiTemplateEntry.inc:147
+msgid "Short description of the file"
+msgstr ""
 
-#: admin/fai/class_faiTemplateEntry.inc:255
-#: admin/fai/faiTemplateEntry.tpl.c:11
-msgid "Destination path"
-msgstr "RÃ©pertoire de destination"
-
-#: admin/fai/class_faiTemplateEntry.inc:260 admin/fai/faiTemplateEntry.tpl.c:8
-msgid "File name"
-msgstr "Nom du fichier"
-
-#: admin/fai/class_faiTemplateEntry.inc:264
-#: admin/fai/class_faiTemplateEntry.inc:266
-#: admin/fai/faiTemplateEntry.tpl.c:68
-msgid "User"
-msgstr "Utilisateur"
-
-#: admin/fai/class_faiTemplateEntry.inc:270
-#: admin/fai/class_faiTemplateEntry.inc:273
-#: admin/fai/class_faiTemplateEntry.inc:275
-#: admin/fai/faiTemplateEntry.tpl.c:47 admin/fai/faiTemplateEntry.tpl.c:74
-msgid "Group"
-msgstr "Groupe"
+#: admin/fai/class_faiTemplateEntry.inc:156
+msgid "Template attributes"
+msgstr "Attributs des modÃ¨les"
 
-#: admin/fai/class_faiTemplateEntry.inc:305
-msgid "Template entry"
-msgstr "ModÃ¨le FAI"
+#: admin/fai/class_faiTemplateEntry.inc:160
+msgid "Template file content"
+msgstr ""
 
-#: admin/fai/class_faiTemplateEntry.inc:306
-msgid "FAI template entry"
-msgstr "ModÃ¨le FAI"
+#: admin/fai/class_faiTemplateEntry.inc:160
+msgid "Content of the template file"
+msgstr ""
 
-#: admin/fai/class_faiTemplateEntry.inc:314
-msgid "Template file"
-msgstr "Fichier de modÃ¨le"
+#: admin/fai/class_faiTemplateEntry.inc:164
+msgid "Owner and group of the file"
+msgstr ""
 
-#: admin/fai/class_faiTemplateEntry.inc:315
-msgid "Template path"
-msgstr "Chemin du modÃ¨le"
+#: admin/fai/class_faiTemplateEntry.inc:167
+msgid "Owner"
+msgstr "PropriÃ©taire"
 
-#: admin/fai/class_faiTemplateEntry.inc:316
+#: admin/fai/class_faiTemplateEntry.inc:167
 msgid "File owner"
 msgstr "PropriÃ©taire du fichier"
 
-#: admin/fai/class_faiTemplateEntry.inc:317
-msgid "File permissions"
-msgstr "Permissions du fichier"
-
-#: admin/fai/class_FAI.inc:287 admin/fai/class_FAI.inc:679
-#: admin/fai/class_FAI.inc:1266 admin/fai/class_FAI.inc:1283
-#: admin/fai/class_FAI.inc:1287
-msgid "LDAP error"
-msgstr "Erreur LDAP"
-
-#: admin/fai/class_FAI.inc:570
-#, php-format
-msgid "Error, following objects should be equal '%s' and '%s'"
-msgstr "Erreur, les objets suivants doivent Ãªtre Ã©gaux '%s' et '%s'"
-
-#: admin/fai/class_FAI.inc:891
-#, php-format
-msgid "Creating group application release for %s"
-msgstr "CrÃ©ation d'un groupe d'application pour %s"
-
-#: admin/fai/class_FAI.inc:960 admin/fai/class_FAI.inc:982
-#: admin/fai/class_FAI.inc:1022 admin/fai/class_FAI.inc:1027
-#: admin/fai/class_FAI.inc:1065
-msgid "Object"
-msgstr "Objet"
-
-#: admin/fai/class_FAI.inc:961
-#, php-format
-msgid "Adding missing group application release container %s."
-msgstr "Ajout du contenant de groupe d'application manquant %s."
-
-#: admin/fai/class_FAI.inc:983
-#, php-format
-msgid "Adding group application release container %s."
-msgstr "Ajout du groupe d'application %s."
-
-#: admin/fai/class_FAI.inc:1023
-#, php-format
-msgid "Could not create menu entry %s. (Already exists)."
-msgstr "Impossible de crÃ©er l'entrÃ©e de menu %s. (Existe dÃ©jÃ )."
-
-#: admin/fai/class_FAI.inc:1028
-#, php-format
-msgid "Created group application menu entry for %s."
-msgstr "Menu du groupe d'application pour %s crÃ©e."
-
-#: admin/fai/class_FAI.inc:1059
-#, php-format
-msgid "Creating copy of %s"
-msgstr "CrÃ©ation d'une copie de %s"
-
-#: admin/fai/class_FAI.inc:1062
-msgid "Processing"
-msgstr "Traitement en cours"
-
-#: admin/fai/class_FAI.inc:1080
-msgid "Could not create new release, the destination dn is already in use."
-msgstr "Impossible de crÃ©er une nouvelle version, le dn de destination existe dÃ©jÃ ."
-
-#: admin/fai/class_FAI.inc:1093
-msgid "Error while fetching source dn - aborted!"
-msgstr "Une erreur s'est produite lors de la rÃ©cupÃ©ration du dn - ArrÃªtâ€¯!"
-
-#: admin/fai/class_FAI.inc:1174
-msgid "Fatal error"
-msgstr "Erreur Fatale"
-
-#: admin/fai/class_FAI.inc:1175
-#, php-format
-msgid ""
-"Release creation failed due to ldap errors. Additional informations '%s'."
-msgstr "La crÃ©ation de la version a Ã©chouÃ© suite Ã  des erreurs ldap. Informations additionnelles '%s'."
-
-#: admin/fai/class_faiPartitionTableEntry.inc:162
-msgid "primary"
-msgstr "primaire"
-
-#: admin/fai/class_faiPartitionTableEntry.inc:162
-msgid "logical"
-msgstr "logique"
-
-#: admin/fai/class_faiPartitionTableEntry.inc:169
-#: admin/fai/faiPartition.tpl.c:8
-msgid "Type"
-msgstr "Type"
-
-#: admin/fai/class_faiPartitionTableEntry.inc:170
-msgid "FS type"
-msgstr "Type du FS"
-
-#: admin/fai/class_faiPartitionTableEntry.inc:172
-msgid "Size in MB"
-msgstr "Taille en Mo"
-
-#: admin/fai/class_faiPartitionTableEntry.inc:174
-msgid "FS option"
-msgstr "Option du FS"
-
-#: admin/fai/class_faiPartitionTableEntry.inc:175
-#: admin/fai/faiPartition.tpl.c:23
-msgid "Preserve"
-msgstr "PrÃ©server"
-
-#: admin/fai/class_faiPartitionTableEntry.inc:266
-msgid "False"
-msgstr "Faux"
-
-#: admin/fai/class_faiPartitionTableEntry.inc:268
-msgid "True"
-msgstr "Vrai"
-
-#: admin/fai/class_faiPartitionTableEntry.inc:272
-#: admin/fai/class_faiPartitionTableEntry.inc:274 admin/fai/fai-list.xml:159
-#: admin/fai/fai-list.xml:198
-msgid "Remove"
-msgstr "Supprimer"
-
-#: admin/fai/class_faiPartitionTableEntry.inc:384
-#, php-format
-msgid "please enter a unique mount point for partition %s"
-msgstr "veuillez entrer un point de montage unique pour la partition %s"
+#: admin/fai/class_faiTemplateEntry.inc:172
+msgid "Group"
+msgstr "Groupes"
 
-#: admin/fai/class_faiPartitionTableEntry.inc:389
-#, php-format
-msgid "partition %s mount point"
-msgstr "point de montage de la partition %s"
+#: admin/fai/class_faiTemplateEntry.inc:172
+msgid "File group"
+msgstr ""
 
-#: admin/fai/class_faiPartitionTableEntry.inc:394
-#, php-format
-msgid ""
-"File system type 'swap' is already used, change file system type for "
-"partition %s."
-msgstr "Le systÃ¨me de fichier 'swap' est dÃ©jÃ  utilisÃ©, veuillez changer le type pour la partition %s."
-
-#: admin/fai/class_faiPartitionTableEntry.inc:398
-msgid "Please use 'swap' as mount point, if 'swap' is used as fs-type."
-msgstr "Veuillez utiliser 'swap' comme point de montage, si 'swap' est utilisÃ© comme type de fichier."
-
-#: admin/fai/class_faiPartitionTableEntry.inc:404
-#: admin/fai/class_faiPartitionTableEntry.inc:408
-#: admin/fai/class_faiPartitionTableEntry.inc:414
-#: admin/fai/class_faiPartitionTableEntry.inc:416
-#: admin/fai/class_faiPartitionTableEntry.inc:421
-#, php-format
-msgid "partition %s size"
-msgstr "taille de la partition %s"
+#: admin/fai/class_faiTemplateEntry.inc:181
+msgid "Access"
+msgstr "AccÃ¨s"
 
-#: admin/fai/class_faiPartitionTableEntry.inc:436
-msgid ""
-"You have more than 3 primary partition table entries in your configuration, "
-"please check your configuration twice."
-msgstr "Vous avez plus de 3 partitions primaires dans votre configuration, veuillez vÃ©rifier votre configuration."
+#: admin/fai/class_faiTemplateEntry.inc:181
+msgid "Access rights"
+msgstr ""
 
 #: admin/fai/packageSelect/selectPackage-list.xml:10
-#: admin/fai/classSelect/selectClass-list.xml:11
 msgid "Please select the desired entries"
 msgstr "Veuillez sÃ©lectionner les entrÃ©es dÃ©sirÃ©es"
 
@@ -719,148 +362,95 @@ msgstr "Veuillez sÃ©lectionner les entrÃ©es dÃ©sirÃ©es"
 msgid "Version"
 msgstr "Version"
 
-#: admin/fai/class_faiProfile.inc:310
-msgid "This list displays all assigned class names for this profile."
-msgstr "Cette liste affiche toutes les classes appartenant Ã  ce profile."
-
-#: admin/fai/class_faiProfile.inc:313 admin/fai/class_askClassName.inc:103
-#: admin/fai/classSelect/class_classSelect.inc:53
-#: admin/fai/class_faiProfileEntry.inc:158
-msgid "Hook bundle"
-msgstr "Ensemble de hooks"
-
-#: admin/fai/class_faiProfile.inc:314 admin/fai/class_askClassName.inc:105
-#: admin/fai/classSelect/class_classSelect.inc:54
-#: admin/fai/class_faiProfileEntry.inc:159
-msgid "Template bundle"
-msgstr "Ensemble de modÃ¨les"
-
-#: admin/fai/class_faiProfile.inc:315 admin/fai/class_askClassName.inc:101
-#: admin/fai/classSelect/class_classSelect.inc:55
-#: admin/fai/class_faiProfileEntry.inc:160
-msgid "Script bundle"
-msgstr "Ensemble de scripts"
-
-#: admin/fai/class_faiProfile.inc:316 admin/fai/class_askClassName.inc:102
-#: admin/fai/classSelect/class_classSelect.inc:56
-#: admin/fai/class_faiProfileEntry.inc:161
-msgid "Variable bundle"
-msgstr "Ensemble de variables"
-
-#: admin/fai/class_faiProfile.inc:317 admin/fai/class_askClassName.inc:100
-#: admin/fai/classSelect/class_classSelect.inc:57
-#: admin/fai/class_faiProfileEntry.inc:162
-msgid "Package bundle"
-msgstr "Ensemble de paquets"
-
-#: admin/fai/class_faiProfile.inc:321
-msgid "Remove class from profile"
-msgstr "Enlever la classe du profil"
-
-#: admin/fai/class_faiProfile.inc:324
-msgid "Up"
-msgstr "Haut"
-
-#: admin/fai/class_faiProfile.inc:325
-msgid "Down"
-msgstr "Bas"
-
-#: admin/fai/class_faiProfile.inc:410
-msgid "No class specified for this profile!"
-msgstr "Pas de classe spÃ©cifiÃ©e pour ce profileâ€¯!"
-
-#: admin/fai/class_faiProfile.inc:419
-msgid "You can't use the same name for a class and a profile!"
-msgstr "Vous ne pouvez pas utiliser le mÃªme nom pour une classe et un profilâ€¯!"
-
-#: admin/fai/class_faiProfile.inc:455
+#: admin/fai/class_faiProfile.inc:28
+msgid "Profile"
+msgstr "Profil"
+
+#: admin/fai/class_faiProfile.inc:29
 msgid "FAI profile"
 msgstr "Profil FAI"
 
-#: admin/fai/class_faiProfile.inc:458
+#: admin/fai/class_faiProfile.inc:32
 msgid "FAI Profile"
 msgstr "Profil FAI"
 
-#: admin/fai/class_faiProfile.inc:465 admin/fai/faiProfile.tpl.c:17
+#: admin/fai/class_faiProfile.inc:61
 msgid "FAI classes"
 msgstr "Classes FAI"
 
-#: admin/fai/class_faiHookEntry.inc:200
-msgid "Hook entry"
-msgstr "Hook"
+#: admin/fai/class_faiProfile.inc:61
+msgid "FAI classes which are part of this profile"
+msgstr ""
 
-#: admin/fai/class_faiHookEntry.inc:201
-msgid "FAI hook entry"
-msgstr "Hook FAI"
+#: admin/fai/class_faiPackageConfiguration.inc:88
+#, php-format
+msgid "Debconf information for package '%s'"
+msgstr "Information Debconf pour le paquet '%s'"
 
-#: admin/fai/class_faiHookEntry.inc:209 admin/fai/faiHookEntry.tpl.c:20
-msgid "Task"
-msgstr "TÃ¢che"
+#: admin/fai/class_faiScript.inc:30 admin/fai/class_faiScript.inc:84
+#: admin/fai/class_faiHook.inc:87
+msgid "Script"
+msgstr "Script"
 
-#: admin/fai/class_faiHookEntry.inc:210 admin/fai/class_faiScript.inc:595
-#: admin/fai/class_faiScript.inc:599
+#: admin/fai/class_faiScript.inc:31 admin/fai/class_faiScript.inc:34
 msgid "FAI script"
 msgstr "Script FAI"
 
-#: admin/fai/class_faiPackageConfiguration.inc:88
-#, php-format
-msgid "Debconf information for package '%s'"
-msgstr "Information Debconf pour le paquet '%s'"
+#: admin/fai/class_faiScript.inc:63
+msgid "Scripts"
+msgstr "Scripts"
 
-#: admin/fai/class_askClassName.inc:99 admin/fai/class_askClassName.inc:100
-#: admin/fai/class_askClassName.inc:101 admin/fai/class_askClassName.inc:102
-#: admin/fai/class_askClassName.inc:103 admin/fai/class_askClassName.inc:104
-#: admin/fai/class_askClassName.inc:105 admin/fai/class_askClassName.inc:106
-msgid "Create new FAI object"
-msgstr "CrÃ©er un nouvel objet FAI"
+#: admin/fai/class_faiScript.inc:67 admin/fai/class_faiHook.inc:67
+#: admin/fai/class_faiVariable.inc:67
+msgid "Variables in this class"
+msgstr ""
 
-#: admin/fai/class_faiTemplateEdit.inc:80
-#, php-format
-msgid ""
-"The file encodig has changed from '%s' to '%s'. Do you really want to save?"
-msgstr "L'encodage du fichier a changÃ© de '%s' vers '%s', voulez vous rÃ©ellement le sauver ?"
+#: admin/fai/class_faiScript.inc:71 admin/fai/class_faiHook.inc:71
+#: admin/fai/class_faiVariable.inc:71
+msgid "The name of the variable"
+msgstr ""
 
-#: admin/fai/class_faiScript.inc:333 admin/fai/class_faiScript.inc:335
-msgid "Sort direction"
-msgstr "Direction du tri"
+#: admin/fai/class_faiScript.inc:75 admin/fai/class_faiHook.inc:75
+#: admin/fai/class_faiVariable.inc:75
+msgid "A short description of the variable"
+msgstr ""
 
-#: admin/fai/class_faiScript.inc:348 admin/fai/faiScriptEntry.tpl.c:20
+#: admin/fai/class_faiScript.inc:79
 msgid "Priority"
 msgstr "PrioritÃ©"
 
-#: admin/fai/class_faiScript.inc:350
-msgid "Action"
-msgstr "Action"
+#: admin/fai/class_faiScript.inc:79
+msgid "Priority of this script (FIXME: less is done first?)"
+msgstr ""
 
-#: admin/fai/classSelect/selectClass-list.xml:36 admin/fai/fai-list.xml:88
-#: admin/fai/faiScriptEntry.tpl.c:14
-msgid "Properties"
-msgstr "PropriÃ©tÃ©s"
+#: admin/fai/class_faiScript.inc:84
+msgid "The script itself"
+msgstr ""
 
-#: admin/fai/class_faiTemplate.inc:501 admin/fai/fai-list.xml:116
+#: admin/fai/class_faiTemplate.inc:136
+#, php-format
+msgid "There are several files with the same path: %s"
+msgstr ""
+
+#: admin/fai/class_faiTemplate.inc:153
 msgid "Template"
 msgstr "ModÃ¨le"
 
-#: admin/fai/class_faiTemplate.inc:502 admin/fai/class_faiTemplate.inc:506
+#: admin/fai/class_faiTemplate.inc:154 admin/fai/class_faiTemplate.inc:157
 msgid "FAI template"
 msgstr "ModÃ¨le FAI"
 
-#: admin/fai/class_faiVariableEntry.inc:107
-msgid "Content"
-msgstr "Contenu"
-
-#: admin/fai/class_faiVariableEntry.inc:142
-msgid "Variable entry"
-msgstr "Variable"
+#: admin/fai/class_faiTemplate.inc:176
+msgid "Template class name"
+msgstr ""
 
-#: admin/fai/class_faiVariableEntry.inc:143
-msgid "FAI variable entry "
-msgstr "Variable FAI"
+#: admin/fai/class_faiTemplate.inc:186
+msgid "Template files"
+msgstr ""
 
-#: admin/fai/class_faiVariableEntry.inc:151
-#: admin/fai/faiVariableEntry.tpl.c:20
-msgid "Variable content"
-msgstr "Contenu de la variable"
+#: admin/fai/class_faiTemplate.inc:190
+msgid "Template files in this class"
+msgstr ""
 
 #: admin/fai/class_faiPartition.inc:176 admin/fai/class_faiPartition.inc:180
 msgid "Logical"
@@ -888,7 +478,7 @@ msgstr "RAID 6"
 
 #: admin/fai/class_faiPartition.inc:195
 msgid "fixed"
-msgstr "fixe"
+msgstr "Fixe"
 
 #: admin/fai/class_faiPartition.inc:196
 msgid "dynamic"
@@ -900,23 +490,23 @@ msgstr "place restante"
 
 #: admin/fai/class_faiPartition.inc:202
 msgid "KB"
-msgstr "Ko"
+msgstr "KB"
 
 #: admin/fai/class_faiPartition.inc:203
 msgid "MB"
-msgstr "Mo"
+msgstr "MB"
 
 #: admin/fai/class_faiPartition.inc:204
 msgid "GB"
-msgstr "Go"
+msgstr "GB"
 
 #: admin/fai/class_faiPartition.inc:205
 msgid "TB"
-msgstr "To"
+msgstr "TB"
 
 #: admin/fai/class_faiPartition.inc:206
 msgid "PB"
-msgstr "Po"
+msgstr "PB"
 
 #: admin/fai/class_faiPartition.inc:207
 msgid "%"
@@ -928,7 +518,7 @@ msgstr "toujours"
 
 #: admin/fai/class_faiPartition.inc:213
 msgid "reinstall"
-msgstr "rÃ©installer"
+msgstr "reinstaller"
 
 #: admin/fai/class_faiPartition.inc:217
 msgid "swap space"
@@ -948,7 +538,7 @@ msgstr "ext4"
 
 #: admin/fai/class_faiPartition.inc:221
 msgid "reiser fs"
-msgstr "reiser fs"
+msgstr "Reiser fs"
 
 #: admin/fai/class_faiPartition.inc:222
 msgid "xfs"
@@ -958,95 +548,74 @@ msgstr "xfs"
 msgid "btrfs"
 msgstr "btrfs"
 
-#: admin/fai/class_faiPartition.inc:224
-msgid "LVM/RAID"
-msgstr "LVM/RAID"
-
-#: admin/fai/class_faiPartition.inc:327
+#: admin/fai/class_faiPartition.inc:325
 msgid "spare"
-msgstr "en trop"
+msgstr "de rechange"
 
-#: admin/fai/class_faiPartition.inc:330
+#: admin/fai/class_faiPartition.inc:328
 msgid "missing"
 msgstr "manquant"
 
-#: admin/fai/class_faiPartition.inc:333
+#: admin/fai/class_faiPartition.inc:331
 msgid "Options"
 msgstr "Options"
 
-#: admin/fai/class_faiPartition.inc:420
+#: admin/fai/class_faiPartition.inc:415
 msgid "Minimum partition size"
 msgstr "Taille minimale de la partition"
 
-#: admin/fai/class_faiPartition.inc:420
+#: admin/fai/class_faiPartition.inc:415
 msgid "Maximum partition size"
 msgstr "Taille maximum de la partition"
 
-#: admin/fai/class_faiPartition.inc:428
+#: admin/fai/class_faiPartition.inc:423
 msgid "Raid arrays must contain at least two partitions!"
-msgstr "Les ensembles RAID doivent contenir au moins 2 partitionsâ€¯!"
+msgstr "Les ensembles RAID doit contenir au moins 2 partitions !"
 
-#: admin/fai/class_faiPartition.inc:430
+#: admin/fai/class_faiPartition.inc:425
 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:332 admin/fai/class_faiHook.inc:334
-#: admin/fai/fai-list.xml:190 admin/fai/faiVariable.tpl.c:23
-#: admin/fai/faiVariable.tpl.c:26
-msgid "Edit"
-msgstr "Ã‰diter"
+msgstr "Les ensembles RAID 0 ne peuvent Ãªtre rÃ©alisÃ© qu'avec deux partitions !"
 
-#: admin/fai/class_faiHook.inc:336
-msgid "Delete"
-msgstr "Supprimer"
-
-#: admin/fai/class_faiHook.inc:521 admin/fai/fai-list.xml:128
+#: admin/fai/class_faiHook.inc:30
 msgid "Hook"
-msgstr "Hook"
+msgstr "Connexions"
 
-#: admin/fai/class_faiHook.inc:522 admin/fai/class_faiHook.inc:526
+#: admin/fai/class_faiHook.inc:31 admin/fai/class_faiHook.inc:34
 msgid "FAI hook"
-msgstr "Hook FAI"
-
-#: admin/fai/class_faiVariable.inc:387 admin/fai/fai-list.xml:134
-msgid "Variable"
-msgstr "Variable"
+msgstr "Connexions FAI"
 
-#: admin/fai/class_faiVariable.inc:388 admin/fai/class_faiVariable.inc:392
-msgid "FAI variable"
-msgstr "Variable FAI"
+#: admin/fai/class_faiHook.inc:63
+msgid "Hooks"
+msgstr "Connexions"
 
-#: admin/fai/class_faiProfileEntry.inc:184 admin/fai/askClassName.tpl.c:11
-#: admin/fai/askClassName.tpl.c:17 admin/fai/paste_generic.tpl.c:5
-msgid "Class name"
-msgstr "Nom de la classe"
+#: admin/fai/class_faiHook.inc:79
+msgid "Task"
+msgstr "TÃ¢ches"
 
-#: admin/fai/class_faiProfileEntry.inc:184 admin/fai/faiTemplate.tpl.c:14
-#: admin/fai/faiVariable.tpl.c:14 admin/fai/faiHook.tpl.c:14
-#: admin/fai/faiPartitionTable.tpl.c:17 admin/fai/faiScript.tpl.c:14
-msgid "Objects"
-msgstr "Objets"
+#: admin/fai/class_faiHook.inc:87
+msgid "The script of this hook"
+msgstr ""
 
-#: admin/fai/fai-list.xml:11
-msgid "List of deployment classes and products"
-msgstr "Listes des classes et des paquets de dÃ©ploiement"
+#: admin/fai/class_faiVariable.inc:30
+msgid "Variable"
+msgstr "Variable"
 
-#: admin/fai/fai-list.xml:15
-msgid "partitionTable"
-msgstr "Table des partitions"
+#: admin/fai/class_faiVariable.inc:31 admin/fai/class_faiVariable.inc:34
+msgid "FAI variable"
+msgstr "Variables FAI"
 
-#: admin/fai/fai-list.xml:23
-msgid "packagelist"
-msgstr "Liste de paquets"
+#: admin/fai/class_faiVariable.inc:63
+msgid "Variables"
+msgstr "Variables"
 
-#: admin/fai/fai-list.xml:93
-msgid "Actions"
-msgstr "Actions"
+#: admin/fai/class_faiVariable.inc:79
+msgid "Content"
+msgstr "Contenu"
 
-#: admin/fai/fai-list.xml:104
-msgid "Create"
-msgstr "CrÃ©er"
+#: admin/fai/class_faiVariable.inc:79
+msgid "The content of the variable"
+msgstr ""
 
 #: admin/systems/class_faiLogView.inc:56
 msgid "Sort down"
@@ -1056,6 +625,10 @@ msgstr "Trier vers le bas"
 msgid "Sort up"
 msgstr "Trier vers le haut"
 
+#: admin/systems/class_faiLogView.inc:70
+msgid "File"
+msgstr "Fichier"
+
 #: admin/systems/class_faiLogView.inc:71
 msgid "Date"
 msgstr "Date"
@@ -1071,7 +644,7 @@ msgstr "SÃ©lectionner le journal systÃ¨me"
 
 #: admin/systems/class_faiLogView.inc:162
 msgid "Content of the selected log"
-msgstr "Contenu du journal systÃ¨me sÃ©lectionnÃ©"
+msgstr "Contenu du journal systÃ¨me sÃ©lectionne "
 
 #: admin/systems/class_faiLogView.inc:174
 msgid "FAI Logs"
@@ -1079,28 +652,28 @@ msgstr "Journaux systÃ¨mes FAI"
 
 #: admin/systems/class_faiLogView.inc:175
 msgid "FAI Logs Viewer"
-msgstr "Afficheur de journaux systÃ¨mes FAI"
+msgstr "Afficheur des journaux systÃ¨mes FAI"
 
 #: admin/systems/class_faiLogView.inc:222
 msgid "Selected file"
-msgstr "Fichier sÃ©lectionnÃ©"
+msgstr "Fichier sÃ©lectionne "
 
 #: admin/systems/class_faiLogView.inc:230
 #, php-format
 msgid "Selected file: %s"
-msgstr "Fichier sÃ©lectionnÃ©â€¯: %s"
+msgstr "Fichier sÃ©lectionne: %s"
 
-#: admin/systems/class_faiStartup.inc:70 admin/fai/paste_generic.tpl.c:2
+#: admin/systems/class_faiStartup.inc:70
 msgid "FAI settings"
 msgstr "ParamÃ¨tres FAI"
 
 #: admin/systems/class_faiStartup.inc:74
 msgid "FAI profil and release to be applied to this computer"
-msgstr "Profil FAI et version de Debian Ã  appliquer pour ce systÃ¨me"
+msgstr "Profil FAI et Release Debian Ã  appliquer pour ce systÃ¨me"
 
 #: admin/systems/class_faiStartup.inc:78
 msgid "FAI debian release to be installed on this computer"
-msgstr "Version de Debian Ã  installer sur ce systÃ¨me avec FAI"
+msgstr "Release Debian a installer sur ce systÃ¨me avec FAI"
 
 #: admin/systems/class_faiStartup.inc:82
 msgid "Profil"
@@ -1110,14 +683,9 @@ msgstr "Profil"
 msgid "FAI profil to be applied to this computer"
 msgstr "Profil FAI pour ce systÃ¨me"
 
-#: admin/systems/class_faiStartup.inc:90 admin/fai/faiPackage.tpl.c:14
-#: admin/fai/faiPackage.tpl.c:17
-msgid "Repository"
-msgstr "DÃ©pÃ´t"
-
 #: admin/systems/class_faiStartup.inc:90
 msgid "FAI Debian repository to be used for installation"
-msgstr "DÃ©pÃ´t FAI Ã  utiliser pour cette installation"
+msgstr "Repository FAI Ã  utiliser pour cette installation"
 
 #: admin/systems/class_faiStartup.inc:96
 msgid "Startup parameters"
@@ -1125,100 +693,111 @@ msgstr "ParamÃ¨tres de dÃ©marrage"
 
 #: admin/systems/class_faiStartup.inc:99
 msgid "Boot kernel"
-msgstr "Noyau utilisÃ© au dÃ©marrage"
+msgstr "Kernel utilisÃ© au dÃ©marrage"
 
 #: admin/systems/class_faiStartup.inc:99
 msgid "Linux kernel to be installed and booted"
-msgstr "Noyau Linux Ã  installer et Ã  dÃ©marrer"
+msgstr "Kernel linux Ã  installer et Ã  demarrer"
 
 #: admin/systems/class_faiStartup.inc:103
 msgid "Boot kernel parameters"
-msgstr "ParamÃ¨tres de dÃ©marrage du noyau"
+msgstr "ParamÃ¨tres de demarrage pour ce kernel"
 
 #: admin/systems/class_faiStartup.inc:103
 msgid "Linux kernel parameters to be ran"
-msgstr "ParamÃ¨tres de dÃ©marrage Ã  passer au noyau Linux"
+msgstr "ParamÃ¨tres de dÃ©marrage pour ce kernel"
 
-#: admin/systems/class_faiStartup.inc:178
+#: admin/systems/class_faiStartup.inc:179
 msgid "Full automated installation"
 msgstr "Full automated installation"
 
-#: admin/systems/services/repository/class_serviceRepository.inc:31
+#: admin/systems/services/repository/class_serviceDebianRepository.inc:34
+#: admin/systems/services/repository/class_serviceCentosRepository.inc:31
+msgid "Repositories"
+msgstr "DÃ©pÃ´t"
+
+#: admin/systems/services/repository/class_serviceDebianRepository.inc:39
+#: admin/systems/services/repository/class_serviceCentosRepository.inc:36
+msgid "Repositories this server hosts"
+msgstr "DÃ©pots fournis par ce serveur"
+
+#: admin/systems/services/repository/class_serviceDebianRepository.inc:43
+#: admin/systems/services/repository/class_serviceCentosRepository.inc:40
 msgid "URL"
 msgstr "URL"
 
-#: admin/systems/services/repository/class_serviceRepository.inc:31
+#: admin/systems/services/repository/class_serviceDebianRepository.inc:43
+#: admin/systems/services/repository/class_serviceCentosRepository.inc:40
 msgid "Repository url"
 msgstr "URL du dÃ©pÃ´t"
 
-#: admin/systems/services/repository/class_serviceRepository.inc:35
+#: admin/systems/services/repository/class_serviceDebianRepository.inc:47
+#: admin/systems/services/repository/class_serviceCentosRepository.inc:44
 msgid "Parent server"
 msgstr "Serveur parent"
 
-#: admin/systems/services/repository/class_serviceRepository.inc:35
+#: admin/systems/services/repository/class_serviceDebianRepository.inc:47
+#: admin/systems/services/repository/class_serviceCentosRepository.inc:44
 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
-msgid "Sections"
-msgstr "Sections"
+#: admin/systems/services/repository/class_serviceDebianRepository.inc:52
+msgid "Debian release used on this repository"
+msgstr "Release Debian utilisÃ©e sur ce dÃ©pÃ´t"
 
-#: 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_serviceDebianRepository.inc:58
+msgid "Debian sections available on this repository"
+msgstr "Section Debian disponibles sur ce dÃ©pÃ´t"
 
-#: admin/systems/services/repository/class_serviceRepository.inc:52
+#: admin/systems/services/repository/class_serviceDebianRepository.inc:63
+#: admin/systems/services/repository/class_serviceCentosRepository.inc:57
 msgid "Mirror mode"
-msgstr "Type de miroir"
+msgstr "Mode du miroir"
 
-#: admin/systems/services/repository/class_serviceRepository.inc:52
+#: admin/systems/services/repository/class_serviceDebianRepository.inc:63
+#: admin/systems/services/repository/class_serviceCentosRepository.inc:57
 msgid ""
 "Is this mirror an installation repository? Is its release a custom one?"
-msgstr "Est ce que ce miroir est un dÃ©pÃ´t d'installation ? Est-ce que sa version de Debian est personnalisÃ©eâ€¯?"
+msgstr "Est ce que ce miroir est dÃ©pÃ´t d'installation ? est ce que sa release est personnalisÃ©e "
 
-#: admin/systems/services/repository/class_serviceRepository.inc:57
+#: admin/systems/services/repository/class_serviceDebianRepository.inc:68
+#: admin/systems/services/repository/class_serviceCentosRepository.inc:62
 msgid "Local mirror"
-msgstr "Miroir local"
+msgstr "Mirroir local"
 
-#: admin/systems/services/repository/class_serviceRepository.inc:57
+#: admin/systems/services/repository/class_serviceDebianRepository.inc:68
+#: admin/systems/services/repository/class_serviceCentosRepository.inc:62
 msgid "Is this mirror a local or a network mirror?"
-msgstr "Est-ce un miroir local ou externe?"
+msgstr "Est ce un mirroir local ou rÃ©seau ?"
 
-#: admin/systems/services/repository/class_serviceRepository.inc:66
+#: admin/systems/services/repository/class_serviceDebianRepository.inc:77
+#: admin/systems/services/repository/class_serviceCentosRepository.inc:71
 msgid "Architectures"
 msgstr "Architectures"
 
-#: admin/systems/services/repository/class_serviceRepository.inc:66
+#: admin/systems/services/repository/class_serviceDebianRepository.inc:77
+#: admin/systems/services/repository/class_serviceCentosRepository.inc:71
 msgid "Processor architectures available on this repository"
-msgstr "Architectures de processeur disponibles sur ce dÃ©pÃ´t"
+msgstr "Architectures de processeurs disponibles sur ce dÃ©pÃ´t"
 
-#: admin/systems/services/repository/class_serviceRepository.inc:72
-msgid "Distribution"
-msgstr "Distribution"
+#: admin/systems/services/repository/class_serviceDebianRepository.inc:99
+#: admin/systems/services/repository/class_serviceDebianRepository.inc:100
+msgid "Debian repository"
+msgstr "DÃ©pÃ´t Debian"
 
-#: 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_serviceDebianRepository.inc:100
+#: admin/systems/services/repository/class_serviceCentosRepository.inc:96
+msgid "Services"
+msgstr "Service"
 
-#: admin/systems/services/repository/class_serviceRepository.inc:140
-msgid "Repositories"
-msgstr "DÃ©pÃ´ts"
-
-#: admin/systems/services/repository/class_serviceRepository.inc:145
-msgid "Repositories this server hosts"
-msgstr "DÃ©pots fournis par ce serveur"
-
-#: admin/systems/services/repository/class_serviceRepository.inc:160
-msgid "Package repository"
-msgstr "DÃ©pÃ´t  de paquets"
+#: admin/systems/services/repository/class_serviceCentosRepository.inc:49
+msgid "Centos release used on this repository"
+msgstr ""
 
-#: admin/systems/services/repository/class_serviceRepository.inc:161
-msgid "Package repository information"
-msgstr "Information sur le dÃ©pÃ´t de paquets"
+#: admin/systems/services/repository/class_serviceCentosRepository.inc:95
+#: admin/systems/services/repository/class_serviceCentosRepository.inc:96
+msgid "Centos repository"
+msgstr ""
 
 #: config/fai/class_faiConfig.inc:28
 msgid "FAI configuration"
@@ -1230,495 +809,22 @@ msgstr "Configuration du plugin FAI"
 
 #: config/fai/class_faiConfig.inc:44
 msgid "Fai base RDN"
-msgstr "Branche FAI"
+msgstr "Fai base RDN"
 
 #: 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"
+msgstr "Branche dans laquelle les objets FAI seront stockÃ©s"
 
 #: config/fai/class_faiConfig.inc:59
 #, php-format
 msgid "Fai %s RDN"
-msgstr "Sous-branche FAIÂ %s"
+msgstr "Fai %s RDN"
 
 #: 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"
+msgstr "Branche relatif dans laquelle les objets fai %s seront stockÃ©s"
 
 #: config/fai/class_faiConfig.inc:60
 msgid "s"
 msgstr "s"
-
-#: admin/fai/faiPartitionTableEntry.tpl.c:2 admin/fai/faiVariableEntry.tpl.c:2
-#: admin/fai/faiVariableEntry.tpl.c:5 admin/fai/faiDiskEntry.tpl.c:2
-#: admin/fai/faiTemplate.tpl.c:2 admin/fai/faiTemplate.tpl.c:5
-#: admin/fai/faiVariable.tpl.c:2 admin/fai/faiVariable.tpl.c:5
-#: admin/fai/faiHook.tpl.c:2 admin/fai/faiHook.tpl.c:5
-#: admin/fai/faiPackage.tpl.c:2 admin/fai/faiPackage.tpl.c:5
-#: admin/fai/faiTemplateEntry.tpl.c:2 admin/fai/faiTemplateEntry.tpl.c:5
-#: admin/fai/faiScriptEntry.tpl.c:2 admin/fai/faiScriptEntry.tpl.c:5
-#: admin/fai/faiPartitionTable.tpl.c:2 admin/fai/faiPartitionTable.tpl.c:5
-#: admin/fai/faiScript.tpl.c:2 admin/fai/faiScript.tpl.c:5
-#: admin/fai/faiProfile.tpl.c:2 admin/fai/faiProfile.tpl.c:5
-#: admin/fai/faiProfile.tpl.c:14 admin/fai/faiHookEntry.tpl.c:2
-#: admin/fai/faiHookEntry.tpl.c:5
-msgid "Generic"
-msgstr "Application"
-
-#: admin/fai/faiPartitionTableEntry.tpl.c:14
-#: admin/fai/faiPartitionTableEntry.tpl.c:17 admin/fai/faiDiskEntry.tpl.c:23
-#: admin/fai/faiDiskEntry.tpl.c:26
-msgid "Partition entries"
-msgstr "Liste de partitions"
-
-#: admin/fai/faiPartitionTableEntry.tpl.c:20
-#: admin/fai/faiPartitionTableEntry.tpl.c:23 admin/fai/faiDiskEntry.tpl.c:29
-#: admin/fai/faiDiskEntry.tpl.c:32
-msgid "Add partition"
-msgstr "Ajouter une partition"
-
-#: admin/fai/branch_selector.tpl.c:2
-msgid "Releases"
-msgstr "Versions"
-
-#: admin/fai/branch_selector.tpl.c:5
-msgid "Current release"
-msgstr "Version actuelle"
-
-#: admin/fai/branch_selector.tpl.c:8 admin/fai/branch_selector.tpl.c:17
-#: admin/fai/fai-filter.tpl.c:8 admin/fai/fai-filter.tpl.c:17
-msgid "Create release"
-msgstr "CrÃ©er une version"
-
-#: admin/fai/branch_selector.tpl.c:11 admin/fai/branch_selector.tpl.c:23
-#: admin/fai/fai-filter.tpl.c:11 admin/fai/fai-filter.tpl.c:23
-msgid "Create read-only release"
-msgstr "CrÃ©er une version en lecture seule"
-
-#: admin/fai/branch_selector.tpl.c:20 admin/fai/fai-filter.tpl.c:20
-msgid "Freeze"
-msgstr "VerouillÃ©"
-
-#: admin/fai/branch_selector.tpl.c:26 admin/fai/fai-filter.tpl.c:26
-msgid "Delete current release"
-msgstr "Effacer la version actuelle"
-
-#: admin/fai/faiPartition.tpl.c:2
-msgid "Partition"
-msgstr "Partition"
-
-#: admin/fai/faiPartition.tpl.c:17
-msgid "Resize existing partition"
-msgstr "RÃ©duire un partition existante"
-
-#: admin/fai/faiPartition.tpl.c:20
-msgid "Bootable"
-msgstr "AmorÃ§able"
-
-#: admin/fai/faiPartition.tpl.c:26 admin/fai/faiDiskEntry.tpl.c:20
-msgid "Combined physical partitions"
-msgstr "Combination des partitions physiques"
-
-#: admin/fai/faiPartition.tpl.c:29
-msgid "Toggle missing"
-msgstr "Afficher/Cacher manquants"
-
-#: admin/fai/faiPartition.tpl.c:32
-msgid "Toggle spare"
-msgstr "Afficher/Cacher spare"
-
-#: admin/fai/faiPartition.tpl.c:35
-msgid "Filesystem"
-msgstr "SystÃ¨me de fichiers"
-
-#: admin/fai/faiPartition.tpl.c:38
-msgid "Filesystem create options"
-msgstr "Options de crÃ©ation du systÃ¨me de fichier"
-
-#: admin/fai/faiPartition.tpl.c:41
-msgid "Encrypted"
-msgstr "CryptÃ©"
-
-#: admin/fai/faiPartition.tpl.c:44
-msgid "Tune options"
-msgstr "Options de tuning"
-
-#: admin/fai/faiNewBranch.tpl.c:2
-msgid ""
-"You are now going to create a branch or locked branch. This action clones "
-"the existing release to another release name. Branches can be modified as "
-"usual. FAI classes of locked branches cannot be modified, just additional "
-"classes are possible. Branch names should be alphanumeric, excluding the "
-"reserved names 'scripts', 'hooks', 'partitions', 'variables', 'templates' "
-"and 'fai'."
-msgstr "Vous allez maintenant crÃ©er un branche ou une branche verrouillÃ©e. Cette action copie la version actuelle dans un nouvelle version. Les branches peuvent Ãªtre modifiÃ©es comme d'habitude. Les classes FAI des branches verrouillÃ©es ne peuvent pas Ãªtre modifiÃ©es, seul des des classes supplÃ©mentaires sont possibles. Les noms de branches doivent Ãªtre alphanumÃ©riques, a l'exception des mots rÃ©servÃ©s 'scripts', 'hooks', 'partitions', 'variables', 'templates' et 'fai'."
-
-#: admin/fai/faiNewBranch.tpl.c:5
-msgid ""
-"Branches are created as subreleases of the currently selected branch. "
-"Creating a new branch named 1.0.2 in SARGE for example, will result in a new"
-" release called SARGE/1.0.2."
-msgstr "Les branches sont crÃ©es comme des sous versions de la branche sÃ©lectionnÃ©es. La crÃ©ation d'un nouvelle branche nommÃ©e 1.0.2 in SARGE par exemple, donnera comme rÃ©sultat une nouvelle version appelÃ©e SARGE/1.0.2"
-
-#: admin/fai/faiNewBranch.tpl.c:8
-msgid "Please enter a name for the branch"
-msgstr "Veuillez entrer un nom pour la branche."
-
-#: admin/fai/faiNewBranch.tpl.c:11
-msgid "Processing the requested operation"
-msgstr "OpÃ©ration en cours"
-
-#: admin/fai/faiNewBranch.tpl.c:14
-msgid ""
-"As soon as the copy operation has finished, you can scroll down to end of "
-"the page and press the 'Continue' button to continue with the fai management"
-" dialog."
-msgstr "AussitÃ´t que l'opÃ©ration de copie est finie, vous pouvez aller Ã  la fin de la page et cliquer sur 'Continuer' pour continuer la configuration de fai."
-
-#: admin/fai/faiNewBranch.tpl.c:17
-msgid ""
-"Your browser doesn't support iframes, please use this link to perform the "
-"requested operation."
-msgstr "Votre navigateur ne supporte pas les iframes, veuillez utiliser ce lien pour effectuer l'opÃ©ration demandÃ©e."
-
-#: admin/fai/faiNewBranch.tpl.c:20
-msgid "Perform requested operation."
-msgstr "OpÃ©ration en cours."
-
-#: admin/fai/faiNewBranch.tpl.c:23
-msgid "Initiate operation"
-msgstr "DÃ©marrage de l'opÃ©ration"
-
-#: admin/fai/faiVariableEntry.tpl.c:14 admin/fai/faiVariableEntry.tpl.c:17
-msgid "Variable attributes"
-msgstr "Attributs des variables"
-
-#: admin/fai/faiDiskEntry.tpl.c:11
-msgid "fstab key"
-msgstr "EntrÃ©e fstab"
-
-#: admin/fai/faiDiskEntry.tpl.c:17
-msgid "Disk label"
-msgstr "Etiquette du disque"
-
-#: admin/fai/faiTemplate.tpl.c:17
-msgid "List of template files"
-msgstr "Liste des modÃ¨les"
-
-#: admin/fai/faiVariable.tpl.c:17
-msgid "List of assigned variables"
-msgstr "Liste des noms de variables dÃ©jÃ  utilisÃ©es"
-
-#: admin/fai/faiVariable.tpl.c:20
-msgid "Choose a variable to delete or edit"
-msgstr "Choisissez une variable Ã  effacer ou Ã©diter"
-
-#: admin/fai/askClassName.tpl.c:2
-msgid ""
-"Adding a new class to the FAI management, requires a class name. You have to"
-" specify a unique class name for unique types of FAI classes, while you can "
-"use the same class name for different types of FAI classes. In the laste "
-"case, FAI will automatically enclose all these different class types to one "
-"unique class name."
-msgstr "Ajouter une classe Ã  la gestion FAI nÃ©cessite un nom de classe. Vous devez spÃ©cifier un nom de classe unique pour les classe FAI de type unique, alors que vous pouvez utiliser le mÃªme nom pour des classes FAI de type diffÃ©rent. Dans le dernier cas, FAI incluera automatiquement toutes ces classes de diffÃ©rent type dans un nom de classe unique."
-
-#: admin/fai/askClassName.tpl.c:5
-msgid ""
-"Please use one of the following methods to choose the name for the new FAI "
-"class."
-msgstr "Veuillez utiliser une des mÃ©thodes suivantes pour choisir le nom de la nouvelle classe FAI."
-
-#: admin/fai/askClassName.tpl.c:8
-msgid "Enter FAI class name manually"
-msgstr "Entrez le nom de la classe FAI manuellement"
-
-#: admin/fai/askClassName.tpl.c:14
-msgid "Choose FAI class name from a list of existing classes"
-msgstr "Choisissez le nom de la classe FAI parmi les classes existantes"
-
-#: admin/fai/askClassName.tpl.c:20
-msgid "Choose class name"
-msgstr "Choisissez un nom de classe"
-
-#: admin/fai/faiGroupHandle.tpl.c:2
-msgid "Please select the objects you want to remove:"
-msgstr "Veuillez sÃ©lectionner les objets que vous voulez enlever :"
-
-#: admin/fai/faiGroupHandle.tpl.c:5
-msgid "Freezed"
-msgstr "VerrouillÃ©"
-
-#: admin/fai/faiGroupHandle.tpl.c:8
-msgid "Select the object you want to edit:"
-msgstr "SÃ©lectionnez les objets que vous voulez Ã©diter :"
-
-#: admin/fai/faiGroupHandle.tpl.c:11
-msgid "Select the object you want to copy:"
-msgstr "SÃ©lectionnez les objets que vous voulez copier :"
-
-#: admin/fai/remove.tpl.c:5
-msgid ""
-"This includes all account data, system access rules, imap settings, etc. for"
-" this user. Please double check if your really want to do this since there "
-"is no way for FusionDirectory to get your data back."
-msgstr "Cela inclut toutes les donnÃ©es des comptes, les droits d'accÃ¨s, la configuration imap, etc. pour cet utilisateur. Veuillez vous assurer que vous voulez effectuez cette opÃ©ration Ã©tant donnÃ© qu'il sera impossible pour FusionDirectory de rÃ©cupÃ©rer vos donnÃ©es."
-
-#: admin/fai/remove.tpl.c:8 admin/fai/remove_branch.tpl.c:8
-msgid "So - if you're sure - press 'Delete' to continue or 'Cancel' to abort."
-msgstr "Donc - si vous Ãªtes sÃ»r - cliquez sur 'Supprimer' pour continuer ou sur 'Annuler' pour abandonner."
-
-#: admin/fai/faiHook.tpl.c:17
-msgid "List of hook scripts"
-msgstr "Liste des scripts de connexions"
-
-#: admin/fai/packageSelect/selectPackage-list.tpl.c:2
-#: admin/fai/classSelect/selectClass-list.tpl.c:5
-msgid "Update"
-msgstr "Mise Ã  jour"
-
-#: admin/fai/packageSelect/selectPackage-list.tpl.c:5
-#: admin/fai/classSelect/selectClass-list.tpl.c:8
-msgid "Submit"
-msgstr "Soumettre"
-
-#: admin/fai/packageSelect/selectPackage-filter.tpl.c:2
-#: admin/fai/classSelect/selectClass-filter.tpl.c:2
-#: admin/fai/fai-filter.tpl.c:2
-msgid "Filter"
-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/remove_branch.tpl.c:5
-msgid ""
-"This includes all account data, system access, etc. for this branch. Please "
-"double check if your really want to do this since there is no way for "
-"FusionDirectory to get your data back."
-msgstr "Cela inclut toutes les donnÃ©es des comptes, les droits d'accÃ¨s, la configuration imap,etc. pour cette branche. Veuillez vous assurez que vous voulez effectuez cette opÃ©ration Ã©tant donnÃ© qu'il est impossible pour FusionDirectory de rÃ©cupÃ©rer vos donnÃ©es."
-
-#: admin/fai/faiPackage.tpl.c:26
-msgid "Install method"
-msgstr "MÃ©thode d'installation"
-
-#: admin/fai/faiPackage.tpl.c:29
-msgid "Please select the installation method"
-msgstr "Veuillez sÃ©lectionner la mÃ©thode d'installation"
-
-#: admin/fai/faiPackage.tpl.c:32 admin/fai/faiPackage.tpl.c:35
-msgid "Used packages"
-msgstr "Paquets utilisÃ©s"
-
-#: admin/fai/faiPackage.tpl.c:38
-msgid "Add from list"
-msgstr "Ajouter depuis la liste"
-
-#: admin/fai/faiProfileEntry.tpl.c:2
-msgid "List of FAI objects (Fully Automatic Installation)"
-msgstr "Liste des objets FAI (Fully Automatic Installation)"
-
-#: admin/fai/faiProfileEntry.tpl.c:5
-msgid "Information"
-msgstr "Information"
-
-#: admin/fai/faiProfileEntry.tpl.c:8
-msgid ""
-"This menu allows you to select FAI class names and to add them to the "
-"currently edited profile."
-msgstr "Ce menu vous permet de sÃ©lectionner des classes FAI et de les ajouter au profile actuellement Ã©ditÃ©."
-
-#: admin/fai/faiProfileEntry.tpl.c:11
-msgid "Filters"
-msgstr "Filtres"
-
-#: admin/fai/faiProfileEntry.tpl.c:14
-msgid "Show only classes with templates"
-msgstr "Montrer seulement les classes avec modÃ¨les"
-
-#: admin/fai/faiProfileEntry.tpl.c:17
-msgid "Show only classes with scripts"
-msgstr "Montrer seulement les classes avec scripts"
-
-#: admin/fai/faiProfileEntry.tpl.c:20
-msgid "Show only classes with hooks"
-msgstr "Montrer seulement les classes avec des hooks"
-
-#: admin/fai/faiProfileEntry.tpl.c:23
-msgid "Show only classes with variables"
-msgstr "Montrer seulement les classes avec variables"
-
-#: admin/fai/faiProfileEntry.tpl.c:26
-msgid "Show only classes with packages"
-msgstr "Montrer seulement les classes avec des paquets"
-
-#: admin/fai/faiProfileEntry.tpl.c:29
-msgid "Show only classes with partitions"
-msgstr "Montrer seulement les classes avec des partitions"
-
-#: admin/fai/faiProfileEntry.tpl.c:32 admin/fai/faiProfileEntry.tpl.c:35
-msgid "Display objects matching"
-msgstr "Afficher les objets correspondants"
-
-#: admin/fai/faiProfileEntry.tpl.c:38
-msgid "Regular expression for matching object names"
-msgstr "Expression rÃ©guliÃ¨re pour trouver les objets correspondants"
-
-#: admin/fai/faiTemplateEntry.tpl.c:17 admin/fai/faiTemplateEntry.tpl.c:20
-msgid "Template attributes"
-msgstr "Attributs des modÃ¨les"
-
-#: admin/fai/faiTemplateEntry.tpl.c:26 admin/fai/faiTemplateEntry.tpl.c:29
-msgid "Save template"
-msgstr "Sauver le modÃ¨le"
-
-#: admin/fai/faiTemplateEntry.tpl.c:32 admin/fai/faiTemplateEntry.tpl.c:35
-msgid "Edit template"
-msgstr "Editer un modÃ¨le"
-
-#: admin/fai/faiTemplateEntry.tpl.c:38
-msgid "Full path"
-msgstr "Chemin complet"
-
-#: admin/fai/faiTemplateEntry.tpl.c:41
-msgid "Upload"
-msgstr "TÃ©lÃ©verser"
-
-#: admin/fai/faiTemplateEntry.tpl.c:44
-msgid "Owner"
-msgstr "PropriÃ©taire"
-
-#: admin/fai/faiTemplateEntry.tpl.c:50
-msgid "Access"
-msgstr "AccÃ¨s"
-
-#: admin/fai/faiTemplateEntry.tpl.c:53
-msgid "Class"
-msgstr "Classe"
-
-#: admin/fai/faiTemplateEntry.tpl.c:56
-msgid "Read"
-msgstr "Lire"
-
-#: admin/fai/faiTemplateEntry.tpl.c:59
-msgid "Write"
-msgstr "Ecrire"
-
-#: admin/fai/faiTemplateEntry.tpl.c:62
-msgid "Execute"
-msgstr "ExÃ©cuter"
-
-#: admin/fai/faiTemplateEntry.tpl.c:65
-msgid "Special"
-msgstr "SpÃ©cial"
-
-#: admin/fai/faiTemplateEntry.tpl.c:71
-msgid "SUID"
-msgstr "SUID"
-
-#: admin/fai/faiTemplateEntry.tpl.c:77
-msgid "SGID"
-msgstr "SGID"
-
-#: admin/fai/faiTemplateEntry.tpl.c:80
-msgid "Others"
-msgstr "Autres"
-
-#: admin/fai/faiTemplateEntry.tpl.c:83
-msgid "sticky"
-msgstr "permanent"
-
-#: admin/fai/faiScriptEntry.tpl.c:17 admin/fai/faiScriptEntry.tpl.c:26
-msgid "Script attributes"
-msgstr "Attributs du script"
-
-#: admin/fai/faiScriptEntry.tpl.c:23
-msgid ""
-"Choose a priority. Low values result in an earlier, high values in a later "
-"execution."
-msgstr "Choisissez une prioritÃ©. Les valeurs basses s'exÃ©cutent en premier."
-
-#: admin/fai/faiScriptEntry.tpl.c:32 admin/fai/faiHookEntry.tpl.c:32
-msgid "Import script"
-msgstr "Importez un script"
-
-#: admin/fai/classSelect/selectClass-list.tpl.c:2
-msgid "Base"
-msgstr "Base"
-
-#: admin/fai/fai-filter.tpl.c:29
-msgid "Show profiles"
-msgstr "Afficher les profils"
-
-#: admin/fai/fai-filter.tpl.c:32
-msgid "Show templates"
-msgstr "Afficher les modÃ¨les"
-
-#: admin/fai/fai-filter.tpl.c:35
-msgid "Show scripts"
-msgstr "Afficher les scripts"
-
-#: admin/fai/fai-filter.tpl.c:38
-msgid "Show hooks"
-msgstr "Montrer les connections"
-
-#: admin/fai/fai-filter.tpl.c:41
-msgid "Show variables"
-msgstr "Afficher les variables"
-
-#: admin/fai/fai-filter.tpl.c:44
-msgid "Show packages"
-msgstr "Afficher les paquets"
-
-#: admin/fai/fai-filter.tpl.c:47
-msgid "Show partitions"
-msgstr "Afficher les partitions"
-
-#: admin/fai/faiTemplateEdit.tpl.c:2
-msgid "This FAI template is write protected. Editing may break it!"
-msgstr "Ce modÃ¨le FAI est protÃ©gÃ© contre l'Ã©criture. L'Ã©dition peut abÃ®mer le fichier !"
-
-#: admin/fai/faiTemplateEdit.tpl.c:5
-msgid "Edit anyway"
-msgstr "Ã‰diter malgrÃ© tout"
-
-#: admin/fai/faiPartitionTable.tpl.c:14
-msgid "Use 'setup-storage' to partition the disk"
-msgstr "Utiliser 'setup storage' pour partitionner le disque"
-
-#: admin/fai/faiPartitionTable.tpl.c:20
-msgid "Discs"
-msgstr "Disques"
-
-#: admin/fai/faiPartitionTable.tpl.c:23 admin/fai/faiPartitionTable.tpl.c:26
-#: admin/fai/faiPartitionTable.tpl.c:41 admin/fai/faiPartitionTable.tpl.c:44
-msgid "Add disk"
-msgstr "Ajouter un disque"
-
-#: admin/fai/faiPartitionTable.tpl.c:29 admin/fai/faiPartitionTable.tpl.c:32
-#: admin/fai/faiPartitionTable.tpl.c:47 admin/fai/faiPartitionTable.tpl.c:50
-msgid "Add RAID"
-msgstr "Ajouter du RAID"
-
-#: admin/fai/faiPartitionTable.tpl.c:35 admin/fai/faiPartitionTable.tpl.c:38
-#: admin/fai/faiPartitionTable.tpl.c:53 admin/fai/faiPartitionTable.tpl.c:56
-msgid "Add volume group"
-msgstr "Ajouter un groupe de volume"
-
-#: admin/fai/faiScript.tpl.c:17
-msgid "List of scripts"
-msgstr "Liste des scripts"
-
-#: admin/fai/faiProfile.tpl.c:20
-msgid "Choose a priority"
-msgstr "SÃ©lectionnez une prioritÃ©"
-
-#: admin/fai/faiHookEntry.tpl.c:14 admin/fai/faiHookEntry.tpl.c:17
-#: admin/fai/faiHookEntry.tpl.c:26
-msgid "Hook attributes"
-msgstr "Attributs des connections"
-
-#: admin/fai/faiHookEntry.tpl.c:23
-msgid "Choose an existing FAI task"
-msgstr "Choisissez une tÃ¢che FAI existante"
diff --git a/fai/locale/id/fusiondirectory.po b/fai/locale/id/fusiondirectory.po
index 7f19d494ae14405d90abe525ead7ddce64b19032..284315481ff4aa19de95a3f1ea220118a278d42a 100644
--- a/fai/locale/id/fusiondirectory.po
+++ b/fai/locale/id/fusiondirectory.po
@@ -5,379 +5,188 @@
 # Translators:
 msgid ""
 msgstr ""
-"Project-Id-Version: FusionDirectory-108\n"
+"Project-Id-Version: FusionDirectory-109\n"
 "Report-Msgid-Bugs-To: documentation@lists.fusiondirectory.org\n"
-"POT-Creation-Date: 2015-03-19 21:45+0100\n"
-"PO-Revision-Date: 2015-02-25 15:46+0000\n"
+"POT-Creation-Date: 2014-12-15 17:47+0100\n"
+"PO-Revision-Date: 2014-12-15 16:54+0000\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>\n"
-"Language-Team: Indonesian (http://www.transifex.com/projects/p/FusionDirectory-108/language/id/)\n"
+"Language-Team: Indonesian (http://www.transifex.com/projects/p/FusionDirectory-109/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/fai/class_faiScriptEntry.inc:79 admin/fai/class_faiScriptEntry.inc:82
-#: admin/fai/class_faiManagement.inc:240 admin/fai/class_faiManagement.inc:768
-#: admin/fai/class_faiManagement.inc:774
-#: admin/fai/class_faiPartitionTable.inc:268
-#: admin/fai/class_faiPartitionTable.inc:331
-#: admin/fai/class_faiDiskEntry.inc:445 admin/fai/class_FAI.inc:570
-#: admin/fai/class_faiHookEntry.inc:83 admin/fai/class_faiHookEntry.inc:86
-#: admin/fai/class_faiScript.inc:249 admin/fai/class_faiTemplate.inc:232
-#: admin/fai/class_faiHook.inc:259 admin/fai/class_faiVariable.inc:162
-#: admin/systems/class_faiLogView.inc:207
-#: admin/systems/class_faiLogView.inc:242
-msgid "Error"
-msgstr ""
-
-#: admin/fai/class_faiScriptEntry.inc:82 admin/fai/class_faiHookEntry.inc:86
-msgid "file is empty"
-msgstr ""
-
-#: admin/fai/class_faiScriptEntry.inc:102 admin/fai/class_faiHookEntry.inc:102
-#: admin/fai/class_faiScript.inc:349 admin/fai/class_faiScript.inc:374
-#: admin/fai/class_faiTemplate.inc:320 admin/fai/class_faiHook.inc:346
-msgid "Download"
-msgstr ""
-
-#: admin/fai/class_faiScriptEntry.inc:147
-#: admin/fai/class_faiScriptEntry.inc:151
-#: admin/fai/class_faiScriptEntry.inc:154
-#: admin/fai/class_faiScriptEntry.inc:197
-#: admin/fai/class_faiManagement.inc:768 admin/fai/class_faiManagement.inc:774
-#: admin/fai/class_faiPackage.inc:685
-#: admin/fai/class_faiPartitionTable.inc:779
-#: admin/fai/class_faiDiskEntry.inc:702 admin/fai/class_faiDiskEntry.inc:705
-#: admin/fai/class_faiDiskEntry.inc:758
-#: admin/fai/class_faiTemplateEntry.inc:247
-#: admin/fai/class_faiTemplateEntry.inc:312
-#: admin/fai/class_faiPartitionTableEntry.inc:353
-#: admin/fai/class_faiPartitionTableEntry.inc:356
-#: admin/fai/class_faiPartitionTableEntry.inc:360
-#: admin/fai/class_faiPartitionTableEntry.inc:455
-#: admin/fai/packageSelect/selectPackage-list.xml:40
-#: admin/fai/class_faiProfile.inc:414 admin/fai/class_faiProfile.inc:463
-#: admin/fai/class_faiHookEntry.inc:157 admin/fai/class_faiHookEntry.inc:162
-#: admin/fai/class_faiHookEntry.inc:165 admin/fai/class_faiHookEntry.inc:207
-#: admin/fai/class_askClassName.inc:163 admin/fai/class_askClassName.inc:167
-#: admin/fai/class_askClassName.inc:171 admin/fai/class_askClassName.inc:198
-#: admin/fai/class_faiScript.inc:347 admin/fai/class_faiScript.inc:605
-#: admin/fai/classSelect/selectClass-list.xml:28
-#: admin/fai/class_faiTemplate.inc:512
-#: admin/fai/class_faiVariableEntry.inc:103
-#: admin/fai/class_faiVariableEntry.inc:112
-#: admin/fai/class_faiVariableEntry.inc:115
-#: admin/fai/class_faiVariableEntry.inc:149 admin/fai/class_faiHook.inc:531
-#: admin/fai/class_faiVariable.inc:398 admin/fai/fai-list.xml:80
-#: admin/fai/faiPartitionTableEntry.tpl.c:8 admin/fai/faiPartition.tpl.c:5
-#: admin/fai/faiVariableEntry.tpl.c:8 admin/fai/faiDiskEntry.tpl.c:8
-#: admin/fai/faiTemplate.tpl.c:8 admin/fai/faiVariable.tpl.c:8
-#: admin/fai/faiHook.tpl.c:8
-#: admin/fai/packageSelect/selectPackage-filter.tpl.c:8
-#: admin/fai/faiPackage.tpl.c:8 admin/fai/faiScriptEntry.tpl.c:8
-#: admin/fai/classSelect/selectClass-filter.tpl.c:5
-#: admin/fai/fai-filter.tpl.c:50 admin/fai/faiPartitionTable.tpl.c:8
-#: admin/fai/faiScript.tpl.c:8 admin/fai/faiProfile.tpl.c:8
-#: admin/fai/faiHookEntry.tpl.c:8
-msgid "Name"
-msgstr ""
-
-#: admin/fai/class_faiScriptEntry.inc:159 admin/fai/class_faiHookEntry.inc:170
-#: admin/fai/class_faiScript.inc:594 admin/fai/fai-list.xml:122
-#: admin/fai/faiScriptEntry.tpl.c:29 admin/fai/faiHookEntry.tpl.c:29
-msgid "Script"
-msgstr ""
-
-#: admin/fai/class_faiScriptEntry.inc:190
-#: admin/fai/class_faiScriptEntry.inc:199
-msgid "Script entry"
-msgstr ""
-
-#: admin/fai/class_faiScriptEntry.inc:191
-msgid "FAI script entry"
-msgstr ""
-
-#: admin/fai/class_faiScriptEntry.inc:198 admin/fai/class_faiPackage.inc:686
-#: admin/fai/class_faiPartitionTable.inc:780
-#: admin/fai/class_faiDiskEntry.inc:759
-#: admin/fai/class_faiTemplateEntry.inc:313
-#: admin/fai/class_faiPartitionTableEntry.inc:456
-#: admin/fai/class_faiProfile.inc:464 admin/fai/class_faiHookEntry.inc:208
-#: admin/fai/class_faiScript.inc:606 admin/fai/class_faiTemplate.inc:513
-#: admin/fai/class_faiVariableEntry.inc:150 admin/fai/class_faiHook.inc:532
-#: admin/fai/class_faiVariable.inc:399
-#: admin/fai/faiPartitionTableEntry.tpl.c:11 admin/fai/faiPartition.tpl.c:11
-#: admin/fai/faiVariableEntry.tpl.c:11 admin/fai/faiDiskEntry.tpl.c:14
-#: admin/fai/faiTemplate.tpl.c:11 admin/fai/faiVariable.tpl.c:11
-#: admin/fai/faiHook.tpl.c:11 admin/fai/faiPackage.tpl.c:11
-#: admin/fai/faiTemplateEntry.tpl.c:14 admin/fai/faiScriptEntry.tpl.c:11
-#: admin/fai/faiPartitionTable.tpl.c:11 admin/fai/faiScript.tpl.c:11
-#: admin/fai/faiProfile.tpl.c:11 admin/fai/faiHookEntry.tpl.c:11
-msgid "Description"
-msgstr ""
-
-#: admin/fai/class_faiScriptEntry.inc:200
-msgid "Script Priority"
-msgstr ""
-
-#: admin/fai/class_faiManagement.inc:188
-msgid "partition table"
-msgstr ""
-
-#: admin/fai/class_faiManagement.inc:189 admin/fai/fai-list.xml:31
-msgid "script"
-msgstr ""
-
-#: admin/fai/class_faiManagement.inc:190 admin/fai/fai-list.xml:47
-msgid "hook"
-msgstr ""
-
-#: admin/fai/class_faiManagement.inc:191 admin/fai/fai-list.xml:39
-msgid "variable"
-msgstr ""
-
-#: admin/fai/class_faiManagement.inc:192 admin/fai/fai-list.xml:63
-msgid "template"
-msgstr ""
-
-#: admin/fai/class_faiManagement.inc:193
-msgid "package list"
-msgstr ""
-
-#: admin/fai/class_faiManagement.inc:210 admin/fai/class_faiManagement.inc:226
-#: admin/fai/class_faiManagement.inc:332 admin/fai/class_faiManagement.inc:390
-#: admin/fai/class_faiManagement.inc:480 admin/fai/class_faiManagement.inc:575
-#: admin/fai/class_faiManagement.inc:598 admin/fai/class_faiManagement.inc:619
-msgid "Permission error"
-msgstr ""
-
-#: admin/fai/class_faiManagement.inc:211 admin/fai/class_faiManagement.inc:226
-#, php-format
-msgid "You have no permission to create a new %s!"
-msgstr ""
-
-#: admin/fai/class_faiManagement.inc:226 admin/fai/fai-list.xml:55
-msgid "profile"
-msgstr ""
-
-#: admin/fai/class_faiManagement.inc:328
-msgid "Branch locked"
-msgstr ""
-
-#: admin/fai/class_faiManagement.inc:329
-#, php-format
-msgid "The following entries are locked, you can't remove them %s."
-msgstr ""
-
-#: admin/fai/class_faiManagement.inc:346
-msgid "FAI object"
-msgstr ""
-
-#: admin/fai/class_faiManagement.inc:477
-msgid "FAI branch/freeze"
-msgstr ""
-
-#: admin/fai/class_faiManagement.inc:480
-msgid "You have no permission to delete this release!"
-msgstr ""
-
-#: admin/fai/class_faiManagement.inc:496 admin/fai/remove.tpl.c:2
-#: admin/fai/remove_branch.tpl.c:2
-msgid "Warning"
-msgstr ""
-
-#: admin/fai/class_faiManagement.inc:496
-msgid "Release remove aborted because the release name check failed!"
-msgstr ""
-
-#: admin/fai/class_faiManagement.inc:573 admin/fai/class_faiManagement.inc:596
-msgid "Configuration"
-msgstr ""
-
-#: admin/fai/class_faiManagement.inc:575 admin/fai/class_faiManagement.inc:598
-#: admin/fai/class_faiManagement.inc:619
-msgid "Branch"
-msgstr ""
-
-#: admin/fai/class_faiManagement.inc:725 admin/fai/askClassName.tpl.c:23
-msgid "Continue"
-msgstr ""
-
-#: admin/fai/class_faiManagement.inc:926
-#: admin/fai/class_faiPartitionTable.inc:768
-#: admin/fai/class_faiProfile.inc:318 admin/fai/class_askClassName.inc:99
-#: admin/fai/classSelect/class_classSelect.inc:58
-#: admin/fai/class_faiGroupHandle.inc:120
-#: admin/fai/class_faiProfileEntry.inc:163 admin/fai/fai-list.xml:146
-msgid "Partition table"
+#: admin/fai/class_faiManagement.inc:117 admin/fai/class_faiManagement.inc:122
+#: admin/fai/packageSelect/selectPackage-list.xml:14
+#: admin/systems/class_faiStartup.inc:178 config/fai/class_faiConfig.inc:41
+msgid "FAI"
 msgstr ""
 
-#: admin/fai/class_faiManagement.inc:928
-#: admin/fai/class_faiGroupHandle.inc:122 admin/fai/fai-list.xml:140
-msgid "Package list"
+#: admin/fai/class_faiManagement.inc:118
+msgid "Manage FAI software packages and deployment recipes"
 msgstr ""
 
-#: admin/fai/class_faiManagement.inc:930
-#: admin/fai/class_faiGroupHandle.inc:124
-msgid "Scripts"
+#: admin/fai/class_faiPackage.inc:157
+msgid "Mark for installation"
 msgstr ""
 
-#: admin/fai/class_faiManagement.inc:932
-#: admin/fai/class_faiGroupHandle.inc:126
-msgid "Variables"
+#: admin/fai/class_faiPackage.inc:161
+msgid "Mark for removal"
 msgstr ""
 
-#: admin/fai/class_faiManagement.inc:934
-#: admin/fai/class_faiGroupHandle.inc:128
-msgid "Hooks"
+#: admin/fai/class_faiPackage.inc:166
+msgid "Edit configuration"
 msgstr ""
 
-#: admin/fai/class_faiManagement.inc:936 admin/fai/class_faiProfile.inc:454
-#: admin/fai/class_askClassName.inc:104 admin/fai/class_faiGroupHandle.inc:130
-#: admin/fai/fai-list.xml:110
-msgid "Profile"
+#: admin/fai/class_faiPackage.inc:247
+#: admin/fai/class_faiPartitionTable.inc:209
+#: admin/fai/class_faiPartitionTable.inc:250
+#: admin/fai/class_faiTemplate.inc:114
+#: admin/systems/services/repository/class_serviceDebianRepository.inc:172
+#: admin/systems/services/repository/class_serviceDebianRepository.inc:189
+#: admin/systems/services/repository/class_serviceDebianRepository.inc:193
+msgid "LDAP error"
 msgstr ""
 
-#: admin/fai/class_faiManagement.inc:938
-#: admin/fai/class_faiGroupHandle.inc:132
-msgid "Templates"
+#: admin/fai/class_faiPackage.inc:279
+#: admin/fai/packageSelect/class_filterFAIPackages.inc:41
+#: admin/fai/packageSelect/class_filterFAIPackages.inc:46
+#: admin/fai/class_faiPackageConfiguration.inc:55
+#: admin/systems/class_faiStartup.inc:133
+#: admin/systems/class_faiStartup.inc:160
+msgid "Service infrastructure"
 msgstr ""
 
-#: admin/fai/class_faiManagement.inc:1039
-#: admin/fai/class_faiManagement.inc:1045
-#: admin/fai/packageSelect/selectPackage-list.xml:14
-#: admin/fai/classSelect/selectClass-list.xml:15
-#: admin/systems/class_faiStartup.inc:177 config/fai/class_faiConfig.inc:41
-msgid "FAI"
+#: admin/fai/class_faiPackage.inc:294
+msgid "Unkown packages"
 msgstr ""
 
-#: admin/fai/class_faiManagement.inc:1040
-msgid "Manage FAI software packages and deployment recipes"
+#: admin/fai/class_faiPackage.inc:365
+msgid "Package"
 msgstr ""
 
-#: admin/fai/class_faiPackage.inc:261
-msgid "Invalid package names"
+#: admin/fai/class_faiPackage.inc:366
+msgid "FAI Package list"
 msgstr ""
 
-#: admin/fai/class_faiPackage.inc:262
-#, php-format
-msgid "The following package names don't match the Debian policy: %s"
+#: admin/fai/class_faiPackage.inc:369
+msgid "FAI Package"
 msgstr ""
 
-#: admin/fai/class_faiPackage.inc:421 admin/fai/class_faiPackage.inc:422
-msgid "Configured"
+#: admin/fai/class_faiPackage.inc:385
+#: admin/fai/class_faiPartitionTable.inc:304
+#: admin/fai/class_faiTemplateEntry.inc:140 admin/fai/class_faiProfile.inc:47
+#: admin/fai/class_faiScript.inc:50 admin/fai/class_faiTemplate.inc:173
+#: admin/fai/class_faiHook.inc:50 admin/fai/class_faiVariable.inc:50
+msgid "Properties"
 msgstr ""
 
-#: admin/fai/class_faiPackage.inc:428 admin/fai/class_faiPackage.inc:429
-msgid "Package marked for removal"
+#: admin/fai/class_faiPackage.inc:388
+#: admin/fai/class_faiPartitionTable.inc:307 admin/fai/class_faiProfile.inc:50
+#: admin/fai/class_faiScript.inc:53 admin/fai/class_faiTemplate.inc:176
+#: admin/fai/class_faiHook.inc:53 admin/fai/class_faiVariable.inc:53
+msgid "Class name"
 msgstr ""
 
-#: admin/fai/class_faiPackage.inc:445
-msgid "Mark package for removal"
+#: admin/fai/class_faiPackage.inc:388 admin/fai/class_faiScript.inc:53
+#: admin/fai/class_faiHook.inc:53 admin/fai/class_faiVariable.inc:53
+msgid "Variables class name"
 msgstr ""
 
-#: admin/fai/class_faiPackage.inc:451
-msgid "Configure this package"
+#: admin/fai/class_faiPackage.inc:392
+#: admin/fai/class_faiPartitionTable.inc:311
+#: admin/fai/class_faiDiskEntry.inc:738
+#: admin/fai/class_faiTemplateEntry.inc:147 admin/fai/class_faiProfile.inc:54
+#: admin/fai/class_faiScript.inc:57 admin/fai/class_faiScript.inc:75
+#: admin/fai/class_faiTemplate.inc:180 admin/fai/class_faiHook.inc:57
+#: admin/fai/class_faiHook.inc:75 admin/fai/class_faiVariable.inc:57
+#: admin/fai/class_faiVariable.inc:75
+msgid "Description"
 msgstr ""
 
-#: admin/fai/class_faiPackage.inc:455
-msgid "Remove this package"
+#: admin/fai/class_faiPackage.inc:392
+#: admin/fai/class_faiPartitionTable.inc:311 admin/fai/class_faiProfile.inc:54
+#: admin/fai/class_faiScript.inc:57 admin/fai/class_faiTemplate.inc:180
+#: admin/fai/class_faiHook.inc:57 admin/fai/class_faiVariable.inc:57
+msgid "Short description of the class"
 msgstr ""
 
-#: admin/fai/class_faiPackage.inc:534
-msgid "Please select a least one package!"
+#: admin/fai/class_faiPackage.inc:398 admin/systems/class_faiStartup.inc:90
+msgid "Repository"
 msgstr ""
 
-#: admin/fai/class_faiPackage.inc:538
-msgid ""
-"Please choose a valid release/section combination for your repository setup!"
+#: admin/fai/class_faiPackage.inc:401 admin/systems/class_faiStartup.inc:78
+#: admin/systems/services/repository/class_serviceDebianRepository.inc:52
+#: admin/systems/services/repository/class_serviceCentosRepository.inc:49
+msgid "Release"
 msgstr ""
 
-#: admin/fai/class_faiPackage.inc:571
-#: admin/fai/packageSelect/class_filterFAIPackages.inc:41
-#: admin/fai/packageSelect/class_filterFAIPackages.inc:46
-#: admin/fai/class_faiPackageConfiguration.inc:55
-#: admin/systems/class_faiStartup.inc:132
-#: admin/systems/class_faiStartup.inc:159
-msgid "Infrastructure service"
+#: admin/fai/class_faiPackage.inc:401
+msgid "Debian release concerned"
 msgstr ""
 
-#: admin/fai/class_faiPackage.inc:587
-msgid "Unkown packages"
+#: admin/fai/class_faiPackage.inc:405
+#: admin/systems/services/repository/class_serviceDebianRepository.inc:58
+msgid "Sections"
 msgstr ""
 
-#: admin/fai/class_faiPackage.inc:674
-#: admin/fai/faiPackageConfiguration.tpl.c:2
-msgid "Package"
+#: admin/fai/class_faiPackage.inc:405
+msgid "Sections concerned"
 msgstr ""
 
-#: admin/fai/class_faiPackage.inc:675
-msgid "FAI Package list"
+#: admin/fai/class_faiPackage.inc:409
+msgid "Install method"
 msgstr ""
 
-#: admin/fai/class_faiPackage.inc:679
-msgid "FAI Package"
+#: admin/fai/class_faiPackage.inc:409
+msgid "Install method to use for this package list"
 msgstr ""
 
-#: admin/fai/class_faiPackage.inc:687
+#: admin/fai/class_faiPackage.inc:420
 msgid "Packages"
 msgstr ""
 
-#: admin/fai/class_faiPackage.inc:688 admin/fai/faiPackage.tpl.c:23
-msgid "Section"
-msgstr ""
-
-#: admin/fai/class_faiPackage.inc:688 admin/fai/class_faiPackage.inc:691
-#: admin/fai/class_faiScript.inc:605 admin/fai/class_faiTemplate.inc:512
-msgid "Readonly"
+#: admin/fai/class_faiPackage.inc:424
+msgid "Packages in this class"
 msgstr ""
 
-#: admin/fai/class_faiPackage.inc:689
-msgid "Install Method"
+#: admin/fai/class_faiPartitionTable.inc:61
+#: admin/fai/class_faiDiskEntry.inc:442 admin/systems/class_faiLogView.inc:207
+#: admin/systems/class_faiLogView.inc:242
+msgid "Error"
 msgstr ""
 
-#: admin/fai/class_faiPackage.inc:690
-msgid "Package configuration"
+#: admin/fai/class_faiPartitionTable.inc:112
+msgid "Add RAID"
 msgstr ""
 
-#: admin/fai/class_faiPackage.inc:691 admin/systems/class_faiStartup.inc:78
-#: admin/systems/services/repository/class_serviceRepository.inc:40
-#: admin/fai/branch_selector.tpl.c:14 admin/fai/faiPackage.tpl.c:20
-#: admin/fai/fai-filter.tpl.c:5 admin/fai/fai-filter.tpl.c:14
-msgid "Release"
+#: admin/fai/class_faiPartitionTable.inc:116
+msgid "Add LVM"
 msgstr ""
 
-#: admin/fai/class_faiPartitionTable.inc:269
-#: admin/fai/class_faiDiskEntry.inc:446
-#, php-format
-msgid ""
-"The disk cannot be deleted while it is used in the '%s' disk definition!"
+#: admin/fai/class_faiPartitionTable.inc:284
+msgid "Partition table"
 msgstr ""
 
-#: admin/fai/class_faiPartitionTable.inc:416 admin/fai/class_faiScript.inc:360
-#: admin/fai/class_faiScript.inc:362 admin/fai/class_faiTemplate.inc:306
-#: admin/fai/class_faiTemplate.inc:308
-msgid "edit"
+#: admin/fai/class_faiPartitionTable.inc:285
+#: admin/fai/class_faiPartitionTable.inc:288
+msgid "FAI partition table"
 msgstr ""
 
-#: admin/fai/class_faiPartitionTable.inc:418 admin/fai/class_faiScript.inc:364
-#: admin/fai/class_faiTemplate.inc:310
-msgid "delete"
+#: admin/fai/class_faiPartitionTable.inc:307 admin/fai/class_faiProfile.inc:50
+msgid "Partition table class name"
 msgstr ""
 
-#: admin/fai/class_faiPartitionTable.inc:769
-#: admin/fai/class_faiPartitionTable.inc:773
-msgid "FAI partition table"
+#: admin/fai/class_faiPartitionTable.inc:317
+msgid "Discs"
 msgstr ""
 
-#: admin/fai/class_faiPartitionTable.inc:779 admin/fai/class_faiHook.inc:531
-#: admin/fai/class_faiVariable.inc:398
-msgid "Read only"
+#: admin/fai/class_faiPartitionTable.inc:324
+msgid "Partitions in this class"
 msgstr ""
 
 #: admin/fai/class_faiDiskEntry.inc:273
-#: admin/fai/faiPartitionTableEntry.tpl.c:5 admin/fai/faiDiskEntry.tpl.c:5
 msgid "Device"
 msgstr ""
 
@@ -389,103 +198,103 @@ msgstr ""
 msgid "UUID"
 msgstr ""
 
-#: admin/fai/class_faiDiskEntry.inc:345
+#: admin/fai/class_faiDiskEntry.inc:344
 msgid "Disks"
 msgstr ""
 
-#: admin/fai/class_faiDiskEntry.inc:348 admin/fai/class_faiPartition.inc:321
-#: admin/fai/faiPartition.tpl.c:14
+#: admin/fai/class_faiDiskEntry.inc:347 admin/fai/class_faiPartition.inc:319
 msgid "Size"
 msgstr ""
 
-#: admin/fai/class_faiDiskEntry.inc:544
+#: admin/fai/class_faiDiskEntry.inc:443
+#, php-format
+msgid ""
+"The disk cannot be deleted while it is used in the '%s' disk definition!"
+msgstr ""
+
+#: admin/fai/class_faiDiskEntry.inc:536
 msgid "encrypted"
 msgstr ""
 
-#: admin/fai/class_faiDiskEntry.inc:547
+#: admin/fai/class_faiDiskEntry.inc:539
 msgid "bootable"
 msgstr ""
 
-#: admin/fai/class_faiDiskEntry.inc:550
+#: admin/fai/class_faiDiskEntry.inc:542
 msgid "preserve"
 msgstr ""
 
-#: admin/fai/class_faiDiskEntry.inc:735
+#: admin/fai/class_faiDiskEntry.inc:687 admin/fai/class_faiDiskEntry.inc:690
+#: admin/fai/class_faiDiskEntry.inc:737
+#: admin/fai/packageSelect/selectPackage-list.xml:40
+#: admin/fai/class_faiScript.inc:71 admin/fai/class_faiHook.inc:71
+#: admin/fai/class_faiVariable.inc:71
+#: admin/fai/class_faiSimplePluginClass.inc:50
+msgid "Name"
+msgstr ""
+
+#: admin/fai/class_faiDiskEntry.inc:717
 msgid ""
 "You have more than four primary partition table entries in your "
 "configuration, please check your configuration twice."
 msgstr ""
 
-#: admin/fai/class_faiDiskEntry.inc:739
+#: admin/fai/class_faiDiskEntry.inc:721
 msgid ""
 "You cannot have more than three primary partition while using logical "
 "partitions, please check your configuration twice."
 msgstr ""
 
-#: admin/fai/class_faiDiskEntry.inc:752
-#: admin/fai/class_faiPartitionTableEntry.inc:448
+#: admin/fai/class_faiDiskEntry.inc:733
 msgid "Partition table entry"
 msgstr ""
 
-#: admin/fai/class_faiDiskEntry.inc:753
-#: admin/fai/class_faiPartitionTableEntry.inc:449
+#: admin/fai/class_faiDiskEntry.inc:734
 msgid "FAI partition table entry"
 msgstr ""
 
-#: admin/fai/class_faiDiskEntry.inc:760
+#: admin/fai/class_faiDiskEntry.inc:739
 msgid "Disk options"
 msgstr ""
 
-#: admin/fai/class_faiDiskEntry.inc:761
-#: admin/fai/class_faiPartitionTableEntry.inc:457
+#: admin/fai/class_faiDiskEntry.inc:740
 msgid "Partition type"
 msgstr ""
 
-#: admin/fai/class_faiDiskEntry.inc:762
-#: admin/fai/class_faiPartitionTableEntry.inc:458
+#: admin/fai/class_faiDiskEntry.inc:741
 msgid "Partition no."
 msgstr ""
 
-#: admin/fai/class_faiDiskEntry.inc:763
-#: admin/fai/class_faiPartitionTableEntry.inc:459
+#: admin/fai/class_faiDiskEntry.inc:742
 msgid "File system type"
 msgstr ""
 
-#: admin/fai/class_faiDiskEntry.inc:764
-#: admin/fai/class_faiPartitionTableEntry.inc:171
-#: admin/fai/class_faiPartitionTableEntry.inc:460
-#: admin/fai/class_faiPartition.inc:437 admin/fai/faiPartition.tpl.c:47
+#: admin/fai/class_faiDiskEntry.inc:743 admin/fai/class_faiPartition.inc:432
 msgid "Mount point"
 msgstr ""
 
-#: admin/fai/class_faiDiskEntry.inc:765
-#: admin/fai/class_faiPartitionTableEntry.inc:461
-#: admin/fai/class_faiPartition.inc:402 admin/fai/class_faiPartition.inc:407
+#: admin/fai/class_faiDiskEntry.inc:744 admin/fai/class_faiPartition.inc:397
+#: admin/fai/class_faiPartition.inc:402
 msgid "Partition size"
 msgstr ""
 
-#: admin/fai/class_faiDiskEntry.inc:766
-#: admin/fai/class_faiPartitionTableEntry.inc:173
-#: admin/fai/class_faiPartitionTableEntry.inc:462
-#: admin/fai/faiPartition.tpl.c:50
+#: admin/fai/class_faiDiskEntry.inc:745
 msgid "Mount options"
 msgstr ""
 
-#: admin/fai/class_faiDiskEntry.inc:767
-#: admin/fai/class_faiPartitionTableEntry.inc:463
+#: admin/fai/class_faiDiskEntry.inc:746
 msgid "File system options"
 msgstr ""
 
-#: admin/fai/class_faiDiskEntry.inc:768
-#: admin/fai/class_faiPartitionTableEntry.inc:464
+#: admin/fai/class_faiDiskEntry.inc:747
 msgid "Partition flags"
 msgstr ""
 
-#: admin/fai/class_debconfTemplate.inc:227
+#: admin/fai/class_debconfTemplate.inc:225
 msgid "This package has no debconf options."
 msgstr ""
 
-#: admin/fai/class_debconfTemplate.inc:264
+#: admin/fai/class_debconfTemplate.inc:262
 msgid ""
 "This debconf question is dynamically generated during package installation "
 "and requires choosing between specific options which cannot be presented "
@@ -493,217 +302,59 @@ msgid ""
 " effect."
 msgstr ""
 
-#: admin/fai/class_faiTemplateEntry.inc:139
-msgid "no file uploaded yet"
-msgstr ""
-
-#: admin/fai/class_faiTemplateEntry.inc:142
-#, php-format
-msgid "exists in database (size: %s bytes)"
-msgstr ""
-
-#: admin/fai/class_faiTemplateEntry.inc:251
-#: admin/systems/class_faiLogView.inc:70 admin/fai/faiTemplateEntry.tpl.c:23
-msgid "File"
-msgstr ""
-
-#: admin/fai/class_faiTemplateEntry.inc:255
-#: admin/fai/faiTemplateEntry.tpl.c:11
-msgid "Destination path"
+#: admin/fai/class_faiTemplateEntry.inc:143
+msgid "File path"
 msgstr ""
 
-#: admin/fai/class_faiTemplateEntry.inc:260 admin/fai/faiTemplateEntry.tpl.c:8
-msgid "File name"
+#: admin/fai/class_faiTemplateEntry.inc:143
+msgid "Complete absolute template file path and name"
 msgstr ""
 
-#: admin/fai/class_faiTemplateEntry.inc:264
-#: admin/fai/class_faiTemplateEntry.inc:266
-#: admin/fai/faiTemplateEntry.tpl.c:68
-msgid "User"
+#: admin/fai/class_faiTemplateEntry.inc:147
+msgid "Short description of the file"
 msgstr ""
 
-#: admin/fai/class_faiTemplateEntry.inc:270
-#: admin/fai/class_faiTemplateEntry.inc:273
-#: admin/fai/class_faiTemplateEntry.inc:275
-#: admin/fai/faiTemplateEntry.tpl.c:47 admin/fai/faiTemplateEntry.tpl.c:74
-msgid "Group"
+#: admin/fai/class_faiTemplateEntry.inc:156
+msgid "Template attributes"
 msgstr ""
 
-#: admin/fai/class_faiTemplateEntry.inc:305
-msgid "Template entry"
+#: admin/fai/class_faiTemplateEntry.inc:160
+msgid "Template file content"
 msgstr ""
 
-#: admin/fai/class_faiTemplateEntry.inc:306
-msgid "FAI template entry"
+#: admin/fai/class_faiTemplateEntry.inc:160
+msgid "Content of the template file"
 msgstr ""
 
-#: admin/fai/class_faiTemplateEntry.inc:314
-msgid "Template file"
+#: admin/fai/class_faiTemplateEntry.inc:164
+msgid "Owner and group of the file"
 msgstr ""
 
-#: admin/fai/class_faiTemplateEntry.inc:315
-msgid "Template path"
+#: admin/fai/class_faiTemplateEntry.inc:167
+msgid "Owner"
 msgstr ""
 
-#: admin/fai/class_faiTemplateEntry.inc:316
+#: admin/fai/class_faiTemplateEntry.inc:167
 msgid "File owner"
 msgstr ""
 
-#: admin/fai/class_faiTemplateEntry.inc:317
-msgid "File permissions"
-msgstr ""
-
-#: admin/fai/class_FAI.inc:287 admin/fai/class_FAI.inc:679
-#: admin/fai/class_FAI.inc:1266 admin/fai/class_FAI.inc:1283
-#: admin/fai/class_FAI.inc:1287
-msgid "LDAP error"
-msgstr ""
-
-#: admin/fai/class_FAI.inc:570
-#, php-format
-msgid "Error, following objects should be equal '%s' and '%s'"
-msgstr ""
-
-#: admin/fai/class_FAI.inc:891
-#, php-format
-msgid "Creating group application release for %s"
-msgstr ""
-
-#: admin/fai/class_FAI.inc:960 admin/fai/class_FAI.inc:982
-#: admin/fai/class_FAI.inc:1022 admin/fai/class_FAI.inc:1027
-#: admin/fai/class_FAI.inc:1065
-msgid "Object"
-msgstr ""
-
-#: admin/fai/class_FAI.inc:961
-#, php-format
-msgid "Adding missing group application release container %s."
-msgstr ""
-
-#: admin/fai/class_FAI.inc:983
-#, php-format
-msgid "Adding group application release container %s."
-msgstr ""
-
-#: admin/fai/class_FAI.inc:1023
-#, php-format
-msgid "Could not create menu entry %s. (Already exists)."
-msgstr ""
-
-#: admin/fai/class_FAI.inc:1028
-#, php-format
-msgid "Created group application menu entry for %s."
-msgstr ""
-
-#: admin/fai/class_FAI.inc:1059
-#, php-format
-msgid "Creating copy of %s"
-msgstr ""
-
-#: admin/fai/class_FAI.inc:1062
-msgid "Processing"
-msgstr ""
-
-#: admin/fai/class_FAI.inc:1080
-msgid "Could not create new release, the destination dn is already in use."
-msgstr ""
-
-#: admin/fai/class_FAI.inc:1093
-msgid "Error while fetching source dn - aborted!"
-msgstr ""
-
-#: admin/fai/class_FAI.inc:1174
-msgid "Fatal error"
-msgstr ""
-
-#: admin/fai/class_FAI.inc:1175
-#, php-format
-msgid ""
-"Release creation failed due to ldap errors. Additional informations '%s'."
-msgstr ""
-
-#: admin/fai/class_faiPartitionTableEntry.inc:162
-msgid "primary"
-msgstr ""
-
-#: admin/fai/class_faiPartitionTableEntry.inc:162
-msgid "logical"
-msgstr ""
-
-#: admin/fai/class_faiPartitionTableEntry.inc:169
-#: admin/fai/faiPartition.tpl.c:8
-msgid "Type"
-msgstr ""
-
-#: admin/fai/class_faiPartitionTableEntry.inc:170
-msgid "FS type"
-msgstr ""
-
-#: admin/fai/class_faiPartitionTableEntry.inc:172
-msgid "Size in MB"
-msgstr ""
-
-#: admin/fai/class_faiPartitionTableEntry.inc:174
-msgid "FS option"
-msgstr ""
-
-#: admin/fai/class_faiPartitionTableEntry.inc:175
-#: admin/fai/faiPartition.tpl.c:23
-msgid "Preserve"
-msgstr ""
-
-#: admin/fai/class_faiPartitionTableEntry.inc:266
-msgid "False"
-msgstr ""
-
-#: admin/fai/class_faiPartitionTableEntry.inc:268
-msgid "True"
-msgstr ""
-
-#: admin/fai/class_faiPartitionTableEntry.inc:272
-#: admin/fai/class_faiPartitionTableEntry.inc:274 admin/fai/fai-list.xml:159
-#: admin/fai/fai-list.xml:198
-msgid "Remove"
-msgstr ""
-
-#: admin/fai/class_faiPartitionTableEntry.inc:384
-#, php-format
-msgid "please enter a unique mount point for partition %s"
-msgstr ""
-
-#: admin/fai/class_faiPartitionTableEntry.inc:389
-#, php-format
-msgid "partition %s mount point"
-msgstr ""
-
-#: admin/fai/class_faiPartitionTableEntry.inc:394
-#, php-format
-msgid ""
-"File system type 'swap' is already used, change file system type for "
-"partition %s."
+#: admin/fai/class_faiTemplateEntry.inc:172
+msgid "Group"
 msgstr ""
 
-#: admin/fai/class_faiPartitionTableEntry.inc:398
-msgid "Please use 'swap' as mount point, if 'swap' is used as fs-type."
+#: admin/fai/class_faiTemplateEntry.inc:172
+msgid "File group"
 msgstr ""
 
-#: admin/fai/class_faiPartitionTableEntry.inc:404
-#: admin/fai/class_faiPartitionTableEntry.inc:408
-#: admin/fai/class_faiPartitionTableEntry.inc:414
-#: admin/fai/class_faiPartitionTableEntry.inc:416
-#: admin/fai/class_faiPartitionTableEntry.inc:421
-#, php-format
-msgid "partition %s size"
+#: admin/fai/class_faiTemplateEntry.inc:181
+msgid "Access"
 msgstr ""
 
-#: admin/fai/class_faiPartitionTableEntry.inc:436
-msgid ""
-"You have more than 3 primary partition table entries in your configuration, "
-"please check your configuration twice."
+#: admin/fai/class_faiTemplateEntry.inc:181
+msgid "Access rights"
 msgstr ""
 
 #: admin/fai/packageSelect/selectPackage-list.xml:10
-#: admin/fai/classSelect/selectClass-list.xml:11
 msgid "Please select the desired entries"
 msgstr ""
 
@@ -711,147 +362,94 @@ msgstr ""
 msgid "Version"
 msgstr ""
 
-#: admin/fai/class_faiProfile.inc:310
-msgid "This list displays all assigned class names for this profile."
-msgstr ""
-
-#: admin/fai/class_faiProfile.inc:313 admin/fai/class_askClassName.inc:103
-#: admin/fai/classSelect/class_classSelect.inc:53
-#: admin/fai/class_faiProfileEntry.inc:158
-msgid "Hook bundle"
-msgstr ""
-
-#: admin/fai/class_faiProfile.inc:314 admin/fai/class_askClassName.inc:105
-#: admin/fai/classSelect/class_classSelect.inc:54
-#: admin/fai/class_faiProfileEntry.inc:159
-msgid "Template bundle"
-msgstr ""
-
-#: admin/fai/class_faiProfile.inc:315 admin/fai/class_askClassName.inc:101
-#: admin/fai/classSelect/class_classSelect.inc:55
-#: admin/fai/class_faiProfileEntry.inc:160
-msgid "Script bundle"
-msgstr ""
-
-#: admin/fai/class_faiProfile.inc:316 admin/fai/class_askClassName.inc:102
-#: admin/fai/classSelect/class_classSelect.inc:56
-#: admin/fai/class_faiProfileEntry.inc:161
-msgid "Variable bundle"
-msgstr ""
-
-#: admin/fai/class_faiProfile.inc:317 admin/fai/class_askClassName.inc:100
-#: admin/fai/classSelect/class_classSelect.inc:57
-#: admin/fai/class_faiProfileEntry.inc:162
-msgid "Package bundle"
-msgstr ""
-
-#: admin/fai/class_faiProfile.inc:321
-msgid "Remove class from profile"
-msgstr ""
-
-#: admin/fai/class_faiProfile.inc:324
-msgid "Up"
-msgstr ""
-
-#: admin/fai/class_faiProfile.inc:325
-msgid "Down"
-msgstr ""
-
-#: admin/fai/class_faiProfile.inc:410
-msgid "No class specified for this profile!"
-msgstr ""
-
-#: admin/fai/class_faiProfile.inc:419
-msgid "You can't use the same name for a class and a profile!"
+#: admin/fai/class_faiProfile.inc:28
+msgid "Profile"
 msgstr ""
 
-#: admin/fai/class_faiProfile.inc:455
+#: admin/fai/class_faiProfile.inc:29
 msgid "FAI profile"
 msgstr ""
 
-#: admin/fai/class_faiProfile.inc:458
+#: admin/fai/class_faiProfile.inc:32
 msgid "FAI Profile"
 msgstr ""
 
-#: admin/fai/class_faiProfile.inc:465 admin/fai/faiProfile.tpl.c:17
+#: admin/fai/class_faiProfile.inc:61
 msgid "FAI classes"
 msgstr ""
 
-#: admin/fai/class_faiHookEntry.inc:200
-msgid "Hook entry"
+#: admin/fai/class_faiProfile.inc:61
+msgid "FAI classes which are part of this profile"
 msgstr ""
 
-#: admin/fai/class_faiHookEntry.inc:201
-msgid "FAI hook entry"
+#: admin/fai/class_faiPackageConfiguration.inc:88
+#, php-format
+msgid "Debconf information for package '%s'"
 msgstr ""
 
-#: admin/fai/class_faiHookEntry.inc:209 admin/fai/faiHookEntry.tpl.c:20
-msgid "Task"
+#: admin/fai/class_faiScript.inc:30 admin/fai/class_faiScript.inc:84
+#: admin/fai/class_faiHook.inc:87
+msgid "Script"
 msgstr ""
 
-#: admin/fai/class_faiHookEntry.inc:210 admin/fai/class_faiScript.inc:595
-#: admin/fai/class_faiScript.inc:599
+#: admin/fai/class_faiScript.inc:31 admin/fai/class_faiScript.inc:34
 msgid "FAI script"
 msgstr ""
 
-#: admin/fai/class_faiPackageConfiguration.inc:88
-#, php-format
-msgid "Debconf information for package '%s'"
+#: admin/fai/class_faiScript.inc:63
+msgid "Scripts"
 msgstr ""
 
-#: admin/fai/class_askClassName.inc:99 admin/fai/class_askClassName.inc:100
-#: admin/fai/class_askClassName.inc:101 admin/fai/class_askClassName.inc:102
-#: admin/fai/class_askClassName.inc:103 admin/fai/class_askClassName.inc:104
-#: admin/fai/class_askClassName.inc:105 admin/fai/class_askClassName.inc:106
-msgid "Create new FAI object"
+#: admin/fai/class_faiScript.inc:67 admin/fai/class_faiHook.inc:67
+#: admin/fai/class_faiVariable.inc:67
+msgid "Variables in this class"
 msgstr ""
 
-#: admin/fai/class_faiTemplateEdit.inc:80
-#, php-format
-msgid ""
-"The file encodig has changed from '%s' to '%s'. Do you really want to save?"
+#: admin/fai/class_faiScript.inc:71 admin/fai/class_faiHook.inc:71
+#: admin/fai/class_faiVariable.inc:71
+msgid "The name of the variable"
 msgstr ""
 
-#: admin/fai/class_faiScript.inc:333 admin/fai/class_faiScript.inc:335
-msgid "Sort direction"
+#: admin/fai/class_faiScript.inc:75 admin/fai/class_faiHook.inc:75
+#: admin/fai/class_faiVariable.inc:75
+msgid "A short description of the variable"
 msgstr ""
 
-#: admin/fai/class_faiScript.inc:348 admin/fai/faiScriptEntry.tpl.c:20
+#: admin/fai/class_faiScript.inc:79
 msgid "Priority"
 msgstr ""
 
-#: admin/fai/class_faiScript.inc:350
-msgid "Action"
+#: admin/fai/class_faiScript.inc:79
+msgid "Priority of this script (FIXME: less is done first?)"
 msgstr ""
 
-#: admin/fai/classSelect/selectClass-list.xml:36 admin/fai/fai-list.xml:88
-#: admin/fai/faiScriptEntry.tpl.c:14
-msgid "Properties"
+#: admin/fai/class_faiScript.inc:84
+msgid "The script itself"
 msgstr ""
 
-#: admin/fai/class_faiTemplate.inc:501 admin/fai/fai-list.xml:116
-msgid "Template"
+#: admin/fai/class_faiTemplate.inc:136
+#, php-format
+msgid "There are several files with the same path: %s"
 msgstr ""
 
-#: admin/fai/class_faiTemplate.inc:502 admin/fai/class_faiTemplate.inc:506
-msgid "FAI template"
+#: admin/fai/class_faiTemplate.inc:153
+msgid "Template"
 msgstr ""
 
-#: admin/fai/class_faiVariableEntry.inc:107
-msgid "Content"
+#: admin/fai/class_faiTemplate.inc:154 admin/fai/class_faiTemplate.inc:157
+msgid "FAI template"
 msgstr ""
 
-#: admin/fai/class_faiVariableEntry.inc:142
-msgid "Variable entry"
+#: admin/fai/class_faiTemplate.inc:176
+msgid "Template class name"
 msgstr ""
 
-#: admin/fai/class_faiVariableEntry.inc:143
-msgid "FAI variable entry "
+#: admin/fai/class_faiTemplate.inc:186
+msgid "Template files"
 msgstr ""
 
-#: admin/fai/class_faiVariableEntry.inc:151
-#: admin/fai/faiVariableEntry.tpl.c:20
-msgid "Variable content"
+#: admin/fai/class_faiTemplate.inc:190
+msgid "Template files in this class"
 msgstr ""
 
 #: admin/fai/class_faiPartition.inc:176 admin/fai/class_faiPartition.inc:180
@@ -950,94 +548,73 @@ msgstr ""
 msgid "btrfs"
 msgstr ""
 
-#: admin/fai/class_faiPartition.inc:224
-msgid "LVM/RAID"
-msgstr ""
-
-#: admin/fai/class_faiPartition.inc:327
+#: admin/fai/class_faiPartition.inc:325
 msgid "spare"
 msgstr ""
 
-#: admin/fai/class_faiPartition.inc:330
+#: admin/fai/class_faiPartition.inc:328
 msgid "missing"
 msgstr ""
 
-#: admin/fai/class_faiPartition.inc:333
+#: admin/fai/class_faiPartition.inc:331
 msgid "Options"
 msgstr ""
 
-#: admin/fai/class_faiPartition.inc:420
+#: admin/fai/class_faiPartition.inc:415
 msgid "Minimum partition size"
 msgstr ""
 
-#: admin/fai/class_faiPartition.inc:420
+#: admin/fai/class_faiPartition.inc:415
 msgid "Maximum partition size"
 msgstr ""
 
-#: admin/fai/class_faiPartition.inc:428
+#: admin/fai/class_faiPartition.inc:423
 msgid "Raid arrays must contain at least two partitions!"
 msgstr ""
 
-#: admin/fai/class_faiPartition.inc:430
+#: admin/fai/class_faiPartition.inc:425
 msgid ""
 "Raid 0 arrays can only be realized with a combination of two partitions!"
 msgstr ""
 
-#: admin/fai/class_faiHook.inc:332 admin/fai/class_faiHook.inc:334
-#: admin/fai/fai-list.xml:190 admin/fai/faiVariable.tpl.c:23
-#: admin/fai/faiVariable.tpl.c:26
-msgid "Edit"
-msgstr ""
-
-#: admin/fai/class_faiHook.inc:336
-msgid "Delete"
-msgstr ""
-
-#: admin/fai/class_faiHook.inc:521 admin/fai/fai-list.xml:128
+#: admin/fai/class_faiHook.inc:30
 msgid "Hook"
 msgstr ""
 
-#: admin/fai/class_faiHook.inc:522 admin/fai/class_faiHook.inc:526
+#: admin/fai/class_faiHook.inc:31 admin/fai/class_faiHook.inc:34
 msgid "FAI hook"
 msgstr ""
 
-#: admin/fai/class_faiVariable.inc:387 admin/fai/fai-list.xml:134
-msgid "Variable"
-msgstr ""
-
-#: admin/fai/class_faiVariable.inc:388 admin/fai/class_faiVariable.inc:392
-msgid "FAI variable"
+#: admin/fai/class_faiHook.inc:63
+msgid "Hooks"
 msgstr ""
 
-#: admin/fai/class_faiProfileEntry.inc:184 admin/fai/askClassName.tpl.c:11
-#: admin/fai/askClassName.tpl.c:17 admin/fai/paste_generic.tpl.c:5
-msgid "Class name"
+#: admin/fai/class_faiHook.inc:79
+msgid "Task"
 msgstr ""
 
-#: admin/fai/class_faiProfileEntry.inc:184 admin/fai/faiTemplate.tpl.c:14
-#: admin/fai/faiVariable.tpl.c:14 admin/fai/faiHook.tpl.c:14
-#: admin/fai/faiPartitionTable.tpl.c:17 admin/fai/faiScript.tpl.c:14
-msgid "Objects"
+#: admin/fai/class_faiHook.inc:87
+msgid "The script of this hook"
 msgstr ""
 
-#: admin/fai/fai-list.xml:11
-msgid "List of deployment classes and products"
+#: admin/fai/class_faiVariable.inc:30
+msgid "Variable"
 msgstr ""
 
-#: admin/fai/fai-list.xml:15
-msgid "partitionTable"
+#: admin/fai/class_faiVariable.inc:31 admin/fai/class_faiVariable.inc:34
+msgid "FAI variable"
 msgstr ""
 
-#: admin/fai/fai-list.xml:23
-msgid "packagelist"
+#: admin/fai/class_faiVariable.inc:63
+msgid "Variables"
 msgstr ""
 
-#: admin/fai/fai-list.xml:93
-msgid "Actions"
+#: admin/fai/class_faiVariable.inc:79
+msgid "Content"
 msgstr ""
 
-#: admin/fai/fai-list.xml:104
-msgid "Create"
+#: admin/fai/class_faiVariable.inc:79
+msgid "The content of the variable"
 msgstr ""
 
 #: admin/systems/class_faiLogView.inc:56
@@ -1048,6 +625,10 @@ msgstr ""
 msgid "Sort up"
 msgstr ""
 
+#: admin/systems/class_faiLogView.inc:70
+msgid "File"
+msgstr ""
+
 #: admin/systems/class_faiLogView.inc:71
 msgid "Date"
 msgstr ""
@@ -1082,7 +663,7 @@ msgstr ""
 msgid "Selected file: %s"
 msgstr ""
 
-#: admin/systems/class_faiStartup.inc:70 admin/fai/paste_generic.tpl.c:2
+#: admin/systems/class_faiStartup.inc:70
 msgid "FAI settings"
 msgstr ""
 
@@ -1102,11 +683,6 @@ msgstr ""
 msgid "FAI profil to be applied to this computer"
 msgstr ""
 
-#: admin/systems/class_faiStartup.inc:90 admin/fai/faiPackage.tpl.c:14
-#: admin/fai/faiPackage.tpl.c:17
-msgid "Repository"
-msgstr ""
-
 #: admin/systems/class_faiStartup.inc:90
 msgid "FAI Debian repository to be used for installation"
 msgstr ""
@@ -1131,85 +707,96 @@ msgstr ""
 msgid "Linux kernel parameters to be ran"
 msgstr ""
 
-#: admin/systems/class_faiStartup.inc:178
+#: admin/systems/class_faiStartup.inc:179
 msgid "Full automated installation"
 msgstr ""
 
-#: admin/systems/services/repository/class_serviceRepository.inc:31
+#: admin/systems/services/repository/class_serviceDebianRepository.inc:34
+#: admin/systems/services/repository/class_serviceCentosRepository.inc:31
+msgid "Repositories"
+msgstr ""
+
+#: admin/systems/services/repository/class_serviceDebianRepository.inc:39
+#: admin/systems/services/repository/class_serviceCentosRepository.inc:36
+msgid "Repositories this server hosts"
+msgstr ""
+
+#: admin/systems/services/repository/class_serviceDebianRepository.inc:43
+#: admin/systems/services/repository/class_serviceCentosRepository.inc:40
 msgid "URL"
 msgstr ""
 
-#: admin/systems/services/repository/class_serviceRepository.inc:31
+#: admin/systems/services/repository/class_serviceDebianRepository.inc:43
+#: admin/systems/services/repository/class_serviceCentosRepository.inc:40
 msgid "Repository url"
 msgstr ""
 
-#: admin/systems/services/repository/class_serviceRepository.inc:35
+#: admin/systems/services/repository/class_serviceDebianRepository.inc:47
+#: admin/systems/services/repository/class_serviceCentosRepository.inc:44
 msgid "Parent server"
 msgstr ""
 
-#: admin/systems/services/repository/class_serviceRepository.inc:35
+#: admin/systems/services/repository/class_serviceDebianRepository.inc:47
+#: admin/systems/services/repository/class_serviceCentosRepository.inc:44
 msgid "Parent repository server"
 msgstr ""
 
-#: admin/systems/services/repository/class_serviceRepository.inc:40
-msgid "Release used on this repository"
+#: admin/systems/services/repository/class_serviceDebianRepository.inc:52
+msgid "Debian release used on this repository"
 msgstr ""
 
-#: admin/systems/services/repository/class_serviceRepository.inc:47
-msgid "Sections"
-msgstr ""
-
-#: admin/systems/services/repository/class_serviceRepository.inc:47
-msgid "Sections available on this repository"
+#: admin/systems/services/repository/class_serviceDebianRepository.inc:58
+msgid "Debian sections available on this repository"
 msgstr ""
 
-#: admin/systems/services/repository/class_serviceRepository.inc:52
+#: admin/systems/services/repository/class_serviceDebianRepository.inc:63
+#: admin/systems/services/repository/class_serviceCentosRepository.inc:57
 msgid "Mirror mode"
 msgstr ""
 
-#: admin/systems/services/repository/class_serviceRepository.inc:52
+#: admin/systems/services/repository/class_serviceDebianRepository.inc:63
+#: admin/systems/services/repository/class_serviceCentosRepository.inc:57
 msgid ""
 "Is this mirror an installation repository? Is its release a custom one?"
 msgstr ""
 
-#: admin/systems/services/repository/class_serviceRepository.inc:57
+#: admin/systems/services/repository/class_serviceDebianRepository.inc:68
+#: admin/systems/services/repository/class_serviceCentosRepository.inc:62
 msgid "Local mirror"
 msgstr ""
 
-#: admin/systems/services/repository/class_serviceRepository.inc:57
+#: admin/systems/services/repository/class_serviceDebianRepository.inc:68
+#: admin/systems/services/repository/class_serviceCentosRepository.inc:62
 msgid "Is this mirror a local or a network mirror?"
 msgstr ""
 
-#: admin/systems/services/repository/class_serviceRepository.inc:66
+#: admin/systems/services/repository/class_serviceDebianRepository.inc:77
+#: admin/systems/services/repository/class_serviceCentosRepository.inc:71
 msgid "Architectures"
 msgstr ""
 
-#: admin/systems/services/repository/class_serviceRepository.inc:66
+#: admin/systems/services/repository/class_serviceDebianRepository.inc:77
+#: admin/systems/services/repository/class_serviceCentosRepository.inc:71
 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:140
-msgid "Repositories"
+#: admin/systems/services/repository/class_serviceDebianRepository.inc:99
+#: admin/systems/services/repository/class_serviceDebianRepository.inc:100
+msgid "Debian repository"
 msgstr ""
 
-#: admin/systems/services/repository/class_serviceRepository.inc:145
-msgid "Repositories this server hosts"
+#: admin/systems/services/repository/class_serviceDebianRepository.inc:100
+#: admin/systems/services/repository/class_serviceCentosRepository.inc:96
+msgid "Services"
 msgstr ""
 
-#: admin/systems/services/repository/class_serviceRepository.inc:160
-msgid "Package repository"
+#: admin/systems/services/repository/class_serviceCentosRepository.inc:49
+msgid "Centos release used on this repository"
 msgstr ""
 
-#: admin/systems/services/repository/class_serviceRepository.inc:161
-msgid "Package repository information"
+#: admin/systems/services/repository/class_serviceCentosRepository.inc:95
+#: admin/systems/services/repository/class_serviceCentosRepository.inc:96
+msgid "Centos repository"
 msgstr ""
 
 #: config/fai/class_faiConfig.inc:28
@@ -1241,476 +828,3 @@ msgstr ""
 #: config/fai/class_faiConfig.inc:60
 msgid "s"
 msgstr ""
-
-#: admin/fai/faiPartitionTableEntry.tpl.c:2 admin/fai/faiVariableEntry.tpl.c:2
-#: admin/fai/faiVariableEntry.tpl.c:5 admin/fai/faiDiskEntry.tpl.c:2
-#: admin/fai/faiTemplate.tpl.c:2 admin/fai/faiTemplate.tpl.c:5
-#: admin/fai/faiVariable.tpl.c:2 admin/fai/faiVariable.tpl.c:5
-#: admin/fai/faiHook.tpl.c:2 admin/fai/faiHook.tpl.c:5
-#: admin/fai/faiPackage.tpl.c:2 admin/fai/faiPackage.tpl.c:5
-#: admin/fai/faiTemplateEntry.tpl.c:2 admin/fai/faiTemplateEntry.tpl.c:5
-#: admin/fai/faiScriptEntry.tpl.c:2 admin/fai/faiScriptEntry.tpl.c:5
-#: admin/fai/faiPartitionTable.tpl.c:2 admin/fai/faiPartitionTable.tpl.c:5
-#: admin/fai/faiScript.tpl.c:2 admin/fai/faiScript.tpl.c:5
-#: admin/fai/faiProfile.tpl.c:2 admin/fai/faiProfile.tpl.c:5
-#: admin/fai/faiProfile.tpl.c:14 admin/fai/faiHookEntry.tpl.c:2
-#: admin/fai/faiHookEntry.tpl.c:5
-msgid "Generic"
-msgstr ""
-
-#: admin/fai/faiPartitionTableEntry.tpl.c:14
-#: admin/fai/faiPartitionTableEntry.tpl.c:17 admin/fai/faiDiskEntry.tpl.c:23
-#: admin/fai/faiDiskEntry.tpl.c:26
-msgid "Partition entries"
-msgstr ""
-
-#: admin/fai/faiPartitionTableEntry.tpl.c:20
-#: admin/fai/faiPartitionTableEntry.tpl.c:23 admin/fai/faiDiskEntry.tpl.c:29
-#: admin/fai/faiDiskEntry.tpl.c:32
-msgid "Add partition"
-msgstr ""
-
-#: admin/fai/branch_selector.tpl.c:2
-msgid "Releases"
-msgstr ""
-
-#: admin/fai/branch_selector.tpl.c:5
-msgid "Current release"
-msgstr ""
-
-#: admin/fai/branch_selector.tpl.c:8 admin/fai/branch_selector.tpl.c:17
-#: admin/fai/fai-filter.tpl.c:8 admin/fai/fai-filter.tpl.c:17
-msgid "Create release"
-msgstr ""
-
-#: admin/fai/branch_selector.tpl.c:11 admin/fai/branch_selector.tpl.c:23
-#: admin/fai/fai-filter.tpl.c:11 admin/fai/fai-filter.tpl.c:23
-msgid "Create read-only release"
-msgstr ""
-
-#: admin/fai/branch_selector.tpl.c:20 admin/fai/fai-filter.tpl.c:20
-msgid "Freeze"
-msgstr ""
-
-#: admin/fai/branch_selector.tpl.c:26 admin/fai/fai-filter.tpl.c:26
-msgid "Delete current release"
-msgstr ""
-
-#: admin/fai/faiPartition.tpl.c:2
-msgid "Partition"
-msgstr ""
-
-#: admin/fai/faiPartition.tpl.c:17
-msgid "Resize existing partition"
-msgstr ""
-
-#: admin/fai/faiPartition.tpl.c:20
-msgid "Bootable"
-msgstr ""
-
-#: admin/fai/faiPartition.tpl.c:26 admin/fai/faiDiskEntry.tpl.c:20
-msgid "Combined physical partitions"
-msgstr ""
-
-#: admin/fai/faiPartition.tpl.c:29
-msgid "Toggle missing"
-msgstr ""
-
-#: admin/fai/faiPartition.tpl.c:32
-msgid "Toggle spare"
-msgstr ""
-
-#: admin/fai/faiPartition.tpl.c:35
-msgid "Filesystem"
-msgstr ""
-
-#: admin/fai/faiPartition.tpl.c:38
-msgid "Filesystem create options"
-msgstr ""
-
-#: admin/fai/faiPartition.tpl.c:41
-msgid "Encrypted"
-msgstr ""
-
-#: admin/fai/faiPartition.tpl.c:44
-msgid "Tune options"
-msgstr ""
-
-#: admin/fai/faiNewBranch.tpl.c:2
-msgid ""
-"You are now going to create a branch or locked branch. This action clones "
-"the existing release to another release name. Branches can be modified as "
-"usual. FAI classes of locked branches cannot be modified, just additional "
-"classes are possible. Branch names should be alphanumeric, excluding the "
-"reserved names 'scripts', 'hooks', 'partitions', 'variables', 'templates' "
-"and 'fai'."
-msgstr ""
-
-#: admin/fai/faiNewBranch.tpl.c:5
-msgid ""
-"Branches are created as subreleases of the currently selected branch. "
-"Creating a new branch named 1.0.2 in SARGE for example, will result in a new"
-" release called SARGE/1.0.2."
-msgstr ""
-
-#: admin/fai/faiNewBranch.tpl.c:8
-msgid "Please enter a name for the branch"
-msgstr ""
-
-#: admin/fai/faiNewBranch.tpl.c:11
-msgid "Processing the requested operation"
-msgstr ""
-
-#: admin/fai/faiNewBranch.tpl.c:14
-msgid ""
-"As soon as the copy operation has finished, you can scroll down to end of "
-"the page and press the 'Continue' button to continue with the fai management"
-" dialog."
-msgstr ""
-
-#: admin/fai/faiNewBranch.tpl.c:17
-msgid ""
-"Your browser doesn't support iframes, please use this link to perform the "
-"requested operation."
-msgstr ""
-
-#: admin/fai/faiNewBranch.tpl.c:20
-msgid "Perform requested operation."
-msgstr ""
-
-#: admin/fai/faiNewBranch.tpl.c:23
-msgid "Initiate operation"
-msgstr ""
-
-#: admin/fai/faiVariableEntry.tpl.c:14 admin/fai/faiVariableEntry.tpl.c:17
-msgid "Variable attributes"
-msgstr ""
-
-#: admin/fai/faiDiskEntry.tpl.c:11
-msgid "fstab key"
-msgstr ""
-
-#: admin/fai/faiDiskEntry.tpl.c:17
-msgid "Disk label"
-msgstr ""
-
-#: admin/fai/faiTemplate.tpl.c:17
-msgid "List of template files"
-msgstr ""
-
-#: admin/fai/faiVariable.tpl.c:17
-msgid "List of assigned variables"
-msgstr ""
-
-#: admin/fai/faiVariable.tpl.c:20
-msgid "Choose a variable to delete or edit"
-msgstr ""
-
-#: admin/fai/askClassName.tpl.c:2
-msgid ""
-"Adding a new class to the FAI management, requires a class name. You have to"
-" specify a unique class name for unique types of FAI classes, while you can "
-"use the same class name for different types of FAI classes. In the laste "
-"case, FAI will automatically enclose all these different class types to one "
-"unique class name."
-msgstr ""
-
-#: admin/fai/askClassName.tpl.c:5
-msgid ""
-"Please use one of the following methods to choose the name for the new FAI "
-"class."
-msgstr ""
-
-#: admin/fai/askClassName.tpl.c:8
-msgid "Enter FAI class name manually"
-msgstr ""
-
-#: admin/fai/askClassName.tpl.c:14
-msgid "Choose FAI class name from a list of existing classes"
-msgstr ""
-
-#: admin/fai/askClassName.tpl.c:20
-msgid "Choose class name"
-msgstr ""
-
-#: admin/fai/faiGroupHandle.tpl.c:2
-msgid "Please select the objects you want to remove:"
-msgstr ""
-
-#: admin/fai/faiGroupHandle.tpl.c:5
-msgid "Freezed"
-msgstr ""
-
-#: admin/fai/faiGroupHandle.tpl.c:8
-msgid "Select the object you want to edit:"
-msgstr ""
-
-#: admin/fai/faiGroupHandle.tpl.c:11
-msgid "Select the object you want to copy:"
-msgstr ""
-
-#: admin/fai/remove.tpl.c:5
-msgid ""
-"This includes all account data, system access rules, imap settings, etc. for"
-" this user. Please double check if your really want to do this since there "
-"is no way for FusionDirectory to get your data back."
-msgstr ""
-
-#: admin/fai/remove.tpl.c:8 admin/fai/remove_branch.tpl.c:8
-msgid "So - if you're sure - press 'Delete' to continue or 'Cancel' to abort."
-msgstr ""
-
-#: admin/fai/faiHook.tpl.c:17
-msgid "List of hook scripts"
-msgstr ""
-
-#: admin/fai/packageSelect/selectPackage-list.tpl.c:2
-#: admin/fai/classSelect/selectClass-list.tpl.c:5
-msgid "Update"
-msgstr ""
-
-#: admin/fai/packageSelect/selectPackage-list.tpl.c:5
-#: admin/fai/classSelect/selectClass-list.tpl.c:8
-msgid "Submit"
-msgstr ""
-
-#: admin/fai/packageSelect/selectPackage-filter.tpl.c:2
-#: admin/fai/classSelect/selectClass-filter.tpl.c:2
-#: admin/fai/fai-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/remove_branch.tpl.c:5
-msgid ""
-"This includes all account data, system access, etc. for this branch. Please "
-"double check if your really want to do this since there is no way for "
-"FusionDirectory to get your data back."
-msgstr ""
-
-#: admin/fai/faiPackage.tpl.c:26
-msgid "Install method"
-msgstr ""
-
-#: admin/fai/faiPackage.tpl.c:29
-msgid "Please select the installation method"
-msgstr ""
-
-#: admin/fai/faiPackage.tpl.c:32 admin/fai/faiPackage.tpl.c:35
-msgid "Used packages"
-msgstr ""
-
-#: admin/fai/faiPackage.tpl.c:38
-msgid "Add from list"
-msgstr ""
-
-#: admin/fai/faiProfileEntry.tpl.c:2
-msgid "List of FAI objects (Fully Automatic Installation)"
-msgstr ""
-
-#: admin/fai/faiProfileEntry.tpl.c:5
-msgid "Information"
-msgstr ""
-
-#: admin/fai/faiProfileEntry.tpl.c:8
-msgid ""
-"This menu allows you to select FAI class names and to add them to the "
-"currently edited profile."
-msgstr ""
-
-#: admin/fai/faiProfileEntry.tpl.c:11
-msgid "Filters"
-msgstr ""
-
-#: admin/fai/faiProfileEntry.tpl.c:14
-msgid "Show only classes with templates"
-msgstr ""
-
-#: admin/fai/faiProfileEntry.tpl.c:17
-msgid "Show only classes with scripts"
-msgstr ""
-
-#: admin/fai/faiProfileEntry.tpl.c:20
-msgid "Show only classes with hooks"
-msgstr ""
-
-#: admin/fai/faiProfileEntry.tpl.c:23
-msgid "Show only classes with variables"
-msgstr ""
-
-#: admin/fai/faiProfileEntry.tpl.c:26
-msgid "Show only classes with packages"
-msgstr ""
-
-#: admin/fai/faiProfileEntry.tpl.c:29
-msgid "Show only classes with partitions"
-msgstr ""
-
-#: admin/fai/faiProfileEntry.tpl.c:32 admin/fai/faiProfileEntry.tpl.c:35
-msgid "Display objects matching"
-msgstr ""
-
-#: admin/fai/faiProfileEntry.tpl.c:38
-msgid "Regular expression for matching object names"
-msgstr ""
-
-#: admin/fai/faiTemplateEntry.tpl.c:17 admin/fai/faiTemplateEntry.tpl.c:20
-msgid "Template attributes"
-msgstr ""
-
-#: admin/fai/faiTemplateEntry.tpl.c:26 admin/fai/faiTemplateEntry.tpl.c:29
-msgid "Save template"
-msgstr ""
-
-#: admin/fai/faiTemplateEntry.tpl.c:32 admin/fai/faiTemplateEntry.tpl.c:35
-msgid "Edit template"
-msgstr ""
-
-#: admin/fai/faiTemplateEntry.tpl.c:38
-msgid "Full path"
-msgstr ""
-
-#: admin/fai/faiTemplateEntry.tpl.c:41
-msgid "Upload"
-msgstr ""
-
-#: admin/fai/faiTemplateEntry.tpl.c:44
-msgid "Owner"
-msgstr ""
-
-#: admin/fai/faiTemplateEntry.tpl.c:50
-msgid "Access"
-msgstr ""
-
-#: admin/fai/faiTemplateEntry.tpl.c:53
-msgid "Class"
-msgstr ""
-
-#: admin/fai/faiTemplateEntry.tpl.c:56
-msgid "Read"
-msgstr ""
-
-#: admin/fai/faiTemplateEntry.tpl.c:59
-msgid "Write"
-msgstr ""
-
-#: admin/fai/faiTemplateEntry.tpl.c:62
-msgid "Execute"
-msgstr ""
-
-#: admin/fai/faiTemplateEntry.tpl.c:65
-msgid "Special"
-msgstr ""
-
-#: admin/fai/faiTemplateEntry.tpl.c:71
-msgid "SUID"
-msgstr ""
-
-#: admin/fai/faiTemplateEntry.tpl.c:77
-msgid "SGID"
-msgstr ""
-
-#: admin/fai/faiTemplateEntry.tpl.c:80
-msgid "Others"
-msgstr ""
-
-#: admin/fai/faiTemplateEntry.tpl.c:83
-msgid "sticky"
-msgstr ""
-
-#: admin/fai/faiScriptEntry.tpl.c:17 admin/fai/faiScriptEntry.tpl.c:26
-msgid "Script attributes"
-msgstr ""
-
-#: admin/fai/faiScriptEntry.tpl.c:23
-msgid ""
-"Choose a priority. Low values result in an earlier, high values in a later "
-"execution."
-msgstr ""
-
-#: admin/fai/faiScriptEntry.tpl.c:32 admin/fai/faiHookEntry.tpl.c:32
-msgid "Import script"
-msgstr ""
-
-#: admin/fai/classSelect/selectClass-list.tpl.c:2
-msgid "Base"
-msgstr ""
-
-#: admin/fai/fai-filter.tpl.c:29
-msgid "Show profiles"
-msgstr ""
-
-#: admin/fai/fai-filter.tpl.c:32
-msgid "Show templates"
-msgstr ""
-
-#: admin/fai/fai-filter.tpl.c:35
-msgid "Show scripts"
-msgstr ""
-
-#: admin/fai/fai-filter.tpl.c:38
-msgid "Show hooks"
-msgstr ""
-
-#: admin/fai/fai-filter.tpl.c:41
-msgid "Show variables"
-msgstr ""
-
-#: admin/fai/fai-filter.tpl.c:44
-msgid "Show packages"
-msgstr ""
-
-#: admin/fai/fai-filter.tpl.c:47
-msgid "Show partitions"
-msgstr ""
-
-#: admin/fai/faiTemplateEdit.tpl.c:2
-msgid "This FAI template is write protected. Editing may break it!"
-msgstr ""
-
-#: admin/fai/faiTemplateEdit.tpl.c:5
-msgid "Edit anyway"
-msgstr ""
-
-#: admin/fai/faiPartitionTable.tpl.c:14
-msgid "Use 'setup-storage' to partition the disk"
-msgstr ""
-
-#: admin/fai/faiPartitionTable.tpl.c:20
-msgid "Discs"
-msgstr ""
-
-#: admin/fai/faiPartitionTable.tpl.c:23 admin/fai/faiPartitionTable.tpl.c:26
-#: admin/fai/faiPartitionTable.tpl.c:41 admin/fai/faiPartitionTable.tpl.c:44
-msgid "Add disk"
-msgstr ""
-
-#: admin/fai/faiPartitionTable.tpl.c:29 admin/fai/faiPartitionTable.tpl.c:32
-#: admin/fai/faiPartitionTable.tpl.c:47 admin/fai/faiPartitionTable.tpl.c:50
-msgid "Add RAID"
-msgstr ""
-
-#: admin/fai/faiPartitionTable.tpl.c:35 admin/fai/faiPartitionTable.tpl.c:38
-#: admin/fai/faiPartitionTable.tpl.c:53 admin/fai/faiPartitionTable.tpl.c:56
-msgid "Add volume group"
-msgstr ""
-
-#: admin/fai/faiScript.tpl.c:17
-msgid "List of scripts"
-msgstr ""
-
-#: admin/fai/faiProfile.tpl.c:20
-msgid "Choose a priority"
-msgstr ""
-
-#: admin/fai/faiHookEntry.tpl.c:14 admin/fai/faiHookEntry.tpl.c:17
-#: admin/fai/faiHookEntry.tpl.c:26
-msgid "Hook attributes"
-msgstr ""
-
-#: admin/fai/faiHookEntry.tpl.c:23
-msgid "Choose an existing FAI task"
-msgstr ""
diff --git a/fai/locale/it/fusiondirectory.po b/fai/locale/it/fusiondirectory.po
index 2a686a2af7c346a8aad2d81890e48046a84f2dbe..466d3cf931329ab8944c5f7d7c54e679e57c6a40 100644
--- a/fai/locale/it/fusiondirectory.po
+++ b/fai/locale/it/fusiondirectory.po
@@ -3,386 +3,190 @@
 # This file is distributed under the same license as the PACKAGE package.
 # 
 # Translators:
-# Alessandro Amici <a.amici@bopen.it>, 2005
-# poterealpopolo <giuliano@opensides.be>, 2011
-# poterealpopolo <giuliano@opensides.be>, 2013
-# poterealpopolo <giuliano@opensides.be>, 2012
-# poterealpopolo <giuliano@opensides.be>, 2011-2013
 msgid ""
 msgstr ""
-"Project-Id-Version: FusionDirectory-108\n"
+"Project-Id-Version: FusionDirectory-109\n"
 "Report-Msgid-Bugs-To: documentation@lists.fusiondirectory.org\n"
-"POT-Creation-Date: 2015-03-19 21:45+0100\n"
-"PO-Revision-Date: 2015-02-25 16:12+0000\n"
+"POT-Creation-Date: 2014-12-15 17:47+0100\n"
+"PO-Revision-Date: 2015-02-25 16:13+0000\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>\n"
-"Language-Team: Italian (http://www.transifex.com/projects/p/FusionDirectory-108/language/it/)\n"
+"Language-Team: Italian (http://www.transifex.com/projects/p/FusionDirectory-109/language/it/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Language: it\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: admin/fai/class_faiScriptEntry.inc:79 admin/fai/class_faiScriptEntry.inc:82
-#: admin/fai/class_faiManagement.inc:240 admin/fai/class_faiManagement.inc:768
-#: admin/fai/class_faiManagement.inc:774
-#: admin/fai/class_faiPartitionTable.inc:268
-#: admin/fai/class_faiPartitionTable.inc:331
-#: admin/fai/class_faiDiskEntry.inc:445 admin/fai/class_FAI.inc:570
-#: admin/fai/class_faiHookEntry.inc:83 admin/fai/class_faiHookEntry.inc:86
-#: admin/fai/class_faiScript.inc:249 admin/fai/class_faiTemplate.inc:232
-#: admin/fai/class_faiHook.inc:259 admin/fai/class_faiVariable.inc:162
-#: admin/systems/class_faiLogView.inc:207
-#: admin/systems/class_faiLogView.inc:242
-msgid "Error"
-msgstr "Errore"
-
-#: admin/fai/class_faiScriptEntry.inc:82 admin/fai/class_faiHookEntry.inc:86
-msgid "file is empty"
-msgstr "Il file Ã¨ vuoto"
-
-#: admin/fai/class_faiScriptEntry.inc:102 admin/fai/class_faiHookEntry.inc:102
-#: admin/fai/class_faiScript.inc:349 admin/fai/class_faiScript.inc:374
-#: admin/fai/class_faiTemplate.inc:320 admin/fai/class_faiHook.inc:346
-msgid "Download"
-msgstr "Scarica"
-
-#: admin/fai/class_faiScriptEntry.inc:147
-#: admin/fai/class_faiScriptEntry.inc:151
-#: admin/fai/class_faiScriptEntry.inc:154
-#: admin/fai/class_faiScriptEntry.inc:197
-#: admin/fai/class_faiManagement.inc:768 admin/fai/class_faiManagement.inc:774
-#: admin/fai/class_faiPackage.inc:685
-#: admin/fai/class_faiPartitionTable.inc:779
-#: admin/fai/class_faiDiskEntry.inc:702 admin/fai/class_faiDiskEntry.inc:705
-#: admin/fai/class_faiDiskEntry.inc:758
-#: admin/fai/class_faiTemplateEntry.inc:247
-#: admin/fai/class_faiTemplateEntry.inc:312
-#: admin/fai/class_faiPartitionTableEntry.inc:353
-#: admin/fai/class_faiPartitionTableEntry.inc:356
-#: admin/fai/class_faiPartitionTableEntry.inc:360
-#: admin/fai/class_faiPartitionTableEntry.inc:455
-#: admin/fai/packageSelect/selectPackage-list.xml:40
-#: admin/fai/class_faiProfile.inc:414 admin/fai/class_faiProfile.inc:463
-#: admin/fai/class_faiHookEntry.inc:157 admin/fai/class_faiHookEntry.inc:162
-#: admin/fai/class_faiHookEntry.inc:165 admin/fai/class_faiHookEntry.inc:207
-#: admin/fai/class_askClassName.inc:163 admin/fai/class_askClassName.inc:167
-#: admin/fai/class_askClassName.inc:171 admin/fai/class_askClassName.inc:198
-#: admin/fai/class_faiScript.inc:347 admin/fai/class_faiScript.inc:605
-#: admin/fai/classSelect/selectClass-list.xml:28
-#: admin/fai/class_faiTemplate.inc:512
-#: admin/fai/class_faiVariableEntry.inc:103
-#: admin/fai/class_faiVariableEntry.inc:112
-#: admin/fai/class_faiVariableEntry.inc:115
-#: admin/fai/class_faiVariableEntry.inc:149 admin/fai/class_faiHook.inc:531
-#: admin/fai/class_faiVariable.inc:398 admin/fai/fai-list.xml:80
-#: admin/fai/faiPartitionTableEntry.tpl.c:8 admin/fai/faiPartition.tpl.c:5
-#: admin/fai/faiVariableEntry.tpl.c:8 admin/fai/faiDiskEntry.tpl.c:8
-#: admin/fai/faiTemplate.tpl.c:8 admin/fai/faiVariable.tpl.c:8
-#: admin/fai/faiHook.tpl.c:8
-#: admin/fai/packageSelect/selectPackage-filter.tpl.c:8
-#: admin/fai/faiPackage.tpl.c:8 admin/fai/faiScriptEntry.tpl.c:8
-#: admin/fai/classSelect/selectClass-filter.tpl.c:5
-#: admin/fai/fai-filter.tpl.c:50 admin/fai/faiPartitionTable.tpl.c:8
-#: admin/fai/faiScript.tpl.c:8 admin/fai/faiProfile.tpl.c:8
-#: admin/fai/faiHookEntry.tpl.c:8
-msgid "Name"
-msgstr "Nome"
-
-#: admin/fai/class_faiScriptEntry.inc:159 admin/fai/class_faiHookEntry.inc:170
-#: admin/fai/class_faiScript.inc:594 admin/fai/fai-list.xml:122
-#: admin/fai/faiScriptEntry.tpl.c:29 admin/fai/faiHookEntry.tpl.c:29
-msgid "Script"
-msgstr "Script"
-
-#: admin/fai/class_faiScriptEntry.inc:190
-#: admin/fai/class_faiScriptEntry.inc:199
-msgid "Script entry"
-msgstr "Script"
-
-#: admin/fai/class_faiScriptEntry.inc:191
-msgid "FAI script entry"
-msgstr "Script FAI"
-
-#: admin/fai/class_faiScriptEntry.inc:198 admin/fai/class_faiPackage.inc:686
-#: admin/fai/class_faiPartitionTable.inc:780
-#: admin/fai/class_faiDiskEntry.inc:759
-#: admin/fai/class_faiTemplateEntry.inc:313
-#: admin/fai/class_faiPartitionTableEntry.inc:456
-#: admin/fai/class_faiProfile.inc:464 admin/fai/class_faiHookEntry.inc:208
-#: admin/fai/class_faiScript.inc:606 admin/fai/class_faiTemplate.inc:513
-#: admin/fai/class_faiVariableEntry.inc:150 admin/fai/class_faiHook.inc:532
-#: admin/fai/class_faiVariable.inc:399
-#: admin/fai/faiPartitionTableEntry.tpl.c:11 admin/fai/faiPartition.tpl.c:11
-#: admin/fai/faiVariableEntry.tpl.c:11 admin/fai/faiDiskEntry.tpl.c:14
-#: admin/fai/faiTemplate.tpl.c:11 admin/fai/faiVariable.tpl.c:11
-#: admin/fai/faiHook.tpl.c:11 admin/fai/faiPackage.tpl.c:11
-#: admin/fai/faiTemplateEntry.tpl.c:14 admin/fai/faiScriptEntry.tpl.c:11
-#: admin/fai/faiPartitionTable.tpl.c:11 admin/fai/faiScript.tpl.c:11
-#: admin/fai/faiProfile.tpl.c:11 admin/fai/faiHookEntry.tpl.c:11
-msgid "Description"
-msgstr "Descrizione"
-
-#: admin/fai/class_faiScriptEntry.inc:200
-msgid "Script Priority"
-msgstr "PrioritÃ  dello script"
-
-#: admin/fai/class_faiManagement.inc:188
-msgid "partition table"
-msgstr "Tavola delle partizioni"
-
-#: admin/fai/class_faiManagement.inc:189 admin/fai/fai-list.xml:31
-msgid "script"
-msgstr "Script"
-
-#: admin/fai/class_faiManagement.inc:190 admin/fai/fai-list.xml:47
-msgid "hook"
-msgstr "connessioni"
-
-#: admin/fai/class_faiManagement.inc:191 admin/fai/fai-list.xml:39
-msgid "variable"
-msgstr "Variabile"
-
-#: admin/fai/class_faiManagement.inc:192 admin/fai/fai-list.xml:63
-msgid "template"
-msgstr "Modello"
-
-#: admin/fai/class_faiManagement.inc:193
-msgid "package list"
-msgstr "Elenco dei pacchetti"
-
-#: admin/fai/class_faiManagement.inc:210 admin/fai/class_faiManagement.inc:226
-#: admin/fai/class_faiManagement.inc:332 admin/fai/class_faiManagement.inc:390
-#: admin/fai/class_faiManagement.inc:480 admin/fai/class_faiManagement.inc:575
-#: admin/fai/class_faiManagement.inc:598 admin/fai/class_faiManagement.inc:619
-msgid "Permission error"
-msgstr "Errore di autorizzazione"
-
-#: admin/fai/class_faiManagement.inc:211 admin/fai/class_faiManagement.inc:226
-#, php-format
-msgid "You have no permission to create a new %s!"
-msgstr "Non hai il permesso di creare un nuovo %s !"
-
-#: admin/fai/class_faiManagement.inc:226 admin/fai/fai-list.xml:55
-msgid "profile"
-msgstr "profilo"
-
-#: admin/fai/class_faiManagement.inc:328
-msgid "Branch locked"
-msgstr "Ramo bloccato"
-
-#: admin/fai/class_faiManagement.inc:329
-#, php-format
-msgid "The following entries are locked, you can't remove them %s."
-msgstr "Le seguenti entries %s sono bloccate, non puoi rimuoverle."
-
-#: admin/fai/class_faiManagement.inc:346
-msgid "FAI object"
-msgstr "Oggetto FAI"
-
-#: admin/fai/class_faiManagement.inc:477
-msgid "FAI branch/freeze"
-msgstr "FAI ramo/bloccato"
-
-#: admin/fai/class_faiManagement.inc:480
-msgid "You have no permission to delete this release!"
-msgstr "Non hai il permesso di rimuovere questa versione !"
-
-#: admin/fai/class_faiManagement.inc:496 admin/fai/remove.tpl.c:2
-#: admin/fai/remove_branch.tpl.c:2
-msgid "Warning"
-msgstr "Avvertimento"
-
-#: admin/fai/class_faiManagement.inc:496
-msgid "Release remove aborted because the release name check failed!"
-msgstr "La rimozione della versione non Ã¨ riuscita a causa dui un errore nella verifica del suo nome !"
-
-#: admin/fai/class_faiManagement.inc:573 admin/fai/class_faiManagement.inc:596
-msgid "Configuration"
-msgstr "Configurazione"
-
-#: admin/fai/class_faiManagement.inc:575 admin/fai/class_faiManagement.inc:598
-#: admin/fai/class_faiManagement.inc:619
-msgid "Branch"
-msgstr "Ramo"
-
-#: admin/fai/class_faiManagement.inc:725 admin/fai/askClassName.tpl.c:23
-msgid "Continue"
-msgstr "Continua"
-
-#: admin/fai/class_faiManagement.inc:926
-#: admin/fai/class_faiPartitionTable.inc:768
-#: admin/fai/class_faiProfile.inc:318 admin/fai/class_askClassName.inc:99
-#: admin/fai/classSelect/class_classSelect.inc:58
-#: admin/fai/class_faiGroupHandle.inc:120
-#: admin/fai/class_faiProfileEntry.inc:163 admin/fai/fai-list.xml:146
-msgid "Partition table"
-msgstr "Tavola delle partizioni"
-
-#: admin/fai/class_faiManagement.inc:928
-#: admin/fai/class_faiGroupHandle.inc:122 admin/fai/fai-list.xml:140
-msgid "Package list"
-msgstr "Elenco dei pacchetti"
-
-#: admin/fai/class_faiManagement.inc:930
-#: admin/fai/class_faiGroupHandle.inc:124
-msgid "Scripts"
-msgstr "Scripts"
-
-#: admin/fai/class_faiManagement.inc:932
-#: admin/fai/class_faiGroupHandle.inc:126
-msgid "Variables"
-msgstr "Variabili"
-
-#: admin/fai/class_faiManagement.inc:934
-#: admin/fai/class_faiGroupHandle.inc:128
-msgid "Hooks"
-msgstr "Connessioni"
-
-#: admin/fai/class_faiManagement.inc:936 admin/fai/class_faiProfile.inc:454
-#: admin/fai/class_askClassName.inc:104 admin/fai/class_faiGroupHandle.inc:130
-#: admin/fai/fai-list.xml:110
-msgid "Profile"
-msgstr "Profilo"
-
-#: admin/fai/class_faiManagement.inc:938
-#: admin/fai/class_faiGroupHandle.inc:132
-msgid "Templates"
-msgstr "Modelli"
-
-#: admin/fai/class_faiManagement.inc:1039
-#: admin/fai/class_faiManagement.inc:1045
+#: admin/fai/class_faiManagement.inc:117 admin/fai/class_faiManagement.inc:122
 #: admin/fai/packageSelect/selectPackage-list.xml:14
-#: admin/fai/classSelect/selectClass-list.xml:15
-#: admin/systems/class_faiStartup.inc:177 config/fai/class_faiConfig.inc:41
+#: admin/systems/class_faiStartup.inc:178 config/fai/class_faiConfig.inc:41
 msgid "FAI"
 msgstr "FAI"
 
-#: admin/fai/class_faiManagement.inc:1040
+#: 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/fai/class_faiPackage.inc:261
-msgid "Invalid package names"
-msgstr "Nome di pacchetto non valido"
-
-#: admin/fai/class_faiPackage.inc:262
-#, php-format
-msgid "The following package names don't match the Debian policy: %s"
-msgstr "Il pacchetto seguente non corrisponde alla politica Debian : %s"
-
-#: admin/fai/class_faiPackage.inc:421 admin/fai/class_faiPackage.inc:422
-msgid "Configured"
-msgstr "Configurato"
-
-#: admin/fai/class_faiPackage.inc:428 admin/fai/class_faiPackage.inc:429
-msgid "Package marked for removal"
-msgstr "Pacchetto marcato per la rimozione"
-
-#: admin/fai/class_faiPackage.inc:445
-msgid "Mark package for removal"
-msgstr "Marca il pacchetto per la rimozione"
-
-#: admin/fai/class_faiPackage.inc:451
-msgid "Configure this package"
-msgstr "Configura il pacchetto"
+#: admin/fai/class_faiPackage.inc:157
+msgid "Mark for installation"
+msgstr ""
 
-#: admin/fai/class_faiPackage.inc:455
-msgid "Remove this package"
-msgstr "Rimuovi questo pacchetto"
+#: admin/fai/class_faiPackage.inc:161
+msgid "Mark for removal"
+msgstr ""
 
-#: admin/fai/class_faiPackage.inc:534
-msgid "Please select a least one package!"
-msgstr "Seleziona almeno un pacchetto !"
+#: admin/fai/class_faiPackage.inc:166
+msgid "Edit configuration"
+msgstr ""
 
-#: admin/fai/class_faiPackage.inc:538
-msgid ""
-"Please choose a valid release/section combination for your repository setup!"
-msgstr "Scegli una combinazione versione/sessione valida per la creazione del tuo deposito di pacchetti !"
+#: admin/fai/class_faiPackage.inc:247
+#: admin/fai/class_faiPartitionTable.inc:209
+#: admin/fai/class_faiPartitionTable.inc:250
+#: admin/fai/class_faiTemplate.inc:114
+#: admin/systems/services/repository/class_serviceDebianRepository.inc:172
+#: admin/systems/services/repository/class_serviceDebianRepository.inc:189
+#: admin/systems/services/repository/class_serviceDebianRepository.inc:193
+msgid "LDAP error"
+msgstr "Errore LDAP"
 
-#: admin/fai/class_faiPackage.inc:571
+#: admin/fai/class_faiPackage.inc:279
 #: admin/fai/packageSelect/class_filterFAIPackages.inc:41
 #: admin/fai/packageSelect/class_filterFAIPackages.inc:46
 #: admin/fai/class_faiPackageConfiguration.inc:55
-#: admin/systems/class_faiStartup.inc:132
-#: admin/systems/class_faiStartup.inc:159
-msgid "Infrastructure service"
-msgstr ""
+#: admin/systems/class_faiStartup.inc:133
+#: admin/systems/class_faiStartup.inc:160
+msgid "Service infrastructure"
+msgstr "Servizio d'infrastruttura"
 
-#: admin/fai/class_faiPackage.inc:587
+#: admin/fai/class_faiPackage.inc:294
 msgid "Unkown packages"
 msgstr "Pacchetti sconosciuti"
 
-#: admin/fai/class_faiPackage.inc:674
-#: admin/fai/faiPackageConfiguration.tpl.c:2
+#: admin/fai/class_faiPackage.inc:365
 msgid "Package"
 msgstr "Pacchetto"
 
-#: admin/fai/class_faiPackage.inc:675
+#: admin/fai/class_faiPackage.inc:366
 msgid "FAI Package list"
 msgstr "Elenco dei pacchetti FAI"
 
-#: admin/fai/class_faiPackage.inc:679
+#: admin/fai/class_faiPackage.inc:369
 msgid "FAI Package"
 msgstr "Pacchetto FAI"
 
-#: admin/fai/class_faiPackage.inc:687
-msgid "Packages"
-msgstr "Pacchetti"
+#: admin/fai/class_faiPackage.inc:385
+#: admin/fai/class_faiPartitionTable.inc:304
+#: admin/fai/class_faiTemplateEntry.inc:140 admin/fai/class_faiProfile.inc:47
+#: admin/fai/class_faiScript.inc:50 admin/fai/class_faiTemplate.inc:173
+#: admin/fai/class_faiHook.inc:50 admin/fai/class_faiVariable.inc:50
+msgid "Properties"
+msgstr "ProprietÃ "
+
+#: admin/fai/class_faiPackage.inc:388
+#: admin/fai/class_faiPartitionTable.inc:307 admin/fai/class_faiProfile.inc:50
+#: admin/fai/class_faiScript.inc:53 admin/fai/class_faiTemplate.inc:176
+#: admin/fai/class_faiHook.inc:53 admin/fai/class_faiVariable.inc:53
+msgid "Class name"
+msgstr "Nome della classe"
 
-#: admin/fai/class_faiPackage.inc:688 admin/fai/faiPackage.tpl.c:23
-msgid "Section"
-msgstr "Sezione"
+#: admin/fai/class_faiPackage.inc:388 admin/fai/class_faiScript.inc:53
+#: admin/fai/class_faiHook.inc:53 admin/fai/class_faiVariable.inc:53
+msgid "Variables class name"
+msgstr ""
 
-#: admin/fai/class_faiPackage.inc:688 admin/fai/class_faiPackage.inc:691
-#: admin/fai/class_faiScript.inc:605 admin/fai/class_faiTemplate.inc:512
-msgid "Readonly"
-msgstr "Sola lettura"
+#: admin/fai/class_faiPackage.inc:392
+#: admin/fai/class_faiPartitionTable.inc:311
+#: admin/fai/class_faiDiskEntry.inc:738
+#: admin/fai/class_faiTemplateEntry.inc:147 admin/fai/class_faiProfile.inc:54
+#: admin/fai/class_faiScript.inc:57 admin/fai/class_faiScript.inc:75
+#: admin/fai/class_faiTemplate.inc:180 admin/fai/class_faiHook.inc:57
+#: admin/fai/class_faiHook.inc:75 admin/fai/class_faiVariable.inc:57
+#: admin/fai/class_faiVariable.inc:75
+msgid "Description"
+msgstr "Descrizione"
 
-#: admin/fai/class_faiPackage.inc:689
-msgid "Install Method"
-msgstr "Metodo di installazione"
+#: admin/fai/class_faiPackage.inc:392
+#: admin/fai/class_faiPartitionTable.inc:311 admin/fai/class_faiProfile.inc:54
+#: admin/fai/class_faiScript.inc:57 admin/fai/class_faiTemplate.inc:180
+#: admin/fai/class_faiHook.inc:57 admin/fai/class_faiVariable.inc:57
+msgid "Short description of the class"
+msgstr ""
 
-#: admin/fai/class_faiPackage.inc:690
-msgid "Package configuration"
-msgstr "Configurazione dei pacchetti"
+#: admin/fai/class_faiPackage.inc:398 admin/systems/class_faiStartup.inc:90
+msgid "Repository"
+msgstr "Deposito"
 
-#: admin/fai/class_faiPackage.inc:691 admin/systems/class_faiStartup.inc:78
-#: admin/systems/services/repository/class_serviceRepository.inc:40
-#: admin/fai/branch_selector.tpl.c:14 admin/fai/faiPackage.tpl.c:20
-#: admin/fai/fai-filter.tpl.c:5 admin/fai/fai-filter.tpl.c:14
+#: admin/fai/class_faiPackage.inc:401 admin/systems/class_faiStartup.inc:78
+#: admin/systems/services/repository/class_serviceDebianRepository.inc:52
+#: admin/systems/services/repository/class_serviceCentosRepository.inc:49
 msgid "Release"
 msgstr "Versione"
 
-#: admin/fai/class_faiPartitionTable.inc:269
-#: admin/fai/class_faiDiskEntry.inc:446
-#, php-format
-msgid ""
-"The disk cannot be deleted while it is used in the '%s' disk definition!"
-msgstr "Il disco non puÃ² essere rimosso perchÃ¨ Ã¨ utilizzato nella definizione del disco '%s' !"
+#: admin/fai/class_faiPackage.inc:401
+msgid "Debian release concerned"
+msgstr ""
+
+#: admin/fai/class_faiPackage.inc:405
+#: admin/systems/services/repository/class_serviceDebianRepository.inc:58
+msgid "Sections"
+msgstr "Sezioni"
+
+#: admin/fai/class_faiPackage.inc:405
+msgid "Sections concerned"
+msgstr ""
+
+#: admin/fai/class_faiPackage.inc:409
+msgid "Install method"
+msgstr "Metodo d'installazione"
+
+#: admin/fai/class_faiPackage.inc:409
+msgid "Install method to use for this package list"
+msgstr ""
 
-#: admin/fai/class_faiPartitionTable.inc:416 admin/fai/class_faiScript.inc:360
-#: admin/fai/class_faiScript.inc:362 admin/fai/class_faiTemplate.inc:306
-#: admin/fai/class_faiTemplate.inc:308
-msgid "edit"
-msgstr "modifica"
+#: admin/fai/class_faiPackage.inc:420
+msgid "Packages"
+msgstr "Pacchetti"
 
-#: admin/fai/class_faiPartitionTable.inc:418 admin/fai/class_faiScript.inc:364
-#: admin/fai/class_faiTemplate.inc:310
-msgid "delete"
-msgstr "elimina"
+#: admin/fai/class_faiPackage.inc:424
+msgid "Packages in this class"
+msgstr ""
 
-#: admin/fai/class_faiPartitionTable.inc:769
-#: admin/fai/class_faiPartitionTable.inc:773
+#: admin/fai/class_faiPartitionTable.inc:61
+#: admin/fai/class_faiDiskEntry.inc:442 admin/systems/class_faiLogView.inc:207
+#: admin/systems/class_faiLogView.inc:242
+msgid "Error"
+msgstr "Errore"
+
+#: admin/fai/class_faiPartitionTable.inc:112
+msgid "Add RAID"
+msgstr "Aggiungi il RAID"
+
+#: admin/fai/class_faiPartitionTable.inc:116
+msgid "Add LVM"
+msgstr ""
+
+#: admin/fai/class_faiPartitionTable.inc:284
+msgid "Partition table"
+msgstr "Tavola delle partizioni"
+
+#: admin/fai/class_faiPartitionTable.inc:285
+#: admin/fai/class_faiPartitionTable.inc:288
 msgid "FAI partition table"
 msgstr "Tavola delle partizioni FAI"
 
-#: admin/fai/class_faiPartitionTable.inc:779 admin/fai/class_faiHook.inc:531
-#: admin/fai/class_faiVariable.inc:398
-msgid "Read only"
-msgstr "Solo lettura"
+#: admin/fai/class_faiPartitionTable.inc:307 admin/fai/class_faiProfile.inc:50
+msgid "Partition table class name"
+msgstr ""
+
+#: admin/fai/class_faiPartitionTable.inc:317
+msgid "Discs"
+msgstr "Dischi"
+
+#: admin/fai/class_faiPartitionTable.inc:324
+msgid "Partitions in this class"
+msgstr ""
 
 #: admin/fai/class_faiDiskEntry.inc:273
-#: admin/fai/faiPartitionTableEntry.tpl.c:5 admin/fai/faiDiskEntry.tpl.c:5
 msgid "Device"
 msgstr "Dispositivi"
 
@@ -394,103 +198,103 @@ msgstr "Etichetta"
 msgid "UUID"
 msgstr "UUID"
 
-#: admin/fai/class_faiDiskEntry.inc:345
+#: admin/fai/class_faiDiskEntry.inc:344
 msgid "Disks"
 msgstr "Dischi"
 
-#: admin/fai/class_faiDiskEntry.inc:348 admin/fai/class_faiPartition.inc:321
-#: admin/fai/faiPartition.tpl.c:14
+#: admin/fai/class_faiDiskEntry.inc:347 admin/fai/class_faiPartition.inc:319
 msgid "Size"
 msgstr "Dimensione"
 
-#: admin/fai/class_faiDiskEntry.inc:544
+#: admin/fai/class_faiDiskEntry.inc:443
+#, php-format
+msgid ""
+"The disk cannot be deleted while it is used in the '%s' disk definition!"
+msgstr "Il disco non puÃ² essere rimosso perchÃ¨ Ã¨ utilizzato nella definizione del disco '%s' !"
+
+#: admin/fai/class_faiDiskEntry.inc:536
 msgid "encrypted"
 msgstr "criptato"
 
-#: admin/fai/class_faiDiskEntry.inc:547
+#: admin/fai/class_faiDiskEntry.inc:539
 msgid "bootable"
 msgstr "Avviabile"
 
-#: admin/fai/class_faiDiskEntry.inc:550
+#: admin/fai/class_faiDiskEntry.inc:542
 msgid "preserve"
 msgstr "preserve"
 
-#: admin/fai/class_faiDiskEntry.inc:735
+#: admin/fai/class_faiDiskEntry.inc:687 admin/fai/class_faiDiskEntry.inc:690
+#: admin/fai/class_faiDiskEntry.inc:737
+#: admin/fai/packageSelect/selectPackage-list.xml:40
+#: admin/fai/class_faiScript.inc:71 admin/fai/class_faiHook.inc:71
+#: admin/fai/class_faiVariable.inc:71
+#: admin/fai/class_faiSimplePluginClass.inc:50
+msgid "Name"
+msgstr "Nome"
+
+#: admin/fai/class_faiDiskEntry.inc:717
 msgid ""
 "You have more than four primary partition table entries in your "
 "configuration, please check your configuration twice."
 msgstr "Ci sono piÃ¹ di 4 partizioni primarie nella tua configurazione, verifica di nuovo la tua configurazione !"
 
-#: admin/fai/class_faiDiskEntry.inc:739
+#: admin/fai/class_faiDiskEntry.inc:721
 msgid ""
 "You cannot have more than three primary partition while using logical "
 "partitions, please check your configuration twice."
 msgstr "Non puoi avere piÃ¹ di 3 partizioni primarie quando usi delle partizioni logiche, verifica di nuovo la tua configurazione."
 
-#: admin/fai/class_faiDiskEntry.inc:752
-#: admin/fai/class_faiPartitionTableEntry.inc:448
+#: admin/fai/class_faiDiskEntry.inc:733
 msgid "Partition table entry"
 msgstr "Elenco della tavola delle partizioni"
 
-#: admin/fai/class_faiDiskEntry.inc:753
-#: admin/fai/class_faiPartitionTableEntry.inc:449
+#: admin/fai/class_faiDiskEntry.inc:734
 msgid "FAI partition table entry"
 msgstr "Elenco della tavola delle partizioni FAI"
 
-#: admin/fai/class_faiDiskEntry.inc:760
+#: admin/fai/class_faiDiskEntry.inc:739
 msgid "Disk options"
 msgstr "Opzioni dei dischi"
 
-#: admin/fai/class_faiDiskEntry.inc:761
-#: admin/fai/class_faiPartitionTableEntry.inc:457
+#: admin/fai/class_faiDiskEntry.inc:740
 msgid "Partition type"
 msgstr "Tipo di partizione"
 
-#: admin/fai/class_faiDiskEntry.inc:762
-#: admin/fai/class_faiPartitionTableEntry.inc:458
+#: admin/fai/class_faiDiskEntry.inc:741
 msgid "Partition no."
 msgstr "Partizione numero"
 
-#: admin/fai/class_faiDiskEntry.inc:763
-#: admin/fai/class_faiPartitionTableEntry.inc:459
+#: admin/fai/class_faiDiskEntry.inc:742
 msgid "File system type"
 msgstr "Tipo di file system"
 
-#: admin/fai/class_faiDiskEntry.inc:764
-#: admin/fai/class_faiPartitionTableEntry.inc:171
-#: admin/fai/class_faiPartitionTableEntry.inc:460
-#: admin/fai/class_faiPartition.inc:437 admin/fai/faiPartition.tpl.c:47
+#: admin/fai/class_faiDiskEntry.inc:743 admin/fai/class_faiPartition.inc:432
 msgid "Mount point"
 msgstr "Punto di montaggio"
 
-#: admin/fai/class_faiDiskEntry.inc:765
-#: admin/fai/class_faiPartitionTableEntry.inc:461
-#: admin/fai/class_faiPartition.inc:402 admin/fai/class_faiPartition.inc:407
+#: admin/fai/class_faiDiskEntry.inc:744 admin/fai/class_faiPartition.inc:397
+#: admin/fai/class_faiPartition.inc:402
 msgid "Partition size"
 msgstr "Dimensione della partizione"
 
-#: admin/fai/class_faiDiskEntry.inc:766
-#: admin/fai/class_faiPartitionTableEntry.inc:173
-#: admin/fai/class_faiPartitionTableEntry.inc:462
-#: admin/fai/faiPartition.tpl.c:50
+#: admin/fai/class_faiDiskEntry.inc:745
 msgid "Mount options"
 msgstr "Opzioni di montaggio"
 
-#: admin/fai/class_faiDiskEntry.inc:767
-#: admin/fai/class_faiPartitionTableEntry.inc:463
+#: admin/fai/class_faiDiskEntry.inc:746
 msgid "File system options"
 msgstr "Opzioni del file system"
 
-#: admin/fai/class_faiDiskEntry.inc:768
-#: admin/fai/class_faiPartitionTableEntry.inc:464
+#: admin/fai/class_faiDiskEntry.inc:747
 msgid "Partition flags"
 msgstr "Indicatore delle partizioni"
 
-#: admin/fai/class_debconfTemplate.inc:227
+#: admin/fai/class_debconfTemplate.inc:225
 msgid "This package has no debconf options."
 msgstr "Questo pacchetto non ha opzioni Debconf."
 
-#: admin/fai/class_debconfTemplate.inc:264
+#: admin/fai/class_debconfTemplate.inc:262
 msgid ""
 "This debconf question is dynamically generated during package installation "
 "and requires choosing between specific options which cannot be presented "
@@ -498,217 +302,59 @@ msgid ""
 " effect."
 msgstr "Questa domanda debconf viene generata dinamicamente durante l'installazione del pacchetto e richiede 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_faiTemplateEntry.inc:139
-msgid "no file uploaded yet"
-msgstr "ancora nessun file scaricato"
+#: admin/fai/class_faiTemplateEntry.inc:143
+msgid "File path"
+msgstr ""
 
-#: admin/fai/class_faiTemplateEntry.inc:142
-#, php-format
-msgid "exists in database (size: %s bytes)"
-msgstr "esiste nel database (dimensione : %s bytes)"
+#: admin/fai/class_faiTemplateEntry.inc:143
+msgid "Complete absolute template file path and name"
+msgstr ""
 
-#: admin/fai/class_faiTemplateEntry.inc:251
-#: admin/systems/class_faiLogView.inc:70 admin/fai/faiTemplateEntry.tpl.c:23
-msgid "File"
-msgstr "File"
+#: admin/fai/class_faiTemplateEntry.inc:147
+msgid "Short description of the file"
+msgstr ""
 
-#: admin/fai/class_faiTemplateEntry.inc:255
-#: admin/fai/faiTemplateEntry.tpl.c:11
-msgid "Destination path"
-msgstr "Directory di destinazione"
-
-#: admin/fai/class_faiTemplateEntry.inc:260 admin/fai/faiTemplateEntry.tpl.c:8
-msgid "File name"
-msgstr "Nome del file"
-
-#: admin/fai/class_faiTemplateEntry.inc:264
-#: admin/fai/class_faiTemplateEntry.inc:266
-#: admin/fai/faiTemplateEntry.tpl.c:68
-msgid "User"
-msgstr "Utente"
-
-#: admin/fai/class_faiTemplateEntry.inc:270
-#: admin/fai/class_faiTemplateEntry.inc:273
-#: admin/fai/class_faiTemplateEntry.inc:275
-#: admin/fai/faiTemplateEntry.tpl.c:47 admin/fai/faiTemplateEntry.tpl.c:74
-msgid "Group"
-msgstr "Gruppi"
+#: admin/fai/class_faiTemplateEntry.inc:156
+msgid "Template attributes"
+msgstr "Attributi dei modelli"
 
-#: admin/fai/class_faiTemplateEntry.inc:305
-msgid "Template entry"
-msgstr "Modello"
+#: admin/fai/class_faiTemplateEntry.inc:160
+msgid "Template file content"
+msgstr ""
 
-#: admin/fai/class_faiTemplateEntry.inc:306
-msgid "FAI template entry"
-msgstr "Modello FAI"
+#: admin/fai/class_faiTemplateEntry.inc:160
+msgid "Content of the template file"
+msgstr ""
 
-#: admin/fai/class_faiTemplateEntry.inc:314
-msgid "Template file"
-msgstr "File del modello"
+#: admin/fai/class_faiTemplateEntry.inc:164
+msgid "Owner and group of the file"
+msgstr ""
 
-#: admin/fai/class_faiTemplateEntry.inc:315
-msgid "Template path"
-msgstr "Path del modello"
+#: admin/fai/class_faiTemplateEntry.inc:167
+msgid "Owner"
+msgstr "Propietario"
 
-#: admin/fai/class_faiTemplateEntry.inc:316
+#: admin/fai/class_faiTemplateEntry.inc:167
 msgid "File owner"
 msgstr "Propietario del file"
 
-#: admin/fai/class_faiTemplateEntry.inc:317
-msgid "File permissions"
-msgstr "Autorizzazioni del file"
-
-#: admin/fai/class_FAI.inc:287 admin/fai/class_FAI.inc:679
-#: admin/fai/class_FAI.inc:1266 admin/fai/class_FAI.inc:1283
-#: admin/fai/class_FAI.inc:1287
-msgid "LDAP error"
-msgstr "Errore LDAP"
-
-#: admin/fai/class_FAI.inc:570
-#, php-format
-msgid "Error, following objects should be equal '%s' and '%s'"
-msgstr "Errore, i seguenti oggetti devono essere uguali '%s' e '%s'"
-
-#: admin/fai/class_FAI.inc:891
-#, php-format
-msgid "Creating group application release for %s"
-msgstr "Creazione di un gruppo di applicazione per la versione %s"
-
-#: admin/fai/class_FAI.inc:960 admin/fai/class_FAI.inc:982
-#: admin/fai/class_FAI.inc:1022 admin/fai/class_FAI.inc:1027
-#: admin/fai/class_FAI.inc:1065
-msgid "Object"
-msgstr "Oggetto"
-
-#: admin/fai/class_FAI.inc:961
-#, php-format
-msgid "Adding missing group application release container %s."
-msgstr "Aggiunta del gruppo di applicazioni mancanti %s."
-
-#: admin/fai/class_FAI.inc:983
-#, php-format
-msgid "Adding group application release container %s."
-msgstr "Aggiunta del gruppo di applicazioni %s."
-
-#: admin/fai/class_FAI.inc:1023
-#, php-format
-msgid "Could not create menu entry %s. (Already exists)."
-msgstr "Impossibile creare l'entry di menu %s (esiste giÃ )."
-
-#: admin/fai/class_FAI.inc:1028
-#, php-format
-msgid "Created group application menu entry for %s."
-msgstr "Il menu del gruppo di applicazioni %s Ã¨ stato creato."
-
-#: admin/fai/class_FAI.inc:1059
-#, php-format
-msgid "Creating copy of %s"
-msgstr "Creazione di una copia di %s"
-
-#: admin/fai/class_FAI.inc:1062
-msgid "Processing"
-msgstr "Trattamento in corso"
-
-#: admin/fai/class_FAI.inc:1080
-msgid "Could not create new release, the destination dn is already in use."
-msgstr "Impossibile creare una nuova versione, il DN di destinazione esiste giÃ ."
-
-#: admin/fai/class_FAI.inc:1093
-msgid "Error while fetching source dn - aborted!"
-msgstr "Errore durante il recupero del DN - operazione interrotta !"
-
-#: admin/fai/class_FAI.inc:1174
-msgid "Fatal error"
-msgstr "Errore fatale"
-
-#: admin/fai/class_FAI.inc:1175
-#, php-format
-msgid ""
-"Release creation failed due to ldap errors. Additional informations '%s'."
-msgstr "La creazione della versione non Ã¨ riuscita in seguito a degli errori LDAP. Informazioni aggiuntive '%s'."
-
-#: admin/fai/class_faiPartitionTableEntry.inc:162
-msgid "primary"
-msgstr "primario"
-
-#: admin/fai/class_faiPartitionTableEntry.inc:162
-msgid "logical"
-msgstr "logico"
-
-#: admin/fai/class_faiPartitionTableEntry.inc:169
-#: admin/fai/faiPartition.tpl.c:8
-msgid "Type"
-msgstr "Tipo"
-
-#: admin/fai/class_faiPartitionTableEntry.inc:170
-msgid "FS type"
-msgstr "Tipo FS"
-
-#: admin/fai/class_faiPartitionTableEntry.inc:172
-msgid "Size in MB"
-msgstr "Dimensione in MB"
-
-#: admin/fai/class_faiPartitionTableEntry.inc:174
-msgid "FS option"
-msgstr "Opzioni del file system"
-
-#: admin/fai/class_faiPartitionTableEntry.inc:175
-#: admin/fai/faiPartition.tpl.c:23
-msgid "Preserve"
-msgstr "Preserva"
-
-#: admin/fai/class_faiPartitionTableEntry.inc:266
-msgid "False"
-msgstr "Falso"
-
-#: admin/fai/class_faiPartitionTableEntry.inc:268
-msgid "True"
-msgstr "Vero"
-
-#: admin/fai/class_faiPartitionTableEntry.inc:272
-#: admin/fai/class_faiPartitionTableEntry.inc:274 admin/fai/fai-list.xml:159
-#: admin/fai/fai-list.xml:198
-msgid "Remove"
-msgstr "Rimuovi"
-
-#: admin/fai/class_faiPartitionTableEntry.inc:384
-#, php-format
-msgid "please enter a unique mount point for partition %s"
-msgstr "Indica un punto di montaggio unico per la partizione %s"
+#: admin/fai/class_faiTemplateEntry.inc:172
+msgid "Group"
+msgstr "Gruppo"
 
-#: admin/fai/class_faiPartitionTableEntry.inc:389
-#, php-format
-msgid "partition %s mount point"
-msgstr "partizione %s punto di montaggio"
+#: admin/fai/class_faiTemplateEntry.inc:172
+msgid "File group"
+msgstr ""
 
-#: admin/fai/class_faiPartitionTableEntry.inc:394
-#, php-format
-msgid ""
-"File system type 'swap' is already used, change file system type for "
-"partition %s."
-msgstr "Il file system 'swap' Ã¨ giÃ  utilizzato, cambia il tipo di file system per la partizione %s."
-
-#: admin/fai/class_faiPartitionTableEntry.inc:398
-msgid "Please use 'swap' as mount point, if 'swap' is used as fs-type."
-msgstr "Utilizza 'swap' come punto di montaggio, se 'swap' Ã¨ utilizzato come tipo di file system."
-
-#: admin/fai/class_faiPartitionTableEntry.inc:404
-#: admin/fai/class_faiPartitionTableEntry.inc:408
-#: admin/fai/class_faiPartitionTableEntry.inc:414
-#: admin/fai/class_faiPartitionTableEntry.inc:416
-#: admin/fai/class_faiPartitionTableEntry.inc:421
-#, php-format
-msgid "partition %s size"
-msgstr "Dimensione della partizione %s"
+#: admin/fai/class_faiTemplateEntry.inc:181
+msgid "Access"
+msgstr "Accesso"
 
-#: admin/fai/class_faiPartitionTableEntry.inc:436
-msgid ""
-"You have more than 3 primary partition table entries in your configuration, "
-"please check your configuration twice."
-msgstr "Hai piÃ¹ di tre partizioni primarie nella tua configurazione, verifica la tua configurazione ! "
+#: admin/fai/class_faiTemplateEntry.inc:181
+msgid "Access rights"
+msgstr ""
 
 #: admin/fai/packageSelect/selectPackage-list.xml:10
-#: admin/fai/classSelect/selectClass-list.xml:11
 msgid "Please select the desired entries"
 msgstr "Seleziona le entries desiderate"
 
@@ -716,148 +362,95 @@ msgstr "Seleziona le entries desiderate"
 msgid "Version"
 msgstr "Versione"
 
-#: admin/fai/class_faiProfile.inc:310
-msgid "This list displays all assigned class names for this profile."
-msgstr "Questo elenco mostra tutte le classi appartenenti a questo profilo"
-
-#: admin/fai/class_faiProfile.inc:313 admin/fai/class_askClassName.inc:103
-#: admin/fai/classSelect/class_classSelect.inc:53
-#: admin/fai/class_faiProfileEntry.inc:158
-msgid "Hook bundle"
-msgstr "Insieme di connessioni"
-
-#: admin/fai/class_faiProfile.inc:314 admin/fai/class_askClassName.inc:105
-#: admin/fai/classSelect/class_classSelect.inc:54
-#: admin/fai/class_faiProfileEntry.inc:159
-msgid "Template bundle"
-msgstr "Insieme di modelli"
-
-#: admin/fai/class_faiProfile.inc:315 admin/fai/class_askClassName.inc:101
-#: admin/fai/classSelect/class_classSelect.inc:55
-#: admin/fai/class_faiProfileEntry.inc:160
-msgid "Script bundle"
-msgstr "Insieme di script"
-
-#: admin/fai/class_faiProfile.inc:316 admin/fai/class_askClassName.inc:102
-#: admin/fai/classSelect/class_classSelect.inc:56
-#: admin/fai/class_faiProfileEntry.inc:161
-msgid "Variable bundle"
-msgstr "Insieme di variabili "
-
-#: admin/fai/class_faiProfile.inc:317 admin/fai/class_askClassName.inc:100
-#: admin/fai/classSelect/class_classSelect.inc:57
-#: admin/fai/class_faiProfileEntry.inc:162
-msgid "Package bundle"
-msgstr "Insieme di pacchetti"
-
-#: admin/fai/class_faiProfile.inc:321
-msgid "Remove class from profile"
-msgstr "Rimuovi la classe dal profilo"
-
-#: admin/fai/class_faiProfile.inc:324
-msgid "Up"
-msgstr "Sopra"
-
-#: admin/fai/class_faiProfile.inc:325
-msgid "Down"
-msgstr "Sotto"
-
-#: admin/fai/class_faiProfile.inc:410
-msgid "No class specified for this profile!"
-msgstr "Nessuna classe Ã¨ stata specificata per questo profilo !"
-
-#: admin/fai/class_faiProfile.inc:419
-msgid "You can't use the same name for a class and a profile!"
-msgstr ""
+#: admin/fai/class_faiProfile.inc:28
+msgid "Profile"
+msgstr "Profilo"
 
-#: admin/fai/class_faiProfile.inc:455
+#: admin/fai/class_faiProfile.inc:29
 msgid "FAI profile"
 msgstr "Profilo FAI"
 
-#: admin/fai/class_faiProfile.inc:458
+#: admin/fai/class_faiProfile.inc:32
 msgid "FAI Profile"
 msgstr "Profilo FAI"
 
-#: admin/fai/class_faiProfile.inc:465 admin/fai/faiProfile.tpl.c:17
+#: admin/fai/class_faiProfile.inc:61
 msgid "FAI classes"
 msgstr "Classi FAI"
 
-#: admin/fai/class_faiHookEntry.inc:200
-msgid "Hook entry"
-msgstr "Connessioni"
+#: admin/fai/class_faiProfile.inc:61
+msgid "FAI classes which are part of this profile"
+msgstr ""
 
-#: admin/fai/class_faiHookEntry.inc:201
-msgid "FAI hook entry"
-msgstr "Connessioni FAI"
+#: admin/fai/class_faiPackageConfiguration.inc:88
+#, php-format
+msgid "Debconf information for package '%s'"
+msgstr "Informazione Debconf per il pacchetto '%s'"
 
-#: admin/fai/class_faiHookEntry.inc:209 admin/fai/faiHookEntry.tpl.c:20
-msgid "Task"
-msgstr "AttivitÃ "
+#: admin/fai/class_faiScript.inc:30 admin/fai/class_faiScript.inc:84
+#: admin/fai/class_faiHook.inc:87
+msgid "Script"
+msgstr "Script"
 
-#: admin/fai/class_faiHookEntry.inc:210 admin/fai/class_faiScript.inc:595
-#: admin/fai/class_faiScript.inc:599
+#: admin/fai/class_faiScript.inc:31 admin/fai/class_faiScript.inc:34
 msgid "FAI script"
 msgstr "Script FAI"
 
-#: admin/fai/class_faiPackageConfiguration.inc:88
-#, php-format
-msgid "Debconf information for package '%s'"
-msgstr "Informazione Debconf per il pacchetto '%s'"
+#: admin/fai/class_faiScript.inc:63
+msgid "Scripts"
+msgstr "Scripts"
 
-#: admin/fai/class_askClassName.inc:99 admin/fai/class_askClassName.inc:100
-#: admin/fai/class_askClassName.inc:101 admin/fai/class_askClassName.inc:102
-#: admin/fai/class_askClassName.inc:103 admin/fai/class_askClassName.inc:104
-#: admin/fai/class_askClassName.inc:105 admin/fai/class_askClassName.inc:106
-msgid "Create new FAI object"
-msgstr "Crea un nuovo oggetto FAI"
+#: admin/fai/class_faiScript.inc:67 admin/fai/class_faiHook.inc:67
+#: admin/fai/class_faiVariable.inc:67
+msgid "Variables in this class"
+msgstr ""
 
-#: admin/fai/class_faiTemplateEdit.inc:80
-#, php-format
-msgid ""
-"The file encodig has changed from '%s' to '%s'. Do you really want to save?"
-msgstr "La codifica del file Ã¨ cambiata da '%s' verso '%s', voui davvero registrare la modifica ?"
+#: admin/fai/class_faiScript.inc:71 admin/fai/class_faiHook.inc:71
+#: admin/fai/class_faiVariable.inc:71
+msgid "The name of the variable"
+msgstr ""
 
-#: admin/fai/class_faiScript.inc:333 admin/fai/class_faiScript.inc:335
-msgid "Sort direction"
-msgstr "Direzione dell'ordinamento"
+#: admin/fai/class_faiScript.inc:75 admin/fai/class_faiHook.inc:75
+#: admin/fai/class_faiVariable.inc:75
+msgid "A short description of the variable"
+msgstr ""
 
-#: admin/fai/class_faiScript.inc:348 admin/fai/faiScriptEntry.tpl.c:20
+#: admin/fai/class_faiScript.inc:79
 msgid "Priority"
 msgstr "PrioritÃ "
 
-#: admin/fai/class_faiScript.inc:350
-msgid "Action"
-msgstr "Azione"
+#: admin/fai/class_faiScript.inc:79
+msgid "Priority of this script (FIXME: less is done first?)"
+msgstr ""
+
+#: admin/fai/class_faiScript.inc:84
+msgid "The script itself"
+msgstr ""
 
-#: admin/fai/classSelect/selectClass-list.xml:36 admin/fai/fai-list.xml:88
-#: admin/fai/faiScriptEntry.tpl.c:14
-msgid "Properties"
-msgstr "ProprietÃ "
+#: admin/fai/class_faiTemplate.inc:136
+#, php-format
+msgid "There are several files with the same path: %s"
+msgstr ""
 
-#: admin/fai/class_faiTemplate.inc:501 admin/fai/fai-list.xml:116
+#: admin/fai/class_faiTemplate.inc:153
 msgid "Template"
 msgstr "Modello"
 
-#: admin/fai/class_faiTemplate.inc:502 admin/fai/class_faiTemplate.inc:506
+#: admin/fai/class_faiTemplate.inc:154 admin/fai/class_faiTemplate.inc:157
 msgid "FAI template"
 msgstr "Modello FAI"
 
-#: admin/fai/class_faiVariableEntry.inc:107
-msgid "Content"
-msgstr "Contenuto"
-
-#: admin/fai/class_faiVariableEntry.inc:142
-msgid "Variable entry"
-msgstr "Contenuto della variabile"
+#: admin/fai/class_faiTemplate.inc:176
+msgid "Template class name"
+msgstr ""
 
-#: admin/fai/class_faiVariableEntry.inc:143
-msgid "FAI variable entry "
-msgstr "Contenuto della variabile FAI"
+#: admin/fai/class_faiTemplate.inc:186
+msgid "Template files"
+msgstr ""
 
-#: admin/fai/class_faiVariableEntry.inc:151
-#: admin/fai/faiVariableEntry.tpl.c:20
-msgid "Variable content"
-msgstr "Contenuto della variabile"
+#: admin/fai/class_faiTemplate.inc:190
+msgid "Template files in this class"
+msgstr ""
 
 #: admin/fai/class_faiPartition.inc:176 admin/fai/class_faiPartition.inc:180
 msgid "Logical"
@@ -955,95 +548,74 @@ msgstr "xfs"
 msgid "btrfs"
 msgstr "btrfs"
 
-#: admin/fai/class_faiPartition.inc:224
-msgid "LVM/RAID"
-msgstr ""
-
-#: admin/fai/class_faiPartition.inc:327
+#: admin/fai/class_faiPartition.inc:325
 msgid "spare"
 msgstr "spare"
 
-#: admin/fai/class_faiPartition.inc:330
+#: admin/fai/class_faiPartition.inc:328
 msgid "missing"
 msgstr "mancante"
 
-#: admin/fai/class_faiPartition.inc:333
+#: admin/fai/class_faiPartition.inc:331
 msgid "Options"
 msgstr "Opzioni"
 
-#: admin/fai/class_faiPartition.inc:420
+#: admin/fai/class_faiPartition.inc:415
 msgid "Minimum partition size"
 msgstr "Dimensione minima della partizione"
 
-#: admin/fai/class_faiPartition.inc:420
+#: admin/fai/class_faiPartition.inc:415
 msgid "Maximum partition size"
 msgstr "Dimensione massima della partizione"
 
-#: admin/fai/class_faiPartition.inc:428
+#: admin/fai/class_faiPartition.inc:423
 msgid "Raid arrays must contain at least two partitions!"
 msgstr "Gli arrays RAID devono contenere almeno 2 partizioni !"
 
-#: admin/fai/class_faiPartition.inc:430
+#: admin/fai/class_faiPartition.inc:425
 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:332 admin/fai/class_faiHook.inc:334
-#: admin/fai/fai-list.xml:190 admin/fai/faiVariable.tpl.c:23
-#: admin/fai/faiVariable.tpl.c:26
-msgid "Edit"
-msgstr "Modifica"
-
-#: admin/fai/class_faiHook.inc:336
-msgid "Delete"
-msgstr "Rimuovi"
-
-#: admin/fai/class_faiHook.inc:521 admin/fai/fai-list.xml:128
+#: admin/fai/class_faiHook.inc:30
 msgid "Hook"
 msgstr "Connessioni"
 
-#: admin/fai/class_faiHook.inc:522 admin/fai/class_faiHook.inc:526
+#: admin/fai/class_faiHook.inc:31 admin/fai/class_faiHook.inc:34
 msgid "FAI hook"
 msgstr "Connessioni FAI"
 
-#: admin/fai/class_faiVariable.inc:387 admin/fai/fai-list.xml:134
+#: admin/fai/class_faiHook.inc:63
+msgid "Hooks"
+msgstr "Connessioni"
+
+#: admin/fai/class_faiHook.inc:79
+msgid "Task"
+msgstr "AttivitÃ "
+
+#: admin/fai/class_faiHook.inc:87
+msgid "The script of this hook"
+msgstr ""
+
+#: admin/fai/class_faiVariable.inc:30
 msgid "Variable"
 msgstr "Variabile"
 
-#: admin/fai/class_faiVariable.inc:388 admin/fai/class_faiVariable.inc:392
+#: admin/fai/class_faiVariable.inc:31 admin/fai/class_faiVariable.inc:34
 msgid "FAI variable"
 msgstr "Variabile FAI"
 
-#: admin/fai/class_faiProfileEntry.inc:184 admin/fai/askClassName.tpl.c:11
-#: admin/fai/askClassName.tpl.c:17 admin/fai/paste_generic.tpl.c:5
-msgid "Class name"
-msgstr "Nome della classe"
-
-#: admin/fai/class_faiProfileEntry.inc:184 admin/fai/faiTemplate.tpl.c:14
-#: admin/fai/faiVariable.tpl.c:14 admin/fai/faiHook.tpl.c:14
-#: admin/fai/faiPartitionTable.tpl.c:17 admin/fai/faiScript.tpl.c:14
-msgid "Objects"
-msgstr "Oggetti"
-
-#: admin/fai/fai-list.xml:11
-msgid "List of deployment classes and products"
-msgstr "Elenco delle classi e dei pacchetti di distribuzione"
-
-#: admin/fai/fai-list.xml:15
-msgid "partitionTable"
-msgstr "tabella delle partizioni"
-
-#: admin/fai/fai-list.xml:23
-msgid "packagelist"
-msgstr "lista dei pacchetti"
+#: admin/fai/class_faiVariable.inc:63
+msgid "Variables"
+msgstr "Variabili"
 
-#: admin/fai/fai-list.xml:93
-msgid "Actions"
-msgstr "Azioni"
+#: admin/fai/class_faiVariable.inc:79
+msgid "Content"
+msgstr "Contenuto"
 
-#: admin/fai/fai-list.xml:104
-msgid "Create"
-msgstr "Crea"
+#: admin/fai/class_faiVariable.inc:79
+msgid "The content of the variable"
+msgstr ""
 
 #: admin/systems/class_faiLogView.inc:56
 msgid "Sort down"
@@ -1053,6 +625,10 @@ msgstr ""
 msgid "Sort up"
 msgstr ""
 
+#: admin/systems/class_faiLogView.inc:70
+msgid "File"
+msgstr "File"
+
 #: admin/systems/class_faiLogView.inc:71
 msgid "Date"
 msgstr "Data"
@@ -1087,7 +663,7 @@ msgstr ""
 msgid "Selected file: %s"
 msgstr ""
 
-#: admin/systems/class_faiStartup.inc:70 admin/fai/paste_generic.tpl.c:2
+#: admin/systems/class_faiStartup.inc:70
 msgid "FAI settings"
 msgstr "Impostazioni FAI"
 
@@ -1107,11 +683,6 @@ msgstr "Profilo"
 msgid "FAI profil to be applied to this computer"
 msgstr "Profilo FAI da applicare a questo computer"
 
-#: admin/systems/class_faiStartup.inc:90 admin/fai/faiPackage.tpl.c:14
-#: admin/fai/faiPackage.tpl.c:17
-msgid "Repository"
-msgstr "Deposito"
-
 #: admin/systems/class_faiStartup.inc:90
 msgid "FAI Debian repository to be used for installation"
 msgstr "Repository Debian per FAI da usare per l'installazione"
@@ -1136,85 +707,96 @@ msgstr "Parametri del kernel d'avvio"
 msgid "Linux kernel parameters to be ran"
 msgstr "Parametri del kernel d'avvio da eseguire"
 
-#: admin/systems/class_faiStartup.inc:178
+#: admin/systems/class_faiStartup.inc:179
 msgid "Full automated installation"
 msgstr "Installazione completa automatizzata"
 
-#: admin/systems/services/repository/class_serviceRepository.inc:31
+#: admin/systems/services/repository/class_serviceDebianRepository.inc:34
+#: admin/systems/services/repository/class_serviceCentosRepository.inc:31
+msgid "Repositories"
+msgstr "Repositories"
+
+#: admin/systems/services/repository/class_serviceDebianRepository.inc:39
+#: admin/systems/services/repository/class_serviceCentosRepository.inc:36
+msgid "Repositories this server hosts"
+msgstr "Repository che questo server ospita"
+
+#: admin/systems/services/repository/class_serviceDebianRepository.inc:43
+#: admin/systems/services/repository/class_serviceCentosRepository.inc:40
 msgid "URL"
 msgstr "URL"
 
-#: admin/systems/services/repository/class_serviceRepository.inc:31
+#: admin/systems/services/repository/class_serviceDebianRepository.inc:43
+#: admin/systems/services/repository/class_serviceCentosRepository.inc:40
 msgid "Repository url"
 msgstr "URL del repository"
 
-#: admin/systems/services/repository/class_serviceRepository.inc:35
+#: admin/systems/services/repository/class_serviceDebianRepository.inc:47
+#: admin/systems/services/repository/class_serviceCentosRepository.inc:44
 msgid "Parent server"
 msgstr "Server genitore"
 
-#: admin/systems/services/repository/class_serviceRepository.inc:35
+#: admin/systems/services/repository/class_serviceDebianRepository.inc:47
+#: admin/systems/services/repository/class_serviceCentosRepository.inc:44
 msgid "Parent repository server"
 msgstr "Server di repository genitore"
 
-#: admin/systems/services/repository/class_serviceRepository.inc:40
-msgid "Release used on this repository"
-msgstr ""
+#: admin/systems/services/repository/class_serviceDebianRepository.inc:52
+msgid "Debian release used on this repository"
+msgstr "Release Debian usata su questo repository"
 
-#: admin/systems/services/repository/class_serviceRepository.inc:47
-msgid "Sections"
-msgstr "Sezioni"
-
-#: admin/systems/services/repository/class_serviceRepository.inc:47
-msgid "Sections available on this repository"
-msgstr ""
+#: admin/systems/services/repository/class_serviceDebianRepository.inc:58
+msgid "Debian sections available on this repository"
+msgstr "Sezioni Debian disponibili su questo repository"
 
-#: admin/systems/services/repository/class_serviceRepository.inc:52
+#: admin/systems/services/repository/class_serviceDebianRepository.inc:63
+#: admin/systems/services/repository/class_serviceCentosRepository.inc:57
 msgid "Mirror mode"
 msgstr "Modo Mirror"
 
-#: admin/systems/services/repository/class_serviceRepository.inc:52
+#: admin/systems/services/repository/class_serviceDebianRepository.inc:63
+#: admin/systems/services/repository/class_serviceCentosRepository.inc:57
 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
+#: admin/systems/services/repository/class_serviceDebianRepository.inc:68
+#: admin/systems/services/repository/class_serviceCentosRepository.inc:62
 msgid "Local mirror"
 msgstr "Mirror locale"
 
-#: admin/systems/services/repository/class_serviceRepository.inc:57
+#: admin/systems/services/repository/class_serviceDebianRepository.inc:68
+#: admin/systems/services/repository/class_serviceCentosRepository.inc:62
 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
+#: admin/systems/services/repository/class_serviceDebianRepository.inc:77
+#: admin/systems/services/repository/class_serviceCentosRepository.inc:71
 msgid "Architectures"
 msgstr "Architetture"
 
-#: admin/systems/services/repository/class_serviceRepository.inc:66
+#: admin/systems/services/repository/class_serviceDebianRepository.inc:77
+#: admin/systems/services/repository/class_serviceCentosRepository.inc:71
 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 ""
-
-#: admin/systems/services/repository/class_serviceRepository.inc:140
-msgid "Repositories"
-msgstr "Repositories"
+#: admin/systems/services/repository/class_serviceDebianRepository.inc:99
+#: admin/systems/services/repository/class_serviceDebianRepository.inc:100
+msgid "Debian repository"
+msgstr "Repository Debian"
 
-#: admin/systems/services/repository/class_serviceRepository.inc:145
-msgid "Repositories this server hosts"
-msgstr "Repository che questo server ospita"
+#: admin/systems/services/repository/class_serviceDebianRepository.inc:100
+#: admin/systems/services/repository/class_serviceCentosRepository.inc:96
+msgid "Services"
+msgstr "Servizi"
 
-#: admin/systems/services/repository/class_serviceRepository.inc:160
-msgid "Package repository"
+#: admin/systems/services/repository/class_serviceCentosRepository.inc:49
+msgid "Centos release used on this repository"
 msgstr ""
 
-#: admin/systems/services/repository/class_serviceRepository.inc:161
-msgid "Package repository information"
+#: admin/systems/services/repository/class_serviceCentosRepository.inc:95
+#: admin/systems/services/repository/class_serviceCentosRepository.inc:96
+msgid "Centos repository"
 msgstr ""
 
 #: config/fai/class_faiConfig.inc:28
@@ -1246,476 +828,3 @@ msgstr ""
 #: config/fai/class_faiConfig.inc:60
 msgid "s"
 msgstr ""
-
-#: admin/fai/faiPartitionTableEntry.tpl.c:2 admin/fai/faiVariableEntry.tpl.c:2
-#: admin/fai/faiVariableEntry.tpl.c:5 admin/fai/faiDiskEntry.tpl.c:2
-#: admin/fai/faiTemplate.tpl.c:2 admin/fai/faiTemplate.tpl.c:5
-#: admin/fai/faiVariable.tpl.c:2 admin/fai/faiVariable.tpl.c:5
-#: admin/fai/faiHook.tpl.c:2 admin/fai/faiHook.tpl.c:5
-#: admin/fai/faiPackage.tpl.c:2 admin/fai/faiPackage.tpl.c:5
-#: admin/fai/faiTemplateEntry.tpl.c:2 admin/fai/faiTemplateEntry.tpl.c:5
-#: admin/fai/faiScriptEntry.tpl.c:2 admin/fai/faiScriptEntry.tpl.c:5
-#: admin/fai/faiPartitionTable.tpl.c:2 admin/fai/faiPartitionTable.tpl.c:5
-#: admin/fai/faiScript.tpl.c:2 admin/fai/faiScript.tpl.c:5
-#: admin/fai/faiProfile.tpl.c:2 admin/fai/faiProfile.tpl.c:5
-#: admin/fai/faiProfile.tpl.c:14 admin/fai/faiHookEntry.tpl.c:2
-#: admin/fai/faiHookEntry.tpl.c:5
-msgid "Generic"
-msgstr "Informazioni"
-
-#: admin/fai/faiPartitionTableEntry.tpl.c:14
-#: admin/fai/faiPartitionTableEntry.tpl.c:17 admin/fai/faiDiskEntry.tpl.c:23
-#: admin/fai/faiDiskEntry.tpl.c:26
-msgid "Partition entries"
-msgstr "Elenco delle partizioni"
-
-#: admin/fai/faiPartitionTableEntry.tpl.c:20
-#: admin/fai/faiPartitionTableEntry.tpl.c:23 admin/fai/faiDiskEntry.tpl.c:29
-#: admin/fai/faiDiskEntry.tpl.c:32
-msgid "Add partition"
-msgstr "Aggiungi una partizione"
-
-#: admin/fai/branch_selector.tpl.c:2
-msgid "Releases"
-msgstr "Versioni"
-
-#: admin/fai/branch_selector.tpl.c:5
-msgid "Current release"
-msgstr "Versione attuale"
-
-#: admin/fai/branch_selector.tpl.c:8 admin/fai/branch_selector.tpl.c:17
-#: admin/fai/fai-filter.tpl.c:8 admin/fai/fai-filter.tpl.c:17
-msgid "Create release"
-msgstr "Crea  una versione"
-
-#: admin/fai/branch_selector.tpl.c:11 admin/fai/branch_selector.tpl.c:23
-#: admin/fai/fai-filter.tpl.c:11 admin/fai/fai-filter.tpl.c:23
-msgid "Create read-only release"
-msgstr "Crea una versione di sola lettura"
-
-#: admin/fai/branch_selector.tpl.c:20 admin/fai/fai-filter.tpl.c:20
-msgid "Freeze"
-msgstr "Bloccato"
-
-#: admin/fai/branch_selector.tpl.c:26 admin/fai/fai-filter.tpl.c:26
-msgid "Delete current release"
-msgstr "Rimuovi la versione corrente"
-
-#: admin/fai/faiPartition.tpl.c:2
-msgid "Partition"
-msgstr "Partizione"
-
-#: admin/fai/faiPartition.tpl.c:17
-msgid "Resize existing partition"
-msgstr "Ridimensiona una partizione esistente"
-
-#: admin/fai/faiPartition.tpl.c:20
-msgid "Bootable"
-msgstr "Avviabile"
-
-#: admin/fai/faiPartition.tpl.c:26 admin/fai/faiDiskEntry.tpl.c:20
-msgid "Combined physical partitions"
-msgstr "Combinazione delle partizioni fisiche"
-
-#: admin/fai/faiPartition.tpl.c:29
-msgid "Toggle missing"
-msgstr "Mostra/Nascondi i mancanti"
-
-#: admin/fai/faiPartition.tpl.c:32
-msgid "Toggle spare"
-msgstr "Mostra/Nascondi gli spare"
-
-#: admin/fai/faiPartition.tpl.c:35
-msgid "Filesystem"
-msgstr "File system"
-
-#: admin/fai/faiPartition.tpl.c:38
-msgid "Filesystem create options"
-msgstr "Opzioni per la creazione del file system"
-
-#: admin/fai/faiPartition.tpl.c:41
-msgid "Encrypted"
-msgstr "Criptato"
-
-#: admin/fai/faiPartition.tpl.c:44
-msgid "Tune options"
-msgstr "Opzioni di tuning"
-
-#: admin/fai/faiNewBranch.tpl.c:2
-msgid ""
-"You are now going to create a branch or locked branch. This action clones "
-"the existing release to another release name. Branches can be modified as "
-"usual. FAI classes of locked branches cannot be modified, just additional "
-"classes are possible. Branch names should be alphanumeric, excluding the "
-"reserved names 'scripts', 'hooks', 'partitions', 'variables', 'templates' "
-"and 'fai'."
-msgstr "Stai per creare un ramo oppure un ramo bloccato. Questa azione copierÃ  la versione corrente in un a nuova versione. I rami possono essere modificati abitualmente. Le classi FAI dei rami bloccati non possono essere modificate, possono solo essere create delle classi supplementari. I nomi dei rami devono essere 'alfanumerici' con l'eccezione delle parole riservate 'scripts', 'hooks', 'partitions', 'variables', 'templates', e 'fai'."
-
-#: admin/fai/faiNewBranch.tpl.c:5
-msgid ""
-"Branches are created as subreleases of the currently selected branch. "
-"Creating a new branch named 1.0.2 in SARGE for example, will result in a new"
-" release called SARGE/1.0.2."
-msgstr "I rami sono creati come delle sotto versioni del ramo selezionato. La creazione di un nuovo ramo chiamato 1.0.2 in SARGE ad esempio, darÃ  come risultato una nuova versione chiamata SARGE/1.0.2."
-
-#: admin/fai/faiNewBranch.tpl.c:8
-msgid "Please enter a name for the branch"
-msgstr "Inserisci un nome per il ramo"
-
-#: admin/fai/faiNewBranch.tpl.c:11
-msgid "Processing the requested operation"
-msgstr "Operazione in corso"
-
-#: admin/fai/faiNewBranch.tpl.c:14
-msgid ""
-"As soon as the copy operation has finished, you can scroll down to end of "
-"the page and press the 'Continue' button to continue with the fai management"
-" dialog."
-msgstr "Appena l'operazione di copia sarÃ  terminata, potrai andare alla fine della pagina e premere il pulsante 'Continuare' per avanzare nella configurazione della FAI."
-
-#: admin/fai/faiNewBranch.tpl.c:17
-msgid ""
-"Your browser doesn't support iframes, please use this link to perform the "
-"requested operation."
-msgstr "Il tuo navigatore web non supporta gli iframes, utilizza questo link per effettuare l'operazione richiesta."
-
-#: admin/fai/faiNewBranch.tpl.c:20
-msgid "Perform requested operation."
-msgstr "Operazione in corso"
-
-#: admin/fai/faiNewBranch.tpl.c:23
-msgid "Initiate operation"
-msgstr "Avvio dell'operazione"
-
-#: admin/fai/faiVariableEntry.tpl.c:14 admin/fai/faiVariableEntry.tpl.c:17
-msgid "Variable attributes"
-msgstr "Attributi delle variabili"
-
-#: admin/fai/faiDiskEntry.tpl.c:11
-msgid "fstab key"
-msgstr "Elenco fstab"
-
-#: admin/fai/faiDiskEntry.tpl.c:17
-msgid "Disk label"
-msgstr "Etichetta del disco"
-
-#: admin/fai/faiTemplate.tpl.c:17
-msgid "List of template files"
-msgstr "Elenco dei modelli"
-
-#: admin/fai/faiVariable.tpl.c:17
-msgid "List of assigned variables"
-msgstr "Elenco dei nomi delle variabili giÃ  in uso"
-
-#: admin/fai/faiVariable.tpl.c:20
-msgid "Choose a variable to delete or edit"
-msgstr "Scegli una variabile da modificare o da rimuovere"
-
-#: admin/fai/askClassName.tpl.c:2
-msgid ""
-"Adding a new class to the FAI management, requires a class name. You have to"
-" specify a unique class name for unique types of FAI classes, while you can "
-"use the same class name for different types of FAI classes. In the laste "
-"case, FAI will automatically enclose all these different class types to one "
-"unique class name."
-msgstr "L'aggiunta di una classe alla gestione della FAI necessita un nome di classe. Devi specificare un nome di classe unico per le classi FAI di tipo unico, quantunque puoi usare lo stesso nome per delle classi FAI di tipo diverso. Nell'ultimo caso, FAI includerÃ  automaticamente tutte queste classi di tipo diverso in un nome di classe unico."
-
-#: admin/fai/askClassName.tpl.c:5
-msgid ""
-"Please use one of the following methods to choose the name for the new FAI "
-"class."
-msgstr "Utilizza uno dei metodi seguenti per scegliere il nome della nuova classe FAI."
-
-#: admin/fai/askClassName.tpl.c:8
-msgid "Enter FAI class name manually"
-msgstr "Inserisci il nome della classe FAI manualmente"
-
-#: admin/fai/askClassName.tpl.c:14
-msgid "Choose FAI class name from a list of existing classes"
-msgstr "Scegli il nome della classe FAI tra le classi esistenti"
-
-#: admin/fai/askClassName.tpl.c:20
-msgid "Choose class name"
-msgstr "Scegli un nome di classe"
-
-#: admin/fai/faiGroupHandle.tpl.c:2
-msgid "Please select the objects you want to remove:"
-msgstr "Seleziona gli oggetti che intendi rimuovere :"
-
-#: admin/fai/faiGroupHandle.tpl.c:5
-msgid "Freezed"
-msgstr "Bloccato"
-
-#: admin/fai/faiGroupHandle.tpl.c:8
-msgid "Select the object you want to edit:"
-msgstr "Seleziona gli oggetti che intendi modificare :"
-
-#: admin/fai/faiGroupHandle.tpl.c:11
-msgid "Select the object you want to copy:"
-msgstr "Seleziona gli oggetti che intendi copiare :"
-
-#: admin/fai/remove.tpl.c:5
-msgid ""
-"This includes all account data, system access rules, imap settings, etc. for"
-" this user. Please double check if your really want to do this since there "
-"is no way for FusionDirectory to get your data back."
-msgstr "Questo include tutti i dati degli account, i permessi di accesso al sistema, la configurazione imap, etc. di questo utente. Accertati che vuoi davvero eseguire questa azione visto che poi sarÃ  impossibile per FusionDirectory recuperare i tuoi dati."
-
-#: admin/fai/remove.tpl.c:8 admin/fai/remove_branch.tpl.c:8
-msgid "So - if you're sure - press 'Delete' to continue or 'Cancel' to abort."
-msgstr "Quindi - se sei sicuro - premi 'Rimuovi' per continuare oppure 'Annulla' per interrompere."
-
-#: admin/fai/faiHook.tpl.c:17
-msgid "List of hook scripts"
-msgstr "Elenco degli scripts di connessione"
-
-#: admin/fai/packageSelect/selectPackage-list.tpl.c:2
-#: admin/fai/classSelect/selectClass-list.tpl.c:5
-msgid "Update"
-msgstr "Aggiornamento"
-
-#: admin/fai/packageSelect/selectPackage-list.tpl.c:5
-#: admin/fai/classSelect/selectClass-list.tpl.c:8
-msgid "Submit"
-msgstr "Invia"
-
-#: admin/fai/packageSelect/selectPackage-filter.tpl.c:2
-#: admin/fai/classSelect/selectClass-filter.tpl.c:2
-#: admin/fai/fai-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 "Saranno mostrate un massimo di 200 entries."
-
-#: admin/fai/remove_branch.tpl.c:5
-msgid ""
-"This includes all account data, system access, etc. for this branch. Please "
-"double check if your really want to do this since there is no way for "
-"FusionDirectory to get your data back."
-msgstr "Questo include tutti i dati degli account, le autorizzazzioni di accesso al sistema, la configurazione imap, etc. per questo ramo. Accertati che vuoi davvero eseguire questa azione visto che poi sarÃ  impossibile per FusionDirectory recuperare i tuoi dati."
-
-#: admin/fai/faiPackage.tpl.c:26
-msgid "Install method"
-msgstr "Metodo d'installazione"
-
-#: admin/fai/faiPackage.tpl.c:29
-msgid "Please select the installation method"
-msgstr "Scegli il metodo d'installazione"
-
-#: admin/fai/faiPackage.tpl.c:32 admin/fai/faiPackage.tpl.c:35
-msgid "Used packages"
-msgstr "Pacchetti utilizzati"
-
-#: admin/fai/faiPackage.tpl.c:38
-msgid "Add from list"
-msgstr "Aggiungi dalla lista"
-
-#: admin/fai/faiProfileEntry.tpl.c:2
-msgid "List of FAI objects (Fully Automatic Installation)"
-msgstr "Elenco degli oggetti FAI (Fully Automatic Installation)"
-
-#: admin/fai/faiProfileEntry.tpl.c:5
-msgid "Information"
-msgstr "Informazione"
-
-#: admin/fai/faiProfileEntry.tpl.c:8
-msgid ""
-"This menu allows you to select FAI class names and to add them to the "
-"currently edited profile."
-msgstr "Questo menu ti permette di scegliere delle classi FAI e di aggiungerle al profilo che stai modificando attualmente."
-
-#: admin/fai/faiProfileEntry.tpl.c:11
-msgid "Filters"
-msgstr "Filtri"
-
-#: admin/fai/faiProfileEntry.tpl.c:14
-msgid "Show only classes with templates"
-msgstr "Mostra solo le classi con i modelli"
-
-#: admin/fai/faiProfileEntry.tpl.c:17
-msgid "Show only classes with scripts"
-msgstr "Mostra solo le classi con gli scripts"
-
-#: admin/fai/faiProfileEntry.tpl.c:20
-msgid "Show only classes with hooks"
-msgstr "Mostra solo le classi con delle connessioni"
-
-#: admin/fai/faiProfileEntry.tpl.c:23
-msgid "Show only classes with variables"
-msgstr "Mostra solo le classi con delle variabili"
-
-#: admin/fai/faiProfileEntry.tpl.c:26
-msgid "Show only classes with packages"
-msgstr "Mostra solo le classi con dei pacchetti"
-
-#: admin/fai/faiProfileEntry.tpl.c:29
-msgid "Show only classes with partitions"
-msgstr "Mostra solo le classi con delle partizioni"
-
-#: admin/fai/faiProfileEntry.tpl.c:32 admin/fai/faiProfileEntry.tpl.c:35
-msgid "Display objects matching"
-msgstr "Mostra gli oggetti corrispondenti"
-
-#: admin/fai/faiProfileEntry.tpl.c:38
-msgid "Regular expression for matching object names"
-msgstr "Espressione regolare per trovare gli oggetti corrispondenti"
-
-#: admin/fai/faiTemplateEntry.tpl.c:17 admin/fai/faiTemplateEntry.tpl.c:20
-msgid "Template attributes"
-msgstr "Attributi dei modelli"
-
-#: admin/fai/faiTemplateEntry.tpl.c:26 admin/fai/faiTemplateEntry.tpl.c:29
-msgid "Save template"
-msgstr "Registra il modello"
-
-#: admin/fai/faiTemplateEntry.tpl.c:32 admin/fai/faiTemplateEntry.tpl.c:35
-msgid "Edit template"
-msgstr "Modifica il modello"
-
-#: admin/fai/faiTemplateEntry.tpl.c:38
-msgid "Full path"
-msgstr "Path completo"
-
-#: admin/fai/faiTemplateEntry.tpl.c:41
-msgid "Upload"
-msgstr "Caricare"
-
-#: admin/fai/faiTemplateEntry.tpl.c:44
-msgid "Owner"
-msgstr "Propietario"
-
-#: admin/fai/faiTemplateEntry.tpl.c:50
-msgid "Access"
-msgstr "Accesso"
-
-#: admin/fai/faiTemplateEntry.tpl.c:53
-msgid "Class"
-msgstr "Categoria"
-
-#: admin/fai/faiTemplateEntry.tpl.c:56
-msgid "Read"
-msgstr "Lettura"
-
-#: admin/fai/faiTemplateEntry.tpl.c:59
-msgid "Write"
-msgstr "Scrittura"
-
-#: admin/fai/faiTemplateEntry.tpl.c:62
-msgid "Execute"
-msgstr "Esegui"
-
-#: admin/fai/faiTemplateEntry.tpl.c:65
-msgid "Special"
-msgstr "Speciale"
-
-#: admin/fai/faiTemplateEntry.tpl.c:71
-msgid "SUID"
-msgstr "SUID"
-
-#: admin/fai/faiTemplateEntry.tpl.c:77
-msgid "SGID"
-msgstr "SGID"
-
-#: admin/fai/faiTemplateEntry.tpl.c:80
-msgid "Others"
-msgstr "Altri"
-
-#: admin/fai/faiTemplateEntry.tpl.c:83
-msgid "sticky"
-msgstr "permanente"
-
-#: admin/fai/faiScriptEntry.tpl.c:17 admin/fai/faiScriptEntry.tpl.c:26
-msgid "Script attributes"
-msgstr "Attributi dello script"
-
-#: admin/fai/faiScriptEntry.tpl.c:23
-msgid ""
-"Choose a priority. Low values result in an earlier, high values in a later "
-"execution."
-msgstr "Scegli una prioritÃ . I valori bassi saranno eseguiti per primi."
-
-#: admin/fai/faiScriptEntry.tpl.c:32 admin/fai/faiHookEntry.tpl.c:32
-msgid "Import script"
-msgstr "Importa uno script"
-
-#: admin/fai/classSelect/selectClass-list.tpl.c:2
-msgid "Base"
-msgstr "Base"
-
-#: admin/fai/fai-filter.tpl.c:29
-msgid "Show profiles"
-msgstr "Mostra i profili"
-
-#: admin/fai/fai-filter.tpl.c:32
-msgid "Show templates"
-msgstr "Mostra i modelli"
-
-#: admin/fai/fai-filter.tpl.c:35
-msgid "Show scripts"
-msgstr "Mostra gli scripts"
-
-#: admin/fai/fai-filter.tpl.c:38
-msgid "Show hooks"
-msgstr "Mostra le connessioni"
-
-#: admin/fai/fai-filter.tpl.c:41
-msgid "Show variables"
-msgstr "Mostra le variabili"
-
-#: admin/fai/fai-filter.tpl.c:44
-msgid "Show packages"
-msgstr "Mostra i pacchetti"
-
-#: admin/fai/fai-filter.tpl.c:47
-msgid "Show partitions"
-msgstr "Mostra le partizioni"
-
-#: admin/fai/faiTemplateEdit.tpl.c:2
-msgid "This FAI template is write protected. Editing may break it!"
-msgstr "Questo modello FAI Ã¨ protetto contro la scrittura. La modifica potrebbe danneggiare il file !"
-
-#: admin/fai/faiTemplateEdit.tpl.c:5
-msgid "Edit anyway"
-msgstr "Modifica malgrado l'avvertimento"
-
-#: admin/fai/faiPartitionTable.tpl.c:14
-msgid "Use 'setup-storage' to partition the disk"
-msgstr "Utilizza 'setup storage' per partizionare il disco"
-
-#: admin/fai/faiPartitionTable.tpl.c:20
-msgid "Discs"
-msgstr "Dischi"
-
-#: admin/fai/faiPartitionTable.tpl.c:23 admin/fai/faiPartitionTable.tpl.c:26
-#: admin/fai/faiPartitionTable.tpl.c:41 admin/fai/faiPartitionTable.tpl.c:44
-msgid "Add disk"
-msgstr "Aggiungi un disco"
-
-#: admin/fai/faiPartitionTable.tpl.c:29 admin/fai/faiPartitionTable.tpl.c:32
-#: admin/fai/faiPartitionTable.tpl.c:47 admin/fai/faiPartitionTable.tpl.c:50
-msgid "Add RAID"
-msgstr "Aggiungi il RAID"
-
-#: admin/fai/faiPartitionTable.tpl.c:35 admin/fai/faiPartitionTable.tpl.c:38
-#: admin/fai/faiPartitionTable.tpl.c:53 admin/fai/faiPartitionTable.tpl.c:56
-msgid "Add volume group"
-msgstr "Aggiungi un gruppo di volumi"
-
-#: admin/fai/faiScript.tpl.c:17
-msgid "List of scripts"
-msgstr "Elenco degli scripts"
-
-#: admin/fai/faiProfile.tpl.c:20
-msgid "Choose a priority"
-msgstr "Scegli una prioritÃ "
-
-#: admin/fai/faiHookEntry.tpl.c:14 admin/fai/faiHookEntry.tpl.c:17
-#: admin/fai/faiHookEntry.tpl.c:26
-msgid "Hook attributes"
-msgstr "Attributi delle connessioni"
-
-#: admin/fai/faiHookEntry.tpl.c:23
-msgid "Choose an existing FAI task"
-msgstr "Scegli un'attivitÃ  FAI esistente"
diff --git a/fai/locale/lv/fusiondirectory.po b/fai/locale/lv/fusiondirectory.po
index 3513ca91331ad0b1cef40f82d70a8309a1869c80..41ca6f58eb42e27232f11d53d860174746a9df55 100644
--- a/fai/locale/lv/fusiondirectory.po
+++ b/fai/locale/lv/fusiondirectory.po
@@ -5,379 +5,188 @@
 # Translators:
 msgid ""
 msgstr ""
-"Project-Id-Version: FusionDirectory-108\n"
+"Project-Id-Version: FusionDirectory-109\n"
 "Report-Msgid-Bugs-To: documentation@lists.fusiondirectory.org\n"
-"POT-Creation-Date: 2015-03-19 21:45+0100\n"
-"PO-Revision-Date: 2015-02-25 15:46+0000\n"
+"POT-Creation-Date: 2014-12-15 17:47+0100\n"
+"PO-Revision-Date: 2014-12-15 16:54+0000\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>\n"
-"Language-Team: Latvian (http://www.transifex.com/projects/p/FusionDirectory-108/language/lv/)\n"
+"Language-Team: Latvian (http://www.transifex.com/projects/p/FusionDirectory-109/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/fai/class_faiScriptEntry.inc:79 admin/fai/class_faiScriptEntry.inc:82
-#: admin/fai/class_faiManagement.inc:240 admin/fai/class_faiManagement.inc:768
-#: admin/fai/class_faiManagement.inc:774
-#: admin/fai/class_faiPartitionTable.inc:268
-#: admin/fai/class_faiPartitionTable.inc:331
-#: admin/fai/class_faiDiskEntry.inc:445 admin/fai/class_FAI.inc:570
-#: admin/fai/class_faiHookEntry.inc:83 admin/fai/class_faiHookEntry.inc:86
-#: admin/fai/class_faiScript.inc:249 admin/fai/class_faiTemplate.inc:232
-#: admin/fai/class_faiHook.inc:259 admin/fai/class_faiVariable.inc:162
-#: admin/systems/class_faiLogView.inc:207
-#: admin/systems/class_faiLogView.inc:242
-msgid "Error"
-msgstr ""
-
-#: admin/fai/class_faiScriptEntry.inc:82 admin/fai/class_faiHookEntry.inc:86
-msgid "file is empty"
-msgstr ""
-
-#: admin/fai/class_faiScriptEntry.inc:102 admin/fai/class_faiHookEntry.inc:102
-#: admin/fai/class_faiScript.inc:349 admin/fai/class_faiScript.inc:374
-#: admin/fai/class_faiTemplate.inc:320 admin/fai/class_faiHook.inc:346
-msgid "Download"
-msgstr ""
-
-#: admin/fai/class_faiScriptEntry.inc:147
-#: admin/fai/class_faiScriptEntry.inc:151
-#: admin/fai/class_faiScriptEntry.inc:154
-#: admin/fai/class_faiScriptEntry.inc:197
-#: admin/fai/class_faiManagement.inc:768 admin/fai/class_faiManagement.inc:774
-#: admin/fai/class_faiPackage.inc:685
-#: admin/fai/class_faiPartitionTable.inc:779
-#: admin/fai/class_faiDiskEntry.inc:702 admin/fai/class_faiDiskEntry.inc:705
-#: admin/fai/class_faiDiskEntry.inc:758
-#: admin/fai/class_faiTemplateEntry.inc:247
-#: admin/fai/class_faiTemplateEntry.inc:312
-#: admin/fai/class_faiPartitionTableEntry.inc:353
-#: admin/fai/class_faiPartitionTableEntry.inc:356
-#: admin/fai/class_faiPartitionTableEntry.inc:360
-#: admin/fai/class_faiPartitionTableEntry.inc:455
-#: admin/fai/packageSelect/selectPackage-list.xml:40
-#: admin/fai/class_faiProfile.inc:414 admin/fai/class_faiProfile.inc:463
-#: admin/fai/class_faiHookEntry.inc:157 admin/fai/class_faiHookEntry.inc:162
-#: admin/fai/class_faiHookEntry.inc:165 admin/fai/class_faiHookEntry.inc:207
-#: admin/fai/class_askClassName.inc:163 admin/fai/class_askClassName.inc:167
-#: admin/fai/class_askClassName.inc:171 admin/fai/class_askClassName.inc:198
-#: admin/fai/class_faiScript.inc:347 admin/fai/class_faiScript.inc:605
-#: admin/fai/classSelect/selectClass-list.xml:28
-#: admin/fai/class_faiTemplate.inc:512
-#: admin/fai/class_faiVariableEntry.inc:103
-#: admin/fai/class_faiVariableEntry.inc:112
-#: admin/fai/class_faiVariableEntry.inc:115
-#: admin/fai/class_faiVariableEntry.inc:149 admin/fai/class_faiHook.inc:531
-#: admin/fai/class_faiVariable.inc:398 admin/fai/fai-list.xml:80
-#: admin/fai/faiPartitionTableEntry.tpl.c:8 admin/fai/faiPartition.tpl.c:5
-#: admin/fai/faiVariableEntry.tpl.c:8 admin/fai/faiDiskEntry.tpl.c:8
-#: admin/fai/faiTemplate.tpl.c:8 admin/fai/faiVariable.tpl.c:8
-#: admin/fai/faiHook.tpl.c:8
-#: admin/fai/packageSelect/selectPackage-filter.tpl.c:8
-#: admin/fai/faiPackage.tpl.c:8 admin/fai/faiScriptEntry.tpl.c:8
-#: admin/fai/classSelect/selectClass-filter.tpl.c:5
-#: admin/fai/fai-filter.tpl.c:50 admin/fai/faiPartitionTable.tpl.c:8
-#: admin/fai/faiScript.tpl.c:8 admin/fai/faiProfile.tpl.c:8
-#: admin/fai/faiHookEntry.tpl.c:8
-msgid "Name"
-msgstr ""
-
-#: admin/fai/class_faiScriptEntry.inc:159 admin/fai/class_faiHookEntry.inc:170
-#: admin/fai/class_faiScript.inc:594 admin/fai/fai-list.xml:122
-#: admin/fai/faiScriptEntry.tpl.c:29 admin/fai/faiHookEntry.tpl.c:29
-msgid "Script"
-msgstr ""
-
-#: admin/fai/class_faiScriptEntry.inc:190
-#: admin/fai/class_faiScriptEntry.inc:199
-msgid "Script entry"
-msgstr ""
-
-#: admin/fai/class_faiScriptEntry.inc:191
-msgid "FAI script entry"
-msgstr ""
-
-#: admin/fai/class_faiScriptEntry.inc:198 admin/fai/class_faiPackage.inc:686
-#: admin/fai/class_faiPartitionTable.inc:780
-#: admin/fai/class_faiDiskEntry.inc:759
-#: admin/fai/class_faiTemplateEntry.inc:313
-#: admin/fai/class_faiPartitionTableEntry.inc:456
-#: admin/fai/class_faiProfile.inc:464 admin/fai/class_faiHookEntry.inc:208
-#: admin/fai/class_faiScript.inc:606 admin/fai/class_faiTemplate.inc:513
-#: admin/fai/class_faiVariableEntry.inc:150 admin/fai/class_faiHook.inc:532
-#: admin/fai/class_faiVariable.inc:399
-#: admin/fai/faiPartitionTableEntry.tpl.c:11 admin/fai/faiPartition.tpl.c:11
-#: admin/fai/faiVariableEntry.tpl.c:11 admin/fai/faiDiskEntry.tpl.c:14
-#: admin/fai/faiTemplate.tpl.c:11 admin/fai/faiVariable.tpl.c:11
-#: admin/fai/faiHook.tpl.c:11 admin/fai/faiPackage.tpl.c:11
-#: admin/fai/faiTemplateEntry.tpl.c:14 admin/fai/faiScriptEntry.tpl.c:11
-#: admin/fai/faiPartitionTable.tpl.c:11 admin/fai/faiScript.tpl.c:11
-#: admin/fai/faiProfile.tpl.c:11 admin/fai/faiHookEntry.tpl.c:11
-msgid "Description"
-msgstr ""
-
-#: admin/fai/class_faiScriptEntry.inc:200
-msgid "Script Priority"
-msgstr ""
-
-#: admin/fai/class_faiManagement.inc:188
-msgid "partition table"
-msgstr ""
-
-#: admin/fai/class_faiManagement.inc:189 admin/fai/fai-list.xml:31
-msgid "script"
-msgstr ""
-
-#: admin/fai/class_faiManagement.inc:190 admin/fai/fai-list.xml:47
-msgid "hook"
-msgstr ""
-
-#: admin/fai/class_faiManagement.inc:191 admin/fai/fai-list.xml:39
-msgid "variable"
-msgstr ""
-
-#: admin/fai/class_faiManagement.inc:192 admin/fai/fai-list.xml:63
-msgid "template"
-msgstr ""
-
-#: admin/fai/class_faiManagement.inc:193
-msgid "package list"
-msgstr ""
-
-#: admin/fai/class_faiManagement.inc:210 admin/fai/class_faiManagement.inc:226
-#: admin/fai/class_faiManagement.inc:332 admin/fai/class_faiManagement.inc:390
-#: admin/fai/class_faiManagement.inc:480 admin/fai/class_faiManagement.inc:575
-#: admin/fai/class_faiManagement.inc:598 admin/fai/class_faiManagement.inc:619
-msgid "Permission error"
-msgstr ""
-
-#: admin/fai/class_faiManagement.inc:211 admin/fai/class_faiManagement.inc:226
-#, php-format
-msgid "You have no permission to create a new %s!"
-msgstr ""
-
-#: admin/fai/class_faiManagement.inc:226 admin/fai/fai-list.xml:55
-msgid "profile"
-msgstr ""
-
-#: admin/fai/class_faiManagement.inc:328
-msgid "Branch locked"
-msgstr ""
-
-#: admin/fai/class_faiManagement.inc:329
-#, php-format
-msgid "The following entries are locked, you can't remove them %s."
-msgstr ""
-
-#: admin/fai/class_faiManagement.inc:346
-msgid "FAI object"
-msgstr ""
-
-#: admin/fai/class_faiManagement.inc:477
-msgid "FAI branch/freeze"
-msgstr ""
-
-#: admin/fai/class_faiManagement.inc:480
-msgid "You have no permission to delete this release!"
-msgstr ""
-
-#: admin/fai/class_faiManagement.inc:496 admin/fai/remove.tpl.c:2
-#: admin/fai/remove_branch.tpl.c:2
-msgid "Warning"
-msgstr ""
-
-#: admin/fai/class_faiManagement.inc:496
-msgid "Release remove aborted because the release name check failed!"
-msgstr ""
-
-#: admin/fai/class_faiManagement.inc:573 admin/fai/class_faiManagement.inc:596
-msgid "Configuration"
-msgstr ""
-
-#: admin/fai/class_faiManagement.inc:575 admin/fai/class_faiManagement.inc:598
-#: admin/fai/class_faiManagement.inc:619
-msgid "Branch"
-msgstr ""
-
-#: admin/fai/class_faiManagement.inc:725 admin/fai/askClassName.tpl.c:23
-msgid "Continue"
-msgstr ""
-
-#: admin/fai/class_faiManagement.inc:926
-#: admin/fai/class_faiPartitionTable.inc:768
-#: admin/fai/class_faiProfile.inc:318 admin/fai/class_askClassName.inc:99
-#: admin/fai/classSelect/class_classSelect.inc:58
-#: admin/fai/class_faiGroupHandle.inc:120
-#: admin/fai/class_faiProfileEntry.inc:163 admin/fai/fai-list.xml:146
-msgid "Partition table"
+#: admin/fai/class_faiManagement.inc:117 admin/fai/class_faiManagement.inc:122
+#: admin/fai/packageSelect/selectPackage-list.xml:14
+#: admin/systems/class_faiStartup.inc:178 config/fai/class_faiConfig.inc:41
+msgid "FAI"
 msgstr ""
 
-#: admin/fai/class_faiManagement.inc:928
-#: admin/fai/class_faiGroupHandle.inc:122 admin/fai/fai-list.xml:140
-msgid "Package list"
+#: admin/fai/class_faiManagement.inc:118
+msgid "Manage FAI software packages and deployment recipes"
 msgstr ""
 
-#: admin/fai/class_faiManagement.inc:930
-#: admin/fai/class_faiGroupHandle.inc:124
-msgid "Scripts"
+#: admin/fai/class_faiPackage.inc:157
+msgid "Mark for installation"
 msgstr ""
 
-#: admin/fai/class_faiManagement.inc:932
-#: admin/fai/class_faiGroupHandle.inc:126
-msgid "Variables"
+#: admin/fai/class_faiPackage.inc:161
+msgid "Mark for removal"
 msgstr ""
 
-#: admin/fai/class_faiManagement.inc:934
-#: admin/fai/class_faiGroupHandle.inc:128
-msgid "Hooks"
+#: admin/fai/class_faiPackage.inc:166
+msgid "Edit configuration"
 msgstr ""
 
-#: admin/fai/class_faiManagement.inc:936 admin/fai/class_faiProfile.inc:454
-#: admin/fai/class_askClassName.inc:104 admin/fai/class_faiGroupHandle.inc:130
-#: admin/fai/fai-list.xml:110
-msgid "Profile"
+#: admin/fai/class_faiPackage.inc:247
+#: admin/fai/class_faiPartitionTable.inc:209
+#: admin/fai/class_faiPartitionTable.inc:250
+#: admin/fai/class_faiTemplate.inc:114
+#: admin/systems/services/repository/class_serviceDebianRepository.inc:172
+#: admin/systems/services/repository/class_serviceDebianRepository.inc:189
+#: admin/systems/services/repository/class_serviceDebianRepository.inc:193
+msgid "LDAP error"
 msgstr ""
 
-#: admin/fai/class_faiManagement.inc:938
-#: admin/fai/class_faiGroupHandle.inc:132
-msgid "Templates"
+#: admin/fai/class_faiPackage.inc:279
+#: admin/fai/packageSelect/class_filterFAIPackages.inc:41
+#: admin/fai/packageSelect/class_filterFAIPackages.inc:46
+#: admin/fai/class_faiPackageConfiguration.inc:55
+#: admin/systems/class_faiStartup.inc:133
+#: admin/systems/class_faiStartup.inc:160
+msgid "Service infrastructure"
 msgstr ""
 
-#: admin/fai/class_faiManagement.inc:1039
-#: admin/fai/class_faiManagement.inc:1045
-#: admin/fai/packageSelect/selectPackage-list.xml:14
-#: admin/fai/classSelect/selectClass-list.xml:15
-#: admin/systems/class_faiStartup.inc:177 config/fai/class_faiConfig.inc:41
-msgid "FAI"
+#: admin/fai/class_faiPackage.inc:294
+msgid "Unkown packages"
 msgstr ""
 
-#: admin/fai/class_faiManagement.inc:1040
-msgid "Manage FAI software packages and deployment recipes"
+#: admin/fai/class_faiPackage.inc:365
+msgid "Package"
 msgstr ""
 
-#: admin/fai/class_faiPackage.inc:261
-msgid "Invalid package names"
+#: admin/fai/class_faiPackage.inc:366
+msgid "FAI Package list"
 msgstr ""
 
-#: admin/fai/class_faiPackage.inc:262
-#, php-format
-msgid "The following package names don't match the Debian policy: %s"
+#: admin/fai/class_faiPackage.inc:369
+msgid "FAI Package"
 msgstr ""
 
-#: admin/fai/class_faiPackage.inc:421 admin/fai/class_faiPackage.inc:422
-msgid "Configured"
+#: admin/fai/class_faiPackage.inc:385
+#: admin/fai/class_faiPartitionTable.inc:304
+#: admin/fai/class_faiTemplateEntry.inc:140 admin/fai/class_faiProfile.inc:47
+#: admin/fai/class_faiScript.inc:50 admin/fai/class_faiTemplate.inc:173
+#: admin/fai/class_faiHook.inc:50 admin/fai/class_faiVariable.inc:50
+msgid "Properties"
 msgstr ""
 
-#: admin/fai/class_faiPackage.inc:428 admin/fai/class_faiPackage.inc:429
-msgid "Package marked for removal"
+#: admin/fai/class_faiPackage.inc:388
+#: admin/fai/class_faiPartitionTable.inc:307 admin/fai/class_faiProfile.inc:50
+#: admin/fai/class_faiScript.inc:53 admin/fai/class_faiTemplate.inc:176
+#: admin/fai/class_faiHook.inc:53 admin/fai/class_faiVariable.inc:53
+msgid "Class name"
 msgstr ""
 
-#: admin/fai/class_faiPackage.inc:445
-msgid "Mark package for removal"
+#: admin/fai/class_faiPackage.inc:388 admin/fai/class_faiScript.inc:53
+#: admin/fai/class_faiHook.inc:53 admin/fai/class_faiVariable.inc:53
+msgid "Variables class name"
 msgstr ""
 
-#: admin/fai/class_faiPackage.inc:451
-msgid "Configure this package"
+#: admin/fai/class_faiPackage.inc:392
+#: admin/fai/class_faiPartitionTable.inc:311
+#: admin/fai/class_faiDiskEntry.inc:738
+#: admin/fai/class_faiTemplateEntry.inc:147 admin/fai/class_faiProfile.inc:54
+#: admin/fai/class_faiScript.inc:57 admin/fai/class_faiScript.inc:75
+#: admin/fai/class_faiTemplate.inc:180 admin/fai/class_faiHook.inc:57
+#: admin/fai/class_faiHook.inc:75 admin/fai/class_faiVariable.inc:57
+#: admin/fai/class_faiVariable.inc:75
+msgid "Description"
 msgstr ""
 
-#: admin/fai/class_faiPackage.inc:455
-msgid "Remove this package"
+#: admin/fai/class_faiPackage.inc:392
+#: admin/fai/class_faiPartitionTable.inc:311 admin/fai/class_faiProfile.inc:54
+#: admin/fai/class_faiScript.inc:57 admin/fai/class_faiTemplate.inc:180
+#: admin/fai/class_faiHook.inc:57 admin/fai/class_faiVariable.inc:57
+msgid "Short description of the class"
 msgstr ""
 
-#: admin/fai/class_faiPackage.inc:534
-msgid "Please select a least one package!"
+#: admin/fai/class_faiPackage.inc:398 admin/systems/class_faiStartup.inc:90
+msgid "Repository"
 msgstr ""
 
-#: admin/fai/class_faiPackage.inc:538
-msgid ""
-"Please choose a valid release/section combination for your repository setup!"
+#: admin/fai/class_faiPackage.inc:401 admin/systems/class_faiStartup.inc:78
+#: admin/systems/services/repository/class_serviceDebianRepository.inc:52
+#: admin/systems/services/repository/class_serviceCentosRepository.inc:49
+msgid "Release"
 msgstr ""
 
-#: admin/fai/class_faiPackage.inc:571
-#: admin/fai/packageSelect/class_filterFAIPackages.inc:41
-#: admin/fai/packageSelect/class_filterFAIPackages.inc:46
-#: admin/fai/class_faiPackageConfiguration.inc:55
-#: admin/systems/class_faiStartup.inc:132
-#: admin/systems/class_faiStartup.inc:159
-msgid "Infrastructure service"
+#: admin/fai/class_faiPackage.inc:401
+msgid "Debian release concerned"
 msgstr ""
 
-#: admin/fai/class_faiPackage.inc:587
-msgid "Unkown packages"
+#: admin/fai/class_faiPackage.inc:405
+#: admin/systems/services/repository/class_serviceDebianRepository.inc:58
+msgid "Sections"
 msgstr ""
 
-#: admin/fai/class_faiPackage.inc:674
-#: admin/fai/faiPackageConfiguration.tpl.c:2
-msgid "Package"
+#: admin/fai/class_faiPackage.inc:405
+msgid "Sections concerned"
 msgstr ""
 
-#: admin/fai/class_faiPackage.inc:675
-msgid "FAI Package list"
+#: admin/fai/class_faiPackage.inc:409
+msgid "Install method"
 msgstr ""
 
-#: admin/fai/class_faiPackage.inc:679
-msgid "FAI Package"
+#: admin/fai/class_faiPackage.inc:409
+msgid "Install method to use for this package list"
 msgstr ""
 
-#: admin/fai/class_faiPackage.inc:687
+#: admin/fai/class_faiPackage.inc:420
 msgid "Packages"
 msgstr ""
 
-#: admin/fai/class_faiPackage.inc:688 admin/fai/faiPackage.tpl.c:23
-msgid "Section"
-msgstr ""
-
-#: admin/fai/class_faiPackage.inc:688 admin/fai/class_faiPackage.inc:691
-#: admin/fai/class_faiScript.inc:605 admin/fai/class_faiTemplate.inc:512
-msgid "Readonly"
+#: admin/fai/class_faiPackage.inc:424
+msgid "Packages in this class"
 msgstr ""
 
-#: admin/fai/class_faiPackage.inc:689
-msgid "Install Method"
+#: admin/fai/class_faiPartitionTable.inc:61
+#: admin/fai/class_faiDiskEntry.inc:442 admin/systems/class_faiLogView.inc:207
+#: admin/systems/class_faiLogView.inc:242
+msgid "Error"
 msgstr ""
 
-#: admin/fai/class_faiPackage.inc:690
-msgid "Package configuration"
+#: admin/fai/class_faiPartitionTable.inc:112
+msgid "Add RAID"
 msgstr ""
 
-#: admin/fai/class_faiPackage.inc:691 admin/systems/class_faiStartup.inc:78
-#: admin/systems/services/repository/class_serviceRepository.inc:40
-#: admin/fai/branch_selector.tpl.c:14 admin/fai/faiPackage.tpl.c:20
-#: admin/fai/fai-filter.tpl.c:5 admin/fai/fai-filter.tpl.c:14
-msgid "Release"
+#: admin/fai/class_faiPartitionTable.inc:116
+msgid "Add LVM"
 msgstr ""
 
-#: admin/fai/class_faiPartitionTable.inc:269
-#: admin/fai/class_faiDiskEntry.inc:446
-#, php-format
-msgid ""
-"The disk cannot be deleted while it is used in the '%s' disk definition!"
+#: admin/fai/class_faiPartitionTable.inc:284
+msgid "Partition table"
 msgstr ""
 
-#: admin/fai/class_faiPartitionTable.inc:416 admin/fai/class_faiScript.inc:360
-#: admin/fai/class_faiScript.inc:362 admin/fai/class_faiTemplate.inc:306
-#: admin/fai/class_faiTemplate.inc:308
-msgid "edit"
+#: admin/fai/class_faiPartitionTable.inc:285
+#: admin/fai/class_faiPartitionTable.inc:288
+msgid "FAI partition table"
 msgstr ""
 
-#: admin/fai/class_faiPartitionTable.inc:418 admin/fai/class_faiScript.inc:364
-#: admin/fai/class_faiTemplate.inc:310
-msgid "delete"
+#: admin/fai/class_faiPartitionTable.inc:307 admin/fai/class_faiProfile.inc:50
+msgid "Partition table class name"
 msgstr ""
 
-#: admin/fai/class_faiPartitionTable.inc:769
-#: admin/fai/class_faiPartitionTable.inc:773
-msgid "FAI partition table"
+#: admin/fai/class_faiPartitionTable.inc:317
+msgid "Discs"
 msgstr ""
 
-#: admin/fai/class_faiPartitionTable.inc:779 admin/fai/class_faiHook.inc:531
-#: admin/fai/class_faiVariable.inc:398
-msgid "Read only"
+#: admin/fai/class_faiPartitionTable.inc:324
+msgid "Partitions in this class"
 msgstr ""
 
 #: admin/fai/class_faiDiskEntry.inc:273
-#: admin/fai/faiPartitionTableEntry.tpl.c:5 admin/fai/faiDiskEntry.tpl.c:5
 msgid "Device"
 msgstr ""
 
@@ -389,103 +198,103 @@ msgstr ""
 msgid "UUID"
 msgstr ""
 
-#: admin/fai/class_faiDiskEntry.inc:345
+#: admin/fai/class_faiDiskEntry.inc:344
 msgid "Disks"
 msgstr ""
 
-#: admin/fai/class_faiDiskEntry.inc:348 admin/fai/class_faiPartition.inc:321
-#: admin/fai/faiPartition.tpl.c:14
+#: admin/fai/class_faiDiskEntry.inc:347 admin/fai/class_faiPartition.inc:319
 msgid "Size"
 msgstr ""
 
-#: admin/fai/class_faiDiskEntry.inc:544
+#: admin/fai/class_faiDiskEntry.inc:443
+#, php-format
+msgid ""
+"The disk cannot be deleted while it is used in the '%s' disk definition!"
+msgstr ""
+
+#: admin/fai/class_faiDiskEntry.inc:536
 msgid "encrypted"
 msgstr ""
 
-#: admin/fai/class_faiDiskEntry.inc:547
+#: admin/fai/class_faiDiskEntry.inc:539
 msgid "bootable"
 msgstr ""
 
-#: admin/fai/class_faiDiskEntry.inc:550
+#: admin/fai/class_faiDiskEntry.inc:542
 msgid "preserve"
 msgstr ""
 
-#: admin/fai/class_faiDiskEntry.inc:735
+#: admin/fai/class_faiDiskEntry.inc:687 admin/fai/class_faiDiskEntry.inc:690
+#: admin/fai/class_faiDiskEntry.inc:737
+#: admin/fai/packageSelect/selectPackage-list.xml:40
+#: admin/fai/class_faiScript.inc:71 admin/fai/class_faiHook.inc:71
+#: admin/fai/class_faiVariable.inc:71
+#: admin/fai/class_faiSimplePluginClass.inc:50
+msgid "Name"
+msgstr ""
+
+#: admin/fai/class_faiDiskEntry.inc:717
 msgid ""
 "You have more than four primary partition table entries in your "
 "configuration, please check your configuration twice."
 msgstr ""
 
-#: admin/fai/class_faiDiskEntry.inc:739
+#: admin/fai/class_faiDiskEntry.inc:721
 msgid ""
 "You cannot have more than three primary partition while using logical "
 "partitions, please check your configuration twice."
 msgstr ""
 
-#: admin/fai/class_faiDiskEntry.inc:752
-#: admin/fai/class_faiPartitionTableEntry.inc:448
+#: admin/fai/class_faiDiskEntry.inc:733
 msgid "Partition table entry"
 msgstr ""
 
-#: admin/fai/class_faiDiskEntry.inc:753
-#: admin/fai/class_faiPartitionTableEntry.inc:449
+#: admin/fai/class_faiDiskEntry.inc:734
 msgid "FAI partition table entry"
 msgstr ""
 
-#: admin/fai/class_faiDiskEntry.inc:760
+#: admin/fai/class_faiDiskEntry.inc:739
 msgid "Disk options"
 msgstr ""
 
-#: admin/fai/class_faiDiskEntry.inc:761
-#: admin/fai/class_faiPartitionTableEntry.inc:457
+#: admin/fai/class_faiDiskEntry.inc:740
 msgid "Partition type"
 msgstr ""
 
-#: admin/fai/class_faiDiskEntry.inc:762
-#: admin/fai/class_faiPartitionTableEntry.inc:458
+#: admin/fai/class_faiDiskEntry.inc:741
 msgid "Partition no."
 msgstr ""
 
-#: admin/fai/class_faiDiskEntry.inc:763
-#: admin/fai/class_faiPartitionTableEntry.inc:459
+#: admin/fai/class_faiDiskEntry.inc:742
 msgid "File system type"
 msgstr ""
 
-#: admin/fai/class_faiDiskEntry.inc:764
-#: admin/fai/class_faiPartitionTableEntry.inc:171
-#: admin/fai/class_faiPartitionTableEntry.inc:460
-#: admin/fai/class_faiPartition.inc:437 admin/fai/faiPartition.tpl.c:47
+#: admin/fai/class_faiDiskEntry.inc:743 admin/fai/class_faiPartition.inc:432
 msgid "Mount point"
 msgstr ""
 
-#: admin/fai/class_faiDiskEntry.inc:765
-#: admin/fai/class_faiPartitionTableEntry.inc:461
-#: admin/fai/class_faiPartition.inc:402 admin/fai/class_faiPartition.inc:407
+#: admin/fai/class_faiDiskEntry.inc:744 admin/fai/class_faiPartition.inc:397
+#: admin/fai/class_faiPartition.inc:402
 msgid "Partition size"
 msgstr ""
 
-#: admin/fai/class_faiDiskEntry.inc:766
-#: admin/fai/class_faiPartitionTableEntry.inc:173
-#: admin/fai/class_faiPartitionTableEntry.inc:462
-#: admin/fai/faiPartition.tpl.c:50
+#: admin/fai/class_faiDiskEntry.inc:745
 msgid "Mount options"
 msgstr ""
 
-#: admin/fai/class_faiDiskEntry.inc:767
-#: admin/fai/class_faiPartitionTableEntry.inc:463
+#: admin/fai/class_faiDiskEntry.inc:746
 msgid "File system options"
 msgstr ""
 
-#: admin/fai/class_faiDiskEntry.inc:768
-#: admin/fai/class_faiPartitionTableEntry.inc:464
+#: admin/fai/class_faiDiskEntry.inc:747
 msgid "Partition flags"
 msgstr ""
 
-#: admin/fai/class_debconfTemplate.inc:227
+#: admin/fai/class_debconfTemplate.inc:225
 msgid "This package has no debconf options."
 msgstr ""
 
-#: admin/fai/class_debconfTemplate.inc:264
+#: admin/fai/class_debconfTemplate.inc:262
 msgid ""
 "This debconf question is dynamically generated during package installation "
 "and requires choosing between specific options which cannot be presented "
@@ -493,217 +302,59 @@ msgid ""
 " effect."
 msgstr ""
 
-#: admin/fai/class_faiTemplateEntry.inc:139
-msgid "no file uploaded yet"
-msgstr ""
-
-#: admin/fai/class_faiTemplateEntry.inc:142
-#, php-format
-msgid "exists in database (size: %s bytes)"
-msgstr ""
-
-#: admin/fai/class_faiTemplateEntry.inc:251
-#: admin/systems/class_faiLogView.inc:70 admin/fai/faiTemplateEntry.tpl.c:23
-msgid "File"
-msgstr ""
-
-#: admin/fai/class_faiTemplateEntry.inc:255
-#: admin/fai/faiTemplateEntry.tpl.c:11
-msgid "Destination path"
+#: admin/fai/class_faiTemplateEntry.inc:143
+msgid "File path"
 msgstr ""
 
-#: admin/fai/class_faiTemplateEntry.inc:260 admin/fai/faiTemplateEntry.tpl.c:8
-msgid "File name"
+#: admin/fai/class_faiTemplateEntry.inc:143
+msgid "Complete absolute template file path and name"
 msgstr ""
 
-#: admin/fai/class_faiTemplateEntry.inc:264
-#: admin/fai/class_faiTemplateEntry.inc:266
-#: admin/fai/faiTemplateEntry.tpl.c:68
-msgid "User"
+#: admin/fai/class_faiTemplateEntry.inc:147
+msgid "Short description of the file"
 msgstr ""
 
-#: admin/fai/class_faiTemplateEntry.inc:270
-#: admin/fai/class_faiTemplateEntry.inc:273
-#: admin/fai/class_faiTemplateEntry.inc:275
-#: admin/fai/faiTemplateEntry.tpl.c:47 admin/fai/faiTemplateEntry.tpl.c:74
-msgid "Group"
+#: admin/fai/class_faiTemplateEntry.inc:156
+msgid "Template attributes"
 msgstr ""
 
-#: admin/fai/class_faiTemplateEntry.inc:305
-msgid "Template entry"
+#: admin/fai/class_faiTemplateEntry.inc:160
+msgid "Template file content"
 msgstr ""
 
-#: admin/fai/class_faiTemplateEntry.inc:306
-msgid "FAI template entry"
+#: admin/fai/class_faiTemplateEntry.inc:160
+msgid "Content of the template file"
 msgstr ""
 
-#: admin/fai/class_faiTemplateEntry.inc:314
-msgid "Template file"
+#: admin/fai/class_faiTemplateEntry.inc:164
+msgid "Owner and group of the file"
 msgstr ""
 
-#: admin/fai/class_faiTemplateEntry.inc:315
-msgid "Template path"
+#: admin/fai/class_faiTemplateEntry.inc:167
+msgid "Owner"
 msgstr ""
 
-#: admin/fai/class_faiTemplateEntry.inc:316
+#: admin/fai/class_faiTemplateEntry.inc:167
 msgid "File owner"
 msgstr ""
 
-#: admin/fai/class_faiTemplateEntry.inc:317
-msgid "File permissions"
-msgstr ""
-
-#: admin/fai/class_FAI.inc:287 admin/fai/class_FAI.inc:679
-#: admin/fai/class_FAI.inc:1266 admin/fai/class_FAI.inc:1283
-#: admin/fai/class_FAI.inc:1287
-msgid "LDAP error"
-msgstr ""
-
-#: admin/fai/class_FAI.inc:570
-#, php-format
-msgid "Error, following objects should be equal '%s' and '%s'"
-msgstr ""
-
-#: admin/fai/class_FAI.inc:891
-#, php-format
-msgid "Creating group application release for %s"
-msgstr ""
-
-#: admin/fai/class_FAI.inc:960 admin/fai/class_FAI.inc:982
-#: admin/fai/class_FAI.inc:1022 admin/fai/class_FAI.inc:1027
-#: admin/fai/class_FAI.inc:1065
-msgid "Object"
-msgstr ""
-
-#: admin/fai/class_FAI.inc:961
-#, php-format
-msgid "Adding missing group application release container %s."
-msgstr ""
-
-#: admin/fai/class_FAI.inc:983
-#, php-format
-msgid "Adding group application release container %s."
-msgstr ""
-
-#: admin/fai/class_FAI.inc:1023
-#, php-format
-msgid "Could not create menu entry %s. (Already exists)."
-msgstr ""
-
-#: admin/fai/class_FAI.inc:1028
-#, php-format
-msgid "Created group application menu entry for %s."
-msgstr ""
-
-#: admin/fai/class_FAI.inc:1059
-#, php-format
-msgid "Creating copy of %s"
-msgstr ""
-
-#: admin/fai/class_FAI.inc:1062
-msgid "Processing"
-msgstr ""
-
-#: admin/fai/class_FAI.inc:1080
-msgid "Could not create new release, the destination dn is already in use."
-msgstr ""
-
-#: admin/fai/class_FAI.inc:1093
-msgid "Error while fetching source dn - aborted!"
-msgstr ""
-
-#: admin/fai/class_FAI.inc:1174
-msgid "Fatal error"
-msgstr ""
-
-#: admin/fai/class_FAI.inc:1175
-#, php-format
-msgid ""
-"Release creation failed due to ldap errors. Additional informations '%s'."
-msgstr ""
-
-#: admin/fai/class_faiPartitionTableEntry.inc:162
-msgid "primary"
-msgstr ""
-
-#: admin/fai/class_faiPartitionTableEntry.inc:162
-msgid "logical"
-msgstr ""
-
-#: admin/fai/class_faiPartitionTableEntry.inc:169
-#: admin/fai/faiPartition.tpl.c:8
-msgid "Type"
-msgstr ""
-
-#: admin/fai/class_faiPartitionTableEntry.inc:170
-msgid "FS type"
-msgstr ""
-
-#: admin/fai/class_faiPartitionTableEntry.inc:172
-msgid "Size in MB"
-msgstr ""
-
-#: admin/fai/class_faiPartitionTableEntry.inc:174
-msgid "FS option"
-msgstr ""
-
-#: admin/fai/class_faiPartitionTableEntry.inc:175
-#: admin/fai/faiPartition.tpl.c:23
-msgid "Preserve"
-msgstr ""
-
-#: admin/fai/class_faiPartitionTableEntry.inc:266
-msgid "False"
-msgstr ""
-
-#: admin/fai/class_faiPartitionTableEntry.inc:268
-msgid "True"
-msgstr ""
-
-#: admin/fai/class_faiPartitionTableEntry.inc:272
-#: admin/fai/class_faiPartitionTableEntry.inc:274 admin/fai/fai-list.xml:159
-#: admin/fai/fai-list.xml:198
-msgid "Remove"
-msgstr ""
-
-#: admin/fai/class_faiPartitionTableEntry.inc:384
-#, php-format
-msgid "please enter a unique mount point for partition %s"
-msgstr ""
-
-#: admin/fai/class_faiPartitionTableEntry.inc:389
-#, php-format
-msgid "partition %s mount point"
-msgstr ""
-
-#: admin/fai/class_faiPartitionTableEntry.inc:394
-#, php-format
-msgid ""
-"File system type 'swap' is already used, change file system type for "
-"partition %s."
+#: admin/fai/class_faiTemplateEntry.inc:172
+msgid "Group"
 msgstr ""
 
-#: admin/fai/class_faiPartitionTableEntry.inc:398
-msgid "Please use 'swap' as mount point, if 'swap' is used as fs-type."
+#: admin/fai/class_faiTemplateEntry.inc:172
+msgid "File group"
 msgstr ""
 
-#: admin/fai/class_faiPartitionTableEntry.inc:404
-#: admin/fai/class_faiPartitionTableEntry.inc:408
-#: admin/fai/class_faiPartitionTableEntry.inc:414
-#: admin/fai/class_faiPartitionTableEntry.inc:416
-#: admin/fai/class_faiPartitionTableEntry.inc:421
-#, php-format
-msgid "partition %s size"
+#: admin/fai/class_faiTemplateEntry.inc:181
+msgid "Access"
 msgstr ""
 
-#: admin/fai/class_faiPartitionTableEntry.inc:436
-msgid ""
-"You have more than 3 primary partition table entries in your configuration, "
-"please check your configuration twice."
+#: admin/fai/class_faiTemplateEntry.inc:181
+msgid "Access rights"
 msgstr ""
 
 #: admin/fai/packageSelect/selectPackage-list.xml:10
-#: admin/fai/classSelect/selectClass-list.xml:11
 msgid "Please select the desired entries"
 msgstr ""
 
@@ -711,147 +362,94 @@ msgstr ""
 msgid "Version"
 msgstr ""
 
-#: admin/fai/class_faiProfile.inc:310
-msgid "This list displays all assigned class names for this profile."
-msgstr ""
-
-#: admin/fai/class_faiProfile.inc:313 admin/fai/class_askClassName.inc:103
-#: admin/fai/classSelect/class_classSelect.inc:53
-#: admin/fai/class_faiProfileEntry.inc:158
-msgid "Hook bundle"
-msgstr ""
-
-#: admin/fai/class_faiProfile.inc:314 admin/fai/class_askClassName.inc:105
-#: admin/fai/classSelect/class_classSelect.inc:54
-#: admin/fai/class_faiProfileEntry.inc:159
-msgid "Template bundle"
-msgstr ""
-
-#: admin/fai/class_faiProfile.inc:315 admin/fai/class_askClassName.inc:101
-#: admin/fai/classSelect/class_classSelect.inc:55
-#: admin/fai/class_faiProfileEntry.inc:160
-msgid "Script bundle"
-msgstr ""
-
-#: admin/fai/class_faiProfile.inc:316 admin/fai/class_askClassName.inc:102
-#: admin/fai/classSelect/class_classSelect.inc:56
-#: admin/fai/class_faiProfileEntry.inc:161
-msgid "Variable bundle"
-msgstr ""
-
-#: admin/fai/class_faiProfile.inc:317 admin/fai/class_askClassName.inc:100
-#: admin/fai/classSelect/class_classSelect.inc:57
-#: admin/fai/class_faiProfileEntry.inc:162
-msgid "Package bundle"
-msgstr ""
-
-#: admin/fai/class_faiProfile.inc:321
-msgid "Remove class from profile"
-msgstr ""
-
-#: admin/fai/class_faiProfile.inc:324
-msgid "Up"
-msgstr ""
-
-#: admin/fai/class_faiProfile.inc:325
-msgid "Down"
-msgstr ""
-
-#: admin/fai/class_faiProfile.inc:410
-msgid "No class specified for this profile!"
-msgstr ""
-
-#: admin/fai/class_faiProfile.inc:419
-msgid "You can't use the same name for a class and a profile!"
+#: admin/fai/class_faiProfile.inc:28
+msgid "Profile"
 msgstr ""
 
-#: admin/fai/class_faiProfile.inc:455
+#: admin/fai/class_faiProfile.inc:29
 msgid "FAI profile"
 msgstr ""
 
-#: admin/fai/class_faiProfile.inc:458
+#: admin/fai/class_faiProfile.inc:32
 msgid "FAI Profile"
 msgstr ""
 
-#: admin/fai/class_faiProfile.inc:465 admin/fai/faiProfile.tpl.c:17
+#: admin/fai/class_faiProfile.inc:61
 msgid "FAI classes"
 msgstr ""
 
-#: admin/fai/class_faiHookEntry.inc:200
-msgid "Hook entry"
+#: admin/fai/class_faiProfile.inc:61
+msgid "FAI classes which are part of this profile"
 msgstr ""
 
-#: admin/fai/class_faiHookEntry.inc:201
-msgid "FAI hook entry"
+#: admin/fai/class_faiPackageConfiguration.inc:88
+#, php-format
+msgid "Debconf information for package '%s'"
 msgstr ""
 
-#: admin/fai/class_faiHookEntry.inc:209 admin/fai/faiHookEntry.tpl.c:20
-msgid "Task"
+#: admin/fai/class_faiScript.inc:30 admin/fai/class_faiScript.inc:84
+#: admin/fai/class_faiHook.inc:87
+msgid "Script"
 msgstr ""
 
-#: admin/fai/class_faiHookEntry.inc:210 admin/fai/class_faiScript.inc:595
-#: admin/fai/class_faiScript.inc:599
+#: admin/fai/class_faiScript.inc:31 admin/fai/class_faiScript.inc:34
 msgid "FAI script"
 msgstr ""
 
-#: admin/fai/class_faiPackageConfiguration.inc:88
-#, php-format
-msgid "Debconf information for package '%s'"
+#: admin/fai/class_faiScript.inc:63
+msgid "Scripts"
 msgstr ""
 
-#: admin/fai/class_askClassName.inc:99 admin/fai/class_askClassName.inc:100
-#: admin/fai/class_askClassName.inc:101 admin/fai/class_askClassName.inc:102
-#: admin/fai/class_askClassName.inc:103 admin/fai/class_askClassName.inc:104
-#: admin/fai/class_askClassName.inc:105 admin/fai/class_askClassName.inc:106
-msgid "Create new FAI object"
+#: admin/fai/class_faiScript.inc:67 admin/fai/class_faiHook.inc:67
+#: admin/fai/class_faiVariable.inc:67
+msgid "Variables in this class"
 msgstr ""
 
-#: admin/fai/class_faiTemplateEdit.inc:80
-#, php-format
-msgid ""
-"The file encodig has changed from '%s' to '%s'. Do you really want to save?"
+#: admin/fai/class_faiScript.inc:71 admin/fai/class_faiHook.inc:71
+#: admin/fai/class_faiVariable.inc:71
+msgid "The name of the variable"
 msgstr ""
 
-#: admin/fai/class_faiScript.inc:333 admin/fai/class_faiScript.inc:335
-msgid "Sort direction"
+#: admin/fai/class_faiScript.inc:75 admin/fai/class_faiHook.inc:75
+#: admin/fai/class_faiVariable.inc:75
+msgid "A short description of the variable"
 msgstr ""
 
-#: admin/fai/class_faiScript.inc:348 admin/fai/faiScriptEntry.tpl.c:20
+#: admin/fai/class_faiScript.inc:79
 msgid "Priority"
 msgstr ""
 
-#: admin/fai/class_faiScript.inc:350
-msgid "Action"
+#: admin/fai/class_faiScript.inc:79
+msgid "Priority of this script (FIXME: less is done first?)"
 msgstr ""
 
-#: admin/fai/classSelect/selectClass-list.xml:36 admin/fai/fai-list.xml:88
-#: admin/fai/faiScriptEntry.tpl.c:14
-msgid "Properties"
+#: admin/fai/class_faiScript.inc:84
+msgid "The script itself"
 msgstr ""
 
-#: admin/fai/class_faiTemplate.inc:501 admin/fai/fai-list.xml:116
-msgid "Template"
+#: admin/fai/class_faiTemplate.inc:136
+#, php-format
+msgid "There are several files with the same path: %s"
 msgstr ""
 
-#: admin/fai/class_faiTemplate.inc:502 admin/fai/class_faiTemplate.inc:506
-msgid "FAI template"
+#: admin/fai/class_faiTemplate.inc:153
+msgid "Template"
 msgstr ""
 
-#: admin/fai/class_faiVariableEntry.inc:107
-msgid "Content"
+#: admin/fai/class_faiTemplate.inc:154 admin/fai/class_faiTemplate.inc:157
+msgid "FAI template"
 msgstr ""
 
-#: admin/fai/class_faiVariableEntry.inc:142
-msgid "Variable entry"
+#: admin/fai/class_faiTemplate.inc:176
+msgid "Template class name"
 msgstr ""
 
-#: admin/fai/class_faiVariableEntry.inc:143
-msgid "FAI variable entry "
+#: admin/fai/class_faiTemplate.inc:186
+msgid "Template files"
 msgstr ""
 
-#: admin/fai/class_faiVariableEntry.inc:151
-#: admin/fai/faiVariableEntry.tpl.c:20
-msgid "Variable content"
+#: admin/fai/class_faiTemplate.inc:190
+msgid "Template files in this class"
 msgstr ""
 
 #: admin/fai/class_faiPartition.inc:176 admin/fai/class_faiPartition.inc:180
@@ -950,94 +548,73 @@ msgstr ""
 msgid "btrfs"
 msgstr ""
 
-#: admin/fai/class_faiPartition.inc:224
-msgid "LVM/RAID"
-msgstr ""
-
-#: admin/fai/class_faiPartition.inc:327
+#: admin/fai/class_faiPartition.inc:325
 msgid "spare"
 msgstr ""
 
-#: admin/fai/class_faiPartition.inc:330
+#: admin/fai/class_faiPartition.inc:328
 msgid "missing"
 msgstr ""
 
-#: admin/fai/class_faiPartition.inc:333
+#: admin/fai/class_faiPartition.inc:331
 msgid "Options"
 msgstr ""
 
-#: admin/fai/class_faiPartition.inc:420
+#: admin/fai/class_faiPartition.inc:415
 msgid "Minimum partition size"
 msgstr ""
 
-#: admin/fai/class_faiPartition.inc:420
+#: admin/fai/class_faiPartition.inc:415
 msgid "Maximum partition size"
 msgstr ""
 
-#: admin/fai/class_faiPartition.inc:428
+#: admin/fai/class_faiPartition.inc:423
 msgid "Raid arrays must contain at least two partitions!"
 msgstr ""
 
-#: admin/fai/class_faiPartition.inc:430
+#: admin/fai/class_faiPartition.inc:425
 msgid ""
 "Raid 0 arrays can only be realized with a combination of two partitions!"
 msgstr ""
 
-#: admin/fai/class_faiHook.inc:332 admin/fai/class_faiHook.inc:334
-#: admin/fai/fai-list.xml:190 admin/fai/faiVariable.tpl.c:23
-#: admin/fai/faiVariable.tpl.c:26
-msgid "Edit"
-msgstr ""
-
-#: admin/fai/class_faiHook.inc:336
-msgid "Delete"
-msgstr ""
-
-#: admin/fai/class_faiHook.inc:521 admin/fai/fai-list.xml:128
+#: admin/fai/class_faiHook.inc:30
 msgid "Hook"
 msgstr ""
 
-#: admin/fai/class_faiHook.inc:522 admin/fai/class_faiHook.inc:526
+#: admin/fai/class_faiHook.inc:31 admin/fai/class_faiHook.inc:34
 msgid "FAI hook"
 msgstr ""
 
-#: admin/fai/class_faiVariable.inc:387 admin/fai/fai-list.xml:134
-msgid "Variable"
-msgstr ""
-
-#: admin/fai/class_faiVariable.inc:388 admin/fai/class_faiVariable.inc:392
-msgid "FAI variable"
+#: admin/fai/class_faiHook.inc:63
+msgid "Hooks"
 msgstr ""
 
-#: admin/fai/class_faiProfileEntry.inc:184 admin/fai/askClassName.tpl.c:11
-#: admin/fai/askClassName.tpl.c:17 admin/fai/paste_generic.tpl.c:5
-msgid "Class name"
+#: admin/fai/class_faiHook.inc:79
+msgid "Task"
 msgstr ""
 
-#: admin/fai/class_faiProfileEntry.inc:184 admin/fai/faiTemplate.tpl.c:14
-#: admin/fai/faiVariable.tpl.c:14 admin/fai/faiHook.tpl.c:14
-#: admin/fai/faiPartitionTable.tpl.c:17 admin/fai/faiScript.tpl.c:14
-msgid "Objects"
+#: admin/fai/class_faiHook.inc:87
+msgid "The script of this hook"
 msgstr ""
 
-#: admin/fai/fai-list.xml:11
-msgid "List of deployment classes and products"
+#: admin/fai/class_faiVariable.inc:30
+msgid "Variable"
 msgstr ""
 
-#: admin/fai/fai-list.xml:15
-msgid "partitionTable"
+#: admin/fai/class_faiVariable.inc:31 admin/fai/class_faiVariable.inc:34
+msgid "FAI variable"
 msgstr ""
 
-#: admin/fai/fai-list.xml:23
-msgid "packagelist"
+#: admin/fai/class_faiVariable.inc:63
+msgid "Variables"
 msgstr ""
 
-#: admin/fai/fai-list.xml:93
-msgid "Actions"
+#: admin/fai/class_faiVariable.inc:79
+msgid "Content"
 msgstr ""
 
-#: admin/fai/fai-list.xml:104
-msgid "Create"
+#: admin/fai/class_faiVariable.inc:79
+msgid "The content of the variable"
 msgstr ""
 
 #: admin/systems/class_faiLogView.inc:56
@@ -1048,6 +625,10 @@ msgstr ""
 msgid "Sort up"
 msgstr ""
 
+#: admin/systems/class_faiLogView.inc:70
+msgid "File"
+msgstr ""
+
 #: admin/systems/class_faiLogView.inc:71
 msgid "Date"
 msgstr ""
@@ -1082,7 +663,7 @@ msgstr ""
 msgid "Selected file: %s"
 msgstr ""
 
-#: admin/systems/class_faiStartup.inc:70 admin/fai/paste_generic.tpl.c:2
+#: admin/systems/class_faiStartup.inc:70
 msgid "FAI settings"
 msgstr ""
 
@@ -1102,11 +683,6 @@ msgstr ""
 msgid "FAI profil to be applied to this computer"
 msgstr ""
 
-#: admin/systems/class_faiStartup.inc:90 admin/fai/faiPackage.tpl.c:14
-#: admin/fai/faiPackage.tpl.c:17
-msgid "Repository"
-msgstr ""
-
 #: admin/systems/class_faiStartup.inc:90
 msgid "FAI Debian repository to be used for installation"
 msgstr ""
@@ -1131,85 +707,96 @@ msgstr ""
 msgid "Linux kernel parameters to be ran"
 msgstr ""
 
-#: admin/systems/class_faiStartup.inc:178
+#: admin/systems/class_faiStartup.inc:179
 msgid "Full automated installation"
 msgstr ""
 
-#: admin/systems/services/repository/class_serviceRepository.inc:31
+#: admin/systems/services/repository/class_serviceDebianRepository.inc:34
+#: admin/systems/services/repository/class_serviceCentosRepository.inc:31
+msgid "Repositories"
+msgstr ""
+
+#: admin/systems/services/repository/class_serviceDebianRepository.inc:39
+#: admin/systems/services/repository/class_serviceCentosRepository.inc:36
+msgid "Repositories this server hosts"
+msgstr ""
+
+#: admin/systems/services/repository/class_serviceDebianRepository.inc:43
+#: admin/systems/services/repository/class_serviceCentosRepository.inc:40
 msgid "URL"
 msgstr ""
 
-#: admin/systems/services/repository/class_serviceRepository.inc:31
+#: admin/systems/services/repository/class_serviceDebianRepository.inc:43
+#: admin/systems/services/repository/class_serviceCentosRepository.inc:40
 msgid "Repository url"
 msgstr ""
 
-#: admin/systems/services/repository/class_serviceRepository.inc:35
+#: admin/systems/services/repository/class_serviceDebianRepository.inc:47
+#: admin/systems/services/repository/class_serviceCentosRepository.inc:44
 msgid "Parent server"
 msgstr ""
 
-#: admin/systems/services/repository/class_serviceRepository.inc:35
+#: admin/systems/services/repository/class_serviceDebianRepository.inc:47
+#: admin/systems/services/repository/class_serviceCentosRepository.inc:44
 msgid "Parent repository server"
 msgstr ""
 
-#: admin/systems/services/repository/class_serviceRepository.inc:40
-msgid "Release used on this repository"
+#: admin/systems/services/repository/class_serviceDebianRepository.inc:52
+msgid "Debian release used on this repository"
 msgstr ""
 
-#: admin/systems/services/repository/class_serviceRepository.inc:47
-msgid "Sections"
-msgstr ""
-
-#: admin/systems/services/repository/class_serviceRepository.inc:47
-msgid "Sections available on this repository"
+#: admin/systems/services/repository/class_serviceDebianRepository.inc:58
+msgid "Debian sections available on this repository"
 msgstr ""
 
-#: admin/systems/services/repository/class_serviceRepository.inc:52
+#: admin/systems/services/repository/class_serviceDebianRepository.inc:63
+#: admin/systems/services/repository/class_serviceCentosRepository.inc:57
 msgid "Mirror mode"
 msgstr ""
 
-#: admin/systems/services/repository/class_serviceRepository.inc:52
+#: admin/systems/services/repository/class_serviceDebianRepository.inc:63
+#: admin/systems/services/repository/class_serviceCentosRepository.inc:57
 msgid ""
 "Is this mirror an installation repository? Is its release a custom one?"
 msgstr ""
 
-#: admin/systems/services/repository/class_serviceRepository.inc:57
+#: admin/systems/services/repository/class_serviceDebianRepository.inc:68
+#: admin/systems/services/repository/class_serviceCentosRepository.inc:62
 msgid "Local mirror"
 msgstr ""
 
-#: admin/systems/services/repository/class_serviceRepository.inc:57
+#: admin/systems/services/repository/class_serviceDebianRepository.inc:68
+#: admin/systems/services/repository/class_serviceCentosRepository.inc:62
 msgid "Is this mirror a local or a network mirror?"
 msgstr ""
 
-#: admin/systems/services/repository/class_serviceRepository.inc:66
+#: admin/systems/services/repository/class_serviceDebianRepository.inc:77
+#: admin/systems/services/repository/class_serviceCentosRepository.inc:71
 msgid "Architectures"
 msgstr ""
 
-#: admin/systems/services/repository/class_serviceRepository.inc:66
+#: admin/systems/services/repository/class_serviceDebianRepository.inc:77
+#: admin/systems/services/repository/class_serviceCentosRepository.inc:71
 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:140
-msgid "Repositories"
+#: admin/systems/services/repository/class_serviceDebianRepository.inc:99
+#: admin/systems/services/repository/class_serviceDebianRepository.inc:100
+msgid "Debian repository"
 msgstr ""
 
-#: admin/systems/services/repository/class_serviceRepository.inc:145
-msgid "Repositories this server hosts"
+#: admin/systems/services/repository/class_serviceDebianRepository.inc:100
+#: admin/systems/services/repository/class_serviceCentosRepository.inc:96
+msgid "Services"
 msgstr ""
 
-#: admin/systems/services/repository/class_serviceRepository.inc:160
-msgid "Package repository"
+#: admin/systems/services/repository/class_serviceCentosRepository.inc:49
+msgid "Centos release used on this repository"
 msgstr ""
 
-#: admin/systems/services/repository/class_serviceRepository.inc:161
-msgid "Package repository information"
+#: admin/systems/services/repository/class_serviceCentosRepository.inc:95
+#: admin/systems/services/repository/class_serviceCentosRepository.inc:96
+msgid "Centos repository"
 msgstr ""
 
 #: config/fai/class_faiConfig.inc:28
@@ -1241,476 +828,3 @@ msgstr ""
 #: config/fai/class_faiConfig.inc:60
 msgid "s"
 msgstr ""
-
-#: admin/fai/faiPartitionTableEntry.tpl.c:2 admin/fai/faiVariableEntry.tpl.c:2
-#: admin/fai/faiVariableEntry.tpl.c:5 admin/fai/faiDiskEntry.tpl.c:2
-#: admin/fai/faiTemplate.tpl.c:2 admin/fai/faiTemplate.tpl.c:5
-#: admin/fai/faiVariable.tpl.c:2 admin/fai/faiVariable.tpl.c:5
-#: admin/fai/faiHook.tpl.c:2 admin/fai/faiHook.tpl.c:5
-#: admin/fai/faiPackage.tpl.c:2 admin/fai/faiPackage.tpl.c:5
-#: admin/fai/faiTemplateEntry.tpl.c:2 admin/fai/faiTemplateEntry.tpl.c:5
-#: admin/fai/faiScriptEntry.tpl.c:2 admin/fai/faiScriptEntry.tpl.c:5
-#: admin/fai/faiPartitionTable.tpl.c:2 admin/fai/faiPartitionTable.tpl.c:5
-#: admin/fai/faiScript.tpl.c:2 admin/fai/faiScript.tpl.c:5
-#: admin/fai/faiProfile.tpl.c:2 admin/fai/faiProfile.tpl.c:5
-#: admin/fai/faiProfile.tpl.c:14 admin/fai/faiHookEntry.tpl.c:2
-#: admin/fai/faiHookEntry.tpl.c:5
-msgid "Generic"
-msgstr ""
-
-#: admin/fai/faiPartitionTableEntry.tpl.c:14
-#: admin/fai/faiPartitionTableEntry.tpl.c:17 admin/fai/faiDiskEntry.tpl.c:23
-#: admin/fai/faiDiskEntry.tpl.c:26
-msgid "Partition entries"
-msgstr ""
-
-#: admin/fai/faiPartitionTableEntry.tpl.c:20
-#: admin/fai/faiPartitionTableEntry.tpl.c:23 admin/fai/faiDiskEntry.tpl.c:29
-#: admin/fai/faiDiskEntry.tpl.c:32
-msgid "Add partition"
-msgstr ""
-
-#: admin/fai/branch_selector.tpl.c:2
-msgid "Releases"
-msgstr ""
-
-#: admin/fai/branch_selector.tpl.c:5
-msgid "Current release"
-msgstr ""
-
-#: admin/fai/branch_selector.tpl.c:8 admin/fai/branch_selector.tpl.c:17
-#: admin/fai/fai-filter.tpl.c:8 admin/fai/fai-filter.tpl.c:17
-msgid "Create release"
-msgstr ""
-
-#: admin/fai/branch_selector.tpl.c:11 admin/fai/branch_selector.tpl.c:23
-#: admin/fai/fai-filter.tpl.c:11 admin/fai/fai-filter.tpl.c:23
-msgid "Create read-only release"
-msgstr ""
-
-#: admin/fai/branch_selector.tpl.c:20 admin/fai/fai-filter.tpl.c:20
-msgid "Freeze"
-msgstr ""
-
-#: admin/fai/branch_selector.tpl.c:26 admin/fai/fai-filter.tpl.c:26
-msgid "Delete current release"
-msgstr ""
-
-#: admin/fai/faiPartition.tpl.c:2
-msgid "Partition"
-msgstr ""
-
-#: admin/fai/faiPartition.tpl.c:17
-msgid "Resize existing partition"
-msgstr ""
-
-#: admin/fai/faiPartition.tpl.c:20
-msgid "Bootable"
-msgstr ""
-
-#: admin/fai/faiPartition.tpl.c:26 admin/fai/faiDiskEntry.tpl.c:20
-msgid "Combined physical partitions"
-msgstr ""
-
-#: admin/fai/faiPartition.tpl.c:29
-msgid "Toggle missing"
-msgstr ""
-
-#: admin/fai/faiPartition.tpl.c:32
-msgid "Toggle spare"
-msgstr ""
-
-#: admin/fai/faiPartition.tpl.c:35
-msgid "Filesystem"
-msgstr ""
-
-#: admin/fai/faiPartition.tpl.c:38
-msgid "Filesystem create options"
-msgstr ""
-
-#: admin/fai/faiPartition.tpl.c:41
-msgid "Encrypted"
-msgstr ""
-
-#: admin/fai/faiPartition.tpl.c:44
-msgid "Tune options"
-msgstr ""
-
-#: admin/fai/faiNewBranch.tpl.c:2
-msgid ""
-"You are now going to create a branch or locked branch. This action clones "
-"the existing release to another release name. Branches can be modified as "
-"usual. FAI classes of locked branches cannot be modified, just additional "
-"classes are possible. Branch names should be alphanumeric, excluding the "
-"reserved names 'scripts', 'hooks', 'partitions', 'variables', 'templates' "
-"and 'fai'."
-msgstr ""
-
-#: admin/fai/faiNewBranch.tpl.c:5
-msgid ""
-"Branches are created as subreleases of the currently selected branch. "
-"Creating a new branch named 1.0.2 in SARGE for example, will result in a new"
-" release called SARGE/1.0.2."
-msgstr ""
-
-#: admin/fai/faiNewBranch.tpl.c:8
-msgid "Please enter a name for the branch"
-msgstr ""
-
-#: admin/fai/faiNewBranch.tpl.c:11
-msgid "Processing the requested operation"
-msgstr ""
-
-#: admin/fai/faiNewBranch.tpl.c:14
-msgid ""
-"As soon as the copy operation has finished, you can scroll down to end of "
-"the page and press the 'Continue' button to continue with the fai management"
-" dialog."
-msgstr ""
-
-#: admin/fai/faiNewBranch.tpl.c:17
-msgid ""
-"Your browser doesn't support iframes, please use this link to perform the "
-"requested operation."
-msgstr ""
-
-#: admin/fai/faiNewBranch.tpl.c:20
-msgid "Perform requested operation."
-msgstr ""
-
-#: admin/fai/faiNewBranch.tpl.c:23
-msgid "Initiate operation"
-msgstr ""
-
-#: admin/fai/faiVariableEntry.tpl.c:14 admin/fai/faiVariableEntry.tpl.c:17
-msgid "Variable attributes"
-msgstr ""
-
-#: admin/fai/faiDiskEntry.tpl.c:11
-msgid "fstab key"
-msgstr ""
-
-#: admin/fai/faiDiskEntry.tpl.c:17
-msgid "Disk label"
-msgstr ""
-
-#: admin/fai/faiTemplate.tpl.c:17
-msgid "List of template files"
-msgstr ""
-
-#: admin/fai/faiVariable.tpl.c:17
-msgid "List of assigned variables"
-msgstr ""
-
-#: admin/fai/faiVariable.tpl.c:20
-msgid "Choose a variable to delete or edit"
-msgstr ""
-
-#: admin/fai/askClassName.tpl.c:2
-msgid ""
-"Adding a new class to the FAI management, requires a class name. You have to"
-" specify a unique class name for unique types of FAI classes, while you can "
-"use the same class name for different types of FAI classes. In the laste "
-"case, FAI will automatically enclose all these different class types to one "
-"unique class name."
-msgstr ""
-
-#: admin/fai/askClassName.tpl.c:5
-msgid ""
-"Please use one of the following methods to choose the name for the new FAI "
-"class."
-msgstr ""
-
-#: admin/fai/askClassName.tpl.c:8
-msgid "Enter FAI class name manually"
-msgstr ""
-
-#: admin/fai/askClassName.tpl.c:14
-msgid "Choose FAI class name from a list of existing classes"
-msgstr ""
-
-#: admin/fai/askClassName.tpl.c:20
-msgid "Choose class name"
-msgstr ""
-
-#: admin/fai/faiGroupHandle.tpl.c:2
-msgid "Please select the objects you want to remove:"
-msgstr ""
-
-#: admin/fai/faiGroupHandle.tpl.c:5
-msgid "Freezed"
-msgstr ""
-
-#: admin/fai/faiGroupHandle.tpl.c:8
-msgid "Select the object you want to edit:"
-msgstr ""
-
-#: admin/fai/faiGroupHandle.tpl.c:11
-msgid "Select the object you want to copy:"
-msgstr ""
-
-#: admin/fai/remove.tpl.c:5
-msgid ""
-"This includes all account data, system access rules, imap settings, etc. for"
-" this user. Please double check if your really want to do this since there "
-"is no way for FusionDirectory to get your data back."
-msgstr ""
-
-#: admin/fai/remove.tpl.c:8 admin/fai/remove_branch.tpl.c:8
-msgid "So - if you're sure - press 'Delete' to continue or 'Cancel' to abort."
-msgstr ""
-
-#: admin/fai/faiHook.tpl.c:17
-msgid "List of hook scripts"
-msgstr ""
-
-#: admin/fai/packageSelect/selectPackage-list.tpl.c:2
-#: admin/fai/classSelect/selectClass-list.tpl.c:5
-msgid "Update"
-msgstr ""
-
-#: admin/fai/packageSelect/selectPackage-list.tpl.c:5
-#: admin/fai/classSelect/selectClass-list.tpl.c:8
-msgid "Submit"
-msgstr ""
-
-#: admin/fai/packageSelect/selectPackage-filter.tpl.c:2
-#: admin/fai/classSelect/selectClass-filter.tpl.c:2
-#: admin/fai/fai-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/remove_branch.tpl.c:5
-msgid ""
-"This includes all account data, system access, etc. for this branch. Please "
-"double check if your really want to do this since there is no way for "
-"FusionDirectory to get your data back."
-msgstr ""
-
-#: admin/fai/faiPackage.tpl.c:26
-msgid "Install method"
-msgstr ""
-
-#: admin/fai/faiPackage.tpl.c:29
-msgid "Please select the installation method"
-msgstr ""
-
-#: admin/fai/faiPackage.tpl.c:32 admin/fai/faiPackage.tpl.c:35
-msgid "Used packages"
-msgstr ""
-
-#: admin/fai/faiPackage.tpl.c:38
-msgid "Add from list"
-msgstr ""
-
-#: admin/fai/faiProfileEntry.tpl.c:2
-msgid "List of FAI objects (Fully Automatic Installation)"
-msgstr ""
-
-#: admin/fai/faiProfileEntry.tpl.c:5
-msgid "Information"
-msgstr ""
-
-#: admin/fai/faiProfileEntry.tpl.c:8
-msgid ""
-"This menu allows you to select FAI class names and to add them to the "
-"currently edited profile."
-msgstr ""
-
-#: admin/fai/faiProfileEntry.tpl.c:11
-msgid "Filters"
-msgstr ""
-
-#: admin/fai/faiProfileEntry.tpl.c:14
-msgid "Show only classes with templates"
-msgstr ""
-
-#: admin/fai/faiProfileEntry.tpl.c:17
-msgid "Show only classes with scripts"
-msgstr ""
-
-#: admin/fai/faiProfileEntry.tpl.c:20
-msgid "Show only classes with hooks"
-msgstr ""
-
-#: admin/fai/faiProfileEntry.tpl.c:23
-msgid "Show only classes with variables"
-msgstr ""
-
-#: admin/fai/faiProfileEntry.tpl.c:26
-msgid "Show only classes with packages"
-msgstr ""
-
-#: admin/fai/faiProfileEntry.tpl.c:29
-msgid "Show only classes with partitions"
-msgstr ""
-
-#: admin/fai/faiProfileEntry.tpl.c:32 admin/fai/faiProfileEntry.tpl.c:35
-msgid "Display objects matching"
-msgstr ""
-
-#: admin/fai/faiProfileEntry.tpl.c:38
-msgid "Regular expression for matching object names"
-msgstr ""
-
-#: admin/fai/faiTemplateEntry.tpl.c:17 admin/fai/faiTemplateEntry.tpl.c:20
-msgid "Template attributes"
-msgstr ""
-
-#: admin/fai/faiTemplateEntry.tpl.c:26 admin/fai/faiTemplateEntry.tpl.c:29
-msgid "Save template"
-msgstr ""
-
-#: admin/fai/faiTemplateEntry.tpl.c:32 admin/fai/faiTemplateEntry.tpl.c:35
-msgid "Edit template"
-msgstr ""
-
-#: admin/fai/faiTemplateEntry.tpl.c:38
-msgid "Full path"
-msgstr ""
-
-#: admin/fai/faiTemplateEntry.tpl.c:41
-msgid "Upload"
-msgstr ""
-
-#: admin/fai/faiTemplateEntry.tpl.c:44
-msgid "Owner"
-msgstr ""
-
-#: admin/fai/faiTemplateEntry.tpl.c:50
-msgid "Access"
-msgstr ""
-
-#: admin/fai/faiTemplateEntry.tpl.c:53
-msgid "Class"
-msgstr ""
-
-#: admin/fai/faiTemplateEntry.tpl.c:56
-msgid "Read"
-msgstr ""
-
-#: admin/fai/faiTemplateEntry.tpl.c:59
-msgid "Write"
-msgstr ""
-
-#: admin/fai/faiTemplateEntry.tpl.c:62
-msgid "Execute"
-msgstr ""
-
-#: admin/fai/faiTemplateEntry.tpl.c:65
-msgid "Special"
-msgstr ""
-
-#: admin/fai/faiTemplateEntry.tpl.c:71
-msgid "SUID"
-msgstr ""
-
-#: admin/fai/faiTemplateEntry.tpl.c:77
-msgid "SGID"
-msgstr ""
-
-#: admin/fai/faiTemplateEntry.tpl.c:80
-msgid "Others"
-msgstr ""
-
-#: admin/fai/faiTemplateEntry.tpl.c:83
-msgid "sticky"
-msgstr ""
-
-#: admin/fai/faiScriptEntry.tpl.c:17 admin/fai/faiScriptEntry.tpl.c:26
-msgid "Script attributes"
-msgstr ""
-
-#: admin/fai/faiScriptEntry.tpl.c:23
-msgid ""
-"Choose a priority. Low values result in an earlier, high values in a later "
-"execution."
-msgstr ""
-
-#: admin/fai/faiScriptEntry.tpl.c:32 admin/fai/faiHookEntry.tpl.c:32
-msgid "Import script"
-msgstr ""
-
-#: admin/fai/classSelect/selectClass-list.tpl.c:2
-msgid "Base"
-msgstr ""
-
-#: admin/fai/fai-filter.tpl.c:29
-msgid "Show profiles"
-msgstr ""
-
-#: admin/fai/fai-filter.tpl.c:32
-msgid "Show templates"
-msgstr ""
-
-#: admin/fai/fai-filter.tpl.c:35
-msgid "Show scripts"
-msgstr ""
-
-#: admin/fai/fai-filter.tpl.c:38
-msgid "Show hooks"
-msgstr ""
-
-#: admin/fai/fai-filter.tpl.c:41
-msgid "Show variables"
-msgstr ""
-
-#: admin/fai/fai-filter.tpl.c:44
-msgid "Show packages"
-msgstr ""
-
-#: admin/fai/fai-filter.tpl.c:47
-msgid "Show partitions"
-msgstr ""
-
-#: admin/fai/faiTemplateEdit.tpl.c:2
-msgid "This FAI template is write protected. Editing may break it!"
-msgstr ""
-
-#: admin/fai/faiTemplateEdit.tpl.c:5
-msgid "Edit anyway"
-msgstr ""
-
-#: admin/fai/faiPartitionTable.tpl.c:14
-msgid "Use 'setup-storage' to partition the disk"
-msgstr ""
-
-#: admin/fai/faiPartitionTable.tpl.c:20
-msgid "Discs"
-msgstr ""
-
-#: admin/fai/faiPartitionTable.tpl.c:23 admin/fai/faiPartitionTable.tpl.c:26
-#: admin/fai/faiPartitionTable.tpl.c:41 admin/fai/faiPartitionTable.tpl.c:44
-msgid "Add disk"
-msgstr ""
-
-#: admin/fai/faiPartitionTable.tpl.c:29 admin/fai/faiPartitionTable.tpl.c:32
-#: admin/fai/faiPartitionTable.tpl.c:47 admin/fai/faiPartitionTable.tpl.c:50
-msgid "Add RAID"
-msgstr ""
-
-#: admin/fai/faiPartitionTable.tpl.c:35 admin/fai/faiPartitionTable.tpl.c:38
-#: admin/fai/faiPartitionTable.tpl.c:53 admin/fai/faiPartitionTable.tpl.c:56
-msgid "Add volume group"
-msgstr ""
-
-#: admin/fai/faiScript.tpl.c:17
-msgid "List of scripts"
-msgstr ""
-
-#: admin/fai/faiProfile.tpl.c:20
-msgid "Choose a priority"
-msgstr ""
-
-#: admin/fai/faiHookEntry.tpl.c:14 admin/fai/faiHookEntry.tpl.c:17
-#: admin/fai/faiHookEntry.tpl.c:26
-msgid "Hook attributes"
-msgstr ""
-
-#: admin/fai/faiHookEntry.tpl.c:23
-msgid "Choose an existing FAI task"
-msgstr ""
diff --git a/fai/locale/nb/fusiondirectory.po b/fai/locale/nb/fusiondirectory.po
index eb11ef2b3a7f481404e3d4c18ea4ba750f0e8499..0a493bf92d8982b44684fd40c0188c8087b10913 100644
--- a/fai/locale/nb/fusiondirectory.po
+++ b/fai/locale/nb/fusiondirectory.po
@@ -5,379 +5,188 @@
 # Translators:
 msgid ""
 msgstr ""
-"Project-Id-Version: FusionDirectory-108\n"
+"Project-Id-Version: FusionDirectory-109\n"
 "Report-Msgid-Bugs-To: documentation@lists.fusiondirectory.org\n"
-"POT-Creation-Date: 2015-03-19 21:45+0100\n"
-"PO-Revision-Date: 2015-02-25 16:12+0000\n"
+"POT-Creation-Date: 2014-12-15 17:47+0100\n"
+"PO-Revision-Date: 2015-02-25 16:04+0000\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>\n"
-"Language-Team: Norwegian BokmÃ¥l (http://www.transifex.com/projects/p/FusionDirectory-108/language/nb/)\n"
+"Language-Team: Norwegian BokmÃ¥l (http://www.transifex.com/projects/p/FusionDirectory-109/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/fai/class_faiScriptEntry.inc:79 admin/fai/class_faiScriptEntry.inc:82
-#: admin/fai/class_faiManagement.inc:240 admin/fai/class_faiManagement.inc:768
-#: admin/fai/class_faiManagement.inc:774
-#: admin/fai/class_faiPartitionTable.inc:268
-#: admin/fai/class_faiPartitionTable.inc:331
-#: admin/fai/class_faiDiskEntry.inc:445 admin/fai/class_FAI.inc:570
-#: admin/fai/class_faiHookEntry.inc:83 admin/fai/class_faiHookEntry.inc:86
-#: admin/fai/class_faiScript.inc:249 admin/fai/class_faiTemplate.inc:232
-#: admin/fai/class_faiHook.inc:259 admin/fai/class_faiVariable.inc:162
-#: admin/systems/class_faiLogView.inc:207
-#: admin/systems/class_faiLogView.inc:242
-msgid "Error"
-msgstr "Feil"
-
-#: admin/fai/class_faiScriptEntry.inc:82 admin/fai/class_faiHookEntry.inc:86
-msgid "file is empty"
-msgstr ""
-
-#: admin/fai/class_faiScriptEntry.inc:102 admin/fai/class_faiHookEntry.inc:102
-#: admin/fai/class_faiScript.inc:349 admin/fai/class_faiScript.inc:374
-#: admin/fai/class_faiTemplate.inc:320 admin/fai/class_faiHook.inc:346
-msgid "Download"
-msgstr ""
-
-#: admin/fai/class_faiScriptEntry.inc:147
-#: admin/fai/class_faiScriptEntry.inc:151
-#: admin/fai/class_faiScriptEntry.inc:154
-#: admin/fai/class_faiScriptEntry.inc:197
-#: admin/fai/class_faiManagement.inc:768 admin/fai/class_faiManagement.inc:774
-#: admin/fai/class_faiPackage.inc:685
-#: admin/fai/class_faiPartitionTable.inc:779
-#: admin/fai/class_faiDiskEntry.inc:702 admin/fai/class_faiDiskEntry.inc:705
-#: admin/fai/class_faiDiskEntry.inc:758
-#: admin/fai/class_faiTemplateEntry.inc:247
-#: admin/fai/class_faiTemplateEntry.inc:312
-#: admin/fai/class_faiPartitionTableEntry.inc:353
-#: admin/fai/class_faiPartitionTableEntry.inc:356
-#: admin/fai/class_faiPartitionTableEntry.inc:360
-#: admin/fai/class_faiPartitionTableEntry.inc:455
-#: admin/fai/packageSelect/selectPackage-list.xml:40
-#: admin/fai/class_faiProfile.inc:414 admin/fai/class_faiProfile.inc:463
-#: admin/fai/class_faiHookEntry.inc:157 admin/fai/class_faiHookEntry.inc:162
-#: admin/fai/class_faiHookEntry.inc:165 admin/fai/class_faiHookEntry.inc:207
-#: admin/fai/class_askClassName.inc:163 admin/fai/class_askClassName.inc:167
-#: admin/fai/class_askClassName.inc:171 admin/fai/class_askClassName.inc:198
-#: admin/fai/class_faiScript.inc:347 admin/fai/class_faiScript.inc:605
-#: admin/fai/classSelect/selectClass-list.xml:28
-#: admin/fai/class_faiTemplate.inc:512
-#: admin/fai/class_faiVariableEntry.inc:103
-#: admin/fai/class_faiVariableEntry.inc:112
-#: admin/fai/class_faiVariableEntry.inc:115
-#: admin/fai/class_faiVariableEntry.inc:149 admin/fai/class_faiHook.inc:531
-#: admin/fai/class_faiVariable.inc:398 admin/fai/fai-list.xml:80
-#: admin/fai/faiPartitionTableEntry.tpl.c:8 admin/fai/faiPartition.tpl.c:5
-#: admin/fai/faiVariableEntry.tpl.c:8 admin/fai/faiDiskEntry.tpl.c:8
-#: admin/fai/faiTemplate.tpl.c:8 admin/fai/faiVariable.tpl.c:8
-#: admin/fai/faiHook.tpl.c:8
-#: admin/fai/packageSelect/selectPackage-filter.tpl.c:8
-#: admin/fai/faiPackage.tpl.c:8 admin/fai/faiScriptEntry.tpl.c:8
-#: admin/fai/classSelect/selectClass-filter.tpl.c:5
-#: admin/fai/fai-filter.tpl.c:50 admin/fai/faiPartitionTable.tpl.c:8
-#: admin/fai/faiScript.tpl.c:8 admin/fai/faiProfile.tpl.c:8
-#: admin/fai/faiHookEntry.tpl.c:8
-msgid "Name"
-msgstr "Navn"
-
-#: admin/fai/class_faiScriptEntry.inc:159 admin/fai/class_faiHookEntry.inc:170
-#: admin/fai/class_faiScript.inc:594 admin/fai/fai-list.xml:122
-#: admin/fai/faiScriptEntry.tpl.c:29 admin/fai/faiHookEntry.tpl.c:29
-msgid "Script"
-msgstr ""
-
-#: admin/fai/class_faiScriptEntry.inc:190
-#: admin/fai/class_faiScriptEntry.inc:199
-msgid "Script entry"
-msgstr ""
-
-#: admin/fai/class_faiScriptEntry.inc:191
-msgid "FAI script entry"
-msgstr ""
-
-#: admin/fai/class_faiScriptEntry.inc:198 admin/fai/class_faiPackage.inc:686
-#: admin/fai/class_faiPartitionTable.inc:780
-#: admin/fai/class_faiDiskEntry.inc:759
-#: admin/fai/class_faiTemplateEntry.inc:313
-#: admin/fai/class_faiPartitionTableEntry.inc:456
-#: admin/fai/class_faiProfile.inc:464 admin/fai/class_faiHookEntry.inc:208
-#: admin/fai/class_faiScript.inc:606 admin/fai/class_faiTemplate.inc:513
-#: admin/fai/class_faiVariableEntry.inc:150 admin/fai/class_faiHook.inc:532
-#: admin/fai/class_faiVariable.inc:399
-#: admin/fai/faiPartitionTableEntry.tpl.c:11 admin/fai/faiPartition.tpl.c:11
-#: admin/fai/faiVariableEntry.tpl.c:11 admin/fai/faiDiskEntry.tpl.c:14
-#: admin/fai/faiTemplate.tpl.c:11 admin/fai/faiVariable.tpl.c:11
-#: admin/fai/faiHook.tpl.c:11 admin/fai/faiPackage.tpl.c:11
-#: admin/fai/faiTemplateEntry.tpl.c:14 admin/fai/faiScriptEntry.tpl.c:11
-#: admin/fai/faiPartitionTable.tpl.c:11 admin/fai/faiScript.tpl.c:11
-#: admin/fai/faiProfile.tpl.c:11 admin/fai/faiHookEntry.tpl.c:11
-msgid "Description"
-msgstr "Beskrivelse"
-
-#: admin/fai/class_faiScriptEntry.inc:200
-msgid "Script Priority"
-msgstr ""
-
-#: admin/fai/class_faiManagement.inc:188
-msgid "partition table"
-msgstr ""
-
-#: admin/fai/class_faiManagement.inc:189 admin/fai/fai-list.xml:31
-msgid "script"
-msgstr ""
-
-#: admin/fai/class_faiManagement.inc:190 admin/fai/fai-list.xml:47
-msgid "hook"
-msgstr ""
-
-#: admin/fai/class_faiManagement.inc:191 admin/fai/fai-list.xml:39
-msgid "variable"
-msgstr ""
-
-#: admin/fai/class_faiManagement.inc:192 admin/fai/fai-list.xml:63
-msgid "template"
-msgstr ""
-
-#: admin/fai/class_faiManagement.inc:193
-msgid "package list"
-msgstr ""
-
-#: admin/fai/class_faiManagement.inc:210 admin/fai/class_faiManagement.inc:226
-#: admin/fai/class_faiManagement.inc:332 admin/fai/class_faiManagement.inc:390
-#: admin/fai/class_faiManagement.inc:480 admin/fai/class_faiManagement.inc:575
-#: admin/fai/class_faiManagement.inc:598 admin/fai/class_faiManagement.inc:619
-msgid "Permission error"
-msgstr ""
-
-#: admin/fai/class_faiManagement.inc:211 admin/fai/class_faiManagement.inc:226
-#, php-format
-msgid "You have no permission to create a new %s!"
-msgstr ""
-
-#: admin/fai/class_faiManagement.inc:226 admin/fai/fai-list.xml:55
-msgid "profile"
-msgstr ""
-
-#: admin/fai/class_faiManagement.inc:328
-msgid "Branch locked"
-msgstr ""
-
-#: admin/fai/class_faiManagement.inc:329
-#, php-format
-msgid "The following entries are locked, you can't remove them %s."
-msgstr ""
-
-#: admin/fai/class_faiManagement.inc:346
-msgid "FAI object"
-msgstr ""
-
-#: admin/fai/class_faiManagement.inc:477
-msgid "FAI branch/freeze"
-msgstr ""
-
-#: admin/fai/class_faiManagement.inc:480
-msgid "You have no permission to delete this release!"
-msgstr ""
-
-#: admin/fai/class_faiManagement.inc:496 admin/fai/remove.tpl.c:2
-#: admin/fai/remove_branch.tpl.c:2
-msgid "Warning"
-msgstr ""
-
-#: admin/fai/class_faiManagement.inc:496
-msgid "Release remove aborted because the release name check failed!"
-msgstr ""
-
-#: admin/fai/class_faiManagement.inc:573 admin/fai/class_faiManagement.inc:596
-msgid "Configuration"
-msgstr ""
-
-#: admin/fai/class_faiManagement.inc:575 admin/fai/class_faiManagement.inc:598
-#: admin/fai/class_faiManagement.inc:619
-msgid "Branch"
-msgstr ""
-
-#: admin/fai/class_faiManagement.inc:725 admin/fai/askClassName.tpl.c:23
-msgid "Continue"
+#: admin/fai/class_faiManagement.inc:117 admin/fai/class_faiManagement.inc:122
+#: admin/fai/packageSelect/selectPackage-list.xml:14
+#: admin/systems/class_faiStartup.inc:178 config/fai/class_faiConfig.inc:41
+msgid "FAI"
 msgstr ""
 
-#: admin/fai/class_faiManagement.inc:926
-#: admin/fai/class_faiPartitionTable.inc:768
-#: admin/fai/class_faiProfile.inc:318 admin/fai/class_askClassName.inc:99
-#: admin/fai/classSelect/class_classSelect.inc:58
-#: admin/fai/class_faiGroupHandle.inc:120
-#: admin/fai/class_faiProfileEntry.inc:163 admin/fai/fai-list.xml:146
-msgid "Partition table"
+#: admin/fai/class_faiManagement.inc:118
+msgid "Manage FAI software packages and deployment recipes"
 msgstr ""
 
-#: admin/fai/class_faiManagement.inc:928
-#: admin/fai/class_faiGroupHandle.inc:122 admin/fai/fai-list.xml:140
-msgid "Package list"
+#: admin/fai/class_faiPackage.inc:157
+msgid "Mark for installation"
 msgstr ""
 
-#: admin/fai/class_faiManagement.inc:930
-#: admin/fai/class_faiGroupHandle.inc:124
-msgid "Scripts"
+#: admin/fai/class_faiPackage.inc:161
+msgid "Mark for removal"
 msgstr ""
 
-#: admin/fai/class_faiManagement.inc:932
-#: admin/fai/class_faiGroupHandle.inc:126
-msgid "Variables"
+#: admin/fai/class_faiPackage.inc:166
+msgid "Edit configuration"
 msgstr ""
 
-#: admin/fai/class_faiManagement.inc:934
-#: admin/fai/class_faiGroupHandle.inc:128
-msgid "Hooks"
-msgstr ""
-
-#: admin/fai/class_faiManagement.inc:936 admin/fai/class_faiProfile.inc:454
-#: admin/fai/class_askClassName.inc:104 admin/fai/class_faiGroupHandle.inc:130
-#: admin/fai/fai-list.xml:110
-msgid "Profile"
-msgstr ""
+#: admin/fai/class_faiPackage.inc:247
+#: admin/fai/class_faiPartitionTable.inc:209
+#: admin/fai/class_faiPartitionTable.inc:250
+#: admin/fai/class_faiTemplate.inc:114
+#: admin/systems/services/repository/class_serviceDebianRepository.inc:172
+#: admin/systems/services/repository/class_serviceDebianRepository.inc:189
+#: admin/systems/services/repository/class_serviceDebianRepository.inc:193
+msgid "LDAP error"
+msgstr "LDAP-feil"
 
-#: admin/fai/class_faiManagement.inc:938
-#: admin/fai/class_faiGroupHandle.inc:132
-msgid "Templates"
+#: admin/fai/class_faiPackage.inc:279
+#: admin/fai/packageSelect/class_filterFAIPackages.inc:41
+#: admin/fai/packageSelect/class_filterFAIPackages.inc:46
+#: admin/fai/class_faiPackageConfiguration.inc:55
+#: admin/systems/class_faiStartup.inc:133
+#: admin/systems/class_faiStartup.inc:160
+msgid "Service infrastructure"
 msgstr ""
 
-#: admin/fai/class_faiManagement.inc:1039
-#: admin/fai/class_faiManagement.inc:1045
-#: admin/fai/packageSelect/selectPackage-list.xml:14
-#: admin/fai/classSelect/selectClass-list.xml:15
-#: admin/systems/class_faiStartup.inc:177 config/fai/class_faiConfig.inc:41
-msgid "FAI"
+#: admin/fai/class_faiPackage.inc:294
+msgid "Unkown packages"
 msgstr ""
 
-#: admin/fai/class_faiManagement.inc:1040
-msgid "Manage FAI software packages and deployment recipes"
+#: admin/fai/class_faiPackage.inc:365
+msgid "Package"
 msgstr ""
 
-#: admin/fai/class_faiPackage.inc:261
-msgid "Invalid package names"
+#: admin/fai/class_faiPackage.inc:366
+msgid "FAI Package list"
 msgstr ""
 
-#: admin/fai/class_faiPackage.inc:262
-#, php-format
-msgid "The following package names don't match the Debian policy: %s"
+#: admin/fai/class_faiPackage.inc:369
+msgid "FAI Package"
 msgstr ""
 
-#: admin/fai/class_faiPackage.inc:421 admin/fai/class_faiPackage.inc:422
-msgid "Configured"
-msgstr ""
+#: admin/fai/class_faiPackage.inc:385
+#: admin/fai/class_faiPartitionTable.inc:304
+#: admin/fai/class_faiTemplateEntry.inc:140 admin/fai/class_faiProfile.inc:47
+#: admin/fai/class_faiScript.inc:50 admin/fai/class_faiTemplate.inc:173
+#: admin/fai/class_faiHook.inc:50 admin/fai/class_faiVariable.inc:50
+msgid "Properties"
+msgstr "Egenskaper"
 
-#: admin/fai/class_faiPackage.inc:428 admin/fai/class_faiPackage.inc:429
-msgid "Package marked for removal"
+#: admin/fai/class_faiPackage.inc:388
+#: admin/fai/class_faiPartitionTable.inc:307 admin/fai/class_faiProfile.inc:50
+#: admin/fai/class_faiScript.inc:53 admin/fai/class_faiTemplate.inc:176
+#: admin/fai/class_faiHook.inc:53 admin/fai/class_faiVariable.inc:53
+msgid "Class name"
 msgstr ""
 
-#: admin/fai/class_faiPackage.inc:445
-msgid "Mark package for removal"
+#: admin/fai/class_faiPackage.inc:388 admin/fai/class_faiScript.inc:53
+#: admin/fai/class_faiHook.inc:53 admin/fai/class_faiVariable.inc:53
+msgid "Variables class name"
 msgstr ""
 
-#: admin/fai/class_faiPackage.inc:451
-msgid "Configure this package"
-msgstr ""
+#: admin/fai/class_faiPackage.inc:392
+#: admin/fai/class_faiPartitionTable.inc:311
+#: admin/fai/class_faiDiskEntry.inc:738
+#: admin/fai/class_faiTemplateEntry.inc:147 admin/fai/class_faiProfile.inc:54
+#: admin/fai/class_faiScript.inc:57 admin/fai/class_faiScript.inc:75
+#: admin/fai/class_faiTemplate.inc:180 admin/fai/class_faiHook.inc:57
+#: admin/fai/class_faiHook.inc:75 admin/fai/class_faiVariable.inc:57
+#: admin/fai/class_faiVariable.inc:75
+msgid "Description"
+msgstr "Beskrivelse"
 
-#: admin/fai/class_faiPackage.inc:455
-msgid "Remove this package"
+#: admin/fai/class_faiPackage.inc:392
+#: admin/fai/class_faiPartitionTable.inc:311 admin/fai/class_faiProfile.inc:54
+#: admin/fai/class_faiScript.inc:57 admin/fai/class_faiTemplate.inc:180
+#: admin/fai/class_faiHook.inc:57 admin/fai/class_faiVariable.inc:57
+msgid "Short description of the class"
 msgstr ""
 
-#: admin/fai/class_faiPackage.inc:534
-msgid "Please select a least one package!"
+#: admin/fai/class_faiPackage.inc:398 admin/systems/class_faiStartup.inc:90
+msgid "Repository"
 msgstr ""
 
-#: admin/fai/class_faiPackage.inc:538
-msgid ""
-"Please choose a valid release/section combination for your repository setup!"
+#: admin/fai/class_faiPackage.inc:401 admin/systems/class_faiStartup.inc:78
+#: admin/systems/services/repository/class_serviceDebianRepository.inc:52
+#: admin/systems/services/repository/class_serviceCentosRepository.inc:49
+msgid "Release"
 msgstr ""
 
-#: admin/fai/class_faiPackage.inc:571
-#: admin/fai/packageSelect/class_filterFAIPackages.inc:41
-#: admin/fai/packageSelect/class_filterFAIPackages.inc:46
-#: admin/fai/class_faiPackageConfiguration.inc:55
-#: admin/systems/class_faiStartup.inc:132
-#: admin/systems/class_faiStartup.inc:159
-msgid "Infrastructure service"
+#: admin/fai/class_faiPackage.inc:401
+msgid "Debian release concerned"
 msgstr ""
 
-#: admin/fai/class_faiPackage.inc:587
-msgid "Unkown packages"
+#: admin/fai/class_faiPackage.inc:405
+#: admin/systems/services/repository/class_serviceDebianRepository.inc:58
+msgid "Sections"
 msgstr ""
 
-#: admin/fai/class_faiPackage.inc:674
-#: admin/fai/faiPackageConfiguration.tpl.c:2
-msgid "Package"
+#: admin/fai/class_faiPackage.inc:405
+msgid "Sections concerned"
 msgstr ""
 
-#: admin/fai/class_faiPackage.inc:675
-msgid "FAI Package list"
+#: admin/fai/class_faiPackage.inc:409
+msgid "Install method"
 msgstr ""
 
-#: admin/fai/class_faiPackage.inc:679
-msgid "FAI Package"
+#: admin/fai/class_faiPackage.inc:409
+msgid "Install method to use for this package list"
 msgstr ""
 
-#: admin/fai/class_faiPackage.inc:687
+#: admin/fai/class_faiPackage.inc:420
 msgid "Packages"
 msgstr ""
 
-#: admin/fai/class_faiPackage.inc:688 admin/fai/faiPackage.tpl.c:23
-msgid "Section"
-msgstr ""
-
-#: admin/fai/class_faiPackage.inc:688 admin/fai/class_faiPackage.inc:691
-#: admin/fai/class_faiScript.inc:605 admin/fai/class_faiTemplate.inc:512
-msgid "Readonly"
+#: admin/fai/class_faiPackage.inc:424
+msgid "Packages in this class"
 msgstr ""
 
-#: admin/fai/class_faiPackage.inc:689
-msgid "Install Method"
-msgstr ""
+#: admin/fai/class_faiPartitionTable.inc:61
+#: admin/fai/class_faiDiskEntry.inc:442 admin/systems/class_faiLogView.inc:207
+#: admin/systems/class_faiLogView.inc:242
+msgid "Error"
+msgstr "Feil"
 
-#: admin/fai/class_faiPackage.inc:690
-msgid "Package configuration"
+#: admin/fai/class_faiPartitionTable.inc:112
+msgid "Add RAID"
 msgstr ""
 
-#: admin/fai/class_faiPackage.inc:691 admin/systems/class_faiStartup.inc:78
-#: admin/systems/services/repository/class_serviceRepository.inc:40
-#: admin/fai/branch_selector.tpl.c:14 admin/fai/faiPackage.tpl.c:20
-#: admin/fai/fai-filter.tpl.c:5 admin/fai/fai-filter.tpl.c:14
-msgid "Release"
+#: admin/fai/class_faiPartitionTable.inc:116
+msgid "Add LVM"
 msgstr ""
 
-#: admin/fai/class_faiPartitionTable.inc:269
-#: admin/fai/class_faiDiskEntry.inc:446
-#, php-format
-msgid ""
-"The disk cannot be deleted while it is used in the '%s' disk definition!"
+#: admin/fai/class_faiPartitionTable.inc:284
+msgid "Partition table"
 msgstr ""
 
-#: admin/fai/class_faiPartitionTable.inc:416 admin/fai/class_faiScript.inc:360
-#: admin/fai/class_faiScript.inc:362 admin/fai/class_faiTemplate.inc:306
-#: admin/fai/class_faiTemplate.inc:308
-msgid "edit"
+#: admin/fai/class_faiPartitionTable.inc:285
+#: admin/fai/class_faiPartitionTable.inc:288
+msgid "FAI partition table"
 msgstr ""
 
-#: admin/fai/class_faiPartitionTable.inc:418 admin/fai/class_faiScript.inc:364
-#: admin/fai/class_faiTemplate.inc:310
-msgid "delete"
+#: admin/fai/class_faiPartitionTable.inc:307 admin/fai/class_faiProfile.inc:50
+msgid "Partition table class name"
 msgstr ""
 
-#: admin/fai/class_faiPartitionTable.inc:769
-#: admin/fai/class_faiPartitionTable.inc:773
-msgid "FAI partition table"
+#: admin/fai/class_faiPartitionTable.inc:317
+msgid "Discs"
 msgstr ""
 
-#: admin/fai/class_faiPartitionTable.inc:779 admin/fai/class_faiHook.inc:531
-#: admin/fai/class_faiVariable.inc:398
-msgid "Read only"
+#: admin/fai/class_faiPartitionTable.inc:324
+msgid "Partitions in this class"
 msgstr ""
 
 #: admin/fai/class_faiDiskEntry.inc:273
-#: admin/fai/faiPartitionTableEntry.tpl.c:5 admin/fai/faiDiskEntry.tpl.c:5
 msgid "Device"
 msgstr ""
 
@@ -389,103 +198,103 @@ msgstr ""
 msgid "UUID"
 msgstr ""
 
-#: admin/fai/class_faiDiskEntry.inc:345
+#: admin/fai/class_faiDiskEntry.inc:344
 msgid "Disks"
 msgstr ""
 
-#: admin/fai/class_faiDiskEntry.inc:348 admin/fai/class_faiPartition.inc:321
-#: admin/fai/faiPartition.tpl.c:14
+#: admin/fai/class_faiDiskEntry.inc:347 admin/fai/class_faiPartition.inc:319
 msgid "Size"
 msgstr ""
 
-#: admin/fai/class_faiDiskEntry.inc:544
+#: admin/fai/class_faiDiskEntry.inc:443
+#, php-format
+msgid ""
+"The disk cannot be deleted while it is used in the '%s' disk definition!"
+msgstr ""
+
+#: admin/fai/class_faiDiskEntry.inc:536
 msgid "encrypted"
 msgstr ""
 
-#: admin/fai/class_faiDiskEntry.inc:547
+#: admin/fai/class_faiDiskEntry.inc:539
 msgid "bootable"
 msgstr ""
 
-#: admin/fai/class_faiDiskEntry.inc:550
+#: admin/fai/class_faiDiskEntry.inc:542
 msgid "preserve"
 msgstr ""
 
-#: admin/fai/class_faiDiskEntry.inc:735
+#: admin/fai/class_faiDiskEntry.inc:687 admin/fai/class_faiDiskEntry.inc:690
+#: admin/fai/class_faiDiskEntry.inc:737
+#: admin/fai/packageSelect/selectPackage-list.xml:40
+#: admin/fai/class_faiScript.inc:71 admin/fai/class_faiHook.inc:71
+#: admin/fai/class_faiVariable.inc:71
+#: admin/fai/class_faiSimplePluginClass.inc:50
+msgid "Name"
+msgstr "Navn"
+
+#: admin/fai/class_faiDiskEntry.inc:717
 msgid ""
 "You have more than four primary partition table entries in your "
 "configuration, please check your configuration twice."
 msgstr ""
 
-#: admin/fai/class_faiDiskEntry.inc:739
+#: admin/fai/class_faiDiskEntry.inc:721
 msgid ""
 "You cannot have more than three primary partition while using logical "
 "partitions, please check your configuration twice."
 msgstr ""
 
-#: admin/fai/class_faiDiskEntry.inc:752
-#: admin/fai/class_faiPartitionTableEntry.inc:448
+#: admin/fai/class_faiDiskEntry.inc:733
 msgid "Partition table entry"
 msgstr ""
 
-#: admin/fai/class_faiDiskEntry.inc:753
-#: admin/fai/class_faiPartitionTableEntry.inc:449
+#: admin/fai/class_faiDiskEntry.inc:734
 msgid "FAI partition table entry"
 msgstr ""
 
-#: admin/fai/class_faiDiskEntry.inc:760
+#: admin/fai/class_faiDiskEntry.inc:739
 msgid "Disk options"
 msgstr ""
 
-#: admin/fai/class_faiDiskEntry.inc:761
-#: admin/fai/class_faiPartitionTableEntry.inc:457
+#: admin/fai/class_faiDiskEntry.inc:740
 msgid "Partition type"
 msgstr ""
 
-#: admin/fai/class_faiDiskEntry.inc:762
-#: admin/fai/class_faiPartitionTableEntry.inc:458
+#: admin/fai/class_faiDiskEntry.inc:741
 msgid "Partition no."
 msgstr ""
 
-#: admin/fai/class_faiDiskEntry.inc:763
-#: admin/fai/class_faiPartitionTableEntry.inc:459
+#: admin/fai/class_faiDiskEntry.inc:742
 msgid "File system type"
 msgstr ""
 
-#: admin/fai/class_faiDiskEntry.inc:764
-#: admin/fai/class_faiPartitionTableEntry.inc:171
-#: admin/fai/class_faiPartitionTableEntry.inc:460
-#: admin/fai/class_faiPartition.inc:437 admin/fai/faiPartition.tpl.c:47
+#: admin/fai/class_faiDiskEntry.inc:743 admin/fai/class_faiPartition.inc:432
 msgid "Mount point"
 msgstr ""
 
-#: admin/fai/class_faiDiskEntry.inc:765
-#: admin/fai/class_faiPartitionTableEntry.inc:461
-#: admin/fai/class_faiPartition.inc:402 admin/fai/class_faiPartition.inc:407
+#: admin/fai/class_faiDiskEntry.inc:744 admin/fai/class_faiPartition.inc:397
+#: admin/fai/class_faiPartition.inc:402
 msgid "Partition size"
 msgstr ""
 
-#: admin/fai/class_faiDiskEntry.inc:766
-#: admin/fai/class_faiPartitionTableEntry.inc:173
-#: admin/fai/class_faiPartitionTableEntry.inc:462
-#: admin/fai/faiPartition.tpl.c:50
+#: admin/fai/class_faiDiskEntry.inc:745
 msgid "Mount options"
 msgstr ""
 
-#: admin/fai/class_faiDiskEntry.inc:767
-#: admin/fai/class_faiPartitionTableEntry.inc:463
+#: admin/fai/class_faiDiskEntry.inc:746
 msgid "File system options"
 msgstr ""
 
-#: admin/fai/class_faiDiskEntry.inc:768
-#: admin/fai/class_faiPartitionTableEntry.inc:464
+#: admin/fai/class_faiDiskEntry.inc:747
 msgid "Partition flags"
 msgstr ""
 
-#: admin/fai/class_debconfTemplate.inc:227
+#: admin/fai/class_debconfTemplate.inc:225
 msgid "This package has no debconf options."
 msgstr ""
 
-#: admin/fai/class_debconfTemplate.inc:264
+#: admin/fai/class_debconfTemplate.inc:262
 msgid ""
 "This debconf question is dynamically generated during package installation "
 "and requires choosing between specific options which cannot be presented "
@@ -493,217 +302,59 @@ msgid ""
 " effect."
 msgstr ""
 
-#: admin/fai/class_faiTemplateEntry.inc:139
-msgid "no file uploaded yet"
+#: admin/fai/class_faiTemplateEntry.inc:143
+msgid "File path"
 msgstr ""
 
-#: admin/fai/class_faiTemplateEntry.inc:142
-#, php-format
-msgid "exists in database (size: %s bytes)"
-msgstr ""
-
-#: admin/fai/class_faiTemplateEntry.inc:251
-#: admin/systems/class_faiLogView.inc:70 admin/fai/faiTemplateEntry.tpl.c:23
-msgid "File"
+#: admin/fai/class_faiTemplateEntry.inc:143
+msgid "Complete absolute template file path and name"
 msgstr ""
 
-#: admin/fai/class_faiTemplateEntry.inc:255
-#: admin/fai/faiTemplateEntry.tpl.c:11
-msgid "Destination path"
+#: admin/fai/class_faiTemplateEntry.inc:147
+msgid "Short description of the file"
 msgstr ""
 
-#: admin/fai/class_faiTemplateEntry.inc:260 admin/fai/faiTemplateEntry.tpl.c:8
-msgid "File name"
-msgstr ""
-
-#: admin/fai/class_faiTemplateEntry.inc:264
-#: admin/fai/class_faiTemplateEntry.inc:266
-#: admin/fai/faiTemplateEntry.tpl.c:68
-msgid "User"
-msgstr "Bruker"
-
-#: admin/fai/class_faiTemplateEntry.inc:270
-#: admin/fai/class_faiTemplateEntry.inc:273
-#: admin/fai/class_faiTemplateEntry.inc:275
-#: admin/fai/faiTemplateEntry.tpl.c:47 admin/fai/faiTemplateEntry.tpl.c:74
-msgid "Group"
+#: admin/fai/class_faiTemplateEntry.inc:156
+msgid "Template attributes"
 msgstr ""
 
-#: admin/fai/class_faiTemplateEntry.inc:305
-msgid "Template entry"
+#: admin/fai/class_faiTemplateEntry.inc:160
+msgid "Template file content"
 msgstr ""
 
-#: admin/fai/class_faiTemplateEntry.inc:306
-msgid "FAI template entry"
+#: admin/fai/class_faiTemplateEntry.inc:160
+msgid "Content of the template file"
 msgstr ""
 
-#: admin/fai/class_faiTemplateEntry.inc:314
-msgid "Template file"
+#: admin/fai/class_faiTemplateEntry.inc:164
+msgid "Owner and group of the file"
 msgstr ""
 
-#: admin/fai/class_faiTemplateEntry.inc:315
-msgid "Template path"
+#: admin/fai/class_faiTemplateEntry.inc:167
+msgid "Owner"
 msgstr ""
 
-#: admin/fai/class_faiTemplateEntry.inc:316
+#: admin/fai/class_faiTemplateEntry.inc:167
 msgid "File owner"
 msgstr ""
 
-#: admin/fai/class_faiTemplateEntry.inc:317
-msgid "File permissions"
-msgstr ""
-
-#: admin/fai/class_FAI.inc:287 admin/fai/class_FAI.inc:679
-#: admin/fai/class_FAI.inc:1266 admin/fai/class_FAI.inc:1283
-#: admin/fai/class_FAI.inc:1287
-msgid "LDAP error"
-msgstr "LDAP-feil"
-
-#: admin/fai/class_FAI.inc:570
-#, php-format
-msgid "Error, following objects should be equal '%s' and '%s'"
-msgstr ""
-
-#: admin/fai/class_FAI.inc:891
-#, php-format
-msgid "Creating group application release for %s"
-msgstr ""
-
-#: admin/fai/class_FAI.inc:960 admin/fai/class_FAI.inc:982
-#: admin/fai/class_FAI.inc:1022 admin/fai/class_FAI.inc:1027
-#: admin/fai/class_FAI.inc:1065
-msgid "Object"
-msgstr ""
-
-#: admin/fai/class_FAI.inc:961
-#, php-format
-msgid "Adding missing group application release container %s."
-msgstr ""
-
-#: admin/fai/class_FAI.inc:983
-#, php-format
-msgid "Adding group application release container %s."
-msgstr ""
-
-#: admin/fai/class_FAI.inc:1023
-#, php-format
-msgid "Could not create menu entry %s. (Already exists)."
-msgstr ""
-
-#: admin/fai/class_FAI.inc:1028
-#, php-format
-msgid "Created group application menu entry for %s."
-msgstr ""
-
-#: admin/fai/class_FAI.inc:1059
-#, php-format
-msgid "Creating copy of %s"
-msgstr ""
-
-#: admin/fai/class_FAI.inc:1062
-msgid "Processing"
-msgstr ""
-
-#: admin/fai/class_FAI.inc:1080
-msgid "Could not create new release, the destination dn is already in use."
-msgstr ""
-
-#: admin/fai/class_FAI.inc:1093
-msgid "Error while fetching source dn - aborted!"
-msgstr ""
-
-#: admin/fai/class_FAI.inc:1174
-msgid "Fatal error"
-msgstr ""
-
-#: admin/fai/class_FAI.inc:1175
-#, php-format
-msgid ""
-"Release creation failed due to ldap errors. Additional informations '%s'."
-msgstr ""
-
-#: admin/fai/class_faiPartitionTableEntry.inc:162
-msgid "primary"
-msgstr ""
-
-#: admin/fai/class_faiPartitionTableEntry.inc:162
-msgid "logical"
-msgstr ""
-
-#: admin/fai/class_faiPartitionTableEntry.inc:169
-#: admin/fai/faiPartition.tpl.c:8
-msgid "Type"
-msgstr ""
-
-#: admin/fai/class_faiPartitionTableEntry.inc:170
-msgid "FS type"
-msgstr ""
-
-#: admin/fai/class_faiPartitionTableEntry.inc:172
-msgid "Size in MB"
-msgstr ""
-
-#: admin/fai/class_faiPartitionTableEntry.inc:174
-msgid "FS option"
-msgstr ""
-
-#: admin/fai/class_faiPartitionTableEntry.inc:175
-#: admin/fai/faiPartition.tpl.c:23
-msgid "Preserve"
-msgstr ""
-
-#: admin/fai/class_faiPartitionTableEntry.inc:266
-msgid "False"
-msgstr ""
-
-#: admin/fai/class_faiPartitionTableEntry.inc:268
-msgid "True"
-msgstr ""
-
-#: admin/fai/class_faiPartitionTableEntry.inc:272
-#: admin/fai/class_faiPartitionTableEntry.inc:274 admin/fai/fai-list.xml:159
-#: admin/fai/fai-list.xml:198
-msgid "Remove"
-msgstr "Fjern"
-
-#: admin/fai/class_faiPartitionTableEntry.inc:384
-#, php-format
-msgid "please enter a unique mount point for partition %s"
-msgstr ""
-
-#: admin/fai/class_faiPartitionTableEntry.inc:389
-#, php-format
-msgid "partition %s mount point"
-msgstr ""
-
-#: admin/fai/class_faiPartitionTableEntry.inc:394
-#, php-format
-msgid ""
-"File system type 'swap' is already used, change file system type for "
-"partition %s."
+#: admin/fai/class_faiTemplateEntry.inc:172
+msgid "Group"
 msgstr ""
 
-#: admin/fai/class_faiPartitionTableEntry.inc:398
-msgid "Please use 'swap' as mount point, if 'swap' is used as fs-type."
+#: admin/fai/class_faiTemplateEntry.inc:172
+msgid "File group"
 msgstr ""
 
-#: admin/fai/class_faiPartitionTableEntry.inc:404
-#: admin/fai/class_faiPartitionTableEntry.inc:408
-#: admin/fai/class_faiPartitionTableEntry.inc:414
-#: admin/fai/class_faiPartitionTableEntry.inc:416
-#: admin/fai/class_faiPartitionTableEntry.inc:421
-#, php-format
-msgid "partition %s size"
+#: admin/fai/class_faiTemplateEntry.inc:181
+msgid "Access"
 msgstr ""
 
-#: admin/fai/class_faiPartitionTableEntry.inc:436
-msgid ""
-"You have more than 3 primary partition table entries in your configuration, "
-"please check your configuration twice."
+#: admin/fai/class_faiTemplateEntry.inc:181
+msgid "Access rights"
 msgstr ""
 
 #: admin/fai/packageSelect/selectPackage-list.xml:10
-#: admin/fai/classSelect/selectClass-list.xml:11
 msgid "Please select the desired entries"
 msgstr ""
 
@@ -711,147 +362,94 @@ msgstr ""
 msgid "Version"
 msgstr ""
 
-#: admin/fai/class_faiProfile.inc:310
-msgid "This list displays all assigned class names for this profile."
-msgstr ""
-
-#: admin/fai/class_faiProfile.inc:313 admin/fai/class_askClassName.inc:103
-#: admin/fai/classSelect/class_classSelect.inc:53
-#: admin/fai/class_faiProfileEntry.inc:158
-msgid "Hook bundle"
-msgstr ""
-
-#: admin/fai/class_faiProfile.inc:314 admin/fai/class_askClassName.inc:105
-#: admin/fai/classSelect/class_classSelect.inc:54
-#: admin/fai/class_faiProfileEntry.inc:159
-msgid "Template bundle"
-msgstr ""
-
-#: admin/fai/class_faiProfile.inc:315 admin/fai/class_askClassName.inc:101
-#: admin/fai/classSelect/class_classSelect.inc:55
-#: admin/fai/class_faiProfileEntry.inc:160
-msgid "Script bundle"
-msgstr ""
-
-#: admin/fai/class_faiProfile.inc:316 admin/fai/class_askClassName.inc:102
-#: admin/fai/classSelect/class_classSelect.inc:56
-#: admin/fai/class_faiProfileEntry.inc:161
-msgid "Variable bundle"
-msgstr ""
-
-#: admin/fai/class_faiProfile.inc:317 admin/fai/class_askClassName.inc:100
-#: admin/fai/classSelect/class_classSelect.inc:57
-#: admin/fai/class_faiProfileEntry.inc:162
-msgid "Package bundle"
-msgstr ""
-
-#: admin/fai/class_faiProfile.inc:321
-msgid "Remove class from profile"
-msgstr ""
-
-#: admin/fai/class_faiProfile.inc:324
-msgid "Up"
-msgstr ""
-
-#: admin/fai/class_faiProfile.inc:325
-msgid "Down"
-msgstr ""
-
-#: admin/fai/class_faiProfile.inc:410
-msgid "No class specified for this profile!"
-msgstr ""
-
-#: admin/fai/class_faiProfile.inc:419
-msgid "You can't use the same name for a class and a profile!"
+#: admin/fai/class_faiProfile.inc:28
+msgid "Profile"
 msgstr ""
 
-#: admin/fai/class_faiProfile.inc:455
+#: admin/fai/class_faiProfile.inc:29
 msgid "FAI profile"
 msgstr ""
 
-#: admin/fai/class_faiProfile.inc:458
+#: admin/fai/class_faiProfile.inc:32
 msgid "FAI Profile"
 msgstr ""
 
-#: admin/fai/class_faiProfile.inc:465 admin/fai/faiProfile.tpl.c:17
+#: admin/fai/class_faiProfile.inc:61
 msgid "FAI classes"
 msgstr ""
 
-#: admin/fai/class_faiHookEntry.inc:200
-msgid "Hook entry"
+#: admin/fai/class_faiProfile.inc:61
+msgid "FAI classes which are part of this profile"
 msgstr ""
 
-#: admin/fai/class_faiHookEntry.inc:201
-msgid "FAI hook entry"
+#: admin/fai/class_faiPackageConfiguration.inc:88
+#, php-format
+msgid "Debconf information for package '%s'"
 msgstr ""
 
-#: admin/fai/class_faiHookEntry.inc:209 admin/fai/faiHookEntry.tpl.c:20
-msgid "Task"
+#: admin/fai/class_faiScript.inc:30 admin/fai/class_faiScript.inc:84
+#: admin/fai/class_faiHook.inc:87
+msgid "Script"
 msgstr ""
 
-#: admin/fai/class_faiHookEntry.inc:210 admin/fai/class_faiScript.inc:595
-#: admin/fai/class_faiScript.inc:599
+#: admin/fai/class_faiScript.inc:31 admin/fai/class_faiScript.inc:34
 msgid "FAI script"
 msgstr ""
 
-#: admin/fai/class_faiPackageConfiguration.inc:88
-#, php-format
-msgid "Debconf information for package '%s'"
+#: admin/fai/class_faiScript.inc:63
+msgid "Scripts"
 msgstr ""
 
-#: admin/fai/class_askClassName.inc:99 admin/fai/class_askClassName.inc:100
-#: admin/fai/class_askClassName.inc:101 admin/fai/class_askClassName.inc:102
-#: admin/fai/class_askClassName.inc:103 admin/fai/class_askClassName.inc:104
-#: admin/fai/class_askClassName.inc:105 admin/fai/class_askClassName.inc:106
-msgid "Create new FAI object"
+#: admin/fai/class_faiScript.inc:67 admin/fai/class_faiHook.inc:67
+#: admin/fai/class_faiVariable.inc:67
+msgid "Variables in this class"
 msgstr ""
 
-#: admin/fai/class_faiTemplateEdit.inc:80
-#, php-format
-msgid ""
-"The file encodig has changed from '%s' to '%s'. Do you really want to save?"
+#: admin/fai/class_faiScript.inc:71 admin/fai/class_faiHook.inc:71
+#: admin/fai/class_faiVariable.inc:71
+msgid "The name of the variable"
 msgstr ""
 
-#: admin/fai/class_faiScript.inc:333 admin/fai/class_faiScript.inc:335
-msgid "Sort direction"
+#: admin/fai/class_faiScript.inc:75 admin/fai/class_faiHook.inc:75
+#: admin/fai/class_faiVariable.inc:75
+msgid "A short description of the variable"
 msgstr ""
 
-#: admin/fai/class_faiScript.inc:348 admin/fai/faiScriptEntry.tpl.c:20
+#: admin/fai/class_faiScript.inc:79
 msgid "Priority"
 msgstr ""
 
-#: admin/fai/class_faiScript.inc:350
-msgid "Action"
+#: admin/fai/class_faiScript.inc:79
+msgid "Priority of this script (FIXME: less is done first?)"
 msgstr ""
 
-#: admin/fai/classSelect/selectClass-list.xml:36 admin/fai/fai-list.xml:88
-#: admin/fai/faiScriptEntry.tpl.c:14
-msgid "Properties"
-msgstr "Egenskaper"
+#: admin/fai/class_faiScript.inc:84
+msgid "The script itself"
+msgstr ""
 
-#: admin/fai/class_faiTemplate.inc:501 admin/fai/fai-list.xml:116
-msgid "Template"
+#: admin/fai/class_faiTemplate.inc:136
+#, php-format
+msgid "There are several files with the same path: %s"
 msgstr ""
 
-#: admin/fai/class_faiTemplate.inc:502 admin/fai/class_faiTemplate.inc:506
-msgid "FAI template"
+#: admin/fai/class_faiTemplate.inc:153
+msgid "Template"
 msgstr ""
 
-#: admin/fai/class_faiVariableEntry.inc:107
-msgid "Content"
+#: admin/fai/class_faiTemplate.inc:154 admin/fai/class_faiTemplate.inc:157
+msgid "FAI template"
 msgstr ""
 
-#: admin/fai/class_faiVariableEntry.inc:142
-msgid "Variable entry"
+#: admin/fai/class_faiTemplate.inc:176
+msgid "Template class name"
 msgstr ""
 
-#: admin/fai/class_faiVariableEntry.inc:143
-msgid "FAI variable entry "
+#: admin/fai/class_faiTemplate.inc:186
+msgid "Template files"
 msgstr ""
 
-#: admin/fai/class_faiVariableEntry.inc:151
-#: admin/fai/faiVariableEntry.tpl.c:20
-msgid "Variable content"
+#: admin/fai/class_faiTemplate.inc:190
+msgid "Template files in this class"
 msgstr ""
 
 #: admin/fai/class_faiPartition.inc:176 admin/fai/class_faiPartition.inc:180
@@ -950,96 +548,75 @@ msgstr ""
 msgid "btrfs"
 msgstr ""
 
-#: admin/fai/class_faiPartition.inc:224
-msgid "LVM/RAID"
-msgstr ""
-
-#: admin/fai/class_faiPartition.inc:327
+#: admin/fai/class_faiPartition.inc:325
 msgid "spare"
 msgstr ""
 
-#: admin/fai/class_faiPartition.inc:330
+#: admin/fai/class_faiPartition.inc:328
 msgid "missing"
 msgstr ""
 
-#: admin/fai/class_faiPartition.inc:333
+#: admin/fai/class_faiPartition.inc:331
 msgid "Options"
 msgstr ""
 
-#: admin/fai/class_faiPartition.inc:420
+#: admin/fai/class_faiPartition.inc:415
 msgid "Minimum partition size"
 msgstr ""
 
-#: admin/fai/class_faiPartition.inc:420
+#: admin/fai/class_faiPartition.inc:415
 msgid "Maximum partition size"
 msgstr ""
 
-#: admin/fai/class_faiPartition.inc:428
+#: admin/fai/class_faiPartition.inc:423
 msgid "Raid arrays must contain at least two partitions!"
 msgstr ""
 
-#: admin/fai/class_faiPartition.inc:430
+#: admin/fai/class_faiPartition.inc:425
 msgid ""
 "Raid 0 arrays can only be realized with a combination of two partitions!"
 msgstr ""
 
-#: admin/fai/class_faiHook.inc:332 admin/fai/class_faiHook.inc:334
-#: admin/fai/fai-list.xml:190 admin/fai/faiVariable.tpl.c:23
-#: admin/fai/faiVariable.tpl.c:26
-msgid "Edit"
-msgstr "Endre"
-
-#: admin/fai/class_faiHook.inc:336
-msgid "Delete"
-msgstr ""
-
-#: admin/fai/class_faiHook.inc:521 admin/fai/fai-list.xml:128
+#: admin/fai/class_faiHook.inc:30
 msgid "Hook"
 msgstr ""
 
-#: admin/fai/class_faiHook.inc:522 admin/fai/class_faiHook.inc:526
+#: admin/fai/class_faiHook.inc:31 admin/fai/class_faiHook.inc:34
 msgid "FAI hook"
 msgstr ""
 
-#: admin/fai/class_faiVariable.inc:387 admin/fai/fai-list.xml:134
-msgid "Variable"
+#: admin/fai/class_faiHook.inc:63
+msgid "Hooks"
 msgstr ""
 
-#: admin/fai/class_faiVariable.inc:388 admin/fai/class_faiVariable.inc:392
-msgid "FAI variable"
+#: admin/fai/class_faiHook.inc:79
+msgid "Task"
 msgstr ""
 
-#: admin/fai/class_faiProfileEntry.inc:184 admin/fai/askClassName.tpl.c:11
-#: admin/fai/askClassName.tpl.c:17 admin/fai/paste_generic.tpl.c:5
-msgid "Class name"
+#: admin/fai/class_faiHook.inc:87
+msgid "The script of this hook"
 msgstr ""
 
-#: admin/fai/class_faiProfileEntry.inc:184 admin/fai/faiTemplate.tpl.c:14
-#: admin/fai/faiVariable.tpl.c:14 admin/fai/faiHook.tpl.c:14
-#: admin/fai/faiPartitionTable.tpl.c:17 admin/fai/faiScript.tpl.c:14
-msgid "Objects"
+#: admin/fai/class_faiVariable.inc:30
+msgid "Variable"
 msgstr ""
 
-#: admin/fai/fai-list.xml:11
-msgid "List of deployment classes and products"
+#: admin/fai/class_faiVariable.inc:31 admin/fai/class_faiVariable.inc:34
+msgid "FAI variable"
 msgstr ""
 
-#: admin/fai/fai-list.xml:15
-msgid "partitionTable"
+#: admin/fai/class_faiVariable.inc:63
+msgid "Variables"
 msgstr ""
 
-#: admin/fai/fai-list.xml:23
-msgid "packagelist"
+#: admin/fai/class_faiVariable.inc:79
+msgid "Content"
 msgstr ""
 
-#: admin/fai/fai-list.xml:93
-msgid "Actions"
+#: admin/fai/class_faiVariable.inc:79
+msgid "The content of the variable"
 msgstr ""
 
-#: admin/fai/fai-list.xml:104
-msgid "Create"
-msgstr "Opprett"
-
 #: admin/systems/class_faiLogView.inc:56
 msgid "Sort down"
 msgstr ""
@@ -1048,6 +625,10 @@ msgstr ""
 msgid "Sort up"
 msgstr ""
 
+#: admin/systems/class_faiLogView.inc:70
+msgid "File"
+msgstr ""
+
 #: admin/systems/class_faiLogView.inc:71
 msgid "Date"
 msgstr ""
@@ -1082,7 +663,7 @@ msgstr ""
 msgid "Selected file: %s"
 msgstr ""
 
-#: admin/systems/class_faiStartup.inc:70 admin/fai/paste_generic.tpl.c:2
+#: admin/systems/class_faiStartup.inc:70
 msgid "FAI settings"
 msgstr ""
 
@@ -1102,11 +683,6 @@ msgstr ""
 msgid "FAI profil to be applied to this computer"
 msgstr ""
 
-#: admin/systems/class_faiStartup.inc:90 admin/fai/faiPackage.tpl.c:14
-#: admin/fai/faiPackage.tpl.c:17
-msgid "Repository"
-msgstr ""
-
 #: admin/systems/class_faiStartup.inc:90
 msgid "FAI Debian repository to be used for installation"
 msgstr ""
@@ -1131,85 +707,96 @@ msgstr ""
 msgid "Linux kernel parameters to be ran"
 msgstr ""
 
-#: admin/systems/class_faiStartup.inc:178
+#: admin/systems/class_faiStartup.inc:179
 msgid "Full automated installation"
 msgstr ""
 
-#: admin/systems/services/repository/class_serviceRepository.inc:31
+#: admin/systems/services/repository/class_serviceDebianRepository.inc:34
+#: admin/systems/services/repository/class_serviceCentosRepository.inc:31
+msgid "Repositories"
+msgstr ""
+
+#: admin/systems/services/repository/class_serviceDebianRepository.inc:39
+#: admin/systems/services/repository/class_serviceCentosRepository.inc:36
+msgid "Repositories this server hosts"
+msgstr ""
+
+#: admin/systems/services/repository/class_serviceDebianRepository.inc:43
+#: admin/systems/services/repository/class_serviceCentosRepository.inc:40
 msgid "URL"
 msgstr ""
 
-#: admin/systems/services/repository/class_serviceRepository.inc:31
+#: admin/systems/services/repository/class_serviceDebianRepository.inc:43
+#: admin/systems/services/repository/class_serviceCentosRepository.inc:40
 msgid "Repository url"
 msgstr ""
 
-#: admin/systems/services/repository/class_serviceRepository.inc:35
+#: admin/systems/services/repository/class_serviceDebianRepository.inc:47
+#: admin/systems/services/repository/class_serviceCentosRepository.inc:44
 msgid "Parent server"
 msgstr ""
 
-#: admin/systems/services/repository/class_serviceRepository.inc:35
+#: admin/systems/services/repository/class_serviceDebianRepository.inc:47
+#: admin/systems/services/repository/class_serviceCentosRepository.inc:44
 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"
+#: admin/systems/services/repository/class_serviceDebianRepository.inc:52
+msgid "Debian release used on this repository"
 msgstr ""
 
-#: admin/systems/services/repository/class_serviceRepository.inc:47
-msgid "Sections available on this repository"
+#: admin/systems/services/repository/class_serviceDebianRepository.inc:58
+msgid "Debian sections available on this repository"
 msgstr ""
 
-#: admin/systems/services/repository/class_serviceRepository.inc:52
+#: admin/systems/services/repository/class_serviceDebianRepository.inc:63
+#: admin/systems/services/repository/class_serviceCentosRepository.inc:57
 msgid "Mirror mode"
 msgstr ""
 
-#: admin/systems/services/repository/class_serviceRepository.inc:52
+#: admin/systems/services/repository/class_serviceDebianRepository.inc:63
+#: admin/systems/services/repository/class_serviceCentosRepository.inc:57
 msgid ""
 "Is this mirror an installation repository? Is its release a custom one?"
 msgstr ""
 
-#: admin/systems/services/repository/class_serviceRepository.inc:57
+#: admin/systems/services/repository/class_serviceDebianRepository.inc:68
+#: admin/systems/services/repository/class_serviceCentosRepository.inc:62
 msgid "Local mirror"
 msgstr ""
 
-#: admin/systems/services/repository/class_serviceRepository.inc:57
+#: admin/systems/services/repository/class_serviceDebianRepository.inc:68
+#: admin/systems/services/repository/class_serviceCentosRepository.inc:62
 msgid "Is this mirror a local or a network mirror?"
 msgstr ""
 
-#: admin/systems/services/repository/class_serviceRepository.inc:66
+#: admin/systems/services/repository/class_serviceDebianRepository.inc:77
+#: admin/systems/services/repository/class_serviceCentosRepository.inc:71
 msgid "Architectures"
 msgstr ""
 
-#: admin/systems/services/repository/class_serviceRepository.inc:66
+#: admin/systems/services/repository/class_serviceDebianRepository.inc:77
+#: admin/systems/services/repository/class_serviceCentosRepository.inc:71
 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"
+#: admin/systems/services/repository/class_serviceDebianRepository.inc:99
+#: admin/systems/services/repository/class_serviceDebianRepository.inc:100
+msgid "Debian repository"
 msgstr ""
 
-#: admin/systems/services/repository/class_serviceRepository.inc:140
-msgid "Repositories"
-msgstr ""
-
-#: admin/systems/services/repository/class_serviceRepository.inc:145
-msgid "Repositories this server hosts"
+#: admin/systems/services/repository/class_serviceDebianRepository.inc:100
+#: admin/systems/services/repository/class_serviceCentosRepository.inc:96
+msgid "Services"
 msgstr ""
 
-#: admin/systems/services/repository/class_serviceRepository.inc:160
-msgid "Package repository"
+#: admin/systems/services/repository/class_serviceCentosRepository.inc:49
+msgid "Centos release used on this repository"
 msgstr ""
 
-#: admin/systems/services/repository/class_serviceRepository.inc:161
-msgid "Package repository information"
+#: admin/systems/services/repository/class_serviceCentosRepository.inc:95
+#: admin/systems/services/repository/class_serviceCentosRepository.inc:96
+msgid "Centos repository"
 msgstr ""
 
 #: config/fai/class_faiConfig.inc:28
@@ -1241,476 +828,3 @@ msgstr ""
 #: config/fai/class_faiConfig.inc:60
 msgid "s"
 msgstr ""
-
-#: admin/fai/faiPartitionTableEntry.tpl.c:2 admin/fai/faiVariableEntry.tpl.c:2
-#: admin/fai/faiVariableEntry.tpl.c:5 admin/fai/faiDiskEntry.tpl.c:2
-#: admin/fai/faiTemplate.tpl.c:2 admin/fai/faiTemplate.tpl.c:5
-#: admin/fai/faiVariable.tpl.c:2 admin/fai/faiVariable.tpl.c:5
-#: admin/fai/faiHook.tpl.c:2 admin/fai/faiHook.tpl.c:5
-#: admin/fai/faiPackage.tpl.c:2 admin/fai/faiPackage.tpl.c:5
-#: admin/fai/faiTemplateEntry.tpl.c:2 admin/fai/faiTemplateEntry.tpl.c:5
-#: admin/fai/faiScriptEntry.tpl.c:2 admin/fai/faiScriptEntry.tpl.c:5
-#: admin/fai/faiPartitionTable.tpl.c:2 admin/fai/faiPartitionTable.tpl.c:5
-#: admin/fai/faiScript.tpl.c:2 admin/fai/faiScript.tpl.c:5
-#: admin/fai/faiProfile.tpl.c:2 admin/fai/faiProfile.tpl.c:5
-#: admin/fai/faiProfile.tpl.c:14 admin/fai/faiHookEntry.tpl.c:2
-#: admin/fai/faiHookEntry.tpl.c:5
-msgid "Generic"
-msgstr "Generisk"
-
-#: admin/fai/faiPartitionTableEntry.tpl.c:14
-#: admin/fai/faiPartitionTableEntry.tpl.c:17 admin/fai/faiDiskEntry.tpl.c:23
-#: admin/fai/faiDiskEntry.tpl.c:26
-msgid "Partition entries"
-msgstr ""
-
-#: admin/fai/faiPartitionTableEntry.tpl.c:20
-#: admin/fai/faiPartitionTableEntry.tpl.c:23 admin/fai/faiDiskEntry.tpl.c:29
-#: admin/fai/faiDiskEntry.tpl.c:32
-msgid "Add partition"
-msgstr ""
-
-#: admin/fai/branch_selector.tpl.c:2
-msgid "Releases"
-msgstr ""
-
-#: admin/fai/branch_selector.tpl.c:5
-msgid "Current release"
-msgstr ""
-
-#: admin/fai/branch_selector.tpl.c:8 admin/fai/branch_selector.tpl.c:17
-#: admin/fai/fai-filter.tpl.c:8 admin/fai/fai-filter.tpl.c:17
-msgid "Create release"
-msgstr ""
-
-#: admin/fai/branch_selector.tpl.c:11 admin/fai/branch_selector.tpl.c:23
-#: admin/fai/fai-filter.tpl.c:11 admin/fai/fai-filter.tpl.c:23
-msgid "Create read-only release"
-msgstr ""
-
-#: admin/fai/branch_selector.tpl.c:20 admin/fai/fai-filter.tpl.c:20
-msgid "Freeze"
-msgstr ""
-
-#: admin/fai/branch_selector.tpl.c:26 admin/fai/fai-filter.tpl.c:26
-msgid "Delete current release"
-msgstr ""
-
-#: admin/fai/faiPartition.tpl.c:2
-msgid "Partition"
-msgstr ""
-
-#: admin/fai/faiPartition.tpl.c:17
-msgid "Resize existing partition"
-msgstr ""
-
-#: admin/fai/faiPartition.tpl.c:20
-msgid "Bootable"
-msgstr ""
-
-#: admin/fai/faiPartition.tpl.c:26 admin/fai/faiDiskEntry.tpl.c:20
-msgid "Combined physical partitions"
-msgstr ""
-
-#: admin/fai/faiPartition.tpl.c:29
-msgid "Toggle missing"
-msgstr ""
-
-#: admin/fai/faiPartition.tpl.c:32
-msgid "Toggle spare"
-msgstr ""
-
-#: admin/fai/faiPartition.tpl.c:35
-msgid "Filesystem"
-msgstr ""
-
-#: admin/fai/faiPartition.tpl.c:38
-msgid "Filesystem create options"
-msgstr ""
-
-#: admin/fai/faiPartition.tpl.c:41
-msgid "Encrypted"
-msgstr ""
-
-#: admin/fai/faiPartition.tpl.c:44
-msgid "Tune options"
-msgstr ""
-
-#: admin/fai/faiNewBranch.tpl.c:2
-msgid ""
-"You are now going to create a branch or locked branch. This action clones "
-"the existing release to another release name. Branches can be modified as "
-"usual. FAI classes of locked branches cannot be modified, just additional "
-"classes are possible. Branch names should be alphanumeric, excluding the "
-"reserved names 'scripts', 'hooks', 'partitions', 'variables', 'templates' "
-"and 'fai'."
-msgstr ""
-
-#: admin/fai/faiNewBranch.tpl.c:5
-msgid ""
-"Branches are created as subreleases of the currently selected branch. "
-"Creating a new branch named 1.0.2 in SARGE for example, will result in a new"
-" release called SARGE/1.0.2."
-msgstr ""
-
-#: admin/fai/faiNewBranch.tpl.c:8
-msgid "Please enter a name for the branch"
-msgstr ""
-
-#: admin/fai/faiNewBranch.tpl.c:11
-msgid "Processing the requested operation"
-msgstr ""
-
-#: admin/fai/faiNewBranch.tpl.c:14
-msgid ""
-"As soon as the copy operation has finished, you can scroll down to end of "
-"the page and press the 'Continue' button to continue with the fai management"
-" dialog."
-msgstr ""
-
-#: admin/fai/faiNewBranch.tpl.c:17
-msgid ""
-"Your browser doesn't support iframes, please use this link to perform the "
-"requested operation."
-msgstr ""
-
-#: admin/fai/faiNewBranch.tpl.c:20
-msgid "Perform requested operation."
-msgstr ""
-
-#: admin/fai/faiNewBranch.tpl.c:23
-msgid "Initiate operation"
-msgstr ""
-
-#: admin/fai/faiVariableEntry.tpl.c:14 admin/fai/faiVariableEntry.tpl.c:17
-msgid "Variable attributes"
-msgstr ""
-
-#: admin/fai/faiDiskEntry.tpl.c:11
-msgid "fstab key"
-msgstr ""
-
-#: admin/fai/faiDiskEntry.tpl.c:17
-msgid "Disk label"
-msgstr ""
-
-#: admin/fai/faiTemplate.tpl.c:17
-msgid "List of template files"
-msgstr ""
-
-#: admin/fai/faiVariable.tpl.c:17
-msgid "List of assigned variables"
-msgstr ""
-
-#: admin/fai/faiVariable.tpl.c:20
-msgid "Choose a variable to delete or edit"
-msgstr ""
-
-#: admin/fai/askClassName.tpl.c:2
-msgid ""
-"Adding a new class to the FAI management, requires a class name. You have to"
-" specify a unique class name for unique types of FAI classes, while you can "
-"use the same class name for different types of FAI classes. In the laste "
-"case, FAI will automatically enclose all these different class types to one "
-"unique class name."
-msgstr ""
-
-#: admin/fai/askClassName.tpl.c:5
-msgid ""
-"Please use one of the following methods to choose the name for the new FAI "
-"class."
-msgstr ""
-
-#: admin/fai/askClassName.tpl.c:8
-msgid "Enter FAI class name manually"
-msgstr ""
-
-#: admin/fai/askClassName.tpl.c:14
-msgid "Choose FAI class name from a list of existing classes"
-msgstr ""
-
-#: admin/fai/askClassName.tpl.c:20
-msgid "Choose class name"
-msgstr ""
-
-#: admin/fai/faiGroupHandle.tpl.c:2
-msgid "Please select the objects you want to remove:"
-msgstr ""
-
-#: admin/fai/faiGroupHandle.tpl.c:5
-msgid "Freezed"
-msgstr ""
-
-#: admin/fai/faiGroupHandle.tpl.c:8
-msgid "Select the object you want to edit:"
-msgstr ""
-
-#: admin/fai/faiGroupHandle.tpl.c:11
-msgid "Select the object you want to copy:"
-msgstr ""
-
-#: admin/fai/remove.tpl.c:5
-msgid ""
-"This includes all account data, system access rules, imap settings, etc. for"
-" this user. Please double check if your really want to do this since there "
-"is no way for FusionDirectory to get your data back."
-msgstr ""
-
-#: admin/fai/remove.tpl.c:8 admin/fai/remove_branch.tpl.c:8
-msgid "So - if you're sure - press 'Delete' to continue or 'Cancel' to abort."
-msgstr ""
-
-#: admin/fai/faiHook.tpl.c:17
-msgid "List of hook scripts"
-msgstr ""
-
-#: admin/fai/packageSelect/selectPackage-list.tpl.c:2
-#: admin/fai/classSelect/selectClass-list.tpl.c:5
-msgid "Update"
-msgstr ""
-
-#: admin/fai/packageSelect/selectPackage-list.tpl.c:5
-#: admin/fai/classSelect/selectClass-list.tpl.c:8
-msgid "Submit"
-msgstr ""
-
-#: admin/fai/packageSelect/selectPackage-filter.tpl.c:2
-#: admin/fai/classSelect/selectClass-filter.tpl.c:2
-#: admin/fai/fai-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 ""
-
-#: admin/fai/remove_branch.tpl.c:5
-msgid ""
-"This includes all account data, system access, etc. for this branch. Please "
-"double check if your really want to do this since there is no way for "
-"FusionDirectory to get your data back."
-msgstr ""
-
-#: admin/fai/faiPackage.tpl.c:26
-msgid "Install method"
-msgstr ""
-
-#: admin/fai/faiPackage.tpl.c:29
-msgid "Please select the installation method"
-msgstr ""
-
-#: admin/fai/faiPackage.tpl.c:32 admin/fai/faiPackage.tpl.c:35
-msgid "Used packages"
-msgstr ""
-
-#: admin/fai/faiPackage.tpl.c:38
-msgid "Add from list"
-msgstr ""
-
-#: admin/fai/faiProfileEntry.tpl.c:2
-msgid "List of FAI objects (Fully Automatic Installation)"
-msgstr ""
-
-#: admin/fai/faiProfileEntry.tpl.c:5
-msgid "Information"
-msgstr ""
-
-#: admin/fai/faiProfileEntry.tpl.c:8
-msgid ""
-"This menu allows you to select FAI class names and to add them to the "
-"currently edited profile."
-msgstr ""
-
-#: admin/fai/faiProfileEntry.tpl.c:11
-msgid "Filters"
-msgstr "Filter"
-
-#: admin/fai/faiProfileEntry.tpl.c:14
-msgid "Show only classes with templates"
-msgstr ""
-
-#: admin/fai/faiProfileEntry.tpl.c:17
-msgid "Show only classes with scripts"
-msgstr ""
-
-#: admin/fai/faiProfileEntry.tpl.c:20
-msgid "Show only classes with hooks"
-msgstr ""
-
-#: admin/fai/faiProfileEntry.tpl.c:23
-msgid "Show only classes with variables"
-msgstr ""
-
-#: admin/fai/faiProfileEntry.tpl.c:26
-msgid "Show only classes with packages"
-msgstr ""
-
-#: admin/fai/faiProfileEntry.tpl.c:29
-msgid "Show only classes with partitions"
-msgstr ""
-
-#: admin/fai/faiProfileEntry.tpl.c:32 admin/fai/faiProfileEntry.tpl.c:35
-msgid "Display objects matching"
-msgstr ""
-
-#: admin/fai/faiProfileEntry.tpl.c:38
-msgid "Regular expression for matching object names"
-msgstr ""
-
-#: admin/fai/faiTemplateEntry.tpl.c:17 admin/fai/faiTemplateEntry.tpl.c:20
-msgid "Template attributes"
-msgstr ""
-
-#: admin/fai/faiTemplateEntry.tpl.c:26 admin/fai/faiTemplateEntry.tpl.c:29
-msgid "Save template"
-msgstr ""
-
-#: admin/fai/faiTemplateEntry.tpl.c:32 admin/fai/faiTemplateEntry.tpl.c:35
-msgid "Edit template"
-msgstr ""
-
-#: admin/fai/faiTemplateEntry.tpl.c:38
-msgid "Full path"
-msgstr ""
-
-#: admin/fai/faiTemplateEntry.tpl.c:41
-msgid "Upload"
-msgstr ""
-
-#: admin/fai/faiTemplateEntry.tpl.c:44
-msgid "Owner"
-msgstr ""
-
-#: admin/fai/faiTemplateEntry.tpl.c:50
-msgid "Access"
-msgstr ""
-
-#: admin/fai/faiTemplateEntry.tpl.c:53
-msgid "Class"
-msgstr ""
-
-#: admin/fai/faiTemplateEntry.tpl.c:56
-msgid "Read"
-msgstr ""
-
-#: admin/fai/faiTemplateEntry.tpl.c:59
-msgid "Write"
-msgstr ""
-
-#: admin/fai/faiTemplateEntry.tpl.c:62
-msgid "Execute"
-msgstr ""
-
-#: admin/fai/faiTemplateEntry.tpl.c:65
-msgid "Special"
-msgstr ""
-
-#: admin/fai/faiTemplateEntry.tpl.c:71
-msgid "SUID"
-msgstr ""
-
-#: admin/fai/faiTemplateEntry.tpl.c:77
-msgid "SGID"
-msgstr ""
-
-#: admin/fai/faiTemplateEntry.tpl.c:80
-msgid "Others"
-msgstr ""
-
-#: admin/fai/faiTemplateEntry.tpl.c:83
-msgid "sticky"
-msgstr ""
-
-#: admin/fai/faiScriptEntry.tpl.c:17 admin/fai/faiScriptEntry.tpl.c:26
-msgid "Script attributes"
-msgstr ""
-
-#: admin/fai/faiScriptEntry.tpl.c:23
-msgid ""
-"Choose a priority. Low values result in an earlier, high values in a later "
-"execution."
-msgstr ""
-
-#: admin/fai/faiScriptEntry.tpl.c:32 admin/fai/faiHookEntry.tpl.c:32
-msgid "Import script"
-msgstr ""
-
-#: admin/fai/classSelect/selectClass-list.tpl.c:2
-msgid "Base"
-msgstr ""
-
-#: admin/fai/fai-filter.tpl.c:29
-msgid "Show profiles"
-msgstr ""
-
-#: admin/fai/fai-filter.tpl.c:32
-msgid "Show templates"
-msgstr ""
-
-#: admin/fai/fai-filter.tpl.c:35
-msgid "Show scripts"
-msgstr ""
-
-#: admin/fai/fai-filter.tpl.c:38
-msgid "Show hooks"
-msgstr ""
-
-#: admin/fai/fai-filter.tpl.c:41
-msgid "Show variables"
-msgstr ""
-
-#: admin/fai/fai-filter.tpl.c:44
-msgid "Show packages"
-msgstr ""
-
-#: admin/fai/fai-filter.tpl.c:47
-msgid "Show partitions"
-msgstr ""
-
-#: admin/fai/faiTemplateEdit.tpl.c:2
-msgid "This FAI template is write protected. Editing may break it!"
-msgstr ""
-
-#: admin/fai/faiTemplateEdit.tpl.c:5
-msgid "Edit anyway"
-msgstr ""
-
-#: admin/fai/faiPartitionTable.tpl.c:14
-msgid "Use 'setup-storage' to partition the disk"
-msgstr ""
-
-#: admin/fai/faiPartitionTable.tpl.c:20
-msgid "Discs"
-msgstr ""
-
-#: admin/fai/faiPartitionTable.tpl.c:23 admin/fai/faiPartitionTable.tpl.c:26
-#: admin/fai/faiPartitionTable.tpl.c:41 admin/fai/faiPartitionTable.tpl.c:44
-msgid "Add disk"
-msgstr ""
-
-#: admin/fai/faiPartitionTable.tpl.c:29 admin/fai/faiPartitionTable.tpl.c:32
-#: admin/fai/faiPartitionTable.tpl.c:47 admin/fai/faiPartitionTable.tpl.c:50
-msgid "Add RAID"
-msgstr ""
-
-#: admin/fai/faiPartitionTable.tpl.c:35 admin/fai/faiPartitionTable.tpl.c:38
-#: admin/fai/faiPartitionTable.tpl.c:53 admin/fai/faiPartitionTable.tpl.c:56
-msgid "Add volume group"
-msgstr ""
-
-#: admin/fai/faiScript.tpl.c:17
-msgid "List of scripts"
-msgstr ""
-
-#: admin/fai/faiProfile.tpl.c:20
-msgid "Choose a priority"
-msgstr ""
-
-#: admin/fai/faiHookEntry.tpl.c:14 admin/fai/faiHookEntry.tpl.c:17
-#: admin/fai/faiHookEntry.tpl.c:26
-msgid "Hook attributes"
-msgstr ""
-
-#: admin/fai/faiHookEntry.tpl.c:23
-msgid "Choose an existing FAI task"
-msgstr ""
diff --git a/fai/locale/nl/fusiondirectory.po b/fai/locale/nl/fusiondirectory.po
index 520a1662db3dbf217ca3e6540272a53b76f89226..209353fcda746a32c62ec9c2ccdcb766ce1efb87 100644
--- a/fai/locale/nl/fusiondirectory.po
+++ b/fai/locale/nl/fusiondirectory.po
@@ -3,384 +3,190 @@
 # This file is distributed under the same license as the PACKAGE package.
 # 
 # Translators:
-# Christophe Augello <christophe@augello.be>, 2012
-# Kenny Tordeurs <tordeurskenny@gmail.com>, 2012-2013
-#  Niels Klomp (CareWorks ICT Services) <nk@careworks.nl>, 2005
 msgid ""
 msgstr ""
-"Project-Id-Version: FusionDirectory-108\n"
+"Project-Id-Version: FusionDirectory-109\n"
 "Report-Msgid-Bugs-To: documentation@lists.fusiondirectory.org\n"
-"POT-Creation-Date: 2015-03-19 21:45+0100\n"
-"PO-Revision-Date: 2015-02-25 16:12+0000\n"
+"POT-Creation-Date: 2014-12-15 17:47+0100\n"
+"PO-Revision-Date: 2015-02-25 16:13+0000\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>\n"
-"Language-Team: Dutch (http://www.transifex.com/projects/p/FusionDirectory-108/language/nl/)\n"
+"Language-Team: Dutch (http://www.transifex.com/projects/p/FusionDirectory-109/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/fai/class_faiScriptEntry.inc:79 admin/fai/class_faiScriptEntry.inc:82
-#: admin/fai/class_faiManagement.inc:240 admin/fai/class_faiManagement.inc:768
-#: admin/fai/class_faiManagement.inc:774
-#: admin/fai/class_faiPartitionTable.inc:268
-#: admin/fai/class_faiPartitionTable.inc:331
-#: admin/fai/class_faiDiskEntry.inc:445 admin/fai/class_FAI.inc:570
-#: admin/fai/class_faiHookEntry.inc:83 admin/fai/class_faiHookEntry.inc:86
-#: admin/fai/class_faiScript.inc:249 admin/fai/class_faiTemplate.inc:232
-#: admin/fai/class_faiHook.inc:259 admin/fai/class_faiVariable.inc:162
-#: admin/systems/class_faiLogView.inc:207
-#: admin/systems/class_faiLogView.inc:242
-msgid "Error"
-msgstr "Fout"
-
-#: admin/fai/class_faiScriptEntry.inc:82 admin/fai/class_faiHookEntry.inc:86
-msgid "file is empty"
-msgstr "Bestand is leeg"
-
-#: admin/fai/class_faiScriptEntry.inc:102 admin/fai/class_faiHookEntry.inc:102
-#: admin/fai/class_faiScript.inc:349 admin/fai/class_faiScript.inc:374
-#: admin/fai/class_faiTemplate.inc:320 admin/fai/class_faiHook.inc:346
-msgid "Download"
-msgstr "Downloaden"
-
-#: admin/fai/class_faiScriptEntry.inc:147
-#: admin/fai/class_faiScriptEntry.inc:151
-#: admin/fai/class_faiScriptEntry.inc:154
-#: admin/fai/class_faiScriptEntry.inc:197
-#: admin/fai/class_faiManagement.inc:768 admin/fai/class_faiManagement.inc:774
-#: admin/fai/class_faiPackage.inc:685
-#: admin/fai/class_faiPartitionTable.inc:779
-#: admin/fai/class_faiDiskEntry.inc:702 admin/fai/class_faiDiskEntry.inc:705
-#: admin/fai/class_faiDiskEntry.inc:758
-#: admin/fai/class_faiTemplateEntry.inc:247
-#: admin/fai/class_faiTemplateEntry.inc:312
-#: admin/fai/class_faiPartitionTableEntry.inc:353
-#: admin/fai/class_faiPartitionTableEntry.inc:356
-#: admin/fai/class_faiPartitionTableEntry.inc:360
-#: admin/fai/class_faiPartitionTableEntry.inc:455
-#: admin/fai/packageSelect/selectPackage-list.xml:40
-#: admin/fai/class_faiProfile.inc:414 admin/fai/class_faiProfile.inc:463
-#: admin/fai/class_faiHookEntry.inc:157 admin/fai/class_faiHookEntry.inc:162
-#: admin/fai/class_faiHookEntry.inc:165 admin/fai/class_faiHookEntry.inc:207
-#: admin/fai/class_askClassName.inc:163 admin/fai/class_askClassName.inc:167
-#: admin/fai/class_askClassName.inc:171 admin/fai/class_askClassName.inc:198
-#: admin/fai/class_faiScript.inc:347 admin/fai/class_faiScript.inc:605
-#: admin/fai/classSelect/selectClass-list.xml:28
-#: admin/fai/class_faiTemplate.inc:512
-#: admin/fai/class_faiVariableEntry.inc:103
-#: admin/fai/class_faiVariableEntry.inc:112
-#: admin/fai/class_faiVariableEntry.inc:115
-#: admin/fai/class_faiVariableEntry.inc:149 admin/fai/class_faiHook.inc:531
-#: admin/fai/class_faiVariable.inc:398 admin/fai/fai-list.xml:80
-#: admin/fai/faiPartitionTableEntry.tpl.c:8 admin/fai/faiPartition.tpl.c:5
-#: admin/fai/faiVariableEntry.tpl.c:8 admin/fai/faiDiskEntry.tpl.c:8
-#: admin/fai/faiTemplate.tpl.c:8 admin/fai/faiVariable.tpl.c:8
-#: admin/fai/faiHook.tpl.c:8
-#: admin/fai/packageSelect/selectPackage-filter.tpl.c:8
-#: admin/fai/faiPackage.tpl.c:8 admin/fai/faiScriptEntry.tpl.c:8
-#: admin/fai/classSelect/selectClass-filter.tpl.c:5
-#: admin/fai/fai-filter.tpl.c:50 admin/fai/faiPartitionTable.tpl.c:8
-#: admin/fai/faiScript.tpl.c:8 admin/fai/faiProfile.tpl.c:8
-#: admin/fai/faiHookEntry.tpl.c:8
-msgid "Name"
-msgstr "Naam"
-
-#: admin/fai/class_faiScriptEntry.inc:159 admin/fai/class_faiHookEntry.inc:170
-#: admin/fai/class_faiScript.inc:594 admin/fai/fai-list.xml:122
-#: admin/fai/faiScriptEntry.tpl.c:29 admin/fai/faiHookEntry.tpl.c:29
-msgid "Script"
-msgstr "Script"
-
-#: admin/fai/class_faiScriptEntry.inc:190
-#: admin/fai/class_faiScriptEntry.inc:199
-msgid "Script entry"
-msgstr "Script invoer"
-
-#: admin/fai/class_faiScriptEntry.inc:191
-msgid "FAI script entry"
-msgstr "FAI script invoer"
-
-#: admin/fai/class_faiScriptEntry.inc:198 admin/fai/class_faiPackage.inc:686
-#: admin/fai/class_faiPartitionTable.inc:780
-#: admin/fai/class_faiDiskEntry.inc:759
-#: admin/fai/class_faiTemplateEntry.inc:313
-#: admin/fai/class_faiPartitionTableEntry.inc:456
-#: admin/fai/class_faiProfile.inc:464 admin/fai/class_faiHookEntry.inc:208
-#: admin/fai/class_faiScript.inc:606 admin/fai/class_faiTemplate.inc:513
-#: admin/fai/class_faiVariableEntry.inc:150 admin/fai/class_faiHook.inc:532
-#: admin/fai/class_faiVariable.inc:399
-#: admin/fai/faiPartitionTableEntry.tpl.c:11 admin/fai/faiPartition.tpl.c:11
-#: admin/fai/faiVariableEntry.tpl.c:11 admin/fai/faiDiskEntry.tpl.c:14
-#: admin/fai/faiTemplate.tpl.c:11 admin/fai/faiVariable.tpl.c:11
-#: admin/fai/faiHook.tpl.c:11 admin/fai/faiPackage.tpl.c:11
-#: admin/fai/faiTemplateEntry.tpl.c:14 admin/fai/faiScriptEntry.tpl.c:11
-#: admin/fai/faiPartitionTable.tpl.c:11 admin/fai/faiScript.tpl.c:11
-#: admin/fai/faiProfile.tpl.c:11 admin/fai/faiHookEntry.tpl.c:11
-msgid "Description"
-msgstr "Omschrijving"
-
-#: admin/fai/class_faiScriptEntry.inc:200
-msgid "Script Priority"
-msgstr "Script prioriteit"
-
-#: admin/fai/class_faiManagement.inc:188
-msgid "partition table"
-msgstr "partitie tafel"
-
-#: admin/fai/class_faiManagement.inc:189 admin/fai/fai-list.xml:31
-msgid "script"
-msgstr "script"
-
-#: admin/fai/class_faiManagement.inc:190 admin/fai/fai-list.xml:47
-msgid "hook"
-msgstr "aansluiting"
-
-#: admin/fai/class_faiManagement.inc:191 admin/fai/fai-list.xml:39
-msgid "variable"
-msgstr "varaibel"
-
-#: admin/fai/class_faiManagement.inc:192 admin/fai/fai-list.xml:63
-msgid "template"
-msgstr "sjabloon"
-
-#: admin/fai/class_faiManagement.inc:193
-msgid "package list"
-msgstr "pakketlijst"
-
-#: admin/fai/class_faiManagement.inc:210 admin/fai/class_faiManagement.inc:226
-#: admin/fai/class_faiManagement.inc:332 admin/fai/class_faiManagement.inc:390
-#: admin/fai/class_faiManagement.inc:480 admin/fai/class_faiManagement.inc:575
-#: admin/fai/class_faiManagement.inc:598 admin/fai/class_faiManagement.inc:619
-msgid "Permission error"
-msgstr "Permissiefout"
-
-#: admin/fai/class_faiManagement.inc:211 admin/fai/class_faiManagement.inc:226
-#, php-format
-msgid "You have no permission to create a new %s!"
-msgstr "U heeft het recht niet om een nieuwe %s te crÃ«eren!"
-
-#: admin/fai/class_faiManagement.inc:226 admin/fai/fai-list.xml:55
-msgid "profile"
-msgstr "profiel"
-
-#: admin/fai/class_faiManagement.inc:328
-msgid "Branch locked"
-msgstr "Branch vergrendeld"
-
-#: admin/fai/class_faiManagement.inc:329
-#, php-format
-msgid "The following entries are locked, you can't remove them %s."
-msgstr "De volgende waarden zijn vergrendeld, u kan ze niet verwijderen %s."
-
-#: admin/fai/class_faiManagement.inc:346
-msgid "FAI object"
-msgstr "FAI object"
-
-#: admin/fai/class_faiManagement.inc:477
-msgid "FAI branch/freeze"
-msgstr "FAI branch/freeze"
-
-#: admin/fai/class_faiManagement.inc:480
-msgid "You have no permission to delete this release!"
-msgstr "U heeft het recht niet om deze release te verwijderen!"
-
-#: admin/fai/class_faiManagement.inc:496 admin/fai/remove.tpl.c:2
-#: admin/fai/remove_branch.tpl.c:2
-msgid "Warning"
-msgstr "Waarschuwing"
-
-#: admin/fai/class_faiManagement.inc:496
-msgid "Release remove aborted because the release name check failed!"
-msgstr "Release verwijdering gestopt doordat de release naam check gefaald is!"
-
-#: admin/fai/class_faiManagement.inc:573 admin/fai/class_faiManagement.inc:596
-msgid "Configuration"
-msgstr "Configuratie"
-
-#: admin/fai/class_faiManagement.inc:575 admin/fai/class_faiManagement.inc:598
-#: admin/fai/class_faiManagement.inc:619
-msgid "Branch"
-msgstr "Branch"
-
-#: admin/fai/class_faiManagement.inc:725 admin/fai/askClassName.tpl.c:23
-msgid "Continue"
-msgstr "Doorgaan"
-
-#: admin/fai/class_faiManagement.inc:926
-#: admin/fai/class_faiPartitionTable.inc:768
-#: admin/fai/class_faiProfile.inc:318 admin/fai/class_askClassName.inc:99
-#: admin/fai/classSelect/class_classSelect.inc:58
-#: admin/fai/class_faiGroupHandle.inc:120
-#: admin/fai/class_faiProfileEntry.inc:163 admin/fai/fai-list.xml:146
-msgid "Partition table"
-msgstr "Partitietabel"
-
-#: admin/fai/class_faiManagement.inc:928
-#: admin/fai/class_faiGroupHandle.inc:122 admin/fai/fai-list.xml:140
-msgid "Package list"
-msgstr "Pakketlijst"
-
-#: admin/fai/class_faiManagement.inc:930
-#: admin/fai/class_faiGroupHandle.inc:124
-msgid "Scripts"
-msgstr "Scripts"
-
-#: admin/fai/class_faiManagement.inc:932
-#: admin/fai/class_faiGroupHandle.inc:126
-msgid "Variables"
-msgstr "Variabelen"
-
-#: admin/fai/class_faiManagement.inc:934
-#: admin/fai/class_faiGroupHandle.inc:128
-msgid "Hooks"
-msgstr "Inhakers"
-
-#: admin/fai/class_faiManagement.inc:936 admin/fai/class_faiProfile.inc:454
-#: admin/fai/class_askClassName.inc:104 admin/fai/class_faiGroupHandle.inc:130
-#: admin/fai/fai-list.xml:110
-msgid "Profile"
-msgstr "Profiel"
-
-#: admin/fai/class_faiManagement.inc:938
-#: admin/fai/class_faiGroupHandle.inc:132
-msgid "Templates"
-msgstr "Sjablonen"
-
-#: admin/fai/class_faiManagement.inc:1039
-#: admin/fai/class_faiManagement.inc:1045
+#: admin/fai/class_faiManagement.inc:117 admin/fai/class_faiManagement.inc:122
 #: admin/fai/packageSelect/selectPackage-list.xml:14
-#: admin/fai/classSelect/selectClass-list.xml:15
-#: admin/systems/class_faiStartup.inc:177 config/fai/class_faiConfig.inc:41
+#: admin/systems/class_faiStartup.inc:178 config/fai/class_faiConfig.inc:41
 msgid "FAI"
 msgstr "FAI"
 
-#: admin/fai/class_faiManagement.inc:1040
+#: 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_faiPackage.inc:261
-msgid "Invalid package names"
-msgstr "Ongeldige pakket namen"
-
-#: admin/fai/class_faiPackage.inc:262
-#, php-format
-msgid "The following package names don't match the Debian policy: %s"
-msgstr "De volgende pakket namen komen niet overeen met de Debian policy : %s"
-
-#: admin/fai/class_faiPackage.inc:421 admin/fai/class_faiPackage.inc:422
-msgid "Configured"
-msgstr "Geconfigureerd"
-
-#: admin/fai/class_faiPackage.inc:428 admin/fai/class_faiPackage.inc:429
-msgid "Package marked for removal"
-msgstr "Pakket gemarkeerd voor verwijdering"
-
-#: admin/fai/class_faiPackage.inc:445
-msgid "Mark package for removal"
-msgstr "Markeer pakket voor het verwijderen"
-
-#: admin/fai/class_faiPackage.inc:451
-msgid "Configure this package"
-msgstr "Configureer deze pakket"
+#: admin/fai/class_faiPackage.inc:157
+msgid "Mark for installation"
+msgstr ""
 
-#: admin/fai/class_faiPackage.inc:455
-msgid "Remove this package"
-msgstr "Verwijder deze pakket"
+#: admin/fai/class_faiPackage.inc:161
+msgid "Mark for removal"
+msgstr ""
 
-#: admin/fai/class_faiPackage.inc:534
-msgid "Please select a least one package!"
-msgstr "Gelieve minstens Ã©Ã©n pakket te selecteren!"
+#: admin/fai/class_faiPackage.inc:166
+msgid "Edit configuration"
+msgstr ""
 
-#: admin/fai/class_faiPackage.inc:538
-msgid ""
-"Please choose a valid release/section combination for your repository setup!"
-msgstr "Gelieve een geldig release/sectie combinatie te kiezen voor uw repository setup!"
+#: admin/fai/class_faiPackage.inc:247
+#: admin/fai/class_faiPartitionTable.inc:209
+#: admin/fai/class_faiPartitionTable.inc:250
+#: admin/fai/class_faiTemplate.inc:114
+#: admin/systems/services/repository/class_serviceDebianRepository.inc:172
+#: admin/systems/services/repository/class_serviceDebianRepository.inc:189
+#: admin/systems/services/repository/class_serviceDebianRepository.inc:193
+msgid "LDAP error"
+msgstr "LDAP fout"
 
-#: admin/fai/class_faiPackage.inc:571
+#: admin/fai/class_faiPackage.inc:279
 #: admin/fai/packageSelect/class_filterFAIPackages.inc:41
 #: admin/fai/packageSelect/class_filterFAIPackages.inc:46
 #: admin/fai/class_faiPackageConfiguration.inc:55
-#: admin/systems/class_faiStartup.inc:132
-#: admin/systems/class_faiStartup.inc:159
-msgid "Infrastructure service"
-msgstr ""
+#: admin/systems/class_faiStartup.inc:133
+#: admin/systems/class_faiStartup.inc:160
+msgid "Service infrastructure"
+msgstr "Dienst infrastructuur"
 
-#: admin/fai/class_faiPackage.inc:587
+#: admin/fai/class_faiPackage.inc:294
 msgid "Unkown packages"
 msgstr "Onbekende pakketen"
 
-#: admin/fai/class_faiPackage.inc:674
-#: admin/fai/faiPackageConfiguration.tpl.c:2
+#: admin/fai/class_faiPackage.inc:365
 msgid "Package"
 msgstr "Pakket"
 
-#: admin/fai/class_faiPackage.inc:675
+#: admin/fai/class_faiPackage.inc:366
 msgid "FAI Package list"
 msgstr "FAI pakket lijst"
 
-#: admin/fai/class_faiPackage.inc:679
+#: admin/fai/class_faiPackage.inc:369
 msgid "FAI Package"
 msgstr "FAI pakket"
 
-#: admin/fai/class_faiPackage.inc:687
-msgid "Packages"
-msgstr "Pakketten"
+#: admin/fai/class_faiPackage.inc:385
+#: admin/fai/class_faiPartitionTable.inc:304
+#: admin/fai/class_faiTemplateEntry.inc:140 admin/fai/class_faiProfile.inc:47
+#: admin/fai/class_faiScript.inc:50 admin/fai/class_faiTemplate.inc:173
+#: admin/fai/class_faiHook.inc:50 admin/fai/class_faiVariable.inc:50
+msgid "Properties"
+msgstr "Eigenschappen"
 
-#: admin/fai/class_faiPackage.inc:688 admin/fai/faiPackage.tpl.c:23
-msgid "Section"
-msgstr "Sectie"
+#: admin/fai/class_faiPackage.inc:388
+#: admin/fai/class_faiPartitionTable.inc:307 admin/fai/class_faiProfile.inc:50
+#: admin/fai/class_faiScript.inc:53 admin/fai/class_faiTemplate.inc:176
+#: admin/fai/class_faiHook.inc:53 admin/fai/class_faiVariable.inc:53
+msgid "Class name"
+msgstr "Klassenaam"
 
-#: admin/fai/class_faiPackage.inc:688 admin/fai/class_faiPackage.inc:691
-#: admin/fai/class_faiScript.inc:605 admin/fai/class_faiTemplate.inc:512
-msgid "Readonly"
-msgstr "Readonly"
+#: admin/fai/class_faiPackage.inc:388 admin/fai/class_faiScript.inc:53
+#: admin/fai/class_faiHook.inc:53 admin/fai/class_faiVariable.inc:53
+msgid "Variables class name"
+msgstr ""
 
-#: admin/fai/class_faiPackage.inc:689
-msgid "Install Method"
-msgstr "Installatie methode"
+#: admin/fai/class_faiPackage.inc:392
+#: admin/fai/class_faiPartitionTable.inc:311
+#: admin/fai/class_faiDiskEntry.inc:738
+#: admin/fai/class_faiTemplateEntry.inc:147 admin/fai/class_faiProfile.inc:54
+#: admin/fai/class_faiScript.inc:57 admin/fai/class_faiScript.inc:75
+#: admin/fai/class_faiTemplate.inc:180 admin/fai/class_faiHook.inc:57
+#: admin/fai/class_faiHook.inc:75 admin/fai/class_faiVariable.inc:57
+#: admin/fai/class_faiVariable.inc:75
+msgid "Description"
+msgstr "Omschrijving"
+
+#: admin/fai/class_faiPackage.inc:392
+#: admin/fai/class_faiPartitionTable.inc:311 admin/fai/class_faiProfile.inc:54
+#: admin/fai/class_faiScript.inc:57 admin/fai/class_faiTemplate.inc:180
+#: admin/fai/class_faiHook.inc:57 admin/fai/class_faiVariable.inc:57
+msgid "Short description of the class"
+msgstr ""
 
-#: admin/fai/class_faiPackage.inc:690
-msgid "Package configuration"
-msgstr "Pakket configuratie"
+#: admin/fai/class_faiPackage.inc:398 admin/systems/class_faiStartup.inc:90
+msgid "Repository"
+msgstr "Verzamelplaats"
 
-#: admin/fai/class_faiPackage.inc:691 admin/systems/class_faiStartup.inc:78
-#: admin/systems/services/repository/class_serviceRepository.inc:40
-#: admin/fai/branch_selector.tpl.c:14 admin/fai/faiPackage.tpl.c:20
-#: admin/fai/fai-filter.tpl.c:5 admin/fai/fai-filter.tpl.c:14
+#: admin/fai/class_faiPackage.inc:401 admin/systems/class_faiStartup.inc:78
+#: admin/systems/services/repository/class_serviceDebianRepository.inc:52
+#: admin/systems/services/repository/class_serviceCentosRepository.inc:49
 msgid "Release"
 msgstr "Distributie versie"
 
-#: admin/fai/class_faiPartitionTable.inc:269
-#: admin/fai/class_faiDiskEntry.inc:446
-#, php-format
-msgid ""
-"The disk cannot be deleted while it is used in the '%s' disk definition!"
-msgstr "Kan deze disk niet verwijderen waneer deze in gebruik is in '%s' disk omschrijving!"
+#: admin/fai/class_faiPackage.inc:401
+msgid "Debian release concerned"
+msgstr ""
+
+#: admin/fai/class_faiPackage.inc:405
+#: admin/systems/services/repository/class_serviceDebianRepository.inc:58
+msgid "Sections"
+msgstr "Secties"
+
+#: admin/fai/class_faiPackage.inc:405
+msgid "Sections concerned"
+msgstr ""
+
+#: admin/fai/class_faiPackage.inc:409
+msgid "Install method"
+msgstr "Installatie methode"
+
+#: admin/fai/class_faiPackage.inc:409
+msgid "Install method to use for this package list"
+msgstr ""
+
+#: admin/fai/class_faiPackage.inc:420
+msgid "Packages"
+msgstr "Pakketten"
+
+#: admin/fai/class_faiPackage.inc:424
+msgid "Packages in this class"
+msgstr ""
 
-#: admin/fai/class_faiPartitionTable.inc:416 admin/fai/class_faiScript.inc:360
-#: admin/fai/class_faiScript.inc:362 admin/fai/class_faiTemplate.inc:306
-#: admin/fai/class_faiTemplate.inc:308
-msgid "edit"
-msgstr "Bewerk"
+#: admin/fai/class_faiPartitionTable.inc:61
+#: admin/fai/class_faiDiskEntry.inc:442 admin/systems/class_faiLogView.inc:207
+#: admin/systems/class_faiLogView.inc:242
+msgid "Error"
+msgstr "Fout"
+
+#: admin/fai/class_faiPartitionTable.inc:112
+msgid "Add RAID"
+msgstr "Raid toevoegen"
+
+#: admin/fai/class_faiPartitionTable.inc:116
+msgid "Add LVM"
+msgstr ""
 
-#: admin/fai/class_faiPartitionTable.inc:418 admin/fai/class_faiScript.inc:364
-#: admin/fai/class_faiTemplate.inc:310
-msgid "delete"
-msgstr "Verwijder"
+#: admin/fai/class_faiPartitionTable.inc:284
+msgid "Partition table"
+msgstr "Partitietabel"
 
-#: admin/fai/class_faiPartitionTable.inc:769
-#: admin/fai/class_faiPartitionTable.inc:773
+#: admin/fai/class_faiPartitionTable.inc:285
+#: admin/fai/class_faiPartitionTable.inc:288
 msgid "FAI partition table"
 msgstr "FAI partitie tafel"
 
-#: admin/fai/class_faiPartitionTable.inc:779 admin/fai/class_faiHook.inc:531
-#: admin/fai/class_faiVariable.inc:398
-msgid "Read only"
-msgstr "Read only"
+#: admin/fai/class_faiPartitionTable.inc:307 admin/fai/class_faiProfile.inc:50
+msgid "Partition table class name"
+msgstr ""
+
+#: admin/fai/class_faiPartitionTable.inc:317
+msgid "Discs"
+msgstr "Schijven"
+
+#: admin/fai/class_faiPartitionTable.inc:324
+msgid "Partitions in this class"
+msgstr ""
 
 #: admin/fai/class_faiDiskEntry.inc:273
-#: admin/fai/faiPartitionTableEntry.tpl.c:5 admin/fai/faiDiskEntry.tpl.c:5
 msgid "Device"
 msgstr "Apparaat"
 
@@ -392,103 +198,103 @@ msgstr "Label"
 msgid "UUID"
 msgstr "UUID"
 
-#: admin/fai/class_faiDiskEntry.inc:345
+#: admin/fai/class_faiDiskEntry.inc:344
 msgid "Disks"
 msgstr "Disks"
 
-#: admin/fai/class_faiDiskEntry.inc:348 admin/fai/class_faiPartition.inc:321
-#: admin/fai/faiPartition.tpl.c:14
+#: admin/fai/class_faiDiskEntry.inc:347 admin/fai/class_faiPartition.inc:319
 msgid "Size"
 msgstr "Grootte"
 
-#: admin/fai/class_faiDiskEntry.inc:544
+#: admin/fai/class_faiDiskEntry.inc:443
+#, php-format
+msgid ""
+"The disk cannot be deleted while it is used in the '%s' disk definition!"
+msgstr "Kan deze disk niet verwijderen waneer deze in gebruik is in '%s' disk omschrijving!"
+
+#: admin/fai/class_faiDiskEntry.inc:536
 msgid "encrypted"
 msgstr "ge-encrypteerd"
 
-#: admin/fai/class_faiDiskEntry.inc:547
+#: admin/fai/class_faiDiskEntry.inc:539
 msgid "bootable"
 msgstr "bootable"
 
-#: admin/fai/class_faiDiskEntry.inc:550
+#: admin/fai/class_faiDiskEntry.inc:542
 msgid "preserve"
 msgstr "behouden"
 
-#: admin/fai/class_faiDiskEntry.inc:735
+#: admin/fai/class_faiDiskEntry.inc:687 admin/fai/class_faiDiskEntry.inc:690
+#: admin/fai/class_faiDiskEntry.inc:737
+#: admin/fai/packageSelect/selectPackage-list.xml:40
+#: admin/fai/class_faiScript.inc:71 admin/fai/class_faiHook.inc:71
+#: admin/fai/class_faiVariable.inc:71
+#: admin/fai/class_faiSimplePluginClass.inc:50
+msgid "Name"
+msgstr "Naam"
+
+#: admin/fai/class_faiDiskEntry.inc:717
 msgid ""
 "You have more than four primary partition table entries in your "
 "configuration, please check your configuration twice."
 msgstr "U heeft meer dan vier primaire partitie tafel items in uw configuratie, controleer uw configuratie."
 
-#: admin/fai/class_faiDiskEntry.inc:739
+#: admin/fai/class_faiDiskEntry.inc:721
 msgid ""
 "You cannot have more than three primary partition while using logical "
 "partitions, please check your configuration twice."
 msgstr "U kan niet meer dan drie primaire partities hebben tijdens het gebruik van logische partities, controleer uw configuratie."
 
-#: admin/fai/class_faiDiskEntry.inc:752
-#: admin/fai/class_faiPartitionTableEntry.inc:448
+#: admin/fai/class_faiDiskEntry.inc:733
 msgid "Partition table entry"
 msgstr "Partitie table invoer"
 
-#: admin/fai/class_faiDiskEntry.inc:753
-#: admin/fai/class_faiPartitionTableEntry.inc:449
+#: admin/fai/class_faiDiskEntry.inc:734
 msgid "FAI partition table entry"
 msgstr "FAI partitie table invoer"
 
-#: admin/fai/class_faiDiskEntry.inc:760
+#: admin/fai/class_faiDiskEntry.inc:739
 msgid "Disk options"
 msgstr "Disk opties"
 
-#: admin/fai/class_faiDiskEntry.inc:761
-#: admin/fai/class_faiPartitionTableEntry.inc:457
+#: admin/fai/class_faiDiskEntry.inc:740
 msgid "Partition type"
 msgstr "Partitie type"
 
-#: admin/fai/class_faiDiskEntry.inc:762
-#: admin/fai/class_faiPartitionTableEntry.inc:458
+#: admin/fai/class_faiDiskEntry.inc:741
 msgid "Partition no."
 msgstr "Partitie nr."
 
-#: admin/fai/class_faiDiskEntry.inc:763
-#: admin/fai/class_faiPartitionTableEntry.inc:459
+#: admin/fai/class_faiDiskEntry.inc:742
 msgid "File system type"
 msgstr "File system type"
 
-#: admin/fai/class_faiDiskEntry.inc:764
-#: admin/fai/class_faiPartitionTableEntry.inc:171
-#: admin/fai/class_faiPartitionTableEntry.inc:460
-#: admin/fai/class_faiPartition.inc:437 admin/fai/faiPartition.tpl.c:47
+#: admin/fai/class_faiDiskEntry.inc:743 admin/fai/class_faiPartition.inc:432
 msgid "Mount point"
 msgstr "Koppelpunt"
 
-#: admin/fai/class_faiDiskEntry.inc:765
-#: admin/fai/class_faiPartitionTableEntry.inc:461
-#: admin/fai/class_faiPartition.inc:402 admin/fai/class_faiPartition.inc:407
+#: admin/fai/class_faiDiskEntry.inc:744 admin/fai/class_faiPartition.inc:397
+#: admin/fai/class_faiPartition.inc:402
 msgid "Partition size"
 msgstr "Partitie grootte"
 
-#: admin/fai/class_faiDiskEntry.inc:766
-#: admin/fai/class_faiPartitionTableEntry.inc:173
-#: admin/fai/class_faiPartitionTableEntry.inc:462
-#: admin/fai/faiPartition.tpl.c:50
+#: admin/fai/class_faiDiskEntry.inc:745
 msgid "Mount options"
 msgstr "Koppelopties"
 
-#: admin/fai/class_faiDiskEntry.inc:767
-#: admin/fai/class_faiPartitionTableEntry.inc:463
+#: admin/fai/class_faiDiskEntry.inc:746
 msgid "File system options"
 msgstr "File system opties"
 
-#: admin/fai/class_faiDiskEntry.inc:768
-#: admin/fai/class_faiPartitionTableEntry.inc:464
+#: admin/fai/class_faiDiskEntry.inc:747
 msgid "Partition flags"
 msgstr "Partitie flags"
 
-#: admin/fai/class_debconfTemplate.inc:227
+#: admin/fai/class_debconfTemplate.inc:225
 msgid "This package has no debconf options."
 msgstr "Dit pakket heeft geen debconf mogelijkheden."
 
-#: admin/fai/class_debconfTemplate.inc:264
+#: admin/fai/class_debconfTemplate.inc:262
 msgid ""
 "This debconf question is dynamically generated during package installation "
 "and requires choosing between specific options which cannot be presented "
@@ -496,366 +302,155 @@ msgid ""
 " effect."
 msgstr "Deze debconf vraag wordt dynamisch gegenereerd tijdens de installatie van het pakket en u hoeft te kiezen tussen specifieke opties die hier niet kunnen worden gepresenteerd. De ingevoerde tekst moet Ã©Ã©n van de geldige keuzes zijn om verder te gaan."
 
-#: admin/fai/class_faiTemplateEntry.inc:139
-msgid "no file uploaded yet"
-msgstr "nog geen bestand ge-upload."
+#: admin/fai/class_faiTemplateEntry.inc:143
+msgid "File path"
+msgstr ""
 
-#: admin/fai/class_faiTemplateEntry.inc:142
-#, php-format
-msgid "exists in database (size: %s bytes)"
-msgstr "bestaat in database (grootte: %s bytes)"
+#: admin/fai/class_faiTemplateEntry.inc:143
+msgid "Complete absolute template file path and name"
+msgstr ""
 
-#: admin/fai/class_faiTemplateEntry.inc:251
-#: admin/systems/class_faiLogView.inc:70 admin/fai/faiTemplateEntry.tpl.c:23
-msgid "File"
-msgstr "Bestand"
+#: admin/fai/class_faiTemplateEntry.inc:147
+msgid "Short description of the file"
+msgstr ""
 
-#: admin/fai/class_faiTemplateEntry.inc:255
-#: admin/fai/faiTemplateEntry.tpl.c:11
-msgid "Destination path"
-msgstr "Doelpad"
-
-#: admin/fai/class_faiTemplateEntry.inc:260 admin/fai/faiTemplateEntry.tpl.c:8
-msgid "File name"
-msgstr "Bestand naam"
-
-#: admin/fai/class_faiTemplateEntry.inc:264
-#: admin/fai/class_faiTemplateEntry.inc:266
-#: admin/fai/faiTemplateEntry.tpl.c:68
-msgid "User"
-msgstr "Gebruiker"
-
-#: admin/fai/class_faiTemplateEntry.inc:270
-#: admin/fai/class_faiTemplateEntry.inc:273
-#: admin/fai/class_faiTemplateEntry.inc:275
-#: admin/fai/faiTemplateEntry.tpl.c:47 admin/fai/faiTemplateEntry.tpl.c:74
-msgid "Group"
-msgstr "Groep"
+#: admin/fai/class_faiTemplateEntry.inc:156
+msgid "Template attributes"
+msgstr "Sjabloon atributen"
 
-#: admin/fai/class_faiTemplateEntry.inc:305
-msgid "Template entry"
-msgstr "Sjabloon invoer"
+#: admin/fai/class_faiTemplateEntry.inc:160
+msgid "Template file content"
+msgstr ""
 
-#: admin/fai/class_faiTemplateEntry.inc:306
-msgid "FAI template entry"
-msgstr "FAI sjabloon invoer"
+#: admin/fai/class_faiTemplateEntry.inc:160
+msgid "Content of the template file"
+msgstr ""
 
-#: admin/fai/class_faiTemplateEntry.inc:314
-msgid "Template file"
-msgstr "Sjabloon bestand"
+#: admin/fai/class_faiTemplateEntry.inc:164
+msgid "Owner and group of the file"
+msgstr ""
 
-#: admin/fai/class_faiTemplateEntry.inc:315
-msgid "Template path"
-msgstr "Sjabloon pad"
+#: admin/fai/class_faiTemplateEntry.inc:167
+msgid "Owner"
+msgstr "Eigenaar"
 
-#: admin/fai/class_faiTemplateEntry.inc:316
+#: admin/fai/class_faiTemplateEntry.inc:167
 msgid "File owner"
 msgstr "Bestand eigenaar"
 
-#: admin/fai/class_faiTemplateEntry.inc:317
-msgid "File permissions"
-msgstr "Bestand rechten"
-
-#: admin/fai/class_FAI.inc:287 admin/fai/class_FAI.inc:679
-#: admin/fai/class_FAI.inc:1266 admin/fai/class_FAI.inc:1283
-#: admin/fai/class_FAI.inc:1287
-msgid "LDAP error"
-msgstr "LDAP fout"
-
-#: admin/fai/class_FAI.inc:570
-#, php-format
-msgid "Error, following objects should be equal '%s' and '%s'"
-msgstr "Fout, volgende object moet gelijk zijn '%s' en '%s'"
-
-#: admin/fai/class_FAI.inc:891
-#, php-format
-msgid "Creating group application release for %s"
-msgstr "Maken van het groep applicatie release voor %s"
-
-#: admin/fai/class_FAI.inc:960 admin/fai/class_FAI.inc:982
-#: admin/fai/class_FAI.inc:1022 admin/fai/class_FAI.inc:1027
-#: admin/fai/class_FAI.inc:1065
-msgid "Object"
-msgstr "Object"
-
-#: admin/fai/class_FAI.inc:961
-#, php-format
-msgid "Adding missing group application release container %s."
-msgstr "Toevoegen van ontbrekend groep applicatie release container %s."
-
-#: admin/fai/class_FAI.inc:983
-#, php-format
-msgid "Adding group application release container %s."
-msgstr "Toevoegen van groep applicatie release container %s."
-
-#: admin/fai/class_FAI.inc:1023
-#, php-format
-msgid "Could not create menu entry %s. (Already exists)."
-msgstr "Kan invoer menu %s niet maken.(Bestaat al)."
-
-#: admin/fai/class_FAI.inc:1028
-#, php-format
-msgid "Created group application menu entry for %s."
-msgstr "Maken groep applicatie menu invoer voor %s voltooid."
-
-#: admin/fai/class_FAI.inc:1059
-#, php-format
-msgid "Creating copy of %s"
-msgstr "Bezig met maken van kopie van %s"
-
-#: admin/fai/class_FAI.inc:1062
-msgid "Processing"
-msgstr "Bezig met verwerken"
-
-#: admin/fai/class_FAI.inc:1080
-msgid "Could not create new release, the destination dn is already in use."
-msgstr "Kan nieuwe release niet maken, destination dn is al in gebruik."
-
-#: admin/fai/class_FAI.inc:1093
-msgid "Error while fetching source dn - aborted!"
-msgstr "Fout bij het ophalen van de bron dn - afgebroken!"
-
-#: admin/fai/class_FAI.inc:1174
-msgid "Fatal error"
-msgstr "Fatale fout."
-
-#: admin/fai/class_FAI.inc:1175
-#, php-format
-msgid ""
-"Release creation failed due to ldap errors. Additional informations '%s'."
-msgstr "Release creatie mislukt door ldap fout. Meer informaties '%s'."
-
-#: admin/fai/class_faiPartitionTableEntry.inc:162
-msgid "primary"
-msgstr "primair"
-
-#: admin/fai/class_faiPartitionTableEntry.inc:162
-msgid "logical"
-msgstr "logische"
-
-#: admin/fai/class_faiPartitionTableEntry.inc:169
-#: admin/fai/faiPartition.tpl.c:8
-msgid "Type"
-msgstr "Type"
-
-#: admin/fai/class_faiPartitionTableEntry.inc:170
-msgid "FS type"
-msgstr "FS type"
-
-#: admin/fai/class_faiPartitionTableEntry.inc:172
-msgid "Size in MB"
-msgstr "Grootte in MB"
-
-#: admin/fai/class_faiPartitionTableEntry.inc:174
-msgid "FS option"
-msgstr "FS opties"
-
-#: admin/fai/class_faiPartitionTableEntry.inc:175
-#: admin/fai/faiPartition.tpl.c:23
-msgid "Preserve"
-msgstr "Bewaar"
-
-#: admin/fai/class_faiPartitionTableEntry.inc:266
-msgid "False"
-msgstr "Nee"
-
-#: admin/fai/class_faiPartitionTableEntry.inc:268
-msgid "True"
-msgstr "Ja"
-
-#: admin/fai/class_faiPartitionTableEntry.inc:272
-#: admin/fai/class_faiPartitionTableEntry.inc:274 admin/fai/fai-list.xml:159
-#: admin/fai/fai-list.xml:198
-msgid "Remove"
-msgstr "Verwijderen"
-
-#: admin/fai/class_faiPartitionTableEntry.inc:384
-#, php-format
-msgid "please enter a unique mount point for partition %s"
-msgstr "Geef a.u.b. een uniek koppelpunt op voor partitie %s"
+#: admin/fai/class_faiTemplateEntry.inc:172
+msgid "Group"
+msgstr "Groep"
 
-#: admin/fai/class_faiPartitionTableEntry.inc:389
-#, php-format
-msgid "partition %s mount point"
-msgstr "partitie %s mount point"
+#: admin/fai/class_faiTemplateEntry.inc:172
+msgid "File group"
+msgstr ""
 
-#: admin/fai/class_faiPartitionTableEntry.inc:394
-#, php-format
-msgid ""
-"File system type 'swap' is already used, change file system type for "
-"partition %s."
-msgstr "Bestandssysteem type 'swap' wordt al gebruikt. Verander bestandssysteem type voor partitie %s."
-
-#: admin/fai/class_faiPartitionTableEntry.inc:398
-msgid "Please use 'swap' as mount point, if 'swap' is used as fs-type."
-msgstr "Gebruik a.u.b. 'swap' als koppelpunt indien 'swap' gebruikt wordt als fs-type."
-
-#: admin/fai/class_faiPartitionTableEntry.inc:404
-#: admin/fai/class_faiPartitionTableEntry.inc:408
-#: admin/fai/class_faiPartitionTableEntry.inc:414
-#: admin/fai/class_faiPartitionTableEntry.inc:416
-#: admin/fai/class_faiPartitionTableEntry.inc:421
-#, php-format
-msgid "partition %s size"
-msgstr "partitie %s grootte"
+#: admin/fai/class_faiTemplateEntry.inc:181
+msgid "Access"
+msgstr "Toegang"
 
-#: admin/fai/class_faiPartitionTableEntry.inc:436
-msgid ""
-"You have more than 3 primary partition table entries in your configuration, "
-"please check your configuration twice."
-msgstr "U heeft meer dan 3 primaire partitietabel regels in uw configuratie. Controleer uw configuratie a.u.b. nogmaals."
+#: admin/fai/class_faiTemplateEntry.inc:181
+msgid "Access rights"
+msgstr ""
 
 #: admin/fai/packageSelect/selectPackage-list.xml:10
-#: admin/fai/classSelect/selectClass-list.xml:11
 msgid "Please select the desired entries"
-msgstr "Gelieve de waarden te selecteren"
+msgstr "Gelieve de gegevens te selecteren"
 
 #: admin/fai/packageSelect/selectPackage-list.xml:48
 msgid "Version"
 msgstr "Versie"
 
-#: admin/fai/class_faiProfile.inc:310
-msgid "This list displays all assigned class names for this profile."
-msgstr "Deze lijst toont alle toegekende klassenamen voor dit profiel."
-
-#: admin/fai/class_faiProfile.inc:313 admin/fai/class_askClassName.inc:103
-#: admin/fai/classSelect/class_classSelect.inc:53
-#: admin/fai/class_faiProfileEntry.inc:158
-msgid "Hook bundle"
-msgstr "Inhakers bundel"
-
-#: admin/fai/class_faiProfile.inc:314 admin/fai/class_askClassName.inc:105
-#: admin/fai/classSelect/class_classSelect.inc:54
-#: admin/fai/class_faiProfileEntry.inc:159
-msgid "Template bundle"
-msgstr "Sjabloon bundel"
-
-#: admin/fai/class_faiProfile.inc:315 admin/fai/class_askClassName.inc:101
-#: admin/fai/classSelect/class_classSelect.inc:55
-#: admin/fai/class_faiProfileEntry.inc:160
-msgid "Script bundle"
-msgstr "Script bundel"
-
-#: admin/fai/class_faiProfile.inc:316 admin/fai/class_askClassName.inc:102
-#: admin/fai/classSelect/class_classSelect.inc:56
-#: admin/fai/class_faiProfileEntry.inc:161
-msgid "Variable bundle"
-msgstr "Variabele bundel"
-
-#: admin/fai/class_faiProfile.inc:317 admin/fai/class_askClassName.inc:100
-#: admin/fai/classSelect/class_classSelect.inc:57
-#: admin/fai/class_faiProfileEntry.inc:162
-msgid "Package bundle"
-msgstr "Pakket bundel"
-
-#: admin/fai/class_faiProfile.inc:321
-msgid "Remove class from profile"
-msgstr "Verwijder klasse uit profiel"
-
-#: admin/fai/class_faiProfile.inc:324
-msgid "Up"
-msgstr "Omhoog"
-
-#: admin/fai/class_faiProfile.inc:325
-msgid "Down"
-msgstr "Omlaag"
-
-#: admin/fai/class_faiProfile.inc:410
-msgid "No class specified for this profile!"
-msgstr "Geen klasse bepaald voor dit profiel!"
-
-#: admin/fai/class_faiProfile.inc:419
-msgid "You can't use the same name for a class and a profile!"
-msgstr ""
+#: admin/fai/class_faiProfile.inc:28
+msgid "Profile"
+msgstr "Profiel"
 
-#: admin/fai/class_faiProfile.inc:455
+#: admin/fai/class_faiProfile.inc:29
 msgid "FAI profile"
 msgstr "FAI profiel"
 
-#: admin/fai/class_faiProfile.inc:458
+#: admin/fai/class_faiProfile.inc:32
 msgid "FAI Profile"
 msgstr "FAI profiel"
 
-#: admin/fai/class_faiProfile.inc:465 admin/fai/faiProfile.tpl.c:17
+#: admin/fai/class_faiProfile.inc:61
 msgid "FAI classes"
 msgstr "FAI klassen"
 
-#: admin/fai/class_faiHookEntry.inc:200
-msgid "Hook entry"
-msgstr "Aansluiting invoer"
+#: admin/fai/class_faiProfile.inc:61
+msgid "FAI classes which are part of this profile"
+msgstr ""
 
-#: admin/fai/class_faiHookEntry.inc:201
-msgid "FAI hook entry"
-msgstr "FAI aansluiting invoer"
+#: admin/fai/class_faiPackageConfiguration.inc:88
+#, php-format
+msgid "Debconf information for package '%s'"
+msgstr "Debconf informatie voor pakket '%s'"
 
-#: admin/fai/class_faiHookEntry.inc:209 admin/fai/faiHookEntry.tpl.c:20
-msgid "Task"
-msgstr "Taak"
+#: admin/fai/class_faiScript.inc:30 admin/fai/class_faiScript.inc:84
+#: admin/fai/class_faiHook.inc:87
+msgid "Script"
+msgstr "Script"
 
-#: admin/fai/class_faiHookEntry.inc:210 admin/fai/class_faiScript.inc:595
-#: admin/fai/class_faiScript.inc:599
+#: admin/fai/class_faiScript.inc:31 admin/fai/class_faiScript.inc:34
 msgid "FAI script"
 msgstr "FAI script"
 
-#: admin/fai/class_faiPackageConfiguration.inc:88
-#, php-format
-msgid "Debconf information for package '%s'"
-msgstr "Debconf informatie voor pakket '%s'"
+#: admin/fai/class_faiScript.inc:63
+msgid "Scripts"
+msgstr "Scripts"
 
-#: admin/fai/class_askClassName.inc:99 admin/fai/class_askClassName.inc:100
-#: admin/fai/class_askClassName.inc:101 admin/fai/class_askClassName.inc:102
-#: admin/fai/class_askClassName.inc:103 admin/fai/class_askClassName.inc:104
-#: admin/fai/class_askClassName.inc:105 admin/fai/class_askClassName.inc:106
-msgid "Create new FAI object"
-msgstr "Nieuw FAI object aanmaken"
+#: admin/fai/class_faiScript.inc:67 admin/fai/class_faiHook.inc:67
+#: admin/fai/class_faiVariable.inc:67
+msgid "Variables in this class"
+msgstr ""
 
-#: admin/fai/class_faiTemplateEdit.inc:80
-#, php-format
-msgid ""
-"The file encodig has changed from '%s' to '%s'. Do you really want to save?"
-msgstr "Het bestand encodage is gewijzigd van '%s' naar '%s'. Bent u zeker om deze te bewaren?"
+#: admin/fai/class_faiScript.inc:71 admin/fai/class_faiHook.inc:71
+#: admin/fai/class_faiVariable.inc:71
+msgid "The name of the variable"
+msgstr ""
 
-#: admin/fai/class_faiScript.inc:333 admin/fai/class_faiScript.inc:335
-msgid "Sort direction"
-msgstr "Sorteer richting"
+#: admin/fai/class_faiScript.inc:75 admin/fai/class_faiHook.inc:75
+#: admin/fai/class_faiVariable.inc:75
+msgid "A short description of the variable"
+msgstr ""
 
-#: admin/fai/class_faiScript.inc:348 admin/fai/faiScriptEntry.tpl.c:20
+#: admin/fai/class_faiScript.inc:79
 msgid "Priority"
 msgstr "Prioriteit"
 
-#: admin/fai/class_faiScript.inc:350
-msgid "Action"
-msgstr "Actie"
+#: admin/fai/class_faiScript.inc:79
+msgid "Priority of this script (FIXME: less is done first?)"
+msgstr ""
 
-#: admin/fai/classSelect/selectClass-list.xml:36 admin/fai/fai-list.xml:88
-#: admin/fai/faiScriptEntry.tpl.c:14
-msgid "Properties"
-msgstr "Eigenschappen"
+#: 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:501 admin/fai/fai-list.xml:116
+#: admin/fai/class_faiTemplate.inc:153
 msgid "Template"
 msgstr "Sjabloon"
 
-#: admin/fai/class_faiTemplate.inc:502 admin/fai/class_faiTemplate.inc:506
+#: admin/fai/class_faiTemplate.inc:154 admin/fai/class_faiTemplate.inc:157
 msgid "FAI template"
 msgstr "FAI sjabloon"
 
-#: admin/fai/class_faiVariableEntry.inc:107
-msgid "Content"
-msgstr "Inhoud"
-
-#: admin/fai/class_faiVariableEntry.inc:142
-msgid "Variable entry"
-msgstr "Variabel invoer"
+#: admin/fai/class_faiTemplate.inc:176
+msgid "Template class name"
+msgstr ""
 
-#: admin/fai/class_faiVariableEntry.inc:143
-msgid "FAI variable entry "
-msgstr "FAI variabel invoer"
+#: admin/fai/class_faiTemplate.inc:186
+msgid "Template files"
+msgstr ""
 
-#: admin/fai/class_faiVariableEntry.inc:151
-#: admin/fai/faiVariableEntry.tpl.c:20
-msgid "Variable content"
-msgstr "Variabele inhoud"
+#: admin/fai/class_faiTemplate.inc:190
+msgid "Template files in this class"
+msgstr ""
 
 #: admin/fai/class_faiPartition.inc:176 admin/fai/class_faiPartition.inc:180
 msgid "Logical"
@@ -953,95 +548,74 @@ msgstr "xfs"
 msgid "btrfs"
 msgstr "btrfs"
 
-#: admin/fai/class_faiPartition.inc:224
-msgid "LVM/RAID"
-msgstr ""
-
-#: admin/fai/class_faiPartition.inc:327
+#: admin/fai/class_faiPartition.inc:325
 msgid "spare"
 msgstr "reservedeel"
 
-#: admin/fai/class_faiPartition.inc:330
+#: admin/fai/class_faiPartition.inc:328
 msgid "missing"
 msgstr "ontbrekend"
 
-#: admin/fai/class_faiPartition.inc:333
+#: admin/fai/class_faiPartition.inc:331
 msgid "Options"
 msgstr "Opties"
 
-#: admin/fai/class_faiPartition.inc:420
+#: admin/fai/class_faiPartition.inc:415
 msgid "Minimum partition size"
 msgstr "Minimale partitie grootte"
 
-#: admin/fai/class_faiPartition.inc:420
+#: admin/fai/class_faiPartition.inc:415
 msgid "Maximum partition size"
 msgstr "Maximale partitie grootte"
 
-#: admin/fai/class_faiPartition.inc:428
+#: admin/fai/class_faiPartition.inc:423
 msgid "Raid arrays must contain at least two partitions!"
 msgstr "RAID-arrays moet ten minste twee partities bevatten!"
 
-#: admin/fai/class_faiPartition.inc:430
+#: admin/fai/class_faiPartition.inc:425
 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:332 admin/fai/class_faiHook.inc:334
-#: admin/fai/fai-list.xml:190 admin/fai/faiVariable.tpl.c:23
-#: admin/fai/faiVariable.tpl.c:26
-msgid "Edit"
-msgstr "Bewerken"
-
-#: admin/fai/class_faiHook.inc:336
-msgid "Delete"
-msgstr "Verwijderen"
-
-#: admin/fai/class_faiHook.inc:521 admin/fai/fai-list.xml:128
+#: admin/fai/class_faiHook.inc:30
 msgid "Hook"
 msgstr "Aansluiting"
 
-#: admin/fai/class_faiHook.inc:522 admin/fai/class_faiHook.inc:526
+#: admin/fai/class_faiHook.inc:31 admin/fai/class_faiHook.inc:34
 msgid "FAI hook"
 msgstr "FAI Aansluiting"
 
-#: admin/fai/class_faiVariable.inc:387 admin/fai/fai-list.xml:134
+#: admin/fai/class_faiHook.inc:63
+msgid "Hooks"
+msgstr "Inhakers"
+
+#: admin/fai/class_faiHook.inc:79
+msgid "Task"
+msgstr "Taak"
+
+#: admin/fai/class_faiHook.inc:87
+msgid "The script of this hook"
+msgstr ""
+
+#: admin/fai/class_faiVariable.inc:30
 msgid "Variable"
 msgstr "Variabele"
 
-#: admin/fai/class_faiVariable.inc:388 admin/fai/class_faiVariable.inc:392
+#: admin/fai/class_faiVariable.inc:31 admin/fai/class_faiVariable.inc:34
 msgid "FAI variable"
 msgstr "FAI variabel"
 
-#: admin/fai/class_faiProfileEntry.inc:184 admin/fai/askClassName.tpl.c:11
-#: admin/fai/askClassName.tpl.c:17 admin/fai/paste_generic.tpl.c:5
-msgid "Class name"
-msgstr "Klassenaam"
-
-#: admin/fai/class_faiProfileEntry.inc:184 admin/fai/faiTemplate.tpl.c:14
-#: admin/fai/faiVariable.tpl.c:14 admin/fai/faiHook.tpl.c:14
-#: admin/fai/faiPartitionTable.tpl.c:17 admin/fai/faiScript.tpl.c:14
-msgid "Objects"
-msgstr "Objecten"
-
-#: admin/fai/fai-list.xml:11
-msgid "List of deployment classes and products"
-msgstr "Lijst van deployement klassen en producten"
-
-#: admin/fai/fai-list.xml:15
-msgid "partitionTable"
-msgstr "partitie Tafel"
-
-#: admin/fai/fai-list.xml:23
-msgid "packagelist"
-msgstr "pakketlijst"
+#: admin/fai/class_faiVariable.inc:63
+msgid "Variables"
+msgstr "Variabelen"
 
-#: admin/fai/fai-list.xml:93
-msgid "Actions"
-msgstr "Acties"
+#: admin/fai/class_faiVariable.inc:79
+msgid "Content"
+msgstr "Inhoud"
 
-#: admin/fai/fai-list.xml:104
-msgid "Create"
-msgstr "Aanmaken"
+#: admin/fai/class_faiVariable.inc:79
+msgid "The content of the variable"
+msgstr ""
 
 #: admin/systems/class_faiLogView.inc:56
 msgid "Sort down"
@@ -1051,6 +625,10 @@ msgstr ""
 msgid "Sort up"
 msgstr ""
 
+#: admin/systems/class_faiLogView.inc:70
+msgid "File"
+msgstr "Bestand"
+
 #: admin/systems/class_faiLogView.inc:71
 msgid "Date"
 msgstr "Datum"
@@ -1085,7 +663,7 @@ msgstr ""
 msgid "Selected file: %s"
 msgstr ""
 
-#: admin/systems/class_faiStartup.inc:70 admin/fai/paste_generic.tpl.c:2
+#: admin/systems/class_faiStartup.inc:70
 msgid "FAI settings"
 msgstr "FAI instellingen"
 
@@ -1105,11 +683,6 @@ msgstr "Profiel"
 msgid "FAI profil to be applied to this computer"
 msgstr "FAI profiel om toe te passen op deze computer"
 
-#: admin/systems/class_faiStartup.inc:90 admin/fai/faiPackage.tpl.c:14
-#: admin/fai/faiPackage.tpl.c:17
-msgid "Repository"
-msgstr "Verzamelplaats"
-
 #: admin/systems/class_faiStartup.inc:90
 msgid "FAI Debian repository to be used for installation"
 msgstr "FAI Debian repository om te gebruiken voor de installatie"
@@ -1134,85 +707,96 @@ msgstr "Boot kernel parameters"
 msgid "Linux kernel parameters to be ran"
 msgstr "Linux kernel parameters om te draaien"
 
-#: admin/systems/class_faiStartup.inc:178
+#: admin/systems/class_faiStartup.inc:179
 msgid "Full automated installation"
 msgstr "Volautomatische installatie"
 
-#: admin/systems/services/repository/class_serviceRepository.inc:31
+#: admin/systems/services/repository/class_serviceDebianRepository.inc:34
+#: admin/systems/services/repository/class_serviceCentosRepository.inc:31
+msgid "Repositories"
+msgstr "Repositories"
+
+#: admin/systems/services/repository/class_serviceDebianRepository.inc:39
+#: admin/systems/services/repository/class_serviceCentosRepository.inc:36
+msgid "Repositories this server hosts"
+msgstr "Repositories op deze server"
+
+#: admin/systems/services/repository/class_serviceDebianRepository.inc:43
+#: admin/systems/services/repository/class_serviceCentosRepository.inc:40
 msgid "URL"
 msgstr "URL"
 
-#: admin/systems/services/repository/class_serviceRepository.inc:31
+#: admin/systems/services/repository/class_serviceDebianRepository.inc:43
+#: admin/systems/services/repository/class_serviceCentosRepository.inc:40
 msgid "Repository url"
 msgstr "Repository url"
 
-#: admin/systems/services/repository/class_serviceRepository.inc:35
+#: admin/systems/services/repository/class_serviceDebianRepository.inc:47
+#: admin/systems/services/repository/class_serviceCentosRepository.inc:44
 msgid "Parent server"
 msgstr "Parent server"
 
-#: admin/systems/services/repository/class_serviceRepository.inc:35
+#: admin/systems/services/repository/class_serviceDebianRepository.inc:47
+#: admin/systems/services/repository/class_serviceCentosRepository.inc:44
 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"
-msgstr "Secties"
+#: admin/systems/services/repository/class_serviceDebianRepository.inc:52
+msgid "Debian release used on this repository"
+msgstr "Debian uitgave gebruikt voor deze repository"
 
-#: admin/systems/services/repository/class_serviceRepository.inc:47
-msgid "Sections available on this repository"
-msgstr ""
+#: admin/systems/services/repository/class_serviceDebianRepository.inc:58
+msgid "Debian sections available on this repository"
+msgstr "Debian secties beschikbaar voor deze repository"
 
-#: admin/systems/services/repository/class_serviceRepository.inc:52
+#: admin/systems/services/repository/class_serviceDebianRepository.inc:63
+#: admin/systems/services/repository/class_serviceCentosRepository.inc:57
 msgid "Mirror mode"
 msgstr "Mirror mode"
 
-#: admin/systems/services/repository/class_serviceRepository.inc:52
+#: admin/systems/services/repository/class_serviceDebianRepository.inc:63
+#: admin/systems/services/repository/class_serviceCentosRepository.inc:57
 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
+#: admin/systems/services/repository/class_serviceDebianRepository.inc:68
+#: admin/systems/services/repository/class_serviceCentosRepository.inc:62
 msgid "Local mirror"
 msgstr "Lokale mirror"
 
-#: admin/systems/services/repository/class_serviceRepository.inc:57
+#: admin/systems/services/repository/class_serviceDebianRepository.inc:68
+#: admin/systems/services/repository/class_serviceCentosRepository.inc:62
 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
+#: admin/systems/services/repository/class_serviceDebianRepository.inc:77
+#: admin/systems/services/repository/class_serviceCentosRepository.inc:71
 msgid "Architectures"
 msgstr "Architectures"
 
-#: admin/systems/services/repository/class_serviceRepository.inc:66
+#: admin/systems/services/repository/class_serviceDebianRepository.inc:77
+#: admin/systems/services/repository/class_serviceCentosRepository.inc:71
 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_serviceDebianRepository.inc:99
+#: admin/systems/services/repository/class_serviceDebianRepository.inc:100
+msgid "Debian repository"
+msgstr "Debian repository"
 
-#: admin/systems/services/repository/class_serviceRepository.inc:72
-msgid "Which distribution is this repository for"
-msgstr ""
-
-#: admin/systems/services/repository/class_serviceRepository.inc:140
-msgid "Repositories"
-msgstr "Repositories"
-
-#: admin/systems/services/repository/class_serviceRepository.inc:145
-msgid "Repositories this server hosts"
-msgstr "Repositories op deze server"
+#: admin/systems/services/repository/class_serviceDebianRepository.inc:100
+#: admin/systems/services/repository/class_serviceCentosRepository.inc:96
+msgid "Services"
+msgstr "Services"
 
-#: admin/systems/services/repository/class_serviceRepository.inc:160
-msgid "Package repository"
+#: admin/systems/services/repository/class_serviceCentosRepository.inc:49
+msgid "Centos release used on this repository"
 msgstr ""
 
-#: admin/systems/services/repository/class_serviceRepository.inc:161
-msgid "Package repository information"
+#: admin/systems/services/repository/class_serviceCentosRepository.inc:95
+#: admin/systems/services/repository/class_serviceCentosRepository.inc:96
+msgid "Centos repository"
 msgstr ""
 
 #: config/fai/class_faiConfig.inc:28
@@ -1244,476 +828,3 @@ msgstr ""
 #: config/fai/class_faiConfig.inc:60
 msgid "s"
 msgstr ""
-
-#: admin/fai/faiPartitionTableEntry.tpl.c:2 admin/fai/faiVariableEntry.tpl.c:2
-#: admin/fai/faiVariableEntry.tpl.c:5 admin/fai/faiDiskEntry.tpl.c:2
-#: admin/fai/faiTemplate.tpl.c:2 admin/fai/faiTemplate.tpl.c:5
-#: admin/fai/faiVariable.tpl.c:2 admin/fai/faiVariable.tpl.c:5
-#: admin/fai/faiHook.tpl.c:2 admin/fai/faiHook.tpl.c:5
-#: admin/fai/faiPackage.tpl.c:2 admin/fai/faiPackage.tpl.c:5
-#: admin/fai/faiTemplateEntry.tpl.c:2 admin/fai/faiTemplateEntry.tpl.c:5
-#: admin/fai/faiScriptEntry.tpl.c:2 admin/fai/faiScriptEntry.tpl.c:5
-#: admin/fai/faiPartitionTable.tpl.c:2 admin/fai/faiPartitionTable.tpl.c:5
-#: admin/fai/faiScript.tpl.c:2 admin/fai/faiScript.tpl.c:5
-#: admin/fai/faiProfile.tpl.c:2 admin/fai/faiProfile.tpl.c:5
-#: admin/fai/faiProfile.tpl.c:14 admin/fai/faiHookEntry.tpl.c:2
-#: admin/fai/faiHookEntry.tpl.c:5
-msgid "Generic"
-msgstr "Algemeen"
-
-#: admin/fai/faiPartitionTableEntry.tpl.c:14
-#: admin/fai/faiPartitionTableEntry.tpl.c:17 admin/fai/faiDiskEntry.tpl.c:23
-#: admin/fai/faiDiskEntry.tpl.c:26
-msgid "Partition entries"
-msgstr "Partitie regels"
-
-#: admin/fai/faiPartitionTableEntry.tpl.c:20
-#: admin/fai/faiPartitionTableEntry.tpl.c:23 admin/fai/faiDiskEntry.tpl.c:29
-#: admin/fai/faiDiskEntry.tpl.c:32
-msgid "Add partition"
-msgstr "Partitie toevoegen"
-
-#: admin/fai/branch_selector.tpl.c:2
-msgid "Releases"
-msgstr "Releases"
-
-#: admin/fai/branch_selector.tpl.c:5
-msgid "Current release"
-msgstr "Huidige uitgave"
-
-#: admin/fai/branch_selector.tpl.c:8 admin/fai/branch_selector.tpl.c:17
-#: admin/fai/fai-filter.tpl.c:8 admin/fai/fai-filter.tpl.c:17
-msgid "Create release"
-msgstr "Maak release"
-
-#: admin/fai/branch_selector.tpl.c:11 admin/fai/branch_selector.tpl.c:23
-#: admin/fai/fai-filter.tpl.c:11 admin/fai/fai-filter.tpl.c:23
-msgid "Create read-only release"
-msgstr "Maak read-only release"
-
-#: admin/fai/branch_selector.tpl.c:20 admin/fai/fai-filter.tpl.c:20
-msgid "Freeze"
-msgstr "Freeze"
-
-#: admin/fai/branch_selector.tpl.c:26 admin/fai/fai-filter.tpl.c:26
-msgid "Delete current release"
-msgstr "Verwijder huidige uitgave"
-
-#: admin/fai/faiPartition.tpl.c:2
-msgid "Partition"
-msgstr "Partitie"
-
-#: admin/fai/faiPartition.tpl.c:17
-msgid "Resize existing partition"
-msgstr "Resize bestaande partitie"
-
-#: admin/fai/faiPartition.tpl.c:20
-msgid "Bootable"
-msgstr "Bootable"
-
-#: admin/fai/faiPartition.tpl.c:26 admin/fai/faiDiskEntry.tpl.c:20
-msgid "Combined physical partitions"
-msgstr "Gecombineerd fysieke partities"
-
-#: admin/fai/faiPartition.tpl.c:29
-msgid "Toggle missing"
-msgstr "Weergeven/verbergen ontbreekende"
-
-#: admin/fai/faiPartition.tpl.c:32
-msgid "Toggle spare"
-msgstr "Toon/verberg reservedeel"
-
-#: admin/fai/faiPartition.tpl.c:35
-msgid "Filesystem"
-msgstr "Filesystem"
-
-#: admin/fai/faiPartition.tpl.c:38
-msgid "Filesystem create options"
-msgstr "Filesystem creatie opties"
-
-#: admin/fai/faiPartition.tpl.c:41
-msgid "Encrypted"
-msgstr "Ge-encrypteerd"
-
-#: admin/fai/faiPartition.tpl.c:44
-msgid "Tune options"
-msgstr "Tune opties"
-
-#: admin/fai/faiNewBranch.tpl.c:2
-msgid ""
-"You are now going to create a branch or locked branch. This action clones "
-"the existing release to another release name. Branches can be modified as "
-"usual. FAI classes of locked branches cannot be modified, just additional "
-"classes are possible. Branch names should be alphanumeric, excluding the "
-"reserved names 'scripts', 'hooks', 'partitions', 'variables', 'templates' "
-"and 'fai'."
-msgstr "U staat op het punt een nieuwe distributie of afgesloten distributie aan te maken. Deze actie kopieert de bestaande uitgave naar een nieuwe uitgave naam. Distributies kunnen zoals gewoonlijk veranderd worden. FAI klassen of gesloten distributies kunnen niet veranderd worden. Er kunnen alleen additionele klassen aangemaakt worden. Distributie namen moeten alfanumeriek zijn, met uitzondering van de gereserveerde namen 'scripts', 'hooks', 'partitions', 'variables', 'templates' en 'fai'."
-
-#: admin/fai/faiNewBranch.tpl.c:5
-msgid ""
-"Branches are created as subreleases of the currently selected branch. "
-"Creating a new branch named 1.0.2 in SARGE for example, will result in a new"
-" release called SARGE/1.0.2."
-msgstr "Branches worden gecreÃ«erd als subreleases van de geselecteerde branche. Het creÃ«ren van een nieuwe branche  met de naam 1.0.2 SARGE bijvoorbeeld, zal resulteren in een nieuwe release genaamd SARGE/1.0."
-
-#: admin/fai/faiNewBranch.tpl.c:8
-msgid "Please enter a name for the branch"
-msgstr "Voer a.u.b. een naam voor de aftakking in."
-
-#: admin/fai/faiNewBranch.tpl.c:11
-msgid "Processing the requested operation"
-msgstr "Bezig met verwerken van de gevraagde opdracht"
-
-#: admin/fai/faiNewBranch.tpl.c:14
-msgid ""
-"As soon as the copy operation has finished, you can scroll down to end of "
-"the page and press the 'Continue' button to continue with the fai management"
-" dialog."
-msgstr "Zodra de kopieerbewerking beeindigd is, kunt u naar het einde van de pagina gaan en op de 'Verder' knop drukken om verder te gaan met de FAI beheer dialoog."
-
-#: admin/fai/faiNewBranch.tpl.c:17
-msgid ""
-"Your browser doesn't support iframes, please use this link to perform the "
-"requested operation."
-msgstr "Uw browser heeft geen ondersteuning voor frames. Gebruik a.u.b. deze link om de gewenste opdracht uit te voeren."
-
-#: admin/fai/faiNewBranch.tpl.c:20
-msgid "Perform requested operation."
-msgstr "Gewenste opdracht uitvoeren."
-
-#: admin/fai/faiNewBranch.tpl.c:23
-msgid "Initiate operation"
-msgstr "Opdracht starten"
-
-#: admin/fai/faiVariableEntry.tpl.c:14 admin/fai/faiVariableEntry.tpl.c:17
-msgid "Variable attributes"
-msgstr "Variabele attributen"
-
-#: admin/fai/faiDiskEntry.tpl.c:11
-msgid "fstab key"
-msgstr "fstab key"
-
-#: admin/fai/faiDiskEntry.tpl.c:17
-msgid "Disk label"
-msgstr "Disk label"
-
-#: admin/fai/faiTemplate.tpl.c:17
-msgid "List of template files"
-msgstr "Lijst met sjabloonbestanden"
-
-#: admin/fai/faiVariable.tpl.c:17
-msgid "List of assigned variables"
-msgstr "Lijst met toegekende variabelen"
-
-#: admin/fai/faiVariable.tpl.c:20
-msgid "Choose a variable to delete or edit"
-msgstr "Kies een te bewerken of verwijderen variabele"
-
-#: admin/fai/askClassName.tpl.c:2
-msgid ""
-"Adding a new class to the FAI management, requires a class name. You have to"
-" specify a unique class name for unique types of FAI classes, while you can "
-"use the same class name for different types of FAI classes. In the laste "
-"case, FAI will automatically enclose all these different class types to one "
-"unique class name."
-msgstr "Het toevoegen van een nieuwe klasse aan FAI beheer, vereist een klassenaam. U dient een unieke klassenaam binnen een FAI klassetype te gebruiken. Het is mogelijk dezelfde klassenaam voor verschillende FAI klassetypes te gebruiken. In het laatste geval zal FAI automatisch alle verschillende klassetypes onderbrengen binnen een unieke klassenaam."
-
-#: admin/fai/askClassName.tpl.c:5
-msgid ""
-"Please use one of the following methods to choose the name for the new FAI "
-"class."
-msgstr "Gebruik a.u.b. een van de volgende methodes om de naam voor de nieuwe FAI klasse te kiezen."
-
-#: admin/fai/askClassName.tpl.c:8
-msgid "Enter FAI class name manually"
-msgstr "Voer FAI klassenaam handmatig in"
-
-#: admin/fai/askClassName.tpl.c:14
-msgid "Choose FAI class name from a list of existing classes"
-msgstr "Kies FAI klassenaam uit een lijst met bestaande klasses"
-
-#: admin/fai/askClassName.tpl.c:20
-msgid "Choose class name"
-msgstr "Kies een klassenaam"
-
-#: admin/fai/faiGroupHandle.tpl.c:2
-msgid "Please select the objects you want to remove:"
-msgstr "Gelieve de te verwijderen objecten te selecteren :"
-
-#: admin/fai/faiGroupHandle.tpl.c:5
-msgid "Freezed"
-msgstr "Freezed"
-
-#: admin/fai/faiGroupHandle.tpl.c:8
-msgid "Select the object you want to edit:"
-msgstr "Selecteer het object dat u wenst te bewerken :"
-
-#: admin/fai/faiGroupHandle.tpl.c:11
-msgid "Select the object you want to copy:"
-msgstr "Selecteer het object dat u wenst te kopieren:"
-
-#: admin/fai/remove.tpl.c:5
-msgid ""
-"This includes all account data, system access rules, imap settings, etc. for"
-" this user. Please double check if your really want to do this since there "
-"is no way for FusionDirectory to get your data back."
-msgstr "Inclusief alle account data,system access rules,imap opties,etc. Voor deze gebruiker. Gelieve dubbel na te kijken of je dit echt wenst te doen want er is geen andere manier voor FusionDirectory om je data terug te krijgen."
-
-#: admin/fai/remove.tpl.c:8 admin/fai/remove_branch.tpl.c:8
-msgid "So - if you're sure - press 'Delete' to continue or 'Cancel' to abort."
-msgstr "Indien u zeker bent drukt u dan 'Verwijderen' om door te gaan of 'Annuleren' om te annuleren."
-
-#: admin/fai/faiHook.tpl.c:17
-msgid "List of hook scripts"
-msgstr "Lijst met inhakers scripts"
-
-#: admin/fai/packageSelect/selectPackage-list.tpl.c:2
-#: admin/fai/classSelect/selectClass-list.tpl.c:5
-msgid "Update"
-msgstr "Bijwerken"
-
-#: admin/fai/packageSelect/selectPackage-list.tpl.c:5
-#: admin/fai/classSelect/selectClass-list.tpl.c:8
-msgid "Submit"
-msgstr "Verwerk"
-
-#: admin/fai/packageSelect/selectPackage-filter.tpl.c:2
-#: admin/fai/classSelect/selectClass-filter.tpl.c:2
-#: admin/fai/fai-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."
-
-#: admin/fai/remove_branch.tpl.c:5
-msgid ""
-"This includes all account data, system access, etc. for this branch. 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 account gegevens, systeem toegangsregels, instellingen etc. voor deze aftakkingen. Verzeker uzelf hiervan, aangezien er geen mogelijkheid voor FusionDirectory is om deze informatie terug te halen."
-
-#: admin/fai/faiPackage.tpl.c:26
-msgid "Install method"
-msgstr "Installatie methode"
-
-#: admin/fai/faiPackage.tpl.c:29
-msgid "Please select the installation method"
-msgstr "Gelieve de installatie methode te selecteren"
-
-#: admin/fai/faiPackage.tpl.c:32 admin/fai/faiPackage.tpl.c:35
-msgid "Used packages"
-msgstr "Gebruikte pakketten"
-
-#: admin/fai/faiPackage.tpl.c:38
-msgid "Add from list"
-msgstr "Toevoegen uit lijst"
-
-#: admin/fai/faiProfileEntry.tpl.c:2
-msgid "List of FAI objects (Fully Automatic Installation)"
-msgstr "Lijst met FAI objecten (Fully Automatic Installation)"
-
-#: admin/fai/faiProfileEntry.tpl.c:5
-msgid "Information"
-msgstr "Informatie"
-
-#: admin/fai/faiProfileEntry.tpl.c:8
-msgid ""
-"This menu allows you to select FAI class names and to add them to the "
-"currently edited profile."
-msgstr "Dit menu maakt het mogelijk ok FAI klassenamen te selecteren en deze toe te voegen aan het profiel dat op dit moment bewerkt wordt."
-
-#: admin/fai/faiProfileEntry.tpl.c:11
-msgid "Filters"
-msgstr "Filters"
-
-#: admin/fai/faiProfileEntry.tpl.c:14
-msgid "Show only classes with templates"
-msgstr "Toon alleen klassen met sjablonen"
-
-#: admin/fai/faiProfileEntry.tpl.c:17
-msgid "Show only classes with scripts"
-msgstr "Toon alleen klassen met scripts"
-
-#: admin/fai/faiProfileEntry.tpl.c:20
-msgid "Show only classes with hooks"
-msgstr "Toon alleen klassen met inhakers"
-
-#: admin/fai/faiProfileEntry.tpl.c:23
-msgid "Show only classes with variables"
-msgstr "Toon alleen klassen met variabelen"
-
-#: admin/fai/faiProfileEntry.tpl.c:26
-msgid "Show only classes with packages"
-msgstr "Toon alleen klassen met pakketten"
-
-#: admin/fai/faiProfileEntry.tpl.c:29
-msgid "Show only classes with partitions"
-msgstr "Toon alleen klassen met partities"
-
-#: admin/fai/faiProfileEntry.tpl.c:32 admin/fai/faiProfileEntry.tpl.c:35
-msgid "Display objects matching"
-msgstr "Toon overeenkomende objecten"
-
-#: admin/fai/faiProfileEntry.tpl.c:38
-msgid "Regular expression for matching object names"
-msgstr "Reguliere expressie voor overeenkomende objectnamen"
-
-#: admin/fai/faiTemplateEntry.tpl.c:17 admin/fai/faiTemplateEntry.tpl.c:20
-msgid "Template attributes"
-msgstr "Sjabloon atributen"
-
-#: admin/fai/faiTemplateEntry.tpl.c:26 admin/fai/faiTemplateEntry.tpl.c:29
-msgid "Save template"
-msgstr "Sjabloon opslaan"
-
-#: admin/fai/faiTemplateEntry.tpl.c:32 admin/fai/faiTemplateEntry.tpl.c:35
-msgid "Edit template"
-msgstr "Bewerk Sjabool"
-
-#: admin/fai/faiTemplateEntry.tpl.c:38
-msgid "Full path"
-msgstr "Absoluut pad"
-
-#: admin/fai/faiTemplateEntry.tpl.c:41
-msgid "Upload"
-msgstr "Uploaden"
-
-#: admin/fai/faiTemplateEntry.tpl.c:44
-msgid "Owner"
-msgstr "Eigenaar"
-
-#: admin/fai/faiTemplateEntry.tpl.c:50
-msgid "Access"
-msgstr "Toegang"
-
-#: admin/fai/faiTemplateEntry.tpl.c:53
-msgid "Class"
-msgstr "Klasse"
-
-#: admin/fai/faiTemplateEntry.tpl.c:56
-msgid "Read"
-msgstr "Lezen"
-
-#: admin/fai/faiTemplateEntry.tpl.c:59
-msgid "Write"
-msgstr "Schrijven"
-
-#: admin/fai/faiTemplateEntry.tpl.c:62
-msgid "Execute"
-msgstr "Commando"
-
-#: admin/fai/faiTemplateEntry.tpl.c:65
-msgid "Special"
-msgstr "Speciaal"
-
-#: admin/fai/faiTemplateEntry.tpl.c:71
-msgid "SUID"
-msgstr "SUID"
-
-#: admin/fai/faiTemplateEntry.tpl.c:77
-msgid "SGID"
-msgstr "SGID"
-
-#: admin/fai/faiTemplateEntry.tpl.c:80
-msgid "Others"
-msgstr "Anderen"
-
-#: admin/fai/faiTemplateEntry.tpl.c:83
-msgid "sticky"
-msgstr "sticky"
-
-#: admin/fai/faiScriptEntry.tpl.c:17 admin/fai/faiScriptEntry.tpl.c:26
-msgid "Script attributes"
-msgstr "Script attributen"
-
-#: admin/fai/faiScriptEntry.tpl.c:23
-msgid ""
-"Choose a priority. Low values result in an earlier, high values in a later "
-"execution."
-msgstr "Kies een prioriteit. Lage waarden resulteren in een eerder uitvoering, hoge waarden in een latere uitvoering."
-
-#: admin/fai/faiScriptEntry.tpl.c:32 admin/fai/faiHookEntry.tpl.c:32
-msgid "Import script"
-msgstr "Importeer script"
-
-#: admin/fai/classSelect/selectClass-list.tpl.c:2
-msgid "Base"
-msgstr "Basis"
-
-#: admin/fai/fai-filter.tpl.c:29
-msgid "Show profiles"
-msgstr "Toon profielen"
-
-#: admin/fai/fai-filter.tpl.c:32
-msgid "Show templates"
-msgstr "Toon sjablonen"
-
-#: admin/fai/fai-filter.tpl.c:35
-msgid "Show scripts"
-msgstr "Toon scripts"
-
-#: admin/fai/fai-filter.tpl.c:38
-msgid "Show hooks"
-msgstr "Toon inhakers"
-
-#: admin/fai/fai-filter.tpl.c:41
-msgid "Show variables"
-msgstr "Toon variabelen"
-
-#: admin/fai/fai-filter.tpl.c:44
-msgid "Show packages"
-msgstr "Toon pakketten"
-
-#: admin/fai/fai-filter.tpl.c:47
-msgid "Show partitions"
-msgstr "Toon partities"
-
-#: admin/fai/faiTemplateEdit.tpl.c:2
-msgid "This FAI template is write protected. Editing may break it!"
-msgstr "Deze FAI sjabloon is write protected. Deze bewerken kan het bestand schaden!"
-
-#: admin/fai/faiTemplateEdit.tpl.c:5
-msgid "Edit anyway"
-msgstr "Alsnog bewerken"
-
-#: admin/fai/faiPartitionTable.tpl.c:14
-msgid "Use 'setup-storage' to partition the disk"
-msgstr "Gebruik 'setup-storage' voor disk partitie"
-
-#: admin/fai/faiPartitionTable.tpl.c:20
-msgid "Discs"
-msgstr "Schijven"
-
-#: admin/fai/faiPartitionTable.tpl.c:23 admin/fai/faiPartitionTable.tpl.c:26
-#: admin/fai/faiPartitionTable.tpl.c:41 admin/fai/faiPartitionTable.tpl.c:44
-msgid "Add disk"
-msgstr "Disk toevoegen"
-
-#: admin/fai/faiPartitionTable.tpl.c:29 admin/fai/faiPartitionTable.tpl.c:32
-#: admin/fai/faiPartitionTable.tpl.c:47 admin/fai/faiPartitionTable.tpl.c:50
-msgid "Add RAID"
-msgstr "Raid toevoegen"
-
-#: admin/fai/faiPartitionTable.tpl.c:35 admin/fai/faiPartitionTable.tpl.c:38
-#: admin/fai/faiPartitionTable.tpl.c:53 admin/fai/faiPartitionTable.tpl.c:56
-msgid "Add volume group"
-msgstr "Volume group toevoegen"
-
-#: admin/fai/faiScript.tpl.c:17
-msgid "List of scripts"
-msgstr "Lijst met scripts"
-
-#: admin/fai/faiProfile.tpl.c:20
-msgid "Choose a priority"
-msgstr "Kies een prioriteit"
-
-#: admin/fai/faiHookEntry.tpl.c:14 admin/fai/faiHookEntry.tpl.c:17
-#: admin/fai/faiHookEntry.tpl.c:26
-msgid "Hook attributes"
-msgstr "Inhakers atributen"
-
-#: admin/fai/faiHookEntry.tpl.c:23
-msgid "Choose an existing FAI task"
-msgstr "Kies een bestaande FAI taak"
diff --git a/fai/locale/pl/fusiondirectory.po b/fai/locale/pl/fusiondirectory.po
index 28d0206b27a60bf9096ce0cc56b3e6b2f96b4897..1eb1b84e9e71d2dd0a3fb7773c954dae2b2c8dd2 100644
--- a/fai/locale/pl/fusiondirectory.po
+++ b/fai/locale/pl/fusiondirectory.po
@@ -5,379 +5,188 @@
 # Translators:
 msgid ""
 msgstr ""
-"Project-Id-Version: FusionDirectory-108\n"
+"Project-Id-Version: FusionDirectory-109\n"
 "Report-Msgid-Bugs-To: documentation@lists.fusiondirectory.org\n"
-"POT-Creation-Date: 2015-03-19 21:45+0100\n"
-"PO-Revision-Date: 2015-02-25 16:12+0000\n"
+"POT-Creation-Date: 2014-12-15 17:47+0100\n"
+"PO-Revision-Date: 2015-02-25 16:13+0000\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>\n"
-"Language-Team: Polish (http://www.transifex.com/projects/p/FusionDirectory-108/language/pl/)\n"
+"Language-Team: Polish (http://www.transifex.com/projects/p/FusionDirectory-109/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/fai/class_faiScriptEntry.inc:79 admin/fai/class_faiScriptEntry.inc:82
-#: admin/fai/class_faiManagement.inc:240 admin/fai/class_faiManagement.inc:768
-#: admin/fai/class_faiManagement.inc:774
-#: admin/fai/class_faiPartitionTable.inc:268
-#: admin/fai/class_faiPartitionTable.inc:331
-#: admin/fai/class_faiDiskEntry.inc:445 admin/fai/class_FAI.inc:570
-#: admin/fai/class_faiHookEntry.inc:83 admin/fai/class_faiHookEntry.inc:86
-#: admin/fai/class_faiScript.inc:249 admin/fai/class_faiTemplate.inc:232
-#: admin/fai/class_faiHook.inc:259 admin/fai/class_faiVariable.inc:162
-#: admin/systems/class_faiLogView.inc:207
-#: admin/systems/class_faiLogView.inc:242
-msgid "Error"
-msgstr "BÅ‚Ä…d"
-
-#: admin/fai/class_faiScriptEntry.inc:82 admin/fai/class_faiHookEntry.inc:86
-msgid "file is empty"
-msgstr ""
-
-#: admin/fai/class_faiScriptEntry.inc:102 admin/fai/class_faiHookEntry.inc:102
-#: admin/fai/class_faiScript.inc:349 admin/fai/class_faiScript.inc:374
-#: admin/fai/class_faiTemplate.inc:320 admin/fai/class_faiHook.inc:346
-msgid "Download"
-msgstr "ÅšciÄ…gnij"
-
-#: admin/fai/class_faiScriptEntry.inc:147
-#: admin/fai/class_faiScriptEntry.inc:151
-#: admin/fai/class_faiScriptEntry.inc:154
-#: admin/fai/class_faiScriptEntry.inc:197
-#: admin/fai/class_faiManagement.inc:768 admin/fai/class_faiManagement.inc:774
-#: admin/fai/class_faiPackage.inc:685
-#: admin/fai/class_faiPartitionTable.inc:779
-#: admin/fai/class_faiDiskEntry.inc:702 admin/fai/class_faiDiskEntry.inc:705
-#: admin/fai/class_faiDiskEntry.inc:758
-#: admin/fai/class_faiTemplateEntry.inc:247
-#: admin/fai/class_faiTemplateEntry.inc:312
-#: admin/fai/class_faiPartitionTableEntry.inc:353
-#: admin/fai/class_faiPartitionTableEntry.inc:356
-#: admin/fai/class_faiPartitionTableEntry.inc:360
-#: admin/fai/class_faiPartitionTableEntry.inc:455
-#: admin/fai/packageSelect/selectPackage-list.xml:40
-#: admin/fai/class_faiProfile.inc:414 admin/fai/class_faiProfile.inc:463
-#: admin/fai/class_faiHookEntry.inc:157 admin/fai/class_faiHookEntry.inc:162
-#: admin/fai/class_faiHookEntry.inc:165 admin/fai/class_faiHookEntry.inc:207
-#: admin/fai/class_askClassName.inc:163 admin/fai/class_askClassName.inc:167
-#: admin/fai/class_askClassName.inc:171 admin/fai/class_askClassName.inc:198
-#: admin/fai/class_faiScript.inc:347 admin/fai/class_faiScript.inc:605
-#: admin/fai/classSelect/selectClass-list.xml:28
-#: admin/fai/class_faiTemplate.inc:512
-#: admin/fai/class_faiVariableEntry.inc:103
-#: admin/fai/class_faiVariableEntry.inc:112
-#: admin/fai/class_faiVariableEntry.inc:115
-#: admin/fai/class_faiVariableEntry.inc:149 admin/fai/class_faiHook.inc:531
-#: admin/fai/class_faiVariable.inc:398 admin/fai/fai-list.xml:80
-#: admin/fai/faiPartitionTableEntry.tpl.c:8 admin/fai/faiPartition.tpl.c:5
-#: admin/fai/faiVariableEntry.tpl.c:8 admin/fai/faiDiskEntry.tpl.c:8
-#: admin/fai/faiTemplate.tpl.c:8 admin/fai/faiVariable.tpl.c:8
-#: admin/fai/faiHook.tpl.c:8
-#: admin/fai/packageSelect/selectPackage-filter.tpl.c:8
-#: admin/fai/faiPackage.tpl.c:8 admin/fai/faiScriptEntry.tpl.c:8
-#: admin/fai/classSelect/selectClass-filter.tpl.c:5
-#: admin/fai/fai-filter.tpl.c:50 admin/fai/faiPartitionTable.tpl.c:8
-#: admin/fai/faiScript.tpl.c:8 admin/fai/faiProfile.tpl.c:8
-#: admin/fai/faiHookEntry.tpl.c:8
-msgid "Name"
-msgstr "ImiÄ™"
-
-#: admin/fai/class_faiScriptEntry.inc:159 admin/fai/class_faiHookEntry.inc:170
-#: admin/fai/class_faiScript.inc:594 admin/fai/fai-list.xml:122
-#: admin/fai/faiScriptEntry.tpl.c:29 admin/fai/faiHookEntry.tpl.c:29
-msgid "Script"
-msgstr "Skrypt"
-
-#: admin/fai/class_faiScriptEntry.inc:190
-#: admin/fai/class_faiScriptEntry.inc:199
-msgid "Script entry"
-msgstr "Skrypt"
-
-#: admin/fai/class_faiScriptEntry.inc:191
-msgid "FAI script entry"
-msgstr ""
-
-#: admin/fai/class_faiScriptEntry.inc:198 admin/fai/class_faiPackage.inc:686
-#: admin/fai/class_faiPartitionTable.inc:780
-#: admin/fai/class_faiDiskEntry.inc:759
-#: admin/fai/class_faiTemplateEntry.inc:313
-#: admin/fai/class_faiPartitionTableEntry.inc:456
-#: admin/fai/class_faiProfile.inc:464 admin/fai/class_faiHookEntry.inc:208
-#: admin/fai/class_faiScript.inc:606 admin/fai/class_faiTemplate.inc:513
-#: admin/fai/class_faiVariableEntry.inc:150 admin/fai/class_faiHook.inc:532
-#: admin/fai/class_faiVariable.inc:399
-#: admin/fai/faiPartitionTableEntry.tpl.c:11 admin/fai/faiPartition.tpl.c:11
-#: admin/fai/faiVariableEntry.tpl.c:11 admin/fai/faiDiskEntry.tpl.c:14
-#: admin/fai/faiTemplate.tpl.c:11 admin/fai/faiVariable.tpl.c:11
-#: admin/fai/faiHook.tpl.c:11 admin/fai/faiPackage.tpl.c:11
-#: admin/fai/faiTemplateEntry.tpl.c:14 admin/fai/faiScriptEntry.tpl.c:11
-#: admin/fai/faiPartitionTable.tpl.c:11 admin/fai/faiScript.tpl.c:11
-#: admin/fai/faiProfile.tpl.c:11 admin/fai/faiHookEntry.tpl.c:11
-msgid "Description"
-msgstr "Opis"
-
-#: admin/fai/class_faiScriptEntry.inc:200
-msgid "Script Priority"
-msgstr ""
-
-#: admin/fai/class_faiManagement.inc:188
-msgid "partition table"
-msgstr ""
-
-#: admin/fai/class_faiManagement.inc:189 admin/fai/fai-list.xml:31
-msgid "script"
-msgstr "Skrypt"
-
-#: admin/fai/class_faiManagement.inc:190 admin/fai/fai-list.xml:47
-msgid "hook"
-msgstr "Zaczep"
-
-#: admin/fai/class_faiManagement.inc:191 admin/fai/fai-list.xml:39
-msgid "variable"
-msgstr "Zmienna"
-
-#: admin/fai/class_faiManagement.inc:192 admin/fai/fai-list.xml:63
-msgid "template"
-msgstr ""
-
-#: admin/fai/class_faiManagement.inc:193
-msgid "package list"
-msgstr ""
-
-#: admin/fai/class_faiManagement.inc:210 admin/fai/class_faiManagement.inc:226
-#: admin/fai/class_faiManagement.inc:332 admin/fai/class_faiManagement.inc:390
-#: admin/fai/class_faiManagement.inc:480 admin/fai/class_faiManagement.inc:575
-#: admin/fai/class_faiManagement.inc:598 admin/fai/class_faiManagement.inc:619
-msgid "Permission error"
-msgstr ""
-
-#: admin/fai/class_faiManagement.inc:211 admin/fai/class_faiManagement.inc:226
-#, php-format
-msgid "You have no permission to create a new %s!"
-msgstr ""
-
-#: admin/fai/class_faiManagement.inc:226 admin/fai/fai-list.xml:55
-msgid "profile"
-msgstr ""
-
-#: admin/fai/class_faiManagement.inc:328
-msgid "Branch locked"
-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:178 config/fai/class_faiConfig.inc:41
+msgid "FAI"
+msgstr "FAI"
 
-#: admin/fai/class_faiManagement.inc:329
-#, php-format
-msgid "The following entries are locked, you can't remove them %s."
+#: admin/fai/class_faiManagement.inc:118
+msgid "Manage FAI software packages and deployment recipes"
 msgstr ""
 
-#: admin/fai/class_faiManagement.inc:346
-msgid "FAI object"
+#: admin/fai/class_faiPackage.inc:157
+msgid "Mark for installation"
 msgstr ""
 
-#: admin/fai/class_faiManagement.inc:477
-msgid "FAI branch/freeze"
+#: admin/fai/class_faiPackage.inc:161
+msgid "Mark for removal"
 msgstr ""
 
-#: admin/fai/class_faiManagement.inc:480
-msgid "You have no permission to delete this release!"
+#: admin/fai/class_faiPackage.inc:166
+msgid "Edit configuration"
 msgstr ""
 
-#: admin/fai/class_faiManagement.inc:496 admin/fai/remove.tpl.c:2
-#: admin/fai/remove_branch.tpl.c:2
-msgid "Warning"
-msgstr "OstrzeÅ¼enie"
+#: admin/fai/class_faiPackage.inc:247
+#: admin/fai/class_faiPartitionTable.inc:209
+#: admin/fai/class_faiPartitionTable.inc:250
+#: admin/fai/class_faiTemplate.inc:114
+#: admin/systems/services/repository/class_serviceDebianRepository.inc:172
+#: admin/systems/services/repository/class_serviceDebianRepository.inc:189
+#: admin/systems/services/repository/class_serviceDebianRepository.inc:193
+msgid "LDAP error"
+msgstr "bÅ‚Ä…d LDAP"
 
-#: admin/fai/class_faiManagement.inc:496
-msgid "Release remove aborted because the release name check failed!"
+#: admin/fai/class_faiPackage.inc:279
+#: admin/fai/packageSelect/class_filterFAIPackages.inc:41
+#: admin/fai/packageSelect/class_filterFAIPackages.inc:46
+#: admin/fai/class_faiPackageConfiguration.inc:55
+#: admin/systems/class_faiStartup.inc:133
+#: admin/systems/class_faiStartup.inc:160
+msgid "Service infrastructure"
 msgstr ""
 
-#: admin/fai/class_faiManagement.inc:573 admin/fai/class_faiManagement.inc:596
-msgid "Configuration"
-msgstr "Konfiguracja"
-
-#: admin/fai/class_faiManagement.inc:575 admin/fai/class_faiManagement.inc:598
-#: admin/fai/class_faiManagement.inc:619
-msgid "Branch"
+#: admin/fai/class_faiPackage.inc:294
+msgid "Unkown packages"
 msgstr ""
 
-#: admin/fai/class_faiManagement.inc:725 admin/fai/askClassName.tpl.c:23
-msgid "Continue"
-msgstr "Kontynuuj"
-
-#: admin/fai/class_faiManagement.inc:926
-#: admin/fai/class_faiPartitionTable.inc:768
-#: admin/fai/class_faiProfile.inc:318 admin/fai/class_askClassName.inc:99
-#: admin/fai/classSelect/class_classSelect.inc:58
-#: admin/fai/class_faiGroupHandle.inc:120
-#: admin/fai/class_faiProfileEntry.inc:163 admin/fai/fai-list.xml:146
-msgid "Partition table"
-msgstr "Tablica partycji"
-
-#: admin/fai/class_faiManagement.inc:928
-#: admin/fai/class_faiGroupHandle.inc:122 admin/fai/fai-list.xml:140
-msgid "Package list"
-msgstr "Lista pakietÃ³w"
-
-#: admin/fai/class_faiManagement.inc:930
-#: admin/fai/class_faiGroupHandle.inc:124
-msgid "Scripts"
-msgstr "Skrypty"
-
-#: admin/fai/class_faiManagement.inc:932
-#: admin/fai/class_faiGroupHandle.inc:126
-msgid "Variables"
-msgstr "Zmienie"
-
-#: admin/fai/class_faiManagement.inc:934
-#: admin/fai/class_faiGroupHandle.inc:128
-msgid "Hooks"
-msgstr "Zaczepy"
-
-#: admin/fai/class_faiManagement.inc:936 admin/fai/class_faiProfile.inc:454
-#: admin/fai/class_askClassName.inc:104 admin/fai/class_faiGroupHandle.inc:130
-#: admin/fai/fai-list.xml:110
-msgid "Profile"
-msgstr "Profile"
-
-#: admin/fai/class_faiManagement.inc:938
-#: admin/fai/class_faiGroupHandle.inc:132
-msgid "Templates"
-msgstr "Szablony"
+#: admin/fai/class_faiPackage.inc:365
+msgid "Package"
+msgstr "Pakiet"
 
-#: admin/fai/class_faiManagement.inc:1039
-#: admin/fai/class_faiManagement.inc:1045
-#: admin/fai/packageSelect/selectPackage-list.xml:14
-#: admin/fai/classSelect/selectClass-list.xml:15
-#: admin/systems/class_faiStartup.inc:177 config/fai/class_faiConfig.inc:41
-msgid "FAI"
-msgstr "FAI"
+#: admin/fai/class_faiPackage.inc:366
+msgid "FAI Package list"
+msgstr "Lista pakietÃ³w FAI"
 
-#: admin/fai/class_faiManagement.inc:1040
-msgid "Manage FAI software packages and deployment recipes"
+#: admin/fai/class_faiPackage.inc:369
+msgid "FAI Package"
 msgstr ""
 
-#: admin/fai/class_faiPackage.inc:261
-msgid "Invalid package names"
-msgstr ""
+#: admin/fai/class_faiPackage.inc:385
+#: admin/fai/class_faiPartitionTable.inc:304
+#: admin/fai/class_faiTemplateEntry.inc:140 admin/fai/class_faiProfile.inc:47
+#: admin/fai/class_faiScript.inc:50 admin/fai/class_faiTemplate.inc:173
+#: admin/fai/class_faiHook.inc:50 admin/fai/class_faiVariable.inc:50
+msgid "Properties"
+msgstr "WÅ‚aÅ›ciwoÅ›ci"
 
-#: admin/fai/class_faiPackage.inc:262
-#, php-format
-msgid "The following package names don't match the Debian policy: %s"
-msgstr ""
+#: admin/fai/class_faiPackage.inc:388
+#: admin/fai/class_faiPartitionTable.inc:307 admin/fai/class_faiProfile.inc:50
+#: admin/fai/class_faiScript.inc:53 admin/fai/class_faiTemplate.inc:176
+#: admin/fai/class_faiHook.inc:53 admin/fai/class_faiVariable.inc:53
+msgid "Class name"
+msgstr "Nazwa klasy"
 
-#: admin/fai/class_faiPackage.inc:421 admin/fai/class_faiPackage.inc:422
-msgid "Configured"
+#: admin/fai/class_faiPackage.inc:388 admin/fai/class_faiScript.inc:53
+#: admin/fai/class_faiHook.inc:53 admin/fai/class_faiVariable.inc:53
+msgid "Variables class name"
 msgstr ""
 
-#: admin/fai/class_faiPackage.inc:428 admin/fai/class_faiPackage.inc:429
-msgid "Package marked for removal"
-msgstr "Pakiet zaznaczony do usuniÄ™cia"
-
-#: admin/fai/class_faiPackage.inc:445
-msgid "Mark package for removal"
-msgstr ""
+#: admin/fai/class_faiPackage.inc:392
+#: admin/fai/class_faiPartitionTable.inc:311
+#: admin/fai/class_faiDiskEntry.inc:738
+#: admin/fai/class_faiTemplateEntry.inc:147 admin/fai/class_faiProfile.inc:54
+#: admin/fai/class_faiScript.inc:57 admin/fai/class_faiScript.inc:75
+#: admin/fai/class_faiTemplate.inc:180 admin/fai/class_faiHook.inc:57
+#: admin/fai/class_faiHook.inc:75 admin/fai/class_faiVariable.inc:57
+#: admin/fai/class_faiVariable.inc:75
+msgid "Description"
+msgstr "Opis"
 
-#: admin/fai/class_faiPackage.inc:451
-msgid "Configure this package"
+#: admin/fai/class_faiPackage.inc:392
+#: admin/fai/class_faiPartitionTable.inc:311 admin/fai/class_faiProfile.inc:54
+#: admin/fai/class_faiScript.inc:57 admin/fai/class_faiTemplate.inc:180
+#: admin/fai/class_faiHook.inc:57 admin/fai/class_faiVariable.inc:57
+msgid "Short description of the class"
 msgstr ""
 
-#: admin/fai/class_faiPackage.inc:455
-msgid "Remove this package"
-msgstr ""
+#: admin/fai/class_faiPackage.inc:398 admin/systems/class_faiStartup.inc:90
+msgid "Repository"
+msgstr "Repozytorium"
 
-#: admin/fai/class_faiPackage.inc:534
-msgid "Please select a least one package!"
-msgstr ""
+#: admin/fai/class_faiPackage.inc:401 admin/systems/class_faiStartup.inc:78
+#: admin/systems/services/repository/class_serviceDebianRepository.inc:52
+#: admin/systems/services/repository/class_serviceCentosRepository.inc:49
+msgid "Release"
+msgstr "Wersja"
 
-#: admin/fai/class_faiPackage.inc:538
-msgid ""
-"Please choose a valid release/section combination for your repository setup!"
+#: admin/fai/class_faiPackage.inc:401
+msgid "Debian release concerned"
 msgstr ""
 
-#: admin/fai/class_faiPackage.inc:571
-#: admin/fai/packageSelect/class_filterFAIPackages.inc:41
-#: admin/fai/packageSelect/class_filterFAIPackages.inc:46
-#: admin/fai/class_faiPackageConfiguration.inc:55
-#: admin/systems/class_faiStartup.inc:132
-#: admin/systems/class_faiStartup.inc:159
-msgid "Infrastructure service"
+#: admin/fai/class_faiPackage.inc:405
+#: admin/systems/services/repository/class_serviceDebianRepository.inc:58
+msgid "Sections"
 msgstr ""
 
-#: admin/fai/class_faiPackage.inc:587
-msgid "Unkown packages"
+#: admin/fai/class_faiPackage.inc:405
+msgid "Sections concerned"
 msgstr ""
 
-#: admin/fai/class_faiPackage.inc:674
-#: admin/fai/faiPackageConfiguration.tpl.c:2
-msgid "Package"
-msgstr "Pakiet"
-
-#: admin/fai/class_faiPackage.inc:675
-msgid "FAI Package list"
-msgstr "Lista pakietÃ³w FAI"
+#: admin/fai/class_faiPackage.inc:409
+msgid "Install method"
+msgstr "Metoda instalacji"
 
-#: admin/fai/class_faiPackage.inc:679
-msgid "FAI Package"
+#: admin/fai/class_faiPackage.inc:409
+msgid "Install method to use for this package list"
 msgstr ""
 
-#: admin/fai/class_faiPackage.inc:687
+#: admin/fai/class_faiPackage.inc:420
 msgid "Packages"
 msgstr "Pakiety"
 
-#: admin/fai/class_faiPackage.inc:688 admin/fai/faiPackage.tpl.c:23
-msgid "Section"
-msgstr "Sekcja"
-
-#: admin/fai/class_faiPackage.inc:688 admin/fai/class_faiPackage.inc:691
-#: admin/fai/class_faiScript.inc:605 admin/fai/class_faiTemplate.inc:512
-msgid "Readonly"
+#: admin/fai/class_faiPackage.inc:424
+msgid "Packages in this class"
 msgstr ""
 
-#: admin/fai/class_faiPackage.inc:689
-msgid "Install Method"
-msgstr "Metoda instalacji"
+#: admin/fai/class_faiPartitionTable.inc:61
+#: admin/fai/class_faiDiskEntry.inc:442 admin/systems/class_faiLogView.inc:207
+#: admin/systems/class_faiLogView.inc:242
+msgid "Error"
+msgstr "BÅ‚Ä…d"
 
-#: admin/fai/class_faiPackage.inc:690
-msgid "Package configuration"
+#: admin/fai/class_faiPartitionTable.inc:112
+msgid "Add RAID"
 msgstr ""
 
-#: admin/fai/class_faiPackage.inc:691 admin/systems/class_faiStartup.inc:78
-#: admin/systems/services/repository/class_serviceRepository.inc:40
-#: admin/fai/branch_selector.tpl.c:14 admin/fai/faiPackage.tpl.c:20
-#: admin/fai/fai-filter.tpl.c:5 admin/fai/fai-filter.tpl.c:14
-msgid "Release"
-msgstr "Wersja"
-
-#: admin/fai/class_faiPartitionTable.inc:269
-#: admin/fai/class_faiDiskEntry.inc:446
-#, php-format
-msgid ""
-"The disk cannot be deleted while it is used in the '%s' disk definition!"
+#: admin/fai/class_faiPartitionTable.inc:116
+msgid "Add LVM"
 msgstr ""
 
-#: admin/fai/class_faiPartitionTable.inc:416 admin/fai/class_faiScript.inc:360
-#: admin/fai/class_faiScript.inc:362 admin/fai/class_faiTemplate.inc:306
-#: admin/fai/class_faiTemplate.inc:308
-msgid "edit"
-msgstr "edytuj"
-
-#: admin/fai/class_faiPartitionTable.inc:418 admin/fai/class_faiScript.inc:364
-#: admin/fai/class_faiTemplate.inc:310
-msgid "delete"
-msgstr "UsuÅ„"
+#: admin/fai/class_faiPartitionTable.inc:284
+msgid "Partition table"
+msgstr "Tablica partycji"
 
-#: admin/fai/class_faiPartitionTable.inc:769
-#: admin/fai/class_faiPartitionTable.inc:773
+#: admin/fai/class_faiPartitionTable.inc:285
+#: admin/fai/class_faiPartitionTable.inc:288
 msgid "FAI partition table"
 msgstr "Tablica partycji FAI"
 
-#: admin/fai/class_faiPartitionTable.inc:779 admin/fai/class_faiHook.inc:531
-#: admin/fai/class_faiVariable.inc:398
-msgid "Read only"
-msgstr "Tylko do odczytu"
+#: admin/fai/class_faiPartitionTable.inc:307 admin/fai/class_faiProfile.inc:50
+msgid "Partition table class name"
+msgstr ""
+
+#: admin/fai/class_faiPartitionTable.inc:317
+msgid "Discs"
+msgstr "Dyski"
+
+#: admin/fai/class_faiPartitionTable.inc:324
+msgid "Partitions in this class"
+msgstr ""
 
 #: admin/fai/class_faiDiskEntry.inc:273
-#: admin/fai/faiPartitionTableEntry.tpl.c:5 admin/fai/faiDiskEntry.tpl.c:5
 msgid "Device"
 msgstr "UrzÄ…dzenie"
 
@@ -389,103 +198,103 @@ msgstr ""
 msgid "UUID"
 msgstr ""
 
-#: admin/fai/class_faiDiskEntry.inc:345
+#: admin/fai/class_faiDiskEntry.inc:344
 msgid "Disks"
 msgstr ""
 
-#: admin/fai/class_faiDiskEntry.inc:348 admin/fai/class_faiPartition.inc:321
-#: admin/fai/faiPartition.tpl.c:14
+#: admin/fai/class_faiDiskEntry.inc:347 admin/fai/class_faiPartition.inc:319
 msgid "Size"
 msgstr "Rozmiar"
 
-#: admin/fai/class_faiDiskEntry.inc:544
+#: admin/fai/class_faiDiskEntry.inc:443
+#, php-format
+msgid ""
+"The disk cannot be deleted while it is used in the '%s' disk definition!"
+msgstr ""
+
+#: admin/fai/class_faiDiskEntry.inc:536
 msgid "encrypted"
 msgstr ""
 
-#: admin/fai/class_faiDiskEntry.inc:547
+#: admin/fai/class_faiDiskEntry.inc:539
 msgid "bootable"
 msgstr ""
 
-#: admin/fai/class_faiDiskEntry.inc:550
+#: admin/fai/class_faiDiskEntry.inc:542
 msgid "preserve"
 msgstr ""
 
-#: admin/fai/class_faiDiskEntry.inc:735
+#: admin/fai/class_faiDiskEntry.inc:687 admin/fai/class_faiDiskEntry.inc:690
+#: admin/fai/class_faiDiskEntry.inc:737
+#: admin/fai/packageSelect/selectPackage-list.xml:40
+#: admin/fai/class_faiScript.inc:71 admin/fai/class_faiHook.inc:71
+#: admin/fai/class_faiVariable.inc:71
+#: admin/fai/class_faiSimplePluginClass.inc:50
+msgid "Name"
+msgstr "ImiÄ™"
+
+#: admin/fai/class_faiDiskEntry.inc:717
 msgid ""
 "You have more than four primary partition table entries in your "
 "configuration, please check your configuration twice."
 msgstr ""
 
-#: admin/fai/class_faiDiskEntry.inc:739
+#: admin/fai/class_faiDiskEntry.inc:721
 msgid ""
 "You cannot have more than three primary partition while using logical "
 "partitions, please check your configuration twice."
 msgstr ""
 
-#: admin/fai/class_faiDiskEntry.inc:752
-#: admin/fai/class_faiPartitionTableEntry.inc:448
+#: admin/fai/class_faiDiskEntry.inc:733
 msgid "Partition table entry"
 msgstr ""
 
-#: admin/fai/class_faiDiskEntry.inc:753
-#: admin/fai/class_faiPartitionTableEntry.inc:449
+#: admin/fai/class_faiDiskEntry.inc:734
 msgid "FAI partition table entry"
 msgstr ""
 
-#: admin/fai/class_faiDiskEntry.inc:760
+#: admin/fai/class_faiDiskEntry.inc:739
 msgid "Disk options"
 msgstr ""
 
-#: admin/fai/class_faiDiskEntry.inc:761
-#: admin/fai/class_faiPartitionTableEntry.inc:457
+#: admin/fai/class_faiDiskEntry.inc:740
 msgid "Partition type"
 msgstr "Typ partycji"
 
-#: admin/fai/class_faiDiskEntry.inc:762
-#: admin/fai/class_faiPartitionTableEntry.inc:458
+#: admin/fai/class_faiDiskEntry.inc:741
 msgid "Partition no."
 msgstr "Nr. Partycji"
 
-#: admin/fai/class_faiDiskEntry.inc:763
-#: admin/fai/class_faiPartitionTableEntry.inc:459
+#: admin/fai/class_faiDiskEntry.inc:742
 msgid "File system type"
 msgstr "Typ systemu plikÃ³w"
 
-#: admin/fai/class_faiDiskEntry.inc:764
-#: admin/fai/class_faiPartitionTableEntry.inc:171
-#: admin/fai/class_faiPartitionTableEntry.inc:460
-#: admin/fai/class_faiPartition.inc:437 admin/fai/faiPartition.tpl.c:47
+#: admin/fai/class_faiDiskEntry.inc:743 admin/fai/class_faiPartition.inc:432
 msgid "Mount point"
 msgstr "Punkt montowania"
 
-#: admin/fai/class_faiDiskEntry.inc:765
-#: admin/fai/class_faiPartitionTableEntry.inc:461
-#: admin/fai/class_faiPartition.inc:402 admin/fai/class_faiPartition.inc:407
+#: admin/fai/class_faiDiskEntry.inc:744 admin/fai/class_faiPartition.inc:397
+#: admin/fai/class_faiPartition.inc:402
 msgid "Partition size"
 msgstr "Rozmiar partycji"
 
-#: admin/fai/class_faiDiskEntry.inc:766
-#: admin/fai/class_faiPartitionTableEntry.inc:173
-#: admin/fai/class_faiPartitionTableEntry.inc:462
-#: admin/fai/faiPartition.tpl.c:50
+#: admin/fai/class_faiDiskEntry.inc:745
 msgid "Mount options"
 msgstr "Opcje montowania"
 
-#: admin/fai/class_faiDiskEntry.inc:767
-#: admin/fai/class_faiPartitionTableEntry.inc:463
+#: admin/fai/class_faiDiskEntry.inc:746
 msgid "File system options"
 msgstr "Opcje systemu plikÃ³w"
 
-#: admin/fai/class_faiDiskEntry.inc:768
-#: admin/fai/class_faiPartitionTableEntry.inc:464
+#: admin/fai/class_faiDiskEntry.inc:747
 msgid "Partition flags"
 msgstr "Flagi partycji"
 
-#: admin/fai/class_debconfTemplate.inc:227
+#: admin/fai/class_debconfTemplate.inc:225
 msgid "This package has no debconf options."
 msgstr "Ten pakiet nie ma opcji debconf."
 
-#: admin/fai/class_debconfTemplate.inc:264
+#: admin/fai/class_debconfTemplate.inc:262
 msgid ""
 "This debconf question is dynamically generated during package installation "
 "and requires choosing between specific options which cannot be presented "
@@ -493,217 +302,59 @@ msgid ""
 " effect."
 msgstr ""
 
-#: admin/fai/class_faiTemplateEntry.inc:139
-msgid "no file uploaded yet"
-msgstr "Nie wgrano jeszcze Å¼adnego pliku"
-
-#: admin/fai/class_faiTemplateEntry.inc:142
-#, php-format
-msgid "exists in database (size: %s bytes)"
-msgstr "istnieje w bazie danych (rozmiar %s bajtÃ³w)"
-
-#: admin/fai/class_faiTemplateEntry.inc:251
-#: admin/systems/class_faiLogView.inc:70 admin/fai/faiTemplateEntry.tpl.c:23
-msgid "File"
-msgstr "Plik"
-
-#: admin/fai/class_faiTemplateEntry.inc:255
-#: admin/fai/faiTemplateEntry.tpl.c:11
-msgid "Destination path"
-msgstr "ÅšcieÅ¼ka docelowa"
-
-#: admin/fai/class_faiTemplateEntry.inc:260 admin/fai/faiTemplateEntry.tpl.c:8
-msgid "File name"
-msgstr ""
-
-#: admin/fai/class_faiTemplateEntry.inc:264
-#: admin/fai/class_faiTemplateEntry.inc:266
-#: admin/fai/faiTemplateEntry.tpl.c:68
-msgid "User"
-msgstr "UÅ¼ytkownik"
-
-#: admin/fai/class_faiTemplateEntry.inc:270
-#: admin/fai/class_faiTemplateEntry.inc:273
-#: admin/fai/class_faiTemplateEntry.inc:275
-#: admin/fai/faiTemplateEntry.tpl.c:47 admin/fai/faiTemplateEntry.tpl.c:74
-msgid "Group"
-msgstr "Grupa"
-
-#: admin/fai/class_faiTemplateEntry.inc:305
-msgid "Template entry"
+#: admin/fai/class_faiTemplateEntry.inc:143
+msgid "File path"
 msgstr ""
 
-#: admin/fai/class_faiTemplateEntry.inc:306
-msgid "FAI template entry"
+#: admin/fai/class_faiTemplateEntry.inc:143
+msgid "Complete absolute template file path and name"
 msgstr ""
 
-#: admin/fai/class_faiTemplateEntry.inc:314
-msgid "Template file"
-msgstr "Plik szablonu"
-
-#: admin/fai/class_faiTemplateEntry.inc:315
-msgid "Template path"
-msgstr "ÅšcieÅ¼ka szablonu"
-
-#: admin/fai/class_faiTemplateEntry.inc:316
-msgid "File owner"
-msgstr "WÅ‚aÅ›ciciel pliku"
-
-#: admin/fai/class_faiTemplateEntry.inc:317
-msgid "File permissions"
-msgstr "Uprawnienia pliku"
-
-#: admin/fai/class_FAI.inc:287 admin/fai/class_FAI.inc:679
-#: admin/fai/class_FAI.inc:1266 admin/fai/class_FAI.inc:1283
-#: admin/fai/class_FAI.inc:1287
-msgid "LDAP error"
-msgstr "bÅ‚Ä…d LDAP"
-
-#: admin/fai/class_FAI.inc:570
-#, php-format
-msgid "Error, following objects should be equal '%s' and '%s'"
-msgstr "BÅ‚Ä…d, nastÄ™pujÄ…ce obiekty powinny byÄ‡ rÃ³wne '%s' oraz '%s'"
-
-#: admin/fai/class_FAI.inc:891
-#, php-format
-msgid "Creating group application release for %s"
+#: admin/fai/class_faiTemplateEntry.inc:147
+msgid "Short description of the file"
 msgstr ""
 
-#: admin/fai/class_FAI.inc:960 admin/fai/class_FAI.inc:982
-#: admin/fai/class_FAI.inc:1022 admin/fai/class_FAI.inc:1027
-#: admin/fai/class_FAI.inc:1065
-msgid "Object"
-msgstr "Obiekt"
-
-#: admin/fai/class_FAI.inc:961
-#, php-format
-msgid "Adding missing group application release container %s."
-msgstr ""
+#: admin/fai/class_faiTemplateEntry.inc:156
+msgid "Template attributes"
+msgstr "Atrybuty szablonu"
 
-#: admin/fai/class_FAI.inc:983
-#, php-format
-msgid "Adding group application release container %s."
+#: admin/fai/class_faiTemplateEntry.inc:160
+msgid "Template file content"
 msgstr ""
 
-#: admin/fai/class_FAI.inc:1023
-#, php-format
-msgid "Could not create menu entry %s. (Already exists)."
+#: admin/fai/class_faiTemplateEntry.inc:160
+msgid "Content of the template file"
 msgstr ""
 
-#: admin/fai/class_FAI.inc:1028
-#, php-format
-msgid "Created group application menu entry for %s."
+#: admin/fai/class_faiTemplateEntry.inc:164
+msgid "Owner and group of the file"
 msgstr ""
 
-#: admin/fai/class_FAI.inc:1059
-#, php-format
-msgid "Creating copy of %s"
-msgstr "Tworzenie kopii %s"
-
-#: admin/fai/class_FAI.inc:1062
-msgid "Processing"
-msgstr "Przetwarzanie"
-
-#: admin/fai/class_FAI.inc:1080
-msgid "Could not create new release, the destination dn is already in use."
-msgstr ""
+#: admin/fai/class_faiTemplateEntry.inc:167
+msgid "Owner"
+msgstr "WÅ‚aÅ›ciciel"
 
-#: admin/fai/class_FAI.inc:1093
-msgid "Error while fetching source dn - aborted!"
-msgstr "BÅ‚Ä…d podczas pobierania ÅºrÃ³dÅ‚owego dn - anulowano!"
+#: admin/fai/class_faiTemplateEntry.inc:167
+msgid "File owner"
+msgstr "WÅ‚aÅ›ciciel pliku"
 
-#: admin/fai/class_FAI.inc:1174
-msgid "Fatal error"
-msgstr "BÅ‚Ä…d krytyczny"
+#: admin/fai/class_faiTemplateEntry.inc:172
+msgid "Group"
+msgstr "Grupa"
 
-#: admin/fai/class_FAI.inc:1175
-#, php-format
-msgid ""
-"Release creation failed due to ldap errors. Additional informations '%s'."
+#: admin/fai/class_faiTemplateEntry.inc:172
+msgid "File group"
 msgstr ""
 
-#: admin/fai/class_faiPartitionTableEntry.inc:162
-msgid "primary"
-msgstr "podstawowa"
-
-#: admin/fai/class_faiPartitionTableEntry.inc:162
-msgid "logical"
-msgstr "logiczna"
-
-#: admin/fai/class_faiPartitionTableEntry.inc:169
-#: admin/fai/faiPartition.tpl.c:8
-msgid "Type"
-msgstr "Typ"
-
-#: admin/fai/class_faiPartitionTableEntry.inc:170
-msgid "FS type"
-msgstr "Typ FS"
-
-#: admin/fai/class_faiPartitionTableEntry.inc:172
-msgid "Size in MB"
-msgstr "Rozmiar w MB"
-
-#: admin/fai/class_faiPartitionTableEntry.inc:174
-msgid "FS option"
-msgstr "Opcje systemu plikÃ³w"
-
-#: admin/fai/class_faiPartitionTableEntry.inc:175
-#: admin/fai/faiPartition.tpl.c:23
-msgid "Preserve"
-msgstr "Zachowaj"
-
-#: admin/fai/class_faiPartitionTableEntry.inc:266
-msgid "False"
-msgstr "Nie"
-
-#: admin/fai/class_faiPartitionTableEntry.inc:268
-msgid "True"
-msgstr "Tak"
-
-#: admin/fai/class_faiPartitionTableEntry.inc:272
-#: admin/fai/class_faiPartitionTableEntry.inc:274 admin/fai/fai-list.xml:159
-#: admin/fai/fai-list.xml:198
-msgid "Remove"
-msgstr "UsuÅ„"
-
-#: admin/fai/class_faiPartitionTableEntry.inc:384
-#, php-format
-msgid "please enter a unique mount point for partition %s"
-msgstr "proszÄ™ podaÄ‡ unikalny punkt montowania dla partycji %s"
-
-#: admin/fai/class_faiPartitionTableEntry.inc:389
-#, php-format
-msgid "partition %s mount point"
-msgstr ""
+#: admin/fai/class_faiTemplateEntry.inc:181
+msgid "Access"
+msgstr "DostÄ™p"
 
-#: admin/fai/class_faiPartitionTableEntry.inc:394
-#, php-format
-msgid ""
-"File system type 'swap' is already used, change file system type for "
-"partition %s."
-msgstr "Typ systemu plikÃ³w 'swap' jest juÅ¼ uÅ¼yty. ZmieÅ„ system plikÃ³w dla partycji %s."
-
-#: admin/fai/class_faiPartitionTableEntry.inc:398
-msgid "Please use 'swap' as mount point, if 'swap' is used as fs-type."
-msgstr "ProszÄ™ uÅ¼yÄ‡ 'swap' jako punkt montowania w przypadku uÅ¼ycia systemu plikÃ³w 'swap'."
-
-#: admin/fai/class_faiPartitionTableEntry.inc:404
-#: admin/fai/class_faiPartitionTableEntry.inc:408
-#: admin/fai/class_faiPartitionTableEntry.inc:414
-#: admin/fai/class_faiPartitionTableEntry.inc:416
-#: admin/fai/class_faiPartitionTableEntry.inc:421
-#, php-format
-msgid "partition %s size"
+#: admin/fai/class_faiTemplateEntry.inc:181
+msgid "Access rights"
 msgstr ""
 
-#: admin/fai/class_faiPartitionTableEntry.inc:436
-msgid ""
-"You have more than 3 primary partition table entries in your configuration, "
-"please check your configuration twice."
-msgstr "Jest wiÄ™cej niÅ¼ 3 wpisy w podstawowej tablicy partycji. ProszÄ™ sprawdziÄ‡ konfiguracjÄ™."
-
 #: admin/fai/packageSelect/selectPackage-list.xml:10
-#: admin/fai/classSelect/selectClass-list.xml:11
 msgid "Please select the desired entries"
 msgstr ""
 
@@ -711,149 +362,96 @@ msgstr ""
 msgid "Version"
 msgstr ""
 
-#: admin/fai/class_faiProfile.inc:310
-msgid "This list displays all assigned class names for this profile."
-msgstr "Ta lista wyÅ›wietla wszystkie przypisane nazwy klas dla tego profilu."
-
-#: admin/fai/class_faiProfile.inc:313 admin/fai/class_askClassName.inc:103
-#: admin/fai/classSelect/class_classSelect.inc:53
-#: admin/fai/class_faiProfileEntry.inc:158
-msgid "Hook bundle"
-msgstr "Zestaw zaczepÃ³w"
-
-#: admin/fai/class_faiProfile.inc:314 admin/fai/class_askClassName.inc:105
-#: admin/fai/classSelect/class_classSelect.inc:54
-#: admin/fai/class_faiProfileEntry.inc:159
-msgid "Template bundle"
-msgstr "Zestaw szablonÃ³w"
-
-#: admin/fai/class_faiProfile.inc:315 admin/fai/class_askClassName.inc:101
-#: admin/fai/classSelect/class_classSelect.inc:55
-#: admin/fai/class_faiProfileEntry.inc:160
-msgid "Script bundle"
-msgstr "Zestaw skryptÃ³w"
-
-#: admin/fai/class_faiProfile.inc:316 admin/fai/class_askClassName.inc:102
-#: admin/fai/classSelect/class_classSelect.inc:56
-#: admin/fai/class_faiProfileEntry.inc:161
-msgid "Variable bundle"
-msgstr "Zestaw zmiennych"
-
-#: admin/fai/class_faiProfile.inc:317 admin/fai/class_askClassName.inc:100
-#: admin/fai/classSelect/class_classSelect.inc:57
-#: admin/fai/class_faiProfileEntry.inc:162
-msgid "Package bundle"
-msgstr "Zestaw pakietu"
-
-#: admin/fai/class_faiProfile.inc:321
-msgid "Remove class from profile"
-msgstr "UsuÅ„ klasÄ™ z profilu"
-
-#: admin/fai/class_faiProfile.inc:324
-msgid "Up"
-msgstr "GÃ³ra"
-
-#: admin/fai/class_faiProfile.inc:325
-msgid "Down"
-msgstr "W dÃ³Å‚"
-
-#: admin/fai/class_faiProfile.inc:410
-msgid "No class specified for this profile!"
-msgstr ""
-
-#: admin/fai/class_faiProfile.inc:419
-msgid "You can't use the same name for a class and a profile!"
-msgstr ""
+#: admin/fai/class_faiProfile.inc:28
+msgid "Profile"
+msgstr "Profile"
 
-#: admin/fai/class_faiProfile.inc:455
+#: admin/fai/class_faiProfile.inc:29
 msgid "FAI profile"
 msgstr "Profil FAI"
 
-#: admin/fai/class_faiProfile.inc:458
+#: admin/fai/class_faiProfile.inc:32
 msgid "FAI Profile"
 msgstr ""
 
-#: admin/fai/class_faiProfile.inc:465 admin/fai/faiProfile.tpl.c:17
+#: admin/fai/class_faiProfile.inc:61
 msgid "FAI classes"
 msgstr "Klasy FAI"
 
-#: admin/fai/class_faiHookEntry.inc:200
-msgid "Hook entry"
+#: admin/fai/class_faiProfile.inc:61
+msgid "FAI classes which are part of this profile"
 msgstr ""
 
-#: admin/fai/class_faiHookEntry.inc:201
-msgid "FAI hook entry"
-msgstr ""
+#: admin/fai/class_faiPackageConfiguration.inc:88
+#, php-format
+msgid "Debconf information for package '%s'"
+msgstr "Informacja Debconf dla pakietu '%s'"
 
-#: admin/fai/class_faiHookEntry.inc:209 admin/fai/faiHookEntry.tpl.c:20
-msgid "Task"
-msgstr "Zadanie"
+#: admin/fai/class_faiScript.inc:30 admin/fai/class_faiScript.inc:84
+#: admin/fai/class_faiHook.inc:87
+msgid "Script"
+msgstr "Skrypt"
 
-#: admin/fai/class_faiHookEntry.inc:210 admin/fai/class_faiScript.inc:595
-#: admin/fai/class_faiScript.inc:599
+#: admin/fai/class_faiScript.inc:31 admin/fai/class_faiScript.inc:34
 msgid "FAI script"
 msgstr "Skrypt FAI"
 
-#: admin/fai/class_faiPackageConfiguration.inc:88
-#, php-format
-msgid "Debconf information for package '%s'"
-msgstr "Informacja Debconf dla pakietu '%s'"
+#: admin/fai/class_faiScript.inc:63
+msgid "Scripts"
+msgstr "Skrypty"
 
-#: admin/fai/class_askClassName.inc:99 admin/fai/class_askClassName.inc:100
-#: admin/fai/class_askClassName.inc:101 admin/fai/class_askClassName.inc:102
-#: admin/fai/class_askClassName.inc:103 admin/fai/class_askClassName.inc:104
-#: admin/fai/class_askClassName.inc:105 admin/fai/class_askClassName.inc:106
-msgid "Create new FAI object"
-msgstr "UtwÃ³rz nowy obiekt FAI"
+#: admin/fai/class_faiScript.inc:67 admin/fai/class_faiHook.inc:67
+#: admin/fai/class_faiVariable.inc:67
+msgid "Variables in this class"
+msgstr ""
 
-#: admin/fai/class_faiTemplateEdit.inc:80
-#, php-format
-msgid ""
-"The file encodig has changed from '%s' to '%s'. Do you really want to save?"
+#: admin/fai/class_faiScript.inc:71 admin/fai/class_faiHook.inc:71
+#: admin/fai/class_faiVariable.inc:71
+msgid "The name of the variable"
 msgstr ""
 
-#: admin/fai/class_faiScript.inc:333 admin/fai/class_faiScript.inc:335
-msgid "Sort direction"
+#: admin/fai/class_faiScript.inc:75 admin/fai/class_faiHook.inc:75
+#: admin/fai/class_faiVariable.inc:75
+msgid "A short description of the variable"
 msgstr ""
 
-#: admin/fai/class_faiScript.inc:348 admin/fai/faiScriptEntry.tpl.c:20
+#: admin/fai/class_faiScript.inc:79
 msgid "Priority"
 msgstr "Priorytet"
 
-#: admin/fai/class_faiScript.inc:350
-msgid "Action"
-msgstr "Akcja"
+#: admin/fai/class_faiScript.inc:79
+msgid "Priority of this script (FIXME: less is done first?)"
+msgstr ""
+
+#: admin/fai/class_faiScript.inc:84
+msgid "The script itself"
+msgstr ""
 
-#: admin/fai/classSelect/selectClass-list.xml:36 admin/fai/fai-list.xml:88
-#: admin/fai/faiScriptEntry.tpl.c:14
-msgid "Properties"
-msgstr "WÅ‚aÅ›ciwoÅ›ci"
+#: admin/fai/class_faiTemplate.inc:136
+#, php-format
+msgid "There are several files with the same path: %s"
+msgstr ""
 
-#: admin/fai/class_faiTemplate.inc:501 admin/fai/fai-list.xml:116
+#: admin/fai/class_faiTemplate.inc:153
 msgid "Template"
 msgstr "Szablon"
 
-#: admin/fai/class_faiTemplate.inc:502 admin/fai/class_faiTemplate.inc:506
+#: admin/fai/class_faiTemplate.inc:154 admin/fai/class_faiTemplate.inc:157
 msgid "FAI template"
 msgstr "Szablon FAI"
 
-#: admin/fai/class_faiVariableEntry.inc:107
-msgid "Content"
+#: admin/fai/class_faiTemplate.inc:176
+msgid "Template class name"
 msgstr ""
 
-#: admin/fai/class_faiVariableEntry.inc:142
-msgid "Variable entry"
+#: admin/fai/class_faiTemplate.inc:186
+msgid "Template files"
 msgstr ""
 
-#: admin/fai/class_faiVariableEntry.inc:143
-msgid "FAI variable entry "
+#: admin/fai/class_faiTemplate.inc:190
+msgid "Template files in this class"
 msgstr ""
 
-#: admin/fai/class_faiVariableEntry.inc:151
-#: admin/fai/faiVariableEntry.tpl.c:20
-msgid "Variable content"
-msgstr "ZawartoÅ›Ä‡ zmiennych"
-
 #: admin/fai/class_faiPartition.inc:176 admin/fai/class_faiPartition.inc:180
 msgid "Logical"
 msgstr ""
@@ -950,96 +548,75 @@ msgstr ""
 msgid "btrfs"
 msgstr ""
 
-#: admin/fai/class_faiPartition.inc:224
-msgid "LVM/RAID"
-msgstr ""
-
-#: admin/fai/class_faiPartition.inc:327
+#: admin/fai/class_faiPartition.inc:325
 msgid "spare"
 msgstr ""
 
-#: admin/fai/class_faiPartition.inc:330
+#: admin/fai/class_faiPartition.inc:328
 msgid "missing"
 msgstr ""
 
-#: admin/fai/class_faiPartition.inc:333
+#: admin/fai/class_faiPartition.inc:331
 msgid "Options"
 msgstr "Opcje"
 
-#: admin/fai/class_faiPartition.inc:420
+#: admin/fai/class_faiPartition.inc:415
 msgid "Minimum partition size"
 msgstr ""
 
-#: admin/fai/class_faiPartition.inc:420
+#: admin/fai/class_faiPartition.inc:415
 msgid "Maximum partition size"
 msgstr ""
 
-#: admin/fai/class_faiPartition.inc:428
+#: admin/fai/class_faiPartition.inc:423
 msgid "Raid arrays must contain at least two partitions!"
 msgstr ""
 
-#: admin/fai/class_faiPartition.inc:430
+#: admin/fai/class_faiPartition.inc:425
 msgid ""
 "Raid 0 arrays can only be realized with a combination of two partitions!"
 msgstr ""
 
-#: admin/fai/class_faiHook.inc:332 admin/fai/class_faiHook.inc:334
-#: admin/fai/fai-list.xml:190 admin/fai/faiVariable.tpl.c:23
-#: admin/fai/faiVariable.tpl.c:26
-msgid "Edit"
-msgstr "Edytuj"
-
-#: admin/fai/class_faiHook.inc:336
-msgid "Delete"
-msgstr "UsuÅ„"
-
-#: admin/fai/class_faiHook.inc:521 admin/fai/fai-list.xml:128
+#: admin/fai/class_faiHook.inc:30
 msgid "Hook"
 msgstr "Zaczep"
 
-#: admin/fai/class_faiHook.inc:522 admin/fai/class_faiHook.inc:526
+#: admin/fai/class_faiHook.inc:31 admin/fai/class_faiHook.inc:34
 msgid "FAI hook"
 msgstr "Zaczep FAI"
 
-#: admin/fai/class_faiVariable.inc:387 admin/fai/fai-list.xml:134
+#: admin/fai/class_faiHook.inc:63
+msgid "Hooks"
+msgstr "Zaczepy"
+
+#: admin/fai/class_faiHook.inc:79
+msgid "Task"
+msgstr "Zadanie"
+
+#: admin/fai/class_faiHook.inc:87
+msgid "The script of this hook"
+msgstr ""
+
+#: admin/fai/class_faiVariable.inc:30
 msgid "Variable"
 msgstr "Zmienna"
 
-#: admin/fai/class_faiVariable.inc:388 admin/fai/class_faiVariable.inc:392
+#: admin/fai/class_faiVariable.inc:31 admin/fai/class_faiVariable.inc:34
 msgid "FAI variable"
 msgstr "Zmienna FAI"
 
-#: admin/fai/class_faiProfileEntry.inc:184 admin/fai/askClassName.tpl.c:11
-#: admin/fai/askClassName.tpl.c:17 admin/fai/paste_generic.tpl.c:5
-msgid "Class name"
-msgstr "Nazwa klasy"
-
-#: admin/fai/class_faiProfileEntry.inc:184 admin/fai/faiTemplate.tpl.c:14
-#: admin/fai/faiVariable.tpl.c:14 admin/fai/faiHook.tpl.c:14
-#: admin/fai/faiPartitionTable.tpl.c:17 admin/fai/faiScript.tpl.c:14
-msgid "Objects"
-msgstr "Obiekty"
-
-#: admin/fai/fai-list.xml:11
-msgid "List of deployment classes and products"
-msgstr ""
+#: admin/fai/class_faiVariable.inc:63
+msgid "Variables"
+msgstr "Zmienie"
 
-#: admin/fai/fai-list.xml:15
-msgid "partitionTable"
+#: admin/fai/class_faiVariable.inc:79
+msgid "Content"
 msgstr ""
 
-#: admin/fai/fai-list.xml:23
-msgid "packagelist"
+#: admin/fai/class_faiVariable.inc:79
+msgid "The content of the variable"
 msgstr ""
 
-#: admin/fai/fai-list.xml:93
-msgid "Actions"
-msgstr "Akcje"
-
-#: admin/fai/fai-list.xml:104
-msgid "Create"
-msgstr "UtwÃ³rz"
-
 #: admin/systems/class_faiLogView.inc:56
 msgid "Sort down"
 msgstr ""
@@ -1048,6 +625,10 @@ msgstr ""
 msgid "Sort up"
 msgstr ""
 
+#: admin/systems/class_faiLogView.inc:70
+msgid "File"
+msgstr "Plik"
+
 #: admin/systems/class_faiLogView.inc:71
 msgid "Date"
 msgstr "Data"
@@ -1082,7 +663,7 @@ msgstr ""
 msgid "Selected file: %s"
 msgstr ""
 
-#: admin/systems/class_faiStartup.inc:70 admin/fai/paste_generic.tpl.c:2
+#: admin/systems/class_faiStartup.inc:70
 msgid "FAI settings"
 msgstr ""
 
@@ -1102,11 +683,6 @@ msgstr ""
 msgid "FAI profil to be applied to this computer"
 msgstr ""
 
-#: admin/systems/class_faiStartup.inc:90 admin/fai/faiPackage.tpl.c:14
-#: admin/fai/faiPackage.tpl.c:17
-msgid "Repository"
-msgstr "Repozytorium"
-
 #: admin/systems/class_faiStartup.inc:90
 msgid "FAI Debian repository to be used for installation"
 msgstr ""
@@ -1131,85 +707,96 @@ msgstr ""
 msgid "Linux kernel parameters to be ran"
 msgstr ""
 
-#: admin/systems/class_faiStartup.inc:178
+#: admin/systems/class_faiStartup.inc:179
 msgid "Full automated installation"
 msgstr ""
 
-#: admin/systems/services/repository/class_serviceRepository.inc:31
+#: admin/systems/services/repository/class_serviceDebianRepository.inc:34
+#: admin/systems/services/repository/class_serviceCentosRepository.inc:31
+msgid "Repositories"
+msgstr ""
+
+#: admin/systems/services/repository/class_serviceDebianRepository.inc:39
+#: admin/systems/services/repository/class_serviceCentosRepository.inc:36
+msgid "Repositories this server hosts"
+msgstr ""
+
+#: admin/systems/services/repository/class_serviceDebianRepository.inc:43
+#: admin/systems/services/repository/class_serviceCentosRepository.inc:40
 msgid "URL"
 msgstr "URL"
 
-#: admin/systems/services/repository/class_serviceRepository.inc:31
+#: admin/systems/services/repository/class_serviceDebianRepository.inc:43
+#: admin/systems/services/repository/class_serviceCentosRepository.inc:40
 msgid "Repository url"
 msgstr ""
 
-#: admin/systems/services/repository/class_serviceRepository.inc:35
+#: admin/systems/services/repository/class_serviceDebianRepository.inc:47
+#: admin/systems/services/repository/class_serviceCentosRepository.inc:44
 msgid "Parent server"
 msgstr ""
 
-#: admin/systems/services/repository/class_serviceRepository.inc:35
+#: admin/systems/services/repository/class_serviceDebianRepository.inc:47
+#: admin/systems/services/repository/class_serviceCentosRepository.inc:44
 msgid "Parent repository server"
 msgstr ""
 
-#: admin/systems/services/repository/class_serviceRepository.inc:40
-msgid "Release used on this repository"
+#: admin/systems/services/repository/class_serviceDebianRepository.inc:52
+msgid "Debian release used on this repository"
 msgstr ""
 
-#: admin/systems/services/repository/class_serviceRepository.inc:47
-msgid "Sections"
-msgstr ""
-
-#: admin/systems/services/repository/class_serviceRepository.inc:47
-msgid "Sections available on this repository"
+#: admin/systems/services/repository/class_serviceDebianRepository.inc:58
+msgid "Debian sections available on this repository"
 msgstr ""
 
-#: admin/systems/services/repository/class_serviceRepository.inc:52
+#: admin/systems/services/repository/class_serviceDebianRepository.inc:63
+#: admin/systems/services/repository/class_serviceCentosRepository.inc:57
 msgid "Mirror mode"
 msgstr ""
 
-#: admin/systems/services/repository/class_serviceRepository.inc:52
+#: admin/systems/services/repository/class_serviceDebianRepository.inc:63
+#: admin/systems/services/repository/class_serviceCentosRepository.inc:57
 msgid ""
 "Is this mirror an installation repository? Is its release a custom one?"
 msgstr ""
 
-#: admin/systems/services/repository/class_serviceRepository.inc:57
+#: admin/systems/services/repository/class_serviceDebianRepository.inc:68
+#: admin/systems/services/repository/class_serviceCentosRepository.inc:62
 msgid "Local mirror"
 msgstr ""
 
-#: admin/systems/services/repository/class_serviceRepository.inc:57
+#: admin/systems/services/repository/class_serviceDebianRepository.inc:68
+#: admin/systems/services/repository/class_serviceCentosRepository.inc:62
 msgid "Is this mirror a local or a network mirror?"
 msgstr ""
 
-#: admin/systems/services/repository/class_serviceRepository.inc:66
+#: admin/systems/services/repository/class_serviceDebianRepository.inc:77
+#: admin/systems/services/repository/class_serviceCentosRepository.inc:71
 msgid "Architectures"
 msgstr ""
 
-#: admin/systems/services/repository/class_serviceRepository.inc:66
+#: admin/systems/services/repository/class_serviceDebianRepository.inc:77
+#: admin/systems/services/repository/class_serviceCentosRepository.inc:71
 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:140
-msgid "Repositories"
+#: admin/systems/services/repository/class_serviceDebianRepository.inc:99
+#: admin/systems/services/repository/class_serviceDebianRepository.inc:100
+msgid "Debian repository"
 msgstr ""
 
-#: admin/systems/services/repository/class_serviceRepository.inc:145
-msgid "Repositories this server hosts"
-msgstr ""
+#: admin/systems/services/repository/class_serviceDebianRepository.inc:100
+#: admin/systems/services/repository/class_serviceCentosRepository.inc:96
+msgid "Services"
+msgstr "UsÅ‚ugi"
 
-#: admin/systems/services/repository/class_serviceRepository.inc:160
-msgid "Package repository"
+#: admin/systems/services/repository/class_serviceCentosRepository.inc:49
+msgid "Centos release used on this repository"
 msgstr ""
 
-#: admin/systems/services/repository/class_serviceRepository.inc:161
-msgid "Package repository information"
+#: admin/systems/services/repository/class_serviceCentosRepository.inc:95
+#: admin/systems/services/repository/class_serviceCentosRepository.inc:96
+msgid "Centos repository"
 msgstr ""
 
 #: config/fai/class_faiConfig.inc:28
@@ -1241,476 +828,3 @@ msgstr ""
 #: config/fai/class_faiConfig.inc:60
 msgid "s"
 msgstr ""
-
-#: admin/fai/faiPartitionTableEntry.tpl.c:2 admin/fai/faiVariableEntry.tpl.c:2
-#: admin/fai/faiVariableEntry.tpl.c:5 admin/fai/faiDiskEntry.tpl.c:2
-#: admin/fai/faiTemplate.tpl.c:2 admin/fai/faiTemplate.tpl.c:5
-#: admin/fai/faiVariable.tpl.c:2 admin/fai/faiVariable.tpl.c:5
-#: admin/fai/faiHook.tpl.c:2 admin/fai/faiHook.tpl.c:5
-#: admin/fai/faiPackage.tpl.c:2 admin/fai/faiPackage.tpl.c:5
-#: admin/fai/faiTemplateEntry.tpl.c:2 admin/fai/faiTemplateEntry.tpl.c:5
-#: admin/fai/faiScriptEntry.tpl.c:2 admin/fai/faiScriptEntry.tpl.c:5
-#: admin/fai/faiPartitionTable.tpl.c:2 admin/fai/faiPartitionTable.tpl.c:5
-#: admin/fai/faiScript.tpl.c:2 admin/fai/faiScript.tpl.c:5
-#: admin/fai/faiProfile.tpl.c:2 admin/fai/faiProfile.tpl.c:5
-#: admin/fai/faiProfile.tpl.c:14 admin/fai/faiHookEntry.tpl.c:2
-#: admin/fai/faiHookEntry.tpl.c:5
-msgid "Generic"
-msgstr "OgÃ³lne"
-
-#: admin/fai/faiPartitionTableEntry.tpl.c:14
-#: admin/fai/faiPartitionTableEntry.tpl.c:17 admin/fai/faiDiskEntry.tpl.c:23
-#: admin/fai/faiDiskEntry.tpl.c:26
-msgid "Partition entries"
-msgstr "Partycje"
-
-#: admin/fai/faiPartitionTableEntry.tpl.c:20
-#: admin/fai/faiPartitionTableEntry.tpl.c:23 admin/fai/faiDiskEntry.tpl.c:29
-#: admin/fai/faiDiskEntry.tpl.c:32
-msgid "Add partition"
-msgstr "Dodaj partycje"
-
-#: admin/fai/branch_selector.tpl.c:2
-msgid "Releases"
-msgstr ""
-
-#: admin/fai/branch_selector.tpl.c:5
-msgid "Current release"
-msgstr "Obecne wydanie"
-
-#: admin/fai/branch_selector.tpl.c:8 admin/fai/branch_selector.tpl.c:17
-#: admin/fai/fai-filter.tpl.c:8 admin/fai/fai-filter.tpl.c:17
-msgid "Create release"
-msgstr ""
-
-#: admin/fai/branch_selector.tpl.c:11 admin/fai/branch_selector.tpl.c:23
-#: admin/fai/fai-filter.tpl.c:11 admin/fai/fai-filter.tpl.c:23
-msgid "Create read-only release"
-msgstr ""
-
-#: admin/fai/branch_selector.tpl.c:20 admin/fai/fai-filter.tpl.c:20
-msgid "Freeze"
-msgstr ""
-
-#: admin/fai/branch_selector.tpl.c:26 admin/fai/fai-filter.tpl.c:26
-msgid "Delete current release"
-msgstr "UsuÅ„ bieÅ¼Ä…ce wydanie"
-
-#: admin/fai/faiPartition.tpl.c:2
-msgid "Partition"
-msgstr ""
-
-#: admin/fai/faiPartition.tpl.c:17
-msgid "Resize existing partition"
-msgstr ""
-
-#: admin/fai/faiPartition.tpl.c:20
-msgid "Bootable"
-msgstr ""
-
-#: admin/fai/faiPartition.tpl.c:26 admin/fai/faiDiskEntry.tpl.c:20
-msgid "Combined physical partitions"
-msgstr ""
-
-#: admin/fai/faiPartition.tpl.c:29
-msgid "Toggle missing"
-msgstr ""
-
-#: admin/fai/faiPartition.tpl.c:32
-msgid "Toggle spare"
-msgstr ""
-
-#: admin/fai/faiPartition.tpl.c:35
-msgid "Filesystem"
-msgstr ""
-
-#: admin/fai/faiPartition.tpl.c:38
-msgid "Filesystem create options"
-msgstr ""
-
-#: admin/fai/faiPartition.tpl.c:41
-msgid "Encrypted"
-msgstr ""
-
-#: admin/fai/faiPartition.tpl.c:44
-msgid "Tune options"
-msgstr ""
-
-#: admin/fai/faiNewBranch.tpl.c:2
-msgid ""
-"You are now going to create a branch or locked branch. This action clones "
-"the existing release to another release name. Branches can be modified as "
-"usual. FAI classes of locked branches cannot be modified, just additional "
-"classes are possible. Branch names should be alphanumeric, excluding the "
-"reserved names 'scripts', 'hooks', 'partitions', 'variables', 'templates' "
-"and 'fai'."
-msgstr "Zamierzasz utworzyÄ‡ gaÅ‚Ä…Åº lub zablokowanÄ… gaÅ‚Ä…Åº. Ta akcja klonuje istniejÄ…ce wydanie do innej nazwy wydania. GaÅ‚Ä™zie mogÄ… byÄ‡ zwyczajnie modyfikowane. Klasy FAI zablokowanych gaÅ‚Ä™zi nie mogÄ… byÄ‡ modyfikowane, moÅ¼na tylko dodawaÄ‡ klasy. Nazwy gaÅ‚Ä™zi powinny skÅ‚adaÄ‡ siÄ™ ze znakÃ³w alfanumerycznych i nie zawieraÄ‡ zarezerwowanych nazw 'scripts', 'hooks', 'partitions', 'variables', 'templates', oraz 'fai'."
-
-#: admin/fai/faiNewBranch.tpl.c:5
-msgid ""
-"Branches are created as subreleases of the currently selected branch. "
-"Creating a new branch named 1.0.2 in SARGE for example, will result in a new"
-" release called SARGE/1.0.2."
-msgstr ""
-
-#: admin/fai/faiNewBranch.tpl.c:8
-msgid "Please enter a name for the branch"
-msgstr "ProszÄ™ podaÄ‡ nazwÄ™ gaÅ‚Ä™zi"
-
-#: admin/fai/faiNewBranch.tpl.c:11
-msgid "Processing the requested operation"
-msgstr "Przetwarzam zadanÄ… operacjÄ™"
-
-#: admin/fai/faiNewBranch.tpl.c:14
-msgid ""
-"As soon as the copy operation has finished, you can scroll down to end of "
-"the page and press the 'Continue' button to continue with the fai management"
-" dialog."
-msgstr "Jak tylko operacja kopiowania zakoÅ„czy siÄ™, moÅ¼na przewinÄ…Ä‡ stronÄ™ na dÃ³Å‚ i nacisnÄ…Ä‡ przycisk 'Kontynuuj' aby przejÅ›Ä‡ do dialogu zarzÄ…dzania FAI."
-
-#: admin/fai/faiNewBranch.tpl.c:17
-msgid ""
-"Your browser doesn't support iframes, please use this link to perform the "
-"requested operation."
-msgstr "Twoja przeglÄ…darka nie obsÅ‚uguje iframes, proszÄ™ uÅ¼yÄ‡ tego linku aby wykonaÄ‡ Å¼Ä…danÄ… operacjÄ™."
-
-#: admin/fai/faiNewBranch.tpl.c:20
-msgid "Perform requested operation."
-msgstr "Wykonaj Å¼Ä…danÄ… operacjÄ™."
-
-#: admin/fai/faiNewBranch.tpl.c:23
-msgid "Initiate operation"
-msgstr "Zainicjiuj operacjÄ™"
-
-#: admin/fai/faiVariableEntry.tpl.c:14 admin/fai/faiVariableEntry.tpl.c:17
-msgid "Variable attributes"
-msgstr "Atrybuty zmiennych"
-
-#: admin/fai/faiDiskEntry.tpl.c:11
-msgid "fstab key"
-msgstr ""
-
-#: admin/fai/faiDiskEntry.tpl.c:17
-msgid "Disk label"
-msgstr ""
-
-#: admin/fai/faiTemplate.tpl.c:17
-msgid "List of template files"
-msgstr "Lista plikÃ³w szablonÃ³w"
-
-#: admin/fai/faiVariable.tpl.c:17
-msgid "List of assigned variables"
-msgstr "Lista przypisanych zmiennych"
-
-#: admin/fai/faiVariable.tpl.c:20
-msgid "Choose a variable to delete or edit"
-msgstr "Wybierz zmiennÄ… do usuniÄ™cia lub edycji"
-
-#: admin/fai/askClassName.tpl.c:2
-msgid ""
-"Adding a new class to the FAI management, requires a class name. You have to"
-" specify a unique class name for unique types of FAI classes, while you can "
-"use the same class name for different types of FAI classes. In the laste "
-"case, FAI will automatically enclose all these different class types to one "
-"unique class name."
-msgstr "Dodawanie nowej klasy do zarzÄ…dzania FAI wymaga nazwy klasy. NaleÅ¼y podaÄ‡ unikalnÄ… nazwÄ™ klasy dla unikalnych typÃ³w klas FAI, podczas gdy moÅ¼na uÅ¼yÄ‡ tej samej nazwy klasy dla rÃ³Å¼nych typÃ³w klas FAI. W ostatnim przypadku, FAI automatycznie poÅ‚Ä…czy wszystkie rÃ³Å¼ne typy klas w jednÄ… unikalnÄ… nazwÄ™ klasy."
-
-#: admin/fai/askClassName.tpl.c:5
-msgid ""
-"Please use one of the following methods to choose the name for the new FAI "
-"class."
-msgstr "ProszÄ™ uÅ¼yÄ‡ jednÄ… z poniÅ¼szych metod dla wybrania nazwy nowej klasy FAI."
-
-#: admin/fai/askClassName.tpl.c:8
-msgid "Enter FAI class name manually"
-msgstr "Podaj nazwÄ™ klasy FAI rÄ™cznie"
-
-#: admin/fai/askClassName.tpl.c:14
-msgid "Choose FAI class name from a list of existing classes"
-msgstr "Wybierz nazwÄ™ klasy FAI z listy istniejÄ…cych klas"
-
-#: admin/fai/askClassName.tpl.c:20
-msgid "Choose class name"
-msgstr "Wybierz nazwÄ™ klasy"
-
-#: admin/fai/faiGroupHandle.tpl.c:2
-msgid "Please select the objects you want to remove:"
-msgstr ""
-
-#: admin/fai/faiGroupHandle.tpl.c:5
-msgid "Freezed"
-msgstr ""
-
-#: admin/fai/faiGroupHandle.tpl.c:8
-msgid "Select the object you want to edit:"
-msgstr ""
-
-#: admin/fai/faiGroupHandle.tpl.c:11
-msgid "Select the object you want to copy:"
-msgstr ""
-
-#: admin/fai/remove.tpl.c:5
-msgid ""
-"This includes all account data, system access rules, imap settings, etc. for"
-" this user. Please double check if your really want to do this since there "
-"is no way for FusionDirectory to get your data back."
-msgstr ""
-
-#: admin/fai/remove.tpl.c:8 admin/fai/remove_branch.tpl.c:8
-msgid "So - if you're sure - press 'Delete' to continue or 'Cancel' to abort."
-msgstr "JeÅ›li jesteÅ› pewien - naciÅ›nij 'UsuÅ„' aby kontynuowaÄ‡ lub 'Anuluj' aby anulowaÄ‡."
-
-#: admin/fai/faiHook.tpl.c:17
-msgid "List of hook scripts"
-msgstr "Lista zaczepionych slryptÃ³w"
-
-#: admin/fai/packageSelect/selectPackage-list.tpl.c:2
-#: admin/fai/classSelect/selectClass-list.tpl.c:5
-msgid "Update"
-msgstr "Aktualizuj"
-
-#: admin/fai/packageSelect/selectPackage-list.tpl.c:5
-#: admin/fai/classSelect/selectClass-list.tpl.c:8
-msgid "Submit"
-msgstr "WyÅ›lij"
-
-#: admin/fai/packageSelect/selectPackage-filter.tpl.c:2
-#: admin/fai/classSelect/selectClass-filter.tpl.c:2
-#: admin/fai/fai-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/remove_branch.tpl.c:5
-msgid ""
-"This includes all account data, system access, etc. for this branch. Please "
-"double check if your really want to do this since there is no way for "
-"FusionDirectory to get your data back."
-msgstr ""
-
-#: admin/fai/faiPackage.tpl.c:26
-msgid "Install method"
-msgstr "Metoda instalacji"
-
-#: admin/fai/faiPackage.tpl.c:29
-msgid "Please select the installation method"
-msgstr ""
-
-#: admin/fai/faiPackage.tpl.c:32 admin/fai/faiPackage.tpl.c:35
-msgid "Used packages"
-msgstr "UÅ¼yte pakiety"
-
-#: admin/fai/faiPackage.tpl.c:38
-msgid "Add from list"
-msgstr ""
-
-#: admin/fai/faiProfileEntry.tpl.c:2
-msgid "List of FAI objects (Fully Automatic Installation)"
-msgstr "Lista obiektÃ³w FAI (Fully Automatic Installation)"
-
-#: admin/fai/faiProfileEntry.tpl.c:5
-msgid "Information"
-msgstr "Informacja"
-
-#: admin/fai/faiProfileEntry.tpl.c:8
-msgid ""
-"This menu allows you to select FAI class names and to add them to the "
-"currently edited profile."
-msgstr "To menu umoÅ¼liwia wybÃ³r nazw klas FAI i dodawania ich do obecnie edytowanego profilu."
-
-#: admin/fai/faiProfileEntry.tpl.c:11
-msgid "Filters"
-msgstr "Filtry"
-
-#: admin/fai/faiProfileEntry.tpl.c:14
-msgid "Show only classes with templates"
-msgstr "PokaÅ¼ tylko klasy z szablonami"
-
-#: admin/fai/faiProfileEntry.tpl.c:17
-msgid "Show only classes with scripts"
-msgstr "PokaÅ¼ tylko klasy ze skryptami"
-
-#: admin/fai/faiProfileEntry.tpl.c:20
-msgid "Show only classes with hooks"
-msgstr "PokaÅ¼ tylko klasy z zaczepami"
-
-#: admin/fai/faiProfileEntry.tpl.c:23
-msgid "Show only classes with variables"
-msgstr "PokaÅ¼ tylko klasy ze zmiennymi"
-
-#: admin/fai/faiProfileEntry.tpl.c:26
-msgid "Show only classes with packages"
-msgstr "PokaÅ¼ tylko klasy z pakietami"
-
-#: admin/fai/faiProfileEntry.tpl.c:29
-msgid "Show only classes with partitions"
-msgstr "PokaÅ¼ tylko klasy z partycjami"
-
-#: admin/fai/faiProfileEntry.tpl.c:32 admin/fai/faiProfileEntry.tpl.c:35
-msgid "Display objects matching"
-msgstr "WyÅ›wietl obiekty pasujÄ…ce"
-
-#: admin/fai/faiProfileEntry.tpl.c:38
-msgid "Regular expression for matching object names"
-msgstr "WyraÅ¼enie regularne dla dopasowania nazw obiektÃ³w"
-
-#: admin/fai/faiTemplateEntry.tpl.c:17 admin/fai/faiTemplateEntry.tpl.c:20
-msgid "Template attributes"
-msgstr "Atrybuty szablonu"
-
-#: admin/fai/faiTemplateEntry.tpl.c:26 admin/fai/faiTemplateEntry.tpl.c:29
-msgid "Save template"
-msgstr "Zapisz szablon"
-
-#: admin/fai/faiTemplateEntry.tpl.c:32 admin/fai/faiTemplateEntry.tpl.c:35
-msgid "Edit template"
-msgstr ""
-
-#: admin/fai/faiTemplateEntry.tpl.c:38
-msgid "Full path"
-msgstr ""
-
-#: admin/fai/faiTemplateEntry.tpl.c:41
-msgid "Upload"
-msgstr "Wgraj"
-
-#: admin/fai/faiTemplateEntry.tpl.c:44
-msgid "Owner"
-msgstr "WÅ‚aÅ›ciciel"
-
-#: admin/fai/faiTemplateEntry.tpl.c:50
-msgid "Access"
-msgstr "DostÄ™p"
-
-#: admin/fai/faiTemplateEntry.tpl.c:53
-msgid "Class"
-msgstr "Klasa"
-
-#: admin/fai/faiTemplateEntry.tpl.c:56
-msgid "Read"
-msgstr "Odczyt"
-
-#: admin/fai/faiTemplateEntry.tpl.c:59
-msgid "Write"
-msgstr "Zapis"
-
-#: admin/fai/faiTemplateEntry.tpl.c:62
-msgid "Execute"
-msgstr "Uruchom"
-
-#: admin/fai/faiTemplateEntry.tpl.c:65
-msgid "Special"
-msgstr "Specjalne"
-
-#: admin/fai/faiTemplateEntry.tpl.c:71
-msgid "SUID"
-msgstr "SUID"
-
-#: admin/fai/faiTemplateEntry.tpl.c:77
-msgid "SGID"
-msgstr "SGID"
-
-#: admin/fai/faiTemplateEntry.tpl.c:80
-msgid "Others"
-msgstr "Inne"
-
-#: admin/fai/faiTemplateEntry.tpl.c:83
-msgid "sticky"
-msgstr "sticky"
-
-#: admin/fai/faiScriptEntry.tpl.c:17 admin/fai/faiScriptEntry.tpl.c:26
-msgid "Script attributes"
-msgstr "Atrybuty skryptu"
-
-#: admin/fai/faiScriptEntry.tpl.c:23
-msgid ""
-"Choose a priority. Low values result in an earlier, high values in a later "
-"execution."
-msgstr ""
-
-#: admin/fai/faiScriptEntry.tpl.c:32 admin/fai/faiHookEntry.tpl.c:32
-msgid "Import script"
-msgstr "Importuj skrypt"
-
-#: admin/fai/classSelect/selectClass-list.tpl.c:2
-msgid "Base"
-msgstr "Kontener"
-
-#: admin/fai/fai-filter.tpl.c:29
-msgid "Show profiles"
-msgstr "PokaÅ¼ profile"
-
-#: admin/fai/fai-filter.tpl.c:32
-msgid "Show templates"
-msgstr "PokaÅ¼ szablony"
-
-#: admin/fai/fai-filter.tpl.c:35
-msgid "Show scripts"
-msgstr "PokaÅ¼ skrypty"
-
-#: admin/fai/fai-filter.tpl.c:38
-msgid "Show hooks"
-msgstr "PokaÅ¼ zaczepy"
-
-#: admin/fai/fai-filter.tpl.c:41
-msgid "Show variables"
-msgstr "PokaÅ¼ zmienne"
-
-#: admin/fai/fai-filter.tpl.c:44
-msgid "Show packages"
-msgstr "PokaÅ¼ pakiety"
-
-#: admin/fai/fai-filter.tpl.c:47
-msgid "Show partitions"
-msgstr ""
-
-#: admin/fai/faiTemplateEdit.tpl.c:2
-msgid "This FAI template is write protected. Editing may break it!"
-msgstr ""
-
-#: admin/fai/faiTemplateEdit.tpl.c:5
-msgid "Edit anyway"
-msgstr "Edytuj mimo wszystko"
-
-#: admin/fai/faiPartitionTable.tpl.c:14
-msgid "Use 'setup-storage' to partition the disk"
-msgstr ""
-
-#: admin/fai/faiPartitionTable.tpl.c:20
-msgid "Discs"
-msgstr "Dyski"
-
-#: admin/fai/faiPartitionTable.tpl.c:23 admin/fai/faiPartitionTable.tpl.c:26
-#: admin/fai/faiPartitionTable.tpl.c:41 admin/fai/faiPartitionTable.tpl.c:44
-msgid "Add disk"
-msgstr ""
-
-#: admin/fai/faiPartitionTable.tpl.c:29 admin/fai/faiPartitionTable.tpl.c:32
-#: admin/fai/faiPartitionTable.tpl.c:47 admin/fai/faiPartitionTable.tpl.c:50
-msgid "Add RAID"
-msgstr ""
-
-#: admin/fai/faiPartitionTable.tpl.c:35 admin/fai/faiPartitionTable.tpl.c:38
-#: admin/fai/faiPartitionTable.tpl.c:53 admin/fai/faiPartitionTable.tpl.c:56
-msgid "Add volume group"
-msgstr ""
-
-#: admin/fai/faiScript.tpl.c:17
-msgid "List of scripts"
-msgstr "Lista skryptÃ³w"
-
-#: admin/fai/faiProfile.tpl.c:20
-msgid "Choose a priority"
-msgstr "Wybierz priorytet"
-
-#: admin/fai/faiHookEntry.tpl.c:14 admin/fai/faiHookEntry.tpl.c:17
-#: admin/fai/faiHookEntry.tpl.c:26
-msgid "Hook attributes"
-msgstr "Atrybuty zaczepu"
-
-#: admin/fai/faiHookEntry.tpl.c:23
-msgid "Choose an existing FAI task"
-msgstr "ProszÄ™ wybraÄ‡ istniejÄ…ce zadanie FAI"
diff --git a/fai/locale/pt/fusiondirectory.po b/fai/locale/pt/fusiondirectory.po
index d801ab8e1da31962c78e3401000f2dc6d289cfe9..3f035d2775e4bcae81f7bd52fcfa01d51177625d 100644
--- a/fai/locale/pt/fusiondirectory.po
+++ b/fai/locale/pt/fusiondirectory.po
@@ -5,379 +5,188 @@
 # Translators:
 msgid ""
 msgstr ""
-"Project-Id-Version: FusionDirectory-108\n"
+"Project-Id-Version: FusionDirectory-109\n"
 "Report-Msgid-Bugs-To: documentation@lists.fusiondirectory.org\n"
-"POT-Creation-Date: 2015-03-19 21:45+0100\n"
-"PO-Revision-Date: 2015-02-25 16:12+0000\n"
+"POT-Creation-Date: 2014-12-15 17:47+0100\n"
+"PO-Revision-Date: 2015-02-25 16:04+0000\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>\n"
-"Language-Team: Portuguese (http://www.transifex.com/projects/p/FusionDirectory-108/language/pt/)\n"
+"Language-Team: Portuguese (http://www.transifex.com/projects/p/FusionDirectory-109/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/fai/class_faiScriptEntry.inc:79 admin/fai/class_faiScriptEntry.inc:82
-#: admin/fai/class_faiManagement.inc:240 admin/fai/class_faiManagement.inc:768
-#: admin/fai/class_faiManagement.inc:774
-#: admin/fai/class_faiPartitionTable.inc:268
-#: admin/fai/class_faiPartitionTable.inc:331
-#: admin/fai/class_faiDiskEntry.inc:445 admin/fai/class_FAI.inc:570
-#: admin/fai/class_faiHookEntry.inc:83 admin/fai/class_faiHookEntry.inc:86
-#: admin/fai/class_faiScript.inc:249 admin/fai/class_faiTemplate.inc:232
-#: admin/fai/class_faiHook.inc:259 admin/fai/class_faiVariable.inc:162
-#: admin/systems/class_faiLogView.inc:207
-#: admin/systems/class_faiLogView.inc:242
-msgid "Error"
-msgstr "Erro"
-
-#: admin/fai/class_faiScriptEntry.inc:82 admin/fai/class_faiHookEntry.inc:86
-msgid "file is empty"
-msgstr ""
-
-#: admin/fai/class_faiScriptEntry.inc:102 admin/fai/class_faiHookEntry.inc:102
-#: admin/fai/class_faiScript.inc:349 admin/fai/class_faiScript.inc:374
-#: admin/fai/class_faiTemplate.inc:320 admin/fai/class_faiHook.inc:346
-msgid "Download"
-msgstr ""
-
-#: admin/fai/class_faiScriptEntry.inc:147
-#: admin/fai/class_faiScriptEntry.inc:151
-#: admin/fai/class_faiScriptEntry.inc:154
-#: admin/fai/class_faiScriptEntry.inc:197
-#: admin/fai/class_faiManagement.inc:768 admin/fai/class_faiManagement.inc:774
-#: admin/fai/class_faiPackage.inc:685
-#: admin/fai/class_faiPartitionTable.inc:779
-#: admin/fai/class_faiDiskEntry.inc:702 admin/fai/class_faiDiskEntry.inc:705
-#: admin/fai/class_faiDiskEntry.inc:758
-#: admin/fai/class_faiTemplateEntry.inc:247
-#: admin/fai/class_faiTemplateEntry.inc:312
-#: admin/fai/class_faiPartitionTableEntry.inc:353
-#: admin/fai/class_faiPartitionTableEntry.inc:356
-#: admin/fai/class_faiPartitionTableEntry.inc:360
-#: admin/fai/class_faiPartitionTableEntry.inc:455
-#: admin/fai/packageSelect/selectPackage-list.xml:40
-#: admin/fai/class_faiProfile.inc:414 admin/fai/class_faiProfile.inc:463
-#: admin/fai/class_faiHookEntry.inc:157 admin/fai/class_faiHookEntry.inc:162
-#: admin/fai/class_faiHookEntry.inc:165 admin/fai/class_faiHookEntry.inc:207
-#: admin/fai/class_askClassName.inc:163 admin/fai/class_askClassName.inc:167
-#: admin/fai/class_askClassName.inc:171 admin/fai/class_askClassName.inc:198
-#: admin/fai/class_faiScript.inc:347 admin/fai/class_faiScript.inc:605
-#: admin/fai/classSelect/selectClass-list.xml:28
-#: admin/fai/class_faiTemplate.inc:512
-#: admin/fai/class_faiVariableEntry.inc:103
-#: admin/fai/class_faiVariableEntry.inc:112
-#: admin/fai/class_faiVariableEntry.inc:115
-#: admin/fai/class_faiVariableEntry.inc:149 admin/fai/class_faiHook.inc:531
-#: admin/fai/class_faiVariable.inc:398 admin/fai/fai-list.xml:80
-#: admin/fai/faiPartitionTableEntry.tpl.c:8 admin/fai/faiPartition.tpl.c:5
-#: admin/fai/faiVariableEntry.tpl.c:8 admin/fai/faiDiskEntry.tpl.c:8
-#: admin/fai/faiTemplate.tpl.c:8 admin/fai/faiVariable.tpl.c:8
-#: admin/fai/faiHook.tpl.c:8
-#: admin/fai/packageSelect/selectPackage-filter.tpl.c:8
-#: admin/fai/faiPackage.tpl.c:8 admin/fai/faiScriptEntry.tpl.c:8
-#: admin/fai/classSelect/selectClass-filter.tpl.c:5
-#: admin/fai/fai-filter.tpl.c:50 admin/fai/faiPartitionTable.tpl.c:8
-#: admin/fai/faiScript.tpl.c:8 admin/fai/faiProfile.tpl.c:8
-#: admin/fai/faiHookEntry.tpl.c:8
-msgid "Name"
-msgstr "Nome"
-
-#: admin/fai/class_faiScriptEntry.inc:159 admin/fai/class_faiHookEntry.inc:170
-#: admin/fai/class_faiScript.inc:594 admin/fai/fai-list.xml:122
-#: admin/fai/faiScriptEntry.tpl.c:29 admin/fai/faiHookEntry.tpl.c:29
-msgid "Script"
-msgstr ""
-
-#: admin/fai/class_faiScriptEntry.inc:190
-#: admin/fai/class_faiScriptEntry.inc:199
-msgid "Script entry"
-msgstr ""
-
-#: admin/fai/class_faiScriptEntry.inc:191
-msgid "FAI script entry"
-msgstr ""
-
-#: admin/fai/class_faiScriptEntry.inc:198 admin/fai/class_faiPackage.inc:686
-#: admin/fai/class_faiPartitionTable.inc:780
-#: admin/fai/class_faiDiskEntry.inc:759
-#: admin/fai/class_faiTemplateEntry.inc:313
-#: admin/fai/class_faiPartitionTableEntry.inc:456
-#: admin/fai/class_faiProfile.inc:464 admin/fai/class_faiHookEntry.inc:208
-#: admin/fai/class_faiScript.inc:606 admin/fai/class_faiTemplate.inc:513
-#: admin/fai/class_faiVariableEntry.inc:150 admin/fai/class_faiHook.inc:532
-#: admin/fai/class_faiVariable.inc:399
-#: admin/fai/faiPartitionTableEntry.tpl.c:11 admin/fai/faiPartition.tpl.c:11
-#: admin/fai/faiVariableEntry.tpl.c:11 admin/fai/faiDiskEntry.tpl.c:14
-#: admin/fai/faiTemplate.tpl.c:11 admin/fai/faiVariable.tpl.c:11
-#: admin/fai/faiHook.tpl.c:11 admin/fai/faiPackage.tpl.c:11
-#: admin/fai/faiTemplateEntry.tpl.c:14 admin/fai/faiScriptEntry.tpl.c:11
-#: admin/fai/faiPartitionTable.tpl.c:11 admin/fai/faiScript.tpl.c:11
-#: admin/fai/faiProfile.tpl.c:11 admin/fai/faiHookEntry.tpl.c:11
-msgid "Description"
-msgstr "DescriÃ§Ã£o"
-
-#: admin/fai/class_faiScriptEntry.inc:200
-msgid "Script Priority"
-msgstr ""
-
-#: admin/fai/class_faiManagement.inc:188
-msgid "partition table"
-msgstr ""
-
-#: admin/fai/class_faiManagement.inc:189 admin/fai/fai-list.xml:31
-msgid "script"
-msgstr ""
-
-#: admin/fai/class_faiManagement.inc:190 admin/fai/fai-list.xml:47
-msgid "hook"
-msgstr ""
-
-#: admin/fai/class_faiManagement.inc:191 admin/fai/fai-list.xml:39
-msgid "variable"
-msgstr ""
-
-#: admin/fai/class_faiManagement.inc:192 admin/fai/fai-list.xml:63
-msgid "template"
-msgstr ""
-
-#: admin/fai/class_faiManagement.inc:193
-msgid "package list"
-msgstr ""
-
-#: admin/fai/class_faiManagement.inc:210 admin/fai/class_faiManagement.inc:226
-#: admin/fai/class_faiManagement.inc:332 admin/fai/class_faiManagement.inc:390
-#: admin/fai/class_faiManagement.inc:480 admin/fai/class_faiManagement.inc:575
-#: admin/fai/class_faiManagement.inc:598 admin/fai/class_faiManagement.inc:619
-msgid "Permission error"
-msgstr ""
-
-#: admin/fai/class_faiManagement.inc:211 admin/fai/class_faiManagement.inc:226
-#, php-format
-msgid "You have no permission to create a new %s!"
-msgstr ""
-
-#: admin/fai/class_faiManagement.inc:226 admin/fai/fai-list.xml:55
-msgid "profile"
-msgstr ""
-
-#: admin/fai/class_faiManagement.inc:328
-msgid "Branch locked"
-msgstr ""
-
-#: admin/fai/class_faiManagement.inc:329
-#, php-format
-msgid "The following entries are locked, you can't remove them %s."
-msgstr ""
-
-#: admin/fai/class_faiManagement.inc:346
-msgid "FAI object"
-msgstr ""
-
-#: admin/fai/class_faiManagement.inc:477
-msgid "FAI branch/freeze"
-msgstr ""
-
-#: admin/fai/class_faiManagement.inc:480
-msgid "You have no permission to delete this release!"
-msgstr ""
-
-#: admin/fai/class_faiManagement.inc:496 admin/fai/remove.tpl.c:2
-#: admin/fai/remove_branch.tpl.c:2
-msgid "Warning"
-msgstr "AtenÃ§Ã£o"
-
-#: admin/fai/class_faiManagement.inc:496
-msgid "Release remove aborted because the release name check failed!"
-msgstr ""
-
-#: admin/fai/class_faiManagement.inc:573 admin/fai/class_faiManagement.inc:596
-msgid "Configuration"
-msgstr "ConfiguraÃ§Ã£o"
-
-#: admin/fai/class_faiManagement.inc:575 admin/fai/class_faiManagement.inc:598
-#: admin/fai/class_faiManagement.inc:619
-msgid "Branch"
+#: admin/fai/class_faiManagement.inc:117 admin/fai/class_faiManagement.inc:122
+#: admin/fai/packageSelect/selectPackage-list.xml:14
+#: admin/systems/class_faiStartup.inc:178 config/fai/class_faiConfig.inc:41
+msgid "FAI"
 msgstr ""
 
-#: admin/fai/class_faiManagement.inc:725 admin/fai/askClassName.tpl.c:23
-msgid "Continue"
-msgstr "Continuar"
-
-#: admin/fai/class_faiManagement.inc:926
-#: admin/fai/class_faiPartitionTable.inc:768
-#: admin/fai/class_faiProfile.inc:318 admin/fai/class_askClassName.inc:99
-#: admin/fai/classSelect/class_classSelect.inc:58
-#: admin/fai/class_faiGroupHandle.inc:120
-#: admin/fai/class_faiProfileEntry.inc:163 admin/fai/fai-list.xml:146
-msgid "Partition table"
+#: admin/fai/class_faiManagement.inc:118
+msgid "Manage FAI software packages and deployment recipes"
 msgstr ""
 
-#: admin/fai/class_faiManagement.inc:928
-#: admin/fai/class_faiGroupHandle.inc:122 admin/fai/fai-list.xml:140
-msgid "Package list"
+#: admin/fai/class_faiPackage.inc:157
+msgid "Mark for installation"
 msgstr ""
 
-#: admin/fai/class_faiManagement.inc:930
-#: admin/fai/class_faiGroupHandle.inc:124
-msgid "Scripts"
+#: admin/fai/class_faiPackage.inc:161
+msgid "Mark for removal"
 msgstr ""
 
-#: admin/fai/class_faiManagement.inc:932
-#: admin/fai/class_faiGroupHandle.inc:126
-msgid "Variables"
+#: admin/fai/class_faiPackage.inc:166
+msgid "Edit configuration"
 msgstr ""
 
-#: admin/fai/class_faiManagement.inc:934
-#: admin/fai/class_faiGroupHandle.inc:128
-msgid "Hooks"
-msgstr ""
+#: admin/fai/class_faiPackage.inc:247
+#: admin/fai/class_faiPartitionTable.inc:209
+#: admin/fai/class_faiPartitionTable.inc:250
+#: admin/fai/class_faiTemplate.inc:114
+#: admin/systems/services/repository/class_serviceDebianRepository.inc:172
+#: admin/systems/services/repository/class_serviceDebianRepository.inc:189
+#: admin/systems/services/repository/class_serviceDebianRepository.inc:193
+msgid "LDAP error"
+msgstr "Erro de LDAP"
 
-#: admin/fai/class_faiManagement.inc:936 admin/fai/class_faiProfile.inc:454
-#: admin/fai/class_askClassName.inc:104 admin/fai/class_faiGroupHandle.inc:130
-#: admin/fai/fai-list.xml:110
-msgid "Profile"
+#: admin/fai/class_faiPackage.inc:279
+#: admin/fai/packageSelect/class_filterFAIPackages.inc:41
+#: admin/fai/packageSelect/class_filterFAIPackages.inc:46
+#: admin/fai/class_faiPackageConfiguration.inc:55
+#: admin/systems/class_faiStartup.inc:133
+#: admin/systems/class_faiStartup.inc:160
+msgid "Service infrastructure"
 msgstr ""
 
-#: admin/fai/class_faiManagement.inc:938
-#: admin/fai/class_faiGroupHandle.inc:132
-msgid "Templates"
-msgstr "Modelos"
-
-#: admin/fai/class_faiManagement.inc:1039
-#: admin/fai/class_faiManagement.inc:1045
-#: admin/fai/packageSelect/selectPackage-list.xml:14
-#: admin/fai/classSelect/selectClass-list.xml:15
-#: admin/systems/class_faiStartup.inc:177 config/fai/class_faiConfig.inc:41
-msgid "FAI"
+#: admin/fai/class_faiPackage.inc:294
+msgid "Unkown packages"
 msgstr ""
 
-#: admin/fai/class_faiManagement.inc:1040
-msgid "Manage FAI software packages and deployment recipes"
+#: admin/fai/class_faiPackage.inc:365
+msgid "Package"
 msgstr ""
 
-#: admin/fai/class_faiPackage.inc:261
-msgid "Invalid package names"
+#: admin/fai/class_faiPackage.inc:366
+msgid "FAI Package list"
 msgstr ""
 
-#: admin/fai/class_faiPackage.inc:262
-#, php-format
-msgid "The following package names don't match the Debian policy: %s"
+#: admin/fai/class_faiPackage.inc:369
+msgid "FAI Package"
 msgstr ""
 
-#: admin/fai/class_faiPackage.inc:421 admin/fai/class_faiPackage.inc:422
-msgid "Configured"
-msgstr ""
+#: admin/fai/class_faiPackage.inc:385
+#: admin/fai/class_faiPartitionTable.inc:304
+#: admin/fai/class_faiTemplateEntry.inc:140 admin/fai/class_faiProfile.inc:47
+#: admin/fai/class_faiScript.inc:50 admin/fai/class_faiTemplate.inc:173
+#: admin/fai/class_faiHook.inc:50 admin/fai/class_faiVariable.inc:50
+msgid "Properties"
+msgstr "Propriedades"
 
-#: admin/fai/class_faiPackage.inc:428 admin/fai/class_faiPackage.inc:429
-msgid "Package marked for removal"
+#: admin/fai/class_faiPackage.inc:388
+#: admin/fai/class_faiPartitionTable.inc:307 admin/fai/class_faiProfile.inc:50
+#: admin/fai/class_faiScript.inc:53 admin/fai/class_faiTemplate.inc:176
+#: admin/fai/class_faiHook.inc:53 admin/fai/class_faiVariable.inc:53
+msgid "Class name"
 msgstr ""
 
-#: admin/fai/class_faiPackage.inc:445
-msgid "Mark package for removal"
+#: admin/fai/class_faiPackage.inc:388 admin/fai/class_faiScript.inc:53
+#: admin/fai/class_faiHook.inc:53 admin/fai/class_faiVariable.inc:53
+msgid "Variables class name"
 msgstr ""
 
-#: admin/fai/class_faiPackage.inc:451
-msgid "Configure this package"
-msgstr ""
+#: admin/fai/class_faiPackage.inc:392
+#: admin/fai/class_faiPartitionTable.inc:311
+#: admin/fai/class_faiDiskEntry.inc:738
+#: admin/fai/class_faiTemplateEntry.inc:147 admin/fai/class_faiProfile.inc:54
+#: admin/fai/class_faiScript.inc:57 admin/fai/class_faiScript.inc:75
+#: admin/fai/class_faiTemplate.inc:180 admin/fai/class_faiHook.inc:57
+#: admin/fai/class_faiHook.inc:75 admin/fai/class_faiVariable.inc:57
+#: admin/fai/class_faiVariable.inc:75
+msgid "Description"
+msgstr "DescriÃ§Ã£o"
 
-#: admin/fai/class_faiPackage.inc:455
-msgid "Remove this package"
+#: admin/fai/class_faiPackage.inc:392
+#: admin/fai/class_faiPartitionTable.inc:311 admin/fai/class_faiProfile.inc:54
+#: admin/fai/class_faiScript.inc:57 admin/fai/class_faiTemplate.inc:180
+#: admin/fai/class_faiHook.inc:57 admin/fai/class_faiVariable.inc:57
+msgid "Short description of the class"
 msgstr ""
 
-#: admin/fai/class_faiPackage.inc:534
-msgid "Please select a least one package!"
+#: admin/fai/class_faiPackage.inc:398 admin/systems/class_faiStartup.inc:90
+msgid "Repository"
 msgstr ""
 
-#: admin/fai/class_faiPackage.inc:538
-msgid ""
-"Please choose a valid release/section combination for your repository setup!"
+#: admin/fai/class_faiPackage.inc:401 admin/systems/class_faiStartup.inc:78
+#: admin/systems/services/repository/class_serviceDebianRepository.inc:52
+#: admin/systems/services/repository/class_serviceCentosRepository.inc:49
+msgid "Release"
 msgstr ""
 
-#: admin/fai/class_faiPackage.inc:571
-#: admin/fai/packageSelect/class_filterFAIPackages.inc:41
-#: admin/fai/packageSelect/class_filterFAIPackages.inc:46
-#: admin/fai/class_faiPackageConfiguration.inc:55
-#: admin/systems/class_faiStartup.inc:132
-#: admin/systems/class_faiStartup.inc:159
-msgid "Infrastructure service"
+#: admin/fai/class_faiPackage.inc:401
+msgid "Debian release concerned"
 msgstr ""
 
-#: admin/fai/class_faiPackage.inc:587
-msgid "Unkown packages"
+#: admin/fai/class_faiPackage.inc:405
+#: admin/systems/services/repository/class_serviceDebianRepository.inc:58
+msgid "Sections"
 msgstr ""
 
-#: admin/fai/class_faiPackage.inc:674
-#: admin/fai/faiPackageConfiguration.tpl.c:2
-msgid "Package"
+#: admin/fai/class_faiPackage.inc:405
+msgid "Sections concerned"
 msgstr ""
 
-#: admin/fai/class_faiPackage.inc:675
-msgid "FAI Package list"
+#: admin/fai/class_faiPackage.inc:409
+msgid "Install method"
 msgstr ""
 
-#: admin/fai/class_faiPackage.inc:679
-msgid "FAI Package"
+#: admin/fai/class_faiPackage.inc:409
+msgid "Install method to use for this package list"
 msgstr ""
 
-#: admin/fai/class_faiPackage.inc:687
+#: admin/fai/class_faiPackage.inc:420
 msgid "Packages"
 msgstr ""
 
-#: admin/fai/class_faiPackage.inc:688 admin/fai/faiPackage.tpl.c:23
-msgid "Section"
+#: admin/fai/class_faiPackage.inc:424
+msgid "Packages in this class"
 msgstr ""
 
-#: admin/fai/class_faiPackage.inc:688 admin/fai/class_faiPackage.inc:691
-#: admin/fai/class_faiScript.inc:605 admin/fai/class_faiTemplate.inc:512
-msgid "Readonly"
-msgstr ""
-
-#: admin/fai/class_faiPackage.inc:689
-msgid "Install Method"
-msgstr ""
+#: admin/fai/class_faiPartitionTable.inc:61
+#: admin/fai/class_faiDiskEntry.inc:442 admin/systems/class_faiLogView.inc:207
+#: admin/systems/class_faiLogView.inc:242
+msgid "Error"
+msgstr "Erro"
 
-#: admin/fai/class_faiPackage.inc:690
-msgid "Package configuration"
+#: admin/fai/class_faiPartitionTable.inc:112
+msgid "Add RAID"
 msgstr ""
 
-#: admin/fai/class_faiPackage.inc:691 admin/systems/class_faiStartup.inc:78
-#: admin/systems/services/repository/class_serviceRepository.inc:40
-#: admin/fai/branch_selector.tpl.c:14 admin/fai/faiPackage.tpl.c:20
-#: admin/fai/fai-filter.tpl.c:5 admin/fai/fai-filter.tpl.c:14
-msgid "Release"
+#: admin/fai/class_faiPartitionTable.inc:116
+msgid "Add LVM"
 msgstr ""
 
-#: admin/fai/class_faiPartitionTable.inc:269
-#: admin/fai/class_faiDiskEntry.inc:446
-#, php-format
-msgid ""
-"The disk cannot be deleted while it is used in the '%s' disk definition!"
+#: admin/fai/class_faiPartitionTable.inc:284
+msgid "Partition table"
 msgstr ""
 
-#: admin/fai/class_faiPartitionTable.inc:416 admin/fai/class_faiScript.inc:360
-#: admin/fai/class_faiScript.inc:362 admin/fai/class_faiTemplate.inc:306
-#: admin/fai/class_faiTemplate.inc:308
-msgid "edit"
+#: admin/fai/class_faiPartitionTable.inc:285
+#: admin/fai/class_faiPartitionTable.inc:288
+msgid "FAI partition table"
 msgstr ""
 
-#: admin/fai/class_faiPartitionTable.inc:418 admin/fai/class_faiScript.inc:364
-#: admin/fai/class_faiTemplate.inc:310
-msgid "delete"
+#: admin/fai/class_faiPartitionTable.inc:307 admin/fai/class_faiProfile.inc:50
+msgid "Partition table class name"
 msgstr ""
 
-#: admin/fai/class_faiPartitionTable.inc:769
-#: admin/fai/class_faiPartitionTable.inc:773
-msgid "FAI partition table"
+#: admin/fai/class_faiPartitionTable.inc:317
+msgid "Discs"
 msgstr ""
 
-#: admin/fai/class_faiPartitionTable.inc:779 admin/fai/class_faiHook.inc:531
-#: admin/fai/class_faiVariable.inc:398
-msgid "Read only"
+#: admin/fai/class_faiPartitionTable.inc:324
+msgid "Partitions in this class"
 msgstr ""
 
 #: admin/fai/class_faiDiskEntry.inc:273
-#: admin/fai/faiPartitionTableEntry.tpl.c:5 admin/fai/faiDiskEntry.tpl.c:5
 msgid "Device"
 msgstr ""
 
@@ -389,103 +198,103 @@ msgstr ""
 msgid "UUID"
 msgstr ""
 
-#: admin/fai/class_faiDiskEntry.inc:345
+#: admin/fai/class_faiDiskEntry.inc:344
 msgid "Disks"
 msgstr ""
 
-#: admin/fai/class_faiDiskEntry.inc:348 admin/fai/class_faiPartition.inc:321
-#: admin/fai/faiPartition.tpl.c:14
+#: admin/fai/class_faiDiskEntry.inc:347 admin/fai/class_faiPartition.inc:319
 msgid "Size"
 msgstr ""
 
-#: admin/fai/class_faiDiskEntry.inc:544
+#: admin/fai/class_faiDiskEntry.inc:443
+#, php-format
+msgid ""
+"The disk cannot be deleted while it is used in the '%s' disk definition!"
+msgstr ""
+
+#: admin/fai/class_faiDiskEntry.inc:536
 msgid "encrypted"
 msgstr ""
 
-#: admin/fai/class_faiDiskEntry.inc:547
+#: admin/fai/class_faiDiskEntry.inc:539
 msgid "bootable"
 msgstr ""
 
-#: admin/fai/class_faiDiskEntry.inc:550
+#: admin/fai/class_faiDiskEntry.inc:542
 msgid "preserve"
 msgstr ""
 
-#: admin/fai/class_faiDiskEntry.inc:735
+#: admin/fai/class_faiDiskEntry.inc:687 admin/fai/class_faiDiskEntry.inc:690
+#: admin/fai/class_faiDiskEntry.inc:737
+#: admin/fai/packageSelect/selectPackage-list.xml:40
+#: admin/fai/class_faiScript.inc:71 admin/fai/class_faiHook.inc:71
+#: admin/fai/class_faiVariable.inc:71
+#: admin/fai/class_faiSimplePluginClass.inc:50
+msgid "Name"
+msgstr "Nome"
+
+#: admin/fai/class_faiDiskEntry.inc:717
 msgid ""
 "You have more than four primary partition table entries in your "
 "configuration, please check your configuration twice."
 msgstr ""
 
-#: admin/fai/class_faiDiskEntry.inc:739
+#: admin/fai/class_faiDiskEntry.inc:721
 msgid ""
 "You cannot have more than three primary partition while using logical "
 "partitions, please check your configuration twice."
 msgstr ""
 
-#: admin/fai/class_faiDiskEntry.inc:752
-#: admin/fai/class_faiPartitionTableEntry.inc:448
+#: admin/fai/class_faiDiskEntry.inc:733
 msgid "Partition table entry"
 msgstr ""
 
-#: admin/fai/class_faiDiskEntry.inc:753
-#: admin/fai/class_faiPartitionTableEntry.inc:449
+#: admin/fai/class_faiDiskEntry.inc:734
 msgid "FAI partition table entry"
 msgstr ""
 
-#: admin/fai/class_faiDiskEntry.inc:760
+#: admin/fai/class_faiDiskEntry.inc:739
 msgid "Disk options"
 msgstr ""
 
-#: admin/fai/class_faiDiskEntry.inc:761
-#: admin/fai/class_faiPartitionTableEntry.inc:457
+#: admin/fai/class_faiDiskEntry.inc:740
 msgid "Partition type"
 msgstr ""
 
-#: admin/fai/class_faiDiskEntry.inc:762
-#: admin/fai/class_faiPartitionTableEntry.inc:458
+#: admin/fai/class_faiDiskEntry.inc:741
 msgid "Partition no."
 msgstr ""
 
-#: admin/fai/class_faiDiskEntry.inc:763
-#: admin/fai/class_faiPartitionTableEntry.inc:459
+#: admin/fai/class_faiDiskEntry.inc:742
 msgid "File system type"
 msgstr ""
 
-#: admin/fai/class_faiDiskEntry.inc:764
-#: admin/fai/class_faiPartitionTableEntry.inc:171
-#: admin/fai/class_faiPartitionTableEntry.inc:460
-#: admin/fai/class_faiPartition.inc:437 admin/fai/faiPartition.tpl.c:47
+#: admin/fai/class_faiDiskEntry.inc:743 admin/fai/class_faiPartition.inc:432
 msgid "Mount point"
 msgstr ""
 
-#: admin/fai/class_faiDiskEntry.inc:765
-#: admin/fai/class_faiPartitionTableEntry.inc:461
-#: admin/fai/class_faiPartition.inc:402 admin/fai/class_faiPartition.inc:407
+#: admin/fai/class_faiDiskEntry.inc:744 admin/fai/class_faiPartition.inc:397
+#: admin/fai/class_faiPartition.inc:402
 msgid "Partition size"
 msgstr ""
 
-#: admin/fai/class_faiDiskEntry.inc:766
-#: admin/fai/class_faiPartitionTableEntry.inc:173
-#: admin/fai/class_faiPartitionTableEntry.inc:462
-#: admin/fai/faiPartition.tpl.c:50
+#: admin/fai/class_faiDiskEntry.inc:745
 msgid "Mount options"
 msgstr ""
 
-#: admin/fai/class_faiDiskEntry.inc:767
-#: admin/fai/class_faiPartitionTableEntry.inc:463
+#: admin/fai/class_faiDiskEntry.inc:746
 msgid "File system options"
 msgstr ""
 
-#: admin/fai/class_faiDiskEntry.inc:768
-#: admin/fai/class_faiPartitionTableEntry.inc:464
+#: admin/fai/class_faiDiskEntry.inc:747
 msgid "Partition flags"
 msgstr ""
 
-#: admin/fai/class_debconfTemplate.inc:227
+#: admin/fai/class_debconfTemplate.inc:225
 msgid "This package has no debconf options."
 msgstr ""
 
-#: admin/fai/class_debconfTemplate.inc:264
+#: admin/fai/class_debconfTemplate.inc:262
 msgid ""
 "This debconf question is dynamically generated during package installation "
 "and requires choosing between specific options which cannot be presented "
@@ -493,217 +302,59 @@ msgid ""
 " effect."
 msgstr ""
 
-#: admin/fai/class_faiTemplateEntry.inc:139
-msgid "no file uploaded yet"
+#: admin/fai/class_faiTemplateEntry.inc:143
+msgid "File path"
 msgstr ""
 
-#: admin/fai/class_faiTemplateEntry.inc:142
-#, php-format
-msgid "exists in database (size: %s bytes)"
-msgstr ""
-
-#: admin/fai/class_faiTemplateEntry.inc:251
-#: admin/systems/class_faiLogView.inc:70 admin/fai/faiTemplateEntry.tpl.c:23
-msgid "File"
+#: admin/fai/class_faiTemplateEntry.inc:143
+msgid "Complete absolute template file path and name"
 msgstr ""
 
-#: admin/fai/class_faiTemplateEntry.inc:255
-#: admin/fai/faiTemplateEntry.tpl.c:11
-msgid "Destination path"
+#: admin/fai/class_faiTemplateEntry.inc:147
+msgid "Short description of the file"
 msgstr ""
 
-#: admin/fai/class_faiTemplateEntry.inc:260 admin/fai/faiTemplateEntry.tpl.c:8
-msgid "File name"
-msgstr ""
-
-#: admin/fai/class_faiTemplateEntry.inc:264
-#: admin/fai/class_faiTemplateEntry.inc:266
-#: admin/fai/faiTemplateEntry.tpl.c:68
-msgid "User"
-msgstr "UsuÃ¡rio"
-
-#: admin/fai/class_faiTemplateEntry.inc:270
-#: admin/fai/class_faiTemplateEntry.inc:273
-#: admin/fai/class_faiTemplateEntry.inc:275
-#: admin/fai/faiTemplateEntry.tpl.c:47 admin/fai/faiTemplateEntry.tpl.c:74
-msgid "Group"
+#: admin/fai/class_faiTemplateEntry.inc:156
+msgid "Template attributes"
 msgstr ""
 
-#: admin/fai/class_faiTemplateEntry.inc:305
-msgid "Template entry"
+#: admin/fai/class_faiTemplateEntry.inc:160
+msgid "Template file content"
 msgstr ""
 
-#: admin/fai/class_faiTemplateEntry.inc:306
-msgid "FAI template entry"
+#: admin/fai/class_faiTemplateEntry.inc:160
+msgid "Content of the template file"
 msgstr ""
 
-#: admin/fai/class_faiTemplateEntry.inc:314
-msgid "Template file"
+#: admin/fai/class_faiTemplateEntry.inc:164
+msgid "Owner and group of the file"
 msgstr ""
 
-#: admin/fai/class_faiTemplateEntry.inc:315
-msgid "Template path"
+#: admin/fai/class_faiTemplateEntry.inc:167
+msgid "Owner"
 msgstr ""
 
-#: admin/fai/class_faiTemplateEntry.inc:316
+#: admin/fai/class_faiTemplateEntry.inc:167
 msgid "File owner"
 msgstr ""
 
-#: admin/fai/class_faiTemplateEntry.inc:317
-msgid "File permissions"
-msgstr ""
-
-#: admin/fai/class_FAI.inc:287 admin/fai/class_FAI.inc:679
-#: admin/fai/class_FAI.inc:1266 admin/fai/class_FAI.inc:1283
-#: admin/fai/class_FAI.inc:1287
-msgid "LDAP error"
-msgstr "Erro de LDAP"
-
-#: admin/fai/class_FAI.inc:570
-#, php-format
-msgid "Error, following objects should be equal '%s' and '%s'"
-msgstr ""
-
-#: admin/fai/class_FAI.inc:891
-#, php-format
-msgid "Creating group application release for %s"
-msgstr ""
-
-#: admin/fai/class_FAI.inc:960 admin/fai/class_FAI.inc:982
-#: admin/fai/class_FAI.inc:1022 admin/fai/class_FAI.inc:1027
-#: admin/fai/class_FAI.inc:1065
-msgid "Object"
-msgstr "Objeto"
-
-#: admin/fai/class_FAI.inc:961
-#, php-format
-msgid "Adding missing group application release container %s."
-msgstr ""
-
-#: admin/fai/class_FAI.inc:983
-#, php-format
-msgid "Adding group application release container %s."
-msgstr ""
-
-#: admin/fai/class_FAI.inc:1023
-#, php-format
-msgid "Could not create menu entry %s. (Already exists)."
-msgstr ""
-
-#: admin/fai/class_FAI.inc:1028
-#, php-format
-msgid "Created group application menu entry for %s."
-msgstr ""
-
-#: admin/fai/class_FAI.inc:1059
-#, php-format
-msgid "Creating copy of %s"
-msgstr ""
-
-#: admin/fai/class_FAI.inc:1062
-msgid "Processing"
-msgstr ""
-
-#: admin/fai/class_FAI.inc:1080
-msgid "Could not create new release, the destination dn is already in use."
-msgstr ""
-
-#: admin/fai/class_FAI.inc:1093
-msgid "Error while fetching source dn - aborted!"
-msgstr ""
-
-#: admin/fai/class_FAI.inc:1174
-msgid "Fatal error"
-msgstr ""
-
-#: admin/fai/class_FAI.inc:1175
-#, php-format
-msgid ""
-"Release creation failed due to ldap errors. Additional informations '%s'."
-msgstr ""
-
-#: admin/fai/class_faiPartitionTableEntry.inc:162
-msgid "primary"
-msgstr ""
-
-#: admin/fai/class_faiPartitionTableEntry.inc:162
-msgid "logical"
-msgstr ""
-
-#: admin/fai/class_faiPartitionTableEntry.inc:169
-#: admin/fai/faiPartition.tpl.c:8
-msgid "Type"
-msgstr "Tipo"
-
-#: admin/fai/class_faiPartitionTableEntry.inc:170
-msgid "FS type"
-msgstr ""
-
-#: admin/fai/class_faiPartitionTableEntry.inc:172
-msgid "Size in MB"
-msgstr ""
-
-#: admin/fai/class_faiPartitionTableEntry.inc:174
-msgid "FS option"
-msgstr ""
-
-#: admin/fai/class_faiPartitionTableEntry.inc:175
-#: admin/fai/faiPartition.tpl.c:23
-msgid "Preserve"
-msgstr ""
-
-#: admin/fai/class_faiPartitionTableEntry.inc:266
-msgid "False"
-msgstr ""
-
-#: admin/fai/class_faiPartitionTableEntry.inc:268
-msgid "True"
-msgstr ""
-
-#: admin/fai/class_faiPartitionTableEntry.inc:272
-#: admin/fai/class_faiPartitionTableEntry.inc:274 admin/fai/fai-list.xml:159
-#: admin/fai/fai-list.xml:198
-msgid "Remove"
-msgstr "Remover"
-
-#: admin/fai/class_faiPartitionTableEntry.inc:384
-#, php-format
-msgid "please enter a unique mount point for partition %s"
-msgstr ""
-
-#: admin/fai/class_faiPartitionTableEntry.inc:389
-#, php-format
-msgid "partition %s mount point"
+#: admin/fai/class_faiTemplateEntry.inc:172
+msgid "Group"
 msgstr ""
 
-#: admin/fai/class_faiPartitionTableEntry.inc:394
-#, php-format
-msgid ""
-"File system type 'swap' is already used, change file system type for "
-"partition %s."
+#: admin/fai/class_faiTemplateEntry.inc:172
+msgid "File group"
 msgstr ""
 
-#: admin/fai/class_faiPartitionTableEntry.inc:398
-msgid "Please use 'swap' as mount point, if 'swap' is used as fs-type."
+#: admin/fai/class_faiTemplateEntry.inc:181
+msgid "Access"
 msgstr ""
 
-#: admin/fai/class_faiPartitionTableEntry.inc:404
-#: admin/fai/class_faiPartitionTableEntry.inc:408
-#: admin/fai/class_faiPartitionTableEntry.inc:414
-#: admin/fai/class_faiPartitionTableEntry.inc:416
-#: admin/fai/class_faiPartitionTableEntry.inc:421
-#, php-format
-msgid "partition %s size"
-msgstr ""
-
-#: admin/fai/class_faiPartitionTableEntry.inc:436
-msgid ""
-"You have more than 3 primary partition table entries in your configuration, "
-"please check your configuration twice."
+#: admin/fai/class_faiTemplateEntry.inc:181
+msgid "Access rights"
 msgstr ""
 
 #: admin/fai/packageSelect/selectPackage-list.xml:10
-#: admin/fai/classSelect/selectClass-list.xml:11
 msgid "Please select the desired entries"
 msgstr ""
 
@@ -711,147 +362,94 @@ msgstr ""
 msgid "Version"
 msgstr ""
 
-#: admin/fai/class_faiProfile.inc:310
-msgid "This list displays all assigned class names for this profile."
-msgstr ""
-
-#: admin/fai/class_faiProfile.inc:313 admin/fai/class_askClassName.inc:103
-#: admin/fai/classSelect/class_classSelect.inc:53
-#: admin/fai/class_faiProfileEntry.inc:158
-msgid "Hook bundle"
-msgstr ""
-
-#: admin/fai/class_faiProfile.inc:314 admin/fai/class_askClassName.inc:105
-#: admin/fai/classSelect/class_classSelect.inc:54
-#: admin/fai/class_faiProfileEntry.inc:159
-msgid "Template bundle"
-msgstr ""
-
-#: admin/fai/class_faiProfile.inc:315 admin/fai/class_askClassName.inc:101
-#: admin/fai/classSelect/class_classSelect.inc:55
-#: admin/fai/class_faiProfileEntry.inc:160
-msgid "Script bundle"
-msgstr ""
-
-#: admin/fai/class_faiProfile.inc:316 admin/fai/class_askClassName.inc:102
-#: admin/fai/classSelect/class_classSelect.inc:56
-#: admin/fai/class_faiProfileEntry.inc:161
-msgid "Variable bundle"
-msgstr ""
-
-#: admin/fai/class_faiProfile.inc:317 admin/fai/class_askClassName.inc:100
-#: admin/fai/classSelect/class_classSelect.inc:57
-#: admin/fai/class_faiProfileEntry.inc:162
-msgid "Package bundle"
-msgstr ""
-
-#: admin/fai/class_faiProfile.inc:321
-msgid "Remove class from profile"
-msgstr ""
-
-#: admin/fai/class_faiProfile.inc:324
-msgid "Up"
-msgstr "Para cima"
-
-#: admin/fai/class_faiProfile.inc:325
-msgid "Down"
-msgstr "Para baixo"
-
-#: admin/fai/class_faiProfile.inc:410
-msgid "No class specified for this profile!"
-msgstr ""
-
-#: admin/fai/class_faiProfile.inc:419
-msgid "You can't use the same name for a class and a profile!"
+#: admin/fai/class_faiProfile.inc:28
+msgid "Profile"
 msgstr ""
 
-#: admin/fai/class_faiProfile.inc:455
+#: admin/fai/class_faiProfile.inc:29
 msgid "FAI profile"
 msgstr ""
 
-#: admin/fai/class_faiProfile.inc:458
+#: admin/fai/class_faiProfile.inc:32
 msgid "FAI Profile"
 msgstr ""
 
-#: admin/fai/class_faiProfile.inc:465 admin/fai/faiProfile.tpl.c:17
+#: admin/fai/class_faiProfile.inc:61
 msgid "FAI classes"
 msgstr ""
 
-#: admin/fai/class_faiHookEntry.inc:200
-msgid "Hook entry"
+#: admin/fai/class_faiProfile.inc:61
+msgid "FAI classes which are part of this profile"
 msgstr ""
 
-#: admin/fai/class_faiHookEntry.inc:201
-msgid "FAI hook entry"
+#: admin/fai/class_faiPackageConfiguration.inc:88
+#, php-format
+msgid "Debconf information for package '%s'"
 msgstr ""
 
-#: admin/fai/class_faiHookEntry.inc:209 admin/fai/faiHookEntry.tpl.c:20
-msgid "Task"
+#: admin/fai/class_faiScript.inc:30 admin/fai/class_faiScript.inc:84
+#: admin/fai/class_faiHook.inc:87
+msgid "Script"
 msgstr ""
 
-#: admin/fai/class_faiHookEntry.inc:210 admin/fai/class_faiScript.inc:595
-#: admin/fai/class_faiScript.inc:599
+#: admin/fai/class_faiScript.inc:31 admin/fai/class_faiScript.inc:34
 msgid "FAI script"
 msgstr ""
 
-#: admin/fai/class_faiPackageConfiguration.inc:88
-#, php-format
-msgid "Debconf information for package '%s'"
+#: admin/fai/class_faiScript.inc:63
+msgid "Scripts"
 msgstr ""
 
-#: admin/fai/class_askClassName.inc:99 admin/fai/class_askClassName.inc:100
-#: admin/fai/class_askClassName.inc:101 admin/fai/class_askClassName.inc:102
-#: admin/fai/class_askClassName.inc:103 admin/fai/class_askClassName.inc:104
-#: admin/fai/class_askClassName.inc:105 admin/fai/class_askClassName.inc:106
-msgid "Create new FAI object"
+#: admin/fai/class_faiScript.inc:67 admin/fai/class_faiHook.inc:67
+#: admin/fai/class_faiVariable.inc:67
+msgid "Variables in this class"
 msgstr ""
 
-#: admin/fai/class_faiTemplateEdit.inc:80
-#, php-format
-msgid ""
-"The file encodig has changed from '%s' to '%s'. Do you really want to save?"
+#: admin/fai/class_faiScript.inc:71 admin/fai/class_faiHook.inc:71
+#: admin/fai/class_faiVariable.inc:71
+msgid "The name of the variable"
 msgstr ""
 
-#: admin/fai/class_faiScript.inc:333 admin/fai/class_faiScript.inc:335
-msgid "Sort direction"
+#: admin/fai/class_faiScript.inc:75 admin/fai/class_faiHook.inc:75
+#: admin/fai/class_faiVariable.inc:75
+msgid "A short description of the variable"
 msgstr ""
 
-#: admin/fai/class_faiScript.inc:348 admin/fai/faiScriptEntry.tpl.c:20
+#: admin/fai/class_faiScript.inc:79
 msgid "Priority"
 msgstr ""
 
-#: admin/fai/class_faiScript.inc:350
-msgid "Action"
+#: admin/fai/class_faiScript.inc:79
+msgid "Priority of this script (FIXME: less is done first?)"
 msgstr ""
 
-#: admin/fai/classSelect/selectClass-list.xml:36 admin/fai/fai-list.xml:88
-#: admin/fai/faiScriptEntry.tpl.c:14
-msgid "Properties"
-msgstr "Propriedades"
+#: admin/fai/class_faiScript.inc:84
+msgid "The script itself"
+msgstr ""
 
-#: admin/fai/class_faiTemplate.inc:501 admin/fai/fai-list.xml:116
+#: admin/fai/class_faiTemplate.inc:136
+#, php-format
+msgid "There are several files with the same path: %s"
+msgstr ""
+
+#: admin/fai/class_faiTemplate.inc:153
 msgid "Template"
 msgstr "Modelo"
 
-#: admin/fai/class_faiTemplate.inc:502 admin/fai/class_faiTemplate.inc:506
+#: admin/fai/class_faiTemplate.inc:154 admin/fai/class_faiTemplate.inc:157
 msgid "FAI template"
 msgstr ""
 
-#: admin/fai/class_faiVariableEntry.inc:107
-msgid "Content"
+#: admin/fai/class_faiTemplate.inc:176
+msgid "Template class name"
 msgstr ""
 
-#: admin/fai/class_faiVariableEntry.inc:142
-msgid "Variable entry"
+#: admin/fai/class_faiTemplate.inc:186
+msgid "Template files"
 msgstr ""
 
-#: admin/fai/class_faiVariableEntry.inc:143
-msgid "FAI variable entry "
-msgstr ""
-
-#: admin/fai/class_faiVariableEntry.inc:151
-#: admin/fai/faiVariableEntry.tpl.c:20
-msgid "Variable content"
+#: admin/fai/class_faiTemplate.inc:190
+msgid "Template files in this class"
 msgstr ""
 
 #: admin/fai/class_faiPartition.inc:176 admin/fai/class_faiPartition.inc:180
@@ -950,95 +548,74 @@ msgstr ""
 msgid "btrfs"
 msgstr ""
 
-#: admin/fai/class_faiPartition.inc:224
-msgid "LVM/RAID"
-msgstr ""
-
-#: admin/fai/class_faiPartition.inc:327
+#: admin/fai/class_faiPartition.inc:325
 msgid "spare"
 msgstr ""
 
-#: admin/fai/class_faiPartition.inc:330
+#: admin/fai/class_faiPartition.inc:328
 msgid "missing"
 msgstr ""
 
-#: admin/fai/class_faiPartition.inc:333
+#: admin/fai/class_faiPartition.inc:331
 msgid "Options"
 msgstr ""
 
-#: admin/fai/class_faiPartition.inc:420
+#: admin/fai/class_faiPartition.inc:415
 msgid "Minimum partition size"
 msgstr ""
 
-#: admin/fai/class_faiPartition.inc:420
+#: admin/fai/class_faiPartition.inc:415
 msgid "Maximum partition size"
 msgstr ""
 
-#: admin/fai/class_faiPartition.inc:428
+#: admin/fai/class_faiPartition.inc:423
 msgid "Raid arrays must contain at least two partitions!"
 msgstr ""
 
-#: admin/fai/class_faiPartition.inc:430
+#: admin/fai/class_faiPartition.inc:425
 msgid ""
 "Raid 0 arrays can only be realized with a combination of two partitions!"
 msgstr ""
 
-#: admin/fai/class_faiHook.inc:332 admin/fai/class_faiHook.inc:334
-#: admin/fai/fai-list.xml:190 admin/fai/faiVariable.tpl.c:23
-#: admin/fai/faiVariable.tpl.c:26
-msgid "Edit"
-msgstr "Editar"
-
-#: admin/fai/class_faiHook.inc:336
-msgid "Delete"
-msgstr "Deletar"
-
-#: admin/fai/class_faiHook.inc:521 admin/fai/fai-list.xml:128
+#: admin/fai/class_faiHook.inc:30
 msgid "Hook"
 msgstr ""
 
-#: admin/fai/class_faiHook.inc:522 admin/fai/class_faiHook.inc:526
+#: admin/fai/class_faiHook.inc:31 admin/fai/class_faiHook.inc:34
 msgid "FAI hook"
 msgstr ""
 
-#: admin/fai/class_faiVariable.inc:387 admin/fai/fai-list.xml:134
-msgid "Variable"
+#: admin/fai/class_faiHook.inc:63
+msgid "Hooks"
 msgstr ""
 
-#: admin/fai/class_faiVariable.inc:388 admin/fai/class_faiVariable.inc:392
-msgid "FAI variable"
+#: admin/fai/class_faiHook.inc:79
+msgid "Task"
 msgstr ""
 
-#: admin/fai/class_faiProfileEntry.inc:184 admin/fai/askClassName.tpl.c:11
-#: admin/fai/askClassName.tpl.c:17 admin/fai/paste_generic.tpl.c:5
-msgid "Class name"
+#: admin/fai/class_faiHook.inc:87
+msgid "The script of this hook"
 msgstr ""
 
-#: admin/fai/class_faiProfileEntry.inc:184 admin/fai/faiTemplate.tpl.c:14
-#: admin/fai/faiVariable.tpl.c:14 admin/fai/faiHook.tpl.c:14
-#: admin/fai/faiPartitionTable.tpl.c:17 admin/fai/faiScript.tpl.c:14
-msgid "Objects"
+#: admin/fai/class_faiVariable.inc:30
+msgid "Variable"
 msgstr ""
 
-#: admin/fai/fai-list.xml:11
-msgid "List of deployment classes and products"
+#: admin/fai/class_faiVariable.inc:31 admin/fai/class_faiVariable.inc:34
+msgid "FAI variable"
 msgstr ""
 
-#: admin/fai/fai-list.xml:15
-msgid "partitionTable"
+#: admin/fai/class_faiVariable.inc:63
+msgid "Variables"
 msgstr ""
 
-#: admin/fai/fai-list.xml:23
-msgid "packagelist"
+#: admin/fai/class_faiVariable.inc:79
+msgid "Content"
 msgstr ""
 
-#: admin/fai/fai-list.xml:93
-msgid "Actions"
-msgstr "AÃ§Ãµes"
-
-#: admin/fai/fai-list.xml:104
-msgid "Create"
-msgstr "Criar"
+#: admin/fai/class_faiVariable.inc:79
+msgid "The content of the variable"
+msgstr ""
 
 #: admin/systems/class_faiLogView.inc:56
 msgid "Sort down"
@@ -1048,6 +625,10 @@ msgstr ""
 msgid "Sort up"
 msgstr ""
 
+#: admin/systems/class_faiLogView.inc:70
+msgid "File"
+msgstr ""
+
 #: admin/systems/class_faiLogView.inc:71
 msgid "Date"
 msgstr ""
@@ -1082,7 +663,7 @@ msgstr ""
 msgid "Selected file: %s"
 msgstr ""
 
-#: admin/systems/class_faiStartup.inc:70 admin/fai/paste_generic.tpl.c:2
+#: admin/systems/class_faiStartup.inc:70
 msgid "FAI settings"
 msgstr ""
 
@@ -1102,11 +683,6 @@ msgstr ""
 msgid "FAI profil to be applied to this computer"
 msgstr ""
 
-#: admin/systems/class_faiStartup.inc:90 admin/fai/faiPackage.tpl.c:14
-#: admin/fai/faiPackage.tpl.c:17
-msgid "Repository"
-msgstr ""
-
 #: admin/systems/class_faiStartup.inc:90
 msgid "FAI Debian repository to be used for installation"
 msgstr ""
@@ -1131,85 +707,96 @@ msgstr ""
 msgid "Linux kernel parameters to be ran"
 msgstr ""
 
-#: admin/systems/class_faiStartup.inc:178
+#: admin/systems/class_faiStartup.inc:179
 msgid "Full automated installation"
 msgstr ""
 
-#: admin/systems/services/repository/class_serviceRepository.inc:31
+#: admin/systems/services/repository/class_serviceDebianRepository.inc:34
+#: admin/systems/services/repository/class_serviceCentosRepository.inc:31
+msgid "Repositories"
+msgstr ""
+
+#: admin/systems/services/repository/class_serviceDebianRepository.inc:39
+#: admin/systems/services/repository/class_serviceCentosRepository.inc:36
+msgid "Repositories this server hosts"
+msgstr ""
+
+#: admin/systems/services/repository/class_serviceDebianRepository.inc:43
+#: admin/systems/services/repository/class_serviceCentosRepository.inc:40
 msgid "URL"
 msgstr ""
 
-#: admin/systems/services/repository/class_serviceRepository.inc:31
+#: admin/systems/services/repository/class_serviceDebianRepository.inc:43
+#: admin/systems/services/repository/class_serviceCentosRepository.inc:40
 msgid "Repository url"
 msgstr ""
 
-#: admin/systems/services/repository/class_serviceRepository.inc:35
+#: admin/systems/services/repository/class_serviceDebianRepository.inc:47
+#: admin/systems/services/repository/class_serviceCentosRepository.inc:44
 msgid "Parent server"
 msgstr ""
 
-#: admin/systems/services/repository/class_serviceRepository.inc:35
+#: admin/systems/services/repository/class_serviceDebianRepository.inc:47
+#: admin/systems/services/repository/class_serviceCentosRepository.inc:44
 msgid "Parent repository server"
 msgstr ""
 
-#: admin/systems/services/repository/class_serviceRepository.inc:40
-msgid "Release used on this repository"
+#: admin/systems/services/repository/class_serviceDebianRepository.inc:52
+msgid "Debian release used on this repository"
 msgstr ""
 
-#: admin/systems/services/repository/class_serviceRepository.inc:47
-msgid "Sections"
+#: admin/systems/services/repository/class_serviceDebianRepository.inc:58
+msgid "Debian sections available 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
+#: admin/systems/services/repository/class_serviceDebianRepository.inc:63
+#: admin/systems/services/repository/class_serviceCentosRepository.inc:57
 msgid "Mirror mode"
 msgstr ""
 
-#: admin/systems/services/repository/class_serviceRepository.inc:52
+#: admin/systems/services/repository/class_serviceDebianRepository.inc:63
+#: admin/systems/services/repository/class_serviceCentosRepository.inc:57
 msgid ""
 "Is this mirror an installation repository? Is its release a custom one?"
 msgstr ""
 
-#: admin/systems/services/repository/class_serviceRepository.inc:57
+#: admin/systems/services/repository/class_serviceDebianRepository.inc:68
+#: admin/systems/services/repository/class_serviceCentosRepository.inc:62
 msgid "Local mirror"
 msgstr ""
 
-#: admin/systems/services/repository/class_serviceRepository.inc:57
+#: admin/systems/services/repository/class_serviceDebianRepository.inc:68
+#: admin/systems/services/repository/class_serviceCentosRepository.inc:62
 msgid "Is this mirror a local or a network mirror?"
 msgstr ""
 
-#: admin/systems/services/repository/class_serviceRepository.inc:66
+#: admin/systems/services/repository/class_serviceDebianRepository.inc:77
+#: admin/systems/services/repository/class_serviceCentosRepository.inc:71
 msgid "Architectures"
 msgstr ""
 
-#: admin/systems/services/repository/class_serviceRepository.inc:66
+#: admin/systems/services/repository/class_serviceDebianRepository.inc:77
+#: admin/systems/services/repository/class_serviceCentosRepository.inc:71
 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"
+#: admin/systems/services/repository/class_serviceDebianRepository.inc:99
+#: admin/systems/services/repository/class_serviceDebianRepository.inc:100
+msgid "Debian repository"
 msgstr ""
 
-#: admin/systems/services/repository/class_serviceRepository.inc:140
-msgid "Repositories"
-msgstr ""
-
-#: admin/systems/services/repository/class_serviceRepository.inc:145
-msgid "Repositories this server hosts"
+#: admin/systems/services/repository/class_serviceDebianRepository.inc:100
+#: admin/systems/services/repository/class_serviceCentosRepository.inc:96
+msgid "Services"
 msgstr ""
 
-#: admin/systems/services/repository/class_serviceRepository.inc:160
-msgid "Package repository"
+#: admin/systems/services/repository/class_serviceCentosRepository.inc:49
+msgid "Centos release used on this repository"
 msgstr ""
 
-#: admin/systems/services/repository/class_serviceRepository.inc:161
-msgid "Package repository information"
+#: admin/systems/services/repository/class_serviceCentosRepository.inc:95
+#: admin/systems/services/repository/class_serviceCentosRepository.inc:96
+msgid "Centos repository"
 msgstr ""
 
 #: config/fai/class_faiConfig.inc:28
@@ -1241,476 +828,3 @@ msgstr ""
 #: config/fai/class_faiConfig.inc:60
 msgid "s"
 msgstr ""
-
-#: admin/fai/faiPartitionTableEntry.tpl.c:2 admin/fai/faiVariableEntry.tpl.c:2
-#: admin/fai/faiVariableEntry.tpl.c:5 admin/fai/faiDiskEntry.tpl.c:2
-#: admin/fai/faiTemplate.tpl.c:2 admin/fai/faiTemplate.tpl.c:5
-#: admin/fai/faiVariable.tpl.c:2 admin/fai/faiVariable.tpl.c:5
-#: admin/fai/faiHook.tpl.c:2 admin/fai/faiHook.tpl.c:5
-#: admin/fai/faiPackage.tpl.c:2 admin/fai/faiPackage.tpl.c:5
-#: admin/fai/faiTemplateEntry.tpl.c:2 admin/fai/faiTemplateEntry.tpl.c:5
-#: admin/fai/faiScriptEntry.tpl.c:2 admin/fai/faiScriptEntry.tpl.c:5
-#: admin/fai/faiPartitionTable.tpl.c:2 admin/fai/faiPartitionTable.tpl.c:5
-#: admin/fai/faiScript.tpl.c:2 admin/fai/faiScript.tpl.c:5
-#: admin/fai/faiProfile.tpl.c:2 admin/fai/faiProfile.tpl.c:5
-#: admin/fai/faiProfile.tpl.c:14 admin/fai/faiHookEntry.tpl.c:2
-#: admin/fai/faiHookEntry.tpl.c:5
-msgid "Generic"
-msgstr "Geral"
-
-#: admin/fai/faiPartitionTableEntry.tpl.c:14
-#: admin/fai/faiPartitionTableEntry.tpl.c:17 admin/fai/faiDiskEntry.tpl.c:23
-#: admin/fai/faiDiskEntry.tpl.c:26
-msgid "Partition entries"
-msgstr ""
-
-#: admin/fai/faiPartitionTableEntry.tpl.c:20
-#: admin/fai/faiPartitionTableEntry.tpl.c:23 admin/fai/faiDiskEntry.tpl.c:29
-#: admin/fai/faiDiskEntry.tpl.c:32
-msgid "Add partition"
-msgstr ""
-
-#: admin/fai/branch_selector.tpl.c:2
-msgid "Releases"
-msgstr ""
-
-#: admin/fai/branch_selector.tpl.c:5
-msgid "Current release"
-msgstr ""
-
-#: admin/fai/branch_selector.tpl.c:8 admin/fai/branch_selector.tpl.c:17
-#: admin/fai/fai-filter.tpl.c:8 admin/fai/fai-filter.tpl.c:17
-msgid "Create release"
-msgstr ""
-
-#: admin/fai/branch_selector.tpl.c:11 admin/fai/branch_selector.tpl.c:23
-#: admin/fai/fai-filter.tpl.c:11 admin/fai/fai-filter.tpl.c:23
-msgid "Create read-only release"
-msgstr ""
-
-#: admin/fai/branch_selector.tpl.c:20 admin/fai/fai-filter.tpl.c:20
-msgid "Freeze"
-msgstr ""
-
-#: admin/fai/branch_selector.tpl.c:26 admin/fai/fai-filter.tpl.c:26
-msgid "Delete current release"
-msgstr ""
-
-#: admin/fai/faiPartition.tpl.c:2
-msgid "Partition"
-msgstr ""
-
-#: admin/fai/faiPartition.tpl.c:17
-msgid "Resize existing partition"
-msgstr ""
-
-#: admin/fai/faiPartition.tpl.c:20
-msgid "Bootable"
-msgstr ""
-
-#: admin/fai/faiPartition.tpl.c:26 admin/fai/faiDiskEntry.tpl.c:20
-msgid "Combined physical partitions"
-msgstr ""
-
-#: admin/fai/faiPartition.tpl.c:29
-msgid "Toggle missing"
-msgstr ""
-
-#: admin/fai/faiPartition.tpl.c:32
-msgid "Toggle spare"
-msgstr ""
-
-#: admin/fai/faiPartition.tpl.c:35
-msgid "Filesystem"
-msgstr ""
-
-#: admin/fai/faiPartition.tpl.c:38
-msgid "Filesystem create options"
-msgstr ""
-
-#: admin/fai/faiPartition.tpl.c:41
-msgid "Encrypted"
-msgstr ""
-
-#: admin/fai/faiPartition.tpl.c:44
-msgid "Tune options"
-msgstr ""
-
-#: admin/fai/faiNewBranch.tpl.c:2
-msgid ""
-"You are now going to create a branch or locked branch. This action clones "
-"the existing release to another release name. Branches can be modified as "
-"usual. FAI classes of locked branches cannot be modified, just additional "
-"classes are possible. Branch names should be alphanumeric, excluding the "
-"reserved names 'scripts', 'hooks', 'partitions', 'variables', 'templates' "
-"and 'fai'."
-msgstr ""
-
-#: admin/fai/faiNewBranch.tpl.c:5
-msgid ""
-"Branches are created as subreleases of the currently selected branch. "
-"Creating a new branch named 1.0.2 in SARGE for example, will result in a new"
-" release called SARGE/1.0.2."
-msgstr ""
-
-#: admin/fai/faiNewBranch.tpl.c:8
-msgid "Please enter a name for the branch"
-msgstr ""
-
-#: admin/fai/faiNewBranch.tpl.c:11
-msgid "Processing the requested operation"
-msgstr ""
-
-#: admin/fai/faiNewBranch.tpl.c:14
-msgid ""
-"As soon as the copy operation has finished, you can scroll down to end of "
-"the page and press the 'Continue' button to continue with the fai management"
-" dialog."
-msgstr ""
-
-#: admin/fai/faiNewBranch.tpl.c:17
-msgid ""
-"Your browser doesn't support iframes, please use this link to perform the "
-"requested operation."
-msgstr ""
-
-#: admin/fai/faiNewBranch.tpl.c:20
-msgid "Perform requested operation."
-msgstr ""
-
-#: admin/fai/faiNewBranch.tpl.c:23
-msgid "Initiate operation"
-msgstr ""
-
-#: admin/fai/faiVariableEntry.tpl.c:14 admin/fai/faiVariableEntry.tpl.c:17
-msgid "Variable attributes"
-msgstr ""
-
-#: admin/fai/faiDiskEntry.tpl.c:11
-msgid "fstab key"
-msgstr ""
-
-#: admin/fai/faiDiskEntry.tpl.c:17
-msgid "Disk label"
-msgstr ""
-
-#: admin/fai/faiTemplate.tpl.c:17
-msgid "List of template files"
-msgstr ""
-
-#: admin/fai/faiVariable.tpl.c:17
-msgid "List of assigned variables"
-msgstr ""
-
-#: admin/fai/faiVariable.tpl.c:20
-msgid "Choose a variable to delete or edit"
-msgstr ""
-
-#: admin/fai/askClassName.tpl.c:2
-msgid ""
-"Adding a new class to the FAI management, requires a class name. You have to"
-" specify a unique class name for unique types of FAI classes, while you can "
-"use the same class name for different types of FAI classes. In the laste "
-"case, FAI will automatically enclose all these different class types to one "
-"unique class name."
-msgstr ""
-
-#: admin/fai/askClassName.tpl.c:5
-msgid ""
-"Please use one of the following methods to choose the name for the new FAI "
-"class."
-msgstr ""
-
-#: admin/fai/askClassName.tpl.c:8
-msgid "Enter FAI class name manually"
-msgstr ""
-
-#: admin/fai/askClassName.tpl.c:14
-msgid "Choose FAI class name from a list of existing classes"
-msgstr ""
-
-#: admin/fai/askClassName.tpl.c:20
-msgid "Choose class name"
-msgstr ""
-
-#: admin/fai/faiGroupHandle.tpl.c:2
-msgid "Please select the objects you want to remove:"
-msgstr ""
-
-#: admin/fai/faiGroupHandle.tpl.c:5
-msgid "Freezed"
-msgstr ""
-
-#: admin/fai/faiGroupHandle.tpl.c:8
-msgid "Select the object you want to edit:"
-msgstr ""
-
-#: admin/fai/faiGroupHandle.tpl.c:11
-msgid "Select the object you want to copy:"
-msgstr ""
-
-#: admin/fai/remove.tpl.c:5
-msgid ""
-"This includes all account data, system access rules, imap settings, etc. for"
-" this user. Please double check if your really want to do this since there "
-"is no way for FusionDirectory to get your data back."
-msgstr ""
-
-#: admin/fai/remove.tpl.c:8 admin/fai/remove_branch.tpl.c:8
-msgid "So - if you're sure - press 'Delete' to continue or 'Cancel' to abort."
-msgstr "EntÃ£o, se vocÃª tem certeza, pressione 'Deletar' para continuar ou 'Cancelar' para abortar."
-
-#: admin/fai/faiHook.tpl.c:17
-msgid "List of hook scripts"
-msgstr ""
-
-#: admin/fai/packageSelect/selectPackage-list.tpl.c:2
-#: admin/fai/classSelect/selectClass-list.tpl.c:5
-msgid "Update"
-msgstr ""
-
-#: admin/fai/packageSelect/selectPackage-list.tpl.c:5
-#: admin/fai/classSelect/selectClass-list.tpl.c:8
-msgid "Submit"
-msgstr "Submeter"
-
-#: admin/fai/packageSelect/selectPackage-filter.tpl.c:2
-#: admin/fai/classSelect/selectClass-filter.tpl.c:2
-#: admin/fai/fai-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/remove_branch.tpl.c:5
-msgid ""
-"This includes all account data, system access, etc. for this branch. Please "
-"double check if your really want to do this since there is no way for "
-"FusionDirectory to get your data back."
-msgstr ""
-
-#: admin/fai/faiPackage.tpl.c:26
-msgid "Install method"
-msgstr ""
-
-#: admin/fai/faiPackage.tpl.c:29
-msgid "Please select the installation method"
-msgstr ""
-
-#: admin/fai/faiPackage.tpl.c:32 admin/fai/faiPackage.tpl.c:35
-msgid "Used packages"
-msgstr ""
-
-#: admin/fai/faiPackage.tpl.c:38
-msgid "Add from list"
-msgstr ""
-
-#: admin/fai/faiProfileEntry.tpl.c:2
-msgid "List of FAI objects (Fully Automatic Installation)"
-msgstr ""
-
-#: admin/fai/faiProfileEntry.tpl.c:5
-msgid "Information"
-msgstr "InformaÃ§Ã£o"
-
-#: admin/fai/faiProfileEntry.tpl.c:8
-msgid ""
-"This menu allows you to select FAI class names and to add them to the "
-"currently edited profile."
-msgstr ""
-
-#: admin/fai/faiProfileEntry.tpl.c:11
-msgid "Filters"
-msgstr "Filtros"
-
-#: admin/fai/faiProfileEntry.tpl.c:14
-msgid "Show only classes with templates"
-msgstr ""
-
-#: admin/fai/faiProfileEntry.tpl.c:17
-msgid "Show only classes with scripts"
-msgstr ""
-
-#: admin/fai/faiProfileEntry.tpl.c:20
-msgid "Show only classes with hooks"
-msgstr ""
-
-#: admin/fai/faiProfileEntry.tpl.c:23
-msgid "Show only classes with variables"
-msgstr ""
-
-#: admin/fai/faiProfileEntry.tpl.c:26
-msgid "Show only classes with packages"
-msgstr ""
-
-#: admin/fai/faiProfileEntry.tpl.c:29
-msgid "Show only classes with partitions"
-msgstr ""
-
-#: admin/fai/faiProfileEntry.tpl.c:32 admin/fai/faiProfileEntry.tpl.c:35
-msgid "Display objects matching"
-msgstr "Exibir combinaÃ§Ã£o de objetos"
-
-#: admin/fai/faiProfileEntry.tpl.c:38
-msgid "Regular expression for matching object names"
-msgstr "ExpressÃ£o regular para combinaÃ§Ã£o de nomes de objeto"
-
-#: admin/fai/faiTemplateEntry.tpl.c:17 admin/fai/faiTemplateEntry.tpl.c:20
-msgid "Template attributes"
-msgstr ""
-
-#: admin/fai/faiTemplateEntry.tpl.c:26 admin/fai/faiTemplateEntry.tpl.c:29
-msgid "Save template"
-msgstr ""
-
-#: admin/fai/faiTemplateEntry.tpl.c:32 admin/fai/faiTemplateEntry.tpl.c:35
-msgid "Edit template"
-msgstr ""
-
-#: admin/fai/faiTemplateEntry.tpl.c:38
-msgid "Full path"
-msgstr ""
-
-#: admin/fai/faiTemplateEntry.tpl.c:41
-msgid "Upload"
-msgstr ""
-
-#: admin/fai/faiTemplateEntry.tpl.c:44
-msgid "Owner"
-msgstr ""
-
-#: admin/fai/faiTemplateEntry.tpl.c:50
-msgid "Access"
-msgstr ""
-
-#: admin/fai/faiTemplateEntry.tpl.c:53
-msgid "Class"
-msgstr ""
-
-#: admin/fai/faiTemplateEntry.tpl.c:56
-msgid "Read"
-msgstr ""
-
-#: admin/fai/faiTemplateEntry.tpl.c:59
-msgid "Write"
-msgstr ""
-
-#: admin/fai/faiTemplateEntry.tpl.c:62
-msgid "Execute"
-msgstr ""
-
-#: admin/fai/faiTemplateEntry.tpl.c:65
-msgid "Special"
-msgstr ""
-
-#: admin/fai/faiTemplateEntry.tpl.c:71
-msgid "SUID"
-msgstr ""
-
-#: admin/fai/faiTemplateEntry.tpl.c:77
-msgid "SGID"
-msgstr ""
-
-#: admin/fai/faiTemplateEntry.tpl.c:80
-msgid "Others"
-msgstr ""
-
-#: admin/fai/faiTemplateEntry.tpl.c:83
-msgid "sticky"
-msgstr ""
-
-#: admin/fai/faiScriptEntry.tpl.c:17 admin/fai/faiScriptEntry.tpl.c:26
-msgid "Script attributes"
-msgstr ""
-
-#: admin/fai/faiScriptEntry.tpl.c:23
-msgid ""
-"Choose a priority. Low values result in an earlier, high values in a later "
-"execution."
-msgstr ""
-
-#: admin/fai/faiScriptEntry.tpl.c:32 admin/fai/faiHookEntry.tpl.c:32
-msgid "Import script"
-msgstr ""
-
-#: admin/fai/classSelect/selectClass-list.tpl.c:2
-msgid "Base"
-msgstr "Base"
-
-#: admin/fai/fai-filter.tpl.c:29
-msgid "Show profiles"
-msgstr ""
-
-#: admin/fai/fai-filter.tpl.c:32
-msgid "Show templates"
-msgstr ""
-
-#: admin/fai/fai-filter.tpl.c:35
-msgid "Show scripts"
-msgstr ""
-
-#: admin/fai/fai-filter.tpl.c:38
-msgid "Show hooks"
-msgstr ""
-
-#: admin/fai/fai-filter.tpl.c:41
-msgid "Show variables"
-msgstr ""
-
-#: admin/fai/fai-filter.tpl.c:44
-msgid "Show packages"
-msgstr ""
-
-#: admin/fai/fai-filter.tpl.c:47
-msgid "Show partitions"
-msgstr ""
-
-#: admin/fai/faiTemplateEdit.tpl.c:2
-msgid "This FAI template is write protected. Editing may break it!"
-msgstr ""
-
-#: admin/fai/faiTemplateEdit.tpl.c:5
-msgid "Edit anyway"
-msgstr "Editar mesmo assim"
-
-#: admin/fai/faiPartitionTable.tpl.c:14
-msgid "Use 'setup-storage' to partition the disk"
-msgstr ""
-
-#: admin/fai/faiPartitionTable.tpl.c:20
-msgid "Discs"
-msgstr ""
-
-#: admin/fai/faiPartitionTable.tpl.c:23 admin/fai/faiPartitionTable.tpl.c:26
-#: admin/fai/faiPartitionTable.tpl.c:41 admin/fai/faiPartitionTable.tpl.c:44
-msgid "Add disk"
-msgstr ""
-
-#: admin/fai/faiPartitionTable.tpl.c:29 admin/fai/faiPartitionTable.tpl.c:32
-#: admin/fai/faiPartitionTable.tpl.c:47 admin/fai/faiPartitionTable.tpl.c:50
-msgid "Add RAID"
-msgstr ""
-
-#: admin/fai/faiPartitionTable.tpl.c:35 admin/fai/faiPartitionTable.tpl.c:38
-#: admin/fai/faiPartitionTable.tpl.c:53 admin/fai/faiPartitionTable.tpl.c:56
-msgid "Add volume group"
-msgstr ""
-
-#: admin/fai/faiScript.tpl.c:17
-msgid "List of scripts"
-msgstr ""
-
-#: admin/fai/faiProfile.tpl.c:20
-msgid "Choose a priority"
-msgstr ""
-
-#: admin/fai/faiHookEntry.tpl.c:14 admin/fai/faiHookEntry.tpl.c:17
-#: admin/fai/faiHookEntry.tpl.c:26
-msgid "Hook attributes"
-msgstr ""
-
-#: admin/fai/faiHookEntry.tpl.c:23
-msgid "Choose an existing FAI task"
-msgstr ""
diff --git a/fai/locale/pt_BR/fusiondirectory.po b/fai/locale/pt_BR/fusiondirectory.po
index c3240e6bf714de5c0f8c7e53537e5da176e7fc87..08a159672f95b2ba348f6ba73503f4f1c38bc13c 100644
--- a/fai/locale/pt_BR/fusiondirectory.po
+++ b/fai/locale/pt_BR/fusiondirectory.po
@@ -3,384 +3,190 @@
 # This file is distributed under the same license as the PACKAGE package.
 # 
 # Translators:
-# ALEJANDRO BARRIOS <alejandrobarrios@interlegis.leg.br>, 2014
-# kayocarneiro <kayomatheus@gmail.com>, 2014
-# kayocarneiro <kayomatheus@gmail.com>, 2014
 msgid ""
 msgstr ""
-"Project-Id-Version: FusionDirectory-108\n"
+"Project-Id-Version: FusionDirectory-109\n"
 "Report-Msgid-Bugs-To: documentation@lists.fusiondirectory.org\n"
-"POT-Creation-Date: 2015-03-19 21:45+0100\n"
-"PO-Revision-Date: 2015-02-25 16:12+0000\n"
+"POT-Creation-Date: 2014-12-15 17:47+0100\n"
+"PO-Revision-Date: 2015-02-25 16:13+0000\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>\n"
-"Language-Team: Portuguese (Brazil) (http://www.transifex.com/projects/p/FusionDirectory-108/language/pt_BR/)\n"
+"Language-Team: Portuguese (Brazil) (http://www.transifex.com/projects/p/FusionDirectory-109/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/fai/class_faiScriptEntry.inc:79 admin/fai/class_faiScriptEntry.inc:82
-#: admin/fai/class_faiManagement.inc:240 admin/fai/class_faiManagement.inc:768
-#: admin/fai/class_faiManagement.inc:774
-#: admin/fai/class_faiPartitionTable.inc:268
-#: admin/fai/class_faiPartitionTable.inc:331
-#: admin/fai/class_faiDiskEntry.inc:445 admin/fai/class_FAI.inc:570
-#: admin/fai/class_faiHookEntry.inc:83 admin/fai/class_faiHookEntry.inc:86
-#: admin/fai/class_faiScript.inc:249 admin/fai/class_faiTemplate.inc:232
-#: admin/fai/class_faiHook.inc:259 admin/fai/class_faiVariable.inc:162
-#: admin/systems/class_faiLogView.inc:207
-#: admin/systems/class_faiLogView.inc:242
-msgid "Error"
-msgstr "Erro"
-
-#: admin/fai/class_faiScriptEntry.inc:82 admin/fai/class_faiHookEntry.inc:86
-msgid "file is empty"
-msgstr "arquivo estÃ¡ vazio"
-
-#: admin/fai/class_faiScriptEntry.inc:102 admin/fai/class_faiHookEntry.inc:102
-#: admin/fai/class_faiScript.inc:349 admin/fai/class_faiScript.inc:374
-#: admin/fai/class_faiTemplate.inc:320 admin/fai/class_faiHook.inc:346
-msgid "Download"
-msgstr "Download"
-
-#: admin/fai/class_faiScriptEntry.inc:147
-#: admin/fai/class_faiScriptEntry.inc:151
-#: admin/fai/class_faiScriptEntry.inc:154
-#: admin/fai/class_faiScriptEntry.inc:197
-#: admin/fai/class_faiManagement.inc:768 admin/fai/class_faiManagement.inc:774
-#: admin/fai/class_faiPackage.inc:685
-#: admin/fai/class_faiPartitionTable.inc:779
-#: admin/fai/class_faiDiskEntry.inc:702 admin/fai/class_faiDiskEntry.inc:705
-#: admin/fai/class_faiDiskEntry.inc:758
-#: admin/fai/class_faiTemplateEntry.inc:247
-#: admin/fai/class_faiTemplateEntry.inc:312
-#: admin/fai/class_faiPartitionTableEntry.inc:353
-#: admin/fai/class_faiPartitionTableEntry.inc:356
-#: admin/fai/class_faiPartitionTableEntry.inc:360
-#: admin/fai/class_faiPartitionTableEntry.inc:455
-#: admin/fai/packageSelect/selectPackage-list.xml:40
-#: admin/fai/class_faiProfile.inc:414 admin/fai/class_faiProfile.inc:463
-#: admin/fai/class_faiHookEntry.inc:157 admin/fai/class_faiHookEntry.inc:162
-#: admin/fai/class_faiHookEntry.inc:165 admin/fai/class_faiHookEntry.inc:207
-#: admin/fai/class_askClassName.inc:163 admin/fai/class_askClassName.inc:167
-#: admin/fai/class_askClassName.inc:171 admin/fai/class_askClassName.inc:198
-#: admin/fai/class_faiScript.inc:347 admin/fai/class_faiScript.inc:605
-#: admin/fai/classSelect/selectClass-list.xml:28
-#: admin/fai/class_faiTemplate.inc:512
-#: admin/fai/class_faiVariableEntry.inc:103
-#: admin/fai/class_faiVariableEntry.inc:112
-#: admin/fai/class_faiVariableEntry.inc:115
-#: admin/fai/class_faiVariableEntry.inc:149 admin/fai/class_faiHook.inc:531
-#: admin/fai/class_faiVariable.inc:398 admin/fai/fai-list.xml:80
-#: admin/fai/faiPartitionTableEntry.tpl.c:8 admin/fai/faiPartition.tpl.c:5
-#: admin/fai/faiVariableEntry.tpl.c:8 admin/fai/faiDiskEntry.tpl.c:8
-#: admin/fai/faiTemplate.tpl.c:8 admin/fai/faiVariable.tpl.c:8
-#: admin/fai/faiHook.tpl.c:8
-#: admin/fai/packageSelect/selectPackage-filter.tpl.c:8
-#: admin/fai/faiPackage.tpl.c:8 admin/fai/faiScriptEntry.tpl.c:8
-#: admin/fai/classSelect/selectClass-filter.tpl.c:5
-#: admin/fai/fai-filter.tpl.c:50 admin/fai/faiPartitionTable.tpl.c:8
-#: admin/fai/faiScript.tpl.c:8 admin/fai/faiProfile.tpl.c:8
-#: admin/fai/faiHookEntry.tpl.c:8
-msgid "Name"
-msgstr "Nome"
-
-#: admin/fai/class_faiScriptEntry.inc:159 admin/fai/class_faiHookEntry.inc:170
-#: admin/fai/class_faiScript.inc:594 admin/fai/fai-list.xml:122
-#: admin/fai/faiScriptEntry.tpl.c:29 admin/fai/faiHookEntry.tpl.c:29
-msgid "Script"
-msgstr "Script"
-
-#: admin/fai/class_faiScriptEntry.inc:190
-#: admin/fai/class_faiScriptEntry.inc:199
-msgid "Script entry"
-msgstr "Script"
-
-#: admin/fai/class_faiScriptEntry.inc:191
-msgid "FAI script entry"
-msgstr ""
-
-#: admin/fai/class_faiScriptEntry.inc:198 admin/fai/class_faiPackage.inc:686
-#: admin/fai/class_faiPartitionTable.inc:780
-#: admin/fai/class_faiDiskEntry.inc:759
-#: admin/fai/class_faiTemplateEntry.inc:313
-#: admin/fai/class_faiPartitionTableEntry.inc:456
-#: admin/fai/class_faiProfile.inc:464 admin/fai/class_faiHookEntry.inc:208
-#: admin/fai/class_faiScript.inc:606 admin/fai/class_faiTemplate.inc:513
-#: admin/fai/class_faiVariableEntry.inc:150 admin/fai/class_faiHook.inc:532
-#: admin/fai/class_faiVariable.inc:399
-#: admin/fai/faiPartitionTableEntry.tpl.c:11 admin/fai/faiPartition.tpl.c:11
-#: admin/fai/faiVariableEntry.tpl.c:11 admin/fai/faiDiskEntry.tpl.c:14
-#: admin/fai/faiTemplate.tpl.c:11 admin/fai/faiVariable.tpl.c:11
-#: admin/fai/faiHook.tpl.c:11 admin/fai/faiPackage.tpl.c:11
-#: admin/fai/faiTemplateEntry.tpl.c:14 admin/fai/faiScriptEntry.tpl.c:11
-#: admin/fai/faiPartitionTable.tpl.c:11 admin/fai/faiScript.tpl.c:11
-#: admin/fai/faiProfile.tpl.c:11 admin/fai/faiHookEntry.tpl.c:11
-msgid "Description"
-msgstr "DescriÃ§Ã£o"
-
-#: admin/fai/class_faiScriptEntry.inc:200
-msgid "Script Priority"
-msgstr ""
-
-#: admin/fai/class_faiManagement.inc:188
-msgid "partition table"
-msgstr ""
-
-#: admin/fai/class_faiManagement.inc:189 admin/fai/fai-list.xml:31
-msgid "script"
-msgstr "Script"
-
-#: admin/fai/class_faiManagement.inc:190 admin/fai/fai-list.xml:47
-msgid "hook"
-msgstr ""
-
-#: admin/fai/class_faiManagement.inc:191 admin/fai/fai-list.xml:39
-msgid "variable"
-msgstr "VariÃ¡vel"
-
-#: admin/fai/class_faiManagement.inc:192 admin/fai/fai-list.xml:63
-msgid "template"
-msgstr ""
-
-#: admin/fai/class_faiManagement.inc:193
-msgid "package list"
-msgstr "Lista de pacote"
-
-#: admin/fai/class_faiManagement.inc:210 admin/fai/class_faiManagement.inc:226
-#: admin/fai/class_faiManagement.inc:332 admin/fai/class_faiManagement.inc:390
-#: admin/fai/class_faiManagement.inc:480 admin/fai/class_faiManagement.inc:575
-#: admin/fai/class_faiManagement.inc:598 admin/fai/class_faiManagement.inc:619
-msgid "Permission error"
-msgstr "Erro de permissÃ£o"
-
-#: admin/fai/class_faiManagement.inc:211 admin/fai/class_faiManagement.inc:226
-#, php-format
-msgid "You have no permission to create a new %s!"
-msgstr "VocÃª nÃ£o tem permissÃ£o para criar um novo %s!"
-
-#: admin/fai/class_faiManagement.inc:226 admin/fai/fai-list.xml:55
-msgid "profile"
-msgstr "Perfil"
-
-#: admin/fai/class_faiManagement.inc:328
-msgid "Branch locked"
-msgstr "Filial bloqueada"
-
-#: admin/fai/class_faiManagement.inc:329
-#, php-format
-msgid "The following entries are locked, you can't remove them %s."
-msgstr "As seguintes entradas estÃ£o bloqueadas, vocÃª nÃ£o pode remove-los %s."
-
-#: admin/fai/class_faiManagement.inc:346
-msgid "FAI object"
-msgstr "Objeto FAI"
-
-#: admin/fai/class_faiManagement.inc:477
-msgid "FAI branch/freeze"
-msgstr ""
-
-#: admin/fai/class_faiManagement.inc:480
-msgid "You have no permission to delete this release!"
-msgstr "VocÃª nÃ£o tem permissÃ£o para deletar essa permissÃ£o!"
-
-#: admin/fai/class_faiManagement.inc:496 admin/fai/remove.tpl.c:2
-#: admin/fai/remove_branch.tpl.c:2
-msgid "Warning"
-msgstr "Aviso"
-
-#: admin/fai/class_faiManagement.inc:496
-msgid "Release remove aborted because the release name check failed!"
-msgstr "RemoÃ§Ã£o de liberaÃ§Ã£o abortada pois a checagem do nome de liberaÃ§Ã£o falhou!"
-
-#: admin/fai/class_faiManagement.inc:573 admin/fai/class_faiManagement.inc:596
-msgid "Configuration"
-msgstr "ConfiguraÃ§Ã£o"
-
-#: admin/fai/class_faiManagement.inc:575 admin/fai/class_faiManagement.inc:598
-#: admin/fai/class_faiManagement.inc:619
-msgid "Branch"
-msgstr "Filial"
-
-#: admin/fai/class_faiManagement.inc:725 admin/fai/askClassName.tpl.c:23
-msgid "Continue"
-msgstr "Continuar"
-
-#: admin/fai/class_faiManagement.inc:926
-#: admin/fai/class_faiPartitionTable.inc:768
-#: admin/fai/class_faiProfile.inc:318 admin/fai/class_askClassName.inc:99
-#: admin/fai/classSelect/class_classSelect.inc:58
-#: admin/fai/class_faiGroupHandle.inc:120
-#: admin/fai/class_faiProfileEntry.inc:163 admin/fai/fai-list.xml:146
-msgid "Partition table"
-msgstr "Tabela de partiÃ§Ã£o"
-
-#: admin/fai/class_faiManagement.inc:928
-#: admin/fai/class_faiGroupHandle.inc:122 admin/fai/fai-list.xml:140
-msgid "Package list"
-msgstr "Lista de pacote"
-
-#: admin/fai/class_faiManagement.inc:930
-#: admin/fai/class_faiGroupHandle.inc:124
-msgid "Scripts"
-msgstr "Script"
-
-#: admin/fai/class_faiManagement.inc:932
-#: admin/fai/class_faiGroupHandle.inc:126
-msgid "Variables"
-msgstr "VariÃ¡veis"
-
-#: admin/fai/class_faiManagement.inc:934
-#: admin/fai/class_faiGroupHandle.inc:128
-msgid "Hooks"
-msgstr "Ganchos"
-
-#: admin/fai/class_faiManagement.inc:936 admin/fai/class_faiProfile.inc:454
-#: admin/fai/class_askClassName.inc:104 admin/fai/class_faiGroupHandle.inc:130
-#: admin/fai/fai-list.xml:110
-msgid "Profile"
-msgstr "Perfil"
-
-#: admin/fai/class_faiManagement.inc:938
-#: admin/fai/class_faiGroupHandle.inc:132
-msgid "Templates"
-msgstr "Modelos"
-
-#: admin/fai/class_faiManagement.inc:1039
-#: admin/fai/class_faiManagement.inc:1045
+#: admin/fai/class_faiManagement.inc:117 admin/fai/class_faiManagement.inc:122
 #: admin/fai/packageSelect/selectPackage-list.xml:14
-#: admin/fai/classSelect/selectClass-list.xml:15
-#: admin/systems/class_faiStartup.inc:177 config/fai/class_faiConfig.inc:41
+#: admin/systems/class_faiStartup.inc:178 config/fai/class_faiConfig.inc:41
 msgid "FAI"
 msgstr "FAI"
 
-#: admin/fai/class_faiManagement.inc:1040
+#: 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/fai/class_faiPackage.inc:261
-msgid "Invalid package names"
-msgstr "Nome de pacote invÃ¡lido"
-
-#: admin/fai/class_faiPackage.inc:262
-#, php-format
-msgid "The following package names don't match the Debian policy: %s"
-msgstr "Os seguintes nomes de pacote nÃ£o correspondem a polÃtica Debian:%s"
-
-#: admin/fai/class_faiPackage.inc:421 admin/fai/class_faiPackage.inc:422
-msgid "Configured"
-msgstr "Configurado"
-
-#: admin/fai/class_faiPackage.inc:428 admin/fai/class_faiPackage.inc:429
-msgid "Package marked for removal"
-msgstr "Pacote marcado para remoÃ§Ã£o"
-
-#: admin/fai/class_faiPackage.inc:445
-msgid "Mark package for removal"
-msgstr "Marcar pacote para remoÃ§Ã£o"
-
-#: admin/fai/class_faiPackage.inc:451
-msgid "Configure this package"
-msgstr "Configurar este pacote"
+#: admin/fai/class_faiPackage.inc:157
+msgid "Mark for installation"
+msgstr ""
 
-#: admin/fai/class_faiPackage.inc:455
-msgid "Remove this package"
-msgstr "Remover este pacote"
+#: admin/fai/class_faiPackage.inc:161
+msgid "Mark for removal"
+msgstr ""
 
-#: admin/fai/class_faiPackage.inc:534
-msgid "Please select a least one package!"
-msgstr "Por favor, selecione ao menos um pacote."
+#: admin/fai/class_faiPackage.inc:166
+msgid "Edit configuration"
+msgstr ""
 
-#: admin/fai/class_faiPackage.inc:538
-msgid ""
-"Please choose a valid release/section combination for your repository setup!"
-msgstr "Por favor, escolha uma combinaÃ§Ã£o vÃ¡lida de liberaÃ§Ã£o/seÃ§Ã£o para sua configuraÃ§Ã£o de repositÃ³rio."
+#: admin/fai/class_faiPackage.inc:247
+#: admin/fai/class_faiPartitionTable.inc:209
+#: admin/fai/class_faiPartitionTable.inc:250
+#: admin/fai/class_faiTemplate.inc:114
+#: admin/systems/services/repository/class_serviceDebianRepository.inc:172
+#: admin/systems/services/repository/class_serviceDebianRepository.inc:189
+#: admin/systems/services/repository/class_serviceDebianRepository.inc:193
+msgid "LDAP error"
+msgstr "Erro de LDAP"
 
-#: admin/fai/class_faiPackage.inc:571
+#: admin/fai/class_faiPackage.inc:279
 #: admin/fai/packageSelect/class_filterFAIPackages.inc:41
 #: admin/fai/packageSelect/class_filterFAIPackages.inc:46
 #: admin/fai/class_faiPackageConfiguration.inc:55
-#: admin/systems/class_faiStartup.inc:132
-#: admin/systems/class_faiStartup.inc:159
-msgid "Infrastructure service"
-msgstr ""
+#: admin/systems/class_faiStartup.inc:133
+#: admin/systems/class_faiStartup.inc:160
+msgid "Service infrastructure"
+msgstr "Infraestrutura do serviÃ§o"
 
-#: admin/fai/class_faiPackage.inc:587
+#: admin/fai/class_faiPackage.inc:294
 msgid "Unkown packages"
 msgstr "Pacotes desconhecidos"
 
-#: admin/fai/class_faiPackage.inc:674
-#: admin/fai/faiPackageConfiguration.tpl.c:2
+#: admin/fai/class_faiPackage.inc:365
 msgid "Package"
 msgstr "Pacote"
 
-#: admin/fai/class_faiPackage.inc:675
+#: admin/fai/class_faiPackage.inc:366
 msgid "FAI Package list"
 msgstr "Lista de pacotes FAI"
 
-#: admin/fai/class_faiPackage.inc:679
+#: admin/fai/class_faiPackage.inc:369
 msgid "FAI Package"
 msgstr "Pacote FAI"
 
-#: admin/fai/class_faiPackage.inc:687
-msgid "Packages"
-msgstr "Pacotes"
+#: admin/fai/class_faiPackage.inc:385
+#: admin/fai/class_faiPartitionTable.inc:304
+#: admin/fai/class_faiTemplateEntry.inc:140 admin/fai/class_faiProfile.inc:47
+#: admin/fai/class_faiScript.inc:50 admin/fai/class_faiTemplate.inc:173
+#: admin/fai/class_faiHook.inc:50 admin/fai/class_faiVariable.inc:50
+msgid "Properties"
+msgstr "Propriedades"
 
-#: admin/fai/class_faiPackage.inc:688 admin/fai/faiPackage.tpl.c:23
-msgid "Section"
-msgstr "SeÃ§Ã£o"
+#: admin/fai/class_faiPackage.inc:388
+#: admin/fai/class_faiPartitionTable.inc:307 admin/fai/class_faiProfile.inc:50
+#: admin/fai/class_faiScript.inc:53 admin/fai/class_faiTemplate.inc:176
+#: admin/fai/class_faiHook.inc:53 admin/fai/class_faiVariable.inc:53
+msgid "Class name"
+msgstr "Nome da classe"
 
-#: admin/fai/class_faiPackage.inc:688 admin/fai/class_faiPackage.inc:691
-#: admin/fai/class_faiScript.inc:605 admin/fai/class_faiTemplate.inc:512
-msgid "Readonly"
-msgstr "Apenas leitura"
+#: admin/fai/class_faiPackage.inc:388 admin/fai/class_faiScript.inc:53
+#: admin/fai/class_faiHook.inc:53 admin/fai/class_faiVariable.inc:53
+msgid "Variables class name"
+msgstr ""
 
-#: admin/fai/class_faiPackage.inc:689
-msgid "Install Method"
-msgstr "Instalar mÃ©todos"
+#: admin/fai/class_faiPackage.inc:392
+#: admin/fai/class_faiPartitionTable.inc:311
+#: admin/fai/class_faiDiskEntry.inc:738
+#: admin/fai/class_faiTemplateEntry.inc:147 admin/fai/class_faiProfile.inc:54
+#: admin/fai/class_faiScript.inc:57 admin/fai/class_faiScript.inc:75
+#: admin/fai/class_faiTemplate.inc:180 admin/fai/class_faiHook.inc:57
+#: admin/fai/class_faiHook.inc:75 admin/fai/class_faiVariable.inc:57
+#: admin/fai/class_faiVariable.inc:75
+msgid "Description"
+msgstr "DescriÃ§Ã£o"
 
-#: admin/fai/class_faiPackage.inc:690
-msgid "Package configuration"
-msgstr "ConfiguraÃ§Ã£o de pacote"
+#: admin/fai/class_faiPackage.inc:392
+#: admin/fai/class_faiPartitionTable.inc:311 admin/fai/class_faiProfile.inc:54
+#: admin/fai/class_faiScript.inc:57 admin/fai/class_faiTemplate.inc:180
+#: admin/fai/class_faiHook.inc:57 admin/fai/class_faiVariable.inc:57
+msgid "Short description of the class"
+msgstr ""
 
-#: admin/fai/class_faiPackage.inc:691 admin/systems/class_faiStartup.inc:78
-#: admin/systems/services/repository/class_serviceRepository.inc:40
-#: admin/fai/branch_selector.tpl.c:14 admin/fai/faiPackage.tpl.c:20
-#: admin/fai/fai-filter.tpl.c:5 admin/fai/fai-filter.tpl.c:14
+#: admin/fai/class_faiPackage.inc:398 admin/systems/class_faiStartup.inc:90
+msgid "Repository"
+msgstr "RepositÃ³rio"
+
+#: admin/fai/class_faiPackage.inc:401 admin/systems/class_faiStartup.inc:78
+#: admin/systems/services/repository/class_serviceDebianRepository.inc:52
+#: admin/systems/services/repository/class_serviceCentosRepository.inc:49
 msgid "Release"
 msgstr "LiberaÃ§Ã£o"
 
-#: admin/fai/class_faiPartitionTable.inc:269
-#: admin/fai/class_faiDiskEntry.inc:446
-#, php-format
-msgid ""
-"The disk cannot be deleted while it is used in the '%s' disk definition!"
-msgstr "O disco nÃ£o pode ser deletado enquanto Ã©  '%s' usado em definiÃ§Ã£o de disco!"
+#: admin/fai/class_faiPackage.inc:401
+msgid "Debian release concerned"
+msgstr ""
+
+#: admin/fai/class_faiPackage.inc:405
+#: admin/systems/services/repository/class_serviceDebianRepository.inc:58
+msgid "Sections"
+msgstr ""
+
+#: admin/fai/class_faiPackage.inc:405
+msgid "Sections concerned"
+msgstr ""
+
+#: admin/fai/class_faiPackage.inc:409
+msgid "Install method"
+msgstr ""
+
+#: admin/fai/class_faiPackage.inc:409
+msgid "Install method to use for this package list"
+msgstr ""
+
+#: admin/fai/class_faiPackage.inc:420
+msgid "Packages"
+msgstr "Pacotes"
 
-#: admin/fai/class_faiPartitionTable.inc:416 admin/fai/class_faiScript.inc:360
-#: admin/fai/class_faiScript.inc:362 admin/fai/class_faiTemplate.inc:306
-#: admin/fai/class_faiTemplate.inc:308
-msgid "edit"
-msgstr "editar"
+#: admin/fai/class_faiPackage.inc:424
+msgid "Packages in this class"
+msgstr ""
 
-#: admin/fai/class_faiPartitionTable.inc:418 admin/fai/class_faiScript.inc:364
-#: admin/fai/class_faiTemplate.inc:310
-msgid "delete"
-msgstr "deletar"
+#: admin/fai/class_faiPartitionTable.inc:61
+#: admin/fai/class_faiDiskEntry.inc:442 admin/systems/class_faiLogView.inc:207
+#: admin/systems/class_faiLogView.inc:242
+msgid "Error"
+msgstr "Erro"
 
-#: admin/fai/class_faiPartitionTable.inc:769
-#: admin/fai/class_faiPartitionTable.inc:773
+#: admin/fai/class_faiPartitionTable.inc:112
+msgid "Add RAID"
+msgstr ""
+
+#: admin/fai/class_faiPartitionTable.inc:116
+msgid "Add LVM"
+msgstr ""
+
+#: admin/fai/class_faiPartitionTable.inc:284
+msgid "Partition table"
+msgstr "Tabela de partiÃ§Ã£o"
+
+#: admin/fai/class_faiPartitionTable.inc:285
+#: admin/fai/class_faiPartitionTable.inc:288
 msgid "FAI partition table"
 msgstr "Tabela de partiÃ§Ã£o FAI"
 
-#: admin/fai/class_faiPartitionTable.inc:779 admin/fai/class_faiHook.inc:531
-#: admin/fai/class_faiVariable.inc:398
-msgid "Read only"
-msgstr "Somente leitura"
+#: admin/fai/class_faiPartitionTable.inc:307 admin/fai/class_faiProfile.inc:50
+msgid "Partition table class name"
+msgstr ""
+
+#: admin/fai/class_faiPartitionTable.inc:317
+msgid "Discs"
+msgstr ""
+
+#: admin/fai/class_faiPartitionTable.inc:324
+msgid "Partitions in this class"
+msgstr ""
 
 #: admin/fai/class_faiDiskEntry.inc:273
-#: admin/fai/faiPartitionTableEntry.tpl.c:5 admin/fai/faiDiskEntry.tpl.c:5
 msgid "Device"
 msgstr "Dispositivo"
 
@@ -392,103 +198,103 @@ msgstr "RÃ³tulo"
 msgid "UUID"
 msgstr "UUID"
 
-#: admin/fai/class_faiDiskEntry.inc:345
+#: admin/fai/class_faiDiskEntry.inc:344
 msgid "Disks"
 msgstr "Discos"
 
-#: admin/fai/class_faiDiskEntry.inc:348 admin/fai/class_faiPartition.inc:321
-#: admin/fai/faiPartition.tpl.c:14
+#: admin/fai/class_faiDiskEntry.inc:347 admin/fai/class_faiPartition.inc:319
 msgid "Size"
 msgstr "Tamanho"
 
-#: admin/fai/class_faiDiskEntry.inc:544
+#: admin/fai/class_faiDiskEntry.inc:443
+#, php-format
+msgid ""
+"The disk cannot be deleted while it is used in the '%s' disk definition!"
+msgstr "O disco nÃ£o pode ser deletado enquanto Ã©  '%s' usado em definiÃ§Ã£o de disco!"
+
+#: admin/fai/class_faiDiskEntry.inc:536
 msgid "encrypted"
 msgstr "Encriptado"
 
-#: admin/fai/class_faiDiskEntry.inc:547
+#: admin/fai/class_faiDiskEntry.inc:539
 msgid "bootable"
 msgstr "BootÃ¡vel"
 
-#: admin/fai/class_faiDiskEntry.inc:550
+#: admin/fai/class_faiDiskEntry.inc:542
 msgid "preserve"
 msgstr "preservar"
 
-#: admin/fai/class_faiDiskEntry.inc:735
+#: admin/fai/class_faiDiskEntry.inc:687 admin/fai/class_faiDiskEntry.inc:690
+#: admin/fai/class_faiDiskEntry.inc:737
+#: admin/fai/packageSelect/selectPackage-list.xml:40
+#: admin/fai/class_faiScript.inc:71 admin/fai/class_faiHook.inc:71
+#: admin/fai/class_faiVariable.inc:71
+#: admin/fai/class_faiSimplePluginClass.inc:50
+msgid "Name"
+msgstr "Nome"
+
+#: admin/fai/class_faiDiskEntry.inc:717
 msgid ""
 "You have more than four primary partition table entries in your "
 "configuration, please check your configuration twice."
 msgstr "VocÃª tem mais de quatro entradas da tabela de partiÃ§Ã£o primÃ¡ria em sua configuraÃ§Ã£o, por favor cheque sua configuraÃ§Ã£o novamente."
 
-#: admin/fai/class_faiDiskEntry.inc:739
+#: admin/fai/class_faiDiskEntry.inc:721
 msgid ""
 "You cannot have more than three primary partition while using logical "
 "partitions, please check your configuration twice."
 msgstr "VocÃª nÃ£o pode ter mais do que trÃªs partiÃ§Ã£o primÃ¡ria ao usar partiÃ§Ãµes lÃ³gicas, por favor, verifique a configuraÃ§Ã£o novamente."
 
-#: admin/fai/class_faiDiskEntry.inc:752
-#: admin/fai/class_faiPartitionTableEntry.inc:448
+#: admin/fai/class_faiDiskEntry.inc:733
 msgid "Partition table entry"
 msgstr "Entrada na tabela de partiÃ§Ã£o"
 
-#: admin/fai/class_faiDiskEntry.inc:753
-#: admin/fai/class_faiPartitionTableEntry.inc:449
+#: admin/fai/class_faiDiskEntry.inc:734
 msgid "FAI partition table entry"
 msgstr "Entrada na tabela de partiÃ§Ã£o FAI"
 
-#: admin/fai/class_faiDiskEntry.inc:760
+#: admin/fai/class_faiDiskEntry.inc:739
 msgid "Disk options"
 msgstr "OpÃ§Ãµes de disco"
 
-#: admin/fai/class_faiDiskEntry.inc:761
-#: admin/fai/class_faiPartitionTableEntry.inc:457
+#: admin/fai/class_faiDiskEntry.inc:740
 msgid "Partition type"
 msgstr "Tipo de partiÃ§Ã£o"
 
-#: admin/fai/class_faiDiskEntry.inc:762
-#: admin/fai/class_faiPartitionTableEntry.inc:458
+#: admin/fai/class_faiDiskEntry.inc:741
 msgid "Partition no."
 msgstr "NÃºmero da partiÃ§Ã£o"
 
-#: admin/fai/class_faiDiskEntry.inc:763
-#: admin/fai/class_faiPartitionTableEntry.inc:459
+#: admin/fai/class_faiDiskEntry.inc:742
 msgid "File system type"
 msgstr "Tipo de sistema de arquivos"
 
-#: admin/fai/class_faiDiskEntry.inc:764
-#: admin/fai/class_faiPartitionTableEntry.inc:171
-#: admin/fai/class_faiPartitionTableEntry.inc:460
-#: admin/fai/class_faiPartition.inc:437 admin/fai/faiPartition.tpl.c:47
+#: admin/fai/class_faiDiskEntry.inc:743 admin/fai/class_faiPartition.inc:432
 msgid "Mount point"
 msgstr "Ponto de montagem"
 
-#: admin/fai/class_faiDiskEntry.inc:765
-#: admin/fai/class_faiPartitionTableEntry.inc:461
-#: admin/fai/class_faiPartition.inc:402 admin/fai/class_faiPartition.inc:407
+#: admin/fai/class_faiDiskEntry.inc:744 admin/fai/class_faiPartition.inc:397
+#: admin/fai/class_faiPartition.inc:402
 msgid "Partition size"
 msgstr "Tamanho da partiÃ§Ã£o"
 
-#: admin/fai/class_faiDiskEntry.inc:766
-#: admin/fai/class_faiPartitionTableEntry.inc:173
-#: admin/fai/class_faiPartitionTableEntry.inc:462
-#: admin/fai/faiPartition.tpl.c:50
+#: admin/fai/class_faiDiskEntry.inc:745
 msgid "Mount options"
 msgstr "OpÃ§Ãµes de montagem"
 
-#: admin/fai/class_faiDiskEntry.inc:767
-#: admin/fai/class_faiPartitionTableEntry.inc:463
+#: admin/fai/class_faiDiskEntry.inc:746
 msgid "File system options"
 msgstr "OpÃ§Ãµes de sistema de arquivos"
 
-#: admin/fai/class_faiDiskEntry.inc:768
-#: admin/fai/class_faiPartitionTableEntry.inc:464
+#: admin/fai/class_faiDiskEntry.inc:747
 msgid "Partition flags"
 msgstr "Bandeiras de partiÃ§Ã£o"
 
-#: admin/fai/class_debconfTemplate.inc:227
+#: admin/fai/class_debconfTemplate.inc:225
 msgid "This package has no debconf options."
 msgstr "Este pacote nÃ£o possui opÃ§Ãµes de debconf."
 
-#: admin/fai/class_debconfTemplate.inc:264
+#: admin/fai/class_debconfTemplate.inc:262
 msgid ""
 "This debconf question is dynamically generated during package installation "
 "and requires choosing between specific options which cannot be presented "
@@ -496,217 +302,59 @@ msgid ""
 " effect."
 msgstr "Esta questÃ£o debconf Ã© gerado dinamicamente durante a instalaÃ§Ã£o do pacote e requer a escolha entre as opÃ§Ãµes especÃficas que nÃ£o podem ser apresentados aqui. O texto digitado deve ser uma das opÃ§Ãµes vÃ¡lidas, a fim de entrar em vigor."
 
-#: admin/fai/class_faiTemplateEntry.inc:139
-msgid "no file uploaded yet"
-msgstr "nenhum arquivo enviado ainda"
-
-#: admin/fai/class_faiTemplateEntry.inc:142
-#, php-format
-msgid "exists in database (size: %s bytes)"
-msgstr "existe no banco de dados (tamanho: %s bytes)"
-
-#: admin/fai/class_faiTemplateEntry.inc:251
-#: admin/systems/class_faiLogView.inc:70 admin/fai/faiTemplateEntry.tpl.c:23
-msgid "File"
-msgstr "Arquivo"
-
-#: admin/fai/class_faiTemplateEntry.inc:255
-#: admin/fai/faiTemplateEntry.tpl.c:11
-msgid "Destination path"
-msgstr "Caminho de destino"
-
-#: admin/fai/class_faiTemplateEntry.inc:260 admin/fai/faiTemplateEntry.tpl.c:8
-msgid "File name"
-msgstr "Nome do arquivo"
-
-#: admin/fai/class_faiTemplateEntry.inc:264
-#: admin/fai/class_faiTemplateEntry.inc:266
-#: admin/fai/faiTemplateEntry.tpl.c:68
-msgid "User"
-msgstr "UsuÃ¡rio"
-
-#: admin/fai/class_faiTemplateEntry.inc:270
-#: admin/fai/class_faiTemplateEntry.inc:273
-#: admin/fai/class_faiTemplateEntry.inc:275
-#: admin/fai/faiTemplateEntry.tpl.c:47 admin/fai/faiTemplateEntry.tpl.c:74
-msgid "Group"
-msgstr "Grupo"
-
-#: admin/fai/class_faiTemplateEntry.inc:305
-msgid "Template entry"
-msgstr "Entrada de Template"
-
-#: admin/fai/class_faiTemplateEntry.inc:306
-msgid "FAI template entry"
-msgstr "Modelo de entrada FAI"
-
-#: admin/fai/class_faiTemplateEntry.inc:314
-msgid "Template file"
-msgstr "Arquivo modelo"
-
-#: admin/fai/class_faiTemplateEntry.inc:315
-msgid "Template path"
-msgstr "Caminho do modelo"
-
-#: admin/fai/class_faiTemplateEntry.inc:316
-msgid "File owner"
-msgstr "Dono do arquivo"
-
-#: admin/fai/class_faiTemplateEntry.inc:317
-msgid "File permissions"
-msgstr "PermissÃµes do arquivo"
-
-#: admin/fai/class_FAI.inc:287 admin/fai/class_FAI.inc:679
-#: admin/fai/class_FAI.inc:1266 admin/fai/class_FAI.inc:1283
-#: admin/fai/class_FAI.inc:1287
-msgid "LDAP error"
-msgstr "Erro de LDAP"
-
-#: admin/fai/class_FAI.inc:570
-#, php-format
-msgid "Error, following objects should be equal '%s' and '%s'"
-msgstr "Erro, os seguintes objetos devem ser iguais a '%s' e '%s'"
-
-#: admin/fai/class_FAI.inc:891
-#, php-format
-msgid "Creating group application release for %s"
-msgstr ""
-
-#: admin/fai/class_FAI.inc:960 admin/fai/class_FAI.inc:982
-#: admin/fai/class_FAI.inc:1022 admin/fai/class_FAI.inc:1027
-#: admin/fai/class_FAI.inc:1065
-msgid "Object"
-msgstr "Objeto"
-
-#: admin/fai/class_FAI.inc:961
-#, php-format
-msgid "Adding missing group application release container %s."
-msgstr ""
-
-#: admin/fai/class_FAI.inc:983
-#, php-format
-msgid "Adding group application release container %s."
+#: admin/fai/class_faiTemplateEntry.inc:143
+msgid "File path"
 msgstr ""
 
-#: admin/fai/class_FAI.inc:1023
-#, php-format
-msgid "Could not create menu entry %s. (Already exists)."
+#: admin/fai/class_faiTemplateEntry.inc:143
+msgid "Complete absolute template file path and name"
 msgstr ""
 
-#: admin/fai/class_FAI.inc:1028
-#, php-format
-msgid "Created group application menu entry for %s."
+#: admin/fai/class_faiTemplateEntry.inc:147
+msgid "Short description of the file"
 msgstr ""
 
-#: admin/fai/class_FAI.inc:1059
-#, php-format
-msgid "Creating copy of %s"
+#: admin/fai/class_faiTemplateEntry.inc:156
+msgid "Template attributes"
 msgstr ""
 
-#: admin/fai/class_FAI.inc:1062
-msgid "Processing"
+#: admin/fai/class_faiTemplateEntry.inc:160
+msgid "Template file content"
 msgstr ""
 
-#: admin/fai/class_FAI.inc:1080
-msgid "Could not create new release, the destination dn is already in use."
+#: admin/fai/class_faiTemplateEntry.inc:160
+msgid "Content of the template file"
 msgstr ""
 
-#: admin/fai/class_FAI.inc:1093
-msgid "Error while fetching source dn - aborted!"
+#: admin/fai/class_faiTemplateEntry.inc:164
+msgid "Owner and group of the file"
 msgstr ""
 
-#: admin/fai/class_FAI.inc:1174
-msgid "Fatal error"
-msgstr "Erro fatal"
-
-#: admin/fai/class_FAI.inc:1175
-#, php-format
-msgid ""
-"Release creation failed due to ldap errors. Additional informations '%s'."
-msgstr ""
-
-#: admin/fai/class_faiPartitionTableEntry.inc:162
-msgid "primary"
-msgstr "primÃ¡rio"
-
-#: admin/fai/class_faiPartitionTableEntry.inc:162
-msgid "logical"
-msgstr "lÃ³gico"
-
-#: admin/fai/class_faiPartitionTableEntry.inc:169
-#: admin/fai/faiPartition.tpl.c:8
-msgid "Type"
-msgstr "Tipo"
-
-#: admin/fai/class_faiPartitionTableEntry.inc:170
-msgid "FS type"
-msgstr "Tipo FS"
-
-#: admin/fai/class_faiPartitionTableEntry.inc:172
-msgid "Size in MB"
-msgstr "Tamanho em MB"
-
-#: admin/fai/class_faiPartitionTableEntry.inc:174
-msgid "FS option"
-msgstr ""
-
-#: admin/fai/class_faiPartitionTableEntry.inc:175
-#: admin/fai/faiPartition.tpl.c:23
-msgid "Preserve"
-msgstr ""
-
-#: admin/fai/class_faiPartitionTableEntry.inc:266
-msgid "False"
-msgstr "Falso"
-
-#: admin/fai/class_faiPartitionTableEntry.inc:268
-msgid "True"
-msgstr "Verdadeiro"
-
-#: admin/fai/class_faiPartitionTableEntry.inc:272
-#: admin/fai/class_faiPartitionTableEntry.inc:274 admin/fai/fai-list.xml:159
-#: admin/fai/fai-list.xml:198
-msgid "Remove"
-msgstr "Remover"
+#: admin/fai/class_faiTemplateEntry.inc:167
+msgid "Owner"
+msgstr "ProprietÃ¡rio"
 
-#: admin/fai/class_faiPartitionTableEntry.inc:384
-#, php-format
-msgid "please enter a unique mount point for partition %s"
-msgstr ""
+#: admin/fai/class_faiTemplateEntry.inc:167
+msgid "File owner"
+msgstr "Dono do arquivo"
 
-#: admin/fai/class_faiPartitionTableEntry.inc:389
-#, php-format
-msgid "partition %s mount point"
-msgstr ""
+#: admin/fai/class_faiTemplateEntry.inc:172
+msgid "Group"
+msgstr "Grupo"
 
-#: admin/fai/class_faiPartitionTableEntry.inc:394
-#, php-format
-msgid ""
-"File system type 'swap' is already used, change file system type for "
-"partition %s."
+#: admin/fai/class_faiTemplateEntry.inc:172
+msgid "File group"
 msgstr ""
 
-#: admin/fai/class_faiPartitionTableEntry.inc:398
-msgid "Please use 'swap' as mount point, if 'swap' is used as fs-type."
+#: admin/fai/class_faiTemplateEntry.inc:181
+msgid "Access"
 msgstr ""
 
-#: admin/fai/class_faiPartitionTableEntry.inc:404
-#: admin/fai/class_faiPartitionTableEntry.inc:408
-#: admin/fai/class_faiPartitionTableEntry.inc:414
-#: admin/fai/class_faiPartitionTableEntry.inc:416
-#: admin/fai/class_faiPartitionTableEntry.inc:421
-#, php-format
-msgid "partition %s size"
+#: admin/fai/class_faiTemplateEntry.inc:181
+msgid "Access rights"
 msgstr ""
 
-#: admin/fai/class_faiPartitionTableEntry.inc:436
-msgid ""
-"You have more than 3 primary partition table entries in your configuration, "
-"please check your configuration twice."
-msgstr "VocÃª tem mais que 3 entradas na tabela de partiÃ§Ãµes primÃ¡rias. Por favor, confira duas vezes suas configuraÃ§Ãµes."
-
 #: admin/fai/packageSelect/selectPackage-list.xml:10
-#: admin/fai/classSelect/selectClass-list.xml:11
 msgid "Please select the desired entries"
 msgstr "Por favor, selecione as entradas desejadas"
 
@@ -714,147 +362,94 @@ msgstr "Por favor, selecione as entradas desejadas"
 msgid "Version"
 msgstr ""
 
-#: admin/fai/class_faiProfile.inc:310
-msgid "This list displays all assigned class names for this profile."
-msgstr "Esta lista mostra todos os nomes de classes designados para este perfil."
-
-#: admin/fai/class_faiProfile.inc:313 admin/fai/class_askClassName.inc:103
-#: admin/fai/classSelect/class_classSelect.inc:53
-#: admin/fai/class_faiProfileEntry.inc:158
-msgid "Hook bundle"
-msgstr ""
-
-#: admin/fai/class_faiProfile.inc:314 admin/fai/class_askClassName.inc:105
-#: admin/fai/classSelect/class_classSelect.inc:54
-#: admin/fai/class_faiProfileEntry.inc:159
-msgid "Template bundle"
-msgstr ""
-
-#: admin/fai/class_faiProfile.inc:315 admin/fai/class_askClassName.inc:101
-#: admin/fai/classSelect/class_classSelect.inc:55
-#: admin/fai/class_faiProfileEntry.inc:160
-msgid "Script bundle"
-msgstr ""
-
-#: admin/fai/class_faiProfile.inc:316 admin/fai/class_askClassName.inc:102
-#: admin/fai/classSelect/class_classSelect.inc:56
-#: admin/fai/class_faiProfileEntry.inc:161
-msgid "Variable bundle"
-msgstr ""
-
-#: admin/fai/class_faiProfile.inc:317 admin/fai/class_askClassName.inc:100
-#: admin/fai/classSelect/class_classSelect.inc:57
-#: admin/fai/class_faiProfileEntry.inc:162
-msgid "Package bundle"
-msgstr ""
-
-#: admin/fai/class_faiProfile.inc:321
-msgid "Remove class from profile"
-msgstr ""
-
-#: admin/fai/class_faiProfile.inc:324
-msgid "Up"
-msgstr "Subir"
-
-#: admin/fai/class_faiProfile.inc:325
-msgid "Down"
-msgstr "Descer"
-
-#: admin/fai/class_faiProfile.inc:410
-msgid "No class specified for this profile!"
-msgstr ""
-
-#: admin/fai/class_faiProfile.inc:419
-msgid "You can't use the same name for a class and a profile!"
-msgstr ""
+#: admin/fai/class_faiProfile.inc:28
+msgid "Profile"
+msgstr "Perfil"
 
-#: admin/fai/class_faiProfile.inc:455
+#: admin/fai/class_faiProfile.inc:29
 msgid "FAI profile"
 msgstr ""
 
-#: admin/fai/class_faiProfile.inc:458
+#: admin/fai/class_faiProfile.inc:32
 msgid "FAI Profile"
 msgstr ""
 
-#: admin/fai/class_faiProfile.inc:465 admin/fai/faiProfile.tpl.c:17
+#: admin/fai/class_faiProfile.inc:61
 msgid "FAI classes"
 msgstr ""
 
-#: admin/fai/class_faiHookEntry.inc:200
-msgid "Hook entry"
+#: admin/fai/class_faiProfile.inc:61
+msgid "FAI classes which are part of this profile"
 msgstr ""
 
-#: admin/fai/class_faiHookEntry.inc:201
-msgid "FAI hook entry"
-msgstr ""
+#: admin/fai/class_faiPackageConfiguration.inc:88
+#, php-format
+msgid "Debconf information for package '%s'"
+msgstr "InformaÃ§Ã£o debconf para o pacote '%s'"
 
-#: admin/fai/class_faiHookEntry.inc:209 admin/fai/faiHookEntry.tpl.c:20
-msgid "Task"
-msgstr "Tarefa"
+#: admin/fai/class_faiScript.inc:30 admin/fai/class_faiScript.inc:84
+#: admin/fai/class_faiHook.inc:87
+msgid "Script"
+msgstr "Script"
 
-#: admin/fai/class_faiHookEntry.inc:210 admin/fai/class_faiScript.inc:595
-#: admin/fai/class_faiScript.inc:599
+#: admin/fai/class_faiScript.inc:31 admin/fai/class_faiScript.inc:34
 msgid "FAI script"
 msgstr ""
 
-#: admin/fai/class_faiPackageConfiguration.inc:88
-#, php-format
-msgid "Debconf information for package '%s'"
-msgstr "InformaÃ§Ã£o debconf para o pacote '%s'"
+#: admin/fai/class_faiScript.inc:63
+msgid "Scripts"
+msgstr "Script"
 
-#: admin/fai/class_askClassName.inc:99 admin/fai/class_askClassName.inc:100
-#: admin/fai/class_askClassName.inc:101 admin/fai/class_askClassName.inc:102
-#: admin/fai/class_askClassName.inc:103 admin/fai/class_askClassName.inc:104
-#: admin/fai/class_askClassName.inc:105 admin/fai/class_askClassName.inc:106
-msgid "Create new FAI object"
+#: admin/fai/class_faiScript.inc:67 admin/fai/class_faiHook.inc:67
+#: admin/fai/class_faiVariable.inc:67
+msgid "Variables in this class"
 msgstr ""
 
-#: admin/fai/class_faiTemplateEdit.inc:80
-#, php-format
-msgid ""
-"The file encodig has changed from '%s' to '%s'. Do you really want to save?"
+#: admin/fai/class_faiScript.inc:71 admin/fai/class_faiHook.inc:71
+#: admin/fai/class_faiVariable.inc:71
+msgid "The name of the variable"
 msgstr ""
 
-#: admin/fai/class_faiScript.inc:333 admin/fai/class_faiScript.inc:335
-msgid "Sort direction"
+#: admin/fai/class_faiScript.inc:75 admin/fai/class_faiHook.inc:75
+#: admin/fai/class_faiVariable.inc:75
+msgid "A short description of the variable"
 msgstr ""
 
-#: admin/fai/class_faiScript.inc:348 admin/fai/faiScriptEntry.tpl.c:20
+#: admin/fai/class_faiScript.inc:79
 msgid "Priority"
 msgstr ""
 
-#: admin/fai/class_faiScript.inc:350
-msgid "Action"
-msgstr "AÃ§Ã£o"
+#: admin/fai/class_faiScript.inc:79
+msgid "Priority of this script (FIXME: less is done first?)"
+msgstr ""
 
-#: admin/fai/classSelect/selectClass-list.xml:36 admin/fai/fai-list.xml:88
-#: admin/fai/faiScriptEntry.tpl.c:14
-msgid "Properties"
-msgstr "Propriedades"
+#: admin/fai/class_faiScript.inc:84
+msgid "The script itself"
+msgstr ""
 
-#: admin/fai/class_faiTemplate.inc:501 admin/fai/fai-list.xml:116
+#: admin/fai/class_faiTemplate.inc:136
+#, php-format
+msgid "There are several files with the same path: %s"
+msgstr ""
+
+#: admin/fai/class_faiTemplate.inc:153
 msgid "Template"
 msgstr "Modelo"
 
-#: admin/fai/class_faiTemplate.inc:502 admin/fai/class_faiTemplate.inc:506
+#: admin/fai/class_faiTemplate.inc:154 admin/fai/class_faiTemplate.inc:157
 msgid "FAI template"
 msgstr ""
 
-#: admin/fai/class_faiVariableEntry.inc:107
-msgid "Content"
-msgstr "ConteÃºdo"
-
-#: admin/fai/class_faiVariableEntry.inc:142
-msgid "Variable entry"
+#: admin/fai/class_faiTemplate.inc:176
+msgid "Template class name"
 msgstr ""
 
-#: admin/fai/class_faiVariableEntry.inc:143
-msgid "FAI variable entry "
+#: admin/fai/class_faiTemplate.inc:186
+msgid "Template files"
 msgstr ""
 
-#: admin/fai/class_faiVariableEntry.inc:151
-#: admin/fai/faiVariableEntry.tpl.c:20
-msgid "Variable content"
+#: admin/fai/class_faiTemplate.inc:190
+msgid "Template files in this class"
 msgstr ""
 
 #: admin/fai/class_faiPartition.inc:176 admin/fai/class_faiPartition.inc:180
@@ -953,96 +548,75 @@ msgstr ""
 msgid "btrfs"
 msgstr ""
 
-#: admin/fai/class_faiPartition.inc:224
-msgid "LVM/RAID"
-msgstr ""
-
-#: admin/fai/class_faiPartition.inc:327
+#: admin/fai/class_faiPartition.inc:325
 msgid "spare"
 msgstr ""
 
-#: admin/fai/class_faiPartition.inc:330
+#: admin/fai/class_faiPartition.inc:328
 msgid "missing"
 msgstr ""
 
-#: admin/fai/class_faiPartition.inc:333
+#: admin/fai/class_faiPartition.inc:331
 msgid "Options"
 msgstr "OpÃ§Ãµes"
 
-#: admin/fai/class_faiPartition.inc:420
+#: admin/fai/class_faiPartition.inc:415
 msgid "Minimum partition size"
 msgstr ""
 
-#: admin/fai/class_faiPartition.inc:420
+#: admin/fai/class_faiPartition.inc:415
 msgid "Maximum partition size"
 msgstr ""
 
-#: admin/fai/class_faiPartition.inc:428
+#: admin/fai/class_faiPartition.inc:423
 msgid "Raid arrays must contain at least two partitions!"
 msgstr ""
 
-#: admin/fai/class_faiPartition.inc:430
+#: admin/fai/class_faiPartition.inc:425
 msgid ""
 "Raid 0 arrays can only be realized with a combination of two partitions!"
 msgstr ""
 
-#: admin/fai/class_faiHook.inc:332 admin/fai/class_faiHook.inc:334
-#: admin/fai/fai-list.xml:190 admin/fai/faiVariable.tpl.c:23
-#: admin/fai/faiVariable.tpl.c:26
-msgid "Edit"
-msgstr "Editar"
-
-#: admin/fai/class_faiHook.inc:336
-msgid "Delete"
-msgstr "Deletar"
-
-#: admin/fai/class_faiHook.inc:521 admin/fai/fai-list.xml:128
+#: admin/fai/class_faiHook.inc:30
 msgid "Hook"
 msgstr ""
 
-#: admin/fai/class_faiHook.inc:522 admin/fai/class_faiHook.inc:526
+#: admin/fai/class_faiHook.inc:31 admin/fai/class_faiHook.inc:34
 msgid "FAI hook"
 msgstr ""
 
-#: admin/fai/class_faiVariable.inc:387 admin/fai/fai-list.xml:134
+#: admin/fai/class_faiHook.inc:63
+msgid "Hooks"
+msgstr "Ganchos"
+
+#: admin/fai/class_faiHook.inc:79
+msgid "Task"
+msgstr "Tarefa"
+
+#: admin/fai/class_faiHook.inc:87
+msgid "The script of this hook"
+msgstr ""
+
+#: admin/fai/class_faiVariable.inc:30
 msgid "Variable"
 msgstr "VariÃ¡vel"
 
-#: admin/fai/class_faiVariable.inc:388 admin/fai/class_faiVariable.inc:392
+#: admin/fai/class_faiVariable.inc:31 admin/fai/class_faiVariable.inc:34
 msgid "FAI variable"
 msgstr ""
 
-#: admin/fai/class_faiProfileEntry.inc:184 admin/fai/askClassName.tpl.c:11
-#: admin/fai/askClassName.tpl.c:17 admin/fai/paste_generic.tpl.c:5
-msgid "Class name"
-msgstr "Nome da classe"
-
-#: admin/fai/class_faiProfileEntry.inc:184 admin/fai/faiTemplate.tpl.c:14
-#: admin/fai/faiVariable.tpl.c:14 admin/fai/faiHook.tpl.c:14
-#: admin/fai/faiPartitionTable.tpl.c:17 admin/fai/faiScript.tpl.c:14
-msgid "Objects"
-msgstr "Objetos"
-
-#: admin/fai/fai-list.xml:11
-msgid "List of deployment classes and products"
-msgstr ""
+#: admin/fai/class_faiVariable.inc:63
+msgid "Variables"
+msgstr "VariÃ¡veis"
 
-#: admin/fai/fai-list.xml:15
-msgid "partitionTable"
-msgstr ""
+#: admin/fai/class_faiVariable.inc:79
+msgid "Content"
+msgstr "ConteÃºdo"
 
-#: admin/fai/fai-list.xml:23
-msgid "packagelist"
+#: admin/fai/class_faiVariable.inc:79
+msgid "The content of the variable"
 msgstr ""
 
-#: admin/fai/fai-list.xml:93
-msgid "Actions"
-msgstr "AÃ§Ãµes"
-
-#: admin/fai/fai-list.xml:104
-msgid "Create"
-msgstr "Criar"
-
 #: admin/systems/class_faiLogView.inc:56
 msgid "Sort down"
 msgstr ""
@@ -1051,6 +625,10 @@ msgstr ""
 msgid "Sort up"
 msgstr ""
 
+#: admin/systems/class_faiLogView.inc:70
+msgid "File"
+msgstr "Arquivo"
+
 #: admin/systems/class_faiLogView.inc:71
 msgid "Date"
 msgstr "Data"
@@ -1085,7 +663,7 @@ msgstr ""
 msgid "Selected file: %s"
 msgstr ""
 
-#: admin/systems/class_faiStartup.inc:70 admin/fai/paste_generic.tpl.c:2
+#: admin/systems/class_faiStartup.inc:70
 msgid "FAI settings"
 msgstr ""
 
@@ -1105,11 +683,6 @@ msgstr ""
 msgid "FAI profil to be applied to this computer"
 msgstr ""
 
-#: admin/systems/class_faiStartup.inc:90 admin/fai/faiPackage.tpl.c:14
-#: admin/fai/faiPackage.tpl.c:17
-msgid "Repository"
-msgstr "RepositÃ³rio"
-
 #: admin/systems/class_faiStartup.inc:90
 msgid "FAI Debian repository to be used for installation"
 msgstr ""
@@ -1134,85 +707,96 @@ msgstr "ParÃ¢metros de boot do kernel"
 msgid "Linux kernel parameters to be ran"
 msgstr "ParÃ¢metros do kernel Linux para ser executado"
 
-#: admin/systems/class_faiStartup.inc:178
+#: admin/systems/class_faiStartup.inc:179
 msgid "Full automated installation"
 msgstr ""
 
-#: admin/systems/services/repository/class_serviceRepository.inc:31
+#: admin/systems/services/repository/class_serviceDebianRepository.inc:34
+#: admin/systems/services/repository/class_serviceCentosRepository.inc:31
+msgid "Repositories"
+msgstr ""
+
+#: admin/systems/services/repository/class_serviceDebianRepository.inc:39
+#: admin/systems/services/repository/class_serviceCentosRepository.inc:36
+msgid "Repositories this server hosts"
+msgstr ""
+
+#: admin/systems/services/repository/class_serviceDebianRepository.inc:43
+#: admin/systems/services/repository/class_serviceCentosRepository.inc:40
 msgid "URL"
 msgstr "URL"
 
-#: admin/systems/services/repository/class_serviceRepository.inc:31
+#: admin/systems/services/repository/class_serviceDebianRepository.inc:43
+#: admin/systems/services/repository/class_serviceCentosRepository.inc:40
 msgid "Repository url"
 msgstr ""
 
-#: admin/systems/services/repository/class_serviceRepository.inc:35
+#: admin/systems/services/repository/class_serviceDebianRepository.inc:47
+#: admin/systems/services/repository/class_serviceCentosRepository.inc:44
 msgid "Parent server"
 msgstr ""
 
-#: admin/systems/services/repository/class_serviceRepository.inc:35
+#: admin/systems/services/repository/class_serviceDebianRepository.inc:47
+#: admin/systems/services/repository/class_serviceCentosRepository.inc:44
 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"
+#: admin/systems/services/repository/class_serviceDebianRepository.inc:52
+msgid "Debian release used on this repository"
 msgstr ""
 
-#: admin/systems/services/repository/class_serviceRepository.inc:47
-msgid "Sections available on this repository"
+#: admin/systems/services/repository/class_serviceDebianRepository.inc:58
+msgid "Debian sections available on this repository"
 msgstr ""
 
-#: admin/systems/services/repository/class_serviceRepository.inc:52
+#: admin/systems/services/repository/class_serviceDebianRepository.inc:63
+#: admin/systems/services/repository/class_serviceCentosRepository.inc:57
 msgid "Mirror mode"
 msgstr ""
 
-#: admin/systems/services/repository/class_serviceRepository.inc:52
+#: admin/systems/services/repository/class_serviceDebianRepository.inc:63
+#: admin/systems/services/repository/class_serviceCentosRepository.inc:57
 msgid ""
 "Is this mirror an installation repository? Is its release a custom one?"
 msgstr ""
 
-#: admin/systems/services/repository/class_serviceRepository.inc:57
+#: admin/systems/services/repository/class_serviceDebianRepository.inc:68
+#: admin/systems/services/repository/class_serviceCentosRepository.inc:62
 msgid "Local mirror"
 msgstr ""
 
-#: admin/systems/services/repository/class_serviceRepository.inc:57
+#: admin/systems/services/repository/class_serviceDebianRepository.inc:68
+#: admin/systems/services/repository/class_serviceCentosRepository.inc:62
 msgid "Is this mirror a local or a network mirror?"
 msgstr ""
 
-#: admin/systems/services/repository/class_serviceRepository.inc:66
+#: admin/systems/services/repository/class_serviceDebianRepository.inc:77
+#: admin/systems/services/repository/class_serviceCentosRepository.inc:71
 msgid "Architectures"
 msgstr ""
 
-#: admin/systems/services/repository/class_serviceRepository.inc:66
+#: admin/systems/services/repository/class_serviceDebianRepository.inc:77
+#: admin/systems/services/repository/class_serviceCentosRepository.inc:71
 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"
+#: admin/systems/services/repository/class_serviceDebianRepository.inc:99
+#: admin/systems/services/repository/class_serviceDebianRepository.inc:100
+msgid "Debian repository"
 msgstr ""
 
-#: admin/systems/services/repository/class_serviceRepository.inc:140
-msgid "Repositories"
-msgstr ""
+#: admin/systems/services/repository/class_serviceDebianRepository.inc:100
+#: admin/systems/services/repository/class_serviceCentosRepository.inc:96
+msgid "Services"
+msgstr "ServiÃ§os"
 
-#: admin/systems/services/repository/class_serviceRepository.inc:145
-msgid "Repositories this server hosts"
+#: admin/systems/services/repository/class_serviceCentosRepository.inc:49
+msgid "Centos release used on this repository"
 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"
+#: admin/systems/services/repository/class_serviceCentosRepository.inc:95
+#: admin/systems/services/repository/class_serviceCentosRepository.inc:96
+msgid "Centos repository"
 msgstr ""
 
 #: config/fai/class_faiConfig.inc:28
@@ -1244,476 +828,3 @@ msgstr ""
 #: config/fai/class_faiConfig.inc:60
 msgid "s"
 msgstr ""
-
-#: admin/fai/faiPartitionTableEntry.tpl.c:2 admin/fai/faiVariableEntry.tpl.c:2
-#: admin/fai/faiVariableEntry.tpl.c:5 admin/fai/faiDiskEntry.tpl.c:2
-#: admin/fai/faiTemplate.tpl.c:2 admin/fai/faiTemplate.tpl.c:5
-#: admin/fai/faiVariable.tpl.c:2 admin/fai/faiVariable.tpl.c:5
-#: admin/fai/faiHook.tpl.c:2 admin/fai/faiHook.tpl.c:5
-#: admin/fai/faiPackage.tpl.c:2 admin/fai/faiPackage.tpl.c:5
-#: admin/fai/faiTemplateEntry.tpl.c:2 admin/fai/faiTemplateEntry.tpl.c:5
-#: admin/fai/faiScriptEntry.tpl.c:2 admin/fai/faiScriptEntry.tpl.c:5
-#: admin/fai/faiPartitionTable.tpl.c:2 admin/fai/faiPartitionTable.tpl.c:5
-#: admin/fai/faiScript.tpl.c:2 admin/fai/faiScript.tpl.c:5
-#: admin/fai/faiProfile.tpl.c:2 admin/fai/faiProfile.tpl.c:5
-#: admin/fai/faiProfile.tpl.c:14 admin/fai/faiHookEntry.tpl.c:2
-#: admin/fai/faiHookEntry.tpl.c:5
-msgid "Generic"
-msgstr "GenÃ©rico"
-
-#: admin/fai/faiPartitionTableEntry.tpl.c:14
-#: admin/fai/faiPartitionTableEntry.tpl.c:17 admin/fai/faiDiskEntry.tpl.c:23
-#: admin/fai/faiDiskEntry.tpl.c:26
-msgid "Partition entries"
-msgstr ""
-
-#: admin/fai/faiPartitionTableEntry.tpl.c:20
-#: admin/fai/faiPartitionTableEntry.tpl.c:23 admin/fai/faiDiskEntry.tpl.c:29
-#: admin/fai/faiDiskEntry.tpl.c:32
-msgid "Add partition"
-msgstr ""
-
-#: admin/fai/branch_selector.tpl.c:2
-msgid "Releases"
-msgstr ""
-
-#: admin/fai/branch_selector.tpl.c:5
-msgid "Current release"
-msgstr ""
-
-#: admin/fai/branch_selector.tpl.c:8 admin/fai/branch_selector.tpl.c:17
-#: admin/fai/fai-filter.tpl.c:8 admin/fai/fai-filter.tpl.c:17
-msgid "Create release"
-msgstr ""
-
-#: admin/fai/branch_selector.tpl.c:11 admin/fai/branch_selector.tpl.c:23
-#: admin/fai/fai-filter.tpl.c:11 admin/fai/fai-filter.tpl.c:23
-msgid "Create read-only release"
-msgstr ""
-
-#: admin/fai/branch_selector.tpl.c:20 admin/fai/fai-filter.tpl.c:20
-msgid "Freeze"
-msgstr "Congelar"
-
-#: admin/fai/branch_selector.tpl.c:26 admin/fai/fai-filter.tpl.c:26
-msgid "Delete current release"
-msgstr ""
-
-#: admin/fai/faiPartition.tpl.c:2
-msgid "Partition"
-msgstr ""
-
-#: admin/fai/faiPartition.tpl.c:17
-msgid "Resize existing partition"
-msgstr ""
-
-#: admin/fai/faiPartition.tpl.c:20
-msgid "Bootable"
-msgstr ""
-
-#: admin/fai/faiPartition.tpl.c:26 admin/fai/faiDiskEntry.tpl.c:20
-msgid "Combined physical partitions"
-msgstr ""
-
-#: admin/fai/faiPartition.tpl.c:29
-msgid "Toggle missing"
-msgstr ""
-
-#: admin/fai/faiPartition.tpl.c:32
-msgid "Toggle spare"
-msgstr ""
-
-#: admin/fai/faiPartition.tpl.c:35
-msgid "Filesystem"
-msgstr ""
-
-#: admin/fai/faiPartition.tpl.c:38
-msgid "Filesystem create options"
-msgstr ""
-
-#: admin/fai/faiPartition.tpl.c:41
-msgid "Encrypted"
-msgstr ""
-
-#: admin/fai/faiPartition.tpl.c:44
-msgid "Tune options"
-msgstr ""
-
-#: admin/fai/faiNewBranch.tpl.c:2
-msgid ""
-"You are now going to create a branch or locked branch. This action clones "
-"the existing release to another release name. Branches can be modified as "
-"usual. FAI classes of locked branches cannot be modified, just additional "
-"classes are possible. Branch names should be alphanumeric, excluding the "
-"reserved names 'scripts', 'hooks', 'partitions', 'variables', 'templates' "
-"and 'fai'."
-msgstr ""
-
-#: admin/fai/faiNewBranch.tpl.c:5
-msgid ""
-"Branches are created as subreleases of the currently selected branch. "
-"Creating a new branch named 1.0.2 in SARGE for example, will result in a new"
-" release called SARGE/1.0.2."
-msgstr ""
-
-#: admin/fai/faiNewBranch.tpl.c:8
-msgid "Please enter a name for the branch"
-msgstr "Por favor, insira um nome para a ramificaÃ§Ã£o"
-
-#: admin/fai/faiNewBranch.tpl.c:11
-msgid "Processing the requested operation"
-msgstr "Processando a operaÃ§Ã£o"
-
-#: admin/fai/faiNewBranch.tpl.c:14
-msgid ""
-"As soon as the copy operation has finished, you can scroll down to end of "
-"the page and press the 'Continue' button to continue with the fai management"
-" dialog."
-msgstr "Quando a operaÃ§Ã£o de cÃ³pia terminar, vocÃª pode rolar atÃ© o fim da pÃ¡gina e pressionar 'Continuar' para seguir com o gerenciamento fai."
-
-#: admin/fai/faiNewBranch.tpl.c:17
-msgid ""
-"Your browser doesn't support iframes, please use this link to perform the "
-"requested operation."
-msgstr "Seu navegador nÃ£o tem suporte para iframes, favor usar este link para realizar a operaÃ§Ã£o."
-
-#: admin/fai/faiNewBranch.tpl.c:20
-msgid "Perform requested operation."
-msgstr "Realizar a operaÃ§Ã£o."
-
-#: admin/fai/faiNewBranch.tpl.c:23
-msgid "Initiate operation"
-msgstr "Iniciar operaÃ§Ã£o"
-
-#: admin/fai/faiVariableEntry.tpl.c:14 admin/fai/faiVariableEntry.tpl.c:17
-msgid "Variable attributes"
-msgstr "Atributos da variÃ¡vel"
-
-#: admin/fai/faiDiskEntry.tpl.c:11
-msgid "fstab key"
-msgstr ""
-
-#: admin/fai/faiDiskEntry.tpl.c:17
-msgid "Disk label"
-msgstr ""
-
-#: admin/fai/faiTemplate.tpl.c:17
-msgid "List of template files"
-msgstr ""
-
-#: admin/fai/faiVariable.tpl.c:17
-msgid "List of assigned variables"
-msgstr ""
-
-#: admin/fai/faiVariable.tpl.c:20
-msgid "Choose a variable to delete or edit"
-msgstr ""
-
-#: admin/fai/askClassName.tpl.c:2
-msgid ""
-"Adding a new class to the FAI management, requires a class name. You have to"
-" specify a unique class name for unique types of FAI classes, while you can "
-"use the same class name for different types of FAI classes. In the laste "
-"case, FAI will automatically enclose all these different class types to one "
-"unique class name."
-msgstr "Adicionar um nova classe para o gerenciamento FAI requere um nome de classe. VocÃª deve especificar um nome Ãºnico de classe para tipos Ãºnicos de classes FAI, enquanto vocÃª pode usar o mesmo nome de classe para tipos diferentes de classes FAI. Em Ãºltimo caso, FAI irÃ¡ juntar automaticamente todos os diferentes tipos de classe em um Ãºnico nome de classe."
-
-#: admin/fai/askClassName.tpl.c:5
-msgid ""
-"Please use one of the following methods to choose the name for the new FAI "
-"class."
-msgstr "Por favor, use um dos seguintes mÃ©todos para escolher o nome para a nova classe FAI."
-
-#: admin/fai/askClassName.tpl.c:8
-msgid "Enter FAI class name manually"
-msgstr "Insira o nome de classe FAI manualmente"
-
-#: admin/fai/askClassName.tpl.c:14
-msgid "Choose FAI class name from a list of existing classes"
-msgstr "Escolha um nome de classe FAI da lista de classes existentes"
-
-#: admin/fai/askClassName.tpl.c:20
-msgid "Choose class name"
-msgstr "Escolha o nome da classe"
-
-#: admin/fai/faiGroupHandle.tpl.c:2
-msgid "Please select the objects you want to remove:"
-msgstr ""
-
-#: admin/fai/faiGroupHandle.tpl.c:5
-msgid "Freezed"
-msgstr ""
-
-#: admin/fai/faiGroupHandle.tpl.c:8
-msgid "Select the object you want to edit:"
-msgstr ""
-
-#: admin/fai/faiGroupHandle.tpl.c:11
-msgid "Select the object you want to copy:"
-msgstr ""
-
-#: admin/fai/remove.tpl.c:5
-msgid ""
-"This includes all account data, system access rules, imap settings, etc. for"
-" this user. Please double check if your really want to do this since there "
-"is no way for FusionDirectory to get your data back."
-msgstr "Isto inclui todos os dados da conta, regras de acesso ao sistema, configuraÃ§Ãµes do imap, etc. para este usuÃ¡rio. Por favor, tenha certeza que vocÃª quer fazer isso porque nÃ£o tem como recuperar seus dados do FusionDirectory de volta."
-
-#: admin/fai/remove.tpl.c:8 admin/fai/remove_branch.tpl.c:8
-msgid "So - if you're sure - press 'Delete' to continue or 'Cancel' to abort."
-msgstr "Se vocÃª tem certeza, pressione 'Delete' para continuar ou 'Cancel' para desistir."
-
-#: admin/fai/faiHook.tpl.c:17
-msgid "List of hook scripts"
-msgstr ""
-
-#: admin/fai/packageSelect/selectPackage-list.tpl.c:2
-#: admin/fai/classSelect/selectClass-list.tpl.c:5
-msgid "Update"
-msgstr "Atualizar"
-
-#: admin/fai/packageSelect/selectPackage-list.tpl.c:5
-#: admin/fai/classSelect/selectClass-list.tpl.c:8
-msgid "Submit"
-msgstr ""
-
-#: admin/fai/packageSelect/selectPackage-filter.tpl.c:2
-#: admin/fai/classSelect/selectClass-filter.tpl.c:2
-#: admin/fai/fai-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 ""
-
-#: admin/fai/remove_branch.tpl.c:5
-msgid ""
-"This includes all account data, system access, etc. for this branch. Please "
-"double check if your really want to do this since there is no way for "
-"FusionDirectory to get your data back."
-msgstr ""
-
-#: admin/fai/faiPackage.tpl.c:26
-msgid "Install method"
-msgstr ""
-
-#: admin/fai/faiPackage.tpl.c:29
-msgid "Please select the installation method"
-msgstr ""
-
-#: admin/fai/faiPackage.tpl.c:32 admin/fai/faiPackage.tpl.c:35
-msgid "Used packages"
-msgstr ""
-
-#: admin/fai/faiPackage.tpl.c:38
-msgid "Add from list"
-msgstr ""
-
-#: admin/fai/faiProfileEntry.tpl.c:2
-msgid "List of FAI objects (Fully Automatic Installation)"
-msgstr "Lista de objetos FAI (Fully Automatic Installation)"
-
-#: admin/fai/faiProfileEntry.tpl.c:5
-msgid "Information"
-msgstr "InformaÃ§Ã£o"
-
-#: admin/fai/faiProfileEntry.tpl.c:8
-msgid ""
-"This menu allows you to select FAI class names and to add them to the "
-"currently edited profile."
-msgstr "Este menun permite que vocÃª selecione nomes de classe FAI e adicionÃ¡-las para o perfil atual."
-
-#: admin/fai/faiProfileEntry.tpl.c:11
-msgid "Filters"
-msgstr "Filtros"
-
-#: admin/fai/faiProfileEntry.tpl.c:14
-msgid "Show only classes with templates"
-msgstr "Mostrar apenas classes com templates"
-
-#: admin/fai/faiProfileEntry.tpl.c:17
-msgid "Show only classes with scripts"
-msgstr "Mostrar apenas classes com scripts"
-
-#: admin/fai/faiProfileEntry.tpl.c:20
-msgid "Show only classes with hooks"
-msgstr "Mostrar apenas classes com ganchos"
-
-#: admin/fai/faiProfileEntry.tpl.c:23
-msgid "Show only classes with variables"
-msgstr "Mostrar apenas classes com variÃ¡veis"
-
-#: admin/fai/faiProfileEntry.tpl.c:26
-msgid "Show only classes with packages"
-msgstr "Mostrar apenas classes com pacotes"
-
-#: admin/fai/faiProfileEntry.tpl.c:29
-msgid "Show only classes with partitions"
-msgstr "Mostrar apenas classes com partiÃ§Ãµes"
-
-#: admin/fai/faiProfileEntry.tpl.c:32 admin/fai/faiProfileEntry.tpl.c:35
-msgid "Display objects matching"
-msgstr ""
-
-#: admin/fai/faiProfileEntry.tpl.c:38
-msgid "Regular expression for matching object names"
-msgstr ""
-
-#: admin/fai/faiTemplateEntry.tpl.c:17 admin/fai/faiTemplateEntry.tpl.c:20
-msgid "Template attributes"
-msgstr ""
-
-#: admin/fai/faiTemplateEntry.tpl.c:26 admin/fai/faiTemplateEntry.tpl.c:29
-msgid "Save template"
-msgstr ""
-
-#: admin/fai/faiTemplateEntry.tpl.c:32 admin/fai/faiTemplateEntry.tpl.c:35
-msgid "Edit template"
-msgstr ""
-
-#: admin/fai/faiTemplateEntry.tpl.c:38
-msgid "Full path"
-msgstr ""
-
-#: admin/fai/faiTemplateEntry.tpl.c:41
-msgid "Upload"
-msgstr "Upload"
-
-#: admin/fai/faiTemplateEntry.tpl.c:44
-msgid "Owner"
-msgstr "ProprietÃ¡rio"
-
-#: admin/fai/faiTemplateEntry.tpl.c:50
-msgid "Access"
-msgstr ""
-
-#: admin/fai/faiTemplateEntry.tpl.c:53
-msgid "Class"
-msgstr "Classe"
-
-#: admin/fai/faiTemplateEntry.tpl.c:56
-msgid "Read"
-msgstr ""
-
-#: admin/fai/faiTemplateEntry.tpl.c:59
-msgid "Write"
-msgstr ""
-
-#: admin/fai/faiTemplateEntry.tpl.c:62
-msgid "Execute"
-msgstr "Executar"
-
-#: admin/fai/faiTemplateEntry.tpl.c:65
-msgid "Special"
-msgstr ""
-
-#: admin/fai/faiTemplateEntry.tpl.c:71
-msgid "SUID"
-msgstr ""
-
-#: admin/fai/faiTemplateEntry.tpl.c:77
-msgid "SGID"
-msgstr ""
-
-#: admin/fai/faiTemplateEntry.tpl.c:80
-msgid "Others"
-msgstr ""
-
-#: admin/fai/faiTemplateEntry.tpl.c:83
-msgid "sticky"
-msgstr ""
-
-#: admin/fai/faiScriptEntry.tpl.c:17 admin/fai/faiScriptEntry.tpl.c:26
-msgid "Script attributes"
-msgstr ""
-
-#: admin/fai/faiScriptEntry.tpl.c:23
-msgid ""
-"Choose a priority. Low values result in an earlier, high values in a later "
-"execution."
-msgstr ""
-
-#: admin/fai/faiScriptEntry.tpl.c:32 admin/fai/faiHookEntry.tpl.c:32
-msgid "Import script"
-msgstr ""
-
-#: admin/fai/classSelect/selectClass-list.tpl.c:2
-msgid "Base"
-msgstr "Base"
-
-#: admin/fai/fai-filter.tpl.c:29
-msgid "Show profiles"
-msgstr "Mostrar perfis"
-
-#: admin/fai/fai-filter.tpl.c:32
-msgid "Show templates"
-msgstr "Mostrar templates"
-
-#: admin/fai/fai-filter.tpl.c:35
-msgid "Show scripts"
-msgstr "Mostrar scripts"
-
-#: admin/fai/fai-filter.tpl.c:38
-msgid "Show hooks"
-msgstr "Mostrar ganchos"
-
-#: admin/fai/fai-filter.tpl.c:41
-msgid "Show variables"
-msgstr "Mostrar variÃ¡veis"
-
-#: admin/fai/fai-filter.tpl.c:44
-msgid "Show packages"
-msgstr "Mostrar pacotes"
-
-#: admin/fai/fai-filter.tpl.c:47
-msgid "Show partitions"
-msgstr "Mostrar partiÃ§Ãµes"
-
-#: admin/fai/faiTemplateEdit.tpl.c:2
-msgid "This FAI template is write protected. Editing may break it!"
-msgstr ""
-
-#: admin/fai/faiTemplateEdit.tpl.c:5
-msgid "Edit anyway"
-msgstr ""
-
-#: admin/fai/faiPartitionTable.tpl.c:14
-msgid "Use 'setup-storage' to partition the disk"
-msgstr ""
-
-#: admin/fai/faiPartitionTable.tpl.c:20
-msgid "Discs"
-msgstr ""
-
-#: admin/fai/faiPartitionTable.tpl.c:23 admin/fai/faiPartitionTable.tpl.c:26
-#: admin/fai/faiPartitionTable.tpl.c:41 admin/fai/faiPartitionTable.tpl.c:44
-msgid "Add disk"
-msgstr ""
-
-#: admin/fai/faiPartitionTable.tpl.c:29 admin/fai/faiPartitionTable.tpl.c:32
-#: admin/fai/faiPartitionTable.tpl.c:47 admin/fai/faiPartitionTable.tpl.c:50
-msgid "Add RAID"
-msgstr ""
-
-#: admin/fai/faiPartitionTable.tpl.c:35 admin/fai/faiPartitionTable.tpl.c:38
-#: admin/fai/faiPartitionTable.tpl.c:53 admin/fai/faiPartitionTable.tpl.c:56
-msgid "Add volume group"
-msgstr ""
-
-#: admin/fai/faiScript.tpl.c:17
-msgid "List of scripts"
-msgstr ""
-
-#: admin/fai/faiProfile.tpl.c:20
-msgid "Choose a priority"
-msgstr ""
-
-#: admin/fai/faiHookEntry.tpl.c:14 admin/fai/faiHookEntry.tpl.c:17
-#: admin/fai/faiHookEntry.tpl.c:26
-msgid "Hook attributes"
-msgstr ""
-
-#: admin/fai/faiHookEntry.tpl.c:23
-msgid "Choose an existing FAI task"
-msgstr ""
diff --git a/fai/locale/ru/fusiondirectory.po b/fai/locale/ru/fusiondirectory.po
index 26759febc5df83ad7df79e15e1333afcf5ee1215..9b4bea2a675629e7f044171452135a5061e47aac 100644
--- a/fai/locale/ru/fusiondirectory.po
+++ b/fai/locale/ru/fusiondirectory.po
@@ -3,490 +3,298 @@
 # This file is distributed under the same license as the PACKAGE package.
 # 
 # Translators:
-#  Valia V. Vaneeva <fattie@altlinux.ru>, 2004
 msgid ""
 msgstr ""
-"Project-Id-Version: FusionDirectory-108\n"
+"Project-Id-Version: FusionDirectory-109\n"
 "Report-Msgid-Bugs-To: documentation@lists.fusiondirectory.org\n"
-"POT-Creation-Date: 2015-03-19 21:45+0100\n"
-"PO-Revision-Date: 2015-03-12 07:51+0000\n"
+"POT-Creation-Date: 2014-12-15 17:47+0100\n"
+"PO-Revision-Date: 2015-04-13 01:05+0000\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>\n"
-"Language-Team: Russian (http://www.transifex.com/projects/p/FusionDirectory-108/language/ru/)\n"
+"Language-Team: Russian (http://www.transifex.com/projects/p/FusionDirectory-109/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=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);\n"
-
-#: admin/fai/class_faiScriptEntry.inc:79 admin/fai/class_faiScriptEntry.inc:82
-#: admin/fai/class_faiManagement.inc:240 admin/fai/class_faiManagement.inc:768
-#: admin/fai/class_faiManagement.inc:774
-#: admin/fai/class_faiPartitionTable.inc:268
-#: admin/fai/class_faiPartitionTable.inc:331
-#: admin/fai/class_faiDiskEntry.inc:445 admin/fai/class_FAI.inc:570
-#: admin/fai/class_faiHookEntry.inc:83 admin/fai/class_faiHookEntry.inc:86
-#: admin/fai/class_faiScript.inc:249 admin/fai/class_faiTemplate.inc:232
-#: admin/fai/class_faiHook.inc:259 admin/fai/class_faiVariable.inc:162
-#: admin/systems/class_faiLogView.inc:207
-#: admin/systems/class_faiLogView.inc:242
-msgid "Error"
-msgstr "ÐžÑˆÐ¸Ð±ÐºÐ°"
-
-#: admin/fai/class_faiScriptEntry.inc:82 admin/fai/class_faiHookEntry.inc:86
-msgid "file is empty"
-msgstr "Ñ„Ð°Ð¹Ð» Ð¿ÑƒÑÑ‚Ð¾Ð¹"
-
-#: admin/fai/class_faiScriptEntry.inc:102 admin/fai/class_faiHookEntry.inc:102
-#: admin/fai/class_faiScript.inc:349 admin/fai/class_faiScript.inc:374
-#: admin/fai/class_faiTemplate.inc:320 admin/fai/class_faiHook.inc:346
-msgid "Download"
-msgstr "Ð¡ÐºÐ°Ñ‡Ð°Ñ‚ÑŒ"
-
-#: admin/fai/class_faiScriptEntry.inc:147
-#: admin/fai/class_faiScriptEntry.inc:151
-#: admin/fai/class_faiScriptEntry.inc:154
-#: admin/fai/class_faiScriptEntry.inc:197
-#: admin/fai/class_faiManagement.inc:768 admin/fai/class_faiManagement.inc:774
-#: admin/fai/class_faiPackage.inc:685
-#: admin/fai/class_faiPartitionTable.inc:779
-#: admin/fai/class_faiDiskEntry.inc:702 admin/fai/class_faiDiskEntry.inc:705
-#: admin/fai/class_faiDiskEntry.inc:758
-#: admin/fai/class_faiTemplateEntry.inc:247
-#: admin/fai/class_faiTemplateEntry.inc:312
-#: admin/fai/class_faiPartitionTableEntry.inc:353
-#: admin/fai/class_faiPartitionTableEntry.inc:356
-#: admin/fai/class_faiPartitionTableEntry.inc:360
-#: admin/fai/class_faiPartitionTableEntry.inc:455
-#: admin/fai/packageSelect/selectPackage-list.xml:40
-#: admin/fai/class_faiProfile.inc:414 admin/fai/class_faiProfile.inc:463
-#: admin/fai/class_faiHookEntry.inc:157 admin/fai/class_faiHookEntry.inc:162
-#: admin/fai/class_faiHookEntry.inc:165 admin/fai/class_faiHookEntry.inc:207
-#: admin/fai/class_askClassName.inc:163 admin/fai/class_askClassName.inc:167
-#: admin/fai/class_askClassName.inc:171 admin/fai/class_askClassName.inc:198
-#: admin/fai/class_faiScript.inc:347 admin/fai/class_faiScript.inc:605
-#: admin/fai/classSelect/selectClass-list.xml:28
-#: admin/fai/class_faiTemplate.inc:512
-#: admin/fai/class_faiVariableEntry.inc:103
-#: admin/fai/class_faiVariableEntry.inc:112
-#: admin/fai/class_faiVariableEntry.inc:115
-#: admin/fai/class_faiVariableEntry.inc:149 admin/fai/class_faiHook.inc:531
-#: admin/fai/class_faiVariable.inc:398 admin/fai/fai-list.xml:80
-#: admin/fai/faiPartitionTableEntry.tpl.c:8 admin/fai/faiPartition.tpl.c:5
-#: admin/fai/faiVariableEntry.tpl.c:8 admin/fai/faiDiskEntry.tpl.c:8
-#: admin/fai/faiTemplate.tpl.c:8 admin/fai/faiVariable.tpl.c:8
-#: admin/fai/faiHook.tpl.c:8
-#: admin/fai/packageSelect/selectPackage-filter.tpl.c:8
-#: admin/fai/faiPackage.tpl.c:8 admin/fai/faiScriptEntry.tpl.c:8
-#: admin/fai/classSelect/selectClass-filter.tpl.c:5
-#: admin/fai/fai-filter.tpl.c:50 admin/fai/faiPartitionTable.tpl.c:8
-#: admin/fai/faiScript.tpl.c:8 admin/fai/faiProfile.tpl.c:8
-#: admin/fai/faiHookEntry.tpl.c:8
-msgid "Name"
-msgstr "Ð¤Ð°Ð¼Ð¸Ð»Ð¸Ñ"
-
-#: admin/fai/class_faiScriptEntry.inc:159 admin/fai/class_faiHookEntry.inc:170
-#: admin/fai/class_faiScript.inc:594 admin/fai/fai-list.xml:122
-#: admin/fai/faiScriptEntry.tpl.c:29 admin/fai/faiHookEntry.tpl.c:29
-msgid "Script"
-msgstr ""
-
-#: admin/fai/class_faiScriptEntry.inc:190
-#: admin/fai/class_faiScriptEntry.inc:199
-msgid "Script entry"
-msgstr ""
-
-#: admin/fai/class_faiScriptEntry.inc:191
-msgid "FAI script entry"
-msgstr ""
-
-#: admin/fai/class_faiScriptEntry.inc:198 admin/fai/class_faiPackage.inc:686
-#: admin/fai/class_faiPartitionTable.inc:780
-#: admin/fai/class_faiDiskEntry.inc:759
-#: admin/fai/class_faiTemplateEntry.inc:313
-#: admin/fai/class_faiPartitionTableEntry.inc:456
-#: admin/fai/class_faiProfile.inc:464 admin/fai/class_faiHookEntry.inc:208
-#: admin/fai/class_faiScript.inc:606 admin/fai/class_faiTemplate.inc:513
-#: admin/fai/class_faiVariableEntry.inc:150 admin/fai/class_faiHook.inc:532
-#: admin/fai/class_faiVariable.inc:399
-#: admin/fai/faiPartitionTableEntry.tpl.c:11 admin/fai/faiPartition.tpl.c:11
-#: admin/fai/faiVariableEntry.tpl.c:11 admin/fai/faiDiskEntry.tpl.c:14
-#: admin/fai/faiTemplate.tpl.c:11 admin/fai/faiVariable.tpl.c:11
-#: admin/fai/faiHook.tpl.c:11 admin/fai/faiPackage.tpl.c:11
-#: admin/fai/faiTemplateEntry.tpl.c:14 admin/fai/faiScriptEntry.tpl.c:11
-#: admin/fai/faiPartitionTable.tpl.c:11 admin/fai/faiScript.tpl.c:11
-#: admin/fai/faiProfile.tpl.c:11 admin/fai/faiHookEntry.tpl.c:11
-msgid "Description"
-msgstr "ÐžÐ¿Ð¸ÑÐ°Ð½Ð¸Ðµ"
-
-#: admin/fai/class_faiScriptEntry.inc:200
-msgid "Script Priority"
-msgstr ""
-
-#: admin/fai/class_faiManagement.inc:188
-msgid "partition table"
-msgstr ""
-
-#: admin/fai/class_faiManagement.inc:189 admin/fai/fai-list.xml:31
-msgid "script"
-msgstr ""
-
-#: admin/fai/class_faiManagement.inc:190 admin/fai/fai-list.xml:47
-msgid "hook"
-msgstr ""
-
-#: admin/fai/class_faiManagement.inc:191 admin/fai/fai-list.xml:39
-msgid "variable"
-msgstr "ÐŸÐµÑ€ÐµÐ¼ÐµÐ½Ð½Ð°Ñ"
-
-#: admin/fai/class_faiManagement.inc:192 admin/fai/fai-list.xml:63
-msgid "template"
-msgstr ""
-
-#: admin/fai/class_faiManagement.inc:193
-msgid "package list"
-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"
 
-#: admin/fai/class_faiManagement.inc:210 admin/fai/class_faiManagement.inc:226
-#: admin/fai/class_faiManagement.inc:332 admin/fai/class_faiManagement.inc:390
-#: admin/fai/class_faiManagement.inc:480 admin/fai/class_faiManagement.inc:575
-#: admin/fai/class_faiManagement.inc:598 admin/fai/class_faiManagement.inc:619
-msgid "Permission error"
-msgstr ""
-
-#: admin/fai/class_faiManagement.inc:211 admin/fai/class_faiManagement.inc:226
-#, php-format
-msgid "You have no permission to create a new %s!"
-msgstr ""
-
-#: admin/fai/class_faiManagement.inc:226 admin/fai/fai-list.xml:55
-msgid "profile"
-msgstr ""
-
-#: admin/fai/class_faiManagement.inc:328
-msgid "Branch locked"
-msgstr ""
-
-#: admin/fai/class_faiManagement.inc:329
-#, php-format
-msgid "The following entries are locked, you can't remove them %s."
-msgstr ""
-
-#: admin/fai/class_faiManagement.inc:346
-msgid "FAI object"
-msgstr ""
-
-#: admin/fai/class_faiManagement.inc:477
-msgid "FAI branch/freeze"
-msgstr ""
-
-#: admin/fai/class_faiManagement.inc:480
-msgid "You have no permission to delete this release!"
-msgstr ""
-
-#: admin/fai/class_faiManagement.inc:496 admin/fai/remove.tpl.c:2
-#: admin/fai/remove_branch.tpl.c:2
-msgid "Warning"
-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:178 config/fai/class_faiConfig.inc:41
+msgid "FAI"
+msgstr "FAI"
 
-#: admin/fai/class_faiManagement.inc:496
-msgid "Release remove aborted because the release name check failed!"
+#: admin/fai/class_faiManagement.inc:118
+msgid "Manage FAI software packages and deployment recipes"
 msgstr ""
 
-#: admin/fai/class_faiManagement.inc:573 admin/fai/class_faiManagement.inc:596
-msgid "Configuration"
-msgstr "ÐÐ°ÑÑ‚Ñ€Ð¾Ð¹ÐºÐ¸"
-
-#: admin/fai/class_faiManagement.inc:575 admin/fai/class_faiManagement.inc:598
-#: admin/fai/class_faiManagement.inc:619
-msgid "Branch"
+#: admin/fai/class_faiPackage.inc:157
+msgid "Mark for installation"
 msgstr ""
 
-#: admin/fai/class_faiManagement.inc:725 admin/fai/askClassName.tpl.c:23
-msgid "Continue"
-msgstr "ÐŸÑ€Ð¾Ð´Ð¾Ð»Ð¶Ð¸Ñ‚ÑŒ"
-
-#: admin/fai/class_faiManagement.inc:926
-#: admin/fai/class_faiPartitionTable.inc:768
-#: admin/fai/class_faiProfile.inc:318 admin/fai/class_askClassName.inc:99
-#: admin/fai/classSelect/class_classSelect.inc:58
-#: admin/fai/class_faiGroupHandle.inc:120
-#: admin/fai/class_faiProfileEntry.inc:163 admin/fai/fai-list.xml:146
-msgid "Partition table"
+#: admin/fai/class_faiPackage.inc:161
+msgid "Mark for removal"
 msgstr ""
 
-#: admin/fai/class_faiManagement.inc:928
-#: admin/fai/class_faiGroupHandle.inc:122 admin/fai/fai-list.xml:140
-msgid "Package list"
+#: admin/fai/class_faiPackage.inc:166
+msgid "Edit configuration"
 msgstr ""
 
-#: admin/fai/class_faiManagement.inc:930
-#: admin/fai/class_faiGroupHandle.inc:124
-msgid "Scripts"
-msgstr ""
-
-#: admin/fai/class_faiManagement.inc:932
-#: admin/fai/class_faiGroupHandle.inc:126
-msgid "Variables"
-msgstr ""
+#: admin/fai/class_faiPackage.inc:247
+#: admin/fai/class_faiPartitionTable.inc:209
+#: admin/fai/class_faiPartitionTable.inc:250
+#: admin/fai/class_faiTemplate.inc:114
+#: admin/systems/services/repository/class_serviceDebianRepository.inc:172
+#: admin/systems/services/repository/class_serviceDebianRepository.inc:189
+#: admin/systems/services/repository/class_serviceDebianRepository.inc:193
+msgid "LDAP error"
+msgstr "ÐžÑˆÐ¸Ð±ÐºÐ° LDAP"
 
-#: admin/fai/class_faiManagement.inc:934
-#: admin/fai/class_faiGroupHandle.inc:128
-msgid "Hooks"
+#: admin/fai/class_faiPackage.inc:279
+#: admin/fai/packageSelect/class_filterFAIPackages.inc:41
+#: admin/fai/packageSelect/class_filterFAIPackages.inc:46
+#: admin/fai/class_faiPackageConfiguration.inc:55
+#: admin/systems/class_faiStartup.inc:133
+#: admin/systems/class_faiStartup.inc:160
+msgid "Service infrastructure"
 msgstr ""
 
-#: admin/fai/class_faiManagement.inc:936 admin/fai/class_faiProfile.inc:454
-#: admin/fai/class_askClassName.inc:104 admin/fai/class_faiGroupHandle.inc:130
-#: admin/fai/fai-list.xml:110
-msgid "Profile"
+#: admin/fai/class_faiPackage.inc:294
+msgid "Unkown packages"
 msgstr ""
 
-#: admin/fai/class_faiManagement.inc:938
-#: admin/fai/class_faiGroupHandle.inc:132
-msgid "Templates"
-msgstr "Ð¨Ð°Ð±Ð»Ð¾Ð½Ñ‹"
-
-#: admin/fai/class_faiManagement.inc:1039
-#: admin/fai/class_faiManagement.inc:1045
-#: admin/fai/packageSelect/selectPackage-list.xml:14
-#: admin/fai/classSelect/selectClass-list.xml:15
-#: admin/systems/class_faiStartup.inc:177 config/fai/class_faiConfig.inc:41
-msgid "FAI"
-msgstr "FAI"
-
-#: admin/fai/class_faiManagement.inc:1040
-msgid "Manage FAI software packages and deployment recipes"
+#: admin/fai/class_faiPackage.inc:365
+msgid "Package"
 msgstr ""
 
-#: admin/fai/class_faiPackage.inc:261
-msgid "Invalid package names"
+#: admin/fai/class_faiPackage.inc:366
+msgid "FAI Package list"
 msgstr ""
 
-#: admin/fai/class_faiPackage.inc:262
-#, php-format
-msgid "The following package names don't match the Debian policy: %s"
+#: admin/fai/class_faiPackage.inc:369
+msgid "FAI Package"
 msgstr ""
 
-#: admin/fai/class_faiPackage.inc:421 admin/fai/class_faiPackage.inc:422
-msgid "Configured"
-msgstr ""
+#: admin/fai/class_faiPackage.inc:385
+#: admin/fai/class_faiPartitionTable.inc:304
+#: admin/fai/class_faiTemplateEntry.inc:140 admin/fai/class_faiProfile.inc:47
+#: admin/fai/class_faiScript.inc:50 admin/fai/class_faiTemplate.inc:173
+#: admin/fai/class_faiHook.inc:50 admin/fai/class_faiVariable.inc:50
+msgid "Properties"
+msgstr "Ð¡Ð²Ð¾Ð¹ÑÑ‚Ð²Ð°"
 
-#: admin/fai/class_faiPackage.inc:428 admin/fai/class_faiPackage.inc:429
-msgid "Package marked for removal"
+#: admin/fai/class_faiPackage.inc:388
+#: admin/fai/class_faiPartitionTable.inc:307 admin/fai/class_faiProfile.inc:50
+#: admin/fai/class_faiScript.inc:53 admin/fai/class_faiTemplate.inc:176
+#: admin/fai/class_faiHook.inc:53 admin/fai/class_faiVariable.inc:53
+msgid "Class name"
 msgstr ""
 
-#: admin/fai/class_faiPackage.inc:445
-msgid "Mark package for removal"
+#: admin/fai/class_faiPackage.inc:388 admin/fai/class_faiScript.inc:53
+#: admin/fai/class_faiHook.inc:53 admin/fai/class_faiVariable.inc:53
+msgid "Variables class name"
 msgstr ""
 
-#: admin/fai/class_faiPackage.inc:451
-msgid "Configure this package"
-msgstr ""
+#: admin/fai/class_faiPackage.inc:392
+#: admin/fai/class_faiPartitionTable.inc:311
+#: admin/fai/class_faiDiskEntry.inc:738
+#: admin/fai/class_faiTemplateEntry.inc:147 admin/fai/class_faiProfile.inc:54
+#: admin/fai/class_faiScript.inc:57 admin/fai/class_faiScript.inc:75
+#: admin/fai/class_faiTemplate.inc:180 admin/fai/class_faiHook.inc:57
+#: admin/fai/class_faiHook.inc:75 admin/fai/class_faiVariable.inc:57
+#: admin/fai/class_faiVariable.inc:75
+msgid "Description"
+msgstr "ÐžÐ¿Ð¸ÑÐ°Ð½Ð¸Ðµ"
 
-#: admin/fai/class_faiPackage.inc:455
-msgid "Remove this package"
+#: admin/fai/class_faiPackage.inc:392
+#: admin/fai/class_faiPartitionTable.inc:311 admin/fai/class_faiProfile.inc:54
+#: admin/fai/class_faiScript.inc:57 admin/fai/class_faiTemplate.inc:180
+#: admin/fai/class_faiHook.inc:57 admin/fai/class_faiVariable.inc:57
+msgid "Short description of the class"
 msgstr ""
 
-#: admin/fai/class_faiPackage.inc:534
-msgid "Please select a least one package!"
+#: admin/fai/class_faiPackage.inc:398 admin/systems/class_faiStartup.inc:90
+msgid "Repository"
 msgstr ""
 
-#: admin/fai/class_faiPackage.inc:538
-msgid ""
-"Please choose a valid release/section combination for your repository setup!"
+#: admin/fai/class_faiPackage.inc:401 admin/systems/class_faiStartup.inc:78
+#: admin/systems/services/repository/class_serviceDebianRepository.inc:52
+#: admin/systems/services/repository/class_serviceCentosRepository.inc:49
+msgid "Release"
 msgstr ""
 
-#: admin/fai/class_faiPackage.inc:571
-#: admin/fai/packageSelect/class_filterFAIPackages.inc:41
-#: admin/fai/packageSelect/class_filterFAIPackages.inc:46
-#: admin/fai/class_faiPackageConfiguration.inc:55
-#: admin/systems/class_faiStartup.inc:132
-#: admin/systems/class_faiStartup.inc:159
-msgid "Infrastructure service"
+#: admin/fai/class_faiPackage.inc:401
+msgid "Debian release concerned"
 msgstr ""
 
-#: admin/fai/class_faiPackage.inc:587
-msgid "Unkown packages"
+#: admin/fai/class_faiPackage.inc:405
+#: admin/systems/services/repository/class_serviceDebianRepository.inc:58
+msgid "Sections"
 msgstr ""
 
-#: admin/fai/class_faiPackage.inc:674
-#: admin/fai/faiPackageConfiguration.tpl.c:2
-msgid "Package"
+#: admin/fai/class_faiPackage.inc:405
+msgid "Sections concerned"
 msgstr ""
 
-#: admin/fai/class_faiPackage.inc:675
-msgid "FAI Package list"
+#: admin/fai/class_faiPackage.inc:409
+msgid "Install method"
 msgstr ""
 
-#: admin/fai/class_faiPackage.inc:679
-msgid "FAI Package"
+#: admin/fai/class_faiPackage.inc:409
+msgid "Install method to use for this package list"
 msgstr ""
 
-#: admin/fai/class_faiPackage.inc:687
+#: admin/fai/class_faiPackage.inc:420
 msgid "Packages"
 msgstr ""
 
-#: admin/fai/class_faiPackage.inc:688 admin/fai/faiPackage.tpl.c:23
-msgid "Section"
+#: admin/fai/class_faiPackage.inc:424
+msgid "Packages in this class"
 msgstr ""
 
-#: admin/fai/class_faiPackage.inc:688 admin/fai/class_faiPackage.inc:691
-#: admin/fai/class_faiScript.inc:605 admin/fai/class_faiTemplate.inc:512
-msgid "Readonly"
-msgstr ""
+#: admin/fai/class_faiPartitionTable.inc:61
+#: admin/fai/class_faiDiskEntry.inc:442 admin/systems/class_faiLogView.inc:207
+#: admin/systems/class_faiLogView.inc:242
+msgid "Error"
+msgstr "ÐžÑˆÐ¸Ð±ÐºÐ°"
 
-#: admin/fai/class_faiPackage.inc:689
-msgid "Install Method"
+#: admin/fai/class_faiPartitionTable.inc:112
+msgid "Add RAID"
 msgstr ""
 
-#: admin/fai/class_faiPackage.inc:690
-msgid "Package configuration"
+#: admin/fai/class_faiPartitionTable.inc:116
+msgid "Add LVM"
 msgstr ""
 
-#: admin/fai/class_faiPackage.inc:691 admin/systems/class_faiStartup.inc:78
-#: admin/systems/services/repository/class_serviceRepository.inc:40
-#: admin/fai/branch_selector.tpl.c:14 admin/fai/faiPackage.tpl.c:20
-#: admin/fai/fai-filter.tpl.c:5 admin/fai/fai-filter.tpl.c:14
-msgid "Release"
+#: admin/fai/class_faiPartitionTable.inc:284
+msgid "Partition table"
 msgstr ""
 
-#: admin/fai/class_faiPartitionTable.inc:269
-#: admin/fai/class_faiDiskEntry.inc:446
-#, php-format
-msgid ""
-"The disk cannot be deleted while it is used in the '%s' disk definition!"
+#: admin/fai/class_faiPartitionTable.inc:285
+#: admin/fai/class_faiPartitionTable.inc:288
+msgid "FAI partition table"
 msgstr ""
 
-#: admin/fai/class_faiPartitionTable.inc:416 admin/fai/class_faiScript.inc:360
-#: admin/fai/class_faiScript.inc:362 admin/fai/class_faiTemplate.inc:306
-#: admin/fai/class_faiTemplate.inc:308
-msgid "edit"
+#: admin/fai/class_faiPartitionTable.inc:307 admin/fai/class_faiProfile.inc:50
+msgid "Partition table class name"
 msgstr ""
 
-#: admin/fai/class_faiPartitionTable.inc:418 admin/fai/class_faiScript.inc:364
-#: admin/fai/class_faiTemplate.inc:310
-msgid "delete"
+#: admin/fai/class_faiPartitionTable.inc:317
+msgid "Discs"
 msgstr ""
 
-#: admin/fai/class_faiPartitionTable.inc:769
-#: admin/fai/class_faiPartitionTable.inc:773
-msgid "FAI partition table"
+#: admin/fai/class_faiPartitionTable.inc:324
+msgid "Partitions in this class"
 msgstr ""
 
-#: admin/fai/class_faiPartitionTable.inc:779 admin/fai/class_faiHook.inc:531
-#: admin/fai/class_faiVariable.inc:398
-msgid "Read only"
-msgstr "Ð¢Ð¾Ð»ÑŒÐºÐ¾ Ð´Ð»Ñ Ñ‡Ñ‚ÐµÐ½Ð¸Ñ"
-
 #: admin/fai/class_faiDiskEntry.inc:273
-#: admin/fai/faiPartitionTableEntry.tpl.c:5 admin/fai/faiDiskEntry.tpl.c:5
 msgid "Device"
 msgstr ""
 
 #: admin/fai/class_faiDiskEntry.inc:273
 msgid "Label"
-msgstr ""
+msgstr "ÐžÐ±Ð¾Ð·Ð½Ð°Ñ‡ÐµÐ½Ð¸Ðµ"
 
 #: admin/fai/class_faiDiskEntry.inc:273
 msgid "UUID"
 msgstr ""
 
-#: admin/fai/class_faiDiskEntry.inc:345
+#: admin/fai/class_faiDiskEntry.inc:344
 msgid "Disks"
 msgstr ""
 
-#: admin/fai/class_faiDiskEntry.inc:348 admin/fai/class_faiPartition.inc:321
-#: admin/fai/faiPartition.tpl.c:14
+#: admin/fai/class_faiDiskEntry.inc:347 admin/fai/class_faiPartition.inc:319
 msgid "Size"
 msgstr "Ð Ð°Ð·Ð¼ÐµÑ€"
 
-#: admin/fai/class_faiDiskEntry.inc:544
+#: admin/fai/class_faiDiskEntry.inc:443
+#, php-format
+msgid ""
+"The disk cannot be deleted while it is used in the '%s' disk definition!"
+msgstr ""
+
+#: admin/fai/class_faiDiskEntry.inc:536
 msgid "encrypted"
 msgstr ""
 
-#: admin/fai/class_faiDiskEntry.inc:547
+#: admin/fai/class_faiDiskEntry.inc:539
 msgid "bootable"
 msgstr ""
 
-#: admin/fai/class_faiDiskEntry.inc:550
+#: admin/fai/class_faiDiskEntry.inc:542
 msgid "preserve"
 msgstr ""
 
-#: admin/fai/class_faiDiskEntry.inc:735
+#: admin/fai/class_faiDiskEntry.inc:687 admin/fai/class_faiDiskEntry.inc:690
+#: admin/fai/class_faiDiskEntry.inc:737
+#: admin/fai/packageSelect/selectPackage-list.xml:40
+#: admin/fai/class_faiScript.inc:71 admin/fai/class_faiHook.inc:71
+#: admin/fai/class_faiVariable.inc:71
+#: admin/fai/class_faiSimplePluginClass.inc:50
+msgid "Name"
+msgstr "Ð¤Ð°Ð¼Ð¸Ð»Ð¸Ñ"
+
+#: admin/fai/class_faiDiskEntry.inc:717
 msgid ""
 "You have more than four primary partition table entries in your "
 "configuration, please check your configuration twice."
 msgstr ""
 
-#: admin/fai/class_faiDiskEntry.inc:739
+#: admin/fai/class_faiDiskEntry.inc:721
 msgid ""
 "You cannot have more than three primary partition while using logical "
 "partitions, please check your configuration twice."
 msgstr ""
 
-#: admin/fai/class_faiDiskEntry.inc:752
-#: admin/fai/class_faiPartitionTableEntry.inc:448
+#: admin/fai/class_faiDiskEntry.inc:733
 msgid "Partition table entry"
 msgstr ""
 
-#: admin/fai/class_faiDiskEntry.inc:753
-#: admin/fai/class_faiPartitionTableEntry.inc:449
+#: admin/fai/class_faiDiskEntry.inc:734
 msgid "FAI partition table entry"
 msgstr ""
 
-#: admin/fai/class_faiDiskEntry.inc:760
+#: admin/fai/class_faiDiskEntry.inc:739
 msgid "Disk options"
 msgstr ""
 
-#: admin/fai/class_faiDiskEntry.inc:761
-#: admin/fai/class_faiPartitionTableEntry.inc:457
+#: admin/fai/class_faiDiskEntry.inc:740
 msgid "Partition type"
 msgstr ""
 
-#: admin/fai/class_faiDiskEntry.inc:762
-#: admin/fai/class_faiPartitionTableEntry.inc:458
+#: admin/fai/class_faiDiskEntry.inc:741
 msgid "Partition no."
 msgstr ""
 
-#: admin/fai/class_faiDiskEntry.inc:763
-#: admin/fai/class_faiPartitionTableEntry.inc:459
+#: admin/fai/class_faiDiskEntry.inc:742
 msgid "File system type"
 msgstr ""
 
-#: admin/fai/class_faiDiskEntry.inc:764
-#: admin/fai/class_faiPartitionTableEntry.inc:171
-#: admin/fai/class_faiPartitionTableEntry.inc:460
-#: admin/fai/class_faiPartition.inc:437 admin/fai/faiPartition.tpl.c:47
+#: admin/fai/class_faiDiskEntry.inc:743 admin/fai/class_faiPartition.inc:432
 msgid "Mount point"
-msgstr ""
+msgstr "Ð¢Ð¾Ñ‡ÐºÐ° Ð¼Ð¾Ð½Ñ‚Ð¸Ñ€Ð¾Ð²Ð°Ð½Ð¸Ñ"
 
-#: admin/fai/class_faiDiskEntry.inc:765
-#: admin/fai/class_faiPartitionTableEntry.inc:461
-#: admin/fai/class_faiPartition.inc:402 admin/fai/class_faiPartition.inc:407
+#: admin/fai/class_faiDiskEntry.inc:744 admin/fai/class_faiPartition.inc:397
+#: admin/fai/class_faiPartition.inc:402
 msgid "Partition size"
 msgstr ""
 
-#: admin/fai/class_faiDiskEntry.inc:766
-#: admin/fai/class_faiPartitionTableEntry.inc:173
-#: admin/fai/class_faiPartitionTableEntry.inc:462
-#: admin/fai/faiPartition.tpl.c:50
+#: admin/fai/class_faiDiskEntry.inc:745
 msgid "Mount options"
 msgstr ""
 
-#: admin/fai/class_faiDiskEntry.inc:767
-#: admin/fai/class_faiPartitionTableEntry.inc:463
+#: admin/fai/class_faiDiskEntry.inc:746
 msgid "File system options"
 msgstr ""
 
-#: admin/fai/class_faiDiskEntry.inc:768
-#: admin/fai/class_faiPartitionTableEntry.inc:464
+#: admin/fai/class_faiDiskEntry.inc:747
 msgid "Partition flags"
 msgstr ""
 
-#: admin/fai/class_debconfTemplate.inc:227
+#: admin/fai/class_debconfTemplate.inc:225
 msgid "This package has no debconf options."
 msgstr ""
 
-#: admin/fai/class_debconfTemplate.inc:264
+#: admin/fai/class_debconfTemplate.inc:262
 msgid ""
 "This debconf question is dynamically generated during package installation "
 "and requires choosing between specific options which cannot be presented "
@@ -494,217 +302,59 @@ msgid ""
 " effect."
 msgstr ""
 
-#: admin/fai/class_faiTemplateEntry.inc:139
-msgid "no file uploaded yet"
+#: admin/fai/class_faiTemplateEntry.inc:143
+msgid "File path"
 msgstr ""
 
-#: admin/fai/class_faiTemplateEntry.inc:142
-#, php-format
-msgid "exists in database (size: %s bytes)"
+#: admin/fai/class_faiTemplateEntry.inc:143
+msgid "Complete absolute template file path and name"
 msgstr ""
 
-#: admin/fai/class_faiTemplateEntry.inc:251
-#: admin/systems/class_faiLogView.inc:70 admin/fai/faiTemplateEntry.tpl.c:23
-msgid "File"
-msgstr "Ð¤Ð°Ð¹Ð»"
-
-#: admin/fai/class_faiTemplateEntry.inc:255
-#: admin/fai/faiTemplateEntry.tpl.c:11
-msgid "Destination path"
+#: admin/fai/class_faiTemplateEntry.inc:147
+msgid "Short description of the file"
 msgstr ""
 
-#: admin/fai/class_faiTemplateEntry.inc:260 admin/fai/faiTemplateEntry.tpl.c:8
-msgid "File name"
+#: admin/fai/class_faiTemplateEntry.inc:156
+msgid "Template attributes"
 msgstr ""
 
-#: admin/fai/class_faiTemplateEntry.inc:264
-#: admin/fai/class_faiTemplateEntry.inc:266
-#: admin/fai/faiTemplateEntry.tpl.c:68
-msgid "User"
-msgstr "ÐŸÐ¾Ð»ÑŒÐ·Ð¾Ð²Ð°Ñ‚ÐµÐ»ÑŒ"
-
-#: admin/fai/class_faiTemplateEntry.inc:270
-#: admin/fai/class_faiTemplateEntry.inc:273
-#: admin/fai/class_faiTemplateEntry.inc:275
-#: admin/fai/faiTemplateEntry.tpl.c:47 admin/fai/faiTemplateEntry.tpl.c:74
-msgid "Group"
-msgstr "Ð“Ñ€ÑƒÐ¿Ð¿Ð°"
-
-#: admin/fai/class_faiTemplateEntry.inc:305
-msgid "Template entry"
+#: admin/fai/class_faiTemplateEntry.inc:160
+msgid "Template file content"
 msgstr ""
 
-#: admin/fai/class_faiTemplateEntry.inc:306
-msgid "FAI template entry"
+#: admin/fai/class_faiTemplateEntry.inc:160
+msgid "Content of the template file"
 msgstr ""
 
-#: admin/fai/class_faiTemplateEntry.inc:314
-msgid "Template file"
+#: admin/fai/class_faiTemplateEntry.inc:164
+msgid "Owner and group of the file"
 msgstr ""
 
-#: admin/fai/class_faiTemplateEntry.inc:315
-msgid "Template path"
+#: admin/fai/class_faiTemplateEntry.inc:167
+msgid "Owner"
 msgstr ""
 
-#: admin/fai/class_faiTemplateEntry.inc:316
+#: admin/fai/class_faiTemplateEntry.inc:167
 msgid "File owner"
 msgstr ""
 
-#: admin/fai/class_faiTemplateEntry.inc:317
-msgid "File permissions"
-msgstr ""
-
-#: admin/fai/class_FAI.inc:287 admin/fai/class_FAI.inc:679
-#: admin/fai/class_FAI.inc:1266 admin/fai/class_FAI.inc:1283
-#: admin/fai/class_FAI.inc:1287
-msgid "LDAP error"
-msgstr "ÐžÑˆÐ¸Ð±ÐºÐ° LDAP"
-
-#: admin/fai/class_FAI.inc:570
-#, php-format
-msgid "Error, following objects should be equal '%s' and '%s'"
-msgstr ""
-
-#: admin/fai/class_FAI.inc:891
-#, php-format
-msgid "Creating group application release for %s"
-msgstr ""
-
-#: admin/fai/class_FAI.inc:960 admin/fai/class_FAI.inc:982
-#: admin/fai/class_FAI.inc:1022 admin/fai/class_FAI.inc:1027
-#: admin/fai/class_FAI.inc:1065
-msgid "Object"
-msgstr "ÐžÐ±ÑŠÐµÐºÑ‚"
-
-#: admin/fai/class_FAI.inc:961
-#, php-format
-msgid "Adding missing group application release container %s."
-msgstr ""
-
-#: admin/fai/class_FAI.inc:983
-#, php-format
-msgid "Adding group application release container %s."
-msgstr ""
-
-#: admin/fai/class_FAI.inc:1023
-#, php-format
-msgid "Could not create menu entry %s. (Already exists)."
-msgstr ""
-
-#: admin/fai/class_FAI.inc:1028
-#, php-format
-msgid "Created group application menu entry for %s."
-msgstr ""
-
-#: admin/fai/class_FAI.inc:1059
-#, php-format
-msgid "Creating copy of %s"
-msgstr ""
-
-#: admin/fai/class_FAI.inc:1062
-msgid "Processing"
-msgstr ""
-
-#: admin/fai/class_FAI.inc:1080
-msgid "Could not create new release, the destination dn is already in use."
-msgstr ""
-
-#: admin/fai/class_FAI.inc:1093
-msgid "Error while fetching source dn - aborted!"
-msgstr ""
-
-#: admin/fai/class_FAI.inc:1174
-msgid "Fatal error"
-msgstr "Ð¤Ð°Ñ‚Ð°Ð»ÑŒÐ½Ð°Ñ Ð¾ÑˆÐ¸Ð±ÐºÐ°"
-
-#: admin/fai/class_FAI.inc:1175
-#, php-format
-msgid ""
-"Release creation failed due to ldap errors. Additional informations '%s'."
-msgstr ""
-
-#: admin/fai/class_faiPartitionTableEntry.inc:162
-msgid "primary"
-msgstr ""
-
-#: admin/fai/class_faiPartitionTableEntry.inc:162
-msgid "logical"
-msgstr ""
-
-#: admin/fai/class_faiPartitionTableEntry.inc:169
-#: admin/fai/faiPartition.tpl.c:8
-msgid "Type"
-msgstr "Ð¢Ð¸Ð¿"
-
-#: admin/fai/class_faiPartitionTableEntry.inc:170
-msgid "FS type"
-msgstr ""
-
-#: admin/fai/class_faiPartitionTableEntry.inc:172
-msgid "Size in MB"
-msgstr ""
-
-#: admin/fai/class_faiPartitionTableEntry.inc:174
-msgid "FS option"
-msgstr ""
-
-#: admin/fai/class_faiPartitionTableEntry.inc:175
-#: admin/fai/faiPartition.tpl.c:23
-msgid "Preserve"
-msgstr ""
-
-#: admin/fai/class_faiPartitionTableEntry.inc:266
-msgid "False"
-msgstr ""
-
-#: admin/fai/class_faiPartitionTableEntry.inc:268
-msgid "True"
-msgstr ""
-
-#: admin/fai/class_faiPartitionTableEntry.inc:272
-#: admin/fai/class_faiPartitionTableEntry.inc:274 admin/fai/fai-list.xml:159
-#: admin/fai/fai-list.xml:198
-msgid "Remove"
-msgstr "Ð£Ð´Ð°Ð»Ð¸Ñ‚ÑŒ"
-
-#: admin/fai/class_faiPartitionTableEntry.inc:384
-#, php-format
-msgid "please enter a unique mount point for partition %s"
-msgstr ""
-
-#: admin/fai/class_faiPartitionTableEntry.inc:389
-#, php-format
-msgid "partition %s mount point"
-msgstr ""
-
-#: admin/fai/class_faiPartitionTableEntry.inc:394
-#, php-format
-msgid ""
-"File system type 'swap' is already used, change file system type for "
-"partition %s."
-msgstr ""
+#: admin/fai/class_faiTemplateEntry.inc:172
+msgid "Group"
+msgstr "Ð“Ñ€ÑƒÐ¿Ð¿Ð°"
 
-#: admin/fai/class_faiPartitionTableEntry.inc:398
-msgid "Please use 'swap' as mount point, if 'swap' is used as fs-type."
+#: admin/fai/class_faiTemplateEntry.inc:172
+msgid "File group"
 msgstr ""
 
-#: admin/fai/class_faiPartitionTableEntry.inc:404
-#: admin/fai/class_faiPartitionTableEntry.inc:408
-#: admin/fai/class_faiPartitionTableEntry.inc:414
-#: admin/fai/class_faiPartitionTableEntry.inc:416
-#: admin/fai/class_faiPartitionTableEntry.inc:421
-#, php-format
-msgid "partition %s size"
+#: admin/fai/class_faiTemplateEntry.inc:181
+msgid "Access"
 msgstr ""
 
-#: admin/fai/class_faiPartitionTableEntry.inc:436
-msgid ""
-"You have more than 3 primary partition table entries in your configuration, "
-"please check your configuration twice."
+#: admin/fai/class_faiTemplateEntry.inc:181
+msgid "Access rights"
 msgstr ""
 
 #: admin/fai/packageSelect/selectPackage-list.xml:10
-#: admin/fai/classSelect/selectClass-list.xml:11
 msgid "Please select the desired entries"
 msgstr "ÐŸÐ¾Ð¶Ð°Ð»ÑƒÐ¹ÑÑ‚Ð° Ð²Ñ‹Ð±ÐµÑ€ÐµÑ‚Ðµ Ð½ÑƒÐ¶Ð½Ñ‹Ðµ Ð·Ð°Ð¿Ð¸ÑÐ¸"
 
@@ -712,147 +362,94 @@ msgstr "ÐŸÐ¾Ð¶Ð°Ð»ÑƒÐ¹ÑÑ‚Ð° Ð²Ñ‹Ð±ÐµÑ€ÐµÑ‚Ðµ Ð½ÑƒÐ¶Ð½Ñ‹Ðµ Ð·Ð°Ð¿Ð¸ÑÐ¸"
 msgid "Version"
 msgstr ""
 
-#: admin/fai/class_faiProfile.inc:310
-msgid "This list displays all assigned class names for this profile."
-msgstr ""
-
-#: admin/fai/class_faiProfile.inc:313 admin/fai/class_askClassName.inc:103
-#: admin/fai/classSelect/class_classSelect.inc:53
-#: admin/fai/class_faiProfileEntry.inc:158
-msgid "Hook bundle"
-msgstr ""
-
-#: admin/fai/class_faiProfile.inc:314 admin/fai/class_askClassName.inc:105
-#: admin/fai/classSelect/class_classSelect.inc:54
-#: admin/fai/class_faiProfileEntry.inc:159
-msgid "Template bundle"
-msgstr ""
-
-#: admin/fai/class_faiProfile.inc:315 admin/fai/class_askClassName.inc:101
-#: admin/fai/classSelect/class_classSelect.inc:55
-#: admin/fai/class_faiProfileEntry.inc:160
-msgid "Script bundle"
-msgstr ""
-
-#: admin/fai/class_faiProfile.inc:316 admin/fai/class_askClassName.inc:102
-#: admin/fai/classSelect/class_classSelect.inc:56
-#: admin/fai/class_faiProfileEntry.inc:161
-msgid "Variable bundle"
-msgstr ""
-
-#: admin/fai/class_faiProfile.inc:317 admin/fai/class_askClassName.inc:100
-#: admin/fai/classSelect/class_classSelect.inc:57
-#: admin/fai/class_faiProfileEntry.inc:162
-msgid "Package bundle"
-msgstr ""
-
-#: admin/fai/class_faiProfile.inc:321
-msgid "Remove class from profile"
-msgstr ""
-
-#: admin/fai/class_faiProfile.inc:324
-msgid "Up"
-msgstr ""
-
-#: admin/fai/class_faiProfile.inc:325
-msgid "Down"
-msgstr "Ð’Ð½Ð¸Ð·"
-
-#: admin/fai/class_faiProfile.inc:410
-msgid "No class specified for this profile!"
-msgstr ""
-
-#: admin/fai/class_faiProfile.inc:419
-msgid "You can't use the same name for a class and a profile!"
+#: admin/fai/class_faiProfile.inc:28
+msgid "Profile"
 msgstr ""
 
-#: admin/fai/class_faiProfile.inc:455
+#: admin/fai/class_faiProfile.inc:29
 msgid "FAI profile"
 msgstr ""
 
-#: admin/fai/class_faiProfile.inc:458
+#: admin/fai/class_faiProfile.inc:32
 msgid "FAI Profile"
 msgstr ""
 
-#: admin/fai/class_faiProfile.inc:465 admin/fai/faiProfile.tpl.c:17
+#: admin/fai/class_faiProfile.inc:61
 msgid "FAI classes"
 msgstr ""
 
-#: admin/fai/class_faiHookEntry.inc:200
-msgid "Hook entry"
+#: admin/fai/class_faiProfile.inc:61
+msgid "FAI classes which are part of this profile"
 msgstr ""
 
-#: admin/fai/class_faiHookEntry.inc:201
-msgid "FAI hook entry"
+#: admin/fai/class_faiPackageConfiguration.inc:88
+#, php-format
+msgid "Debconf information for package '%s'"
 msgstr ""
 
-#: admin/fai/class_faiHookEntry.inc:209 admin/fai/faiHookEntry.tpl.c:20
-msgid "Task"
+#: admin/fai/class_faiScript.inc:30 admin/fai/class_faiScript.inc:84
+#: admin/fai/class_faiHook.inc:87
+msgid "Script"
 msgstr ""
 
-#: admin/fai/class_faiHookEntry.inc:210 admin/fai/class_faiScript.inc:595
-#: admin/fai/class_faiScript.inc:599
+#: admin/fai/class_faiScript.inc:31 admin/fai/class_faiScript.inc:34
 msgid "FAI script"
 msgstr ""
 
-#: admin/fai/class_faiPackageConfiguration.inc:88
-#, php-format
-msgid "Debconf information for package '%s'"
+#: admin/fai/class_faiScript.inc:63
+msgid "Scripts"
 msgstr ""
 
-#: admin/fai/class_askClassName.inc:99 admin/fai/class_askClassName.inc:100
-#: admin/fai/class_askClassName.inc:101 admin/fai/class_askClassName.inc:102
-#: admin/fai/class_askClassName.inc:103 admin/fai/class_askClassName.inc:104
-#: admin/fai/class_askClassName.inc:105 admin/fai/class_askClassName.inc:106
-msgid "Create new FAI object"
+#: admin/fai/class_faiScript.inc:67 admin/fai/class_faiHook.inc:67
+#: admin/fai/class_faiVariable.inc:67
+msgid "Variables in this class"
 msgstr ""
 
-#: admin/fai/class_faiTemplateEdit.inc:80
-#, php-format
-msgid ""
-"The file encodig has changed from '%s' to '%s'. Do you really want to save?"
+#: admin/fai/class_faiScript.inc:71 admin/fai/class_faiHook.inc:71
+#: admin/fai/class_faiVariable.inc:71
+msgid "The name of the variable"
 msgstr ""
 
-#: admin/fai/class_faiScript.inc:333 admin/fai/class_faiScript.inc:335
-msgid "Sort direction"
+#: admin/fai/class_faiScript.inc:75 admin/fai/class_faiHook.inc:75
+#: admin/fai/class_faiVariable.inc:75
+msgid "A short description of the variable"
 msgstr ""
 
-#: admin/fai/class_faiScript.inc:348 admin/fai/faiScriptEntry.tpl.c:20
+#: admin/fai/class_faiScript.inc:79
 msgid "Priority"
 msgstr ""
 
-#: admin/fai/class_faiScript.inc:350
-msgid "Action"
-msgstr "Ð”ÐµÐ¹ÑÑ‚Ð²Ð¸Ðµ"
+#: admin/fai/class_faiScript.inc:79
+msgid "Priority of this script (FIXME: less is done first?)"
+msgstr ""
 
-#: admin/fai/classSelect/selectClass-list.xml:36 admin/fai/fai-list.xml:88
-#: admin/fai/faiScriptEntry.tpl.c:14
-msgid "Properties"
-msgstr "Ð¡Ð²Ð¾Ð¹ÑÑ‚Ð²Ð°"
+#: admin/fai/class_faiScript.inc:84
+msgid "The script itself"
+msgstr ""
 
-#: admin/fai/class_faiTemplate.inc:501 admin/fai/fai-list.xml:116
+#: admin/fai/class_faiTemplate.inc:136
+#, php-format
+msgid "There are several files with the same path: %s"
+msgstr ""
+
+#: admin/fai/class_faiTemplate.inc:153
 msgid "Template"
 msgstr "Ð¨Ð°Ð±Ð»Ð¾Ð½"
 
-#: admin/fai/class_faiTemplate.inc:502 admin/fai/class_faiTemplate.inc:506
+#: admin/fai/class_faiTemplate.inc:154 admin/fai/class_faiTemplate.inc:157
 msgid "FAI template"
 msgstr ""
 
-#: admin/fai/class_faiVariableEntry.inc:107
-msgid "Content"
+#: admin/fai/class_faiTemplate.inc:176
+msgid "Template class name"
 msgstr ""
 
-#: admin/fai/class_faiVariableEntry.inc:142
-msgid "Variable entry"
+#: admin/fai/class_faiTemplate.inc:186
+msgid "Template files"
 msgstr ""
 
-#: admin/fai/class_faiVariableEntry.inc:143
-msgid "FAI variable entry "
-msgstr ""
-
-#: admin/fai/class_faiVariableEntry.inc:151
-#: admin/fai/faiVariableEntry.tpl.c:20
-msgid "Variable content"
+#: admin/fai/class_faiTemplate.inc:190
+msgid "Template files in this class"
 msgstr ""
 
 #: admin/fai/class_faiPartition.inc:176 admin/fai/class_faiPartition.inc:180
@@ -951,95 +548,74 @@ msgstr ""
 msgid "btrfs"
 msgstr ""
 
-#: admin/fai/class_faiPartition.inc:224
-msgid "LVM/RAID"
-msgstr ""
-
-#: admin/fai/class_faiPartition.inc:327
+#: admin/fai/class_faiPartition.inc:325
 msgid "spare"
 msgstr ""
 
-#: admin/fai/class_faiPartition.inc:330
+#: admin/fai/class_faiPartition.inc:328
 msgid "missing"
 msgstr ""
 
-#: admin/fai/class_faiPartition.inc:333
+#: admin/fai/class_faiPartition.inc:331
 msgid "Options"
 msgstr "ÐŸÐ°Ñ€Ð°Ð¼ÐµÑ‚Ñ€Ñ‹"
 
-#: admin/fai/class_faiPartition.inc:420
+#: admin/fai/class_faiPartition.inc:415
 msgid "Minimum partition size"
 msgstr ""
 
-#: admin/fai/class_faiPartition.inc:420
+#: admin/fai/class_faiPartition.inc:415
 msgid "Maximum partition size"
 msgstr ""
 
-#: admin/fai/class_faiPartition.inc:428
+#: admin/fai/class_faiPartition.inc:423
 msgid "Raid arrays must contain at least two partitions!"
 msgstr ""
 
-#: admin/fai/class_faiPartition.inc:430
+#: admin/fai/class_faiPartition.inc:425
 msgid ""
 "Raid 0 arrays can only be realized with a combination of two partitions!"
 msgstr ""
 
-#: admin/fai/class_faiHook.inc:332 admin/fai/class_faiHook.inc:334
-#: admin/fai/fai-list.xml:190 admin/fai/faiVariable.tpl.c:23
-#: admin/fai/faiVariable.tpl.c:26
-msgid "Edit"
-msgstr "Ð˜Ð·Ð¼ÐµÐ½Ð¸Ñ‚ÑŒ"
-
-#: admin/fai/class_faiHook.inc:336
-msgid "Delete"
-msgstr "Ð£Ð´Ð°Ð»Ð¸Ñ‚ÑŒ"
-
-#: admin/fai/class_faiHook.inc:521 admin/fai/fai-list.xml:128
+#: admin/fai/class_faiHook.inc:30
 msgid "Hook"
 msgstr ""
 
-#: admin/fai/class_faiHook.inc:522 admin/fai/class_faiHook.inc:526
+#: admin/fai/class_faiHook.inc:31 admin/fai/class_faiHook.inc:34
 msgid "FAI hook"
 msgstr ""
 
-#: admin/fai/class_faiVariable.inc:387 admin/fai/fai-list.xml:134
-msgid "Variable"
-msgstr "ÐŸÐµÑ€ÐµÐ¼ÐµÐ½Ð½Ð°Ñ"
+#: admin/fai/class_faiHook.inc:63
+msgid "Hooks"
+msgstr "Ð¥ÑƒÐºÐ¸"
 
-#: admin/fai/class_faiVariable.inc:388 admin/fai/class_faiVariable.inc:392
-msgid "FAI variable"
+#: admin/fai/class_faiHook.inc:79
+msgid "Task"
 msgstr ""
 
-#: admin/fai/class_faiProfileEntry.inc:184 admin/fai/askClassName.tpl.c:11
-#: admin/fai/askClassName.tpl.c:17 admin/fai/paste_generic.tpl.c:5
-msgid "Class name"
+#: admin/fai/class_faiHook.inc:87
+msgid "The script of this hook"
 msgstr ""
 
-#: admin/fai/class_faiProfileEntry.inc:184 admin/fai/faiTemplate.tpl.c:14
-#: admin/fai/faiVariable.tpl.c:14 admin/fai/faiHook.tpl.c:14
-#: admin/fai/faiPartitionTable.tpl.c:17 admin/fai/faiScript.tpl.c:14
-msgid "Objects"
-msgstr ""
+#: admin/fai/class_faiVariable.inc:30
+msgid "Variable"
+msgstr "ÐŸÐµÑ€ÐµÐ¼ÐµÐ½Ð½Ð°Ñ"
 
-#: admin/fai/fai-list.xml:11
-msgid "List of deployment classes and products"
+#: admin/fai/class_faiVariable.inc:31 admin/fai/class_faiVariable.inc:34
+msgid "FAI variable"
 msgstr ""
 
-#: admin/fai/fai-list.xml:15
-msgid "partitionTable"
+#: admin/fai/class_faiVariable.inc:63
+msgid "Variables"
 msgstr ""
 
-#: admin/fai/fai-list.xml:23
-msgid "packagelist"
+#: admin/fai/class_faiVariable.inc:79
+msgid "Content"
 msgstr ""
 
-#: admin/fai/fai-list.xml:93
-msgid "Actions"
-msgstr "Ð”ÐµÐ¹ÑÑ‚Ð²Ð¸Ñ"
-
-#: admin/fai/fai-list.xml:104
-msgid "Create"
-msgstr "Ð¡Ð¾Ð·Ð´Ð°Ñ‚ÑŒ"
+#: admin/fai/class_faiVariable.inc:79
+msgid "The content of the variable"
+msgstr ""
 
 #: admin/systems/class_faiLogView.inc:56
 msgid "Sort down"
@@ -1049,6 +625,10 @@ msgstr ""
 msgid "Sort up"
 msgstr ""
 
+#: admin/systems/class_faiLogView.inc:70
+msgid "File"
+msgstr "Ð¤Ð°Ð¹Ð»"
+
 #: admin/systems/class_faiLogView.inc:71
 msgid "Date"
 msgstr "Ð”Ð°Ñ‚Ð°"
@@ -1083,7 +663,7 @@ msgstr ""
 msgid "Selected file: %s"
 msgstr ""
 
-#: admin/systems/class_faiStartup.inc:70 admin/fai/paste_generic.tpl.c:2
+#: admin/systems/class_faiStartup.inc:70
 msgid "FAI settings"
 msgstr ""
 
@@ -1103,18 +683,13 @@ msgstr ""
 msgid "FAI profil to be applied to this computer"
 msgstr ""
 
-#: admin/systems/class_faiStartup.inc:90 admin/fai/faiPackage.tpl.c:14
-#: admin/fai/faiPackage.tpl.c:17
-msgid "Repository"
-msgstr ""
-
 #: admin/systems/class_faiStartup.inc:90
 msgid "FAI Debian repository to be used for installation"
 msgstr ""
 
 #: admin/systems/class_faiStartup.inc:96
 msgid "Startup parameters"
-msgstr ""
+msgstr "ÐŸÐ°Ñ€Ð°Ð¼ÐµÑ‚Ñ€Ñ‹ Ð·Ð°Ð¿ÑƒÑÐºÐ°"
 
 #: admin/systems/class_faiStartup.inc:99
 msgid "Boot kernel"
@@ -1122,95 +697,106 @@ msgstr "Ð¯Ð´Ñ€Ð¾ Ð´Ð»Ñ Ð·Ð°Ð³Ñ€ÑƒÐ·ÐºÐ¸"
 
 #: admin/systems/class_faiStartup.inc:99
 msgid "Linux kernel to be installed and booted"
-msgstr ""
+msgstr "Linux ÑÐ´Ñ€Ð¾, ÐºÐ¾Ñ‚Ð¾Ñ€Ð¾Ðµ ÑƒÑÑ‚Ð°Ð½Ð¾Ð²Ð»ÐµÐ½Ð¾ Ð¸ Ð·Ð°Ð³Ñ€ÑƒÐ¶ÐµÐ½Ð¾"
 
 #: admin/systems/class_faiStartup.inc:103
 msgid "Boot kernel parameters"
-msgstr ""
+msgstr "ÐŸÐ°Ñ€Ð°Ð¼ÐµÑ‚Ñ€Ñ‹ Ð·Ð°Ð³Ñ€ÑƒÐ·ÐºÐ¸ ÑÐ´Ñ€Ð°"
 
 #: admin/systems/class_faiStartup.inc:103
 msgid "Linux kernel parameters to be ran"
-msgstr ""
+msgstr "ÐŸÐ°Ñ€Ð°Ð¼ÐµÑ‚Ñ€Ñ‹ Ñ ÐºÐ¾Ñ‚Ð¾Ñ€Ñ‹Ð¼Ð¸ Linux ÑÐ´Ñ€Ð¾ Ð±Ñ‹Ð»Ð¾ Ð·Ð°Ð¿ÑƒÑ‰ÐµÐ½Ð¾"
 
-#: admin/systems/class_faiStartup.inc:178
+#: admin/systems/class_faiStartup.inc:179
 msgid "Full automated installation"
 msgstr ""
 
-#: admin/systems/services/repository/class_serviceRepository.inc:31
+#: admin/systems/services/repository/class_serviceDebianRepository.inc:34
+#: admin/systems/services/repository/class_serviceCentosRepository.inc:31
+msgid "Repositories"
+msgstr ""
+
+#: admin/systems/services/repository/class_serviceDebianRepository.inc:39
+#: admin/systems/services/repository/class_serviceCentosRepository.inc:36
+msgid "Repositories this server hosts"
+msgstr ""
+
+#: admin/systems/services/repository/class_serviceDebianRepository.inc:43
+#: admin/systems/services/repository/class_serviceCentosRepository.inc:40
 msgid "URL"
 msgstr ""
 
-#: admin/systems/services/repository/class_serviceRepository.inc:31
+#: admin/systems/services/repository/class_serviceDebianRepository.inc:43
+#: admin/systems/services/repository/class_serviceCentosRepository.inc:40
 msgid "Repository url"
 msgstr ""
 
-#: admin/systems/services/repository/class_serviceRepository.inc:35
+#: admin/systems/services/repository/class_serviceDebianRepository.inc:47
+#: admin/systems/services/repository/class_serviceCentosRepository.inc:44
 msgid "Parent server"
 msgstr ""
 
-#: admin/systems/services/repository/class_serviceRepository.inc:35
+#: admin/systems/services/repository/class_serviceDebianRepository.inc:47
+#: admin/systems/services/repository/class_serviceCentosRepository.inc:44
 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"
+#: admin/systems/services/repository/class_serviceDebianRepository.inc:52
+msgid "Debian release used on this repository"
 msgstr ""
 
-#: admin/systems/services/repository/class_serviceRepository.inc:47
-msgid "Sections available on this repository"
+#: admin/systems/services/repository/class_serviceDebianRepository.inc:58
+msgid "Debian sections available on this repository"
 msgstr ""
 
-#: admin/systems/services/repository/class_serviceRepository.inc:52
+#: admin/systems/services/repository/class_serviceDebianRepository.inc:63
+#: admin/systems/services/repository/class_serviceCentosRepository.inc:57
 msgid "Mirror mode"
 msgstr ""
 
-#: admin/systems/services/repository/class_serviceRepository.inc:52
+#: admin/systems/services/repository/class_serviceDebianRepository.inc:63
+#: admin/systems/services/repository/class_serviceCentosRepository.inc:57
 msgid ""
 "Is this mirror an installation repository? Is its release a custom one?"
 msgstr ""
 
-#: admin/systems/services/repository/class_serviceRepository.inc:57
+#: admin/systems/services/repository/class_serviceDebianRepository.inc:68
+#: admin/systems/services/repository/class_serviceCentosRepository.inc:62
 msgid "Local mirror"
 msgstr ""
 
-#: admin/systems/services/repository/class_serviceRepository.inc:57
+#: admin/systems/services/repository/class_serviceDebianRepository.inc:68
+#: admin/systems/services/repository/class_serviceCentosRepository.inc:62
 msgid "Is this mirror a local or a network mirror?"
 msgstr ""
 
-#: admin/systems/services/repository/class_serviceRepository.inc:66
+#: admin/systems/services/repository/class_serviceDebianRepository.inc:77
+#: admin/systems/services/repository/class_serviceCentosRepository.inc:71
 msgid "Architectures"
 msgstr ""
 
-#: admin/systems/services/repository/class_serviceRepository.inc:66
+#: admin/systems/services/repository/class_serviceDebianRepository.inc:77
+#: admin/systems/services/repository/class_serviceCentosRepository.inc:71
 msgid "Processor architectures available on this repository"
 msgstr ""
 
-#: admin/systems/services/repository/class_serviceRepository.inc:72
-msgid "Distribution"
+#: admin/systems/services/repository/class_serviceDebianRepository.inc:99
+#: admin/systems/services/repository/class_serviceDebianRepository.inc:100
+msgid "Debian repository"
 msgstr ""
 
-#: admin/systems/services/repository/class_serviceRepository.inc:72
-msgid "Which distribution is this repository for"
-msgstr ""
-
-#: admin/systems/services/repository/class_serviceRepository.inc:140
-msgid "Repositories"
-msgstr ""
+#: admin/systems/services/repository/class_serviceDebianRepository.inc:100
+#: admin/systems/services/repository/class_serviceCentosRepository.inc:96
+msgid "Services"
+msgstr "Ð¡ÐµÑ€Ð²Ð¸ÑÑ‹"
 
-#: admin/systems/services/repository/class_serviceRepository.inc:145
-msgid "Repositories this server hosts"
-msgstr ""
-
-#: admin/systems/services/repository/class_serviceRepository.inc:160
-msgid "Package repository"
+#: admin/systems/services/repository/class_serviceCentosRepository.inc:49
+msgid "Centos release used on this repository"
 msgstr ""
 
-#: admin/systems/services/repository/class_serviceRepository.inc:161
-msgid "Package repository information"
+#: admin/systems/services/repository/class_serviceCentosRepository.inc:95
+#: admin/systems/services/repository/class_serviceCentosRepository.inc:96
+msgid "Centos repository"
 msgstr ""
 
 #: config/fai/class_faiConfig.inc:28
@@ -1242,476 +828,3 @@ msgstr ""
 #: config/fai/class_faiConfig.inc:60
 msgid "s"
 msgstr ""
-
-#: admin/fai/faiPartitionTableEntry.tpl.c:2 admin/fai/faiVariableEntry.tpl.c:2
-#: admin/fai/faiVariableEntry.tpl.c:5 admin/fai/faiDiskEntry.tpl.c:2
-#: admin/fai/faiTemplate.tpl.c:2 admin/fai/faiTemplate.tpl.c:5
-#: admin/fai/faiVariable.tpl.c:2 admin/fai/faiVariable.tpl.c:5
-#: admin/fai/faiHook.tpl.c:2 admin/fai/faiHook.tpl.c:5
-#: admin/fai/faiPackage.tpl.c:2 admin/fai/faiPackage.tpl.c:5
-#: admin/fai/faiTemplateEntry.tpl.c:2 admin/fai/faiTemplateEntry.tpl.c:5
-#: admin/fai/faiScriptEntry.tpl.c:2 admin/fai/faiScriptEntry.tpl.c:5
-#: admin/fai/faiPartitionTable.tpl.c:2 admin/fai/faiPartitionTable.tpl.c:5
-#: admin/fai/faiScript.tpl.c:2 admin/fai/faiScript.tpl.c:5
-#: admin/fai/faiProfile.tpl.c:2 admin/fai/faiProfile.tpl.c:5
-#: admin/fai/faiProfile.tpl.c:14 admin/fai/faiHookEntry.tpl.c:2
-#: admin/fai/faiHookEntry.tpl.c:5
-msgid "Generic"
-msgstr "ÐžÐ±Ñ‰ÐµÐµ"
-
-#: admin/fai/faiPartitionTableEntry.tpl.c:14
-#: admin/fai/faiPartitionTableEntry.tpl.c:17 admin/fai/faiDiskEntry.tpl.c:23
-#: admin/fai/faiDiskEntry.tpl.c:26
-msgid "Partition entries"
-msgstr ""
-
-#: admin/fai/faiPartitionTableEntry.tpl.c:20
-#: admin/fai/faiPartitionTableEntry.tpl.c:23 admin/fai/faiDiskEntry.tpl.c:29
-#: admin/fai/faiDiskEntry.tpl.c:32
-msgid "Add partition"
-msgstr ""
-
-#: admin/fai/branch_selector.tpl.c:2
-msgid "Releases"
-msgstr ""
-
-#: admin/fai/branch_selector.tpl.c:5
-msgid "Current release"
-msgstr ""
-
-#: admin/fai/branch_selector.tpl.c:8 admin/fai/branch_selector.tpl.c:17
-#: admin/fai/fai-filter.tpl.c:8 admin/fai/fai-filter.tpl.c:17
-msgid "Create release"
-msgstr ""
-
-#: admin/fai/branch_selector.tpl.c:11 admin/fai/branch_selector.tpl.c:23
-#: admin/fai/fai-filter.tpl.c:11 admin/fai/fai-filter.tpl.c:23
-msgid "Create read-only release"
-msgstr ""
-
-#: admin/fai/branch_selector.tpl.c:20 admin/fai/fai-filter.tpl.c:20
-msgid "Freeze"
-msgstr ""
-
-#: admin/fai/branch_selector.tpl.c:26 admin/fai/fai-filter.tpl.c:26
-msgid "Delete current release"
-msgstr ""
-
-#: admin/fai/faiPartition.tpl.c:2
-msgid "Partition"
-msgstr ""
-
-#: admin/fai/faiPartition.tpl.c:17
-msgid "Resize existing partition"
-msgstr ""
-
-#: admin/fai/faiPartition.tpl.c:20
-msgid "Bootable"
-msgstr ""
-
-#: admin/fai/faiPartition.tpl.c:26 admin/fai/faiDiskEntry.tpl.c:20
-msgid "Combined physical partitions"
-msgstr ""
-
-#: admin/fai/faiPartition.tpl.c:29
-msgid "Toggle missing"
-msgstr ""
-
-#: admin/fai/faiPartition.tpl.c:32
-msgid "Toggle spare"
-msgstr ""
-
-#: admin/fai/faiPartition.tpl.c:35
-msgid "Filesystem"
-msgstr ""
-
-#: admin/fai/faiPartition.tpl.c:38
-msgid "Filesystem create options"
-msgstr ""
-
-#: admin/fai/faiPartition.tpl.c:41
-msgid "Encrypted"
-msgstr ""
-
-#: admin/fai/faiPartition.tpl.c:44
-msgid "Tune options"
-msgstr ""
-
-#: admin/fai/faiNewBranch.tpl.c:2
-msgid ""
-"You are now going to create a branch or locked branch. This action clones "
-"the existing release to another release name. Branches can be modified as "
-"usual. FAI classes of locked branches cannot be modified, just additional "
-"classes are possible. Branch names should be alphanumeric, excluding the "
-"reserved names 'scripts', 'hooks', 'partitions', 'variables', 'templates' "
-"and 'fai'."
-msgstr ""
-
-#: admin/fai/faiNewBranch.tpl.c:5
-msgid ""
-"Branches are created as subreleases of the currently selected branch. "
-"Creating a new branch named 1.0.2 in SARGE for example, will result in a new"
-" release called SARGE/1.0.2."
-msgstr ""
-
-#: admin/fai/faiNewBranch.tpl.c:8
-msgid "Please enter a name for the branch"
-msgstr ""
-
-#: admin/fai/faiNewBranch.tpl.c:11
-msgid "Processing the requested operation"
-msgstr ""
-
-#: admin/fai/faiNewBranch.tpl.c:14
-msgid ""
-"As soon as the copy operation has finished, you can scroll down to end of "
-"the page and press the 'Continue' button to continue with the fai management"
-" dialog."
-msgstr ""
-
-#: admin/fai/faiNewBranch.tpl.c:17
-msgid ""
-"Your browser doesn't support iframes, please use this link to perform the "
-"requested operation."
-msgstr ""
-
-#: admin/fai/faiNewBranch.tpl.c:20
-msgid "Perform requested operation."
-msgstr ""
-
-#: admin/fai/faiNewBranch.tpl.c:23
-msgid "Initiate operation"
-msgstr ""
-
-#: admin/fai/faiVariableEntry.tpl.c:14 admin/fai/faiVariableEntry.tpl.c:17
-msgid "Variable attributes"
-msgstr ""
-
-#: admin/fai/faiDiskEntry.tpl.c:11
-msgid "fstab key"
-msgstr ""
-
-#: admin/fai/faiDiskEntry.tpl.c:17
-msgid "Disk label"
-msgstr ""
-
-#: admin/fai/faiTemplate.tpl.c:17
-msgid "List of template files"
-msgstr ""
-
-#: admin/fai/faiVariable.tpl.c:17
-msgid "List of assigned variables"
-msgstr ""
-
-#: admin/fai/faiVariable.tpl.c:20
-msgid "Choose a variable to delete or edit"
-msgstr ""
-
-#: admin/fai/askClassName.tpl.c:2
-msgid ""
-"Adding a new class to the FAI management, requires a class name. You have to"
-" specify a unique class name for unique types of FAI classes, while you can "
-"use the same class name for different types of FAI classes. In the laste "
-"case, FAI will automatically enclose all these different class types to one "
-"unique class name."
-msgstr ""
-
-#: admin/fai/askClassName.tpl.c:5
-msgid ""
-"Please use one of the following methods to choose the name for the new FAI "
-"class."
-msgstr ""
-
-#: admin/fai/askClassName.tpl.c:8
-msgid "Enter FAI class name manually"
-msgstr ""
-
-#: admin/fai/askClassName.tpl.c:14
-msgid "Choose FAI class name from a list of existing classes"
-msgstr ""
-
-#: admin/fai/askClassName.tpl.c:20
-msgid "Choose class name"
-msgstr ""
-
-#: admin/fai/faiGroupHandle.tpl.c:2
-msgid "Please select the objects you want to remove:"
-msgstr ""
-
-#: admin/fai/faiGroupHandle.tpl.c:5
-msgid "Freezed"
-msgstr ""
-
-#: admin/fai/faiGroupHandle.tpl.c:8
-msgid "Select the object you want to edit:"
-msgstr ""
-
-#: admin/fai/faiGroupHandle.tpl.c:11
-msgid "Select the object you want to copy:"
-msgstr ""
-
-#: admin/fai/remove.tpl.c:5
-msgid ""
-"This includes all account data, system access rules, imap settings, etc. for"
-" this user. Please double check if your really want to do this since there "
-"is no way for FusionDirectory to get your data back."
-msgstr ""
-
-#: admin/fai/remove.tpl.c:8 admin/fai/remove_branch.tpl.c:8
-msgid "So - if you're sure - press 'Delete' to continue or 'Cancel' to abort."
-msgstr "Ð˜Ñ‚Ð°Ðº - ÐµÑÐ»Ð¸ Ð²Ñ‹ ÑƒÐ²ÐµÑ€ÐµÐ½Ñ‹ - Ð½Ð°Ð¶Ð¼Ð¸Ñ‚Ðµ 'Ð£Ð´Ð°Ð»Ð¸Ñ‚ÑŒ', Ñ‡Ñ‚Ð¾Ð±Ñ‹ Ð¿Ñ€Ð¾Ð´Ð¾Ð»Ð¶Ð¸Ñ‚ÑŒ Ð¸Ð»Ð¸ 'ÐžÑ‚Ð¼ÐµÐ½Ð°' Ñ‡Ñ‚Ð¾Ð±Ñ‹ Ð¿Ñ€ÐµÑ€Ð²Ð°Ñ‚ÑŒ."
-
-#: admin/fai/faiHook.tpl.c:17
-msgid "List of hook scripts"
-msgstr ""
-
-#: admin/fai/packageSelect/selectPackage-list.tpl.c:2
-#: admin/fai/classSelect/selectClass-list.tpl.c:5
-msgid "Update"
-msgstr "ÐžÐ±Ð½Ð¾Ð²Ð¸Ñ‚ÑŒ"
-
-#: admin/fai/packageSelect/selectPackage-list.tpl.c:5
-#: admin/fai/classSelect/selectClass-list.tpl.c:8
-msgid "Submit"
-msgstr ""
-
-#: admin/fai/packageSelect/selectPackage-filter.tpl.c:2
-#: admin/fai/classSelect/selectClass-filter.tpl.c:2
-#: admin/fai/fai-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/remove_branch.tpl.c:5
-msgid ""
-"This includes all account data, system access, etc. for this branch. Please "
-"double check if your really want to do this since there is no way for "
-"FusionDirectory to get your data back."
-msgstr ""
-
-#: admin/fai/faiPackage.tpl.c:26
-msgid "Install method"
-msgstr ""
-
-#: admin/fai/faiPackage.tpl.c:29
-msgid "Please select the installation method"
-msgstr ""
-
-#: admin/fai/faiPackage.tpl.c:32 admin/fai/faiPackage.tpl.c:35
-msgid "Used packages"
-msgstr ""
-
-#: admin/fai/faiPackage.tpl.c:38
-msgid "Add from list"
-msgstr ""
-
-#: admin/fai/faiProfileEntry.tpl.c:2
-msgid "List of FAI objects (Fully Automatic Installation)"
-msgstr ""
-
-#: admin/fai/faiProfileEntry.tpl.c:5
-msgid "Information"
-msgstr "Ð˜Ð½Ñ„Ð¾Ñ€Ð¼Ð°Ñ†Ð¸Ñ"
-
-#: admin/fai/faiProfileEntry.tpl.c:8
-msgid ""
-"This menu allows you to select FAI class names and to add them to the "
-"currently edited profile."
-msgstr ""
-
-#: admin/fai/faiProfileEntry.tpl.c:11
-msgid "Filters"
-msgstr "Ð¤Ð¸Ð»ÑŒÑ‚Ñ€Ñ‹"
-
-#: admin/fai/faiProfileEntry.tpl.c:14
-msgid "Show only classes with templates"
-msgstr ""
-
-#: admin/fai/faiProfileEntry.tpl.c:17
-msgid "Show only classes with scripts"
-msgstr ""
-
-#: admin/fai/faiProfileEntry.tpl.c:20
-msgid "Show only classes with hooks"
-msgstr ""
-
-#: admin/fai/faiProfileEntry.tpl.c:23
-msgid "Show only classes with variables"
-msgstr ""
-
-#: admin/fai/faiProfileEntry.tpl.c:26
-msgid "Show only classes with packages"
-msgstr ""
-
-#: admin/fai/faiProfileEntry.tpl.c:29
-msgid "Show only classes with partitions"
-msgstr ""
-
-#: admin/fai/faiProfileEntry.tpl.c:32 admin/fai/faiProfileEntry.tpl.c:35
-msgid "Display objects matching"
-msgstr "ÐŸÐ¾ÐºÐ°Ð·Ð°Ñ‚ÑŒ ÑÐ¾Ð²Ð¿Ð°Ð´ÐµÐ½Ð¸Ñ Ð¾Ð±ÑŠÐµÐºÑ‚Ð¾Ð²"
-
-#: admin/fai/faiProfileEntry.tpl.c:38
-msgid "Regular expression for matching object names"
-msgstr "Ð ÐµÐ³ÑƒÐ»ÑÑ€Ð½Ð¾Ðµ Ð²Ñ‹Ñ€Ð°Ð¶ÐµÐ½Ð¸Ðµ, ÑÐ¾Ð¾Ñ‚Ð²ÐµÑ‚ÑÑ‚Ð²ÑƒÑŽÑ‰ÐµÐµ Ð¸Ð¼ÐµÐ½Ð°Ð¼ Ð¾Ð±ÑŠÐµÐºÑ‚Ð¾Ð²"
-
-#: admin/fai/faiTemplateEntry.tpl.c:17 admin/fai/faiTemplateEntry.tpl.c:20
-msgid "Template attributes"
-msgstr ""
-
-#: admin/fai/faiTemplateEntry.tpl.c:26 admin/fai/faiTemplateEntry.tpl.c:29
-msgid "Save template"
-msgstr ""
-
-#: admin/fai/faiTemplateEntry.tpl.c:32 admin/fai/faiTemplateEntry.tpl.c:35
-msgid "Edit template"
-msgstr ""
-
-#: admin/fai/faiTemplateEntry.tpl.c:38
-msgid "Full path"
-msgstr ""
-
-#: admin/fai/faiTemplateEntry.tpl.c:41
-msgid "Upload"
-msgstr "Ð—Ð°Ð³Ñ€ÑƒÐ·Ð¸Ñ‚ÑŒ"
-
-#: admin/fai/faiTemplateEntry.tpl.c:44
-msgid "Owner"
-msgstr ""
-
-#: admin/fai/faiTemplateEntry.tpl.c:50
-msgid "Access"
-msgstr ""
-
-#: admin/fai/faiTemplateEntry.tpl.c:53
-msgid "Class"
-msgstr ""
-
-#: admin/fai/faiTemplateEntry.tpl.c:56
-msgid "Read"
-msgstr ""
-
-#: admin/fai/faiTemplateEntry.tpl.c:59
-msgid "Write"
-msgstr ""
-
-#: admin/fai/faiTemplateEntry.tpl.c:62
-msgid "Execute"
-msgstr "Ð’Ñ‹Ð¿Ð¾Ð»Ð½Ð¸Ñ‚ÑŒ"
-
-#: admin/fai/faiTemplateEntry.tpl.c:65
-msgid "Special"
-msgstr ""
-
-#: admin/fai/faiTemplateEntry.tpl.c:71
-msgid "SUID"
-msgstr ""
-
-#: admin/fai/faiTemplateEntry.tpl.c:77
-msgid "SGID"
-msgstr ""
-
-#: admin/fai/faiTemplateEntry.tpl.c:80
-msgid "Others"
-msgstr ""
-
-#: admin/fai/faiTemplateEntry.tpl.c:83
-msgid "sticky"
-msgstr ""
-
-#: admin/fai/faiScriptEntry.tpl.c:17 admin/fai/faiScriptEntry.tpl.c:26
-msgid "Script attributes"
-msgstr ""
-
-#: admin/fai/faiScriptEntry.tpl.c:23
-msgid ""
-"Choose a priority. Low values result in an earlier, high values in a later "
-"execution."
-msgstr ""
-
-#: admin/fai/faiScriptEntry.tpl.c:32 admin/fai/faiHookEntry.tpl.c:32
-msgid "Import script"
-msgstr ""
-
-#: admin/fai/classSelect/selectClass-list.tpl.c:2
-msgid "Base"
-msgstr "Ð’ÐµÑ‚ÐºÐ°"
-
-#: admin/fai/fai-filter.tpl.c:29
-msgid "Show profiles"
-msgstr ""
-
-#: admin/fai/fai-filter.tpl.c:32
-msgid "Show templates"
-msgstr "ÐŸÐ¾ÐºÐ°Ð·Ð°Ñ‚ÑŒ ÑˆÐ°Ð±Ð»Ð¾Ð½Ñ‹"
-
-#: admin/fai/fai-filter.tpl.c:35
-msgid "Show scripts"
-msgstr ""
-
-#: admin/fai/fai-filter.tpl.c:38
-msgid "Show hooks"
-msgstr ""
-
-#: admin/fai/fai-filter.tpl.c:41
-msgid "Show variables"
-msgstr ""
-
-#: admin/fai/fai-filter.tpl.c:44
-msgid "Show packages"
-msgstr ""
-
-#: admin/fai/fai-filter.tpl.c:47
-msgid "Show partitions"
-msgstr ""
-
-#: admin/fai/faiTemplateEdit.tpl.c:2
-msgid "This FAI template is write protected. Editing may break it!"
-msgstr ""
-
-#: admin/fai/faiTemplateEdit.tpl.c:5
-msgid "Edit anyway"
-msgstr "Ð ÐµÐ´Ð°ÐºÑ‚Ð¸Ñ€Ð¾Ð²Ð°Ñ‚ÑŒ Ð² Ð»ÑŽÐ±Ð¾Ð¼ ÑÐ»ÑƒÑ‡Ð°Ðµ"
-
-#: admin/fai/faiPartitionTable.tpl.c:14
-msgid "Use 'setup-storage' to partition the disk"
-msgstr ""
-
-#: admin/fai/faiPartitionTable.tpl.c:20
-msgid "Discs"
-msgstr ""
-
-#: admin/fai/faiPartitionTable.tpl.c:23 admin/fai/faiPartitionTable.tpl.c:26
-#: admin/fai/faiPartitionTable.tpl.c:41 admin/fai/faiPartitionTable.tpl.c:44
-msgid "Add disk"
-msgstr ""
-
-#: admin/fai/faiPartitionTable.tpl.c:29 admin/fai/faiPartitionTable.tpl.c:32
-#: admin/fai/faiPartitionTable.tpl.c:47 admin/fai/faiPartitionTable.tpl.c:50
-msgid "Add RAID"
-msgstr ""
-
-#: admin/fai/faiPartitionTable.tpl.c:35 admin/fai/faiPartitionTable.tpl.c:38
-#: admin/fai/faiPartitionTable.tpl.c:53 admin/fai/faiPartitionTable.tpl.c:56
-msgid "Add volume group"
-msgstr ""
-
-#: admin/fai/faiScript.tpl.c:17
-msgid "List of scripts"
-msgstr ""
-
-#: admin/fai/faiProfile.tpl.c:20
-msgid "Choose a priority"
-msgstr ""
-
-#: admin/fai/faiHookEntry.tpl.c:14 admin/fai/faiHookEntry.tpl.c:17
-#: admin/fai/faiHookEntry.tpl.c:26
-msgid "Hook attributes"
-msgstr ""
-
-#: admin/fai/faiHookEntry.tpl.c:23
-msgid "Choose an existing FAI task"
-msgstr ""
diff --git a/fai/locale/ru@petr1708/fusiondirectory.po b/fai/locale/ru@petr1708/fusiondirectory.po
index b17fd54df474c13329108085bb720b787f3092e7..fe4f1d6222128d9a37dde85707aa7cc84d252324 100644
--- a/fai/locale/ru@petr1708/fusiondirectory.po
+++ b/fai/locale/ru@petr1708/fusiondirectory.po
@@ -5,379 +5,188 @@
 # Translators:
 msgid ""
 msgstr ""
-"Project-Id-Version: FusionDirectory-108\n"
+"Project-Id-Version: FusionDirectory-109\n"
 "Report-Msgid-Bugs-To: documentation@lists.fusiondirectory.org\n"
-"POT-Creation-Date: 2015-03-19 21:45+0100\n"
-"PO-Revision-Date: 2015-02-25 15:46+0000\n"
+"POT-Creation-Date: 2014-12-15 17:47+0100\n"
+"PO-Revision-Date: 2014-12-15 16:54+0000\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>\n"
-"Language-Team: Russian Petrine orthography (http://www.transifex.com/projects/p/FusionDirectory-108/language/ru@petr1708/)\n"
+"Language-Team: Russian Petrine orthography (http://www.transifex.com/projects/p/FusionDirectory-109/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=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);\n"
-
-#: admin/fai/class_faiScriptEntry.inc:79 admin/fai/class_faiScriptEntry.inc:82
-#: admin/fai/class_faiManagement.inc:240 admin/fai/class_faiManagement.inc:768
-#: admin/fai/class_faiManagement.inc:774
-#: admin/fai/class_faiPartitionTable.inc:268
-#: admin/fai/class_faiPartitionTable.inc:331
-#: admin/fai/class_faiDiskEntry.inc:445 admin/fai/class_FAI.inc:570
-#: admin/fai/class_faiHookEntry.inc:83 admin/fai/class_faiHookEntry.inc:86
-#: admin/fai/class_faiScript.inc:249 admin/fai/class_faiTemplate.inc:232
-#: admin/fai/class_faiHook.inc:259 admin/fai/class_faiVariable.inc:162
-#: admin/systems/class_faiLogView.inc:207
-#: admin/systems/class_faiLogView.inc:242
-msgid "Error"
-msgstr ""
-
-#: admin/fai/class_faiScriptEntry.inc:82 admin/fai/class_faiHookEntry.inc:86
-msgid "file is empty"
-msgstr ""
-
-#: admin/fai/class_faiScriptEntry.inc:102 admin/fai/class_faiHookEntry.inc:102
-#: admin/fai/class_faiScript.inc:349 admin/fai/class_faiScript.inc:374
-#: admin/fai/class_faiTemplate.inc:320 admin/fai/class_faiHook.inc:346
-msgid "Download"
-msgstr ""
-
-#: admin/fai/class_faiScriptEntry.inc:147
-#: admin/fai/class_faiScriptEntry.inc:151
-#: admin/fai/class_faiScriptEntry.inc:154
-#: admin/fai/class_faiScriptEntry.inc:197
-#: admin/fai/class_faiManagement.inc:768 admin/fai/class_faiManagement.inc:774
-#: admin/fai/class_faiPackage.inc:685
-#: admin/fai/class_faiPartitionTable.inc:779
-#: admin/fai/class_faiDiskEntry.inc:702 admin/fai/class_faiDiskEntry.inc:705
-#: admin/fai/class_faiDiskEntry.inc:758
-#: admin/fai/class_faiTemplateEntry.inc:247
-#: admin/fai/class_faiTemplateEntry.inc:312
-#: admin/fai/class_faiPartitionTableEntry.inc:353
-#: admin/fai/class_faiPartitionTableEntry.inc:356
-#: admin/fai/class_faiPartitionTableEntry.inc:360
-#: admin/fai/class_faiPartitionTableEntry.inc:455
-#: admin/fai/packageSelect/selectPackage-list.xml:40
-#: admin/fai/class_faiProfile.inc:414 admin/fai/class_faiProfile.inc:463
-#: admin/fai/class_faiHookEntry.inc:157 admin/fai/class_faiHookEntry.inc:162
-#: admin/fai/class_faiHookEntry.inc:165 admin/fai/class_faiHookEntry.inc:207
-#: admin/fai/class_askClassName.inc:163 admin/fai/class_askClassName.inc:167
-#: admin/fai/class_askClassName.inc:171 admin/fai/class_askClassName.inc:198
-#: admin/fai/class_faiScript.inc:347 admin/fai/class_faiScript.inc:605
-#: admin/fai/classSelect/selectClass-list.xml:28
-#: admin/fai/class_faiTemplate.inc:512
-#: admin/fai/class_faiVariableEntry.inc:103
-#: admin/fai/class_faiVariableEntry.inc:112
-#: admin/fai/class_faiVariableEntry.inc:115
-#: admin/fai/class_faiVariableEntry.inc:149 admin/fai/class_faiHook.inc:531
-#: admin/fai/class_faiVariable.inc:398 admin/fai/fai-list.xml:80
-#: admin/fai/faiPartitionTableEntry.tpl.c:8 admin/fai/faiPartition.tpl.c:5
-#: admin/fai/faiVariableEntry.tpl.c:8 admin/fai/faiDiskEntry.tpl.c:8
-#: admin/fai/faiTemplate.tpl.c:8 admin/fai/faiVariable.tpl.c:8
-#: admin/fai/faiHook.tpl.c:8
-#: admin/fai/packageSelect/selectPackage-filter.tpl.c:8
-#: admin/fai/faiPackage.tpl.c:8 admin/fai/faiScriptEntry.tpl.c:8
-#: admin/fai/classSelect/selectClass-filter.tpl.c:5
-#: admin/fai/fai-filter.tpl.c:50 admin/fai/faiPartitionTable.tpl.c:8
-#: admin/fai/faiScript.tpl.c:8 admin/fai/faiProfile.tpl.c:8
-#: admin/fai/faiHookEntry.tpl.c:8
-msgid "Name"
-msgstr ""
-
-#: admin/fai/class_faiScriptEntry.inc:159 admin/fai/class_faiHookEntry.inc:170
-#: admin/fai/class_faiScript.inc:594 admin/fai/fai-list.xml:122
-#: admin/fai/faiScriptEntry.tpl.c:29 admin/fai/faiHookEntry.tpl.c:29
-msgid "Script"
-msgstr ""
-
-#: admin/fai/class_faiScriptEntry.inc:190
-#: admin/fai/class_faiScriptEntry.inc:199
-msgid "Script entry"
-msgstr ""
-
-#: admin/fai/class_faiScriptEntry.inc:191
-msgid "FAI script entry"
-msgstr ""
-
-#: admin/fai/class_faiScriptEntry.inc:198 admin/fai/class_faiPackage.inc:686
-#: admin/fai/class_faiPartitionTable.inc:780
-#: admin/fai/class_faiDiskEntry.inc:759
-#: admin/fai/class_faiTemplateEntry.inc:313
-#: admin/fai/class_faiPartitionTableEntry.inc:456
-#: admin/fai/class_faiProfile.inc:464 admin/fai/class_faiHookEntry.inc:208
-#: admin/fai/class_faiScript.inc:606 admin/fai/class_faiTemplate.inc:513
-#: admin/fai/class_faiVariableEntry.inc:150 admin/fai/class_faiHook.inc:532
-#: admin/fai/class_faiVariable.inc:399
-#: admin/fai/faiPartitionTableEntry.tpl.c:11 admin/fai/faiPartition.tpl.c:11
-#: admin/fai/faiVariableEntry.tpl.c:11 admin/fai/faiDiskEntry.tpl.c:14
-#: admin/fai/faiTemplate.tpl.c:11 admin/fai/faiVariable.tpl.c:11
-#: admin/fai/faiHook.tpl.c:11 admin/fai/faiPackage.tpl.c:11
-#: admin/fai/faiTemplateEntry.tpl.c:14 admin/fai/faiScriptEntry.tpl.c:11
-#: admin/fai/faiPartitionTable.tpl.c:11 admin/fai/faiScript.tpl.c:11
-#: admin/fai/faiProfile.tpl.c:11 admin/fai/faiHookEntry.tpl.c:11
-msgid "Description"
-msgstr ""
-
-#: admin/fai/class_faiScriptEntry.inc:200
-msgid "Script Priority"
-msgstr ""
-
-#: admin/fai/class_faiManagement.inc:188
-msgid "partition table"
-msgstr ""
-
-#: admin/fai/class_faiManagement.inc:189 admin/fai/fai-list.xml:31
-msgid "script"
-msgstr ""
-
-#: admin/fai/class_faiManagement.inc:190 admin/fai/fai-list.xml:47
-msgid "hook"
-msgstr ""
-
-#: admin/fai/class_faiManagement.inc:191 admin/fai/fai-list.xml:39
-msgid "variable"
-msgstr ""
-
-#: admin/fai/class_faiManagement.inc:192 admin/fai/fai-list.xml:63
-msgid "template"
-msgstr ""
-
-#: admin/fai/class_faiManagement.inc:193
-msgid "package list"
-msgstr ""
-
-#: admin/fai/class_faiManagement.inc:210 admin/fai/class_faiManagement.inc:226
-#: admin/fai/class_faiManagement.inc:332 admin/fai/class_faiManagement.inc:390
-#: admin/fai/class_faiManagement.inc:480 admin/fai/class_faiManagement.inc:575
-#: admin/fai/class_faiManagement.inc:598 admin/fai/class_faiManagement.inc:619
-msgid "Permission error"
-msgstr ""
-
-#: admin/fai/class_faiManagement.inc:211 admin/fai/class_faiManagement.inc:226
-#, php-format
-msgid "You have no permission to create a new %s!"
-msgstr ""
-
-#: admin/fai/class_faiManagement.inc:226 admin/fai/fai-list.xml:55
-msgid "profile"
-msgstr ""
-
-#: admin/fai/class_faiManagement.inc:328
-msgid "Branch locked"
-msgstr ""
-
-#: admin/fai/class_faiManagement.inc:329
-#, php-format
-msgid "The following entries are locked, you can't remove them %s."
-msgstr ""
-
-#: admin/fai/class_faiManagement.inc:346
-msgid "FAI object"
-msgstr ""
-
-#: admin/fai/class_faiManagement.inc:477
-msgid "FAI branch/freeze"
-msgstr ""
-
-#: admin/fai/class_faiManagement.inc:480
-msgid "You have no permission to delete this release!"
-msgstr ""
-
-#: admin/fai/class_faiManagement.inc:496 admin/fai/remove.tpl.c:2
-#: admin/fai/remove_branch.tpl.c:2
-msgid "Warning"
-msgstr ""
-
-#: admin/fai/class_faiManagement.inc:496
-msgid "Release remove aborted because the release name check failed!"
-msgstr ""
-
-#: admin/fai/class_faiManagement.inc:573 admin/fai/class_faiManagement.inc:596
-msgid "Configuration"
-msgstr ""
-
-#: admin/fai/class_faiManagement.inc:575 admin/fai/class_faiManagement.inc:598
-#: admin/fai/class_faiManagement.inc:619
-msgid "Branch"
-msgstr ""
-
-#: admin/fai/class_faiManagement.inc:725 admin/fai/askClassName.tpl.c:23
-msgid "Continue"
-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"
 
-#: admin/fai/class_faiManagement.inc:926
-#: admin/fai/class_faiPartitionTable.inc:768
-#: admin/fai/class_faiProfile.inc:318 admin/fai/class_askClassName.inc:99
-#: admin/fai/classSelect/class_classSelect.inc:58
-#: admin/fai/class_faiGroupHandle.inc:120
-#: admin/fai/class_faiProfileEntry.inc:163 admin/fai/fai-list.xml:146
-msgid "Partition table"
+#: admin/fai/class_faiManagement.inc:117 admin/fai/class_faiManagement.inc:122
+#: admin/fai/packageSelect/selectPackage-list.xml:14
+#: admin/systems/class_faiStartup.inc:178 config/fai/class_faiConfig.inc:41
+msgid "FAI"
 msgstr ""
 
-#: admin/fai/class_faiManagement.inc:928
-#: admin/fai/class_faiGroupHandle.inc:122 admin/fai/fai-list.xml:140
-msgid "Package list"
+#: admin/fai/class_faiManagement.inc:118
+msgid "Manage FAI software packages and deployment recipes"
 msgstr ""
 
-#: admin/fai/class_faiManagement.inc:930
-#: admin/fai/class_faiGroupHandle.inc:124
-msgid "Scripts"
+#: admin/fai/class_faiPackage.inc:157
+msgid "Mark for installation"
 msgstr ""
 
-#: admin/fai/class_faiManagement.inc:932
-#: admin/fai/class_faiGroupHandle.inc:126
-msgid "Variables"
+#: admin/fai/class_faiPackage.inc:161
+msgid "Mark for removal"
 msgstr ""
 
-#: admin/fai/class_faiManagement.inc:934
-#: admin/fai/class_faiGroupHandle.inc:128
-msgid "Hooks"
+#: admin/fai/class_faiPackage.inc:166
+msgid "Edit configuration"
 msgstr ""
 
-#: admin/fai/class_faiManagement.inc:936 admin/fai/class_faiProfile.inc:454
-#: admin/fai/class_askClassName.inc:104 admin/fai/class_faiGroupHandle.inc:130
-#: admin/fai/fai-list.xml:110
-msgid "Profile"
+#: admin/fai/class_faiPackage.inc:247
+#: admin/fai/class_faiPartitionTable.inc:209
+#: admin/fai/class_faiPartitionTable.inc:250
+#: admin/fai/class_faiTemplate.inc:114
+#: admin/systems/services/repository/class_serviceDebianRepository.inc:172
+#: admin/systems/services/repository/class_serviceDebianRepository.inc:189
+#: admin/systems/services/repository/class_serviceDebianRepository.inc:193
+msgid "LDAP error"
 msgstr ""
 
-#: admin/fai/class_faiManagement.inc:938
-#: admin/fai/class_faiGroupHandle.inc:132
-msgid "Templates"
+#: admin/fai/class_faiPackage.inc:279
+#: admin/fai/packageSelect/class_filterFAIPackages.inc:41
+#: admin/fai/packageSelect/class_filterFAIPackages.inc:46
+#: admin/fai/class_faiPackageConfiguration.inc:55
+#: admin/systems/class_faiStartup.inc:133
+#: admin/systems/class_faiStartup.inc:160
+msgid "Service infrastructure"
 msgstr ""
 
-#: admin/fai/class_faiManagement.inc:1039
-#: admin/fai/class_faiManagement.inc:1045
-#: admin/fai/packageSelect/selectPackage-list.xml:14
-#: admin/fai/classSelect/selectClass-list.xml:15
-#: admin/systems/class_faiStartup.inc:177 config/fai/class_faiConfig.inc:41
-msgid "FAI"
+#: admin/fai/class_faiPackage.inc:294
+msgid "Unkown packages"
 msgstr ""
 
-#: admin/fai/class_faiManagement.inc:1040
-msgid "Manage FAI software packages and deployment recipes"
+#: admin/fai/class_faiPackage.inc:365
+msgid "Package"
 msgstr ""
 
-#: admin/fai/class_faiPackage.inc:261
-msgid "Invalid package names"
+#: admin/fai/class_faiPackage.inc:366
+msgid "FAI Package list"
 msgstr ""
 
-#: admin/fai/class_faiPackage.inc:262
-#, php-format
-msgid "The following package names don't match the Debian policy: %s"
+#: admin/fai/class_faiPackage.inc:369
+msgid "FAI Package"
 msgstr ""
 
-#: admin/fai/class_faiPackage.inc:421 admin/fai/class_faiPackage.inc:422
-msgid "Configured"
+#: admin/fai/class_faiPackage.inc:385
+#: admin/fai/class_faiPartitionTable.inc:304
+#: admin/fai/class_faiTemplateEntry.inc:140 admin/fai/class_faiProfile.inc:47
+#: admin/fai/class_faiScript.inc:50 admin/fai/class_faiTemplate.inc:173
+#: admin/fai/class_faiHook.inc:50 admin/fai/class_faiVariable.inc:50
+msgid "Properties"
 msgstr ""
 
-#: admin/fai/class_faiPackage.inc:428 admin/fai/class_faiPackage.inc:429
-msgid "Package marked for removal"
+#: admin/fai/class_faiPackage.inc:388
+#: admin/fai/class_faiPartitionTable.inc:307 admin/fai/class_faiProfile.inc:50
+#: admin/fai/class_faiScript.inc:53 admin/fai/class_faiTemplate.inc:176
+#: admin/fai/class_faiHook.inc:53 admin/fai/class_faiVariable.inc:53
+msgid "Class name"
 msgstr ""
 
-#: admin/fai/class_faiPackage.inc:445
-msgid "Mark package for removal"
+#: admin/fai/class_faiPackage.inc:388 admin/fai/class_faiScript.inc:53
+#: admin/fai/class_faiHook.inc:53 admin/fai/class_faiVariable.inc:53
+msgid "Variables class name"
 msgstr ""
 
-#: admin/fai/class_faiPackage.inc:451
-msgid "Configure this package"
+#: admin/fai/class_faiPackage.inc:392
+#: admin/fai/class_faiPartitionTable.inc:311
+#: admin/fai/class_faiDiskEntry.inc:738
+#: admin/fai/class_faiTemplateEntry.inc:147 admin/fai/class_faiProfile.inc:54
+#: admin/fai/class_faiScript.inc:57 admin/fai/class_faiScript.inc:75
+#: admin/fai/class_faiTemplate.inc:180 admin/fai/class_faiHook.inc:57
+#: admin/fai/class_faiHook.inc:75 admin/fai/class_faiVariable.inc:57
+#: admin/fai/class_faiVariable.inc:75
+msgid "Description"
 msgstr ""
 
-#: admin/fai/class_faiPackage.inc:455
-msgid "Remove this package"
+#: admin/fai/class_faiPackage.inc:392
+#: admin/fai/class_faiPartitionTable.inc:311 admin/fai/class_faiProfile.inc:54
+#: admin/fai/class_faiScript.inc:57 admin/fai/class_faiTemplate.inc:180
+#: admin/fai/class_faiHook.inc:57 admin/fai/class_faiVariable.inc:57
+msgid "Short description of the class"
 msgstr ""
 
-#: admin/fai/class_faiPackage.inc:534
-msgid "Please select a least one package!"
+#: admin/fai/class_faiPackage.inc:398 admin/systems/class_faiStartup.inc:90
+msgid "Repository"
 msgstr ""
 
-#: admin/fai/class_faiPackage.inc:538
-msgid ""
-"Please choose a valid release/section combination for your repository setup!"
+#: admin/fai/class_faiPackage.inc:401 admin/systems/class_faiStartup.inc:78
+#: admin/systems/services/repository/class_serviceDebianRepository.inc:52
+#: admin/systems/services/repository/class_serviceCentosRepository.inc:49
+msgid "Release"
 msgstr ""
 
-#: admin/fai/class_faiPackage.inc:571
-#: admin/fai/packageSelect/class_filterFAIPackages.inc:41
-#: admin/fai/packageSelect/class_filterFAIPackages.inc:46
-#: admin/fai/class_faiPackageConfiguration.inc:55
-#: admin/systems/class_faiStartup.inc:132
-#: admin/systems/class_faiStartup.inc:159
-msgid "Infrastructure service"
+#: admin/fai/class_faiPackage.inc:401
+msgid "Debian release concerned"
 msgstr ""
 
-#: admin/fai/class_faiPackage.inc:587
-msgid "Unkown packages"
+#: admin/fai/class_faiPackage.inc:405
+#: admin/systems/services/repository/class_serviceDebianRepository.inc:58
+msgid "Sections"
 msgstr ""
 
-#: admin/fai/class_faiPackage.inc:674
-#: admin/fai/faiPackageConfiguration.tpl.c:2
-msgid "Package"
+#: admin/fai/class_faiPackage.inc:405
+msgid "Sections concerned"
 msgstr ""
 
-#: admin/fai/class_faiPackage.inc:675
-msgid "FAI Package list"
+#: admin/fai/class_faiPackage.inc:409
+msgid "Install method"
 msgstr ""
 
-#: admin/fai/class_faiPackage.inc:679
-msgid "FAI Package"
+#: admin/fai/class_faiPackage.inc:409
+msgid "Install method to use for this package list"
 msgstr ""
 
-#: admin/fai/class_faiPackage.inc:687
+#: admin/fai/class_faiPackage.inc:420
 msgid "Packages"
 msgstr ""
 
-#: admin/fai/class_faiPackage.inc:688 admin/fai/faiPackage.tpl.c:23
-msgid "Section"
-msgstr ""
-
-#: admin/fai/class_faiPackage.inc:688 admin/fai/class_faiPackage.inc:691
-#: admin/fai/class_faiScript.inc:605 admin/fai/class_faiTemplate.inc:512
-msgid "Readonly"
+#: admin/fai/class_faiPackage.inc:424
+msgid "Packages in this class"
 msgstr ""
 
-#: admin/fai/class_faiPackage.inc:689
-msgid "Install Method"
+#: admin/fai/class_faiPartitionTable.inc:61
+#: admin/fai/class_faiDiskEntry.inc:442 admin/systems/class_faiLogView.inc:207
+#: admin/systems/class_faiLogView.inc:242
+msgid "Error"
 msgstr ""
 
-#: admin/fai/class_faiPackage.inc:690
-msgid "Package configuration"
+#: admin/fai/class_faiPartitionTable.inc:112
+msgid "Add RAID"
 msgstr ""
 
-#: admin/fai/class_faiPackage.inc:691 admin/systems/class_faiStartup.inc:78
-#: admin/systems/services/repository/class_serviceRepository.inc:40
-#: admin/fai/branch_selector.tpl.c:14 admin/fai/faiPackage.tpl.c:20
-#: admin/fai/fai-filter.tpl.c:5 admin/fai/fai-filter.tpl.c:14
-msgid "Release"
+#: admin/fai/class_faiPartitionTable.inc:116
+msgid "Add LVM"
 msgstr ""
 
-#: admin/fai/class_faiPartitionTable.inc:269
-#: admin/fai/class_faiDiskEntry.inc:446
-#, php-format
-msgid ""
-"The disk cannot be deleted while it is used in the '%s' disk definition!"
+#: admin/fai/class_faiPartitionTable.inc:284
+msgid "Partition table"
 msgstr ""
 
-#: admin/fai/class_faiPartitionTable.inc:416 admin/fai/class_faiScript.inc:360
-#: admin/fai/class_faiScript.inc:362 admin/fai/class_faiTemplate.inc:306
-#: admin/fai/class_faiTemplate.inc:308
-msgid "edit"
+#: admin/fai/class_faiPartitionTable.inc:285
+#: admin/fai/class_faiPartitionTable.inc:288
+msgid "FAI partition table"
 msgstr ""
 
-#: admin/fai/class_faiPartitionTable.inc:418 admin/fai/class_faiScript.inc:364
-#: admin/fai/class_faiTemplate.inc:310
-msgid "delete"
+#: admin/fai/class_faiPartitionTable.inc:307 admin/fai/class_faiProfile.inc:50
+msgid "Partition table class name"
 msgstr ""
 
-#: admin/fai/class_faiPartitionTable.inc:769
-#: admin/fai/class_faiPartitionTable.inc:773
-msgid "FAI partition table"
+#: admin/fai/class_faiPartitionTable.inc:317
+msgid "Discs"
 msgstr ""
 
-#: admin/fai/class_faiPartitionTable.inc:779 admin/fai/class_faiHook.inc:531
-#: admin/fai/class_faiVariable.inc:398
-msgid "Read only"
+#: admin/fai/class_faiPartitionTable.inc:324
+msgid "Partitions in this class"
 msgstr ""
 
 #: admin/fai/class_faiDiskEntry.inc:273
-#: admin/fai/faiPartitionTableEntry.tpl.c:5 admin/fai/faiDiskEntry.tpl.c:5
 msgid "Device"
 msgstr ""
 
@@ -389,103 +198,103 @@ msgstr ""
 msgid "UUID"
 msgstr ""
 
-#: admin/fai/class_faiDiskEntry.inc:345
+#: admin/fai/class_faiDiskEntry.inc:344
 msgid "Disks"
 msgstr ""
 
-#: admin/fai/class_faiDiskEntry.inc:348 admin/fai/class_faiPartition.inc:321
-#: admin/fai/faiPartition.tpl.c:14
+#: admin/fai/class_faiDiskEntry.inc:347 admin/fai/class_faiPartition.inc:319
 msgid "Size"
 msgstr ""
 
-#: admin/fai/class_faiDiskEntry.inc:544
+#: admin/fai/class_faiDiskEntry.inc:443
+#, php-format
+msgid ""
+"The disk cannot be deleted while it is used in the '%s' disk definition!"
+msgstr ""
+
+#: admin/fai/class_faiDiskEntry.inc:536
 msgid "encrypted"
 msgstr ""
 
-#: admin/fai/class_faiDiskEntry.inc:547
+#: admin/fai/class_faiDiskEntry.inc:539
 msgid "bootable"
 msgstr ""
 
-#: admin/fai/class_faiDiskEntry.inc:550
+#: admin/fai/class_faiDiskEntry.inc:542
 msgid "preserve"
 msgstr ""
 
-#: admin/fai/class_faiDiskEntry.inc:735
+#: admin/fai/class_faiDiskEntry.inc:687 admin/fai/class_faiDiskEntry.inc:690
+#: admin/fai/class_faiDiskEntry.inc:737
+#: admin/fai/packageSelect/selectPackage-list.xml:40
+#: admin/fai/class_faiScript.inc:71 admin/fai/class_faiHook.inc:71
+#: admin/fai/class_faiVariable.inc:71
+#: admin/fai/class_faiSimplePluginClass.inc:50
+msgid "Name"
+msgstr ""
+
+#: admin/fai/class_faiDiskEntry.inc:717
 msgid ""
 "You have more than four primary partition table entries in your "
 "configuration, please check your configuration twice."
 msgstr ""
 
-#: admin/fai/class_faiDiskEntry.inc:739
+#: admin/fai/class_faiDiskEntry.inc:721
 msgid ""
 "You cannot have more than three primary partition while using logical "
 "partitions, please check your configuration twice."
 msgstr ""
 
-#: admin/fai/class_faiDiskEntry.inc:752
-#: admin/fai/class_faiPartitionTableEntry.inc:448
+#: admin/fai/class_faiDiskEntry.inc:733
 msgid "Partition table entry"
 msgstr ""
 
-#: admin/fai/class_faiDiskEntry.inc:753
-#: admin/fai/class_faiPartitionTableEntry.inc:449
+#: admin/fai/class_faiDiskEntry.inc:734
 msgid "FAI partition table entry"
 msgstr ""
 
-#: admin/fai/class_faiDiskEntry.inc:760
+#: admin/fai/class_faiDiskEntry.inc:739
 msgid "Disk options"
 msgstr ""
 
-#: admin/fai/class_faiDiskEntry.inc:761
-#: admin/fai/class_faiPartitionTableEntry.inc:457
+#: admin/fai/class_faiDiskEntry.inc:740
 msgid "Partition type"
 msgstr ""
 
-#: admin/fai/class_faiDiskEntry.inc:762
-#: admin/fai/class_faiPartitionTableEntry.inc:458
+#: admin/fai/class_faiDiskEntry.inc:741
 msgid "Partition no."
 msgstr ""
 
-#: admin/fai/class_faiDiskEntry.inc:763
-#: admin/fai/class_faiPartitionTableEntry.inc:459
+#: admin/fai/class_faiDiskEntry.inc:742
 msgid "File system type"
 msgstr ""
 
-#: admin/fai/class_faiDiskEntry.inc:764
-#: admin/fai/class_faiPartitionTableEntry.inc:171
-#: admin/fai/class_faiPartitionTableEntry.inc:460
-#: admin/fai/class_faiPartition.inc:437 admin/fai/faiPartition.tpl.c:47
+#: admin/fai/class_faiDiskEntry.inc:743 admin/fai/class_faiPartition.inc:432
 msgid "Mount point"
 msgstr ""
 
-#: admin/fai/class_faiDiskEntry.inc:765
-#: admin/fai/class_faiPartitionTableEntry.inc:461
-#: admin/fai/class_faiPartition.inc:402 admin/fai/class_faiPartition.inc:407
+#: admin/fai/class_faiDiskEntry.inc:744 admin/fai/class_faiPartition.inc:397
+#: admin/fai/class_faiPartition.inc:402
 msgid "Partition size"
 msgstr ""
 
-#: admin/fai/class_faiDiskEntry.inc:766
-#: admin/fai/class_faiPartitionTableEntry.inc:173
-#: admin/fai/class_faiPartitionTableEntry.inc:462
-#: admin/fai/faiPartition.tpl.c:50
+#: admin/fai/class_faiDiskEntry.inc:745
 msgid "Mount options"
 msgstr ""
 
-#: admin/fai/class_faiDiskEntry.inc:767
-#: admin/fai/class_faiPartitionTableEntry.inc:463
+#: admin/fai/class_faiDiskEntry.inc:746
 msgid "File system options"
 msgstr ""
 
-#: admin/fai/class_faiDiskEntry.inc:768
-#: admin/fai/class_faiPartitionTableEntry.inc:464
+#: admin/fai/class_faiDiskEntry.inc:747
 msgid "Partition flags"
 msgstr ""
 
-#: admin/fai/class_debconfTemplate.inc:227
+#: admin/fai/class_debconfTemplate.inc:225
 msgid "This package has no debconf options."
 msgstr ""
 
-#: admin/fai/class_debconfTemplate.inc:264
+#: admin/fai/class_debconfTemplate.inc:262
 msgid ""
 "This debconf question is dynamically generated during package installation "
 "and requires choosing between specific options which cannot be presented "
@@ -493,217 +302,59 @@ msgid ""
 " effect."
 msgstr ""
 
-#: admin/fai/class_faiTemplateEntry.inc:139
-msgid "no file uploaded yet"
+#: admin/fai/class_faiTemplateEntry.inc:143
+msgid "File path"
 msgstr ""
 
-#: admin/fai/class_faiTemplateEntry.inc:142
-#, php-format
-msgid "exists in database (size: %s bytes)"
+#: admin/fai/class_faiTemplateEntry.inc:143
+msgid "Complete absolute template file path and name"
 msgstr ""
 
-#: admin/fai/class_faiTemplateEntry.inc:251
-#: admin/systems/class_faiLogView.inc:70 admin/fai/faiTemplateEntry.tpl.c:23
-msgid "File"
+#: admin/fai/class_faiTemplateEntry.inc:147
+msgid "Short description of the file"
 msgstr ""
 
-#: admin/fai/class_faiTemplateEntry.inc:255
-#: admin/fai/faiTemplateEntry.tpl.c:11
-msgid "Destination path"
-msgstr ""
-
-#: admin/fai/class_faiTemplateEntry.inc:260 admin/fai/faiTemplateEntry.tpl.c:8
-msgid "File name"
-msgstr ""
-
-#: admin/fai/class_faiTemplateEntry.inc:264
-#: admin/fai/class_faiTemplateEntry.inc:266
-#: admin/fai/faiTemplateEntry.tpl.c:68
-msgid "User"
-msgstr ""
-
-#: admin/fai/class_faiTemplateEntry.inc:270
-#: admin/fai/class_faiTemplateEntry.inc:273
-#: admin/fai/class_faiTemplateEntry.inc:275
-#: admin/fai/faiTemplateEntry.tpl.c:47 admin/fai/faiTemplateEntry.tpl.c:74
-msgid "Group"
+#: admin/fai/class_faiTemplateEntry.inc:156
+msgid "Template attributes"
 msgstr ""
 
-#: admin/fai/class_faiTemplateEntry.inc:305
-msgid "Template entry"
+#: admin/fai/class_faiTemplateEntry.inc:160
+msgid "Template file content"
 msgstr ""
 
-#: admin/fai/class_faiTemplateEntry.inc:306
-msgid "FAI template entry"
+#: admin/fai/class_faiTemplateEntry.inc:160
+msgid "Content of the template file"
 msgstr ""
 
-#: admin/fai/class_faiTemplateEntry.inc:314
-msgid "Template file"
+#: admin/fai/class_faiTemplateEntry.inc:164
+msgid "Owner and group of the file"
 msgstr ""
 
-#: admin/fai/class_faiTemplateEntry.inc:315
-msgid "Template path"
+#: admin/fai/class_faiTemplateEntry.inc:167
+msgid "Owner"
 msgstr ""
 
-#: admin/fai/class_faiTemplateEntry.inc:316
+#: admin/fai/class_faiTemplateEntry.inc:167
 msgid "File owner"
 msgstr ""
 
-#: admin/fai/class_faiTemplateEntry.inc:317
-msgid "File permissions"
-msgstr ""
-
-#: admin/fai/class_FAI.inc:287 admin/fai/class_FAI.inc:679
-#: admin/fai/class_FAI.inc:1266 admin/fai/class_FAI.inc:1283
-#: admin/fai/class_FAI.inc:1287
-msgid "LDAP error"
-msgstr ""
-
-#: admin/fai/class_FAI.inc:570
-#, php-format
-msgid "Error, following objects should be equal '%s' and '%s'"
-msgstr ""
-
-#: admin/fai/class_FAI.inc:891
-#, php-format
-msgid "Creating group application release for %s"
-msgstr ""
-
-#: admin/fai/class_FAI.inc:960 admin/fai/class_FAI.inc:982
-#: admin/fai/class_FAI.inc:1022 admin/fai/class_FAI.inc:1027
-#: admin/fai/class_FAI.inc:1065
-msgid "Object"
-msgstr ""
-
-#: admin/fai/class_FAI.inc:961
-#, php-format
-msgid "Adding missing group application release container %s."
-msgstr ""
-
-#: admin/fai/class_FAI.inc:983
-#, php-format
-msgid "Adding group application release container %s."
-msgstr ""
-
-#: admin/fai/class_FAI.inc:1023
-#, php-format
-msgid "Could not create menu entry %s. (Already exists)."
-msgstr ""
-
-#: admin/fai/class_FAI.inc:1028
-#, php-format
-msgid "Created group application menu entry for %s."
-msgstr ""
-
-#: admin/fai/class_FAI.inc:1059
-#, php-format
-msgid "Creating copy of %s"
-msgstr ""
-
-#: admin/fai/class_FAI.inc:1062
-msgid "Processing"
-msgstr ""
-
-#: admin/fai/class_FAI.inc:1080
-msgid "Could not create new release, the destination dn is already in use."
-msgstr ""
-
-#: admin/fai/class_FAI.inc:1093
-msgid "Error while fetching source dn - aborted!"
-msgstr ""
-
-#: admin/fai/class_FAI.inc:1174
-msgid "Fatal error"
-msgstr ""
-
-#: admin/fai/class_FAI.inc:1175
-#, php-format
-msgid ""
-"Release creation failed due to ldap errors. Additional informations '%s'."
-msgstr ""
-
-#: admin/fai/class_faiPartitionTableEntry.inc:162
-msgid "primary"
-msgstr ""
-
-#: admin/fai/class_faiPartitionTableEntry.inc:162
-msgid "logical"
-msgstr ""
-
-#: admin/fai/class_faiPartitionTableEntry.inc:169
-#: admin/fai/faiPartition.tpl.c:8
-msgid "Type"
-msgstr ""
-
-#: admin/fai/class_faiPartitionTableEntry.inc:170
-msgid "FS type"
-msgstr ""
-
-#: admin/fai/class_faiPartitionTableEntry.inc:172
-msgid "Size in MB"
-msgstr ""
-
-#: admin/fai/class_faiPartitionTableEntry.inc:174
-msgid "FS option"
-msgstr ""
-
-#: admin/fai/class_faiPartitionTableEntry.inc:175
-#: admin/fai/faiPartition.tpl.c:23
-msgid "Preserve"
-msgstr ""
-
-#: admin/fai/class_faiPartitionTableEntry.inc:266
-msgid "False"
-msgstr ""
-
-#: admin/fai/class_faiPartitionTableEntry.inc:268
-msgid "True"
-msgstr ""
-
-#: admin/fai/class_faiPartitionTableEntry.inc:272
-#: admin/fai/class_faiPartitionTableEntry.inc:274 admin/fai/fai-list.xml:159
-#: admin/fai/fai-list.xml:198
-msgid "Remove"
-msgstr ""
-
-#: admin/fai/class_faiPartitionTableEntry.inc:384
-#, php-format
-msgid "please enter a unique mount point for partition %s"
-msgstr ""
-
-#: admin/fai/class_faiPartitionTableEntry.inc:389
-#, php-format
-msgid "partition %s mount point"
-msgstr ""
-
-#: admin/fai/class_faiPartitionTableEntry.inc:394
-#, php-format
-msgid ""
-"File system type 'swap' is already used, change file system type for "
-"partition %s."
+#: admin/fai/class_faiTemplateEntry.inc:172
+msgid "Group"
 msgstr ""
 
-#: admin/fai/class_faiPartitionTableEntry.inc:398
-msgid "Please use 'swap' as mount point, if 'swap' is used as fs-type."
+#: admin/fai/class_faiTemplateEntry.inc:172
+msgid "File group"
 msgstr ""
 
-#: admin/fai/class_faiPartitionTableEntry.inc:404
-#: admin/fai/class_faiPartitionTableEntry.inc:408
-#: admin/fai/class_faiPartitionTableEntry.inc:414
-#: admin/fai/class_faiPartitionTableEntry.inc:416
-#: admin/fai/class_faiPartitionTableEntry.inc:421
-#, php-format
-msgid "partition %s size"
+#: admin/fai/class_faiTemplateEntry.inc:181
+msgid "Access"
 msgstr ""
 
-#: admin/fai/class_faiPartitionTableEntry.inc:436
-msgid ""
-"You have more than 3 primary partition table entries in your configuration, "
-"please check your configuration twice."
+#: admin/fai/class_faiTemplateEntry.inc:181
+msgid "Access rights"
 msgstr ""
 
 #: admin/fai/packageSelect/selectPackage-list.xml:10
-#: admin/fai/classSelect/selectClass-list.xml:11
 msgid "Please select the desired entries"
 msgstr ""
 
@@ -711,147 +362,94 @@ msgstr ""
 msgid "Version"
 msgstr ""
 
-#: admin/fai/class_faiProfile.inc:310
-msgid "This list displays all assigned class names for this profile."
-msgstr ""
-
-#: admin/fai/class_faiProfile.inc:313 admin/fai/class_askClassName.inc:103
-#: admin/fai/classSelect/class_classSelect.inc:53
-#: admin/fai/class_faiProfileEntry.inc:158
-msgid "Hook bundle"
-msgstr ""
-
-#: admin/fai/class_faiProfile.inc:314 admin/fai/class_askClassName.inc:105
-#: admin/fai/classSelect/class_classSelect.inc:54
-#: admin/fai/class_faiProfileEntry.inc:159
-msgid "Template bundle"
-msgstr ""
-
-#: admin/fai/class_faiProfile.inc:315 admin/fai/class_askClassName.inc:101
-#: admin/fai/classSelect/class_classSelect.inc:55
-#: admin/fai/class_faiProfileEntry.inc:160
-msgid "Script bundle"
-msgstr ""
-
-#: admin/fai/class_faiProfile.inc:316 admin/fai/class_askClassName.inc:102
-#: admin/fai/classSelect/class_classSelect.inc:56
-#: admin/fai/class_faiProfileEntry.inc:161
-msgid "Variable bundle"
-msgstr ""
-
-#: admin/fai/class_faiProfile.inc:317 admin/fai/class_askClassName.inc:100
-#: admin/fai/classSelect/class_classSelect.inc:57
-#: admin/fai/class_faiProfileEntry.inc:162
-msgid "Package bundle"
-msgstr ""
-
-#: admin/fai/class_faiProfile.inc:321
-msgid "Remove class from profile"
-msgstr ""
-
-#: admin/fai/class_faiProfile.inc:324
-msgid "Up"
-msgstr ""
-
-#: admin/fai/class_faiProfile.inc:325
-msgid "Down"
-msgstr ""
-
-#: admin/fai/class_faiProfile.inc:410
-msgid "No class specified for this profile!"
-msgstr ""
-
-#: admin/fai/class_faiProfile.inc:419
-msgid "You can't use the same name for a class and a profile!"
+#: admin/fai/class_faiProfile.inc:28
+msgid "Profile"
 msgstr ""
 
-#: admin/fai/class_faiProfile.inc:455
+#: admin/fai/class_faiProfile.inc:29
 msgid "FAI profile"
 msgstr ""
 
-#: admin/fai/class_faiProfile.inc:458
+#: admin/fai/class_faiProfile.inc:32
 msgid "FAI Profile"
 msgstr ""
 
-#: admin/fai/class_faiProfile.inc:465 admin/fai/faiProfile.tpl.c:17
+#: admin/fai/class_faiProfile.inc:61
 msgid "FAI classes"
 msgstr ""
 
-#: admin/fai/class_faiHookEntry.inc:200
-msgid "Hook entry"
+#: admin/fai/class_faiProfile.inc:61
+msgid "FAI classes which are part of this profile"
 msgstr ""
 
-#: admin/fai/class_faiHookEntry.inc:201
-msgid "FAI hook entry"
+#: admin/fai/class_faiPackageConfiguration.inc:88
+#, php-format
+msgid "Debconf information for package '%s'"
 msgstr ""
 
-#: admin/fai/class_faiHookEntry.inc:209 admin/fai/faiHookEntry.tpl.c:20
-msgid "Task"
+#: admin/fai/class_faiScript.inc:30 admin/fai/class_faiScript.inc:84
+#: admin/fai/class_faiHook.inc:87
+msgid "Script"
 msgstr ""
 
-#: admin/fai/class_faiHookEntry.inc:210 admin/fai/class_faiScript.inc:595
-#: admin/fai/class_faiScript.inc:599
+#: admin/fai/class_faiScript.inc:31 admin/fai/class_faiScript.inc:34
 msgid "FAI script"
 msgstr ""
 
-#: admin/fai/class_faiPackageConfiguration.inc:88
-#, php-format
-msgid "Debconf information for package '%s'"
+#: admin/fai/class_faiScript.inc:63
+msgid "Scripts"
 msgstr ""
 
-#: admin/fai/class_askClassName.inc:99 admin/fai/class_askClassName.inc:100
-#: admin/fai/class_askClassName.inc:101 admin/fai/class_askClassName.inc:102
-#: admin/fai/class_askClassName.inc:103 admin/fai/class_askClassName.inc:104
-#: admin/fai/class_askClassName.inc:105 admin/fai/class_askClassName.inc:106
-msgid "Create new FAI object"
+#: admin/fai/class_faiScript.inc:67 admin/fai/class_faiHook.inc:67
+#: admin/fai/class_faiVariable.inc:67
+msgid "Variables in this class"
 msgstr ""
 
-#: admin/fai/class_faiTemplateEdit.inc:80
-#, php-format
-msgid ""
-"The file encodig has changed from '%s' to '%s'. Do you really want to save?"
+#: admin/fai/class_faiScript.inc:71 admin/fai/class_faiHook.inc:71
+#: admin/fai/class_faiVariable.inc:71
+msgid "The name of the variable"
 msgstr ""
 
-#: admin/fai/class_faiScript.inc:333 admin/fai/class_faiScript.inc:335
-msgid "Sort direction"
+#: admin/fai/class_faiScript.inc:75 admin/fai/class_faiHook.inc:75
+#: admin/fai/class_faiVariable.inc:75
+msgid "A short description of the variable"
 msgstr ""
 
-#: admin/fai/class_faiScript.inc:348 admin/fai/faiScriptEntry.tpl.c:20
+#: admin/fai/class_faiScript.inc:79
 msgid "Priority"
 msgstr ""
 
-#: admin/fai/class_faiScript.inc:350
-msgid "Action"
+#: admin/fai/class_faiScript.inc:79
+msgid "Priority of this script (FIXME: less is done first?)"
 msgstr ""
 
-#: admin/fai/classSelect/selectClass-list.xml:36 admin/fai/fai-list.xml:88
-#: admin/fai/faiScriptEntry.tpl.c:14
-msgid "Properties"
+#: admin/fai/class_faiScript.inc:84
+msgid "The script itself"
 msgstr ""
 
-#: admin/fai/class_faiTemplate.inc:501 admin/fai/fai-list.xml:116
-msgid "Template"
+#: admin/fai/class_faiTemplate.inc:136
+#, php-format
+msgid "There are several files with the same path: %s"
 msgstr ""
 
-#: admin/fai/class_faiTemplate.inc:502 admin/fai/class_faiTemplate.inc:506
-msgid "FAI template"
+#: admin/fai/class_faiTemplate.inc:153
+msgid "Template"
 msgstr ""
 
-#: admin/fai/class_faiVariableEntry.inc:107
-msgid "Content"
+#: admin/fai/class_faiTemplate.inc:154 admin/fai/class_faiTemplate.inc:157
+msgid "FAI template"
 msgstr ""
 
-#: admin/fai/class_faiVariableEntry.inc:142
-msgid "Variable entry"
+#: admin/fai/class_faiTemplate.inc:176
+msgid "Template class name"
 msgstr ""
 
-#: admin/fai/class_faiVariableEntry.inc:143
-msgid "FAI variable entry "
+#: admin/fai/class_faiTemplate.inc:186
+msgid "Template files"
 msgstr ""
 
-#: admin/fai/class_faiVariableEntry.inc:151
-#: admin/fai/faiVariableEntry.tpl.c:20
-msgid "Variable content"
+#: admin/fai/class_faiTemplate.inc:190
+msgid "Template files in this class"
 msgstr ""
 
 #: admin/fai/class_faiPartition.inc:176 admin/fai/class_faiPartition.inc:180
@@ -950,94 +548,73 @@ msgstr ""
 msgid "btrfs"
 msgstr ""
 
-#: admin/fai/class_faiPartition.inc:224
-msgid "LVM/RAID"
-msgstr ""
-
-#: admin/fai/class_faiPartition.inc:327
+#: admin/fai/class_faiPartition.inc:325
 msgid "spare"
 msgstr ""
 
-#: admin/fai/class_faiPartition.inc:330
+#: admin/fai/class_faiPartition.inc:328
 msgid "missing"
 msgstr ""
 
-#: admin/fai/class_faiPartition.inc:333
+#: admin/fai/class_faiPartition.inc:331
 msgid "Options"
 msgstr ""
 
-#: admin/fai/class_faiPartition.inc:420
+#: admin/fai/class_faiPartition.inc:415
 msgid "Minimum partition size"
 msgstr ""
 
-#: admin/fai/class_faiPartition.inc:420
+#: admin/fai/class_faiPartition.inc:415
 msgid "Maximum partition size"
 msgstr ""
 
-#: admin/fai/class_faiPartition.inc:428
+#: admin/fai/class_faiPartition.inc:423
 msgid "Raid arrays must contain at least two partitions!"
 msgstr ""
 
-#: admin/fai/class_faiPartition.inc:430
+#: admin/fai/class_faiPartition.inc:425
 msgid ""
 "Raid 0 arrays can only be realized with a combination of two partitions!"
 msgstr ""
 
-#: admin/fai/class_faiHook.inc:332 admin/fai/class_faiHook.inc:334
-#: admin/fai/fai-list.xml:190 admin/fai/faiVariable.tpl.c:23
-#: admin/fai/faiVariable.tpl.c:26
-msgid "Edit"
-msgstr ""
-
-#: admin/fai/class_faiHook.inc:336
-msgid "Delete"
-msgstr ""
-
-#: admin/fai/class_faiHook.inc:521 admin/fai/fai-list.xml:128
+#: admin/fai/class_faiHook.inc:30
 msgid "Hook"
 msgstr ""
 
-#: admin/fai/class_faiHook.inc:522 admin/fai/class_faiHook.inc:526
+#: admin/fai/class_faiHook.inc:31 admin/fai/class_faiHook.inc:34
 msgid "FAI hook"
 msgstr ""
 
-#: admin/fai/class_faiVariable.inc:387 admin/fai/fai-list.xml:134
-msgid "Variable"
-msgstr ""
-
-#: admin/fai/class_faiVariable.inc:388 admin/fai/class_faiVariable.inc:392
-msgid "FAI variable"
+#: admin/fai/class_faiHook.inc:63
+msgid "Hooks"
 msgstr ""
 
-#: admin/fai/class_faiProfileEntry.inc:184 admin/fai/askClassName.tpl.c:11
-#: admin/fai/askClassName.tpl.c:17 admin/fai/paste_generic.tpl.c:5
-msgid "Class name"
+#: admin/fai/class_faiHook.inc:79
+msgid "Task"
 msgstr ""
 
-#: admin/fai/class_faiProfileEntry.inc:184 admin/fai/faiTemplate.tpl.c:14
-#: admin/fai/faiVariable.tpl.c:14 admin/fai/faiHook.tpl.c:14
-#: admin/fai/faiPartitionTable.tpl.c:17 admin/fai/faiScript.tpl.c:14
-msgid "Objects"
+#: admin/fai/class_faiHook.inc:87
+msgid "The script of this hook"
 msgstr ""
 
-#: admin/fai/fai-list.xml:11
-msgid "List of deployment classes and products"
+#: admin/fai/class_faiVariable.inc:30
+msgid "Variable"
 msgstr ""
 
-#: admin/fai/fai-list.xml:15
-msgid "partitionTable"
+#: admin/fai/class_faiVariable.inc:31 admin/fai/class_faiVariable.inc:34
+msgid "FAI variable"
 msgstr ""
 
-#: admin/fai/fai-list.xml:23
-msgid "packagelist"
+#: admin/fai/class_faiVariable.inc:63
+msgid "Variables"
 msgstr ""
 
-#: admin/fai/fai-list.xml:93
-msgid "Actions"
+#: admin/fai/class_faiVariable.inc:79
+msgid "Content"
 msgstr ""
 
-#: admin/fai/fai-list.xml:104
-msgid "Create"
+#: admin/fai/class_faiVariable.inc:79
+msgid "The content of the variable"
 msgstr ""
 
 #: admin/systems/class_faiLogView.inc:56
@@ -1048,6 +625,10 @@ msgstr ""
 msgid "Sort up"
 msgstr ""
 
+#: admin/systems/class_faiLogView.inc:70
+msgid "File"
+msgstr ""
+
 #: admin/systems/class_faiLogView.inc:71
 msgid "Date"
 msgstr ""
@@ -1082,7 +663,7 @@ msgstr ""
 msgid "Selected file: %s"
 msgstr ""
 
-#: admin/systems/class_faiStartup.inc:70 admin/fai/paste_generic.tpl.c:2
+#: admin/systems/class_faiStartup.inc:70
 msgid "FAI settings"
 msgstr ""
 
@@ -1102,11 +683,6 @@ msgstr ""
 msgid "FAI profil to be applied to this computer"
 msgstr ""
 
-#: admin/systems/class_faiStartup.inc:90 admin/fai/faiPackage.tpl.c:14
-#: admin/fai/faiPackage.tpl.c:17
-msgid "Repository"
-msgstr ""
-
 #: admin/systems/class_faiStartup.inc:90
 msgid "FAI Debian repository to be used for installation"
 msgstr ""
@@ -1131,85 +707,96 @@ msgstr ""
 msgid "Linux kernel parameters to be ran"
 msgstr ""
 
-#: admin/systems/class_faiStartup.inc:178
+#: admin/systems/class_faiStartup.inc:179
 msgid "Full automated installation"
 msgstr ""
 
-#: admin/systems/services/repository/class_serviceRepository.inc:31
+#: admin/systems/services/repository/class_serviceDebianRepository.inc:34
+#: admin/systems/services/repository/class_serviceCentosRepository.inc:31
+msgid "Repositories"
+msgstr ""
+
+#: admin/systems/services/repository/class_serviceDebianRepository.inc:39
+#: admin/systems/services/repository/class_serviceCentosRepository.inc:36
+msgid "Repositories this server hosts"
+msgstr ""
+
+#: admin/systems/services/repository/class_serviceDebianRepository.inc:43
+#: admin/systems/services/repository/class_serviceCentosRepository.inc:40
 msgid "URL"
 msgstr ""
 
-#: admin/systems/services/repository/class_serviceRepository.inc:31
+#: admin/systems/services/repository/class_serviceDebianRepository.inc:43
+#: admin/systems/services/repository/class_serviceCentosRepository.inc:40
 msgid "Repository url"
 msgstr ""
 
-#: admin/systems/services/repository/class_serviceRepository.inc:35
+#: admin/systems/services/repository/class_serviceDebianRepository.inc:47
+#: admin/systems/services/repository/class_serviceCentosRepository.inc:44
 msgid "Parent server"
 msgstr ""
 
-#: admin/systems/services/repository/class_serviceRepository.inc:35
+#: admin/systems/services/repository/class_serviceDebianRepository.inc:47
+#: admin/systems/services/repository/class_serviceCentosRepository.inc:44
 msgid "Parent repository server"
 msgstr ""
 
-#: admin/systems/services/repository/class_serviceRepository.inc:40
-msgid "Release used on this repository"
+#: admin/systems/services/repository/class_serviceDebianRepository.inc:52
+msgid "Debian release used on this repository"
 msgstr ""
 
-#: admin/systems/services/repository/class_serviceRepository.inc:47
-msgid "Sections"
-msgstr ""
-
-#: admin/systems/services/repository/class_serviceRepository.inc:47
-msgid "Sections available on this repository"
+#: admin/systems/services/repository/class_serviceDebianRepository.inc:58
+msgid "Debian sections available on this repository"
 msgstr ""
 
-#: admin/systems/services/repository/class_serviceRepository.inc:52
+#: admin/systems/services/repository/class_serviceDebianRepository.inc:63
+#: admin/systems/services/repository/class_serviceCentosRepository.inc:57
 msgid "Mirror mode"
 msgstr ""
 
-#: admin/systems/services/repository/class_serviceRepository.inc:52
+#: admin/systems/services/repository/class_serviceDebianRepository.inc:63
+#: admin/systems/services/repository/class_serviceCentosRepository.inc:57
 msgid ""
 "Is this mirror an installation repository? Is its release a custom one?"
 msgstr ""
 
-#: admin/systems/services/repository/class_serviceRepository.inc:57
+#: admin/systems/services/repository/class_serviceDebianRepository.inc:68
+#: admin/systems/services/repository/class_serviceCentosRepository.inc:62
 msgid "Local mirror"
 msgstr ""
 
-#: admin/systems/services/repository/class_serviceRepository.inc:57
+#: admin/systems/services/repository/class_serviceDebianRepository.inc:68
+#: admin/systems/services/repository/class_serviceCentosRepository.inc:62
 msgid "Is this mirror a local or a network mirror?"
 msgstr ""
 
-#: admin/systems/services/repository/class_serviceRepository.inc:66
+#: admin/systems/services/repository/class_serviceDebianRepository.inc:77
+#: admin/systems/services/repository/class_serviceCentosRepository.inc:71
 msgid "Architectures"
 msgstr ""
 
-#: admin/systems/services/repository/class_serviceRepository.inc:66
+#: admin/systems/services/repository/class_serviceDebianRepository.inc:77
+#: admin/systems/services/repository/class_serviceCentosRepository.inc:71
 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:140
-msgid "Repositories"
+#: admin/systems/services/repository/class_serviceDebianRepository.inc:99
+#: admin/systems/services/repository/class_serviceDebianRepository.inc:100
+msgid "Debian repository"
 msgstr ""
 
-#: admin/systems/services/repository/class_serviceRepository.inc:145
-msgid "Repositories this server hosts"
+#: admin/systems/services/repository/class_serviceDebianRepository.inc:100
+#: admin/systems/services/repository/class_serviceCentosRepository.inc:96
+msgid "Services"
 msgstr ""
 
-#: admin/systems/services/repository/class_serviceRepository.inc:160
-msgid "Package repository"
+#: admin/systems/services/repository/class_serviceCentosRepository.inc:49
+msgid "Centos release used on this repository"
 msgstr ""
 
-#: admin/systems/services/repository/class_serviceRepository.inc:161
-msgid "Package repository information"
+#: admin/systems/services/repository/class_serviceCentosRepository.inc:95
+#: admin/systems/services/repository/class_serviceCentosRepository.inc:96
+msgid "Centos repository"
 msgstr ""
 
 #: config/fai/class_faiConfig.inc:28
@@ -1241,476 +828,3 @@ msgstr ""
 #: config/fai/class_faiConfig.inc:60
 msgid "s"
 msgstr ""
-
-#: admin/fai/faiPartitionTableEntry.tpl.c:2 admin/fai/faiVariableEntry.tpl.c:2
-#: admin/fai/faiVariableEntry.tpl.c:5 admin/fai/faiDiskEntry.tpl.c:2
-#: admin/fai/faiTemplate.tpl.c:2 admin/fai/faiTemplate.tpl.c:5
-#: admin/fai/faiVariable.tpl.c:2 admin/fai/faiVariable.tpl.c:5
-#: admin/fai/faiHook.tpl.c:2 admin/fai/faiHook.tpl.c:5
-#: admin/fai/faiPackage.tpl.c:2 admin/fai/faiPackage.tpl.c:5
-#: admin/fai/faiTemplateEntry.tpl.c:2 admin/fai/faiTemplateEntry.tpl.c:5
-#: admin/fai/faiScriptEntry.tpl.c:2 admin/fai/faiScriptEntry.tpl.c:5
-#: admin/fai/faiPartitionTable.tpl.c:2 admin/fai/faiPartitionTable.tpl.c:5
-#: admin/fai/faiScript.tpl.c:2 admin/fai/faiScript.tpl.c:5
-#: admin/fai/faiProfile.tpl.c:2 admin/fai/faiProfile.tpl.c:5
-#: admin/fai/faiProfile.tpl.c:14 admin/fai/faiHookEntry.tpl.c:2
-#: admin/fai/faiHookEntry.tpl.c:5
-msgid "Generic"
-msgstr ""
-
-#: admin/fai/faiPartitionTableEntry.tpl.c:14
-#: admin/fai/faiPartitionTableEntry.tpl.c:17 admin/fai/faiDiskEntry.tpl.c:23
-#: admin/fai/faiDiskEntry.tpl.c:26
-msgid "Partition entries"
-msgstr ""
-
-#: admin/fai/faiPartitionTableEntry.tpl.c:20
-#: admin/fai/faiPartitionTableEntry.tpl.c:23 admin/fai/faiDiskEntry.tpl.c:29
-#: admin/fai/faiDiskEntry.tpl.c:32
-msgid "Add partition"
-msgstr ""
-
-#: admin/fai/branch_selector.tpl.c:2
-msgid "Releases"
-msgstr ""
-
-#: admin/fai/branch_selector.tpl.c:5
-msgid "Current release"
-msgstr ""
-
-#: admin/fai/branch_selector.tpl.c:8 admin/fai/branch_selector.tpl.c:17
-#: admin/fai/fai-filter.tpl.c:8 admin/fai/fai-filter.tpl.c:17
-msgid "Create release"
-msgstr ""
-
-#: admin/fai/branch_selector.tpl.c:11 admin/fai/branch_selector.tpl.c:23
-#: admin/fai/fai-filter.tpl.c:11 admin/fai/fai-filter.tpl.c:23
-msgid "Create read-only release"
-msgstr ""
-
-#: admin/fai/branch_selector.tpl.c:20 admin/fai/fai-filter.tpl.c:20
-msgid "Freeze"
-msgstr ""
-
-#: admin/fai/branch_selector.tpl.c:26 admin/fai/fai-filter.tpl.c:26
-msgid "Delete current release"
-msgstr ""
-
-#: admin/fai/faiPartition.tpl.c:2
-msgid "Partition"
-msgstr ""
-
-#: admin/fai/faiPartition.tpl.c:17
-msgid "Resize existing partition"
-msgstr ""
-
-#: admin/fai/faiPartition.tpl.c:20
-msgid "Bootable"
-msgstr ""
-
-#: admin/fai/faiPartition.tpl.c:26 admin/fai/faiDiskEntry.tpl.c:20
-msgid "Combined physical partitions"
-msgstr ""
-
-#: admin/fai/faiPartition.tpl.c:29
-msgid "Toggle missing"
-msgstr ""
-
-#: admin/fai/faiPartition.tpl.c:32
-msgid "Toggle spare"
-msgstr ""
-
-#: admin/fai/faiPartition.tpl.c:35
-msgid "Filesystem"
-msgstr ""
-
-#: admin/fai/faiPartition.tpl.c:38
-msgid "Filesystem create options"
-msgstr ""
-
-#: admin/fai/faiPartition.tpl.c:41
-msgid "Encrypted"
-msgstr ""
-
-#: admin/fai/faiPartition.tpl.c:44
-msgid "Tune options"
-msgstr ""
-
-#: admin/fai/faiNewBranch.tpl.c:2
-msgid ""
-"You are now going to create a branch or locked branch. This action clones "
-"the existing release to another release name. Branches can be modified as "
-"usual. FAI classes of locked branches cannot be modified, just additional "
-"classes are possible. Branch names should be alphanumeric, excluding the "
-"reserved names 'scripts', 'hooks', 'partitions', 'variables', 'templates' "
-"and 'fai'."
-msgstr ""
-
-#: admin/fai/faiNewBranch.tpl.c:5
-msgid ""
-"Branches are created as subreleases of the currently selected branch. "
-"Creating a new branch named 1.0.2 in SARGE for example, will result in a new"
-" release called SARGE/1.0.2."
-msgstr ""
-
-#: admin/fai/faiNewBranch.tpl.c:8
-msgid "Please enter a name for the branch"
-msgstr ""
-
-#: admin/fai/faiNewBranch.tpl.c:11
-msgid "Processing the requested operation"
-msgstr ""
-
-#: admin/fai/faiNewBranch.tpl.c:14
-msgid ""
-"As soon as the copy operation has finished, you can scroll down to end of "
-"the page and press the 'Continue' button to continue with the fai management"
-" dialog."
-msgstr ""
-
-#: admin/fai/faiNewBranch.tpl.c:17
-msgid ""
-"Your browser doesn't support iframes, please use this link to perform the "
-"requested operation."
-msgstr ""
-
-#: admin/fai/faiNewBranch.tpl.c:20
-msgid "Perform requested operation."
-msgstr ""
-
-#: admin/fai/faiNewBranch.tpl.c:23
-msgid "Initiate operation"
-msgstr ""
-
-#: admin/fai/faiVariableEntry.tpl.c:14 admin/fai/faiVariableEntry.tpl.c:17
-msgid "Variable attributes"
-msgstr ""
-
-#: admin/fai/faiDiskEntry.tpl.c:11
-msgid "fstab key"
-msgstr ""
-
-#: admin/fai/faiDiskEntry.tpl.c:17
-msgid "Disk label"
-msgstr ""
-
-#: admin/fai/faiTemplate.tpl.c:17
-msgid "List of template files"
-msgstr ""
-
-#: admin/fai/faiVariable.tpl.c:17
-msgid "List of assigned variables"
-msgstr ""
-
-#: admin/fai/faiVariable.tpl.c:20
-msgid "Choose a variable to delete or edit"
-msgstr ""
-
-#: admin/fai/askClassName.tpl.c:2
-msgid ""
-"Adding a new class to the FAI management, requires a class name. You have to"
-" specify a unique class name for unique types of FAI classes, while you can "
-"use the same class name for different types of FAI classes. In the laste "
-"case, FAI will automatically enclose all these different class types to one "
-"unique class name."
-msgstr ""
-
-#: admin/fai/askClassName.tpl.c:5
-msgid ""
-"Please use one of the following methods to choose the name for the new FAI "
-"class."
-msgstr ""
-
-#: admin/fai/askClassName.tpl.c:8
-msgid "Enter FAI class name manually"
-msgstr ""
-
-#: admin/fai/askClassName.tpl.c:14
-msgid "Choose FAI class name from a list of existing classes"
-msgstr ""
-
-#: admin/fai/askClassName.tpl.c:20
-msgid "Choose class name"
-msgstr ""
-
-#: admin/fai/faiGroupHandle.tpl.c:2
-msgid "Please select the objects you want to remove:"
-msgstr ""
-
-#: admin/fai/faiGroupHandle.tpl.c:5
-msgid "Freezed"
-msgstr ""
-
-#: admin/fai/faiGroupHandle.tpl.c:8
-msgid "Select the object you want to edit:"
-msgstr ""
-
-#: admin/fai/faiGroupHandle.tpl.c:11
-msgid "Select the object you want to copy:"
-msgstr ""
-
-#: admin/fai/remove.tpl.c:5
-msgid ""
-"This includes all account data, system access rules, imap settings, etc. for"
-" this user. Please double check if your really want to do this since there "
-"is no way for FusionDirectory to get your data back."
-msgstr ""
-
-#: admin/fai/remove.tpl.c:8 admin/fai/remove_branch.tpl.c:8
-msgid "So - if you're sure - press 'Delete' to continue or 'Cancel' to abort."
-msgstr ""
-
-#: admin/fai/faiHook.tpl.c:17
-msgid "List of hook scripts"
-msgstr ""
-
-#: admin/fai/packageSelect/selectPackage-list.tpl.c:2
-#: admin/fai/classSelect/selectClass-list.tpl.c:5
-msgid "Update"
-msgstr ""
-
-#: admin/fai/packageSelect/selectPackage-list.tpl.c:5
-#: admin/fai/classSelect/selectClass-list.tpl.c:8
-msgid "Submit"
-msgstr ""
-
-#: admin/fai/packageSelect/selectPackage-filter.tpl.c:2
-#: admin/fai/classSelect/selectClass-filter.tpl.c:2
-#: admin/fai/fai-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/remove_branch.tpl.c:5
-msgid ""
-"This includes all account data, system access, etc. for this branch. Please "
-"double check if your really want to do this since there is no way for "
-"FusionDirectory to get your data back."
-msgstr ""
-
-#: admin/fai/faiPackage.tpl.c:26
-msgid "Install method"
-msgstr ""
-
-#: admin/fai/faiPackage.tpl.c:29
-msgid "Please select the installation method"
-msgstr ""
-
-#: admin/fai/faiPackage.tpl.c:32 admin/fai/faiPackage.tpl.c:35
-msgid "Used packages"
-msgstr ""
-
-#: admin/fai/faiPackage.tpl.c:38
-msgid "Add from list"
-msgstr ""
-
-#: admin/fai/faiProfileEntry.tpl.c:2
-msgid "List of FAI objects (Fully Automatic Installation)"
-msgstr ""
-
-#: admin/fai/faiProfileEntry.tpl.c:5
-msgid "Information"
-msgstr ""
-
-#: admin/fai/faiProfileEntry.tpl.c:8
-msgid ""
-"This menu allows you to select FAI class names and to add them to the "
-"currently edited profile."
-msgstr ""
-
-#: admin/fai/faiProfileEntry.tpl.c:11
-msgid "Filters"
-msgstr ""
-
-#: admin/fai/faiProfileEntry.tpl.c:14
-msgid "Show only classes with templates"
-msgstr ""
-
-#: admin/fai/faiProfileEntry.tpl.c:17
-msgid "Show only classes with scripts"
-msgstr ""
-
-#: admin/fai/faiProfileEntry.tpl.c:20
-msgid "Show only classes with hooks"
-msgstr ""
-
-#: admin/fai/faiProfileEntry.tpl.c:23
-msgid "Show only classes with variables"
-msgstr ""
-
-#: admin/fai/faiProfileEntry.tpl.c:26
-msgid "Show only classes with packages"
-msgstr ""
-
-#: admin/fai/faiProfileEntry.tpl.c:29
-msgid "Show only classes with partitions"
-msgstr ""
-
-#: admin/fai/faiProfileEntry.tpl.c:32 admin/fai/faiProfileEntry.tpl.c:35
-msgid "Display objects matching"
-msgstr ""
-
-#: admin/fai/faiProfileEntry.tpl.c:38
-msgid "Regular expression for matching object names"
-msgstr ""
-
-#: admin/fai/faiTemplateEntry.tpl.c:17 admin/fai/faiTemplateEntry.tpl.c:20
-msgid "Template attributes"
-msgstr ""
-
-#: admin/fai/faiTemplateEntry.tpl.c:26 admin/fai/faiTemplateEntry.tpl.c:29
-msgid "Save template"
-msgstr ""
-
-#: admin/fai/faiTemplateEntry.tpl.c:32 admin/fai/faiTemplateEntry.tpl.c:35
-msgid "Edit template"
-msgstr ""
-
-#: admin/fai/faiTemplateEntry.tpl.c:38
-msgid "Full path"
-msgstr ""
-
-#: admin/fai/faiTemplateEntry.tpl.c:41
-msgid "Upload"
-msgstr ""
-
-#: admin/fai/faiTemplateEntry.tpl.c:44
-msgid "Owner"
-msgstr ""
-
-#: admin/fai/faiTemplateEntry.tpl.c:50
-msgid "Access"
-msgstr ""
-
-#: admin/fai/faiTemplateEntry.tpl.c:53
-msgid "Class"
-msgstr ""
-
-#: admin/fai/faiTemplateEntry.tpl.c:56
-msgid "Read"
-msgstr ""
-
-#: admin/fai/faiTemplateEntry.tpl.c:59
-msgid "Write"
-msgstr ""
-
-#: admin/fai/faiTemplateEntry.tpl.c:62
-msgid "Execute"
-msgstr ""
-
-#: admin/fai/faiTemplateEntry.tpl.c:65
-msgid "Special"
-msgstr ""
-
-#: admin/fai/faiTemplateEntry.tpl.c:71
-msgid "SUID"
-msgstr ""
-
-#: admin/fai/faiTemplateEntry.tpl.c:77
-msgid "SGID"
-msgstr ""
-
-#: admin/fai/faiTemplateEntry.tpl.c:80
-msgid "Others"
-msgstr ""
-
-#: admin/fai/faiTemplateEntry.tpl.c:83
-msgid "sticky"
-msgstr ""
-
-#: admin/fai/faiScriptEntry.tpl.c:17 admin/fai/faiScriptEntry.tpl.c:26
-msgid "Script attributes"
-msgstr ""
-
-#: admin/fai/faiScriptEntry.tpl.c:23
-msgid ""
-"Choose a priority. Low values result in an earlier, high values in a later "
-"execution."
-msgstr ""
-
-#: admin/fai/faiScriptEntry.tpl.c:32 admin/fai/faiHookEntry.tpl.c:32
-msgid "Import script"
-msgstr ""
-
-#: admin/fai/classSelect/selectClass-list.tpl.c:2
-msgid "Base"
-msgstr ""
-
-#: admin/fai/fai-filter.tpl.c:29
-msgid "Show profiles"
-msgstr ""
-
-#: admin/fai/fai-filter.tpl.c:32
-msgid "Show templates"
-msgstr ""
-
-#: admin/fai/fai-filter.tpl.c:35
-msgid "Show scripts"
-msgstr ""
-
-#: admin/fai/fai-filter.tpl.c:38
-msgid "Show hooks"
-msgstr ""
-
-#: admin/fai/fai-filter.tpl.c:41
-msgid "Show variables"
-msgstr ""
-
-#: admin/fai/fai-filter.tpl.c:44
-msgid "Show packages"
-msgstr ""
-
-#: admin/fai/fai-filter.tpl.c:47
-msgid "Show partitions"
-msgstr ""
-
-#: admin/fai/faiTemplateEdit.tpl.c:2
-msgid "This FAI template is write protected. Editing may break it!"
-msgstr ""
-
-#: admin/fai/faiTemplateEdit.tpl.c:5
-msgid "Edit anyway"
-msgstr ""
-
-#: admin/fai/faiPartitionTable.tpl.c:14
-msgid "Use 'setup-storage' to partition the disk"
-msgstr ""
-
-#: admin/fai/faiPartitionTable.tpl.c:20
-msgid "Discs"
-msgstr ""
-
-#: admin/fai/faiPartitionTable.tpl.c:23 admin/fai/faiPartitionTable.tpl.c:26
-#: admin/fai/faiPartitionTable.tpl.c:41 admin/fai/faiPartitionTable.tpl.c:44
-msgid "Add disk"
-msgstr ""
-
-#: admin/fai/faiPartitionTable.tpl.c:29 admin/fai/faiPartitionTable.tpl.c:32
-#: admin/fai/faiPartitionTable.tpl.c:47 admin/fai/faiPartitionTable.tpl.c:50
-msgid "Add RAID"
-msgstr ""
-
-#: admin/fai/faiPartitionTable.tpl.c:35 admin/fai/faiPartitionTable.tpl.c:38
-#: admin/fai/faiPartitionTable.tpl.c:53 admin/fai/faiPartitionTable.tpl.c:56
-msgid "Add volume group"
-msgstr ""
-
-#: admin/fai/faiScript.tpl.c:17
-msgid "List of scripts"
-msgstr ""
-
-#: admin/fai/faiProfile.tpl.c:20
-msgid "Choose a priority"
-msgstr ""
-
-#: admin/fai/faiHookEntry.tpl.c:14 admin/fai/faiHookEntry.tpl.c:17
-#: admin/fai/faiHookEntry.tpl.c:26
-msgid "Hook attributes"
-msgstr ""
-
-#: admin/fai/faiHookEntry.tpl.c:23
-msgid "Choose an existing FAI task"
-msgstr ""
diff --git a/fai/locale/sv/fusiondirectory.po b/fai/locale/sv/fusiondirectory.po
index 553b7e0553ab87a82beb9b1126912c90cbfb1cd7..1800b5e1ebd69262dc5a7ddc4ba33fb00f48f0de 100644
--- a/fai/locale/sv/fusiondirectory.po
+++ b/fai/locale/sv/fusiondirectory.po
@@ -3,382 +3,190 @@
 # This file is distributed under the same license as the PACKAGE package.
 # 
 # Translators:
-# Mathias Friman <mathias.friman@knorca.se>, 2014
 msgid ""
 msgstr ""
-"Project-Id-Version: FusionDirectory-108\n"
+"Project-Id-Version: FusionDirectory-109\n"
 "Report-Msgid-Bugs-To: documentation@lists.fusiondirectory.org\n"
-"POT-Creation-Date: 2015-03-19 21:45+0100\n"
-"PO-Revision-Date: 2015-02-25 16:12+0000\n"
+"POT-Creation-Date: 2014-12-15 17:47+0100\n"
+"PO-Revision-Date: 2015-02-25 16:13+0000\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>\n"
-"Language-Team: Swedish (http://www.transifex.com/projects/p/FusionDirectory-108/language/sv/)\n"
+"Language-Team: Swedish (http://www.transifex.com/projects/p/FusionDirectory-109/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/fai/class_faiScriptEntry.inc:79 admin/fai/class_faiScriptEntry.inc:82
-#: admin/fai/class_faiManagement.inc:240 admin/fai/class_faiManagement.inc:768
-#: admin/fai/class_faiManagement.inc:774
-#: admin/fai/class_faiPartitionTable.inc:268
-#: admin/fai/class_faiPartitionTable.inc:331
-#: admin/fai/class_faiDiskEntry.inc:445 admin/fai/class_FAI.inc:570
-#: admin/fai/class_faiHookEntry.inc:83 admin/fai/class_faiHookEntry.inc:86
-#: admin/fai/class_faiScript.inc:249 admin/fai/class_faiTemplate.inc:232
-#: admin/fai/class_faiHook.inc:259 admin/fai/class_faiVariable.inc:162
-#: admin/systems/class_faiLogView.inc:207
-#: admin/systems/class_faiLogView.inc:242
-msgid "Error"
-msgstr "Fel"
-
-#: admin/fai/class_faiScriptEntry.inc:82 admin/fai/class_faiHookEntry.inc:86
-msgid "file is empty"
-msgstr "filen Ã¤r tom"
-
-#: admin/fai/class_faiScriptEntry.inc:102 admin/fai/class_faiHookEntry.inc:102
-#: admin/fai/class_faiScript.inc:349 admin/fai/class_faiScript.inc:374
-#: admin/fai/class_faiTemplate.inc:320 admin/fai/class_faiHook.inc:346
-msgid "Download"
-msgstr "Ladda ner"
-
-#: admin/fai/class_faiScriptEntry.inc:147
-#: admin/fai/class_faiScriptEntry.inc:151
-#: admin/fai/class_faiScriptEntry.inc:154
-#: admin/fai/class_faiScriptEntry.inc:197
-#: admin/fai/class_faiManagement.inc:768 admin/fai/class_faiManagement.inc:774
-#: admin/fai/class_faiPackage.inc:685
-#: admin/fai/class_faiPartitionTable.inc:779
-#: admin/fai/class_faiDiskEntry.inc:702 admin/fai/class_faiDiskEntry.inc:705
-#: admin/fai/class_faiDiskEntry.inc:758
-#: admin/fai/class_faiTemplateEntry.inc:247
-#: admin/fai/class_faiTemplateEntry.inc:312
-#: admin/fai/class_faiPartitionTableEntry.inc:353
-#: admin/fai/class_faiPartitionTableEntry.inc:356
-#: admin/fai/class_faiPartitionTableEntry.inc:360
-#: admin/fai/class_faiPartitionTableEntry.inc:455
-#: admin/fai/packageSelect/selectPackage-list.xml:40
-#: admin/fai/class_faiProfile.inc:414 admin/fai/class_faiProfile.inc:463
-#: admin/fai/class_faiHookEntry.inc:157 admin/fai/class_faiHookEntry.inc:162
-#: admin/fai/class_faiHookEntry.inc:165 admin/fai/class_faiHookEntry.inc:207
-#: admin/fai/class_askClassName.inc:163 admin/fai/class_askClassName.inc:167
-#: admin/fai/class_askClassName.inc:171 admin/fai/class_askClassName.inc:198
-#: admin/fai/class_faiScript.inc:347 admin/fai/class_faiScript.inc:605
-#: admin/fai/classSelect/selectClass-list.xml:28
-#: admin/fai/class_faiTemplate.inc:512
-#: admin/fai/class_faiVariableEntry.inc:103
-#: admin/fai/class_faiVariableEntry.inc:112
-#: admin/fai/class_faiVariableEntry.inc:115
-#: admin/fai/class_faiVariableEntry.inc:149 admin/fai/class_faiHook.inc:531
-#: admin/fai/class_faiVariable.inc:398 admin/fai/fai-list.xml:80
-#: admin/fai/faiPartitionTableEntry.tpl.c:8 admin/fai/faiPartition.tpl.c:5
-#: admin/fai/faiVariableEntry.tpl.c:8 admin/fai/faiDiskEntry.tpl.c:8
-#: admin/fai/faiTemplate.tpl.c:8 admin/fai/faiVariable.tpl.c:8
-#: admin/fai/faiHook.tpl.c:8
-#: admin/fai/packageSelect/selectPackage-filter.tpl.c:8
-#: admin/fai/faiPackage.tpl.c:8 admin/fai/faiScriptEntry.tpl.c:8
-#: admin/fai/classSelect/selectClass-filter.tpl.c:5
-#: admin/fai/fai-filter.tpl.c:50 admin/fai/faiPartitionTable.tpl.c:8
-#: admin/fai/faiScript.tpl.c:8 admin/fai/faiProfile.tpl.c:8
-#: admin/fai/faiHookEntry.tpl.c:8
-msgid "Name"
-msgstr "Namn"
-
-#: admin/fai/class_faiScriptEntry.inc:159 admin/fai/class_faiHookEntry.inc:170
-#: admin/fai/class_faiScript.inc:594 admin/fai/fai-list.xml:122
-#: admin/fai/faiScriptEntry.tpl.c:29 admin/fai/faiHookEntry.tpl.c:29
-msgid "Script"
-msgstr "Script"
-
-#: admin/fai/class_faiScriptEntry.inc:190
-#: admin/fai/class_faiScriptEntry.inc:199
-msgid "Script entry"
-msgstr "Script-post"
-
-#: admin/fai/class_faiScriptEntry.inc:191
-msgid "FAI script entry"
-msgstr "FAI-scriptpost"
-
-#: admin/fai/class_faiScriptEntry.inc:198 admin/fai/class_faiPackage.inc:686
-#: admin/fai/class_faiPartitionTable.inc:780
-#: admin/fai/class_faiDiskEntry.inc:759
-#: admin/fai/class_faiTemplateEntry.inc:313
-#: admin/fai/class_faiPartitionTableEntry.inc:456
-#: admin/fai/class_faiProfile.inc:464 admin/fai/class_faiHookEntry.inc:208
-#: admin/fai/class_faiScript.inc:606 admin/fai/class_faiTemplate.inc:513
-#: admin/fai/class_faiVariableEntry.inc:150 admin/fai/class_faiHook.inc:532
-#: admin/fai/class_faiVariable.inc:399
-#: admin/fai/faiPartitionTableEntry.tpl.c:11 admin/fai/faiPartition.tpl.c:11
-#: admin/fai/faiVariableEntry.tpl.c:11 admin/fai/faiDiskEntry.tpl.c:14
-#: admin/fai/faiTemplate.tpl.c:11 admin/fai/faiVariable.tpl.c:11
-#: admin/fai/faiHook.tpl.c:11 admin/fai/faiPackage.tpl.c:11
-#: admin/fai/faiTemplateEntry.tpl.c:14 admin/fai/faiScriptEntry.tpl.c:11
-#: admin/fai/faiPartitionTable.tpl.c:11 admin/fai/faiScript.tpl.c:11
-#: admin/fai/faiProfile.tpl.c:11 admin/fai/faiHookEntry.tpl.c:11
-msgid "Description"
-msgstr "Beskrivning"
-
-#: admin/fai/class_faiScriptEntry.inc:200
-msgid "Script Priority"
-msgstr "Skriptprioritet"
-
-#: admin/fai/class_faiManagement.inc:188
-msgid "partition table"
-msgstr "partitionstabell"
-
-#: admin/fai/class_faiManagement.inc:189 admin/fai/fai-list.xml:31
-msgid "script"
-msgstr "script"
-
-#: admin/fai/class_faiManagement.inc:190 admin/fai/fai-list.xml:47
-msgid "hook"
-msgstr "hook"
-
-#: admin/fai/class_faiManagement.inc:191 admin/fai/fai-list.xml:39
-msgid "variable"
-msgstr "variabel"
-
-#: admin/fai/class_faiManagement.inc:192 admin/fai/fai-list.xml:63
-msgid "template"
-msgstr "mall"
-
-#: admin/fai/class_faiManagement.inc:193
-msgid "package list"
-msgstr "paketlista"
-
-#: admin/fai/class_faiManagement.inc:210 admin/fai/class_faiManagement.inc:226
-#: admin/fai/class_faiManagement.inc:332 admin/fai/class_faiManagement.inc:390
-#: admin/fai/class_faiManagement.inc:480 admin/fai/class_faiManagement.inc:575
-#: admin/fai/class_faiManagement.inc:598 admin/fai/class_faiManagement.inc:619
-msgid "Permission error"
-msgstr "RÃ¤ttighetsfel"
-
-#: admin/fai/class_faiManagement.inc:211 admin/fai/class_faiManagement.inc:226
-#, php-format
-msgid "You have no permission to create a new %s!"
-msgstr "Du har inte rÃ¤ttigheter att skapa en ny %s!"
-
-#: admin/fai/class_faiManagement.inc:226 admin/fai/fai-list.xml:55
-msgid "profile"
-msgstr "profil"
-
-#: admin/fai/class_faiManagement.inc:328
-msgid "Branch locked"
-msgstr "Avgrening lÃ¥st"
-
-#: admin/fai/class_faiManagement.inc:329
-#, php-format
-msgid "The following entries are locked, you can't remove them %s."
-msgstr "FÃ¶ljande poster Ã¤r lÃ¥sta, du kan inte ta bort dem %s."
-
-#: admin/fai/class_faiManagement.inc:346
-msgid "FAI object"
-msgstr "FAI-objekt"
-
-#: admin/fai/class_faiManagement.inc:477
-msgid "FAI branch/freeze"
-msgstr "FAI-avgrening/-frysning"
-
-#: admin/fai/class_faiManagement.inc:480
-msgid "You have no permission to delete this release!"
-msgstr "Du har inte rÃ¤ttigheter att ta bort den hÃ¤r releasen!"
-
-#: admin/fai/class_faiManagement.inc:496 admin/fai/remove.tpl.c:2
-#: admin/fai/remove_branch.tpl.c:2
-msgid "Warning"
-msgstr "Varning"
-
-#: admin/fai/class_faiManagement.inc:496
-msgid "Release remove aborted because the release name check failed!"
-msgstr "Borttagning av den hÃ¤r releasen avbrÃ¶ts fÃ¶r att namnkontrollen misslyckades!"
-
-#: admin/fai/class_faiManagement.inc:573 admin/fai/class_faiManagement.inc:596
-msgid "Configuration"
-msgstr "Konfiguration"
-
-#: admin/fai/class_faiManagement.inc:575 admin/fai/class_faiManagement.inc:598
-#: admin/fai/class_faiManagement.inc:619
-msgid "Branch"
-msgstr "Avgrening"
-
-#: admin/fai/class_faiManagement.inc:725 admin/fai/askClassName.tpl.c:23
-msgid "Continue"
-msgstr "FortsÃ¤tt"
-
-#: admin/fai/class_faiManagement.inc:926
-#: admin/fai/class_faiPartitionTable.inc:768
-#: admin/fai/class_faiProfile.inc:318 admin/fai/class_askClassName.inc:99
-#: admin/fai/classSelect/class_classSelect.inc:58
-#: admin/fai/class_faiGroupHandle.inc:120
-#: admin/fai/class_faiProfileEntry.inc:163 admin/fai/fai-list.xml:146
-msgid "Partition table"
-msgstr "Partitionstabell"
-
-#: admin/fai/class_faiManagement.inc:928
-#: admin/fai/class_faiGroupHandle.inc:122 admin/fai/fai-list.xml:140
-msgid "Package list"
-msgstr "Paketlista"
-
-#: admin/fai/class_faiManagement.inc:930
-#: admin/fai/class_faiGroupHandle.inc:124
-msgid "Scripts"
-msgstr "Script"
-
-#: admin/fai/class_faiManagement.inc:932
-#: admin/fai/class_faiGroupHandle.inc:126
-msgid "Variables"
-msgstr "Variabler"
-
-#: admin/fai/class_faiManagement.inc:934
-#: admin/fai/class_faiGroupHandle.inc:128
-msgid "Hooks"
-msgstr "Hooks"
-
-#: admin/fai/class_faiManagement.inc:936 admin/fai/class_faiProfile.inc:454
-#: admin/fai/class_askClassName.inc:104 admin/fai/class_faiGroupHandle.inc:130
-#: admin/fai/fai-list.xml:110
-msgid "Profile"
-msgstr "Profil"
-
-#: admin/fai/class_faiManagement.inc:938
-#: admin/fai/class_faiGroupHandle.inc:132
-msgid "Templates"
-msgstr "Mallar"
-
-#: admin/fai/class_faiManagement.inc:1039
-#: admin/fai/class_faiManagement.inc:1045
+#: admin/fai/class_faiManagement.inc:117 admin/fai/class_faiManagement.inc:122
 #: admin/fai/packageSelect/selectPackage-list.xml:14
-#: admin/fai/classSelect/selectClass-list.xml:15
-#: admin/systems/class_faiStartup.inc:177 config/fai/class_faiConfig.inc:41
+#: admin/systems/class_faiStartup.inc:178 config/fai/class_faiConfig.inc:41
 msgid "FAI"
 msgstr "FAI"
 
-#: admin/fai/class_faiManagement.inc:1040
+#: admin/fai/class_faiManagement.inc:118
 msgid "Manage FAI software packages and deployment recipes"
 msgstr "Hantera FAI-programpaket och deployment-recept"
 
-#: admin/fai/class_faiPackage.inc:261
-msgid "Invalid package names"
-msgstr "Ogiltiga paketnamn"
-
-#: admin/fai/class_faiPackage.inc:262
-#, php-format
-msgid "The following package names don't match the Debian policy: %s"
-msgstr "FÃ¶ljande paketnamn matchar inte Debians policy: %s"
-
-#: admin/fai/class_faiPackage.inc:421 admin/fai/class_faiPackage.inc:422
-msgid "Configured"
-msgstr "Konfigurerad"
-
-#: admin/fai/class_faiPackage.inc:428 admin/fai/class_faiPackage.inc:429
-msgid "Package marked for removal"
-msgstr "Paket markerat fÃ¶r borttagning"
-
-#: admin/fai/class_faiPackage.inc:445
-msgid "Mark package for removal"
-msgstr "Marker paket fÃ¶r borttagning"
-
-#: admin/fai/class_faiPackage.inc:451
-msgid "Configure this package"
-msgstr "Konfigurera det hÃ¤r paketet"
+#: admin/fai/class_faiPackage.inc:157
+msgid "Mark for installation"
+msgstr ""
 
-#: admin/fai/class_faiPackage.inc:455
-msgid "Remove this package"
-msgstr "Ta bort det hÃ¤r paketet"
+#: admin/fai/class_faiPackage.inc:161
+msgid "Mark for removal"
+msgstr ""
 
-#: admin/fai/class_faiPackage.inc:534
-msgid "Please select a least one package!"
-msgstr "VÃ¤lj Ã¥tminstone ett paket!"
+#: admin/fai/class_faiPackage.inc:166
+msgid "Edit configuration"
+msgstr ""
 
-#: admin/fai/class_faiPackage.inc:538
-msgid ""
-"Please choose a valid release/section combination for your repository setup!"
-msgstr "VÃ¤lj en giltig release/sektion-kombination fÃ¶r din fÃ¶rrÃ¥dskonfiguration!"
+#: admin/fai/class_faiPackage.inc:247
+#: admin/fai/class_faiPartitionTable.inc:209
+#: admin/fai/class_faiPartitionTable.inc:250
+#: admin/fai/class_faiTemplate.inc:114
+#: admin/systems/services/repository/class_serviceDebianRepository.inc:172
+#: admin/systems/services/repository/class_serviceDebianRepository.inc:189
+#: admin/systems/services/repository/class_serviceDebianRepository.inc:193
+msgid "LDAP error"
+msgstr "LDAP-fel"
 
-#: admin/fai/class_faiPackage.inc:571
+#: admin/fai/class_faiPackage.inc:279
 #: admin/fai/packageSelect/class_filterFAIPackages.inc:41
 #: admin/fai/packageSelect/class_filterFAIPackages.inc:46
 #: admin/fai/class_faiPackageConfiguration.inc:55
-#: admin/systems/class_faiStartup.inc:132
-#: admin/systems/class_faiStartup.inc:159
-msgid "Infrastructure service"
-msgstr ""
+#: admin/systems/class_faiStartup.inc:133
+#: admin/systems/class_faiStartup.inc:160
+msgid "Service infrastructure"
+msgstr "TjÃ¤nste-infrastruktur"
 
-#: admin/fai/class_faiPackage.inc:587
+#: admin/fai/class_faiPackage.inc:294
 msgid "Unkown packages"
 msgstr "OkÃ¤nda paket"
 
-#: admin/fai/class_faiPackage.inc:674
-#: admin/fai/faiPackageConfiguration.tpl.c:2
+#: admin/fai/class_faiPackage.inc:365
 msgid "Package"
 msgstr "Paket"
 
-#: admin/fai/class_faiPackage.inc:675
+#: admin/fai/class_faiPackage.inc:366
 msgid "FAI Package list"
 msgstr "FAI-paketlista"
 
-#: admin/fai/class_faiPackage.inc:679
+#: admin/fai/class_faiPackage.inc:369
 msgid "FAI Package"
 msgstr "FAI-paket"
 
-#: admin/fai/class_faiPackage.inc:687
-msgid "Packages"
-msgstr "Paket"
+#: admin/fai/class_faiPackage.inc:385
+#: admin/fai/class_faiPartitionTable.inc:304
+#: admin/fai/class_faiTemplateEntry.inc:140 admin/fai/class_faiProfile.inc:47
+#: admin/fai/class_faiScript.inc:50 admin/fai/class_faiTemplate.inc:173
+#: admin/fai/class_faiHook.inc:50 admin/fai/class_faiVariable.inc:50
+msgid "Properties"
+msgstr "Egenskaper"
 
-#: admin/fai/class_faiPackage.inc:688 admin/fai/faiPackage.tpl.c:23
-msgid "Section"
-msgstr "Sektion"
+#: admin/fai/class_faiPackage.inc:388
+#: admin/fai/class_faiPartitionTable.inc:307 admin/fai/class_faiProfile.inc:50
+#: admin/fai/class_faiScript.inc:53 admin/fai/class_faiTemplate.inc:176
+#: admin/fai/class_faiHook.inc:53 admin/fai/class_faiVariable.inc:53
+msgid "Class name"
+msgstr "Klassnamn"
 
-#: admin/fai/class_faiPackage.inc:688 admin/fai/class_faiPackage.inc:691
-#: admin/fai/class_faiScript.inc:605 admin/fai/class_faiTemplate.inc:512
-msgid "Readonly"
-msgstr "Endast lÃ¤sbar"
+#: admin/fai/class_faiPackage.inc:388 admin/fai/class_faiScript.inc:53
+#: admin/fai/class_faiHook.inc:53 admin/fai/class_faiVariable.inc:53
+msgid "Variables class name"
+msgstr ""
 
-#: admin/fai/class_faiPackage.inc:689
-msgid "Install Method"
-msgstr "Installationsmetod"
+#: admin/fai/class_faiPackage.inc:392
+#: admin/fai/class_faiPartitionTable.inc:311
+#: admin/fai/class_faiDiskEntry.inc:738
+#: admin/fai/class_faiTemplateEntry.inc:147 admin/fai/class_faiProfile.inc:54
+#: admin/fai/class_faiScript.inc:57 admin/fai/class_faiScript.inc:75
+#: admin/fai/class_faiTemplate.inc:180 admin/fai/class_faiHook.inc:57
+#: admin/fai/class_faiHook.inc:75 admin/fai/class_faiVariable.inc:57
+#: admin/fai/class_faiVariable.inc:75
+msgid "Description"
+msgstr "Beskrivning"
 
-#: admin/fai/class_faiPackage.inc:690
-msgid "Package configuration"
-msgstr "Paketkonfiguration"
+#: admin/fai/class_faiPackage.inc:392
+#: admin/fai/class_faiPartitionTable.inc:311 admin/fai/class_faiProfile.inc:54
+#: admin/fai/class_faiScript.inc:57 admin/fai/class_faiTemplate.inc:180
+#: admin/fai/class_faiHook.inc:57 admin/fai/class_faiVariable.inc:57
+msgid "Short description of the class"
+msgstr ""
+
+#: admin/fai/class_faiPackage.inc:398 admin/systems/class_faiStartup.inc:90
+msgid "Repository"
+msgstr "FÃ¶rrÃ¥d"
 
-#: admin/fai/class_faiPackage.inc:691 admin/systems/class_faiStartup.inc:78
-#: admin/systems/services/repository/class_serviceRepository.inc:40
-#: admin/fai/branch_selector.tpl.c:14 admin/fai/faiPackage.tpl.c:20
-#: admin/fai/fai-filter.tpl.c:5 admin/fai/fai-filter.tpl.c:14
+#: admin/fai/class_faiPackage.inc:401 admin/systems/class_faiStartup.inc:78
+#: admin/systems/services/repository/class_serviceDebianRepository.inc:52
+#: admin/systems/services/repository/class_serviceCentosRepository.inc:49
 msgid "Release"
 msgstr "Release"
 
-#: admin/fai/class_faiPartitionTable.inc:269
-#: admin/fai/class_faiDiskEntry.inc:446
-#, php-format
-msgid ""
-"The disk cannot be deleted while it is used in the '%s' disk definition!"
-msgstr "Disken kan inte tas bort medan den anvÃ¤nds i diskdefinitionen fÃ¶r '%s'! "
+#: admin/fai/class_faiPackage.inc:401
+msgid "Debian release concerned"
+msgstr ""
+
+#: admin/fai/class_faiPackage.inc:405
+#: admin/systems/services/repository/class_serviceDebianRepository.inc:58
+msgid "Sections"
+msgstr "Sektioner"
+
+#: admin/fai/class_faiPackage.inc:405
+msgid "Sections concerned"
+msgstr ""
 
-#: admin/fai/class_faiPartitionTable.inc:416 admin/fai/class_faiScript.inc:360
-#: admin/fai/class_faiScript.inc:362 admin/fai/class_faiTemplate.inc:306
-#: admin/fai/class_faiTemplate.inc:308
-msgid "edit"
-msgstr "redigera"
+#: admin/fai/class_faiPackage.inc:409
+msgid "Install method"
+msgstr "Installationsmetod"
 
-#: admin/fai/class_faiPartitionTable.inc:418 admin/fai/class_faiScript.inc:364
-#: admin/fai/class_faiTemplate.inc:310
-msgid "delete"
-msgstr "ta bort"
+#: admin/fai/class_faiPackage.inc:409
+msgid "Install method to use for this package list"
+msgstr ""
+
+#: admin/fai/class_faiPackage.inc:420
+msgid "Packages"
+msgstr "Paket"
+
+#: admin/fai/class_faiPackage.inc:424
+msgid "Packages in this class"
+msgstr ""
 
-#: admin/fai/class_faiPartitionTable.inc:769
-#: admin/fai/class_faiPartitionTable.inc:773
+#: admin/fai/class_faiPartitionTable.inc:61
+#: admin/fai/class_faiDiskEntry.inc:442 admin/systems/class_faiLogView.inc:207
+#: admin/systems/class_faiLogView.inc:242
+msgid "Error"
+msgstr "Fel"
+
+#: admin/fai/class_faiPartitionTable.inc:112
+msgid "Add RAID"
+msgstr "LÃ¤gg till RAID"
+
+#: admin/fai/class_faiPartitionTable.inc:116
+msgid "Add LVM"
+msgstr ""
+
+#: admin/fai/class_faiPartitionTable.inc:284
+msgid "Partition table"
+msgstr "Partitionstabell"
+
+#: admin/fai/class_faiPartitionTable.inc:285
+#: admin/fai/class_faiPartitionTable.inc:288
 msgid "FAI partition table"
 msgstr "FAI-partitionstabell"
 
-#: admin/fai/class_faiPartitionTable.inc:779 admin/fai/class_faiHook.inc:531
-#: admin/fai/class_faiVariable.inc:398
-msgid "Read only"
-msgstr "Endast lÃ¤sning"
+#: admin/fai/class_faiPartitionTable.inc:307 admin/fai/class_faiProfile.inc:50
+msgid "Partition table class name"
+msgstr ""
+
+#: admin/fai/class_faiPartitionTable.inc:317
+msgid "Discs"
+msgstr "Diskar"
+
+#: admin/fai/class_faiPartitionTable.inc:324
+msgid "Partitions in this class"
+msgstr ""
 
 #: admin/fai/class_faiDiskEntry.inc:273
-#: admin/fai/faiPartitionTableEntry.tpl.c:5 admin/fai/faiDiskEntry.tpl.c:5
 msgid "Device"
 msgstr "Enhet"
 
@@ -390,103 +198,103 @@ msgstr "Etikett"
 msgid "UUID"
 msgstr "UUID"
 
-#: admin/fai/class_faiDiskEntry.inc:345
+#: admin/fai/class_faiDiskEntry.inc:344
 msgid "Disks"
 msgstr "Diskar"
 
-#: admin/fai/class_faiDiskEntry.inc:348 admin/fai/class_faiPartition.inc:321
-#: admin/fai/faiPartition.tpl.c:14
+#: admin/fai/class_faiDiskEntry.inc:347 admin/fai/class_faiPartition.inc:319
 msgid "Size"
 msgstr "Storlek"
 
-#: admin/fai/class_faiDiskEntry.inc:544
+#: admin/fai/class_faiDiskEntry.inc:443
+#, php-format
+msgid ""
+"The disk cannot be deleted while it is used in the '%s' disk definition!"
+msgstr "Disken kan inte tas bort medan den anvÃ¤nds i diskdefinitionen fÃ¶r '%s'! "
+
+#: admin/fai/class_faiDiskEntry.inc:536
 msgid "encrypted"
 msgstr "krypterad"
 
-#: admin/fai/class_faiDiskEntry.inc:547
+#: admin/fai/class_faiDiskEntry.inc:539
 msgid "bootable"
 msgstr "bootbar"
 
-#: admin/fai/class_faiDiskEntry.inc:550
+#: admin/fai/class_faiDiskEntry.inc:542
 msgid "preserve"
 msgstr "bevara"
 
-#: admin/fai/class_faiDiskEntry.inc:735
+#: admin/fai/class_faiDiskEntry.inc:687 admin/fai/class_faiDiskEntry.inc:690
+#: admin/fai/class_faiDiskEntry.inc:737
+#: admin/fai/packageSelect/selectPackage-list.xml:40
+#: admin/fai/class_faiScript.inc:71 admin/fai/class_faiHook.inc:71
+#: admin/fai/class_faiVariable.inc:71
+#: admin/fai/class_faiSimplePluginClass.inc:50
+msgid "Name"
+msgstr "Namn"
+
+#: admin/fai/class_faiDiskEntry.inc:717
 msgid ""
 "You have more than four primary partition table entries in your "
 "configuration, please check your configuration twice."
 msgstr "Du har fler Ã¤n fyra primÃ¤ra partitionstabellsposter i din konfiguration, vÃ¤nligen kontrollera din konfiguration igen."
 
-#: admin/fai/class_faiDiskEntry.inc:739
+#: admin/fai/class_faiDiskEntry.inc:721
 msgid ""
 "You cannot have more than three primary partition while using logical "
 "partitions, please check your configuration twice."
 msgstr "Du kan inte ha fler Ã¤n tre primÃ¤ra partitioner nÃ¤r du anvÃ¤nder logiska partitioner, vÃ¤nligen kontrollera din konfiguration igen."
 
-#: admin/fai/class_faiDiskEntry.inc:752
-#: admin/fai/class_faiPartitionTableEntry.inc:448
+#: admin/fai/class_faiDiskEntry.inc:733
 msgid "Partition table entry"
 msgstr "Partitionstabellspost"
 
-#: admin/fai/class_faiDiskEntry.inc:753
-#: admin/fai/class_faiPartitionTableEntry.inc:449
+#: admin/fai/class_faiDiskEntry.inc:734
 msgid "FAI partition table entry"
 msgstr "FAI-partitionstabellspost"
 
-#: admin/fai/class_faiDiskEntry.inc:760
+#: admin/fai/class_faiDiskEntry.inc:739
 msgid "Disk options"
 msgstr "Diskalternativ"
 
-#: admin/fai/class_faiDiskEntry.inc:761
-#: admin/fai/class_faiPartitionTableEntry.inc:457
+#: admin/fai/class_faiDiskEntry.inc:740
 msgid "Partition type"
 msgstr "Partitionstyp"
 
-#: admin/fai/class_faiDiskEntry.inc:762
-#: admin/fai/class_faiPartitionTableEntry.inc:458
+#: admin/fai/class_faiDiskEntry.inc:741
 msgid "Partition no."
 msgstr "Partition nr."
 
-#: admin/fai/class_faiDiskEntry.inc:763
-#: admin/fai/class_faiPartitionTableEntry.inc:459
+#: admin/fai/class_faiDiskEntry.inc:742
 msgid "File system type"
 msgstr "Filsystemstyp"
 
-#: admin/fai/class_faiDiskEntry.inc:764
-#: admin/fai/class_faiPartitionTableEntry.inc:171
-#: admin/fai/class_faiPartitionTableEntry.inc:460
-#: admin/fai/class_faiPartition.inc:437 admin/fai/faiPartition.tpl.c:47
+#: admin/fai/class_faiDiskEntry.inc:743 admin/fai/class_faiPartition.inc:432
 msgid "Mount point"
 msgstr "Monteringspunkt"
 
-#: admin/fai/class_faiDiskEntry.inc:765
-#: admin/fai/class_faiPartitionTableEntry.inc:461
-#: admin/fai/class_faiPartition.inc:402 admin/fai/class_faiPartition.inc:407
+#: admin/fai/class_faiDiskEntry.inc:744 admin/fai/class_faiPartition.inc:397
+#: admin/fai/class_faiPartition.inc:402
 msgid "Partition size"
 msgstr "Partitionsstorlek"
 
-#: admin/fai/class_faiDiskEntry.inc:766
-#: admin/fai/class_faiPartitionTableEntry.inc:173
-#: admin/fai/class_faiPartitionTableEntry.inc:462
-#: admin/fai/faiPartition.tpl.c:50
+#: admin/fai/class_faiDiskEntry.inc:745
 msgid "Mount options"
 msgstr "Monteringsalternativ"
 
-#: admin/fai/class_faiDiskEntry.inc:767
-#: admin/fai/class_faiPartitionTableEntry.inc:463
+#: admin/fai/class_faiDiskEntry.inc:746
 msgid "File system options"
 msgstr "Filsystemsalternativ"
 
-#: admin/fai/class_faiDiskEntry.inc:768
-#: admin/fai/class_faiPartitionTableEntry.inc:464
+#: admin/fai/class_faiDiskEntry.inc:747
 msgid "Partition flags"
 msgstr "Partitionsflaggor"
 
-#: admin/fai/class_debconfTemplate.inc:227
+#: admin/fai/class_debconfTemplate.inc:225
 msgid "This package has no debconf options."
 msgstr "Det hÃ¤r paketet har inga debconf-alternativ."
 
-#: admin/fai/class_debconfTemplate.inc:264
+#: admin/fai/class_debconfTemplate.inc:262
 msgid ""
 "This debconf question is dynamically generated during package installation "
 "and requires choosing between specific options which cannot be presented "
@@ -494,217 +302,59 @@ msgid ""
 " effect."
 msgstr "Den hÃ¤r debconf-frÃ¥gan genereras dynamiskt under paketinstallation och krÃ¤ver ett val mellan specifika alternativ som inte kan presenteras hÃ¤r. Den inskrivna texten mÃ¥ste vara ett av de giltiga valen fÃ¶r att trÃ¤da i kraft."
 
-#: admin/fai/class_faiTemplateEntry.inc:139
-msgid "no file uploaded yet"
-msgstr "ingen fil uppladdad Ã¤n"
+#: admin/fai/class_faiTemplateEntry.inc:143
+msgid "File path"
+msgstr ""
 
-#: admin/fai/class_faiTemplateEntry.inc:142
-#, php-format
-msgid "exists in database (size: %s bytes)"
-msgstr "finns i databas (storlek: %s bytes)"
+#: admin/fai/class_faiTemplateEntry.inc:143
+msgid "Complete absolute template file path and name"
+msgstr ""
 
-#: admin/fai/class_faiTemplateEntry.inc:251
-#: admin/systems/class_faiLogView.inc:70 admin/fai/faiTemplateEntry.tpl.c:23
-msgid "File"
-msgstr "Fil"
+#: admin/fai/class_faiTemplateEntry.inc:147
+msgid "Short description of the file"
+msgstr ""
 
-#: admin/fai/class_faiTemplateEntry.inc:255
-#: admin/fai/faiTemplateEntry.tpl.c:11
-msgid "Destination path"
-msgstr "Destinationens sÃ¶kvÃ¤g"
-
-#: admin/fai/class_faiTemplateEntry.inc:260 admin/fai/faiTemplateEntry.tpl.c:8
-msgid "File name"
-msgstr "Filnamn"
-
-#: admin/fai/class_faiTemplateEntry.inc:264
-#: admin/fai/class_faiTemplateEntry.inc:266
-#: admin/fai/faiTemplateEntry.tpl.c:68
-msgid "User"
-msgstr "AnvÃ¤ndare"
-
-#: admin/fai/class_faiTemplateEntry.inc:270
-#: admin/fai/class_faiTemplateEntry.inc:273
-#: admin/fai/class_faiTemplateEntry.inc:275
-#: admin/fai/faiTemplateEntry.tpl.c:47 admin/fai/faiTemplateEntry.tpl.c:74
-msgid "Group"
-msgstr "Grupp"
+#: admin/fai/class_faiTemplateEntry.inc:156
+msgid "Template attributes"
+msgstr "Mall-attribut"
 
-#: admin/fai/class_faiTemplateEntry.inc:305
-msgid "Template entry"
-msgstr "Mall-post"
+#: admin/fai/class_faiTemplateEntry.inc:160
+msgid "Template file content"
+msgstr ""
 
-#: admin/fai/class_faiTemplateEntry.inc:306
-msgid "FAI template entry"
-msgstr "FAI-mall-post"
+#: admin/fai/class_faiTemplateEntry.inc:160
+msgid "Content of the template file"
+msgstr ""
 
-#: admin/fai/class_faiTemplateEntry.inc:314
-msgid "Template file"
-msgstr "Mall-fil"
+#: admin/fai/class_faiTemplateEntry.inc:164
+msgid "Owner and group of the file"
+msgstr ""
 
-#: admin/fai/class_faiTemplateEntry.inc:315
-msgid "Template path"
-msgstr "Mall-sÃ¶kvÃ¤g"
+#: admin/fai/class_faiTemplateEntry.inc:167
+msgid "Owner"
+msgstr "Ã„gare"
 
-#: admin/fai/class_faiTemplateEntry.inc:316
+#: admin/fai/class_faiTemplateEntry.inc:167
 msgid "File owner"
 msgstr "FilÃ¤gare"
 
-#: admin/fai/class_faiTemplateEntry.inc:317
-msgid "File permissions"
-msgstr "FilrÃ¤ttigheter"
-
-#: admin/fai/class_FAI.inc:287 admin/fai/class_FAI.inc:679
-#: admin/fai/class_FAI.inc:1266 admin/fai/class_FAI.inc:1283
-#: admin/fai/class_FAI.inc:1287
-msgid "LDAP error"
-msgstr "LDAP-fel"
-
-#: admin/fai/class_FAI.inc:570
-#, php-format
-msgid "Error, following objects should be equal '%s' and '%s'"
-msgstr "Fel, fÃ¶ljande objekt borde vara lika: '%s' och '%s'"
-
-#: admin/fai/class_FAI.inc:891
-#, php-format
-msgid "Creating group application release for %s"
-msgstr "Skapar gruppapplikationsrelease fÃ¶r %s"
-
-#: admin/fai/class_FAI.inc:960 admin/fai/class_FAI.inc:982
-#: admin/fai/class_FAI.inc:1022 admin/fai/class_FAI.inc:1027
-#: admin/fai/class_FAI.inc:1065
-msgid "Object"
-msgstr "Objekt"
-
-#: admin/fai/class_FAI.inc:961
-#, php-format
-msgid "Adding missing group application release container %s."
-msgstr "LÃ¤gger till saknad behÃ¥llare fÃ¶r gruppapplikations-release %s."
-
-#: admin/fai/class_FAI.inc:983
-#, php-format
-msgid "Adding group application release container %s."
-msgstr "LÃ¤gger till behÃ¥llare fÃ¶r gruppapplikations-release %s."
-
-#: admin/fai/class_FAI.inc:1023
-#, php-format
-msgid "Could not create menu entry %s. (Already exists)."
-msgstr "Kunde inte skapa meny-post %s. (Finns redan)."
-
-#: admin/fai/class_FAI.inc:1028
-#, php-format
-msgid "Created group application menu entry for %s."
-msgstr "Skapade menypost fÃ¶r gruppapplikation %s."
-
-#: admin/fai/class_FAI.inc:1059
-#, php-format
-msgid "Creating copy of %s"
-msgstr "Skapar kopia av %s"
-
-#: admin/fai/class_FAI.inc:1062
-msgid "Processing"
-msgstr "Processar"
-
-#: admin/fai/class_FAI.inc:1080
-msgid "Could not create new release, the destination dn is already in use."
-msgstr "Kunde inte skapa ny release, destinationens dn anvÃ¤nds redan."
-
-#: admin/fai/class_FAI.inc:1093
-msgid "Error while fetching source dn - aborted!"
-msgstr "Fel nÃ¤r kÃ¤llans dn hÃ¤mtades - avbruten!"
-
-#: admin/fai/class_FAI.inc:1174
-msgid "Fatal error"
-msgstr "Allvarligt fel"
-
-#: admin/fai/class_FAI.inc:1175
-#, php-format
-msgid ""
-"Release creation failed due to ldap errors. Additional informations '%s'."
-msgstr "Skapandet av en release misslyckades pÃ¥ grund av ldap-fel. Ytterligare information '%s'."
-
-#: admin/fai/class_faiPartitionTableEntry.inc:162
-msgid "primary"
-msgstr "primÃ¤r"
-
-#: admin/fai/class_faiPartitionTableEntry.inc:162
-msgid "logical"
-msgstr "logisk"
-
-#: admin/fai/class_faiPartitionTableEntry.inc:169
-#: admin/fai/faiPartition.tpl.c:8
-msgid "Type"
-msgstr "Typ"
-
-#: admin/fai/class_faiPartitionTableEntry.inc:170
-msgid "FS type"
-msgstr "FS-typ"
-
-#: admin/fai/class_faiPartitionTableEntry.inc:172
-msgid "Size in MB"
-msgstr "Storlek i MB"
-
-#: admin/fai/class_faiPartitionTableEntry.inc:174
-msgid "FS option"
-msgstr "FS-alternativ"
-
-#: admin/fai/class_faiPartitionTableEntry.inc:175
-#: admin/fai/faiPartition.tpl.c:23
-msgid "Preserve"
-msgstr "Bevara"
-
-#: admin/fai/class_faiPartitionTableEntry.inc:266
-msgid "False"
-msgstr "Falskt"
-
-#: admin/fai/class_faiPartitionTableEntry.inc:268
-msgid "True"
-msgstr "Sant"
-
-#: admin/fai/class_faiPartitionTableEntry.inc:272
-#: admin/fai/class_faiPartitionTableEntry.inc:274 admin/fai/fai-list.xml:159
-#: admin/fai/fai-list.xml:198
-msgid "Remove"
-msgstr "Ta bort"
-
-#: admin/fai/class_faiPartitionTableEntry.inc:384
-#, php-format
-msgid "please enter a unique mount point for partition %s"
-msgstr "skriv in en unik monteringspunkt fÃ¶r partition %s"
+#: admin/fai/class_faiTemplateEntry.inc:172
+msgid "Group"
+msgstr "Grupp"
 
-#: admin/fai/class_faiPartitionTableEntry.inc:389
-#, php-format
-msgid "partition %s mount point"
-msgstr "partionen %s monteringspunkt"
+#: admin/fai/class_faiTemplateEntry.inc:172
+msgid "File group"
+msgstr ""
 
-#: admin/fai/class_faiPartitionTableEntry.inc:394
-#, php-format
-msgid ""
-"File system type 'swap' is already used, change file system type for "
-"partition %s."
-msgstr "Filsystemstyp 'swap' anvÃ¤nds redan, Ã¤ndra filsystemstyp fÃ¶r partitionen %s."
-
-#: admin/fai/class_faiPartitionTableEntry.inc:398
-msgid "Please use 'swap' as mount point, if 'swap' is used as fs-type."
-msgstr "AnvÃ¤nd 'swap' som monteringspunkt, om 'swap' anvÃ¤nds som fs-typ."
-
-#: admin/fai/class_faiPartitionTableEntry.inc:404
-#: admin/fai/class_faiPartitionTableEntry.inc:408
-#: admin/fai/class_faiPartitionTableEntry.inc:414
-#: admin/fai/class_faiPartitionTableEntry.inc:416
-#: admin/fai/class_faiPartitionTableEntry.inc:421
-#, php-format
-msgid "partition %s size"
-msgstr "partition %s storlek"
+#: admin/fai/class_faiTemplateEntry.inc:181
+msgid "Access"
+msgstr "TillgÃ¥ng"
 
-#: admin/fai/class_faiPartitionTableEntry.inc:436
-msgid ""
-"You have more than 3 primary partition table entries in your configuration, "
-"please check your configuration twice."
-msgstr "Du har fler Ã¤n 3 primÃ¤ra partitioner i din konfiguration, vÃ¤nligen kontrollera din konfiguration noga."
+#: admin/fai/class_faiTemplateEntry.inc:181
+msgid "Access rights"
+msgstr ""
 
 #: admin/fai/packageSelect/selectPackage-list.xml:10
-#: admin/fai/classSelect/selectClass-list.xml:11
 msgid "Please select the desired entries"
 msgstr "VÃ¤lj Ã¶nskade poster"
 
@@ -712,148 +362,95 @@ msgstr "VÃ¤lj Ã¶nskade poster"
 msgid "Version"
 msgstr "Version"
 
-#: admin/fai/class_faiProfile.inc:310
-msgid "This list displays all assigned class names for this profile."
-msgstr "Den hÃ¤r listan visar alla tilldelade klasser fÃ¶r den hÃ¤r profilen."
-
-#: admin/fai/class_faiProfile.inc:313 admin/fai/class_askClassName.inc:103
-#: admin/fai/classSelect/class_classSelect.inc:53
-#: admin/fai/class_faiProfileEntry.inc:158
-msgid "Hook bundle"
-msgstr "Hook-samling"
-
-#: admin/fai/class_faiProfile.inc:314 admin/fai/class_askClassName.inc:105
-#: admin/fai/classSelect/class_classSelect.inc:54
-#: admin/fai/class_faiProfileEntry.inc:159
-msgid "Template bundle"
-msgstr "Mall-samling"
-
-#: admin/fai/class_faiProfile.inc:315 admin/fai/class_askClassName.inc:101
-#: admin/fai/classSelect/class_classSelect.inc:55
-#: admin/fai/class_faiProfileEntry.inc:160
-msgid "Script bundle"
-msgstr "Script-samling"
-
-#: admin/fai/class_faiProfile.inc:316 admin/fai/class_askClassName.inc:102
-#: admin/fai/classSelect/class_classSelect.inc:56
-#: admin/fai/class_faiProfileEntry.inc:161
-msgid "Variable bundle"
-msgstr "Variabel-samling"
-
-#: admin/fai/class_faiProfile.inc:317 admin/fai/class_askClassName.inc:100
-#: admin/fai/classSelect/class_classSelect.inc:57
-#: admin/fai/class_faiProfileEntry.inc:162
-msgid "Package bundle"
-msgstr "Paket-samling"
-
-#: admin/fai/class_faiProfile.inc:321
-msgid "Remove class from profile"
-msgstr "Ta bort klass frÃ¥n profil"
-
-#: admin/fai/class_faiProfile.inc:324
-msgid "Up"
-msgstr "Upp"
-
-#: admin/fai/class_faiProfile.inc:325
-msgid "Down"
-msgstr "Ner"
-
-#: admin/fai/class_faiProfile.inc:410
-msgid "No class specified for this profile!"
-msgstr "Ingen klass specificerad fÃ¶r den hÃ¤r profilen!"
-
-#: admin/fai/class_faiProfile.inc:419
-msgid "You can't use the same name for a class and a profile!"
-msgstr ""
+#: admin/fai/class_faiProfile.inc:28
+msgid "Profile"
+msgstr "Profil"
 
-#: admin/fai/class_faiProfile.inc:455
+#: admin/fai/class_faiProfile.inc:29
 msgid "FAI profile"
 msgstr "FAI-profil"
 
-#: admin/fai/class_faiProfile.inc:458
+#: admin/fai/class_faiProfile.inc:32
 msgid "FAI Profile"
 msgstr "FAI-profil"
 
-#: admin/fai/class_faiProfile.inc:465 admin/fai/faiProfile.tpl.c:17
+#: admin/fai/class_faiProfile.inc:61
 msgid "FAI classes"
 msgstr "FAI-klasser"
 
-#: admin/fai/class_faiHookEntry.inc:200
-msgid "Hook entry"
-msgstr "Hook-post"
+#: admin/fai/class_faiProfile.inc:61
+msgid "FAI classes which are part of this profile"
+msgstr ""
 
-#: admin/fai/class_faiHookEntry.inc:201
-msgid "FAI hook entry"
-msgstr "FAI-hook-post"
+#: admin/fai/class_faiPackageConfiguration.inc:88
+#, php-format
+msgid "Debconf information for package '%s'"
+msgstr "Debconf-information fÃ¶r paketet '%s'"
 
-#: admin/fai/class_faiHookEntry.inc:209 admin/fai/faiHookEntry.tpl.c:20
-msgid "Task"
-msgstr "Ã…tgÃ¤rd"
+#: admin/fai/class_faiScript.inc:30 admin/fai/class_faiScript.inc:84
+#: admin/fai/class_faiHook.inc:87
+msgid "Script"
+msgstr "Script"
 
-#: admin/fai/class_faiHookEntry.inc:210 admin/fai/class_faiScript.inc:595
-#: admin/fai/class_faiScript.inc:599
+#: admin/fai/class_faiScript.inc:31 admin/fai/class_faiScript.inc:34
 msgid "FAI script"
 msgstr "FAI-script"
 
-#: admin/fai/class_faiPackageConfiguration.inc:88
-#, php-format
-msgid "Debconf information for package '%s'"
-msgstr "Debconf-information fÃ¶r paketet '%s'"
+#: admin/fai/class_faiScript.inc:63
+msgid "Scripts"
+msgstr "Script"
 
-#: admin/fai/class_askClassName.inc:99 admin/fai/class_askClassName.inc:100
-#: admin/fai/class_askClassName.inc:101 admin/fai/class_askClassName.inc:102
-#: admin/fai/class_askClassName.inc:103 admin/fai/class_askClassName.inc:104
-#: admin/fai/class_askClassName.inc:105 admin/fai/class_askClassName.inc:106
-msgid "Create new FAI object"
-msgstr "Skapa nytt FAI-objekt"
+#: admin/fai/class_faiScript.inc:67 admin/fai/class_faiHook.inc:67
+#: admin/fai/class_faiVariable.inc:67
+msgid "Variables in this class"
+msgstr ""
 
-#: admin/fai/class_faiTemplateEdit.inc:80
-#, php-format
-msgid ""
-"The file encodig has changed from '%s' to '%s'. Do you really want to save?"
-msgstr "Filens teckenkodning har Ã¤ndrats frÃ¥n '%s' till '%s'. Vill du verkligen spara?"
+#: admin/fai/class_faiScript.inc:71 admin/fai/class_faiHook.inc:71
+#: admin/fai/class_faiVariable.inc:71
+msgid "The name of the variable"
+msgstr ""
 
-#: admin/fai/class_faiScript.inc:333 admin/fai/class_faiScript.inc:335
-msgid "Sort direction"
-msgstr "Sorteringsordning"
+#: admin/fai/class_faiScript.inc:75 admin/fai/class_faiHook.inc:75
+#: admin/fai/class_faiVariable.inc:75
+msgid "A short description of the variable"
+msgstr ""
 
-#: admin/fai/class_faiScript.inc:348 admin/fai/faiScriptEntry.tpl.c:20
+#: admin/fai/class_faiScript.inc:79
 msgid "Priority"
 msgstr "Prioritet"
 
-#: admin/fai/class_faiScript.inc:350
-msgid "Action"
-msgstr "Ã…tgÃ¤rd"
+#: admin/fai/class_faiScript.inc:79
+msgid "Priority of this script (FIXME: less is done first?)"
+msgstr ""
 
-#: admin/fai/classSelect/selectClass-list.xml:36 admin/fai/fai-list.xml:88
-#: admin/fai/faiScriptEntry.tpl.c:14
-msgid "Properties"
-msgstr "Egenskaper"
+#: 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:501 admin/fai/fai-list.xml:116
+#: admin/fai/class_faiTemplate.inc:153
 msgid "Template"
 msgstr "Mall"
 
-#: admin/fai/class_faiTemplate.inc:502 admin/fai/class_faiTemplate.inc:506
+#: admin/fai/class_faiTemplate.inc:154 admin/fai/class_faiTemplate.inc:157
 msgid "FAI template"
 msgstr "FAI-mall"
 
-#: admin/fai/class_faiVariableEntry.inc:107
-msgid "Content"
-msgstr "InnehÃ¥ll"
-
-#: admin/fai/class_faiVariableEntry.inc:142
-msgid "Variable entry"
-msgstr "Variabelpost"
+#: admin/fai/class_faiTemplate.inc:176
+msgid "Template class name"
+msgstr ""
 
-#: admin/fai/class_faiVariableEntry.inc:143
-msgid "FAI variable entry "
-msgstr "FAI-variabelpost"
+#: admin/fai/class_faiTemplate.inc:186
+msgid "Template files"
+msgstr ""
 
-#: admin/fai/class_faiVariableEntry.inc:151
-#: admin/fai/faiVariableEntry.tpl.c:20
-msgid "Variable content"
-msgstr "Variabel-innehÃ¥ll"
+#: admin/fai/class_faiTemplate.inc:190
+msgid "Template files in this class"
+msgstr ""
 
 #: admin/fai/class_faiPartition.inc:176 admin/fai/class_faiPartition.inc:180
 msgid "Logical"
@@ -951,95 +548,74 @@ msgstr "xfs"
 msgid "btrfs"
 msgstr "btrfs"
 
-#: admin/fai/class_faiPartition.inc:224
-msgid "LVM/RAID"
-msgstr ""
-
-#: admin/fai/class_faiPartition.inc:327
+#: admin/fai/class_faiPartition.inc:325
 msgid "spare"
 msgstr "reserv"
 
-#: admin/fai/class_faiPartition.inc:330
+#: admin/fai/class_faiPartition.inc:328
 msgid "missing"
 msgstr "saknas"
 
-#: admin/fai/class_faiPartition.inc:333
+#: admin/fai/class_faiPartition.inc:331
 msgid "Options"
 msgstr "Alternativ"
 
-#: admin/fai/class_faiPartition.inc:420
+#: admin/fai/class_faiPartition.inc:415
 msgid "Minimum partition size"
 msgstr "Minsta partitionsstorlek"
 
-#: admin/fai/class_faiPartition.inc:420
+#: admin/fai/class_faiPartition.inc:415
 msgid "Maximum partition size"
 msgstr "StÃ¶rsta partitionsstorlek"
 
-#: admin/fai/class_faiPartition.inc:428
+#: admin/fai/class_faiPartition.inc:423
 msgid "Raid arrays must contain at least two partitions!"
 msgstr "Raid-arrayer mÃ¥ste innehÃ¥lla minst tvÃ¥ partitioner!"
 
-#: admin/fai/class_faiPartition.inc:430
+#: admin/fai/class_faiPartition.inc:425
 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:332 admin/fai/class_faiHook.inc:334
-#: admin/fai/fai-list.xml:190 admin/fai/faiVariable.tpl.c:23
-#: admin/fai/faiVariable.tpl.c:26
-msgid "Edit"
-msgstr "Redigera"
-
-#: admin/fai/class_faiHook.inc:336
-msgid "Delete"
-msgstr "Ta bort"
-
-#: admin/fai/class_faiHook.inc:521 admin/fai/fai-list.xml:128
+#: admin/fai/class_faiHook.inc:30
 msgid "Hook"
 msgstr "Hook"
 
-#: admin/fai/class_faiHook.inc:522 admin/fai/class_faiHook.inc:526
+#: admin/fai/class_faiHook.inc:31 admin/fai/class_faiHook.inc:34
 msgid "FAI hook"
 msgstr "FAI-hook"
 
-#: admin/fai/class_faiVariable.inc:387 admin/fai/fai-list.xml:134
+#: admin/fai/class_faiHook.inc:63
+msgid "Hooks"
+msgstr "Hooks"
+
+#: admin/fai/class_faiHook.inc:79
+msgid "Task"
+msgstr "Ã…tgÃ¤rd"
+
+#: admin/fai/class_faiHook.inc:87
+msgid "The script of this hook"
+msgstr ""
+
+#: admin/fai/class_faiVariable.inc:30
 msgid "Variable"
 msgstr "Variabel"
 
-#: admin/fai/class_faiVariable.inc:388 admin/fai/class_faiVariable.inc:392
+#: admin/fai/class_faiVariable.inc:31 admin/fai/class_faiVariable.inc:34
 msgid "FAI variable"
 msgstr "FAI-variabel"
 
-#: admin/fai/class_faiProfileEntry.inc:184 admin/fai/askClassName.tpl.c:11
-#: admin/fai/askClassName.tpl.c:17 admin/fai/paste_generic.tpl.c:5
-msgid "Class name"
-msgstr "Klassnamn"
-
-#: admin/fai/class_faiProfileEntry.inc:184 admin/fai/faiTemplate.tpl.c:14
-#: admin/fai/faiVariable.tpl.c:14 admin/fai/faiHook.tpl.c:14
-#: admin/fai/faiPartitionTable.tpl.c:17 admin/fai/faiScript.tpl.c:14
-msgid "Objects"
-msgstr "Objekt"
-
-#: admin/fai/fai-list.xml:11
-msgid "List of deployment classes and products"
-msgstr "Lista med deployment-klasser och -produkter"
-
-#: admin/fai/fai-list.xml:15
-msgid "partitionTable"
-msgstr "partitionsTabell"
-
-#: admin/fai/fai-list.xml:23
-msgid "packagelist"
-msgstr "paketlista"
+#: admin/fai/class_faiVariable.inc:63
+msgid "Variables"
+msgstr "Variabler"
 
-#: admin/fai/fai-list.xml:93
-msgid "Actions"
-msgstr "Ã…tgÃ¤rder"
+#: admin/fai/class_faiVariable.inc:79
+msgid "Content"
+msgstr "InnehÃ¥ll"
 
-#: admin/fai/fai-list.xml:104
-msgid "Create"
-msgstr "Skapa"
+#: admin/fai/class_faiVariable.inc:79
+msgid "The content of the variable"
+msgstr ""
 
 #: admin/systems/class_faiLogView.inc:56
 msgid "Sort down"
@@ -1049,6 +625,10 @@ msgstr ""
 msgid "Sort up"
 msgstr ""
 
+#: admin/systems/class_faiLogView.inc:70
+msgid "File"
+msgstr "Fil"
+
 #: admin/systems/class_faiLogView.inc:71
 msgid "Date"
 msgstr ""
@@ -1083,7 +663,7 @@ msgstr ""
 msgid "Selected file: %s"
 msgstr ""
 
-#: admin/systems/class_faiStartup.inc:70 admin/fai/paste_generic.tpl.c:2
+#: admin/systems/class_faiStartup.inc:70
 msgid "FAI settings"
 msgstr "FAI-instÃ¤llningar"
 
@@ -1103,11 +683,6 @@ msgstr "Profil"
 msgid "FAI profil to be applied to this computer"
 msgstr "FAI-profil att applicera pÃ¥ den hÃ¤r datorn"
 
-#: admin/systems/class_faiStartup.inc:90 admin/fai/faiPackage.tpl.c:14
-#: admin/fai/faiPackage.tpl.c:17
-msgid "Repository"
-msgstr "FÃ¶rrÃ¥d"
-
 #: admin/systems/class_faiStartup.inc:90
 msgid "FAI Debian repository to be used for installation"
 msgstr "FAI Debian-fÃ¶rrÃ¥d att anvÃ¤nda fÃ¶r installation"
@@ -1132,85 +707,96 @@ msgstr "Parametrar fÃ¶r BootkÃ¤rna"
 msgid "Linux kernel parameters to be ran"
 msgstr "Linux kÃ¤rnparametrar att kÃ¶ra"
 
-#: admin/systems/class_faiStartup.inc:178
+#: admin/systems/class_faiStartup.inc:179
 msgid "Full automated installation"
 msgstr "Fullt automatiserad installation"
 
-#: admin/systems/services/repository/class_serviceRepository.inc:31
+#: admin/systems/services/repository/class_serviceDebianRepository.inc:34
+#: admin/systems/services/repository/class_serviceCentosRepository.inc:31
+msgid "Repositories"
+msgstr "FÃ¶rrÃ¥d"
+
+#: admin/systems/services/repository/class_serviceDebianRepository.inc:39
+#: admin/systems/services/repository/class_serviceCentosRepository.inc:36
+msgid "Repositories this server hosts"
+msgstr "FÃ¶rrÃ¥d denna server tillhandahÃ¥ller"
+
+#: admin/systems/services/repository/class_serviceDebianRepository.inc:43
+#: admin/systems/services/repository/class_serviceCentosRepository.inc:40
 msgid "URL"
 msgstr "URL"
 
-#: admin/systems/services/repository/class_serviceRepository.inc:31
+#: admin/systems/services/repository/class_serviceDebianRepository.inc:43
+#: admin/systems/services/repository/class_serviceCentosRepository.inc:40
 msgid "Repository url"
 msgstr "FÃ¶rrÃ¥dets url"
 
-#: admin/systems/services/repository/class_serviceRepository.inc:35
+#: admin/systems/services/repository/class_serviceDebianRepository.inc:47
+#: admin/systems/services/repository/class_serviceCentosRepository.inc:44
 msgid "Parent server"
 msgstr "Parent server"
 
-#: admin/systems/services/repository/class_serviceRepository.inc:35
+#: admin/systems/services/repository/class_serviceDebianRepository.inc:47
+#: admin/systems/services/repository/class_serviceCentosRepository.inc:44
 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"
-msgstr "Sektioner"
+#: admin/systems/services/repository/class_serviceDebianRepository.inc:52
+msgid "Debian release used on this repository"
+msgstr "Debian-release som anvÃ¤nds i det hÃ¤r fÃ¶rrÃ¥det"
 
-#: admin/systems/services/repository/class_serviceRepository.inc:47
-msgid "Sections available on this repository"
-msgstr ""
+#: admin/systems/services/repository/class_serviceDebianRepository.inc:58
+msgid "Debian sections available on this repository"
+msgstr "TillgÃ¤ngliga Debian-sektioner i det hÃ¤r fÃ¶rrÃ¥det"
 
-#: admin/systems/services/repository/class_serviceRepository.inc:52
+#: admin/systems/services/repository/class_serviceDebianRepository.inc:63
+#: admin/systems/services/repository/class_serviceCentosRepository.inc:57
 msgid "Mirror mode"
 msgstr "Mirror-lÃ¤ge"
 
-#: admin/systems/services/repository/class_serviceRepository.inc:52
+#: admin/systems/services/repository/class_serviceDebianRepository.inc:63
+#: admin/systems/services/repository/class_serviceCentosRepository.inc:57
 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
+#: admin/systems/services/repository/class_serviceDebianRepository.inc:68
+#: admin/systems/services/repository/class_serviceCentosRepository.inc:62
 msgid "Local mirror"
 msgstr "Lokal mirror"
 
-#: admin/systems/services/repository/class_serviceRepository.inc:57
+#: admin/systems/services/repository/class_serviceDebianRepository.inc:68
+#: admin/systems/services/repository/class_serviceCentosRepository.inc:62
 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
+#: admin/systems/services/repository/class_serviceDebianRepository.inc:77
+#: admin/systems/services/repository/class_serviceCentosRepository.inc:71
 msgid "Architectures"
 msgstr "Arkitekturer"
 
-#: admin/systems/services/repository/class_serviceRepository.inc:66
+#: admin/systems/services/repository/class_serviceDebianRepository.inc:77
+#: admin/systems/services/repository/class_serviceCentosRepository.inc:71
 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_serviceDebianRepository.inc:99
+#: admin/systems/services/repository/class_serviceDebianRepository.inc:100
+msgid "Debian repository"
+msgstr "Debian-fÃ¶rrÃ¥d"
 
-#: admin/systems/services/repository/class_serviceRepository.inc:72
-msgid "Which distribution is this repository for"
-msgstr ""
-
-#: admin/systems/services/repository/class_serviceRepository.inc:140
-msgid "Repositories"
-msgstr "FÃ¶rrÃ¥d"
-
-#: admin/systems/services/repository/class_serviceRepository.inc:145
-msgid "Repositories this server hosts"
-msgstr "FÃ¶rrÃ¥d denna server tillhandahÃ¥ller"
+#: admin/systems/services/repository/class_serviceDebianRepository.inc:100
+#: admin/systems/services/repository/class_serviceCentosRepository.inc:96
+msgid "Services"
+msgstr "TjÃ¤nster"
 
-#: admin/systems/services/repository/class_serviceRepository.inc:160
-msgid "Package repository"
+#: admin/systems/services/repository/class_serviceCentosRepository.inc:49
+msgid "Centos release used on this repository"
 msgstr ""
 
-#: admin/systems/services/repository/class_serviceRepository.inc:161
-msgid "Package repository information"
+#: admin/systems/services/repository/class_serviceCentosRepository.inc:95
+#: admin/systems/services/repository/class_serviceCentosRepository.inc:96
+msgid "Centos repository"
 msgstr ""
 
 #: config/fai/class_faiConfig.inc:28
@@ -1242,476 +828,3 @@ msgstr "Relativ gren dÃ¤r fai %s kommer att lagras"
 #: config/fai/class_faiConfig.inc:60
 msgid "s"
 msgstr "er"
-
-#: admin/fai/faiPartitionTableEntry.tpl.c:2 admin/fai/faiVariableEntry.tpl.c:2
-#: admin/fai/faiVariableEntry.tpl.c:5 admin/fai/faiDiskEntry.tpl.c:2
-#: admin/fai/faiTemplate.tpl.c:2 admin/fai/faiTemplate.tpl.c:5
-#: admin/fai/faiVariable.tpl.c:2 admin/fai/faiVariable.tpl.c:5
-#: admin/fai/faiHook.tpl.c:2 admin/fai/faiHook.tpl.c:5
-#: admin/fai/faiPackage.tpl.c:2 admin/fai/faiPackage.tpl.c:5
-#: admin/fai/faiTemplateEntry.tpl.c:2 admin/fai/faiTemplateEntry.tpl.c:5
-#: admin/fai/faiScriptEntry.tpl.c:2 admin/fai/faiScriptEntry.tpl.c:5
-#: admin/fai/faiPartitionTable.tpl.c:2 admin/fai/faiPartitionTable.tpl.c:5
-#: admin/fai/faiScript.tpl.c:2 admin/fai/faiScript.tpl.c:5
-#: admin/fai/faiProfile.tpl.c:2 admin/fai/faiProfile.tpl.c:5
-#: admin/fai/faiProfile.tpl.c:14 admin/fai/faiHookEntry.tpl.c:2
-#: admin/fai/faiHookEntry.tpl.c:5
-msgid "Generic"
-msgstr "Generisk"
-
-#: admin/fai/faiPartitionTableEntry.tpl.c:14
-#: admin/fai/faiPartitionTableEntry.tpl.c:17 admin/fai/faiDiskEntry.tpl.c:23
-#: admin/fai/faiDiskEntry.tpl.c:26
-msgid "Partition entries"
-msgstr "Partitionsposter"
-
-#: admin/fai/faiPartitionTableEntry.tpl.c:20
-#: admin/fai/faiPartitionTableEntry.tpl.c:23 admin/fai/faiDiskEntry.tpl.c:29
-#: admin/fai/faiDiskEntry.tpl.c:32
-msgid "Add partition"
-msgstr "LÃ¤gg till partition"
-
-#: admin/fai/branch_selector.tpl.c:2
-msgid "Releases"
-msgstr "Releaser"
-
-#: admin/fai/branch_selector.tpl.c:5
-msgid "Current release"
-msgstr "Nuvarande release"
-
-#: admin/fai/branch_selector.tpl.c:8 admin/fai/branch_selector.tpl.c:17
-#: admin/fai/fai-filter.tpl.c:8 admin/fai/fai-filter.tpl.c:17
-msgid "Create release"
-msgstr "Skapa release"
-
-#: admin/fai/branch_selector.tpl.c:11 admin/fai/branch_selector.tpl.c:23
-#: admin/fai/fai-filter.tpl.c:11 admin/fai/fai-filter.tpl.c:23
-msgid "Create read-only release"
-msgstr "Skapa endast-lÃ¤sbar-release"
-
-#: admin/fai/branch_selector.tpl.c:20 admin/fai/fai-filter.tpl.c:20
-msgid "Freeze"
-msgstr "Frys"
-
-#: admin/fai/branch_selector.tpl.c:26 admin/fai/fai-filter.tpl.c:26
-msgid "Delete current release"
-msgstr "Ta bort nuvarande release"
-
-#: admin/fai/faiPartition.tpl.c:2
-msgid "Partition"
-msgstr "Partitionera"
-
-#: admin/fai/faiPartition.tpl.c:17
-msgid "Resize existing partition"
-msgstr "Ã„ndra storlek pÃ¥ existerande partition"
-
-#: admin/fai/faiPartition.tpl.c:20
-msgid "Bootable"
-msgstr "Bootbar"
-
-#: admin/fai/faiPartition.tpl.c:26 admin/fai/faiDiskEntry.tpl.c:20
-msgid "Combined physical partitions"
-msgstr "Kombinerade fysiska partitioner"
-
-#: admin/fai/faiPartition.tpl.c:29
-msgid "Toggle missing"
-msgstr "VÃ¤xla 'Saknad'"
-
-#: admin/fai/faiPartition.tpl.c:32
-msgid "Toggle spare"
-msgstr "VÃ¤xla 'reserv'"
-
-#: admin/fai/faiPartition.tpl.c:35
-msgid "Filesystem"
-msgstr "Filsystem"
-
-#: admin/fai/faiPartition.tpl.c:38
-msgid "Filesystem create options"
-msgstr "Alternativ fÃ¶r skapa filsystem"
-
-#: admin/fai/faiPartition.tpl.c:41
-msgid "Encrypted"
-msgstr "Krypterad"
-
-#: admin/fai/faiPartition.tpl.c:44
-msgid "Tune options"
-msgstr "Tune-instÃ¤llningar"
-
-#: admin/fai/faiNewBranch.tpl.c:2
-msgid ""
-"You are now going to create a branch or locked branch. This action clones "
-"the existing release to another release name. Branches can be modified as "
-"usual. FAI classes of locked branches cannot be modified, just additional "
-"classes are possible. Branch names should be alphanumeric, excluding the "
-"reserved names 'scripts', 'hooks', 'partitions', 'variables', 'templates' "
-"and 'fai'."
-msgstr "Du kommer nu att skapa en avgrening eller lÃ¥st avgrening. Denna Ã¥tgÃ¤rd klonar den existerande releasen till ett annat release-namn. Avgreningar kan Ã¤ndras som vanligt. FAI-klasser i lÃ¥sta avgreningar kan inte Ã¤ndras, det gÃ¥r endast att lÃ¤gga till ytterligare klasser. Namnen pÃ¥ avgreningarna bÃ¶r vara alfanumeriska, och namnen 'scripts', 'hooks', 'partitions', 'variables', 'templates' och 'fai' Ã¤r reserverade och ska inte anvÃ¤ndas.  "
-
-#: admin/fai/faiNewBranch.tpl.c:5
-msgid ""
-"Branches are created as subreleases of the currently selected branch. "
-"Creating a new branch named 1.0.2 in SARGE for example, will result in a new"
-" release called SARGE/1.0.2."
-msgstr "Avgreningar skapas som under-release till aktuell vald avgrening. Skapandet av en ny avgrening vid namn 1.0.2 i SARGE till exempel, kommer att resultera i en ny release som heter SARGE/1.0.2."
-
-#: admin/fai/faiNewBranch.tpl.c:8
-msgid "Please enter a name for the branch"
-msgstr "Skriv in ett namn fÃ¶r avgreningen"
-
-#: admin/fai/faiNewBranch.tpl.c:11
-msgid "Processing the requested operation"
-msgstr "Processar den begÃ¤rda operationen"
-
-#: admin/fai/faiNewBranch.tpl.c:14
-msgid ""
-"As soon as the copy operation has finished, you can scroll down to end of "
-"the page and press the 'Continue' button to continue with the fai management"
-" dialog."
-msgstr "SÃ¥ snart kopieringsrutinen har slutfÃ¶rts, kan du skrolla ner till slutet av sidan och trycka pÃ¥ 'FortsÃ¤tt'-knappen fÃ¶r att fortsÃ¤tta med fai-underhÃ¥llsdialogrutan."
-
-#: admin/fai/faiNewBranch.tpl.c:17
-msgid ""
-"Your browser doesn't support iframes, please use this link to perform the "
-"requested operation."
-msgstr "Din webblÃ¤sare stÃ¶djer inte iframes, anvÃ¤nd den hÃ¤r lÃ¤nken fÃ¶r att utfÃ¶ra begÃ¤rd operation."
-
-#: admin/fai/faiNewBranch.tpl.c:20
-msgid "Perform requested operation."
-msgstr "UtfÃ¶r begÃ¤rd operation."
-
-#: admin/fai/faiNewBranch.tpl.c:23
-msgid "Initiate operation"
-msgstr "Inled operation"
-
-#: admin/fai/faiVariableEntry.tpl.c:14 admin/fai/faiVariableEntry.tpl.c:17
-msgid "Variable attributes"
-msgstr "Variabelattribut"
-
-#: admin/fai/faiDiskEntry.tpl.c:11
-msgid "fstab key"
-msgstr "fstab-nyckel"
-
-#: admin/fai/faiDiskEntry.tpl.c:17
-msgid "Disk label"
-msgstr "Disketikett"
-
-#: admin/fai/faiTemplate.tpl.c:17
-msgid "List of template files"
-msgstr "Lista med mallfiler"
-
-#: admin/fai/faiVariable.tpl.c:17
-msgid "List of assigned variables"
-msgstr "Lista med tilldelade variabler"
-
-#: admin/fai/faiVariable.tpl.c:20
-msgid "Choose a variable to delete or edit"
-msgstr "VÃ¤lj en variabel att ta bort eller redigera"
-
-#: admin/fai/askClassName.tpl.c:2
-msgid ""
-"Adding a new class to the FAI management, requires a class name. You have to"
-" specify a unique class name for unique types of FAI classes, while you can "
-"use the same class name for different types of FAI classes. In the laste "
-"case, FAI will automatically enclose all these different class types to one "
-"unique class name."
-msgstr "Att lÃ¤gga till en ny klass till FAI-hanteringen, krÃ¤ver ett klassnamn. Du behÃ¶ver specificera ett unikt klassnamn fÃ¶r unika typer av FAI-klasser, medan du kan anvÃ¤nda samma klassnamn fÃ¶r olika typer av FAI-klasser. I det senare fallet, kommer FAI att automatiskt foga ihop alla dessa olika klasstyper till ett unikt klassnamn."
-
-#: admin/fai/askClassName.tpl.c:5
-msgid ""
-"Please use one of the following methods to choose the name for the new FAI "
-"class."
-msgstr "AnvÃ¤nd nÃ¥gon av de fÃ¶ljande metoderna fÃ¶r att vÃ¤lja ett namn fÃ¶r den nya FAI-klassen."
-
-#: admin/fai/askClassName.tpl.c:8
-msgid "Enter FAI class name manually"
-msgstr "Skriv in namnet pÃ¥ FAI-klassen manuellt"
-
-#: admin/fai/askClassName.tpl.c:14
-msgid "Choose FAI class name from a list of existing classes"
-msgstr "VÃ¤lj FAI-klassnamn frÃ¥n en lista av existerande klasser"
-
-#: admin/fai/askClassName.tpl.c:20
-msgid "Choose class name"
-msgstr "VÃ¤lj klassnamn"
-
-#: admin/fai/faiGroupHandle.tpl.c:2
-msgid "Please select the objects you want to remove:"
-msgstr "VÃ¤lj objekten du vill ta bort:"
-
-#: admin/fai/faiGroupHandle.tpl.c:5
-msgid "Freezed"
-msgstr "Fryst"
-
-#: admin/fai/faiGroupHandle.tpl.c:8
-msgid "Select the object you want to edit:"
-msgstr "VÃ¤lj objekten du vill redigera:"
-
-#: admin/fai/faiGroupHandle.tpl.c:11
-msgid "Select the object you want to copy:"
-msgstr "VÃ¤lj objektet du vill kopiera:"
-
-#: admin/fai/remove.tpl.c:5
-msgid ""
-"This includes all account data, system access rules, imap settings, etc. for"
-" this user. Please double check if your really want to do this since there "
-"is no way for FusionDirectory to get your data back."
-msgstr "Detta inkluderar alla kontodata, systemrÃ¤ttighetsregler, imapinstÃ¤llningar, etc. fÃ¶r den hÃ¤r anvÃ¤ndaren. VÃ¤nligen dubbelkolla att du verkligen vill gÃ¶ra detta eftersom det inte finns nÃ¥got sÃ¤tt fÃ¶r FusionDirectory att fÃ¥ tillbaka informationen."
-
-#: admin/fai/remove.tpl.c:8 admin/fai/remove_branch.tpl.c:8
-msgid "So - if you're sure - press 'Delete' to continue or 'Cancel' to abort."
-msgstr "SÃ¥ - om du Ã¤r sÃ¤ker - tryck 'Ta bort' fÃ¶r att fortsÃ¤tta och 'Avbryt' fÃ¶r att avbryta."
-
-#: admin/fai/faiHook.tpl.c:17
-msgid "List of hook scripts"
-msgstr "Lista med hook-script"
-
-#: admin/fai/packageSelect/selectPackage-list.tpl.c:2
-#: admin/fai/classSelect/selectClass-list.tpl.c:5
-msgid "Update"
-msgstr "Uppdatera"
-
-#: admin/fai/packageSelect/selectPackage-list.tpl.c:5
-#: admin/fai/classSelect/selectClass-list.tpl.c:8
-msgid "Submit"
-msgstr "Skicka"
-
-#: admin/fai/packageSelect/selectPackage-filter.tpl.c:2
-#: admin/fai/classSelect/selectClass-filter.tpl.c:2
-#: admin/fai/fai-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."
-
-#: admin/fai/remove_branch.tpl.c:5
-msgid ""
-"This includes all account data, system access, etc. for this branch. Please "
-"double check if your really want to do this since there is no way for "
-"FusionDirectory to get your data back."
-msgstr "Detta inkluderar all data, systemtillgÃ¥ng, etc. fÃ¶r den hÃ¤r avgreningen. 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/fai/faiPackage.tpl.c:26
-msgid "Install method"
-msgstr "Installationsmetod"
-
-#: admin/fai/faiPackage.tpl.c:29
-msgid "Please select the installation method"
-msgstr "VÃ¤lj installationsmetod"
-
-#: admin/fai/faiPackage.tpl.c:32 admin/fai/faiPackage.tpl.c:35
-msgid "Used packages"
-msgstr "AnvÃ¤nda paket"
-
-#: admin/fai/faiPackage.tpl.c:38
-msgid "Add from list"
-msgstr "LÃ¤gg till frÃ¥n lista"
-
-#: admin/fai/faiProfileEntry.tpl.c:2
-msgid "List of FAI objects (Fully Automatic Installation)"
-msgstr "Lista av FAI-objekt (Fully Automatic Installation)"
-
-#: admin/fai/faiProfileEntry.tpl.c:5
-msgid "Information"
-msgstr "Information"
-
-#: admin/fai/faiProfileEntry.tpl.c:8
-msgid ""
-"This menu allows you to select FAI class names and to add them to the "
-"currently edited profile."
-msgstr "Den hÃ¤r menyn lÃ¥ter dig vÃ¤lja FAI-klassnamn och lÃ¤gga till dem till profilen som redigeras."
-
-#: admin/fai/faiProfileEntry.tpl.c:11
-msgid "Filters"
-msgstr "Filter"
-
-#: admin/fai/faiProfileEntry.tpl.c:14
-msgid "Show only classes with templates"
-msgstr "Visa bara klasser med mallar"
-
-#: admin/fai/faiProfileEntry.tpl.c:17
-msgid "Show only classes with scripts"
-msgstr "Visa bara klasser med script"
-
-#: admin/fai/faiProfileEntry.tpl.c:20
-msgid "Show only classes with hooks"
-msgstr "Visa bara klasser med hooks"
-
-#: admin/fai/faiProfileEntry.tpl.c:23
-msgid "Show only classes with variables"
-msgstr "Visa bara klasser med variabler"
-
-#: admin/fai/faiProfileEntry.tpl.c:26
-msgid "Show only classes with packages"
-msgstr "Visa bara klasser med paket"
-
-#: admin/fai/faiProfileEntry.tpl.c:29
-msgid "Show only classes with partitions"
-msgstr "Visa bara klasser med partitioner"
-
-#: admin/fai/faiProfileEntry.tpl.c:32 admin/fai/faiProfileEntry.tpl.c:35
-msgid "Display objects matching"
-msgstr "Visa objekt som matchar"
-
-#: admin/fai/faiProfileEntry.tpl.c:38
-msgid "Regular expression for matching object names"
-msgstr "ReguljÃ¤rt uttryck fÃ¶r matchande objektnamn"
-
-#: admin/fai/faiTemplateEntry.tpl.c:17 admin/fai/faiTemplateEntry.tpl.c:20
-msgid "Template attributes"
-msgstr "Mall-attribut"
-
-#: admin/fai/faiTemplateEntry.tpl.c:26 admin/fai/faiTemplateEntry.tpl.c:29
-msgid "Save template"
-msgstr "Spara mall"
-
-#: admin/fai/faiTemplateEntry.tpl.c:32 admin/fai/faiTemplateEntry.tpl.c:35
-msgid "Edit template"
-msgstr "Redigera mall"
-
-#: admin/fai/faiTemplateEntry.tpl.c:38
-msgid "Full path"
-msgstr "Full sÃ¶kvÃ¤g"
-
-#: admin/fai/faiTemplateEntry.tpl.c:41
-msgid "Upload"
-msgstr "Ladda upp"
-
-#: admin/fai/faiTemplateEntry.tpl.c:44
-msgid "Owner"
-msgstr "Ã„gare"
-
-#: admin/fai/faiTemplateEntry.tpl.c:50
-msgid "Access"
-msgstr "TillgÃ¥ng"
-
-#: admin/fai/faiTemplateEntry.tpl.c:53
-msgid "Class"
-msgstr "Klass"
-
-#: admin/fai/faiTemplateEntry.tpl.c:56
-msgid "Read"
-msgstr "LÃ¤s"
-
-#: admin/fai/faiTemplateEntry.tpl.c:59
-msgid "Write"
-msgstr "Skriv"
-
-#: admin/fai/faiTemplateEntry.tpl.c:62
-msgid "Execute"
-msgstr "Exekvera"
-
-#: admin/fai/faiTemplateEntry.tpl.c:65
-msgid "Special"
-msgstr "Special"
-
-#: admin/fai/faiTemplateEntry.tpl.c:71
-msgid "SUID"
-msgstr "SUID"
-
-#: admin/fai/faiTemplateEntry.tpl.c:77
-msgid "SGID"
-msgstr "SGID"
-
-#: admin/fai/faiTemplateEntry.tpl.c:80
-msgid "Others"
-msgstr "Ã–vriga"
-
-#: admin/fai/faiTemplateEntry.tpl.c:83
-msgid "sticky"
-msgstr "klistrad"
-
-#: admin/fai/faiScriptEntry.tpl.c:17 admin/fai/faiScriptEntry.tpl.c:26
-msgid "Script attributes"
-msgstr "Script-attribut"
-
-#: admin/fai/faiScriptEntry.tpl.c:23
-msgid ""
-"Choose a priority. Low values result in an earlier, high values in a later "
-"execution."
-msgstr "VÃ¤lj prioritet. LÃ¥ga vÃ¤rden resulterar i en tidigare exekvering, hÃ¶ga vÃ¤rden i en senare."
-
-#: admin/fai/faiScriptEntry.tpl.c:32 admin/fai/faiHookEntry.tpl.c:32
-msgid "Import script"
-msgstr "Importera script"
-
-#: admin/fai/classSelect/selectClass-list.tpl.c:2
-msgid "Base"
-msgstr "Bas"
-
-#: admin/fai/fai-filter.tpl.c:29
-msgid "Show profiles"
-msgstr "Visa profiler"
-
-#: admin/fai/fai-filter.tpl.c:32
-msgid "Show templates"
-msgstr "Visa mallar"
-
-#: admin/fai/fai-filter.tpl.c:35
-msgid "Show scripts"
-msgstr "Visa script"
-
-#: admin/fai/fai-filter.tpl.c:38
-msgid "Show hooks"
-msgstr "Visa hooks"
-
-#: admin/fai/fai-filter.tpl.c:41
-msgid "Show variables"
-msgstr "Visa variabler"
-
-#: admin/fai/fai-filter.tpl.c:44
-msgid "Show packages"
-msgstr "Visa paket"
-
-#: admin/fai/fai-filter.tpl.c:47
-msgid "Show partitions"
-msgstr "Visa partitioner"
-
-#: admin/fai/faiTemplateEdit.tpl.c:2
-msgid "This FAI template is write protected. Editing may break it!"
-msgstr "Den hÃ¤r FAI-mallen Ã¤r skrivskyddad. Att redigera den kan fÃ¶rstÃ¶ra den!"
-
-#: admin/fai/faiTemplateEdit.tpl.c:5
-msgid "Edit anyway"
-msgstr "Redigera Ã¤ndÃ¥"
-
-#: admin/fai/faiPartitionTable.tpl.c:14
-msgid "Use 'setup-storage' to partition the disk"
-msgstr "AnvÃ¤nd 'setup-storage' fÃ¶r att partitionera disken"
-
-#: admin/fai/faiPartitionTable.tpl.c:20
-msgid "Discs"
-msgstr "Diskar"
-
-#: admin/fai/faiPartitionTable.tpl.c:23 admin/fai/faiPartitionTable.tpl.c:26
-#: admin/fai/faiPartitionTable.tpl.c:41 admin/fai/faiPartitionTable.tpl.c:44
-msgid "Add disk"
-msgstr "LÃ¤gg till disk"
-
-#: admin/fai/faiPartitionTable.tpl.c:29 admin/fai/faiPartitionTable.tpl.c:32
-#: admin/fai/faiPartitionTable.tpl.c:47 admin/fai/faiPartitionTable.tpl.c:50
-msgid "Add RAID"
-msgstr "LÃ¤gg till RAID"
-
-#: admin/fai/faiPartitionTable.tpl.c:35 admin/fai/faiPartitionTable.tpl.c:38
-#: admin/fai/faiPartitionTable.tpl.c:53 admin/fai/faiPartitionTable.tpl.c:56
-msgid "Add volume group"
-msgstr "LÃ¤gg till volymgrupp"
-
-#: admin/fai/faiScript.tpl.c:17
-msgid "List of scripts"
-msgstr "Script-lista"
-
-#: admin/fai/faiProfile.tpl.c:20
-msgid "Choose a priority"
-msgstr "VÃ¤lj prioritet"
-
-#: admin/fai/faiHookEntry.tpl.c:14 admin/fai/faiHookEntry.tpl.c:17
-#: admin/fai/faiHookEntry.tpl.c:26
-msgid "Hook attributes"
-msgstr "Hook-attribut"
-
-#: admin/fai/faiHookEntry.tpl.c:23
-msgid "Choose an existing FAI task"
-msgstr "VÃ¤lj en existerande FAI-Ã¥tgÃ¤rd"
diff --git a/fai/locale/ug/fusiondirectory.po b/fai/locale/ug/fusiondirectory.po
index 200ea068a04196eaee8a6bf56500c5d73986a0c8..56fcc162db443038521095898f3eb2c2b173b559 100644
--- a/fai/locale/ug/fusiondirectory.po
+++ b/fai/locale/ug/fusiondirectory.po
@@ -5,379 +5,188 @@
 # Translators:
 msgid ""
 msgstr ""
-"Project-Id-Version: FusionDirectory-108\n"
+"Project-Id-Version: FusionDirectory-109\n"
 "Report-Msgid-Bugs-To: documentation@lists.fusiondirectory.org\n"
-"POT-Creation-Date: 2015-03-19 21:45+0100\n"
-"PO-Revision-Date: 2015-02-25 15:46+0000\n"
+"POT-Creation-Date: 2014-12-15 17:47+0100\n"
+"PO-Revision-Date: 2014-12-15 16:54+0000\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>\n"
-"Language-Team: Uighur (http://www.transifex.com/projects/p/FusionDirectory-108/language/ug/)\n"
+"Language-Team: Uighur (http://www.transifex.com/projects/p/FusionDirectory-109/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/fai/class_faiScriptEntry.inc:79 admin/fai/class_faiScriptEntry.inc:82
-#: admin/fai/class_faiManagement.inc:240 admin/fai/class_faiManagement.inc:768
-#: admin/fai/class_faiManagement.inc:774
-#: admin/fai/class_faiPartitionTable.inc:268
-#: admin/fai/class_faiPartitionTable.inc:331
-#: admin/fai/class_faiDiskEntry.inc:445 admin/fai/class_FAI.inc:570
-#: admin/fai/class_faiHookEntry.inc:83 admin/fai/class_faiHookEntry.inc:86
-#: admin/fai/class_faiScript.inc:249 admin/fai/class_faiTemplate.inc:232
-#: admin/fai/class_faiHook.inc:259 admin/fai/class_faiVariable.inc:162
-#: admin/systems/class_faiLogView.inc:207
-#: admin/systems/class_faiLogView.inc:242
-msgid "Error"
-msgstr ""
-
-#: admin/fai/class_faiScriptEntry.inc:82 admin/fai/class_faiHookEntry.inc:86
-msgid "file is empty"
-msgstr ""
-
-#: admin/fai/class_faiScriptEntry.inc:102 admin/fai/class_faiHookEntry.inc:102
-#: admin/fai/class_faiScript.inc:349 admin/fai/class_faiScript.inc:374
-#: admin/fai/class_faiTemplate.inc:320 admin/fai/class_faiHook.inc:346
-msgid "Download"
-msgstr ""
-
-#: admin/fai/class_faiScriptEntry.inc:147
-#: admin/fai/class_faiScriptEntry.inc:151
-#: admin/fai/class_faiScriptEntry.inc:154
-#: admin/fai/class_faiScriptEntry.inc:197
-#: admin/fai/class_faiManagement.inc:768 admin/fai/class_faiManagement.inc:774
-#: admin/fai/class_faiPackage.inc:685
-#: admin/fai/class_faiPartitionTable.inc:779
-#: admin/fai/class_faiDiskEntry.inc:702 admin/fai/class_faiDiskEntry.inc:705
-#: admin/fai/class_faiDiskEntry.inc:758
-#: admin/fai/class_faiTemplateEntry.inc:247
-#: admin/fai/class_faiTemplateEntry.inc:312
-#: admin/fai/class_faiPartitionTableEntry.inc:353
-#: admin/fai/class_faiPartitionTableEntry.inc:356
-#: admin/fai/class_faiPartitionTableEntry.inc:360
-#: admin/fai/class_faiPartitionTableEntry.inc:455
-#: admin/fai/packageSelect/selectPackage-list.xml:40
-#: admin/fai/class_faiProfile.inc:414 admin/fai/class_faiProfile.inc:463
-#: admin/fai/class_faiHookEntry.inc:157 admin/fai/class_faiHookEntry.inc:162
-#: admin/fai/class_faiHookEntry.inc:165 admin/fai/class_faiHookEntry.inc:207
-#: admin/fai/class_askClassName.inc:163 admin/fai/class_askClassName.inc:167
-#: admin/fai/class_askClassName.inc:171 admin/fai/class_askClassName.inc:198
-#: admin/fai/class_faiScript.inc:347 admin/fai/class_faiScript.inc:605
-#: admin/fai/classSelect/selectClass-list.xml:28
-#: admin/fai/class_faiTemplate.inc:512
-#: admin/fai/class_faiVariableEntry.inc:103
-#: admin/fai/class_faiVariableEntry.inc:112
-#: admin/fai/class_faiVariableEntry.inc:115
-#: admin/fai/class_faiVariableEntry.inc:149 admin/fai/class_faiHook.inc:531
-#: admin/fai/class_faiVariable.inc:398 admin/fai/fai-list.xml:80
-#: admin/fai/faiPartitionTableEntry.tpl.c:8 admin/fai/faiPartition.tpl.c:5
-#: admin/fai/faiVariableEntry.tpl.c:8 admin/fai/faiDiskEntry.tpl.c:8
-#: admin/fai/faiTemplate.tpl.c:8 admin/fai/faiVariable.tpl.c:8
-#: admin/fai/faiHook.tpl.c:8
-#: admin/fai/packageSelect/selectPackage-filter.tpl.c:8
-#: admin/fai/faiPackage.tpl.c:8 admin/fai/faiScriptEntry.tpl.c:8
-#: admin/fai/classSelect/selectClass-filter.tpl.c:5
-#: admin/fai/fai-filter.tpl.c:50 admin/fai/faiPartitionTable.tpl.c:8
-#: admin/fai/faiScript.tpl.c:8 admin/fai/faiProfile.tpl.c:8
-#: admin/fai/faiHookEntry.tpl.c:8
-msgid "Name"
-msgstr ""
-
-#: admin/fai/class_faiScriptEntry.inc:159 admin/fai/class_faiHookEntry.inc:170
-#: admin/fai/class_faiScript.inc:594 admin/fai/fai-list.xml:122
-#: admin/fai/faiScriptEntry.tpl.c:29 admin/fai/faiHookEntry.tpl.c:29
-msgid "Script"
-msgstr ""
-
-#: admin/fai/class_faiScriptEntry.inc:190
-#: admin/fai/class_faiScriptEntry.inc:199
-msgid "Script entry"
-msgstr ""
-
-#: admin/fai/class_faiScriptEntry.inc:191
-msgid "FAI script entry"
-msgstr ""
-
-#: admin/fai/class_faiScriptEntry.inc:198 admin/fai/class_faiPackage.inc:686
-#: admin/fai/class_faiPartitionTable.inc:780
-#: admin/fai/class_faiDiskEntry.inc:759
-#: admin/fai/class_faiTemplateEntry.inc:313
-#: admin/fai/class_faiPartitionTableEntry.inc:456
-#: admin/fai/class_faiProfile.inc:464 admin/fai/class_faiHookEntry.inc:208
-#: admin/fai/class_faiScript.inc:606 admin/fai/class_faiTemplate.inc:513
-#: admin/fai/class_faiVariableEntry.inc:150 admin/fai/class_faiHook.inc:532
-#: admin/fai/class_faiVariable.inc:399
-#: admin/fai/faiPartitionTableEntry.tpl.c:11 admin/fai/faiPartition.tpl.c:11
-#: admin/fai/faiVariableEntry.tpl.c:11 admin/fai/faiDiskEntry.tpl.c:14
-#: admin/fai/faiTemplate.tpl.c:11 admin/fai/faiVariable.tpl.c:11
-#: admin/fai/faiHook.tpl.c:11 admin/fai/faiPackage.tpl.c:11
-#: admin/fai/faiTemplateEntry.tpl.c:14 admin/fai/faiScriptEntry.tpl.c:11
-#: admin/fai/faiPartitionTable.tpl.c:11 admin/fai/faiScript.tpl.c:11
-#: admin/fai/faiProfile.tpl.c:11 admin/fai/faiHookEntry.tpl.c:11
-msgid "Description"
-msgstr ""
-
-#: admin/fai/class_faiScriptEntry.inc:200
-msgid "Script Priority"
-msgstr ""
-
-#: admin/fai/class_faiManagement.inc:188
-msgid "partition table"
-msgstr ""
-
-#: admin/fai/class_faiManagement.inc:189 admin/fai/fai-list.xml:31
-msgid "script"
-msgstr ""
-
-#: admin/fai/class_faiManagement.inc:190 admin/fai/fai-list.xml:47
-msgid "hook"
-msgstr ""
-
-#: admin/fai/class_faiManagement.inc:191 admin/fai/fai-list.xml:39
-msgid "variable"
-msgstr ""
-
-#: admin/fai/class_faiManagement.inc:192 admin/fai/fai-list.xml:63
-msgid "template"
-msgstr ""
-
-#: admin/fai/class_faiManagement.inc:193
-msgid "package list"
-msgstr ""
-
-#: admin/fai/class_faiManagement.inc:210 admin/fai/class_faiManagement.inc:226
-#: admin/fai/class_faiManagement.inc:332 admin/fai/class_faiManagement.inc:390
-#: admin/fai/class_faiManagement.inc:480 admin/fai/class_faiManagement.inc:575
-#: admin/fai/class_faiManagement.inc:598 admin/fai/class_faiManagement.inc:619
-msgid "Permission error"
-msgstr ""
-
-#: admin/fai/class_faiManagement.inc:211 admin/fai/class_faiManagement.inc:226
-#, php-format
-msgid "You have no permission to create a new %s!"
-msgstr ""
-
-#: admin/fai/class_faiManagement.inc:226 admin/fai/fai-list.xml:55
-msgid "profile"
-msgstr ""
-
-#: admin/fai/class_faiManagement.inc:328
-msgid "Branch locked"
-msgstr ""
-
-#: admin/fai/class_faiManagement.inc:329
-#, php-format
-msgid "The following entries are locked, you can't remove them %s."
-msgstr ""
-
-#: admin/fai/class_faiManagement.inc:346
-msgid "FAI object"
-msgstr ""
-
-#: admin/fai/class_faiManagement.inc:477
-msgid "FAI branch/freeze"
-msgstr ""
-
-#: admin/fai/class_faiManagement.inc:480
-msgid "You have no permission to delete this release!"
-msgstr ""
-
-#: admin/fai/class_faiManagement.inc:496 admin/fai/remove.tpl.c:2
-#: admin/fai/remove_branch.tpl.c:2
-msgid "Warning"
-msgstr ""
-
-#: admin/fai/class_faiManagement.inc:496
-msgid "Release remove aborted because the release name check failed!"
-msgstr ""
-
-#: admin/fai/class_faiManagement.inc:573 admin/fai/class_faiManagement.inc:596
-msgid "Configuration"
-msgstr ""
-
-#: admin/fai/class_faiManagement.inc:575 admin/fai/class_faiManagement.inc:598
-#: admin/fai/class_faiManagement.inc:619
-msgid "Branch"
-msgstr ""
-
-#: admin/fai/class_faiManagement.inc:725 admin/fai/askClassName.tpl.c:23
-msgid "Continue"
-msgstr ""
-
-#: admin/fai/class_faiManagement.inc:926
-#: admin/fai/class_faiPartitionTable.inc:768
-#: admin/fai/class_faiProfile.inc:318 admin/fai/class_askClassName.inc:99
-#: admin/fai/classSelect/class_classSelect.inc:58
-#: admin/fai/class_faiGroupHandle.inc:120
-#: admin/fai/class_faiProfileEntry.inc:163 admin/fai/fai-list.xml:146
-msgid "Partition table"
+#: admin/fai/class_faiManagement.inc:117 admin/fai/class_faiManagement.inc:122
+#: admin/fai/packageSelect/selectPackage-list.xml:14
+#: admin/systems/class_faiStartup.inc:178 config/fai/class_faiConfig.inc:41
+msgid "FAI"
 msgstr ""
 
-#: admin/fai/class_faiManagement.inc:928
-#: admin/fai/class_faiGroupHandle.inc:122 admin/fai/fai-list.xml:140
-msgid "Package list"
+#: admin/fai/class_faiManagement.inc:118
+msgid "Manage FAI software packages and deployment recipes"
 msgstr ""
 
-#: admin/fai/class_faiManagement.inc:930
-#: admin/fai/class_faiGroupHandle.inc:124
-msgid "Scripts"
+#: admin/fai/class_faiPackage.inc:157
+msgid "Mark for installation"
 msgstr ""
 
-#: admin/fai/class_faiManagement.inc:932
-#: admin/fai/class_faiGroupHandle.inc:126
-msgid "Variables"
+#: admin/fai/class_faiPackage.inc:161
+msgid "Mark for removal"
 msgstr ""
 
-#: admin/fai/class_faiManagement.inc:934
-#: admin/fai/class_faiGroupHandle.inc:128
-msgid "Hooks"
+#: admin/fai/class_faiPackage.inc:166
+msgid "Edit configuration"
 msgstr ""
 
-#: admin/fai/class_faiManagement.inc:936 admin/fai/class_faiProfile.inc:454
-#: admin/fai/class_askClassName.inc:104 admin/fai/class_faiGroupHandle.inc:130
-#: admin/fai/fai-list.xml:110
-msgid "Profile"
+#: admin/fai/class_faiPackage.inc:247
+#: admin/fai/class_faiPartitionTable.inc:209
+#: admin/fai/class_faiPartitionTable.inc:250
+#: admin/fai/class_faiTemplate.inc:114
+#: admin/systems/services/repository/class_serviceDebianRepository.inc:172
+#: admin/systems/services/repository/class_serviceDebianRepository.inc:189
+#: admin/systems/services/repository/class_serviceDebianRepository.inc:193
+msgid "LDAP error"
 msgstr ""
 
-#: admin/fai/class_faiManagement.inc:938
-#: admin/fai/class_faiGroupHandle.inc:132
-msgid "Templates"
+#: admin/fai/class_faiPackage.inc:279
+#: admin/fai/packageSelect/class_filterFAIPackages.inc:41
+#: admin/fai/packageSelect/class_filterFAIPackages.inc:46
+#: admin/fai/class_faiPackageConfiguration.inc:55
+#: admin/systems/class_faiStartup.inc:133
+#: admin/systems/class_faiStartup.inc:160
+msgid "Service infrastructure"
 msgstr ""
 
-#: admin/fai/class_faiManagement.inc:1039
-#: admin/fai/class_faiManagement.inc:1045
-#: admin/fai/packageSelect/selectPackage-list.xml:14
-#: admin/fai/classSelect/selectClass-list.xml:15
-#: admin/systems/class_faiStartup.inc:177 config/fai/class_faiConfig.inc:41
-msgid "FAI"
+#: admin/fai/class_faiPackage.inc:294
+msgid "Unkown packages"
 msgstr ""
 
-#: admin/fai/class_faiManagement.inc:1040
-msgid "Manage FAI software packages and deployment recipes"
+#: admin/fai/class_faiPackage.inc:365
+msgid "Package"
 msgstr ""
 
-#: admin/fai/class_faiPackage.inc:261
-msgid "Invalid package names"
+#: admin/fai/class_faiPackage.inc:366
+msgid "FAI Package list"
 msgstr ""
 
-#: admin/fai/class_faiPackage.inc:262
-#, php-format
-msgid "The following package names don't match the Debian policy: %s"
+#: admin/fai/class_faiPackage.inc:369
+msgid "FAI Package"
 msgstr ""
 
-#: admin/fai/class_faiPackage.inc:421 admin/fai/class_faiPackage.inc:422
-msgid "Configured"
+#: admin/fai/class_faiPackage.inc:385
+#: admin/fai/class_faiPartitionTable.inc:304
+#: admin/fai/class_faiTemplateEntry.inc:140 admin/fai/class_faiProfile.inc:47
+#: admin/fai/class_faiScript.inc:50 admin/fai/class_faiTemplate.inc:173
+#: admin/fai/class_faiHook.inc:50 admin/fai/class_faiVariable.inc:50
+msgid "Properties"
 msgstr ""
 
-#: admin/fai/class_faiPackage.inc:428 admin/fai/class_faiPackage.inc:429
-msgid "Package marked for removal"
+#: admin/fai/class_faiPackage.inc:388
+#: admin/fai/class_faiPartitionTable.inc:307 admin/fai/class_faiProfile.inc:50
+#: admin/fai/class_faiScript.inc:53 admin/fai/class_faiTemplate.inc:176
+#: admin/fai/class_faiHook.inc:53 admin/fai/class_faiVariable.inc:53
+msgid "Class name"
 msgstr ""
 
-#: admin/fai/class_faiPackage.inc:445
-msgid "Mark package for removal"
+#: admin/fai/class_faiPackage.inc:388 admin/fai/class_faiScript.inc:53
+#: admin/fai/class_faiHook.inc:53 admin/fai/class_faiVariable.inc:53
+msgid "Variables class name"
 msgstr ""
 
-#: admin/fai/class_faiPackage.inc:451
-msgid "Configure this package"
+#: admin/fai/class_faiPackage.inc:392
+#: admin/fai/class_faiPartitionTable.inc:311
+#: admin/fai/class_faiDiskEntry.inc:738
+#: admin/fai/class_faiTemplateEntry.inc:147 admin/fai/class_faiProfile.inc:54
+#: admin/fai/class_faiScript.inc:57 admin/fai/class_faiScript.inc:75
+#: admin/fai/class_faiTemplate.inc:180 admin/fai/class_faiHook.inc:57
+#: admin/fai/class_faiHook.inc:75 admin/fai/class_faiVariable.inc:57
+#: admin/fai/class_faiVariable.inc:75
+msgid "Description"
 msgstr ""
 
-#: admin/fai/class_faiPackage.inc:455
-msgid "Remove this package"
+#: admin/fai/class_faiPackage.inc:392
+#: admin/fai/class_faiPartitionTable.inc:311 admin/fai/class_faiProfile.inc:54
+#: admin/fai/class_faiScript.inc:57 admin/fai/class_faiTemplate.inc:180
+#: admin/fai/class_faiHook.inc:57 admin/fai/class_faiVariable.inc:57
+msgid "Short description of the class"
 msgstr ""
 
-#: admin/fai/class_faiPackage.inc:534
-msgid "Please select a least one package!"
+#: admin/fai/class_faiPackage.inc:398 admin/systems/class_faiStartup.inc:90
+msgid "Repository"
 msgstr ""
 
-#: admin/fai/class_faiPackage.inc:538
-msgid ""
-"Please choose a valid release/section combination for your repository setup!"
+#: admin/fai/class_faiPackage.inc:401 admin/systems/class_faiStartup.inc:78
+#: admin/systems/services/repository/class_serviceDebianRepository.inc:52
+#: admin/systems/services/repository/class_serviceCentosRepository.inc:49
+msgid "Release"
 msgstr ""
 
-#: admin/fai/class_faiPackage.inc:571
-#: admin/fai/packageSelect/class_filterFAIPackages.inc:41
-#: admin/fai/packageSelect/class_filterFAIPackages.inc:46
-#: admin/fai/class_faiPackageConfiguration.inc:55
-#: admin/systems/class_faiStartup.inc:132
-#: admin/systems/class_faiStartup.inc:159
-msgid "Infrastructure service"
+#: admin/fai/class_faiPackage.inc:401
+msgid "Debian release concerned"
 msgstr ""
 
-#: admin/fai/class_faiPackage.inc:587
-msgid "Unkown packages"
+#: admin/fai/class_faiPackage.inc:405
+#: admin/systems/services/repository/class_serviceDebianRepository.inc:58
+msgid "Sections"
 msgstr ""
 
-#: admin/fai/class_faiPackage.inc:674
-#: admin/fai/faiPackageConfiguration.tpl.c:2
-msgid "Package"
+#: admin/fai/class_faiPackage.inc:405
+msgid "Sections concerned"
 msgstr ""
 
-#: admin/fai/class_faiPackage.inc:675
-msgid "FAI Package list"
+#: admin/fai/class_faiPackage.inc:409
+msgid "Install method"
 msgstr ""
 
-#: admin/fai/class_faiPackage.inc:679
-msgid "FAI Package"
+#: admin/fai/class_faiPackage.inc:409
+msgid "Install method to use for this package list"
 msgstr ""
 
-#: admin/fai/class_faiPackage.inc:687
+#: admin/fai/class_faiPackage.inc:420
 msgid "Packages"
 msgstr ""
 
-#: admin/fai/class_faiPackage.inc:688 admin/fai/faiPackage.tpl.c:23
-msgid "Section"
-msgstr ""
-
-#: admin/fai/class_faiPackage.inc:688 admin/fai/class_faiPackage.inc:691
-#: admin/fai/class_faiScript.inc:605 admin/fai/class_faiTemplate.inc:512
-msgid "Readonly"
+#: admin/fai/class_faiPackage.inc:424
+msgid "Packages in this class"
 msgstr ""
 
-#: admin/fai/class_faiPackage.inc:689
-msgid "Install Method"
+#: admin/fai/class_faiPartitionTable.inc:61
+#: admin/fai/class_faiDiskEntry.inc:442 admin/systems/class_faiLogView.inc:207
+#: admin/systems/class_faiLogView.inc:242
+msgid "Error"
 msgstr ""
 
-#: admin/fai/class_faiPackage.inc:690
-msgid "Package configuration"
+#: admin/fai/class_faiPartitionTable.inc:112
+msgid "Add RAID"
 msgstr ""
 
-#: admin/fai/class_faiPackage.inc:691 admin/systems/class_faiStartup.inc:78
-#: admin/systems/services/repository/class_serviceRepository.inc:40
-#: admin/fai/branch_selector.tpl.c:14 admin/fai/faiPackage.tpl.c:20
-#: admin/fai/fai-filter.tpl.c:5 admin/fai/fai-filter.tpl.c:14
-msgid "Release"
+#: admin/fai/class_faiPartitionTable.inc:116
+msgid "Add LVM"
 msgstr ""
 
-#: admin/fai/class_faiPartitionTable.inc:269
-#: admin/fai/class_faiDiskEntry.inc:446
-#, php-format
-msgid ""
-"The disk cannot be deleted while it is used in the '%s' disk definition!"
+#: admin/fai/class_faiPartitionTable.inc:284
+msgid "Partition table"
 msgstr ""
 
-#: admin/fai/class_faiPartitionTable.inc:416 admin/fai/class_faiScript.inc:360
-#: admin/fai/class_faiScript.inc:362 admin/fai/class_faiTemplate.inc:306
-#: admin/fai/class_faiTemplate.inc:308
-msgid "edit"
+#: admin/fai/class_faiPartitionTable.inc:285
+#: admin/fai/class_faiPartitionTable.inc:288
+msgid "FAI partition table"
 msgstr ""
 
-#: admin/fai/class_faiPartitionTable.inc:418 admin/fai/class_faiScript.inc:364
-#: admin/fai/class_faiTemplate.inc:310
-msgid "delete"
+#: admin/fai/class_faiPartitionTable.inc:307 admin/fai/class_faiProfile.inc:50
+msgid "Partition table class name"
 msgstr ""
 
-#: admin/fai/class_faiPartitionTable.inc:769
-#: admin/fai/class_faiPartitionTable.inc:773
-msgid "FAI partition table"
+#: admin/fai/class_faiPartitionTable.inc:317
+msgid "Discs"
 msgstr ""
 
-#: admin/fai/class_faiPartitionTable.inc:779 admin/fai/class_faiHook.inc:531
-#: admin/fai/class_faiVariable.inc:398
-msgid "Read only"
+#: admin/fai/class_faiPartitionTable.inc:324
+msgid "Partitions in this class"
 msgstr ""
 
 #: admin/fai/class_faiDiskEntry.inc:273
-#: admin/fai/faiPartitionTableEntry.tpl.c:5 admin/fai/faiDiskEntry.tpl.c:5
 msgid "Device"
 msgstr ""
 
@@ -389,103 +198,103 @@ msgstr ""
 msgid "UUID"
 msgstr ""
 
-#: admin/fai/class_faiDiskEntry.inc:345
+#: admin/fai/class_faiDiskEntry.inc:344
 msgid "Disks"
 msgstr ""
 
-#: admin/fai/class_faiDiskEntry.inc:348 admin/fai/class_faiPartition.inc:321
-#: admin/fai/faiPartition.tpl.c:14
+#: admin/fai/class_faiDiskEntry.inc:347 admin/fai/class_faiPartition.inc:319
 msgid "Size"
 msgstr ""
 
-#: admin/fai/class_faiDiskEntry.inc:544
+#: admin/fai/class_faiDiskEntry.inc:443
+#, php-format
+msgid ""
+"The disk cannot be deleted while it is used in the '%s' disk definition!"
+msgstr ""
+
+#: admin/fai/class_faiDiskEntry.inc:536
 msgid "encrypted"
 msgstr ""
 
-#: admin/fai/class_faiDiskEntry.inc:547
+#: admin/fai/class_faiDiskEntry.inc:539
 msgid "bootable"
 msgstr ""
 
-#: admin/fai/class_faiDiskEntry.inc:550
+#: admin/fai/class_faiDiskEntry.inc:542
 msgid "preserve"
 msgstr ""
 
-#: admin/fai/class_faiDiskEntry.inc:735
+#: admin/fai/class_faiDiskEntry.inc:687 admin/fai/class_faiDiskEntry.inc:690
+#: admin/fai/class_faiDiskEntry.inc:737
+#: admin/fai/packageSelect/selectPackage-list.xml:40
+#: admin/fai/class_faiScript.inc:71 admin/fai/class_faiHook.inc:71
+#: admin/fai/class_faiVariable.inc:71
+#: admin/fai/class_faiSimplePluginClass.inc:50
+msgid "Name"
+msgstr ""
+
+#: admin/fai/class_faiDiskEntry.inc:717
 msgid ""
 "You have more than four primary partition table entries in your "
 "configuration, please check your configuration twice."
 msgstr ""
 
-#: admin/fai/class_faiDiskEntry.inc:739
+#: admin/fai/class_faiDiskEntry.inc:721
 msgid ""
 "You cannot have more than three primary partition while using logical "
 "partitions, please check your configuration twice."
 msgstr ""
 
-#: admin/fai/class_faiDiskEntry.inc:752
-#: admin/fai/class_faiPartitionTableEntry.inc:448
+#: admin/fai/class_faiDiskEntry.inc:733
 msgid "Partition table entry"
 msgstr ""
 
-#: admin/fai/class_faiDiskEntry.inc:753
-#: admin/fai/class_faiPartitionTableEntry.inc:449
+#: admin/fai/class_faiDiskEntry.inc:734
 msgid "FAI partition table entry"
 msgstr ""
 
-#: admin/fai/class_faiDiskEntry.inc:760
+#: admin/fai/class_faiDiskEntry.inc:739
 msgid "Disk options"
 msgstr ""
 
-#: admin/fai/class_faiDiskEntry.inc:761
-#: admin/fai/class_faiPartitionTableEntry.inc:457
+#: admin/fai/class_faiDiskEntry.inc:740
 msgid "Partition type"
 msgstr ""
 
-#: admin/fai/class_faiDiskEntry.inc:762
-#: admin/fai/class_faiPartitionTableEntry.inc:458
+#: admin/fai/class_faiDiskEntry.inc:741
 msgid "Partition no."
 msgstr ""
 
-#: admin/fai/class_faiDiskEntry.inc:763
-#: admin/fai/class_faiPartitionTableEntry.inc:459
+#: admin/fai/class_faiDiskEntry.inc:742
 msgid "File system type"
 msgstr ""
 
-#: admin/fai/class_faiDiskEntry.inc:764
-#: admin/fai/class_faiPartitionTableEntry.inc:171
-#: admin/fai/class_faiPartitionTableEntry.inc:460
-#: admin/fai/class_faiPartition.inc:437 admin/fai/faiPartition.tpl.c:47
+#: admin/fai/class_faiDiskEntry.inc:743 admin/fai/class_faiPartition.inc:432
 msgid "Mount point"
 msgstr ""
 
-#: admin/fai/class_faiDiskEntry.inc:765
-#: admin/fai/class_faiPartitionTableEntry.inc:461
-#: admin/fai/class_faiPartition.inc:402 admin/fai/class_faiPartition.inc:407
+#: admin/fai/class_faiDiskEntry.inc:744 admin/fai/class_faiPartition.inc:397
+#: admin/fai/class_faiPartition.inc:402
 msgid "Partition size"
 msgstr ""
 
-#: admin/fai/class_faiDiskEntry.inc:766
-#: admin/fai/class_faiPartitionTableEntry.inc:173
-#: admin/fai/class_faiPartitionTableEntry.inc:462
-#: admin/fai/faiPartition.tpl.c:50
+#: admin/fai/class_faiDiskEntry.inc:745
 msgid "Mount options"
 msgstr ""
 
-#: admin/fai/class_faiDiskEntry.inc:767
-#: admin/fai/class_faiPartitionTableEntry.inc:463
+#: admin/fai/class_faiDiskEntry.inc:746
 msgid "File system options"
 msgstr ""
 
-#: admin/fai/class_faiDiskEntry.inc:768
-#: admin/fai/class_faiPartitionTableEntry.inc:464
+#: admin/fai/class_faiDiskEntry.inc:747
 msgid "Partition flags"
 msgstr ""
 
-#: admin/fai/class_debconfTemplate.inc:227
+#: admin/fai/class_debconfTemplate.inc:225
 msgid "This package has no debconf options."
 msgstr ""
 
-#: admin/fai/class_debconfTemplate.inc:264
+#: admin/fai/class_debconfTemplate.inc:262
 msgid ""
 "This debconf question is dynamically generated during package installation "
 "and requires choosing between specific options which cannot be presented "
@@ -493,217 +302,59 @@ msgid ""
 " effect."
 msgstr ""
 
-#: admin/fai/class_faiTemplateEntry.inc:139
-msgid "no file uploaded yet"
-msgstr ""
-
-#: admin/fai/class_faiTemplateEntry.inc:142
-#, php-format
-msgid "exists in database (size: %s bytes)"
-msgstr ""
-
-#: admin/fai/class_faiTemplateEntry.inc:251
-#: admin/systems/class_faiLogView.inc:70 admin/fai/faiTemplateEntry.tpl.c:23
-msgid "File"
-msgstr ""
-
-#: admin/fai/class_faiTemplateEntry.inc:255
-#: admin/fai/faiTemplateEntry.tpl.c:11
-msgid "Destination path"
+#: admin/fai/class_faiTemplateEntry.inc:143
+msgid "File path"
 msgstr ""
 
-#: admin/fai/class_faiTemplateEntry.inc:260 admin/fai/faiTemplateEntry.tpl.c:8
-msgid "File name"
+#: admin/fai/class_faiTemplateEntry.inc:143
+msgid "Complete absolute template file path and name"
 msgstr ""
 
-#: admin/fai/class_faiTemplateEntry.inc:264
-#: admin/fai/class_faiTemplateEntry.inc:266
-#: admin/fai/faiTemplateEntry.tpl.c:68
-msgid "User"
+#: admin/fai/class_faiTemplateEntry.inc:147
+msgid "Short description of the file"
 msgstr ""
 
-#: admin/fai/class_faiTemplateEntry.inc:270
-#: admin/fai/class_faiTemplateEntry.inc:273
-#: admin/fai/class_faiTemplateEntry.inc:275
-#: admin/fai/faiTemplateEntry.tpl.c:47 admin/fai/faiTemplateEntry.tpl.c:74
-msgid "Group"
+#: admin/fai/class_faiTemplateEntry.inc:156
+msgid "Template attributes"
 msgstr ""
 
-#: admin/fai/class_faiTemplateEntry.inc:305
-msgid "Template entry"
+#: admin/fai/class_faiTemplateEntry.inc:160
+msgid "Template file content"
 msgstr ""
 
-#: admin/fai/class_faiTemplateEntry.inc:306
-msgid "FAI template entry"
+#: admin/fai/class_faiTemplateEntry.inc:160
+msgid "Content of the template file"
 msgstr ""
 
-#: admin/fai/class_faiTemplateEntry.inc:314
-msgid "Template file"
+#: admin/fai/class_faiTemplateEntry.inc:164
+msgid "Owner and group of the file"
 msgstr ""
 
-#: admin/fai/class_faiTemplateEntry.inc:315
-msgid "Template path"
+#: admin/fai/class_faiTemplateEntry.inc:167
+msgid "Owner"
 msgstr ""
 
-#: admin/fai/class_faiTemplateEntry.inc:316
+#: admin/fai/class_faiTemplateEntry.inc:167
 msgid "File owner"
 msgstr ""
 
-#: admin/fai/class_faiTemplateEntry.inc:317
-msgid "File permissions"
-msgstr ""
-
-#: admin/fai/class_FAI.inc:287 admin/fai/class_FAI.inc:679
-#: admin/fai/class_FAI.inc:1266 admin/fai/class_FAI.inc:1283
-#: admin/fai/class_FAI.inc:1287
-msgid "LDAP error"
-msgstr ""
-
-#: admin/fai/class_FAI.inc:570
-#, php-format
-msgid "Error, following objects should be equal '%s' and '%s'"
-msgstr ""
-
-#: admin/fai/class_FAI.inc:891
-#, php-format
-msgid "Creating group application release for %s"
-msgstr ""
-
-#: admin/fai/class_FAI.inc:960 admin/fai/class_FAI.inc:982
-#: admin/fai/class_FAI.inc:1022 admin/fai/class_FAI.inc:1027
-#: admin/fai/class_FAI.inc:1065
-msgid "Object"
-msgstr ""
-
-#: admin/fai/class_FAI.inc:961
-#, php-format
-msgid "Adding missing group application release container %s."
-msgstr ""
-
-#: admin/fai/class_FAI.inc:983
-#, php-format
-msgid "Adding group application release container %s."
-msgstr ""
-
-#: admin/fai/class_FAI.inc:1023
-#, php-format
-msgid "Could not create menu entry %s. (Already exists)."
-msgstr ""
-
-#: admin/fai/class_FAI.inc:1028
-#, php-format
-msgid "Created group application menu entry for %s."
-msgstr ""
-
-#: admin/fai/class_FAI.inc:1059
-#, php-format
-msgid "Creating copy of %s"
-msgstr ""
-
-#: admin/fai/class_FAI.inc:1062
-msgid "Processing"
-msgstr ""
-
-#: admin/fai/class_FAI.inc:1080
-msgid "Could not create new release, the destination dn is already in use."
-msgstr ""
-
-#: admin/fai/class_FAI.inc:1093
-msgid "Error while fetching source dn - aborted!"
-msgstr ""
-
-#: admin/fai/class_FAI.inc:1174
-msgid "Fatal error"
-msgstr ""
-
-#: admin/fai/class_FAI.inc:1175
-#, php-format
-msgid ""
-"Release creation failed due to ldap errors. Additional informations '%s'."
-msgstr ""
-
-#: admin/fai/class_faiPartitionTableEntry.inc:162
-msgid "primary"
-msgstr ""
-
-#: admin/fai/class_faiPartitionTableEntry.inc:162
-msgid "logical"
-msgstr ""
-
-#: admin/fai/class_faiPartitionTableEntry.inc:169
-#: admin/fai/faiPartition.tpl.c:8
-msgid "Type"
-msgstr ""
-
-#: admin/fai/class_faiPartitionTableEntry.inc:170
-msgid "FS type"
-msgstr ""
-
-#: admin/fai/class_faiPartitionTableEntry.inc:172
-msgid "Size in MB"
-msgstr ""
-
-#: admin/fai/class_faiPartitionTableEntry.inc:174
-msgid "FS option"
-msgstr ""
-
-#: admin/fai/class_faiPartitionTableEntry.inc:175
-#: admin/fai/faiPartition.tpl.c:23
-msgid "Preserve"
-msgstr ""
-
-#: admin/fai/class_faiPartitionTableEntry.inc:266
-msgid "False"
-msgstr ""
-
-#: admin/fai/class_faiPartitionTableEntry.inc:268
-msgid "True"
-msgstr ""
-
-#: admin/fai/class_faiPartitionTableEntry.inc:272
-#: admin/fai/class_faiPartitionTableEntry.inc:274 admin/fai/fai-list.xml:159
-#: admin/fai/fai-list.xml:198
-msgid "Remove"
-msgstr ""
-
-#: admin/fai/class_faiPartitionTableEntry.inc:384
-#, php-format
-msgid "please enter a unique mount point for partition %s"
-msgstr ""
-
-#: admin/fai/class_faiPartitionTableEntry.inc:389
-#, php-format
-msgid "partition %s mount point"
-msgstr ""
-
-#: admin/fai/class_faiPartitionTableEntry.inc:394
-#, php-format
-msgid ""
-"File system type 'swap' is already used, change file system type for "
-"partition %s."
+#: admin/fai/class_faiTemplateEntry.inc:172
+msgid "Group"
 msgstr ""
 
-#: admin/fai/class_faiPartitionTableEntry.inc:398
-msgid "Please use 'swap' as mount point, if 'swap' is used as fs-type."
+#: admin/fai/class_faiTemplateEntry.inc:172
+msgid "File group"
 msgstr ""
 
-#: admin/fai/class_faiPartitionTableEntry.inc:404
-#: admin/fai/class_faiPartitionTableEntry.inc:408
-#: admin/fai/class_faiPartitionTableEntry.inc:414
-#: admin/fai/class_faiPartitionTableEntry.inc:416
-#: admin/fai/class_faiPartitionTableEntry.inc:421
-#, php-format
-msgid "partition %s size"
+#: admin/fai/class_faiTemplateEntry.inc:181
+msgid "Access"
 msgstr ""
 
-#: admin/fai/class_faiPartitionTableEntry.inc:436
-msgid ""
-"You have more than 3 primary partition table entries in your configuration, "
-"please check your configuration twice."
+#: admin/fai/class_faiTemplateEntry.inc:181
+msgid "Access rights"
 msgstr ""
 
 #: admin/fai/packageSelect/selectPackage-list.xml:10
-#: admin/fai/classSelect/selectClass-list.xml:11
 msgid "Please select the desired entries"
 msgstr ""
 
@@ -711,147 +362,94 @@ msgstr ""
 msgid "Version"
 msgstr ""
 
-#: admin/fai/class_faiProfile.inc:310
-msgid "This list displays all assigned class names for this profile."
-msgstr ""
-
-#: admin/fai/class_faiProfile.inc:313 admin/fai/class_askClassName.inc:103
-#: admin/fai/classSelect/class_classSelect.inc:53
-#: admin/fai/class_faiProfileEntry.inc:158
-msgid "Hook bundle"
-msgstr ""
-
-#: admin/fai/class_faiProfile.inc:314 admin/fai/class_askClassName.inc:105
-#: admin/fai/classSelect/class_classSelect.inc:54
-#: admin/fai/class_faiProfileEntry.inc:159
-msgid "Template bundle"
-msgstr ""
-
-#: admin/fai/class_faiProfile.inc:315 admin/fai/class_askClassName.inc:101
-#: admin/fai/classSelect/class_classSelect.inc:55
-#: admin/fai/class_faiProfileEntry.inc:160
-msgid "Script bundle"
-msgstr ""
-
-#: admin/fai/class_faiProfile.inc:316 admin/fai/class_askClassName.inc:102
-#: admin/fai/classSelect/class_classSelect.inc:56
-#: admin/fai/class_faiProfileEntry.inc:161
-msgid "Variable bundle"
-msgstr ""
-
-#: admin/fai/class_faiProfile.inc:317 admin/fai/class_askClassName.inc:100
-#: admin/fai/classSelect/class_classSelect.inc:57
-#: admin/fai/class_faiProfileEntry.inc:162
-msgid "Package bundle"
-msgstr ""
-
-#: admin/fai/class_faiProfile.inc:321
-msgid "Remove class from profile"
-msgstr ""
-
-#: admin/fai/class_faiProfile.inc:324
-msgid "Up"
-msgstr ""
-
-#: admin/fai/class_faiProfile.inc:325
-msgid "Down"
-msgstr ""
-
-#: admin/fai/class_faiProfile.inc:410
-msgid "No class specified for this profile!"
-msgstr ""
-
-#: admin/fai/class_faiProfile.inc:419
-msgid "You can't use the same name for a class and a profile!"
+#: admin/fai/class_faiProfile.inc:28
+msgid "Profile"
 msgstr ""
 
-#: admin/fai/class_faiProfile.inc:455
+#: admin/fai/class_faiProfile.inc:29
 msgid "FAI profile"
 msgstr ""
 
-#: admin/fai/class_faiProfile.inc:458
+#: admin/fai/class_faiProfile.inc:32
 msgid "FAI Profile"
 msgstr ""
 
-#: admin/fai/class_faiProfile.inc:465 admin/fai/faiProfile.tpl.c:17
+#: admin/fai/class_faiProfile.inc:61
 msgid "FAI classes"
 msgstr ""
 
-#: admin/fai/class_faiHookEntry.inc:200
-msgid "Hook entry"
+#: admin/fai/class_faiProfile.inc:61
+msgid "FAI classes which are part of this profile"
 msgstr ""
 
-#: admin/fai/class_faiHookEntry.inc:201
-msgid "FAI hook entry"
+#: admin/fai/class_faiPackageConfiguration.inc:88
+#, php-format
+msgid "Debconf information for package '%s'"
 msgstr ""
 
-#: admin/fai/class_faiHookEntry.inc:209 admin/fai/faiHookEntry.tpl.c:20
-msgid "Task"
+#: admin/fai/class_faiScript.inc:30 admin/fai/class_faiScript.inc:84
+#: admin/fai/class_faiHook.inc:87
+msgid "Script"
 msgstr ""
 
-#: admin/fai/class_faiHookEntry.inc:210 admin/fai/class_faiScript.inc:595
-#: admin/fai/class_faiScript.inc:599
+#: admin/fai/class_faiScript.inc:31 admin/fai/class_faiScript.inc:34
 msgid "FAI script"
 msgstr ""
 
-#: admin/fai/class_faiPackageConfiguration.inc:88
-#, php-format
-msgid "Debconf information for package '%s'"
+#: admin/fai/class_faiScript.inc:63
+msgid "Scripts"
 msgstr ""
 
-#: admin/fai/class_askClassName.inc:99 admin/fai/class_askClassName.inc:100
-#: admin/fai/class_askClassName.inc:101 admin/fai/class_askClassName.inc:102
-#: admin/fai/class_askClassName.inc:103 admin/fai/class_askClassName.inc:104
-#: admin/fai/class_askClassName.inc:105 admin/fai/class_askClassName.inc:106
-msgid "Create new FAI object"
+#: admin/fai/class_faiScript.inc:67 admin/fai/class_faiHook.inc:67
+#: admin/fai/class_faiVariable.inc:67
+msgid "Variables in this class"
 msgstr ""
 
-#: admin/fai/class_faiTemplateEdit.inc:80
-#, php-format
-msgid ""
-"The file encodig has changed from '%s' to '%s'. Do you really want to save?"
+#: admin/fai/class_faiScript.inc:71 admin/fai/class_faiHook.inc:71
+#: admin/fai/class_faiVariable.inc:71
+msgid "The name of the variable"
 msgstr ""
 
-#: admin/fai/class_faiScript.inc:333 admin/fai/class_faiScript.inc:335
-msgid "Sort direction"
+#: admin/fai/class_faiScript.inc:75 admin/fai/class_faiHook.inc:75
+#: admin/fai/class_faiVariable.inc:75
+msgid "A short description of the variable"
 msgstr ""
 
-#: admin/fai/class_faiScript.inc:348 admin/fai/faiScriptEntry.tpl.c:20
+#: admin/fai/class_faiScript.inc:79
 msgid "Priority"
 msgstr ""
 
-#: admin/fai/class_faiScript.inc:350
-msgid "Action"
+#: admin/fai/class_faiScript.inc:79
+msgid "Priority of this script (FIXME: less is done first?)"
 msgstr ""
 
-#: admin/fai/classSelect/selectClass-list.xml:36 admin/fai/fai-list.xml:88
-#: admin/fai/faiScriptEntry.tpl.c:14
-msgid "Properties"
+#: admin/fai/class_faiScript.inc:84
+msgid "The script itself"
 msgstr ""
 
-#: admin/fai/class_faiTemplate.inc:501 admin/fai/fai-list.xml:116
-msgid "Template"
+#: admin/fai/class_faiTemplate.inc:136
+#, php-format
+msgid "There are several files with the same path: %s"
 msgstr ""
 
-#: admin/fai/class_faiTemplate.inc:502 admin/fai/class_faiTemplate.inc:506
-msgid "FAI template"
+#: admin/fai/class_faiTemplate.inc:153
+msgid "Template"
 msgstr ""
 
-#: admin/fai/class_faiVariableEntry.inc:107
-msgid "Content"
+#: admin/fai/class_faiTemplate.inc:154 admin/fai/class_faiTemplate.inc:157
+msgid "FAI template"
 msgstr ""
 
-#: admin/fai/class_faiVariableEntry.inc:142
-msgid "Variable entry"
+#: admin/fai/class_faiTemplate.inc:176
+msgid "Template class name"
 msgstr ""
 
-#: admin/fai/class_faiVariableEntry.inc:143
-msgid "FAI variable entry "
+#: admin/fai/class_faiTemplate.inc:186
+msgid "Template files"
 msgstr ""
 
-#: admin/fai/class_faiVariableEntry.inc:151
-#: admin/fai/faiVariableEntry.tpl.c:20
-msgid "Variable content"
+#: admin/fai/class_faiTemplate.inc:190
+msgid "Template files in this class"
 msgstr ""
 
 #: admin/fai/class_faiPartition.inc:176 admin/fai/class_faiPartition.inc:180
@@ -950,94 +548,73 @@ msgstr ""
 msgid "btrfs"
 msgstr ""
 
-#: admin/fai/class_faiPartition.inc:224
-msgid "LVM/RAID"
-msgstr ""
-
-#: admin/fai/class_faiPartition.inc:327
+#: admin/fai/class_faiPartition.inc:325
 msgid "spare"
 msgstr ""
 
-#: admin/fai/class_faiPartition.inc:330
+#: admin/fai/class_faiPartition.inc:328
 msgid "missing"
 msgstr ""
 
-#: admin/fai/class_faiPartition.inc:333
+#: admin/fai/class_faiPartition.inc:331
 msgid "Options"
 msgstr ""
 
-#: admin/fai/class_faiPartition.inc:420
+#: admin/fai/class_faiPartition.inc:415
 msgid "Minimum partition size"
 msgstr ""
 
-#: admin/fai/class_faiPartition.inc:420
+#: admin/fai/class_faiPartition.inc:415
 msgid "Maximum partition size"
 msgstr ""
 
-#: admin/fai/class_faiPartition.inc:428
+#: admin/fai/class_faiPartition.inc:423
 msgid "Raid arrays must contain at least two partitions!"
 msgstr ""
 
-#: admin/fai/class_faiPartition.inc:430
+#: admin/fai/class_faiPartition.inc:425
 msgid ""
 "Raid 0 arrays can only be realized with a combination of two partitions!"
 msgstr ""
 
-#: admin/fai/class_faiHook.inc:332 admin/fai/class_faiHook.inc:334
-#: admin/fai/fai-list.xml:190 admin/fai/faiVariable.tpl.c:23
-#: admin/fai/faiVariable.tpl.c:26
-msgid "Edit"
-msgstr ""
-
-#: admin/fai/class_faiHook.inc:336
-msgid "Delete"
-msgstr ""
-
-#: admin/fai/class_faiHook.inc:521 admin/fai/fai-list.xml:128
+#: admin/fai/class_faiHook.inc:30
 msgid "Hook"
 msgstr ""
 
-#: admin/fai/class_faiHook.inc:522 admin/fai/class_faiHook.inc:526
+#: admin/fai/class_faiHook.inc:31 admin/fai/class_faiHook.inc:34
 msgid "FAI hook"
 msgstr ""
 
-#: admin/fai/class_faiVariable.inc:387 admin/fai/fai-list.xml:134
-msgid "Variable"
-msgstr ""
-
-#: admin/fai/class_faiVariable.inc:388 admin/fai/class_faiVariable.inc:392
-msgid "FAI variable"
+#: admin/fai/class_faiHook.inc:63
+msgid "Hooks"
 msgstr ""
 
-#: admin/fai/class_faiProfileEntry.inc:184 admin/fai/askClassName.tpl.c:11
-#: admin/fai/askClassName.tpl.c:17 admin/fai/paste_generic.tpl.c:5
-msgid "Class name"
+#: admin/fai/class_faiHook.inc:79
+msgid "Task"
 msgstr ""
 
-#: admin/fai/class_faiProfileEntry.inc:184 admin/fai/faiTemplate.tpl.c:14
-#: admin/fai/faiVariable.tpl.c:14 admin/fai/faiHook.tpl.c:14
-#: admin/fai/faiPartitionTable.tpl.c:17 admin/fai/faiScript.tpl.c:14
-msgid "Objects"
+#: admin/fai/class_faiHook.inc:87
+msgid "The script of this hook"
 msgstr ""
 
-#: admin/fai/fai-list.xml:11
-msgid "List of deployment classes and products"
+#: admin/fai/class_faiVariable.inc:30
+msgid "Variable"
 msgstr ""
 
-#: admin/fai/fai-list.xml:15
-msgid "partitionTable"
+#: admin/fai/class_faiVariable.inc:31 admin/fai/class_faiVariable.inc:34
+msgid "FAI variable"
 msgstr ""
 
-#: admin/fai/fai-list.xml:23
-msgid "packagelist"
+#: admin/fai/class_faiVariable.inc:63
+msgid "Variables"
 msgstr ""
 
-#: admin/fai/fai-list.xml:93
-msgid "Actions"
+#: admin/fai/class_faiVariable.inc:79
+msgid "Content"
 msgstr ""
 
-#: admin/fai/fai-list.xml:104
-msgid "Create"
+#: admin/fai/class_faiVariable.inc:79
+msgid "The content of the variable"
 msgstr ""
 
 #: admin/systems/class_faiLogView.inc:56
@@ -1048,6 +625,10 @@ msgstr ""
 msgid "Sort up"
 msgstr ""
 
+#: admin/systems/class_faiLogView.inc:70
+msgid "File"
+msgstr ""
+
 #: admin/systems/class_faiLogView.inc:71
 msgid "Date"
 msgstr ""
@@ -1082,7 +663,7 @@ msgstr ""
 msgid "Selected file: %s"
 msgstr ""
 
-#: admin/systems/class_faiStartup.inc:70 admin/fai/paste_generic.tpl.c:2
+#: admin/systems/class_faiStartup.inc:70
 msgid "FAI settings"
 msgstr ""
 
@@ -1102,11 +683,6 @@ msgstr ""
 msgid "FAI profil to be applied to this computer"
 msgstr ""
 
-#: admin/systems/class_faiStartup.inc:90 admin/fai/faiPackage.tpl.c:14
-#: admin/fai/faiPackage.tpl.c:17
-msgid "Repository"
-msgstr ""
-
 #: admin/systems/class_faiStartup.inc:90
 msgid "FAI Debian repository to be used for installation"
 msgstr ""
@@ -1131,85 +707,96 @@ msgstr ""
 msgid "Linux kernel parameters to be ran"
 msgstr ""
 
-#: admin/systems/class_faiStartup.inc:178
+#: admin/systems/class_faiStartup.inc:179
 msgid "Full automated installation"
 msgstr ""
 
-#: admin/systems/services/repository/class_serviceRepository.inc:31
+#: admin/systems/services/repository/class_serviceDebianRepository.inc:34
+#: admin/systems/services/repository/class_serviceCentosRepository.inc:31
+msgid "Repositories"
+msgstr ""
+
+#: admin/systems/services/repository/class_serviceDebianRepository.inc:39
+#: admin/systems/services/repository/class_serviceCentosRepository.inc:36
+msgid "Repositories this server hosts"
+msgstr ""
+
+#: admin/systems/services/repository/class_serviceDebianRepository.inc:43
+#: admin/systems/services/repository/class_serviceCentosRepository.inc:40
 msgid "URL"
 msgstr ""
 
-#: admin/systems/services/repository/class_serviceRepository.inc:31
+#: admin/systems/services/repository/class_serviceDebianRepository.inc:43
+#: admin/systems/services/repository/class_serviceCentosRepository.inc:40
 msgid "Repository url"
 msgstr ""
 
-#: admin/systems/services/repository/class_serviceRepository.inc:35
+#: admin/systems/services/repository/class_serviceDebianRepository.inc:47
+#: admin/systems/services/repository/class_serviceCentosRepository.inc:44
 msgid "Parent server"
 msgstr ""
 
-#: admin/systems/services/repository/class_serviceRepository.inc:35
+#: admin/systems/services/repository/class_serviceDebianRepository.inc:47
+#: admin/systems/services/repository/class_serviceCentosRepository.inc:44
 msgid "Parent repository server"
 msgstr ""
 
-#: admin/systems/services/repository/class_serviceRepository.inc:40
-msgid "Release used on this repository"
+#: admin/systems/services/repository/class_serviceDebianRepository.inc:52
+msgid "Debian release used on this repository"
 msgstr ""
 
-#: admin/systems/services/repository/class_serviceRepository.inc:47
-msgid "Sections"
-msgstr ""
-
-#: admin/systems/services/repository/class_serviceRepository.inc:47
-msgid "Sections available on this repository"
+#: admin/systems/services/repository/class_serviceDebianRepository.inc:58
+msgid "Debian sections available on this repository"
 msgstr ""
 
-#: admin/systems/services/repository/class_serviceRepository.inc:52
+#: admin/systems/services/repository/class_serviceDebianRepository.inc:63
+#: admin/systems/services/repository/class_serviceCentosRepository.inc:57
 msgid "Mirror mode"
 msgstr ""
 
-#: admin/systems/services/repository/class_serviceRepository.inc:52
+#: admin/systems/services/repository/class_serviceDebianRepository.inc:63
+#: admin/systems/services/repository/class_serviceCentosRepository.inc:57
 msgid ""
 "Is this mirror an installation repository? Is its release a custom one?"
 msgstr ""
 
-#: admin/systems/services/repository/class_serviceRepository.inc:57
+#: admin/systems/services/repository/class_serviceDebianRepository.inc:68
+#: admin/systems/services/repository/class_serviceCentosRepository.inc:62
 msgid "Local mirror"
 msgstr ""
 
-#: admin/systems/services/repository/class_serviceRepository.inc:57
+#: admin/systems/services/repository/class_serviceDebianRepository.inc:68
+#: admin/systems/services/repository/class_serviceCentosRepository.inc:62
 msgid "Is this mirror a local or a network mirror?"
 msgstr ""
 
-#: admin/systems/services/repository/class_serviceRepository.inc:66
+#: admin/systems/services/repository/class_serviceDebianRepository.inc:77
+#: admin/systems/services/repository/class_serviceCentosRepository.inc:71
 msgid "Architectures"
 msgstr ""
 
-#: admin/systems/services/repository/class_serviceRepository.inc:66
+#: admin/systems/services/repository/class_serviceDebianRepository.inc:77
+#: admin/systems/services/repository/class_serviceCentosRepository.inc:71
 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:140
-msgid "Repositories"
+#: admin/systems/services/repository/class_serviceDebianRepository.inc:99
+#: admin/systems/services/repository/class_serviceDebianRepository.inc:100
+msgid "Debian repository"
 msgstr ""
 
-#: admin/systems/services/repository/class_serviceRepository.inc:145
-msgid "Repositories this server hosts"
+#: admin/systems/services/repository/class_serviceDebianRepository.inc:100
+#: admin/systems/services/repository/class_serviceCentosRepository.inc:96
+msgid "Services"
 msgstr ""
 
-#: admin/systems/services/repository/class_serviceRepository.inc:160
-msgid "Package repository"
+#: admin/systems/services/repository/class_serviceCentosRepository.inc:49
+msgid "Centos release used on this repository"
 msgstr ""
 
-#: admin/systems/services/repository/class_serviceRepository.inc:161
-msgid "Package repository information"
+#: admin/systems/services/repository/class_serviceCentosRepository.inc:95
+#: admin/systems/services/repository/class_serviceCentosRepository.inc:96
+msgid "Centos repository"
 msgstr ""
 
 #: config/fai/class_faiConfig.inc:28
@@ -1241,476 +828,3 @@ msgstr ""
 #: config/fai/class_faiConfig.inc:60
 msgid "s"
 msgstr ""
-
-#: admin/fai/faiPartitionTableEntry.tpl.c:2 admin/fai/faiVariableEntry.tpl.c:2
-#: admin/fai/faiVariableEntry.tpl.c:5 admin/fai/faiDiskEntry.tpl.c:2
-#: admin/fai/faiTemplate.tpl.c:2 admin/fai/faiTemplate.tpl.c:5
-#: admin/fai/faiVariable.tpl.c:2 admin/fai/faiVariable.tpl.c:5
-#: admin/fai/faiHook.tpl.c:2 admin/fai/faiHook.tpl.c:5
-#: admin/fai/faiPackage.tpl.c:2 admin/fai/faiPackage.tpl.c:5
-#: admin/fai/faiTemplateEntry.tpl.c:2 admin/fai/faiTemplateEntry.tpl.c:5
-#: admin/fai/faiScriptEntry.tpl.c:2 admin/fai/faiScriptEntry.tpl.c:5
-#: admin/fai/faiPartitionTable.tpl.c:2 admin/fai/faiPartitionTable.tpl.c:5
-#: admin/fai/faiScript.tpl.c:2 admin/fai/faiScript.tpl.c:5
-#: admin/fai/faiProfile.tpl.c:2 admin/fai/faiProfile.tpl.c:5
-#: admin/fai/faiProfile.tpl.c:14 admin/fai/faiHookEntry.tpl.c:2
-#: admin/fai/faiHookEntry.tpl.c:5
-msgid "Generic"
-msgstr ""
-
-#: admin/fai/faiPartitionTableEntry.tpl.c:14
-#: admin/fai/faiPartitionTableEntry.tpl.c:17 admin/fai/faiDiskEntry.tpl.c:23
-#: admin/fai/faiDiskEntry.tpl.c:26
-msgid "Partition entries"
-msgstr ""
-
-#: admin/fai/faiPartitionTableEntry.tpl.c:20
-#: admin/fai/faiPartitionTableEntry.tpl.c:23 admin/fai/faiDiskEntry.tpl.c:29
-#: admin/fai/faiDiskEntry.tpl.c:32
-msgid "Add partition"
-msgstr ""
-
-#: admin/fai/branch_selector.tpl.c:2
-msgid "Releases"
-msgstr ""
-
-#: admin/fai/branch_selector.tpl.c:5
-msgid "Current release"
-msgstr ""
-
-#: admin/fai/branch_selector.tpl.c:8 admin/fai/branch_selector.tpl.c:17
-#: admin/fai/fai-filter.tpl.c:8 admin/fai/fai-filter.tpl.c:17
-msgid "Create release"
-msgstr ""
-
-#: admin/fai/branch_selector.tpl.c:11 admin/fai/branch_selector.tpl.c:23
-#: admin/fai/fai-filter.tpl.c:11 admin/fai/fai-filter.tpl.c:23
-msgid "Create read-only release"
-msgstr ""
-
-#: admin/fai/branch_selector.tpl.c:20 admin/fai/fai-filter.tpl.c:20
-msgid "Freeze"
-msgstr ""
-
-#: admin/fai/branch_selector.tpl.c:26 admin/fai/fai-filter.tpl.c:26
-msgid "Delete current release"
-msgstr ""
-
-#: admin/fai/faiPartition.tpl.c:2
-msgid "Partition"
-msgstr ""
-
-#: admin/fai/faiPartition.tpl.c:17
-msgid "Resize existing partition"
-msgstr ""
-
-#: admin/fai/faiPartition.tpl.c:20
-msgid "Bootable"
-msgstr ""
-
-#: admin/fai/faiPartition.tpl.c:26 admin/fai/faiDiskEntry.tpl.c:20
-msgid "Combined physical partitions"
-msgstr ""
-
-#: admin/fai/faiPartition.tpl.c:29
-msgid "Toggle missing"
-msgstr ""
-
-#: admin/fai/faiPartition.tpl.c:32
-msgid "Toggle spare"
-msgstr ""
-
-#: admin/fai/faiPartition.tpl.c:35
-msgid "Filesystem"
-msgstr ""
-
-#: admin/fai/faiPartition.tpl.c:38
-msgid "Filesystem create options"
-msgstr ""
-
-#: admin/fai/faiPartition.tpl.c:41
-msgid "Encrypted"
-msgstr ""
-
-#: admin/fai/faiPartition.tpl.c:44
-msgid "Tune options"
-msgstr ""
-
-#: admin/fai/faiNewBranch.tpl.c:2
-msgid ""
-"You are now going to create a branch or locked branch. This action clones "
-"the existing release to another release name. Branches can be modified as "
-"usual. FAI classes of locked branches cannot be modified, just additional "
-"classes are possible. Branch names should be alphanumeric, excluding the "
-"reserved names 'scripts', 'hooks', 'partitions', 'variables', 'templates' "
-"and 'fai'."
-msgstr ""
-
-#: admin/fai/faiNewBranch.tpl.c:5
-msgid ""
-"Branches are created as subreleases of the currently selected branch. "
-"Creating a new branch named 1.0.2 in SARGE for example, will result in a new"
-" release called SARGE/1.0.2."
-msgstr ""
-
-#: admin/fai/faiNewBranch.tpl.c:8
-msgid "Please enter a name for the branch"
-msgstr ""
-
-#: admin/fai/faiNewBranch.tpl.c:11
-msgid "Processing the requested operation"
-msgstr ""
-
-#: admin/fai/faiNewBranch.tpl.c:14
-msgid ""
-"As soon as the copy operation has finished, you can scroll down to end of "
-"the page and press the 'Continue' button to continue with the fai management"
-" dialog."
-msgstr ""
-
-#: admin/fai/faiNewBranch.tpl.c:17
-msgid ""
-"Your browser doesn't support iframes, please use this link to perform the "
-"requested operation."
-msgstr ""
-
-#: admin/fai/faiNewBranch.tpl.c:20
-msgid "Perform requested operation."
-msgstr ""
-
-#: admin/fai/faiNewBranch.tpl.c:23
-msgid "Initiate operation"
-msgstr ""
-
-#: admin/fai/faiVariableEntry.tpl.c:14 admin/fai/faiVariableEntry.tpl.c:17
-msgid "Variable attributes"
-msgstr ""
-
-#: admin/fai/faiDiskEntry.tpl.c:11
-msgid "fstab key"
-msgstr ""
-
-#: admin/fai/faiDiskEntry.tpl.c:17
-msgid "Disk label"
-msgstr ""
-
-#: admin/fai/faiTemplate.tpl.c:17
-msgid "List of template files"
-msgstr ""
-
-#: admin/fai/faiVariable.tpl.c:17
-msgid "List of assigned variables"
-msgstr ""
-
-#: admin/fai/faiVariable.tpl.c:20
-msgid "Choose a variable to delete or edit"
-msgstr ""
-
-#: admin/fai/askClassName.tpl.c:2
-msgid ""
-"Adding a new class to the FAI management, requires a class name. You have to"
-" specify a unique class name for unique types of FAI classes, while you can "
-"use the same class name for different types of FAI classes. In the laste "
-"case, FAI will automatically enclose all these different class types to one "
-"unique class name."
-msgstr ""
-
-#: admin/fai/askClassName.tpl.c:5
-msgid ""
-"Please use one of the following methods to choose the name for the new FAI "
-"class."
-msgstr ""
-
-#: admin/fai/askClassName.tpl.c:8
-msgid "Enter FAI class name manually"
-msgstr ""
-
-#: admin/fai/askClassName.tpl.c:14
-msgid "Choose FAI class name from a list of existing classes"
-msgstr ""
-
-#: admin/fai/askClassName.tpl.c:20
-msgid "Choose class name"
-msgstr ""
-
-#: admin/fai/faiGroupHandle.tpl.c:2
-msgid "Please select the objects you want to remove:"
-msgstr ""
-
-#: admin/fai/faiGroupHandle.tpl.c:5
-msgid "Freezed"
-msgstr ""
-
-#: admin/fai/faiGroupHandle.tpl.c:8
-msgid "Select the object you want to edit:"
-msgstr ""
-
-#: admin/fai/faiGroupHandle.tpl.c:11
-msgid "Select the object you want to copy:"
-msgstr ""
-
-#: admin/fai/remove.tpl.c:5
-msgid ""
-"This includes all account data, system access rules, imap settings, etc. for"
-" this user. Please double check if your really want to do this since there "
-"is no way for FusionDirectory to get your data back."
-msgstr ""
-
-#: admin/fai/remove.tpl.c:8 admin/fai/remove_branch.tpl.c:8
-msgid "So - if you're sure - press 'Delete' to continue or 'Cancel' to abort."
-msgstr ""
-
-#: admin/fai/faiHook.tpl.c:17
-msgid "List of hook scripts"
-msgstr ""
-
-#: admin/fai/packageSelect/selectPackage-list.tpl.c:2
-#: admin/fai/classSelect/selectClass-list.tpl.c:5
-msgid "Update"
-msgstr ""
-
-#: admin/fai/packageSelect/selectPackage-list.tpl.c:5
-#: admin/fai/classSelect/selectClass-list.tpl.c:8
-msgid "Submit"
-msgstr ""
-
-#: admin/fai/packageSelect/selectPackage-filter.tpl.c:2
-#: admin/fai/classSelect/selectClass-filter.tpl.c:2
-#: admin/fai/fai-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/remove_branch.tpl.c:5
-msgid ""
-"This includes all account data, system access, etc. for this branch. Please "
-"double check if your really want to do this since there is no way for "
-"FusionDirectory to get your data back."
-msgstr ""
-
-#: admin/fai/faiPackage.tpl.c:26
-msgid "Install method"
-msgstr ""
-
-#: admin/fai/faiPackage.tpl.c:29
-msgid "Please select the installation method"
-msgstr ""
-
-#: admin/fai/faiPackage.tpl.c:32 admin/fai/faiPackage.tpl.c:35
-msgid "Used packages"
-msgstr ""
-
-#: admin/fai/faiPackage.tpl.c:38
-msgid "Add from list"
-msgstr ""
-
-#: admin/fai/faiProfileEntry.tpl.c:2
-msgid "List of FAI objects (Fully Automatic Installation)"
-msgstr ""
-
-#: admin/fai/faiProfileEntry.tpl.c:5
-msgid "Information"
-msgstr ""
-
-#: admin/fai/faiProfileEntry.tpl.c:8
-msgid ""
-"This menu allows you to select FAI class names and to add them to the "
-"currently edited profile."
-msgstr ""
-
-#: admin/fai/faiProfileEntry.tpl.c:11
-msgid "Filters"
-msgstr ""
-
-#: admin/fai/faiProfileEntry.tpl.c:14
-msgid "Show only classes with templates"
-msgstr ""
-
-#: admin/fai/faiProfileEntry.tpl.c:17
-msgid "Show only classes with scripts"
-msgstr ""
-
-#: admin/fai/faiProfileEntry.tpl.c:20
-msgid "Show only classes with hooks"
-msgstr ""
-
-#: admin/fai/faiProfileEntry.tpl.c:23
-msgid "Show only classes with variables"
-msgstr ""
-
-#: admin/fai/faiProfileEntry.tpl.c:26
-msgid "Show only classes with packages"
-msgstr ""
-
-#: admin/fai/faiProfileEntry.tpl.c:29
-msgid "Show only classes with partitions"
-msgstr ""
-
-#: admin/fai/faiProfileEntry.tpl.c:32 admin/fai/faiProfileEntry.tpl.c:35
-msgid "Display objects matching"
-msgstr ""
-
-#: admin/fai/faiProfileEntry.tpl.c:38
-msgid "Regular expression for matching object names"
-msgstr ""
-
-#: admin/fai/faiTemplateEntry.tpl.c:17 admin/fai/faiTemplateEntry.tpl.c:20
-msgid "Template attributes"
-msgstr ""
-
-#: admin/fai/faiTemplateEntry.tpl.c:26 admin/fai/faiTemplateEntry.tpl.c:29
-msgid "Save template"
-msgstr ""
-
-#: admin/fai/faiTemplateEntry.tpl.c:32 admin/fai/faiTemplateEntry.tpl.c:35
-msgid "Edit template"
-msgstr ""
-
-#: admin/fai/faiTemplateEntry.tpl.c:38
-msgid "Full path"
-msgstr ""
-
-#: admin/fai/faiTemplateEntry.tpl.c:41
-msgid "Upload"
-msgstr ""
-
-#: admin/fai/faiTemplateEntry.tpl.c:44
-msgid "Owner"
-msgstr ""
-
-#: admin/fai/faiTemplateEntry.tpl.c:50
-msgid "Access"
-msgstr ""
-
-#: admin/fai/faiTemplateEntry.tpl.c:53
-msgid "Class"
-msgstr ""
-
-#: admin/fai/faiTemplateEntry.tpl.c:56
-msgid "Read"
-msgstr ""
-
-#: admin/fai/faiTemplateEntry.tpl.c:59
-msgid "Write"
-msgstr ""
-
-#: admin/fai/faiTemplateEntry.tpl.c:62
-msgid "Execute"
-msgstr ""
-
-#: admin/fai/faiTemplateEntry.tpl.c:65
-msgid "Special"
-msgstr ""
-
-#: admin/fai/faiTemplateEntry.tpl.c:71
-msgid "SUID"
-msgstr ""
-
-#: admin/fai/faiTemplateEntry.tpl.c:77
-msgid "SGID"
-msgstr ""
-
-#: admin/fai/faiTemplateEntry.tpl.c:80
-msgid "Others"
-msgstr ""
-
-#: admin/fai/faiTemplateEntry.tpl.c:83
-msgid "sticky"
-msgstr ""
-
-#: admin/fai/faiScriptEntry.tpl.c:17 admin/fai/faiScriptEntry.tpl.c:26
-msgid "Script attributes"
-msgstr ""
-
-#: admin/fai/faiScriptEntry.tpl.c:23
-msgid ""
-"Choose a priority. Low values result in an earlier, high values in a later "
-"execution."
-msgstr ""
-
-#: admin/fai/faiScriptEntry.tpl.c:32 admin/fai/faiHookEntry.tpl.c:32
-msgid "Import script"
-msgstr ""
-
-#: admin/fai/classSelect/selectClass-list.tpl.c:2
-msgid "Base"
-msgstr ""
-
-#: admin/fai/fai-filter.tpl.c:29
-msgid "Show profiles"
-msgstr ""
-
-#: admin/fai/fai-filter.tpl.c:32
-msgid "Show templates"
-msgstr ""
-
-#: admin/fai/fai-filter.tpl.c:35
-msgid "Show scripts"
-msgstr ""
-
-#: admin/fai/fai-filter.tpl.c:38
-msgid "Show hooks"
-msgstr ""
-
-#: admin/fai/fai-filter.tpl.c:41
-msgid "Show variables"
-msgstr ""
-
-#: admin/fai/fai-filter.tpl.c:44
-msgid "Show packages"
-msgstr ""
-
-#: admin/fai/fai-filter.tpl.c:47
-msgid "Show partitions"
-msgstr ""
-
-#: admin/fai/faiTemplateEdit.tpl.c:2
-msgid "This FAI template is write protected. Editing may break it!"
-msgstr ""
-
-#: admin/fai/faiTemplateEdit.tpl.c:5
-msgid "Edit anyway"
-msgstr ""
-
-#: admin/fai/faiPartitionTable.tpl.c:14
-msgid "Use 'setup-storage' to partition the disk"
-msgstr ""
-
-#: admin/fai/faiPartitionTable.tpl.c:20
-msgid "Discs"
-msgstr ""
-
-#: admin/fai/faiPartitionTable.tpl.c:23 admin/fai/faiPartitionTable.tpl.c:26
-#: admin/fai/faiPartitionTable.tpl.c:41 admin/fai/faiPartitionTable.tpl.c:44
-msgid "Add disk"
-msgstr ""
-
-#: admin/fai/faiPartitionTable.tpl.c:29 admin/fai/faiPartitionTable.tpl.c:32
-#: admin/fai/faiPartitionTable.tpl.c:47 admin/fai/faiPartitionTable.tpl.c:50
-msgid "Add RAID"
-msgstr ""
-
-#: admin/fai/faiPartitionTable.tpl.c:35 admin/fai/faiPartitionTable.tpl.c:38
-#: admin/fai/faiPartitionTable.tpl.c:53 admin/fai/faiPartitionTable.tpl.c:56
-msgid "Add volume group"
-msgstr ""
-
-#: admin/fai/faiScript.tpl.c:17
-msgid "List of scripts"
-msgstr ""
-
-#: admin/fai/faiProfile.tpl.c:20
-msgid "Choose a priority"
-msgstr ""
-
-#: admin/fai/faiHookEntry.tpl.c:14 admin/fai/faiHookEntry.tpl.c:17
-#: admin/fai/faiHookEntry.tpl.c:26
-msgid "Hook attributes"
-msgstr ""
-
-#: admin/fai/faiHookEntry.tpl.c:23
-msgid "Choose an existing FAI task"
-msgstr ""
diff --git a/fai/locale/vi_VN/fusiondirectory.po b/fai/locale/vi_VN/fusiondirectory.po
index e2b3f1f30af15cc40845b82c1d620b6289b41975..2dcc811f14e168f26ee2d06b6a5b4d76d128285e 100644
--- a/fai/locale/vi_VN/fusiondirectory.po
+++ b/fai/locale/vi_VN/fusiondirectory.po
@@ -5,379 +5,188 @@
 # Translators:
 msgid ""
 msgstr ""
-"Project-Id-Version: FusionDirectory-108\n"
+"Project-Id-Version: FusionDirectory-109\n"
 "Report-Msgid-Bugs-To: documentation@lists.fusiondirectory.org\n"
-"POT-Creation-Date: 2015-03-19 21:45+0100\n"
-"PO-Revision-Date: 2015-02-25 16:12+0000\n"
+"POT-Creation-Date: 2014-12-15 17:47+0100\n"
+"PO-Revision-Date: 2015-02-25 16:04+0000\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>\n"
-"Language-Team: Vietnamese (Viet Nam) (http://www.transifex.com/projects/p/FusionDirectory-108/language/vi_VN/)\n"
+"Language-Team: Vietnamese (Viet Nam) (http://www.transifex.com/projects/p/FusionDirectory-109/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/fai/class_faiScriptEntry.inc:79 admin/fai/class_faiScriptEntry.inc:82
-#: admin/fai/class_faiManagement.inc:240 admin/fai/class_faiManagement.inc:768
-#: admin/fai/class_faiManagement.inc:774
-#: admin/fai/class_faiPartitionTable.inc:268
-#: admin/fai/class_faiPartitionTable.inc:331
-#: admin/fai/class_faiDiskEntry.inc:445 admin/fai/class_FAI.inc:570
-#: admin/fai/class_faiHookEntry.inc:83 admin/fai/class_faiHookEntry.inc:86
-#: admin/fai/class_faiScript.inc:249 admin/fai/class_faiTemplate.inc:232
-#: admin/fai/class_faiHook.inc:259 admin/fai/class_faiVariable.inc:162
-#: admin/systems/class_faiLogView.inc:207
-#: admin/systems/class_faiLogView.inc:242
-msgid "Error"
-msgstr "Lá»—i"
-
-#: admin/fai/class_faiScriptEntry.inc:82 admin/fai/class_faiHookEntry.inc:86
-msgid "file is empty"
-msgstr ""
-
-#: admin/fai/class_faiScriptEntry.inc:102 admin/fai/class_faiHookEntry.inc:102
-#: admin/fai/class_faiScript.inc:349 admin/fai/class_faiScript.inc:374
-#: admin/fai/class_faiTemplate.inc:320 admin/fai/class_faiHook.inc:346
-msgid "Download"
-msgstr ""
-
-#: admin/fai/class_faiScriptEntry.inc:147
-#: admin/fai/class_faiScriptEntry.inc:151
-#: admin/fai/class_faiScriptEntry.inc:154
-#: admin/fai/class_faiScriptEntry.inc:197
-#: admin/fai/class_faiManagement.inc:768 admin/fai/class_faiManagement.inc:774
-#: admin/fai/class_faiPackage.inc:685
-#: admin/fai/class_faiPartitionTable.inc:779
-#: admin/fai/class_faiDiskEntry.inc:702 admin/fai/class_faiDiskEntry.inc:705
-#: admin/fai/class_faiDiskEntry.inc:758
-#: admin/fai/class_faiTemplateEntry.inc:247
-#: admin/fai/class_faiTemplateEntry.inc:312
-#: admin/fai/class_faiPartitionTableEntry.inc:353
-#: admin/fai/class_faiPartitionTableEntry.inc:356
-#: admin/fai/class_faiPartitionTableEntry.inc:360
-#: admin/fai/class_faiPartitionTableEntry.inc:455
-#: admin/fai/packageSelect/selectPackage-list.xml:40
-#: admin/fai/class_faiProfile.inc:414 admin/fai/class_faiProfile.inc:463
-#: admin/fai/class_faiHookEntry.inc:157 admin/fai/class_faiHookEntry.inc:162
-#: admin/fai/class_faiHookEntry.inc:165 admin/fai/class_faiHookEntry.inc:207
-#: admin/fai/class_askClassName.inc:163 admin/fai/class_askClassName.inc:167
-#: admin/fai/class_askClassName.inc:171 admin/fai/class_askClassName.inc:198
-#: admin/fai/class_faiScript.inc:347 admin/fai/class_faiScript.inc:605
-#: admin/fai/classSelect/selectClass-list.xml:28
-#: admin/fai/class_faiTemplate.inc:512
-#: admin/fai/class_faiVariableEntry.inc:103
-#: admin/fai/class_faiVariableEntry.inc:112
-#: admin/fai/class_faiVariableEntry.inc:115
-#: admin/fai/class_faiVariableEntry.inc:149 admin/fai/class_faiHook.inc:531
-#: admin/fai/class_faiVariable.inc:398 admin/fai/fai-list.xml:80
-#: admin/fai/faiPartitionTableEntry.tpl.c:8 admin/fai/faiPartition.tpl.c:5
-#: admin/fai/faiVariableEntry.tpl.c:8 admin/fai/faiDiskEntry.tpl.c:8
-#: admin/fai/faiTemplate.tpl.c:8 admin/fai/faiVariable.tpl.c:8
-#: admin/fai/faiHook.tpl.c:8
-#: admin/fai/packageSelect/selectPackage-filter.tpl.c:8
-#: admin/fai/faiPackage.tpl.c:8 admin/fai/faiScriptEntry.tpl.c:8
-#: admin/fai/classSelect/selectClass-filter.tpl.c:5
-#: admin/fai/fai-filter.tpl.c:50 admin/fai/faiPartitionTable.tpl.c:8
-#: admin/fai/faiScript.tpl.c:8 admin/fai/faiProfile.tpl.c:8
-#: admin/fai/faiHookEntry.tpl.c:8
-msgid "Name"
-msgstr "TÃªn"
-
-#: admin/fai/class_faiScriptEntry.inc:159 admin/fai/class_faiHookEntry.inc:170
-#: admin/fai/class_faiScript.inc:594 admin/fai/fai-list.xml:122
-#: admin/fai/faiScriptEntry.tpl.c:29 admin/fai/faiHookEntry.tpl.c:29
-msgid "Script"
-msgstr ""
-
-#: admin/fai/class_faiScriptEntry.inc:190
-#: admin/fai/class_faiScriptEntry.inc:199
-msgid "Script entry"
-msgstr ""
-
-#: admin/fai/class_faiScriptEntry.inc:191
-msgid "FAI script entry"
-msgstr ""
-
-#: admin/fai/class_faiScriptEntry.inc:198 admin/fai/class_faiPackage.inc:686
-#: admin/fai/class_faiPartitionTable.inc:780
-#: admin/fai/class_faiDiskEntry.inc:759
-#: admin/fai/class_faiTemplateEntry.inc:313
-#: admin/fai/class_faiPartitionTableEntry.inc:456
-#: admin/fai/class_faiProfile.inc:464 admin/fai/class_faiHookEntry.inc:208
-#: admin/fai/class_faiScript.inc:606 admin/fai/class_faiTemplate.inc:513
-#: admin/fai/class_faiVariableEntry.inc:150 admin/fai/class_faiHook.inc:532
-#: admin/fai/class_faiVariable.inc:399
-#: admin/fai/faiPartitionTableEntry.tpl.c:11 admin/fai/faiPartition.tpl.c:11
-#: admin/fai/faiVariableEntry.tpl.c:11 admin/fai/faiDiskEntry.tpl.c:14
-#: admin/fai/faiTemplate.tpl.c:11 admin/fai/faiVariable.tpl.c:11
-#: admin/fai/faiHook.tpl.c:11 admin/fai/faiPackage.tpl.c:11
-#: admin/fai/faiTemplateEntry.tpl.c:14 admin/fai/faiScriptEntry.tpl.c:11
-#: admin/fai/faiPartitionTable.tpl.c:11 admin/fai/faiScript.tpl.c:11
-#: admin/fai/faiProfile.tpl.c:11 admin/fai/faiHookEntry.tpl.c:11
-msgid "Description"
-msgstr "MÃ´ táº£"
-
-#: admin/fai/class_faiScriptEntry.inc:200
-msgid "Script Priority"
-msgstr ""
-
-#: admin/fai/class_faiManagement.inc:188
-msgid "partition table"
-msgstr ""
-
-#: admin/fai/class_faiManagement.inc:189 admin/fai/fai-list.xml:31
-msgid "script"
-msgstr ""
-
-#: admin/fai/class_faiManagement.inc:190 admin/fai/fai-list.xml:47
-msgid "hook"
-msgstr ""
-
-#: admin/fai/class_faiManagement.inc:191 admin/fai/fai-list.xml:39
-msgid "variable"
-msgstr ""
-
-#: admin/fai/class_faiManagement.inc:192 admin/fai/fai-list.xml:63
-msgid "template"
-msgstr ""
-
-#: admin/fai/class_faiManagement.inc:193
-msgid "package list"
-msgstr ""
-
-#: admin/fai/class_faiManagement.inc:210 admin/fai/class_faiManagement.inc:226
-#: admin/fai/class_faiManagement.inc:332 admin/fai/class_faiManagement.inc:390
-#: admin/fai/class_faiManagement.inc:480 admin/fai/class_faiManagement.inc:575
-#: admin/fai/class_faiManagement.inc:598 admin/fai/class_faiManagement.inc:619
-msgid "Permission error"
-msgstr "Lá»—i vá» cáº¥p phÃ©p"
-
-#: admin/fai/class_faiManagement.inc:211 admin/fai/class_faiManagement.inc:226
-#, php-format
-msgid "You have no permission to create a new %s!"
-msgstr ""
-
-#: admin/fai/class_faiManagement.inc:226 admin/fai/fai-list.xml:55
-msgid "profile"
-msgstr ""
-
-#: admin/fai/class_faiManagement.inc:328
-msgid "Branch locked"
-msgstr ""
-
-#: admin/fai/class_faiManagement.inc:329
-#, php-format
-msgid "The following entries are locked, you can't remove them %s."
-msgstr ""
-
-#: admin/fai/class_faiManagement.inc:346
-msgid "FAI object"
-msgstr ""
-
-#: admin/fai/class_faiManagement.inc:477
-msgid "FAI branch/freeze"
-msgstr ""
-
-#: admin/fai/class_faiManagement.inc:480
-msgid "You have no permission to delete this release!"
-msgstr ""
-
-#: admin/fai/class_faiManagement.inc:496 admin/fai/remove.tpl.c:2
-#: admin/fai/remove_branch.tpl.c:2
-msgid "Warning"
-msgstr "Cáº£nh bÃ¡o"
-
-#: admin/fai/class_faiManagement.inc:496
-msgid "Release remove aborted because the release name check failed!"
-msgstr ""
-
-#: admin/fai/class_faiManagement.inc:573 admin/fai/class_faiManagement.inc:596
-msgid "Configuration"
-msgstr "Cáº¥u hÃ¬nh"
-
-#: admin/fai/class_faiManagement.inc:575 admin/fai/class_faiManagement.inc:598
-#: admin/fai/class_faiManagement.inc:619
-msgid "Branch"
+#: admin/fai/class_faiManagement.inc:117 admin/fai/class_faiManagement.inc:122
+#: admin/fai/packageSelect/selectPackage-list.xml:14
+#: admin/systems/class_faiStartup.inc:178 config/fai/class_faiConfig.inc:41
+msgid "FAI"
 msgstr ""
 
-#: admin/fai/class_faiManagement.inc:725 admin/fai/askClassName.tpl.c:23
-msgid "Continue"
-msgstr "Tiáº¿p tá»¥c"
-
-#: admin/fai/class_faiManagement.inc:926
-#: admin/fai/class_faiPartitionTable.inc:768
-#: admin/fai/class_faiProfile.inc:318 admin/fai/class_askClassName.inc:99
-#: admin/fai/classSelect/class_classSelect.inc:58
-#: admin/fai/class_faiGroupHandle.inc:120
-#: admin/fai/class_faiProfileEntry.inc:163 admin/fai/fai-list.xml:146
-msgid "Partition table"
+#: admin/fai/class_faiManagement.inc:118
+msgid "Manage FAI software packages and deployment recipes"
 msgstr ""
 
-#: admin/fai/class_faiManagement.inc:928
-#: admin/fai/class_faiGroupHandle.inc:122 admin/fai/fai-list.xml:140
-msgid "Package list"
+#: admin/fai/class_faiPackage.inc:157
+msgid "Mark for installation"
 msgstr ""
 
-#: admin/fai/class_faiManagement.inc:930
-#: admin/fai/class_faiGroupHandle.inc:124
-msgid "Scripts"
+#: admin/fai/class_faiPackage.inc:161
+msgid "Mark for removal"
 msgstr ""
 
-#: admin/fai/class_faiManagement.inc:932
-#: admin/fai/class_faiGroupHandle.inc:126
-msgid "Variables"
+#: admin/fai/class_faiPackage.inc:166
+msgid "Edit configuration"
 msgstr ""
 
-#: admin/fai/class_faiManagement.inc:934
-#: admin/fai/class_faiGroupHandle.inc:128
-msgid "Hooks"
-msgstr ""
+#: admin/fai/class_faiPackage.inc:247
+#: admin/fai/class_faiPartitionTable.inc:209
+#: admin/fai/class_faiPartitionTable.inc:250
+#: admin/fai/class_faiTemplate.inc:114
+#: admin/systems/services/repository/class_serviceDebianRepository.inc:172
+#: admin/systems/services/repository/class_serviceDebianRepository.inc:189
+#: admin/systems/services/repository/class_serviceDebianRepository.inc:193
+msgid "LDAP error"
+msgstr "Lá»—i LDAP"
 
-#: admin/fai/class_faiManagement.inc:936 admin/fai/class_faiProfile.inc:454
-#: admin/fai/class_askClassName.inc:104 admin/fai/class_faiGroupHandle.inc:130
-#: admin/fai/fai-list.xml:110
-msgid "Profile"
+#: admin/fai/class_faiPackage.inc:279
+#: admin/fai/packageSelect/class_filterFAIPackages.inc:41
+#: admin/fai/packageSelect/class_filterFAIPackages.inc:46
+#: admin/fai/class_faiPackageConfiguration.inc:55
+#: admin/systems/class_faiStartup.inc:133
+#: admin/systems/class_faiStartup.inc:160
+msgid "Service infrastructure"
 msgstr ""
 
-#: admin/fai/class_faiManagement.inc:938
-#: admin/fai/class_faiGroupHandle.inc:132
-msgid "Templates"
+#: admin/fai/class_faiPackage.inc:294
+msgid "Unkown packages"
 msgstr ""
 
-#: admin/fai/class_faiManagement.inc:1039
-#: admin/fai/class_faiManagement.inc:1045
-#: admin/fai/packageSelect/selectPackage-list.xml:14
-#: admin/fai/classSelect/selectClass-list.xml:15
-#: admin/systems/class_faiStartup.inc:177 config/fai/class_faiConfig.inc:41
-msgid "FAI"
+#: admin/fai/class_faiPackage.inc:365
+msgid "Package"
 msgstr ""
 
-#: admin/fai/class_faiManagement.inc:1040
-msgid "Manage FAI software packages and deployment recipes"
+#: admin/fai/class_faiPackage.inc:366
+msgid "FAI Package list"
 msgstr ""
 
-#: admin/fai/class_faiPackage.inc:261
-msgid "Invalid package names"
+#: admin/fai/class_faiPackage.inc:369
+msgid "FAI Package"
 msgstr ""
 
-#: admin/fai/class_faiPackage.inc:262
-#, php-format
-msgid "The following package names don't match the Debian policy: %s"
-msgstr ""
+#: admin/fai/class_faiPackage.inc:385
+#: admin/fai/class_faiPartitionTable.inc:304
+#: admin/fai/class_faiTemplateEntry.inc:140 admin/fai/class_faiProfile.inc:47
+#: admin/fai/class_faiScript.inc:50 admin/fai/class_faiTemplate.inc:173
+#: admin/fai/class_faiHook.inc:50 admin/fai/class_faiVariable.inc:50
+msgid "Properties"
+msgstr "Properties"
 
-#: admin/fai/class_faiPackage.inc:421 admin/fai/class_faiPackage.inc:422
-msgid "Configured"
+#: admin/fai/class_faiPackage.inc:388
+#: admin/fai/class_faiPartitionTable.inc:307 admin/fai/class_faiProfile.inc:50
+#: admin/fai/class_faiScript.inc:53 admin/fai/class_faiTemplate.inc:176
+#: admin/fai/class_faiHook.inc:53 admin/fai/class_faiVariable.inc:53
+msgid "Class name"
 msgstr ""
 
-#: admin/fai/class_faiPackage.inc:428 admin/fai/class_faiPackage.inc:429
-msgid "Package marked for removal"
+#: admin/fai/class_faiPackage.inc:388 admin/fai/class_faiScript.inc:53
+#: admin/fai/class_faiHook.inc:53 admin/fai/class_faiVariable.inc:53
+msgid "Variables class name"
 msgstr ""
 
-#: admin/fai/class_faiPackage.inc:445
-msgid "Mark package for removal"
-msgstr ""
+#: admin/fai/class_faiPackage.inc:392
+#: admin/fai/class_faiPartitionTable.inc:311
+#: admin/fai/class_faiDiskEntry.inc:738
+#: admin/fai/class_faiTemplateEntry.inc:147 admin/fai/class_faiProfile.inc:54
+#: admin/fai/class_faiScript.inc:57 admin/fai/class_faiScript.inc:75
+#: admin/fai/class_faiTemplate.inc:180 admin/fai/class_faiHook.inc:57
+#: admin/fai/class_faiHook.inc:75 admin/fai/class_faiVariable.inc:57
+#: admin/fai/class_faiVariable.inc:75
+msgid "Description"
+msgstr "MÃ´ táº£"
 
-#: admin/fai/class_faiPackage.inc:451
-msgid "Configure this package"
+#: admin/fai/class_faiPackage.inc:392
+#: admin/fai/class_faiPartitionTable.inc:311 admin/fai/class_faiProfile.inc:54
+#: admin/fai/class_faiScript.inc:57 admin/fai/class_faiTemplate.inc:180
+#: admin/fai/class_faiHook.inc:57 admin/fai/class_faiVariable.inc:57
+msgid "Short description of the class"
 msgstr ""
 
-#: admin/fai/class_faiPackage.inc:455
-msgid "Remove this package"
+#: admin/fai/class_faiPackage.inc:398 admin/systems/class_faiStartup.inc:90
+msgid "Repository"
 msgstr ""
 
-#: admin/fai/class_faiPackage.inc:534
-msgid "Please select a least one package!"
+#: admin/fai/class_faiPackage.inc:401 admin/systems/class_faiStartup.inc:78
+#: admin/systems/services/repository/class_serviceDebianRepository.inc:52
+#: admin/systems/services/repository/class_serviceCentosRepository.inc:49
+msgid "Release"
 msgstr ""
 
-#: admin/fai/class_faiPackage.inc:538
-msgid ""
-"Please choose a valid release/section combination for your repository setup!"
+#: admin/fai/class_faiPackage.inc:401
+msgid "Debian release concerned"
 msgstr ""
 
-#: admin/fai/class_faiPackage.inc:571
-#: admin/fai/packageSelect/class_filterFAIPackages.inc:41
-#: admin/fai/packageSelect/class_filterFAIPackages.inc:46
-#: admin/fai/class_faiPackageConfiguration.inc:55
-#: admin/systems/class_faiStartup.inc:132
-#: admin/systems/class_faiStartup.inc:159
-msgid "Infrastructure service"
+#: admin/fai/class_faiPackage.inc:405
+#: admin/systems/services/repository/class_serviceDebianRepository.inc:58
+msgid "Sections"
 msgstr ""
 
-#: admin/fai/class_faiPackage.inc:587
-msgid "Unkown packages"
+#: admin/fai/class_faiPackage.inc:405
+msgid "Sections concerned"
 msgstr ""
 
-#: admin/fai/class_faiPackage.inc:674
-#: admin/fai/faiPackageConfiguration.tpl.c:2
-msgid "Package"
-msgstr ""
-
-#: admin/fai/class_faiPackage.inc:675
-msgid "FAI Package list"
+#: admin/fai/class_faiPackage.inc:409
+msgid "Install method"
 msgstr ""
 
-#: admin/fai/class_faiPackage.inc:679
-msgid "FAI Package"
+#: admin/fai/class_faiPackage.inc:409
+msgid "Install method to use for this package list"
 msgstr ""
 
-#: admin/fai/class_faiPackage.inc:687
+#: admin/fai/class_faiPackage.inc:420
 msgid "Packages"
 msgstr ""
 
-#: admin/fai/class_faiPackage.inc:688 admin/fai/faiPackage.tpl.c:23
-msgid "Section"
+#: admin/fai/class_faiPackage.inc:424
+msgid "Packages in this class"
 msgstr ""
 
-#: admin/fai/class_faiPackage.inc:688 admin/fai/class_faiPackage.inc:691
-#: admin/fai/class_faiScript.inc:605 admin/fai/class_faiTemplate.inc:512
-msgid "Readonly"
-msgstr ""
-
-#: admin/fai/class_faiPackage.inc:689
-msgid "Install Method"
-msgstr ""
+#: admin/fai/class_faiPartitionTable.inc:61
+#: admin/fai/class_faiDiskEntry.inc:442 admin/systems/class_faiLogView.inc:207
+#: admin/systems/class_faiLogView.inc:242
+msgid "Error"
+msgstr "Lá»—i"
 
-#: admin/fai/class_faiPackage.inc:690
-msgid "Package configuration"
+#: admin/fai/class_faiPartitionTable.inc:112
+msgid "Add RAID"
 msgstr ""
 
-#: admin/fai/class_faiPackage.inc:691 admin/systems/class_faiStartup.inc:78
-#: admin/systems/services/repository/class_serviceRepository.inc:40
-#: admin/fai/branch_selector.tpl.c:14 admin/fai/faiPackage.tpl.c:20
-#: admin/fai/fai-filter.tpl.c:5 admin/fai/fai-filter.tpl.c:14
-msgid "Release"
+#: admin/fai/class_faiPartitionTable.inc:116
+msgid "Add LVM"
 msgstr ""
 
-#: admin/fai/class_faiPartitionTable.inc:269
-#: admin/fai/class_faiDiskEntry.inc:446
-#, php-format
-msgid ""
-"The disk cannot be deleted while it is used in the '%s' disk definition!"
+#: admin/fai/class_faiPartitionTable.inc:284
+msgid "Partition table"
 msgstr ""
 
-#: admin/fai/class_faiPartitionTable.inc:416 admin/fai/class_faiScript.inc:360
-#: admin/fai/class_faiScript.inc:362 admin/fai/class_faiTemplate.inc:306
-#: admin/fai/class_faiTemplate.inc:308
-msgid "edit"
+#: admin/fai/class_faiPartitionTable.inc:285
+#: admin/fai/class_faiPartitionTable.inc:288
+msgid "FAI partition table"
 msgstr ""
 
-#: admin/fai/class_faiPartitionTable.inc:418 admin/fai/class_faiScript.inc:364
-#: admin/fai/class_faiTemplate.inc:310
-msgid "delete"
+#: admin/fai/class_faiPartitionTable.inc:307 admin/fai/class_faiProfile.inc:50
+msgid "Partition table class name"
 msgstr ""
 
-#: admin/fai/class_faiPartitionTable.inc:769
-#: admin/fai/class_faiPartitionTable.inc:773
-msgid "FAI partition table"
+#: admin/fai/class_faiPartitionTable.inc:317
+msgid "Discs"
 msgstr ""
 
-#: admin/fai/class_faiPartitionTable.inc:779 admin/fai/class_faiHook.inc:531
-#: admin/fai/class_faiVariable.inc:398
-msgid "Read only"
+#: admin/fai/class_faiPartitionTable.inc:324
+msgid "Partitions in this class"
 msgstr ""
 
 #: admin/fai/class_faiDiskEntry.inc:273
-#: admin/fai/faiPartitionTableEntry.tpl.c:5 admin/fai/faiDiskEntry.tpl.c:5
 msgid "Device"
 msgstr ""
 
@@ -389,103 +198,103 @@ msgstr ""
 msgid "UUID"
 msgstr ""
 
-#: admin/fai/class_faiDiskEntry.inc:345
+#: admin/fai/class_faiDiskEntry.inc:344
 msgid "Disks"
 msgstr ""
 
-#: admin/fai/class_faiDiskEntry.inc:348 admin/fai/class_faiPartition.inc:321
-#: admin/fai/faiPartition.tpl.c:14
+#: admin/fai/class_faiDiskEntry.inc:347 admin/fai/class_faiPartition.inc:319
 msgid "Size"
 msgstr ""
 
-#: admin/fai/class_faiDiskEntry.inc:544
+#: admin/fai/class_faiDiskEntry.inc:443
+#, php-format
+msgid ""
+"The disk cannot be deleted while it is used in the '%s' disk definition!"
+msgstr ""
+
+#: admin/fai/class_faiDiskEntry.inc:536
 msgid "encrypted"
 msgstr ""
 
-#: admin/fai/class_faiDiskEntry.inc:547
+#: admin/fai/class_faiDiskEntry.inc:539
 msgid "bootable"
 msgstr ""
 
-#: admin/fai/class_faiDiskEntry.inc:550
+#: admin/fai/class_faiDiskEntry.inc:542
 msgid "preserve"
 msgstr ""
 
-#: admin/fai/class_faiDiskEntry.inc:735
+#: admin/fai/class_faiDiskEntry.inc:687 admin/fai/class_faiDiskEntry.inc:690
+#: admin/fai/class_faiDiskEntry.inc:737
+#: admin/fai/packageSelect/selectPackage-list.xml:40
+#: admin/fai/class_faiScript.inc:71 admin/fai/class_faiHook.inc:71
+#: admin/fai/class_faiVariable.inc:71
+#: admin/fai/class_faiSimplePluginClass.inc:50
+msgid "Name"
+msgstr "TÃªn"
+
+#: admin/fai/class_faiDiskEntry.inc:717
 msgid ""
 "You have more than four primary partition table entries in your "
 "configuration, please check your configuration twice."
 msgstr ""
 
-#: admin/fai/class_faiDiskEntry.inc:739
+#: admin/fai/class_faiDiskEntry.inc:721
 msgid ""
 "You cannot have more than three primary partition while using logical "
 "partitions, please check your configuration twice."
 msgstr ""
 
-#: admin/fai/class_faiDiskEntry.inc:752
-#: admin/fai/class_faiPartitionTableEntry.inc:448
+#: admin/fai/class_faiDiskEntry.inc:733
 msgid "Partition table entry"
 msgstr ""
 
-#: admin/fai/class_faiDiskEntry.inc:753
-#: admin/fai/class_faiPartitionTableEntry.inc:449
+#: admin/fai/class_faiDiskEntry.inc:734
 msgid "FAI partition table entry"
 msgstr ""
 
-#: admin/fai/class_faiDiskEntry.inc:760
+#: admin/fai/class_faiDiskEntry.inc:739
 msgid "Disk options"
 msgstr ""
 
-#: admin/fai/class_faiDiskEntry.inc:761
-#: admin/fai/class_faiPartitionTableEntry.inc:457
+#: admin/fai/class_faiDiskEntry.inc:740
 msgid "Partition type"
 msgstr ""
 
-#: admin/fai/class_faiDiskEntry.inc:762
-#: admin/fai/class_faiPartitionTableEntry.inc:458
+#: admin/fai/class_faiDiskEntry.inc:741
 msgid "Partition no."
 msgstr ""
 
-#: admin/fai/class_faiDiskEntry.inc:763
-#: admin/fai/class_faiPartitionTableEntry.inc:459
+#: admin/fai/class_faiDiskEntry.inc:742
 msgid "File system type"
 msgstr ""
 
-#: admin/fai/class_faiDiskEntry.inc:764
-#: admin/fai/class_faiPartitionTableEntry.inc:171
-#: admin/fai/class_faiPartitionTableEntry.inc:460
-#: admin/fai/class_faiPartition.inc:437 admin/fai/faiPartition.tpl.c:47
+#: admin/fai/class_faiDiskEntry.inc:743 admin/fai/class_faiPartition.inc:432
 msgid "Mount point"
 msgstr ""
 
-#: admin/fai/class_faiDiskEntry.inc:765
-#: admin/fai/class_faiPartitionTableEntry.inc:461
-#: admin/fai/class_faiPartition.inc:402 admin/fai/class_faiPartition.inc:407
+#: admin/fai/class_faiDiskEntry.inc:744 admin/fai/class_faiPartition.inc:397
+#: admin/fai/class_faiPartition.inc:402
 msgid "Partition size"
 msgstr ""
 
-#: admin/fai/class_faiDiskEntry.inc:766
-#: admin/fai/class_faiPartitionTableEntry.inc:173
-#: admin/fai/class_faiPartitionTableEntry.inc:462
-#: admin/fai/faiPartition.tpl.c:50
+#: admin/fai/class_faiDiskEntry.inc:745
 msgid "Mount options"
 msgstr ""
 
-#: admin/fai/class_faiDiskEntry.inc:767
-#: admin/fai/class_faiPartitionTableEntry.inc:463
+#: admin/fai/class_faiDiskEntry.inc:746
 msgid "File system options"
 msgstr ""
 
-#: admin/fai/class_faiDiskEntry.inc:768
-#: admin/fai/class_faiPartitionTableEntry.inc:464
+#: admin/fai/class_faiDiskEntry.inc:747
 msgid "Partition flags"
 msgstr ""
 
-#: admin/fai/class_debconfTemplate.inc:227
+#: admin/fai/class_debconfTemplate.inc:225
 msgid "This package has no debconf options."
 msgstr ""
 
-#: admin/fai/class_debconfTemplate.inc:264
+#: admin/fai/class_debconfTemplate.inc:262
 msgid ""
 "This debconf question is dynamically generated during package installation "
 "and requires choosing between specific options which cannot be presented "
@@ -493,217 +302,59 @@ msgid ""
 " effect."
 msgstr ""
 
-#: admin/fai/class_faiTemplateEntry.inc:139
-msgid "no file uploaded yet"
+#: admin/fai/class_faiTemplateEntry.inc:143
+msgid "File path"
 msgstr ""
 
-#: admin/fai/class_faiTemplateEntry.inc:142
-#, php-format
-msgid "exists in database (size: %s bytes)"
+#: admin/fai/class_faiTemplateEntry.inc:143
+msgid "Complete absolute template file path and name"
 msgstr ""
 
-#: admin/fai/class_faiTemplateEntry.inc:251
-#: admin/systems/class_faiLogView.inc:70 admin/fai/faiTemplateEntry.tpl.c:23
-msgid "File"
-msgstr "File"
-
-#: admin/fai/class_faiTemplateEntry.inc:255
-#: admin/fai/faiTemplateEntry.tpl.c:11
-msgid "Destination path"
+#: admin/fai/class_faiTemplateEntry.inc:147
+msgid "Short description of the file"
 msgstr ""
 
-#: admin/fai/class_faiTemplateEntry.inc:260 admin/fai/faiTemplateEntry.tpl.c:8
-msgid "File name"
+#: admin/fai/class_faiTemplateEntry.inc:156
+msgid "Template attributes"
 msgstr ""
 
-#: admin/fai/class_faiTemplateEntry.inc:264
-#: admin/fai/class_faiTemplateEntry.inc:266
-#: admin/fai/faiTemplateEntry.tpl.c:68
-msgid "User"
-msgstr "NgÆ°á»i dÃ¹ng"
-
-#: admin/fai/class_faiTemplateEntry.inc:270
-#: admin/fai/class_faiTemplateEntry.inc:273
-#: admin/fai/class_faiTemplateEntry.inc:275
-#: admin/fai/faiTemplateEntry.tpl.c:47 admin/fai/faiTemplateEntry.tpl.c:74
-msgid "Group"
-msgstr "NhÃ³m "
-
-#: admin/fai/class_faiTemplateEntry.inc:305
-msgid "Template entry"
+#: admin/fai/class_faiTemplateEntry.inc:160
+msgid "Template file content"
 msgstr ""
 
-#: admin/fai/class_faiTemplateEntry.inc:306
-msgid "FAI template entry"
+#: admin/fai/class_faiTemplateEntry.inc:160
+msgid "Content of the template file"
 msgstr ""
 
-#: admin/fai/class_faiTemplateEntry.inc:314
-msgid "Template file"
+#: admin/fai/class_faiTemplateEntry.inc:164
+msgid "Owner and group of the file"
 msgstr ""
 
-#: admin/fai/class_faiTemplateEntry.inc:315
-msgid "Template path"
+#: admin/fai/class_faiTemplateEntry.inc:167
+msgid "Owner"
 msgstr ""
 
-#: admin/fai/class_faiTemplateEntry.inc:316
+#: admin/fai/class_faiTemplateEntry.inc:167
 msgid "File owner"
 msgstr ""
 
-#: admin/fai/class_faiTemplateEntry.inc:317
-msgid "File permissions"
-msgstr ""
-
-#: admin/fai/class_FAI.inc:287 admin/fai/class_FAI.inc:679
-#: admin/fai/class_FAI.inc:1266 admin/fai/class_FAI.inc:1283
-#: admin/fai/class_FAI.inc:1287
-msgid "LDAP error"
-msgstr "Lá»—i LDAP"
-
-#: admin/fai/class_FAI.inc:570
-#, php-format
-msgid "Error, following objects should be equal '%s' and '%s'"
-msgstr ""
-
-#: admin/fai/class_FAI.inc:891
-#, php-format
-msgid "Creating group application release for %s"
-msgstr ""
-
-#: admin/fai/class_FAI.inc:960 admin/fai/class_FAI.inc:982
-#: admin/fai/class_FAI.inc:1022 admin/fai/class_FAI.inc:1027
-#: admin/fai/class_FAI.inc:1065
-msgid "Object"
-msgstr "Ä‘á»‘i tÆ°á»£ng"
-
-#: admin/fai/class_FAI.inc:961
-#, php-format
-msgid "Adding missing group application release container %s."
-msgstr ""
-
-#: admin/fai/class_FAI.inc:983
-#, php-format
-msgid "Adding group application release container %s."
-msgstr ""
-
-#: admin/fai/class_FAI.inc:1023
-#, php-format
-msgid "Could not create menu entry %s. (Already exists)."
-msgstr ""
-
-#: admin/fai/class_FAI.inc:1028
-#, php-format
-msgid "Created group application menu entry for %s."
-msgstr ""
-
-#: admin/fai/class_FAI.inc:1059
-#, php-format
-msgid "Creating copy of %s"
-msgstr ""
-
-#: admin/fai/class_FAI.inc:1062
-msgid "Processing"
-msgstr ""
-
-#: admin/fai/class_FAI.inc:1080
-msgid "Could not create new release, the destination dn is already in use."
-msgstr ""
-
-#: admin/fai/class_FAI.inc:1093
-msgid "Error while fetching source dn - aborted!"
-msgstr ""
-
-#: admin/fai/class_FAI.inc:1174
-msgid "Fatal error"
-msgstr "Lá»—i náº·ng"
-
-#: admin/fai/class_FAI.inc:1175
-#, php-format
-msgid ""
-"Release creation failed due to ldap errors. Additional informations '%s'."
-msgstr ""
-
-#: admin/fai/class_faiPartitionTableEntry.inc:162
-msgid "primary"
-msgstr ""
-
-#: admin/fai/class_faiPartitionTableEntry.inc:162
-msgid "logical"
-msgstr ""
-
-#: admin/fai/class_faiPartitionTableEntry.inc:169
-#: admin/fai/faiPartition.tpl.c:8
-msgid "Type"
-msgstr "Loáº¡i"
-
-#: admin/fai/class_faiPartitionTableEntry.inc:170
-msgid "FS type"
-msgstr ""
-
-#: admin/fai/class_faiPartitionTableEntry.inc:172
-msgid "Size in MB"
-msgstr ""
-
-#: admin/fai/class_faiPartitionTableEntry.inc:174
-msgid "FS option"
-msgstr ""
-
-#: admin/fai/class_faiPartitionTableEntry.inc:175
-#: admin/fai/faiPartition.tpl.c:23
-msgid "Preserve"
-msgstr ""
-
-#: admin/fai/class_faiPartitionTableEntry.inc:266
-msgid "False"
-msgstr ""
-
-#: admin/fai/class_faiPartitionTableEntry.inc:268
-msgid "True"
-msgstr ""
-
-#: admin/fai/class_faiPartitionTableEntry.inc:272
-#: admin/fai/class_faiPartitionTableEntry.inc:274 admin/fai/fai-list.xml:159
-#: admin/fai/fai-list.xml:198
-msgid "Remove"
-msgstr "XÃ³a bá»"
-
-#: admin/fai/class_faiPartitionTableEntry.inc:384
-#, php-format
-msgid "please enter a unique mount point for partition %s"
-msgstr ""
-
-#: admin/fai/class_faiPartitionTableEntry.inc:389
-#, php-format
-msgid "partition %s mount point"
-msgstr ""
-
-#: admin/fai/class_faiPartitionTableEntry.inc:394
-#, php-format
-msgid ""
-"File system type 'swap' is already used, change file system type for "
-"partition %s."
-msgstr ""
+#: admin/fai/class_faiTemplateEntry.inc:172
+msgid "Group"
+msgstr "NhÃ³m "
 
-#: admin/fai/class_faiPartitionTableEntry.inc:398
-msgid "Please use 'swap' as mount point, if 'swap' is used as fs-type."
+#: admin/fai/class_faiTemplateEntry.inc:172
+msgid "File group"
 msgstr ""
 
-#: admin/fai/class_faiPartitionTableEntry.inc:404
-#: admin/fai/class_faiPartitionTableEntry.inc:408
-#: admin/fai/class_faiPartitionTableEntry.inc:414
-#: admin/fai/class_faiPartitionTableEntry.inc:416
-#: admin/fai/class_faiPartitionTableEntry.inc:421
-#, php-format
-msgid "partition %s size"
+#: admin/fai/class_faiTemplateEntry.inc:181
+msgid "Access"
 msgstr ""
 
-#: admin/fai/class_faiPartitionTableEntry.inc:436
-msgid ""
-"You have more than 3 primary partition table entries in your configuration, "
-"please check your configuration twice."
+#: admin/fai/class_faiTemplateEntry.inc:181
+msgid "Access rights"
 msgstr ""
 
 #: admin/fai/packageSelect/selectPackage-list.xml:10
-#: admin/fai/classSelect/selectClass-list.xml:11
 msgid "Please select the desired entries"
 msgstr ""
 
@@ -711,147 +362,94 @@ msgstr ""
 msgid "Version"
 msgstr ""
 
-#: admin/fai/class_faiProfile.inc:310
-msgid "This list displays all assigned class names for this profile."
-msgstr ""
-
-#: admin/fai/class_faiProfile.inc:313 admin/fai/class_askClassName.inc:103
-#: admin/fai/classSelect/class_classSelect.inc:53
-#: admin/fai/class_faiProfileEntry.inc:158
-msgid "Hook bundle"
-msgstr ""
-
-#: admin/fai/class_faiProfile.inc:314 admin/fai/class_askClassName.inc:105
-#: admin/fai/classSelect/class_classSelect.inc:54
-#: admin/fai/class_faiProfileEntry.inc:159
-msgid "Template bundle"
-msgstr ""
-
-#: admin/fai/class_faiProfile.inc:315 admin/fai/class_askClassName.inc:101
-#: admin/fai/classSelect/class_classSelect.inc:55
-#: admin/fai/class_faiProfileEntry.inc:160
-msgid "Script bundle"
-msgstr ""
-
-#: admin/fai/class_faiProfile.inc:316 admin/fai/class_askClassName.inc:102
-#: admin/fai/classSelect/class_classSelect.inc:56
-#: admin/fai/class_faiProfileEntry.inc:161
-msgid "Variable bundle"
-msgstr ""
-
-#: admin/fai/class_faiProfile.inc:317 admin/fai/class_askClassName.inc:100
-#: admin/fai/classSelect/class_classSelect.inc:57
-#: admin/fai/class_faiProfileEntry.inc:162
-msgid "Package bundle"
-msgstr ""
-
-#: admin/fai/class_faiProfile.inc:321
-msgid "Remove class from profile"
-msgstr ""
-
-#: admin/fai/class_faiProfile.inc:324
-msgid "Up"
-msgstr "LÃªn"
-
-#: admin/fai/class_faiProfile.inc:325
-msgid "Down"
-msgstr "Xuá»‘ng"
-
-#: admin/fai/class_faiProfile.inc:410
-msgid "No class specified for this profile!"
-msgstr ""
-
-#: admin/fai/class_faiProfile.inc:419
-msgid "You can't use the same name for a class and a profile!"
+#: admin/fai/class_faiProfile.inc:28
+msgid "Profile"
 msgstr ""
 
-#: admin/fai/class_faiProfile.inc:455
+#: admin/fai/class_faiProfile.inc:29
 msgid "FAI profile"
 msgstr ""
 
-#: admin/fai/class_faiProfile.inc:458
+#: admin/fai/class_faiProfile.inc:32
 msgid "FAI Profile"
 msgstr ""
 
-#: admin/fai/class_faiProfile.inc:465 admin/fai/faiProfile.tpl.c:17
+#: admin/fai/class_faiProfile.inc:61
 msgid "FAI classes"
 msgstr ""
 
-#: admin/fai/class_faiHookEntry.inc:200
-msgid "Hook entry"
+#: admin/fai/class_faiProfile.inc:61
+msgid "FAI classes which are part of this profile"
 msgstr ""
 
-#: admin/fai/class_faiHookEntry.inc:201
-msgid "FAI hook entry"
+#: admin/fai/class_faiPackageConfiguration.inc:88
+#, php-format
+msgid "Debconf information for package '%s'"
 msgstr ""
 
-#: admin/fai/class_faiHookEntry.inc:209 admin/fai/faiHookEntry.tpl.c:20
-msgid "Task"
+#: admin/fai/class_faiScript.inc:30 admin/fai/class_faiScript.inc:84
+#: admin/fai/class_faiHook.inc:87
+msgid "Script"
 msgstr ""
 
-#: admin/fai/class_faiHookEntry.inc:210 admin/fai/class_faiScript.inc:595
-#: admin/fai/class_faiScript.inc:599
+#: admin/fai/class_faiScript.inc:31 admin/fai/class_faiScript.inc:34
 msgid "FAI script"
 msgstr ""
 
-#: admin/fai/class_faiPackageConfiguration.inc:88
-#, php-format
-msgid "Debconf information for package '%s'"
+#: admin/fai/class_faiScript.inc:63
+msgid "Scripts"
 msgstr ""
 
-#: admin/fai/class_askClassName.inc:99 admin/fai/class_askClassName.inc:100
-#: admin/fai/class_askClassName.inc:101 admin/fai/class_askClassName.inc:102
-#: admin/fai/class_askClassName.inc:103 admin/fai/class_askClassName.inc:104
-#: admin/fai/class_askClassName.inc:105 admin/fai/class_askClassName.inc:106
-msgid "Create new FAI object"
+#: admin/fai/class_faiScript.inc:67 admin/fai/class_faiHook.inc:67
+#: admin/fai/class_faiVariable.inc:67
+msgid "Variables in this class"
 msgstr ""
 
-#: admin/fai/class_faiTemplateEdit.inc:80
-#, php-format
-msgid ""
-"The file encodig has changed from '%s' to '%s'. Do you really want to save?"
+#: admin/fai/class_faiScript.inc:71 admin/fai/class_faiHook.inc:71
+#: admin/fai/class_faiVariable.inc:71
+msgid "The name of the variable"
 msgstr ""
 
-#: admin/fai/class_faiScript.inc:333 admin/fai/class_faiScript.inc:335
-msgid "Sort direction"
+#: admin/fai/class_faiScript.inc:75 admin/fai/class_faiHook.inc:75
+#: admin/fai/class_faiVariable.inc:75
+msgid "A short description of the variable"
 msgstr ""
 
-#: admin/fai/class_faiScript.inc:348 admin/fai/faiScriptEntry.tpl.c:20
+#: admin/fai/class_faiScript.inc:79
 msgid "Priority"
 msgstr ""
 
-#: admin/fai/class_faiScript.inc:350
-msgid "Action"
+#: admin/fai/class_faiScript.inc:79
+msgid "Priority of this script (FIXME: less is done first?)"
 msgstr ""
 
-#: admin/fai/classSelect/selectClass-list.xml:36 admin/fai/fai-list.xml:88
-#: admin/fai/faiScriptEntry.tpl.c:14
-msgid "Properties"
-msgstr "Properties"
+#: 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:501 admin/fai/fai-list.xml:116
+#: admin/fai/class_faiTemplate.inc:153
 msgid "Template"
 msgstr "Máº«u"
 
-#: admin/fai/class_faiTemplate.inc:502 admin/fai/class_faiTemplate.inc:506
+#: admin/fai/class_faiTemplate.inc:154 admin/fai/class_faiTemplate.inc:157
 msgid "FAI template"
 msgstr ""
 
-#: admin/fai/class_faiVariableEntry.inc:107
-msgid "Content"
-msgstr ""
-
-#: admin/fai/class_faiVariableEntry.inc:142
-msgid "Variable entry"
+#: admin/fai/class_faiTemplate.inc:176
+msgid "Template class name"
 msgstr ""
 
-#: admin/fai/class_faiVariableEntry.inc:143
-msgid "FAI variable entry "
+#: admin/fai/class_faiTemplate.inc:186
+msgid "Template files"
 msgstr ""
 
-#: admin/fai/class_faiVariableEntry.inc:151
-#: admin/fai/faiVariableEntry.tpl.c:20
-msgid "Variable content"
+#: admin/fai/class_faiTemplate.inc:190
+msgid "Template files in this class"
 msgstr ""
 
 #: admin/fai/class_faiPartition.inc:176 admin/fai/class_faiPartition.inc:180
@@ -950,95 +548,74 @@ msgstr ""
 msgid "btrfs"
 msgstr ""
 
-#: admin/fai/class_faiPartition.inc:224
-msgid "LVM/RAID"
-msgstr ""
-
-#: admin/fai/class_faiPartition.inc:327
+#: admin/fai/class_faiPartition.inc:325
 msgid "spare"
 msgstr ""
 
-#: admin/fai/class_faiPartition.inc:330
+#: admin/fai/class_faiPartition.inc:328
 msgid "missing"
 msgstr ""
 
-#: admin/fai/class_faiPartition.inc:333
+#: admin/fai/class_faiPartition.inc:331
 msgid "Options"
 msgstr ""
 
-#: admin/fai/class_faiPartition.inc:420
+#: admin/fai/class_faiPartition.inc:415
 msgid "Minimum partition size"
 msgstr ""
 
-#: admin/fai/class_faiPartition.inc:420
+#: admin/fai/class_faiPartition.inc:415
 msgid "Maximum partition size"
 msgstr ""
 
-#: admin/fai/class_faiPartition.inc:428
+#: admin/fai/class_faiPartition.inc:423
 msgid "Raid arrays must contain at least two partitions!"
 msgstr ""
 
-#: admin/fai/class_faiPartition.inc:430
+#: admin/fai/class_faiPartition.inc:425
 msgid ""
 "Raid 0 arrays can only be realized with a combination of two partitions!"
 msgstr ""
 
-#: admin/fai/class_faiHook.inc:332 admin/fai/class_faiHook.inc:334
-#: admin/fai/fai-list.xml:190 admin/fai/faiVariable.tpl.c:23
-#: admin/fai/faiVariable.tpl.c:26
-msgid "Edit"
-msgstr "Hiá»‡u chá»‰nh"
-
-#: admin/fai/class_faiHook.inc:336
-msgid "Delete"
-msgstr "XÃ³a"
-
-#: admin/fai/class_faiHook.inc:521 admin/fai/fai-list.xml:128
+#: admin/fai/class_faiHook.inc:30
 msgid "Hook"
 msgstr ""
 
-#: admin/fai/class_faiHook.inc:522 admin/fai/class_faiHook.inc:526
+#: admin/fai/class_faiHook.inc:31 admin/fai/class_faiHook.inc:34
 msgid "FAI hook"
 msgstr ""
 
-#: admin/fai/class_faiVariable.inc:387 admin/fai/fai-list.xml:134
-msgid "Variable"
+#: admin/fai/class_faiHook.inc:63
+msgid "Hooks"
 msgstr ""
 
-#: admin/fai/class_faiVariable.inc:388 admin/fai/class_faiVariable.inc:392
-msgid "FAI variable"
+#: admin/fai/class_faiHook.inc:79
+msgid "Task"
 msgstr ""
 
-#: admin/fai/class_faiProfileEntry.inc:184 admin/fai/askClassName.tpl.c:11
-#: admin/fai/askClassName.tpl.c:17 admin/fai/paste_generic.tpl.c:5
-msgid "Class name"
+#: admin/fai/class_faiHook.inc:87
+msgid "The script of this hook"
 msgstr ""
 
-#: admin/fai/class_faiProfileEntry.inc:184 admin/fai/faiTemplate.tpl.c:14
-#: admin/fai/faiVariable.tpl.c:14 admin/fai/faiHook.tpl.c:14
-#: admin/fai/faiPartitionTable.tpl.c:17 admin/fai/faiScript.tpl.c:14
-msgid "Objects"
+#: admin/fai/class_faiVariable.inc:30
+msgid "Variable"
 msgstr ""
 
-#: admin/fai/fai-list.xml:11
-msgid "List of deployment classes and products"
+#: admin/fai/class_faiVariable.inc:31 admin/fai/class_faiVariable.inc:34
+msgid "FAI variable"
 msgstr ""
 
-#: admin/fai/fai-list.xml:15
-msgid "partitionTable"
+#: admin/fai/class_faiVariable.inc:63
+msgid "Variables"
 msgstr ""
 
-#: admin/fai/fai-list.xml:23
-msgid "packagelist"
+#: admin/fai/class_faiVariable.inc:79
+msgid "Content"
 msgstr ""
 
-#: admin/fai/fai-list.xml:93
-msgid "Actions"
-msgstr "CÃ¡c thao tÃ¡c"
-
-#: admin/fai/fai-list.xml:104
-msgid "Create"
-msgstr "Táº¡o "
+#: admin/fai/class_faiVariable.inc:79
+msgid "The content of the variable"
+msgstr ""
 
 #: admin/systems/class_faiLogView.inc:56
 msgid "Sort down"
@@ -1048,6 +625,10 @@ msgstr ""
 msgid "Sort up"
 msgstr ""
 
+#: admin/systems/class_faiLogView.inc:70
+msgid "File"
+msgstr "File"
+
 #: admin/systems/class_faiLogView.inc:71
 msgid "Date"
 msgstr ""
@@ -1082,7 +663,7 @@ msgstr ""
 msgid "Selected file: %s"
 msgstr ""
 
-#: admin/systems/class_faiStartup.inc:70 admin/fai/paste_generic.tpl.c:2
+#: admin/systems/class_faiStartup.inc:70
 msgid "FAI settings"
 msgstr ""
 
@@ -1102,11 +683,6 @@ msgstr ""
 msgid "FAI profil to be applied to this computer"
 msgstr ""
 
-#: admin/systems/class_faiStartup.inc:90 admin/fai/faiPackage.tpl.c:14
-#: admin/fai/faiPackage.tpl.c:17
-msgid "Repository"
-msgstr ""
-
 #: admin/systems/class_faiStartup.inc:90
 msgid "FAI Debian repository to be used for installation"
 msgstr ""
@@ -1131,85 +707,96 @@ msgstr ""
 msgid "Linux kernel parameters to be ran"
 msgstr ""
 
-#: admin/systems/class_faiStartup.inc:178
+#: admin/systems/class_faiStartup.inc:179
 msgid "Full automated installation"
 msgstr ""
 
-#: admin/systems/services/repository/class_serviceRepository.inc:31
+#: admin/systems/services/repository/class_serviceDebianRepository.inc:34
+#: admin/systems/services/repository/class_serviceCentosRepository.inc:31
+msgid "Repositories"
+msgstr ""
+
+#: admin/systems/services/repository/class_serviceDebianRepository.inc:39
+#: admin/systems/services/repository/class_serviceCentosRepository.inc:36
+msgid "Repositories this server hosts"
+msgstr ""
+
+#: admin/systems/services/repository/class_serviceDebianRepository.inc:43
+#: admin/systems/services/repository/class_serviceCentosRepository.inc:40
 msgid "URL"
 msgstr ""
 
-#: admin/systems/services/repository/class_serviceRepository.inc:31
+#: admin/systems/services/repository/class_serviceDebianRepository.inc:43
+#: admin/systems/services/repository/class_serviceCentosRepository.inc:40
 msgid "Repository url"
 msgstr ""
 
-#: admin/systems/services/repository/class_serviceRepository.inc:35
+#: admin/systems/services/repository/class_serviceDebianRepository.inc:47
+#: admin/systems/services/repository/class_serviceCentosRepository.inc:44
 msgid "Parent server"
 msgstr ""
 
-#: admin/systems/services/repository/class_serviceRepository.inc:35
+#: admin/systems/services/repository/class_serviceDebianRepository.inc:47
+#: admin/systems/services/repository/class_serviceCentosRepository.inc:44
 msgid "Parent repository server"
 msgstr ""
 
-#: admin/systems/services/repository/class_serviceRepository.inc:40
-msgid "Release used on this repository"
+#: admin/systems/services/repository/class_serviceDebianRepository.inc:52
+msgid "Debian release used on this repository"
 msgstr ""
 
-#: admin/systems/services/repository/class_serviceRepository.inc:47
-msgid "Sections"
+#: admin/systems/services/repository/class_serviceDebianRepository.inc:58
+msgid "Debian sections available 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
+#: admin/systems/services/repository/class_serviceDebianRepository.inc:63
+#: admin/systems/services/repository/class_serviceCentosRepository.inc:57
 msgid "Mirror mode"
 msgstr ""
 
-#: admin/systems/services/repository/class_serviceRepository.inc:52
+#: admin/systems/services/repository/class_serviceDebianRepository.inc:63
+#: admin/systems/services/repository/class_serviceCentosRepository.inc:57
 msgid ""
 "Is this mirror an installation repository? Is its release a custom one?"
 msgstr ""
 
-#: admin/systems/services/repository/class_serviceRepository.inc:57
+#: admin/systems/services/repository/class_serviceDebianRepository.inc:68
+#: admin/systems/services/repository/class_serviceCentosRepository.inc:62
 msgid "Local mirror"
 msgstr ""
 
-#: admin/systems/services/repository/class_serviceRepository.inc:57
+#: admin/systems/services/repository/class_serviceDebianRepository.inc:68
+#: admin/systems/services/repository/class_serviceCentosRepository.inc:62
 msgid "Is this mirror a local or a network mirror?"
 msgstr ""
 
-#: admin/systems/services/repository/class_serviceRepository.inc:66
+#: admin/systems/services/repository/class_serviceDebianRepository.inc:77
+#: admin/systems/services/repository/class_serviceCentosRepository.inc:71
 msgid "Architectures"
 msgstr ""
 
-#: admin/systems/services/repository/class_serviceRepository.inc:66
+#: admin/systems/services/repository/class_serviceDebianRepository.inc:77
+#: admin/systems/services/repository/class_serviceCentosRepository.inc:71
 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:140
-msgid "Repositories"
+#: admin/systems/services/repository/class_serviceDebianRepository.inc:99
+#: admin/systems/services/repository/class_serviceDebianRepository.inc:100
+msgid "Debian repository"
 msgstr ""
 
-#: admin/systems/services/repository/class_serviceRepository.inc:145
-msgid "Repositories this server hosts"
+#: admin/systems/services/repository/class_serviceDebianRepository.inc:100
+#: admin/systems/services/repository/class_serviceCentosRepository.inc:96
+msgid "Services"
 msgstr ""
 
-#: admin/systems/services/repository/class_serviceRepository.inc:160
-msgid "Package repository"
+#: admin/systems/services/repository/class_serviceCentosRepository.inc:49
+msgid "Centos release used on this repository"
 msgstr ""
 
-#: admin/systems/services/repository/class_serviceRepository.inc:161
-msgid "Package repository information"
+#: admin/systems/services/repository/class_serviceCentosRepository.inc:95
+#: admin/systems/services/repository/class_serviceCentosRepository.inc:96
+msgid "Centos repository"
 msgstr ""
 
 #: config/fai/class_faiConfig.inc:28
@@ -1241,476 +828,3 @@ msgstr ""
 #: config/fai/class_faiConfig.inc:60
 msgid "s"
 msgstr ""
-
-#: admin/fai/faiPartitionTableEntry.tpl.c:2 admin/fai/faiVariableEntry.tpl.c:2
-#: admin/fai/faiVariableEntry.tpl.c:5 admin/fai/faiDiskEntry.tpl.c:2
-#: admin/fai/faiTemplate.tpl.c:2 admin/fai/faiTemplate.tpl.c:5
-#: admin/fai/faiVariable.tpl.c:2 admin/fai/faiVariable.tpl.c:5
-#: admin/fai/faiHook.tpl.c:2 admin/fai/faiHook.tpl.c:5
-#: admin/fai/faiPackage.tpl.c:2 admin/fai/faiPackage.tpl.c:5
-#: admin/fai/faiTemplateEntry.tpl.c:2 admin/fai/faiTemplateEntry.tpl.c:5
-#: admin/fai/faiScriptEntry.tpl.c:2 admin/fai/faiScriptEntry.tpl.c:5
-#: admin/fai/faiPartitionTable.tpl.c:2 admin/fai/faiPartitionTable.tpl.c:5
-#: admin/fai/faiScript.tpl.c:2 admin/fai/faiScript.tpl.c:5
-#: admin/fai/faiProfile.tpl.c:2 admin/fai/faiProfile.tpl.c:5
-#: admin/fai/faiProfile.tpl.c:14 admin/fai/faiHookEntry.tpl.c:2
-#: admin/fai/faiHookEntry.tpl.c:5
-msgid "Generic"
-msgstr "ThÃ´ng tin chung"
-
-#: admin/fai/faiPartitionTableEntry.tpl.c:14
-#: admin/fai/faiPartitionTableEntry.tpl.c:17 admin/fai/faiDiskEntry.tpl.c:23
-#: admin/fai/faiDiskEntry.tpl.c:26
-msgid "Partition entries"
-msgstr ""
-
-#: admin/fai/faiPartitionTableEntry.tpl.c:20
-#: admin/fai/faiPartitionTableEntry.tpl.c:23 admin/fai/faiDiskEntry.tpl.c:29
-#: admin/fai/faiDiskEntry.tpl.c:32
-msgid "Add partition"
-msgstr ""
-
-#: admin/fai/branch_selector.tpl.c:2
-msgid "Releases"
-msgstr ""
-
-#: admin/fai/branch_selector.tpl.c:5
-msgid "Current release"
-msgstr ""
-
-#: admin/fai/branch_selector.tpl.c:8 admin/fai/branch_selector.tpl.c:17
-#: admin/fai/fai-filter.tpl.c:8 admin/fai/fai-filter.tpl.c:17
-msgid "Create release"
-msgstr ""
-
-#: admin/fai/branch_selector.tpl.c:11 admin/fai/branch_selector.tpl.c:23
-#: admin/fai/fai-filter.tpl.c:11 admin/fai/fai-filter.tpl.c:23
-msgid "Create read-only release"
-msgstr ""
-
-#: admin/fai/branch_selector.tpl.c:20 admin/fai/fai-filter.tpl.c:20
-msgid "Freeze"
-msgstr ""
-
-#: admin/fai/branch_selector.tpl.c:26 admin/fai/fai-filter.tpl.c:26
-msgid "Delete current release"
-msgstr ""
-
-#: admin/fai/faiPartition.tpl.c:2
-msgid "Partition"
-msgstr ""
-
-#: admin/fai/faiPartition.tpl.c:17
-msgid "Resize existing partition"
-msgstr ""
-
-#: admin/fai/faiPartition.tpl.c:20
-msgid "Bootable"
-msgstr ""
-
-#: admin/fai/faiPartition.tpl.c:26 admin/fai/faiDiskEntry.tpl.c:20
-msgid "Combined physical partitions"
-msgstr ""
-
-#: admin/fai/faiPartition.tpl.c:29
-msgid "Toggle missing"
-msgstr ""
-
-#: admin/fai/faiPartition.tpl.c:32
-msgid "Toggle spare"
-msgstr ""
-
-#: admin/fai/faiPartition.tpl.c:35
-msgid "Filesystem"
-msgstr ""
-
-#: admin/fai/faiPartition.tpl.c:38
-msgid "Filesystem create options"
-msgstr ""
-
-#: admin/fai/faiPartition.tpl.c:41
-msgid "Encrypted"
-msgstr ""
-
-#: admin/fai/faiPartition.tpl.c:44
-msgid "Tune options"
-msgstr ""
-
-#: admin/fai/faiNewBranch.tpl.c:2
-msgid ""
-"You are now going to create a branch or locked branch. This action clones "
-"the existing release to another release name. Branches can be modified as "
-"usual. FAI classes of locked branches cannot be modified, just additional "
-"classes are possible. Branch names should be alphanumeric, excluding the "
-"reserved names 'scripts', 'hooks', 'partitions', 'variables', 'templates' "
-"and 'fai'."
-msgstr ""
-
-#: admin/fai/faiNewBranch.tpl.c:5
-msgid ""
-"Branches are created as subreleases of the currently selected branch. "
-"Creating a new branch named 1.0.2 in SARGE for example, will result in a new"
-" release called SARGE/1.0.2."
-msgstr ""
-
-#: admin/fai/faiNewBranch.tpl.c:8
-msgid "Please enter a name for the branch"
-msgstr ""
-
-#: admin/fai/faiNewBranch.tpl.c:11
-msgid "Processing the requested operation"
-msgstr "Xá» lÃ½ thao tÃ¡c Ä‘Æ°á»£c yÃªu cáº§u"
-
-#: admin/fai/faiNewBranch.tpl.c:14
-msgid ""
-"As soon as the copy operation has finished, you can scroll down to end of "
-"the page and press the 'Continue' button to continue with the fai management"
-" dialog."
-msgstr ""
-
-#: admin/fai/faiNewBranch.tpl.c:17
-msgid ""
-"Your browser doesn't support iframes, please use this link to perform the "
-"requested operation."
-msgstr "TrÃ¬nh duyá»‡t cá»§a báº¡n khÃ´ng há»— trá»£ iframe, xin hÃ£y sá» dá»¥ng Ä‘Æ°á»ng link nÃ y Ä‘á»ƒ thá»±c hiá»‡n nhá»¯ng thao tÃ¡c Ä‘Æ°á»£c yÃªu cáº§u."
-
-#: admin/fai/faiNewBranch.tpl.c:20
-msgid "Perform requested operation."
-msgstr ""
-
-#: admin/fai/faiNewBranch.tpl.c:23
-msgid "Initiate operation"
-msgstr ""
-
-#: admin/fai/faiVariableEntry.tpl.c:14 admin/fai/faiVariableEntry.tpl.c:17
-msgid "Variable attributes"
-msgstr ""
-
-#: admin/fai/faiDiskEntry.tpl.c:11
-msgid "fstab key"
-msgstr ""
-
-#: admin/fai/faiDiskEntry.tpl.c:17
-msgid "Disk label"
-msgstr ""
-
-#: admin/fai/faiTemplate.tpl.c:17
-msgid "List of template files"
-msgstr ""
-
-#: admin/fai/faiVariable.tpl.c:17
-msgid "List of assigned variables"
-msgstr ""
-
-#: admin/fai/faiVariable.tpl.c:20
-msgid "Choose a variable to delete or edit"
-msgstr ""
-
-#: admin/fai/askClassName.tpl.c:2
-msgid ""
-"Adding a new class to the FAI management, requires a class name. You have to"
-" specify a unique class name for unique types of FAI classes, while you can "
-"use the same class name for different types of FAI classes. In the laste "
-"case, FAI will automatically enclose all these different class types to one "
-"unique class name."
-msgstr ""
-
-#: admin/fai/askClassName.tpl.c:5
-msgid ""
-"Please use one of the following methods to choose the name for the new FAI "
-"class."
-msgstr ""
-
-#: admin/fai/askClassName.tpl.c:8
-msgid "Enter FAI class name manually"
-msgstr ""
-
-#: admin/fai/askClassName.tpl.c:14
-msgid "Choose FAI class name from a list of existing classes"
-msgstr ""
-
-#: admin/fai/askClassName.tpl.c:20
-msgid "Choose class name"
-msgstr ""
-
-#: admin/fai/faiGroupHandle.tpl.c:2
-msgid "Please select the objects you want to remove:"
-msgstr ""
-
-#: admin/fai/faiGroupHandle.tpl.c:5
-msgid "Freezed"
-msgstr ""
-
-#: admin/fai/faiGroupHandle.tpl.c:8
-msgid "Select the object you want to edit:"
-msgstr ""
-
-#: admin/fai/faiGroupHandle.tpl.c:11
-msgid "Select the object you want to copy:"
-msgstr ""
-
-#: admin/fai/remove.tpl.c:5
-msgid ""
-"This includes all account data, system access rules, imap settings, etc. for"
-" this user. Please double check if your really want to do this since there "
-"is no way for FusionDirectory to get your data back."
-msgstr ""
-
-#: admin/fai/remove.tpl.c:8 admin/fai/remove_branch.tpl.c:8
-msgid "So - if you're sure - press 'Delete' to continue or 'Cancel' to abort."
-msgstr "VÃ¬ tháº¿ náº¿u báº¡n cháº¯c cháº¯n hÃ£y nháº¥n \"XÃ³a bá»\" Ä‘á»ƒ tiáº¿p tá»¥c hoáº·c'Há»§y bá»' Ä‘á»ƒ dá»«ng láº¡i."
-
-#: admin/fai/faiHook.tpl.c:17
-msgid "List of hook scripts"
-msgstr ""
-
-#: admin/fai/packageSelect/selectPackage-list.tpl.c:2
-#: admin/fai/classSelect/selectClass-list.tpl.c:5
-msgid "Update"
-msgstr ""
-
-#: admin/fai/packageSelect/selectPackage-list.tpl.c:5
-#: admin/fai/classSelect/selectClass-list.tpl.c:8
-msgid "Submit"
-msgstr "Ná»™p"
-
-#: admin/fai/packageSelect/selectPackage-filter.tpl.c:2
-#: admin/fai/classSelect/selectClass-filter.tpl.c:2
-#: admin/fai/fai-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/remove_branch.tpl.c:5
-msgid ""
-"This includes all account data, system access, etc. for this branch. Please "
-"double check if your really want to do this since there is no way for "
-"FusionDirectory to get your data back."
-msgstr ""
-
-#: admin/fai/faiPackage.tpl.c:26
-msgid "Install method"
-msgstr ""
-
-#: admin/fai/faiPackage.tpl.c:29
-msgid "Please select the installation method"
-msgstr ""
-
-#: admin/fai/faiPackage.tpl.c:32 admin/fai/faiPackage.tpl.c:35
-msgid "Used packages"
-msgstr ""
-
-#: admin/fai/faiPackage.tpl.c:38
-msgid "Add from list"
-msgstr ""
-
-#: admin/fai/faiProfileEntry.tpl.c:2
-msgid "List of FAI objects (Fully Automatic Installation)"
-msgstr ""
-
-#: admin/fai/faiProfileEntry.tpl.c:5
-msgid "Information"
-msgstr "ThÃ´ng tin"
-
-#: admin/fai/faiProfileEntry.tpl.c:8
-msgid ""
-"This menu allows you to select FAI class names and to add them to the "
-"currently edited profile."
-msgstr ""
-
-#: admin/fai/faiProfileEntry.tpl.c:11
-msgid "Filters"
-msgstr "CÃ¡c bá»™ lá»c"
-
-#: admin/fai/faiProfileEntry.tpl.c:14
-msgid "Show only classes with templates"
-msgstr ""
-
-#: admin/fai/faiProfileEntry.tpl.c:17
-msgid "Show only classes with scripts"
-msgstr ""
-
-#: admin/fai/faiProfileEntry.tpl.c:20
-msgid "Show only classes with hooks"
-msgstr ""
-
-#: admin/fai/faiProfileEntry.tpl.c:23
-msgid "Show only classes with variables"
-msgstr ""
-
-#: admin/fai/faiProfileEntry.tpl.c:26
-msgid "Show only classes with packages"
-msgstr ""
-
-#: admin/fai/faiProfileEntry.tpl.c:29
-msgid "Show only classes with partitions"
-msgstr ""
-
-#: admin/fai/faiProfileEntry.tpl.c:32 admin/fai/faiProfileEntry.tpl.c:35
-msgid "Display objects matching"
-msgstr "Hiá»ƒn thá»‹ viá»‡c khá»›p cÃ¡c Ä‘á»‘i tÆ°á»£ng"
-
-#: admin/fai/faiProfileEntry.tpl.c:38
-msgid "Regular expression for matching object names"
-msgstr "Hiá»ƒn thá»‹ thÃ´ng thÆ°á»ng cho viá»‡c khá»›p tÃªn cÃ¡c Ä‘á»‘i tÆ°á»£ng"
-
-#: admin/fai/faiTemplateEntry.tpl.c:17 admin/fai/faiTemplateEntry.tpl.c:20
-msgid "Template attributes"
-msgstr ""
-
-#: admin/fai/faiTemplateEntry.tpl.c:26 admin/fai/faiTemplateEntry.tpl.c:29
-msgid "Save template"
-msgstr ""
-
-#: admin/fai/faiTemplateEntry.tpl.c:32 admin/fai/faiTemplateEntry.tpl.c:35
-msgid "Edit template"
-msgstr ""
-
-#: admin/fai/faiTemplateEntry.tpl.c:38
-msgid "Full path"
-msgstr ""
-
-#: admin/fai/faiTemplateEntry.tpl.c:41
-msgid "Upload"
-msgstr ""
-
-#: admin/fai/faiTemplateEntry.tpl.c:44
-msgid "Owner"
-msgstr ""
-
-#: admin/fai/faiTemplateEntry.tpl.c:50
-msgid "Access"
-msgstr ""
-
-#: admin/fai/faiTemplateEntry.tpl.c:53
-msgid "Class"
-msgstr ""
-
-#: admin/fai/faiTemplateEntry.tpl.c:56
-msgid "Read"
-msgstr ""
-
-#: admin/fai/faiTemplateEntry.tpl.c:59
-msgid "Write"
-msgstr ""
-
-#: admin/fai/faiTemplateEntry.tpl.c:62
-msgid "Execute"
-msgstr ""
-
-#: admin/fai/faiTemplateEntry.tpl.c:65
-msgid "Special"
-msgstr ""
-
-#: admin/fai/faiTemplateEntry.tpl.c:71
-msgid "SUID"
-msgstr ""
-
-#: admin/fai/faiTemplateEntry.tpl.c:77
-msgid "SGID"
-msgstr ""
-
-#: admin/fai/faiTemplateEntry.tpl.c:80
-msgid "Others"
-msgstr ""
-
-#: admin/fai/faiTemplateEntry.tpl.c:83
-msgid "sticky"
-msgstr ""
-
-#: admin/fai/faiScriptEntry.tpl.c:17 admin/fai/faiScriptEntry.tpl.c:26
-msgid "Script attributes"
-msgstr ""
-
-#: admin/fai/faiScriptEntry.tpl.c:23
-msgid ""
-"Choose a priority. Low values result in an earlier, high values in a later "
-"execution."
-msgstr ""
-
-#: admin/fai/faiScriptEntry.tpl.c:32 admin/fai/faiHookEntry.tpl.c:32
-msgid "Import script"
-msgstr ""
-
-#: admin/fai/classSelect/selectClass-list.tpl.c:2
-msgid "Base"
-msgstr "CÆ¡ sá»Ÿ"
-
-#: admin/fai/fai-filter.tpl.c:29
-msgid "Show profiles"
-msgstr ""
-
-#: admin/fai/fai-filter.tpl.c:32
-msgid "Show templates"
-msgstr ""
-
-#: admin/fai/fai-filter.tpl.c:35
-msgid "Show scripts"
-msgstr ""
-
-#: admin/fai/fai-filter.tpl.c:38
-msgid "Show hooks"
-msgstr ""
-
-#: admin/fai/fai-filter.tpl.c:41
-msgid "Show variables"
-msgstr ""
-
-#: admin/fai/fai-filter.tpl.c:44
-msgid "Show packages"
-msgstr ""
-
-#: admin/fai/fai-filter.tpl.c:47
-msgid "Show partitions"
-msgstr ""
-
-#: admin/fai/faiTemplateEdit.tpl.c:2
-msgid "This FAI template is write protected. Editing may break it!"
-msgstr ""
-
-#: admin/fai/faiTemplateEdit.tpl.c:5
-msgid "Edit anyway"
-msgstr "Cá»© hiá»‡u chá»‰nh"
-
-#: admin/fai/faiPartitionTable.tpl.c:14
-msgid "Use 'setup-storage' to partition the disk"
-msgstr ""
-
-#: admin/fai/faiPartitionTable.tpl.c:20
-msgid "Discs"
-msgstr ""
-
-#: admin/fai/faiPartitionTable.tpl.c:23 admin/fai/faiPartitionTable.tpl.c:26
-#: admin/fai/faiPartitionTable.tpl.c:41 admin/fai/faiPartitionTable.tpl.c:44
-msgid "Add disk"
-msgstr ""
-
-#: admin/fai/faiPartitionTable.tpl.c:29 admin/fai/faiPartitionTable.tpl.c:32
-#: admin/fai/faiPartitionTable.tpl.c:47 admin/fai/faiPartitionTable.tpl.c:50
-msgid "Add RAID"
-msgstr ""
-
-#: admin/fai/faiPartitionTable.tpl.c:35 admin/fai/faiPartitionTable.tpl.c:38
-#: admin/fai/faiPartitionTable.tpl.c:53 admin/fai/faiPartitionTable.tpl.c:56
-msgid "Add volume group"
-msgstr ""
-
-#: admin/fai/faiScript.tpl.c:17
-msgid "List of scripts"
-msgstr ""
-
-#: admin/fai/faiProfile.tpl.c:20
-msgid "Choose a priority"
-msgstr ""
-
-#: admin/fai/faiHookEntry.tpl.c:14 admin/fai/faiHookEntry.tpl.c:17
-#: admin/fai/faiHookEntry.tpl.c:26
-msgid "Hook attributes"
-msgstr ""
-
-#: admin/fai/faiHookEntry.tpl.c:23
-msgid "Choose an existing FAI task"
-msgstr ""
diff --git a/fai/locale/zh/fusiondirectory.po b/fai/locale/zh/fusiondirectory.po
index 8b070b92b5db47b8867009ff59966a07e79f1eee..24fa7370a020390e13341e17877e3493d191e64b 100644
--- a/fai/locale/zh/fusiondirectory.po
+++ b/fai/locale/zh/fusiondirectory.po
@@ -3,382 +3,190 @@
 # This file is distributed under the same license as the PACKAGE package.
 # 
 # Translators:
-#  Jiang Xin <worldhello.net@gmail.com>, 2007
 msgid ""
 msgstr ""
-"Project-Id-Version: FusionDirectory-108\n"
+"Project-Id-Version: FusionDirectory-109\n"
 "Report-Msgid-Bugs-To: documentation@lists.fusiondirectory.org\n"
-"POT-Creation-Date: 2015-03-19 21:45+0100\n"
-"PO-Revision-Date: 2015-02-25 16:12+0000\n"
+"POT-Creation-Date: 2014-12-15 17:47+0100\n"
+"PO-Revision-Date: 2015-02-25 16:13+0000\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>\n"
-"Language-Team: Chinese (http://www.transifex.com/projects/p/FusionDirectory-108/language/zh/)\n"
+"Language-Team: Chinese (http://www.transifex.com/projects/p/FusionDirectory-109/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/fai/class_faiScriptEntry.inc:79 admin/fai/class_faiScriptEntry.inc:82
-#: admin/fai/class_faiManagement.inc:240 admin/fai/class_faiManagement.inc:768
-#: admin/fai/class_faiManagement.inc:774
-#: admin/fai/class_faiPartitionTable.inc:268
-#: admin/fai/class_faiPartitionTable.inc:331
-#: admin/fai/class_faiDiskEntry.inc:445 admin/fai/class_FAI.inc:570
-#: admin/fai/class_faiHookEntry.inc:83 admin/fai/class_faiHookEntry.inc:86
-#: admin/fai/class_faiScript.inc:249 admin/fai/class_faiTemplate.inc:232
-#: admin/fai/class_faiHook.inc:259 admin/fai/class_faiVariable.inc:162
-#: admin/systems/class_faiLogView.inc:207
-#: admin/systems/class_faiLogView.inc:242
-msgid "Error"
-msgstr "é”™è¯¯"
-
-#: admin/fai/class_faiScriptEntry.inc:82 admin/fai/class_faiHookEntry.inc:86
-msgid "file is empty"
-msgstr ""
-
-#: admin/fai/class_faiScriptEntry.inc:102 admin/fai/class_faiHookEntry.inc:102
-#: admin/fai/class_faiScript.inc:349 admin/fai/class_faiScript.inc:374
-#: admin/fai/class_faiTemplate.inc:320 admin/fai/class_faiHook.inc:346
-msgid "Download"
-msgstr "ä¸‹è½½"
-
-#: admin/fai/class_faiScriptEntry.inc:147
-#: admin/fai/class_faiScriptEntry.inc:151
-#: admin/fai/class_faiScriptEntry.inc:154
-#: admin/fai/class_faiScriptEntry.inc:197
-#: admin/fai/class_faiManagement.inc:768 admin/fai/class_faiManagement.inc:774
-#: admin/fai/class_faiPackage.inc:685
-#: admin/fai/class_faiPartitionTable.inc:779
-#: admin/fai/class_faiDiskEntry.inc:702 admin/fai/class_faiDiskEntry.inc:705
-#: admin/fai/class_faiDiskEntry.inc:758
-#: admin/fai/class_faiTemplateEntry.inc:247
-#: admin/fai/class_faiTemplateEntry.inc:312
-#: admin/fai/class_faiPartitionTableEntry.inc:353
-#: admin/fai/class_faiPartitionTableEntry.inc:356
-#: admin/fai/class_faiPartitionTableEntry.inc:360
-#: admin/fai/class_faiPartitionTableEntry.inc:455
-#: admin/fai/packageSelect/selectPackage-list.xml:40
-#: admin/fai/class_faiProfile.inc:414 admin/fai/class_faiProfile.inc:463
-#: admin/fai/class_faiHookEntry.inc:157 admin/fai/class_faiHookEntry.inc:162
-#: admin/fai/class_faiHookEntry.inc:165 admin/fai/class_faiHookEntry.inc:207
-#: admin/fai/class_askClassName.inc:163 admin/fai/class_askClassName.inc:167
-#: admin/fai/class_askClassName.inc:171 admin/fai/class_askClassName.inc:198
-#: admin/fai/class_faiScript.inc:347 admin/fai/class_faiScript.inc:605
-#: admin/fai/classSelect/selectClass-list.xml:28
-#: admin/fai/class_faiTemplate.inc:512
-#: admin/fai/class_faiVariableEntry.inc:103
-#: admin/fai/class_faiVariableEntry.inc:112
-#: admin/fai/class_faiVariableEntry.inc:115
-#: admin/fai/class_faiVariableEntry.inc:149 admin/fai/class_faiHook.inc:531
-#: admin/fai/class_faiVariable.inc:398 admin/fai/fai-list.xml:80
-#: admin/fai/faiPartitionTableEntry.tpl.c:8 admin/fai/faiPartition.tpl.c:5
-#: admin/fai/faiVariableEntry.tpl.c:8 admin/fai/faiDiskEntry.tpl.c:8
-#: admin/fai/faiTemplate.tpl.c:8 admin/fai/faiVariable.tpl.c:8
-#: admin/fai/faiHook.tpl.c:8
-#: admin/fai/packageSelect/selectPackage-filter.tpl.c:8
-#: admin/fai/faiPackage.tpl.c:8 admin/fai/faiScriptEntry.tpl.c:8
-#: admin/fai/classSelect/selectClass-filter.tpl.c:5
-#: admin/fai/fai-filter.tpl.c:50 admin/fai/faiPartitionTable.tpl.c:8
-#: admin/fai/faiScript.tpl.c:8 admin/fai/faiProfile.tpl.c:8
-#: admin/fai/faiHookEntry.tpl.c:8
-msgid "Name"
-msgstr "åç§°"
-
-#: admin/fai/class_faiScriptEntry.inc:159 admin/fai/class_faiHookEntry.inc:170
-#: admin/fai/class_faiScript.inc:594 admin/fai/fai-list.xml:122
-#: admin/fai/faiScriptEntry.tpl.c:29 admin/fai/faiHookEntry.tpl.c:29
-msgid "Script"
-msgstr "è„šæœ¬"
-
-#: admin/fai/class_faiScriptEntry.inc:190
-#: admin/fai/class_faiScriptEntry.inc:199
-msgid "Script entry"
-msgstr "è„šæœ¬"
-
-#: admin/fai/class_faiScriptEntry.inc:191
-msgid "FAI script entry"
-msgstr ""
-
-#: admin/fai/class_faiScriptEntry.inc:198 admin/fai/class_faiPackage.inc:686
-#: admin/fai/class_faiPartitionTable.inc:780
-#: admin/fai/class_faiDiskEntry.inc:759
-#: admin/fai/class_faiTemplateEntry.inc:313
-#: admin/fai/class_faiPartitionTableEntry.inc:456
-#: admin/fai/class_faiProfile.inc:464 admin/fai/class_faiHookEntry.inc:208
-#: admin/fai/class_faiScript.inc:606 admin/fai/class_faiTemplate.inc:513
-#: admin/fai/class_faiVariableEntry.inc:150 admin/fai/class_faiHook.inc:532
-#: admin/fai/class_faiVariable.inc:399
-#: admin/fai/faiPartitionTableEntry.tpl.c:11 admin/fai/faiPartition.tpl.c:11
-#: admin/fai/faiVariableEntry.tpl.c:11 admin/fai/faiDiskEntry.tpl.c:14
-#: admin/fai/faiTemplate.tpl.c:11 admin/fai/faiVariable.tpl.c:11
-#: admin/fai/faiHook.tpl.c:11 admin/fai/faiPackage.tpl.c:11
-#: admin/fai/faiTemplateEntry.tpl.c:14 admin/fai/faiScriptEntry.tpl.c:11
-#: admin/fai/faiPartitionTable.tpl.c:11 admin/fai/faiScript.tpl.c:11
-#: admin/fai/faiProfile.tpl.c:11 admin/fai/faiHookEntry.tpl.c:11
-msgid "Description"
-msgstr "æè¿°"
-
-#: admin/fai/class_faiScriptEntry.inc:200
-msgid "Script Priority"
-msgstr ""
-
-#: admin/fai/class_faiManagement.inc:188
-msgid "partition table"
-msgstr ""
-
-#: admin/fai/class_faiManagement.inc:189 admin/fai/fai-list.xml:31
-msgid "script"
-msgstr "è„šæœ¬"
-
-#: admin/fai/class_faiManagement.inc:190 admin/fai/fai-list.xml:47
-msgid "hook"
-msgstr ""
-
-#: admin/fai/class_faiManagement.inc:191 admin/fai/fai-list.xml:39
-msgid "variable"
-msgstr "å˜é‡"
-
-#: admin/fai/class_faiManagement.inc:192 admin/fai/fai-list.xml:63
-msgid "template"
-msgstr ""
-
-#: admin/fai/class_faiManagement.inc:193
-msgid "package list"
-msgstr ""
-
-#: admin/fai/class_faiManagement.inc:210 admin/fai/class_faiManagement.inc:226
-#: admin/fai/class_faiManagement.inc:332 admin/fai/class_faiManagement.inc:390
-#: admin/fai/class_faiManagement.inc:480 admin/fai/class_faiManagement.inc:575
-#: admin/fai/class_faiManagement.inc:598 admin/fai/class_faiManagement.inc:619
-msgid "Permission error"
-msgstr ""
-
-#: admin/fai/class_faiManagement.inc:211 admin/fai/class_faiManagement.inc:226
-#, php-format
-msgid "You have no permission to create a new %s!"
-msgstr ""
-
-#: admin/fai/class_faiManagement.inc:226 admin/fai/fai-list.xml:55
-msgid "profile"
-msgstr ""
-
-#: admin/fai/class_faiManagement.inc:328
-msgid "Branch locked"
-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:178 config/fai/class_faiConfig.inc:41
+msgid "FAI"
+msgstr "è‡ªåŠ¨åŒ–å®‰è£…"
 
-#: admin/fai/class_faiManagement.inc:329
-#, php-format
-msgid "The following entries are locked, you can't remove them %s."
+#: admin/fai/class_faiManagement.inc:118
+msgid "Manage FAI software packages and deployment recipes"
 msgstr ""
 
-#: admin/fai/class_faiManagement.inc:346
-msgid "FAI object"
+#: admin/fai/class_faiPackage.inc:157
+msgid "Mark for installation"
 msgstr ""
 
-#: admin/fai/class_faiManagement.inc:477
-msgid "FAI branch/freeze"
+#: admin/fai/class_faiPackage.inc:161
+msgid "Mark for removal"
 msgstr ""
 
-#: admin/fai/class_faiManagement.inc:480
-msgid "You have no permission to delete this release!"
+#: admin/fai/class_faiPackage.inc:166
+msgid "Edit configuration"
 msgstr ""
 
-#: admin/fai/class_faiManagement.inc:496 admin/fai/remove.tpl.c:2
-#: admin/fai/remove_branch.tpl.c:2
-msgid "Warning"
-msgstr "è¦å‘Š"
-
-#: admin/fai/class_faiManagement.inc:496
-msgid "Release remove aborted because the release name check failed!"
-msgstr ""
+#: admin/fai/class_faiPackage.inc:247
+#: admin/fai/class_faiPartitionTable.inc:209
+#: admin/fai/class_faiPartitionTable.inc:250
+#: admin/fai/class_faiTemplate.inc:114
+#: admin/systems/services/repository/class_serviceDebianRepository.inc:172
+#: admin/systems/services/repository/class_serviceDebianRepository.inc:189
+#: admin/systems/services/repository/class_serviceDebianRepository.inc:193
+msgid "LDAP error"
+msgstr "LDAP é”™è¯¯"
 
-#: admin/fai/class_faiManagement.inc:573 admin/fai/class_faiManagement.inc:596
-msgid "Configuration"
+#: admin/fai/class_faiPackage.inc:279
+#: admin/fai/packageSelect/class_filterFAIPackages.inc:41
+#: admin/fai/packageSelect/class_filterFAIPackages.inc:46
+#: admin/fai/class_faiPackageConfiguration.inc:55
+#: admin/systems/class_faiStartup.inc:133
+#: admin/systems/class_faiStartup.inc:160
+msgid "Service infrastructure"
 msgstr ""
 
-#: admin/fai/class_faiManagement.inc:575 admin/fai/class_faiManagement.inc:598
-#: admin/fai/class_faiManagement.inc:619
-msgid "Branch"
+#: admin/fai/class_faiPackage.inc:294
+msgid "Unkown packages"
 msgstr ""
 
-#: admin/fai/class_faiManagement.inc:725 admin/fai/askClassName.tpl.c:23
-msgid "Continue"
-msgstr "ç»§ç»"
-
-#: admin/fai/class_faiManagement.inc:926
-#: admin/fai/class_faiPartitionTable.inc:768
-#: admin/fai/class_faiProfile.inc:318 admin/fai/class_askClassName.inc:99
-#: admin/fai/classSelect/class_classSelect.inc:58
-#: admin/fai/class_faiGroupHandle.inc:120
-#: admin/fai/class_faiProfileEntry.inc:163 admin/fai/fai-list.xml:146
-msgid "Partition table"
-msgstr "åˆ†åŒºè¡¨"
-
-#: admin/fai/class_faiManagement.inc:928
-#: admin/fai/class_faiGroupHandle.inc:122 admin/fai/fai-list.xml:140
-msgid "Package list"
-msgstr "è½¯ä»¶åŒ…åˆ—è¡¨"
-
-#: admin/fai/class_faiManagement.inc:930
-#: admin/fai/class_faiGroupHandle.inc:124
-msgid "Scripts"
-msgstr "è„šæœ¬"
-
-#: admin/fai/class_faiManagement.inc:932
-#: admin/fai/class_faiGroupHandle.inc:126
-msgid "Variables"
-msgstr "å˜é‡"
-
-#: admin/fai/class_faiManagement.inc:934
-#: admin/fai/class_faiGroupHandle.inc:128
-msgid "Hooks"
-msgstr "é’©å"
+#: admin/fai/class_faiPackage.inc:365
+msgid "Package"
+msgstr "è½¯ä»¶åŒ…"
 
-#: admin/fai/class_faiManagement.inc:936 admin/fai/class_faiProfile.inc:454
-#: admin/fai/class_askClassName.inc:104 admin/fai/class_faiGroupHandle.inc:130
-#: admin/fai/fai-list.xml:110
-msgid "Profile"
+#: admin/fai/class_faiPackage.inc:366
+msgid "FAI Package list"
 msgstr ""
 
-#: admin/fai/class_faiManagement.inc:938
-#: admin/fai/class_faiGroupHandle.inc:132
-msgid "Templates"
-msgstr "æ¨¡æ¿"
-
-#: admin/fai/class_faiManagement.inc:1039
-#: admin/fai/class_faiManagement.inc:1045
-#: admin/fai/packageSelect/selectPackage-list.xml:14
-#: admin/fai/classSelect/selectClass-list.xml:15
-#: admin/systems/class_faiStartup.inc:177 config/fai/class_faiConfig.inc:41
-msgid "FAI"
-msgstr "è‡ªåŠ¨åŒ–å®‰è£…"
-
-#: admin/fai/class_faiManagement.inc:1040
-msgid "Manage FAI software packages and deployment recipes"
+#: admin/fai/class_faiPackage.inc:369
+msgid "FAI Package"
 msgstr ""
 
-#: admin/fai/class_faiPackage.inc:261
-msgid "Invalid package names"
-msgstr ""
+#: admin/fai/class_faiPackage.inc:385
+#: admin/fai/class_faiPartitionTable.inc:304
+#: admin/fai/class_faiTemplateEntry.inc:140 admin/fai/class_faiProfile.inc:47
+#: admin/fai/class_faiScript.inc:50 admin/fai/class_faiTemplate.inc:173
+#: admin/fai/class_faiHook.inc:50 admin/fai/class_faiVariable.inc:50
+msgid "Properties"
+msgstr "å±žæ€§"
 
-#: admin/fai/class_faiPackage.inc:262
-#, php-format
-msgid "The following package names don't match the Debian policy: %s"
-msgstr ""
+#: admin/fai/class_faiPackage.inc:388
+#: admin/fai/class_faiPartitionTable.inc:307 admin/fai/class_faiProfile.inc:50
+#: admin/fai/class_faiScript.inc:53 admin/fai/class_faiTemplate.inc:176
+#: admin/fai/class_faiHook.inc:53 admin/fai/class_faiVariable.inc:53
+msgid "Class name"
+msgstr "ç±»å"
 
-#: admin/fai/class_faiPackage.inc:421 admin/fai/class_faiPackage.inc:422
-msgid "Configured"
+#: admin/fai/class_faiPackage.inc:388 admin/fai/class_faiScript.inc:53
+#: admin/fai/class_faiHook.inc:53 admin/fai/class_faiVariable.inc:53
+msgid "Variables class name"
 msgstr ""
 
-#: admin/fai/class_faiPackage.inc:428 admin/fai/class_faiPackage.inc:429
-msgid "Package marked for removal"
-msgstr "è½¯ä»¶åŒ…æ ‡è®°ä¸ºåˆ é™¤"
-
-#: admin/fai/class_faiPackage.inc:445
-msgid "Mark package for removal"
-msgstr ""
+#: admin/fai/class_faiPackage.inc:392
+#: admin/fai/class_faiPartitionTable.inc:311
+#: admin/fai/class_faiDiskEntry.inc:738
+#: admin/fai/class_faiTemplateEntry.inc:147 admin/fai/class_faiProfile.inc:54
+#: admin/fai/class_faiScript.inc:57 admin/fai/class_faiScript.inc:75
+#: admin/fai/class_faiTemplate.inc:180 admin/fai/class_faiHook.inc:57
+#: admin/fai/class_faiHook.inc:75 admin/fai/class_faiVariable.inc:57
+#: admin/fai/class_faiVariable.inc:75
+msgid "Description"
+msgstr "æè¿°"
 
-#: admin/fai/class_faiPackage.inc:451
-msgid "Configure this package"
+#: admin/fai/class_faiPackage.inc:392
+#: admin/fai/class_faiPartitionTable.inc:311 admin/fai/class_faiProfile.inc:54
+#: admin/fai/class_faiScript.inc:57 admin/fai/class_faiTemplate.inc:180
+#: admin/fai/class_faiHook.inc:57 admin/fai/class_faiVariable.inc:57
+msgid "Short description of the class"
 msgstr ""
 
-#: admin/fai/class_faiPackage.inc:455
-msgid "Remove this package"
-msgstr ""
+#: admin/fai/class_faiPackage.inc:398 admin/systems/class_faiStartup.inc:90
+msgid "Repository"
+msgstr "ä»“åº“"
 
-#: admin/fai/class_faiPackage.inc:534
-msgid "Please select a least one package!"
-msgstr ""
+#: admin/fai/class_faiPackage.inc:401 admin/systems/class_faiStartup.inc:78
+#: admin/systems/services/repository/class_serviceDebianRepository.inc:52
+#: admin/systems/services/repository/class_serviceCentosRepository.inc:49
+msgid "Release"
+msgstr "å‘è¡Œ"
 
-#: admin/fai/class_faiPackage.inc:538
-msgid ""
-"Please choose a valid release/section combination for your repository setup!"
+#: admin/fai/class_faiPackage.inc:401
+msgid "Debian release concerned"
 msgstr ""
 
-#: admin/fai/class_faiPackage.inc:571
-#: admin/fai/packageSelect/class_filterFAIPackages.inc:41
-#: admin/fai/packageSelect/class_filterFAIPackages.inc:46
-#: admin/fai/class_faiPackageConfiguration.inc:55
-#: admin/systems/class_faiStartup.inc:132
-#: admin/systems/class_faiStartup.inc:159
-msgid "Infrastructure service"
+#: admin/fai/class_faiPackage.inc:405
+#: admin/systems/services/repository/class_serviceDebianRepository.inc:58
+msgid "Sections"
 msgstr ""
 
-#: admin/fai/class_faiPackage.inc:587
-msgid "Unkown packages"
+#: admin/fai/class_faiPackage.inc:405
+msgid "Sections concerned"
 msgstr ""
 
-#: admin/fai/class_faiPackage.inc:674
-#: admin/fai/faiPackageConfiguration.tpl.c:2
-msgid "Package"
-msgstr "è½¯ä»¶åŒ…"
-
-#: admin/fai/class_faiPackage.inc:675
-msgid "FAI Package list"
-msgstr ""
+#: admin/fai/class_faiPackage.inc:409
+msgid "Install method"
+msgstr "å®‰è£…æ–¹æ³•"
 
-#: admin/fai/class_faiPackage.inc:679
-msgid "FAI Package"
+#: admin/fai/class_faiPackage.inc:409
+msgid "Install method to use for this package list"
 msgstr ""
 
-#: admin/fai/class_faiPackage.inc:687
+#: admin/fai/class_faiPackage.inc:420
 msgid "Packages"
 msgstr "è½¯ä»¶åŒ…"
 
-#: admin/fai/class_faiPackage.inc:688 admin/fai/faiPackage.tpl.c:23
-msgid "Section"
-msgstr "èŠ‚"
-
-#: admin/fai/class_faiPackage.inc:688 admin/fai/class_faiPackage.inc:691
-#: admin/fai/class_faiScript.inc:605 admin/fai/class_faiTemplate.inc:512
-msgid "Readonly"
+#: admin/fai/class_faiPackage.inc:424
+msgid "Packages in this class"
 msgstr ""
 
-#: admin/fai/class_faiPackage.inc:689
-msgid "Install Method"
-msgstr ""
+#: admin/fai/class_faiPartitionTable.inc:61
+#: admin/fai/class_faiDiskEntry.inc:442 admin/systems/class_faiLogView.inc:207
+#: admin/systems/class_faiLogView.inc:242
+msgid "Error"
+msgstr "é”™è¯¯"
 
-#: admin/fai/class_faiPackage.inc:690
-msgid "Package configuration"
+#: admin/fai/class_faiPartitionTable.inc:112
+msgid "Add RAID"
 msgstr ""
 
-#: admin/fai/class_faiPackage.inc:691 admin/systems/class_faiStartup.inc:78
-#: admin/systems/services/repository/class_serviceRepository.inc:40
-#: admin/fai/branch_selector.tpl.c:14 admin/fai/faiPackage.tpl.c:20
-#: admin/fai/fai-filter.tpl.c:5 admin/fai/fai-filter.tpl.c:14
-msgid "Release"
-msgstr "å‘è¡Œ"
-
-#: admin/fai/class_faiPartitionTable.inc:269
-#: admin/fai/class_faiDiskEntry.inc:446
-#, php-format
-msgid ""
-"The disk cannot be deleted while it is used in the '%s' disk definition!"
+#: admin/fai/class_faiPartitionTable.inc:116
+msgid "Add LVM"
 msgstr ""
 
-#: admin/fai/class_faiPartitionTable.inc:416 admin/fai/class_faiScript.inc:360
-#: admin/fai/class_faiScript.inc:362 admin/fai/class_faiTemplate.inc:306
-#: admin/fai/class_faiTemplate.inc:308
-msgid "edit"
-msgstr "ç¼–è¾‘"
-
-#: admin/fai/class_faiPartitionTable.inc:418 admin/fai/class_faiScript.inc:364
-#: admin/fai/class_faiTemplate.inc:310
-msgid "delete"
-msgstr "åˆ é™¤"
+#: admin/fai/class_faiPartitionTable.inc:284
+msgid "Partition table"
+msgstr "åˆ†åŒºè¡¨"
 
-#: admin/fai/class_faiPartitionTable.inc:769
-#: admin/fai/class_faiPartitionTable.inc:773
+#: admin/fai/class_faiPartitionTable.inc:285
+#: admin/fai/class_faiPartitionTable.inc:288
 msgid "FAI partition table"
 msgstr ""
 
-#: admin/fai/class_faiPartitionTable.inc:779 admin/fai/class_faiHook.inc:531
-#: admin/fai/class_faiVariable.inc:398
-msgid "Read only"
+#: admin/fai/class_faiPartitionTable.inc:307 admin/fai/class_faiProfile.inc:50
+msgid "Partition table class name"
+msgstr ""
+
+#: admin/fai/class_faiPartitionTable.inc:317
+msgid "Discs"
+msgstr "Discs"
+
+#: admin/fai/class_faiPartitionTable.inc:324
+msgid "Partitions in this class"
 msgstr ""
 
 #: admin/fai/class_faiDiskEntry.inc:273
-#: admin/fai/faiPartitionTableEntry.tpl.c:5 admin/fai/faiDiskEntry.tpl.c:5
 msgid "Device"
 msgstr "è®¾å¤‡"
 
@@ -390,103 +198,103 @@ msgstr ""
 msgid "UUID"
 msgstr ""
 
-#: admin/fai/class_faiDiskEntry.inc:345
+#: admin/fai/class_faiDiskEntry.inc:344
 msgid "Disks"
 msgstr ""
 
-#: admin/fai/class_faiDiskEntry.inc:348 admin/fai/class_faiPartition.inc:321
-#: admin/fai/faiPartition.tpl.c:14
+#: admin/fai/class_faiDiskEntry.inc:347 admin/fai/class_faiPartition.inc:319
 msgid "Size"
 msgstr "å¤§å°"
 
-#: admin/fai/class_faiDiskEntry.inc:544
+#: admin/fai/class_faiDiskEntry.inc:443
+#, php-format
+msgid ""
+"The disk cannot be deleted while it is used in the '%s' disk definition!"
+msgstr ""
+
+#: admin/fai/class_faiDiskEntry.inc:536
 msgid "encrypted"
 msgstr ""
 
-#: admin/fai/class_faiDiskEntry.inc:547
+#: admin/fai/class_faiDiskEntry.inc:539
 msgid "bootable"
 msgstr ""
 
-#: admin/fai/class_faiDiskEntry.inc:550
+#: admin/fai/class_faiDiskEntry.inc:542
 msgid "preserve"
 msgstr ""
 
-#: admin/fai/class_faiDiskEntry.inc:735
+#: admin/fai/class_faiDiskEntry.inc:687 admin/fai/class_faiDiskEntry.inc:690
+#: admin/fai/class_faiDiskEntry.inc:737
+#: admin/fai/packageSelect/selectPackage-list.xml:40
+#: admin/fai/class_faiScript.inc:71 admin/fai/class_faiHook.inc:71
+#: admin/fai/class_faiVariable.inc:71
+#: admin/fai/class_faiSimplePluginClass.inc:50
+msgid "Name"
+msgstr "åç§°"
+
+#: admin/fai/class_faiDiskEntry.inc:717
 msgid ""
 "You have more than four primary partition table entries in your "
 "configuration, please check your configuration twice."
 msgstr ""
 
-#: admin/fai/class_faiDiskEntry.inc:739
+#: admin/fai/class_faiDiskEntry.inc:721
 msgid ""
 "You cannot have more than three primary partition while using logical "
 "partitions, please check your configuration twice."
 msgstr ""
 
-#: admin/fai/class_faiDiskEntry.inc:752
-#: admin/fai/class_faiPartitionTableEntry.inc:448
+#: admin/fai/class_faiDiskEntry.inc:733
 msgid "Partition table entry"
 msgstr ""
 
-#: admin/fai/class_faiDiskEntry.inc:753
-#: admin/fai/class_faiPartitionTableEntry.inc:449
+#: admin/fai/class_faiDiskEntry.inc:734
 msgid "FAI partition table entry"
 msgstr ""
 
-#: admin/fai/class_faiDiskEntry.inc:760
+#: admin/fai/class_faiDiskEntry.inc:739
 msgid "Disk options"
 msgstr ""
 
-#: admin/fai/class_faiDiskEntry.inc:761
-#: admin/fai/class_faiPartitionTableEntry.inc:457
+#: admin/fai/class_faiDiskEntry.inc:740
 msgid "Partition type"
 msgstr ""
 
-#: admin/fai/class_faiDiskEntry.inc:762
-#: admin/fai/class_faiPartitionTableEntry.inc:458
+#: admin/fai/class_faiDiskEntry.inc:741
 msgid "Partition no."
 msgstr ""
 
-#: admin/fai/class_faiDiskEntry.inc:763
-#: admin/fai/class_faiPartitionTableEntry.inc:459
+#: admin/fai/class_faiDiskEntry.inc:742
 msgid "File system type"
 msgstr ""
 
-#: admin/fai/class_faiDiskEntry.inc:764
-#: admin/fai/class_faiPartitionTableEntry.inc:171
-#: admin/fai/class_faiPartitionTableEntry.inc:460
-#: admin/fai/class_faiPartition.inc:437 admin/fai/faiPartition.tpl.c:47
+#: admin/fai/class_faiDiskEntry.inc:743 admin/fai/class_faiPartition.inc:432
 msgid "Mount point"
 msgstr "æŒ‚è½½ç‚¹"
 
-#: admin/fai/class_faiDiskEntry.inc:765
-#: admin/fai/class_faiPartitionTableEntry.inc:461
-#: admin/fai/class_faiPartition.inc:402 admin/fai/class_faiPartition.inc:407
+#: admin/fai/class_faiDiskEntry.inc:744 admin/fai/class_faiPartition.inc:397
+#: admin/fai/class_faiPartition.inc:402
 msgid "Partition size"
 msgstr ""
 
-#: admin/fai/class_faiDiskEntry.inc:766
-#: admin/fai/class_faiPartitionTableEntry.inc:173
-#: admin/fai/class_faiPartitionTableEntry.inc:462
-#: admin/fai/faiPartition.tpl.c:50
+#: admin/fai/class_faiDiskEntry.inc:745
 msgid "Mount options"
 msgstr "æŒ‚è½½é€‰é¡¹"
 
-#: admin/fai/class_faiDiskEntry.inc:767
-#: admin/fai/class_faiPartitionTableEntry.inc:463
+#: admin/fai/class_faiDiskEntry.inc:746
 msgid "File system options"
 msgstr ""
 
-#: admin/fai/class_faiDiskEntry.inc:768
-#: admin/fai/class_faiPartitionTableEntry.inc:464
+#: admin/fai/class_faiDiskEntry.inc:747
 msgid "Partition flags"
 msgstr ""
 
-#: admin/fai/class_debconfTemplate.inc:227
+#: admin/fai/class_debconfTemplate.inc:225
 msgid "This package has no debconf options."
 msgstr "è¿™ä¸ªè½¯ä»¶åŒ…æ²¡æœ‰ debconf é€‰é¡¹ã€‚"
 
-#: admin/fai/class_debconfTemplate.inc:264
+#: admin/fai/class_debconfTemplate.inc:262
 msgid ""
 "This debconf question is dynamically generated during package installation "
 "and requires choosing between specific options which cannot be presented "
@@ -494,217 +302,59 @@ msgid ""
 " effect."
 msgstr ""
 
-#: admin/fai/class_faiTemplateEntry.inc:139
-msgid "no file uploaded yet"
-msgstr "è¿˜æ²¡æœ‰ä¸Šä¼ æ–‡ä»¶"
-
-#: admin/fai/class_faiTemplateEntry.inc:142
-#, php-format
-msgid "exists in database (size: %s bytes)"
-msgstr "å˜åœ¨äºŽæ•°æ®åº“ ï¼ˆå¤§å°ï¼š %s å—èŠ‚ï¼‰"
-
-#: admin/fai/class_faiTemplateEntry.inc:251
-#: admin/systems/class_faiLogView.inc:70 admin/fai/faiTemplateEntry.tpl.c:23
-msgid "File"
-msgstr "æ–‡ä»¶"
-
-#: admin/fai/class_faiTemplateEntry.inc:255
-#: admin/fai/faiTemplateEntry.tpl.c:11
-msgid "Destination path"
-msgstr "ç›®æ ‡è·¯å¾„"
-
-#: admin/fai/class_faiTemplateEntry.inc:260 admin/fai/faiTemplateEntry.tpl.c:8
-msgid "File name"
-msgstr ""
-
-#: admin/fai/class_faiTemplateEntry.inc:264
-#: admin/fai/class_faiTemplateEntry.inc:266
-#: admin/fai/faiTemplateEntry.tpl.c:68
-msgid "User"
-msgstr "ç”¨æˆ·"
-
-#: admin/fai/class_faiTemplateEntry.inc:270
-#: admin/fai/class_faiTemplateEntry.inc:273
-#: admin/fai/class_faiTemplateEntry.inc:275
-#: admin/fai/faiTemplateEntry.tpl.c:47 admin/fai/faiTemplateEntry.tpl.c:74
-msgid "Group"
-msgstr "ç»„"
-
-#: admin/fai/class_faiTemplateEntry.inc:305
-msgid "Template entry"
-msgstr ""
-
-#: admin/fai/class_faiTemplateEntry.inc:306
-msgid "FAI template entry"
-msgstr ""
-
-#: admin/fai/class_faiTemplateEntry.inc:314
-msgid "Template file"
-msgstr ""
-
-#: admin/fai/class_faiTemplateEntry.inc:315
-msgid "Template path"
-msgstr ""
-
-#: admin/fai/class_faiTemplateEntry.inc:316
-msgid "File owner"
-msgstr ""
-
-#: admin/fai/class_faiTemplateEntry.inc:317
-msgid "File permissions"
+#: admin/fai/class_faiTemplateEntry.inc:143
+msgid "File path"
 msgstr ""
 
-#: admin/fai/class_FAI.inc:287 admin/fai/class_FAI.inc:679
-#: admin/fai/class_FAI.inc:1266 admin/fai/class_FAI.inc:1283
-#: admin/fai/class_FAI.inc:1287
-msgid "LDAP error"
-msgstr "LDAP é”™è¯¯"
-
-#: admin/fai/class_FAI.inc:570
-#, php-format
-msgid "Error, following objects should be equal '%s' and '%s'"
+#: admin/fai/class_faiTemplateEntry.inc:143
+msgid "Complete absolute template file path and name"
 msgstr ""
 
-#: admin/fai/class_FAI.inc:891
-#, php-format
-msgid "Creating group application release for %s"
+#: admin/fai/class_faiTemplateEntry.inc:147
+msgid "Short description of the file"
 msgstr ""
 
-#: admin/fai/class_FAI.inc:960 admin/fai/class_FAI.inc:982
-#: admin/fai/class_FAI.inc:1022 admin/fai/class_FAI.inc:1027
-#: admin/fai/class_FAI.inc:1065
-msgid "Object"
-msgstr "å¯¹è±¡"
-
-#: admin/fai/class_FAI.inc:961
-#, php-format
-msgid "Adding missing group application release container %s."
-msgstr ""
+#: admin/fai/class_faiTemplateEntry.inc:156
+msgid "Template attributes"
+msgstr "æ¨¡æ¿å±žæ€§"
 
-#: admin/fai/class_FAI.inc:983
-#, php-format
-msgid "Adding group application release container %s."
+#: admin/fai/class_faiTemplateEntry.inc:160
+msgid "Template file content"
 msgstr ""
 
-#: admin/fai/class_FAI.inc:1023
-#, php-format
-msgid "Could not create menu entry %s. (Already exists)."
+#: admin/fai/class_faiTemplateEntry.inc:160
+msgid "Content of the template file"
 msgstr ""
 
-#: admin/fai/class_FAI.inc:1028
-#, php-format
-msgid "Created group application menu entry for %s."
+#: admin/fai/class_faiTemplateEntry.inc:164
+msgid "Owner and group of the file"
 msgstr ""
 
-#: admin/fai/class_FAI.inc:1059
-#, php-format
-msgid "Creating copy of %s"
-msgstr "åˆ›å»º %s çš„æ‹·è´"
-
-#: admin/fai/class_FAI.inc:1062
-msgid "Processing"
-msgstr "å¤„ç†"
+#: admin/fai/class_faiTemplateEntry.inc:167
+msgid "Owner"
+msgstr "æ‰€æœ‰è€…"
 
-#: admin/fai/class_FAI.inc:1080
-msgid "Could not create new release, the destination dn is already in use."
+#: admin/fai/class_faiTemplateEntry.inc:167
+msgid "File owner"
 msgstr ""
 
-#: admin/fai/class_FAI.inc:1093
-msgid "Error while fetching source dn - aborted!"
-msgstr "å½“èŽ·å–æº dn æ—¶é”™è¯¯â”€â”€é€€å‡ºï¼"
-
-#: admin/fai/class_FAI.inc:1174
-msgid "Fatal error"
-msgstr ""
+#: admin/fai/class_faiTemplateEntry.inc:172
+msgid "Group"
+msgstr "ç»„"
 
-#: admin/fai/class_FAI.inc:1175
-#, php-format
-msgid ""
-"Release creation failed due to ldap errors. Additional informations '%s'."
+#: admin/fai/class_faiTemplateEntry.inc:172
+msgid "File group"
 msgstr ""
 
-#: admin/fai/class_faiPartitionTableEntry.inc:162
-msgid "primary"
-msgstr "ä¸»è¦"
-
-#: admin/fai/class_faiPartitionTableEntry.inc:162
-msgid "logical"
-msgstr "é€»è¾‘"
-
-#: admin/fai/class_faiPartitionTableEntry.inc:169
-#: admin/fai/faiPartition.tpl.c:8
-msgid "Type"
-msgstr "ç±»åž‹"
-
-#: admin/fai/class_faiPartitionTableEntry.inc:170
-msgid "FS type"
-msgstr "æ–‡ä»¶ç³»ç»Ÿç±»åž‹"
-
-#: admin/fai/class_faiPartitionTableEntry.inc:172
-msgid "Size in MB"
-msgstr "å•ä½ MB"
-
-#: admin/fai/class_faiPartitionTableEntry.inc:174
-msgid "FS option"
-msgstr "æ–‡ä»¶ç³»ç»Ÿé€‰é¡¹"
-
-#: admin/fai/class_faiPartitionTableEntry.inc:175
-#: admin/fai/faiPartition.tpl.c:23
-msgid "Preserve"
-msgstr "ä¿ç•™"
-
-#: admin/fai/class_faiPartitionTableEntry.inc:266
-msgid "False"
-msgstr "å‡"
-
-#: admin/fai/class_faiPartitionTableEntry.inc:268
-msgid "True"
-msgstr "çœŸ"
-
-#: admin/fai/class_faiPartitionTableEntry.inc:272
-#: admin/fai/class_faiPartitionTableEntry.inc:274 admin/fai/fai-list.xml:159
-#: admin/fai/fai-list.xml:198
-msgid "Remove"
-msgstr "åˆ é™¤"
-
-#: admin/fai/class_faiPartitionTableEntry.inc:384
-#, php-format
-msgid "please enter a unique mount point for partition %s"
-msgstr "è¯·è¾“å…¥åˆ†åŒº %s çš„ä¸€ä¸ªå”¯ä¸€æŒ‚è½½ç‚¹"
-
-#: admin/fai/class_faiPartitionTableEntry.inc:389
-#, php-format
-msgid "partition %s mount point"
-msgstr ""
+#: admin/fai/class_faiTemplateEntry.inc:181
+msgid "Access"
+msgstr "è®¿é—®"
 
-#: admin/fai/class_faiPartitionTableEntry.inc:394
-#, php-format
-msgid ""
-"File system type 'swap' is already used, change file system type for "
-"partition %s."
-msgstr "æ–‡ä»¶ç³»ç»Ÿç±»åž‹ 'swap' å·²ç»ä½¿ç”¨è¿‡äº†ï¼Œä¿®æ”¹åˆ†åŒº %s çš„æ–‡ä»¶ç³»ç»Ÿç±»åž‹ã€‚"
-
-#: admin/fai/class_faiPartitionTableEntry.inc:398
-msgid "Please use 'swap' as mount point, if 'swap' is used as fs-type."
-msgstr "è¯·ç”¨ 'swap' ä½œä¸ºæŒ‚è½½ç‚¹ï¼Œå¦‚æžœ 'swap' ä½œä¸ºæ–‡ä»¶ç³»ç»Ÿç±»åž‹ã€‚"
-
-#: admin/fai/class_faiPartitionTableEntry.inc:404
-#: admin/fai/class_faiPartitionTableEntry.inc:408
-#: admin/fai/class_faiPartitionTableEntry.inc:414
-#: admin/fai/class_faiPartitionTableEntry.inc:416
-#: admin/fai/class_faiPartitionTableEntry.inc:421
-#, php-format
-msgid "partition %s size"
+#: admin/fai/class_faiTemplateEntry.inc:181
+msgid "Access rights"
 msgstr ""
 
-#: admin/fai/class_faiPartitionTableEntry.inc:436
-msgid ""
-"You have more than 3 primary partition table entries in your configuration, "
-"please check your configuration twice."
-msgstr "åœ¨æ‚¨çš„é…ç½®æ–‡ä»¶ä¸ï¼Œæœ‰è¶…è¿‡ 3 ä¸ªä¸»è¦åˆ†åŒºè¡¨è®°å½•ï¼Œè¯·å†æ¬¡æ£€æŸ¥æ‚¨çš„é…ç½®ã€‚"
-
 #: admin/fai/packageSelect/selectPackage-list.xml:10
-#: admin/fai/classSelect/selectClass-list.xml:11
 msgid "Please select the desired entries"
 msgstr ""
 
@@ -712,149 +362,96 @@ msgstr ""
 msgid "Version"
 msgstr ""
 
-#: admin/fai/class_faiProfile.inc:310
-msgid "This list displays all assigned class names for this profile."
-msgstr "è¿™ä¸ªåˆ—è¡¨æ˜¾ç¤ºè¯¥ profile æ‰€æœ‰åˆ†é…çš„ç±»åã€‚"
-
-#: admin/fai/class_faiProfile.inc:313 admin/fai/class_askClassName.inc:103
-#: admin/fai/classSelect/class_classSelect.inc:53
-#: admin/fai/class_faiProfileEntry.inc:158
-msgid "Hook bundle"
-msgstr "Hook é›†åˆ"
-
-#: admin/fai/class_faiProfile.inc:314 admin/fai/class_askClassName.inc:105
-#: admin/fai/classSelect/class_classSelect.inc:54
-#: admin/fai/class_faiProfileEntry.inc:159
-msgid "Template bundle"
-msgstr "æ¨¡æ¿é›†"
-
-#: admin/fai/class_faiProfile.inc:315 admin/fai/class_askClassName.inc:101
-#: admin/fai/classSelect/class_classSelect.inc:55
-#: admin/fai/class_faiProfileEntry.inc:160
-msgid "Script bundle"
-msgstr "è„šæœ¬é›†"
-
-#: admin/fai/class_faiProfile.inc:316 admin/fai/class_askClassName.inc:102
-#: admin/fai/classSelect/class_classSelect.inc:56
-#: admin/fai/class_faiProfileEntry.inc:161
-msgid "Variable bundle"
-msgstr "å˜é‡é›†"
-
-#: admin/fai/class_faiProfile.inc:317 admin/fai/class_askClassName.inc:100
-#: admin/fai/classSelect/class_classSelect.inc:57
-#: admin/fai/class_faiProfileEntry.inc:162
-msgid "Package bundle"
-msgstr "è½¯ä»¶åŒ…é›†åˆ"
-
-#: admin/fai/class_faiProfile.inc:321
-msgid "Remove class from profile"
-msgstr "ä»Ž profile ä¸åˆ é™¤åˆ†ç±»"
-
-#: admin/fai/class_faiProfile.inc:324
-msgid "Up"
-msgstr "ä¸Š"
-
-#: admin/fai/class_faiProfile.inc:325
-msgid "Down"
-msgstr "å…³é—"
-
-#: admin/fai/class_faiProfile.inc:410
-msgid "No class specified for this profile!"
-msgstr ""
-
-#: admin/fai/class_faiProfile.inc:419
-msgid "You can't use the same name for a class and a profile!"
+#: admin/fai/class_faiProfile.inc:28
+msgid "Profile"
 msgstr ""
 
-#: admin/fai/class_faiProfile.inc:455
+#: admin/fai/class_faiProfile.inc:29
 msgid "FAI profile"
 msgstr ""
 
-#: admin/fai/class_faiProfile.inc:458
+#: admin/fai/class_faiProfile.inc:32
 msgid "FAI Profile"
 msgstr ""
 
-#: admin/fai/class_faiProfile.inc:465 admin/fai/faiProfile.tpl.c:17
+#: admin/fai/class_faiProfile.inc:61
 msgid "FAI classes"
 msgstr "è‡ªåŠ¨åŒ–å®‰è£…ï¼ˆFAIï¼‰ç±»"
 
-#: admin/fai/class_faiHookEntry.inc:200
-msgid "Hook entry"
+#: admin/fai/class_faiProfile.inc:61
+msgid "FAI classes which are part of this profile"
 msgstr ""
 
-#: admin/fai/class_faiHookEntry.inc:201
-msgid "FAI hook entry"
-msgstr ""
+#: admin/fai/class_faiPackageConfiguration.inc:88
+#, php-format
+msgid "Debconf information for package '%s'"
+msgstr "è½¯ä»¶åŒ…'%s' çš„ Debconf ä¿¡æ¯"
 
-#: admin/fai/class_faiHookEntry.inc:209 admin/fai/faiHookEntry.tpl.c:20
-msgid "Task"
-msgstr "ä»»åŠ¡"
+#: admin/fai/class_faiScript.inc:30 admin/fai/class_faiScript.inc:84
+#: admin/fai/class_faiHook.inc:87
+msgid "Script"
+msgstr "è„šæœ¬"
 
-#: admin/fai/class_faiHookEntry.inc:210 admin/fai/class_faiScript.inc:595
-#: admin/fai/class_faiScript.inc:599
+#: admin/fai/class_faiScript.inc:31 admin/fai/class_faiScript.inc:34
 msgid "FAI script"
 msgstr ""
 
-#: admin/fai/class_faiPackageConfiguration.inc:88
-#, php-format
-msgid "Debconf information for package '%s'"
-msgstr "è½¯ä»¶åŒ…'%s' çš„ Debconf ä¿¡æ¯"
+#: admin/fai/class_faiScript.inc:63
+msgid "Scripts"
+msgstr "è„šæœ¬"
 
-#: admin/fai/class_askClassName.inc:99 admin/fai/class_askClassName.inc:100
-#: admin/fai/class_askClassName.inc:101 admin/fai/class_askClassName.inc:102
-#: admin/fai/class_askClassName.inc:103 admin/fai/class_askClassName.inc:104
-#: admin/fai/class_askClassName.inc:105 admin/fai/class_askClassName.inc:106
-msgid "Create new FAI object"
-msgstr "åˆ›å»ºæ–° FAI å¯¹è±¡"
+#: admin/fai/class_faiScript.inc:67 admin/fai/class_faiHook.inc:67
+#: admin/fai/class_faiVariable.inc:67
+msgid "Variables in this class"
+msgstr ""
 
-#: admin/fai/class_faiTemplateEdit.inc:80
-#, php-format
-msgid ""
-"The file encodig has changed from '%s' to '%s'. Do you really want to save?"
+#: admin/fai/class_faiScript.inc:71 admin/fai/class_faiHook.inc:71
+#: admin/fai/class_faiVariable.inc:71
+msgid "The name of the variable"
 msgstr ""
 
-#: admin/fai/class_faiScript.inc:333 admin/fai/class_faiScript.inc:335
-msgid "Sort direction"
+#: admin/fai/class_faiScript.inc:75 admin/fai/class_faiHook.inc:75
+#: admin/fai/class_faiVariable.inc:75
+msgid "A short description of the variable"
 msgstr ""
 
-#: admin/fai/class_faiScript.inc:348 admin/fai/faiScriptEntry.tpl.c:20
+#: admin/fai/class_faiScript.inc:79
 msgid "Priority"
 msgstr "ä¼˜å…ˆçº§"
 
-#: admin/fai/class_faiScript.inc:350
-msgid "Action"
-msgstr "è¡ŒåŠ¨"
+#: admin/fai/class_faiScript.inc:79
+msgid "Priority of this script (FIXME: less is done first?)"
+msgstr ""
+
+#: admin/fai/class_faiScript.inc:84
+msgid "The script itself"
+msgstr ""
 
-#: admin/fai/classSelect/selectClass-list.xml:36 admin/fai/fai-list.xml:88
-#: admin/fai/faiScriptEntry.tpl.c:14
-msgid "Properties"
-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:501 admin/fai/fai-list.xml:116
+#: admin/fai/class_faiTemplate.inc:153
 msgid "Template"
 msgstr "æ¨¡æ¿"
 
-#: admin/fai/class_faiTemplate.inc:502 admin/fai/class_faiTemplate.inc:506
+#: admin/fai/class_faiTemplate.inc:154 admin/fai/class_faiTemplate.inc:157
 msgid "FAI template"
 msgstr ""
 
-#: admin/fai/class_faiVariableEntry.inc:107
-msgid "Content"
+#: admin/fai/class_faiTemplate.inc:176
+msgid "Template class name"
 msgstr ""
 
-#: admin/fai/class_faiVariableEntry.inc:142
-msgid "Variable entry"
+#: admin/fai/class_faiTemplate.inc:186
+msgid "Template files"
 msgstr ""
 
-#: admin/fai/class_faiVariableEntry.inc:143
-msgid "FAI variable entry "
+#: admin/fai/class_faiTemplate.inc:190
+msgid "Template files in this class"
 msgstr ""
 
-#: admin/fai/class_faiVariableEntry.inc:151
-#: admin/fai/faiVariableEntry.tpl.c:20
-msgid "Variable content"
-msgstr "å˜é‡å†…å®¹"
-
 #: admin/fai/class_faiPartition.inc:176 admin/fai/class_faiPartition.inc:180
 msgid "Logical"
 msgstr ""
@@ -951,96 +548,75 @@ msgstr ""
 msgid "btrfs"
 msgstr ""
 
-#: admin/fai/class_faiPartition.inc:224
-msgid "LVM/RAID"
-msgstr ""
-
-#: admin/fai/class_faiPartition.inc:327
+#: admin/fai/class_faiPartition.inc:325
 msgid "spare"
 msgstr ""
 
-#: admin/fai/class_faiPartition.inc:330
+#: admin/fai/class_faiPartition.inc:328
 msgid "missing"
 msgstr ""
 
-#: admin/fai/class_faiPartition.inc:333
+#: admin/fai/class_faiPartition.inc:331
 msgid "Options"
 msgstr "é€‰é¡¹"
 
-#: admin/fai/class_faiPartition.inc:420
+#: admin/fai/class_faiPartition.inc:415
 msgid "Minimum partition size"
 msgstr ""
 
-#: admin/fai/class_faiPartition.inc:420
+#: admin/fai/class_faiPartition.inc:415
 msgid "Maximum partition size"
 msgstr ""
 
-#: admin/fai/class_faiPartition.inc:428
+#: admin/fai/class_faiPartition.inc:423
 msgid "Raid arrays must contain at least two partitions!"
 msgstr ""
 
-#: admin/fai/class_faiPartition.inc:430
+#: admin/fai/class_faiPartition.inc:425
 msgid ""
 "Raid 0 arrays can only be realized with a combination of two partitions!"
 msgstr ""
 
-#: admin/fai/class_faiHook.inc:332 admin/fai/class_faiHook.inc:334
-#: admin/fai/fai-list.xml:190 admin/fai/faiVariable.tpl.c:23
-#: admin/fai/faiVariable.tpl.c:26
-msgid "Edit"
-msgstr "ç¼–è¾‘"
-
-#: admin/fai/class_faiHook.inc:336
-msgid "Delete"
-msgstr "åˆ é™¤"
-
-#: admin/fai/class_faiHook.inc:521 admin/fai/fai-list.xml:128
+#: admin/fai/class_faiHook.inc:30
 msgid "Hook"
 msgstr ""
 
-#: admin/fai/class_faiHook.inc:522 admin/fai/class_faiHook.inc:526
+#: admin/fai/class_faiHook.inc:31 admin/fai/class_faiHook.inc:34
 msgid "FAI hook"
 msgstr ""
 
-#: admin/fai/class_faiVariable.inc:387 admin/fai/fai-list.xml:134
+#: admin/fai/class_faiHook.inc:63
+msgid "Hooks"
+msgstr "é’©å"
+
+#: admin/fai/class_faiHook.inc:79
+msgid "Task"
+msgstr "ä»»åŠ¡"
+
+#: admin/fai/class_faiHook.inc:87
+msgid "The script of this hook"
+msgstr ""
+
+#: admin/fai/class_faiVariable.inc:30
 msgid "Variable"
 msgstr "å˜é‡"
 
-#: admin/fai/class_faiVariable.inc:388 admin/fai/class_faiVariable.inc:392
+#: admin/fai/class_faiVariable.inc:31 admin/fai/class_faiVariable.inc:34
 msgid "FAI variable"
 msgstr ""
 
-#: admin/fai/class_faiProfileEntry.inc:184 admin/fai/askClassName.tpl.c:11
-#: admin/fai/askClassName.tpl.c:17 admin/fai/paste_generic.tpl.c:5
-msgid "Class name"
-msgstr "ç±»å"
-
-#: admin/fai/class_faiProfileEntry.inc:184 admin/fai/faiTemplate.tpl.c:14
-#: admin/fai/faiVariable.tpl.c:14 admin/fai/faiHook.tpl.c:14
-#: admin/fai/faiPartitionTable.tpl.c:17 admin/fai/faiScript.tpl.c:14
-msgid "Objects"
-msgstr "å¯¹è±¡"
-
-#: admin/fai/fai-list.xml:11
-msgid "List of deployment classes and products"
-msgstr ""
+#: admin/fai/class_faiVariable.inc:63
+msgid "Variables"
+msgstr "å˜é‡"
 
-#: admin/fai/fai-list.xml:15
-msgid "partitionTable"
+#: admin/fai/class_faiVariable.inc:79
+msgid "Content"
 msgstr ""
 
-#: admin/fai/fai-list.xml:23
-msgid "packagelist"
+#: admin/fai/class_faiVariable.inc:79
+msgid "The content of the variable"
 msgstr ""
 
-#: admin/fai/fai-list.xml:93
-msgid "Actions"
-msgstr "åŠ¨ä½œ"
-
-#: admin/fai/fai-list.xml:104
-msgid "Create"
-msgstr "åˆ›å»º"
-
 #: admin/systems/class_faiLogView.inc:56
 msgid "Sort down"
 msgstr ""
@@ -1049,6 +625,10 @@ msgstr ""
 msgid "Sort up"
 msgstr ""
 
+#: admin/systems/class_faiLogView.inc:70
+msgid "File"
+msgstr "æ–‡ä»¶"
+
 #: admin/systems/class_faiLogView.inc:71
 msgid "Date"
 msgstr "æ—¥æœŸ"
@@ -1083,7 +663,7 @@ msgstr ""
 msgid "Selected file: %s"
 msgstr ""
 
-#: admin/systems/class_faiStartup.inc:70 admin/fai/paste_generic.tpl.c:2
+#: admin/systems/class_faiStartup.inc:70
 msgid "FAI settings"
 msgstr ""
 
@@ -1103,11 +683,6 @@ msgstr ""
 msgid "FAI profil to be applied to this computer"
 msgstr ""
 
-#: admin/systems/class_faiStartup.inc:90 admin/fai/faiPackage.tpl.c:14
-#: admin/fai/faiPackage.tpl.c:17
-msgid "Repository"
-msgstr "ä»“åº“"
-
 #: admin/systems/class_faiStartup.inc:90
 msgid "FAI Debian repository to be used for installation"
 msgstr ""
@@ -1132,85 +707,96 @@ msgstr ""
 msgid "Linux kernel parameters to be ran"
 msgstr ""
 
-#: admin/systems/class_faiStartup.inc:178
+#: admin/systems/class_faiStartup.inc:179
 msgid "Full automated installation"
 msgstr ""
 
-#: admin/systems/services/repository/class_serviceRepository.inc:31
+#: admin/systems/services/repository/class_serviceDebianRepository.inc:34
+#: admin/systems/services/repository/class_serviceCentosRepository.inc:31
+msgid "Repositories"
+msgstr ""
+
+#: admin/systems/services/repository/class_serviceDebianRepository.inc:39
+#: admin/systems/services/repository/class_serviceCentosRepository.inc:36
+msgid "Repositories this server hosts"
+msgstr ""
+
+#: admin/systems/services/repository/class_serviceDebianRepository.inc:43
+#: admin/systems/services/repository/class_serviceCentosRepository.inc:40
 msgid "URL"
 msgstr "URL"
 
-#: admin/systems/services/repository/class_serviceRepository.inc:31
+#: admin/systems/services/repository/class_serviceDebianRepository.inc:43
+#: admin/systems/services/repository/class_serviceCentosRepository.inc:40
 msgid "Repository url"
 msgstr ""
 
-#: admin/systems/services/repository/class_serviceRepository.inc:35
+#: admin/systems/services/repository/class_serviceDebianRepository.inc:47
+#: admin/systems/services/repository/class_serviceCentosRepository.inc:44
 msgid "Parent server"
 msgstr ""
 
-#: admin/systems/services/repository/class_serviceRepository.inc:35
+#: admin/systems/services/repository/class_serviceDebianRepository.inc:47
+#: admin/systems/services/repository/class_serviceCentosRepository.inc:44
 msgid "Parent repository server"
 msgstr ""
 
-#: admin/systems/services/repository/class_serviceRepository.inc:40
-msgid "Release used on this repository"
+#: admin/systems/services/repository/class_serviceDebianRepository.inc:52
+msgid "Debian release used on this repository"
 msgstr ""
 
-#: admin/systems/services/repository/class_serviceRepository.inc:47
-msgid "Sections"
-msgstr ""
-
-#: admin/systems/services/repository/class_serviceRepository.inc:47
-msgid "Sections available on this repository"
+#: admin/systems/services/repository/class_serviceDebianRepository.inc:58
+msgid "Debian sections available on this repository"
 msgstr ""
 
-#: admin/systems/services/repository/class_serviceRepository.inc:52
+#: admin/systems/services/repository/class_serviceDebianRepository.inc:63
+#: admin/systems/services/repository/class_serviceCentosRepository.inc:57
 msgid "Mirror mode"
 msgstr ""
 
-#: admin/systems/services/repository/class_serviceRepository.inc:52
+#: admin/systems/services/repository/class_serviceDebianRepository.inc:63
+#: admin/systems/services/repository/class_serviceCentosRepository.inc:57
 msgid ""
 "Is this mirror an installation repository? Is its release a custom one?"
 msgstr ""
 
-#: admin/systems/services/repository/class_serviceRepository.inc:57
+#: admin/systems/services/repository/class_serviceDebianRepository.inc:68
+#: admin/systems/services/repository/class_serviceCentosRepository.inc:62
 msgid "Local mirror"
 msgstr ""
 
-#: admin/systems/services/repository/class_serviceRepository.inc:57
+#: admin/systems/services/repository/class_serviceDebianRepository.inc:68
+#: admin/systems/services/repository/class_serviceCentosRepository.inc:62
 msgid "Is this mirror a local or a network mirror?"
 msgstr ""
 
-#: admin/systems/services/repository/class_serviceRepository.inc:66
+#: admin/systems/services/repository/class_serviceDebianRepository.inc:77
+#: admin/systems/services/repository/class_serviceCentosRepository.inc:71
 msgid "Architectures"
 msgstr ""
 
-#: admin/systems/services/repository/class_serviceRepository.inc:66
+#: admin/systems/services/repository/class_serviceDebianRepository.inc:77
+#: admin/systems/services/repository/class_serviceCentosRepository.inc:71
 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:140
-msgid "Repositories"
+#: admin/systems/services/repository/class_serviceDebianRepository.inc:99
+#: admin/systems/services/repository/class_serviceDebianRepository.inc:100
+msgid "Debian repository"
 msgstr ""
 
-#: admin/systems/services/repository/class_serviceRepository.inc:145
-msgid "Repositories this server hosts"
-msgstr ""
+#: admin/systems/services/repository/class_serviceDebianRepository.inc:100
+#: admin/systems/services/repository/class_serviceCentosRepository.inc:96
+msgid "Services"
+msgstr "æœåŠ¡"
 
-#: admin/systems/services/repository/class_serviceRepository.inc:160
-msgid "Package repository"
+#: admin/systems/services/repository/class_serviceCentosRepository.inc:49
+msgid "Centos release used on this repository"
 msgstr ""
 
-#: admin/systems/services/repository/class_serviceRepository.inc:161
-msgid "Package repository information"
+#: admin/systems/services/repository/class_serviceCentosRepository.inc:95
+#: admin/systems/services/repository/class_serviceCentosRepository.inc:96
+msgid "Centos repository"
 msgstr ""
 
 #: config/fai/class_faiConfig.inc:28
@@ -1242,476 +828,3 @@ msgstr ""
 #: config/fai/class_faiConfig.inc:60
 msgid "s"
 msgstr ""
-
-#: admin/fai/faiPartitionTableEntry.tpl.c:2 admin/fai/faiVariableEntry.tpl.c:2
-#: admin/fai/faiVariableEntry.tpl.c:5 admin/fai/faiDiskEntry.tpl.c:2
-#: admin/fai/faiTemplate.tpl.c:2 admin/fai/faiTemplate.tpl.c:5
-#: admin/fai/faiVariable.tpl.c:2 admin/fai/faiVariable.tpl.c:5
-#: admin/fai/faiHook.tpl.c:2 admin/fai/faiHook.tpl.c:5
-#: admin/fai/faiPackage.tpl.c:2 admin/fai/faiPackage.tpl.c:5
-#: admin/fai/faiTemplateEntry.tpl.c:2 admin/fai/faiTemplateEntry.tpl.c:5
-#: admin/fai/faiScriptEntry.tpl.c:2 admin/fai/faiScriptEntry.tpl.c:5
-#: admin/fai/faiPartitionTable.tpl.c:2 admin/fai/faiPartitionTable.tpl.c:5
-#: admin/fai/faiScript.tpl.c:2 admin/fai/faiScript.tpl.c:5
-#: admin/fai/faiProfile.tpl.c:2 admin/fai/faiProfile.tpl.c:5
-#: admin/fai/faiProfile.tpl.c:14 admin/fai/faiHookEntry.tpl.c:2
-#: admin/fai/faiHookEntry.tpl.c:5
-msgid "Generic"
-msgstr "é€šç”¨é…ç½®"
-
-#: admin/fai/faiPartitionTableEntry.tpl.c:14
-#: admin/fai/faiPartitionTableEntry.tpl.c:17 admin/fai/faiDiskEntry.tpl.c:23
-#: admin/fai/faiDiskEntry.tpl.c:26
-msgid "Partition entries"
-msgstr "åˆ†åŒºæ¡ç›®"
-
-#: admin/fai/faiPartitionTableEntry.tpl.c:20
-#: admin/fai/faiPartitionTableEntry.tpl.c:23 admin/fai/faiDiskEntry.tpl.c:29
-#: admin/fai/faiDiskEntry.tpl.c:32
-msgid "Add partition"
-msgstr "æ·»åŠ åˆ†åŒº"
-
-#: admin/fai/branch_selector.tpl.c:2
-msgid "Releases"
-msgstr ""
-
-#: admin/fai/branch_selector.tpl.c:5
-msgid "Current release"
-msgstr "å½“å‰ç‰ˆæœ¬"
-
-#: admin/fai/branch_selector.tpl.c:8 admin/fai/branch_selector.tpl.c:17
-#: admin/fai/fai-filter.tpl.c:8 admin/fai/fai-filter.tpl.c:17
-msgid "Create release"
-msgstr ""
-
-#: admin/fai/branch_selector.tpl.c:11 admin/fai/branch_selector.tpl.c:23
-#: admin/fai/fai-filter.tpl.c:11 admin/fai/fai-filter.tpl.c:23
-msgid "Create read-only release"
-msgstr ""
-
-#: admin/fai/branch_selector.tpl.c:20 admin/fai/fai-filter.tpl.c:20
-msgid "Freeze"
-msgstr ""
-
-#: admin/fai/branch_selector.tpl.c:26 admin/fai/fai-filter.tpl.c:26
-msgid "Delete current release"
-msgstr "åˆ é™¤å½“å‰ç‰ˆæœ¬"
-
-#: admin/fai/faiPartition.tpl.c:2
-msgid "Partition"
-msgstr ""
-
-#: admin/fai/faiPartition.tpl.c:17
-msgid "Resize existing partition"
-msgstr ""
-
-#: admin/fai/faiPartition.tpl.c:20
-msgid "Bootable"
-msgstr ""
-
-#: admin/fai/faiPartition.tpl.c:26 admin/fai/faiDiskEntry.tpl.c:20
-msgid "Combined physical partitions"
-msgstr ""
-
-#: admin/fai/faiPartition.tpl.c:29
-msgid "Toggle missing"
-msgstr ""
-
-#: admin/fai/faiPartition.tpl.c:32
-msgid "Toggle spare"
-msgstr ""
-
-#: admin/fai/faiPartition.tpl.c:35
-msgid "Filesystem"
-msgstr ""
-
-#: admin/fai/faiPartition.tpl.c:38
-msgid "Filesystem create options"
-msgstr ""
-
-#: admin/fai/faiPartition.tpl.c:41
-msgid "Encrypted"
-msgstr ""
-
-#: admin/fai/faiPartition.tpl.c:44
-msgid "Tune options"
-msgstr ""
-
-#: admin/fai/faiNewBranch.tpl.c:2
-msgid ""
-"You are now going to create a branch or locked branch. This action clones "
-"the existing release to another release name. Branches can be modified as "
-"usual. FAI classes of locked branches cannot be modified, just additional "
-"classes are possible. Branch names should be alphanumeric, excluding the "
-"reserved names 'scripts', 'hooks', 'partitions', 'variables', 'templates' "
-"and 'fai'."
-msgstr "æ‚¨çŽ°åœ¨å°†åˆ›å»ºä¸€ä¸ªåˆ†æ”¯æˆ–è€…é”å®šåˆ†æ”¯ã€‚è¿™ä¸ªåŠ¨ä½œå°†çŽ°å˜çš„å‘è¡Œç‰ˆå…‹éš†ä¸ºå¦å¤–çš„åå—ã€‚åˆ†æ”¯å¯ä»¥æ£å¸¸ç¼–è¾‘ã€‚é”å®šåˆ†æ”¯çš„FAI åˆ†ç±»æ— æ³•ç¼–è¾‘ï¼Œåªæ˜¯å¦å¤–çš„åˆ†ç±»å¯ä»¥ã€‚åˆ†æ”¯åå—ç”±å—æ¯æ•°å—ç»„æˆï¼Œä¿ç•™å—é™¤å¤–ï¼Œå¦‚ 'scripts', 'hooks', 'partitions', 'variables', 'templates' å’Œ 'fai'ã€‚"
-
-#: admin/fai/faiNewBranch.tpl.c:5
-msgid ""
-"Branches are created as subreleases of the currently selected branch. "
-"Creating a new branch named 1.0.2 in SARGE for example, will result in a new"
-" release called SARGE/1.0.2."
-msgstr "åˆ†æ”¯ä½œä¸ºå½“å‰æ‰€é€‰åˆ†æ”¯çš„åå‘è¡Œç‰ˆè¢«åˆ›å»ºã€‚ä¾‹å¦‚åœ¨ SARGE ä¸åˆ›å»ºä¸€ä¸ªåä¸º 1.0.2 çš„æ–°åˆ†æ”¯ï¼Œå°†ä¼šäº§ç”Ÿä¸€ä¸ªæ–°åˆ†æ”¯åä¸º SARGE/1.0.2ã€‚"
-
-#: admin/fai/faiNewBranch.tpl.c:8
-msgid "Please enter a name for the branch"
-msgstr "è¯·ä¸ºè¯¥åˆ†æ”¯è¾“å…¥ä¸€ä¸ªåç§°"
-
-#: admin/fai/faiNewBranch.tpl.c:11
-msgid "Processing the requested operation"
-msgstr "å¤„ç†è¯·æ±‚çš„æ“ä½œ"
-
-#: admin/fai/faiNewBranch.tpl.c:14
-msgid ""
-"As soon as the copy operation has finished, you can scroll down to end of "
-"the page and press the 'Continue' button to continue with the fai management"
-" dialog."
-msgstr "ä¸€æ—¦æ‹·è´å®Œæˆï¼Œæ‚¨å¯ä»¥æ»šåŠ¨é¡µé¢åˆ°æœ€ä¸‹ç«¯ï¼ŒæŒ‰â€œç»§ç»â€æŒ‰é’®ç»§ç» fai ç®¡ç†å¯¹è¯æ¡†ã€‚"
-
-#: admin/fai/faiNewBranch.tpl.c:17
-msgid ""
-"Your browser doesn't support iframes, please use this link to perform the "
-"requested operation."
-msgstr "æ‚¨çš„æµè§ˆå™¨ä¸æ”¯æŒ iframeï¼Œè¯·ä½¿ç”¨è¿™ä¸ªé“¾æŽ¥æ¥æ‰§è¡Œè¯·æ±‚çš„æ“ä½œã€‚"
-
-#: admin/fai/faiNewBranch.tpl.c:20
-msgid "Perform requested operation."
-msgstr "æ‰§è¡Œè¯·æ±‚çš„æ“ä½œã€‚"
-
-#: admin/fai/faiNewBranch.tpl.c:23
-msgid "Initiate operation"
-msgstr "åˆå§‹æ“ä½œ"
-
-#: admin/fai/faiVariableEntry.tpl.c:14 admin/fai/faiVariableEntry.tpl.c:17
-msgid "Variable attributes"
-msgstr "å˜é‡å±žæ€§"
-
-#: admin/fai/faiDiskEntry.tpl.c:11
-msgid "fstab key"
-msgstr ""
-
-#: admin/fai/faiDiskEntry.tpl.c:17
-msgid "Disk label"
-msgstr ""
-
-#: admin/fai/faiTemplate.tpl.c:17
-msgid "List of template files"
-msgstr "æ¨¡æ¿æ–‡ä»¶åˆ—è¡¨"
-
-#: admin/fai/faiVariable.tpl.c:17
-msgid "List of assigned variables"
-msgstr "å·²åˆ†é…å˜é‡åˆ—è¡¨"
-
-#: admin/fai/faiVariable.tpl.c:20
-msgid "Choose a variable to delete or edit"
-msgstr "é€‰æ‹©ä¸€ä¸ªè¦åˆ é™¤æˆ–ä¿®æ”¹çš„å˜é‡"
-
-#: admin/fai/askClassName.tpl.c:2
-msgid ""
-"Adding a new class to the FAI management, requires a class name. You have to"
-" specify a unique class name for unique types of FAI classes, while you can "
-"use the same class name for different types of FAI classes. In the laste "
-"case, FAI will automatically enclose all these different class types to one "
-"unique class name."
-msgstr "åœ¨ FAI ç®¡ç†ä¸æ·»åŠ ä¸€ä¸ªæ–°åˆ†ç±»ï¼Œéœ€è¦ä¸€ä¸ªåˆ†ç±»åã€‚æ‚¨å¿…é¡»ä¸ºå”¯ä¸€çš„ FAI åˆ†ç±»æä¾›ä¸€ä¸ªå”¯ä¸€ç±»åï¼Œè€Œæ‚¨å¯ä»¥ä¸ºä¸åŒçš„ FAI åˆ†ç±»ä½¿ç”¨ç›¸åŒçš„ç±»åã€‚åœ¨æœ€åŽä¸€ç§æƒ…å†µï¼ŒFAI ä¼šè‡ªåŠ¨åŒ…å«æ‰€æœ‰ä¸åŒåˆ†ç±»ç±»åž‹åˆ°å”¯ä¸€ä¸€ä¸ªç±»åä¸ã€‚"
-
-#: admin/fai/askClassName.tpl.c:5
-msgid ""
-"Please use one of the following methods to choose the name for the new FAI "
-"class."
-msgstr "è¯·ä½¿ç”¨ä¸‹é¢çš„ä¸€ä¸ªæ–¹æ³•æ¥é€‰æ‹©æ–° FAI åˆ†ç±»çš„åç§°ã€‚"
-
-#: admin/fai/askClassName.tpl.c:8
-msgid "Enter FAI class name manually"
-msgstr "æ‰‹å·¥è¾“å…¥ FAI åˆ†ç±»åç§°"
-
-#: admin/fai/askClassName.tpl.c:14
-msgid "Choose FAI class name from a list of existing classes"
-msgstr "ä»ŽçŽ°å˜ç±»çš„åˆ—è¡¨ä¸é€‰æ‹©ä¸€ä¸ª FAI åˆ†ç±»åç§°"
-
-#: admin/fai/askClassName.tpl.c:20
-msgid "Choose class name"
-msgstr "é€‰æ‹©åˆ†ç±»å"
-
-#: admin/fai/faiGroupHandle.tpl.c:2
-msgid "Please select the objects you want to remove:"
-msgstr ""
-
-#: admin/fai/faiGroupHandle.tpl.c:5
-msgid "Freezed"
-msgstr ""
-
-#: admin/fai/faiGroupHandle.tpl.c:8
-msgid "Select the object you want to edit:"
-msgstr ""
-
-#: admin/fai/faiGroupHandle.tpl.c:11
-msgid "Select the object you want to copy:"
-msgstr ""
-
-#: admin/fai/remove.tpl.c:5
-msgid ""
-"This includes all account data, system access rules, imap settings, etc. for"
-" this user. Please double check if your really want to do this since there "
-"is no way for FusionDirectory to get your data back."
-msgstr ""
-
-#: admin/fai/remove.tpl.c:8 admin/fai/remove_branch.tpl.c:8
-msgid "So - if you're sure - press 'Delete' to continue or 'Cancel' to abort."
-msgstr "æ‰€ä»¥ï¼Œå¦‚æžœæ‚¨ç¡®å®šï¼Œè¯·æŒ‰â€œåˆ é™¤â€ç»§ç»ï¼Œå¦åˆ™æŒ‰â€œå–æ¶ˆâ€é€€å‡ºã€‚"
-
-#: admin/fai/faiHook.tpl.c:17
-msgid "List of hook scripts"
-msgstr "é’©åè„šæœ¬åˆ—è¡¨"
-
-#: admin/fai/packageSelect/selectPackage-list.tpl.c:2
-#: admin/fai/classSelect/selectClass-list.tpl.c:5
-msgid "Update"
-msgstr "æ›´æ–°"
-
-#: admin/fai/packageSelect/selectPackage-list.tpl.c:5
-#: admin/fai/classSelect/selectClass-list.tpl.c:8
-msgid "Submit"
-msgstr "æäº¤"
-
-#: admin/fai/packageSelect/selectPackage-filter.tpl.c:2
-#: admin/fai/classSelect/selectClass-filter.tpl.c:2
-#: admin/fai/fai-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/remove_branch.tpl.c:5
-msgid ""
-"This includes all account data, system access, etc. for this branch. Please "
-"double check if your really want to do this since there is no way for "
-"FusionDirectory to get your data back."
-msgstr ""
-
-#: admin/fai/faiPackage.tpl.c:26
-msgid "Install method"
-msgstr "å®‰è£…æ–¹æ³•"
-
-#: admin/fai/faiPackage.tpl.c:29
-msgid "Please select the installation method"
-msgstr ""
-
-#: admin/fai/faiPackage.tpl.c:32 admin/fai/faiPackage.tpl.c:35
-msgid "Used packages"
-msgstr "ä½¿ç”¨è½¯ä»¶åŒ…"
-
-#: admin/fai/faiPackage.tpl.c:38
-msgid "Add from list"
-msgstr ""
-
-#: admin/fai/faiProfileEntry.tpl.c:2
-msgid "List of FAI objects (Fully Automatic Installation)"
-msgstr "FAI ï¼ˆå…¨è‡ªåŠ¨å®‰è£…ï¼‰å¯¹è±¡åˆ—è¡¨"
-
-#: admin/fai/faiProfileEntry.tpl.c:5
-msgid "Information"
-msgstr "æç¤ºä¿¡æ¯"
-
-#: admin/fai/faiProfileEntry.tpl.c:8
-msgid ""
-"This menu allows you to select FAI class names and to add them to the "
-"currently edited profile."
-msgstr "è¿™ä¸ªèœå•å…è®¸æ‚¨ä¸ºå½“å‰ç¼–è¾‘çš„é…ç½®æ·»åŠ  FAI ç±»åã€‚"
-
-#: admin/fai/faiProfileEntry.tpl.c:11
-msgid "Filters"
-msgstr "è¿‡æ»¤å™¨"
-
-#: admin/fai/faiProfileEntry.tpl.c:14
-msgid "Show only classes with templates"
-msgstr "åªæ˜¾ç¤ºå¸¦æœ‰æ¨¡æ¿çš„åˆ†ç±»"
-
-#: admin/fai/faiProfileEntry.tpl.c:17
-msgid "Show only classes with scripts"
-msgstr "åªæ˜¾ç¤ºå¸¦æœ‰è„šæœ¬çš„åˆ†ç±»"
-
-#: admin/fai/faiProfileEntry.tpl.c:20
-msgid "Show only classes with hooks"
-msgstr "åªæ˜¾ç¤ºå¸¦æœ‰é’©åçš„åˆ†ç±»"
-
-#: admin/fai/faiProfileEntry.tpl.c:23
-msgid "Show only classes with variables"
-msgstr "åªæ˜¾ç¤ºå¸¦æœ‰å˜é‡çš„åˆ†ç±»"
-
-#: admin/fai/faiProfileEntry.tpl.c:26
-msgid "Show only classes with packages"
-msgstr "åªæ˜¾ç¤ºå¸¦æœ‰è½¯ä»¶åŒ…çš„åˆ†ç±»"
-
-#: admin/fai/faiProfileEntry.tpl.c:29
-msgid "Show only classes with partitions"
-msgstr "åªæ˜¾ç¤ºå¸¦æœ‰åˆ†åŒºçš„åˆ†ç±»"
-
-#: admin/fai/faiProfileEntry.tpl.c:32 admin/fai/faiProfileEntry.tpl.c:35
-msgid "Display objects matching"
-msgstr "æ˜¾ç¤ºåŒ¹é…å¯¹è±¡"
-
-#: admin/fai/faiProfileEntry.tpl.c:38
-msgid "Regular expression for matching object names"
-msgstr "åŒ¹é…å¯¹è±¡åçš„æ£åˆ™è¡¨è¾¾å¼"
-
-#: admin/fai/faiTemplateEntry.tpl.c:17 admin/fai/faiTemplateEntry.tpl.c:20
-msgid "Template attributes"
-msgstr "æ¨¡æ¿å±žæ€§"
-
-#: admin/fai/faiTemplateEntry.tpl.c:26 admin/fai/faiTemplateEntry.tpl.c:29
-msgid "Save template"
-msgstr "ä¿å˜æ¨¡æ¿"
-
-#: admin/fai/faiTemplateEntry.tpl.c:32 admin/fai/faiTemplateEntry.tpl.c:35
-msgid "Edit template"
-msgstr ""
-
-#: admin/fai/faiTemplateEntry.tpl.c:38
-msgid "Full path"
-msgstr ""
-
-#: admin/fai/faiTemplateEntry.tpl.c:41
-msgid "Upload"
-msgstr "ä¸Šä¼ "
-
-#: admin/fai/faiTemplateEntry.tpl.c:44
-msgid "Owner"
-msgstr "æ‰€æœ‰è€…"
-
-#: admin/fai/faiTemplateEntry.tpl.c:50
-msgid "Access"
-msgstr "è®¿é—®"
-
-#: admin/fai/faiTemplateEntry.tpl.c:53
-msgid "Class"
-msgstr "ç±»"
-
-#: admin/fai/faiTemplateEntry.tpl.c:56
-msgid "Read"
-msgstr "è¯»"
-
-#: admin/fai/faiTemplateEntry.tpl.c:59
-msgid "Write"
-msgstr "å†™"
-
-#: admin/fai/faiTemplateEntry.tpl.c:62
-msgid "Execute"
-msgstr "æ‰§è¡Œ"
-
-#: admin/fai/faiTemplateEntry.tpl.c:65
-msgid "Special"
-msgstr "ç‰¹æ®Š"
-
-#: admin/fai/faiTemplateEntry.tpl.c:71
-msgid "SUID"
-msgstr "SUID"
-
-#: admin/fai/faiTemplateEntry.tpl.c:77
-msgid "SGID"
-msgstr "SGID"
-
-#: admin/fai/faiTemplateEntry.tpl.c:80
-msgid "Others"
-msgstr "å…¶ä»–"
-
-#: admin/fai/faiTemplateEntry.tpl.c:83
-msgid "sticky"
-msgstr "ç½®é¡¶"
-
-#: admin/fai/faiScriptEntry.tpl.c:17 admin/fai/faiScriptEntry.tpl.c:26
-msgid "Script attributes"
-msgstr "è„šæœ¬å±žæ€§"
-
-#: admin/fai/faiScriptEntry.tpl.c:23
-msgid ""
-"Choose a priority. Low values result in an earlier, high values in a later "
-"execution."
-msgstr ""
-
-#: admin/fai/faiScriptEntry.tpl.c:32 admin/fai/faiHookEntry.tpl.c:32
-msgid "Import script"
-msgstr "å¯¼å…¥è„šæœ¬"
-
-#: admin/fai/classSelect/selectClass-list.tpl.c:2
-msgid "Base"
-msgstr "ä½ç½®"
-
-#: admin/fai/fai-filter.tpl.c:29
-msgid "Show profiles"
-msgstr "æ˜¾ç¤º profiles"
-
-#: admin/fai/fai-filter.tpl.c:32
-msgid "Show templates"
-msgstr "æ˜¾ç¤ºæ¨¡æ¿"
-
-#: admin/fai/fai-filter.tpl.c:35
-msgid "Show scripts"
-msgstr "æ˜¾ç¤ºè„šæœ¬"
-
-#: admin/fai/fai-filter.tpl.c:38
-msgid "Show hooks"
-msgstr "æ˜¾ç¤ºé’©å"
-
-#: admin/fai/fai-filter.tpl.c:41
-msgid "Show variables"
-msgstr "æ˜¾ç¤ºå˜é‡"
-
-#: admin/fai/fai-filter.tpl.c:44
-msgid "Show packages"
-msgstr "æ˜¾ç¤ºè½¯ä»¶åŒ…"
-
-#: admin/fai/fai-filter.tpl.c:47
-msgid "Show partitions"
-msgstr ""
-
-#: admin/fai/faiTemplateEdit.tpl.c:2
-msgid "This FAI template is write protected. Editing may break it!"
-msgstr ""
-
-#: admin/fai/faiTemplateEdit.tpl.c:5
-msgid "Edit anyway"
-msgstr "ä»ç„¶ç¼–è¾‘"
-
-#: admin/fai/faiPartitionTable.tpl.c:14
-msgid "Use 'setup-storage' to partition the disk"
-msgstr ""
-
-#: admin/fai/faiPartitionTable.tpl.c:20
-msgid "Discs"
-msgstr "Discs"
-
-#: admin/fai/faiPartitionTable.tpl.c:23 admin/fai/faiPartitionTable.tpl.c:26
-#: admin/fai/faiPartitionTable.tpl.c:41 admin/fai/faiPartitionTable.tpl.c:44
-msgid "Add disk"
-msgstr ""
-
-#: admin/fai/faiPartitionTable.tpl.c:29 admin/fai/faiPartitionTable.tpl.c:32
-#: admin/fai/faiPartitionTable.tpl.c:47 admin/fai/faiPartitionTable.tpl.c:50
-msgid "Add RAID"
-msgstr ""
-
-#: admin/fai/faiPartitionTable.tpl.c:35 admin/fai/faiPartitionTable.tpl.c:38
-#: admin/fai/faiPartitionTable.tpl.c:53 admin/fai/faiPartitionTable.tpl.c:56
-msgid "Add volume group"
-msgstr ""
-
-#: admin/fai/faiScript.tpl.c:17
-msgid "List of scripts"
-msgstr "è„šæœ¬åˆ—è¡¨"
-
-#: admin/fai/faiProfile.tpl.c:20
-msgid "Choose a priority"
-msgstr "é€‰æ‹©ä¸€ä¸ªä¼˜å…ˆçº§"
-
-#: admin/fai/faiHookEntry.tpl.c:14 admin/fai/faiHookEntry.tpl.c:17
-#: admin/fai/faiHookEntry.tpl.c:26
-msgid "Hook attributes"
-msgstr "é’©åå±žæ€§"
-
-#: admin/fai/faiHookEntry.tpl.c:23
-msgid "Choose an existing FAI task"
-msgstr "é€‰æ‹©ä¸€ä¸ªå·²å˜åœ¨çš„ FAI ä»»åŠ¡"
diff --git a/fax/locale/ar/fusiondirectory.po b/fax/locale/ar/fusiondirectory.po
index 32d44cbe95b6785a804e4d2fd0383fdb9ddc0809..291a3fe0c62f691d7cfadf64ee2d19e0441999df 100644
--- a/fax/locale/ar/fusiondirectory.po
+++ b/fax/locale/ar/fusiondirectory.po
@@ -5,12 +5,12 @@
 # Translators:
 msgid ""
 msgstr ""
-"Project-Id-Version: FusionDirectory-108\n"
+"Project-Id-Version: FusionDirectory-109\n"
 "Report-Msgid-Bugs-To: documentation@lists.fusiondirectory.org\n"
-"POT-Creation-Date: 2015-03-19 21:45+0100\n"
-"PO-Revision-Date: 2015-02-25 16:02+0000\n"
+"POT-Creation-Date: 2014-12-15 17:47+0100\n"
+"PO-Revision-Date: 2015-02-25 16:04+0000\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>\n"
-"Language-Team: Arabic (http://www.transifex.com/projects/p/FusionDirectory-108/language/ar/)\n"
+"Language-Team: Arabic (http://www.transifex.com/projects/p/FusionDirectory-109/language/ar/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -169,7 +169,6 @@ msgid "Fax ID"
 msgstr ""
 
 #: addons/faxreports/class_faxreport.inc:494
-#: addons/faxreports/contents.tpl.c:29
 msgid "Date"
 msgstr ""
 
@@ -178,23 +177,22 @@ msgid "Time"
 msgstr ""
 
 #: addons/faxreports/class_faxreport.inc:495
-#: addons/faxreports/contents.tpl.c:32 addons/faxreports/detail.tpl.c:29
 msgid "Status"
 msgstr ""
 
-#: addons/faxreports/class_faxreport.inc:496 addons/faxreports/detail.tpl.c:20
+#: addons/faxreports/class_faxreport.inc:496
 msgid "Sender ID"
 msgstr ""
 
-#: addons/faxreports/class_faxreport.inc:497 addons/faxreports/detail.tpl.c:17
+#: addons/faxreports/class_faxreport.inc:497
 msgid "Sender MSN"
 msgstr ""
 
-#: addons/faxreports/class_faxreport.inc:498 addons/faxreports/detail.tpl.c:26
+#: addons/faxreports/class_faxreport.inc:498
 msgid "Receiver ID"
 msgstr ""
 
-#: addons/faxreports/class_faxreport.inc:499 addons/faxreports/detail.tpl.c:23
+#: addons/faxreports/class_faxreport.inc:499
 msgid "Receiver MSN"
 msgstr ""
 
@@ -206,7 +204,7 @@ msgstr ""
 msgid "Status Message"
 msgstr ""
 
-#: addons/faxreports/class_faxreport.inc:502 addons/faxreports/detail.tpl.c:35
+#: addons/faxreports/class_faxreport.inc:502
 msgid "Transfer time"
 msgstr ""
 
@@ -274,8 +272,7 @@ msgstr ""
 
 #: personal/faxaccount/class_gofaxAccount.inc:796
 #: personal/faxaccount/faxNumberSelect/faxNumberSelect-list.xml:56
-#: config/fax/class_faxConfig.inc:42 personal/faxaccount/generic.tpl.c:5
-#: personal/faxaccount/paste_generic.tpl.c:5
+#: config/fax/class_faxConfig.inc:42
 msgid "Fax"
 msgstr "Ø§Ù„ÙØ§ÙƒØ³"
 
@@ -284,12 +281,10 @@ msgid "Fax account settings"
 msgstr ""
 
 #: personal/faxaccount/class_gofaxAccount.inc:806
-#: personal/faxaccount/generic.tpl.c:11
 msgid "Language"
 msgstr ""
 
 #: personal/faxaccount/class_gofaxAccount.inc:807
-#: personal/faxaccount/generic.tpl.c:17
 msgid "Delivery format"
 msgstr ""
 
@@ -302,12 +297,10 @@ msgid "Enable/Disable fax"
 msgstr ""
 
 #: personal/faxaccount/class_gofaxAccount.inc:810
-#: personal/faxaccount/generic.tpl.c:32
 msgid "Deliver fax as mail"
 msgstr ""
 
 #: personal/faxaccount/class_gofaxAccount.inc:811
-#: personal/faxaccount/generic.tpl.c:35
 msgid "Deliver fax to printer"
 msgstr ""
 
@@ -324,7 +317,6 @@ msgid "Please select the desired entries"
 msgstr ""
 
 #: personal/faxaccount/faxNumberSelect/faxNumberSelect-list.xml:14
-#: addons/faxreports/contents.tpl.c:26 addons/faxreports/detail.tpl.c:11
 msgid "User"
 msgstr ""
 
@@ -379,181 +371,3 @@ msgstr ""
 #: config/fax/class_faxConfig.inc:45
 msgid "Branch in which fax blocklists will be stored"
 msgstr ""
-
-#: addons/faxreports/contents.tpl.c:2
-#: personal/faxaccount/faxNumberSelect/faxNumberSelect-filter.tpl.c:2
-msgid "Filter"
-msgstr ""
-
-#: addons/faxreports/contents.tpl.c:5
-msgid "Search for"
-msgstr ""
-
-#: addons/faxreports/contents.tpl.c:8
-msgid "Enter user name to search for"
-msgstr ""
-
-#: addons/faxreports/contents.tpl.c:11 addons/faxreports/contents.tpl.c:20
-msgid "in"
-msgstr ""
-
-#: addons/faxreports/contents.tpl.c:14
-msgid "Select subtree to base search on"
-msgstr ""
-
-#: addons/faxreports/contents.tpl.c:17
-msgid "during"
-msgstr ""
-
-#: addons/faxreports/contents.tpl.c:23
-msgid "Search"
-msgstr ""
-
-#: addons/faxreports/contents.tpl.c:35
-msgid "Sender"
-msgstr ""
-
-#: addons/faxreports/contents.tpl.c:38
-msgid "Receiver"
-msgstr ""
-
-#: addons/faxreports/contents.tpl.c:41 addons/faxreports/detail.tpl.c:38
-msgid "# pages"
-msgstr ""
-
-#: addons/faxreports/contents.tpl.c:44
-msgid "Search returned no results..."
-msgstr ""
-
-#: addons/faxreports/detail.tpl.c:2
-msgid "FAX preview - please wait"
-msgstr ""
-
-#: addons/faxreports/detail.tpl.c:5
-msgid "Click on fax to download"
-msgstr ""
-
-#: addons/faxreports/detail.tpl.c:8
-msgid "FAX ID"
-msgstr ""
-
-#: addons/faxreports/detail.tpl.c:14
-msgid "Date / Time"
-msgstr ""
-
-#: addons/faxreports/detail.tpl.c:32
-msgid "Status message"
-msgstr ""
-
-#: personal/faxaccount/generic.tpl.c:2
-#: personal/faxaccount/paste_generic.tpl.c:2
-msgid "Generic"
-msgstr ""
-
-#: personal/faxaccount/generic.tpl.c:8
-msgid "Fax number for fax to trigger on"
-msgstr ""
-
-#: personal/faxaccount/generic.tpl.c:14
-msgid "Specify the fax communication language for fax to mail gateway"
-msgstr ""
-
-#: personal/faxaccount/generic.tpl.c:20
-msgid "Specify delivery format for fax to mail gateway"
-msgstr ""
-
-#: personal/faxaccount/generic.tpl.c:23
-msgid "Delivery methods"
-msgstr ""
-
-#: personal/faxaccount/generic.tpl.c:26
-msgid "Temporary disable fax usage"
-msgstr ""
-
-#: personal/faxaccount/generic.tpl.c:29
-msgid "Deliver fax as mail to"
-msgstr ""
-
-#: personal/faxaccount/generic.tpl.c:38
-msgid "Alternate fax numbers"
-msgstr ""
-
-#: personal/faxaccount/generic.tpl.c:41
-msgid "Add local"
-msgstr ""
-
-#: personal/faxaccount/generic.tpl.c:44
-msgid "Blocklists"
-msgstr ""
-
-#: personal/faxaccount/generic.tpl.c:47
-msgid "Blocklists for incoming fax"
-msgstr ""
-
-#: personal/faxaccount/generic.tpl.c:50 personal/faxaccount/generic.tpl.c:56
-msgid "Edit"
-msgstr ""
-
-#: personal/faxaccount/generic.tpl.c:53
-msgid "Blocklists for outgoing fax"
-msgstr ""
-
-#: personal/faxaccount/lists.tpl.c:2
-msgid "Blocked numbers/lists"
-msgstr ""
-
-#: personal/faxaccount/lists.tpl.c:5
-msgid "List of predefined blocklists"
-msgstr ""
-
-#: personal/faxaccount/lists.tpl.c:8
-msgid "Add the list to the blocklists"
-msgstr ""
-
-#: personal/faxaccount/paste_generic.tpl.c:8
-msgid "Fax number for GOfax to trigger on"
-msgstr ""
-
-#: personal/faxaccount/paste_generic.tpl.c:11
-msgid "Alternate fax numbers will not be copied"
-msgstr ""
-
-#: personal/faxaccount/locals.tpl.c:2
-msgid "Select numbers to add"
-msgstr ""
-
-#: personal/faxaccount/locals.tpl.c:5
-msgid "Filters"
-msgstr ""
-
-#: personal/faxaccount/locals.tpl.c:8
-msgid "Display numbers of department"
-msgstr ""
-
-#: personal/faxaccount/locals.tpl.c:11
-msgid "Choose the department the search will be based on"
-msgstr ""
-
-#: personal/faxaccount/locals.tpl.c:14
-msgid "Display numbers matching"
-msgstr ""
-
-#: personal/faxaccount/locals.tpl.c:17
-msgid "Regular expression for matching numbers"
-msgstr ""
-
-#: personal/faxaccount/locals.tpl.c:20
-msgid "Display numbers of user"
-msgstr ""
-
-#: personal/faxaccount/locals.tpl.c:23
-msgid "User name of which numbers are shown"
-msgstr ""
-
-#: personal/faxaccount/faxNumberSelect/faxNumberSelect-filter.tpl.c:5
-msgid "Name"
-msgstr "Ø§Ù„Ø¥Ø³Ù…"
-
-#: personal/faxaccount/faxNumberSelect/faxNumberSelect-list.tpl.c:2
-msgid "Base"
-msgstr ""
diff --git a/fax/locale/ca/fusiondirectory.po b/fax/locale/ca/fusiondirectory.po
index 693d798f8602828f6ab25ec68972246c62b34727..eb27569a0a7dc7f94757604955099701083bae59 100644
--- a/fax/locale/ca/fusiondirectory.po
+++ b/fax/locale/ca/fusiondirectory.po
@@ -5,12 +5,12 @@
 # Translators:
 msgid ""
 msgstr ""
-"Project-Id-Version: FusionDirectory-108\n"
+"Project-Id-Version: FusionDirectory-109\n"
 "Report-Msgid-Bugs-To: documentation@lists.fusiondirectory.org\n"
-"POT-Creation-Date: 2015-03-19 21:45+0100\n"
-"PO-Revision-Date: 2015-02-25 16:12+0000\n"
+"POT-Creation-Date: 2014-12-15 17:47+0100\n"
+"PO-Revision-Date: 2015-02-25 15:53+0000\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>\n"
-"Language-Team: Catalan (http://www.transifex.com/projects/p/FusionDirectory-108/language/ca/)\n"
+"Language-Team: Catalan (http://www.transifex.com/projects/p/FusionDirectory-109/language/ca/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -169,7 +169,6 @@ msgid "Fax ID"
 msgstr ""
 
 #: addons/faxreports/class_faxreport.inc:494
-#: addons/faxreports/contents.tpl.c:29
 msgid "Date"
 msgstr ""
 
@@ -178,23 +177,22 @@ msgid "Time"
 msgstr ""
 
 #: addons/faxreports/class_faxreport.inc:495
-#: addons/faxreports/contents.tpl.c:32 addons/faxreports/detail.tpl.c:29
 msgid "Status"
 msgstr ""
 
-#: addons/faxreports/class_faxreport.inc:496 addons/faxreports/detail.tpl.c:20
+#: addons/faxreports/class_faxreport.inc:496
 msgid "Sender ID"
 msgstr ""
 
-#: addons/faxreports/class_faxreport.inc:497 addons/faxreports/detail.tpl.c:17
+#: addons/faxreports/class_faxreport.inc:497
 msgid "Sender MSN"
 msgstr ""
 
-#: addons/faxreports/class_faxreport.inc:498 addons/faxreports/detail.tpl.c:26
+#: addons/faxreports/class_faxreport.inc:498
 msgid "Receiver ID"
 msgstr ""
 
-#: addons/faxreports/class_faxreport.inc:499 addons/faxreports/detail.tpl.c:23
+#: addons/faxreports/class_faxreport.inc:499
 msgid "Receiver MSN"
 msgstr ""
 
@@ -206,7 +204,7 @@ msgstr ""
 msgid "Status Message"
 msgstr ""
 
-#: addons/faxreports/class_faxreport.inc:502 addons/faxreports/detail.tpl.c:35
+#: addons/faxreports/class_faxreport.inc:502
 msgid "Transfer time"
 msgstr ""
 
@@ -274,8 +272,7 @@ msgstr ""
 
 #: personal/faxaccount/class_gofaxAccount.inc:796
 #: personal/faxaccount/faxNumberSelect/faxNumberSelect-list.xml:56
-#: config/fax/class_faxConfig.inc:42 personal/faxaccount/generic.tpl.c:5
-#: personal/faxaccount/paste_generic.tpl.c:5
+#: config/fax/class_faxConfig.inc:42
 msgid "Fax"
 msgstr "Fax"
 
@@ -284,12 +281,10 @@ msgid "Fax account settings"
 msgstr ""
 
 #: personal/faxaccount/class_gofaxAccount.inc:806
-#: personal/faxaccount/generic.tpl.c:11
 msgid "Language"
 msgstr ""
 
 #: personal/faxaccount/class_gofaxAccount.inc:807
-#: personal/faxaccount/generic.tpl.c:17
 msgid "Delivery format"
 msgstr ""
 
@@ -302,12 +297,10 @@ msgid "Enable/Disable fax"
 msgstr ""
 
 #: personal/faxaccount/class_gofaxAccount.inc:810
-#: personal/faxaccount/generic.tpl.c:32
 msgid "Deliver fax as mail"
 msgstr ""
 
 #: personal/faxaccount/class_gofaxAccount.inc:811
-#: personal/faxaccount/generic.tpl.c:35
 msgid "Deliver fax to printer"
 msgstr ""
 
@@ -324,7 +317,6 @@ msgid "Please select the desired entries"
 msgstr ""
 
 #: personal/faxaccount/faxNumberSelect/faxNumberSelect-list.xml:14
-#: addons/faxreports/contents.tpl.c:26 addons/faxreports/detail.tpl.c:11
 msgid "User"
 msgstr ""
 
@@ -379,181 +371,3 @@ msgstr ""
 #: config/fax/class_faxConfig.inc:45
 msgid "Branch in which fax blocklists will be stored"
 msgstr ""
-
-#: addons/faxreports/contents.tpl.c:2
-#: personal/faxaccount/faxNumberSelect/faxNumberSelect-filter.tpl.c:2
-msgid "Filter"
-msgstr ""
-
-#: addons/faxreports/contents.tpl.c:5
-msgid "Search for"
-msgstr ""
-
-#: addons/faxreports/contents.tpl.c:8
-msgid "Enter user name to search for"
-msgstr ""
-
-#: addons/faxreports/contents.tpl.c:11 addons/faxreports/contents.tpl.c:20
-msgid "in"
-msgstr ""
-
-#: addons/faxreports/contents.tpl.c:14
-msgid "Select subtree to base search on"
-msgstr ""
-
-#: addons/faxreports/contents.tpl.c:17
-msgid "during"
-msgstr ""
-
-#: addons/faxreports/contents.tpl.c:23
-msgid "Search"
-msgstr "Cerca"
-
-#: addons/faxreports/contents.tpl.c:35
-msgid "Sender"
-msgstr ""
-
-#: addons/faxreports/contents.tpl.c:38
-msgid "Receiver"
-msgstr ""
-
-#: addons/faxreports/contents.tpl.c:41 addons/faxreports/detail.tpl.c:38
-msgid "# pages"
-msgstr ""
-
-#: addons/faxreports/contents.tpl.c:44
-msgid "Search returned no results..."
-msgstr ""
-
-#: addons/faxreports/detail.tpl.c:2
-msgid "FAX preview - please wait"
-msgstr ""
-
-#: addons/faxreports/detail.tpl.c:5
-msgid "Click on fax to download"
-msgstr ""
-
-#: addons/faxreports/detail.tpl.c:8
-msgid "FAX ID"
-msgstr ""
-
-#: addons/faxreports/detail.tpl.c:14
-msgid "Date / Time"
-msgstr ""
-
-#: addons/faxreports/detail.tpl.c:32
-msgid "Status message"
-msgstr ""
-
-#: personal/faxaccount/generic.tpl.c:2
-#: personal/faxaccount/paste_generic.tpl.c:2
-msgid "Generic"
-msgstr "GenÃ¨ric"
-
-#: personal/faxaccount/generic.tpl.c:8
-msgid "Fax number for fax to trigger on"
-msgstr ""
-
-#: personal/faxaccount/generic.tpl.c:14
-msgid "Specify the fax communication language for fax to mail gateway"
-msgstr ""
-
-#: personal/faxaccount/generic.tpl.c:20
-msgid "Specify delivery format for fax to mail gateway"
-msgstr ""
-
-#: personal/faxaccount/generic.tpl.c:23
-msgid "Delivery methods"
-msgstr ""
-
-#: personal/faxaccount/generic.tpl.c:26
-msgid "Temporary disable fax usage"
-msgstr ""
-
-#: personal/faxaccount/generic.tpl.c:29
-msgid "Deliver fax as mail to"
-msgstr ""
-
-#: personal/faxaccount/generic.tpl.c:38
-msgid "Alternate fax numbers"
-msgstr ""
-
-#: personal/faxaccount/generic.tpl.c:41
-msgid "Add local"
-msgstr ""
-
-#: personal/faxaccount/generic.tpl.c:44
-msgid "Blocklists"
-msgstr ""
-
-#: personal/faxaccount/generic.tpl.c:47
-msgid "Blocklists for incoming fax"
-msgstr ""
-
-#: personal/faxaccount/generic.tpl.c:50 personal/faxaccount/generic.tpl.c:56
-msgid "Edit"
-msgstr ""
-
-#: personal/faxaccount/generic.tpl.c:53
-msgid "Blocklists for outgoing fax"
-msgstr ""
-
-#: personal/faxaccount/lists.tpl.c:2
-msgid "Blocked numbers/lists"
-msgstr ""
-
-#: personal/faxaccount/lists.tpl.c:5
-msgid "List of predefined blocklists"
-msgstr ""
-
-#: personal/faxaccount/lists.tpl.c:8
-msgid "Add the list to the blocklists"
-msgstr ""
-
-#: personal/faxaccount/paste_generic.tpl.c:8
-msgid "Fax number for GOfax to trigger on"
-msgstr ""
-
-#: personal/faxaccount/paste_generic.tpl.c:11
-msgid "Alternate fax numbers will not be copied"
-msgstr ""
-
-#: personal/faxaccount/locals.tpl.c:2
-msgid "Select numbers to add"
-msgstr ""
-
-#: personal/faxaccount/locals.tpl.c:5
-msgid "Filters"
-msgstr ""
-
-#: personal/faxaccount/locals.tpl.c:8
-msgid "Display numbers of department"
-msgstr ""
-
-#: personal/faxaccount/locals.tpl.c:11
-msgid "Choose the department the search will be based on"
-msgstr ""
-
-#: personal/faxaccount/locals.tpl.c:14
-msgid "Display numbers matching"
-msgstr ""
-
-#: personal/faxaccount/locals.tpl.c:17
-msgid "Regular expression for matching numbers"
-msgstr ""
-
-#: personal/faxaccount/locals.tpl.c:20
-msgid "Display numbers of user"
-msgstr ""
-
-#: personal/faxaccount/locals.tpl.c:23
-msgid "User name of which numbers are shown"
-msgstr ""
-
-#: personal/faxaccount/faxNumberSelect/faxNumberSelect-filter.tpl.c:5
-msgid "Name"
-msgstr "Nom"
-
-#: personal/faxaccount/faxNumberSelect/faxNumberSelect-list.tpl.c:2
-msgid "Base"
-msgstr "Base"
diff --git a/fax/locale/cs_CZ/fusiondirectory.po b/fax/locale/cs_CZ/fusiondirectory.po
index 3c69dd0cebaf1fdb702e9b0aeb4af588b00799ca..8a8c32f5487b0f30fc34813cc4d2821029155442 100644
--- a/fax/locale/cs_CZ/fusiondirectory.po
+++ b/fax/locale/cs_CZ/fusiondirectory.po
@@ -3,17 +3,15 @@
 # This file is distributed under the same license as the PACKAGE package.
 # 
 # Translators:
-# Pavel Borecki <pavel.borecki@gmail.com>, 2012
-# Pavel Borecki <pavel.borecki@gmail.com>, 2012
-# Pavel Borecki <pavel.borecki@gmail.com>, 2012
+# Pavel Borecki <pavel.borecki@gmail.com>, 2014-2015
 msgid ""
 msgstr ""
-"Project-Id-Version: FusionDirectory-108\n"
+"Project-Id-Version: FusionDirectory-109\n"
 "Report-Msgid-Bugs-To: documentation@lists.fusiondirectory.org\n"
-"POT-Creation-Date: 2015-03-19 21:45+0100\n"
-"PO-Revision-Date: 2015-02-25 16:12+0000\n"
-"Last-Translator: fusiondirectory <contact@fusiondirectory.org>\n"
-"Language-Team: Czech (Czech Republic) (http://www.transifex.com/projects/p/FusionDirectory-108/language/cs_CZ/)\n"
+"POT-Creation-Date: 2014-12-15 17:47+0100\n"
+"PO-Revision-Date: 2015-04-07 14:22+0000\n"
+"Last-Translator: Pavel Borecki <pavel.borecki@gmail.com>\n"
+"Language-Team: Czech (Czech Republic) (http://www.transifex.com/projects/p/FusionDirectory-109/language/cs_CZ/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -22,15 +20,15 @@ msgstr ""
 
 #: admin/blocklists/class_blocklistManagement.inc:28
 msgid "Fax Blocklists"
-msgstr ""
+msgstr "Seznamy blokovanÃ½ch faxÅ¯"
 
 #: admin/blocklists/class_blocklistManagement.inc:29
 msgid "Fax Blocklists management"
-msgstr ""
+msgstr "SprÃ¡va seznamÅ¯ blokovanÃ½ch faxÅ¯"
 
 #: admin/blocklists/class_blocklistGeneric.inc:32
 msgid "Type"
-msgstr "typ"
+msgstr "Typ"
 
 #: admin/blocklists/class_blocklistGeneric.inc:32
 msgid "Type of this list"
@@ -46,7 +44,7 @@ msgstr "pÅ™ijmout"
 
 #: admin/blocklists/class_blocklistGeneric.inc:39
 msgid "Blocked numbers"
-msgstr "blokovanÃ¡ ÄÃsla"
+msgstr "BlokovanÃ¡ ÄÃsla"
 
 #: admin/blocklists/class_blocklistGeneric.inc:40
 msgid "Numbers can also contain wild cards."
@@ -55,11 +53,11 @@ msgstr "ÄŒÃsla mohou obsahovat tÃ©Å¾ zÃ¡stupnÃ© znaky."
 #: admin/blocklists/class_blocklistGeneric.inc:137
 #: admin/blocklists/class_blocklistGeneric.inc:141
 msgid "Fax blocklists"
-msgstr "seznam blokovanÃ½ch faxÅ¯"
+msgstr "Seznam blokovanÃ½ch faxÅ¯"
 
 #: admin/blocklists/class_blocklistGeneric.inc:138
 msgid "The part of the fax plugin managing blacklist"
-msgstr ""
+msgstr "ÄŒÃ¡st faxovÃ©ho zÃ¡suvnÃ©ho modulu, kterÃ¡ spravuje seznam blokovanÃ½ch"
 
 #: admin/blocklists/class_blocklistGeneric.inc:159
 msgid "Informations"
@@ -67,15 +65,15 @@ msgstr "Informace"
 
 #: admin/blocklists/class_blocklistGeneric.inc:162
 msgid "List name"
-msgstr "nÃ¡zev seznamu"
+msgstr "NÃ¡zev seznamu"
 
 #: admin/blocklists/class_blocklistGeneric.inc:162
 msgid "The name of the list"
-msgstr ""
+msgstr "NÃ¡zev seznamu"
 
 #: admin/blocklists/class_blocklistGeneric.inc:163
 msgid "Description"
-msgstr "popis"
+msgstr "Popis"
 
 #: admin/blocklists/class_blocklistGeneric.inc:163
 msgid "A description for the list"
@@ -83,16 +81,16 @@ msgstr "Popis seznamu"
 
 #: admin/blocklists/class_blocklistGeneric.inc:165
 msgid "List of blocked number"
-msgstr ""
+msgstr "Seznam blokovanÃ½ch ÄÃsel"
 
 #: admin/systems/services/fax/class_serviceFax.inc:31
 #: admin/systems/services/fax/class_serviceFax.inc:32
 msgid "FAX service"
-msgstr ""
+msgstr "FaxovÃ¡ sluÅ¾ba"
 
 #: admin/systems/services/fax/class_serviceFax.inc:32
 msgid "Services"
-msgstr "sluÅ¾by"
+msgstr "SluÅ¾by"
 
 #: admin/systems/services/fax/class_serviceFax.inc:46
 msgid "FAX database information"
@@ -104,7 +102,7 @@ msgstr "uÅ¾ivatel pro pÅ™ihlÃ¡Å¡enÃ do databÃ¡ze faxÅ¯"
 
 #: admin/systems/services/fax/class_serviceFax.inc:56
 msgid "Password"
-msgstr "heslo"
+msgstr "Heslo"
 
 #: addons/faxreports/class_faxreport.inc:130
 #: addons/faxreports/class_faxreport.inc:139
@@ -113,7 +111,7 @@ msgstr "heslo"
 #: personal/faxaccount/class_gofaxAccount.inc:272 html/getfax.php:96
 #: html/getfax.php:101 html/getfax.php:106
 msgid "Error"
-msgstr "chyba"
+msgstr "Chyba"
 
 #: addons/faxreports/class_faxreport.inc:130
 msgid "No fax server found!"
@@ -133,7 +131,7 @@ msgstr "NedaÅ™Ã se dotazovat do databÃ¡ze %s!"
 #: addons/faxreports/class_faxreport.inc:168
 #: addons/faxreports/class_faxreport.inc:178
 msgid "Permission error"
-msgstr "chyba oprÃ¡vnÄ›nÃ"
+msgstr "Chyba oprÃ¡vnÄ›nÃ"
 
 #: addons/faxreports/class_faxreport.inc:168
 #: addons/faxreports/class_faxreport.inc:178
@@ -151,79 +149,77 @@ msgstr "nedostaÄujÃcÃ oprÃ¡vnÄ›nÃ pro zobrazenÃ tÃ©to vlastnosti"
 
 #: addons/faxreports/class_faxreport.inc:319
 msgid "Insufficient permissions"
-msgstr "nedostaÄujÃcÃ oprÃ¡vnÄ›nÃ"
+msgstr "NedostaÄujÃcÃ oprÃ¡vnÄ›nÃ"
 
 #: addons/faxreports/class_faxreport.inc:482
 #: addons/faxreports/class_faxreport.inc:483
 #: addons/faxreports/class_faxreport.inc:488
 msgid "Fax reports"
-msgstr "statistiky faxu"
+msgstr "Statistiky faxu"
 
 #: addons/faxreports/class_faxreport.inc:483
 msgid "All entries are readonly"
-msgstr "vÅ¡echny poloÅ¾ky jsou pÅ™ÃstupnÃ© pouze pro ÄtenÃ"
+msgstr "VeÅ¡kerÃ© poloÅ¾ky jsou pÅ™ÃstupnÃ© pouze pro ÄtenÃ"
 
 #: addons/faxreports/class_faxreport.inc:492
 msgid "Detailed view"
-msgstr "podrobnosti"
+msgstr "Zobrazit podrobnosti"
 
 #: addons/faxreports/class_faxreport.inc:493
 msgid "Fax ID"
-msgstr "ID faxu"
+msgstr "IdentifikÃ¡tor faxu"
 
 #: addons/faxreports/class_faxreport.inc:494
-#: addons/faxreports/contents.tpl.c:29
 msgid "Date"
-msgstr "datum"
+msgstr "Datum"
 
 #: addons/faxreports/class_faxreport.inc:494
 msgid "Time"
-msgstr "Äas"
+msgstr "ÄŒas"
 
 #: addons/faxreports/class_faxreport.inc:495
-#: addons/faxreports/contents.tpl.c:32 addons/faxreports/detail.tpl.c:29
 msgid "Status"
-msgstr "stav"
+msgstr "Stav"
 
-#: addons/faxreports/class_faxreport.inc:496 addons/faxreports/detail.tpl.c:20
+#: addons/faxreports/class_faxreport.inc:496
 msgid "Sender ID"
-msgstr "ID odesilatele"
+msgstr "IdentifikÃ¡tor odesilatele"
 
-#: addons/faxreports/class_faxreport.inc:497 addons/faxreports/detail.tpl.c:17
+#: addons/faxreports/class_faxreport.inc:497
 msgid "Sender MSN"
 msgstr "MSN odesilatele"
 
-#: addons/faxreports/class_faxreport.inc:498 addons/faxreports/detail.tpl.c:26
+#: addons/faxreports/class_faxreport.inc:498
 msgid "Receiver ID"
-msgstr "ID pÅ™Ãjemce"
+msgstr "IdentifikÃ¡tor pÅ™Ãjemce"
 
-#: addons/faxreports/class_faxreport.inc:499 addons/faxreports/detail.tpl.c:23
+#: addons/faxreports/class_faxreport.inc:499
 msgid "Receiver MSN"
 msgstr "MSN pÅ™Ãjemce"
 
 #: addons/faxreports/class_faxreport.inc:500
 msgid "Number of pages"
-msgstr "poÄet stran"
+msgstr "PoÄet stran"
 
 #: addons/faxreports/class_faxreport.inc:501
 msgid "Status Message"
-msgstr "stavovÃ¡ zprÃ¡va"
+msgstr "StavovÃ¡ zprÃ¡va"
 
-#: addons/faxreports/class_faxreport.inc:502 addons/faxreports/detail.tpl.c:35
+#: addons/faxreports/class_faxreport.inc:502
 msgid "Transfer time"
-msgstr "dÃ©lka trvÃ¡nÃ pÅ™enosu"
+msgstr "ÄŒas pÅ™enosu"
 
 #: addons/faxreports/main.inc:44
 msgid "FAX reports"
-msgstr "statistiky faxÅ¯"
+msgstr "Statistiky faxÅ¯"
 
 #: personal/faxaccount/class_gofaxAccount.inc:26
 msgid "FAX"
-msgstr "fax"
+msgstr "Fax"
 
 #: personal/faxaccount/class_gofaxAccount.inc:27
 msgid "This does something"
-msgstr "tohle nÄ›co dÄ›lÃ¡"
+msgstr "Tohle nÄ›co dÄ›lÃ¡"
 
 #: personal/faxaccount/class_gofaxAccount.inc:180
 #: personal/faxaccount/class_gofaxAccount.inc:190
@@ -233,7 +229,7 @@ msgstr "GOfax"
 
 #: personal/faxaccount/class_gofaxAccount.inc:189
 msgid "Remove fax account"
-msgstr "odebrat faxovÃ½ ÃºÄet"
+msgstr "Odstranit faxovÃ½ ÃºÄet"
 
 #: personal/faxaccount/class_gofaxAccount.inc:192
 msgid "Create fax account"
@@ -241,7 +237,7 @@ msgstr "vytvoÅ™it faxovÃ½ ÃºÄet"
 
 #: personal/faxaccount/class_gofaxAccount.inc:272
 msgid "Phone number"
-msgstr "telefonnÃ ÄÃslo"
+msgstr "TelefonnÃ ÄÃslo"
 
 #: personal/faxaccount/class_gofaxAccount.inc:421
 #: personal/faxaccount/class_gofaxAccount.inc:503
@@ -251,13 +247,13 @@ msgstr "zpÄ›t"
 #: personal/faxaccount/class_gofaxAccount.inc:611
 #: personal/faxaccount/class_gofaxAccount.inc:739
 msgid "LDAP error"
-msgstr "chyba LDAPu"
+msgstr "Chyba LDAP"
 
 #: personal/faxaccount/class_gofaxAccount.inc:627
 #: personal/faxaccount/class_gofaxAccount.inc:631
 #: personal/faxaccount/class_gofaxAccount.inc:805
 msgid "Fax number"
-msgstr "ÄÃslo faxu"
+msgstr "ÄŒÃslo faxu"
 
 #: personal/faxaccount/class_gofaxAccount.inc:638
 msgid "Mail delivery is requested without target address!"
@@ -277,8 +273,7 @@ msgstr "Je poÅ¾adovÃ¡n tisk, ale nenÃ nastavena cÃlovÃ¡ tiskÃ¡rna!"
 
 #: personal/faxaccount/class_gofaxAccount.inc:796
 #: personal/faxaccount/faxNumberSelect/faxNumberSelect-list.xml:56
-#: config/fax/class_faxConfig.inc:42 personal/faxaccount/generic.tpl.c:5
-#: personal/faxaccount/paste_generic.tpl.c:5
+#: config/fax/class_faxConfig.inc:42
 msgid "Fax"
 msgstr "fax"
 
@@ -287,36 +282,32 @@ msgid "Fax account settings"
 msgstr "nastavenÃ faxovÃ©ho ÃºÄtu"
 
 #: personal/faxaccount/class_gofaxAccount.inc:806
-#: personal/faxaccount/generic.tpl.c:11
 msgid "Language"
-msgstr "jazyk"
+msgstr "Jazyk"
 
 #: personal/faxaccount/class_gofaxAccount.inc:807
-#: personal/faxaccount/generic.tpl.c:17
 msgid "Delivery format"
-msgstr "doruÄovanÃ½ formÃ¡t"
+msgstr "FormÃ¡t doruÄenÃ"
 
 #: personal/faxaccount/class_gofaxAccount.inc:808
 msgid "Alternate fax number"
-msgstr "alternativnÃ ÄÃslo faxu"
+msgstr "AlternativnÃ faxovÃ© ÄÃslo"
 
 #: personal/faxaccount/class_gofaxAccount.inc:809
 msgid "Enable/Disable fax"
-msgstr "povolit/zakÃ¡zat fax"
+msgstr "Vypnout/Zapnout fax"
 
 #: personal/faxaccount/class_gofaxAccount.inc:810
-#: personal/faxaccount/generic.tpl.c:32
 msgid "Deliver fax as mail"
-msgstr "doruÄovat fax jako e-mail"
+msgstr "DoruÄovat fax v podobÄ› e-mailu"
 
 #: personal/faxaccount/class_gofaxAccount.inc:811
-#: personal/faxaccount/generic.tpl.c:35
 msgid "Deliver fax to printer"
-msgstr "doruÄovat fax na tiskÃ¡rnu"
+msgstr "DoruÄovat fax na tiskÃ¡rnu"
 
 #: personal/faxaccount/class_gofaxAccount.inc:812
 msgid "Receive blocklist"
-msgstr "zÃskat seznamy blokovanÃ½ch"
+msgstr "ZÃskat seznamy blokovanÃ½ch"
 
 #: personal/faxaccount/class_gofaxAccount.inc:813
 msgid "Send blocklist"
@@ -324,28 +315,27 @@ msgstr "poslat seznam blokovanÃ½ch"
 
 #: personal/faxaccount/faxNumberSelect/faxNumberSelect-list.xml:10
 msgid "Please select the desired entries"
-msgstr "vyberte prosÃm poÅ¾adovanÃ© poloÅ¾ky"
+msgstr "Vyberte poÅ¾adovanÃ© poloÅ¾ky"
 
 #: personal/faxaccount/faxNumberSelect/faxNumberSelect-list.xml:14
-#: addons/faxreports/contents.tpl.c:26 addons/faxreports/detail.tpl.c:11
 msgid "User"
-msgstr "uÅ¾ivatel"
+msgstr "UÅ¾ivatel"
 
 #: personal/faxaccount/faxNumberSelect/faxNumberSelect-list.xml:40
 msgid "Given name"
-msgstr "jmÃ©no"
+msgstr "JmÃ©no"
 
 #: personal/faxaccount/faxNumberSelect/faxNumberSelect-list.xml:48
 msgid "Surname"
-msgstr "pÅ™ÃjmenÃ"
+msgstr "PÅ™ÃjmenÃ"
 
 #: personal/faxaccount/main.inc:126
 msgid "Click the 'Edit' button below to change informations in this dialog"
-msgstr "pro zmÄ›nu informacÃ v tomto dialogu kliknÄ›te na 'upravit'"
+msgstr "Pro zmÄ›nu informacÃ v tomto dialogu kliknÄ›te na Upravit"
 
 #: personal/faxaccount/main.inc:135
 msgid "FAX settings"
-msgstr "nastavenÃ faxu"
+msgstr "NastavenÃ faxu"
 
 #: html/getfax.php:59
 msgid "Could not connect to database server!"
@@ -357,7 +347,7 @@ msgstr "Dotaz do databÃ¡ze se nezdaÅ™il!"
 
 #: html/getfax.php:96
 msgid "cannot resize fax image"
-msgstr ""
+msgstr "Nelze zmÄ›nit velikost faxovÃ©ho obrÃ¡zku"
 
 #: html/getfax.php:101
 msgid "cannot convert fax image to png"
@@ -365,7 +355,7 @@ msgstr "faxovÃ½ obrÃ¡zek nelze pÅ™evÃ©st na png"
 
 #: html/getfax.php:106
 msgid "Reading fax image image failed"
-msgstr "Nelze naÄÃst obrÃ¡zek faxu"
+msgstr "NaÄtenÃ faxovÃ©ho obrÃ¡zku se nezdaÅ™ilo"
 
 #: config/fax/class_faxConfig.inc:28
 msgid "Fax configuration"
@@ -373,190 +363,12 @@ msgstr "NastavenÃ faxu"
 
 #: config/fax/class_faxConfig.inc:29
 msgid "FusionDirectory fax plugin configuration"
-msgstr ""
+msgstr "NastavenÃ zÃ¡suvnÃ©ho modulu fax pro FusionDirectory"
 
 #: config/fax/class_faxConfig.inc:45
 msgid "Fax RDN"
-msgstr ""
+msgstr "RelativnÃ rozliÅ¡enÃ½ nÃ¡zev faxu"
 
 #: config/fax/class_faxConfig.inc:45
 msgid "Branch in which fax blocklists will be stored"
-msgstr ""
-
-#: addons/faxreports/contents.tpl.c:2
-#: personal/faxaccount/faxNumberSelect/faxNumberSelect-filter.tpl.c:2
-msgid "Filter"
-msgstr "filtr"
-
-#: addons/faxreports/contents.tpl.c:5
-msgid "Search for"
-msgstr "hledat"
-
-#: addons/faxreports/contents.tpl.c:8
-msgid "Enter user name to search for"
-msgstr "zadejte jmÃ©no uÅ¾ivatele, kterÃ½ mÃ¡ bÃ½t vyhledÃ¡n"
-
-#: addons/faxreports/contents.tpl.c:11 addons/faxreports/contents.tpl.c:20
-msgid "in"
-msgstr "v"
-
-#: addons/faxreports/contents.tpl.c:14
-msgid "Select subtree to base search on"
-msgstr "zvolte podstrom, ve kterÃ©m se bude hledat"
-
-#: addons/faxreports/contents.tpl.c:17
-msgid "during"
-msgstr "bÄ›hem"
-
-#: addons/faxreports/contents.tpl.c:23
-msgid "Search"
-msgstr "hledat"
-
-#: addons/faxreports/contents.tpl.c:35
-msgid "Sender"
-msgstr "odesilatel"
-
-#: addons/faxreports/contents.tpl.c:38
-msgid "Receiver"
-msgstr "pÅ™Ãjemce"
-
-#: addons/faxreports/contents.tpl.c:41 addons/faxreports/detail.tpl.c:38
-msgid "# pages"
-msgstr "poÄet stran"
-
-#: addons/faxreports/contents.tpl.c:44
-msgid "Search returned no results..."
-msgstr "Nic nebylo nalezenoâ€¦"
-
-#: addons/faxreports/detail.tpl.c:2
-msgid "FAX preview - please wait"
-msgstr "PÅ™ipravuji nÃ¡hled faxu â€“ Äekejte prosÃm!"
-
-#: addons/faxreports/detail.tpl.c:5
-msgid "Click on fax to download"
-msgstr "pro staÅ¾enÃ kliknÄ›te na fax"
-
-#: addons/faxreports/detail.tpl.c:8
-msgid "FAX ID"
-msgstr "ID faxu"
-
-#: addons/faxreports/detail.tpl.c:14
-msgid "Date / Time"
-msgstr "datum / Äas"
-
-#: addons/faxreports/detail.tpl.c:32
-msgid "Status message"
-msgstr "stavovÃ¡ zprÃ¡va"
-
-#: personal/faxaccount/generic.tpl.c:2
-#: personal/faxaccount/paste_generic.tpl.c:2
-msgid "Generic"
-msgstr "obecnÃ©"
-
-#: personal/faxaccount/generic.tpl.c:8
-msgid "Fax number for fax to trigger on"
-msgstr ""
-
-#: personal/faxaccount/generic.tpl.c:14
-msgid "Specify the fax communication language for fax to mail gateway"
-msgstr ""
-
-#: personal/faxaccount/generic.tpl.c:20
-msgid "Specify delivery format for fax to mail gateway"
-msgstr "zvolte doruÄovanÃ½ formÃ¡t faxu pro e-mailovou brÃ¡nu"
-
-#: personal/faxaccount/generic.tpl.c:23
-msgid "Delivery methods"
-msgstr "zpÅ¯soby doruÄenÃ"
-
-#: personal/faxaccount/generic.tpl.c:26
-msgid "Temporary disable fax usage"
-msgstr "doÄasnÃ© zakÃ¡zÃ¡nÃ pouÅ¾ÃvÃ¡nÃ faxu"
-
-#: personal/faxaccount/generic.tpl.c:29
-msgid "Deliver fax as mail to"
-msgstr "doruÄit fax na tento e-mail"
-
-#: personal/faxaccount/generic.tpl.c:38
-msgid "Alternate fax numbers"
-msgstr "alternativnÃ faxovÃ¡ ÄÃsla"
-
-#: personal/faxaccount/generic.tpl.c:41
-msgid "Add local"
-msgstr "pÅ™idat mÃstnÃ"
-
-#: personal/faxaccount/generic.tpl.c:44
-msgid "Blocklists"
-msgstr "seznamy blokovanÃ½ch"
-
-#: personal/faxaccount/generic.tpl.c:47
-msgid "Blocklists for incoming fax"
-msgstr "seznamy blokovanÃ½ch pro pÅ™ÃchozÃ faxy"
-
-#: personal/faxaccount/generic.tpl.c:50 personal/faxaccount/generic.tpl.c:56
-msgid "Edit"
-msgstr "upravit"
-
-#: personal/faxaccount/generic.tpl.c:53
-msgid "Blocklists for outgoing fax"
-msgstr "seznamy blokovanÃ½ch pro odchozÃ faxy"
-
-#: personal/faxaccount/lists.tpl.c:2
-msgid "Blocked numbers/lists"
-msgstr "blokovanÃ¡ ÄÃsla/seznamy"
-
-#: personal/faxaccount/lists.tpl.c:5
-msgid "List of predefined blocklists"
-msgstr "seznam pÅ™eddefinovanÃ½ch seznamÅ¯ blokovanÃ½ch ÄÃsel"
-
-#: personal/faxaccount/lists.tpl.c:8
-msgid "Add the list to the blocklists"
-msgstr "pÅ™idat seznam do seznamu blokovanÃ½ch"
-
-#: personal/faxaccount/paste_generic.tpl.c:8
-msgid "Fax number for GOfax to trigger on"
-msgstr "faxovÃ© ÄÃslo pro GOfax pro spouÅ¡tÄ›nÃ"
-
-#: personal/faxaccount/paste_generic.tpl.c:11
-msgid "Alternate fax numbers will not be copied"
-msgstr "alternativnÃ faxovÃ¡ ÄÃsla nebudou zkopÃrovÃ¡na"
-
-#: personal/faxaccount/locals.tpl.c:2
-msgid "Select numbers to add"
-msgstr "zvolte ÄÃsla, kterÃ¡ majÃ bÃ½t pÅ™idÃ¡na"
-
-#: personal/faxaccount/locals.tpl.c:5
-msgid "Filters"
-msgstr "filtry"
-
-#: personal/faxaccount/locals.tpl.c:8
-msgid "Display numbers of department"
-msgstr "zobrazit ÄÃsla tohoto oddÄ›lenÃ"
-
-#: personal/faxaccount/locals.tpl.c:11
-msgid "Choose the department the search will be based on"
-msgstr "vyberte oddÄ›lenÃ ve kterÃ©m se bude hledat"
-
-#: personal/faxaccount/locals.tpl.c:14
-msgid "Display numbers matching"
-msgstr "zobrazit ÄÃsla odpovÃdajÃcÃ ÄÃsla"
-
-#: personal/faxaccount/locals.tpl.c:17
-msgid "Regular expression for matching numbers"
-msgstr "regulÃ¡rnÃ vÃ½raz pro hledÃ¡nÃ ÄÃsel"
-
-#: personal/faxaccount/locals.tpl.c:20
-msgid "Display numbers of user"
-msgstr "zobrazit ÄÃsla tohoto uÅ¾ivatele"
-
-#: personal/faxaccount/locals.tpl.c:23
-msgid "User name of which numbers are shown"
-msgstr "jmÃ©no uÅ¾ivatele jehoÅ¾ ÄÃsla jsou zobrazena"
-
-#: personal/faxaccount/faxNumberSelect/faxNumberSelect-filter.tpl.c:5
-msgid "Name"
-msgstr "nÃ¡zev"
-
-#: personal/faxaccount/faxNumberSelect/faxNumberSelect-list.tpl.c:2
-msgid "Base"
-msgstr "zÃ¡klad"
+msgstr "VÄ›tev, ve kterÃ© budou uloÅ¾eny seznamy blokovanÃ½ch faxÅ¯"
diff --git a/fax/locale/de/fusiondirectory.po b/fax/locale/de/fusiondirectory.po
index 32199ee2777c02b22758047df04162f19a81da99..e6ba69bf999ca63d391b5a5060bc1da49183b840 100644
--- a/fax/locale/de/fusiondirectory.po
+++ b/fax/locale/de/fusiondirectory.po
@@ -3,19 +3,14 @@
 # This file is distributed under the same license as the PACKAGE package.
 # 
 # Translators:
-# Islam Adel, 2013
-# Islam Adel, 2013
-# Maik Wagner <maikwagner@yahoo.com>, 2014
-# Matthias KÃ¶rner <matthias.koerner@binary-artworks.com>, 2013
-#  Stefan Koehler <stefan.koehler@GONICUS.de>, 2005
 msgid ""
 msgstr ""
-"Project-Id-Version: FusionDirectory-108\n"
+"Project-Id-Version: FusionDirectory-109\n"
 "Report-Msgid-Bugs-To: documentation@lists.fusiondirectory.org\n"
-"POT-Creation-Date: 2015-03-19 21:45+0100\n"
-"PO-Revision-Date: 2015-02-25 16:12+0000\n"
+"POT-Creation-Date: 2014-12-15 17:47+0100\n"
+"PO-Revision-Date: 2015-02-25 16:13+0000\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>\n"
-"Language-Team: German (http://www.transifex.com/projects/p/FusionDirectory-108/language/de/)\n"
+"Language-Team: German (http://www.transifex.com/projects/p/FusionDirectory-109/language/de/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -174,7 +169,6 @@ msgid "Fax ID"
 msgstr "Fax-ID"
 
 #: addons/faxreports/class_faxreport.inc:494
-#: addons/faxreports/contents.tpl.c:29
 msgid "Date"
 msgstr "Datum"
 
@@ -183,23 +177,22 @@ msgid "Time"
 msgstr "Zeit"
 
 #: addons/faxreports/class_faxreport.inc:495
-#: addons/faxreports/contents.tpl.c:32 addons/faxreports/detail.tpl.c:29
 msgid "Status"
 msgstr "Status"
 
-#: addons/faxreports/class_faxreport.inc:496 addons/faxreports/detail.tpl.c:20
+#: addons/faxreports/class_faxreport.inc:496
 msgid "Sender ID"
 msgstr "Absender-ID"
 
-#: addons/faxreports/class_faxreport.inc:497 addons/faxreports/detail.tpl.c:17
+#: addons/faxreports/class_faxreport.inc:497
 msgid "Sender MSN"
 msgstr "Absender-MSN"
 
-#: addons/faxreports/class_faxreport.inc:498 addons/faxreports/detail.tpl.c:26
+#: addons/faxreports/class_faxreport.inc:498
 msgid "Receiver ID"
 msgstr "EmpfÃ¤nger-ID"
 
-#: addons/faxreports/class_faxreport.inc:499 addons/faxreports/detail.tpl.c:23
+#: addons/faxreports/class_faxreport.inc:499
 msgid "Receiver MSN"
 msgstr "EmpfÃ¤nger-MSN"
 
@@ -211,7 +204,7 @@ msgstr "Anzahl der Seiten"
 msgid "Status Message"
 msgstr "Status-Nachricht"
 
-#: addons/faxreports/class_faxreport.inc:502 addons/faxreports/detail.tpl.c:35
+#: addons/faxreports/class_faxreport.inc:502
 msgid "Transfer time"
 msgstr "Ãœbertragungszeit"
 
@@ -271,7 +264,7 @@ msgstr "Mail-Adresse"
 
 #: personal/faxaccount/class_gofaxAccount.inc:640
 msgid "your-name@your-domain.com"
-msgstr "ihr-name@ihre-domain.com"
+msgstr "Ihr-Name@ihre-domain.com"
 
 #: personal/faxaccount/class_gofaxAccount.inc:646
 msgid "Printing is requested without a target printer!"
@@ -279,8 +272,7 @@ msgstr "Ausdruck wurden ohne Zieldrucker angefordert!"
 
 #: personal/faxaccount/class_gofaxAccount.inc:796
 #: personal/faxaccount/faxNumberSelect/faxNumberSelect-list.xml:56
-#: config/fax/class_faxConfig.inc:42 personal/faxaccount/generic.tpl.c:5
-#: personal/faxaccount/paste_generic.tpl.c:5
+#: config/fax/class_faxConfig.inc:42
 msgid "Fax"
 msgstr "Fax"
 
@@ -289,12 +281,10 @@ msgid "Fax account settings"
 msgstr "Fax-Konto-Einstellungen"
 
 #: personal/faxaccount/class_gofaxAccount.inc:806
-#: personal/faxaccount/generic.tpl.c:11
 msgid "Language"
 msgstr "Sprache"
 
 #: personal/faxaccount/class_gofaxAccount.inc:807
-#: personal/faxaccount/generic.tpl.c:17
 msgid "Delivery format"
 msgstr "Auslieferungsformat"
 
@@ -307,12 +297,10 @@ msgid "Enable/Disable fax"
 msgstr "FAX aktivieren/deaktivieren"
 
 #: personal/faxaccount/class_gofaxAccount.inc:810
-#: personal/faxaccount/generic.tpl.c:32
 msgid "Deliver fax as mail"
 msgstr "Als Mail ausliefern"
 
 #: personal/faxaccount/class_gofaxAccount.inc:811
-#: personal/faxaccount/generic.tpl.c:35
 msgid "Deliver fax to printer"
 msgstr "Fax an Drucker weiterleiten"
 
@@ -329,7 +317,6 @@ msgid "Please select the desired entries"
 msgstr "Bitte wÃ¤hlen Sie die gewÃ¼nschten EintrÃ¤ge"
 
 #: personal/faxaccount/faxNumberSelect/faxNumberSelect-list.xml:14
-#: addons/faxreports/contents.tpl.c:26 addons/faxreports/detail.tpl.c:11
 msgid "User"
 msgstr "Benutzer"
 
@@ -384,181 +371,3 @@ msgstr "Fax RDN"
 #: config/fax/class_faxConfig.inc:45
 msgid "Branch in which fax blocklists will be stored"
 msgstr "Zweig in dem Fax-Blocklisten gespeichert werden"
-
-#: addons/faxreports/contents.tpl.c:2
-#: personal/faxaccount/faxNumberSelect/faxNumberSelect-filter.tpl.c:2
-msgid "Filter"
-msgstr "Filter"
-
-#: addons/faxreports/contents.tpl.c:5
-msgid "Search for"
-msgstr "Suche nach"
-
-#: addons/faxreports/contents.tpl.c:8
-msgid "Enter user name to search for"
-msgstr "Benutzername, nach dem gesucht werden soll"
-
-#: addons/faxreports/contents.tpl.c:11 addons/faxreports/contents.tpl.c:20
-msgid "in"
-msgstr "in"
-
-#: addons/faxreports/contents.tpl.c:14
-msgid "Select subtree to base search on"
-msgstr "WÃ¤hlen Sie den Teilbaum, in dem gesucht werden soll"
-
-#: addons/faxreports/contents.tpl.c:17
-msgid "during"
-msgstr "wÃ¤hrend"
-
-#: addons/faxreports/contents.tpl.c:23
-msgid "Search"
-msgstr "Suchen"
-
-#: addons/faxreports/contents.tpl.c:35
-msgid "Sender"
-msgstr "Absender"
-
-#: addons/faxreports/contents.tpl.c:38
-msgid "Receiver"
-msgstr "EmpfÃ¤nger"
-
-#: addons/faxreports/contents.tpl.c:41 addons/faxreports/detail.tpl.c:38
-msgid "# pages"
-msgstr "# Seiten"
-
-#: addons/faxreports/contents.tpl.c:44
-msgid "Search returned no results..."
-msgstr "Die Suche verlief ergebnislos..."
-
-#: addons/faxreports/detail.tpl.c:2
-msgid "FAX preview - please wait"
-msgstr "Fax Vorschau - bitte warten"
-
-#: addons/faxreports/detail.tpl.c:5
-msgid "Click on fax to download"
-msgstr "Klicken Sie auf das Fax, um es herunterzuladen"
-
-#: addons/faxreports/detail.tpl.c:8
-msgid "FAX ID"
-msgstr "Fax-ID"
-
-#: addons/faxreports/detail.tpl.c:14
-msgid "Date / Time"
-msgstr "Datum / Zeit"
-
-#: addons/faxreports/detail.tpl.c:32
-msgid "Status message"
-msgstr "Status-Nachricht"
-
-#: personal/faxaccount/generic.tpl.c:2
-#: personal/faxaccount/paste_generic.tpl.c:2
-msgid "Generic"
-msgstr "Allgemein"
-
-#: personal/faxaccount/generic.tpl.c:8
-msgid "Fax number for fax to trigger on"
-msgstr "Faxnummer fÃ¼r Fax, welches getriggert werden soll"
-
-#: personal/faxaccount/generic.tpl.c:14
-msgid "Specify the fax communication language for fax to mail gateway"
-msgstr "Spezifizierung der Fax-Kommunikationssprache fÃ¼r Fax an Mailgateway"
-
-#: personal/faxaccount/generic.tpl.c:20
-msgid "Specify delivery format for fax to mail gateway"
-msgstr "Geben Sie das Auslieferungsformat des Fax to Mailgateways an"
-
-#: personal/faxaccount/generic.tpl.c:23
-msgid "Delivery methods"
-msgstr "Auslieferungsmethode"
-
-#: personal/faxaccount/generic.tpl.c:26
-msgid "Temporary disable fax usage"
-msgstr "TemporÃ¤res Abschalten der Fax-Benutzung"
-
-#: personal/faxaccount/generic.tpl.c:29
-msgid "Deliver fax as mail to"
-msgstr "Fax als Mail ausliefern an"
-
-#: personal/faxaccount/generic.tpl.c:38
-msgid "Alternate fax numbers"
-msgstr "Alternative Fax-Nummern"
-
-#: personal/faxaccount/generic.tpl.c:41
-msgid "Add local"
-msgstr "Lokale hinzufÃ¼gen"
-
-#: personal/faxaccount/generic.tpl.c:44
-msgid "Blocklists"
-msgstr "Sperrlisten"
-
-#: personal/faxaccount/generic.tpl.c:47
-msgid "Blocklists for incoming fax"
-msgstr "Sperrlisten fÃ¼r eingehendes Fax"
-
-#: personal/faxaccount/generic.tpl.c:50 personal/faxaccount/generic.tpl.c:56
-msgid "Edit"
-msgstr "Bearbeiten"
-
-#: personal/faxaccount/generic.tpl.c:53
-msgid "Blocklists for outgoing fax"
-msgstr "Sperrlisten fÃ¼r abgehendes Fax"
-
-#: personal/faxaccount/lists.tpl.c:2
-msgid "Blocked numbers/lists"
-msgstr "Gesperrte Nummern/Listen"
-
-#: personal/faxaccount/lists.tpl.c:5
-msgid "List of predefined blocklists"
-msgstr "Liste von vordefinierten Sperrlisten"
-
-#: personal/faxaccount/lists.tpl.c:8
-msgid "Add the list to the blocklists"
-msgstr "Liste zu den Sperrlisten hinzufÃ¼gen"
-
-#: personal/faxaccount/paste_generic.tpl.c:8
-msgid "Fax number for GOfax to trigger on"
-msgstr "Fax-Nummer, auf die GOfax ansprechen soll"
-
-#: personal/faxaccount/paste_generic.tpl.c:11
-msgid "Alternate fax numbers will not be copied"
-msgstr "Alternative Fax-Nummern werden nicht kopiert"
-
-#: personal/faxaccount/locals.tpl.c:2
-msgid "Select numbers to add"
-msgstr "WÃ¤hlen Sie die hinzuzufÃ¼genden Nummern"
-
-#: personal/faxaccount/locals.tpl.c:5
-msgid "Filters"
-msgstr "Filter"
-
-#: personal/faxaccount/locals.tpl.c:8
-msgid "Display numbers of department"
-msgstr "Zeige die Nummern der Abteilung"
-
-#: personal/faxaccount/locals.tpl.c:11
-msgid "Choose the department the search will be based on"
-msgstr "WÃ¤hlen Sie die Abteilung, auf die die Suchfunktion angewandt wird"
-
-#: personal/faxaccount/locals.tpl.c:14
-msgid "Display numbers matching"
-msgstr "Zeige die Nummern, auf die Folgendes passt"
-
-#: personal/faxaccount/locals.tpl.c:17
-msgid "Regular expression for matching numbers"
-msgstr "RegulÃ¤rer Ausdruck zum Erkennen von Telefonnummern"
-
-#: personal/faxaccount/locals.tpl.c:20
-msgid "Display numbers of user"
-msgstr "Zeige Nummern des Benutzers"
-
-#: personal/faxaccount/locals.tpl.c:23
-msgid "User name of which numbers are shown"
-msgstr "Benutzername, dessen Nummern angezeigt werden"
-
-#: personal/faxaccount/faxNumberSelect/faxNumberSelect-filter.tpl.c:5
-msgid "Name"
-msgstr "Name"
-
-#: personal/faxaccount/faxNumberSelect/faxNumberSelect-list.tpl.c:2
-msgid "Base"
-msgstr "Basis"
diff --git a/fax/locale/el_GR/fusiondirectory.po b/fax/locale/el_GR/fusiondirectory.po
new file mode 100644
index 0000000000000000000000000000000000000000..ddd3af77d2abdb200ecf6fb3d25ca9f092df8a76
--- /dev/null
+++ b/fax/locale/el_GR/fusiondirectory.po
@@ -0,0 +1,373 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR FusionDirectory Project
+# This file is distributed under the same license as the PACKAGE package.
+# 
+# Translators:
+msgid ""
+msgstr ""
+"Project-Id-Version: FusionDirectory-109\n"
+"Report-Msgid-Bugs-To: documentation@lists.fusiondirectory.org\n"
+"POT-Creation-Date: 2014-12-15 17:47+0100\n"
+"PO-Revision-Date: 2015-05-30 11:45+0000\n"
+"Last-Translator: Benoit Mortier <benoit.mortier@opensides.be>\n"
+"Language-Team: Greek (Greece) (http://www.transifex.com/projects/p/FusionDirectory-109/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/blocklists/class_blocklistManagement.inc:28
+msgid "Fax Blocklists"
+msgstr ""
+
+#: admin/blocklists/class_blocklistManagement.inc:29
+msgid "Fax Blocklists management"
+msgstr ""
+
+#: admin/blocklists/class_blocklistGeneric.inc:32
+msgid "Type"
+msgstr ""
+
+#: admin/blocklists/class_blocklistGeneric.inc:32
+msgid "Type of this list"
+msgstr ""
+
+#: admin/blocklists/class_blocklistGeneric.inc:35
+msgid "send"
+msgstr ""
+
+#: admin/blocklists/class_blocklistGeneric.inc:35
+msgid "receive"
+msgstr ""
+
+#: admin/blocklists/class_blocklistGeneric.inc:39
+msgid "Blocked numbers"
+msgstr ""
+
+#: admin/blocklists/class_blocklistGeneric.inc:40
+msgid "Numbers can also contain wild cards."
+msgstr ""
+
+#: admin/blocklists/class_blocklistGeneric.inc:137
+#: admin/blocklists/class_blocklistGeneric.inc:141
+msgid "Fax blocklists"
+msgstr ""
+
+#: admin/blocklists/class_blocklistGeneric.inc:138
+msgid "The part of the fax plugin managing blacklist"
+msgstr ""
+
+#: admin/blocklists/class_blocklistGeneric.inc:159
+msgid "Informations"
+msgstr ""
+
+#: admin/blocklists/class_blocklistGeneric.inc:162
+msgid "List name"
+msgstr ""
+
+#: admin/blocklists/class_blocklistGeneric.inc:162
+msgid "The name of the list"
+msgstr ""
+
+#: admin/blocklists/class_blocklistGeneric.inc:163
+msgid "Description"
+msgstr ""
+
+#: admin/blocklists/class_blocklistGeneric.inc:163
+msgid "A description for the list"
+msgstr ""
+
+#: admin/blocklists/class_blocklistGeneric.inc:165
+msgid "List of blocked number"
+msgstr ""
+
+#: admin/systems/services/fax/class_serviceFax.inc:31
+#: admin/systems/services/fax/class_serviceFax.inc:32
+msgid "FAX service"
+msgstr ""
+
+#: admin/systems/services/fax/class_serviceFax.inc:32
+msgid "Services"
+msgstr ""
+
+#: admin/systems/services/fax/class_serviceFax.inc:46
+msgid "FAX database information"
+msgstr ""
+
+#: admin/systems/services/fax/class_serviceFax.inc:50
+msgid "FAX DB user"
+msgstr ""
+
+#: admin/systems/services/fax/class_serviceFax.inc:56
+msgid "Password"
+msgstr ""
+
+#: addons/faxreports/class_faxreport.inc:130
+#: addons/faxreports/class_faxreport.inc:139
+#: addons/faxreports/class_faxreport.inc:159
+#: addons/faxreports/class_faxreport.inc:300
+#: personal/faxaccount/class_gofaxAccount.inc:272 html/getfax.php:96
+#: html/getfax.php:101 html/getfax.php:106
+msgid "Error"
+msgstr ""
+
+#: addons/faxreports/class_faxreport.inc:130
+msgid "No fax server found!"
+msgstr ""
+
+#: addons/faxreports/class_faxreport.inc:139
+#, php-format
+msgid "Cannot connect to %s database!"
+msgstr ""
+
+#: addons/faxreports/class_faxreport.inc:159
+#: addons/faxreports/class_faxreport.inc:300
+#, php-format
+msgid "Cannot query %s database!"
+msgstr ""
+
+#: addons/faxreports/class_faxreport.inc:168
+#: addons/faxreports/class_faxreport.inc:178
+msgid "Permission error"
+msgstr ""
+
+#: addons/faxreports/class_faxreport.inc:168
+#: addons/faxreports/class_faxreport.inc:178
+msgid "You have no permission to view this fax id!"
+msgstr ""
+
+#: addons/faxreports/class_faxreport.inc:209
+#: addons/faxreports/class_faxreport.inc:325
+msgid "Y-M-D"
+msgstr ""
+
+#: addons/faxreports/class_faxreport.inc:319
+msgid "Insufficient permissions to view this attribute"
+msgstr ""
+
+#: addons/faxreports/class_faxreport.inc:319
+msgid "Insufficient permissions"
+msgstr ""
+
+#: addons/faxreports/class_faxreport.inc:482
+#: addons/faxreports/class_faxreport.inc:483
+#: addons/faxreports/class_faxreport.inc:488
+msgid "Fax reports"
+msgstr ""
+
+#: addons/faxreports/class_faxreport.inc:483
+msgid "All entries are readonly"
+msgstr ""
+
+#: addons/faxreports/class_faxreport.inc:492
+msgid "Detailed view"
+msgstr ""
+
+#: addons/faxreports/class_faxreport.inc:493
+msgid "Fax ID"
+msgstr ""
+
+#: addons/faxreports/class_faxreport.inc:494
+msgid "Date"
+msgstr ""
+
+#: addons/faxreports/class_faxreport.inc:494
+msgid "Time"
+msgstr ""
+
+#: addons/faxreports/class_faxreport.inc:495
+msgid "Status"
+msgstr ""
+
+#: addons/faxreports/class_faxreport.inc:496
+msgid "Sender ID"
+msgstr ""
+
+#: addons/faxreports/class_faxreport.inc:497
+msgid "Sender MSN"
+msgstr ""
+
+#: addons/faxreports/class_faxreport.inc:498
+msgid "Receiver ID"
+msgstr ""
+
+#: addons/faxreports/class_faxreport.inc:499
+msgid "Receiver MSN"
+msgstr ""
+
+#: addons/faxreports/class_faxreport.inc:500
+msgid "Number of pages"
+msgstr ""
+
+#: addons/faxreports/class_faxreport.inc:501
+msgid "Status Message"
+msgstr ""
+
+#: addons/faxreports/class_faxreport.inc:502
+msgid "Transfer time"
+msgstr ""
+
+#: addons/faxreports/main.inc:44
+msgid "FAX reports"
+msgstr ""
+
+#: personal/faxaccount/class_gofaxAccount.inc:26
+msgid "FAX"
+msgstr ""
+
+#: personal/faxaccount/class_gofaxAccount.inc:27
+msgid "This does something"
+msgstr ""
+
+#: personal/faxaccount/class_gofaxAccount.inc:180
+#: personal/faxaccount/class_gofaxAccount.inc:190
+#: personal/faxaccount/class_gofaxAccount.inc:193
+msgid "GOfax"
+msgstr ""
+
+#: personal/faxaccount/class_gofaxAccount.inc:189
+msgid "Remove fax account"
+msgstr ""
+
+#: personal/faxaccount/class_gofaxAccount.inc:192
+msgid "Create fax account"
+msgstr ""
+
+#: personal/faxaccount/class_gofaxAccount.inc:272
+msgid "Phone number"
+msgstr ""
+
+#: personal/faxaccount/class_gofaxAccount.inc:421
+#: personal/faxaccount/class_gofaxAccount.inc:503
+msgid "back"
+msgstr ""
+
+#: personal/faxaccount/class_gofaxAccount.inc:611
+#: personal/faxaccount/class_gofaxAccount.inc:739
+msgid "LDAP error"
+msgstr ""
+
+#: personal/faxaccount/class_gofaxAccount.inc:627
+#: personal/faxaccount/class_gofaxAccount.inc:631
+#: personal/faxaccount/class_gofaxAccount.inc:805
+msgid "Fax number"
+msgstr ""
+
+#: personal/faxaccount/class_gofaxAccount.inc:638
+msgid "Mail delivery is requested without target address!"
+msgstr ""
+
+#: personal/faxaccount/class_gofaxAccount.inc:640
+msgid "Mail address"
+msgstr ""
+
+#: personal/faxaccount/class_gofaxAccount.inc:640
+msgid "your-name@your-domain.com"
+msgstr ""
+
+#: personal/faxaccount/class_gofaxAccount.inc:646
+msgid "Printing is requested without a target printer!"
+msgstr ""
+
+#: personal/faxaccount/class_gofaxAccount.inc:796
+#: personal/faxaccount/faxNumberSelect/faxNumberSelect-list.xml:56
+#: config/fax/class_faxConfig.inc:42
+msgid "Fax"
+msgstr ""
+
+#: personal/faxaccount/class_gofaxAccount.inc:797
+msgid "Fax account settings"
+msgstr ""
+
+#: personal/faxaccount/class_gofaxAccount.inc:806
+msgid "Language"
+msgstr ""
+
+#: personal/faxaccount/class_gofaxAccount.inc:807
+msgid "Delivery format"
+msgstr ""
+
+#: personal/faxaccount/class_gofaxAccount.inc:808
+msgid "Alternate fax number"
+msgstr ""
+
+#: personal/faxaccount/class_gofaxAccount.inc:809
+msgid "Enable/Disable fax"
+msgstr ""
+
+#: personal/faxaccount/class_gofaxAccount.inc:810
+msgid "Deliver fax as mail"
+msgstr ""
+
+#: personal/faxaccount/class_gofaxAccount.inc:811
+msgid "Deliver fax to printer"
+msgstr ""
+
+#: personal/faxaccount/class_gofaxAccount.inc:812
+msgid "Receive blocklist"
+msgstr ""
+
+#: personal/faxaccount/class_gofaxAccount.inc:813
+msgid "Send blocklist"
+msgstr ""
+
+#: personal/faxaccount/faxNumberSelect/faxNumberSelect-list.xml:10
+msgid "Please select the desired entries"
+msgstr ""
+
+#: personal/faxaccount/faxNumberSelect/faxNumberSelect-list.xml:14
+msgid "User"
+msgstr ""
+
+#: personal/faxaccount/faxNumberSelect/faxNumberSelect-list.xml:40
+msgid "Given name"
+msgstr ""
+
+#: personal/faxaccount/faxNumberSelect/faxNumberSelect-list.xml:48
+msgid "Surname"
+msgstr ""
+
+#: personal/faxaccount/main.inc:126
+msgid "Click the 'Edit' button below to change informations in this dialog"
+msgstr ""
+
+#: personal/faxaccount/main.inc:135
+msgid "FAX settings"
+msgstr ""
+
+#: html/getfax.php:59
+msgid "Could not connect to database server!"
+msgstr ""
+
+#: html/getfax.php:66 html/getfax.php:76
+msgid "Database query failed!"
+msgstr ""
+
+#: html/getfax.php:96
+msgid "cannot resize fax image"
+msgstr ""
+
+#: html/getfax.php:101
+msgid "cannot convert fax image to png"
+msgstr ""
+
+#: html/getfax.php:106
+msgid "Reading fax image image failed"
+msgstr ""
+
+#: config/fax/class_faxConfig.inc:28
+msgid "Fax configuration"
+msgstr ""
+
+#: config/fax/class_faxConfig.inc:29
+msgid "FusionDirectory fax plugin configuration"
+msgstr ""
+
+#: config/fax/class_faxConfig.inc:45
+msgid "Fax RDN"
+msgstr ""
+
+#: config/fax/class_faxConfig.inc:45
+msgid "Branch in which fax blocklists will be stored"
+msgstr ""
diff --git a/fax/locale/en/fusiondirectory.po b/fax/locale/en/fusiondirectory.po
index 08ceabceb2bfbe32ca76342447dcdc009614a9fe..bc9e5405170540dd88a833a19e457a0e3f3f771c 100644
--- a/fax/locale/en/fusiondirectory.po
+++ b/fax/locale/en/fusiondirectory.po
@@ -6,13 +6,13 @@
 #, fuzzy
 msgid ""
 msgstr ""
-"Project-Id-Version: PACKAGE VERSION\n"
-"Report-Msgid-Bugs-To: documentation@lists.fusiondirectory.org\n"
-"POT-Creation-Date: 2015-03-31 11:49+0200\n"
+"Project-Id-Version: FusionDirectory VERSION\n"
+"Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
+"POT-Creation-Date: 2015-05-30 15:30+0200\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
-"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
-"Language-Team: LANGUAGE <LL@li.org>\n"
-"Language: \n"
+"Last-Translator: FusionDirectory project <contact@fusiondirectory.org>\n"
+"Language-Team: English\n"
+"Language: en\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
diff --git a/fax/locale/es/fusiondirectory.po b/fax/locale/es/fusiondirectory.po
index 58539db02113f455eab3c5ec311f3199fbbda7e2..447d32758c18b4523adfa43d2d922638887499bc 100644
--- a/fax/locale/es/fusiondirectory.po
+++ b/fax/locale/es/fusiondirectory.po
@@ -5,12 +5,12 @@
 # Translators:
 msgid ""
 msgstr ""
-"Project-Id-Version: FusionDirectory-108\n"
+"Project-Id-Version: FusionDirectory-109\n"
 "Report-Msgid-Bugs-To: documentation@lists.fusiondirectory.org\n"
-"POT-Creation-Date: 2015-03-19 21:45+0100\n"
-"PO-Revision-Date: 2015-02-25 16:12+0000\n"
+"POT-Creation-Date: 2014-12-15 17:47+0100\n"
+"PO-Revision-Date: 2015-02-25 16:13+0000\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>\n"
-"Language-Team: Spanish (http://www.transifex.com/projects/p/FusionDirectory-108/language/es/)\n"
+"Language-Team: Spanish (http://www.transifex.com/projects/p/FusionDirectory-109/language/es/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -169,7 +169,6 @@ msgid "Fax ID"
 msgstr "Fax ID"
 
 #: addons/faxreports/class_faxreport.inc:494
-#: addons/faxreports/contents.tpl.c:29
 msgid "Date"
 msgstr "Fecha"
 
@@ -178,23 +177,22 @@ msgid "Time"
 msgstr "Tiempo"
 
 #: addons/faxreports/class_faxreport.inc:495
-#: addons/faxreports/contents.tpl.c:32 addons/faxreports/detail.tpl.c:29
 msgid "Status"
 msgstr "Estado"
 
-#: addons/faxreports/class_faxreport.inc:496 addons/faxreports/detail.tpl.c:20
+#: addons/faxreports/class_faxreport.inc:496
 msgid "Sender ID"
 msgstr "ID del Remitente"
 
-#: addons/faxreports/class_faxreport.inc:497 addons/faxreports/detail.tpl.c:17
+#: addons/faxreports/class_faxreport.inc:497
 msgid "Sender MSN"
 msgstr "MSN del Remitente"
 
-#: addons/faxreports/class_faxreport.inc:498 addons/faxreports/detail.tpl.c:26
+#: addons/faxreports/class_faxreport.inc:498
 msgid "Receiver ID"
 msgstr "ID del Receptor"
 
-#: addons/faxreports/class_faxreport.inc:499 addons/faxreports/detail.tpl.c:23
+#: addons/faxreports/class_faxreport.inc:499
 msgid "Receiver MSN"
 msgstr "MSN del Receptor"
 
@@ -206,7 +204,7 @@ msgstr "NÃºmero de pÃ¡ginas"
 msgid "Status Message"
 msgstr "Mensaje de estado"
 
-#: addons/faxreports/class_faxreport.inc:502 addons/faxreports/detail.tpl.c:35
+#: addons/faxreports/class_faxreport.inc:502
 msgid "Transfer time"
 msgstr "Tiempo de envÃo"
 
@@ -274,8 +272,7 @@ msgstr "Â¡Ha seleccionado impresiÃ³n, pero no se ha introducido ninguna impresor
 
 #: personal/faxaccount/class_gofaxAccount.inc:796
 #: personal/faxaccount/faxNumberSelect/faxNumberSelect-list.xml:56
-#: config/fax/class_faxConfig.inc:42 personal/faxaccount/generic.tpl.c:5
-#: personal/faxaccount/paste_generic.tpl.c:5
+#: config/fax/class_faxConfig.inc:42
 msgid "Fax"
 msgstr "Fax"
 
@@ -284,12 +281,10 @@ msgid "Fax account settings"
 msgstr "ConfiguraciÃ³n cuenta de FAX"
 
 #: personal/faxaccount/class_gofaxAccount.inc:806
-#: personal/faxaccount/generic.tpl.c:11
 msgid "Language"
 msgstr "Idioma"
 
 #: personal/faxaccount/class_gofaxAccount.inc:807
-#: personal/faxaccount/generic.tpl.c:17
 msgid "Delivery format"
 msgstr "Formato de envÃo"
 
@@ -302,12 +297,10 @@ msgid "Enable/Disable fax"
 msgstr "Activar/desactivar FAX"
 
 #: personal/faxaccount/class_gofaxAccount.inc:810
-#: personal/faxaccount/generic.tpl.c:32
 msgid "Deliver fax as mail"
 msgstr "Enviar fax como correo electrÃ³nico"
 
 #: personal/faxaccount/class_gofaxAccount.inc:811
-#: personal/faxaccount/generic.tpl.c:35
 msgid "Deliver fax to printer"
 msgstr "Enviar fax a la impresora"
 
@@ -324,7 +317,6 @@ msgid "Please select the desired entries"
 msgstr "Por favor seleccione las entradas que desee"
 
 #: personal/faxaccount/faxNumberSelect/faxNumberSelect-list.xml:14
-#: addons/faxreports/contents.tpl.c:26 addons/faxreports/detail.tpl.c:11
 msgid "User"
 msgstr "Usuario"
 
@@ -379,181 +371,3 @@ msgstr ""
 #: config/fax/class_faxConfig.inc:45
 msgid "Branch in which fax blocklists will be stored"
 msgstr ""
-
-#: addons/faxreports/contents.tpl.c:2
-#: personal/faxaccount/faxNumberSelect/faxNumberSelect-filter.tpl.c:2
-msgid "Filter"
-msgstr "Filtro"
-
-#: addons/faxreports/contents.tpl.c:5
-msgid "Search for"
-msgstr "Buscar por"
-
-#: addons/faxreports/contents.tpl.c:8
-msgid "Enter user name to search for"
-msgstr "Introduzca el nombre de usuario para la bÃºsqueda"
-
-#: addons/faxreports/contents.tpl.c:11 addons/faxreports/contents.tpl.c:20
-msgid "in"
-msgstr "en"
-
-#: addons/faxreports/contents.tpl.c:14
-msgid "Select subtree to base search on"
-msgstr "Seleccione el subÃ¡rbol como base de la bÃºsqueda"
-
-#: addons/faxreports/contents.tpl.c:17
-msgid "during"
-msgstr "durante"
-
-#: addons/faxreports/contents.tpl.c:23
-msgid "Search"
-msgstr "Buscar"
-
-#: addons/faxreports/contents.tpl.c:35
-msgid "Sender"
-msgstr "Remitente"
-
-#: addons/faxreports/contents.tpl.c:38
-msgid "Receiver"
-msgstr "Receptor"
-
-#: addons/faxreports/contents.tpl.c:41 addons/faxreports/detail.tpl.c:38
-msgid "# pages"
-msgstr "# pÃ¡ginas"
-
-#: addons/faxreports/contents.tpl.c:44
-msgid "Search returned no results..."
-msgstr "La bÃºsqueda no ha encontrado resultados..."
-
-#: addons/faxreports/detail.tpl.c:2
-msgid "FAX preview - please wait"
-msgstr "VisualizaciÃ³n del Fax - Por favor espere"
-
-#: addons/faxreports/detail.tpl.c:5
-msgid "Click on fax to download"
-msgstr "Pulse en 'Fax' para descargar"
-
-#: addons/faxreports/detail.tpl.c:8
-msgid "FAX ID"
-msgstr "FAX ID"
-
-#: addons/faxreports/detail.tpl.c:14
-msgid "Date / Time"
-msgstr "Fecha / Hora"
-
-#: addons/faxreports/detail.tpl.c:32
-msgid "Status message"
-msgstr "Estado del mensaje"
-
-#: personal/faxaccount/generic.tpl.c:2
-#: personal/faxaccount/paste_generic.tpl.c:2
-msgid "Generic"
-msgstr "GenÃ©rico"
-
-#: personal/faxaccount/generic.tpl.c:8
-msgid "Fax number for fax to trigger on"
-msgstr ""
-
-#: personal/faxaccount/generic.tpl.c:14
-msgid "Specify the fax communication language for fax to mail gateway"
-msgstr ""
-
-#: personal/faxaccount/generic.tpl.c:20
-msgid "Specify delivery format for fax to mail gateway"
-msgstr "Especificar el formato de envÃo para la pasarela de fax a correo"
-
-#: personal/faxaccount/generic.tpl.c:23
-msgid "Delivery methods"
-msgstr "MÃ©todos de envÃo"
-
-#: personal/faxaccount/generic.tpl.c:26
-msgid "Temporary disable fax usage"
-msgstr "DesactivaciÃ³n temporal del uso del fax"
-
-#: personal/faxaccount/generic.tpl.c:29
-msgid "Deliver fax as mail to"
-msgstr "Enviar fax como correo electrÃ³nico a"
-
-#: personal/faxaccount/generic.tpl.c:38
-msgid "Alternate fax numbers"
-msgstr "Intercambiar los nÃºmeros de fax"
-
-#: personal/faxaccount/generic.tpl.c:41
-msgid "Add local"
-msgstr "AÃ±adir Cuenta Local"
-
-#: personal/faxaccount/generic.tpl.c:44
-msgid "Blocklists"
-msgstr "Listas de bloqueo"
-
-#: personal/faxaccount/generic.tpl.c:47
-msgid "Blocklists for incoming fax"
-msgstr "Listas de bloqueo para fax entrante"
-
-#: personal/faxaccount/generic.tpl.c:50 personal/faxaccount/generic.tpl.c:56
-msgid "Edit"
-msgstr "Editar"
-
-#: personal/faxaccount/generic.tpl.c:53
-msgid "Blocklists for outgoing fax"
-msgstr "Listas de bloqueo para fax saliente"
-
-#: personal/faxaccount/lists.tpl.c:2
-msgid "Blocked numbers/lists"
-msgstr "Listas/NÃºmeros bloqueados"
-
-#: personal/faxaccount/lists.tpl.c:5
-msgid "List of predefined blocklists"
-msgstr "Listas de bloqueos predefinidas"
-
-#: personal/faxaccount/lists.tpl.c:8
-msgid "Add the list to the blocklists"
-msgstr "AÃ±adir a la lista de bloqueos"
-
-#: personal/faxaccount/paste_generic.tpl.c:8
-msgid "Fax number for GOfax to trigger on"
-msgstr "Numero de fax para activar GOfax"
-
-#: personal/faxaccount/paste_generic.tpl.c:11
-msgid "Alternate fax numbers will not be copied"
-msgstr "Los nÃºmeros de fax alternativos no serÃ¡n copiados"
-
-#: personal/faxaccount/locals.tpl.c:2
-msgid "Select numbers to add"
-msgstr "Seleccione nÃºmeros para aÃ±adir"
-
-#: personal/faxaccount/locals.tpl.c:5
-msgid "Filters"
-msgstr "Filtros"
-
-#: personal/faxaccount/locals.tpl.c:8
-msgid "Display numbers of department"
-msgstr "Mostrar nÃºmero de Departamentos"
-
-#: personal/faxaccount/locals.tpl.c:11
-msgid "Choose the department the search will be based on"
-msgstr "Escoja el departamento base de la bÃºsqueda"
-
-#: personal/faxaccount/locals.tpl.c:14
-msgid "Display numbers matching"
-msgstr "Mostrar nÃºmeros que coincidan con"
-
-#: personal/faxaccount/locals.tpl.c:17
-msgid "Regular expression for matching numbers"
-msgstr "Expresiones regulares que coincidan con nÃºmeros"
-
-#: personal/faxaccount/locals.tpl.c:20
-msgid "Display numbers of user"
-msgstr "Mostrar nÃºmeros de usuario"
-
-#: personal/faxaccount/locals.tpl.c:23
-msgid "User name of which numbers are shown"
-msgstr "Nombre de usuario cuyos nÃºmeros estÃ¡n siendo mostrados"
-
-#: personal/faxaccount/faxNumberSelect/faxNumberSelect-filter.tpl.c:5
-msgid "Name"
-msgstr "Nombre"
-
-#: personal/faxaccount/faxNumberSelect/faxNumberSelect-list.tpl.c:2
-msgid "Base"
-msgstr "Base"
diff --git a/fax/locale/es_VE/fusiondirectory.po b/fax/locale/es_VE/fusiondirectory.po
index 2ab32533459bcdd3a86c33d1e8d866b8a210595c..f297d1e869a730d36c8533dfc5fe6e0d9d5454b0 100644
--- a/fax/locale/es_VE/fusiondirectory.po
+++ b/fax/locale/es_VE/fusiondirectory.po
@@ -5,12 +5,12 @@
 # Translators:
 msgid ""
 msgstr ""
-"Project-Id-Version: FusionDirectory-108\n"
+"Project-Id-Version: FusionDirectory-109\n"
 "Report-Msgid-Bugs-To: documentation@lists.fusiondirectory.org\n"
-"POT-Creation-Date: 2015-03-19 21:45+0100\n"
-"PO-Revision-Date: 2015-02-25 16:12+0000\n"
+"POT-Creation-Date: 2014-12-15 17:47+0100\n"
+"PO-Revision-Date: 2015-02-25 16:13+0000\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>\n"
-"Language-Team: Spanish (Venezuela) (http://www.transifex.com/projects/p/FusionDirectory-108/language/es_VE/)\n"
+"Language-Team: Spanish (Venezuela) (http://www.transifex.com/projects/p/FusionDirectory-109/language/es_VE/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -169,7 +169,6 @@ msgid "Fax ID"
 msgstr "Fax ID"
 
 #: addons/faxreports/class_faxreport.inc:494
-#: addons/faxreports/contents.tpl.c:29
 msgid "Date"
 msgstr "Fecha"
 
@@ -178,23 +177,22 @@ msgid "Time"
 msgstr "Tiempo"
 
 #: addons/faxreports/class_faxreport.inc:495
-#: addons/faxreports/contents.tpl.c:32 addons/faxreports/detail.tpl.c:29
 msgid "Status"
 msgstr "Estado"
 
-#: addons/faxreports/class_faxreport.inc:496 addons/faxreports/detail.tpl.c:20
+#: addons/faxreports/class_faxreport.inc:496
 msgid "Sender ID"
 msgstr "ID del Remitente"
 
-#: addons/faxreports/class_faxreport.inc:497 addons/faxreports/detail.tpl.c:17
+#: addons/faxreports/class_faxreport.inc:497
 msgid "Sender MSN"
 msgstr "MSN del Remitente"
 
-#: addons/faxreports/class_faxreport.inc:498 addons/faxreports/detail.tpl.c:26
+#: addons/faxreports/class_faxreport.inc:498
 msgid "Receiver ID"
 msgstr "ID del Receptor"
 
-#: addons/faxreports/class_faxreport.inc:499 addons/faxreports/detail.tpl.c:23
+#: addons/faxreports/class_faxreport.inc:499
 msgid "Receiver MSN"
 msgstr "MSN del Receptor"
 
@@ -206,7 +204,7 @@ msgstr "NÃºmero de pÃ¡ginas"
 msgid "Status Message"
 msgstr "Mensaje de estado"
 
-#: addons/faxreports/class_faxreport.inc:502 addons/faxreports/detail.tpl.c:35
+#: addons/faxreports/class_faxreport.inc:502
 msgid "Transfer time"
 msgstr "Tiempo de envÃo"
 
@@ -248,7 +246,7 @@ msgstr "atrÃ¡s"
 #: personal/faxaccount/class_gofaxAccount.inc:611
 #: personal/faxaccount/class_gofaxAccount.inc:739
 msgid "LDAP error"
-msgstr "Error LDAP"
+msgstr "Error de LDAP"
 
 #: personal/faxaccount/class_gofaxAccount.inc:627
 #: personal/faxaccount/class_gofaxAccount.inc:631
@@ -274,8 +272,7 @@ msgstr "Â¡Ha seleccionado impresiÃ³n, pero no se ha introducido ninguna impresor
 
 #: personal/faxaccount/class_gofaxAccount.inc:796
 #: personal/faxaccount/faxNumberSelect/faxNumberSelect-list.xml:56
-#: config/fax/class_faxConfig.inc:42 personal/faxaccount/generic.tpl.c:5
-#: personal/faxaccount/paste_generic.tpl.c:5
+#: config/fax/class_faxConfig.inc:42
 msgid "Fax"
 msgstr "Fax"
 
@@ -284,12 +281,10 @@ msgid "Fax account settings"
 msgstr "ConfiguraciÃ³n cuenta de FAX"
 
 #: personal/faxaccount/class_gofaxAccount.inc:806
-#: personal/faxaccount/generic.tpl.c:11
 msgid "Language"
 msgstr "Idioma"
 
 #: personal/faxaccount/class_gofaxAccount.inc:807
-#: personal/faxaccount/generic.tpl.c:17
 msgid "Delivery format"
 msgstr "Formato de envÃo"
 
@@ -302,12 +297,10 @@ msgid "Enable/Disable fax"
 msgstr "Activar/desactivar FAX"
 
 #: personal/faxaccount/class_gofaxAccount.inc:810
-#: personal/faxaccount/generic.tpl.c:32
 msgid "Deliver fax as mail"
 msgstr "Enviar fax como correo electrÃ³nico"
 
 #: personal/faxaccount/class_gofaxAccount.inc:811
-#: personal/faxaccount/generic.tpl.c:35
 msgid "Deliver fax to printer"
 msgstr "Enviar fax a la impresora"
 
@@ -324,7 +317,6 @@ msgid "Please select the desired entries"
 msgstr "Por favor seleccione las entradas que desee"
 
 #: personal/faxaccount/faxNumberSelect/faxNumberSelect-list.xml:14
-#: addons/faxreports/contents.tpl.c:26 addons/faxreports/detail.tpl.c:11
 msgid "User"
 msgstr "Usuario"
 
@@ -379,181 +371,3 @@ msgstr ""
 #: config/fax/class_faxConfig.inc:45
 msgid "Branch in which fax blocklists will be stored"
 msgstr ""
-
-#: addons/faxreports/contents.tpl.c:2
-#: personal/faxaccount/faxNumberSelect/faxNumberSelect-filter.tpl.c:2
-msgid "Filter"
-msgstr "Filtro"
-
-#: addons/faxreports/contents.tpl.c:5
-msgid "Search for"
-msgstr "Buscar por"
-
-#: addons/faxreports/contents.tpl.c:8
-msgid "Enter user name to search for"
-msgstr "Introduzca el nombre de usuario para la bÃºsqueda"
-
-#: addons/faxreports/contents.tpl.c:11 addons/faxreports/contents.tpl.c:20
-msgid "in"
-msgstr "en"
-
-#: addons/faxreports/contents.tpl.c:14
-msgid "Select subtree to base search on"
-msgstr "Seleccione el subÃ¡rbol como base de la bÃºsqueda"
-
-#: addons/faxreports/contents.tpl.c:17
-msgid "during"
-msgstr "durante"
-
-#: addons/faxreports/contents.tpl.c:23
-msgid "Search"
-msgstr "Buscar"
-
-#: addons/faxreports/contents.tpl.c:35
-msgid "Sender"
-msgstr "Remitente"
-
-#: addons/faxreports/contents.tpl.c:38
-msgid "Receiver"
-msgstr "Receptor"
-
-#: addons/faxreports/contents.tpl.c:41 addons/faxreports/detail.tpl.c:38
-msgid "# pages"
-msgstr "# pÃ¡ginas"
-
-#: addons/faxreports/contents.tpl.c:44
-msgid "Search returned no results..."
-msgstr "La bÃºsqueda no ha encontrado resultados..."
-
-#: addons/faxreports/detail.tpl.c:2
-msgid "FAX preview - please wait"
-msgstr "VisualizaciÃ³n del Fax - Por favor espere"
-
-#: addons/faxreports/detail.tpl.c:5
-msgid "Click on fax to download"
-msgstr "Pulse en 'Fax' para descargar"
-
-#: addons/faxreports/detail.tpl.c:8
-msgid "FAX ID"
-msgstr "FAX ID"
-
-#: addons/faxreports/detail.tpl.c:14
-msgid "Date / Time"
-msgstr "Fecha / Hora"
-
-#: addons/faxreports/detail.tpl.c:32
-msgid "Status message"
-msgstr "Estado del mensaje"
-
-#: personal/faxaccount/generic.tpl.c:2
-#: personal/faxaccount/paste_generic.tpl.c:2
-msgid "Generic"
-msgstr "GenÃ©rico"
-
-#: personal/faxaccount/generic.tpl.c:8
-msgid "Fax number for fax to trigger on"
-msgstr ""
-
-#: personal/faxaccount/generic.tpl.c:14
-msgid "Specify the fax communication language for fax to mail gateway"
-msgstr ""
-
-#: personal/faxaccount/generic.tpl.c:20
-msgid "Specify delivery format for fax to mail gateway"
-msgstr "Especificar el formato de envÃo para la pasarela de fax a correo"
-
-#: personal/faxaccount/generic.tpl.c:23
-msgid "Delivery methods"
-msgstr "MÃ©todos de envÃo"
-
-#: personal/faxaccount/generic.tpl.c:26
-msgid "Temporary disable fax usage"
-msgstr "DesactivaciÃ³n temporal del uso del fax"
-
-#: personal/faxaccount/generic.tpl.c:29
-msgid "Deliver fax as mail to"
-msgstr "Enviar fax como correo electrÃ³nico a"
-
-#: personal/faxaccount/generic.tpl.c:38
-msgid "Alternate fax numbers"
-msgstr "Intercambiar los nÃºmeros de fax"
-
-#: personal/faxaccount/generic.tpl.c:41
-msgid "Add local"
-msgstr "AÃ±adir Cuenta Local"
-
-#: personal/faxaccount/generic.tpl.c:44
-msgid "Blocklists"
-msgstr "Listas de bloqueo"
-
-#: personal/faxaccount/generic.tpl.c:47
-msgid "Blocklists for incoming fax"
-msgstr "Listas de bloqueo para fax entrante"
-
-#: personal/faxaccount/generic.tpl.c:50 personal/faxaccount/generic.tpl.c:56
-msgid "Edit"
-msgstr "Editar"
-
-#: personal/faxaccount/generic.tpl.c:53
-msgid "Blocklists for outgoing fax"
-msgstr "Listas de bloqueo para fax saliente"
-
-#: personal/faxaccount/lists.tpl.c:2
-msgid "Blocked numbers/lists"
-msgstr "Listas/NÃºmeros bloqueados"
-
-#: personal/faxaccount/lists.tpl.c:5
-msgid "List of predefined blocklists"
-msgstr "Listas de bloqueos predefinidas"
-
-#: personal/faxaccount/lists.tpl.c:8
-msgid "Add the list to the blocklists"
-msgstr "AÃ±adir a la lista de bloqueos"
-
-#: personal/faxaccount/paste_generic.tpl.c:8
-msgid "Fax number for GOfax to trigger on"
-msgstr "Numero de fax para activar GOfax"
-
-#: personal/faxaccount/paste_generic.tpl.c:11
-msgid "Alternate fax numbers will not be copied"
-msgstr "Los nÃºmeros de fax alternativos no serÃ¡n copiados"
-
-#: personal/faxaccount/locals.tpl.c:2
-msgid "Select numbers to add"
-msgstr "Seleccione nÃºmeros para aÃ±adir"
-
-#: personal/faxaccount/locals.tpl.c:5
-msgid "Filters"
-msgstr "Filtros"
-
-#: personal/faxaccount/locals.tpl.c:8
-msgid "Display numbers of department"
-msgstr "Mostrar nÃºmero de Departamentos"
-
-#: personal/faxaccount/locals.tpl.c:11
-msgid "Choose the department the search will be based on"
-msgstr "Escoja el departamento base de la bÃºsqueda"
-
-#: personal/faxaccount/locals.tpl.c:14
-msgid "Display numbers matching"
-msgstr "Mostrar nÃºmeros que coincidan con"
-
-#: personal/faxaccount/locals.tpl.c:17
-msgid "Regular expression for matching numbers"
-msgstr "Expresiones regulares que coincidan con nÃºmeros"
-
-#: personal/faxaccount/locals.tpl.c:20
-msgid "Display numbers of user"
-msgstr "Mostrar nÃºmeros de usuario"
-
-#: personal/faxaccount/locals.tpl.c:23
-msgid "User name of which numbers are shown"
-msgstr "Nombre de usuario cuyos nÃºmeros estÃ¡n siendo mostrados"
-
-#: personal/faxaccount/faxNumberSelect/faxNumberSelect-filter.tpl.c:5
-msgid "Name"
-msgstr "Nombre"
-
-#: personal/faxaccount/faxNumberSelect/faxNumberSelect-list.tpl.c:2
-msgid "Base"
-msgstr "Base"
diff --git a/fax/locale/fa_IR/fusiondirectory.po b/fax/locale/fa_IR/fusiondirectory.po
index 4edd62514d8d8124a7dca4518b693fe8c9b3e856..5386a59096c4bdb468945fd58d1398939d2a98ad 100644
--- a/fax/locale/fa_IR/fusiondirectory.po
+++ b/fax/locale/fa_IR/fusiondirectory.po
@@ -5,12 +5,12 @@
 # Translators:
 msgid ""
 msgstr ""
-"Project-Id-Version: FusionDirectory-108\n"
+"Project-Id-Version: FusionDirectory-109\n"
 "Report-Msgid-Bugs-To: documentation@lists.fusiondirectory.org\n"
-"POT-Creation-Date: 2015-03-19 21:45+0100\n"
-"PO-Revision-Date: 2015-02-25 15:52+0000\n"
+"POT-Creation-Date: 2014-12-15 17:47+0100\n"
+"PO-Revision-Date: 2015-02-25 15:53+0000\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>\n"
-"Language-Team: Persian (Iran) (http://www.transifex.com/projects/p/FusionDirectory-108/language/fa_IR/)\n"
+"Language-Team: Persian (Iran) (http://www.transifex.com/projects/p/FusionDirectory-109/language/fa_IR/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -169,7 +169,6 @@ msgid "Fax ID"
 msgstr ""
 
 #: addons/faxreports/class_faxreport.inc:494
-#: addons/faxreports/contents.tpl.c:29
 msgid "Date"
 msgstr ""
 
@@ -178,23 +177,22 @@ msgid "Time"
 msgstr ""
 
 #: addons/faxreports/class_faxreport.inc:495
-#: addons/faxreports/contents.tpl.c:32 addons/faxreports/detail.tpl.c:29
 msgid "Status"
 msgstr ""
 
-#: addons/faxreports/class_faxreport.inc:496 addons/faxreports/detail.tpl.c:20
+#: addons/faxreports/class_faxreport.inc:496
 msgid "Sender ID"
 msgstr ""
 
-#: addons/faxreports/class_faxreport.inc:497 addons/faxreports/detail.tpl.c:17
+#: addons/faxreports/class_faxreport.inc:497
 msgid "Sender MSN"
 msgstr ""
 
-#: addons/faxreports/class_faxreport.inc:498 addons/faxreports/detail.tpl.c:26
+#: addons/faxreports/class_faxreport.inc:498
 msgid "Receiver ID"
 msgstr ""
 
-#: addons/faxreports/class_faxreport.inc:499 addons/faxreports/detail.tpl.c:23
+#: addons/faxreports/class_faxreport.inc:499
 msgid "Receiver MSN"
 msgstr ""
 
@@ -206,7 +204,7 @@ msgstr ""
 msgid "Status Message"
 msgstr ""
 
-#: addons/faxreports/class_faxreport.inc:502 addons/faxreports/detail.tpl.c:35
+#: addons/faxreports/class_faxreport.inc:502
 msgid "Transfer time"
 msgstr ""
 
@@ -274,8 +272,7 @@ msgstr ""
 
 #: personal/faxaccount/class_gofaxAccount.inc:796
 #: personal/faxaccount/faxNumberSelect/faxNumberSelect-list.xml:56
-#: config/fax/class_faxConfig.inc:42 personal/faxaccount/generic.tpl.c:5
-#: personal/faxaccount/paste_generic.tpl.c:5
+#: config/fax/class_faxConfig.inc:42
 msgid "Fax"
 msgstr ""
 
@@ -284,12 +281,10 @@ msgid "Fax account settings"
 msgstr ""
 
 #: personal/faxaccount/class_gofaxAccount.inc:806
-#: personal/faxaccount/generic.tpl.c:11
 msgid "Language"
 msgstr ""
 
 #: personal/faxaccount/class_gofaxAccount.inc:807
-#: personal/faxaccount/generic.tpl.c:17
 msgid "Delivery format"
 msgstr ""
 
@@ -302,12 +297,10 @@ msgid "Enable/Disable fax"
 msgstr ""
 
 #: personal/faxaccount/class_gofaxAccount.inc:810
-#: personal/faxaccount/generic.tpl.c:32
 msgid "Deliver fax as mail"
 msgstr ""
 
 #: personal/faxaccount/class_gofaxAccount.inc:811
-#: personal/faxaccount/generic.tpl.c:35
 msgid "Deliver fax to printer"
 msgstr ""
 
@@ -324,7 +317,6 @@ msgid "Please select the desired entries"
 msgstr ""
 
 #: personal/faxaccount/faxNumberSelect/faxNumberSelect-list.xml:14
-#: addons/faxreports/contents.tpl.c:26 addons/faxreports/detail.tpl.c:11
 msgid "User"
 msgstr ""
 
@@ -379,181 +371,3 @@ msgstr ""
 #: config/fax/class_faxConfig.inc:45
 msgid "Branch in which fax blocklists will be stored"
 msgstr ""
-
-#: addons/faxreports/contents.tpl.c:2
-#: personal/faxaccount/faxNumberSelect/faxNumberSelect-filter.tpl.c:2
-msgid "Filter"
-msgstr ""
-
-#: addons/faxreports/contents.tpl.c:5
-msgid "Search for"
-msgstr ""
-
-#: addons/faxreports/contents.tpl.c:8
-msgid "Enter user name to search for"
-msgstr ""
-
-#: addons/faxreports/contents.tpl.c:11 addons/faxreports/contents.tpl.c:20
-msgid "in"
-msgstr ""
-
-#: addons/faxreports/contents.tpl.c:14
-msgid "Select subtree to base search on"
-msgstr ""
-
-#: addons/faxreports/contents.tpl.c:17
-msgid "during"
-msgstr ""
-
-#: addons/faxreports/contents.tpl.c:23
-msgid "Search"
-msgstr ""
-
-#: addons/faxreports/contents.tpl.c:35
-msgid "Sender"
-msgstr ""
-
-#: addons/faxreports/contents.tpl.c:38
-msgid "Receiver"
-msgstr ""
-
-#: addons/faxreports/contents.tpl.c:41 addons/faxreports/detail.tpl.c:38
-msgid "# pages"
-msgstr ""
-
-#: addons/faxreports/contents.tpl.c:44
-msgid "Search returned no results..."
-msgstr ""
-
-#: addons/faxreports/detail.tpl.c:2
-msgid "FAX preview - please wait"
-msgstr ""
-
-#: addons/faxreports/detail.tpl.c:5
-msgid "Click on fax to download"
-msgstr ""
-
-#: addons/faxreports/detail.tpl.c:8
-msgid "FAX ID"
-msgstr ""
-
-#: addons/faxreports/detail.tpl.c:14
-msgid "Date / Time"
-msgstr ""
-
-#: addons/faxreports/detail.tpl.c:32
-msgid "Status message"
-msgstr ""
-
-#: personal/faxaccount/generic.tpl.c:2
-#: personal/faxaccount/paste_generic.tpl.c:2
-msgid "Generic"
-msgstr ""
-
-#: personal/faxaccount/generic.tpl.c:8
-msgid "Fax number for fax to trigger on"
-msgstr ""
-
-#: personal/faxaccount/generic.tpl.c:14
-msgid "Specify the fax communication language for fax to mail gateway"
-msgstr ""
-
-#: personal/faxaccount/generic.tpl.c:20
-msgid "Specify delivery format for fax to mail gateway"
-msgstr ""
-
-#: personal/faxaccount/generic.tpl.c:23
-msgid "Delivery methods"
-msgstr ""
-
-#: personal/faxaccount/generic.tpl.c:26
-msgid "Temporary disable fax usage"
-msgstr ""
-
-#: personal/faxaccount/generic.tpl.c:29
-msgid "Deliver fax as mail to"
-msgstr ""
-
-#: personal/faxaccount/generic.tpl.c:38
-msgid "Alternate fax numbers"
-msgstr ""
-
-#: personal/faxaccount/generic.tpl.c:41
-msgid "Add local"
-msgstr ""
-
-#: personal/faxaccount/generic.tpl.c:44
-msgid "Blocklists"
-msgstr ""
-
-#: personal/faxaccount/generic.tpl.c:47
-msgid "Blocklists for incoming fax"
-msgstr ""
-
-#: personal/faxaccount/generic.tpl.c:50 personal/faxaccount/generic.tpl.c:56
-msgid "Edit"
-msgstr ""
-
-#: personal/faxaccount/generic.tpl.c:53
-msgid "Blocklists for outgoing fax"
-msgstr ""
-
-#: personal/faxaccount/lists.tpl.c:2
-msgid "Blocked numbers/lists"
-msgstr ""
-
-#: personal/faxaccount/lists.tpl.c:5
-msgid "List of predefined blocklists"
-msgstr ""
-
-#: personal/faxaccount/lists.tpl.c:8
-msgid "Add the list to the blocklists"
-msgstr ""
-
-#: personal/faxaccount/paste_generic.tpl.c:8
-msgid "Fax number for GOfax to trigger on"
-msgstr ""
-
-#: personal/faxaccount/paste_generic.tpl.c:11
-msgid "Alternate fax numbers will not be copied"
-msgstr ""
-
-#: personal/faxaccount/locals.tpl.c:2
-msgid "Select numbers to add"
-msgstr ""
-
-#: personal/faxaccount/locals.tpl.c:5
-msgid "Filters"
-msgstr ""
-
-#: personal/faxaccount/locals.tpl.c:8
-msgid "Display numbers of department"
-msgstr ""
-
-#: personal/faxaccount/locals.tpl.c:11
-msgid "Choose the department the search will be based on"
-msgstr ""
-
-#: personal/faxaccount/locals.tpl.c:14
-msgid "Display numbers matching"
-msgstr ""
-
-#: personal/faxaccount/locals.tpl.c:17
-msgid "Regular expression for matching numbers"
-msgstr ""
-
-#: personal/faxaccount/locals.tpl.c:20
-msgid "Display numbers of user"
-msgstr ""
-
-#: personal/faxaccount/locals.tpl.c:23
-msgid "User name of which numbers are shown"
-msgstr ""
-
-#: personal/faxaccount/faxNumberSelect/faxNumberSelect-filter.tpl.c:5
-msgid "Name"
-msgstr ""
-
-#: personal/faxaccount/faxNumberSelect/faxNumberSelect-list.tpl.c:2
-msgid "Base"
-msgstr ""
diff --git a/fax/locale/fr/fusiondirectory.po b/fax/locale/fr/fusiondirectory.po
index 32a82d82055e1ecfc22affff7086cf72d31b41ca..98efab89129772e798f602c0c2a8186747e76897 100644
--- a/fax/locale/fr/fusiondirectory.po
+++ b/fax/locale/fr/fusiondirectory.po
@@ -3,20 +3,14 @@
 # This file is distributed under the same license as the PACKAGE package.
 # 
 # Translators:
-# Anne Nicolas <ennael1@gmail.com>, 2014
-# Benoit Mortier <benoit.mortier@opensides.be>, 2005-2008,2010-2011
-# fusiondirectory <contact@fusiondirectory.org>, 2013-2014
-# fusiondirectory <contact@fusiondirectory.org>, 2012
-# fusiondirectory <contact@fusiondirectory.org>, 2012
-# fusiondirectory <contact@fusiondirectory.org>, 2012
 msgid ""
 msgstr ""
-"Project-Id-Version: FusionDirectory-108\n"
+"Project-Id-Version: FusionDirectory-109\n"
 "Report-Msgid-Bugs-To: documentation@lists.fusiondirectory.org\n"
-"POT-Creation-Date: 2015-03-19 21:45+0100\n"
-"PO-Revision-Date: 2015-02-25 16:12+0000\n"
+"POT-Creation-Date: 2014-12-15 17:47+0100\n"
+"PO-Revision-Date: 2015-02-25 16:13+0000\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>\n"
-"Language-Team: French (http://www.transifex.com/projects/p/FusionDirectory-108/language/fr/)\n"
+"Language-Team: French (http://www.transifex.com/projects/p/FusionDirectory-109/language/fr/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -95,7 +89,7 @@ msgstr "Service Fax"
 
 #: admin/systems/services/fax/class_serviceFax.inc:32
 msgid "Services"
-msgstr "Services"
+msgstr "Service"
 
 #: admin/systems/services/fax/class_serviceFax.inc:46
 msgid "FAX database information"
@@ -175,7 +169,6 @@ msgid "Fax ID"
 msgstr "ID Fax"
 
 #: addons/faxreports/class_faxreport.inc:494
-#: addons/faxreports/contents.tpl.c:29
 msgid "Date"
 msgstr "Date"
 
@@ -184,23 +177,22 @@ msgid "Time"
 msgstr "Temps"
 
 #: addons/faxreports/class_faxreport.inc:495
-#: addons/faxreports/contents.tpl.c:32 addons/faxreports/detail.tpl.c:29
 msgid "Status"
 msgstr "Statut"
 
-#: addons/faxreports/class_faxreport.inc:496 addons/faxreports/detail.tpl.c:20
+#: addons/faxreports/class_faxreport.inc:496
 msgid "Sender ID"
 msgstr "ID de l'expÃ©diteur"
 
-#: addons/faxreports/class_faxreport.inc:497 addons/faxreports/detail.tpl.c:17
+#: addons/faxreports/class_faxreport.inc:497
 msgid "Sender MSN"
 msgstr "MSN de l'expÃ©diteur"
 
-#: addons/faxreports/class_faxreport.inc:498 addons/faxreports/detail.tpl.c:26
+#: addons/faxreports/class_faxreport.inc:498
 msgid "Receiver ID"
 msgstr "ID du correspondant"
 
-#: addons/faxreports/class_faxreport.inc:499 addons/faxreports/detail.tpl.c:23
+#: addons/faxreports/class_faxreport.inc:499
 msgid "Receiver MSN"
 msgstr "MSN du correspondant"
 
@@ -212,7 +204,7 @@ msgstr "Nombre de pages"
 msgid "Status Message"
 msgstr "Rapport d'envoi"
 
-#: addons/faxreports/class_faxreport.inc:502 addons/faxreports/detail.tpl.c:35
+#: addons/faxreports/class_faxreport.inc:502
 msgid "Transfer time"
 msgstr "Temps de transfert"
 
@@ -280,8 +272,7 @@ msgstr "L'impression Ã  Ã©tÃ© demandÃ© alors que l'imprimante n'est pas dÃ©finie
 
 #: personal/faxaccount/class_gofaxAccount.inc:796
 #: personal/faxaccount/faxNumberSelect/faxNumberSelect-list.xml:56
-#: config/fax/class_faxConfig.inc:42 personal/faxaccount/generic.tpl.c:5
-#: personal/faxaccount/paste_generic.tpl.c:5
+#: config/fax/class_faxConfig.inc:42
 msgid "Fax"
 msgstr "Fax"
 
@@ -290,12 +281,10 @@ msgid "Fax account settings"
 msgstr "ParamÃ¨tres du compte FAX"
 
 #: personal/faxaccount/class_gofaxAccount.inc:806
-#: personal/faxaccount/generic.tpl.c:11
 msgid "Language"
 msgstr "Langue"
 
 #: personal/faxaccount/class_gofaxAccount.inc:807
-#: personal/faxaccount/generic.tpl.c:17
 msgid "Delivery format"
 msgstr "Format de distribution"
 
@@ -308,12 +297,10 @@ msgid "Enable/Disable fax"
 msgstr "Activer/dÃ©sactiver le fax"
 
 #: personal/faxaccount/class_gofaxAccount.inc:810
-#: personal/faxaccount/generic.tpl.c:32
 msgid "Deliver fax as mail"
 msgstr "DÃ©livrer les fax comme des messages"
 
 #: personal/faxaccount/class_gofaxAccount.inc:811
-#: personal/faxaccount/generic.tpl.c:35
 msgid "Deliver fax to printer"
 msgstr "Imprimer directement les fax"
 
@@ -330,7 +317,6 @@ msgid "Please select the desired entries"
 msgstr "Veuillez sÃ©lectionner les entrÃ©es dÃ©sirÃ©es"
 
 #: personal/faxaccount/faxNumberSelect/faxNumberSelect-list.xml:14
-#: addons/faxreports/contents.tpl.c:26 addons/faxreports/detail.tpl.c:11
 msgid "User"
 msgstr "Utilisateur"
 
@@ -340,7 +326,7 @@ msgstr "PrÃ©nom"
 
 #: personal/faxaccount/faxNumberSelect/faxNumberSelect-list.xml:48
 msgid "Surname"
-msgstr "Nom de famille"
+msgstr "Nom"
 
 #: personal/faxaccount/main.inc:126
 msgid "Click the 'Edit' button below to change informations in this dialog"
@@ -385,181 +371,3 @@ msgstr "Fax RDN"
 #: config/fax/class_faxConfig.inc:45
 msgid "Branch in which fax blocklists will be stored"
 msgstr "Branche dans laquelle les listes rouges du fax seront stockÃ©es"
-
-#: addons/faxreports/contents.tpl.c:2
-#: personal/faxaccount/faxNumberSelect/faxNumberSelect-filter.tpl.c:2
-msgid "Filter"
-msgstr "Filtre"
-
-#: addons/faxreports/contents.tpl.c:5
-msgid "Search for"
-msgstr "Recherche de"
-
-#: addons/faxreports/contents.tpl.c:8
-msgid "Enter user name to search for"
-msgstr "Entrez le nom recherchÃ©"
-
-#: addons/faxreports/contents.tpl.c:11 addons/faxreports/contents.tpl.c:20
-msgid "in"
-msgstr "dans"
-
-#: addons/faxreports/contents.tpl.c:14
-msgid "Select subtree to base search on"
-msgstr "SÃ©lectionnez la branche de l'annuaire oÃ¹ sera effectuÃ©e la recherche"
-
-#: addons/faxreports/contents.tpl.c:17
-msgid "during"
-msgstr "pendant"
-
-#: addons/faxreports/contents.tpl.c:23
-msgid "Search"
-msgstr "Recherche"
-
-#: addons/faxreports/contents.tpl.c:35
-msgid "Sender"
-msgstr "ExpÃ©diteur"
-
-#: addons/faxreports/contents.tpl.c:38
-msgid "Receiver"
-msgstr "Correspondant"
-
-#: addons/faxreports/contents.tpl.c:41 addons/faxreports/detail.tpl.c:38
-msgid "# pages"
-msgstr "# pages"
-
-#: addons/faxreports/contents.tpl.c:44
-msgid "Search returned no results..."
-msgstr "La recherche n'a renvoyÃ© aucun rÃ©sultat..."
-
-#: addons/faxreports/detail.tpl.c:2
-msgid "FAX preview - please wait"
-msgstr "prÃ©visualisation du FAX - Veuillez attendre"
-
-#: addons/faxreports/detail.tpl.c:5
-msgid "Click on fax to download"
-msgstr "Cliquez sur le fax pour le tÃ©lÃ©charger"
-
-#: addons/faxreports/detail.tpl.c:8
-msgid "FAX ID"
-msgstr "FAX ID"
-
-#: addons/faxreports/detail.tpl.c:14
-msgid "Date / Time"
-msgstr "Date / Heure"
-
-#: addons/faxreports/detail.tpl.c:32
-msgid "Status message"
-msgstr "Statut"
-
-#: personal/faxaccount/generic.tpl.c:2
-#: personal/faxaccount/paste_generic.tpl.c:2
-msgid "Generic"
-msgstr "Application"
-
-#: personal/faxaccount/generic.tpl.c:8
-msgid "Fax number for fax to trigger on"
-msgstr "NumÃ©ro de fax ou fax Ã  dÃ©clencher"
-
-#: personal/faxaccount/generic.tpl.c:14
-msgid "Specify the fax communication language for fax to mail gateway"
-msgstr "SpÃ©cifiez le format de distribution pour les fax vers la passerelle de messagerie"
-
-#: personal/faxaccount/generic.tpl.c:20
-msgid "Specify delivery format for fax to mail gateway"
-msgstr "SpÃ©cifiez le format de distribution pour les fax vers la passerelle de messagerie"
-
-#: personal/faxaccount/generic.tpl.c:23
-msgid "Delivery methods"
-msgstr "MÃ©thodes de distribution"
-
-#: personal/faxaccount/generic.tpl.c:26
-msgid "Temporary disable fax usage"
-msgstr "DÃ©sactiver temporairement l'utilisation du fax"
-
-#: personal/faxaccount/generic.tpl.c:29
-msgid "Deliver fax as mail to"
-msgstr "DÃ©livrer les fax comme des messages Ã "
-
-#: personal/faxaccount/generic.tpl.c:38
-msgid "Alternate fax numbers"
-msgstr "NumÃ©ros de fax alternatif"
-
-#: personal/faxaccount/generic.tpl.c:41
-msgid "Add local"
-msgstr "Ajouter en local"
-
-#: personal/faxaccount/generic.tpl.c:44
-msgid "Blocklists"
-msgstr "Listes Rouges"
-
-#: personal/faxaccount/generic.tpl.c:47
-msgid "Blocklists for incoming fax"
-msgstr "Listes rouges pour les fax entrant"
-
-#: personal/faxaccount/generic.tpl.c:50 personal/faxaccount/generic.tpl.c:56
-msgid "Edit"
-msgstr "Ã‰diter"
-
-#: personal/faxaccount/generic.tpl.c:53
-msgid "Blocklists for outgoing fax"
-msgstr "Listes rouges pour les fax sortant"
-
-#: personal/faxaccount/lists.tpl.c:2
-msgid "Blocked numbers/lists"
-msgstr "NumÃ©ros/listes refusÃ©s"
-
-#: personal/faxaccount/lists.tpl.c:5
-msgid "List of predefined blocklists"
-msgstr "Liste des listes rouges prÃ©dÃ©finies"
-
-#: personal/faxaccount/lists.tpl.c:8
-msgid "Add the list to the blocklists"
-msgstr "Ajouter a la liste des listes rouges"
-
-#: personal/faxaccount/paste_generic.tpl.c:8
-msgid "Fax number for GOfax to trigger on"
-msgstr "NumÃ©ro de fax pour lesquels GOfax s'activera"
-
-#: personal/faxaccount/paste_generic.tpl.c:11
-msgid "Alternate fax numbers will not be copied"
-msgstr "Les numÃ©ros de fax alternatif ne seront pas copiÃ©s"
-
-#: personal/faxaccount/locals.tpl.c:2
-msgid "Select numbers to add"
-msgstr "SÃ©lectionnez les numÃ©ros Ã  ajouter"
-
-#: personal/faxaccount/locals.tpl.c:5
-msgid "Filters"
-msgstr "Filtres"
-
-#: personal/faxaccount/locals.tpl.c:8
-msgid "Display numbers of department"
-msgstr "Afficher les numÃ©ro du dÃ©partement"
-
-#: personal/faxaccount/locals.tpl.c:11
-msgid "Choose the department the search will be based on"
-msgstr "SÃ©lectionner le dÃ©partement oÃ¹ sera effectuÃ©e la recherche"
-
-#: personal/faxaccount/locals.tpl.c:14
-msgid "Display numbers matching"
-msgstr "Afficher les numÃ©ros correspondants"
-
-#: personal/faxaccount/locals.tpl.c:17
-msgid "Regular expression for matching numbers"
-msgstr "Expression rÃ©guliÃ¨re pour trouver les numÃ©ros correspondants"
-
-#: personal/faxaccount/locals.tpl.c:20
-msgid "Display numbers of user"
-msgstr "Afficher les numÃ©ros des utilisateurs"
-
-#: personal/faxaccount/locals.tpl.c:23
-msgid "User name of which numbers are shown"
-msgstr "Utilisateur dont les numÃ©ros sont affichÃ©s"
-
-#: personal/faxaccount/faxNumberSelect/faxNumberSelect-filter.tpl.c:5
-msgid "Name"
-msgstr "Nom"
-
-#: personal/faxaccount/faxNumberSelect/faxNumberSelect-list.tpl.c:2
-msgid "Base"
-msgstr "Base"
diff --git a/fax/locale/id/fusiondirectory.po b/fax/locale/id/fusiondirectory.po
index 8f85c4873bbbbe453568c5605fb6e7b364608ae0..649d62aabd7422b7f57d2b90f6ffa2d1e4ff2dcd 100644
--- a/fax/locale/id/fusiondirectory.po
+++ b/fax/locale/id/fusiondirectory.po
@@ -5,12 +5,12 @@
 # Translators:
 msgid ""
 msgstr ""
-"Project-Id-Version: FusionDirectory-108\n"
+"Project-Id-Version: FusionDirectory-109\n"
 "Report-Msgid-Bugs-To: documentation@lists.fusiondirectory.org\n"
-"POT-Creation-Date: 2015-03-19 21:45+0100\n"
-"PO-Revision-Date: 2015-02-25 15:46+0000\n"
+"POT-Creation-Date: 2014-12-15 17:47+0100\n"
+"PO-Revision-Date: 2014-12-15 16:55+0000\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>\n"
-"Language-Team: Indonesian (http://www.transifex.com/projects/p/FusionDirectory-108/language/id/)\n"
+"Language-Team: Indonesian (http://www.transifex.com/projects/p/FusionDirectory-109/language/id/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -169,7 +169,6 @@ msgid "Fax ID"
 msgstr ""
 
 #: addons/faxreports/class_faxreport.inc:494
-#: addons/faxreports/contents.tpl.c:29
 msgid "Date"
 msgstr ""
 
@@ -178,23 +177,22 @@ msgid "Time"
 msgstr ""
 
 #: addons/faxreports/class_faxreport.inc:495
-#: addons/faxreports/contents.tpl.c:32 addons/faxreports/detail.tpl.c:29
 msgid "Status"
 msgstr ""
 
-#: addons/faxreports/class_faxreport.inc:496 addons/faxreports/detail.tpl.c:20
+#: addons/faxreports/class_faxreport.inc:496
 msgid "Sender ID"
 msgstr ""
 
-#: addons/faxreports/class_faxreport.inc:497 addons/faxreports/detail.tpl.c:17
+#: addons/faxreports/class_faxreport.inc:497
 msgid "Sender MSN"
 msgstr ""
 
-#: addons/faxreports/class_faxreport.inc:498 addons/faxreports/detail.tpl.c:26
+#: addons/faxreports/class_faxreport.inc:498
 msgid "Receiver ID"
 msgstr ""
 
-#: addons/faxreports/class_faxreport.inc:499 addons/faxreports/detail.tpl.c:23
+#: addons/faxreports/class_faxreport.inc:499
 msgid "Receiver MSN"
 msgstr ""
 
@@ -206,7 +204,7 @@ msgstr ""
 msgid "Status Message"
 msgstr ""
 
-#: addons/faxreports/class_faxreport.inc:502 addons/faxreports/detail.tpl.c:35
+#: addons/faxreports/class_faxreport.inc:502
 msgid "Transfer time"
 msgstr ""
 
@@ -274,8 +272,7 @@ msgstr ""
 
 #: personal/faxaccount/class_gofaxAccount.inc:796
 #: personal/faxaccount/faxNumberSelect/faxNumberSelect-list.xml:56
-#: config/fax/class_faxConfig.inc:42 personal/faxaccount/generic.tpl.c:5
-#: personal/faxaccount/paste_generic.tpl.c:5
+#: config/fax/class_faxConfig.inc:42
 msgid "Fax"
 msgstr ""
 
@@ -284,12 +281,10 @@ msgid "Fax account settings"
 msgstr ""
 
 #: personal/faxaccount/class_gofaxAccount.inc:806
-#: personal/faxaccount/generic.tpl.c:11
 msgid "Language"
 msgstr ""
 
 #: personal/faxaccount/class_gofaxAccount.inc:807
-#: personal/faxaccount/generic.tpl.c:17
 msgid "Delivery format"
 msgstr ""
 
@@ -302,12 +297,10 @@ msgid "Enable/Disable fax"
 msgstr ""
 
 #: personal/faxaccount/class_gofaxAccount.inc:810
-#: personal/faxaccount/generic.tpl.c:32
 msgid "Deliver fax as mail"
 msgstr ""
 
 #: personal/faxaccount/class_gofaxAccount.inc:811
-#: personal/faxaccount/generic.tpl.c:35
 msgid "Deliver fax to printer"
 msgstr ""
 
@@ -324,7 +317,6 @@ msgid "Please select the desired entries"
 msgstr ""
 
 #: personal/faxaccount/faxNumberSelect/faxNumberSelect-list.xml:14
-#: addons/faxreports/contents.tpl.c:26 addons/faxreports/detail.tpl.c:11
 msgid "User"
 msgstr ""
 
@@ -379,181 +371,3 @@ msgstr ""
 #: config/fax/class_faxConfig.inc:45
 msgid "Branch in which fax blocklists will be stored"
 msgstr ""
-
-#: addons/faxreports/contents.tpl.c:2
-#: personal/faxaccount/faxNumberSelect/faxNumberSelect-filter.tpl.c:2
-msgid "Filter"
-msgstr ""
-
-#: addons/faxreports/contents.tpl.c:5
-msgid "Search for"
-msgstr ""
-
-#: addons/faxreports/contents.tpl.c:8
-msgid "Enter user name to search for"
-msgstr ""
-
-#: addons/faxreports/contents.tpl.c:11 addons/faxreports/contents.tpl.c:20
-msgid "in"
-msgstr ""
-
-#: addons/faxreports/contents.tpl.c:14
-msgid "Select subtree to base search on"
-msgstr ""
-
-#: addons/faxreports/contents.tpl.c:17
-msgid "during"
-msgstr ""
-
-#: addons/faxreports/contents.tpl.c:23
-msgid "Search"
-msgstr ""
-
-#: addons/faxreports/contents.tpl.c:35
-msgid "Sender"
-msgstr ""
-
-#: addons/faxreports/contents.tpl.c:38
-msgid "Receiver"
-msgstr ""
-
-#: addons/faxreports/contents.tpl.c:41 addons/faxreports/detail.tpl.c:38
-msgid "# pages"
-msgstr ""
-
-#: addons/faxreports/contents.tpl.c:44
-msgid "Search returned no results..."
-msgstr ""
-
-#: addons/faxreports/detail.tpl.c:2
-msgid "FAX preview - please wait"
-msgstr ""
-
-#: addons/faxreports/detail.tpl.c:5
-msgid "Click on fax to download"
-msgstr ""
-
-#: addons/faxreports/detail.tpl.c:8
-msgid "FAX ID"
-msgstr ""
-
-#: addons/faxreports/detail.tpl.c:14
-msgid "Date / Time"
-msgstr ""
-
-#: addons/faxreports/detail.tpl.c:32
-msgid "Status message"
-msgstr ""
-
-#: personal/faxaccount/generic.tpl.c:2
-#: personal/faxaccount/paste_generic.tpl.c:2
-msgid "Generic"
-msgstr ""
-
-#: personal/faxaccount/generic.tpl.c:8
-msgid "Fax number for fax to trigger on"
-msgstr ""
-
-#: personal/faxaccount/generic.tpl.c:14
-msgid "Specify the fax communication language for fax to mail gateway"
-msgstr ""
-
-#: personal/faxaccount/generic.tpl.c:20
-msgid "Specify delivery format for fax to mail gateway"
-msgstr ""
-
-#: personal/faxaccount/generic.tpl.c:23
-msgid "Delivery methods"
-msgstr ""
-
-#: personal/faxaccount/generic.tpl.c:26
-msgid "Temporary disable fax usage"
-msgstr ""
-
-#: personal/faxaccount/generic.tpl.c:29
-msgid "Deliver fax as mail to"
-msgstr ""
-
-#: personal/faxaccount/generic.tpl.c:38
-msgid "Alternate fax numbers"
-msgstr ""
-
-#: personal/faxaccount/generic.tpl.c:41
-msgid "Add local"
-msgstr ""
-
-#: personal/faxaccount/generic.tpl.c:44
-msgid "Blocklists"
-msgstr ""
-
-#: personal/faxaccount/generic.tpl.c:47
-msgid "Blocklists for incoming fax"
-msgstr ""
-
-#: personal/faxaccount/generic.tpl.c:50 personal/faxaccount/generic.tpl.c:56
-msgid "Edit"
-msgstr ""
-
-#: personal/faxaccount/generic.tpl.c:53
-msgid "Blocklists for outgoing fax"
-msgstr ""
-
-#: personal/faxaccount/lists.tpl.c:2
-msgid "Blocked numbers/lists"
-msgstr ""
-
-#: personal/faxaccount/lists.tpl.c:5
-msgid "List of predefined blocklists"
-msgstr ""
-
-#: personal/faxaccount/lists.tpl.c:8
-msgid "Add the list to the blocklists"
-msgstr ""
-
-#: personal/faxaccount/paste_generic.tpl.c:8
-msgid "Fax number for GOfax to trigger on"
-msgstr ""
-
-#: personal/faxaccount/paste_generic.tpl.c:11
-msgid "Alternate fax numbers will not be copied"
-msgstr ""
-
-#: personal/faxaccount/locals.tpl.c:2
-msgid "Select numbers to add"
-msgstr ""
-
-#: personal/faxaccount/locals.tpl.c:5
-msgid "Filters"
-msgstr ""
-
-#: personal/faxaccount/locals.tpl.c:8
-msgid "Display numbers of department"
-msgstr ""
-
-#: personal/faxaccount/locals.tpl.c:11
-msgid "Choose the department the search will be based on"
-msgstr ""
-
-#: personal/faxaccount/locals.tpl.c:14
-msgid "Display numbers matching"
-msgstr ""
-
-#: personal/faxaccount/locals.tpl.c:17
-msgid "Regular expression for matching numbers"
-msgstr ""
-
-#: personal/faxaccount/locals.tpl.c:20
-msgid "Display numbers of user"
-msgstr ""
-
-#: personal/faxaccount/locals.tpl.c:23
-msgid "User name of which numbers are shown"
-msgstr ""
-
-#: personal/faxaccount/faxNumberSelect/faxNumberSelect-filter.tpl.c:5
-msgid "Name"
-msgstr ""
-
-#: personal/faxaccount/faxNumberSelect/faxNumberSelect-list.tpl.c:2
-msgid "Base"
-msgstr ""
diff --git a/fax/locale/it/fusiondirectory.po b/fax/locale/it/fusiondirectory.po
index 577dbff85c2fac2ca0993941b14f830a691666bd..2d726aa026f53cc4d215ed41f25f06ddcc90fa2c 100644
--- a/fax/locale/it/fusiondirectory.po
+++ b/fax/locale/it/fusiondirectory.po
@@ -3,19 +3,14 @@
 # This file is distributed under the same license as the PACKAGE package.
 # 
 # Translators:
-# Alessandro Amici <a.amici@bopen.it>, 2005
-# poterealpopolo <giuliano@opensides.be>, 2011
-# poterealpopolo <giuliano@opensides.be>, 2013
-# poterealpopolo <giuliano@opensides.be>, 2012
-# poterealpopolo <giuliano@opensides.be>, 2011-2013
 msgid ""
 msgstr ""
-"Project-Id-Version: FusionDirectory-108\n"
+"Project-Id-Version: FusionDirectory-109\n"
 "Report-Msgid-Bugs-To: documentation@lists.fusiondirectory.org\n"
-"POT-Creation-Date: 2015-03-19 21:45+0100\n"
-"PO-Revision-Date: 2015-02-25 16:12+0000\n"
+"POT-Creation-Date: 2014-12-15 17:47+0100\n"
+"PO-Revision-Date: 2015-02-25 16:13+0000\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>\n"
-"Language-Team: Italian (http://www.transifex.com/projects/p/FusionDirectory-108/language/it/)\n"
+"Language-Team: Italian (http://www.transifex.com/projects/p/FusionDirectory-109/language/it/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -163,7 +158,7 @@ msgstr "Rapporti dei FAX"
 
 #: addons/faxreports/class_faxreport.inc:483
 msgid "All entries are readonly"
-msgstr "Tutti i campi sono in sola lettura"
+msgstr "Tutte le entries sono in sola lettura"
 
 #: addons/faxreports/class_faxreport.inc:492
 msgid "Detailed view"
@@ -174,7 +169,6 @@ msgid "Fax ID"
 msgstr "ID del Fax"
 
 #: addons/faxreports/class_faxreport.inc:494
-#: addons/faxreports/contents.tpl.c:29
 msgid "Date"
 msgstr "Data"
 
@@ -183,23 +177,22 @@ msgid "Time"
 msgstr "Tempo"
 
 #: addons/faxreports/class_faxreport.inc:495
-#: addons/faxreports/contents.tpl.c:32 addons/faxreports/detail.tpl.c:29
 msgid "Status"
 msgstr "Stato"
 
-#: addons/faxreports/class_faxreport.inc:496 addons/faxreports/detail.tpl.c:20
+#: addons/faxreports/class_faxreport.inc:496
 msgid "Sender ID"
 msgstr "ID del mittente"
 
-#: addons/faxreports/class_faxreport.inc:497 addons/faxreports/detail.tpl.c:17
+#: addons/faxreports/class_faxreport.inc:497
 msgid "Sender MSN"
 msgstr "MSN del mittente"
 
-#: addons/faxreports/class_faxreport.inc:498 addons/faxreports/detail.tpl.c:26
+#: addons/faxreports/class_faxreport.inc:498
 msgid "Receiver ID"
 msgstr "ID del destinatario"
 
-#: addons/faxreports/class_faxreport.inc:499 addons/faxreports/detail.tpl.c:23
+#: addons/faxreports/class_faxreport.inc:499
 msgid "Receiver MSN"
 msgstr "MSN del destinatario"
 
@@ -211,7 +204,7 @@ msgstr "Numero di pagine"
 msgid "Status Message"
 msgstr "Rapporto di spedizione"
 
-#: addons/faxreports/class_faxreport.inc:502 addons/faxreports/detail.tpl.c:35
+#: addons/faxreports/class_faxreport.inc:502
 msgid "Transfer time"
 msgstr "Tempo di trasferimento"
 
@@ -271,7 +264,7 @@ msgstr "Indirizzo di posta elettronica"
 
 #: personal/faxaccount/class_gofaxAccount.inc:640
 msgid "your-name@your-domain.com"
-msgstr "il-tuo-nome@il-tuo-dominio.org"
+msgstr "il-tuo-nome@il-tuo-dominio.com"
 
 #: personal/faxaccount/class_gofaxAccount.inc:646
 msgid "Printing is requested without a target printer!"
@@ -279,8 +272,7 @@ msgstr "Hai chiesto di stampare senza aver definito una stampante !"
 
 #: personal/faxaccount/class_gofaxAccount.inc:796
 #: personal/faxaccount/faxNumberSelect/faxNumberSelect-list.xml:56
-#: config/fax/class_faxConfig.inc:42 personal/faxaccount/generic.tpl.c:5
-#: personal/faxaccount/paste_generic.tpl.c:5
+#: config/fax/class_faxConfig.inc:42
 msgid "Fax"
 msgstr "Fax"
 
@@ -289,12 +281,10 @@ msgid "Fax account settings"
 msgstr "Impostazioni dell'account Fax"
 
 #: personal/faxaccount/class_gofaxAccount.inc:806
-#: personal/faxaccount/generic.tpl.c:11
 msgid "Language"
 msgstr "Lingua"
 
 #: personal/faxaccount/class_gofaxAccount.inc:807
-#: personal/faxaccount/generic.tpl.c:17
 msgid "Delivery format"
 msgstr "Formato di recapito"
 
@@ -307,12 +297,10 @@ msgid "Enable/Disable fax"
 msgstr "Attiva/Disattiva il Fax"
 
 #: personal/faxaccount/class_gofaxAccount.inc:810
-#: personal/faxaccount/generic.tpl.c:32
 msgid "Deliver fax as mail"
 msgstr "Recapita i Fax come mail"
 
 #: personal/faxaccount/class_gofaxAccount.inc:811
-#: personal/faxaccount/generic.tpl.c:35
 msgid "Deliver fax to printer"
 msgstr "Stampa direttamente i fax"
 
@@ -329,7 +317,6 @@ msgid "Please select the desired entries"
 msgstr "Seleziona le entries desiderate"
 
 #: personal/faxaccount/faxNumberSelect/faxNumberSelect-list.xml:14
-#: addons/faxreports/contents.tpl.c:26 addons/faxreports/detail.tpl.c:11
 msgid "User"
 msgstr "Utente"
 
@@ -343,7 +330,7 @@ msgstr "Cognome"
 
 #: personal/faxaccount/main.inc:126
 msgid "Click the 'Edit' button below to change informations in this dialog"
-msgstr "Click sul bottone 'Modifica' qui sotto per cambiare le informazioni in questa finestra"
+msgstr "Click sul bottone 'Modifica' qui sotto per cambiare le informazioni di questa schermata"
 
 #: personal/faxaccount/main.inc:135
 msgid "FAX settings"
@@ -384,181 +371,3 @@ msgstr ""
 #: config/fax/class_faxConfig.inc:45
 msgid "Branch in which fax blocklists will be stored"
 msgstr ""
-
-#: addons/faxreports/contents.tpl.c:2
-#: personal/faxaccount/faxNumberSelect/faxNumberSelect-filter.tpl.c:2
-msgid "Filter"
-msgstr "Filtro"
-
-#: addons/faxreports/contents.tpl.c:5
-msgid "Search for"
-msgstr "Cerca"
-
-#: addons/faxreports/contents.tpl.c:8
-msgid "Enter user name to search for"
-msgstr "Inserisci il nome dell'utente da ricercare"
-
-#: addons/faxreports/contents.tpl.c:11 addons/faxreports/contents.tpl.c:20
-msgid "in"
-msgstr "nel"
-
-#: addons/faxreports/contents.tpl.c:14
-msgid "Select subtree to base search on"
-msgstr "Scegli il ramo dell'annuario dove sarÃ  effettuata la ricerca"
-
-#: addons/faxreports/contents.tpl.c:17
-msgid "during"
-msgstr "durante"
-
-#: addons/faxreports/contents.tpl.c:23
-msgid "Search"
-msgstr "Cerca"
-
-#: addons/faxreports/contents.tpl.c:35
-msgid "Sender"
-msgstr "Mittente"
-
-#: addons/faxreports/contents.tpl.c:38
-msgid "Receiver"
-msgstr "Destinatario"
-
-#: addons/faxreports/contents.tpl.c:41 addons/faxreports/detail.tpl.c:38
-msgid "# pages"
-msgstr "# pagine"
-
-#: addons/faxreports/contents.tpl.c:44
-msgid "Search returned no results..."
-msgstr "La ricerca non ha prodotto risultati ..."
-
-#: addons/faxreports/detail.tpl.c:2
-msgid "FAX preview - please wait"
-msgstr "Previsualizzazione del FAX - attendi prego"
-
-#: addons/faxreports/detail.tpl.c:5
-msgid "Click on fax to download"
-msgstr "Premi sul FAX per scaricarlo"
-
-#: addons/faxreports/detail.tpl.c:8
-msgid "FAX ID"
-msgstr "FAX ID"
-
-#: addons/faxreports/detail.tpl.c:14
-msgid "Date / Time"
-msgstr "Data / Ora"
-
-#: addons/faxreports/detail.tpl.c:32
-msgid "Status message"
-msgstr "Stato"
-
-#: personal/faxaccount/generic.tpl.c:2
-#: personal/faxaccount/paste_generic.tpl.c:2
-msgid "Generic"
-msgstr "Informazioni"
-
-#: personal/faxaccount/generic.tpl.c:8
-msgid "Fax number for fax to trigger on"
-msgstr ""
-
-#: personal/faxaccount/generic.tpl.c:14
-msgid "Specify the fax communication language for fax to mail gateway"
-msgstr ""
-
-#: personal/faxaccount/generic.tpl.c:20
-msgid "Specify delivery format for fax to mail gateway"
-msgstr "Indica il formato di recapito dei fax verso la passerella del server mail"
-
-#: personal/faxaccount/generic.tpl.c:23
-msgid "Delivery methods"
-msgstr "Metodi di recapito"
-
-#: personal/faxaccount/generic.tpl.c:26
-msgid "Temporary disable fax usage"
-msgstr "Disabilita temporaneamente l'uso del Fax"
-
-#: personal/faxaccount/generic.tpl.c:29
-msgid "Deliver fax as mail to"
-msgstr "Recapita i fax come delle email verso"
-
-#: personal/faxaccount/generic.tpl.c:38
-msgid "Alternate fax numbers"
-msgstr "Numeri di Fax alternativi"
-
-#: personal/faxaccount/generic.tpl.c:41
-msgid "Add local"
-msgstr "Aggiungi localmente"
-
-#: personal/faxaccount/generic.tpl.c:44
-msgid "Blocklists"
-msgstr "Blocklists"
-
-#: personal/faxaccount/generic.tpl.c:47
-msgid "Blocklists for incoming fax"
-msgstr "Blocklists per i fax in arrivo"
-
-#: personal/faxaccount/generic.tpl.c:50 personal/faxaccount/generic.tpl.c:56
-msgid "Edit"
-msgstr "Modifica"
-
-#: personal/faxaccount/generic.tpl.c:53
-msgid "Blocklists for outgoing fax"
-msgstr "Blocklists per i fax in partenza"
-
-#: personal/faxaccount/lists.tpl.c:2
-msgid "Blocked numbers/lists"
-msgstr "Numeri/liste bloccati"
-
-#: personal/faxaccount/lists.tpl.c:5
-msgid "List of predefined blocklists"
-msgstr "Elenco delle blocklists predefinite"
-
-#: personal/faxaccount/lists.tpl.c:8
-msgid "Add the list to the blocklists"
-msgstr "Aggiungi l'elenco alle blocklists"
-
-#: personal/faxaccount/paste_generic.tpl.c:8
-msgid "Fax number for GOfax to trigger on"
-msgstr "Numero di FAX per il quale GOfax sarÃ  attivato"
-
-#: personal/faxaccount/paste_generic.tpl.c:11
-msgid "Alternate fax numbers will not be copied"
-msgstr "I numeri di Fax alternativi non saranno copiati"
-
-#: personal/faxaccount/locals.tpl.c:2
-msgid "Select numbers to add"
-msgstr "Seleziona i numeri da aggiungere"
-
-#: personal/faxaccount/locals.tpl.c:5
-msgid "Filters"
-msgstr "Filtri"
-
-#: personal/faxaccount/locals.tpl.c:8
-msgid "Display numbers of department"
-msgstr "Mostra i numeri del dipartimento"
-
-#: personal/faxaccount/locals.tpl.c:11
-msgid "Choose the department the search will be based on"
-msgstr "Scegli il dipartimento di base per la ricerca"
-
-#: personal/faxaccount/locals.tpl.c:14
-msgid "Display numbers matching"
-msgstr "Mostra i numeri che corrispondono"
-
-#: personal/faxaccount/locals.tpl.c:17
-msgid "Regular expression for matching numbers"
-msgstr "Espressioni regolare per ricercare i numeri corrispondenti"
-
-#: personal/faxaccount/locals.tpl.c:20
-msgid "Display numbers of user"
-msgstr "Mostra i numeri degli utenti"
-
-#: personal/faxaccount/locals.tpl.c:23
-msgid "User name of which numbers are shown"
-msgstr "Utenti i quali numeri sono visibili"
-
-#: personal/faxaccount/faxNumberSelect/faxNumberSelect-filter.tpl.c:5
-msgid "Name"
-msgstr "Nome"
-
-#: personal/faxaccount/faxNumberSelect/faxNumberSelect-list.tpl.c:2
-msgid "Base"
-msgstr "Base"
diff --git a/fax/locale/lv/fusiondirectory.po b/fax/locale/lv/fusiondirectory.po
index ccee0674a914a67c1d468ff812d049d77fc2adbe..c70be77e09611b3b508f6310b137d0f6551cf8af 100644
--- a/fax/locale/lv/fusiondirectory.po
+++ b/fax/locale/lv/fusiondirectory.po
@@ -5,12 +5,12 @@
 # Translators:
 msgid ""
 msgstr ""
-"Project-Id-Version: FusionDirectory-108\n"
+"Project-Id-Version: FusionDirectory-109\n"
 "Report-Msgid-Bugs-To: documentation@lists.fusiondirectory.org\n"
-"POT-Creation-Date: 2015-03-19 21:45+0100\n"
-"PO-Revision-Date: 2015-02-25 15:46+0000\n"
+"POT-Creation-Date: 2014-12-15 17:47+0100\n"
+"PO-Revision-Date: 2014-12-15 16:55+0000\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>\n"
-"Language-Team: Latvian (http://www.transifex.com/projects/p/FusionDirectory-108/language/lv/)\n"
+"Language-Team: Latvian (http://www.transifex.com/projects/p/FusionDirectory-109/language/lv/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -169,7 +169,6 @@ msgid "Fax ID"
 msgstr ""
 
 #: addons/faxreports/class_faxreport.inc:494
-#: addons/faxreports/contents.tpl.c:29
 msgid "Date"
 msgstr ""
 
@@ -178,23 +177,22 @@ msgid "Time"
 msgstr ""
 
 #: addons/faxreports/class_faxreport.inc:495
-#: addons/faxreports/contents.tpl.c:32 addons/faxreports/detail.tpl.c:29
 msgid "Status"
 msgstr ""
 
-#: addons/faxreports/class_faxreport.inc:496 addons/faxreports/detail.tpl.c:20
+#: addons/faxreports/class_faxreport.inc:496
 msgid "Sender ID"
 msgstr ""
 
-#: addons/faxreports/class_faxreport.inc:497 addons/faxreports/detail.tpl.c:17
+#: addons/faxreports/class_faxreport.inc:497
 msgid "Sender MSN"
 msgstr ""
 
-#: addons/faxreports/class_faxreport.inc:498 addons/faxreports/detail.tpl.c:26
+#: addons/faxreports/class_faxreport.inc:498
 msgid "Receiver ID"
 msgstr ""
 
-#: addons/faxreports/class_faxreport.inc:499 addons/faxreports/detail.tpl.c:23
+#: addons/faxreports/class_faxreport.inc:499
 msgid "Receiver MSN"
 msgstr ""
 
@@ -206,7 +204,7 @@ msgstr ""
 msgid "Status Message"
 msgstr ""
 
-#: addons/faxreports/class_faxreport.inc:502 addons/faxreports/detail.tpl.c:35
+#: addons/faxreports/class_faxreport.inc:502
 msgid "Transfer time"
 msgstr ""
 
@@ -274,8 +272,7 @@ msgstr ""
 
 #: personal/faxaccount/class_gofaxAccount.inc:796
 #: personal/faxaccount/faxNumberSelect/faxNumberSelect-list.xml:56
-#: config/fax/class_faxConfig.inc:42 personal/faxaccount/generic.tpl.c:5
-#: personal/faxaccount/paste_generic.tpl.c:5
+#: config/fax/class_faxConfig.inc:42
 msgid "Fax"
 msgstr ""
 
@@ -284,12 +281,10 @@ msgid "Fax account settings"
 msgstr ""
 
 #: personal/faxaccount/class_gofaxAccount.inc:806
-#: personal/faxaccount/generic.tpl.c:11
 msgid "Language"
 msgstr ""
 
 #: personal/faxaccount/class_gofaxAccount.inc:807
-#: personal/faxaccount/generic.tpl.c:17
 msgid "Delivery format"
 msgstr ""
 
@@ -302,12 +297,10 @@ msgid "Enable/Disable fax"
 msgstr ""
 
 #: personal/faxaccount/class_gofaxAccount.inc:810
-#: personal/faxaccount/generic.tpl.c:32
 msgid "Deliver fax as mail"
 msgstr ""
 
 #: personal/faxaccount/class_gofaxAccount.inc:811
-#: personal/faxaccount/generic.tpl.c:35
 msgid "Deliver fax to printer"
 msgstr ""
 
@@ -324,7 +317,6 @@ msgid "Please select the desired entries"
 msgstr ""
 
 #: personal/faxaccount/faxNumberSelect/faxNumberSelect-list.xml:14
-#: addons/faxreports/contents.tpl.c:26 addons/faxreports/detail.tpl.c:11
 msgid "User"
 msgstr ""
 
@@ -379,181 +371,3 @@ msgstr ""
 #: config/fax/class_faxConfig.inc:45
 msgid "Branch in which fax blocklists will be stored"
 msgstr ""
-
-#: addons/faxreports/contents.tpl.c:2
-#: personal/faxaccount/faxNumberSelect/faxNumberSelect-filter.tpl.c:2
-msgid "Filter"
-msgstr ""
-
-#: addons/faxreports/contents.tpl.c:5
-msgid "Search for"
-msgstr ""
-
-#: addons/faxreports/contents.tpl.c:8
-msgid "Enter user name to search for"
-msgstr ""
-
-#: addons/faxreports/contents.tpl.c:11 addons/faxreports/contents.tpl.c:20
-msgid "in"
-msgstr ""
-
-#: addons/faxreports/contents.tpl.c:14
-msgid "Select subtree to base search on"
-msgstr ""
-
-#: addons/faxreports/contents.tpl.c:17
-msgid "during"
-msgstr ""
-
-#: addons/faxreports/contents.tpl.c:23
-msgid "Search"
-msgstr ""
-
-#: addons/faxreports/contents.tpl.c:35
-msgid "Sender"
-msgstr ""
-
-#: addons/faxreports/contents.tpl.c:38
-msgid "Receiver"
-msgstr ""
-
-#: addons/faxreports/contents.tpl.c:41 addons/faxreports/detail.tpl.c:38
-msgid "# pages"
-msgstr ""
-
-#: addons/faxreports/contents.tpl.c:44
-msgid "Search returned no results..."
-msgstr ""
-
-#: addons/faxreports/detail.tpl.c:2
-msgid "FAX preview - please wait"
-msgstr ""
-
-#: addons/faxreports/detail.tpl.c:5
-msgid "Click on fax to download"
-msgstr ""
-
-#: addons/faxreports/detail.tpl.c:8
-msgid "FAX ID"
-msgstr ""
-
-#: addons/faxreports/detail.tpl.c:14
-msgid "Date / Time"
-msgstr ""
-
-#: addons/faxreports/detail.tpl.c:32
-msgid "Status message"
-msgstr ""
-
-#: personal/faxaccount/generic.tpl.c:2
-#: personal/faxaccount/paste_generic.tpl.c:2
-msgid "Generic"
-msgstr ""
-
-#: personal/faxaccount/generic.tpl.c:8
-msgid "Fax number for fax to trigger on"
-msgstr ""
-
-#: personal/faxaccount/generic.tpl.c:14
-msgid "Specify the fax communication language for fax to mail gateway"
-msgstr ""
-
-#: personal/faxaccount/generic.tpl.c:20
-msgid "Specify delivery format for fax to mail gateway"
-msgstr ""
-
-#: personal/faxaccount/generic.tpl.c:23
-msgid "Delivery methods"
-msgstr ""
-
-#: personal/faxaccount/generic.tpl.c:26
-msgid "Temporary disable fax usage"
-msgstr ""
-
-#: personal/faxaccount/generic.tpl.c:29
-msgid "Deliver fax as mail to"
-msgstr ""
-
-#: personal/faxaccount/generic.tpl.c:38
-msgid "Alternate fax numbers"
-msgstr ""
-
-#: personal/faxaccount/generic.tpl.c:41
-msgid "Add local"
-msgstr ""
-
-#: personal/faxaccount/generic.tpl.c:44
-msgid "Blocklists"
-msgstr ""
-
-#: personal/faxaccount/generic.tpl.c:47
-msgid "Blocklists for incoming fax"
-msgstr ""
-
-#: personal/faxaccount/generic.tpl.c:50 personal/faxaccount/generic.tpl.c:56
-msgid "Edit"
-msgstr ""
-
-#: personal/faxaccount/generic.tpl.c:53
-msgid "Blocklists for outgoing fax"
-msgstr ""
-
-#: personal/faxaccount/lists.tpl.c:2
-msgid "Blocked numbers/lists"
-msgstr ""
-
-#: personal/faxaccount/lists.tpl.c:5
-msgid "List of predefined blocklists"
-msgstr ""
-
-#: personal/faxaccount/lists.tpl.c:8
-msgid "Add the list to the blocklists"
-msgstr ""
-
-#: personal/faxaccount/paste_generic.tpl.c:8
-msgid "Fax number for GOfax to trigger on"
-msgstr ""
-
-#: personal/faxaccount/paste_generic.tpl.c:11
-msgid "Alternate fax numbers will not be copied"
-msgstr ""
-
-#: personal/faxaccount/locals.tpl.c:2
-msgid "Select numbers to add"
-msgstr ""
-
-#: personal/faxaccount/locals.tpl.c:5
-msgid "Filters"
-msgstr ""
-
-#: personal/faxaccount/locals.tpl.c:8
-msgid "Display numbers of department"
-msgstr ""
-
-#: personal/faxaccount/locals.tpl.c:11
-msgid "Choose the department the search will be based on"
-msgstr ""
-
-#: personal/faxaccount/locals.tpl.c:14
-msgid "Display numbers matching"
-msgstr ""
-
-#: personal/faxaccount/locals.tpl.c:17
-msgid "Regular expression for matching numbers"
-msgstr ""
-
-#: personal/faxaccount/locals.tpl.c:20
-msgid "Display numbers of user"
-msgstr ""
-
-#: personal/faxaccount/locals.tpl.c:23
-msgid "User name of which numbers are shown"
-msgstr ""
-
-#: personal/faxaccount/faxNumberSelect/faxNumberSelect-filter.tpl.c:5
-msgid "Name"
-msgstr ""
-
-#: personal/faxaccount/faxNumberSelect/faxNumberSelect-list.tpl.c:2
-msgid "Base"
-msgstr ""
diff --git a/fax/locale/nb/fusiondirectory.po b/fax/locale/nb/fusiondirectory.po
index 3f6a3cd14e7d8a901428e0e83f01aa8f1d0808fb..092212ad0b5edf6a930bc7eda8316967305a3012 100644
--- a/fax/locale/nb/fusiondirectory.po
+++ b/fax/locale/nb/fusiondirectory.po
@@ -5,12 +5,12 @@
 # Translators:
 msgid ""
 msgstr ""
-"Project-Id-Version: FusionDirectory-108\n"
+"Project-Id-Version: FusionDirectory-109\n"
 "Report-Msgid-Bugs-To: documentation@lists.fusiondirectory.org\n"
-"POT-Creation-Date: 2015-03-19 21:45+0100\n"
-"PO-Revision-Date: 2015-02-25 16:12+0000\n"
+"POT-Creation-Date: 2014-12-15 17:47+0100\n"
+"PO-Revision-Date: 2014-12-15 17:22+0000\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>\n"
-"Language-Team: Norwegian BokmÃ¥l (http://www.transifex.com/projects/p/FusionDirectory-108/language/nb/)\n"
+"Language-Team: Norwegian BokmÃ¥l (http://www.transifex.com/projects/p/FusionDirectory-109/language/nb/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -169,7 +169,6 @@ msgid "Fax ID"
 msgstr ""
 
 #: addons/faxreports/class_faxreport.inc:494
-#: addons/faxreports/contents.tpl.c:29
 msgid "Date"
 msgstr ""
 
@@ -178,23 +177,22 @@ msgid "Time"
 msgstr ""
 
 #: addons/faxreports/class_faxreport.inc:495
-#: addons/faxreports/contents.tpl.c:32 addons/faxreports/detail.tpl.c:29
 msgid "Status"
 msgstr ""
 
-#: addons/faxreports/class_faxreport.inc:496 addons/faxreports/detail.tpl.c:20
+#: addons/faxreports/class_faxreport.inc:496
 msgid "Sender ID"
 msgstr ""
 
-#: addons/faxreports/class_faxreport.inc:497 addons/faxreports/detail.tpl.c:17
+#: addons/faxreports/class_faxreport.inc:497
 msgid "Sender MSN"
 msgstr ""
 
-#: addons/faxreports/class_faxreport.inc:498 addons/faxreports/detail.tpl.c:26
+#: addons/faxreports/class_faxreport.inc:498
 msgid "Receiver ID"
 msgstr ""
 
-#: addons/faxreports/class_faxreport.inc:499 addons/faxreports/detail.tpl.c:23
+#: addons/faxreports/class_faxreport.inc:499
 msgid "Receiver MSN"
 msgstr ""
 
@@ -206,7 +204,7 @@ msgstr ""
 msgid "Status Message"
 msgstr ""
 
-#: addons/faxreports/class_faxreport.inc:502 addons/faxreports/detail.tpl.c:35
+#: addons/faxreports/class_faxreport.inc:502
 msgid "Transfer time"
 msgstr ""
 
@@ -274,8 +272,7 @@ msgstr ""
 
 #: personal/faxaccount/class_gofaxAccount.inc:796
 #: personal/faxaccount/faxNumberSelect/faxNumberSelect-list.xml:56
-#: config/fax/class_faxConfig.inc:42 personal/faxaccount/generic.tpl.c:5
-#: personal/faxaccount/paste_generic.tpl.c:5
+#: config/fax/class_faxConfig.inc:42
 msgid "Fax"
 msgstr ""
 
@@ -284,12 +281,10 @@ msgid "Fax account settings"
 msgstr ""
 
 #: personal/faxaccount/class_gofaxAccount.inc:806
-#: personal/faxaccount/generic.tpl.c:11
 msgid "Language"
 msgstr ""
 
 #: personal/faxaccount/class_gofaxAccount.inc:807
-#: personal/faxaccount/generic.tpl.c:17
 msgid "Delivery format"
 msgstr ""
 
@@ -302,12 +297,10 @@ msgid "Enable/Disable fax"
 msgstr ""
 
 #: personal/faxaccount/class_gofaxAccount.inc:810
-#: personal/faxaccount/generic.tpl.c:32
 msgid "Deliver fax as mail"
 msgstr ""
 
 #: personal/faxaccount/class_gofaxAccount.inc:811
-#: personal/faxaccount/generic.tpl.c:35
 msgid "Deliver fax to printer"
 msgstr ""
 
@@ -324,7 +317,6 @@ msgid "Please select the desired entries"
 msgstr ""
 
 #: personal/faxaccount/faxNumberSelect/faxNumberSelect-list.xml:14
-#: addons/faxreports/contents.tpl.c:26 addons/faxreports/detail.tpl.c:11
 msgid "User"
 msgstr "Bruker"
 
@@ -379,181 +371,3 @@ msgstr ""
 #: config/fax/class_faxConfig.inc:45
 msgid "Branch in which fax blocklists will be stored"
 msgstr ""
-
-#: addons/faxreports/contents.tpl.c:2
-#: personal/faxaccount/faxNumberSelect/faxNumberSelect-filter.tpl.c:2
-msgid "Filter"
-msgstr "Filter"
-
-#: addons/faxreports/contents.tpl.c:5
-msgid "Search for"
-msgstr ""
-
-#: addons/faxreports/contents.tpl.c:8
-msgid "Enter user name to search for"
-msgstr ""
-
-#: addons/faxreports/contents.tpl.c:11 addons/faxreports/contents.tpl.c:20
-msgid "in"
-msgstr ""
-
-#: addons/faxreports/contents.tpl.c:14
-msgid "Select subtree to base search on"
-msgstr ""
-
-#: addons/faxreports/contents.tpl.c:17
-msgid "during"
-msgstr ""
-
-#: addons/faxreports/contents.tpl.c:23
-msgid "Search"
-msgstr ""
-
-#: addons/faxreports/contents.tpl.c:35
-msgid "Sender"
-msgstr ""
-
-#: addons/faxreports/contents.tpl.c:38
-msgid "Receiver"
-msgstr ""
-
-#: addons/faxreports/contents.tpl.c:41 addons/faxreports/detail.tpl.c:38
-msgid "# pages"
-msgstr ""
-
-#: addons/faxreports/contents.tpl.c:44
-msgid "Search returned no results..."
-msgstr ""
-
-#: addons/faxreports/detail.tpl.c:2
-msgid "FAX preview - please wait"
-msgstr ""
-
-#: addons/faxreports/detail.tpl.c:5
-msgid "Click on fax to download"
-msgstr ""
-
-#: addons/faxreports/detail.tpl.c:8
-msgid "FAX ID"
-msgstr ""
-
-#: addons/faxreports/detail.tpl.c:14
-msgid "Date / Time"
-msgstr ""
-
-#: addons/faxreports/detail.tpl.c:32
-msgid "Status message"
-msgstr ""
-
-#: personal/faxaccount/generic.tpl.c:2
-#: personal/faxaccount/paste_generic.tpl.c:2
-msgid "Generic"
-msgstr "Generisk"
-
-#: personal/faxaccount/generic.tpl.c:8
-msgid "Fax number for fax to trigger on"
-msgstr ""
-
-#: personal/faxaccount/generic.tpl.c:14
-msgid "Specify the fax communication language for fax to mail gateway"
-msgstr ""
-
-#: personal/faxaccount/generic.tpl.c:20
-msgid "Specify delivery format for fax to mail gateway"
-msgstr ""
-
-#: personal/faxaccount/generic.tpl.c:23
-msgid "Delivery methods"
-msgstr ""
-
-#: personal/faxaccount/generic.tpl.c:26
-msgid "Temporary disable fax usage"
-msgstr ""
-
-#: personal/faxaccount/generic.tpl.c:29
-msgid "Deliver fax as mail to"
-msgstr ""
-
-#: personal/faxaccount/generic.tpl.c:38
-msgid "Alternate fax numbers"
-msgstr ""
-
-#: personal/faxaccount/generic.tpl.c:41
-msgid "Add local"
-msgstr ""
-
-#: personal/faxaccount/generic.tpl.c:44
-msgid "Blocklists"
-msgstr ""
-
-#: personal/faxaccount/generic.tpl.c:47
-msgid "Blocklists for incoming fax"
-msgstr ""
-
-#: personal/faxaccount/generic.tpl.c:50 personal/faxaccount/generic.tpl.c:56
-msgid "Edit"
-msgstr "Endre"
-
-#: personal/faxaccount/generic.tpl.c:53
-msgid "Blocklists for outgoing fax"
-msgstr ""
-
-#: personal/faxaccount/lists.tpl.c:2
-msgid "Blocked numbers/lists"
-msgstr ""
-
-#: personal/faxaccount/lists.tpl.c:5
-msgid "List of predefined blocklists"
-msgstr ""
-
-#: personal/faxaccount/lists.tpl.c:8
-msgid "Add the list to the blocklists"
-msgstr ""
-
-#: personal/faxaccount/paste_generic.tpl.c:8
-msgid "Fax number for GOfax to trigger on"
-msgstr ""
-
-#: personal/faxaccount/paste_generic.tpl.c:11
-msgid "Alternate fax numbers will not be copied"
-msgstr ""
-
-#: personal/faxaccount/locals.tpl.c:2
-msgid "Select numbers to add"
-msgstr ""
-
-#: personal/faxaccount/locals.tpl.c:5
-msgid "Filters"
-msgstr "Filter"
-
-#: personal/faxaccount/locals.tpl.c:8
-msgid "Display numbers of department"
-msgstr ""
-
-#: personal/faxaccount/locals.tpl.c:11
-msgid "Choose the department the search will be based on"
-msgstr ""
-
-#: personal/faxaccount/locals.tpl.c:14
-msgid "Display numbers matching"
-msgstr ""
-
-#: personal/faxaccount/locals.tpl.c:17
-msgid "Regular expression for matching numbers"
-msgstr ""
-
-#: personal/faxaccount/locals.tpl.c:20
-msgid "Display numbers of user"
-msgstr ""
-
-#: personal/faxaccount/locals.tpl.c:23
-msgid "User name of which numbers are shown"
-msgstr ""
-
-#: personal/faxaccount/faxNumberSelect/faxNumberSelect-filter.tpl.c:5
-msgid "Name"
-msgstr "Navn"
-
-#: personal/faxaccount/faxNumberSelect/faxNumberSelect-list.tpl.c:2
-msgid "Base"
-msgstr ""
diff --git a/fax/locale/nl/fusiondirectory.po b/fax/locale/nl/fusiondirectory.po
index 9ac86398aaa8dd0f9aeb74f3b428787d253598fc..6395e3f4e67bf83c7db00a086a5295e401927c68 100644
--- a/fax/locale/nl/fusiondirectory.po
+++ b/fax/locale/nl/fusiondirectory.po
@@ -3,18 +3,14 @@
 # This file is distributed under the same license as the PACKAGE package.
 # 
 # Translators:
-# Christophe Augello <christophe@augello.be>, 2012
-# Kenny Tordeurs <tordeurskenny@gmail.com>, 2012-2013
-#  Niels Klomp (CareWorks ICT Services) <nk@careworks.nl>, 2005
-# Kenny Tordeurs <tordeurskenny@gmail.com>, 2012
 msgid ""
 msgstr ""
-"Project-Id-Version: FusionDirectory-108\n"
+"Project-Id-Version: FusionDirectory-109\n"
 "Report-Msgid-Bugs-To: documentation@lists.fusiondirectory.org\n"
-"POT-Creation-Date: 2015-03-19 21:45+0100\n"
-"PO-Revision-Date: 2015-02-25 16:12+0000\n"
+"POT-Creation-Date: 2014-12-15 17:47+0100\n"
+"PO-Revision-Date: 2015-02-25 16:13+0000\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>\n"
-"Language-Team: Dutch (http://www.transifex.com/projects/p/FusionDirectory-108/language/nl/)\n"
+"Language-Team: Dutch (http://www.transifex.com/projects/p/FusionDirectory-109/language/nl/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -123,13 +119,13 @@ msgstr "Geen fax server gevonden!"
 #: addons/faxreports/class_faxreport.inc:139
 #, php-format
 msgid "Cannot connect to %s database!"
-msgstr "Kan niet connecteren met %s databank!"
+msgstr "Kan niet connecteren naar %s databank!"
 
 #: addons/faxreports/class_faxreport.inc:159
 #: addons/faxreports/class_faxreport.inc:300
 #, php-format
 msgid "Cannot query %s database!"
-msgstr "Kan geen query maken naar %s databank!"
+msgstr "Kan geen query doen op %s databank!"
 
 #: addons/faxreports/class_faxreport.inc:168
 #: addons/faxreports/class_faxreport.inc:178
@@ -162,7 +158,7 @@ msgstr "Fax rapporten"
 
 #: addons/faxreports/class_faxreport.inc:483
 msgid "All entries are readonly"
-msgstr "Alle inzendingen zijn alleen-lezen"
+msgstr "Alle inzendingen zijn lees-enkel"
 
 #: addons/faxreports/class_faxreport.inc:492
 msgid "Detailed view"
@@ -173,7 +169,6 @@ msgid "Fax ID"
 msgstr "Fax ID"
 
 #: addons/faxreports/class_faxreport.inc:494
-#: addons/faxreports/contents.tpl.c:29
 msgid "Date"
 msgstr "Datum"
 
@@ -182,23 +177,22 @@ msgid "Time"
 msgstr "Tijd"
 
 #: addons/faxreports/class_faxreport.inc:495
-#: addons/faxreports/contents.tpl.c:32 addons/faxreports/detail.tpl.c:29
 msgid "Status"
 msgstr "Status"
 
-#: addons/faxreports/class_faxreport.inc:496 addons/faxreports/detail.tpl.c:20
+#: addons/faxreports/class_faxreport.inc:496
 msgid "Sender ID"
 msgstr "Afzender ID"
 
-#: addons/faxreports/class_faxreport.inc:497 addons/faxreports/detail.tpl.c:17
+#: addons/faxreports/class_faxreport.inc:497
 msgid "Sender MSN"
 msgstr "Afzender MSN"
 
-#: addons/faxreports/class_faxreport.inc:498 addons/faxreports/detail.tpl.c:26
+#: addons/faxreports/class_faxreport.inc:498
 msgid "Receiver ID"
 msgstr "Ontvanger ID"
 
-#: addons/faxreports/class_faxreport.inc:499 addons/faxreports/detail.tpl.c:23
+#: addons/faxreports/class_faxreport.inc:499
 msgid "Receiver MSN"
 msgstr "Ontvanger MSN"
 
@@ -210,7 +204,7 @@ msgstr "Pagina nummers"
 msgid "Status Message"
 msgstr "Status Bericht"
 
-#: addons/faxreports/class_faxreport.inc:502 addons/faxreports/detail.tpl.c:35
+#: addons/faxreports/class_faxreport.inc:502
 msgid "Transfer time"
 msgstr "Overdrachtstijd"
 
@@ -258,7 +252,7 @@ msgstr "LDAP fout"
 #: personal/faxaccount/class_gofaxAccount.inc:631
 #: personal/faxaccount/class_gofaxAccount.inc:805
 msgid "Fax number"
-msgstr "FAX nummer"
+msgstr "Fax nummer"
 
 #: personal/faxaccount/class_gofaxAccount.inc:638
 msgid "Mail delivery is requested without target address!"
@@ -278,8 +272,7 @@ msgstr "Printen is gevraagd zonder doelprinter"
 
 #: personal/faxaccount/class_gofaxAccount.inc:796
 #: personal/faxaccount/faxNumberSelect/faxNumberSelect-list.xml:56
-#: config/fax/class_faxConfig.inc:42 personal/faxaccount/generic.tpl.c:5
-#: personal/faxaccount/paste_generic.tpl.c:5
+#: config/fax/class_faxConfig.inc:42
 msgid "Fax"
 msgstr "Fax"
 
@@ -288,12 +281,10 @@ msgid "Fax account settings"
 msgstr "Fax account opties"
 
 #: personal/faxaccount/class_gofaxAccount.inc:806
-#: personal/faxaccount/generic.tpl.c:11
 msgid "Language"
 msgstr "Taal"
 
 #: personal/faxaccount/class_gofaxAccount.inc:807
-#: personal/faxaccount/generic.tpl.c:17
 msgid "Delivery format"
 msgstr "Aflever formaat"
 
@@ -306,12 +297,10 @@ msgid "Enable/Disable fax"
 msgstr "Inschakelen/Uitschakelen fax"
 
 #: personal/faxaccount/class_gofaxAccount.inc:810
-#: personal/faxaccount/generic.tpl.c:32
 msgid "Deliver fax as mail"
 msgstr "Lever Fax als E-mail af"
 
 #: personal/faxaccount/class_gofaxAccount.inc:811
-#: personal/faxaccount/generic.tpl.c:35
 msgid "Deliver fax to printer"
 msgstr "Lever Fax af op printer"
 
@@ -325,16 +314,15 @@ msgstr "Zend blokkeerlijst"
 
 #: personal/faxaccount/faxNumberSelect/faxNumberSelect-list.xml:10
 msgid "Please select the desired entries"
-msgstr "Selecteer aub de gewenste inzendingen"
+msgstr "Gelieve de gegevens te selecteren"
 
 #: personal/faxaccount/faxNumberSelect/faxNumberSelect-list.xml:14
-#: addons/faxreports/contents.tpl.c:26 addons/faxreports/detail.tpl.c:11
 msgid "User"
 msgstr "Gebruiker"
 
 #: personal/faxaccount/faxNumberSelect/faxNumberSelect-list.xml:40
 msgid "Given name"
-msgstr "Naam"
+msgstr "Voornaam"
 
 #: personal/faxaccount/faxNumberSelect/faxNumberSelect-list.xml:48
 msgid "Surname"
@@ -383,181 +371,3 @@ msgstr ""
 #: config/fax/class_faxConfig.inc:45
 msgid "Branch in which fax blocklists will be stored"
 msgstr ""
-
-#: addons/faxreports/contents.tpl.c:2
-#: personal/faxaccount/faxNumberSelect/faxNumberSelect-filter.tpl.c:2
-msgid "Filter"
-msgstr "Filter"
-
-#: addons/faxreports/contents.tpl.c:5
-msgid "Search for"
-msgstr "Zoek naar"
-
-#: addons/faxreports/contents.tpl.c:8
-msgid "Enter user name to search for"
-msgstr "Voer de te zoeken gebruikersnaam in"
-
-#: addons/faxreports/contents.tpl.c:11 addons/faxreports/contents.tpl.c:20
-msgid "in"
-msgstr "in"
-
-#: addons/faxreports/contents.tpl.c:14
-msgid "Select subtree to base search on"
-msgstr "Selecteer de subtree waarbinnen de zoekopdracht plaatsvindt"
-
-#: addons/faxreports/contents.tpl.c:17
-msgid "during"
-msgstr "gedurende"
-
-#: addons/faxreports/contents.tpl.c:23
-msgid "Search"
-msgstr "Zoeken"
-
-#: addons/faxreports/contents.tpl.c:35
-msgid "Sender"
-msgstr "Afzender"
-
-#: addons/faxreports/contents.tpl.c:38
-msgid "Receiver"
-msgstr "Ontvanger"
-
-#: addons/faxreports/contents.tpl.c:41 addons/faxreports/detail.tpl.c:38
-msgid "# pages"
-msgstr "# pagina's"
-
-#: addons/faxreports/contents.tpl.c:44
-msgid "Search returned no results..."
-msgstr "De zoekopdracht gaf geen resultaten terug..."
-
-#: addons/faxreports/detail.tpl.c:2
-msgid "FAX preview - please wait"
-msgstr "Fax voorbeeld - even geduld a.u.b."
-
-#: addons/faxreports/detail.tpl.c:5
-msgid "Click on fax to download"
-msgstr "Klik op de Fax om deze te downloaden"
-
-#: addons/faxreports/detail.tpl.c:8
-msgid "FAX ID"
-msgstr "Fax ID"
-
-#: addons/faxreports/detail.tpl.c:14
-msgid "Date / Time"
-msgstr "Datum / Tijd"
-
-#: addons/faxreports/detail.tpl.c:32
-msgid "Status message"
-msgstr "Status bericht"
-
-#: personal/faxaccount/generic.tpl.c:2
-#: personal/faxaccount/paste_generic.tpl.c:2
-msgid "Generic"
-msgstr "Algemeen"
-
-#: personal/faxaccount/generic.tpl.c:8
-msgid "Fax number for fax to trigger on"
-msgstr ""
-
-#: personal/faxaccount/generic.tpl.c:14
-msgid "Specify the fax communication language for fax to mail gateway"
-msgstr ""
-
-#: personal/faxaccount/generic.tpl.c:20
-msgid "Specify delivery format for fax to mail gateway"
-msgstr "Specificeer het aflever formaat voor de Fax naar E-mail gateway"
-
-#: personal/faxaccount/generic.tpl.c:23
-msgid "Delivery methods"
-msgstr "Aflever methodes"
-
-#: personal/faxaccount/generic.tpl.c:26
-msgid "Temporary disable fax usage"
-msgstr "Schakel Fax gebruik tijdelijk uit"
-
-#: personal/faxaccount/generic.tpl.c:29
-msgid "Deliver fax as mail to"
-msgstr "Lever Fax als E-mail af aan"
-
-#: personal/faxaccount/generic.tpl.c:38
-msgid "Alternate fax numbers"
-msgstr "Alternatieve Fax nummers"
-
-#: personal/faxaccount/generic.tpl.c:41
-msgid "Add local"
-msgstr "Lokaal toevoegen"
-
-#: personal/faxaccount/generic.tpl.c:44
-msgid "Blocklists"
-msgstr "Blokkeerlijsten"
-
-#: personal/faxaccount/generic.tpl.c:47
-msgid "Blocklists for incoming fax"
-msgstr "Blokkeerlijsten voor te ontvangen Faxen"
-
-#: personal/faxaccount/generic.tpl.c:50 personal/faxaccount/generic.tpl.c:56
-msgid "Edit"
-msgstr "Bewerken"
-
-#: personal/faxaccount/generic.tpl.c:53
-msgid "Blocklists for outgoing fax"
-msgstr "Blokkeerlijsten voor te versturen Faxen"
-
-#: personal/faxaccount/lists.tpl.c:2
-msgid "Blocked numbers/lists"
-msgstr "Geblokkeerde nummers/lijsten"
-
-#: personal/faxaccount/lists.tpl.c:5
-msgid "List of predefined blocklists"
-msgstr "Lijst met voorgedefiniÃ«erde blokkeerlijstn"
-
-#: personal/faxaccount/lists.tpl.c:8
-msgid "Add the list to the blocklists"
-msgstr "Voeg de lijst toe aan de blokkeerlijsten"
-
-#: personal/faxaccount/paste_generic.tpl.c:8
-msgid "Fax number for GOfax to trigger on"
-msgstr "Fax nummer waarop GOfax moet reageren"
-
-#: personal/faxaccount/paste_generic.tpl.c:11
-msgid "Alternate fax numbers will not be copied"
-msgstr "Alternative fax nummers worden niet gekopieerd"
-
-#: personal/faxaccount/locals.tpl.c:2
-msgid "Select numbers to add"
-msgstr "Selecteer de toe te voegen nummers"
-
-#: personal/faxaccount/locals.tpl.c:5
-msgid "Filters"
-msgstr "Filters"
-
-#: personal/faxaccount/locals.tpl.c:8
-msgid "Display numbers of department"
-msgstr "Toon nummers van afdeling"
-
-#: personal/faxaccount/locals.tpl.c:11
-msgid "Choose the department the search will be based on"
-msgstr "Selecteer de afdeling waarbinnen gezocht zal worden"
-
-#: personal/faxaccount/locals.tpl.c:14
-msgid "Display numbers matching"
-msgstr "Toon de overeenkomende nummers"
-
-#: personal/faxaccount/locals.tpl.c:17
-msgid "Regular expression for matching numbers"
-msgstr "Reguliere expressie voor overeenkomende nummers"
-
-#: personal/faxaccount/locals.tpl.c:20
-msgid "Display numbers of user"
-msgstr "Toon nummers van gebruiker"
-
-#: personal/faxaccount/locals.tpl.c:23
-msgid "User name of which numbers are shown"
-msgstr "Gebruikersnaam van de gebruiker wiens nummers getoond worden"
-
-#: personal/faxaccount/faxNumberSelect/faxNumberSelect-filter.tpl.c:5
-msgid "Name"
-msgstr "Naam"
-
-#: personal/faxaccount/faxNumberSelect/faxNumberSelect-list.tpl.c:2
-msgid "Base"
-msgstr "Basis"
diff --git a/fax/locale/pl/fusiondirectory.po b/fax/locale/pl/fusiondirectory.po
index e11860a4b354355df7a7ca6c9d965a94519886a3..60d6475c19db665c00c21f09f799fde93e92998e 100644
--- a/fax/locale/pl/fusiondirectory.po
+++ b/fax/locale/pl/fusiondirectory.po
@@ -5,12 +5,12 @@
 # Translators:
 msgid ""
 msgstr ""
-"Project-Id-Version: FusionDirectory-108\n"
+"Project-Id-Version: FusionDirectory-109\n"
 "Report-Msgid-Bugs-To: documentation@lists.fusiondirectory.org\n"
-"POT-Creation-Date: 2015-03-19 21:45+0100\n"
-"PO-Revision-Date: 2015-02-25 16:12+0000\n"
+"POT-Creation-Date: 2014-12-15 17:47+0100\n"
+"PO-Revision-Date: 2015-02-25 16:13+0000\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>\n"
-"Language-Team: Polish (http://www.transifex.com/projects/p/FusionDirectory-108/language/pl/)\n"
+"Language-Team: Polish (http://www.transifex.com/projects/p/FusionDirectory-109/language/pl/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -169,7 +169,6 @@ msgid "Fax ID"
 msgstr ""
 
 #: addons/faxreports/class_faxreport.inc:494
-#: addons/faxreports/contents.tpl.c:29
 msgid "Date"
 msgstr "Data"
 
@@ -178,23 +177,22 @@ msgid "Time"
 msgstr ""
 
 #: addons/faxreports/class_faxreport.inc:495
-#: addons/faxreports/contents.tpl.c:32 addons/faxreports/detail.tpl.c:29
 msgid "Status"
 msgstr "Status"
 
-#: addons/faxreports/class_faxreport.inc:496 addons/faxreports/detail.tpl.c:20
+#: addons/faxreports/class_faxreport.inc:496
 msgid "Sender ID"
 msgstr "ID nadawcy"
 
-#: addons/faxreports/class_faxreport.inc:497 addons/faxreports/detail.tpl.c:17
+#: addons/faxreports/class_faxreport.inc:497
 msgid "Sender MSN"
 msgstr "MSN nadawcy"
 
-#: addons/faxreports/class_faxreport.inc:498 addons/faxreports/detail.tpl.c:26
+#: addons/faxreports/class_faxreport.inc:498
 msgid "Receiver ID"
 msgstr "ID odbiorcy"
 
-#: addons/faxreports/class_faxreport.inc:499 addons/faxreports/detail.tpl.c:23
+#: addons/faxreports/class_faxreport.inc:499
 msgid "Receiver MSN"
 msgstr "MSN odbiorcy"
 
@@ -206,7 +204,7 @@ msgstr ""
 msgid "Status Message"
 msgstr ""
 
-#: addons/faxreports/class_faxreport.inc:502 addons/faxreports/detail.tpl.c:35
+#: addons/faxreports/class_faxreport.inc:502
 msgid "Transfer time"
 msgstr "Czas transferu"
 
@@ -274,8 +272,7 @@ msgstr ""
 
 #: personal/faxaccount/class_gofaxAccount.inc:796
 #: personal/faxaccount/faxNumberSelect/faxNumberSelect-list.xml:56
-#: config/fax/class_faxConfig.inc:42 personal/faxaccount/generic.tpl.c:5
-#: personal/faxaccount/paste_generic.tpl.c:5
+#: config/fax/class_faxConfig.inc:42
 msgid "Fax"
 msgstr "Fax"
 
@@ -284,12 +281,10 @@ msgid "Fax account settings"
 msgstr "Ustawienia konta fax"
 
 #: personal/faxaccount/class_gofaxAccount.inc:806
-#: personal/faxaccount/generic.tpl.c:11
 msgid "Language"
 msgstr "JÄ™zyk"
 
 #: personal/faxaccount/class_gofaxAccount.inc:807
-#: personal/faxaccount/generic.tpl.c:17
 msgid "Delivery format"
 msgstr "Format dostarczania"
 
@@ -302,12 +297,10 @@ msgid "Enable/Disable fax"
 msgstr "WÅ‚Ä…cz/WyÅ‚Ä…cz fax"
 
 #: personal/faxaccount/class_gofaxAccount.inc:810
-#: personal/faxaccount/generic.tpl.c:32
 msgid "Deliver fax as mail"
 msgstr "Dostarcz fax jako pocztÄ™"
 
 #: personal/faxaccount/class_gofaxAccount.inc:811
-#: personal/faxaccount/generic.tpl.c:35
 msgid "Deliver fax to printer"
 msgstr "Dostarcz fax na drukarkÄ™"
 
@@ -324,7 +317,6 @@ msgid "Please select the desired entries"
 msgstr ""
 
 #: personal/faxaccount/faxNumberSelect/faxNumberSelect-list.xml:14
-#: addons/faxreports/contents.tpl.c:26 addons/faxreports/detail.tpl.c:11
 msgid "User"
 msgstr "UÅ¼ytkownik"
 
@@ -379,181 +371,3 @@ msgstr ""
 #: config/fax/class_faxConfig.inc:45
 msgid "Branch in which fax blocklists will be stored"
 msgstr ""
-
-#: addons/faxreports/contents.tpl.c:2
-#: personal/faxaccount/faxNumberSelect/faxNumberSelect-filter.tpl.c:2
-msgid "Filter"
-msgstr "Filtr"
-
-#: addons/faxreports/contents.tpl.c:5
-msgid "Search for"
-msgstr "Szukaj dla"
-
-#: addons/faxreports/contents.tpl.c:8
-msgid "Enter user name to search for"
-msgstr "WprowadÅº poszukiwanÄ… nazwÄ™ uÅ¼ytkownika"
-
-#: addons/faxreports/contents.tpl.c:11 addons/faxreports/contents.tpl.c:20
-msgid "in"
-msgstr "w"
-
-#: addons/faxreports/contents.tpl.c:14
-msgid "Select subtree to base search on"
-msgstr "Wybierz poddrzewo od ktÃ³rego zaczÄ…Ä‡ szukanie"
-
-#: addons/faxreports/contents.tpl.c:17
-msgid "during"
-msgstr "podczas"
-
-#: addons/faxreports/contents.tpl.c:23
-msgid "Search"
-msgstr "Szukaj"
-
-#: addons/faxreports/contents.tpl.c:35
-msgid "Sender"
-msgstr "Nadawca"
-
-#: addons/faxreports/contents.tpl.c:38
-msgid "Receiver"
-msgstr "Odbiorca"
-
-#: addons/faxreports/contents.tpl.c:41 addons/faxreports/detail.tpl.c:38
-msgid "# pages"
-msgstr "# stron"
-
-#: addons/faxreports/contents.tpl.c:44
-msgid "Search returned no results..."
-msgstr "Wyszukiwanie nie zwrÃ³ciÅ‚o Å¼adnych wynikÃ³w..."
-
-#: addons/faxreports/detail.tpl.c:2
-msgid "FAX preview - please wait"
-msgstr "PodglÄ…d FAXu - proszÄ™ poczekaÄ‡"
-
-#: addons/faxreports/detail.tpl.c:5
-msgid "Click on fax to download"
-msgstr "Kliknij na fax aby pobraÄ‡"
-
-#: addons/faxreports/detail.tpl.c:8
-msgid "FAX ID"
-msgstr "FAX ID"
-
-#: addons/faxreports/detail.tpl.c:14
-msgid "Date / Time"
-msgstr "Data/Czas"
-
-#: addons/faxreports/detail.tpl.c:32
-msgid "Status message"
-msgstr "Informacja o statusie"
-
-#: personal/faxaccount/generic.tpl.c:2
-#: personal/faxaccount/paste_generic.tpl.c:2
-msgid "Generic"
-msgstr "OgÃ³lne"
-
-#: personal/faxaccount/generic.tpl.c:8
-msgid "Fax number for fax to trigger on"
-msgstr ""
-
-#: personal/faxaccount/generic.tpl.c:14
-msgid "Specify the fax communication language for fax to mail gateway"
-msgstr ""
-
-#: personal/faxaccount/generic.tpl.c:20
-msgid "Specify delivery format for fax to mail gateway"
-msgstr "Podaj format dostarczania dla bramki fax-mail"
-
-#: personal/faxaccount/generic.tpl.c:23
-msgid "Delivery methods"
-msgstr "Metody dostarczania"
-
-#: personal/faxaccount/generic.tpl.c:26
-msgid "Temporary disable fax usage"
-msgstr "Tymczasowo zablokuj uÅ¼ywanie faxu"
-
-#: personal/faxaccount/generic.tpl.c:29
-msgid "Deliver fax as mail to"
-msgstr "Dostarcz fax jako pocztÄ™ do"
-
-#: personal/faxaccount/generic.tpl.c:38
-msgid "Alternate fax numbers"
-msgstr "Alternatywne numery faxu"
-
-#: personal/faxaccount/generic.tpl.c:41
-msgid "Add local"
-msgstr "Dodaj lokalne"
-
-#: personal/faxaccount/generic.tpl.c:44
-msgid "Blocklists"
-msgstr "Bloklisty"
-
-#: personal/faxaccount/generic.tpl.c:47
-msgid "Blocklists for incoming fax"
-msgstr "Bloklisty dla nadchodzÄ…cych faxÃ³w"
-
-#: personal/faxaccount/generic.tpl.c:50 personal/faxaccount/generic.tpl.c:56
-msgid "Edit"
-msgstr "Edytuj"
-
-#: personal/faxaccount/generic.tpl.c:53
-msgid "Blocklists for outgoing fax"
-msgstr "Bloklisty dla wychodzÄ…cych faxÃ³w"
-
-#: personal/faxaccount/lists.tpl.c:2
-msgid "Blocked numbers/lists"
-msgstr "Zablokowane numery/listy"
-
-#: personal/faxaccount/lists.tpl.c:5
-msgid "List of predefined blocklists"
-msgstr "Lista predefiniowanych bloklist"
-
-#: personal/faxaccount/lists.tpl.c:8
-msgid "Add the list to the blocklists"
-msgstr "Dodaj listÄ™ do bloklisty"
-
-#: personal/faxaccount/paste_generic.tpl.c:8
-msgid "Fax number for GOfax to trigger on"
-msgstr "Numer faxu dla GOfax dla przeÅ‚Ä…czenia"
-
-#: personal/faxaccount/paste_generic.tpl.c:11
-msgid "Alternate fax numbers will not be copied"
-msgstr ""
-
-#: personal/faxaccount/locals.tpl.c:2
-msgid "Select numbers to add"
-msgstr "Wybierz numery do dodania"
-
-#: personal/faxaccount/locals.tpl.c:5
-msgid "Filters"
-msgstr "Filtry"
-
-#: personal/faxaccount/locals.tpl.c:8
-msgid "Display numbers of department"
-msgstr "WyÅ›wietl numery departamentu"
-
-#: personal/faxaccount/locals.tpl.c:11
-msgid "Choose the department the search will be based on"
-msgstr "Wybierz departament na ktÃ³rym wyszukiwanie bÄ™dzie bazowaÄ‡"
-
-#: personal/faxaccount/locals.tpl.c:14
-msgid "Display numbers matching"
-msgstr "WyÅ›wietl numery pasujÄ…ce"
-
-#: personal/faxaccount/locals.tpl.c:17
-msgid "Regular expression for matching numbers"
-msgstr "WyraÅ¼enie regularne dla dopasowania numerÃ³w"
-
-#: personal/faxaccount/locals.tpl.c:20
-msgid "Display numbers of user"
-msgstr "WyÅ›wietl numery uÅ¼ytkownika"
-
-#: personal/faxaccount/locals.tpl.c:23
-msgid "User name of which numbers are shown"
-msgstr "Nazwa uÅ¼ytkownika ktÃ³rego numery sÄ… pokazane"
-
-#: personal/faxaccount/faxNumberSelect/faxNumberSelect-filter.tpl.c:5
-msgid "Name"
-msgstr "ImiÄ™"
-
-#: personal/faxaccount/faxNumberSelect/faxNumberSelect-list.tpl.c:2
-msgid "Base"
-msgstr "Kontener"
diff --git a/fax/locale/pt/fusiondirectory.po b/fax/locale/pt/fusiondirectory.po
index 7f50e9b3d7b80312eda966100a8879b97c43f6bd..9320155d7d0137cce5e0c3604bae7cd7ace149ed 100644
--- a/fax/locale/pt/fusiondirectory.po
+++ b/fax/locale/pt/fusiondirectory.po
@@ -5,12 +5,12 @@
 # Translators:
 msgid ""
 msgstr ""
-"Project-Id-Version: FusionDirectory-108\n"
+"Project-Id-Version: FusionDirectory-109\n"
 "Report-Msgid-Bugs-To: documentation@lists.fusiondirectory.org\n"
-"POT-Creation-Date: 2015-03-19 21:45+0100\n"
-"PO-Revision-Date: 2015-02-25 16:12+0000\n"
+"POT-Creation-Date: 2014-12-15 17:47+0100\n"
+"PO-Revision-Date: 2015-02-25 16:04+0000\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>\n"
-"Language-Team: Portuguese (http://www.transifex.com/projects/p/FusionDirectory-108/language/pt/)\n"
+"Language-Team: Portuguese (http://www.transifex.com/projects/p/FusionDirectory-109/language/pt/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -169,7 +169,6 @@ msgid "Fax ID"
 msgstr ""
 
 #: addons/faxreports/class_faxreport.inc:494
-#: addons/faxreports/contents.tpl.c:29
 msgid "Date"
 msgstr ""
 
@@ -178,23 +177,22 @@ msgid "Time"
 msgstr ""
 
 #: addons/faxreports/class_faxreport.inc:495
-#: addons/faxreports/contents.tpl.c:32 addons/faxreports/detail.tpl.c:29
 msgid "Status"
 msgstr "Estatus"
 
-#: addons/faxreports/class_faxreport.inc:496 addons/faxreports/detail.tpl.c:20
+#: addons/faxreports/class_faxreport.inc:496
 msgid "Sender ID"
 msgstr ""
 
-#: addons/faxreports/class_faxreport.inc:497 addons/faxreports/detail.tpl.c:17
+#: addons/faxreports/class_faxreport.inc:497
 msgid "Sender MSN"
 msgstr ""
 
-#: addons/faxreports/class_faxreport.inc:498 addons/faxreports/detail.tpl.c:26
+#: addons/faxreports/class_faxreport.inc:498
 msgid "Receiver ID"
 msgstr ""
 
-#: addons/faxreports/class_faxreport.inc:499 addons/faxreports/detail.tpl.c:23
+#: addons/faxreports/class_faxreport.inc:499
 msgid "Receiver MSN"
 msgstr ""
 
@@ -206,7 +204,7 @@ msgstr ""
 msgid "Status Message"
 msgstr ""
 
-#: addons/faxreports/class_faxreport.inc:502 addons/faxreports/detail.tpl.c:35
+#: addons/faxreports/class_faxreport.inc:502
 msgid "Transfer time"
 msgstr ""
 
@@ -274,8 +272,7 @@ msgstr ""
 
 #: personal/faxaccount/class_gofaxAccount.inc:796
 #: personal/faxaccount/faxNumberSelect/faxNumberSelect-list.xml:56
-#: config/fax/class_faxConfig.inc:42 personal/faxaccount/generic.tpl.c:5
-#: personal/faxaccount/paste_generic.tpl.c:5
+#: config/fax/class_faxConfig.inc:42
 msgid "Fax"
 msgstr "Fax"
 
@@ -284,12 +281,10 @@ msgid "Fax account settings"
 msgstr ""
 
 #: personal/faxaccount/class_gofaxAccount.inc:806
-#: personal/faxaccount/generic.tpl.c:11
 msgid "Language"
 msgstr ""
 
 #: personal/faxaccount/class_gofaxAccount.inc:807
-#: personal/faxaccount/generic.tpl.c:17
 msgid "Delivery format"
 msgstr ""
 
@@ -302,12 +297,10 @@ msgid "Enable/Disable fax"
 msgstr ""
 
 #: personal/faxaccount/class_gofaxAccount.inc:810
-#: personal/faxaccount/generic.tpl.c:32
 msgid "Deliver fax as mail"
 msgstr ""
 
 #: personal/faxaccount/class_gofaxAccount.inc:811
-#: personal/faxaccount/generic.tpl.c:35
 msgid "Deliver fax to printer"
 msgstr ""
 
@@ -324,7 +317,6 @@ msgid "Please select the desired entries"
 msgstr ""
 
 #: personal/faxaccount/faxNumberSelect/faxNumberSelect-list.xml:14
-#: addons/faxreports/contents.tpl.c:26 addons/faxreports/detail.tpl.c:11
 msgid "User"
 msgstr "UsuÃ¡rio"
 
@@ -379,181 +371,3 @@ msgstr ""
 #: config/fax/class_faxConfig.inc:45
 msgid "Branch in which fax blocklists will be stored"
 msgstr ""
-
-#: addons/faxreports/contents.tpl.c:2
-#: personal/faxaccount/faxNumberSelect/faxNumberSelect-filter.tpl.c:2
-msgid "Filter"
-msgstr ""
-
-#: addons/faxreports/contents.tpl.c:5
-msgid "Search for"
-msgstr ""
-
-#: addons/faxreports/contents.tpl.c:8
-msgid "Enter user name to search for"
-msgstr ""
-
-#: addons/faxreports/contents.tpl.c:11 addons/faxreports/contents.tpl.c:20
-msgid "in"
-msgstr ""
-
-#: addons/faxreports/contents.tpl.c:14
-msgid "Select subtree to base search on"
-msgstr ""
-
-#: addons/faxreports/contents.tpl.c:17
-msgid "during"
-msgstr ""
-
-#: addons/faxreports/contents.tpl.c:23
-msgid "Search"
-msgstr "Procura"
-
-#: addons/faxreports/contents.tpl.c:35
-msgid "Sender"
-msgstr ""
-
-#: addons/faxreports/contents.tpl.c:38
-msgid "Receiver"
-msgstr ""
-
-#: addons/faxreports/contents.tpl.c:41 addons/faxreports/detail.tpl.c:38
-msgid "# pages"
-msgstr ""
-
-#: addons/faxreports/contents.tpl.c:44
-msgid "Search returned no results..."
-msgstr ""
-
-#: addons/faxreports/detail.tpl.c:2
-msgid "FAX preview - please wait"
-msgstr ""
-
-#: addons/faxreports/detail.tpl.c:5
-msgid "Click on fax to download"
-msgstr ""
-
-#: addons/faxreports/detail.tpl.c:8
-msgid "FAX ID"
-msgstr ""
-
-#: addons/faxreports/detail.tpl.c:14
-msgid "Date / Time"
-msgstr ""
-
-#: addons/faxreports/detail.tpl.c:32
-msgid "Status message"
-msgstr ""
-
-#: personal/faxaccount/generic.tpl.c:2
-#: personal/faxaccount/paste_generic.tpl.c:2
-msgid "Generic"
-msgstr "Geral"
-
-#: personal/faxaccount/generic.tpl.c:8
-msgid "Fax number for fax to trigger on"
-msgstr ""
-
-#: personal/faxaccount/generic.tpl.c:14
-msgid "Specify the fax communication language for fax to mail gateway"
-msgstr ""
-
-#: personal/faxaccount/generic.tpl.c:20
-msgid "Specify delivery format for fax to mail gateway"
-msgstr ""
-
-#: personal/faxaccount/generic.tpl.c:23
-msgid "Delivery methods"
-msgstr ""
-
-#: personal/faxaccount/generic.tpl.c:26
-msgid "Temporary disable fax usage"
-msgstr ""
-
-#: personal/faxaccount/generic.tpl.c:29
-msgid "Deliver fax as mail to"
-msgstr ""
-
-#: personal/faxaccount/generic.tpl.c:38
-msgid "Alternate fax numbers"
-msgstr ""
-
-#: personal/faxaccount/generic.tpl.c:41
-msgid "Add local"
-msgstr ""
-
-#: personal/faxaccount/generic.tpl.c:44
-msgid "Blocklists"
-msgstr ""
-
-#: personal/faxaccount/generic.tpl.c:47
-msgid "Blocklists for incoming fax"
-msgstr ""
-
-#: personal/faxaccount/generic.tpl.c:50 personal/faxaccount/generic.tpl.c:56
-msgid "Edit"
-msgstr "Editar"
-
-#: personal/faxaccount/generic.tpl.c:53
-msgid "Blocklists for outgoing fax"
-msgstr ""
-
-#: personal/faxaccount/lists.tpl.c:2
-msgid "Blocked numbers/lists"
-msgstr ""
-
-#: personal/faxaccount/lists.tpl.c:5
-msgid "List of predefined blocklists"
-msgstr ""
-
-#: personal/faxaccount/lists.tpl.c:8
-msgid "Add the list to the blocklists"
-msgstr ""
-
-#: personal/faxaccount/paste_generic.tpl.c:8
-msgid "Fax number for GOfax to trigger on"
-msgstr ""
-
-#: personal/faxaccount/paste_generic.tpl.c:11
-msgid "Alternate fax numbers will not be copied"
-msgstr ""
-
-#: personal/faxaccount/locals.tpl.c:2
-msgid "Select numbers to add"
-msgstr ""
-
-#: personal/faxaccount/locals.tpl.c:5
-msgid "Filters"
-msgstr "Filtros"
-
-#: personal/faxaccount/locals.tpl.c:8
-msgid "Display numbers of department"
-msgstr ""
-
-#: personal/faxaccount/locals.tpl.c:11
-msgid "Choose the department the search will be based on"
-msgstr "Escolha o departamento para base de procura"
-
-#: personal/faxaccount/locals.tpl.c:14
-msgid "Display numbers matching"
-msgstr ""
-
-#: personal/faxaccount/locals.tpl.c:17
-msgid "Regular expression for matching numbers"
-msgstr ""
-
-#: personal/faxaccount/locals.tpl.c:20
-msgid "Display numbers of user"
-msgstr ""
-
-#: personal/faxaccount/locals.tpl.c:23
-msgid "User name of which numbers are shown"
-msgstr ""
-
-#: personal/faxaccount/faxNumberSelect/faxNumberSelect-filter.tpl.c:5
-msgid "Name"
-msgstr "Nome"
-
-#: personal/faxaccount/faxNumberSelect/faxNumberSelect-list.tpl.c:2
-msgid "Base"
-msgstr "Base"
diff --git a/fax/locale/pt_BR/fusiondirectory.po b/fax/locale/pt_BR/fusiondirectory.po
index 136823315b51218883a3a372692dec7fd04d6794..a814b83269ce878845d15e9df56651b7e00b6022 100644
--- a/fax/locale/pt_BR/fusiondirectory.po
+++ b/fax/locale/pt_BR/fusiondirectory.po
@@ -5,12 +5,12 @@
 # Translators:
 msgid ""
 msgstr ""
-"Project-Id-Version: FusionDirectory-108\n"
+"Project-Id-Version: FusionDirectory-109\n"
 "Report-Msgid-Bugs-To: documentation@lists.fusiondirectory.org\n"
-"POT-Creation-Date: 2015-03-19 21:45+0100\n"
-"PO-Revision-Date: 2015-02-25 16:12+0000\n"
+"POT-Creation-Date: 2014-12-15 17:47+0100\n"
+"PO-Revision-Date: 2015-02-25 16:13+0000\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>\n"
-"Language-Team: Portuguese (Brazil) (http://www.transifex.com/projects/p/FusionDirectory-108/language/pt_BR/)\n"
+"Language-Team: Portuguese (Brazil) (http://www.transifex.com/projects/p/FusionDirectory-109/language/pt_BR/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -169,7 +169,6 @@ msgid "Fax ID"
 msgstr ""
 
 #: addons/faxreports/class_faxreport.inc:494
-#: addons/faxreports/contents.tpl.c:29
 msgid "Date"
 msgstr "Data"
 
@@ -178,23 +177,22 @@ msgid "Time"
 msgstr ""
 
 #: addons/faxreports/class_faxreport.inc:495
-#: addons/faxreports/contents.tpl.c:32 addons/faxreports/detail.tpl.c:29
 msgid "Status"
 msgstr "Estado"
 
-#: addons/faxreports/class_faxreport.inc:496 addons/faxreports/detail.tpl.c:20
+#: addons/faxreports/class_faxreport.inc:496
 msgid "Sender ID"
 msgstr ""
 
-#: addons/faxreports/class_faxreport.inc:497 addons/faxreports/detail.tpl.c:17
+#: addons/faxreports/class_faxreport.inc:497
 msgid "Sender MSN"
 msgstr ""
 
-#: addons/faxreports/class_faxreport.inc:498 addons/faxreports/detail.tpl.c:26
+#: addons/faxreports/class_faxreport.inc:498
 msgid "Receiver ID"
 msgstr ""
 
-#: addons/faxreports/class_faxreport.inc:499 addons/faxreports/detail.tpl.c:23
+#: addons/faxreports/class_faxreport.inc:499
 msgid "Receiver MSN"
 msgstr ""
 
@@ -206,7 +204,7 @@ msgstr ""
 msgid "Status Message"
 msgstr ""
 
-#: addons/faxreports/class_faxreport.inc:502 addons/faxreports/detail.tpl.c:35
+#: addons/faxreports/class_faxreport.inc:502
 msgid "Transfer time"
 msgstr ""
 
@@ -274,8 +272,7 @@ msgstr ""
 
 #: personal/faxaccount/class_gofaxAccount.inc:796
 #: personal/faxaccount/faxNumberSelect/faxNumberSelect-list.xml:56
-#: config/fax/class_faxConfig.inc:42 personal/faxaccount/generic.tpl.c:5
-#: personal/faxaccount/paste_generic.tpl.c:5
+#: config/fax/class_faxConfig.inc:42
 msgid "Fax"
 msgstr "Fax"
 
@@ -284,12 +281,10 @@ msgid "Fax account settings"
 msgstr ""
 
 #: personal/faxaccount/class_gofaxAccount.inc:806
-#: personal/faxaccount/generic.tpl.c:11
 msgid "Language"
 msgstr "Idioma"
 
 #: personal/faxaccount/class_gofaxAccount.inc:807
-#: personal/faxaccount/generic.tpl.c:17
 msgid "Delivery format"
 msgstr ""
 
@@ -302,12 +297,10 @@ msgid "Enable/Disable fax"
 msgstr ""
 
 #: personal/faxaccount/class_gofaxAccount.inc:810
-#: personal/faxaccount/generic.tpl.c:32
 msgid "Deliver fax as mail"
 msgstr ""
 
 #: personal/faxaccount/class_gofaxAccount.inc:811
-#: personal/faxaccount/generic.tpl.c:35
 msgid "Deliver fax to printer"
 msgstr ""
 
@@ -324,7 +317,6 @@ msgid "Please select the desired entries"
 msgstr "Por favor, selecione as entradas desejadas"
 
 #: personal/faxaccount/faxNumberSelect/faxNumberSelect-list.xml:14
-#: addons/faxreports/contents.tpl.c:26 addons/faxreports/detail.tpl.c:11
 msgid "User"
 msgstr "UsuÃ¡rio"
 
@@ -379,181 +371,3 @@ msgstr ""
 #: config/fax/class_faxConfig.inc:45
 msgid "Branch in which fax blocklists will be stored"
 msgstr ""
-
-#: addons/faxreports/contents.tpl.c:2
-#: personal/faxaccount/faxNumberSelect/faxNumberSelect-filter.tpl.c:2
-msgid "Filter"
-msgstr "Filtro"
-
-#: addons/faxreports/contents.tpl.c:5
-msgid "Search for"
-msgstr "Procurar por"
-
-#: addons/faxreports/contents.tpl.c:8
-msgid "Enter user name to search for"
-msgstr "Digite o nome de usuÃ¡rio a ser pesquisado"
-
-#: addons/faxreports/contents.tpl.c:11 addons/faxreports/contents.tpl.c:20
-msgid "in"
-msgstr "dentro"
-
-#: addons/faxreports/contents.tpl.c:14
-msgid "Select subtree to base search on"
-msgstr "Selecionar sub-arvore para busca"
-
-#: addons/faxreports/contents.tpl.c:17
-msgid "during"
-msgstr "durante"
-
-#: addons/faxreports/contents.tpl.c:23
-msgid "Search"
-msgstr "Pesquisar"
-
-#: addons/faxreports/contents.tpl.c:35
-msgid "Sender"
-msgstr ""
-
-#: addons/faxreports/contents.tpl.c:38
-msgid "Receiver"
-msgstr ""
-
-#: addons/faxreports/contents.tpl.c:41 addons/faxreports/detail.tpl.c:38
-msgid "# pages"
-msgstr ""
-
-#: addons/faxreports/contents.tpl.c:44
-msgid "Search returned no results..."
-msgstr "A pesquisa nÃ£o retornou resultados..."
-
-#: addons/faxreports/detail.tpl.c:2
-msgid "FAX preview - please wait"
-msgstr ""
-
-#: addons/faxreports/detail.tpl.c:5
-msgid "Click on fax to download"
-msgstr ""
-
-#: addons/faxreports/detail.tpl.c:8
-msgid "FAX ID"
-msgstr ""
-
-#: addons/faxreports/detail.tpl.c:14
-msgid "Date / Time"
-msgstr ""
-
-#: addons/faxreports/detail.tpl.c:32
-msgid "Status message"
-msgstr ""
-
-#: personal/faxaccount/generic.tpl.c:2
-#: personal/faxaccount/paste_generic.tpl.c:2
-msgid "Generic"
-msgstr "GenÃ©rico"
-
-#: personal/faxaccount/generic.tpl.c:8
-msgid "Fax number for fax to trigger on"
-msgstr ""
-
-#: personal/faxaccount/generic.tpl.c:14
-msgid "Specify the fax communication language for fax to mail gateway"
-msgstr ""
-
-#: personal/faxaccount/generic.tpl.c:20
-msgid "Specify delivery format for fax to mail gateway"
-msgstr ""
-
-#: personal/faxaccount/generic.tpl.c:23
-msgid "Delivery methods"
-msgstr ""
-
-#: personal/faxaccount/generic.tpl.c:26
-msgid "Temporary disable fax usage"
-msgstr ""
-
-#: personal/faxaccount/generic.tpl.c:29
-msgid "Deliver fax as mail to"
-msgstr ""
-
-#: personal/faxaccount/generic.tpl.c:38
-msgid "Alternate fax numbers"
-msgstr ""
-
-#: personal/faxaccount/generic.tpl.c:41
-msgid "Add local"
-msgstr ""
-
-#: personal/faxaccount/generic.tpl.c:44
-msgid "Blocklists"
-msgstr ""
-
-#: personal/faxaccount/generic.tpl.c:47
-msgid "Blocklists for incoming fax"
-msgstr ""
-
-#: personal/faxaccount/generic.tpl.c:50 personal/faxaccount/generic.tpl.c:56
-msgid "Edit"
-msgstr "Editar"
-
-#: personal/faxaccount/generic.tpl.c:53
-msgid "Blocklists for outgoing fax"
-msgstr ""
-
-#: personal/faxaccount/lists.tpl.c:2
-msgid "Blocked numbers/lists"
-msgstr ""
-
-#: personal/faxaccount/lists.tpl.c:5
-msgid "List of predefined blocklists"
-msgstr ""
-
-#: personal/faxaccount/lists.tpl.c:8
-msgid "Add the list to the blocklists"
-msgstr ""
-
-#: personal/faxaccount/paste_generic.tpl.c:8
-msgid "Fax number for GOfax to trigger on"
-msgstr ""
-
-#: personal/faxaccount/paste_generic.tpl.c:11
-msgid "Alternate fax numbers will not be copied"
-msgstr ""
-
-#: personal/faxaccount/locals.tpl.c:2
-msgid "Select numbers to add"
-msgstr ""
-
-#: personal/faxaccount/locals.tpl.c:5
-msgid "Filters"
-msgstr "Filtros"
-
-#: personal/faxaccount/locals.tpl.c:8
-msgid "Display numbers of department"
-msgstr ""
-
-#: personal/faxaccount/locals.tpl.c:11
-msgid "Choose the department the search will be based on"
-msgstr "scolha o objeto a ser feita a pesquisa"
-
-#: personal/faxaccount/locals.tpl.c:14
-msgid "Display numbers matching"
-msgstr ""
-
-#: personal/faxaccount/locals.tpl.c:17
-msgid "Regular expression for matching numbers"
-msgstr ""
-
-#: personal/faxaccount/locals.tpl.c:20
-msgid "Display numbers of user"
-msgstr ""
-
-#: personal/faxaccount/locals.tpl.c:23
-msgid "User name of which numbers are shown"
-msgstr ""
-
-#: personal/faxaccount/faxNumberSelect/faxNumberSelect-filter.tpl.c:5
-msgid "Name"
-msgstr "Nome"
-
-#: personal/faxaccount/faxNumberSelect/faxNumberSelect-list.tpl.c:2
-msgid "Base"
-msgstr "Base"
diff --git a/fax/locale/ru/fusiondirectory.po b/fax/locale/ru/fusiondirectory.po
index d60268efd28b8646f42df84849b45a3e937839a1..8f061ccb8f3be22c6abb280332b3188564a7a82a 100644
--- a/fax/locale/ru/fusiondirectory.po
+++ b/fax/locale/ru/fusiondirectory.po
@@ -3,20 +3,19 @@
 # This file is distributed under the same license as the PACKAGE package.
 # 
 # Translators:
-#  Valia V. Vaneeva <fattie@altlinux.ru>, 2004
 msgid ""
 msgstr ""
-"Project-Id-Version: FusionDirectory-108\n"
+"Project-Id-Version: FusionDirectory-109\n"
 "Report-Msgid-Bugs-To: documentation@lists.fusiondirectory.org\n"
-"POT-Creation-Date: 2015-03-19 21:45+0100\n"
-"PO-Revision-Date: 2015-03-11 21:42+0000\n"
+"POT-Creation-Date: 2014-12-15 17:47+0100\n"
+"PO-Revision-Date: 2015-04-12 22:01+0000\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>\n"
-"Language-Team: Russian (http://www.transifex.com/projects/p/FusionDirectory-108/language/ru/)\n"
+"Language-Team: Russian (http://www.transifex.com/projects/p/FusionDirectory-109/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=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);\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/blocklists/class_blocklistManagement.inc:28
 msgid "Fax Blocklists"
@@ -126,12 +125,12 @@ msgstr "ÐÐµÐ¼Ð¾Ð³Ñƒ Ð¿Ð¾Ð´ÐºÐ»ÑŽÑ‡Ð¸Ñ‚ÑŒÑÑ Ðº %s Ð±Ð°Ð·Ðµ Ð´Ð°Ð½Ð½Ñ‹Ñ…!"
 #: addons/faxreports/class_faxreport.inc:300
 #, php-format
 msgid "Cannot query %s database!"
-msgstr ""
+msgstr "ÐÐµ Ð¼Ð¾Ð³Ñƒ Ð¾Ñ‚Ð¿Ñ€Ð°Ð²Ð¸Ñ‚ÑŒ Ð·Ð°Ð¿Ñ€Ð¾Ñ %s Ð±Ð°Ð·Ðµ Ð´Ð°Ð½Ð½Ñ‹Ñ…!"
 
 #: addons/faxreports/class_faxreport.inc:168
 #: addons/faxreports/class_faxreport.inc:178
 msgid "Permission error"
-msgstr ""
+msgstr "ÐžÑˆÐ¸Ð±ÐºÐ° Ð´Ð¾ÑÑ‚ÑƒÐ¿Ð°"
 
 #: addons/faxreports/class_faxreport.inc:168
 #: addons/faxreports/class_faxreport.inc:178
@@ -170,7 +169,6 @@ msgid "Fax ID"
 msgstr ""
 
 #: addons/faxreports/class_faxreport.inc:494
-#: addons/faxreports/contents.tpl.c:29
 msgid "Date"
 msgstr "Ð”Ð°Ñ‚Ð°"
 
@@ -179,23 +177,22 @@ msgid "Time"
 msgstr ""
 
 #: addons/faxreports/class_faxreport.inc:495
-#: addons/faxreports/contents.tpl.c:32 addons/faxreports/detail.tpl.c:29
 msgid "Status"
 msgstr "Ð¡Ð¾ÑÑ‚Ð¾ÑÐ½Ð¸Ðµ"
 
-#: addons/faxreports/class_faxreport.inc:496 addons/faxreports/detail.tpl.c:20
+#: addons/faxreports/class_faxreport.inc:496
 msgid "Sender ID"
 msgstr "Ð˜Ð´ÐµÐ½Ñ‚Ð¸Ñ„Ð¸ÐºÐ°Ñ‚Ð¾Ñ€ Ð¾Ñ‚Ð¿Ñ€Ð°Ð²Ð¸Ñ‚ÐµÐ»Ñ"
 
-#: addons/faxreports/class_faxreport.inc:497 addons/faxreports/detail.tpl.c:17
+#: addons/faxreports/class_faxreport.inc:497
 msgid "Sender MSN"
 msgstr "MSN Ð¾Ñ‚Ð¿Ñ€Ð°Ð²Ð¸Ñ‚ÐµÐ»Ñ"
 
-#: addons/faxreports/class_faxreport.inc:498 addons/faxreports/detail.tpl.c:26
+#: addons/faxreports/class_faxreport.inc:498
 msgid "Receiver ID"
 msgstr "Ð˜Ð´ÐµÐ½Ñ‚Ð¸Ñ„Ð¸ÐºÐ°Ñ‚Ð¾Ñ€ Ð¿Ð¾Ð»ÑƒÑ‡Ð°Ñ‚ÐµÐ»Ñ"
 
-#: addons/faxreports/class_faxreport.inc:499 addons/faxreports/detail.tpl.c:23
+#: addons/faxreports/class_faxreport.inc:499
 msgid "Receiver MSN"
 msgstr "MSN Ð¿Ð¾Ð»ÑƒÑ‡Ð°Ñ‚ÐµÐ»Ñ"
 
@@ -207,7 +204,7 @@ msgstr ""
 msgid "Status Message"
 msgstr ""
 
-#: addons/faxreports/class_faxreport.inc:502 addons/faxreports/detail.tpl.c:35
+#: addons/faxreports/class_faxreport.inc:502
 msgid "Transfer time"
 msgstr "Ð’Ñ€ÐµÐ¼Ñ Ð¿ÐµÑ€ÐµÐ´Ð°Ñ‡Ð¸"
 
@@ -227,7 +224,7 @@ msgstr "Ð§Ñ‚Ð¾-Ñ‚Ð¾ Ð±ÑƒÐ´ÐµÑ‚"
 #: personal/faxaccount/class_gofaxAccount.inc:190
 #: personal/faxaccount/class_gofaxAccount.inc:193
 msgid "GOfax"
-msgstr ""
+msgstr "GOfax"
 
 #: personal/faxaccount/class_gofaxAccount.inc:189
 msgid "Remove fax account"
@@ -244,7 +241,7 @@ msgstr "Ð¢ÐµÐ»ÐµÑ„Ð¾Ð½"
 #: personal/faxaccount/class_gofaxAccount.inc:421
 #: personal/faxaccount/class_gofaxAccount.inc:503
 msgid "back"
-msgstr ""
+msgstr "Ð½Ð°Ð·Ð°Ð´"
 
 #: personal/faxaccount/class_gofaxAccount.inc:611
 #: personal/faxaccount/class_gofaxAccount.inc:739
@@ -275,8 +272,7 @@ msgstr ""
 
 #: personal/faxaccount/class_gofaxAccount.inc:796
 #: personal/faxaccount/faxNumberSelect/faxNumberSelect-list.xml:56
-#: config/fax/class_faxConfig.inc:42 personal/faxaccount/generic.tpl.c:5
-#: personal/faxaccount/paste_generic.tpl.c:5
+#: config/fax/class_faxConfig.inc:42
 msgid "Fax"
 msgstr "Ð¤Ð°ÐºÑ"
 
@@ -285,12 +281,10 @@ msgid "Fax account settings"
 msgstr ""
 
 #: personal/faxaccount/class_gofaxAccount.inc:806
-#: personal/faxaccount/generic.tpl.c:11
 msgid "Language"
 msgstr "Ð¯Ð·Ñ‹Ðº"
 
 #: personal/faxaccount/class_gofaxAccount.inc:807
-#: personal/faxaccount/generic.tpl.c:17
 msgid "Delivery format"
 msgstr "Ð¤Ð¾Ñ€Ð¼Ð°Ñ‚ Ð´Ð¾ÑÑ‚Ð°Ð²ÐºÐ¸"
 
@@ -303,12 +297,10 @@ msgid "Enable/Disable fax"
 msgstr ""
 
 #: personal/faxaccount/class_gofaxAccount.inc:810
-#: personal/faxaccount/generic.tpl.c:32
 msgid "Deliver fax as mail"
 msgstr "ÐžÑ‚Ð¿Ñ€Ð°Ð²Ð»ÑÑ‚ÑŒ Ñ„Ð°ÐºÑÑ‹ Ð¿Ð¾ ÑÐ». Ð¿Ð¾Ñ‡Ñ‚Ðµ"
 
 #: personal/faxaccount/class_gofaxAccount.inc:811
-#: personal/faxaccount/generic.tpl.c:35
 msgid "Deliver fax to printer"
 msgstr "ÐžÑ‚Ð¿Ñ€Ð°Ð²Ð»ÑÑ‚ÑŒ Ñ„Ð°ÐºÑÑ‹ Ð½Ð° Ð¿Ñ€Ð¸Ð½Ñ‚ÐµÑ€"
 
@@ -325,7 +317,6 @@ msgid "Please select the desired entries"
 msgstr "ÐŸÐ¾Ð¶Ð°Ð»ÑƒÐ¹ÑÑ‚Ð° Ð²Ñ‹Ð±ÐµÑ€ÐµÑ‚Ðµ Ð½ÑƒÐ¶Ð½Ñ‹Ðµ Ð·Ð°Ð¿Ð¸ÑÐ¸"
 
 #: personal/faxaccount/faxNumberSelect/faxNumberSelect-list.xml:14
-#: addons/faxreports/contents.tpl.c:26 addons/faxreports/detail.tpl.c:11
 msgid "User"
 msgstr "ÐŸÐ¾Ð»ÑŒÐ·Ð¾Ð²Ð°Ñ‚ÐµÐ»ÑŒ"
 
@@ -380,181 +371,3 @@ msgstr ""
 #: config/fax/class_faxConfig.inc:45
 msgid "Branch in which fax blocklists will be stored"
 msgstr ""
-
-#: addons/faxreports/contents.tpl.c:2
-#: personal/faxaccount/faxNumberSelect/faxNumberSelect-filter.tpl.c:2
-msgid "Filter"
-msgstr "Ð¤Ð¸Ð»ÑŒÑ‚Ñ€"
-
-#: addons/faxreports/contents.tpl.c:5
-msgid "Search for"
-msgstr "ÐŸÐ¾Ð¸ÑÐº"
-
-#: addons/faxreports/contents.tpl.c:8
-msgid "Enter user name to search for"
-msgstr "Ð’Ð²ÐµÐ´Ð¸Ñ‚Ðµ Ð¸ÑÐºÐ¾Ð¼Ð¾Ðµ Ð¸Ð¼Ñ Ð¿Ð¾Ð»ÑŒÐ·Ð¾Ð²Ð°Ñ‚ÐµÐ»Ñ"
-
-#: addons/faxreports/contents.tpl.c:11 addons/faxreports/contents.tpl.c:20
-msgid "in"
-msgstr "Ð²"
-
-#: addons/faxreports/contents.tpl.c:14
-msgid "Select subtree to base search on"
-msgstr "Ð’Ñ‹Ð±ÐµÑ€Ð¸Ñ‚Ðµ Ð²ÐµÑ‚ÐºÑƒ Ð´Ð»Ñ Ð¿Ð¾Ð¸ÑÐºÐ°"
-
-#: addons/faxreports/contents.tpl.c:17
-msgid "during"
-msgstr "Ð² Ñ‚ÐµÑ‡ÐµÐ½Ð¸Ðµ"
-
-#: addons/faxreports/contents.tpl.c:23
-msgid "Search"
-msgstr "ÐŸÐ¾Ð¸ÑÐº"
-
-#: addons/faxreports/contents.tpl.c:35
-msgid "Sender"
-msgstr "ÐžÑ‚Ð¿Ñ€Ð°Ð²Ð¸Ñ‚ÐµÐ»ÑŒ"
-
-#: addons/faxreports/contents.tpl.c:38
-msgid "Receiver"
-msgstr "ÐŸÐ¾Ð»ÑƒÑ‡Ð°Ñ‚ÐµÐ»ÑŒ"
-
-#: addons/faxreports/contents.tpl.c:41 addons/faxreports/detail.tpl.c:38
-msgid "# pages"
-msgstr "Ð§Ð¸ÑÐ»Ð¾ ÑÑ‚Ñ€Ð°Ð½Ð¸Ñ†"
-
-#: addons/faxreports/contents.tpl.c:44
-msgid "Search returned no results..."
-msgstr "ÐÐµ Ð½Ð°Ð¹Ð´ÐµÐ½Ð¾..."
-
-#: addons/faxreports/detail.tpl.c:2
-msgid "FAX preview - please wait"
-msgstr "ÐŸÑ€ÐµÐ´Ð²Ð°Ñ€Ð¸Ñ‚ÐµÐ»ÑŒÐ½Ñ‹Ð¹ Ð¿Ñ€Ð¾ÑÐ¼Ð¾Ñ‚Ñ€ - Ð¿Ð¾Ð¶Ð°Ð»ÑƒÐ¹ÑÑ‚Ð°, Ð¿Ð¾Ð´Ð¾Ð¶Ð´Ð¸Ñ‚Ðµ"
-
-#: addons/faxreports/detail.tpl.c:5
-msgid "Click on fax to download"
-msgstr "Ð©ÐµÐ»ÐºÐ½Ð¸Ñ‚Ðµ Ð¿Ð¾ Ñ„Ð°ÐºÑÑƒ, Ñ‡Ñ‚Ð¾Ð±Ñ‹ Ð·Ð°Ð³Ñ€ÑƒÐ·Ð¸Ñ‚ÑŒ ÐµÐ³Ð¾"
-
-#: addons/faxreports/detail.tpl.c:8
-msgid "FAX ID"
-msgstr "Ð˜Ð´ÐµÐ½Ñ‚Ð¸Ñ„Ð¸ÐºÐ°Ñ‚Ð¾Ñ€ Ñ„Ð°ÐºÑÐ°"
-
-#: addons/faxreports/detail.tpl.c:14
-msgid "Date / Time"
-msgstr "Ð”Ð°Ñ‚Ð° / Ð²Ñ€ÐµÐ¼Ñ"
-
-#: addons/faxreports/detail.tpl.c:32
-msgid "Status message"
-msgstr "Ð¡Ð¾Ð¾Ð±Ñ‰ÐµÐ½Ð¸Ðµ Ð¾ ÑÐ¾ÑÑ‚Ð¾ÑÐ½Ð¸Ð¸"
-
-#: personal/faxaccount/generic.tpl.c:2
-#: personal/faxaccount/paste_generic.tpl.c:2
-msgid "Generic"
-msgstr "ÐžÐ±Ñ‰ÐµÐµ"
-
-#: personal/faxaccount/generic.tpl.c:8
-msgid "Fax number for fax to trigger on"
-msgstr ""
-
-#: personal/faxaccount/generic.tpl.c:14
-msgid "Specify the fax communication language for fax to mail gateway"
-msgstr ""
-
-#: personal/faxaccount/generic.tpl.c:20
-msgid "Specify delivery format for fax to mail gateway"
-msgstr "Ð£ÐºÐ°Ð¶Ð¸Ñ‚Ðµ Ð² ÐºÐ°ÐºÐ¾Ð¼ Ñ„Ð¾Ñ€Ð¼Ð°Ñ‚Ðµ Ð´Ð¾Ð»Ð¶Ð½Ñ‹ Ð¿ÐµÑ€ÐµÐ½Ð°Ð¿Ñ€Ð°Ð²Ð»ÑÑ‚ÑŒÑÑ Ñ„Ð°ÐºÑÑ‹"
-
-#: personal/faxaccount/generic.tpl.c:23
-msgid "Delivery methods"
-msgstr "Ð¡Ð¿Ð¾ÑÐ¾Ð± Ð´Ð¾ÑÑ‚Ð°Ð²ÐºÐ¸"
-
-#: personal/faxaccount/generic.tpl.c:26
-msgid "Temporary disable fax usage"
-msgstr "Ð’Ñ€ÐµÐ¼ÐµÐ½Ð½Ð¾ Ð¾Ñ‚ÐºÐ»ÑŽÑ‡Ð¸Ñ‚ÑŒ Ð¸ÑÐ¿Ð¾Ð»ÑŒÐ·Ð¾Ð²Ð°Ð½Ð¸Ðµ Ñ„Ð°ÐºÑÐ°"
-
-#: personal/faxaccount/generic.tpl.c:29
-msgid "Deliver fax as mail to"
-msgstr ""
-
-#: personal/faxaccount/generic.tpl.c:38
-msgid "Alternate fax numbers"
-msgstr "ÐÐ»ÑŒÑ‚ÐµÑ€Ð½Ð°Ñ‚Ð¸Ð²Ð½Ñ‹Ðµ Ð½Ð¾Ð¼ÐµÑ€Ð° Ñ„Ð°ÐºÑÐ¾Ð²"
-
-#: personal/faxaccount/generic.tpl.c:41
-msgid "Add local"
-msgstr "Ð”Ð¾Ð±Ð°Ð²Ð¸Ñ‚ÑŒ Ð»Ð¾ÐºÐ°Ð»ÑŒÐ½Ð¾"
-
-#: personal/faxaccount/generic.tpl.c:44
-msgid "Blocklists"
-msgstr "\"Ð§ÐµÑ€Ð½Ñ‹Ðµ ÑÐ¿Ð¸ÑÐºÐ¸\""
-
-#: personal/faxaccount/generic.tpl.c:47
-msgid "Blocklists for incoming fax"
-msgstr "\"Ð§ÐµÑ€Ð½Ñ‹Ðµ ÑÐ¿Ð¸ÑÐºÐ¸\" Ð´Ð»Ñ Ð²Ñ…Ð¾Ð´ÑÑ‰Ð¸Ñ… Ñ„Ð°ÐºÑÐ¾Ð²"
-
-#: personal/faxaccount/generic.tpl.c:50 personal/faxaccount/generic.tpl.c:56
-msgid "Edit"
-msgstr "Ð˜Ð·Ð¼ÐµÐ½Ð¸Ñ‚ÑŒ"
-
-#: personal/faxaccount/generic.tpl.c:53
-msgid "Blocklists for outgoing fax"
-msgstr "\"Ð§ÐµÑ€Ð½Ñ‹Ðµ ÑÐ¿Ð¸ÑÐºÐ¸\" Ð´Ð»Ñ Ð¸ÑÑ…Ð¾Ð´ÑÑ‰Ð¸Ñ… Ñ„Ð°ÐºÑÐ¾Ð²"
-
-#: personal/faxaccount/lists.tpl.c:2
-msgid "Blocked numbers/lists"
-msgstr "Ð‘Ð»Ð¾ÐºÐ¸Ñ€ÑƒÐµÐ¼Ñ‹Ðµ Ð½Ð¾Ð¼ÐµÑ€Ð°/ÑÐ¿Ð¸ÑÐºÐ¸"
-
-#: personal/faxaccount/lists.tpl.c:5
-msgid "List of predefined blocklists"
-msgstr "Ð“Ð¾Ñ‚Ð¾Ð²Ñ‹Ðµ \"Ñ‡ÐµÑ€Ð½Ñ‹Ðµ ÑÐ¿Ð¸ÑÐºÐ¸\""
-
-#: personal/faxaccount/lists.tpl.c:8
-msgid "Add the list to the blocklists"
-msgstr ""
-
-#: personal/faxaccount/paste_generic.tpl.c:8
-msgid "Fax number for GOfax to trigger on"
-msgstr "ÐÐ¾Ð¼ÐµÑ€ Ñ„Ð°ÐºÑÐ°, Ð´Ð»Ñ ÐºÐ¾Ñ‚Ð¾Ñ€Ð¾Ð³Ð¾ ÑÑ€Ð°Ð±Ð¾Ñ‚Ð°ÐµÑ‚ GOfax"
-
-#: personal/faxaccount/paste_generic.tpl.c:11
-msgid "Alternate fax numbers will not be copied"
-msgstr ""
-
-#: personal/faxaccount/locals.tpl.c:2
-msgid "Select numbers to add"
-msgstr "Ð’Ñ‹Ð±Ñ€Ð°Ñ‚ÑŒ Ð½Ð¾Ð¼ÐµÑ€Ð° Ð´Ð»Ñ Ð´Ð¾Ð±Ð°Ð²Ð»ÐµÐ½Ð¸Ñ"
-
-#: personal/faxaccount/locals.tpl.c:5
-msgid "Filters"
-msgstr "Ð¤Ð¸Ð»ÑŒÑ‚Ñ€Ñ‹"
-
-#: personal/faxaccount/locals.tpl.c:8
-msgid "Display numbers of department"
-msgstr "ÐŸÐ¾ÐºÐ°Ð·Ð°Ñ‚ÑŒ Ð½Ð¾Ð¼ÐµÑ€Ð° Ð¸Ð· Ð¿Ð¾Ð´Ñ€Ð°Ð·Ð´ÐµÐ»ÐµÐ½Ð¸Ñ"
-
-#: personal/faxaccount/locals.tpl.c:11
-msgid "Choose the department the search will be based on"
-msgstr "Ð’Ñ‹Ð±Ñ€Ð°Ñ‚ÑŒ Ñ€Ð°Ð·Ð´ÐµÐ», Ð´Ð»Ñ ÐºÐ¾Ñ‚Ð¾Ñ€Ð¾Ð³Ð¾ Ð±ÑƒÐ´ÐµÑ‚ Ð¾ÑÑƒÑ‰ÐµÑÑ‚Ð²Ð»ÐµÐ½ Ð¿Ð¾Ð¸ÑÐº"
-
-#: personal/faxaccount/locals.tpl.c:14
-msgid "Display numbers matching"
-msgstr "ÐŸÐ¾ÐºÐ°Ð·Ð°Ñ‚ÑŒ ÑÐ¾Ð²Ð¿Ð°Ð´ÐµÐ½Ð¸Ñ Ð½Ð¾Ð¼ÐµÑ€Ð¾Ð²"
-
-#: personal/faxaccount/locals.tpl.c:17
-msgid "Regular expression for matching numbers"
-msgstr "Ð ÐµÐ³ÑƒÐ»ÑÑ€Ð½Ð¾Ðµ Ð²Ñ‹Ñ€Ð°Ð¶ÐµÐ½Ð¸Ðµ, ÑÐ¾Ð¾Ñ‚Ð²ÐµÑ‚ÑÑ‚Ð²ÑƒÑŽÑ‰ÐµÐµ Ð½Ð¾Ð¼ÐµÑ€Ð°Ð¼"
-
-#: personal/faxaccount/locals.tpl.c:20
-msgid "Display numbers of user"
-msgstr "ÐŸÐ¾ÐºÐ°Ð·Ð°Ñ‚ÑŒ Ð½Ð¾Ð¼ÐµÑ€Ð° Ð¿Ð¾Ð»ÑŒÐ·Ð¾Ð²Ð°Ñ‚ÐµÐ»Ñ"
-
-#: personal/faxaccount/locals.tpl.c:23
-msgid "User name of which numbers are shown"
-msgstr "Ð˜Ð¼Ñ Ð¿Ð¾Ð»ÑŒÐ·Ð¾Ð²Ð°Ñ‚ÐµÐ»Ñ, Ð´Ð»Ñ ÐºÐ¾Ñ‚Ð¾Ñ€Ð¾Ð³Ð¾ Ð¿ÐµÑ€ÐµÑ‡Ð¸ÑÐ»ÑÑŽÑ‚ÑÑ Ð½Ð¾Ð¼ÐµÑ€Ð°"
-
-#: personal/faxaccount/faxNumberSelect/faxNumberSelect-filter.tpl.c:5
-msgid "Name"
-msgstr "ÐÐ°Ð·Ð²Ð°Ð½Ð¸Ðµ"
-
-#: personal/faxaccount/faxNumberSelect/faxNumberSelect-list.tpl.c:2
-msgid "Base"
-msgstr "Ð’ÐµÑ‚ÐºÐ°"
diff --git a/fax/locale/ru@petr1708/fusiondirectory.po b/fax/locale/ru@petr1708/fusiondirectory.po
index 5e898409237b4b199dbdc7dd6a5c557f4d4db5d5..de66e212635b01fb495b3b6bffb81137da722cc2 100644
--- a/fax/locale/ru@petr1708/fusiondirectory.po
+++ b/fax/locale/ru@petr1708/fusiondirectory.po
@@ -5,17 +5,17 @@
 # Translators:
 msgid ""
 msgstr ""
-"Project-Id-Version: FusionDirectory-108\n"
+"Project-Id-Version: FusionDirectory-109\n"
 "Report-Msgid-Bugs-To: documentation@lists.fusiondirectory.org\n"
-"POT-Creation-Date: 2015-03-19 21:45+0100\n"
-"PO-Revision-Date: 2015-02-25 15:46+0000\n"
+"POT-Creation-Date: 2014-12-15 17:47+0100\n"
+"PO-Revision-Date: 2014-12-15 16:55+0000\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>\n"
-"Language-Team: Russian Petrine orthography (http://www.transifex.com/projects/p/FusionDirectory-108/language/ru@petr1708/)\n"
+"Language-Team: Russian Petrine orthography (http://www.transifex.com/projects/p/FusionDirectory-109/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=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);\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/blocklists/class_blocklistManagement.inc:28
 msgid "Fax Blocklists"
@@ -169,7 +169,6 @@ msgid "Fax ID"
 msgstr ""
 
 #: addons/faxreports/class_faxreport.inc:494
-#: addons/faxreports/contents.tpl.c:29
 msgid "Date"
 msgstr ""
 
@@ -178,23 +177,22 @@ msgid "Time"
 msgstr ""
 
 #: addons/faxreports/class_faxreport.inc:495
-#: addons/faxreports/contents.tpl.c:32 addons/faxreports/detail.tpl.c:29
 msgid "Status"
 msgstr ""
 
-#: addons/faxreports/class_faxreport.inc:496 addons/faxreports/detail.tpl.c:20
+#: addons/faxreports/class_faxreport.inc:496
 msgid "Sender ID"
 msgstr ""
 
-#: addons/faxreports/class_faxreport.inc:497 addons/faxreports/detail.tpl.c:17
+#: addons/faxreports/class_faxreport.inc:497
 msgid "Sender MSN"
 msgstr ""
 
-#: addons/faxreports/class_faxreport.inc:498 addons/faxreports/detail.tpl.c:26
+#: addons/faxreports/class_faxreport.inc:498
 msgid "Receiver ID"
 msgstr ""
 
-#: addons/faxreports/class_faxreport.inc:499 addons/faxreports/detail.tpl.c:23
+#: addons/faxreports/class_faxreport.inc:499
 msgid "Receiver MSN"
 msgstr ""
 
@@ -206,7 +204,7 @@ msgstr ""
 msgid "Status Message"
 msgstr ""
 
-#: addons/faxreports/class_faxreport.inc:502 addons/faxreports/detail.tpl.c:35
+#: addons/faxreports/class_faxreport.inc:502
 msgid "Transfer time"
 msgstr ""
 
@@ -274,8 +272,7 @@ msgstr ""
 
 #: personal/faxaccount/class_gofaxAccount.inc:796
 #: personal/faxaccount/faxNumberSelect/faxNumberSelect-list.xml:56
-#: config/fax/class_faxConfig.inc:42 personal/faxaccount/generic.tpl.c:5
-#: personal/faxaccount/paste_generic.tpl.c:5
+#: config/fax/class_faxConfig.inc:42
 msgid "Fax"
 msgstr ""
 
@@ -284,12 +281,10 @@ msgid "Fax account settings"
 msgstr ""
 
 #: personal/faxaccount/class_gofaxAccount.inc:806
-#: personal/faxaccount/generic.tpl.c:11
 msgid "Language"
 msgstr ""
 
 #: personal/faxaccount/class_gofaxAccount.inc:807
-#: personal/faxaccount/generic.tpl.c:17
 msgid "Delivery format"
 msgstr ""
 
@@ -302,12 +297,10 @@ msgid "Enable/Disable fax"
 msgstr ""
 
 #: personal/faxaccount/class_gofaxAccount.inc:810
-#: personal/faxaccount/generic.tpl.c:32
 msgid "Deliver fax as mail"
 msgstr ""
 
 #: personal/faxaccount/class_gofaxAccount.inc:811
-#: personal/faxaccount/generic.tpl.c:35
 msgid "Deliver fax to printer"
 msgstr ""
 
@@ -324,7 +317,6 @@ msgid "Please select the desired entries"
 msgstr ""
 
 #: personal/faxaccount/faxNumberSelect/faxNumberSelect-list.xml:14
-#: addons/faxreports/contents.tpl.c:26 addons/faxreports/detail.tpl.c:11
 msgid "User"
 msgstr ""
 
@@ -379,181 +371,3 @@ msgstr ""
 #: config/fax/class_faxConfig.inc:45
 msgid "Branch in which fax blocklists will be stored"
 msgstr ""
-
-#: addons/faxreports/contents.tpl.c:2
-#: personal/faxaccount/faxNumberSelect/faxNumberSelect-filter.tpl.c:2
-msgid "Filter"
-msgstr ""
-
-#: addons/faxreports/contents.tpl.c:5
-msgid "Search for"
-msgstr ""
-
-#: addons/faxreports/contents.tpl.c:8
-msgid "Enter user name to search for"
-msgstr ""
-
-#: addons/faxreports/contents.tpl.c:11 addons/faxreports/contents.tpl.c:20
-msgid "in"
-msgstr ""
-
-#: addons/faxreports/contents.tpl.c:14
-msgid "Select subtree to base search on"
-msgstr ""
-
-#: addons/faxreports/contents.tpl.c:17
-msgid "during"
-msgstr ""
-
-#: addons/faxreports/contents.tpl.c:23
-msgid "Search"
-msgstr ""
-
-#: addons/faxreports/contents.tpl.c:35
-msgid "Sender"
-msgstr ""
-
-#: addons/faxreports/contents.tpl.c:38
-msgid "Receiver"
-msgstr ""
-
-#: addons/faxreports/contents.tpl.c:41 addons/faxreports/detail.tpl.c:38
-msgid "# pages"
-msgstr ""
-
-#: addons/faxreports/contents.tpl.c:44
-msgid "Search returned no results..."
-msgstr ""
-
-#: addons/faxreports/detail.tpl.c:2
-msgid "FAX preview - please wait"
-msgstr ""
-
-#: addons/faxreports/detail.tpl.c:5
-msgid "Click on fax to download"
-msgstr ""
-
-#: addons/faxreports/detail.tpl.c:8
-msgid "FAX ID"
-msgstr ""
-
-#: addons/faxreports/detail.tpl.c:14
-msgid "Date / Time"
-msgstr ""
-
-#: addons/faxreports/detail.tpl.c:32
-msgid "Status message"
-msgstr ""
-
-#: personal/faxaccount/generic.tpl.c:2
-#: personal/faxaccount/paste_generic.tpl.c:2
-msgid "Generic"
-msgstr ""
-
-#: personal/faxaccount/generic.tpl.c:8
-msgid "Fax number for fax to trigger on"
-msgstr ""
-
-#: personal/faxaccount/generic.tpl.c:14
-msgid "Specify the fax communication language for fax to mail gateway"
-msgstr ""
-
-#: personal/faxaccount/generic.tpl.c:20
-msgid "Specify delivery format for fax to mail gateway"
-msgstr ""
-
-#: personal/faxaccount/generic.tpl.c:23
-msgid "Delivery methods"
-msgstr ""
-
-#: personal/faxaccount/generic.tpl.c:26
-msgid "Temporary disable fax usage"
-msgstr ""
-
-#: personal/faxaccount/generic.tpl.c:29
-msgid "Deliver fax as mail to"
-msgstr ""
-
-#: personal/faxaccount/generic.tpl.c:38
-msgid "Alternate fax numbers"
-msgstr ""
-
-#: personal/faxaccount/generic.tpl.c:41
-msgid "Add local"
-msgstr ""
-
-#: personal/faxaccount/generic.tpl.c:44
-msgid "Blocklists"
-msgstr ""
-
-#: personal/faxaccount/generic.tpl.c:47
-msgid "Blocklists for incoming fax"
-msgstr ""
-
-#: personal/faxaccount/generic.tpl.c:50 personal/faxaccount/generic.tpl.c:56
-msgid "Edit"
-msgstr ""
-
-#: personal/faxaccount/generic.tpl.c:53
-msgid "Blocklists for outgoing fax"
-msgstr ""
-
-#: personal/faxaccount/lists.tpl.c:2
-msgid "Blocked numbers/lists"
-msgstr ""
-
-#: personal/faxaccount/lists.tpl.c:5
-msgid "List of predefined blocklists"
-msgstr ""
-
-#: personal/faxaccount/lists.tpl.c:8
-msgid "Add the list to the blocklists"
-msgstr ""
-
-#: personal/faxaccount/paste_generic.tpl.c:8
-msgid "Fax number for GOfax to trigger on"
-msgstr ""
-
-#: personal/faxaccount/paste_generic.tpl.c:11
-msgid "Alternate fax numbers will not be copied"
-msgstr ""
-
-#: personal/faxaccount/locals.tpl.c:2
-msgid "Select numbers to add"
-msgstr ""
-
-#: personal/faxaccount/locals.tpl.c:5
-msgid "Filters"
-msgstr ""
-
-#: personal/faxaccount/locals.tpl.c:8
-msgid "Display numbers of department"
-msgstr ""
-
-#: personal/faxaccount/locals.tpl.c:11
-msgid "Choose the department the search will be based on"
-msgstr ""
-
-#: personal/faxaccount/locals.tpl.c:14
-msgid "Display numbers matching"
-msgstr ""
-
-#: personal/faxaccount/locals.tpl.c:17
-msgid "Regular expression for matching numbers"
-msgstr ""
-
-#: personal/faxaccount/locals.tpl.c:20
-msgid "Display numbers of user"
-msgstr ""
-
-#: personal/faxaccount/locals.tpl.c:23
-msgid "User name of which numbers are shown"
-msgstr ""
-
-#: personal/faxaccount/faxNumberSelect/faxNumberSelect-filter.tpl.c:5
-msgid "Name"
-msgstr ""
-
-#: personal/faxaccount/faxNumberSelect/faxNumberSelect-list.tpl.c:2
-msgid "Base"
-msgstr ""
diff --git a/fax/locale/sv/fusiondirectory.po b/fax/locale/sv/fusiondirectory.po
index 2548ad919ccde9194dd04d3773b2d52def0d147b..92aa0dccdce2b6fccbe369cb6de45c912f6d6921 100644
--- a/fax/locale/sv/fusiondirectory.po
+++ b/fax/locale/sv/fusiondirectory.po
@@ -5,12 +5,12 @@
 # Translators:
 msgid ""
 msgstr ""
-"Project-Id-Version: FusionDirectory-108\n"
+"Project-Id-Version: FusionDirectory-109\n"
 "Report-Msgid-Bugs-To: documentation@lists.fusiondirectory.org\n"
-"POT-Creation-Date: 2015-03-19 21:45+0100\n"
-"PO-Revision-Date: 2015-02-25 16:12+0000\n"
+"POT-Creation-Date: 2014-12-15 17:47+0100\n"
+"PO-Revision-Date: 2015-02-25 16:04+0000\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>\n"
-"Language-Team: Swedish (http://www.transifex.com/projects/p/FusionDirectory-108/language/sv/)\n"
+"Language-Team: Swedish (http://www.transifex.com/projects/p/FusionDirectory-109/language/sv/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -169,7 +169,6 @@ msgid "Fax ID"
 msgstr ""
 
 #: addons/faxreports/class_faxreport.inc:494
-#: addons/faxreports/contents.tpl.c:29
 msgid "Date"
 msgstr ""
 
@@ -178,23 +177,22 @@ msgid "Time"
 msgstr ""
 
 #: addons/faxreports/class_faxreport.inc:495
-#: addons/faxreports/contents.tpl.c:32 addons/faxreports/detail.tpl.c:29
 msgid "Status"
 msgstr "Status"
 
-#: addons/faxreports/class_faxreport.inc:496 addons/faxreports/detail.tpl.c:20
+#: addons/faxreports/class_faxreport.inc:496
 msgid "Sender ID"
 msgstr ""
 
-#: addons/faxreports/class_faxreport.inc:497 addons/faxreports/detail.tpl.c:17
+#: addons/faxreports/class_faxreport.inc:497
 msgid "Sender MSN"
 msgstr ""
 
-#: addons/faxreports/class_faxreport.inc:498 addons/faxreports/detail.tpl.c:26
+#: addons/faxreports/class_faxreport.inc:498
 msgid "Receiver ID"
 msgstr ""
 
-#: addons/faxreports/class_faxreport.inc:499 addons/faxreports/detail.tpl.c:23
+#: addons/faxreports/class_faxreport.inc:499
 msgid "Receiver MSN"
 msgstr ""
 
@@ -206,7 +204,7 @@ msgstr ""
 msgid "Status Message"
 msgstr ""
 
-#: addons/faxreports/class_faxreport.inc:502 addons/faxreports/detail.tpl.c:35
+#: addons/faxreports/class_faxreport.inc:502
 msgid "Transfer time"
 msgstr ""
 
@@ -274,8 +272,7 @@ msgstr ""
 
 #: personal/faxaccount/class_gofaxAccount.inc:796
 #: personal/faxaccount/faxNumberSelect/faxNumberSelect-list.xml:56
-#: config/fax/class_faxConfig.inc:42 personal/faxaccount/generic.tpl.c:5
-#: personal/faxaccount/paste_generic.tpl.c:5
+#: config/fax/class_faxConfig.inc:42
 msgid "Fax"
 msgstr "Fax"
 
@@ -284,12 +281,10 @@ msgid "Fax account settings"
 msgstr ""
 
 #: personal/faxaccount/class_gofaxAccount.inc:806
-#: personal/faxaccount/generic.tpl.c:11
 msgid "Language"
 msgstr "SprÃ¥k"
 
 #: personal/faxaccount/class_gofaxAccount.inc:807
-#: personal/faxaccount/generic.tpl.c:17
 msgid "Delivery format"
 msgstr ""
 
@@ -302,12 +297,10 @@ msgid "Enable/Disable fax"
 msgstr ""
 
 #: personal/faxaccount/class_gofaxAccount.inc:810
-#: personal/faxaccount/generic.tpl.c:32
 msgid "Deliver fax as mail"
 msgstr ""
 
 #: personal/faxaccount/class_gofaxAccount.inc:811
-#: personal/faxaccount/generic.tpl.c:35
 msgid "Deliver fax to printer"
 msgstr ""
 
@@ -324,7 +317,6 @@ msgid "Please select the desired entries"
 msgstr "VÃ¤lj Ã¶nskade poster"
 
 #: personal/faxaccount/faxNumberSelect/faxNumberSelect-list.xml:14
-#: addons/faxreports/contents.tpl.c:26 addons/faxreports/detail.tpl.c:11
 msgid "User"
 msgstr "AnvÃ¤ndare"
 
@@ -379,181 +371,3 @@ msgstr ""
 #: config/fax/class_faxConfig.inc:45
 msgid "Branch in which fax blocklists will be stored"
 msgstr ""
-
-#: addons/faxreports/contents.tpl.c:2
-#: personal/faxaccount/faxNumberSelect/faxNumberSelect-filter.tpl.c:2
-msgid "Filter"
-msgstr "Filter"
-
-#: addons/faxreports/contents.tpl.c:5
-msgid "Search for"
-msgstr ""
-
-#: addons/faxreports/contents.tpl.c:8
-msgid "Enter user name to search for"
-msgstr ""
-
-#: addons/faxreports/contents.tpl.c:11 addons/faxreports/contents.tpl.c:20
-msgid "in"
-msgstr "i"
-
-#: addons/faxreports/contents.tpl.c:14
-msgid "Select subtree to base search on"
-msgstr ""
-
-#: addons/faxreports/contents.tpl.c:17
-msgid "during"
-msgstr ""
-
-#: addons/faxreports/contents.tpl.c:23
-msgid "Search"
-msgstr "SÃ¶k"
-
-#: addons/faxreports/contents.tpl.c:35
-msgid "Sender"
-msgstr ""
-
-#: addons/faxreports/contents.tpl.c:38
-msgid "Receiver"
-msgstr ""
-
-#: addons/faxreports/contents.tpl.c:41 addons/faxreports/detail.tpl.c:38
-msgid "# pages"
-msgstr ""
-
-#: addons/faxreports/contents.tpl.c:44
-msgid "Search returned no results..."
-msgstr ""
-
-#: addons/faxreports/detail.tpl.c:2
-msgid "FAX preview - please wait"
-msgstr ""
-
-#: addons/faxreports/detail.tpl.c:5
-msgid "Click on fax to download"
-msgstr ""
-
-#: addons/faxreports/detail.tpl.c:8
-msgid "FAX ID"
-msgstr ""
-
-#: addons/faxreports/detail.tpl.c:14
-msgid "Date / Time"
-msgstr ""
-
-#: addons/faxreports/detail.tpl.c:32
-msgid "Status message"
-msgstr ""
-
-#: personal/faxaccount/generic.tpl.c:2
-#: personal/faxaccount/paste_generic.tpl.c:2
-msgid "Generic"
-msgstr "Generisk"
-
-#: personal/faxaccount/generic.tpl.c:8
-msgid "Fax number for fax to trigger on"
-msgstr ""
-
-#: personal/faxaccount/generic.tpl.c:14
-msgid "Specify the fax communication language for fax to mail gateway"
-msgstr ""
-
-#: personal/faxaccount/generic.tpl.c:20
-msgid "Specify delivery format for fax to mail gateway"
-msgstr ""
-
-#: personal/faxaccount/generic.tpl.c:23
-msgid "Delivery methods"
-msgstr ""
-
-#: personal/faxaccount/generic.tpl.c:26
-msgid "Temporary disable fax usage"
-msgstr ""
-
-#: personal/faxaccount/generic.tpl.c:29
-msgid "Deliver fax as mail to"
-msgstr ""
-
-#: personal/faxaccount/generic.tpl.c:38
-msgid "Alternate fax numbers"
-msgstr ""
-
-#: personal/faxaccount/generic.tpl.c:41
-msgid "Add local"
-msgstr ""
-
-#: personal/faxaccount/generic.tpl.c:44
-msgid "Blocklists"
-msgstr ""
-
-#: personal/faxaccount/generic.tpl.c:47
-msgid "Blocklists for incoming fax"
-msgstr ""
-
-#: personal/faxaccount/generic.tpl.c:50 personal/faxaccount/generic.tpl.c:56
-msgid "Edit"
-msgstr "Redigera"
-
-#: personal/faxaccount/generic.tpl.c:53
-msgid "Blocklists for outgoing fax"
-msgstr ""
-
-#: personal/faxaccount/lists.tpl.c:2
-msgid "Blocked numbers/lists"
-msgstr ""
-
-#: personal/faxaccount/lists.tpl.c:5
-msgid "List of predefined blocklists"
-msgstr ""
-
-#: personal/faxaccount/lists.tpl.c:8
-msgid "Add the list to the blocklists"
-msgstr ""
-
-#: personal/faxaccount/paste_generic.tpl.c:8
-msgid "Fax number for GOfax to trigger on"
-msgstr ""
-
-#: personal/faxaccount/paste_generic.tpl.c:11
-msgid "Alternate fax numbers will not be copied"
-msgstr ""
-
-#: personal/faxaccount/locals.tpl.c:2
-msgid "Select numbers to add"
-msgstr ""
-
-#: personal/faxaccount/locals.tpl.c:5
-msgid "Filters"
-msgstr "Filter"
-
-#: personal/faxaccount/locals.tpl.c:8
-msgid "Display numbers of department"
-msgstr ""
-
-#: personal/faxaccount/locals.tpl.c:11
-msgid "Choose the department the search will be based on"
-msgstr "VÃ¤lj vilken avdelning sÃ¶kningen ska baseras pÃ¥"
-
-#: personal/faxaccount/locals.tpl.c:14
-msgid "Display numbers matching"
-msgstr ""
-
-#: personal/faxaccount/locals.tpl.c:17
-msgid "Regular expression for matching numbers"
-msgstr ""
-
-#: personal/faxaccount/locals.tpl.c:20
-msgid "Display numbers of user"
-msgstr ""
-
-#: personal/faxaccount/locals.tpl.c:23
-msgid "User name of which numbers are shown"
-msgstr ""
-
-#: personal/faxaccount/faxNumberSelect/faxNumberSelect-filter.tpl.c:5
-msgid "Name"
-msgstr "Namn"
-
-#: personal/faxaccount/faxNumberSelect/faxNumberSelect-list.tpl.c:2
-msgid "Base"
-msgstr "Bas"
diff --git a/fax/locale/ug/fusiondirectory.po b/fax/locale/ug/fusiondirectory.po
index 2c4840ebf4adc7407bc2a5267fdf74d43b7f46db..83d035884303625e482aa667555e25e64fa2bac8 100644
--- a/fax/locale/ug/fusiondirectory.po
+++ b/fax/locale/ug/fusiondirectory.po
@@ -5,12 +5,12 @@
 # Translators:
 msgid ""
 msgstr ""
-"Project-Id-Version: FusionDirectory-108\n"
+"Project-Id-Version: FusionDirectory-109\n"
 "Report-Msgid-Bugs-To: documentation@lists.fusiondirectory.org\n"
-"POT-Creation-Date: 2015-03-19 21:45+0100\n"
-"PO-Revision-Date: 2015-02-25 15:46+0000\n"
+"POT-Creation-Date: 2014-12-15 17:47+0100\n"
+"PO-Revision-Date: 2014-12-15 16:55+0000\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>\n"
-"Language-Team: Uighur (http://www.transifex.com/projects/p/FusionDirectory-108/language/ug/)\n"
+"Language-Team: Uighur (http://www.transifex.com/projects/p/FusionDirectory-109/language/ug/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -169,7 +169,6 @@ msgid "Fax ID"
 msgstr ""
 
 #: addons/faxreports/class_faxreport.inc:494
-#: addons/faxreports/contents.tpl.c:29
 msgid "Date"
 msgstr ""
 
@@ -178,23 +177,22 @@ msgid "Time"
 msgstr ""
 
 #: addons/faxreports/class_faxreport.inc:495
-#: addons/faxreports/contents.tpl.c:32 addons/faxreports/detail.tpl.c:29
 msgid "Status"
 msgstr ""
 
-#: addons/faxreports/class_faxreport.inc:496 addons/faxreports/detail.tpl.c:20
+#: addons/faxreports/class_faxreport.inc:496
 msgid "Sender ID"
 msgstr ""
 
-#: addons/faxreports/class_faxreport.inc:497 addons/faxreports/detail.tpl.c:17
+#: addons/faxreports/class_faxreport.inc:497
 msgid "Sender MSN"
 msgstr ""
 
-#: addons/faxreports/class_faxreport.inc:498 addons/faxreports/detail.tpl.c:26
+#: addons/faxreports/class_faxreport.inc:498
 msgid "Receiver ID"
 msgstr ""
 
-#: addons/faxreports/class_faxreport.inc:499 addons/faxreports/detail.tpl.c:23
+#: addons/faxreports/class_faxreport.inc:499
 msgid "Receiver MSN"
 msgstr ""
 
@@ -206,7 +204,7 @@ msgstr ""
 msgid "Status Message"
 msgstr ""
 
-#: addons/faxreports/class_faxreport.inc:502 addons/faxreports/detail.tpl.c:35
+#: addons/faxreports/class_faxreport.inc:502
 msgid "Transfer time"
 msgstr ""
 
@@ -274,8 +272,7 @@ msgstr ""
 
 #: personal/faxaccount/class_gofaxAccount.inc:796
 #: personal/faxaccount/faxNumberSelect/faxNumberSelect-list.xml:56
-#: config/fax/class_faxConfig.inc:42 personal/faxaccount/generic.tpl.c:5
-#: personal/faxaccount/paste_generic.tpl.c:5
+#: config/fax/class_faxConfig.inc:42
 msgid "Fax"
 msgstr ""
 
@@ -284,12 +281,10 @@ msgid "Fax account settings"
 msgstr ""
 
 #: personal/faxaccount/class_gofaxAccount.inc:806
-#: personal/faxaccount/generic.tpl.c:11
 msgid "Language"
 msgstr ""
 
 #: personal/faxaccount/class_gofaxAccount.inc:807
-#: personal/faxaccount/generic.tpl.c:17
 msgid "Delivery format"
 msgstr ""
 
@@ -302,12 +297,10 @@ msgid "Enable/Disable fax"
 msgstr ""
 
 #: personal/faxaccount/class_gofaxAccount.inc:810
-#: personal/faxaccount/generic.tpl.c:32
 msgid "Deliver fax as mail"
 msgstr ""
 
 #: personal/faxaccount/class_gofaxAccount.inc:811
-#: personal/faxaccount/generic.tpl.c:35
 msgid "Deliver fax to printer"
 msgstr ""
 
@@ -324,7 +317,6 @@ msgid "Please select the desired entries"
 msgstr ""
 
 #: personal/faxaccount/faxNumberSelect/faxNumberSelect-list.xml:14
-#: addons/faxreports/contents.tpl.c:26 addons/faxreports/detail.tpl.c:11
 msgid "User"
 msgstr ""
 
@@ -379,181 +371,3 @@ msgstr ""
 #: config/fax/class_faxConfig.inc:45
 msgid "Branch in which fax blocklists will be stored"
 msgstr ""
-
-#: addons/faxreports/contents.tpl.c:2
-#: personal/faxaccount/faxNumberSelect/faxNumberSelect-filter.tpl.c:2
-msgid "Filter"
-msgstr ""
-
-#: addons/faxreports/contents.tpl.c:5
-msgid "Search for"
-msgstr ""
-
-#: addons/faxreports/contents.tpl.c:8
-msgid "Enter user name to search for"
-msgstr ""
-
-#: addons/faxreports/contents.tpl.c:11 addons/faxreports/contents.tpl.c:20
-msgid "in"
-msgstr ""
-
-#: addons/faxreports/contents.tpl.c:14
-msgid "Select subtree to base search on"
-msgstr ""
-
-#: addons/faxreports/contents.tpl.c:17
-msgid "during"
-msgstr ""
-
-#: addons/faxreports/contents.tpl.c:23
-msgid "Search"
-msgstr ""
-
-#: addons/faxreports/contents.tpl.c:35
-msgid "Sender"
-msgstr ""
-
-#: addons/faxreports/contents.tpl.c:38
-msgid "Receiver"
-msgstr ""
-
-#: addons/faxreports/contents.tpl.c:41 addons/faxreports/detail.tpl.c:38
-msgid "# pages"
-msgstr ""
-
-#: addons/faxreports/contents.tpl.c:44
-msgid "Search returned no results..."
-msgstr ""
-
-#: addons/faxreports/detail.tpl.c:2
-msgid "FAX preview - please wait"
-msgstr ""
-
-#: addons/faxreports/detail.tpl.c:5
-msgid "Click on fax to download"
-msgstr ""
-
-#: addons/faxreports/detail.tpl.c:8
-msgid "FAX ID"
-msgstr ""
-
-#: addons/faxreports/detail.tpl.c:14
-msgid "Date / Time"
-msgstr ""
-
-#: addons/faxreports/detail.tpl.c:32
-msgid "Status message"
-msgstr ""
-
-#: personal/faxaccount/generic.tpl.c:2
-#: personal/faxaccount/paste_generic.tpl.c:2
-msgid "Generic"
-msgstr ""
-
-#: personal/faxaccount/generic.tpl.c:8
-msgid "Fax number for fax to trigger on"
-msgstr ""
-
-#: personal/faxaccount/generic.tpl.c:14
-msgid "Specify the fax communication language for fax to mail gateway"
-msgstr ""
-
-#: personal/faxaccount/generic.tpl.c:20
-msgid "Specify delivery format for fax to mail gateway"
-msgstr ""
-
-#: personal/faxaccount/generic.tpl.c:23
-msgid "Delivery methods"
-msgstr ""
-
-#: personal/faxaccount/generic.tpl.c:26
-msgid "Temporary disable fax usage"
-msgstr ""
-
-#: personal/faxaccount/generic.tpl.c:29
-msgid "Deliver fax as mail to"
-msgstr ""
-
-#: personal/faxaccount/generic.tpl.c:38
-msgid "Alternate fax numbers"
-msgstr ""
-
-#: personal/faxaccount/generic.tpl.c:41
-msgid "Add local"
-msgstr ""
-
-#: personal/faxaccount/generic.tpl.c:44
-msgid "Blocklists"
-msgstr ""
-
-#: personal/faxaccount/generic.tpl.c:47
-msgid "Blocklists for incoming fax"
-msgstr ""
-
-#: personal/faxaccount/generic.tpl.c:50 personal/faxaccount/generic.tpl.c:56
-msgid "Edit"
-msgstr ""
-
-#: personal/faxaccount/generic.tpl.c:53
-msgid "Blocklists for outgoing fax"
-msgstr ""
-
-#: personal/faxaccount/lists.tpl.c:2
-msgid "Blocked numbers/lists"
-msgstr ""
-
-#: personal/faxaccount/lists.tpl.c:5
-msgid "List of predefined blocklists"
-msgstr ""
-
-#: personal/faxaccount/lists.tpl.c:8
-msgid "Add the list to the blocklists"
-msgstr ""
-
-#: personal/faxaccount/paste_generic.tpl.c:8
-msgid "Fax number for GOfax to trigger on"
-msgstr ""
-
-#: personal/faxaccount/paste_generic.tpl.c:11
-msgid "Alternate fax numbers will not be copied"
-msgstr ""
-
-#: personal/faxaccount/locals.tpl.c:2
-msgid "Select numbers to add"
-msgstr ""
-
-#: personal/faxaccount/locals.tpl.c:5
-msgid "Filters"
-msgstr ""
-
-#: personal/faxaccount/locals.tpl.c:8
-msgid "Display numbers of department"
-msgstr ""
-
-#: personal/faxaccount/locals.tpl.c:11
-msgid "Choose the department the search will be based on"
-msgstr ""
-
-#: personal/faxaccount/locals.tpl.c:14
-msgid "Display numbers matching"
-msgstr ""
-
-#: personal/faxaccount/locals.tpl.c:17
-msgid "Regular expression for matching numbers"
-msgstr ""
-
-#: personal/faxaccount/locals.tpl.c:20
-msgid "Display numbers of user"
-msgstr ""
-
-#: personal/faxaccount/locals.tpl.c:23
-msgid "User name of which numbers are shown"
-msgstr ""
-
-#: personal/faxaccount/faxNumberSelect/faxNumberSelect-filter.tpl.c:5
-msgid "Name"
-msgstr ""
-
-#: personal/faxaccount/faxNumberSelect/faxNumberSelect-list.tpl.c:2
-msgid "Base"
-msgstr ""
diff --git a/fax/locale/vi_VN/fusiondirectory.po b/fax/locale/vi_VN/fusiondirectory.po
index dd984fb1ed0d86eb79153c8b48fa1eb18f73b2fc..2bb12a88b73563bafa7e956f6155aca565913f71 100644
--- a/fax/locale/vi_VN/fusiondirectory.po
+++ b/fax/locale/vi_VN/fusiondirectory.po
@@ -5,12 +5,12 @@
 # Translators:
 msgid ""
 msgstr ""
-"Project-Id-Version: FusionDirectory-108\n"
+"Project-Id-Version: FusionDirectory-109\n"
 "Report-Msgid-Bugs-To: documentation@lists.fusiondirectory.org\n"
-"POT-Creation-Date: 2015-03-19 21:45+0100\n"
-"PO-Revision-Date: 2015-02-25 16:12+0000\n"
+"POT-Creation-Date: 2014-12-15 17:47+0100\n"
+"PO-Revision-Date: 2015-02-25 16:04+0000\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>\n"
-"Language-Team: Vietnamese (Viet Nam) (http://www.transifex.com/projects/p/FusionDirectory-108/language/vi_VN/)\n"
+"Language-Team: Vietnamese (Viet Nam) (http://www.transifex.com/projects/p/FusionDirectory-109/language/vi_VN/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -169,7 +169,6 @@ msgid "Fax ID"
 msgstr ""
 
 #: addons/faxreports/class_faxreport.inc:494
-#: addons/faxreports/contents.tpl.c:29
 msgid "Date"
 msgstr ""
 
@@ -178,23 +177,22 @@ msgid "Time"
 msgstr ""
 
 #: addons/faxreports/class_faxreport.inc:495
-#: addons/faxreports/contents.tpl.c:32 addons/faxreports/detail.tpl.c:29
 msgid "Status"
 msgstr "Tráº¡ng thÃ¡i"
 
-#: addons/faxreports/class_faxreport.inc:496 addons/faxreports/detail.tpl.c:20
+#: addons/faxreports/class_faxreport.inc:496
 msgid "Sender ID"
 msgstr ""
 
-#: addons/faxreports/class_faxreport.inc:497 addons/faxreports/detail.tpl.c:17
+#: addons/faxreports/class_faxreport.inc:497
 msgid "Sender MSN"
 msgstr ""
 
-#: addons/faxreports/class_faxreport.inc:498 addons/faxreports/detail.tpl.c:26
+#: addons/faxreports/class_faxreport.inc:498
 msgid "Receiver ID"
 msgstr ""
 
-#: addons/faxreports/class_faxreport.inc:499 addons/faxreports/detail.tpl.c:23
+#: addons/faxreports/class_faxreport.inc:499
 msgid "Receiver MSN"
 msgstr ""
 
@@ -206,7 +204,7 @@ msgstr ""
 msgid "Status Message"
 msgstr ""
 
-#: addons/faxreports/class_faxreport.inc:502 addons/faxreports/detail.tpl.c:35
+#: addons/faxreports/class_faxreport.inc:502
 msgid "Transfer time"
 msgstr ""
 
@@ -274,8 +272,7 @@ msgstr ""
 
 #: personal/faxaccount/class_gofaxAccount.inc:796
 #: personal/faxaccount/faxNumberSelect/faxNumberSelect-list.xml:56
-#: config/fax/class_faxConfig.inc:42 personal/faxaccount/generic.tpl.c:5
-#: personal/faxaccount/paste_generic.tpl.c:5
+#: config/fax/class_faxConfig.inc:42
 msgid "Fax"
 msgstr "Sá»‘ fax"
 
@@ -284,12 +281,10 @@ msgid "Fax account settings"
 msgstr ""
 
 #: personal/faxaccount/class_gofaxAccount.inc:806
-#: personal/faxaccount/generic.tpl.c:11
 msgid "Language"
 msgstr ""
 
 #: personal/faxaccount/class_gofaxAccount.inc:807
-#: personal/faxaccount/generic.tpl.c:17
 msgid "Delivery format"
 msgstr ""
 
@@ -302,12 +297,10 @@ msgid "Enable/Disable fax"
 msgstr ""
 
 #: personal/faxaccount/class_gofaxAccount.inc:810
-#: personal/faxaccount/generic.tpl.c:32
 msgid "Deliver fax as mail"
 msgstr ""
 
 #: personal/faxaccount/class_gofaxAccount.inc:811
-#: personal/faxaccount/generic.tpl.c:35
 msgid "Deliver fax to printer"
 msgstr ""
 
@@ -324,7 +317,6 @@ msgid "Please select the desired entries"
 msgstr ""
 
 #: personal/faxaccount/faxNumberSelect/faxNumberSelect-list.xml:14
-#: addons/faxreports/contents.tpl.c:26 addons/faxreports/detail.tpl.c:11
 msgid "User"
 msgstr "NgÆ°á»i dÃ¹ng"
 
@@ -379,181 +371,3 @@ msgstr ""
 #: config/fax/class_faxConfig.inc:45
 msgid "Branch in which fax blocklists will be stored"
 msgstr ""
-
-#: addons/faxreports/contents.tpl.c:2
-#: personal/faxaccount/faxNumberSelect/faxNumberSelect-filter.tpl.c:2
-msgid "Filter"
-msgstr ""
-
-#: addons/faxreports/contents.tpl.c:5
-msgid "Search for"
-msgstr ""
-
-#: addons/faxreports/contents.tpl.c:8
-msgid "Enter user name to search for"
-msgstr ""
-
-#: addons/faxreports/contents.tpl.c:11 addons/faxreports/contents.tpl.c:20
-msgid "in"
-msgstr ""
-
-#: addons/faxreports/contents.tpl.c:14
-msgid "Select subtree to base search on"
-msgstr ""
-
-#: addons/faxreports/contents.tpl.c:17
-msgid "during"
-msgstr ""
-
-#: addons/faxreports/contents.tpl.c:23
-msgid "Search"
-msgstr "TÃ¬m kiáº¿m"
-
-#: addons/faxreports/contents.tpl.c:35
-msgid "Sender"
-msgstr ""
-
-#: addons/faxreports/contents.tpl.c:38
-msgid "Receiver"
-msgstr ""
-
-#: addons/faxreports/contents.tpl.c:41 addons/faxreports/detail.tpl.c:38
-msgid "# pages"
-msgstr ""
-
-#: addons/faxreports/contents.tpl.c:44
-msgid "Search returned no results..."
-msgstr ""
-
-#: addons/faxreports/detail.tpl.c:2
-msgid "FAX preview - please wait"
-msgstr ""
-
-#: addons/faxreports/detail.tpl.c:5
-msgid "Click on fax to download"
-msgstr ""
-
-#: addons/faxreports/detail.tpl.c:8
-msgid "FAX ID"
-msgstr ""
-
-#: addons/faxreports/detail.tpl.c:14
-msgid "Date / Time"
-msgstr ""
-
-#: addons/faxreports/detail.tpl.c:32
-msgid "Status message"
-msgstr ""
-
-#: personal/faxaccount/generic.tpl.c:2
-#: personal/faxaccount/paste_generic.tpl.c:2
-msgid "Generic"
-msgstr "ThÃ´ng tin chung"
-
-#: personal/faxaccount/generic.tpl.c:8
-msgid "Fax number for fax to trigger on"
-msgstr ""
-
-#: personal/faxaccount/generic.tpl.c:14
-msgid "Specify the fax communication language for fax to mail gateway"
-msgstr ""
-
-#: personal/faxaccount/generic.tpl.c:20
-msgid "Specify delivery format for fax to mail gateway"
-msgstr ""
-
-#: personal/faxaccount/generic.tpl.c:23
-msgid "Delivery methods"
-msgstr ""
-
-#: personal/faxaccount/generic.tpl.c:26
-msgid "Temporary disable fax usage"
-msgstr ""
-
-#: personal/faxaccount/generic.tpl.c:29
-msgid "Deliver fax as mail to"
-msgstr ""
-
-#: personal/faxaccount/generic.tpl.c:38
-msgid "Alternate fax numbers"
-msgstr ""
-
-#: personal/faxaccount/generic.tpl.c:41
-msgid "Add local"
-msgstr ""
-
-#: personal/faxaccount/generic.tpl.c:44
-msgid "Blocklists"
-msgstr ""
-
-#: personal/faxaccount/generic.tpl.c:47
-msgid "Blocklists for incoming fax"
-msgstr ""
-
-#: personal/faxaccount/generic.tpl.c:50 personal/faxaccount/generic.tpl.c:56
-msgid "Edit"
-msgstr "Hiá»‡u chá»‰nh"
-
-#: personal/faxaccount/generic.tpl.c:53
-msgid "Blocklists for outgoing fax"
-msgstr ""
-
-#: personal/faxaccount/lists.tpl.c:2
-msgid "Blocked numbers/lists"
-msgstr ""
-
-#: personal/faxaccount/lists.tpl.c:5
-msgid "List of predefined blocklists"
-msgstr ""
-
-#: personal/faxaccount/lists.tpl.c:8
-msgid "Add the list to the blocklists"
-msgstr ""
-
-#: personal/faxaccount/paste_generic.tpl.c:8
-msgid "Fax number for GOfax to trigger on"
-msgstr ""
-
-#: personal/faxaccount/paste_generic.tpl.c:11
-msgid "Alternate fax numbers will not be copied"
-msgstr ""
-
-#: personal/faxaccount/locals.tpl.c:2
-msgid "Select numbers to add"
-msgstr ""
-
-#: personal/faxaccount/locals.tpl.c:5
-msgid "Filters"
-msgstr "CÃ¡c bá»™ lá»c"
-
-#: personal/faxaccount/locals.tpl.c:8
-msgid "Display numbers of department"
-msgstr ""
-
-#: personal/faxaccount/locals.tpl.c:11
-msgid "Choose the department the search will be based on"
-msgstr "Chá»n bá»™ pháºn mÃ  viá»‡c tÃ¬m kiáº¿m sáº½ tiáº¿n hÃ nh trÃªn Ä‘Ã³ "
-
-#: personal/faxaccount/locals.tpl.c:14
-msgid "Display numbers matching"
-msgstr ""
-
-#: personal/faxaccount/locals.tpl.c:17
-msgid "Regular expression for matching numbers"
-msgstr ""
-
-#: personal/faxaccount/locals.tpl.c:20
-msgid "Display numbers of user"
-msgstr ""
-
-#: personal/faxaccount/locals.tpl.c:23
-msgid "User name of which numbers are shown"
-msgstr ""
-
-#: personal/faxaccount/faxNumberSelect/faxNumberSelect-filter.tpl.c:5
-msgid "Name"
-msgstr "TÃªn"
-
-#: personal/faxaccount/faxNumberSelect/faxNumberSelect-list.tpl.c:2
-msgid "Base"
-msgstr "CÆ¡ sá»Ÿ"
diff --git a/fax/locale/zh/fusiondirectory.po b/fax/locale/zh/fusiondirectory.po
index 31bf4d7e62ec1e7f3f743d1a155606d2e9af21f1..309d469b0b01e8fc0e06ff992192c3e0770f6b7a 100644
--- a/fax/locale/zh/fusiondirectory.po
+++ b/fax/locale/zh/fusiondirectory.po
@@ -3,15 +3,14 @@
 # This file is distributed under the same license as the PACKAGE package.
 # 
 # Translators:
-#  Jiang Xin <worldhello.net@gmail.com>, 2007
 msgid ""
 msgstr ""
-"Project-Id-Version: FusionDirectory-108\n"
+"Project-Id-Version: FusionDirectory-109\n"
 "Report-Msgid-Bugs-To: documentation@lists.fusiondirectory.org\n"
-"POT-Creation-Date: 2015-03-19 21:45+0100\n"
-"PO-Revision-Date: 2015-02-25 16:12+0000\n"
+"POT-Creation-Date: 2014-12-15 17:47+0100\n"
+"PO-Revision-Date: 2015-02-25 16:13+0000\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>\n"
-"Language-Team: Chinese (http://www.transifex.com/projects/p/FusionDirectory-108/language/zh/)\n"
+"Language-Team: Chinese (http://www.transifex.com/projects/p/FusionDirectory-109/language/zh/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -170,7 +169,6 @@ msgid "Fax ID"
 msgstr ""
 
 #: addons/faxreports/class_faxreport.inc:494
-#: addons/faxreports/contents.tpl.c:29
 msgid "Date"
 msgstr "æ—¥æœŸ"
 
@@ -179,23 +177,22 @@ msgid "Time"
 msgstr ""
 
 #: addons/faxreports/class_faxreport.inc:495
-#: addons/faxreports/contents.tpl.c:32 addons/faxreports/detail.tpl.c:29
 msgid "Status"
 msgstr "çŠ¶æ€"
 
-#: addons/faxreports/class_faxreport.inc:496 addons/faxreports/detail.tpl.c:20
+#: addons/faxreports/class_faxreport.inc:496
 msgid "Sender ID"
 msgstr "å‘é€è€… ID"
 
-#: addons/faxreports/class_faxreport.inc:497 addons/faxreports/detail.tpl.c:17
+#: addons/faxreports/class_faxreport.inc:497
 msgid "Sender MSN"
 msgstr "å‘é€è€… MSN"
 
-#: addons/faxreports/class_faxreport.inc:498 addons/faxreports/detail.tpl.c:26
+#: addons/faxreports/class_faxreport.inc:498
 msgid "Receiver ID"
 msgstr "æŽ¥æ”¶è€… ID"
 
-#: addons/faxreports/class_faxreport.inc:499 addons/faxreports/detail.tpl.c:23
+#: addons/faxreports/class_faxreport.inc:499
 msgid "Receiver MSN"
 msgstr "æŽ¥æ”¶è€… MSN"
 
@@ -207,7 +204,7 @@ msgstr ""
 msgid "Status Message"
 msgstr ""
 
-#: addons/faxreports/class_faxreport.inc:502 addons/faxreports/detail.tpl.c:35
+#: addons/faxreports/class_faxreport.inc:502
 msgid "Transfer time"
 msgstr "ä¼ é€æ—¶é—´"
 
@@ -275,8 +272,7 @@ msgstr ""
 
 #: personal/faxaccount/class_gofaxAccount.inc:796
 #: personal/faxaccount/faxNumberSelect/faxNumberSelect-list.xml:56
-#: config/fax/class_faxConfig.inc:42 personal/faxaccount/generic.tpl.c:5
-#: personal/faxaccount/paste_generic.tpl.c:5
+#: config/fax/class_faxConfig.inc:42
 msgid "Fax"
 msgstr "ä¼ çœŸ"
 
@@ -285,12 +281,10 @@ msgid "Fax account settings"
 msgstr ""
 
 #: personal/faxaccount/class_gofaxAccount.inc:806
-#: personal/faxaccount/generic.tpl.c:11
 msgid "Language"
 msgstr "è¯è¨€"
 
 #: personal/faxaccount/class_gofaxAccount.inc:807
-#: personal/faxaccount/generic.tpl.c:17
 msgid "Delivery format"
 msgstr "ä¼ è¾“æ ¼å¼"
 
@@ -303,12 +297,10 @@ msgid "Enable/Disable fax"
 msgstr ""
 
 #: personal/faxaccount/class_gofaxAccount.inc:810
-#: personal/faxaccount/generic.tpl.c:32
 msgid "Deliver fax as mail"
 msgstr "å‘é€ä¼ çœŸè‡³é‚®ä»¶"
 
 #: personal/faxaccount/class_gofaxAccount.inc:811
-#: personal/faxaccount/generic.tpl.c:35
 msgid "Deliver fax to printer"
 msgstr "å‘é€ä¼ çœŸè‡³æ‰“å°æœº"
 
@@ -325,7 +317,6 @@ msgid "Please select the desired entries"
 msgstr ""
 
 #: personal/faxaccount/faxNumberSelect/faxNumberSelect-list.xml:14
-#: addons/faxreports/contents.tpl.c:26 addons/faxreports/detail.tpl.c:11
 msgid "User"
 msgstr "ç”¨æˆ·"
 
@@ -380,181 +371,3 @@ msgstr ""
 #: config/fax/class_faxConfig.inc:45
 msgid "Branch in which fax blocklists will be stored"
 msgstr ""
-
-#: addons/faxreports/contents.tpl.c:2
-#: personal/faxaccount/faxNumberSelect/faxNumberSelect-filter.tpl.c:2
-msgid "Filter"
-msgstr "è¿‡æ»¤å™¨"
-
-#: addons/faxreports/contents.tpl.c:5
-msgid "Search for"
-msgstr "æŸ¥è¯¢"
-
-#: addons/faxreports/contents.tpl.c:8
-msgid "Enter user name to search for"
-msgstr "è¾“å…¥è¦æŸ¥è¯¢çš„ç”¨æˆ·å"
-
-#: addons/faxreports/contents.tpl.c:11 addons/faxreports/contents.tpl.c:20
-msgid "in"
-msgstr "äºŽ"
-
-#: addons/faxreports/contents.tpl.c:14
-msgid "Select subtree to base search on"
-msgstr "é€‰æ‹©æŸ¥è¯¢åŸºäºŽçš„åæ ‘"
-
-#: addons/faxreports/contents.tpl.c:17
-msgid "during"
-msgstr "åœ¨"
-
-#: addons/faxreports/contents.tpl.c:23
-msgid "Search"
-msgstr "æŸ¥æ‰¾"
-
-#: addons/faxreports/contents.tpl.c:35
-msgid "Sender"
-msgstr "å‘é€è€…"
-
-#: addons/faxreports/contents.tpl.c:38
-msgid "Receiver"
-msgstr "æŽ¥æ”¶è€…"
-
-#: addons/faxreports/contents.tpl.c:41 addons/faxreports/detail.tpl.c:38
-msgid "# pages"
-msgstr "# é¡µ"
-
-#: addons/faxreports/contents.tpl.c:44
-msgid "Search returned no results..."
-msgstr "æŸ¥æ— ç»“æžœ..."
-
-#: addons/faxreports/detail.tpl.c:2
-msgid "FAX preview - please wait"
-msgstr "ä¼ çœŸé¢„è§ˆ â”€â”€ è¯·ç‰å¾…"
-
-#: addons/faxreports/detail.tpl.c:5
-msgid "Click on fax to download"
-msgstr "ç‚¹å‡»ä¼ çœŸä¸‹è½½"
-
-#: addons/faxreports/detail.tpl.c:8
-msgid "FAX ID"
-msgstr "ä¼ çœŸ ID"
-
-#: addons/faxreports/detail.tpl.c:14
-msgid "Date / Time"
-msgstr "æ—¥æœŸ / æ—¶é—´"
-
-#: addons/faxreports/detail.tpl.c:32
-msgid "Status message"
-msgstr "çŠ¶æ€ä¿¡æ¯"
-
-#: personal/faxaccount/generic.tpl.c:2
-#: personal/faxaccount/paste_generic.tpl.c:2
-msgid "Generic"
-msgstr "é€šç”¨é…ç½®"
-
-#: personal/faxaccount/generic.tpl.c:8
-msgid "Fax number for fax to trigger on"
-msgstr ""
-
-#: personal/faxaccount/generic.tpl.c:14
-msgid "Specify the fax communication language for fax to mail gateway"
-msgstr ""
-
-#: personal/faxaccount/generic.tpl.c:20
-msgid "Specify delivery format for fax to mail gateway"
-msgstr "è¯´æ˜Žä¼ çœŸåˆ°é‚®ä»¶ç½‘å…³çš„æ ¼å¼"
-
-#: personal/faxaccount/generic.tpl.c:23
-msgid "Delivery methods"
-msgstr "ä¼ è¾“æ–¹æ³•"
-
-#: personal/faxaccount/generic.tpl.c:26
-msgid "Temporary disable fax usage"
-msgstr "ä¸´æ—¶ç¦ç”¨ä¼ çœŸ"
-
-#: personal/faxaccount/generic.tpl.c:29
-msgid "Deliver fax as mail to"
-msgstr "å‘é€ä¼ çœŸè‡³é‚®ä»¶åˆ°"
-
-#: personal/faxaccount/generic.tpl.c:38
-msgid "Alternate fax numbers"
-msgstr "æ›¿ä»£ä¼ çœŸå·ç "
-
-#: personal/faxaccount/generic.tpl.c:41
-msgid "Add local"
-msgstr "æ·»åŠ æœ¬åœ°"
-
-#: personal/faxaccount/generic.tpl.c:44
-msgid "Blocklists"
-msgstr "é»‘åå•"
-
-#: personal/faxaccount/generic.tpl.c:47
-msgid "Blocklists for incoming fax"
-msgstr "è¾“å…¥ä¼ çœŸé»‘åå•"
-
-#: personal/faxaccount/generic.tpl.c:50 personal/faxaccount/generic.tpl.c:56
-msgid "Edit"
-msgstr "ç¼–è¾‘"
-
-#: personal/faxaccount/generic.tpl.c:53
-msgid "Blocklists for outgoing fax"
-msgstr "å¤–å‘ä¼ çœŸé»‘åå•"
-
-#: personal/faxaccount/lists.tpl.c:2
-msgid "Blocked numbers/lists"
-msgstr "å°é”å·ç /åˆ—è¡¨"
-
-#: personal/faxaccount/lists.tpl.c:5
-msgid "List of predefined blocklists"
-msgstr "é¢„å®šä¹‰é»‘åå•åˆ—è¡¨"
-
-#: personal/faxaccount/lists.tpl.c:8
-msgid "Add the list to the blocklists"
-msgstr "æ·»åŠ åˆ—è¡¨è‡³é»‘åå•"
-
-#: personal/faxaccount/paste_generic.tpl.c:8
-msgid "Fax number for GOfax to trigger on"
-msgstr "è¦æ‰“å¼€çš„ GOfax çš„ä¼ çœŸå·ç "
-
-#: personal/faxaccount/paste_generic.tpl.c:11
-msgid "Alternate fax numbers will not be copied"
-msgstr "ä¸æ‹·è´åˆ°æ›¿ä»£ä¼ çœŸå·ç "
-
-#: personal/faxaccount/locals.tpl.c:2
-msgid "Select numbers to add"
-msgstr "é€‰æ‹©è¦æ·»åŠ çš„æ•°å—"
-
-#: personal/faxaccount/locals.tpl.c:5
-msgid "Filters"
-msgstr "è¿‡æ»¤å™¨"
-
-#: personal/faxaccount/locals.tpl.c:8
-msgid "Display numbers of department"
-msgstr "æ˜¾ç¤ºéƒ¨é—¨å·ç "
-
-#: personal/faxaccount/locals.tpl.c:11
-msgid "Choose the department the search will be based on"
-msgstr "é€‰æ‹©ä¸€ä¸ªéƒ¨é—¨æ¥åšæŸ¥è¯¢"
-
-#: personal/faxaccount/locals.tpl.c:14
-msgid "Display numbers matching"
-msgstr "æ˜¾ç¤ºåŒ¹é…æ•°å—"
-
-#: personal/faxaccount/locals.tpl.c:17
-msgid "Regular expression for matching numbers"
-msgstr "åŒ¹é…å·ç çš„æ£åˆ™è¡¨è¾¾å¼"
-
-#: personal/faxaccount/locals.tpl.c:20
-msgid "Display numbers of user"
-msgstr "æ˜¾ç¤ºç”¨æˆ·ç¼–å·"
-
-#: personal/faxaccount/locals.tpl.c:23
-msgid "User name of which numbers are shown"
-msgstr "æ˜¾ç¤ºè¯¥å·ç çš„ç”¨æˆ·å"
-
-#: personal/faxaccount/faxNumberSelect/faxNumberSelect-filter.tpl.c:5
-msgid "Name"
-msgstr "åç§°"
-
-#: personal/faxaccount/faxNumberSelect/faxNumberSelect-list.tpl.c:2
-msgid "Base"
-msgstr "ä½ç½®"
diff --git a/freeradius/locale/ar/fusiondirectory.po b/freeradius/locale/ar/fusiondirectory.po
index 14fc335dd174df11fe035df339e60ee3dc4b0fde..34bb29a5fdaefe566903ca9336d71bd46ea11659 100644
--- a/freeradius/locale/ar/fusiondirectory.po
+++ b/freeradius/locale/ar/fusiondirectory.po
@@ -5,12 +5,12 @@
 # Translators:
 msgid ""
 msgstr ""
-"Project-Id-Version: FusionDirectory-108\n"
+"Project-Id-Version: FusionDirectory-109\n"
 "Report-Msgid-Bugs-To: documentation@lists.fusiondirectory.org\n"
-"POT-Creation-Date: 2015-03-19 21:45+0100\n"
-"PO-Revision-Date: 2014-08-26 14:13+0000\n"
-"Last-Translator: fusiondirectory <contact@fusiondirectory.org>\n"
-"Language-Team: Arabic (http://www.transifex.com/projects/p/FusionDirectory-108/language/ar/)\n"
+"POT-Creation-Date: 2014-12-15 17:47+0100\n"
+"PO-Revision-Date: 2014-08-28 10:28+0000\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: Arabic (http://www.transifex.com/projects/p/FusionDirectory-109/language/ar/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
diff --git a/freeradius/locale/ca/fusiondirectory.po b/freeradius/locale/ca/fusiondirectory.po
index fb09345a798f402cced127c1d928655764ac6ba9..5138946787ea93cecc7aed5ae628df1a724033e6 100644
--- a/freeradius/locale/ca/fusiondirectory.po
+++ b/freeradius/locale/ca/fusiondirectory.po
@@ -5,12 +5,12 @@
 # Translators:
 msgid ""
 msgstr ""
-"Project-Id-Version: FusionDirectory-108\n"
+"Project-Id-Version: FusionDirectory-109\n"
 "Report-Msgid-Bugs-To: documentation@lists.fusiondirectory.org\n"
-"POT-Creation-Date: 2015-03-19 21:45+0100\n"
-"PO-Revision-Date: 2014-08-26 14:13+0000\n"
-"Last-Translator: fusiondirectory <contact@fusiondirectory.org>\n"
-"Language-Team: Catalan (http://www.transifex.com/projects/p/FusionDirectory-108/language/ca/)\n"
+"POT-Creation-Date: 2014-12-15 17:47+0100\n"
+"PO-Revision-Date: 2014-08-28 10:28+0000\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: Catalan (http://www.transifex.com/projects/p/FusionDirectory-109/language/ca/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
diff --git a/freeradius/locale/cs_CZ/fusiondirectory.po b/freeradius/locale/cs_CZ/fusiondirectory.po
index 562b10f8a7d371e864b90569973dd1fa91540676..d5ae5cc0112df0984548fad7c9a6cc3f45117f46 100644
--- a/freeradius/locale/cs_CZ/fusiondirectory.po
+++ b/freeradius/locale/cs_CZ/fusiondirectory.po
@@ -3,14 +3,15 @@
 # This file is distributed under the same license as the PACKAGE package.
 # 
 # Translators:
+# Pavel Borecki <pavel.borecki@gmail.com>, 2014-2015
 msgid ""
 msgstr ""
-"Project-Id-Version: FusionDirectory-108\n"
+"Project-Id-Version: FusionDirectory-109\n"
 "Report-Msgid-Bugs-To: documentation@lists.fusiondirectory.org\n"
-"POT-Creation-Date: 2015-03-19 21:45+0100\n"
-"PO-Revision-Date: 2014-12-08 22:00+0000\n"
-"Last-Translator: fusiondirectory <contact@fusiondirectory.org>\n"
-"Language-Team: Czech (Czech Republic) (http://www.transifex.com/projects/p/FusionDirectory-108/language/cs_CZ/)\n"
+"POT-Creation-Date: 2014-12-15 17:47+0100\n"
+"PO-Revision-Date: 2015-04-07 19:31+0000\n"
+"Last-Translator: Pavel Borecki <pavel.borecki@gmail.com>\n"
+"Language-Team: Czech (Czech Republic) (http://www.transifex.com/projects/p/FusionDirectory-109/language/cs_CZ/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -25,22 +26,22 @@ msgstr ""
 #: admin/freeradius/class_freeradiusGroup.inc:46
 #: personal/freeradius/class_freeradiusAccount.inc:47
 msgid "This Plugin is for Radius accounting based in FreeRadius"
-msgstr ""
+msgstr "Tento zÃ¡suvnÃ½ modul slouÅ¾Ã pro sprÃ¡vu ovÄ›Å™ovÃ¡nÃ Radius, zaloÅ¾enÃ©m na implementaci FreeRadius"
 
 #: admin/freeradius/class_freeradiusGroup.inc:60
 #: personal/freeradius/class_freeradiusAccount.inc:66
 msgid "Support 802.1x"
-msgstr ""
+msgstr "Podpora 802.1x"
 
 #: admin/freeradius/class_freeradiusGroup.inc:63
 #: personal/freeradius/class_freeradiusAccount.inc:69
 msgid "Tunnel medium type"
-msgstr ""
+msgstr "Typ mÃ©dia tunelu"
 
 #: admin/freeradius/class_freeradiusGroup.inc:64
 #: personal/freeradius/class_freeradiusAccount.inc:69
 msgid "Name of the tunnel medium type"
-msgstr ""
+msgstr "NÃ¡zev typu mÃ©dia tunelu"
 
 #: admin/freeradius/class_freeradiusGroup.inc:70
 #: personal/freeradius/class_freeradiusAccount.inc:74
@@ -50,34 +51,34 @@ msgstr "Typ tunelu"
 #: admin/freeradius/class_freeradiusGroup.inc:71
 #: personal/freeradius/class_freeradiusAccount.inc:74
 msgid "Name of the tunnel type"
-msgstr ""
+msgstr "NÃ¡zev typu tunelu"
 
 #: admin/freeradius/class_freeradiusGroup.inc:77
 #: personal/freeradius/class_freeradiusAccount.inc:79
 msgid "VLAN id"
-msgstr ""
+msgstr "IdentifikÃ¡tor virtuÃ¡lnÃ sÃtÄ› (vlan)"
 
 #: admin/freeradius/class_freeradiusGroup.inc:78
 #: personal/freeradius/class_freeradiusAccount.inc:79
 msgid "VLAN identifier"
-msgstr "identifikÃ¡tor VLAN"
+msgstr "IdentifikÃ¡tor VLAN"
 
 #: personal/freeradius/class_freeradiusAccount.inc:84
 msgid "Expiration date"
-msgstr "Datum vyprÅ¡enÃ platnosti"
+msgstr "Datum skonÄenÃ platnosti"
 
 #: personal/freeradius/class_freeradiusAccount.inc:84
 msgid "Date of the expiration account"
-msgstr ""
+msgstr "Datum skonÄenÃ platnosti ÃºÄtu"
 
 #: personal/freeradius/class_freeradiusAccount.inc:91
 #: personal/freeradius/class_freeradiusAccount.inc:95
 msgid "Groups"
-msgstr "skupiny"
+msgstr "Skupiny"
 
 #: personal/freeradius/class_freeradiusAccount.inc:96
 msgid "FreeRadius Group"
-msgstr ""
+msgstr "Skupina pro FreeRadius"
 
 #: personal/freeradius/class_freeradiusAccount.inc:105
 msgid "User preferences"
@@ -89,11 +90,11 @@ msgstr "Protokol"
 
 #: personal/freeradius/class_freeradiusAccount.inc:113
 msgid "IP Address"
-msgstr ""
+msgstr "IP adresa"
 
 #: personal/freeradius/class_freeradiusAccount.inc:118
 msgid "IP Netmask"
-msgstr ""
+msgstr "Maska IP sÃtÄ›"
 
 #: personal/freeradius/class_freeradiusAccount.inc:123
 msgid "Framed-MTU"
@@ -101,7 +102,7 @@ msgstr ""
 
 #: personal/freeradius/class_freeradiusAccount.inc:130
 msgid "Compression"
-msgstr ""
+msgstr "Komprese"
 
 #: personal/freeradius/class_freeradiusAccount.inc:135
 msgid "Service type"
@@ -109,12 +110,12 @@ msgstr "Typ sluÅ¾by"
 
 #: personal/freeradius/class_freeradiusAccount.inc:140
 msgid "Session Timeout"
-msgstr ""
+msgstr "ÄŒasovÃ½ limit relace"
 
 #: personal/freeradius/class_freeradiusAccount.inc:147
 msgid "Idle Timeout"
-msgstr ""
+msgstr "ÄŒasovÃ½ limit neÄinnosti"
 
 #: personal/freeradius/class_freeradiusAccount.inc:154
 msgid "Port limit"
-msgstr ""
+msgstr "OmezenÃ portÅ¯"
diff --git a/freeradius/locale/de/fusiondirectory.po b/freeradius/locale/de/fusiondirectory.po
index 59b1b605331f820f61b56ee29c1daa5802193e76..e836ee48d03aa3e0a21c32aa74cc61c3e299b44f 100644
--- a/freeradius/locale/de/fusiondirectory.po
+++ b/freeradius/locale/de/fusiondirectory.po
@@ -3,15 +3,14 @@
 # This file is distributed under the same license as the PACKAGE package.
 # 
 # Translators:
-# Maik Wagner <maikwagner@yahoo.com>, 2013
 msgid ""
 msgstr ""
-"Project-Id-Version: FusionDirectory-108\n"
+"Project-Id-Version: FusionDirectory-109\n"
 "Report-Msgid-Bugs-To: documentation@lists.fusiondirectory.org\n"
-"POT-Creation-Date: 2015-03-19 21:45+0100\n"
-"PO-Revision-Date: 2014-08-28 10:52+0000\n"
-"Last-Translator: fusiondirectory <contact@fusiondirectory.org>\n"
-"Language-Team: German (http://www.transifex.com/projects/p/FusionDirectory-108/language/de/)\n"
+"POT-Creation-Date: 2014-12-15 17:47+0100\n"
+"PO-Revision-Date: 2014-08-28 10:28+0000\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: German (http://www.transifex.com/projects/p/FusionDirectory-109/language/de/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
diff --git a/freeradius/locale/el_GR/fusiondirectory.po b/freeradius/locale/el_GR/fusiondirectory.po
new file mode 100644
index 0000000000000000000000000000000000000000..81a71a66694febb4cc03830b903a316e3d811b99
--- /dev/null
+++ b/freeradius/locale/el_GR/fusiondirectory.po
@@ -0,0 +1,120 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR FusionDirectory Project
+# This file is distributed under the same license as the PACKAGE package.
+# 
+# Translators:
+msgid ""
+msgstr ""
+"Project-Id-Version: FusionDirectory-109\n"
+"Report-Msgid-Bugs-To: documentation@lists.fusiondirectory.org\n"
+"POT-Creation-Date: 2014-12-15 17:47+0100\n"
+"PO-Revision-Date: 2015-05-30 11:45+0000\n"
+"Last-Translator: Benoit Mortier <benoit.mortier@opensides.be>\n"
+"Language-Team: Greek (Greece) (http://www.transifex.com/projects/p/FusionDirectory-109/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/freeradius/class_freeradiusGroup.inc:45
+#: personal/freeradius/class_freeradiusAccount.inc:46
+msgid "Freeradius"
+msgstr ""
+
+#: admin/freeradius/class_freeradiusGroup.inc:46
+#: personal/freeradius/class_freeradiusAccount.inc:47
+msgid "This Plugin is for Radius accounting based in FreeRadius"
+msgstr ""
+
+#: admin/freeradius/class_freeradiusGroup.inc:60
+#: personal/freeradius/class_freeradiusAccount.inc:66
+msgid "Support 802.1x"
+msgstr ""
+
+#: admin/freeradius/class_freeradiusGroup.inc:63
+#: personal/freeradius/class_freeradiusAccount.inc:69
+msgid "Tunnel medium type"
+msgstr ""
+
+#: admin/freeradius/class_freeradiusGroup.inc:64
+#: personal/freeradius/class_freeradiusAccount.inc:69
+msgid "Name of the tunnel medium type"
+msgstr ""
+
+#: admin/freeradius/class_freeradiusGroup.inc:70
+#: personal/freeradius/class_freeradiusAccount.inc:74
+msgid "Tunnel type"
+msgstr ""
+
+#: admin/freeradius/class_freeradiusGroup.inc:71
+#: personal/freeradius/class_freeradiusAccount.inc:74
+msgid "Name of the tunnel type"
+msgstr ""
+
+#: admin/freeradius/class_freeradiusGroup.inc:77
+#: personal/freeradius/class_freeradiusAccount.inc:79
+msgid "VLAN id"
+msgstr ""
+
+#: admin/freeradius/class_freeradiusGroup.inc:78
+#: personal/freeradius/class_freeradiusAccount.inc:79
+msgid "VLAN identifier"
+msgstr ""
+
+#: personal/freeradius/class_freeradiusAccount.inc:84
+msgid "Expiration date"
+msgstr ""
+
+#: personal/freeradius/class_freeradiusAccount.inc:84
+msgid "Date of the expiration account"
+msgstr ""
+
+#: personal/freeradius/class_freeradiusAccount.inc:91
+#: personal/freeradius/class_freeradiusAccount.inc:95
+msgid "Groups"
+msgstr ""
+
+#: personal/freeradius/class_freeradiusAccount.inc:96
+msgid "FreeRadius Group"
+msgstr ""
+
+#: personal/freeradius/class_freeradiusAccount.inc:105
+msgid "User preferences"
+msgstr ""
+
+#: personal/freeradius/class_freeradiusAccount.inc:108
+msgid "Protocol"
+msgstr ""
+
+#: personal/freeradius/class_freeradiusAccount.inc:113
+msgid "IP Address"
+msgstr ""
+
+#: personal/freeradius/class_freeradiusAccount.inc:118
+msgid "IP Netmask"
+msgstr ""
+
+#: personal/freeradius/class_freeradiusAccount.inc:123
+msgid "Framed-MTU"
+msgstr ""
+
+#: personal/freeradius/class_freeradiusAccount.inc:130
+msgid "Compression"
+msgstr ""
+
+#: personal/freeradius/class_freeradiusAccount.inc:135
+msgid "Service type"
+msgstr ""
+
+#: personal/freeradius/class_freeradiusAccount.inc:140
+msgid "Session Timeout"
+msgstr ""
+
+#: personal/freeradius/class_freeradiusAccount.inc:147
+msgid "Idle Timeout"
+msgstr ""
+
+#: personal/freeradius/class_freeradiusAccount.inc:154
+msgid "Port limit"
+msgstr ""
diff --git a/freeradius/locale/en/fusiondirectory.po b/freeradius/locale/en/fusiondirectory.po
index 29f68bdd0adedb25bf1d656302cb3371ca939b6b..d779f18246697185a4601d3ec24bbba065a3b1a6 100644
--- a/freeradius/locale/en/fusiondirectory.po
+++ b/freeradius/locale/en/fusiondirectory.po
@@ -6,13 +6,13 @@
 #, fuzzy
 msgid ""
 msgstr ""
-"Project-Id-Version: PACKAGE VERSION\n"
-"Report-Msgid-Bugs-To: documentation@lists.fusiondirectory.org\n"
-"POT-Creation-Date: 2015-03-31 11:49+0200\n"
+"Project-Id-Version: FusionDirectory VERSION\n"
+"Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
+"POT-Creation-Date: 2015-05-30 15:30+0200\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
-"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
-"Language-Team: LANGUAGE <LL@li.org>\n"
-"Language: \n"
+"Last-Translator: FusionDirectory project <contact@fusiondirectory.org>\n"
+"Language-Team: English\n"
+"Language: en\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
diff --git a/freeradius/locale/es/fusiondirectory.po b/freeradius/locale/es/fusiondirectory.po
index 9eea02269afdf8718a0ee6befe741beec4197471..774a3e56260941d761f4bf3b3b1c65137a6e104b 100644
--- a/freeradius/locale/es/fusiondirectory.po
+++ b/freeradius/locale/es/fusiondirectory.po
@@ -5,12 +5,12 @@
 # Translators:
 msgid ""
 msgstr ""
-"Project-Id-Version: FusionDirectory-108\n"
+"Project-Id-Version: FusionDirectory-109\n"
 "Report-Msgid-Bugs-To: documentation@lists.fusiondirectory.org\n"
-"POT-Creation-Date: 2015-03-19 21:45+0100\n"
-"PO-Revision-Date: 2014-08-28 10:49+0000\n"
-"Last-Translator: fusiondirectory <contact@fusiondirectory.org>\n"
-"Language-Team: Spanish (http://www.transifex.com/projects/p/FusionDirectory-108/language/es/)\n"
+"POT-Creation-Date: 2014-12-15 17:47+0100\n"
+"PO-Revision-Date: 2014-08-28 10:28+0000\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: Spanish (http://www.transifex.com/projects/p/FusionDirectory-109/language/es/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
diff --git a/freeradius/locale/es_VE/fusiondirectory.po b/freeradius/locale/es_VE/fusiondirectory.po
index a59f1c903e765e667298631d6e4b17f5df034d04..de13d9d149c1e1da4347a11bab2d34f6a4c66564 100644
--- a/freeradius/locale/es_VE/fusiondirectory.po
+++ b/freeradius/locale/es_VE/fusiondirectory.po
@@ -5,12 +5,12 @@
 # Translators:
 msgid ""
 msgstr ""
-"Project-Id-Version: FusionDirectory-108\n"
+"Project-Id-Version: FusionDirectory-109\n"
 "Report-Msgid-Bugs-To: documentation@lists.fusiondirectory.org\n"
-"POT-Creation-Date: 2015-03-19 21:45+0100\n"
-"PO-Revision-Date: 2014-08-28 10:49+0000\n"
-"Last-Translator: fusiondirectory <contact@fusiondirectory.org>\n"
-"Language-Team: Spanish (Venezuela) (http://www.transifex.com/projects/p/FusionDirectory-108/language/es_VE/)\n"
+"POT-Creation-Date: 2014-12-15 17:47+0100\n"
+"PO-Revision-Date: 2014-08-28 10:28+0000\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: Spanish (Venezuela) (http://www.transifex.com/projects/p/FusionDirectory-109/language/es_VE/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
diff --git a/freeradius/locale/fa_IR/fusiondirectory.po b/freeradius/locale/fa_IR/fusiondirectory.po
index 58b1d72812a1d773d6869878992f876a28740d33..e97bfe0aa3c61bf4a01082b65d5a68ab124999ab 100644
--- a/freeradius/locale/fa_IR/fusiondirectory.po
+++ b/freeradius/locale/fa_IR/fusiondirectory.po
@@ -5,12 +5,12 @@
 # Translators:
 msgid ""
 msgstr ""
-"Project-Id-Version: FusionDirectory-108\n"
+"Project-Id-Version: FusionDirectory-109\n"
 "Report-Msgid-Bugs-To: documentation@lists.fusiondirectory.org\n"
-"POT-Creation-Date: 2015-03-19 21:45+0100\n"
-"PO-Revision-Date: 2014-08-26 14:14+0000\n"
-"Last-Translator: fusiondirectory <contact@fusiondirectory.org>\n"
-"Language-Team: Persian (Iran) (http://www.transifex.com/projects/p/FusionDirectory-108/language/fa_IR/)\n"
+"POT-Creation-Date: 2014-12-15 17:47+0100\n"
+"PO-Revision-Date: 2014-08-28 10:28+0000\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: Persian (Iran) (http://www.transifex.com/projects/p/FusionDirectory-109/language/fa_IR/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
diff --git a/freeradius/locale/fr/fusiondirectory.po b/freeradius/locale/fr/fusiondirectory.po
index 20b296e878651bdf0b4de29893b13e0346a056a0..97b85e147c6a724ac38cf84c5bd8b2acc8b0c9f4 100644
--- a/freeradius/locale/fr/fusiondirectory.po
+++ b/freeradius/locale/fr/fusiondirectory.po
@@ -3,21 +3,14 @@
 # This file is distributed under the same license as the PACKAGE package.
 # 
 # Translators:
-# gallak <antoine.gallavardin@free.fr>, 2013
-# MCMic, 2014
-# fusiondirectory <contact@fusiondirectory.org>, 2013
-# fusiondirectory <contact@fusiondirectory.org>, 2012-2013
-# fusiondirectory <contact@fusiondirectory.org>, 2012
-# gallak <antoine.gallavardin@free.fr>, 2013
-# MCMic, 2014
 msgid ""
 msgstr ""
-"Project-Id-Version: FusionDirectory-108\n"
+"Project-Id-Version: FusionDirectory-109\n"
 "Report-Msgid-Bugs-To: documentation@lists.fusiondirectory.org\n"
-"POT-Creation-Date: 2015-03-19 21:45+0100\n"
-"PO-Revision-Date: 2014-12-18 09:21+0000\n"
-"Last-Translator: MCMic\n"
-"Language-Team: French (http://www.transifex.com/projects/p/FusionDirectory-108/language/fr/)\n"
+"POT-Creation-Date: 2014-12-15 17:47+0100\n"
+"PO-Revision-Date: 2014-08-28 10:28+0000\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: French (http://www.transifex.com/projects/p/FusionDirectory-109/language/fr/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -42,7 +35,7 @@ msgstr "Supporter 802.1x"
 #: admin/freeradius/class_freeradiusGroup.inc:63
 #: personal/freeradius/class_freeradiusAccount.inc:69
 msgid "Tunnel medium type"
-msgstr "Type de mÃ©dia du tunnel"
+msgstr "Type de mÃ©dia pour le tunnel"
 
 #: admin/freeradius/class_freeradiusGroup.inc:64
 #: personal/freeradius/class_freeradiusAccount.inc:69
@@ -62,7 +55,7 @@ msgstr "Nom du type de tunnel"
 #: admin/freeradius/class_freeradiusGroup.inc:77
 #: personal/freeradius/class_freeradiusAccount.inc:79
 msgid "VLAN id"
-msgstr "ID du Vlan"
+msgstr "id du Vlan"
 
 #: admin/freeradius/class_freeradiusGroup.inc:78
 #: personal/freeradius/class_freeradiusAccount.inc:79
diff --git a/freeradius/locale/id/fusiondirectory.po b/freeradius/locale/id/fusiondirectory.po
index 7b914986e129f6600a0f7e4d2eaca3b1215e1a08..08062610817d6ed06104153c1c74a492ede637a6 100644
--- a/freeradius/locale/id/fusiondirectory.po
+++ b/freeradius/locale/id/fusiondirectory.po
@@ -5,12 +5,12 @@
 # Translators:
 msgid ""
 msgstr ""
-"Project-Id-Version: FusionDirectory-108\n"
+"Project-Id-Version: FusionDirectory-109\n"
 "Report-Msgid-Bugs-To: documentation@lists.fusiondirectory.org\n"
-"POT-Creation-Date: 2015-03-19 21:45+0100\n"
-"PO-Revision-Date: 2014-08-26 14:14+0000\n"
-"Last-Translator: fusiondirectory <contact@fusiondirectory.org>\n"
-"Language-Team: Indonesian (http://www.transifex.com/projects/p/FusionDirectory-108/language/id/)\n"
+"POT-Creation-Date: 2014-12-15 17:47+0100\n"
+"PO-Revision-Date: 2014-08-28 10:28+0000\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: Indonesian (http://www.transifex.com/projects/p/FusionDirectory-109/language/id/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
diff --git a/freeradius/locale/it/fusiondirectory.po b/freeradius/locale/it/fusiondirectory.po
index 4559206514adc370bcd5eca659187c291d686852..18e340164e1e635d8322b37b6f850bbcf7bae136 100644
--- a/freeradius/locale/it/fusiondirectory.po
+++ b/freeradius/locale/it/fusiondirectory.po
@@ -3,16 +3,14 @@
 # This file is distributed under the same license as the PACKAGE package.
 # 
 # Translators:
-# poterealpopolo <giuliano@opensides.be>, 2013
-# poterealpopolo <giuliano@opensides.be>, 2013
 msgid ""
 msgstr ""
-"Project-Id-Version: FusionDirectory-108\n"
+"Project-Id-Version: FusionDirectory-109\n"
 "Report-Msgid-Bugs-To: documentation@lists.fusiondirectory.org\n"
-"POT-Creation-Date: 2015-03-19 21:45+0100\n"
-"PO-Revision-Date: 2014-08-28 10:52+0000\n"
-"Last-Translator: fusiondirectory <contact@fusiondirectory.org>\n"
-"Language-Team: Italian (http://www.transifex.com/projects/p/FusionDirectory-108/language/it/)\n"
+"POT-Creation-Date: 2014-12-15 17:47+0100\n"
+"PO-Revision-Date: 2014-08-28 10:28+0000\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: Italian (http://www.transifex.com/projects/p/FusionDirectory-109/language/it/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
diff --git a/freeradius/locale/lv/fusiondirectory.po b/freeradius/locale/lv/fusiondirectory.po
index 834cdae924c35b05afb0b2452583ddf2e4e1bbc1..24d73641c344f9f6a48ad31b1fa49ee9246abb1d 100644
--- a/freeradius/locale/lv/fusiondirectory.po
+++ b/freeradius/locale/lv/fusiondirectory.po
@@ -5,12 +5,12 @@
 # Translators:
 msgid ""
 msgstr ""
-"Project-Id-Version: FusionDirectory-108\n"
+"Project-Id-Version: FusionDirectory-109\n"
 "Report-Msgid-Bugs-To: documentation@lists.fusiondirectory.org\n"
-"POT-Creation-Date: 2015-03-19 21:45+0100\n"
-"PO-Revision-Date: 2014-08-26 14:14+0000\n"
-"Last-Translator: fusiondirectory <contact@fusiondirectory.org>\n"
-"Language-Team: Latvian (http://www.transifex.com/projects/p/FusionDirectory-108/language/lv/)\n"
+"POT-Creation-Date: 2014-12-15 17:47+0100\n"
+"PO-Revision-Date: 2014-08-28 10:28+0000\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: Latvian (http://www.transifex.com/projects/p/FusionDirectory-109/language/lv/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
diff --git a/freeradius/locale/nb/fusiondirectory.po b/freeradius/locale/nb/fusiondirectory.po
index dcb785c405fa2574a03c974e9f5bc5aa28931462..fb5a9b7dbb6a9e85b3217033ad390e6633ede881 100644
--- a/freeradius/locale/nb/fusiondirectory.po
+++ b/freeradius/locale/nb/fusiondirectory.po
@@ -5,12 +5,12 @@
 # Translators:
 msgid ""
 msgstr ""
-"Project-Id-Version: FusionDirectory-108\n"
+"Project-Id-Version: FusionDirectory-109\n"
 "Report-Msgid-Bugs-To: documentation@lists.fusiondirectory.org\n"
-"POT-Creation-Date: 2015-03-19 21:45+0100\n"
-"PO-Revision-Date: 2014-08-26 14:14+0000\n"
-"Last-Translator: fusiondirectory <contact@fusiondirectory.org>\n"
-"Language-Team: Norwegian BokmÃ¥l (http://www.transifex.com/projects/p/FusionDirectory-108/language/nb/)\n"
+"POT-Creation-Date: 2014-12-15 17:47+0100\n"
+"PO-Revision-Date: 2014-08-28 10:28+0000\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: Norwegian BokmÃ¥l (http://www.transifex.com/projects/p/FusionDirectory-109/language/nb/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
diff --git a/freeradius/locale/nl/fusiondirectory.po b/freeradius/locale/nl/fusiondirectory.po
index 041353098c593cd8fb4a736e92048d48d189a9cd..3bbbab45f5088148281b8246a8018b0f204a18ef 100644
--- a/freeradius/locale/nl/fusiondirectory.po
+++ b/freeradius/locale/nl/fusiondirectory.po
@@ -3,15 +3,14 @@
 # This file is distributed under the same license as the PACKAGE package.
 # 
 # Translators:
-# Kenny Tordeurs <tordeurskenny@gmail.com>, 2013
 msgid ""
 msgstr ""
-"Project-Id-Version: FusionDirectory-108\n"
+"Project-Id-Version: FusionDirectory-109\n"
 "Report-Msgid-Bugs-To: documentation@lists.fusiondirectory.org\n"
-"POT-Creation-Date: 2015-03-19 21:45+0100\n"
-"PO-Revision-Date: 2014-08-28 10:49+0000\n"
-"Last-Translator: fusiondirectory <contact@fusiondirectory.org>\n"
-"Language-Team: Dutch (http://www.transifex.com/projects/p/FusionDirectory-108/language/nl/)\n"
+"POT-Creation-Date: 2014-12-15 17:47+0100\n"
+"PO-Revision-Date: 2014-08-28 10:28+0000\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: Dutch (http://www.transifex.com/projects/p/FusionDirectory-109/language/nl/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
diff --git a/freeradius/locale/pl/fusiondirectory.po b/freeradius/locale/pl/fusiondirectory.po
index 3dcf49880c2bc3213e25fb083df34fc55ad49091..6b253dc0a7129d88615efd225eee60aa9b7101e3 100644
--- a/freeradius/locale/pl/fusiondirectory.po
+++ b/freeradius/locale/pl/fusiondirectory.po
@@ -5,12 +5,12 @@
 # Translators:
 msgid ""
 msgstr ""
-"Project-Id-Version: FusionDirectory-108\n"
+"Project-Id-Version: FusionDirectory-109\n"
 "Report-Msgid-Bugs-To: documentation@lists.fusiondirectory.org\n"
-"POT-Creation-Date: 2015-03-19 21:45+0100\n"
-"PO-Revision-Date: 2014-08-28 10:49+0000\n"
-"Last-Translator: fusiondirectory <contact@fusiondirectory.org>\n"
-"Language-Team: Polish (http://www.transifex.com/projects/p/FusionDirectory-108/language/pl/)\n"
+"POT-Creation-Date: 2014-12-15 17:47+0100\n"
+"PO-Revision-Date: 2014-08-28 10:28+0000\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: Polish (http://www.transifex.com/projects/p/FusionDirectory-109/language/pl/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
diff --git a/freeradius/locale/pt/fusiondirectory.po b/freeradius/locale/pt/fusiondirectory.po
index 39d11b2fc7116a7a0bc078386414894c13628b02..849c22ad102a8d8407ad36d2664d813b0395279d 100644
--- a/freeradius/locale/pt/fusiondirectory.po
+++ b/freeradius/locale/pt/fusiondirectory.po
@@ -5,12 +5,12 @@
 # Translators:
 msgid ""
 msgstr ""
-"Project-Id-Version: FusionDirectory-108\n"
+"Project-Id-Version: FusionDirectory-109\n"
 "Report-Msgid-Bugs-To: documentation@lists.fusiondirectory.org\n"
-"POT-Creation-Date: 2015-03-19 21:45+0100\n"
-"PO-Revision-Date: 2014-08-28 10:49+0000\n"
-"Last-Translator: fusiondirectory <contact@fusiondirectory.org>\n"
-"Language-Team: Portuguese (http://www.transifex.com/projects/p/FusionDirectory-108/language/pt/)\n"
+"POT-Creation-Date: 2014-12-15 17:47+0100\n"
+"PO-Revision-Date: 2014-08-28 10:28+0000\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: Portuguese (http://www.transifex.com/projects/p/FusionDirectory-109/language/pt/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
diff --git a/freeradius/locale/pt_BR/fusiondirectory.po b/freeradius/locale/pt_BR/fusiondirectory.po
index 89c43d08be39ab92a551e89f700109d6d99baa18..a85b1b56c41f5c9bc2a599a7d522143d84ff9c0a 100644
--- a/freeradius/locale/pt_BR/fusiondirectory.po
+++ b/freeradius/locale/pt_BR/fusiondirectory.po
@@ -3,15 +3,14 @@
 # This file is distributed under the same license as the PACKAGE package.
 # 
 # Translators:
-# ALEJANDRO BARRIOS <alejandrobarrios@interlegis.leg.br>, 2014
 msgid ""
 msgstr ""
-"Project-Id-Version: FusionDirectory-108\n"
+"Project-Id-Version: FusionDirectory-109\n"
 "Report-Msgid-Bugs-To: documentation@lists.fusiondirectory.org\n"
-"POT-Creation-Date: 2015-03-19 21:45+0100\n"
-"PO-Revision-Date: 2014-08-28 10:52+0000\n"
-"Last-Translator: fusiondirectory <contact@fusiondirectory.org>\n"
-"Language-Team: Portuguese (Brazil) (http://www.transifex.com/projects/p/FusionDirectory-108/language/pt_BR/)\n"
+"POT-Creation-Date: 2014-12-15 17:47+0100\n"
+"PO-Revision-Date: 2014-08-28 10:28+0000\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: Portuguese (Brazil) (http://www.transifex.com/projects/p/FusionDirectory-109/language/pt_BR/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
diff --git a/freeradius/locale/ru/fusiondirectory.po b/freeradius/locale/ru/fusiondirectory.po
index a2693add47dde2d04b273dff3005c18e2231f3ad..7482dedda626972e4b3920145088d07274af3143 100644
--- a/freeradius/locale/ru/fusiondirectory.po
+++ b/freeradius/locale/ru/fusiondirectory.po
@@ -5,22 +5,22 @@
 # Translators:
 msgid ""
 msgstr ""
-"Project-Id-Version: FusionDirectory-108\n"
+"Project-Id-Version: FusionDirectory-109\n"
 "Report-Msgid-Bugs-To: documentation@lists.fusiondirectory.org\n"
-"POT-Creation-Date: 2015-03-19 21:45+0100\n"
-"PO-Revision-Date: 2014-08-28 10:49+0000\n"
-"Last-Translator: fusiondirectory <contact@fusiondirectory.org>\n"
-"Language-Team: Russian (http://www.transifex.com/projects/p/FusionDirectory-108/language/ru/)\n"
+"POT-Creation-Date: 2014-12-15 17:47+0100\n"
+"PO-Revision-Date: 2014-08-28 10:28+0000\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: Russian (http://www.transifex.com/projects/p/FusionDirectory-109/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=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);\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:45
 #: personal/freeradius/class_freeradiusAccount.inc:46
 msgid "Freeradius"
-msgstr ""
+msgstr "Freeradius"
 
 #: admin/freeradius/class_freeradiusGroup.inc:46
 #: personal/freeradius/class_freeradiusAccount.inc:47
@@ -64,7 +64,7 @@ msgstr ""
 
 #: personal/freeradius/class_freeradiusAccount.inc:84
 msgid "Expiration date"
-msgstr ""
+msgstr "Ð”Ð°Ñ‚Ð° Ð¾ÐºÐ¾Ð½Ñ‡Ð°Ð½Ð¸Ñ Ð´ÐµÐ¹ÑÑ‚Ð²Ð¸Ñ"
 
 #: personal/freeradius/class_freeradiusAccount.inc:84
 msgid "Date of the expiration account"
diff --git a/freeradius/locale/ru@petr1708/fusiondirectory.po b/freeradius/locale/ru@petr1708/fusiondirectory.po
index e4c1db6a87a9eb05b07c60785b66462893336862..3c115e28bba2ce8e706b3914e29d6e0da9908bbe 100644
--- a/freeradius/locale/ru@petr1708/fusiondirectory.po
+++ b/freeradius/locale/ru@petr1708/fusiondirectory.po
@@ -5,17 +5,17 @@
 # Translators:
 msgid ""
 msgstr ""
-"Project-Id-Version: FusionDirectory-108\n"
+"Project-Id-Version: FusionDirectory-109\n"
 "Report-Msgid-Bugs-To: documentation@lists.fusiondirectory.org\n"
-"POT-Creation-Date: 2015-03-19 21:45+0100\n"
-"PO-Revision-Date: 2014-08-26 14:14+0000\n"
-"Last-Translator: fusiondirectory <contact@fusiondirectory.org>\n"
-"Language-Team: Russian Petrine orthography (http://www.transifex.com/projects/p/FusionDirectory-108/language/ru@petr1708/)\n"
+"POT-Creation-Date: 2014-12-15 17:47+0100\n"
+"PO-Revision-Date: 2014-08-28 10:28+0000\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: Russian Petrine orthography (http://www.transifex.com/projects/p/FusionDirectory-109/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=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);\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:45
 #: personal/freeradius/class_freeradiusAccount.inc:46
diff --git a/freeradius/locale/sv/fusiondirectory.po b/freeradius/locale/sv/fusiondirectory.po
index b4a5065ebed7ee033a07c88443e13768965a562f..a743837ac3cf93544e16a08e9b1ce2824ce7ca57 100644
--- a/freeradius/locale/sv/fusiondirectory.po
+++ b/freeradius/locale/sv/fusiondirectory.po
@@ -5,12 +5,12 @@
 # Translators:
 msgid ""
 msgstr ""
-"Project-Id-Version: FusionDirectory-108\n"
+"Project-Id-Version: FusionDirectory-109\n"
 "Report-Msgid-Bugs-To: documentation@lists.fusiondirectory.org\n"
-"POT-Creation-Date: 2015-03-19 21:45+0100\n"
-"PO-Revision-Date: 2014-08-28 10:49+0000\n"
-"Last-Translator: fusiondirectory <contact@fusiondirectory.org>\n"
-"Language-Team: Swedish (http://www.transifex.com/projects/p/FusionDirectory-108/language/sv/)\n"
+"POT-Creation-Date: 2014-12-15 17:47+0100\n"
+"PO-Revision-Date: 2014-08-28 10:28+0000\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: Swedish (http://www.transifex.com/projects/p/FusionDirectory-109/language/sv/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
diff --git a/freeradius/locale/ug/fusiondirectory.po b/freeradius/locale/ug/fusiondirectory.po
index 5bd622e8aed5cd6b4c052960343efe4f9c9f2e28..d07e2477b1a89cee0fc06eec2b7882ec3ac3e353 100644
--- a/freeradius/locale/ug/fusiondirectory.po
+++ b/freeradius/locale/ug/fusiondirectory.po
@@ -5,12 +5,12 @@
 # Translators:
 msgid ""
 msgstr ""
-"Project-Id-Version: FusionDirectory-108\n"
+"Project-Id-Version: FusionDirectory-109\n"
 "Report-Msgid-Bugs-To: documentation@lists.fusiondirectory.org\n"
-"POT-Creation-Date: 2015-03-19 21:45+0100\n"
-"PO-Revision-Date: 2014-08-26 14:14+0000\n"
-"Last-Translator: fusiondirectory <contact@fusiondirectory.org>\n"
-"Language-Team: Uighur (http://www.transifex.com/projects/p/FusionDirectory-108/language/ug/)\n"
+"POT-Creation-Date: 2014-12-15 17:47+0100\n"
+"PO-Revision-Date: 2014-08-28 10:28+0000\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: Uighur (http://www.transifex.com/projects/p/FusionDirectory-109/language/ug/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
diff --git a/freeradius/locale/vi_VN/fusiondirectory.po b/freeradius/locale/vi_VN/fusiondirectory.po
index 0bebc252b9546e3b40d6961f12a7b698b6ba4643..bbad0dd77d31d4ba64b3b226d3eeb20b28621bef 100644
--- a/freeradius/locale/vi_VN/fusiondirectory.po
+++ b/freeradius/locale/vi_VN/fusiondirectory.po
@@ -5,12 +5,12 @@
 # Translators:
 msgid ""
 msgstr ""
-"Project-Id-Version: FusionDirectory-108\n"
+"Project-Id-Version: FusionDirectory-109\n"
 "Report-Msgid-Bugs-To: documentation@lists.fusiondirectory.org\n"
-"POT-Creation-Date: 2015-03-19 21:45+0100\n"
-"PO-Revision-Date: 2014-08-28 10:49+0000\n"
-"Last-Translator: fusiondirectory <contact@fusiondirectory.org>\n"
-"Language-Team: Vietnamese (Viet Nam) (http://www.transifex.com/projects/p/FusionDirectory-108/language/vi_VN/)\n"
+"POT-Creation-Date: 2014-12-15 17:47+0100\n"
+"PO-Revision-Date: 2014-08-28 10:28+0000\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: Vietnamese (Viet Nam) (http://www.transifex.com/projects/p/FusionDirectory-109/language/vi_VN/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
diff --git a/freeradius/locale/zh/fusiondirectory.po b/freeradius/locale/zh/fusiondirectory.po
index 302640c7c14c0aadc97ad1a4cd138609ea1c4ba7..c1d8564f921b0ed2ea5ec46fe8ec6ca8544f13d2 100644
--- a/freeradius/locale/zh/fusiondirectory.po
+++ b/freeradius/locale/zh/fusiondirectory.po
@@ -5,12 +5,12 @@
 # Translators:
 msgid ""
 msgstr ""
-"Project-Id-Version: FusionDirectory-108\n"
+"Project-Id-Version: FusionDirectory-109\n"
 "Report-Msgid-Bugs-To: documentation@lists.fusiondirectory.org\n"
-"POT-Creation-Date: 2015-03-19 21:45+0100\n"
-"PO-Revision-Date: 2014-08-28 10:49+0000\n"
-"Last-Translator: fusiondirectory <contact@fusiondirectory.org>\n"
-"Language-Team: Chinese (http://www.transifex.com/projects/p/FusionDirectory-108/language/zh/)\n"
+"POT-Creation-Date: 2014-12-15 17:47+0100\n"
+"PO-Revision-Date: 2014-08-28 10:28+0000\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: Chinese (http://www.transifex.com/projects/p/FusionDirectory-109/language/zh/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
diff --git a/fusioninventory/locale/ar/fusiondirectory.po b/fusioninventory/locale/ar/fusiondirectory.po
index a705f4c1701512e9fd1e043ee0131479f39e2aef..094dc7d6e9537d00a92abda6d86afb9ab2ac9022 100644
--- a/fusioninventory/locale/ar/fusiondirectory.po
+++ b/fusioninventory/locale/ar/fusiondirectory.po
@@ -5,12 +5,12 @@
 # Translators:
 msgid ""
 msgstr ""
-"Project-Id-Version: FusionDirectory-108\n"
+"Project-Id-Version: FusionDirectory-109\n"
 "Report-Msgid-Bugs-To: documentation@lists.fusiondirectory.org\n"
-"POT-Creation-Date: 2015-03-19 21:45+0100\n"
-"PO-Revision-Date: 2015-02-25 16:12+0000\n"
-"Last-Translator: fusiondirectory <contact@fusiondirectory.org>\n"
-"Language-Team: Arabic (http://www.transifex.com/projects/p/FusionDirectory-108/language/ar/)\n"
+"POT-Creation-Date: 2014-12-15 17:47+0100\n"
+"PO-Revision-Date: 2014-08-28 10:28+0000\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: Arabic (http://www.transifex.com/projects/p/FusionDirectory-109/language/ar/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
diff --git a/fusioninventory/locale/ca/fusiondirectory.po b/fusioninventory/locale/ca/fusiondirectory.po
index 54d5312eedcbe94a9b2e622deb0143e4fa7071dc..51aa964e1d2d94b8c15ae14b9916f339f3ec2cf5 100644
--- a/fusioninventory/locale/ca/fusiondirectory.po
+++ b/fusioninventory/locale/ca/fusiondirectory.po
@@ -5,12 +5,12 @@
 # Translators:
 msgid ""
 msgstr ""
-"Project-Id-Version: FusionDirectory-108\n"
+"Project-Id-Version: FusionDirectory-109\n"
 "Report-Msgid-Bugs-To: documentation@lists.fusiondirectory.org\n"
-"POT-Creation-Date: 2015-03-19 21:45+0100\n"
-"PO-Revision-Date: 2014-08-28 10:52+0000\n"
-"Last-Translator: fusiondirectory <contact@fusiondirectory.org>\n"
-"Language-Team: Catalan (http://www.transifex.com/projects/p/FusionDirectory-108/language/ca/)\n"
+"POT-Creation-Date: 2014-12-15 17:47+0100\n"
+"PO-Revision-Date: 2014-08-28 10:28+0000\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: Catalan (http://www.transifex.com/projects/p/FusionDirectory-109/language/ca/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
diff --git a/fusioninventory/locale/cs_CZ/fusiondirectory.po b/fusioninventory/locale/cs_CZ/fusiondirectory.po
index 79def8f5ff0a500d7044e40cd654e1e5ceebd86e..fd7570ceb1c9cfe6463c0d330f2fd52e49a8eea1 100644
--- a/fusioninventory/locale/cs_CZ/fusiondirectory.po
+++ b/fusioninventory/locale/cs_CZ/fusiondirectory.po
@@ -3,14 +3,15 @@
 # This file is distributed under the same license as the PACKAGE package.
 # 
 # Translators:
+# Pavel Borecki <pavel.borecki@gmail.com>, 2014-2015
 msgid ""
 msgstr ""
-"Project-Id-Version: FusionDirectory-108\n"
+"Project-Id-Version: FusionDirectory-109\n"
 "Report-Msgid-Bugs-To: documentation@lists.fusiondirectory.org\n"
-"POT-Creation-Date: 2015-03-19 21:45+0100\n"
-"PO-Revision-Date: 2015-02-25 16:12+0000\n"
-"Last-Translator: fusiondirectory <contact@fusiondirectory.org>\n"
-"Language-Team: Czech (Czech Republic) (http://www.transifex.com/projects/p/FusionDirectory-108/language/cs_CZ/)\n"
+"POT-Creation-Date: 2014-12-15 17:47+0100\n"
+"PO-Revision-Date: 2015-04-07 19:21+0000\n"
+"Last-Translator: Pavel Borecki <pavel.borecki@gmail.com>\n"
+"Language-Team: Czech (Czech Republic) (http://www.transifex.com/projects/p/FusionDirectory-109/language/cs_CZ/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -19,7 +20,7 @@ msgstr ""
 
 #: admin/inventory/inventory-list.xml:7
 msgid "NO LABEL"
-msgstr ""
+msgstr "BEZ POPISKU"
 
 #: admin/inventory/inventory-list.xml:28
 #: admin/systems/fusioninventory/class_fiInventoryAgent.inc:56
@@ -28,7 +29,7 @@ msgstr ""
 
 #: admin/inventory/inventory-list.xml:36
 msgid "Macs"
-msgstr ""
+msgstr "MAC adresy"
 
 #: admin/inventory/inventory-list.xml:44
 msgid "Operating Systems"
@@ -36,19 +37,19 @@ msgstr "OperaÄnÃ systÃ©my"
 
 #: admin/inventory/inventory-list.xml:50
 msgid "Actions"
-msgstr "akce"
+msgstr "Akce"
 
 #: admin/inventory/inventory-list.xml:61 admin/inventory/inventory-list.xml:85
 msgid "Edit"
-msgstr "upravit"
+msgstr "Upravit"
 
 #: admin/inventory/inventory-list.xml:68 admin/inventory/inventory-list.xml:92
 msgid "Remove"
-msgstr "odebrat"
+msgstr "Odstranit"
 
 #: admin/inventory/class_inventoryManagement.inc:36
 msgid "Inventory objects"
-msgstr ""
+msgstr "Objekty inventÃ¡Å™e"
 
 #: admin/inventory/class_inventoryManagement.inc:37
 msgid "Browse inventory objects"
@@ -60,12 +61,12 @@ msgstr "InventÃ¡Å™"
 
 #: admin/systems/fusioninventory/class_fiInventory.inc:68
 msgid "Inventory Viewer"
-msgstr ""
+msgstr "ProhlÃÅ¾eÄ inventÃ¡Å™e"
 
 #: admin/systems/fusioninventory/class_fiInventory.inc:73
 #: admin/systems/fusioninventory/class_fiInventory.inc:77
 msgid "Inventory object"
-msgstr ""
+msgstr "Objekt inventÃ¡Å™e"
 
 #: admin/systems/fusioninventory/class_fiInventory.inc:91
 msgid "Hardware"
@@ -73,44 +74,44 @@ msgstr "hardware"
 
 #: admin/systems/fusioninventory/class_fiInventory.inc:97
 msgid "Software"
-msgstr "software"
+msgstr "ProgramovÃ© vybavenÃ"
 
 #: admin/systems/fusioninventory/class_fiInventory.inc:103
 msgid "Users"
-msgstr "uÅ¾ivatelÃ©"
+msgstr "UÅ¾ivatelÃ©"
 
 #: admin/systems/fusioninventory/class_fiInventory.inc:109
 msgid "Processes"
-msgstr ""
+msgstr "Procesy"
 
 #: admin/systems/fusioninventory/class_fiInventoryAgent.inc:30
 msgid "Configuration"
-msgstr "nastavenÃ"
+msgstr "NastavenÃ"
 
 #: admin/systems/fusioninventory/class_fiInventoryAgent.inc:33
 msgid "Server"
-msgstr "server"
+msgstr "Server"
 
 #: admin/systems/fusioninventory/class_fiInventoryAgent.inc:33
 msgid "Server which FI will send inventory infos"
-msgstr ""
+msgstr "Server, kterÃ½ F.I. bude posÃlat Ãºdaje o inventÃ¡Å™i "
 
 #: admin/systems/fusioninventory/class_fiInventoryAgent.inc:37
 msgid "Delay time"
-msgstr ""
+msgstr "DÃ©lka prodlevy"
 
 #: admin/systems/fusioninventory/class_fiInventoryAgent.inc:37
 msgid "Maximum initial delay before first target, in seconds"
-msgstr ""
+msgstr "NejvyÅ¡Å¡Ã umoÅ¾nÄ›nÃ¡ poÄÃ¡teÄnÃ prodleva pÅ™ed prvnÃm cÃlem, v sekundÃ¡ch"
 
 #: admin/systems/fusioninventory/class_fiInventoryAgent.inc:42
 msgid "Wait"
-msgstr ""
+msgstr "ÄŒekat"
 
 #: admin/systems/fusioninventory/class_fiInventoryAgent.inc:42
 #: admin/systems/fusioninventory/class_fiInventoryAgent.inc:60
 msgid "Maximum delay between each targets, in seconds"
-msgstr ""
+msgstr "NejvyÅ¡Å¡Ã umoÅ¾nÄ›nÃ¡ prodleva mezi obÄ›ma cÃli, v sekundÃ¡ch"
 
 #: admin/systems/fusioninventory/class_fiInventoryAgent.inc:49
 msgid "Web Interface"
@@ -118,19 +119,19 @@ msgstr "WebovÃ© rozhranÃ"
 
 #: admin/systems/fusioninventory/class_fiInventoryAgent.inc:52
 msgid "Disable web interface"
-msgstr ""
+msgstr "Vypnout webovÃ© rozhranÃ"
 
 #: admin/systems/fusioninventory/class_fiInventoryAgent.inc:52
 msgid "Do not use web interface"
-msgstr ""
+msgstr "NepouÅ¾Ãvat webovÃ© rozhranÃ"
 
 #: admin/systems/fusioninventory/class_fiInventoryAgent.inc:56
 msgid "Network interface to listen to"
-msgstr ""
+msgstr "SÃÅ¥ovÃ© rozhranÃ, na kterÃ©m oÄekÃ¡vat spojenÃ"
 
 #: admin/systems/fusioninventory/class_fiInventoryAgent.inc:60
 msgid "Port"
-msgstr "port"
+msgstr "Port"
 
 #: admin/systems/fusioninventory/class_fiInventoryAgent.inc:65
 msgid "Trust"
@@ -138,7 +139,7 @@ msgstr "DÅ¯vÄ›ra"
 
 #: admin/systems/fusioninventory/class_fiInventoryAgent.inc:65
 msgid "IPs allowed to launch inventory task through web interface"
-msgstr ""
+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
@@ -147,7 +148,7 @@ msgstr ""
 
 #: admin/systems/fusioninventory/class_fiInventoryAgent.inc:78
 msgid "FusionInventory agent configuration"
-msgstr ""
+msgstr "NastavenÃ agenta FusionInventory"
 
 #: html/collect.php:89
 #, php-format
@@ -156,27 +157,27 @@ msgstr "NastavenÃ %s/%s FusionDirectory nenÃ ÄitelnÃ©. Akce byla zruÅ¡ena."
 
 #: config/fusioninventory/class_fiConfig.inc:28
 msgid "FusionInventory configuration"
-msgstr ""
+msgstr "NastavenÃ FusionInventory"
 
 #: config/fusioninventory/class_fiConfig.inc:29
 msgid "FusionDirectory FusionInventory plugin configuration"
-msgstr ""
+msgstr "NastavenÃ zÃ¡suvnÃ©ho modulu FusionInventory pro FusionDirectory"
 
 #: config/fusioninventory/class_fiConfig.inc:44
 msgid "Inventory RDN"
-msgstr ""
+msgstr "RelativnÃ rozliÅ¡enÃ½ nÃ¡zev inventÃ¡Å™e"
 
 #: config/fusioninventory/class_fiConfig.inc:44
 msgid "Branch in which inventory objects will be stored"
-msgstr ""
+msgstr "VÄ›tev, ve kterÃ© budou uklÃ¡dÃ¡ny objekty inventÃ¡Å™e"
 
 #: config/fusioninventory/class_fiConfig.inc:49
 msgid "Inventory matching"
-msgstr ""
+msgstr "PÃ¡rovÃ¡nÃ inventÃ¡Å™e"
 
 #: config/fusioninventory/class_fiConfig.inc:49
 msgid "Criteria to link an inventory result to a system"
-msgstr ""
+msgstr "Hlediska pro pÅ™iÅ™azenÃ vÃ½sledku inventury k systÃ©mu"
 
 #: config/fusioninventory/class_fiConfig.inc:52
 msgid "Mac address"
@@ -184,7 +185,7 @@ msgstr "MAC adresa"
 
 #: config/fusioninventory/class_fiConfig.inc:52
 msgid "IP address"
-msgstr "IP addresa"
+msgstr "IP adresa"
 
 #: config/fusioninventory/class_fiConfig.inc:52
 msgid "Both"
diff --git a/fusioninventory/locale/de/fusiondirectory.po b/fusioninventory/locale/de/fusiondirectory.po
index 0c5a54fe5b810ede87a38e910705a81fad64224b..2a0efc64cde7219775d1de0887bd39b9a88ca76d 100644
--- a/fusioninventory/locale/de/fusiondirectory.po
+++ b/fusioninventory/locale/de/fusiondirectory.po
@@ -3,14 +3,15 @@
 # This file is distributed under the same license as the PACKAGE package.
 # 
 # Translators:
+# Ettore Atalan <atalanttore@googlemail.com>, 2014-2015
 msgid ""
 msgstr ""
-"Project-Id-Version: FusionDirectory-108\n"
+"Project-Id-Version: FusionDirectory-109\n"
 "Report-Msgid-Bugs-To: documentation@lists.fusiondirectory.org\n"
-"POT-Creation-Date: 2015-03-19 21:45+0100\n"
-"PO-Revision-Date: 2015-02-25 16:12+0000\n"
-"Last-Translator: fusiondirectory <contact@fusiondirectory.org>\n"
-"Language-Team: German (http://www.transifex.com/projects/p/FusionDirectory-108/language/de/)\n"
+"POT-Creation-Date: 2014-12-15 17:47+0100\n"
+"PO-Revision-Date: 2015-05-30 13:10+0000\n"
+"Last-Translator: Ettore Atalan <atalanttore@googlemail.com>\n"
+"Language-Team: German (http://www.transifex.com/projects/p/FusionDirectory-109/language/de/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -122,7 +123,7 @@ msgstr "WeboberflÃ¤che deaktivieren"
 
 #: admin/systems/fusioninventory/class_fiInventoryAgent.inc:52
 msgid "Do not use web interface"
-msgstr ""
+msgstr "Verwenden Sie keine WeboberflÃ¤che"
 
 #: admin/systems/fusioninventory/class_fiInventoryAgent.inc:56
 msgid "Network interface to listen to"
@@ -147,7 +148,7 @@ msgstr ""
 
 #: admin/systems/fusioninventory/class_fiInventoryAgent.inc:78
 msgid "FusionInventory agent configuration"
-msgstr ""
+msgstr "FusionInventory-Agentkonfiguration"
 
 #: html/collect.php:89
 #, php-format
@@ -156,7 +157,7 @@ msgstr "FusionDirectory Konfiguration %s/%s ist nicht lesbar. Abgebrochen."
 
 #: config/fusioninventory/class_fiConfig.inc:28
 msgid "FusionInventory configuration"
-msgstr ""
+msgstr "FusionInventory-Konfiguration"
 
 #: config/fusioninventory/class_fiConfig.inc:29
 msgid "FusionDirectory FusionInventory plugin configuration"
diff --git a/fusioninventory/locale/el_GR/fusiondirectory.po b/fusioninventory/locale/el_GR/fusiondirectory.po
new file mode 100644
index 0000000000000000000000000000000000000000..6304e5e68658cc1411c171c99da0ffd0ce02ca5f
--- /dev/null
+++ b/fusioninventory/locale/el_GR/fusiondirectory.po
@@ -0,0 +1,195 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR FusionDirectory Project
+# This file is distributed under the same license as the PACKAGE package.
+# 
+# Translators:
+msgid ""
+msgstr ""
+"Project-Id-Version: FusionDirectory-109\n"
+"Report-Msgid-Bugs-To: documentation@lists.fusiondirectory.org\n"
+"POT-Creation-Date: 2014-12-15 17:47+0100\n"
+"PO-Revision-Date: 2015-05-30 11:45+0000\n"
+"Last-Translator: Benoit Mortier <benoit.mortier@opensides.be>\n"
+"Language-Team: Greek (Greece) (http://www.transifex.com/projects/p/FusionDirectory-109/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/inventory/inventory-list.xml:7
+msgid "NO LABEL"
+msgstr ""
+
+#: admin/inventory/inventory-list.xml:28
+#: admin/systems/fusioninventory/class_fiInventoryAgent.inc:56
+msgid "IP"
+msgstr ""
+
+#: admin/inventory/inventory-list.xml:36
+msgid "Macs"
+msgstr ""
+
+#: admin/inventory/inventory-list.xml:44
+msgid "Operating Systems"
+msgstr ""
+
+#: admin/inventory/inventory-list.xml:50
+msgid "Actions"
+msgstr ""
+
+#: admin/inventory/inventory-list.xml:61 admin/inventory/inventory-list.xml:85
+msgid "Edit"
+msgstr ""
+
+#: admin/inventory/inventory-list.xml:68 admin/inventory/inventory-list.xml:92
+msgid "Remove"
+msgstr ""
+
+#: admin/inventory/class_inventoryManagement.inc:36
+msgid "Inventory objects"
+msgstr ""
+
+#: admin/inventory/class_inventoryManagement.inc:37
+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 ""
+
+#: admin/systems/fusioninventory/class_fiInventoryAgent.inc:33
+msgid "Server"
+msgstr ""
+
+#: admin/systems/fusioninventory/class_fiInventoryAgent.inc:33
+msgid "Server which FI will send inventory infos"
+msgstr ""
+
+#: admin/systems/fusioninventory/class_fiInventoryAgent.inc:37
+msgid "Delay time"
+msgstr ""
+
+#: admin/systems/fusioninventory/class_fiInventoryAgent.inc:37
+msgid "Maximum initial delay before first target, in seconds"
+msgstr ""
+
+#: admin/systems/fusioninventory/class_fiInventoryAgent.inc:42
+msgid "Wait"
+msgstr ""
+
+#: admin/systems/fusioninventory/class_fiInventoryAgent.inc:42
+#: admin/systems/fusioninventory/class_fiInventoryAgent.inc:60
+msgid "Maximum delay between each targets, in seconds"
+msgstr ""
+
+#: admin/systems/fusioninventory/class_fiInventoryAgent.inc:49
+msgid "Web Interface"
+msgstr ""
+
+#: admin/systems/fusioninventory/class_fiInventoryAgent.inc:52
+msgid "Disable web interface"
+msgstr ""
+
+#: admin/systems/fusioninventory/class_fiInventoryAgent.inc:52
+msgid "Do not use web interface"
+msgstr ""
+
+#: admin/systems/fusioninventory/class_fiInventoryAgent.inc:56
+msgid "Network interface to listen to"
+msgstr ""
+
+#: admin/systems/fusioninventory/class_fiInventoryAgent.inc:60
+msgid "Port"
+msgstr ""
+
+#: admin/systems/fusioninventory/class_fiInventoryAgent.inc:65
+msgid "Trust"
+msgstr ""
+
+#: admin/systems/fusioninventory/class_fiInventoryAgent.inc:65
+msgid "IPs allowed to launch inventory task through web interface"
+msgstr ""
+
+#: admin/systems/fusioninventory/class_fiInventoryAgent.inc:77
+#: config/fusioninventory/class_fiConfig.inc:41
+msgid "FusionInventory"
+msgstr ""
+
+#: admin/systems/fusioninventory/class_fiInventoryAgent.inc:78
+msgid "FusionInventory agent configuration"
+msgstr ""
+
+#: html/collect.php:89
+#, 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"
+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 ""
diff --git a/fusioninventory/locale/en/fusiondirectory.po b/fusioninventory/locale/en/fusiondirectory.po
index 87b3b9b03da40163a93c89b9a02d5491487784f8..f1c955cb5ca10a2c4505556fa32c14ae115ad5e7 100644
--- a/fusioninventory/locale/en/fusiondirectory.po
+++ b/fusioninventory/locale/en/fusiondirectory.po
@@ -6,13 +6,13 @@
 #, fuzzy
 msgid ""
 msgstr ""
-"Project-Id-Version: PACKAGE VERSION\n"
-"Report-Msgid-Bugs-To: documentation@lists.fusiondirectory.org\n"
-"POT-Creation-Date: 2015-03-31 11:49+0200\n"
+"Project-Id-Version: FusionDirectory VERSION\n"
+"Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
+"POT-Creation-Date: 2015-05-30 15:30+0200\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
-"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
-"Language-Team: LANGUAGE <LL@li.org>\n"
-"Language: \n"
+"Last-Translator: FusionDirectory project <contact@fusiondirectory.org>\n"
+"Language-Team: English\n"
+"Language: en\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
diff --git a/fusioninventory/locale/es/fusiondirectory.po b/fusioninventory/locale/es/fusiondirectory.po
index dffb8cbbaaf43682e9efb85c729fb42da1f89804..0eef515ef51b31b4dbcc04c1b46f3d0130d4393d 100644
--- a/fusioninventory/locale/es/fusiondirectory.po
+++ b/fusioninventory/locale/es/fusiondirectory.po
@@ -5,12 +5,12 @@
 # Translators:
 msgid ""
 msgstr ""
-"Project-Id-Version: FusionDirectory-108\n"
+"Project-Id-Version: FusionDirectory-109\n"
 "Report-Msgid-Bugs-To: documentation@lists.fusiondirectory.org\n"
-"POT-Creation-Date: 2015-03-19 21:45+0100\n"
-"PO-Revision-Date: 2015-02-25 16:12+0000\n"
-"Last-Translator: fusiondirectory <contact@fusiondirectory.org>\n"
-"Language-Team: Spanish (http://www.transifex.com/projects/p/FusionDirectory-108/language/es/)\n"
+"POT-Creation-Date: 2014-12-15 17:47+0100\n"
+"PO-Revision-Date: 2014-08-28 10:28+0000\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: Spanish (http://www.transifex.com/projects/p/FusionDirectory-109/language/es/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
diff --git a/fusioninventory/locale/es_VE/fusiondirectory.po b/fusioninventory/locale/es_VE/fusiondirectory.po
index 683508efe9c58845c030acd9408a7046175ad08b..81451a6eb79a64f86d4e32565f4130866ad0114d 100644
--- a/fusioninventory/locale/es_VE/fusiondirectory.po
+++ b/fusioninventory/locale/es_VE/fusiondirectory.po
@@ -5,12 +5,12 @@
 # Translators:
 msgid ""
 msgstr ""
-"Project-Id-Version: FusionDirectory-108\n"
+"Project-Id-Version: FusionDirectory-109\n"
 "Report-Msgid-Bugs-To: documentation@lists.fusiondirectory.org\n"
-"POT-Creation-Date: 2015-03-19 21:45+0100\n"
-"PO-Revision-Date: 2015-02-25 16:12+0000\n"
-"Last-Translator: fusiondirectory <contact@fusiondirectory.org>\n"
-"Language-Team: Spanish (Venezuela) (http://www.transifex.com/projects/p/FusionDirectory-108/language/es_VE/)\n"
+"POT-Creation-Date: 2014-12-15 17:47+0100\n"
+"PO-Revision-Date: 2014-08-28 10:28+0000\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: Spanish (Venezuela) (http://www.transifex.com/projects/p/FusionDirectory-109/language/es_VE/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
diff --git a/fusioninventory/locale/fa_IR/fusiondirectory.po b/fusioninventory/locale/fa_IR/fusiondirectory.po
index b1a68d519e867bd01d525e2fcb06a456b8a052b8..e8d4c4dcdba96620f8d26482c069a047c1e2337b 100644
--- a/fusioninventory/locale/fa_IR/fusiondirectory.po
+++ b/fusioninventory/locale/fa_IR/fusiondirectory.po
@@ -5,12 +5,12 @@
 # Translators:
 msgid ""
 msgstr ""
-"Project-Id-Version: FusionDirectory-108\n"
+"Project-Id-Version: FusionDirectory-109\n"
 "Report-Msgid-Bugs-To: documentation@lists.fusiondirectory.org\n"
-"POT-Creation-Date: 2015-03-19 21:45+0100\n"
-"PO-Revision-Date: 2014-08-26 14:14+0000\n"
-"Last-Translator: fusiondirectory <contact@fusiondirectory.org>\n"
-"Language-Team: Persian (Iran) (http://www.transifex.com/projects/p/FusionDirectory-108/language/fa_IR/)\n"
+"POT-Creation-Date: 2014-12-15 17:47+0100\n"
+"PO-Revision-Date: 2014-08-28 10:28+0000\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: Persian (Iran) (http://www.transifex.com/projects/p/FusionDirectory-109/language/fa_IR/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
diff --git a/fusioninventory/locale/fr/fusiondirectory.po b/fusioninventory/locale/fr/fusiondirectory.po
index 1b632276940c43eed9905deb645f035ae9b62d8b..844a933168baf8dd53aedbe4ab3a7b4eaf9239d0 100644
--- a/fusioninventory/locale/fr/fusiondirectory.po
+++ b/fusioninventory/locale/fr/fusiondirectory.po
@@ -3,17 +3,15 @@
 # This file is distributed under the same license as the PACKAGE package.
 # 
 # Translators:
-# MCMic, 2014
-# fusiondirectory <contact@fusiondirectory.org>, 2013-2014
-# MCMic, 2014
+# fusiondirectory <contact@fusiondirectory.org>, 2013
 msgid ""
 msgstr ""
-"Project-Id-Version: FusionDirectory-108\n"
+"Project-Id-Version: FusionDirectory-109\n"
 "Report-Msgid-Bugs-To: documentation@lists.fusiondirectory.org\n"
-"POT-Creation-Date: 2015-03-19 21:45+0100\n"
-"PO-Revision-Date: 2015-02-25 16:12+0000\n"
-"Last-Translator: MCMic\n"
-"Language-Team: French (http://www.transifex.com/projects/p/FusionDirectory-108/language/fr/)\n"
+"POT-Creation-Date: 2014-12-15 17:47+0100\n"
+"PO-Revision-Date: 2014-08-28 10:28+0000\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: French (http://www.transifex.com/projects/p/FusionDirectory-109/language/fr/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -35,7 +33,7 @@ msgstr "Macs"
 
 #: admin/inventory/inventory-list.xml:44
 msgid "Operating Systems"
-msgstr "SystÃ¨mes d'exploitation"
+msgstr "SystÃ¨mes d'exploitations"
 
 #: admin/inventory/inventory-list.xml:50
 msgid "Actions"
@@ -43,7 +41,7 @@ msgstr "Actions"
 
 #: admin/inventory/inventory-list.xml:61 admin/inventory/inventory-list.xml:85
 msgid "Edit"
-msgstr "Ã‰diter"
+msgstr "Editer"
 
 #: admin/inventory/inventory-list.xml:68 admin/inventory/inventory-list.xml:92
 msgid "Remove"
@@ -51,11 +49,11 @@ msgstr "Supprimer"
 
 #: admin/inventory/class_inventoryManagement.inc:36
 msgid "Inventory objects"
-msgstr "Objets d'inventaire"
+msgstr "Objets d'inventaires"
 
 #: admin/inventory/class_inventoryManagement.inc:37
 msgid "Browse inventory objects"
-msgstr "Parcourir les objets d'inventaire"
+msgstr "Parcourir les objets de l'inventaire"
 
 #: admin/systems/fusioninventory/class_fiInventory.inc:67
 msgid "Inventory"
@@ -68,7 +66,7 @@ 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"
+msgstr "Objets d'inventaire"
 
 #: admin/systems/fusioninventory/class_fiInventory.inc:91
 msgid "Hardware"
@@ -113,7 +111,7 @@ msgstr "Attente"
 #: admin/systems/fusioninventory/class_fiInventoryAgent.inc:42
 #: admin/systems/fusioninventory/class_fiInventoryAgent.inc:60
 msgid "Maximum delay between each targets, in seconds"
-msgstr "DÃ©lai maximum entre chaque cible, en secondes"
+msgstr "DÃ©lai maximum entre chaque cibles, en secondes"
 
 #: admin/systems/fusioninventory/class_fiInventoryAgent.inc:49
 msgid "Web Interface"
@@ -129,7 +127,7 @@ msgstr "Ne pas utiliser l'interface Web"
 
 #: admin/systems/fusioninventory/class_fiInventoryAgent.inc:56
 msgid "Network interface to listen to"
-msgstr "Interface rÃ©seau sur laquelle Ã©couter"
+msgstr "Interface de rÃ©seau sur laquelle Ã©couter"
 
 #: admin/systems/fusioninventory/class_fiInventoryAgent.inc:60
 msgid "Port"
@@ -141,7 +139,7 @@ msgstr "Mode de confiance"
 
 #: admin/systems/fusioninventory/class_fiInventoryAgent.inc:65
 msgid "IPs allowed to launch inventory task through web interface"
-msgstr "IPs autorisÃ©es Ã  lancer des tÃ¢ches d'inventaire via l'interface web"
+msgstr "IPs autorisÃ©s Ã  lancer tÃ¢che d'inventaire via l'interface web"
 
 #: admin/systems/fusioninventory/class_fiInventoryAgent.inc:77
 #: config/fusioninventory/class_fiConfig.inc:41
@@ -159,7 +157,7 @@ msgstr "Le fichier de configuration de FusionDirectory %s/%s ne peut Ãªtre lu. A
 
 #: config/fusioninventory/class_fiConfig.inc:28
 msgid "FusionInventory configuration"
-msgstr "Configuration FusionInventory"
+msgstr "Configuration de l'agent FusionInventory"
 
 #: config/fusioninventory/class_fiConfig.inc:29
 msgid "FusionDirectory FusionInventory plugin configuration"
@@ -167,11 +165,11 @@ msgstr "Configuration du plugin FusionInventory"
 
 #: config/fusioninventory/class_fiConfig.inc:44
 msgid "Inventory RDN"
-msgstr "Branche des inventaires"
+msgstr "RDN Inventaire"
 
 #: 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"
+msgstr "Branche oÃ¹ seront stockÃ©s les objets FusionInventory"
 
 #: config/fusioninventory/class_fiConfig.inc:49
 msgid "Inventory matching"
@@ -195,4 +193,4 @@ msgstr "Les deux"
 
 #: config/fusioninventory/class_fiConfig.inc:52
 msgid "IP or Mac address"
-msgstr "Adresse IP ou mac"
+msgstr "Adresse IP ou adresse mac"
diff --git a/fusioninventory/locale/id/fusiondirectory.po b/fusioninventory/locale/id/fusiondirectory.po
index d3a18a7e39fbd59be57e56cb15541058a05a8bda..11dac3df1e3a6619528a45570a8d2487013d7d26 100644
--- a/fusioninventory/locale/id/fusiondirectory.po
+++ b/fusioninventory/locale/id/fusiondirectory.po
@@ -5,12 +5,12 @@
 # Translators:
 msgid ""
 msgstr ""
-"Project-Id-Version: FusionDirectory-108\n"
+"Project-Id-Version: FusionDirectory-109\n"
 "Report-Msgid-Bugs-To: documentation@lists.fusiondirectory.org\n"
-"POT-Creation-Date: 2015-03-19 21:45+0100\n"
-"PO-Revision-Date: 2014-08-26 14:14+0000\n"
-"Last-Translator: fusiondirectory <contact@fusiondirectory.org>\n"
-"Language-Team: Indonesian (http://www.transifex.com/projects/p/FusionDirectory-108/language/id/)\n"
+"POT-Creation-Date: 2014-12-15 17:47+0100\n"
+"PO-Revision-Date: 2014-08-28 10:28+0000\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: Indonesian (http://www.transifex.com/projects/p/FusionDirectory-109/language/id/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
diff --git a/fusioninventory/locale/it/fusiondirectory.po b/fusioninventory/locale/it/fusiondirectory.po
index 8ddda7bf3e343b2fbdb58602b495950875a10fc4..c7ed80d6e12435d7989d35d4f51a1f991e10d91c 100644
--- a/fusioninventory/locale/it/fusiondirectory.po
+++ b/fusioninventory/locale/it/fusiondirectory.po
@@ -5,12 +5,12 @@
 # Translators:
 msgid ""
 msgstr ""
-"Project-Id-Version: FusionDirectory-108\n"
+"Project-Id-Version: FusionDirectory-109\n"
 "Report-Msgid-Bugs-To: documentation@lists.fusiondirectory.org\n"
-"POT-Creation-Date: 2015-03-19 21:45+0100\n"
-"PO-Revision-Date: 2015-02-25 16:12+0000\n"
-"Last-Translator: fusiondirectory <contact@fusiondirectory.org>\n"
-"Language-Team: Italian (http://www.transifex.com/projects/p/FusionDirectory-108/language/it/)\n"
+"POT-Creation-Date: 2014-12-15 17:47+0100\n"
+"PO-Revision-Date: 2014-08-28 10:28+0000\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: Italian (http://www.transifex.com/projects/p/FusionDirectory-109/language/it/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
diff --git a/fusioninventory/locale/lv/fusiondirectory.po b/fusioninventory/locale/lv/fusiondirectory.po
index 593554eee0258cdf866bbc865ec4816bea3dbe71..6a380a5854e90ee2b4f9332e43116b531eb026ff 100644
--- a/fusioninventory/locale/lv/fusiondirectory.po
+++ b/fusioninventory/locale/lv/fusiondirectory.po
@@ -5,12 +5,12 @@
 # Translators:
 msgid ""
 msgstr ""
-"Project-Id-Version: FusionDirectory-108\n"
+"Project-Id-Version: FusionDirectory-109\n"
 "Report-Msgid-Bugs-To: documentation@lists.fusiondirectory.org\n"
-"POT-Creation-Date: 2015-03-19 21:45+0100\n"
-"PO-Revision-Date: 2014-08-26 14:14+0000\n"
-"Last-Translator: fusiondirectory <contact@fusiondirectory.org>\n"
-"Language-Team: Latvian (http://www.transifex.com/projects/p/FusionDirectory-108/language/lv/)\n"
+"POT-Creation-Date: 2014-12-15 17:47+0100\n"
+"PO-Revision-Date: 2014-08-28 10:28+0000\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: Latvian (http://www.transifex.com/projects/p/FusionDirectory-109/language/lv/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
diff --git a/fusioninventory/locale/nb/fusiondirectory.po b/fusioninventory/locale/nb/fusiondirectory.po
index 3dceb71efa26c1bf807b942274361fc8044a84fd..d8e0d0c828837a2b8ff4bb19519e0e1ec9d22f2d 100644
--- a/fusioninventory/locale/nb/fusiondirectory.po
+++ b/fusioninventory/locale/nb/fusiondirectory.po
@@ -5,12 +5,12 @@
 # Translators:
 msgid ""
 msgstr ""
-"Project-Id-Version: FusionDirectory-108\n"
+"Project-Id-Version: FusionDirectory-109\n"
 "Report-Msgid-Bugs-To: documentation@lists.fusiondirectory.org\n"
-"POT-Creation-Date: 2015-03-19 21:45+0100\n"
-"PO-Revision-Date: 2015-02-25 16:12+0000\n"
-"Last-Translator: fusiondirectory <contact@fusiondirectory.org>\n"
-"Language-Team: Norwegian BokmÃ¥l (http://www.transifex.com/projects/p/FusionDirectory-108/language/nb/)\n"
+"POT-Creation-Date: 2014-12-15 17:47+0100\n"
+"PO-Revision-Date: 2014-08-28 10:28+0000\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: Norwegian BokmÃ¥l (http://www.transifex.com/projects/p/FusionDirectory-109/language/nb/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
diff --git a/fusioninventory/locale/nl/fusiondirectory.po b/fusioninventory/locale/nl/fusiondirectory.po
index 8618e374a900252be30d8c74eb62938797bf8dbf..0f542e5dc1846808172db30cd284818b63812e7e 100644
--- a/fusioninventory/locale/nl/fusiondirectory.po
+++ b/fusioninventory/locale/nl/fusiondirectory.po
@@ -5,12 +5,12 @@
 # Translators:
 msgid ""
 msgstr ""
-"Project-Id-Version: FusionDirectory-108\n"
+"Project-Id-Version: FusionDirectory-109\n"
 "Report-Msgid-Bugs-To: documentation@lists.fusiondirectory.org\n"
-"POT-Creation-Date: 2015-03-19 21:45+0100\n"
-"PO-Revision-Date: 2015-02-25 16:12+0000\n"
-"Last-Translator: fusiondirectory <contact@fusiondirectory.org>\n"
-"Language-Team: Dutch (http://www.transifex.com/projects/p/FusionDirectory-108/language/nl/)\n"
+"POT-Creation-Date: 2014-12-15 17:47+0100\n"
+"PO-Revision-Date: 2014-08-28 10:28+0000\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: Dutch (http://www.transifex.com/projects/p/FusionDirectory-109/language/nl/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
diff --git a/fusioninventory/locale/pl/fusiondirectory.po b/fusioninventory/locale/pl/fusiondirectory.po
index d5a54cdf288e558a2e08c93f3b9cb56b28312e79..7e2a260b8b39fcb21893a6c8607b389b55ddd826 100644
--- a/fusioninventory/locale/pl/fusiondirectory.po
+++ b/fusioninventory/locale/pl/fusiondirectory.po
@@ -5,12 +5,12 @@
 # Translators:
 msgid ""
 msgstr ""
-"Project-Id-Version: FusionDirectory-108\n"
+"Project-Id-Version: FusionDirectory-109\n"
 "Report-Msgid-Bugs-To: documentation@lists.fusiondirectory.org\n"
-"POT-Creation-Date: 2015-03-19 21:45+0100\n"
-"PO-Revision-Date: 2015-02-25 16:12+0000\n"
-"Last-Translator: fusiondirectory <contact@fusiondirectory.org>\n"
-"Language-Team: Polish (http://www.transifex.com/projects/p/FusionDirectory-108/language/pl/)\n"
+"POT-Creation-Date: 2014-12-15 17:47+0100\n"
+"PO-Revision-Date: 2014-08-28 10:28+0000\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: Polish (http://www.transifex.com/projects/p/FusionDirectory-109/language/pl/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
diff --git a/fusioninventory/locale/pt/fusiondirectory.po b/fusioninventory/locale/pt/fusiondirectory.po
index eb213773497c5fc8550fdb4123a74cd76d97d696..a9917dbc630d7c8552d50c00ecfd15f543c097a5 100644
--- a/fusioninventory/locale/pt/fusiondirectory.po
+++ b/fusioninventory/locale/pt/fusiondirectory.po
@@ -5,12 +5,12 @@
 # Translators:
 msgid ""
 msgstr ""
-"Project-Id-Version: FusionDirectory-108\n"
+"Project-Id-Version: FusionDirectory-109\n"
 "Report-Msgid-Bugs-To: documentation@lists.fusiondirectory.org\n"
-"POT-Creation-Date: 2015-03-19 21:45+0100\n"
-"PO-Revision-Date: 2015-02-25 16:12+0000\n"
-"Last-Translator: fusiondirectory <contact@fusiondirectory.org>\n"
-"Language-Team: Portuguese (http://www.transifex.com/projects/p/FusionDirectory-108/language/pt/)\n"
+"POT-Creation-Date: 2014-12-15 17:47+0100\n"
+"PO-Revision-Date: 2014-08-28 10:28+0000\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: Portuguese (http://www.transifex.com/projects/p/FusionDirectory-109/language/pt/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
diff --git a/fusioninventory/locale/pt_BR/fusiondirectory.po b/fusioninventory/locale/pt_BR/fusiondirectory.po
index da9ab7d3d3304ef7727f52a80fe97c06d1c56306..8907eeec4513d75597c5c271950478451993b01e 100644
--- a/fusioninventory/locale/pt_BR/fusiondirectory.po
+++ b/fusioninventory/locale/pt_BR/fusiondirectory.po
@@ -3,15 +3,14 @@
 # This file is distributed under the same license as the PACKAGE package.
 # 
 # Translators:
-# ALEJANDRO BARRIOS <alejandrobarrios@interlegis.leg.br>, 2014
 msgid ""
 msgstr ""
-"Project-Id-Version: FusionDirectory-108\n"
+"Project-Id-Version: FusionDirectory-109\n"
 "Report-Msgid-Bugs-To: documentation@lists.fusiondirectory.org\n"
-"POT-Creation-Date: 2015-03-19 21:45+0100\n"
-"PO-Revision-Date: 2015-02-25 16:12+0000\n"
-"Last-Translator: fusiondirectory <contact@fusiondirectory.org>\n"
-"Language-Team: Portuguese (Brazil) (http://www.transifex.com/projects/p/FusionDirectory-108/language/pt_BR/)\n"
+"POT-Creation-Date: 2014-12-15 17:47+0100\n"
+"PO-Revision-Date: 2014-08-28 10:28+0000\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: Portuguese (Brazil) (http://www.transifex.com/projects/p/FusionDirectory-109/language/pt_BR/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -90,7 +89,7 @@ msgstr "ConfiguraÃ§Ã£o"
 
 #: admin/systems/fusioninventory/class_fiInventoryAgent.inc:33
 msgid "Server"
-msgstr "Servidor"
+msgstr "servidor"
 
 #: admin/systems/fusioninventory/class_fiInventoryAgent.inc:33
 msgid "Server which FI will send inventory infos"
diff --git a/fusioninventory/locale/ru/fusiondirectory.po b/fusioninventory/locale/ru/fusiondirectory.po
index d417a429965831388b02a99a38eb822d8f39e582..698ead2c929c686be2eae8990a8c21da9c4cb98b 100644
--- a/fusioninventory/locale/ru/fusiondirectory.po
+++ b/fusioninventory/locale/ru/fusiondirectory.po
@@ -5,17 +5,17 @@
 # Translators:
 msgid ""
 msgstr ""
-"Project-Id-Version: FusionDirectory-108\n"
+"Project-Id-Version: FusionDirectory-109\n"
 "Report-Msgid-Bugs-To: documentation@lists.fusiondirectory.org\n"
-"POT-Creation-Date: 2015-03-19 21:45+0100\n"
-"PO-Revision-Date: 2015-03-10 11:21+0000\n"
-"Last-Translator: fusiondirectory <contact@fusiondirectory.org>\n"
-"Language-Team: Russian (http://www.transifex.com/projects/p/FusionDirectory-108/language/ru/)\n"
+"POT-Creation-Date: 2014-12-15 17:47+0100\n"
+"PO-Revision-Date: 2014-08-28 10:28+0000\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: Russian (http://www.transifex.com/projects/p/FusionDirectory-109/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=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);\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/inventory/inventory-list.xml:7
 msgid "NO LABEL"
@@ -24,7 +24,7 @@ msgstr ""
 #: admin/inventory/inventory-list.xml:28
 #: admin/systems/fusioninventory/class_fiInventoryAgent.inc:56
 msgid "IP"
-msgstr ""
+msgstr "IP"
 
 #: admin/inventory/inventory-list.xml:36
 msgid "Macs"
@@ -32,7 +32,7 @@ msgstr ""
 
 #: admin/inventory/inventory-list.xml:44
 msgid "Operating Systems"
-msgstr ""
+msgstr "ÐžÐ¿ÐµÑ€Ð°Ñ†Ð¸Ð¾Ð½Ð½Ñ‹Ðµ Ð¡Ð¸ÑÑ‚ÐµÐ¼Ñ‹"
 
 #: admin/inventory/inventory-list.xml:50
 msgid "Actions"
@@ -73,7 +73,7 @@ msgstr ""
 
 #: admin/systems/fusioninventory/class_fiInventory.inc:97
 msgid "Software"
-msgstr ""
+msgstr "ÐŸÑ€Ð¾Ð³Ñ€Ð°Ð¼Ð½Ð¾Ðµ Ð¾Ð±ÐµÑÐ¿ÐµÑ‡ÐµÐ½Ð¸Ðµ"
 
 #: admin/systems/fusioninventory/class_fiInventory.inc:103
 msgid "Users"
@@ -180,16 +180,16 @@ msgstr ""
 
 #: config/fusioninventory/class_fiConfig.inc:52
 msgid "Mac address"
-msgstr ""
+msgstr "Mac Ð°Ð´Ñ€ÐµÑ"
 
 #: config/fusioninventory/class_fiConfig.inc:52
 msgid "IP address"
-msgstr ""
+msgstr "IP Ð°Ð´Ñ€ÐµÑ"
 
 #: config/fusioninventory/class_fiConfig.inc:52
 msgid "Both"
-msgstr ""
+msgstr "ÐžÐ±Ð°"
 
 #: config/fusioninventory/class_fiConfig.inc:52
 msgid "IP or Mac address"
-msgstr ""
+msgstr "IP Ð¸Ð»Ð¸ MAC Ð°Ð´Ñ€ÐµÑ"
diff --git a/fusioninventory/locale/ru@petr1708/fusiondirectory.po b/fusioninventory/locale/ru@petr1708/fusiondirectory.po
index b07c4b1794ada109cc7319810cf868f0b569ba69..f9d8dd01a32cb683797a5f34259581e2660fa432 100644
--- a/fusioninventory/locale/ru@petr1708/fusiondirectory.po
+++ b/fusioninventory/locale/ru@petr1708/fusiondirectory.po
@@ -5,17 +5,17 @@
 # Translators:
 msgid ""
 msgstr ""
-"Project-Id-Version: FusionDirectory-108\n"
+"Project-Id-Version: FusionDirectory-109\n"
 "Report-Msgid-Bugs-To: documentation@lists.fusiondirectory.org\n"
-"POT-Creation-Date: 2015-03-19 21:45+0100\n"
-"PO-Revision-Date: 2014-08-26 14:14+0000\n"
-"Last-Translator: fusiondirectory <contact@fusiondirectory.org>\n"
-"Language-Team: Russian Petrine orthography (http://www.transifex.com/projects/p/FusionDirectory-108/language/ru@petr1708/)\n"
+"POT-Creation-Date: 2014-12-15 17:47+0100\n"
+"PO-Revision-Date: 2014-08-28 10:28+0000\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: Russian Petrine orthography (http://www.transifex.com/projects/p/FusionDirectory-109/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=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);\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/inventory/inventory-list.xml:7
 msgid "NO LABEL"
diff --git a/fusioninventory/locale/sv/fusiondirectory.po b/fusioninventory/locale/sv/fusiondirectory.po
index 8c6b09abc73701a6c630fb42f832084264d53b19..993aeefad00ed491787d2cb1bec949f598c39e52 100644
--- a/fusioninventory/locale/sv/fusiondirectory.po
+++ b/fusioninventory/locale/sv/fusiondirectory.po
@@ -5,12 +5,12 @@
 # Translators:
 msgid ""
 msgstr ""
-"Project-Id-Version: FusionDirectory-108\n"
+"Project-Id-Version: FusionDirectory-109\n"
 "Report-Msgid-Bugs-To: documentation@lists.fusiondirectory.org\n"
-"POT-Creation-Date: 2015-03-19 21:45+0100\n"
-"PO-Revision-Date: 2015-02-25 16:12+0000\n"
-"Last-Translator: fusiondirectory <contact@fusiondirectory.org>\n"
-"Language-Team: Swedish (http://www.transifex.com/projects/p/FusionDirectory-108/language/sv/)\n"
+"POT-Creation-Date: 2014-12-15 17:47+0100\n"
+"PO-Revision-Date: 2014-08-28 10:28+0000\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: Swedish (http://www.transifex.com/projects/p/FusionDirectory-109/language/sv/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
diff --git a/fusioninventory/locale/ug/fusiondirectory.po b/fusioninventory/locale/ug/fusiondirectory.po
index 1e7f0a60392709b071fe01c38425303cdeb47bdb..1b21dd0997e917bc41ec360e44575557f8b70a6f 100644
--- a/fusioninventory/locale/ug/fusiondirectory.po
+++ b/fusioninventory/locale/ug/fusiondirectory.po
@@ -5,12 +5,12 @@
 # Translators:
 msgid ""
 msgstr ""
-"Project-Id-Version: FusionDirectory-108\n"
+"Project-Id-Version: FusionDirectory-109\n"
 "Report-Msgid-Bugs-To: documentation@lists.fusiondirectory.org\n"
-"POT-Creation-Date: 2015-03-19 21:45+0100\n"
-"PO-Revision-Date: 2014-08-26 14:14+0000\n"
-"Last-Translator: fusiondirectory <contact@fusiondirectory.org>\n"
-"Language-Team: Uighur (http://www.transifex.com/projects/p/FusionDirectory-108/language/ug/)\n"
+"POT-Creation-Date: 2014-12-15 17:47+0100\n"
+"PO-Revision-Date: 2014-08-28 10:28+0000\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: Uighur (http://www.transifex.com/projects/p/FusionDirectory-109/language/ug/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
diff --git a/fusioninventory/locale/vi_VN/fusiondirectory.po b/fusioninventory/locale/vi_VN/fusiondirectory.po
index e71a3bd1c6e8afa3782a6a2bd8525a6fe6db53f1..77d58ea3eb54427a66efc9431427a15782ba1176 100644
--- a/fusioninventory/locale/vi_VN/fusiondirectory.po
+++ b/fusioninventory/locale/vi_VN/fusiondirectory.po
@@ -5,12 +5,12 @@
 # Translators:
 msgid ""
 msgstr ""
-"Project-Id-Version: FusionDirectory-108\n"
+"Project-Id-Version: FusionDirectory-109\n"
 "Report-Msgid-Bugs-To: documentation@lists.fusiondirectory.org\n"
-"POT-Creation-Date: 2015-03-19 21:45+0100\n"
-"PO-Revision-Date: 2015-02-25 16:12+0000\n"
-"Last-Translator: fusiondirectory <contact@fusiondirectory.org>\n"
-"Language-Team: Vietnamese (Viet Nam) (http://www.transifex.com/projects/p/FusionDirectory-108/language/vi_VN/)\n"
+"POT-Creation-Date: 2014-12-15 17:47+0100\n"
+"PO-Revision-Date: 2014-08-28 10:28+0000\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: Vietnamese (Viet Nam) (http://www.transifex.com/projects/p/FusionDirectory-109/language/vi_VN/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
diff --git a/fusioninventory/locale/zh/fusiondirectory.po b/fusioninventory/locale/zh/fusiondirectory.po
index 55d01826b49dd7aff2dd21a6d634f3b7ee915bed..40623bd27b4b67ef62f0ec91f016f4511e85ab08 100644
--- a/fusioninventory/locale/zh/fusiondirectory.po
+++ b/fusioninventory/locale/zh/fusiondirectory.po
@@ -5,12 +5,12 @@
 # Translators:
 msgid ""
 msgstr ""
-"Project-Id-Version: FusionDirectory-108\n"
+"Project-Id-Version: FusionDirectory-109\n"
 "Report-Msgid-Bugs-To: documentation@lists.fusiondirectory.org\n"
-"POT-Creation-Date: 2015-03-19 21:45+0100\n"
-"PO-Revision-Date: 2015-02-25 16:12+0000\n"
-"Last-Translator: fusiondirectory <contact@fusiondirectory.org>\n"
-"Language-Team: Chinese (http://www.transifex.com/projects/p/FusionDirectory-108/language/zh/)\n"
+"POT-Creation-Date: 2014-12-15 17:47+0100\n"
+"PO-Revision-Date: 2014-08-28 10:28+0000\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: Chinese (http://www.transifex.com/projects/p/FusionDirectory-109/language/zh/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
diff --git a/game/locale/ar/fusiondirectory.po b/game/locale/ar/fusiondirectory.po
index 8b5e853e2b551c2b45ed3017638bfeece72a9079..6a80f8ead7beff52c8cb71131839624ac5b43dbd 100644
--- a/game/locale/ar/fusiondirectory.po
+++ b/game/locale/ar/fusiondirectory.po
@@ -5,12 +5,12 @@
 # Translators:
 msgid ""
 msgstr ""
-"Project-Id-Version: FusionDirectory-108\n"
+"Project-Id-Version: FusionDirectory-109\n"
 "Report-Msgid-Bugs-To: documentation@lists.fusiondirectory.org\n"
-"POT-Creation-Date: 2015-03-19 21:45+0100\n"
-"PO-Revision-Date: 2014-08-26 14:13+0000\n"
-"Last-Translator: fusiondirectory <contact@fusiondirectory.org>\n"
-"Language-Team: Arabic (http://www.transifex.com/projects/p/FusionDirectory-108/language/ar/)\n"
+"POT-Creation-Date: 2014-12-15 17:47+0100\n"
+"PO-Revision-Date: 2014-08-28 10:28+0000\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: Arabic (http://www.transifex.com/projects/p/FusionDirectory-109/language/ar/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
diff --git a/game/locale/ca/fusiondirectory.po b/game/locale/ca/fusiondirectory.po
index efcaf09f9bea664c6350adce0077f0e288336147..b439425bfa51b71b371a728192e1086860260497 100644
--- a/game/locale/ca/fusiondirectory.po
+++ b/game/locale/ca/fusiondirectory.po
@@ -5,12 +5,12 @@
 # Translators:
 msgid ""
 msgstr ""
-"Project-Id-Version: FusionDirectory-108\n"
+"Project-Id-Version: FusionDirectory-109\n"
 "Report-Msgid-Bugs-To: documentation@lists.fusiondirectory.org\n"
-"POT-Creation-Date: 2015-03-19 21:45+0100\n"
-"PO-Revision-Date: 2014-08-26 14:13+0000\n"
-"Last-Translator: fusiondirectory <contact@fusiondirectory.org>\n"
-"Language-Team: Catalan (http://www.transifex.com/projects/p/FusionDirectory-108/language/ca/)\n"
+"POT-Creation-Date: 2014-12-15 17:47+0100\n"
+"PO-Revision-Date: 2014-08-28 10:28+0000\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: Catalan (http://www.transifex.com/projects/p/FusionDirectory-109/language/ca/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
diff --git a/game/locale/cs_CZ/fusiondirectory.po b/game/locale/cs_CZ/fusiondirectory.po
index 3d5652121a1f3134ad25c378cd3851baf3750593..215aefb8ddfc02823cbbc74ec4e6b826ce91cb37 100644
--- a/game/locale/cs_CZ/fusiondirectory.po
+++ b/game/locale/cs_CZ/fusiondirectory.po
@@ -3,14 +3,15 @@
 # This file is distributed under the same license as the PACKAGE package.
 # 
 # Translators:
+# Pavel Borecki <pavel.borecki@gmail.com>, 2015
 msgid ""
 msgstr ""
-"Project-Id-Version: FusionDirectory-108\n"
+"Project-Id-Version: FusionDirectory-109\n"
 "Report-Msgid-Bugs-To: documentation@lists.fusiondirectory.org\n"
-"POT-Creation-Date: 2015-03-19 21:45+0100\n"
-"PO-Revision-Date: 2014-08-26 14:14+0000\n"
-"Last-Translator: fusiondirectory <contact@fusiondirectory.org>\n"
-"Language-Team: Czech (Czech Republic) (http://www.transifex.com/projects/p/FusionDirectory-108/language/cs_CZ/)\n"
+"POT-Creation-Date: 2014-12-15 17:47+0100\n"
+"PO-Revision-Date: 2015-04-02 12:51+0000\n"
+"Last-Translator: Pavel Borecki <pavel.borecki@gmail.com>\n"
+"Language-Team: Czech (Czech Republic) (http://www.transifex.com/projects/p/FusionDirectory-109/language/cs_CZ/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -19,68 +20,68 @@ msgstr ""
 
 #: addons/game/class_Game.inc:77
 msgid "John Lennon has arrived"
-msgstr ""
+msgstr "Dorazil John Lennon"
 
 #: addons/game/class_Game.inc:79
 msgid "Create a user for John Lennon with login <b>john</b>"
-msgstr ""
+msgstr "VytvoÅ™te ÃºÄet pro Johna Lennona s pÅ™ihlaÅ¡ovacÃm jmÃ©nem <b>john</b>"
 
 #: addons/game/class_Game.inc:82
 msgid "The Beatles are here"
-msgstr ""
+msgstr "Beatles jsou zde"
 
 #: addons/game/class_Game.inc:84
 msgid ""
 "Create a user template named <b>beatle</b>, using "
 "<i>http://%l|givenName%.com</i> as homepage and <i>%l|sn%</i> (lower case "
 "first name) as password"
-msgstr ""
+msgstr "VytvoÅ™it Å¡ablonu uÅ¾ivatele nazvanou <b>beatle</b>, s pouÅ¾itÃm <i>http://%l|givenName%.com</i> coby domovskÃ© strÃ¡nky <i>%l|sn%</i> (jmÃ©no malÃ½mi pÃsmeny) jako hesla"
 
 #: addons/game/class_Game.inc:85
 msgid "Create a user for Paul McCartney using beatle profile (login paul)"
-msgstr ""
+msgstr "VytvoÅ™it uÅ¾ivatelskÃ½ ÃºÄet pro Paul McCartneyho s pouÅ¾itÃm sady nastavenÃ â€žbeatleâ€œ (pÅ™ihlaÅ¡ovacÃ jmÃ©no paul)"
 
 #: addons/game/class_Game.inc:86
 msgid "Create a user for George Harrison using beatle profile (login george)"
-msgstr ""
+msgstr "VytvoÅ™it uÅ¾ivatelskÃ½ ÃºÄet pro George Harrisona s pouÅ¾itÃm sady nastavenÃ â€žbeatleâ€œ (pÅ™ihlaÅ¡ovacÃ jmÃ©no george)"
 
 #: addons/game/class_Game.inc:87
 msgid "Create a user for Ringo Starr using beatle profile (login ringo)"
-msgstr ""
+msgstr "VytvoÅ™it ÃºÄet pro Ringo Starra s pouÅ¾itÃm sady nastavenÃ â€žbeatleâ€œ (uÅ¾ivatelskÃ© jmÃ©no ringo)"
 
 #: addons/game/class_Game.inc:88
 msgid ""
 "Create a group for The Beatles named <b>beatles</b> and add the 4 beatles to"
 " this group"
-msgstr ""
+msgstr "VytvoÅ™te uÅ¾ivatelskou skupinu pro skupinu Beatles, pojmenovanou <b>beatles</b> a pÅ™idejte do nÃ jejÃ Äleny"
 
 #: addons/game/class_Game.inc:99
 msgid "The Beatles bought computers"
-msgstr ""
+msgstr "Beatles si koupili poÄÃtaÄe"
 
 #: addons/game/class_Game.inc:101
 msgid ""
 "Create a server named <b>yellow-submarine</b> with IP 192.168.1.129 and MAC "
 "00:11:22:33:44:01"
-msgstr ""
+msgstr "VytvoÅ™te server, nazvanÃ½ <b>zluta-ponorka</b> s IP adresou 192.168.1.129 a MAC adresou 00:11:22:33:44:01"
 
 #: addons/game/class_Game.inc:102
 msgid "Add a DNS service for zone <b>beatles.fake</b> on this server"
-msgstr ""
+msgstr "PÅ™idat DNS sluÅ¾bu pro zÃ³nu <b>beatles.smyslena</b> na tento server"
 
 #: addons/game/class_Game.inc:103
 msgid ""
 "Add a DHCP service for the network <b>192.168.1.128/26</b> on this server"
-msgstr ""
+msgstr "PÅ™idat sluÅ¾bu DHCP pro sÃÅ¥ <b>192.168.1.128/26</b> na tento server"
 
 #: addons/game/class_Game.inc:104
 msgid ""
 "Create a workstation for John's laptop, with IP 192.168.1.130 and MAC "
 "00:11:22:33:44:02"
-msgstr ""
+msgstr "VytvoÅ™it pracovnÃ stanici pro JanÅ¯v notebook, kterÃ½ mÃ¡ IP adresu 192.168.1.130 a MAC adresu 00:11:22:33:44:02"
 
 #: addons/game/class_Game.inc:105
 msgid ""
 "Create a winstation for George's laptop, as he is running windows, with IP "
 "192.168.1.131 and MAC 00:11:22:33:44:03"
-msgstr ""
+msgstr "VytvoÅ™it ÃºÄet poÄÃtaÄe s MS Windows pro JiÅ™Ãho notebook, s IP adresou 192.168.1.131 a MAC adresu 00:11:22:33:44:03"
diff --git a/game/locale/de/fusiondirectory.po b/game/locale/de/fusiondirectory.po
index 111e5772a8a3fcd97a9e912b921d8c9ca3107726..cded7a0cf824687252dcf9e2fe64a9b286892502 100644
--- a/game/locale/de/fusiondirectory.po
+++ b/game/locale/de/fusiondirectory.po
@@ -3,17 +3,14 @@
 # This file is distributed under the same license as the PACKAGE package.
 # 
 # Translators:
-# Islam Adel, 2013
-# Islam Adel, 2013
-# Maik Wagner <maikwagner@yahoo.com>, 2014
 msgid ""
 msgstr ""
-"Project-Id-Version: FusionDirectory-108\n"
+"Project-Id-Version: FusionDirectory-109\n"
 "Report-Msgid-Bugs-To: documentation@lists.fusiondirectory.org\n"
-"POT-Creation-Date: 2015-03-19 21:45+0100\n"
-"PO-Revision-Date: 2014-08-28 10:50+0000\n"
-"Last-Translator: fusiondirectory <contact@fusiondirectory.org>\n"
-"Language-Team: German (http://www.transifex.com/projects/p/FusionDirectory-108/language/de/)\n"
+"POT-Creation-Date: 2014-12-15 17:47+0100\n"
+"PO-Revision-Date: 2014-08-28 10:28+0000\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: German (http://www.transifex.com/projects/p/FusionDirectory-109/language/de/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
diff --git a/game/locale/el_GR/fusiondirectory.po b/game/locale/el_GR/fusiondirectory.po
new file mode 100644
index 0000000000000000000000000000000000000000..6eb2a7b9c767b72e48091477375826fa0c1ba852
--- /dev/null
+++ b/game/locale/el_GR/fusiondirectory.po
@@ -0,0 +1,86 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR FusionDirectory Project
+# This file is distributed under the same license as the PACKAGE package.
+# 
+# Translators:
+msgid ""
+msgstr ""
+"Project-Id-Version: FusionDirectory-109\n"
+"Report-Msgid-Bugs-To: documentation@lists.fusiondirectory.org\n"
+"POT-Creation-Date: 2014-12-15 17:47+0100\n"
+"PO-Revision-Date: 2015-05-30 11:45+0000\n"
+"Last-Translator: Benoit Mortier <benoit.mortier@opensides.be>\n"
+"Language-Team: Greek (Greece) (http://www.transifex.com/projects/p/FusionDirectory-109/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"
+
+#: addons/game/class_Game.inc:77
+msgid "John Lennon has arrived"
+msgstr ""
+
+#: addons/game/class_Game.inc:79
+msgid "Create a user for John Lennon with login <b>john</b>"
+msgstr ""
+
+#: addons/game/class_Game.inc:82
+msgid "The Beatles are here"
+msgstr ""
+
+#: addons/game/class_Game.inc:84
+msgid ""
+"Create a user template named <b>beatle</b>, using "
+"<i>http://%l|givenName%.com</i> as homepage and <i>%l|sn%</i> (lower case "
+"first name) as password"
+msgstr ""
+
+#: addons/game/class_Game.inc:85
+msgid "Create a user for Paul McCartney using beatle profile (login paul)"
+msgstr ""
+
+#: addons/game/class_Game.inc:86
+msgid "Create a user for George Harrison using beatle profile (login george)"
+msgstr ""
+
+#: addons/game/class_Game.inc:87
+msgid "Create a user for Ringo Starr using beatle profile (login ringo)"
+msgstr ""
+
+#: addons/game/class_Game.inc:88
+msgid ""
+"Create a group for The Beatles named <b>beatles</b> and add the 4 beatles to"
+" this group"
+msgstr ""
+
+#: addons/game/class_Game.inc:99
+msgid "The Beatles bought computers"
+msgstr ""
+
+#: addons/game/class_Game.inc:101
+msgid ""
+"Create a server named <b>yellow-submarine</b> with IP 192.168.1.129 and MAC "
+"00:11:22:33:44:01"
+msgstr ""
+
+#: addons/game/class_Game.inc:102
+msgid "Add a DNS service for zone <b>beatles.fake</b> on this server"
+msgstr ""
+
+#: addons/game/class_Game.inc:103
+msgid ""
+"Add a DHCP service for the network <b>192.168.1.128/26</b> on this server"
+msgstr ""
+
+#: addons/game/class_Game.inc:104
+msgid ""
+"Create a workstation for John's laptop, with IP 192.168.1.130 and MAC "
+"00:11:22:33:44:02"
+msgstr ""
+
+#: addons/game/class_Game.inc:105
+msgid ""
+"Create a winstation for George's laptop, as he is running windows, with IP "
+"192.168.1.131 and MAC 00:11:22:33:44:03"
+msgstr ""
diff --git a/game/locale/en/fusiondirectory.po b/game/locale/en/fusiondirectory.po
index f8f25fab5022d39163d8564cf580a3cfcc2a2f73..b41004095a004f62aad8abf530b024135189f084 100644
--- a/game/locale/en/fusiondirectory.po
+++ b/game/locale/en/fusiondirectory.po
@@ -6,13 +6,13 @@
 #, fuzzy
 msgid ""
 msgstr ""
-"Project-Id-Version: PACKAGE VERSION\n"
-"Report-Msgid-Bugs-To: documentation@lists.fusiondirectory.org\n"
-"POT-Creation-Date: 2015-03-31 11:49+0200\n"
+"Project-Id-Version: FusionDirectory VERSION\n"
+"Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
+"POT-Creation-Date: 2015-05-30 15:30+0200\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
-"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
-"Language-Team: LANGUAGE <LL@li.org>\n"
-"Language: \n"
+"Last-Translator: FusionDirectory project <contact@fusiondirectory.org>\n"
+"Language-Team: English\n"
+"Language: en\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
diff --git a/game/locale/es/fusiondirectory.po b/game/locale/es/fusiondirectory.po
index a2592da3b632baf37c5988114a75dd8525f0badd..fba3a27cbe714623560fc9c556c0daf893b83aa2 100644
--- a/game/locale/es/fusiondirectory.po
+++ b/game/locale/es/fusiondirectory.po
@@ -5,12 +5,12 @@
 # Translators:
 msgid ""
 msgstr ""
-"Project-Id-Version: FusionDirectory-108\n"
+"Project-Id-Version: FusionDirectory-109\n"
 "Report-Msgid-Bugs-To: documentation@lists.fusiondirectory.org\n"
-"POT-Creation-Date: 2015-03-19 21:45+0100\n"
-"PO-Revision-Date: 2014-08-26 14:14+0000\n"
-"Last-Translator: fusiondirectory <contact@fusiondirectory.org>\n"
-"Language-Team: Spanish (http://www.transifex.com/projects/p/FusionDirectory-108/language/es/)\n"
+"POT-Creation-Date: 2014-12-15 17:47+0100\n"
+"PO-Revision-Date: 2014-08-28 10:28+0000\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: Spanish (http://www.transifex.com/projects/p/FusionDirectory-109/language/es/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
diff --git a/game/locale/es_VE/fusiondirectory.po b/game/locale/es_VE/fusiondirectory.po
index ceb85287005a01889d2c68a6f6a6dc20970acf62..35acc529e609f81d571b8e740f7204d796d7cddc 100644
--- a/game/locale/es_VE/fusiondirectory.po
+++ b/game/locale/es_VE/fusiondirectory.po
@@ -5,12 +5,12 @@
 # Translators:
 msgid ""
 msgstr ""
-"Project-Id-Version: FusionDirectory-108\n"
+"Project-Id-Version: FusionDirectory-109\n"
 "Report-Msgid-Bugs-To: documentation@lists.fusiondirectory.org\n"
-"POT-Creation-Date: 2015-03-19 21:45+0100\n"
-"PO-Revision-Date: 2014-08-26 14:14+0000\n"
-"Last-Translator: fusiondirectory <contact@fusiondirectory.org>\n"
-"Language-Team: Spanish (Venezuela) (http://www.transifex.com/projects/p/FusionDirectory-108/language/es_VE/)\n"
+"POT-Creation-Date: 2014-12-15 17:47+0100\n"
+"PO-Revision-Date: 2014-08-28 10:28+0000\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: Spanish (Venezuela) (http://www.transifex.com/projects/p/FusionDirectory-109/language/es_VE/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
diff --git a/game/locale/fa_IR/fusiondirectory.po b/game/locale/fa_IR/fusiondirectory.po
index 0566f036dc362344dc0c6184e0059d3c161ee291..c9453b220cb85506962b033f1c7603765dc4dc9e 100644
--- a/game/locale/fa_IR/fusiondirectory.po
+++ b/game/locale/fa_IR/fusiondirectory.po
@@ -5,12 +5,12 @@
 # Translators:
 msgid ""
 msgstr ""
-"Project-Id-Version: FusionDirectory-108\n"
+"Project-Id-Version: FusionDirectory-109\n"
 "Report-Msgid-Bugs-To: documentation@lists.fusiondirectory.org\n"
-"POT-Creation-Date: 2015-03-19 21:45+0100\n"
-"PO-Revision-Date: 2014-08-26 14:14+0000\n"
-"Last-Translator: fusiondirectory <contact@fusiondirectory.org>\n"
-"Language-Team: Persian (Iran) (http://www.transifex.com/projects/p/FusionDirectory-108/language/fa_IR/)\n"
+"POT-Creation-Date: 2014-12-15 17:47+0100\n"
+"PO-Revision-Date: 2014-08-28 10:28+0000\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: Persian (Iran) (http://www.transifex.com/projects/p/FusionDirectory-109/language/fa_IR/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
diff --git a/game/locale/fr/fusiondirectory.po b/game/locale/fr/fusiondirectory.po
index 057a5a48eb5efd09d034b9a87fe882e6fa382f7c..38f79d8f25f308a3814af571bb9075a7f38eb2ed 100644
--- a/game/locale/fr/fusiondirectory.po
+++ b/game/locale/fr/fusiondirectory.po
@@ -3,18 +3,14 @@
 # This file is distributed under the same license as the PACKAGE package.
 # 
 # Translators:
-# MCMic, 2014
-# fusiondirectory <contact@fusiondirectory.org>, 2013
-# fusiondirectory <contact@fusiondirectory.org>, 2013
-# MCMic, 2014
 msgid ""
 msgstr ""
-"Project-Id-Version: FusionDirectory-108\n"
+"Project-Id-Version: FusionDirectory-109\n"
 "Report-Msgid-Bugs-To: documentation@lists.fusiondirectory.org\n"
-"POT-Creation-Date: 2015-03-19 21:45+0100\n"
+"POT-Creation-Date: 2014-12-15 17:47+0100\n"
 "PO-Revision-Date: 2014-12-18 09:30+0000\n"
-"Last-Translator: MCMic\n"
-"Language-Team: French (http://www.transifex.com/projects/p/FusionDirectory-108/language/fr/)\n"
+"Last-Translator: fusiondirectory <contact@fusiondirectory.org>\n"
+"Language-Team: French (http://www.transifex.com/projects/p/FusionDirectory-109/language/fr/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -27,7 +23,7 @@ msgstr "John Lennon est arrivÃ©"
 
 #: addons/game/class_Game.inc:79
 msgid "Create a user for John Lennon with login <b>john</b>"
-msgstr "CrÃ©er un utilisateur pour John Lennon avec <b>john<b> comme identifiant de connexion"
+msgstr "Creez un utilisateur "
 
 #: addons/game/class_Game.inc:82
 msgid "The Beatles are here"
@@ -42,7 +38,7 @@ msgstr "CrÃ©er un modÃ¨le utilisateur nommÃ© <b>beatle</ b>, en utilisant <i>htt
 
 #: addons/game/class_Game.inc:85
 msgid "Create a user for Paul McCartney using beatle profile (login paul)"
-msgstr "CrÃ©er un utilisateur pour Paul McCartney en utilisant le profil beatle (login paul)"
+msgstr "CrÃ©ez un utilisateur pour Paul McCartney en utilisant le profil beatle (login paul)"
 
 #: addons/game/class_Game.inc:86
 msgid "Create a user for George Harrison using beatle profile (login george)"
@@ -50,7 +46,7 @@ msgstr "CrÃ©ez un utilisateur pour George Harrison en utilisant le profil beatle
 
 #: addons/game/class_Game.inc:87
 msgid "Create a user for Ringo Starr using beatle profile (login ringo)"
-msgstr "CrÃ©er un utilisateur pour Ringo Starr en utilisant  le profil beatle (login ringo)"
+msgstr "CrÃ©ez un utilisateur pour Ringo Starr en utilisant  le profil beatle (login ringo)"
 
 #: addons/game/class_Game.inc:88
 msgid ""
@@ -66,16 +62,16 @@ msgstr "The Beatles ont achetÃ© des ordinateurs"
 msgid ""
 "Create a server named <b>yellow-submarine</b> with IP 192.168.1.129 and MAC "
 "00:11:22:33:44:01"
-msgstr "CrÃ©er un serveur nommÃ© <b>yellow-submarine</ b> avec IP 192.168.1.129 et MAC 00:11:22:33:44:01"
+msgstr "CrÃ©er un serveur nommÃ© <b> jaune-sous-marine </ b> avec IP 192.168.1.129 et MAC 00:11:22:33:44:01"
 
 #: addons/game/class_Game.inc:102
 msgid "Add a DNS service for zone <b>beatles.fake</b> on this server"
-msgstr "Ajouter un service DNS pour la zone <b>beatles.fake</ b> sur ce serveur"
+msgstr "Ajouter un service DNS pour la zone <b> beatles.fake </ b> sur ce serveur"
 
 #: addons/game/class_Game.inc:103
 msgid ""
 "Add a DHCP service for the network <b>192.168.1.128/26</b> on this server"
-msgstr "Ajouter un service DHCP pour le rÃ©seau <b>192.168.1.128/26</ b> sur ce serveur"
+msgstr "Ajouter un service DHCP pour le rÃ©seau <b> 192.168.1.128/26 </ b> sur ce serveur"
 
 #: addons/game/class_Game.inc:104
 msgid ""
diff --git a/game/locale/id/fusiondirectory.po b/game/locale/id/fusiondirectory.po
index f942d147cb1cad4833f3938d063de49d701d9116..c067502d371af3e799852c3da326ef3d4306292f 100644
--- a/game/locale/id/fusiondirectory.po
+++ b/game/locale/id/fusiondirectory.po
@@ -5,12 +5,12 @@
 # Translators:
 msgid ""
 msgstr ""
-"Project-Id-Version: FusionDirectory-108\n"
+"Project-Id-Version: FusionDirectory-109\n"
 "Report-Msgid-Bugs-To: documentation@lists.fusiondirectory.org\n"
-"POT-Creation-Date: 2015-03-19 21:45+0100\n"
-"PO-Revision-Date: 2014-08-26 14:14+0000\n"
-"Last-Translator: fusiondirectory <contact@fusiondirectory.org>\n"
-"Language-Team: Indonesian (http://www.transifex.com/projects/p/FusionDirectory-108/language/id/)\n"
+"POT-Creation-Date: 2014-12-15 17:47+0100\n"
+"PO-Revision-Date: 2014-08-28 10:28+0000\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: Indonesian (http://www.transifex.com/projects/p/FusionDirectory-109/language/id/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
diff --git a/game/locale/it/fusiondirectory.po b/game/locale/it/fusiondirectory.po
index 584d9fd2b0d74532833374216d1a94c13267ef60..8267773ad2750ab974714164d1112f4cbd9c4b21 100644
--- a/game/locale/it/fusiondirectory.po
+++ b/game/locale/it/fusiondirectory.po
@@ -5,12 +5,12 @@
 # Translators:
 msgid ""
 msgstr ""
-"Project-Id-Version: FusionDirectory-108\n"
+"Project-Id-Version: FusionDirectory-109\n"
 "Report-Msgid-Bugs-To: documentation@lists.fusiondirectory.org\n"
-"POT-Creation-Date: 2015-03-19 21:45+0100\n"
-"PO-Revision-Date: 2014-08-26 14:14+0000\n"
-"Last-Translator: fusiondirectory <contact@fusiondirectory.org>\n"
-"Language-Team: Italian (http://www.transifex.com/projects/p/FusionDirectory-108/language/it/)\n"
+"POT-Creation-Date: 2014-12-15 17:47+0100\n"
+"PO-Revision-Date: 2014-08-28 10:28+0000\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: Italian (http://www.transifex.com/projects/p/FusionDirectory-109/language/it/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
diff --git a/game/locale/lv/fusiondirectory.po b/game/locale/lv/fusiondirectory.po
index 5a7826d7ce73fe02662dd83a31f26ccc71646054..aa2adec6d32161bd9faeb9ac14b2b607e4aa094a 100644
--- a/game/locale/lv/fusiondirectory.po
+++ b/game/locale/lv/fusiondirectory.po
@@ -5,12 +5,12 @@
 # Translators:
 msgid ""
 msgstr ""
-"Project-Id-Version: FusionDirectory-108\n"
+"Project-Id-Version: FusionDirectory-109\n"
 "Report-Msgid-Bugs-To: documentation@lists.fusiondirectory.org\n"
-"POT-Creation-Date: 2015-03-19 21:45+0100\n"
-"PO-Revision-Date: 2014-08-26 14:14+0000\n"
-"Last-Translator: fusiondirectory <contact@fusiondirectory.org>\n"
-"Language-Team: Latvian (http://www.transifex.com/projects/p/FusionDirectory-108/language/lv/)\n"
+"POT-Creation-Date: 2014-12-15 17:47+0100\n"
+"PO-Revision-Date: 2014-08-28 10:28+0000\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: Latvian (http://www.transifex.com/projects/p/FusionDirectory-109/language/lv/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
diff --git a/game/locale/nb/fusiondirectory.po b/game/locale/nb/fusiondirectory.po
index 13f76d63448db612df8ae2eb1cea1f673a97a419..f8c6f36807bbf2ed18f6d838fa7a8cc1f8473ebd 100644
--- a/game/locale/nb/fusiondirectory.po
+++ b/game/locale/nb/fusiondirectory.po
@@ -5,12 +5,12 @@
 # Translators:
 msgid ""
 msgstr ""
-"Project-Id-Version: FusionDirectory-108\n"
+"Project-Id-Version: FusionDirectory-109\n"
 "Report-Msgid-Bugs-To: documentation@lists.fusiondirectory.org\n"
-"POT-Creation-Date: 2015-03-19 21:45+0100\n"
-"PO-Revision-Date: 2014-08-26 14:14+0000\n"
-"Last-Translator: fusiondirectory <contact@fusiondirectory.org>\n"
-"Language-Team: Norwegian BokmÃ¥l (http://www.transifex.com/projects/p/FusionDirectory-108/language/nb/)\n"
+"POT-Creation-Date: 2014-12-15 17:47+0100\n"
+"PO-Revision-Date: 2014-08-28 10:28+0000\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: Norwegian BokmÃ¥l (http://www.transifex.com/projects/p/FusionDirectory-109/language/nb/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
diff --git a/game/locale/nl/fusiondirectory.po b/game/locale/nl/fusiondirectory.po
index 5ac30a4b84743890051758811e3a7923d4a0d8e7..b037db6c80338a2282285382258908ca7870db9f 100644
--- a/game/locale/nl/fusiondirectory.po
+++ b/game/locale/nl/fusiondirectory.po
@@ -5,12 +5,12 @@
 # Translators:
 msgid ""
 msgstr ""
-"Project-Id-Version: FusionDirectory-108\n"
+"Project-Id-Version: FusionDirectory-109\n"
 "Report-Msgid-Bugs-To: documentation@lists.fusiondirectory.org\n"
-"POT-Creation-Date: 2015-03-19 21:45+0100\n"
-"PO-Revision-Date: 2014-08-26 14:14+0000\n"
-"Last-Translator: fusiondirectory <contact@fusiondirectory.org>\n"
-"Language-Team: Dutch (http://www.transifex.com/projects/p/FusionDirectory-108/language/nl/)\n"
+"POT-Creation-Date: 2014-12-15 17:47+0100\n"
+"PO-Revision-Date: 2014-08-28 10:28+0000\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: Dutch (http://www.transifex.com/projects/p/FusionDirectory-109/language/nl/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
diff --git a/game/locale/pl/fusiondirectory.po b/game/locale/pl/fusiondirectory.po
index 316b4e4f5792dc8a3ac72e6945fd6f8c30eee956..1f9633a69b2a13defecdde236c703955e37b3817 100644
--- a/game/locale/pl/fusiondirectory.po
+++ b/game/locale/pl/fusiondirectory.po
@@ -5,12 +5,12 @@
 # Translators:
 msgid ""
 msgstr ""
-"Project-Id-Version: FusionDirectory-108\n"
+"Project-Id-Version: FusionDirectory-109\n"
 "Report-Msgid-Bugs-To: documentation@lists.fusiondirectory.org\n"
-"POT-Creation-Date: 2015-03-19 21:45+0100\n"
-"PO-Revision-Date: 2014-08-26 14:14+0000\n"
-"Last-Translator: fusiondirectory <contact@fusiondirectory.org>\n"
-"Language-Team: Polish (http://www.transifex.com/projects/p/FusionDirectory-108/language/pl/)\n"
+"POT-Creation-Date: 2014-12-15 17:47+0100\n"
+"PO-Revision-Date: 2014-08-28 10:28+0000\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: Polish (http://www.transifex.com/projects/p/FusionDirectory-109/language/pl/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
diff --git a/game/locale/pt/fusiondirectory.po b/game/locale/pt/fusiondirectory.po
index 09eaadeb1bae5a054a38dd8399e0a79c725bca47..b102bfc8f2af2f58ed24d9c33447f6691a652b6e 100644
--- a/game/locale/pt/fusiondirectory.po
+++ b/game/locale/pt/fusiondirectory.po
@@ -5,12 +5,12 @@
 # Translators:
 msgid ""
 msgstr ""
-"Project-Id-Version: FusionDirectory-108\n"
+"Project-Id-Version: FusionDirectory-109\n"
 "Report-Msgid-Bugs-To: documentation@lists.fusiondirectory.org\n"
-"POT-Creation-Date: 2015-03-19 21:45+0100\n"
-"PO-Revision-Date: 2014-08-26 14:14+0000\n"
-"Last-Translator: fusiondirectory <contact@fusiondirectory.org>\n"
-"Language-Team: Portuguese (http://www.transifex.com/projects/p/FusionDirectory-108/language/pt/)\n"
+"POT-Creation-Date: 2014-12-15 17:47+0100\n"
+"PO-Revision-Date: 2014-08-28 10:28+0000\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: Portuguese (http://www.transifex.com/projects/p/FusionDirectory-109/language/pt/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
diff --git a/game/locale/pt_BR/fusiondirectory.po b/game/locale/pt_BR/fusiondirectory.po
index 644d73847a46e51e27268abff119e6f5f7ca55f1..111cec148559978c11cffecad14c2bbe34e81fe5 100644
--- a/game/locale/pt_BR/fusiondirectory.po
+++ b/game/locale/pt_BR/fusiondirectory.po
@@ -3,15 +3,14 @@
 # This file is distributed under the same license as the PACKAGE package.
 # 
 # Translators:
-# ALEJANDRO BARRIOS <alejandrobarrios@interlegis.leg.br>, 2014
 msgid ""
 msgstr ""
-"Project-Id-Version: FusionDirectory-108\n"
+"Project-Id-Version: FusionDirectory-109\n"
 "Report-Msgid-Bugs-To: documentation@lists.fusiondirectory.org\n"
-"POT-Creation-Date: 2015-03-19 21:45+0100\n"
-"PO-Revision-Date: 2014-08-28 10:50+0000\n"
-"Last-Translator: fusiondirectory <contact@fusiondirectory.org>\n"
-"Language-Team: Portuguese (Brazil) (http://www.transifex.com/projects/p/FusionDirectory-108/language/pt_BR/)\n"
+"POT-Creation-Date: 2014-12-15 17:47+0100\n"
+"PO-Revision-Date: 2014-08-28 10:28+0000\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: Portuguese (Brazil) (http://www.transifex.com/projects/p/FusionDirectory-109/language/pt_BR/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
diff --git a/game/locale/ru/fusiondirectory.po b/game/locale/ru/fusiondirectory.po
index c5ce5b0dc6fb8ad5a3975e8d89e24edb04e2f7bc..389b812b55d1dac7aece9808958e83ce884408a9 100644
--- a/game/locale/ru/fusiondirectory.po
+++ b/game/locale/ru/fusiondirectory.po
@@ -5,17 +5,17 @@
 # Translators:
 msgid ""
 msgstr ""
-"Project-Id-Version: FusionDirectory-108\n"
+"Project-Id-Version: FusionDirectory-109\n"
 "Report-Msgid-Bugs-To: documentation@lists.fusiondirectory.org\n"
-"POT-Creation-Date: 2015-03-19 21:45+0100\n"
-"PO-Revision-Date: 2014-08-26 14:14+0000\n"
-"Last-Translator: fusiondirectory <contact@fusiondirectory.org>\n"
-"Language-Team: Russian (http://www.transifex.com/projects/p/FusionDirectory-108/language/ru/)\n"
+"POT-Creation-Date: 2014-12-15 17:47+0100\n"
+"PO-Revision-Date: 2014-08-28 10:28+0000\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: Russian (http://www.transifex.com/projects/p/FusionDirectory-109/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=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);\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/game/class_Game.inc:77
 msgid "John Lennon has arrived"
diff --git a/game/locale/ru@petr1708/fusiondirectory.po b/game/locale/ru@petr1708/fusiondirectory.po
index b994cf1ca87ce6ebf06827b3942de18cbed21140..0c1ac2b2b7076dd4b8a45ffb696698923c90c3ad 100644
--- a/game/locale/ru@petr1708/fusiondirectory.po
+++ b/game/locale/ru@petr1708/fusiondirectory.po
@@ -5,17 +5,17 @@
 # Translators:
 msgid ""
 msgstr ""
-"Project-Id-Version: FusionDirectory-108\n"
+"Project-Id-Version: FusionDirectory-109\n"
 "Report-Msgid-Bugs-To: documentation@lists.fusiondirectory.org\n"
-"POT-Creation-Date: 2015-03-19 21:45+0100\n"
-"PO-Revision-Date: 2014-08-26 14:14+0000\n"
-"Last-Translator: fusiondirectory <contact@fusiondirectory.org>\n"
-"Language-Team: Russian Petrine orthography (http://www.transifex.com/projects/p/FusionDirectory-108/language/ru@petr1708/)\n"
+"POT-Creation-Date: 2014-12-15 17:47+0100\n"
+"PO-Revision-Date: 2014-08-28 10:28+0000\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: Russian Petrine orthography (http://www.transifex.com/projects/p/FusionDirectory-109/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=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);\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/game/class_Game.inc:77
 msgid "John Lennon has arrived"
diff --git a/game/locale/sv/fusiondirectory.po b/game/locale/sv/fusiondirectory.po
index f1af864ce40a3809a470414ab04981be17fd7061..f4995c2f44c8c00009f088c9a3c6e6f10e8ce98e 100644
--- a/game/locale/sv/fusiondirectory.po
+++ b/game/locale/sv/fusiondirectory.po
@@ -5,12 +5,12 @@
 # Translators:
 msgid ""
 msgstr ""
-"Project-Id-Version: FusionDirectory-108\n"
+"Project-Id-Version: FusionDirectory-109\n"
 "Report-Msgid-Bugs-To: documentation@lists.fusiondirectory.org\n"
-"POT-Creation-Date: 2015-03-19 21:45+0100\n"
-"PO-Revision-Date: 2014-08-26 14:14+0000\n"
-"Last-Translator: fusiondirectory <contact@fusiondirectory.org>\n"
-"Language-Team: Swedish (http://www.transifex.com/projects/p/FusionDirectory-108/language/sv/)\n"
+"POT-Creation-Date: 2014-12-15 17:47+0100\n"
+"PO-Revision-Date: 2014-08-28 10:28+0000\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: Swedish (http://www.transifex.com/projects/p/FusionDirectory-109/language/sv/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
diff --git a/game/locale/ug/fusiondirectory.po b/game/locale/ug/fusiondirectory.po
index 1f90a88d766c62163c24c5988f75819f7c2c9eb5..ad49f920f76156981be2fd7fca1a7108f0e674eb 100644
--- a/game/locale/ug/fusiondirectory.po
+++ b/game/locale/ug/fusiondirectory.po
@@ -5,12 +5,12 @@
 # Translators:
 msgid ""
 msgstr ""
-"Project-Id-Version: FusionDirectory-108\n"
+"Project-Id-Version: FusionDirectory-109\n"
 "Report-Msgid-Bugs-To: documentation@lists.fusiondirectory.org\n"
-"POT-Creation-Date: 2015-03-19 21:45+0100\n"
-"PO-Revision-Date: 2014-08-26 14:14+0000\n"
-"Last-Translator: fusiondirectory <contact@fusiondirectory.org>\n"
-"Language-Team: Uighur (http://www.transifex.com/projects/p/FusionDirectory-108/language/ug/)\n"
+"POT-Creation-Date: 2014-12-15 17:47+0100\n"
+"PO-Revision-Date: 2014-08-28 10:28+0000\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: Uighur (http://www.transifex.com/projects/p/FusionDirectory-109/language/ug/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
diff --git a/game/locale/vi_VN/fusiondirectory.po b/game/locale/vi_VN/fusiondirectory.po
index d7a6ffca1eafc029e45b1a82c19fb3252d587901..4ed7a022e4f7741636bfe1af560bfd57d6e599e5 100644
--- a/game/locale/vi_VN/fusiondirectory.po
+++ b/game/locale/vi_VN/fusiondirectory.po
@@ -5,12 +5,12 @@
 # Translators:
 msgid ""
 msgstr ""
-"Project-Id-Version: FusionDirectory-108\n"
+"Project-Id-Version: FusionDirectory-109\n"
 "Report-Msgid-Bugs-To: documentation@lists.fusiondirectory.org\n"
-"POT-Creation-Date: 2015-03-19 21:45+0100\n"
-"PO-Revision-Date: 2014-08-26 14:14+0000\n"
-"Last-Translator: fusiondirectory <contact@fusiondirectory.org>\n"
-"Language-Team: Vietnamese (Viet Nam) (http://www.transifex.com/projects/p/FusionDirectory-108/language/vi_VN/)\n"
+"POT-Creation-Date: 2014-12-15 17:47+0100\n"
+"PO-Revision-Date: 2014-08-28 10:28+0000\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: Vietnamese (Viet Nam) (http://www.transifex.com/projects/p/FusionDirectory-109/language/vi_VN/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
diff --git a/game/locale/zh/fusiondirectory.po b/game/locale/zh/fusiondirectory.po
index 37024505660d02e9505ffcb53c52a667c8452be5..00bf6abf5d558df7e461b63ab99ce0a9aadd7275 100644
--- a/game/locale/zh/fusiondirectory.po
+++ b/game/locale/zh/fusiondirectory.po
@@ -5,12 +5,12 @@
 # Translators:
 msgid ""
 msgstr ""
-"Project-Id-Version: FusionDirectory-108\n"
+"Project-Id-Version: FusionDirectory-109\n"
 "Report-Msgid-Bugs-To: documentation@lists.fusiondirectory.org\n"
-"POT-Creation-Date: 2015-03-19 21:45+0100\n"
-"PO-Revision-Date: 2014-08-26 14:14+0000\n"
-"Last-Translator: fusiondirectory <contact@fusiondirectory.org>\n"
-"Language-Team: Chinese (http://www.transifex.com/projects/p/FusionDirectory-108/language/zh/)\n"
+"POT-Creation-Date: 2014-12-15 17:47+0100\n"
+"PO-Revision-Date: 2014-08-28 10:28+0000\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: Chinese (http://www.transifex.com/projects/p/FusionDirectory-109/language/zh/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
diff --git a/gpg/locale/ar/fusiondirectory.po b/gpg/locale/ar/fusiondirectory.po
index d3af6cdb52b6ebcb110dd6b2a9d992bab0b8c3eb..2f5434609b9d2f665a2bd2e85ea398a3b28b625a 100644
--- a/gpg/locale/ar/fusiondirectory.po
+++ b/gpg/locale/ar/fusiondirectory.po
@@ -5,12 +5,12 @@
 # Translators:
 msgid ""
 msgstr ""
-"Project-Id-Version: FusionDirectory-108\n"
+"Project-Id-Version: FusionDirectory-109\n"
 "Report-Msgid-Bugs-To: documentation@lists.fusiondirectory.org\n"
-"POT-Creation-Date: 2015-03-31 11:49+0200\n"
-"PO-Revision-Date: 2015-02-25 16:03+0000\n"
-"Last-Translator: fusiondirectory <contact@fusiondirectory.org>\n"
-"Language-Team: Arabic (http://www.transifex.com/projects/p/FusionDirectory-108/language/ar/)\n"
+"POT-Creation-Date: 2014-12-15 17:47+0100\n"
+"PO-Revision-Date: 2014-08-28 10:28+0000\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: Arabic (http://www.transifex.com/projects/p/FusionDirectory-109/language/ar/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -50,7 +50,7 @@ msgstr ""
 msgid "Branch under base in which keys are stored"
 msgstr ""
 
-#: addons/gpg/class_pgpServerInfo.inc:92
+#: addons/gpg/class_pgpServerInfo.inc:91
 msgid "LDAP error"
 msgstr ""
 
diff --git a/gpg/locale/ca/fusiondirectory.po b/gpg/locale/ca/fusiondirectory.po
index c1997225b23467dd89d301a044e0a5df3309231a..fea2806672bbafa440b1a26e2191c2a2fc8112c7 100644
--- a/gpg/locale/ca/fusiondirectory.po
+++ b/gpg/locale/ca/fusiondirectory.po
@@ -5,12 +5,12 @@
 # Translators:
 msgid ""
 msgstr ""
-"Project-Id-Version: FusionDirectory-108\n"
+"Project-Id-Version: FusionDirectory-109\n"
 "Report-Msgid-Bugs-To: documentation@lists.fusiondirectory.org\n"
-"POT-Creation-Date: 2015-03-31 11:49+0200\n"
-"PO-Revision-Date: 2015-03-31 11:41+0000\n"
-"Last-Translator: fusiondirectory <contact@fusiondirectory.org>\n"
-"Language-Team: Catalan (http://www.transifex.com/projects/p/FusionDirectory-108/language/ca/)\n"
+"POT-Creation-Date: 2014-12-15 17:47+0100\n"
+"PO-Revision-Date: 2014-08-28 10:28+0000\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: Catalan (http://www.transifex.com/projects/p/FusionDirectory-109/language/ca/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -50,7 +50,7 @@ msgstr ""
 msgid "Branch under base in which keys are stored"
 msgstr ""
 
-#: addons/gpg/class_pgpServerInfo.inc:92
+#: addons/gpg/class_pgpServerInfo.inc:91
 msgid "LDAP error"
 msgstr "Error d'LDAP"
 
diff --git a/gpg/locale/cs_CZ/fusiondirectory.po b/gpg/locale/cs_CZ/fusiondirectory.po
index d9f7d0acc2bf61ed0c37238827a0d6b6f5a77cb0..3a6277d7ed9fef64bdb96caf14a7eaffc7fdf5b7 100644
--- a/gpg/locale/cs_CZ/fusiondirectory.po
+++ b/gpg/locale/cs_CZ/fusiondirectory.po
@@ -3,15 +3,15 @@
 # This file is distributed under the same license as the PACKAGE package.
 # 
 # Translators:
-# Pavel Borecki <pavel.borecki@gmail.com>, 2015
+# Pavel Borecki <pavel.borecki@gmail.com>, 2014-2015
 msgid ""
 msgstr ""
-"Project-Id-Version: FusionDirectory-108\n"
+"Project-Id-Version: FusionDirectory-109\n"
 "Report-Msgid-Bugs-To: documentation@lists.fusiondirectory.org\n"
-"POT-Creation-Date: 2015-03-31 11:49+0200\n"
-"PO-Revision-Date: 2015-03-31 11:51+0000\n"
+"POT-Creation-Date: 2014-12-15 17:47+0100\n"
+"PO-Revision-Date: 2015-04-07 14:12+0000\n"
 "Last-Translator: Pavel Borecki <pavel.borecki@gmail.com>\n"
-"Language-Team: Czech (Czech Republic) (http://www.transifex.com/projects/p/FusionDirectory-108/language/cs_CZ/)\n"
+"Language-Team: Czech (Czech Republic) (http://www.transifex.com/projects/p/FusionDirectory-109/language/cs_CZ/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -25,11 +25,11 @@ msgstr "Informace o GPG serveru"
 
 #: addons/gpg/class_pgpServerInfo.inc:38
 msgid "Software"
-msgstr "software"
+msgstr "ProgramovÃ© vybavenÃ"
 
 #: addons/gpg/class_pgpServerInfo.inc:38
 msgid "Which software this GPG key server is running"
-msgstr "JakÃ¡ implementace GPG je pouÅ¾ÃvÃ¡na na tomto serveru s klÃÄi"
+msgstr "JakÃ¡ implementace GPG je na tomto serveru s klÃÄi pouÅ¾ÃvÃ¡na"
 
 #: addons/gpg/class_pgpServerInfo.inc:43
 msgid "GPG version"
@@ -37,11 +37,11 @@ msgstr "Verze GPG"
 
 #: addons/gpg/class_pgpServerInfo.inc:43
 msgid "Which version of GPG this key server is running"
-msgstr "JakÃ¡ verze nÃ¡stroje GPG je provozovÃ¡na na tomto serveru s klÃÄi"
+msgstr "JakÃ¡ verze nÃ¡stroje GPG je na tomto serveru s klÃÄi provozovÃ¡na"
 
 #: addons/gpg/class_pgpServerInfo.inc:48
 msgid "Branch in which keys are stored"
-msgstr "VÄ›tev, ve kterÃ© jsou uloÅ¾eny klÃÄe"
+msgstr "VÄ›tev, ve kterou jsou uloÅ¾eny klÃÄe"
 
 #: addons/gpg/class_pgpServerInfo.inc:52
 msgid "Keys RDN"
@@ -49,15 +49,15 @@ msgstr "RelativnÃ rozliÅ¡enÃ½ nÃ¡zev klÃÄÅ¯"
 
 #: addons/gpg/class_pgpServerInfo.inc:52
 msgid "Branch under base in which keys are stored"
-msgstr "VÄ›tev, ve kterÃ© jsou uloÅ¾eny klÃÄe"
+msgstr "VÄ›tev pod zÃ¡kladem, ve kterÃ© jsou uloÅ¾eny klÃÄe"
 
-#: addons/gpg/class_pgpServerInfo.inc:92
+#: addons/gpg/class_pgpServerInfo.inc:91
 msgid "LDAP error"
-msgstr "chyba LDAPu"
+msgstr "Chyba LDAP"
 
 #: personal/gpg/pgpKeySelect/pgpKeySelect-list.xml:10
 msgid "Please select the desired entries"
-msgstr "vyberte prosÃm poÅ¾adovanÃ© poloÅ¾ky"
+msgstr "Vyberte poÅ¾adovanÃ© poloÅ¾ky"
 
 #: personal/gpg/pgpKeySelect/pgpKeySelect-list.xml:14
 msgid "PGP Key"
@@ -70,7 +70,7 @@ msgstr "IdentifikÃ¡tor klÃÄe"
 
 #: personal/gpg/pgpKeySelect/pgpKeySelect-list.xml:48
 msgid "User"
-msgstr "uÅ¾ivatel"
+msgstr "UÅ¾ivatel"
 
 #: personal/gpg/pgpKeySelect/pgpKeySelect-list.xml:56
 msgid "Creation date"
@@ -78,16 +78,16 @@ msgstr "Datum vytvoÅ™enÃ"
 
 #: personal/gpg/pgpKeySelect/pgpKeySelect-list.xml:64
 msgid "Expiration date"
-msgstr "Datum vyprÅ¡enÃ platnosti"
+msgstr "Datum skonÄenÃ platnosti"
 
 #: personal/gpg/pgpKeySelect/pgpKeySelect-list.xml:72
 msgid "Type"
-msgstr "typ"
+msgstr "Typ"
 
 #: personal/gpg/pgpKeySelect/pgpKeySelect-list.xml:80
 #: personal/gpg/pgpKeySelect/class_pgpKeySelect.inc:133
 msgid "Size"
-msgstr "velikost"
+msgstr "Velikost"
 
 #: personal/gpg/pgpKeySelect/pgpKeySelect-list.xml:88
 #: personal/gpg/pgpKeySelect/class_pgpKeySelect.inc:134
@@ -97,11 +97,11 @@ msgstr "Platnost odvolÃ¡na"
 #: personal/gpg/pgpKeySelect/pgpKeySelect-list.xml:96
 #: personal/gpg/pgpKeySelect/class_pgpKeySelect.inc:135
 msgid "Disabled"
-msgstr "zakÃ¡zÃ¡no"
+msgstr "Vypnuto"
 
 #: personal/gpg/pgpKeySelect/class_pgpKeySelect.inc:41
 msgid "Configuration error"
-msgstr "chyba v nastavenÃ"
+msgstr "Chyba v nastavenÃ"
 
 #: personal/gpg/pgpKeySelect/class_pgpKeySelect.inc:41
 msgid "You need to configure GPG base dn through the addons section first"
@@ -109,7 +109,7 @@ msgstr "Nejprve je tÅ™eba prostÅ™ednictvÃm sekce pÅ™Ãdavky nastavit zÃ¡klad GP
 
 #: personal/gpg/pgpKeySelect/class_pgpKeySelect.inc:129
 msgid "User ID"
-msgstr "ID uÅ¾ivatele"
+msgstr "IdentifikÃ¡tor uÅ¾ivatele"
 
 #: personal/gpg/pgpKeySelect/class_pgpKeySelect.inc:130
 msgid "Creation time"
@@ -117,7 +117,7 @@ msgstr "ÄŒas vytvoÅ™enÃ"
 
 #: personal/gpg/pgpKeySelect/class_pgpKeySelect.inc:131
 msgid "Expiration"
-msgstr "VyprÅ¡enÃ platnosti"
+msgstr "SkonÄenÃ platnosti"
 
 #: personal/gpg/pgpKeySelect/class_pgpKeySelect.inc:132
 msgid "Algorithm"
diff --git a/gpg/locale/de/fusiondirectory.po b/gpg/locale/de/fusiondirectory.po
index c52e02e2fe52af57c135f39f5bb663595a8f229f..cbf2f271501551c863055df18622c56cd8967f2d 100644
--- a/gpg/locale/de/fusiondirectory.po
+++ b/gpg/locale/de/fusiondirectory.po
@@ -3,14 +3,15 @@
 # This file is distributed under the same license as the PACKAGE package.
 # 
 # Translators:
+# Ettore Atalan <atalanttore@googlemail.com>, 2014-2015
 msgid ""
 msgstr ""
-"Project-Id-Version: FusionDirectory-108\n"
+"Project-Id-Version: FusionDirectory-109\n"
 "Report-Msgid-Bugs-To: documentation@lists.fusiondirectory.org\n"
-"POT-Creation-Date: 2015-03-31 11:49+0200\n"
-"PO-Revision-Date: 2015-03-31 11:41+0000\n"
-"Last-Translator: fusiondirectory <contact@fusiondirectory.org>\n"
-"Language-Team: German (http://www.transifex.com/projects/p/FusionDirectory-108/language/de/)\n"
+"POT-Creation-Date: 2014-12-15 17:47+0100\n"
+"PO-Revision-Date: 2015-04-23 15:07+0000\n"
+"Last-Translator: Ettore Atalan <atalanttore@googlemail.com>\n"
+"Language-Team: German (http://www.transifex.com/projects/p/FusionDirectory-109/language/de/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -50,7 +51,7 @@ msgstr ""
 msgid "Branch under base in which keys are stored"
 msgstr ""
 
-#: addons/gpg/class_pgpServerInfo.inc:92
+#: addons/gpg/class_pgpServerInfo.inc:91
 msgid "LDAP error"
 msgstr "LDAP-Fehler"
 
@@ -116,7 +117,7 @@ msgstr "Erstellungszeitpunkt"
 
 #: personal/gpg/pgpKeySelect/class_pgpKeySelect.inc:131
 msgid "Expiration"
-msgstr ""
+msgstr "Ablauf"
 
 #: personal/gpg/pgpKeySelect/class_pgpKeySelect.inc:132
 msgid "Algorithm"
diff --git a/gpg/locale/el_GR/fusiondirectory.po b/gpg/locale/el_GR/fusiondirectory.po
new file mode 100644
index 0000000000000000000000000000000000000000..6a71029828e8593f41fda77acbf1618aea640c74
--- /dev/null
+++ b/gpg/locale/el_GR/fusiondirectory.po
@@ -0,0 +1,139 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR FusionDirectory Project
+# This file is distributed under the same license as the PACKAGE package.
+# 
+# Translators:
+msgid ""
+msgstr ""
+"Project-Id-Version: FusionDirectory-109\n"
+"Report-Msgid-Bugs-To: documentation@lists.fusiondirectory.org\n"
+"POT-Creation-Date: 2014-12-15 17:47+0100\n"
+"PO-Revision-Date: 2015-05-30 11:45+0000\n"
+"Last-Translator: Benoit Mortier <benoit.mortier@opensides.be>\n"
+"Language-Team: Greek (Greece) (http://www.transifex.com/projects/p/FusionDirectory-109/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"
+
+#: addons/gpg/class_pgpServerInfo.inc:34 addons/gpg/class_pgpServerInfo.inc:69
+#: addons/gpg/class_pgpServerInfo.inc:70
+msgid "GPG server info"
+msgstr ""
+
+#: addons/gpg/class_pgpServerInfo.inc:38
+msgid "Software"
+msgstr ""
+
+#: addons/gpg/class_pgpServerInfo.inc:38
+msgid "Which software this GPG key server is running"
+msgstr ""
+
+#: addons/gpg/class_pgpServerInfo.inc:43
+msgid "GPG version"
+msgstr ""
+
+#: addons/gpg/class_pgpServerInfo.inc:43
+msgid "Which version of GPG this key server is running"
+msgstr ""
+
+#: addons/gpg/class_pgpServerInfo.inc:48
+msgid "Branch in which keys are stored"
+msgstr ""
+
+#: addons/gpg/class_pgpServerInfo.inc:52
+msgid "Keys RDN"
+msgstr ""
+
+#: addons/gpg/class_pgpServerInfo.inc:52
+msgid "Branch under base in which keys are stored"
+msgstr ""
+
+#: addons/gpg/class_pgpServerInfo.inc:91
+msgid "LDAP error"
+msgstr ""
+
+#: personal/gpg/pgpKeySelect/pgpKeySelect-list.xml:10
+msgid "Please select the desired entries"
+msgstr ""
+
+#: personal/gpg/pgpKeySelect/pgpKeySelect-list.xml:14
+msgid "PGP Key"
+msgstr ""
+
+#: personal/gpg/pgpKeySelect/pgpKeySelect-list.xml:40
+#: personal/gpg/pgpKeySelect/class_pgpKeySelect.inc:128
+msgid "Key ID"
+msgstr ""
+
+#: personal/gpg/pgpKeySelect/pgpKeySelect-list.xml:48
+msgid "User"
+msgstr ""
+
+#: personal/gpg/pgpKeySelect/pgpKeySelect-list.xml:56
+msgid "Creation date"
+msgstr ""
+
+#: personal/gpg/pgpKeySelect/pgpKeySelect-list.xml:64
+msgid "Expiration date"
+msgstr ""
+
+#: personal/gpg/pgpKeySelect/pgpKeySelect-list.xml:72
+msgid "Type"
+msgstr ""
+
+#: personal/gpg/pgpKeySelect/pgpKeySelect-list.xml:80
+#: personal/gpg/pgpKeySelect/class_pgpKeySelect.inc:133
+msgid "Size"
+msgstr ""
+
+#: personal/gpg/pgpKeySelect/pgpKeySelect-list.xml:88
+#: personal/gpg/pgpKeySelect/class_pgpKeySelect.inc:134
+msgid "Revoked"
+msgstr ""
+
+#: personal/gpg/pgpKeySelect/pgpKeySelect-list.xml:96
+#: personal/gpg/pgpKeySelect/class_pgpKeySelect.inc:135
+msgid "Disabled"
+msgstr ""
+
+#: personal/gpg/pgpKeySelect/class_pgpKeySelect.inc:41
+msgid "Configuration error"
+msgstr ""
+
+#: personal/gpg/pgpKeySelect/class_pgpKeySelect.inc:41
+msgid "You need to configure GPG base dn through the addons section first"
+msgstr ""
+
+#: personal/gpg/pgpKeySelect/class_pgpKeySelect.inc:129
+msgid "User ID"
+msgstr ""
+
+#: personal/gpg/pgpKeySelect/class_pgpKeySelect.inc:130
+msgid "Creation time"
+msgstr ""
+
+#: personal/gpg/pgpKeySelect/class_pgpKeySelect.inc:131
+msgid "Expiration"
+msgstr ""
+
+#: personal/gpg/pgpKeySelect/class_pgpKeySelect.inc:132
+msgid "Algorithm"
+msgstr ""
+
+#: personal/gpg/class_gpgAccount.inc:31
+msgid "GPG keys"
+msgstr ""
+
+#: personal/gpg/class_gpgAccount.inc:35
+msgid "GPG keys of this user"
+msgstr ""
+
+#: personal/gpg/class_gpgAccount.inc:46
+msgid "GPG"
+msgstr ""
+
+#: personal/gpg/class_gpgAccount.inc:47
+msgid "Edit user's GPG IDs"
+msgstr ""
diff --git a/gpg/locale/en/fusiondirectory.po b/gpg/locale/en/fusiondirectory.po
index 2088b0b65cbf4c5cec3e465eae5ff8c9965ec2bc..2b6402027412db38d73f0fecdb2fb2954df1d589 100644
--- a/gpg/locale/en/fusiondirectory.po
+++ b/gpg/locale/en/fusiondirectory.po
@@ -6,13 +6,13 @@
 #, fuzzy
 msgid ""
 msgstr ""
-"Project-Id-Version: PACKAGE VERSION\n"
-"Report-Msgid-Bugs-To: documentation@lists.fusiondirectory.org\n"
-"POT-Creation-Date: 2015-03-31 11:49+0200\n"
+"Project-Id-Version: FusionDirectory VERSION\n"
+"Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
+"POT-Creation-Date: 2015-05-30 15:30+0200\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
-"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
-"Language-Team: LANGUAGE <LL@li.org>\n"
-"Language: \n"
+"Last-Translator: FusionDirectory project <contact@fusiondirectory.org>\n"
+"Language-Team: English\n"
+"Language: en\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
diff --git a/gpg/locale/es/fusiondirectory.po b/gpg/locale/es/fusiondirectory.po
index d24d4f5ed4362e831881983b1913eb47068daa69..cecac50744f50250be827f4c3d823403e34220f8 100644
--- a/gpg/locale/es/fusiondirectory.po
+++ b/gpg/locale/es/fusiondirectory.po
@@ -5,12 +5,12 @@
 # Translators:
 msgid ""
 msgstr ""
-"Project-Id-Version: FusionDirectory-108\n"
+"Project-Id-Version: FusionDirectory-109\n"
 "Report-Msgid-Bugs-To: documentation@lists.fusiondirectory.org\n"
-"POT-Creation-Date: 2015-03-31 11:49+0200\n"
-"PO-Revision-Date: 2015-03-31 11:41+0000\n"
-"Last-Translator: fusiondirectory <contact@fusiondirectory.org>\n"
-"Language-Team: Spanish (http://www.transifex.com/projects/p/FusionDirectory-108/language/es/)\n"
+"POT-Creation-Date: 2014-12-15 17:47+0100\n"
+"PO-Revision-Date: 2014-08-28 10:28+0000\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: Spanish (http://www.transifex.com/projects/p/FusionDirectory-109/language/es/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -50,7 +50,7 @@ msgstr ""
 msgid "Branch under base in which keys are stored"
 msgstr ""
 
-#: addons/gpg/class_pgpServerInfo.inc:92
+#: addons/gpg/class_pgpServerInfo.inc:91
 msgid "LDAP error"
 msgstr "Error LDAP"
 
diff --git a/gpg/locale/es_VE/fusiondirectory.po b/gpg/locale/es_VE/fusiondirectory.po
index 64395214ce7c8b23ece2c0aeda416de75c1e4178..039e6ab5840bf16359ad44b05fea9ee2f7d4180c 100644
--- a/gpg/locale/es_VE/fusiondirectory.po
+++ b/gpg/locale/es_VE/fusiondirectory.po
@@ -5,12 +5,12 @@
 # Translators:
 msgid ""
 msgstr ""
-"Project-Id-Version: FusionDirectory-108\n"
+"Project-Id-Version: FusionDirectory-109\n"
 "Report-Msgid-Bugs-To: documentation@lists.fusiondirectory.org\n"
-"POT-Creation-Date: 2015-03-31 11:49+0200\n"
+"POT-Creation-Date: 2014-12-15 17:47+0100\n"
 "PO-Revision-Date: 2015-03-31 11:41+0000\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>\n"
-"Language-Team: Spanish (Venezuela) (http://www.transifex.com/projects/p/FusionDirectory-108/language/es_VE/)\n"
+"Language-Team: Spanish (Venezuela) (http://www.transifex.com/projects/p/FusionDirectory-109/language/es_VE/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -50,7 +50,7 @@ msgstr ""
 msgid "Branch under base in which keys are stored"
 msgstr ""
 
-#: addons/gpg/class_pgpServerInfo.inc:92
+#: addons/gpg/class_pgpServerInfo.inc:91
 msgid "LDAP error"
 msgstr "Error de LDAP"
 
diff --git a/gpg/locale/fa_IR/fusiondirectory.po b/gpg/locale/fa_IR/fusiondirectory.po
index f9983e6ad9b50a88accea053bf34c6baa9a8a170..9a03157536aeab2b3afe438ce5eed24147a3538e 100644
--- a/gpg/locale/fa_IR/fusiondirectory.po
+++ b/gpg/locale/fa_IR/fusiondirectory.po
@@ -5,12 +5,12 @@
 # Translators:
 msgid ""
 msgstr ""
-"Project-Id-Version: FusionDirectory-108\n"
+"Project-Id-Version: FusionDirectory-109\n"
 "Report-Msgid-Bugs-To: documentation@lists.fusiondirectory.org\n"
-"POT-Creation-Date: 2015-03-31 11:49+0200\n"
-"PO-Revision-Date: 2014-08-28 10:50+0000\n"
-"Last-Translator: fusiondirectory <contact@fusiondirectory.org>\n"
-"Language-Team: Persian (Iran) (http://www.transifex.com/projects/p/FusionDirectory-108/language/fa_IR/)\n"
+"POT-Creation-Date: 2014-12-15 17:47+0100\n"
+"PO-Revision-Date: 2014-08-28 10:28+0000\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: Persian (Iran) (http://www.transifex.com/projects/p/FusionDirectory-109/language/fa_IR/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -50,7 +50,7 @@ msgstr ""
 msgid "Branch under base in which keys are stored"
 msgstr ""
 
-#: addons/gpg/class_pgpServerInfo.inc:92
+#: addons/gpg/class_pgpServerInfo.inc:91
 msgid "LDAP error"
 msgstr "Ø®Ø·Ø§ÛŒ LDAP"
 
diff --git a/gpg/locale/fr/fusiondirectory.po b/gpg/locale/fr/fusiondirectory.po
index 76dc78287b662706bd24ac9a6273c4d4dc92aa3a..4b269f752cc5f8a45382c7a8be23005326c32bf7 100644
--- a/gpg/locale/fr/fusiondirectory.po
+++ b/gpg/locale/fr/fusiondirectory.po
@@ -3,16 +3,17 @@
 # This file is distributed under the same license as the PACKAGE package.
 # 
 # Translators:
-# MCMic, 2014
-# MCMic, 2014
+# Ã‰ric Deschamps <erdesc@free.fr>, 2013
+# Ã‰ric Deschamps <erdesc@free.fr>, 2013
+# fusiondirectory <contact@fusiondirectory.org>, 2013
 msgid ""
 msgstr ""
-"Project-Id-Version: FusionDirectory-108\n"
+"Project-Id-Version: FusionDirectory-109\n"
 "Report-Msgid-Bugs-To: documentation@lists.fusiondirectory.org\n"
-"POT-Creation-Date: 2015-03-31 11:49+0200\n"
-"PO-Revision-Date: 2015-03-31 11:31+0000\n"
-"Last-Translator: MCMic\n"
-"Language-Team: French (http://www.transifex.com/projects/p/FusionDirectory-108/language/fr/)\n"
+"POT-Creation-Date: 2014-12-15 17:47+0100\n"
+"PO-Revision-Date: 2014-08-28 10:28+0000\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: French (http://www.transifex.com/projects/p/FusionDirectory-109/language/fr/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -30,7 +31,7 @@ msgstr "Logiciel"
 
 #: addons/gpg/class_pgpServerInfo.inc:38
 msgid "Which software this GPG key server is running"
-msgstr "Quel logiciel ce serveur de clÃ©s GPG utilise"
+msgstr "Version du logiciel de ce serveur de clÃ©s GPG "
 
 #: addons/gpg/class_pgpServerInfo.inc:43
 msgid "GPG version"
@@ -38,21 +39,21 @@ msgstr "Version de GPG"
 
 #: addons/gpg/class_pgpServerInfo.inc:43
 msgid "Which version of GPG this key server is running"
-msgstr "Version de GPG ce serveur de clÃ©s utilise"
+msgstr "Version du logiciel de ce serveur de clÃ©s GPG "
 
 #: addons/gpg/class_pgpServerInfo.inc:48
 msgid "Branch in which keys are stored"
-msgstr "Branche oÃ¹ seront stockÃ©es les clefs GPG"
+msgstr "Branches ou seront stockÃ©s les clefs GPG"
 
 #: addons/gpg/class_pgpServerInfo.inc:52
 msgid "Keys RDN"
-msgstr "Branche des clÃ©s"
+msgstr "RDN des clÃ©s"
 
 #: addons/gpg/class_pgpServerInfo.inc:52
 msgid "Branch under base in which keys are stored"
-msgstr "Branche oÃ¹ seront stockÃ©es les clefs GPG"
+msgstr "Branches ou seront stockÃ©s les clefs GPG"
 
-#: addons/gpg/class_pgpServerInfo.inc:92
+#: addons/gpg/class_pgpServerInfo.inc:91
 msgid "LDAP error"
 msgstr "Erreur LDAP"
 
diff --git a/gpg/locale/id/fusiondirectory.po b/gpg/locale/id/fusiondirectory.po
index bd485ed5e2e9d2046b5f1eb2a1467f02b83eed0e..ef11cbaa2fd9d777eda9a90fc8958ee2260a3102 100644
--- a/gpg/locale/id/fusiondirectory.po
+++ b/gpg/locale/id/fusiondirectory.po
@@ -5,12 +5,12 @@
 # Translators:
 msgid ""
 msgstr ""
-"Project-Id-Version: FusionDirectory-108\n"
+"Project-Id-Version: FusionDirectory-109\n"
 "Report-Msgid-Bugs-To: documentation@lists.fusiondirectory.org\n"
-"POT-Creation-Date: 2015-03-31 11:49+0200\n"
-"PO-Revision-Date: 2014-08-26 14:14+0000\n"
-"Last-Translator: fusiondirectory <contact@fusiondirectory.org>\n"
-"Language-Team: Indonesian (http://www.transifex.com/projects/p/FusionDirectory-108/language/id/)\n"
+"POT-Creation-Date: 2014-12-15 17:47+0100\n"
+"PO-Revision-Date: 2014-08-28 10:28+0000\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: Indonesian (http://www.transifex.com/projects/p/FusionDirectory-109/language/id/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -50,7 +50,7 @@ msgstr ""
 msgid "Branch under base in which keys are stored"
 msgstr ""
 
-#: addons/gpg/class_pgpServerInfo.inc:92
+#: addons/gpg/class_pgpServerInfo.inc:91
 msgid "LDAP error"
 msgstr ""
 
diff --git a/gpg/locale/it/fusiondirectory.po b/gpg/locale/it/fusiondirectory.po
index b55a5582ea509b5a5124fee9ec0717579e2fe308..6eca6faf52422ab42291a22757d7d8b00644f4fb 100644
--- a/gpg/locale/it/fusiondirectory.po
+++ b/gpg/locale/it/fusiondirectory.po
@@ -5,12 +5,12 @@
 # Translators:
 msgid ""
 msgstr ""
-"Project-Id-Version: FusionDirectory-108\n"
+"Project-Id-Version: FusionDirectory-109\n"
 "Report-Msgid-Bugs-To: documentation@lists.fusiondirectory.org\n"
-"POT-Creation-Date: 2015-03-31 11:49+0200\n"
-"PO-Revision-Date: 2015-03-31 11:41+0000\n"
-"Last-Translator: fusiondirectory <contact@fusiondirectory.org>\n"
-"Language-Team: Italian (http://www.transifex.com/projects/p/FusionDirectory-108/language/it/)\n"
+"POT-Creation-Date: 2014-12-15 17:47+0100\n"
+"PO-Revision-Date: 2014-08-28 10:28+0000\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: Italian (http://www.transifex.com/projects/p/FusionDirectory-109/language/it/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -50,7 +50,7 @@ msgstr "RDN chiavi"
 msgid "Branch under base in which keys are stored"
 msgstr "Ramo sotto la base nel quale saranno immagazzinate le chiavi"
 
-#: addons/gpg/class_pgpServerInfo.inc:92
+#: addons/gpg/class_pgpServerInfo.inc:91
 msgid "LDAP error"
 msgstr "Errore LDAP"
 
diff --git a/gpg/locale/lv/fusiondirectory.po b/gpg/locale/lv/fusiondirectory.po
index 755a23ae267ec4e7db93688ef84673d8b7fd9628..fbef843f122b69661ca04d163284c4acdb8fa577 100644
--- a/gpg/locale/lv/fusiondirectory.po
+++ b/gpg/locale/lv/fusiondirectory.po
@@ -5,12 +5,12 @@
 # Translators:
 msgid ""
 msgstr ""
-"Project-Id-Version: FusionDirectory-108\n"
+"Project-Id-Version: FusionDirectory-109\n"
 "Report-Msgid-Bugs-To: documentation@lists.fusiondirectory.org\n"
-"POT-Creation-Date: 2015-03-31 11:49+0200\n"
-"PO-Revision-Date: 2014-08-26 14:14+0000\n"
-"Last-Translator: fusiondirectory <contact@fusiondirectory.org>\n"
-"Language-Team: Latvian (http://www.transifex.com/projects/p/FusionDirectory-108/language/lv/)\n"
+"POT-Creation-Date: 2014-12-15 17:47+0100\n"
+"PO-Revision-Date: 2014-08-28 10:28+0000\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: Latvian (http://www.transifex.com/projects/p/FusionDirectory-109/language/lv/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -50,7 +50,7 @@ msgstr ""
 msgid "Branch under base in which keys are stored"
 msgstr ""
 
-#: addons/gpg/class_pgpServerInfo.inc:92
+#: addons/gpg/class_pgpServerInfo.inc:91
 msgid "LDAP error"
 msgstr ""
 
diff --git a/gpg/locale/nb/fusiondirectory.po b/gpg/locale/nb/fusiondirectory.po
index 7d527786f6adaf494f693261694044ec593492a3..4673b15c576e32027ece53c1ecde9daf4b7974ea 100644
--- a/gpg/locale/nb/fusiondirectory.po
+++ b/gpg/locale/nb/fusiondirectory.po
@@ -5,12 +5,12 @@
 # Translators:
 msgid ""
 msgstr ""
-"Project-Id-Version: FusionDirectory-108\n"
+"Project-Id-Version: FusionDirectory-109\n"
 "Report-Msgid-Bugs-To: documentation@lists.fusiondirectory.org\n"
-"POT-Creation-Date: 2015-03-31 11:49+0200\n"
-"PO-Revision-Date: 2014-08-28 10:50+0000\n"
-"Last-Translator: fusiondirectory <contact@fusiondirectory.org>\n"
-"Language-Team: Norwegian BokmÃ¥l (http://www.transifex.com/projects/p/FusionDirectory-108/language/nb/)\n"
+"POT-Creation-Date: 2014-12-15 17:47+0100\n"
+"PO-Revision-Date: 2014-08-28 10:28+0000\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: Norwegian BokmÃ¥l (http://www.transifex.com/projects/p/FusionDirectory-109/language/nb/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -50,7 +50,7 @@ msgstr ""
 msgid "Branch under base in which keys are stored"
 msgstr ""
 
-#: addons/gpg/class_pgpServerInfo.inc:92
+#: addons/gpg/class_pgpServerInfo.inc:91
 msgid "LDAP error"
 msgstr "LDAP-feil"
 
diff --git a/gpg/locale/nl/fusiondirectory.po b/gpg/locale/nl/fusiondirectory.po
index 0ca31c1d2eecc6a712d06a80213dfcdc2028c594..f2e1015a946bece59cfb6aa706bc2f5403b141ff 100644
--- a/gpg/locale/nl/fusiondirectory.po
+++ b/gpg/locale/nl/fusiondirectory.po
@@ -5,12 +5,12 @@
 # Translators:
 msgid ""
 msgstr ""
-"Project-Id-Version: FusionDirectory-108\n"
+"Project-Id-Version: FusionDirectory-109\n"
 "Report-Msgid-Bugs-To: documentation@lists.fusiondirectory.org\n"
-"POT-Creation-Date: 2015-03-31 11:49+0200\n"
+"POT-Creation-Date: 2014-12-15 17:47+0100\n"
 "PO-Revision-Date: 2015-03-31 11:41+0000\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>\n"
-"Language-Team: Dutch (http://www.transifex.com/projects/p/FusionDirectory-108/language/nl/)\n"
+"Language-Team: Dutch (http://www.transifex.com/projects/p/FusionDirectory-109/language/nl/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -50,7 +50,7 @@ msgstr ""
 msgid "Branch under base in which keys are stored"
 msgstr ""
 
-#: addons/gpg/class_pgpServerInfo.inc:92
+#: addons/gpg/class_pgpServerInfo.inc:91
 msgid "LDAP error"
 msgstr "LDAP fout"
 
diff --git a/gpg/locale/pl/fusiondirectory.po b/gpg/locale/pl/fusiondirectory.po
index 4b1a65653620fb8f5acb21ae22fff2dc7b4d38a2..79963d75c2cb2638f7d5f60bba74e732c27cc8e8 100644
--- a/gpg/locale/pl/fusiondirectory.po
+++ b/gpg/locale/pl/fusiondirectory.po
@@ -5,12 +5,12 @@
 # Translators:
 msgid ""
 msgstr ""
-"Project-Id-Version: FusionDirectory-108\n"
+"Project-Id-Version: FusionDirectory-109\n"
 "Report-Msgid-Bugs-To: documentation@lists.fusiondirectory.org\n"
-"POT-Creation-Date: 2015-03-31 11:49+0200\n"
-"PO-Revision-Date: 2015-03-31 11:41+0000\n"
-"Last-Translator: fusiondirectory <contact@fusiondirectory.org>\n"
-"Language-Team: Polish (http://www.transifex.com/projects/p/FusionDirectory-108/language/pl/)\n"
+"POT-Creation-Date: 2014-12-15 17:47+0100\n"
+"PO-Revision-Date: 2014-08-28 10:28+0000\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: Polish (http://www.transifex.com/projects/p/FusionDirectory-109/language/pl/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -50,7 +50,7 @@ msgstr ""
 msgid "Branch under base in which keys are stored"
 msgstr ""
 
-#: addons/gpg/class_pgpServerInfo.inc:92
+#: addons/gpg/class_pgpServerInfo.inc:91
 msgid "LDAP error"
 msgstr "bÅ‚Ä…d LDAP"
 
diff --git a/gpg/locale/pt/fusiondirectory.po b/gpg/locale/pt/fusiondirectory.po
index e873349814fbf5a0243a289b86741b442655fb69..d2f15f8db2c904cbc8c4b474e4f8a2e4d43dd2f2 100644
--- a/gpg/locale/pt/fusiondirectory.po
+++ b/gpg/locale/pt/fusiondirectory.po
@@ -5,12 +5,12 @@
 # Translators:
 msgid ""
 msgstr ""
-"Project-Id-Version: FusionDirectory-108\n"
+"Project-Id-Version: FusionDirectory-109\n"
 "Report-Msgid-Bugs-To: documentation@lists.fusiondirectory.org\n"
-"POT-Creation-Date: 2015-03-31 11:49+0200\n"
-"PO-Revision-Date: 2015-03-31 11:41+0000\n"
-"Last-Translator: fusiondirectory <contact@fusiondirectory.org>\n"
-"Language-Team: Portuguese (http://www.transifex.com/projects/p/FusionDirectory-108/language/pt/)\n"
+"POT-Creation-Date: 2014-12-15 17:47+0100\n"
+"PO-Revision-Date: 2014-08-28 10:28+0000\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: Portuguese (http://www.transifex.com/projects/p/FusionDirectory-109/language/pt/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -50,7 +50,7 @@ msgstr ""
 msgid "Branch under base in which keys are stored"
 msgstr ""
 
-#: addons/gpg/class_pgpServerInfo.inc:92
+#: addons/gpg/class_pgpServerInfo.inc:91
 msgid "LDAP error"
 msgstr "Erro de LDAP"
 
diff --git a/gpg/locale/pt_BR/fusiondirectory.po b/gpg/locale/pt_BR/fusiondirectory.po
index 631aaa16f4d0a96e5b1a9c87f1d562906e37d5c5..2aae61a2094e5a59bee7ef457d7261c68589de46 100644
--- a/gpg/locale/pt_BR/fusiondirectory.po
+++ b/gpg/locale/pt_BR/fusiondirectory.po
@@ -5,12 +5,12 @@
 # Translators:
 msgid ""
 msgstr ""
-"Project-Id-Version: FusionDirectory-108\n"
+"Project-Id-Version: FusionDirectory-109\n"
 "Report-Msgid-Bugs-To: documentation@lists.fusiondirectory.org\n"
-"POT-Creation-Date: 2015-03-31 11:49+0200\n"
-"PO-Revision-Date: 2015-03-31 11:41+0000\n"
-"Last-Translator: fusiondirectory <contact@fusiondirectory.org>\n"
-"Language-Team: Portuguese (Brazil) (http://www.transifex.com/projects/p/FusionDirectory-108/language/pt_BR/)\n"
+"POT-Creation-Date: 2014-12-15 17:47+0100\n"
+"PO-Revision-Date: 2014-08-28 10:28+0000\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: Portuguese (Brazil) (http://www.transifex.com/projects/p/FusionDirectory-109/language/pt_BR/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -50,7 +50,7 @@ msgstr ""
 msgid "Branch under base in which keys are stored"
 msgstr ""
 
-#: addons/gpg/class_pgpServerInfo.inc:92
+#: addons/gpg/class_pgpServerInfo.inc:91
 msgid "LDAP error"
 msgstr "Erro de LDAP"
 
diff --git a/gpg/locale/ru/fusiondirectory.po b/gpg/locale/ru/fusiondirectory.po
index 66ee4d3efc44fdce8c38820888babe4af493a8d3..5861d84451fa8080df1e0f1140ca1eb9895a9b2c 100644
--- a/gpg/locale/ru/fusiondirectory.po
+++ b/gpg/locale/ru/fusiondirectory.po
@@ -3,25 +3,24 @@
 # This file is distributed under the same license as the PACKAGE package.
 # 
 # Translators:
-# Alexey, 2015
 msgid ""
 msgstr ""
-"Project-Id-Version: FusionDirectory-108\n"
+"Project-Id-Version: FusionDirectory-109\n"
 "Report-Msgid-Bugs-To: documentation@lists.fusiondirectory.org\n"
-"POT-Creation-Date: 2015-03-31 11:49+0200\n"
-"PO-Revision-Date: 2015-03-30 08:10+0000\n"
-"Last-Translator: Alexey\n"
-"Language-Team: Russian (http://www.transifex.com/projects/p/FusionDirectory-108/language/ru/)\n"
+"POT-Creation-Date: 2014-12-15 17:47+0100\n"
+"PO-Revision-Date: 2014-08-28 10:28+0000\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: Russian (http://www.transifex.com/projects/p/FusionDirectory-109/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=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);\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:34 addons/gpg/class_pgpServerInfo.inc:69
 #: addons/gpg/class_pgpServerInfo.inc:70
 msgid "GPG server info"
-msgstr ""
+msgstr "Ð˜Ð½Ñ„Ð¾Ñ€Ð¼Ð°Ñ†Ð¸Ñ Ð¾Ð± GPG ÑÐµÑ€Ð²ÐµÑ€Ðµ"
 
 #: addons/gpg/class_pgpServerInfo.inc:38
 msgid "Software"
@@ -45,13 +44,13 @@ msgstr "Ð’ÐµÑ‚ÐºÐ° Ð² ÐºÐ¾Ñ‚Ð¾Ñ€Ð¾Ð¹ Ñ…Ñ€Ð°Ð½ÑÑ‚ÑÑ ÐºÐ»ÑŽÑ‡Ð¸"
 
 #: addons/gpg/class_pgpServerInfo.inc:52
 msgid "Keys RDN"
-msgstr ""
+msgstr "RDN Ð´Ð»Ñ ÐºÐ»ÑŽÑ‡ÐµÐ¹"
 
 #: addons/gpg/class_pgpServerInfo.inc:52
 msgid "Branch under base in which keys are stored"
-msgstr ""
+msgstr "Ð’ÐµÑ‚ÐºÐ° Ð² ÐºÐ¾Ñ‚Ð¾Ñ€Ð¾Ð¹ Ð±ÑƒÐ´ÑƒÑ‚ Ñ…Ñ€Ð°Ð½Ð¸Ñ‚ÑŒÑÑ ÐºÐ»ÑŽÑ‡Ð¸"
 
-#: addons/gpg/class_pgpServerInfo.inc:92
+#: addons/gpg/class_pgpServerInfo.inc:91
 msgid "LDAP error"
 msgstr "ÐžÑˆÐ¸Ð±ÐºÐ° LDAP"
 
@@ -101,7 +100,7 @@ msgstr "ÐžÑ‚ÐºÐ»ÑŽÑ‡ÐµÐ½"
 
 #: personal/gpg/pgpKeySelect/class_pgpKeySelect.inc:41
 msgid "Configuration error"
-msgstr ""
+msgstr "ÐžÑˆÐ¸Ð±ÐºÐ° ÐºÐ¾Ð½Ñ„Ð¸Ð³ÑƒÑ€Ð°Ñ†Ð¸Ð¸"
 
 #: personal/gpg/pgpKeySelect/class_pgpKeySelect.inc:41
 msgid "You need to configure GPG base dn through the addons section first"
diff --git a/gpg/locale/ru@petr1708/fusiondirectory.po b/gpg/locale/ru@petr1708/fusiondirectory.po
index 2c346785d6a58cf2f9c55358a331e98d9f8d1547..637efb1788108bf0b7065df1e0005c0e39d224f7 100644
--- a/gpg/locale/ru@petr1708/fusiondirectory.po
+++ b/gpg/locale/ru@petr1708/fusiondirectory.po
@@ -5,17 +5,17 @@
 # Translators:
 msgid ""
 msgstr ""
-"Project-Id-Version: FusionDirectory-108\n"
+"Project-Id-Version: FusionDirectory-109\n"
 "Report-Msgid-Bugs-To: documentation@lists.fusiondirectory.org\n"
-"POT-Creation-Date: 2015-03-31 11:49+0200\n"
-"PO-Revision-Date: 2014-08-26 14:14+0000\n"
-"Last-Translator: fusiondirectory <contact@fusiondirectory.org>\n"
-"Language-Team: Russian Petrine orthography (http://www.transifex.com/projects/p/FusionDirectory-108/language/ru@petr1708/)\n"
+"POT-Creation-Date: 2014-12-15 17:47+0100\n"
+"PO-Revision-Date: 2014-08-28 10:28+0000\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: Russian Petrine orthography (http://www.transifex.com/projects/p/FusionDirectory-109/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=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);\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:34 addons/gpg/class_pgpServerInfo.inc:69
 #: addons/gpg/class_pgpServerInfo.inc:70
@@ -50,7 +50,7 @@ msgstr ""
 msgid "Branch under base in which keys are stored"
 msgstr ""
 
-#: addons/gpg/class_pgpServerInfo.inc:92
+#: addons/gpg/class_pgpServerInfo.inc:91
 msgid "LDAP error"
 msgstr ""
 
diff --git a/gpg/locale/sv/fusiondirectory.po b/gpg/locale/sv/fusiondirectory.po
index 480570033c15aa194a04f64db86c1cd0053f6eb8..c27abb2eab3dde227c08b6abffa3756a10af9198 100644
--- a/gpg/locale/sv/fusiondirectory.po
+++ b/gpg/locale/sv/fusiondirectory.po
@@ -5,12 +5,12 @@
 # Translators:
 msgid ""
 msgstr ""
-"Project-Id-Version: FusionDirectory-108\n"
+"Project-Id-Version: FusionDirectory-109\n"
 "Report-Msgid-Bugs-To: documentation@lists.fusiondirectory.org\n"
-"POT-Creation-Date: 2015-03-31 11:49+0200\n"
-"PO-Revision-Date: 2015-03-31 11:41+0000\n"
-"Last-Translator: fusiondirectory <contact@fusiondirectory.org>\n"
-"Language-Team: Swedish (http://www.transifex.com/projects/p/FusionDirectory-108/language/sv/)\n"
+"POT-Creation-Date: 2014-12-15 17:47+0100\n"
+"PO-Revision-Date: 2014-08-28 10:28+0000\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: Swedish (http://www.transifex.com/projects/p/FusionDirectory-109/language/sv/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -50,7 +50,7 @@ msgstr ""
 msgid "Branch under base in which keys are stored"
 msgstr ""
 
-#: addons/gpg/class_pgpServerInfo.inc:92
+#: addons/gpg/class_pgpServerInfo.inc:91
 msgid "LDAP error"
 msgstr "LDAP-fel"
 
diff --git a/gpg/locale/ug/fusiondirectory.po b/gpg/locale/ug/fusiondirectory.po
index 329016bd81a66251e90da75cf58084b3a7fba146..359fc245a44d95a18cfb4aa2e245b434548d6482 100644
--- a/gpg/locale/ug/fusiondirectory.po
+++ b/gpg/locale/ug/fusiondirectory.po
@@ -5,12 +5,12 @@
 # Translators:
 msgid ""
 msgstr ""
-"Project-Id-Version: FusionDirectory-108\n"
+"Project-Id-Version: FusionDirectory-109\n"
 "Report-Msgid-Bugs-To: documentation@lists.fusiondirectory.org\n"
-"POT-Creation-Date: 2015-03-31 11:49+0200\n"
-"PO-Revision-Date: 2014-08-26 14:14+0000\n"
-"Last-Translator: fusiondirectory <contact@fusiondirectory.org>\n"
-"Language-Team: Uighur (http://www.transifex.com/projects/p/FusionDirectory-108/language/ug/)\n"
+"POT-Creation-Date: 2014-12-15 17:47+0100\n"
+"PO-Revision-Date: 2014-08-28 10:28+0000\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: Uighur (http://www.transifex.com/projects/p/FusionDirectory-109/language/ug/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -50,7 +50,7 @@ msgstr ""
 msgid "Branch under base in which keys are stored"
 msgstr ""
 
-#: addons/gpg/class_pgpServerInfo.inc:92
+#: addons/gpg/class_pgpServerInfo.inc:91
 msgid "LDAP error"
 msgstr ""
 
diff --git a/gpg/locale/vi_VN/fusiondirectory.po b/gpg/locale/vi_VN/fusiondirectory.po
index 64bfbc5b0f869a89340de43c6176854d72b7ce8d..25924bc5e90342d740f4d7191e3d4729c4969752 100644
--- a/gpg/locale/vi_VN/fusiondirectory.po
+++ b/gpg/locale/vi_VN/fusiondirectory.po
@@ -5,12 +5,12 @@
 # Translators:
 msgid ""
 msgstr ""
-"Project-Id-Version: FusionDirectory-108\n"
+"Project-Id-Version: FusionDirectory-109\n"
 "Report-Msgid-Bugs-To: documentation@lists.fusiondirectory.org\n"
-"POT-Creation-Date: 2015-03-31 11:49+0200\n"
-"PO-Revision-Date: 2015-03-31 11:41+0000\n"
-"Last-Translator: fusiondirectory <contact@fusiondirectory.org>\n"
-"Language-Team: Vietnamese (Viet Nam) (http://www.transifex.com/projects/p/FusionDirectory-108/language/vi_VN/)\n"
+"POT-Creation-Date: 2014-12-15 17:47+0100\n"
+"PO-Revision-Date: 2014-08-28 10:28+0000\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: Vietnamese (Viet Nam) (http://www.transifex.com/projects/p/FusionDirectory-109/language/vi_VN/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -50,7 +50,7 @@ msgstr ""
 msgid "Branch under base in which keys are stored"
 msgstr ""
 
-#: addons/gpg/class_pgpServerInfo.inc:92
+#: addons/gpg/class_pgpServerInfo.inc:91
 msgid "LDAP error"
 msgstr "Lá»—i LDAP"
 
diff --git a/gpg/locale/zh/fusiondirectory.po b/gpg/locale/zh/fusiondirectory.po
index 400c115a9d716bbd894000834c75c5f89e2d1dba..2059651f32e0056e1a268a8c79fd648938b0767d 100644
--- a/gpg/locale/zh/fusiondirectory.po
+++ b/gpg/locale/zh/fusiondirectory.po
@@ -5,12 +5,12 @@
 # Translators:
 msgid ""
 msgstr ""
-"Project-Id-Version: FusionDirectory-108\n"
+"Project-Id-Version: FusionDirectory-109\n"
 "Report-Msgid-Bugs-To: documentation@lists.fusiondirectory.org\n"
-"POT-Creation-Date: 2015-03-31 11:49+0200\n"
-"PO-Revision-Date: 2015-02-25 16:03+0000\n"
-"Last-Translator: fusiondirectory <contact@fusiondirectory.org>\n"
-"Language-Team: Chinese (http://www.transifex.com/projects/p/FusionDirectory-108/language/zh/)\n"
+"POT-Creation-Date: 2014-12-15 17:47+0100\n"
+"PO-Revision-Date: 2014-08-28 10:28+0000\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: Chinese (http://www.transifex.com/projects/p/FusionDirectory-109/language/zh/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -50,7 +50,7 @@ msgstr ""
 msgid "Branch under base in which keys are stored"
 msgstr ""
 
-#: addons/gpg/class_pgpServerInfo.inc:92
+#: addons/gpg/class_pgpServerInfo.inc:91
 msgid "LDAP error"
 msgstr "LDAP é”™è¯¯"
 
diff --git a/ipmi/locale/ar/fusiondirectory.po b/ipmi/locale/ar/fusiondirectory.po
index 0acef78633b7bdf619a8bc82d2a35e55c4db3b97..869ca52d071a1872953485dc230cd28531f668c3 100644
--- a/ipmi/locale/ar/fusiondirectory.po
+++ b/ipmi/locale/ar/fusiondirectory.po
@@ -5,12 +5,12 @@
 # Translators:
 msgid ""
 msgstr ""
-"Project-Id-Version: FusionDirectory-108\n"
+"Project-Id-Version: FusionDirectory-109\n"
 "Report-Msgid-Bugs-To: documentation@lists.fusiondirectory.org\n"
-"POT-Creation-Date: 2015-03-19 21:45+0100\n"
-"PO-Revision-Date: 2014-08-26 14:13+0000\n"
-"Last-Translator: fusiondirectory <contact@fusiondirectory.org>\n"
-"Language-Team: Arabic (http://www.transifex.com/projects/p/FusionDirectory-108/language/ar/)\n"
+"POT-Creation-Date: 2014-12-15 17:47+0100\n"
+"PO-Revision-Date: 2014-08-28 10:28+0000\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: Arabic (http://www.transifex.com/projects/p/FusionDirectory-109/language/ar/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
diff --git a/ipmi/locale/ca/fusiondirectory.po b/ipmi/locale/ca/fusiondirectory.po
index bd44106594c06cef1105f7c99a97871325888266..987fd044d58f0582236e28c08b032fdf090e4fda 100644
--- a/ipmi/locale/ca/fusiondirectory.po
+++ b/ipmi/locale/ca/fusiondirectory.po
@@ -5,12 +5,12 @@
 # Translators:
 msgid ""
 msgstr ""
-"Project-Id-Version: FusionDirectory-108\n"
+"Project-Id-Version: FusionDirectory-109\n"
 "Report-Msgid-Bugs-To: documentation@lists.fusiondirectory.org\n"
-"POT-Creation-Date: 2015-03-19 21:45+0100\n"
-"PO-Revision-Date: 2014-08-26 14:13+0000\n"
-"Last-Translator: fusiondirectory <contact@fusiondirectory.org>\n"
-"Language-Team: Catalan (http://www.transifex.com/projects/p/FusionDirectory-108/language/ca/)\n"
+"POT-Creation-Date: 2014-12-15 17:47+0100\n"
+"PO-Revision-Date: 2014-08-28 10:28+0000\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: Catalan (http://www.transifex.com/projects/p/FusionDirectory-109/language/ca/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
diff --git a/ipmi/locale/cs_CZ/fusiondirectory.po b/ipmi/locale/cs_CZ/fusiondirectory.po
index 5b70400e7e367097ee864da7ce917c59767c1066..e3d9643830f13f80655f75ef48a0069b56c88517 100644
--- a/ipmi/locale/cs_CZ/fusiondirectory.po
+++ b/ipmi/locale/cs_CZ/fusiondirectory.po
@@ -3,14 +3,15 @@
 # This file is distributed under the same license as the PACKAGE package.
 # 
 # Translators:
+# Pavel Borecki <pavel.borecki@gmail.com>, 2014-2015
 msgid ""
 msgstr ""
-"Project-Id-Version: FusionDirectory-108\n"
+"Project-Id-Version: FusionDirectory-109\n"
 "Report-Msgid-Bugs-To: documentation@lists.fusiondirectory.org\n"
-"POT-Creation-Date: 2015-03-19 21:45+0100\n"
-"PO-Revision-Date: 2014-12-08 17:31+0000\n"
-"Last-Translator: fusiondirectory <contact@fusiondirectory.org>\n"
-"Language-Team: Czech (Czech Republic) (http://www.transifex.com/projects/p/FusionDirectory-108/language/cs_CZ/)\n"
+"POT-Creation-Date: 2014-12-15 17:47+0100\n"
+"PO-Revision-Date: 2015-04-02 12:13+0000\n"
+"Last-Translator: Pavel Borecki <pavel.borecki@gmail.com>\n"
+"Language-Team: Czech (Czech Republic) (http://www.transifex.com/projects/p/FusionDirectory-109/language/cs_CZ/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -19,7 +20,7 @@ msgstr ""
 
 #: admin/systems/ipmi/class_ipmiClient.inc:31
 msgid "IPMI client"
-msgstr "Klient IPMI"
+msgstr "IPMI klient"
 
 #: admin/systems/ipmi/class_ipmiClient.inc:32
 msgid "Edit IPMI client settings"
@@ -47,7 +48,7 @@ msgstr "PÅ™ihlaÅ¡ovacÃ jmÃ©no k IPMI"
 
 #: admin/systems/ipmi/class_ipmiClient.inc:57
 msgid "User password"
-msgstr "heslo uÅ¾ivatele"
+msgstr "Heslo uÅ¾ivatele"
 
 #: admin/systems/ipmi/class_ipmiClient.inc:57
 msgid "IPMI user password"
diff --git a/ipmi/locale/de/fusiondirectory.po b/ipmi/locale/de/fusiondirectory.po
index ef6f44dc5cdb1ff6f898457af7917b4703572c7f..2e1d06631bb48ad2ed2a25858ca9f6a54594bd6e 100644
--- a/ipmi/locale/de/fusiondirectory.po
+++ b/ipmi/locale/de/fusiondirectory.po
@@ -3,14 +3,15 @@
 # This file is distributed under the same license as the PACKAGE package.
 # 
 # Translators:
+# Ettore Atalan <atalanttore@googlemail.com>, 2014
 msgid ""
 msgstr ""
-"Project-Id-Version: FusionDirectory-108\n"
+"Project-Id-Version: FusionDirectory-109\n"
 "Report-Msgid-Bugs-To: documentation@lists.fusiondirectory.org\n"
-"POT-Creation-Date: 2015-03-19 21:45+0100\n"
-"PO-Revision-Date: 2014-09-21 16:10+0000\n"
-"Last-Translator: fusiondirectory <contact@fusiondirectory.org>\n"
-"Language-Team: German (http://www.transifex.com/projects/p/FusionDirectory-108/language/de/)\n"
+"POT-Creation-Date: 2014-12-15 17:47+0100\n"
+"PO-Revision-Date: 2014-09-21 16:11+0000\n"
+"Last-Translator: Ettore Atalan <atalanttore@googlemail.com>\n"
+"Language-Team: German (http://www.transifex.com/projects/p/FusionDirectory-109/language/de/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
diff --git a/ipmi/locale/el_GR/fusiondirectory.po b/ipmi/locale/el_GR/fusiondirectory.po
new file mode 100644
index 0000000000000000000000000000000000000000..78b1f2c2d363f05393d98645f6f1f9c56bed1a47
--- /dev/null
+++ b/ipmi/locale/el_GR/fusiondirectory.po
@@ -0,0 +1,54 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR FusionDirectory Project
+# This file is distributed under the same license as the PACKAGE package.
+# 
+# Translators:
+msgid ""
+msgstr ""
+"Project-Id-Version: FusionDirectory-109\n"
+"Report-Msgid-Bugs-To: documentation@lists.fusiondirectory.org\n"
+"POT-Creation-Date: 2014-12-15 17:47+0100\n"
+"PO-Revision-Date: 2015-05-30 11:45+0000\n"
+"Last-Translator: Benoit Mortier <benoit.mortier@opensides.be>\n"
+"Language-Team: Greek (Greece) (http://www.transifex.com/projects/p/FusionDirectory-109/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/ipmi/class_ipmiClient.inc:31
+msgid "IPMI client"
+msgstr ""
+
+#: admin/systems/ipmi/class_ipmiClient.inc:32
+msgid "Edit IPMI client settings"
+msgstr ""
+
+#: admin/systems/ipmi/class_ipmiClient.inc:45
+msgid "IPMI client settings"
+msgstr ""
+
+#: admin/systems/ipmi/class_ipmiClient.inc:48
+msgid "IP"
+msgstr ""
+
+#: admin/systems/ipmi/class_ipmiClient.inc:48
+msgid "IP of the IPMI interface"
+msgstr ""
+
+#: admin/systems/ipmi/class_ipmiClient.inc:52
+msgid "User login"
+msgstr ""
+
+#: admin/systems/ipmi/class_ipmiClient.inc:52
+msgid "IPMI user login"
+msgstr ""
+
+#: admin/systems/ipmi/class_ipmiClient.inc:57
+msgid "User password"
+msgstr ""
+
+#: admin/systems/ipmi/class_ipmiClient.inc:57
+msgid "IPMI user password"
+msgstr ""
diff --git a/ipmi/locale/en/fusiondirectory.po b/ipmi/locale/en/fusiondirectory.po
index fee02db2d1f183e39251a12101e87bd2c5d47685..281952083d133264aa569cdd15d63e1209508cb6 100644
--- a/ipmi/locale/en/fusiondirectory.po
+++ b/ipmi/locale/en/fusiondirectory.po
@@ -6,13 +6,13 @@
 #, fuzzy
 msgid ""
 msgstr ""
-"Project-Id-Version: PACKAGE VERSION\n"
-"Report-Msgid-Bugs-To: documentation@lists.fusiondirectory.org\n"
-"POT-Creation-Date: 2015-03-31 11:49+0200\n"
+"Project-Id-Version: FusionDirectory VERSION\n"
+"Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
+"POT-Creation-Date: 2015-05-30 15:30+0200\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
-"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
-"Language-Team: LANGUAGE <LL@li.org>\n"
-"Language: \n"
+"Last-Translator: FusionDirectory project <contact@fusiondirectory.org>\n"
+"Language-Team: English\n"
+"Language: en\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
diff --git a/ipmi/locale/es/fusiondirectory.po b/ipmi/locale/es/fusiondirectory.po
index 185097e9ad019fb7401c1fc84ce40be31b15d67f..9b04fc7bb8e2b47531b562228b542fdb0d45d13e 100644
--- a/ipmi/locale/es/fusiondirectory.po
+++ b/ipmi/locale/es/fusiondirectory.po
@@ -5,12 +5,12 @@
 # Translators:
 msgid ""
 msgstr ""
-"Project-Id-Version: FusionDirectory-108\n"
+"Project-Id-Version: FusionDirectory-109\n"
 "Report-Msgid-Bugs-To: documentation@lists.fusiondirectory.org\n"
-"POT-Creation-Date: 2015-03-19 21:45+0100\n"
-"PO-Revision-Date: 2014-08-28 10:50+0000\n"
-"Last-Translator: fusiondirectory <contact@fusiondirectory.org>\n"
-"Language-Team: Spanish (http://www.transifex.com/projects/p/FusionDirectory-108/language/es/)\n"
+"POT-Creation-Date: 2014-12-15 17:47+0100\n"
+"PO-Revision-Date: 2014-08-28 10:28+0000\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: Spanish (http://www.transifex.com/projects/p/FusionDirectory-109/language/es/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
diff --git a/ipmi/locale/es_VE/fusiondirectory.po b/ipmi/locale/es_VE/fusiondirectory.po
index ef184f79db1209b57b02d64635b4b458497d5bfc..c272914ea4de684fb893ee6dc100750567d35ad0 100644
--- a/ipmi/locale/es_VE/fusiondirectory.po
+++ b/ipmi/locale/es_VE/fusiondirectory.po
@@ -5,12 +5,12 @@
 # Translators:
 msgid ""
 msgstr ""
-"Project-Id-Version: FusionDirectory-108\n"
+"Project-Id-Version: FusionDirectory-109\n"
 "Report-Msgid-Bugs-To: documentation@lists.fusiondirectory.org\n"
-"POT-Creation-Date: 2015-03-19 21:45+0100\n"
-"PO-Revision-Date: 2014-08-28 10:50+0000\n"
-"Last-Translator: fusiondirectory <contact@fusiondirectory.org>\n"
-"Language-Team: Spanish (Venezuela) (http://www.transifex.com/projects/p/FusionDirectory-108/language/es_VE/)\n"
+"POT-Creation-Date: 2014-12-15 17:47+0100\n"
+"PO-Revision-Date: 2014-08-28 10:28+0000\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: Spanish (Venezuela) (http://www.transifex.com/projects/p/FusionDirectory-109/language/es_VE/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
diff --git a/ipmi/locale/fa_IR/fusiondirectory.po b/ipmi/locale/fa_IR/fusiondirectory.po
index 83191f82bda84e629f708fc6d40af998d8df7e32..eb88de80c30a42d229a51c2055f21323b4eb1d1d 100644
--- a/ipmi/locale/fa_IR/fusiondirectory.po
+++ b/ipmi/locale/fa_IR/fusiondirectory.po
@@ -5,12 +5,12 @@
 # Translators:
 msgid ""
 msgstr ""
-"Project-Id-Version: FusionDirectory-108\n"
+"Project-Id-Version: FusionDirectory-109\n"
 "Report-Msgid-Bugs-To: documentation@lists.fusiondirectory.org\n"
-"POT-Creation-Date: 2015-03-19 21:45+0100\n"
-"PO-Revision-Date: 2014-08-26 14:14+0000\n"
-"Last-Translator: fusiondirectory <contact@fusiondirectory.org>\n"
-"Language-Team: Persian (Iran) (http://www.transifex.com/projects/p/FusionDirectory-108/language/fa_IR/)\n"
+"POT-Creation-Date: 2014-12-15 17:47+0100\n"
+"PO-Revision-Date: 2014-08-28 10:28+0000\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: Persian (Iran) (http://www.transifex.com/projects/p/FusionDirectory-109/language/fa_IR/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
diff --git a/ipmi/locale/fr/fusiondirectory.po b/ipmi/locale/fr/fusiondirectory.po
index 8518c4838bbe50e4f1ccd9a1acee6133748c8901..bd0638c9fc4d2c18b9caebea249a362c754311e0 100644
--- a/ipmi/locale/fr/fusiondirectory.po
+++ b/ipmi/locale/fr/fusiondirectory.po
@@ -3,17 +3,14 @@
 # This file is distributed under the same license as the PACKAGE package.
 # 
 # Translators:
-# MCMic, 2014
-# fusiondirectory <contact@fusiondirectory.org>, 2013-2014
-# MCMic, 2014
 msgid ""
 msgstr ""
-"Project-Id-Version: FusionDirectory-108\n"
+"Project-Id-Version: FusionDirectory-109\n"
 "Report-Msgid-Bugs-To: documentation@lists.fusiondirectory.org\n"
-"POT-Creation-Date: 2015-03-19 21:45+0100\n"
+"POT-Creation-Date: 2014-12-15 17:47+0100\n"
 "PO-Revision-Date: 2014-12-18 15:40+0000\n"
-"Last-Translator: MCMic\n"
-"Language-Team: French (http://www.transifex.com/projects/p/FusionDirectory-108/language/fr/)\n"
+"Last-Translator: fusiondirectory <contact@fusiondirectory.org>\n"
+"Language-Team: French (http://www.transifex.com/projects/p/FusionDirectory-109/language/fr/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -30,7 +27,7 @@ msgstr "Ã‰dition des paramÃ¨tres du client IPMI"
 
 #: admin/systems/ipmi/class_ipmiClient.inc:45
 msgid "IPMI client settings"
-msgstr "ParamÃ¨tres du client IPMI"
+msgstr "Ã‰dition des paramÃ¨tres du client IPMI"
 
 #: admin/systems/ipmi/class_ipmiClient.inc:48
 msgid "IP"
@@ -42,11 +39,11 @@ msgstr "Adresse IP de l'interface IPMI"
 
 #: admin/systems/ipmi/class_ipmiClient.inc:52
 msgid "User login"
-msgstr "Compte utilisateur"
+msgstr "compte Utilisateur"
 
 #: admin/systems/ipmi/class_ipmiClient.inc:52
 msgid "IPMI user login"
-msgstr "Compte utilisateur IPMI"
+msgstr "Compte utililisateur pour IPMI"
 
 #: admin/systems/ipmi/class_ipmiClient.inc:57
 msgid "User password"
@@ -54,4 +51,4 @@ msgstr "Mot de passe"
 
 #: admin/systems/ipmi/class_ipmiClient.inc:57
 msgid "IPMI user password"
-msgstr "Mot de passe IPMI"
+msgstr "Mot de passe utilisateur"
diff --git a/ipmi/locale/id/fusiondirectory.po b/ipmi/locale/id/fusiondirectory.po
index 1d7b678f45d57e8b89854137c8aa291a7244d15a..1e24d227f8a0e8802de0707adbb2daa12511d045 100644
--- a/ipmi/locale/id/fusiondirectory.po
+++ b/ipmi/locale/id/fusiondirectory.po
@@ -5,12 +5,12 @@
 # Translators:
 msgid ""
 msgstr ""
-"Project-Id-Version: FusionDirectory-108\n"
+"Project-Id-Version: FusionDirectory-109\n"
 "Report-Msgid-Bugs-To: documentation@lists.fusiondirectory.org\n"
-"POT-Creation-Date: 2015-03-19 21:45+0100\n"
-"PO-Revision-Date: 2014-08-26 14:14+0000\n"
-"Last-Translator: fusiondirectory <contact@fusiondirectory.org>\n"
-"Language-Team: Indonesian (http://www.transifex.com/projects/p/FusionDirectory-108/language/id/)\n"
+"POT-Creation-Date: 2014-12-15 17:47+0100\n"
+"PO-Revision-Date: 2014-08-28 10:28+0000\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: Indonesian (http://www.transifex.com/projects/p/FusionDirectory-109/language/id/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
diff --git a/ipmi/locale/it/fusiondirectory.po b/ipmi/locale/it/fusiondirectory.po
index 423e9a752de81e4f9604b7ac449e47b1a93b3ac1..de5898e200f4ddee837043d671a0c7d00aab06cb 100644
--- a/ipmi/locale/it/fusiondirectory.po
+++ b/ipmi/locale/it/fusiondirectory.po
@@ -5,12 +5,12 @@
 # Translators:
 msgid ""
 msgstr ""
-"Project-Id-Version: FusionDirectory-108\n"
+"Project-Id-Version: FusionDirectory-109\n"
 "Report-Msgid-Bugs-To: documentation@lists.fusiondirectory.org\n"
-"POT-Creation-Date: 2015-03-19 21:45+0100\n"
-"PO-Revision-Date: 2014-08-28 10:52+0000\n"
-"Last-Translator: fusiondirectory <contact@fusiondirectory.org>\n"
-"Language-Team: Italian (http://www.transifex.com/projects/p/FusionDirectory-108/language/it/)\n"
+"POT-Creation-Date: 2014-12-15 17:47+0100\n"
+"PO-Revision-Date: 2014-08-28 10:28+0000\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: Italian (http://www.transifex.com/projects/p/FusionDirectory-109/language/it/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
diff --git a/ipmi/locale/lv/fusiondirectory.po b/ipmi/locale/lv/fusiondirectory.po
index d995e4b144e8d39363856bf7be0b96030214a58f..0493d30fcb7698e16a75e8f92667786af4445c6b 100644
--- a/ipmi/locale/lv/fusiondirectory.po
+++ b/ipmi/locale/lv/fusiondirectory.po
@@ -5,12 +5,12 @@
 # Translators:
 msgid ""
 msgstr ""
-"Project-Id-Version: FusionDirectory-108\n"
+"Project-Id-Version: FusionDirectory-109\n"
 "Report-Msgid-Bugs-To: documentation@lists.fusiondirectory.org\n"
-"POT-Creation-Date: 2015-03-19 21:45+0100\n"
-"PO-Revision-Date: 2014-08-26 14:14+0000\n"
-"Last-Translator: fusiondirectory <contact@fusiondirectory.org>\n"
-"Language-Team: Latvian (http://www.transifex.com/projects/p/FusionDirectory-108/language/lv/)\n"
+"POT-Creation-Date: 2014-12-15 17:47+0100\n"
+"PO-Revision-Date: 2014-08-28 10:28+0000\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: Latvian (http://www.transifex.com/projects/p/FusionDirectory-109/language/lv/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
diff --git a/ipmi/locale/nb/fusiondirectory.po b/ipmi/locale/nb/fusiondirectory.po
index 9c920a8518e78dcf2e99cb9321b943ee18dc2b0f..21217230a7719c783a935193457925ef74da846e 100644
--- a/ipmi/locale/nb/fusiondirectory.po
+++ b/ipmi/locale/nb/fusiondirectory.po
@@ -5,12 +5,12 @@
 # Translators:
 msgid ""
 msgstr ""
-"Project-Id-Version: FusionDirectory-108\n"
+"Project-Id-Version: FusionDirectory-109\n"
 "Report-Msgid-Bugs-To: documentation@lists.fusiondirectory.org\n"
-"POT-Creation-Date: 2015-03-19 21:45+0100\n"
-"PO-Revision-Date: 2014-08-26 14:14+0000\n"
-"Last-Translator: fusiondirectory <contact@fusiondirectory.org>\n"
-"Language-Team: Norwegian BokmÃ¥l (http://www.transifex.com/projects/p/FusionDirectory-108/language/nb/)\n"
+"POT-Creation-Date: 2014-12-15 17:47+0100\n"
+"PO-Revision-Date: 2014-08-28 10:28+0000\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: Norwegian BokmÃ¥l (http://www.transifex.com/projects/p/FusionDirectory-109/language/nb/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
diff --git a/ipmi/locale/nl/fusiondirectory.po b/ipmi/locale/nl/fusiondirectory.po
index 2615b3df1791356bc0da8812d8969efd80f95280..8a96311b979c9027620b8169e49100f6eaaba957 100644
--- a/ipmi/locale/nl/fusiondirectory.po
+++ b/ipmi/locale/nl/fusiondirectory.po
@@ -5,12 +5,12 @@
 # Translators:
 msgid ""
 msgstr ""
-"Project-Id-Version: FusionDirectory-108\n"
+"Project-Id-Version: FusionDirectory-109\n"
 "Report-Msgid-Bugs-To: documentation@lists.fusiondirectory.org\n"
-"POT-Creation-Date: 2015-03-19 21:45+0100\n"
-"PO-Revision-Date: 2014-08-28 10:50+0000\n"
-"Last-Translator: fusiondirectory <contact@fusiondirectory.org>\n"
-"Language-Team: Dutch (http://www.transifex.com/projects/p/FusionDirectory-108/language/nl/)\n"
+"POT-Creation-Date: 2014-12-15 17:47+0100\n"
+"PO-Revision-Date: 2014-08-28 10:28+0000\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: Dutch (http://www.transifex.com/projects/p/FusionDirectory-109/language/nl/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
diff --git a/ipmi/locale/pl/fusiondirectory.po b/ipmi/locale/pl/fusiondirectory.po
index 9e8f5ce1ce56a66c45aee065d321755e854b3f84..5f09ea3e22382bfe59e0a5abf36168643824ccea 100644
--- a/ipmi/locale/pl/fusiondirectory.po
+++ b/ipmi/locale/pl/fusiondirectory.po
@@ -5,12 +5,12 @@
 # Translators:
 msgid ""
 msgstr ""
-"Project-Id-Version: FusionDirectory-108\n"
+"Project-Id-Version: FusionDirectory-109\n"
 "Report-Msgid-Bugs-To: documentation@lists.fusiondirectory.org\n"
-"POT-Creation-Date: 2015-03-19 21:45+0100\n"
-"PO-Revision-Date: 2014-08-28 10:50+0000\n"
-"Last-Translator: fusiondirectory <contact@fusiondirectory.org>\n"
-"Language-Team: Polish (http://www.transifex.com/projects/p/FusionDirectory-108/language/pl/)\n"
+"POT-Creation-Date: 2014-12-15 17:47+0100\n"
+"PO-Revision-Date: 2014-08-28 10:28+0000\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: Polish (http://www.transifex.com/projects/p/FusionDirectory-109/language/pl/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
diff --git a/ipmi/locale/pt/fusiondirectory.po b/ipmi/locale/pt/fusiondirectory.po
index f0b968ab8e918c68827bb69217b3aa88544bd266..b27e17027bcb8e38ff6a6f15b59c348198b3caac 100644
--- a/ipmi/locale/pt/fusiondirectory.po
+++ b/ipmi/locale/pt/fusiondirectory.po
@@ -5,12 +5,12 @@
 # Translators:
 msgid ""
 msgstr ""
-"Project-Id-Version: FusionDirectory-108\n"
+"Project-Id-Version: FusionDirectory-109\n"
 "Report-Msgid-Bugs-To: documentation@lists.fusiondirectory.org\n"
-"POT-Creation-Date: 2015-03-19 21:45+0100\n"
-"PO-Revision-Date: 2014-08-26 14:14+0000\n"
-"Last-Translator: fusiondirectory <contact@fusiondirectory.org>\n"
-"Language-Team: Portuguese (http://www.transifex.com/projects/p/FusionDirectory-108/language/pt/)\n"
+"POT-Creation-Date: 2014-12-15 17:47+0100\n"
+"PO-Revision-Date: 2014-08-28 10:28+0000\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: Portuguese (http://www.transifex.com/projects/p/FusionDirectory-109/language/pt/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
diff --git a/ipmi/locale/pt_BR/fusiondirectory.po b/ipmi/locale/pt_BR/fusiondirectory.po
index c3a130b3f6348219288b95b26daccd78f88e4463..4cbe5a25dbbae7d1f6d23b7d6b81993008ccd00c 100644
--- a/ipmi/locale/pt_BR/fusiondirectory.po
+++ b/ipmi/locale/pt_BR/fusiondirectory.po
@@ -3,15 +3,14 @@
 # This file is distributed under the same license as the PACKAGE package.
 # 
 # Translators:
-# ALEJANDRO BARRIOS <alejandrobarrios@interlegis.leg.br>, 2014
 msgid ""
 msgstr ""
-"Project-Id-Version: FusionDirectory-108\n"
+"Project-Id-Version: FusionDirectory-109\n"
 "Report-Msgid-Bugs-To: documentation@lists.fusiondirectory.org\n"
-"POT-Creation-Date: 2015-03-19 21:45+0100\n"
-"PO-Revision-Date: 2014-08-28 10:52+0000\n"
-"Last-Translator: fusiondirectory <contact@fusiondirectory.org>\n"
-"Language-Team: Portuguese (Brazil) (http://www.transifex.com/projects/p/FusionDirectory-108/language/pt_BR/)\n"
+"POT-Creation-Date: 2014-12-15 17:47+0100\n"
+"PO-Revision-Date: 2014-08-28 10:28+0000\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: Portuguese (Brazil) (http://www.transifex.com/projects/p/FusionDirectory-109/language/pt_BR/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
diff --git a/ipmi/locale/ru/fusiondirectory.po b/ipmi/locale/ru/fusiondirectory.po
index 257d79cf580c5b99f1dfe377a7f91c7c4e2f098a..4c9a8217188dd23645f2f2c7c84b51eccbdf3fcc 100644
--- a/ipmi/locale/ru/fusiondirectory.po
+++ b/ipmi/locale/ru/fusiondirectory.po
@@ -5,50 +5,50 @@
 # Translators:
 msgid ""
 msgstr ""
-"Project-Id-Version: FusionDirectory-108\n"
+"Project-Id-Version: FusionDirectory-109\n"
 "Report-Msgid-Bugs-To: documentation@lists.fusiondirectory.org\n"
-"POT-Creation-Date: 2015-03-19 21:45+0100\n"
-"PO-Revision-Date: 2014-08-26 14:14+0000\n"
-"Last-Translator: fusiondirectory <contact@fusiondirectory.org>\n"
-"Language-Team: Russian (http://www.transifex.com/projects/p/FusionDirectory-108/language/ru/)\n"
+"POT-Creation-Date: 2014-12-15 17:47+0100\n"
+"PO-Revision-Date: 2014-08-28 10:28+0000\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: Russian (http://www.transifex.com/projects/p/FusionDirectory-109/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=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);\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/ipmi/class_ipmiClient.inc:31
 msgid "IPMI client"
-msgstr ""
+msgstr "ÐšÐ»Ð¸ÐµÐ½Ñ‚ IPMI"
 
 #: admin/systems/ipmi/class_ipmiClient.inc:32
 msgid "Edit IPMI client settings"
-msgstr ""
+msgstr "Ð ÐµÐ´Ð°ÐºÑ‚Ð¸Ñ€Ð¾Ð²Ð°Ñ‚ÑŒ Ð½Ð°ÑÑ‚Ñ€Ð¾Ð¹ÐºÐ¸ ÐºÐ»Ð¸ÐµÐ½Ñ‚Ð° IPMI"
 
 #: admin/systems/ipmi/class_ipmiClient.inc:45
 msgid "IPMI client settings"
-msgstr ""
+msgstr "ÐÐ°ÑÑ‚Ñ€Ð¾Ð¹ÐºÐ¸ ÐºÐ»Ð¸ÐµÐ½Ñ‚Ð° IPMI"
 
 #: admin/systems/ipmi/class_ipmiClient.inc:48
 msgid "IP"
-msgstr ""
+msgstr "IP"
 
 #: admin/systems/ipmi/class_ipmiClient.inc:48
 msgid "IP of the IPMI interface"
-msgstr ""
+msgstr "IP Ð°Ð´Ñ€ÐµÑ IPMI Ð¸Ð½Ñ‚ÐµÑ€Ñ„ÐµÐ¹ÑÐ°"
 
 #: admin/systems/ipmi/class_ipmiClient.inc:52
 msgid "User login"
-msgstr ""
+msgstr "Ð›Ð¾Ð³Ð¸Ð½ Ð¿Ð¾Ð»ÑŒÐ·Ð¾Ð²Ð°Ñ‚ÐµÐ»Ñ"
 
 #: admin/systems/ipmi/class_ipmiClient.inc:52
 msgid "IPMI user login"
-msgstr ""
+msgstr "Ð›Ð¾Ð³Ð¸Ð½ Ð¿Ð¾Ð»ÑŒÐ·Ð¾Ð²Ð°Ñ‚ÐµÐ»Ñ IPMI"
 
 #: admin/systems/ipmi/class_ipmiClient.inc:57
 msgid "User password"
-msgstr ""
+msgstr "ÐŸÐ°Ñ€Ð¾Ð»ÑŒ Ð¿Ð¾Ð»ÑŒÐ·Ð¾Ð²Ð°Ñ‚ÐµÐ»Ñ"
 
 #: admin/systems/ipmi/class_ipmiClient.inc:57
 msgid "IPMI user password"
-msgstr ""
+msgstr "ÐŸÐ°Ñ€Ð¾Ð»ÑŒ Ð¿Ð¾Ð»ÑŒÐ·Ð¾Ð²Ð°Ñ‚ÐµÐ»Ñ IPMI"
diff --git a/ipmi/locale/ru@petr1708/fusiondirectory.po b/ipmi/locale/ru@petr1708/fusiondirectory.po
index 266407615bd18e402102c03b69a969341323d55c..0916fe0289ac45c15b0231630e66f14ea91308c3 100644
--- a/ipmi/locale/ru@petr1708/fusiondirectory.po
+++ b/ipmi/locale/ru@petr1708/fusiondirectory.po
@@ -5,17 +5,17 @@
 # Translators:
 msgid ""
 msgstr ""
-"Project-Id-Version: FusionDirectory-108\n"
+"Project-Id-Version: FusionDirectory-109\n"
 "Report-Msgid-Bugs-To: documentation@lists.fusiondirectory.org\n"
-"POT-Creation-Date: 2015-03-19 21:45+0100\n"
-"PO-Revision-Date: 2014-08-26 14:14+0000\n"
-"Last-Translator: fusiondirectory <contact@fusiondirectory.org>\n"
-"Language-Team: Russian Petrine orthography (http://www.transifex.com/projects/p/FusionDirectory-108/language/ru@petr1708/)\n"
+"POT-Creation-Date: 2014-12-15 17:47+0100\n"
+"PO-Revision-Date: 2014-08-28 10:28+0000\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: Russian Petrine orthography (http://www.transifex.com/projects/p/FusionDirectory-109/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=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);\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/ipmi/class_ipmiClient.inc:31
 msgid "IPMI client"
diff --git a/ipmi/locale/sv/fusiondirectory.po b/ipmi/locale/sv/fusiondirectory.po
index 6cbaeb3428d93cf48c4c0ddbfa0fd7e8330d0817..a324fa6af695827820607d842aba640a2abe7a6d 100644
--- a/ipmi/locale/sv/fusiondirectory.po
+++ b/ipmi/locale/sv/fusiondirectory.po
@@ -5,12 +5,12 @@
 # Translators:
 msgid ""
 msgstr ""
-"Project-Id-Version: FusionDirectory-108\n"
+"Project-Id-Version: FusionDirectory-109\n"
 "Report-Msgid-Bugs-To: documentation@lists.fusiondirectory.org\n"
-"POT-Creation-Date: 2015-03-19 21:45+0100\n"
-"PO-Revision-Date: 2014-08-26 14:14+0000\n"
-"Last-Translator: fusiondirectory <contact@fusiondirectory.org>\n"
-"Language-Team: Swedish (http://www.transifex.com/projects/p/FusionDirectory-108/language/sv/)\n"
+"POT-Creation-Date: 2014-12-15 17:47+0100\n"
+"PO-Revision-Date: 2014-08-28 10:28+0000\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: Swedish (http://www.transifex.com/projects/p/FusionDirectory-109/language/sv/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
diff --git a/ipmi/locale/ug/fusiondirectory.po b/ipmi/locale/ug/fusiondirectory.po
index 3b4aa4654779569f42c2ad0eb3e02babf26f8259..870657c9419c30a83ed5a6390065384915de278c 100644
--- a/ipmi/locale/ug/fusiondirectory.po
+++ b/ipmi/locale/ug/fusiondirectory.po
@@ -5,12 +5,12 @@
 # Translators:
 msgid ""
 msgstr ""
-"Project-Id-Version: FusionDirectory-108\n"
+"Project-Id-Version: FusionDirectory-109\n"
 "Report-Msgid-Bugs-To: documentation@lists.fusiondirectory.org\n"
-"POT-Creation-Date: 2015-03-19 21:45+0100\n"
-"PO-Revision-Date: 2014-08-26 14:14+0000\n"
-"Last-Translator: fusiondirectory <contact@fusiondirectory.org>\n"
-"Language-Team: Uighur (http://www.transifex.com/projects/p/FusionDirectory-108/language/ug/)\n"
+"POT-Creation-Date: 2014-12-15 17:47+0100\n"
+"PO-Revision-Date: 2014-08-28 10:28+0000\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: Uighur (http://www.transifex.com/projects/p/FusionDirectory-109/language/ug/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
diff --git a/ipmi/locale/vi_VN/fusiondirectory.po b/ipmi/locale/vi_VN/fusiondirectory.po
index 66c4854c90515f0d96c2fd011ce4340c30e5c7f4..7d1613ad3f21394dcd3c48fa2b1a8a561aadc540 100644
--- a/ipmi/locale/vi_VN/fusiondirectory.po
+++ b/ipmi/locale/vi_VN/fusiondirectory.po
@@ -5,12 +5,12 @@
 # Translators:
 msgid ""
 msgstr ""
-"Project-Id-Version: FusionDirectory-108\n"
+"Project-Id-Version: FusionDirectory-109\n"
 "Report-Msgid-Bugs-To: documentation@lists.fusiondirectory.org\n"
-"POT-Creation-Date: 2015-03-19 21:45+0100\n"
-"PO-Revision-Date: 2014-08-26 14:14+0000\n"
-"Last-Translator: fusiondirectory <contact@fusiondirectory.org>\n"
-"Language-Team: Vietnamese (Viet Nam) (http://www.transifex.com/projects/p/FusionDirectory-108/language/vi_VN/)\n"
+"POT-Creation-Date: 2014-12-15 17:47+0100\n"
+"PO-Revision-Date: 2014-08-28 10:28+0000\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: Vietnamese (Viet Nam) (http://www.transifex.com/projects/p/FusionDirectory-109/language/vi_VN/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
diff --git a/ipmi/locale/zh/fusiondirectory.po b/ipmi/locale/zh/fusiondirectory.po
index db08bc0063eb062cdb0964fcbecb429deb217040..b3356c319e64120fbc4939cab2a75e37aa7111bd 100644
--- a/ipmi/locale/zh/fusiondirectory.po
+++ b/ipmi/locale/zh/fusiondirectory.po
@@ -5,12 +5,12 @@
 # Translators:
 msgid ""
 msgstr ""
-"Project-Id-Version: FusionDirectory-108\n"
+"Project-Id-Version: FusionDirectory-109\n"
 "Report-Msgid-Bugs-To: documentation@lists.fusiondirectory.org\n"
-"POT-Creation-Date: 2015-03-19 21:45+0100\n"
-"PO-Revision-Date: 2014-08-26 14:14+0000\n"
-"Last-Translator: fusiondirectory <contact@fusiondirectory.org>\n"
-"Language-Team: Chinese (http://www.transifex.com/projects/p/FusionDirectory-108/language/zh/)\n"
+"POT-Creation-Date: 2014-12-15 17:47+0100\n"
+"PO-Revision-Date: 2014-08-28 10:28+0000\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: Chinese (http://www.transifex.com/projects/p/FusionDirectory-109/language/zh/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
diff --git a/kolab/locale/ar/fusiondirectory.po b/kolab/locale/ar/fusiondirectory.po
index fa3d85e721be5d1375ba8a7a609f629b45ad78b9..b75007c175d5033f58964cb654202e11c07bd77e 100644
--- a/kolab/locale/ar/fusiondirectory.po
+++ b/kolab/locale/ar/fusiondirectory.po
@@ -5,57 +5,56 @@
 # Translators:
 msgid ""
 msgstr ""
-"Project-Id-Version: FusionDirectory-108\n"
+"Project-Id-Version: FusionDirectory-109\n"
 "Report-Msgid-Bugs-To: documentation@lists.fusiondirectory.org\n"
-"POT-Creation-Date: 2015-03-19 21:45+0100\n"
-"PO-Revision-Date: 2015-02-25 15:48+0000\n"
+"POT-Creation-Date: 2014-12-15 17:47+0100\n"
+"PO-Revision-Date: 2014-12-15 16:58+0000\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>\n"
-"Language-Team: Arabic (http://www.transifex.com/projects/p/FusionDirectory-108/language/ar/)\n"
+"Language-Team: Arabic (http://www.transifex.com/projects/p/FusionDirectory-109/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/ogroups/kolab/class_mailogroup.inc:70
+#: admin/ogroups/kolab/class_mailogroup.inc:37
+msgid "Mail"
+msgstr ""
+
+#: admin/ogroups/kolab/class_mailogroup.inc:38
+msgid "Mail group"
+msgstr ""
+
+#: admin/ogroups/kolab/class_mailogroup.inc:45
+#: admin/ogroups/kolab/class_mailogroup.inc:118
+#: admin/ogroups/kolab/class_mailogroup.inc:125
+msgid "Mail address"
+msgstr ""
+
+#: admin/ogroups/kolab/class_mailogroup.inc:82
 msgid "Remove mail account"
 msgstr ""
 
-#: admin/ogroups/kolab/class_mailogroup.inc:71
-#: admin/ogroups/kolab/class_mailogroup.inc:74
+#: admin/ogroups/kolab/class_mailogroup.inc:83
+#: admin/ogroups/kolab/class_mailogroup.inc:86
 msgid "mail group"
 msgstr ""
 
-#: admin/ogroups/kolab/class_mailogroup.inc:73
+#: admin/ogroups/kolab/class_mailogroup.inc:85
 msgid "Create mail account"
 msgstr ""
 
-#: admin/ogroups/kolab/class_mailogroup.inc:106
-#: admin/ogroups/kolab/class_mailogroup.inc:113
-#: admin/ogroups/kolab/class_mailogroup.inc:190
-msgid "Mail address"
-msgstr ""
-
-#: admin/ogroups/kolab/class_mailogroup.inc:106
+#: admin/ogroups/kolab/class_mailogroup.inc:118
 msgid "your-name@your-domain.com"
 msgstr ""
 
-#: admin/ogroups/kolab/class_mailogroup.inc:140
-#: admin/ogroups/kolab/class_mailogroup.inc:177
+#: admin/ogroups/kolab/class_mailogroup.inc:152
+#: admin/ogroups/kolab/class_mailogroup.inc:189
 #: admin/systems/services/kolab/class_serviceKolab.inc:282
 #: admin/systems/services/kolab/class_serviceKolab.inc:293
 msgid "LDAP error"
 msgstr ""
 
-#: admin/ogroups/kolab/class_mailogroup.inc:184
-#: admin/ogroups/kolab/paste_mail.tpl.c:2
-msgid "Mail"
-msgstr ""
-
-#: admin/ogroups/kolab/class_mailogroup.inc:185
-msgid "Mail group"
-msgstr ""
-
 #: admin/systems/services/kolab/class_serviceKolab.inc:29
 msgid "Enable MX lookup for relayhost"
 msgstr ""
@@ -392,19 +391,3 @@ msgstr ""
 #: personal/mail/kolab/class_mail-methods-kolab.inc:282
 msgid "Please remove the mail settings first!"
 msgstr ""
-
-#: admin/ogroups/kolab/mail.tpl.c:2
-msgid "Mail distribution list"
-msgstr ""
-
-#: admin/ogroups/kolab/mail.tpl.c:5
-msgid "Primary address"
-msgstr ""
-
-#: admin/ogroups/kolab/mail.tpl.c:8
-msgid "Primary mail address for this distribution list"
-msgstr ""
-
-#: admin/ogroups/kolab/paste_mail.tpl.c:5
-msgid "Please enter a mail address"
-msgstr ""
diff --git a/kolab/locale/ca/fusiondirectory.po b/kolab/locale/ca/fusiondirectory.po
index d0d1709163a5f1389a0f69d7d95dfa962442d6ab..e078bffae00a6bf0c88944d8c8cf26aded344cc0 100644
--- a/kolab/locale/ca/fusiondirectory.po
+++ b/kolab/locale/ca/fusiondirectory.po
@@ -5,57 +5,56 @@
 # Translators:
 msgid ""
 msgstr ""
-"Project-Id-Version: FusionDirectory-108\n"
+"Project-Id-Version: FusionDirectory-109\n"
 "Report-Msgid-Bugs-To: documentation@lists.fusiondirectory.org\n"
-"POT-Creation-Date: 2015-03-19 21:45+0100\n"
-"PO-Revision-Date: 2015-02-25 15:48+0000\n"
+"POT-Creation-Date: 2014-12-15 17:47+0100\n"
+"PO-Revision-Date: 2014-12-15 16:58+0000\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>\n"
-"Language-Team: Catalan (http://www.transifex.com/projects/p/FusionDirectory-108/language/ca/)\n"
+"Language-Team: Catalan (http://www.transifex.com/projects/p/FusionDirectory-109/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/ogroups/kolab/class_mailogroup.inc:70
+#: admin/ogroups/kolab/class_mailogroup.inc:37
+msgid "Mail"
+msgstr ""
+
+#: admin/ogroups/kolab/class_mailogroup.inc:38
+msgid "Mail group"
+msgstr ""
+
+#: admin/ogroups/kolab/class_mailogroup.inc:45
+#: admin/ogroups/kolab/class_mailogroup.inc:118
+#: admin/ogroups/kolab/class_mailogroup.inc:125
+msgid "Mail address"
+msgstr "AdreÃ§a de correu"
+
+#: admin/ogroups/kolab/class_mailogroup.inc:82
 msgid "Remove mail account"
 msgstr ""
 
-#: admin/ogroups/kolab/class_mailogroup.inc:71
-#: admin/ogroups/kolab/class_mailogroup.inc:74
+#: admin/ogroups/kolab/class_mailogroup.inc:83
+#: admin/ogroups/kolab/class_mailogroup.inc:86
 msgid "mail group"
 msgstr ""
 
-#: admin/ogroups/kolab/class_mailogroup.inc:73
+#: admin/ogroups/kolab/class_mailogroup.inc:85
 msgid "Create mail account"
 msgstr ""
 
-#: admin/ogroups/kolab/class_mailogroup.inc:106
-#: admin/ogroups/kolab/class_mailogroup.inc:113
-#: admin/ogroups/kolab/class_mailogroup.inc:190
-msgid "Mail address"
-msgstr "AdreÃ§a de correu"
-
-#: admin/ogroups/kolab/class_mailogroup.inc:106
+#: admin/ogroups/kolab/class_mailogroup.inc:118
 msgid "your-name@your-domain.com"
 msgstr ""
 
-#: admin/ogroups/kolab/class_mailogroup.inc:140
-#: admin/ogroups/kolab/class_mailogroup.inc:177
+#: admin/ogroups/kolab/class_mailogroup.inc:152
+#: admin/ogroups/kolab/class_mailogroup.inc:189
 #: admin/systems/services/kolab/class_serviceKolab.inc:282
 #: admin/systems/services/kolab/class_serviceKolab.inc:293
 msgid "LDAP error"
 msgstr "Error d'LDAP"
 
-#: admin/ogroups/kolab/class_mailogroup.inc:184
-#: admin/ogroups/kolab/paste_mail.tpl.c:2
-msgid "Mail"
-msgstr ""
-
-#: admin/ogroups/kolab/class_mailogroup.inc:185
-msgid "Mail group"
-msgstr ""
-
 #: admin/systems/services/kolab/class_serviceKolab.inc:29
 msgid "Enable MX lookup for relayhost"
 msgstr ""
@@ -392,19 +391,3 @@ msgstr ""
 #: personal/mail/kolab/class_mail-methods-kolab.inc:282
 msgid "Please remove the mail settings first!"
 msgstr ""
-
-#: admin/ogroups/kolab/mail.tpl.c:2
-msgid "Mail distribution list"
-msgstr ""
-
-#: admin/ogroups/kolab/mail.tpl.c:5
-msgid "Primary address"
-msgstr ""
-
-#: admin/ogroups/kolab/mail.tpl.c:8
-msgid "Primary mail address for this distribution list"
-msgstr ""
-
-#: admin/ogroups/kolab/paste_mail.tpl.c:5
-msgid "Please enter a mail address"
-msgstr ""
diff --git a/kolab/locale/cs_CZ/fusiondirectory.po b/kolab/locale/cs_CZ/fusiondirectory.po
index 65750d399ec559d34e46411ea882750fd8c773b1..b4c1fb21ec8218fc22ab8195ddb15682fcbe4cd5 100644
--- a/kolab/locale/cs_CZ/fusiondirectory.po
+++ b/kolab/locale/cs_CZ/fusiondirectory.po
@@ -3,61 +3,58 @@
 # This file is distributed under the same license as the PACKAGE package.
 # 
 # Translators:
-# Pavel Borecki <pavel.borecki@gmail.com>, 2012
-# Pavel Borecki <pavel.borecki@gmail.com>, 2012
-# Pavel Borecki <pavel.borecki@gmail.com>, 2012
+# Pavel Borecki <pavel.borecki@gmail.com>, 2014-2015
 msgid ""
 msgstr ""
-"Project-Id-Version: FusionDirectory-108\n"
+"Project-Id-Version: FusionDirectory-109\n"
 "Report-Msgid-Bugs-To: documentation@lists.fusiondirectory.org\n"
-"POT-Creation-Date: 2015-03-19 21:45+0100\n"
-"PO-Revision-Date: 2015-02-25 16:51+0000\n"
-"Last-Translator: fusiondirectory <contact@fusiondirectory.org>\n"
-"Language-Team: Czech (Czech Republic) (http://www.transifex.com/projects/p/FusionDirectory-108/language/cs_CZ/)\n"
+"POT-Creation-Date: 2014-12-15 17:47+0100\n"
+"PO-Revision-Date: 2015-04-07 19:41+0000\n"
+"Last-Translator: Pavel Borecki <pavel.borecki@gmail.com>\n"
+"Language-Team: Czech (Czech Republic) (http://www.transifex.com/projects/p/FusionDirectory-109/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/ogroups/kolab/class_mailogroup.inc:70
+#: admin/ogroups/kolab/class_mailogroup.inc:37
+msgid "Mail"
+msgstr "E-mail"
+
+#: admin/ogroups/kolab/class_mailogroup.inc:38
+msgid "Mail group"
+msgstr "E-mailovÃ¡ skupina"
+
+#: admin/ogroups/kolab/class_mailogroup.inc:45
+#: admin/ogroups/kolab/class_mailogroup.inc:118
+#: admin/ogroups/kolab/class_mailogroup.inc:125
+msgid "Mail address"
+msgstr "E-mailovÃ¡ adresa"
+
+#: admin/ogroups/kolab/class_mailogroup.inc:82
 msgid "Remove mail account"
-msgstr "odebrat e-mailovÃ½ ÃºÄet"
+msgstr "Odstranit e-mailovÃ½ ÃºÄet"
 
-#: admin/ogroups/kolab/class_mailogroup.inc:71
-#: admin/ogroups/kolab/class_mailogroup.inc:74
+#: admin/ogroups/kolab/class_mailogroup.inc:83
+#: admin/ogroups/kolab/class_mailogroup.inc:86
 msgid "mail group"
 msgstr "e-mailovÃ¡ skupina"
 
-#: admin/ogroups/kolab/class_mailogroup.inc:73
+#: admin/ogroups/kolab/class_mailogroup.inc:85
 msgid "Create mail account"
-msgstr "vytvoÅ™it ÃºÄet pro e-mail"
-
-#: admin/ogroups/kolab/class_mailogroup.inc:106
-#: admin/ogroups/kolab/class_mailogroup.inc:113
-#: admin/ogroups/kolab/class_mailogroup.inc:190
-msgid "Mail address"
-msgstr "e-mailovÃ¡ adresa"
+msgstr "VytvoÅ™it ÃºÄet pro e-mail"
 
-#: admin/ogroups/kolab/class_mailogroup.inc:106
+#: admin/ogroups/kolab/class_mailogroup.inc:118
 msgid "your-name@your-domain.com"
 msgstr "vase-jmeno@vase-domena.cz"
 
-#: admin/ogroups/kolab/class_mailogroup.inc:140
-#: admin/ogroups/kolab/class_mailogroup.inc:177
+#: admin/ogroups/kolab/class_mailogroup.inc:152
+#: admin/ogroups/kolab/class_mailogroup.inc:189
 #: admin/systems/services/kolab/class_serviceKolab.inc:282
 #: admin/systems/services/kolab/class_serviceKolab.inc:293
 msgid "LDAP error"
-msgstr "chyba LDAPu"
-
-#: admin/ogroups/kolab/class_mailogroup.inc:184
-#: admin/ogroups/kolab/paste_mail.tpl.c:2
-msgid "Mail"
-msgstr "e-mail"
-
-#: admin/ogroups/kolab/class_mailogroup.inc:185
-msgid "Mail group"
-msgstr "e-mailovÃ¡ skupina"
+msgstr "Chyba LDAP"
 
 #: admin/systems/services/kolab/class_serviceKolab.inc:29
 msgid "Enable MX lookup for relayhost"
@@ -70,17 +67,17 @@ msgstr "pÅ™edÃ¡vajÃcÃ stroj"
 #: admin/systems/services/kolab/class_serviceKolab.inc:32
 #: admin/systems/services/kolab/class_serviceKolab.inc:186
 msgid "Host used to relay mails"
-msgstr "stroj pouÅ¾itÃ½ k pÅ™edÃ¡vÃ¡nÃ zprÃ¡v"
+msgstr "PoÄÃtaÄ slouÅ¾ÃcÃ k pÅ™edÃ¡vÃ¡nÃ zprÃ¡v"
 
 #: admin/systems/services/kolab/class_serviceKolab.inc:67
 #: admin/systems/services/kolab/class_serviceKolab.inc:68
 msgid "Kolab mail service"
-msgstr "e-mailovÃ¡ sluÅ¾ba Kolab"
+msgstr "E-mailovÃ¡ sluÅ¾ba Kolab"
 
 #: admin/systems/services/kolab/class_serviceKolab.inc:68
 #: admin/systems/services/kolab/class_serviceKolab.inc:104
 msgid "Services"
-msgstr "sluÅ¾by"
+msgstr "SluÅ¾by"
 
 #: admin/systems/services/kolab/class_serviceKolab.inc:82
 msgid "Informations"
@@ -88,11 +85,11 @@ msgstr "Informace"
 
 #: admin/systems/services/kolab/class_serviceKolab.inc:88
 msgid "Postfix mydomain"
-msgstr "mydomain Postfixu"
+msgstr "mydomain Postfix"
 
 #: admin/systems/services/kolab/class_serviceKolab.inc:88
 msgid "Postfix domain name"
-msgstr ""
+msgstr "DomÃ©novÃ½ nÃ¡zev Postfix"
 
 #: admin/systems/services/kolab/class_serviceKolab.inc:92
 msgid "Cyrus admins"
@@ -100,7 +97,7 @@ msgstr "sprÃ¡vci Cyra"
 
 #: admin/systems/services/kolab/class_serviceKolab.inc:92
 msgid "Cyrus admins for kolab server"
-msgstr ""
+msgstr "SprÃ¡vci Cyrus pro kolab server"
 
 #: admin/systems/services/kolab/class_serviceKolab.inc:97
 msgid "Mail domains"
@@ -112,19 +109,19 @@ msgstr ""
 
 #: admin/systems/services/kolab/class_serviceKolab.inc:107
 msgid "POP3 service"
-msgstr "sluÅ¾ba POP3"
+msgstr "SluÅ¾ba POP3"
 
 #: admin/systems/services/kolab/class_serviceKolab.inc:107
 msgid "Enable POP3 service"
-msgstr ""
+msgstr "Zapnout sluÅ¾bu POP3"
 
 #: admin/systems/services/kolab/class_serviceKolab.inc:111
 msgid "POP3/SSL service"
-msgstr "sluÅ¾ba POP3/SSL"
+msgstr "SluÅ¾ba POP3/SSL"
 
 #: admin/systems/services/kolab/class_serviceKolab.inc:111
 msgid "Enable POP3/SSL service"
-msgstr ""
+msgstr "Zapnout sluÅ¾bu PO3/SSL"
 
 #: admin/systems/services/kolab/class_serviceKolab.inc:115
 msgid "IMAP service"
@@ -132,15 +129,15 @@ msgstr "sluÅ¾ba IMAP"
 
 #: admin/systems/services/kolab/class_serviceKolab.inc:115
 msgid "Enable IMAP service"
-msgstr ""
+msgstr "Zapnout sluÅ¾bu IMAP"
 
 #: admin/systems/services/kolab/class_serviceKolab.inc:119
 msgid "IMAP/SSL service"
-msgstr "sluÅ¾ba IMAP/SSL"
+msgstr "SluÅ¾ba IMAP/SSL"
 
 #: admin/systems/services/kolab/class_serviceKolab.inc:119
 msgid "Enable IMAP/SSL service"
-msgstr ""
+msgstr "Zapnout sluÅ¾bu IMAP/SSL"
 
 #: admin/systems/services/kolab/class_serviceKolab.inc:123
 msgid "Sieve service"
@@ -148,11 +145,11 @@ msgstr "sluÅ¾ba Sieve"
 
 #: admin/systems/services/kolab/class_serviceKolab.inc:123
 msgid "Enable Sieve service"
-msgstr ""
+msgstr "Zapnout sluÅ¾bu Sieve"
 
 #: admin/systems/services/kolab/class_serviceKolab.inc:127
 msgid "FTP FreeBusy service (legacy)"
-msgstr ""
+msgstr "sluÅ¾ba FTP FreeBusy (v reÅ¾imu zpÄ›tnÃ© kompatibility)"
 
 #: admin/systems/services/kolab/class_serviceKolab.inc:128
 msgid "FTP FreeBusy service (legacy, not interoperable with Kolab2 FreeBusy)"
@@ -160,74 +157,74 @@ msgstr "sluÅ¾ba FTP Free/Busy (v reÅ¾imu zpÄ›tnÃ© kompatibility, nekompatibilnÃ
 
 #: admin/systems/services/kolab/class_serviceKolab.inc:132
 msgid "HTTP FreeBusy service (legacy)"
-msgstr "sluÅ¾ba HTTP FreeBusy (v reÅ¾imu zpÄ›tnÃ© kompatibility)"
+msgstr "SluÅ¾ba HTTP FreeBusy (v reÅ¾imu zpÄ›tnÃ© sluÄitelnosti)"
 
 #: admin/systems/services/kolab/class_serviceKolab.inc:136
 msgid "Amavis email scanning"
-msgstr ""
+msgstr "SkenovÃ¡nÃ e-mailÅ¯ Amavis"
 
 #: admin/systems/services/kolab/class_serviceKolab.inc:136
 msgid "Amavis email scanning (virus/spam)"
-msgstr "systÃ©m skenovÃ¡nÃ e-mailÅ¯ Amavis (viry/nevyÅ¾Ã¡danÃ¡ poÅ¡ta)"
+msgstr "SkenovÃ¡nÃ e-mailÅ¯ nÃ¡strojem Amavis (viry/nevyÅ¾Ã¡danÃ¡ poÅ¡ta)"
 
 #: admin/systems/services/kolab/class_serviceKolab.inc:142
 msgid "Quota settings"
-msgstr "nastavenÃ kvÃ³t"
+msgstr "NastavenÃ kvÃ³t"
 
 #: admin/systems/services/kolab/class_serviceKolab.inc:145
 msgid "Quota occupation limit before warning users (%)"
-msgstr ""
+msgstr "Hranice, po jejÃmÅ¾ pÅ™ekroÄenÃ budou uÅ¾ivatelÃ© varovÃ¡ni ohlednÄ› blÃÅ¾ÃcÃho se vyÄerpÃ¡nÃ kvÃ³ty (%s)"
 
 #: admin/systems/services/kolab/class_serviceKolab.inc:146
 #, php-format
 msgid "Warn users when using more than X% of their mail quota"
-msgstr ""
+msgstr "Varovat uÅ¾ivatele, pokud vyuÅ¾ijÃ vÃce neÅ¾ X% objemu svÃ© kvÃ³ty na e-maily"
 
 #: admin/systems/services/kolab/class_serviceKolab.inc:154
 msgid "Free/Busy settings"
-msgstr "nastavenÃ Free/Busy"
+msgstr "NastavenÃ Free/Busy"
 
 #: admin/systems/services/kolab/class_serviceKolab.inc:157
 #: admin/systems/services/kolab/class_serviceKolab.inc:158
 msgid "Allow unauthenticated downloading of Free/Busy information"
-msgstr "dovolit neovÄ›Å™enÃ½m uÅ¾ivatelÅ¯m stahovat informace z Free/Busy"
+msgstr "UmoÅ¾nit neovÄ›Å™enÃ½m uÅ¾ivatelÅ¯m stahovat informace z Free/Busy"
 
 #: admin/systems/services/kolab/class_serviceKolab.inc:162
 msgid "Number of days to include when creating free/busy lists"
-msgstr ""
+msgstr "PoÄet dnÅ¯, kterÃ© zahrnout pÅ™i vytvÃ¡Å™enÃ seznamÅ¯ free/busy"
 
 #: admin/systems/services/kolab/class_serviceKolab.inc:163
 msgid "Include data from X days in the past when creating free/busy lists"
-msgstr ""
+msgstr "Zahrnout Ãºdaje z X dnÅ¯ v minulosti pÅ™i vytvÃ¡Å™enÃ free/busy seznamÅ¯"
 
 #: admin/systems/services/kolab/class_serviceKolab.inc:171
 msgid "SMTP privileged networks"
-msgstr "privilegovanÃ© sÃtÄ› pro SMTP"
+msgstr "SÃtÄ›, ze kterÃ½ch je moÅ¾nÃ© pouÅ¾Ãvat SMTP"
 
 #: admin/systems/services/kolab/class_serviceKolab.inc:174
 msgid "Hosts/networks allowed to relay"
-msgstr "stroje/sÃtÄ› kterÃ© mohou pÅ™edÃ¡vat"
+msgstr "PoÄÃtaÄe/sÃtÄ› kterÃ© mohou pÅ™edÃ¡vat"
 
 #: admin/systems/services/kolab/class_serviceKolab.inc:175
 msgid "Hosts/networks allowed to relay (multiple values comma-seperated)"
-msgstr ""
+msgstr "stroje/sÃtÄ› kterÃ© mohou pÅ™edÃ¡vat (jednotlivÃ© poloÅ¾ky oddÄ›lujte ÄÃ¡rkou)"
 
 #: admin/systems/services/kolab/class_serviceKolab.inc:183
 msgid "SMTP smarthost/relayhost"
-msgstr "inteligentnÃ pÅ™edÃ¡vajÃcÃ (smarthost) / pÅ™edÃ¡vajÃcÃ stroj SMTP"
+msgstr "InteligentnÃ pÅ™edÃ¡vajÃcÃ (smarthost) / pÅ™edÃ¡vajÃcÃ stroj SMTP"
 
 #: admin/systems/services/kolab/class_serviceKolab.inc:191
 msgid "Accept Internet Mail"
-msgstr "pÅ™ijÃmat Internetovou poÅ¡tu"
+msgstr "PÅ™ijÃmat Internetovou poÅ¡tu"
 
 #: admin/systems/services/kolab/class_serviceKolab.inc:194
 #: admin/systems/services/kolab/class_serviceKolab.inc:195
 msgid "Accept mail from other domains over non-authenticated SMTP"
-msgstr "pÅ™ijÃmat i zprÃ¡vy, kterÃ© pÅ™ichÃ¡zejÃ z jinÃ½ch domÃ©n, pÅ™es neovÄ›Å™enÃ© SMTP servery"
+msgstr "PÅ™ijÃmat i zprÃ¡vy, kterÃ© pÅ™ichÃ¡zejÃ z jinÃ½ch domÃ©n, pÅ™es neovÄ›Å™enÃ© SMTP servery"
 
 #: admin/systems/services/kolab/class_serviceKolab.inc:269
 msgid "Internal error"
-msgstr "vnitÅ™nÃ chyba"
+msgstr "VnitÅ™nÃ chyba"
 
 #: admin/systems/services/kolab/class_serviceKolab.inc:269
 msgid "Kolab account does not exist!"
@@ -235,7 +232,7 @@ msgstr "ÃºÄet neexistuje v Kolabu!"
 
 #: admin/systems/services/kolab/class_serviceKolab.inc:273
 msgid "Error"
-msgstr "chyba"
+msgstr "Chyba"
 
 #: admin/systems/services/kolab/class_serviceKolab.inc:273
 msgid "hostname"
@@ -247,7 +244,7 @@ msgstr "Kolab"
 
 #: personal/kolab/class_kolabAccount.inc:83
 msgid "Kolab account settings"
-msgstr "nastavenÃ ÃºÄtu v Kolab"
+msgstr "NastavenÃ ÃºÄtu v Kolab"
 
 #: personal/kolab/class_kolabAccount.inc:100
 msgid "Kolab account"
@@ -255,7 +252,7 @@ msgstr "ÃºÄet Kolab"
 
 #: personal/kolab/class_kolabAccount.inc:104
 msgid "Delegations"
-msgstr "povÄ›Å™enÃ"
+msgstr "PovÄ›Å™enÃ"
 
 #: personal/kolab/class_kolabAccount.inc:112
 msgid "Mail size"
@@ -275,7 +272,7 @@ msgstr "URL"
 
 #: personal/kolab/class_kolabAccount.inc:130
 msgid "Future"
-msgstr "budoucÃ"
+msgstr "BudoucÃ"
 
 #: personal/kolab/class_kolabAccount.inc:130
 msgid "days"
@@ -286,25 +283,25 @@ msgstr "dny"
 #: personal/kolab/class_kolabAccount.inc:149
 #: personal/kolab/class_kolabAccount.inc:159
 msgid "Invitation policy"
-msgstr "pravidla pro pozvÃ¡nky"
+msgstr "Pravidla pro pozvÃ¡nky"
 
 #: personal/kolab/class_kolabAccount.inc:144
 msgid "Default policy"
-msgstr ""
+msgstr "VÃ½chozÃ zÃ¡sada"
 
 #: personal/kolab/class_kolabAccount.inc:144
 msgid "Default invitation policy"
-msgstr ""
+msgstr "VÃ½chozÃ pravidla pozvÃ¡nek"
 
 #: personal/kolab/class_kolabAccount.inc:146
 #: personal/kolab/class_kolabAccount.inc:155
 msgid "Manual"
-msgstr "ruÄnÃ"
+msgstr "RuÄnÃ"
 
 #: personal/kolab/class_kolabAccount.inc:146
 #: personal/kolab/class_kolabAccount.inc:155
 msgid "Always accept"
-msgstr "vÅ¾dy pÅ™ijmout"
+msgstr "VÅ¾dy pÅ™ijmout"
 
 #: personal/kolab/class_kolabAccount.inc:146
 #: personal/kolab/class_kolabAccount.inc:155
@@ -314,7 +311,7 @@ msgstr "vÅ¾dy odmÃtnout"
 #: personal/kolab/class_kolabAccount.inc:146
 #: personal/kolab/class_kolabAccount.inc:155
 msgid "Reject if conflicts"
-msgstr "odmÃtnout, pokud je v konfliktu"
+msgstr "OdmÃtnout, pokud je v konfliktu"
 
 #: personal/kolab/class_kolabAccount.inc:146
 #: personal/kolab/class_kolabAccount.inc:155
@@ -327,53 +324,53 @@ msgstr "e-mailovÃ¡ adresa"
 
 #: personal/kolab/class_kolabAccount.inc:153
 msgid "policy for this mail address"
-msgstr ""
+msgstr "Sada pravidel pro tuto e-mailovou adresu"
 
 #: personal/mail/kolab/class_mail-methods-kolab.inc:148
 #: personal/mail/kolab/class_mail-methods-kolab.inc:156
 #: personal/mail/kolab/class_mail-methods-kolab.inc:157
 msgid "Unspecified"
-msgstr "neurÄeno"
+msgstr "NeurÄeno"
 
 #: personal/mail/kolab/class_mail-methods-kolab.inc:149
 msgid "Mails"
-msgstr "zprÃ¡vy"
+msgstr "ZprÃ¡vy"
 
 #: personal/mail/kolab/class_mail-methods-kolab.inc:150
 msgid "Tasks"
-msgstr "Ãºkoly"
+msgstr "Ãškoly"
 
 #: personal/mail/kolab/class_mail-methods-kolab.inc:151
 msgid "Journals"
-msgstr "denÃky"
+msgstr "DenÃky"
 
 #: personal/mail/kolab/class_mail-methods-kolab.inc:152
 msgid "Calendar"
-msgstr "kalendÃ¡Å™"
+msgstr "KalendÃ¡Å™"
 
 #: personal/mail/kolab/class_mail-methods-kolab.inc:153
 msgid "Contacts"
-msgstr "kontakty"
+msgstr "Kontakty"
 
 #: personal/mail/kolab/class_mail-methods-kolab.inc:154
 msgid "Notes"
-msgstr "poznÃ¡mky"
+msgstr "PoznÃ¡mky"
 
 #: personal/mail/kolab/class_mail-methods-kolab.inc:158
 msgid "Inbox"
-msgstr "pÅ™ÃchozÃ"
+msgstr "PÅ™ÃchozÃ"
 
 #: personal/mail/kolab/class_mail-methods-kolab.inc:159
 msgid "Drafts"
-msgstr "rozepsanÃ©"
+msgstr "RozepsanÃ©"
 
 #: personal/mail/kolab/class_mail-methods-kolab.inc:160
 msgid "Sent"
-msgstr "odeslanÃ©"
+msgstr "OdeslanÃ©"
 
 #: personal/mail/kolab/class_mail-methods-kolab.inc:161
 msgid "SPAM"
-msgstr "nevyÅ¾Ã¡danÃ¡ poÅ¡ta (SPAM)"
+msgstr "NevyÅ¾Ã¡danÃ¡ poÅ¡ta"
 
 #: personal/mail/kolab/class_mail-methods-kolab.inc:163
 #: personal/mail/kolab/class_mail-methods-kolab.inc:164
@@ -381,7 +378,7 @@ msgstr "nevyÅ¾Ã¡danÃ¡ poÅ¡ta (SPAM)"
 #: personal/mail/kolab/class_mail-methods-kolab.inc:166
 #: personal/mail/kolab/class_mail-methods-kolab.inc:167
 msgid "Default"
-msgstr "vÃ½chozÃ"
+msgstr "VÃ½chozÃ"
 
 #: personal/mail/kolab/class_mail-methods-kolab.inc:182
 msgid ""
@@ -395,19 +392,3 @@ msgstr "ÄŒekÃ¡ se na Kolab, aÅ¾ odebere nastavenÃ e-mailuâ€¦"
 #: personal/mail/kolab/class_mail-methods-kolab.inc:282
 msgid "Please remove the mail settings first!"
 msgstr "Nejprve prosÃm odeberte nastavenÃ© e-mailu!"
-
-#: admin/ogroups/kolab/mail.tpl.c:2
-msgid "Mail distribution list"
-msgstr "distribuÄnÃ seznam"
-
-#: admin/ogroups/kolab/mail.tpl.c:5
-msgid "Primary address"
-msgstr "hlavnÃ adresa"
-
-#: admin/ogroups/kolab/mail.tpl.c:8
-msgid "Primary mail address for this distribution list"
-msgstr "hlavnÃ e-mailovÃ¡ adresa pro tento distribuÄnÃ seznam"
-
-#: admin/ogroups/kolab/paste_mail.tpl.c:5
-msgid "Please enter a mail address"
-msgstr "zadejte prosÃm e-mailovou adresu"
diff --git a/kolab/locale/de/fusiondirectory.po b/kolab/locale/de/fusiondirectory.po
index f5c5f5084e56fa0baea77c87b11602f41c7f5ec9..3454cf808f9a33f8f9134e260f081337132de85b 100644
--- a/kolab/locale/de/fusiondirectory.po
+++ b/kolab/locale/de/fusiondirectory.po
@@ -3,61 +3,58 @@
 # This file is distributed under the same license as the PACKAGE package.
 # 
 # Translators:
-# Maik Wagner <maikwagner@yahoo.com>, 2014
-#  Stefan Koehler <stefan.koehler@GONICUS.de>, 2005
 msgid ""
 msgstr ""
-"Project-Id-Version: FusionDirectory-108\n"
+"Project-Id-Version: FusionDirectory-109\n"
 "Report-Msgid-Bugs-To: documentation@lists.fusiondirectory.org\n"
-"POT-Creation-Date: 2015-03-19 21:45+0100\n"
+"POT-Creation-Date: 2014-12-15 17:47+0100\n"
 "PO-Revision-Date: 2015-02-25 16:51+0000\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>\n"
-"Language-Team: German (http://www.transifex.com/projects/p/FusionDirectory-108/language/de/)\n"
+"Language-Team: German (http://www.transifex.com/projects/p/FusionDirectory-109/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/ogroups/kolab/class_mailogroup.inc:70
+#: admin/ogroups/kolab/class_mailogroup.inc:37
+msgid "Mail"
+msgstr "Mail"
+
+#: admin/ogroups/kolab/class_mailogroup.inc:38
+msgid "Mail group"
+msgstr "Mail-Gruppe"
+
+#: admin/ogroups/kolab/class_mailogroup.inc:45
+#: admin/ogroups/kolab/class_mailogroup.inc:118
+#: admin/ogroups/kolab/class_mailogroup.inc:125
+msgid "Mail address"
+msgstr "Mail-Adresse"
+
+#: admin/ogroups/kolab/class_mailogroup.inc:82
 msgid "Remove mail account"
 msgstr "Mail-Konto entfernen"
 
-#: admin/ogroups/kolab/class_mailogroup.inc:71
-#: admin/ogroups/kolab/class_mailogroup.inc:74
+#: admin/ogroups/kolab/class_mailogroup.inc:83
+#: admin/ogroups/kolab/class_mailogroup.inc:86
 msgid "mail group"
 msgstr "Mail-Gruppe"
 
-#: admin/ogroups/kolab/class_mailogroup.inc:73
+#: admin/ogroups/kolab/class_mailogroup.inc:85
 msgid "Create mail account"
 msgstr "Neues Mail-Konto erzeugen"
 
-#: admin/ogroups/kolab/class_mailogroup.inc:106
-#: admin/ogroups/kolab/class_mailogroup.inc:113
-#: admin/ogroups/kolab/class_mailogroup.inc:190
-msgid "Mail address"
-msgstr "Mail-Adresse"
-
-#: admin/ogroups/kolab/class_mailogroup.inc:106
+#: admin/ogroups/kolab/class_mailogroup.inc:118
 msgid "your-name@your-domain.com"
 msgstr "Ihr-Name@ihre-domain.com"
 
-#: admin/ogroups/kolab/class_mailogroup.inc:140
-#: admin/ogroups/kolab/class_mailogroup.inc:177
+#: admin/ogroups/kolab/class_mailogroup.inc:152
+#: admin/ogroups/kolab/class_mailogroup.inc:189
 #: admin/systems/services/kolab/class_serviceKolab.inc:282
 #: admin/systems/services/kolab/class_serviceKolab.inc:293
 msgid "LDAP error"
 msgstr "LDAP-Fehler"
 
-#: admin/ogroups/kolab/class_mailogroup.inc:184
-#: admin/ogroups/kolab/paste_mail.tpl.c:2
-msgid "Mail"
-msgstr "Mail"
-
-#: admin/ogroups/kolab/class_mailogroup.inc:185
-msgid "Mail group"
-msgstr "Mail-Gruppe"
-
 #: admin/systems/services/kolab/class_serviceKolab.inc:29
 msgid "Enable MX lookup for relayhost"
 msgstr "Aktiviere MX lookup fÃ¼r relayhost"
@@ -380,7 +377,7 @@ msgstr "Werbung"
 #: personal/mail/kolab/class_mail-methods-kolab.inc:166
 #: personal/mail/kolab/class_mail-methods-kolab.inc:167
 msgid "Default"
-msgstr "Standard"
+msgstr "Vorgabe"
 
 #: personal/mail/kolab/class_mail-methods-kolab.inc:182
 msgid ""
@@ -394,19 +391,3 @@ msgstr "Warte darauf, daÃŸ Kolab die Mail-Einstellungen entfernt..."
 #: personal/mail/kolab/class_mail-methods-kolab.inc:282
 msgid "Please remove the mail settings first!"
 msgstr "Bitte entfernen Sie zunÃ¤chst die Mail-Einstellungen!"
-
-#: admin/ogroups/kolab/mail.tpl.c:2
-msgid "Mail distribution list"
-msgstr "Mail-Verteilerliste"
-
-#: admin/ogroups/kolab/mail.tpl.c:5
-msgid "Primary address"
-msgstr "PrimÃ¤re Adresse"
-
-#: admin/ogroups/kolab/mail.tpl.c:8
-msgid "Primary mail address for this distribution list"
-msgstr "PrimÃ¤re Mail-Adresse der Verteilerliste"
-
-#: admin/ogroups/kolab/paste_mail.tpl.c:5
-msgid "Please enter a mail address"
-msgstr "Bitte geben Sie eine Mail-Adresse ein"
diff --git a/kolab/locale/el_GR/fusiondirectory.po b/kolab/locale/el_GR/fusiondirectory.po
new file mode 100644
index 0000000000000000000000000000000000000000..b9dc7859b7b9539a24c2cd26b06f18f5a63315ab
--- /dev/null
+++ b/kolab/locale/el_GR/fusiondirectory.po
@@ -0,0 +1,393 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR FusionDirectory Project
+# This file is distributed under the same license as the PACKAGE package.
+# 
+# Translators:
+msgid ""
+msgstr ""
+"Project-Id-Version: FusionDirectory-109\n"
+"Report-Msgid-Bugs-To: documentation@lists.fusiondirectory.org\n"
+"POT-Creation-Date: 2014-12-15 17:47+0100\n"
+"PO-Revision-Date: 2015-05-30 11:45+0000\n"
+"Last-Translator: Benoit Mortier <benoit.mortier@opensides.be>\n"
+"Language-Team: Greek (Greece) (http://www.transifex.com/projects/p/FusionDirectory-109/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/ogroups/kolab/class_mailogroup.inc:37
+msgid "Mail"
+msgstr ""
+
+#: admin/ogroups/kolab/class_mailogroup.inc:38
+msgid "Mail group"
+msgstr ""
+
+#: admin/ogroups/kolab/class_mailogroup.inc:45
+#: admin/ogroups/kolab/class_mailogroup.inc:118
+#: admin/ogroups/kolab/class_mailogroup.inc:125
+msgid "Mail address"
+msgstr ""
+
+#: admin/ogroups/kolab/class_mailogroup.inc:82
+msgid "Remove mail account"
+msgstr ""
+
+#: admin/ogroups/kolab/class_mailogroup.inc:83
+#: admin/ogroups/kolab/class_mailogroup.inc:86
+msgid "mail group"
+msgstr ""
+
+#: admin/ogroups/kolab/class_mailogroup.inc:85
+msgid "Create mail account"
+msgstr ""
+
+#: admin/ogroups/kolab/class_mailogroup.inc:118
+msgid "your-name@your-domain.com"
+msgstr ""
+
+#: admin/ogroups/kolab/class_mailogroup.inc:152
+#: admin/ogroups/kolab/class_mailogroup.inc:189
+#: admin/systems/services/kolab/class_serviceKolab.inc:282
+#: admin/systems/services/kolab/class_serviceKolab.inc:293
+msgid "LDAP error"
+msgstr ""
+
+#: admin/systems/services/kolab/class_serviceKolab.inc:29
+msgid "Enable MX lookup for relayhost"
+msgstr ""
+
+#: admin/systems/services/kolab/class_serviceKolab.inc:32
+msgid "Relay host"
+msgstr ""
+
+#: admin/systems/services/kolab/class_serviceKolab.inc:32
+#: admin/systems/services/kolab/class_serviceKolab.inc:186
+msgid "Host used to relay mails"
+msgstr ""
+
+#: admin/systems/services/kolab/class_serviceKolab.inc:67
+#: admin/systems/services/kolab/class_serviceKolab.inc:68
+msgid "Kolab mail service"
+msgstr ""
+
+#: admin/systems/services/kolab/class_serviceKolab.inc:68
+#: admin/systems/services/kolab/class_serviceKolab.inc:104
+msgid "Services"
+msgstr ""
+
+#: admin/systems/services/kolab/class_serviceKolab.inc:82
+msgid "Informations"
+msgstr ""
+
+#: admin/systems/services/kolab/class_serviceKolab.inc:88
+msgid "Postfix mydomain"
+msgstr ""
+
+#: admin/systems/services/kolab/class_serviceKolab.inc:88
+msgid "Postfix domain name"
+msgstr ""
+
+#: admin/systems/services/kolab/class_serviceKolab.inc:92
+msgid "Cyrus admins"
+msgstr ""
+
+#: admin/systems/services/kolab/class_serviceKolab.inc:92
+msgid "Cyrus admins for kolab server"
+msgstr ""
+
+#: admin/systems/services/kolab/class_serviceKolab.inc:97
+msgid "Mail domains"
+msgstr ""
+
+#: admin/systems/services/kolab/class_serviceKolab.inc:97
+msgid "Postfix mydestination"
+msgstr ""
+
+#: admin/systems/services/kolab/class_serviceKolab.inc:107
+msgid "POP3 service"
+msgstr ""
+
+#: admin/systems/services/kolab/class_serviceKolab.inc:107
+msgid "Enable POP3 service"
+msgstr ""
+
+#: admin/systems/services/kolab/class_serviceKolab.inc:111
+msgid "POP3/SSL service"
+msgstr ""
+
+#: admin/systems/services/kolab/class_serviceKolab.inc:111
+msgid "Enable POP3/SSL service"
+msgstr ""
+
+#: admin/systems/services/kolab/class_serviceKolab.inc:115
+msgid "IMAP service"
+msgstr ""
+
+#: admin/systems/services/kolab/class_serviceKolab.inc:115
+msgid "Enable IMAP service"
+msgstr ""
+
+#: admin/systems/services/kolab/class_serviceKolab.inc:119
+msgid "IMAP/SSL service"
+msgstr ""
+
+#: admin/systems/services/kolab/class_serviceKolab.inc:119
+msgid "Enable IMAP/SSL service"
+msgstr ""
+
+#: admin/systems/services/kolab/class_serviceKolab.inc:123
+msgid "Sieve service"
+msgstr ""
+
+#: admin/systems/services/kolab/class_serviceKolab.inc:123
+msgid "Enable Sieve service"
+msgstr ""
+
+#: admin/systems/services/kolab/class_serviceKolab.inc:127
+msgid "FTP FreeBusy service (legacy)"
+msgstr ""
+
+#: admin/systems/services/kolab/class_serviceKolab.inc:128
+msgid "FTP FreeBusy service (legacy, not interoperable with Kolab2 FreeBusy)"
+msgstr ""
+
+#: admin/systems/services/kolab/class_serviceKolab.inc:132
+msgid "HTTP FreeBusy service (legacy)"
+msgstr ""
+
+#: admin/systems/services/kolab/class_serviceKolab.inc:136
+msgid "Amavis email scanning"
+msgstr ""
+
+#: admin/systems/services/kolab/class_serviceKolab.inc:136
+msgid "Amavis email scanning (virus/spam)"
+msgstr ""
+
+#: admin/systems/services/kolab/class_serviceKolab.inc:142
+msgid "Quota settings"
+msgstr ""
+
+#: admin/systems/services/kolab/class_serviceKolab.inc:145
+msgid "Quota occupation limit before warning users (%)"
+msgstr ""
+
+#: admin/systems/services/kolab/class_serviceKolab.inc:146
+#, php-format
+msgid "Warn users when using more than X% of their mail quota"
+msgstr ""
+
+#: admin/systems/services/kolab/class_serviceKolab.inc:154
+msgid "Free/Busy settings"
+msgstr ""
+
+#: admin/systems/services/kolab/class_serviceKolab.inc:157
+#: admin/systems/services/kolab/class_serviceKolab.inc:158
+msgid "Allow unauthenticated downloading of Free/Busy information"
+msgstr ""
+
+#: admin/systems/services/kolab/class_serviceKolab.inc:162
+msgid "Number of days to include when creating free/busy lists"
+msgstr ""
+
+#: admin/systems/services/kolab/class_serviceKolab.inc:163
+msgid "Include data from X days in the past when creating free/busy lists"
+msgstr ""
+
+#: admin/systems/services/kolab/class_serviceKolab.inc:171
+msgid "SMTP privileged networks"
+msgstr ""
+
+#: admin/systems/services/kolab/class_serviceKolab.inc:174
+msgid "Hosts/networks allowed to relay"
+msgstr ""
+
+#: admin/systems/services/kolab/class_serviceKolab.inc:175
+msgid "Hosts/networks allowed to relay (multiple values comma-seperated)"
+msgstr ""
+
+#: admin/systems/services/kolab/class_serviceKolab.inc:183
+msgid "SMTP smarthost/relayhost"
+msgstr ""
+
+#: admin/systems/services/kolab/class_serviceKolab.inc:191
+msgid "Accept Internet Mail"
+msgstr ""
+
+#: admin/systems/services/kolab/class_serviceKolab.inc:194
+#: admin/systems/services/kolab/class_serviceKolab.inc:195
+msgid "Accept mail from other domains over non-authenticated SMTP"
+msgstr ""
+
+#: admin/systems/services/kolab/class_serviceKolab.inc:269
+msgid "Internal error"
+msgstr ""
+
+#: admin/systems/services/kolab/class_serviceKolab.inc:269
+msgid "Kolab account does not exist!"
+msgstr ""
+
+#: admin/systems/services/kolab/class_serviceKolab.inc:273
+msgid "Error"
+msgstr ""
+
+#: admin/systems/services/kolab/class_serviceKolab.inc:273
+msgid "hostname"
+msgstr ""
+
+#: personal/kolab/class_kolabAccount.inc:82
+msgid "Kolab"
+msgstr ""
+
+#: personal/kolab/class_kolabAccount.inc:83
+msgid "Kolab account settings"
+msgstr ""
+
+#: personal/kolab/class_kolabAccount.inc:100
+msgid "Kolab account"
+msgstr ""
+
+#: personal/kolab/class_kolabAccount.inc:104
+msgid "Delegations"
+msgstr ""
+
+#: personal/kolab/class_kolabAccount.inc:112
+msgid "Mail size"
+msgstr ""
+
+#: personal/kolab/class_kolabAccount.inc:115
+msgid "No mail size restriction for this account"
+msgstr ""
+
+#: personal/kolab/class_kolabAccount.inc:122
+msgid "Free Busy information"
+msgstr ""
+
+#: personal/kolab/class_kolabAccount.inc:125
+msgid "URL"
+msgstr ""
+
+#: personal/kolab/class_kolabAccount.inc:130
+msgid "Future"
+msgstr ""
+
+#: personal/kolab/class_kolabAccount.inc:130
+msgid "days"
+msgstr ""
+
+#: personal/kolab/class_kolabAccount.inc:138
+#: personal/kolab/class_kolabAccount.inc:141
+#: personal/kolab/class_kolabAccount.inc:149
+#: personal/kolab/class_kolabAccount.inc:159
+msgid "Invitation policy"
+msgstr ""
+
+#: personal/kolab/class_kolabAccount.inc:144
+msgid "Default policy"
+msgstr ""
+
+#: personal/kolab/class_kolabAccount.inc:144
+msgid "Default invitation policy"
+msgstr ""
+
+#: personal/kolab/class_kolabAccount.inc:146
+#: personal/kolab/class_kolabAccount.inc:155
+msgid "Manual"
+msgstr ""
+
+#: personal/kolab/class_kolabAccount.inc:146
+#: personal/kolab/class_kolabAccount.inc:155
+msgid "Always accept"
+msgstr ""
+
+#: personal/kolab/class_kolabAccount.inc:146
+#: personal/kolab/class_kolabAccount.inc:155
+msgid "Always reject"
+msgstr ""
+
+#: personal/kolab/class_kolabAccount.inc:146
+#: personal/kolab/class_kolabAccount.inc:155
+msgid "Reject if conflicts"
+msgstr ""
+
+#: personal/kolab/class_kolabAccount.inc:146
+#: personal/kolab/class_kolabAccount.inc:155
+msgid "Manual if conflicts"
+msgstr ""
+
+#: personal/kolab/class_kolabAccount.inc:152
+msgid "mail address"
+msgstr ""
+
+#: personal/kolab/class_kolabAccount.inc:153
+msgid "policy for this mail address"
+msgstr ""
+
+#: personal/mail/kolab/class_mail-methods-kolab.inc:148
+#: personal/mail/kolab/class_mail-methods-kolab.inc:156
+#: personal/mail/kolab/class_mail-methods-kolab.inc:157
+msgid "Unspecified"
+msgstr ""
+
+#: personal/mail/kolab/class_mail-methods-kolab.inc:149
+msgid "Mails"
+msgstr ""
+
+#: personal/mail/kolab/class_mail-methods-kolab.inc:150
+msgid "Tasks"
+msgstr ""
+
+#: personal/mail/kolab/class_mail-methods-kolab.inc:151
+msgid "Journals"
+msgstr ""
+
+#: personal/mail/kolab/class_mail-methods-kolab.inc:152
+msgid "Calendar"
+msgstr ""
+
+#: personal/mail/kolab/class_mail-methods-kolab.inc:153
+msgid "Contacts"
+msgstr ""
+
+#: personal/mail/kolab/class_mail-methods-kolab.inc:154
+msgid "Notes"
+msgstr ""
+
+#: personal/mail/kolab/class_mail-methods-kolab.inc:158
+msgid "Inbox"
+msgstr ""
+
+#: personal/mail/kolab/class_mail-methods-kolab.inc:159
+msgid "Drafts"
+msgstr ""
+
+#: personal/mail/kolab/class_mail-methods-kolab.inc:160
+msgid "Sent"
+msgstr ""
+
+#: personal/mail/kolab/class_mail-methods-kolab.inc:161
+msgid "SPAM"
+msgstr ""
+
+#: personal/mail/kolab/class_mail-methods-kolab.inc:163
+#: personal/mail/kolab/class_mail-methods-kolab.inc:164
+#: personal/mail/kolab/class_mail-methods-kolab.inc:165
+#: personal/mail/kolab/class_mail-methods-kolab.inc:166
+#: personal/mail/kolab/class_mail-methods-kolab.inc:167
+msgid "Default"
+msgstr ""
+
+#: personal/mail/kolab/class_mail-methods-kolab.inc:182
+msgid ""
+"Mail settings cannot be removed while there are delegations configured!"
+msgstr ""
+
+#: personal/mail/kolab/class_mail-methods-kolab.inc:279
+msgid "Waiting for kolab to remove mail properties..."
+msgstr ""
+
+#: personal/mail/kolab/class_mail-methods-kolab.inc:282
+msgid "Please remove the mail settings first!"
+msgstr ""
diff --git a/kolab/locale/en/fusiondirectory.po b/kolab/locale/en/fusiondirectory.po
index 6d48ca64293452d04d0c291b7e51f9560b0bca3a..103b4b0eb64de0d54e1942977d557799c0888ea5 100644
--- a/kolab/locale/en/fusiondirectory.po
+++ b/kolab/locale/en/fusiondirectory.po
@@ -6,56 +6,56 @@
 #, fuzzy
 msgid ""
 msgstr ""
-"Project-Id-Version: PACKAGE VERSION\n"
-"Report-Msgid-Bugs-To: documentation@lists.fusiondirectory.org\n"
-"POT-Creation-Date: 2015-03-31 11:49+0200\n"
+"Project-Id-Version: FusionDirectory VERSION\n"
+"Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
+"POT-Creation-Date: 2015-05-30 15:30+0200\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
-"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
-"Language-Team: LANGUAGE <LL@li.org>\n"
-"Language: \n"
+"Last-Translator: FusionDirectory project <contact@fusiondirectory.org>\n"
+"Language-Team: English\n"
+"Language: en\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: admin/ogroups/kolab/class_mailogroup.inc:70
+#: admin/ogroups/kolab/class_mailogroup.inc:37
+#: admin/ogroups/kolab/paste_mail.tpl.c:2
+msgid "Mail"
+msgstr ""
+
+#: admin/ogroups/kolab/class_mailogroup.inc:38
+msgid "Mail group"
+msgstr ""
+
+#: admin/ogroups/kolab/class_mailogroup.inc:45
+#: admin/ogroups/kolab/class_mailogroup.inc:118
+#: admin/ogroups/kolab/class_mailogroup.inc:125
+msgid "Mail address"
+msgstr ""
+
+#: admin/ogroups/kolab/class_mailogroup.inc:82
 msgid "Remove mail account"
 msgstr ""
 
-#: admin/ogroups/kolab/class_mailogroup.inc:71
-#: admin/ogroups/kolab/class_mailogroup.inc:74
+#: admin/ogroups/kolab/class_mailogroup.inc:83
+#: admin/ogroups/kolab/class_mailogroup.inc:86
 msgid "mail group"
 msgstr ""
 
-#: admin/ogroups/kolab/class_mailogroup.inc:73
+#: admin/ogroups/kolab/class_mailogroup.inc:85
 msgid "Create mail account"
 msgstr ""
 
-#: admin/ogroups/kolab/class_mailogroup.inc:106
-#: admin/ogroups/kolab/class_mailogroup.inc:113
-#: admin/ogroups/kolab/class_mailogroup.inc:190
-msgid "Mail address"
-msgstr ""
-
-#: admin/ogroups/kolab/class_mailogroup.inc:106
+#: admin/ogroups/kolab/class_mailogroup.inc:118
 msgid "your-name@your-domain.com"
 msgstr ""
 
-#: admin/ogroups/kolab/class_mailogroup.inc:140
-#: admin/ogroups/kolab/class_mailogroup.inc:177
+#: admin/ogroups/kolab/class_mailogroup.inc:152
+#: admin/ogroups/kolab/class_mailogroup.inc:189
 #: admin/systems/services/kolab/class_serviceKolab.inc:282
 #: admin/systems/services/kolab/class_serviceKolab.inc:293
 msgid "LDAP error"
 msgstr ""
 
-#: admin/ogroups/kolab/class_mailogroup.inc:184
-#: admin/ogroups/kolab/paste_mail.tpl.c:2
-msgid "Mail"
-msgstr ""
-
-#: admin/ogroups/kolab/class_mailogroup.inc:185
-msgid "Mail group"
-msgstr ""
-
 #: admin/systems/services/kolab/class_serviceKolab.inc:29
 msgid "Enable MX lookup for relayhost"
 msgstr ""
diff --git a/kolab/locale/es/fusiondirectory.po b/kolab/locale/es/fusiondirectory.po
index 18a6f2d7e91b22d2aeba3f8a30addb449c076eee..f9900c4c6d5a14bd2c0f1892faee23c75708cb8c 100644
--- a/kolab/locale/es/fusiondirectory.po
+++ b/kolab/locale/es/fusiondirectory.po
@@ -5,57 +5,56 @@
 # Translators:
 msgid ""
 msgstr ""
-"Project-Id-Version: FusionDirectory-108\n"
+"Project-Id-Version: FusionDirectory-109\n"
 "Report-Msgid-Bugs-To: documentation@lists.fusiondirectory.org\n"
-"POT-Creation-Date: 2015-03-19 21:45+0100\n"
+"POT-Creation-Date: 2014-12-15 17:47+0100\n"
 "PO-Revision-Date: 2015-02-25 16:51+0000\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>\n"
-"Language-Team: Spanish (http://www.transifex.com/projects/p/FusionDirectory-108/language/es/)\n"
+"Language-Team: Spanish (http://www.transifex.com/projects/p/FusionDirectory-109/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/ogroups/kolab/class_mailogroup.inc:70
+#: admin/ogroups/kolab/class_mailogroup.inc:37
+msgid "Mail"
+msgstr "Correo ElectrÃ³nico"
+
+#: admin/ogroups/kolab/class_mailogroup.inc:38
+msgid "Mail group"
+msgstr "Grupo de correo"
+
+#: admin/ogroups/kolab/class_mailogroup.inc:45
+#: admin/ogroups/kolab/class_mailogroup.inc:118
+#: admin/ogroups/kolab/class_mailogroup.inc:125
+msgid "Mail address"
+msgstr "DirecciÃ³n correo electrÃ³nico"
+
+#: admin/ogroups/kolab/class_mailogroup.inc:82
 msgid "Remove mail account"
 msgstr "Eliminar cuenta de correo"
 
-#: admin/ogroups/kolab/class_mailogroup.inc:71
-#: admin/ogroups/kolab/class_mailogroup.inc:74
+#: admin/ogroups/kolab/class_mailogroup.inc:83
+#: admin/ogroups/kolab/class_mailogroup.inc:86
 msgid "mail group"
 msgstr "grupo de correo"
 
-#: admin/ogroups/kolab/class_mailogroup.inc:73
+#: admin/ogroups/kolab/class_mailogroup.inc:85
 msgid "Create mail account"
 msgstr "Crear cuenta de correo"
 
-#: admin/ogroups/kolab/class_mailogroup.inc:106
-#: admin/ogroups/kolab/class_mailogroup.inc:113
-#: admin/ogroups/kolab/class_mailogroup.inc:190
-msgid "Mail address"
-msgstr "DirecciÃ³n correo electrÃ³nico"
-
-#: admin/ogroups/kolab/class_mailogroup.inc:106
+#: admin/ogroups/kolab/class_mailogroup.inc:118
 msgid "your-name@your-domain.com"
 msgstr "your-name@your-domain.com"
 
-#: admin/ogroups/kolab/class_mailogroup.inc:140
-#: admin/ogroups/kolab/class_mailogroup.inc:177
+#: admin/ogroups/kolab/class_mailogroup.inc:152
+#: admin/ogroups/kolab/class_mailogroup.inc:189
 #: admin/systems/services/kolab/class_serviceKolab.inc:282
 #: admin/systems/services/kolab/class_serviceKolab.inc:293
 msgid "LDAP error"
 msgstr "Error LDAP"
 
-#: admin/ogroups/kolab/class_mailogroup.inc:184
-#: admin/ogroups/kolab/paste_mail.tpl.c:2
-msgid "Mail"
-msgstr "Correo ElectrÃ³nico"
-
-#: admin/ogroups/kolab/class_mailogroup.inc:185
-msgid "Mail group"
-msgstr "Grupo de correo"
-
 #: admin/systems/services/kolab/class_serviceKolab.inc:29
 msgid "Enable MX lookup for relayhost"
 msgstr "Permitir bÃºsquedas MX para los relayhost"
@@ -224,7 +223,7 @@ msgstr "Aceptar correo desde otros dominios que no usen autentificaciÃ³n SMTP"
 
 #: admin/systems/services/kolab/class_serviceKolab.inc:269
 msgid "Internal error"
-msgstr "Error interno"
+msgstr "error interno"
 
 #: admin/systems/services/kolab/class_serviceKolab.inc:269
 msgid "Kolab account does not exist!"
@@ -392,19 +391,3 @@ msgstr "Esperando que Kolab elimine las caracterÃsticas de correo..."
 #: personal/mail/kolab/class_mail-methods-kolab.inc:282
 msgid "Please remove the mail settings first!"
 msgstr "Â¡Por favor elimine las caracterÃsticas de correo primero!"
-
-#: admin/ogroups/kolab/mail.tpl.c:2
-msgid "Mail distribution list"
-msgstr "Lista de distribuciÃ³n de correo"
-
-#: admin/ogroups/kolab/mail.tpl.c:5
-msgid "Primary address"
-msgstr "Cuenta Principal"
-
-#: admin/ogroups/kolab/mail.tpl.c:8
-msgid "Primary mail address for this distribution list"
-msgstr "DirecciÃ³n de correo primaria para esta lista de distribuciÃ³n"
-
-#: admin/ogroups/kolab/paste_mail.tpl.c:5
-msgid "Please enter a mail address"
-msgstr "Por favor introduzca una direcciÃ³n de correo"
diff --git a/kolab/locale/es_VE/fusiondirectory.po b/kolab/locale/es_VE/fusiondirectory.po
index a13f577dda8e7ff4abe6071c6404b8859febc3ee..6089ee1ed54d89991aaa4d35a55f78fed52e7b65 100644
--- a/kolab/locale/es_VE/fusiondirectory.po
+++ b/kolab/locale/es_VE/fusiondirectory.po
@@ -5,56 +5,55 @@
 # Translators:
 msgid ""
 msgstr ""
-"Project-Id-Version: FusionDirectory-108\n"
+"Project-Id-Version: FusionDirectory-109\n"
 "Report-Msgid-Bugs-To: documentation@lists.fusiondirectory.org\n"
-"POT-Creation-Date: 2015-03-19 21:45+0100\n"
+"POT-Creation-Date: 2014-12-15 17:47+0100\n"
 "PO-Revision-Date: 2015-02-25 16:51+0000\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>\n"
-"Language-Team: Spanish (Venezuela) (http://www.transifex.com/projects/p/FusionDirectory-108/language/es_VE/)\n"
+"Language-Team: Spanish (Venezuela) (http://www.transifex.com/projects/p/FusionDirectory-109/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/ogroups/kolab/class_mailogroup.inc:70
+#: admin/ogroups/kolab/class_mailogroup.inc:37
+msgid "Mail"
+msgstr "Correo ElectrÃ³nico"
+
+#: admin/ogroups/kolab/class_mailogroup.inc:38
+msgid "Mail group"
+msgstr "Grupo de correo"
+
+#: admin/ogroups/kolab/class_mailogroup.inc:45
+#: admin/ogroups/kolab/class_mailogroup.inc:118
+#: admin/ogroups/kolab/class_mailogroup.inc:125
+msgid "Mail address"
+msgstr "DirecciÃ³n correo electrÃ³nico"
+
+#: admin/ogroups/kolab/class_mailogroup.inc:82
 msgid "Remove mail account"
 msgstr "Eliminar cuenta de correo"
 
-#: admin/ogroups/kolab/class_mailogroup.inc:71
-#: admin/ogroups/kolab/class_mailogroup.inc:74
+#: admin/ogroups/kolab/class_mailogroup.inc:83
+#: admin/ogroups/kolab/class_mailogroup.inc:86
 msgid "mail group"
 msgstr "grupo de correo"
 
-#: admin/ogroups/kolab/class_mailogroup.inc:73
+#: admin/ogroups/kolab/class_mailogroup.inc:85
 msgid "Create mail account"
 msgstr "Crear cuenta de correo"
 
-#: admin/ogroups/kolab/class_mailogroup.inc:106
-#: admin/ogroups/kolab/class_mailogroup.inc:113
-#: admin/ogroups/kolab/class_mailogroup.inc:190
-msgid "Mail address"
-msgstr "DirecciÃ³n correo electrÃ³nico"
-
-#: admin/ogroups/kolab/class_mailogroup.inc:106
+#: admin/ogroups/kolab/class_mailogroup.inc:118
 msgid "your-name@your-domain.com"
 msgstr "your-name@your-domain.com"
 
-#: admin/ogroups/kolab/class_mailogroup.inc:140
-#: admin/ogroups/kolab/class_mailogroup.inc:177
+#: admin/ogroups/kolab/class_mailogroup.inc:152
+#: admin/ogroups/kolab/class_mailogroup.inc:189
 #: admin/systems/services/kolab/class_serviceKolab.inc:282
 #: admin/systems/services/kolab/class_serviceKolab.inc:293
 msgid "LDAP error"
-msgstr "Error LDAP"
-
-#: admin/ogroups/kolab/class_mailogroup.inc:184
-#: admin/ogroups/kolab/paste_mail.tpl.c:2
-msgid "Mail"
-msgstr "Correo ElectrÃ³nico"
-
-#: admin/ogroups/kolab/class_mailogroup.inc:185
-msgid "Mail group"
-msgstr "Grupo de correo"
+msgstr "Error de LDAP"
 
 #: admin/systems/services/kolab/class_serviceKolab.inc:29
 msgid "Enable MX lookup for relayhost"
@@ -224,7 +223,7 @@ msgstr "Aceptar correo desde otros dominios que no usen autentificaciÃ³n SMTP"
 
 #: admin/systems/services/kolab/class_serviceKolab.inc:269
 msgid "Internal error"
-msgstr "Error interno"
+msgstr "error interno"
 
 #: admin/systems/services/kolab/class_serviceKolab.inc:269
 msgid "Kolab account does not exist!"
@@ -392,19 +391,3 @@ msgstr "Esperando que Kolab elimine las caracterÃsticas de correo..."
 #: personal/mail/kolab/class_mail-methods-kolab.inc:282
 msgid "Please remove the mail settings first!"
 msgstr "Â¡Por favor elimine las caracterÃsticas de correo primero!"
-
-#: admin/ogroups/kolab/mail.tpl.c:2
-msgid "Mail distribution list"
-msgstr "Lista de distribuciÃ³n de correo"
-
-#: admin/ogroups/kolab/mail.tpl.c:5
-msgid "Primary address"
-msgstr "Cuenta Principal"
-
-#: admin/ogroups/kolab/mail.tpl.c:8
-msgid "Primary mail address for this distribution list"
-msgstr "DirecciÃ³n de correo primaria para esta lista de distribuciÃ³n"
-
-#: admin/ogroups/kolab/paste_mail.tpl.c:5
-msgid "Please enter a mail address"
-msgstr "Por favor introduzca una direcciÃ³n de correo"
diff --git a/kolab/locale/fa_IR/fusiondirectory.po b/kolab/locale/fa_IR/fusiondirectory.po
index cbdd27f24103f4857832e77a760a4380114293c4..b5be53dac44643b0a172e3ca9b5844dce051de96 100644
--- a/kolab/locale/fa_IR/fusiondirectory.po
+++ b/kolab/locale/fa_IR/fusiondirectory.po
@@ -5,57 +5,56 @@
 # Translators:
 msgid ""
 msgstr ""
-"Project-Id-Version: FusionDirectory-108\n"
+"Project-Id-Version: FusionDirectory-109\n"
 "Report-Msgid-Bugs-To: documentation@lists.fusiondirectory.org\n"
-"POT-Creation-Date: 2015-03-19 21:45+0100\n"
-"PO-Revision-Date: 2015-02-25 15:48+0000\n"
+"POT-Creation-Date: 2014-12-15 17:47+0100\n"
+"PO-Revision-Date: 2014-12-15 16:58+0000\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>\n"
-"Language-Team: Persian (Iran) (http://www.transifex.com/projects/p/FusionDirectory-108/language/fa_IR/)\n"
+"Language-Team: Persian (Iran) (http://www.transifex.com/projects/p/FusionDirectory-109/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/ogroups/kolab/class_mailogroup.inc:70
+#: admin/ogroups/kolab/class_mailogroup.inc:37
+msgid "Mail"
+msgstr ""
+
+#: admin/ogroups/kolab/class_mailogroup.inc:38
+msgid "Mail group"
+msgstr ""
+
+#: admin/ogroups/kolab/class_mailogroup.inc:45
+#: admin/ogroups/kolab/class_mailogroup.inc:118
+#: admin/ogroups/kolab/class_mailogroup.inc:125
+msgid "Mail address"
+msgstr ""
+
+#: admin/ogroups/kolab/class_mailogroup.inc:82
 msgid "Remove mail account"
 msgstr ""
 
-#: admin/ogroups/kolab/class_mailogroup.inc:71
-#: admin/ogroups/kolab/class_mailogroup.inc:74
+#: admin/ogroups/kolab/class_mailogroup.inc:83
+#: admin/ogroups/kolab/class_mailogroup.inc:86
 msgid "mail group"
 msgstr ""
 
-#: admin/ogroups/kolab/class_mailogroup.inc:73
+#: admin/ogroups/kolab/class_mailogroup.inc:85
 msgid "Create mail account"
 msgstr ""
 
-#: admin/ogroups/kolab/class_mailogroup.inc:106
-#: admin/ogroups/kolab/class_mailogroup.inc:113
-#: admin/ogroups/kolab/class_mailogroup.inc:190
-msgid "Mail address"
-msgstr ""
-
-#: admin/ogroups/kolab/class_mailogroup.inc:106
+#: admin/ogroups/kolab/class_mailogroup.inc:118
 msgid "your-name@your-domain.com"
 msgstr ""
 
-#: admin/ogroups/kolab/class_mailogroup.inc:140
-#: admin/ogroups/kolab/class_mailogroup.inc:177
+#: admin/ogroups/kolab/class_mailogroup.inc:152
+#: admin/ogroups/kolab/class_mailogroup.inc:189
 #: admin/systems/services/kolab/class_serviceKolab.inc:282
 #: admin/systems/services/kolab/class_serviceKolab.inc:293
 msgid "LDAP error"
 msgstr "Ø®Ø·Ø§ÛŒ LDAP"
 
-#: admin/ogroups/kolab/class_mailogroup.inc:184
-#: admin/ogroups/kolab/paste_mail.tpl.c:2
-msgid "Mail"
-msgstr ""
-
-#: admin/ogroups/kolab/class_mailogroup.inc:185
-msgid "Mail group"
-msgstr ""
-
 #: admin/systems/services/kolab/class_serviceKolab.inc:29
 msgid "Enable MX lookup for relayhost"
 msgstr ""
@@ -392,19 +391,3 @@ msgstr ""
 #: personal/mail/kolab/class_mail-methods-kolab.inc:282
 msgid "Please remove the mail settings first!"
 msgstr ""
-
-#: admin/ogroups/kolab/mail.tpl.c:2
-msgid "Mail distribution list"
-msgstr ""
-
-#: admin/ogroups/kolab/mail.tpl.c:5
-msgid "Primary address"
-msgstr ""
-
-#: admin/ogroups/kolab/mail.tpl.c:8
-msgid "Primary mail address for this distribution list"
-msgstr ""
-
-#: admin/ogroups/kolab/paste_mail.tpl.c:5
-msgid "Please enter a mail address"
-msgstr ""
diff --git a/kolab/locale/fr/fusiondirectory.po b/kolab/locale/fr/fusiondirectory.po
index 4386a56a73b3a68f93f4fa384b8d851475a863cc..a806e6ed24c0a560893f8594c98fbba61e2e3f6d 100644
--- a/kolab/locale/fr/fusiondirectory.po
+++ b/kolab/locale/fr/fusiondirectory.po
@@ -3,73 +3,65 @@
 # This file is distributed under the same license as the PACKAGE package.
 # 
 # Translators:
-# Benoit Mortier <benoit.mortier@opensides.be>, 2005-2009
-# MCMic, 2014
-# fusiondirectory <contact@fusiondirectory.org>, 2013
-# fusiondirectory <contact@fusiondirectory.org>, 2012
-# fusiondirectory <contact@fusiondirectory.org>, 2012-2013
-# fusiondirectory <contact@fusiondirectory.org>, 2012
-# MCMic, 2014
 msgid ""
 msgstr ""
-"Project-Id-Version: FusionDirectory-108\n"
+"Project-Id-Version: FusionDirectory-109\n"
 "Report-Msgid-Bugs-To: documentation@lists.fusiondirectory.org\n"
-"POT-Creation-Date: 2015-03-19 21:45+0100\n"
+"POT-Creation-Date: 2014-12-15 17:47+0100\n"
 "PO-Revision-Date: 2015-02-25 16:51+0000\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>\n"
-"Language-Team: French (http://www.transifex.com/projects/p/FusionDirectory-108/language/fr/)\n"
+"Language-Team: French (http://www.transifex.com/projects/p/FusionDirectory-109/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/ogroups/kolab/class_mailogroup.inc:70
+#: admin/ogroups/kolab/class_mailogroup.inc:37
+msgid "Mail"
+msgstr "Messagerie"
+
+#: admin/ogroups/kolab/class_mailogroup.inc:38
+msgid "Mail group"
+msgstr "Messagerie de groupe"
+
+#: admin/ogroups/kolab/class_mailogroup.inc:45
+#: admin/ogroups/kolab/class_mailogroup.inc:118
+#: admin/ogroups/kolab/class_mailogroup.inc:125
+msgid "Mail address"
+msgstr "Adresse de messagerie"
+
+#: admin/ogroups/kolab/class_mailogroup.inc:82
 msgid "Remove mail account"
-msgstr "Supprimer le compte de courriel"
+msgstr "Supprimer le compte de messagerie"
 
-#: admin/ogroups/kolab/class_mailogroup.inc:71
-#: admin/ogroups/kolab/class_mailogroup.inc:74
+#: admin/ogroups/kolab/class_mailogroup.inc:83
+#: admin/ogroups/kolab/class_mailogroup.inc:86
 msgid "mail group"
 msgstr "messagerie de groupe"
 
-#: admin/ogroups/kolab/class_mailogroup.inc:73
+#: admin/ogroups/kolab/class_mailogroup.inc:85
 msgid "Create mail account"
 msgstr "CrÃ©er un compte de messagerie"
 
-#: admin/ogroups/kolab/class_mailogroup.inc:106
-#: admin/ogroups/kolab/class_mailogroup.inc:113
-#: admin/ogroups/kolab/class_mailogroup.inc:190
-msgid "Mail address"
-msgstr "Adresse de courriel"
-
-#: admin/ogroups/kolab/class_mailogroup.inc:106
+#: admin/ogroups/kolab/class_mailogroup.inc:118
 msgid "your-name@your-domain.com"
 msgstr "votre-nom@votre-domaine.com"
 
-#: admin/ogroups/kolab/class_mailogroup.inc:140
-#: admin/ogroups/kolab/class_mailogroup.inc:177
+#: admin/ogroups/kolab/class_mailogroup.inc:152
+#: admin/ogroups/kolab/class_mailogroup.inc:189
 #: admin/systems/services/kolab/class_serviceKolab.inc:282
 #: admin/systems/services/kolab/class_serviceKolab.inc:293
 msgid "LDAP error"
 msgstr "Erreur LDAP"
 
-#: admin/ogroups/kolab/class_mailogroup.inc:184
-#: admin/ogroups/kolab/paste_mail.tpl.c:2
-msgid "Mail"
-msgstr "Messagerie"
-
-#: admin/ogroups/kolab/class_mailogroup.inc:185
-msgid "Mail group"
-msgstr "Groupe de courriel"
-
 #: admin/systems/services/kolab/class_serviceKolab.inc:29
 msgid "Enable MX lookup for relayhost"
-msgstr "Activer la recherche MX pour le serveur relais"
+msgstr "VÃ©rification de l'enregistrement MX pour le serveur relais"
 
 #: admin/systems/services/kolab/class_serviceKolab.inc:32
 msgid "Relay host"
-msgstr "HÃ´te relai"
+msgstr "HÃ´te relais"
 
 #: admin/systems/services/kolab/class_serviceKolab.inc:32
 #: admin/systems/services/kolab/class_serviceKolab.inc:186
@@ -79,12 +71,12 @@ msgstr "Machine utilisÃ©e pour relayer les mails"
 #: admin/systems/services/kolab/class_serviceKolab.inc:67
 #: admin/systems/services/kolab/class_serviceKolab.inc:68
 msgid "Kolab mail service"
-msgstr "Service de courriel Kolab"
+msgstr "Service de messagerie Kolab"
 
 #: admin/systems/services/kolab/class_serviceKolab.inc:68
 #: admin/systems/services/kolab/class_serviceKolab.inc:104
 msgid "Services"
-msgstr "Services"
+msgstr "Service"
 
 #: admin/systems/services/kolab/class_serviceKolab.inc:82
 msgid "Informations"
@@ -100,15 +92,15 @@ msgstr "Nom du domaine postfix"
 
 #: admin/systems/services/kolab/class_serviceKolab.inc:92
 msgid "Cyrus admins"
-msgstr "Administrateurs Cyrus"
+msgstr "Administrateur Cyrus"
 
 #: admin/systems/services/kolab/class_serviceKolab.inc:92
 msgid "Cyrus admins for kolab server"
-msgstr "Administrateurs Cyrus pour le serveur Kolab"
+msgstr "Administrateur Cyrus pour le serveur Kolab"
 
 #: admin/systems/services/kolab/class_serviceKolab.inc:97
 msgid "Mail domains"
-msgstr "Domaines de courriel"
+msgstr "Domaines de messagerie"
 
 #: admin/systems/services/kolab/class_serviceKolab.inc:97
 msgid "Postfix mydestination"
@@ -156,23 +148,23 @@ msgstr "Activer le service Sieve"
 
 #: admin/systems/services/kolab/class_serviceKolab.inc:127
 msgid "FTP FreeBusy service (legacy)"
-msgstr "Service FTP FreeBusy (obsolÃ¨te)"
+msgstr "Service d'option de disponibilitÃ© par HTTP (ancien)"
 
 #: admin/systems/services/kolab/class_serviceKolab.inc:128
 msgid "FTP FreeBusy service (legacy, not interoperable with Kolab2 FreeBusy)"
-msgstr "Service FTP FreeBusy (obsolÃ¨te, pas compatible avec Kolab2 FreeBusy)"
+msgstr "Service des options de disponibilitÃ©s par FTP (ancien, pas compatible avec les options de disponibilitÃ©s de Kolab2)"
 
 #: admin/systems/services/kolab/class_serviceKolab.inc:132
 msgid "HTTP FreeBusy service (legacy)"
-msgstr "Service HTTP FreeBusy (obsolÃ¨te)"
+msgstr "Service d'option de disponibilitÃ© par HTTP (ancien)"
 
 #: admin/systems/services/kolab/class_serviceKolab.inc:136
 msgid "Amavis email scanning"
-msgstr "Scan des courriels par Amavis"
+msgstr "Scan des messages par Amavis"
 
 #: admin/systems/services/kolab/class_serviceKolab.inc:136
 msgid "Amavis email scanning (virus/spam)"
-msgstr "Scan des courriels par Amavis (antivirus/antispam)"
+msgstr "Scan des messages par Amavis (antivirus/antispam)"
 
 #: admin/systems/services/kolab/class_serviceKolab.inc:142
 msgid "Quota settings"
@@ -235,7 +227,7 @@ msgstr "Erreur interne"
 
 #: admin/systems/services/kolab/class_serviceKolab.inc:269
 msgid "Kolab account does not exist!"
-msgstr "Le compte Kolab n'existe pasâ€¯!"
+msgstr "Le compte kolab ,'existe pas !"
 
 #: admin/systems/services/kolab/class_serviceKolab.inc:273
 msgid "Error"
@@ -243,7 +235,7 @@ msgstr "Erreur"
 
 #: admin/systems/services/kolab/class_serviceKolab.inc:273
 msgid "hostname"
-msgstr "Nom dâ€™hÃ´te"
+msgstr "Nom de l'hÃ´te"
 
 #: personal/kolab/class_kolabAccount.inc:82
 msgid "Kolab"
@@ -327,11 +319,11 @@ msgstr "Manuel si il y a conflit"
 
 #: personal/kolab/class_kolabAccount.inc:152
 msgid "mail address"
-msgstr "Adresse de courriel"
+msgstr "Adresse de messagerie"
 
 #: personal/kolab/class_kolabAccount.inc:153
 msgid "policy for this mail address"
-msgstr "Politique pour cette adresse de courriel"
+msgstr "Politique pour mon adresse de messagerie"
 
 #: personal/mail/kolab/class_mail-methods-kolab.inc:148
 #: personal/mail/kolab/class_mail-methods-kolab.inc:156
@@ -341,7 +333,7 @@ msgstr "Non spÃ©cifiÃ©"
 
 #: personal/mail/kolab/class_mail-methods-kolab.inc:149
 msgid "Mails"
-msgstr "Courriel"
+msgstr "Messagerie"
 
 #: personal/mail/kolab/class_mail-methods-kolab.inc:150
 msgid "Tasks"
@@ -399,19 +391,3 @@ msgstr "En attente de kolab pour la suppression des paramÃ¨tres de messagerie...
 #: personal/mail/kolab/class_mail-methods-kolab.inc:282
 msgid "Please remove the mail settings first!"
 msgstr "Veuillez d'abord supprimer les paramÃ¨tres de messagerie !"
-
-#: admin/ogroups/kolab/mail.tpl.c:2
-msgid "Mail distribution list"
-msgstr "Liste de distribution"
-
-#: admin/ogroups/kolab/mail.tpl.c:5
-msgid "Primary address"
-msgstr "Adresse principale"
-
-#: admin/ogroups/kolab/mail.tpl.c:8
-msgid "Primary mail address for this distribution list"
-msgstr "Adresse de messagerie principale pour cette liste de distribution"
-
-#: admin/ogroups/kolab/paste_mail.tpl.c:5
-msgid "Please enter a mail address"
-msgstr "Veuillez entrer une adresse de messagerie"
diff --git a/kolab/locale/id/fusiondirectory.po b/kolab/locale/id/fusiondirectory.po
index 7f1a934b20f4f7d2091c76c82d4381fed833445e..5ea194b1410991a8f4a4b6f16ff960ddace51a98 100644
--- a/kolab/locale/id/fusiondirectory.po
+++ b/kolab/locale/id/fusiondirectory.po
@@ -5,57 +5,56 @@
 # Translators:
 msgid ""
 msgstr ""
-"Project-Id-Version: FusionDirectory-108\n"
+"Project-Id-Version: FusionDirectory-109\n"
 "Report-Msgid-Bugs-To: documentation@lists.fusiondirectory.org\n"
-"POT-Creation-Date: 2015-03-19 21:45+0100\n"
-"PO-Revision-Date: 2015-02-25 15:48+0000\n"
+"POT-Creation-Date: 2014-12-15 17:47+0100\n"
+"PO-Revision-Date: 2014-12-15 16:58+0000\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>\n"
-"Language-Team: Indonesian (http://www.transifex.com/projects/p/FusionDirectory-108/language/id/)\n"
+"Language-Team: Indonesian (http://www.transifex.com/projects/p/FusionDirectory-109/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/ogroups/kolab/class_mailogroup.inc:70
+#: admin/ogroups/kolab/class_mailogroup.inc:37
+msgid "Mail"
+msgstr ""
+
+#: admin/ogroups/kolab/class_mailogroup.inc:38
+msgid "Mail group"
+msgstr ""
+
+#: admin/ogroups/kolab/class_mailogroup.inc:45
+#: admin/ogroups/kolab/class_mailogroup.inc:118
+#: admin/ogroups/kolab/class_mailogroup.inc:125
+msgid "Mail address"
+msgstr ""
+
+#: admin/ogroups/kolab/class_mailogroup.inc:82
 msgid "Remove mail account"
 msgstr ""
 
-#: admin/ogroups/kolab/class_mailogroup.inc:71
-#: admin/ogroups/kolab/class_mailogroup.inc:74
+#: admin/ogroups/kolab/class_mailogroup.inc:83
+#: admin/ogroups/kolab/class_mailogroup.inc:86
 msgid "mail group"
 msgstr ""
 
-#: admin/ogroups/kolab/class_mailogroup.inc:73
+#: admin/ogroups/kolab/class_mailogroup.inc:85
 msgid "Create mail account"
 msgstr ""
 
-#: admin/ogroups/kolab/class_mailogroup.inc:106
-#: admin/ogroups/kolab/class_mailogroup.inc:113
-#: admin/ogroups/kolab/class_mailogroup.inc:190
-msgid "Mail address"
-msgstr ""
-
-#: admin/ogroups/kolab/class_mailogroup.inc:106
+#: admin/ogroups/kolab/class_mailogroup.inc:118
 msgid "your-name@your-domain.com"
 msgstr ""
 
-#: admin/ogroups/kolab/class_mailogroup.inc:140
-#: admin/ogroups/kolab/class_mailogroup.inc:177
+#: admin/ogroups/kolab/class_mailogroup.inc:152
+#: admin/ogroups/kolab/class_mailogroup.inc:189
 #: admin/systems/services/kolab/class_serviceKolab.inc:282
 #: admin/systems/services/kolab/class_serviceKolab.inc:293
 msgid "LDAP error"
 msgstr ""
 
-#: admin/ogroups/kolab/class_mailogroup.inc:184
-#: admin/ogroups/kolab/paste_mail.tpl.c:2
-msgid "Mail"
-msgstr ""
-
-#: admin/ogroups/kolab/class_mailogroup.inc:185
-msgid "Mail group"
-msgstr ""
-
 #: admin/systems/services/kolab/class_serviceKolab.inc:29
 msgid "Enable MX lookup for relayhost"
 msgstr ""
@@ -392,19 +391,3 @@ msgstr ""
 #: personal/mail/kolab/class_mail-methods-kolab.inc:282
 msgid "Please remove the mail settings first!"
 msgstr ""
-
-#: admin/ogroups/kolab/mail.tpl.c:2
-msgid "Mail distribution list"
-msgstr ""
-
-#: admin/ogroups/kolab/mail.tpl.c:5
-msgid "Primary address"
-msgstr ""
-
-#: admin/ogroups/kolab/mail.tpl.c:8
-msgid "Primary mail address for this distribution list"
-msgstr ""
-
-#: admin/ogroups/kolab/paste_mail.tpl.c:5
-msgid "Please enter a mail address"
-msgstr ""
diff --git a/kolab/locale/it/fusiondirectory.po b/kolab/locale/it/fusiondirectory.po
index 18bb8281e8bb8b0e86ca7638fbdbdafb22d17217..b7b80b5f5e12b09a04d7cb140089cdf43f6bbc95 100644
--- a/kolab/locale/it/fusiondirectory.po
+++ b/kolab/locale/it/fusiondirectory.po
@@ -3,64 +3,58 @@
 # This file is distributed under the same license as the PACKAGE package.
 # 
 # Translators:
-# Alessandro Amici <a.amici@bopen.it>, 2005
-# poterealpopolo <giuliano@opensides.be>, 2011
-# poterealpopolo <giuliano@opensides.be>, 2013
-# poterealpopolo <giuliano@opensides.be>, 2012
-# poterealpopolo <giuliano@opensides.be>, 2011-2013
 msgid ""
 msgstr ""
-"Project-Id-Version: FusionDirectory-108\n"
+"Project-Id-Version: FusionDirectory-109\n"
 "Report-Msgid-Bugs-To: documentation@lists.fusiondirectory.org\n"
-"POT-Creation-Date: 2015-03-19 21:45+0100\n"
+"POT-Creation-Date: 2014-12-15 17:47+0100\n"
 "PO-Revision-Date: 2015-02-25 16:51+0000\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>\n"
-"Language-Team: Italian (http://www.transifex.com/projects/p/FusionDirectory-108/language/it/)\n"
+"Language-Team: Italian (http://www.transifex.com/projects/p/FusionDirectory-109/language/it/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Language: it\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: admin/ogroups/kolab/class_mailogroup.inc:70
+#: admin/ogroups/kolab/class_mailogroup.inc:37
+msgid "Mail"
+msgstr "Mail"
+
+#: admin/ogroups/kolab/class_mailogroup.inc:38
+msgid "Mail group"
+msgstr "Gruppo mail"
+
+#: admin/ogroups/kolab/class_mailogroup.inc:45
+#: admin/ogroups/kolab/class_mailogroup.inc:118
+#: admin/ogroups/kolab/class_mailogroup.inc:125
+msgid "Mail address"
+msgstr "Indirizzo di posta elettronica"
+
+#: admin/ogroups/kolab/class_mailogroup.inc:82
 msgid "Remove mail account"
 msgstr "Rimuovi l'account di posta elettronica"
 
-#: admin/ogroups/kolab/class_mailogroup.inc:71
-#: admin/ogroups/kolab/class_mailogroup.inc:74
+#: admin/ogroups/kolab/class_mailogroup.inc:83
+#: admin/ogroups/kolab/class_mailogroup.inc:86
 msgid "mail group"
 msgstr "Gruppo mail"
 
-#: admin/ogroups/kolab/class_mailogroup.inc:73
+#: admin/ogroups/kolab/class_mailogroup.inc:85
 msgid "Create mail account"
 msgstr "Crea un account di posta elettronica"
 
-#: admin/ogroups/kolab/class_mailogroup.inc:106
-#: admin/ogroups/kolab/class_mailogroup.inc:113
-#: admin/ogroups/kolab/class_mailogroup.inc:190
-msgid "Mail address"
-msgstr "Indirizzo di posta elettronica"
-
-#: admin/ogroups/kolab/class_mailogroup.inc:106
+#: admin/ogroups/kolab/class_mailogroup.inc:118
 msgid "your-name@your-domain.com"
 msgstr "il-tuo-nome@il-tuo-dominio.com"
 
-#: admin/ogroups/kolab/class_mailogroup.inc:140
-#: admin/ogroups/kolab/class_mailogroup.inc:177
+#: admin/ogroups/kolab/class_mailogroup.inc:152
+#: admin/ogroups/kolab/class_mailogroup.inc:189
 #: admin/systems/services/kolab/class_serviceKolab.inc:282
 #: admin/systems/services/kolab/class_serviceKolab.inc:293
 msgid "LDAP error"
 msgstr "Errore LDAP"
 
-#: admin/ogroups/kolab/class_mailogroup.inc:184
-#: admin/ogroups/kolab/paste_mail.tpl.c:2
-msgid "Mail"
-msgstr "Mail"
-
-#: admin/ogroups/kolab/class_mailogroup.inc:185
-msgid "Mail group"
-msgstr "Gruppo mail"
-
 #: admin/systems/services/kolab/class_serviceKolab.inc:29
 msgid "Enable MX lookup for relayhost"
 msgstr "Verifica del record MX per il server relayhost"
@@ -397,19 +391,3 @@ msgstr "In attesa di Kolab per la rimozione dei parametri di posta elettronica"
 #: personal/mail/kolab/class_mail-methods-kolab.inc:282
 msgid "Please remove the mail settings first!"
 msgstr "Rimuovi prima i parametri della posta elettronica !"
-
-#: admin/ogroups/kolab/mail.tpl.c:2
-msgid "Mail distribution list"
-msgstr "Lista di distribuzione della posta elettronica"
-
-#: admin/ogroups/kolab/mail.tpl.c:5
-msgid "Primary address"
-msgstr "Indirizzo principale"
-
-#: admin/ogroups/kolab/mail.tpl.c:8
-msgid "Primary mail address for this distribution list"
-msgstr "Indirizzo email principale per questa lista di distribuzione"
-
-#: admin/ogroups/kolab/paste_mail.tpl.c:5
-msgid "Please enter a mail address"
-msgstr "Inserisci un indirizzo di posta elettronica"
diff --git a/kolab/locale/lv/fusiondirectory.po b/kolab/locale/lv/fusiondirectory.po
index 795822ce2e539fe491467892c65fe2226f765471..07f528e0443da3948e17b175ece147b8c249d643 100644
--- a/kolab/locale/lv/fusiondirectory.po
+++ b/kolab/locale/lv/fusiondirectory.po
@@ -5,57 +5,56 @@
 # Translators:
 msgid ""
 msgstr ""
-"Project-Id-Version: FusionDirectory-108\n"
+"Project-Id-Version: FusionDirectory-109\n"
 "Report-Msgid-Bugs-To: documentation@lists.fusiondirectory.org\n"
-"POT-Creation-Date: 2015-03-19 21:45+0100\n"
-"PO-Revision-Date: 2015-02-25 15:48+0000\n"
+"POT-Creation-Date: 2014-12-15 17:47+0100\n"
+"PO-Revision-Date: 2014-12-15 16:58+0000\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>\n"
-"Language-Team: Latvian (http://www.transifex.com/projects/p/FusionDirectory-108/language/lv/)\n"
+"Language-Team: Latvian (http://www.transifex.com/projects/p/FusionDirectory-109/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/ogroups/kolab/class_mailogroup.inc:70
+#: admin/ogroups/kolab/class_mailogroup.inc:37
+msgid "Mail"
+msgstr ""
+
+#: admin/ogroups/kolab/class_mailogroup.inc:38
+msgid "Mail group"
+msgstr ""
+
+#: admin/ogroups/kolab/class_mailogroup.inc:45
+#: admin/ogroups/kolab/class_mailogroup.inc:118
+#: admin/ogroups/kolab/class_mailogroup.inc:125
+msgid "Mail address"
+msgstr ""
+
+#: admin/ogroups/kolab/class_mailogroup.inc:82
 msgid "Remove mail account"
 msgstr ""
 
-#: admin/ogroups/kolab/class_mailogroup.inc:71
-#: admin/ogroups/kolab/class_mailogroup.inc:74
+#: admin/ogroups/kolab/class_mailogroup.inc:83
+#: admin/ogroups/kolab/class_mailogroup.inc:86
 msgid "mail group"
 msgstr ""
 
-#: admin/ogroups/kolab/class_mailogroup.inc:73
+#: admin/ogroups/kolab/class_mailogroup.inc:85
 msgid "Create mail account"
 msgstr ""
 
-#: admin/ogroups/kolab/class_mailogroup.inc:106
-#: admin/ogroups/kolab/class_mailogroup.inc:113
-#: admin/ogroups/kolab/class_mailogroup.inc:190
-msgid "Mail address"
-msgstr ""
-
-#: admin/ogroups/kolab/class_mailogroup.inc:106
+#: admin/ogroups/kolab/class_mailogroup.inc:118
 msgid "your-name@your-domain.com"
 msgstr ""
 
-#: admin/ogroups/kolab/class_mailogroup.inc:140
-#: admin/ogroups/kolab/class_mailogroup.inc:177
+#: admin/ogroups/kolab/class_mailogroup.inc:152
+#: admin/ogroups/kolab/class_mailogroup.inc:189
 #: admin/systems/services/kolab/class_serviceKolab.inc:282
 #: admin/systems/services/kolab/class_serviceKolab.inc:293
 msgid "LDAP error"
 msgstr ""
 
-#: admin/ogroups/kolab/class_mailogroup.inc:184
-#: admin/ogroups/kolab/paste_mail.tpl.c:2
-msgid "Mail"
-msgstr ""
-
-#: admin/ogroups/kolab/class_mailogroup.inc:185
-msgid "Mail group"
-msgstr ""
-
 #: admin/systems/services/kolab/class_serviceKolab.inc:29
 msgid "Enable MX lookup for relayhost"
 msgstr ""
@@ -392,19 +391,3 @@ msgstr ""
 #: personal/mail/kolab/class_mail-methods-kolab.inc:282
 msgid "Please remove the mail settings first!"
 msgstr ""
-
-#: admin/ogroups/kolab/mail.tpl.c:2
-msgid "Mail distribution list"
-msgstr ""
-
-#: admin/ogroups/kolab/mail.tpl.c:5
-msgid "Primary address"
-msgstr ""
-
-#: admin/ogroups/kolab/mail.tpl.c:8
-msgid "Primary mail address for this distribution list"
-msgstr ""
-
-#: admin/ogroups/kolab/paste_mail.tpl.c:5
-msgid "Please enter a mail address"
-msgstr ""
diff --git a/kolab/locale/nb/fusiondirectory.po b/kolab/locale/nb/fusiondirectory.po
index 81d3f4765d86ad9039599f210c6e20c3f1311c1d..6dd4e381376d21fa7e9f4c0b097e6953870c07b7 100644
--- a/kolab/locale/nb/fusiondirectory.po
+++ b/kolab/locale/nb/fusiondirectory.po
@@ -5,57 +5,56 @@
 # Translators:
 msgid ""
 msgstr ""
-"Project-Id-Version: FusionDirectory-108\n"
+"Project-Id-Version: FusionDirectory-109\n"
 "Report-Msgid-Bugs-To: documentation@lists.fusiondirectory.org\n"
-"POT-Creation-Date: 2015-03-19 21:45+0100\n"
-"PO-Revision-Date: 2015-02-25 15:48+0000\n"
+"POT-Creation-Date: 2014-12-15 17:47+0100\n"
+"PO-Revision-Date: 2014-12-15 16:58+0000\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>\n"
-"Language-Team: Norwegian BokmÃ¥l (http://www.transifex.com/projects/p/FusionDirectory-108/language/nb/)\n"
+"Language-Team: Norwegian BokmÃ¥l (http://www.transifex.com/projects/p/FusionDirectory-109/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/ogroups/kolab/class_mailogroup.inc:70
+#: admin/ogroups/kolab/class_mailogroup.inc:37
+msgid "Mail"
+msgstr ""
+
+#: admin/ogroups/kolab/class_mailogroup.inc:38
+msgid "Mail group"
+msgstr ""
+
+#: admin/ogroups/kolab/class_mailogroup.inc:45
+#: admin/ogroups/kolab/class_mailogroup.inc:118
+#: admin/ogroups/kolab/class_mailogroup.inc:125
+msgid "Mail address"
+msgstr ""
+
+#: admin/ogroups/kolab/class_mailogroup.inc:82
 msgid "Remove mail account"
 msgstr ""
 
-#: admin/ogroups/kolab/class_mailogroup.inc:71
-#: admin/ogroups/kolab/class_mailogroup.inc:74
+#: admin/ogroups/kolab/class_mailogroup.inc:83
+#: admin/ogroups/kolab/class_mailogroup.inc:86
 msgid "mail group"
 msgstr ""
 
-#: admin/ogroups/kolab/class_mailogroup.inc:73
+#: admin/ogroups/kolab/class_mailogroup.inc:85
 msgid "Create mail account"
 msgstr ""
 
-#: admin/ogroups/kolab/class_mailogroup.inc:106
-#: admin/ogroups/kolab/class_mailogroup.inc:113
-#: admin/ogroups/kolab/class_mailogroup.inc:190
-msgid "Mail address"
-msgstr ""
-
-#: admin/ogroups/kolab/class_mailogroup.inc:106
+#: admin/ogroups/kolab/class_mailogroup.inc:118
 msgid "your-name@your-domain.com"
 msgstr ""
 
-#: admin/ogroups/kolab/class_mailogroup.inc:140
-#: admin/ogroups/kolab/class_mailogroup.inc:177
+#: admin/ogroups/kolab/class_mailogroup.inc:152
+#: admin/ogroups/kolab/class_mailogroup.inc:189
 #: admin/systems/services/kolab/class_serviceKolab.inc:282
 #: admin/systems/services/kolab/class_serviceKolab.inc:293
 msgid "LDAP error"
 msgstr "LDAP-feil"
 
-#: admin/ogroups/kolab/class_mailogroup.inc:184
-#: admin/ogroups/kolab/paste_mail.tpl.c:2
-msgid "Mail"
-msgstr ""
-
-#: admin/ogroups/kolab/class_mailogroup.inc:185
-msgid "Mail group"
-msgstr ""
-
 #: admin/systems/services/kolab/class_serviceKolab.inc:29
 msgid "Enable MX lookup for relayhost"
 msgstr ""
@@ -392,19 +391,3 @@ msgstr ""
 #: personal/mail/kolab/class_mail-methods-kolab.inc:282
 msgid "Please remove the mail settings first!"
 msgstr ""
-
-#: admin/ogroups/kolab/mail.tpl.c:2
-msgid "Mail distribution list"
-msgstr ""
-
-#: admin/ogroups/kolab/mail.tpl.c:5
-msgid "Primary address"
-msgstr ""
-
-#: admin/ogroups/kolab/mail.tpl.c:8
-msgid "Primary mail address for this distribution list"
-msgstr ""
-
-#: admin/ogroups/kolab/paste_mail.tpl.c:5
-msgid "Please enter a mail address"
-msgstr ""
diff --git a/kolab/locale/nl/fusiondirectory.po b/kolab/locale/nl/fusiondirectory.po
index 8470e9ecc9011765894846fba7e46202642be725..9328237582a4d8e41859031129c35dc417ba7be2 100644
--- a/kolab/locale/nl/fusiondirectory.po
+++ b/kolab/locale/nl/fusiondirectory.po
@@ -3,61 +3,58 @@
 # This file is distributed under the same license as the PACKAGE package.
 # 
 # Translators:
-# Christophe Augello <christophe@augello.be>, 2012
-#  Niels Klomp (CareWorks ICT Services) <nk@careworks.nl>, 2005
 msgid ""
 msgstr ""
-"Project-Id-Version: FusionDirectory-108\n"
+"Project-Id-Version: FusionDirectory-109\n"
 "Report-Msgid-Bugs-To: documentation@lists.fusiondirectory.org\n"
-"POT-Creation-Date: 2015-03-19 21:45+0100\n"
+"POT-Creation-Date: 2014-12-15 17:47+0100\n"
 "PO-Revision-Date: 2015-02-25 16:51+0000\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>\n"
-"Language-Team: Dutch (http://www.transifex.com/projects/p/FusionDirectory-108/language/nl/)\n"
+"Language-Team: Dutch (http://www.transifex.com/projects/p/FusionDirectory-109/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/ogroups/kolab/class_mailogroup.inc:70
+#: admin/ogroups/kolab/class_mailogroup.inc:37
+msgid "Mail"
+msgstr "E-mail"
+
+#: admin/ogroups/kolab/class_mailogroup.inc:38
+msgid "Mail group"
+msgstr "Mail groep"
+
+#: admin/ogroups/kolab/class_mailogroup.inc:45
+#: admin/ogroups/kolab/class_mailogroup.inc:118
+#: admin/ogroups/kolab/class_mailogroup.inc:125
+msgid "Mail address"
+msgstr "E-mail adres"
+
+#: admin/ogroups/kolab/class_mailogroup.inc:82
 msgid "Remove mail account"
 msgstr "E-mail account verwijderen"
 
-#: admin/ogroups/kolab/class_mailogroup.inc:71
-#: admin/ogroups/kolab/class_mailogroup.inc:74
+#: admin/ogroups/kolab/class_mailogroup.inc:83
+#: admin/ogroups/kolab/class_mailogroup.inc:86
 msgid "mail group"
 msgstr "mail groep"
 
-#: admin/ogroups/kolab/class_mailogroup.inc:73
+#: admin/ogroups/kolab/class_mailogroup.inc:85
 msgid "Create mail account"
 msgstr "E-mail account aanmaken"
 
-#: admin/ogroups/kolab/class_mailogroup.inc:106
-#: admin/ogroups/kolab/class_mailogroup.inc:113
-#: admin/ogroups/kolab/class_mailogroup.inc:190
-msgid "Mail address"
-msgstr "E-mail adres"
-
-#: admin/ogroups/kolab/class_mailogroup.inc:106
+#: admin/ogroups/kolab/class_mailogroup.inc:118
 msgid "your-name@your-domain.com"
 msgstr "your-name@your-domain.com"
 
-#: admin/ogroups/kolab/class_mailogroup.inc:140
-#: admin/ogroups/kolab/class_mailogroup.inc:177
+#: admin/ogroups/kolab/class_mailogroup.inc:152
+#: admin/ogroups/kolab/class_mailogroup.inc:189
 #: admin/systems/services/kolab/class_serviceKolab.inc:282
 #: admin/systems/services/kolab/class_serviceKolab.inc:293
 msgid "LDAP error"
 msgstr "LDAP fout"
 
-#: admin/ogroups/kolab/class_mailogroup.inc:184
-#: admin/ogroups/kolab/paste_mail.tpl.c:2
-msgid "Mail"
-msgstr "E-mail"
-
-#: admin/ogroups/kolab/class_mailogroup.inc:185
-msgid "Mail group"
-msgstr "Mail groep"
-
 #: admin/systems/services/kolab/class_serviceKolab.inc:29
 msgid "Enable MX lookup for relayhost"
 msgstr "Sta MX record opzoeken voor relayhost toe"
@@ -226,7 +223,7 @@ msgstr "Accepteer E-mail van andere domeinen over niet geauthenticeerde SMTP"
 
 #: admin/systems/services/kolab/class_serviceKolab.inc:269
 msgid "Internal error"
-msgstr "Interne fout"
+msgstr "Interne error"
 
 #: admin/systems/services/kolab/class_serviceKolab.inc:269
 msgid "Kolab account does not exist!"
@@ -380,7 +377,7 @@ msgstr "SPAM"
 #: personal/mail/kolab/class_mail-methods-kolab.inc:166
 #: personal/mail/kolab/class_mail-methods-kolab.inc:167
 msgid "Default"
-msgstr "Default"
+msgstr "Standaard"
 
 #: personal/mail/kolab/class_mail-methods-kolab.inc:182
 msgid ""
@@ -394,19 +391,3 @@ msgstr "Wachten op kolab om e-mail eigenschappen te verwijderen ..."
 #: personal/mail/kolab/class_mail-methods-kolab.inc:282
 msgid "Please remove the mail settings first!"
 msgstr "Gelieve eerst de e-mail instellingen te verwijderen!"
-
-#: admin/ogroups/kolab/mail.tpl.c:2
-msgid "Mail distribution list"
-msgstr "Mail distributielijst"
-
-#: admin/ogroups/kolab/mail.tpl.c:5
-msgid "Primary address"
-msgstr "Primair adres"
-
-#: admin/ogroups/kolab/mail.tpl.c:8
-msgid "Primary mail address for this distribution list"
-msgstr "Primair E-mail adres voor deze distributielijst"
-
-#: admin/ogroups/kolab/paste_mail.tpl.c:5
-msgid "Please enter a mail address"
-msgstr "Gelieve een geldig mail adress in te voeren"
diff --git a/kolab/locale/pl/fusiondirectory.po b/kolab/locale/pl/fusiondirectory.po
index ef4ee608b586bfa1cda24603ad5ba239986de0c4..1e72e932ef16a15cb24c261ae2957b420bb827fe 100644
--- a/kolab/locale/pl/fusiondirectory.po
+++ b/kolab/locale/pl/fusiondirectory.po
@@ -5,57 +5,56 @@
 # Translators:
 msgid ""
 msgstr ""
-"Project-Id-Version: FusionDirectory-108\n"
+"Project-Id-Version: FusionDirectory-109\n"
 "Report-Msgid-Bugs-To: documentation@lists.fusiondirectory.org\n"
-"POT-Creation-Date: 2015-03-19 21:45+0100\n"
+"POT-Creation-Date: 2014-12-15 17:47+0100\n"
 "PO-Revision-Date: 2015-02-25 16:51+0000\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>\n"
-"Language-Team: Polish (http://www.transifex.com/projects/p/FusionDirectory-108/language/pl/)\n"
+"Language-Team: Polish (http://www.transifex.com/projects/p/FusionDirectory-109/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/ogroups/kolab/class_mailogroup.inc:70
+#: admin/ogroups/kolab/class_mailogroup.inc:37
+msgid "Mail"
+msgstr "Poczta"
+
+#: admin/ogroups/kolab/class_mailogroup.inc:38
+msgid "Mail group"
+msgstr "Grupa pocztowa"
+
+#: admin/ogroups/kolab/class_mailogroup.inc:45
+#: admin/ogroups/kolab/class_mailogroup.inc:118
+#: admin/ogroups/kolab/class_mailogroup.inc:125
+msgid "Mail address"
+msgstr "Adres email"
+
+#: admin/ogroups/kolab/class_mailogroup.inc:82
 msgid "Remove mail account"
 msgstr "UsuÅ„ konto pocztowe"
 
-#: admin/ogroups/kolab/class_mailogroup.inc:71
-#: admin/ogroups/kolab/class_mailogroup.inc:74
+#: admin/ogroups/kolab/class_mailogroup.inc:83
+#: admin/ogroups/kolab/class_mailogroup.inc:86
 msgid "mail group"
 msgstr ""
 
-#: admin/ogroups/kolab/class_mailogroup.inc:73
+#: admin/ogroups/kolab/class_mailogroup.inc:85
 msgid "Create mail account"
 msgstr "StwÃ³rz konto pocztowe"
 
-#: admin/ogroups/kolab/class_mailogroup.inc:106
-#: admin/ogroups/kolab/class_mailogroup.inc:113
-#: admin/ogroups/kolab/class_mailogroup.inc:190
-msgid "Mail address"
-msgstr "Adres email"
-
-#: admin/ogroups/kolab/class_mailogroup.inc:106
+#: admin/ogroups/kolab/class_mailogroup.inc:118
 msgid "your-name@your-domain.com"
 msgstr ""
 
-#: admin/ogroups/kolab/class_mailogroup.inc:140
-#: admin/ogroups/kolab/class_mailogroup.inc:177
+#: admin/ogroups/kolab/class_mailogroup.inc:152
+#: admin/ogroups/kolab/class_mailogroup.inc:189
 #: admin/systems/services/kolab/class_serviceKolab.inc:282
 #: admin/systems/services/kolab/class_serviceKolab.inc:293
 msgid "LDAP error"
 msgstr "bÅ‚Ä…d LDAP"
 
-#: admin/ogroups/kolab/class_mailogroup.inc:184
-#: admin/ogroups/kolab/paste_mail.tpl.c:2
-msgid "Mail"
-msgstr "Poczta"
-
-#: admin/ogroups/kolab/class_mailogroup.inc:185
-msgid "Mail group"
-msgstr "Grupa pocztowa"
-
 #: admin/systems/services/kolab/class_serviceKolab.inc:29
 msgid "Enable MX lookup for relayhost"
 msgstr "WÅ‚Ä…cz sprawdzanie MX dla relayhosta"
@@ -392,19 +391,3 @@ msgstr ""
 #: personal/mail/kolab/class_mail-methods-kolab.inc:282
 msgid "Please remove the mail settings first!"
 msgstr ""
-
-#: admin/ogroups/kolab/mail.tpl.c:2
-msgid "Mail distribution list"
-msgstr "Pocztowa lista dystrybucyjna"
-
-#: admin/ogroups/kolab/mail.tpl.c:5
-msgid "Primary address"
-msgstr "Adres podstawowy"
-
-#: admin/ogroups/kolab/mail.tpl.c:8
-msgid "Primary mail address for this distribution list"
-msgstr "Adres podstawowy dla tej listy dystrybucyjnej"
-
-#: admin/ogroups/kolab/paste_mail.tpl.c:5
-msgid "Please enter a mail address"
-msgstr ""
diff --git a/kolab/locale/pt/fusiondirectory.po b/kolab/locale/pt/fusiondirectory.po
index 3a95fdcc59ec0fbc725be979abd3300ad76501a6..61578f0a1a8d25c94ddf1758c04b26af42f2fd6d 100644
--- a/kolab/locale/pt/fusiondirectory.po
+++ b/kolab/locale/pt/fusiondirectory.po
@@ -5,57 +5,56 @@
 # Translators:
 msgid ""
 msgstr ""
-"Project-Id-Version: FusionDirectory-108\n"
+"Project-Id-Version: FusionDirectory-109\n"
 "Report-Msgid-Bugs-To: documentation@lists.fusiondirectory.org\n"
-"POT-Creation-Date: 2015-03-19 21:45+0100\n"
-"PO-Revision-Date: 2015-02-25 15:48+0000\n"
+"POT-Creation-Date: 2014-12-15 17:47+0100\n"
+"PO-Revision-Date: 2014-12-15 16:58+0000\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>\n"
-"Language-Team: Portuguese (http://www.transifex.com/projects/p/FusionDirectory-108/language/pt/)\n"
+"Language-Team: Portuguese (http://www.transifex.com/projects/p/FusionDirectory-109/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/ogroups/kolab/class_mailogroup.inc:70
+#: admin/ogroups/kolab/class_mailogroup.inc:37
+msgid "Mail"
+msgstr "Correio"
+
+#: admin/ogroups/kolab/class_mailogroup.inc:38
+msgid "Mail group"
+msgstr ""
+
+#: admin/ogroups/kolab/class_mailogroup.inc:45
+#: admin/ogroups/kolab/class_mailogroup.inc:118
+#: admin/ogroups/kolab/class_mailogroup.inc:125
+msgid "Mail address"
+msgstr "EndereÃ§o de Correio"
+
+#: admin/ogroups/kolab/class_mailogroup.inc:82
 msgid "Remove mail account"
 msgstr ""
 
-#: admin/ogroups/kolab/class_mailogroup.inc:71
-#: admin/ogroups/kolab/class_mailogroup.inc:74
+#: admin/ogroups/kolab/class_mailogroup.inc:83
+#: admin/ogroups/kolab/class_mailogroup.inc:86
 msgid "mail group"
 msgstr ""
 
-#: admin/ogroups/kolab/class_mailogroup.inc:73
+#: admin/ogroups/kolab/class_mailogroup.inc:85
 msgid "Create mail account"
 msgstr ""
 
-#: admin/ogroups/kolab/class_mailogroup.inc:106
-#: admin/ogroups/kolab/class_mailogroup.inc:113
-#: admin/ogroups/kolab/class_mailogroup.inc:190
-msgid "Mail address"
-msgstr "EndereÃ§o de Correio"
-
-#: admin/ogroups/kolab/class_mailogroup.inc:106
+#: admin/ogroups/kolab/class_mailogroup.inc:118
 msgid "your-name@your-domain.com"
 msgstr ""
 
-#: admin/ogroups/kolab/class_mailogroup.inc:140
-#: admin/ogroups/kolab/class_mailogroup.inc:177
+#: admin/ogroups/kolab/class_mailogroup.inc:152
+#: admin/ogroups/kolab/class_mailogroup.inc:189
 #: admin/systems/services/kolab/class_serviceKolab.inc:282
 #: admin/systems/services/kolab/class_serviceKolab.inc:293
 msgid "LDAP error"
 msgstr "Erro de LDAP"
 
-#: admin/ogroups/kolab/class_mailogroup.inc:184
-#: admin/ogroups/kolab/paste_mail.tpl.c:2
-msgid "Mail"
-msgstr "Correio"
-
-#: admin/ogroups/kolab/class_mailogroup.inc:185
-msgid "Mail group"
-msgstr ""
-
 #: admin/systems/services/kolab/class_serviceKolab.inc:29
 msgid "Enable MX lookup for relayhost"
 msgstr ""
@@ -392,19 +391,3 @@ msgstr ""
 #: personal/mail/kolab/class_mail-methods-kolab.inc:282
 msgid "Please remove the mail settings first!"
 msgstr ""
-
-#: admin/ogroups/kolab/mail.tpl.c:2
-msgid "Mail distribution list"
-msgstr ""
-
-#: admin/ogroups/kolab/mail.tpl.c:5
-msgid "Primary address"
-msgstr ""
-
-#: admin/ogroups/kolab/mail.tpl.c:8
-msgid "Primary mail address for this distribution list"
-msgstr ""
-
-#: admin/ogroups/kolab/paste_mail.tpl.c:5
-msgid "Please enter a mail address"
-msgstr ""
diff --git a/kolab/locale/pt_BR/fusiondirectory.po b/kolab/locale/pt_BR/fusiondirectory.po
index bd1ea045a7d5744e4d9ccbec287d888746950d5f..530b07518a37ad31e37d16e1a2b025e9a78418dd 100644
--- a/kolab/locale/pt_BR/fusiondirectory.po
+++ b/kolab/locale/pt_BR/fusiondirectory.po
@@ -3,60 +3,58 @@
 # This file is distributed under the same license as the PACKAGE package.
 # 
 # Translators:
-# ALEJANDRO BARRIOS <alejandrobarrios@interlegis.leg.br>, 2014
 msgid ""
 msgstr ""
-"Project-Id-Version: FusionDirectory-108\n"
+"Project-Id-Version: FusionDirectory-109\n"
 "Report-Msgid-Bugs-To: documentation@lists.fusiondirectory.org\n"
-"POT-Creation-Date: 2015-03-19 21:45+0100\n"
+"POT-Creation-Date: 2014-12-15 17:47+0100\n"
 "PO-Revision-Date: 2015-02-25 16:51+0000\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>\n"
-"Language-Team: Portuguese (Brazil) (http://www.transifex.com/projects/p/FusionDirectory-108/language/pt_BR/)\n"
+"Language-Team: Portuguese (Brazil) (http://www.transifex.com/projects/p/FusionDirectory-109/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/ogroups/kolab/class_mailogroup.inc:70
+#: admin/ogroups/kolab/class_mailogroup.inc:37
+msgid "Mail"
+msgstr "Correio"
+
+#: admin/ogroups/kolab/class_mailogroup.inc:38
+msgid "Mail group"
+msgstr "Grupo de email"
+
+#: admin/ogroups/kolab/class_mailogroup.inc:45
+#: admin/ogroups/kolab/class_mailogroup.inc:118
+#: admin/ogroups/kolab/class_mailogroup.inc:125
+msgid "Mail address"
+msgstr "E-mail"
+
+#: admin/ogroups/kolab/class_mailogroup.inc:82
 msgid "Remove mail account"
 msgstr "Remover conta de email"
 
-#: admin/ogroups/kolab/class_mailogroup.inc:71
-#: admin/ogroups/kolab/class_mailogroup.inc:74
+#: admin/ogroups/kolab/class_mailogroup.inc:83
+#: admin/ogroups/kolab/class_mailogroup.inc:86
 msgid "mail group"
 msgstr "grupo de email"
 
-#: admin/ogroups/kolab/class_mailogroup.inc:73
+#: admin/ogroups/kolab/class_mailogroup.inc:85
 msgid "Create mail account"
 msgstr "Criar conta de email"
 
-#: admin/ogroups/kolab/class_mailogroup.inc:106
-#: admin/ogroups/kolab/class_mailogroup.inc:113
-#: admin/ogroups/kolab/class_mailogroup.inc:190
-msgid "Mail address"
-msgstr "E-mail"
-
-#: admin/ogroups/kolab/class_mailogroup.inc:106
+#: admin/ogroups/kolab/class_mailogroup.inc:118
 msgid "your-name@your-domain.com"
 msgstr "seu-nome@seu-domÃnio.com"
 
-#: admin/ogroups/kolab/class_mailogroup.inc:140
-#: admin/ogroups/kolab/class_mailogroup.inc:177
+#: admin/ogroups/kolab/class_mailogroup.inc:152
+#: admin/ogroups/kolab/class_mailogroup.inc:189
 #: admin/systems/services/kolab/class_serviceKolab.inc:282
 #: admin/systems/services/kolab/class_serviceKolab.inc:293
 msgid "LDAP error"
 msgstr "Erro de LDAP"
 
-#: admin/ogroups/kolab/class_mailogroup.inc:184
-#: admin/ogroups/kolab/paste_mail.tpl.c:2
-msgid "Mail"
-msgstr "Correio"
-
-#: admin/ogroups/kolab/class_mailogroup.inc:185
-msgid "Mail group"
-msgstr "Grupo de email"
-
 #: admin/systems/services/kolab/class_serviceKolab.inc:29
 msgid "Enable MX lookup for relayhost"
 msgstr ""
@@ -393,19 +391,3 @@ msgstr "Aguardando Kolab remover propriedades de correio..."
 #: personal/mail/kolab/class_mail-methods-kolab.inc:282
 msgid "Please remove the mail settings first!"
 msgstr "Por favor, remova configuraÃ§Ãµes de correio antes!"
-
-#: admin/ogroups/kolab/mail.tpl.c:2
-msgid "Mail distribution list"
-msgstr "Lista de distribuiÃ§Ã£o de correio"
-
-#: admin/ogroups/kolab/mail.tpl.c:5
-msgid "Primary address"
-msgstr "EndereÃ§o primÃ¡rio"
-
-#: admin/ogroups/kolab/mail.tpl.c:8
-msgid "Primary mail address for this distribution list"
-msgstr "Email primÃ¡rio para lista de distribuiÃ§Ã£o"
-
-#: admin/ogroups/kolab/paste_mail.tpl.c:5
-msgid "Please enter a mail address"
-msgstr "Por favor, insira um endereÃ§o de correio"
diff --git a/kolab/locale/ru/fusiondirectory.po b/kolab/locale/ru/fusiondirectory.po
index 22e8ae11d9c8fcd02b1839a16c604fa076f2286a..b6340b4edce02223dfc6f8e7f274cdcc1c476be0 100644
--- a/kolab/locale/ru/fusiondirectory.po
+++ b/kolab/locale/ru/fusiondirectory.po
@@ -3,60 +3,58 @@
 # This file is distributed under the same license as the PACKAGE package.
 # 
 # Translators:
-#  Valia V. Vaneeva <fattie@altlinux.ru>, 2004
 msgid ""
 msgstr ""
-"Project-Id-Version: FusionDirectory-108\n"
+"Project-Id-Version: FusionDirectory-109\n"
 "Report-Msgid-Bugs-To: documentation@lists.fusiondirectory.org\n"
-"POT-Creation-Date: 2015-03-19 21:45+0100\n"
+"POT-Creation-Date: 2014-12-15 17:47+0100\n"
 "PO-Revision-Date: 2015-03-11 21:42+0000\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>\n"
-"Language-Team: Russian (http://www.transifex.com/projects/p/FusionDirectory-108/language/ru/)\n"
+"Language-Team: Russian (http://www.transifex.com/projects/p/FusionDirectory-109/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=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);\n"
+"Plural-Forms: nplurals=4; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%10<=4 && (n%100<12 || n%100>14) ? 1 : n%10==0 || (n%10>=5 && n%10<=9) || (n%100>=11 && n%100<=14)? 2 : 3);\n"
 
-#: admin/ogroups/kolab/class_mailogroup.inc:70
+#: admin/ogroups/kolab/class_mailogroup.inc:37
+msgid "Mail"
+msgstr "ÐŸÐ¾Ñ‡Ñ‚Ð°"
+
+#: admin/ogroups/kolab/class_mailogroup.inc:38
+msgid "Mail group"
+msgstr ""
+
+#: admin/ogroups/kolab/class_mailogroup.inc:45
+#: admin/ogroups/kolab/class_mailogroup.inc:118
+#: admin/ogroups/kolab/class_mailogroup.inc:125
+msgid "Mail address"
+msgstr "ÐÐ´Ñ€ÐµÑ ÑÐ»ÐµÐºÑ‚Ñ€Ð¾Ð½Ð½Ð¾Ð¹ Ð¿Ð¾Ñ‡Ñ‚Ñ‹"
+
+#: admin/ogroups/kolab/class_mailogroup.inc:82
 msgid "Remove mail account"
 msgstr "Ð£Ð´Ð°Ð»Ð¸Ñ‚ÑŒ Ð½Ð°ÑÑ‚Ñ€Ð¾Ð¹ÐºÐ¸ ÑÐ». Ð¿Ð¾Ñ‡Ñ‚Ñ‹"
 
-#: admin/ogroups/kolab/class_mailogroup.inc:71
-#: admin/ogroups/kolab/class_mailogroup.inc:74
+#: admin/ogroups/kolab/class_mailogroup.inc:83
+#: admin/ogroups/kolab/class_mailogroup.inc:86
 msgid "mail group"
 msgstr ""
 
-#: admin/ogroups/kolab/class_mailogroup.inc:73
+#: admin/ogroups/kolab/class_mailogroup.inc:85
 msgid "Create mail account"
 msgstr "Ð¡Ð¾Ð·Ð´Ð°Ñ‚ÑŒ Ð½Ð°ÑÑ‚Ñ€Ð¾Ð¹ÐºÐ¸ Ð·Ð°Ð¿Ð¸ÑÑŒ ÑÐ». Ð¿Ð¾Ñ‡Ñ‚Ñ‹"
 
-#: admin/ogroups/kolab/class_mailogroup.inc:106
-#: admin/ogroups/kolab/class_mailogroup.inc:113
-#: admin/ogroups/kolab/class_mailogroup.inc:190
-msgid "Mail address"
-msgstr "ÐÐ´Ñ€ÐµÑ ÑÐ»ÐµÐºÑ‚Ñ€Ð¾Ð½Ð½Ð¾Ð¹ Ð¿Ð¾Ñ‡Ñ‚Ñ‹"
-
-#: admin/ogroups/kolab/class_mailogroup.inc:106
+#: admin/ogroups/kolab/class_mailogroup.inc:118
 msgid "your-name@your-domain.com"
 msgstr ""
 
-#: admin/ogroups/kolab/class_mailogroup.inc:140
-#: admin/ogroups/kolab/class_mailogroup.inc:177
+#: admin/ogroups/kolab/class_mailogroup.inc:152
+#: admin/ogroups/kolab/class_mailogroup.inc:189
 #: admin/systems/services/kolab/class_serviceKolab.inc:282
 #: admin/systems/services/kolab/class_serviceKolab.inc:293
 msgid "LDAP error"
 msgstr "ÐžÑˆÐ¸Ð±ÐºÐ° LDAP"
 
-#: admin/ogroups/kolab/class_mailogroup.inc:184
-#: admin/ogroups/kolab/paste_mail.tpl.c:2
-msgid "Mail"
-msgstr "ÐŸÐ¾Ñ‡Ñ‚Ð°"
-
-#: admin/ogroups/kolab/class_mailogroup.inc:185
-msgid "Mail group"
-msgstr ""
-
 #: admin/systems/services/kolab/class_serviceKolab.inc:29
 msgid "Enable MX lookup for relayhost"
 msgstr ""
@@ -393,19 +391,3 @@ msgstr ""
 #: personal/mail/kolab/class_mail-methods-kolab.inc:282
 msgid "Please remove the mail settings first!"
 msgstr ""
-
-#: admin/ogroups/kolab/mail.tpl.c:2
-msgid "Mail distribution list"
-msgstr ""
-
-#: admin/ogroups/kolab/mail.tpl.c:5
-msgid "Primary address"
-msgstr "ÐžÑÐ½Ð¾Ð²Ð½Ð¾Ð¹ Ð°Ð´Ñ€ÐµÑ"
-
-#: admin/ogroups/kolab/mail.tpl.c:8
-msgid "Primary mail address for this distribution list"
-msgstr ""
-
-#: admin/ogroups/kolab/paste_mail.tpl.c:5
-msgid "Please enter a mail address"
-msgstr ""
diff --git a/kolab/locale/ru@petr1708/fusiondirectory.po b/kolab/locale/ru@petr1708/fusiondirectory.po
index 8c2e7cf4eb7947797559a516199ab3d86736dd73..9422410617c24a9a371578561997f78eca56142c 100644
--- a/kolab/locale/ru@petr1708/fusiondirectory.po
+++ b/kolab/locale/ru@petr1708/fusiondirectory.po
@@ -5,57 +5,56 @@
 # Translators:
 msgid ""
 msgstr ""
-"Project-Id-Version: FusionDirectory-108\n"
+"Project-Id-Version: FusionDirectory-109\n"
 "Report-Msgid-Bugs-To: documentation@lists.fusiondirectory.org\n"
-"POT-Creation-Date: 2015-03-19 21:45+0100\n"
-"PO-Revision-Date: 2015-02-25 15:48+0000\n"
+"POT-Creation-Date: 2014-12-15 17:47+0100\n"
+"PO-Revision-Date: 2014-12-15 16:58+0000\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>\n"
-"Language-Team: Russian Petrine orthography (http://www.transifex.com/projects/p/FusionDirectory-108/language/ru@petr1708/)\n"
+"Language-Team: Russian Petrine orthography (http://www.transifex.com/projects/p/FusionDirectory-109/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=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);\n"
+"Plural-Forms: nplurals=4; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%10<=4 && (n%100<12 || n%100>14) ? 1 : n%10==0 || (n%10>=5 && n%10<=9) || (n%100>=11 && n%100<=14)? 2 : 3);\n"
 
-#: admin/ogroups/kolab/class_mailogroup.inc:70
+#: admin/ogroups/kolab/class_mailogroup.inc:37
+msgid "Mail"
+msgstr ""
+
+#: admin/ogroups/kolab/class_mailogroup.inc:38
+msgid "Mail group"
+msgstr ""
+
+#: admin/ogroups/kolab/class_mailogroup.inc:45
+#: admin/ogroups/kolab/class_mailogroup.inc:118
+#: admin/ogroups/kolab/class_mailogroup.inc:125
+msgid "Mail address"
+msgstr ""
+
+#: admin/ogroups/kolab/class_mailogroup.inc:82
 msgid "Remove mail account"
 msgstr ""
 
-#: admin/ogroups/kolab/class_mailogroup.inc:71
-#: admin/ogroups/kolab/class_mailogroup.inc:74
+#: admin/ogroups/kolab/class_mailogroup.inc:83
+#: admin/ogroups/kolab/class_mailogroup.inc:86
 msgid "mail group"
 msgstr ""
 
-#: admin/ogroups/kolab/class_mailogroup.inc:73
+#: admin/ogroups/kolab/class_mailogroup.inc:85
 msgid "Create mail account"
 msgstr ""
 
-#: admin/ogroups/kolab/class_mailogroup.inc:106
-#: admin/ogroups/kolab/class_mailogroup.inc:113
-#: admin/ogroups/kolab/class_mailogroup.inc:190
-msgid "Mail address"
-msgstr ""
-
-#: admin/ogroups/kolab/class_mailogroup.inc:106
+#: admin/ogroups/kolab/class_mailogroup.inc:118
 msgid "your-name@your-domain.com"
 msgstr ""
 
-#: admin/ogroups/kolab/class_mailogroup.inc:140
-#: admin/ogroups/kolab/class_mailogroup.inc:177
+#: admin/ogroups/kolab/class_mailogroup.inc:152
+#: admin/ogroups/kolab/class_mailogroup.inc:189
 #: admin/systems/services/kolab/class_serviceKolab.inc:282
 #: admin/systems/services/kolab/class_serviceKolab.inc:293
 msgid "LDAP error"
 msgstr ""
 
-#: admin/ogroups/kolab/class_mailogroup.inc:184
-#: admin/ogroups/kolab/paste_mail.tpl.c:2
-msgid "Mail"
-msgstr ""
-
-#: admin/ogroups/kolab/class_mailogroup.inc:185
-msgid "Mail group"
-msgstr ""
-
 #: admin/systems/services/kolab/class_serviceKolab.inc:29
 msgid "Enable MX lookup for relayhost"
 msgstr ""
@@ -392,19 +391,3 @@ msgstr ""
 #: personal/mail/kolab/class_mail-methods-kolab.inc:282
 msgid "Please remove the mail settings first!"
 msgstr ""
-
-#: admin/ogroups/kolab/mail.tpl.c:2
-msgid "Mail distribution list"
-msgstr ""
-
-#: admin/ogroups/kolab/mail.tpl.c:5
-msgid "Primary address"
-msgstr ""
-
-#: admin/ogroups/kolab/mail.tpl.c:8
-msgid "Primary mail address for this distribution list"
-msgstr ""
-
-#: admin/ogroups/kolab/paste_mail.tpl.c:5
-msgid "Please enter a mail address"
-msgstr ""
diff --git a/kolab/locale/sv/fusiondirectory.po b/kolab/locale/sv/fusiondirectory.po
index 0186cf5ccbf5b8688e9b21ee20607a01ced1288f..63d8b649b5d80ad053d9c992083e43c0cdc051ff 100644
--- a/kolab/locale/sv/fusiondirectory.po
+++ b/kolab/locale/sv/fusiondirectory.po
@@ -5,57 +5,56 @@
 # Translators:
 msgid ""
 msgstr ""
-"Project-Id-Version: FusionDirectory-108\n"
+"Project-Id-Version: FusionDirectory-109\n"
 "Report-Msgid-Bugs-To: documentation@lists.fusiondirectory.org\n"
-"POT-Creation-Date: 2015-03-19 21:45+0100\n"
-"PO-Revision-Date: 2015-02-25 15:48+0000\n"
+"POT-Creation-Date: 2014-12-15 17:47+0100\n"
+"PO-Revision-Date: 2014-12-15 16:58+0000\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>\n"
-"Language-Team: Swedish (http://www.transifex.com/projects/p/FusionDirectory-108/language/sv/)\n"
+"Language-Team: Swedish (http://www.transifex.com/projects/p/FusionDirectory-109/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/ogroups/kolab/class_mailogroup.inc:70
+#: admin/ogroups/kolab/class_mailogroup.inc:37
+msgid "Mail"
+msgstr "Epost"
+
+#: admin/ogroups/kolab/class_mailogroup.inc:38
+msgid "Mail group"
+msgstr ""
+
+#: admin/ogroups/kolab/class_mailogroup.inc:45
+#: admin/ogroups/kolab/class_mailogroup.inc:118
+#: admin/ogroups/kolab/class_mailogroup.inc:125
+msgid "Mail address"
+msgstr "Epostadress"
+
+#: admin/ogroups/kolab/class_mailogroup.inc:82
 msgid "Remove mail account"
 msgstr ""
 
-#: admin/ogroups/kolab/class_mailogroup.inc:71
-#: admin/ogroups/kolab/class_mailogroup.inc:74
+#: admin/ogroups/kolab/class_mailogroup.inc:83
+#: admin/ogroups/kolab/class_mailogroup.inc:86
 msgid "mail group"
 msgstr ""
 
-#: admin/ogroups/kolab/class_mailogroup.inc:73
+#: admin/ogroups/kolab/class_mailogroup.inc:85
 msgid "Create mail account"
 msgstr ""
 
-#: admin/ogroups/kolab/class_mailogroup.inc:106
-#: admin/ogroups/kolab/class_mailogroup.inc:113
-#: admin/ogroups/kolab/class_mailogroup.inc:190
-msgid "Mail address"
-msgstr "Epostadress"
-
-#: admin/ogroups/kolab/class_mailogroup.inc:106
+#: admin/ogroups/kolab/class_mailogroup.inc:118
 msgid "your-name@your-domain.com"
 msgstr ""
 
-#: admin/ogroups/kolab/class_mailogroup.inc:140
-#: admin/ogroups/kolab/class_mailogroup.inc:177
+#: admin/ogroups/kolab/class_mailogroup.inc:152
+#: admin/ogroups/kolab/class_mailogroup.inc:189
 #: admin/systems/services/kolab/class_serviceKolab.inc:282
 #: admin/systems/services/kolab/class_serviceKolab.inc:293
 msgid "LDAP error"
 msgstr "LDAP-fel"
 
-#: admin/ogroups/kolab/class_mailogroup.inc:184
-#: admin/ogroups/kolab/paste_mail.tpl.c:2
-msgid "Mail"
-msgstr "Epost"
-
-#: admin/ogroups/kolab/class_mailogroup.inc:185
-msgid "Mail group"
-msgstr ""
-
 #: admin/systems/services/kolab/class_serviceKolab.inc:29
 msgid "Enable MX lookup for relayhost"
 msgstr ""
@@ -392,19 +391,3 @@ msgstr ""
 #: personal/mail/kolab/class_mail-methods-kolab.inc:282
 msgid "Please remove the mail settings first!"
 msgstr ""
-
-#: admin/ogroups/kolab/mail.tpl.c:2
-msgid "Mail distribution list"
-msgstr ""
-
-#: admin/ogroups/kolab/mail.tpl.c:5
-msgid "Primary address"
-msgstr ""
-
-#: admin/ogroups/kolab/mail.tpl.c:8
-msgid "Primary mail address for this distribution list"
-msgstr ""
-
-#: admin/ogroups/kolab/paste_mail.tpl.c:5
-msgid "Please enter a mail address"
-msgstr ""
diff --git a/kolab/locale/ug/fusiondirectory.po b/kolab/locale/ug/fusiondirectory.po
index 2e9a0a5f491d8f7ebcf974d0ef4c76dbfeae9bcb..d49d69471daa3c2606b6d2891919db0b4908d336 100644
--- a/kolab/locale/ug/fusiondirectory.po
+++ b/kolab/locale/ug/fusiondirectory.po
@@ -5,57 +5,56 @@
 # Translators:
 msgid ""
 msgstr ""
-"Project-Id-Version: FusionDirectory-108\n"
+"Project-Id-Version: FusionDirectory-109\n"
 "Report-Msgid-Bugs-To: documentation@lists.fusiondirectory.org\n"
-"POT-Creation-Date: 2015-03-19 21:45+0100\n"
-"PO-Revision-Date: 2015-02-25 15:48+0000\n"
+"POT-Creation-Date: 2014-12-15 17:47+0100\n"
+"PO-Revision-Date: 2014-12-15 16:58+0000\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>\n"
-"Language-Team: Uighur (http://www.transifex.com/projects/p/FusionDirectory-108/language/ug/)\n"
+"Language-Team: Uighur (http://www.transifex.com/projects/p/FusionDirectory-109/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/ogroups/kolab/class_mailogroup.inc:70
+#: admin/ogroups/kolab/class_mailogroup.inc:37
+msgid "Mail"
+msgstr ""
+
+#: admin/ogroups/kolab/class_mailogroup.inc:38
+msgid "Mail group"
+msgstr ""
+
+#: admin/ogroups/kolab/class_mailogroup.inc:45
+#: admin/ogroups/kolab/class_mailogroup.inc:118
+#: admin/ogroups/kolab/class_mailogroup.inc:125
+msgid "Mail address"
+msgstr ""
+
+#: admin/ogroups/kolab/class_mailogroup.inc:82
 msgid "Remove mail account"
 msgstr ""
 
-#: admin/ogroups/kolab/class_mailogroup.inc:71
-#: admin/ogroups/kolab/class_mailogroup.inc:74
+#: admin/ogroups/kolab/class_mailogroup.inc:83
+#: admin/ogroups/kolab/class_mailogroup.inc:86
 msgid "mail group"
 msgstr ""
 
-#: admin/ogroups/kolab/class_mailogroup.inc:73
+#: admin/ogroups/kolab/class_mailogroup.inc:85
 msgid "Create mail account"
 msgstr ""
 
-#: admin/ogroups/kolab/class_mailogroup.inc:106
-#: admin/ogroups/kolab/class_mailogroup.inc:113
-#: admin/ogroups/kolab/class_mailogroup.inc:190
-msgid "Mail address"
-msgstr ""
-
-#: admin/ogroups/kolab/class_mailogroup.inc:106
+#: admin/ogroups/kolab/class_mailogroup.inc:118
 msgid "your-name@your-domain.com"
 msgstr ""
 
-#: admin/ogroups/kolab/class_mailogroup.inc:140
-#: admin/ogroups/kolab/class_mailogroup.inc:177
+#: admin/ogroups/kolab/class_mailogroup.inc:152
+#: admin/ogroups/kolab/class_mailogroup.inc:189
 #: admin/systems/services/kolab/class_serviceKolab.inc:282
 #: admin/systems/services/kolab/class_serviceKolab.inc:293
 msgid "LDAP error"
 msgstr ""
 
-#: admin/ogroups/kolab/class_mailogroup.inc:184
-#: admin/ogroups/kolab/paste_mail.tpl.c:2
-msgid "Mail"
-msgstr ""
-
-#: admin/ogroups/kolab/class_mailogroup.inc:185
-msgid "Mail group"
-msgstr ""
-
 #: admin/systems/services/kolab/class_serviceKolab.inc:29
 msgid "Enable MX lookup for relayhost"
 msgstr ""
@@ -392,19 +391,3 @@ msgstr ""
 #: personal/mail/kolab/class_mail-methods-kolab.inc:282
 msgid "Please remove the mail settings first!"
 msgstr ""
-
-#: admin/ogroups/kolab/mail.tpl.c:2
-msgid "Mail distribution list"
-msgstr ""
-
-#: admin/ogroups/kolab/mail.tpl.c:5
-msgid "Primary address"
-msgstr ""
-
-#: admin/ogroups/kolab/mail.tpl.c:8
-msgid "Primary mail address for this distribution list"
-msgstr ""
-
-#: admin/ogroups/kolab/paste_mail.tpl.c:5
-msgid "Please enter a mail address"
-msgstr ""
diff --git a/kolab/locale/vi_VN/fusiondirectory.po b/kolab/locale/vi_VN/fusiondirectory.po
index a329a40a9795dbd823d483f0818d3d9229a0f2f7..15d34cd8ac26d7fb8de4c79b06b039c6b695e3ff 100644
--- a/kolab/locale/vi_VN/fusiondirectory.po
+++ b/kolab/locale/vi_VN/fusiondirectory.po
@@ -5,57 +5,56 @@
 # Translators:
 msgid ""
 msgstr ""
-"Project-Id-Version: FusionDirectory-108\n"
+"Project-Id-Version: FusionDirectory-109\n"
 "Report-Msgid-Bugs-To: documentation@lists.fusiondirectory.org\n"
-"POT-Creation-Date: 2015-03-19 21:45+0100\n"
-"PO-Revision-Date: 2015-02-25 15:48+0000\n"
+"POT-Creation-Date: 2014-12-15 17:47+0100\n"
+"PO-Revision-Date: 2014-12-15 16:58+0000\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>\n"
-"Language-Team: Vietnamese (Viet Nam) (http://www.transifex.com/projects/p/FusionDirectory-108/language/vi_VN/)\n"
+"Language-Team: Vietnamese (Viet Nam) (http://www.transifex.com/projects/p/FusionDirectory-109/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/ogroups/kolab/class_mailogroup.inc:70
+#: admin/ogroups/kolab/class_mailogroup.inc:37
+msgid "Mail"
+msgstr "ThÆ°"
+
+#: admin/ogroups/kolab/class_mailogroup.inc:38
+msgid "Mail group"
+msgstr ""
+
+#: admin/ogroups/kolab/class_mailogroup.inc:45
+#: admin/ogroups/kolab/class_mailogroup.inc:118
+#: admin/ogroups/kolab/class_mailogroup.inc:125
+msgid "Mail address"
+msgstr "Äá»‹a chá»‰ thÆ°"
+
+#: admin/ogroups/kolab/class_mailogroup.inc:82
 msgid "Remove mail account"
 msgstr ""
 
-#: admin/ogroups/kolab/class_mailogroup.inc:71
-#: admin/ogroups/kolab/class_mailogroup.inc:74
+#: admin/ogroups/kolab/class_mailogroup.inc:83
+#: admin/ogroups/kolab/class_mailogroup.inc:86
 msgid "mail group"
 msgstr ""
 
-#: admin/ogroups/kolab/class_mailogroup.inc:73
+#: admin/ogroups/kolab/class_mailogroup.inc:85
 msgid "Create mail account"
 msgstr ""
 
-#: admin/ogroups/kolab/class_mailogroup.inc:106
-#: admin/ogroups/kolab/class_mailogroup.inc:113
-#: admin/ogroups/kolab/class_mailogroup.inc:190
-msgid "Mail address"
-msgstr "Äá»‹a chá»‰ thÆ°"
-
-#: admin/ogroups/kolab/class_mailogroup.inc:106
+#: admin/ogroups/kolab/class_mailogroup.inc:118
 msgid "your-name@your-domain.com"
 msgstr ""
 
-#: admin/ogroups/kolab/class_mailogroup.inc:140
-#: admin/ogroups/kolab/class_mailogroup.inc:177
+#: admin/ogroups/kolab/class_mailogroup.inc:152
+#: admin/ogroups/kolab/class_mailogroup.inc:189
 #: admin/systems/services/kolab/class_serviceKolab.inc:282
 #: admin/systems/services/kolab/class_serviceKolab.inc:293
 msgid "LDAP error"
 msgstr "Lá»—i LDAP"
 
-#: admin/ogroups/kolab/class_mailogroup.inc:184
-#: admin/ogroups/kolab/paste_mail.tpl.c:2
-msgid "Mail"
-msgstr "ThÆ°"
-
-#: admin/ogroups/kolab/class_mailogroup.inc:185
-msgid "Mail group"
-msgstr ""
-
 #: admin/systems/services/kolab/class_serviceKolab.inc:29
 msgid "Enable MX lookup for relayhost"
 msgstr ""
@@ -392,19 +391,3 @@ msgstr ""
 #: personal/mail/kolab/class_mail-methods-kolab.inc:282
 msgid "Please remove the mail settings first!"
 msgstr ""
-
-#: admin/ogroups/kolab/mail.tpl.c:2
-msgid "Mail distribution list"
-msgstr ""
-
-#: admin/ogroups/kolab/mail.tpl.c:5
-msgid "Primary address"
-msgstr ""
-
-#: admin/ogroups/kolab/mail.tpl.c:8
-msgid "Primary mail address for this distribution list"
-msgstr ""
-
-#: admin/ogroups/kolab/paste_mail.tpl.c:5
-msgid "Please enter a mail address"
-msgstr ""
diff --git a/kolab/locale/zh/fusiondirectory.po b/kolab/locale/zh/fusiondirectory.po
index 72d6c9efc473924179253fd545e498795405749a..8eeb86a510812d72fd472d41ed132adbd8cd0e91 100644
--- a/kolab/locale/zh/fusiondirectory.po
+++ b/kolab/locale/zh/fusiondirectory.po
@@ -3,60 +3,58 @@
 # This file is distributed under the same license as the PACKAGE package.
 # 
 # Translators:
-#  Jiang Xin <worldhello.net@gmail.com>, 2007
 msgid ""
 msgstr ""
-"Project-Id-Version: FusionDirectory-108\n"
+"Project-Id-Version: FusionDirectory-109\n"
 "Report-Msgid-Bugs-To: documentation@lists.fusiondirectory.org\n"
-"POT-Creation-Date: 2015-03-19 21:45+0100\n"
+"POT-Creation-Date: 2014-12-15 17:47+0100\n"
 "PO-Revision-Date: 2015-02-25 16:51+0000\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>\n"
-"Language-Team: Chinese (http://www.transifex.com/projects/p/FusionDirectory-108/language/zh/)\n"
+"Language-Team: Chinese (http://www.transifex.com/projects/p/FusionDirectory-109/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/ogroups/kolab/class_mailogroup.inc:70
+#: admin/ogroups/kolab/class_mailogroup.inc:37
+msgid "Mail"
+msgstr "é‚®ä»¶"
+
+#: admin/ogroups/kolab/class_mailogroup.inc:38
+msgid "Mail group"
+msgstr ""
+
+#: admin/ogroups/kolab/class_mailogroup.inc:45
+#: admin/ogroups/kolab/class_mailogroup.inc:118
+#: admin/ogroups/kolab/class_mailogroup.inc:125
+msgid "Mail address"
+msgstr "é‚®ä»¶åœ°å€"
+
+#: admin/ogroups/kolab/class_mailogroup.inc:82
 msgid "Remove mail account"
 msgstr "åˆ é™¤é‚®ä»¶è´¦å·"
 
-#: admin/ogroups/kolab/class_mailogroup.inc:71
-#: admin/ogroups/kolab/class_mailogroup.inc:74
+#: admin/ogroups/kolab/class_mailogroup.inc:83
+#: admin/ogroups/kolab/class_mailogroup.inc:86
 msgid "mail group"
 msgstr ""
 
-#: admin/ogroups/kolab/class_mailogroup.inc:73
+#: admin/ogroups/kolab/class_mailogroup.inc:85
 msgid "Create mail account"
 msgstr "åˆ›å»ºé‚®ä»¶è´¦å·"
 
-#: admin/ogroups/kolab/class_mailogroup.inc:106
-#: admin/ogroups/kolab/class_mailogroup.inc:113
-#: admin/ogroups/kolab/class_mailogroup.inc:190
-msgid "Mail address"
-msgstr "é‚®ä»¶åœ°å€"
-
-#: admin/ogroups/kolab/class_mailogroup.inc:106
+#: admin/ogroups/kolab/class_mailogroup.inc:118
 msgid "your-name@your-domain.com"
 msgstr ""
 
-#: admin/ogroups/kolab/class_mailogroup.inc:140
-#: admin/ogroups/kolab/class_mailogroup.inc:177
+#: admin/ogroups/kolab/class_mailogroup.inc:152
+#: admin/ogroups/kolab/class_mailogroup.inc:189
 #: admin/systems/services/kolab/class_serviceKolab.inc:282
 #: admin/systems/services/kolab/class_serviceKolab.inc:293
 msgid "LDAP error"
 msgstr "LDAP é”™è¯¯"
 
-#: admin/ogroups/kolab/class_mailogroup.inc:184
-#: admin/ogroups/kolab/paste_mail.tpl.c:2
-msgid "Mail"
-msgstr "é‚®ä»¶"
-
-#: admin/ogroups/kolab/class_mailogroup.inc:185
-msgid "Mail group"
-msgstr ""
-
 #: admin/systems/services/kolab/class_serviceKolab.inc:29
 msgid "Enable MX lookup for relayhost"
 msgstr "å¯ç”¨ä¸ç»§ä¸»æœºçš„ MX æŸ¥æ‰¾"
@@ -393,19 +391,3 @@ msgstr ""
 #: personal/mail/kolab/class_mail-methods-kolab.inc:282
 msgid "Please remove the mail settings first!"
 msgstr ""
-
-#: admin/ogroups/kolab/mail.tpl.c:2
-msgid "Mail distribution list"
-msgstr "é‚®ä»¶ä¼ é€’åˆ—è¡¨"
-
-#: admin/ogroups/kolab/mail.tpl.c:5
-msgid "Primary address"
-msgstr "ä¸»è¦åœ°å€"
-
-#: admin/ogroups/kolab/mail.tpl.c:8
-msgid "Primary mail address for this distribution list"
-msgstr "æ¤åˆ†é…åˆ—è¡¨çš„ä¸»è¦é‚®ä»¶åœ°å€"
-
-#: admin/ogroups/kolab/paste_mail.tpl.c:5
-msgid "Please enter a mail address"
-msgstr "è¯·è¾“å…¥ä¸€ä¸ªé‚®ä»¶åœ°å€"
diff --git a/ldapdump/locale/ar/fusiondirectory.po b/ldapdump/locale/ar/fusiondirectory.po
index 66f9cec91b1cddf7c0fe1566f1cc1ee007ccf7dc..d80741fd645debf41543a30b7db982fa420410d9 100644
--- a/ldapdump/locale/ar/fusiondirectory.po
+++ b/ldapdump/locale/ar/fusiondirectory.po
@@ -5,12 +5,12 @@
 # Translators:
 msgid ""
 msgstr ""
-"Project-Id-Version: FusionDirectory-108\n"
+"Project-Id-Version: FusionDirectory-109\n"
 "Report-Msgid-Bugs-To: documentation@lists.fusiondirectory.org\n"
-"POT-Creation-Date: 2015-03-19 21:45+0100\n"
-"PO-Revision-Date: 2015-02-25 15:48+0000\n"
+"POT-Creation-Date: 2014-12-15 17:47+0100\n"
+"PO-Revision-Date: 2014-12-15 16:59+0000\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>\n"
-"Language-Team: Arabic (http://www.transifex.com/projects/p/FusionDirectory-108/language/ar/)\n"
+"Language-Team: Arabic (http://www.transifex.com/projects/p/FusionDirectory-109/language/ar/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -24,7 +24,3 @@ msgstr ""
 #: addons/ldapdump/class_ldapDump.inc:27 addons/ldapdump/class_ldapDump.inc:39
 msgid "LDAP Dump"
 msgstr ""
-
-#: addons/ldapdump/ldapdump.tpl.c:2
-msgid "Insufficient rights"
-msgstr ""
diff --git a/ldapdump/locale/ca/fusiondirectory.po b/ldapdump/locale/ca/fusiondirectory.po
index fde061bd0127ace2ab03c3ba2572ae62975711fd..350a9d6d9426b30c7da36e6e1afef962c6225a57 100644
--- a/ldapdump/locale/ca/fusiondirectory.po
+++ b/ldapdump/locale/ca/fusiondirectory.po
@@ -5,12 +5,12 @@
 # Translators:
 msgid ""
 msgstr ""
-"Project-Id-Version: FusionDirectory-108\n"
+"Project-Id-Version: FusionDirectory-109\n"
 "Report-Msgid-Bugs-To: documentation@lists.fusiondirectory.org\n"
-"POT-Creation-Date: 2015-03-19 21:45+0100\n"
-"PO-Revision-Date: 2015-02-25 15:48+0000\n"
+"POT-Creation-Date: 2014-12-15 17:47+0100\n"
+"PO-Revision-Date: 2014-12-15 16:59+0000\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>\n"
-"Language-Team: Catalan (http://www.transifex.com/projects/p/FusionDirectory-108/language/ca/)\n"
+"Language-Team: Catalan (http://www.transifex.com/projects/p/FusionDirectory-109/language/ca/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -24,7 +24,3 @@ msgstr ""
 #: addons/ldapdump/class_ldapDump.inc:27 addons/ldapdump/class_ldapDump.inc:39
 msgid "LDAP Dump"
 msgstr ""
-
-#: addons/ldapdump/ldapdump.tpl.c:2
-msgid "Insufficient rights"
-msgstr ""
diff --git a/ldapdump/locale/cs_CZ/fusiondirectory.po b/ldapdump/locale/cs_CZ/fusiondirectory.po
index f12e998a7ec15c67c98091b5468f87f57544ce8b..6febbe05c545dda3f9c3ba6737a5d50a06a774d5 100644
--- a/ldapdump/locale/cs_CZ/fusiondirectory.po
+++ b/ldapdump/locale/cs_CZ/fusiondirectory.po
@@ -3,14 +3,15 @@
 # This file is distributed under the same license as the PACKAGE package.
 # 
 # Translators:
+# Pavel Borecki <pavel.borecki@gmail.com>, 2014-2015
 msgid ""
 msgstr ""
-"Project-Id-Version: FusionDirectory-108\n"
+"Project-Id-Version: FusionDirectory-109\n"
 "Report-Msgid-Bugs-To: documentation@lists.fusiondirectory.org\n"
-"POT-Creation-Date: 2015-03-19 21:45+0100\n"
-"PO-Revision-Date: 2015-02-25 16:03+0000\n"
-"Last-Translator: fusiondirectory <contact@fusiondirectory.org>\n"
-"Language-Team: Czech (Czech Republic) (http://www.transifex.com/projects/p/FusionDirectory-108/language/cs_CZ/)\n"
+"POT-Creation-Date: 2014-12-15 17:47+0100\n"
+"PO-Revision-Date: 2015-04-01 15:15+0000\n"
+"Last-Translator: Pavel Borecki <pavel.borecki@gmail.com>\n"
+"Language-Team: Czech (Czech Republic) (http://www.transifex.com/projects/p/FusionDirectory-109/language/cs_CZ/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -19,12 +20,8 @@ msgstr ""
 
 #: addons/ldapdump/class_ldapDump.inc:26
 msgid "LDAP"
-msgstr "LDAP"
+msgstr ""
 
 #: addons/ldapdump/class_ldapDump.inc:27 addons/ldapdump/class_ldapDump.inc:39
 msgid "LDAP Dump"
-msgstr ""
-
-#: addons/ldapdump/ldapdump.tpl.c:2
-msgid "Insufficient rights"
-msgstr "NedostaÄujÃcÃ oprÃ¡vnÄ›nÃ"
+msgstr "VÃ½pis z LDAP"
diff --git a/ldapdump/locale/de/fusiondirectory.po b/ldapdump/locale/de/fusiondirectory.po
index 1d3ca67de8661c46b1ff83db49c9cc8b1be40d69..a57f7300cbf99db102a7602aa2e2baf0b0862c6e 100644
--- a/ldapdump/locale/de/fusiondirectory.po
+++ b/ldapdump/locale/de/fusiondirectory.po
@@ -5,12 +5,12 @@
 # Translators:
 msgid ""
 msgstr ""
-"Project-Id-Version: FusionDirectory-108\n"
+"Project-Id-Version: FusionDirectory-109\n"
 "Report-Msgid-Bugs-To: documentation@lists.fusiondirectory.org\n"
-"POT-Creation-Date: 2015-03-19 21:45+0100\n"
-"PO-Revision-Date: 2015-02-25 16:03+0000\n"
+"POT-Creation-Date: 2014-12-15 17:47+0100\n"
+"PO-Revision-Date: 2014-12-15 16:59+0000\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>\n"
-"Language-Team: German (http://www.transifex.com/projects/p/FusionDirectory-108/language/de/)\n"
+"Language-Team: German (http://www.transifex.com/projects/p/FusionDirectory-109/language/de/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -24,7 +24,3 @@ msgstr "LDAP"
 #: addons/ldapdump/class_ldapDump.inc:27 addons/ldapdump/class_ldapDump.inc:39
 msgid "LDAP Dump"
 msgstr "LDAP Dump"
-
-#: addons/ldapdump/ldapdump.tpl.c:2
-msgid "Insufficient rights"
-msgstr "Nicht ausreichende Rechte"
diff --git a/ldapdump/locale/el_GR/fusiondirectory.po b/ldapdump/locale/el_GR/fusiondirectory.po
new file mode 100644
index 0000000000000000000000000000000000000000..f1c826fe0e91cdf52497b30308890c72735a0869
--- /dev/null
+++ b/ldapdump/locale/el_GR/fusiondirectory.po
@@ -0,0 +1,26 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR FusionDirectory Project
+# This file is distributed under the same license as the PACKAGE package.
+# 
+# Translators:
+msgid ""
+msgstr ""
+"Project-Id-Version: FusionDirectory-109\n"
+"Report-Msgid-Bugs-To: documentation@lists.fusiondirectory.org\n"
+"POT-Creation-Date: 2014-12-15 17:47+0100\n"
+"PO-Revision-Date: 2015-05-30 11:45+0000\n"
+"Last-Translator: Benoit Mortier <benoit.mortier@opensides.be>\n"
+"Language-Team: Greek (Greece) (http://www.transifex.com/projects/p/FusionDirectory-109/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"
+
+#: addons/ldapdump/class_ldapDump.inc:26
+msgid "LDAP"
+msgstr ""
+
+#: addons/ldapdump/class_ldapDump.inc:27 addons/ldapdump/class_ldapDump.inc:39
+msgid "LDAP Dump"
+msgstr ""
diff --git a/ldapdump/locale/en/fusiondirectory.po b/ldapdump/locale/en/fusiondirectory.po
index 3b6e4bc41b7a44892358e26677b8f5c4b2acd110..1ead3224f473e9a31b2d9b0a14bf07b3ff6617aa 100644
--- a/ldapdump/locale/en/fusiondirectory.po
+++ b/ldapdump/locale/en/fusiondirectory.po
@@ -6,13 +6,13 @@
 #, fuzzy
 msgid ""
 msgstr ""
-"Project-Id-Version: PACKAGE VERSION\n"
-"Report-Msgid-Bugs-To: documentation@lists.fusiondirectory.org\n"
-"POT-Creation-Date: 2015-03-31 11:49+0200\n"
+"Project-Id-Version: FusionDirectory VERSION\n"
+"Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
+"POT-Creation-Date: 2015-05-30 15:30+0200\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
-"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
-"Language-Team: LANGUAGE <LL@li.org>\n"
-"Language: \n"
+"Last-Translator: FusionDirectory project <contact@fusiondirectory.org>\n"
+"Language-Team: English\n"
+"Language: en\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
diff --git a/ldapdump/locale/es/fusiondirectory.po b/ldapdump/locale/es/fusiondirectory.po
index 872c9e973877e61f39a441258862c9e815ca2015..151c891bb7dbe0585a2819358b7c86518cd0e226 100644
--- a/ldapdump/locale/es/fusiondirectory.po
+++ b/ldapdump/locale/es/fusiondirectory.po
@@ -5,12 +5,12 @@
 # Translators:
 msgid ""
 msgstr ""
-"Project-Id-Version: FusionDirectory-108\n"
+"Project-Id-Version: FusionDirectory-109\n"
 "Report-Msgid-Bugs-To: documentation@lists.fusiondirectory.org\n"
-"POT-Creation-Date: 2015-03-19 21:45+0100\n"
-"PO-Revision-Date: 2015-02-25 15:48+0000\n"
+"POT-Creation-Date: 2014-12-15 17:47+0100\n"
+"PO-Revision-Date: 2014-12-15 16:59+0000\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>\n"
-"Language-Team: Spanish (http://www.transifex.com/projects/p/FusionDirectory-108/language/es/)\n"
+"Language-Team: Spanish (http://www.transifex.com/projects/p/FusionDirectory-109/language/es/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -24,7 +24,3 @@ msgstr "LDAP"
 #: addons/ldapdump/class_ldapDump.inc:27 addons/ldapdump/class_ldapDump.inc:39
 msgid "LDAP Dump"
 msgstr ""
-
-#: addons/ldapdump/ldapdump.tpl.c:2
-msgid "Insufficient rights"
-msgstr ""
diff --git a/ldapdump/locale/es_VE/fusiondirectory.po b/ldapdump/locale/es_VE/fusiondirectory.po
index 286afb1e285eb8f879a40ad6dbbd977e9927fdfc..3f72e6d86c47fc263affd083a41cf435e3be0d2a 100644
--- a/ldapdump/locale/es_VE/fusiondirectory.po
+++ b/ldapdump/locale/es_VE/fusiondirectory.po
@@ -5,12 +5,12 @@
 # Translators:
 msgid ""
 msgstr ""
-"Project-Id-Version: FusionDirectory-108\n"
+"Project-Id-Version: FusionDirectory-109\n"
 "Report-Msgid-Bugs-To: documentation@lists.fusiondirectory.org\n"
-"POT-Creation-Date: 2015-03-19 21:45+0100\n"
-"PO-Revision-Date: 2015-02-25 15:48+0000\n"
+"POT-Creation-Date: 2014-12-15 17:47+0100\n"
+"PO-Revision-Date: 2014-12-15 16:59+0000\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>\n"
-"Language-Team: Spanish (Venezuela) (http://www.transifex.com/projects/p/FusionDirectory-108/language/es_VE/)\n"
+"Language-Team: Spanish (Venezuela) (http://www.transifex.com/projects/p/FusionDirectory-109/language/es_VE/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -24,7 +24,3 @@ msgstr "LDAP"
 #: addons/ldapdump/class_ldapDump.inc:27 addons/ldapdump/class_ldapDump.inc:39
 msgid "LDAP Dump"
 msgstr ""
-
-#: addons/ldapdump/ldapdump.tpl.c:2
-msgid "Insufficient rights"
-msgstr ""
diff --git a/ldapdump/locale/fa_IR/fusiondirectory.po b/ldapdump/locale/fa_IR/fusiondirectory.po
index fb9a6e1141b9b5af24545600d2f3e38ce5bd1b7e..27e286b7e05601cb5c2035347278588b4d338db6 100644
--- a/ldapdump/locale/fa_IR/fusiondirectory.po
+++ b/ldapdump/locale/fa_IR/fusiondirectory.po
@@ -5,12 +5,12 @@
 # Translators:
 msgid ""
 msgstr ""
-"Project-Id-Version: FusionDirectory-108\n"
+"Project-Id-Version: FusionDirectory-109\n"
 "Report-Msgid-Bugs-To: documentation@lists.fusiondirectory.org\n"
-"POT-Creation-Date: 2015-03-19 21:45+0100\n"
-"PO-Revision-Date: 2015-02-25 15:48+0000\n"
+"POT-Creation-Date: 2014-12-15 17:47+0100\n"
+"PO-Revision-Date: 2014-12-15 16:59+0000\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>\n"
-"Language-Team: Persian (Iran) (http://www.transifex.com/projects/p/FusionDirectory-108/language/fa_IR/)\n"
+"Language-Team: Persian (Iran) (http://www.transifex.com/projects/p/FusionDirectory-109/language/fa_IR/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -24,7 +24,3 @@ msgstr ""
 #: addons/ldapdump/class_ldapDump.inc:27 addons/ldapdump/class_ldapDump.inc:39
 msgid "LDAP Dump"
 msgstr ""
-
-#: addons/ldapdump/ldapdump.tpl.c:2
-msgid "Insufficient rights"
-msgstr ""
diff --git a/ldapdump/locale/fr/fusiondirectory.po b/ldapdump/locale/fr/fusiondirectory.po
index 42890e7fdb1616ea061447fff9a400d0d0b34fc9..769cfc3aa0662b331d0de0d6e2170dd984d6c53a 100644
--- a/ldapdump/locale/fr/fusiondirectory.po
+++ b/ldapdump/locale/fr/fusiondirectory.po
@@ -3,16 +3,15 @@
 # This file is distributed under the same license as the PACKAGE package.
 # 
 # Translators:
-# MCMic, 2014
-# MCMic, 2014
+# fusiondirectory <contact@fusiondirectory.org>, 2013
 msgid ""
 msgstr ""
-"Project-Id-Version: FusionDirectory-108\n"
+"Project-Id-Version: FusionDirectory-109\n"
 "Report-Msgid-Bugs-To: documentation@lists.fusiondirectory.org\n"
-"POT-Creation-Date: 2015-03-19 21:45+0100\n"
-"PO-Revision-Date: 2015-02-25 16:03+0000\n"
+"POT-Creation-Date: 2014-12-15 17:47+0100\n"
+"PO-Revision-Date: 2014-12-15 16:59+0000\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>\n"
-"Language-Team: French (http://www.transifex.com/projects/p/FusionDirectory-108/language/fr/)\n"
+"Language-Team: French (http://www.transifex.com/projects/p/FusionDirectory-109/language/fr/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -25,8 +24,4 @@ msgstr "LDAP"
 
 #: addons/ldapdump/class_ldapDump.inc:27 addons/ldapdump/class_ldapDump.inc:39
 msgid "LDAP Dump"
-msgstr "Vue LDAP"
-
-#: addons/ldapdump/ldapdump.tpl.c:2
-msgid "Insufficient rights"
-msgstr "Permission insuffisantes"
+msgstr "Vue technique du LDAP"
diff --git a/ldapdump/locale/id/fusiondirectory.po b/ldapdump/locale/id/fusiondirectory.po
index 6105e76f6808136f36ddf1a39d464d6408ca3d53..177fe6366d1accda434aadfeb3e69ccb145fd11c 100644
--- a/ldapdump/locale/id/fusiondirectory.po
+++ b/ldapdump/locale/id/fusiondirectory.po
@@ -5,12 +5,12 @@
 # Translators:
 msgid ""
 msgstr ""
-"Project-Id-Version: FusionDirectory-108\n"
+"Project-Id-Version: FusionDirectory-109\n"
 "Report-Msgid-Bugs-To: documentation@lists.fusiondirectory.org\n"
-"POT-Creation-Date: 2015-03-19 21:45+0100\n"
-"PO-Revision-Date: 2015-02-25 15:48+0000\n"
+"POT-Creation-Date: 2014-12-15 17:47+0100\n"
+"PO-Revision-Date: 2014-12-15 16:59+0000\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>\n"
-"Language-Team: Indonesian (http://www.transifex.com/projects/p/FusionDirectory-108/language/id/)\n"
+"Language-Team: Indonesian (http://www.transifex.com/projects/p/FusionDirectory-109/language/id/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -24,7 +24,3 @@ msgstr ""
 #: addons/ldapdump/class_ldapDump.inc:27 addons/ldapdump/class_ldapDump.inc:39
 msgid "LDAP Dump"
 msgstr ""
-
-#: addons/ldapdump/ldapdump.tpl.c:2
-msgid "Insufficient rights"
-msgstr ""
diff --git a/ldapdump/locale/it/fusiondirectory.po b/ldapdump/locale/it/fusiondirectory.po
index 2baf627327a15a9e1595d0333ce3d2377e80040f..3f4c5da97db5247beda8ac047b7c4fe6064fcab3 100644
--- a/ldapdump/locale/it/fusiondirectory.po
+++ b/ldapdump/locale/it/fusiondirectory.po
@@ -5,12 +5,12 @@
 # Translators:
 msgid ""
 msgstr ""
-"Project-Id-Version: FusionDirectory-108\n"
+"Project-Id-Version: FusionDirectory-109\n"
 "Report-Msgid-Bugs-To: documentation@lists.fusiondirectory.org\n"
-"POT-Creation-Date: 2015-03-19 21:45+0100\n"
-"PO-Revision-Date: 2015-02-25 15:48+0000\n"
+"POT-Creation-Date: 2014-12-15 17:47+0100\n"
+"PO-Revision-Date: 2014-12-15 16:59+0000\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>\n"
-"Language-Team: Italian (http://www.transifex.com/projects/p/FusionDirectory-108/language/it/)\n"
+"Language-Team: Italian (http://www.transifex.com/projects/p/FusionDirectory-109/language/it/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -24,7 +24,3 @@ msgstr "LDAP"
 #: addons/ldapdump/class_ldapDump.inc:27 addons/ldapdump/class_ldapDump.inc:39
 msgid "LDAP Dump"
 msgstr ""
-
-#: addons/ldapdump/ldapdump.tpl.c:2
-msgid "Insufficient rights"
-msgstr ""
diff --git a/ldapdump/locale/lv/fusiondirectory.po b/ldapdump/locale/lv/fusiondirectory.po
index b25de4570db478e44f62f358a1bab072a66375a3..f2b314a2a94cd1e924872bfef2d971202dc41e0d 100644
--- a/ldapdump/locale/lv/fusiondirectory.po
+++ b/ldapdump/locale/lv/fusiondirectory.po
@@ -5,12 +5,12 @@
 # Translators:
 msgid ""
 msgstr ""
-"Project-Id-Version: FusionDirectory-108\n"
+"Project-Id-Version: FusionDirectory-109\n"
 "Report-Msgid-Bugs-To: documentation@lists.fusiondirectory.org\n"
-"POT-Creation-Date: 2015-03-19 21:45+0100\n"
-"PO-Revision-Date: 2015-02-25 15:48+0000\n"
+"POT-Creation-Date: 2014-12-15 17:47+0100\n"
+"PO-Revision-Date: 2014-12-15 16:59+0000\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>\n"
-"Language-Team: Latvian (http://www.transifex.com/projects/p/FusionDirectory-108/language/lv/)\n"
+"Language-Team: Latvian (http://www.transifex.com/projects/p/FusionDirectory-109/language/lv/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -24,7 +24,3 @@ msgstr ""
 #: addons/ldapdump/class_ldapDump.inc:27 addons/ldapdump/class_ldapDump.inc:39
 msgid "LDAP Dump"
 msgstr ""
-
-#: addons/ldapdump/ldapdump.tpl.c:2
-msgid "Insufficient rights"
-msgstr ""
diff --git a/ldapdump/locale/nb/fusiondirectory.po b/ldapdump/locale/nb/fusiondirectory.po
index dde46c6b6ccf85b8e85b4215ab8ab82359b12fbe..7113e134de4bebdb61ee50ed419ba542f8f87233 100644
--- a/ldapdump/locale/nb/fusiondirectory.po
+++ b/ldapdump/locale/nb/fusiondirectory.po
@@ -5,12 +5,12 @@
 # Translators:
 msgid ""
 msgstr ""
-"Project-Id-Version: FusionDirectory-108\n"
+"Project-Id-Version: FusionDirectory-109\n"
 "Report-Msgid-Bugs-To: documentation@lists.fusiondirectory.org\n"
-"POT-Creation-Date: 2015-03-19 21:45+0100\n"
-"PO-Revision-Date: 2015-02-25 15:48+0000\n"
+"POT-Creation-Date: 2014-12-15 17:47+0100\n"
+"PO-Revision-Date: 2014-12-15 16:59+0000\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>\n"
-"Language-Team: Norwegian BokmÃ¥l (http://www.transifex.com/projects/p/FusionDirectory-108/language/nb/)\n"
+"Language-Team: Norwegian BokmÃ¥l (http://www.transifex.com/projects/p/FusionDirectory-109/language/nb/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -24,7 +24,3 @@ msgstr ""
 #: addons/ldapdump/class_ldapDump.inc:27 addons/ldapdump/class_ldapDump.inc:39
 msgid "LDAP Dump"
 msgstr ""
-
-#: addons/ldapdump/ldapdump.tpl.c:2
-msgid "Insufficient rights"
-msgstr ""
diff --git a/ldapdump/locale/nl/fusiondirectory.po b/ldapdump/locale/nl/fusiondirectory.po
index db76fc8d5f345168118f5d686f1f44805b7b708e..7307af391aaa231a322c192f19948de48654955c 100644
--- a/ldapdump/locale/nl/fusiondirectory.po
+++ b/ldapdump/locale/nl/fusiondirectory.po
@@ -5,12 +5,12 @@
 # Translators:
 msgid ""
 msgstr ""
-"Project-Id-Version: FusionDirectory-108\n"
+"Project-Id-Version: FusionDirectory-109\n"
 "Report-Msgid-Bugs-To: documentation@lists.fusiondirectory.org\n"
-"POT-Creation-Date: 2015-03-19 21:45+0100\n"
-"PO-Revision-Date: 2015-02-25 15:48+0000\n"
+"POT-Creation-Date: 2014-12-15 17:47+0100\n"
+"PO-Revision-Date: 2014-12-15 16:59+0000\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>\n"
-"Language-Team: Dutch (http://www.transifex.com/projects/p/FusionDirectory-108/language/nl/)\n"
+"Language-Team: Dutch (http://www.transifex.com/projects/p/FusionDirectory-109/language/nl/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -24,7 +24,3 @@ msgstr "LDAP"
 #: addons/ldapdump/class_ldapDump.inc:27 addons/ldapdump/class_ldapDump.inc:39
 msgid "LDAP Dump"
 msgstr ""
-
-#: addons/ldapdump/ldapdump.tpl.c:2
-msgid "Insufficient rights"
-msgstr ""
diff --git a/ldapdump/locale/pl/fusiondirectory.po b/ldapdump/locale/pl/fusiondirectory.po
index 147dd97cb289848ca501e467de4799b4cf52af7a..29a1e130f8584d14bf7e22a4df738db1ccd697e4 100644
--- a/ldapdump/locale/pl/fusiondirectory.po
+++ b/ldapdump/locale/pl/fusiondirectory.po
@@ -5,12 +5,12 @@
 # Translators:
 msgid ""
 msgstr ""
-"Project-Id-Version: FusionDirectory-108\n"
+"Project-Id-Version: FusionDirectory-109\n"
 "Report-Msgid-Bugs-To: documentation@lists.fusiondirectory.org\n"
-"POT-Creation-Date: 2015-03-19 21:45+0100\n"
-"PO-Revision-Date: 2015-02-25 15:48+0000\n"
+"POT-Creation-Date: 2014-12-15 17:47+0100\n"
+"PO-Revision-Date: 2014-12-15 16:59+0000\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>\n"
-"Language-Team: Polish (http://www.transifex.com/projects/p/FusionDirectory-108/language/pl/)\n"
+"Language-Team: Polish (http://www.transifex.com/projects/p/FusionDirectory-109/language/pl/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -24,7 +24,3 @@ msgstr "LDAP"
 #: addons/ldapdump/class_ldapDump.inc:27 addons/ldapdump/class_ldapDump.inc:39
 msgid "LDAP Dump"
 msgstr ""
-
-#: addons/ldapdump/ldapdump.tpl.c:2
-msgid "Insufficient rights"
-msgstr ""
diff --git a/ldapdump/locale/pt/fusiondirectory.po b/ldapdump/locale/pt/fusiondirectory.po
index 74d4bb05f2e3ac1c31b02a3751a1ce6b6c27f1d2..504579fe999cfd0462879ceba4a241abc24ae8c6 100644
--- a/ldapdump/locale/pt/fusiondirectory.po
+++ b/ldapdump/locale/pt/fusiondirectory.po
@@ -5,12 +5,12 @@
 # Translators:
 msgid ""
 msgstr ""
-"Project-Id-Version: FusionDirectory-108\n"
+"Project-Id-Version: FusionDirectory-109\n"
 "Report-Msgid-Bugs-To: documentation@lists.fusiondirectory.org\n"
-"POT-Creation-Date: 2015-03-19 21:45+0100\n"
-"PO-Revision-Date: 2015-02-25 15:48+0000\n"
+"POT-Creation-Date: 2014-12-15 17:47+0100\n"
+"PO-Revision-Date: 2014-12-15 16:59+0000\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>\n"
-"Language-Team: Portuguese (http://www.transifex.com/projects/p/FusionDirectory-108/language/pt/)\n"
+"Language-Team: Portuguese (http://www.transifex.com/projects/p/FusionDirectory-109/language/pt/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -24,7 +24,3 @@ msgstr ""
 #: addons/ldapdump/class_ldapDump.inc:27 addons/ldapdump/class_ldapDump.inc:39
 msgid "LDAP Dump"
 msgstr ""
-
-#: addons/ldapdump/ldapdump.tpl.c:2
-msgid "Insufficient rights"
-msgstr ""
diff --git a/ldapdump/locale/pt_BR/fusiondirectory.po b/ldapdump/locale/pt_BR/fusiondirectory.po
index f7c17a882f5531fea4ffdd49a5c7072e0d5a08ca..4e45d5530b95c0af76de43d51ac0abd4f5bc8747 100644
--- a/ldapdump/locale/pt_BR/fusiondirectory.po
+++ b/ldapdump/locale/pt_BR/fusiondirectory.po
@@ -5,12 +5,12 @@
 # Translators:
 msgid ""
 msgstr ""
-"Project-Id-Version: FusionDirectory-108\n"
+"Project-Id-Version: FusionDirectory-109\n"
 "Report-Msgid-Bugs-To: documentation@lists.fusiondirectory.org\n"
-"POT-Creation-Date: 2015-03-19 21:45+0100\n"
-"PO-Revision-Date: 2015-02-25 16:03+0000\n"
+"POT-Creation-Date: 2014-12-15 17:47+0100\n"
+"PO-Revision-Date: 2014-12-15 16:59+0000\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>\n"
-"Language-Team: Portuguese (Brazil) (http://www.transifex.com/projects/p/FusionDirectory-108/language/pt_BR/)\n"
+"Language-Team: Portuguese (Brazil) (http://www.transifex.com/projects/p/FusionDirectory-109/language/pt_BR/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -24,7 +24,3 @@ msgstr "LDAP"
 #: addons/ldapdump/class_ldapDump.inc:27 addons/ldapdump/class_ldapDump.inc:39
 msgid "LDAP Dump"
 msgstr "Despejo de LDAP"
-
-#: addons/ldapdump/ldapdump.tpl.c:2
-msgid "Insufficient rights"
-msgstr "Direitos insuficientes"
diff --git a/ldapdump/locale/ru/fusiondirectory.po b/ldapdump/locale/ru/fusiondirectory.po
index 7aa68f70126fcf02b925a75a66d90c0ad37b2826..b3eef43d624f9f45f42c5264318b2a20ccd8e504 100644
--- a/ldapdump/locale/ru/fusiondirectory.po
+++ b/ldapdump/locale/ru/fusiondirectory.po
@@ -5,26 +5,22 @@
 # Translators:
 msgid ""
 msgstr ""
-"Project-Id-Version: FusionDirectory-108\n"
+"Project-Id-Version: FusionDirectory-109\n"
 "Report-Msgid-Bugs-To: documentation@lists.fusiondirectory.org\n"
-"POT-Creation-Date: 2015-03-19 21:45+0100\n"
-"PO-Revision-Date: 2015-02-25 15:48+0000\n"
+"POT-Creation-Date: 2014-12-15 17:47+0100\n"
+"PO-Revision-Date: 2015-04-12 22:01+0000\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>\n"
-"Language-Team: Russian (http://www.transifex.com/projects/p/FusionDirectory-108/language/ru/)\n"
+"Language-Team: Russian (http://www.transifex.com/projects/p/FusionDirectory-109/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=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);\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/ldapdump/class_ldapDump.inc:26
 msgid "LDAP"
-msgstr ""
+msgstr "LDAP"
 
 #: addons/ldapdump/class_ldapDump.inc:27 addons/ldapdump/class_ldapDump.inc:39
 msgid "LDAP Dump"
 msgstr ""
-
-#: addons/ldapdump/ldapdump.tpl.c:2
-msgid "Insufficient rights"
-msgstr ""
diff --git a/ldapdump/locale/ru@petr1708/fusiondirectory.po b/ldapdump/locale/ru@petr1708/fusiondirectory.po
index e9e238a3b645f76aea0b2b73a7882a7c21488099..81f558c18b4a756d3499afdb1df89de8a82a32d8 100644
--- a/ldapdump/locale/ru@petr1708/fusiondirectory.po
+++ b/ldapdump/locale/ru@petr1708/fusiondirectory.po
@@ -5,17 +5,17 @@
 # Translators:
 msgid ""
 msgstr ""
-"Project-Id-Version: FusionDirectory-108\n"
+"Project-Id-Version: FusionDirectory-109\n"
 "Report-Msgid-Bugs-To: documentation@lists.fusiondirectory.org\n"
-"POT-Creation-Date: 2015-03-19 21:45+0100\n"
-"PO-Revision-Date: 2015-02-25 15:48+0000\n"
+"POT-Creation-Date: 2014-12-15 17:47+0100\n"
+"PO-Revision-Date: 2014-12-15 16:59+0000\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>\n"
-"Language-Team: Russian Petrine orthography (http://www.transifex.com/projects/p/FusionDirectory-108/language/ru@petr1708/)\n"
+"Language-Team: Russian Petrine orthography (http://www.transifex.com/projects/p/FusionDirectory-109/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=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);\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/ldapdump/class_ldapDump.inc:26
 msgid "LDAP"
@@ -24,7 +24,3 @@ msgstr ""
 #: addons/ldapdump/class_ldapDump.inc:27 addons/ldapdump/class_ldapDump.inc:39
 msgid "LDAP Dump"
 msgstr ""
-
-#: addons/ldapdump/ldapdump.tpl.c:2
-msgid "Insufficient rights"
-msgstr ""
diff --git a/ldapdump/locale/sv/fusiondirectory.po b/ldapdump/locale/sv/fusiondirectory.po
index 6264f9244bb9aeef142ba6fd0b6741ad86313a82..298912e3d744777b73bdb67ca4a4674576c6122b 100644
--- a/ldapdump/locale/sv/fusiondirectory.po
+++ b/ldapdump/locale/sv/fusiondirectory.po
@@ -5,12 +5,12 @@
 # Translators:
 msgid ""
 msgstr ""
-"Project-Id-Version: FusionDirectory-108\n"
+"Project-Id-Version: FusionDirectory-109\n"
 "Report-Msgid-Bugs-To: documentation@lists.fusiondirectory.org\n"
-"POT-Creation-Date: 2015-03-19 21:45+0100\n"
-"PO-Revision-Date: 2015-02-25 16:03+0000\n"
+"POT-Creation-Date: 2014-12-15 17:47+0100\n"
+"PO-Revision-Date: 2014-12-15 16:59+0000\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>\n"
-"Language-Team: Swedish (http://www.transifex.com/projects/p/FusionDirectory-108/language/sv/)\n"
+"Language-Team: Swedish (http://www.transifex.com/projects/p/FusionDirectory-109/language/sv/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -24,7 +24,3 @@ msgstr ""
 #: addons/ldapdump/class_ldapDump.inc:27 addons/ldapdump/class_ldapDump.inc:39
 msgid "LDAP Dump"
 msgstr "LDAP-dumpning"
-
-#: addons/ldapdump/ldapdump.tpl.c:2
-msgid "Insufficient rights"
-msgstr "OtillrÃ¤ckliga rÃ¤ttigheter"
diff --git a/ldapdump/locale/ug/fusiondirectory.po b/ldapdump/locale/ug/fusiondirectory.po
index 5a51898b85d5b233993a07f5d2a8d57211c7f795..4c2afc8cc36fd1b414bbc5cb7541bf4fee330f27 100644
--- a/ldapdump/locale/ug/fusiondirectory.po
+++ b/ldapdump/locale/ug/fusiondirectory.po
@@ -5,12 +5,12 @@
 # Translators:
 msgid ""
 msgstr ""
-"Project-Id-Version: FusionDirectory-108\n"
+"Project-Id-Version: FusionDirectory-109\n"
 "Report-Msgid-Bugs-To: documentation@lists.fusiondirectory.org\n"
-"POT-Creation-Date: 2015-03-19 21:45+0100\n"
-"PO-Revision-Date: 2015-02-25 15:48+0000\n"
+"POT-Creation-Date: 2014-12-15 17:47+0100\n"
+"PO-Revision-Date: 2014-12-15 16:59+0000\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>\n"
-"Language-Team: Uighur (http://www.transifex.com/projects/p/FusionDirectory-108/language/ug/)\n"
+"Language-Team: Uighur (http://www.transifex.com/projects/p/FusionDirectory-109/language/ug/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -24,7 +24,3 @@ msgstr ""
 #: addons/ldapdump/class_ldapDump.inc:27 addons/ldapdump/class_ldapDump.inc:39
 msgid "LDAP Dump"
 msgstr ""
-
-#: addons/ldapdump/ldapdump.tpl.c:2
-msgid "Insufficient rights"
-msgstr ""
diff --git a/ldapdump/locale/vi_VN/fusiondirectory.po b/ldapdump/locale/vi_VN/fusiondirectory.po
index 28e332a25224818f351c4050b8334671a7ca90b5..400d91f2ed0ed921faf4dba13961833f0da18699 100644
--- a/ldapdump/locale/vi_VN/fusiondirectory.po
+++ b/ldapdump/locale/vi_VN/fusiondirectory.po
@@ -5,12 +5,12 @@
 # Translators:
 msgid ""
 msgstr ""
-"Project-Id-Version: FusionDirectory-108\n"
+"Project-Id-Version: FusionDirectory-109\n"
 "Report-Msgid-Bugs-To: documentation@lists.fusiondirectory.org\n"
-"POT-Creation-Date: 2015-03-19 21:45+0100\n"
-"PO-Revision-Date: 2015-02-25 15:48+0000\n"
+"POT-Creation-Date: 2014-12-15 17:47+0100\n"
+"PO-Revision-Date: 2014-12-15 16:59+0000\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>\n"
-"Language-Team: Vietnamese (Viet Nam) (http://www.transifex.com/projects/p/FusionDirectory-108/language/vi_VN/)\n"
+"Language-Team: Vietnamese (Viet Nam) (http://www.transifex.com/projects/p/FusionDirectory-109/language/vi_VN/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -24,7 +24,3 @@ msgstr "LDAP"
 #: addons/ldapdump/class_ldapDump.inc:27 addons/ldapdump/class_ldapDump.inc:39
 msgid "LDAP Dump"
 msgstr ""
-
-#: addons/ldapdump/ldapdump.tpl.c:2
-msgid "Insufficient rights"
-msgstr ""
diff --git a/ldapdump/locale/zh/fusiondirectory.po b/ldapdump/locale/zh/fusiondirectory.po
index 88168088ca494abaa9614c828eddfb38a2a8efdb..330df629bd56477c88f441a3620c67cbf6b9c880 100644
--- a/ldapdump/locale/zh/fusiondirectory.po
+++ b/ldapdump/locale/zh/fusiondirectory.po
@@ -5,12 +5,12 @@
 # Translators:
 msgid ""
 msgstr ""
-"Project-Id-Version: FusionDirectory-108\n"
+"Project-Id-Version: FusionDirectory-109\n"
 "Report-Msgid-Bugs-To: documentation@lists.fusiondirectory.org\n"
-"POT-Creation-Date: 2015-03-19 21:45+0100\n"
-"PO-Revision-Date: 2015-02-25 15:48+0000\n"
+"POT-Creation-Date: 2014-12-15 17:47+0100\n"
+"PO-Revision-Date: 2014-12-15 16:59+0000\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>\n"
-"Language-Team: Chinese (http://www.transifex.com/projects/p/FusionDirectory-108/language/zh/)\n"
+"Language-Team: Chinese (http://www.transifex.com/projects/p/FusionDirectory-109/language/zh/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -24,7 +24,3 @@ msgstr ""
 #: addons/ldapdump/class_ldapDump.inc:27 addons/ldapdump/class_ldapDump.inc:39
 msgid "LDAP Dump"
 msgstr ""
-
-#: addons/ldapdump/ldapdump.tpl.c:2
-msgid "Insufficient rights"
-msgstr ""
diff --git a/ldapmanager/locale/ar/fusiondirectory.po b/ldapmanager/locale/ar/fusiondirectory.po
index 761ec1cc80674a4ce509bfd039b180e1f15e8c81..30681d30a39e5bea1ae5067a957abca3b0b58eb1 100644
--- a/ldapmanager/locale/ar/fusiondirectory.po
+++ b/ldapmanager/locale/ar/fusiondirectory.po
@@ -5,12 +5,12 @@
 # Translators:
 msgid ""
 msgstr ""
-"Project-Id-Version: FusionDirectory-108\n"
+"Project-Id-Version: FusionDirectory-109\n"
 "Report-Msgid-Bugs-To: documentation@lists.fusiondirectory.org\n"
-"POT-Creation-Date: 2015-03-19 21:45+0100\n"
-"PO-Revision-Date: 2015-02-25 16:02+0000\n"
+"POT-Creation-Date: 2014-12-15 17:47+0100\n"
+"PO-Revision-Date: 2014-12-15 16:59+0000\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>\n"
-"Language-Team: Arabic (http://www.transifex.com/projects/p/FusionDirectory-108/language/ar/)\n"
+"Language-Team: Arabic (http://www.transifex.com/projects/p/FusionDirectory-109/language/ar/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -82,8 +82,8 @@ msgid ""
 msgstr ""
 
 #: addons/ldapmanager/class_ldapmanager.inc:102
-#: addons/ldapmanager/contentcsv.tpl.c:26
-#: addons/ldapmanager/contentcsv.tpl.c:29
+#: addons/ldapmanager/class_csvimport.inc:70
+#: addons/ldapmanager/class_csvimport.inc:93
 msgid "Import"
 msgstr ""
 
@@ -91,38 +91,31 @@ msgstr ""
 msgid "Import LDIF file"
 msgstr ""
 
-#: addons/ldapmanager/class_ldapmanager.inc:147
-#: addons/ldapmanager/class_ldapmanager.inc:186
+#: addons/ldapmanager/class_ldapmanager.inc:133
+#: addons/ldapmanager/class_ldapmanager.inc:175
 msgid "LDAP error"
 msgstr ""
 
-#: addons/ldapmanager/class_ldapmanager.inc:148
+#: addons/ldapmanager/class_ldapmanager.inc:134
 #, php-format
 msgid "No such object %s!"
 msgstr ""
 
-#: addons/ldapmanager/class_ldapmanager.inc:162
-#: addons/ldapmanager/class_csvimport.inc:137
+#: addons/ldapmanager/class_ldapmanager.inc:152
 msgid "Permission error"
 msgstr ""
 
-#: addons/ldapmanager/class_ldapmanager.inc:163
+#: addons/ldapmanager/class_ldapmanager.inc:153
 #, php-format
 msgid "You have no permission to export %s!"
 msgstr ""
 
-#: addons/ldapmanager/class_ldapmanager.inc:168
-#: addons/ldapmanager/class_csvimport.inc:188
-#: addons/ldapmanager/class_csvimport.inc:351
-#: addons/ldapmanager/class_csvimport.inc:388
-#: addons/ldapmanager/class_csvimport.inc:391
-#: addons/ldapmanager/class_csvimport.inc:394
-#: addons/ldapmanager/class_csvimport.inc:397
-#: addons/ldapmanager/class_csvimport.inc:545
+#: addons/ldapmanager/class_ldapmanager.inc:159
+#: addons/ldapmanager/class_csvimport.inc:181
 msgid "Error"
 msgstr "Ø®Ø·Ø£"
 
-#: addons/ldapmanager/class_ldapmanager.inc:169
+#: addons/ldapmanager/class_ldapmanager.inc:160
 #, php-format
 msgid "Failed to generate ldap export, error was \"%s\"!"
 msgstr ""
@@ -139,107 +132,72 @@ msgstr ""
 msgid "Ldap manager"
 msgstr ""
 
-#: addons/ldapmanager/class_csvimport.inc:39
+#: addons/ldapmanager/class_csvimport.inc:28
 msgid "CSV import"
 msgstr ""
 
-#: addons/ldapmanager/class_csvimport.inc:40
+#: addons/ldapmanager/class_csvimport.inc:29
 msgid "Import of csv data into the ldap tree"
 msgstr ""
 
-#: addons/ldapmanager/class_csvimport.inc:137
-msgid "You've no permission to import CSV files."
+#: addons/ldapmanager/class_csvimport.inc:42
+msgid "Import CSV"
 msgstr ""
 
-#: addons/ldapmanager/class_csvimport.inc:188
-msgid "Need at least 'sn' and 'givenName' to create users!"
+#: addons/ldapmanager/class_csvimport.inc:45
+msgid "Object type"
 msgstr ""
 
-#: addons/ldapmanager/class_csvimport.inc:189
-#: addons/ldapmanager/class_csvimport.inc:221
-#: addons/ldapmanager/class_csvimport.inc:287
-msgid "failed"
+#: addons/ldapmanager/class_csvimport.inc:45
+msgid "Type of objects you wish to import"
 msgstr ""
 
-#: addons/ldapmanager/class_csvimport.inc:220
-#, php-format
-msgid "Failed to generate 'uid' for entry '%s'!"
-msgstr ""
-
-#: addons/ldapmanager/class_csvimport.inc:291
-msgid "ok"
-msgstr ""
-
-#: addons/ldapmanager/class_csvimport.inc:351
-#, php-format
-msgid "Cannot insert entry '%s'!"
+#: addons/ldapmanager/class_csvimport.inc:49
+msgid "Template"
 msgstr ""
 
-#: addons/ldapmanager/class_csvimport.inc:377
-msgid "Information"
-msgstr "Ù…Ø¹Ù„ÙˆÙ…Ø§Øª"
-
-#: addons/ldapmanager/class_csvimport.inc:377
-msgid "Nothing to import!"
+#: addons/ldapmanager/class_csvimport.inc:49
+msgid "Select a template to apply to imported entries"
 msgstr ""
 
-#: addons/ldapmanager/class_csvimport.inc:388
-#: addons/ldapmanager/class_csvimport.inc:391
-#: addons/ldapmanager/class_csvimport.inc:394
-#: addons/ldapmanager/class_csvimport.inc:397
-#, php-format
-msgid "Cannot read uploaded file: %s"
+#: addons/ldapmanager/class_csvimport.inc:53
+msgid "CSV file"
 msgstr ""
 
-#: addons/ldapmanager/class_csvimport.inc:388
-#: addons/ldapmanager/class_csvimport.inc:394
-msgid "file not found"
+#: addons/ldapmanager/class_csvimport.inc:53
+msgid "Import a CSV file into your LDAP"
 msgstr ""
 
-#: addons/ldapmanager/class_csvimport.inc:391
-msgid "file is empty"
+#: addons/ldapmanager/class_csvimport.inc:57
+msgid "Separator"
 msgstr ""
 
-#: addons/ldapmanager/class_csvimport.inc:397
-msgid "file not readable"
+#: addons/ldapmanager/class_csvimport.inc:57
+msgid "Character used as separator in the CSV file"
 msgstr ""
 
-#: addons/ldapmanager/class_csvimport.inc:545
-msgid "Cannot find CSV data in the selected file!"
+#: addons/ldapmanager/class_csvimport.inc:63
+msgid "Fixed values"
 msgstr ""
 
-#: addons/ldapmanager/contentcsv.tpl.c:2
+#: addons/ldapmanager/class_csvimport.inc:63
 msgid ""
-"The CSV import plugin provides methods to generate user accounts from a file"
-" containing Semi-Colon Seperated Values. The administrator can decide which "
-"columns should be transfered to which attribute. Note that you must have at "
-"least the GIVENNAME and SURNAME set."
+"Some fixed values that you might wanna use in the filling of the template."
 msgstr ""
 
-#: addons/ldapmanager/contentcsv.tpl.c:5
-msgid "Select CSV file to import"
+#: addons/ldapmanager/class_csvimport.inc:75
+msgid "Template filling"
 msgstr ""
 
-#: addons/ldapmanager/contentcsv.tpl.c:8
-msgid "Browse"
+#: addons/ldapmanager/class_csvimport.inc:84
+msgid "Select fields associations"
 msgstr ""
 
-#: addons/ldapmanager/contentcsv.tpl.c:11
-msgid "Select template"
+#: addons/ldapmanager/class_csvimport.inc:190
+msgid "Success"
 msgstr ""
 
-#: addons/ldapmanager/contentcsv.tpl.c:14
-msgid "All entries have been written to the LDAP database successfully."
-msgstr ""
-
-#: addons/ldapmanager/contentcsv.tpl.c:17
-msgid "Oups. There was an error during the import of your data."
-msgstr ""
-
-#: addons/ldapmanager/contentcsv.tpl.c:20
-msgid "Here is the status report for the import:"
-msgstr ""
-
-#: addons/ldapmanager/contentcsv.tpl.c:23
-msgid "Selected Template"
+#: addons/ldapmanager/class_csvimport.inc:190
+#, php-format
+msgid "Successfully imported %d entries"
 msgstr ""
diff --git a/ldapmanager/locale/ca/fusiondirectory.po b/ldapmanager/locale/ca/fusiondirectory.po
index 23cd37e9342e0e1412e40d4d643463fd89d9207d..17f3ded618372c827a95effde33eefe0be8303e7 100644
--- a/ldapmanager/locale/ca/fusiondirectory.po
+++ b/ldapmanager/locale/ca/fusiondirectory.po
@@ -5,12 +5,12 @@
 # Translators:
 msgid ""
 msgstr ""
-"Project-Id-Version: FusionDirectory-108\n"
+"Project-Id-Version: FusionDirectory-109\n"
 "Report-Msgid-Bugs-To: documentation@lists.fusiondirectory.org\n"
-"POT-Creation-Date: 2015-03-19 21:45+0100\n"
-"PO-Revision-Date: 2015-02-25 16:02+0000\n"
+"POT-Creation-Date: 2014-12-15 17:47+0100\n"
+"PO-Revision-Date: 2015-02-13 16:32+0000\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>\n"
-"Language-Team: Catalan (http://www.transifex.com/projects/p/FusionDirectory-108/language/ca/)\n"
+"Language-Team: Catalan (http://www.transifex.com/projects/p/FusionDirectory-109/language/ca/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -82,8 +82,8 @@ msgid ""
 msgstr ""
 
 #: addons/ldapmanager/class_ldapmanager.inc:102
-#: addons/ldapmanager/contentcsv.tpl.c:26
-#: addons/ldapmanager/contentcsv.tpl.c:29
+#: addons/ldapmanager/class_csvimport.inc:70
+#: addons/ldapmanager/class_csvimport.inc:93
 msgid "Import"
 msgstr ""
 
@@ -91,38 +91,31 @@ msgstr ""
 msgid "Import LDIF file"
 msgstr ""
 
-#: addons/ldapmanager/class_ldapmanager.inc:147
-#: addons/ldapmanager/class_ldapmanager.inc:186
+#: addons/ldapmanager/class_ldapmanager.inc:133
+#: addons/ldapmanager/class_ldapmanager.inc:175
 msgid "LDAP error"
 msgstr "Error d'LDAP"
 
-#: addons/ldapmanager/class_ldapmanager.inc:148
+#: addons/ldapmanager/class_ldapmanager.inc:134
 #, php-format
 msgid "No such object %s!"
 msgstr ""
 
-#: addons/ldapmanager/class_ldapmanager.inc:162
-#: addons/ldapmanager/class_csvimport.inc:137
+#: addons/ldapmanager/class_ldapmanager.inc:152
 msgid "Permission error"
 msgstr ""
 
-#: addons/ldapmanager/class_ldapmanager.inc:163
+#: addons/ldapmanager/class_ldapmanager.inc:153
 #, php-format
 msgid "You have no permission to export %s!"
 msgstr ""
 
-#: addons/ldapmanager/class_ldapmanager.inc:168
-#: addons/ldapmanager/class_csvimport.inc:188
-#: addons/ldapmanager/class_csvimport.inc:351
-#: addons/ldapmanager/class_csvimport.inc:388
-#: addons/ldapmanager/class_csvimport.inc:391
-#: addons/ldapmanager/class_csvimport.inc:394
-#: addons/ldapmanager/class_csvimport.inc:397
-#: addons/ldapmanager/class_csvimport.inc:545
+#: addons/ldapmanager/class_ldapmanager.inc:159
+#: addons/ldapmanager/class_csvimport.inc:181
 msgid "Error"
 msgstr "Error"
 
-#: addons/ldapmanager/class_ldapmanager.inc:169
+#: addons/ldapmanager/class_ldapmanager.inc:160
 #, php-format
 msgid "Failed to generate ldap export, error was \"%s\"!"
 msgstr ""
@@ -139,107 +132,72 @@ msgstr ""
 msgid "Ldap manager"
 msgstr ""
 
-#: addons/ldapmanager/class_csvimport.inc:39
+#: addons/ldapmanager/class_csvimport.inc:28
 msgid "CSV import"
 msgstr ""
 
-#: addons/ldapmanager/class_csvimport.inc:40
+#: addons/ldapmanager/class_csvimport.inc:29
 msgid "Import of csv data into the ldap tree"
 msgstr ""
 
-#: addons/ldapmanager/class_csvimport.inc:137
-msgid "You've no permission to import CSV files."
+#: addons/ldapmanager/class_csvimport.inc:42
+msgid "Import CSV"
 msgstr ""
 
-#: addons/ldapmanager/class_csvimport.inc:188
-msgid "Need at least 'sn' and 'givenName' to create users!"
+#: addons/ldapmanager/class_csvimport.inc:45
+msgid "Object type"
 msgstr ""
 
-#: addons/ldapmanager/class_csvimport.inc:189
-#: addons/ldapmanager/class_csvimport.inc:221
-#: addons/ldapmanager/class_csvimport.inc:287
-msgid "failed"
+#: addons/ldapmanager/class_csvimport.inc:45
+msgid "Type of objects you wish to import"
 msgstr ""
 
-#: addons/ldapmanager/class_csvimport.inc:220
-#, php-format
-msgid "Failed to generate 'uid' for entry '%s'!"
-msgstr ""
-
-#: addons/ldapmanager/class_csvimport.inc:291
-msgid "ok"
-msgstr ""
-
-#: addons/ldapmanager/class_csvimport.inc:351
-#, php-format
-msgid "Cannot insert entry '%s'!"
+#: addons/ldapmanager/class_csvimport.inc:49
+msgid "Template"
 msgstr ""
 
-#: addons/ldapmanager/class_csvimport.inc:377
-msgid "Information"
-msgstr "InformaciÃ³"
-
-#: addons/ldapmanager/class_csvimport.inc:377
-msgid "Nothing to import!"
+#: addons/ldapmanager/class_csvimport.inc:49
+msgid "Select a template to apply to imported entries"
 msgstr ""
 
-#: addons/ldapmanager/class_csvimport.inc:388
-#: addons/ldapmanager/class_csvimport.inc:391
-#: addons/ldapmanager/class_csvimport.inc:394
-#: addons/ldapmanager/class_csvimport.inc:397
-#, php-format
-msgid "Cannot read uploaded file: %s"
+#: addons/ldapmanager/class_csvimport.inc:53
+msgid "CSV file"
 msgstr ""
 
-#: addons/ldapmanager/class_csvimport.inc:388
-#: addons/ldapmanager/class_csvimport.inc:394
-msgid "file not found"
+#: addons/ldapmanager/class_csvimport.inc:53
+msgid "Import a CSV file into your LDAP"
 msgstr ""
 
-#: addons/ldapmanager/class_csvimport.inc:391
-msgid "file is empty"
+#: addons/ldapmanager/class_csvimport.inc:57
+msgid "Separator"
 msgstr ""
 
-#: addons/ldapmanager/class_csvimport.inc:397
-msgid "file not readable"
+#: addons/ldapmanager/class_csvimport.inc:57
+msgid "Character used as separator in the CSV file"
 msgstr ""
 
-#: addons/ldapmanager/class_csvimport.inc:545
-msgid "Cannot find CSV data in the selected file!"
+#: addons/ldapmanager/class_csvimport.inc:63
+msgid "Fixed values"
 msgstr ""
 
-#: addons/ldapmanager/contentcsv.tpl.c:2
+#: addons/ldapmanager/class_csvimport.inc:63
 msgid ""
-"The CSV import plugin provides methods to generate user accounts from a file"
-" containing Semi-Colon Seperated Values. The administrator can decide which "
-"columns should be transfered to which attribute. Note that you must have at "
-"least the GIVENNAME and SURNAME set."
+"Some fixed values that you might wanna use in the filling of the template."
 msgstr ""
 
-#: addons/ldapmanager/contentcsv.tpl.c:5
-msgid "Select CSV file to import"
+#: addons/ldapmanager/class_csvimport.inc:75
+msgid "Template filling"
 msgstr ""
 
-#: addons/ldapmanager/contentcsv.tpl.c:8
-msgid "Browse"
+#: addons/ldapmanager/class_csvimport.inc:84
+msgid "Select fields associations"
 msgstr ""
 
-#: addons/ldapmanager/contentcsv.tpl.c:11
-msgid "Select template"
-msgstr ""
-
-#: addons/ldapmanager/contentcsv.tpl.c:14
-msgid "All entries have been written to the LDAP database successfully."
-msgstr ""
-
-#: addons/ldapmanager/contentcsv.tpl.c:17
-msgid "Oups. There was an error during the import of your data."
-msgstr ""
-
-#: addons/ldapmanager/contentcsv.tpl.c:20
-msgid "Here is the status report for the import:"
-msgstr ""
+#: addons/ldapmanager/class_csvimport.inc:190
+msgid "Success"
+msgstr "Ãˆxit"
 
-#: addons/ldapmanager/contentcsv.tpl.c:23
-msgid "Selected Template"
+#: addons/ldapmanager/class_csvimport.inc:190
+#, php-format
+msgid "Successfully imported %d entries"
 msgstr ""
diff --git a/ldapmanager/locale/cs_CZ/fusiondirectory.po b/ldapmanager/locale/cs_CZ/fusiondirectory.po
index 261331862e46c7952711cd3fe2fcdaf2cf522db8..1c1c828eac7d52fb9c3b78bc6b99313ccbb0d163 100644
--- a/ldapmanager/locale/cs_CZ/fusiondirectory.po
+++ b/ldapmanager/locale/cs_CZ/fusiondirectory.po
@@ -3,17 +3,15 @@
 # This file is distributed under the same license as the PACKAGE package.
 # 
 # Translators:
-# Pavel Borecki <pavel.borecki@gmail.com>, 2012
-# Pavel Borecki <pavel.borecki@gmail.com>, 2012
-# Pavel Borecki <pavel.borecki@gmail.com>, 2012
+# Pavel Borecki <pavel.borecki@gmail.com>, 2014-2015
 msgid ""
 msgstr ""
-"Project-Id-Version: FusionDirectory-108\n"
+"Project-Id-Version: FusionDirectory-109\n"
 "Report-Msgid-Bugs-To: documentation@lists.fusiondirectory.org\n"
-"POT-Creation-Date: 2015-03-19 21:45+0100\n"
-"PO-Revision-Date: 2015-02-25 16:12+0000\n"
-"Last-Translator: fusiondirectory <contact@fusiondirectory.org>\n"
-"Language-Team: Czech (Czech Republic) (http://www.transifex.com/projects/p/FusionDirectory-108/language/cs_CZ/)\n"
+"POT-Creation-Date: 2014-12-15 17:47+0100\n"
+"PO-Revision-Date: 2015-04-07 19:16+0000\n"
+"Last-Translator: Pavel Borecki <pavel.borecki@gmail.com>\n"
+"Language-Team: Czech (Czech Republic) (http://www.transifex.com/projects/p/FusionDirectory-109/language/cs_CZ/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -26,7 +24,7 @@ msgstr ""
 
 #: addons/ldapmanager/class_ldapmanager.inc:29
 msgid "Export/Import the ldap tree to/from LDIF format"
-msgstr ""
+msgstr "Exportovat/importovat ldap strom do/z LDIF formÃ¡tu"
 
 #: addons/ldapmanager/class_ldapmanager.inc:31
 msgid "LDAP Manager"
@@ -40,209 +38,167 @@ msgstr "export(ovat)"
 
 #: addons/ldapmanager/class_ldapmanager.inc:46
 msgid "DN of a single entry to export as ldif"
-msgstr ""
+msgstr "RozliÅ¡enÃ½ nÃ¡zev jednÃ© poloÅ¾ky k exportu v podobÄ› ldif"
 
 #: addons/ldapmanager/class_ldapmanager.inc:60
 msgid "Export single entry"
-msgstr "exportovat jedinou poloÅ¾ku"
+msgstr "Exportovat jedinou poloÅ¾ku"
 
 #: addons/ldapmanager/class_ldapmanager.inc:63
 msgid "Filter"
-msgstr "filtr"
+msgstr "Filtr"
 
 #: addons/ldapmanager/class_ldapmanager.inc:63
 msgid "Filter to use for selecting objects to export"
-msgstr ""
+msgstr "Filtr, kterÃ½ pouÅ¾Ãt pro vÃ½bÄ›r objektÅ¯ k exportu"
 
 #: addons/ldapmanager/class_ldapmanager.inc:68
 msgid ""
 "Download a complete snapshot of the running LDAP directory for this base as "
 "ldif"
-msgstr ""
+msgstr "StÃ¡hnout ÃºplnÃ½ zachycenÃ½ stav bÄ›Å¾ÃcÃho LDAP adresÃ¡Å™e tohoto zÃ¡kladu do ldif"
 
 #: addons/ldapmanager/class_ldapmanager.inc:79
 msgid "Export complete LDIF for"
-msgstr "exportovat ÃºplnÃ½ LDIF pro"
+msgstr "Exportovat ÃºplnÃ½ LDIF pro"
 
 #: addons/ldapmanager/class_ldapmanager.inc:84
 msgid "Import LDIF"
-msgstr ""
+msgstr "Importovat LDIF"
 
 #: addons/ldapmanager/class_ldapmanager.inc:87
 msgid "Overwrite existing entries"
-msgstr ""
+msgstr "PÅ™epsat existujÃcÃ poloÅ¾ky"
 
 #: addons/ldapmanager/class_ldapmanager.inc:87
 msgid ""
 "Remove fields that are not in the LDIF from the LDAP entries if they were "
 "existing."
-msgstr ""
+msgstr "Odebrat z LDAP poloÅ¾ky, kterÃ© jsou navÃc oproti tomu, co je v LDIF."
 
 #: addons/ldapmanager/class_ldapmanager.inc:92
 msgid ""
 "Import an LDIF file into your LDAP. Remember that FusionDirectory will not "
 "check your LDIFs for FusionDirectory conformance."
-msgstr ""
+msgstr "Import LDIF souboru do vaÅ¡Ã 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:102
-#: addons/ldapmanager/contentcsv.tpl.c:26
-#: addons/ldapmanager/contentcsv.tpl.c:29
+#: addons/ldapmanager/class_csvimport.inc:70
+#: addons/ldapmanager/class_csvimport.inc:93
 msgid "Import"
 msgstr "import(ovat)"
 
 #: addons/ldapmanager/class_ldapmanager.inc:106
 msgid "Import LDIF file"
-msgstr ""
+msgstr "Importovat LDIF soubor"
 
-#: addons/ldapmanager/class_ldapmanager.inc:147
-#: addons/ldapmanager/class_ldapmanager.inc:186
+#: addons/ldapmanager/class_ldapmanager.inc:133
+#: addons/ldapmanager/class_ldapmanager.inc:175
 msgid "LDAP error"
-msgstr "chyba LDAPu"
+msgstr "Chyba LDAP"
 
-#: addons/ldapmanager/class_ldapmanager.inc:148
+#: addons/ldapmanager/class_ldapmanager.inc:134
 #, php-format
 msgid "No such object %s!"
 msgstr "Objekt %s neexistuje!"
 
-#: addons/ldapmanager/class_ldapmanager.inc:162
-#: addons/ldapmanager/class_csvimport.inc:137
+#: addons/ldapmanager/class_ldapmanager.inc:152
 msgid "Permission error"
-msgstr "chyba oprÃ¡vnÄ›nÃ"
+msgstr "Chyba oprÃ¡vnÄ›nÃ"
 
-#: addons/ldapmanager/class_ldapmanager.inc:163
+#: addons/ldapmanager/class_ldapmanager.inc:153
 #, php-format
 msgid "You have no permission to export %s!"
-msgstr "Nejste oprÃ¡vnÄ›n(a) exportovat %s!"
-
-#: addons/ldapmanager/class_ldapmanager.inc:168
-#: addons/ldapmanager/class_csvimport.inc:188
-#: addons/ldapmanager/class_csvimport.inc:351
-#: addons/ldapmanager/class_csvimport.inc:388
-#: addons/ldapmanager/class_csvimport.inc:391
-#: addons/ldapmanager/class_csvimport.inc:394
-#: addons/ldapmanager/class_csvimport.inc:397
-#: addons/ldapmanager/class_csvimport.inc:545
+msgstr "Nejste oprÃ¡vnÄ›ni exportovat %s!"
+
+#: addons/ldapmanager/class_ldapmanager.inc:159
+#: addons/ldapmanager/class_csvimport.inc:181
 msgid "Error"
-msgstr "chyba"
+msgstr "Chyba"
 
-#: addons/ldapmanager/class_ldapmanager.inc:169
+#: addons/ldapmanager/class_ldapmanager.inc:160
 #, php-format
 msgid "Failed to generate ldap export, error was \"%s\"!"
-msgstr ""
+msgstr "VytvoÅ™enÃ ldap exportu se nezdaÅ™ilo, chyba je v %s!"
 
 #: addons/ldapmanager/tabs_ldif.inc:38
 msgid "LDAP import/export"
-msgstr "import/export LDAP"
+msgstr "Import/export LDAP"
 
 #: addons/ldapmanager/tabs_ldif.inc:39
 msgid "Allows the import or export of the ldap tree"
-msgstr ""
+msgstr "UmoÅ¾Åˆuje importovat Äi exportovat ldap strom"
 
 #: addons/ldapmanager/tabs_ldif.inc:43
 msgid "Ldap manager"
-msgstr "sprÃ¡vce LDAPu"
+msgstr "sprÃ¡vce LDAP"
 
-#: addons/ldapmanager/class_csvimport.inc:39
+#: addons/ldapmanager/class_csvimport.inc:28
 msgid "CSV import"
-msgstr "import(ovat) CSV"
+msgstr "Import CSV"
 
-#: addons/ldapmanager/class_csvimport.inc:40
+#: addons/ldapmanager/class_csvimport.inc:29
 msgid "Import of csv data into the ldap tree"
-msgstr ""
+msgstr "Importovat csv data do ldap stromu"
 
-#: addons/ldapmanager/class_csvimport.inc:137
-msgid "You've no permission to import CSV files."
-msgstr "Nejste oprÃ¡vnÄ›n(a) importovat CSV soubory."
+#: addons/ldapmanager/class_csvimport.inc:42
+msgid "Import CSV"
+msgstr "Importovat CSV"
 
-#: addons/ldapmanager/class_csvimport.inc:188
-msgid "Need at least 'sn' and 'givenName' to create users!"
-msgstr ""
+#: addons/ldapmanager/class_csvimport.inc:45
+msgid "Object type"
+msgstr "Typ objektu"
 
-#: addons/ldapmanager/class_csvimport.inc:189
-#: addons/ldapmanager/class_csvimport.inc:221
-#: addons/ldapmanager/class_csvimport.inc:287
-msgid "failed"
-msgstr "selhalo"
+#: addons/ldapmanager/class_csvimport.inc:45
+msgid "Type of objects you wish to import"
+msgstr "Typ objektÅ¯, kterÃ© chcete importovat"
 
-#: addons/ldapmanager/class_csvimport.inc:220
-#, php-format
-msgid "Failed to generate 'uid' for entry '%s'!"
-msgstr ""
+#: addons/ldapmanager/class_csvimport.inc:49
+msgid "Template"
+msgstr "Å ablona"
 
-#: addons/ldapmanager/class_csvimport.inc:291
-msgid "ok"
-msgstr "ok"
+#: addons/ldapmanager/class_csvimport.inc:49
+msgid "Select a template to apply to imported entries"
+msgstr "Vyberte Å¡ablonu, kterou aplikovat na importovanÃ© poloÅ¾ky"
 
-#: addons/ldapmanager/class_csvimport.inc:351
-#, php-format
-msgid "Cannot insert entry '%s'!"
-msgstr "NedaÅ™Ã se vloÅ¾it poloÅ¾ku '%s'!"
+#: addons/ldapmanager/class_csvimport.inc:53
+msgid "CSV file"
+msgstr "Soubor CSV"
 
-#: addons/ldapmanager/class_csvimport.inc:377
-msgid "Information"
-msgstr "informace"
-
-#: addons/ldapmanager/class_csvimport.inc:377
-msgid "Nothing to import!"
-msgstr "NenÃ co importovat!"
-
-#: addons/ldapmanager/class_csvimport.inc:388
-#: addons/ldapmanager/class_csvimport.inc:391
-#: addons/ldapmanager/class_csvimport.inc:394
-#: addons/ldapmanager/class_csvimport.inc:397
-#, php-format
-msgid "Cannot read uploaded file: %s"
-msgstr "Nelze pÅ™eÄÃst nahranÃ½ soubor: %s"
+#: addons/ldapmanager/class_csvimport.inc:53
+msgid "Import a CSV file into your LDAP"
+msgstr "Importovat CSV soubor do databÃ¡ze LDAP"
 
-#: addons/ldapmanager/class_csvimport.inc:388
-#: addons/ldapmanager/class_csvimport.inc:394
-msgid "file not found"
-msgstr "soubor nebyl nenalezen"
+#: addons/ldapmanager/class_csvimport.inc:57
+msgid "Separator"
+msgstr "OddÄ›lovaÄ"
 
-#: addons/ldapmanager/class_csvimport.inc:391
-msgid "file is empty"
-msgstr "soubor je prÃ¡zdnÃ½"
+#: addons/ldapmanager/class_csvimport.inc:57
+msgid "Character used as separator in the CSV file"
+msgstr "Znak slouÅ¾ÃcÃ jako oddÄ›lovaÄ v CSV souboru"
 
-#: addons/ldapmanager/class_csvimport.inc:397
-msgid "file not readable"
-msgstr "soubor nenÃ ÄitelnÃ½"
+#: addons/ldapmanager/class_csvimport.inc:63
+msgid "Fixed values"
+msgstr "NemÄ›nnÃ© hodnoty"
 
-#: addons/ldapmanager/class_csvimport.inc:545
-msgid "Cannot find CSV data in the selected file!"
-msgstr "Ve zvolenÃ©m souboru se nenachÃ¡zejÃ Å¾Ã¡dnÃ¡ data ve formÃ¡tu CSV!"
-
-#: addons/ldapmanager/contentcsv.tpl.c:2
+#: addons/ldapmanager/class_csvimport.inc:63
 msgid ""
-"The CSV import plugin provides methods to generate user accounts from a file"
-" containing Semi-Colon Seperated Values. The administrator can decide which "
-"columns should be transfered to which attribute. Note that you must have at "
-"least the GIVENNAME and SURNAME set."
-msgstr ""
-
-#: addons/ldapmanager/contentcsv.tpl.c:5
-msgid "Select CSV file to import"
-msgstr "vyberte CSV soubor, kterÃ½ bude importovÃ¡n"
+"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/contentcsv.tpl.c:8
-msgid "Browse"
-msgstr "prochÃ¡zet"
+#: addons/ldapmanager/class_csvimport.inc:75
+msgid "Template filling"
+msgstr "VyplÅˆovÃ¡nÃ Å¡ablony"
 
-#: addons/ldapmanager/contentcsv.tpl.c:11
-msgid "Select template"
-msgstr "zvolit Å¡ablonu"
+#: addons/ldapmanager/class_csvimport.inc:84
+msgid "Select fields associations"
+msgstr "Vyberte pÅ™iÅ™azenÃ polÃÄek"
 
-#: addons/ldapmanager/contentcsv.tpl.c:14
-msgid "All entries have been written to the LDAP database successfully."
-msgstr "VÅ¡echny poloÅ¾ky byly ÃºspÄ›Å¡nÄ› zapsÃ¡ny do databÃ¡ze LDAPu."
+#: addons/ldapmanager/class_csvimport.inc:190
+msgid "Success"
+msgstr "ÃšspÄ›ch"
 
-#: addons/ldapmanager/contentcsv.tpl.c:17
-msgid "Oups. There was an error during the import of your data."
-msgstr "Ouha. PÅ™i importu VaÅ¡ich dat se vyskytla chyba."
-
-#: addons/ldapmanager/contentcsv.tpl.c:20
-msgid "Here is the status report for the import:"
-msgstr "Zde je hlÃ¡Å¡enÃ o provedenÃ©m importu:"
-
-#: addons/ldapmanager/contentcsv.tpl.c:23
-msgid "Selected Template"
-msgstr "zvolenÃ¡ Å¡ablona"
+#: addons/ldapmanager/class_csvimport.inc:190
+#, php-format
+msgid "Successfully imported %d entries"
+msgstr "%d poloÅ¾ek bylo ÃºspÄ›Å¡nÄ› importovÃ¡no"
diff --git a/ldapmanager/locale/de/fusiondirectory.po b/ldapmanager/locale/de/fusiondirectory.po
index c386d20e4cbc73eb22c3d605bf4408b920286ce2..ae82508c758b5f1f3dd36323669d2d1f0a6f39df 100644
--- a/ldapmanager/locale/de/fusiondirectory.po
+++ b/ldapmanager/locale/de/fusiondirectory.po
@@ -3,16 +3,15 @@
 # This file is distributed under the same license as the PACKAGE package.
 # 
 # Translators:
-# Maik Wagner <maikwagner@yahoo.com>, 2013-2014
-#  Stefan Koehler <stefan.koehler@GONICUS.de>, 2005
+# Ettore Atalan <atalanttore@googlemail.com>, 2014
 msgid ""
 msgstr ""
-"Project-Id-Version: FusionDirectory-108\n"
+"Project-Id-Version: FusionDirectory-109\n"
 "Report-Msgid-Bugs-To: documentation@lists.fusiondirectory.org\n"
-"POT-Creation-Date: 2015-03-19 21:45+0100\n"
-"PO-Revision-Date: 2015-02-25 16:12+0000\n"
-"Last-Translator: fusiondirectory <contact@fusiondirectory.org>\n"
-"Language-Team: German (http://www.transifex.com/projects/p/FusionDirectory-108/language/de/)\n"
+"POT-Creation-Date: 2014-12-15 17:47+0100\n"
+"PO-Revision-Date: 2015-02-25 16:13+0000\n"
+"Last-Translator: Ettore Atalan <atalanttore@googlemail.com>\n"
+"Language-Team: German (http://www.transifex.com/projects/p/FusionDirectory-109/language/de/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -84,8 +83,8 @@ msgid ""
 msgstr ""
 
 #: addons/ldapmanager/class_ldapmanager.inc:102
-#: addons/ldapmanager/contentcsv.tpl.c:26
-#: addons/ldapmanager/contentcsv.tpl.c:29
+#: addons/ldapmanager/class_csvimport.inc:70
+#: addons/ldapmanager/class_csvimport.inc:93
 msgid "Import"
 msgstr "Importieren"
 
@@ -93,38 +92,31 @@ msgstr "Importieren"
 msgid "Import LDIF file"
 msgstr "LDIF-Datei importieren"
 
-#: addons/ldapmanager/class_ldapmanager.inc:147
-#: addons/ldapmanager/class_ldapmanager.inc:186
+#: addons/ldapmanager/class_ldapmanager.inc:133
+#: addons/ldapmanager/class_ldapmanager.inc:175
 msgid "LDAP error"
 msgstr "LDAP-Fehler"
 
-#: addons/ldapmanager/class_ldapmanager.inc:148
+#: addons/ldapmanager/class_ldapmanager.inc:134
 #, php-format
 msgid "No such object %s!"
 msgstr "Objekt %s nicht gefunden!"
 
-#: addons/ldapmanager/class_ldapmanager.inc:162
-#: addons/ldapmanager/class_csvimport.inc:137
+#: addons/ldapmanager/class_ldapmanager.inc:152
 msgid "Permission error"
 msgstr "Berechtigungsfehler"
 
-#: addons/ldapmanager/class_ldapmanager.inc:163
+#: addons/ldapmanager/class_ldapmanager.inc:153
 #, php-format
 msgid "You have no permission to export %s!"
 msgstr "Sie haben keine Berechtigung, um %s zu exportieren!"
 
-#: addons/ldapmanager/class_ldapmanager.inc:168
-#: addons/ldapmanager/class_csvimport.inc:188
-#: addons/ldapmanager/class_csvimport.inc:351
-#: addons/ldapmanager/class_csvimport.inc:388
-#: addons/ldapmanager/class_csvimport.inc:391
-#: addons/ldapmanager/class_csvimport.inc:394
-#: addons/ldapmanager/class_csvimport.inc:397
-#: addons/ldapmanager/class_csvimport.inc:545
+#: addons/ldapmanager/class_ldapmanager.inc:159
+#: addons/ldapmanager/class_csvimport.inc:181
 msgid "Error"
 msgstr "Fehler"
 
-#: addons/ldapmanager/class_ldapmanager.inc:169
+#: addons/ldapmanager/class_ldapmanager.inc:160
 #, php-format
 msgid "Failed to generate ldap export, error was \"%s\"!"
 msgstr ""
@@ -141,107 +133,72 @@ msgstr "Erlaubt das Importieren und Exportieren des LDAP-Baums"
 msgid "Ldap manager"
 msgstr "LDAP-Manager"
 
-#: addons/ldapmanager/class_csvimport.inc:39
+#: addons/ldapmanager/class_csvimport.inc:28
 msgid "CSV import"
 msgstr "CSV-Import"
 
-#: addons/ldapmanager/class_csvimport.inc:40
+#: addons/ldapmanager/class_csvimport.inc:29
 msgid "Import of csv data into the ldap tree"
 msgstr "Import von CSV-Daten in den LDAP-Baum"
 
-#: addons/ldapmanager/class_csvimport.inc:137
-msgid "You've no permission to import CSV files."
-msgstr "Sie haben keine Berechtigung, um CSV Dateien zu importieren."
+#: addons/ldapmanager/class_csvimport.inc:42
+msgid "Import CSV"
+msgstr "CSV importieren"
 
-#: addons/ldapmanager/class_csvimport.inc:188
-msgid "Need at least 'sn' and 'givenName' to create users!"
-msgstr "Brauche mindestens 'sn' und 'givenName' um Nutzer zu erstellen!"
+#: addons/ldapmanager/class_csvimport.inc:45
+msgid "Object type"
+msgstr "Objecttyp"
 
-#: addons/ldapmanager/class_csvimport.inc:189
-#: addons/ldapmanager/class_csvimport.inc:221
-#: addons/ldapmanager/class_csvimport.inc:287
-msgid "failed"
-msgstr "Fehlgeschlagen"
+#: addons/ldapmanager/class_csvimport.inc:45
+msgid "Type of objects you wish to import"
+msgstr ""
 
-#: addons/ldapmanager/class_csvimport.inc:220
-#, php-format
-msgid "Failed to generate 'uid' for entry '%s'!"
-msgstr "Fehler beim Generieren von 'uid' fÃ¼r Eintrag '%s'!"
+#: addons/ldapmanager/class_csvimport.inc:49
+msgid "Template"
+msgstr "Vorlage"
 
-#: addons/ldapmanager/class_csvimport.inc:291
-msgid "ok"
-msgstr "ok"
+#: addons/ldapmanager/class_csvimport.inc:49
+msgid "Select a template to apply to imported entries"
+msgstr ""
 
-#: addons/ldapmanager/class_csvimport.inc:351
-#, php-format
-msgid "Cannot insert entry '%s'!"
-msgstr "Kann Eintrag '%s' nicht einfÃ¼gen!"
+#: addons/ldapmanager/class_csvimport.inc:53
+msgid "CSV file"
+msgstr "CSV-Datei"
 
-#: addons/ldapmanager/class_csvimport.inc:377
-msgid "Information"
-msgstr "Information"
+#: addons/ldapmanager/class_csvimport.inc:53
+msgid "Import a CSV file into your LDAP"
+msgstr ""
 
-#: addons/ldapmanager/class_csvimport.inc:377
-msgid "Nothing to import!"
-msgstr "Nichts zu importieren!"
+#: addons/ldapmanager/class_csvimport.inc:57
+msgid "Separator"
+msgstr "Feldtrenner"
 
-#: addons/ldapmanager/class_csvimport.inc:388
-#: addons/ldapmanager/class_csvimport.inc:391
-#: addons/ldapmanager/class_csvimport.inc:394
-#: addons/ldapmanager/class_csvimport.inc:397
-#, php-format
-msgid "Cannot read uploaded file: %s"
-msgstr "Kann hochgeladene Datei nicht lesen: %s"
+#: addons/ldapmanager/class_csvimport.inc:57
+msgid "Character used as separator in the CSV file"
+msgstr ""
 
-#: addons/ldapmanager/class_csvimport.inc:388
-#: addons/ldapmanager/class_csvimport.inc:394
-msgid "file not found"
-msgstr "Die Datei wurde nicht gefunden"
+#: addons/ldapmanager/class_csvimport.inc:63
+msgid "Fixed values"
+msgstr "Feste Werte"
 
-#: addons/ldapmanager/class_csvimport.inc:391
-msgid "file is empty"
-msgstr "Die Datei ist leer"
+#: addons/ldapmanager/class_csvimport.inc:63
+msgid ""
+"Some fixed values that you might wanna use in the filling of the template."
+msgstr ""
 
-#: addons/ldapmanager/class_csvimport.inc:397
-msgid "file not readable"
-msgstr "Die Datei ist nicht lesbar"
+#: addons/ldapmanager/class_csvimport.inc:75
+msgid "Template filling"
+msgstr ""
 
-#: addons/ldapmanager/class_csvimport.inc:545
-msgid "Cannot find CSV data in the selected file!"
-msgstr "Kann keine CSV-Daten in der gewÃ¤hlten Datei finden!"
+#: addons/ldapmanager/class_csvimport.inc:84
+msgid "Select fields associations"
+msgstr ""
 
-#: addons/ldapmanager/contentcsv.tpl.c:2
-msgid ""
-"The CSV import plugin provides methods to generate user accounts from a file"
-" containing Semi-Colon Seperated Values. The administrator can decide which "
-"columns should be transfered to which attribute. Note that you must have at "
-"least the GIVENNAME and SURNAME set."
-msgstr "Das CSV-Importplugin bietet Methoden um Benutzerkonten von einer Datei zu erstellen. Diese Datei sollte Semikolon-getrennte Werte haben. Der Administrator kann sich entscheiden, welche Spalten zu welchem Attribut transferiert werden. Beachten Sie dass Sie mindestes den VORNAMEN und NACHNAMEN als Set haben mÃ¼ssen."
-
-#: addons/ldapmanager/contentcsv.tpl.c:5
-msgid "Select CSV file to import"
-msgstr "Auswahl der zu importierenden CSV Datei"
-
-#: addons/ldapmanager/contentcsv.tpl.c:8
-msgid "Browse"
-msgstr "Durchsuchen"
-
-#: addons/ldapmanager/contentcsv.tpl.c:11
-msgid "Select template"
-msgstr "Auswahl der Vorlage"
-
-#: addons/ldapmanager/contentcsv.tpl.c:14
-msgid "All entries have been written to the LDAP database successfully."
-msgstr "Alle EintrÃ¤ge wurden erfolgreich in die LDAP-Datenbank geschrieben."
-
-#: addons/ldapmanager/contentcsv.tpl.c:17
-msgid "Oups. There was an error during the import of your data."
-msgstr "Es gab einen Fehler wÃ¤hrend des Importvorgangs Ihrer Daten."
-
-#: addons/ldapmanager/contentcsv.tpl.c:20
-msgid "Here is the status report for the import:"
-msgstr "Statusreport des Imports:"
-
-#: addons/ldapmanager/contentcsv.tpl.c:23
-msgid "Selected Template"
-msgstr "GewÃ¤hlte Vorlage"
+#: addons/ldapmanager/class_csvimport.inc:190
+msgid "Success"
+msgstr "Erfolg"
+
+#: addons/ldapmanager/class_csvimport.inc:190
+#, php-format
+msgid "Successfully imported %d entries"
+msgstr "%d EintrÃ¤ge erfolgreich importiert"
diff --git a/ldapmanager/locale/el_GR/fusiondirectory.po b/ldapmanager/locale/el_GR/fusiondirectory.po
new file mode 100644
index 0000000000000000000000000000000000000000..47484b69b704136eed6ba32194847a891c4dca64
--- /dev/null
+++ b/ldapmanager/locale/el_GR/fusiondirectory.po
@@ -0,0 +1,203 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR FusionDirectory Project
+# This file is distributed under the same license as the PACKAGE package.
+# 
+# Translators:
+msgid ""
+msgstr ""
+"Project-Id-Version: FusionDirectory-109\n"
+"Report-Msgid-Bugs-To: documentation@lists.fusiondirectory.org\n"
+"POT-Creation-Date: 2014-12-15 17:47+0100\n"
+"PO-Revision-Date: 2015-05-30 11:45+0000\n"
+"Last-Translator: Benoit Mortier <benoit.mortier@opensides.be>\n"
+"Language-Team: Greek (Greece) (http://www.transifex.com/projects/p/FusionDirectory-109/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"
+
+#: addons/ldapmanager/class_ldapmanager.inc:28
+msgid "LDIF"
+msgstr ""
+
+#: addons/ldapmanager/class_ldapmanager.inc:29
+msgid "Export/Import the ldap tree to/from LDIF format"
+msgstr ""
+
+#: addons/ldapmanager/class_ldapmanager.inc:31
+msgid "LDAP Manager"
+msgstr ""
+
+#: addons/ldapmanager/class_ldapmanager.inc:43
+#: addons/ldapmanager/class_ldapmanager.inc:56
+#: addons/ldapmanager/class_ldapmanager.inc:75
+msgid "Export"
+msgstr ""
+
+#: addons/ldapmanager/class_ldapmanager.inc:46
+msgid "DN of a single entry to export as ldif"
+msgstr ""
+
+#: addons/ldapmanager/class_ldapmanager.inc:60
+msgid "Export single entry"
+msgstr ""
+
+#: addons/ldapmanager/class_ldapmanager.inc:63
+msgid "Filter"
+msgstr ""
+
+#: addons/ldapmanager/class_ldapmanager.inc:63
+msgid "Filter to use for selecting objects to export"
+msgstr ""
+
+#: addons/ldapmanager/class_ldapmanager.inc:68
+msgid ""
+"Download a complete snapshot of the running LDAP directory for this base as "
+"ldif"
+msgstr ""
+
+#: addons/ldapmanager/class_ldapmanager.inc:79
+msgid "Export complete LDIF for"
+msgstr ""
+
+#: addons/ldapmanager/class_ldapmanager.inc:84
+msgid "Import LDIF"
+msgstr ""
+
+#: addons/ldapmanager/class_ldapmanager.inc:87
+msgid "Overwrite existing entries"
+msgstr ""
+
+#: addons/ldapmanager/class_ldapmanager.inc:87
+msgid ""
+"Remove fields that are not in the LDIF from the LDAP entries if they were "
+"existing."
+msgstr ""
+
+#: addons/ldapmanager/class_ldapmanager.inc:92
+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:102
+#: addons/ldapmanager/class_csvimport.inc:70
+#: addons/ldapmanager/class_csvimport.inc:93
+msgid "Import"
+msgstr ""
+
+#: addons/ldapmanager/class_ldapmanager.inc:106
+msgid "Import LDIF file"
+msgstr ""
+
+#: addons/ldapmanager/class_ldapmanager.inc:133
+#: addons/ldapmanager/class_ldapmanager.inc:175
+msgid "LDAP error"
+msgstr ""
+
+#: addons/ldapmanager/class_ldapmanager.inc:134
+#, php-format
+msgid "No such object %s!"
+msgstr ""
+
+#: addons/ldapmanager/class_ldapmanager.inc:152
+msgid "Permission error"
+msgstr ""
+
+#: addons/ldapmanager/class_ldapmanager.inc:153
+#, php-format
+msgid "You have no permission to export %s!"
+msgstr ""
+
+#: addons/ldapmanager/class_ldapmanager.inc:159
+#: addons/ldapmanager/class_csvimport.inc:181
+msgid "Error"
+msgstr ""
+
+#: addons/ldapmanager/class_ldapmanager.inc:160
+#, php-format
+msgid "Failed to generate ldap export, error was \"%s\"!"
+msgstr ""
+
+#: addons/ldapmanager/tabs_ldif.inc:38
+msgid "LDAP import/export"
+msgstr ""
+
+#: addons/ldapmanager/tabs_ldif.inc:39
+msgid "Allows the import or export of the ldap tree"
+msgstr ""
+
+#: addons/ldapmanager/tabs_ldif.inc:43
+msgid "Ldap manager"
+msgstr ""
+
+#: addons/ldapmanager/class_csvimport.inc:28
+msgid "CSV import"
+msgstr ""
+
+#: addons/ldapmanager/class_csvimport.inc:29
+msgid "Import of csv data into the ldap tree"
+msgstr ""
+
+#: addons/ldapmanager/class_csvimport.inc:42
+msgid "Import CSV"
+msgstr ""
+
+#: addons/ldapmanager/class_csvimport.inc:45
+msgid "Object type"
+msgstr ""
+
+#: addons/ldapmanager/class_csvimport.inc:45
+msgid "Type of objects you wish to import"
+msgstr ""
+
+#: addons/ldapmanager/class_csvimport.inc:49
+msgid "Template"
+msgstr ""
+
+#: addons/ldapmanager/class_csvimport.inc:49
+msgid "Select a template to apply to imported entries"
+msgstr ""
+
+#: addons/ldapmanager/class_csvimport.inc:53
+msgid "CSV file"
+msgstr ""
+
+#: addons/ldapmanager/class_csvimport.inc:53
+msgid "Import a CSV file into your LDAP"
+msgstr ""
+
+#: addons/ldapmanager/class_csvimport.inc:57
+msgid "Separator"
+msgstr ""
+
+#: addons/ldapmanager/class_csvimport.inc:57
+msgid "Character used as separator in the CSV file"
+msgstr ""
+
+#: addons/ldapmanager/class_csvimport.inc:63
+msgid "Fixed values"
+msgstr ""
+
+#: addons/ldapmanager/class_csvimport.inc:63
+msgid ""
+"Some fixed values that you might wanna use in the filling of the template."
+msgstr ""
+
+#: addons/ldapmanager/class_csvimport.inc:75
+msgid "Template filling"
+msgstr ""
+
+#: addons/ldapmanager/class_csvimport.inc:84
+msgid "Select fields associations"
+msgstr ""
+
+#: addons/ldapmanager/class_csvimport.inc:190
+msgid "Success"
+msgstr ""
+
+#: addons/ldapmanager/class_csvimport.inc:190
+#, php-format
+msgid "Successfully imported %d entries"
+msgstr ""
diff --git a/ldapmanager/locale/en/fusiondirectory.po b/ldapmanager/locale/en/fusiondirectory.po
index f4b3e10d4afaade307e941baa45921e529fb819e..19d74735f6770f608ca392288d2e0c382ce0ba65 100644
--- a/ldapmanager/locale/en/fusiondirectory.po
+++ b/ldapmanager/locale/en/fusiondirectory.po
@@ -6,123 +6,118 @@
 #, fuzzy
 msgid ""
 msgstr ""
-"Project-Id-Version: PACKAGE VERSION\n"
-"Report-Msgid-Bugs-To: documentation@lists.fusiondirectory.org\n"
-"POT-Creation-Date: 2015-03-31 11:49+0200\n"
+"Project-Id-Version: FusionDirectory VERSION\n"
+"Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
+"POT-Creation-Date: 2015-05-30 15:30+0200\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
-"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
-"Language-Team: LANGUAGE <LL@li.org>\n"
-"Language: \n"
+"Last-Translator: FusionDirectory project <contact@fusiondirectory.org>\n"
+"Language-Team: English\n"
+"Language: en\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: addons/ldapmanager/class_ldapmanager.inc:28
+#: addons/ldapmanager/class_ldapmanager.inc:45
 msgid "LDIF"
 msgstr ""
 
-#: addons/ldapmanager/class_ldapmanager.inc:29
+#: addons/ldapmanager/class_ldapmanager.inc:46
 msgid "Export/Import the ldap tree to/from LDIF format"
 msgstr ""
 
-#: addons/ldapmanager/class_ldapmanager.inc:31
+#: addons/ldapmanager/class_ldapmanager.inc:48
 msgid "LDAP Manager"
 msgstr ""
 
-#: addons/ldapmanager/class_ldapmanager.inc:43
-#: addons/ldapmanager/class_ldapmanager.inc:56
-#: addons/ldapmanager/class_ldapmanager.inc:75
+#: addons/ldapmanager/class_ldapmanager.inc:60
+#: addons/ldapmanager/class_ldapmanager.inc:73
+#: addons/ldapmanager/class_ldapmanager.inc:92
 msgid "Export"
 msgstr ""
 
-#: addons/ldapmanager/class_ldapmanager.inc:46
+#: addons/ldapmanager/class_ldapmanager.inc:63
 msgid "DN of a single entry to export as ldif"
 msgstr ""
 
-#: addons/ldapmanager/class_ldapmanager.inc:60
+#: addons/ldapmanager/class_ldapmanager.inc:77
 msgid "Export single entry"
 msgstr ""
 
-#: addons/ldapmanager/class_ldapmanager.inc:63
+#: addons/ldapmanager/class_ldapmanager.inc:80
 msgid "Filter"
 msgstr ""
 
-#: addons/ldapmanager/class_ldapmanager.inc:63
+#: addons/ldapmanager/class_ldapmanager.inc:80
 msgid "Filter to use for selecting objects to export"
 msgstr ""
 
-#: addons/ldapmanager/class_ldapmanager.inc:68
+#: addons/ldapmanager/class_ldapmanager.inc:85
 msgid ""
 "Download a complete snapshot of the running LDAP directory for this base as "
 "ldif"
 msgstr ""
 
-#: addons/ldapmanager/class_ldapmanager.inc:79
+#: addons/ldapmanager/class_ldapmanager.inc:96
 msgid "Export complete LDIF for"
 msgstr ""
 
-#: addons/ldapmanager/class_ldapmanager.inc:84
+#: addons/ldapmanager/class_ldapmanager.inc:101
 msgid "Import LDIF"
 msgstr ""
 
-#: addons/ldapmanager/class_ldapmanager.inc:87
+#: addons/ldapmanager/class_ldapmanager.inc:104
 msgid "Overwrite existing entries"
 msgstr ""
 
-#: addons/ldapmanager/class_ldapmanager.inc:87
+#: addons/ldapmanager/class_ldapmanager.inc:104
 msgid ""
 "Remove fields that are not in the LDIF from the LDAP entries if they were "
 "existing."
 msgstr ""
 
-#: addons/ldapmanager/class_ldapmanager.inc:92
+#: addons/ldapmanager/class_ldapmanager.inc:109
 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:102
+#: addons/ldapmanager/class_ldapmanager.inc:119
+#: 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:106
+#: addons/ldapmanager/class_ldapmanager.inc:123
 msgid "Import LDIF file"
 msgstr ""
 
-#: addons/ldapmanager/class_ldapmanager.inc:147
-#: addons/ldapmanager/class_ldapmanager.inc:186
+#: addons/ldapmanager/class_ldapmanager.inc:151
+#: addons/ldapmanager/class_ldapmanager.inc:193
 msgid "LDAP error"
 msgstr ""
 
-#: addons/ldapmanager/class_ldapmanager.inc:148
+#: addons/ldapmanager/class_ldapmanager.inc:152
 #, php-format
 msgid "No such object %s!"
 msgstr ""
 
-#: addons/ldapmanager/class_ldapmanager.inc:162
-#: addons/ldapmanager/class_csvimport.inc:137
+#: addons/ldapmanager/class_ldapmanager.inc:170
 msgid "Permission error"
 msgstr ""
 
-#: addons/ldapmanager/class_ldapmanager.inc:163
+#: addons/ldapmanager/class_ldapmanager.inc:171
 #, php-format
 msgid "You have no permission to export %s!"
 msgstr ""
 
-#: addons/ldapmanager/class_ldapmanager.inc:168
-#: addons/ldapmanager/class_csvimport.inc:188
-#: addons/ldapmanager/class_csvimport.inc:351
-#: addons/ldapmanager/class_csvimport.inc:388
-#: addons/ldapmanager/class_csvimport.inc:391
-#: addons/ldapmanager/class_csvimport.inc:394
-#: addons/ldapmanager/class_csvimport.inc:397
-#: addons/ldapmanager/class_csvimport.inc:545
+#: addons/ldapmanager/class_ldapmanager.inc:177
+#: addons/ldapmanager/class_csvimport.inc:195
 msgid "Error"
 msgstr ""
 
-#: addons/ldapmanager/class_ldapmanager.inc:169
+#: addons/ldapmanager/class_ldapmanager.inc:178
 #, php-format
 msgid "Failed to generate ldap export, error was \"%s\"!"
 msgstr ""
@@ -139,73 +134,74 @@ msgstr ""
 msgid "Ldap manager"
 msgstr ""
 
-#: addons/ldapmanager/class_csvimport.inc:39
+#: addons/ldapmanager/class_csvimport.inc:29
 msgid "CSV import"
 msgstr ""
 
-#: addons/ldapmanager/class_csvimport.inc:40
+#: addons/ldapmanager/class_csvimport.inc:30
 msgid "Import of csv data into the ldap tree"
 msgstr ""
 
-#: addons/ldapmanager/class_csvimport.inc:137
-msgid "You've no permission to import CSV files."
+#: addons/ldapmanager/class_csvimport.inc:43
+msgid "Import CSV"
 msgstr ""
 
-#: addons/ldapmanager/class_csvimport.inc:188
-msgid "Need at least 'sn' and 'givenName' to create users!"
+#: addons/ldapmanager/class_csvimport.inc:46
+msgid "Object type"
 msgstr ""
 
-#: addons/ldapmanager/class_csvimport.inc:189
-#: addons/ldapmanager/class_csvimport.inc:221
-#: addons/ldapmanager/class_csvimport.inc:287
-msgid "failed"
+#: addons/ldapmanager/class_csvimport.inc:46
+msgid "Type of objects you wish to import"
 msgstr ""
 
-#: addons/ldapmanager/class_csvimport.inc:220
-#, php-format
-msgid "Failed to generate 'uid' for entry '%s'!"
+#: addons/ldapmanager/class_csvimport.inc:50
+msgid "Template"
 msgstr ""
 
-#: addons/ldapmanager/class_csvimport.inc:291
-msgid "ok"
+#: addons/ldapmanager/class_csvimport.inc:50
+msgid "Select a template to apply to imported entries"
 msgstr ""
 
-#: addons/ldapmanager/class_csvimport.inc:351
-#, php-format
-msgid "Cannot insert entry '%s'!"
+#: addons/ldapmanager/class_csvimport.inc:54
+msgid "CSV file"
 msgstr ""
 
-#: addons/ldapmanager/class_csvimport.inc:377
-msgid "Information"
+#: addons/ldapmanager/class_csvimport.inc:54
+msgid "Import a CSV file into your LDAP"
 msgstr ""
 
-#: addons/ldapmanager/class_csvimport.inc:377
-msgid "Nothing to import!"
+#: addons/ldapmanager/class_csvimport.inc:58
+msgid "Separator"
 msgstr ""
 
-#: addons/ldapmanager/class_csvimport.inc:388
-#: addons/ldapmanager/class_csvimport.inc:391
-#: addons/ldapmanager/class_csvimport.inc:394
-#: addons/ldapmanager/class_csvimport.inc:397
-#, php-format
-msgid "Cannot read uploaded file: %s"
+#: addons/ldapmanager/class_csvimport.inc:58
+msgid "Character used as separator in the CSV file"
 msgstr ""
 
-#: addons/ldapmanager/class_csvimport.inc:388
-#: addons/ldapmanager/class_csvimport.inc:394
-msgid "file not found"
+#: addons/ldapmanager/class_csvimport.inc:64
+msgid "Fixed values"
 msgstr ""
 
-#: addons/ldapmanager/class_csvimport.inc:391
-msgid "file is empty"
+#: 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:397
-msgid "file not readable"
+#: addons/ldapmanager/class_csvimport.inc:76
+msgid "Template filling"
 msgstr ""
 
-#: addons/ldapmanager/class_csvimport.inc:545
-msgid "Cannot find CSV data in the selected file!"
+#: addons/ldapmanager/class_csvimport.inc:85
+msgid "Select fields associations"
+msgstr ""
+
+#: addons/ldapmanager/class_csvimport.inc:204
+msgid "Success"
+msgstr ""
+
+#: addons/ldapmanager/class_csvimport.inc:204
+#, php-format
+msgid "Successfully imported %d entries"
 msgstr ""
 
 #: addons/ldapmanager/contentcsv.tpl.c:2
diff --git a/ldapmanager/locale/es/fusiondirectory.po b/ldapmanager/locale/es/fusiondirectory.po
index d08dbafbb67acc51e0073c67bb08bbaa7dc56d29..2caeda84a103b64b39f4c46ac860328caf64bb57 100644
--- a/ldapmanager/locale/es/fusiondirectory.po
+++ b/ldapmanager/locale/es/fusiondirectory.po
@@ -3,16 +3,14 @@
 # This file is distributed under the same license as the PACKAGE package.
 # 
 # Translators:
-# lars_g <lars.gold@gmail.com>, 2012
-# lars_g <lars.gold@gmail.com>, 2012
 msgid ""
 msgstr ""
-"Project-Id-Version: FusionDirectory-108\n"
+"Project-Id-Version: FusionDirectory-109\n"
 "Report-Msgid-Bugs-To: documentation@lists.fusiondirectory.org\n"
-"POT-Creation-Date: 2015-03-19 21:45+0100\n"
-"PO-Revision-Date: 2015-02-25 16:12+0000\n"
+"POT-Creation-Date: 2014-12-15 17:47+0100\n"
+"PO-Revision-Date: 2015-02-25 16:13+0000\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>\n"
-"Language-Team: Spanish (http://www.transifex.com/projects/p/FusionDirectory-108/language/es/)\n"
+"Language-Team: Spanish (http://www.transifex.com/projects/p/FusionDirectory-109/language/es/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -84,8 +82,8 @@ msgid ""
 msgstr ""
 
 #: addons/ldapmanager/class_ldapmanager.inc:102
-#: addons/ldapmanager/contentcsv.tpl.c:26
-#: addons/ldapmanager/contentcsv.tpl.c:29
+#: addons/ldapmanager/class_csvimport.inc:70
+#: addons/ldapmanager/class_csvimport.inc:93
 msgid "Import"
 msgstr "Importar"
 
@@ -93,38 +91,31 @@ msgstr "Importar"
 msgid "Import LDIF file"
 msgstr ""
 
-#: addons/ldapmanager/class_ldapmanager.inc:147
-#: addons/ldapmanager/class_ldapmanager.inc:186
+#: addons/ldapmanager/class_ldapmanager.inc:133
+#: addons/ldapmanager/class_ldapmanager.inc:175
 msgid "LDAP error"
 msgstr "Error LDAP"
 
-#: addons/ldapmanager/class_ldapmanager.inc:148
+#: addons/ldapmanager/class_ldapmanager.inc:134
 #, php-format
 msgid "No such object %s!"
 msgstr "No existe el objeto %s!"
 
-#: addons/ldapmanager/class_ldapmanager.inc:162
-#: addons/ldapmanager/class_csvimport.inc:137
+#: addons/ldapmanager/class_ldapmanager.inc:152
 msgid "Permission error"
 msgstr "Error de permisos"
 
-#: addons/ldapmanager/class_ldapmanager.inc:163
+#: addons/ldapmanager/class_ldapmanager.inc:153
 #, php-format
 msgid "You have no permission to export %s!"
 msgstr "No tiene permiso para exportar %s!"
 
-#: addons/ldapmanager/class_ldapmanager.inc:168
-#: addons/ldapmanager/class_csvimport.inc:188
-#: addons/ldapmanager/class_csvimport.inc:351
-#: addons/ldapmanager/class_csvimport.inc:388
-#: addons/ldapmanager/class_csvimport.inc:391
-#: addons/ldapmanager/class_csvimport.inc:394
-#: addons/ldapmanager/class_csvimport.inc:397
-#: addons/ldapmanager/class_csvimport.inc:545
+#: addons/ldapmanager/class_ldapmanager.inc:159
+#: addons/ldapmanager/class_csvimport.inc:181
 msgid "Error"
 msgstr "Error"
 
-#: addons/ldapmanager/class_ldapmanager.inc:169
+#: addons/ldapmanager/class_ldapmanager.inc:160
 #, php-format
 msgid "Failed to generate ldap export, error was \"%s\"!"
 msgstr ""
@@ -141,107 +132,72 @@ msgstr ""
 msgid "Ldap manager"
 msgstr "Administrador LDAP"
 
-#: addons/ldapmanager/class_csvimport.inc:39
+#: addons/ldapmanager/class_csvimport.inc:28
 msgid "CSV import"
 msgstr "Importar desde CSV"
 
-#: addons/ldapmanager/class_csvimport.inc:40
+#: addons/ldapmanager/class_csvimport.inc:29
 msgid "Import of csv data into the ldap tree"
 msgstr ""
 
-#: addons/ldapmanager/class_csvimport.inc:137
-msgid "You've no permission to import CSV files."
-msgstr "No tiene permisos para importar archivos CSV."
+#: addons/ldapmanager/class_csvimport.inc:42
+msgid "Import CSV"
+msgstr ""
 
-#: addons/ldapmanager/class_csvimport.inc:188
-msgid "Need at least 'sn' and 'givenName' to create users!"
-msgstr "Se requiere por lo menos de 'sn' y 'givenName' para crear usuarios!"
+#: addons/ldapmanager/class_csvimport.inc:45
+msgid "Object type"
+msgstr ""
 
-#: addons/ldapmanager/class_csvimport.inc:189
-#: addons/ldapmanager/class_csvimport.inc:221
-#: addons/ldapmanager/class_csvimport.inc:287
-msgid "failed"
-msgstr "error"
+#: addons/ldapmanager/class_csvimport.inc:45
+msgid "Type of objects you wish to import"
+msgstr ""
 
-#: addons/ldapmanager/class_csvimport.inc:220
-#, php-format
-msgid "Failed to generate 'uid' for entry '%s'!"
-msgstr "Fallo al generar 'uid' para la entrada '%s'!"
+#: addons/ldapmanager/class_csvimport.inc:49
+msgid "Template"
+msgstr "Plantilla"
 
-#: addons/ldapmanager/class_csvimport.inc:291
-msgid "ok"
-msgstr "ok"
+#: addons/ldapmanager/class_csvimport.inc:49
+msgid "Select a template to apply to imported entries"
+msgstr ""
 
-#: addons/ldapmanager/class_csvimport.inc:351
-#, php-format
-msgid "Cannot insert entry '%s'!"
-msgstr "Â¡No se puede introducir la entrada '%s'!"
+#: addons/ldapmanager/class_csvimport.inc:53
+msgid "CSV file"
+msgstr ""
 
-#: addons/ldapmanager/class_csvimport.inc:377
-msgid "Information"
-msgstr "InformaciÃ³n"
+#: addons/ldapmanager/class_csvimport.inc:53
+msgid "Import a CSV file into your LDAP"
+msgstr ""
 
-#: addons/ldapmanager/class_csvimport.inc:377
-msgid "Nothing to import!"
-msgstr "Â¡No hay nada que importar!"
+#: addons/ldapmanager/class_csvimport.inc:57
+msgid "Separator"
+msgstr "Separador"
 
-#: addons/ldapmanager/class_csvimport.inc:388
-#: addons/ldapmanager/class_csvimport.inc:391
-#: addons/ldapmanager/class_csvimport.inc:394
-#: addons/ldapmanager/class_csvimport.inc:397
-#, php-format
-msgid "Cannot read uploaded file: %s"
-msgstr "No puedo leer el archivo: %s"
+#: addons/ldapmanager/class_csvimport.inc:57
+msgid "Character used as separator in the CSV file"
+msgstr ""
 
-#: addons/ldapmanager/class_csvimport.inc:388
-#: addons/ldapmanager/class_csvimport.inc:394
-msgid "file not found"
-msgstr "fichero no encontrado"
+#: addons/ldapmanager/class_csvimport.inc:63
+msgid "Fixed values"
+msgstr ""
 
-#: addons/ldapmanager/class_csvimport.inc:391
-msgid "file is empty"
-msgstr "el archivo estÃ¡ vacÃo"
+#: addons/ldapmanager/class_csvimport.inc:63
+msgid ""
+"Some fixed values that you might wanna use in the filling of the template."
+msgstr ""
 
-#: addons/ldapmanager/class_csvimport.inc:397
-msgid "file not readable"
-msgstr "fichero no accesible"
+#: addons/ldapmanager/class_csvimport.inc:75
+msgid "Template filling"
+msgstr ""
 
-#: addons/ldapmanager/class_csvimport.inc:545
-msgid "Cannot find CSV data in the selected file!"
-msgstr "Â¡No se puede encontrar informaciÃ³n CSV en el archivo seleccionado!"
+#: addons/ldapmanager/class_csvimport.inc:84
+msgid "Select fields associations"
+msgstr ""
 
-#: addons/ldapmanager/contentcsv.tpl.c:2
-msgid ""
-"The CSV import plugin provides methods to generate user accounts from a file"
-" containing Semi-Colon Seperated Values. The administrator can decide which "
-"columns should be transfered to which attribute. Note that you must have at "
-"least the GIVENNAME and SURNAME set."
-msgstr "El complemento de importado de CSV provee metodos para generar cuentas de usuario a partir de un archivo que contiene Valores Separados por Punto y Coma. El administrador puede decidir cuales columnas son transferidas a cuales atributos. Tome en cuenta que debe tener como minimo el conjunto de NOMBRE y APELLIDO"
-
-#: addons/ldapmanager/contentcsv.tpl.c:5
-msgid "Select CSV file to import"
-msgstr "Seleccione el archivo CSV para importar"
-
-#: addons/ldapmanager/contentcsv.tpl.c:8
-msgid "Browse"
-msgstr "Visualizar"
-
-#: addons/ldapmanager/contentcsv.tpl.c:11
-msgid "Select template"
-msgstr "Selecciona plantilla"
-
-#: addons/ldapmanager/contentcsv.tpl.c:14
-msgid "All entries have been written to the LDAP database successfully."
-msgstr "Todas las entradas han sido escritas correctamente en la base de datos LDAP."
-
-#: addons/ldapmanager/contentcsv.tpl.c:17
-msgid "Oups. There was an error during the import of your data."
-msgstr "Error: Ha habido un error durante la importaciÃ³n de los datos."
-
-#: addons/ldapmanager/contentcsv.tpl.c:20
-msgid "Here is the status report for the import:"
-msgstr "Este es el informe de estado de la importaciÃ³n:"
-
-#: addons/ldapmanager/contentcsv.tpl.c:23
-msgid "Selected Template"
-msgstr "Plantilla seleccionada"
+#: addons/ldapmanager/class_csvimport.inc:190
+msgid "Success"
+msgstr "Correcto"
+
+#: addons/ldapmanager/class_csvimport.inc:190
+#, php-format
+msgid "Successfully imported %d entries"
+msgstr ""
diff --git a/ldapmanager/locale/es_VE/fusiondirectory.po b/ldapmanager/locale/es_VE/fusiondirectory.po
index 160113250f4b9bfe24bd2aec5589b5eb31fcd015..61ec8755758ff3795ec5a54a79d2ae73acd5eb68 100644
--- a/ldapmanager/locale/es_VE/fusiondirectory.po
+++ b/ldapmanager/locale/es_VE/fusiondirectory.po
@@ -3,16 +3,14 @@
 # This file is distributed under the same license as the PACKAGE package.
 # 
 # Translators:
-# lars_g <lars.gold@gmail.com>, 2012
-# lars_g <lars.gold@gmail.com>, 2012
 msgid ""
 msgstr ""
-"Project-Id-Version: FusionDirectory-108\n"
+"Project-Id-Version: FusionDirectory-109\n"
 "Report-Msgid-Bugs-To: documentation@lists.fusiondirectory.org\n"
-"POT-Creation-Date: 2015-03-19 21:45+0100\n"
-"PO-Revision-Date: 2015-02-25 16:12+0000\n"
+"POT-Creation-Date: 2014-12-15 17:47+0100\n"
+"PO-Revision-Date: 2015-02-25 16:13+0000\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>\n"
-"Language-Team: Spanish (Venezuela) (http://www.transifex.com/projects/p/FusionDirectory-108/language/es_VE/)\n"
+"Language-Team: Spanish (Venezuela) (http://www.transifex.com/projects/p/FusionDirectory-109/language/es_VE/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -84,8 +82,8 @@ msgid ""
 msgstr ""
 
 #: addons/ldapmanager/class_ldapmanager.inc:102
-#: addons/ldapmanager/contentcsv.tpl.c:26
-#: addons/ldapmanager/contentcsv.tpl.c:29
+#: addons/ldapmanager/class_csvimport.inc:70
+#: addons/ldapmanager/class_csvimport.inc:93
 msgid "Import"
 msgstr "Importar"
 
@@ -93,38 +91,31 @@ msgstr "Importar"
 msgid "Import LDIF file"
 msgstr ""
 
-#: addons/ldapmanager/class_ldapmanager.inc:147
-#: addons/ldapmanager/class_ldapmanager.inc:186
+#: addons/ldapmanager/class_ldapmanager.inc:133
+#: addons/ldapmanager/class_ldapmanager.inc:175
 msgid "LDAP error"
 msgstr "Error de LDAP"
 
-#: addons/ldapmanager/class_ldapmanager.inc:148
+#: addons/ldapmanager/class_ldapmanager.inc:134
 #, php-format
 msgid "No such object %s!"
 msgstr "No existe el objeto %s!"
 
-#: addons/ldapmanager/class_ldapmanager.inc:162
-#: addons/ldapmanager/class_csvimport.inc:137
+#: addons/ldapmanager/class_ldapmanager.inc:152
 msgid "Permission error"
 msgstr "Error de permisos"
 
-#: addons/ldapmanager/class_ldapmanager.inc:163
+#: addons/ldapmanager/class_ldapmanager.inc:153
 #, php-format
 msgid "You have no permission to export %s!"
 msgstr "No tiene permiso para exportar %s!"
 
-#: addons/ldapmanager/class_ldapmanager.inc:168
-#: addons/ldapmanager/class_csvimport.inc:188
-#: addons/ldapmanager/class_csvimport.inc:351
-#: addons/ldapmanager/class_csvimport.inc:388
-#: addons/ldapmanager/class_csvimport.inc:391
-#: addons/ldapmanager/class_csvimport.inc:394
-#: addons/ldapmanager/class_csvimport.inc:397
-#: addons/ldapmanager/class_csvimport.inc:545
+#: addons/ldapmanager/class_ldapmanager.inc:159
+#: addons/ldapmanager/class_csvimport.inc:181
 msgid "Error"
 msgstr "Error"
 
-#: addons/ldapmanager/class_ldapmanager.inc:169
+#: addons/ldapmanager/class_ldapmanager.inc:160
 #, php-format
 msgid "Failed to generate ldap export, error was \"%s\"!"
 msgstr ""
@@ -141,107 +132,72 @@ msgstr ""
 msgid "Ldap manager"
 msgstr "Administrador LDAP"
 
-#: addons/ldapmanager/class_csvimport.inc:39
+#: addons/ldapmanager/class_csvimport.inc:28
 msgid "CSV import"
 msgstr ""
 
-#: addons/ldapmanager/class_csvimport.inc:40
+#: addons/ldapmanager/class_csvimport.inc:29
 msgid "Import of csv data into the ldap tree"
 msgstr ""
 
-#: addons/ldapmanager/class_csvimport.inc:137
-msgid "You've no permission to import CSV files."
-msgstr "No tiene permisos para importar archivos CSV."
+#: addons/ldapmanager/class_csvimport.inc:42
+msgid "Import CSV"
+msgstr ""
 
-#: addons/ldapmanager/class_csvimport.inc:188
-msgid "Need at least 'sn' and 'givenName' to create users!"
-msgstr "Se requiere por lo menos de 'sn' y 'givenName' para crear usuarios!"
+#: addons/ldapmanager/class_csvimport.inc:45
+msgid "Object type"
+msgstr ""
 
-#: addons/ldapmanager/class_csvimport.inc:189
-#: addons/ldapmanager/class_csvimport.inc:221
-#: addons/ldapmanager/class_csvimport.inc:287
-msgid "failed"
-msgstr "error"
+#: addons/ldapmanager/class_csvimport.inc:45
+msgid "Type of objects you wish to import"
+msgstr ""
 
-#: addons/ldapmanager/class_csvimport.inc:220
-#, php-format
-msgid "Failed to generate 'uid' for entry '%s'!"
-msgstr "Fallo al generar 'uid' para la entrada '%s'!"
+#: addons/ldapmanager/class_csvimport.inc:49
+msgid "Template"
+msgstr "Plantilla"
 
-#: addons/ldapmanager/class_csvimport.inc:291
-msgid "ok"
-msgstr "ok"
+#: addons/ldapmanager/class_csvimport.inc:49
+msgid "Select a template to apply to imported entries"
+msgstr ""
 
-#: addons/ldapmanager/class_csvimport.inc:351
-#, php-format
-msgid "Cannot insert entry '%s'!"
-msgstr "Â¡No se puede introducir la entrada '%s'!"
+#: addons/ldapmanager/class_csvimport.inc:53
+msgid "CSV file"
+msgstr ""
 
-#: addons/ldapmanager/class_csvimport.inc:377
-msgid "Information"
-msgstr "InformaciÃ³n"
+#: addons/ldapmanager/class_csvimport.inc:53
+msgid "Import a CSV file into your LDAP"
+msgstr ""
 
-#: addons/ldapmanager/class_csvimport.inc:377
-msgid "Nothing to import!"
-msgstr "Â¡No hay nada que importar!"
+#: addons/ldapmanager/class_csvimport.inc:57
+msgid "Separator"
+msgstr "Separador"
 
-#: addons/ldapmanager/class_csvimport.inc:388
-#: addons/ldapmanager/class_csvimport.inc:391
-#: addons/ldapmanager/class_csvimport.inc:394
-#: addons/ldapmanager/class_csvimport.inc:397
-#, php-format
-msgid "Cannot read uploaded file: %s"
-msgstr "No puedo leer el archivo: %s"
+#: addons/ldapmanager/class_csvimport.inc:57
+msgid "Character used as separator in the CSV file"
+msgstr ""
 
-#: addons/ldapmanager/class_csvimport.inc:388
-#: addons/ldapmanager/class_csvimport.inc:394
-msgid "file not found"
-msgstr "archivo no encontrado"
+#: addons/ldapmanager/class_csvimport.inc:63
+msgid "Fixed values"
+msgstr ""
 
-#: addons/ldapmanager/class_csvimport.inc:391
-msgid "file is empty"
-msgstr "el archivo estÃ¡ vacÃo"
+#: addons/ldapmanager/class_csvimport.inc:63
+msgid ""
+"Some fixed values that you might wanna use in the filling of the template."
+msgstr ""
 
-#: addons/ldapmanager/class_csvimport.inc:397
-msgid "file not readable"
-msgstr "archivo no accesible"
+#: addons/ldapmanager/class_csvimport.inc:75
+msgid "Template filling"
+msgstr ""
 
-#: addons/ldapmanager/class_csvimport.inc:545
-msgid "Cannot find CSV data in the selected file!"
-msgstr "Â¡No se puede encontrar informaciÃ³n CSV en el archivo seleccionado!"
+#: addons/ldapmanager/class_csvimport.inc:84
+msgid "Select fields associations"
+msgstr ""
 
-#: addons/ldapmanager/contentcsv.tpl.c:2
-msgid ""
-"The CSV import plugin provides methods to generate user accounts from a file"
-" containing Semi-Colon Seperated Values. The administrator can decide which "
-"columns should be transfered to which attribute. Note that you must have at "
-"least the GIVENNAME and SURNAME set."
-msgstr "El complemento de importado de CSV provee metodos para generar cuentas de usuario a partir de un archivo que contiene Valores Separados por Punto y Coma. El administrador puede decidir cuales columnas son transferidas a cuales atributos. Tome en cuenta que debe tener como minimo el conjunto de NOMBRE y APELLIDO"
-
-#: addons/ldapmanager/contentcsv.tpl.c:5
-msgid "Select CSV file to import"
-msgstr "Seleccione el archivo CSV para importar"
-
-#: addons/ldapmanager/contentcsv.tpl.c:8
-msgid "Browse"
-msgstr "Visualizar"
-
-#: addons/ldapmanager/contentcsv.tpl.c:11
-msgid "Select template"
-msgstr "Selecciona plantilla"
-
-#: addons/ldapmanager/contentcsv.tpl.c:14
-msgid "All entries have been written to the LDAP database successfully."
-msgstr "Todas las entradas han sido escritas correctamente en la base de datos LDAP."
-
-#: addons/ldapmanager/contentcsv.tpl.c:17
-msgid "Oups. There was an error during the import of your data."
-msgstr "Error: Ha habido un error durante la carga de los datos."
-
-#: addons/ldapmanager/contentcsv.tpl.c:20
-msgid "Here is the status report for the import:"
-msgstr "Este es el informe de estado de la importaciÃ³n:"
-
-#: addons/ldapmanager/contentcsv.tpl.c:23
-msgid "Selected Template"
-msgstr "Plantilla seleccionada"
+#: addons/ldapmanager/class_csvimport.inc:190
+msgid "Success"
+msgstr "Correcto"
+
+#: addons/ldapmanager/class_csvimport.inc:190
+#, php-format
+msgid "Successfully imported %d entries"
+msgstr ""
diff --git a/ldapmanager/locale/fa_IR/fusiondirectory.po b/ldapmanager/locale/fa_IR/fusiondirectory.po
index bb71b77848ed3947687a8be28e7864beeec05e3d..9700b631feba19aab9516e18bc638b895c285584 100644
--- a/ldapmanager/locale/fa_IR/fusiondirectory.po
+++ b/ldapmanager/locale/fa_IR/fusiondirectory.po
@@ -5,12 +5,12 @@
 # Translators:
 msgid ""
 msgstr ""
-"Project-Id-Version: FusionDirectory-108\n"
+"Project-Id-Version: FusionDirectory-109\n"
 "Report-Msgid-Bugs-To: documentation@lists.fusiondirectory.org\n"
-"POT-Creation-Date: 2015-03-19 21:45+0100\n"
-"PO-Revision-Date: 2015-02-25 15:49+0000\n"
+"POT-Creation-Date: 2014-12-15 17:47+0100\n"
+"PO-Revision-Date: 2014-12-15 16:59+0000\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>\n"
-"Language-Team: Persian (Iran) (http://www.transifex.com/projects/p/FusionDirectory-108/language/fa_IR/)\n"
+"Language-Team: Persian (Iran) (http://www.transifex.com/projects/p/FusionDirectory-109/language/fa_IR/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -82,8 +82,8 @@ msgid ""
 msgstr ""
 
 #: addons/ldapmanager/class_ldapmanager.inc:102
-#: addons/ldapmanager/contentcsv.tpl.c:26
-#: addons/ldapmanager/contentcsv.tpl.c:29
+#: addons/ldapmanager/class_csvimport.inc:70
+#: addons/ldapmanager/class_csvimport.inc:93
 msgid "Import"
 msgstr ""
 
@@ -91,38 +91,31 @@ msgstr ""
 msgid "Import LDIF file"
 msgstr ""
 
-#: addons/ldapmanager/class_ldapmanager.inc:147
-#: addons/ldapmanager/class_ldapmanager.inc:186
+#: addons/ldapmanager/class_ldapmanager.inc:133
+#: addons/ldapmanager/class_ldapmanager.inc:175
 msgid "LDAP error"
 msgstr "Ø®Ø·Ø§ÛŒ LDAP"
 
-#: addons/ldapmanager/class_ldapmanager.inc:148
+#: addons/ldapmanager/class_ldapmanager.inc:134
 #, php-format
 msgid "No such object %s!"
 msgstr ""
 
-#: addons/ldapmanager/class_ldapmanager.inc:162
-#: addons/ldapmanager/class_csvimport.inc:137
+#: addons/ldapmanager/class_ldapmanager.inc:152
 msgid "Permission error"
 msgstr ""
 
-#: addons/ldapmanager/class_ldapmanager.inc:163
+#: addons/ldapmanager/class_ldapmanager.inc:153
 #, php-format
 msgid "You have no permission to export %s!"
 msgstr ""
 
-#: addons/ldapmanager/class_ldapmanager.inc:168
-#: addons/ldapmanager/class_csvimport.inc:188
-#: addons/ldapmanager/class_csvimport.inc:351
-#: addons/ldapmanager/class_csvimport.inc:388
-#: addons/ldapmanager/class_csvimport.inc:391
-#: addons/ldapmanager/class_csvimport.inc:394
-#: addons/ldapmanager/class_csvimport.inc:397
-#: addons/ldapmanager/class_csvimport.inc:545
+#: addons/ldapmanager/class_ldapmanager.inc:159
+#: addons/ldapmanager/class_csvimport.inc:181
 msgid "Error"
 msgstr "Ø®Ø·Ø§"
 
-#: addons/ldapmanager/class_ldapmanager.inc:169
+#: addons/ldapmanager/class_ldapmanager.inc:160
 #, php-format
 msgid "Failed to generate ldap export, error was \"%s\"!"
 msgstr ""
@@ -139,107 +132,72 @@ msgstr ""
 msgid "Ldap manager"
 msgstr ""
 
-#: addons/ldapmanager/class_csvimport.inc:39
+#: addons/ldapmanager/class_csvimport.inc:28
 msgid "CSV import"
 msgstr ""
 
-#: addons/ldapmanager/class_csvimport.inc:40
+#: addons/ldapmanager/class_csvimport.inc:29
 msgid "Import of csv data into the ldap tree"
 msgstr ""
 
-#: addons/ldapmanager/class_csvimport.inc:137
-msgid "You've no permission to import CSV files."
+#: addons/ldapmanager/class_csvimport.inc:42
+msgid "Import CSV"
 msgstr ""
 
-#: addons/ldapmanager/class_csvimport.inc:188
-msgid "Need at least 'sn' and 'givenName' to create users!"
+#: addons/ldapmanager/class_csvimport.inc:45
+msgid "Object type"
 msgstr ""
 
-#: addons/ldapmanager/class_csvimport.inc:189
-#: addons/ldapmanager/class_csvimport.inc:221
-#: addons/ldapmanager/class_csvimport.inc:287
-msgid "failed"
+#: addons/ldapmanager/class_csvimport.inc:45
+msgid "Type of objects you wish to import"
 msgstr ""
 
-#: addons/ldapmanager/class_csvimport.inc:220
-#, php-format
-msgid "Failed to generate 'uid' for entry '%s'!"
-msgstr ""
-
-#: addons/ldapmanager/class_csvimport.inc:291
-msgid "ok"
-msgstr ""
-
-#: addons/ldapmanager/class_csvimport.inc:351
-#, php-format
-msgid "Cannot insert entry '%s'!"
-msgstr ""
-
-#: addons/ldapmanager/class_csvimport.inc:377
-msgid "Information"
+#: addons/ldapmanager/class_csvimport.inc:49
+msgid "Template"
 msgstr ""
 
-#: addons/ldapmanager/class_csvimport.inc:377
-msgid "Nothing to import!"
+#: addons/ldapmanager/class_csvimport.inc:49
+msgid "Select a template to apply to imported entries"
 msgstr ""
 
-#: addons/ldapmanager/class_csvimport.inc:388
-#: addons/ldapmanager/class_csvimport.inc:391
-#: addons/ldapmanager/class_csvimport.inc:394
-#: addons/ldapmanager/class_csvimport.inc:397
-#, php-format
-msgid "Cannot read uploaded file: %s"
+#: addons/ldapmanager/class_csvimport.inc:53
+msgid "CSV file"
 msgstr ""
 
-#: addons/ldapmanager/class_csvimport.inc:388
-#: addons/ldapmanager/class_csvimport.inc:394
-msgid "file not found"
+#: addons/ldapmanager/class_csvimport.inc:53
+msgid "Import a CSV file into your LDAP"
 msgstr ""
 
-#: addons/ldapmanager/class_csvimport.inc:391
-msgid "file is empty"
+#: addons/ldapmanager/class_csvimport.inc:57
+msgid "Separator"
 msgstr ""
 
-#: addons/ldapmanager/class_csvimport.inc:397
-msgid "file not readable"
+#: addons/ldapmanager/class_csvimport.inc:57
+msgid "Character used as separator in the CSV file"
 msgstr ""
 
-#: addons/ldapmanager/class_csvimport.inc:545
-msgid "Cannot find CSV data in the selected file!"
+#: addons/ldapmanager/class_csvimport.inc:63
+msgid "Fixed values"
 msgstr ""
 
-#: addons/ldapmanager/contentcsv.tpl.c:2
+#: addons/ldapmanager/class_csvimport.inc:63
 msgid ""
-"The CSV import plugin provides methods to generate user accounts from a file"
-" containing Semi-Colon Seperated Values. The administrator can decide which "
-"columns should be transfered to which attribute. Note that you must have at "
-"least the GIVENNAME and SURNAME set."
-msgstr ""
-
-#: addons/ldapmanager/contentcsv.tpl.c:5
-msgid "Select CSV file to import"
-msgstr ""
-
-#: addons/ldapmanager/contentcsv.tpl.c:8
-msgid "Browse"
-msgstr ""
-
-#: addons/ldapmanager/contentcsv.tpl.c:11
-msgid "Select template"
+"Some fixed values that you might wanna use in the filling of the template."
 msgstr ""
 
-#: addons/ldapmanager/contentcsv.tpl.c:14
-msgid "All entries have been written to the LDAP database successfully."
+#: addons/ldapmanager/class_csvimport.inc:75
+msgid "Template filling"
 msgstr ""
 
-#: addons/ldapmanager/contentcsv.tpl.c:17
-msgid "Oups. There was an error during the import of your data."
+#: addons/ldapmanager/class_csvimport.inc:84
+msgid "Select fields associations"
 msgstr ""
 
-#: addons/ldapmanager/contentcsv.tpl.c:20
-msgid "Here is the status report for the import:"
+#: addons/ldapmanager/class_csvimport.inc:190
+msgid "Success"
 msgstr ""
 
-#: addons/ldapmanager/contentcsv.tpl.c:23
-msgid "Selected Template"
+#: addons/ldapmanager/class_csvimport.inc:190
+#, php-format
+msgid "Successfully imported %d entries"
 msgstr ""
diff --git a/ldapmanager/locale/fr/fusiondirectory.po b/ldapmanager/locale/fr/fusiondirectory.po
index 8fc8a55c539d71346577b421de887bba8385927c..14ad57e494b136b1a5a7460c855cf6305bddbddb 100644
--- a/ldapmanager/locale/fr/fusiondirectory.po
+++ b/ldapmanager/locale/fr/fusiondirectory.po
@@ -3,21 +3,15 @@
 # This file is distributed under the same license as the PACKAGE package.
 # 
 # Translators:
-# Benoit Mortier <benoit.mortier@opensides.be>, 2005-2008,2011
-# MCMic, 2014
-# fusiondirectory <contact@fusiondirectory.org>, 2013-2014
-# fusiondirectory <contact@fusiondirectory.org>, 2012
-# fusiondirectory <contact@fusiondirectory.org>, 2012
-# fusiondirectory <contact@fusiondirectory.org>, 2012
-# MCMic, 2014
+# fusiondirectory <contact@fusiondirectory.org>, 2013
 msgid ""
 msgstr ""
-"Project-Id-Version: FusionDirectory-108\n"
+"Project-Id-Version: FusionDirectory-109\n"
 "Report-Msgid-Bugs-To: documentation@lists.fusiondirectory.org\n"
-"POT-Creation-Date: 2015-03-19 21:45+0100\n"
-"PO-Revision-Date: 2015-02-25 16:12+0000\n"
+"POT-Creation-Date: 2014-12-15 17:47+0100\n"
+"PO-Revision-Date: 2015-02-25 16:13+0000\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>\n"
-"Language-Team: French (http://www.transifex.com/projects/p/FusionDirectory-108/language/fr/)\n"
+"Language-Team: French (http://www.transifex.com/projects/p/FusionDirectory-109/language/fr/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -30,11 +24,11 @@ msgstr "LDIF"
 
 #: addons/ldapmanager/class_ldapmanager.inc:29
 msgid "Export/Import the ldap tree to/from LDIF format"
-msgstr "Exporter/importer l'annuaire LDAP au format LDIF"
+msgstr "Exporter l'annuaire ldap sous format ldif"
 
 #: addons/ldapmanager/class_ldapmanager.inc:31
 msgid "LDAP Manager"
-msgstr "GÃ©rer l'annuaire LDAP"
+msgstr "GÃ©rer l'annuaire"
 
 #: addons/ldapmanager/class_ldapmanager.inc:43
 #: addons/ldapmanager/class_ldapmanager.inc:56
@@ -56,13 +50,13 @@ msgstr "Filtre"
 
 #: addons/ldapmanager/class_ldapmanager.inc:63
 msgid "Filter to use for selecting objects to export"
-msgstr "Filtre Ã  utiliser pour sÃ©lectionner les objets Ã  exporter"
+msgstr "Filtre a utiliser pour sÃ©lectionner les objets Ã  exporter"
 
 #: addons/ldapmanager/class_ldapmanager.inc:68
 msgid ""
 "Download a complete snapshot of the running LDAP directory for this base as "
 "ldif"
-msgstr "TÃ©lÃ©charger un instantanÃ© complet de l'annuaire LDAP au format LDIF"
+msgstr "Telecharger un snapshot complet de l'annuaire LDAP "
 
 #: addons/ldapmanager/class_ldapmanager.inc:79
 msgid "Export complete LDIF for"
@@ -80,173 +74,131 @@ msgstr "Ã‰craser les entrÃ©es existantes"
 msgid ""
 "Remove fields that are not in the LDIF from the LDAP entries if they were "
 "existing."
-msgstr "Retirer les champs qui ne sont pas dans le LDIF de l'annuaire si ils existaient."
+msgstr "Enlever les entrÃ©es qui ne sont pas dans le LDIF de l'annuaire si elles existaient"
 
 #: addons/ldapmanager/class_ldapmanager.inc:92
 msgid ""
 "Import an LDIF file into your LDAP. Remember that FusionDirectory will not "
 "check your LDIFs for FusionDirectory conformance."
-msgstr "Importer un fichier LDIF dans votre annuaire. Souvenez vous que FusionDirectory ne vÃ©rifiera pas si votre fichier est conforme aux besoins de FusionDirectory ."
+msgstr "Importer un fichier LDIF dans votre annuaire. Souvenez vous que FusionDirectory ne vÃ©rifiera pas si votre fichier est conforme au besoin de FusionDirectory "
 
 #: addons/ldapmanager/class_ldapmanager.inc:102
-#: addons/ldapmanager/contentcsv.tpl.c:26
-#: addons/ldapmanager/contentcsv.tpl.c:29
+#: addons/ldapmanager/class_csvimport.inc:70
+#: addons/ldapmanager/class_csvimport.inc:93
 msgid "Import"
 msgstr "Importer"
 
 #: addons/ldapmanager/class_ldapmanager.inc:106
 msgid "Import LDIF file"
-msgstr "Importer un fichier LDIF"
+msgstr "Importation d'un fichier LDIF"
 
-#: addons/ldapmanager/class_ldapmanager.inc:147
-#: addons/ldapmanager/class_ldapmanager.inc:186
+#: addons/ldapmanager/class_ldapmanager.inc:133
+#: addons/ldapmanager/class_ldapmanager.inc:175
 msgid "LDAP error"
 msgstr "Erreur LDAP"
 
-#: addons/ldapmanager/class_ldapmanager.inc:148
+#: addons/ldapmanager/class_ldapmanager.inc:134
 #, php-format
 msgid "No such object %s!"
-msgstr "Objet '%s' non trouvÃ©â€¯!"
+msgstr "Pas d'objet '%s' !"
 
-#: addons/ldapmanager/class_ldapmanager.inc:162
-#: addons/ldapmanager/class_csvimport.inc:137
+#: addons/ldapmanager/class_ldapmanager.inc:152
 msgid "Permission error"
-msgstr "Erreur de permission"
+msgstr "Erreur de permissions"
 
-#: addons/ldapmanager/class_ldapmanager.inc:163
+#: addons/ldapmanager/class_ldapmanager.inc:153
 #, 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:168
-#: addons/ldapmanager/class_csvimport.inc:188
-#: addons/ldapmanager/class_csvimport.inc:351
-#: addons/ldapmanager/class_csvimport.inc:388
-#: addons/ldapmanager/class_csvimport.inc:391
-#: addons/ldapmanager/class_csvimport.inc:394
-#: addons/ldapmanager/class_csvimport.inc:397
-#: addons/ldapmanager/class_csvimport.inc:545
+#: addons/ldapmanager/class_ldapmanager.inc:159
+#: addons/ldapmanager/class_csvimport.inc:181
 msgid "Error"
 msgstr "Erreur"
 
-#: addons/ldapmanager/class_ldapmanager.inc:169
+#: addons/ldapmanager/class_ldapmanager.inc:160
 #, php-format
 msgid "Failed to generate ldap export, error was \"%s\"!"
-msgstr "Ã‰chec de lâ€™exportation de votre annuaire LDAP, l'erreur est '%s'â€¯!"
+msgstr "Ã‰chec de la crÃ©ation d'une exportation de votre annuaire ldap, l'erreur est '%s' !"
 
 #: addons/ldapmanager/tabs_ldif.inc:38
 msgid "LDAP import/export"
-msgstr "Import/Export LDAP"
+msgstr "Import / Export LDAP"
 
 #: addons/ldapmanager/tabs_ldif.inc:39
 msgid "Allows the import or export of the ldap tree"
-msgstr "Vous permet d'importer ou exporter des parties de votre annuaire LDAP"
+msgstr "Cette extension vous permet d'importer ou exporter des parties de votre annuaire LDAP"
 
 #: addons/ldapmanager/tabs_ldif.inc:43
 msgid "Ldap manager"
 msgstr "GÃ©rer l'annuaire LDAP"
 
-#: addons/ldapmanager/class_csvimport.inc:39
+#: addons/ldapmanager/class_csvimport.inc:28
 msgid "CSV import"
 msgstr "Importation CSV"
 
-#: addons/ldapmanager/class_csvimport.inc:40
+#: addons/ldapmanager/class_csvimport.inc:29
 msgid "Import of csv data into the ldap tree"
-msgstr "Importer des donnÃ©es CSV dans votre annuaire LDAP"
+msgstr "importer des donnÃ©es CVS dans votre annuaire ldap"
 
-#: addons/ldapmanager/class_csvimport.inc:137
-msgid "You've no permission to import CSV files."
-msgstr "Vous n'avez pas les droits nÃ©cessaires pour effectuer des importations CSV."
+#: addons/ldapmanager/class_csvimport.inc:42
+msgid "Import CSV"
+msgstr ""
 
-#: addons/ldapmanager/class_csvimport.inc:188
-msgid "Need at least 'sn' and 'givenName' to create users!"
-msgstr "Il faut au moins 'sn' et 'givenName' pour crÃ©er des utilisateursâ€¯!"
+#: addons/ldapmanager/class_csvimport.inc:45
+msgid "Object type"
+msgstr ""
 
-#: addons/ldapmanager/class_csvimport.inc:189
-#: addons/ldapmanager/class_csvimport.inc:221
-#: addons/ldapmanager/class_csvimport.inc:287
-msgid "failed"
-msgstr "Ã©chec"
+#: addons/ldapmanager/class_csvimport.inc:45
+msgid "Type of objects you wish to import"
+msgstr ""
 
-#: addons/ldapmanager/class_csvimport.inc:220
-#, php-format
-msgid "Failed to generate 'uid' for entry '%s'!"
-msgstr "La crÃ©ation de l'uid pour l'entrÃ©e '%s' a Ã©chouÃ©  !"
+#: addons/ldapmanager/class_csvimport.inc:49
+msgid "Template"
+msgstr "ModÃ¨le"
 
-#: addons/ldapmanager/class_csvimport.inc:291
-msgid "ok"
-msgstr "ok"
+#: addons/ldapmanager/class_csvimport.inc:49
+msgid "Select a template to apply to imported entries"
+msgstr ""
 
-#: addons/ldapmanager/class_csvimport.inc:351
-#, php-format
-msgid "Cannot insert entry '%s'!"
-msgstr "Impossible dâ€™insÃ©rer l'entrÃ©e '%s'â€¯!"
+#: addons/ldapmanager/class_csvimport.inc:53
+msgid "CSV file"
+msgstr ""
 
-#: addons/ldapmanager/class_csvimport.inc:377
-msgid "Information"
-msgstr "Information"
+#: addons/ldapmanager/class_csvimport.inc:53
+msgid "Import a CSV file into your LDAP"
+msgstr ""
 
-#: addons/ldapmanager/class_csvimport.inc:377
-msgid "Nothing to import!"
-msgstr "Rien Ã  importer !"
+#: addons/ldapmanager/class_csvimport.inc:57
+msgid "Separator"
+msgstr "SÃ©parateur"
 
-#: addons/ldapmanager/class_csvimport.inc:388
-#: addons/ldapmanager/class_csvimport.inc:391
-#: addons/ldapmanager/class_csvimport.inc:394
-#: addons/ldapmanager/class_csvimport.inc:397
-#, php-format
-msgid "Cannot read uploaded file: %s"
-msgstr "Impossible de lire le fichier importÃ©â€¯: '%s'"
+#: addons/ldapmanager/class_csvimport.inc:57
+msgid "Character used as separator in the CSV file"
+msgstr ""
+
+#: addons/ldapmanager/class_csvimport.inc:63
+msgid "Fixed values"
+msgstr ""
 
-#: addons/ldapmanager/class_csvimport.inc:388
-#: addons/ldapmanager/class_csvimport.inc:394
-msgid "file not found"
-msgstr "le fichier n'a pas Ã©tÃ© trouvÃ©"
+#: addons/ldapmanager/class_csvimport.inc:63
+msgid ""
+"Some fixed values that you might wanna use in the filling of the template."
+msgstr ""
 
-#: addons/ldapmanager/class_csvimport.inc:391
-msgid "file is empty"
-msgstr "le fichier est vide"
+#: addons/ldapmanager/class_csvimport.inc:75
+msgid "Template filling"
+msgstr ""
 
-#: addons/ldapmanager/class_csvimport.inc:397
-msgid "file not readable"
-msgstr "le fichier n'est pas lisible"
+#: addons/ldapmanager/class_csvimport.inc:84
+msgid "Select fields associations"
+msgstr ""
 
-#: addons/ldapmanager/class_csvimport.inc:545
-msgid "Cannot find CSV data in the selected file!"
-msgstr "Impossible de trouver des donnÃ©es CSV dans le fichier selectionnÃ© !"
+#: addons/ldapmanager/class_csvimport.inc:190
+msgid "Success"
+msgstr "RÃ©ussi"
 
-#: addons/ldapmanager/contentcsv.tpl.c:2
-msgid ""
-"The CSV import plugin provides methods to generate user accounts from a file"
-" containing Semi-Colon Seperated Values. The administrator can decide which "
-"columns should be transfered to which attribute. Note that you must have at "
-"least the GIVENNAME and SURNAME set."
-msgstr "L'extension CSV permet de gÃ©nÃ©rer des comptes utilisateurs depuis un fichier contenant des valeurs sÃ©parÃ©es par des points virgules. L'administrateur peut choisir quelle colonnes doivent Ãªtre transfÃ©rÃ©es vers quel attribut. Notez que vous devez au moins fournir le GIVENNAME et SURENAME."
-
-#: addons/ldapmanager/contentcsv.tpl.c:5
-msgid "Select CSV file to import"
-msgstr "SÃ©lectionnez le fichier CSV Ã  importer"
-
-#: addons/ldapmanager/contentcsv.tpl.c:8
-msgid "Browse"
-msgstr "Parcourir"
-
-#: addons/ldapmanager/contentcsv.tpl.c:11
-msgid "Select template"
-msgstr "SÃ©lectionnez le modÃ¨le"
-
-#: addons/ldapmanager/contentcsv.tpl.c:14
-msgid "All entries have been written to the LDAP database successfully."
-msgstr "Toutes les entrÃ©es on Ã©tÃ© Ã©crites correctement dans l'arbre LDAP."
-
-#: addons/ldapmanager/contentcsv.tpl.c:17
-msgid "Oups. There was an error during the import of your data."
-msgstr "Oups. Il Ã  eu une erreur lors de l'importation de vos donnÃ©es."
-
-#: addons/ldapmanager/contentcsv.tpl.c:20
-msgid "Here is the status report for the import:"
-msgstr "Voici le rapport de votre importation de donnÃ©es :"
-
-#: addons/ldapmanager/contentcsv.tpl.c:23
-msgid "Selected Template"
-msgstr "ModÃ¨le sÃ©lectionnÃ©"
+#: addons/ldapmanager/class_csvimport.inc:190
+#, php-format
+msgid "Successfully imported %d entries"
+msgstr ""
diff --git a/ldapmanager/locale/id/fusiondirectory.po b/ldapmanager/locale/id/fusiondirectory.po
index 16bc5fcc76cb4d0a22086d56f37ec0e644a780c3..af52844dc48a9986f65748fedc214e6f3b6e13b1 100644
--- a/ldapmanager/locale/id/fusiondirectory.po
+++ b/ldapmanager/locale/id/fusiondirectory.po
@@ -5,12 +5,12 @@
 # Translators:
 msgid ""
 msgstr ""
-"Project-Id-Version: FusionDirectory-108\n"
+"Project-Id-Version: FusionDirectory-109\n"
 "Report-Msgid-Bugs-To: documentation@lists.fusiondirectory.org\n"
-"POT-Creation-Date: 2015-03-19 21:45+0100\n"
-"PO-Revision-Date: 2015-02-25 15:49+0000\n"
+"POT-Creation-Date: 2014-12-15 17:47+0100\n"
+"PO-Revision-Date: 2014-12-15 16:59+0000\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>\n"
-"Language-Team: Indonesian (http://www.transifex.com/projects/p/FusionDirectory-108/language/id/)\n"
+"Language-Team: Indonesian (http://www.transifex.com/projects/p/FusionDirectory-109/language/id/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -82,8 +82,8 @@ msgid ""
 msgstr ""
 
 #: addons/ldapmanager/class_ldapmanager.inc:102
-#: addons/ldapmanager/contentcsv.tpl.c:26
-#: addons/ldapmanager/contentcsv.tpl.c:29
+#: addons/ldapmanager/class_csvimport.inc:70
+#: addons/ldapmanager/class_csvimport.inc:93
 msgid "Import"
 msgstr ""
 
@@ -91,38 +91,31 @@ msgstr ""
 msgid "Import LDIF file"
 msgstr ""
 
-#: addons/ldapmanager/class_ldapmanager.inc:147
-#: addons/ldapmanager/class_ldapmanager.inc:186
+#: addons/ldapmanager/class_ldapmanager.inc:133
+#: addons/ldapmanager/class_ldapmanager.inc:175
 msgid "LDAP error"
 msgstr ""
 
-#: addons/ldapmanager/class_ldapmanager.inc:148
+#: addons/ldapmanager/class_ldapmanager.inc:134
 #, php-format
 msgid "No such object %s!"
 msgstr ""
 
-#: addons/ldapmanager/class_ldapmanager.inc:162
-#: addons/ldapmanager/class_csvimport.inc:137
+#: addons/ldapmanager/class_ldapmanager.inc:152
 msgid "Permission error"
 msgstr ""
 
-#: addons/ldapmanager/class_ldapmanager.inc:163
+#: addons/ldapmanager/class_ldapmanager.inc:153
 #, php-format
 msgid "You have no permission to export %s!"
 msgstr ""
 
-#: addons/ldapmanager/class_ldapmanager.inc:168
-#: addons/ldapmanager/class_csvimport.inc:188
-#: addons/ldapmanager/class_csvimport.inc:351
-#: addons/ldapmanager/class_csvimport.inc:388
-#: addons/ldapmanager/class_csvimport.inc:391
-#: addons/ldapmanager/class_csvimport.inc:394
-#: addons/ldapmanager/class_csvimport.inc:397
-#: addons/ldapmanager/class_csvimport.inc:545
+#: addons/ldapmanager/class_ldapmanager.inc:159
+#: addons/ldapmanager/class_csvimport.inc:181
 msgid "Error"
 msgstr ""
 
-#: addons/ldapmanager/class_ldapmanager.inc:169
+#: addons/ldapmanager/class_ldapmanager.inc:160
 #, php-format
 msgid "Failed to generate ldap export, error was \"%s\"!"
 msgstr ""
@@ -139,107 +132,72 @@ msgstr ""
 msgid "Ldap manager"
 msgstr ""
 
-#: addons/ldapmanager/class_csvimport.inc:39
+#: addons/ldapmanager/class_csvimport.inc:28
 msgid "CSV import"
 msgstr ""
 
-#: addons/ldapmanager/class_csvimport.inc:40
+#: addons/ldapmanager/class_csvimport.inc:29
 msgid "Import of csv data into the ldap tree"
 msgstr ""
 
-#: addons/ldapmanager/class_csvimport.inc:137
-msgid "You've no permission to import CSV files."
+#: addons/ldapmanager/class_csvimport.inc:42
+msgid "Import CSV"
 msgstr ""
 
-#: addons/ldapmanager/class_csvimport.inc:188
-msgid "Need at least 'sn' and 'givenName' to create users!"
+#: addons/ldapmanager/class_csvimport.inc:45
+msgid "Object type"
 msgstr ""
 
-#: addons/ldapmanager/class_csvimport.inc:189
-#: addons/ldapmanager/class_csvimport.inc:221
-#: addons/ldapmanager/class_csvimport.inc:287
-msgid "failed"
+#: addons/ldapmanager/class_csvimport.inc:45
+msgid "Type of objects you wish to import"
 msgstr ""
 
-#: addons/ldapmanager/class_csvimport.inc:220
-#, php-format
-msgid "Failed to generate 'uid' for entry '%s'!"
-msgstr ""
-
-#: addons/ldapmanager/class_csvimport.inc:291
-msgid "ok"
-msgstr ""
-
-#: addons/ldapmanager/class_csvimport.inc:351
-#, php-format
-msgid "Cannot insert entry '%s'!"
-msgstr ""
-
-#: addons/ldapmanager/class_csvimport.inc:377
-msgid "Information"
+#: addons/ldapmanager/class_csvimport.inc:49
+msgid "Template"
 msgstr ""
 
-#: addons/ldapmanager/class_csvimport.inc:377
-msgid "Nothing to import!"
+#: addons/ldapmanager/class_csvimport.inc:49
+msgid "Select a template to apply to imported entries"
 msgstr ""
 
-#: addons/ldapmanager/class_csvimport.inc:388
-#: addons/ldapmanager/class_csvimport.inc:391
-#: addons/ldapmanager/class_csvimport.inc:394
-#: addons/ldapmanager/class_csvimport.inc:397
-#, php-format
-msgid "Cannot read uploaded file: %s"
+#: addons/ldapmanager/class_csvimport.inc:53
+msgid "CSV file"
 msgstr ""
 
-#: addons/ldapmanager/class_csvimport.inc:388
-#: addons/ldapmanager/class_csvimport.inc:394
-msgid "file not found"
+#: addons/ldapmanager/class_csvimport.inc:53
+msgid "Import a CSV file into your LDAP"
 msgstr ""
 
-#: addons/ldapmanager/class_csvimport.inc:391
-msgid "file is empty"
+#: addons/ldapmanager/class_csvimport.inc:57
+msgid "Separator"
 msgstr ""
 
-#: addons/ldapmanager/class_csvimport.inc:397
-msgid "file not readable"
+#: addons/ldapmanager/class_csvimport.inc:57
+msgid "Character used as separator in the CSV file"
 msgstr ""
 
-#: addons/ldapmanager/class_csvimport.inc:545
-msgid "Cannot find CSV data in the selected file!"
+#: addons/ldapmanager/class_csvimport.inc:63
+msgid "Fixed values"
 msgstr ""
 
-#: addons/ldapmanager/contentcsv.tpl.c:2
+#: addons/ldapmanager/class_csvimport.inc:63
 msgid ""
-"The CSV import plugin provides methods to generate user accounts from a file"
-" containing Semi-Colon Seperated Values. The administrator can decide which "
-"columns should be transfered to which attribute. Note that you must have at "
-"least the GIVENNAME and SURNAME set."
-msgstr ""
-
-#: addons/ldapmanager/contentcsv.tpl.c:5
-msgid "Select CSV file to import"
-msgstr ""
-
-#: addons/ldapmanager/contentcsv.tpl.c:8
-msgid "Browse"
-msgstr ""
-
-#: addons/ldapmanager/contentcsv.tpl.c:11
-msgid "Select template"
+"Some fixed values that you might wanna use in the filling of the template."
 msgstr ""
 
-#: addons/ldapmanager/contentcsv.tpl.c:14
-msgid "All entries have been written to the LDAP database successfully."
+#: addons/ldapmanager/class_csvimport.inc:75
+msgid "Template filling"
 msgstr ""
 
-#: addons/ldapmanager/contentcsv.tpl.c:17
-msgid "Oups. There was an error during the import of your data."
+#: addons/ldapmanager/class_csvimport.inc:84
+msgid "Select fields associations"
 msgstr ""
 
-#: addons/ldapmanager/contentcsv.tpl.c:20
-msgid "Here is the status report for the import:"
+#: addons/ldapmanager/class_csvimport.inc:190
+msgid "Success"
 msgstr ""
 
-#: addons/ldapmanager/contentcsv.tpl.c:23
-msgid "Selected Template"
+#: addons/ldapmanager/class_csvimport.inc:190
+#, php-format
+msgid "Successfully imported %d entries"
 msgstr ""
diff --git a/ldapmanager/locale/it/fusiondirectory.po b/ldapmanager/locale/it/fusiondirectory.po
index 0eaa6d5a0776e4d323cc35bde8b8bac073151009..8d986f3881ff66ac6c7e0765d7f30add48331a7f 100644
--- a/ldapmanager/locale/it/fusiondirectory.po
+++ b/ldapmanager/locale/it/fusiondirectory.po
@@ -3,19 +3,14 @@
 # This file is distributed under the same license as the PACKAGE package.
 # 
 # Translators:
-# Alessandro Amici <a.amici@bopen.it>, 2005
-# poterealpopolo <giuliano@opensides.be>, 2011
-# poterealpopolo <giuliano@opensides.be>, 2013
-# poterealpopolo <giuliano@opensides.be>, 2012
-# poterealpopolo <giuliano@opensides.be>, 2011-2013
 msgid ""
 msgstr ""
-"Project-Id-Version: FusionDirectory-108\n"
+"Project-Id-Version: FusionDirectory-109\n"
 "Report-Msgid-Bugs-To: documentation@lists.fusiondirectory.org\n"
-"POT-Creation-Date: 2015-03-19 21:45+0100\n"
-"PO-Revision-Date: 2015-02-25 16:12+0000\n"
+"POT-Creation-Date: 2014-12-15 17:47+0100\n"
+"PO-Revision-Date: 2015-02-25 16:13+0000\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>\n"
-"Language-Team: Italian (http://www.transifex.com/projects/p/FusionDirectory-108/language/it/)\n"
+"Language-Team: Italian (http://www.transifex.com/projects/p/FusionDirectory-109/language/it/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -87,8 +82,8 @@ msgid ""
 msgstr ""
 
 #: addons/ldapmanager/class_ldapmanager.inc:102
-#: addons/ldapmanager/contentcsv.tpl.c:26
-#: addons/ldapmanager/contentcsv.tpl.c:29
+#: addons/ldapmanager/class_csvimport.inc:70
+#: addons/ldapmanager/class_csvimport.inc:93
 msgid "Import"
 msgstr "Importa"
 
@@ -96,38 +91,31 @@ msgstr "Importa"
 msgid "Import LDIF file"
 msgstr ""
 
-#: addons/ldapmanager/class_ldapmanager.inc:147
-#: addons/ldapmanager/class_ldapmanager.inc:186
+#: addons/ldapmanager/class_ldapmanager.inc:133
+#: addons/ldapmanager/class_ldapmanager.inc:175
 msgid "LDAP error"
 msgstr "Errore LDAP"
 
-#: addons/ldapmanager/class_ldapmanager.inc:148
+#: addons/ldapmanager/class_ldapmanager.inc:134
 #, php-format
 msgid "No such object %s!"
 msgstr "Nessun oggetto %s !"
 
-#: addons/ldapmanager/class_ldapmanager.inc:162
-#: addons/ldapmanager/class_csvimport.inc:137
+#: addons/ldapmanager/class_ldapmanager.inc:152
 msgid "Permission error"
 msgstr "Errore d'autorizzazione"
 
-#: addons/ldapmanager/class_ldapmanager.inc:163
+#: addons/ldapmanager/class_ldapmanager.inc:153
 #, php-format
 msgid "You have no permission to export %s!"
 msgstr "Non hai il permesso di esportare %s !"
 
-#: addons/ldapmanager/class_ldapmanager.inc:168
-#: addons/ldapmanager/class_csvimport.inc:188
-#: addons/ldapmanager/class_csvimport.inc:351
-#: addons/ldapmanager/class_csvimport.inc:388
-#: addons/ldapmanager/class_csvimport.inc:391
-#: addons/ldapmanager/class_csvimport.inc:394
-#: addons/ldapmanager/class_csvimport.inc:397
-#: addons/ldapmanager/class_csvimport.inc:545
+#: addons/ldapmanager/class_ldapmanager.inc:159
+#: addons/ldapmanager/class_csvimport.inc:181
 msgid "Error"
 msgstr "Errore"
 
-#: addons/ldapmanager/class_ldapmanager.inc:169
+#: addons/ldapmanager/class_ldapmanager.inc:160
 #, php-format
 msgid "Failed to generate ldap export, error was \"%s\"!"
 msgstr ""
@@ -144,107 +132,72 @@ msgstr ""
 msgid "Ldap manager"
 msgstr "Amministratore LDAP"
 
-#: addons/ldapmanager/class_csvimport.inc:39
+#: addons/ldapmanager/class_csvimport.inc:28
 msgid "CSV import"
 msgstr "Importa dal formato CSV"
 
-#: addons/ldapmanager/class_csvimport.inc:40
+#: addons/ldapmanager/class_csvimport.inc:29
 msgid "Import of csv data into the ldap tree"
 msgstr ""
 
-#: addons/ldapmanager/class_csvimport.inc:137
-msgid "You've no permission to import CSV files."
-msgstr "Non hai il permesso di di importare file CSV."
+#: addons/ldapmanager/class_csvimport.inc:42
+msgid "Import CSV"
+msgstr ""
 
-#: addons/ldapmanager/class_csvimport.inc:188
-msgid "Need at least 'sn' and 'givenName' to create users!"
-msgstr "Hai bisogno almeno di 'sn' e 'givenName' per creare gli utenti!"
+#: addons/ldapmanager/class_csvimport.inc:45
+msgid "Object type"
+msgstr ""
 
-#: addons/ldapmanager/class_csvimport.inc:189
-#: addons/ldapmanager/class_csvimport.inc:221
-#: addons/ldapmanager/class_csvimport.inc:287
-msgid "failed"
-msgstr "Fallito"
+#: addons/ldapmanager/class_csvimport.inc:45
+msgid "Type of objects you wish to import"
+msgstr ""
 
-#: addons/ldapmanager/class_csvimport.inc:220
-#, php-format
-msgid "Failed to generate 'uid' for entry '%s'!"
-msgstr "Impossibile generare 'uid' per l'entry '%s'!"
+#: addons/ldapmanager/class_csvimport.inc:49
+msgid "Template"
+msgstr "Modello"
 
-#: addons/ldapmanager/class_csvimport.inc:291
-msgid "ok"
-msgstr "Ok"
+#: addons/ldapmanager/class_csvimport.inc:49
+msgid "Select a template to apply to imported entries"
+msgstr ""
 
-#: addons/ldapmanager/class_csvimport.inc:351
-#, php-format
-msgid "Cannot insert entry '%s'!"
-msgstr "Impossibile inserire l'entry '%s' !"
+#: addons/ldapmanager/class_csvimport.inc:53
+msgid "CSV file"
+msgstr ""
 
-#: addons/ldapmanager/class_csvimport.inc:377
-msgid "Information"
-msgstr "Informazione"
+#: addons/ldapmanager/class_csvimport.inc:53
+msgid "Import a CSV file into your LDAP"
+msgstr ""
 
-#: addons/ldapmanager/class_csvimport.inc:377
-msgid "Nothing to import!"
-msgstr "Niente da importare !"
+#: addons/ldapmanager/class_csvimport.inc:57
+msgid "Separator"
+msgstr "Separatore"
 
-#: addons/ldapmanager/class_csvimport.inc:388
-#: addons/ldapmanager/class_csvimport.inc:391
-#: addons/ldapmanager/class_csvimport.inc:394
-#: addons/ldapmanager/class_csvimport.inc:397
-#, php-format
-msgid "Cannot read uploaded file: %s"
-msgstr "Impossibile leggere il file importato : %s"
+#: addons/ldapmanager/class_csvimport.inc:57
+msgid "Character used as separator in the CSV file"
+msgstr ""
 
-#: addons/ldapmanager/class_csvimport.inc:388
-#: addons/ldapmanager/class_csvimport.inc:394
-msgid "file not found"
-msgstr "Il file non Ã¨ stato trovato"
+#: addons/ldapmanager/class_csvimport.inc:63
+msgid "Fixed values"
+msgstr ""
 
-#: addons/ldapmanager/class_csvimport.inc:391
-msgid "file is empty"
-msgstr "il file Ã¨ vuoto"
+#: addons/ldapmanager/class_csvimport.inc:63
+msgid ""
+"Some fixed values that you might wanna use in the filling of the template."
+msgstr ""
 
-#: addons/ldapmanager/class_csvimport.inc:397
-msgid "file not readable"
-msgstr "Il file non puÃ³ essere letto"
+#: addons/ldapmanager/class_csvimport.inc:75
+msgid "Template filling"
+msgstr ""
 
-#: addons/ldapmanager/class_csvimport.inc:545
-msgid "Cannot find CSV data in the selected file!"
-msgstr "Impossibile trovare dei dati nel file CSV selezionato !"
+#: addons/ldapmanager/class_csvimport.inc:84
+msgid "Select fields associations"
+msgstr ""
 
-#: addons/ldapmanager/contentcsv.tpl.c:2
-msgid ""
-"The CSV import plugin provides methods to generate user accounts from a file"
-" containing Semi-Colon Seperated Values. The administrator can decide which "
-"columns should be transfered to which attribute. Note that you must have at "
-"least the GIVENNAME and SURNAME set."
-msgstr "L'estensione per l'importazione CSV ti permette di generare degli account utente a partire da un file contenente dei valori separati con dei punti e virgola. L'amministratore puÃ³ scegliere quali colonne saranno trasferite verso quale attributo. Nota che nel file CSV dovranno essere forniti almeno il GIVENNAME e il SURNAME."
-
-#: addons/ldapmanager/contentcsv.tpl.c:5
-msgid "Select CSV file to import"
-msgstr "Scegli un file CSV da importare"
-
-#: addons/ldapmanager/contentcsv.tpl.c:8
-msgid "Browse"
-msgstr "Percorri"
-
-#: addons/ldapmanager/contentcsv.tpl.c:11
-msgid "Select template"
-msgstr "SCegli un modello"
-
-#: addons/ldapmanager/contentcsv.tpl.c:14
-msgid "All entries have been written to the LDAP database successfully."
-msgstr "Tutte le entries sono state correttamente scritte nell'annuario LDAP."
-
-#: addons/ldapmanager/contentcsv.tpl.c:17
-msgid "Oups. There was an error during the import of your data."
-msgstr "Si Ã¨ verificato un errore durante l'importazione dei tuoi dati."
-
-#: addons/ldapmanager/contentcsv.tpl.c:20
-msgid "Here is the status report for the import:"
-msgstr "Ecco il rapporto dell'importazione dei vostri dati :"
-
-#: addons/ldapmanager/contentcsv.tpl.c:23
-msgid "Selected Template"
-msgstr "Modello selezionato"
+#: addons/ldapmanager/class_csvimport.inc:190
+msgid "Success"
+msgstr "Completato"
+
+#: addons/ldapmanager/class_csvimport.inc:190
+#, php-format
+msgid "Successfully imported %d entries"
+msgstr ""
diff --git a/ldapmanager/locale/lv/fusiondirectory.po b/ldapmanager/locale/lv/fusiondirectory.po
index b0e33971771a3f68510786e606ad4307dd1a5197..bf8a4fcbf199d7c3dab644459f7ab43e73c17567 100644
--- a/ldapmanager/locale/lv/fusiondirectory.po
+++ b/ldapmanager/locale/lv/fusiondirectory.po
@@ -5,12 +5,12 @@
 # Translators:
 msgid ""
 msgstr ""
-"Project-Id-Version: FusionDirectory-108\n"
+"Project-Id-Version: FusionDirectory-109\n"
 "Report-Msgid-Bugs-To: documentation@lists.fusiondirectory.org\n"
-"POT-Creation-Date: 2015-03-19 21:45+0100\n"
-"PO-Revision-Date: 2015-02-25 15:49+0000\n"
+"POT-Creation-Date: 2014-12-15 17:47+0100\n"
+"PO-Revision-Date: 2014-12-15 16:59+0000\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>\n"
-"Language-Team: Latvian (http://www.transifex.com/projects/p/FusionDirectory-108/language/lv/)\n"
+"Language-Team: Latvian (http://www.transifex.com/projects/p/FusionDirectory-109/language/lv/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -82,8 +82,8 @@ msgid ""
 msgstr ""
 
 #: addons/ldapmanager/class_ldapmanager.inc:102
-#: addons/ldapmanager/contentcsv.tpl.c:26
-#: addons/ldapmanager/contentcsv.tpl.c:29
+#: addons/ldapmanager/class_csvimport.inc:70
+#: addons/ldapmanager/class_csvimport.inc:93
 msgid "Import"
 msgstr ""
 
@@ -91,38 +91,31 @@ msgstr ""
 msgid "Import LDIF file"
 msgstr ""
 
-#: addons/ldapmanager/class_ldapmanager.inc:147
-#: addons/ldapmanager/class_ldapmanager.inc:186
+#: addons/ldapmanager/class_ldapmanager.inc:133
+#: addons/ldapmanager/class_ldapmanager.inc:175
 msgid "LDAP error"
 msgstr ""
 
-#: addons/ldapmanager/class_ldapmanager.inc:148
+#: addons/ldapmanager/class_ldapmanager.inc:134
 #, php-format
 msgid "No such object %s!"
 msgstr ""
 
-#: addons/ldapmanager/class_ldapmanager.inc:162
-#: addons/ldapmanager/class_csvimport.inc:137
+#: addons/ldapmanager/class_ldapmanager.inc:152
 msgid "Permission error"
 msgstr ""
 
-#: addons/ldapmanager/class_ldapmanager.inc:163
+#: addons/ldapmanager/class_ldapmanager.inc:153
 #, php-format
 msgid "You have no permission to export %s!"
 msgstr ""
 
-#: addons/ldapmanager/class_ldapmanager.inc:168
-#: addons/ldapmanager/class_csvimport.inc:188
-#: addons/ldapmanager/class_csvimport.inc:351
-#: addons/ldapmanager/class_csvimport.inc:388
-#: addons/ldapmanager/class_csvimport.inc:391
-#: addons/ldapmanager/class_csvimport.inc:394
-#: addons/ldapmanager/class_csvimport.inc:397
-#: addons/ldapmanager/class_csvimport.inc:545
+#: addons/ldapmanager/class_ldapmanager.inc:159
+#: addons/ldapmanager/class_csvimport.inc:181
 msgid "Error"
 msgstr ""
 
-#: addons/ldapmanager/class_ldapmanager.inc:169
+#: addons/ldapmanager/class_ldapmanager.inc:160
 #, php-format
 msgid "Failed to generate ldap export, error was \"%s\"!"
 msgstr ""
@@ -139,107 +132,72 @@ msgstr ""
 msgid "Ldap manager"
 msgstr ""
 
-#: addons/ldapmanager/class_csvimport.inc:39
+#: addons/ldapmanager/class_csvimport.inc:28
 msgid "CSV import"
 msgstr ""
 
-#: addons/ldapmanager/class_csvimport.inc:40
+#: addons/ldapmanager/class_csvimport.inc:29
 msgid "Import of csv data into the ldap tree"
 msgstr ""
 
-#: addons/ldapmanager/class_csvimport.inc:137
-msgid "You've no permission to import CSV files."
+#: addons/ldapmanager/class_csvimport.inc:42
+msgid "Import CSV"
 msgstr ""
 
-#: addons/ldapmanager/class_csvimport.inc:188
-msgid "Need at least 'sn' and 'givenName' to create users!"
+#: addons/ldapmanager/class_csvimport.inc:45
+msgid "Object type"
 msgstr ""
 
-#: addons/ldapmanager/class_csvimport.inc:189
-#: addons/ldapmanager/class_csvimport.inc:221
-#: addons/ldapmanager/class_csvimport.inc:287
-msgid "failed"
+#: addons/ldapmanager/class_csvimport.inc:45
+msgid "Type of objects you wish to import"
 msgstr ""
 
-#: addons/ldapmanager/class_csvimport.inc:220
-#, php-format
-msgid "Failed to generate 'uid' for entry '%s'!"
-msgstr ""
-
-#: addons/ldapmanager/class_csvimport.inc:291
-msgid "ok"
-msgstr ""
-
-#: addons/ldapmanager/class_csvimport.inc:351
-#, php-format
-msgid "Cannot insert entry '%s'!"
-msgstr ""
-
-#: addons/ldapmanager/class_csvimport.inc:377
-msgid "Information"
+#: addons/ldapmanager/class_csvimport.inc:49
+msgid "Template"
 msgstr ""
 
-#: addons/ldapmanager/class_csvimport.inc:377
-msgid "Nothing to import!"
+#: addons/ldapmanager/class_csvimport.inc:49
+msgid "Select a template to apply to imported entries"
 msgstr ""
 
-#: addons/ldapmanager/class_csvimport.inc:388
-#: addons/ldapmanager/class_csvimport.inc:391
-#: addons/ldapmanager/class_csvimport.inc:394
-#: addons/ldapmanager/class_csvimport.inc:397
-#, php-format
-msgid "Cannot read uploaded file: %s"
+#: addons/ldapmanager/class_csvimport.inc:53
+msgid "CSV file"
 msgstr ""
 
-#: addons/ldapmanager/class_csvimport.inc:388
-#: addons/ldapmanager/class_csvimport.inc:394
-msgid "file not found"
+#: addons/ldapmanager/class_csvimport.inc:53
+msgid "Import a CSV file into your LDAP"
 msgstr ""
 
-#: addons/ldapmanager/class_csvimport.inc:391
-msgid "file is empty"
+#: addons/ldapmanager/class_csvimport.inc:57
+msgid "Separator"
 msgstr ""
 
-#: addons/ldapmanager/class_csvimport.inc:397
-msgid "file not readable"
+#: addons/ldapmanager/class_csvimport.inc:57
+msgid "Character used as separator in the CSV file"
 msgstr ""
 
-#: addons/ldapmanager/class_csvimport.inc:545
-msgid "Cannot find CSV data in the selected file!"
+#: addons/ldapmanager/class_csvimport.inc:63
+msgid "Fixed values"
 msgstr ""
 
-#: addons/ldapmanager/contentcsv.tpl.c:2
+#: addons/ldapmanager/class_csvimport.inc:63
 msgid ""
-"The CSV import plugin provides methods to generate user accounts from a file"
-" containing Semi-Colon Seperated Values. The administrator can decide which "
-"columns should be transfered to which attribute. Note that you must have at "
-"least the GIVENNAME and SURNAME set."
-msgstr ""
-
-#: addons/ldapmanager/contentcsv.tpl.c:5
-msgid "Select CSV file to import"
-msgstr ""
-
-#: addons/ldapmanager/contentcsv.tpl.c:8
-msgid "Browse"
-msgstr ""
-
-#: addons/ldapmanager/contentcsv.tpl.c:11
-msgid "Select template"
+"Some fixed values that you might wanna use in the filling of the template."
 msgstr ""
 
-#: addons/ldapmanager/contentcsv.tpl.c:14
-msgid "All entries have been written to the LDAP database successfully."
+#: addons/ldapmanager/class_csvimport.inc:75
+msgid "Template filling"
 msgstr ""
 
-#: addons/ldapmanager/contentcsv.tpl.c:17
-msgid "Oups. There was an error during the import of your data."
+#: addons/ldapmanager/class_csvimport.inc:84
+msgid "Select fields associations"
 msgstr ""
 
-#: addons/ldapmanager/contentcsv.tpl.c:20
-msgid "Here is the status report for the import:"
+#: addons/ldapmanager/class_csvimport.inc:190
+msgid "Success"
 msgstr ""
 
-#: addons/ldapmanager/contentcsv.tpl.c:23
-msgid "Selected Template"
+#: addons/ldapmanager/class_csvimport.inc:190
+#, php-format
+msgid "Successfully imported %d entries"
 msgstr ""
diff --git a/ldapmanager/locale/nb/fusiondirectory.po b/ldapmanager/locale/nb/fusiondirectory.po
index 93ca1407dc8d62b40f55432825fb90c01f3f3798..9024476c7205705dcd2896e946bb6e9e9fc43fdd 100644
--- a/ldapmanager/locale/nb/fusiondirectory.po
+++ b/ldapmanager/locale/nb/fusiondirectory.po
@@ -5,12 +5,12 @@
 # Translators:
 msgid ""
 msgstr ""
-"Project-Id-Version: FusionDirectory-108\n"
+"Project-Id-Version: FusionDirectory-109\n"
 "Report-Msgid-Bugs-To: documentation@lists.fusiondirectory.org\n"
-"POT-Creation-Date: 2015-03-19 21:45+0100\n"
-"PO-Revision-Date: 2015-02-25 16:12+0000\n"
+"POT-Creation-Date: 2014-12-15 17:47+0100\n"
+"PO-Revision-Date: 2015-02-25 16:13+0000\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>\n"
-"Language-Team: Norwegian BokmÃ¥l (http://www.transifex.com/projects/p/FusionDirectory-108/language/nb/)\n"
+"Language-Team: Norwegian BokmÃ¥l (http://www.transifex.com/projects/p/FusionDirectory-109/language/nb/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -82,8 +82,8 @@ msgid ""
 msgstr ""
 
 #: addons/ldapmanager/class_ldapmanager.inc:102
-#: addons/ldapmanager/contentcsv.tpl.c:26
-#: addons/ldapmanager/contentcsv.tpl.c:29
+#: addons/ldapmanager/class_csvimport.inc:70
+#: addons/ldapmanager/class_csvimport.inc:93
 msgid "Import"
 msgstr ""
 
@@ -91,38 +91,31 @@ msgstr ""
 msgid "Import LDIF file"
 msgstr ""
 
-#: addons/ldapmanager/class_ldapmanager.inc:147
-#: addons/ldapmanager/class_ldapmanager.inc:186
+#: addons/ldapmanager/class_ldapmanager.inc:133
+#: addons/ldapmanager/class_ldapmanager.inc:175
 msgid "LDAP error"
 msgstr "LDAP-feil"
 
-#: addons/ldapmanager/class_ldapmanager.inc:148
+#: addons/ldapmanager/class_ldapmanager.inc:134
 #, php-format
 msgid "No such object %s!"
 msgstr ""
 
-#: addons/ldapmanager/class_ldapmanager.inc:162
-#: addons/ldapmanager/class_csvimport.inc:137
+#: addons/ldapmanager/class_ldapmanager.inc:152
 msgid "Permission error"
 msgstr ""
 
-#: addons/ldapmanager/class_ldapmanager.inc:163
+#: addons/ldapmanager/class_ldapmanager.inc:153
 #, php-format
 msgid "You have no permission to export %s!"
 msgstr ""
 
-#: addons/ldapmanager/class_ldapmanager.inc:168
-#: addons/ldapmanager/class_csvimport.inc:188
-#: addons/ldapmanager/class_csvimport.inc:351
-#: addons/ldapmanager/class_csvimport.inc:388
-#: addons/ldapmanager/class_csvimport.inc:391
-#: addons/ldapmanager/class_csvimport.inc:394
-#: addons/ldapmanager/class_csvimport.inc:397
-#: addons/ldapmanager/class_csvimport.inc:545
+#: addons/ldapmanager/class_ldapmanager.inc:159
+#: addons/ldapmanager/class_csvimport.inc:181
 msgid "Error"
 msgstr "Feil"
 
-#: addons/ldapmanager/class_ldapmanager.inc:169
+#: addons/ldapmanager/class_ldapmanager.inc:160
 #, php-format
 msgid "Failed to generate ldap export, error was \"%s\"!"
 msgstr ""
@@ -139,107 +132,72 @@ msgstr ""
 msgid "Ldap manager"
 msgstr ""
 
-#: addons/ldapmanager/class_csvimport.inc:39
+#: addons/ldapmanager/class_csvimport.inc:28
 msgid "CSV import"
 msgstr ""
 
-#: addons/ldapmanager/class_csvimport.inc:40
+#: addons/ldapmanager/class_csvimport.inc:29
 msgid "Import of csv data into the ldap tree"
 msgstr ""
 
-#: addons/ldapmanager/class_csvimport.inc:137
-msgid "You've no permission to import CSV files."
+#: addons/ldapmanager/class_csvimport.inc:42
+msgid "Import CSV"
 msgstr ""
 
-#: addons/ldapmanager/class_csvimport.inc:188
-msgid "Need at least 'sn' and 'givenName' to create users!"
+#: addons/ldapmanager/class_csvimport.inc:45
+msgid "Object type"
 msgstr ""
 
-#: addons/ldapmanager/class_csvimport.inc:189
-#: addons/ldapmanager/class_csvimport.inc:221
-#: addons/ldapmanager/class_csvimport.inc:287
-msgid "failed"
+#: addons/ldapmanager/class_csvimport.inc:45
+msgid "Type of objects you wish to import"
 msgstr ""
 
-#: addons/ldapmanager/class_csvimport.inc:220
-#, php-format
-msgid "Failed to generate 'uid' for entry '%s'!"
-msgstr ""
-
-#: addons/ldapmanager/class_csvimport.inc:291
-msgid "ok"
-msgstr ""
-
-#: addons/ldapmanager/class_csvimport.inc:351
-#, php-format
-msgid "Cannot insert entry '%s'!"
-msgstr ""
-
-#: addons/ldapmanager/class_csvimport.inc:377
-msgid "Information"
+#: addons/ldapmanager/class_csvimport.inc:49
+msgid "Template"
 msgstr ""
 
-#: addons/ldapmanager/class_csvimport.inc:377
-msgid "Nothing to import!"
+#: addons/ldapmanager/class_csvimport.inc:49
+msgid "Select a template to apply to imported entries"
 msgstr ""
 
-#: addons/ldapmanager/class_csvimport.inc:388
-#: addons/ldapmanager/class_csvimport.inc:391
-#: addons/ldapmanager/class_csvimport.inc:394
-#: addons/ldapmanager/class_csvimport.inc:397
-#, php-format
-msgid "Cannot read uploaded file: %s"
+#: addons/ldapmanager/class_csvimport.inc:53
+msgid "CSV file"
 msgstr ""
 
-#: addons/ldapmanager/class_csvimport.inc:388
-#: addons/ldapmanager/class_csvimport.inc:394
-msgid "file not found"
+#: addons/ldapmanager/class_csvimport.inc:53
+msgid "Import a CSV file into your LDAP"
 msgstr ""
 
-#: addons/ldapmanager/class_csvimport.inc:391
-msgid "file is empty"
+#: addons/ldapmanager/class_csvimport.inc:57
+msgid "Separator"
 msgstr ""
 
-#: addons/ldapmanager/class_csvimport.inc:397
-msgid "file not readable"
+#: addons/ldapmanager/class_csvimport.inc:57
+msgid "Character used as separator in the CSV file"
 msgstr ""
 
-#: addons/ldapmanager/class_csvimport.inc:545
-msgid "Cannot find CSV data in the selected file!"
+#: addons/ldapmanager/class_csvimport.inc:63
+msgid "Fixed values"
 msgstr ""
 
-#: addons/ldapmanager/contentcsv.tpl.c:2
+#: addons/ldapmanager/class_csvimport.inc:63
 msgid ""
-"The CSV import plugin provides methods to generate user accounts from a file"
-" containing Semi-Colon Seperated Values. The administrator can decide which "
-"columns should be transfered to which attribute. Note that you must have at "
-"least the GIVENNAME and SURNAME set."
-msgstr ""
-
-#: addons/ldapmanager/contentcsv.tpl.c:5
-msgid "Select CSV file to import"
-msgstr ""
-
-#: addons/ldapmanager/contentcsv.tpl.c:8
-msgid "Browse"
-msgstr ""
-
-#: addons/ldapmanager/contentcsv.tpl.c:11
-msgid "Select template"
+"Some fixed values that you might wanna use in the filling of the template."
 msgstr ""
 
-#: addons/ldapmanager/contentcsv.tpl.c:14
-msgid "All entries have been written to the LDAP database successfully."
+#: addons/ldapmanager/class_csvimport.inc:75
+msgid "Template filling"
 msgstr ""
 
-#: addons/ldapmanager/contentcsv.tpl.c:17
-msgid "Oups. There was an error during the import of your data."
+#: addons/ldapmanager/class_csvimport.inc:84
+msgid "Select fields associations"
 msgstr ""
 
-#: addons/ldapmanager/contentcsv.tpl.c:20
-msgid "Here is the status report for the import:"
+#: addons/ldapmanager/class_csvimport.inc:190
+msgid "Success"
 msgstr ""
 
-#: addons/ldapmanager/contentcsv.tpl.c:23
-msgid "Selected Template"
+#: addons/ldapmanager/class_csvimport.inc:190
+#, php-format
+msgid "Successfully imported %d entries"
 msgstr ""
diff --git a/ldapmanager/locale/nl/fusiondirectory.po b/ldapmanager/locale/nl/fusiondirectory.po
index 8142fa786ae988502c093e7daa5dc0e08878ca3d..d75cd64dfbdf3774fb85fc27c7f54bd00c968221 100644
--- a/ldapmanager/locale/nl/fusiondirectory.po
+++ b/ldapmanager/locale/nl/fusiondirectory.po
@@ -3,16 +3,14 @@
 # This file is distributed under the same license as the PACKAGE package.
 # 
 # Translators:
-# Kenny Tordeurs <tordeurskenny@gmail.com>, 2012-2013
-#  Niels Klomp (CareWorks ICT Services) <nk@careworks.nl>, 2005
 msgid ""
 msgstr ""
-"Project-Id-Version: FusionDirectory-108\n"
+"Project-Id-Version: FusionDirectory-109\n"
 "Report-Msgid-Bugs-To: documentation@lists.fusiondirectory.org\n"
-"POT-Creation-Date: 2015-03-19 21:45+0100\n"
-"PO-Revision-Date: 2015-02-25 16:12+0000\n"
+"POT-Creation-Date: 2014-12-15 17:47+0100\n"
+"PO-Revision-Date: 2015-02-25 16:13+0000\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>\n"
-"Language-Team: Dutch (http://www.transifex.com/projects/p/FusionDirectory-108/language/nl/)\n"
+"Language-Team: Dutch (http://www.transifex.com/projects/p/FusionDirectory-109/language/nl/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -84,8 +82,8 @@ msgid ""
 msgstr ""
 
 #: addons/ldapmanager/class_ldapmanager.inc:102
-#: addons/ldapmanager/contentcsv.tpl.c:26
-#: addons/ldapmanager/contentcsv.tpl.c:29
+#: addons/ldapmanager/class_csvimport.inc:70
+#: addons/ldapmanager/class_csvimport.inc:93
 msgid "Import"
 msgstr "Importeren"
 
@@ -93,38 +91,31 @@ msgstr "Importeren"
 msgid "Import LDIF file"
 msgstr ""
 
-#: addons/ldapmanager/class_ldapmanager.inc:147
-#: addons/ldapmanager/class_ldapmanager.inc:186
+#: addons/ldapmanager/class_ldapmanager.inc:133
+#: addons/ldapmanager/class_ldapmanager.inc:175
 msgid "LDAP error"
 msgstr "LDAP fout"
 
-#: addons/ldapmanager/class_ldapmanager.inc:148
+#: addons/ldapmanager/class_ldapmanager.inc:134
 #, php-format
 msgid "No such object %s!"
 msgstr "Zo geen object %s!"
 
-#: addons/ldapmanager/class_ldapmanager.inc:162
-#: addons/ldapmanager/class_csvimport.inc:137
+#: addons/ldapmanager/class_ldapmanager.inc:152
 msgid "Permission error"
 msgstr "Permissiefout"
 
-#: addons/ldapmanager/class_ldapmanager.inc:163
+#: addons/ldapmanager/class_ldapmanager.inc:153
 #, php-format
 msgid "You have no permission to export %s!"
 msgstr "Je hebt geen rechten om te exporten %s!"
 
-#: addons/ldapmanager/class_ldapmanager.inc:168
-#: addons/ldapmanager/class_csvimport.inc:188
-#: addons/ldapmanager/class_csvimport.inc:351
-#: addons/ldapmanager/class_csvimport.inc:388
-#: addons/ldapmanager/class_csvimport.inc:391
-#: addons/ldapmanager/class_csvimport.inc:394
-#: addons/ldapmanager/class_csvimport.inc:397
-#: addons/ldapmanager/class_csvimport.inc:545
+#: addons/ldapmanager/class_ldapmanager.inc:159
+#: addons/ldapmanager/class_csvimport.inc:181
 msgid "Error"
 msgstr "Fout"
 
-#: addons/ldapmanager/class_ldapmanager.inc:169
+#: addons/ldapmanager/class_ldapmanager.inc:160
 #, php-format
 msgid "Failed to generate ldap export, error was \"%s\"!"
 msgstr ""
@@ -141,107 +132,72 @@ msgstr ""
 msgid "Ldap manager"
 msgstr "Ldap beheerder"
 
-#: addons/ldapmanager/class_csvimport.inc:39
+#: addons/ldapmanager/class_csvimport.inc:28
 msgid "CSV import"
 msgstr "CSV import"
 
-#: addons/ldapmanager/class_csvimport.inc:40
+#: addons/ldapmanager/class_csvimport.inc:29
 msgid "Import of csv data into the ldap tree"
 msgstr ""
 
-#: addons/ldapmanager/class_csvimport.inc:137
-msgid "You've no permission to import CSV files."
-msgstr "Je hebt geen rechten om CSV bestanden te importeren."
+#: addons/ldapmanager/class_csvimport.inc:42
+msgid "Import CSV"
+msgstr ""
 
-#: addons/ldapmanager/class_csvimport.inc:188
-msgid "Need at least 'sn' and 'givenName' to create users!"
-msgstr "Je hebt minstens een 'naam' en 'voornaam' nodig om gebruikers aan te maken!"
+#: addons/ldapmanager/class_csvimport.inc:45
+msgid "Object type"
+msgstr ""
 
-#: addons/ldapmanager/class_csvimport.inc:189
-#: addons/ldapmanager/class_csvimport.inc:221
-#: addons/ldapmanager/class_csvimport.inc:287
-msgid "failed"
-msgstr "mislukt"
+#: addons/ldapmanager/class_csvimport.inc:45
+msgid "Type of objects you wish to import"
+msgstr ""
 
-#: addons/ldapmanager/class_csvimport.inc:220
-#, php-format
-msgid "Failed to generate 'uid' for entry '%s'!"
-msgstr "Onmogelijk om 'uid' voor inzending '%s' te genereren!"
+#: addons/ldapmanager/class_csvimport.inc:49
+msgid "Template"
+msgstr "Sjabloon"
 
-#: addons/ldapmanager/class_csvimport.inc:291
-msgid "ok"
-msgstr "okee"
+#: addons/ldapmanager/class_csvimport.inc:49
+msgid "Select a template to apply to imported entries"
+msgstr ""
 
-#: addons/ldapmanager/class_csvimport.inc:351
-#, php-format
-msgid "Cannot insert entry '%s'!"
-msgstr "Kan de inzending '%s' niet importeren!"
+#: addons/ldapmanager/class_csvimport.inc:53
+msgid "CSV file"
+msgstr ""
 
-#: addons/ldapmanager/class_csvimport.inc:377
-msgid "Information"
-msgstr "Informatie"
+#: addons/ldapmanager/class_csvimport.inc:53
+msgid "Import a CSV file into your LDAP"
+msgstr ""
 
-#: addons/ldapmanager/class_csvimport.inc:377
-msgid "Nothing to import!"
-msgstr "Er is niets te importeren!"
+#: addons/ldapmanager/class_csvimport.inc:57
+msgid "Separator"
+msgstr "Separator"
 
-#: addons/ldapmanager/class_csvimport.inc:388
-#: addons/ldapmanager/class_csvimport.inc:391
-#: addons/ldapmanager/class_csvimport.inc:394
-#: addons/ldapmanager/class_csvimport.inc:397
-#, php-format
-msgid "Cannot read uploaded file: %s"
-msgstr "Kan geupload bestand niet lezen: %s"
+#: addons/ldapmanager/class_csvimport.inc:57
+msgid "Character used as separator in the CSV file"
+msgstr ""
 
-#: addons/ldapmanager/class_csvimport.inc:388
-#: addons/ldapmanager/class_csvimport.inc:394
-msgid "file not found"
-msgstr "bestand niet gevonden"
+#: addons/ldapmanager/class_csvimport.inc:63
+msgid "Fixed values"
+msgstr ""
 
-#: addons/ldapmanager/class_csvimport.inc:391
-msgid "file is empty"
-msgstr "bestand is leeg"
+#: addons/ldapmanager/class_csvimport.inc:63
+msgid ""
+"Some fixed values that you might wanna use in the filling of the template."
+msgstr ""
 
-#: addons/ldapmanager/class_csvimport.inc:397
-msgid "file not readable"
-msgstr "bestand onleesbaar"
+#: addons/ldapmanager/class_csvimport.inc:75
+msgid "Template filling"
+msgstr ""
 
-#: addons/ldapmanager/class_csvimport.inc:545
-msgid "Cannot find CSV data in the selected file!"
-msgstr "Kan CSV data niet vinden in geselecteerd bestand!"
+#: addons/ldapmanager/class_csvimport.inc:84
+msgid "Select fields associations"
+msgstr ""
 
-#: addons/ldapmanager/contentcsv.tpl.c:2
-msgid ""
-"The CSV import plugin provides methods to generate user accounts from a file"
-" containing Semi-Colon Seperated Values. The administrator can decide which "
-"columns should be transfered to which attribute. Note that you must have at "
-"least the GIVENNAME and SURNAME set."
-msgstr "De CSV import plugin geeft methodes aan om gebruikers accounts te genereren van een bestand dat Semi-Colon Seperated waarden bevat. De administrator kan beslissen welke kolommen naar welk attribuut worden getransfereerd. Let op je moet minstens een VOORNAAM en een NAAM hebben."
-
-#: addons/ldapmanager/contentcsv.tpl.c:5
-msgid "Select CSV file to import"
-msgstr "Selecteer het te importeren CSV bestand"
-
-#: addons/ldapmanager/contentcsv.tpl.c:8
-msgid "Browse"
-msgstr "Doorzoek"
-
-#: addons/ldapmanager/contentcsv.tpl.c:11
-msgid "Select template"
-msgstr "Selecteer sjabloon"
-
-#: addons/ldapmanager/contentcsv.tpl.c:14
-msgid "All entries have been written to the LDAP database successfully."
-msgstr "Alle gegevens zijn succesvol naar de LDAP database weggeschreven."
-
-#: addons/ldapmanager/contentcsv.tpl.c:17
-msgid "Oups. There was an error during the import of your data."
-msgstr "Oeps. Er is een fout opgetreden bij het importeren van uw data."
-
-#: addons/ldapmanager/contentcsv.tpl.c:20
-msgid "Here is the status report for the import:"
-msgstr "Hier is het statusraport voor de import:"
-
-#: addons/ldapmanager/contentcsv.tpl.c:23
-msgid "Selected Template"
-msgstr "Geselecteerd Sjabloon"
+#: addons/ldapmanager/class_csvimport.inc:190
+msgid "Success"
+msgstr "Succes"
+
+#: addons/ldapmanager/class_csvimport.inc:190
+#, php-format
+msgid "Successfully imported %d entries"
+msgstr ""
diff --git a/ldapmanager/locale/pl/fusiondirectory.po b/ldapmanager/locale/pl/fusiondirectory.po
index 4d8de71391c8dc3c9ad0ca6bafef01a3cf95de4f..ed78f8be4a67ab8d9132e947529face432736d6d 100644
--- a/ldapmanager/locale/pl/fusiondirectory.po
+++ b/ldapmanager/locale/pl/fusiondirectory.po
@@ -5,12 +5,12 @@
 # Translators:
 msgid ""
 msgstr ""
-"Project-Id-Version: FusionDirectory-108\n"
+"Project-Id-Version: FusionDirectory-109\n"
 "Report-Msgid-Bugs-To: documentation@lists.fusiondirectory.org\n"
-"POT-Creation-Date: 2015-03-19 21:45+0100\n"
-"PO-Revision-Date: 2015-02-25 16:12+0000\n"
+"POT-Creation-Date: 2014-12-15 17:47+0100\n"
+"PO-Revision-Date: 2015-02-25 16:13+0000\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>\n"
-"Language-Team: Polish (http://www.transifex.com/projects/p/FusionDirectory-108/language/pl/)\n"
+"Language-Team: Polish (http://www.transifex.com/projects/p/FusionDirectory-109/language/pl/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -82,8 +82,8 @@ msgid ""
 msgstr ""
 
 #: addons/ldapmanager/class_ldapmanager.inc:102
-#: addons/ldapmanager/contentcsv.tpl.c:26
-#: addons/ldapmanager/contentcsv.tpl.c:29
+#: addons/ldapmanager/class_csvimport.inc:70
+#: addons/ldapmanager/class_csvimport.inc:93
 msgid "Import"
 msgstr "Import"
 
@@ -91,38 +91,31 @@ msgstr "Import"
 msgid "Import LDIF file"
 msgstr ""
 
-#: addons/ldapmanager/class_ldapmanager.inc:147
-#: addons/ldapmanager/class_ldapmanager.inc:186
+#: addons/ldapmanager/class_ldapmanager.inc:133
+#: addons/ldapmanager/class_ldapmanager.inc:175
 msgid "LDAP error"
 msgstr "bÅ‚Ä…d LDAP"
 
-#: addons/ldapmanager/class_ldapmanager.inc:148
+#: addons/ldapmanager/class_ldapmanager.inc:134
 #, php-format
 msgid "No such object %s!"
 msgstr ""
 
-#: addons/ldapmanager/class_ldapmanager.inc:162
-#: addons/ldapmanager/class_csvimport.inc:137
+#: addons/ldapmanager/class_ldapmanager.inc:152
 msgid "Permission error"
 msgstr ""
 
-#: addons/ldapmanager/class_ldapmanager.inc:163
+#: addons/ldapmanager/class_ldapmanager.inc:153
 #, php-format
 msgid "You have no permission to export %s!"
 msgstr ""
 
-#: addons/ldapmanager/class_ldapmanager.inc:168
-#: addons/ldapmanager/class_csvimport.inc:188
-#: addons/ldapmanager/class_csvimport.inc:351
-#: addons/ldapmanager/class_csvimport.inc:388
-#: addons/ldapmanager/class_csvimport.inc:391
-#: addons/ldapmanager/class_csvimport.inc:394
-#: addons/ldapmanager/class_csvimport.inc:397
-#: addons/ldapmanager/class_csvimport.inc:545
+#: addons/ldapmanager/class_ldapmanager.inc:159
+#: addons/ldapmanager/class_csvimport.inc:181
 msgid "Error"
 msgstr "BÅ‚Ä…d"
 
-#: addons/ldapmanager/class_ldapmanager.inc:169
+#: addons/ldapmanager/class_ldapmanager.inc:160
 #, php-format
 msgid "Failed to generate ldap export, error was \"%s\"!"
 msgstr ""
@@ -139,107 +132,72 @@ msgstr ""
 msgid "Ldap manager"
 msgstr ""
 
-#: addons/ldapmanager/class_csvimport.inc:39
+#: addons/ldapmanager/class_csvimport.inc:28
 msgid "CSV import"
 msgstr "import CVS"
 
-#: addons/ldapmanager/class_csvimport.inc:40
+#: addons/ldapmanager/class_csvimport.inc:29
 msgid "Import of csv data into the ldap tree"
 msgstr ""
 
-#: addons/ldapmanager/class_csvimport.inc:137
-msgid "You've no permission to import CSV files."
+#: addons/ldapmanager/class_csvimport.inc:42
+msgid "Import CSV"
 msgstr ""
 
-#: addons/ldapmanager/class_csvimport.inc:188
-msgid "Need at least 'sn' and 'givenName' to create users!"
+#: addons/ldapmanager/class_csvimport.inc:45
+msgid "Object type"
 msgstr ""
 
-#: addons/ldapmanager/class_csvimport.inc:189
-#: addons/ldapmanager/class_csvimport.inc:221
-#: addons/ldapmanager/class_csvimport.inc:287
-msgid "failed"
-msgstr "bÅ‚Ä…d"
-
-#: addons/ldapmanager/class_csvimport.inc:220
-#, php-format
-msgid "Failed to generate 'uid' for entry '%s'!"
+#: addons/ldapmanager/class_csvimport.inc:45
+msgid "Type of objects you wish to import"
 msgstr ""
 
-#: addons/ldapmanager/class_csvimport.inc:291
-msgid "ok"
-msgstr "ok"
+#: addons/ldapmanager/class_csvimport.inc:49
+msgid "Template"
+msgstr "Szablon"
 
-#: addons/ldapmanager/class_csvimport.inc:351
-#, php-format
-msgid "Cannot insert entry '%s'!"
+#: addons/ldapmanager/class_csvimport.inc:49
+msgid "Select a template to apply to imported entries"
 msgstr ""
 
-#: addons/ldapmanager/class_csvimport.inc:377
-msgid "Information"
-msgstr "Informacja"
-
-#: addons/ldapmanager/class_csvimport.inc:377
-msgid "Nothing to import!"
-msgstr "Nic do importowania!"
-
-#: addons/ldapmanager/class_csvimport.inc:388
-#: addons/ldapmanager/class_csvimport.inc:391
-#: addons/ldapmanager/class_csvimport.inc:394
-#: addons/ldapmanager/class_csvimport.inc:397
-#, php-format
-msgid "Cannot read uploaded file: %s"
+#: addons/ldapmanager/class_csvimport.inc:53
+msgid "CSV file"
 msgstr ""
 
-#: addons/ldapmanager/class_csvimport.inc:388
-#: addons/ldapmanager/class_csvimport.inc:394
-msgid "file not found"
+#: addons/ldapmanager/class_csvimport.inc:53
+msgid "Import a CSV file into your LDAP"
 msgstr ""
 
-#: addons/ldapmanager/class_csvimport.inc:391
-msgid "file is empty"
+#: addons/ldapmanager/class_csvimport.inc:57
+msgid "Separator"
 msgstr ""
 
-#: addons/ldapmanager/class_csvimport.inc:397
-msgid "file not readable"
+#: addons/ldapmanager/class_csvimport.inc:57
+msgid "Character used as separator in the CSV file"
 msgstr ""
 
-#: addons/ldapmanager/class_csvimport.inc:545
-msgid "Cannot find CSV data in the selected file!"
+#: addons/ldapmanager/class_csvimport.inc:63
+msgid "Fixed values"
 msgstr ""
 
-#: addons/ldapmanager/contentcsv.tpl.c:2
+#: addons/ldapmanager/class_csvimport.inc:63
 msgid ""
-"The CSV import plugin provides methods to generate user accounts from a file"
-" containing Semi-Colon Seperated Values. The administrator can decide which "
-"columns should be transfered to which attribute. Note that you must have at "
-"least the GIVENNAME and SURNAME set."
+"Some fixed values that you might wanna use in the filling of the template."
 msgstr ""
 
-#: addons/ldapmanager/contentcsv.tpl.c:5
-msgid "Select CSV file to import"
-msgstr "Wybierz plik CSV do importu"
-
-#: addons/ldapmanager/contentcsv.tpl.c:8
-msgid "Browse"
-msgstr "PrzeglÄ…daj"
-
-#: addons/ldapmanager/contentcsv.tpl.c:11
-msgid "Select template"
-msgstr "Wybierz Szablon"
-
-#: addons/ldapmanager/contentcsv.tpl.c:14
-msgid "All entries have been written to the LDAP database successfully."
-msgstr "Wszystkie elementy zostaÅ‚y prawidÅ‚owo zapisane w bazie LDAP."
+#: addons/ldapmanager/class_csvimport.inc:75
+msgid "Template filling"
+msgstr ""
 
-#: addons/ldapmanager/contentcsv.tpl.c:17
-msgid "Oups. There was an error during the import of your data."
-msgstr "Ups. WystÄ…piÅ‚ bÅ‚Ä…d podczas importu danych."
+#: addons/ldapmanager/class_csvimport.inc:84
+msgid "Select fields associations"
+msgstr ""
 
-#: addons/ldapmanager/contentcsv.tpl.c:20
-msgid "Here is the status report for the import:"
-msgstr "Raport z importu:"
+#: addons/ldapmanager/class_csvimport.inc:190
+msgid "Success"
+msgstr "Powodzenie"
 
-#: addons/ldapmanager/contentcsv.tpl.c:23
-msgid "Selected Template"
-msgstr "Wybrany Szablon"
+#: addons/ldapmanager/class_csvimport.inc:190
+#, php-format
+msgid "Successfully imported %d entries"
+msgstr ""
diff --git a/ldapmanager/locale/pt/fusiondirectory.po b/ldapmanager/locale/pt/fusiondirectory.po
index f1e0228e63d40ff97a6953fb3473e9f72427da4f..f915484c961c33dbf0475d3cdb1f7df5f647c8c6 100644
--- a/ldapmanager/locale/pt/fusiondirectory.po
+++ b/ldapmanager/locale/pt/fusiondirectory.po
@@ -5,12 +5,12 @@
 # Translators:
 msgid ""
 msgstr ""
-"Project-Id-Version: FusionDirectory-108\n"
+"Project-Id-Version: FusionDirectory-109\n"
 "Report-Msgid-Bugs-To: documentation@lists.fusiondirectory.org\n"
-"POT-Creation-Date: 2015-03-19 21:45+0100\n"
-"PO-Revision-Date: 2015-02-25 16:02+0000\n"
+"POT-Creation-Date: 2014-12-15 17:47+0100\n"
+"PO-Revision-Date: 2015-02-13 16:32+0000\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>\n"
-"Language-Team: Portuguese (http://www.transifex.com/projects/p/FusionDirectory-108/language/pt/)\n"
+"Language-Team: Portuguese (http://www.transifex.com/projects/p/FusionDirectory-109/language/pt/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -82,8 +82,8 @@ msgid ""
 msgstr ""
 
 #: addons/ldapmanager/class_ldapmanager.inc:102
-#: addons/ldapmanager/contentcsv.tpl.c:26
-#: addons/ldapmanager/contentcsv.tpl.c:29
+#: addons/ldapmanager/class_csvimport.inc:70
+#: addons/ldapmanager/class_csvimport.inc:93
 msgid "Import"
 msgstr ""
 
@@ -91,38 +91,31 @@ msgstr ""
 msgid "Import LDIF file"
 msgstr ""
 
-#: addons/ldapmanager/class_ldapmanager.inc:147
-#: addons/ldapmanager/class_ldapmanager.inc:186
+#: addons/ldapmanager/class_ldapmanager.inc:133
+#: addons/ldapmanager/class_ldapmanager.inc:175
 msgid "LDAP error"
 msgstr "Erro de LDAP"
 
-#: addons/ldapmanager/class_ldapmanager.inc:148
+#: addons/ldapmanager/class_ldapmanager.inc:134
 #, php-format
 msgid "No such object %s!"
 msgstr ""
 
-#: addons/ldapmanager/class_ldapmanager.inc:162
-#: addons/ldapmanager/class_csvimport.inc:137
+#: addons/ldapmanager/class_ldapmanager.inc:152
 msgid "Permission error"
 msgstr ""
 
-#: addons/ldapmanager/class_ldapmanager.inc:163
+#: addons/ldapmanager/class_ldapmanager.inc:153
 #, php-format
 msgid "You have no permission to export %s!"
 msgstr ""
 
-#: addons/ldapmanager/class_ldapmanager.inc:168
-#: addons/ldapmanager/class_csvimport.inc:188
-#: addons/ldapmanager/class_csvimport.inc:351
-#: addons/ldapmanager/class_csvimport.inc:388
-#: addons/ldapmanager/class_csvimport.inc:391
-#: addons/ldapmanager/class_csvimport.inc:394
-#: addons/ldapmanager/class_csvimport.inc:397
-#: addons/ldapmanager/class_csvimport.inc:545
+#: addons/ldapmanager/class_ldapmanager.inc:159
+#: addons/ldapmanager/class_csvimport.inc:181
 msgid "Error"
 msgstr "Erro"
 
-#: addons/ldapmanager/class_ldapmanager.inc:169
+#: addons/ldapmanager/class_ldapmanager.inc:160
 #, php-format
 msgid "Failed to generate ldap export, error was \"%s\"!"
 msgstr ""
@@ -139,107 +132,72 @@ msgstr ""
 msgid "Ldap manager"
 msgstr ""
 
-#: addons/ldapmanager/class_csvimport.inc:39
+#: addons/ldapmanager/class_csvimport.inc:28
 msgid "CSV import"
 msgstr ""
 
-#: addons/ldapmanager/class_csvimport.inc:40
+#: addons/ldapmanager/class_csvimport.inc:29
 msgid "Import of csv data into the ldap tree"
 msgstr ""
 
-#: addons/ldapmanager/class_csvimport.inc:137
-msgid "You've no permission to import CSV files."
+#: addons/ldapmanager/class_csvimport.inc:42
+msgid "Import CSV"
 msgstr ""
 
-#: addons/ldapmanager/class_csvimport.inc:188
-msgid "Need at least 'sn' and 'givenName' to create users!"
+#: addons/ldapmanager/class_csvimport.inc:45
+msgid "Object type"
 msgstr ""
 
-#: addons/ldapmanager/class_csvimport.inc:189
-#: addons/ldapmanager/class_csvimport.inc:221
-#: addons/ldapmanager/class_csvimport.inc:287
-msgid "failed"
+#: addons/ldapmanager/class_csvimport.inc:45
+msgid "Type of objects you wish to import"
 msgstr ""
 
-#: addons/ldapmanager/class_csvimport.inc:220
-#, php-format
-msgid "Failed to generate 'uid' for entry '%s'!"
-msgstr ""
+#: addons/ldapmanager/class_csvimport.inc:49
+msgid "Template"
+msgstr "Modelo"
 
-#: addons/ldapmanager/class_csvimport.inc:291
-msgid "ok"
-msgstr ""
-
-#: addons/ldapmanager/class_csvimport.inc:351
-#, php-format
-msgid "Cannot insert entry '%s'!"
+#: addons/ldapmanager/class_csvimport.inc:49
+msgid "Select a template to apply to imported entries"
 msgstr ""
 
-#: addons/ldapmanager/class_csvimport.inc:377
-msgid "Information"
-msgstr "InformaÃ§Ã£o"
-
-#: addons/ldapmanager/class_csvimport.inc:377
-msgid "Nothing to import!"
-msgstr ""
-
-#: addons/ldapmanager/class_csvimport.inc:388
-#: addons/ldapmanager/class_csvimport.inc:391
-#: addons/ldapmanager/class_csvimport.inc:394
-#: addons/ldapmanager/class_csvimport.inc:397
-#, php-format
-msgid "Cannot read uploaded file: %s"
+#: addons/ldapmanager/class_csvimport.inc:53
+msgid "CSV file"
 msgstr ""
 
-#: addons/ldapmanager/class_csvimport.inc:388
-#: addons/ldapmanager/class_csvimport.inc:394
-msgid "file not found"
+#: addons/ldapmanager/class_csvimport.inc:53
+msgid "Import a CSV file into your LDAP"
 msgstr ""
 
-#: addons/ldapmanager/class_csvimport.inc:391
-msgid "file is empty"
+#: addons/ldapmanager/class_csvimport.inc:57
+msgid "Separator"
 msgstr ""
 
-#: addons/ldapmanager/class_csvimport.inc:397
-msgid "file not readable"
+#: addons/ldapmanager/class_csvimport.inc:57
+msgid "Character used as separator in the CSV file"
 msgstr ""
 
-#: addons/ldapmanager/class_csvimport.inc:545
-msgid "Cannot find CSV data in the selected file!"
+#: addons/ldapmanager/class_csvimport.inc:63
+msgid "Fixed values"
 msgstr ""
 
-#: addons/ldapmanager/contentcsv.tpl.c:2
+#: addons/ldapmanager/class_csvimport.inc:63
 msgid ""
-"The CSV import plugin provides methods to generate user accounts from a file"
-" containing Semi-Colon Seperated Values. The administrator can decide which "
-"columns should be transfered to which attribute. Note that you must have at "
-"least the GIVENNAME and SURNAME set."
+"Some fixed values that you might wanna use in the filling of the template."
 msgstr ""
 
-#: addons/ldapmanager/contentcsv.tpl.c:5
-msgid "Select CSV file to import"
+#: addons/ldapmanager/class_csvimport.inc:75
+msgid "Template filling"
 msgstr ""
 
-#: addons/ldapmanager/contentcsv.tpl.c:8
-msgid "Browse"
+#: addons/ldapmanager/class_csvimport.inc:84
+msgid "Select fields associations"
 msgstr ""
 
-#: addons/ldapmanager/contentcsv.tpl.c:11
-msgid "Select template"
-msgstr ""
-
-#: addons/ldapmanager/contentcsv.tpl.c:14
-msgid "All entries have been written to the LDAP database successfully."
-msgstr ""
-
-#: addons/ldapmanager/contentcsv.tpl.c:17
-msgid "Oups. There was an error during the import of your data."
-msgstr ""
-
-#: addons/ldapmanager/contentcsv.tpl.c:20
-msgid "Here is the status report for the import:"
-msgstr ""
+#: addons/ldapmanager/class_csvimport.inc:190
+msgid "Success"
+msgstr "Sucesso"
 
-#: addons/ldapmanager/contentcsv.tpl.c:23
-msgid "Selected Template"
+#: addons/ldapmanager/class_csvimport.inc:190
+#, php-format
+msgid "Successfully imported %d entries"
 msgstr ""
diff --git a/ldapmanager/locale/pt_BR/fusiondirectory.po b/ldapmanager/locale/pt_BR/fusiondirectory.po
index 5af8d3cfaafe4f372ccc66579b884c9d874cf59e..241caff9dab66f11d2f91ec9302f236d5b79ed87 100644
--- a/ldapmanager/locale/pt_BR/fusiondirectory.po
+++ b/ldapmanager/locale/pt_BR/fusiondirectory.po
@@ -3,15 +3,14 @@
 # This file is distributed under the same license as the PACKAGE package.
 # 
 # Translators:
-# ALEJANDRO BARRIOS <alejandrobarrios@interlegis.leg.br>, 2014
 msgid ""
 msgstr ""
-"Project-Id-Version: FusionDirectory-108\n"
+"Project-Id-Version: FusionDirectory-109\n"
 "Report-Msgid-Bugs-To: documentation@lists.fusiondirectory.org\n"
-"POT-Creation-Date: 2015-03-19 21:45+0100\n"
-"PO-Revision-Date: 2015-02-25 16:12+0000\n"
+"POT-Creation-Date: 2014-12-15 17:47+0100\n"
+"PO-Revision-Date: 2015-02-25 16:13+0000\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>\n"
-"Language-Team: Portuguese (Brazil) (http://www.transifex.com/projects/p/FusionDirectory-108/language/pt_BR/)\n"
+"Language-Team: Portuguese (Brazil) (http://www.transifex.com/projects/p/FusionDirectory-109/language/pt_BR/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -83,8 +82,8 @@ msgid ""
 msgstr ""
 
 #: addons/ldapmanager/class_ldapmanager.inc:102
-#: addons/ldapmanager/contentcsv.tpl.c:26
-#: addons/ldapmanager/contentcsv.tpl.c:29
+#: addons/ldapmanager/class_csvimport.inc:70
+#: addons/ldapmanager/class_csvimport.inc:93
 msgid "Import"
 msgstr "Importar"
 
@@ -92,38 +91,31 @@ msgstr "Importar"
 msgid "Import LDIF file"
 msgstr ""
 
-#: addons/ldapmanager/class_ldapmanager.inc:147
-#: addons/ldapmanager/class_ldapmanager.inc:186
+#: addons/ldapmanager/class_ldapmanager.inc:133
+#: addons/ldapmanager/class_ldapmanager.inc:175
 msgid "LDAP error"
 msgstr "Erro de LDAP"
 
-#: addons/ldapmanager/class_ldapmanager.inc:148
+#: addons/ldapmanager/class_ldapmanager.inc:134
 #, php-format
 msgid "No such object %s!"
 msgstr "NÃ£o hÃ¡ esse objeto %s!"
 
-#: addons/ldapmanager/class_ldapmanager.inc:162
-#: addons/ldapmanager/class_csvimport.inc:137
+#: addons/ldapmanager/class_ldapmanager.inc:152
 msgid "Permission error"
 msgstr "Erro de permissÃ£o"
 
-#: addons/ldapmanager/class_ldapmanager.inc:163
+#: addons/ldapmanager/class_ldapmanager.inc:153
 #, 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:168
-#: addons/ldapmanager/class_csvimport.inc:188
-#: addons/ldapmanager/class_csvimport.inc:351
-#: addons/ldapmanager/class_csvimport.inc:388
-#: addons/ldapmanager/class_csvimport.inc:391
-#: addons/ldapmanager/class_csvimport.inc:394
-#: addons/ldapmanager/class_csvimport.inc:397
-#: addons/ldapmanager/class_csvimport.inc:545
+#: addons/ldapmanager/class_ldapmanager.inc:159
+#: addons/ldapmanager/class_csvimport.inc:181
 msgid "Error"
 msgstr "Erro"
 
-#: addons/ldapmanager/class_ldapmanager.inc:169
+#: addons/ldapmanager/class_ldapmanager.inc:160
 #, php-format
 msgid "Failed to generate ldap export, error was \"%s\"!"
 msgstr ""
@@ -140,107 +132,72 @@ msgstr "Permite importaÃ§Ã£o ou exportaÃ§Ã£o da Ã¡rvore ldap"
 msgid "Ldap manager"
 msgstr "Gerenciamento Ldap"
 
-#: addons/ldapmanager/class_csvimport.inc:39
+#: addons/ldapmanager/class_csvimport.inc:28
 msgid "CSV import"
 msgstr "ImportaÃ§Ã£o CSV"
 
-#: addons/ldapmanager/class_csvimport.inc:40
+#: addons/ldapmanager/class_csvimport.inc:29
 msgid "Import of csv data into the ldap tree"
 msgstr "ImportaÃ§Ã£o de dados csv na Ã¡rvore ldap"
 
-#: addons/ldapmanager/class_csvimport.inc:137
-msgid "You've no permission to import CSV files."
-msgstr "VocÃª nÃ£o tem permissÃ£o para importar arquivos CSV."
+#: addons/ldapmanager/class_csvimport.inc:42
+msgid "Import CSV"
+msgstr ""
 
-#: addons/ldapmanager/class_csvimport.inc:188
-msgid "Need at least 'sn' and 'givenName' to create users!"
-msgstr "NecessÃ¡rio ao menos 'sn' e 'givenName' para criar usuÃ¡rios!"
+#: addons/ldapmanager/class_csvimport.inc:45
+msgid "Object type"
+msgstr ""
 
-#: addons/ldapmanager/class_csvimport.inc:189
-#: addons/ldapmanager/class_csvimport.inc:221
-#: addons/ldapmanager/class_csvimport.inc:287
-msgid "failed"
-msgstr "Falha"
+#: addons/ldapmanager/class_csvimport.inc:45
+msgid "Type of objects you wish to import"
+msgstr ""
 
-#: addons/ldapmanager/class_csvimport.inc:220
-#, php-format
-msgid "Failed to generate 'uid' for entry '%s'!"
-msgstr "Falha ao gerar 'uid' para a entrada '%s'!"
+#: addons/ldapmanager/class_csvimport.inc:49
+msgid "Template"
+msgstr "Modelo"
 
-#: addons/ldapmanager/class_csvimport.inc:291
-msgid "ok"
-msgstr "ok"
+#: addons/ldapmanager/class_csvimport.inc:49
+msgid "Select a template to apply to imported entries"
+msgstr ""
 
-#: addons/ldapmanager/class_csvimport.inc:351
-#, php-format
-msgid "Cannot insert entry '%s'!"
-msgstr "NÃ£o Ã© possÃvel inserir entrada '%s'!"
+#: addons/ldapmanager/class_csvimport.inc:53
+msgid "CSV file"
+msgstr ""
 
-#: addons/ldapmanager/class_csvimport.inc:377
-msgid "Information"
-msgstr "InformaÃ§Ã£o"
+#: addons/ldapmanager/class_csvimport.inc:53
+msgid "Import a CSV file into your LDAP"
+msgstr ""
 
-#: addons/ldapmanager/class_csvimport.inc:377
-msgid "Nothing to import!"
-msgstr "Nada a importar!"
+#: addons/ldapmanager/class_csvimport.inc:57
+msgid "Separator"
+msgstr ""
 
-#: addons/ldapmanager/class_csvimport.inc:388
-#: addons/ldapmanager/class_csvimport.inc:391
-#: addons/ldapmanager/class_csvimport.inc:394
-#: addons/ldapmanager/class_csvimport.inc:397
-#, php-format
-msgid "Cannot read uploaded file: %s"
-msgstr "NÃ£o Ã© possÃvel ler arquivo enviado: %s"
+#: addons/ldapmanager/class_csvimport.inc:57
+msgid "Character used as separator in the CSV file"
+msgstr ""
+
+#: addons/ldapmanager/class_csvimport.inc:63
+msgid "Fixed values"
+msgstr ""
 
-#: addons/ldapmanager/class_csvimport.inc:388
-#: addons/ldapmanager/class_csvimport.inc:394
-msgid "file not found"
-msgstr "arquivo nÃ£o encontrado"
+#: addons/ldapmanager/class_csvimport.inc:63
+msgid ""
+"Some fixed values that you might wanna use in the filling of the template."
+msgstr ""
 
-#: addons/ldapmanager/class_csvimport.inc:391
-msgid "file is empty"
-msgstr "arquivo estÃ¡ vazio"
+#: addons/ldapmanager/class_csvimport.inc:75
+msgid "Template filling"
+msgstr ""
 
-#: addons/ldapmanager/class_csvimport.inc:397
-msgid "file not readable"
-msgstr "arquivo nÃ£o Ã© legivel"
+#: addons/ldapmanager/class_csvimport.inc:84
+msgid "Select fields associations"
+msgstr ""
 
-#: addons/ldapmanager/class_csvimport.inc:545
-msgid "Cannot find CSV data in the selected file!"
-msgstr "NÃ£o Ã© possÃvel encontrar dados CSV no arquivo selecionado!"
+#: addons/ldapmanager/class_csvimport.inc:190
+msgid "Success"
+msgstr "Sucesso"
 
-#: addons/ldapmanager/contentcsv.tpl.c:2
-msgid ""
-"The CSV import plugin provides methods to generate user accounts from a file"
-" containing Semi-Colon Seperated Values. The administrator can decide which "
-"columns should be transfered to which attribute. Note that you must have at "
-"least the GIVENNAME and SURNAME set."
-msgstr "O plugin CSV import provÃª mÃ©todos para gerar contas de usuÃ¡rios a partir de de um arquivo com valores separados por ponto e vÃrgula. O administrador pode decidir quais colunas devem ser transferidas para um determinado atributo. Note que vocÃª deve ter ao menos o NOME e SOBRENOME."
-
-#: addons/ldapmanager/contentcsv.tpl.c:5
-msgid "Select CSV file to import"
-msgstr "Selecione arquivo CSV a importar"
-
-#: addons/ldapmanager/contentcsv.tpl.c:8
-msgid "Browse"
-msgstr "Navegar"
-
-#: addons/ldapmanager/contentcsv.tpl.c:11
-msgid "Select template"
-msgstr "Selecione template"
-
-#: addons/ldapmanager/contentcsv.tpl.c:14
-msgid "All entries have been written to the LDAP database successfully."
-msgstr "Todas as entradas foram escritas com sucesso no banco de dados LDAP."
-
-#: addons/ldapmanager/contentcsv.tpl.c:17
-msgid "Oups. There was an error during the import of your data."
-msgstr "Ops. Houve um erro durante a importaÃ§Ã£o de dos seus dados."
-
-#: addons/ldapmanager/contentcsv.tpl.c:20
-msgid "Here is the status report for the import:"
-msgstr "Aqui estÃ¡ o relatÃ³rio da importaÃ§Ã£o: "
-
-#: addons/ldapmanager/contentcsv.tpl.c:23
-msgid "Selected Template"
-msgstr "Template selecionado"
+#: addons/ldapmanager/class_csvimport.inc:190
+#, php-format
+msgid "Successfully imported %d entries"
+msgstr ""
diff --git a/ldapmanager/locale/ru/fusiondirectory.po b/ldapmanager/locale/ru/fusiondirectory.po
index 48ee10f4fe59d05666eb75b321dc1ebacfdd13a3..f5d036375fa76e8e45e48d41931eb981355f464b 100644
--- a/ldapmanager/locale/ru/fusiondirectory.po
+++ b/ldapmanager/locale/ru/fusiondirectory.po
@@ -3,20 +3,19 @@
 # This file is distributed under the same license as the PACKAGE package.
 # 
 # Translators:
-#  Valia V. Vaneeva <fattie@altlinux.ru>, 2004
 msgid ""
 msgstr ""
-"Project-Id-Version: FusionDirectory-108\n"
+"Project-Id-Version: FusionDirectory-109\n"
 "Report-Msgid-Bugs-To: documentation@lists.fusiondirectory.org\n"
-"POT-Creation-Date: 2015-03-19 21:45+0100\n"
-"PO-Revision-Date: 2015-03-06 07:10+0000\n"
+"POT-Creation-Date: 2014-12-15 17:47+0100\n"
+"PO-Revision-Date: 2015-04-10 07:25+0000\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>\n"
-"Language-Team: Russian (http://www.transifex.com/projects/p/FusionDirectory-108/language/ru/)\n"
+"Language-Team: Russian (http://www.transifex.com/projects/p/FusionDirectory-109/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=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);\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:28
 msgid "LDIF"
@@ -83,8 +82,8 @@ msgid ""
 msgstr ""
 
 #: addons/ldapmanager/class_ldapmanager.inc:102
-#: addons/ldapmanager/contentcsv.tpl.c:26
-#: addons/ldapmanager/contentcsv.tpl.c:29
+#: addons/ldapmanager/class_csvimport.inc:70
+#: addons/ldapmanager/class_csvimport.inc:93
 msgid "Import"
 msgstr "Ð˜Ð¼Ð¿Ð¾Ñ€Ñ‚Ð¸Ñ€Ð¾Ð²Ð°Ñ‚ÑŒ"
 
@@ -92,38 +91,31 @@ msgstr "Ð˜Ð¼Ð¿Ð¾Ñ€Ñ‚Ð¸Ñ€Ð¾Ð²Ð°Ñ‚ÑŒ"
 msgid "Import LDIF file"
 msgstr ""
 
-#: addons/ldapmanager/class_ldapmanager.inc:147
-#: addons/ldapmanager/class_ldapmanager.inc:186
+#: addons/ldapmanager/class_ldapmanager.inc:133
+#: addons/ldapmanager/class_ldapmanager.inc:175
 msgid "LDAP error"
 msgstr "ÐžÑˆÐ¸Ð±ÐºÐ° LDAP"
 
-#: addons/ldapmanager/class_ldapmanager.inc:148
+#: addons/ldapmanager/class_ldapmanager.inc:134
 #, php-format
 msgid "No such object %s!"
 msgstr ""
 
-#: addons/ldapmanager/class_ldapmanager.inc:162
-#: addons/ldapmanager/class_csvimport.inc:137
+#: addons/ldapmanager/class_ldapmanager.inc:152
 msgid "Permission error"
-msgstr ""
+msgstr "ÐžÑˆÐ¸Ð±ÐºÐ° Ð´Ð¾ÑÑ‚ÑƒÐ¿Ð°"
 
-#: addons/ldapmanager/class_ldapmanager.inc:163
+#: addons/ldapmanager/class_ldapmanager.inc:153
 #, php-format
 msgid "You have no permission to export %s!"
 msgstr ""
 
-#: addons/ldapmanager/class_ldapmanager.inc:168
-#: addons/ldapmanager/class_csvimport.inc:188
-#: addons/ldapmanager/class_csvimport.inc:351
-#: addons/ldapmanager/class_csvimport.inc:388
-#: addons/ldapmanager/class_csvimport.inc:391
-#: addons/ldapmanager/class_csvimport.inc:394
-#: addons/ldapmanager/class_csvimport.inc:397
-#: addons/ldapmanager/class_csvimport.inc:545
+#: addons/ldapmanager/class_ldapmanager.inc:159
+#: addons/ldapmanager/class_csvimport.inc:181
 msgid "Error"
 msgstr "ÐžÑˆÐ¸Ð±ÐºÐ°"
 
-#: addons/ldapmanager/class_ldapmanager.inc:169
+#: addons/ldapmanager/class_ldapmanager.inc:160
 #, php-format
 msgid "Failed to generate ldap export, error was \"%s\"!"
 msgstr ""
@@ -140,107 +132,72 @@ msgstr ""
 msgid "Ldap manager"
 msgstr ""
 
-#: addons/ldapmanager/class_csvimport.inc:39
+#: addons/ldapmanager/class_csvimport.inc:28
 msgid "CSV import"
 msgstr ""
 
-#: addons/ldapmanager/class_csvimport.inc:40
+#: addons/ldapmanager/class_csvimport.inc:29
 msgid "Import of csv data into the ldap tree"
 msgstr ""
 
-#: addons/ldapmanager/class_csvimport.inc:137
-msgid "You've no permission to import CSV files."
+#: addons/ldapmanager/class_csvimport.inc:42
+msgid "Import CSV"
 msgstr ""
 
-#: addons/ldapmanager/class_csvimport.inc:188
-msgid "Need at least 'sn' and 'givenName' to create users!"
+#: addons/ldapmanager/class_csvimport.inc:45
+msgid "Object type"
 msgstr ""
 
-#: addons/ldapmanager/class_csvimport.inc:189
-#: addons/ldapmanager/class_csvimport.inc:221
-#: addons/ldapmanager/class_csvimport.inc:287
-msgid "failed"
+#: addons/ldapmanager/class_csvimport.inc:45
+msgid "Type of objects you wish to import"
 msgstr ""
 
-#: addons/ldapmanager/class_csvimport.inc:220
-#, php-format
-msgid "Failed to generate 'uid' for entry '%s'!"
-msgstr ""
+#: addons/ldapmanager/class_csvimport.inc:49
+msgid "Template"
+msgstr "Ð¨Ð°Ð±Ð»Ð¾Ð½"
 
-#: addons/ldapmanager/class_csvimport.inc:291
-msgid "ok"
+#: addons/ldapmanager/class_csvimport.inc:49
+msgid "Select a template to apply to imported entries"
 msgstr ""
 
-#: addons/ldapmanager/class_csvimport.inc:351
-#, php-format
-msgid "Cannot insert entry '%s'!"
+#: addons/ldapmanager/class_csvimport.inc:53
+msgid "CSV file"
 msgstr ""
 
-#: addons/ldapmanager/class_csvimport.inc:377
-msgid "Information"
-msgstr "Ð˜Ð½Ñ„Ð¾Ñ€Ð¼Ð°Ñ†Ð¸Ñ"
-
-#: addons/ldapmanager/class_csvimport.inc:377
-msgid "Nothing to import!"
+#: addons/ldapmanager/class_csvimport.inc:53
+msgid "Import a CSV file into your LDAP"
 msgstr ""
 
-#: addons/ldapmanager/class_csvimport.inc:388
-#: addons/ldapmanager/class_csvimport.inc:391
-#: addons/ldapmanager/class_csvimport.inc:394
-#: addons/ldapmanager/class_csvimport.inc:397
-#, php-format
-msgid "Cannot read uploaded file: %s"
-msgstr "ÐÐµ Ð¼Ð¾Ð³Ñƒ Ð¿Ñ€Ð¾Ñ‡ÐµÑÑ‚ÑŒ Ð·Ð°Ð³Ñ€ÑƒÐ¶ÐµÐ½Ð½Ñ‹Ð¹ Ñ„Ð°Ð¹Ð»: %s"
-
-#: addons/ldapmanager/class_csvimport.inc:388
-#: addons/ldapmanager/class_csvimport.inc:394
-msgid "file not found"
-msgstr "Ñ„Ð°Ð¹Ð» Ð½Ðµ Ð½Ð°Ð¹Ð´ÐµÐ½"
-
-#: addons/ldapmanager/class_csvimport.inc:391
-msgid "file is empty"
-msgstr "Ñ„Ð°Ð¹Ð» Ð¿ÑƒÑÑ‚Ð¾Ð¹"
-
-#: addons/ldapmanager/class_csvimport.inc:397
-msgid "file not readable"
-msgstr "Ñ„Ð°Ð¹Ð» Ð½Ðµ Ñ‡Ð¸Ñ‚Ð°ÐµÐ¼"
-
-#: addons/ldapmanager/class_csvimport.inc:545
-msgid "Cannot find CSV data in the selected file!"
+#: addons/ldapmanager/class_csvimport.inc:57
+msgid "Separator"
 msgstr ""
 
-#: addons/ldapmanager/contentcsv.tpl.c:2
-msgid ""
-"The CSV import plugin provides methods to generate user accounts from a file"
-" containing Semi-Colon Seperated Values. The administrator can decide which "
-"columns should be transfered to which attribute. Note that you must have at "
-"least the GIVENNAME and SURNAME set."
+#: addons/ldapmanager/class_csvimport.inc:57
+msgid "Character used as separator in the CSV file"
 msgstr ""
 
-#: addons/ldapmanager/contentcsv.tpl.c:5
-msgid "Select CSV file to import"
+#: addons/ldapmanager/class_csvimport.inc:63
+msgid "Fixed values"
 msgstr ""
 
-#: addons/ldapmanager/contentcsv.tpl.c:8
-msgid "Browse"
-msgstr "ÐŸÑ€Ð¾ÑÐ¼Ð¾Ñ‚Ñ€"
-
-#: addons/ldapmanager/contentcsv.tpl.c:11
-msgid "Select template"
+#: addons/ldapmanager/class_csvimport.inc:63
+msgid ""
+"Some fixed values that you might wanna use in the filling of the template."
 msgstr ""
 
-#: addons/ldapmanager/contentcsv.tpl.c:14
-msgid "All entries have been written to the LDAP database successfully."
+#: addons/ldapmanager/class_csvimport.inc:75
+msgid "Template filling"
 msgstr ""
 
-#: addons/ldapmanager/contentcsv.tpl.c:17
-msgid "Oups. There was an error during the import of your data."
+#: addons/ldapmanager/class_csvimport.inc:84
+msgid "Select fields associations"
 msgstr ""
 
-#: addons/ldapmanager/contentcsv.tpl.c:20
-msgid "Here is the status report for the import:"
-msgstr ""
+#: addons/ldapmanager/class_csvimport.inc:190
+msgid "Success"
+msgstr "Ð£ÑÐ¿ÐµÑˆÐ½Ð¾"
 
-#: addons/ldapmanager/contentcsv.tpl.c:23
-msgid "Selected Template"
+#: addons/ldapmanager/class_csvimport.inc:190
+#, php-format
+msgid "Successfully imported %d entries"
 msgstr ""
diff --git a/ldapmanager/locale/ru@petr1708/fusiondirectory.po b/ldapmanager/locale/ru@petr1708/fusiondirectory.po
index ed814caed7bb79ee8af1889330d5f5d2f9bc5267..1e93d2f5b9adf8faff901573223d3bfcd959661e 100644
--- a/ldapmanager/locale/ru@petr1708/fusiondirectory.po
+++ b/ldapmanager/locale/ru@petr1708/fusiondirectory.po
@@ -5,17 +5,17 @@
 # Translators:
 msgid ""
 msgstr ""
-"Project-Id-Version: FusionDirectory-108\n"
+"Project-Id-Version: FusionDirectory-109\n"
 "Report-Msgid-Bugs-To: documentation@lists.fusiondirectory.org\n"
-"POT-Creation-Date: 2015-03-19 21:45+0100\n"
-"PO-Revision-Date: 2015-02-25 15:49+0000\n"
+"POT-Creation-Date: 2014-12-15 17:47+0100\n"
+"PO-Revision-Date: 2014-12-15 16:59+0000\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>\n"
-"Language-Team: Russian Petrine orthography (http://www.transifex.com/projects/p/FusionDirectory-108/language/ru@petr1708/)\n"
+"Language-Team: Russian Petrine orthography (http://www.transifex.com/projects/p/FusionDirectory-109/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=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);\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:28
 msgid "LDIF"
@@ -82,8 +82,8 @@ msgid ""
 msgstr ""
 
 #: addons/ldapmanager/class_ldapmanager.inc:102
-#: addons/ldapmanager/contentcsv.tpl.c:26
-#: addons/ldapmanager/contentcsv.tpl.c:29
+#: addons/ldapmanager/class_csvimport.inc:70
+#: addons/ldapmanager/class_csvimport.inc:93
 msgid "Import"
 msgstr ""
 
@@ -91,38 +91,31 @@ msgstr ""
 msgid "Import LDIF file"
 msgstr ""
 
-#: addons/ldapmanager/class_ldapmanager.inc:147
-#: addons/ldapmanager/class_ldapmanager.inc:186
+#: addons/ldapmanager/class_ldapmanager.inc:133
+#: addons/ldapmanager/class_ldapmanager.inc:175
 msgid "LDAP error"
 msgstr ""
 
-#: addons/ldapmanager/class_ldapmanager.inc:148
+#: addons/ldapmanager/class_ldapmanager.inc:134
 #, php-format
 msgid "No such object %s!"
 msgstr ""
 
-#: addons/ldapmanager/class_ldapmanager.inc:162
-#: addons/ldapmanager/class_csvimport.inc:137
+#: addons/ldapmanager/class_ldapmanager.inc:152
 msgid "Permission error"
 msgstr ""
 
-#: addons/ldapmanager/class_ldapmanager.inc:163
+#: addons/ldapmanager/class_ldapmanager.inc:153
 #, php-format
 msgid "You have no permission to export %s!"
 msgstr ""
 
-#: addons/ldapmanager/class_ldapmanager.inc:168
-#: addons/ldapmanager/class_csvimport.inc:188
-#: addons/ldapmanager/class_csvimport.inc:351
-#: addons/ldapmanager/class_csvimport.inc:388
-#: addons/ldapmanager/class_csvimport.inc:391
-#: addons/ldapmanager/class_csvimport.inc:394
-#: addons/ldapmanager/class_csvimport.inc:397
-#: addons/ldapmanager/class_csvimport.inc:545
+#: addons/ldapmanager/class_ldapmanager.inc:159
+#: addons/ldapmanager/class_csvimport.inc:181
 msgid "Error"
 msgstr ""
 
-#: addons/ldapmanager/class_ldapmanager.inc:169
+#: addons/ldapmanager/class_ldapmanager.inc:160
 #, php-format
 msgid "Failed to generate ldap export, error was \"%s\"!"
 msgstr ""
@@ -139,107 +132,72 @@ msgstr ""
 msgid "Ldap manager"
 msgstr ""
 
-#: addons/ldapmanager/class_csvimport.inc:39
+#: addons/ldapmanager/class_csvimport.inc:28
 msgid "CSV import"
 msgstr ""
 
-#: addons/ldapmanager/class_csvimport.inc:40
+#: addons/ldapmanager/class_csvimport.inc:29
 msgid "Import of csv data into the ldap tree"
 msgstr ""
 
-#: addons/ldapmanager/class_csvimport.inc:137
-msgid "You've no permission to import CSV files."
+#: addons/ldapmanager/class_csvimport.inc:42
+msgid "Import CSV"
 msgstr ""
 
-#: addons/ldapmanager/class_csvimport.inc:188
-msgid "Need at least 'sn' and 'givenName' to create users!"
+#: addons/ldapmanager/class_csvimport.inc:45
+msgid "Object type"
 msgstr ""
 
-#: addons/ldapmanager/class_csvimport.inc:189
-#: addons/ldapmanager/class_csvimport.inc:221
-#: addons/ldapmanager/class_csvimport.inc:287
-msgid "failed"
+#: addons/ldapmanager/class_csvimport.inc:45
+msgid "Type of objects you wish to import"
 msgstr ""
 
-#: addons/ldapmanager/class_csvimport.inc:220
-#, php-format
-msgid "Failed to generate 'uid' for entry '%s'!"
-msgstr ""
-
-#: addons/ldapmanager/class_csvimport.inc:291
-msgid "ok"
-msgstr ""
-
-#: addons/ldapmanager/class_csvimport.inc:351
-#, php-format
-msgid "Cannot insert entry '%s'!"
-msgstr ""
-
-#: addons/ldapmanager/class_csvimport.inc:377
-msgid "Information"
+#: addons/ldapmanager/class_csvimport.inc:49
+msgid "Template"
 msgstr ""
 
-#: addons/ldapmanager/class_csvimport.inc:377
-msgid "Nothing to import!"
+#: addons/ldapmanager/class_csvimport.inc:49
+msgid "Select a template to apply to imported entries"
 msgstr ""
 
-#: addons/ldapmanager/class_csvimport.inc:388
-#: addons/ldapmanager/class_csvimport.inc:391
-#: addons/ldapmanager/class_csvimport.inc:394
-#: addons/ldapmanager/class_csvimport.inc:397
-#, php-format
-msgid "Cannot read uploaded file: %s"
+#: addons/ldapmanager/class_csvimport.inc:53
+msgid "CSV file"
 msgstr ""
 
-#: addons/ldapmanager/class_csvimport.inc:388
-#: addons/ldapmanager/class_csvimport.inc:394
-msgid "file not found"
+#: addons/ldapmanager/class_csvimport.inc:53
+msgid "Import a CSV file into your LDAP"
 msgstr ""
 
-#: addons/ldapmanager/class_csvimport.inc:391
-msgid "file is empty"
+#: addons/ldapmanager/class_csvimport.inc:57
+msgid "Separator"
 msgstr ""
 
-#: addons/ldapmanager/class_csvimport.inc:397
-msgid "file not readable"
+#: addons/ldapmanager/class_csvimport.inc:57
+msgid "Character used as separator in the CSV file"
 msgstr ""
 
-#: addons/ldapmanager/class_csvimport.inc:545
-msgid "Cannot find CSV data in the selected file!"
+#: addons/ldapmanager/class_csvimport.inc:63
+msgid "Fixed values"
 msgstr ""
 
-#: addons/ldapmanager/contentcsv.tpl.c:2
+#: addons/ldapmanager/class_csvimport.inc:63
 msgid ""
-"The CSV import plugin provides methods to generate user accounts from a file"
-" containing Semi-Colon Seperated Values. The administrator can decide which "
-"columns should be transfered to which attribute. Note that you must have at "
-"least the GIVENNAME and SURNAME set."
-msgstr ""
-
-#: addons/ldapmanager/contentcsv.tpl.c:5
-msgid "Select CSV file to import"
-msgstr ""
-
-#: addons/ldapmanager/contentcsv.tpl.c:8
-msgid "Browse"
-msgstr ""
-
-#: addons/ldapmanager/contentcsv.tpl.c:11
-msgid "Select template"
+"Some fixed values that you might wanna use in the filling of the template."
 msgstr ""
 
-#: addons/ldapmanager/contentcsv.tpl.c:14
-msgid "All entries have been written to the LDAP database successfully."
+#: addons/ldapmanager/class_csvimport.inc:75
+msgid "Template filling"
 msgstr ""
 
-#: addons/ldapmanager/contentcsv.tpl.c:17
-msgid "Oups. There was an error during the import of your data."
+#: addons/ldapmanager/class_csvimport.inc:84
+msgid "Select fields associations"
 msgstr ""
 
-#: addons/ldapmanager/contentcsv.tpl.c:20
-msgid "Here is the status report for the import:"
+#: addons/ldapmanager/class_csvimport.inc:190
+msgid "Success"
 msgstr ""
 
-#: addons/ldapmanager/contentcsv.tpl.c:23
-msgid "Selected Template"
+#: addons/ldapmanager/class_csvimport.inc:190
+#, php-format
+msgid "Successfully imported %d entries"
 msgstr ""
diff --git a/ldapmanager/locale/sv/fusiondirectory.po b/ldapmanager/locale/sv/fusiondirectory.po
index e992be3931527a97c8c1989128e0008f4c6232cc..77e399368df076448d4b836410dc8575246e2f05 100644
--- a/ldapmanager/locale/sv/fusiondirectory.po
+++ b/ldapmanager/locale/sv/fusiondirectory.po
@@ -5,12 +5,12 @@
 # Translators:
 msgid ""
 msgstr ""
-"Project-Id-Version: FusionDirectory-108\n"
+"Project-Id-Version: FusionDirectory-109\n"
 "Report-Msgid-Bugs-To: documentation@lists.fusiondirectory.org\n"
-"POT-Creation-Date: 2015-03-19 21:45+0100\n"
-"PO-Revision-Date: 2015-02-25 16:12+0000\n"
+"POT-Creation-Date: 2014-12-15 17:47+0100\n"
+"PO-Revision-Date: 2015-02-25 16:13+0000\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>\n"
-"Language-Team: Swedish (http://www.transifex.com/projects/p/FusionDirectory-108/language/sv/)\n"
+"Language-Team: Swedish (http://www.transifex.com/projects/p/FusionDirectory-109/language/sv/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -82,8 +82,8 @@ msgid ""
 msgstr ""
 
 #: addons/ldapmanager/class_ldapmanager.inc:102
-#: addons/ldapmanager/contentcsv.tpl.c:26
-#: addons/ldapmanager/contentcsv.tpl.c:29
+#: addons/ldapmanager/class_csvimport.inc:70
+#: addons/ldapmanager/class_csvimport.inc:93
 msgid "Import"
 msgstr ""
 
@@ -91,38 +91,31 @@ msgstr ""
 msgid "Import LDIF file"
 msgstr ""
 
-#: addons/ldapmanager/class_ldapmanager.inc:147
-#: addons/ldapmanager/class_ldapmanager.inc:186
+#: addons/ldapmanager/class_ldapmanager.inc:133
+#: addons/ldapmanager/class_ldapmanager.inc:175
 msgid "LDAP error"
 msgstr "LDAP-fel"
 
-#: addons/ldapmanager/class_ldapmanager.inc:148
+#: addons/ldapmanager/class_ldapmanager.inc:134
 #, php-format
 msgid "No such object %s!"
 msgstr ""
 
-#: addons/ldapmanager/class_ldapmanager.inc:162
-#: addons/ldapmanager/class_csvimport.inc:137
+#: addons/ldapmanager/class_ldapmanager.inc:152
 msgid "Permission error"
 msgstr "RÃ¤ttighetsfel"
 
-#: addons/ldapmanager/class_ldapmanager.inc:163
+#: addons/ldapmanager/class_ldapmanager.inc:153
 #, php-format
 msgid "You have no permission to export %s!"
 msgstr ""
 
-#: addons/ldapmanager/class_ldapmanager.inc:168
-#: addons/ldapmanager/class_csvimport.inc:188
-#: addons/ldapmanager/class_csvimport.inc:351
-#: addons/ldapmanager/class_csvimport.inc:388
-#: addons/ldapmanager/class_csvimport.inc:391
-#: addons/ldapmanager/class_csvimport.inc:394
-#: addons/ldapmanager/class_csvimport.inc:397
-#: addons/ldapmanager/class_csvimport.inc:545
+#: addons/ldapmanager/class_ldapmanager.inc:159
+#: addons/ldapmanager/class_csvimport.inc:181
 msgid "Error"
 msgstr "Fel"
 
-#: addons/ldapmanager/class_ldapmanager.inc:169
+#: addons/ldapmanager/class_ldapmanager.inc:160
 #, php-format
 msgid "Failed to generate ldap export, error was \"%s\"!"
 msgstr ""
@@ -139,107 +132,72 @@ msgstr ""
 msgid "Ldap manager"
 msgstr ""
 
-#: addons/ldapmanager/class_csvimport.inc:39
+#: addons/ldapmanager/class_csvimport.inc:28
 msgid "CSV import"
 msgstr ""
 
-#: addons/ldapmanager/class_csvimport.inc:40
+#: addons/ldapmanager/class_csvimport.inc:29
 msgid "Import of csv data into the ldap tree"
 msgstr ""
 
-#: addons/ldapmanager/class_csvimport.inc:137
-msgid "You've no permission to import CSV files."
+#: addons/ldapmanager/class_csvimport.inc:42
+msgid "Import CSV"
 msgstr ""
 
-#: addons/ldapmanager/class_csvimport.inc:188
-msgid "Need at least 'sn' and 'givenName' to create users!"
+#: addons/ldapmanager/class_csvimport.inc:45
+msgid "Object type"
 msgstr ""
 
-#: addons/ldapmanager/class_csvimport.inc:189
-#: addons/ldapmanager/class_csvimport.inc:221
-#: addons/ldapmanager/class_csvimport.inc:287
-msgid "failed"
+#: addons/ldapmanager/class_csvimport.inc:45
+msgid "Type of objects you wish to import"
 msgstr ""
 
-#: addons/ldapmanager/class_csvimport.inc:220
-#, php-format
-msgid "Failed to generate 'uid' for entry '%s'!"
-msgstr ""
+#: addons/ldapmanager/class_csvimport.inc:49
+msgid "Template"
+msgstr "Mall"
 
-#: addons/ldapmanager/class_csvimport.inc:291
-msgid "ok"
+#: addons/ldapmanager/class_csvimport.inc:49
+msgid "Select a template to apply to imported entries"
 msgstr ""
 
-#: addons/ldapmanager/class_csvimport.inc:351
-#, php-format
-msgid "Cannot insert entry '%s'!"
+#: addons/ldapmanager/class_csvimport.inc:53
+msgid "CSV file"
 msgstr ""
 
-#: addons/ldapmanager/class_csvimport.inc:377
-msgid "Information"
-msgstr "Information"
-
-#: addons/ldapmanager/class_csvimport.inc:377
-msgid "Nothing to import!"
-msgstr ""
-
-#: addons/ldapmanager/class_csvimport.inc:388
-#: addons/ldapmanager/class_csvimport.inc:391
-#: addons/ldapmanager/class_csvimport.inc:394
-#: addons/ldapmanager/class_csvimport.inc:397
-#, php-format
-msgid "Cannot read uploaded file: %s"
-msgstr "Kan inte lÃ¤sa uppladdad fil: %s"
-
-#: addons/ldapmanager/class_csvimport.inc:388
-#: addons/ldapmanager/class_csvimport.inc:394
-msgid "file not found"
-msgstr "filen kunde inte hittas"
-
-#: addons/ldapmanager/class_csvimport.inc:391
-msgid "file is empty"
-msgstr "filen Ã¤r tom"
-
-#: addons/ldapmanager/class_csvimport.inc:397
-msgid "file not readable"
-msgstr "filen Ã¤r inte lÃ¤sbar"
-
-#: addons/ldapmanager/class_csvimport.inc:545
-msgid "Cannot find CSV data in the selected file!"
+#: addons/ldapmanager/class_csvimport.inc:53
+msgid "Import a CSV file into your LDAP"
 msgstr ""
 
-#: addons/ldapmanager/contentcsv.tpl.c:2
-msgid ""
-"The CSV import plugin provides methods to generate user accounts from a file"
-" containing Semi-Colon Seperated Values. The administrator can decide which "
-"columns should be transfered to which attribute. Note that you must have at "
-"least the GIVENNAME and SURNAME set."
+#: addons/ldapmanager/class_csvimport.inc:57
+msgid "Separator"
 msgstr ""
 
-#: addons/ldapmanager/contentcsv.tpl.c:5
-msgid "Select CSV file to import"
+#: addons/ldapmanager/class_csvimport.inc:57
+msgid "Character used as separator in the CSV file"
 msgstr ""
 
-#: addons/ldapmanager/contentcsv.tpl.c:8
-msgid "Browse"
+#: addons/ldapmanager/class_csvimport.inc:63
+msgid "Fixed values"
 msgstr ""
 
-#: addons/ldapmanager/contentcsv.tpl.c:11
-msgid "Select template"
+#: addons/ldapmanager/class_csvimport.inc:63
+msgid ""
+"Some fixed values that you might wanna use in the filling of the template."
 msgstr ""
 
-#: addons/ldapmanager/contentcsv.tpl.c:14
-msgid "All entries have been written to the LDAP database successfully."
+#: addons/ldapmanager/class_csvimport.inc:75
+msgid "Template filling"
 msgstr ""
 
-#: addons/ldapmanager/contentcsv.tpl.c:17
-msgid "Oups. There was an error during the import of your data."
+#: addons/ldapmanager/class_csvimport.inc:84
+msgid "Select fields associations"
 msgstr ""
 
-#: addons/ldapmanager/contentcsv.tpl.c:20
-msgid "Here is the status report for the import:"
+#: addons/ldapmanager/class_csvimport.inc:190
+msgid "Success"
 msgstr ""
 
-#: addons/ldapmanager/contentcsv.tpl.c:23
-msgid "Selected Template"
+#: addons/ldapmanager/class_csvimport.inc:190
+#, php-format
+msgid "Successfully imported %d entries"
 msgstr ""
diff --git a/ldapmanager/locale/ug/fusiondirectory.po b/ldapmanager/locale/ug/fusiondirectory.po
index 1aa22c4be21c0c824866e767f7f14cccd04fb1bb..7bbda5ca163dd683c098456490c191822461fd21 100644
--- a/ldapmanager/locale/ug/fusiondirectory.po
+++ b/ldapmanager/locale/ug/fusiondirectory.po
@@ -5,12 +5,12 @@
 # Translators:
 msgid ""
 msgstr ""
-"Project-Id-Version: FusionDirectory-108\n"
+"Project-Id-Version: FusionDirectory-109\n"
 "Report-Msgid-Bugs-To: documentation@lists.fusiondirectory.org\n"
-"POT-Creation-Date: 2015-03-19 21:45+0100\n"
-"PO-Revision-Date: 2015-02-25 15:49+0000\n"
+"POT-Creation-Date: 2014-12-15 17:47+0100\n"
+"PO-Revision-Date: 2014-12-15 16:59+0000\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>\n"
-"Language-Team: Uighur (http://www.transifex.com/projects/p/FusionDirectory-108/language/ug/)\n"
+"Language-Team: Uighur (http://www.transifex.com/projects/p/FusionDirectory-109/language/ug/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -82,8 +82,8 @@ msgid ""
 msgstr ""
 
 #: addons/ldapmanager/class_ldapmanager.inc:102
-#: addons/ldapmanager/contentcsv.tpl.c:26
-#: addons/ldapmanager/contentcsv.tpl.c:29
+#: addons/ldapmanager/class_csvimport.inc:70
+#: addons/ldapmanager/class_csvimport.inc:93
 msgid "Import"
 msgstr ""
 
@@ -91,38 +91,31 @@ msgstr ""
 msgid "Import LDIF file"
 msgstr ""
 
-#: addons/ldapmanager/class_ldapmanager.inc:147
-#: addons/ldapmanager/class_ldapmanager.inc:186
+#: addons/ldapmanager/class_ldapmanager.inc:133
+#: addons/ldapmanager/class_ldapmanager.inc:175
 msgid "LDAP error"
 msgstr ""
 
-#: addons/ldapmanager/class_ldapmanager.inc:148
+#: addons/ldapmanager/class_ldapmanager.inc:134
 #, php-format
 msgid "No such object %s!"
 msgstr ""
 
-#: addons/ldapmanager/class_ldapmanager.inc:162
-#: addons/ldapmanager/class_csvimport.inc:137
+#: addons/ldapmanager/class_ldapmanager.inc:152
 msgid "Permission error"
 msgstr ""
 
-#: addons/ldapmanager/class_ldapmanager.inc:163
+#: addons/ldapmanager/class_ldapmanager.inc:153
 #, php-format
 msgid "You have no permission to export %s!"
 msgstr ""
 
-#: addons/ldapmanager/class_ldapmanager.inc:168
-#: addons/ldapmanager/class_csvimport.inc:188
-#: addons/ldapmanager/class_csvimport.inc:351
-#: addons/ldapmanager/class_csvimport.inc:388
-#: addons/ldapmanager/class_csvimport.inc:391
-#: addons/ldapmanager/class_csvimport.inc:394
-#: addons/ldapmanager/class_csvimport.inc:397
-#: addons/ldapmanager/class_csvimport.inc:545
+#: addons/ldapmanager/class_ldapmanager.inc:159
+#: addons/ldapmanager/class_csvimport.inc:181
 msgid "Error"
 msgstr ""
 
-#: addons/ldapmanager/class_ldapmanager.inc:169
+#: addons/ldapmanager/class_ldapmanager.inc:160
 #, php-format
 msgid "Failed to generate ldap export, error was \"%s\"!"
 msgstr ""
@@ -139,107 +132,72 @@ msgstr ""
 msgid "Ldap manager"
 msgstr ""
 
-#: addons/ldapmanager/class_csvimport.inc:39
+#: addons/ldapmanager/class_csvimport.inc:28
 msgid "CSV import"
 msgstr ""
 
-#: addons/ldapmanager/class_csvimport.inc:40
+#: addons/ldapmanager/class_csvimport.inc:29
 msgid "Import of csv data into the ldap tree"
 msgstr ""
 
-#: addons/ldapmanager/class_csvimport.inc:137
-msgid "You've no permission to import CSV files."
+#: addons/ldapmanager/class_csvimport.inc:42
+msgid "Import CSV"
 msgstr ""
 
-#: addons/ldapmanager/class_csvimport.inc:188
-msgid "Need at least 'sn' and 'givenName' to create users!"
+#: addons/ldapmanager/class_csvimport.inc:45
+msgid "Object type"
 msgstr ""
 
-#: addons/ldapmanager/class_csvimport.inc:189
-#: addons/ldapmanager/class_csvimport.inc:221
-#: addons/ldapmanager/class_csvimport.inc:287
-msgid "failed"
+#: addons/ldapmanager/class_csvimport.inc:45
+msgid "Type of objects you wish to import"
 msgstr ""
 
-#: addons/ldapmanager/class_csvimport.inc:220
-#, php-format
-msgid "Failed to generate 'uid' for entry '%s'!"
-msgstr ""
-
-#: addons/ldapmanager/class_csvimport.inc:291
-msgid "ok"
-msgstr ""
-
-#: addons/ldapmanager/class_csvimport.inc:351
-#, php-format
-msgid "Cannot insert entry '%s'!"
-msgstr ""
-
-#: addons/ldapmanager/class_csvimport.inc:377
-msgid "Information"
+#: addons/ldapmanager/class_csvimport.inc:49
+msgid "Template"
 msgstr ""
 
-#: addons/ldapmanager/class_csvimport.inc:377
-msgid "Nothing to import!"
+#: addons/ldapmanager/class_csvimport.inc:49
+msgid "Select a template to apply to imported entries"
 msgstr ""
 
-#: addons/ldapmanager/class_csvimport.inc:388
-#: addons/ldapmanager/class_csvimport.inc:391
-#: addons/ldapmanager/class_csvimport.inc:394
-#: addons/ldapmanager/class_csvimport.inc:397
-#, php-format
-msgid "Cannot read uploaded file: %s"
+#: addons/ldapmanager/class_csvimport.inc:53
+msgid "CSV file"
 msgstr ""
 
-#: addons/ldapmanager/class_csvimport.inc:388
-#: addons/ldapmanager/class_csvimport.inc:394
-msgid "file not found"
+#: addons/ldapmanager/class_csvimport.inc:53
+msgid "Import a CSV file into your LDAP"
 msgstr ""
 
-#: addons/ldapmanager/class_csvimport.inc:391
-msgid "file is empty"
+#: addons/ldapmanager/class_csvimport.inc:57
+msgid "Separator"
 msgstr ""
 
-#: addons/ldapmanager/class_csvimport.inc:397
-msgid "file not readable"
+#: addons/ldapmanager/class_csvimport.inc:57
+msgid "Character used as separator in the CSV file"
 msgstr ""
 
-#: addons/ldapmanager/class_csvimport.inc:545
-msgid "Cannot find CSV data in the selected file!"
+#: addons/ldapmanager/class_csvimport.inc:63
+msgid "Fixed values"
 msgstr ""
 
-#: addons/ldapmanager/contentcsv.tpl.c:2
+#: addons/ldapmanager/class_csvimport.inc:63
 msgid ""
-"The CSV import plugin provides methods to generate user accounts from a file"
-" containing Semi-Colon Seperated Values. The administrator can decide which "
-"columns should be transfered to which attribute. Note that you must have at "
-"least the GIVENNAME and SURNAME set."
-msgstr ""
-
-#: addons/ldapmanager/contentcsv.tpl.c:5
-msgid "Select CSV file to import"
-msgstr ""
-
-#: addons/ldapmanager/contentcsv.tpl.c:8
-msgid "Browse"
-msgstr ""
-
-#: addons/ldapmanager/contentcsv.tpl.c:11
-msgid "Select template"
+"Some fixed values that you might wanna use in the filling of the template."
 msgstr ""
 
-#: addons/ldapmanager/contentcsv.tpl.c:14
-msgid "All entries have been written to the LDAP database successfully."
+#: addons/ldapmanager/class_csvimport.inc:75
+msgid "Template filling"
 msgstr ""
 
-#: addons/ldapmanager/contentcsv.tpl.c:17
-msgid "Oups. There was an error during the import of your data."
+#: addons/ldapmanager/class_csvimport.inc:84
+msgid "Select fields associations"
 msgstr ""
 
-#: addons/ldapmanager/contentcsv.tpl.c:20
-msgid "Here is the status report for the import:"
+#: addons/ldapmanager/class_csvimport.inc:190
+msgid "Success"
 msgstr ""
 
-#: addons/ldapmanager/contentcsv.tpl.c:23
-msgid "Selected Template"
+#: addons/ldapmanager/class_csvimport.inc:190
+#, php-format
+msgid "Successfully imported %d entries"
 msgstr ""
diff --git a/ldapmanager/locale/vi_VN/fusiondirectory.po b/ldapmanager/locale/vi_VN/fusiondirectory.po
index 677fb3215a6a19d1e88031eecba56142a5d5304a..dffb2229b5fd72efe0f6e60384450d3fb94b305f 100644
--- a/ldapmanager/locale/vi_VN/fusiondirectory.po
+++ b/ldapmanager/locale/vi_VN/fusiondirectory.po
@@ -5,12 +5,12 @@
 # Translators:
 msgid ""
 msgstr ""
-"Project-Id-Version: FusionDirectory-108\n"
+"Project-Id-Version: FusionDirectory-109\n"
 "Report-Msgid-Bugs-To: documentation@lists.fusiondirectory.org\n"
-"POT-Creation-Date: 2015-03-19 21:45+0100\n"
-"PO-Revision-Date: 2015-02-25 16:02+0000\n"
+"POT-Creation-Date: 2014-12-15 17:47+0100\n"
+"PO-Revision-Date: 2015-02-13 16:32+0000\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>\n"
-"Language-Team: Vietnamese (Viet Nam) (http://www.transifex.com/projects/p/FusionDirectory-108/language/vi_VN/)\n"
+"Language-Team: Vietnamese (Viet Nam) (http://www.transifex.com/projects/p/FusionDirectory-109/language/vi_VN/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -82,8 +82,8 @@ msgid ""
 msgstr ""
 
 #: addons/ldapmanager/class_ldapmanager.inc:102
-#: addons/ldapmanager/contentcsv.tpl.c:26
-#: addons/ldapmanager/contentcsv.tpl.c:29
+#: addons/ldapmanager/class_csvimport.inc:70
+#: addons/ldapmanager/class_csvimport.inc:93
 msgid "Import"
 msgstr ""
 
@@ -91,38 +91,31 @@ msgstr ""
 msgid "Import LDIF file"
 msgstr ""
 
-#: addons/ldapmanager/class_ldapmanager.inc:147
-#: addons/ldapmanager/class_ldapmanager.inc:186
+#: addons/ldapmanager/class_ldapmanager.inc:133
+#: addons/ldapmanager/class_ldapmanager.inc:175
 msgid "LDAP error"
 msgstr "Lá»—i LDAP"
 
-#: addons/ldapmanager/class_ldapmanager.inc:148
+#: addons/ldapmanager/class_ldapmanager.inc:134
 #, php-format
 msgid "No such object %s!"
 msgstr ""
 
-#: addons/ldapmanager/class_ldapmanager.inc:162
-#: addons/ldapmanager/class_csvimport.inc:137
+#: addons/ldapmanager/class_ldapmanager.inc:152
 msgid "Permission error"
 msgstr "Lá»—i vá» cáº¥p phÃ©p"
 
-#: addons/ldapmanager/class_ldapmanager.inc:163
+#: addons/ldapmanager/class_ldapmanager.inc:153
 #, php-format
 msgid "You have no permission to export %s!"
 msgstr ""
 
-#: addons/ldapmanager/class_ldapmanager.inc:168
-#: addons/ldapmanager/class_csvimport.inc:188
-#: addons/ldapmanager/class_csvimport.inc:351
-#: addons/ldapmanager/class_csvimport.inc:388
-#: addons/ldapmanager/class_csvimport.inc:391
-#: addons/ldapmanager/class_csvimport.inc:394
-#: addons/ldapmanager/class_csvimport.inc:397
-#: addons/ldapmanager/class_csvimport.inc:545
+#: addons/ldapmanager/class_ldapmanager.inc:159
+#: addons/ldapmanager/class_csvimport.inc:181
 msgid "Error"
 msgstr "Lá»—i"
 
-#: addons/ldapmanager/class_ldapmanager.inc:169
+#: addons/ldapmanager/class_ldapmanager.inc:160
 #, php-format
 msgid "Failed to generate ldap export, error was \"%s\"!"
 msgstr ""
@@ -139,107 +132,72 @@ msgstr ""
 msgid "Ldap manager"
 msgstr ""
 
-#: addons/ldapmanager/class_csvimport.inc:39
+#: addons/ldapmanager/class_csvimport.inc:28
 msgid "CSV import"
 msgstr ""
 
-#: addons/ldapmanager/class_csvimport.inc:40
+#: addons/ldapmanager/class_csvimport.inc:29
 msgid "Import of csv data into the ldap tree"
 msgstr ""
 
-#: addons/ldapmanager/class_csvimport.inc:137
-msgid "You've no permission to import CSV files."
+#: addons/ldapmanager/class_csvimport.inc:42
+msgid "Import CSV"
 msgstr ""
 
-#: addons/ldapmanager/class_csvimport.inc:188
-msgid "Need at least 'sn' and 'givenName' to create users!"
+#: addons/ldapmanager/class_csvimport.inc:45
+msgid "Object type"
 msgstr ""
 
-#: addons/ldapmanager/class_csvimport.inc:189
-#: addons/ldapmanager/class_csvimport.inc:221
-#: addons/ldapmanager/class_csvimport.inc:287
-msgid "failed"
+#: addons/ldapmanager/class_csvimport.inc:45
+msgid "Type of objects you wish to import"
 msgstr ""
 
-#: addons/ldapmanager/class_csvimport.inc:220
-#, php-format
-msgid "Failed to generate 'uid' for entry '%s'!"
-msgstr ""
+#: addons/ldapmanager/class_csvimport.inc:49
+msgid "Template"
+msgstr "Máº«u"
 
-#: addons/ldapmanager/class_csvimport.inc:291
-msgid "ok"
-msgstr ""
-
-#: addons/ldapmanager/class_csvimport.inc:351
-#, php-format
-msgid "Cannot insert entry '%s'!"
+#: addons/ldapmanager/class_csvimport.inc:49
+msgid "Select a template to apply to imported entries"
 msgstr ""
 
-#: addons/ldapmanager/class_csvimport.inc:377
-msgid "Information"
-msgstr "ThÃ´ng tin"
-
-#: addons/ldapmanager/class_csvimport.inc:377
-msgid "Nothing to import!"
-msgstr ""
-
-#: addons/ldapmanager/class_csvimport.inc:388
-#: addons/ldapmanager/class_csvimport.inc:391
-#: addons/ldapmanager/class_csvimport.inc:394
-#: addons/ldapmanager/class_csvimport.inc:397
-#, php-format
-msgid "Cannot read uploaded file: %s"
+#: addons/ldapmanager/class_csvimport.inc:53
+msgid "CSV file"
 msgstr ""
 
-#: addons/ldapmanager/class_csvimport.inc:388
-#: addons/ldapmanager/class_csvimport.inc:394
-msgid "file not found"
+#: addons/ldapmanager/class_csvimport.inc:53
+msgid "Import a CSV file into your LDAP"
 msgstr ""
 
-#: addons/ldapmanager/class_csvimport.inc:391
-msgid "file is empty"
+#: addons/ldapmanager/class_csvimport.inc:57
+msgid "Separator"
 msgstr ""
 
-#: addons/ldapmanager/class_csvimport.inc:397
-msgid "file not readable"
+#: addons/ldapmanager/class_csvimport.inc:57
+msgid "Character used as separator in the CSV file"
 msgstr ""
 
-#: addons/ldapmanager/class_csvimport.inc:545
-msgid "Cannot find CSV data in the selected file!"
+#: addons/ldapmanager/class_csvimport.inc:63
+msgid "Fixed values"
 msgstr ""
 
-#: addons/ldapmanager/contentcsv.tpl.c:2
+#: addons/ldapmanager/class_csvimport.inc:63
 msgid ""
-"The CSV import plugin provides methods to generate user accounts from a file"
-" containing Semi-Colon Seperated Values. The administrator can decide which "
-"columns should be transfered to which attribute. Note that you must have at "
-"least the GIVENNAME and SURNAME set."
+"Some fixed values that you might wanna use in the filling of the template."
 msgstr ""
 
-#: addons/ldapmanager/contentcsv.tpl.c:5
-msgid "Select CSV file to import"
+#: addons/ldapmanager/class_csvimport.inc:75
+msgid "Template filling"
 msgstr ""
 
-#: addons/ldapmanager/contentcsv.tpl.c:8
-msgid "Browse"
+#: addons/ldapmanager/class_csvimport.inc:84
+msgid "Select fields associations"
 msgstr ""
 
-#: addons/ldapmanager/contentcsv.tpl.c:11
-msgid "Select template"
-msgstr ""
-
-#: addons/ldapmanager/contentcsv.tpl.c:14
-msgid "All entries have been written to the LDAP database successfully."
-msgstr ""
-
-#: addons/ldapmanager/contentcsv.tpl.c:17
-msgid "Oups. There was an error during the import of your data."
-msgstr ""
-
-#: addons/ldapmanager/contentcsv.tpl.c:20
-msgid "Here is the status report for the import:"
-msgstr ""
+#: addons/ldapmanager/class_csvimport.inc:190
+msgid "Success"
+msgstr "ThÃ nh cÃ´ng"
 
-#: addons/ldapmanager/contentcsv.tpl.c:23
-msgid "Selected Template"
+#: addons/ldapmanager/class_csvimport.inc:190
+#, php-format
+msgid "Successfully imported %d entries"
 msgstr ""
diff --git a/ldapmanager/locale/zh/fusiondirectory.po b/ldapmanager/locale/zh/fusiondirectory.po
index aa290d399d34e3ac1c77473685e672db51e1dc81..c73c0e8a75911b07a4e9b50615a777bdc40a6939 100644
--- a/ldapmanager/locale/zh/fusiondirectory.po
+++ b/ldapmanager/locale/zh/fusiondirectory.po
@@ -3,15 +3,14 @@
 # This file is distributed under the same license as the PACKAGE package.
 # 
 # Translators:
-#  Jiang Xin <worldhello.net@gmail.com>, 2007
 msgid ""
 msgstr ""
-"Project-Id-Version: FusionDirectory-108\n"
+"Project-Id-Version: FusionDirectory-109\n"
 "Report-Msgid-Bugs-To: documentation@lists.fusiondirectory.org\n"
-"POT-Creation-Date: 2015-03-19 21:45+0100\n"
-"PO-Revision-Date: 2015-02-25 16:12+0000\n"
+"POT-Creation-Date: 2014-12-15 17:47+0100\n"
+"PO-Revision-Date: 2015-02-25 16:13+0000\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>\n"
-"Language-Team: Chinese (http://www.transifex.com/projects/p/FusionDirectory-108/language/zh/)\n"
+"Language-Team: Chinese (http://www.transifex.com/projects/p/FusionDirectory-109/language/zh/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -83,8 +82,8 @@ msgid ""
 msgstr ""
 
 #: addons/ldapmanager/class_ldapmanager.inc:102
-#: addons/ldapmanager/contentcsv.tpl.c:26
-#: addons/ldapmanager/contentcsv.tpl.c:29
+#: addons/ldapmanager/class_csvimport.inc:70
+#: addons/ldapmanager/class_csvimport.inc:93
 msgid "Import"
 msgstr "å¯¼å…¥"
 
@@ -92,38 +91,31 @@ msgstr "å¯¼å…¥"
 msgid "Import LDIF file"
 msgstr ""
 
-#: addons/ldapmanager/class_ldapmanager.inc:147
-#: addons/ldapmanager/class_ldapmanager.inc:186
+#: addons/ldapmanager/class_ldapmanager.inc:133
+#: addons/ldapmanager/class_ldapmanager.inc:175
 msgid "LDAP error"
 msgstr "LDAP é”™è¯¯"
 
-#: addons/ldapmanager/class_ldapmanager.inc:148
+#: addons/ldapmanager/class_ldapmanager.inc:134
 #, php-format
 msgid "No such object %s!"
 msgstr ""
 
-#: addons/ldapmanager/class_ldapmanager.inc:162
-#: addons/ldapmanager/class_csvimport.inc:137
+#: addons/ldapmanager/class_ldapmanager.inc:152
 msgid "Permission error"
 msgstr ""
 
-#: addons/ldapmanager/class_ldapmanager.inc:163
+#: addons/ldapmanager/class_ldapmanager.inc:153
 #, php-format
 msgid "You have no permission to export %s!"
 msgstr ""
 
-#: addons/ldapmanager/class_ldapmanager.inc:168
-#: addons/ldapmanager/class_csvimport.inc:188
-#: addons/ldapmanager/class_csvimport.inc:351
-#: addons/ldapmanager/class_csvimport.inc:388
-#: addons/ldapmanager/class_csvimport.inc:391
-#: addons/ldapmanager/class_csvimport.inc:394
-#: addons/ldapmanager/class_csvimport.inc:397
-#: addons/ldapmanager/class_csvimport.inc:545
+#: addons/ldapmanager/class_ldapmanager.inc:159
+#: addons/ldapmanager/class_csvimport.inc:181
 msgid "Error"
 msgstr "é”™è¯¯"
 
-#: addons/ldapmanager/class_ldapmanager.inc:169
+#: addons/ldapmanager/class_ldapmanager.inc:160
 #, php-format
 msgid "Failed to generate ldap export, error was \"%s\"!"
 msgstr ""
@@ -140,107 +132,72 @@ msgstr ""
 msgid "Ldap manager"
 msgstr ""
 
-#: addons/ldapmanager/class_csvimport.inc:39
+#: addons/ldapmanager/class_csvimport.inc:28
 msgid "CSV import"
 msgstr "CSV å¯¼å…¥"
 
-#: addons/ldapmanager/class_csvimport.inc:40
+#: addons/ldapmanager/class_csvimport.inc:29
 msgid "Import of csv data into the ldap tree"
 msgstr ""
 
-#: addons/ldapmanager/class_csvimport.inc:137
-msgid "You've no permission to import CSV files."
+#: addons/ldapmanager/class_csvimport.inc:42
+msgid "Import CSV"
 msgstr ""
 
-#: addons/ldapmanager/class_csvimport.inc:188
-msgid "Need at least 'sn' and 'givenName' to create users!"
+#: addons/ldapmanager/class_csvimport.inc:45
+msgid "Object type"
 msgstr ""
 
-#: addons/ldapmanager/class_csvimport.inc:189
-#: addons/ldapmanager/class_csvimport.inc:221
-#: addons/ldapmanager/class_csvimport.inc:287
-msgid "failed"
-msgstr "å¤±è´¥"
-
-#: addons/ldapmanager/class_csvimport.inc:220
-#, php-format
-msgid "Failed to generate 'uid' for entry '%s'!"
+#: addons/ldapmanager/class_csvimport.inc:45
+msgid "Type of objects you wish to import"
 msgstr ""
 
-#: addons/ldapmanager/class_csvimport.inc:291
-msgid "ok"
-msgstr "ok"
+#: addons/ldapmanager/class_csvimport.inc:49
+msgid "Template"
+msgstr "æ¨¡æ¿"
 
-#: addons/ldapmanager/class_csvimport.inc:351
-#, php-format
-msgid "Cannot insert entry '%s'!"
+#: addons/ldapmanager/class_csvimport.inc:49
+msgid "Select a template to apply to imported entries"
 msgstr ""
 
-#: addons/ldapmanager/class_csvimport.inc:377
-msgid "Information"
-msgstr "æç¤ºä¿¡æ¯"
-
-#: addons/ldapmanager/class_csvimport.inc:377
-msgid "Nothing to import!"
-msgstr "æ²¡æœ‰æ•°æ®å¯¼å…¥ï¼"
-
-#: addons/ldapmanager/class_csvimport.inc:388
-#: addons/ldapmanager/class_csvimport.inc:391
-#: addons/ldapmanager/class_csvimport.inc:394
-#: addons/ldapmanager/class_csvimport.inc:397
-#, php-format
-msgid "Cannot read uploaded file: %s"
+#: addons/ldapmanager/class_csvimport.inc:53
+msgid "CSV file"
 msgstr ""
 
-#: addons/ldapmanager/class_csvimport.inc:388
-#: addons/ldapmanager/class_csvimport.inc:394
-msgid "file not found"
+#: addons/ldapmanager/class_csvimport.inc:53
+msgid "Import a CSV file into your LDAP"
 msgstr ""
 
-#: addons/ldapmanager/class_csvimport.inc:391
-msgid "file is empty"
+#: addons/ldapmanager/class_csvimport.inc:57
+msgid "Separator"
 msgstr ""
 
-#: addons/ldapmanager/class_csvimport.inc:397
-msgid "file not readable"
+#: addons/ldapmanager/class_csvimport.inc:57
+msgid "Character used as separator in the CSV file"
 msgstr ""
 
-#: addons/ldapmanager/class_csvimport.inc:545
-msgid "Cannot find CSV data in the selected file!"
+#: addons/ldapmanager/class_csvimport.inc:63
+msgid "Fixed values"
 msgstr ""
 
-#: addons/ldapmanager/contentcsv.tpl.c:2
+#: addons/ldapmanager/class_csvimport.inc:63
 msgid ""
-"The CSV import plugin provides methods to generate user accounts from a file"
-" containing Semi-Colon Seperated Values. The administrator can decide which "
-"columns should be transfered to which attribute. Note that you must have at "
-"least the GIVENNAME and SURNAME set."
+"Some fixed values that you might wanna use in the filling of the template."
 msgstr ""
 
-#: addons/ldapmanager/contentcsv.tpl.c:5
-msgid "Select CSV file to import"
-msgstr "é€‰æ‹©è¦å¯¼å…¥çš„ CSV æ–‡ä»¶"
-
-#: addons/ldapmanager/contentcsv.tpl.c:8
-msgid "Browse"
-msgstr "æµè§ˆ"
-
-#: addons/ldapmanager/contentcsv.tpl.c:11
-msgid "Select template"
-msgstr "é€‰æ‹©æ¨¡æ¿"
-
-#: addons/ldapmanager/contentcsv.tpl.c:14
-msgid "All entries have been written to the LDAP database successfully."
-msgstr "æ‰€æœ‰è®°å½•æˆåŠŸå†™å…¥ LDAP æ•°æ®åº“ã€‚"
+#: addons/ldapmanager/class_csvimport.inc:75
+msgid "Template filling"
+msgstr ""
 
-#: addons/ldapmanager/contentcsv.tpl.c:17
-msgid "Oups. There was an error during the import of your data."
-msgstr "å“Žå“Ÿ! å¯¼å…¥è¿‡ç¨‹ä¸é‡åˆ°ä¸€ä¸ªé”™è¯¯ã€‚"
+#: addons/ldapmanager/class_csvimport.inc:84
+msgid "Select fields associations"
+msgstr ""
 
-#: addons/ldapmanager/contentcsv.tpl.c:20
-msgid "Here is the status report for the import:"
-msgstr "è¿™é‡Œæ˜¯å¯¼å…¥è¿‡ç¨‹çš„çŠ¶æ€æŠ¥å‘Šï¼š"
+#: addons/ldapmanager/class_csvimport.inc:190
+msgid "Success"
+msgstr ""
 
-#: addons/ldapmanager/contentcsv.tpl.c:23
-msgid "Selected Template"
-msgstr "æ‰€é€‰æ¨¡æ¿"
+#: addons/ldapmanager/class_csvimport.inc:190
+#, php-format
+msgid "Successfully imported %d entries"
+msgstr ""
diff --git a/mail/locale/ar/fusiondirectory.po b/mail/locale/ar/fusiondirectory.po
index bb49c6e060494ab85fef8ef52261a1427be19f4f..99de9c2e4f64ea0d24417ea37ee8014b8951af1e 100644
--- a/mail/locale/ar/fusiondirectory.po
+++ b/mail/locale/ar/fusiondirectory.po
@@ -3,16 +3,14 @@
 # This file is distributed under the same license as the PACKAGE package.
 # 
 # Translators:
-# Islam Adel, 2013
-# Islam Adel, 2013
 msgid ""
 msgstr ""
-"Project-Id-Version: FusionDirectory-108\n"
+"Project-Id-Version: FusionDirectory-109\n"
 "Report-Msgid-Bugs-To: documentation@lists.fusiondirectory.org\n"
-"POT-Creation-Date: 2015-03-31 11:49+0200\n"
-"PO-Revision-Date: 2015-03-17 17:56+0000\n"
+"POT-Creation-Date: 2014-12-15 17:47+0100\n"
+"PO-Revision-Date: 2015-02-25 16:13+0000\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>\n"
-"Language-Team: Arabic (http://www.transifex.com/projects/p/FusionDirectory-108/language/ar/)\n"
+"Language-Team: Arabic (http://www.transifex.com/projects/p/FusionDirectory-109/language/ar/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -34,45 +32,35 @@ msgstr ""
 msgid "Informations"
 msgstr ""
 
-#: admin/groups/mail/class_groupMail.inc:82
+#: admin/groups/mail/class_groupMail.inc:86
 #: personal/mail/class_mailAccount.inc:100
 msgid "Primary address"
 msgstr ""
 
-#: admin/groups/mail/class_groupMail.inc:82
+#: admin/groups/mail/class_groupMail.inc:86
 msgid "The primary mail address"
 msgstr ""
 
-#: admin/groups/mail/class_groupMail.inc:86
+#: admin/groups/mail/class_groupMail.inc:90
 #: personal/mail/class_mailAccount.inc:104
 msgid "Server"
 msgstr "Ø®Ø§Ø¯Ù…"
 
-#: admin/groups/mail/class_groupMail.inc:86
+#: admin/groups/mail/class_groupMail.inc:90
 msgid "Server mail"
 msgstr ""
 
-#: admin/groups/mail/class_groupMail.inc:92
+#: admin/groups/mail/class_groupMail.inc:96
 #: personal/mail/class_mailAccount.inc:120
 msgid "Alternative addresses"
 msgstr ""
 
-#: admin/groups/mail/class_groupMail.inc:92
+#: admin/groups/mail/class_groupMail.inc:96
 msgid "Alternative mail addresses for the group"
 msgstr ""
 
-#: admin/groups/mail/class_groupMail.inc:97
-msgid "Forward messages to non group members"
-msgstr ""
-
-#: admin/groups/mail/class_groupMail.inc:101
-msgid "Only allowed to receive local mail"
-msgstr ""
-
 #: admin/groups/mail/class_groupMail.inc:101
-msgid ""
-"Whether this group mail is only allowed to receive messages from local "
-"senders"
+msgid "Forward messages to non group members"
 msgstr ""
 
 #: admin/systems/services/postfix/class_servicePostfix.inc:29
@@ -225,8 +213,7 @@ msgid "Rules"
 msgstr "Ù‚ÙˆØ§Ø¹Ø¯"
 
 #: admin/systems/services/spam/class_serviceSpamAssassin.inc:116
-#: admin/systems/services/spam/class_serviceSpamAssassin.inc:124
-msgid "Edit spam rule"
+msgid "Edit spam ruleEdit spam rule"
 msgstr ""
 
 #: admin/systems/services/spam/class_serviceSpamAssassin.inc:119
@@ -237,6 +224,10 @@ msgstr "Ø§Ù„Ø¥Ø³Ù…"
 msgid "Rule"
 msgstr "Ù‚Ø§Ø¹Ø¯Ø©"
 
+#: admin/systems/services/spam/class_serviceSpamAssassin.inc:124
+msgid "Edit spam rule"
+msgstr ""
+
 #: admin/systems/services/virus/class_serviceAntiVirus.inc:31
 #: admin/systems/services/virus/class_serviceAntiVirus.inc:32
 msgid "Antivirus service"
@@ -282,10 +273,6 @@ msgstr ""
 msgid "Max directory recursions"
 msgstr ""
 
-#: admin/systems/services/virus/class_serviceAntiVirus.inc:68
-msgid "Maximum number of directory recursions"
-msgstr ""
-
 #: admin/systems/services/virus/class_serviceAntiVirus.inc:73
 msgid "Checks per day"
 msgstr ""
@@ -330,6 +317,10 @@ msgstr ""
 msgid "Maximum compression ratio"
 msgstr ""
 
+#: admin/systems/services/virus/class_serviceAntiVirus.inc:113
+msgid " "
+msgstr ""
+
 #: admin/systems/services/imap/class_serviceIMAP.inc:32
 msgid "IMAP/POP3 generic service"
 msgstr ""
@@ -353,16 +344,16 @@ msgstr ""
 msgid "Mail method '%s' is unknown!"
 msgstr ""
 
-#: personal/mail/class_mail-methods.inc:727
-#: personal/mail/class_mail-methods.inc:728
+#: personal/mail/class_mail-methods.inc:735
+#: personal/mail/class_mail-methods.inc:736
 msgid "None"
 msgstr ""
 
-#: personal/mail/class_mail-methods.inc:817
+#: personal/mail/class_mail-methods.inc:825
 msgid "Unknown"
 msgstr ""
 
-#: personal/mail/class_mail-methods.inc:819
+#: personal/mail/class_mail-methods.inc:827
 msgid "Unlimited"
 msgstr ""
 
diff --git a/mail/locale/ca/fusiondirectory.po b/mail/locale/ca/fusiondirectory.po
index f02e5916ce1a21ff16c634a35fa49a67dbd8575d..78e5900bb554505d2ce36fea94945a52c3e64a0e 100644
--- a/mail/locale/ca/fusiondirectory.po
+++ b/mail/locale/ca/fusiondirectory.po
@@ -5,12 +5,12 @@
 # Translators:
 msgid ""
 msgstr ""
-"Project-Id-Version: FusionDirectory-108\n"
+"Project-Id-Version: FusionDirectory-109\n"
 "Report-Msgid-Bugs-To: documentation@lists.fusiondirectory.org\n"
-"POT-Creation-Date: 2015-03-31 11:49+0200\n"
+"POT-Creation-Date: 2014-12-15 17:47+0100\n"
 "PO-Revision-Date: 2015-03-31 11:41+0000\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>\n"
-"Language-Team: Catalan (http://www.transifex.com/projects/p/FusionDirectory-108/language/ca/)\n"
+"Language-Team: Catalan (http://www.transifex.com/projects/p/FusionDirectory-109/language/ca/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -32,45 +32,35 @@ msgstr ""
 msgid "Informations"
 msgstr ""
 
-#: admin/groups/mail/class_groupMail.inc:82
+#: admin/groups/mail/class_groupMail.inc:86
 #: personal/mail/class_mailAccount.inc:100
 msgid "Primary address"
 msgstr ""
 
-#: admin/groups/mail/class_groupMail.inc:82
+#: admin/groups/mail/class_groupMail.inc:86
 msgid "The primary mail address"
 msgstr ""
 
-#: admin/groups/mail/class_groupMail.inc:86
+#: admin/groups/mail/class_groupMail.inc:90
 #: personal/mail/class_mailAccount.inc:104
 msgid "Server"
 msgstr ""
 
-#: admin/groups/mail/class_groupMail.inc:86
+#: admin/groups/mail/class_groupMail.inc:90
 msgid "Server mail"
 msgstr ""
 
-#: admin/groups/mail/class_groupMail.inc:92
+#: admin/groups/mail/class_groupMail.inc:96
 #: personal/mail/class_mailAccount.inc:120
 msgid "Alternative addresses"
 msgstr ""
 
-#: admin/groups/mail/class_groupMail.inc:92
+#: admin/groups/mail/class_groupMail.inc:96
 msgid "Alternative mail addresses for the group"
 msgstr ""
 
-#: admin/groups/mail/class_groupMail.inc:97
-msgid "Forward messages to non group members"
-msgstr ""
-
-#: admin/groups/mail/class_groupMail.inc:101
-msgid "Only allowed to receive local mail"
-msgstr ""
-
 #: admin/groups/mail/class_groupMail.inc:101
-msgid ""
-"Whether this group mail is only allowed to receive messages from local "
-"senders"
+msgid "Forward messages to non group members"
 msgstr ""
 
 #: admin/systems/services/postfix/class_servicePostfix.inc:29
@@ -223,8 +213,7 @@ msgid "Rules"
 msgstr ""
 
 #: admin/systems/services/spam/class_serviceSpamAssassin.inc:116
-#: admin/systems/services/spam/class_serviceSpamAssassin.inc:124
-msgid "Edit spam rule"
+msgid "Edit spam ruleEdit spam rule"
 msgstr ""
 
 #: admin/systems/services/spam/class_serviceSpamAssassin.inc:119
@@ -235,6 +224,10 @@ msgstr "Nom"
 msgid "Rule"
 msgstr ""
 
+#: admin/systems/services/spam/class_serviceSpamAssassin.inc:124
+msgid "Edit spam rule"
+msgstr ""
+
 #: admin/systems/services/virus/class_serviceAntiVirus.inc:31
 #: admin/systems/services/virus/class_serviceAntiVirus.inc:32
 msgid "Antivirus service"
@@ -280,10 +273,6 @@ msgstr ""
 msgid "Max directory recursions"
 msgstr ""
 
-#: admin/systems/services/virus/class_serviceAntiVirus.inc:68
-msgid "Maximum number of directory recursions"
-msgstr ""
-
 #: admin/systems/services/virus/class_serviceAntiVirus.inc:73
 msgid "Checks per day"
 msgstr ""
@@ -328,6 +317,10 @@ msgstr ""
 msgid "Maximum compression ratio"
 msgstr ""
 
+#: admin/systems/services/virus/class_serviceAntiVirus.inc:113
+msgid " "
+msgstr ""
+
 #: admin/systems/services/imap/class_serviceIMAP.inc:32
 msgid "IMAP/POP3 generic service"
 msgstr ""
@@ -351,16 +344,16 @@ msgstr ""
 msgid "Mail method '%s' is unknown!"
 msgstr ""
 
-#: personal/mail/class_mail-methods.inc:727
-#: personal/mail/class_mail-methods.inc:728
+#: personal/mail/class_mail-methods.inc:735
+#: personal/mail/class_mail-methods.inc:736
 msgid "None"
 msgstr ""
 
-#: personal/mail/class_mail-methods.inc:817
+#: personal/mail/class_mail-methods.inc:825
 msgid "Unknown"
 msgstr ""
 
-#: personal/mail/class_mail-methods.inc:819
+#: personal/mail/class_mail-methods.inc:827
 msgid "Unlimited"
 msgstr ""
 
diff --git a/mail/locale/cs_CZ/fusiondirectory.po b/mail/locale/cs_CZ/fusiondirectory.po
index 6775679dcfdbc8b0a942d65c74646a550d30a81f..214a6ab69b13798adcf5cc0ccf37a42b446e1aca 100644
--- a/mail/locale/cs_CZ/fusiondirectory.po
+++ b/mail/locale/cs_CZ/fusiondirectory.po
@@ -3,17 +3,15 @@
 # This file is distributed under the same license as the PACKAGE package.
 # 
 # Translators:
-# Pavel Borecki <pavel.borecki@gmail.com>, 2012
-# Pavel Borecki <pavel.borecki@gmail.com>, 2012,2015
-# Pavel Borecki <pavel.borecki@gmail.com>, 2012
+# Pavel Borecki <pavel.borecki@gmail.com>, 2014-2015
 msgid ""
 msgstr ""
-"Project-Id-Version: FusionDirectory-108\n"
+"Project-Id-Version: FusionDirectory-109\n"
 "Report-Msgid-Bugs-To: documentation@lists.fusiondirectory.org\n"
-"POT-Creation-Date: 2015-03-31 11:49+0200\n"
-"PO-Revision-Date: 2015-03-31 11:51+0000\n"
+"POT-Creation-Date: 2014-12-15 17:47+0100\n"
+"PO-Revision-Date: 2015-04-07 18:02+0000\n"
 "Last-Translator: Pavel Borecki <pavel.borecki@gmail.com>\n"
-"Language-Team: Czech (Czech Republic) (http://www.transifex.com/projects/p/FusionDirectory-108/language/cs_CZ/)\n"
+"Language-Team: Czech (Czech Republic) (http://www.transifex.com/projects/p/FusionDirectory-109/language/cs_CZ/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -24,7 +22,7 @@ msgstr ""
 #: personal/mail/class_mailAccount.inc:79
 #: config/mail/class_mailPluginConfig.inc:28
 msgid "Mail"
-msgstr "e-mail"
+msgstr "E-mail"
 
 #: admin/groups/mail/class_groupMail.inc:47
 msgid "Group mail options"
@@ -35,46 +33,36 @@ msgstr "MoÅ¾nosti skupinovÃ©ho e-mailu"
 msgid "Informations"
 msgstr "Informace"
 
-#: admin/groups/mail/class_groupMail.inc:82
+#: admin/groups/mail/class_groupMail.inc:86
 #: personal/mail/class_mailAccount.inc:100
 msgid "Primary address"
-msgstr "hlavnÃ adresa"
+msgstr "HlavnÃ adresa"
 
-#: admin/groups/mail/class_groupMail.inc:82
+#: admin/groups/mail/class_groupMail.inc:86
 msgid "The primary mail address"
 msgstr "HlavnÃ e-mailovÃ¡ adresa"
 
-#: admin/groups/mail/class_groupMail.inc:86
+#: admin/groups/mail/class_groupMail.inc:90
 #: personal/mail/class_mailAccount.inc:104
 msgid "Server"
-msgstr "server"
+msgstr "Server"
 
-#: admin/groups/mail/class_groupMail.inc:86
+#: admin/groups/mail/class_groupMail.inc:90
 msgid "Server mail"
 msgstr "ServerovÃ¡ poÅ¡ta"
 
-#: admin/groups/mail/class_groupMail.inc:92
+#: admin/groups/mail/class_groupMail.inc:96
 #: personal/mail/class_mailAccount.inc:120
 msgid "Alternative addresses"
-msgstr "alternativnÃ adresy"
+msgstr "AlternativnÃ adresy"
 
-#: admin/groups/mail/class_groupMail.inc:92
+#: admin/groups/mail/class_groupMail.inc:96
 msgid "Alternative mail addresses for the group"
 msgstr "AlternativnÃ e-mailovÃ© adresy pro skupinu"
 
-#: admin/groups/mail/class_groupMail.inc:97
-msgid "Forward messages to non group members"
-msgstr "pÅ™eposlat zprÃ¡vy tÄ›m, kdo nejsou Äleny skupiny"
-
 #: admin/groups/mail/class_groupMail.inc:101
-msgid "Only allowed to receive local mail"
-msgstr "MÅ¯Å¾e pÅ™ijÃmat pouze mÃstnÃ e-maily"
-
-#: admin/groups/mail/class_groupMail.inc:101
-msgid ""
-"Whether this group mail is only allowed to receive messages from local "
-"senders"
-msgstr "Zda je tÃ©to e-mailovÃ© skupinÄ› umoÅ¾nÄ›no dostÃ¡vat zprÃ¡vy pouze od mÃstnÃch odesilatelÅ¯"
+msgid "Forward messages to non group members"
+msgstr "PÅ™eposlat zprÃ¡vy tÄ›m, kdo nejsou Äleny skupiny"
 
 #: admin/systems/services/postfix/class_servicePostfix.inc:29
 #: admin/systems/services/postfix/class_servicePostfix.inc:30
@@ -86,7 +74,7 @@ msgstr ""
 #: admin/systems/services/virus/class_serviceAntiVirus.inc:32
 #: admin/systems/services/imap/class_serviceIMAP.inc:33
 msgid "Services"
-msgstr "sluÅ¾by"
+msgstr "SluÅ¾by"
 
 #: admin/systems/services/postfix/class_servicePostfix.inc:48
 msgid "Hostname"
@@ -98,7 +86,7 @@ msgstr "NÃ¡zev poÄÃtaÄe."
 
 #: admin/systems/services/postfix/class_servicePostfix.inc:53
 msgid "Domain"
-msgstr "domÃ©na"
+msgstr "DomÃ©na"
 
 #: admin/systems/services/postfix/class_servicePostfix.inc:53
 msgid "The domain."
@@ -106,7 +94,7 @@ msgstr "DomÃ©na"
 
 #: admin/systems/services/postfix/class_servicePostfix.inc:58
 msgid "Max mail header size (KB)"
-msgstr "NejvyÅ¡Å¡Ã umoÅ¾nÄ›nÃ¡ velikost hlaviÄky e-mailu (KB)"
+msgstr "NejvÄ›tÅ¡Ã pÅ™ijatelnÃ¡ velikost hlaviÄky e-mailu (KB)"
 
 #: admin/systems/services/postfix/class_servicePostfix.inc:58
 msgid "This value specifies the maximal header size."
@@ -130,7 +118,7 @@ msgstr "UrÄuje nejvÄ›tÅ¡Ã povolenou velikost zprÃ¡vy."
 
 #: admin/systems/services/postfix/class_servicePostfix.inc:75
 msgid "Domains and routing"
-msgstr "domÃ©ny a smÄ›rovÃ¡nÃ"
+msgstr "DomÃ©ny a smÄ›rovÃ¡nÃ"
 
 #: admin/systems/services/postfix/class_servicePostfix.inc:79
 msgid "Domains to accept mail for"
@@ -142,7 +130,7 @@ msgstr "sÃtÄ› Postfixu"
 
 #: admin/systems/services/postfix/class_servicePostfix.inc:84
 msgid "Transport table"
-msgstr "transportnÃ tabulka"
+msgstr "TransportnÃ tabulka"
 
 #: admin/systems/services/postfix/class_servicePostfix.inc:89
 msgid "Transport rule"
@@ -150,11 +138,11 @@ msgstr "TransportnÃ pravidlo"
 
 #: admin/systems/services/postfix/class_servicePostfix.inc:103
 msgid "Restrictions"
-msgstr "omezenÃ"
+msgstr "OmezenÃ"
 
 #: admin/systems/services/postfix/class_servicePostfix.inc:107
 msgid "Restrictions for sender"
-msgstr "omezenÃ odesilatele"
+msgstr "OmezenÃ odesilatele"
 
 #: admin/systems/services/postfix/class_servicePostfix.inc:116
 msgid "For sender"
@@ -162,7 +150,7 @@ msgstr "Pro odesilatele"
 
 #: admin/systems/services/postfix/class_servicePostfix.inc:121
 msgid "Restrictions for recipient"
-msgstr "omezenÃ pÅ™Ãjemce"
+msgstr "OmezenÃ pÅ™Ãjemce"
 
 #: admin/systems/services/postfix/class_servicePostfix.inc:130
 msgid "For recipient"
@@ -179,19 +167,19 @@ msgstr "OznaÄovÃ¡nÃ nevyÅ¾Ã¡danÃ© poÅ¡ty"
 
 #: admin/systems/services/spam/class_serviceSpamAssassin.inc:52
 msgid "Rewrite header"
-msgstr "pÅ™epsat hlaviÄku"
+msgstr "PÅ™epsat hlaviÄku"
 
 #: admin/systems/services/spam/class_serviceSpamAssassin.inc:56
 msgid "Required score"
-msgstr "potÅ™ebnÃ½ stupeÅˆ hodnocenÃ"
+msgstr "PotÅ™ebnÃ½ stupeÅˆ hodnocenÃ"
 
 #: admin/systems/services/spam/class_serviceSpamAssassin.inc:56
 msgid "Select required score to tag mail as spam"
-msgstr "zvolte stupeÅˆ hodnocenÃ, po jehoÅ¾ dosaÅ¾enÃ bude zprÃ¡va povaÅ¾ovÃ¡na za nevyÅ¾Ã¡danou (SPAM)"
+msgstr "Zvolte stupeÅˆ hodnocenÃ, po jehoÅ¾ dosaÅ¾enÃ bude zprÃ¡va povaÅ¾ovÃ¡na za nevyÅ¾Ã¡danou"
 
 #: admin/systems/services/spam/class_serviceSpamAssassin.inc:62
 msgid "Trusted networks"
-msgstr "dÅ¯vÄ›ryhodnÃ© sÃtÄ›"
+msgstr "DÅ¯vÄ›ryhodnÃ© sÃtÄ›"
 
 #: admin/systems/services/spam/class_serviceSpamAssassin.inc:69
 msgid "Flags"
@@ -199,7 +187,7 @@ msgstr "PÅ™Ãznaky"
 
 #: admin/systems/services/spam/class_serviceSpamAssassin.inc:72
 msgid "Enable use of bayes filtering"
-msgstr "pouÅ¾Ãvat k filtrovÃ¡nÃ zprÃ¡v algoritmu Bayes"
+msgstr "PouÅ¾Ãvat k filtrovÃ¡nÃ zprÃ¡v algoritmus Bayes"
 
 #: admin/systems/services/spam/class_serviceSpamAssassin.inc:77
 msgid "Enable bayes auto learning"
@@ -207,36 +195,39 @@ msgstr "PouÅ¾Ãvat samouÄÃcÃ reÅ¾im algoritmu Bayes"
 
 #: admin/systems/services/spam/class_serviceSpamAssassin.inc:82
 msgid "Enable RBL checks"
-msgstr "zapnout kontrolu RBL"
+msgstr "Zapnout kontrolu RBL"
 
 #: admin/systems/services/spam/class_serviceSpamAssassin.inc:87
 msgid "Enable use of Razor"
-msgstr "pouÅ¾Ãvat Razor"
+msgstr "PouÅ¾Ãvat Razor"
 
 #: admin/systems/services/spam/class_serviceSpamAssassin.inc:92
 msgid "Enable use of DDC"
-msgstr "pouÅ¾Ãvat DDC"
+msgstr "PouÅ¾Ãvat DCC detekci"
 
 #: admin/systems/services/spam/class_serviceSpamAssassin.inc:97
 msgid "Enable use of Pyzor"
-msgstr "pouÅ¾Ãvat Pyzor"
+msgstr "PouÅ¾Ãvat Pyzor"
 
 #: admin/systems/services/spam/class_serviceSpamAssassin.inc:112
 msgid "Rules"
-msgstr "pravidla"
+msgstr "Pravidla"
 
 #: admin/systems/services/spam/class_serviceSpamAssassin.inc:116
-#: admin/systems/services/spam/class_serviceSpamAssassin.inc:124
-msgid "Edit spam rule"
+msgid "Edit spam ruleEdit spam rule"
 msgstr "Upravit pravidlo pro nevyÅ¾Ã¡danou poÅ¡tu"
 
 #: admin/systems/services/spam/class_serviceSpamAssassin.inc:119
 msgid "Name"
-msgstr "nÃ¡zev"
+msgstr "NÃ¡zev"
 
 #: admin/systems/services/spam/class_serviceSpamAssassin.inc:120
 msgid "Rule"
-msgstr "pravidlo"
+msgstr "Pravidlo"
+
+#: admin/systems/services/spam/class_serviceSpamAssassin.inc:124
+msgid "Edit spam rule"
+msgstr "Upravit pravidlo pro nevyÅ¾Ã¡danou poÅ¡tu"
 
 #: admin/systems/services/virus/class_serviceAntiVirus.inc:31
 #: admin/systems/services/virus/class_serviceAntiVirus.inc:32
@@ -257,7 +248,7 @@ msgstr "PÅ™ihlaÅ¡ovacÃ jmÃ©no do databÃ¡ze"
 
 #: admin/systems/services/virus/class_serviceAntiVirus.inc:54
 msgid "Database mirror"
-msgstr "zrcadlo databÃ¡ze"
+msgstr "Zrcadlo databÃ¡ze"
 
 #: admin/systems/services/virus/class_serviceAntiVirus.inc:54
 msgid "Mirror for the database"
@@ -265,7 +256,7 @@ msgstr "Zrcadlo pro databÃ¡zi"
 
 #: admin/systems/services/virus/class_serviceAntiVirus.inc:58
 msgid "Http proxy URL"
-msgstr "URL HTTP proxy"
+msgstr "URL adresa HTTP proxy"
 
 #: admin/systems/services/virus/class_serviceAntiVirus.inc:58
 msgid "URL for the proxy"
@@ -273,7 +264,7 @@ msgstr "URL adresa proxy"
 
 #: admin/systems/services/virus/class_serviceAntiVirus.inc:62
 msgid "Maximum threads"
-msgstr "nejvyÅ¡Å¡Ã povolenÃ½ poÄet vlÃ¡ken"
+msgstr "NejvyÅ¡Å¡Ã umoÅ¾nÄ›nÃ½ poÄet vlÃ¡ken"
 
 #: admin/systems/services/virus/class_serviceAntiVirus.inc:62
 msgid "Maximum number of threads"
@@ -281,19 +272,15 @@ msgstr "NejvyÅ¡Å¡Ã umoÅ¾nÄ›nÃ½ poÄet vlÃ¡ken"
 
 #: admin/systems/services/virus/class_serviceAntiVirus.inc:68
 msgid "Max directory recursions"
-msgstr "nejvyÅ¡Å¡Ã povolenÃ½ poÄet vnoÅ™enÃ adresÃ¡Å™e"
-
-#: admin/systems/services/virus/class_serviceAntiVirus.inc:68
-msgid "Maximum number of directory recursions"
-msgstr ""
+msgstr "NejvyÅ¡Å¡Ã umoÅ¾nÄ›nÃ½ poÄet vnoÅ™enÃ adresÃ¡Å™e"
 
 #: admin/systems/services/virus/class_serviceAntiVirus.inc:73
 msgid "Checks per day"
-msgstr "kontrol za den"
+msgstr "Kontrol za den"
 
 #: admin/systems/services/virus/class_serviceAntiVirus.inc:78
 msgid "Enable debugging"
-msgstr "zapnout reÅ¾im ladÄ›nÃ"
+msgstr "Zapnout diagnostickÃ½ reÅ¾im"
 
 #: admin/systems/services/virus/class_serviceAntiVirus.inc:78
 msgid "Enable debugging for the antivirus"
@@ -301,7 +288,7 @@ msgstr "Zapnout diagnostickÃ½ reÅ¾im pro antivirus"
 
 #: admin/systems/services/virus/class_serviceAntiVirus.inc:83
 msgid "Enable mail scanning"
-msgstr "zapnout skenovÃ¡nÃ zprÃ¡v"
+msgstr "Zapnout skenovÃ¡nÃ zprÃ¡v"
 
 #: admin/systems/services/virus/class_serviceAntiVirus.inc:83
 msgid "Enable mail scanning for the antivirus"
@@ -309,19 +296,19 @@ msgstr "Zapnout skenovÃ¡nÃ e-mailÅ¯ na viry"
 
 #: admin/systems/services/virus/class_serviceAntiVirus.inc:90
 msgid "Archive scanning"
-msgstr "skenovÃ¡nÃ archivu"
+msgstr "SkenovÃ¡nÃ archivÅ¯"
 
 #: admin/systems/services/virus/class_serviceAntiVirus.inc:93
 msgid "Enable scanning of archives"
-msgstr "zapnout skenovÃ¡nÃ archivu"
+msgstr "Zapnout skenovÃ¡nÃ archivÅ¯"
 
 #: admin/systems/services/virus/class_serviceAntiVirus.inc:98
 msgid "Block encrypted archives"
-msgstr "blokovat Å¡ifrovanÃ© archivy"
+msgstr "Blokovat zaÅ¡ifrovanÃ© archivy"
 
 #: admin/systems/services/virus/class_serviceAntiVirus.inc:103
 msgid "Maximum file size"
-msgstr "maximÃ¡lnÃ velikost souboru"
+msgstr "NejvyÅ¡Å¡Ã umoÅ¾nÄ›nÃ¡ velikost souboru"
 
 #: admin/systems/services/virus/class_serviceAntiVirus.inc:108
 msgid "Maximum recursion"
@@ -331,18 +318,22 @@ msgstr "NejvyÅ¡Å¡Ã umoÅ¾nÄ›nÃ½ poÄet vnoÅ™enÃ½ch ÃºrovnÃ"
 msgid "Maximum compression ratio"
 msgstr "MaximÃ¡lnÃ kompresnÃ pomÄ›r"
 
+#: admin/systems/services/virus/class_serviceAntiVirus.inc:113
+msgid " "
+msgstr ""
+
 #: 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"
+msgstr ""
 
 #: personal/mail/class_mail-methods.inc:156
 #: personal/mail/class_mail-methods.inc:517
 msgid "Configuration error"
-msgstr "chyba v nastavenÃ"
+msgstr "Chyba v nastavenÃ"
 
 #: personal/mail/class_mail-methods.inc:157
 #, php-format
@@ -354,18 +345,18 @@ msgstr "NastavenÃ½ atribut zprÃ¡vy '%s' nenÃ podporovÃ¡n!"
 msgid "Mail method '%s' is unknown!"
 msgstr "NeznÃ¡mÃ½ systÃ©m sprÃ¡vy e-mailÅ¯ '%s'!"
 
-#: personal/mail/class_mail-methods.inc:727
-#: personal/mail/class_mail-methods.inc:728
+#: personal/mail/class_mail-methods.inc:735
+#: personal/mail/class_mail-methods.inc:736
 msgid "None"
 msgstr "Å¾Ã¡dnÃ©"
 
-#: personal/mail/class_mail-methods.inc:817
+#: personal/mail/class_mail-methods.inc:825
 msgid "Unknown"
 msgstr "neznÃ¡mÃ©"
 
-#: personal/mail/class_mail-methods.inc:819
+#: personal/mail/class_mail-methods.inc:827
 msgid "Unlimited"
-msgstr "neomezenÃ©"
+msgstr "NeomezenÃ©"
 
 #: personal/mail/class_mailAccount.inc:47
 #: personal/mail/class_mailAccount.inc:256
@@ -375,16 +366,16 @@ msgstr "neomezenÃ©"
 #: personal/mail/class_mailAccount.inc:355
 #: personal/mail/class_mailAccount.inc:359
 msgid "Mail error"
-msgstr "chyba e-mailu"
+msgstr "Chyba e-mailu"
 
 #: personal/mail/class_mailAccount.inc:47
 #, php-format
 msgid "Cannot read quota settings: %s"
-msgstr "nelze naÄÃst nastavenÃ kvÃ³ty: %s"
+msgstr "Nelze naÄÃst nastavenÃ kvÃ³ty: %s"
 
 #: personal/mail/class_mailAccount.inc:57
 msgid "Quota usage"
-msgstr "KvÃ³ta pouÅ¾ÃvÃ¡nÃ"
+msgstr "KvÃ³ta vyuÅ¾itÃ"
 
 #: personal/mail/class_mailAccount.inc:58
 msgid "Part of the quota which is used"
@@ -393,7 +384,7 @@ msgstr "ÄŒÃ¡st kvÃ³ty, kterÃ¡ je vyuÅ¾ita"
 #: personal/mail/class_mailAccount.inc:80
 #: config/mail/class_mailPluginConfig.inc:41
 msgid "Mail settings"
-msgstr "nastavenÃ e-mailu"
+msgstr "NastavenÃ e-mailu"
 
 #: personal/mail/class_mailAccount.inc:97
 msgid "Mail account"
@@ -405,11 +396,11 @@ msgstr "HlavnÃ e-mailovÃ¡ adresa"
 
 #: personal/mail/class_mailAccount.inc:104
 msgid "Specify the mail server where the user will be hosted on"
-msgstr "Zvolte poÅ¡tovnÃ server, na kterÃ©m bude uÅ¾ivatel mÃt svÅ¯j ÃºÄet."
+msgstr "Zadejte poÅ¡tovnÃ server, na kterÃ©m bude uÅ¾ivatel mÃt svÅ¯j ÃºÄet."
 
 #: personal/mail/class_mailAccount.inc:109
 msgid "Quota size"
-msgstr "kvÃ³ta objemu dat"
+msgstr "Velikost kvÃ³ty"
 
 #: personal/mail/class_mailAccount.inc:116
 msgid "Other addresses and redirections"
@@ -417,11 +408,11 @@ msgstr "OstatnÃ adresy a pÅ™esmÄ›rovÃ¡nÃ"
 
 #: personal/mail/class_mailAccount.inc:120
 msgid "List of alternative mail addresses"
-msgstr "seznam alternativnÃch e-mailovÃ½ch adres"
+msgstr "Seznam alternativnÃch e-mailovÃ½ch adres"
 
 #: personal/mail/class_mailAccount.inc:125
 msgid "Forward messages to"
-msgstr "pÅ™esmÄ›rovat zprÃ¡vy na"
+msgstr "PÅ™esmÄ›rovat zprÃ¡vy na"
 
 #: personal/mail/class_mailAccount.inc:125
 msgid "Addresses to which messages should be forwarded"
@@ -430,16 +421,16 @@ msgstr "Adresy, na kterÃ© by mÄ›ly bÃ½t pÅ™eposÃlÃ¡ny zprÃ¡vy"
 #: personal/mail/class_mailAccount.inc:131
 #: personal/mail/class_mailAccount.inc:150
 msgid "Vacation message"
-msgstr "zprÃ¡va â€žjsem na dovolenÃ©â€œ"
+msgstr "ZprÃ¡va â€žjsem na dovolenÃ©â€œ"
 
 #: personal/mail/class_mailAccount.inc:134
 msgid "Activate vacation message"
-msgstr "aktivovat zprÃ¡vu â€žjsem na dovolenÃ©â€œ"
+msgstr "Zapnout samoÄinnou odpovÄ›Ä â€žjsem na dovolenÃ©â€œ"
 
 #: personal/mail/class_mailAccount.inc:135
 msgid ""
 "Select to automatically response with the vacation message defined below"
-msgstr "zaÅ¡krtnÄ›te pro automatickÃ© odpovÃdÃ¡nÃ nÃÅ¾e uvedenou zprÃ¡vou â€žjsem na dovolenÃ©â€œ"
+msgstr "ZaÅ¡krtnÄ›te pro automatickÃ© odpovÃdÃ¡nÃ nÃÅ¾e uvedenou zprÃ¡vou â€žjsem na dovolenÃ©â€œ"
 
 #: personal/mail/class_mailAccount.inc:140
 msgid "from"
@@ -487,7 +478,7 @@ msgstr "NejniÅ¾Å¡Ã umoÅ¾nÄ›nÃ¡ velikost pro odmÃtnutÃ zprÃ¡vy (MB)"
 
 #: personal/mail/class_mailAccount.inc:195
 msgid "Advanced mail options"
-msgstr "pokroÄilÃ© volby e-mailu"
+msgstr "PokroÄilÃ© volby e-mailu"
 
 #: personal/mail/class_mailAccount.inc:198
 msgid "Use custom sieve script"
@@ -503,19 +494,19 @@ msgstr "PouÅ¾ijte svÅ¯j sieve skript s vlastnÃmi Ãºpravami"
 
 #: personal/mail/class_mailAccount.inc:204
 msgid "User is only allowed to send and receive local mails"
-msgstr "uÅ¾ivateli je dovoleno pÅ™ijÃmat a odesÃlat pouze mÃstnÃ poÅ¡tu"
+msgstr "UÅ¾ivateli je dovoleno pÅ™ijÃmat a odesÃlat pouze mÃstnÃ poÅ¡tu"
 
 #: personal/mail/class_mailAccount.inc:205
 msgid "Select if user can only send and receive inside his own domain"
-msgstr "zvolte, zda uÅ¾ivatel bude moci pÅ™ijÃmat a odesÃlat pouze v rÃ¡mci vlastnÃ domÃ©ny"
+msgstr "Vyberte, pokud uÅ¾ivatel mÃ¡ pÅ™ijÃmat a odesÃlat pouze v rÃ¡mci vlastnÃ domÃ©ny"
 
 #: personal/mail/class_mailAccount.inc:210
 msgid "No delivery to own mailbox"
-msgstr "nedoruÄovat do vlastnÃ schrÃ¡nky"
+msgstr "NedoruÄovat do vlastnÃ schrÃ¡nky"
 
 #: personal/mail/class_mailAccount.inc:211
 msgid "Select if you want to forward mails without getting own copies of them"
-msgstr "Zvolte, zda chcete pÅ™eposÃlat zprÃ¡vy bez toho, abyste si ponechÃ¡vali jejich kopie."
+msgstr "Vyberte, pokud chcete pÅ™eposÃlat zprÃ¡vy bez toho, abyste dostÃ¡vali vlastnÃ kopie"
 
 #: personal/mail/class_mailAccount.inc:256
 #, php-format
@@ -531,21 +522,21 @@ msgstr "E-mailovÃ¡ metodou se nelze pÅ™ipojit: %s"
 #: personal/mail/class_mailAccount.inc:263
 #, php-format
 msgid "Mailbox '%s' doesn't exists on mail server: %s"
-msgstr "SchrÃ¡nka '%s' neexistuje na poÅ¡tovnÃm serveru: %s"
+msgstr "SchrÃ¡nka %s neexistuje na poÅ¡tovnÃm serveru: %s"
 
 #: personal/mail/class_mailAccount.inc:355
 #, php-format
 msgid "Cannot update mailbox: %s"
-msgstr "NezdaÅ™ilo se aktualizovat schrÃ¡nku: %s"
+msgstr "Nelze aktualizovat schrÃ¡nku: %s"
 
 #: personal/mail/class_mailAccount.inc:359
 #, php-format
 msgid "Cannot write quota settings: %s"
-msgstr "NezdaÅ™ilo se zapsat nastavenÃ kvÃ³ty: %s"
+msgstr "Nelze zapsat nastavenÃ kvÃ³ty: %s"
 
 #: personal/mail/class_mailAccount.inc:372
 msgid "Mail error saving sieve settings"
-msgstr "nastavenÃ uklÃ¡dÃ¡nÃ zÃ¡znamÅ¯ o chybÃ¡ch zprÃ¡v v Sieve"
+msgstr "NastavenÃ uklÃ¡dÃ¡nÃ zÃ¡znamÅ¯ o chybÃ¡ch zprÃ¡v v Sieve"
 
 #: config/mail/class_mailPluginConfig.inc:29
 msgid "Mail plugin configuration"
@@ -564,7 +555,7 @@ msgstr "ZpÅ¯sob, kterÃ½ by mÄ›l bÃ½t pouÅ¾it pro komunikace s pÅ™ÃpadnÃ½m poÅ¡t
 
 #: config/mail/class_mailPluginConfig.inc:50
 msgid "Account identification attribute"
-msgstr "atribut, dle kterÃ©ho budou rozliÅ¡ovÃ¡ny ÃºÄty"
+msgstr "Atribut, dle kterÃ©ho budou rozliÅ¡ovÃ¡ny ÃºÄty"
 
 #: config/mail/class_mailPluginConfig.inc:51
 msgid "Which attribute will be used to create accounts."
@@ -633,4 +624,4 @@ msgstr "PÅ™edpona, kterou pÅ™idat pro sdÃlenÃ© poÅ¡tovnÃ sloÅ¾ky."
 
 #: config/mail/class_mailPluginConfig.inc:108
 msgid "Generic"
-msgstr "obecnÃ©"
+msgstr "ObecnÃ©"
diff --git a/mail/locale/de/fusiondirectory.po b/mail/locale/de/fusiondirectory.po
index c185f2c5d4e06f8a3339513d692310feb8bd6b99..00f9f47a1a72ba963541dccdf892bbb08feb1698 100644
--- a/mail/locale/de/fusiondirectory.po
+++ b/mail/locale/de/fusiondirectory.po
@@ -3,16 +3,15 @@
 # This file is distributed under the same license as the PACKAGE package.
 # 
 # Translators:
-# Maik Wagner <maikwagner@yahoo.com>, 2013
-#  Stefan Koehler <stefan.koehler@GONICUS.de>, 2005
+# Ettore Atalan <atalanttore@googlemail.com>, 2014
 msgid ""
 msgstr ""
-"Project-Id-Version: FusionDirectory-108\n"
+"Project-Id-Version: FusionDirectory-109\n"
 "Report-Msgid-Bugs-To: documentation@lists.fusiondirectory.org\n"
-"POT-Creation-Date: 2015-03-31 11:49+0200\n"
+"POT-Creation-Date: 2014-12-15 17:47+0100\n"
 "PO-Revision-Date: 2015-03-31 11:41+0000\n"
-"Last-Translator: fusiondirectory <contact@fusiondirectory.org>\n"
-"Language-Team: German (http://www.transifex.com/projects/p/FusionDirectory-108/language/de/)\n"
+"Last-Translator: Ettore Atalan <atalanttore@googlemail.com>\n"
+"Language-Team: German (http://www.transifex.com/projects/p/FusionDirectory-109/language/de/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -34,47 +33,37 @@ msgstr "Gruppenmailoptionen"
 msgid "Informations"
 msgstr "Informationen"
 
-#: admin/groups/mail/class_groupMail.inc:82
+#: admin/groups/mail/class_groupMail.inc:86
 #: personal/mail/class_mailAccount.inc:100
 msgid "Primary address"
 msgstr "PrimÃ¤re Adresse"
 
-#: admin/groups/mail/class_groupMail.inc:82
+#: admin/groups/mail/class_groupMail.inc:86
 msgid "The primary mail address"
 msgstr "Die primÃ¤re Mailadresse"
 
-#: admin/groups/mail/class_groupMail.inc:86
+#: admin/groups/mail/class_groupMail.inc:90
 #: personal/mail/class_mailAccount.inc:104
 msgid "Server"
 msgstr "Server"
 
-#: admin/groups/mail/class_groupMail.inc:86
+#: admin/groups/mail/class_groupMail.inc:90
 msgid "Server mail"
 msgstr "Server Mail"
 
-#: admin/groups/mail/class_groupMail.inc:92
+#: admin/groups/mail/class_groupMail.inc:96
 #: personal/mail/class_mailAccount.inc:120
 msgid "Alternative addresses"
 msgstr "Alternative Adressen"
 
-#: admin/groups/mail/class_groupMail.inc:92
+#: admin/groups/mail/class_groupMail.inc:96
 msgid "Alternative mail addresses for the group"
 msgstr "Alternative Mailadressen fÃ¼r die Gruppe"
 
-#: admin/groups/mail/class_groupMail.inc:97
+#: admin/groups/mail/class_groupMail.inc:101
 msgid "Forward messages to non group members"
 msgstr "Weiterleiten der Nachrichten an nicht-Gruppenmitglieder"
 
-#: admin/groups/mail/class_groupMail.inc:101
-msgid "Only allowed to receive local mail"
-msgstr ""
-
-#: admin/groups/mail/class_groupMail.inc:101
-msgid ""
-"Whether this group mail is only allowed to receive messages from local "
-"senders"
-msgstr ""
-
 #: admin/systems/services/postfix/class_servicePostfix.inc:29
 #: admin/systems/services/postfix/class_servicePostfix.inc:30
 msgid "Postfix (SMTP)"
@@ -225,9 +214,8 @@ msgid "Rules"
 msgstr "Regeln"
 
 #: admin/systems/services/spam/class_serviceSpamAssassin.inc:116
-#: admin/systems/services/spam/class_serviceSpamAssassin.inc:124
-msgid "Edit spam rule"
-msgstr "Spamregel bearbeiten"
+msgid "Edit spam ruleEdit spam rule"
+msgstr "Edit spam ruleEdit spam rule"
 
 #: admin/systems/services/spam/class_serviceSpamAssassin.inc:119
 msgid "Name"
@@ -237,6 +225,10 @@ msgstr "Name"
 msgid "Rule"
 msgstr "Regel"
 
+#: admin/systems/services/spam/class_serviceSpamAssassin.inc:124
+msgid "Edit spam rule"
+msgstr "Spamregel bearbeiten"
+
 #: admin/systems/services/virus/class_serviceAntiVirus.inc:31
 #: admin/systems/services/virus/class_serviceAntiVirus.inc:32
 msgid "Antivirus service"
@@ -282,10 +274,6 @@ msgstr "Maximale Anzahl von Threads"
 msgid "Max directory recursions"
 msgstr "Maximale Verzeichnis-Tiefe"
 
-#: admin/systems/services/virus/class_serviceAntiVirus.inc:68
-msgid "Maximum number of directory recursions"
-msgstr ""
-
 #: admin/systems/services/virus/class_serviceAntiVirus.inc:73
 msgid "Checks per day"
 msgstr "PrÃ¼fungen am Tag"
@@ -330,6 +318,10 @@ msgstr "Maximale Rekursionstiefe"
 msgid "Maximum compression ratio"
 msgstr "Maximales Kompressions-VerhÃ¤ltnis"
 
+#: admin/systems/services/virus/class_serviceAntiVirus.inc:113
+msgid " "
+msgstr " "
+
 #: admin/systems/services/imap/class_serviceIMAP.inc:32
 msgid "IMAP/POP3 generic service"
 msgstr "Generischer IMAP/POP3 Dienst"
@@ -353,16 +345,16 @@ msgstr "Das eingestellte Mail-Attribut '%s' wird nicht unterstÃ¼tzt!"
 msgid "Mail method '%s' is unknown!"
 msgstr "Mail-Methode '%s' ist unbekannt!"
 
-#: personal/mail/class_mail-methods.inc:727
-#: personal/mail/class_mail-methods.inc:728
+#: personal/mail/class_mail-methods.inc:735
+#: personal/mail/class_mail-methods.inc:736
 msgid "None"
 msgstr "Keine"
 
-#: personal/mail/class_mail-methods.inc:817
+#: personal/mail/class_mail-methods.inc:825
 msgid "Unknown"
 msgstr "Unbekannt"
 
-#: personal/mail/class_mail-methods.inc:819
+#: personal/mail/class_mail-methods.inc:827
 msgid "Unlimited"
 msgstr "Ohne BeschrÃ¤nkung"
 
diff --git a/mail/locale/el_GR/fusiondirectory.po b/mail/locale/el_GR/fusiondirectory.po
new file mode 100644
index 0000000000000000000000000000000000000000..5bb8b783767f09324b178b384920be05d525b698
--- /dev/null
+++ b/mail/locale/el_GR/fusiondirectory.po
@@ -0,0 +1,626 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR FusionDirectory Project
+# This file is distributed under the same license as the PACKAGE package.
+# 
+# Translators:
+msgid ""
+msgstr ""
+"Project-Id-Version: FusionDirectory-109\n"
+"Report-Msgid-Bugs-To: documentation@lists.fusiondirectory.org\n"
+"POT-Creation-Date: 2014-12-15 17:47+0100\n"
+"PO-Revision-Date: 2015-05-30 11:45+0000\n"
+"Last-Translator: Benoit Mortier <benoit.mortier@opensides.be>\n"
+"Language-Team: Greek (Greece) (http://www.transifex.com/projects/p/FusionDirectory-109/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/groups/mail/class_groupMail.inc:46
+#: personal/mail/class_mailAccount.inc:79
+#: 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:79
+#: admin/systems/services/postfix/class_servicePostfix.inc:44
+msgid "Informations"
+msgstr ""
+
+#: admin/groups/mail/class_groupMail.inc:86
+#: personal/mail/class_mailAccount.inc:100
+msgid "Primary address"
+msgstr ""
+
+#: admin/groups/mail/class_groupMail.inc:86
+msgid "The primary mail address"
+msgstr ""
+
+#: admin/groups/mail/class_groupMail.inc:90
+#: personal/mail/class_mailAccount.inc:104
+msgid "Server"
+msgstr ""
+
+#: admin/groups/mail/class_groupMail.inc:90
+msgid "Server mail"
+msgstr ""
+
+#: admin/groups/mail/class_groupMail.inc:96
+#: personal/mail/class_mailAccount.inc:120
+msgid "Alternative addresses"
+msgstr ""
+
+#: admin/groups/mail/class_groupMail.inc:96
+msgid "Alternative mail addresses for the group"
+msgstr ""
+
+#: admin/groups/mail/class_groupMail.inc:101
+msgid "Forward messages to non group members"
+msgstr ""
+
+#: admin/systems/services/postfix/class_servicePostfix.inc:29
+#: admin/systems/services/postfix/class_servicePostfix.inc:30
+msgid "Postfix (SMTP)"
+msgstr ""
+
+#: admin/systems/services/postfix/class_servicePostfix.inc:30
+#: admin/systems/services/spam/class_serviceSpamAssassin.inc:34
+#: admin/systems/services/virus/class_serviceAntiVirus.inc:32
+#: admin/systems/services/imap/class_serviceIMAP.inc:33
+msgid "Services"
+msgstr ""
+
+#: admin/systems/services/postfix/class_servicePostfix.inc:48
+msgid "Hostname"
+msgstr ""
+
+#: admin/systems/services/postfix/class_servicePostfix.inc:48
+msgid "The host name."
+msgstr ""
+
+#: admin/systems/services/postfix/class_servicePostfix.inc:53
+msgid "Domain"
+msgstr ""
+
+#: admin/systems/services/postfix/class_servicePostfix.inc:53
+msgid "The domain."
+msgstr ""
+
+#: admin/systems/services/postfix/class_servicePostfix.inc:58
+msgid "Max mail header size (KB)"
+msgstr ""
+
+#: admin/systems/services/postfix/class_servicePostfix.inc:58
+msgid "This value specifies the maximal header size."
+msgstr ""
+
+#: admin/systems/services/postfix/class_servicePostfix.inc:63
+msgid "Max mailbox size (KB)"
+msgstr ""
+
+#: admin/systems/services/postfix/class_servicePostfix.inc:63
+msgid "Defines the maximal size of mail box."
+msgstr ""
+
+#: admin/systems/services/postfix/class_servicePostfix.inc:68
+msgid "Max message size (KB)"
+msgstr ""
+
+#: admin/systems/services/postfix/class_servicePostfix.inc:68
+msgid "Specify the maximal size of a message."
+msgstr ""
+
+#: admin/systems/services/postfix/class_servicePostfix.inc:75
+msgid "Domains and routing"
+msgstr ""
+
+#: admin/systems/services/postfix/class_servicePostfix.inc:79
+msgid "Domains to accept mail for"
+msgstr ""
+
+#: admin/systems/services/postfix/class_servicePostfix.inc:79
+msgid "Postfix networks"
+msgstr ""
+
+#: admin/systems/services/postfix/class_servicePostfix.inc:84
+msgid "Transport table"
+msgstr ""
+
+#: admin/systems/services/postfix/class_servicePostfix.inc:89
+msgid "Transport rule"
+msgstr ""
+
+#: admin/systems/services/postfix/class_servicePostfix.inc:103
+msgid "Restrictions"
+msgstr ""
+
+#: admin/systems/services/postfix/class_servicePostfix.inc:107
+msgid "Restrictions for sender"
+msgstr ""
+
+#: admin/systems/services/postfix/class_servicePostfix.inc:116
+msgid "For sender"
+msgstr ""
+
+#: admin/systems/services/postfix/class_servicePostfix.inc:121
+msgid "Restrictions for recipient"
+msgstr ""
+
+#: admin/systems/services/postfix/class_servicePostfix.inc:130
+msgid "For recipient"
+msgstr ""
+
+#: admin/systems/services/spam/class_serviceSpamAssassin.inc:33
+#: admin/systems/services/spam/class_serviceSpamAssassin.inc:34
+msgid "Spamassassin service"
+msgstr ""
+
+#: admin/systems/services/spam/class_serviceSpamAssassin.inc:48
+msgid "Spam tagging"
+msgstr ""
+
+#: admin/systems/services/spam/class_serviceSpamAssassin.inc:52
+msgid "Rewrite header"
+msgstr ""
+
+#: admin/systems/services/spam/class_serviceSpamAssassin.inc:56
+msgid "Required score"
+msgstr ""
+
+#: admin/systems/services/spam/class_serviceSpamAssassin.inc:56
+msgid "Select required score to tag mail as spam"
+msgstr ""
+
+#: admin/systems/services/spam/class_serviceSpamAssassin.inc:62
+msgid "Trusted networks"
+msgstr ""
+
+#: admin/systems/services/spam/class_serviceSpamAssassin.inc:69
+msgid "Flags"
+msgstr ""
+
+#: admin/systems/services/spam/class_serviceSpamAssassin.inc:72
+msgid "Enable use of bayes filtering"
+msgstr ""
+
+#: admin/systems/services/spam/class_serviceSpamAssassin.inc:77
+msgid "Enable bayes auto learning"
+msgstr ""
+
+#: admin/systems/services/spam/class_serviceSpamAssassin.inc:82
+msgid "Enable RBL checks"
+msgstr ""
+
+#: admin/systems/services/spam/class_serviceSpamAssassin.inc:87
+msgid "Enable use of Razor"
+msgstr ""
+
+#: admin/systems/services/spam/class_serviceSpamAssassin.inc:92
+msgid "Enable use of DDC"
+msgstr ""
+
+#: admin/systems/services/spam/class_serviceSpamAssassin.inc:97
+msgid "Enable use of Pyzor"
+msgstr ""
+
+#: admin/systems/services/spam/class_serviceSpamAssassin.inc:112
+msgid "Rules"
+msgstr ""
+
+#: admin/systems/services/spam/class_serviceSpamAssassin.inc:116
+msgid "Edit spam ruleEdit spam rule"
+msgstr ""
+
+#: admin/systems/services/spam/class_serviceSpamAssassin.inc:119
+msgid "Name"
+msgstr ""
+
+#: admin/systems/services/spam/class_serviceSpamAssassin.inc:120
+msgid "Rule"
+msgstr ""
+
+#: admin/systems/services/spam/class_serviceSpamAssassin.inc:124
+msgid "Edit spam rule"
+msgstr ""
+
+#: admin/systems/services/virus/class_serviceAntiVirus.inc:31
+#: admin/systems/services/virus/class_serviceAntiVirus.inc:32
+msgid "Antivirus service"
+msgstr ""
+
+#: admin/systems/services/virus/class_serviceAntiVirus.inc:46
+msgid "Virus filtering"
+msgstr ""
+
+#: admin/systems/services/virus/class_serviceAntiVirus.inc:50
+msgid "Database user"
+msgstr ""
+
+#: admin/systems/services/virus/class_serviceAntiVirus.inc:50
+msgid "User name for the database"
+msgstr ""
+
+#: admin/systems/services/virus/class_serviceAntiVirus.inc:54
+msgid "Database mirror"
+msgstr ""
+
+#: admin/systems/services/virus/class_serviceAntiVirus.inc:54
+msgid "Mirror for the database"
+msgstr ""
+
+#: admin/systems/services/virus/class_serviceAntiVirus.inc:58
+msgid "Http proxy URL"
+msgstr ""
+
+#: admin/systems/services/virus/class_serviceAntiVirus.inc:58
+msgid "URL for the proxy"
+msgstr ""
+
+#: admin/systems/services/virus/class_serviceAntiVirus.inc:62
+msgid "Maximum threads"
+msgstr ""
+
+#: admin/systems/services/virus/class_serviceAntiVirus.inc:62
+msgid "Maximum number of threads"
+msgstr ""
+
+#: admin/systems/services/virus/class_serviceAntiVirus.inc:68
+msgid "Max directory recursions"
+msgstr ""
+
+#: admin/systems/services/virus/class_serviceAntiVirus.inc:73
+msgid "Checks per day"
+msgstr ""
+
+#: admin/systems/services/virus/class_serviceAntiVirus.inc:78
+msgid "Enable debugging"
+msgstr ""
+
+#: admin/systems/services/virus/class_serviceAntiVirus.inc:78
+msgid "Enable debugging for the antivirus"
+msgstr ""
+
+#: admin/systems/services/virus/class_serviceAntiVirus.inc:83
+msgid "Enable mail scanning"
+msgstr ""
+
+#: admin/systems/services/virus/class_serviceAntiVirus.inc:83
+msgid "Enable mail scanning for the antivirus"
+msgstr ""
+
+#: admin/systems/services/virus/class_serviceAntiVirus.inc:90
+msgid "Archive scanning"
+msgstr ""
+
+#: admin/systems/services/virus/class_serviceAntiVirus.inc:93
+msgid "Enable scanning of archives"
+msgstr ""
+
+#: admin/systems/services/virus/class_serviceAntiVirus.inc:98
+msgid "Block encrypted archives"
+msgstr ""
+
+#: admin/systems/services/virus/class_serviceAntiVirus.inc:103
+msgid "Maximum file size"
+msgstr ""
+
+#: admin/systems/services/virus/class_serviceAntiVirus.inc:108
+msgid "Maximum recursion"
+msgstr ""
+
+#: admin/systems/services/virus/class_serviceAntiVirus.inc:113
+msgid "Maximum compression ratio"
+msgstr ""
+
+#: admin/systems/services/virus/class_serviceAntiVirus.inc:113
+msgid " "
+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 ""
+
+#: personal/mail/class_mail-methods.inc:156
+#: personal/mail/class_mail-methods.inc:517
+msgid "Configuration error"
+msgstr ""
+
+#: personal/mail/class_mail-methods.inc:157
+#, php-format
+msgid "The configured mail attribute '%s' is unsupported!"
+msgstr ""
+
+#: personal/mail/class_mail-methods.inc:518
+#, php-format
+msgid "Mail method '%s' is unknown!"
+msgstr ""
+
+#: personal/mail/class_mail-methods.inc:735
+#: personal/mail/class_mail-methods.inc:736
+msgid "None"
+msgstr ""
+
+#: personal/mail/class_mail-methods.inc:825
+msgid "Unknown"
+msgstr ""
+
+#: personal/mail/class_mail-methods.inc:827
+msgid "Unlimited"
+msgstr ""
+
+#: personal/mail/class_mailAccount.inc:47
+#: personal/mail/class_mailAccount.inc:256
+#: personal/mail/class_mailAccount.inc:260
+#: personal/mail/class_mailAccount.inc:263
+#: personal/mail/class_mailAccount.inc:351
+#: personal/mail/class_mailAccount.inc:355
+#: personal/mail/class_mailAccount.inc:359
+msgid "Mail error"
+msgstr ""
+
+#: personal/mail/class_mailAccount.inc:47
+#, php-format
+msgid "Cannot read quota settings: %s"
+msgstr ""
+
+#: personal/mail/class_mailAccount.inc:57
+msgid "Quota usage"
+msgstr ""
+
+#: personal/mail/class_mailAccount.inc:58
+msgid "Part of the quota which is used"
+msgstr ""
+
+#: personal/mail/class_mailAccount.inc:80
+#: config/mail/class_mailPluginConfig.inc:41
+msgid "Mail settings"
+msgstr ""
+
+#: personal/mail/class_mailAccount.inc:97
+msgid "Mail account"
+msgstr ""
+
+#: personal/mail/class_mailAccount.inc:100
+msgid "Primary mail address"
+msgstr ""
+
+#: personal/mail/class_mailAccount.inc:104
+msgid "Specify the mail server where the user will be hosted on"
+msgstr ""
+
+#: personal/mail/class_mailAccount.inc:109
+msgid "Quota size"
+msgstr ""
+
+#: personal/mail/class_mailAccount.inc:116
+msgid "Other addresses and redirections"
+msgstr ""
+
+#: personal/mail/class_mailAccount.inc:120
+msgid "List of alternative mail addresses"
+msgstr ""
+
+#: personal/mail/class_mailAccount.inc:125
+msgid "Forward messages to"
+msgstr ""
+
+#: personal/mail/class_mailAccount.inc:125
+msgid "Addresses to which messages should be forwarded"
+msgstr ""
+
+#: personal/mail/class_mailAccount.inc:131
+#: personal/mail/class_mailAccount.inc:150
+msgid "Vacation message"
+msgstr ""
+
+#: personal/mail/class_mailAccount.inc:134
+msgid "Activate vacation message"
+msgstr ""
+
+#: personal/mail/class_mailAccount.inc:135
+msgid ""
+"Select to automatically response with the vacation message defined below"
+msgstr ""
+
+#: personal/mail/class_mailAccount.inc:140
+msgid "from"
+msgstr ""
+
+#: personal/mail/class_mailAccount.inc:145
+msgid "till"
+msgstr ""
+
+#: personal/mail/class_mailAccount.inc:156
+msgid "Spam options"
+msgstr ""
+
+#: personal/mail/class_mailAccount.inc:159
+msgid "Move mails depending on spam level"
+msgstr ""
+
+#: personal/mail/class_mailAccount.inc:164
+msgid "Minimum spam level"
+msgstr ""
+
+#: personal/mail/class_mailAccount.inc:164
+msgid "Spam level above which a mail will be moved"
+msgstr ""
+
+#: personal/mail/class_mailAccount.inc:169
+msgid "Move spam to folder"
+msgstr ""
+
+#: personal/mail/class_mailAccount.inc:169
+msgid "Folder in which spam will be moved"
+msgstr ""
+
+#: personal/mail/class_mailAccount.inc:174
+msgid "Reject mail depending on their size"
+msgstr ""
+
+#: personal/mail/class_mailAccount.inc:174
+msgid "Messages bigger than the chosen size will be rejected"
+msgstr ""
+
+#: personal/mail/class_mailAccount.inc:179
+msgid "Minimum size to reject a mail (MB)"
+msgstr ""
+
+#: personal/mail/class_mailAccount.inc:195
+msgid "Advanced mail options"
+msgstr ""
+
+#: personal/mail/class_mailAccount.inc:198
+msgid "Use custom sieve script"
+msgstr ""
+
+#: personal/mail/class_mailAccount.inc:198
+msgid "disables all Mail options!"
+msgstr ""
+
+#: personal/mail/class_mailAccount.inc:199
+msgid "Use your sieve script with personnal customization"
+msgstr ""
+
+#: personal/mail/class_mailAccount.inc:204
+msgid "User is only allowed to send and receive local mails"
+msgstr ""
+
+#: personal/mail/class_mailAccount.inc:205
+msgid "Select if user can only send and receive inside his own domain"
+msgstr ""
+
+#: personal/mail/class_mailAccount.inc:210
+msgid "No delivery to own mailbox"
+msgstr ""
+
+#: personal/mail/class_mailAccount.inc:211
+msgid "Select if you want to forward mails without getting own copies of them"
+msgstr ""
+
+#: personal/mail/class_mailAccount.inc:256
+#, php-format
+msgid "Cannot get list of mailboxes: %s"
+msgstr ""
+
+#: personal/mail/class_mailAccount.inc:260
+#: personal/mail/class_mailAccount.inc:351
+#, php-format
+msgid "Mail method cannot connect: %s"
+msgstr ""
+
+#: personal/mail/class_mailAccount.inc:263
+#, php-format
+msgid "Mailbox '%s' doesn't exists on mail server: %s"
+msgstr ""
+
+#: personal/mail/class_mailAccount.inc:355
+#, php-format
+msgid "Cannot update mailbox: %s"
+msgstr ""
+
+#: personal/mail/class_mailAccount.inc:359
+#, php-format
+msgid "Cannot write quota settings: %s"
+msgstr ""
+
+#: personal/mail/class_mailAccount.inc:372
+msgid "Mail error saving sieve settings"
+msgstr ""
+
+#: config/mail/class_mailPluginConfig.inc:29
+msgid "Mail plugin configuration"
+msgstr ""
+
+#: config/mail/class_mailPluginConfig.inc:44
+msgid "Mail method"
+msgstr ""
+
+#: config/mail/class_mailPluginConfig.inc:45
+msgid ""
+"Mail method the setup should use to communicate with a possible mail server."
+" Leave this undefined if your mail method does not match the predefined "
+"ones."
+msgstr ""
+
+#: config/mail/class_mailPluginConfig.inc:50
+msgid "Account identification attribute"
+msgstr ""
+
+#: config/mail/class_mailPluginConfig.inc:51
+msgid "Which attribute will be used to create accounts."
+msgstr ""
+
+#: config/mail/class_mailPluginConfig.inc:56
+msgid "Mail user template"
+msgstr ""
+
+#: config/mail/class_mailPluginConfig.inc:57
+msgid "Override the user account creation syntax."
+msgstr ""
+
+#: config/mail/class_mailPluginConfig.inc:61
+msgid "Mail folder template"
+msgstr ""
+
+#: config/mail/class_mailPluginConfig.inc:62
+msgid "Override the methods default account creation syntax."
+msgstr ""
+
+#: config/mail/class_mailPluginConfig.inc:66
+msgid "Use cyrus UNIX style"
+msgstr ""
+
+#: config/mail/class_mailPluginConfig.inc:67
+msgid ""
+"Determines if 'foo/bar' or 'foo.bar' should be uses as namespaces in IMAP."
+msgstr ""
+
+#: config/mail/class_mailPluginConfig.inc:71
+msgid "Delete mailbox on account deletion"
+msgstr ""
+
+#: config/mail/class_mailPluginConfig.inc:72
+msgid ""
+"Determines if the mailbox should be removed from your IMAP server after the "
+"account is deleted in LDAP."
+msgstr ""
+
+#: config/mail/class_mailPluginConfig.inc:77
+msgid "Cyrus autocreate folders"
+msgstr ""
+
+#: config/mail/class_mailPluginConfig.inc:78
+msgid ""
+"List of personal IMAP folders that should be created along initial account "
+"creation."
+msgstr ""
+
+#: config/mail/class_mailPluginConfig.inc:83
+msgid "IMAP timeout"
+msgstr ""
+
+#: config/mail/class_mailPluginConfig.inc:84
+msgid "Sets the connection timeout for imap actions."
+msgstr ""
+
+#: config/mail/class_mailPluginConfig.inc:89
+msgid "Shared prefix"
+msgstr ""
+
+#: config/mail/class_mailPluginConfig.inc:90
+msgid "Prefix to add for mail shared folders."
+msgstr ""
+
+#: config/mail/class_mailPluginConfig.inc:108
+msgid "Generic"
+msgstr ""
diff --git a/mail/locale/en/fusiondirectory.po b/mail/locale/en/fusiondirectory.po
index 0763941b7b41a4f0a383ec3c0f6da9a55af409c7..c48929101a22a10f3c76ba7500fa7b306526be7e 100644
--- a/mail/locale/en/fusiondirectory.po
+++ b/mail/locale/en/fusiondirectory.po
@@ -6,13 +6,13 @@
 #, fuzzy
 msgid ""
 msgstr ""
-"Project-Id-Version: PACKAGE VERSION\n"
-"Report-Msgid-Bugs-To: documentation@lists.fusiondirectory.org\n"
-"POT-Creation-Date: 2015-03-31 11:49+0200\n"
+"Project-Id-Version: FusionDirectory VERSION\n"
+"Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
+"POT-Creation-Date: 2015-05-30 15:30+0200\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
-"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
-"Language-Team: LANGUAGE <LL@li.org>\n"
-"Language: \n"
+"Last-Translator: FusionDirectory project <contact@fusiondirectory.org>\n"
+"Language-Team: English\n"
+"Language: en\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -211,7 +211,7 @@ msgid "Enable use of Razor"
 msgstr ""
 
 #: admin/systems/services/spam/class_serviceSpamAssassin.inc:92
-msgid "Enable use of DDC"
+msgid "Enable use of DCC"
 msgstr ""
 
 #: admin/systems/services/spam/class_serviceSpamAssassin.inc:97
diff --git a/mail/locale/es/fusiondirectory.po b/mail/locale/es/fusiondirectory.po
index f0da20d575aa614392503da33c89646e3f041cc0..2c773abf793abf46555ff6c741a9eda2dc03c50c 100644
--- a/mail/locale/es/fusiondirectory.po
+++ b/mail/locale/es/fusiondirectory.po
@@ -5,12 +5,12 @@
 # Translators:
 msgid ""
 msgstr ""
-"Project-Id-Version: FusionDirectory-108\n"
+"Project-Id-Version: FusionDirectory-109\n"
 "Report-Msgid-Bugs-To: documentation@lists.fusiondirectory.org\n"
-"POT-Creation-Date: 2015-03-31 11:49+0200\n"
+"POT-Creation-Date: 2014-12-15 17:47+0100\n"
 "PO-Revision-Date: 2015-03-31 11:41+0000\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>\n"
-"Language-Team: Spanish (http://www.transifex.com/projects/p/FusionDirectory-108/language/es/)\n"
+"Language-Team: Spanish (http://www.transifex.com/projects/p/FusionDirectory-109/language/es/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -32,47 +32,37 @@ msgstr ""
 msgid "Informations"
 msgstr ""
 
-#: admin/groups/mail/class_groupMail.inc:82
+#: admin/groups/mail/class_groupMail.inc:86
 #: personal/mail/class_mailAccount.inc:100
 msgid "Primary address"
 msgstr "Cuenta Principal"
 
-#: admin/groups/mail/class_groupMail.inc:82
+#: admin/groups/mail/class_groupMail.inc:86
 msgid "The primary mail address"
 msgstr ""
 
-#: admin/groups/mail/class_groupMail.inc:86
+#: admin/groups/mail/class_groupMail.inc:90
 #: personal/mail/class_mailAccount.inc:104
 msgid "Server"
 msgstr "Servidor"
 
-#: admin/groups/mail/class_groupMail.inc:86
+#: admin/groups/mail/class_groupMail.inc:90
 msgid "Server mail"
 msgstr ""
 
-#: admin/groups/mail/class_groupMail.inc:92
+#: admin/groups/mail/class_groupMail.inc:96
 #: personal/mail/class_mailAccount.inc:120
 msgid "Alternative addresses"
 msgstr "Direcciones alternativas"
 
-#: admin/groups/mail/class_groupMail.inc:92
+#: admin/groups/mail/class_groupMail.inc:96
 msgid "Alternative mail addresses for the group"
 msgstr ""
 
-#: admin/groups/mail/class_groupMail.inc:97
+#: admin/groups/mail/class_groupMail.inc:101
 msgid "Forward messages to non group members"
 msgstr "Reenviar mensajes a miembros que no sean del grupo"
 
-#: admin/groups/mail/class_groupMail.inc:101
-msgid "Only allowed to receive local mail"
-msgstr ""
-
-#: admin/groups/mail/class_groupMail.inc:101
-msgid ""
-"Whether this group mail is only allowed to receive messages from local "
-"senders"
-msgstr ""
-
 #: admin/systems/services/postfix/class_servicePostfix.inc:29
 #: admin/systems/services/postfix/class_servicePostfix.inc:30
 msgid "Postfix (SMTP)"
@@ -223,8 +213,7 @@ msgid "Rules"
 msgstr "Reglas"
 
 #: admin/systems/services/spam/class_serviceSpamAssassin.inc:116
-#: admin/systems/services/spam/class_serviceSpamAssassin.inc:124
-msgid "Edit spam rule"
+msgid "Edit spam ruleEdit spam rule"
 msgstr ""
 
 #: admin/systems/services/spam/class_serviceSpamAssassin.inc:119
@@ -235,6 +224,10 @@ msgstr "Nombre"
 msgid "Rule"
 msgstr "Papel desempeÃ±ado"
 
+#: admin/systems/services/spam/class_serviceSpamAssassin.inc:124
+msgid "Edit spam rule"
+msgstr ""
+
 #: admin/systems/services/virus/class_serviceAntiVirus.inc:31
 #: admin/systems/services/virus/class_serviceAntiVirus.inc:32
 msgid "Antivirus service"
@@ -280,10 +273,6 @@ msgstr ""
 msgid "Max directory recursions"
 msgstr "Nivel mÃ¡ximo de descenso recursivo en directorios"
 
-#: admin/systems/services/virus/class_serviceAntiVirus.inc:68
-msgid "Maximum number of directory recursions"
-msgstr ""
-
 #: admin/systems/services/virus/class_serviceAntiVirus.inc:73
 msgid "Checks per day"
 msgstr "Comprobaciones por dÃa"
@@ -328,6 +317,10 @@ msgstr "Descenso recursivo mÃ¡ximo"
 msgid "Maximum compression ratio"
 msgstr "RelaciÃ³n de compresiÃ³n mÃ¡xima"
 
+#: admin/systems/services/virus/class_serviceAntiVirus.inc:113
+msgid " "
+msgstr ""
+
 #: admin/systems/services/imap/class_serviceIMAP.inc:32
 msgid "IMAP/POP3 generic service"
 msgstr ""
@@ -351,16 +344,16 @@ msgstr "Â¡El atributo '%s' configurado en el correo no esta soportado!"
 msgid "Mail method '%s' is unknown!"
 msgstr "Â¡El mÃ©todo de correo '%s' es desconocido!"
 
-#: personal/mail/class_mail-methods.inc:727
-#: personal/mail/class_mail-methods.inc:728
+#: personal/mail/class_mail-methods.inc:735
+#: personal/mail/class_mail-methods.inc:736
 msgid "None"
 msgstr "Ninguno"
 
-#: personal/mail/class_mail-methods.inc:817
+#: personal/mail/class_mail-methods.inc:825
 msgid "Unknown"
 msgstr "Desconocido"
 
-#: personal/mail/class_mail-methods.inc:819
+#: personal/mail/class_mail-methods.inc:827
 msgid "Unlimited"
 msgstr "Sin limite"
 
@@ -406,7 +399,7 @@ msgstr "Especificar el servidor de correo donde el usuario estarÃ¡ hospedado."
 
 #: personal/mail/class_mailAccount.inc:109
 msgid "Quota size"
-msgstr "TamaÃ±o de cuota"
+msgstr "TamaÃ±o de la cuota"
 
 #: personal/mail/class_mailAccount.inc:116
 msgid "Other addresses and redirections"
diff --git a/mail/locale/es_VE/fusiondirectory.po b/mail/locale/es_VE/fusiondirectory.po
index a4733b7607d7c2aeca66f086325724b68b88ecb0..265371776564d656af6fa518bdd9c955963690fd 100644
--- a/mail/locale/es_VE/fusiondirectory.po
+++ b/mail/locale/es_VE/fusiondirectory.po
@@ -3,16 +3,14 @@
 # This file is distributed under the same license as the PACKAGE package.
 # 
 # Translators:
-# lars_g <lars.gold@gmail.com>, 2012
-# lars_g <lars.gold@gmail.com>, 2012
 msgid ""
 msgstr ""
-"Project-Id-Version: FusionDirectory-108\n"
+"Project-Id-Version: FusionDirectory-109\n"
 "Report-Msgid-Bugs-To: documentation@lists.fusiondirectory.org\n"
-"POT-Creation-Date: 2015-03-31 11:49+0200\n"
+"POT-Creation-Date: 2014-12-15 17:47+0100\n"
 "PO-Revision-Date: 2015-03-31 11:41+0000\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>\n"
-"Language-Team: Spanish (Venezuela) (http://www.transifex.com/projects/p/FusionDirectory-108/language/es_VE/)\n"
+"Language-Team: Spanish (Venezuela) (http://www.transifex.com/projects/p/FusionDirectory-109/language/es_VE/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -34,47 +32,37 @@ msgstr ""
 msgid "Informations"
 msgstr ""
 
-#: admin/groups/mail/class_groupMail.inc:82
+#: admin/groups/mail/class_groupMail.inc:86
 #: personal/mail/class_mailAccount.inc:100
 msgid "Primary address"
 msgstr "Cuenta Principal"
 
-#: admin/groups/mail/class_groupMail.inc:82
+#: admin/groups/mail/class_groupMail.inc:86
 msgid "The primary mail address"
 msgstr ""
 
-#: admin/groups/mail/class_groupMail.inc:86
+#: admin/groups/mail/class_groupMail.inc:90
 #: personal/mail/class_mailAccount.inc:104
 msgid "Server"
 msgstr "Servidor"
 
-#: admin/groups/mail/class_groupMail.inc:86
+#: admin/groups/mail/class_groupMail.inc:90
 msgid "Server mail"
 msgstr ""
 
-#: admin/groups/mail/class_groupMail.inc:92
+#: admin/groups/mail/class_groupMail.inc:96
 #: personal/mail/class_mailAccount.inc:120
 msgid "Alternative addresses"
 msgstr "Direcciones alternativas"
 
-#: admin/groups/mail/class_groupMail.inc:92
+#: admin/groups/mail/class_groupMail.inc:96
 msgid "Alternative mail addresses for the group"
 msgstr ""
 
-#: admin/groups/mail/class_groupMail.inc:97
+#: admin/groups/mail/class_groupMail.inc:101
 msgid "Forward messages to non group members"
 msgstr "Reenviar mensajes a miembros que no sean del grupo"
 
-#: admin/groups/mail/class_groupMail.inc:101
-msgid "Only allowed to receive local mail"
-msgstr ""
-
-#: admin/groups/mail/class_groupMail.inc:101
-msgid ""
-"Whether this group mail is only allowed to receive messages from local "
-"senders"
-msgstr ""
-
 #: admin/systems/services/postfix/class_servicePostfix.inc:29
 #: admin/systems/services/postfix/class_servicePostfix.inc:30
 msgid "Postfix (SMTP)"
@@ -225,8 +213,7 @@ msgid "Rules"
 msgstr "Reglas"
 
 #: admin/systems/services/spam/class_serviceSpamAssassin.inc:116
-#: admin/systems/services/spam/class_serviceSpamAssassin.inc:124
-msgid "Edit spam rule"
+msgid "Edit spam ruleEdit spam rule"
 msgstr ""
 
 #: admin/systems/services/spam/class_serviceSpamAssassin.inc:119
@@ -237,6 +224,10 @@ msgstr "Nombre"
 msgid "Rule"
 msgstr "Papel desempeÃ±ado"
 
+#: admin/systems/services/spam/class_serviceSpamAssassin.inc:124
+msgid "Edit spam rule"
+msgstr ""
+
 #: admin/systems/services/virus/class_serviceAntiVirus.inc:31
 #: admin/systems/services/virus/class_serviceAntiVirus.inc:32
 msgid "Antivirus service"
@@ -282,10 +273,6 @@ msgstr ""
 msgid "Max directory recursions"
 msgstr "Nivel mÃ¡ximo de descenso recursivo en directorios"
 
-#: admin/systems/services/virus/class_serviceAntiVirus.inc:68
-msgid "Maximum number of directory recursions"
-msgstr ""
-
 #: admin/systems/services/virus/class_serviceAntiVirus.inc:73
 msgid "Checks per day"
 msgstr "Comprobaciones por dÃa"
@@ -330,6 +317,10 @@ msgstr "Descenso recursivo mÃ¡ximo"
 msgid "Maximum compression ratio"
 msgstr "RelaciÃ³n de compresiÃ³n mÃ¡xima"
 
+#: admin/systems/services/virus/class_serviceAntiVirus.inc:113
+msgid " "
+msgstr ""
+
 #: admin/systems/services/imap/class_serviceIMAP.inc:32
 msgid "IMAP/POP3 generic service"
 msgstr ""
@@ -353,16 +344,16 @@ msgstr "Â¡El atributo '%s' configurado en el correo no esta soportado!"
 msgid "Mail method '%s' is unknown!"
 msgstr "Â¡El mÃ©todo de correo '%s' es desconocido!"
 
-#: personal/mail/class_mail-methods.inc:727
-#: personal/mail/class_mail-methods.inc:728
+#: personal/mail/class_mail-methods.inc:735
+#: personal/mail/class_mail-methods.inc:736
 msgid "None"
 msgstr "Ninguno"
 
-#: personal/mail/class_mail-methods.inc:817
+#: personal/mail/class_mail-methods.inc:825
 msgid "Unknown"
 msgstr "Desconocido"
 
-#: personal/mail/class_mail-methods.inc:819
+#: personal/mail/class_mail-methods.inc:827
 msgid "Unlimited"
 msgstr "Sin limite"
 
diff --git a/mail/locale/fa_IR/fusiondirectory.po b/mail/locale/fa_IR/fusiondirectory.po
index fd0be9970b7b6bc3da6a79d42a2e33f81432a3a5..4eaaffdba558b45f2e20bbdea9152df52cae6d11 100644
--- a/mail/locale/fa_IR/fusiondirectory.po
+++ b/mail/locale/fa_IR/fusiondirectory.po
@@ -5,12 +5,12 @@
 # Translators:
 msgid ""
 msgstr ""
-"Project-Id-Version: FusionDirectory-108\n"
+"Project-Id-Version: FusionDirectory-109\n"
 "Report-Msgid-Bugs-To: documentation@lists.fusiondirectory.org\n"
-"POT-Creation-Date: 2015-03-31 11:49+0200\n"
-"PO-Revision-Date: 2015-03-17 17:56+0000\n"
+"POT-Creation-Date: 2014-12-15 17:47+0100\n"
+"PO-Revision-Date: 2014-12-15 16:59+0000\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>\n"
-"Language-Team: Persian (Iran) (http://www.transifex.com/projects/p/FusionDirectory-108/language/fa_IR/)\n"
+"Language-Team: Persian (Iran) (http://www.transifex.com/projects/p/FusionDirectory-109/language/fa_IR/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -32,45 +32,35 @@ msgstr ""
 msgid "Informations"
 msgstr ""
 
-#: admin/groups/mail/class_groupMail.inc:82
+#: admin/groups/mail/class_groupMail.inc:86
 #: personal/mail/class_mailAccount.inc:100
 msgid "Primary address"
 msgstr ""
 
-#: admin/groups/mail/class_groupMail.inc:82
+#: admin/groups/mail/class_groupMail.inc:86
 msgid "The primary mail address"
 msgstr ""
 
-#: admin/groups/mail/class_groupMail.inc:86
+#: admin/groups/mail/class_groupMail.inc:90
 #: personal/mail/class_mailAccount.inc:104
 msgid "Server"
 msgstr ""
 
-#: admin/groups/mail/class_groupMail.inc:86
+#: admin/groups/mail/class_groupMail.inc:90
 msgid "Server mail"
 msgstr ""
 
-#: admin/groups/mail/class_groupMail.inc:92
+#: admin/groups/mail/class_groupMail.inc:96
 #: personal/mail/class_mailAccount.inc:120
 msgid "Alternative addresses"
 msgstr ""
 
-#: admin/groups/mail/class_groupMail.inc:92
+#: admin/groups/mail/class_groupMail.inc:96
 msgid "Alternative mail addresses for the group"
 msgstr ""
 
-#: admin/groups/mail/class_groupMail.inc:97
-msgid "Forward messages to non group members"
-msgstr ""
-
-#: admin/groups/mail/class_groupMail.inc:101
-msgid "Only allowed to receive local mail"
-msgstr ""
-
 #: admin/groups/mail/class_groupMail.inc:101
-msgid ""
-"Whether this group mail is only allowed to receive messages from local "
-"senders"
+msgid "Forward messages to non group members"
 msgstr ""
 
 #: admin/systems/services/postfix/class_servicePostfix.inc:29
@@ -223,8 +213,7 @@ msgid "Rules"
 msgstr ""
 
 #: admin/systems/services/spam/class_serviceSpamAssassin.inc:116
-#: admin/systems/services/spam/class_serviceSpamAssassin.inc:124
-msgid "Edit spam rule"
+msgid "Edit spam ruleEdit spam rule"
 msgstr ""
 
 #: admin/systems/services/spam/class_serviceSpamAssassin.inc:119
@@ -235,6 +224,10 @@ msgstr ""
 msgid "Rule"
 msgstr ""
 
+#: admin/systems/services/spam/class_serviceSpamAssassin.inc:124
+msgid "Edit spam rule"
+msgstr ""
+
 #: admin/systems/services/virus/class_serviceAntiVirus.inc:31
 #: admin/systems/services/virus/class_serviceAntiVirus.inc:32
 msgid "Antivirus service"
@@ -280,10 +273,6 @@ msgstr ""
 msgid "Max directory recursions"
 msgstr ""
 
-#: admin/systems/services/virus/class_serviceAntiVirus.inc:68
-msgid "Maximum number of directory recursions"
-msgstr ""
-
 #: admin/systems/services/virus/class_serviceAntiVirus.inc:73
 msgid "Checks per day"
 msgstr ""
@@ -328,6 +317,10 @@ msgstr ""
 msgid "Maximum compression ratio"
 msgstr ""
 
+#: admin/systems/services/virus/class_serviceAntiVirus.inc:113
+msgid " "
+msgstr ""
+
 #: admin/systems/services/imap/class_serviceIMAP.inc:32
 msgid "IMAP/POP3 generic service"
 msgstr ""
@@ -351,16 +344,16 @@ msgstr ""
 msgid "Mail method '%s' is unknown!"
 msgstr ""
 
-#: personal/mail/class_mail-methods.inc:727
-#: personal/mail/class_mail-methods.inc:728
+#: personal/mail/class_mail-methods.inc:735
+#: personal/mail/class_mail-methods.inc:736
 msgid "None"
 msgstr ""
 
-#: personal/mail/class_mail-methods.inc:817
+#: personal/mail/class_mail-methods.inc:825
 msgid "Unknown"
 msgstr ""
 
-#: personal/mail/class_mail-methods.inc:819
+#: personal/mail/class_mail-methods.inc:827
 msgid "Unlimited"
 msgstr ""
 
diff --git a/mail/locale/fr/fusiondirectory.po b/mail/locale/fr/fusiondirectory.po
index b5e105beeb1137afff2420358762459196fa6efb..017dca6481e0f45a51eee0b6bd6281843bc26161 100644
--- a/mail/locale/fr/fusiondirectory.po
+++ b/mail/locale/fr/fusiondirectory.po
@@ -3,24 +3,14 @@
 # This file is distributed under the same license as the PACKAGE package.
 # 
 # Translators:
-# Benoit Mortier <benoit.mortier@opensides.be>, 2005-2011
-# Benoit Mortier <benoit.mortier@opensides.be>, 2015
-# MCMic, 2014
-# fusiondirectory <contact@fusiondirectory.org>, 2013-2014
-# fusiondirectory <contact@fusiondirectory.org>, 2012
-# fusiondirectory <contact@fusiondirectory.org>, 2012-2013
-# fusiondirectory <contact@fusiondirectory.org>, 2012
-# poterealpopolo <giuliano@opensides.be>, 2013
-# MCMic, 2014
-# poterealpopolo <giuliano@opensides.be>, 2013
 msgid ""
 msgstr ""
-"Project-Id-Version: FusionDirectory-108\n"
+"Project-Id-Version: FusionDirectory-109\n"
 "Report-Msgid-Bugs-To: documentation@lists.fusiondirectory.org\n"
-"POT-Creation-Date: 2015-03-31 11:49+0200\n"
+"POT-Creation-Date: 2014-12-15 17:47+0100\n"
 "PO-Revision-Date: 2015-03-31 11:31+0000\n"
-"Last-Translator: Benoit Mortier <benoit.mortier@opensides.be>\n"
-"Language-Team: French (http://www.transifex.com/projects/p/FusionDirectory-108/language/fr/)\n"
+"Last-Translator: fusiondirectory <contact@fusiondirectory.org>\n"
+"Language-Team: French (http://www.transifex.com/projects/p/FusionDirectory-109/language/fr/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -31,57 +21,47 @@ msgstr ""
 #: personal/mail/class_mailAccount.inc:79
 #: config/mail/class_mailPluginConfig.inc:28
 msgid "Mail"
-msgstr "Courriel"
+msgstr "Messagerie"
 
 #: admin/groups/mail/class_groupMail.inc:47
 msgid "Group mail options"
-msgstr "Options de courriel du groupe"
+msgstr "Options de messagerie de groupe"
 
 #: admin/groups/mail/class_groupMail.inc:79
 #: admin/systems/services/postfix/class_servicePostfix.inc:44
 msgid "Informations"
 msgstr "Informations"
 
-#: admin/groups/mail/class_groupMail.inc:82
+#: admin/groups/mail/class_groupMail.inc:86
 #: personal/mail/class_mailAccount.inc:100
 msgid "Primary address"
 msgstr "Adresse principale"
 
-#: admin/groups/mail/class_groupMail.inc:82
+#: admin/groups/mail/class_groupMail.inc:86
 msgid "The primary mail address"
-msgstr "Adresse de courriel principale"
+msgstr "Adresse principale"
 
-#: admin/groups/mail/class_groupMail.inc:86
+#: admin/groups/mail/class_groupMail.inc:90
 #: personal/mail/class_mailAccount.inc:104
 msgid "Server"
 msgstr "Serveur"
 
-#: admin/groups/mail/class_groupMail.inc:86
+#: admin/groups/mail/class_groupMail.inc:90
 msgid "Server mail"
-msgstr "Serveur de courriel"
+msgstr "Serveur de mail"
 
-#: admin/groups/mail/class_groupMail.inc:92
+#: admin/groups/mail/class_groupMail.inc:96
 #: personal/mail/class_mailAccount.inc:120
 msgid "Alternative addresses"
 msgstr "Adresses alternatives"
 
-#: admin/groups/mail/class_groupMail.inc:92
+#: admin/groups/mail/class_groupMail.inc:96
 msgid "Alternative mail addresses for the group"
-msgstr "Adresses de courriel alternatives pour le groupe"
-
-#: admin/groups/mail/class_groupMail.inc:97
-msgid "Forward messages to non group members"
-msgstr "TransfÃ©rer les messages vers des membres n'appartenant pas au groupe"
+msgstr "Adresse alternative pour le groupe"
 
 #: admin/groups/mail/class_groupMail.inc:101
-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:101
-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"
+msgid "Forward messages to non group members"
+msgstr "TransfÃ©rer les messages vers un membre n'appartenant pas au groupe"
 
 #: admin/systems/services/postfix/class_servicePostfix.inc:29
 #: admin/systems/services/postfix/class_servicePostfix.inc:30
@@ -93,15 +73,15 @@ msgstr "Postfix (SMTP)"
 #: admin/systems/services/virus/class_serviceAntiVirus.inc:32
 #: admin/systems/services/imap/class_serviceIMAP.inc:33
 msgid "Services"
-msgstr "Services"
+msgstr "Service"
 
 #: admin/systems/services/postfix/class_servicePostfix.inc:48
 msgid "Hostname"
-msgstr "Nom d'hÃ´te"
+msgstr "Nom de l'hÃ´te"
 
 #: admin/systems/services/postfix/class_servicePostfix.inc:48
 msgid "The host name."
-msgstr "Le nom d'hÃ´te."
+msgstr "Nom de l'hÃ´te"
 
 #: admin/systems/services/postfix/class_servicePostfix.inc:53
 msgid "Domain"
@@ -109,11 +89,11 @@ msgstr "Domaine"
 
 #: admin/systems/services/postfix/class_servicePostfix.inc:53
 msgid "The domain."
-msgstr "Le domaine."
+msgstr "Nom du domaine"
 
 #: admin/systems/services/postfix/class_servicePostfix.inc:58
 msgid "Max mail header size (KB)"
-msgstr "Taille maximum des entÃªtes de message (Ko)"
+msgstr "Taille maximum des entÃªtes des messages (KB)"
 
 #: admin/systems/services/postfix/class_servicePostfix.inc:58
 msgid "This value specifies the maximal header size."
@@ -121,23 +101,23 @@ msgstr "Cette valeur spÃ©cifie la taille maximum de l'entÃªte des messages."
 
 #: admin/systems/services/postfix/class_servicePostfix.inc:63
 msgid "Max mailbox size (KB)"
-msgstr "Taille maximale des boites de courriel (Ko)"
+msgstr "Taille maximale des comptes de messagerie (KB)"
 
 #: admin/systems/services/postfix/class_servicePostfix.inc:63
 msgid "Defines the maximal size of mail box."
-msgstr "DÃ©finit la taille maximale de la boite de courriel."
+msgstr "DÃ©fini la taille maximale du compte de messagerie."
 
 #: admin/systems/services/postfix/class_servicePostfix.inc:68
 msgid "Max message size (KB)"
-msgstr "Taille maximale des messages (Ko)"
+msgstr "Taille maximale des messages (KB)"
 
 #: admin/systems/services/postfix/class_servicePostfix.inc:68
 msgid "Specify the maximal size of a message."
-msgstr "DÃ©finit la taille maximale d'un message."
+msgstr "SpÃ©cifiez la taille maximale d'un message."
 
 #: admin/systems/services/postfix/class_servicePostfix.inc:75
 msgid "Domains and routing"
-msgstr "Domaines et routage"
+msgstr "Domaines et routages"
 
 #: admin/systems/services/postfix/class_servicePostfix.inc:79
 msgid "Domains to accept mail for"
@@ -145,7 +125,7 @@ msgstr "Domaine desquels accepter des messages"
 
 #: admin/systems/services/postfix/class_servicePostfix.inc:79
 msgid "Postfix networks"
-msgstr "RÃ©seaux postfix"
+msgstr "RÃ©seau postfix"
 
 #: admin/systems/services/postfix/class_servicePostfix.inc:84
 msgid "Transport table"
@@ -165,7 +145,7 @@ msgstr "Restrictions pour l'envoyeur"
 
 #: admin/systems/services/postfix/class_servicePostfix.inc:116
 msgid "For sender"
-msgstr "Pour lâ€™expÃ©diteur"
+msgstr "ExpÃ©diteur"
 
 #: admin/systems/services/postfix/class_servicePostfix.inc:121
 msgid "Restrictions for recipient"
@@ -173,7 +153,7 @@ msgstr "Restrictions pour les destinataires"
 
 #: admin/systems/services/postfix/class_servicePostfix.inc:130
 msgid "For recipient"
-msgstr "Pour le destinataire"
+msgstr "Destinataire"
 
 #: admin/systems/services/spam/class_serviceSpamAssassin.inc:33
 #: admin/systems/services/spam/class_serviceSpamAssassin.inc:34
@@ -206,15 +186,15 @@ msgstr "Drapeaux"
 
 #: admin/systems/services/spam/class_serviceSpamAssassin.inc:72
 msgid "Enable use of bayes filtering"
-msgstr "Activer la mÃ©thode de filtrage bayÃ©sienne"
+msgstr "Activer l'utilisation de la mÃ©thode de filtrage bayesienne"
 
 #: admin/systems/services/spam/class_serviceSpamAssassin.inc:77
 msgid "Enable bayes auto learning"
-msgstr "Activer l'apprentissage automatique pour la mÃ©thode bayÃ©sienne"
+msgstr "Activer l'apprentissage automatique pour la mÃ©thode bayesienne"
 
 #: admin/systems/services/spam/class_serviceSpamAssassin.inc:82
 msgid "Enable RBL checks"
-msgstr "Activer les vÃ©rifications RBL"
+msgstr "Activer les vÃ©rification RBL"
 
 #: admin/systems/services/spam/class_serviceSpamAssassin.inc:87
 msgid "Enable use of Razor"
@@ -233,9 +213,8 @@ msgid "Rules"
 msgstr "RÃ¨gles"
 
 #: admin/systems/services/spam/class_serviceSpamAssassin.inc:116
-#: admin/systems/services/spam/class_serviceSpamAssassin.inc:124
-msgid "Edit spam rule"
-msgstr "Modifier la rÃ¨gle anti spam"
+msgid "Edit spam ruleEdit spam rule"
+msgstr "Modifiez la rÃ¨gle pour le spam"
 
 #: admin/systems/services/spam/class_serviceSpamAssassin.inc:119
 msgid "Name"
@@ -245,6 +224,10 @@ msgstr "Nom"
 msgid "Rule"
 msgstr "RÃ¨gle"
 
+#: admin/systems/services/spam/class_serviceSpamAssassin.inc:124
+msgid "Edit spam rule"
+msgstr "Modifier la rÃ¨gle anti spam"
+
 #: admin/systems/services/virus/class_serviceAntiVirus.inc:31
 #: admin/systems/services/virus/class_serviceAntiVirus.inc:32
 msgid "Antivirus service"
@@ -256,23 +239,23 @@ msgstr "Filtrage des virus"
 
 #: admin/systems/services/virus/class_serviceAntiVirus.inc:50
 msgid "Database user"
-msgstr "Utilisateur de la base de donnÃ©es"
+msgstr "Base de donnÃ©es utilisateur"
 
 #: admin/systems/services/virus/class_serviceAntiVirus.inc:50
 msgid "User name for the database"
-msgstr "Nom de l'utilisateur pour se connecter Ã  la base de donnÃ©es"
+msgstr "Nom de l'utilisateur pour la base de donnÃ©es"
 
 #: admin/systems/services/virus/class_serviceAntiVirus.inc:54
 msgid "Database mirror"
-msgstr "Miroir de la base de donnÃ©es"
+msgstr "Base de donnÃ©es mirroir"
 
 #: admin/systems/services/virus/class_serviceAntiVirus.inc:54
 msgid "Mirror for the database"
-msgstr "Miroir pour la base de donnÃ©es"
+msgstr "Mirroir pour la base de donnÃ©es"
 
 #: admin/systems/services/virus/class_serviceAntiVirus.inc:58
 msgid "Http proxy URL"
-msgstr "URL du proxy HTTP"
+msgstr "URL du proxy http"
 
 #: admin/systems/services/virus/class_serviceAntiVirus.inc:58
 msgid "URL for the proxy"
@@ -280,18 +263,14 @@ msgstr "URL pour le proxy"
 
 #: admin/systems/services/virus/class_serviceAntiVirus.inc:62
 msgid "Maximum threads"
-msgstr "Nombre de threads maximum"
+msgstr "Nombre de processus maximum"
 
 #: admin/systems/services/virus/class_serviceAntiVirus.inc:62
 msgid "Maximum number of threads"
-msgstr "Nombre de threads maximum"
+msgstr "Nombre de processus maximum"
 
 #: admin/systems/services/virus/class_serviceAntiVirus.inc:68
 msgid "Max directory recursions"
-msgstr "RÃ©cursions maximum"
-
-#: admin/systems/services/virus/class_serviceAntiVirus.inc:68
-msgid "Maximum number of directory recursions"
 msgstr "Nombre maximum de rÃ©cursions dans les rÃ©pertoires"
 
 #: admin/systems/services/virus/class_serviceAntiVirus.inc:73
@@ -300,19 +279,19 @@ msgstr "VÃ©rifications par jour"
 
 #: admin/systems/services/virus/class_serviceAntiVirus.inc:78
 msgid "Enable debugging"
-msgstr "Activer le dÃ©bogage"
+msgstr "Activer le deboguage"
 
 #: admin/systems/services/virus/class_serviceAntiVirus.inc:78
 msgid "Enable debugging for the antivirus"
-msgstr "Activer le dÃ©bogage pour lâ€™antivirus"
+msgstr "Activer le dÃ©bogage"
 
 #: admin/systems/services/virus/class_serviceAntiVirus.inc:83
 msgid "Enable mail scanning"
-msgstr "Activer le scan de courriel"
+msgstr "Activer la vÃ©rification antivirus de la messagerie"
 
 #: admin/systems/services/virus/class_serviceAntiVirus.inc:83
 msgid "Enable mail scanning for the antivirus"
-msgstr "Activer le scan de courriel par lâ€™antivirus"
+msgstr "Activer la vÃ©rification antivirus de la messagerie"
 
 #: admin/systems/services/virus/class_serviceAntiVirus.inc:90
 msgid "Archive scanning"
@@ -338,6 +317,10 @@ msgstr "RÃ©cursions maximum"
 msgid "Maximum compression ratio"
 msgstr "Ratio maximum de compression"
 
+#: admin/systems/services/virus/class_serviceAntiVirus.inc:113
+msgid " "
+msgstr ""
+
 #: admin/systems/services/imap/class_serviceIMAP.inc:32
 msgid "IMAP/POP3 generic service"
 msgstr "Service IMAP/POP3 gÃ©nÃ©rique"
@@ -354,25 +337,25 @@ msgstr "Erreur de configuration"
 #: personal/mail/class_mail-methods.inc:157
 #, php-format
 msgid "The configured mail attribute '%s' is unsupported!"
-msgstr "L'attribut de messagerie '%s' n'est pas supportÃ©â€¯!"
+msgstr "L'attribut de messagerie '%s' n'est pas supportÃ© !"
 
 #: personal/mail/class_mail-methods.inc:518
 #, php-format
 msgid "Mail method '%s' is unknown!"
-msgstr "Le mÃ©thode de messagerie '%s' est inconnueâ€¯!"
+msgstr "Le mÃ©thode de messagerie '%s' est inconnue !"
 
-#: personal/mail/class_mail-methods.inc:727
-#: personal/mail/class_mail-methods.inc:728
+#: personal/mail/class_mail-methods.inc:735
+#: personal/mail/class_mail-methods.inc:736
 msgid "None"
 msgstr "Aucun"
 
-#: personal/mail/class_mail-methods.inc:817
+#: personal/mail/class_mail-methods.inc:825
 msgid "Unknown"
 msgstr "Inconnu"
 
-#: personal/mail/class_mail-methods.inc:819
+#: personal/mail/class_mail-methods.inc:827
 msgid "Unlimited"
-msgstr "IllimitÃ©"
+msgstr "IllimitÃ©s"
 
 #: personal/mail/class_mailAccount.inc:47
 #: personal/mail/class_mailAccount.inc:256
@@ -382,25 +365,25 @@ msgstr "IllimitÃ©"
 #: personal/mail/class_mailAccount.inc:355
 #: personal/mail/class_mailAccount.inc:359
 msgid "Mail error"
-msgstr "Erreur du serveur de courriel"
+msgstr "Erreur du serveur de messagerie"
 
 #: personal/mail/class_mailAccount.inc:47
 #, php-format
 msgid "Cannot read quota settings: %s"
-msgstr "Impossible de lire les paramÃ¨tres de quotaâ€¯: %s"
+msgstr "Impossible de lire les paramÃ¨tres de quota : %s"
 
 #: personal/mail/class_mailAccount.inc:57
 msgid "Quota usage"
-msgstr "Utilisation des quotas"
+msgstr "Utilisation des Quota"
 
 #: personal/mail/class_mailAccount.inc:58
 msgid "Part of the quota which is used"
-msgstr "Part du quota qui est utilisÃ©e"
+msgstr "Partie du quota qui est utilisÃ©"
 
 #: personal/mail/class_mailAccount.inc:80
 #: config/mail/class_mailPluginConfig.inc:41
 msgid "Mail settings"
-msgstr "ParamÃ¨tres de courriel"
+msgstr "ParamÃ¨tres de messagerie"
 
 #: personal/mail/class_mailAccount.inc:97
 msgid "Mail account"
@@ -408,23 +391,23 @@ msgstr "Compte courriel"
 
 #: personal/mail/class_mailAccount.inc:100
 msgid "Primary mail address"
-msgstr "Adresse de courriel principale"
+msgstr "Adresse de messagerie principale"
 
 #: personal/mail/class_mailAccount.inc:104
 msgid "Specify the mail server where the user will be hosted on"
-msgstr "Indiquez le serveur de courriel de l'utilisateur"
+msgstr "Indiquez le serveur de messagerie de l'utilisateur"
 
 #: personal/mail/class_mailAccount.inc:109
 msgid "Quota size"
-msgstr "Taille du quota"
+msgstr "Taille du Quota"
 
 #: personal/mail/class_mailAccount.inc:116
 msgid "Other addresses and redirections"
-msgstr "Autres adresses et redirections"
+msgstr "Autres adresses et les redirections"
 
 #: personal/mail/class_mailAccount.inc:120
 msgid "List of alternative mail addresses"
-msgstr "Liste des adresses de courriel alternatives"
+msgstr "Liste des adresses de messagerie alternatives"
 
 #: personal/mail/class_mailAccount.inc:125
 msgid "Forward messages to"
@@ -441,12 +424,12 @@ msgstr "Message d'absence"
 
 #: personal/mail/class_mailAccount.inc:134
 msgid "Activate vacation message"
-msgstr "Activer le message d'absence"
+msgstr "Activer la notification d'absence"
 
 #: personal/mail/class_mailAccount.inc:135
 msgid ""
 "Select to automatically response with the vacation message defined below"
-msgstr "RÃ©ponse automatique par le message d'absence ci-dessous"
+msgstr "Indiquez la rÃ©ponse automatique en remplissant le message d'absence ci-dessous"
 
 #: personal/mail/class_mailAccount.inc:140
 msgid "from"
@@ -462,7 +445,7 @@ msgstr "Options anti spam"
 
 #: personal/mail/class_mailAccount.inc:159
 msgid "Move mails depending on spam level"
-msgstr "DÃ©placer les messages en fonction du niveau de spam"
+msgstr "DÃ©placer les messages ayant un niveau de spam supÃ©rieur Ã "
 
 #: personal/mail/class_mailAccount.inc:164
 msgid "Minimum spam level"
@@ -470,31 +453,31 @@ msgstr "Niveau de spam minimal"
 
 #: personal/mail/class_mailAccount.inc:164
 msgid "Spam level above which a mail will be moved"
-msgstr "Niveau de spam au-dessus duquel un courriel sera dÃ©placÃ©"
+msgstr "Niveau de spam au-dessus duquel un courrier sera dÃ©placÃ©"
 
 #: personal/mail/class_mailAccount.inc:169
 msgid "Move spam to folder"
-msgstr "DÃ©placer le spam dans le dossier"
+msgstr "Bouger le spam vers le dossier"
 
 #: personal/mail/class_mailAccount.inc:169
 msgid "Folder in which spam will be moved"
-msgstr "Dossier dans lequel le spam sera dÃ©placÃ©"
+msgstr "Dossier dans lequel le spam est dÃ©placÃ©"
 
 #: personal/mail/class_mailAccount.inc:174
 msgid "Reject mail depending on their size"
-msgstr "Rejeter les courriels en fonction de leur taille"
+msgstr "Rejeter les courriers en fonction de leur taille"
 
 #: personal/mail/class_mailAccount.inc:174
 msgid "Messages bigger than the chosen size will be rejected"
-msgstr "Les courriels plus grands que la taille choisie seront rejetÃ©s"
+msgstr "Les messages plus grands que la taille choisie seront rejetÃ©es"
 
 #: personal/mail/class_mailAccount.inc:179
 msgid "Minimum size to reject a mail (MB)"
-msgstr "La taille minimale pour rejeter un courriel (Mo)"
+msgstr "La taille minimale pour rejeter un e-mail (MB)"
 
 #: personal/mail/class_mailAccount.inc:195
 msgid "Advanced mail options"
-msgstr "Options de courriel avancÃ©es"
+msgstr "Options de messagerie avancÃ©es"
 
 #: personal/mail/class_mailAccount.inc:198
 msgid "Use custom sieve script"
@@ -502,7 +485,7 @@ msgstr "Utiliser des scripts sieve personnalisÃ©s"
 
 #: personal/mail/class_mailAccount.inc:198
 msgid "disables all Mail options!"
-msgstr "dÃ©sactive toutes les options de courrielâ€¯!"
+msgstr "dÃ©sactive toutes les options de messagerie !"
 
 #: personal/mail/class_mailAccount.inc:199
 msgid "Use your sieve script with personnal customization"
@@ -514,11 +497,11 @@ msgstr "Les utilisateurs ne sont autorisÃ©s qu'Ã  envoyer et recevoir des messag
 
 #: personal/mail/class_mailAccount.inc:205
 msgid "Select if user can only send and receive inside his own domain"
-msgstr "SÃ©lectionnez si vous voulez que les utilisateurs puissent envoyer et recevoir des courriels uniquement dans leur propre domaine"
+msgstr "SÃ©lectionnez si vous voulez que les utilisateurs puissent envoyer et recevoir des messages uniquement dans son propre domaine"
 
 #: personal/mail/class_mailAccount.inc:210
 msgid "No delivery to own mailbox"
-msgstr "Aucune distribution des courriels dans sa propre boite"
+msgstr "Aucune distribution des messages dans la boite de l'utilisateur"
 
 #: personal/mail/class_mailAccount.inc:211
 msgid "Select if you want to forward mails without getting own copies of them"
@@ -527,47 +510,47 @@ msgstr "SÃ©lectionnez ceci si vous souhaitez relayer les messages sans garder de
 #: personal/mail/class_mailAccount.inc:256
 #, php-format
 msgid "Cannot get list of mailboxes: %s"
-msgstr "Impossible d'obtenir la liste des comptes de courrielâ€¯: %s"
+msgstr "Impossible d'obtenir la liste des comptes de messagerie : %s"
 
 #: personal/mail/class_mailAccount.inc:260
 #: personal/mail/class_mailAccount.inc:351
 #, php-format
 msgid "Mail method cannot connect: %s"
-msgstr "Le mÃ©thode de courriel ne peut pas se connecterâ€¯: %s"
+msgstr "Le mÃ©thode mail ne peut pas se connecter : %s"
 
 #: personal/mail/class_mailAccount.inc:263
 #, php-format
 msgid "Mailbox '%s' doesn't exists on mail server: %s"
-msgstr "Le compte de courriel '%s' n'existe pas sur le serveurâ€¯: %s"
+msgstr "Le compte de messagerie '%s' n'existe pas sur le serveur de messagerie : %s"
 
 #: personal/mail/class_mailAccount.inc:355
 #, php-format
 msgid "Cannot update mailbox: %s"
-msgstr "Impossible de mettre Ã  jour le compteâ€¯: %s"
+msgstr "Impossible de mettre Ã  jour le compte de messagerie : %s"
 
 #: personal/mail/class_mailAccount.inc:359
 #, php-format
 msgid "Cannot write quota settings: %s"
-msgstr "Impossible d'Ã©crire les paramÃ¨tres de quotaâ€¯: %s"
+msgstr "Impossible d'Ã©crire les quotas : %s"
 
 #: personal/mail/class_mailAccount.inc:372
 msgid "Mail error saving sieve settings"
-msgstr "Erreur lors de la sauvegarde du script sieve"
+msgstr "Erreur de messagerie lors de la sauvegarde du script sieve"
 
 #: config/mail/class_mailPluginConfig.inc:29
 msgid "Mail plugin configuration"
-msgstr "Configuration du plugin mail"
+msgstr "Configuration de l'extension mail"
 
 #: config/mail/class_mailPluginConfig.inc:44
 msgid "Mail method"
-msgstr "MÃ©thode de courriel"
+msgstr "MÃ©thode de messagerie"
 
 #: config/mail/class_mailPluginConfig.inc:45
 msgid ""
 "Mail method the setup should use to communicate with a possible mail server."
 " Leave this undefined if your mail method does not match the predefined "
 "ones."
-msgstr "MÃ©thode de courriel que l'installation doit utiliser pour communiquer avec un serveur de messagerie. Laissez ceci Ã  indÃ©fini si votre mÃ©thode ne correspondent pas Ã  celles prÃ©dÃ©finies."
+msgstr "MÃ©thode mail que l'installation doit utiliser pour communiquer avec un serveur de messagerie. Laissez ceci Ã  indÃ©fini si votre mÃ©thode mail ne correspondent pas Ã  celle prÃ©dÃ©finies."
 
 #: config/mail/class_mailPluginConfig.inc:50
 msgid "Account identification attribute"
@@ -579,7 +562,7 @@ msgstr "Quel attribut sera utilisÃ© pour crÃ©er des comptes."
 
 #: config/mail/class_mailPluginConfig.inc:56
 msgid "Mail user template"
-msgstr "ModÃ¨le d'utilisateur de courriel"
+msgstr "ModÃ¨le d'utilisateur de messagerie"
 
 #: config/mail/class_mailPluginConfig.inc:57
 msgid "Override the user account creation syntax."
@@ -587,30 +570,30 @@ msgstr "Remplacer la syntaxe de crÃ©ation d'un compte utilisateur."
 
 #: config/mail/class_mailPluginConfig.inc:61
 msgid "Mail folder template"
-msgstr "ModÃ¨le de dossier de courriel"
+msgstr "ModÃ¨le de dossier de messagerie"
 
 #: config/mail/class_mailPluginConfig.inc:62
 msgid "Override the methods default account creation syntax."
-msgstr "Remplacer la syntaxe de crÃ©ation de compte par dÃ©faut."
+msgstr "Remplacer la syntaxe de crÃ©ation de compte par dÃ©faut"
 
 #: config/mail/class_mailPluginConfig.inc:66
 msgid "Use cyrus UNIX style"
-msgstr "Utiliser le style Cyrus UNIX"
+msgstr "Utilisez Cyrus UNIX style"
 
 #: config/mail/class_mailPluginConfig.inc:67
 msgid ""
 "Determines if 'foo/bar' or 'foo.bar' should be uses as namespaces in IMAP."
-msgstr "DÃ©termine si \"foo/bar\" ou \"foo.bar\" devrait Ãªtre utilisÃ© comme espaces de nom IMAP."
+msgstr "DÃ©termine si \"foo / bar\" ou \"foo.bar\" devrait Ãªtre utilise comme espaces de noms IMAP."
 
 #: config/mail/class_mailPluginConfig.inc:71
 msgid "Delete mailbox on account deletion"
-msgstr "Supprimer le compte de courriel lors de la suppression du compte"
+msgstr "Effacer le compte de messagerie lors de l'effacement du compte"
 
 #: config/mail/class_mailPluginConfig.inc:72
 msgid ""
 "Determines if the mailbox should be removed from your IMAP server after the "
 "account is deleted in LDAP."
-msgstr "DÃ©termine si la boÃ®te aux lettres doit Ãªtre retirÃ©e de votre serveur IMAP aprÃ¨s la suppression du compte LDAP."
+msgstr "DÃ©termine si la boÃ®te aux lettres doit Ãªtre retirÃ© de votre serveur IMAP aprÃ¨s le compte est supprimÃ© dans LDAP."
 
 #: config/mail/class_mailPluginConfig.inc:77
 msgid "Cyrus autocreate folders"
@@ -628,15 +611,15 @@ msgstr "DÃ©lai d'inactivitÃ© IMAP"
 
 #: config/mail/class_mailPluginConfig.inc:84
 msgid "Sets the connection timeout for imap actions."
-msgstr "DÃ©finit le dÃ©lai dâ€™attente maximum pour les actions IMAP."
+msgstr "DÃ©finit le dÃ©lai de connexion pour les actions IMAP."
 
 #: config/mail/class_mailPluginConfig.inc:89
 msgid "Shared prefix"
-msgstr "PrÃ©fixe des dossiers partagÃ©s"
+msgstr "PrÃ©fixe pour les dossiers partagÃ©s"
 
 #: config/mail/class_mailPluginConfig.inc:90
 msgid "Prefix to add for mail shared folders."
-msgstr "PrÃ©fixe Ã  ajouter pour les dossiers partagÃ©s."
+msgstr "PrÃ©fixe Ã  ajouter pour dossiers partagÃ©s."
 
 #: config/mail/class_mailPluginConfig.inc:108
 msgid "Generic"
diff --git a/mail/locale/id/fusiondirectory.po b/mail/locale/id/fusiondirectory.po
index 728fbb94b6e9cb73201ab267a26435c002f83ad6..37015050cde408457822d27299c0589b54e96925 100644
--- a/mail/locale/id/fusiondirectory.po
+++ b/mail/locale/id/fusiondirectory.po
@@ -5,12 +5,12 @@
 # Translators:
 msgid ""
 msgstr ""
-"Project-Id-Version: FusionDirectory-108\n"
+"Project-Id-Version: FusionDirectory-109\n"
 "Report-Msgid-Bugs-To: documentation@lists.fusiondirectory.org\n"
-"POT-Creation-Date: 2015-03-31 11:49+0200\n"
-"PO-Revision-Date: 2015-03-17 17:56+0000\n"
+"POT-Creation-Date: 2014-12-15 17:47+0100\n"
+"PO-Revision-Date: 2014-12-15 16:59+0000\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>\n"
-"Language-Team: Indonesian (http://www.transifex.com/projects/p/FusionDirectory-108/language/id/)\n"
+"Language-Team: Indonesian (http://www.transifex.com/projects/p/FusionDirectory-109/language/id/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -32,45 +32,35 @@ msgstr ""
 msgid "Informations"
 msgstr ""
 
-#: admin/groups/mail/class_groupMail.inc:82
+#: admin/groups/mail/class_groupMail.inc:86
 #: personal/mail/class_mailAccount.inc:100
 msgid "Primary address"
 msgstr ""
 
-#: admin/groups/mail/class_groupMail.inc:82
+#: admin/groups/mail/class_groupMail.inc:86
 msgid "The primary mail address"
 msgstr ""
 
-#: admin/groups/mail/class_groupMail.inc:86
+#: admin/groups/mail/class_groupMail.inc:90
 #: personal/mail/class_mailAccount.inc:104
 msgid "Server"
 msgstr ""
 
-#: admin/groups/mail/class_groupMail.inc:86
+#: admin/groups/mail/class_groupMail.inc:90
 msgid "Server mail"
 msgstr ""
 
-#: admin/groups/mail/class_groupMail.inc:92
+#: admin/groups/mail/class_groupMail.inc:96
 #: personal/mail/class_mailAccount.inc:120
 msgid "Alternative addresses"
 msgstr ""
 
-#: admin/groups/mail/class_groupMail.inc:92
+#: admin/groups/mail/class_groupMail.inc:96
 msgid "Alternative mail addresses for the group"
 msgstr ""
 
-#: admin/groups/mail/class_groupMail.inc:97
-msgid "Forward messages to non group members"
-msgstr ""
-
-#: admin/groups/mail/class_groupMail.inc:101
-msgid "Only allowed to receive local mail"
-msgstr ""
-
 #: admin/groups/mail/class_groupMail.inc:101
-msgid ""
-"Whether this group mail is only allowed to receive messages from local "
-"senders"
+msgid "Forward messages to non group members"
 msgstr ""
 
 #: admin/systems/services/postfix/class_servicePostfix.inc:29
@@ -223,8 +213,7 @@ msgid "Rules"
 msgstr ""
 
 #: admin/systems/services/spam/class_serviceSpamAssassin.inc:116
-#: admin/systems/services/spam/class_serviceSpamAssassin.inc:124
-msgid "Edit spam rule"
+msgid "Edit spam ruleEdit spam rule"
 msgstr ""
 
 #: admin/systems/services/spam/class_serviceSpamAssassin.inc:119
@@ -235,6 +224,10 @@ msgstr ""
 msgid "Rule"
 msgstr ""
 
+#: admin/systems/services/spam/class_serviceSpamAssassin.inc:124
+msgid "Edit spam rule"
+msgstr ""
+
 #: admin/systems/services/virus/class_serviceAntiVirus.inc:31
 #: admin/systems/services/virus/class_serviceAntiVirus.inc:32
 msgid "Antivirus service"
@@ -280,10 +273,6 @@ msgstr ""
 msgid "Max directory recursions"
 msgstr ""
 
-#: admin/systems/services/virus/class_serviceAntiVirus.inc:68
-msgid "Maximum number of directory recursions"
-msgstr ""
-
 #: admin/systems/services/virus/class_serviceAntiVirus.inc:73
 msgid "Checks per day"
 msgstr ""
@@ -328,6 +317,10 @@ msgstr ""
 msgid "Maximum compression ratio"
 msgstr ""
 
+#: admin/systems/services/virus/class_serviceAntiVirus.inc:113
+msgid " "
+msgstr ""
+
 #: admin/systems/services/imap/class_serviceIMAP.inc:32
 msgid "IMAP/POP3 generic service"
 msgstr ""
@@ -351,16 +344,16 @@ msgstr ""
 msgid "Mail method '%s' is unknown!"
 msgstr ""
 
-#: personal/mail/class_mail-methods.inc:727
-#: personal/mail/class_mail-methods.inc:728
+#: personal/mail/class_mail-methods.inc:735
+#: personal/mail/class_mail-methods.inc:736
 msgid "None"
 msgstr ""
 
-#: personal/mail/class_mail-methods.inc:817
+#: personal/mail/class_mail-methods.inc:825
 msgid "Unknown"
 msgstr ""
 
-#: personal/mail/class_mail-methods.inc:819
+#: personal/mail/class_mail-methods.inc:827
 msgid "Unlimited"
 msgstr ""
 
diff --git a/mail/locale/it/fusiondirectory.po b/mail/locale/it/fusiondirectory.po
index 8f1799234c862a276ec07aed41e27d77805ed5d2..78828e2079a357d9b8744b7344f1145dbf69a7b6 100644
--- a/mail/locale/it/fusiondirectory.po
+++ b/mail/locale/it/fusiondirectory.po
@@ -3,19 +3,14 @@
 # This file is distributed under the same license as the PACKAGE package.
 # 
 # Translators:
-# Alessandro Amici <a.amici@bopen.it>, 2005
-# poterealpopolo <giuliano@opensides.be>, 2011
-# poterealpopolo <giuliano@opensides.be>, 2013
-# poterealpopolo <giuliano@opensides.be>, 2012
-# poterealpopolo <giuliano@opensides.be>, 2011-2013
 msgid ""
 msgstr ""
-"Project-Id-Version: FusionDirectory-108\n"
+"Project-Id-Version: FusionDirectory-109\n"
 "Report-Msgid-Bugs-To: documentation@lists.fusiondirectory.org\n"
-"POT-Creation-Date: 2015-03-31 11:49+0200\n"
+"POT-Creation-Date: 2014-12-15 17:47+0100\n"
 "PO-Revision-Date: 2015-03-31 11:41+0000\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>\n"
-"Language-Team: Italian (http://www.transifex.com/projects/p/FusionDirectory-108/language/it/)\n"
+"Language-Team: Italian (http://www.transifex.com/projects/p/FusionDirectory-109/language/it/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -26,7 +21,7 @@ msgstr ""
 #: personal/mail/class_mailAccount.inc:79
 #: config/mail/class_mailPluginConfig.inc:28
 msgid "Mail"
-msgstr "Posta elettronica"
+msgstr "Mail"
 
 #: admin/groups/mail/class_groupMail.inc:47
 msgid "Group mail options"
@@ -37,47 +32,37 @@ msgstr ""
 msgid "Informations"
 msgstr "Informazioni"
 
-#: admin/groups/mail/class_groupMail.inc:82
+#: admin/groups/mail/class_groupMail.inc:86
 #: personal/mail/class_mailAccount.inc:100
 msgid "Primary address"
 msgstr "Indirizzo principale"
 
-#: admin/groups/mail/class_groupMail.inc:82
+#: admin/groups/mail/class_groupMail.inc:86
 msgid "The primary mail address"
 msgstr "Lindirizzo mail principale"
 
-#: admin/groups/mail/class_groupMail.inc:86
+#: admin/groups/mail/class_groupMail.inc:90
 #: personal/mail/class_mailAccount.inc:104
 msgid "Server"
 msgstr "Server"
 
-#: admin/groups/mail/class_groupMail.inc:86
+#: admin/groups/mail/class_groupMail.inc:90
 msgid "Server mail"
 msgstr ""
 
-#: admin/groups/mail/class_groupMail.inc:92
+#: admin/groups/mail/class_groupMail.inc:96
 #: personal/mail/class_mailAccount.inc:120
 msgid "Alternative addresses"
 msgstr "Indirizzi alternativi"
 
-#: admin/groups/mail/class_groupMail.inc:92
+#: admin/groups/mail/class_groupMail.inc:96
 msgid "Alternative mail addresses for the group"
 msgstr ""
 
-#: admin/groups/mail/class_groupMail.inc:97
+#: admin/groups/mail/class_groupMail.inc:101
 msgid "Forward messages to non group members"
 msgstr "Inoltra i messaggi ai membri che non appartengono al gruppo"
 
-#: admin/groups/mail/class_groupMail.inc:101
-msgid "Only allowed to receive local mail"
-msgstr ""
-
-#: admin/groups/mail/class_groupMail.inc:101
-msgid ""
-"Whether this group mail is only allowed to receive messages from local "
-"senders"
-msgstr ""
-
 #: admin/systems/services/postfix/class_servicePostfix.inc:29
 #: admin/systems/services/postfix/class_servicePostfix.inc:30
 msgid "Postfix (SMTP)"
@@ -228,9 +213,8 @@ msgid "Rules"
 msgstr "Regole"
 
 #: admin/systems/services/spam/class_serviceSpamAssassin.inc:116
-#: admin/systems/services/spam/class_serviceSpamAssassin.inc:124
-msgid "Edit spam rule"
-msgstr "Modifica regola dello spam"
+msgid "Edit spam ruleEdit spam rule"
+msgstr "Modifica regola di spamming"
 
 #: admin/systems/services/spam/class_serviceSpamAssassin.inc:119
 msgid "Name"
@@ -240,6 +224,10 @@ msgstr "Nome"
 msgid "Rule"
 msgstr "Regola"
 
+#: admin/systems/services/spam/class_serviceSpamAssassin.inc:124
+msgid "Edit spam rule"
+msgstr "Modifica regola dello spam"
+
 #: admin/systems/services/virus/class_serviceAntiVirus.inc:31
 #: admin/systems/services/virus/class_serviceAntiVirus.inc:32
 msgid "Antivirus service"
@@ -285,10 +273,6 @@ msgstr "Numero massimo di thread"
 msgid "Max directory recursions"
 msgstr "Numero massimo di ricorsioni nelle cartelle"
 
-#: admin/systems/services/virus/class_serviceAntiVirus.inc:68
-msgid "Maximum number of directory recursions"
-msgstr ""
-
 #: admin/systems/services/virus/class_serviceAntiVirus.inc:73
 msgid "Checks per day"
 msgstr "Verifiche giornaliere"
@@ -333,6 +317,10 @@ msgstr "Numero massimo delle ricorsioni"
 msgid "Maximum compression ratio"
 msgstr "Rapporto massimo di compressione"
 
+#: admin/systems/services/virus/class_serviceAntiVirus.inc:113
+msgid " "
+msgstr " "
+
 #: admin/systems/services/imap/class_serviceIMAP.inc:32
 msgid "IMAP/POP3 generic service"
 msgstr "Servizio generico IMAP/POP3"
@@ -356,16 +344,16 @@ msgstr "L'attributo mail '%s' non Ã¨ supportato !"
 msgid "Mail method '%s' is unknown!"
 msgstr "L'algoritmo per la posta elettronica '%s' Ã¨ sconosciuto !"
 
-#: personal/mail/class_mail-methods.inc:727
-#: personal/mail/class_mail-methods.inc:728
+#: personal/mail/class_mail-methods.inc:735
+#: personal/mail/class_mail-methods.inc:736
 msgid "None"
 msgstr "Nessuno"
 
-#: personal/mail/class_mail-methods.inc:817
+#: personal/mail/class_mail-methods.inc:825
 msgid "Unknown"
 msgstr "Sconosciuto"
 
-#: personal/mail/class_mail-methods.inc:819
+#: personal/mail/class_mail-methods.inc:827
 msgid "Unlimited"
 msgstr "Illimitato"
 
diff --git a/mail/locale/lv/fusiondirectory.po b/mail/locale/lv/fusiondirectory.po
index a770d064f01050b6bd01547765ff29e61bc4b464..f2dfbf83a00ec761a6d901d2651b7f9210a75ebd 100644
--- a/mail/locale/lv/fusiondirectory.po
+++ b/mail/locale/lv/fusiondirectory.po
@@ -5,12 +5,12 @@
 # Translators:
 msgid ""
 msgstr ""
-"Project-Id-Version: FusionDirectory-108\n"
+"Project-Id-Version: FusionDirectory-109\n"
 "Report-Msgid-Bugs-To: documentation@lists.fusiondirectory.org\n"
-"POT-Creation-Date: 2015-03-31 11:49+0200\n"
-"PO-Revision-Date: 2015-03-17 17:56+0000\n"
+"POT-Creation-Date: 2014-12-15 17:47+0100\n"
+"PO-Revision-Date: 2014-12-15 16:59+0000\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>\n"
-"Language-Team: Latvian (http://www.transifex.com/projects/p/FusionDirectory-108/language/lv/)\n"
+"Language-Team: Latvian (http://www.transifex.com/projects/p/FusionDirectory-109/language/lv/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -32,45 +32,35 @@ msgstr ""
 msgid "Informations"
 msgstr ""
 
-#: admin/groups/mail/class_groupMail.inc:82
+#: admin/groups/mail/class_groupMail.inc:86
 #: personal/mail/class_mailAccount.inc:100
 msgid "Primary address"
 msgstr ""
 
-#: admin/groups/mail/class_groupMail.inc:82
+#: admin/groups/mail/class_groupMail.inc:86
 msgid "The primary mail address"
 msgstr ""
 
-#: admin/groups/mail/class_groupMail.inc:86
+#: admin/groups/mail/class_groupMail.inc:90
 #: personal/mail/class_mailAccount.inc:104
 msgid "Server"
 msgstr ""
 
-#: admin/groups/mail/class_groupMail.inc:86
+#: admin/groups/mail/class_groupMail.inc:90
 msgid "Server mail"
 msgstr ""
 
-#: admin/groups/mail/class_groupMail.inc:92
+#: admin/groups/mail/class_groupMail.inc:96
 #: personal/mail/class_mailAccount.inc:120
 msgid "Alternative addresses"
 msgstr ""
 
-#: admin/groups/mail/class_groupMail.inc:92
+#: admin/groups/mail/class_groupMail.inc:96
 msgid "Alternative mail addresses for the group"
 msgstr ""
 
-#: admin/groups/mail/class_groupMail.inc:97
-msgid "Forward messages to non group members"
-msgstr ""
-
-#: admin/groups/mail/class_groupMail.inc:101
-msgid "Only allowed to receive local mail"
-msgstr ""
-
 #: admin/groups/mail/class_groupMail.inc:101
-msgid ""
-"Whether this group mail is only allowed to receive messages from local "
-"senders"
+msgid "Forward messages to non group members"
 msgstr ""
 
 #: admin/systems/services/postfix/class_servicePostfix.inc:29
@@ -223,8 +213,7 @@ msgid "Rules"
 msgstr ""
 
 #: admin/systems/services/spam/class_serviceSpamAssassin.inc:116
-#: admin/systems/services/spam/class_serviceSpamAssassin.inc:124
-msgid "Edit spam rule"
+msgid "Edit spam ruleEdit spam rule"
 msgstr ""
 
 #: admin/systems/services/spam/class_serviceSpamAssassin.inc:119
@@ -235,6 +224,10 @@ msgstr ""
 msgid "Rule"
 msgstr ""
 
+#: admin/systems/services/spam/class_serviceSpamAssassin.inc:124
+msgid "Edit spam rule"
+msgstr ""
+
 #: admin/systems/services/virus/class_serviceAntiVirus.inc:31
 #: admin/systems/services/virus/class_serviceAntiVirus.inc:32
 msgid "Antivirus service"
@@ -280,10 +273,6 @@ msgstr ""
 msgid "Max directory recursions"
 msgstr ""
 
-#: admin/systems/services/virus/class_serviceAntiVirus.inc:68
-msgid "Maximum number of directory recursions"
-msgstr ""
-
 #: admin/systems/services/virus/class_serviceAntiVirus.inc:73
 msgid "Checks per day"
 msgstr ""
@@ -328,6 +317,10 @@ msgstr ""
 msgid "Maximum compression ratio"
 msgstr ""
 
+#: admin/systems/services/virus/class_serviceAntiVirus.inc:113
+msgid " "
+msgstr ""
+
 #: admin/systems/services/imap/class_serviceIMAP.inc:32
 msgid "IMAP/POP3 generic service"
 msgstr ""
@@ -351,16 +344,16 @@ msgstr ""
 msgid "Mail method '%s' is unknown!"
 msgstr ""
 
-#: personal/mail/class_mail-methods.inc:727
-#: personal/mail/class_mail-methods.inc:728
+#: personal/mail/class_mail-methods.inc:735
+#: personal/mail/class_mail-methods.inc:736
 msgid "None"
 msgstr ""
 
-#: personal/mail/class_mail-methods.inc:817
+#: personal/mail/class_mail-methods.inc:825
 msgid "Unknown"
 msgstr ""
 
-#: personal/mail/class_mail-methods.inc:819
+#: personal/mail/class_mail-methods.inc:827
 msgid "Unlimited"
 msgstr ""
 
diff --git a/mail/locale/nb/fusiondirectory.po b/mail/locale/nb/fusiondirectory.po
index 7df36b287a54595dd4c7177c0864fcbff7fb0c99..1b0c84d439a969d09b8f0591a45d9e3876812af8 100644
--- a/mail/locale/nb/fusiondirectory.po
+++ b/mail/locale/nb/fusiondirectory.po
@@ -5,12 +5,12 @@
 # Translators:
 msgid ""
 msgstr ""
-"Project-Id-Version: FusionDirectory-108\n"
+"Project-Id-Version: FusionDirectory-109\n"
 "Report-Msgid-Bugs-To: documentation@lists.fusiondirectory.org\n"
-"POT-Creation-Date: 2015-03-31 11:49+0200\n"
-"PO-Revision-Date: 2015-03-17 17:56+0000\n"
+"POT-Creation-Date: 2014-12-15 17:47+0100\n"
+"PO-Revision-Date: 2015-02-25 16:13+0000\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>\n"
-"Language-Team: Norwegian BokmÃ¥l (http://www.transifex.com/projects/p/FusionDirectory-108/language/nb/)\n"
+"Language-Team: Norwegian BokmÃ¥l (http://www.transifex.com/projects/p/FusionDirectory-109/language/nb/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -32,45 +32,35 @@ msgstr ""
 msgid "Informations"
 msgstr ""
 
-#: admin/groups/mail/class_groupMail.inc:82
+#: admin/groups/mail/class_groupMail.inc:86
 #: personal/mail/class_mailAccount.inc:100
 msgid "Primary address"
 msgstr ""
 
-#: admin/groups/mail/class_groupMail.inc:82
+#: admin/groups/mail/class_groupMail.inc:86
 msgid "The primary mail address"
 msgstr ""
 
-#: admin/groups/mail/class_groupMail.inc:86
+#: admin/groups/mail/class_groupMail.inc:90
 #: personal/mail/class_mailAccount.inc:104
 msgid "Server"
 msgstr "Tjener"
 
-#: admin/groups/mail/class_groupMail.inc:86
+#: admin/groups/mail/class_groupMail.inc:90
 msgid "Server mail"
 msgstr ""
 
-#: admin/groups/mail/class_groupMail.inc:92
+#: admin/groups/mail/class_groupMail.inc:96
 #: personal/mail/class_mailAccount.inc:120
 msgid "Alternative addresses"
 msgstr ""
 
-#: admin/groups/mail/class_groupMail.inc:92
+#: admin/groups/mail/class_groupMail.inc:96
 msgid "Alternative mail addresses for the group"
 msgstr ""
 
-#: admin/groups/mail/class_groupMail.inc:97
-msgid "Forward messages to non group members"
-msgstr ""
-
-#: admin/groups/mail/class_groupMail.inc:101
-msgid "Only allowed to receive local mail"
-msgstr ""
-
 #: admin/groups/mail/class_groupMail.inc:101
-msgid ""
-"Whether this group mail is only allowed to receive messages from local "
-"senders"
+msgid "Forward messages to non group members"
 msgstr ""
 
 #: admin/systems/services/postfix/class_servicePostfix.inc:29
@@ -223,8 +213,7 @@ msgid "Rules"
 msgstr ""
 
 #: admin/systems/services/spam/class_serviceSpamAssassin.inc:116
-#: admin/systems/services/spam/class_serviceSpamAssassin.inc:124
-msgid "Edit spam rule"
+msgid "Edit spam ruleEdit spam rule"
 msgstr ""
 
 #: admin/systems/services/spam/class_serviceSpamAssassin.inc:119
@@ -235,6 +224,10 @@ msgstr "Navn"
 msgid "Rule"
 msgstr ""
 
+#: admin/systems/services/spam/class_serviceSpamAssassin.inc:124
+msgid "Edit spam rule"
+msgstr ""
+
 #: admin/systems/services/virus/class_serviceAntiVirus.inc:31
 #: admin/systems/services/virus/class_serviceAntiVirus.inc:32
 msgid "Antivirus service"
@@ -280,10 +273,6 @@ msgstr ""
 msgid "Max directory recursions"
 msgstr ""
 
-#: admin/systems/services/virus/class_serviceAntiVirus.inc:68
-msgid "Maximum number of directory recursions"
-msgstr ""
-
 #: admin/systems/services/virus/class_serviceAntiVirus.inc:73
 msgid "Checks per day"
 msgstr ""
@@ -328,6 +317,10 @@ msgstr ""
 msgid "Maximum compression ratio"
 msgstr ""
 
+#: admin/systems/services/virus/class_serviceAntiVirus.inc:113
+msgid " "
+msgstr ""
+
 #: admin/systems/services/imap/class_serviceIMAP.inc:32
 msgid "IMAP/POP3 generic service"
 msgstr ""
@@ -351,16 +344,16 @@ msgstr ""
 msgid "Mail method '%s' is unknown!"
 msgstr ""
 
-#: personal/mail/class_mail-methods.inc:727
-#: personal/mail/class_mail-methods.inc:728
+#: personal/mail/class_mail-methods.inc:735
+#: personal/mail/class_mail-methods.inc:736
 msgid "None"
 msgstr ""
 
-#: personal/mail/class_mail-methods.inc:817
+#: personal/mail/class_mail-methods.inc:825
 msgid "Unknown"
 msgstr ""
 
-#: personal/mail/class_mail-methods.inc:819
+#: personal/mail/class_mail-methods.inc:827
 msgid "Unlimited"
 msgstr ""
 
diff --git a/mail/locale/nl/fusiondirectory.po b/mail/locale/nl/fusiondirectory.po
index b9d78e123d650bd8d403c0a970063842ffbb25b2..9868f20caa0ea57c274d4915c4aaaca6d037ffdf 100644
--- a/mail/locale/nl/fusiondirectory.po
+++ b/mail/locale/nl/fusiondirectory.po
@@ -3,16 +3,14 @@
 # This file is distributed under the same license as the PACKAGE package.
 # 
 # Translators:
-# Christophe Augello <christophe@augello.be>, 2012
-#  Niels Klomp (CareWorks ICT Services) <nk@careworks.nl>, 2005
 msgid ""
 msgstr ""
-"Project-Id-Version: FusionDirectory-108\n"
+"Project-Id-Version: FusionDirectory-109\n"
 "Report-Msgid-Bugs-To: documentation@lists.fusiondirectory.org\n"
-"POT-Creation-Date: 2015-03-31 11:49+0200\n"
+"POT-Creation-Date: 2014-12-15 17:47+0100\n"
 "PO-Revision-Date: 2015-03-31 11:41+0000\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>\n"
-"Language-Team: Dutch (http://www.transifex.com/projects/p/FusionDirectory-108/language/nl/)\n"
+"Language-Team: Dutch (http://www.transifex.com/projects/p/FusionDirectory-109/language/nl/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -34,47 +32,37 @@ msgstr ""
 msgid "Informations"
 msgstr "Informatie"
 
-#: admin/groups/mail/class_groupMail.inc:82
+#: admin/groups/mail/class_groupMail.inc:86
 #: personal/mail/class_mailAccount.inc:100
 msgid "Primary address"
 msgstr "Primair adres"
 
-#: admin/groups/mail/class_groupMail.inc:82
+#: admin/groups/mail/class_groupMail.inc:86
 msgid "The primary mail address"
 msgstr "Het primaire email adres"
 
-#: admin/groups/mail/class_groupMail.inc:86
+#: admin/groups/mail/class_groupMail.inc:90
 #: personal/mail/class_mailAccount.inc:104
 msgid "Server"
 msgstr "Server"
 
-#: admin/groups/mail/class_groupMail.inc:86
+#: admin/groups/mail/class_groupMail.inc:90
 msgid "Server mail"
 msgstr ""
 
-#: admin/groups/mail/class_groupMail.inc:92
+#: admin/groups/mail/class_groupMail.inc:96
 #: personal/mail/class_mailAccount.inc:120
 msgid "Alternative addresses"
 msgstr "Alternatieve adressen"
 
-#: admin/groups/mail/class_groupMail.inc:92
+#: admin/groups/mail/class_groupMail.inc:96
 msgid "Alternative mail addresses for the group"
 msgstr ""
 
-#: admin/groups/mail/class_groupMail.inc:97
+#: admin/groups/mail/class_groupMail.inc:101
 msgid "Forward messages to non group members"
 msgstr "Stuur berichten door naar niet groepsleden"
 
-#: admin/groups/mail/class_groupMail.inc:101
-msgid "Only allowed to receive local mail"
-msgstr ""
-
-#: admin/groups/mail/class_groupMail.inc:101
-msgid ""
-"Whether this group mail is only allowed to receive messages from local "
-"senders"
-msgstr ""
-
 #: admin/systems/services/postfix/class_servicePostfix.inc:29
 #: admin/systems/services/postfix/class_servicePostfix.inc:30
 msgid "Postfix (SMTP)"
@@ -225,8 +213,7 @@ msgid "Rules"
 msgstr "Regel"
 
 #: admin/systems/services/spam/class_serviceSpamAssassin.inc:116
-#: admin/systems/services/spam/class_serviceSpamAssassin.inc:124
-msgid "Edit spam rule"
+msgid "Edit spam ruleEdit spam rule"
 msgstr ""
 
 #: admin/systems/services/spam/class_serviceSpamAssassin.inc:119
@@ -237,6 +224,10 @@ msgstr "Naam"
 msgid "Rule"
 msgstr "Regel"
 
+#: admin/systems/services/spam/class_serviceSpamAssassin.inc:124
+msgid "Edit spam rule"
+msgstr ""
+
 #: admin/systems/services/virus/class_serviceAntiVirus.inc:31
 #: admin/systems/services/virus/class_serviceAntiVirus.inc:32
 msgid "Antivirus service"
@@ -282,10 +273,6 @@ msgstr ""
 msgid "Max directory recursions"
 msgstr "Max map recursies"
 
-#: admin/systems/services/virus/class_serviceAntiVirus.inc:68
-msgid "Maximum number of directory recursions"
-msgstr ""
-
 #: admin/systems/services/virus/class_serviceAntiVirus.inc:73
 msgid "Checks per day"
 msgstr "Checks per dag"
@@ -330,6 +317,10 @@ msgstr "Maximale recursie"
 msgid "Maximum compression ratio"
 msgstr "Maximale compressie ratio"
 
+#: admin/systems/services/virus/class_serviceAntiVirus.inc:113
+msgid " "
+msgstr ""
+
 #: admin/systems/services/imap/class_serviceIMAP.inc:32
 msgid "IMAP/POP3 generic service"
 msgstr ""
@@ -341,7 +332,7 @@ msgstr "IMAP/POP3"
 #: personal/mail/class_mail-methods.inc:156
 #: personal/mail/class_mail-methods.inc:517
 msgid "Configuration error"
-msgstr "Instelling fout"
+msgstr "Configuratie fout"
 
 #: personal/mail/class_mail-methods.inc:157
 #, php-format
@@ -353,16 +344,16 @@ msgstr "De geconfigureerde mail attribuut '%s' is niet ondersteund!"
 msgid "Mail method '%s' is unknown!"
 msgstr "Mail methode '%s' is onbekend!"
 
-#: personal/mail/class_mail-methods.inc:727
-#: personal/mail/class_mail-methods.inc:728
+#: personal/mail/class_mail-methods.inc:735
+#: personal/mail/class_mail-methods.inc:736
 msgid "None"
 msgstr "Geen"
 
-#: personal/mail/class_mail-methods.inc:817
+#: personal/mail/class_mail-methods.inc:825
 msgid "Unknown"
 msgstr "Onbekend"
 
-#: personal/mail/class_mail-methods.inc:819
+#: personal/mail/class_mail-methods.inc:827
 msgid "Unlimited"
 msgstr "Onbeperkt"
 
diff --git a/mail/locale/pl/fusiondirectory.po b/mail/locale/pl/fusiondirectory.po
index b4565076e1bc807d03ec2ca2276625c6f36e8e2c..c3c12eb7c5a58f93203169a403d5759325b67c3c 100644
--- a/mail/locale/pl/fusiondirectory.po
+++ b/mail/locale/pl/fusiondirectory.po
@@ -5,12 +5,12 @@
 # Translators:
 msgid ""
 msgstr ""
-"Project-Id-Version: FusionDirectory-108\n"
+"Project-Id-Version: FusionDirectory-109\n"
 "Report-Msgid-Bugs-To: documentation@lists.fusiondirectory.org\n"
-"POT-Creation-Date: 2015-03-31 11:49+0200\n"
+"POT-Creation-Date: 2014-12-15 17:47+0100\n"
 "PO-Revision-Date: 2015-03-31 11:41+0000\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>\n"
-"Language-Team: Polish (http://www.transifex.com/projects/p/FusionDirectory-108/language/pl/)\n"
+"Language-Team: Polish (http://www.transifex.com/projects/p/FusionDirectory-109/language/pl/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -32,47 +32,37 @@ msgstr ""
 msgid "Informations"
 msgstr ""
 
-#: admin/groups/mail/class_groupMail.inc:82
+#: admin/groups/mail/class_groupMail.inc:86
 #: personal/mail/class_mailAccount.inc:100
 msgid "Primary address"
 msgstr "Adres podstawowy"
 
-#: admin/groups/mail/class_groupMail.inc:82
+#: admin/groups/mail/class_groupMail.inc:86
 msgid "The primary mail address"
 msgstr ""
 
-#: admin/groups/mail/class_groupMail.inc:86
+#: admin/groups/mail/class_groupMail.inc:90
 #: personal/mail/class_mailAccount.inc:104
 msgid "Server"
 msgstr "Serwer"
 
-#: admin/groups/mail/class_groupMail.inc:86
+#: admin/groups/mail/class_groupMail.inc:90
 msgid "Server mail"
 msgstr ""
 
-#: admin/groups/mail/class_groupMail.inc:92
+#: admin/groups/mail/class_groupMail.inc:96
 #: personal/mail/class_mailAccount.inc:120
 msgid "Alternative addresses"
 msgstr "Adresy alternatywne"
 
-#: admin/groups/mail/class_groupMail.inc:92
+#: admin/groups/mail/class_groupMail.inc:96
 msgid "Alternative mail addresses for the group"
 msgstr ""
 
-#: admin/groups/mail/class_groupMail.inc:97
+#: admin/groups/mail/class_groupMail.inc:101
 msgid "Forward messages to non group members"
 msgstr "PrzekaÅ¼ wiadomoÅ›ci do czÅ‚onkÃ³w bez grupy"
 
-#: admin/groups/mail/class_groupMail.inc:101
-msgid "Only allowed to receive local mail"
-msgstr ""
-
-#: admin/groups/mail/class_groupMail.inc:101
-msgid ""
-"Whether this group mail is only allowed to receive messages from local "
-"senders"
-msgstr ""
-
 #: admin/systems/services/postfix/class_servicePostfix.inc:29
 #: admin/systems/services/postfix/class_servicePostfix.inc:30
 msgid "Postfix (SMTP)"
@@ -223,8 +213,7 @@ msgid "Rules"
 msgstr ""
 
 #: admin/systems/services/spam/class_serviceSpamAssassin.inc:116
-#: admin/systems/services/spam/class_serviceSpamAssassin.inc:124
-msgid "Edit spam rule"
+msgid "Edit spam ruleEdit spam rule"
 msgstr ""
 
 #: admin/systems/services/spam/class_serviceSpamAssassin.inc:119
@@ -235,6 +224,10 @@ msgstr "ImiÄ™"
 msgid "Rule"
 msgstr ""
 
+#: admin/systems/services/spam/class_serviceSpamAssassin.inc:124
+msgid "Edit spam rule"
+msgstr ""
+
 #: admin/systems/services/virus/class_serviceAntiVirus.inc:31
 #: admin/systems/services/virus/class_serviceAntiVirus.inc:32
 msgid "Antivirus service"
@@ -280,10 +273,6 @@ msgstr ""
 msgid "Max directory recursions"
 msgstr ""
 
-#: admin/systems/services/virus/class_serviceAntiVirus.inc:68
-msgid "Maximum number of directory recursions"
-msgstr ""
-
 #: admin/systems/services/virus/class_serviceAntiVirus.inc:73
 msgid "Checks per day"
 msgstr ""
@@ -328,6 +317,10 @@ msgstr ""
 msgid "Maximum compression ratio"
 msgstr ""
 
+#: admin/systems/services/virus/class_serviceAntiVirus.inc:113
+msgid " "
+msgstr ""
+
 #: admin/systems/services/imap/class_serviceIMAP.inc:32
 msgid "IMAP/POP3 generic service"
 msgstr ""
@@ -351,16 +344,16 @@ msgstr ""
 msgid "Mail method '%s' is unknown!"
 msgstr ""
 
-#: personal/mail/class_mail-methods.inc:727
-#: personal/mail/class_mail-methods.inc:728
+#: personal/mail/class_mail-methods.inc:735
+#: personal/mail/class_mail-methods.inc:736
 msgid "None"
 msgstr ""
 
-#: personal/mail/class_mail-methods.inc:817
+#: personal/mail/class_mail-methods.inc:825
 msgid "Unknown"
 msgstr "Nieznane"
 
-#: personal/mail/class_mail-methods.inc:819
+#: personal/mail/class_mail-methods.inc:827
 msgid "Unlimited"
 msgstr ""
 
diff --git a/mail/locale/pt/fusiondirectory.po b/mail/locale/pt/fusiondirectory.po
index 6c135a27f882a38c8efa3bf634da9fe6789143e7..fdc483511626ee4a875d9edcf962ba9fab08c5ea 100644
--- a/mail/locale/pt/fusiondirectory.po
+++ b/mail/locale/pt/fusiondirectory.po
@@ -5,12 +5,12 @@
 # Translators:
 msgid ""
 msgstr ""
-"Project-Id-Version: FusionDirectory-108\n"
+"Project-Id-Version: FusionDirectory-109\n"
 "Report-Msgid-Bugs-To: documentation@lists.fusiondirectory.org\n"
-"POT-Creation-Date: 2015-03-31 11:49+0200\n"
+"POT-Creation-Date: 2014-12-15 17:47+0100\n"
 "PO-Revision-Date: 2015-03-31 11:41+0000\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>\n"
-"Language-Team: Portuguese (http://www.transifex.com/projects/p/FusionDirectory-108/language/pt/)\n"
+"Language-Team: Portuguese (http://www.transifex.com/projects/p/FusionDirectory-109/language/pt/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -32,45 +32,35 @@ msgstr ""
 msgid "Informations"
 msgstr ""
 
-#: admin/groups/mail/class_groupMail.inc:82
+#: admin/groups/mail/class_groupMail.inc:86
 #: personal/mail/class_mailAccount.inc:100
 msgid "Primary address"
 msgstr ""
 
-#: admin/groups/mail/class_groupMail.inc:82
+#: admin/groups/mail/class_groupMail.inc:86
 msgid "The primary mail address"
 msgstr ""
 
-#: admin/groups/mail/class_groupMail.inc:86
+#: admin/groups/mail/class_groupMail.inc:90
 #: personal/mail/class_mailAccount.inc:104
 msgid "Server"
 msgstr "Servidor"
 
-#: admin/groups/mail/class_groupMail.inc:86
+#: admin/groups/mail/class_groupMail.inc:90
 msgid "Server mail"
 msgstr ""
 
-#: admin/groups/mail/class_groupMail.inc:92
+#: admin/groups/mail/class_groupMail.inc:96
 #: personal/mail/class_mailAccount.inc:120
 msgid "Alternative addresses"
 msgstr ""
 
-#: admin/groups/mail/class_groupMail.inc:92
+#: admin/groups/mail/class_groupMail.inc:96
 msgid "Alternative mail addresses for the group"
 msgstr ""
 
-#: admin/groups/mail/class_groupMail.inc:97
-msgid "Forward messages to non group members"
-msgstr ""
-
-#: admin/groups/mail/class_groupMail.inc:101
-msgid "Only allowed to receive local mail"
-msgstr ""
-
 #: admin/groups/mail/class_groupMail.inc:101
-msgid ""
-"Whether this group mail is only allowed to receive messages from local "
-"senders"
+msgid "Forward messages to non group members"
 msgstr ""
 
 #: admin/systems/services/postfix/class_servicePostfix.inc:29
@@ -223,8 +213,7 @@ msgid "Rules"
 msgstr ""
 
 #: admin/systems/services/spam/class_serviceSpamAssassin.inc:116
-#: admin/systems/services/spam/class_serviceSpamAssassin.inc:124
-msgid "Edit spam rule"
+msgid "Edit spam ruleEdit spam rule"
 msgstr ""
 
 #: admin/systems/services/spam/class_serviceSpamAssassin.inc:119
@@ -235,6 +224,10 @@ msgstr "Nome"
 msgid "Rule"
 msgstr ""
 
+#: admin/systems/services/spam/class_serviceSpamAssassin.inc:124
+msgid "Edit spam rule"
+msgstr ""
+
 #: admin/systems/services/virus/class_serviceAntiVirus.inc:31
 #: admin/systems/services/virus/class_serviceAntiVirus.inc:32
 msgid "Antivirus service"
@@ -280,10 +273,6 @@ msgstr ""
 msgid "Max directory recursions"
 msgstr ""
 
-#: admin/systems/services/virus/class_serviceAntiVirus.inc:68
-msgid "Maximum number of directory recursions"
-msgstr ""
-
 #: admin/systems/services/virus/class_serviceAntiVirus.inc:73
 msgid "Checks per day"
 msgstr ""
@@ -328,6 +317,10 @@ msgstr ""
 msgid "Maximum compression ratio"
 msgstr ""
 
+#: admin/systems/services/virus/class_serviceAntiVirus.inc:113
+msgid " "
+msgstr ""
+
 #: admin/systems/services/imap/class_serviceIMAP.inc:32
 msgid "IMAP/POP3 generic service"
 msgstr ""
@@ -351,16 +344,16 @@ msgstr ""
 msgid "Mail method '%s' is unknown!"
 msgstr ""
 
-#: personal/mail/class_mail-methods.inc:727
-#: personal/mail/class_mail-methods.inc:728
+#: personal/mail/class_mail-methods.inc:735
+#: personal/mail/class_mail-methods.inc:736
 msgid "None"
 msgstr ""
 
-#: personal/mail/class_mail-methods.inc:817
+#: personal/mail/class_mail-methods.inc:825
 msgid "Unknown"
 msgstr "Desconhecido"
 
-#: personal/mail/class_mail-methods.inc:819
+#: personal/mail/class_mail-methods.inc:827
 msgid "Unlimited"
 msgstr ""
 
diff --git a/mail/locale/pt_BR/fusiondirectory.po b/mail/locale/pt_BR/fusiondirectory.po
index 320ea80d62d891663c52b1f29f6602a817b92abe..67705c9c4828a370e9eac9a6cc682f4c716fabef 100644
--- a/mail/locale/pt_BR/fusiondirectory.po
+++ b/mail/locale/pt_BR/fusiondirectory.po
@@ -3,17 +3,14 @@
 # This file is distributed under the same license as the PACKAGE package.
 # 
 # Translators:
-# ALEJANDRO BARRIOS <alejandrobarrios@interlegis.leg.br>, 2014
-# kayocarneiro <kayomatheus@gmail.com>, 2014
-# kayocarneiro <kayomatheus@gmail.com>, 2014
 msgid ""
 msgstr ""
-"Project-Id-Version: FusionDirectory-108\n"
+"Project-Id-Version: FusionDirectory-109\n"
 "Report-Msgid-Bugs-To: documentation@lists.fusiondirectory.org\n"
-"POT-Creation-Date: 2015-03-31 11:49+0200\n"
+"POT-Creation-Date: 2014-12-15 17:47+0100\n"
 "PO-Revision-Date: 2015-03-31 11:41+0000\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>\n"
-"Language-Team: Portuguese (Brazil) (http://www.transifex.com/projects/p/FusionDirectory-108/language/pt_BR/)\n"
+"Language-Team: Portuguese (Brazil) (http://www.transifex.com/projects/p/FusionDirectory-109/language/pt_BR/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -35,47 +32,37 @@ msgstr "OpÃ§Ã£o de grupo de e-mail"
 msgid "Informations"
 msgstr "InformaÃ§Ãµes"
 
-#: admin/groups/mail/class_groupMail.inc:82
+#: admin/groups/mail/class_groupMail.inc:86
 #: personal/mail/class_mailAccount.inc:100
 msgid "Primary address"
 msgstr "EndereÃ§o primÃ¡rio"
 
-#: admin/groups/mail/class_groupMail.inc:82
+#: admin/groups/mail/class_groupMail.inc:86
 msgid "The primary mail address"
 msgstr "EndereÃ§o de e-mail primÃ¡rio"
 
-#: admin/groups/mail/class_groupMail.inc:86
+#: admin/groups/mail/class_groupMail.inc:90
 #: personal/mail/class_mailAccount.inc:104
 msgid "Server"
-msgstr "Servidor"
+msgstr "servidor"
 
-#: admin/groups/mail/class_groupMail.inc:86
+#: admin/groups/mail/class_groupMail.inc:90
 msgid "Server mail"
 msgstr "Servidor de e-mail"
 
-#: admin/groups/mail/class_groupMail.inc:92
+#: admin/groups/mail/class_groupMail.inc:96
 #: personal/mail/class_mailAccount.inc:120
 msgid "Alternative addresses"
 msgstr "EndereÃ§os alternativos"
 
-#: admin/groups/mail/class_groupMail.inc:92
+#: admin/groups/mail/class_groupMail.inc:96
 msgid "Alternative mail addresses for the group"
 msgstr "EndereÃ§o de e-mail alternativo para o grupo"
 
-#: admin/groups/mail/class_groupMail.inc:97
+#: admin/groups/mail/class_groupMail.inc:101
 msgid "Forward messages to non group members"
 msgstr "Encaminhar mensagens para nÃ£o membros de grupos"
 
-#: admin/groups/mail/class_groupMail.inc:101
-msgid "Only allowed to receive local mail"
-msgstr ""
-
-#: admin/groups/mail/class_groupMail.inc:101
-msgid ""
-"Whether this group mail is only allowed to receive messages from local "
-"senders"
-msgstr ""
-
 #: admin/systems/services/postfix/class_servicePostfix.inc:29
 #: admin/systems/services/postfix/class_servicePostfix.inc:30
 msgid "Postfix (SMTP)"
@@ -226,8 +213,7 @@ msgid "Rules"
 msgstr "Regras"
 
 #: admin/systems/services/spam/class_serviceSpamAssassin.inc:116
-#: admin/systems/services/spam/class_serviceSpamAssassin.inc:124
-msgid "Edit spam rule"
+msgid "Edit spam ruleEdit spam rule"
 msgstr "Editar regra de spam"
 
 #: admin/systems/services/spam/class_serviceSpamAssassin.inc:119
@@ -238,6 +224,10 @@ msgstr "Nome"
 msgid "Rule"
 msgstr "Regra"
 
+#: admin/systems/services/spam/class_serviceSpamAssassin.inc:124
+msgid "Edit spam rule"
+msgstr "Editar regra de spam"
+
 #: admin/systems/services/virus/class_serviceAntiVirus.inc:31
 #: admin/systems/services/virus/class_serviceAntiVirus.inc:32
 msgid "Antivirus service"
@@ -283,10 +273,6 @@ msgstr "NÃºmero mÃ¡ximo de threads"
 msgid "Max directory recursions"
 msgstr "RecursÃ£o de Max diretÃ³rio"
 
-#: admin/systems/services/virus/class_serviceAntiVirus.inc:68
-msgid "Maximum number of directory recursions"
-msgstr ""
-
 #: admin/systems/services/virus/class_serviceAntiVirus.inc:73
 msgid "Checks per day"
 msgstr "Checagens por dia"
@@ -331,6 +317,10 @@ msgstr "RecursÃ£o mÃ¡xima"
 msgid "Maximum compression ratio"
 msgstr "MÃ¡xima taxa de compressÃ£o"
 
+#: admin/systems/services/virus/class_serviceAntiVirus.inc:113
+msgid " "
+msgstr ""
+
 #: admin/systems/services/imap/class_serviceIMAP.inc:32
 msgid "IMAP/POP3 generic service"
 msgstr "ServiÃ§o genÃ©rico IMAP/POP3"
@@ -354,16 +344,16 @@ msgstr ""
 msgid "Mail method '%s' is unknown!"
 msgstr ""
 
-#: personal/mail/class_mail-methods.inc:727
-#: personal/mail/class_mail-methods.inc:728
+#: personal/mail/class_mail-methods.inc:735
+#: personal/mail/class_mail-methods.inc:736
 msgid "None"
 msgstr "Nenhum"
 
-#: personal/mail/class_mail-methods.inc:817
+#: personal/mail/class_mail-methods.inc:825
 msgid "Unknown"
 msgstr "Desconhecido"
 
-#: personal/mail/class_mail-methods.inc:819
+#: personal/mail/class_mail-methods.inc:827
 msgid "Unlimited"
 msgstr ""
 
diff --git a/mail/locale/ru/fusiondirectory.po b/mail/locale/ru/fusiondirectory.po
index a0cd576e26b0b46958b01919554d503f95b9f764..007c57d396fd8698d801860865159c2b55dd16ce 100644
--- a/mail/locale/ru/fusiondirectory.po
+++ b/mail/locale/ru/fusiondirectory.po
@@ -3,20 +3,19 @@
 # This file is distributed under the same license as the PACKAGE package.
 # 
 # Translators:
-#  Valia V. Vaneeva <fattie@altlinux.ru>, 2004
 msgid ""
 msgstr ""
-"Project-Id-Version: FusionDirectory-108\n"
+"Project-Id-Version: FusionDirectory-109\n"
 "Report-Msgid-Bugs-To: documentation@lists.fusiondirectory.org\n"
-"POT-Creation-Date: 2015-03-31 11:49+0200\n"
-"PO-Revision-Date: 2015-03-31 10:03+0000\n"
+"POT-Creation-Date: 2014-12-15 17:47+0100\n"
+"PO-Revision-Date: 2015-04-18 18:07+0000\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>\n"
-"Language-Team: Russian (http://www.transifex.com/projects/p/FusionDirectory-108/language/ru/)\n"
+"Language-Team: Russian (http://www.transifex.com/projects/p/FusionDirectory-109/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=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);\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:79
@@ -33,47 +32,37 @@ msgstr ""
 msgid "Informations"
 msgstr "Ð˜Ð½Ñ„Ð¾Ñ€Ð¼Ð°Ñ†Ð¸Ñ"
 
-#: admin/groups/mail/class_groupMail.inc:82
+#: admin/groups/mail/class_groupMail.inc:86
 #: personal/mail/class_mailAccount.inc:100
 msgid "Primary address"
 msgstr "ÐžÑÐ½Ð¾Ð²Ð½Ð¾Ð¹ Ð°Ð´Ñ€ÐµÑ"
 
-#: admin/groups/mail/class_groupMail.inc:82
+#: admin/groups/mail/class_groupMail.inc:86
 msgid "The primary mail address"
 msgstr ""
 
-#: admin/groups/mail/class_groupMail.inc:86
+#: admin/groups/mail/class_groupMail.inc:90
 #: personal/mail/class_mailAccount.inc:104
 msgid "Server"
 msgstr "Ð¡ÐµÑ€Ð²ÐµÑ€"
 
-#: admin/groups/mail/class_groupMail.inc:86
+#: admin/groups/mail/class_groupMail.inc:90
 msgid "Server mail"
 msgstr ""
 
-#: admin/groups/mail/class_groupMail.inc:92
+#: admin/groups/mail/class_groupMail.inc:96
 #: personal/mail/class_mailAccount.inc:120
 msgid "Alternative addresses"
 msgstr ""
 
-#: admin/groups/mail/class_groupMail.inc:92
+#: admin/groups/mail/class_groupMail.inc:96
 msgid "Alternative mail addresses for the group"
 msgstr ""
 
-#: admin/groups/mail/class_groupMail.inc:97
+#: admin/groups/mail/class_groupMail.inc:101
 msgid "Forward messages to non group members"
 msgstr "ÐŸÐµÑ€ÐµÑÑ‹Ð»Ð°Ñ‚ÑŒ ÑÐ¾Ð¾Ð±Ñ‰ÐµÐ½Ð¸Ñ Ð½Ðµ Ñ‡Ð»ÐµÐ½Ð°Ð¼ Ð³Ñ€ÑƒÐ¿Ð¿Ñ‹"
 
-#: admin/groups/mail/class_groupMail.inc:101
-msgid "Only allowed to receive local mail"
-msgstr ""
-
-#: admin/groups/mail/class_groupMail.inc:101
-msgid ""
-"Whether this group mail is only allowed to receive messages from local "
-"senders"
-msgstr ""
-
 #: admin/systems/services/postfix/class_servicePostfix.inc:29
 #: admin/systems/services/postfix/class_servicePostfix.inc:30
 msgid "Postfix (SMTP)"
@@ -224,8 +213,7 @@ msgid "Rules"
 msgstr ""
 
 #: admin/systems/services/spam/class_serviceSpamAssassin.inc:116
-#: admin/systems/services/spam/class_serviceSpamAssassin.inc:124
-msgid "Edit spam rule"
+msgid "Edit spam ruleEdit spam rule"
 msgstr ""
 
 #: admin/systems/services/spam/class_serviceSpamAssassin.inc:119
@@ -236,6 +224,10 @@ msgstr "Ð¤Ð°Ð¼Ð¸Ð»Ð¸Ñ"
 msgid "Rule"
 msgstr ""
 
+#: admin/systems/services/spam/class_serviceSpamAssassin.inc:124
+msgid "Edit spam rule"
+msgstr ""
+
 #: admin/systems/services/virus/class_serviceAntiVirus.inc:31
 #: admin/systems/services/virus/class_serviceAntiVirus.inc:32
 msgid "Antivirus service"
@@ -247,7 +239,7 @@ msgstr ""
 
 #: admin/systems/services/virus/class_serviceAntiVirus.inc:50
 msgid "Database user"
-msgstr ""
+msgstr "ÐŸÐ¾Ð»ÑŒÐ·Ð¾Ð²Ð°Ñ‚ÐµÐ»ÑŒ Ð±Ð°Ð·Ñ‹ Ð´Ð°Ð½Ð½Ñ‹Ñ…"
 
 #: admin/systems/services/virus/class_serviceAntiVirus.inc:50
 msgid "User name for the database"
@@ -281,10 +273,6 @@ msgstr ""
 msgid "Max directory recursions"
 msgstr ""
 
-#: admin/systems/services/virus/class_serviceAntiVirus.inc:68
-msgid "Maximum number of directory recursions"
-msgstr ""
-
 #: admin/systems/services/virus/class_serviceAntiVirus.inc:73
 msgid "Checks per day"
 msgstr ""
@@ -329,6 +317,10 @@ msgstr ""
 msgid "Maximum compression ratio"
 msgstr ""
 
+#: admin/systems/services/virus/class_serviceAntiVirus.inc:113
+msgid " "
+msgstr ""
+
 #: admin/systems/services/imap/class_serviceIMAP.inc:32
 msgid "IMAP/POP3 generic service"
 msgstr ""
@@ -340,7 +332,7 @@ msgstr ""
 #: personal/mail/class_mail-methods.inc:156
 #: personal/mail/class_mail-methods.inc:517
 msgid "Configuration error"
-msgstr ""
+msgstr "ÐžÑˆÐ¸Ð±ÐºÐ° ÐºÐ¾Ð½Ñ„Ð¸Ð³ÑƒÑ€Ð°Ñ†Ð¸Ð¸"
 
 #: personal/mail/class_mail-methods.inc:157
 #, php-format
@@ -352,16 +344,16 @@ msgstr ""
 msgid "Mail method '%s' is unknown!"
 msgstr ""
 
-#: personal/mail/class_mail-methods.inc:727
-#: personal/mail/class_mail-methods.inc:728
+#: personal/mail/class_mail-methods.inc:735
+#: personal/mail/class_mail-methods.inc:736
 msgid "None"
 msgstr ""
 
-#: personal/mail/class_mail-methods.inc:817
+#: personal/mail/class_mail-methods.inc:825
 msgid "Unknown"
 msgstr "ÐÐµÐ¸Ð·Ð²ÐµÑÑ‚Ð½Ð¾"
 
-#: personal/mail/class_mail-methods.inc:819
+#: personal/mail/class_mail-methods.inc:827
 msgid "Unlimited"
 msgstr ""
 
@@ -445,7 +437,7 @@ msgstr ""
 
 #: personal/mail/class_mailAccount.inc:145
 msgid "till"
-msgstr ""
+msgstr "Ð´Ð¾"
 
 #: personal/mail/class_mailAccount.inc:156
 msgid "Spam options"
diff --git a/mail/locale/ru@petr1708/fusiondirectory.po b/mail/locale/ru@petr1708/fusiondirectory.po
index 40fe217e83c1859e778c93bbca0b3daec5833b22..536f3d519c25a73c6b8342830a41a31aa6aa863f 100644
--- a/mail/locale/ru@petr1708/fusiondirectory.po
+++ b/mail/locale/ru@petr1708/fusiondirectory.po
@@ -5,17 +5,17 @@
 # Translators:
 msgid ""
 msgstr ""
-"Project-Id-Version: FusionDirectory-108\n"
+"Project-Id-Version: FusionDirectory-109\n"
 "Report-Msgid-Bugs-To: documentation@lists.fusiondirectory.org\n"
-"POT-Creation-Date: 2015-03-31 11:49+0200\n"
-"PO-Revision-Date: 2015-03-17 17:56+0000\n"
+"POT-Creation-Date: 2014-12-15 17:47+0100\n"
+"PO-Revision-Date: 2014-12-15 16:59+0000\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>\n"
-"Language-Team: Russian Petrine orthography (http://www.transifex.com/projects/p/FusionDirectory-108/language/ru@petr1708/)\n"
+"Language-Team: Russian Petrine orthography (http://www.transifex.com/projects/p/FusionDirectory-109/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=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);\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:79
@@ -32,45 +32,35 @@ msgstr ""
 msgid "Informations"
 msgstr ""
 
-#: admin/groups/mail/class_groupMail.inc:82
+#: admin/groups/mail/class_groupMail.inc:86
 #: personal/mail/class_mailAccount.inc:100
 msgid "Primary address"
 msgstr ""
 
-#: admin/groups/mail/class_groupMail.inc:82
+#: admin/groups/mail/class_groupMail.inc:86
 msgid "The primary mail address"
 msgstr ""
 
-#: admin/groups/mail/class_groupMail.inc:86
+#: admin/groups/mail/class_groupMail.inc:90
 #: personal/mail/class_mailAccount.inc:104
 msgid "Server"
 msgstr ""
 
-#: admin/groups/mail/class_groupMail.inc:86
+#: admin/groups/mail/class_groupMail.inc:90
 msgid "Server mail"
 msgstr ""
 
-#: admin/groups/mail/class_groupMail.inc:92
+#: admin/groups/mail/class_groupMail.inc:96
 #: personal/mail/class_mailAccount.inc:120
 msgid "Alternative addresses"
 msgstr ""
 
-#: admin/groups/mail/class_groupMail.inc:92
+#: admin/groups/mail/class_groupMail.inc:96
 msgid "Alternative mail addresses for the group"
 msgstr ""
 
-#: admin/groups/mail/class_groupMail.inc:97
-msgid "Forward messages to non group members"
-msgstr ""
-
-#: admin/groups/mail/class_groupMail.inc:101
-msgid "Only allowed to receive local mail"
-msgstr ""
-
 #: admin/groups/mail/class_groupMail.inc:101
-msgid ""
-"Whether this group mail is only allowed to receive messages from local "
-"senders"
+msgid "Forward messages to non group members"
 msgstr ""
 
 #: admin/systems/services/postfix/class_servicePostfix.inc:29
@@ -223,8 +213,7 @@ msgid "Rules"
 msgstr ""
 
 #: admin/systems/services/spam/class_serviceSpamAssassin.inc:116
-#: admin/systems/services/spam/class_serviceSpamAssassin.inc:124
-msgid "Edit spam rule"
+msgid "Edit spam ruleEdit spam rule"
 msgstr ""
 
 #: admin/systems/services/spam/class_serviceSpamAssassin.inc:119
@@ -235,6 +224,10 @@ msgstr ""
 msgid "Rule"
 msgstr ""
 
+#: admin/systems/services/spam/class_serviceSpamAssassin.inc:124
+msgid "Edit spam rule"
+msgstr ""
+
 #: admin/systems/services/virus/class_serviceAntiVirus.inc:31
 #: admin/systems/services/virus/class_serviceAntiVirus.inc:32
 msgid "Antivirus service"
@@ -280,10 +273,6 @@ msgstr ""
 msgid "Max directory recursions"
 msgstr ""
 
-#: admin/systems/services/virus/class_serviceAntiVirus.inc:68
-msgid "Maximum number of directory recursions"
-msgstr ""
-
 #: admin/systems/services/virus/class_serviceAntiVirus.inc:73
 msgid "Checks per day"
 msgstr ""
@@ -328,6 +317,10 @@ msgstr ""
 msgid "Maximum compression ratio"
 msgstr ""
 
+#: admin/systems/services/virus/class_serviceAntiVirus.inc:113
+msgid " "
+msgstr ""
+
 #: admin/systems/services/imap/class_serviceIMAP.inc:32
 msgid "IMAP/POP3 generic service"
 msgstr ""
@@ -351,16 +344,16 @@ msgstr ""
 msgid "Mail method '%s' is unknown!"
 msgstr ""
 
-#: personal/mail/class_mail-methods.inc:727
-#: personal/mail/class_mail-methods.inc:728
+#: personal/mail/class_mail-methods.inc:735
+#: personal/mail/class_mail-methods.inc:736
 msgid "None"
 msgstr ""
 
-#: personal/mail/class_mail-methods.inc:817
+#: personal/mail/class_mail-methods.inc:825
 msgid "Unknown"
 msgstr ""
 
-#: personal/mail/class_mail-methods.inc:819
+#: personal/mail/class_mail-methods.inc:827
 msgid "Unlimited"
 msgstr ""
 
diff --git a/mail/locale/sv/fusiondirectory.po b/mail/locale/sv/fusiondirectory.po
index 4dbcb8bead17d71b38556aef443810bf39aff604..71b70239c0f46556bb07ecd438e5ca74c607642a 100644
--- a/mail/locale/sv/fusiondirectory.po
+++ b/mail/locale/sv/fusiondirectory.po
@@ -5,12 +5,12 @@
 # Translators:
 msgid ""
 msgstr ""
-"Project-Id-Version: FusionDirectory-108\n"
+"Project-Id-Version: FusionDirectory-109\n"
 "Report-Msgid-Bugs-To: documentation@lists.fusiondirectory.org\n"
-"POT-Creation-Date: 2015-03-31 11:49+0200\n"
+"POT-Creation-Date: 2014-12-15 17:47+0100\n"
 "PO-Revision-Date: 2015-03-31 11:41+0000\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>\n"
-"Language-Team: Swedish (http://www.transifex.com/projects/p/FusionDirectory-108/language/sv/)\n"
+"Language-Team: Swedish (http://www.transifex.com/projects/p/FusionDirectory-109/language/sv/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -32,45 +32,35 @@ msgstr ""
 msgid "Informations"
 msgstr ""
 
-#: admin/groups/mail/class_groupMail.inc:82
+#: admin/groups/mail/class_groupMail.inc:86
 #: personal/mail/class_mailAccount.inc:100
 msgid "Primary address"
 msgstr ""
 
-#: admin/groups/mail/class_groupMail.inc:82
+#: admin/groups/mail/class_groupMail.inc:86
 msgid "The primary mail address"
 msgstr ""
 
-#: admin/groups/mail/class_groupMail.inc:86
+#: admin/groups/mail/class_groupMail.inc:90
 #: personal/mail/class_mailAccount.inc:104
 msgid "Server"
 msgstr "Server"
 
-#: admin/groups/mail/class_groupMail.inc:86
+#: admin/groups/mail/class_groupMail.inc:90
 msgid "Server mail"
 msgstr ""
 
-#: admin/groups/mail/class_groupMail.inc:92
+#: admin/groups/mail/class_groupMail.inc:96
 #: personal/mail/class_mailAccount.inc:120
 msgid "Alternative addresses"
 msgstr ""
 
-#: admin/groups/mail/class_groupMail.inc:92
+#: admin/groups/mail/class_groupMail.inc:96
 msgid "Alternative mail addresses for the group"
 msgstr ""
 
-#: admin/groups/mail/class_groupMail.inc:97
-msgid "Forward messages to non group members"
-msgstr ""
-
-#: admin/groups/mail/class_groupMail.inc:101
-msgid "Only allowed to receive local mail"
-msgstr ""
-
 #: admin/groups/mail/class_groupMail.inc:101
-msgid ""
-"Whether this group mail is only allowed to receive messages from local "
-"senders"
+msgid "Forward messages to non group members"
 msgstr ""
 
 #: admin/systems/services/postfix/class_servicePostfix.inc:29
@@ -223,8 +213,7 @@ msgid "Rules"
 msgstr ""
 
 #: admin/systems/services/spam/class_serviceSpamAssassin.inc:116
-#: admin/systems/services/spam/class_serviceSpamAssassin.inc:124
-msgid "Edit spam rule"
+msgid "Edit spam ruleEdit spam rule"
 msgstr ""
 
 #: admin/systems/services/spam/class_serviceSpamAssassin.inc:119
@@ -235,6 +224,10 @@ msgstr "Namn"
 msgid "Rule"
 msgstr ""
 
+#: admin/systems/services/spam/class_serviceSpamAssassin.inc:124
+msgid "Edit spam rule"
+msgstr ""
+
 #: admin/systems/services/virus/class_serviceAntiVirus.inc:31
 #: admin/systems/services/virus/class_serviceAntiVirus.inc:32
 msgid "Antivirus service"
@@ -280,10 +273,6 @@ msgstr ""
 msgid "Max directory recursions"
 msgstr ""
 
-#: admin/systems/services/virus/class_serviceAntiVirus.inc:68
-msgid "Maximum number of directory recursions"
-msgstr ""
-
 #: admin/systems/services/virus/class_serviceAntiVirus.inc:73
 msgid "Checks per day"
 msgstr ""
@@ -328,6 +317,10 @@ msgstr ""
 msgid "Maximum compression ratio"
 msgstr ""
 
+#: admin/systems/services/virus/class_serviceAntiVirus.inc:113
+msgid " "
+msgstr ""
+
 #: admin/systems/services/imap/class_serviceIMAP.inc:32
 msgid "IMAP/POP3 generic service"
 msgstr ""
@@ -351,16 +344,16 @@ msgstr ""
 msgid "Mail method '%s' is unknown!"
 msgstr ""
 
-#: personal/mail/class_mail-methods.inc:727
-#: personal/mail/class_mail-methods.inc:728
+#: personal/mail/class_mail-methods.inc:735
+#: personal/mail/class_mail-methods.inc:736
 msgid "None"
 msgstr "Ingen"
 
-#: personal/mail/class_mail-methods.inc:817
+#: personal/mail/class_mail-methods.inc:825
 msgid "Unknown"
 msgstr "OkÃ¤nd"
 
-#: personal/mail/class_mail-methods.inc:819
+#: personal/mail/class_mail-methods.inc:827
 msgid "Unlimited"
 msgstr ""
 
diff --git a/mail/locale/ug/fusiondirectory.po b/mail/locale/ug/fusiondirectory.po
index 24f3e49ce8e2572fdb92ba6b156307602c3e90bb..42b55c439a6d1614a986e57f425dba33e493e5f7 100644
--- a/mail/locale/ug/fusiondirectory.po
+++ b/mail/locale/ug/fusiondirectory.po
@@ -5,12 +5,12 @@
 # Translators:
 msgid ""
 msgstr ""
-"Project-Id-Version: FusionDirectory-108\n"
+"Project-Id-Version: FusionDirectory-109\n"
 "Report-Msgid-Bugs-To: documentation@lists.fusiondirectory.org\n"
-"POT-Creation-Date: 2015-03-31 11:49+0200\n"
-"PO-Revision-Date: 2015-03-17 17:56+0000\n"
+"POT-Creation-Date: 2014-12-15 17:47+0100\n"
+"PO-Revision-Date: 2014-12-15 16:59+0000\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>\n"
-"Language-Team: Uighur (http://www.transifex.com/projects/p/FusionDirectory-108/language/ug/)\n"
+"Language-Team: Uighur (http://www.transifex.com/projects/p/FusionDirectory-109/language/ug/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -32,45 +32,35 @@ msgstr ""
 msgid "Informations"
 msgstr ""
 
-#: admin/groups/mail/class_groupMail.inc:82
+#: admin/groups/mail/class_groupMail.inc:86
 #: personal/mail/class_mailAccount.inc:100
 msgid "Primary address"
 msgstr ""
 
-#: admin/groups/mail/class_groupMail.inc:82
+#: admin/groups/mail/class_groupMail.inc:86
 msgid "The primary mail address"
 msgstr ""
 
-#: admin/groups/mail/class_groupMail.inc:86
+#: admin/groups/mail/class_groupMail.inc:90
 #: personal/mail/class_mailAccount.inc:104
 msgid "Server"
 msgstr ""
 
-#: admin/groups/mail/class_groupMail.inc:86
+#: admin/groups/mail/class_groupMail.inc:90
 msgid "Server mail"
 msgstr ""
 
-#: admin/groups/mail/class_groupMail.inc:92
+#: admin/groups/mail/class_groupMail.inc:96
 #: personal/mail/class_mailAccount.inc:120
 msgid "Alternative addresses"
 msgstr ""
 
-#: admin/groups/mail/class_groupMail.inc:92
+#: admin/groups/mail/class_groupMail.inc:96
 msgid "Alternative mail addresses for the group"
 msgstr ""
 
-#: admin/groups/mail/class_groupMail.inc:97
-msgid "Forward messages to non group members"
-msgstr ""
-
-#: admin/groups/mail/class_groupMail.inc:101
-msgid "Only allowed to receive local mail"
-msgstr ""
-
 #: admin/groups/mail/class_groupMail.inc:101
-msgid ""
-"Whether this group mail is only allowed to receive messages from local "
-"senders"
+msgid "Forward messages to non group members"
 msgstr ""
 
 #: admin/systems/services/postfix/class_servicePostfix.inc:29
@@ -223,8 +213,7 @@ msgid "Rules"
 msgstr ""
 
 #: admin/systems/services/spam/class_serviceSpamAssassin.inc:116
-#: admin/systems/services/spam/class_serviceSpamAssassin.inc:124
-msgid "Edit spam rule"
+msgid "Edit spam ruleEdit spam rule"
 msgstr ""
 
 #: admin/systems/services/spam/class_serviceSpamAssassin.inc:119
@@ -235,6 +224,10 @@ msgstr ""
 msgid "Rule"
 msgstr ""
 
+#: admin/systems/services/spam/class_serviceSpamAssassin.inc:124
+msgid "Edit spam rule"
+msgstr ""
+
 #: admin/systems/services/virus/class_serviceAntiVirus.inc:31
 #: admin/systems/services/virus/class_serviceAntiVirus.inc:32
 msgid "Antivirus service"
@@ -280,10 +273,6 @@ msgstr ""
 msgid "Max directory recursions"
 msgstr ""
 
-#: admin/systems/services/virus/class_serviceAntiVirus.inc:68
-msgid "Maximum number of directory recursions"
-msgstr ""
-
 #: admin/systems/services/virus/class_serviceAntiVirus.inc:73
 msgid "Checks per day"
 msgstr ""
@@ -328,6 +317,10 @@ msgstr ""
 msgid "Maximum compression ratio"
 msgstr ""
 
+#: admin/systems/services/virus/class_serviceAntiVirus.inc:113
+msgid " "
+msgstr ""
+
 #: admin/systems/services/imap/class_serviceIMAP.inc:32
 msgid "IMAP/POP3 generic service"
 msgstr ""
@@ -351,16 +344,16 @@ msgstr ""
 msgid "Mail method '%s' is unknown!"
 msgstr ""
 
-#: personal/mail/class_mail-methods.inc:727
-#: personal/mail/class_mail-methods.inc:728
+#: personal/mail/class_mail-methods.inc:735
+#: personal/mail/class_mail-methods.inc:736
 msgid "None"
 msgstr ""
 
-#: personal/mail/class_mail-methods.inc:817
+#: personal/mail/class_mail-methods.inc:825
 msgid "Unknown"
 msgstr ""
 
-#: personal/mail/class_mail-methods.inc:819
+#: personal/mail/class_mail-methods.inc:827
 msgid "Unlimited"
 msgstr ""
 
diff --git a/mail/locale/vi_VN/fusiondirectory.po b/mail/locale/vi_VN/fusiondirectory.po
index b768d104f7b8ec3ed7e05a9b4629269152770250..fd67de178c302928dd36818be8768f2b3830533e 100644
--- a/mail/locale/vi_VN/fusiondirectory.po
+++ b/mail/locale/vi_VN/fusiondirectory.po
@@ -5,12 +5,12 @@
 # Translators:
 msgid ""
 msgstr ""
-"Project-Id-Version: FusionDirectory-108\n"
+"Project-Id-Version: FusionDirectory-109\n"
 "Report-Msgid-Bugs-To: documentation@lists.fusiondirectory.org\n"
-"POT-Creation-Date: 2015-03-31 11:49+0200\n"
+"POT-Creation-Date: 2014-12-15 17:47+0100\n"
 "PO-Revision-Date: 2015-03-31 11:41+0000\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>\n"
-"Language-Team: Vietnamese (Viet Nam) (http://www.transifex.com/projects/p/FusionDirectory-108/language/vi_VN/)\n"
+"Language-Team: Vietnamese (Viet Nam) (http://www.transifex.com/projects/p/FusionDirectory-109/language/vi_VN/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -32,45 +32,35 @@ msgstr ""
 msgid "Informations"
 msgstr ""
 
-#: admin/groups/mail/class_groupMail.inc:82
+#: admin/groups/mail/class_groupMail.inc:86
 #: personal/mail/class_mailAccount.inc:100
 msgid "Primary address"
 msgstr ""
 
-#: admin/groups/mail/class_groupMail.inc:82
+#: admin/groups/mail/class_groupMail.inc:86
 msgid "The primary mail address"
 msgstr ""
 
-#: admin/groups/mail/class_groupMail.inc:86
+#: admin/groups/mail/class_groupMail.inc:90
 #: personal/mail/class_mailAccount.inc:104
 msgid "Server"
 msgstr "MÃ¡y chá»§ (server)"
 
-#: admin/groups/mail/class_groupMail.inc:86
+#: admin/groups/mail/class_groupMail.inc:90
 msgid "Server mail"
 msgstr ""
 
-#: admin/groups/mail/class_groupMail.inc:92
+#: admin/groups/mail/class_groupMail.inc:96
 #: personal/mail/class_mailAccount.inc:120
 msgid "Alternative addresses"
 msgstr ""
 
-#: admin/groups/mail/class_groupMail.inc:92
+#: admin/groups/mail/class_groupMail.inc:96
 msgid "Alternative mail addresses for the group"
 msgstr ""
 
-#: admin/groups/mail/class_groupMail.inc:97
-msgid "Forward messages to non group members"
-msgstr ""
-
-#: admin/groups/mail/class_groupMail.inc:101
-msgid "Only allowed to receive local mail"
-msgstr ""
-
 #: admin/groups/mail/class_groupMail.inc:101
-msgid ""
-"Whether this group mail is only allowed to receive messages from local "
-"senders"
+msgid "Forward messages to non group members"
 msgstr ""
 
 #: admin/systems/services/postfix/class_servicePostfix.inc:29
@@ -223,8 +213,7 @@ msgid "Rules"
 msgstr ""
 
 #: admin/systems/services/spam/class_serviceSpamAssassin.inc:116
-#: admin/systems/services/spam/class_serviceSpamAssassin.inc:124
-msgid "Edit spam rule"
+msgid "Edit spam ruleEdit spam rule"
 msgstr ""
 
 #: admin/systems/services/spam/class_serviceSpamAssassin.inc:119
@@ -235,6 +224,10 @@ msgstr "TÃªn"
 msgid "Rule"
 msgstr ""
 
+#: admin/systems/services/spam/class_serviceSpamAssassin.inc:124
+msgid "Edit spam rule"
+msgstr ""
+
 #: admin/systems/services/virus/class_serviceAntiVirus.inc:31
 #: admin/systems/services/virus/class_serviceAntiVirus.inc:32
 msgid "Antivirus service"
@@ -280,10 +273,6 @@ msgstr ""
 msgid "Max directory recursions"
 msgstr ""
 
-#: admin/systems/services/virus/class_serviceAntiVirus.inc:68
-msgid "Maximum number of directory recursions"
-msgstr ""
-
 #: admin/systems/services/virus/class_serviceAntiVirus.inc:73
 msgid "Checks per day"
 msgstr ""
@@ -328,6 +317,10 @@ msgstr ""
 msgid "Maximum compression ratio"
 msgstr ""
 
+#: admin/systems/services/virus/class_serviceAntiVirus.inc:113
+msgid " "
+msgstr ""
+
 #: admin/systems/services/imap/class_serviceIMAP.inc:32
 msgid "IMAP/POP3 generic service"
 msgstr ""
@@ -351,16 +344,16 @@ msgstr ""
 msgid "Mail method '%s' is unknown!"
 msgstr ""
 
-#: personal/mail/class_mail-methods.inc:727
-#: personal/mail/class_mail-methods.inc:728
+#: personal/mail/class_mail-methods.inc:735
+#: personal/mail/class_mail-methods.inc:736
 msgid "None"
 msgstr ""
 
-#: personal/mail/class_mail-methods.inc:817
+#: personal/mail/class_mail-methods.inc:825
 msgid "Unknown"
 msgstr "KhÃ´ng rÃµ"
 
-#: personal/mail/class_mail-methods.inc:819
+#: personal/mail/class_mail-methods.inc:827
 msgid "Unlimited"
 msgstr ""
 
diff --git a/mail/locale/zh/fusiondirectory.po b/mail/locale/zh/fusiondirectory.po
index 3e9e6c3125a40a6cafddf3a92e9a435de12fac43..8f00b035c161b4277f682ef69cda9d8a28319fd0 100644
--- a/mail/locale/zh/fusiondirectory.po
+++ b/mail/locale/zh/fusiondirectory.po
@@ -3,15 +3,14 @@
 # This file is distributed under the same license as the PACKAGE package.
 # 
 # Translators:
-#  Jiang Xin <worldhello.net@gmail.com>, 2007
 msgid ""
 msgstr ""
-"Project-Id-Version: FusionDirectory-108\n"
+"Project-Id-Version: FusionDirectory-109\n"
 "Report-Msgid-Bugs-To: documentation@lists.fusiondirectory.org\n"
-"POT-Creation-Date: 2015-03-31 11:49+0200\n"
-"PO-Revision-Date: 2015-03-17 17:56+0000\n"
+"POT-Creation-Date: 2014-12-15 17:47+0100\n"
+"PO-Revision-Date: 2015-02-25 16:13+0000\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>\n"
-"Language-Team: Chinese (http://www.transifex.com/projects/p/FusionDirectory-108/language/zh/)\n"
+"Language-Team: Chinese (http://www.transifex.com/projects/p/FusionDirectory-109/language/zh/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -33,47 +32,37 @@ msgstr ""
 msgid "Informations"
 msgstr ""
 
-#: admin/groups/mail/class_groupMail.inc:82
+#: admin/groups/mail/class_groupMail.inc:86
 #: personal/mail/class_mailAccount.inc:100
 msgid "Primary address"
 msgstr "ä¸»è¦åœ°å€"
 
-#: admin/groups/mail/class_groupMail.inc:82
+#: admin/groups/mail/class_groupMail.inc:86
 msgid "The primary mail address"
 msgstr ""
 
-#: admin/groups/mail/class_groupMail.inc:86
+#: admin/groups/mail/class_groupMail.inc:90
 #: personal/mail/class_mailAccount.inc:104
 msgid "Server"
 msgstr "æœåŠ¡å™¨"
 
-#: admin/groups/mail/class_groupMail.inc:86
+#: admin/groups/mail/class_groupMail.inc:90
 msgid "Server mail"
 msgstr ""
 
-#: admin/groups/mail/class_groupMail.inc:92
+#: admin/groups/mail/class_groupMail.inc:96
 #: personal/mail/class_mailAccount.inc:120
 msgid "Alternative addresses"
 msgstr "æ›¿ä»£åœ°å€"
 
-#: admin/groups/mail/class_groupMail.inc:92
+#: admin/groups/mail/class_groupMail.inc:96
 msgid "Alternative mail addresses for the group"
 msgstr ""
 
-#: admin/groups/mail/class_groupMail.inc:97
+#: admin/groups/mail/class_groupMail.inc:101
 msgid "Forward messages to non group members"
 msgstr "è½¬å‘é‚®ä»¶åˆ°éžç»„æˆå‘˜"
 
-#: admin/groups/mail/class_groupMail.inc:101
-msgid "Only allowed to receive local mail"
-msgstr ""
-
-#: admin/groups/mail/class_groupMail.inc:101
-msgid ""
-"Whether this group mail is only allowed to receive messages from local "
-"senders"
-msgstr ""
-
 #: admin/systems/services/postfix/class_servicePostfix.inc:29
 #: admin/systems/services/postfix/class_servicePostfix.inc:30
 msgid "Postfix (SMTP)"
@@ -224,8 +213,7 @@ msgid "Rules"
 msgstr ""
 
 #: admin/systems/services/spam/class_serviceSpamAssassin.inc:116
-#: admin/systems/services/spam/class_serviceSpamAssassin.inc:124
-msgid "Edit spam rule"
+msgid "Edit spam ruleEdit spam rule"
 msgstr ""
 
 #: admin/systems/services/spam/class_serviceSpamAssassin.inc:119
@@ -236,6 +224,10 @@ msgstr "åç§°"
 msgid "Rule"
 msgstr "è§„åˆ™"
 
+#: admin/systems/services/spam/class_serviceSpamAssassin.inc:124
+msgid "Edit spam rule"
+msgstr ""
+
 #: admin/systems/services/virus/class_serviceAntiVirus.inc:31
 #: admin/systems/services/virus/class_serviceAntiVirus.inc:32
 msgid "Antivirus service"
@@ -281,10 +273,6 @@ msgstr ""
 msgid "Max directory recursions"
 msgstr "æœ€å¤§ç›®å½•é€’å½’"
 
-#: admin/systems/services/virus/class_serviceAntiVirus.inc:68
-msgid "Maximum number of directory recursions"
-msgstr ""
-
 #: admin/systems/services/virus/class_serviceAntiVirus.inc:73
 msgid "Checks per day"
 msgstr "æ¯å¤©æ£€æŸ¥æ¬¡æ•°"
@@ -329,6 +317,10 @@ msgstr "æœ€å¤§é€’å½’"
 msgid "Maximum compression ratio"
 msgstr "æœ€å¤§åŽ‹ç¼©çŽ‡"
 
+#: admin/systems/services/virus/class_serviceAntiVirus.inc:113
+msgid " "
+msgstr ""
+
 #: admin/systems/services/imap/class_serviceIMAP.inc:32
 msgid "IMAP/POP3 generic service"
 msgstr ""
@@ -352,16 +344,16 @@ msgstr ""
 msgid "Mail method '%s' is unknown!"
 msgstr ""
 
-#: personal/mail/class_mail-methods.inc:727
-#: personal/mail/class_mail-methods.inc:728
+#: personal/mail/class_mail-methods.inc:735
+#: personal/mail/class_mail-methods.inc:736
 msgid "None"
 msgstr ""
 
-#: personal/mail/class_mail-methods.inc:817
+#: personal/mail/class_mail-methods.inc:825
 msgid "Unknown"
 msgstr "æœªçŸ¥"
 
-#: personal/mail/class_mail-methods.inc:819
+#: personal/mail/class_mail-methods.inc:827
 msgid "Unlimited"
 msgstr ""
 
diff --git a/nagios/locale/ar/fusiondirectory.po b/nagios/locale/ar/fusiondirectory.po
index c114d5e4c55dc05a4ee060513f0a7b06e5635012..64c9e4e200b00c024e2362a33e18b14409ceefff 100644
--- a/nagios/locale/ar/fusiondirectory.po
+++ b/nagios/locale/ar/fusiondirectory.po
@@ -5,12 +5,12 @@
 # Translators:
 msgid ""
 msgstr ""
-"Project-Id-Version: FusionDirectory-108\n"
+"Project-Id-Version: FusionDirectory-109\n"
 "Report-Msgid-Bugs-To: documentation@lists.fusiondirectory.org\n"
-"POT-Creation-Date: 2015-03-19 21:45+0100\n"
-"PO-Revision-Date: 2015-02-25 15:50+0000\n"
+"POT-Creation-Date: 2014-12-15 17:47+0100\n"
+"PO-Revision-Date: 2014-12-15 17:00+0000\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>\n"
-"Language-Team: Arabic (http://www.transifex.com/projects/p/FusionDirectory-108/language/ar/)\n"
+"Language-Team: Arabic (http://www.transifex.com/projects/p/FusionDirectory-109/language/ar/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -26,11 +26,11 @@ msgstr ""
 msgid "Nagios account settings"
 msgstr ""
 
-#: personal/nagios/class_nagiosAccount.inc:65 personal/nagios/nagios.tpl.c:2
+#: personal/nagios/class_nagiosAccount.inc:65
 msgid "Nagios Account"
 msgstr ""
 
-#: personal/nagios/class_nagiosAccount.inc:68 personal/nagios/nagios.tpl.c:5
+#: personal/nagios/class_nagiosAccount.inc:68
 msgid "Alias"
 msgstr ""
 
@@ -38,7 +38,7 @@ msgstr ""
 msgid "Name of the nagios alias"
 msgstr ""
 
-#: personal/nagios/class_nagiosAccount.inc:72 personal/nagios/nagios.tpl.c:8
+#: personal/nagios/class_nagiosAccount.inc:72
 msgid "Mail address"
 msgstr ""
 
@@ -46,23 +46,23 @@ msgstr ""
 msgid "Email of the nagios alias"
 msgstr ""
 
-#: personal/nagios/class_nagiosAccount.inc:76 personal/nagios/nagios.tpl.c:11
+#: personal/nagios/class_nagiosAccount.inc:76
 msgid "Host notification period"
 msgstr ""
 
-#: personal/nagios/class_nagiosAccount.inc:81 personal/nagios/nagios.tpl.c:14
+#: personal/nagios/class_nagiosAccount.inc:81
 msgid "Service notification period"
 msgstr ""
 
-#: personal/nagios/class_nagiosAccount.inc:86 personal/nagios/nagios.tpl.c:17
+#: personal/nagios/class_nagiosAccount.inc:86
 msgid "Service notification options"
 msgstr ""
 
-#: personal/nagios/class_nagiosAccount.inc:91 personal/nagios/nagios.tpl.c:20
+#: personal/nagios/class_nagiosAccount.inc:91
 msgid "Host notification options"
 msgstr ""
 
-#: personal/nagios/class_nagiosAccount.inc:96 personal/nagios/nagios.tpl.c:23
+#: personal/nagios/class_nagiosAccount.inc:96
 msgid "Pager"
 msgstr ""
 
@@ -70,11 +70,11 @@ msgstr ""
 msgid " Pager"
 msgstr ""
 
-#: personal/nagios/class_nagiosAccount.inc:100 personal/nagios/nagios.tpl.c:26
+#: personal/nagios/class_nagiosAccount.inc:100
 msgid "Service notification commands"
 msgstr ""
 
-#: personal/nagios/class_nagiosAccount.inc:104 personal/nagios/nagios.tpl.c:29
+#: personal/nagios/class_nagiosAccount.inc:104
 msgid "Host notification commands"
 msgstr ""
 
@@ -93,35 +93,3 @@ msgstr ""
 #: config/nagios/class_nagiosConfig.inc:45
 msgid "Prefix used for lconf LDAP fields"
 msgstr ""
-
-#: personal/nagios/nagios.tpl.c:32
-msgid "Nagios authentification"
-msgstr ""
-
-#: personal/nagios/nagios.tpl.c:35
-msgid "view system informations"
-msgstr ""
-
-#: personal/nagios/nagios.tpl.c:38
-msgid "view configuration information"
-msgstr ""
-
-#: personal/nagios/nagios.tpl.c:41
-msgid "trigger system commands"
-msgstr ""
-
-#: personal/nagios/nagios.tpl.c:44
-msgid "view all services"
-msgstr ""
-
-#: personal/nagios/nagios.tpl.c:47
-msgid "view all hosts"
-msgstr ""
-
-#: personal/nagios/nagios.tpl.c:50
-msgid "trigger all service commands"
-msgstr ""
-
-#: personal/nagios/nagios.tpl.c:53
-msgid "trigger all host commands"
-msgstr ""
diff --git a/nagios/locale/ca/fusiondirectory.po b/nagios/locale/ca/fusiondirectory.po
index dafb6e4d8a7e0599d446f14481c561ffbf9832c8..62ae9273717cad0e74415dfe9dd33dcc8a94158c 100644
--- a/nagios/locale/ca/fusiondirectory.po
+++ b/nagios/locale/ca/fusiondirectory.po
@@ -5,12 +5,12 @@
 # Translators:
 msgid ""
 msgstr ""
-"Project-Id-Version: FusionDirectory-108\n"
+"Project-Id-Version: FusionDirectory-109\n"
 "Report-Msgid-Bugs-To: documentation@lists.fusiondirectory.org\n"
-"POT-Creation-Date: 2015-03-19 21:45+0100\n"
-"PO-Revision-Date: 2015-02-25 15:50+0000\n"
+"POT-Creation-Date: 2014-12-15 17:47+0100\n"
+"PO-Revision-Date: 2014-12-15 17:00+0000\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>\n"
-"Language-Team: Catalan (http://www.transifex.com/projects/p/FusionDirectory-108/language/ca/)\n"
+"Language-Team: Catalan (http://www.transifex.com/projects/p/FusionDirectory-109/language/ca/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -26,11 +26,11 @@ msgstr ""
 msgid "Nagios account settings"
 msgstr ""
 
-#: personal/nagios/class_nagiosAccount.inc:65 personal/nagios/nagios.tpl.c:2
+#: personal/nagios/class_nagiosAccount.inc:65
 msgid "Nagios Account"
 msgstr ""
 
-#: personal/nagios/class_nagiosAccount.inc:68 personal/nagios/nagios.tpl.c:5
+#: personal/nagios/class_nagiosAccount.inc:68
 msgid "Alias"
 msgstr ""
 
@@ -38,7 +38,7 @@ msgstr ""
 msgid "Name of the nagios alias"
 msgstr ""
 
-#: personal/nagios/class_nagiosAccount.inc:72 personal/nagios/nagios.tpl.c:8
+#: personal/nagios/class_nagiosAccount.inc:72
 msgid "Mail address"
 msgstr "AdreÃ§a de correu"
 
@@ -46,23 +46,23 @@ msgstr "AdreÃ§a de correu"
 msgid "Email of the nagios alias"
 msgstr ""
 
-#: personal/nagios/class_nagiosAccount.inc:76 personal/nagios/nagios.tpl.c:11
+#: personal/nagios/class_nagiosAccount.inc:76
 msgid "Host notification period"
 msgstr ""
 
-#: personal/nagios/class_nagiosAccount.inc:81 personal/nagios/nagios.tpl.c:14
+#: personal/nagios/class_nagiosAccount.inc:81
 msgid "Service notification period"
 msgstr ""
 
-#: personal/nagios/class_nagiosAccount.inc:86 personal/nagios/nagios.tpl.c:17
+#: personal/nagios/class_nagiosAccount.inc:86
 msgid "Service notification options"
 msgstr ""
 
-#: personal/nagios/class_nagiosAccount.inc:91 personal/nagios/nagios.tpl.c:20
+#: personal/nagios/class_nagiosAccount.inc:91
 msgid "Host notification options"
 msgstr ""
 
-#: personal/nagios/class_nagiosAccount.inc:96 personal/nagios/nagios.tpl.c:23
+#: personal/nagios/class_nagiosAccount.inc:96
 msgid "Pager"
 msgstr "Buscapersones"
 
@@ -70,11 +70,11 @@ msgstr "Buscapersones"
 msgid " Pager"
 msgstr "Buscapersones"
 
-#: personal/nagios/class_nagiosAccount.inc:100 personal/nagios/nagios.tpl.c:26
+#: personal/nagios/class_nagiosAccount.inc:100
 msgid "Service notification commands"
 msgstr ""
 
-#: personal/nagios/class_nagiosAccount.inc:104 personal/nagios/nagios.tpl.c:29
+#: personal/nagios/class_nagiosAccount.inc:104
 msgid "Host notification commands"
 msgstr ""
 
@@ -93,35 +93,3 @@ msgstr ""
 #: config/nagios/class_nagiosConfig.inc:45
 msgid "Prefix used for lconf LDAP fields"
 msgstr ""
-
-#: personal/nagios/nagios.tpl.c:32
-msgid "Nagios authentification"
-msgstr ""
-
-#: personal/nagios/nagios.tpl.c:35
-msgid "view system informations"
-msgstr ""
-
-#: personal/nagios/nagios.tpl.c:38
-msgid "view configuration information"
-msgstr ""
-
-#: personal/nagios/nagios.tpl.c:41
-msgid "trigger system commands"
-msgstr ""
-
-#: personal/nagios/nagios.tpl.c:44
-msgid "view all services"
-msgstr ""
-
-#: personal/nagios/nagios.tpl.c:47
-msgid "view all hosts"
-msgstr ""
-
-#: personal/nagios/nagios.tpl.c:50
-msgid "trigger all service commands"
-msgstr ""
-
-#: personal/nagios/nagios.tpl.c:53
-msgid "trigger all host commands"
-msgstr ""
diff --git a/nagios/locale/cs_CZ/fusiondirectory.po b/nagios/locale/cs_CZ/fusiondirectory.po
index b749bedd0218f8704b7facd9f92af1c063871b52..c5584a87974ed71d010a1a42314145e002805bee 100644
--- a/nagios/locale/cs_CZ/fusiondirectory.po
+++ b/nagios/locale/cs_CZ/fusiondirectory.po
@@ -3,17 +3,15 @@
 # This file is distributed under the same license as the PACKAGE package.
 # 
 # Translators:
-# Pavel Borecki <pavel.borecki@gmail.com>, 2012
-# Pavel Borecki <pavel.borecki@gmail.com>, 2012
-# Pavel Borecki <pavel.borecki@gmail.com>, 2012
+# Pavel Borecki <pavel.borecki@gmail.com>, 2015
 msgid ""
 msgstr ""
-"Project-Id-Version: FusionDirectory-108\n"
+"Project-Id-Version: FusionDirectory-109\n"
 "Report-Msgid-Bugs-To: documentation@lists.fusiondirectory.org\n"
-"POT-Creation-Date: 2015-03-19 21:45+0100\n"
-"PO-Revision-Date: 2015-02-25 16:12+0000\n"
-"Last-Translator: fusiondirectory <contact@fusiondirectory.org>\n"
-"Language-Team: Czech (Czech Republic) (http://www.transifex.com/projects/p/FusionDirectory-108/language/cs_CZ/)\n"
+"POT-Creation-Date: 2014-12-15 17:47+0100\n"
+"PO-Revision-Date: 2015-04-03 06:41+0000\n"
+"Last-Translator: Pavel Borecki <pavel.borecki@gmail.com>\n"
+"Language-Team: Czech (Czech Republic) (http://www.transifex.com/projects/p/FusionDirectory-109/language/cs_CZ/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -23,49 +21,49 @@ msgstr ""
 #: personal/nagios/class_nagiosAccount.inc:45
 #: config/nagios/class_nagiosConfig.inc:42
 msgid "Nagios"
-msgstr "Nagios"
+msgstr ""
 
 #: personal/nagios/class_nagiosAccount.inc:46
 msgid "Nagios account settings"
-msgstr "nastavenÃ ÃºÄtu pro Nagios"
+msgstr "NastavenÃ ÃºÄtu pro Nagios"
 
-#: personal/nagios/class_nagiosAccount.inc:65 personal/nagios/nagios.tpl.c:2
+#: personal/nagios/class_nagiosAccount.inc:65
 msgid "Nagios Account"
 msgstr "ÃºÄet pro Nagios"
 
-#: personal/nagios/class_nagiosAccount.inc:68 personal/nagios/nagios.tpl.c:5
+#: personal/nagios/class_nagiosAccount.inc:68
 msgid "Alias"
-msgstr "alternativnÃ nÃ¡zev (alias)"
+msgstr "AlternativnÃ nÃ¡zev"
 
 #: personal/nagios/class_nagiosAccount.inc:68
 msgid "Name of the nagios alias"
-msgstr ""
+msgstr "NÃ¡zev alternativnÃho nÃ¡zvu pro nagios"
 
-#: personal/nagios/class_nagiosAccount.inc:72 personal/nagios/nagios.tpl.c:8
+#: personal/nagios/class_nagiosAccount.inc:72
 msgid "Mail address"
-msgstr "e-mailovÃ¡ adresa"
+msgstr "E-mailovÃ¡ adresa"
 
 #: personal/nagios/class_nagiosAccount.inc:72
 msgid "Email of the nagios alias"
-msgstr ""
+msgstr "E-mail alternativnÃho nÃ¡zvu sluÅ¾by nagios"
 
-#: personal/nagios/class_nagiosAccount.inc:76 personal/nagios/nagios.tpl.c:11
+#: personal/nagios/class_nagiosAccount.inc:76
 msgid "Host notification period"
 msgstr "interval upozorÅˆovÃ¡nÃ na stroj"
 
-#: personal/nagios/class_nagiosAccount.inc:81 personal/nagios/nagios.tpl.c:14
+#: personal/nagios/class_nagiosAccount.inc:81
 msgid "Service notification period"
 msgstr "interval upozorÅˆovÃ¡nÃ na sluÅ¾bu"
 
-#: personal/nagios/class_nagiosAccount.inc:86 personal/nagios/nagios.tpl.c:17
+#: personal/nagios/class_nagiosAccount.inc:86
 msgid "Service notification options"
 msgstr "pÅ™edvolby upozorÅˆovÃ¡nÃ na sluÅ¾bu"
 
-#: personal/nagios/class_nagiosAccount.inc:91 personal/nagios/nagios.tpl.c:20
+#: personal/nagios/class_nagiosAccount.inc:91
 msgid "Host notification options"
 msgstr "pÅ™edvolby upozorÅˆovÃ¡nÃ na stroj"
 
-#: personal/nagios/class_nagiosAccount.inc:96 personal/nagios/nagios.tpl.c:23
+#: personal/nagios/class_nagiosAccount.inc:96
 msgid "Pager"
 msgstr "pager"
 
@@ -73,58 +71,26 @@ msgstr "pager"
 msgid " Pager"
 msgstr "pager"
 
-#: personal/nagios/class_nagiosAccount.inc:100 personal/nagios/nagios.tpl.c:26
+#: personal/nagios/class_nagiosAccount.inc:100
 msgid "Service notification commands"
 msgstr "pÅ™Ãkazy pro upozorÅˆovÃ¡nÃ na sluÅ¾bu"
 
-#: personal/nagios/class_nagiosAccount.inc:104 personal/nagios/nagios.tpl.c:29
+#: personal/nagios/class_nagiosAccount.inc:104
 msgid "Host notification commands"
 msgstr "pÅ™Ãkazy pro upozorÅˆovÃ¡nÃ na stroj"
 
 #: config/nagios/class_nagiosConfig.inc:28
 msgid "Nagios configuration"
-msgstr ""
+msgstr "NastavenÃ dohledovÃ¡nÃ Nagios"
 
 #: config/nagios/class_nagiosConfig.inc:29
 msgid "FusionDirectory nagios plugin configuration"
-msgstr ""
+msgstr "NastavenÃ zÃ¡suvnÃ©ho modulu nagios pro FusionDirectory"
 
 #: config/nagios/class_nagiosConfig.inc:45
 msgid "Lconf prefix"
-msgstr ""
+msgstr "PÅ™edpona lconf"
 
 #: config/nagios/class_nagiosConfig.inc:45
 msgid "Prefix used for lconf LDAP fields"
-msgstr ""
-
-#: personal/nagios/nagios.tpl.c:32
-msgid "Nagios authentification"
-msgstr "ovÄ›Å™enÃ Nagia"
-
-#: personal/nagios/nagios.tpl.c:35
-msgid "view system informations"
-msgstr "zobrazit informace o systÃ©mu"
-
-#: personal/nagios/nagios.tpl.c:38
-msgid "view configuration information"
-msgstr "zobrazit informace o nastavenÃch"
-
-#: personal/nagios/nagios.tpl.c:41
-msgid "trigger system commands"
-msgstr "spustit systÃ©movÃ© pÅ™Ãkazy"
-
-#: personal/nagios/nagios.tpl.c:44
-msgid "view all services"
-msgstr "zobrazit vÅ¡echny sluÅ¾by"
-
-#: personal/nagios/nagios.tpl.c:47
-msgid "view all hosts"
-msgstr "zobrazit vÅ¡echny stroje"
-
-#: personal/nagios/nagios.tpl.c:50
-msgid "trigger all service commands"
-msgstr "spustit vÅ¡echny servisnÃ pÅ™Ãkazy"
-
-#: personal/nagios/nagios.tpl.c:53
-msgid "trigger all host commands"
-msgstr "spustit vÅ¡echny pÅ™Ãkazy pro stroje"
+msgstr "PÅ™edpona pro polÃÄka lconf LDAP"
diff --git a/nagios/locale/de/fusiondirectory.po b/nagios/locale/de/fusiondirectory.po
index a08f45fe436e0bdd80fd37e1cd10e8a5891d7453..98da5db8d2a2f3c8656512cc33271d36df90cc1e 100644
--- a/nagios/locale/de/fusiondirectory.po
+++ b/nagios/locale/de/fusiondirectory.po
@@ -3,16 +3,14 @@
 # This file is distributed under the same license as the PACKAGE package.
 # 
 # Translators:
-# Maik Wagner <maikwagner@yahoo.com>, 2014
-#  Stefan Koehler <stefan.koehler@GONICUS.de>, 2005
 msgid ""
 msgstr ""
-"Project-Id-Version: FusionDirectory-108\n"
+"Project-Id-Version: FusionDirectory-109\n"
 "Report-Msgid-Bugs-To: documentation@lists.fusiondirectory.org\n"
-"POT-Creation-Date: 2015-03-19 21:45+0100\n"
-"PO-Revision-Date: 2015-02-25 16:12+0000\n"
+"POT-Creation-Date: 2014-12-15 17:47+0100\n"
+"PO-Revision-Date: 2014-12-15 17:01+0000\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>\n"
-"Language-Team: German (http://www.transifex.com/projects/p/FusionDirectory-108/language/de/)\n"
+"Language-Team: German (http://www.transifex.com/projects/p/FusionDirectory-109/language/de/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -28,11 +26,11 @@ msgstr "Nagios"
 msgid "Nagios account settings"
 msgstr "Nagios-Konto-Einstellungen"
 
-#: personal/nagios/class_nagiosAccount.inc:65 personal/nagios/nagios.tpl.c:2
+#: personal/nagios/class_nagiosAccount.inc:65
 msgid "Nagios Account"
 msgstr "Nagios-Konto"
 
-#: personal/nagios/class_nagiosAccount.inc:68 personal/nagios/nagios.tpl.c:5
+#: personal/nagios/class_nagiosAccount.inc:68
 msgid "Alias"
 msgstr "Alias"
 
@@ -40,7 +38,7 @@ msgstr "Alias"
 msgid "Name of the nagios alias"
 msgstr "Name des nagios Alias"
 
-#: personal/nagios/class_nagiosAccount.inc:72 personal/nagios/nagios.tpl.c:8
+#: personal/nagios/class_nagiosAccount.inc:72
 msgid "Mail address"
 msgstr "Mail-Adresse"
 
@@ -48,23 +46,23 @@ msgstr "Mail-Adresse"
 msgid "Email of the nagios alias"
 msgstr "Email des nagios Alias"
 
-#: personal/nagios/class_nagiosAccount.inc:76 personal/nagios/nagios.tpl.c:11
+#: personal/nagios/class_nagiosAccount.inc:76
 msgid "Host notification period"
 msgstr "Frequenz der Host-Meldungen"
 
-#: personal/nagios/class_nagiosAccount.inc:81 personal/nagios/nagios.tpl.c:14
+#: personal/nagios/class_nagiosAccount.inc:81
 msgid "Service notification period"
 msgstr "Frequenz der Dienst-Meldungen"
 
-#: personal/nagios/class_nagiosAccount.inc:86 personal/nagios/nagios.tpl.c:17
+#: personal/nagios/class_nagiosAccount.inc:86
 msgid "Service notification options"
 msgstr "Optionen der Dienst-Meldungen"
 
-#: personal/nagios/class_nagiosAccount.inc:91 personal/nagios/nagios.tpl.c:20
+#: personal/nagios/class_nagiosAccount.inc:91
 msgid "Host notification options"
 msgstr "Optionen der Host-Meldungen"
 
-#: personal/nagios/class_nagiosAccount.inc:96 personal/nagios/nagios.tpl.c:23
+#: personal/nagios/class_nagiosAccount.inc:96
 msgid "Pager"
 msgstr "Pager"
 
@@ -72,11 +70,11 @@ msgstr "Pager"
 msgid " Pager"
 msgstr "Pager"
 
-#: personal/nagios/class_nagiosAccount.inc:100 personal/nagios/nagios.tpl.c:26
+#: personal/nagios/class_nagiosAccount.inc:100
 msgid "Service notification commands"
 msgstr "Befehle fÃ¼r Dienst-Meldungen"
 
-#: personal/nagios/class_nagiosAccount.inc:104 personal/nagios/nagios.tpl.c:29
+#: personal/nagios/class_nagiosAccount.inc:104
 msgid "Host notification commands"
 msgstr "Befehle fÃ¼r Host-Meldungen"
 
@@ -95,35 +93,3 @@ msgstr "Lconf prefix"
 #: config/nagios/class_nagiosConfig.inc:45
 msgid "Prefix used for lconf LDAP fields"
 msgstr "Prefix welches fÃ¼r lconf LDAP-Felder verwendet wird"
-
-#: personal/nagios/nagios.tpl.c:32
-msgid "Nagios authentification"
-msgstr "Nagios Authentifikation"
-
-#: personal/nagios/nagios.tpl.c:35
-msgid "view system informations"
-msgstr "System-Informationen anzeigen"
-
-#: personal/nagios/nagios.tpl.c:38
-msgid "view configuration information"
-msgstr "Konfiguration anzeigen"
-
-#: personal/nagios/nagios.tpl.c:41
-msgid "trigger system commands"
-msgstr "Alle System-Befehle ausfÃ¼hren"
-
-#: personal/nagios/nagios.tpl.c:44
-msgid "view all services"
-msgstr "Alle Dienste anzeigen"
-
-#: personal/nagios/nagios.tpl.c:47
-msgid "view all hosts"
-msgstr "Alle Systeme anzeigen"
-
-#: personal/nagios/nagios.tpl.c:50
-msgid "trigger all service commands"
-msgstr "Alle Dienst-Befehle ausfÃ¼hren"
-
-#: personal/nagios/nagios.tpl.c:53
-msgid "trigger all host commands"
-msgstr "Alle Host-Befehle ausfÃ¼hren"
diff --git a/nagios/locale/el_GR/fusiondirectory.po b/nagios/locale/el_GR/fusiondirectory.po
new file mode 100644
index 0000000000000000000000000000000000000000..8e69c641349400c95e8f6c1491563ee5cc8eace5
--- /dev/null
+++ b/nagios/locale/el_GR/fusiondirectory.po
@@ -0,0 +1,95 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR FusionDirectory Project
+# This file is distributed under the same license as the PACKAGE package.
+# 
+# Translators:
+msgid ""
+msgstr ""
+"Project-Id-Version: FusionDirectory-109\n"
+"Report-Msgid-Bugs-To: documentation@lists.fusiondirectory.org\n"
+"POT-Creation-Date: 2014-12-15 17:47+0100\n"
+"PO-Revision-Date: 2015-05-30 11:45+0000\n"
+"Last-Translator: Benoit Mortier <benoit.mortier@opensides.be>\n"
+"Language-Team: Greek (Greece) (http://www.transifex.com/projects/p/FusionDirectory-109/language/el_GR/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: el_GR\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
+
+#: personal/nagios/class_nagiosAccount.inc:45
+#: config/nagios/class_nagiosConfig.inc:42
+msgid "Nagios"
+msgstr ""
+
+#: personal/nagios/class_nagiosAccount.inc:46
+msgid "Nagios account settings"
+msgstr ""
+
+#: personal/nagios/class_nagiosAccount.inc:65
+msgid "Nagios Account"
+msgstr ""
+
+#: personal/nagios/class_nagiosAccount.inc:68
+msgid "Alias"
+msgstr ""
+
+#: personal/nagios/class_nagiosAccount.inc:68
+msgid "Name of the nagios alias"
+msgstr ""
+
+#: personal/nagios/class_nagiosAccount.inc:72
+msgid "Mail address"
+msgstr ""
+
+#: personal/nagios/class_nagiosAccount.inc:72
+msgid "Email of the nagios alias"
+msgstr ""
+
+#: personal/nagios/class_nagiosAccount.inc:76
+msgid "Host notification period"
+msgstr ""
+
+#: personal/nagios/class_nagiosAccount.inc:81
+msgid "Service notification period"
+msgstr ""
+
+#: personal/nagios/class_nagiosAccount.inc:86
+msgid "Service notification options"
+msgstr ""
+
+#: personal/nagios/class_nagiosAccount.inc:91
+msgid "Host notification options"
+msgstr ""
+
+#: personal/nagios/class_nagiosAccount.inc:96
+msgid "Pager"
+msgstr ""
+
+#: personal/nagios/class_nagiosAccount.inc:96
+msgid " Pager"
+msgstr ""
+
+#: personal/nagios/class_nagiosAccount.inc:100
+msgid "Service notification commands"
+msgstr ""
+
+#: personal/nagios/class_nagiosAccount.inc:104
+msgid "Host notification commands"
+msgstr ""
+
+#: config/nagios/class_nagiosConfig.inc:28
+msgid "Nagios configuration"
+msgstr ""
+
+#: config/nagios/class_nagiosConfig.inc:29
+msgid "FusionDirectory nagios plugin configuration"
+msgstr ""
+
+#: config/nagios/class_nagiosConfig.inc:45
+msgid "Lconf prefix"
+msgstr ""
+
+#: config/nagios/class_nagiosConfig.inc:45
+msgid "Prefix used for lconf LDAP fields"
+msgstr ""
diff --git a/nagios/locale/en/fusiondirectory.po b/nagios/locale/en/fusiondirectory.po
index 030b2a780ca8c9882600dfff2ab228ea255b6d9c..2a77b6fbb7b82322ec2499dd538d67ffb5efe1b7 100644
--- a/nagios/locale/en/fusiondirectory.po
+++ b/nagios/locale/en/fusiondirectory.po
@@ -6,13 +6,13 @@
 #, fuzzy
 msgid ""
 msgstr ""
-"Project-Id-Version: PACKAGE VERSION\n"
-"Report-Msgid-Bugs-To: documentation@lists.fusiondirectory.org\n"
-"POT-Creation-Date: 2015-03-31 11:49+0200\n"
+"Project-Id-Version: FusionDirectory VERSION\n"
+"Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
+"POT-Creation-Date: 2015-05-30 15:30+0200\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
-"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
-"Language-Team: LANGUAGE <LL@li.org>\n"
-"Language: \n"
+"Last-Translator: FusionDirectory project <contact@fusiondirectory.org>\n"
+"Language-Team: English\n"
+"Language: en\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
diff --git a/nagios/locale/es/fusiondirectory.po b/nagios/locale/es/fusiondirectory.po
index ca686e1acc540ba1831efb62a20f347d61084ec9..a7788e123f584bdf96c49356e04e45cd54ee2f24 100644
--- a/nagios/locale/es/fusiondirectory.po
+++ b/nagios/locale/es/fusiondirectory.po
@@ -5,12 +5,12 @@
 # Translators:
 msgid ""
 msgstr ""
-"Project-Id-Version: FusionDirectory-108\n"
+"Project-Id-Version: FusionDirectory-109\n"
 "Report-Msgid-Bugs-To: documentation@lists.fusiondirectory.org\n"
-"POT-Creation-Date: 2015-03-19 21:45+0100\n"
-"PO-Revision-Date: 2015-02-25 16:12+0000\n"
+"POT-Creation-Date: 2014-12-15 17:47+0100\n"
+"PO-Revision-Date: 2014-12-15 17:01+0000\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>\n"
-"Language-Team: Spanish (http://www.transifex.com/projects/p/FusionDirectory-108/language/es/)\n"
+"Language-Team: Spanish (http://www.transifex.com/projects/p/FusionDirectory-109/language/es/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -26,11 +26,11 @@ msgstr "Nagios"
 msgid "Nagios account settings"
 msgstr "ParÃ¡metros de cuenta Nagios"
 
-#: personal/nagios/class_nagiosAccount.inc:65 personal/nagios/nagios.tpl.c:2
+#: personal/nagios/class_nagiosAccount.inc:65
 msgid "Nagios Account"
 msgstr "Cuenta Nagios"
 
-#: personal/nagios/class_nagiosAccount.inc:68 personal/nagios/nagios.tpl.c:5
+#: personal/nagios/class_nagiosAccount.inc:68
 msgid "Alias"
 msgstr "Alias"
 
@@ -38,7 +38,7 @@ msgstr "Alias"
 msgid "Name of the nagios alias"
 msgstr ""
 
-#: personal/nagios/class_nagiosAccount.inc:72 personal/nagios/nagios.tpl.c:8
+#: personal/nagios/class_nagiosAccount.inc:72
 msgid "Mail address"
 msgstr "DirecciÃ³n correo electrÃ³nico"
 
@@ -46,23 +46,23 @@ msgstr "DirecciÃ³n correo electrÃ³nico"
 msgid "Email of the nagios alias"
 msgstr ""
 
-#: personal/nagios/class_nagiosAccount.inc:76 personal/nagios/nagios.tpl.c:11
+#: personal/nagios/class_nagiosAccount.inc:76
 msgid "Host notification period"
 msgstr "Periodo de NotificaciÃ³n de mÃ¡quina"
 
-#: personal/nagios/class_nagiosAccount.inc:81 personal/nagios/nagios.tpl.c:14
+#: personal/nagios/class_nagiosAccount.inc:81
 msgid "Service notification period"
 msgstr "Periodo de NotificaciÃ³n de Servicio"
 
-#: personal/nagios/class_nagiosAccount.inc:86 personal/nagios/nagios.tpl.c:17
+#: personal/nagios/class_nagiosAccount.inc:86
 msgid "Service notification options"
 msgstr "Opciones de NotificaciÃ³n de Servicio"
 
-#: personal/nagios/class_nagiosAccount.inc:91 personal/nagios/nagios.tpl.c:20
+#: personal/nagios/class_nagiosAccount.inc:91
 msgid "Host notification options"
 msgstr "Opciones de NotificaciÃ³n de mÃ¡quina"
 
-#: personal/nagios/class_nagiosAccount.inc:96 personal/nagios/nagios.tpl.c:23
+#: personal/nagios/class_nagiosAccount.inc:96
 msgid "Pager"
 msgstr "Buscapersonas"
 
@@ -70,11 +70,11 @@ msgstr "Buscapersonas"
 msgid " Pager"
 msgstr "Buscapersonas"
 
-#: personal/nagios/class_nagiosAccount.inc:100 personal/nagios/nagios.tpl.c:26
+#: personal/nagios/class_nagiosAccount.inc:100
 msgid "Service notification commands"
 msgstr "Comandos de NotificaciÃ³n de Servicio"
 
-#: personal/nagios/class_nagiosAccount.inc:104 personal/nagios/nagios.tpl.c:29
+#: personal/nagios/class_nagiosAccount.inc:104
 msgid "Host notification commands"
 msgstr "Comandos de NotificaciÃ³n de mÃ¡quina"
 
@@ -93,35 +93,3 @@ msgstr ""
 #: config/nagios/class_nagiosConfig.inc:45
 msgid "Prefix used for lconf LDAP fields"
 msgstr ""
-
-#: personal/nagios/nagios.tpl.c:32
-msgid "Nagios authentification"
-msgstr "AutenticaciÃ³n de Nagios"
-
-#: personal/nagios/nagios.tpl.c:35
-msgid "view system informations"
-msgstr "Ver la informaciÃ³n de sistema"
-
-#: personal/nagios/nagios.tpl.c:38
-msgid "view configuration information"
-msgstr "Ver la informaciÃ³n de configuraciÃ³n"
-
-#: personal/nagios/nagios.tpl.c:41
-msgid "trigger system commands"
-msgstr "modificar comandos del sistema"
-
-#: personal/nagios/nagios.tpl.c:44
-msgid "view all services"
-msgstr "Ver todos los servicios"
-
-#: personal/nagios/nagios.tpl.c:47
-msgid "view all hosts"
-msgstr "Ver todos las mÃ¡quinas"
-
-#: personal/nagios/nagios.tpl.c:50
-msgid "trigger all service commands"
-msgstr "modificar todos los comandos de servicios"
-
-#: personal/nagios/nagios.tpl.c:53
-msgid "trigger all host commands"
-msgstr "modificar todos los comandos de mÃ¡quina"
diff --git a/nagios/locale/es_VE/fusiondirectory.po b/nagios/locale/es_VE/fusiondirectory.po
index 8afee9583c86ec344e1a4f7fd880e9be97e9a88f..a228c31956bdfee7d067a9f76d620c0dab8c8b87 100644
--- a/nagios/locale/es_VE/fusiondirectory.po
+++ b/nagios/locale/es_VE/fusiondirectory.po
@@ -5,12 +5,12 @@
 # Translators:
 msgid ""
 msgstr ""
-"Project-Id-Version: FusionDirectory-108\n"
+"Project-Id-Version: FusionDirectory-109\n"
 "Report-Msgid-Bugs-To: documentation@lists.fusiondirectory.org\n"
-"POT-Creation-Date: 2015-03-19 21:45+0100\n"
-"PO-Revision-Date: 2015-02-25 16:12+0000\n"
+"POT-Creation-Date: 2014-12-15 17:47+0100\n"
+"PO-Revision-Date: 2014-12-15 17:01+0000\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>\n"
-"Language-Team: Spanish (Venezuela) (http://www.transifex.com/projects/p/FusionDirectory-108/language/es_VE/)\n"
+"Language-Team: Spanish (Venezuela) (http://www.transifex.com/projects/p/FusionDirectory-109/language/es_VE/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -26,11 +26,11 @@ msgstr "Nagios"
 msgid "Nagios account settings"
 msgstr "ParÃ¡metros de cuenta Nagios"
 
-#: personal/nagios/class_nagiosAccount.inc:65 personal/nagios/nagios.tpl.c:2
+#: personal/nagios/class_nagiosAccount.inc:65
 msgid "Nagios Account"
 msgstr "Cuenta Nagios"
 
-#: personal/nagios/class_nagiosAccount.inc:68 personal/nagios/nagios.tpl.c:5
+#: personal/nagios/class_nagiosAccount.inc:68
 msgid "Alias"
 msgstr "Alias"
 
@@ -38,7 +38,7 @@ msgstr "Alias"
 msgid "Name of the nagios alias"
 msgstr ""
 
-#: personal/nagios/class_nagiosAccount.inc:72 personal/nagios/nagios.tpl.c:8
+#: personal/nagios/class_nagiosAccount.inc:72
 msgid "Mail address"
 msgstr "DirecciÃ³n correo electrÃ³nico"
 
@@ -46,23 +46,23 @@ msgstr "DirecciÃ³n correo electrÃ³nico"
 msgid "Email of the nagios alias"
 msgstr ""
 
-#: personal/nagios/class_nagiosAccount.inc:76 personal/nagios/nagios.tpl.c:11
+#: personal/nagios/class_nagiosAccount.inc:76
 msgid "Host notification period"
 msgstr "Periodo de NotificaciÃ³n de mÃ¡quina"
 
-#: personal/nagios/class_nagiosAccount.inc:81 personal/nagios/nagios.tpl.c:14
+#: personal/nagios/class_nagiosAccount.inc:81
 msgid "Service notification period"
 msgstr "Periodo de NotificaciÃ³n de Servicio"
 
-#: personal/nagios/class_nagiosAccount.inc:86 personal/nagios/nagios.tpl.c:17
+#: personal/nagios/class_nagiosAccount.inc:86
 msgid "Service notification options"
 msgstr "Opciones de NotificaciÃ³n de Servicio"
 
-#: personal/nagios/class_nagiosAccount.inc:91 personal/nagios/nagios.tpl.c:20
+#: personal/nagios/class_nagiosAccount.inc:91
 msgid "Host notification options"
 msgstr "Opciones de NotificaciÃ³n de mÃ¡quina"
 
-#: personal/nagios/class_nagiosAccount.inc:96 personal/nagios/nagios.tpl.c:23
+#: personal/nagios/class_nagiosAccount.inc:96
 msgid "Pager"
 msgstr "Buscapersonas"
 
@@ -70,11 +70,11 @@ msgstr "Buscapersonas"
 msgid " Pager"
 msgstr "Buscapersonas"
 
-#: personal/nagios/class_nagiosAccount.inc:100 personal/nagios/nagios.tpl.c:26
+#: personal/nagios/class_nagiosAccount.inc:100
 msgid "Service notification commands"
 msgstr "Comandos de NotificaciÃ³n de Servicio"
 
-#: personal/nagios/class_nagiosAccount.inc:104 personal/nagios/nagios.tpl.c:29
+#: personal/nagios/class_nagiosAccount.inc:104
 msgid "Host notification commands"
 msgstr "Comandos de NotificaciÃ³n de mÃ¡quina"
 
@@ -93,35 +93,3 @@ msgstr ""
 #: config/nagios/class_nagiosConfig.inc:45
 msgid "Prefix used for lconf LDAP fields"
 msgstr ""
-
-#: personal/nagios/nagios.tpl.c:32
-msgid "Nagios authentification"
-msgstr "AutenticaciÃ³n de Nagios"
-
-#: personal/nagios/nagios.tpl.c:35
-msgid "view system informations"
-msgstr "Ver la informaciÃ³n de sistema"
-
-#: personal/nagios/nagios.tpl.c:38
-msgid "view configuration information"
-msgstr "Ver la informaciÃ³n de configuraciÃ³n"
-
-#: personal/nagios/nagios.tpl.c:41
-msgid "trigger system commands"
-msgstr "modificar comandos del sistema"
-
-#: personal/nagios/nagios.tpl.c:44
-msgid "view all services"
-msgstr "Ver todos los servicios"
-
-#: personal/nagios/nagios.tpl.c:47
-msgid "view all hosts"
-msgstr "Ver todos las mÃ¡quinas"
-
-#: personal/nagios/nagios.tpl.c:50
-msgid "trigger all service commands"
-msgstr "modificar todos los comandos de servicios"
-
-#: personal/nagios/nagios.tpl.c:53
-msgid "trigger all host commands"
-msgstr "modificar todos los comandos de mÃ¡quina"
diff --git a/nagios/locale/fa_IR/fusiondirectory.po b/nagios/locale/fa_IR/fusiondirectory.po
index 80952480c6c1f2be1b4709dd0524050b90564c2f..79e25645577ffc72af63bc2e6a453eb4867984c4 100644
--- a/nagios/locale/fa_IR/fusiondirectory.po
+++ b/nagios/locale/fa_IR/fusiondirectory.po
@@ -5,12 +5,12 @@
 # Translators:
 msgid ""
 msgstr ""
-"Project-Id-Version: FusionDirectory-108\n"
+"Project-Id-Version: FusionDirectory-109\n"
 "Report-Msgid-Bugs-To: documentation@lists.fusiondirectory.org\n"
-"POT-Creation-Date: 2015-03-19 21:45+0100\n"
-"PO-Revision-Date: 2015-02-25 15:50+0000\n"
+"POT-Creation-Date: 2014-12-15 17:47+0100\n"
+"PO-Revision-Date: 2014-12-15 17:00+0000\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>\n"
-"Language-Team: Persian (Iran) (http://www.transifex.com/projects/p/FusionDirectory-108/language/fa_IR/)\n"
+"Language-Team: Persian (Iran) (http://www.transifex.com/projects/p/FusionDirectory-109/language/fa_IR/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -26,11 +26,11 @@ msgstr ""
 msgid "Nagios account settings"
 msgstr ""
 
-#: personal/nagios/class_nagiosAccount.inc:65 personal/nagios/nagios.tpl.c:2
+#: personal/nagios/class_nagiosAccount.inc:65
 msgid "Nagios Account"
 msgstr ""
 
-#: personal/nagios/class_nagiosAccount.inc:68 personal/nagios/nagios.tpl.c:5
+#: personal/nagios/class_nagiosAccount.inc:68
 msgid "Alias"
 msgstr ""
 
@@ -38,7 +38,7 @@ msgstr ""
 msgid "Name of the nagios alias"
 msgstr ""
 
-#: personal/nagios/class_nagiosAccount.inc:72 personal/nagios/nagios.tpl.c:8
+#: personal/nagios/class_nagiosAccount.inc:72
 msgid "Mail address"
 msgstr ""
 
@@ -46,23 +46,23 @@ msgstr ""
 msgid "Email of the nagios alias"
 msgstr ""
 
-#: personal/nagios/class_nagiosAccount.inc:76 personal/nagios/nagios.tpl.c:11
+#: personal/nagios/class_nagiosAccount.inc:76
 msgid "Host notification period"
 msgstr ""
 
-#: personal/nagios/class_nagiosAccount.inc:81 personal/nagios/nagios.tpl.c:14
+#: personal/nagios/class_nagiosAccount.inc:81
 msgid "Service notification period"
 msgstr ""
 
-#: personal/nagios/class_nagiosAccount.inc:86 personal/nagios/nagios.tpl.c:17
+#: personal/nagios/class_nagiosAccount.inc:86
 msgid "Service notification options"
 msgstr ""
 
-#: personal/nagios/class_nagiosAccount.inc:91 personal/nagios/nagios.tpl.c:20
+#: personal/nagios/class_nagiosAccount.inc:91
 msgid "Host notification options"
 msgstr ""
 
-#: personal/nagios/class_nagiosAccount.inc:96 personal/nagios/nagios.tpl.c:23
+#: personal/nagios/class_nagiosAccount.inc:96
 msgid "Pager"
 msgstr "Ù¾ÛŒØ¬Ø±"
 
@@ -70,11 +70,11 @@ msgstr "Ù¾ÛŒØ¬Ø±"
 msgid " Pager"
 msgstr "Ù¾ÛŒØ¬Ø±"
 
-#: personal/nagios/class_nagiosAccount.inc:100 personal/nagios/nagios.tpl.c:26
+#: personal/nagios/class_nagiosAccount.inc:100
 msgid "Service notification commands"
 msgstr ""
 
-#: personal/nagios/class_nagiosAccount.inc:104 personal/nagios/nagios.tpl.c:29
+#: personal/nagios/class_nagiosAccount.inc:104
 msgid "Host notification commands"
 msgstr ""
 
@@ -93,35 +93,3 @@ msgstr ""
 #: config/nagios/class_nagiosConfig.inc:45
 msgid "Prefix used for lconf LDAP fields"
 msgstr ""
-
-#: personal/nagios/nagios.tpl.c:32
-msgid "Nagios authentification"
-msgstr ""
-
-#: personal/nagios/nagios.tpl.c:35
-msgid "view system informations"
-msgstr ""
-
-#: personal/nagios/nagios.tpl.c:38
-msgid "view configuration information"
-msgstr ""
-
-#: personal/nagios/nagios.tpl.c:41
-msgid "trigger system commands"
-msgstr ""
-
-#: personal/nagios/nagios.tpl.c:44
-msgid "view all services"
-msgstr ""
-
-#: personal/nagios/nagios.tpl.c:47
-msgid "view all hosts"
-msgstr ""
-
-#: personal/nagios/nagios.tpl.c:50
-msgid "trigger all service commands"
-msgstr ""
-
-#: personal/nagios/nagios.tpl.c:53
-msgid "trigger all host commands"
-msgstr ""
diff --git a/nagios/locale/fr/fusiondirectory.po b/nagios/locale/fr/fusiondirectory.po
index 5497a4f691f8ed88400236b49c4fc42f02483ebd..b81c94fd84233a9553524ee0b923e09ed03f3737 100644
--- a/nagios/locale/fr/fusiondirectory.po
+++ b/nagios/locale/fr/fusiondirectory.po
@@ -3,20 +3,14 @@
 # This file is distributed under the same license as the PACKAGE package.
 # 
 # Translators:
-# Benoit Mortier <benoit.mortier@opensides.be>, 2005-2009
-# MCMic, 2014
-# fusiondirectory <contact@fusiondirectory.org>, 2013
-# fusiondirectory <contact@fusiondirectory.org>, 2012-2013
-# fusiondirectory <contact@fusiondirectory.org>, 2012
-# MCMic, 2014
 msgid ""
 msgstr ""
-"Project-Id-Version: FusionDirectory-108\n"
+"Project-Id-Version: FusionDirectory-109\n"
 "Report-Msgid-Bugs-To: documentation@lists.fusiondirectory.org\n"
-"POT-Creation-Date: 2015-03-19 21:45+0100\n"
-"PO-Revision-Date: 2015-02-25 16:12+0000\n"
+"POT-Creation-Date: 2014-12-15 17:47+0100\n"
+"PO-Revision-Date: 2014-12-18 14:41+0000\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>\n"
-"Language-Team: French (http://www.transifex.com/projects/p/FusionDirectory-108/language/fr/)\n"
+"Language-Team: French (http://www.transifex.com/projects/p/FusionDirectory-109/language/fr/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -32,43 +26,43 @@ msgstr "Nagios"
 msgid "Nagios account settings"
 msgstr "ParamÃ¨tres Nagios"
 
-#: personal/nagios/class_nagiosAccount.inc:65 personal/nagios/nagios.tpl.c:2
+#: personal/nagios/class_nagiosAccount.inc:65
 msgid "Nagios Account"
 msgstr "Compte Nagios"
 
-#: personal/nagios/class_nagiosAccount.inc:68 personal/nagios/nagios.tpl.c:5
+#: personal/nagios/class_nagiosAccount.inc:68
 msgid "Alias"
-msgstr "Alias"
+msgstr "Alias de l'utilisateur"
 
 #: personal/nagios/class_nagiosAccount.inc:68
 msgid "Name of the nagios alias"
 msgstr "Nom de l'alias Nagios"
 
-#: personal/nagios/class_nagiosAccount.inc:72 personal/nagios/nagios.tpl.c:8
+#: personal/nagios/class_nagiosAccount.inc:72
 msgid "Mail address"
-msgstr "Adresse de courriel"
+msgstr "Adresse de messagerie"
 
 #: personal/nagios/class_nagiosAccount.inc:72
 msgid "Email of the nagios alias"
-msgstr "Courriel de l'alias Nagios"
+msgstr "Adresses de messagerie de l'alias Nagios"
 
-#: personal/nagios/class_nagiosAccount.inc:76 personal/nagios/nagios.tpl.c:11
+#: personal/nagios/class_nagiosAccount.inc:76
 msgid "Host notification period"
 msgstr "PÃ©riode de notification pour les systÃ¨mes"
 
-#: personal/nagios/class_nagiosAccount.inc:81 personal/nagios/nagios.tpl.c:14
+#: personal/nagios/class_nagiosAccount.inc:81
 msgid "Service notification period"
 msgstr "PÃ©riode de notification pour les services"
 
-#: personal/nagios/class_nagiosAccount.inc:86 personal/nagios/nagios.tpl.c:17
+#: personal/nagios/class_nagiosAccount.inc:86
 msgid "Service notification options"
-msgstr "Options de notification pour les services"
+msgstr "Options pour la pÃ©riode de notification pour les services"
 
-#: personal/nagios/class_nagiosAccount.inc:91 personal/nagios/nagios.tpl.c:20
+#: personal/nagios/class_nagiosAccount.inc:91
 msgid "Host notification options"
-msgstr "Options de notification pour les systÃ¨mes"
+msgstr "Options pour la notification des systÃ¨mes"
 
-#: personal/nagios/class_nagiosAccount.inc:96 personal/nagios/nagios.tpl.c:23
+#: personal/nagios/class_nagiosAccount.inc:96
 msgid "Pager"
 msgstr "Bip"
 
@@ -76,11 +70,11 @@ msgstr "Bip"
 msgid " Pager"
 msgstr "Bip"
 
-#: personal/nagios/class_nagiosAccount.inc:100 personal/nagios/nagios.tpl.c:26
+#: personal/nagios/class_nagiosAccount.inc:100
 msgid "Service notification commands"
 msgstr "Commandes pour la notification des services"
 
-#: personal/nagios/class_nagiosAccount.inc:104 personal/nagios/nagios.tpl.c:29
+#: personal/nagios/class_nagiosAccount.inc:104
 msgid "Host notification commands"
 msgstr "Commandes pour la notification des systÃ¨mes"
 
@@ -99,35 +93,3 @@ msgstr "PrÃ©fixe Lconf"
 #: config/nagios/class_nagiosConfig.inc:45
 msgid "Prefix used for lconf LDAP fields"
 msgstr "PrÃ©fixe utilisÃ© pour les champs LDAP lconf"
-
-#: personal/nagios/nagios.tpl.c:32
-msgid "Nagios authentification"
-msgstr "Authentification nagios"
-
-#: personal/nagios/nagios.tpl.c:35
-msgid "view system informations"
-msgstr "voir les informations sur le systÃ¨me"
-
-#: personal/nagios/nagios.tpl.c:38
-msgid "view configuration information"
-msgstr "voir les informations de configuration"
-
-#: personal/nagios/nagios.tpl.c:41
-msgid "trigger system commands"
-msgstr "Permettre les commandes systÃ¨mes"
-
-#: personal/nagios/nagios.tpl.c:44
-msgid "view all services"
-msgstr "Voir tout les services"
-
-#: personal/nagios/nagios.tpl.c:47
-msgid "view all hosts"
-msgstr "Voir tout les hÃ´tes"
-
-#: personal/nagios/nagios.tpl.c:50
-msgid "trigger all service commands"
-msgstr "Permettre les commandes sur tout les services"
-
-#: personal/nagios/nagios.tpl.c:53
-msgid "trigger all host commands"
-msgstr "permettre les commandes sur tout les hÃ´tes"
diff --git a/nagios/locale/id/fusiondirectory.po b/nagios/locale/id/fusiondirectory.po
index e1019120d699c21645d011e30a0388437cf5237b..546dd49ac5f3d88207c023989e8f728b8ba91260 100644
--- a/nagios/locale/id/fusiondirectory.po
+++ b/nagios/locale/id/fusiondirectory.po
@@ -5,12 +5,12 @@
 # Translators:
 msgid ""
 msgstr ""
-"Project-Id-Version: FusionDirectory-108\n"
+"Project-Id-Version: FusionDirectory-109\n"
 "Report-Msgid-Bugs-To: documentation@lists.fusiondirectory.org\n"
-"POT-Creation-Date: 2015-03-19 21:45+0100\n"
-"PO-Revision-Date: 2015-02-25 15:50+0000\n"
+"POT-Creation-Date: 2014-12-15 17:47+0100\n"
+"PO-Revision-Date: 2014-12-15 17:00+0000\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>\n"
-"Language-Team: Indonesian (http://www.transifex.com/projects/p/FusionDirectory-108/language/id/)\n"
+"Language-Team: Indonesian (http://www.transifex.com/projects/p/FusionDirectory-109/language/id/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -26,11 +26,11 @@ msgstr ""
 msgid "Nagios account settings"
 msgstr ""
 
-#: personal/nagios/class_nagiosAccount.inc:65 personal/nagios/nagios.tpl.c:2
+#: personal/nagios/class_nagiosAccount.inc:65
 msgid "Nagios Account"
 msgstr ""
 
-#: personal/nagios/class_nagiosAccount.inc:68 personal/nagios/nagios.tpl.c:5
+#: personal/nagios/class_nagiosAccount.inc:68
 msgid "Alias"
 msgstr ""
 
@@ -38,7 +38,7 @@ msgstr ""
 msgid "Name of the nagios alias"
 msgstr ""
 
-#: personal/nagios/class_nagiosAccount.inc:72 personal/nagios/nagios.tpl.c:8
+#: personal/nagios/class_nagiosAccount.inc:72
 msgid "Mail address"
 msgstr ""
 
@@ -46,23 +46,23 @@ msgstr ""
 msgid "Email of the nagios alias"
 msgstr ""
 
-#: personal/nagios/class_nagiosAccount.inc:76 personal/nagios/nagios.tpl.c:11
+#: personal/nagios/class_nagiosAccount.inc:76
 msgid "Host notification period"
 msgstr ""
 
-#: personal/nagios/class_nagiosAccount.inc:81 personal/nagios/nagios.tpl.c:14
+#: personal/nagios/class_nagiosAccount.inc:81
 msgid "Service notification period"
 msgstr ""
 
-#: personal/nagios/class_nagiosAccount.inc:86 personal/nagios/nagios.tpl.c:17
+#: personal/nagios/class_nagiosAccount.inc:86
 msgid "Service notification options"
 msgstr ""
 
-#: personal/nagios/class_nagiosAccount.inc:91 personal/nagios/nagios.tpl.c:20
+#: personal/nagios/class_nagiosAccount.inc:91
 msgid "Host notification options"
 msgstr ""
 
-#: personal/nagios/class_nagiosAccount.inc:96 personal/nagios/nagios.tpl.c:23
+#: personal/nagios/class_nagiosAccount.inc:96
 msgid "Pager"
 msgstr ""
 
@@ -70,11 +70,11 @@ msgstr ""
 msgid " Pager"
 msgstr ""
 
-#: personal/nagios/class_nagiosAccount.inc:100 personal/nagios/nagios.tpl.c:26
+#: personal/nagios/class_nagiosAccount.inc:100
 msgid "Service notification commands"
 msgstr ""
 
-#: personal/nagios/class_nagiosAccount.inc:104 personal/nagios/nagios.tpl.c:29
+#: personal/nagios/class_nagiosAccount.inc:104
 msgid "Host notification commands"
 msgstr ""
 
@@ -93,35 +93,3 @@ msgstr ""
 #: config/nagios/class_nagiosConfig.inc:45
 msgid "Prefix used for lconf LDAP fields"
 msgstr ""
-
-#: personal/nagios/nagios.tpl.c:32
-msgid "Nagios authentification"
-msgstr ""
-
-#: personal/nagios/nagios.tpl.c:35
-msgid "view system informations"
-msgstr ""
-
-#: personal/nagios/nagios.tpl.c:38
-msgid "view configuration information"
-msgstr ""
-
-#: personal/nagios/nagios.tpl.c:41
-msgid "trigger system commands"
-msgstr ""
-
-#: personal/nagios/nagios.tpl.c:44
-msgid "view all services"
-msgstr ""
-
-#: personal/nagios/nagios.tpl.c:47
-msgid "view all hosts"
-msgstr ""
-
-#: personal/nagios/nagios.tpl.c:50
-msgid "trigger all service commands"
-msgstr ""
-
-#: personal/nagios/nagios.tpl.c:53
-msgid "trigger all host commands"
-msgstr ""
diff --git a/nagios/locale/it/fusiondirectory.po b/nagios/locale/it/fusiondirectory.po
index 273ff992e2151fc7d978c3ccb8776d97de01c53a..8f57abfec9486e13f4cf0c98cefdb15b8ca4bc13 100644
--- a/nagios/locale/it/fusiondirectory.po
+++ b/nagios/locale/it/fusiondirectory.po
@@ -3,19 +3,14 @@
 # This file is distributed under the same license as the PACKAGE package.
 # 
 # Translators:
-# Alessandro Amici <a.amici@bopen.it>, 2005
-# poterealpopolo <giuliano@opensides.be>, 2011
-# poterealpopolo <giuliano@opensides.be>, 2013
-# poterealpopolo <giuliano@opensides.be>, 2012
-# poterealpopolo <giuliano@opensides.be>, 2011-2013
 msgid ""
 msgstr ""
-"Project-Id-Version: FusionDirectory-108\n"
+"Project-Id-Version: FusionDirectory-109\n"
 "Report-Msgid-Bugs-To: documentation@lists.fusiondirectory.org\n"
-"POT-Creation-Date: 2015-03-19 21:45+0100\n"
-"PO-Revision-Date: 2015-02-25 16:12+0000\n"
+"POT-Creation-Date: 2014-12-15 17:47+0100\n"
+"PO-Revision-Date: 2014-12-15 17:01+0000\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>\n"
-"Language-Team: Italian (http://www.transifex.com/projects/p/FusionDirectory-108/language/it/)\n"
+"Language-Team: Italian (http://www.transifex.com/projects/p/FusionDirectory-109/language/it/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -31,11 +26,11 @@ msgstr "Nagios"
 msgid "Nagios account settings"
 msgstr "Parametri di Nagios"
 
-#: personal/nagios/class_nagiosAccount.inc:65 personal/nagios/nagios.tpl.c:2
+#: personal/nagios/class_nagiosAccount.inc:65
 msgid "Nagios Account"
 msgstr "Account di Nagios"
 
-#: personal/nagios/class_nagiosAccount.inc:68 personal/nagios/nagios.tpl.c:5
+#: personal/nagios/class_nagiosAccount.inc:68
 msgid "Alias"
 msgstr "Alias dell'utente"
 
@@ -43,7 +38,7 @@ msgstr "Alias dell'utente"
 msgid "Name of the nagios alias"
 msgstr "Nome dell'alias Nagios"
 
-#: personal/nagios/class_nagiosAccount.inc:72 personal/nagios/nagios.tpl.c:8
+#: personal/nagios/class_nagiosAccount.inc:72
 msgid "Mail address"
 msgstr "Indirizzo di posta elettronica"
 
@@ -51,23 +46,23 @@ msgstr "Indirizzo di posta elettronica"
 msgid "Email of the nagios alias"
 msgstr "Email dell'alias Nagios"
 
-#: personal/nagios/class_nagiosAccount.inc:76 personal/nagios/nagios.tpl.c:11
+#: personal/nagios/class_nagiosAccount.inc:76
 msgid "Host notification period"
 msgstr "Periodo di notifica dei clienti"
 
-#: personal/nagios/class_nagiosAccount.inc:81 personal/nagios/nagios.tpl.c:14
+#: personal/nagios/class_nagiosAccount.inc:81
 msgid "Service notification period"
 msgstr "Periodo di notifica dei servizi"
 
-#: personal/nagios/class_nagiosAccount.inc:86 personal/nagios/nagios.tpl.c:17
+#: personal/nagios/class_nagiosAccount.inc:86
 msgid "Service notification options"
 msgstr "Opzioni per la notifica dei servizi"
 
-#: personal/nagios/class_nagiosAccount.inc:91 personal/nagios/nagios.tpl.c:20
+#: personal/nagios/class_nagiosAccount.inc:91
 msgid "Host notification options"
 msgstr "Opzioni per la notifica dei clienti"
 
-#: personal/nagios/class_nagiosAccount.inc:96 personal/nagios/nagios.tpl.c:23
+#: personal/nagios/class_nagiosAccount.inc:96
 msgid "Pager"
 msgstr "Cercapersone"
 
@@ -75,11 +70,11 @@ msgstr "Cercapersone"
 msgid " Pager"
 msgstr "Cercapersone"
 
-#: personal/nagios/class_nagiosAccount.inc:100 personal/nagios/nagios.tpl.c:26
+#: personal/nagios/class_nagiosAccount.inc:100
 msgid "Service notification commands"
 msgstr "Comandi per la notifica dei servizi"
 
-#: personal/nagios/class_nagiosAccount.inc:104 personal/nagios/nagios.tpl.c:29
+#: personal/nagios/class_nagiosAccount.inc:104
 msgid "Host notification commands"
 msgstr "Comandi per la notifica dei clienti"
 
@@ -98,35 +93,3 @@ msgstr ""
 #: config/nagios/class_nagiosConfig.inc:45
 msgid "Prefix used for lconf LDAP fields"
 msgstr ""
-
-#: personal/nagios/nagios.tpl.c:32
-msgid "Nagios authentification"
-msgstr "Autentificazione di Nagios"
-
-#: personal/nagios/nagios.tpl.c:35
-msgid "view system informations"
-msgstr "vedi le informazioni sul sistema"
-
-#: personal/nagios/nagios.tpl.c:38
-msgid "view configuration information"
-msgstr "vedi le informazioni di configurazione"
-
-#: personal/nagios/nagios.tpl.c:41
-msgid "trigger system commands"
-msgstr "Autorizza i comandi di sistema"
-
-#: personal/nagios/nagios.tpl.c:44
-msgid "view all services"
-msgstr "vedi tutti i servizi"
-
-#: personal/nagios/nagios.tpl.c:47
-msgid "view all hosts"
-msgstr "vedi tutti gli host"
-
-#: personal/nagios/nagios.tpl.c:50
-msgid "trigger all service commands"
-msgstr "Autorizza i comandi su tutti i servizi"
-
-#: personal/nagios/nagios.tpl.c:53
-msgid "trigger all host commands"
-msgstr "Autorizza i comandi su tutti gli host"
diff --git a/nagios/locale/lv/fusiondirectory.po b/nagios/locale/lv/fusiondirectory.po
index 01a7d7e57c2c427df2b55035aa1babcbed284a5d..6e6f96938b832aa7ffbb0de88f65ac725788d18f 100644
--- a/nagios/locale/lv/fusiondirectory.po
+++ b/nagios/locale/lv/fusiondirectory.po
@@ -5,12 +5,12 @@
 # Translators:
 msgid ""
 msgstr ""
-"Project-Id-Version: FusionDirectory-108\n"
+"Project-Id-Version: FusionDirectory-109\n"
 "Report-Msgid-Bugs-To: documentation@lists.fusiondirectory.org\n"
-"POT-Creation-Date: 2015-03-19 21:45+0100\n"
-"PO-Revision-Date: 2015-02-25 15:50+0000\n"
+"POT-Creation-Date: 2014-12-15 17:47+0100\n"
+"PO-Revision-Date: 2014-12-15 17:00+0000\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>\n"
-"Language-Team: Latvian (http://www.transifex.com/projects/p/FusionDirectory-108/language/lv/)\n"
+"Language-Team: Latvian (http://www.transifex.com/projects/p/FusionDirectory-109/language/lv/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -26,11 +26,11 @@ msgstr ""
 msgid "Nagios account settings"
 msgstr ""
 
-#: personal/nagios/class_nagiosAccount.inc:65 personal/nagios/nagios.tpl.c:2
+#: personal/nagios/class_nagiosAccount.inc:65
 msgid "Nagios Account"
 msgstr ""
 
-#: personal/nagios/class_nagiosAccount.inc:68 personal/nagios/nagios.tpl.c:5
+#: personal/nagios/class_nagiosAccount.inc:68
 msgid "Alias"
 msgstr ""
 
@@ -38,7 +38,7 @@ msgstr ""
 msgid "Name of the nagios alias"
 msgstr ""
 
-#: personal/nagios/class_nagiosAccount.inc:72 personal/nagios/nagios.tpl.c:8
+#: personal/nagios/class_nagiosAccount.inc:72
 msgid "Mail address"
 msgstr ""
 
@@ -46,23 +46,23 @@ msgstr ""
 msgid "Email of the nagios alias"
 msgstr ""
 
-#: personal/nagios/class_nagiosAccount.inc:76 personal/nagios/nagios.tpl.c:11
+#: personal/nagios/class_nagiosAccount.inc:76
 msgid "Host notification period"
 msgstr ""
 
-#: personal/nagios/class_nagiosAccount.inc:81 personal/nagios/nagios.tpl.c:14
+#: personal/nagios/class_nagiosAccount.inc:81
 msgid "Service notification period"
 msgstr ""
 
-#: personal/nagios/class_nagiosAccount.inc:86 personal/nagios/nagios.tpl.c:17
+#: personal/nagios/class_nagiosAccount.inc:86
 msgid "Service notification options"
 msgstr ""
 
-#: personal/nagios/class_nagiosAccount.inc:91 personal/nagios/nagios.tpl.c:20
+#: personal/nagios/class_nagiosAccount.inc:91
 msgid "Host notification options"
 msgstr ""
 
-#: personal/nagios/class_nagiosAccount.inc:96 personal/nagios/nagios.tpl.c:23
+#: personal/nagios/class_nagiosAccount.inc:96
 msgid "Pager"
 msgstr ""
 
@@ -70,11 +70,11 @@ msgstr ""
 msgid " Pager"
 msgstr ""
 
-#: personal/nagios/class_nagiosAccount.inc:100 personal/nagios/nagios.tpl.c:26
+#: personal/nagios/class_nagiosAccount.inc:100
 msgid "Service notification commands"
 msgstr ""
 
-#: personal/nagios/class_nagiosAccount.inc:104 personal/nagios/nagios.tpl.c:29
+#: personal/nagios/class_nagiosAccount.inc:104
 msgid "Host notification commands"
 msgstr ""
 
@@ -93,35 +93,3 @@ msgstr ""
 #: config/nagios/class_nagiosConfig.inc:45
 msgid "Prefix used for lconf LDAP fields"
 msgstr ""
-
-#: personal/nagios/nagios.tpl.c:32
-msgid "Nagios authentification"
-msgstr ""
-
-#: personal/nagios/nagios.tpl.c:35
-msgid "view system informations"
-msgstr ""
-
-#: personal/nagios/nagios.tpl.c:38
-msgid "view configuration information"
-msgstr ""
-
-#: personal/nagios/nagios.tpl.c:41
-msgid "trigger system commands"
-msgstr ""
-
-#: personal/nagios/nagios.tpl.c:44
-msgid "view all services"
-msgstr ""
-
-#: personal/nagios/nagios.tpl.c:47
-msgid "view all hosts"
-msgstr ""
-
-#: personal/nagios/nagios.tpl.c:50
-msgid "trigger all service commands"
-msgstr ""
-
-#: personal/nagios/nagios.tpl.c:53
-msgid "trigger all host commands"
-msgstr ""
diff --git a/nagios/locale/nb/fusiondirectory.po b/nagios/locale/nb/fusiondirectory.po
index 04f5088d11ec0ac66f5c50e780c075b72b1f2d1e..a8a6a3c1573d221441b37cc30a8e9e5c3e63982e 100644
--- a/nagios/locale/nb/fusiondirectory.po
+++ b/nagios/locale/nb/fusiondirectory.po
@@ -5,12 +5,12 @@
 # Translators:
 msgid ""
 msgstr ""
-"Project-Id-Version: FusionDirectory-108\n"
+"Project-Id-Version: FusionDirectory-109\n"
 "Report-Msgid-Bugs-To: documentation@lists.fusiondirectory.org\n"
-"POT-Creation-Date: 2015-03-19 21:45+0100\n"
-"PO-Revision-Date: 2015-02-25 15:50+0000\n"
+"POT-Creation-Date: 2014-12-15 17:47+0100\n"
+"PO-Revision-Date: 2014-12-15 17:00+0000\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>\n"
-"Language-Team: Norwegian BokmÃ¥l (http://www.transifex.com/projects/p/FusionDirectory-108/language/nb/)\n"
+"Language-Team: Norwegian BokmÃ¥l (http://www.transifex.com/projects/p/FusionDirectory-109/language/nb/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -26,11 +26,11 @@ msgstr ""
 msgid "Nagios account settings"
 msgstr ""
 
-#: personal/nagios/class_nagiosAccount.inc:65 personal/nagios/nagios.tpl.c:2
+#: personal/nagios/class_nagiosAccount.inc:65
 msgid "Nagios Account"
 msgstr ""
 
-#: personal/nagios/class_nagiosAccount.inc:68 personal/nagios/nagios.tpl.c:5
+#: personal/nagios/class_nagiosAccount.inc:68
 msgid "Alias"
 msgstr ""
 
@@ -38,7 +38,7 @@ msgstr ""
 msgid "Name of the nagios alias"
 msgstr ""
 
-#: personal/nagios/class_nagiosAccount.inc:72 personal/nagios/nagios.tpl.c:8
+#: personal/nagios/class_nagiosAccount.inc:72
 msgid "Mail address"
 msgstr ""
 
@@ -46,23 +46,23 @@ msgstr ""
 msgid "Email of the nagios alias"
 msgstr ""
 
-#: personal/nagios/class_nagiosAccount.inc:76 personal/nagios/nagios.tpl.c:11
+#: personal/nagios/class_nagiosAccount.inc:76
 msgid "Host notification period"
 msgstr ""
 
-#: personal/nagios/class_nagiosAccount.inc:81 personal/nagios/nagios.tpl.c:14
+#: personal/nagios/class_nagiosAccount.inc:81
 msgid "Service notification period"
 msgstr ""
 
-#: personal/nagios/class_nagiosAccount.inc:86 personal/nagios/nagios.tpl.c:17
+#: personal/nagios/class_nagiosAccount.inc:86
 msgid "Service notification options"
 msgstr ""
 
-#: personal/nagios/class_nagiosAccount.inc:91 personal/nagios/nagios.tpl.c:20
+#: personal/nagios/class_nagiosAccount.inc:91
 msgid "Host notification options"
 msgstr ""
 
-#: personal/nagios/class_nagiosAccount.inc:96 personal/nagios/nagios.tpl.c:23
+#: personal/nagios/class_nagiosAccount.inc:96
 msgid "Pager"
 msgstr ""
 
@@ -70,11 +70,11 @@ msgstr ""
 msgid " Pager"
 msgstr ""
 
-#: personal/nagios/class_nagiosAccount.inc:100 personal/nagios/nagios.tpl.c:26
+#: personal/nagios/class_nagiosAccount.inc:100
 msgid "Service notification commands"
 msgstr ""
 
-#: personal/nagios/class_nagiosAccount.inc:104 personal/nagios/nagios.tpl.c:29
+#: personal/nagios/class_nagiosAccount.inc:104
 msgid "Host notification commands"
 msgstr ""
 
@@ -93,35 +93,3 @@ msgstr ""
 #: config/nagios/class_nagiosConfig.inc:45
 msgid "Prefix used for lconf LDAP fields"
 msgstr ""
-
-#: personal/nagios/nagios.tpl.c:32
-msgid "Nagios authentification"
-msgstr ""
-
-#: personal/nagios/nagios.tpl.c:35
-msgid "view system informations"
-msgstr ""
-
-#: personal/nagios/nagios.tpl.c:38
-msgid "view configuration information"
-msgstr ""
-
-#: personal/nagios/nagios.tpl.c:41
-msgid "trigger system commands"
-msgstr ""
-
-#: personal/nagios/nagios.tpl.c:44
-msgid "view all services"
-msgstr ""
-
-#: personal/nagios/nagios.tpl.c:47
-msgid "view all hosts"
-msgstr ""
-
-#: personal/nagios/nagios.tpl.c:50
-msgid "trigger all service commands"
-msgstr ""
-
-#: personal/nagios/nagios.tpl.c:53
-msgid "trigger all host commands"
-msgstr ""
diff --git a/nagios/locale/nl/fusiondirectory.po b/nagios/locale/nl/fusiondirectory.po
index 29a1a4ba4cfade9c46945b4434ec10b0a6a51b0c..e016bf5d6d05852592c43d5997fea216cdcd83eb 100644
--- a/nagios/locale/nl/fusiondirectory.po
+++ b/nagios/locale/nl/fusiondirectory.po
@@ -3,17 +3,14 @@
 # This file is distributed under the same license as the PACKAGE package.
 # 
 # Translators:
-# Kenny Tordeurs <tordeurskenny@gmail.com>, 2012-2013
-#  Niels Klomp (CareWorks ICT Services) <nk@careworks.nl>, 2005
-# Kenny Tordeurs <tordeurskenny@gmail.com>, 2012
 msgid ""
 msgstr ""
-"Project-Id-Version: FusionDirectory-108\n"
+"Project-Id-Version: FusionDirectory-109\n"
 "Report-Msgid-Bugs-To: documentation@lists.fusiondirectory.org\n"
-"POT-Creation-Date: 2015-03-19 21:45+0100\n"
-"PO-Revision-Date: 2015-02-25 16:12+0000\n"
+"POT-Creation-Date: 2014-12-15 17:47+0100\n"
+"PO-Revision-Date: 2014-12-15 17:01+0000\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>\n"
-"Language-Team: Dutch (http://www.transifex.com/projects/p/FusionDirectory-108/language/nl/)\n"
+"Language-Team: Dutch (http://www.transifex.com/projects/p/FusionDirectory-109/language/nl/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -29,11 +26,11 @@ msgstr "Nagios"
 msgid "Nagios account settings"
 msgstr "Nagios account opties"
 
-#: personal/nagios/class_nagiosAccount.inc:65 personal/nagios/nagios.tpl.c:2
+#: personal/nagios/class_nagiosAccount.inc:65
 msgid "Nagios Account"
 msgstr "Nagios account"
 
-#: personal/nagios/class_nagiosAccount.inc:68 personal/nagios/nagios.tpl.c:5
+#: personal/nagios/class_nagiosAccount.inc:68
 msgid "Alias"
 msgstr "Alias"
 
@@ -41,7 +38,7 @@ msgstr "Alias"
 msgid "Name of the nagios alias"
 msgstr "Naam van de nagios alias"
 
-#: personal/nagios/class_nagiosAccount.inc:72 personal/nagios/nagios.tpl.c:8
+#: personal/nagios/class_nagiosAccount.inc:72
 msgid "Mail address"
 msgstr "E-mail adres"
 
@@ -49,23 +46,23 @@ msgstr "E-mail adres"
 msgid "Email of the nagios alias"
 msgstr "Email van de nagios alias"
 
-#: personal/nagios/class_nagiosAccount.inc:76 personal/nagios/nagios.tpl.c:11
+#: personal/nagios/class_nagiosAccount.inc:76
 msgid "Host notification period"
 msgstr "Host notificatie periode"
 
-#: personal/nagios/class_nagiosAccount.inc:81 personal/nagios/nagios.tpl.c:14
+#: personal/nagios/class_nagiosAccount.inc:81
 msgid "Service notification period"
 msgstr "Service notificatie periode"
 
-#: personal/nagios/class_nagiosAccount.inc:86 personal/nagios/nagios.tpl.c:17
+#: personal/nagios/class_nagiosAccount.inc:86
 msgid "Service notification options"
 msgstr "Service notificatie opties"
 
-#: personal/nagios/class_nagiosAccount.inc:91 personal/nagios/nagios.tpl.c:20
+#: personal/nagios/class_nagiosAccount.inc:91
 msgid "Host notification options"
 msgstr "Host notificatie opties"
 
-#: personal/nagios/class_nagiosAccount.inc:96 personal/nagios/nagios.tpl.c:23
+#: personal/nagios/class_nagiosAccount.inc:96
 msgid "Pager"
 msgstr "Pieper"
 
@@ -73,11 +70,11 @@ msgstr "Pieper"
 msgid " Pager"
 msgstr "Pager"
 
-#: personal/nagios/class_nagiosAccount.inc:100 personal/nagios/nagios.tpl.c:26
+#: personal/nagios/class_nagiosAccount.inc:100
 msgid "Service notification commands"
 msgstr "Service notificatie commando's"
 
-#: personal/nagios/class_nagiosAccount.inc:104 personal/nagios/nagios.tpl.c:29
+#: personal/nagios/class_nagiosAccount.inc:104
 msgid "Host notification commands"
 msgstr "Host notificatie commando's"
 
@@ -96,35 +93,3 @@ msgstr ""
 #: config/nagios/class_nagiosConfig.inc:45
 msgid "Prefix used for lconf LDAP fields"
 msgstr ""
-
-#: personal/nagios/nagios.tpl.c:32
-msgid "Nagios authentification"
-msgstr "Nagios authenticatie"
-
-#: personal/nagios/nagios.tpl.c:35
-msgid "view system informations"
-msgstr "systeem informatie bekijken"
-
-#: personal/nagios/nagios.tpl.c:38
-msgid "view configuration information"
-msgstr "configuratie informatie bekijken"
-
-#: personal/nagios/nagios.tpl.c:41
-msgid "trigger system commands"
-msgstr "systeem commando's activeren"
-
-#: personal/nagios/nagios.tpl.c:44
-msgid "view all services"
-msgstr "alle services bekijken"
-
-#: personal/nagios/nagios.tpl.c:47
-msgid "view all hosts"
-msgstr "alle hosts bekijken"
-
-#: personal/nagios/nagios.tpl.c:50
-msgid "trigger all service commands"
-msgstr "alle service commando's activeren"
-
-#: personal/nagios/nagios.tpl.c:53
-msgid "trigger all host commands"
-msgstr "alle host commando's activeren"
diff --git a/nagios/locale/pl/fusiondirectory.po b/nagios/locale/pl/fusiondirectory.po
index 53ffc219b8430a763f8866d1ec8d359b567e5b0e..ce2587020ee1946a79521e124f97be9b594b259d 100644
--- a/nagios/locale/pl/fusiondirectory.po
+++ b/nagios/locale/pl/fusiondirectory.po
@@ -5,12 +5,12 @@
 # Translators:
 msgid ""
 msgstr ""
-"Project-Id-Version: FusionDirectory-108\n"
+"Project-Id-Version: FusionDirectory-109\n"
 "Report-Msgid-Bugs-To: documentation@lists.fusiondirectory.org\n"
-"POT-Creation-Date: 2015-03-19 21:45+0100\n"
-"PO-Revision-Date: 2015-02-25 16:12+0000\n"
+"POT-Creation-Date: 2014-12-15 17:47+0100\n"
+"PO-Revision-Date: 2014-12-15 17:01+0000\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>\n"
-"Language-Team: Polish (http://www.transifex.com/projects/p/FusionDirectory-108/language/pl/)\n"
+"Language-Team: Polish (http://www.transifex.com/projects/p/FusionDirectory-109/language/pl/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -26,11 +26,11 @@ msgstr "Nagios"
 msgid "Nagios account settings"
 msgstr "Ustawienia konta nagios"
 
-#: personal/nagios/class_nagiosAccount.inc:65 personal/nagios/nagios.tpl.c:2
+#: personal/nagios/class_nagiosAccount.inc:65
 msgid "Nagios Account"
 msgstr "Konto Nagios"
 
-#: personal/nagios/class_nagiosAccount.inc:68 personal/nagios/nagios.tpl.c:5
+#: personal/nagios/class_nagiosAccount.inc:68
 msgid "Alias"
 msgstr "Alias"
 
@@ -38,7 +38,7 @@ msgstr "Alias"
 msgid "Name of the nagios alias"
 msgstr ""
 
-#: personal/nagios/class_nagiosAccount.inc:72 personal/nagios/nagios.tpl.c:8
+#: personal/nagios/class_nagiosAccount.inc:72
 msgid "Mail address"
 msgstr "Adres email"
 
@@ -46,23 +46,23 @@ msgstr "Adres email"
 msgid "Email of the nagios alias"
 msgstr ""
 
-#: personal/nagios/class_nagiosAccount.inc:76 personal/nagios/nagios.tpl.c:11
+#: personal/nagios/class_nagiosAccount.inc:76
 msgid "Host notification period"
 msgstr "Okres powiadamiania o hoÅ›cie"
 
-#: personal/nagios/class_nagiosAccount.inc:81 personal/nagios/nagios.tpl.c:14
+#: personal/nagios/class_nagiosAccount.inc:81
 msgid "Service notification period"
 msgstr "Okres powiadamiania o usÅ‚udze"
 
-#: personal/nagios/class_nagiosAccount.inc:86 personal/nagios/nagios.tpl.c:17
+#: personal/nagios/class_nagiosAccount.inc:86
 msgid "Service notification options"
 msgstr "Opcje powiadamiania o usÅ‚udze"
 
-#: personal/nagios/class_nagiosAccount.inc:91 personal/nagios/nagios.tpl.c:20
+#: personal/nagios/class_nagiosAccount.inc:91
 msgid "Host notification options"
 msgstr "Opcje powiadamiania o hoÅ›cie"
 
-#: personal/nagios/class_nagiosAccount.inc:96 personal/nagios/nagios.tpl.c:23
+#: personal/nagios/class_nagiosAccount.inc:96
 msgid "Pager"
 msgstr "Pager"
 
@@ -70,11 +70,11 @@ msgstr "Pager"
 msgid " Pager"
 msgstr "Pager"
 
-#: personal/nagios/class_nagiosAccount.inc:100 personal/nagios/nagios.tpl.c:26
+#: personal/nagios/class_nagiosAccount.inc:100
 msgid "Service notification commands"
 msgstr "Polecenia powiadamiania o usÅ‚udze"
 
-#: personal/nagios/class_nagiosAccount.inc:104 personal/nagios/nagios.tpl.c:29
+#: personal/nagios/class_nagiosAccount.inc:104
 msgid "Host notification commands"
 msgstr "Polecenia powiadamiania o hoÅ›cie"
 
@@ -93,35 +93,3 @@ msgstr ""
 #: config/nagios/class_nagiosConfig.inc:45
 msgid "Prefix used for lconf LDAP fields"
 msgstr ""
-
-#: personal/nagios/nagios.tpl.c:32
-msgid "Nagios authentification"
-msgstr "Autentykacja Nagios"
-
-#: personal/nagios/nagios.tpl.c:35
-msgid "view system informations"
-msgstr "pokaÅ¼ informacje o systemie"
-
-#: personal/nagios/nagios.tpl.c:38
-msgid "view configuration information"
-msgstr "PokaÅ¼ konfiguracjÄ™"
-
-#: personal/nagios/nagios.tpl.c:41
-msgid "trigger system commands"
-msgstr "przeÅ‚Ä…cz polecenia systemu"
-
-#: personal/nagios/nagios.tpl.c:44
-msgid "view all services"
-msgstr "pokaÅ¼ wszystkie usÅ‚ugi"
-
-#: personal/nagios/nagios.tpl.c:47
-msgid "view all hosts"
-msgstr "pokaÅ¼ wszystkie hosty"
-
-#: personal/nagios/nagios.tpl.c:50
-msgid "trigger all service commands"
-msgstr "przeÅ‚Ä…cz wszystkie polecenia usÅ‚ugi"
-
-#: personal/nagios/nagios.tpl.c:53
-msgid "trigger all host commands"
-msgstr "przeÅ‚Ä…cz wszystkie polecenia hosta"
diff --git a/nagios/locale/pt/fusiondirectory.po b/nagios/locale/pt/fusiondirectory.po
index 9e1406b32bb09716e96b3e0668862d31233e141a..314e17ce78d3d065e7d5d51c225d6aa928088606 100644
--- a/nagios/locale/pt/fusiondirectory.po
+++ b/nagios/locale/pt/fusiondirectory.po
@@ -5,12 +5,12 @@
 # Translators:
 msgid ""
 msgstr ""
-"Project-Id-Version: FusionDirectory-108\n"
+"Project-Id-Version: FusionDirectory-109\n"
 "Report-Msgid-Bugs-To: documentation@lists.fusiondirectory.org\n"
-"POT-Creation-Date: 2015-03-19 21:45+0100\n"
-"PO-Revision-Date: 2015-02-25 15:50+0000\n"
+"POT-Creation-Date: 2014-12-15 17:47+0100\n"
+"PO-Revision-Date: 2014-12-15 17:00+0000\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>\n"
-"Language-Team: Portuguese (http://www.transifex.com/projects/p/FusionDirectory-108/language/pt/)\n"
+"Language-Team: Portuguese (http://www.transifex.com/projects/p/FusionDirectory-109/language/pt/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -26,11 +26,11 @@ msgstr ""
 msgid "Nagios account settings"
 msgstr ""
 
-#: personal/nagios/class_nagiosAccount.inc:65 personal/nagios/nagios.tpl.c:2
+#: personal/nagios/class_nagiosAccount.inc:65
 msgid "Nagios Account"
 msgstr ""
 
-#: personal/nagios/class_nagiosAccount.inc:68 personal/nagios/nagios.tpl.c:5
+#: personal/nagios/class_nagiosAccount.inc:68
 msgid "Alias"
 msgstr ""
 
@@ -38,7 +38,7 @@ msgstr ""
 msgid "Name of the nagios alias"
 msgstr ""
 
-#: personal/nagios/class_nagiosAccount.inc:72 personal/nagios/nagios.tpl.c:8
+#: personal/nagios/class_nagiosAccount.inc:72
 msgid "Mail address"
 msgstr "EndereÃ§o de Correio"
 
@@ -46,23 +46,23 @@ msgstr "EndereÃ§o de Correio"
 msgid "Email of the nagios alias"
 msgstr ""
 
-#: personal/nagios/class_nagiosAccount.inc:76 personal/nagios/nagios.tpl.c:11
+#: personal/nagios/class_nagiosAccount.inc:76
 msgid "Host notification period"
 msgstr ""
 
-#: personal/nagios/class_nagiosAccount.inc:81 personal/nagios/nagios.tpl.c:14
+#: personal/nagios/class_nagiosAccount.inc:81
 msgid "Service notification period"
 msgstr ""
 
-#: personal/nagios/class_nagiosAccount.inc:86 personal/nagios/nagios.tpl.c:17
+#: personal/nagios/class_nagiosAccount.inc:86
 msgid "Service notification options"
 msgstr ""
 
-#: personal/nagios/class_nagiosAccount.inc:91 personal/nagios/nagios.tpl.c:20
+#: personal/nagios/class_nagiosAccount.inc:91
 msgid "Host notification options"
 msgstr ""
 
-#: personal/nagios/class_nagiosAccount.inc:96 personal/nagios/nagios.tpl.c:23
+#: personal/nagios/class_nagiosAccount.inc:96
 msgid "Pager"
 msgstr "Pager"
 
@@ -70,11 +70,11 @@ msgstr "Pager"
 msgid " Pager"
 msgstr "Pager"
 
-#: personal/nagios/class_nagiosAccount.inc:100 personal/nagios/nagios.tpl.c:26
+#: personal/nagios/class_nagiosAccount.inc:100
 msgid "Service notification commands"
 msgstr ""
 
-#: personal/nagios/class_nagiosAccount.inc:104 personal/nagios/nagios.tpl.c:29
+#: personal/nagios/class_nagiosAccount.inc:104
 msgid "Host notification commands"
 msgstr ""
 
@@ -93,35 +93,3 @@ msgstr ""
 #: config/nagios/class_nagiosConfig.inc:45
 msgid "Prefix used for lconf LDAP fields"
 msgstr ""
-
-#: personal/nagios/nagios.tpl.c:32
-msgid "Nagios authentification"
-msgstr ""
-
-#: personal/nagios/nagios.tpl.c:35
-msgid "view system informations"
-msgstr ""
-
-#: personal/nagios/nagios.tpl.c:38
-msgid "view configuration information"
-msgstr ""
-
-#: personal/nagios/nagios.tpl.c:41
-msgid "trigger system commands"
-msgstr ""
-
-#: personal/nagios/nagios.tpl.c:44
-msgid "view all services"
-msgstr ""
-
-#: personal/nagios/nagios.tpl.c:47
-msgid "view all hosts"
-msgstr ""
-
-#: personal/nagios/nagios.tpl.c:50
-msgid "trigger all service commands"
-msgstr ""
-
-#: personal/nagios/nagios.tpl.c:53
-msgid "trigger all host commands"
-msgstr ""
diff --git a/nagios/locale/pt_BR/fusiondirectory.po b/nagios/locale/pt_BR/fusiondirectory.po
index e6d4dc93b4df3884cc0132920f8a9c8ff12a4488..d5cdfe9d5943e0ef9ff397ef0b644a3cdb2639dd 100644
--- a/nagios/locale/pt_BR/fusiondirectory.po
+++ b/nagios/locale/pt_BR/fusiondirectory.po
@@ -3,15 +3,14 @@
 # This file is distributed under the same license as the PACKAGE package.
 # 
 # Translators:
-# ALEJANDRO BARRIOS <alejandrobarrios@interlegis.leg.br>, 2014
 msgid ""
 msgstr ""
-"Project-Id-Version: FusionDirectory-108\n"
+"Project-Id-Version: FusionDirectory-109\n"
 "Report-Msgid-Bugs-To: documentation@lists.fusiondirectory.org\n"
-"POT-Creation-Date: 2015-03-19 21:45+0100\n"
-"PO-Revision-Date: 2015-02-25 16:12+0000\n"
+"POT-Creation-Date: 2014-12-15 17:47+0100\n"
+"PO-Revision-Date: 2014-12-15 17:01+0000\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>\n"
-"Language-Team: Portuguese (Brazil) (http://www.transifex.com/projects/p/FusionDirectory-108/language/pt_BR/)\n"
+"Language-Team: Portuguese (Brazil) (http://www.transifex.com/projects/p/FusionDirectory-109/language/pt_BR/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -27,11 +26,11 @@ msgstr "Nagios"
 msgid "Nagios account settings"
 msgstr "ConfiguraÃ§Ãµes de conta Nagios"
 
-#: personal/nagios/class_nagiosAccount.inc:65 personal/nagios/nagios.tpl.c:2
+#: personal/nagios/class_nagiosAccount.inc:65
 msgid "Nagios Account"
 msgstr "Conta Nagios"
 
-#: personal/nagios/class_nagiosAccount.inc:68 personal/nagios/nagios.tpl.c:5
+#: personal/nagios/class_nagiosAccount.inc:68
 msgid "Alias"
 msgstr "Alias"
 
@@ -39,7 +38,7 @@ msgstr "Alias"
 msgid "Name of the nagios alias"
 msgstr "Nome do alias nagios"
 
-#: personal/nagios/class_nagiosAccount.inc:72 personal/nagios/nagios.tpl.c:8
+#: personal/nagios/class_nagiosAccount.inc:72
 msgid "Mail address"
 msgstr "E-mail"
 
@@ -47,23 +46,23 @@ msgstr "E-mail"
 msgid "Email of the nagios alias"
 msgstr "Email do alias nagios"
 
-#: personal/nagios/class_nagiosAccount.inc:76 personal/nagios/nagios.tpl.c:11
+#: personal/nagios/class_nagiosAccount.inc:76
 msgid "Host notification period"
 msgstr "PerÃodo de notificaÃ§Ã£o de host"
 
-#: personal/nagios/class_nagiosAccount.inc:81 personal/nagios/nagios.tpl.c:14
+#: personal/nagios/class_nagiosAccount.inc:81
 msgid "Service notification period"
 msgstr "PerÃodo de notificaÃ§Ã£o de serviÃ§o"
 
-#: personal/nagios/class_nagiosAccount.inc:86 personal/nagios/nagios.tpl.c:17
+#: personal/nagios/class_nagiosAccount.inc:86
 msgid "Service notification options"
 msgstr "OpÃ§Ãµes de notificaÃ§Ã£o de serviÃ§o"
 
-#: personal/nagios/class_nagiosAccount.inc:91 personal/nagios/nagios.tpl.c:20
+#: personal/nagios/class_nagiosAccount.inc:91
 msgid "Host notification options"
 msgstr "OpÃ§Ãµes de notificaÃ§Ã£o de host"
 
-#: personal/nagios/class_nagiosAccount.inc:96 personal/nagios/nagios.tpl.c:23
+#: personal/nagios/class_nagiosAccount.inc:96
 msgid "Pager"
 msgstr "Pager"
 
@@ -71,11 +70,11 @@ msgstr "Pager"
 msgid " Pager"
 msgstr "Pager"
 
-#: personal/nagios/class_nagiosAccount.inc:100 personal/nagios/nagios.tpl.c:26
+#: personal/nagios/class_nagiosAccount.inc:100
 msgid "Service notification commands"
 msgstr "Comandos de notificaÃ§Ã£o de serviÃ§o"
 
-#: personal/nagios/class_nagiosAccount.inc:104 personal/nagios/nagios.tpl.c:29
+#: personal/nagios/class_nagiosAccount.inc:104
 msgid "Host notification commands"
 msgstr "Comandos de notificaÃ§Ã£o de host"
 
@@ -94,35 +93,3 @@ msgstr "Prefixo Lconf"
 #: config/nagios/class_nagiosConfig.inc:45
 msgid "Prefix used for lconf LDAP fields"
 msgstr "Prefixo usado para os campos LDAP lconf"
-
-#: personal/nagios/nagios.tpl.c:32
-msgid "Nagios authentification"
-msgstr "AutentificaÃ§Ã£o Nagios"
-
-#: personal/nagios/nagios.tpl.c:35
-msgid "view system informations"
-msgstr "ver informaÃ§Ãµes do sistema"
-
-#: personal/nagios/nagios.tpl.c:38
-msgid "view configuration information"
-msgstr "ver informaÃ§Ã£o da configuraÃ§Ã£o"
-
-#: personal/nagios/nagios.tpl.c:41
-msgid "trigger system commands"
-msgstr ""
-
-#: personal/nagios/nagios.tpl.c:44
-msgid "view all services"
-msgstr "ver todos os serviÃ§os"
-
-#: personal/nagios/nagios.tpl.c:47
-msgid "view all hosts"
-msgstr "ver todos os hosts"
-
-#: personal/nagios/nagios.tpl.c:50
-msgid "trigger all service commands"
-msgstr ""
-
-#: personal/nagios/nagios.tpl.c:53
-msgid "trigger all host commands"
-msgstr ""
diff --git a/nagios/locale/ru/fusiondirectory.po b/nagios/locale/ru/fusiondirectory.po
index d8ce742d3084504a7291cf1cf83e60ae166aa52f..67cc4e6345817e06b87180a7799b601e64f88dc4 100644
--- a/nagios/locale/ru/fusiondirectory.po
+++ b/nagios/locale/ru/fusiondirectory.po
@@ -3,20 +3,19 @@
 # This file is distributed under the same license as the PACKAGE package.
 # 
 # Translators:
-#  Valia V. Vaneeva <fattie@altlinux.ru>, 2004
 msgid ""
 msgstr ""
-"Project-Id-Version: FusionDirectory-108\n"
+"Project-Id-Version: FusionDirectory-109\n"
 "Report-Msgid-Bugs-To: documentation@lists.fusiondirectory.org\n"
-"POT-Creation-Date: 2015-03-19 21:45+0100\n"
-"PO-Revision-Date: 2015-03-11 21:42+0000\n"
+"POT-Creation-Date: 2014-12-15 17:47+0100\n"
+"PO-Revision-Date: 2015-04-03 10:49+0000\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>\n"
-"Language-Team: Russian (http://www.transifex.com/projects/p/FusionDirectory-108/language/ru/)\n"
+"Language-Team: Russian (http://www.transifex.com/projects/p/FusionDirectory-109/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=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);\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/nagios/class_nagiosAccount.inc:45
 #: config/nagios/class_nagiosConfig.inc:42
@@ -27,19 +26,19 @@ msgstr ""
 msgid "Nagios account settings"
 msgstr ""
 
-#: personal/nagios/class_nagiosAccount.inc:65 personal/nagios/nagios.tpl.c:2
+#: personal/nagios/class_nagiosAccount.inc:65
 msgid "Nagios Account"
 msgstr ""
 
-#: personal/nagios/class_nagiosAccount.inc:68 personal/nagios/nagios.tpl.c:5
+#: personal/nagios/class_nagiosAccount.inc:68
 msgid "Alias"
-msgstr ""
+msgstr "ÐŸÑÐµÐ²Ð¾Ð´Ð¾Ð½Ð¸Ð¼"
 
 #: personal/nagios/class_nagiosAccount.inc:68
 msgid "Name of the nagios alias"
 msgstr ""
 
-#: personal/nagios/class_nagiosAccount.inc:72 personal/nagios/nagios.tpl.c:8
+#: personal/nagios/class_nagiosAccount.inc:72
 msgid "Mail address"
 msgstr "ÐÐ´Ñ€ÐµÑ ÑÐ»ÐµÐºÑ‚Ñ€Ð¾Ð½Ð½Ð¾Ð¹ Ð¿Ð¾Ñ‡Ñ‚Ñ‹"
 
@@ -47,23 +46,23 @@ msgstr "ÐÐ´Ñ€ÐµÑ ÑÐ»ÐµÐºÑ‚Ñ€Ð¾Ð½Ð½Ð¾Ð¹ Ð¿Ð¾Ñ‡Ñ‚Ñ‹"
 msgid "Email of the nagios alias"
 msgstr ""
 
-#: personal/nagios/class_nagiosAccount.inc:76 personal/nagios/nagios.tpl.c:11
+#: personal/nagios/class_nagiosAccount.inc:76
 msgid "Host notification period"
 msgstr ""
 
-#: personal/nagios/class_nagiosAccount.inc:81 personal/nagios/nagios.tpl.c:14
+#: personal/nagios/class_nagiosAccount.inc:81
 msgid "Service notification period"
 msgstr ""
 
-#: personal/nagios/class_nagiosAccount.inc:86 personal/nagios/nagios.tpl.c:17
+#: personal/nagios/class_nagiosAccount.inc:86
 msgid "Service notification options"
 msgstr ""
 
-#: personal/nagios/class_nagiosAccount.inc:91 personal/nagios/nagios.tpl.c:20
+#: personal/nagios/class_nagiosAccount.inc:91
 msgid "Host notification options"
 msgstr ""
 
-#: personal/nagios/class_nagiosAccount.inc:96 personal/nagios/nagios.tpl.c:23
+#: personal/nagios/class_nagiosAccount.inc:96
 msgid "Pager"
 msgstr "ÐŸÐµÐ¹Ð´Ð¶ÐµÑ€"
 
@@ -71,11 +70,11 @@ msgstr "ÐŸÐµÐ¹Ð´Ð¶ÐµÑ€"
 msgid " Pager"
 msgstr "ÐŸÐµÐ¹Ð´Ð¶ÐµÑ€"
 
-#: personal/nagios/class_nagiosAccount.inc:100 personal/nagios/nagios.tpl.c:26
+#: personal/nagios/class_nagiosAccount.inc:100
 msgid "Service notification commands"
 msgstr ""
 
-#: personal/nagios/class_nagiosAccount.inc:104 personal/nagios/nagios.tpl.c:29
+#: personal/nagios/class_nagiosAccount.inc:104
 msgid "Host notification commands"
 msgstr ""
 
@@ -94,35 +93,3 @@ msgstr ""
 #: config/nagios/class_nagiosConfig.inc:45
 msgid "Prefix used for lconf LDAP fields"
 msgstr ""
-
-#: personal/nagios/nagios.tpl.c:32
-msgid "Nagios authentification"
-msgstr ""
-
-#: personal/nagios/nagios.tpl.c:35
-msgid "view system informations"
-msgstr ""
-
-#: personal/nagios/nagios.tpl.c:38
-msgid "view configuration information"
-msgstr ""
-
-#: personal/nagios/nagios.tpl.c:41
-msgid "trigger system commands"
-msgstr ""
-
-#: personal/nagios/nagios.tpl.c:44
-msgid "view all services"
-msgstr ""
-
-#: personal/nagios/nagios.tpl.c:47
-msgid "view all hosts"
-msgstr ""
-
-#: personal/nagios/nagios.tpl.c:50
-msgid "trigger all service commands"
-msgstr ""
-
-#: personal/nagios/nagios.tpl.c:53
-msgid "trigger all host commands"
-msgstr ""
diff --git a/nagios/locale/ru@petr1708/fusiondirectory.po b/nagios/locale/ru@petr1708/fusiondirectory.po
index 39d6591df2f279cc8b6755c3077466cf3bc4e6bc..5be8ddea536d34831aad4b495c50a714c6f669ef 100644
--- a/nagios/locale/ru@petr1708/fusiondirectory.po
+++ b/nagios/locale/ru@petr1708/fusiondirectory.po
@@ -5,17 +5,17 @@
 # Translators:
 msgid ""
 msgstr ""
-"Project-Id-Version: FusionDirectory-108\n"
+"Project-Id-Version: FusionDirectory-109\n"
 "Report-Msgid-Bugs-To: documentation@lists.fusiondirectory.org\n"
-"POT-Creation-Date: 2015-03-19 21:45+0100\n"
-"PO-Revision-Date: 2015-02-25 15:50+0000\n"
+"POT-Creation-Date: 2014-12-15 17:47+0100\n"
+"PO-Revision-Date: 2014-12-15 17:00+0000\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>\n"
-"Language-Team: Russian Petrine orthography (http://www.transifex.com/projects/p/FusionDirectory-108/language/ru@petr1708/)\n"
+"Language-Team: Russian Petrine orthography (http://www.transifex.com/projects/p/FusionDirectory-109/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=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);\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/nagios/class_nagiosAccount.inc:45
 #: config/nagios/class_nagiosConfig.inc:42
@@ -26,11 +26,11 @@ msgstr ""
 msgid "Nagios account settings"
 msgstr ""
 
-#: personal/nagios/class_nagiosAccount.inc:65 personal/nagios/nagios.tpl.c:2
+#: personal/nagios/class_nagiosAccount.inc:65
 msgid "Nagios Account"
 msgstr ""
 
-#: personal/nagios/class_nagiosAccount.inc:68 personal/nagios/nagios.tpl.c:5
+#: personal/nagios/class_nagiosAccount.inc:68
 msgid "Alias"
 msgstr ""
 
@@ -38,7 +38,7 @@ msgstr ""
 msgid "Name of the nagios alias"
 msgstr ""
 
-#: personal/nagios/class_nagiosAccount.inc:72 personal/nagios/nagios.tpl.c:8
+#: personal/nagios/class_nagiosAccount.inc:72
 msgid "Mail address"
 msgstr ""
 
@@ -46,23 +46,23 @@ msgstr ""
 msgid "Email of the nagios alias"
 msgstr ""
 
-#: personal/nagios/class_nagiosAccount.inc:76 personal/nagios/nagios.tpl.c:11
+#: personal/nagios/class_nagiosAccount.inc:76
 msgid "Host notification period"
 msgstr ""
 
-#: personal/nagios/class_nagiosAccount.inc:81 personal/nagios/nagios.tpl.c:14
+#: personal/nagios/class_nagiosAccount.inc:81
 msgid "Service notification period"
 msgstr ""
 
-#: personal/nagios/class_nagiosAccount.inc:86 personal/nagios/nagios.tpl.c:17
+#: personal/nagios/class_nagiosAccount.inc:86
 msgid "Service notification options"
 msgstr ""
 
-#: personal/nagios/class_nagiosAccount.inc:91 personal/nagios/nagios.tpl.c:20
+#: personal/nagios/class_nagiosAccount.inc:91
 msgid "Host notification options"
 msgstr ""
 
-#: personal/nagios/class_nagiosAccount.inc:96 personal/nagios/nagios.tpl.c:23
+#: personal/nagios/class_nagiosAccount.inc:96
 msgid "Pager"
 msgstr ""
 
@@ -70,11 +70,11 @@ msgstr ""
 msgid " Pager"
 msgstr ""
 
-#: personal/nagios/class_nagiosAccount.inc:100 personal/nagios/nagios.tpl.c:26
+#: personal/nagios/class_nagiosAccount.inc:100
 msgid "Service notification commands"
 msgstr ""
 
-#: personal/nagios/class_nagiosAccount.inc:104 personal/nagios/nagios.tpl.c:29
+#: personal/nagios/class_nagiosAccount.inc:104
 msgid "Host notification commands"
 msgstr ""
 
@@ -93,35 +93,3 @@ msgstr ""
 #: config/nagios/class_nagiosConfig.inc:45
 msgid "Prefix used for lconf LDAP fields"
 msgstr ""
-
-#: personal/nagios/nagios.tpl.c:32
-msgid "Nagios authentification"
-msgstr ""
-
-#: personal/nagios/nagios.tpl.c:35
-msgid "view system informations"
-msgstr ""
-
-#: personal/nagios/nagios.tpl.c:38
-msgid "view configuration information"
-msgstr ""
-
-#: personal/nagios/nagios.tpl.c:41
-msgid "trigger system commands"
-msgstr ""
-
-#: personal/nagios/nagios.tpl.c:44
-msgid "view all services"
-msgstr ""
-
-#: personal/nagios/nagios.tpl.c:47
-msgid "view all hosts"
-msgstr ""
-
-#: personal/nagios/nagios.tpl.c:50
-msgid "trigger all service commands"
-msgstr ""
-
-#: personal/nagios/nagios.tpl.c:53
-msgid "trigger all host commands"
-msgstr ""
diff --git a/nagios/locale/sv/fusiondirectory.po b/nagios/locale/sv/fusiondirectory.po
index 0cca9d3438781eb95c0cc1c8fc0e91771b5490eb..2c7e1b73a4ebee279e1919ec8eeec6ef717d1c22 100644
--- a/nagios/locale/sv/fusiondirectory.po
+++ b/nagios/locale/sv/fusiondirectory.po
@@ -5,12 +5,12 @@
 # Translators:
 msgid ""
 msgstr ""
-"Project-Id-Version: FusionDirectory-108\n"
+"Project-Id-Version: FusionDirectory-109\n"
 "Report-Msgid-Bugs-To: documentation@lists.fusiondirectory.org\n"
-"POT-Creation-Date: 2015-03-19 21:45+0100\n"
-"PO-Revision-Date: 2015-02-25 15:50+0000\n"
+"POT-Creation-Date: 2014-12-15 17:47+0100\n"
+"PO-Revision-Date: 2014-12-15 17:00+0000\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>\n"
-"Language-Team: Swedish (http://www.transifex.com/projects/p/FusionDirectory-108/language/sv/)\n"
+"Language-Team: Swedish (http://www.transifex.com/projects/p/FusionDirectory-109/language/sv/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -26,11 +26,11 @@ msgstr ""
 msgid "Nagios account settings"
 msgstr ""
 
-#: personal/nagios/class_nagiosAccount.inc:65 personal/nagios/nagios.tpl.c:2
+#: personal/nagios/class_nagiosAccount.inc:65
 msgid "Nagios Account"
 msgstr ""
 
-#: personal/nagios/class_nagiosAccount.inc:68 personal/nagios/nagios.tpl.c:5
+#: personal/nagios/class_nagiosAccount.inc:68
 msgid "Alias"
 msgstr ""
 
@@ -38,7 +38,7 @@ msgstr ""
 msgid "Name of the nagios alias"
 msgstr ""
 
-#: personal/nagios/class_nagiosAccount.inc:72 personal/nagios/nagios.tpl.c:8
+#: personal/nagios/class_nagiosAccount.inc:72
 msgid "Mail address"
 msgstr "Epostadress"
 
@@ -46,23 +46,23 @@ msgstr "Epostadress"
 msgid "Email of the nagios alias"
 msgstr ""
 
-#: personal/nagios/class_nagiosAccount.inc:76 personal/nagios/nagios.tpl.c:11
+#: personal/nagios/class_nagiosAccount.inc:76
 msgid "Host notification period"
 msgstr ""
 
-#: personal/nagios/class_nagiosAccount.inc:81 personal/nagios/nagios.tpl.c:14
+#: personal/nagios/class_nagiosAccount.inc:81
 msgid "Service notification period"
 msgstr ""
 
-#: personal/nagios/class_nagiosAccount.inc:86 personal/nagios/nagios.tpl.c:17
+#: personal/nagios/class_nagiosAccount.inc:86
 msgid "Service notification options"
 msgstr ""
 
-#: personal/nagios/class_nagiosAccount.inc:91 personal/nagios/nagios.tpl.c:20
+#: personal/nagios/class_nagiosAccount.inc:91
 msgid "Host notification options"
 msgstr ""
 
-#: personal/nagios/class_nagiosAccount.inc:96 personal/nagios/nagios.tpl.c:23
+#: personal/nagios/class_nagiosAccount.inc:96
 msgid "Pager"
 msgstr "Pager"
 
@@ -70,11 +70,11 @@ msgstr "Pager"
 msgid " Pager"
 msgstr "Pager"
 
-#: personal/nagios/class_nagiosAccount.inc:100 personal/nagios/nagios.tpl.c:26
+#: personal/nagios/class_nagiosAccount.inc:100
 msgid "Service notification commands"
 msgstr ""
 
-#: personal/nagios/class_nagiosAccount.inc:104 personal/nagios/nagios.tpl.c:29
+#: personal/nagios/class_nagiosAccount.inc:104
 msgid "Host notification commands"
 msgstr ""
 
@@ -93,35 +93,3 @@ msgstr ""
 #: config/nagios/class_nagiosConfig.inc:45
 msgid "Prefix used for lconf LDAP fields"
 msgstr ""
-
-#: personal/nagios/nagios.tpl.c:32
-msgid "Nagios authentification"
-msgstr ""
-
-#: personal/nagios/nagios.tpl.c:35
-msgid "view system informations"
-msgstr ""
-
-#: personal/nagios/nagios.tpl.c:38
-msgid "view configuration information"
-msgstr ""
-
-#: personal/nagios/nagios.tpl.c:41
-msgid "trigger system commands"
-msgstr ""
-
-#: personal/nagios/nagios.tpl.c:44
-msgid "view all services"
-msgstr ""
-
-#: personal/nagios/nagios.tpl.c:47
-msgid "view all hosts"
-msgstr ""
-
-#: personal/nagios/nagios.tpl.c:50
-msgid "trigger all service commands"
-msgstr ""
-
-#: personal/nagios/nagios.tpl.c:53
-msgid "trigger all host commands"
-msgstr ""
diff --git a/nagios/locale/ug/fusiondirectory.po b/nagios/locale/ug/fusiondirectory.po
index 54e46e9c46b8d2b91603cbe2a07c90680196a7c7..2c13bd7d92f1afb94d5a549ebafe18a7094b4a9e 100644
--- a/nagios/locale/ug/fusiondirectory.po
+++ b/nagios/locale/ug/fusiondirectory.po
@@ -5,12 +5,12 @@
 # Translators:
 msgid ""
 msgstr ""
-"Project-Id-Version: FusionDirectory-108\n"
+"Project-Id-Version: FusionDirectory-109\n"
 "Report-Msgid-Bugs-To: documentation@lists.fusiondirectory.org\n"
-"POT-Creation-Date: 2015-03-19 21:45+0100\n"
-"PO-Revision-Date: 2015-02-25 15:50+0000\n"
+"POT-Creation-Date: 2014-12-15 17:47+0100\n"
+"PO-Revision-Date: 2014-12-15 17:00+0000\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>\n"
-"Language-Team: Uighur (http://www.transifex.com/projects/p/FusionDirectory-108/language/ug/)\n"
+"Language-Team: Uighur (http://www.transifex.com/projects/p/FusionDirectory-109/language/ug/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -26,11 +26,11 @@ msgstr ""
 msgid "Nagios account settings"
 msgstr ""
 
-#: personal/nagios/class_nagiosAccount.inc:65 personal/nagios/nagios.tpl.c:2
+#: personal/nagios/class_nagiosAccount.inc:65
 msgid "Nagios Account"
 msgstr ""
 
-#: personal/nagios/class_nagiosAccount.inc:68 personal/nagios/nagios.tpl.c:5
+#: personal/nagios/class_nagiosAccount.inc:68
 msgid "Alias"
 msgstr ""
 
@@ -38,7 +38,7 @@ msgstr ""
 msgid "Name of the nagios alias"
 msgstr ""
 
-#: personal/nagios/class_nagiosAccount.inc:72 personal/nagios/nagios.tpl.c:8
+#: personal/nagios/class_nagiosAccount.inc:72
 msgid "Mail address"
 msgstr ""
 
@@ -46,23 +46,23 @@ msgstr ""
 msgid "Email of the nagios alias"
 msgstr ""
 
-#: personal/nagios/class_nagiosAccount.inc:76 personal/nagios/nagios.tpl.c:11
+#: personal/nagios/class_nagiosAccount.inc:76
 msgid "Host notification period"
 msgstr ""
 
-#: personal/nagios/class_nagiosAccount.inc:81 personal/nagios/nagios.tpl.c:14
+#: personal/nagios/class_nagiosAccount.inc:81
 msgid "Service notification period"
 msgstr ""
 
-#: personal/nagios/class_nagiosAccount.inc:86 personal/nagios/nagios.tpl.c:17
+#: personal/nagios/class_nagiosAccount.inc:86
 msgid "Service notification options"
 msgstr ""
 
-#: personal/nagios/class_nagiosAccount.inc:91 personal/nagios/nagios.tpl.c:20
+#: personal/nagios/class_nagiosAccount.inc:91
 msgid "Host notification options"
 msgstr ""
 
-#: personal/nagios/class_nagiosAccount.inc:96 personal/nagios/nagios.tpl.c:23
+#: personal/nagios/class_nagiosAccount.inc:96
 msgid "Pager"
 msgstr ""
 
@@ -70,11 +70,11 @@ msgstr ""
 msgid " Pager"
 msgstr ""
 
-#: personal/nagios/class_nagiosAccount.inc:100 personal/nagios/nagios.tpl.c:26
+#: personal/nagios/class_nagiosAccount.inc:100
 msgid "Service notification commands"
 msgstr ""
 
-#: personal/nagios/class_nagiosAccount.inc:104 personal/nagios/nagios.tpl.c:29
+#: personal/nagios/class_nagiosAccount.inc:104
 msgid "Host notification commands"
 msgstr ""
 
@@ -93,35 +93,3 @@ msgstr ""
 #: config/nagios/class_nagiosConfig.inc:45
 msgid "Prefix used for lconf LDAP fields"
 msgstr ""
-
-#: personal/nagios/nagios.tpl.c:32
-msgid "Nagios authentification"
-msgstr ""
-
-#: personal/nagios/nagios.tpl.c:35
-msgid "view system informations"
-msgstr ""
-
-#: personal/nagios/nagios.tpl.c:38
-msgid "view configuration information"
-msgstr ""
-
-#: personal/nagios/nagios.tpl.c:41
-msgid "trigger system commands"
-msgstr ""
-
-#: personal/nagios/nagios.tpl.c:44
-msgid "view all services"
-msgstr ""
-
-#: personal/nagios/nagios.tpl.c:47
-msgid "view all hosts"
-msgstr ""
-
-#: personal/nagios/nagios.tpl.c:50
-msgid "trigger all service commands"
-msgstr ""
-
-#: personal/nagios/nagios.tpl.c:53
-msgid "trigger all host commands"
-msgstr ""
diff --git a/nagios/locale/vi_VN/fusiondirectory.po b/nagios/locale/vi_VN/fusiondirectory.po
index 16ff10d9a78c792f7c706d18c1d5f1325ce7ace3..3a3cc40bcf37038a71eb4512057f77401e9e331e 100644
--- a/nagios/locale/vi_VN/fusiondirectory.po
+++ b/nagios/locale/vi_VN/fusiondirectory.po
@@ -5,12 +5,12 @@
 # Translators:
 msgid ""
 msgstr ""
-"Project-Id-Version: FusionDirectory-108\n"
+"Project-Id-Version: FusionDirectory-109\n"
 "Report-Msgid-Bugs-To: documentation@lists.fusiondirectory.org\n"
-"POT-Creation-Date: 2015-03-19 21:45+0100\n"
-"PO-Revision-Date: 2015-02-25 15:50+0000\n"
+"POT-Creation-Date: 2014-12-15 17:47+0100\n"
+"PO-Revision-Date: 2014-12-15 17:00+0000\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>\n"
-"Language-Team: Vietnamese (Viet Nam) (http://www.transifex.com/projects/p/FusionDirectory-108/language/vi_VN/)\n"
+"Language-Team: Vietnamese (Viet Nam) (http://www.transifex.com/projects/p/FusionDirectory-109/language/vi_VN/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -26,11 +26,11 @@ msgstr ""
 msgid "Nagios account settings"
 msgstr ""
 
-#: personal/nagios/class_nagiosAccount.inc:65 personal/nagios/nagios.tpl.c:2
+#: personal/nagios/class_nagiosAccount.inc:65
 msgid "Nagios Account"
 msgstr ""
 
-#: personal/nagios/class_nagiosAccount.inc:68 personal/nagios/nagios.tpl.c:5
+#: personal/nagios/class_nagiosAccount.inc:68
 msgid "Alias"
 msgstr ""
 
@@ -38,7 +38,7 @@ msgstr ""
 msgid "Name of the nagios alias"
 msgstr ""
 
-#: personal/nagios/class_nagiosAccount.inc:72 personal/nagios/nagios.tpl.c:8
+#: personal/nagios/class_nagiosAccount.inc:72
 msgid "Mail address"
 msgstr "Äá»‹a chá»‰ thÆ°"
 
@@ -46,23 +46,23 @@ msgstr "Äá»‹a chá»‰ thÆ°"
 msgid "Email of the nagios alias"
 msgstr ""
 
-#: personal/nagios/class_nagiosAccount.inc:76 personal/nagios/nagios.tpl.c:11
+#: personal/nagios/class_nagiosAccount.inc:76
 msgid "Host notification period"
 msgstr ""
 
-#: personal/nagios/class_nagiosAccount.inc:81 personal/nagios/nagios.tpl.c:14
+#: personal/nagios/class_nagiosAccount.inc:81
 msgid "Service notification period"
 msgstr ""
 
-#: personal/nagios/class_nagiosAccount.inc:86 personal/nagios/nagios.tpl.c:17
+#: personal/nagios/class_nagiosAccount.inc:86
 msgid "Service notification options"
 msgstr ""
 
-#: personal/nagios/class_nagiosAccount.inc:91 personal/nagios/nagios.tpl.c:20
+#: personal/nagios/class_nagiosAccount.inc:91
 msgid "Host notification options"
 msgstr ""
 
-#: personal/nagios/class_nagiosAccount.inc:96 personal/nagios/nagios.tpl.c:23
+#: personal/nagios/class_nagiosAccount.inc:96
 msgid "Pager"
 msgstr "MÃ¡y nháº¯n tin"
 
@@ -70,11 +70,11 @@ msgstr "MÃ¡y nháº¯n tin"
 msgid " Pager"
 msgstr "MÃ¡y nháº¯n tin"
 
-#: personal/nagios/class_nagiosAccount.inc:100 personal/nagios/nagios.tpl.c:26
+#: personal/nagios/class_nagiosAccount.inc:100
 msgid "Service notification commands"
 msgstr ""
 
-#: personal/nagios/class_nagiosAccount.inc:104 personal/nagios/nagios.tpl.c:29
+#: personal/nagios/class_nagiosAccount.inc:104
 msgid "Host notification commands"
 msgstr ""
 
@@ -93,35 +93,3 @@ msgstr ""
 #: config/nagios/class_nagiosConfig.inc:45
 msgid "Prefix used for lconf LDAP fields"
 msgstr ""
-
-#: personal/nagios/nagios.tpl.c:32
-msgid "Nagios authentification"
-msgstr ""
-
-#: personal/nagios/nagios.tpl.c:35
-msgid "view system informations"
-msgstr ""
-
-#: personal/nagios/nagios.tpl.c:38
-msgid "view configuration information"
-msgstr ""
-
-#: personal/nagios/nagios.tpl.c:41
-msgid "trigger system commands"
-msgstr ""
-
-#: personal/nagios/nagios.tpl.c:44
-msgid "view all services"
-msgstr ""
-
-#: personal/nagios/nagios.tpl.c:47
-msgid "view all hosts"
-msgstr ""
-
-#: personal/nagios/nagios.tpl.c:50
-msgid "trigger all service commands"
-msgstr ""
-
-#: personal/nagios/nagios.tpl.c:53
-msgid "trigger all host commands"
-msgstr ""
diff --git a/nagios/locale/zh/fusiondirectory.po b/nagios/locale/zh/fusiondirectory.po
index 6662c96aae8285980296884c5103d359994e3872..84bc4c343d286e7e9f88d8522623984459e26087 100644
--- a/nagios/locale/zh/fusiondirectory.po
+++ b/nagios/locale/zh/fusiondirectory.po
@@ -3,15 +3,14 @@
 # This file is distributed under the same license as the PACKAGE package.
 # 
 # Translators:
-#  Jiang Xin <worldhello.net@gmail.com>, 2007
 msgid ""
 msgstr ""
-"Project-Id-Version: FusionDirectory-108\n"
+"Project-Id-Version: FusionDirectory-109\n"
 "Report-Msgid-Bugs-To: documentation@lists.fusiondirectory.org\n"
-"POT-Creation-Date: 2015-03-19 21:45+0100\n"
-"PO-Revision-Date: 2015-02-25 16:12+0000\n"
+"POT-Creation-Date: 2014-12-15 17:47+0100\n"
+"PO-Revision-Date: 2014-12-15 17:01+0000\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>\n"
-"Language-Team: Chinese (http://www.transifex.com/projects/p/FusionDirectory-108/language/zh/)\n"
+"Language-Team: Chinese (http://www.transifex.com/projects/p/FusionDirectory-109/language/zh/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -27,11 +26,11 @@ msgstr "Nagios"
 msgid "Nagios account settings"
 msgstr ""
 
-#: personal/nagios/class_nagiosAccount.inc:65 personal/nagios/nagios.tpl.c:2
+#: personal/nagios/class_nagiosAccount.inc:65
 msgid "Nagios Account"
 msgstr "Nagios è´¦å·"
 
-#: personal/nagios/class_nagiosAccount.inc:68 personal/nagios/nagios.tpl.c:5
+#: personal/nagios/class_nagiosAccount.inc:68
 msgid "Alias"
 msgstr "åˆ«å"
 
@@ -39,7 +38,7 @@ msgstr "åˆ«å"
 msgid "Name of the nagios alias"
 msgstr ""
 
-#: personal/nagios/class_nagiosAccount.inc:72 personal/nagios/nagios.tpl.c:8
+#: personal/nagios/class_nagiosAccount.inc:72
 msgid "Mail address"
 msgstr "é‚®ä»¶åœ°å€"
 
@@ -47,23 +46,23 @@ msgstr "é‚®ä»¶åœ°å€"
 msgid "Email of the nagios alias"
 msgstr ""
 
-#: personal/nagios/class_nagiosAccount.inc:76 personal/nagios/nagios.tpl.c:11
+#: personal/nagios/class_nagiosAccount.inc:76
 msgid "Host notification period"
 msgstr "ä¸»æœºé€šçŸ¥å‘¨æœŸ"
 
-#: personal/nagios/class_nagiosAccount.inc:81 personal/nagios/nagios.tpl.c:14
+#: personal/nagios/class_nagiosAccount.inc:81
 msgid "Service notification period"
 msgstr "æœåŠ¡é€šçŸ¥å‘¨æœŸ"
 
-#: personal/nagios/class_nagiosAccount.inc:86 personal/nagios/nagios.tpl.c:17
+#: personal/nagios/class_nagiosAccount.inc:86
 msgid "Service notification options"
 msgstr "æœåŠ¡é€šçŸ¥é€‰é¡¹"
 
-#: personal/nagios/class_nagiosAccount.inc:91 personal/nagios/nagios.tpl.c:20
+#: personal/nagios/class_nagiosAccount.inc:91
 msgid "Host notification options"
 msgstr "ä¸»æœºé€šçŸ¥é€‰é¡¹"
 
-#: personal/nagios/class_nagiosAccount.inc:96 personal/nagios/nagios.tpl.c:23
+#: personal/nagios/class_nagiosAccount.inc:96
 msgid "Pager"
 msgstr "å‘¼æœº"
 
@@ -71,11 +70,11 @@ msgstr "å‘¼æœº"
 msgid " Pager"
 msgstr "å‘¼æœº"
 
-#: personal/nagios/class_nagiosAccount.inc:100 personal/nagios/nagios.tpl.c:26
+#: personal/nagios/class_nagiosAccount.inc:100
 msgid "Service notification commands"
 msgstr "æœåŠ¡é€šçŸ¥å‘½ä»¤"
 
-#: personal/nagios/class_nagiosAccount.inc:104 personal/nagios/nagios.tpl.c:29
+#: personal/nagios/class_nagiosAccount.inc:104
 msgid "Host notification commands"
 msgstr "ä¸»æœºé€šçŸ¥å‘½ä»¤"
 
@@ -94,35 +93,3 @@ msgstr ""
 #: config/nagios/class_nagiosConfig.inc:45
 msgid "Prefix used for lconf LDAP fields"
 msgstr ""
-
-#: personal/nagios/nagios.tpl.c:32
-msgid "Nagios authentification"
-msgstr "Nagios é‰´æƒ"
-
-#: personal/nagios/nagios.tpl.c:35
-msgid "view system informations"
-msgstr "æŸ¥çœ‹ç³»ç»Ÿä¿¡æ¯"
-
-#: personal/nagios/nagios.tpl.c:38
-msgid "view configuration information"
-msgstr "æŸ¥çœ‹é…ç½®ä¿¡æ¯"
-
-#: personal/nagios/nagios.tpl.c:41
-msgid "trigger system commands"
-msgstr "è§¦å‘ç³»ç»Ÿå‘½ä»¤"
-
-#: personal/nagios/nagios.tpl.c:44
-msgid "view all services"
-msgstr "æŸ¥çœ‹æ‰€æœ‰æœåŠ¡"
-
-#: personal/nagios/nagios.tpl.c:47
-msgid "view all hosts"
-msgstr "æŸ¥çœ‹æ‰€æœ‰ä¸»æœº"
-
-#: personal/nagios/nagios.tpl.c:50
-msgid "trigger all service commands"
-msgstr "è§¦å‘æ‰€æœ‰æœåŠ¡å‘½ä»¤"
-
-#: personal/nagios/nagios.tpl.c:53
-msgid "trigger all host commands"
-msgstr "è§¦å‘æ‰€æœ‰ä¸»æœºå‘½ä»¤"
diff --git a/netgroups/locale/ar/fusiondirectory.po b/netgroups/locale/ar/fusiondirectory.po
index e6f7361daac0ee2e9b14c11b65b6b8207cf0ea85..d08f7802a1da8c893a90db481fec6ce6b32ffa27 100644
--- a/netgroups/locale/ar/fusiondirectory.po
+++ b/netgroups/locale/ar/fusiondirectory.po
@@ -5,12 +5,12 @@
 # Translators:
 msgid ""
 msgstr ""
-"Project-Id-Version: FusionDirectory-108\n"
+"Project-Id-Version: FusionDirectory-109\n"
 "Report-Msgid-Bugs-To: documentation@lists.fusiondirectory.org\n"
-"POT-Creation-Date: 2015-03-19 21:45+0100\n"
-"PO-Revision-Date: 2015-02-25 16:02+0000\n"
+"POT-Creation-Date: 2014-12-15 17:47+0100\n"
+"PO-Revision-Date: 2015-02-25 16:04+0000\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>\n"
-"Language-Team: Arabic (http://www.transifex.com/projects/p/FusionDirectory-108/language/ar/)\n"
+"Language-Team: Arabic (http://www.transifex.com/projects/p/FusionDirectory-109/language/ar/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
diff --git a/netgroups/locale/ca/fusiondirectory.po b/netgroups/locale/ca/fusiondirectory.po
index 9f44224573be21b4b2761f5e18b9a8303b08bdf8..817853e285596f555019fb20d20f9111fa89e2c8 100644
--- a/netgroups/locale/ca/fusiondirectory.po
+++ b/netgroups/locale/ca/fusiondirectory.po
@@ -5,12 +5,12 @@
 # Translators:
 msgid ""
 msgstr ""
-"Project-Id-Version: FusionDirectory-108\n"
+"Project-Id-Version: FusionDirectory-109\n"
 "Report-Msgid-Bugs-To: documentation@lists.fusiondirectory.org\n"
-"POT-Creation-Date: 2015-03-19 21:45+0100\n"
-"PO-Revision-Date: 2015-02-25 16:02+0000\n"
+"POT-Creation-Date: 2014-12-15 17:47+0100\n"
+"PO-Revision-Date: 2015-02-25 16:04+0000\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>\n"
-"Language-Team: Catalan (http://www.transifex.com/projects/p/FusionDirectory-108/language/ca/)\n"
+"Language-Team: Catalan (http://www.transifex.com/projects/p/FusionDirectory-109/language/ca/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
diff --git a/netgroups/locale/cs_CZ/fusiondirectory.po b/netgroups/locale/cs_CZ/fusiondirectory.po
index 2e978b20575ed47cbfb6e28f6fe47a37550894bb..4b873c48495b21ed6fcf7fd708b152e2f5475adc 100644
--- a/netgroups/locale/cs_CZ/fusiondirectory.po
+++ b/netgroups/locale/cs_CZ/fusiondirectory.po
@@ -3,17 +3,15 @@
 # This file is distributed under the same license as the PACKAGE package.
 # 
 # Translators:
-# Pavel Borecki <pavel.borecki@gmail.com>, 2012
-# Pavel Borecki <pavel.borecki@gmail.com>, 2012
-# Pavel Borecki <pavel.borecki@gmail.com>, 2012
+# Pavel Borecki <pavel.borecki@gmail.com>, 2014-2015
 msgid ""
 msgstr ""
-"Project-Id-Version: FusionDirectory-108\n"
+"Project-Id-Version: FusionDirectory-109\n"
 "Report-Msgid-Bugs-To: documentation@lists.fusiondirectory.org\n"
-"POT-Creation-Date: 2015-03-19 21:45+0100\n"
-"PO-Revision-Date: 2015-02-25 16:02+0000\n"
-"Last-Translator: fusiondirectory <contact@fusiondirectory.org>\n"
-"Language-Team: Czech (Czech Republic) (http://www.transifex.com/projects/p/FusionDirectory-108/language/cs_CZ/)\n"
+"POT-Creation-Date: 2014-12-15 17:47+0100\n"
+"PO-Revision-Date: 2015-04-04 07:11+0000\n"
+"Last-Translator: Pavel Borecki <pavel.borecki@gmail.com>\n"
+"Language-Team: Czech (Czech Republic) (http://www.transifex.com/projects/p/FusionDirectory-109/language/cs_CZ/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -23,11 +21,11 @@ msgstr ""
 #: admin/netgroups/class_netgroup.inc:50
 #: config/netgroups/class_netgroupConfig.inc:42
 msgid "Netgroup"
-msgstr ""
+msgstr "SÃÅ¥ovÃ¡ skupina"
 
 #: admin/netgroups/class_netgroup.inc:51
 msgid "NIS Netgroup settings"
-msgstr ""
+msgstr "NastavenÃ sÃÅ¥ovÃ© skupiny v NIS"
 
 #: admin/netgroups/class_netgroup.inc:54
 #: admin/systems/netgroups/class_netgroupSystem.inc:26
@@ -41,36 +39,36 @@ msgstr "Informace"
 
 #: admin/netgroups/class_netgroup.inc:72
 msgid "Name"
-msgstr "jmÃ©no"
+msgstr "NÃ¡zev"
 
 #: admin/netgroups/class_netgroup.inc:72
 msgid "Name of this NIS netgroup"
-msgstr ""
+msgstr "NÃ¡zev tÃ©to NIS sÃÅ¥ovÃ© skupiny"
 
 #: admin/netgroups/class_netgroup.inc:75
 msgid "Description"
-msgstr "popis"
+msgstr "Popis"
 
 #: admin/netgroups/class_netgroup.inc:75
 msgid "Description of this NIS netgroup"
-msgstr ""
+msgstr "Popis tÃ©to NIS sÃtovÃ© skupiny"
 
 #: admin/netgroups/class_netgroup.inc:81
 msgid "User members"
-msgstr ""
+msgstr "ÄŒlenovÃ© (uÅ¾ivatelÃ©)"
 
 #: admin/netgroups/class_netgroup.inc:88 admin/netgroups/class_netgroup.inc:97
 #: admin/netgroups/class_netgroup.inc:104
 msgid "NIS netgroup members"
-msgstr ""
+msgstr "ÄŒlenovÃ© NIS sÃÅ¥ovÃ© skupiny"
 
 #: admin/netgroups/class_netgroup.inc:94
 msgid "System members"
-msgstr ""
+msgstr "ÄŒlenovÃ© systÃ©mu"
 
 #: admin/netgroups/class_netgroup.inc:101
 msgid "Netgroup members"
-msgstr ""
+msgstr "ÄŒlenovÃ© sÃÅ¥ovÃ© skupiny"
 
 #: admin/netgroups/class_netgroupManagement.inc:34
 msgid "NIS Netgroups"
@@ -78,33 +76,33 @@ msgstr "skupiny NIS"
 
 #: admin/netgroups/class_netgroupManagement.inc:35
 msgid "NIS Netgroup management"
-msgstr ""
+msgstr "SprÃ¡va sÃÅ¥ovÃ© NIS sÃÅ¥ovÃ© skupiny"
 
 #: admin/systems/netgroups/class_netgroupSystem.inc:27
 #: personal/netgroups/class_netgroupMembership.inc:44
 msgid "NIS Netgroup member"
-msgstr "Älen skupiny NIS"
+msgstr "ÄŒlen sÃÅ¥ovÃ© skupiny NIS"
 
 #: personal/netgroups/class_netgroupMembership.inc:60
 msgid "Member of the following NIS Netgroups  "
-msgstr ""
+msgstr "ÄŒlen nÃ¡sledujÃcÃch NIS sÃtovÃ½ch skupin"
 
 #: personal/netgroups/class_netgroupMembership.inc:63
 msgid "NIS netgroup membership"
-msgstr ""
+msgstr "ÄŒlenstvÃ v sÃÅ¥ovÃ© skupiny NIS"
 
 #: config/netgroups/class_netgroupConfig.inc:28
 msgid "Netgroup configuration"
-msgstr ""
+msgstr "NastavenÃ sÃÅ¥ovÃ© skupiny"
 
 #: config/netgroups/class_netgroupConfig.inc:29
 msgid "FusionDirectory netgroup plugin configuration"
-msgstr ""
+msgstr "NastavenÃ zÃ¡suvnÃ©ho modulu netgroup pro FusionDirectory"
 
 #: config/netgroups/class_netgroupConfig.inc:45
 msgid "Netgroup RDN"
-msgstr ""
+msgstr "RelativnÃ rozliÅ¡enÃ½ nÃ¡zev sÃÅ¥ovÃ© skupiny"
 
 #: config/netgroups/class_netgroupConfig.inc:45
 msgid "Branch in which netgroups will be stored"
-msgstr ""
+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 327bebd2849ce2895e52aa0e69188587785ae171..55498bef7a5d3505739f61e06ffc5c1f0ea16811 100644
--- a/netgroups/locale/de/fusiondirectory.po
+++ b/netgroups/locale/de/fusiondirectory.po
@@ -3,16 +3,15 @@
 # This file is distributed under the same license as the PACKAGE package.
 # 
 # Translators:
-# Maik Wagner <maikwagner@yahoo.com>, 2013
-# Marcel Sandow <MarcelSandow@gmx.de>, 2011
+# Ettore Atalan <atalanttore@googlemail.com>, 2014
 msgid ""
 msgstr ""
-"Project-Id-Version: FusionDirectory-108\n"
+"Project-Id-Version: FusionDirectory-109\n"
 "Report-Msgid-Bugs-To: documentation@lists.fusiondirectory.org\n"
-"POT-Creation-Date: 2015-03-19 21:45+0100\n"
-"PO-Revision-Date: 2015-02-25 16:02+0000\n"
-"Last-Translator: fusiondirectory <contact@fusiondirectory.org>\n"
-"Language-Team: German (http://www.transifex.com/projects/p/FusionDirectory-108/language/de/)\n"
+"POT-Creation-Date: 2014-12-15 17:47+0100\n"
+"PO-Revision-Date: 2015-02-25 16:04+0000\n"
+"Last-Translator: Ettore Atalan <atalanttore@googlemail.com>\n"
+"Language-Team: German (http://www.transifex.com/projects/p/FusionDirectory-109/language/de/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -32,7 +31,7 @@ msgstr "NIS-Netzgruppeneinstellungen"
 #: admin/systems/netgroups/class_netgroupSystem.inc:26
 #: personal/netgroups/class_netgroupMembership.inc:43
 msgid "NIS Netgroup"
-msgstr "NIS Netgroup"
+msgstr "NIS-Netzgruppe"
 
 #: admin/netgroups/class_netgroup.inc:69
 msgid "Informations"
@@ -44,7 +43,7 @@ msgstr "Name"
 
 #: admin/netgroups/class_netgroup.inc:72
 msgid "Name of this NIS netgroup"
-msgstr "Name dieser NIS netgroup"
+msgstr "Name von dieser NIS-Netzgruppe"
 
 #: admin/netgroups/class_netgroup.inc:75
 msgid "Description"
@@ -52,7 +51,7 @@ msgstr "Beschreibung"
 
 #: admin/netgroups/class_netgroup.inc:75
 msgid "Description of this NIS netgroup"
-msgstr "Beschreibung dieser NIS netgroup"
+msgstr "Beschreibung von dieser NIS-Netzgruppe"
 
 #: admin/netgroups/class_netgroup.inc:81
 msgid "User members"
@@ -61,49 +60,49 @@ msgstr "Benutzermitglieder"
 #: admin/netgroups/class_netgroup.inc:88 admin/netgroups/class_netgroup.inc:97
 #: admin/netgroups/class_netgroup.inc:104
 msgid "NIS netgroup members"
-msgstr "NIS netgroup Mitglieder"
+msgstr "NIS-Netzgruppenmitglieder"
 
 #: admin/netgroups/class_netgroup.inc:94
 msgid "System members"
-msgstr "System-Mitglieder"
+msgstr "Systemmitglieder"
 
 #: admin/netgroups/class_netgroup.inc:101
 msgid "Netgroup members"
-msgstr "Netgroup-Mitglieder"
+msgstr "Netzgruppenmitglieder"
 
 #: admin/netgroups/class_netgroupManagement.inc:34
 msgid "NIS Netgroups"
-msgstr "NIS Netgroups"
+msgstr "NIS-Netzgruppen"
 
 #: admin/netgroups/class_netgroupManagement.inc:35
 msgid "NIS Netgroup management"
-msgstr "NIS Netzgruppenverwaltung"
+msgstr "NIS-Netzgruppenverwaltung"
 
 #: admin/systems/netgroups/class_netgroupSystem.inc:27
 #: personal/netgroups/class_netgroupMembership.inc:44
 msgid "NIS Netgroup member"
-msgstr "NIS Netgroup Mitglied"
+msgstr "NIS-Netzgruppenmitglied"
 
 #: personal/netgroups/class_netgroupMembership.inc:60
 msgid "Member of the following NIS Netgroups  "
-msgstr "Mitglied der folgenden NIS Netzgruppen"
+msgstr "Mitglied der folgenden NIS-Netzgruppen"
 
 #: personal/netgroups/class_netgroupMembership.inc:63
 msgid "NIS netgroup membership"
-msgstr "NIS netgroup Mitgliedschaft"
+msgstr "NIS-Netzgruppenmitgliedschaft"
 
 #: config/netgroups/class_netgroupConfig.inc:28
 msgid "Netgroup configuration"
-msgstr "Netzgruppen Konfiguration"
+msgstr "Netzgruppenkonfiguration"
 
 #: config/netgroups/class_netgroupConfig.inc:29
 msgid "FusionDirectory netgroup plugin configuration"
-msgstr "FusionDirectory negroup Plugin Konfiguration"
+msgstr "FusionDirectory Netzgruppen-Plugin-Konfiguration"
 
 #: config/netgroups/class_netgroupConfig.inc:45
 msgid "Netgroup RDN"
-msgstr "Netgroup RDN"
+msgstr "Netzgruppe RDN"
 
 #: config/netgroups/class_netgroupConfig.inc:45
 msgid "Branch in which netgroups will be stored"
-msgstr "Zweig in dem netgroups gespeichert werden"
+msgstr "Zweig, in dem Netzgruppen gespeichert werden"
diff --git a/netgroups/locale/el_GR/fusiondirectory.po b/netgroups/locale/el_GR/fusiondirectory.po
new file mode 100644
index 0000000000000000000000000000000000000000..c2508ec5be754085d2f0db7e13f4e1cf6db962b8
--- /dev/null
+++ b/netgroups/locale/el_GR/fusiondirectory.po
@@ -0,0 +1,107 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR FusionDirectory Project
+# This file is distributed under the same license as the PACKAGE package.
+# 
+# Translators:
+msgid ""
+msgstr ""
+"Project-Id-Version: FusionDirectory-109\n"
+"Report-Msgid-Bugs-To: documentation@lists.fusiondirectory.org\n"
+"POT-Creation-Date: 2014-12-15 17:47+0100\n"
+"PO-Revision-Date: 2015-05-30 11:45+0000\n"
+"Last-Translator: Benoit Mortier <benoit.mortier@opensides.be>\n"
+"Language-Team: Greek (Greece) (http://www.transifex.com/projects/p/FusionDirectory-109/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/netgroups/class_netgroup.inc:50
+#: config/netgroups/class_netgroupConfig.inc:42
+msgid "Netgroup"
+msgstr ""
+
+#: admin/netgroups/class_netgroup.inc:51
+msgid "NIS Netgroup settings"
+msgstr ""
+
+#: admin/netgroups/class_netgroup.inc:54
+#: admin/systems/netgroups/class_netgroupSystem.inc:26
+#: personal/netgroups/class_netgroupMembership.inc:43
+msgid "NIS Netgroup"
+msgstr ""
+
+#: admin/netgroups/class_netgroup.inc:69
+msgid "Informations"
+msgstr ""
+
+#: admin/netgroups/class_netgroup.inc:72
+msgid "Name"
+msgstr ""
+
+#: admin/netgroups/class_netgroup.inc:72
+msgid "Name of this NIS netgroup"
+msgstr ""
+
+#: admin/netgroups/class_netgroup.inc:75
+msgid "Description"
+msgstr ""
+
+#: admin/netgroups/class_netgroup.inc:75
+msgid "Description of this NIS netgroup"
+msgstr ""
+
+#: admin/netgroups/class_netgroup.inc:81
+msgid "User members"
+msgstr ""
+
+#: admin/netgroups/class_netgroup.inc:88 admin/netgroups/class_netgroup.inc:97
+#: admin/netgroups/class_netgroup.inc:104
+msgid "NIS netgroup members"
+msgstr ""
+
+#: admin/netgroups/class_netgroup.inc:94
+msgid "System members"
+msgstr ""
+
+#: admin/netgroups/class_netgroup.inc:101
+msgid "Netgroup members"
+msgstr ""
+
+#: admin/netgroups/class_netgroupManagement.inc:34
+msgid "NIS Netgroups"
+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/en/fusiondirectory.po b/netgroups/locale/en/fusiondirectory.po
index fc34cfb407b99843cfac2c3ccb221762dae52c44..702da78666b9e9ce3705ed50691e9dca87ba1599 100644
--- a/netgroups/locale/en/fusiondirectory.po
+++ b/netgroups/locale/en/fusiondirectory.po
@@ -6,13 +6,13 @@
 #, fuzzy
 msgid ""
 msgstr ""
-"Project-Id-Version: PACKAGE VERSION\n"
-"Report-Msgid-Bugs-To: documentation@lists.fusiondirectory.org\n"
-"POT-Creation-Date: 2015-03-31 11:49+0200\n"
+"Project-Id-Version: FusionDirectory VERSION\n"
+"Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
+"POT-Creation-Date: 2015-05-30 15:30+0200\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
-"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
-"Language-Team: LANGUAGE <LL@li.org>\n"
-"Language: \n"
+"Last-Translator: FusionDirectory project <contact@fusiondirectory.org>\n"
+"Language-Team: English\n"
+"Language: en\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
diff --git a/netgroups/locale/es/fusiondirectory.po b/netgroups/locale/es/fusiondirectory.po
index 80568e41853fddf95f4db6f5d4c2f701fd12de0e..09c12dc81a21526e7eff66cb946e67c354050b30 100644
--- a/netgroups/locale/es/fusiondirectory.po
+++ b/netgroups/locale/es/fusiondirectory.po
@@ -3,15 +3,14 @@
 # This file is distributed under the same license as the PACKAGE package.
 # 
 # Translators:
-# thoth, 2011
 msgid ""
 msgstr ""
-"Project-Id-Version: FusionDirectory-108\n"
+"Project-Id-Version: FusionDirectory-109\n"
 "Report-Msgid-Bugs-To: documentation@lists.fusiondirectory.org\n"
-"POT-Creation-Date: 2015-03-19 21:45+0100\n"
-"PO-Revision-Date: 2015-02-25 16:02+0000\n"
+"POT-Creation-Date: 2014-12-15 17:47+0100\n"
+"PO-Revision-Date: 2015-02-25 16:04+0000\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>\n"
-"Language-Team: Spanish (http://www.transifex.com/projects/p/FusionDirectory-108/language/es/)\n"
+"Language-Team: Spanish (http://www.transifex.com/projects/p/FusionDirectory-109/language/es/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
diff --git a/netgroups/locale/es_VE/fusiondirectory.po b/netgroups/locale/es_VE/fusiondirectory.po
index ef007234535dd56e4ee0c0e1ddb9ababaaef2332..be4c1084ca76644d7f13fac5c3f1b20bf4d075dc 100644
--- a/netgroups/locale/es_VE/fusiondirectory.po
+++ b/netgroups/locale/es_VE/fusiondirectory.po
@@ -3,15 +3,14 @@
 # This file is distributed under the same license as the PACKAGE package.
 # 
 # Translators:
-# thoth, 2011
 msgid ""
 msgstr ""
-"Project-Id-Version: FusionDirectory-108\n"
+"Project-Id-Version: FusionDirectory-109\n"
 "Report-Msgid-Bugs-To: documentation@lists.fusiondirectory.org\n"
-"POT-Creation-Date: 2015-03-19 21:45+0100\n"
-"PO-Revision-Date: 2015-02-25 16:02+0000\n"
+"POT-Creation-Date: 2014-12-15 17:47+0100\n"
+"PO-Revision-Date: 2015-02-25 16:04+0000\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>\n"
-"Language-Team: Spanish (Venezuela) (http://www.transifex.com/projects/p/FusionDirectory-108/language/es_VE/)\n"
+"Language-Team: Spanish (Venezuela) (http://www.transifex.com/projects/p/FusionDirectory-109/language/es_VE/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
diff --git a/netgroups/locale/fa_IR/fusiondirectory.po b/netgroups/locale/fa_IR/fusiondirectory.po
index f85f85f632d7066f0d362e312bceb2854856507e..0fe1fc6cabcf1bd444447c1d2734945d613a79fa 100644
--- a/netgroups/locale/fa_IR/fusiondirectory.po
+++ b/netgroups/locale/fa_IR/fusiondirectory.po
@@ -5,12 +5,12 @@
 # Translators:
 msgid ""
 msgstr ""
-"Project-Id-Version: FusionDirectory-108\n"
+"Project-Id-Version: FusionDirectory-109\n"
 "Report-Msgid-Bugs-To: documentation@lists.fusiondirectory.org\n"
-"POT-Creation-Date: 2015-03-19 21:45+0100\n"
-"PO-Revision-Date: 2014-12-12 07:43+0000\n"
+"POT-Creation-Date: 2014-12-15 17:47+0100\n"
+"PO-Revision-Date: 2014-12-15 17:01+0000\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>\n"
-"Language-Team: Persian (Iran) (http://www.transifex.com/projects/p/FusionDirectory-108/language/fa_IR/)\n"
+"Language-Team: Persian (Iran) (http://www.transifex.com/projects/p/FusionDirectory-109/language/fa_IR/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
diff --git a/netgroups/locale/fr/fusiondirectory.po b/netgroups/locale/fr/fusiondirectory.po
index f2154f96eac6de94e765769dda1f065528c3255b..3d2fa91f05940846fb194cea693f3c9a74611dd9 100644
--- a/netgroups/locale/fr/fusiondirectory.po
+++ b/netgroups/locale/fr/fusiondirectory.po
@@ -3,21 +3,14 @@
 # This file is distributed under the same license as the PACKAGE package.
 # 
 # Translators:
-# Benoit Mortier <benoit.mortier@opensides.be>, 2011
-# MCMic, 2014
-# fusiondirectory <contact@fusiondirectory.org>, 2013
-# fusiondirectory <contact@fusiondirectory.org>, 2012
-# fusiondirectory <contact@fusiondirectory.org>, 2012-2013
-# fusiondirectory <contact@fusiondirectory.org>, 2012
-# MCMic, 2014
 msgid ""
 msgstr ""
-"Project-Id-Version: FusionDirectory-108\n"
+"Project-Id-Version: FusionDirectory-109\n"
 "Report-Msgid-Bugs-To: documentation@lists.fusiondirectory.org\n"
-"POT-Creation-Date: 2015-03-19 21:45+0100\n"
-"PO-Revision-Date: 2015-02-25 16:02+0000\n"
-"Last-Translator: MCMic\n"
-"Language-Team: French (http://www.transifex.com/projects/p/FusionDirectory-108/language/fr/)\n"
+"POT-Creation-Date: 2014-12-15 17:47+0100\n"
+"PO-Revision-Date: 2015-02-25 16:04+0000\n"
+"Last-Translator: fusiondirectory <contact@fusiondirectory.org>\n"
+"Language-Team: French (http://www.transifex.com/projects/p/FusionDirectory-109/language/fr/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -61,20 +54,20 @@ msgstr "Description du groupe NIS"
 
 #: admin/netgroups/class_netgroup.inc:81
 msgid "User members"
-msgstr "Membres"
+msgstr "Membre du groupe"
 
 #: admin/netgroups/class_netgroup.inc:88 admin/netgroups/class_netgroup.inc:97
 #: admin/netgroups/class_netgroup.inc:104
 msgid "NIS netgroup members"
-msgstr "Membres du groupe NIS"
+msgstr "Membres d'un groupe NIS"
 
 #: admin/netgroups/class_netgroup.inc:94
 msgid "System members"
-msgstr "SystÃ¨mes membres"
+msgstr "SystÃ¨mes qui ont membres"
 
 #: admin/netgroups/class_netgroup.inc:101
 msgid "Netgroup members"
-msgstr "Membres du groupe NIS"
+msgstr "Membres d'un groupe NIS"
 
 #: admin/netgroups/class_netgroupManagement.inc:34
 msgid "NIS Netgroups"
@@ -82,7 +75,7 @@ msgstr "Groupes NIS"
 
 #: admin/netgroups/class_netgroupManagement.inc:35
 msgid "NIS Netgroup management"
-msgstr "Gestion des groupes NIS"
+msgstr "Gestion des groupes nis"
 
 #: admin/systems/netgroups/class_netgroupSystem.inc:27
 #: personal/netgroups/class_netgroupMembership.inc:44
@@ -95,7 +88,7 @@ msgstr "Membre des groupes NIS suivants"
 
 #: personal/netgroups/class_netgroupMembership.inc:63
 msgid "NIS netgroup membership"
-msgstr "Appartenance Ã  un groupe NIS"
+msgstr "Membre d'un groupe NIS"
 
 #: config/netgroups/class_netgroupConfig.inc:28
 msgid "Netgroup configuration"
@@ -107,8 +100,8 @@ msgstr "Configuration du plugin Netgroup"
 
 #: config/netgroups/class_netgroupConfig.inc:45
 msgid "Netgroup RDN"
-msgstr "Branche des objets Netgroup"
+msgstr "Chemin relatif des objets Netgroup"
 
 #: config/netgroups/class_netgroupConfig.inc:45
 msgid "Branch in which netgroups will be stored"
-msgstr "Branches oÃ¹ seront stockÃ©s les objets Netgroup"
+msgstr "Branches ou seront stockÃ©s les objets Netgroup"
diff --git a/netgroups/locale/id/fusiondirectory.po b/netgroups/locale/id/fusiondirectory.po
index 886f51a7aad73d44cda96a0c8c86b84d7fb35a94..1eae059c53a7fa41b62205ef2fe8339de3a765e5 100644
--- a/netgroups/locale/id/fusiondirectory.po
+++ b/netgroups/locale/id/fusiondirectory.po
@@ -5,12 +5,12 @@
 # Translators:
 msgid ""
 msgstr ""
-"Project-Id-Version: FusionDirectory-108\n"
+"Project-Id-Version: FusionDirectory-109\n"
 "Report-Msgid-Bugs-To: documentation@lists.fusiondirectory.org\n"
-"POT-Creation-Date: 2015-03-19 21:45+0100\n"
-"PO-Revision-Date: 2014-12-12 07:43+0000\n"
+"POT-Creation-Date: 2014-12-15 17:47+0100\n"
+"PO-Revision-Date: 2014-12-15 17:01+0000\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>\n"
-"Language-Team: Indonesian (http://www.transifex.com/projects/p/FusionDirectory-108/language/id/)\n"
+"Language-Team: Indonesian (http://www.transifex.com/projects/p/FusionDirectory-109/language/id/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
diff --git a/netgroups/locale/it/fusiondirectory.po b/netgroups/locale/it/fusiondirectory.po
index 454ec382466cce3b7d8bbab8e70942a68aacdb86..a47d314667d38378361b51f700aa3f16327dd757 100644
--- a/netgroups/locale/it/fusiondirectory.po
+++ b/netgroups/locale/it/fusiondirectory.po
@@ -3,17 +3,14 @@
 # This file is distributed under the same license as the PACKAGE package.
 # 
 # Translators:
-# poterealpopolo <giuliano@opensides.be>, 2013
-# poterealpopolo <giuliano@opensides.be>, 2012
-# poterealpopolo <giuliano@opensides.be>, 2012-2013
 msgid ""
 msgstr ""
-"Project-Id-Version: FusionDirectory-108\n"
+"Project-Id-Version: FusionDirectory-109\n"
 "Report-Msgid-Bugs-To: documentation@lists.fusiondirectory.org\n"
-"POT-Creation-Date: 2015-03-19 21:45+0100\n"
-"PO-Revision-Date: 2015-02-25 16:02+0000\n"
+"POT-Creation-Date: 2014-12-15 17:47+0100\n"
+"PO-Revision-Date: 2015-02-25 16:04+0000\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>\n"
-"Language-Team: Italian (http://www.transifex.com/projects/p/FusionDirectory-108/language/it/)\n"
+"Language-Team: Italian (http://www.transifex.com/projects/p/FusionDirectory-109/language/it/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
diff --git a/netgroups/locale/lv/fusiondirectory.po b/netgroups/locale/lv/fusiondirectory.po
index b1bbc07adb87eaebe45d74f3fdcc7f82fa2847a1..02995d8443e79f25e58f624a628258f6270496c1 100644
--- a/netgroups/locale/lv/fusiondirectory.po
+++ b/netgroups/locale/lv/fusiondirectory.po
@@ -5,12 +5,12 @@
 # Translators:
 msgid ""
 msgstr ""
-"Project-Id-Version: FusionDirectory-108\n"
+"Project-Id-Version: FusionDirectory-109\n"
 "Report-Msgid-Bugs-To: documentation@lists.fusiondirectory.org\n"
-"POT-Creation-Date: 2015-03-19 21:45+0100\n"
-"PO-Revision-Date: 2014-12-12 07:43+0000\n"
+"POT-Creation-Date: 2014-12-15 17:47+0100\n"
+"PO-Revision-Date: 2014-12-15 17:01+0000\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>\n"
-"Language-Team: Latvian (http://www.transifex.com/projects/p/FusionDirectory-108/language/lv/)\n"
+"Language-Team: Latvian (http://www.transifex.com/projects/p/FusionDirectory-109/language/lv/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
diff --git a/netgroups/locale/nb/fusiondirectory.po b/netgroups/locale/nb/fusiondirectory.po
index 79c9aa9fc4b1014edaf5b45d35dadf7b1d7af098..538265ca4378c74e1ad45f2058b41f3fd40c4bc4 100644
--- a/netgroups/locale/nb/fusiondirectory.po
+++ b/netgroups/locale/nb/fusiondirectory.po
@@ -3,15 +3,14 @@
 # This file is distributed under the same license as the PACKAGE package.
 # 
 # Translators:
-# Petter Reinholdtsen <pere@hungry.com>, 2012
 msgid ""
 msgstr ""
-"Project-Id-Version: FusionDirectory-108\n"
+"Project-Id-Version: FusionDirectory-109\n"
 "Report-Msgid-Bugs-To: documentation@lists.fusiondirectory.org\n"
-"POT-Creation-Date: 2015-03-19 21:45+0100\n"
-"PO-Revision-Date: 2015-02-25 16:02+0000\n"
+"POT-Creation-Date: 2014-12-15 17:47+0100\n"
+"PO-Revision-Date: 2015-02-25 16:04+0000\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>\n"
-"Language-Team: Norwegian BokmÃ¥l (http://www.transifex.com/projects/p/FusionDirectory-108/language/nb/)\n"
+"Language-Team: Norwegian BokmÃ¥l (http://www.transifex.com/projects/p/FusionDirectory-109/language/nb/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
diff --git a/netgroups/locale/nl/fusiondirectory.po b/netgroups/locale/nl/fusiondirectory.po
index 1dc046f9111da360c93f0b39f54a9ae216a005b4..26b27efd0c8fdd45dfda0582490aa247987eb718 100644
--- a/netgroups/locale/nl/fusiondirectory.po
+++ b/netgroups/locale/nl/fusiondirectory.po
@@ -3,17 +3,14 @@
 # This file is distributed under the same license as the PACKAGE package.
 # 
 # Translators:
-# Christophe Augello <christophe@augello.be>, 2012
-# Christophe Augello <christophe@augello.be>, 2012
-# Kenny Tordeurs <tordeurskenny@gmail.com>, 2012
 msgid ""
 msgstr ""
-"Project-Id-Version: FusionDirectory-108\n"
+"Project-Id-Version: FusionDirectory-109\n"
 "Report-Msgid-Bugs-To: documentation@lists.fusiondirectory.org\n"
-"POT-Creation-Date: 2015-03-19 21:45+0100\n"
-"PO-Revision-Date: 2015-02-25 16:02+0000\n"
+"POT-Creation-Date: 2014-12-15 17:47+0100\n"
+"PO-Revision-Date: 2015-02-25 16:04+0000\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>\n"
-"Language-Team: Dutch (http://www.transifex.com/projects/p/FusionDirectory-108/language/nl/)\n"
+"Language-Team: Dutch (http://www.transifex.com/projects/p/FusionDirectory-109/language/nl/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -49,7 +46,7 @@ msgstr ""
 
 #: admin/netgroups/class_netgroup.inc:75
 msgid "Description"
-msgstr "Beschrijving"
+msgstr "Omschrijving"
 
 #: admin/netgroups/class_netgroup.inc:75
 msgid "Description of this NIS netgroup"
diff --git a/netgroups/locale/pl/fusiondirectory.po b/netgroups/locale/pl/fusiondirectory.po
index 9a883a7868eca2b40923ed3ec88faaaad8b66877..2ab6b447baf3c3f4d079186ed9d1df41722732b5 100644
--- a/netgroups/locale/pl/fusiondirectory.po
+++ b/netgroups/locale/pl/fusiondirectory.po
@@ -5,12 +5,12 @@
 # Translators:
 msgid ""
 msgstr ""
-"Project-Id-Version: FusionDirectory-108\n"
+"Project-Id-Version: FusionDirectory-109\n"
 "Report-Msgid-Bugs-To: documentation@lists.fusiondirectory.org\n"
-"POT-Creation-Date: 2015-03-19 21:45+0100\n"
-"PO-Revision-Date: 2015-02-25 16:02+0000\n"
+"POT-Creation-Date: 2014-12-15 17:47+0100\n"
+"PO-Revision-Date: 2015-02-25 16:04+0000\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>\n"
-"Language-Team: Polish (http://www.transifex.com/projects/p/FusionDirectory-108/language/pl/)\n"
+"Language-Team: Polish (http://www.transifex.com/projects/p/FusionDirectory-109/language/pl/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
diff --git a/netgroups/locale/pt/fusiondirectory.po b/netgroups/locale/pt/fusiondirectory.po
index e5d0c1e114d0b45afdc20075f1b39ad880d42995..da7661b5f0d496637092878298226217c8207245 100644
--- a/netgroups/locale/pt/fusiondirectory.po
+++ b/netgroups/locale/pt/fusiondirectory.po
@@ -5,12 +5,12 @@
 # Translators:
 msgid ""
 msgstr ""
-"Project-Id-Version: FusionDirectory-108\n"
+"Project-Id-Version: FusionDirectory-109\n"
 "Report-Msgid-Bugs-To: documentation@lists.fusiondirectory.org\n"
-"POT-Creation-Date: 2015-03-19 21:45+0100\n"
-"PO-Revision-Date: 2015-02-25 16:02+0000\n"
+"POT-Creation-Date: 2014-12-15 17:47+0100\n"
+"PO-Revision-Date: 2015-02-25 16:04+0000\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>\n"
-"Language-Team: Portuguese (http://www.transifex.com/projects/p/FusionDirectory-108/language/pt/)\n"
+"Language-Team: Portuguese (http://www.transifex.com/projects/p/FusionDirectory-109/language/pt/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
diff --git a/netgroups/locale/pt_BR/fusiondirectory.po b/netgroups/locale/pt_BR/fusiondirectory.po
index 7eb6f3c74bb5ad3e5b75d84e873b6ebaf94510f0..019be7fd574ece2f397ef02e88cf8c963df08388 100644
--- a/netgroups/locale/pt_BR/fusiondirectory.po
+++ b/netgroups/locale/pt_BR/fusiondirectory.po
@@ -3,15 +3,14 @@
 # This file is distributed under the same license as the PACKAGE package.
 # 
 # Translators:
-# ALEJANDRO BARRIOS <alejandrobarrios@interlegis.leg.br>, 2014
 msgid ""
 msgstr ""
-"Project-Id-Version: FusionDirectory-108\n"
+"Project-Id-Version: FusionDirectory-109\n"
 "Report-Msgid-Bugs-To: documentation@lists.fusiondirectory.org\n"
-"POT-Creation-Date: 2015-03-19 21:45+0100\n"
-"PO-Revision-Date: 2015-02-25 16:02+0000\n"
+"POT-Creation-Date: 2014-12-15 17:47+0100\n"
+"PO-Revision-Date: 2015-02-25 16:04+0000\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>\n"
-"Language-Team: Portuguese (Brazil) (http://www.transifex.com/projects/p/FusionDirectory-108/language/pt_BR/)\n"
+"Language-Team: Portuguese (Brazil) (http://www.transifex.com/projects/p/FusionDirectory-109/language/pt_BR/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
diff --git a/netgroups/locale/ru/fusiondirectory.po b/netgroups/locale/ru/fusiondirectory.po
index 1ea6a73443c3373f8a50949b6c47f61b6ed464b0..e7a18bff6cfe201ecb7e9c2509accf788d9042ee 100644
--- a/netgroups/locale/ru/fusiondirectory.po
+++ b/netgroups/locale/ru/fusiondirectory.po
@@ -5,17 +5,17 @@
 # Translators:
 msgid ""
 msgstr ""
-"Project-Id-Version: FusionDirectory-108\n"
+"Project-Id-Version: FusionDirectory-109\n"
 "Report-Msgid-Bugs-To: documentation@lists.fusiondirectory.org\n"
-"POT-Creation-Date: 2015-03-19 21:45+0100\n"
-"PO-Revision-Date: 2015-02-25 16:02+0000\n"
+"POT-Creation-Date: 2014-12-15 17:47+0100\n"
+"PO-Revision-Date: 2015-04-07 13:01+0000\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>\n"
-"Language-Team: Russian (http://www.transifex.com/projects/p/FusionDirectory-108/language/ru/)\n"
+"Language-Team: Russian (http://www.transifex.com/projects/p/FusionDirectory-109/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=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);\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
 #: config/netgroups/class_netgroupConfig.inc:42
diff --git a/netgroups/locale/ru@petr1708/fusiondirectory.po b/netgroups/locale/ru@petr1708/fusiondirectory.po
index c0cd40e68eba65bceb5ad21e4d2ec043306fd610..b1150fa0534ffaf91f76dc306de8cf1a3151b765 100644
--- a/netgroups/locale/ru@petr1708/fusiondirectory.po
+++ b/netgroups/locale/ru@petr1708/fusiondirectory.po
@@ -5,17 +5,17 @@
 # Translators:
 msgid ""
 msgstr ""
-"Project-Id-Version: FusionDirectory-108\n"
+"Project-Id-Version: FusionDirectory-109\n"
 "Report-Msgid-Bugs-To: documentation@lists.fusiondirectory.org\n"
-"POT-Creation-Date: 2015-03-19 21:45+0100\n"
-"PO-Revision-Date: 2014-12-12 07:43+0000\n"
+"POT-Creation-Date: 2014-12-15 17:47+0100\n"
+"PO-Revision-Date: 2014-12-15 17:01+0000\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>\n"
-"Language-Team: Russian Petrine orthography (http://www.transifex.com/projects/p/FusionDirectory-108/language/ru@petr1708/)\n"
+"Language-Team: Russian Petrine orthography (http://www.transifex.com/projects/p/FusionDirectory-109/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=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);\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
 #: config/netgroups/class_netgroupConfig.inc:42
diff --git a/netgroups/locale/sv/fusiondirectory.po b/netgroups/locale/sv/fusiondirectory.po
index e4e5e33c9ef5a0edf1f1fccd819ab351f24a044a..e07fbca12423a17ea4fef34d54e9ea91bc577168 100644
--- a/netgroups/locale/sv/fusiondirectory.po
+++ b/netgroups/locale/sv/fusiondirectory.po
@@ -5,12 +5,12 @@
 # Translators:
 msgid ""
 msgstr ""
-"Project-Id-Version: FusionDirectory-108\n"
+"Project-Id-Version: FusionDirectory-109\n"
 "Report-Msgid-Bugs-To: documentation@lists.fusiondirectory.org\n"
-"POT-Creation-Date: 2015-03-19 21:45+0100\n"
-"PO-Revision-Date: 2015-02-25 16:02+0000\n"
+"POT-Creation-Date: 2014-12-15 17:47+0100\n"
+"PO-Revision-Date: 2015-02-25 16:04+0000\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>\n"
-"Language-Team: Swedish (http://www.transifex.com/projects/p/FusionDirectory-108/language/sv/)\n"
+"Language-Team: Swedish (http://www.transifex.com/projects/p/FusionDirectory-109/language/sv/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
diff --git a/netgroups/locale/ug/fusiondirectory.po b/netgroups/locale/ug/fusiondirectory.po
index 3ee4264013cae55d86efd8195c7193533fe35325..fe952a3d495c29f925a071df2e740018dc73b84a 100644
--- a/netgroups/locale/ug/fusiondirectory.po
+++ b/netgroups/locale/ug/fusiondirectory.po
@@ -5,12 +5,12 @@
 # Translators:
 msgid ""
 msgstr ""
-"Project-Id-Version: FusionDirectory-108\n"
+"Project-Id-Version: FusionDirectory-109\n"
 "Report-Msgid-Bugs-To: documentation@lists.fusiondirectory.org\n"
-"POT-Creation-Date: 2015-03-19 21:45+0100\n"
-"PO-Revision-Date: 2014-12-12 07:43+0000\n"
+"POT-Creation-Date: 2014-12-15 17:47+0100\n"
+"PO-Revision-Date: 2014-12-15 17:01+0000\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>\n"
-"Language-Team: Uighur (http://www.transifex.com/projects/p/FusionDirectory-108/language/ug/)\n"
+"Language-Team: Uighur (http://www.transifex.com/projects/p/FusionDirectory-109/language/ug/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
diff --git a/netgroups/locale/vi_VN/fusiondirectory.po b/netgroups/locale/vi_VN/fusiondirectory.po
index a182e449d752d659dab02737b2c728c81c27308a..8aa5ee0223a351cfc79ff6fe59245c24c329a68d 100644
--- a/netgroups/locale/vi_VN/fusiondirectory.po
+++ b/netgroups/locale/vi_VN/fusiondirectory.po
@@ -5,12 +5,12 @@
 # Translators:
 msgid ""
 msgstr ""
-"Project-Id-Version: FusionDirectory-108\n"
+"Project-Id-Version: FusionDirectory-109\n"
 "Report-Msgid-Bugs-To: documentation@lists.fusiondirectory.org\n"
-"POT-Creation-Date: 2015-03-19 21:45+0100\n"
-"PO-Revision-Date: 2015-02-25 16:02+0000\n"
+"POT-Creation-Date: 2014-12-15 17:47+0100\n"
+"PO-Revision-Date: 2015-02-25 16:04+0000\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>\n"
-"Language-Team: Vietnamese (Viet Nam) (http://www.transifex.com/projects/p/FusionDirectory-108/language/vi_VN/)\n"
+"Language-Team: Vietnamese (Viet Nam) (http://www.transifex.com/projects/p/FusionDirectory-109/language/vi_VN/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
diff --git a/netgroups/locale/zh/fusiondirectory.po b/netgroups/locale/zh/fusiondirectory.po
index 03b76555b8e37b6819e96827ade5411601e1cd80..46e8fab5c1676be813bae091dd06374de00a3804 100644
--- a/netgroups/locale/zh/fusiondirectory.po
+++ b/netgroups/locale/zh/fusiondirectory.po
@@ -5,12 +5,12 @@
 # Translators:
 msgid ""
 msgstr ""
-"Project-Id-Version: FusionDirectory-108\n"
+"Project-Id-Version: FusionDirectory-109\n"
 "Report-Msgid-Bugs-To: documentation@lists.fusiondirectory.org\n"
-"POT-Creation-Date: 2015-03-19 21:45+0100\n"
-"PO-Revision-Date: 2015-02-25 16:02+0000\n"
+"POT-Creation-Date: 2014-12-15 17:47+0100\n"
+"PO-Revision-Date: 2015-02-25 16:04+0000\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>\n"
-"Language-Team: Chinese (http://www.transifex.com/projects/p/FusionDirectory-108/language/zh/)\n"
+"Language-Team: Chinese (http://www.transifex.com/projects/p/FusionDirectory-109/language/zh/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
diff --git a/opsi/locale/ar/fusiondirectory.po b/opsi/locale/ar/fusiondirectory.po
index 75cb1b189ab4e929114863618fc0654194713309..e519457198a54307131cb32bc6aa457ae01d1e8b 100644
--- a/opsi/locale/ar/fusiondirectory.po
+++ b/opsi/locale/ar/fusiondirectory.po
@@ -5,12 +5,12 @@
 # Translators:
 msgid ""
 msgstr ""
-"Project-Id-Version: FusionDirectory-108\n"
+"Project-Id-Version: FusionDirectory-109\n"
 "Report-Msgid-Bugs-To: documentation@lists.fusiondirectory.org\n"
-"POT-Creation-Date: 2015-03-19 21:45+0100\n"
-"PO-Revision-Date: 2015-02-25 16:03+0000\n"
+"POT-Creation-Date: 2014-12-15 17:47+0100\n"
+"PO-Revision-Date: 2015-02-25 16:04+0000\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>\n"
-"Language-Team: Arabic (http://www.transifex.com/projects/p/FusionDirectory-108/language/ar/)\n"
+"Language-Team: Arabic (http://www.transifex.com/projects/p/FusionDirectory-109/language/ar/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -117,7 +117,7 @@ msgstr ""
 #: admin/opsi/class_opsiSoftwareList.inc:141
 #: admin/opsi/class_opsiProductProperties.inc:192
 #: admin/opsi/class_opsiProfile.inc:191
-msgid "Failed to contact OPSI server"
+msgid "Could contact OPSI server"
 msgstr ""
 
 #: admin/opsi/class_opsiProfileManagement.inc:33
@@ -274,10 +274,3 @@ 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"
-" managed by it, so if you delete them or deactivate their OPSI tab, they "
-"will be removed from OPSI."
-msgstr ""
diff --git a/opsi/locale/ca/fusiondirectory.po b/opsi/locale/ca/fusiondirectory.po
index bb3737302673e35b54fb2529947c926a0e8c3d54..455959ab314edf7a75bb0614a3001df2ead64546 100644
--- a/opsi/locale/ca/fusiondirectory.po
+++ b/opsi/locale/ca/fusiondirectory.po
@@ -5,12 +5,12 @@
 # Translators:
 msgid ""
 msgstr ""
-"Project-Id-Version: FusionDirectory-108\n"
+"Project-Id-Version: FusionDirectory-109\n"
 "Report-Msgid-Bugs-To: documentation@lists.fusiondirectory.org\n"
-"POT-Creation-Date: 2015-03-19 21:45+0100\n"
-"PO-Revision-Date: 2015-02-25 16:03+0000\n"
+"POT-Creation-Date: 2014-12-15 17:47+0100\n"
+"PO-Revision-Date: 2015-02-25 16:04+0000\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>\n"
-"Language-Team: Catalan (http://www.transifex.com/projects/p/FusionDirectory-108/language/ca/)\n"
+"Language-Team: Catalan (http://www.transifex.com/projects/p/FusionDirectory-109/language/ca/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -117,7 +117,7 @@ msgstr ""
 #: admin/opsi/class_opsiSoftwareList.inc:141
 #: admin/opsi/class_opsiProductProperties.inc:192
 #: admin/opsi/class_opsiProfile.inc:191
-msgid "Failed to contact OPSI server"
+msgid "Could contact OPSI server"
 msgstr ""
 
 #: admin/opsi/class_opsiProfileManagement.inc:33
@@ -274,10 +274,3 @@ 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"
-" managed by it, so if you delete them or deactivate their OPSI tab, they "
-"will be removed from OPSI."
-msgstr ""
diff --git a/opsi/locale/cs_CZ/fusiondirectory.po b/opsi/locale/cs_CZ/fusiondirectory.po
index 7eb8caf12d7aec0ff6a0e2e93d96ec019f165080..f5febb5c5f822c70ff202ca0538d4f5708652ac4 100644
--- a/opsi/locale/cs_CZ/fusiondirectory.po
+++ b/opsi/locale/cs_CZ/fusiondirectory.po
@@ -3,14 +3,15 @@
 # This file is distributed under the same license as the PACKAGE package.
 # 
 # Translators:
+# Pavel Borecki <pavel.borecki@gmail.com>, 2014-2015
 msgid ""
 msgstr ""
-"Project-Id-Version: FusionDirectory-108\n"
+"Project-Id-Version: FusionDirectory-109\n"
 "Report-Msgid-Bugs-To: documentation@lists.fusiondirectory.org\n"
-"POT-Creation-Date: 2015-03-19 21:45+0100\n"
-"PO-Revision-Date: 2015-02-25 16:03+0000\n"
-"Last-Translator: fusiondirectory <contact@fusiondirectory.org>\n"
-"Language-Team: Czech (Czech Republic) (http://www.transifex.com/projects/p/FusionDirectory-108/language/cs_CZ/)\n"
+"POT-Creation-Date: 2014-12-15 17:47+0100\n"
+"PO-Revision-Date: 2015-04-04 09:01+0000\n"
+"Last-Translator: Pavel Borecki <pavel.borecki@gmail.com>\n"
+"Language-Team: Czech (Czech Republic) (http://www.transifex.com/projects/p/FusionDirectory-109/language/cs_CZ/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -20,11 +21,11 @@ msgstr ""
 #: admin/opsi/class_opsiOnDemandList.inc:28
 #: admin/opsi/class_opsiOnDemandList.inc:33
 msgid "OPSI ondemand list"
-msgstr ""
+msgstr "OPSI seznam na vyÅ¾Ã¡dÃ¡nÃ"
 
 #: admin/opsi/class_opsiOnDemandList.inc:29
 msgid "OPSI on demand software list"
-msgstr ""
+msgstr "Seznam OPSI programovÃ©ho vybavenÃ na vyÅ¾Ã¡dÃ¡nÃ"
 
 #: admin/opsi/class_opsiOnDemandList.inc:47
 #: admin/opsi/class_opsiSoftwareList.inc:51
@@ -41,84 +42,84 @@ msgstr ""
 #: admin/opsi/class_opsiSoftwareList.inc:54
 #: admin/opsi/class_opsiProfile.inc:88
 msgid "OPSI server to use for deployment"
-msgstr ""
+msgstr "OPSI server, kterÃ½ mÃ¡ bÃ½t pouÅ¾it pro nasazenÃ"
 
 #: admin/opsi/class_opsiOnDemandList.inc:54
 #: admin/opsi/class_opsiSoftwareList.inc:58
 #: admin/opsi/class_opsiProductProperties.inc:117
 #: admin/opsi/class_opsiProfile.inc:85 admin/opsi/class_opsiProfile.inc:92
 msgid "Name"
-msgstr "nÃ¡zev"
+msgstr "NÃ¡zev"
 
 #: admin/opsi/class_opsiOnDemandList.inc:54
 #: admin/opsi/class_opsiSoftwareList.inc:58
 #: admin/opsi/class_opsiProfile.inc:92
 msgid "Name of this OPSI profile"
-msgstr ""
+msgstr "NÃ¡zev tohoto OPSI profilu"
 
 #: admin/opsi/class_opsiOnDemandList.inc:58
 msgid "Show details"
-msgstr ""
+msgstr "Zobrazit podrobnosti"
 
 #: admin/opsi/class_opsiOnDemandList.inc:58
 msgid "Show further information to the user"
-msgstr ""
+msgstr "Zobrazit uÅ¾ivateli dalÅ¡Ã informace"
 
 #: admin/opsi/class_opsiOnDemandList.inc:64
 #: admin/opsi/class_opsiSoftwareList.inc:64
 msgid "Softwares"
-msgstr ""
+msgstr "ProgramovÃ© vybavenÃ"
 
 #: admin/opsi/class_opsiOnDemandList.inc:68
 #: admin/opsi/class_opsiSoftwareList.inc:81
 msgid "Localboot products"
-msgstr ""
+msgstr "Produkty pro mÃstnÃ zavedenÃ"
 
 #: admin/opsi/class_opsiOnDemandList.inc:68
 msgid "The localboot products to put in this list"
-msgstr ""
+msgstr "Produkty pro mÃstnÃ zavedenÃ pro umÃstÄ›nÃ na tento seznam"
 
 #: admin/opsi/class_opsiSoftwareList.inc:32
 msgid "OPSI list"
-msgstr ""
+msgstr "Seznam OPSI"
 
 #: admin/opsi/class_opsiSoftwareList.inc:33
 #: admin/opsi/class_opsiSoftwareList.inc:37
 msgid "OPSI software list"
-msgstr ""
+msgstr "Seznam programovÃ©ho vybavenÃ OPSI"
 
 #: admin/opsi/class_opsiSoftwareList.inc:68
 msgid "The localboot products to install with this list"
-msgstr ""
+msgstr "Produkty pro mÃstnÃ zavedenÃ pro instalaci prostÅ™ednictvÃm tohoto seznamu"
 
 #: admin/opsi/class_opsiSoftwareList.inc:114
 #: admin/opsi/class_opsiProductProperties.inc:176
 #: admin/opsi/class_opsiProfile.inc:164
 msgid "Could not contact argonaut server"
-msgstr ""
+msgstr "Nebylo moÅ¾nÃ© kontaktovat argonaut server"
 
 #: admin/opsi/class_opsiSoftwareList.inc:126
 #: admin/opsi/class_opsiProfile.inc:176 addons/opsi/class_opsiImport.inc:74
 msgid "No mac address"
-msgstr ""
+msgstr "Å½Ã¡dnÃ¡ MAC adresa"
 
 #: admin/opsi/class_opsiSoftwareList.inc:127
 #: admin/opsi/class_opsiProfile.inc:177
 #, php-format
 msgid "Server %s has no mac address configured in the LDAP"
-msgstr ""
+msgstr "Server %s nemÃ¡ v LDAP uvedeny Å¾Ã¡dnÃ© MAC adresy"
 
 #: admin/opsi/class_opsiSoftwareList.inc:133
 #: admin/opsi/class_opsiProfile.inc:149 admin/opsi/class_opsiProfile.inc:183
 #, php-format
 msgid "Could not find %s in the LDAP"
-msgstr ""
+msgstr "%s nelze v LDAP nalÃ©zt"
 
 #: admin/opsi/class_opsiSoftwareList.inc:141
 #: admin/opsi/class_opsiProductProperties.inc:192
 #: admin/opsi/class_opsiProfile.inc:191
-msgid "Failed to contact OPSI server"
-msgstr ""
+msgid "Could contact OPSI server"
+msgstr "Nelze kontaktovat OPSI server"
 
 #: admin/opsi/class_opsiProfileManagement.inc:33
 #: config/opsi/class_opsiConfig.inc:42
@@ -127,7 +128,7 @@ msgstr ""
 
 #: admin/opsi/class_opsiProfileManagement.inc:34
 msgid "OPSI profile management"
-msgstr ""
+msgstr "SprÃ¡va sady nastavenÃ OPSI"
 
 #: admin/opsi/class_opsiProductProperties.inc:104
 #: admin/opsi/class_opsiProductProperties.inc:105
@@ -136,12 +137,12 @@ msgstr "Vlastnosti produktu"
 
 #: admin/opsi/class_opsiProductProperties.inc:122
 msgid "Properties of the products of this profile"
-msgstr ""
+msgstr "Vlastnosti produktÅ¯ v tÃ©to sadÄ› nastavenÃ"
 
 #: admin/opsi/class_opsiProfile.inc:66 admin/opsi/class_opsiProfile.inc:67
 #: admin/opsi/class_opsiProfile.inc:71
 msgid "OPSI profile"
-msgstr ""
+msgstr "Sada nastavenÃ OPSI"
 
 #: admin/opsi/class_opsiProfile.inc:98
 msgid "Entries"
@@ -149,19 +150,19 @@ msgstr "PoloÅ¾ky"
 
 #: admin/opsi/class_opsiProfile.inc:101
 msgid "Netboot product"
-msgstr ""
+msgstr "Produkt pro mÃstnÃ zavedenÃ"
 
 #: admin/opsi/class_opsiProfile.inc:101
 msgid "The netboot product to use for this profile"
-msgstr ""
+msgstr "Netbot produkt pro tuto sadu nastavenÃ"
 
 #: admin/opsi/class_opsiProfile.inc:106
 msgid "Software lists"
-msgstr ""
+msgstr "Seznamy programovÃ©ho vybavenÃ"
 
 #: admin/opsi/class_opsiProfile.inc:106
 msgid "Software lists that will be installed with this profile"
-msgstr ""
+msgstr "Seznam programovÃ©ho vybavenÃ, kterÃ½ bude nainstalovÃ¡n touto sadou nastavenÃ"
 
 #: admin/opsi/class_opsiProfile.inc:211
 #, php-format
@@ -170,90 +171,90 @@ msgstr ""
 
 #: admin/systems/opsi/class_opsiClient.inc:33
 msgid "OPSI client"
-msgstr ""
+msgstr "Klient OPSI"
 
 #: admin/systems/opsi/class_opsiClient.inc:34
 msgid "Edit OPSI client settings"
-msgstr ""
+msgstr "Upravit nastavenÃ OPSI klienta"
 
 #: admin/systems/opsi/class_opsiClient.inc:46
 msgid "OPSI Client"
-msgstr ""
+msgstr "Klient OPSI"
 
 #: admin/systems/opsi/class_opsiClient.inc:49
 msgid "OPSI Server"
-msgstr ""
+msgstr "OPSI server"
 
 #: admin/systems/opsi/class_opsiClient.inc:49
 msgid "The OPSI Server this client is connected to"
-msgstr ""
+msgstr "OPSI server, ke kterÃ©mu je tento klient pÅ™ipojen"
 
 #: admin/systems/opsi/class_opsiClient.inc:53
 msgid "OPSI Profile"
-msgstr ""
+msgstr "Profil OPSI"
 
 #: admin/systems/opsi/class_opsiClient.inc:53
 msgid "The OPSI Profile to apply to this client"
-msgstr ""
+msgstr "Sada nastavenÃ OPSI, kterÃ¡ mÃ¡ bÃ½t pouÅ¾ita na tomto klientovi"
 
 #: admin/systems/opsi/class_opsiClient.inc:95
 msgid "Could not get macAddress for OPSI server !"
-msgstr ""
+msgstr "Nelze zjistit macAddress pro OPSI server !"
 
 #: admin/systems/opsi/class_opsiClient.inc:104
 #: admin/systems/opsi/class_opsiClient.inc:191
 msgid "Could not remove OPSI informations"
-msgstr ""
+msgstr "OPSI informace nelze odebrat"
 
 #: admin/systems/opsi/class_opsiClient.inc:148
 #: addons/opsi/class_opsiImport.inc:89
 msgid "Could not update OPSI informations"
-msgstr ""
+msgstr "Nelze aktualizovat OPSI informace"
 
 #: admin/systems/services/opsi/class_serviceOPSI.inc:29
 #: admin/systems/services/opsi/class_serviceOPSI.inc:30
 msgid "OPSI service"
-msgstr ""
+msgstr "SluÅ¾ba OPSI"
 
 #: admin/systems/services/opsi/class_serviceOPSI.inc:30
 msgid "Services"
-msgstr "sluÅ¾by"
+msgstr "SluÅ¾by"
 
 #: admin/systems/services/opsi/class_serviceOPSI.inc:41
 msgid "OPSI Server informations"
-msgstr ""
+msgstr "Informace o OPSI serveru"
 
 #: admin/systems/services/opsi/class_serviceOPSI.inc:44
 msgid "Server URI"
-msgstr "URI serveru"
+msgstr "URI adresa serveru"
 
 #: admin/systems/services/opsi/class_serviceOPSI.inc:44
 msgid "The URI to use for connection"
-msgstr ""
+msgstr "URI adresa, kterou pouÅ¾Ãt pro pÅ™ipojenÃ"
 
 #: admin/systems/services/opsi/class_serviceOPSI.inc:48
 msgid "User"
-msgstr "uÅ¾ivatel"
+msgstr "UÅ¾ivatel"
 
 #: admin/systems/services/opsi/class_serviceOPSI.inc:48
 msgid "The user to use for connection"
-msgstr ""
+msgstr "UÅ¾ivatelskÃ½ ÃºÄet, pouÅ¾itÃ½ pro pÅ™ipojenÃ"
 
 #: admin/systems/services/opsi/class_serviceOPSI.inc:52
 msgid "Password"
-msgstr "heslo"
+msgstr "Heslo"
 
 #: admin/systems/services/opsi/class_serviceOPSI.inc:52
 msgid "The password to use for connection"
-msgstr ""
+msgstr "Heslo pro spojenÃ"
 
 #: addons/opsi/class_opsiImport.inc:35 addons/opsi/class_opsiImport.inc:39
 msgid "OPSI import"
-msgstr ""
+msgstr "Importovat OPSI"
 
 #: addons/opsi/class_opsiImport.inc:36
 msgid "Import windows stations from OPSI into FD"
-msgstr ""
+msgstr "Importovat poÄÃtaÄe s MS Windows z OPSI do F.D."
 
 #: addons/opsi/class_opsiImport.inc:63
 msgid "Argonaut server is not available"
@@ -269,15 +270,8 @@ msgstr "NastavenÃ nastavenÃ zÃ¡suvnÃ©ho modulu OPSI pro FusionDirectory"
 
 #: config/opsi/class_opsiConfig.inc:45
 msgid "OPSI RDN"
-msgstr ""
+msgstr "RelativnÃ rozliÅ¡enÃ½ nÃ¡zev OPSI"
 
 #: 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"
-" managed by it, so if you delete them or deactivate their OPSI tab, they "
-"will be removed from OPSI."
-msgstr ""
+msgstr "VÄ›tev ve kterÃ© budou uklÃ¡dÃ¡ny OPSI profily"
diff --git a/opsi/locale/de/fusiondirectory.po b/opsi/locale/de/fusiondirectory.po
index e5466252d600bc1af1e6007ae7c0accdb3b8b208..44d93bf9c5a8965e3463a049a720dc4d30443f5e 100644
--- a/opsi/locale/de/fusiondirectory.po
+++ b/opsi/locale/de/fusiondirectory.po
@@ -3,14 +3,16 @@
 # This file is distributed under the same license as the PACKAGE package.
 # 
 # Translators:
+# d.oertel <d.oertel@uib.de>, 2013
+# Ettore Atalan <atalanttore@googlemail.com>, 2014
 msgid ""
 msgstr ""
-"Project-Id-Version: FusionDirectory-108\n"
+"Project-Id-Version: FusionDirectory-109\n"
 "Report-Msgid-Bugs-To: documentation@lists.fusiondirectory.org\n"
-"POT-Creation-Date: 2015-03-19 21:45+0100\n"
-"PO-Revision-Date: 2015-02-25 16:12+0000\n"
-"Last-Translator: fusiondirectory <contact@fusiondirectory.org>\n"
-"Language-Team: German (http://www.transifex.com/projects/p/FusionDirectory-108/language/de/)\n"
+"POT-Creation-Date: 2014-12-15 17:47+0100\n"
+"PO-Revision-Date: 2015-02-25 16:04+0000\n"
+"Last-Translator: Ettore Atalan <atalanttore@googlemail.com>\n"
+"Language-Team: German (http://www.transifex.com/projects/p/FusionDirectory-109/language/de/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -20,11 +22,11 @@ msgstr ""
 #: admin/opsi/class_opsiOnDemandList.inc:28
 #: admin/opsi/class_opsiOnDemandList.inc:33
 msgid "OPSI ondemand list"
-msgstr "OPSI ondemand list"
+msgstr "OPSI-Anforderungsliste"
 
 #: admin/opsi/class_opsiOnDemandList.inc:29
 msgid "OPSI on demand software list"
-msgstr "OPSI on demand software list"
+msgstr "OPSI auf der Anforderungssoftwareliste"
 
 #: admin/opsi/class_opsiOnDemandList.inc:47
 #: admin/opsi/class_opsiSoftwareList.inc:51
@@ -35,13 +37,13 @@ msgstr "Infos"
 #: admin/opsi/class_opsiSoftwareList.inc:54
 #: admin/opsi/class_opsiProfile.inc:88
 msgid "OPSI server"
-msgstr "Opsi Server"
+msgstr "OPSI-Server"
 
 #: admin/opsi/class_opsiOnDemandList.inc:50
 #: admin/opsi/class_opsiSoftwareList.inc:54
 #: admin/opsi/class_opsiProfile.inc:88
 msgid "OPSI server to use for deployment"
-msgstr "OPSI Server der verwendet werden soll"
+msgstr "Der zu verwendende OPSI-Server"
 
 #: admin/opsi/class_opsiOnDemandList.inc:54
 #: admin/opsi/class_opsiSoftwareList.inc:58
@@ -54,7 +56,7 @@ msgstr "Name"
 #: admin/opsi/class_opsiSoftwareList.inc:58
 #: admin/opsi/class_opsiProfile.inc:92
 msgid "Name of this OPSI profile"
-msgstr "Name des Opsi Profils"
+msgstr "Name von diesem OPSI-Profils"
 
 #: admin/opsi/class_opsiOnDemandList.inc:58
 msgid "Show details"
@@ -62,7 +64,7 @@ msgstr "Details anzeigen"
 
 #: admin/opsi/class_opsiOnDemandList.inc:58
 msgid "Show further information to the user"
-msgstr "Weiter Informationen zu diesem User"
+msgstr "Weiter Informationen zu diesem Benutzer anzeigen"
 
 #: admin/opsi/class_opsiOnDemandList.inc:64
 #: admin/opsi/class_opsiSoftwareList.inc:64
@@ -76,26 +78,26 @@ msgstr "Localboot Produkte"
 
 #: admin/opsi/class_opsiOnDemandList.inc:68
 msgid "The localboot products to put in this list"
-msgstr "Das Localboot Produkt welches dieser Liste hinzugefÃ¼gt werden soll"
+msgstr "Das Localboot Produkt, welches dieser Liste hinzugefÃ¼gt werden soll"
 
 #: admin/opsi/class_opsiSoftwareList.inc:32
 msgid "OPSI list"
-msgstr "Opsi Liste"
+msgstr "OPSI-Liste"
 
 #: admin/opsi/class_opsiSoftwareList.inc:33
 #: admin/opsi/class_opsiSoftwareList.inc:37
 msgid "OPSI software list"
-msgstr "OPSI Software Liste"
+msgstr "OPSI-Softwareliste"
 
 #: admin/opsi/class_opsiSoftwareList.inc:68
 msgid "The localboot products to install with this list"
-msgstr "Die Localboot Produkte welche mit dieser Liste installiert werden sollen"
+msgstr "Die Localboot Produkte, welche mit dieser Liste installiert werden sollen"
 
 #: admin/opsi/class_opsiSoftwareList.inc:114
 #: admin/opsi/class_opsiProductProperties.inc:176
 #: admin/opsi/class_opsiProfile.inc:164
 msgid "Could not contact argonaut server"
-msgstr "Keine Verbindung zum Argonaut Server"
+msgstr "Keine Verbindung zum-Argonaut Server"
 
 #: admin/opsi/class_opsiSoftwareList.inc:126
 #: admin/opsi/class_opsiProfile.inc:176 addons/opsi/class_opsiImport.inc:74
@@ -117,8 +119,8 @@ msgstr "Konnte %s nicht im LDAP finden"
 #: admin/opsi/class_opsiSoftwareList.inc:141
 #: admin/opsi/class_opsiProductProperties.inc:192
 #: admin/opsi/class_opsiProfile.inc:191
-msgid "Failed to contact OPSI server"
-msgstr ""
+msgid "Could contact OPSI server"
+msgstr "Verbindung zum OPSI Server hergestellt"
 
 #: admin/opsi/class_opsiProfileManagement.inc:33
 #: config/opsi/class_opsiConfig.inc:42
@@ -127,21 +129,21 @@ msgstr "OPSI"
 
 #: admin/opsi/class_opsiProfileManagement.inc:34
 msgid "OPSI profile management"
-msgstr "OPSI Profile Management"
+msgstr "OPSI-Profilverwaltung"
 
 #: admin/opsi/class_opsiProductProperties.inc:104
 #: admin/opsi/class_opsiProductProperties.inc:105
 msgid "Product properties"
-msgstr "Product properties"
+msgstr "Produkteigenschaften"
 
 #: admin/opsi/class_opsiProductProperties.inc:122
 msgid "Properties of the products of this profile"
-msgstr "Properties der Produkte dieses Profils"
+msgstr "Eigenschaften der Produkte von diesem Profil"
 
 #: admin/opsi/class_opsiProfile.inc:66 admin/opsi/class_opsiProfile.inc:67
 #: admin/opsi/class_opsiProfile.inc:71
 msgid "OPSI profile"
-msgstr "OPSI Profile"
+msgstr "OPSI-Profil"
 
 #: admin/opsi/class_opsiProfile.inc:98
 msgid "Entries"
@@ -149,15 +151,15 @@ msgstr "EintrÃ¤ge"
 
 #: admin/opsi/class_opsiProfile.inc:101
 msgid "Netboot product"
-msgstr "Netboot Produkt"
+msgstr "Netboot-Produkt"
 
 #: admin/opsi/class_opsiProfile.inc:101
 msgid "The netboot product to use for this profile"
-msgstr "Das Netboot Produkt das in diesem Profil verwendet werden soll"
+msgstr "Das Netboot-Produkt, das in diesem Profil verwendet werden soll"
 
 #: admin/opsi/class_opsiProfile.inc:106
 msgid "Software lists"
-msgstr "Software Liste"
+msgstr "Softwareliste"
 
 #: admin/opsi/class_opsiProfile.inc:106
 msgid "Software lists that will be installed with this profile"
@@ -170,50 +172,50 @@ msgstr "%s (%s)"
 
 #: admin/systems/opsi/class_opsiClient.inc:33
 msgid "OPSI client"
-msgstr "OPSI Client"
+msgstr "OPSI-Client"
 
 #: admin/systems/opsi/class_opsiClient.inc:34
 msgid "Edit OPSI client settings"
-msgstr "Einstellungen des OPSI Client editieren"
+msgstr "OPSI-Clienteinstellungen bearbeiten"
 
 #: admin/systems/opsi/class_opsiClient.inc:46
 msgid "OPSI Client"
-msgstr "OPSI Client"
+msgstr "OPSI-Client"
 
 #: admin/systems/opsi/class_opsiClient.inc:49
 msgid "OPSI Server"
-msgstr "OPSI Server"
+msgstr "OPSI-Server"
 
 #: admin/systems/opsi/class_opsiClient.inc:49
 msgid "The OPSI Server this client is connected to"
-msgstr "Der OPSI Server zu dem dieser Client verbunden ist"
+msgstr "Der OPSI-Server zu dem dieser Client verbunden ist"
 
 #: admin/systems/opsi/class_opsiClient.inc:53
 msgid "OPSI Profile"
-msgstr "OPSI Profil"
+msgstr "OPSI-Profil"
 
 #: admin/systems/opsi/class_opsiClient.inc:53
 msgid "The OPSI Profile to apply to this client"
-msgstr "OPSI Profil welches auf diesen Client angewendet wird"
+msgstr "Das OPSI-Profil, welches auf diesen Client angewendet wird"
 
 #: admin/systems/opsi/class_opsiClient.inc:95
 msgid "Could not get macAddress for OPSI server !"
-msgstr "Kann die MAC Adresse des OPSI Servers nicht finden !"
+msgstr "Konnte die MAC-Adresse des OPSI-Servers nicht finden !"
 
 #: admin/systems/opsi/class_opsiClient.inc:104
 #: admin/systems/opsi/class_opsiClient.inc:191
 msgid "Could not remove OPSI informations"
-msgstr "Kann die OPSI Informationen nicht lÃ¶schen"
+msgstr "Konnte die OPSI-Informationen nicht lÃ¶schen"
 
 #: admin/systems/opsi/class_opsiClient.inc:148
 #: addons/opsi/class_opsiImport.inc:89
 msgid "Could not update OPSI informations"
-msgstr "Kann OPSI Informationen nicht updaten"
+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"
-msgstr "OPSI Service"
+msgstr "OPSI-Dienst"
 
 #: admin/systems/services/opsi/class_serviceOPSI.inc:30
 msgid "Services"
@@ -221,15 +223,15 @@ msgstr "Dienste"
 
 #: admin/systems/services/opsi/class_serviceOPSI.inc:41
 msgid "OPSI Server informations"
-msgstr "OPSI Server Informationen"
+msgstr "OPSI-Serverinformationen"
 
 #: admin/systems/services/opsi/class_serviceOPSI.inc:44
 msgid "Server URI"
-msgstr "Server URI"
+msgstr "Server-URI"
 
 #: admin/systems/services/opsi/class_serviceOPSI.inc:44
 msgid "The URI to use for connection"
-msgstr "Verbindungs URI"
+msgstr "Die URI fÃ¼r die Verbindung"
 
 #: admin/systems/services/opsi/class_serviceOPSI.inc:48
 msgid "User"
@@ -237,7 +239,7 @@ msgstr "Benutzer"
 
 #: admin/systems/services/opsi/class_serviceOPSI.inc:48
 msgid "The user to use for connection"
-msgstr "Verbindungs User"
+msgstr "Der Benutzer fÃ¼r die Verbindung"
 
 #: admin/systems/services/opsi/class_serviceOPSI.inc:52
 msgid "Password"
@@ -245,27 +247,27 @@ msgstr "Passwort"
 
 #: admin/systems/services/opsi/class_serviceOPSI.inc:52
 msgid "The password to use for connection"
-msgstr "Verbindungs Passwort"
+msgstr "Das Passwort fÃ¼r die Verbindung"
 
 #: addons/opsi/class_opsiImport.inc:35 addons/opsi/class_opsiImport.inc:39
 msgid "OPSI import"
-msgstr "OPSI Import"
+msgstr "OPSI-Import"
 
 #: addons/opsi/class_opsiImport.inc:36
 msgid "Import windows stations from OPSI into FD"
-msgstr "Importiere Windows Stationen von OPSI nach FD"
+msgstr "Windows-Stationen von OPSI in FD importieren"
 
 #: addons/opsi/class_opsiImport.inc:63
 msgid "Argonaut server is not available"
-msgstr "Argonaut Server ist nicht VerfÃ¼gbar"
+msgstr "Argonaut-Server ist nicht verfÃ¼gbar"
 
 #: config/opsi/class_opsiConfig.inc:28
 msgid "OPSI configuration"
-msgstr "OPSI Konfiguration"
+msgstr "OPSI-Konfiguration"
 
 #: config/opsi/class_opsiConfig.inc:29
 msgid "FusionDirectory OPSI plugin configuration"
-msgstr "FusionDirectory OPSI Plugin Konfiguration"
+msgstr "FusionDirectory OPSI-Plugin-Konfiguration"
 
 #: config/opsi/class_opsiConfig.inc:45
 msgid "OPSI RDN"
@@ -273,11 +275,4 @@ msgstr "OPSI RDN"
 
 #: config/opsi/class_opsiConfig.inc:45
 msgid "Branch in which OPSI profiles will be stored"
-msgstr "Branch in dem die OPSI Profile gespeichert werden"
-
-#: addons/opsi/opsiimport.tpl.c:2
-msgid ""
-"Warning : Once you import your OPSI hosts into FusionDirectory, they will be"
-" managed by it, so if you delete them or deactivate their OPSI tab, they "
-"will be removed from OPSI."
-msgstr "Warnung: Nachdem Sie die OPSI Hosts nach FusionDirectory importiert haben, werden diese dort verwaltet. Wenn Sie danach einen direkt in OPSI lÃ¶schen, so wird er dadurch nicht wirklich gelÃ¶scht."
+msgstr "Zweig, in dem OPSI-Profile gespeichert werden"
diff --git a/opsi/locale/el_GR/fusiondirectory.po b/opsi/locale/el_GR/fusiondirectory.po
new file mode 100644
index 0000000000000000000000000000000000000000..00299b24d405bf99bcd9973b83f9338b691dcbe0
--- /dev/null
+++ b/opsi/locale/el_GR/fusiondirectory.po
@@ -0,0 +1,276 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR FusionDirectory Project
+# This file is distributed under the same license as the PACKAGE package.
+# 
+# Translators:
+msgid ""
+msgstr ""
+"Project-Id-Version: FusionDirectory-109\n"
+"Report-Msgid-Bugs-To: documentation@lists.fusiondirectory.org\n"
+"POT-Creation-Date: 2014-12-15 17:47+0100\n"
+"PO-Revision-Date: 2015-05-30 11:45+0000\n"
+"Last-Translator: Benoit Mortier <benoit.mortier@opensides.be>\n"
+"Language-Team: Greek (Greece) (http://www.transifex.com/projects/p/FusionDirectory-109/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/opsi/class_opsiOnDemandList.inc:28
+#: admin/opsi/class_opsiOnDemandList.inc:33
+msgid "OPSI ondemand list"
+msgstr ""
+
+#: admin/opsi/class_opsiOnDemandList.inc:29
+msgid "OPSI on demand software list"
+msgstr ""
+
+#: admin/opsi/class_opsiOnDemandList.inc:47
+#: admin/opsi/class_opsiSoftwareList.inc:51
+msgid "Infos"
+msgstr ""
+
+#: admin/opsi/class_opsiOnDemandList.inc:50
+#: admin/opsi/class_opsiSoftwareList.inc:54
+#: admin/opsi/class_opsiProfile.inc:88
+msgid "OPSI server"
+msgstr ""
+
+#: admin/opsi/class_opsiOnDemandList.inc:50
+#: admin/opsi/class_opsiSoftwareList.inc:54
+#: admin/opsi/class_opsiProfile.inc:88
+msgid "OPSI server to use for deployment"
+msgstr ""
+
+#: admin/opsi/class_opsiOnDemandList.inc:54
+#: admin/opsi/class_opsiSoftwareList.inc:58
+#: admin/opsi/class_opsiProductProperties.inc:117
+#: admin/opsi/class_opsiProfile.inc:85 admin/opsi/class_opsiProfile.inc:92
+msgid "Name"
+msgstr ""
+
+#: admin/opsi/class_opsiOnDemandList.inc:54
+#: admin/opsi/class_opsiSoftwareList.inc:58
+#: admin/opsi/class_opsiProfile.inc:92
+msgid "Name of this OPSI profile"
+msgstr ""
+
+#: admin/opsi/class_opsiOnDemandList.inc:58
+msgid "Show details"
+msgstr ""
+
+#: admin/opsi/class_opsiOnDemandList.inc:58
+msgid "Show further information to the user"
+msgstr ""
+
+#: admin/opsi/class_opsiOnDemandList.inc:64
+#: admin/opsi/class_opsiSoftwareList.inc:64
+msgid "Softwares"
+msgstr ""
+
+#: admin/opsi/class_opsiOnDemandList.inc:68
+#: admin/opsi/class_opsiSoftwareList.inc:81
+msgid "Localboot products"
+msgstr ""
+
+#: admin/opsi/class_opsiOnDemandList.inc:68
+msgid "The localboot products to put in this list"
+msgstr ""
+
+#: admin/opsi/class_opsiSoftwareList.inc:32
+msgid "OPSI list"
+msgstr ""
+
+#: admin/opsi/class_opsiSoftwareList.inc:33
+#: admin/opsi/class_opsiSoftwareList.inc:37
+msgid "OPSI software list"
+msgstr ""
+
+#: admin/opsi/class_opsiSoftwareList.inc:68
+msgid "The localboot products to install with this list"
+msgstr ""
+
+#: admin/opsi/class_opsiSoftwareList.inc:114
+#: admin/opsi/class_opsiProductProperties.inc:176
+#: admin/opsi/class_opsiProfile.inc:164
+msgid "Could not contact argonaut server"
+msgstr ""
+
+#: admin/opsi/class_opsiSoftwareList.inc:126
+#: admin/opsi/class_opsiProfile.inc:176 addons/opsi/class_opsiImport.inc:74
+msgid "No mac address"
+msgstr ""
+
+#: admin/opsi/class_opsiSoftwareList.inc:127
+#: admin/opsi/class_opsiProfile.inc:177
+#, php-format
+msgid "Server %s has no mac address configured in the LDAP"
+msgstr ""
+
+#: admin/opsi/class_opsiSoftwareList.inc:133
+#: admin/opsi/class_opsiProfile.inc:149 admin/opsi/class_opsiProfile.inc:183
+#, php-format
+msgid "Could not find %s in the LDAP"
+msgstr ""
+
+#: admin/opsi/class_opsiSoftwareList.inc:141
+#: admin/opsi/class_opsiProductProperties.inc:192
+#: admin/opsi/class_opsiProfile.inc:191
+msgid "Could 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:66 admin/opsi/class_opsiProfile.inc:67
+#: admin/opsi/class_opsiProfile.inc:71
+msgid "OPSI profile"
+msgstr ""
+
+#: admin/opsi/class_opsiProfile.inc:98
+msgid "Entries"
+msgstr ""
+
+#: admin/opsi/class_opsiProfile.inc:101
+msgid "Netboot product"
+msgstr ""
+
+#: admin/opsi/class_opsiProfile.inc:101
+msgid "The netboot product to use for this profile"
+msgstr ""
+
+#: admin/opsi/class_opsiProfile.inc:106
+msgid "Software lists"
+msgstr ""
+
+#: admin/opsi/class_opsiProfile.inc:106
+msgid "Software lists that will be installed with this profile"
+msgstr ""
+
+#: admin/opsi/class_opsiProfile.inc:211
+#, php-format
+msgid "%s (%s)"
+msgstr ""
+
+#: admin/systems/opsi/class_opsiClient.inc:33
+msgid "OPSI client"
+msgstr ""
+
+#: admin/systems/opsi/class_opsiClient.inc:34
+msgid "Edit OPSI client settings"
+msgstr ""
+
+#: admin/systems/opsi/class_opsiClient.inc:46
+msgid "OPSI Client"
+msgstr ""
+
+#: admin/systems/opsi/class_opsiClient.inc:49
+msgid "OPSI Server"
+msgstr ""
+
+#: admin/systems/opsi/class_opsiClient.inc:49
+msgid "The OPSI Server this client is connected to"
+msgstr ""
+
+#: admin/systems/opsi/class_opsiClient.inc:53
+msgid "OPSI Profile"
+msgstr ""
+
+#: admin/systems/opsi/class_opsiClient.inc:53
+msgid "The OPSI Profile to apply to this client"
+msgstr ""
+
+#: admin/systems/opsi/class_opsiClient.inc:95
+msgid "Could not get macAddress for OPSI server !"
+msgstr ""
+
+#: admin/systems/opsi/class_opsiClient.inc:104
+#: admin/systems/opsi/class_opsiClient.inc:191
+msgid "Could not remove OPSI informations"
+msgstr ""
+
+#: admin/systems/opsi/class_opsiClient.inc:148
+#: addons/opsi/class_opsiImport.inc:89
+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"
+msgstr ""
+
+#: admin/systems/services/opsi/class_serviceOPSI.inc:30
+msgid "Services"
+msgstr ""
+
+#: admin/systems/services/opsi/class_serviceOPSI.inc:41
+msgid "OPSI Server informations"
+msgstr ""
+
+#: admin/systems/services/opsi/class_serviceOPSI.inc:44
+msgid "Server URI"
+msgstr ""
+
+#: admin/systems/services/opsi/class_serviceOPSI.inc:44
+msgid "The URI to use for connection"
+msgstr ""
+
+#: admin/systems/services/opsi/class_serviceOPSI.inc:48
+msgid "User"
+msgstr ""
+
+#: admin/systems/services/opsi/class_serviceOPSI.inc:48
+msgid "The user to use for connection"
+msgstr ""
+
+#: admin/systems/services/opsi/class_serviceOPSI.inc:52
+msgid "Password"
+msgstr ""
+
+#: admin/systems/services/opsi/class_serviceOPSI.inc:52
+msgid "The password to use for connection"
+msgstr ""
+
+#: addons/opsi/class_opsiImport.inc:35 addons/opsi/class_opsiImport.inc:39
+msgid "OPSI import"
+msgstr ""
+
+#: addons/opsi/class_opsiImport.inc:36
+msgid "Import windows stations from OPSI into FD"
+msgstr ""
+
+#: addons/opsi/class_opsiImport.inc:63
+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 ""
diff --git a/opsi/locale/en/fusiondirectory.po b/opsi/locale/en/fusiondirectory.po
index 572c6c44122e1a07f04bf01b066aa47c8dfb6bc9..5fe6f38e08031427907252ac18bce8283cf3f04b 100644
--- a/opsi/locale/en/fusiondirectory.po
+++ b/opsi/locale/en/fusiondirectory.po
@@ -6,13 +6,13 @@
 #, fuzzy
 msgid ""
 msgstr ""
-"Project-Id-Version: PACKAGE VERSION\n"
-"Report-Msgid-Bugs-To: documentation@lists.fusiondirectory.org\n"
-"POT-Creation-Date: 2015-03-31 11:49+0200\n"
+"Project-Id-Version: FusionDirectory VERSION\n"
+"Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
+"POT-Creation-Date: 2015-05-30 15:30+0200\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
-"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
-"Language-Team: LANGUAGE <LL@li.org>\n"
-"Language: \n"
+"Last-Translator: FusionDirectory project <contact@fusiondirectory.org>\n"
+"Language-Team: English\n"
+"Language: en\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
diff --git a/opsi/locale/es/fusiondirectory.po b/opsi/locale/es/fusiondirectory.po
index ea2e2bbac507350926575a617f3c87a008901ef7..9bd88eb794a2118e2769c0c5ec6bbc1e1ee61971 100644
--- a/opsi/locale/es/fusiondirectory.po
+++ b/opsi/locale/es/fusiondirectory.po
@@ -5,12 +5,12 @@
 # Translators:
 msgid ""
 msgstr ""
-"Project-Id-Version: FusionDirectory-108\n"
+"Project-Id-Version: FusionDirectory-109\n"
 "Report-Msgid-Bugs-To: documentation@lists.fusiondirectory.org\n"
-"POT-Creation-Date: 2015-03-19 21:45+0100\n"
-"PO-Revision-Date: 2015-02-25 16:03+0000\n"
+"POT-Creation-Date: 2014-12-15 17:47+0100\n"
+"PO-Revision-Date: 2015-02-25 16:04+0000\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>\n"
-"Language-Team: Spanish (http://www.transifex.com/projects/p/FusionDirectory-108/language/es/)\n"
+"Language-Team: Spanish (http://www.transifex.com/projects/p/FusionDirectory-109/language/es/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -117,7 +117,7 @@ msgstr ""
 #: admin/opsi/class_opsiSoftwareList.inc:141
 #: admin/opsi/class_opsiProductProperties.inc:192
 #: admin/opsi/class_opsiProfile.inc:191
-msgid "Failed to contact OPSI server"
+msgid "Could contact OPSI server"
 msgstr ""
 
 #: admin/opsi/class_opsiProfileManagement.inc:33
@@ -274,10 +274,3 @@ 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"
-" managed by it, so if you delete them or deactivate their OPSI tab, they "
-"will be removed from OPSI."
-msgstr ""
diff --git a/opsi/locale/es_VE/fusiondirectory.po b/opsi/locale/es_VE/fusiondirectory.po
index bf5fb9436aa5f00719bce8bb073963e12c64d27b..826d6514035ebc7c5bc0e16b71ec8052458dc332 100644
--- a/opsi/locale/es_VE/fusiondirectory.po
+++ b/opsi/locale/es_VE/fusiondirectory.po
@@ -5,12 +5,12 @@
 # Translators:
 msgid ""
 msgstr ""
-"Project-Id-Version: FusionDirectory-108\n"
+"Project-Id-Version: FusionDirectory-109\n"
 "Report-Msgid-Bugs-To: documentation@lists.fusiondirectory.org\n"
-"POT-Creation-Date: 2015-03-19 21:45+0100\n"
-"PO-Revision-Date: 2015-02-25 16:03+0000\n"
+"POT-Creation-Date: 2014-12-15 17:47+0100\n"
+"PO-Revision-Date: 2015-02-25 16:04+0000\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>\n"
-"Language-Team: Spanish (Venezuela) (http://www.transifex.com/projects/p/FusionDirectory-108/language/es_VE/)\n"
+"Language-Team: Spanish (Venezuela) (http://www.transifex.com/projects/p/FusionDirectory-109/language/es_VE/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -117,7 +117,7 @@ msgstr ""
 #: admin/opsi/class_opsiSoftwareList.inc:141
 #: admin/opsi/class_opsiProductProperties.inc:192
 #: admin/opsi/class_opsiProfile.inc:191
-msgid "Failed to contact OPSI server"
+msgid "Could contact OPSI server"
 msgstr ""
 
 #: admin/opsi/class_opsiProfileManagement.inc:33
@@ -274,10 +274,3 @@ 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"
-" managed by it, so if you delete them or deactivate their OPSI tab, they "
-"will be removed from OPSI."
-msgstr ""
diff --git a/opsi/locale/fa_IR/fusiondirectory.po b/opsi/locale/fa_IR/fusiondirectory.po
index 6d5796e8626a0758b6fa2680f1e578e2b0997ff2..cdd2708cab13bb26b6797476b3983a014b4a183c 100644
--- a/opsi/locale/fa_IR/fusiondirectory.po
+++ b/opsi/locale/fa_IR/fusiondirectory.po
@@ -5,12 +5,12 @@
 # Translators:
 msgid ""
 msgstr ""
-"Project-Id-Version: FusionDirectory-108\n"
+"Project-Id-Version: FusionDirectory-109\n"
 "Report-Msgid-Bugs-To: documentation@lists.fusiondirectory.org\n"
-"POT-Creation-Date: 2015-03-19 21:45+0100\n"
-"PO-Revision-Date: 2015-02-25 15:51+0000\n"
+"POT-Creation-Date: 2014-12-15 17:47+0100\n"
+"PO-Revision-Date: 2014-12-15 17:01+0000\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>\n"
-"Language-Team: Persian (Iran) (http://www.transifex.com/projects/p/FusionDirectory-108/language/fa_IR/)\n"
+"Language-Team: Persian (Iran) (http://www.transifex.com/projects/p/FusionDirectory-109/language/fa_IR/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -117,7 +117,7 @@ msgstr ""
 #: admin/opsi/class_opsiSoftwareList.inc:141
 #: admin/opsi/class_opsiProductProperties.inc:192
 #: admin/opsi/class_opsiProfile.inc:191
-msgid "Failed to contact OPSI server"
+msgid "Could contact OPSI server"
 msgstr ""
 
 #: admin/opsi/class_opsiProfileManagement.inc:33
@@ -274,10 +274,3 @@ 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"
-" managed by it, so if you delete them or deactivate their OPSI tab, they "
-"will be removed from OPSI."
-msgstr ""
diff --git a/opsi/locale/fr/fusiondirectory.po b/opsi/locale/fr/fusiondirectory.po
index 38568cc8f328c850cd8cccb756b8628d705d2cae..e0348fb3e901b5168834a365b5c734cab09cd728 100644
--- a/opsi/locale/fr/fusiondirectory.po
+++ b/opsi/locale/fr/fusiondirectory.po
@@ -3,21 +3,14 @@
 # This file is distributed under the same license as the PACKAGE package.
 # 
 # Translators:
-# gallak <antoine.gallavardin@free.fr>, 2013
-# Benoit Mortier <benoit.mortier@opensides.be>, 2015
-# MCMic, 2014
-# fusiondirectory <contact@fusiondirectory.org>, 2013-2014
-# fusiondirectory <contact@fusiondirectory.org>, 2013
-# gallak <antoine.gallavardin@free.fr>, 2013
-# MCMic, 2014
 msgid ""
 msgstr ""
-"Project-Id-Version: FusionDirectory-108\n"
+"Project-Id-Version: FusionDirectory-109\n"
 "Report-Msgid-Bugs-To: documentation@lists.fusiondirectory.org\n"
-"POT-Creation-Date: 2015-03-19 21:45+0100\n"
-"PO-Revision-Date: 2015-02-25 17:21+0000\n"
-"Last-Translator: Benoit Mortier <benoit.mortier@opensides.be>\n"
-"Language-Team: French (http://www.transifex.com/projects/p/FusionDirectory-108/language/fr/)\n"
+"POT-Creation-Date: 2014-12-15 17:47+0100\n"
+"PO-Revision-Date: 2015-02-25 16:04+0000\n"
+"Last-Translator: fusiondirectory <contact@fusiondirectory.org>\n"
+"Language-Team: French (http://www.transifex.com/projects/p/FusionDirectory-109/language/fr/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -48,7 +41,7 @@ msgstr "Serveur OPSI"
 #: admin/opsi/class_opsiSoftwareList.inc:54
 #: admin/opsi/class_opsiProfile.inc:88
 msgid "OPSI server to use for deployment"
-msgstr "Serveur OPSI Ã  utiliser pour le dÃ©ploiement"
+msgstr "Serveur OPSI a utiliser pour le dÃ©ploiement"
 
 #: admin/opsi/class_opsiOnDemandList.inc:54
 #: admin/opsi/class_opsiSoftwareList.inc:58
@@ -69,7 +62,7 @@ msgstr "Montrer les dÃ©tails"
 
 #: admin/opsi/class_opsiOnDemandList.inc:58
 msgid "Show further information to the user"
-msgstr "Montrer plus d'informations Ã  l'utilisateur"
+msgstr "Montrer plus d'informations Ã  ,l'utilisateur"
 
 #: admin/opsi/class_opsiOnDemandList.inc:64
 #: admin/opsi/class_opsiSoftwareList.inc:64
@@ -79,7 +72,7 @@ msgstr "Logiciels"
 #: admin/opsi/class_opsiOnDemandList.inc:68
 #: admin/opsi/class_opsiSoftwareList.inc:81
 msgid "Localboot products"
-msgstr "Produits localboot"
+msgstr "Produit localboot OPSI"
 
 #: admin/opsi/class_opsiOnDemandList.inc:68
 msgid "The localboot products to put in this list"
@@ -92,7 +85,7 @@ msgstr "Liste OPSI"
 #: admin/opsi/class_opsiSoftwareList.inc:33
 #: admin/opsi/class_opsiSoftwareList.inc:37
 msgid "OPSI software list"
-msgstr "Liste de logiciels OPSI"
+msgstr "Liste des logiciels OPSI"
 
 #: admin/opsi/class_opsiSoftwareList.inc:68
 msgid "The localboot products to install with this list"
@@ -113,7 +106,7 @@ msgstr "Pas d'adresse mac"
 #: admin/opsi/class_opsiProfile.inc:177
 #, php-format
 msgid "Server %s has no mac address configured in the LDAP"
-msgstr "Le serveur %s n'a pas d'adresse mac configurÃ©e dans le LDAP"
+msgstr "Le serveur %s n'a pas d'adresse mac configure dans le LDAP"
 
 #: admin/opsi/class_opsiSoftwareList.inc:133
 #: admin/opsi/class_opsiProfile.inc:149 admin/opsi/class_opsiProfile.inc:183
@@ -124,7 +117,7 @@ msgstr "Impossible de trouver %s dans l'annuaire LDAP"
 #: admin/opsi/class_opsiSoftwareList.inc:141
 #: admin/opsi/class_opsiProductProperties.inc:192
 #: admin/opsi/class_opsiProfile.inc:191
-msgid "Failed to contact OPSI server"
+msgid "Could contact OPSI server"
 msgstr "Impossible de contacter le serveur OPSI"
 
 #: admin/opsi/class_opsiProfileManagement.inc:33
@@ -156,7 +149,7 @@ msgstr "EntrÃ©es"
 
 #: admin/opsi/class_opsiProfile.inc:101
 msgid "Netboot product"
-msgstr "Produit netboot"
+msgstr "Produit netboot OPSI"
 
 #: admin/opsi/class_opsiProfile.inc:101
 msgid "The netboot product to use for this profile"
@@ -164,7 +157,7 @@ msgstr "Le produit netboot Ã  utiliser pour ce profil"
 
 #: admin/opsi/class_opsiProfile.inc:106
 msgid "Software lists"
-msgstr "Listes de logiciels"
+msgstr "Liste des logiciels OPSI"
 
 #: admin/opsi/class_opsiProfile.inc:106
 msgid "Software lists that will be installed with this profile"
@@ -193,7 +186,7 @@ msgstr "Serveur OPSI"
 
 #: admin/systems/opsi/class_opsiClient.inc:49
 msgid "The OPSI Server this client is connected to"
-msgstr "Serveur OPSI sur lequel ce client est connectÃ©"
+msgstr "Serveur OPSI sur lequel le client est connectÃ©"
 
 #: admin/systems/opsi/class_opsiClient.inc:53
 msgid "OPSI Profile"
@@ -224,11 +217,11 @@ msgstr "Service OPSI"
 
 #: admin/systems/services/opsi/class_serviceOPSI.inc:30
 msgid "Services"
-msgstr "Services"
+msgstr "Service"
 
 #: admin/systems/services/opsi/class_serviceOPSI.inc:41
 msgid "OPSI Server informations"
-msgstr "Informations du serveur OPSI"
+msgstr "Informations sur le serveur OPSI"
 
 #: admin/systems/services/opsi/class_serviceOPSI.inc:44
 msgid "Server URI"
@@ -236,7 +229,7 @@ msgstr "URI du serveur"
 
 #: admin/systems/services/opsi/class_serviceOPSI.inc:44
 msgid "The URI to use for connection"
-msgstr "URI utilisÃ© pour la connexion"
+msgstr "URI utilisÃ© pour la connexion au serveur"
 
 #: admin/systems/services/opsi/class_serviceOPSI.inc:48
 msgid "User"
@@ -244,7 +237,7 @@ msgstr "Utilisateur"
 
 #: admin/systems/services/opsi/class_serviceOPSI.inc:48
 msgid "The user to use for connection"
-msgstr "Nom du compte Ã  utiliser pour la connexion"
+msgstr "Nom du compte utilisÃ© pour la connexion"
 
 #: admin/systems/services/opsi/class_serviceOPSI.inc:52
 msgid "Password"
@@ -252,7 +245,7 @@ msgstr "Mot de passe"
 
 #: admin/systems/services/opsi/class_serviceOPSI.inc:52
 msgid "The password to use for connection"
-msgstr "Mot de passe Ã  utiliser pour la connexion"
+msgstr "Mot de passe utilisÃ© pour la connexion"
 
 #: addons/opsi/class_opsiImport.inc:35 addons/opsi/class_opsiImport.inc:39
 msgid "OPSI import"
@@ -260,7 +253,7 @@ msgstr "Importation OPSI"
 
 #: addons/opsi/class_opsiImport.inc:36
 msgid "Import windows stations from OPSI into FD"
-msgstr "Importer les stations Windows de OPSI dans FD"
+msgstr "Importer stations Windows de OPSI dans FD"
 
 #: addons/opsi/class_opsiImport.inc:63
 msgid "Argonaut server is not available"
@@ -268,7 +261,7 @@ msgstr "Serveur Argonaut indisponible"
 
 #: config/opsi/class_opsiConfig.inc:28
 msgid "OPSI configuration"
-msgstr "Configuration OPSI"
+msgstr "Informations sur le serveur OPSI"
 
 #: config/opsi/class_opsiConfig.inc:29
 msgid "FusionDirectory OPSI plugin configuration"
@@ -276,15 +269,8 @@ msgstr "Configuration du plugin OPSI"
 
 #: config/opsi/class_opsiConfig.inc:45
 msgid "OPSI RDN"
-msgstr "Branche OPSI"
+msgstr "RDN OPSI"
 
 #: config/opsi/class_opsiConfig.inc:45
 msgid "Branch in which OPSI profiles will be stored"
-msgstr "Branche oÃ¹ seront stockÃ©s les profils OPSI"
-
-#: addons/opsi/opsiimport.tpl.c:2
-msgid ""
-"Warning : Once you import your OPSI hosts into FusionDirectory, they will be"
-" managed by it, so if you delete them or deactivate their OPSI tab, they "
-"will be removed from OPSI."
-msgstr "Attention: Une fois que vous importez vos hÃ´tes OPSI dans FusionDirectory, ils seront gÃ©rÃ©s par lui, donc si vous supprimez ou dÃ©sactivez leur onglet OPSI, ils seront retirÃ©s de OPSI."
+msgstr "Branche oÃ¹ seront stockÃ©s les profiles OPSI"
diff --git a/opsi/locale/id/fusiondirectory.po b/opsi/locale/id/fusiondirectory.po
index 6543ed7682d2456a31f27c662fed5f9184dc5ded..9f23dae40ae65e3537a59fe1d9d8dd369c7053a4 100644
--- a/opsi/locale/id/fusiondirectory.po
+++ b/opsi/locale/id/fusiondirectory.po
@@ -5,12 +5,12 @@
 # Translators:
 msgid ""
 msgstr ""
-"Project-Id-Version: FusionDirectory-108\n"
+"Project-Id-Version: FusionDirectory-109\n"
 "Report-Msgid-Bugs-To: documentation@lists.fusiondirectory.org\n"
-"POT-Creation-Date: 2015-03-19 21:45+0100\n"
-"PO-Revision-Date: 2015-02-25 15:51+0000\n"
+"POT-Creation-Date: 2014-12-15 17:47+0100\n"
+"PO-Revision-Date: 2014-12-15 17:01+0000\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>\n"
-"Language-Team: Indonesian (http://www.transifex.com/projects/p/FusionDirectory-108/language/id/)\n"
+"Language-Team: Indonesian (http://www.transifex.com/projects/p/FusionDirectory-109/language/id/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -117,7 +117,7 @@ msgstr ""
 #: admin/opsi/class_opsiSoftwareList.inc:141
 #: admin/opsi/class_opsiProductProperties.inc:192
 #: admin/opsi/class_opsiProfile.inc:191
-msgid "Failed to contact OPSI server"
+msgid "Could contact OPSI server"
 msgstr ""
 
 #: admin/opsi/class_opsiProfileManagement.inc:33
@@ -274,10 +274,3 @@ 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"
-" managed by it, so if you delete them or deactivate their OPSI tab, they "
-"will be removed from OPSI."
-msgstr ""
diff --git a/opsi/locale/it/fusiondirectory.po b/opsi/locale/it/fusiondirectory.po
index 12036f39580017a560d644318bfe9253aa77c9c6..80be5758bed90ea644cf7bdf0b26cf84069aad3c 100644
--- a/opsi/locale/it/fusiondirectory.po
+++ b/opsi/locale/it/fusiondirectory.po
@@ -3,16 +3,14 @@
 # This file is distributed under the same license as the PACKAGE package.
 # 
 # Translators:
-# poterealpopolo <giuliano@opensides.be>, 2013
-# poterealpopolo <giuliano@opensides.be>, 2013
 msgid ""
 msgstr ""
-"Project-Id-Version: FusionDirectory-108\n"
+"Project-Id-Version: FusionDirectory-109\n"
 "Report-Msgid-Bugs-To: documentation@lists.fusiondirectory.org\n"
-"POT-Creation-Date: 2015-03-19 21:45+0100\n"
-"PO-Revision-Date: 2015-02-25 16:03+0000\n"
+"POT-Creation-Date: 2014-12-15 17:47+0100\n"
+"PO-Revision-Date: 2015-02-25 16:04+0000\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>\n"
-"Language-Team: Italian (http://www.transifex.com/projects/p/FusionDirectory-108/language/it/)\n"
+"Language-Team: Italian (http://www.transifex.com/projects/p/FusionDirectory-109/language/it/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -119,8 +117,8 @@ msgstr "Impossibile trovare %s nell'annuario LDAP"
 #: admin/opsi/class_opsiSoftwareList.inc:141
 #: admin/opsi/class_opsiProductProperties.inc:192
 #: admin/opsi/class_opsiProfile.inc:191
-msgid "Failed to contact OPSI server"
-msgstr ""
+msgid "Could contact OPSI server"
+msgstr "Potrebbe contattare il server OPSI"
 
 #: admin/opsi/class_opsiProfileManagement.inc:33
 #: config/opsi/class_opsiConfig.inc:42
@@ -276,10 +274,3 @@ 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"
-" managed by it, so if you delete them or deactivate their OPSI tab, they "
-"will be removed from OPSI."
-msgstr ""
diff --git a/opsi/locale/lv/fusiondirectory.po b/opsi/locale/lv/fusiondirectory.po
index 0b3dd1b55c89ba3be3bc3e9d90336e8e5897e1d9..04969e762ab1a426aff4781dbb4c0006f3790a73 100644
--- a/opsi/locale/lv/fusiondirectory.po
+++ b/opsi/locale/lv/fusiondirectory.po
@@ -5,12 +5,12 @@
 # Translators:
 msgid ""
 msgstr ""
-"Project-Id-Version: FusionDirectory-108\n"
+"Project-Id-Version: FusionDirectory-109\n"
 "Report-Msgid-Bugs-To: documentation@lists.fusiondirectory.org\n"
-"POT-Creation-Date: 2015-03-19 21:45+0100\n"
-"PO-Revision-Date: 2015-02-25 15:51+0000\n"
+"POT-Creation-Date: 2014-12-15 17:47+0100\n"
+"PO-Revision-Date: 2014-12-15 17:01+0000\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>\n"
-"Language-Team: Latvian (http://www.transifex.com/projects/p/FusionDirectory-108/language/lv/)\n"
+"Language-Team: Latvian (http://www.transifex.com/projects/p/FusionDirectory-109/language/lv/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -117,7 +117,7 @@ msgstr ""
 #: admin/opsi/class_opsiSoftwareList.inc:141
 #: admin/opsi/class_opsiProductProperties.inc:192
 #: admin/opsi/class_opsiProfile.inc:191
-msgid "Failed to contact OPSI server"
+msgid "Could contact OPSI server"
 msgstr ""
 
 #: admin/opsi/class_opsiProfileManagement.inc:33
@@ -274,10 +274,3 @@ 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"
-" managed by it, so if you delete them or deactivate their OPSI tab, they "
-"will be removed from OPSI."
-msgstr ""
diff --git a/opsi/locale/nb/fusiondirectory.po b/opsi/locale/nb/fusiondirectory.po
index a5889fe2f0cc0333014af8ad2b321ac4296c1501..32a17b84d0ae5818b8de3a6d12d8084c170d2b1f 100644
--- a/opsi/locale/nb/fusiondirectory.po
+++ b/opsi/locale/nb/fusiondirectory.po
@@ -5,12 +5,12 @@
 # Translators:
 msgid ""
 msgstr ""
-"Project-Id-Version: FusionDirectory-108\n"
+"Project-Id-Version: FusionDirectory-109\n"
 "Report-Msgid-Bugs-To: documentation@lists.fusiondirectory.org\n"
-"POT-Creation-Date: 2015-03-19 21:45+0100\n"
-"PO-Revision-Date: 2015-02-25 16:03+0000\n"
+"POT-Creation-Date: 2014-12-15 17:47+0100\n"
+"PO-Revision-Date: 2015-02-25 16:04+0000\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>\n"
-"Language-Team: Norwegian BokmÃ¥l (http://www.transifex.com/projects/p/FusionDirectory-108/language/nb/)\n"
+"Language-Team: Norwegian BokmÃ¥l (http://www.transifex.com/projects/p/FusionDirectory-109/language/nb/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -117,7 +117,7 @@ msgstr ""
 #: admin/opsi/class_opsiSoftwareList.inc:141
 #: admin/opsi/class_opsiProductProperties.inc:192
 #: admin/opsi/class_opsiProfile.inc:191
-msgid "Failed to contact OPSI server"
+msgid "Could contact OPSI server"
 msgstr ""
 
 #: admin/opsi/class_opsiProfileManagement.inc:33
@@ -274,10 +274,3 @@ 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"
-" managed by it, so if you delete them or deactivate their OPSI tab, they "
-"will be removed from OPSI."
-msgstr ""
diff --git a/opsi/locale/nl/fusiondirectory.po b/opsi/locale/nl/fusiondirectory.po
index 1cd6aa2e7bb28187f5ad10503a8918014c518568..ec70f1b87c6517433d4b9195badfec1e4240f345 100644
--- a/opsi/locale/nl/fusiondirectory.po
+++ b/opsi/locale/nl/fusiondirectory.po
@@ -5,12 +5,12 @@
 # Translators:
 msgid ""
 msgstr ""
-"Project-Id-Version: FusionDirectory-108\n"
+"Project-Id-Version: FusionDirectory-109\n"
 "Report-Msgid-Bugs-To: documentation@lists.fusiondirectory.org\n"
-"POT-Creation-Date: 2015-03-19 21:45+0100\n"
-"PO-Revision-Date: 2015-02-25 16:03+0000\n"
+"POT-Creation-Date: 2014-12-15 17:47+0100\n"
+"PO-Revision-Date: 2015-02-25 16:04+0000\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>\n"
-"Language-Team: Dutch (http://www.transifex.com/projects/p/FusionDirectory-108/language/nl/)\n"
+"Language-Team: Dutch (http://www.transifex.com/projects/p/FusionDirectory-109/language/nl/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -117,7 +117,7 @@ msgstr ""
 #: admin/opsi/class_opsiSoftwareList.inc:141
 #: admin/opsi/class_opsiProductProperties.inc:192
 #: admin/opsi/class_opsiProfile.inc:191
-msgid "Failed to contact OPSI server"
+msgid "Could contact OPSI server"
 msgstr ""
 
 #: admin/opsi/class_opsiProfileManagement.inc:33
@@ -274,10 +274,3 @@ 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"
-" managed by it, so if you delete them or deactivate their OPSI tab, they "
-"will be removed from OPSI."
-msgstr ""
diff --git a/opsi/locale/pl/fusiondirectory.po b/opsi/locale/pl/fusiondirectory.po
index 86743665f06d607ca8f8a3a1768f0f82a429f306..130b0aa059c9e7ab7e15b6d4321e560690818b11 100644
--- a/opsi/locale/pl/fusiondirectory.po
+++ b/opsi/locale/pl/fusiondirectory.po
@@ -5,12 +5,12 @@
 # Translators:
 msgid ""
 msgstr ""
-"Project-Id-Version: FusionDirectory-108\n"
+"Project-Id-Version: FusionDirectory-109\n"
 "Report-Msgid-Bugs-To: documentation@lists.fusiondirectory.org\n"
-"POT-Creation-Date: 2015-03-19 21:45+0100\n"
-"PO-Revision-Date: 2015-02-25 16:03+0000\n"
+"POT-Creation-Date: 2014-12-15 17:47+0100\n"
+"PO-Revision-Date: 2015-02-25 16:04+0000\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>\n"
-"Language-Team: Polish (http://www.transifex.com/projects/p/FusionDirectory-108/language/pl/)\n"
+"Language-Team: Polish (http://www.transifex.com/projects/p/FusionDirectory-109/language/pl/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -117,7 +117,7 @@ msgstr ""
 #: admin/opsi/class_opsiSoftwareList.inc:141
 #: admin/opsi/class_opsiProductProperties.inc:192
 #: admin/opsi/class_opsiProfile.inc:191
-msgid "Failed to contact OPSI server"
+msgid "Could contact OPSI server"
 msgstr ""
 
 #: admin/opsi/class_opsiProfileManagement.inc:33
@@ -274,10 +274,3 @@ 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"
-" managed by it, so if you delete them or deactivate their OPSI tab, they "
-"will be removed from OPSI."
-msgstr ""
diff --git a/opsi/locale/pt/fusiondirectory.po b/opsi/locale/pt/fusiondirectory.po
index 109c7a1e1b8e38e8dcad7fc64ed856e11f526ff3..541a50a868421f46ac8dc73a6723864753c2d9e1 100644
--- a/opsi/locale/pt/fusiondirectory.po
+++ b/opsi/locale/pt/fusiondirectory.po
@@ -5,12 +5,12 @@
 # Translators:
 msgid ""
 msgstr ""
-"Project-Id-Version: FusionDirectory-108\n"
+"Project-Id-Version: FusionDirectory-109\n"
 "Report-Msgid-Bugs-To: documentation@lists.fusiondirectory.org\n"
-"POT-Creation-Date: 2015-03-19 21:45+0100\n"
-"PO-Revision-Date: 2015-02-25 16:03+0000\n"
+"POT-Creation-Date: 2014-12-15 17:47+0100\n"
+"PO-Revision-Date: 2015-02-25 16:04+0000\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>\n"
-"Language-Team: Portuguese (http://www.transifex.com/projects/p/FusionDirectory-108/language/pt/)\n"
+"Language-Team: Portuguese (http://www.transifex.com/projects/p/FusionDirectory-109/language/pt/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -117,7 +117,7 @@ msgstr ""
 #: admin/opsi/class_opsiSoftwareList.inc:141
 #: admin/opsi/class_opsiProductProperties.inc:192
 #: admin/opsi/class_opsiProfile.inc:191
-msgid "Failed to contact OPSI server"
+msgid "Could contact OPSI server"
 msgstr ""
 
 #: admin/opsi/class_opsiProfileManagement.inc:33
@@ -274,10 +274,3 @@ 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"
-" managed by it, so if you delete them or deactivate their OPSI tab, they "
-"will be removed from OPSI."
-msgstr ""
diff --git a/opsi/locale/pt_BR/fusiondirectory.po b/opsi/locale/pt_BR/fusiondirectory.po
index fac94db89aad426ba6b1fa257019840f612a52ff..9e647472a73b9b0e3aa1e79a2735822cf9d2340b 100644
--- a/opsi/locale/pt_BR/fusiondirectory.po
+++ b/opsi/locale/pt_BR/fusiondirectory.po
@@ -3,15 +3,14 @@
 # This file is distributed under the same license as the PACKAGE package.
 # 
 # Translators:
-# ALEJANDRO BARRIOS <alejandrobarrios@interlegis.leg.br>, 2014
 msgid ""
 msgstr ""
-"Project-Id-Version: FusionDirectory-108\n"
+"Project-Id-Version: FusionDirectory-109\n"
 "Report-Msgid-Bugs-To: documentation@lists.fusiondirectory.org\n"
-"POT-Creation-Date: 2015-03-19 21:45+0100\n"
-"PO-Revision-Date: 2015-02-25 16:03+0000\n"
+"POT-Creation-Date: 2014-12-15 17:47+0100\n"
+"PO-Revision-Date: 2015-02-25 16:04+0000\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>\n"
-"Language-Team: Portuguese (Brazil) (http://www.transifex.com/projects/p/FusionDirectory-108/language/pt_BR/)\n"
+"Language-Team: Portuguese (Brazil) (http://www.transifex.com/projects/p/FusionDirectory-109/language/pt_BR/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -118,7 +117,7 @@ msgstr ""
 #: admin/opsi/class_opsiSoftwareList.inc:141
 #: admin/opsi/class_opsiProductProperties.inc:192
 #: admin/opsi/class_opsiProfile.inc:191
-msgid "Failed to contact OPSI server"
+msgid "Could contact OPSI server"
 msgstr ""
 
 #: admin/opsi/class_opsiProfileManagement.inc:33
@@ -275,10 +274,3 @@ 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"
-" managed by it, so if you delete them or deactivate their OPSI tab, they "
-"will be removed from OPSI."
-msgstr ""
diff --git a/opsi/locale/ru/fusiondirectory.po b/opsi/locale/ru/fusiondirectory.po
index 10bf485980f8509d901c21ff5b05e9621af725ef..022cfe21dfce45b8dceabd062638f10aa2e7914c 100644
--- a/opsi/locale/ru/fusiondirectory.po
+++ b/opsi/locale/ru/fusiondirectory.po
@@ -5,17 +5,17 @@
 # Translators:
 msgid ""
 msgstr ""
-"Project-Id-Version: FusionDirectory-108\n"
+"Project-Id-Version: FusionDirectory-109\n"
 "Report-Msgid-Bugs-To: documentation@lists.fusiondirectory.org\n"
-"POT-Creation-Date: 2015-03-19 21:45+0100\n"
-"PO-Revision-Date: 2015-03-12 07:33+0000\n"
+"POT-Creation-Date: 2014-12-15 17:47+0100\n"
+"PO-Revision-Date: 2015-04-07 13:01+0000\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>\n"
-"Language-Team: Russian (http://www.transifex.com/projects/p/FusionDirectory-108/language/ru/)\n"
+"Language-Team: Russian (http://www.transifex.com/projects/p/FusionDirectory-109/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=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);\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/opsi/class_opsiOnDemandList.inc:28
 #: admin/opsi/class_opsiOnDemandList.inc:33
@@ -117,7 +117,7 @@ msgstr ""
 #: admin/opsi/class_opsiSoftwareList.inc:141
 #: admin/opsi/class_opsiProductProperties.inc:192
 #: admin/opsi/class_opsiProfile.inc:191
-msgid "Failed to contact OPSI server"
+msgid "Could contact OPSI server"
 msgstr ""
 
 #: admin/opsi/class_opsiProfileManagement.inc:33
@@ -274,10 +274,3 @@ 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"
-" managed by it, so if you delete them or deactivate their OPSI tab, they "
-"will be removed from OPSI."
-msgstr ""
diff --git a/opsi/locale/ru@petr1708/fusiondirectory.po b/opsi/locale/ru@petr1708/fusiondirectory.po
index c8734da343f7b0bd47d07787b1a14c084603a586..ae44807870726bdb4db73bcbff69da0e7eb441c9 100644
--- a/opsi/locale/ru@petr1708/fusiondirectory.po
+++ b/opsi/locale/ru@petr1708/fusiondirectory.po
@@ -5,17 +5,17 @@
 # Translators:
 msgid ""
 msgstr ""
-"Project-Id-Version: FusionDirectory-108\n"
+"Project-Id-Version: FusionDirectory-109\n"
 "Report-Msgid-Bugs-To: documentation@lists.fusiondirectory.org\n"
-"POT-Creation-Date: 2015-03-19 21:45+0100\n"
-"PO-Revision-Date: 2015-02-25 15:51+0000\n"
+"POT-Creation-Date: 2014-12-15 17:47+0100\n"
+"PO-Revision-Date: 2014-12-15 17:01+0000\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>\n"
-"Language-Team: Russian Petrine orthography (http://www.transifex.com/projects/p/FusionDirectory-108/language/ru@petr1708/)\n"
+"Language-Team: Russian Petrine orthography (http://www.transifex.com/projects/p/FusionDirectory-109/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=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);\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/opsi/class_opsiOnDemandList.inc:28
 #: admin/opsi/class_opsiOnDemandList.inc:33
@@ -117,7 +117,7 @@ msgstr ""
 #: admin/opsi/class_opsiSoftwareList.inc:141
 #: admin/opsi/class_opsiProductProperties.inc:192
 #: admin/opsi/class_opsiProfile.inc:191
-msgid "Failed to contact OPSI server"
+msgid "Could contact OPSI server"
 msgstr ""
 
 #: admin/opsi/class_opsiProfileManagement.inc:33
@@ -274,10 +274,3 @@ 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"
-" managed by it, so if you delete them or deactivate their OPSI tab, they "
-"will be removed from OPSI."
-msgstr ""
diff --git a/opsi/locale/sv/fusiondirectory.po b/opsi/locale/sv/fusiondirectory.po
index 9c28785b119848b6d308d02735586b177232b076..22edb4e4e9563fb45ab8c4557fcd72efee4df256 100644
--- a/opsi/locale/sv/fusiondirectory.po
+++ b/opsi/locale/sv/fusiondirectory.po
@@ -5,12 +5,12 @@
 # Translators:
 msgid ""
 msgstr ""
-"Project-Id-Version: FusionDirectory-108\n"
+"Project-Id-Version: FusionDirectory-109\n"
 "Report-Msgid-Bugs-To: documentation@lists.fusiondirectory.org\n"
-"POT-Creation-Date: 2015-03-19 21:45+0100\n"
-"PO-Revision-Date: 2015-02-25 16:03+0000\n"
+"POT-Creation-Date: 2014-12-15 17:47+0100\n"
+"PO-Revision-Date: 2015-02-25 16:04+0000\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>\n"
-"Language-Team: Swedish (http://www.transifex.com/projects/p/FusionDirectory-108/language/sv/)\n"
+"Language-Team: Swedish (http://www.transifex.com/projects/p/FusionDirectory-109/language/sv/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -117,7 +117,7 @@ msgstr ""
 #: admin/opsi/class_opsiSoftwareList.inc:141
 #: admin/opsi/class_opsiProductProperties.inc:192
 #: admin/opsi/class_opsiProfile.inc:191
-msgid "Failed to contact OPSI server"
+msgid "Could contact OPSI server"
 msgstr ""
 
 #: admin/opsi/class_opsiProfileManagement.inc:33
@@ -274,10 +274,3 @@ 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"
-" managed by it, so if you delete them or deactivate their OPSI tab, they "
-"will be removed from OPSI."
-msgstr ""
diff --git a/opsi/locale/ug/fusiondirectory.po b/opsi/locale/ug/fusiondirectory.po
index f21ad03073c3eb57b3644b900d3251afaa83b257..8fae31245032ee116a2d62e6232251a963e14cfa 100644
--- a/opsi/locale/ug/fusiondirectory.po
+++ b/opsi/locale/ug/fusiondirectory.po
@@ -5,12 +5,12 @@
 # Translators:
 msgid ""
 msgstr ""
-"Project-Id-Version: FusionDirectory-108\n"
+"Project-Id-Version: FusionDirectory-109\n"
 "Report-Msgid-Bugs-To: documentation@lists.fusiondirectory.org\n"
-"POT-Creation-Date: 2015-03-19 21:45+0100\n"
-"PO-Revision-Date: 2015-02-25 15:51+0000\n"
+"POT-Creation-Date: 2014-12-15 17:47+0100\n"
+"PO-Revision-Date: 2014-12-15 17:01+0000\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>\n"
-"Language-Team: Uighur (http://www.transifex.com/projects/p/FusionDirectory-108/language/ug/)\n"
+"Language-Team: Uighur (http://www.transifex.com/projects/p/FusionDirectory-109/language/ug/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -117,7 +117,7 @@ msgstr ""
 #: admin/opsi/class_opsiSoftwareList.inc:141
 #: admin/opsi/class_opsiProductProperties.inc:192
 #: admin/opsi/class_opsiProfile.inc:191
-msgid "Failed to contact OPSI server"
+msgid "Could contact OPSI server"
 msgstr ""
 
 #: admin/opsi/class_opsiProfileManagement.inc:33
@@ -274,10 +274,3 @@ 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"
-" managed by it, so if you delete them or deactivate their OPSI tab, they "
-"will be removed from OPSI."
-msgstr ""
diff --git a/opsi/locale/vi_VN/fusiondirectory.po b/opsi/locale/vi_VN/fusiondirectory.po
index 91f732909b7900bf03442cba67e2ada410a540f1..2e20a30d7375a0cc5e550202cc3c5d3a0adaacb5 100644
--- a/opsi/locale/vi_VN/fusiondirectory.po
+++ b/opsi/locale/vi_VN/fusiondirectory.po
@@ -5,12 +5,12 @@
 # Translators:
 msgid ""
 msgstr ""
-"Project-Id-Version: FusionDirectory-108\n"
+"Project-Id-Version: FusionDirectory-109\n"
 "Report-Msgid-Bugs-To: documentation@lists.fusiondirectory.org\n"
-"POT-Creation-Date: 2015-03-19 21:45+0100\n"
-"PO-Revision-Date: 2015-02-25 16:03+0000\n"
+"POT-Creation-Date: 2014-12-15 17:47+0100\n"
+"PO-Revision-Date: 2015-02-25 16:04+0000\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>\n"
-"Language-Team: Vietnamese (Viet Nam) (http://www.transifex.com/projects/p/FusionDirectory-108/language/vi_VN/)\n"
+"Language-Team: Vietnamese (Viet Nam) (http://www.transifex.com/projects/p/FusionDirectory-109/language/vi_VN/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -117,7 +117,7 @@ msgstr ""
 #: admin/opsi/class_opsiSoftwareList.inc:141
 #: admin/opsi/class_opsiProductProperties.inc:192
 #: admin/opsi/class_opsiProfile.inc:191
-msgid "Failed to contact OPSI server"
+msgid "Could contact OPSI server"
 msgstr ""
 
 #: admin/opsi/class_opsiProfileManagement.inc:33
@@ -274,10 +274,3 @@ 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"
-" managed by it, so if you delete them or deactivate their OPSI tab, they "
-"will be removed from OPSI."
-msgstr ""
diff --git a/opsi/locale/zh/fusiondirectory.po b/opsi/locale/zh/fusiondirectory.po
index e9b070ad99030ab2eaaa0d7a94b74c10ae7dd0eb..5723653d838094a42d6fe9cc8394d5bef5d06aef 100644
--- a/opsi/locale/zh/fusiondirectory.po
+++ b/opsi/locale/zh/fusiondirectory.po
@@ -5,12 +5,12 @@
 # Translators:
 msgid ""
 msgstr ""
-"Project-Id-Version: FusionDirectory-108\n"
+"Project-Id-Version: FusionDirectory-109\n"
 "Report-Msgid-Bugs-To: documentation@lists.fusiondirectory.org\n"
-"POT-Creation-Date: 2015-03-19 21:45+0100\n"
-"PO-Revision-Date: 2015-02-25 16:03+0000\n"
+"POT-Creation-Date: 2014-12-15 17:47+0100\n"
+"PO-Revision-Date: 2015-02-25 16:04+0000\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>\n"
-"Language-Team: Chinese (http://www.transifex.com/projects/p/FusionDirectory-108/language/zh/)\n"
+"Language-Team: Chinese (http://www.transifex.com/projects/p/FusionDirectory-109/language/zh/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -117,7 +117,7 @@ msgstr ""
 #: admin/opsi/class_opsiSoftwareList.inc:141
 #: admin/opsi/class_opsiProductProperties.inc:192
 #: admin/opsi/class_opsiProfile.inc:191
-msgid "Failed to contact OPSI server"
+msgid "Could contact OPSI server"
 msgstr ""
 
 #: admin/opsi/class_opsiProfileManagement.inc:33
@@ -274,10 +274,3 @@ 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"
-" managed by it, so if you delete them or deactivate their OPSI tab, they "
-"will be removed from OPSI."
-msgstr ""
diff --git a/personal/locale/ar/fusiondirectory.po b/personal/locale/ar/fusiondirectory.po
index b17068a2bc2c0f00c3f8f30ca350671ef0b871d8..c86ec22369bfa2b7827897a6067a0ea22235f58b 100644
--- a/personal/locale/ar/fusiondirectory.po
+++ b/personal/locale/ar/fusiondirectory.po
@@ -5,12 +5,12 @@
 # Translators:
 msgid ""
 msgstr ""
-"Project-Id-Version: FusionDirectory-108\n"
+"Project-Id-Version: FusionDirectory-109\n"
 "Report-Msgid-Bugs-To: documentation@lists.fusiondirectory.org\n"
-"POT-Creation-Date: 2015-03-31 11:49+0200\n"
-"PO-Revision-Date: 2015-03-31 10:38+0000\n"
-"Last-Translator: fusiondirectory <contact@fusiondirectory.org>\n"
-"Language-Team: Arabic (http://www.transifex.com/projects/p/FusionDirectory-108/language/ar/)\n"
+"POT-Creation-Date: 2014-12-09 22:29+0100\n"
+"PO-Revision-Date: 2015-02-10 17:20+0000\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: Arabic (http://www.transifex.com/projects/p/FusionDirectory-109/language/ar/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -34,7 +34,6 @@ msgid "Id of this user on this website"
 msgstr ""
 
 #: personal/personal/class_personalInfo.inc:85
-#: config/personal/class_personalConfig.inc:42
 msgid "Personal"
 msgstr ""
 
@@ -89,19 +88,3 @@ msgstr ""
 #: personal/personal/class_socialHandlers.inc:131
 msgid "Diaspora accounts must look like user@pod"
 msgstr ""
-
-#: config/personal/class_personalConfig.inc:28
-msgid "Personal configuration"
-msgstr ""
-
-#: config/personal/class_personalConfig.inc:29
-msgid "FusionDirectory personal plugin configuration"
-msgstr ""
-
-#: config/personal/class_personalConfig.inc:45
-msgid "Allow use of private email for password recovery"
-msgstr ""
-
-#: config/personal/class_personalConfig.inc:45
-msgid "Allow users to use their private email address for password recovery"
-msgstr ""
diff --git a/personal/locale/ca/fusiondirectory.po b/personal/locale/ca/fusiondirectory.po
index 060741482c8d69a8039e59241d3e2a796800e3fe..2251afb3649d7722757f6d5ac36917f398575c89 100644
--- a/personal/locale/ca/fusiondirectory.po
+++ b/personal/locale/ca/fusiondirectory.po
@@ -5,12 +5,12 @@
 # Translators:
 msgid ""
 msgstr ""
-"Project-Id-Version: FusionDirectory-108\n"
+"Project-Id-Version: FusionDirectory-109\n"
 "Report-Msgid-Bugs-To: documentation@lists.fusiondirectory.org\n"
-"POT-Creation-Date: 2015-03-31 11:49+0200\n"
-"PO-Revision-Date: 2015-03-31 10:38+0000\n"
-"Last-Translator: fusiondirectory <contact@fusiondirectory.org>\n"
-"Language-Team: Catalan (http://www.transifex.com/projects/p/FusionDirectory-108/language/ca/)\n"
+"POT-Creation-Date: 2014-12-09 22:29+0100\n"
+"PO-Revision-Date: 2015-02-10 17:20+0000\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: Catalan (http://www.transifex.com/projects/p/FusionDirectory-109/language/ca/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -34,7 +34,6 @@ msgid "Id of this user on this website"
 msgstr ""
 
 #: personal/personal/class_personalInfo.inc:85
-#: config/personal/class_personalConfig.inc:42
 msgid "Personal"
 msgstr ""
 
@@ -89,19 +88,3 @@ msgstr ""
 #: personal/personal/class_socialHandlers.inc:131
 msgid "Diaspora accounts must look like user@pod"
 msgstr ""
-
-#: config/personal/class_personalConfig.inc:28
-msgid "Personal configuration"
-msgstr ""
-
-#: config/personal/class_personalConfig.inc:29
-msgid "FusionDirectory personal plugin configuration"
-msgstr ""
-
-#: config/personal/class_personalConfig.inc:45
-msgid "Allow use of private email for password recovery"
-msgstr ""
-
-#: config/personal/class_personalConfig.inc:45
-msgid "Allow users to use their private email address for password recovery"
-msgstr ""
diff --git a/personal/locale/cs_CZ/fusiondirectory.po b/personal/locale/cs_CZ/fusiondirectory.po
index 377fc37ccce995e4beb04f7c164b8772e46f8999..8d7b0ef630058a67b5645058a2c326bbb51c2b6a 100644
--- a/personal/locale/cs_CZ/fusiondirectory.po
+++ b/personal/locale/cs_CZ/fusiondirectory.po
@@ -6,12 +6,12 @@
 # Pavel Borecki <pavel.borecki@gmail.com>, 2015
 msgid ""
 msgstr ""
-"Project-Id-Version: FusionDirectory-108\n"
+"Project-Id-Version: FusionDirectory-109\n"
 "Report-Msgid-Bugs-To: documentation@lists.fusiondirectory.org\n"
-"POT-Creation-Date: 2015-03-31 11:49+0200\n"
-"PO-Revision-Date: 2015-03-31 10:44+0000\n"
-"Last-Translator: fusiondirectory <contact@fusiondirectory.org>\n"
-"Language-Team: Czech (Czech Republic) (http://www.transifex.com/projects/p/FusionDirectory-108/language/cs_CZ/)\n"
+"POT-Creation-Date: 2014-12-09 22:29+0100\n"
+"PO-Revision-Date: 2015-04-02 20:31+0000\n"
+"Last-Translator: Pavel Borecki <pavel.borecki@gmail.com>\n"
+"Language-Team: Czech (Czech Republic) (http://www.transifex.com/projects/p/FusionDirectory-109/language/cs_CZ/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -35,9 +35,8 @@ msgid "Id of this user on this website"
 msgstr "IdentifikÃ¡tor tohoto uÅ¾ivatele na tomto webu"
 
 #: personal/personal/class_personalInfo.inc:85
-#: config/personal/class_personalConfig.inc:42
 msgid "Personal"
-msgstr "osobnÃ"
+msgstr "OsobnÃ"
 
 #: personal/personal/class_personalInfo.inc:86
 msgid "Personal informations"
@@ -89,20 +88,4 @@ msgstr ""
 
 #: personal/personal/class_socialHandlers.inc:131
 msgid "Diaspora accounts must look like user@pod"
-msgstr "Diaspora ÃºÄty majÃ podobu uzivatel@server"
-
-#: config/personal/class_personalConfig.inc:28
-msgid "Personal configuration"
-msgstr ""
-
-#: config/personal/class_personalConfig.inc:29
-msgid "FusionDirectory personal plugin configuration"
-msgstr ""
-
-#: config/personal/class_personalConfig.inc:45
-msgid "Allow use of private email for password recovery"
-msgstr ""
-
-#: config/personal/class_personalConfig.inc:45
-msgid "Allow users to use their private email address for password recovery"
-msgstr ""
+msgstr "Diaspora ÃºÄet mÃ¡ podobu uÅ¾ivatel@server"
diff --git a/personal/locale/de/fusiondirectory.po b/personal/locale/de/fusiondirectory.po
index ea1bd1bfbc4edda047adf2eb67a6ec15183e3571..415a45b917876833ea2618ded635f746ad05a216 100644
--- a/personal/locale/de/fusiondirectory.po
+++ b/personal/locale/de/fusiondirectory.po
@@ -3,14 +3,15 @@
 # This file is distributed under the same license as the PACKAGE package.
 # 
 # Translators:
+# Ettore Atalan <atalanttore@googlemail.com>, 2015
 msgid ""
 msgstr ""
-"Project-Id-Version: FusionDirectory-108\n"
+"Project-Id-Version: FusionDirectory-109\n"
 "Report-Msgid-Bugs-To: documentation@lists.fusiondirectory.org\n"
-"POT-Creation-Date: 2015-03-31 11:49+0200\n"
-"PO-Revision-Date: 2015-03-31 10:38+0000\n"
-"Last-Translator: fusiondirectory <contact@fusiondirectory.org>\n"
-"Language-Team: German (http://www.transifex.com/projects/p/FusionDirectory-108/language/de/)\n"
+"POT-Creation-Date: 2014-12-09 22:29+0100\n"
+"PO-Revision-Date: 2015-05-30 13:10+0000\n"
+"Last-Translator: Ettore Atalan <atalanttore@googlemail.com>\n"
+"Language-Team: German (http://www.transifex.com/projects/p/FusionDirectory-109/language/de/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -19,7 +20,7 @@ msgstr ""
 
 #: personal/personal/class_personalInfo.inc:30
 msgid "Site"
-msgstr ""
+msgstr "Seite"
 
 #: personal/personal/class_personalInfo.inc:30
 msgid "Website the account is on"
@@ -27,24 +28,23 @@ msgstr ""
 
 #: personal/personal/class_personalInfo.inc:36
 msgid "Id"
-msgstr ""
+msgstr "Kennung"
 
 #: personal/personal/class_personalInfo.inc:36
 msgid "Id of this user on this website"
 msgstr ""
 
 #: personal/personal/class_personalInfo.inc:85
-#: config/personal/class_personalConfig.inc:42
 msgid "Personal"
 msgstr "PersÃ¶nlich"
 
 #: personal/personal/class_personalInfo.inc:86
 msgid "Personal informations"
-msgstr ""
+msgstr "PersÃ¶nliche Informationen"
 
 #: personal/personal/class_personalInfo.inc:100
 msgid "Personal info"
-msgstr ""
+msgstr "PersÃ¶nliche Information"
 
 #: personal/personal/class_personalInfo.inc:105
 msgid "Social account"
@@ -56,7 +56,7 @@ msgstr ""
 
 #: personal/personal/class_personalInfo.inc:112
 msgid "Private email"
-msgstr ""
+msgstr "Private E-Mail"
 
 #: personal/personal/class_personalInfo.inc:112
 msgid "Private email addresses of this user"
@@ -72,36 +72,20 @@ msgstr ""
 
 #: personal/personal/class_socialHandlers.inc:68
 msgid "Facebook"
-msgstr ""
+msgstr "Facebook"
 
 #: personal/personal/class_socialHandlers.inc:78
 msgid "Twitter"
-msgstr ""
+msgstr "Twitter"
 
 #: personal/personal/class_socialHandlers.inc:98
 msgid "Google+"
-msgstr ""
+msgstr "Google+"
 
 #: personal/personal/class_socialHandlers.inc:118
 msgid "Diaspora*"
-msgstr ""
+msgstr "Diaspora*"
 
 #: personal/personal/class_socialHandlers.inc:131
 msgid "Diaspora accounts must look like user@pod"
 msgstr ""
-
-#: config/personal/class_personalConfig.inc:28
-msgid "Personal configuration"
-msgstr ""
-
-#: config/personal/class_personalConfig.inc:29
-msgid "FusionDirectory personal plugin configuration"
-msgstr ""
-
-#: config/personal/class_personalConfig.inc:45
-msgid "Allow use of private email for password recovery"
-msgstr ""
-
-#: config/personal/class_personalConfig.inc:45
-msgid "Allow users to use their private email address for password recovery"
-msgstr ""
diff --git a/personal/locale/el_GR/fusiondirectory.po b/personal/locale/el_GR/fusiondirectory.po
new file mode 100644
index 0000000000000000000000000000000000000000..24b7bfc11c5f008a495c5f66c83bed8bdc6d9ba9
--- /dev/null
+++ b/personal/locale/el_GR/fusiondirectory.po
@@ -0,0 +1,90 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR FusionDirectory Project
+# This file is distributed under the same license as the PACKAGE package.
+# 
+# Translators:
+msgid ""
+msgstr ""
+"Project-Id-Version: FusionDirectory-109\n"
+"Report-Msgid-Bugs-To: documentation@lists.fusiondirectory.org\n"
+"POT-Creation-Date: 2014-12-09 22:29+0100\n"
+"PO-Revision-Date: 2015-05-30 11:45+0000\n"
+"Last-Translator: Benoit Mortier <benoit.mortier@opensides.be>\n"
+"Language-Team: Greek (Greece) (http://www.transifex.com/projects/p/FusionDirectory-109/language/el_GR/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: el_GR\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
+
+#: personal/personal/class_personalInfo.inc:30
+msgid "Site"
+msgstr ""
+
+#: personal/personal/class_personalInfo.inc:30
+msgid "Website the account is on"
+msgstr ""
+
+#: personal/personal/class_personalInfo.inc:36
+msgid "Id"
+msgstr ""
+
+#: personal/personal/class_personalInfo.inc:36
+msgid "Id of this user on this website"
+msgstr ""
+
+#: personal/personal/class_personalInfo.inc:85
+msgid "Personal"
+msgstr ""
+
+#: personal/personal/class_personalInfo.inc:86
+msgid "Personal informations"
+msgstr ""
+
+#: personal/personal/class_personalInfo.inc:100
+msgid "Personal info"
+msgstr ""
+
+#: personal/personal/class_personalInfo.inc:105
+msgid "Social account"
+msgstr ""
+
+#: personal/personal/class_personalInfo.inc:105
+msgid "Social accounts of this user"
+msgstr ""
+
+#: personal/personal/class_personalInfo.inc:112
+msgid "Private email"
+msgstr ""
+
+#: personal/personal/class_personalInfo.inc:112
+msgid "Private email addresses of this user"
+msgstr ""
+
+#: personal/personal/class_personalInfo.inc:118
+msgid "Nickname"
+msgstr ""
+
+#: personal/personal/class_personalInfo.inc:118
+msgid "Nicknames for this user"
+msgstr ""
+
+#: personal/personal/class_socialHandlers.inc:68
+msgid "Facebook"
+msgstr ""
+
+#: personal/personal/class_socialHandlers.inc:78
+msgid "Twitter"
+msgstr ""
+
+#: personal/personal/class_socialHandlers.inc:98
+msgid "Google+"
+msgstr ""
+
+#: personal/personal/class_socialHandlers.inc:118
+msgid "Diaspora*"
+msgstr ""
+
+#: personal/personal/class_socialHandlers.inc:131
+msgid "Diaspora accounts must look like user@pod"
+msgstr ""
diff --git a/personal/locale/en/fusiondirectory.po b/personal/locale/en/fusiondirectory.po
index 9efe0aefed5ef78cc17c58e9ca43e7bb47005551..3efed483b37566c4280dc98ea804bb258bc4bc57 100644
--- a/personal/locale/en/fusiondirectory.po
+++ b/personal/locale/en/fusiondirectory.po
@@ -6,13 +6,13 @@
 #, fuzzy
 msgid ""
 msgstr ""
-"Project-Id-Version: PACKAGE VERSION\n"
-"Report-Msgid-Bugs-To: documentation@lists.fusiondirectory.org\n"
-"POT-Creation-Date: 2015-03-31 11:49+0200\n"
+"Project-Id-Version: FusionDirectory VERSION\n"
+"Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
+"POT-Creation-Date: 2015-05-30 15:30+0200\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
-"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
-"Language-Team: LANGUAGE <LL@li.org>\n"
-"Language: \n"
+"Last-Translator: FusionDirectory project <contact@fusiondirectory.org>\n"
+"Language-Team: English\n"
+"Language: en\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -42,32 +42,58 @@ msgstr ""
 msgid "Personal informations"
 msgstr ""
 
-#: personal/personal/class_personalInfo.inc:100
+#: personal/personal/class_personalInfo.inc:101
 msgid "Personal info"
 msgstr ""
 
-#: personal/personal/class_personalInfo.inc:105
-msgid "Social account"
+#: personal/personal/class_personalInfo.inc:104
+msgid "Personal title"
 msgstr ""
 
-#: personal/personal/class_personalInfo.inc:105
-msgid "Social accounts of this user"
+#: personal/personal/class_personalInfo.inc:104
+msgid ""
+"Personal title - Examples of personal titles are \"Ms\", \"Dr\", \"Prof\" "
+"and \"Rev\""
 msgstr ""
 
-#: personal/personal/class_personalInfo.inc:112
-msgid "Private email"
+#: personal/personal/class_personalInfo.inc:109
+msgid "Nickname"
 msgstr ""
 
-#: personal/personal/class_personalInfo.inc:112
-msgid "Private email addresses of this user"
+#: personal/personal/class_personalInfo.inc:109
+msgid "Nicknames for this user"
 msgstr ""
 
-#: personal/personal/class_personalInfo.inc:118
-msgid "Nickname"
+#: personal/personal/class_personalInfo.inc:114
+msgid "Date of birth"
 msgstr ""
 
-#: personal/personal/class_personalInfo.inc:118
-msgid "Nicknames for this user"
+#: personal/personal/class_personalInfo.inc:119
+msgid "Sex"
+msgstr ""
+
+#: personal/personal/class_personalInfo.inc:119
+msgid "Gender"
+msgstr ""
+
+#: personal/personal/class_personalInfo.inc:126
+msgid "Contact"
+msgstr ""
+
+#: personal/personal/class_personalInfo.inc:130
+msgid "Social account"
+msgstr ""
+
+#: personal/personal/class_personalInfo.inc:130
+msgid "Social accounts of this user"
+msgstr ""
+
+#: personal/personal/class_personalInfo.inc:137
+msgid "Private email"
+msgstr ""
+
+#: personal/personal/class_personalInfo.inc:137
+msgid "Private email addresses of this user"
 msgstr ""
 
 #: personal/personal/class_socialHandlers.inc:68
diff --git a/personal/locale/es/fusiondirectory.po b/personal/locale/es/fusiondirectory.po
index b774803da2e9b0cbe176b980e549c1c6a9be896a..aa11789cc90ff8797ac78219c14f916a32790eac 100644
--- a/personal/locale/es/fusiondirectory.po
+++ b/personal/locale/es/fusiondirectory.po
@@ -5,12 +5,12 @@
 # Translators:
 msgid ""
 msgstr ""
-"Project-Id-Version: FusionDirectory-108\n"
+"Project-Id-Version: FusionDirectory-109\n"
 "Report-Msgid-Bugs-To: documentation@lists.fusiondirectory.org\n"
-"POT-Creation-Date: 2015-03-31 11:49+0200\n"
-"PO-Revision-Date: 2015-03-31 10:38+0000\n"
-"Last-Translator: fusiondirectory <contact@fusiondirectory.org>\n"
-"Language-Team: Spanish (http://www.transifex.com/projects/p/FusionDirectory-108/language/es/)\n"
+"POT-Creation-Date: 2014-12-09 22:29+0100\n"
+"PO-Revision-Date: 2015-02-10 17:20+0000\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: Spanish (http://www.transifex.com/projects/p/FusionDirectory-109/language/es/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -34,7 +34,6 @@ msgid "Id of this user on this website"
 msgstr ""
 
 #: personal/personal/class_personalInfo.inc:85
-#: config/personal/class_personalConfig.inc:42
 msgid "Personal"
 msgstr "Personal"
 
@@ -89,19 +88,3 @@ msgstr ""
 #: personal/personal/class_socialHandlers.inc:131
 msgid "Diaspora accounts must look like user@pod"
 msgstr ""
-
-#: config/personal/class_personalConfig.inc:28
-msgid "Personal configuration"
-msgstr ""
-
-#: config/personal/class_personalConfig.inc:29
-msgid "FusionDirectory personal plugin configuration"
-msgstr ""
-
-#: config/personal/class_personalConfig.inc:45
-msgid "Allow use of private email for password recovery"
-msgstr ""
-
-#: config/personal/class_personalConfig.inc:45
-msgid "Allow users to use their private email address for password recovery"
-msgstr ""
diff --git a/personal/locale/es_VE/fusiondirectory.po b/personal/locale/es_VE/fusiondirectory.po
index 49a6bc94017ed32d7750bd399f4f4de45eb121be..114ac69b55275879c87764f642a9df3d990ca244 100644
--- a/personal/locale/es_VE/fusiondirectory.po
+++ b/personal/locale/es_VE/fusiondirectory.po
@@ -5,12 +5,12 @@
 # Translators:
 msgid ""
 msgstr ""
-"Project-Id-Version: FusionDirectory-108\n"
+"Project-Id-Version: FusionDirectory-109\n"
 "Report-Msgid-Bugs-To: documentation@lists.fusiondirectory.org\n"
-"POT-Creation-Date: 2015-03-31 11:49+0200\n"
-"PO-Revision-Date: 2015-03-31 10:38+0000\n"
-"Last-Translator: fusiondirectory <contact@fusiondirectory.org>\n"
-"Language-Team: Spanish (Venezuela) (http://www.transifex.com/projects/p/FusionDirectory-108/language/es_VE/)\n"
+"POT-Creation-Date: 2014-12-09 22:29+0100\n"
+"PO-Revision-Date: 2015-02-10 17:20+0000\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: Spanish (Venezuela) (http://www.transifex.com/projects/p/FusionDirectory-109/language/es_VE/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -34,7 +34,6 @@ msgid "Id of this user on this website"
 msgstr ""
 
 #: personal/personal/class_personalInfo.inc:85
-#: config/personal/class_personalConfig.inc:42
 msgid "Personal"
 msgstr "Personal"
 
@@ -89,19 +88,3 @@ msgstr ""
 #: personal/personal/class_socialHandlers.inc:131
 msgid "Diaspora accounts must look like user@pod"
 msgstr ""
-
-#: config/personal/class_personalConfig.inc:28
-msgid "Personal configuration"
-msgstr ""
-
-#: config/personal/class_personalConfig.inc:29
-msgid "FusionDirectory personal plugin configuration"
-msgstr ""
-
-#: config/personal/class_personalConfig.inc:45
-msgid "Allow use of private email for password recovery"
-msgstr ""
-
-#: config/personal/class_personalConfig.inc:45
-msgid "Allow users to use their private email address for password recovery"
-msgstr ""
diff --git a/personal/locale/fa_IR/fusiondirectory.po b/personal/locale/fa_IR/fusiondirectory.po
index 0699005dd48587629e4ac4f5e40bb75127eb3e9d..759ea1484e9d1e93291e3ff0edb7f0e4ebd7dc59 100644
--- a/personal/locale/fa_IR/fusiondirectory.po
+++ b/personal/locale/fa_IR/fusiondirectory.po
@@ -5,12 +5,12 @@
 # Translators:
 msgid ""
 msgstr ""
-"Project-Id-Version: FusionDirectory-108\n"
+"Project-Id-Version: FusionDirectory-109\n"
 "Report-Msgid-Bugs-To: documentation@lists.fusiondirectory.org\n"
-"POT-Creation-Date: 2015-03-31 11:49+0200\n"
-"PO-Revision-Date: 2015-03-31 10:38+0000\n"
-"Last-Translator: fusiondirectory <contact@fusiondirectory.org>\n"
-"Language-Team: Persian (Iran) (http://www.transifex.com/projects/p/FusionDirectory-108/language/fa_IR/)\n"
+"POT-Creation-Date: 2014-12-09 22:29+0100\n"
+"PO-Revision-Date: 2015-02-10 17:20+0000\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: Persian (Iran) (http://www.transifex.com/projects/p/FusionDirectory-109/language/fa_IR/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -34,7 +34,6 @@ msgid "Id of this user on this website"
 msgstr ""
 
 #: personal/personal/class_personalInfo.inc:85
-#: config/personal/class_personalConfig.inc:42
 msgid "Personal"
 msgstr "Ø´Ø®ØµÛŒ"
 
@@ -89,19 +88,3 @@ msgstr ""
 #: personal/personal/class_socialHandlers.inc:131
 msgid "Diaspora accounts must look like user@pod"
 msgstr ""
-
-#: config/personal/class_personalConfig.inc:28
-msgid "Personal configuration"
-msgstr ""
-
-#: config/personal/class_personalConfig.inc:29
-msgid "FusionDirectory personal plugin configuration"
-msgstr ""
-
-#: config/personal/class_personalConfig.inc:45
-msgid "Allow use of private email for password recovery"
-msgstr ""
-
-#: config/personal/class_personalConfig.inc:45
-msgid "Allow users to use their private email address for password recovery"
-msgstr ""
diff --git a/personal/locale/fr/fusiondirectory.po b/personal/locale/fr/fusiondirectory.po
index 235626261a43034ec26ca1d04c5c97553e98f690..dcf984bce7ceaa8ccd6e6898cfb893ff676cb9a8 100644
--- a/personal/locale/fr/fusiondirectory.po
+++ b/personal/locale/fr/fusiondirectory.po
@@ -3,19 +3,14 @@
 # This file is distributed under the same license as the PACKAGE package.
 # 
 # Translators:
-# Benoit Mortier <benoit.mortier@opensides.be>, 2015
-# MCMic, 2014
-# fusiondirectory <contact@fusiondirectory.org>, 2014
-# fusiondirectory <contact@fusiondirectory.org>, 2014
-# MCMic, 2014
 msgid ""
 msgstr ""
-"Project-Id-Version: FusionDirectory-108\n"
+"Project-Id-Version: FusionDirectory-109\n"
 "Report-Msgid-Bugs-To: documentation@lists.fusiondirectory.org\n"
-"POT-Creation-Date: 2015-03-31 11:49+0200\n"
-"PO-Revision-Date: 2015-03-31 11:42+0000\n"
-"Last-Translator: Benoit Mortier <benoit.mortier@opensides.be>\n"
-"Language-Team: French (http://www.transifex.com/projects/p/FusionDirectory-108/language/fr/)\n"
+"POT-Creation-Date: 2014-12-09 22:29+0100\n"
+"PO-Revision-Date: 2015-02-10 17:20+0000\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: French (http://www.transifex.com/projects/p/FusionDirectory-109/language/fr/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -39,7 +34,6 @@ msgid "Id of this user on this website"
 msgstr "Id de cet utilisateur sur ce site"
 
 #: personal/personal/class_personalInfo.inc:85
-#: config/personal/class_personalConfig.inc:42
 msgid "Personal"
 msgstr "Personnel"
 
@@ -94,19 +88,3 @@ msgstr "Diaspora*"
 #: personal/personal/class_socialHandlers.inc:131
 msgid "Diaspora accounts must look like user@pod"
 msgstr "Les comptes Diaspora doivent Ãªtre sous la forme user@pod"
-
-#: config/personal/class_personalConfig.inc:28
-msgid "Personal configuration"
-msgstr "Configuration du plugin personnel"
-
-#: config/personal/class_personalConfig.inc:29
-msgid "FusionDirectory personal plugin configuration"
-msgstr "Configuration du plugin personel"
-
-#: config/personal/class_personalConfig.inc:45
-msgid "Allow use of private email for password recovery"
-msgstr "Autoriser l'utilisation de l'email privÃ© pour la rÃ©cupÃ©ration de mot de passe"
-
-#: config/personal/class_personalConfig.inc:45
-msgid "Allow users to use their private email address for password recovery"
-msgstr "Autoriser les utilisateurs Ã  utiliser leur adresse e-mail privÃ© pour la rÃ©cupÃ©ration de mot de passe"
diff --git a/personal/locale/id/fusiondirectory.po b/personal/locale/id/fusiondirectory.po
index fb13ba68cb3ac1109d005c842db3a91b58997267..39646f564055c96c24c027c9ec29c23bbcf2cb02 100644
--- a/personal/locale/id/fusiondirectory.po
+++ b/personal/locale/id/fusiondirectory.po
@@ -5,12 +5,12 @@
 # Translators:
 msgid ""
 msgstr ""
-"Project-Id-Version: FusionDirectory-108\n"
+"Project-Id-Version: FusionDirectory-109\n"
 "Report-Msgid-Bugs-To: documentation@lists.fusiondirectory.org\n"
-"POT-Creation-Date: 2015-03-31 11:49+0200\n"
-"PO-Revision-Date: 2015-03-31 10:38+0000\n"
-"Last-Translator: fusiondirectory <contact@fusiondirectory.org>\n"
-"Language-Team: Indonesian (http://www.transifex.com/projects/p/FusionDirectory-108/language/id/)\n"
+"POT-Creation-Date: 2014-12-09 22:29+0100\n"
+"PO-Revision-Date: 2015-02-10 17:20+0000\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: Indonesian (http://www.transifex.com/projects/p/FusionDirectory-109/language/id/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -34,7 +34,6 @@ msgid "Id of this user on this website"
 msgstr ""
 
 #: personal/personal/class_personalInfo.inc:85
-#: config/personal/class_personalConfig.inc:42
 msgid "Personal"
 msgstr ""
 
@@ -89,19 +88,3 @@ msgstr ""
 #: personal/personal/class_socialHandlers.inc:131
 msgid "Diaspora accounts must look like user@pod"
 msgstr ""
-
-#: config/personal/class_personalConfig.inc:28
-msgid "Personal configuration"
-msgstr ""
-
-#: config/personal/class_personalConfig.inc:29
-msgid "FusionDirectory personal plugin configuration"
-msgstr ""
-
-#: config/personal/class_personalConfig.inc:45
-msgid "Allow use of private email for password recovery"
-msgstr ""
-
-#: config/personal/class_personalConfig.inc:45
-msgid "Allow users to use their private email address for password recovery"
-msgstr ""
diff --git a/personal/locale/it/fusiondirectory.po b/personal/locale/it/fusiondirectory.po
index 55967d8fea77ede85127df3a409dee4a39808e46..f5788e732a9f3d35df79389a82172465fcb9900a 100644
--- a/personal/locale/it/fusiondirectory.po
+++ b/personal/locale/it/fusiondirectory.po
@@ -5,12 +5,12 @@
 # Translators:
 msgid ""
 msgstr ""
-"Project-Id-Version: FusionDirectory-108\n"
+"Project-Id-Version: FusionDirectory-109\n"
 "Report-Msgid-Bugs-To: documentation@lists.fusiondirectory.org\n"
-"POT-Creation-Date: 2015-03-31 11:49+0200\n"
-"PO-Revision-Date: 2015-03-31 10:38+0000\n"
-"Last-Translator: fusiondirectory <contact@fusiondirectory.org>\n"
-"Language-Team: Italian (http://www.transifex.com/projects/p/FusionDirectory-108/language/it/)\n"
+"POT-Creation-Date: 2014-12-09 22:29+0100\n"
+"PO-Revision-Date: 2015-02-10 17:20+0000\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: Italian (http://www.transifex.com/projects/p/FusionDirectory-109/language/it/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -34,7 +34,6 @@ msgid "Id of this user on this website"
 msgstr ""
 
 #: personal/personal/class_personalInfo.inc:85
-#: config/personal/class_personalConfig.inc:42
 msgid "Personal"
 msgstr "Personale"
 
@@ -89,19 +88,3 @@ msgstr ""
 #: personal/personal/class_socialHandlers.inc:131
 msgid "Diaspora accounts must look like user@pod"
 msgstr ""
-
-#: config/personal/class_personalConfig.inc:28
-msgid "Personal configuration"
-msgstr ""
-
-#: config/personal/class_personalConfig.inc:29
-msgid "FusionDirectory personal plugin configuration"
-msgstr ""
-
-#: config/personal/class_personalConfig.inc:45
-msgid "Allow use of private email for password recovery"
-msgstr ""
-
-#: config/personal/class_personalConfig.inc:45
-msgid "Allow users to use their private email address for password recovery"
-msgstr ""
diff --git a/personal/locale/lv/fusiondirectory.po b/personal/locale/lv/fusiondirectory.po
index 2951466433a29a2729dac87bfbbe9d963b5cc8d8..c4464c64b1cbb34cd5fd8b8550a325adfc7a4d4a 100644
--- a/personal/locale/lv/fusiondirectory.po
+++ b/personal/locale/lv/fusiondirectory.po
@@ -5,12 +5,12 @@
 # Translators:
 msgid ""
 msgstr ""
-"Project-Id-Version: FusionDirectory-108\n"
+"Project-Id-Version: FusionDirectory-109\n"
 "Report-Msgid-Bugs-To: documentation@lists.fusiondirectory.org\n"
-"POT-Creation-Date: 2015-03-31 11:49+0200\n"
-"PO-Revision-Date: 2015-03-31 10:38+0000\n"
-"Last-Translator: fusiondirectory <contact@fusiondirectory.org>\n"
-"Language-Team: Latvian (http://www.transifex.com/projects/p/FusionDirectory-108/language/lv/)\n"
+"POT-Creation-Date: 2014-12-09 22:29+0100\n"
+"PO-Revision-Date: 2015-02-10 17:20+0000\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: Latvian (http://www.transifex.com/projects/p/FusionDirectory-109/language/lv/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -34,7 +34,6 @@ msgid "Id of this user on this website"
 msgstr ""
 
 #: personal/personal/class_personalInfo.inc:85
-#: config/personal/class_personalConfig.inc:42
 msgid "Personal"
 msgstr ""
 
@@ -89,19 +88,3 @@ msgstr ""
 #: personal/personal/class_socialHandlers.inc:131
 msgid "Diaspora accounts must look like user@pod"
 msgstr ""
-
-#: config/personal/class_personalConfig.inc:28
-msgid "Personal configuration"
-msgstr ""
-
-#: config/personal/class_personalConfig.inc:29
-msgid "FusionDirectory personal plugin configuration"
-msgstr ""
-
-#: config/personal/class_personalConfig.inc:45
-msgid "Allow use of private email for password recovery"
-msgstr ""
-
-#: config/personal/class_personalConfig.inc:45
-msgid "Allow users to use their private email address for password recovery"
-msgstr ""
diff --git a/personal/locale/nb/fusiondirectory.po b/personal/locale/nb/fusiondirectory.po
index 86eff8f6fdc07cb1545ab53d944b2d60cafcd027..cf0b2a4f1c5481efe79ad16b554d0ea369ecd2c5 100644
--- a/personal/locale/nb/fusiondirectory.po
+++ b/personal/locale/nb/fusiondirectory.po
@@ -5,12 +5,12 @@
 # Translators:
 msgid ""
 msgstr ""
-"Project-Id-Version: FusionDirectory-108\n"
+"Project-Id-Version: FusionDirectory-109\n"
 "Report-Msgid-Bugs-To: documentation@lists.fusiondirectory.org\n"
-"POT-Creation-Date: 2015-03-31 11:49+0200\n"
-"PO-Revision-Date: 2015-03-31 10:38+0000\n"
-"Last-Translator: fusiondirectory <contact@fusiondirectory.org>\n"
-"Language-Team: Norwegian BokmÃ¥l (http://www.transifex.com/projects/p/FusionDirectory-108/language/nb/)\n"
+"POT-Creation-Date: 2014-12-09 22:29+0100\n"
+"PO-Revision-Date: 2015-02-10 17:20+0000\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: Norwegian BokmÃ¥l (http://www.transifex.com/projects/p/FusionDirectory-109/language/nb/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -34,7 +34,6 @@ msgid "Id of this user on this website"
 msgstr ""
 
 #: personal/personal/class_personalInfo.inc:85
-#: config/personal/class_personalConfig.inc:42
 msgid "Personal"
 msgstr ""
 
@@ -89,19 +88,3 @@ msgstr ""
 #: personal/personal/class_socialHandlers.inc:131
 msgid "Diaspora accounts must look like user@pod"
 msgstr ""
-
-#: config/personal/class_personalConfig.inc:28
-msgid "Personal configuration"
-msgstr ""
-
-#: config/personal/class_personalConfig.inc:29
-msgid "FusionDirectory personal plugin configuration"
-msgstr ""
-
-#: config/personal/class_personalConfig.inc:45
-msgid "Allow use of private email for password recovery"
-msgstr ""
-
-#: config/personal/class_personalConfig.inc:45
-msgid "Allow users to use their private email address for password recovery"
-msgstr ""
diff --git a/personal/locale/nl/fusiondirectory.po b/personal/locale/nl/fusiondirectory.po
index 5102d50e2fecb3eb68e953362c3254aadb2175f4..0dd3f7ccad6b200df941720a1281e8d1ebbac225 100644
--- a/personal/locale/nl/fusiondirectory.po
+++ b/personal/locale/nl/fusiondirectory.po
@@ -5,12 +5,12 @@
 # Translators:
 msgid ""
 msgstr ""
-"Project-Id-Version: FusionDirectory-108\n"
+"Project-Id-Version: FusionDirectory-109\n"
 "Report-Msgid-Bugs-To: documentation@lists.fusiondirectory.org\n"
-"POT-Creation-Date: 2015-03-31 11:49+0200\n"
-"PO-Revision-Date: 2015-03-31 10:38+0000\n"
-"Last-Translator: fusiondirectory <contact@fusiondirectory.org>\n"
-"Language-Team: Dutch (http://www.transifex.com/projects/p/FusionDirectory-108/language/nl/)\n"
+"POT-Creation-Date: 2014-12-09 22:29+0100\n"
+"PO-Revision-Date: 2015-02-10 17:20+0000\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: Dutch (http://www.transifex.com/projects/p/FusionDirectory-109/language/nl/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -34,7 +34,6 @@ msgid "Id of this user on this website"
 msgstr ""
 
 #: personal/personal/class_personalInfo.inc:85
-#: config/personal/class_personalConfig.inc:42
 msgid "Personal"
 msgstr "Persoonlijk"
 
@@ -89,19 +88,3 @@ msgstr ""
 #: personal/personal/class_socialHandlers.inc:131
 msgid "Diaspora accounts must look like user@pod"
 msgstr ""
-
-#: config/personal/class_personalConfig.inc:28
-msgid "Personal configuration"
-msgstr ""
-
-#: config/personal/class_personalConfig.inc:29
-msgid "FusionDirectory personal plugin configuration"
-msgstr ""
-
-#: config/personal/class_personalConfig.inc:45
-msgid "Allow use of private email for password recovery"
-msgstr ""
-
-#: config/personal/class_personalConfig.inc:45
-msgid "Allow users to use their private email address for password recovery"
-msgstr ""
diff --git a/personal/locale/pl/fusiondirectory.po b/personal/locale/pl/fusiondirectory.po
index cef40bc8f43c5ddd541fe6ff42e99bd34cda322e..9dfc2fe4d330aff7912f1814ed1a59d2bf2dd498 100644
--- a/personal/locale/pl/fusiondirectory.po
+++ b/personal/locale/pl/fusiondirectory.po
@@ -5,12 +5,12 @@
 # Translators:
 msgid ""
 msgstr ""
-"Project-Id-Version: FusionDirectory-108\n"
+"Project-Id-Version: FusionDirectory-109\n"
 "Report-Msgid-Bugs-To: documentation@lists.fusiondirectory.org\n"
-"POT-Creation-Date: 2015-03-31 11:49+0200\n"
-"PO-Revision-Date: 2015-03-31 10:38+0000\n"
-"Last-Translator: fusiondirectory <contact@fusiondirectory.org>\n"
-"Language-Team: Polish (http://www.transifex.com/projects/p/FusionDirectory-108/language/pl/)\n"
+"POT-Creation-Date: 2014-12-09 22:29+0100\n"
+"PO-Revision-Date: 2015-02-10 17:20+0000\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: Polish (http://www.transifex.com/projects/p/FusionDirectory-109/language/pl/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -34,7 +34,6 @@ msgid "Id of this user on this website"
 msgstr ""
 
 #: personal/personal/class_personalInfo.inc:85
-#: config/personal/class_personalConfig.inc:42
 msgid "Personal"
 msgstr "Osobiste"
 
@@ -89,19 +88,3 @@ msgstr ""
 #: personal/personal/class_socialHandlers.inc:131
 msgid "Diaspora accounts must look like user@pod"
 msgstr ""
-
-#: config/personal/class_personalConfig.inc:28
-msgid "Personal configuration"
-msgstr ""
-
-#: config/personal/class_personalConfig.inc:29
-msgid "FusionDirectory personal plugin configuration"
-msgstr ""
-
-#: config/personal/class_personalConfig.inc:45
-msgid "Allow use of private email for password recovery"
-msgstr ""
-
-#: config/personal/class_personalConfig.inc:45
-msgid "Allow users to use their private email address for password recovery"
-msgstr ""
diff --git a/personal/locale/pt/fusiondirectory.po b/personal/locale/pt/fusiondirectory.po
index 4bcdb6a1c491e7bb42d6691c9064013cca135e76..62cef84478f9bb9cab23d75d5fae5fdf0e47746b 100644
--- a/personal/locale/pt/fusiondirectory.po
+++ b/personal/locale/pt/fusiondirectory.po
@@ -5,12 +5,12 @@
 # Translators:
 msgid ""
 msgstr ""
-"Project-Id-Version: FusionDirectory-108\n"
+"Project-Id-Version: FusionDirectory-109\n"
 "Report-Msgid-Bugs-To: documentation@lists.fusiondirectory.org\n"
-"POT-Creation-Date: 2015-03-31 11:49+0200\n"
-"PO-Revision-Date: 2015-03-31 10:38+0000\n"
-"Last-Translator: fusiondirectory <contact@fusiondirectory.org>\n"
-"Language-Team: Portuguese (http://www.transifex.com/projects/p/FusionDirectory-108/language/pt/)\n"
+"POT-Creation-Date: 2014-12-09 22:29+0100\n"
+"PO-Revision-Date: 2015-02-10 17:20+0000\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: Portuguese (http://www.transifex.com/projects/p/FusionDirectory-109/language/pt/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -34,7 +34,6 @@ msgid "Id of this user on this website"
 msgstr ""
 
 #: personal/personal/class_personalInfo.inc:85
-#: config/personal/class_personalConfig.inc:42
 msgid "Personal"
 msgstr ""
 
@@ -89,19 +88,3 @@ msgstr ""
 #: personal/personal/class_socialHandlers.inc:131
 msgid "Diaspora accounts must look like user@pod"
 msgstr ""
-
-#: config/personal/class_personalConfig.inc:28
-msgid "Personal configuration"
-msgstr ""
-
-#: config/personal/class_personalConfig.inc:29
-msgid "FusionDirectory personal plugin configuration"
-msgstr ""
-
-#: config/personal/class_personalConfig.inc:45
-msgid "Allow use of private email for password recovery"
-msgstr ""
-
-#: config/personal/class_personalConfig.inc:45
-msgid "Allow users to use their private email address for password recovery"
-msgstr ""
diff --git a/personal/locale/pt_BR/fusiondirectory.po b/personal/locale/pt_BR/fusiondirectory.po
index 0bda882b36821040d3654b397d693b0c68c4c73f..66487d1e6ec573eba393d0ed6869ae15f42e81d8 100644
--- a/personal/locale/pt_BR/fusiondirectory.po
+++ b/personal/locale/pt_BR/fusiondirectory.po
@@ -5,12 +5,12 @@
 # Translators:
 msgid ""
 msgstr ""
-"Project-Id-Version: FusionDirectory-108\n"
+"Project-Id-Version: FusionDirectory-109\n"
 "Report-Msgid-Bugs-To: documentation@lists.fusiondirectory.org\n"
-"POT-Creation-Date: 2015-03-31 11:49+0200\n"
-"PO-Revision-Date: 2015-03-31 10:38+0000\n"
-"Last-Translator: fusiondirectory <contact@fusiondirectory.org>\n"
-"Language-Team: Portuguese (Brazil) (http://www.transifex.com/projects/p/FusionDirectory-108/language/pt_BR/)\n"
+"POT-Creation-Date: 2014-12-09 22:29+0100\n"
+"PO-Revision-Date: 2015-02-10 17:20+0000\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: Portuguese (Brazil) (http://www.transifex.com/projects/p/FusionDirectory-109/language/pt_BR/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -34,7 +34,6 @@ msgid "Id of this user on this website"
 msgstr ""
 
 #: personal/personal/class_personalInfo.inc:85
-#: config/personal/class_personalConfig.inc:42
 msgid "Personal"
 msgstr "Pessoal"
 
@@ -89,19 +88,3 @@ msgstr ""
 #: personal/personal/class_socialHandlers.inc:131
 msgid "Diaspora accounts must look like user@pod"
 msgstr ""
-
-#: config/personal/class_personalConfig.inc:28
-msgid "Personal configuration"
-msgstr ""
-
-#: config/personal/class_personalConfig.inc:29
-msgid "FusionDirectory personal plugin configuration"
-msgstr ""
-
-#: config/personal/class_personalConfig.inc:45
-msgid "Allow use of private email for password recovery"
-msgstr ""
-
-#: config/personal/class_personalConfig.inc:45
-msgid "Allow users to use their private email address for password recovery"
-msgstr ""
diff --git a/personal/locale/ru/fusiondirectory.po b/personal/locale/ru/fusiondirectory.po
index 4f43d5660abba068aeab4fb34d0e7ec2102d7f39..fb42c6dbdf2738561ed4d546039fcfd8a30b4e9e 100644
--- a/personal/locale/ru/fusiondirectory.po
+++ b/personal/locale/ru/fusiondirectory.po
@@ -5,17 +5,17 @@
 # Translators:
 msgid ""
 msgstr ""
-"Project-Id-Version: FusionDirectory-108\n"
+"Project-Id-Version: FusionDirectory-109\n"
 "Report-Msgid-Bugs-To: documentation@lists.fusiondirectory.org\n"
-"POT-Creation-Date: 2015-03-31 11:49+0200\n"
-"PO-Revision-Date: 2015-03-31 10:38+0000\n"
-"Last-Translator: fusiondirectory <contact@fusiondirectory.org>\n"
-"Language-Team: Russian (http://www.transifex.com/projects/p/FusionDirectory-108/language/ru/)\n"
+"POT-Creation-Date: 2014-12-09 22:29+0100\n"
+"PO-Revision-Date: 2015-02-10 17:20+0000\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: Russian (http://www.transifex.com/projects/p/FusionDirectory-109/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=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);\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/personal/class_personalInfo.inc:30
 msgid "Site"
@@ -34,7 +34,6 @@ msgid "Id of this user on this website"
 msgstr ""
 
 #: personal/personal/class_personalInfo.inc:85
-#: config/personal/class_personalConfig.inc:42
 msgid "Personal"
 msgstr "ÐšÐ¾Ð½Ñ‚Ð°ÐºÑ‚"
 
@@ -89,19 +88,3 @@ msgstr ""
 #: personal/personal/class_socialHandlers.inc:131
 msgid "Diaspora accounts must look like user@pod"
 msgstr ""
-
-#: config/personal/class_personalConfig.inc:28
-msgid "Personal configuration"
-msgstr ""
-
-#: config/personal/class_personalConfig.inc:29
-msgid "FusionDirectory personal plugin configuration"
-msgstr ""
-
-#: config/personal/class_personalConfig.inc:45
-msgid "Allow use of private email for password recovery"
-msgstr ""
-
-#: config/personal/class_personalConfig.inc:45
-msgid "Allow users to use their private email address for password recovery"
-msgstr ""
diff --git a/personal/locale/ru@petr1708/fusiondirectory.po b/personal/locale/ru@petr1708/fusiondirectory.po
index 0459642eb0ae8d00f46beba428c438be1439d9a4..0b8be8acb40183d84c6687da1bf5e989aee668cc 100644
--- a/personal/locale/ru@petr1708/fusiondirectory.po
+++ b/personal/locale/ru@petr1708/fusiondirectory.po
@@ -5,17 +5,17 @@
 # Translators:
 msgid ""
 msgstr ""
-"Project-Id-Version: FusionDirectory-108\n"
+"Project-Id-Version: FusionDirectory-109\n"
 "Report-Msgid-Bugs-To: documentation@lists.fusiondirectory.org\n"
-"POT-Creation-Date: 2015-03-31 11:49+0200\n"
-"PO-Revision-Date: 2015-03-31 10:38+0000\n"
-"Last-Translator: fusiondirectory <contact@fusiondirectory.org>\n"
-"Language-Team: Russian Petrine orthography (http://www.transifex.com/projects/p/FusionDirectory-108/language/ru@petr1708/)\n"
+"POT-Creation-Date: 2014-12-09 22:29+0100\n"
+"PO-Revision-Date: 2015-02-10 17:20+0000\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: Russian Petrine orthography (http://www.transifex.com/projects/p/FusionDirectory-109/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=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);\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/personal/class_personalInfo.inc:30
 msgid "Site"
@@ -34,7 +34,6 @@ msgid "Id of this user on this website"
 msgstr ""
 
 #: personal/personal/class_personalInfo.inc:85
-#: config/personal/class_personalConfig.inc:42
 msgid "Personal"
 msgstr ""
 
@@ -89,19 +88,3 @@ msgstr ""
 #: personal/personal/class_socialHandlers.inc:131
 msgid "Diaspora accounts must look like user@pod"
 msgstr ""
-
-#: config/personal/class_personalConfig.inc:28
-msgid "Personal configuration"
-msgstr ""
-
-#: config/personal/class_personalConfig.inc:29
-msgid "FusionDirectory personal plugin configuration"
-msgstr ""
-
-#: config/personal/class_personalConfig.inc:45
-msgid "Allow use of private email for password recovery"
-msgstr ""
-
-#: config/personal/class_personalConfig.inc:45
-msgid "Allow users to use their private email address for password recovery"
-msgstr ""
diff --git a/personal/locale/sv/fusiondirectory.po b/personal/locale/sv/fusiondirectory.po
index d1f32dc22d6311a4829f4e92f105ebe088d90c21..798145dd0e5ce67bdbe2d6d7ce82a09f33be7caf 100644
--- a/personal/locale/sv/fusiondirectory.po
+++ b/personal/locale/sv/fusiondirectory.po
@@ -5,12 +5,12 @@
 # Translators:
 msgid ""
 msgstr ""
-"Project-Id-Version: FusionDirectory-108\n"
+"Project-Id-Version: FusionDirectory-109\n"
 "Report-Msgid-Bugs-To: documentation@lists.fusiondirectory.org\n"
-"POT-Creation-Date: 2015-03-31 11:49+0200\n"
-"PO-Revision-Date: 2015-03-31 10:38+0000\n"
-"Last-Translator: fusiondirectory <contact@fusiondirectory.org>\n"
-"Language-Team: Swedish (http://www.transifex.com/projects/p/FusionDirectory-108/language/sv/)\n"
+"POT-Creation-Date: 2014-12-09 22:29+0100\n"
+"PO-Revision-Date: 2015-02-10 17:20+0000\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: Swedish (http://www.transifex.com/projects/p/FusionDirectory-109/language/sv/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -34,7 +34,6 @@ msgid "Id of this user on this website"
 msgstr ""
 
 #: personal/personal/class_personalInfo.inc:85
-#: config/personal/class_personalConfig.inc:42
 msgid "Personal"
 msgstr ""
 
@@ -89,19 +88,3 @@ msgstr ""
 #: personal/personal/class_socialHandlers.inc:131
 msgid "Diaspora accounts must look like user@pod"
 msgstr ""
-
-#: config/personal/class_personalConfig.inc:28
-msgid "Personal configuration"
-msgstr ""
-
-#: config/personal/class_personalConfig.inc:29
-msgid "FusionDirectory personal plugin configuration"
-msgstr ""
-
-#: config/personal/class_personalConfig.inc:45
-msgid "Allow use of private email for password recovery"
-msgstr ""
-
-#: config/personal/class_personalConfig.inc:45
-msgid "Allow users to use their private email address for password recovery"
-msgstr ""
diff --git a/personal/locale/ug/fusiondirectory.po b/personal/locale/ug/fusiondirectory.po
index 16c6a1174cffdff8e849247649c50a4f68f5e901..347059410b0ec42e68140a24b4d7d56b420ce1db 100644
--- a/personal/locale/ug/fusiondirectory.po
+++ b/personal/locale/ug/fusiondirectory.po
@@ -5,12 +5,12 @@
 # Translators:
 msgid ""
 msgstr ""
-"Project-Id-Version: FusionDirectory-108\n"
+"Project-Id-Version: FusionDirectory-109\n"
 "Report-Msgid-Bugs-To: documentation@lists.fusiondirectory.org\n"
-"POT-Creation-Date: 2015-03-31 11:49+0200\n"
-"PO-Revision-Date: 2015-03-31 10:38+0000\n"
-"Last-Translator: fusiondirectory <contact@fusiondirectory.org>\n"
-"Language-Team: Uighur (http://www.transifex.com/projects/p/FusionDirectory-108/language/ug/)\n"
+"POT-Creation-Date: 2014-12-09 22:29+0100\n"
+"PO-Revision-Date: 2015-02-10 17:20+0000\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: Uighur (http://www.transifex.com/projects/p/FusionDirectory-109/language/ug/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -34,7 +34,6 @@ msgid "Id of this user on this website"
 msgstr ""
 
 #: personal/personal/class_personalInfo.inc:85
-#: config/personal/class_personalConfig.inc:42
 msgid "Personal"
 msgstr ""
 
@@ -89,19 +88,3 @@ msgstr ""
 #: personal/personal/class_socialHandlers.inc:131
 msgid "Diaspora accounts must look like user@pod"
 msgstr ""
-
-#: config/personal/class_personalConfig.inc:28
-msgid "Personal configuration"
-msgstr ""
-
-#: config/personal/class_personalConfig.inc:29
-msgid "FusionDirectory personal plugin configuration"
-msgstr ""
-
-#: config/personal/class_personalConfig.inc:45
-msgid "Allow use of private email for password recovery"
-msgstr ""
-
-#: config/personal/class_personalConfig.inc:45
-msgid "Allow users to use their private email address for password recovery"
-msgstr ""
diff --git a/personal/locale/vi_VN/fusiondirectory.po b/personal/locale/vi_VN/fusiondirectory.po
index 6bc77787358d6f3d02b209819ac8740c3c5c4aa8..6f7d4ea2bda484f5a6c26d7ab8136548b41b281c 100644
--- a/personal/locale/vi_VN/fusiondirectory.po
+++ b/personal/locale/vi_VN/fusiondirectory.po
@@ -5,12 +5,12 @@
 # Translators:
 msgid ""
 msgstr ""
-"Project-Id-Version: FusionDirectory-108\n"
+"Project-Id-Version: FusionDirectory-109\n"
 "Report-Msgid-Bugs-To: documentation@lists.fusiondirectory.org\n"
-"POT-Creation-Date: 2015-03-31 11:49+0200\n"
-"PO-Revision-Date: 2015-03-31 10:38+0000\n"
-"Last-Translator: fusiondirectory <contact@fusiondirectory.org>\n"
-"Language-Team: Vietnamese (Viet Nam) (http://www.transifex.com/projects/p/FusionDirectory-108/language/vi_VN/)\n"
+"POT-Creation-Date: 2014-12-09 22:29+0100\n"
+"PO-Revision-Date: 2015-02-10 17:20+0000\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: Vietnamese (Viet Nam) (http://www.transifex.com/projects/p/FusionDirectory-109/language/vi_VN/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -34,7 +34,6 @@ msgid "Id of this user on this website"
 msgstr ""
 
 #: personal/personal/class_personalInfo.inc:85
-#: config/personal/class_personalConfig.inc:42
 msgid "Personal"
 msgstr ""
 
@@ -89,19 +88,3 @@ msgstr ""
 #: personal/personal/class_socialHandlers.inc:131
 msgid "Diaspora accounts must look like user@pod"
 msgstr ""
-
-#: config/personal/class_personalConfig.inc:28
-msgid "Personal configuration"
-msgstr ""
-
-#: config/personal/class_personalConfig.inc:29
-msgid "FusionDirectory personal plugin configuration"
-msgstr ""
-
-#: config/personal/class_personalConfig.inc:45
-msgid "Allow use of private email for password recovery"
-msgstr ""
-
-#: config/personal/class_personalConfig.inc:45
-msgid "Allow users to use their private email address for password recovery"
-msgstr ""
diff --git a/personal/locale/zh/fusiondirectory.po b/personal/locale/zh/fusiondirectory.po
index e7eeb552cd9dc31d6fa11523b0df017cc30a20ef..be22a4887228e9bbdafd8294c69cdbbd6fa4b456 100644
--- a/personal/locale/zh/fusiondirectory.po
+++ b/personal/locale/zh/fusiondirectory.po
@@ -5,12 +5,12 @@
 # Translators:
 msgid ""
 msgstr ""
-"Project-Id-Version: FusionDirectory-108\n"
+"Project-Id-Version: FusionDirectory-109\n"
 "Report-Msgid-Bugs-To: documentation@lists.fusiondirectory.org\n"
-"POT-Creation-Date: 2015-03-31 11:49+0200\n"
-"PO-Revision-Date: 2015-03-31 10:38+0000\n"
-"Last-Translator: fusiondirectory <contact@fusiondirectory.org>\n"
-"Language-Team: Chinese (http://www.transifex.com/projects/p/FusionDirectory-108/language/zh/)\n"
+"POT-Creation-Date: 2014-12-09 22:29+0100\n"
+"PO-Revision-Date: 2015-02-10 17:20+0000\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: Chinese (http://www.transifex.com/projects/p/FusionDirectory-109/language/zh/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -34,7 +34,6 @@ msgid "Id of this user on this website"
 msgstr ""
 
 #: personal/personal/class_personalInfo.inc:85
-#: config/personal/class_personalConfig.inc:42
 msgid "Personal"
 msgstr "ä¸ªäºº"
 
@@ -89,19 +88,3 @@ msgstr ""
 #: personal/personal/class_socialHandlers.inc:131
 msgid "Diaspora accounts must look like user@pod"
 msgstr ""
-
-#: config/personal/class_personalConfig.inc:28
-msgid "Personal configuration"
-msgstr ""
-
-#: config/personal/class_personalConfig.inc:29
-msgid "FusionDirectory personal plugin configuration"
-msgstr ""
-
-#: config/personal/class_personalConfig.inc:45
-msgid "Allow use of private email for password recovery"
-msgstr ""
-
-#: config/personal/class_personalConfig.inc:45
-msgid "Allow users to use their private email address for password recovery"
-msgstr ""
diff --git a/ppolicy/locale/ar/fusiondirectory.po b/ppolicy/locale/ar/fusiondirectory.po
index 370e5a65ee5ea3a6f861ef2deb1eabb69b44ada6..6805f64506140e34008f56c8f24694c041beb29b 100644
--- a/ppolicy/locale/ar/fusiondirectory.po
+++ b/ppolicy/locale/ar/fusiondirectory.po
@@ -5,12 +5,12 @@
 # Translators:
 msgid ""
 msgstr ""
-"Project-Id-Version: FusionDirectory-108\n"
+"Project-Id-Version: FusionDirectory-109\n"
 "Report-Msgid-Bugs-To: documentation@lists.fusiondirectory.org\n"
-"POT-Creation-Date: 2015-03-31 11:49+0200\n"
-"PO-Revision-Date: 2015-03-31 11:23+0000\n"
-"Last-Translator: fusiondirectory <contact@fusiondirectory.org>\n"
-"Language-Team: Arabic (http://www.transifex.com/projects/p/FusionDirectory-108/language/ar/)\n"
+"POT-Creation-Date: 2015-02-10 18:26+0100\n"
+"PO-Revision-Date: 2015-02-10 17:35+0000\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: Arabic (http://www.transifex.com/projects/p/FusionDirectory-109/language/ar/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -84,14 +84,13 @@ msgid ""
 msgstr ""
 
 #: admin/ppolicy/class_ppolicy.inc:79
-msgid "Expiry warning delay"
+msgid "Expire warning delay"
 msgstr ""
 
 #: admin/ppolicy/class_ppolicy.inc:79
 msgid ""
-"Defines the start time - in seconds - prior to the password expiry that "
-"password expiry warning messages are returned in bind responses. 0 to "
-"disable"
+"Start time prior to the password expiry that password expiry warning "
+"messages are returned in bind responses"
 msgstr ""
 
 #: admin/ppolicy/class_ppolicy.inc:84
@@ -175,38 +174,6 @@ msgid ""
 "administrator following an automatic lockout"
 msgstr ""
 
-#: addons/dashboard/class_dashBoardPPolicy.inc:26
-msgid "Ppolicy"
-msgstr ""
-
-#: addons/dashboard/class_dashBoardPPolicy.inc:27
-msgid "Statistics about ppolicy expired users"
-msgstr ""
-
-#: addons/dashboard/class_dashBoardPPolicy.inc:38
-msgid "Expired accounts"
-msgstr ""
-
-#: addons/dashboard/class_dashBoardPPolicy.inc:43
-#: addons/dashboard/ppolicy_locked_accounts.tpl.c:8
-msgid "Locked accounts"
-msgstr ""
-
-#: addons/dashboard/class_dashBoardPPolicy.inc:69
-#: addons/dashboard/class_dashBoardPPolicy.inc:124
-msgid "Configuration error"
-msgstr ""
-
-#: addons/dashboard/class_dashBoardPPolicy.inc:70
-#, php-format
-msgid "Default ppolicy \"%s\" could not be found in the LDAP!"
-msgstr ""
-
-#: addons/dashboard/class_dashBoardPPolicy.inc:125
-#, php-format
-msgid "Ppolicy \"%s\" set for user \"%s\" could not be found in the LDAP!"
-msgstr ""
-
 #: personal/ppolicy/class_ppolicyAccount.inc:38
 msgid "Edit user's password policy"
 msgstr ""
@@ -251,11 +218,11 @@ msgstr ""
 msgid "Use the default"
 msgstr ""
 
-#: personal/ppolicy/class_ppolicyAccount.inc:92
+#: personal/ppolicy/class_ppolicyAccount.inc:102
 msgid "Never"
 msgstr ""
 
-#: personal/ppolicy/class_ppolicyAccount.inc:100
+#: personal/ppolicy/class_ppolicyAccount.inc:109
 msgid "Unlocked"
 msgstr ""
 
@@ -286,46 +253,3 @@ msgstr ""
 #: config/ppolicy/class_ppolicyConfig.inc:50
 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"
-msgstr[0] ""
-msgstr[1] ""
-msgstr[2] ""
-msgstr[3] ""
-msgstr[4] ""
-msgstr[5] ""
-
-#: addons/dashboard/ppolicy_locked_accounts.tpl.c:5
-msgid "There is no locked account"
-msgstr ""
-
-#: addons/dashboard/ppolicy_locked_accounts.tpl.c:11
-msgid "Manager concerned"
-msgstr ""
-
-#: addons/dashboard/ppolicy_locked_accounts.tpl.c:14
-msgid "uid"
-msgstr ""
-
-#: addons/dashboard/ppolicy_locked_accounts.tpl.c:17
-msgid "cn"
-msgstr ""
-
-#: addons/dashboard/ppolicy_locked_accounts.tpl.c:20
-#: addons/dashboard/ppolicy_locked_accounts.tpl.c:32
-msgid "telephoneNumber"
-msgstr ""
-
-#: addons/dashboard/ppolicy_locked_accounts.tpl.c:23
-msgid "pwdAccountLockedTime"
-msgstr ""
-
-#: addons/dashboard/ppolicy_locked_accounts.tpl.c:26
-msgid "manager"
-msgstr ""
-
-#: addons/dashboard/ppolicy_locked_accounts.tpl.c:29
-msgid "mail"
-msgstr ""
diff --git a/ppolicy/locale/ca/fusiondirectory.po b/ppolicy/locale/ca/fusiondirectory.po
index ed3d34e4f79c43956da2adf36d6c3e66d81f032b..b688abd409f5a337741ec58ce44810b9b00eeac0 100644
--- a/ppolicy/locale/ca/fusiondirectory.po
+++ b/ppolicy/locale/ca/fusiondirectory.po
@@ -5,12 +5,12 @@
 # Translators:
 msgid ""
 msgstr ""
-"Project-Id-Version: FusionDirectory-108\n"
+"Project-Id-Version: FusionDirectory-109\n"
 "Report-Msgid-Bugs-To: documentation@lists.fusiondirectory.org\n"
-"POT-Creation-Date: 2015-03-31 11:49+0200\n"
-"PO-Revision-Date: 2015-03-31 11:42+0000\n"
-"Last-Translator: fusiondirectory <contact@fusiondirectory.org>\n"
-"Language-Team: Catalan (http://www.transifex.com/projects/p/FusionDirectory-108/language/ca/)\n"
+"POT-Creation-Date: 2015-02-10 18:26+0100\n"
+"PO-Revision-Date: 2015-02-10 17:35+0000\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: Catalan (http://www.transifex.com/projects/p/FusionDirectory-109/language/ca/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -84,14 +84,13 @@ msgid ""
 msgstr ""
 
 #: admin/ppolicy/class_ppolicy.inc:79
-msgid "Expiry warning delay"
+msgid "Expire warning delay"
 msgstr ""
 
 #: admin/ppolicy/class_ppolicy.inc:79
 msgid ""
-"Defines the start time - in seconds - prior to the password expiry that "
-"password expiry warning messages are returned in bind responses. 0 to "
-"disable"
+"Start time prior to the password expiry that password expiry warning "
+"messages are returned in bind responses"
 msgstr ""
 
 #: admin/ppolicy/class_ppolicy.inc:84
@@ -175,38 +174,6 @@ msgid ""
 "administrator following an automatic lockout"
 msgstr ""
 
-#: addons/dashboard/class_dashBoardPPolicy.inc:26
-msgid "Ppolicy"
-msgstr ""
-
-#: addons/dashboard/class_dashBoardPPolicy.inc:27
-msgid "Statistics about ppolicy expired users"
-msgstr ""
-
-#: addons/dashboard/class_dashBoardPPolicy.inc:38
-msgid "Expired accounts"
-msgstr ""
-
-#: addons/dashboard/class_dashBoardPPolicy.inc:43
-#: addons/dashboard/ppolicy_locked_accounts.tpl.c:8
-msgid "Locked accounts"
-msgstr ""
-
-#: addons/dashboard/class_dashBoardPPolicy.inc:69
-#: addons/dashboard/class_dashBoardPPolicy.inc:124
-msgid "Configuration error"
-msgstr "Error de la configuraciÃ³"
-
-#: addons/dashboard/class_dashBoardPPolicy.inc:70
-#, php-format
-msgid "Default ppolicy \"%s\" could not be found in the LDAP!"
-msgstr ""
-
-#: addons/dashboard/class_dashBoardPPolicy.inc:125
-#, php-format
-msgid "Ppolicy \"%s\" set for user \"%s\" could not be found in the LDAP!"
-msgstr ""
-
 #: personal/ppolicy/class_ppolicyAccount.inc:38
 msgid "Edit user's password policy"
 msgstr ""
@@ -251,11 +218,11 @@ msgstr ""
 msgid "Use the default"
 msgstr ""
 
-#: personal/ppolicy/class_ppolicyAccount.inc:92
+#: personal/ppolicy/class_ppolicyAccount.inc:102
 msgid "Never"
 msgstr ""
 
-#: personal/ppolicy/class_ppolicyAccount.inc:100
+#: personal/ppolicy/class_ppolicyAccount.inc:109
 msgid "Unlocked"
 msgstr ""
 
@@ -286,42 +253,3 @@ msgstr ""
 #: config/ppolicy/class_ppolicyConfig.inc:50
 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"
-msgstr[0] ""
-msgstr[1] ""
-
-#: addons/dashboard/ppolicy_locked_accounts.tpl.c:5
-msgid "There is no locked account"
-msgstr ""
-
-#: addons/dashboard/ppolicy_locked_accounts.tpl.c:11
-msgid "Manager concerned"
-msgstr ""
-
-#: addons/dashboard/ppolicy_locked_accounts.tpl.c:14
-msgid "uid"
-msgstr ""
-
-#: addons/dashboard/ppolicy_locked_accounts.tpl.c:17
-msgid "cn"
-msgstr ""
-
-#: addons/dashboard/ppolicy_locked_accounts.tpl.c:20
-#: addons/dashboard/ppolicy_locked_accounts.tpl.c:32
-msgid "telephoneNumber"
-msgstr ""
-
-#: addons/dashboard/ppolicy_locked_accounts.tpl.c:23
-msgid "pwdAccountLockedTime"
-msgstr ""
-
-#: addons/dashboard/ppolicy_locked_accounts.tpl.c:26
-msgid "manager"
-msgstr ""
-
-#: addons/dashboard/ppolicy_locked_accounts.tpl.c:29
-msgid "mail"
-msgstr ""
diff --git a/ppolicy/locale/cs_CZ/fusiondirectory.po b/ppolicy/locale/cs_CZ/fusiondirectory.po
index f52cad3e3a33bf78669fd4c6ac3e0c4151268bff..836d03ce6f44f2f095ba8ee17293b43f239658fc 100644
--- a/ppolicy/locale/cs_CZ/fusiondirectory.po
+++ b/ppolicy/locale/cs_CZ/fusiondirectory.po
@@ -6,12 +6,12 @@
 # Pavel Borecki <pavel.borecki@gmail.com>, 2015
 msgid ""
 msgstr ""
-"Project-Id-Version: FusionDirectory-108\n"
+"Project-Id-Version: FusionDirectory-109\n"
 "Report-Msgid-Bugs-To: documentation@lists.fusiondirectory.org\n"
-"POT-Creation-Date: 2015-03-31 11:49+0200\n"
-"PO-Revision-Date: 2015-03-31 11:46+0000\n"
+"POT-Creation-Date: 2015-02-10 18:26+0100\n"
+"PO-Revision-Date: 2015-04-08 08:42+0000\n"
 "Last-Translator: Pavel Borecki <pavel.borecki@gmail.com>\n"
-"Language-Team: Czech (Czech Republic) (http://www.transifex.com/projects/p/FusionDirectory-108/language/cs_CZ/)\n"
+"Language-Team: Czech (Czech Republic) (http://www.transifex.com/projects/p/FusionDirectory-109/language/cs_CZ/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -34,7 +34,7 @@ msgstr "ZÃ¡sada hesel"
 
 #: admin/ppolicy/class_ppolicy.inc:32
 msgid "Password policy for ppolicy overlay"
-msgstr "Politika hesel pro pÅ™ekrytÃ ppolicy"
+msgstr "Pravidla pro hesla pro pÅ™ekrytÃ ppolicy"
 
 #: admin/ppolicy/class_ppolicy.inc:50
 #: personal/ppolicy/class_ppolicyAccount.inc:55
@@ -53,7 +53,7 @@ msgstr "NejkratÅ¡Ã umoÅ¾nÄ›nÃ¡ dÃ©lka"
 msgid ""
 "Minimum length of the user supplied password - passwords shorter than this "
 "value will be rejected"
-msgstr "NejkratÅ¡Ã umoÅ¾nÄ›nÃ¡ dÃ©lka hesel k uÅ¾ivatelskÃ½m ÃºÄtÅ¯m â€“ kratÅ¡Ã hesla budou zamÃtÃ¡na"
+msgstr "NejkratÅ¡Ã pÅ™ijatelnÃ¡ dÃ©lka hesel, kterou budou uÅ¾ivatelÃ© moci pouÅ¾Ãt ke svÃ½m ÃºÄtÅ¯m â€“ kratÅ¡Ã hesla budou zamÃtÃ¡na"
 
 #: admin/ppolicy/class_ppolicy.inc:64
 msgid "Passwords in history"
@@ -63,7 +63,7 @@ msgstr "Hesel v historii"
 msgid ""
 "Number of passwords that are maintained in a list of previously used "
 "passwords"
-msgstr "PoÄet hesel, kterÃ© jsou uchovÃ¡vÃ¡ny v seznamu pÅ™edeÅ¡lÃ½ch hesel"
+msgstr "PoÄet hesel, kterÃ© jsou uchovÃ¡vÃ¡ny v seznamu dÅ™Ãve pouÅ¾itÃ½ch"
 
 #: admin/ppolicy/class_ppolicy.inc:69
 msgid "Minimum password age"
@@ -85,15 +85,14 @@ msgid ""
 msgstr "NejdelÅ¡Ã umoÅ¾nÄ›nÃ¡ doba, po kterou je heslo platnÃ©. Po jejÃm uplynutÃ bude povaÅ¾ovÃ¡no za nepouÅ¾itelnÃ© a jakÃ½koli pokus o spojenÃ s pouÅ¾itÃm tohoto hesla, jehoÅ¾ platnost skonÄila, bude povaÅ¾ovÃ¡n za neplatnÃ½"
 
 #: admin/ppolicy/class_ppolicy.inc:79
-msgid "Expiry warning delay"
-msgstr ""
+msgid "Expire warning delay"
+msgstr "Prodleva varovÃ¡nÃ o vyprÅ¡enÃ platnosti"
 
 #: admin/ppolicy/class_ppolicy.inc:79
 msgid ""
-"Defines the start time - in seconds - prior to the password expiry that "
-"password expiry warning messages are returned in bind responses. 0 to "
-"disable"
-msgstr ""
+"Start time prior to the password expiry that password expiry warning "
+"messages are returned in bind responses"
+msgstr "S jakÃ½m pÅ™edstihem pÅ™ed vyprÅ¡enÃm platnosti hesla posÃlat varovÃ¡nÃ pÅ™i pÅ™ipojovÃ¡nÃ heslem, jehoÅ¾ konec platnosti se blÃÅ¾Ã"
 
 #: admin/ppolicy/class_ppolicy.inc:84
 msgid "Grace period"
@@ -125,7 +124,7 @@ msgstr "Zda pÅ™i zmÄ›nÄ› hesla po uÅ¾ivateli vyÅ¾adovat to stÃ¡vajÃcÃ"
 
 #: admin/ppolicy/class_ppolicy.inc:108
 msgid "Lock out"
-msgstr "Uzamknout"
+msgstr "Zamknout"
 
 #: admin/ppolicy/class_ppolicy.inc:112
 msgid "Activate lock out"
@@ -164,7 +163,7 @@ msgstr "RozmezÃ poÄtu nezdarÅ¯"
 msgid ""
 "Time after which the count of consecutive password failures is reset even if"
 " no successful authentication has occurred"
-msgstr "Doba, po kterÃ© bude ÄÃtaÄ po sobÄ› jdoucÃch chybnÃ½ch zadÃ¡nÃ hesla resetovÃ¡n a to i v pÅ™ÃpadÄ›, Å¾e nedoÅ¡lo k ÃºspÄ›Å¡nÃ©mu pÅ™ihlÃ¡Å¡enÃ"
+msgstr "Doba, po jejÃmÅ¾ uplynutÃ budou chybnÃ¡, po sobÄ› jdoucÃ zadÃ¡nÃ hesla poÄÃtÃ¡na od znovu. Reset tohoto poÄitadla je spuÅ¡tÄ›n buÄ takto Äasem, nebo sprÃ¡vnÃ½m zadÃ¡nÃm hesla."
 
 #: admin/ppolicy/class_ppolicy.inc:132
 msgid "Must change"
@@ -176,45 +175,13 @@ 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:26
-msgid "Ppolicy"
-msgstr ""
-
-#: addons/dashboard/class_dashBoardPPolicy.inc:27
-msgid "Statistics about ppolicy expired users"
-msgstr ""
-
-#: addons/dashboard/class_dashBoardPPolicy.inc:38
-msgid "Expired accounts"
-msgstr "ÃšÄty, jejichÅ¾ platnost skonÄila"
-
-#: addons/dashboard/class_dashBoardPPolicy.inc:43
-#: addons/dashboard/ppolicy_locked_accounts.tpl.c:8
-msgid "Locked accounts"
-msgstr ""
-
-#: addons/dashboard/class_dashBoardPPolicy.inc:69
-#: addons/dashboard/class_dashBoardPPolicy.inc:124
-msgid "Configuration error"
-msgstr "Chyba v nastavenÃ"
-
-#: addons/dashboard/class_dashBoardPPolicy.inc:70
-#, php-format
-msgid "Default ppolicy \"%s\" could not be found in the LDAP!"
-msgstr ""
-
-#: addons/dashboard/class_dashBoardPPolicy.inc:125
-#, php-format
-msgid "Ppolicy \"%s\" set for user \"%s\" could not be found in the LDAP!"
-msgstr ""
-
 #: personal/ppolicy/class_ppolicyAccount.inc:38
 msgid "Edit user's password policy"
-msgstr "Upravit zÃ¡sadu hesel uÅ¾ivatele"
+msgstr "Upravit zÃ¡sady hesel uÅ¾ivatelÅ¯"
 
 #: personal/ppolicy/class_ppolicyAccount.inc:55
 msgid "Use a specific policy for this user"
-msgstr "Pro tohoto uÅ¾ivatele pouÅ¾Ãt zvlÃ¡Å¡tnÃ pravidla"
+msgstr "Pro tohoto uÅ¾ivatele pouÅ¾Ãt zvlÃ¡Å¡tnÃ zÃ¡sady"
 
 #: personal/ppolicy/class_ppolicyAccount.inc:59
 msgid "Last password change"
@@ -246,17 +213,17 @@ msgstr "Resetovat s nezmÄ›nÄ›nÃ½m heslem"
 
 #: personal/ppolicy/class_ppolicyAccount.inc:70
 msgid "Reset and force change"
-msgstr "Resetovat a vynutit zmÄ›nu"
+msgstr "Znovu nastavit a vynutit zmÄ›nu"
 
 #: personal/ppolicy/class_ppolicyAccount.inc:85
 msgid "Use the default"
 msgstr "PouÅ¾Ãt vÃ½chozÃ"
 
-#: personal/ppolicy/class_ppolicyAccount.inc:92
+#: personal/ppolicy/class_ppolicyAccount.inc:102
 msgid "Never"
 msgstr "Nikdy"
 
-#: personal/ppolicy/class_ppolicyAccount.inc:100
+#: personal/ppolicy/class_ppolicyAccount.inc:109
 msgid "Unlocked"
 msgstr "OdemÄeno"
 
@@ -287,43 +254,3 @@ msgstr "BÄ›Å¾nÃ½ nÃ¡zev vÃ½chozÃ ppolicy"
 #: config/ppolicy/class_ppolicyConfig.inc:50
 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"
-msgstr[0] ""
-msgstr[1] ""
-msgstr[2] ""
-
-#: addons/dashboard/ppolicy_locked_accounts.tpl.c:5
-msgid "There is no locked account"
-msgstr ""
-
-#: addons/dashboard/ppolicy_locked_accounts.tpl.c:11
-msgid "Manager concerned"
-msgstr "NadÅ™ÃzenÃ½, kterÃ©ho se tÃ½kÃ¡"
-
-#: addons/dashboard/ppolicy_locked_accounts.tpl.c:14
-msgid "uid"
-msgstr ""
-
-#: addons/dashboard/ppolicy_locked_accounts.tpl.c:17
-msgid "cn"
-msgstr ""
-
-#: addons/dashboard/ppolicy_locked_accounts.tpl.c:20
-#: addons/dashboard/ppolicy_locked_accounts.tpl.c:32
-msgid "telephoneNumber"
-msgstr "telefonniCislo"
-
-#: addons/dashboard/ppolicy_locked_accounts.tpl.c:23
-msgid "pwdAccountLockedTime"
-msgstr ""
-
-#: addons/dashboard/ppolicy_locked_accounts.tpl.c:26
-msgid "manager"
-msgstr "nadÅ™ÃzenÃ½"
-
-#: addons/dashboard/ppolicy_locked_accounts.tpl.c:29
-msgid "mail"
-msgstr "E-mail"
diff --git a/ppolicy/locale/de/fusiondirectory.po b/ppolicy/locale/de/fusiondirectory.po
index 0fde0e4fbf0b8165b1bab5fe93e64ac76ab1a3d8..e955e63e1bbf05af2a88583986b5c520ed1cfb7f 100644
--- a/ppolicy/locale/de/fusiondirectory.po
+++ b/ppolicy/locale/de/fusiondirectory.po
@@ -3,14 +3,15 @@
 # This file is distributed under the same license as the PACKAGE package.
 # 
 # Translators:
+# Ettore Atalan <atalanttore@googlemail.com>, 2015
 msgid ""
 msgstr ""
-"Project-Id-Version: FusionDirectory-108\n"
+"Project-Id-Version: FusionDirectory-109\n"
 "Report-Msgid-Bugs-To: documentation@lists.fusiondirectory.org\n"
-"POT-Creation-Date: 2015-03-31 11:49+0200\n"
-"PO-Revision-Date: 2015-03-31 11:42+0000\n"
-"Last-Translator: fusiondirectory <contact@fusiondirectory.org>\n"
-"Language-Team: German (http://www.transifex.com/projects/p/FusionDirectory-108/language/de/)\n"
+"POT-Creation-Date: 2015-02-10 18:26+0100\n"
+"PO-Revision-Date: 2015-05-30 13:10+0000\n"
+"Last-Translator: Ettore Atalan <atalanttore@googlemail.com>\n"
+"Language-Team: German (http://www.transifex.com/projects/p/FusionDirectory-109/language/de/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -19,17 +20,17 @@ msgstr ""
 
 #: admin/ppolicy/class_ppolicyManagement.inc:28
 msgid "Password policies"
-msgstr ""
+msgstr "Passwortrichtlinien"
 
 #: admin/ppolicy/class_ppolicyManagement.inc:29
 msgid "Password policies management"
-msgstr ""
+msgstr "Passwortrichtlinienverwaltung"
 
 #: admin/ppolicy/class_ppolicy.inc:31 admin/ppolicy/class_ppolicy.inc:34
 #: personal/ppolicy/class_ppolicyAccount.inc:37
 #: personal/ppolicy/class_ppolicyAccount.inc:52
 msgid "Password policy"
-msgstr ""
+msgstr "Passwortrichtlinie"
 
 #: admin/ppolicy/class_ppolicy.inc:32
 msgid "Password policy for ppolicy overlay"
@@ -38,15 +39,15 @@ msgstr ""
 #: admin/ppolicy/class_ppolicy.inc:50
 #: personal/ppolicy/class_ppolicyAccount.inc:55
 msgid "Policy"
-msgstr ""
+msgstr "Richtlinie"
 
 #: admin/ppolicy/class_ppolicy.inc:55
 msgid "Policy name"
-msgstr ""
+msgstr "Richtlinienname"
 
 #: admin/ppolicy/class_ppolicy.inc:59
 msgid "Minimum length"
-msgstr ""
+msgstr "Minimale LÃ¤nge"
 
 #: admin/ppolicy/class_ppolicy.inc:59
 msgid ""
@@ -56,7 +57,7 @@ msgstr ""
 
 #: admin/ppolicy/class_ppolicy.inc:64
 msgid "Passwords in history"
-msgstr ""
+msgstr "PasswÃ¶rter im Verlauf"
 
 #: admin/ppolicy/class_ppolicy.inc:64
 msgid ""
@@ -84,14 +85,13 @@ msgid ""
 msgstr ""
 
 #: admin/ppolicy/class_ppolicy.inc:79
-msgid "Expiry warning delay"
+msgid "Expire warning delay"
 msgstr ""
 
 #: admin/ppolicy/class_ppolicy.inc:79
 msgid ""
-"Defines the start time - in seconds - prior to the password expiry that "
-"password expiry warning messages are returned in bind responses. 0 to "
-"disable"
+"Start time prior to the password expiry that password expiry warning "
+"messages are returned in bind responses"
 msgstr ""
 
 #: admin/ppolicy/class_ppolicy.inc:84
@@ -106,7 +106,7 @@ msgstr ""
 
 #: admin/ppolicy/class_ppolicy.inc:89
 msgid "Allow user change"
-msgstr ""
+msgstr "BenutzerÃ¤nderung erlauben"
 
 #: admin/ppolicy/class_ppolicy.inc:89
 msgid "Whether users are allowed to change their own passwords"
@@ -175,41 +175,9 @@ msgid ""
 "administrator following an automatic lockout"
 msgstr ""
 
-#: addons/dashboard/class_dashBoardPPolicy.inc:26
-msgid "Ppolicy"
-msgstr ""
-
-#: addons/dashboard/class_dashBoardPPolicy.inc:27
-msgid "Statistics about ppolicy expired users"
-msgstr ""
-
-#: addons/dashboard/class_dashBoardPPolicy.inc:38
-msgid "Expired accounts"
-msgstr "Abgelaufene Konten"
-
-#: addons/dashboard/class_dashBoardPPolicy.inc:43
-#: addons/dashboard/ppolicy_locked_accounts.tpl.c:8
-msgid "Locked accounts"
-msgstr ""
-
-#: addons/dashboard/class_dashBoardPPolicy.inc:69
-#: addons/dashboard/class_dashBoardPPolicy.inc:124
-msgid "Configuration error"
-msgstr "Konfigurationsfehler"
-
-#: addons/dashboard/class_dashBoardPPolicy.inc:70
-#, php-format
-msgid "Default ppolicy \"%s\" could not be found in the LDAP!"
-msgstr ""
-
-#: addons/dashboard/class_dashBoardPPolicy.inc:125
-#, php-format
-msgid "Ppolicy \"%s\" set for user \"%s\" could not be found in the LDAP!"
-msgstr ""
-
 #: personal/ppolicy/class_ppolicyAccount.inc:38
 msgid "Edit user's password policy"
-msgstr ""
+msgstr "Passwortrichtlinie des Benutzers bearbeiten"
 
 #: personal/ppolicy/class_ppolicyAccount.inc:55
 msgid "Use a specific policy for this user"
@@ -217,7 +185,7 @@ msgstr ""
 
 #: personal/ppolicy/class_ppolicyAccount.inc:59
 msgid "Last password change"
-msgstr ""
+msgstr "Letzte PasswortÃ¤nderung"
 
 #: personal/ppolicy/class_ppolicyAccount.inc:59
 msgid "Last time the password for the entry was changed"
@@ -249,15 +217,15 @@ msgstr ""
 
 #: personal/ppolicy/class_ppolicyAccount.inc:85
 msgid "Use the default"
-msgstr ""
+msgstr "Standard verwenden"
 
-#: personal/ppolicy/class_ppolicyAccount.inc:92
+#: personal/ppolicy/class_ppolicyAccount.inc:102
 msgid "Never"
-msgstr ""
+msgstr "Nie"
 
-#: personal/ppolicy/class_ppolicyAccount.inc:100
+#: personal/ppolicy/class_ppolicyAccount.inc:109
 msgid "Unlocked"
-msgstr ""
+msgstr "Entsperrt"
 
 #: config/ppolicy/class_ppolicyConfig.inc:28
 msgid "Ppolicy plugin configuration"
@@ -286,42 +254,3 @@ msgstr ""
 #: config/ppolicy/class_ppolicyConfig.inc:50
 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"
-msgstr[0] ""
-msgstr[1] ""
-
-#: addons/dashboard/ppolicy_locked_accounts.tpl.c:5
-msgid "There is no locked account"
-msgstr ""
-
-#: addons/dashboard/ppolicy_locked_accounts.tpl.c:11
-msgid "Manager concerned"
-msgstr "Manager betreffend"
-
-#: addons/dashboard/ppolicy_locked_accounts.tpl.c:14
-msgid "uid"
-msgstr "uid"
-
-#: addons/dashboard/ppolicy_locked_accounts.tpl.c:17
-msgid "cn"
-msgstr "cn"
-
-#: addons/dashboard/ppolicy_locked_accounts.tpl.c:20
-#: addons/dashboard/ppolicy_locked_accounts.tpl.c:32
-msgid "telephoneNumber"
-msgstr "telephoneNumber"
-
-#: addons/dashboard/ppolicy_locked_accounts.tpl.c:23
-msgid "pwdAccountLockedTime"
-msgstr ""
-
-#: addons/dashboard/ppolicy_locked_accounts.tpl.c:26
-msgid "manager"
-msgstr "manager"
-
-#: addons/dashboard/ppolicy_locked_accounts.tpl.c:29
-msgid "mail"
-msgstr "mail"
diff --git a/ppolicy/locale/el_GR/fusiondirectory.po b/ppolicy/locale/el_GR/fusiondirectory.po
new file mode 100644
index 0000000000000000000000000000000000000000..432dc1288fe82277e28f96b98f441cb0ce08f2d3
--- /dev/null
+++ b/ppolicy/locale/el_GR/fusiondirectory.po
@@ -0,0 +1,255 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR FusionDirectory Project
+# This file is distributed under the same license as the PACKAGE package.
+# 
+# Translators:
+msgid ""
+msgstr ""
+"Project-Id-Version: FusionDirectory-109\n"
+"Report-Msgid-Bugs-To: documentation@lists.fusiondirectory.org\n"
+"POT-Creation-Date: 2015-02-10 18:26+0100\n"
+"PO-Revision-Date: 2015-05-30 11:45+0000\n"
+"Last-Translator: Benoit Mortier <benoit.mortier@opensides.be>\n"
+"Language-Team: Greek (Greece) (http://www.transifex.com/projects/p/FusionDirectory-109/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/ppolicy/class_ppolicyManagement.inc:28
+msgid "Password policies"
+msgstr ""
+
+#: admin/ppolicy/class_ppolicyManagement.inc:29
+msgid "Password policies management"
+msgstr ""
+
+#: admin/ppolicy/class_ppolicy.inc:31 admin/ppolicy/class_ppolicy.inc:34
+#: personal/ppolicy/class_ppolicyAccount.inc:37
+#: personal/ppolicy/class_ppolicyAccount.inc:52
+msgid "Password policy"
+msgstr ""
+
+#: admin/ppolicy/class_ppolicy.inc:32
+msgid "Password policy for ppolicy overlay"
+msgstr ""
+
+#: admin/ppolicy/class_ppolicy.inc:50
+#: personal/ppolicy/class_ppolicyAccount.inc:55
+msgid "Policy"
+msgstr ""
+
+#: admin/ppolicy/class_ppolicy.inc:55
+msgid "Policy name"
+msgstr ""
+
+#: admin/ppolicy/class_ppolicy.inc:59
+msgid "Minimum length"
+msgstr ""
+
+#: admin/ppolicy/class_ppolicy.inc:59
+msgid ""
+"Minimum length of the user supplied password - passwords shorter than this "
+"value will be rejected"
+msgstr ""
+
+#: admin/ppolicy/class_ppolicy.inc:64
+msgid "Passwords in history"
+msgstr ""
+
+#: admin/ppolicy/class_ppolicy.inc:64
+msgid ""
+"Number of passwords that are maintained in a list of previously used "
+"passwords"
+msgstr ""
+
+#: admin/ppolicy/class_ppolicy.inc:69
+msgid "Minimum password age"
+msgstr ""
+
+#: admin/ppolicy/class_ppolicy.inc:69
+msgid "Minimum time between password changes"
+msgstr ""
+
+#: admin/ppolicy/class_ppolicy.inc:74
+msgid "Maximum password age"
+msgstr ""
+
+#: admin/ppolicy/class_ppolicy.inc:74
+msgid ""
+"Maximum time a password is valid, after which it is deemed to be no longer "
+"usable and any bind operations attempted with the expired password will be "
+"treated as invalid"
+msgstr ""
+
+#: admin/ppolicy/class_ppolicy.inc:79
+msgid "Expire warning delay"
+msgstr ""
+
+#: admin/ppolicy/class_ppolicy.inc:79
+msgid ""
+"Start time prior to the password expiry that password expiry warning "
+"messages are returned in bind responses"
+msgstr ""
+
+#: admin/ppolicy/class_ppolicy.inc:84
+msgid "Grace period"
+msgstr ""
+
+#: admin/ppolicy/class_ppolicy.inc:84
+msgid ""
+"Number of times a user is allowed to successfully bind using an expired "
+"password"
+msgstr ""
+
+#: admin/ppolicy/class_ppolicy.inc:89
+msgid "Allow user change"
+msgstr ""
+
+#: admin/ppolicy/class_ppolicy.inc:89
+msgid "Whether users are allowed to change their own passwords"
+msgstr ""
+
+#: admin/ppolicy/class_ppolicy.inc:94
+msgid "Safe modify"
+msgstr ""
+
+#: admin/ppolicy/class_ppolicy.inc:94
+msgid ""
+"Whether a user must send the current password during a password modification"
+" operation"
+msgstr ""
+
+#: admin/ppolicy/class_ppolicy.inc:108
+msgid "Lock out"
+msgstr ""
+
+#: admin/ppolicy/class_ppolicy.inc:112
+msgid "Activate lock out"
+msgstr ""
+
+#: admin/ppolicy/class_ppolicy.inc:112
+msgid ""
+"Whether to lock an account that had more consecutive failed bind attempts "
+"with invalid passwords than is defined by \"Maximum failures\""
+msgstr ""
+
+#: admin/ppolicy/class_ppolicy.inc:117
+msgid "Lock out duration"
+msgstr ""
+
+#: admin/ppolicy/class_ppolicy.inc:117
+msgid ""
+"Time the account remains locked after an automatic lock out (0 means for "
+"ever)"
+msgstr ""
+
+#: admin/ppolicy/class_ppolicy.inc:122
+msgid "Maximum failures"
+msgstr ""
+
+#: admin/ppolicy/class_ppolicy.inc:122
+msgid ""
+"Number of consecutive password failures allowed before automatic lock out"
+msgstr ""
+
+#: admin/ppolicy/class_ppolicy.inc:127
+msgid "Failure count interval"
+msgstr ""
+
+#: admin/ppolicy/class_ppolicy.inc:127
+msgid ""
+"Time after which the count of consecutive password failures is reset even if"
+" no successful authentication has occurred"
+msgstr ""
+
+#: admin/ppolicy/class_ppolicy.inc:132
+msgid "Must change"
+msgstr ""
+
+#: admin/ppolicy/class_ppolicy.inc:132
+msgid ""
+"Whether the user must change their password after an account is reset by an "
+"administrator following an automatic lockout"
+msgstr ""
+
+#: personal/ppolicy/class_ppolicyAccount.inc:38
+msgid "Edit user's password policy"
+msgstr ""
+
+#: personal/ppolicy/class_ppolicyAccount.inc:55
+msgid "Use a specific policy for this user"
+msgstr ""
+
+#: personal/ppolicy/class_ppolicyAccount.inc:59
+msgid "Last password change"
+msgstr ""
+
+#: personal/ppolicy/class_ppolicyAccount.inc:59
+msgid "Last time the password for the entry was changed"
+msgstr ""
+
+#: personal/ppolicy/class_ppolicyAccount.inc:63
+msgid "Account locked time"
+msgstr ""
+
+#: personal/ppolicy/class_ppolicyAccount.inc:63
+msgid "Time the account was locked"
+msgstr ""
+
+#: personal/ppolicy/class_ppolicyAccount.inc:67
+msgid "Reset locking"
+msgstr ""
+
+#: personal/ppolicy/class_ppolicyAccount.inc:67
+msgid "Resets the lock status of this account"
+msgstr ""
+
+#: personal/ppolicy/class_ppolicyAccount.inc:70
+msgid "Reset with the same password"
+msgstr ""
+
+#: personal/ppolicy/class_ppolicyAccount.inc:70
+msgid "Reset and force change"
+msgstr ""
+
+#: personal/ppolicy/class_ppolicyAccount.inc:85
+msgid "Use the default"
+msgstr ""
+
+#: personal/ppolicy/class_ppolicyAccount.inc:102
+msgid "Never"
+msgstr ""
+
+#: personal/ppolicy/class_ppolicyAccount.inc:109
+msgid "Unlocked"
+msgstr ""
+
+#: config/ppolicy/class_ppolicyConfig.inc:28
+msgid "Ppolicy plugin configuration"
+msgstr ""
+
+#: config/ppolicy/class_ppolicyConfig.inc:29
+msgid "FusionDirectory ppolicy plugin configuration"
+msgstr ""
+
+#: config/ppolicy/class_ppolicyConfig.inc:42
+msgid "Ppolicy plugin"
+msgstr ""
+
+#: config/ppolicy/class_ppolicyConfig.inc:45
+msgid "Ppolicy RDN"
+msgstr ""
+
+#: config/ppolicy/class_ppolicyConfig.inc:45
+msgid "Branch in which ppolicies will be stored"
+msgstr ""
+
+#: config/ppolicy/class_ppolicyConfig.inc:50
+msgid "Default ppolicy cn"
+msgstr ""
+
+#: config/ppolicy/class_ppolicyConfig.inc:50
+msgid "What you put as default ppolicy in the overlay config"
+msgstr ""
diff --git a/ppolicy/locale/en/fusiondirectory.po b/ppolicy/locale/en/fusiondirectory.po
index 5e2440f2b4167e6e33e3338add35964ec6806ab2..d3f11033c7b40e69aa19e4d1b431543944df2de2 100644
--- a/ppolicy/locale/en/fusiondirectory.po
+++ b/ppolicy/locale/en/fusiondirectory.po
@@ -3,18 +3,20 @@
 # This file is distributed under the same license as the PACKAGE package.
 # FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
 #
+#, fuzzy
 msgid ""
 msgstr ""
-"Project-Id-Version: PACKAGE VERSION\n"
-"Report-Msgid-Bugs-To: documentation@lists.fusiondirectory.org\n"
-"POT-Creation-Date: 2015-03-31 11:49+0200\n"
+"Project-Id-Version: FusionDirectory VERSION\n"
+"Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
+"POT-Creation-Date: 2015-05-30 15:30+0200\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
-"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
-"Language-Team: LANGUAGE <LL@li.org>\n"
-"Language: \n"
+"Last-Translator: FusionDirectory project <contact@fusiondirectory.org>\n"
+"Language-Team: English\n"
+"Language: en\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
 #: admin/ppolicy/class_ppolicyManagement.inc:28
 msgid "Password policies"
@@ -249,11 +251,11 @@ msgstr ""
 msgid "Use the default"
 msgstr ""
 
-#: personal/ppolicy/class_ppolicyAccount.inc:92
+#: personal/ppolicy/class_ppolicyAccount.inc:91
 msgid "Never"
 msgstr ""
 
-#: personal/ppolicy/class_ppolicyAccount.inc:100
+#: personal/ppolicy/class_ppolicyAccount.inc:98
 msgid "Unlocked"
 msgstr ""
 
diff --git a/ppolicy/locale/es/fusiondirectory.po b/ppolicy/locale/es/fusiondirectory.po
index 04e6bb0fdd576bbddef4899bb6127da7deee5716..601ceab79c7fefe58e8486e22ead07f3316acb1a 100644
--- a/ppolicy/locale/es/fusiondirectory.po
+++ b/ppolicy/locale/es/fusiondirectory.po
@@ -5,12 +5,12 @@
 # Translators:
 msgid ""
 msgstr ""
-"Project-Id-Version: FusionDirectory-108\n"
+"Project-Id-Version: FusionDirectory-109\n"
 "Report-Msgid-Bugs-To: documentation@lists.fusiondirectory.org\n"
-"POT-Creation-Date: 2015-03-31 11:49+0200\n"
-"PO-Revision-Date: 2015-03-31 11:42+0000\n"
-"Last-Translator: fusiondirectory <contact@fusiondirectory.org>\n"
-"Language-Team: Spanish (http://www.transifex.com/projects/p/FusionDirectory-108/language/es/)\n"
+"POT-Creation-Date: 2015-02-10 18:26+0100\n"
+"PO-Revision-Date: 2015-02-10 17:35+0000\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: Spanish (http://www.transifex.com/projects/p/FusionDirectory-109/language/es/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -84,14 +84,13 @@ msgid ""
 msgstr ""
 
 #: admin/ppolicy/class_ppolicy.inc:79
-msgid "Expiry warning delay"
+msgid "Expire warning delay"
 msgstr ""
 
 #: admin/ppolicy/class_ppolicy.inc:79
 msgid ""
-"Defines the start time - in seconds - prior to the password expiry that "
-"password expiry warning messages are returned in bind responses. 0 to "
-"disable"
+"Start time prior to the password expiry that password expiry warning "
+"messages are returned in bind responses"
 msgstr ""
 
 #: admin/ppolicy/class_ppolicy.inc:84
@@ -175,38 +174,6 @@ msgid ""
 "administrator following an automatic lockout"
 msgstr ""
 
-#: addons/dashboard/class_dashBoardPPolicy.inc:26
-msgid "Ppolicy"
-msgstr ""
-
-#: addons/dashboard/class_dashBoardPPolicy.inc:27
-msgid "Statistics about ppolicy expired users"
-msgstr ""
-
-#: addons/dashboard/class_dashBoardPPolicy.inc:38
-msgid "Expired accounts"
-msgstr ""
-
-#: addons/dashboard/class_dashBoardPPolicy.inc:43
-#: addons/dashboard/ppolicy_locked_accounts.tpl.c:8
-msgid "Locked accounts"
-msgstr ""
-
-#: addons/dashboard/class_dashBoardPPolicy.inc:69
-#: addons/dashboard/class_dashBoardPPolicy.inc:124
-msgid "Configuration error"
-msgstr "Error en la configuraciÃ³n"
-
-#: addons/dashboard/class_dashBoardPPolicy.inc:70
-#, php-format
-msgid "Default ppolicy \"%s\" could not be found in the LDAP!"
-msgstr ""
-
-#: addons/dashboard/class_dashBoardPPolicy.inc:125
-#, php-format
-msgid "Ppolicy \"%s\" set for user \"%s\" could not be found in the LDAP!"
-msgstr ""
-
 #: personal/ppolicy/class_ppolicyAccount.inc:38
 msgid "Edit user's password policy"
 msgstr ""
@@ -251,11 +218,11 @@ msgstr ""
 msgid "Use the default"
 msgstr ""
 
-#: personal/ppolicy/class_ppolicyAccount.inc:92
+#: personal/ppolicy/class_ppolicyAccount.inc:102
 msgid "Never"
 msgstr ""
 
-#: personal/ppolicy/class_ppolicyAccount.inc:100
+#: personal/ppolicy/class_ppolicyAccount.inc:109
 msgid "Unlocked"
 msgstr ""
 
@@ -286,42 +253,3 @@ msgstr ""
 #: config/ppolicy/class_ppolicyConfig.inc:50
 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"
-msgstr[0] ""
-msgstr[1] ""
-
-#: addons/dashboard/ppolicy_locked_accounts.tpl.c:5
-msgid "There is no locked account"
-msgstr ""
-
-#: addons/dashboard/ppolicy_locked_accounts.tpl.c:11
-msgid "Manager concerned"
-msgstr ""
-
-#: addons/dashboard/ppolicy_locked_accounts.tpl.c:14
-msgid "uid"
-msgstr "uid"
-
-#: addons/dashboard/ppolicy_locked_accounts.tpl.c:17
-msgid "cn"
-msgstr ""
-
-#: addons/dashboard/ppolicy_locked_accounts.tpl.c:20
-#: addons/dashboard/ppolicy_locked_accounts.tpl.c:32
-msgid "telephoneNumber"
-msgstr "telephoneNumber (Numero de Telefono)"
-
-#: addons/dashboard/ppolicy_locked_accounts.tpl.c:23
-msgid "pwdAccountLockedTime"
-msgstr ""
-
-#: addons/dashboard/ppolicy_locked_accounts.tpl.c:26
-msgid "manager"
-msgstr ""
-
-#: addons/dashboard/ppolicy_locked_accounts.tpl.c:29
-msgid "mail"
-msgstr ""
diff --git a/ppolicy/locale/es_VE/fusiondirectory.po b/ppolicy/locale/es_VE/fusiondirectory.po
index f0684922958c6be4ad85fd35961d2bb5be5ec1e3..43010cae64bd32c3ec558142df3b7c93c0b11c83 100644
--- a/ppolicy/locale/es_VE/fusiondirectory.po
+++ b/ppolicy/locale/es_VE/fusiondirectory.po
@@ -5,12 +5,12 @@
 # Translators:
 msgid ""
 msgstr ""
-"Project-Id-Version: FusionDirectory-108\n"
+"Project-Id-Version: FusionDirectory-109\n"
 "Report-Msgid-Bugs-To: documentation@lists.fusiondirectory.org\n"
-"POT-Creation-Date: 2015-03-31 11:49+0200\n"
-"PO-Revision-Date: 2015-03-31 11:42+0000\n"
-"Last-Translator: fusiondirectory <contact@fusiondirectory.org>\n"
-"Language-Team: Spanish (Venezuela) (http://www.transifex.com/projects/p/FusionDirectory-108/language/es_VE/)\n"
+"POT-Creation-Date: 2015-02-10 18:26+0100\n"
+"PO-Revision-Date: 2015-02-10 17:35+0000\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: Spanish (Venezuela) (http://www.transifex.com/projects/p/FusionDirectory-109/language/es_VE/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -84,14 +84,13 @@ msgid ""
 msgstr ""
 
 #: admin/ppolicy/class_ppolicy.inc:79
-msgid "Expiry warning delay"
+msgid "Expire warning delay"
 msgstr ""
 
 #: admin/ppolicy/class_ppolicy.inc:79
 msgid ""
-"Defines the start time - in seconds - prior to the password expiry that "
-"password expiry warning messages are returned in bind responses. 0 to "
-"disable"
+"Start time prior to the password expiry that password expiry warning "
+"messages are returned in bind responses"
 msgstr ""
 
 #: admin/ppolicy/class_ppolicy.inc:84
@@ -175,38 +174,6 @@ msgid ""
 "administrator following an automatic lockout"
 msgstr ""
 
-#: addons/dashboard/class_dashBoardPPolicy.inc:26
-msgid "Ppolicy"
-msgstr ""
-
-#: addons/dashboard/class_dashBoardPPolicy.inc:27
-msgid "Statistics about ppolicy expired users"
-msgstr ""
-
-#: addons/dashboard/class_dashBoardPPolicy.inc:38
-msgid "Expired accounts"
-msgstr ""
-
-#: addons/dashboard/class_dashBoardPPolicy.inc:43
-#: addons/dashboard/ppolicy_locked_accounts.tpl.c:8
-msgid "Locked accounts"
-msgstr ""
-
-#: addons/dashboard/class_dashBoardPPolicy.inc:69
-#: addons/dashboard/class_dashBoardPPolicy.inc:124
-msgid "Configuration error"
-msgstr "Error en la configuraciÃ³n"
-
-#: addons/dashboard/class_dashBoardPPolicy.inc:70
-#, php-format
-msgid "Default ppolicy \"%s\" could not be found in the LDAP!"
-msgstr ""
-
-#: addons/dashboard/class_dashBoardPPolicy.inc:125
-#, php-format
-msgid "Ppolicy \"%s\" set for user \"%s\" could not be found in the LDAP!"
-msgstr ""
-
 #: personal/ppolicy/class_ppolicyAccount.inc:38
 msgid "Edit user's password policy"
 msgstr ""
@@ -251,11 +218,11 @@ msgstr ""
 msgid "Use the default"
 msgstr ""
 
-#: personal/ppolicy/class_ppolicyAccount.inc:92
+#: personal/ppolicy/class_ppolicyAccount.inc:102
 msgid "Never"
 msgstr ""
 
-#: personal/ppolicy/class_ppolicyAccount.inc:100
+#: personal/ppolicy/class_ppolicyAccount.inc:109
 msgid "Unlocked"
 msgstr ""
 
@@ -286,42 +253,3 @@ msgstr ""
 #: config/ppolicy/class_ppolicyConfig.inc:50
 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"
-msgstr[0] ""
-msgstr[1] ""
-
-#: addons/dashboard/ppolicy_locked_accounts.tpl.c:5
-msgid "There is no locked account"
-msgstr ""
-
-#: addons/dashboard/ppolicy_locked_accounts.tpl.c:11
-msgid "Manager concerned"
-msgstr ""
-
-#: addons/dashboard/ppolicy_locked_accounts.tpl.c:14
-msgid "uid"
-msgstr "uid"
-
-#: addons/dashboard/ppolicy_locked_accounts.tpl.c:17
-msgid "cn"
-msgstr ""
-
-#: addons/dashboard/ppolicy_locked_accounts.tpl.c:20
-#: addons/dashboard/ppolicy_locked_accounts.tpl.c:32
-msgid "telephoneNumber"
-msgstr "telephoneNumber (Numero de Telefono)"
-
-#: addons/dashboard/ppolicy_locked_accounts.tpl.c:23
-msgid "pwdAccountLockedTime"
-msgstr ""
-
-#: addons/dashboard/ppolicy_locked_accounts.tpl.c:26
-msgid "manager"
-msgstr ""
-
-#: addons/dashboard/ppolicy_locked_accounts.tpl.c:29
-msgid "mail"
-msgstr ""
diff --git a/ppolicy/locale/fa_IR/fusiondirectory.po b/ppolicy/locale/fa_IR/fusiondirectory.po
index 70839eb23502e035de87661d3aa21a652a0f1bde..b9c0707f593eadc18068fa473158f9b133473c41 100644
--- a/ppolicy/locale/fa_IR/fusiondirectory.po
+++ b/ppolicy/locale/fa_IR/fusiondirectory.po
@@ -5,12 +5,12 @@
 # Translators:
 msgid ""
 msgstr ""
-"Project-Id-Version: FusionDirectory-108\n"
+"Project-Id-Version: FusionDirectory-109\n"
 "Report-Msgid-Bugs-To: documentation@lists.fusiondirectory.org\n"
-"POT-Creation-Date: 2015-03-31 11:49+0200\n"
-"PO-Revision-Date: 2015-03-31 11:23+0000\n"
-"Last-Translator: fusiondirectory <contact@fusiondirectory.org>\n"
-"Language-Team: Persian (Iran) (http://www.transifex.com/projects/p/FusionDirectory-108/language/fa_IR/)\n"
+"POT-Creation-Date: 2015-02-10 18:26+0100\n"
+"PO-Revision-Date: 2015-02-10 17:35+0000\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: Persian (Iran) (http://www.transifex.com/projects/p/FusionDirectory-109/language/fa_IR/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -84,14 +84,13 @@ msgid ""
 msgstr ""
 
 #: admin/ppolicy/class_ppolicy.inc:79
-msgid "Expiry warning delay"
+msgid "Expire warning delay"
 msgstr ""
 
 #: admin/ppolicy/class_ppolicy.inc:79
 msgid ""
-"Defines the start time - in seconds - prior to the password expiry that "
-"password expiry warning messages are returned in bind responses. 0 to "
-"disable"
+"Start time prior to the password expiry that password expiry warning "
+"messages are returned in bind responses"
 msgstr ""
 
 #: admin/ppolicy/class_ppolicy.inc:84
@@ -175,38 +174,6 @@ msgid ""
 "administrator following an automatic lockout"
 msgstr ""
 
-#: addons/dashboard/class_dashBoardPPolicy.inc:26
-msgid "Ppolicy"
-msgstr ""
-
-#: addons/dashboard/class_dashBoardPPolicy.inc:27
-msgid "Statistics about ppolicy expired users"
-msgstr ""
-
-#: addons/dashboard/class_dashBoardPPolicy.inc:38
-msgid "Expired accounts"
-msgstr ""
-
-#: addons/dashboard/class_dashBoardPPolicy.inc:43
-#: addons/dashboard/ppolicy_locked_accounts.tpl.c:8
-msgid "Locked accounts"
-msgstr ""
-
-#: addons/dashboard/class_dashBoardPPolicy.inc:69
-#: addons/dashboard/class_dashBoardPPolicy.inc:124
-msgid "Configuration error"
-msgstr ""
-
-#: addons/dashboard/class_dashBoardPPolicy.inc:70
-#, php-format
-msgid "Default ppolicy \"%s\" could not be found in the LDAP!"
-msgstr ""
-
-#: addons/dashboard/class_dashBoardPPolicy.inc:125
-#, php-format
-msgid "Ppolicy \"%s\" set for user \"%s\" could not be found in the LDAP!"
-msgstr ""
-
 #: personal/ppolicy/class_ppolicyAccount.inc:38
 msgid "Edit user's password policy"
 msgstr ""
@@ -251,11 +218,11 @@ msgstr ""
 msgid "Use the default"
 msgstr ""
 
-#: personal/ppolicy/class_ppolicyAccount.inc:92
+#: personal/ppolicy/class_ppolicyAccount.inc:102
 msgid "Never"
 msgstr ""
 
-#: personal/ppolicy/class_ppolicyAccount.inc:100
+#: personal/ppolicy/class_ppolicyAccount.inc:109
 msgid "Unlocked"
 msgstr ""
 
@@ -286,41 +253,3 @@ msgstr ""
 #: config/ppolicy/class_ppolicyConfig.inc:50
 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"
-msgstr[0] ""
-
-#: addons/dashboard/ppolicy_locked_accounts.tpl.c:5
-msgid "There is no locked account"
-msgstr ""
-
-#: addons/dashboard/ppolicy_locked_accounts.tpl.c:11
-msgid "Manager concerned"
-msgstr ""
-
-#: addons/dashboard/ppolicy_locked_accounts.tpl.c:14
-msgid "uid"
-msgstr ""
-
-#: addons/dashboard/ppolicy_locked_accounts.tpl.c:17
-msgid "cn"
-msgstr ""
-
-#: addons/dashboard/ppolicy_locked_accounts.tpl.c:20
-#: addons/dashboard/ppolicy_locked_accounts.tpl.c:32
-msgid "telephoneNumber"
-msgstr ""
-
-#: addons/dashboard/ppolicy_locked_accounts.tpl.c:23
-msgid "pwdAccountLockedTime"
-msgstr ""
-
-#: addons/dashboard/ppolicy_locked_accounts.tpl.c:26
-msgid "manager"
-msgstr ""
-
-#: addons/dashboard/ppolicy_locked_accounts.tpl.c:29
-msgid "mail"
-msgstr ""
diff --git a/ppolicy/locale/fr/fusiondirectory.po b/ppolicy/locale/fr/fusiondirectory.po
index afee30de5eb36d6ca60e22f93c377287282acb72..f3869973f2d5f82da969d6752bcb5190dadf0e0a 100644
--- a/ppolicy/locale/fr/fusiondirectory.po
+++ b/ppolicy/locale/fr/fusiondirectory.po
@@ -3,15 +3,14 @@
 # This file is distributed under the same license as the PACKAGE package.
 # 
 # Translators:
-# Benoit Mortier <benoit.mortier@opensides.be>, 2015
 msgid ""
 msgstr ""
-"Project-Id-Version: FusionDirectory-108\n"
+"Project-Id-Version: FusionDirectory-109\n"
 "Report-Msgid-Bugs-To: documentation@lists.fusiondirectory.org\n"
-"POT-Creation-Date: 2015-03-31 11:49+0200\n"
-"PO-Revision-Date: 2015-03-31 11:48+0000\n"
-"Last-Translator: Benoit Mortier <benoit.mortier@opensides.be>\n"
-"Language-Team: French (http://www.transifex.com/projects/p/FusionDirectory-108/language/fr/)\n"
+"POT-Creation-Date: 2015-02-10 18:26+0100\n"
+"PO-Revision-Date: 2015-02-10 17:35+0000\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: French (http://www.transifex.com/projects/p/FusionDirectory-109/language/fr/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -85,15 +84,14 @@ msgid ""
 msgstr "Temps maximum un mot de passe est valide, aprÃ¨s quoi il est rÃ©putÃ© ne plus Ãªtre utilisable et toutes les opÃ©rations de connexion tentÃ© avec le mot de passe expirÃ© seront traitÃ©s comme non valides"
 
 #: admin/ppolicy/class_ppolicy.inc:79
-msgid "Expiry warning delay"
+msgid "Expire warning delay"
 msgstr "DÃ©lai d'avertissement d'expiration"
 
 #: admin/ppolicy/class_ppolicy.inc:79
 msgid ""
-"Defines the start time - in seconds - prior to the password expiry that "
-"password expiry warning messages are returned in bind responses. 0 to "
-"disable"
-msgstr "DÃ©finit l'heure de dÃ©but - en secondes - avant lâ€™expiration du mot passe qui retournera des messages d'avertissement d'expiration dans les rÃ©ponses de bind. 0 pour dÃ©sactiver"
+"Start time prior to the password expiry that password expiry warning "
+"messages are returned in bind responses"
+msgstr ""
 
 #: admin/ppolicy/class_ppolicy.inc:84
 msgid "Grace period"
@@ -176,38 +174,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 lock-out automatique"
 
-#: addons/dashboard/class_dashBoardPPolicy.inc:26
-msgid "Ppolicy"
-msgstr "Ppolicy"
-
-#: addons/dashboard/class_dashBoardPPolicy.inc:27
-msgid "Statistics about ppolicy expired users"
-msgstr "Statistiques sur les utilisateurs ppolicy expirÃ©s"
-
-#: addons/dashboard/class_dashBoardPPolicy.inc:38
-msgid "Expired accounts"
-msgstr "Comptes expirÃ©s"
-
-#: addons/dashboard/class_dashBoardPPolicy.inc:43
-#: addons/dashboard/ppolicy_locked_accounts.tpl.c:8
-msgid "Locked accounts"
-msgstr "Compte verrouilles "
-
-#: addons/dashboard/class_dashBoardPPolicy.inc:69
-#: addons/dashboard/class_dashBoardPPolicy.inc:124
-msgid "Configuration error"
-msgstr "Erreur de configuration"
-
-#: addons/dashboard/class_dashBoardPPolicy.inc:70
-#, php-format
-msgid "Default ppolicy \"%s\" could not be found in the LDAP!"
-msgstr "La ppolicy par dÃ©faut \"%s\" nâ€™a pas Ã©tÃ© trouvÃ©e dans le LDAPâ€¯!"
-
-#: addons/dashboard/class_dashBoardPPolicy.inc:125
-#, 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:38
 msgid "Edit user's password policy"
 msgstr "Ã‰diter la politique de mot de passe de l'utilisateur"
@@ -252,11 +218,11 @@ msgstr "RÃ©initialiser et forcer le changement"
 msgid "Use the default"
 msgstr "Utiliser les rÃ©glages par dÃ©faut"
 
-#: personal/ppolicy/class_ppolicyAccount.inc:92
+#: personal/ppolicy/class_ppolicyAccount.inc:102
 msgid "Never"
 msgstr "Jamais"
 
-#: personal/ppolicy/class_ppolicyAccount.inc:100
+#: personal/ppolicy/class_ppolicyAccount.inc:109
 msgid "Unlocked"
 msgstr "DÃ©verrouille "
 
@@ -287,42 +253,3 @@ msgstr "Cn de la politique par dÃ©faut"
 #: config/ppolicy/class_ppolicyConfig.inc:50
 msgid "What you put as default ppolicy in the overlay config"
 msgstr "Ce que vous mettez 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"
-msgstr[0] "Il y a un compte verrouille "
-msgstr[1] "Il y a %1 comptes verrouilles"
-
-#: addons/dashboard/ppolicy_locked_accounts.tpl.c:5
-msgid "There is no locked account"
-msgstr "Il n'y a pas compte verrouillÃ©"
-
-#: addons/dashboard/ppolicy_locked_accounts.tpl.c:11
-msgid "Manager concerned"
-msgstr "Manager concernÃ©"
-
-#: addons/dashboard/ppolicy_locked_accounts.tpl.c:14
-msgid "uid"
-msgstr "uid"
-
-#: addons/dashboard/ppolicy_locked_accounts.tpl.c:17
-msgid "cn"
-msgstr "cn"
-
-#: addons/dashboard/ppolicy_locked_accounts.tpl.c:20
-#: addons/dashboard/ppolicy_locked_accounts.tpl.c:32
-msgid "telephoneNumber"
-msgstr "NumÃ©ro de tÃ©lÃ©phone"
-
-#: addons/dashboard/ppolicy_locked_accounts.tpl.c:23
-msgid "pwdAccountLockedTime"
-msgstr ""
-
-#: addons/dashboard/ppolicy_locked_accounts.tpl.c:26
-msgid "manager"
-msgstr "Responsable"
-
-#: addons/dashboard/ppolicy_locked_accounts.tpl.c:29
-msgid "mail"
-msgstr "mail"
diff --git a/ppolicy/locale/id/fusiondirectory.po b/ppolicy/locale/id/fusiondirectory.po
index 12cb846c682bdbb83a01a8b2161729fc9548a974..6ede56e6f85dd8085f33dae9e78d1edb0fec9142 100644
--- a/ppolicy/locale/id/fusiondirectory.po
+++ b/ppolicy/locale/id/fusiondirectory.po
@@ -5,12 +5,12 @@
 # Translators:
 msgid ""
 msgstr ""
-"Project-Id-Version: FusionDirectory-108\n"
+"Project-Id-Version: FusionDirectory-109\n"
 "Report-Msgid-Bugs-To: documentation@lists.fusiondirectory.org\n"
-"POT-Creation-Date: 2015-03-31 11:49+0200\n"
-"PO-Revision-Date: 2015-03-31 11:23+0000\n"
-"Last-Translator: fusiondirectory <contact@fusiondirectory.org>\n"
-"Language-Team: Indonesian (http://www.transifex.com/projects/p/FusionDirectory-108/language/id/)\n"
+"POT-Creation-Date: 2015-02-10 18:26+0100\n"
+"PO-Revision-Date: 2015-02-10 17:35+0000\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: Indonesian (http://www.transifex.com/projects/p/FusionDirectory-109/language/id/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -84,14 +84,13 @@ msgid ""
 msgstr ""
 
 #: admin/ppolicy/class_ppolicy.inc:79
-msgid "Expiry warning delay"
+msgid "Expire warning delay"
 msgstr ""
 
 #: admin/ppolicy/class_ppolicy.inc:79
 msgid ""
-"Defines the start time - in seconds - prior to the password expiry that "
-"password expiry warning messages are returned in bind responses. 0 to "
-"disable"
+"Start time prior to the password expiry that password expiry warning "
+"messages are returned in bind responses"
 msgstr ""
 
 #: admin/ppolicy/class_ppolicy.inc:84
@@ -175,38 +174,6 @@ msgid ""
 "administrator following an automatic lockout"
 msgstr ""
 
-#: addons/dashboard/class_dashBoardPPolicy.inc:26
-msgid "Ppolicy"
-msgstr ""
-
-#: addons/dashboard/class_dashBoardPPolicy.inc:27
-msgid "Statistics about ppolicy expired users"
-msgstr ""
-
-#: addons/dashboard/class_dashBoardPPolicy.inc:38
-msgid "Expired accounts"
-msgstr ""
-
-#: addons/dashboard/class_dashBoardPPolicy.inc:43
-#: addons/dashboard/ppolicy_locked_accounts.tpl.c:8
-msgid "Locked accounts"
-msgstr ""
-
-#: addons/dashboard/class_dashBoardPPolicy.inc:69
-#: addons/dashboard/class_dashBoardPPolicy.inc:124
-msgid "Configuration error"
-msgstr ""
-
-#: addons/dashboard/class_dashBoardPPolicy.inc:70
-#, php-format
-msgid "Default ppolicy \"%s\" could not be found in the LDAP!"
-msgstr ""
-
-#: addons/dashboard/class_dashBoardPPolicy.inc:125
-#, php-format
-msgid "Ppolicy \"%s\" set for user \"%s\" could not be found in the LDAP!"
-msgstr ""
-
 #: personal/ppolicy/class_ppolicyAccount.inc:38
 msgid "Edit user's password policy"
 msgstr ""
@@ -251,11 +218,11 @@ msgstr ""
 msgid "Use the default"
 msgstr ""
 
-#: personal/ppolicy/class_ppolicyAccount.inc:92
+#: personal/ppolicy/class_ppolicyAccount.inc:102
 msgid "Never"
 msgstr ""
 
-#: personal/ppolicy/class_ppolicyAccount.inc:100
+#: personal/ppolicy/class_ppolicyAccount.inc:109
 msgid "Unlocked"
 msgstr ""
 
@@ -286,41 +253,3 @@ msgstr ""
 #: config/ppolicy/class_ppolicyConfig.inc:50
 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"
-msgstr[0] ""
-
-#: addons/dashboard/ppolicy_locked_accounts.tpl.c:5
-msgid "There is no locked account"
-msgstr ""
-
-#: addons/dashboard/ppolicy_locked_accounts.tpl.c:11
-msgid "Manager concerned"
-msgstr ""
-
-#: addons/dashboard/ppolicy_locked_accounts.tpl.c:14
-msgid "uid"
-msgstr ""
-
-#: addons/dashboard/ppolicy_locked_accounts.tpl.c:17
-msgid "cn"
-msgstr ""
-
-#: addons/dashboard/ppolicy_locked_accounts.tpl.c:20
-#: addons/dashboard/ppolicy_locked_accounts.tpl.c:32
-msgid "telephoneNumber"
-msgstr ""
-
-#: addons/dashboard/ppolicy_locked_accounts.tpl.c:23
-msgid "pwdAccountLockedTime"
-msgstr ""
-
-#: addons/dashboard/ppolicy_locked_accounts.tpl.c:26
-msgid "manager"
-msgstr ""
-
-#: addons/dashboard/ppolicy_locked_accounts.tpl.c:29
-msgid "mail"
-msgstr ""
diff --git a/ppolicy/locale/it/fusiondirectory.po b/ppolicy/locale/it/fusiondirectory.po
index 069ca99c98aa87daed5b0b3f6f5e4ce9235f8f57..a6a16c0c9d853ff725c3e0653f7bdcbd602096fe 100644
--- a/ppolicy/locale/it/fusiondirectory.po
+++ b/ppolicy/locale/it/fusiondirectory.po
@@ -5,12 +5,12 @@
 # Translators:
 msgid ""
 msgstr ""
-"Project-Id-Version: FusionDirectory-108\n"
+"Project-Id-Version: FusionDirectory-109\n"
 "Report-Msgid-Bugs-To: documentation@lists.fusiondirectory.org\n"
-"POT-Creation-Date: 2015-03-31 11:49+0200\n"
-"PO-Revision-Date: 2015-03-31 11:42+0000\n"
-"Last-Translator: fusiondirectory <contact@fusiondirectory.org>\n"
-"Language-Team: Italian (http://www.transifex.com/projects/p/FusionDirectory-108/language/it/)\n"
+"POT-Creation-Date: 2015-02-10 18:26+0100\n"
+"PO-Revision-Date: 2015-02-10 17:35+0000\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: Italian (http://www.transifex.com/projects/p/FusionDirectory-109/language/it/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -84,14 +84,13 @@ msgid ""
 msgstr ""
 
 #: admin/ppolicy/class_ppolicy.inc:79
-msgid "Expiry warning delay"
+msgid "Expire warning delay"
 msgstr ""
 
 #: admin/ppolicy/class_ppolicy.inc:79
 msgid ""
-"Defines the start time - in seconds - prior to the password expiry that "
-"password expiry warning messages are returned in bind responses. 0 to "
-"disable"
+"Start time prior to the password expiry that password expiry warning "
+"messages are returned in bind responses"
 msgstr ""
 
 #: admin/ppolicy/class_ppolicy.inc:84
@@ -175,38 +174,6 @@ msgid ""
 "administrator following an automatic lockout"
 msgstr ""
 
-#: addons/dashboard/class_dashBoardPPolicy.inc:26
-msgid "Ppolicy"
-msgstr ""
-
-#: addons/dashboard/class_dashBoardPPolicy.inc:27
-msgid "Statistics about ppolicy expired users"
-msgstr ""
-
-#: addons/dashboard/class_dashBoardPPolicy.inc:38
-msgid "Expired accounts"
-msgstr "Account scaduti"
-
-#: addons/dashboard/class_dashBoardPPolicy.inc:43
-#: addons/dashboard/ppolicy_locked_accounts.tpl.c:8
-msgid "Locked accounts"
-msgstr ""
-
-#: addons/dashboard/class_dashBoardPPolicy.inc:69
-#: addons/dashboard/class_dashBoardPPolicy.inc:124
-msgid "Configuration error"
-msgstr "Errore di configurazione"
-
-#: addons/dashboard/class_dashBoardPPolicy.inc:70
-#, php-format
-msgid "Default ppolicy \"%s\" could not be found in the LDAP!"
-msgstr ""
-
-#: addons/dashboard/class_dashBoardPPolicy.inc:125
-#, php-format
-msgid "Ppolicy \"%s\" set for user \"%s\" could not be found in the LDAP!"
-msgstr ""
-
 #: personal/ppolicy/class_ppolicyAccount.inc:38
 msgid "Edit user's password policy"
 msgstr ""
@@ -251,11 +218,11 @@ msgstr ""
 msgid "Use the default"
 msgstr ""
 
-#: personal/ppolicy/class_ppolicyAccount.inc:92
+#: personal/ppolicy/class_ppolicyAccount.inc:102
 msgid "Never"
 msgstr ""
 
-#: personal/ppolicy/class_ppolicyAccount.inc:100
+#: personal/ppolicy/class_ppolicyAccount.inc:109
 msgid "Unlocked"
 msgstr ""
 
@@ -286,42 +253,3 @@ msgstr ""
 #: config/ppolicy/class_ppolicyConfig.inc:50
 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"
-msgstr[0] ""
-msgstr[1] ""
-
-#: addons/dashboard/ppolicy_locked_accounts.tpl.c:5
-msgid "There is no locked account"
-msgstr ""
-
-#: addons/dashboard/ppolicy_locked_accounts.tpl.c:11
-msgid "Manager concerned"
-msgstr "Responsabile interessato"
-
-#: addons/dashboard/ppolicy_locked_accounts.tpl.c:14
-msgid "uid"
-msgstr "uid"
-
-#: addons/dashboard/ppolicy_locked_accounts.tpl.c:17
-msgid "cn"
-msgstr "cn"
-
-#: addons/dashboard/ppolicy_locked_accounts.tpl.c:20
-#: addons/dashboard/ppolicy_locked_accounts.tpl.c:32
-msgid "telephoneNumber"
-msgstr "Numero di telefono"
-
-#: addons/dashboard/ppolicy_locked_accounts.tpl.c:23
-msgid "pwdAccountLockedTime"
-msgstr ""
-
-#: addons/dashboard/ppolicy_locked_accounts.tpl.c:26
-msgid "manager"
-msgstr "Responsabile"
-
-#: addons/dashboard/ppolicy_locked_accounts.tpl.c:29
-msgid "mail"
-msgstr "mail"
diff --git a/ppolicy/locale/lv/fusiondirectory.po b/ppolicy/locale/lv/fusiondirectory.po
index b87408dd74f73fc013242c03307cf84b75861219..b4c83021adf0f2d5f0cd3a6b2f72bd3ae11c5cb4 100644
--- a/ppolicy/locale/lv/fusiondirectory.po
+++ b/ppolicy/locale/lv/fusiondirectory.po
@@ -5,12 +5,12 @@
 # Translators:
 msgid ""
 msgstr ""
-"Project-Id-Version: FusionDirectory-108\n"
+"Project-Id-Version: FusionDirectory-109\n"
 "Report-Msgid-Bugs-To: documentation@lists.fusiondirectory.org\n"
-"POT-Creation-Date: 2015-03-31 11:49+0200\n"
-"PO-Revision-Date: 2015-03-31 11:23+0000\n"
-"Last-Translator: fusiondirectory <contact@fusiondirectory.org>\n"
-"Language-Team: Latvian (http://www.transifex.com/projects/p/FusionDirectory-108/language/lv/)\n"
+"POT-Creation-Date: 2015-02-10 18:26+0100\n"
+"PO-Revision-Date: 2015-02-10 17:35+0000\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: Latvian (http://www.transifex.com/projects/p/FusionDirectory-109/language/lv/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -84,14 +84,13 @@ msgid ""
 msgstr ""
 
 #: admin/ppolicy/class_ppolicy.inc:79
-msgid "Expiry warning delay"
+msgid "Expire warning delay"
 msgstr ""
 
 #: admin/ppolicy/class_ppolicy.inc:79
 msgid ""
-"Defines the start time - in seconds - prior to the password expiry that "
-"password expiry warning messages are returned in bind responses. 0 to "
-"disable"
+"Start time prior to the password expiry that password expiry warning "
+"messages are returned in bind responses"
 msgstr ""
 
 #: admin/ppolicy/class_ppolicy.inc:84
@@ -175,38 +174,6 @@ msgid ""
 "administrator following an automatic lockout"
 msgstr ""
 
-#: addons/dashboard/class_dashBoardPPolicy.inc:26
-msgid "Ppolicy"
-msgstr ""
-
-#: addons/dashboard/class_dashBoardPPolicy.inc:27
-msgid "Statistics about ppolicy expired users"
-msgstr ""
-
-#: addons/dashboard/class_dashBoardPPolicy.inc:38
-msgid "Expired accounts"
-msgstr ""
-
-#: addons/dashboard/class_dashBoardPPolicy.inc:43
-#: addons/dashboard/ppolicy_locked_accounts.tpl.c:8
-msgid "Locked accounts"
-msgstr ""
-
-#: addons/dashboard/class_dashBoardPPolicy.inc:69
-#: addons/dashboard/class_dashBoardPPolicy.inc:124
-msgid "Configuration error"
-msgstr ""
-
-#: addons/dashboard/class_dashBoardPPolicy.inc:70
-#, php-format
-msgid "Default ppolicy \"%s\" could not be found in the LDAP!"
-msgstr ""
-
-#: addons/dashboard/class_dashBoardPPolicy.inc:125
-#, php-format
-msgid "Ppolicy \"%s\" set for user \"%s\" could not be found in the LDAP!"
-msgstr ""
-
 #: personal/ppolicy/class_ppolicyAccount.inc:38
 msgid "Edit user's password policy"
 msgstr ""
@@ -251,11 +218,11 @@ msgstr ""
 msgid "Use the default"
 msgstr ""
 
-#: personal/ppolicy/class_ppolicyAccount.inc:92
+#: personal/ppolicy/class_ppolicyAccount.inc:102
 msgid "Never"
 msgstr ""
 
-#: personal/ppolicy/class_ppolicyAccount.inc:100
+#: personal/ppolicy/class_ppolicyAccount.inc:109
 msgid "Unlocked"
 msgstr ""
 
@@ -286,43 +253,3 @@ msgstr ""
 #: config/ppolicy/class_ppolicyConfig.inc:50
 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"
-msgstr[0] ""
-msgstr[1] ""
-msgstr[2] ""
-
-#: addons/dashboard/ppolicy_locked_accounts.tpl.c:5
-msgid "There is no locked account"
-msgstr ""
-
-#: addons/dashboard/ppolicy_locked_accounts.tpl.c:11
-msgid "Manager concerned"
-msgstr ""
-
-#: addons/dashboard/ppolicy_locked_accounts.tpl.c:14
-msgid "uid"
-msgstr ""
-
-#: addons/dashboard/ppolicy_locked_accounts.tpl.c:17
-msgid "cn"
-msgstr ""
-
-#: addons/dashboard/ppolicy_locked_accounts.tpl.c:20
-#: addons/dashboard/ppolicy_locked_accounts.tpl.c:32
-msgid "telephoneNumber"
-msgstr ""
-
-#: addons/dashboard/ppolicy_locked_accounts.tpl.c:23
-msgid "pwdAccountLockedTime"
-msgstr ""
-
-#: addons/dashboard/ppolicy_locked_accounts.tpl.c:26
-msgid "manager"
-msgstr ""
-
-#: addons/dashboard/ppolicy_locked_accounts.tpl.c:29
-msgid "mail"
-msgstr ""
diff --git a/ppolicy/locale/nb/fusiondirectory.po b/ppolicy/locale/nb/fusiondirectory.po
index 4b3f261224a7b1f746b4e7939085694b360f9df2..279299eb7ccd9ba409cc3f4e9d12920d6385236e 100644
--- a/ppolicy/locale/nb/fusiondirectory.po
+++ b/ppolicy/locale/nb/fusiondirectory.po
@@ -5,12 +5,12 @@
 # Translators:
 msgid ""
 msgstr ""
-"Project-Id-Version: FusionDirectory-108\n"
+"Project-Id-Version: FusionDirectory-109\n"
 "Report-Msgid-Bugs-To: documentation@lists.fusiondirectory.org\n"
-"POT-Creation-Date: 2015-03-31 11:49+0200\n"
-"PO-Revision-Date: 2015-03-31 11:23+0000\n"
-"Last-Translator: fusiondirectory <contact@fusiondirectory.org>\n"
-"Language-Team: Norwegian BokmÃ¥l (http://www.transifex.com/projects/p/FusionDirectory-108/language/nb/)\n"
+"POT-Creation-Date: 2015-02-10 18:26+0100\n"
+"PO-Revision-Date: 2015-02-10 17:35+0000\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: Norwegian BokmÃ¥l (http://www.transifex.com/projects/p/FusionDirectory-109/language/nb/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -84,14 +84,13 @@ msgid ""
 msgstr ""
 
 #: admin/ppolicy/class_ppolicy.inc:79
-msgid "Expiry warning delay"
+msgid "Expire warning delay"
 msgstr ""
 
 #: admin/ppolicy/class_ppolicy.inc:79
 msgid ""
-"Defines the start time - in seconds - prior to the password expiry that "
-"password expiry warning messages are returned in bind responses. 0 to "
-"disable"
+"Start time prior to the password expiry that password expiry warning "
+"messages are returned in bind responses"
 msgstr ""
 
 #: admin/ppolicy/class_ppolicy.inc:84
@@ -175,38 +174,6 @@ msgid ""
 "administrator following an automatic lockout"
 msgstr ""
 
-#: addons/dashboard/class_dashBoardPPolicy.inc:26
-msgid "Ppolicy"
-msgstr ""
-
-#: addons/dashboard/class_dashBoardPPolicy.inc:27
-msgid "Statistics about ppolicy expired users"
-msgstr ""
-
-#: addons/dashboard/class_dashBoardPPolicy.inc:38
-msgid "Expired accounts"
-msgstr ""
-
-#: addons/dashboard/class_dashBoardPPolicy.inc:43
-#: addons/dashboard/ppolicy_locked_accounts.tpl.c:8
-msgid "Locked accounts"
-msgstr ""
-
-#: addons/dashboard/class_dashBoardPPolicy.inc:69
-#: addons/dashboard/class_dashBoardPPolicy.inc:124
-msgid "Configuration error"
-msgstr ""
-
-#: addons/dashboard/class_dashBoardPPolicy.inc:70
-#, php-format
-msgid "Default ppolicy \"%s\" could not be found in the LDAP!"
-msgstr ""
-
-#: addons/dashboard/class_dashBoardPPolicy.inc:125
-#, php-format
-msgid "Ppolicy \"%s\" set for user \"%s\" could not be found in the LDAP!"
-msgstr ""
-
 #: personal/ppolicy/class_ppolicyAccount.inc:38
 msgid "Edit user's password policy"
 msgstr ""
@@ -251,11 +218,11 @@ msgstr ""
 msgid "Use the default"
 msgstr ""
 
-#: personal/ppolicy/class_ppolicyAccount.inc:92
+#: personal/ppolicy/class_ppolicyAccount.inc:102
 msgid "Never"
 msgstr ""
 
-#: personal/ppolicy/class_ppolicyAccount.inc:100
+#: personal/ppolicy/class_ppolicyAccount.inc:109
 msgid "Unlocked"
 msgstr ""
 
@@ -286,42 +253,3 @@ msgstr ""
 #: config/ppolicy/class_ppolicyConfig.inc:50
 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"
-msgstr[0] ""
-msgstr[1] ""
-
-#: addons/dashboard/ppolicy_locked_accounts.tpl.c:5
-msgid "There is no locked account"
-msgstr ""
-
-#: addons/dashboard/ppolicy_locked_accounts.tpl.c:11
-msgid "Manager concerned"
-msgstr ""
-
-#: addons/dashboard/ppolicy_locked_accounts.tpl.c:14
-msgid "uid"
-msgstr ""
-
-#: addons/dashboard/ppolicy_locked_accounts.tpl.c:17
-msgid "cn"
-msgstr ""
-
-#: addons/dashboard/ppolicy_locked_accounts.tpl.c:20
-#: addons/dashboard/ppolicy_locked_accounts.tpl.c:32
-msgid "telephoneNumber"
-msgstr ""
-
-#: addons/dashboard/ppolicy_locked_accounts.tpl.c:23
-msgid "pwdAccountLockedTime"
-msgstr ""
-
-#: addons/dashboard/ppolicy_locked_accounts.tpl.c:26
-msgid "manager"
-msgstr ""
-
-#: addons/dashboard/ppolicy_locked_accounts.tpl.c:29
-msgid "mail"
-msgstr ""
diff --git a/ppolicy/locale/nl/fusiondirectory.po b/ppolicy/locale/nl/fusiondirectory.po
index e1693ece461dcc692221d1cc6ca33a669e799dd7..8b7bb66d007c059cb22640dd4eb6c6de57a71dfb 100644
--- a/ppolicy/locale/nl/fusiondirectory.po
+++ b/ppolicy/locale/nl/fusiondirectory.po
@@ -5,12 +5,12 @@
 # Translators:
 msgid ""
 msgstr ""
-"Project-Id-Version: FusionDirectory-108\n"
+"Project-Id-Version: FusionDirectory-109\n"
 "Report-Msgid-Bugs-To: documentation@lists.fusiondirectory.org\n"
-"POT-Creation-Date: 2015-03-31 11:49+0200\n"
-"PO-Revision-Date: 2015-03-31 11:42+0000\n"
-"Last-Translator: fusiondirectory <contact@fusiondirectory.org>\n"
-"Language-Team: Dutch (http://www.transifex.com/projects/p/FusionDirectory-108/language/nl/)\n"
+"POT-Creation-Date: 2015-02-10 18:26+0100\n"
+"PO-Revision-Date: 2015-02-10 17:35+0000\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: Dutch (http://www.transifex.com/projects/p/FusionDirectory-109/language/nl/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -84,14 +84,13 @@ msgid ""
 msgstr ""
 
 #: admin/ppolicy/class_ppolicy.inc:79
-msgid "Expiry warning delay"
+msgid "Expire warning delay"
 msgstr ""
 
 #: admin/ppolicy/class_ppolicy.inc:79
 msgid ""
-"Defines the start time - in seconds - prior to the password expiry that "
-"password expiry warning messages are returned in bind responses. 0 to "
-"disable"
+"Start time prior to the password expiry that password expiry warning "
+"messages are returned in bind responses"
 msgstr ""
 
 #: admin/ppolicy/class_ppolicy.inc:84
@@ -175,38 +174,6 @@ msgid ""
 "administrator following an automatic lockout"
 msgstr ""
 
-#: addons/dashboard/class_dashBoardPPolicy.inc:26
-msgid "Ppolicy"
-msgstr ""
-
-#: addons/dashboard/class_dashBoardPPolicy.inc:27
-msgid "Statistics about ppolicy expired users"
-msgstr ""
-
-#: addons/dashboard/class_dashBoardPPolicy.inc:38
-msgid "Expired accounts"
-msgstr ""
-
-#: addons/dashboard/class_dashBoardPPolicy.inc:43
-#: addons/dashboard/ppolicy_locked_accounts.tpl.c:8
-msgid "Locked accounts"
-msgstr ""
-
-#: addons/dashboard/class_dashBoardPPolicy.inc:69
-#: addons/dashboard/class_dashBoardPPolicy.inc:124
-msgid "Configuration error"
-msgstr "Configuratie fout"
-
-#: addons/dashboard/class_dashBoardPPolicy.inc:70
-#, php-format
-msgid "Default ppolicy \"%s\" could not be found in the LDAP!"
-msgstr ""
-
-#: addons/dashboard/class_dashBoardPPolicy.inc:125
-#, php-format
-msgid "Ppolicy \"%s\" set for user \"%s\" could not be found in the LDAP!"
-msgstr ""
-
 #: personal/ppolicy/class_ppolicyAccount.inc:38
 msgid "Edit user's password policy"
 msgstr ""
@@ -251,11 +218,11 @@ msgstr ""
 msgid "Use the default"
 msgstr ""
 
-#: personal/ppolicy/class_ppolicyAccount.inc:92
+#: personal/ppolicy/class_ppolicyAccount.inc:102
 msgid "Never"
 msgstr ""
 
-#: personal/ppolicy/class_ppolicyAccount.inc:100
+#: personal/ppolicy/class_ppolicyAccount.inc:109
 msgid "Unlocked"
 msgstr ""
 
@@ -286,42 +253,3 @@ msgstr ""
 #: config/ppolicy/class_ppolicyConfig.inc:50
 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"
-msgstr[0] ""
-msgstr[1] ""
-
-#: addons/dashboard/ppolicy_locked_accounts.tpl.c:5
-msgid "There is no locked account"
-msgstr ""
-
-#: addons/dashboard/ppolicy_locked_accounts.tpl.c:11
-msgid "Manager concerned"
-msgstr ""
-
-#: addons/dashboard/ppolicy_locked_accounts.tpl.c:14
-msgid "uid"
-msgstr "uid"
-
-#: addons/dashboard/ppolicy_locked_accounts.tpl.c:17
-msgid "cn"
-msgstr ""
-
-#: addons/dashboard/ppolicy_locked_accounts.tpl.c:20
-#: addons/dashboard/ppolicy_locked_accounts.tpl.c:32
-msgid "telephoneNumber"
-msgstr "telefoonNummer"
-
-#: addons/dashboard/ppolicy_locked_accounts.tpl.c:23
-msgid "pwdAccountLockedTime"
-msgstr ""
-
-#: addons/dashboard/ppolicy_locked_accounts.tpl.c:26
-msgid "manager"
-msgstr ""
-
-#: addons/dashboard/ppolicy_locked_accounts.tpl.c:29
-msgid "mail"
-msgstr ""
diff --git a/ppolicy/locale/pl/fusiondirectory.po b/ppolicy/locale/pl/fusiondirectory.po
index 95b43b175c1b34550fe07dd515f0c24e3357a4c8..5202034abbc2985960b5d91bf8e3f9a8924a8b4a 100644
--- a/ppolicy/locale/pl/fusiondirectory.po
+++ b/ppolicy/locale/pl/fusiondirectory.po
@@ -5,12 +5,12 @@
 # Translators:
 msgid ""
 msgstr ""
-"Project-Id-Version: FusionDirectory-108\n"
+"Project-Id-Version: FusionDirectory-109\n"
 "Report-Msgid-Bugs-To: documentation@lists.fusiondirectory.org\n"
-"POT-Creation-Date: 2015-03-31 11:49+0200\n"
-"PO-Revision-Date: 2015-03-31 11:42+0000\n"
-"Last-Translator: fusiondirectory <contact@fusiondirectory.org>\n"
-"Language-Team: Polish (http://www.transifex.com/projects/p/FusionDirectory-108/language/pl/)\n"
+"POT-Creation-Date: 2015-02-10 18:26+0100\n"
+"PO-Revision-Date: 2015-02-10 17:35+0000\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: Polish (http://www.transifex.com/projects/p/FusionDirectory-109/language/pl/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -84,14 +84,13 @@ msgid ""
 msgstr ""
 
 #: admin/ppolicy/class_ppolicy.inc:79
-msgid "Expiry warning delay"
+msgid "Expire warning delay"
 msgstr ""
 
 #: admin/ppolicy/class_ppolicy.inc:79
 msgid ""
-"Defines the start time - in seconds - prior to the password expiry that "
-"password expiry warning messages are returned in bind responses. 0 to "
-"disable"
+"Start time prior to the password expiry that password expiry warning "
+"messages are returned in bind responses"
 msgstr ""
 
 #: admin/ppolicy/class_ppolicy.inc:84
@@ -175,38 +174,6 @@ msgid ""
 "administrator following an automatic lockout"
 msgstr ""
 
-#: addons/dashboard/class_dashBoardPPolicy.inc:26
-msgid "Ppolicy"
-msgstr ""
-
-#: addons/dashboard/class_dashBoardPPolicy.inc:27
-msgid "Statistics about ppolicy expired users"
-msgstr ""
-
-#: addons/dashboard/class_dashBoardPPolicy.inc:38
-msgid "Expired accounts"
-msgstr ""
-
-#: addons/dashboard/class_dashBoardPPolicy.inc:43
-#: addons/dashboard/ppolicy_locked_accounts.tpl.c:8
-msgid "Locked accounts"
-msgstr ""
-
-#: addons/dashboard/class_dashBoardPPolicy.inc:69
-#: addons/dashboard/class_dashBoardPPolicy.inc:124
-msgid "Configuration error"
-msgstr "BÅ‚Ä…d konfiguracji"
-
-#: addons/dashboard/class_dashBoardPPolicy.inc:70
-#, php-format
-msgid "Default ppolicy \"%s\" could not be found in the LDAP!"
-msgstr ""
-
-#: addons/dashboard/class_dashBoardPPolicy.inc:125
-#, php-format
-msgid "Ppolicy \"%s\" set for user \"%s\" could not be found in the LDAP!"
-msgstr ""
-
 #: personal/ppolicy/class_ppolicyAccount.inc:38
 msgid "Edit user's password policy"
 msgstr ""
@@ -251,11 +218,11 @@ msgstr ""
 msgid "Use the default"
 msgstr ""
 
-#: personal/ppolicy/class_ppolicyAccount.inc:92
+#: personal/ppolicy/class_ppolicyAccount.inc:102
 msgid "Never"
 msgstr ""
 
-#: personal/ppolicy/class_ppolicyAccount.inc:100
+#: personal/ppolicy/class_ppolicyAccount.inc:109
 msgid "Unlocked"
 msgstr ""
 
@@ -286,43 +253,3 @@ msgstr ""
 #: config/ppolicy/class_ppolicyConfig.inc:50
 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"
-msgstr[0] ""
-msgstr[1] ""
-msgstr[2] ""
-
-#: addons/dashboard/ppolicy_locked_accounts.tpl.c:5
-msgid "There is no locked account"
-msgstr ""
-
-#: addons/dashboard/ppolicy_locked_accounts.tpl.c:11
-msgid "Manager concerned"
-msgstr ""
-
-#: addons/dashboard/ppolicy_locked_accounts.tpl.c:14
-msgid "uid"
-msgstr ""
-
-#: addons/dashboard/ppolicy_locked_accounts.tpl.c:17
-msgid "cn"
-msgstr ""
-
-#: addons/dashboard/ppolicy_locked_accounts.tpl.c:20
-#: addons/dashboard/ppolicy_locked_accounts.tpl.c:32
-msgid "telephoneNumber"
-msgstr ""
-
-#: addons/dashboard/ppolicy_locked_accounts.tpl.c:23
-msgid "pwdAccountLockedTime"
-msgstr ""
-
-#: addons/dashboard/ppolicy_locked_accounts.tpl.c:26
-msgid "manager"
-msgstr ""
-
-#: addons/dashboard/ppolicy_locked_accounts.tpl.c:29
-msgid "mail"
-msgstr ""
diff --git a/ppolicy/locale/pt/fusiondirectory.po b/ppolicy/locale/pt/fusiondirectory.po
index 710298504002174be5bde0a111c37dbcab96d30a..2f95c8850526136bf4ccd8182f5104f2842ab3a2 100644
--- a/ppolicy/locale/pt/fusiondirectory.po
+++ b/ppolicy/locale/pt/fusiondirectory.po
@@ -5,12 +5,12 @@
 # Translators:
 msgid ""
 msgstr ""
-"Project-Id-Version: FusionDirectory-108\n"
+"Project-Id-Version: FusionDirectory-109\n"
 "Report-Msgid-Bugs-To: documentation@lists.fusiondirectory.org\n"
-"POT-Creation-Date: 2015-03-31 11:49+0200\n"
-"PO-Revision-Date: 2015-03-31 11:42+0000\n"
-"Last-Translator: fusiondirectory <contact@fusiondirectory.org>\n"
-"Language-Team: Portuguese (http://www.transifex.com/projects/p/FusionDirectory-108/language/pt/)\n"
+"POT-Creation-Date: 2015-02-10 18:26+0100\n"
+"PO-Revision-Date: 2015-02-10 17:35+0000\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: Portuguese (http://www.transifex.com/projects/p/FusionDirectory-109/language/pt/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -84,14 +84,13 @@ msgid ""
 msgstr ""
 
 #: admin/ppolicy/class_ppolicy.inc:79
-msgid "Expiry warning delay"
+msgid "Expire warning delay"
 msgstr ""
 
 #: admin/ppolicy/class_ppolicy.inc:79
 msgid ""
-"Defines the start time - in seconds - prior to the password expiry that "
-"password expiry warning messages are returned in bind responses. 0 to "
-"disable"
+"Start time prior to the password expiry that password expiry warning "
+"messages are returned in bind responses"
 msgstr ""
 
 #: admin/ppolicy/class_ppolicy.inc:84
@@ -175,38 +174,6 @@ msgid ""
 "administrator following an automatic lockout"
 msgstr ""
 
-#: addons/dashboard/class_dashBoardPPolicy.inc:26
-msgid "Ppolicy"
-msgstr ""
-
-#: addons/dashboard/class_dashBoardPPolicy.inc:27
-msgid "Statistics about ppolicy expired users"
-msgstr ""
-
-#: addons/dashboard/class_dashBoardPPolicy.inc:38
-msgid "Expired accounts"
-msgstr ""
-
-#: addons/dashboard/class_dashBoardPPolicy.inc:43
-#: addons/dashboard/ppolicy_locked_accounts.tpl.c:8
-msgid "Locked accounts"
-msgstr ""
-
-#: addons/dashboard/class_dashBoardPPolicy.inc:69
-#: addons/dashboard/class_dashBoardPPolicy.inc:124
-msgid "Configuration error"
-msgstr "Erro de configuraÃ§Ã£o"
-
-#: addons/dashboard/class_dashBoardPPolicy.inc:70
-#, php-format
-msgid "Default ppolicy \"%s\" could not be found in the LDAP!"
-msgstr ""
-
-#: addons/dashboard/class_dashBoardPPolicy.inc:125
-#, php-format
-msgid "Ppolicy \"%s\" set for user \"%s\" could not be found in the LDAP!"
-msgstr ""
-
 #: personal/ppolicy/class_ppolicyAccount.inc:38
 msgid "Edit user's password policy"
 msgstr ""
@@ -251,11 +218,11 @@ msgstr ""
 msgid "Use the default"
 msgstr ""
 
-#: personal/ppolicy/class_ppolicyAccount.inc:92
+#: personal/ppolicy/class_ppolicyAccount.inc:102
 msgid "Never"
 msgstr ""
 
-#: personal/ppolicy/class_ppolicyAccount.inc:100
+#: personal/ppolicy/class_ppolicyAccount.inc:109
 msgid "Unlocked"
 msgstr ""
 
@@ -286,42 +253,3 @@ msgstr ""
 #: config/ppolicy/class_ppolicyConfig.inc:50
 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"
-msgstr[0] ""
-msgstr[1] ""
-
-#: addons/dashboard/ppolicy_locked_accounts.tpl.c:5
-msgid "There is no locked account"
-msgstr ""
-
-#: addons/dashboard/ppolicy_locked_accounts.tpl.c:11
-msgid "Manager concerned"
-msgstr ""
-
-#: addons/dashboard/ppolicy_locked_accounts.tpl.c:14
-msgid "uid"
-msgstr ""
-
-#: addons/dashboard/ppolicy_locked_accounts.tpl.c:17
-msgid "cn"
-msgstr ""
-
-#: addons/dashboard/ppolicy_locked_accounts.tpl.c:20
-#: addons/dashboard/ppolicy_locked_accounts.tpl.c:32
-msgid "telephoneNumber"
-msgstr ""
-
-#: addons/dashboard/ppolicy_locked_accounts.tpl.c:23
-msgid "pwdAccountLockedTime"
-msgstr ""
-
-#: addons/dashboard/ppolicy_locked_accounts.tpl.c:26
-msgid "manager"
-msgstr ""
-
-#: addons/dashboard/ppolicy_locked_accounts.tpl.c:29
-msgid "mail"
-msgstr ""
diff --git a/ppolicy/locale/pt_BR/fusiondirectory.po b/ppolicy/locale/pt_BR/fusiondirectory.po
index 346da2a41eb6e2e88bd64be1a3c2bf1d619ef62c..a25119bd8c9395a798f6c71af603499f9808180d 100644
--- a/ppolicy/locale/pt_BR/fusiondirectory.po
+++ b/ppolicy/locale/pt_BR/fusiondirectory.po
@@ -5,12 +5,12 @@
 # Translators:
 msgid ""
 msgstr ""
-"Project-Id-Version: FusionDirectory-108\n"
+"Project-Id-Version: FusionDirectory-109\n"
 "Report-Msgid-Bugs-To: documentation@lists.fusiondirectory.org\n"
-"POT-Creation-Date: 2015-03-31 11:49+0200\n"
-"PO-Revision-Date: 2015-03-31 11:42+0000\n"
-"Last-Translator: fusiondirectory <contact@fusiondirectory.org>\n"
-"Language-Team: Portuguese (Brazil) (http://www.transifex.com/projects/p/FusionDirectory-108/language/pt_BR/)\n"
+"POT-Creation-Date: 2015-02-10 18:26+0100\n"
+"PO-Revision-Date: 2015-02-10 17:35+0000\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: Portuguese (Brazil) (http://www.transifex.com/projects/p/FusionDirectory-109/language/pt_BR/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -84,14 +84,13 @@ msgid ""
 msgstr ""
 
 #: admin/ppolicy/class_ppolicy.inc:79
-msgid "Expiry warning delay"
+msgid "Expire warning delay"
 msgstr ""
 
 #: admin/ppolicy/class_ppolicy.inc:79
 msgid ""
-"Defines the start time - in seconds - prior to the password expiry that "
-"password expiry warning messages are returned in bind responses. 0 to "
-"disable"
+"Start time prior to the password expiry that password expiry warning "
+"messages are returned in bind responses"
 msgstr ""
 
 #: admin/ppolicy/class_ppolicy.inc:84
@@ -175,38 +174,6 @@ msgid ""
 "administrator following an automatic lockout"
 msgstr ""
 
-#: addons/dashboard/class_dashBoardPPolicy.inc:26
-msgid "Ppolicy"
-msgstr ""
-
-#: addons/dashboard/class_dashBoardPPolicy.inc:27
-msgid "Statistics about ppolicy expired users"
-msgstr ""
-
-#: addons/dashboard/class_dashBoardPPolicy.inc:38
-msgid "Expired accounts"
-msgstr "Contas expiradas"
-
-#: addons/dashboard/class_dashBoardPPolicy.inc:43
-#: addons/dashboard/ppolicy_locked_accounts.tpl.c:8
-msgid "Locked accounts"
-msgstr ""
-
-#: addons/dashboard/class_dashBoardPPolicy.inc:69
-#: addons/dashboard/class_dashBoardPPolicy.inc:124
-msgid "Configuration error"
-msgstr "Erro de configuraÃ§Ã£o"
-
-#: addons/dashboard/class_dashBoardPPolicy.inc:70
-#, php-format
-msgid "Default ppolicy \"%s\" could not be found in the LDAP!"
-msgstr ""
-
-#: addons/dashboard/class_dashBoardPPolicy.inc:125
-#, php-format
-msgid "Ppolicy \"%s\" set for user \"%s\" could not be found in the LDAP!"
-msgstr ""
-
 #: personal/ppolicy/class_ppolicyAccount.inc:38
 msgid "Edit user's password policy"
 msgstr ""
@@ -251,11 +218,11 @@ msgstr ""
 msgid "Use the default"
 msgstr ""
 
-#: personal/ppolicy/class_ppolicyAccount.inc:92
+#: personal/ppolicy/class_ppolicyAccount.inc:102
 msgid "Never"
 msgstr ""
 
-#: personal/ppolicy/class_ppolicyAccount.inc:100
+#: personal/ppolicy/class_ppolicyAccount.inc:109
 msgid "Unlocked"
 msgstr ""
 
@@ -286,42 +253,3 @@ msgstr ""
 #: config/ppolicy/class_ppolicyConfig.inc:50
 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"
-msgstr[0] ""
-msgstr[1] ""
-
-#: addons/dashboard/ppolicy_locked_accounts.tpl.c:5
-msgid "There is no locked account"
-msgstr ""
-
-#: addons/dashboard/ppolicy_locked_accounts.tpl.c:11
-msgid "Manager concerned"
-msgstr ""
-
-#: addons/dashboard/ppolicy_locked_accounts.tpl.c:14
-msgid "uid"
-msgstr ""
-
-#: addons/dashboard/ppolicy_locked_accounts.tpl.c:17
-msgid "cn"
-msgstr ""
-
-#: addons/dashboard/ppolicy_locked_accounts.tpl.c:20
-#: addons/dashboard/ppolicy_locked_accounts.tpl.c:32
-msgid "telephoneNumber"
-msgstr ""
-
-#: addons/dashboard/ppolicy_locked_accounts.tpl.c:23
-msgid "pwdAccountLockedTime"
-msgstr ""
-
-#: addons/dashboard/ppolicy_locked_accounts.tpl.c:26
-msgid "manager"
-msgstr ""
-
-#: addons/dashboard/ppolicy_locked_accounts.tpl.c:29
-msgid "mail"
-msgstr "correio"
diff --git a/ppolicy/locale/ru/fusiondirectory.po b/ppolicy/locale/ru/fusiondirectory.po
index a3ba31e654c1db5d908a8c0184c30024514bf04d..591068eb3130cc9a284caff0c776bfa0b091c7ea 100644
--- a/ppolicy/locale/ru/fusiondirectory.po
+++ b/ppolicy/locale/ru/fusiondirectory.po
@@ -5,17 +5,17 @@
 # Translators:
 msgid ""
 msgstr ""
-"Project-Id-Version: FusionDirectory-108\n"
+"Project-Id-Version: FusionDirectory-109\n"
 "Report-Msgid-Bugs-To: documentation@lists.fusiondirectory.org\n"
-"POT-Creation-Date: 2015-03-31 11:49+0200\n"
-"PO-Revision-Date: 2015-03-31 11:42+0000\n"
-"Last-Translator: fusiondirectory <contact@fusiondirectory.org>\n"
-"Language-Team: Russian (http://www.transifex.com/projects/p/FusionDirectory-108/language/ru/)\n"
+"POT-Creation-Date: 2015-02-10 18:26+0100\n"
+"PO-Revision-Date: 2015-02-10 17:35+0000\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: Russian (http://www.transifex.com/projects/p/FusionDirectory-109/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=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);\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/ppolicy/class_ppolicyManagement.inc:28
 msgid "Password policies"
@@ -84,14 +84,13 @@ msgid ""
 msgstr ""
 
 #: admin/ppolicy/class_ppolicy.inc:79
-msgid "Expiry warning delay"
+msgid "Expire warning delay"
 msgstr ""
 
 #: admin/ppolicy/class_ppolicy.inc:79
 msgid ""
-"Defines the start time - in seconds - prior to the password expiry that "
-"password expiry warning messages are returned in bind responses. 0 to "
-"disable"
+"Start time prior to the password expiry that password expiry warning "
+"messages are returned in bind responses"
 msgstr ""
 
 #: admin/ppolicy/class_ppolicy.inc:84
@@ -175,38 +174,6 @@ msgid ""
 "administrator following an automatic lockout"
 msgstr ""
 
-#: addons/dashboard/class_dashBoardPPolicy.inc:26
-msgid "Ppolicy"
-msgstr ""
-
-#: addons/dashboard/class_dashBoardPPolicy.inc:27
-msgid "Statistics about ppolicy expired users"
-msgstr ""
-
-#: addons/dashboard/class_dashBoardPPolicy.inc:38
-msgid "Expired accounts"
-msgstr "ÐŸÑ€Ð¾ÑÑ€Ð¾Ñ‡ÐµÐ½Ð½Ñ‹Ðµ ÑƒÑ‡ÐµÑ‚Ð½Ñ‹Ðµ Ð·Ð°Ð¿Ð¸ÑÐ¸"
-
-#: addons/dashboard/class_dashBoardPPolicy.inc:43
-#: addons/dashboard/ppolicy_locked_accounts.tpl.c:8
-msgid "Locked accounts"
-msgstr ""
-
-#: addons/dashboard/class_dashBoardPPolicy.inc:69
-#: addons/dashboard/class_dashBoardPPolicy.inc:124
-msgid "Configuration error"
-msgstr ""
-
-#: addons/dashboard/class_dashBoardPPolicy.inc:70
-#, php-format
-msgid "Default ppolicy \"%s\" could not be found in the LDAP!"
-msgstr ""
-
-#: addons/dashboard/class_dashBoardPPolicy.inc:125
-#, php-format
-msgid "Ppolicy \"%s\" set for user \"%s\" could not be found in the LDAP!"
-msgstr ""
-
 #: personal/ppolicy/class_ppolicyAccount.inc:38
 msgid "Edit user's password policy"
 msgstr ""
@@ -251,11 +218,11 @@ msgstr ""
 msgid "Use the default"
 msgstr ""
 
-#: personal/ppolicy/class_ppolicyAccount.inc:92
+#: personal/ppolicy/class_ppolicyAccount.inc:102
 msgid "Never"
 msgstr ""
 
-#: personal/ppolicy/class_ppolicyAccount.inc:100
+#: personal/ppolicy/class_ppolicyAccount.inc:109
 msgid "Unlocked"
 msgstr ""
 
@@ -286,43 +253,3 @@ msgstr ""
 #: config/ppolicy/class_ppolicyConfig.inc:50
 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"
-msgstr[0] ""
-msgstr[1] ""
-msgstr[2] ""
-
-#: addons/dashboard/ppolicy_locked_accounts.tpl.c:5
-msgid "There is no locked account"
-msgstr ""
-
-#: addons/dashboard/ppolicy_locked_accounts.tpl.c:11
-msgid "Manager concerned"
-msgstr ""
-
-#: addons/dashboard/ppolicy_locked_accounts.tpl.c:14
-msgid "uid"
-msgstr "uid"
-
-#: addons/dashboard/ppolicy_locked_accounts.tpl.c:17
-msgid "cn"
-msgstr "cn"
-
-#: addons/dashboard/ppolicy_locked_accounts.tpl.c:20
-#: addons/dashboard/ppolicy_locked_accounts.tpl.c:32
-msgid "telephoneNumber"
-msgstr ""
-
-#: addons/dashboard/ppolicy_locked_accounts.tpl.c:23
-msgid "pwdAccountLockedTime"
-msgstr ""
-
-#: addons/dashboard/ppolicy_locked_accounts.tpl.c:26
-msgid "manager"
-msgstr ""
-
-#: addons/dashboard/ppolicy_locked_accounts.tpl.c:29
-msgid "mail"
-msgstr ""
diff --git a/ppolicy/locale/ru@petr1708/fusiondirectory.po b/ppolicy/locale/ru@petr1708/fusiondirectory.po
index 34a138d1271aae90b13452cd0dfea6349ea9e67c..83808c14e91d0406cb9b1db01cd5b426ac9be2d2 100644
--- a/ppolicy/locale/ru@petr1708/fusiondirectory.po
+++ b/ppolicy/locale/ru@petr1708/fusiondirectory.po
@@ -5,17 +5,17 @@
 # Translators:
 msgid ""
 msgstr ""
-"Project-Id-Version: FusionDirectory-108\n"
+"Project-Id-Version: FusionDirectory-109\n"
 "Report-Msgid-Bugs-To: documentation@lists.fusiondirectory.org\n"
-"POT-Creation-Date: 2015-03-31 11:49+0200\n"
-"PO-Revision-Date: 2015-03-31 11:23+0000\n"
-"Last-Translator: fusiondirectory <contact@fusiondirectory.org>\n"
-"Language-Team: Russian Petrine orthography (http://www.transifex.com/projects/p/FusionDirectory-108/language/ru@petr1708/)\n"
+"POT-Creation-Date: 2015-02-10 18:26+0100\n"
+"PO-Revision-Date: 2015-02-10 17:35+0000\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: Russian Petrine orthography (http://www.transifex.com/projects/p/FusionDirectory-109/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=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);\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/ppolicy/class_ppolicyManagement.inc:28
 msgid "Password policies"
@@ -84,14 +84,13 @@ msgid ""
 msgstr ""
 
 #: admin/ppolicy/class_ppolicy.inc:79
-msgid "Expiry warning delay"
+msgid "Expire warning delay"
 msgstr ""
 
 #: admin/ppolicy/class_ppolicy.inc:79
 msgid ""
-"Defines the start time - in seconds - prior to the password expiry that "
-"password expiry warning messages are returned in bind responses. 0 to "
-"disable"
+"Start time prior to the password expiry that password expiry warning "
+"messages are returned in bind responses"
 msgstr ""
 
 #: admin/ppolicy/class_ppolicy.inc:84
@@ -175,38 +174,6 @@ msgid ""
 "administrator following an automatic lockout"
 msgstr ""
 
-#: addons/dashboard/class_dashBoardPPolicy.inc:26
-msgid "Ppolicy"
-msgstr ""
-
-#: addons/dashboard/class_dashBoardPPolicy.inc:27
-msgid "Statistics about ppolicy expired users"
-msgstr ""
-
-#: addons/dashboard/class_dashBoardPPolicy.inc:38
-msgid "Expired accounts"
-msgstr ""
-
-#: addons/dashboard/class_dashBoardPPolicy.inc:43
-#: addons/dashboard/ppolicy_locked_accounts.tpl.c:8
-msgid "Locked accounts"
-msgstr ""
-
-#: addons/dashboard/class_dashBoardPPolicy.inc:69
-#: addons/dashboard/class_dashBoardPPolicy.inc:124
-msgid "Configuration error"
-msgstr ""
-
-#: addons/dashboard/class_dashBoardPPolicy.inc:70
-#, php-format
-msgid "Default ppolicy \"%s\" could not be found in the LDAP!"
-msgstr ""
-
-#: addons/dashboard/class_dashBoardPPolicy.inc:125
-#, php-format
-msgid "Ppolicy \"%s\" set for user \"%s\" could not be found in the LDAP!"
-msgstr ""
-
 #: personal/ppolicy/class_ppolicyAccount.inc:38
 msgid "Edit user's password policy"
 msgstr ""
@@ -251,11 +218,11 @@ msgstr ""
 msgid "Use the default"
 msgstr ""
 
-#: personal/ppolicy/class_ppolicyAccount.inc:92
+#: personal/ppolicy/class_ppolicyAccount.inc:102
 msgid "Never"
 msgstr ""
 
-#: personal/ppolicy/class_ppolicyAccount.inc:100
+#: personal/ppolicy/class_ppolicyAccount.inc:109
 msgid "Unlocked"
 msgstr ""
 
@@ -286,43 +253,3 @@ msgstr ""
 #: config/ppolicy/class_ppolicyConfig.inc:50
 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"
-msgstr[0] ""
-msgstr[1] ""
-msgstr[2] ""
-
-#: addons/dashboard/ppolicy_locked_accounts.tpl.c:5
-msgid "There is no locked account"
-msgstr ""
-
-#: addons/dashboard/ppolicy_locked_accounts.tpl.c:11
-msgid "Manager concerned"
-msgstr ""
-
-#: addons/dashboard/ppolicy_locked_accounts.tpl.c:14
-msgid "uid"
-msgstr ""
-
-#: addons/dashboard/ppolicy_locked_accounts.tpl.c:17
-msgid "cn"
-msgstr ""
-
-#: addons/dashboard/ppolicy_locked_accounts.tpl.c:20
-#: addons/dashboard/ppolicy_locked_accounts.tpl.c:32
-msgid "telephoneNumber"
-msgstr ""
-
-#: addons/dashboard/ppolicy_locked_accounts.tpl.c:23
-msgid "pwdAccountLockedTime"
-msgstr ""
-
-#: addons/dashboard/ppolicy_locked_accounts.tpl.c:26
-msgid "manager"
-msgstr ""
-
-#: addons/dashboard/ppolicy_locked_accounts.tpl.c:29
-msgid "mail"
-msgstr ""
diff --git a/ppolicy/locale/sv/fusiondirectory.po b/ppolicy/locale/sv/fusiondirectory.po
index b1409359d68182ac477effd1b602f3bbe1b6bc68..67cb50c2444102b8a83cd2fc5afc63c9eaa908ee 100644
--- a/ppolicy/locale/sv/fusiondirectory.po
+++ b/ppolicy/locale/sv/fusiondirectory.po
@@ -5,12 +5,12 @@
 # Translators:
 msgid ""
 msgstr ""
-"Project-Id-Version: FusionDirectory-108\n"
+"Project-Id-Version: FusionDirectory-109\n"
 "Report-Msgid-Bugs-To: documentation@lists.fusiondirectory.org\n"
-"POT-Creation-Date: 2015-03-31 11:49+0200\n"
-"PO-Revision-Date: 2015-03-31 11:42+0000\n"
-"Last-Translator: fusiondirectory <contact@fusiondirectory.org>\n"
-"Language-Team: Swedish (http://www.transifex.com/projects/p/FusionDirectory-108/language/sv/)\n"
+"POT-Creation-Date: 2015-02-10 18:26+0100\n"
+"PO-Revision-Date: 2015-02-10 17:35+0000\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: Swedish (http://www.transifex.com/projects/p/FusionDirectory-109/language/sv/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -84,14 +84,13 @@ msgid ""
 msgstr ""
 
 #: admin/ppolicy/class_ppolicy.inc:79
-msgid "Expiry warning delay"
+msgid "Expire warning delay"
 msgstr ""
 
 #: admin/ppolicy/class_ppolicy.inc:79
 msgid ""
-"Defines the start time - in seconds - prior to the password expiry that "
-"password expiry warning messages are returned in bind responses. 0 to "
-"disable"
+"Start time prior to the password expiry that password expiry warning "
+"messages are returned in bind responses"
 msgstr ""
 
 #: admin/ppolicy/class_ppolicy.inc:84
@@ -175,38 +174,6 @@ msgid ""
 "administrator following an automatic lockout"
 msgstr ""
 
-#: addons/dashboard/class_dashBoardPPolicy.inc:26
-msgid "Ppolicy"
-msgstr ""
-
-#: addons/dashboard/class_dashBoardPPolicy.inc:27
-msgid "Statistics about ppolicy expired users"
-msgstr ""
-
-#: addons/dashboard/class_dashBoardPPolicy.inc:38
-msgid "Expired accounts"
-msgstr ""
-
-#: addons/dashboard/class_dashBoardPPolicy.inc:43
-#: addons/dashboard/ppolicy_locked_accounts.tpl.c:8
-msgid "Locked accounts"
-msgstr ""
-
-#: addons/dashboard/class_dashBoardPPolicy.inc:69
-#: addons/dashboard/class_dashBoardPPolicy.inc:124
-msgid "Configuration error"
-msgstr "Konfigurationsfel"
-
-#: addons/dashboard/class_dashBoardPPolicy.inc:70
-#, php-format
-msgid "Default ppolicy \"%s\" could not be found in the LDAP!"
-msgstr ""
-
-#: addons/dashboard/class_dashBoardPPolicy.inc:125
-#, php-format
-msgid "Ppolicy \"%s\" set for user \"%s\" could not be found in the LDAP!"
-msgstr ""
-
 #: personal/ppolicy/class_ppolicyAccount.inc:38
 msgid "Edit user's password policy"
 msgstr ""
@@ -251,11 +218,11 @@ msgstr ""
 msgid "Use the default"
 msgstr ""
 
-#: personal/ppolicy/class_ppolicyAccount.inc:92
+#: personal/ppolicy/class_ppolicyAccount.inc:102
 msgid "Never"
 msgstr ""
 
-#: personal/ppolicy/class_ppolicyAccount.inc:100
+#: personal/ppolicy/class_ppolicyAccount.inc:109
 msgid "Unlocked"
 msgstr ""
 
@@ -286,42 +253,3 @@ msgstr ""
 #: config/ppolicy/class_ppolicyConfig.inc:50
 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"
-msgstr[0] ""
-msgstr[1] ""
-
-#: addons/dashboard/ppolicy_locked_accounts.tpl.c:5
-msgid "There is no locked account"
-msgstr ""
-
-#: addons/dashboard/ppolicy_locked_accounts.tpl.c:11
-msgid "Manager concerned"
-msgstr ""
-
-#: addons/dashboard/ppolicy_locked_accounts.tpl.c:14
-msgid "uid"
-msgstr ""
-
-#: addons/dashboard/ppolicy_locked_accounts.tpl.c:17
-msgid "cn"
-msgstr ""
-
-#: addons/dashboard/ppolicy_locked_accounts.tpl.c:20
-#: addons/dashboard/ppolicy_locked_accounts.tpl.c:32
-msgid "telephoneNumber"
-msgstr ""
-
-#: addons/dashboard/ppolicy_locked_accounts.tpl.c:23
-msgid "pwdAccountLockedTime"
-msgstr ""
-
-#: addons/dashboard/ppolicy_locked_accounts.tpl.c:26
-msgid "manager"
-msgstr ""
-
-#: addons/dashboard/ppolicy_locked_accounts.tpl.c:29
-msgid "mail"
-msgstr ""
diff --git a/ppolicy/locale/ug/fusiondirectory.po b/ppolicy/locale/ug/fusiondirectory.po
index cc83ffecf5e7912551d9569e372e8ced9265ddd5..001b15a50bf5ed9c3b4324c72486f2b0855be6f6 100644
--- a/ppolicy/locale/ug/fusiondirectory.po
+++ b/ppolicy/locale/ug/fusiondirectory.po
@@ -5,12 +5,12 @@
 # Translators:
 msgid ""
 msgstr ""
-"Project-Id-Version: FusionDirectory-108\n"
+"Project-Id-Version: FusionDirectory-109\n"
 "Report-Msgid-Bugs-To: documentation@lists.fusiondirectory.org\n"
-"POT-Creation-Date: 2015-03-31 11:49+0200\n"
-"PO-Revision-Date: 2015-03-31 11:23+0000\n"
-"Last-Translator: fusiondirectory <contact@fusiondirectory.org>\n"
-"Language-Team: Uighur (http://www.transifex.com/projects/p/FusionDirectory-108/language/ug/)\n"
+"POT-Creation-Date: 2015-02-10 18:26+0100\n"
+"PO-Revision-Date: 2015-02-10 17:35+0000\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: Uighur (http://www.transifex.com/projects/p/FusionDirectory-109/language/ug/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -84,14 +84,13 @@ msgid ""
 msgstr ""
 
 #: admin/ppolicy/class_ppolicy.inc:79
-msgid "Expiry warning delay"
+msgid "Expire warning delay"
 msgstr ""
 
 #: admin/ppolicy/class_ppolicy.inc:79
 msgid ""
-"Defines the start time - in seconds - prior to the password expiry that "
-"password expiry warning messages are returned in bind responses. 0 to "
-"disable"
+"Start time prior to the password expiry that password expiry warning "
+"messages are returned in bind responses"
 msgstr ""
 
 #: admin/ppolicy/class_ppolicy.inc:84
@@ -175,38 +174,6 @@ msgid ""
 "administrator following an automatic lockout"
 msgstr ""
 
-#: addons/dashboard/class_dashBoardPPolicy.inc:26
-msgid "Ppolicy"
-msgstr ""
-
-#: addons/dashboard/class_dashBoardPPolicy.inc:27
-msgid "Statistics about ppolicy expired users"
-msgstr ""
-
-#: addons/dashboard/class_dashBoardPPolicy.inc:38
-msgid "Expired accounts"
-msgstr ""
-
-#: addons/dashboard/class_dashBoardPPolicy.inc:43
-#: addons/dashboard/ppolicy_locked_accounts.tpl.c:8
-msgid "Locked accounts"
-msgstr ""
-
-#: addons/dashboard/class_dashBoardPPolicy.inc:69
-#: addons/dashboard/class_dashBoardPPolicy.inc:124
-msgid "Configuration error"
-msgstr ""
-
-#: addons/dashboard/class_dashBoardPPolicy.inc:70
-#, php-format
-msgid "Default ppolicy \"%s\" could not be found in the LDAP!"
-msgstr ""
-
-#: addons/dashboard/class_dashBoardPPolicy.inc:125
-#, php-format
-msgid "Ppolicy \"%s\" set for user \"%s\" could not be found in the LDAP!"
-msgstr ""
-
 #: personal/ppolicy/class_ppolicyAccount.inc:38
 msgid "Edit user's password policy"
 msgstr ""
@@ -251,11 +218,11 @@ msgstr ""
 msgid "Use the default"
 msgstr ""
 
-#: personal/ppolicy/class_ppolicyAccount.inc:92
+#: personal/ppolicy/class_ppolicyAccount.inc:102
 msgid "Never"
 msgstr ""
 
-#: personal/ppolicy/class_ppolicyAccount.inc:100
+#: personal/ppolicy/class_ppolicyAccount.inc:109
 msgid "Unlocked"
 msgstr ""
 
@@ -286,41 +253,3 @@ msgstr ""
 #: config/ppolicy/class_ppolicyConfig.inc:50
 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"
-msgstr[0] ""
-
-#: addons/dashboard/ppolicy_locked_accounts.tpl.c:5
-msgid "There is no locked account"
-msgstr ""
-
-#: addons/dashboard/ppolicy_locked_accounts.tpl.c:11
-msgid "Manager concerned"
-msgstr ""
-
-#: addons/dashboard/ppolicy_locked_accounts.tpl.c:14
-msgid "uid"
-msgstr ""
-
-#: addons/dashboard/ppolicy_locked_accounts.tpl.c:17
-msgid "cn"
-msgstr ""
-
-#: addons/dashboard/ppolicy_locked_accounts.tpl.c:20
-#: addons/dashboard/ppolicy_locked_accounts.tpl.c:32
-msgid "telephoneNumber"
-msgstr ""
-
-#: addons/dashboard/ppolicy_locked_accounts.tpl.c:23
-msgid "pwdAccountLockedTime"
-msgstr ""
-
-#: addons/dashboard/ppolicy_locked_accounts.tpl.c:26
-msgid "manager"
-msgstr ""
-
-#: addons/dashboard/ppolicy_locked_accounts.tpl.c:29
-msgid "mail"
-msgstr ""
diff --git a/ppolicy/locale/vi_VN/fusiondirectory.po b/ppolicy/locale/vi_VN/fusiondirectory.po
index 4f484de095611f42f1cfa9da785070f1b965a460..c72bad0c07c42ea195f4d3e4fb640f92ad34a5fd 100644
--- a/ppolicy/locale/vi_VN/fusiondirectory.po
+++ b/ppolicy/locale/vi_VN/fusiondirectory.po
@@ -5,12 +5,12 @@
 # Translators:
 msgid ""
 msgstr ""
-"Project-Id-Version: FusionDirectory-108\n"
+"Project-Id-Version: FusionDirectory-109\n"
 "Report-Msgid-Bugs-To: documentation@lists.fusiondirectory.org\n"
-"POT-Creation-Date: 2015-03-31 11:49+0200\n"
-"PO-Revision-Date: 2015-03-31 11:42+0000\n"
-"Last-Translator: fusiondirectory <contact@fusiondirectory.org>\n"
-"Language-Team: Vietnamese (Viet Nam) (http://www.transifex.com/projects/p/FusionDirectory-108/language/vi_VN/)\n"
+"POT-Creation-Date: 2015-02-10 18:26+0100\n"
+"PO-Revision-Date: 2015-02-10 17:35+0000\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: Vietnamese (Viet Nam) (http://www.transifex.com/projects/p/FusionDirectory-109/language/vi_VN/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -84,14 +84,13 @@ msgid ""
 msgstr ""
 
 #: admin/ppolicy/class_ppolicy.inc:79
-msgid "Expiry warning delay"
+msgid "Expire warning delay"
 msgstr ""
 
 #: admin/ppolicy/class_ppolicy.inc:79
 msgid ""
-"Defines the start time - in seconds - prior to the password expiry that "
-"password expiry warning messages are returned in bind responses. 0 to "
-"disable"
+"Start time prior to the password expiry that password expiry warning "
+"messages are returned in bind responses"
 msgstr ""
 
 #: admin/ppolicy/class_ppolicy.inc:84
@@ -175,38 +174,6 @@ msgid ""
 "administrator following an automatic lockout"
 msgstr ""
 
-#: addons/dashboard/class_dashBoardPPolicy.inc:26
-msgid "Ppolicy"
-msgstr ""
-
-#: addons/dashboard/class_dashBoardPPolicy.inc:27
-msgid "Statistics about ppolicy expired users"
-msgstr ""
-
-#: addons/dashboard/class_dashBoardPPolicy.inc:38
-msgid "Expired accounts"
-msgstr ""
-
-#: addons/dashboard/class_dashBoardPPolicy.inc:43
-#: addons/dashboard/ppolicy_locked_accounts.tpl.c:8
-msgid "Locked accounts"
-msgstr ""
-
-#: addons/dashboard/class_dashBoardPPolicy.inc:69
-#: addons/dashboard/class_dashBoardPPolicy.inc:124
-msgid "Configuration error"
-msgstr "Lá»—i cáº¥u hÃ¬nh"
-
-#: addons/dashboard/class_dashBoardPPolicy.inc:70
-#, php-format
-msgid "Default ppolicy \"%s\" could not be found in the LDAP!"
-msgstr ""
-
-#: addons/dashboard/class_dashBoardPPolicy.inc:125
-#, php-format
-msgid "Ppolicy \"%s\" set for user \"%s\" could not be found in the LDAP!"
-msgstr ""
-
 #: personal/ppolicy/class_ppolicyAccount.inc:38
 msgid "Edit user's password policy"
 msgstr ""
@@ -251,11 +218,11 @@ msgstr ""
 msgid "Use the default"
 msgstr ""
 
-#: personal/ppolicy/class_ppolicyAccount.inc:92
+#: personal/ppolicy/class_ppolicyAccount.inc:102
 msgid "Never"
 msgstr ""
 
-#: personal/ppolicy/class_ppolicyAccount.inc:100
+#: personal/ppolicy/class_ppolicyAccount.inc:109
 msgid "Unlocked"
 msgstr ""
 
@@ -286,41 +253,3 @@ msgstr ""
 #: config/ppolicy/class_ppolicyConfig.inc:50
 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"
-msgstr[0] ""
-
-#: addons/dashboard/ppolicy_locked_accounts.tpl.c:5
-msgid "There is no locked account"
-msgstr ""
-
-#: addons/dashboard/ppolicy_locked_accounts.tpl.c:11
-msgid "Manager concerned"
-msgstr ""
-
-#: addons/dashboard/ppolicy_locked_accounts.tpl.c:14
-msgid "uid"
-msgstr ""
-
-#: addons/dashboard/ppolicy_locked_accounts.tpl.c:17
-msgid "cn"
-msgstr ""
-
-#: addons/dashboard/ppolicy_locked_accounts.tpl.c:20
-#: addons/dashboard/ppolicy_locked_accounts.tpl.c:32
-msgid "telephoneNumber"
-msgstr ""
-
-#: addons/dashboard/ppolicy_locked_accounts.tpl.c:23
-msgid "pwdAccountLockedTime"
-msgstr ""
-
-#: addons/dashboard/ppolicy_locked_accounts.tpl.c:26
-msgid "manager"
-msgstr ""
-
-#: addons/dashboard/ppolicy_locked_accounts.tpl.c:29
-msgid "mail"
-msgstr ""
diff --git a/ppolicy/locale/zh/fusiondirectory.po b/ppolicy/locale/zh/fusiondirectory.po
index bbe99947fff272f35c666e7804eba766edd04f59..a59e46d477f59c772fb96a2cd45eb32713e52348 100644
--- a/ppolicy/locale/zh/fusiondirectory.po
+++ b/ppolicy/locale/zh/fusiondirectory.po
@@ -5,12 +5,12 @@
 # Translators:
 msgid ""
 msgstr ""
-"Project-Id-Version: FusionDirectory-108\n"
+"Project-Id-Version: FusionDirectory-109\n"
 "Report-Msgid-Bugs-To: documentation@lists.fusiondirectory.org\n"
-"POT-Creation-Date: 2015-03-31 11:49+0200\n"
-"PO-Revision-Date: 2015-03-31 11:23+0000\n"
-"Last-Translator: fusiondirectory <contact@fusiondirectory.org>\n"
-"Language-Team: Chinese (http://www.transifex.com/projects/p/FusionDirectory-108/language/zh/)\n"
+"POT-Creation-Date: 2015-02-10 18:26+0100\n"
+"PO-Revision-Date: 2015-02-10 17:35+0000\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: Chinese (http://www.transifex.com/projects/p/FusionDirectory-109/language/zh/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -84,14 +84,13 @@ msgid ""
 msgstr ""
 
 #: admin/ppolicy/class_ppolicy.inc:79
-msgid "Expiry warning delay"
+msgid "Expire warning delay"
 msgstr ""
 
 #: admin/ppolicy/class_ppolicy.inc:79
 msgid ""
-"Defines the start time - in seconds - prior to the password expiry that "
-"password expiry warning messages are returned in bind responses. 0 to "
-"disable"
+"Start time prior to the password expiry that password expiry warning "
+"messages are returned in bind responses"
 msgstr ""
 
 #: admin/ppolicy/class_ppolicy.inc:84
@@ -175,38 +174,6 @@ msgid ""
 "administrator following an automatic lockout"
 msgstr ""
 
-#: addons/dashboard/class_dashBoardPPolicy.inc:26
-msgid "Ppolicy"
-msgstr ""
-
-#: addons/dashboard/class_dashBoardPPolicy.inc:27
-msgid "Statistics about ppolicy expired users"
-msgstr ""
-
-#: addons/dashboard/class_dashBoardPPolicy.inc:38
-msgid "Expired accounts"
-msgstr ""
-
-#: addons/dashboard/class_dashBoardPPolicy.inc:43
-#: addons/dashboard/ppolicy_locked_accounts.tpl.c:8
-msgid "Locked accounts"
-msgstr ""
-
-#: addons/dashboard/class_dashBoardPPolicy.inc:69
-#: addons/dashboard/class_dashBoardPPolicy.inc:124
-msgid "Configuration error"
-msgstr ""
-
-#: addons/dashboard/class_dashBoardPPolicy.inc:70
-#, php-format
-msgid "Default ppolicy \"%s\" could not be found in the LDAP!"
-msgstr ""
-
-#: addons/dashboard/class_dashBoardPPolicy.inc:125
-#, php-format
-msgid "Ppolicy \"%s\" set for user \"%s\" could not be found in the LDAP!"
-msgstr ""
-
 #: personal/ppolicy/class_ppolicyAccount.inc:38
 msgid "Edit user's password policy"
 msgstr ""
@@ -251,11 +218,11 @@ msgstr ""
 msgid "Use the default"
 msgstr ""
 
-#: personal/ppolicy/class_ppolicyAccount.inc:92
+#: personal/ppolicy/class_ppolicyAccount.inc:102
 msgid "Never"
 msgstr ""
 
-#: personal/ppolicy/class_ppolicyAccount.inc:100
+#: personal/ppolicy/class_ppolicyAccount.inc:109
 msgid "Unlocked"
 msgstr ""
 
@@ -286,41 +253,3 @@ msgstr ""
 #: config/ppolicy/class_ppolicyConfig.inc:50
 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"
-msgstr[0] ""
-
-#: addons/dashboard/ppolicy_locked_accounts.tpl.c:5
-msgid "There is no locked account"
-msgstr ""
-
-#: addons/dashboard/ppolicy_locked_accounts.tpl.c:11
-msgid "Manager concerned"
-msgstr ""
-
-#: addons/dashboard/ppolicy_locked_accounts.tpl.c:14
-msgid "uid"
-msgstr ""
-
-#: addons/dashboard/ppolicy_locked_accounts.tpl.c:17
-msgid "cn"
-msgstr ""
-
-#: addons/dashboard/ppolicy_locked_accounts.tpl.c:20
-#: addons/dashboard/ppolicy_locked_accounts.tpl.c:32
-msgid "telephoneNumber"
-msgstr ""
-
-#: addons/dashboard/ppolicy_locked_accounts.tpl.c:23
-msgid "pwdAccountLockedTime"
-msgstr ""
-
-#: addons/dashboard/ppolicy_locked_accounts.tpl.c:26
-msgid "manager"
-msgstr ""
-
-#: addons/dashboard/ppolicy_locked_accounts.tpl.c:29
-msgid "mail"
-msgstr ""
diff --git a/puppet/locale/ar/fusiondirectory.po b/puppet/locale/ar/fusiondirectory.po
index 1a0587fbe5f31e499e6fdec0be5c84eb98468a07..46f61007d8399984e85d054d8e1c27a96cffb3f1 100644
--- a/puppet/locale/ar/fusiondirectory.po
+++ b/puppet/locale/ar/fusiondirectory.po
@@ -5,12 +5,12 @@
 # Translators:
 msgid ""
 msgstr ""
-"Project-Id-Version: FusionDirectory-108\n"
+"Project-Id-Version: FusionDirectory-109\n"
 "Report-Msgid-Bugs-To: documentation@lists.fusiondirectory.org\n"
-"POT-Creation-Date: 2015-03-17 18:47+0100\n"
-"PO-Revision-Date: 2014-08-26 14:13+0000\n"
-"Last-Translator: fusiondirectory <contact@fusiondirectory.org>\n"
-"Language-Team: Arabic (http://www.transifex.com/projects/p/FusionDirectory-108/language/ar/)\n"
+"POT-Creation-Date: 2014-12-15 17:47+0100\n"
+"PO-Revision-Date: 2014-08-28 10:29+0000\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: Arabic (http://www.transifex.com/projects/p/FusionDirectory-109/language/ar/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
diff --git a/puppet/locale/ca/fusiondirectory.po b/puppet/locale/ca/fusiondirectory.po
index 4eb75381428c2f9237f4b262f5f598f0c2f7debc..c57de17e0ff98b02fa8f2e6cf7cf191d9b626438 100644
--- a/puppet/locale/ca/fusiondirectory.po
+++ b/puppet/locale/ca/fusiondirectory.po
@@ -5,12 +5,12 @@
 # Translators:
 msgid ""
 msgstr ""
-"Project-Id-Version: FusionDirectory-108\n"
+"Project-Id-Version: FusionDirectory-109\n"
 "Report-Msgid-Bugs-To: documentation@lists.fusiondirectory.org\n"
-"POT-Creation-Date: 2015-03-17 18:47+0100\n"
-"PO-Revision-Date: 2014-08-26 14:13+0000\n"
-"Last-Translator: fusiondirectory <contact@fusiondirectory.org>\n"
-"Language-Team: Catalan (http://www.transifex.com/projects/p/FusionDirectory-108/language/ca/)\n"
+"POT-Creation-Date: 2014-12-15 17:47+0100\n"
+"PO-Revision-Date: 2014-08-28 10:29+0000\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: Catalan (http://www.transifex.com/projects/p/FusionDirectory-109/language/ca/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
diff --git a/puppet/locale/cs_CZ/fusiondirectory.po b/puppet/locale/cs_CZ/fusiondirectory.po
index 66ec6d50418de59c3e49ab95ee1511738abaed2f..aa0b1de71659dff802544da1e2945aca59f1daab 100644
--- a/puppet/locale/cs_CZ/fusiondirectory.po
+++ b/puppet/locale/cs_CZ/fusiondirectory.po
@@ -3,14 +3,15 @@
 # This file is distributed under the same license as the PACKAGE package.
 # 
 # Translators:
+# Pavel Borecki <pavel.borecki@gmail.com>, 2014-2015
 msgid ""
 msgstr ""
-"Project-Id-Version: FusionDirectory-108\n"
+"Project-Id-Version: FusionDirectory-109\n"
 "Report-Msgid-Bugs-To: documentation@lists.fusiondirectory.org\n"
-"POT-Creation-Date: 2015-03-17 18:47+0100\n"
-"PO-Revision-Date: 2015-02-25 16:12+0000\n"
-"Last-Translator: fusiondirectory <contact@fusiondirectory.org>\n"
-"Language-Team: Czech (Czech Republic) (http://www.transifex.com/projects/p/FusionDirectory-108/language/cs_CZ/)\n"
+"POT-Creation-Date: 2014-12-15 17:47+0100\n"
+"PO-Revision-Date: 2015-04-07 18:21+0000\n"
+"Last-Translator: Pavel Borecki <pavel.borecki@gmail.com>\n"
+"Language-Team: Czech (Czech Republic) (http://www.transifex.com/projects/p/FusionDirectory-109/language/cs_CZ/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -23,15 +24,15 @@ msgstr "NastavenÃ Puppet uzlu"
 
 #: admin/systems/puppet/class_puppetNode.inc:36
 msgid "Puppet class"
-msgstr ""
+msgstr "TÅ™Ãda Puppet"
 
 #: admin/systems/puppet/class_puppetNode.inc:36
 msgid "Puppet Node Class"
-msgstr ""
+msgstr "TÅ™Ãda Puppet uzlu"
 
 #: admin/systems/puppet/class_puppetNode.inc:38
 msgid "Parent node"
-msgstr "nadÅ™azenÃ½ uzel"
+msgstr "NadÅ™azenÃ½ uzel"
 
 #: admin/systems/puppet/class_puppetNode.inc:38
 msgid "Puppet Parent Node"
@@ -39,23 +40,23 @@ msgstr "NadÅ™azenÃ½ Puppet uzel"
 
 #: admin/systems/puppet/class_puppetNode.inc:39
 msgid "Environment"
-msgstr "prostÅ™edÃ"
+msgstr "ProstÅ™edÃ"
 
 #: admin/systems/puppet/class_puppetNode.inc:39
 msgid "Puppet Node Environment"
-msgstr ""
+msgstr "ProstÅ™edÃ Puppet uzlu"
 
 #: admin/systems/puppet/class_puppetNode.inc:42
 msgid "A variable setting for puppet"
-msgstr ""
+msgstr "NastavenÃ promÄ›nnÃ© pro puppet"
 
 #: admin/systems/puppet/class_puppetNode.inc:45
 msgid "Name of the variable"
-msgstr ""
+msgstr "NÃ¡zev promÄ›nnÃ©"
 
 #: admin/systems/puppet/class_puppetNode.inc:46
 msgid "Value of the variable"
-msgstr ""
+msgstr "Hodnota promÄ›nnÃ©"
 
 #: admin/systems/puppet/class_puppetNode.inc:63
 msgid "Puppet"
@@ -64,21 +65,21 @@ msgstr ""
 #: admin/systems/puppet/class_puppetNode.inc:64
 msgid ""
 "Support for puppet schema in order to edit puppet classes and puppet vars"
-msgstr ""
+msgstr "Podpora pro schÃ©ma puppet pro Ãºpravy puppet tÅ™Ãd a promÄ›nnÃ½ch"
 
 #: admin/systems/services/puppet/class_servicePuppet.inc:36
 #: admin/systems/services/puppet/class_servicePuppet.inc:56
 msgid "Puppet server"
-msgstr ""
+msgstr "Server Puppet"
 
 #: admin/systems/services/puppet/class_servicePuppet.inc:40
 msgid "Environments"
-msgstr ""
+msgstr "ProstÅ™edÃ"
 
 #: admin/systems/services/puppet/class_servicePuppet.inc:41
 msgid "Available environments for puppet nodes"
-msgstr ""
+msgstr "ProstÅ™edÃ, dostupnÃ¡ pro uzly puppet"
 
 #: admin/systems/services/puppet/class_servicePuppet.inc:57
 msgid "This service allows you to use a puppet server"
-msgstr ""
+msgstr "Tato sluÅ¾ba vÃ¡m umoÅ¾Åˆuje pouÅ¾Ãt puppet server"
diff --git a/puppet/locale/de/fusiondirectory.po b/puppet/locale/de/fusiondirectory.po
index 0d5d92db548c9a84a130c96a753fca7c808c48a5..52f886de760b3a37f278d8eece126ce89e2e4f21 100644
--- a/puppet/locale/de/fusiondirectory.po
+++ b/puppet/locale/de/fusiondirectory.po
@@ -3,15 +3,14 @@
 # This file is distributed under the same license as the PACKAGE package.
 # 
 # Translators:
-# Maik Wagner <maikwagner@yahoo.com>, 2014
 msgid ""
 msgstr ""
-"Project-Id-Version: FusionDirectory-108\n"
+"Project-Id-Version: FusionDirectory-109\n"
 "Report-Msgid-Bugs-To: documentation@lists.fusiondirectory.org\n"
-"POT-Creation-Date: 2015-03-17 18:47+0100\n"
-"PO-Revision-Date: 2015-02-25 16:12+0000\n"
-"Last-Translator: fusiondirectory <contact@fusiondirectory.org>\n"
-"Language-Team: German (http://www.transifex.com/projects/p/FusionDirectory-108/language/de/)\n"
+"POT-Creation-Date: 2014-12-15 17:47+0100\n"
+"PO-Revision-Date: 2014-08-28 10:29+0000\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: German (http://www.transifex.com/projects/p/FusionDirectory-109/language/de/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
diff --git a/puppet/locale/el_GR/fusiondirectory.po b/puppet/locale/el_GR/fusiondirectory.po
new file mode 100644
index 0000000000000000000000000000000000000000..306f4ace77b3905b8439e89312af5ae572758eb1
--- /dev/null
+++ b/puppet/locale/el_GR/fusiondirectory.po
@@ -0,0 +1,84 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR FusionDirectory Project
+# This file is distributed under the same license as the PACKAGE package.
+# 
+# Translators:
+msgid ""
+msgstr ""
+"Project-Id-Version: FusionDirectory-109\n"
+"Report-Msgid-Bugs-To: documentation@lists.fusiondirectory.org\n"
+"POT-Creation-Date: 2014-12-15 17:47+0100\n"
+"PO-Revision-Date: 2015-05-30 11:45+0000\n"
+"Last-Translator: Benoit Mortier <benoit.mortier@opensides.be>\n"
+"Language-Team: Greek (Greece) (http://www.transifex.com/projects/p/FusionDirectory-109/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/puppet/class_puppetNode.inc:33
+msgid "Puppet node settings"
+msgstr ""
+
+#: admin/systems/puppet/class_puppetNode.inc:36
+msgid "Puppet class"
+msgstr ""
+
+#: admin/systems/puppet/class_puppetNode.inc:36
+msgid "Puppet Node Class"
+msgstr ""
+
+#: admin/systems/puppet/class_puppetNode.inc:38
+msgid "Parent node"
+msgstr ""
+
+#: admin/systems/puppet/class_puppetNode.inc:38
+msgid "Puppet Parent Node"
+msgstr ""
+
+#: admin/systems/puppet/class_puppetNode.inc:39
+msgid "Environment"
+msgstr ""
+
+#: admin/systems/puppet/class_puppetNode.inc:39
+msgid "Puppet Node Environment"
+msgstr ""
+
+#: admin/systems/puppet/class_puppetNode.inc:42
+msgid "A variable setting for puppet"
+msgstr ""
+
+#: admin/systems/puppet/class_puppetNode.inc:45
+msgid "Name of the variable"
+msgstr ""
+
+#: admin/systems/puppet/class_puppetNode.inc:46
+msgid "Value of the variable"
+msgstr ""
+
+#: admin/systems/puppet/class_puppetNode.inc:63
+msgid "Puppet"
+msgstr ""
+
+#: admin/systems/puppet/class_puppetNode.inc:64
+msgid ""
+"Support for puppet schema in order to edit puppet classes and puppet vars"
+msgstr ""
+
+#: admin/systems/services/puppet/class_servicePuppet.inc:36
+#: admin/systems/services/puppet/class_servicePuppet.inc:56
+msgid "Puppet server"
+msgstr ""
+
+#: admin/systems/services/puppet/class_servicePuppet.inc:40
+msgid "Environments"
+msgstr ""
+
+#: admin/systems/services/puppet/class_servicePuppet.inc:41
+msgid "Available environments for puppet nodes"
+msgstr ""
+
+#: admin/systems/services/puppet/class_servicePuppet.inc:57
+msgid "This service allows you to use a puppet server"
+msgstr ""
diff --git a/puppet/locale/en/fusiondirectory.po b/puppet/locale/en/fusiondirectory.po
index fd7b8fd8fc8c840b20ae0864b18168c6a61e9d7b..e304ebaae5319fb01b9022c3457301a4a9590fd7 100644
--- a/puppet/locale/en/fusiondirectory.po
+++ b/puppet/locale/en/fusiondirectory.po
@@ -6,13 +6,13 @@
 #, fuzzy
 msgid ""
 msgstr ""
-"Project-Id-Version: PACKAGE VERSION\n"
-"Report-Msgid-Bugs-To: documentation@lists.fusiondirectory.org\n"
-"POT-Creation-Date: 2015-03-31 11:49+0200\n"
+"Project-Id-Version: FusionDirectory VERSION\n"
+"Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
+"POT-Creation-Date: 2015-05-30 15:30+0200\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
-"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
-"Language-Team: LANGUAGE <LL@li.org>\n"
-"Language: \n"
+"Last-Translator: FusionDirectory project <contact@fusiondirectory.org>\n"
+"Language-Team: English\n"
+"Language: en\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
diff --git a/puppet/locale/es/fusiondirectory.po b/puppet/locale/es/fusiondirectory.po
index ca16756a2d3bde79d4dd493ae8ca9c1c409fcb00..09ebd1b265a22ea8b8889b799996d31b8a6975d8 100644
--- a/puppet/locale/es/fusiondirectory.po
+++ b/puppet/locale/es/fusiondirectory.po
@@ -5,12 +5,12 @@
 # Translators:
 msgid ""
 msgstr ""
-"Project-Id-Version: FusionDirectory-108\n"
+"Project-Id-Version: FusionDirectory-109\n"
 "Report-Msgid-Bugs-To: documentation@lists.fusiondirectory.org\n"
-"POT-Creation-Date: 2015-03-17 18:47+0100\n"
-"PO-Revision-Date: 2015-02-25 16:12+0000\n"
-"Last-Translator: fusiondirectory <contact@fusiondirectory.org>\n"
-"Language-Team: Spanish (http://www.transifex.com/projects/p/FusionDirectory-108/language/es/)\n"
+"POT-Creation-Date: 2014-12-15 17:47+0100\n"
+"PO-Revision-Date: 2014-08-28 10:29+0000\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: Spanish (http://www.transifex.com/projects/p/FusionDirectory-109/language/es/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
diff --git a/puppet/locale/es_VE/fusiondirectory.po b/puppet/locale/es_VE/fusiondirectory.po
index 5be934831c64f20468f2042eab967edb676fd9f5..23a825390a0a55bde05d215b6a91ad6dbb7a7b2e 100644
--- a/puppet/locale/es_VE/fusiondirectory.po
+++ b/puppet/locale/es_VE/fusiondirectory.po
@@ -3,16 +3,14 @@
 # This file is distributed under the same license as the PACKAGE package.
 # 
 # Translators:
-# lars_g <lars.gold@gmail.com>, 2013
-# lars_g <lars.gold@gmail.com>, 2013
 msgid ""
 msgstr ""
-"Project-Id-Version: FusionDirectory-108\n"
+"Project-Id-Version: FusionDirectory-109\n"
 "Report-Msgid-Bugs-To: documentation@lists.fusiondirectory.org\n"
-"POT-Creation-Date: 2015-03-17 18:47+0100\n"
-"PO-Revision-Date: 2015-02-25 16:12+0000\n"
+"POT-Creation-Date: 2014-12-15 17:47+0100\n"
+"PO-Revision-Date: 2015-02-25 16:13+0000\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>\n"
-"Language-Team: Spanish (Venezuela) (http://www.transifex.com/projects/p/FusionDirectory-108/language/es_VE/)\n"
+"Language-Team: Spanish (Venezuela) (http://www.transifex.com/projects/p/FusionDirectory-109/language/es_VE/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
diff --git a/puppet/locale/fa_IR/fusiondirectory.po b/puppet/locale/fa_IR/fusiondirectory.po
index 93e4366f500b0a9e13931ddf1256dcfdfc19524e..62f8ac9d10148cb1a742cf7124acc8d313ee77b3 100644
--- a/puppet/locale/fa_IR/fusiondirectory.po
+++ b/puppet/locale/fa_IR/fusiondirectory.po
@@ -5,12 +5,12 @@
 # Translators:
 msgid ""
 msgstr ""
-"Project-Id-Version: FusionDirectory-108\n"
+"Project-Id-Version: FusionDirectory-109\n"
 "Report-Msgid-Bugs-To: documentation@lists.fusiondirectory.org\n"
-"POT-Creation-Date: 2015-03-17 18:47+0100\n"
-"PO-Revision-Date: 2014-08-26 14:14+0000\n"
-"Last-Translator: fusiondirectory <contact@fusiondirectory.org>\n"
-"Language-Team: Persian (Iran) (http://www.transifex.com/projects/p/FusionDirectory-108/language/fa_IR/)\n"
+"POT-Creation-Date: 2014-12-15 17:47+0100\n"
+"PO-Revision-Date: 2014-08-28 10:29+0000\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: Persian (Iran) (http://www.transifex.com/projects/p/FusionDirectory-109/language/fa_IR/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
diff --git a/puppet/locale/fr/fusiondirectory.po b/puppet/locale/fr/fusiondirectory.po
index ff0600518e0331f7c6d134a93fd37ed296171e4d..426d2772d4c3b9d5c1c039cbbb269f8670b776e5 100644
--- a/puppet/locale/fr/fusiondirectory.po
+++ b/puppet/locale/fr/fusiondirectory.po
@@ -3,20 +3,14 @@
 # This file is distributed under the same license as the PACKAGE package.
 # 
 # Translators:
-# gallak <antoine.gallavardin@free.fr>, 2013
-# MCMic, 2014
-# fusiondirectory <contact@fusiondirectory.org>, 2012
-# fusiondirectory <contact@fusiondirectory.org>, 2012
-# gallak <antoine.gallavardin@free.fr>, 2013
-# MCMic, 2014
 msgid ""
 msgstr ""
-"Project-Id-Version: FusionDirectory-108\n"
+"Project-Id-Version: FusionDirectory-109\n"
 "Report-Msgid-Bugs-To: documentation@lists.fusiondirectory.org\n"
-"POT-Creation-Date: 2015-03-17 18:47+0100\n"
-"PO-Revision-Date: 2015-02-25 16:12+0000\n"
-"Last-Translator: MCMic\n"
-"Language-Team: French (http://www.transifex.com/projects/p/FusionDirectory-108/language/fr/)\n"
+"POT-Creation-Date: 2014-12-15 17:47+0100\n"
+"PO-Revision-Date: 2014-08-28 10:29+0000\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: French (http://www.transifex.com/projects/p/FusionDirectory-109/language/fr/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -25,7 +19,7 @@ msgstr ""
 
 #: admin/systems/puppet/class_puppetNode.inc:33
 msgid "Puppet node settings"
-msgstr "ParamÃ¨tres des nÅ“uds"
+msgstr "ParamÃ¨tres des noeuds"
 
 #: admin/systems/puppet/class_puppetNode.inc:36
 msgid "Puppet class"
@@ -37,11 +31,11 @@ msgstr "Class de noeuds Puppet"
 
 #: admin/systems/puppet/class_puppetNode.inc:38
 msgid "Parent node"
-msgstr "NÅ“ud parent"
+msgstr "Noeud PÃ¨re"
 
 #: admin/systems/puppet/class_puppetNode.inc:38
 msgid "Puppet Parent Node"
-msgstr "NÅ“ud parent puppet"
+msgstr "Noeud Parent"
 
 #: admin/systems/puppet/class_puppetNode.inc:39
 msgid "Environment"
@@ -49,11 +43,11 @@ msgstr "Environnement"
 
 #: admin/systems/puppet/class_puppetNode.inc:39
 msgid "Puppet Node Environment"
-msgstr "Environnement de nÅ“ud Puppet"
+msgstr "Environnement nÅ“ud de Puppet"
 
 #: admin/systems/puppet/class_puppetNode.inc:42
 msgid "A variable setting for puppet"
-msgstr "Un paramÃ¨tre variable pour Puppet"
+msgstr "un paramÃ¨tre variable pour puppet"
 
 #: admin/systems/puppet/class_puppetNode.inc:45
 msgid "Name of the variable"
@@ -70,7 +64,7 @@ msgstr "Puppet"
 #: admin/systems/puppet/class_puppetNode.inc:64
 msgid ""
 "Support for puppet schema in order to edit puppet classes and puppet vars"
-msgstr "Support du schÃ©ma Puppet afin de modifier les classes et les variables Puppet"
+msgstr "Soutien pour le schÃ©ma Puppet afin de modifier les classes Puppet et les variables Puppet"
 
 #: admin/systems/services/puppet/class_servicePuppet.inc:36
 #: admin/systems/services/puppet/class_servicePuppet.inc:56
@@ -79,11 +73,11 @@ msgstr "Serveur Puppet"
 
 #: admin/systems/services/puppet/class_servicePuppet.inc:40
 msgid "Environments"
-msgstr "Environnements"
+msgstr "Environments"
 
 #: admin/systems/services/puppet/class_servicePuppet.inc:41
 msgid "Available environments for puppet nodes"
-msgstr "Environnements disponibles pour les nÅ“uds Puppet"
+msgstr "Environnements disponibles pour les noeuds Puppet"
 
 #: admin/systems/services/puppet/class_servicePuppet.inc:57
 msgid "This service allows you to use a puppet server"
diff --git a/puppet/locale/id/fusiondirectory.po b/puppet/locale/id/fusiondirectory.po
index a1e86f21c481da86d7a133e396033c60caae4549..70a6554b5cac4b85e4c63ff01ec1a37cd02101a0 100644
--- a/puppet/locale/id/fusiondirectory.po
+++ b/puppet/locale/id/fusiondirectory.po
@@ -5,12 +5,12 @@
 # Translators:
 msgid ""
 msgstr ""
-"Project-Id-Version: FusionDirectory-108\n"
+"Project-Id-Version: FusionDirectory-109\n"
 "Report-Msgid-Bugs-To: documentation@lists.fusiondirectory.org\n"
-"POT-Creation-Date: 2015-03-17 18:47+0100\n"
-"PO-Revision-Date: 2014-08-26 14:14+0000\n"
-"Last-Translator: fusiondirectory <contact@fusiondirectory.org>\n"
-"Language-Team: Indonesian (http://www.transifex.com/projects/p/FusionDirectory-108/language/id/)\n"
+"POT-Creation-Date: 2014-12-15 17:47+0100\n"
+"PO-Revision-Date: 2014-08-28 10:29+0000\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: Indonesian (http://www.transifex.com/projects/p/FusionDirectory-109/language/id/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
diff --git a/puppet/locale/it/fusiondirectory.po b/puppet/locale/it/fusiondirectory.po
index c7eff748948b9fc02cb3513f92a4095f542ffef1..e488cf215d4e6848e2e6bb8dcea45548acf1c3c7 100644
--- a/puppet/locale/it/fusiondirectory.po
+++ b/puppet/locale/it/fusiondirectory.po
@@ -3,16 +3,14 @@
 # This file is distributed under the same license as the PACKAGE package.
 # 
 # Translators:
-# poterealpopolo <giuliano@opensides.be>, 2013
-# poterealpopolo <giuliano@opensides.be>, 2013
 msgid ""
 msgstr ""
-"Project-Id-Version: FusionDirectory-108\n"
+"Project-Id-Version: FusionDirectory-109\n"
 "Report-Msgid-Bugs-To: documentation@lists.fusiondirectory.org\n"
-"POT-Creation-Date: 2015-03-17 18:47+0100\n"
-"PO-Revision-Date: 2015-02-25 16:12+0000\n"
-"Last-Translator: fusiondirectory <contact@fusiondirectory.org>\n"
-"Language-Team: Italian (http://www.transifex.com/projects/p/FusionDirectory-108/language/it/)\n"
+"POT-Creation-Date: 2014-12-15 17:47+0100\n"
+"PO-Revision-Date: 2014-08-28 10:29+0000\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: Italian (http://www.transifex.com/projects/p/FusionDirectory-109/language/it/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
diff --git a/puppet/locale/lv/fusiondirectory.po b/puppet/locale/lv/fusiondirectory.po
index c6098f92cb458b1c48c2c84d572a838e68fa52e4..c0c4c1556b8c263ed3d2d36b3865de356a960192 100644
--- a/puppet/locale/lv/fusiondirectory.po
+++ b/puppet/locale/lv/fusiondirectory.po
@@ -5,12 +5,12 @@
 # Translators:
 msgid ""
 msgstr ""
-"Project-Id-Version: FusionDirectory-108\n"
+"Project-Id-Version: FusionDirectory-109\n"
 "Report-Msgid-Bugs-To: documentation@lists.fusiondirectory.org\n"
-"POT-Creation-Date: 2015-03-17 18:47+0100\n"
-"PO-Revision-Date: 2014-08-26 14:14+0000\n"
-"Last-Translator: fusiondirectory <contact@fusiondirectory.org>\n"
-"Language-Team: Latvian (http://www.transifex.com/projects/p/FusionDirectory-108/language/lv/)\n"
+"POT-Creation-Date: 2014-12-15 17:47+0100\n"
+"PO-Revision-Date: 2014-08-28 10:29+0000\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: Latvian (http://www.transifex.com/projects/p/FusionDirectory-109/language/lv/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
diff --git a/puppet/locale/nb/fusiondirectory.po b/puppet/locale/nb/fusiondirectory.po
index c04ad2e10743e569398fc16acc18b33a5add0d66..13ceef8f44b00a4d05c3757453180710ee3b166d 100644
--- a/puppet/locale/nb/fusiondirectory.po
+++ b/puppet/locale/nb/fusiondirectory.po
@@ -5,12 +5,12 @@
 # Translators:
 msgid ""
 msgstr ""
-"Project-Id-Version: FusionDirectory-108\n"
+"Project-Id-Version: FusionDirectory-109\n"
 "Report-Msgid-Bugs-To: documentation@lists.fusiondirectory.org\n"
-"POT-Creation-Date: 2015-03-17 18:47+0100\n"
-"PO-Revision-Date: 2014-08-26 14:14+0000\n"
-"Last-Translator: fusiondirectory <contact@fusiondirectory.org>\n"
-"Language-Team: Norwegian BokmÃ¥l (http://www.transifex.com/projects/p/FusionDirectory-108/language/nb/)\n"
+"POT-Creation-Date: 2014-12-15 17:47+0100\n"
+"PO-Revision-Date: 2014-08-28 10:29+0000\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: Norwegian BokmÃ¥l (http://www.transifex.com/projects/p/FusionDirectory-109/language/nb/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
diff --git a/puppet/locale/nl/fusiondirectory.po b/puppet/locale/nl/fusiondirectory.po
index b71463577b474d4291392997daaf9ebd148e165c..17806ae646f407615c9893f9b362500829f3a5b0 100644
--- a/puppet/locale/nl/fusiondirectory.po
+++ b/puppet/locale/nl/fusiondirectory.po
@@ -5,12 +5,12 @@
 # Translators:
 msgid ""
 msgstr ""
-"Project-Id-Version: FusionDirectory-108\n"
+"Project-Id-Version: FusionDirectory-109\n"
 "Report-Msgid-Bugs-To: documentation@lists.fusiondirectory.org\n"
-"POT-Creation-Date: 2015-03-17 18:47+0100\n"
-"PO-Revision-Date: 2015-02-25 16:12+0000\n"
-"Last-Translator: fusiondirectory <contact@fusiondirectory.org>\n"
-"Language-Team: Dutch (http://www.transifex.com/projects/p/FusionDirectory-108/language/nl/)\n"
+"POT-Creation-Date: 2014-12-15 17:47+0100\n"
+"PO-Revision-Date: 2014-08-28 10:29+0000\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: Dutch (http://www.transifex.com/projects/p/FusionDirectory-109/language/nl/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
diff --git a/puppet/locale/pl/fusiondirectory.po b/puppet/locale/pl/fusiondirectory.po
index 526bacafdcf19db0ade37a4c25fcdaa291fbbd89..96336ef23f346d34b6cc32e6dc2bcb4ffdc4f38c 100644
--- a/puppet/locale/pl/fusiondirectory.po
+++ b/puppet/locale/pl/fusiondirectory.po
@@ -5,12 +5,12 @@
 # Translators:
 msgid ""
 msgstr ""
-"Project-Id-Version: FusionDirectory-108\n"
+"Project-Id-Version: FusionDirectory-109\n"
 "Report-Msgid-Bugs-To: documentation@lists.fusiondirectory.org\n"
-"POT-Creation-Date: 2015-03-17 18:47+0100\n"
-"PO-Revision-Date: 2014-08-28 10:49+0000\n"
-"Last-Translator: fusiondirectory <contact@fusiondirectory.org>\n"
-"Language-Team: Polish (http://www.transifex.com/projects/p/FusionDirectory-108/language/pl/)\n"
+"POT-Creation-Date: 2014-12-15 17:47+0100\n"
+"PO-Revision-Date: 2014-08-28 10:29+0000\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: Polish (http://www.transifex.com/projects/p/FusionDirectory-109/language/pl/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
diff --git a/puppet/locale/pt/fusiondirectory.po b/puppet/locale/pt/fusiondirectory.po
index 68a8c0e18b65d2178975b0ad2b740c546f5058d0..da72a7abf96d7f60f77a3799e3c85b13e35f4be4 100644
--- a/puppet/locale/pt/fusiondirectory.po
+++ b/puppet/locale/pt/fusiondirectory.po
@@ -5,12 +5,12 @@
 # Translators:
 msgid ""
 msgstr ""
-"Project-Id-Version: FusionDirectory-108\n"
+"Project-Id-Version: FusionDirectory-109\n"
 "Report-Msgid-Bugs-To: documentation@lists.fusiondirectory.org\n"
-"POT-Creation-Date: 2015-03-17 18:47+0100\n"
-"PO-Revision-Date: 2014-08-28 10:49+0000\n"
-"Last-Translator: fusiondirectory <contact@fusiondirectory.org>\n"
-"Language-Team: Portuguese (http://www.transifex.com/projects/p/FusionDirectory-108/language/pt/)\n"
+"POT-Creation-Date: 2014-12-15 17:47+0100\n"
+"PO-Revision-Date: 2014-08-28 10:29+0000\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: Portuguese (http://www.transifex.com/projects/p/FusionDirectory-109/language/pt/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
diff --git a/puppet/locale/pt_BR/fusiondirectory.po b/puppet/locale/pt_BR/fusiondirectory.po
index 6b5ebf16b034a48f9fd8127c02168d2109f45dc0..17d1210d7cca086dfbf025678c0e901407b85c46 100644
--- a/puppet/locale/pt_BR/fusiondirectory.po
+++ b/puppet/locale/pt_BR/fusiondirectory.po
@@ -3,15 +3,14 @@
 # This file is distributed under the same license as the PACKAGE package.
 # 
 # Translators:
-# ALEJANDRO BARRIOS <alejandrobarrios@interlegis.leg.br>, 2014
 msgid ""
 msgstr ""
-"Project-Id-Version: FusionDirectory-108\n"
+"Project-Id-Version: FusionDirectory-109\n"
 "Report-Msgid-Bugs-To: documentation@lists.fusiondirectory.org\n"
-"POT-Creation-Date: 2015-03-17 18:47+0100\n"
-"PO-Revision-Date: 2015-02-25 16:12+0000\n"
-"Last-Translator: fusiondirectory <contact@fusiondirectory.org>\n"
-"Language-Team: Portuguese (Brazil) (http://www.transifex.com/projects/p/FusionDirectory-108/language/pt_BR/)\n"
+"POT-Creation-Date: 2014-12-15 17:47+0100\n"
+"PO-Revision-Date: 2014-08-28 10:29+0000\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: Portuguese (Brazil) (http://www.transifex.com/projects/p/FusionDirectory-109/language/pt_BR/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
diff --git a/puppet/locale/ru/fusiondirectory.po b/puppet/locale/ru/fusiondirectory.po
index dd6fff68f346b92d30a8ee2f70bb602ca2539e03..236a65d0c5ea44efa23c91492dafcbc14b7401b2 100644
--- a/puppet/locale/ru/fusiondirectory.po
+++ b/puppet/locale/ru/fusiondirectory.po
@@ -5,17 +5,17 @@
 # Translators:
 msgid ""
 msgstr ""
-"Project-Id-Version: FusionDirectory-108\n"
+"Project-Id-Version: FusionDirectory-109\n"
 "Report-Msgid-Bugs-To: documentation@lists.fusiondirectory.org\n"
-"POT-Creation-Date: 2015-03-17 18:47+0100\n"
-"PO-Revision-Date: 2014-08-28 10:49+0000\n"
-"Last-Translator: fusiondirectory <contact@fusiondirectory.org>\n"
-"Language-Team: Russian (http://www.transifex.com/projects/p/FusionDirectory-108/language/ru/)\n"
+"POT-Creation-Date: 2014-12-15 17:47+0100\n"
+"PO-Revision-Date: 2014-08-28 10:29+0000\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: Russian (http://www.transifex.com/projects/p/FusionDirectory-109/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=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);\n"
+"Plural-Forms: nplurals=4; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%10<=4 && (n%100<12 || n%100>14) ? 1 : n%10==0 || (n%10>=5 && n%10<=9) || (n%100>=11 && n%100<=14)? 2 : 3);\n"
 
 #: admin/systems/puppet/class_puppetNode.inc:33
 msgid "Puppet node settings"
diff --git a/puppet/locale/ru@petr1708/fusiondirectory.po b/puppet/locale/ru@petr1708/fusiondirectory.po
index 1cf563c653472c79d84c9afad2bff7d4bb6b753e..89c6e5821da75cda836ff833a57228bc17709f84 100644
--- a/puppet/locale/ru@petr1708/fusiondirectory.po
+++ b/puppet/locale/ru@petr1708/fusiondirectory.po
@@ -5,17 +5,17 @@
 # Translators:
 msgid ""
 msgstr ""
-"Project-Id-Version: FusionDirectory-108\n"
+"Project-Id-Version: FusionDirectory-109\n"
 "Report-Msgid-Bugs-To: documentation@lists.fusiondirectory.org\n"
-"POT-Creation-Date: 2015-03-17 18:47+0100\n"
-"PO-Revision-Date: 2014-08-26 14:14+0000\n"
-"Last-Translator: fusiondirectory <contact@fusiondirectory.org>\n"
-"Language-Team: Russian Petrine orthography (http://www.transifex.com/projects/p/FusionDirectory-108/language/ru@petr1708/)\n"
+"POT-Creation-Date: 2014-12-15 17:47+0100\n"
+"PO-Revision-Date: 2014-08-28 10:29+0000\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: Russian Petrine orthography (http://www.transifex.com/projects/p/FusionDirectory-109/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=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);\n"
+"Plural-Forms: nplurals=4; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%10<=4 && (n%100<12 || n%100>14) ? 1 : n%10==0 || (n%10>=5 && n%10<=9) || (n%100>=11 && n%100<=14)? 2 : 3);\n"
 
 #: admin/systems/puppet/class_puppetNode.inc:33
 msgid "Puppet node settings"
diff --git a/puppet/locale/sv/fusiondirectory.po b/puppet/locale/sv/fusiondirectory.po
index 64943269d4bb3f7053e08e95883c756eacfe6e89..3c484e13c4d88d9b406e8a02f8b96e0b759e8b81 100644
--- a/puppet/locale/sv/fusiondirectory.po
+++ b/puppet/locale/sv/fusiondirectory.po
@@ -3,15 +3,14 @@
 # This file is distributed under the same license as the PACKAGE package.
 # 
 # Translators:
-# Mathias Friman <mathias.friman@knorca.se>, 2014
 msgid ""
 msgstr ""
-"Project-Id-Version: FusionDirectory-108\n"
+"Project-Id-Version: FusionDirectory-109\n"
 "Report-Msgid-Bugs-To: documentation@lists.fusiondirectory.org\n"
-"POT-Creation-Date: 2015-03-17 18:47+0100\n"
-"PO-Revision-Date: 2015-02-25 16:12+0000\n"
-"Last-Translator: fusiondirectory <contact@fusiondirectory.org>\n"
-"Language-Team: Swedish (http://www.transifex.com/projects/p/FusionDirectory-108/language/sv/)\n"
+"POT-Creation-Date: 2014-12-15 17:47+0100\n"
+"PO-Revision-Date: 2014-08-28 10:29+0000\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: Swedish (http://www.transifex.com/projects/p/FusionDirectory-109/language/sv/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
diff --git a/puppet/locale/ug/fusiondirectory.po b/puppet/locale/ug/fusiondirectory.po
index 2a5d5310313b8167748e0302a50c8537fda5726e..33c8ef07ff169617f1df43736a8ccd5c6148f839 100644
--- a/puppet/locale/ug/fusiondirectory.po
+++ b/puppet/locale/ug/fusiondirectory.po
@@ -5,12 +5,12 @@
 # Translators:
 msgid ""
 msgstr ""
-"Project-Id-Version: FusionDirectory-108\n"
+"Project-Id-Version: FusionDirectory-109\n"
 "Report-Msgid-Bugs-To: documentation@lists.fusiondirectory.org\n"
-"POT-Creation-Date: 2015-03-17 18:47+0100\n"
-"PO-Revision-Date: 2014-08-26 14:14+0000\n"
-"Last-Translator: fusiondirectory <contact@fusiondirectory.org>\n"
-"Language-Team: Uighur (http://www.transifex.com/projects/p/FusionDirectory-108/language/ug/)\n"
+"POT-Creation-Date: 2014-12-15 17:47+0100\n"
+"PO-Revision-Date: 2014-08-28 10:29+0000\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: Uighur (http://www.transifex.com/projects/p/FusionDirectory-109/language/ug/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
diff --git a/puppet/locale/vi_VN/fusiondirectory.po b/puppet/locale/vi_VN/fusiondirectory.po
index a392786385bb7f9d2e5bdd1b601e82ffdcf82356..1eaccbc02b3906c2d5c37af95524be5945d51275 100644
--- a/puppet/locale/vi_VN/fusiondirectory.po
+++ b/puppet/locale/vi_VN/fusiondirectory.po
@@ -5,12 +5,12 @@
 # Translators:
 msgid ""
 msgstr ""
-"Project-Id-Version: FusionDirectory-108\n"
+"Project-Id-Version: FusionDirectory-109\n"
 "Report-Msgid-Bugs-To: documentation@lists.fusiondirectory.org\n"
-"POT-Creation-Date: 2015-03-17 18:47+0100\n"
-"PO-Revision-Date: 2014-08-28 10:49+0000\n"
-"Last-Translator: fusiondirectory <contact@fusiondirectory.org>\n"
-"Language-Team: Vietnamese (Viet Nam) (http://www.transifex.com/projects/p/FusionDirectory-108/language/vi_VN/)\n"
+"POT-Creation-Date: 2014-12-15 17:47+0100\n"
+"PO-Revision-Date: 2014-08-28 10:29+0000\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: Vietnamese (Viet Nam) (http://www.transifex.com/projects/p/FusionDirectory-109/language/vi_VN/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
diff --git a/puppet/locale/zh/fusiondirectory.po b/puppet/locale/zh/fusiondirectory.po
index d2aa31fbdddad670846907ffb7c4bda4ba9ceb65..3446b5afbedf9e9ffa524fa2a595ebd99b0055f8 100644
--- a/puppet/locale/zh/fusiondirectory.po
+++ b/puppet/locale/zh/fusiondirectory.po
@@ -5,12 +5,12 @@
 # Translators:
 msgid ""
 msgstr ""
-"Project-Id-Version: FusionDirectory-108\n"
+"Project-Id-Version: FusionDirectory-109\n"
 "Report-Msgid-Bugs-To: documentation@lists.fusiondirectory.org\n"
-"POT-Creation-Date: 2015-03-17 18:47+0100\n"
-"PO-Revision-Date: 2014-08-28 10:49+0000\n"
-"Last-Translator: fusiondirectory <contact@fusiondirectory.org>\n"
-"Language-Team: Chinese (http://www.transifex.com/projects/p/FusionDirectory-108/language/zh/)\n"
+"POT-Creation-Date: 2014-12-15 17:47+0100\n"
+"PO-Revision-Date: 2014-08-28 10:29+0000\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: Chinese (http://www.transifex.com/projects/p/FusionDirectory-109/language/zh/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
diff --git a/pureftpd/locale/ar/fusiondirectory.po b/pureftpd/locale/ar/fusiondirectory.po
index 7b1b9a97b8def9278f5e447480535bed2a84b4ec..c8219d70cebd9f6a3f5623ba440e950142466e72 100644
--- a/pureftpd/locale/ar/fusiondirectory.po
+++ b/pureftpd/locale/ar/fusiondirectory.po
@@ -5,94 +5,91 @@
 # Translators:
 msgid ""
 msgstr ""
-"Project-Id-Version: FusionDirectory-108\n"
+"Project-Id-Version: FusionDirectory-109\n"
 "Report-Msgid-Bugs-To: documentation@lists.fusiondirectory.org\n"
-"POT-Creation-Date: 2015-03-31 11:49+0200\n"
-"PO-Revision-Date: 2015-03-31 10:41+0000\n"
-"Last-Translator: fusiondirectory <contact@fusiondirectory.org>\n"
-"Language-Team: Arabic (http://www.transifex.com/projects/p/FusionDirectory-108/language/ar/)\n"
+"POT-Creation-Date: 2014-12-15 17:47+0100\n"
+"PO-Revision-Date: 2014-08-28 10:29+0000\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: Arabic (http://www.transifex.com/projects/p/FusionDirectory-109/language/ar/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Language: ar\n"
 "Plural-Forms: nplurals=6; plural=n==0 ? 0 : n==1 ? 1 : n==2 ? 2 : n%100>=3 && n%100<=10 ? 3 : n%100>=11 && n%100<=99 ? 4 : 5;\n"
 
-#: personal/pureftpd/class_pureftpdAccount.inc:33
+#: personal/pureftpd/class_pureftpdAccount.inc:34
 msgid "Ftp"
 msgstr ""
 
-#: personal/pureftpd/class_pureftpdAccount.inc:34
+#: personal/pureftpd/class_pureftpdAccount.inc:35
 msgid "Pure ftp account"
 msgstr ""
 
-#: personal/pureftpd/class_pureftpdAccount.inc:34
+#: personal/pureftpd/class_pureftpdAccount.inc:35
 msgid "Connectivity addon"
 msgstr ""
 
-#: personal/pureftpd/class_pureftpdAccount.inc:49
+#: personal/pureftpd/class_pureftpdAccount.inc:50
 msgid "Bandwidth"
 msgstr ""
 
-#: personal/pureftpd/class_pureftpdAccount.inc:52
 #: personal/pureftpd/class_pureftpdAccount.inc:53
+#: personal/pureftpd/class_pureftpdAccount.inc:54
 msgid "Upload bandwidth"
 msgstr ""
 
-#: personal/pureftpd/class_pureftpdAccount.inc:52
-#: personal/pureftpd/class_pureftpdAccount.inc:61
+#: personal/pureftpd/class_pureftpdAccount.inc:53
+#: personal/pureftpd/class_pureftpdAccount.inc:62
 msgid " (kb/sec)"
 msgstr ""
 
-#: personal/pureftpd/class_pureftpdAccount.inc:61
+#: personal/pureftpd/class_pureftpdAccount.inc:62
 msgid "Download bandwidth"
 msgstr ""
 
-#: personal/pureftpd/class_pureftpdAccount.inc:62
+#: personal/pureftpd/class_pureftpdAccount.inc:63
 msgid "Download bandwidth in kb/sec"
 msgstr ""
 
-#: personal/pureftpd/class_pureftpdAccount.inc:72
+#: personal/pureftpd/class_pureftpdAccount.inc:73
 msgid "Ratio"
 msgstr ""
 
-#: personal/pureftpd/class_pureftpdAccount.inc:75
 #: personal/pureftpd/class_pureftpdAccount.inc:76
+#: personal/pureftpd/class_pureftpdAccount.inc:77
 msgid "Uploaded files"
 msgstr ""
 
-#: personal/pureftpd/class_pureftpdAccount.inc:84
 #: personal/pureftpd/class_pureftpdAccount.inc:85
+#: personal/pureftpd/class_pureftpdAccount.inc:86
 msgid "Downloaded files"
 msgstr ""
 
-#: personal/pureftpd/class_pureftpdAccount.inc:98
+#: personal/pureftpd/class_pureftpdAccount.inc:99
 msgid "Files"
 msgstr ""
 
-#: personal/pureftpd/class_pureftpdAccount.inc:99
+#: personal/pureftpd/class_pureftpdAccount.inc:100
 msgid "Quota files"
 msgstr ""
 
-#: personal/pureftpd/class_pureftpdAccount.inc:107
+#: personal/pureftpd/class_pureftpdAccount.inc:108
 msgid "Size"
 msgstr ""
 
-#: personal/pureftpd/class_pureftpdAccount.inc:107
+#: personal/pureftpd/class_pureftpdAccount.inc:108
 msgid " (MB)"
 msgstr ""
 
-#: personal/pureftpd/class_pureftpdAccount.inc:108
+#: personal/pureftpd/class_pureftpdAccount.inc:109
 msgid "Files size"
 msgstr ""
 
-#: personal/pureftpd/class_pureftpdAccount.inc:118
+#: personal/pureftpd/class_pureftpdAccount.inc:119
 msgid "Miscellaneous"
 msgstr ""
 
-#: personal/pureftpd/class_pureftpdAccount.inc:121
-msgid "Enable FTP access"
-msgstr ""
-
-#: personal/pureftpd/class_pureftpdAccount.inc:121
-msgid "Enable or disable FTP access"
+#: personal/pureftpd/class_pureftpdAccount.inc:122
+#: personal/pureftpd/class_pureftpdAccount.inc:123
+msgid "Temporary disable FTP access"
 msgstr ""
diff --git a/pureftpd/locale/ca/fusiondirectory.po b/pureftpd/locale/ca/fusiondirectory.po
index 071a2fd9d9832fcad90d7fbf5774e74ec5edd552..9109bce8cea67f8044a2cc21826a7b673b2d6fec 100644
--- a/pureftpd/locale/ca/fusiondirectory.po
+++ b/pureftpd/locale/ca/fusiondirectory.po
@@ -5,94 +5,91 @@
 # Translators:
 msgid ""
 msgstr ""
-"Project-Id-Version: FusionDirectory-108\n"
+"Project-Id-Version: FusionDirectory-109\n"
 "Report-Msgid-Bugs-To: documentation@lists.fusiondirectory.org\n"
-"POT-Creation-Date: 2015-03-31 11:49+0200\n"
-"PO-Revision-Date: 2015-03-31 10:41+0000\n"
-"Last-Translator: fusiondirectory <contact@fusiondirectory.org>\n"
-"Language-Team: Catalan (http://www.transifex.com/projects/p/FusionDirectory-108/language/ca/)\n"
+"POT-Creation-Date: 2014-12-15 17:47+0100\n"
+"PO-Revision-Date: 2014-08-28 10:29+0000\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: Catalan (http://www.transifex.com/projects/p/FusionDirectory-109/language/ca/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Language: ca\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: personal/pureftpd/class_pureftpdAccount.inc:33
+#: personal/pureftpd/class_pureftpdAccount.inc:34
 msgid "Ftp"
 msgstr ""
 
-#: personal/pureftpd/class_pureftpdAccount.inc:34
+#: personal/pureftpd/class_pureftpdAccount.inc:35
 msgid "Pure ftp account"
 msgstr ""
 
-#: personal/pureftpd/class_pureftpdAccount.inc:34
+#: personal/pureftpd/class_pureftpdAccount.inc:35
 msgid "Connectivity addon"
 msgstr ""
 
-#: personal/pureftpd/class_pureftpdAccount.inc:49
+#: personal/pureftpd/class_pureftpdAccount.inc:50
 msgid "Bandwidth"
 msgstr ""
 
-#: personal/pureftpd/class_pureftpdAccount.inc:52
 #: personal/pureftpd/class_pureftpdAccount.inc:53
+#: personal/pureftpd/class_pureftpdAccount.inc:54
 msgid "Upload bandwidth"
 msgstr ""
 
-#: personal/pureftpd/class_pureftpdAccount.inc:52
-#: personal/pureftpd/class_pureftpdAccount.inc:61
+#: personal/pureftpd/class_pureftpdAccount.inc:53
+#: personal/pureftpd/class_pureftpdAccount.inc:62
 msgid " (kb/sec)"
 msgstr ""
 
-#: personal/pureftpd/class_pureftpdAccount.inc:61
+#: personal/pureftpd/class_pureftpdAccount.inc:62
 msgid "Download bandwidth"
 msgstr ""
 
-#: personal/pureftpd/class_pureftpdAccount.inc:62
+#: personal/pureftpd/class_pureftpdAccount.inc:63
 msgid "Download bandwidth in kb/sec"
 msgstr ""
 
-#: personal/pureftpd/class_pureftpdAccount.inc:72
+#: personal/pureftpd/class_pureftpdAccount.inc:73
 msgid "Ratio"
 msgstr ""
 
-#: personal/pureftpd/class_pureftpdAccount.inc:75
 #: personal/pureftpd/class_pureftpdAccount.inc:76
+#: personal/pureftpd/class_pureftpdAccount.inc:77
 msgid "Uploaded files"
 msgstr ""
 
-#: personal/pureftpd/class_pureftpdAccount.inc:84
 #: personal/pureftpd/class_pureftpdAccount.inc:85
+#: personal/pureftpd/class_pureftpdAccount.inc:86
 msgid "Downloaded files"
 msgstr ""
 
-#: personal/pureftpd/class_pureftpdAccount.inc:98
+#: personal/pureftpd/class_pureftpdAccount.inc:99
 msgid "Files"
 msgstr ""
 
-#: personal/pureftpd/class_pureftpdAccount.inc:99
+#: personal/pureftpd/class_pureftpdAccount.inc:100
 msgid "Quota files"
 msgstr ""
 
-#: personal/pureftpd/class_pureftpdAccount.inc:107
+#: personal/pureftpd/class_pureftpdAccount.inc:108
 msgid "Size"
 msgstr ""
 
-#: personal/pureftpd/class_pureftpdAccount.inc:107
+#: personal/pureftpd/class_pureftpdAccount.inc:108
 msgid " (MB)"
 msgstr ""
 
-#: personal/pureftpd/class_pureftpdAccount.inc:108
+#: personal/pureftpd/class_pureftpdAccount.inc:109
 msgid "Files size"
 msgstr ""
 
-#: personal/pureftpd/class_pureftpdAccount.inc:118
+#: personal/pureftpd/class_pureftpdAccount.inc:119
 msgid "Miscellaneous"
 msgstr ""
 
-#: personal/pureftpd/class_pureftpdAccount.inc:121
-msgid "Enable FTP access"
-msgstr ""
-
-#: personal/pureftpd/class_pureftpdAccount.inc:121
-msgid "Enable or disable FTP access"
+#: personal/pureftpd/class_pureftpdAccount.inc:122
+#: personal/pureftpd/class_pureftpdAccount.inc:123
+msgid "Temporary disable FTP access"
 msgstr ""
diff --git a/pureftpd/locale/cs_CZ/fusiondirectory.po b/pureftpd/locale/cs_CZ/fusiondirectory.po
index dd19db4040e93925a9b8f1dda712dab14dedfc74..3b06a2de64e975405ec7dfeaedfffe3fca76f9d3 100644
--- a/pureftpd/locale/cs_CZ/fusiondirectory.po
+++ b/pureftpd/locale/cs_CZ/fusiondirectory.po
@@ -3,99 +3,94 @@
 # This file is distributed under the same license as the PACKAGE package.
 # 
 # Translators:
-# Pavel Borecki <pavel.borecki@gmail.com>, 2012
-# Pavel Borecki <pavel.borecki@gmail.com>, 2012,2015
-# Pavel Borecki <pavel.borecki@gmail.com>, 2012
+# Pavel Borecki <pavel.borecki@gmail.com>, 2015
 msgid ""
 msgstr ""
-"Project-Id-Version: FusionDirectory-108\n"
+"Project-Id-Version: FusionDirectory-109\n"
 "Report-Msgid-Bugs-To: documentation@lists.fusiondirectory.org\n"
-"POT-Creation-Date: 2015-03-31 11:49+0200\n"
-"PO-Revision-Date: 2015-03-31 10:53+0000\n"
-"Last-Translator: fusiondirectory <contact@fusiondirectory.org>\n"
-"Language-Team: Czech (Czech Republic) (http://www.transifex.com/projects/p/FusionDirectory-108/language/cs_CZ/)\n"
+"POT-Creation-Date: 2014-12-15 17:47+0100\n"
+"PO-Revision-Date: 2015-04-07 17:47+0000\n"
+"Last-Translator: Pavel Borecki <pavel.borecki@gmail.com>\n"
+"Language-Team: Czech (Czech Republic) (http://www.transifex.com/projects/p/FusionDirectory-109/language/cs_CZ/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Language: cs_CZ\n"
 "Plural-Forms: nplurals=3; plural=(n==1) ? 0 : (n>=2 && n<=4) ? 1 : 2;\n"
 
-#: personal/pureftpd/class_pureftpdAccount.inc:33
+#: personal/pureftpd/class_pureftpdAccount.inc:34
 msgid "Ftp"
 msgstr "FTP"
 
-#: personal/pureftpd/class_pureftpdAccount.inc:34
+#: personal/pureftpd/class_pureftpdAccount.inc:35
 msgid "Pure ftp account"
-msgstr "ÃºÄet pro PureFTP"
+msgstr "ÃšÄet v PureFTP"
 
-#: personal/pureftpd/class_pureftpdAccount.inc:34
+#: personal/pureftpd/class_pureftpdAccount.inc:35
 msgid "Connectivity addon"
-msgstr "modul â€žostatnÃ sÃÅ¥ovÃ© sluÅ¾byâ€œ"
+msgstr "doplnÄ›k â€žostatnÃ sÃÅ¥ovÃ© sluÅ¾byâ€œ"
 
-#: personal/pureftpd/class_pureftpdAccount.inc:49
+#: personal/pureftpd/class_pureftpdAccount.inc:50
 msgid "Bandwidth"
-msgstr "rychlost"
+msgstr "Rychlost"
 
-#: personal/pureftpd/class_pureftpdAccount.inc:52
 #: personal/pureftpd/class_pureftpdAccount.inc:53
+#: personal/pureftpd/class_pureftpdAccount.inc:54
 msgid "Upload bandwidth"
-msgstr "rychlost nahrÃ¡vÃ¡nÃ"
+msgstr "Rychlost nahrÃ¡vÃ¡nÃ"
 
-#: personal/pureftpd/class_pureftpdAccount.inc:52
-#: personal/pureftpd/class_pureftpdAccount.inc:61
+#: personal/pureftpd/class_pureftpdAccount.inc:53
+#: personal/pureftpd/class_pureftpdAccount.inc:62
 msgid " (kb/sec)"
 msgstr "(kb/s)"
 
-#: personal/pureftpd/class_pureftpdAccount.inc:61
+#: personal/pureftpd/class_pureftpdAccount.inc:62
 msgid "Download bandwidth"
-msgstr "rychlost stahovÃ¡nÃ"
+msgstr "Rychlost stahovÃ¡nÃ"
 
-#: personal/pureftpd/class_pureftpdAccount.inc:62
+#: personal/pureftpd/class_pureftpdAccount.inc:63
 msgid "Download bandwidth in kb/sec"
 msgstr "Rychlost stahovÃ¡nÃ v kb/s"
 
-#: personal/pureftpd/class_pureftpdAccount.inc:72
+#: personal/pureftpd/class_pureftpdAccount.inc:73
 msgid "Ratio"
-msgstr "pomÄ›r"
+msgstr "PomÄ›r"
 
-#: personal/pureftpd/class_pureftpdAccount.inc:75
 #: personal/pureftpd/class_pureftpdAccount.inc:76
+#: personal/pureftpd/class_pureftpdAccount.inc:77
 msgid "Uploaded files"
 msgstr "NahranÃ© soubory"
 
-#: personal/pureftpd/class_pureftpdAccount.inc:84
 #: personal/pureftpd/class_pureftpdAccount.inc:85
+#: personal/pureftpd/class_pureftpdAccount.inc:86
 msgid "Downloaded files"
 msgstr "StaÅ¾enÃ© soubory"
 
-#: personal/pureftpd/class_pureftpdAccount.inc:98
+#: personal/pureftpd/class_pureftpdAccount.inc:99
 msgid "Files"
-msgstr "souborÅ¯"
+msgstr "Soubory"
 
-#: personal/pureftpd/class_pureftpdAccount.inc:99
+#: personal/pureftpd/class_pureftpdAccount.inc:100
 msgid "Quota files"
 msgstr "omezenÃ poÄtu souborÅ¯"
 
-#: personal/pureftpd/class_pureftpdAccount.inc:107
+#: personal/pureftpd/class_pureftpdAccount.inc:108
 msgid "Size"
-msgstr "objem dat"
+msgstr "Velikost"
 
-#: personal/pureftpd/class_pureftpdAccount.inc:107
+#: personal/pureftpd/class_pureftpdAccount.inc:108
 msgid " (MB)"
 msgstr ""
 
-#: personal/pureftpd/class_pureftpdAccount.inc:108
+#: personal/pureftpd/class_pureftpdAccount.inc:109
 msgid "Files size"
 msgstr "Velikost souborÅ¯"
 
-#: personal/pureftpd/class_pureftpdAccount.inc:118
+#: personal/pureftpd/class_pureftpdAccount.inc:119
 msgid "Miscellaneous"
-msgstr "rÅ¯znÃ©"
+msgstr "RÅ¯znÃ©"
 
-#: personal/pureftpd/class_pureftpdAccount.inc:121
-msgid "Enable FTP access"
-msgstr ""
-
-#: personal/pureftpd/class_pureftpdAccount.inc:121
-msgid "Enable or disable FTP access"
-msgstr ""
+#: personal/pureftpd/class_pureftpdAccount.inc:122
+#: personal/pureftpd/class_pureftpdAccount.inc:123
+msgid "Temporary disable FTP access"
+msgstr "doÄasnÄ› zakÃ¡zat pÅ™Ãstup na FTP"
diff --git a/pureftpd/locale/de/fusiondirectory.po b/pureftpd/locale/de/fusiondirectory.po
index 6c9619cfffe4dc9c86b875fe7f535fd8e33399a8..784938233a81b810ad5ebeef7a3ef6b990981bee 100644
--- a/pureftpd/locale/de/fusiondirectory.po
+++ b/pureftpd/locale/de/fusiondirectory.po
@@ -3,97 +3,94 @@
 # This file is distributed under the same license as the PACKAGE package.
 # 
 # Translators:
-#  Stefan Koehler <stefan.koehler@GONICUS.de>, 2005
+# Maik Wagner <maikwagner@yahoo.com>, 2013
 msgid ""
 msgstr ""
-"Project-Id-Version: FusionDirectory-108\n"
+"Project-Id-Version: FusionDirectory-109\n"
 "Report-Msgid-Bugs-To: documentation@lists.fusiondirectory.org\n"
-"POT-Creation-Date: 2015-03-31 11:49+0200\n"
-"PO-Revision-Date: 2015-03-31 10:41+0000\n"
-"Last-Translator: fusiondirectory <contact@fusiondirectory.org>\n"
-"Language-Team: German (http://www.transifex.com/projects/p/FusionDirectory-108/language/de/)\n"
+"POT-Creation-Date: 2014-12-15 17:47+0100\n"
+"PO-Revision-Date: 2014-08-28 10:29+0000\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: German (http://www.transifex.com/projects/p/FusionDirectory-109/language/de/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Language: de\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: personal/pureftpd/class_pureftpdAccount.inc:33
+#: personal/pureftpd/class_pureftpdAccount.inc:34
 msgid "Ftp"
 msgstr "FTP"
 
-#: personal/pureftpd/class_pureftpdAccount.inc:34
+#: personal/pureftpd/class_pureftpdAccount.inc:35
 msgid "Pure ftp account"
 msgstr "PureFTP-Konto"
 
-#: personal/pureftpd/class_pureftpdAccount.inc:34
+#: personal/pureftpd/class_pureftpdAccount.inc:35
 msgid "Connectivity addon"
 msgstr "KonnektivitÃ¤ts-Erweiterung"
 
-#: personal/pureftpd/class_pureftpdAccount.inc:49
+#: personal/pureftpd/class_pureftpdAccount.inc:50
 msgid "Bandwidth"
 msgstr "Bandbreite"
 
-#: personal/pureftpd/class_pureftpdAccount.inc:52
 #: personal/pureftpd/class_pureftpdAccount.inc:53
+#: personal/pureftpd/class_pureftpdAccount.inc:54
 msgid "Upload bandwidth"
 msgstr "Upload-Bandbreite"
 
-#: personal/pureftpd/class_pureftpdAccount.inc:52
-#: personal/pureftpd/class_pureftpdAccount.inc:61
+#: personal/pureftpd/class_pureftpdAccount.inc:53
+#: personal/pureftpd/class_pureftpdAccount.inc:62
 msgid " (kb/sec)"
 msgstr " (kb/Sek)"
 
-#: personal/pureftpd/class_pureftpdAccount.inc:61
+#: personal/pureftpd/class_pureftpdAccount.inc:62
 msgid "Download bandwidth"
 msgstr "Download-Bandbreite"
 
-#: personal/pureftpd/class_pureftpdAccount.inc:62
+#: personal/pureftpd/class_pureftpdAccount.inc:63
 msgid "Download bandwidth in kb/sec"
 msgstr "Downloadbandbreit in kb/Sek"
 
-#: personal/pureftpd/class_pureftpdAccount.inc:72
+#: personal/pureftpd/class_pureftpdAccount.inc:73
 msgid "Ratio"
 msgstr "VerhÃ¤ltnis"
 
-#: personal/pureftpd/class_pureftpdAccount.inc:75
 #: personal/pureftpd/class_pureftpdAccount.inc:76
+#: personal/pureftpd/class_pureftpdAccount.inc:77
 msgid "Uploaded files"
 msgstr "Heraufgeladene Dateien"
 
-#: personal/pureftpd/class_pureftpdAccount.inc:84
 #: personal/pureftpd/class_pureftpdAccount.inc:85
+#: personal/pureftpd/class_pureftpdAccount.inc:86
 msgid "Downloaded files"
 msgstr "Heruntergeladene Dateien"
 
-#: personal/pureftpd/class_pureftpdAccount.inc:98
+#: personal/pureftpd/class_pureftpdAccount.inc:99
 msgid "Files"
 msgstr "Dateien"
 
-#: personal/pureftpd/class_pureftpdAccount.inc:99
+#: personal/pureftpd/class_pureftpdAccount.inc:100
 msgid "Quota files"
 msgstr "Kontingent-Dateien"
 
-#: personal/pureftpd/class_pureftpdAccount.inc:107
+#: personal/pureftpd/class_pureftpdAccount.inc:108
 msgid "Size"
 msgstr "GrÃ¶ÃŸe"
 
-#: personal/pureftpd/class_pureftpdAccount.inc:107
+#: personal/pureftpd/class_pureftpdAccount.inc:108
 msgid " (MB)"
 msgstr " (MB)"
 
-#: personal/pureftpd/class_pureftpdAccount.inc:108
+#: personal/pureftpd/class_pureftpdAccount.inc:109
 msgid "Files size"
 msgstr "DateiengrÃ¶ÃŸe"
 
-#: personal/pureftpd/class_pureftpdAccount.inc:118
+#: personal/pureftpd/class_pureftpdAccount.inc:119
 msgid "Miscellaneous"
 msgstr "Verschiedenes"
 
-#: personal/pureftpd/class_pureftpdAccount.inc:121
-msgid "Enable FTP access"
-msgstr ""
-
-#: personal/pureftpd/class_pureftpdAccount.inc:121
-msgid "Enable or disable FTP access"
-msgstr ""
+#: personal/pureftpd/class_pureftpdAccount.inc:122
+#: personal/pureftpd/class_pureftpdAccount.inc:123
+msgid "Temporary disable FTP access"
+msgstr "TemporÃ¤res Abschalten des FTP-Zugriffs"
diff --git a/pureftpd/locale/el_GR/fusiondirectory.po b/pureftpd/locale/el_GR/fusiondirectory.po
new file mode 100644
index 0000000000000000000000000000000000000000..e6d96eeb32bfcbc480e535e4ec4f25ef273ac1ad
--- /dev/null
+++ b/pureftpd/locale/el_GR/fusiondirectory.po
@@ -0,0 +1,95 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR FusionDirectory Project
+# This file is distributed under the same license as the PACKAGE package.
+# 
+# Translators:
+msgid ""
+msgstr ""
+"Project-Id-Version: FusionDirectory-109\n"
+"Report-Msgid-Bugs-To: documentation@lists.fusiondirectory.org\n"
+"POT-Creation-Date: 2014-12-15 17:47+0100\n"
+"PO-Revision-Date: 2015-05-30 11:45+0000\n"
+"Last-Translator: Benoit Mortier <benoit.mortier@opensides.be>\n"
+"Language-Team: Greek (Greece) (http://www.transifex.com/projects/p/FusionDirectory-109/language/el_GR/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: el_GR\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
+
+#: personal/pureftpd/class_pureftpdAccount.inc:34
+msgid "Ftp"
+msgstr ""
+
+#: personal/pureftpd/class_pureftpdAccount.inc:35
+msgid "Pure ftp account"
+msgstr ""
+
+#: personal/pureftpd/class_pureftpdAccount.inc:35
+msgid "Connectivity addon"
+msgstr ""
+
+#: personal/pureftpd/class_pureftpdAccount.inc:50
+msgid "Bandwidth"
+msgstr ""
+
+#: personal/pureftpd/class_pureftpdAccount.inc:53
+#: personal/pureftpd/class_pureftpdAccount.inc:54
+msgid "Upload bandwidth"
+msgstr ""
+
+#: personal/pureftpd/class_pureftpdAccount.inc:53
+#: personal/pureftpd/class_pureftpdAccount.inc:62
+msgid " (kb/sec)"
+msgstr ""
+
+#: personal/pureftpd/class_pureftpdAccount.inc:62
+msgid "Download bandwidth"
+msgstr ""
+
+#: personal/pureftpd/class_pureftpdAccount.inc:63
+msgid "Download bandwidth in kb/sec"
+msgstr ""
+
+#: personal/pureftpd/class_pureftpdAccount.inc:73
+msgid "Ratio"
+msgstr ""
+
+#: personal/pureftpd/class_pureftpdAccount.inc:76
+#: personal/pureftpd/class_pureftpdAccount.inc:77
+msgid "Uploaded files"
+msgstr ""
+
+#: personal/pureftpd/class_pureftpdAccount.inc:85
+#: personal/pureftpd/class_pureftpdAccount.inc:86
+msgid "Downloaded files"
+msgstr ""
+
+#: personal/pureftpd/class_pureftpdAccount.inc:99
+msgid "Files"
+msgstr ""
+
+#: personal/pureftpd/class_pureftpdAccount.inc:100
+msgid "Quota files"
+msgstr ""
+
+#: personal/pureftpd/class_pureftpdAccount.inc:108
+msgid "Size"
+msgstr ""
+
+#: personal/pureftpd/class_pureftpdAccount.inc:108
+msgid " (MB)"
+msgstr ""
+
+#: personal/pureftpd/class_pureftpdAccount.inc:109
+msgid "Files size"
+msgstr ""
+
+#: personal/pureftpd/class_pureftpdAccount.inc:119
+msgid "Miscellaneous"
+msgstr ""
+
+#: personal/pureftpd/class_pureftpdAccount.inc:122
+#: personal/pureftpd/class_pureftpdAccount.inc:123
+msgid "Temporary disable FTP access"
+msgstr ""
diff --git a/pureftpd/locale/en/fusiondirectory.po b/pureftpd/locale/en/fusiondirectory.po
index 3ac978a34806a32b1236d613aae6b9a2c70af227..2ba612241bb313a753b8c7f43ed51e6645bd4a59 100644
--- a/pureftpd/locale/en/fusiondirectory.po
+++ b/pureftpd/locale/en/fusiondirectory.po
@@ -6,13 +6,13 @@
 #, fuzzy
 msgid ""
 msgstr ""
-"Project-Id-Version: PACKAGE VERSION\n"
-"Report-Msgid-Bugs-To: documentation@lists.fusiondirectory.org\n"
-"POT-Creation-Date: 2015-03-31 11:49+0200\n"
+"Project-Id-Version: FusionDirectory VERSION\n"
+"Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
+"POT-Creation-Date: 2015-05-30 15:30+0200\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
-"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
-"Language-Team: LANGUAGE <LL@li.org>\n"
-"Language: \n"
+"Last-Translator: FusionDirectory project <contact@fusiondirectory.org>\n"
+"Language-Team: English\n"
+"Language: en\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
diff --git a/pureftpd/locale/es/fusiondirectory.po b/pureftpd/locale/es/fusiondirectory.po
index 9d061b3dea380cd88c9a23df288cf8ced7d66ff2..9bbfe48576e1820e8e1f9b0d8b52b54aecf5a793 100644
--- a/pureftpd/locale/es/fusiondirectory.po
+++ b/pureftpd/locale/es/fusiondirectory.po
@@ -5,94 +5,91 @@
 # Translators:
 msgid ""
 msgstr ""
-"Project-Id-Version: FusionDirectory-108\n"
+"Project-Id-Version: FusionDirectory-109\n"
 "Report-Msgid-Bugs-To: documentation@lists.fusiondirectory.org\n"
-"POT-Creation-Date: 2015-03-31 11:49+0200\n"
-"PO-Revision-Date: 2015-03-31 10:41+0000\n"
-"Last-Translator: fusiondirectory <contact@fusiondirectory.org>\n"
-"Language-Team: Spanish (http://www.transifex.com/projects/p/FusionDirectory-108/language/es/)\n"
+"POT-Creation-Date: 2014-12-15 17:47+0100\n"
+"PO-Revision-Date: 2014-08-28 10:29+0000\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: Spanish (http://www.transifex.com/projects/p/FusionDirectory-109/language/es/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Language: es\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: personal/pureftpd/class_pureftpdAccount.inc:33
+#: personal/pureftpd/class_pureftpdAccount.inc:34
 msgid "Ftp"
 msgstr "Ftp"
 
-#: personal/pureftpd/class_pureftpdAccount.inc:34
+#: personal/pureftpd/class_pureftpdAccount.inc:35
 msgid "Pure ftp account"
 msgstr "Cuenta Pure ftp"
 
-#: personal/pureftpd/class_pureftpdAccount.inc:34
+#: personal/pureftpd/class_pureftpdAccount.inc:35
 msgid "Connectivity addon"
 msgstr "Conectividad adicional"
 
-#: personal/pureftpd/class_pureftpdAccount.inc:49
+#: personal/pureftpd/class_pureftpdAccount.inc:50
 msgid "Bandwidth"
 msgstr "Ancho de banda"
 
-#: personal/pureftpd/class_pureftpdAccount.inc:52
 #: personal/pureftpd/class_pureftpdAccount.inc:53
+#: personal/pureftpd/class_pureftpdAccount.inc:54
 msgid "Upload bandwidth"
 msgstr "Ancho de banda ascendente"
 
-#: personal/pureftpd/class_pureftpdAccount.inc:52
-#: personal/pureftpd/class_pureftpdAccount.inc:61
+#: personal/pureftpd/class_pureftpdAccount.inc:53
+#: personal/pureftpd/class_pureftpdAccount.inc:62
 msgid " (kb/sec)"
 msgstr ""
 
-#: personal/pureftpd/class_pureftpdAccount.inc:61
+#: personal/pureftpd/class_pureftpdAccount.inc:62
 msgid "Download bandwidth"
 msgstr "Ancho de banda descendente"
 
-#: personal/pureftpd/class_pureftpdAccount.inc:62
+#: personal/pureftpd/class_pureftpdAccount.inc:63
 msgid "Download bandwidth in kb/sec"
 msgstr ""
 
-#: personal/pureftpd/class_pureftpdAccount.inc:72
+#: personal/pureftpd/class_pureftpdAccount.inc:73
 msgid "Ratio"
 msgstr "Ratio"
 
-#: personal/pureftpd/class_pureftpdAccount.inc:75
 #: personal/pureftpd/class_pureftpdAccount.inc:76
+#: personal/pureftpd/class_pureftpdAccount.inc:77
 msgid "Uploaded files"
 msgstr ""
 
-#: personal/pureftpd/class_pureftpdAccount.inc:84
 #: personal/pureftpd/class_pureftpdAccount.inc:85
+#: personal/pureftpd/class_pureftpdAccount.inc:86
 msgid "Downloaded files"
 msgstr ""
 
-#: personal/pureftpd/class_pureftpdAccount.inc:98
+#: personal/pureftpd/class_pureftpdAccount.inc:99
 msgid "Files"
 msgstr "Archivos"
 
-#: personal/pureftpd/class_pureftpdAccount.inc:99
+#: personal/pureftpd/class_pureftpdAccount.inc:100
 msgid "Quota files"
 msgstr "Cuota de ficheros"
 
-#: personal/pureftpd/class_pureftpdAccount.inc:107
+#: personal/pureftpd/class_pureftpdAccount.inc:108
 msgid "Size"
 msgstr "TamaÃ±o"
 
-#: personal/pureftpd/class_pureftpdAccount.inc:107
+#: personal/pureftpd/class_pureftpdAccount.inc:108
 msgid " (MB)"
 msgstr ""
 
-#: personal/pureftpd/class_pureftpdAccount.inc:108
+#: personal/pureftpd/class_pureftpdAccount.inc:109
 msgid "Files size"
 msgstr ""
 
-#: personal/pureftpd/class_pureftpdAccount.inc:118
+#: personal/pureftpd/class_pureftpdAccount.inc:119
 msgid "Miscellaneous"
 msgstr "Varios"
 
-#: personal/pureftpd/class_pureftpdAccount.inc:121
-msgid "Enable FTP access"
-msgstr ""
-
-#: personal/pureftpd/class_pureftpdAccount.inc:121
-msgid "Enable or disable FTP access"
-msgstr ""
+#: personal/pureftpd/class_pureftpdAccount.inc:122
+#: personal/pureftpd/class_pureftpdAccount.inc:123
+msgid "Temporary disable FTP access"
+msgstr "Acceso FTP desactivado temporalmente"
diff --git a/pureftpd/locale/es_VE/fusiondirectory.po b/pureftpd/locale/es_VE/fusiondirectory.po
index 74eaf0a3cf07fb12264d24dd3da8dce50880723f..0124edb0cd57f3d7771009b2b09c7f8d97a90a77 100644
--- a/pureftpd/locale/es_VE/fusiondirectory.po
+++ b/pureftpd/locale/es_VE/fusiondirectory.po
@@ -5,94 +5,91 @@
 # Translators:
 msgid ""
 msgstr ""
-"Project-Id-Version: FusionDirectory-108\n"
+"Project-Id-Version: FusionDirectory-109\n"
 "Report-Msgid-Bugs-To: documentation@lists.fusiondirectory.org\n"
-"POT-Creation-Date: 2015-03-31 11:49+0200\n"
-"PO-Revision-Date: 2015-03-31 10:41+0000\n"
-"Last-Translator: fusiondirectory <contact@fusiondirectory.org>\n"
-"Language-Team: Spanish (Venezuela) (http://www.transifex.com/projects/p/FusionDirectory-108/language/es_VE/)\n"
+"POT-Creation-Date: 2014-12-15 17:47+0100\n"
+"PO-Revision-Date: 2014-08-28 10:29+0000\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: Spanish (Venezuela) (http://www.transifex.com/projects/p/FusionDirectory-109/language/es_VE/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Language: es_VE\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: personal/pureftpd/class_pureftpdAccount.inc:33
+#: personal/pureftpd/class_pureftpdAccount.inc:34
 msgid "Ftp"
 msgstr "Ftp"
 
-#: personal/pureftpd/class_pureftpdAccount.inc:34
+#: personal/pureftpd/class_pureftpdAccount.inc:35
 msgid "Pure ftp account"
 msgstr "Cuenta Pure ftp"
 
-#: personal/pureftpd/class_pureftpdAccount.inc:34
+#: personal/pureftpd/class_pureftpdAccount.inc:35
 msgid "Connectivity addon"
 msgstr "Conectividad adicional"
 
-#: personal/pureftpd/class_pureftpdAccount.inc:49
+#: personal/pureftpd/class_pureftpdAccount.inc:50
 msgid "Bandwidth"
 msgstr "Ancho de banda"
 
-#: personal/pureftpd/class_pureftpdAccount.inc:52
 #: personal/pureftpd/class_pureftpdAccount.inc:53
+#: personal/pureftpd/class_pureftpdAccount.inc:54
 msgid "Upload bandwidth"
 msgstr "Ancho de banda ascendente"
 
-#: personal/pureftpd/class_pureftpdAccount.inc:52
-#: personal/pureftpd/class_pureftpdAccount.inc:61
+#: personal/pureftpd/class_pureftpdAccount.inc:53
+#: personal/pureftpd/class_pureftpdAccount.inc:62
 msgid " (kb/sec)"
 msgstr ""
 
-#: personal/pureftpd/class_pureftpdAccount.inc:61
+#: personal/pureftpd/class_pureftpdAccount.inc:62
 msgid "Download bandwidth"
 msgstr "Ancho de banda descendente"
 
-#: personal/pureftpd/class_pureftpdAccount.inc:62
+#: personal/pureftpd/class_pureftpdAccount.inc:63
 msgid "Download bandwidth in kb/sec"
 msgstr ""
 
-#: personal/pureftpd/class_pureftpdAccount.inc:72
+#: personal/pureftpd/class_pureftpdAccount.inc:73
 msgid "Ratio"
 msgstr "Ratio"
 
-#: personal/pureftpd/class_pureftpdAccount.inc:75
 #: personal/pureftpd/class_pureftpdAccount.inc:76
+#: personal/pureftpd/class_pureftpdAccount.inc:77
 msgid "Uploaded files"
 msgstr ""
 
-#: personal/pureftpd/class_pureftpdAccount.inc:84
 #: personal/pureftpd/class_pureftpdAccount.inc:85
+#: personal/pureftpd/class_pureftpdAccount.inc:86
 msgid "Downloaded files"
 msgstr ""
 
-#: personal/pureftpd/class_pureftpdAccount.inc:98
+#: personal/pureftpd/class_pureftpdAccount.inc:99
 msgid "Files"
 msgstr "Archivos"
 
-#: personal/pureftpd/class_pureftpdAccount.inc:99
+#: personal/pureftpd/class_pureftpdAccount.inc:100
 msgid "Quota files"
 msgstr "Cuota de ficheros"
 
-#: personal/pureftpd/class_pureftpdAccount.inc:107
+#: personal/pureftpd/class_pureftpdAccount.inc:108
 msgid "Size"
 msgstr "TamaÃ±o"
 
-#: personal/pureftpd/class_pureftpdAccount.inc:107
+#: personal/pureftpd/class_pureftpdAccount.inc:108
 msgid " (MB)"
 msgstr ""
 
-#: personal/pureftpd/class_pureftpdAccount.inc:108
+#: personal/pureftpd/class_pureftpdAccount.inc:109
 msgid "Files size"
 msgstr ""
 
-#: personal/pureftpd/class_pureftpdAccount.inc:118
+#: personal/pureftpd/class_pureftpdAccount.inc:119
 msgid "Miscellaneous"
 msgstr "Varios"
 
-#: personal/pureftpd/class_pureftpdAccount.inc:121
-msgid "Enable FTP access"
-msgstr ""
-
-#: personal/pureftpd/class_pureftpdAccount.inc:121
-msgid "Enable or disable FTP access"
-msgstr ""
+#: personal/pureftpd/class_pureftpdAccount.inc:122
+#: personal/pureftpd/class_pureftpdAccount.inc:123
+msgid "Temporary disable FTP access"
+msgstr "Acceso FTP desactivado temporalmente"
diff --git a/pureftpd/locale/fa_IR/fusiondirectory.po b/pureftpd/locale/fa_IR/fusiondirectory.po
index 8c05cf44996cf26d5fe05ae4925c1e46f2b52200..9b8d7b8d8eb5b27e1addfe3767dd23b805e7fafa 100644
--- a/pureftpd/locale/fa_IR/fusiondirectory.po
+++ b/pureftpd/locale/fa_IR/fusiondirectory.po
@@ -5,94 +5,91 @@
 # Translators:
 msgid ""
 msgstr ""
-"Project-Id-Version: FusionDirectory-108\n"
+"Project-Id-Version: FusionDirectory-109\n"
 "Report-Msgid-Bugs-To: documentation@lists.fusiondirectory.org\n"
-"POT-Creation-Date: 2015-03-31 11:49+0200\n"
-"PO-Revision-Date: 2015-03-31 10:41+0000\n"
-"Last-Translator: fusiondirectory <contact@fusiondirectory.org>\n"
-"Language-Team: Persian (Iran) (http://www.transifex.com/projects/p/FusionDirectory-108/language/fa_IR/)\n"
+"POT-Creation-Date: 2014-12-15 17:47+0100\n"
+"PO-Revision-Date: 2014-08-28 10:29+0000\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: Persian (Iran) (http://www.transifex.com/projects/p/FusionDirectory-109/language/fa_IR/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Language: fa_IR\n"
 "Plural-Forms: nplurals=1; plural=0;\n"
 
-#: personal/pureftpd/class_pureftpdAccount.inc:33
+#: personal/pureftpd/class_pureftpdAccount.inc:34
 msgid "Ftp"
 msgstr ""
 
-#: personal/pureftpd/class_pureftpdAccount.inc:34
+#: personal/pureftpd/class_pureftpdAccount.inc:35
 msgid "Pure ftp account"
 msgstr ""
 
-#: personal/pureftpd/class_pureftpdAccount.inc:34
+#: personal/pureftpd/class_pureftpdAccount.inc:35
 msgid "Connectivity addon"
 msgstr ""
 
-#: personal/pureftpd/class_pureftpdAccount.inc:49
+#: personal/pureftpd/class_pureftpdAccount.inc:50
 msgid "Bandwidth"
 msgstr ""
 
-#: personal/pureftpd/class_pureftpdAccount.inc:52
 #: personal/pureftpd/class_pureftpdAccount.inc:53
+#: personal/pureftpd/class_pureftpdAccount.inc:54
 msgid "Upload bandwidth"
 msgstr ""
 
-#: personal/pureftpd/class_pureftpdAccount.inc:52
-#: personal/pureftpd/class_pureftpdAccount.inc:61
+#: personal/pureftpd/class_pureftpdAccount.inc:53
+#: personal/pureftpd/class_pureftpdAccount.inc:62
 msgid " (kb/sec)"
 msgstr ""
 
-#: personal/pureftpd/class_pureftpdAccount.inc:61
+#: personal/pureftpd/class_pureftpdAccount.inc:62
 msgid "Download bandwidth"
 msgstr ""
 
-#: personal/pureftpd/class_pureftpdAccount.inc:62
+#: personal/pureftpd/class_pureftpdAccount.inc:63
 msgid "Download bandwidth in kb/sec"
 msgstr ""
 
-#: personal/pureftpd/class_pureftpdAccount.inc:72
+#: personal/pureftpd/class_pureftpdAccount.inc:73
 msgid "Ratio"
 msgstr ""
 
-#: personal/pureftpd/class_pureftpdAccount.inc:75
 #: personal/pureftpd/class_pureftpdAccount.inc:76
+#: personal/pureftpd/class_pureftpdAccount.inc:77
 msgid "Uploaded files"
 msgstr ""
 
-#: personal/pureftpd/class_pureftpdAccount.inc:84
 #: personal/pureftpd/class_pureftpdAccount.inc:85
+#: personal/pureftpd/class_pureftpdAccount.inc:86
 msgid "Downloaded files"
 msgstr ""
 
-#: personal/pureftpd/class_pureftpdAccount.inc:98
+#: personal/pureftpd/class_pureftpdAccount.inc:99
 msgid "Files"
 msgstr ""
 
-#: personal/pureftpd/class_pureftpdAccount.inc:99
+#: personal/pureftpd/class_pureftpdAccount.inc:100
 msgid "Quota files"
 msgstr ""
 
-#: personal/pureftpd/class_pureftpdAccount.inc:107
+#: personal/pureftpd/class_pureftpdAccount.inc:108
 msgid "Size"
 msgstr ""
 
-#: personal/pureftpd/class_pureftpdAccount.inc:107
+#: personal/pureftpd/class_pureftpdAccount.inc:108
 msgid " (MB)"
 msgstr ""
 
-#: personal/pureftpd/class_pureftpdAccount.inc:108
+#: personal/pureftpd/class_pureftpdAccount.inc:109
 msgid "Files size"
 msgstr ""
 
-#: personal/pureftpd/class_pureftpdAccount.inc:118
+#: personal/pureftpd/class_pureftpdAccount.inc:119
 msgid "Miscellaneous"
 msgstr ""
 
-#: personal/pureftpd/class_pureftpdAccount.inc:121
-msgid "Enable FTP access"
-msgstr ""
-
-#: personal/pureftpd/class_pureftpdAccount.inc:121
-msgid "Enable or disable FTP access"
+#: personal/pureftpd/class_pureftpdAccount.inc:122
+#: personal/pureftpd/class_pureftpdAccount.inc:123
+msgid "Temporary disable FTP access"
 msgstr ""
diff --git a/pureftpd/locale/fr/fusiondirectory.po b/pureftpd/locale/fr/fusiondirectory.po
index 0baaec7c72e94028f43e174915546ff9dca99700..4a67d2cfd13dc9b985e06134e3672519eaa606df 100644
--- a/pureftpd/locale/fr/fusiondirectory.po
+++ b/pureftpd/locale/fr/fusiondirectory.po
@@ -3,105 +3,93 @@
 # This file is distributed under the same license as the PACKAGE package.
 # 
 # Translators:
-# Benoit Mortier <benoit.mortier@opensides.be>, 2005-2008
-# Benoit Mortier <benoit.mortier@opensides.be>, 2015
-# MCMic, 2014
-# fusiondirectory <contact@fusiondirectory.org>, 2012
-# fusiondirectory <contact@fusiondirectory.org>, 2012
-# fusiondirectory <contact@fusiondirectory.org>, 2012
-# poterealpopolo <giuliano@opensides.be>, 2013
-# MCMic, 2014
-# poterealpopolo <giuliano@opensides.be>, 2013
 msgid ""
 msgstr ""
-"Project-Id-Version: FusionDirectory-108\n"
+"Project-Id-Version: FusionDirectory-109\n"
 "Report-Msgid-Bugs-To: documentation@lists.fusiondirectory.org\n"
-"POT-Creation-Date: 2015-03-31 11:49+0200\n"
-"PO-Revision-Date: 2015-03-31 11:21+0000\n"
-"Last-Translator: Benoit Mortier <benoit.mortier@opensides.be>\n"
-"Language-Team: French (http://www.transifex.com/projects/p/FusionDirectory-108/language/fr/)\n"
+"POT-Creation-Date: 2014-12-15 17:47+0100\n"
+"PO-Revision-Date: 2014-08-28 10:29+0000\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: French (http://www.transifex.com/projects/p/FusionDirectory-109/language/fr/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Language: fr\n"
 "Plural-Forms: nplurals=2; plural=(n > 1);\n"
 
-#: personal/pureftpd/class_pureftpdAccount.inc:33
+#: personal/pureftpd/class_pureftpdAccount.inc:34
 msgid "Ftp"
 msgstr "Ftp"
 
-#: personal/pureftpd/class_pureftpdAccount.inc:34
+#: personal/pureftpd/class_pureftpdAccount.inc:35
 msgid "Pure ftp account"
 msgstr "Compte Pure ftp"
 
-#: personal/pureftpd/class_pureftpdAccount.inc:34
+#: personal/pureftpd/class_pureftpdAccount.inc:35
 msgid "Connectivity addon"
 msgstr "ConnectivitÃ©"
 
-#: personal/pureftpd/class_pureftpdAccount.inc:49
+#: personal/pureftpd/class_pureftpdAccount.inc:50
 msgid "Bandwidth"
 msgstr "Bande passante"
 
-#: personal/pureftpd/class_pureftpdAccount.inc:52
 #: personal/pureftpd/class_pureftpdAccount.inc:53
+#: personal/pureftpd/class_pureftpdAccount.inc:54
 msgid "Upload bandwidth"
 msgstr "Bande passante montante"
 
-#: personal/pureftpd/class_pureftpdAccount.inc:52
-#: personal/pureftpd/class_pureftpdAccount.inc:61
+#: personal/pureftpd/class_pureftpdAccount.inc:53
+#: personal/pureftpd/class_pureftpdAccount.inc:62
 msgid " (kb/sec)"
 msgstr "(kb/sec)"
 
-#: personal/pureftpd/class_pureftpdAccount.inc:61
+#: personal/pureftpd/class_pureftpdAccount.inc:62
 msgid "Download bandwidth"
 msgstr "Bande passante descendante"
 
-#: personal/pureftpd/class_pureftpdAccount.inc:62
+#: personal/pureftpd/class_pureftpdAccount.inc:63
 msgid "Download bandwidth in kb/sec"
-msgstr "Bande passante descendante en Kb/sec"
+msgstr "Bande passante descendante"
 
-#: personal/pureftpd/class_pureftpdAccount.inc:72
+#: personal/pureftpd/class_pureftpdAccount.inc:73
 msgid "Ratio"
 msgstr "Ratio"
 
-#: personal/pureftpd/class_pureftpdAccount.inc:75
 #: personal/pureftpd/class_pureftpdAccount.inc:76
+#: personal/pureftpd/class_pureftpdAccount.inc:77
 msgid "Uploaded files"
-msgstr "DonnÃ©es envoyÃ©es"
+msgstr "DonnÃ©es envoyÃ©es / reÃ§ues"
 
-#: personal/pureftpd/class_pureftpdAccount.inc:84
 #: personal/pureftpd/class_pureftpdAccount.inc:85
+#: personal/pureftpd/class_pureftpdAccount.inc:86
 msgid "Downloaded files"
-msgstr "DonnÃ©es reÃ§ues"
+msgstr "DonnÃ©es envoyÃ©es / reÃ§ues"
 
-#: personal/pureftpd/class_pureftpdAccount.inc:98
+#: personal/pureftpd/class_pureftpdAccount.inc:99
 msgid "Files"
 msgstr "Fichiers"
 
-#: personal/pureftpd/class_pureftpdAccount.inc:99
+#: personal/pureftpd/class_pureftpdAccount.inc:100
 msgid "Quota files"
-msgstr "Quota pour les fichiers"
+msgstr "Taille du Quota pour les fichiers"
 
-#: personal/pureftpd/class_pureftpdAccount.inc:107
+#: personal/pureftpd/class_pureftpdAccount.inc:108
 msgid "Size"
 msgstr "Taille"
 
-#: personal/pureftpd/class_pureftpdAccount.inc:107
+#: personal/pureftpd/class_pureftpdAccount.inc:108
 msgid " (MB)"
-msgstr " (Mo)"
+msgstr " (MB)"
 
-#: personal/pureftpd/class_pureftpdAccount.inc:108
+#: personal/pureftpd/class_pureftpdAccount.inc:109
 msgid "Files size"
 msgstr "Taille des fichiers"
 
-#: personal/pureftpd/class_pureftpdAccount.inc:118
+#: personal/pureftpd/class_pureftpdAccount.inc:119
 msgid "Miscellaneous"
 msgstr "Divers"
 
-#: personal/pureftpd/class_pureftpdAccount.inc:121
-msgid "Enable FTP access"
-msgstr "Activer l'accÃ¨s FTP"
-
-#: personal/pureftpd/class_pureftpdAccount.inc:121
-msgid "Enable or disable FTP access"
-msgstr "Activer ou dÃ©sactiver temporairement l'accÃ¨s FTP"
+#: personal/pureftpd/class_pureftpdAccount.inc:122
+#: personal/pureftpd/class_pureftpdAccount.inc:123
+msgid "Temporary disable FTP access"
+msgstr "DÃ©sactiver temporairement l'accÃ¨s FTP"
diff --git a/pureftpd/locale/id/fusiondirectory.po b/pureftpd/locale/id/fusiondirectory.po
index cf374419586680d421455292faa26db8650c4719..14b1b915856a1542a061bf1553d8e38f97813b4f 100644
--- a/pureftpd/locale/id/fusiondirectory.po
+++ b/pureftpd/locale/id/fusiondirectory.po
@@ -5,94 +5,91 @@
 # Translators:
 msgid ""
 msgstr ""
-"Project-Id-Version: FusionDirectory-108\n"
+"Project-Id-Version: FusionDirectory-109\n"
 "Report-Msgid-Bugs-To: documentation@lists.fusiondirectory.org\n"
-"POT-Creation-Date: 2015-03-31 11:49+0200\n"
-"PO-Revision-Date: 2015-03-31 10:41+0000\n"
-"Last-Translator: fusiondirectory <contact@fusiondirectory.org>\n"
-"Language-Team: Indonesian (http://www.transifex.com/projects/p/FusionDirectory-108/language/id/)\n"
+"POT-Creation-Date: 2014-12-15 17:47+0100\n"
+"PO-Revision-Date: 2014-08-28 10:29+0000\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: Indonesian (http://www.transifex.com/projects/p/FusionDirectory-109/language/id/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Language: id\n"
 "Plural-Forms: nplurals=1; plural=0;\n"
 
-#: personal/pureftpd/class_pureftpdAccount.inc:33
+#: personal/pureftpd/class_pureftpdAccount.inc:34
 msgid "Ftp"
 msgstr ""
 
-#: personal/pureftpd/class_pureftpdAccount.inc:34
+#: personal/pureftpd/class_pureftpdAccount.inc:35
 msgid "Pure ftp account"
 msgstr ""
 
-#: personal/pureftpd/class_pureftpdAccount.inc:34
+#: personal/pureftpd/class_pureftpdAccount.inc:35
 msgid "Connectivity addon"
 msgstr ""
 
-#: personal/pureftpd/class_pureftpdAccount.inc:49
+#: personal/pureftpd/class_pureftpdAccount.inc:50
 msgid "Bandwidth"
 msgstr ""
 
-#: personal/pureftpd/class_pureftpdAccount.inc:52
 #: personal/pureftpd/class_pureftpdAccount.inc:53
+#: personal/pureftpd/class_pureftpdAccount.inc:54
 msgid "Upload bandwidth"
 msgstr ""
 
-#: personal/pureftpd/class_pureftpdAccount.inc:52
-#: personal/pureftpd/class_pureftpdAccount.inc:61
+#: personal/pureftpd/class_pureftpdAccount.inc:53
+#: personal/pureftpd/class_pureftpdAccount.inc:62
 msgid " (kb/sec)"
 msgstr ""
 
-#: personal/pureftpd/class_pureftpdAccount.inc:61
+#: personal/pureftpd/class_pureftpdAccount.inc:62
 msgid "Download bandwidth"
 msgstr ""
 
-#: personal/pureftpd/class_pureftpdAccount.inc:62
+#: personal/pureftpd/class_pureftpdAccount.inc:63
 msgid "Download bandwidth in kb/sec"
 msgstr ""
 
-#: personal/pureftpd/class_pureftpdAccount.inc:72
+#: personal/pureftpd/class_pureftpdAccount.inc:73
 msgid "Ratio"
 msgstr ""
 
-#: personal/pureftpd/class_pureftpdAccount.inc:75
 #: personal/pureftpd/class_pureftpdAccount.inc:76
+#: personal/pureftpd/class_pureftpdAccount.inc:77
 msgid "Uploaded files"
 msgstr ""
 
-#: personal/pureftpd/class_pureftpdAccount.inc:84
 #: personal/pureftpd/class_pureftpdAccount.inc:85
+#: personal/pureftpd/class_pureftpdAccount.inc:86
 msgid "Downloaded files"
 msgstr ""
 
-#: personal/pureftpd/class_pureftpdAccount.inc:98
+#: personal/pureftpd/class_pureftpdAccount.inc:99
 msgid "Files"
 msgstr ""
 
-#: personal/pureftpd/class_pureftpdAccount.inc:99
+#: personal/pureftpd/class_pureftpdAccount.inc:100
 msgid "Quota files"
 msgstr ""
 
-#: personal/pureftpd/class_pureftpdAccount.inc:107
+#: personal/pureftpd/class_pureftpdAccount.inc:108
 msgid "Size"
 msgstr ""
 
-#: personal/pureftpd/class_pureftpdAccount.inc:107
+#: personal/pureftpd/class_pureftpdAccount.inc:108
 msgid " (MB)"
 msgstr ""
 
-#: personal/pureftpd/class_pureftpdAccount.inc:108
+#: personal/pureftpd/class_pureftpdAccount.inc:109
 msgid "Files size"
 msgstr ""
 
-#: personal/pureftpd/class_pureftpdAccount.inc:118
+#: personal/pureftpd/class_pureftpdAccount.inc:119
 msgid "Miscellaneous"
 msgstr ""
 
-#: personal/pureftpd/class_pureftpdAccount.inc:121
-msgid "Enable FTP access"
-msgstr ""
-
-#: personal/pureftpd/class_pureftpdAccount.inc:121
-msgid "Enable or disable FTP access"
+#: personal/pureftpd/class_pureftpdAccount.inc:122
+#: personal/pureftpd/class_pureftpdAccount.inc:123
+msgid "Temporary disable FTP access"
 msgstr ""
diff --git a/pureftpd/locale/it/fusiondirectory.po b/pureftpd/locale/it/fusiondirectory.po
index 6b9f6aea944cad8b70d62d5fc30cce2238bf001a..fb3fb3396d5a9fdc543eb7ada1803d4201268143 100644
--- a/pureftpd/locale/it/fusiondirectory.po
+++ b/pureftpd/locale/it/fusiondirectory.po
@@ -3,101 +3,93 @@
 # This file is distributed under the same license as the PACKAGE package.
 # 
 # Translators:
-# Alessandro Amici <a.amici@bopen.it>, 2005
-# poterealpopolo <giuliano@opensides.be>, 2011
-# poterealpopolo <giuliano@opensides.be>, 2013
-# poterealpopolo <giuliano@opensides.be>, 2012
-# poterealpopolo <giuliano@opensides.be>, 2011-2013
 msgid ""
 msgstr ""
-"Project-Id-Version: FusionDirectory-108\n"
+"Project-Id-Version: FusionDirectory-109\n"
 "Report-Msgid-Bugs-To: documentation@lists.fusiondirectory.org\n"
-"POT-Creation-Date: 2015-03-31 11:49+0200\n"
-"PO-Revision-Date: 2015-03-31 10:41+0000\n"
-"Last-Translator: fusiondirectory <contact@fusiondirectory.org>\n"
-"Language-Team: Italian (http://www.transifex.com/projects/p/FusionDirectory-108/language/it/)\n"
+"POT-Creation-Date: 2014-12-15 17:47+0100\n"
+"PO-Revision-Date: 2014-08-28 10:29+0000\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: Italian (http://www.transifex.com/projects/p/FusionDirectory-109/language/it/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Language: it\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: personal/pureftpd/class_pureftpdAccount.inc:33
+#: personal/pureftpd/class_pureftpdAccount.inc:34
 msgid "Ftp"
 msgstr "FtpTipo"
 
-#: personal/pureftpd/class_pureftpdAccount.inc:34
+#: personal/pureftpd/class_pureftpdAccount.inc:35
 msgid "Pure ftp account"
 msgstr "Account di Pure ftp"
 
-#: personal/pureftpd/class_pureftpdAccount.inc:34
+#: personal/pureftpd/class_pureftpdAccount.inc:35
 msgid "Connectivity addon"
 msgstr "Estensione per la connessione"
 
-#: personal/pureftpd/class_pureftpdAccount.inc:49
+#: personal/pureftpd/class_pureftpdAccount.inc:50
 msgid "Bandwidth"
 msgstr "Banda passante"
 
-#: personal/pureftpd/class_pureftpdAccount.inc:52
 #: personal/pureftpd/class_pureftpdAccount.inc:53
+#: personal/pureftpd/class_pureftpdAccount.inc:54
 msgid "Upload bandwidth"
 msgstr "Banda passante di upload"
 
-#: personal/pureftpd/class_pureftpdAccount.inc:52
-#: personal/pureftpd/class_pureftpdAccount.inc:61
+#: personal/pureftpd/class_pureftpdAccount.inc:53
+#: personal/pureftpd/class_pureftpdAccount.inc:62
 msgid " (kb/sec)"
 msgstr " (kb/sec)"
 
-#: personal/pureftpd/class_pureftpdAccount.inc:61
+#: personal/pureftpd/class_pureftpdAccount.inc:62
 msgid "Download bandwidth"
 msgstr "Banda passante di download"
 
-#: personal/pureftpd/class_pureftpdAccount.inc:62
+#: personal/pureftpd/class_pureftpdAccount.inc:63
 msgid "Download bandwidth in kb/sec"
 msgstr "Banda passante di download in kb/sec"
 
-#: personal/pureftpd/class_pureftpdAccount.inc:72
+#: personal/pureftpd/class_pureftpdAccount.inc:73
 msgid "Ratio"
 msgstr "Rapporto"
 
-#: personal/pureftpd/class_pureftpdAccount.inc:75
 #: personal/pureftpd/class_pureftpdAccount.inc:76
+#: personal/pureftpd/class_pureftpdAccount.inc:77
 msgid "Uploaded files"
 msgstr "File caricati"
 
-#: personal/pureftpd/class_pureftpdAccount.inc:84
 #: personal/pureftpd/class_pureftpdAccount.inc:85
+#: personal/pureftpd/class_pureftpdAccount.inc:86
 msgid "Downloaded files"
 msgstr "File scaricati"
 
-#: personal/pureftpd/class_pureftpdAccount.inc:98
+#: personal/pureftpd/class_pureftpdAccount.inc:99
 msgid "Files"
 msgstr "Files"
 
-#: personal/pureftpd/class_pureftpdAccount.inc:99
+#: personal/pureftpd/class_pureftpdAccount.inc:100
 msgid "Quota files"
 msgstr "Dimensione della quota per i file"
 
-#: personal/pureftpd/class_pureftpdAccount.inc:107
+#: personal/pureftpd/class_pureftpdAccount.inc:108
 msgid "Size"
 msgstr "Dimensione"
 
-#: personal/pureftpd/class_pureftpdAccount.inc:107
+#: personal/pureftpd/class_pureftpdAccount.inc:108
 msgid " (MB)"
 msgstr " (MB)"
 
-#: personal/pureftpd/class_pureftpdAccount.inc:108
+#: personal/pureftpd/class_pureftpdAccount.inc:109
 msgid "Files size"
 msgstr "Dimensione dei file"
 
-#: personal/pureftpd/class_pureftpdAccount.inc:118
+#: personal/pureftpd/class_pureftpdAccount.inc:119
 msgid "Miscellaneous"
 msgstr "Altro"
 
-#: personal/pureftpd/class_pureftpdAccount.inc:121
-msgid "Enable FTP access"
-msgstr ""
-
-#: personal/pureftpd/class_pureftpdAccount.inc:121
-msgid "Enable or disable FTP access"
-msgstr ""
+#: personal/pureftpd/class_pureftpdAccount.inc:122
+#: personal/pureftpd/class_pureftpdAccount.inc:123
+msgid "Temporary disable FTP access"
+msgstr "Disabilita temporaneamente l'accesso FTP"
diff --git a/pureftpd/locale/lv/fusiondirectory.po b/pureftpd/locale/lv/fusiondirectory.po
index 3c721984f364fdfcf1e3a2f164c695cbb7db173e..422eb1c37a3206d2f105cec64ac6ad710a31cd70 100644
--- a/pureftpd/locale/lv/fusiondirectory.po
+++ b/pureftpd/locale/lv/fusiondirectory.po
@@ -5,94 +5,91 @@
 # Translators:
 msgid ""
 msgstr ""
-"Project-Id-Version: FusionDirectory-108\n"
+"Project-Id-Version: FusionDirectory-109\n"
 "Report-Msgid-Bugs-To: documentation@lists.fusiondirectory.org\n"
-"POT-Creation-Date: 2015-03-31 11:49+0200\n"
-"PO-Revision-Date: 2015-03-31 10:41+0000\n"
-"Last-Translator: fusiondirectory <contact@fusiondirectory.org>\n"
-"Language-Team: Latvian (http://www.transifex.com/projects/p/FusionDirectory-108/language/lv/)\n"
+"POT-Creation-Date: 2014-12-15 17:47+0100\n"
+"PO-Revision-Date: 2014-08-28 10:29+0000\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: Latvian (http://www.transifex.com/projects/p/FusionDirectory-109/language/lv/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Language: lv\n"
 "Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n != 0 ? 1 : 2);\n"
 
-#: personal/pureftpd/class_pureftpdAccount.inc:33
+#: personal/pureftpd/class_pureftpdAccount.inc:34
 msgid "Ftp"
 msgstr ""
 
-#: personal/pureftpd/class_pureftpdAccount.inc:34
+#: personal/pureftpd/class_pureftpdAccount.inc:35
 msgid "Pure ftp account"
 msgstr ""
 
-#: personal/pureftpd/class_pureftpdAccount.inc:34
+#: personal/pureftpd/class_pureftpdAccount.inc:35
 msgid "Connectivity addon"
 msgstr ""
 
-#: personal/pureftpd/class_pureftpdAccount.inc:49
+#: personal/pureftpd/class_pureftpdAccount.inc:50
 msgid "Bandwidth"
 msgstr ""
 
-#: personal/pureftpd/class_pureftpdAccount.inc:52
 #: personal/pureftpd/class_pureftpdAccount.inc:53
+#: personal/pureftpd/class_pureftpdAccount.inc:54
 msgid "Upload bandwidth"
 msgstr ""
 
-#: personal/pureftpd/class_pureftpdAccount.inc:52
-#: personal/pureftpd/class_pureftpdAccount.inc:61
+#: personal/pureftpd/class_pureftpdAccount.inc:53
+#: personal/pureftpd/class_pureftpdAccount.inc:62
 msgid " (kb/sec)"
 msgstr ""
 
-#: personal/pureftpd/class_pureftpdAccount.inc:61
+#: personal/pureftpd/class_pureftpdAccount.inc:62
 msgid "Download bandwidth"
 msgstr ""
 
-#: personal/pureftpd/class_pureftpdAccount.inc:62
+#: personal/pureftpd/class_pureftpdAccount.inc:63
 msgid "Download bandwidth in kb/sec"
 msgstr ""
 
-#: personal/pureftpd/class_pureftpdAccount.inc:72
+#: personal/pureftpd/class_pureftpdAccount.inc:73
 msgid "Ratio"
 msgstr ""
 
-#: personal/pureftpd/class_pureftpdAccount.inc:75
 #: personal/pureftpd/class_pureftpdAccount.inc:76
+#: personal/pureftpd/class_pureftpdAccount.inc:77
 msgid "Uploaded files"
 msgstr ""
 
-#: personal/pureftpd/class_pureftpdAccount.inc:84
 #: personal/pureftpd/class_pureftpdAccount.inc:85
+#: personal/pureftpd/class_pureftpdAccount.inc:86
 msgid "Downloaded files"
 msgstr ""
 
-#: personal/pureftpd/class_pureftpdAccount.inc:98
+#: personal/pureftpd/class_pureftpdAccount.inc:99
 msgid "Files"
 msgstr ""
 
-#: personal/pureftpd/class_pureftpdAccount.inc:99
+#: personal/pureftpd/class_pureftpdAccount.inc:100
 msgid "Quota files"
 msgstr ""
 
-#: personal/pureftpd/class_pureftpdAccount.inc:107
+#: personal/pureftpd/class_pureftpdAccount.inc:108
 msgid "Size"
 msgstr ""
 
-#: personal/pureftpd/class_pureftpdAccount.inc:107
+#: personal/pureftpd/class_pureftpdAccount.inc:108
 msgid " (MB)"
 msgstr ""
 
-#: personal/pureftpd/class_pureftpdAccount.inc:108
+#: personal/pureftpd/class_pureftpdAccount.inc:109
 msgid "Files size"
 msgstr ""
 
-#: personal/pureftpd/class_pureftpdAccount.inc:118
+#: personal/pureftpd/class_pureftpdAccount.inc:119
 msgid "Miscellaneous"
 msgstr ""
 
-#: personal/pureftpd/class_pureftpdAccount.inc:121
-msgid "Enable FTP access"
-msgstr ""
-
-#: personal/pureftpd/class_pureftpdAccount.inc:121
-msgid "Enable or disable FTP access"
+#: personal/pureftpd/class_pureftpdAccount.inc:122
+#: personal/pureftpd/class_pureftpdAccount.inc:123
+msgid "Temporary disable FTP access"
 msgstr ""
diff --git a/pureftpd/locale/nb/fusiondirectory.po b/pureftpd/locale/nb/fusiondirectory.po
index b9608764c5022a634a0d4e86968d01444f4a5b1a..ab6259b9e706feb6871e38f0a569fbfc29f32d01 100644
--- a/pureftpd/locale/nb/fusiondirectory.po
+++ b/pureftpd/locale/nb/fusiondirectory.po
@@ -5,94 +5,91 @@
 # Translators:
 msgid ""
 msgstr ""
-"Project-Id-Version: FusionDirectory-108\n"
+"Project-Id-Version: FusionDirectory-109\n"
 "Report-Msgid-Bugs-To: documentation@lists.fusiondirectory.org\n"
-"POT-Creation-Date: 2015-03-31 11:49+0200\n"
-"PO-Revision-Date: 2015-03-31 10:41+0000\n"
-"Last-Translator: fusiondirectory <contact@fusiondirectory.org>\n"
-"Language-Team: Norwegian BokmÃ¥l (http://www.transifex.com/projects/p/FusionDirectory-108/language/nb/)\n"
+"POT-Creation-Date: 2014-12-15 17:47+0100\n"
+"PO-Revision-Date: 2014-08-28 10:29+0000\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: Norwegian BokmÃ¥l (http://www.transifex.com/projects/p/FusionDirectory-109/language/nb/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Language: nb\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: personal/pureftpd/class_pureftpdAccount.inc:33
+#: personal/pureftpd/class_pureftpdAccount.inc:34
 msgid "Ftp"
 msgstr ""
 
-#: personal/pureftpd/class_pureftpdAccount.inc:34
+#: personal/pureftpd/class_pureftpdAccount.inc:35
 msgid "Pure ftp account"
 msgstr ""
 
-#: personal/pureftpd/class_pureftpdAccount.inc:34
+#: personal/pureftpd/class_pureftpdAccount.inc:35
 msgid "Connectivity addon"
 msgstr ""
 
-#: personal/pureftpd/class_pureftpdAccount.inc:49
+#: personal/pureftpd/class_pureftpdAccount.inc:50
 msgid "Bandwidth"
 msgstr ""
 
-#: personal/pureftpd/class_pureftpdAccount.inc:52
 #: personal/pureftpd/class_pureftpdAccount.inc:53
+#: personal/pureftpd/class_pureftpdAccount.inc:54
 msgid "Upload bandwidth"
 msgstr ""
 
-#: personal/pureftpd/class_pureftpdAccount.inc:52
-#: personal/pureftpd/class_pureftpdAccount.inc:61
+#: personal/pureftpd/class_pureftpdAccount.inc:53
+#: personal/pureftpd/class_pureftpdAccount.inc:62
 msgid " (kb/sec)"
 msgstr ""
 
-#: personal/pureftpd/class_pureftpdAccount.inc:61
+#: personal/pureftpd/class_pureftpdAccount.inc:62
 msgid "Download bandwidth"
 msgstr ""
 
-#: personal/pureftpd/class_pureftpdAccount.inc:62
+#: personal/pureftpd/class_pureftpdAccount.inc:63
 msgid "Download bandwidth in kb/sec"
 msgstr ""
 
-#: personal/pureftpd/class_pureftpdAccount.inc:72
+#: personal/pureftpd/class_pureftpdAccount.inc:73
 msgid "Ratio"
 msgstr ""
 
-#: personal/pureftpd/class_pureftpdAccount.inc:75
 #: personal/pureftpd/class_pureftpdAccount.inc:76
+#: personal/pureftpd/class_pureftpdAccount.inc:77
 msgid "Uploaded files"
 msgstr ""
 
-#: personal/pureftpd/class_pureftpdAccount.inc:84
 #: personal/pureftpd/class_pureftpdAccount.inc:85
+#: personal/pureftpd/class_pureftpdAccount.inc:86
 msgid "Downloaded files"
 msgstr ""
 
-#: personal/pureftpd/class_pureftpdAccount.inc:98
+#: personal/pureftpd/class_pureftpdAccount.inc:99
 msgid "Files"
 msgstr ""
 
-#: personal/pureftpd/class_pureftpdAccount.inc:99
+#: personal/pureftpd/class_pureftpdAccount.inc:100
 msgid "Quota files"
 msgstr ""
 
-#: personal/pureftpd/class_pureftpdAccount.inc:107
+#: personal/pureftpd/class_pureftpdAccount.inc:108
 msgid "Size"
 msgstr ""
 
-#: personal/pureftpd/class_pureftpdAccount.inc:107
+#: personal/pureftpd/class_pureftpdAccount.inc:108
 msgid " (MB)"
 msgstr ""
 
-#: personal/pureftpd/class_pureftpdAccount.inc:108
+#: personal/pureftpd/class_pureftpdAccount.inc:109
 msgid "Files size"
 msgstr ""
 
-#: personal/pureftpd/class_pureftpdAccount.inc:118
+#: personal/pureftpd/class_pureftpdAccount.inc:119
 msgid "Miscellaneous"
 msgstr ""
 
-#: personal/pureftpd/class_pureftpdAccount.inc:121
-msgid "Enable FTP access"
-msgstr ""
-
-#: personal/pureftpd/class_pureftpdAccount.inc:121
-msgid "Enable or disable FTP access"
+#: personal/pureftpd/class_pureftpdAccount.inc:122
+#: personal/pureftpd/class_pureftpdAccount.inc:123
+msgid "Temporary disable FTP access"
 msgstr ""
diff --git a/pureftpd/locale/nl/fusiondirectory.po b/pureftpd/locale/nl/fusiondirectory.po
index 11be27253e8ed40e041dd89f36d8754c41acfad1..4e60a31db469f024d174ebf1d292b895983eea54 100644
--- a/pureftpd/locale/nl/fusiondirectory.po
+++ b/pureftpd/locale/nl/fusiondirectory.po
@@ -3,98 +3,93 @@
 # This file is distributed under the same license as the PACKAGE package.
 # 
 # Translators:
-# Kenny Tordeurs <tordeurskenny@gmail.com>, 2012
-#  Niels Klomp (CareWorks ICT Services) <nk@careworks.nl>, 2005
 msgid ""
 msgstr ""
-"Project-Id-Version: FusionDirectory-108\n"
+"Project-Id-Version: FusionDirectory-109\n"
 "Report-Msgid-Bugs-To: documentation@lists.fusiondirectory.org\n"
-"POT-Creation-Date: 2015-03-31 11:49+0200\n"
-"PO-Revision-Date: 2015-03-31 10:41+0000\n"
-"Last-Translator: fusiondirectory <contact@fusiondirectory.org>\n"
-"Language-Team: Dutch (http://www.transifex.com/projects/p/FusionDirectory-108/language/nl/)\n"
+"POT-Creation-Date: 2014-12-15 17:47+0100\n"
+"PO-Revision-Date: 2014-08-28 10:29+0000\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: Dutch (http://www.transifex.com/projects/p/FusionDirectory-109/language/nl/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Language: nl\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: personal/pureftpd/class_pureftpdAccount.inc:33
+#: personal/pureftpd/class_pureftpdAccount.inc:34
 msgid "Ftp"
 msgstr "Ftp"
 
-#: personal/pureftpd/class_pureftpdAccount.inc:34
+#: personal/pureftpd/class_pureftpdAccount.inc:35
 msgid "Pure ftp account"
 msgstr "Pure ftp account"
 
-#: personal/pureftpd/class_pureftpdAccount.inc:34
+#: personal/pureftpd/class_pureftpdAccount.inc:35
 msgid "Connectivity addon"
 msgstr "Connectiviteit addon"
 
-#: personal/pureftpd/class_pureftpdAccount.inc:49
+#: personal/pureftpd/class_pureftpdAccount.inc:50
 msgid "Bandwidth"
 msgstr "Bandbreedte"
 
-#: personal/pureftpd/class_pureftpdAccount.inc:52
 #: personal/pureftpd/class_pureftpdAccount.inc:53
+#: personal/pureftpd/class_pureftpdAccount.inc:54
 msgid "Upload bandwidth"
 msgstr "Verstuur bandbreedte"
 
-#: personal/pureftpd/class_pureftpdAccount.inc:52
-#: personal/pureftpd/class_pureftpdAccount.inc:61
+#: personal/pureftpd/class_pureftpdAccount.inc:53
+#: personal/pureftpd/class_pureftpdAccount.inc:62
 msgid " (kb/sec)"
 msgstr ""
 
-#: personal/pureftpd/class_pureftpdAccount.inc:61
+#: personal/pureftpd/class_pureftpdAccount.inc:62
 msgid "Download bandwidth"
 msgstr "Ontvangst bandbreedte"
 
-#: personal/pureftpd/class_pureftpdAccount.inc:62
+#: personal/pureftpd/class_pureftpdAccount.inc:63
 msgid "Download bandwidth in kb/sec"
 msgstr ""
 
-#: personal/pureftpd/class_pureftpdAccount.inc:72
+#: personal/pureftpd/class_pureftpdAccount.inc:73
 msgid "Ratio"
 msgstr "Verhouding"
 
-#: personal/pureftpd/class_pureftpdAccount.inc:75
 #: personal/pureftpd/class_pureftpdAccount.inc:76
+#: personal/pureftpd/class_pureftpdAccount.inc:77
 msgid "Uploaded files"
 msgstr ""
 
-#: personal/pureftpd/class_pureftpdAccount.inc:84
 #: personal/pureftpd/class_pureftpdAccount.inc:85
+#: personal/pureftpd/class_pureftpdAccount.inc:86
 msgid "Downloaded files"
 msgstr ""
 
-#: personal/pureftpd/class_pureftpdAccount.inc:98
+#: personal/pureftpd/class_pureftpdAccount.inc:99
 msgid "Files"
 msgstr "Bestanden"
 
-#: personal/pureftpd/class_pureftpdAccount.inc:99
+#: personal/pureftpd/class_pureftpdAccount.inc:100
 msgid "Quota files"
 msgstr "Quota bestanden"
 
-#: personal/pureftpd/class_pureftpdAccount.inc:107
+#: personal/pureftpd/class_pureftpdAccount.inc:108
 msgid "Size"
 msgstr "Grootte"
 
-#: personal/pureftpd/class_pureftpdAccount.inc:107
+#: personal/pureftpd/class_pureftpdAccount.inc:108
 msgid " (MB)"
 msgstr ""
 
-#: personal/pureftpd/class_pureftpdAccount.inc:108
+#: personal/pureftpd/class_pureftpdAccount.inc:109
 msgid "Files size"
 msgstr ""
 
-#: personal/pureftpd/class_pureftpdAccount.inc:118
+#: personal/pureftpd/class_pureftpdAccount.inc:119
 msgid "Miscellaneous"
 msgstr "Terminal Service diverse"
 
-#: personal/pureftpd/class_pureftpdAccount.inc:121
-msgid "Enable FTP access"
-msgstr ""
-
-#: personal/pureftpd/class_pureftpdAccount.inc:121
-msgid "Enable or disable FTP access"
-msgstr ""
+#: personal/pureftpd/class_pureftpdAccount.inc:122
+#: personal/pureftpd/class_pureftpdAccount.inc:123
+msgid "Temporary disable FTP access"
+msgstr "Schakel FTP toegang tijdelijk uit"
diff --git a/pureftpd/locale/pl/fusiondirectory.po b/pureftpd/locale/pl/fusiondirectory.po
index 9adb58b6f018568f427029f10f1002ef21b8844e..1c8f2be55a7299a17a33b7de30005f738e383087 100644
--- a/pureftpd/locale/pl/fusiondirectory.po
+++ b/pureftpd/locale/pl/fusiondirectory.po
@@ -5,94 +5,91 @@
 # Translators:
 msgid ""
 msgstr ""
-"Project-Id-Version: FusionDirectory-108\n"
+"Project-Id-Version: FusionDirectory-109\n"
 "Report-Msgid-Bugs-To: documentation@lists.fusiondirectory.org\n"
-"POT-Creation-Date: 2015-03-31 11:49+0200\n"
-"PO-Revision-Date: 2015-03-31 10:41+0000\n"
-"Last-Translator: fusiondirectory <contact@fusiondirectory.org>\n"
-"Language-Team: Polish (http://www.transifex.com/projects/p/FusionDirectory-108/language/pl/)\n"
+"POT-Creation-Date: 2014-12-15 17:47+0100\n"
+"PO-Revision-Date: 2014-08-28 10:29+0000\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: Polish (http://www.transifex.com/projects/p/FusionDirectory-109/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"
 
-#: personal/pureftpd/class_pureftpdAccount.inc:33
+#: personal/pureftpd/class_pureftpdAccount.inc:34
 msgid "Ftp"
 msgstr "FTP"
 
-#: personal/pureftpd/class_pureftpdAccount.inc:34
+#: personal/pureftpd/class_pureftpdAccount.inc:35
 msgid "Pure ftp account"
 msgstr "Konto Pure-ftp"
 
-#: personal/pureftpd/class_pureftpdAccount.inc:34
+#: personal/pureftpd/class_pureftpdAccount.inc:35
 msgid "Connectivity addon"
 msgstr "dodatek PoÅ‚Ä…czeÅ„"
 
-#: personal/pureftpd/class_pureftpdAccount.inc:49
+#: personal/pureftpd/class_pureftpdAccount.inc:50
 msgid "Bandwidth"
 msgstr "PrzepustowoÅ›Ä‡"
 
-#: personal/pureftpd/class_pureftpdAccount.inc:52
 #: personal/pureftpd/class_pureftpdAccount.inc:53
+#: personal/pureftpd/class_pureftpdAccount.inc:54
 msgid "Upload bandwidth"
 msgstr "PrzepustowoÅ›Ä‡ wysyÅ‚ania"
 
-#: personal/pureftpd/class_pureftpdAccount.inc:52
-#: personal/pureftpd/class_pureftpdAccount.inc:61
+#: personal/pureftpd/class_pureftpdAccount.inc:53
+#: personal/pureftpd/class_pureftpdAccount.inc:62
 msgid " (kb/sec)"
 msgstr ""
 
-#: personal/pureftpd/class_pureftpdAccount.inc:61
+#: personal/pureftpd/class_pureftpdAccount.inc:62
 msgid "Download bandwidth"
 msgstr "PrzepustowoÅ›Ä‡ Å›ciÄ…gania"
 
-#: personal/pureftpd/class_pureftpdAccount.inc:62
+#: personal/pureftpd/class_pureftpdAccount.inc:63
 msgid "Download bandwidth in kb/sec"
 msgstr ""
 
-#: personal/pureftpd/class_pureftpdAccount.inc:72
+#: personal/pureftpd/class_pureftpdAccount.inc:73
 msgid "Ratio"
 msgstr "Proporcja"
 
-#: personal/pureftpd/class_pureftpdAccount.inc:75
 #: personal/pureftpd/class_pureftpdAccount.inc:76
+#: personal/pureftpd/class_pureftpdAccount.inc:77
 msgid "Uploaded files"
 msgstr ""
 
-#: personal/pureftpd/class_pureftpdAccount.inc:84
 #: personal/pureftpd/class_pureftpdAccount.inc:85
+#: personal/pureftpd/class_pureftpdAccount.inc:86
 msgid "Downloaded files"
 msgstr ""
 
-#: personal/pureftpd/class_pureftpdAccount.inc:98
+#: personal/pureftpd/class_pureftpdAccount.inc:99
 msgid "Files"
 msgstr "Pliko"
 
-#: personal/pureftpd/class_pureftpdAccount.inc:99
+#: personal/pureftpd/class_pureftpdAccount.inc:100
 msgid "Quota files"
 msgstr " Quota pliki"
 
-#: personal/pureftpd/class_pureftpdAccount.inc:107
+#: personal/pureftpd/class_pureftpdAccount.inc:108
 msgid "Size"
 msgstr "Rozmiar"
 
-#: personal/pureftpd/class_pureftpdAccount.inc:107
+#: personal/pureftpd/class_pureftpdAccount.inc:108
 msgid " (MB)"
 msgstr ""
 
-#: personal/pureftpd/class_pureftpdAccount.inc:108
+#: personal/pureftpd/class_pureftpdAccount.inc:109
 msgid "Files size"
 msgstr ""
 
-#: personal/pureftpd/class_pureftpdAccount.inc:118
+#: personal/pureftpd/class_pureftpdAccount.inc:119
 msgid "Miscellaneous"
 msgstr "RÃ³Å¼ne"
 
-#: personal/pureftpd/class_pureftpdAccount.inc:121
-msgid "Enable FTP access"
-msgstr ""
-
-#: personal/pureftpd/class_pureftpdAccount.inc:121
-msgid "Enable or disable FTP access"
-msgstr ""
+#: personal/pureftpd/class_pureftpdAccount.inc:122
+#: personal/pureftpd/class_pureftpdAccount.inc:123
+msgid "Temporary disable FTP access"
+msgstr "Tymczasowo wyÅ‚Ä…cz dostÄ™p do FTP"
diff --git a/pureftpd/locale/pt/fusiondirectory.po b/pureftpd/locale/pt/fusiondirectory.po
index d75c64534da9e5da3fe0390b996a42a8683dfe69..6238a2fe3fa4a54cb8603e146c9feff2c569cb4b 100644
--- a/pureftpd/locale/pt/fusiondirectory.po
+++ b/pureftpd/locale/pt/fusiondirectory.po
@@ -5,94 +5,91 @@
 # Translators:
 msgid ""
 msgstr ""
-"Project-Id-Version: FusionDirectory-108\n"
+"Project-Id-Version: FusionDirectory-109\n"
 "Report-Msgid-Bugs-To: documentation@lists.fusiondirectory.org\n"
-"POT-Creation-Date: 2015-03-31 11:49+0200\n"
-"PO-Revision-Date: 2015-03-31 10:41+0000\n"
-"Last-Translator: fusiondirectory <contact@fusiondirectory.org>\n"
-"Language-Team: Portuguese (http://www.transifex.com/projects/p/FusionDirectory-108/language/pt/)\n"
+"POT-Creation-Date: 2014-12-15 17:47+0100\n"
+"PO-Revision-Date: 2014-08-28 10:29+0000\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: Portuguese (http://www.transifex.com/projects/p/FusionDirectory-109/language/pt/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Language: pt\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: personal/pureftpd/class_pureftpdAccount.inc:33
+#: personal/pureftpd/class_pureftpdAccount.inc:34
 msgid "Ftp"
 msgstr ""
 
-#: personal/pureftpd/class_pureftpdAccount.inc:34
+#: personal/pureftpd/class_pureftpdAccount.inc:35
 msgid "Pure ftp account"
 msgstr ""
 
-#: personal/pureftpd/class_pureftpdAccount.inc:34
+#: personal/pureftpd/class_pureftpdAccount.inc:35
 msgid "Connectivity addon"
 msgstr ""
 
-#: personal/pureftpd/class_pureftpdAccount.inc:49
+#: personal/pureftpd/class_pureftpdAccount.inc:50
 msgid "Bandwidth"
 msgstr ""
 
-#: personal/pureftpd/class_pureftpdAccount.inc:52
 #: personal/pureftpd/class_pureftpdAccount.inc:53
+#: personal/pureftpd/class_pureftpdAccount.inc:54
 msgid "Upload bandwidth"
 msgstr ""
 
-#: personal/pureftpd/class_pureftpdAccount.inc:52
-#: personal/pureftpd/class_pureftpdAccount.inc:61
+#: personal/pureftpd/class_pureftpdAccount.inc:53
+#: personal/pureftpd/class_pureftpdAccount.inc:62
 msgid " (kb/sec)"
 msgstr ""
 
-#: personal/pureftpd/class_pureftpdAccount.inc:61
+#: personal/pureftpd/class_pureftpdAccount.inc:62
 msgid "Download bandwidth"
 msgstr ""
 
-#: personal/pureftpd/class_pureftpdAccount.inc:62
+#: personal/pureftpd/class_pureftpdAccount.inc:63
 msgid "Download bandwidth in kb/sec"
 msgstr ""
 
-#: personal/pureftpd/class_pureftpdAccount.inc:72
+#: personal/pureftpd/class_pureftpdAccount.inc:73
 msgid "Ratio"
 msgstr ""
 
-#: personal/pureftpd/class_pureftpdAccount.inc:75
 #: personal/pureftpd/class_pureftpdAccount.inc:76
+#: personal/pureftpd/class_pureftpdAccount.inc:77
 msgid "Uploaded files"
 msgstr ""
 
-#: personal/pureftpd/class_pureftpdAccount.inc:84
 #: personal/pureftpd/class_pureftpdAccount.inc:85
+#: personal/pureftpd/class_pureftpdAccount.inc:86
 msgid "Downloaded files"
 msgstr ""
 
-#: personal/pureftpd/class_pureftpdAccount.inc:98
+#: personal/pureftpd/class_pureftpdAccount.inc:99
 msgid "Files"
 msgstr ""
 
-#: personal/pureftpd/class_pureftpdAccount.inc:99
+#: personal/pureftpd/class_pureftpdAccount.inc:100
 msgid "Quota files"
 msgstr ""
 
-#: personal/pureftpd/class_pureftpdAccount.inc:107
+#: personal/pureftpd/class_pureftpdAccount.inc:108
 msgid "Size"
 msgstr ""
 
-#: personal/pureftpd/class_pureftpdAccount.inc:107
+#: personal/pureftpd/class_pureftpdAccount.inc:108
 msgid " (MB)"
 msgstr ""
 
-#: personal/pureftpd/class_pureftpdAccount.inc:108
+#: personal/pureftpd/class_pureftpdAccount.inc:109
 msgid "Files size"
 msgstr ""
 
-#: personal/pureftpd/class_pureftpdAccount.inc:118
+#: personal/pureftpd/class_pureftpdAccount.inc:119
 msgid "Miscellaneous"
 msgstr ""
 
-#: personal/pureftpd/class_pureftpdAccount.inc:121
-msgid "Enable FTP access"
-msgstr ""
-
-#: personal/pureftpd/class_pureftpdAccount.inc:121
-msgid "Enable or disable FTP access"
+#: personal/pureftpd/class_pureftpdAccount.inc:122
+#: personal/pureftpd/class_pureftpdAccount.inc:123
+msgid "Temporary disable FTP access"
 msgstr ""
diff --git a/pureftpd/locale/pt_BR/fusiondirectory.po b/pureftpd/locale/pt_BR/fusiondirectory.po
index dfc5da271b2a13331e7f745370a8e9fadf7f041d..dc5cb60a732c2633646ab52025748d8ab745b00e 100644
--- a/pureftpd/locale/pt_BR/fusiondirectory.po
+++ b/pureftpd/locale/pt_BR/fusiondirectory.po
@@ -3,97 +3,93 @@
 # This file is distributed under the same license as the PACKAGE package.
 # 
 # Translators:
-# ALEJANDRO BARRIOS <alejandrobarrios@interlegis.leg.br>, 2014
 msgid ""
 msgstr ""
-"Project-Id-Version: FusionDirectory-108\n"
+"Project-Id-Version: FusionDirectory-109\n"
 "Report-Msgid-Bugs-To: documentation@lists.fusiondirectory.org\n"
-"POT-Creation-Date: 2015-03-31 11:49+0200\n"
-"PO-Revision-Date: 2015-03-31 10:41+0000\n"
-"Last-Translator: fusiondirectory <contact@fusiondirectory.org>\n"
-"Language-Team: Portuguese (Brazil) (http://www.transifex.com/projects/p/FusionDirectory-108/language/pt_BR/)\n"
+"POT-Creation-Date: 2014-12-15 17:47+0100\n"
+"PO-Revision-Date: 2014-08-28 10:29+0000\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: Portuguese (Brazil) (http://www.transifex.com/projects/p/FusionDirectory-109/language/pt_BR/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Language: pt_BR\n"
 "Plural-Forms: nplurals=2; plural=(n > 1);\n"
 
-#: personal/pureftpd/class_pureftpdAccount.inc:33
+#: personal/pureftpd/class_pureftpdAccount.inc:34
 msgid "Ftp"
 msgstr "FTP"
 
-#: personal/pureftpd/class_pureftpdAccount.inc:34
+#: personal/pureftpd/class_pureftpdAccount.inc:35
 msgid "Pure ftp account"
 msgstr "Conta ftp pura"
 
-#: personal/pureftpd/class_pureftpdAccount.inc:34
+#: personal/pureftpd/class_pureftpdAccount.inc:35
 msgid "Connectivity addon"
 msgstr "melhoria de conectividade"
 
-#: personal/pureftpd/class_pureftpdAccount.inc:49
+#: personal/pureftpd/class_pureftpdAccount.inc:50
 msgid "Bandwidth"
 msgstr "Largura de banda"
 
-#: personal/pureftpd/class_pureftpdAccount.inc:52
 #: personal/pureftpd/class_pureftpdAccount.inc:53
+#: personal/pureftpd/class_pureftpdAccount.inc:54
 msgid "Upload bandwidth"
 msgstr "Largura de banda para upload"
 
-#: personal/pureftpd/class_pureftpdAccount.inc:52
-#: personal/pureftpd/class_pureftpdAccount.inc:61
+#: personal/pureftpd/class_pureftpdAccount.inc:53
+#: personal/pureftpd/class_pureftpdAccount.inc:62
 msgid " (kb/sec)"
 msgstr "(kbps)"
 
-#: personal/pureftpd/class_pureftpdAccount.inc:61
+#: personal/pureftpd/class_pureftpdAccount.inc:62
 msgid "Download bandwidth"
 msgstr "Largura de banda para download"
 
-#: personal/pureftpd/class_pureftpdAccount.inc:62
+#: personal/pureftpd/class_pureftpdAccount.inc:63
 msgid "Download bandwidth in kb/sec"
 msgstr "Largura de banda de download em kbps"
 
-#: personal/pureftpd/class_pureftpdAccount.inc:72
+#: personal/pureftpd/class_pureftpdAccount.inc:73
 msgid "Ratio"
 msgstr "relaÃ§Ã£o"
 
-#: personal/pureftpd/class_pureftpdAccount.inc:75
 #: personal/pureftpd/class_pureftpdAccount.inc:76
+#: personal/pureftpd/class_pureftpdAccount.inc:77
 msgid "Uploaded files"
 msgstr "Arquivos upados"
 
-#: personal/pureftpd/class_pureftpdAccount.inc:84
 #: personal/pureftpd/class_pureftpdAccount.inc:85
+#: personal/pureftpd/class_pureftpdAccount.inc:86
 msgid "Downloaded files"
 msgstr "Arquivos baixados"
 
-#: personal/pureftpd/class_pureftpdAccount.inc:98
+#: personal/pureftpd/class_pureftpdAccount.inc:99
 msgid "Files"
 msgstr "Arquivos"
 
-#: personal/pureftpd/class_pureftpdAccount.inc:99
+#: personal/pureftpd/class_pureftpdAccount.inc:100
 msgid "Quota files"
 msgstr "Arquivos quota"
 
-#: personal/pureftpd/class_pureftpdAccount.inc:107
+#: personal/pureftpd/class_pureftpdAccount.inc:108
 msgid "Size"
 msgstr "Tamanho"
 
-#: personal/pureftpd/class_pureftpdAccount.inc:107
+#: personal/pureftpd/class_pureftpdAccount.inc:108
 msgid " (MB)"
 msgstr "(MB)"
 
-#: personal/pureftpd/class_pureftpdAccount.inc:108
+#: personal/pureftpd/class_pureftpdAccount.inc:109
 msgid "Files size"
 msgstr "Tamanho de arquivo"
 
-#: personal/pureftpd/class_pureftpdAccount.inc:118
+#: personal/pureftpd/class_pureftpdAccount.inc:119
 msgid "Miscellaneous"
 msgstr "Diversos"
 
-#: personal/pureftpd/class_pureftpdAccount.inc:121
-msgid "Enable FTP access"
-msgstr ""
-
-#: personal/pureftpd/class_pureftpdAccount.inc:121
-msgid "Enable or disable FTP access"
-msgstr ""
+#: personal/pureftpd/class_pureftpdAccount.inc:122
+#: personal/pureftpd/class_pureftpdAccount.inc:123
+msgid "Temporary disable FTP access"
+msgstr "Desabilitar temporariamente acesso FTP"
diff --git a/pureftpd/locale/ru/fusiondirectory.po b/pureftpd/locale/ru/fusiondirectory.po
index f9982dd1fcbf9a56e7b98e524c7ec1a304d8d628..3689ef464d432ddc097c84a385f872767942d977 100644
--- a/pureftpd/locale/ru/fusiondirectory.po
+++ b/pureftpd/locale/ru/fusiondirectory.po
@@ -3,98 +3,93 @@
 # This file is distributed under the same license as the PACKAGE package.
 # 
 # Translators:
-# Alexey, 2015
-#  Valia V. Vaneeva <fattie@altlinux.ru>, 2004
 msgid ""
 msgstr ""
-"Project-Id-Version: FusionDirectory-108\n"
+"Project-Id-Version: FusionDirectory-109\n"
 "Report-Msgid-Bugs-To: documentation@lists.fusiondirectory.org\n"
-"POT-Creation-Date: 2015-03-31 11:49+0200\n"
-"PO-Revision-Date: 2015-03-31 10:41+0000\n"
-"Last-Translator: fusiondirectory <contact@fusiondirectory.org>\n"
-"Language-Team: Russian (http://www.transifex.com/projects/p/FusionDirectory-108/language/ru/)\n"
+"POT-Creation-Date: 2014-12-15 17:47+0100\n"
+"PO-Revision-Date: 2014-08-28 10:29+0000\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: Russian (http://www.transifex.com/projects/p/FusionDirectory-109/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=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);\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/pureftpd/class_pureftpdAccount.inc:33
+#: personal/pureftpd/class_pureftpdAccount.inc:34
 msgid "Ftp"
 msgstr "Ftp"
 
-#: personal/pureftpd/class_pureftpdAccount.inc:34
+#: personal/pureftpd/class_pureftpdAccount.inc:35
 msgid "Pure ftp account"
 msgstr ""
 
-#: personal/pureftpd/class_pureftpdAccount.inc:34
+#: personal/pureftpd/class_pureftpdAccount.inc:35
 msgid "Connectivity addon"
 msgstr ""
 
-#: personal/pureftpd/class_pureftpdAccount.inc:49
+#: personal/pureftpd/class_pureftpdAccount.inc:50
 msgid "Bandwidth"
 msgstr "ÐŸÑ€Ð¾Ð¿ÑƒÑÐºÐ½Ð°Ñ ÑÐ¿Ð¾ÑÐ¾Ð±Ð½Ð¾ÑÑ‚ÑŒ"
 
-#: personal/pureftpd/class_pureftpdAccount.inc:52
 #: personal/pureftpd/class_pureftpdAccount.inc:53
+#: personal/pureftpd/class_pureftpdAccount.inc:54
 msgid "Upload bandwidth"
 msgstr "ÐŸÑ€Ð¾Ð¿ÑƒÑÐºÐ½Ð°Ñ ÑÐ¿Ð¾ÑÐ¾Ð±Ð½Ð¾ÑÑ‚ÑŒ (Ð½Ð° ÑÐµÑ€Ð²ÐµÑ€)"
 
-#: personal/pureftpd/class_pureftpdAccount.inc:52
-#: personal/pureftpd/class_pureftpdAccount.inc:61
+#: personal/pureftpd/class_pureftpdAccount.inc:53
+#: personal/pureftpd/class_pureftpdAccount.inc:62
 msgid " (kb/sec)"
 msgstr " (ÐºÐ±/ÑÐµÐº)"
 
-#: personal/pureftpd/class_pureftpdAccount.inc:61
+#: personal/pureftpd/class_pureftpdAccount.inc:62
 msgid "Download bandwidth"
 msgstr "ÐŸÑ€Ð¾Ð¿ÑƒÑÐºÐ½Ð°Ñ ÑÐ¿Ð¾ÑÐ¾Ð±Ð½Ð¾ÑÑ‚ÑŒ (Ñ ÑÐµÑ€Ð²ÐµÑ€Ð°)"
 
-#: personal/pureftpd/class_pureftpdAccount.inc:62
+#: personal/pureftpd/class_pureftpdAccount.inc:63
 msgid "Download bandwidth in kb/sec"
 msgstr ""
 
-#: personal/pureftpd/class_pureftpdAccount.inc:72
+#: personal/pureftpd/class_pureftpdAccount.inc:73
 msgid "Ratio"
 msgstr "ÐžÑ‚Ð½Ð¾ÑˆÐµÐ½Ð¸Ðµ"
 
-#: personal/pureftpd/class_pureftpdAccount.inc:75
 #: personal/pureftpd/class_pureftpdAccount.inc:76
+#: personal/pureftpd/class_pureftpdAccount.inc:77
 msgid "Uploaded files"
 msgstr "Ð—Ð°Ð³Ñ€ÑƒÐ¶ÐµÐ½Ð½Ñ‹Ðµ Ñ„Ð°Ð¹Ð»Ñ‹"
 
-#: personal/pureftpd/class_pureftpdAccount.inc:84
 #: personal/pureftpd/class_pureftpdAccount.inc:85
+#: personal/pureftpd/class_pureftpdAccount.inc:86
 msgid "Downloaded files"
 msgstr "Ð¡ÐºÐ°Ñ‡ÐµÐ½Ð½Ñ‹Ðµ Ñ„Ð°Ð¹Ð»Ñ‹"
 
-#: personal/pureftpd/class_pureftpdAccount.inc:98
+#: personal/pureftpd/class_pureftpdAccount.inc:99
 msgid "Files"
 msgstr "Ð¤Ð°Ð¹Ð»Ñ‹"
 
-#: personal/pureftpd/class_pureftpdAccount.inc:99
+#: personal/pureftpd/class_pureftpdAccount.inc:100
 msgid "Quota files"
 msgstr ""
 
-#: personal/pureftpd/class_pureftpdAccount.inc:107
+#: personal/pureftpd/class_pureftpdAccount.inc:108
 msgid "Size"
 msgstr "Ð Ð°Ð·Ð¼ÐµÑ€"
 
-#: personal/pureftpd/class_pureftpdAccount.inc:107
+#: personal/pureftpd/class_pureftpdAccount.inc:108
 msgid " (MB)"
 msgstr "(ÐœÐ‘)"
 
-#: personal/pureftpd/class_pureftpdAccount.inc:108
+#: personal/pureftpd/class_pureftpdAccount.inc:109
 msgid "Files size"
 msgstr "Ð Ð°Ð·Ð¼ÐµÑ€ Ñ„Ð°Ð¹Ð»Ð¾Ð²"
 
-#: personal/pureftpd/class_pureftpdAccount.inc:118
+#: personal/pureftpd/class_pureftpdAccount.inc:119
 msgid "Miscellaneous"
 msgstr "Ð Ð°Ð·Ð½Ð¾Ðµ"
 
-#: personal/pureftpd/class_pureftpdAccount.inc:121
-msgid "Enable FTP access"
-msgstr ""
-
-#: personal/pureftpd/class_pureftpdAccount.inc:121
-msgid "Enable or disable FTP access"
-msgstr ""
+#: personal/pureftpd/class_pureftpdAccount.inc:122
+#: personal/pureftpd/class_pureftpdAccount.inc:123
+msgid "Temporary disable FTP access"
+msgstr "Ð’Ñ€ÐµÐ¼ÐµÐ½Ð½Ð¾ Ð¾Ñ‚ÐºÐ»ÑŽÑ‡Ð¸Ñ‚ÑŒ Ð´Ð¾ÑÑ‚ÑƒÐ¿ Ðº FTP"
diff --git a/pureftpd/locale/ru@petr1708/fusiondirectory.po b/pureftpd/locale/ru@petr1708/fusiondirectory.po
index 1471c7560d36ed9635d65b43b56611eb9ac14b70..edd371d7a754430a1ae8e423ecf834c633461471 100644
--- a/pureftpd/locale/ru@petr1708/fusiondirectory.po
+++ b/pureftpd/locale/ru@petr1708/fusiondirectory.po
@@ -5,94 +5,91 @@
 # Translators:
 msgid ""
 msgstr ""
-"Project-Id-Version: FusionDirectory-108\n"
+"Project-Id-Version: FusionDirectory-109\n"
 "Report-Msgid-Bugs-To: documentation@lists.fusiondirectory.org\n"
-"POT-Creation-Date: 2015-03-31 11:49+0200\n"
-"PO-Revision-Date: 2015-03-31 10:41+0000\n"
-"Last-Translator: fusiondirectory <contact@fusiondirectory.org>\n"
-"Language-Team: Russian Petrine orthography (http://www.transifex.com/projects/p/FusionDirectory-108/language/ru@petr1708/)\n"
+"POT-Creation-Date: 2014-12-15 17:47+0100\n"
+"PO-Revision-Date: 2014-08-28 10:29+0000\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: Russian Petrine orthography (http://www.transifex.com/projects/p/FusionDirectory-109/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=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);\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/pureftpd/class_pureftpdAccount.inc:33
+#: personal/pureftpd/class_pureftpdAccount.inc:34
 msgid "Ftp"
 msgstr ""
 
-#: personal/pureftpd/class_pureftpdAccount.inc:34
+#: personal/pureftpd/class_pureftpdAccount.inc:35
 msgid "Pure ftp account"
 msgstr ""
 
-#: personal/pureftpd/class_pureftpdAccount.inc:34
+#: personal/pureftpd/class_pureftpdAccount.inc:35
 msgid "Connectivity addon"
 msgstr ""
 
-#: personal/pureftpd/class_pureftpdAccount.inc:49
+#: personal/pureftpd/class_pureftpdAccount.inc:50
 msgid "Bandwidth"
 msgstr ""
 
-#: personal/pureftpd/class_pureftpdAccount.inc:52
 #: personal/pureftpd/class_pureftpdAccount.inc:53
+#: personal/pureftpd/class_pureftpdAccount.inc:54
 msgid "Upload bandwidth"
 msgstr ""
 
-#: personal/pureftpd/class_pureftpdAccount.inc:52
-#: personal/pureftpd/class_pureftpdAccount.inc:61
+#: personal/pureftpd/class_pureftpdAccount.inc:53
+#: personal/pureftpd/class_pureftpdAccount.inc:62
 msgid " (kb/sec)"
 msgstr ""
 
-#: personal/pureftpd/class_pureftpdAccount.inc:61
+#: personal/pureftpd/class_pureftpdAccount.inc:62
 msgid "Download bandwidth"
 msgstr ""
 
-#: personal/pureftpd/class_pureftpdAccount.inc:62
+#: personal/pureftpd/class_pureftpdAccount.inc:63
 msgid "Download bandwidth in kb/sec"
 msgstr ""
 
-#: personal/pureftpd/class_pureftpdAccount.inc:72
+#: personal/pureftpd/class_pureftpdAccount.inc:73
 msgid "Ratio"
 msgstr ""
 
-#: personal/pureftpd/class_pureftpdAccount.inc:75
 #: personal/pureftpd/class_pureftpdAccount.inc:76
+#: personal/pureftpd/class_pureftpdAccount.inc:77
 msgid "Uploaded files"
 msgstr ""
 
-#: personal/pureftpd/class_pureftpdAccount.inc:84
 #: personal/pureftpd/class_pureftpdAccount.inc:85
+#: personal/pureftpd/class_pureftpdAccount.inc:86
 msgid "Downloaded files"
 msgstr ""
 
-#: personal/pureftpd/class_pureftpdAccount.inc:98
+#: personal/pureftpd/class_pureftpdAccount.inc:99
 msgid "Files"
 msgstr ""
 
-#: personal/pureftpd/class_pureftpdAccount.inc:99
+#: personal/pureftpd/class_pureftpdAccount.inc:100
 msgid "Quota files"
 msgstr ""
 
-#: personal/pureftpd/class_pureftpdAccount.inc:107
+#: personal/pureftpd/class_pureftpdAccount.inc:108
 msgid "Size"
 msgstr ""
 
-#: personal/pureftpd/class_pureftpdAccount.inc:107
+#: personal/pureftpd/class_pureftpdAccount.inc:108
 msgid " (MB)"
 msgstr ""
 
-#: personal/pureftpd/class_pureftpdAccount.inc:108
+#: personal/pureftpd/class_pureftpdAccount.inc:109
 msgid "Files size"
 msgstr ""
 
-#: personal/pureftpd/class_pureftpdAccount.inc:118
+#: personal/pureftpd/class_pureftpdAccount.inc:119
 msgid "Miscellaneous"
 msgstr ""
 
-#: personal/pureftpd/class_pureftpdAccount.inc:121
-msgid "Enable FTP access"
-msgstr ""
-
-#: personal/pureftpd/class_pureftpdAccount.inc:121
-msgid "Enable or disable FTP access"
+#: personal/pureftpd/class_pureftpdAccount.inc:122
+#: personal/pureftpd/class_pureftpdAccount.inc:123
+msgid "Temporary disable FTP access"
 msgstr ""
diff --git a/pureftpd/locale/sv/fusiondirectory.po b/pureftpd/locale/sv/fusiondirectory.po
index b49c1c0d31d2cb307d2b02c2ebfca1504928fa8e..ef0da89ad991d6dc184125ae8bddb1e258104028 100644
--- a/pureftpd/locale/sv/fusiondirectory.po
+++ b/pureftpd/locale/sv/fusiondirectory.po
@@ -5,94 +5,91 @@
 # Translators:
 msgid ""
 msgstr ""
-"Project-Id-Version: FusionDirectory-108\n"
+"Project-Id-Version: FusionDirectory-109\n"
 "Report-Msgid-Bugs-To: documentation@lists.fusiondirectory.org\n"
-"POT-Creation-Date: 2015-03-31 11:49+0200\n"
-"PO-Revision-Date: 2015-03-31 10:41+0000\n"
-"Last-Translator: fusiondirectory <contact@fusiondirectory.org>\n"
-"Language-Team: Swedish (http://www.transifex.com/projects/p/FusionDirectory-108/language/sv/)\n"
+"POT-Creation-Date: 2014-12-15 17:47+0100\n"
+"PO-Revision-Date: 2014-08-28 10:29+0000\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: Swedish (http://www.transifex.com/projects/p/FusionDirectory-109/language/sv/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Language: sv\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: personal/pureftpd/class_pureftpdAccount.inc:33
+#: personal/pureftpd/class_pureftpdAccount.inc:34
 msgid "Ftp"
 msgstr ""
 
-#: personal/pureftpd/class_pureftpdAccount.inc:34
+#: personal/pureftpd/class_pureftpdAccount.inc:35
 msgid "Pure ftp account"
 msgstr ""
 
-#: personal/pureftpd/class_pureftpdAccount.inc:34
+#: personal/pureftpd/class_pureftpdAccount.inc:35
 msgid "Connectivity addon"
 msgstr ""
 
-#: personal/pureftpd/class_pureftpdAccount.inc:49
+#: personal/pureftpd/class_pureftpdAccount.inc:50
 msgid "Bandwidth"
 msgstr ""
 
-#: personal/pureftpd/class_pureftpdAccount.inc:52
 #: personal/pureftpd/class_pureftpdAccount.inc:53
+#: personal/pureftpd/class_pureftpdAccount.inc:54
 msgid "Upload bandwidth"
 msgstr ""
 
-#: personal/pureftpd/class_pureftpdAccount.inc:52
-#: personal/pureftpd/class_pureftpdAccount.inc:61
+#: personal/pureftpd/class_pureftpdAccount.inc:53
+#: personal/pureftpd/class_pureftpdAccount.inc:62
 msgid " (kb/sec)"
 msgstr ""
 
-#: personal/pureftpd/class_pureftpdAccount.inc:61
+#: personal/pureftpd/class_pureftpdAccount.inc:62
 msgid "Download bandwidth"
 msgstr ""
 
-#: personal/pureftpd/class_pureftpdAccount.inc:62
+#: personal/pureftpd/class_pureftpdAccount.inc:63
 msgid "Download bandwidth in kb/sec"
 msgstr ""
 
-#: personal/pureftpd/class_pureftpdAccount.inc:72
+#: personal/pureftpd/class_pureftpdAccount.inc:73
 msgid "Ratio"
 msgstr ""
 
-#: personal/pureftpd/class_pureftpdAccount.inc:75
 #: personal/pureftpd/class_pureftpdAccount.inc:76
+#: personal/pureftpd/class_pureftpdAccount.inc:77
 msgid "Uploaded files"
 msgstr ""
 
-#: personal/pureftpd/class_pureftpdAccount.inc:84
 #: personal/pureftpd/class_pureftpdAccount.inc:85
+#: personal/pureftpd/class_pureftpdAccount.inc:86
 msgid "Downloaded files"
 msgstr ""
 
-#: personal/pureftpd/class_pureftpdAccount.inc:98
+#: personal/pureftpd/class_pureftpdAccount.inc:99
 msgid "Files"
 msgstr ""
 
-#: personal/pureftpd/class_pureftpdAccount.inc:99
+#: personal/pureftpd/class_pureftpdAccount.inc:100
 msgid "Quota files"
 msgstr ""
 
-#: personal/pureftpd/class_pureftpdAccount.inc:107
+#: personal/pureftpd/class_pureftpdAccount.inc:108
 msgid "Size"
 msgstr "Storlek"
 
-#: personal/pureftpd/class_pureftpdAccount.inc:107
+#: personal/pureftpd/class_pureftpdAccount.inc:108
 msgid " (MB)"
 msgstr ""
 
-#: personal/pureftpd/class_pureftpdAccount.inc:108
+#: personal/pureftpd/class_pureftpdAccount.inc:109
 msgid "Files size"
 msgstr ""
 
-#: personal/pureftpd/class_pureftpdAccount.inc:118
+#: personal/pureftpd/class_pureftpdAccount.inc:119
 msgid "Miscellaneous"
 msgstr "Diverse"
 
-#: personal/pureftpd/class_pureftpdAccount.inc:121
-msgid "Enable FTP access"
-msgstr ""
-
-#: personal/pureftpd/class_pureftpdAccount.inc:121
-msgid "Enable or disable FTP access"
+#: personal/pureftpd/class_pureftpdAccount.inc:122
+#: personal/pureftpd/class_pureftpdAccount.inc:123
+msgid "Temporary disable FTP access"
 msgstr ""
diff --git a/pureftpd/locale/ug/fusiondirectory.po b/pureftpd/locale/ug/fusiondirectory.po
index 73046bed3f1b0526ac5e84d0a17f7d044b74d913..360dd69454b7df829ff6055e0f9eddea21ad2a53 100644
--- a/pureftpd/locale/ug/fusiondirectory.po
+++ b/pureftpd/locale/ug/fusiondirectory.po
@@ -5,94 +5,91 @@
 # Translators:
 msgid ""
 msgstr ""
-"Project-Id-Version: FusionDirectory-108\n"
+"Project-Id-Version: FusionDirectory-109\n"
 "Report-Msgid-Bugs-To: documentation@lists.fusiondirectory.org\n"
-"POT-Creation-Date: 2015-03-31 11:49+0200\n"
-"PO-Revision-Date: 2015-03-31 10:41+0000\n"
-"Last-Translator: fusiondirectory <contact@fusiondirectory.org>\n"
-"Language-Team: Uighur (http://www.transifex.com/projects/p/FusionDirectory-108/language/ug/)\n"
+"POT-Creation-Date: 2014-12-15 17:47+0100\n"
+"PO-Revision-Date: 2014-08-28 10:29+0000\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: Uighur (http://www.transifex.com/projects/p/FusionDirectory-109/language/ug/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Language: ug\n"
 "Plural-Forms: nplurals=1; plural=0;\n"
 
-#: personal/pureftpd/class_pureftpdAccount.inc:33
+#: personal/pureftpd/class_pureftpdAccount.inc:34
 msgid "Ftp"
 msgstr ""
 
-#: personal/pureftpd/class_pureftpdAccount.inc:34
+#: personal/pureftpd/class_pureftpdAccount.inc:35
 msgid "Pure ftp account"
 msgstr ""
 
-#: personal/pureftpd/class_pureftpdAccount.inc:34
+#: personal/pureftpd/class_pureftpdAccount.inc:35
 msgid "Connectivity addon"
 msgstr ""
 
-#: personal/pureftpd/class_pureftpdAccount.inc:49
+#: personal/pureftpd/class_pureftpdAccount.inc:50
 msgid "Bandwidth"
 msgstr ""
 
-#: personal/pureftpd/class_pureftpdAccount.inc:52
 #: personal/pureftpd/class_pureftpdAccount.inc:53
+#: personal/pureftpd/class_pureftpdAccount.inc:54
 msgid "Upload bandwidth"
 msgstr ""
 
-#: personal/pureftpd/class_pureftpdAccount.inc:52
-#: personal/pureftpd/class_pureftpdAccount.inc:61
+#: personal/pureftpd/class_pureftpdAccount.inc:53
+#: personal/pureftpd/class_pureftpdAccount.inc:62
 msgid " (kb/sec)"
 msgstr ""
 
-#: personal/pureftpd/class_pureftpdAccount.inc:61
+#: personal/pureftpd/class_pureftpdAccount.inc:62
 msgid "Download bandwidth"
 msgstr ""
 
-#: personal/pureftpd/class_pureftpdAccount.inc:62
+#: personal/pureftpd/class_pureftpdAccount.inc:63
 msgid "Download bandwidth in kb/sec"
 msgstr ""
 
-#: personal/pureftpd/class_pureftpdAccount.inc:72
+#: personal/pureftpd/class_pureftpdAccount.inc:73
 msgid "Ratio"
 msgstr ""
 
-#: personal/pureftpd/class_pureftpdAccount.inc:75
 #: personal/pureftpd/class_pureftpdAccount.inc:76
+#: personal/pureftpd/class_pureftpdAccount.inc:77
 msgid "Uploaded files"
 msgstr ""
 
-#: personal/pureftpd/class_pureftpdAccount.inc:84
 #: personal/pureftpd/class_pureftpdAccount.inc:85
+#: personal/pureftpd/class_pureftpdAccount.inc:86
 msgid "Downloaded files"
 msgstr ""
 
-#: personal/pureftpd/class_pureftpdAccount.inc:98
+#: personal/pureftpd/class_pureftpdAccount.inc:99
 msgid "Files"
 msgstr ""
 
-#: personal/pureftpd/class_pureftpdAccount.inc:99
+#: personal/pureftpd/class_pureftpdAccount.inc:100
 msgid "Quota files"
 msgstr ""
 
-#: personal/pureftpd/class_pureftpdAccount.inc:107
+#: personal/pureftpd/class_pureftpdAccount.inc:108
 msgid "Size"
 msgstr ""
 
-#: personal/pureftpd/class_pureftpdAccount.inc:107
+#: personal/pureftpd/class_pureftpdAccount.inc:108
 msgid " (MB)"
 msgstr ""
 
-#: personal/pureftpd/class_pureftpdAccount.inc:108
+#: personal/pureftpd/class_pureftpdAccount.inc:109
 msgid "Files size"
 msgstr ""
 
-#: personal/pureftpd/class_pureftpdAccount.inc:118
+#: personal/pureftpd/class_pureftpdAccount.inc:119
 msgid "Miscellaneous"
 msgstr ""
 
-#: personal/pureftpd/class_pureftpdAccount.inc:121
-msgid "Enable FTP access"
-msgstr ""
-
-#: personal/pureftpd/class_pureftpdAccount.inc:121
-msgid "Enable or disable FTP access"
+#: personal/pureftpd/class_pureftpdAccount.inc:122
+#: personal/pureftpd/class_pureftpdAccount.inc:123
+msgid "Temporary disable FTP access"
 msgstr ""
diff --git a/pureftpd/locale/vi_VN/fusiondirectory.po b/pureftpd/locale/vi_VN/fusiondirectory.po
index 9e2d6b2dcceba8c87979075e2767ceaf9efae6ad..272870936ee88b82c36f7676f3ea4d4ac7095a0d 100644
--- a/pureftpd/locale/vi_VN/fusiondirectory.po
+++ b/pureftpd/locale/vi_VN/fusiondirectory.po
@@ -5,94 +5,91 @@
 # Translators:
 msgid ""
 msgstr ""
-"Project-Id-Version: FusionDirectory-108\n"
+"Project-Id-Version: FusionDirectory-109\n"
 "Report-Msgid-Bugs-To: documentation@lists.fusiondirectory.org\n"
-"POT-Creation-Date: 2015-03-31 11:49+0200\n"
-"PO-Revision-Date: 2015-03-31 10:41+0000\n"
-"Last-Translator: fusiondirectory <contact@fusiondirectory.org>\n"
-"Language-Team: Vietnamese (Viet Nam) (http://www.transifex.com/projects/p/FusionDirectory-108/language/vi_VN/)\n"
+"POT-Creation-Date: 2014-12-15 17:47+0100\n"
+"PO-Revision-Date: 2014-08-28 10:29+0000\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: Vietnamese (Viet Nam) (http://www.transifex.com/projects/p/FusionDirectory-109/language/vi_VN/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Language: vi_VN\n"
 "Plural-Forms: nplurals=1; plural=0;\n"
 
-#: personal/pureftpd/class_pureftpdAccount.inc:33
+#: personal/pureftpd/class_pureftpdAccount.inc:34
 msgid "Ftp"
 msgstr ""
 
-#: personal/pureftpd/class_pureftpdAccount.inc:34
+#: personal/pureftpd/class_pureftpdAccount.inc:35
 msgid "Pure ftp account"
 msgstr ""
 
-#: personal/pureftpd/class_pureftpdAccount.inc:34
+#: personal/pureftpd/class_pureftpdAccount.inc:35
 msgid "Connectivity addon"
 msgstr ""
 
-#: personal/pureftpd/class_pureftpdAccount.inc:49
+#: personal/pureftpd/class_pureftpdAccount.inc:50
 msgid "Bandwidth"
 msgstr ""
 
-#: personal/pureftpd/class_pureftpdAccount.inc:52
 #: personal/pureftpd/class_pureftpdAccount.inc:53
+#: personal/pureftpd/class_pureftpdAccount.inc:54
 msgid "Upload bandwidth"
 msgstr ""
 
-#: personal/pureftpd/class_pureftpdAccount.inc:52
-#: personal/pureftpd/class_pureftpdAccount.inc:61
+#: personal/pureftpd/class_pureftpdAccount.inc:53
+#: personal/pureftpd/class_pureftpdAccount.inc:62
 msgid " (kb/sec)"
 msgstr ""
 
-#: personal/pureftpd/class_pureftpdAccount.inc:61
+#: personal/pureftpd/class_pureftpdAccount.inc:62
 msgid "Download bandwidth"
 msgstr ""
 
-#: personal/pureftpd/class_pureftpdAccount.inc:62
+#: personal/pureftpd/class_pureftpdAccount.inc:63
 msgid "Download bandwidth in kb/sec"
 msgstr ""
 
-#: personal/pureftpd/class_pureftpdAccount.inc:72
+#: personal/pureftpd/class_pureftpdAccount.inc:73
 msgid "Ratio"
 msgstr ""
 
-#: personal/pureftpd/class_pureftpdAccount.inc:75
 #: personal/pureftpd/class_pureftpdAccount.inc:76
+#: personal/pureftpd/class_pureftpdAccount.inc:77
 msgid "Uploaded files"
 msgstr ""
 
-#: personal/pureftpd/class_pureftpdAccount.inc:84
 #: personal/pureftpd/class_pureftpdAccount.inc:85
+#: personal/pureftpd/class_pureftpdAccount.inc:86
 msgid "Downloaded files"
 msgstr ""
 
-#: personal/pureftpd/class_pureftpdAccount.inc:98
+#: personal/pureftpd/class_pureftpdAccount.inc:99
 msgid "Files"
 msgstr ""
 
-#: personal/pureftpd/class_pureftpdAccount.inc:99
+#: personal/pureftpd/class_pureftpdAccount.inc:100
 msgid "Quota files"
 msgstr ""
 
-#: personal/pureftpd/class_pureftpdAccount.inc:107
+#: personal/pureftpd/class_pureftpdAccount.inc:108
 msgid "Size"
 msgstr ""
 
-#: personal/pureftpd/class_pureftpdAccount.inc:107
+#: personal/pureftpd/class_pureftpdAccount.inc:108
 msgid " (MB)"
 msgstr ""
 
-#: personal/pureftpd/class_pureftpdAccount.inc:108
+#: personal/pureftpd/class_pureftpdAccount.inc:109
 msgid "Files size"
 msgstr ""
 
-#: personal/pureftpd/class_pureftpdAccount.inc:118
+#: personal/pureftpd/class_pureftpdAccount.inc:119
 msgid "Miscellaneous"
 msgstr ""
 
-#: personal/pureftpd/class_pureftpdAccount.inc:121
-msgid "Enable FTP access"
-msgstr ""
-
-#: personal/pureftpd/class_pureftpdAccount.inc:121
-msgid "Enable or disable FTP access"
+#: personal/pureftpd/class_pureftpdAccount.inc:122
+#: personal/pureftpd/class_pureftpdAccount.inc:123
+msgid "Temporary disable FTP access"
 msgstr ""
diff --git a/pureftpd/locale/zh/fusiondirectory.po b/pureftpd/locale/zh/fusiondirectory.po
index 82bb9060f54b2b050767f41073b46c7f13661213..2e51ff016e4d327126415eb5bb219b019f0c7311 100644
--- a/pureftpd/locale/zh/fusiondirectory.po
+++ b/pureftpd/locale/zh/fusiondirectory.po
@@ -3,97 +3,93 @@
 # This file is distributed under the same license as the PACKAGE package.
 # 
 # Translators:
-#  Jiang Xin <worldhello.net@gmail.com>, 2007
 msgid ""
 msgstr ""
-"Project-Id-Version: FusionDirectory-108\n"
+"Project-Id-Version: FusionDirectory-109\n"
 "Report-Msgid-Bugs-To: documentation@lists.fusiondirectory.org\n"
-"POT-Creation-Date: 2015-03-31 11:49+0200\n"
-"PO-Revision-Date: 2015-03-31 10:41+0000\n"
-"Last-Translator: fusiondirectory <contact@fusiondirectory.org>\n"
-"Language-Team: Chinese (http://www.transifex.com/projects/p/FusionDirectory-108/language/zh/)\n"
+"POT-Creation-Date: 2014-12-15 17:47+0100\n"
+"PO-Revision-Date: 2014-08-28 10:29+0000\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: Chinese (http://www.transifex.com/projects/p/FusionDirectory-109/language/zh/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Language: zh\n"
 "Plural-Forms: nplurals=1; plural=0;\n"
 
-#: personal/pureftpd/class_pureftpdAccount.inc:33
+#: personal/pureftpd/class_pureftpdAccount.inc:34
 msgid "Ftp"
 msgstr ""
 
-#: personal/pureftpd/class_pureftpdAccount.inc:34
+#: personal/pureftpd/class_pureftpdAccount.inc:35
 msgid "Pure ftp account"
 msgstr ""
 
-#: personal/pureftpd/class_pureftpdAccount.inc:34
+#: personal/pureftpd/class_pureftpdAccount.inc:35
 msgid "Connectivity addon"
 msgstr ""
 
-#: personal/pureftpd/class_pureftpdAccount.inc:49
+#: personal/pureftpd/class_pureftpdAccount.inc:50
 msgid "Bandwidth"
 msgstr "å¸¦å®½"
 
-#: personal/pureftpd/class_pureftpdAccount.inc:52
 #: personal/pureftpd/class_pureftpdAccount.inc:53
+#: personal/pureftpd/class_pureftpdAccount.inc:54
 msgid "Upload bandwidth"
 msgstr "ä¸Šä¼ å¸¦å®½"
 
-#: personal/pureftpd/class_pureftpdAccount.inc:52
-#: personal/pureftpd/class_pureftpdAccount.inc:61
+#: personal/pureftpd/class_pureftpdAccount.inc:53
+#: personal/pureftpd/class_pureftpdAccount.inc:62
 msgid " (kb/sec)"
 msgstr ""
 
-#: personal/pureftpd/class_pureftpdAccount.inc:61
+#: personal/pureftpd/class_pureftpdAccount.inc:62
 msgid "Download bandwidth"
 msgstr "ä¸‹è½½å¸¦å®½"
 
-#: personal/pureftpd/class_pureftpdAccount.inc:62
+#: personal/pureftpd/class_pureftpdAccount.inc:63
 msgid "Download bandwidth in kb/sec"
 msgstr ""
 
-#: personal/pureftpd/class_pureftpdAccount.inc:72
+#: personal/pureftpd/class_pureftpdAccount.inc:73
 msgid "Ratio"
 msgstr "æ¯”çŽ‡"
 
-#: personal/pureftpd/class_pureftpdAccount.inc:75
 #: personal/pureftpd/class_pureftpdAccount.inc:76
+#: personal/pureftpd/class_pureftpdAccount.inc:77
 msgid "Uploaded files"
 msgstr ""
 
-#: personal/pureftpd/class_pureftpdAccount.inc:84
 #: personal/pureftpd/class_pureftpdAccount.inc:85
+#: personal/pureftpd/class_pureftpdAccount.inc:86
 msgid "Downloaded files"
 msgstr ""
 
-#: personal/pureftpd/class_pureftpdAccount.inc:98
+#: personal/pureftpd/class_pureftpdAccount.inc:99
 msgid "Files"
 msgstr "æ–‡ä»¶"
 
-#: personal/pureftpd/class_pureftpdAccount.inc:99
+#: personal/pureftpd/class_pureftpdAccount.inc:100
 msgid "Quota files"
 msgstr ""
 
-#: personal/pureftpd/class_pureftpdAccount.inc:107
+#: personal/pureftpd/class_pureftpdAccount.inc:108
 msgid "Size"
 msgstr "å¤§å°"
 
-#: personal/pureftpd/class_pureftpdAccount.inc:107
+#: personal/pureftpd/class_pureftpdAccount.inc:108
 msgid " (MB)"
 msgstr ""
 
-#: personal/pureftpd/class_pureftpdAccount.inc:108
+#: personal/pureftpd/class_pureftpdAccount.inc:109
 msgid "Files size"
 msgstr ""
 
-#: personal/pureftpd/class_pureftpdAccount.inc:118
+#: personal/pureftpd/class_pureftpdAccount.inc:119
 msgid "Miscellaneous"
 msgstr "æ‚é¡¹"
 
-#: personal/pureftpd/class_pureftpdAccount.inc:121
-msgid "Enable FTP access"
-msgstr ""
-
-#: personal/pureftpd/class_pureftpdAccount.inc:121
-msgid "Enable or disable FTP access"
-msgstr ""
+#: personal/pureftpd/class_pureftpdAccount.inc:122
+#: personal/pureftpd/class_pureftpdAccount.inc:123
+msgid "Temporary disable FTP access"
+msgstr "ä¸´æ—¶ç¦ç”¨ FTP è®¿é—®"
diff --git a/quota/locale/ar/fusiondirectory.po b/quota/locale/ar/fusiondirectory.po
index 75ddf5db61077b70f73207291e47f6ea6460ec8a..e807b19d341b7a259d3f2976bc776285b812de90 100644
--- a/quota/locale/ar/fusiondirectory.po
+++ b/quota/locale/ar/fusiondirectory.po
@@ -5,12 +5,12 @@
 # Translators:
 msgid ""
 msgstr ""
-"Project-Id-Version: FusionDirectory-108\n"
+"Project-Id-Version: FusionDirectory-109\n"
 "Report-Msgid-Bugs-To: documentation@lists.fusiondirectory.org\n"
-"POT-Creation-Date: 2015-03-17 18:47+0100\n"
-"PO-Revision-Date: 2015-02-25 16:12+0000\n"
+"POT-Creation-Date: 2014-12-15 17:47+0100\n"
+"PO-Revision-Date: 2015-02-25 16:13+0000\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>\n"
-"Language-Team: Arabic (http://www.transifex.com/projects/p/FusionDirectory-108/language/ar/)\n"
+"Language-Team: Arabic (http://www.transifex.com/projects/p/FusionDirectory-109/language/ar/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
diff --git a/quota/locale/ca/fusiondirectory.po b/quota/locale/ca/fusiondirectory.po
index bb662b13463ab05bc077bdf1f487d21dd12f9164..1b6d3f85dbb41b119c488b4ca084974c4e9c13e1 100644
--- a/quota/locale/ca/fusiondirectory.po
+++ b/quota/locale/ca/fusiondirectory.po
@@ -5,12 +5,12 @@
 # Translators:
 msgid ""
 msgstr ""
-"Project-Id-Version: FusionDirectory-108\n"
+"Project-Id-Version: FusionDirectory-109\n"
 "Report-Msgid-Bugs-To: documentation@lists.fusiondirectory.org\n"
-"POT-Creation-Date: 2015-03-17 18:47+0100\n"
-"PO-Revision-Date: 2015-02-25 16:03+0000\n"
+"POT-Creation-Date: 2014-12-15 17:47+0100\n"
+"PO-Revision-Date: 2015-02-25 16:04+0000\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>\n"
-"Language-Team: Catalan (http://www.transifex.com/projects/p/FusionDirectory-108/language/ca/)\n"
+"Language-Team: Catalan (http://www.transifex.com/projects/p/FusionDirectory-109/language/ca/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
diff --git a/quota/locale/cs_CZ/fusiondirectory.po b/quota/locale/cs_CZ/fusiondirectory.po
index 696f453707aebce5f44c51eadf6f50c8764c2105..715c23d704a31763d33a112b7a8e2317f2aef762 100644
--- a/quota/locale/cs_CZ/fusiondirectory.po
+++ b/quota/locale/cs_CZ/fusiondirectory.po
@@ -3,14 +3,15 @@
 # This file is distributed under the same license as the PACKAGE package.
 # 
 # Translators:
+# Pavel Borecki <pavel.borecki@gmail.com>, 2014-2015
 msgid ""
 msgstr ""
-"Project-Id-Version: FusionDirectory-108\n"
+"Project-Id-Version: FusionDirectory-109\n"
 "Report-Msgid-Bugs-To: documentation@lists.fusiondirectory.org\n"
-"POT-Creation-Date: 2015-03-17 18:47+0100\n"
-"PO-Revision-Date: 2015-02-25 16:12+0000\n"
-"Last-Translator: fusiondirectory <contact@fusiondirectory.org>\n"
-"Language-Team: Czech (Czech Republic) (http://www.transifex.com/projects/p/FusionDirectory-108/language/cs_CZ/)\n"
+"POT-Creation-Date: 2014-12-15 17:47+0100\n"
+"PO-Revision-Date: 2015-04-04 14:22+0000\n"
+"Last-Translator: Pavel Borecki <pavel.borecki@gmail.com>\n"
+"Language-Team: Czech (Czech Republic) (http://www.transifex.com/projects/p/FusionDirectory-109/language/cs_CZ/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -20,80 +21,80 @@ msgstr ""
 #: admin/systems/services/quota/class_serviceQuota.inc:30
 #: admin/systems/services/quota/class_serviceQuota.inc:31
 msgid "Quota service"
-msgstr "sluÅ¾ba kvÃ³t"
+msgstr "SluÅ¾ba kvÃ³t"
 
 #: admin/systems/services/quota/class_serviceQuota.inc:31
 msgid "Services"
-msgstr "sluÅ¾by"
+msgstr "SluÅ¾by"
 
 #: admin/systems/services/quota/class_serviceQuota.inc:43
 msgid "Shares"
-msgstr "sdÃlenÃ"
+msgstr "SdÃlenÃ"
 
 #: admin/systems/services/quota/class_serviceQuota.inc:47
 msgid "Quotas for the shares this server hosts"
-msgstr ""
+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Ã"
+msgstr "ZaÅ™ÃzenÃ"
 
 #: admin/systems/services/quota/class_serviceQuota.inc:51
 msgid "Device concerned by this quota"
-msgstr ""
+msgstr "ZaÅ™ÃzenÃ, kterÃ©ho se tato kvÃ³ta tÃ½kÃ¡"
 
 #: admin/systems/services/quota/class_serviceQuota.inc:55
 msgid "Block size"
-msgstr ""
+msgstr "Velikost bloku"
 
 #: admin/systems/services/quota/class_serviceQuota.inc:55
 msgid "Block size of this share (dumpe2fs /dev/sdb3 | grep -i 'Block size')"
-msgstr ""
+msgstr "Velikost bloku pro toto sdÃlenÃ (dumpe2fs /dev/sdb3 | grep -i 'Block size')"
 
 #: admin/systems/services/quota/class_serviceQuota.inc:60
 msgid "Comment"
-msgstr "komentÃ¡Å™"
+msgstr "KomentÃ¡Å™"
 
 #: admin/systems/services/quota/class_serviceQuota.inc:60
 msgid "Short comment about this quota"
-msgstr ""
+msgstr "StruÄnÃ½ komentÃ¡Å™ k tÃ©to kvÃ³tÄ›"
 
 #: admin/systems/services/quota/class_serviceQuota.inc:73
 msgid "Quota warning message"
-msgstr ""
+msgstr "VarovnÃ¡ zprÃ¡va kvÃ³ty"
 
 #: admin/systems/services/quota/class_serviceQuota.inc:76
 msgid "Charset"
-msgstr "znakovÃ¡ sada"
+msgstr "ZnakovÃ¡ sada"
 
 #: admin/systems/services/quota/class_serviceQuota.inc:76
 msgid "Charset use for the message"
-msgstr ""
+msgstr "ZnakovÃ¡ sada zprÃ¡vy"
 
 #: admin/systems/services/quota/class_serviceQuota.inc:80
 msgid "Mail command"
-msgstr ""
+msgstr "PÅ™Ãkaz pro posÃlÃ¡nÃ e-mailÅ¯"
 
 #: admin/systems/services/quota/class_serviceQuota.inc:80
 msgid "Command allowing the server to send mails"
-msgstr ""
+msgstr "PÅ™Ãkaz, umoÅ¾ÅˆujÃcÃ serveru posÃlat e-maily"
 
 #: admin/systems/services/quota/class_serviceQuota.inc:84
 msgid "Support contact"
-msgstr ""
+msgstr "Kontakt na podporu"
 
 #: admin/systems/services/quota/class_serviceQuota.inc:84
 msgid "Email address to contact the administrator"
-msgstr ""
+msgstr "E-mailovÃ¡ adresa pro kontaktovÃ¡nÃ sprÃ¡vce"
 
 #: admin/systems/services/quota/class_serviceQuota.inc:88
 msgid "From"
-msgstr "od"
+msgstr "Od"
 
 #: admin/systems/services/quota/class_serviceQuota.inc:88
 msgid "Email from which the email is sent"
-msgstr ""
+msgstr "Adresa, ze kterÃ© je e-mail poslÃ¡n"
 
 #: admin/systems/services/quota/class_serviceQuota.inc:92
 msgid "CC"
@@ -101,11 +102,11 @@ msgstr "v kopii poslat i (CC)"
 
 #: admin/systems/services/quota/class_serviceQuota.inc:92
 msgid "Send a copy of this email to"
-msgstr ""
+msgstr "Poslat kopii tohoto e-mailu na"
 
 #: admin/systems/services/quota/class_serviceQuota.inc:96
 msgid "Subject"
-msgstr "pÅ™edmÄ›t"
+msgstr "PÅ™edmÄ›t"
 
 #: admin/systems/services/quota/class_serviceQuota.inc:96
 msgid "Subject of the sent warning email"
@@ -113,23 +114,23 @@ msgstr "PÅ™edmÄ›t zaslanÃ©ho varovnÃ©ho e-mailu"
 
 #: admin/systems/services/quota/class_serviceQuota.inc:100
 msgid "Content"
-msgstr "obsah"
+msgstr "Obsah"
 
 #: admin/systems/services/quota/class_serviceQuota.inc:100
 msgid "Content of the sent email"
-msgstr ""
+msgstr "Obsah odeslanÃ©ho e-mailu"
 
 #: admin/systems/services/quota/class_serviceQuota.inc:104
 msgid "Signature"
-msgstr "podpis"
+msgstr "ZnaÄka"
 
 #: admin/systems/services/quota/class_serviceQuota.inc:104
 msgid "Signature to put at the end of the mail"
-msgstr ""
+msgstr "Podpis na konec e-mailovÃ© zprÃ¡vy"
 
 #: admin/systems/services/quota/class_serviceQuota.inc:110
 msgid "LDAP message support"
-msgstr ""
+msgstr "Podpora LDAP zprÃ¡vy"
 
 #: admin/systems/services/quota/class_serviceQuota.inc:113
 msgid "LDAP server"
@@ -137,73 +138,73 @@ msgstr ""
 
 #: admin/systems/services/quota/class_serviceQuota.inc:113
 msgid "The LDAP server to bind to"
-msgstr ""
+msgstr "LDAP server ke kterÃ©mu se pÅ™ipojit"
 
 #: admin/systems/services/quota/class_serviceQuota.inc:117
 msgid "Bind user dn"
-msgstr ""
+msgstr "RozliÅ¡enÃ© jmÃ©no uÅ¾ivatele, kterÃ½ se pÅ™ipojuje"
 
 #: admin/systems/services/quota/class_serviceQuota.inc:117
 msgid "The user dn to use for bind"
-msgstr ""
+msgstr "RozliÅ¡enÃ© jmÃ©no uÅ¾ivatele, kterÃ½m se spojit"
 
 #: admin/systems/services/quota/class_serviceQuota.inc:121
 msgid "Bind user password"
-msgstr ""
+msgstr "Heslo uÅ¾ivatele, kterÃ½m se pÅ™ihlaÅ¡uje"
 
 #: admin/systems/services/quota/class_serviceQuota.inc:121
 msgid "The password of the user used for bind"
-msgstr ""
+msgstr "Heslo uÅ¾ivatele, pouÅ¾itÃ©ho pro spojenÃ"
 
 #: admin/systems/services/quota/class_serviceQuota.inc:153
 msgid "Warning"
-msgstr "varovÃ¡nÃ"
+msgstr "VarovÃ¡nÃ"
 
 #: admin/systems/services/quota/class_serviceQuota.inc:153
 #, php-format
 msgid "Invalid value in encodings : %s"
-msgstr ""
+msgstr "NeplatnÃ¡ hodnota v kÃ³dovÃ¡nÃ znakÅ¯ : %s"
 
 #: admin/systems/services/quota/class_serviceQuota.inc:170
 #, php-format
 msgid "(%s by %s)"
-msgstr ""
+msgstr "(%s od %s)"
 
 #: personal/quota/class_quotaAccount.inc:101
 msgid "Quota"
-msgstr "kvÃ³ta"
+msgstr "KvÃ³ta"
 
 #: personal/quota/class_quotaAccount.inc:102
 msgid "Plugin for quota support"
-msgstr ""
+msgstr "ZÃ¡suvnÃ½ modul pro kvÃ³ty"
 
 #: personal/quota/class_quotaAccount.inc:120
 msgid "Quota informations"
-msgstr ""
+msgstr "Informace o kvÃ³tÃ¡ch"
 
 #: personal/quota/class_quotaAccount.inc:125
 msgid "Quota informations for this user"
-msgstr ""
+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Ã, pro kterÃ© je tato kvÃ³ta urÄena"
+msgstr "ZaÅ™ÃzenÃ, kterÃ©ho se tato kvÃ³ta tÃ½kÃ¡"
 
 #: personal/quota/class_quotaAccount.inc:133
 msgid "Block soft limit"
-msgstr "varovnÃ½ (â€žmÄ›kkÃ½â€œ) limit poÄtu zabranÃ½ch blokÅ¯"
+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 ""
+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:138
 msgid "Block hard limit"
-msgstr "nepÅ™ekroÄitelnÃ½ (â€žtvrdÃ½â€œ) limit poÄtu zabranÃ½ch blokÅ¯"
+msgstr "NepÅ™ekroÄitelnÃ¡ hranice poÄtu zabranÃ½ch blokÅ¯"
 
 #: personal/quota/class_quotaAccount.inc:138
 msgid "Hard limit for the block the user can use"
-msgstr ""
+msgstr "NepÅ™ekroÄitelnÃ¡ hranice poÄtu blokÅ¯, kterÃ© uÅ¾ivatel mÅ¯Å¾e vyuÅ¾Ãt"
 
 #: personal/quota/class_quotaAccount.inc:143
 msgid "Inode soft limit"
@@ -211,7 +212,7 @@ msgstr "varovnÃ½ (â€žmÄ›kkÃ½â€œ) limit poÄtu souborÅ¯ a sloÅ¾ek (i-uzlÅ¯)"
 
 #: personal/quota/class_quotaAccount.inc:143
 msgid "Soft limit for the inodes the user can use"
-msgstr ""
+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:148
 msgid "Inode hard limit"
@@ -219,12 +220,12 @@ msgstr "nepÅ™ekroÄitelnÃ½ (â€žtvrdÃ½â€œ) limit poÄtu souborÅ¯ a sloÅ¾ek (i-uzl
 
 #: personal/quota/class_quotaAccount.inc:148
 msgid "Hard limit for the inodes the user can use"
-msgstr ""
+msgstr "NepÅ™ekroÄitelnÃ¡ hranice poÄtu i-uzlÅ¯, kterÃ© uÅ¾ivatel mÅ¯Å¾e vyuÅ¾Ãt"
 
 #: personal/quota/class_quotaAccount.inc:153
 msgid "Server"
-msgstr "server"
+msgstr "Server"
 
 #: personal/quota/class_quotaAccount.inc:153
 msgid "Server hosting the device this quota is for"
-msgstr ""
+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 53c7f656c34f90d9b88b5a99631bc12f417604d5..7a013736116be1dc5eb083d97e218f8eb3748dbb 100644
--- a/quota/locale/de/fusiondirectory.po
+++ b/quota/locale/de/fusiondirectory.po
@@ -3,14 +3,15 @@
 # This file is distributed under the same license as the PACKAGE package.
 # 
 # Translators:
+# Ettore Atalan <atalanttore@googlemail.com>, 2014-2015
 msgid ""
 msgstr ""
-"Project-Id-Version: FusionDirectory-108\n"
+"Project-Id-Version: FusionDirectory-109\n"
 "Report-Msgid-Bugs-To: documentation@lists.fusiondirectory.org\n"
-"POT-Creation-Date: 2015-03-17 18:47+0100\n"
-"PO-Revision-Date: 2015-02-25 16:12+0000\n"
-"Last-Translator: fusiondirectory <contact@fusiondirectory.org>\n"
-"Language-Team: German (http://www.transifex.com/projects/p/FusionDirectory-108/language/de/)\n"
+"POT-Creation-Date: 2014-12-15 17:47+0100\n"
+"PO-Revision-Date: 2015-04-23 15:20+0000\n"
+"Last-Translator: Ettore Atalan <atalanttore@googlemail.com>\n"
+"Language-Team: German (http://www.transifex.com/projects/p/FusionDirectory-109/language/de/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -20,7 +21,7 @@ msgstr ""
 #: admin/systems/services/quota/class_serviceQuota.inc:30
 #: admin/systems/services/quota/class_serviceQuota.inc:31
 msgid "Quota service"
-msgstr ""
+msgstr "Kontingentdienst"
 
 #: admin/systems/services/quota/class_serviceQuota.inc:31
 msgid "Services"
@@ -61,7 +62,7 @@ msgstr ""
 
 #: admin/systems/services/quota/class_serviceQuota.inc:73
 msgid "Quota warning message"
-msgstr ""
+msgstr "Kontingentwarnmeldung"
 
 #: admin/systems/services/quota/class_serviceQuota.inc:76
 msgid "Charset"
@@ -117,7 +118,7 @@ msgstr "Inhalt"
 
 #: admin/systems/services/quota/class_serviceQuota.inc:100
 msgid "Content of the sent email"
-msgstr ""
+msgstr "Inhalt der gesendeten E-Mail"
 
 #: admin/systems/services/quota/class_serviceQuota.inc:104
 msgid "Signature"
@@ -179,7 +180,7 @@ msgstr ""
 
 #: personal/quota/class_quotaAccount.inc:120
 msgid "Quota informations"
-msgstr ""
+msgstr "Kontingentinformationen"
 
 #: personal/quota/class_quotaAccount.inc:125
 msgid "Quota informations for this user"
diff --git a/quota/locale/el_GR/fusiondirectory.po b/quota/locale/el_GR/fusiondirectory.po
new file mode 100644
index 0000000000000000000000000000000000000000..b3026d1d6ec732815dbfa793c09a0d5c7a41ab34
--- /dev/null
+++ b/quota/locale/el_GR/fusiondirectory.po
@@ -0,0 +1,230 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR FusionDirectory Project
+# This file is distributed under the same license as the PACKAGE package.
+# 
+# Translators:
+msgid ""
+msgstr ""
+"Project-Id-Version: FusionDirectory-109\n"
+"Report-Msgid-Bugs-To: documentation@lists.fusiondirectory.org\n"
+"POT-Creation-Date: 2014-12-15 17:47+0100\n"
+"PO-Revision-Date: 2015-05-30 11:45+0000\n"
+"Last-Translator: Benoit Mortier <benoit.mortier@opensides.be>\n"
+"Language-Team: Greek (Greece) (http://www.transifex.com/projects/p/FusionDirectory-109/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/services/quota/class_serviceQuota.inc:30
+#: admin/systems/services/quota/class_serviceQuota.inc:31
+msgid "Quota service"
+msgstr ""
+
+#: admin/systems/services/quota/class_serviceQuota.inc:31
+msgid "Services"
+msgstr ""
+
+#: admin/systems/services/quota/class_serviceQuota.inc:43
+msgid "Shares"
+msgstr ""
+
+#: admin/systems/services/quota/class_serviceQuota.inc:47
+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 ""
+
+#: admin/systems/services/quota/class_serviceQuota.inc:55
+msgid "Block size"
+msgstr ""
+
+#: admin/systems/services/quota/class_serviceQuota.inc:55
+msgid "Block size of this share (dumpe2fs /dev/sdb3 | grep -i 'Block size')"
+msgstr ""
+
+#: admin/systems/services/quota/class_serviceQuota.inc:60
+msgid "Comment"
+msgstr ""
+
+#: admin/systems/services/quota/class_serviceQuota.inc:60
+msgid "Short comment about this quota"
+msgstr ""
+
+#: admin/systems/services/quota/class_serviceQuota.inc:73
+msgid "Quota warning message"
+msgstr ""
+
+#: admin/systems/services/quota/class_serviceQuota.inc:76
+msgid "Charset"
+msgstr ""
+
+#: admin/systems/services/quota/class_serviceQuota.inc:76
+msgid "Charset use for the message"
+msgstr ""
+
+#: admin/systems/services/quota/class_serviceQuota.inc:80
+msgid "Mail command"
+msgstr ""
+
+#: admin/systems/services/quota/class_serviceQuota.inc:80
+msgid "Command allowing the server to send mails"
+msgstr ""
+
+#: admin/systems/services/quota/class_serviceQuota.inc:84
+msgid "Support contact"
+msgstr ""
+
+#: admin/systems/services/quota/class_serviceQuota.inc:84
+msgid "Email address to contact the administrator"
+msgstr ""
+
+#: admin/systems/services/quota/class_serviceQuota.inc:88
+msgid "From"
+msgstr ""
+
+#: admin/systems/services/quota/class_serviceQuota.inc:88
+msgid "Email from which the email is sent"
+msgstr ""
+
+#: admin/systems/services/quota/class_serviceQuota.inc:92
+msgid "CC"
+msgstr ""
+
+#: admin/systems/services/quota/class_serviceQuota.inc:92
+msgid "Send a copy of this email to"
+msgstr ""
+
+#: admin/systems/services/quota/class_serviceQuota.inc:96
+msgid "Subject"
+msgstr ""
+
+#: admin/systems/services/quota/class_serviceQuota.inc:96
+msgid "Subject of the sent warning email"
+msgstr ""
+
+#: admin/systems/services/quota/class_serviceQuota.inc:100
+msgid "Content"
+msgstr ""
+
+#: admin/systems/services/quota/class_serviceQuota.inc:100
+msgid "Content of the sent email"
+msgstr ""
+
+#: admin/systems/services/quota/class_serviceQuota.inc:104
+msgid "Signature"
+msgstr ""
+
+#: admin/systems/services/quota/class_serviceQuota.inc:104
+msgid "Signature to put at the end of the mail"
+msgstr ""
+
+#: admin/systems/services/quota/class_serviceQuota.inc:110
+msgid "LDAP message support"
+msgstr ""
+
+#: admin/systems/services/quota/class_serviceQuota.inc:113
+msgid "LDAP server"
+msgstr ""
+
+#: admin/systems/services/quota/class_serviceQuota.inc:113
+msgid "The LDAP server to bind to"
+msgstr ""
+
+#: admin/systems/services/quota/class_serviceQuota.inc:117
+msgid "Bind user dn"
+msgstr ""
+
+#: admin/systems/services/quota/class_serviceQuota.inc:117
+msgid "The user dn to use for bind"
+msgstr ""
+
+#: admin/systems/services/quota/class_serviceQuota.inc:121
+msgid "Bind user password"
+msgstr ""
+
+#: admin/systems/services/quota/class_serviceQuota.inc:121
+msgid "The password of the user used for bind"
+msgstr ""
+
+#: admin/systems/services/quota/class_serviceQuota.inc:153
+msgid "Warning"
+msgstr ""
+
+#: admin/systems/services/quota/class_serviceQuota.inc:153
+#, php-format
+msgid "Invalid value in encodings : %s"
+msgstr ""
+
+#: admin/systems/services/quota/class_serviceQuota.inc:170
+#, 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:138
+msgid "Block hard limit"
+msgstr ""
+
+#: personal/quota/class_quotaAccount.inc:138
+msgid "Hard limit for the block the user can use"
+msgstr ""
+
+#: personal/quota/class_quotaAccount.inc:143
+msgid "Inode soft limit"
+msgstr ""
+
+#: personal/quota/class_quotaAccount.inc:143
+msgid "Soft limit for the inodes the user can use"
+msgstr ""
+
+#: personal/quota/class_quotaAccount.inc:148
+msgid "Inode hard limit"
+msgstr ""
+
+#: personal/quota/class_quotaAccount.inc:148
+msgid "Hard limit for the inodes the user can use"
+msgstr ""
+
+#: personal/quota/class_quotaAccount.inc:153
+msgid "Server"
+msgstr ""
+
+#: personal/quota/class_quotaAccount.inc:153
+msgid "Server hosting the device this quota is for"
+msgstr ""
diff --git a/quota/locale/en/fusiondirectory.po b/quota/locale/en/fusiondirectory.po
index 52181c5ddc1a3adfcc5f2d8c06c22b89d109c93b..7236f304d3476ce4260e352886aac0483b7da0a1 100644
--- a/quota/locale/en/fusiondirectory.po
+++ b/quota/locale/en/fusiondirectory.po
@@ -6,13 +6,13 @@
 #, fuzzy
 msgid ""
 msgstr ""
-"Project-Id-Version: PACKAGE VERSION\n"
-"Report-Msgid-Bugs-To: documentation@lists.fusiondirectory.org\n"
-"POT-Creation-Date: 2015-03-31 11:49+0200\n"
+"Project-Id-Version: FusionDirectory VERSION\n"
+"Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
+"POT-Creation-Date: 2015-05-30 15:30+0200\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
-"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
-"Language-Team: LANGUAGE <LL@li.org>\n"
-"Language: \n"
+"Last-Translator: FusionDirectory project <contact@fusiondirectory.org>\n"
+"Language-Team: English\n"
+"Language: en\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
diff --git a/quota/locale/es/fusiondirectory.po b/quota/locale/es/fusiondirectory.po
index d8312d03cfa78355fb224c73e8acdc30db224ac5..ac83844a5e9e36eaab754365bf629f7b954e4ba0 100644
--- a/quota/locale/es/fusiondirectory.po
+++ b/quota/locale/es/fusiondirectory.po
@@ -5,12 +5,12 @@
 # Translators:
 msgid ""
 msgstr ""
-"Project-Id-Version: FusionDirectory-108\n"
+"Project-Id-Version: FusionDirectory-109\n"
 "Report-Msgid-Bugs-To: documentation@lists.fusiondirectory.org\n"
-"POT-Creation-Date: 2015-03-17 18:47+0100\n"
-"PO-Revision-Date: 2015-02-25 16:12+0000\n"
+"POT-Creation-Date: 2014-12-15 17:47+0100\n"
+"PO-Revision-Date: 2015-02-25 16:13+0000\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>\n"
-"Language-Team: Spanish (http://www.transifex.com/projects/p/FusionDirectory-108/language/es/)\n"
+"Language-Team: Spanish (http://www.transifex.com/projects/p/FusionDirectory-109/language/es/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
diff --git a/quota/locale/es_VE/fusiondirectory.po b/quota/locale/es_VE/fusiondirectory.po
index 7b3c7e922e1cec296696968a403cb3be4a919f5d..2a7a2064d1471bed7fe3b120ba041928f0cc3787 100644
--- a/quota/locale/es_VE/fusiondirectory.po
+++ b/quota/locale/es_VE/fusiondirectory.po
@@ -5,12 +5,12 @@
 # Translators:
 msgid ""
 msgstr ""
-"Project-Id-Version: FusionDirectory-108\n"
+"Project-Id-Version: FusionDirectory-109\n"
 "Report-Msgid-Bugs-To: documentation@lists.fusiondirectory.org\n"
-"POT-Creation-Date: 2015-03-17 18:47+0100\n"
-"PO-Revision-Date: 2015-02-25 16:12+0000\n"
+"POT-Creation-Date: 2014-12-15 17:47+0100\n"
+"PO-Revision-Date: 2015-02-25 16:13+0000\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>\n"
-"Language-Team: Spanish (Venezuela) (http://www.transifex.com/projects/p/FusionDirectory-108/language/es_VE/)\n"
+"Language-Team: Spanish (Venezuela) (http://www.transifex.com/projects/p/FusionDirectory-109/language/es_VE/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
diff --git a/quota/locale/fa_IR/fusiondirectory.po b/quota/locale/fa_IR/fusiondirectory.po
index bcd56230680f44368ad5af3e4c0fc5f99adf846c..501ba99b5479e92f314162cc9180d2bc91d5237c 100644
--- a/quota/locale/fa_IR/fusiondirectory.po
+++ b/quota/locale/fa_IR/fusiondirectory.po
@@ -5,12 +5,12 @@
 # Translators:
 msgid ""
 msgstr ""
-"Project-Id-Version: FusionDirectory-108\n"
+"Project-Id-Version: FusionDirectory-109\n"
 "Report-Msgid-Bugs-To: documentation@lists.fusiondirectory.org\n"
-"POT-Creation-Date: 2015-03-17 18:47+0100\n"
-"PO-Revision-Date: 2014-12-03 16:46+0000\n"
+"POT-Creation-Date: 2014-12-15 17:47+0100\n"
+"PO-Revision-Date: 2014-12-15 17:02+0000\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>\n"
-"Language-Team: Persian (Iran) (http://www.transifex.com/projects/p/FusionDirectory-108/language/fa_IR/)\n"
+"Language-Team: Persian (Iran) (http://www.transifex.com/projects/p/FusionDirectory-109/language/fa_IR/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
diff --git a/quota/locale/fr/fusiondirectory.po b/quota/locale/fr/fusiondirectory.po
index 8d0eeafe9a4f1e247068c8dd4a648659b2ebd873..f5ae4075f12bad15830062b04fe42e1a4eca5c76 100644
--- a/quota/locale/fr/fusiondirectory.po
+++ b/quota/locale/fr/fusiondirectory.po
@@ -3,20 +3,14 @@
 # This file is distributed under the same license as the PACKAGE package.
 # 
 # Translators:
-# gallak <antoine.gallavardin@free.fr>, 2013
-# MCMic, 2014
-# fusiondirectory <contact@fusiondirectory.org>, 2012
-# fusiondirectory <contact@fusiondirectory.org>, 2012
-# gallak <antoine.gallavardin@free.fr>, 2013
-# MCMic, 2014
 msgid ""
 msgstr ""
-"Project-Id-Version: FusionDirectory-108\n"
+"Project-Id-Version: FusionDirectory-109\n"
 "Report-Msgid-Bugs-To: documentation@lists.fusiondirectory.org\n"
-"POT-Creation-Date: 2015-03-17 18:47+0100\n"
-"PO-Revision-Date: 2015-02-25 16:12+0000\n"
-"Last-Translator: MCMic\n"
-"Language-Team: French (http://www.transifex.com/projects/p/FusionDirectory-108/language/fr/)\n"
+"POT-Creation-Date: 2014-12-15 17:47+0100\n"
+"PO-Revision-Date: 2015-02-25 16:13+0000\n"
+"Last-Translator: fusiondirectory <contact@fusiondirectory.org>\n"
+"Language-Team: French (http://www.transifex.com/projects/p/FusionDirectory-109/language/fr/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -30,7 +24,7 @@ msgstr "Service Quota"
 
 #: admin/systems/services/quota/class_serviceQuota.inc:31
 msgid "Services"
-msgstr "Services"
+msgstr "Service"
 
 #: admin/systems/services/quota/class_serviceQuota.inc:43
 msgid "Shares"
@@ -38,12 +32,12 @@ msgstr "Partages"
 
 #: admin/systems/services/quota/class_serviceQuota.inc:47
 msgid "Quotas for the shares this server hosts"
-msgstr "Quota pour les partages fournis par ce serveur"
+msgstr "Quota pour le partage fourni par ce server"
 
 #: admin/systems/services/quota/class_serviceQuota.inc:51
 #: personal/quota/class_quotaAccount.inc:129
 msgid "Device"
-msgstr "PÃ©riphÃ©rique"
+msgstr "Partition"
 
 #: admin/systems/services/quota/class_serviceQuota.inc:51
 msgid "Device concerned by this quota"
@@ -59,7 +53,7 @@ msgstr "Taille de blocs appliquÃ©e pour ce partage (faire dumpe2fs <device> | gr
 
 #: admin/systems/services/quota/class_serviceQuota.inc:60
 msgid "Comment"
-msgstr "Commentaire"
+msgstr "Commentaires"
 
 #: admin/systems/services/quota/class_serviceQuota.inc:60
 msgid "Short comment about this quota"
@@ -67,7 +61,7 @@ msgstr "Commentaire sur ce quota"
 
 #: admin/systems/services/quota/class_serviceQuota.inc:73
 msgid "Quota warning message"
-msgstr "Message d'avertissement du quota"
+msgstr "Message d'avertissement sur le dÃ©passement du quota"
 
 #: admin/systems/services/quota/class_serviceQuota.inc:76
 msgid "Charset"
@@ -79,11 +73,11 @@ msgstr "Encodage utilisÃ© pour le message"
 
 #: admin/systems/services/quota/class_serviceQuota.inc:80
 msgid "Mail command"
-msgstr "Commande de courriel"
+msgstr "Commande de messagerie"
 
 #: admin/systems/services/quota/class_serviceQuota.inc:80
 msgid "Command allowing the server to send mails"
-msgstr "Commande permettant au serveur d'envoyer des courriels"
+msgstr "Commande permettant au serveur d'envoyer les messages"
 
 #: admin/systems/services/quota/class_serviceQuota.inc:84
 msgid "Support contact"
@@ -91,7 +85,7 @@ msgstr "Contact du support"
 
 #: admin/systems/services/quota/class_serviceQuota.inc:84
 msgid "Email address to contact the administrator"
-msgstr "Adresse de courriel pour contacter l'administrateur"
+msgstr "Adresse Mail pour contacter l'administrateur"
 
 #: admin/systems/services/quota/class_serviceQuota.inc:88
 msgid "From"
@@ -99,7 +93,7 @@ msgstr "Depuis"
 
 #: admin/systems/services/quota/class_serviceQuota.inc:88
 msgid "Email from which the email is sent"
-msgstr "Adresse depuis laquelle les courriels seront envoyÃ©s"
+msgstr "Adresse de messagerie depuis laquelle les messages seront envoyÃ©s"
 
 #: admin/systems/services/quota/class_serviceQuota.inc:92
 msgid "CC"
@@ -107,7 +101,7 @@ msgstr "CC"
 
 #: admin/systems/services/quota/class_serviceQuota.inc:92
 msgid "Send a copy of this email to"
-msgstr "Envoyer une copie Ã  "
+msgstr "Envoyer une copie du message Ã  "
 
 #: admin/systems/services/quota/class_serviceQuota.inc:96
 msgid "Subject"
@@ -115,7 +109,7 @@ msgstr "Sujet"
 
 #: admin/systems/services/quota/class_serviceQuota.inc:96
 msgid "Subject of the sent warning email"
-msgstr "Sujet du courriel d'alerte envoyÃ©"
+msgstr "Sujet du mail d'alerte envoyÃ©"
 
 #: admin/systems/services/quota/class_serviceQuota.inc:100
 msgid "Content"
@@ -123,7 +117,7 @@ msgstr "Contenu"
 
 #: admin/systems/services/quota/class_serviceQuota.inc:100
 msgid "Content of the sent email"
-msgstr "Contenu du courriel envoyÃ©"
+msgstr "Contenu du mail envoyÃ©"
 
 #: admin/systems/services/quota/class_serviceQuota.inc:104
 msgid "Signature"
@@ -131,11 +125,11 @@ msgstr "Signature"
 
 #: admin/systems/services/quota/class_serviceQuota.inc:104
 msgid "Signature to put at the end of the mail"
-msgstr "Signature de fin de courriel"
+msgstr "Signature de fin de message"
 
 #: admin/systems/services/quota/class_serviceQuota.inc:110
 msgid "LDAP message support"
-msgstr "Support des messages LDAP"
+msgstr "Support LDAP d'envoi des messages"
 
 #: admin/systems/services/quota/class_serviceQuota.inc:113
 msgid "LDAP server"
@@ -147,7 +141,7 @@ msgstr "Serveur LDAP sur lequel se connecter"
 
 #: admin/systems/services/quota/class_serviceQuota.inc:117
 msgid "Bind user dn"
-msgstr "DN de connexion"
+msgstr "Compte de connexion"
 
 #: admin/systems/services/quota/class_serviceQuota.inc:117
 msgid "The user dn to use for bind"
@@ -168,7 +162,7 @@ msgstr "Avertissement"
 #: admin/systems/services/quota/class_serviceQuota.inc:153
 #, php-format
 msgid "Invalid value in encodings : %s"
-msgstr "Valeur d'encodage invalideâ€¯: %s"
+msgstr "Valeur d'encodage invalide: %s"
 
 #: admin/systems/services/quota/class_serviceQuota.inc:170
 #, php-format
@@ -181,7 +175,7 @@ msgstr "Quota"
 
 #: personal/quota/class_quotaAccount.inc:102
 msgid "Plugin for quota support"
-msgstr "Gestion des quotas utilisateurs"
+msgstr "Gestion des quota utilisateurs"
 
 #: personal/quota/class_quotaAccount.inc:120
 msgid "Quota informations"
diff --git a/quota/locale/id/fusiondirectory.po b/quota/locale/id/fusiondirectory.po
index 650829a9ab86044b4fa03bdef65622ecf88db76b..dcc10f57ad210d0c6a835e75e9849a995dbb4f13 100644
--- a/quota/locale/id/fusiondirectory.po
+++ b/quota/locale/id/fusiondirectory.po
@@ -5,12 +5,12 @@
 # Translators:
 msgid ""
 msgstr ""
-"Project-Id-Version: FusionDirectory-108\n"
+"Project-Id-Version: FusionDirectory-109\n"
 "Report-Msgid-Bugs-To: documentation@lists.fusiondirectory.org\n"
-"POT-Creation-Date: 2015-03-17 18:47+0100\n"
-"PO-Revision-Date: 2014-12-03 16:46+0000\n"
+"POT-Creation-Date: 2014-12-15 17:47+0100\n"
+"PO-Revision-Date: 2014-12-15 17:02+0000\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>\n"
-"Language-Team: Indonesian (http://www.transifex.com/projects/p/FusionDirectory-108/language/id/)\n"
+"Language-Team: Indonesian (http://www.transifex.com/projects/p/FusionDirectory-109/language/id/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
diff --git a/quota/locale/it/fusiondirectory.po b/quota/locale/it/fusiondirectory.po
index f77e225f56ee2c734b2dca14cf39af185a25937a..94b5cfe5d4e6c32c7d87edcd18fe020cdda53b29 100644
--- a/quota/locale/it/fusiondirectory.po
+++ b/quota/locale/it/fusiondirectory.po
@@ -3,17 +3,14 @@
 # This file is distributed under the same license as the PACKAGE package.
 # 
 # Translators:
-# poterealpopolo <giuliano@opensides.be>, 2013
-# poterealpopolo <giuliano@opensides.be>, 2012
-# poterealpopolo <giuliano@opensides.be>, 2012-2013
 msgid ""
 msgstr ""
-"Project-Id-Version: FusionDirectory-108\n"
+"Project-Id-Version: FusionDirectory-109\n"
 "Report-Msgid-Bugs-To: documentation@lists.fusiondirectory.org\n"
-"POT-Creation-Date: 2015-03-17 18:47+0100\n"
-"PO-Revision-Date: 2015-02-25 16:12+0000\n"
+"POT-Creation-Date: 2014-12-15 17:47+0100\n"
+"PO-Revision-Date: 2015-02-25 16:13+0000\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>\n"
-"Language-Team: Italian (http://www.transifex.com/projects/p/FusionDirectory-108/language/it/)\n"
+"Language-Team: Italian (http://www.transifex.com/projects/p/FusionDirectory-109/language/it/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
diff --git a/quota/locale/lv/fusiondirectory.po b/quota/locale/lv/fusiondirectory.po
index 46aa0b07478536fa8aeb74be1e126b417195dd1b..4fc994650bf991b12d7dcad4886021a0a68ba447 100644
--- a/quota/locale/lv/fusiondirectory.po
+++ b/quota/locale/lv/fusiondirectory.po
@@ -5,12 +5,12 @@
 # Translators:
 msgid ""
 msgstr ""
-"Project-Id-Version: FusionDirectory-108\n"
+"Project-Id-Version: FusionDirectory-109\n"
 "Report-Msgid-Bugs-To: documentation@lists.fusiondirectory.org\n"
-"POT-Creation-Date: 2015-03-17 18:47+0100\n"
-"PO-Revision-Date: 2014-12-03 16:46+0000\n"
+"POT-Creation-Date: 2014-12-15 17:47+0100\n"
+"PO-Revision-Date: 2014-12-15 17:02+0000\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>\n"
-"Language-Team: Latvian (http://www.transifex.com/projects/p/FusionDirectory-108/language/lv/)\n"
+"Language-Team: Latvian (http://www.transifex.com/projects/p/FusionDirectory-109/language/lv/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
diff --git a/quota/locale/nb/fusiondirectory.po b/quota/locale/nb/fusiondirectory.po
index da003e01771a8bf4dab26f534e1fcff076c2dfdb..e9e1473f4d1390c7038aa0a99d9570dffc504b1c 100644
--- a/quota/locale/nb/fusiondirectory.po
+++ b/quota/locale/nb/fusiondirectory.po
@@ -5,12 +5,12 @@
 # Translators:
 msgid ""
 msgstr ""
-"Project-Id-Version: FusionDirectory-108\n"
+"Project-Id-Version: FusionDirectory-109\n"
 "Report-Msgid-Bugs-To: documentation@lists.fusiondirectory.org\n"
-"POT-Creation-Date: 2015-03-17 18:47+0100\n"
-"PO-Revision-Date: 2015-02-25 16:12+0000\n"
+"POT-Creation-Date: 2014-12-15 17:47+0100\n"
+"PO-Revision-Date: 2015-02-25 16:13+0000\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>\n"
-"Language-Team: Norwegian BokmÃ¥l (http://www.transifex.com/projects/p/FusionDirectory-108/language/nb/)\n"
+"Language-Team: Norwegian BokmÃ¥l (http://www.transifex.com/projects/p/FusionDirectory-109/language/nb/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
diff --git a/quota/locale/nl/fusiondirectory.po b/quota/locale/nl/fusiondirectory.po
index 1fcd5fb00bd7f512d4c38b965dab3909eac16ff0..5362274b0a6516d3be04aa69584626cca727357f 100644
--- a/quota/locale/nl/fusiondirectory.po
+++ b/quota/locale/nl/fusiondirectory.po
@@ -3,16 +3,14 @@
 # This file is distributed under the same license as the PACKAGE package.
 # 
 # Translators:
-# Christophe Augello <christophe@augello.be>, 2012
-# Kenny Tordeurs <tordeurskenny@gmail.com>, 2012
 msgid ""
 msgstr ""
-"Project-Id-Version: FusionDirectory-108\n"
+"Project-Id-Version: FusionDirectory-109\n"
 "Report-Msgid-Bugs-To: documentation@lists.fusiondirectory.org\n"
-"POT-Creation-Date: 2015-03-17 18:47+0100\n"
-"PO-Revision-Date: 2015-02-25 16:12+0000\n"
+"POT-Creation-Date: 2014-12-15 17:47+0100\n"
+"PO-Revision-Date: 2015-02-25 16:13+0000\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>\n"
-"Language-Team: Dutch (http://www.transifex.com/projects/p/FusionDirectory-108/language/nl/)\n"
+"Language-Team: Dutch (http://www.transifex.com/projects/p/FusionDirectory-109/language/nl/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
diff --git a/quota/locale/pl/fusiondirectory.po b/quota/locale/pl/fusiondirectory.po
index 2a9d47b03ab1ed3636a6d32af1bd0f5031133cc1..99cd325c68ec4102db4001d91d76739b3b3b0b59 100644
--- a/quota/locale/pl/fusiondirectory.po
+++ b/quota/locale/pl/fusiondirectory.po
@@ -5,12 +5,12 @@
 # Translators:
 msgid ""
 msgstr ""
-"Project-Id-Version: FusionDirectory-108\n"
+"Project-Id-Version: FusionDirectory-109\n"
 "Report-Msgid-Bugs-To: documentation@lists.fusiondirectory.org\n"
-"POT-Creation-Date: 2015-03-17 18:47+0100\n"
-"PO-Revision-Date: 2015-02-25 16:12+0000\n"
+"POT-Creation-Date: 2014-12-15 17:47+0100\n"
+"PO-Revision-Date: 2015-02-25 16:13+0000\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>\n"
-"Language-Team: Polish (http://www.transifex.com/projects/p/FusionDirectory-108/language/pl/)\n"
+"Language-Team: Polish (http://www.transifex.com/projects/p/FusionDirectory-109/language/pl/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
diff --git a/quota/locale/pt/fusiondirectory.po b/quota/locale/pt/fusiondirectory.po
index 2433022128f0b824fe6c1d9c856937dd4efa44c7..203b530554e7b5803a5beec39b7f12c743bc886b 100644
--- a/quota/locale/pt/fusiondirectory.po
+++ b/quota/locale/pt/fusiondirectory.po
@@ -5,12 +5,12 @@
 # Translators:
 msgid ""
 msgstr ""
-"Project-Id-Version: FusionDirectory-108\n"
+"Project-Id-Version: FusionDirectory-109\n"
 "Report-Msgid-Bugs-To: documentation@lists.fusiondirectory.org\n"
-"POT-Creation-Date: 2015-03-17 18:47+0100\n"
-"PO-Revision-Date: 2015-02-25 16:12+0000\n"
+"POT-Creation-Date: 2014-12-15 17:47+0100\n"
+"PO-Revision-Date: 2015-02-25 16:13+0000\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>\n"
-"Language-Team: Portuguese (http://www.transifex.com/projects/p/FusionDirectory-108/language/pt/)\n"
+"Language-Team: Portuguese (http://www.transifex.com/projects/p/FusionDirectory-109/language/pt/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
diff --git a/quota/locale/pt_BR/fusiondirectory.po b/quota/locale/pt_BR/fusiondirectory.po
index 9a8e18e5c94bad74d6fa13bfdafb9486254a72af..0c7a0ac20eac9547e2177383b01cd23cb39aa194 100644
--- a/quota/locale/pt_BR/fusiondirectory.po
+++ b/quota/locale/pt_BR/fusiondirectory.po
@@ -3,15 +3,14 @@
 # This file is distributed under the same license as the PACKAGE package.
 # 
 # Translators:
-# ALEJANDRO BARRIOS <alejandrobarrios@interlegis.leg.br>, 2014
 msgid ""
 msgstr ""
-"Project-Id-Version: FusionDirectory-108\n"
+"Project-Id-Version: FusionDirectory-109\n"
 "Report-Msgid-Bugs-To: documentation@lists.fusiondirectory.org\n"
-"POT-Creation-Date: 2015-03-17 18:47+0100\n"
-"PO-Revision-Date: 2015-02-25 16:12+0000\n"
+"POT-Creation-Date: 2014-12-15 17:47+0100\n"
+"PO-Revision-Date: 2015-02-25 16:13+0000\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>\n"
-"Language-Team: Portuguese (Brazil) (http://www.transifex.com/projects/p/FusionDirectory-108/language/pt_BR/)\n"
+"Language-Team: Portuguese (Brazil) (http://www.transifex.com/projects/p/FusionDirectory-109/language/pt_BR/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -224,7 +223,7 @@ msgstr ""
 
 #: personal/quota/class_quotaAccount.inc:153
 msgid "Server"
-msgstr "Servidor"
+msgstr "servidor"
 
 #: personal/quota/class_quotaAccount.inc:153
 msgid "Server hosting the device this quota is for"
diff --git a/quota/locale/ru/fusiondirectory.po b/quota/locale/ru/fusiondirectory.po
index 377738d192699df09ad43eca11fb41ad88949195..fc91a12237431b5d914604200e71534837466ca2 100644
--- a/quota/locale/ru/fusiondirectory.po
+++ b/quota/locale/ru/fusiondirectory.po
@@ -5,17 +5,17 @@
 # Translators:
 msgid ""
 msgstr ""
-"Project-Id-Version: FusionDirectory-108\n"
+"Project-Id-Version: FusionDirectory-109\n"
 "Report-Msgid-Bugs-To: documentation@lists.fusiondirectory.org\n"
-"POT-Creation-Date: 2015-03-17 18:47+0100\n"
-"PO-Revision-Date: 2015-03-03 15:12+0000\n"
+"POT-Creation-Date: 2014-12-15 17:47+0100\n"
+"PO-Revision-Date: 2015-04-18 18:07+0000\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>\n"
-"Language-Team: Russian (http://www.transifex.com/projects/p/FusionDirectory-108/language/ru/)\n"
+"Language-Team: Russian (http://www.transifex.com/projects/p/FusionDirectory-109/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=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);\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/quota/class_serviceQuota.inc:30
 #: admin/systems/services/quota/class_serviceQuota.inc:31
@@ -89,7 +89,7 @@ msgstr ""
 
 #: admin/systems/services/quota/class_serviceQuota.inc:88
 msgid "From"
-msgstr ""
+msgstr "ÐžÑ‚"
 
 #: admin/systems/services/quota/class_serviceQuota.inc:88
 msgid "Email from which the email is sent"
diff --git a/quota/locale/ru@petr1708/fusiondirectory.po b/quota/locale/ru@petr1708/fusiondirectory.po
index 0d2b87c624e9ff9402f7258709992e0b3ffa06a9..729d542a06621548fbf2391f43ff53772e06eff2 100644
--- a/quota/locale/ru@petr1708/fusiondirectory.po
+++ b/quota/locale/ru@petr1708/fusiondirectory.po
@@ -5,17 +5,17 @@
 # Translators:
 msgid ""
 msgstr ""
-"Project-Id-Version: FusionDirectory-108\n"
+"Project-Id-Version: FusionDirectory-109\n"
 "Report-Msgid-Bugs-To: documentation@lists.fusiondirectory.org\n"
-"POT-Creation-Date: 2015-03-17 18:47+0100\n"
-"PO-Revision-Date: 2014-12-03 16:46+0000\n"
+"POT-Creation-Date: 2014-12-15 17:47+0100\n"
+"PO-Revision-Date: 2014-12-15 17:02+0000\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>\n"
-"Language-Team: Russian Petrine orthography (http://www.transifex.com/projects/p/FusionDirectory-108/language/ru@petr1708/)\n"
+"Language-Team: Russian Petrine orthography (http://www.transifex.com/projects/p/FusionDirectory-109/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=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);\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/quota/class_serviceQuota.inc:30
 #: admin/systems/services/quota/class_serviceQuota.inc:31
diff --git a/quota/locale/sv/fusiondirectory.po b/quota/locale/sv/fusiondirectory.po
index a605787c25d7506b2c3a7a5c7af4cfa43d80c699..1d3a808004d9b16a8a3772b3680f756ab60559c6 100644
--- a/quota/locale/sv/fusiondirectory.po
+++ b/quota/locale/sv/fusiondirectory.po
@@ -5,12 +5,12 @@
 # Translators:
 msgid ""
 msgstr ""
-"Project-Id-Version: FusionDirectory-108\n"
+"Project-Id-Version: FusionDirectory-109\n"
 "Report-Msgid-Bugs-To: documentation@lists.fusiondirectory.org\n"
-"POT-Creation-Date: 2015-03-17 18:47+0100\n"
-"PO-Revision-Date: 2015-02-25 16:12+0000\n"
+"POT-Creation-Date: 2014-12-15 17:47+0100\n"
+"PO-Revision-Date: 2015-02-25 16:13+0000\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>\n"
-"Language-Team: Swedish (http://www.transifex.com/projects/p/FusionDirectory-108/language/sv/)\n"
+"Language-Team: Swedish (http://www.transifex.com/projects/p/FusionDirectory-109/language/sv/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
diff --git a/quota/locale/ug/fusiondirectory.po b/quota/locale/ug/fusiondirectory.po
index 7518e0a34660132f81fa91c31dc61f0efe9b3c8a..b609a9b68018889c8767b7305344873428e7387c 100644
--- a/quota/locale/ug/fusiondirectory.po
+++ b/quota/locale/ug/fusiondirectory.po
@@ -5,12 +5,12 @@
 # Translators:
 msgid ""
 msgstr ""
-"Project-Id-Version: FusionDirectory-108\n"
+"Project-Id-Version: FusionDirectory-109\n"
 "Report-Msgid-Bugs-To: documentation@lists.fusiondirectory.org\n"
-"POT-Creation-Date: 2015-03-17 18:47+0100\n"
-"PO-Revision-Date: 2014-12-03 16:46+0000\n"
+"POT-Creation-Date: 2014-12-15 17:47+0100\n"
+"PO-Revision-Date: 2014-12-15 17:02+0000\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>\n"
-"Language-Team: Uighur (http://www.transifex.com/projects/p/FusionDirectory-108/language/ug/)\n"
+"Language-Team: Uighur (http://www.transifex.com/projects/p/FusionDirectory-109/language/ug/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
diff --git a/quota/locale/vi_VN/fusiondirectory.po b/quota/locale/vi_VN/fusiondirectory.po
index 42647a1d283e5e82f2ff248d59bc0ecd0f95a2b9..35adc88eade20cad54f3cfc3cd05f4d58f4e2290 100644
--- a/quota/locale/vi_VN/fusiondirectory.po
+++ b/quota/locale/vi_VN/fusiondirectory.po
@@ -5,12 +5,12 @@
 # Translators:
 msgid ""
 msgstr ""
-"Project-Id-Version: FusionDirectory-108\n"
+"Project-Id-Version: FusionDirectory-109\n"
 "Report-Msgid-Bugs-To: documentation@lists.fusiondirectory.org\n"
-"POT-Creation-Date: 2015-03-17 18:47+0100\n"
-"PO-Revision-Date: 2015-02-25 16:12+0000\n"
+"POT-Creation-Date: 2014-12-15 17:47+0100\n"
+"PO-Revision-Date: 2015-02-25 16:13+0000\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>\n"
-"Language-Team: Vietnamese (Viet Nam) (http://www.transifex.com/projects/p/FusionDirectory-108/language/vi_VN/)\n"
+"Language-Team: Vietnamese (Viet Nam) (http://www.transifex.com/projects/p/FusionDirectory-109/language/vi_VN/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
diff --git a/quota/locale/zh/fusiondirectory.po b/quota/locale/zh/fusiondirectory.po
index 8aa97768177aa6c3e7d7b626af5124888ffe1799..423739c4838b574cdc0c9e2307d1a4c775b6ea3e 100644
--- a/quota/locale/zh/fusiondirectory.po
+++ b/quota/locale/zh/fusiondirectory.po
@@ -5,12 +5,12 @@
 # Translators:
 msgid ""
 msgstr ""
-"Project-Id-Version: FusionDirectory-108\n"
+"Project-Id-Version: FusionDirectory-109\n"
 "Report-Msgid-Bugs-To: documentation@lists.fusiondirectory.org\n"
-"POT-Creation-Date: 2015-03-17 18:47+0100\n"
-"PO-Revision-Date: 2015-02-25 16:12+0000\n"
+"POT-Creation-Date: 2014-12-15 17:47+0100\n"
+"PO-Revision-Date: 2015-02-25 16:13+0000\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>\n"
-"Language-Team: Chinese (http://www.transifex.com/projects/p/FusionDirectory-108/language/zh/)\n"
+"Language-Team: Chinese (http://www.transifex.com/projects/p/FusionDirectory-109/language/zh/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
diff --git a/repository/locale/ar/fusiondirectory.po b/repository/locale/ar/fusiondirectory.po
index 364ac7130ef40608d016c793b4a67a562dfb0f1d..68f1d4c288108c02fe2a7e6aa7a41f5e53116000 100644
--- a/repository/locale/ar/fusiondirectory.po
+++ b/repository/locale/ar/fusiondirectory.po
@@ -5,12 +5,12 @@
 # Translators:
 msgid ""
 msgstr ""
-"Project-Id-Version: FusionDirectory-108\n"
+"Project-Id-Version: FusionDirectory-109\n"
 "Report-Msgid-Bugs-To: documentation@lists.fusiondirectory.org\n"
-"POT-Creation-Date: 2015-03-17 18:47+0100\n"
-"PO-Revision-Date: 2015-02-25 16:03+0000\n"
+"POT-Creation-Date: 2014-12-15 17:47+0100\n"
+"PO-Revision-Date: 2015-02-25 16:04+0000\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>\n"
-"Language-Team: Arabic (http://www.transifex.com/projects/p/FusionDirectory-108/language/ar/)\n"
+"Language-Team: Arabic (http://www.transifex.com/projects/p/FusionDirectory-109/language/ar/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
diff --git a/repository/locale/ca/fusiondirectory.po b/repository/locale/ca/fusiondirectory.po
index 5c143dbabd5288026042746cb818fb5a11aa29e3..f2dcd69312a51ae7965961076f9a4b2982702306 100644
--- a/repository/locale/ca/fusiondirectory.po
+++ b/repository/locale/ca/fusiondirectory.po
@@ -5,12 +5,12 @@
 # Translators:
 msgid ""
 msgstr ""
-"Project-Id-Version: FusionDirectory-108\n"
+"Project-Id-Version: FusionDirectory-109\n"
 "Report-Msgid-Bugs-To: documentation@lists.fusiondirectory.org\n"
-"POT-Creation-Date: 2015-03-17 18:47+0100\n"
-"PO-Revision-Date: 2015-02-25 16:03+0000\n"
+"POT-Creation-Date: 2014-12-15 17:47+0100\n"
+"PO-Revision-Date: 2015-02-25 16:04+0000\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>\n"
-"Language-Team: Catalan (http://www.transifex.com/projects/p/FusionDirectory-108/language/ca/)\n"
+"Language-Team: Catalan (http://www.transifex.com/projects/p/FusionDirectory-109/language/ca/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
diff --git a/repository/locale/cs_CZ/fusiondirectory.po b/repository/locale/cs_CZ/fusiondirectory.po
index f7f07dbd0600c02ef4d3c89382e37604319117ef..062692f815f67d591212a0f9aed348559f9af81f 100644
--- a/repository/locale/cs_CZ/fusiondirectory.po
+++ b/repository/locale/cs_CZ/fusiondirectory.po
@@ -3,14 +3,15 @@
 # This file is distributed under the same license as the PACKAGE package.
 # 
 # Translators:
+# Pavel Borecki <pavel.borecki@gmail.com>, 2014-2015
 msgid ""
 msgstr ""
-"Project-Id-Version: FusionDirectory-108\n"
+"Project-Id-Version: FusionDirectory-109\n"
 "Report-Msgid-Bugs-To: documentation@lists.fusiondirectory.org\n"
-"POT-Creation-Date: 2015-03-17 18:47+0100\n"
-"PO-Revision-Date: 2015-02-25 16:12+0000\n"
-"Last-Translator: fusiondirectory <contact@fusiondirectory.org>\n"
-"Language-Team: Czech (Czech Republic) (http://www.transifex.com/projects/p/FusionDirectory-108/language/cs_CZ/)\n"
+"POT-Creation-Date: 2014-12-15 17:47+0100\n"
+"PO-Revision-Date: 2015-04-07 19:21+0000\n"
+"Last-Translator: Pavel Borecki <pavel.borecki@gmail.com>\n"
+"Language-Team: Czech (Czech Republic) (http://www.transifex.com/projects/p/FusionDirectory-109/language/cs_CZ/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -22,13 +23,13 @@ msgstr ""
 #: admin/repository/class_repositoryDistribution.inc:33
 #: admin/repository/class_repositoryDistribution.inc:56
 msgid "Repository distribution"
-msgstr ""
+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"
+msgstr "NÃ¡zev"
 
 #: admin/repository/class_repositoryDistribution.inc:60
 msgid "Unique name for this distribution"
@@ -38,7 +39,7 @@ msgstr "JedineÄnÃ½ nÃ¡zev pro tuto distribuci"
 #: admin/repository/class_repositorySection.inc:61
 #: admin/repository/class_buildRepository.inc:67
 msgid "Description"
-msgstr "popis"
+msgstr "Popis"
 
 #: admin/repository/class_repositoryDistribution.inc:64
 msgid "Description of this distribution"
@@ -46,20 +47,20 @@ msgstr "Popis tÃ©to distribuce"
 
 #: admin/repository/class_repositoryDistribution.inc:69
 msgid "Section"
-msgstr "sekce"
+msgstr "Sekce"
 
 #: admin/repository/class_repositoryDistribution.inc:69
 msgid "The sections this distribution contains"
-msgstr ""
+msgstr "Sekce, kterÃ© tato distribuce obsahuje"
 
 #: admin/repository/class_repositoryDistribution.inc:76
 #: admin/repository/class_repositorySection.inc:66
 msgid "Based on"
-msgstr ""
+msgstr "VychÃ¡zÃ z"
 
 #: admin/repository/class_repositoryDistribution.inc:76
 msgid "The distributions this one is based on"
-msgstr ""
+msgstr "Distribuce, na kterÃ½ch je tato zaloÅ¾ena"
 
 #: admin/repository/class_repositorySection.inc:30
 #: admin/repository/class_repositorySection.inc:31
@@ -70,60 +71,60 @@ msgstr "Sekce repozitÃ¡Å™e"
 
 #: admin/repository/class_repositorySection.inc:57
 msgid "Unique name for this section"
-msgstr ""
+msgstr "JedineÄnÃ½ nÃ¡zev pro tuto sekci"
 
 #: admin/repository/class_repositorySection.inc:61
 msgid "Description of this section"
-msgstr ""
+msgstr "Popis tÃ©to sekce"
 
 #: admin/repository/class_repositorySection.inc:66
 msgid "The sections this one is based on"
-msgstr ""
+msgstr "Sekce, na kterÃ½ch je tato zaloÅ¾ena"
 
 #: admin/repository/class_repositoryManagement.inc:34
 #: admin/repository/class_repositoryManagement.inc:35
 msgid "Repository management"
-msgstr ""
+msgstr "SprÃ¡va repozitÃ¡Å™e"
 
 #: admin/repository/class_repositoryManagement.inc:40
 #: config/repository/class_repositoryConfig.inc:42
 msgid "Repository"
-msgstr "repozitÃ¡Å™"
+msgstr "RepozitÃ¡Å™"
 
 #: admin/repository/class_buildRepository.inc:30
 #: admin/repository/class_buildRepository.inc:31
 #: admin/repository/class_buildRepository.inc:33
 #: admin/repository/class_buildRepository.inc:59
 msgid "Build repository"
-msgstr ""
+msgstr "VytvoÅ™it repozitÃ¡Å™"
 
 #: admin/repository/class_buildRepository.inc:63
 msgid "Unique name for this repository"
-msgstr ""
+msgstr "JedineÄnÃ½ nÃ¡zev pro tento repozitÃ¡Å™"
 
 #: admin/repository/class_buildRepository.inc:67
 msgid "Description of this repository"
-msgstr ""
+msgstr "Popis tohoto repozitÃ¡Å™e"
 
 #: admin/repository/class_buildRepository.inc:72
 msgid "Distribution sections"
-msgstr ""
+msgstr "Sekce distribuce"
 
 #: admin/repository/class_buildRepository.inc:72
 msgid "The distribution sections this repository provides"
-msgstr ""
+msgstr "Sekce distribuce, kterÃ© tento repozitÃ¡Å™ poskytuje"
 
 #: admin/repository/class_buildRepository.inc:78
 msgid "Private"
-msgstr "soukromÃ©"
+msgstr "SoukromÃ©"
 
 #: admin/repository/class_buildRepository.inc:78
 msgid "Is this repository private or public?"
-msgstr ""
+msgstr "Je tento repozitÃ¡Å™ soukromÃ½ nebo veÅ™ejnÃ½?"
 
 #: admin/repository/class_buildRepository.inc:82
 msgid "Type"
-msgstr "typ"
+msgstr "Typ"
 
 #: admin/repository/class_buildRepository.inc:82
 msgid "Repository type"
@@ -131,52 +132,52 @@ msgstr "Typ repozitÃ¡Å™e"
 
 #: admin/repository/class_buildRepository.inc:89
 msgid "Members"
-msgstr "ÄlenovÃ©"
+msgstr "ÄŒlenovÃ©"
 
 #: admin/repository/class_buildRepository.inc:92
 msgid "Admins"
-msgstr "sprÃ¡vci"
+msgstr "SprÃ¡vci"
 
 #: admin/repository/class_buildRepository.inc:92
 msgid "Admins of this repository"
-msgstr ""
+msgstr "SprÃ¡vci tohoto repozitÃ¡Å™e"
 
 #: admin/repository/class_buildRepository.inc:96
 msgid "Uploaders"
-msgstr ""
+msgstr "NahrÃ¡vajÃcÃ"
 
 #: admin/repository/class_buildRepository.inc:96
 msgid "Uploaders of this repository"
-msgstr ""
+msgstr "Kdo do tohoto repozitÃ¡Å™e nahrÃ¡vÃ¡ data"
 
 #: admin/repository/class_buildRepository.inc:100
 msgid "Users"
-msgstr "uÅ¾ivatelÃ©"
+msgstr "UÅ¾ivatelÃ©"
 
 #: admin/repository/class_buildRepository.inc:100
 msgid "Users of this repository"
-msgstr ""
+msgstr "UÅ¾ivatelÃ© tohoto repozitÃ¡Å™e"
 
 #: config/repository/class_repositoryConfig.inc:28
 msgid "Repository configuration"
-msgstr ""
+msgstr "NastavenÃ repozitÃ¡Å™e"
 
 #: config/repository/class_repositoryConfig.inc:29
 msgid "FusionDirectory repository plugin configuration"
-msgstr ""
+msgstr "NastavenÃ zÃ¡suvnÃ©ho modulu repozitÃ¡Å™ pro FusionDirectory"
 
 #: config/repository/class_repositoryConfig.inc:45
 msgid "Repository RDN"
-msgstr ""
+msgstr "RelativnÃ rozliÅ¡enÃ½ nÃ¡zev repozitÃ¡Å™e"
 
 #: config/repository/class_repositoryConfig.inc:45
 msgid "Branch in which repository objects will be stored"
-msgstr ""
+msgstr "VÄ›tev, ve kterÃ© budou uloÅ¾eny objekty repozitÃ¡Å™e"
 
 #: config/repository/class_repositoryConfig.inc:51
 msgid "Repository types"
-msgstr ""
+msgstr "Typy repozitÃ¡Å™Å¯"
 
 #: config/repository/class_repositoryConfig.inc:51
 msgid "Available repository types"
-msgstr ""
+msgstr "DostupnÃ© typy repozitÃ¡Å™Å¯"
diff --git a/repository/locale/de/fusiondirectory.po b/repository/locale/de/fusiondirectory.po
index 70c4191cfb595a17b42906dedef21400745bd0a9..f0aa13078806c17292ef9986b8c8b3616b001bf8 100644
--- a/repository/locale/de/fusiondirectory.po
+++ b/repository/locale/de/fusiondirectory.po
@@ -3,14 +3,15 @@
 # This file is distributed under the same license as the PACKAGE package.
 # 
 # Translators:
+# Ettore Atalan <atalanttore@googlemail.com>, 2014-2015
 msgid ""
 msgstr ""
-"Project-Id-Version: FusionDirectory-108\n"
+"Project-Id-Version: FusionDirectory-109\n"
 "Report-Msgid-Bugs-To: documentation@lists.fusiondirectory.org\n"
-"POT-Creation-Date: 2015-03-17 18:47+0100\n"
-"PO-Revision-Date: 2015-02-25 16:12+0000\n"
-"Last-Translator: fusiondirectory <contact@fusiondirectory.org>\n"
-"Language-Team: German (http://www.transifex.com/projects/p/FusionDirectory-108/language/de/)\n"
+"POT-Creation-Date: 2014-12-15 17:47+0100\n"
+"PO-Revision-Date: 2015-05-30 13:10+0000\n"
+"Last-Translator: Ettore Atalan <atalanttore@googlemail.com>\n"
+"Language-Team: German (http://www.transifex.com/projects/p/FusionDirectory-109/language/de/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -83,7 +84,7 @@ msgstr ""
 #: admin/repository/class_repositoryManagement.inc:34
 #: admin/repository/class_repositoryManagement.inc:35
 msgid "Repository management"
-msgstr ""
+msgstr "Repositoriumsverwaltung"
 
 #: admin/repository/class_repositoryManagement.inc:40
 #: config/repository/class_repositoryConfig.inc:42
@@ -103,7 +104,7 @@ msgstr ""
 
 #: admin/repository/class_buildRepository.inc:67
 msgid "Description of this repository"
-msgstr ""
+msgstr "Beschreibung von diesem Repositorium"
 
 #: admin/repository/class_buildRepository.inc:72
 msgid "Distribution sections"
@@ -127,7 +128,7 @@ msgstr "Typ"
 
 #: admin/repository/class_buildRepository.inc:82
 msgid "Repository type"
-msgstr ""
+msgstr "Repositoriumstyp"
 
 #: admin/repository/class_buildRepository.inc:89
 msgid "Members"
@@ -155,11 +156,11 @@ msgstr "Benutzer"
 
 #: admin/repository/class_buildRepository.inc:100
 msgid "Users of this repository"
-msgstr ""
+msgstr "Benutzer dieses Repositoriums"
 
 #: config/repository/class_repositoryConfig.inc:28
 msgid "Repository configuration"
-msgstr ""
+msgstr "Repositoriumskonfiguration"
 
 #: config/repository/class_repositoryConfig.inc:29
 msgid "FusionDirectory repository plugin configuration"
@@ -175,8 +176,8 @@ msgstr ""
 
 #: config/repository/class_repositoryConfig.inc:51
 msgid "Repository types"
-msgstr ""
+msgstr "Repositoriumstypen"
 
 #: config/repository/class_repositoryConfig.inc:51
 msgid "Available repository types"
-msgstr ""
+msgstr "VerfÃ¼gbare Repositorientypen"
diff --git a/repository/locale/el_GR/fusiondirectory.po b/repository/locale/el_GR/fusiondirectory.po
new file mode 100644
index 0000000000000000000000000000000000000000..0a64b9bf54d036120c896d5c6576efbf23e5d446
--- /dev/null
+++ b/repository/locale/el_GR/fusiondirectory.po
@@ -0,0 +1,182 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR FusionDirectory Project
+# This file is distributed under the same license as the PACKAGE package.
+# 
+# Translators:
+msgid ""
+msgstr ""
+"Project-Id-Version: FusionDirectory-109\n"
+"Report-Msgid-Bugs-To: documentation@lists.fusiondirectory.org\n"
+"POT-Creation-Date: 2014-12-15 17:47+0100\n"
+"PO-Revision-Date: 2015-05-30 11:45+0000\n"
+"Last-Translator: Benoit Mortier <benoit.mortier@opensides.be>\n"
+"Language-Team: Greek (Greece) (http://www.transifex.com/projects/p/FusionDirectory-109/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/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 ""
+
+#: 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 ""
+
+#: admin/repository/class_repositoryManagement.inc:34
+#: admin/repository/class_repositoryManagement.inc:35
+msgid "Repository management"
+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
+#: admin/repository/class_buildRepository.inc:59
+msgid "Build repository"
+msgstr ""
+
+#: admin/repository/class_buildRepository.inc:63
+msgid "Unique name for this repository"
+msgstr ""
+
+#: admin/repository/class_buildRepository.inc:67
+msgid "Description of this repository"
+msgstr ""
+
+#: admin/repository/class_buildRepository.inc:72
+msgid "Distribution sections"
+msgstr ""
+
+#: admin/repository/class_buildRepository.inc:72
+msgid "The distribution sections this repository provides"
+msgstr ""
+
+#: admin/repository/class_buildRepository.inc:78
+msgid "Private"
+msgstr ""
+
+#: admin/repository/class_buildRepository.inc:78
+msgid "Is this repository private or public?"
+msgstr ""
+
+#: admin/repository/class_buildRepository.inc:82
+msgid "Type"
+msgstr ""
+
+#: admin/repository/class_buildRepository.inc:82
+msgid "Repository type"
+msgstr ""
+
+#: admin/repository/class_buildRepository.inc:89
+msgid "Members"
+msgstr ""
+
+#: admin/repository/class_buildRepository.inc:92
+msgid "Admins"
+msgstr ""
+
+#: admin/repository/class_buildRepository.inc:92
+msgid "Admins of this repository"
+msgstr ""
+
+#: admin/repository/class_buildRepository.inc:96
+msgid "Uploaders"
+msgstr ""
+
+#: admin/repository/class_buildRepository.inc:96
+msgid "Uploaders of this repository"
+msgstr ""
+
+#: admin/repository/class_buildRepository.inc:100
+msgid "Users"
+msgstr ""
+
+#: admin/repository/class_buildRepository.inc:100
+msgid "Users of this repository"
+msgstr ""
+
+#: config/repository/class_repositoryConfig.inc:28
+msgid "Repository configuration"
+msgstr ""
+
+#: config/repository/class_repositoryConfig.inc:29
+msgid "FusionDirectory repository plugin configuration"
+msgstr ""
+
+#: config/repository/class_repositoryConfig.inc:45
+msgid "Repository RDN"
+msgstr ""
+
+#: config/repository/class_repositoryConfig.inc:45
+msgid "Branch in which repository objects will be stored"
+msgstr ""
+
+#: config/repository/class_repositoryConfig.inc:51
+msgid "Repository types"
+msgstr ""
+
+#: config/repository/class_repositoryConfig.inc:51
+msgid "Available repository types"
+msgstr ""
diff --git a/repository/locale/en/fusiondirectory.po b/repository/locale/en/fusiondirectory.po
index 20de249ed7b404a5daa97478c0b81aa5661eb9d3..1341fd6f5bb80ae1cb4b576993ab98bc89ee9758 100644
--- a/repository/locale/en/fusiondirectory.po
+++ b/repository/locale/en/fusiondirectory.po
@@ -6,13 +6,13 @@
 #, fuzzy
 msgid ""
 msgstr ""
-"Project-Id-Version: PACKAGE VERSION\n"
-"Report-Msgid-Bugs-To: documentation@lists.fusiondirectory.org\n"
-"POT-Creation-Date: 2015-03-31 11:49+0200\n"
+"Project-Id-Version: FusionDirectory VERSION\n"
+"Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
+"POT-Creation-Date: 2015-05-30 15:30+0200\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
-"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
-"Language-Team: LANGUAGE <LL@li.org>\n"
-"Language: \n"
+"Last-Translator: FusionDirectory project <contact@fusiondirectory.org>\n"
+"Language-Team: English\n"
+"Language: en\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
diff --git a/repository/locale/es/fusiondirectory.po b/repository/locale/es/fusiondirectory.po
index f1e8f3714fe2e15b93de838ee16df631dd078f01..3b4e4c75a136b8473005d0af87ff42534dfe1b92 100644
--- a/repository/locale/es/fusiondirectory.po
+++ b/repository/locale/es/fusiondirectory.po
@@ -5,12 +5,12 @@
 # Translators:
 msgid ""
 msgstr ""
-"Project-Id-Version: FusionDirectory-108\n"
+"Project-Id-Version: FusionDirectory-109\n"
 "Report-Msgid-Bugs-To: documentation@lists.fusiondirectory.org\n"
-"POT-Creation-Date: 2015-03-17 18:47+0100\n"
-"PO-Revision-Date: 2015-02-25 16:12+0000\n"
+"POT-Creation-Date: 2014-12-15 17:47+0100\n"
+"PO-Revision-Date: 2015-02-25 16:13+0000\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>\n"
-"Language-Team: Spanish (http://www.transifex.com/projects/p/FusionDirectory-108/language/es/)\n"
+"Language-Team: Spanish (http://www.transifex.com/projects/p/FusionDirectory-109/language/es/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
diff --git a/repository/locale/es_VE/fusiondirectory.po b/repository/locale/es_VE/fusiondirectory.po
index 961d0e147f7ce0904167b6ec2ef7f2b05e9de514..39235c51f6cdc6bdb9d63b72b02a7bc4b19b6c48 100644
--- a/repository/locale/es_VE/fusiondirectory.po
+++ b/repository/locale/es_VE/fusiondirectory.po
@@ -5,12 +5,12 @@
 # Translators:
 msgid ""
 msgstr ""
-"Project-Id-Version: FusionDirectory-108\n"
+"Project-Id-Version: FusionDirectory-109\n"
 "Report-Msgid-Bugs-To: documentation@lists.fusiondirectory.org\n"
-"POT-Creation-Date: 2015-03-17 18:47+0100\n"
-"PO-Revision-Date: 2015-02-25 16:12+0000\n"
+"POT-Creation-Date: 2014-12-15 17:47+0100\n"
+"PO-Revision-Date: 2015-02-25 16:13+0000\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>\n"
-"Language-Team: Spanish (Venezuela) (http://www.transifex.com/projects/p/FusionDirectory-108/language/es_VE/)\n"
+"Language-Team: Spanish (Venezuela) (http://www.transifex.com/projects/p/FusionDirectory-109/language/es_VE/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
diff --git a/repository/locale/fa_IR/fusiondirectory.po b/repository/locale/fa_IR/fusiondirectory.po
index 5b8a2e543008ea2f92c8f6496ac27798667c494b..13e35d8008b638dcd073bf1461766f02342fc0db 100644
--- a/repository/locale/fa_IR/fusiondirectory.po
+++ b/repository/locale/fa_IR/fusiondirectory.po
@@ -5,12 +5,12 @@
 # Translators:
 msgid ""
 msgstr ""
-"Project-Id-Version: FusionDirectory-108\n"
+"Project-Id-Version: FusionDirectory-109\n"
 "Report-Msgid-Bugs-To: documentation@lists.fusiondirectory.org\n"
-"POT-Creation-Date: 2015-03-17 18:47+0100\n"
+"POT-Creation-Date: 2014-12-15 17:47+0100\n"
 "PO-Revision-Date: 2015-02-25 15:53+0000\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>\n"
-"Language-Team: Persian (Iran) (http://www.transifex.com/projects/p/FusionDirectory-108/language/fa_IR/)\n"
+"Language-Team: Persian (Iran) (http://www.transifex.com/projects/p/FusionDirectory-109/language/fa_IR/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
diff --git a/repository/locale/fr/fusiondirectory.po b/repository/locale/fr/fusiondirectory.po
index 6975ba2acd029eb04f407a7f6065635e84e65936..688870e74f7bdf773d556721d826197058a274e9 100644
--- a/repository/locale/fr/fusiondirectory.po
+++ b/repository/locale/fr/fusiondirectory.po
@@ -3,18 +3,14 @@
 # This file is distributed under the same license as the PACKAGE package.
 # 
 # Translators:
-# MCMic, 2014
-# fusiondirectory <contact@fusiondirectory.org>, 2014
-# fusiondirectory <contact@fusiondirectory.org>, 2014
-# MCMic, 2014
 msgid ""
 msgstr ""
-"Project-Id-Version: FusionDirectory-108\n"
+"Project-Id-Version: FusionDirectory-109\n"
 "Report-Msgid-Bugs-To: documentation@lists.fusiondirectory.org\n"
-"POT-Creation-Date: 2015-03-17 18:47+0100\n"
-"PO-Revision-Date: 2015-02-25 16:12+0000\n"
-"Last-Translator: MCMic\n"
-"Language-Team: French (http://www.transifex.com/projects/p/FusionDirectory-108/language/fr/)\n"
+"POT-Creation-Date: 2014-12-15 17:47+0100\n"
+"PO-Revision-Date: 2015-02-25 16:13+0000\n"
+"Last-Translator: fusiondirectory <contact@fusiondirectory.org>\n"
+"Language-Team: French (http://www.transifex.com/projects/p/FusionDirectory-109/language/fr/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -46,7 +42,7 @@ msgstr "Description"
 
 #: admin/repository/class_repositoryDistribution.inc:64
 msgid "Description of this distribution"
-msgstr "Description de cette distribution"
+msgstr "Description pour cette distribution"
 
 #: admin/repository/class_repositoryDistribution.inc:69
 msgid "Section"
@@ -54,16 +50,16 @@ msgstr "Section"
 
 #: admin/repository/class_repositoryDistribution.inc:69
 msgid "The sections this distribution contains"
-msgstr "Les sections que cette distribution contient"
+msgstr "Les section que cette distribution contient"
 
 #: admin/repository/class_repositoryDistribution.inc:76
 #: admin/repository/class_repositorySection.inc:66
 msgid "Based on"
-msgstr "BasÃ©e sur"
+msgstr "basÃ© sur"
 
 #: admin/repository/class_repositoryDistribution.inc:76
 msgid "The distributions this one is based on"
-msgstr "Les distributions sur lesquelles celle ci est basÃ©e"
+msgstr "Les distributions dont celui-ci est basÃ© sur"
 
 #: admin/repository/class_repositorySection.inc:30
 #: admin/repository/class_repositorySection.inc:31
@@ -78,16 +74,16 @@ msgstr "Nom unique pour cette section"
 
 #: admin/repository/class_repositorySection.inc:61
 msgid "Description of this section"
-msgstr "Description de cette section"
+msgstr "Description pour cette section"
 
 #: admin/repository/class_repositorySection.inc:66
 msgid "The sections this one is based on"
-msgstr "Les sections sur lesquelles celle-ci est basÃ©e"
+msgstr "Les sections dont celui-ci est basÃ© sur"
 
 #: admin/repository/class_repositoryManagement.inc:34
 #: admin/repository/class_repositoryManagement.inc:35
 msgid "Repository management"
-msgstr "Gestion des dÃ©pÃ´ts"
+msgstr "Gestion des dÃ©pots"
 
 #: admin/repository/class_repositoryManagement.inc:40
 #: config/repository/class_repositoryConfig.inc:42
@@ -99,7 +95,7 @@ msgstr "DÃ©pÃ´t"
 #: admin/repository/class_buildRepository.inc:33
 #: admin/repository/class_buildRepository.inc:59
 msgid "Build repository"
-msgstr "DÃ©pÃ´t de construction"
+msgstr "Construire un dÃ©pÃ´t"
 
 #: admin/repository/class_buildRepository.inc:63
 msgid "Unique name for this repository"
@@ -111,11 +107,11 @@ msgstr "Description de ce dÃ©pÃ´t"
 
 #: admin/repository/class_buildRepository.inc:72
 msgid "Distribution sections"
-msgstr "Sections de distribution"
+msgstr "Section du dÃ©pÃ´t"
 
 #: admin/repository/class_buildRepository.inc:72
 msgid "The distribution sections this repository provides"
-msgstr "Les sections de distribution disponibles dans ce dÃ©pÃ´t"
+msgstr "Les sections de la distribution disponibles sur ce dÃ©pÃ´t"
 
 #: admin/repository/class_buildRepository.inc:78
 msgid "Private"
@@ -123,7 +119,7 @@ msgstr "PrivÃ©"
 
 #: admin/repository/class_buildRepository.inc:78
 msgid "Is this repository private or public?"
-msgstr "Ce dÃ©pÃ´t est-il privÃ© ou publicâ€¯?"
+msgstr "Ce dÃ©pÃ´t est privÃ© ou public?"
 
 #: admin/repository/class_buildRepository.inc:82
 msgid "Type"
@@ -171,11 +167,11 @@ msgstr "Configuration du plugin repository"
 
 #: config/repository/class_repositoryConfig.inc:45
 msgid "Repository RDN"
-msgstr "Branche des dÃ©pÃ´ts"
+msgstr "RDN Repository"
 
 #: config/repository/class_repositoryConfig.inc:45
 msgid "Branch in which repository objects will be stored"
-msgstr "Branche oÃ¹ seront stockÃ©s les objets dÃ©pÃ´ts"
+msgstr "Branche oÃ¹ seront stockÃ©s les objets dÃ©pots"
 
 #: config/repository/class_repositoryConfig.inc:51
 msgid "Repository types"
@@ -183,4 +179,4 @@ msgstr "Types de dÃ©pÃ´t"
 
 #: config/repository/class_repositoryConfig.inc:51
 msgid "Available repository types"
-msgstr "Type de dÃ©pÃ´ts disponibles"
+msgstr "Type de tests disponibles"
diff --git a/repository/locale/id/fusiondirectory.po b/repository/locale/id/fusiondirectory.po
index 61f6b8d4b9cf568c59496b02e72d86f646baba2f..77b929b348bb8f88f49d0992c0c96dd18591f87e 100644
--- a/repository/locale/id/fusiondirectory.po
+++ b/repository/locale/id/fusiondirectory.po
@@ -5,12 +5,12 @@
 # Translators:
 msgid ""
 msgstr ""
-"Project-Id-Version: FusionDirectory-108\n"
+"Project-Id-Version: FusionDirectory-109\n"
 "Report-Msgid-Bugs-To: documentation@lists.fusiondirectory.org\n"
-"POT-Creation-Date: 2015-03-17 18:47+0100\n"
-"PO-Revision-Date: 2014-12-12 07:45+0000\n"
+"POT-Creation-Date: 2014-12-15 17:47+0100\n"
+"PO-Revision-Date: 2014-12-15 17:03+0000\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>\n"
-"Language-Team: Indonesian (http://www.transifex.com/projects/p/FusionDirectory-108/language/id/)\n"
+"Language-Team: Indonesian (http://www.transifex.com/projects/p/FusionDirectory-109/language/id/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
diff --git a/repository/locale/it/fusiondirectory.po b/repository/locale/it/fusiondirectory.po
index 9e6972701d9d4d53af96bf23022a5beb3bb836d5..7765a9c4c4b7b4cef9cf1548db1b13467b971951 100644
--- a/repository/locale/it/fusiondirectory.po
+++ b/repository/locale/it/fusiondirectory.po
@@ -5,12 +5,12 @@
 # Translators:
 msgid ""
 msgstr ""
-"Project-Id-Version: FusionDirectory-108\n"
+"Project-Id-Version: FusionDirectory-109\n"
 "Report-Msgid-Bugs-To: documentation@lists.fusiondirectory.org\n"
-"POT-Creation-Date: 2015-03-17 18:47+0100\n"
-"PO-Revision-Date: 2015-02-25 16:12+0000\n"
+"POT-Creation-Date: 2014-12-15 17:47+0100\n"
+"PO-Revision-Date: 2015-02-25 16:13+0000\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>\n"
-"Language-Team: Italian (http://www.transifex.com/projects/p/FusionDirectory-108/language/it/)\n"
+"Language-Team: Italian (http://www.transifex.com/projects/p/FusionDirectory-109/language/it/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
diff --git a/repository/locale/lv/fusiondirectory.po b/repository/locale/lv/fusiondirectory.po
index f9130e35d88a812a2534687f9de94feab69d472d..9da862d1a0f763fcf9d0cbf15c68001aaad41d8d 100644
--- a/repository/locale/lv/fusiondirectory.po
+++ b/repository/locale/lv/fusiondirectory.po
@@ -5,12 +5,12 @@
 # Translators:
 msgid ""
 msgstr ""
-"Project-Id-Version: FusionDirectory-108\n"
+"Project-Id-Version: FusionDirectory-109\n"
 "Report-Msgid-Bugs-To: documentation@lists.fusiondirectory.org\n"
-"POT-Creation-Date: 2015-03-17 18:47+0100\n"
-"PO-Revision-Date: 2014-12-12 07:45+0000\n"
+"POT-Creation-Date: 2014-12-15 17:47+0100\n"
+"PO-Revision-Date: 2014-12-15 17:03+0000\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>\n"
-"Language-Team: Latvian (http://www.transifex.com/projects/p/FusionDirectory-108/language/lv/)\n"
+"Language-Team: Latvian (http://www.transifex.com/projects/p/FusionDirectory-109/language/lv/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
diff --git a/repository/locale/nb/fusiondirectory.po b/repository/locale/nb/fusiondirectory.po
index ce7709bea37e1d333ddabb01fe4c7efc42472e2d..f5ffd65c3a732b197f3568865c1e57370893b5fd 100644
--- a/repository/locale/nb/fusiondirectory.po
+++ b/repository/locale/nb/fusiondirectory.po
@@ -5,12 +5,12 @@
 # Translators:
 msgid ""
 msgstr ""
-"Project-Id-Version: FusionDirectory-108\n"
+"Project-Id-Version: FusionDirectory-109\n"
 "Report-Msgid-Bugs-To: documentation@lists.fusiondirectory.org\n"
-"POT-Creation-Date: 2015-03-17 18:47+0100\n"
-"PO-Revision-Date: 2015-02-25 16:03+0000\n"
+"POT-Creation-Date: 2014-12-15 17:47+0100\n"
+"PO-Revision-Date: 2015-02-25 16:04+0000\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>\n"
-"Language-Team: Norwegian BokmÃ¥l (http://www.transifex.com/projects/p/FusionDirectory-108/language/nb/)\n"
+"Language-Team: Norwegian BokmÃ¥l (http://www.transifex.com/projects/p/FusionDirectory-109/language/nb/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
diff --git a/repository/locale/nl/fusiondirectory.po b/repository/locale/nl/fusiondirectory.po
index 84562c5962a29fb962b18356c2b7e3c486cace4d..f96a0a79dde2d3c1a2d430627b7fe034e6a63bc4 100644
--- a/repository/locale/nl/fusiondirectory.po
+++ b/repository/locale/nl/fusiondirectory.po
@@ -5,12 +5,12 @@
 # Translators:
 msgid ""
 msgstr ""
-"Project-Id-Version: FusionDirectory-108\n"
+"Project-Id-Version: FusionDirectory-109\n"
 "Report-Msgid-Bugs-To: documentation@lists.fusiondirectory.org\n"
-"POT-Creation-Date: 2015-03-17 18:47+0100\n"
-"PO-Revision-Date: 2015-02-25 16:12+0000\n"
+"POT-Creation-Date: 2014-12-15 17:47+0100\n"
+"PO-Revision-Date: 2015-02-25 16:13+0000\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>\n"
-"Language-Team: Dutch (http://www.transifex.com/projects/p/FusionDirectory-108/language/nl/)\n"
+"Language-Team: Dutch (http://www.transifex.com/projects/p/FusionDirectory-109/language/nl/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
diff --git a/repository/locale/pl/fusiondirectory.po b/repository/locale/pl/fusiondirectory.po
index af9e2620b24de806ac327e0a3e412e911186cfe7..ba1e53ad8b27569f13b0b6e5fdb19b8b7bad0603 100644
--- a/repository/locale/pl/fusiondirectory.po
+++ b/repository/locale/pl/fusiondirectory.po
@@ -5,12 +5,12 @@
 # Translators:
 msgid ""
 msgstr ""
-"Project-Id-Version: FusionDirectory-108\n"
+"Project-Id-Version: FusionDirectory-109\n"
 "Report-Msgid-Bugs-To: documentation@lists.fusiondirectory.org\n"
-"POT-Creation-Date: 2015-03-17 18:47+0100\n"
-"PO-Revision-Date: 2015-02-25 16:12+0000\n"
+"POT-Creation-Date: 2014-12-15 17:47+0100\n"
+"PO-Revision-Date: 2015-02-25 16:13+0000\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>\n"
-"Language-Team: Polish (http://www.transifex.com/projects/p/FusionDirectory-108/language/pl/)\n"
+"Language-Team: Polish (http://www.transifex.com/projects/p/FusionDirectory-109/language/pl/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
diff --git a/repository/locale/pt/fusiondirectory.po b/repository/locale/pt/fusiondirectory.po
index aaaf07ce21ffaf062bebda9acfb80aa4b756373a..ec75bfcedf3fed5eb486db81459f1e73dd8c0dab 100644
--- a/repository/locale/pt/fusiondirectory.po
+++ b/repository/locale/pt/fusiondirectory.po
@@ -5,12 +5,12 @@
 # Translators:
 msgid ""
 msgstr ""
-"Project-Id-Version: FusionDirectory-108\n"
+"Project-Id-Version: FusionDirectory-109\n"
 "Report-Msgid-Bugs-To: documentation@lists.fusiondirectory.org\n"
-"POT-Creation-Date: 2015-03-17 18:47+0100\n"
-"PO-Revision-Date: 2015-02-25 16:12+0000\n"
+"POT-Creation-Date: 2014-12-15 17:47+0100\n"
+"PO-Revision-Date: 2015-02-25 16:13+0000\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>\n"
-"Language-Team: Portuguese (http://www.transifex.com/projects/p/FusionDirectory-108/language/pt/)\n"
+"Language-Team: Portuguese (http://www.transifex.com/projects/p/FusionDirectory-109/language/pt/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
diff --git a/repository/locale/pt_BR/fusiondirectory.po b/repository/locale/pt_BR/fusiondirectory.po
index e2df41508b9ccec9a8cd6731c611d4aff447b51b..24d0df83e56c202e8f9bc034cbbc44a9a6223406 100644
--- a/repository/locale/pt_BR/fusiondirectory.po
+++ b/repository/locale/pt_BR/fusiondirectory.po
@@ -3,15 +3,14 @@
 # This file is distributed under the same license as the PACKAGE package.
 # 
 # Translators:
-# ALEJANDRO BARRIOS <alejandrobarrios@interlegis.leg.br>, 2014
 msgid ""
 msgstr ""
-"Project-Id-Version: FusionDirectory-108\n"
+"Project-Id-Version: FusionDirectory-109\n"
 "Report-Msgid-Bugs-To: documentation@lists.fusiondirectory.org\n"
-"POT-Creation-Date: 2015-03-17 18:47+0100\n"
-"PO-Revision-Date: 2015-02-25 16:12+0000\n"
+"POT-Creation-Date: 2014-12-15 17:47+0100\n"
+"PO-Revision-Date: 2015-02-25 16:13+0000\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>\n"
-"Language-Team: Portuguese (Brazil) (http://www.transifex.com/projects/p/FusionDirectory-108/language/pt_BR/)\n"
+"Language-Team: Portuguese (Brazil) (http://www.transifex.com/projects/p/FusionDirectory-109/language/pt_BR/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
diff --git a/repository/locale/ru/fusiondirectory.po b/repository/locale/ru/fusiondirectory.po
index 36e834e8d684cf8e4fd2940ef96aa4624a8555eb..acf747fa8945e15fa88e1ffbf490ce2669e9fd84 100644
--- a/repository/locale/ru/fusiondirectory.po
+++ b/repository/locale/ru/fusiondirectory.po
@@ -5,17 +5,17 @@
 # Translators:
 msgid ""
 msgstr ""
-"Project-Id-Version: FusionDirectory-108\n"
+"Project-Id-Version: FusionDirectory-109\n"
 "Report-Msgid-Bugs-To: documentation@lists.fusiondirectory.org\n"
-"POT-Creation-Date: 2015-03-17 18:47+0100\n"
-"PO-Revision-Date: 2015-02-25 16:12+0000\n"
+"POT-Creation-Date: 2014-12-15 17:47+0100\n"
+"PO-Revision-Date: 2015-04-12 22:01+0000\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>\n"
-"Language-Team: Russian (http://www.transifex.com/projects/p/FusionDirectory-108/language/ru/)\n"
+"Language-Team: Russian (http://www.transifex.com/projects/p/FusionDirectory-109/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=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);\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
@@ -46,7 +46,7 @@ msgstr ""
 
 #: admin/repository/class_repositoryDistribution.inc:69
 msgid "Section"
-msgstr ""
+msgstr "Ð¡ÐµÐºÑ†Ð¸Ñ"
 
 #: admin/repository/class_repositoryDistribution.inc:69
 msgid "The sections this distribution contains"
@@ -135,7 +135,7 @@ msgstr "Ð§Ð»ÐµÐ½Ñ‹"
 
 #: admin/repository/class_buildRepository.inc:92
 msgid "Admins"
-msgstr ""
+msgstr "ÐÐ´Ð¼Ð¸Ð½Ð¸ÑÑ‚Ñ€Ð°Ñ‚Ð¾Ñ€Ñ‹"
 
 #: admin/repository/class_buildRepository.inc:92
 msgid "Admins of this repository"
diff --git a/repository/locale/ru@petr1708/fusiondirectory.po b/repository/locale/ru@petr1708/fusiondirectory.po
index 02e3bc0dac32e232570ab2b7131d6a30105d70d8..a20b8f881587c3dd9cd79171e5faa9143159a52e 100644
--- a/repository/locale/ru@petr1708/fusiondirectory.po
+++ b/repository/locale/ru@petr1708/fusiondirectory.po
@@ -5,17 +5,17 @@
 # Translators:
 msgid ""
 msgstr ""
-"Project-Id-Version: FusionDirectory-108\n"
+"Project-Id-Version: FusionDirectory-109\n"
 "Report-Msgid-Bugs-To: documentation@lists.fusiondirectory.org\n"
-"POT-Creation-Date: 2015-03-17 18:47+0100\n"
-"PO-Revision-Date: 2014-12-12 07:45+0000\n"
+"POT-Creation-Date: 2014-12-15 17:47+0100\n"
+"PO-Revision-Date: 2014-12-15 17:03+0000\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>\n"
-"Language-Team: Russian Petrine orthography (http://www.transifex.com/projects/p/FusionDirectory-108/language/ru@petr1708/)\n"
+"Language-Team: Russian Petrine orthography (http://www.transifex.com/projects/p/FusionDirectory-109/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=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);\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
diff --git a/repository/locale/sv/fusiondirectory.po b/repository/locale/sv/fusiondirectory.po
index 88da7a26ff511c8f233f6c46a25be714fbd18f30..0ac33fdf3fe16bb792be241db66c43c31c671043 100644
--- a/repository/locale/sv/fusiondirectory.po
+++ b/repository/locale/sv/fusiondirectory.po
@@ -5,12 +5,12 @@
 # Translators:
 msgid ""
 msgstr ""
-"Project-Id-Version: FusionDirectory-108\n"
+"Project-Id-Version: FusionDirectory-109\n"
 "Report-Msgid-Bugs-To: documentation@lists.fusiondirectory.org\n"
-"POT-Creation-Date: 2015-03-17 18:47+0100\n"
-"PO-Revision-Date: 2015-02-25 16:12+0000\n"
+"POT-Creation-Date: 2014-12-15 17:47+0100\n"
+"PO-Revision-Date: 2015-02-25 16:13+0000\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>\n"
-"Language-Team: Swedish (http://www.transifex.com/projects/p/FusionDirectory-108/language/sv/)\n"
+"Language-Team: Swedish (http://www.transifex.com/projects/p/FusionDirectory-109/language/sv/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
diff --git a/repository/locale/ug/fusiondirectory.po b/repository/locale/ug/fusiondirectory.po
index bc2894914ad25fd7845b5b1b77a4935fad182341..5f90a7ad7a93bbb696980239ab2b766f6083133f 100644
--- a/repository/locale/ug/fusiondirectory.po
+++ b/repository/locale/ug/fusiondirectory.po
@@ -5,12 +5,12 @@
 # Translators:
 msgid ""
 msgstr ""
-"Project-Id-Version: FusionDirectory-108\n"
+"Project-Id-Version: FusionDirectory-109\n"
 "Report-Msgid-Bugs-To: documentation@lists.fusiondirectory.org\n"
-"POT-Creation-Date: 2015-03-17 18:47+0100\n"
-"PO-Revision-Date: 2014-12-12 07:45+0000\n"
+"POT-Creation-Date: 2014-12-15 17:47+0100\n"
+"PO-Revision-Date: 2014-12-15 17:03+0000\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>\n"
-"Language-Team: Uighur (http://www.transifex.com/projects/p/FusionDirectory-108/language/ug/)\n"
+"Language-Team: Uighur (http://www.transifex.com/projects/p/FusionDirectory-109/language/ug/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
diff --git a/repository/locale/vi_VN/fusiondirectory.po b/repository/locale/vi_VN/fusiondirectory.po
index 52de60226604de96635a3ad9b574877f2459673e..b15d0668212b8b0b9924d63c88dc019d41d9909f 100644
--- a/repository/locale/vi_VN/fusiondirectory.po
+++ b/repository/locale/vi_VN/fusiondirectory.po
@@ -5,12 +5,12 @@
 # Translators:
 msgid ""
 msgstr ""
-"Project-Id-Version: FusionDirectory-108\n"
+"Project-Id-Version: FusionDirectory-109\n"
 "Report-Msgid-Bugs-To: documentation@lists.fusiondirectory.org\n"
-"POT-Creation-Date: 2015-03-17 18:47+0100\n"
-"PO-Revision-Date: 2015-02-25 16:12+0000\n"
+"POT-Creation-Date: 2014-12-15 17:47+0100\n"
+"PO-Revision-Date: 2015-02-25 16:13+0000\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>\n"
-"Language-Team: Vietnamese (Viet Nam) (http://www.transifex.com/projects/p/FusionDirectory-108/language/vi_VN/)\n"
+"Language-Team: Vietnamese (Viet Nam) (http://www.transifex.com/projects/p/FusionDirectory-109/language/vi_VN/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
diff --git a/repository/locale/zh/fusiondirectory.po b/repository/locale/zh/fusiondirectory.po
index 0f020cc8c27bc875f65605b00567b3c7624a1291..e6d14fd6e2f1c771c687e411973678c3d4f3cd36 100644
--- a/repository/locale/zh/fusiondirectory.po
+++ b/repository/locale/zh/fusiondirectory.po
@@ -5,12 +5,12 @@
 # Translators:
 msgid ""
 msgstr ""
-"Project-Id-Version: FusionDirectory-108\n"
+"Project-Id-Version: FusionDirectory-109\n"
 "Report-Msgid-Bugs-To: documentation@lists.fusiondirectory.org\n"
-"POT-Creation-Date: 2015-03-17 18:47+0100\n"
-"PO-Revision-Date: 2015-02-25 16:12+0000\n"
+"POT-Creation-Date: 2014-12-15 17:47+0100\n"
+"PO-Revision-Date: 2015-02-25 16:13+0000\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>\n"
-"Language-Team: Chinese (http://www.transifex.com/projects/p/FusionDirectory-108/language/zh/)\n"
+"Language-Team: Chinese (http://www.transifex.com/projects/p/FusionDirectory-109/language/zh/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
diff --git a/rsyslog/locale/ar/fusiondirectory.po b/rsyslog/locale/ar/fusiondirectory.po
index 43436c18e920da93971b1f79b5210d9faa803db0..635221a2061deaea2504b48bf15aa8672221016f 100644
--- a/rsyslog/locale/ar/fusiondirectory.po
+++ b/rsyslog/locale/ar/fusiondirectory.po
@@ -5,12 +5,12 @@
 # Translators:
 msgid ""
 msgstr ""
-"Project-Id-Version: FusionDirectory-108\n"
+"Project-Id-Version: FusionDirectory-109\n"
 "Report-Msgid-Bugs-To: documentation@lists.fusiondirectory.org\n"
-"POT-Creation-Date: 2015-03-17 18:47+0100\n"
-"PO-Revision-Date: 2015-02-25 16:12+0000\n"
+"POT-Creation-Date: 2014-12-15 17:47+0100\n"
+"PO-Revision-Date: 2015-02-25 16:04+0000\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>\n"
-"Language-Team: Arabic (http://www.transifex.com/projects/p/FusionDirectory-108/language/ar/)\n"
+"Language-Team: Arabic (http://www.transifex.com/projects/p/FusionDirectory-109/language/ar/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -101,7 +101,7 @@ msgstr ""
 msgid "Critical"
 msgstr ""
 
-#: addons/rsyslog/class_rsyslog.inc:351 addons/rsyslog/rSyslog.tpl.c:26
+#: addons/rsyslog/class_rsyslog.inc:351
 msgid "Error"
 msgstr "Ø®Ø·Ø£"
 
@@ -185,51 +185,3 @@ msgstr ""
 #: addons/rsyslog/class_rsyslog.inc:384
 msgid "Clock"
 msgstr ""
-
-#: addons/rsyslog/rSyslog.tpl.c:2
-msgid "Filter"
-msgstr ""
-
-#: addons/rsyslog/rSyslog.tpl.c:5
-msgid "Server"
-msgstr "Ø®Ø§Ø¯Ù…"
-
-#: addons/rsyslog/rSyslog.tpl.c:8
-msgid "Host"
-msgstr ""
-
-#: addons/rsyslog/rSyslog.tpl.c:11 addons/rsyslog/rSyslog.tpl.c:41
-msgid "Severity"
-msgstr ""
-
-#: addons/rsyslog/rSyslog.tpl.c:14
-msgid "From"
-msgstr ""
-
-#: addons/rsyslog/rSyslog.tpl.c:17
-msgid "till"
-msgstr ""
-
-#: addons/rsyslog/rSyslog.tpl.c:20 addons/rsyslog/rSyslog.tpl.c:23
-msgid "Search"
-msgstr ""
-
-#: addons/rsyslog/rSyslog.tpl.c:29
-msgid "Date"
-msgstr ""
-
-#: addons/rsyslog/rSyslog.tpl.c:32
-msgid "Source"
-msgstr ""
-
-#: addons/rsyslog/rSyslog.tpl.c:35
-msgid "Header"
-msgstr ""
-
-#: addons/rsyslog/rSyslog.tpl.c:38
-msgid "Facility"
-msgstr ""
-
-#: addons/rsyslog/rSyslog.tpl.c:44
-msgid "Message"
-msgstr ""
diff --git a/rsyslog/locale/ca/fusiondirectory.po b/rsyslog/locale/ca/fusiondirectory.po
index 49606bf049bea3eeb3c8a66fbbadc179fc247bc8..8bfd62eac457fcb1c5b05c2f9ad70d682729396d 100644
--- a/rsyslog/locale/ca/fusiondirectory.po
+++ b/rsyslog/locale/ca/fusiondirectory.po
@@ -5,12 +5,12 @@
 # Translators:
 msgid ""
 msgstr ""
-"Project-Id-Version: FusionDirectory-108\n"
+"Project-Id-Version: FusionDirectory-109\n"
 "Report-Msgid-Bugs-To: documentation@lists.fusiondirectory.org\n"
-"POT-Creation-Date: 2015-03-17 18:47+0100\n"
-"PO-Revision-Date: 2015-02-25 16:12+0000\n"
+"POT-Creation-Date: 2014-12-15 17:47+0100\n"
+"PO-Revision-Date: 2015-02-25 16:04+0000\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>\n"
-"Language-Team: Catalan (http://www.transifex.com/projects/p/FusionDirectory-108/language/ca/)\n"
+"Language-Team: Catalan (http://www.transifex.com/projects/p/FusionDirectory-109/language/ca/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -101,7 +101,7 @@ msgstr ""
 msgid "Critical"
 msgstr ""
 
-#: addons/rsyslog/class_rsyslog.inc:351 addons/rsyslog/rSyslog.tpl.c:26
+#: addons/rsyslog/class_rsyslog.inc:351
 msgid "Error"
 msgstr "Error"
 
@@ -185,51 +185,3 @@ msgstr ""
 #: addons/rsyslog/class_rsyslog.inc:384
 msgid "Clock"
 msgstr ""
-
-#: addons/rsyslog/rSyslog.tpl.c:2
-msgid "Filter"
-msgstr ""
-
-#: addons/rsyslog/rSyslog.tpl.c:5
-msgid "Server"
-msgstr ""
-
-#: addons/rsyslog/rSyslog.tpl.c:8
-msgid "Host"
-msgstr ""
-
-#: addons/rsyslog/rSyslog.tpl.c:11 addons/rsyslog/rSyslog.tpl.c:41
-msgid "Severity"
-msgstr ""
-
-#: addons/rsyslog/rSyslog.tpl.c:14
-msgid "From"
-msgstr ""
-
-#: addons/rsyslog/rSyslog.tpl.c:17
-msgid "till"
-msgstr ""
-
-#: addons/rsyslog/rSyslog.tpl.c:20 addons/rsyslog/rSyslog.tpl.c:23
-msgid "Search"
-msgstr "Cerca"
-
-#: addons/rsyslog/rSyslog.tpl.c:29
-msgid "Date"
-msgstr ""
-
-#: addons/rsyslog/rSyslog.tpl.c:32
-msgid "Source"
-msgstr ""
-
-#: addons/rsyslog/rSyslog.tpl.c:35
-msgid "Header"
-msgstr ""
-
-#: addons/rsyslog/rSyslog.tpl.c:38
-msgid "Facility"
-msgstr ""
-
-#: addons/rsyslog/rSyslog.tpl.c:44
-msgid "Message"
-msgstr ""
diff --git a/rsyslog/locale/cs_CZ/fusiondirectory.po b/rsyslog/locale/cs_CZ/fusiondirectory.po
index 84625f5ede5558bb2bc502246607430fb7ea753f..bfab431fe7d5042bc23734bd317bde080c00c285 100644
--- a/rsyslog/locale/cs_CZ/fusiondirectory.po
+++ b/rsyslog/locale/cs_CZ/fusiondirectory.po
@@ -3,17 +3,15 @@
 # This file is distributed under the same license as the PACKAGE package.
 # 
 # Translators:
-# Pavel Borecki <pavel.borecki@gmail.com>, 2012
-# Pavel Borecki <pavel.borecki@gmail.com>, 2012
-# Pavel Borecki <pavel.borecki@gmail.com>, 2012
+# Pavel Borecki <pavel.borecki@gmail.com>, 2014-2015
 msgid ""
 msgstr ""
-"Project-Id-Version: FusionDirectory-108\n"
+"Project-Id-Version: FusionDirectory-109\n"
 "Report-Msgid-Bugs-To: documentation@lists.fusiondirectory.org\n"
-"POT-Creation-Date: 2015-03-17 18:47+0100\n"
-"PO-Revision-Date: 2015-02-25 16:12+0000\n"
-"Last-Translator: fusiondirectory <contact@fusiondirectory.org>\n"
-"Language-Team: Czech (Czech Republic) (http://www.transifex.com/projects/p/FusionDirectory-108/language/cs_CZ/)\n"
+"POT-Creation-Date: 2014-12-15 17:47+0100\n"
+"PO-Revision-Date: 2015-04-07 19:21+0000\n"
+"Last-Translator: Pavel Borecki <pavel.borecki@gmail.com>\n"
+"Language-Team: Czech (Czech Republic) (http://www.transifex.com/projects/p/FusionDirectory-109/language/cs_CZ/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -23,56 +21,56 @@ msgstr ""
 #: admin/systems/services/rsyslog/class_serviceSyslog.inc:30
 #: admin/systems/services/rsyslog/class_serviceSyslog.inc:31
 msgid "Logs service"
-msgstr "SluÅ¾ba provoznÃch zÃ¡znamÅ¯"
+msgstr "SluÅ¾ba zÃ¡znamu protokolÅ¯"
 
 #: admin/systems/services/rsyslog/class_serviceSyslog.inc:31
 msgid "Services"
-msgstr "sluÅ¾by"
+msgstr "SluÅ¾by"
 
 #: admin/systems/services/rsyslog/class_serviceSyslog.inc:41
 msgid "Logging service"
-msgstr "SluÅ¾ba poÅ™izovÃ¡nÃ provoznÃch zÃ¡znamÅ¯"
+msgstr "SluÅ¾ba protokolovÃ¡nÃ"
 
 #: admin/systems/services/rsyslog/class_serviceSyslog.inc:44
 msgid "Driver"
-msgstr "ovladaÄ"
+msgstr "OvladaÄ"
 
 #: admin/systems/services/rsyslog/class_serviceSyslog.inc:44
 msgid "Driver to use to contact this database."
-msgstr ""
+msgstr "OvladaÄ pro prÃ¡ci s touto databÃ¡zÃ."
 
 #: admin/systems/services/rsyslog/class_serviceSyslog.inc:48
 msgid "Database"
-msgstr "databÃ¡ze"
+msgstr "DatabÃ¡ze"
 
 #: admin/systems/services/rsyslog/class_serviceSyslog.inc:48
 msgid "Database in which syslog stores its informations"
-msgstr ""
+msgstr "DatabÃ¡ze, ve kterÃ© sluÅ¾ba syslog uchovÃ¡vÃ¡ svÃ© informace"
 
 #: admin/systems/services/rsyslog/class_serviceSyslog.inc:53
 msgid "Database user"
-msgstr "uÅ¾ivatel databÃ¡ze"
+msgstr "UÅ¾ivatel pro pÅ™Ãstup k databÃ¡zi"
 
 #: admin/systems/services/rsyslog/class_serviceSyslog.inc:53
 msgid "Database administrator"
-msgstr ""
+msgstr "SprÃ¡vce databÃ¡ze"
 
 #: admin/systems/services/rsyslog/class_serviceSyslog.inc:58
 msgid "Password"
-msgstr "heslo"
+msgstr "Heslo"
 
 #: admin/systems/services/rsyslog/class_serviceSyslog.inc:58
 msgid "Password for the database administrator"
-msgstr ""
+msgstr "Heslo sprÃ¡vce databÃ¡ze"
 
 #: addons/rsyslog/class_rsyslog.inc:47 addons/rsyslog/class_rsyslog.inc:53
 #: addons/rsyslog/main.inc:38
 msgid "System logs"
-msgstr "protokolovacÃ zÃ¡znamy systÃ©mÅ¯"
+msgstr "Protokoly systÃ©mu"
 
 #: addons/rsyslog/class_rsyslog.inc:48
 msgid "This plugin allow to View system logs"
-msgstr ""
+msgstr "PomocÃ tohoto zÃ¡suvnÃ©ho modulu je moÅ¾nÃ© prohlÃÅ¾et protokoly systÃ©mu"
 
 #: addons/rsyslog/class_rsyslog.inc:142 addons/rsyslog/class_rsyslog.inc:148
 msgid "-"
@@ -80,37 +78,37 @@ msgstr "â€“"
 
 #: addons/rsyslog/class_rsyslog.inc:144 addons/rsyslog/class_rsyslog.inc:150
 msgid "All"
-msgstr "vÅ¡e"
+msgstr "VÅ¡e"
 
 #: addons/rsyslog/class_rsyslog.inc:176
 #, php-format
 msgid "%s entries match the filter"
-msgstr "%s zÃ¡znamÅ¯ odpovÃdÃ¡ filtru"
+msgstr "%s poloÅ¾ek odpovÃdÃ¡ filtru"
 
 #: addons/rsyslog/class_rsyslog.inc:196
 #, php-format
 msgid "The selected server '%s' does not exists!"
-msgstr "Server '%s' neexistuje!"
+msgstr "ZvolenÃ½ server %s neexistuje!"
 
 #: addons/rsyslog/class_rsyslog.inc:348
 msgid "Emergency"
-msgstr "nalÃ©havost"
+msgstr "NalÃ©havost"
 
 #: addons/rsyslog/class_rsyslog.inc:349
 msgid "Alert"
-msgstr "vÃ½straha"
+msgstr "VÃ½straha"
 
 #: addons/rsyslog/class_rsyslog.inc:350
 msgid "Critical"
-msgstr "kritickÃ©"
+msgstr "KritickÃ©"
 
-#: addons/rsyslog/class_rsyslog.inc:351 addons/rsyslog/rSyslog.tpl.c:26
+#: addons/rsyslog/class_rsyslog.inc:351
 msgid "Error"
-msgstr "chyba"
+msgstr "Chyba"
 
 #: addons/rsyslog/class_rsyslog.inc:352
 msgid "Warning"
-msgstr "upozornÄ›nÃ"
+msgstr "VarovÃ¡nÃ"
 
 #: addons/rsyslog/class_rsyslog.inc:353
 msgid "Notice"
@@ -122,7 +120,7 @@ msgstr "informace"
 
 #: addons/rsyslog/class_rsyslog.inc:355
 msgid "Debug"
-msgstr "ladÃcÃ"
+msgstr "Diagnostikovat"
 
 #: addons/rsyslog/class_rsyslog.inc:362 addons/rsyslog/class_rsyslog.inc:399
 #, php-format
@@ -131,7 +129,7 @@ msgstr "neznÃ¡mÃ¡ (%s)"
 
 #: addons/rsyslog/class_rsyslog.inc:369
 msgid "Kernel"
-msgstr "jÃ¡dro"
+msgstr "JÃ¡dro"
 
 #: addons/rsyslog/class_rsyslog.inc:370
 msgid "User level"
@@ -143,23 +141,23 @@ msgstr "systÃ©m zprÃ¡v"
 
 #: addons/rsyslog/class_rsyslog.inc:372
 msgid "System daemon"
-msgstr "systÃ©movÃ© sluÅ¾by"
+msgstr "SystÃ©movÃ¡ sluÅ¾ba"
 
 #: addons/rsyslog/class_rsyslog.inc:373 addons/rsyslog/class_rsyslog.inc:379
 msgid "Security"
-msgstr "zabezpeÄenÃ"
+msgstr "ZabezpeÄenÃ"
 
 #: addons/rsyslog/class_rsyslog.inc:374
 msgid "Internal"
-msgstr "vnitÅ™nÃ"
+msgstr "VnitÅ™nÃ"
 
 #: addons/rsyslog/class_rsyslog.inc:375
 msgid "Printing"
-msgstr "vÃ½pis"
+msgstr "Tisk"
 
 #: addons/rsyslog/class_rsyslog.inc:376
 msgid "News"
-msgstr "zprÃ¡vy"
+msgstr "Novinky"
 
 #: addons/rsyslog/class_rsyslog.inc:377
 msgid "UUCP"
@@ -179,60 +177,12 @@ msgstr "NTP"
 
 #: addons/rsyslog/class_rsyslog.inc:382
 msgid "Log audit"
-msgstr "kontrola zÃ¡znamu"
+msgstr "Kontrola protokolu"
 
 #: addons/rsyslog/class_rsyslog.inc:383
 msgid "Log alert"
-msgstr "vÃ½straha zÃ¡znamu"
+msgstr "VÃ½straha protokolu"
 
 #: addons/rsyslog/class_rsyslog.inc:384
 msgid "Clock"
-msgstr "Äas"
-
-#: addons/rsyslog/rSyslog.tpl.c:2
-msgid "Filter"
-msgstr "filtr"
-
-#: addons/rsyslog/rSyslog.tpl.c:5
-msgid "Server"
-msgstr "server"
-
-#: addons/rsyslog/rSyslog.tpl.c:8
-msgid "Host"
-msgstr "stroj"
-
-#: addons/rsyslog/rSyslog.tpl.c:11 addons/rsyslog/rSyslog.tpl.c:41
-msgid "Severity"
-msgstr "zÃ¡vaÅ¾nost"
-
-#: addons/rsyslog/rSyslog.tpl.c:14
-msgid "From"
-msgstr "od"
-
-#: addons/rsyslog/rSyslog.tpl.c:17
-msgid "till"
-msgstr "dokud"
-
-#: addons/rsyslog/rSyslog.tpl.c:20 addons/rsyslog/rSyslog.tpl.c:23
-msgid "Search"
-msgstr "hledat"
-
-#: addons/rsyslog/rSyslog.tpl.c:29
-msgid "Date"
-msgstr "datum"
-
-#: addons/rsyslog/rSyslog.tpl.c:32
-msgid "Source"
-msgstr "zdroj"
-
-#: addons/rsyslog/rSyslog.tpl.c:35
-msgid "Header"
-msgstr "hlaviÄka"
-
-#: addons/rsyslog/rSyslog.tpl.c:38
-msgid "Facility"
-msgstr "zÃ¡vaÅ¾nost"
-
-#: addons/rsyslog/rSyslog.tpl.c:44
-msgid "Message"
-msgstr "zprÃ¡va"
+msgstr "ÄŒas"
diff --git a/rsyslog/locale/de/fusiondirectory.po b/rsyslog/locale/de/fusiondirectory.po
index 5861abd9ce20ab8491a47c8589f4602979206231..53fa37395dc900ac238539b69ce685ff2deb938e 100644
--- a/rsyslog/locale/de/fusiondirectory.po
+++ b/rsyslog/locale/de/fusiondirectory.po
@@ -3,16 +3,14 @@
 # This file is distributed under the same license as the PACKAGE package.
 # 
 # Translators:
-# Maik Wagner <maikwagner@yahoo.com>, 2013
-#  Stefan Koehler <stefan.koehler@GONICUS.de>, 2005
 msgid ""
 msgstr ""
-"Project-Id-Version: FusionDirectory-108\n"
+"Project-Id-Version: FusionDirectory-109\n"
 "Report-Msgid-Bugs-To: documentation@lists.fusiondirectory.org\n"
-"POT-Creation-Date: 2015-03-17 18:47+0100\n"
-"PO-Revision-Date: 2015-02-25 16:12+0000\n"
+"POT-Creation-Date: 2014-12-15 17:47+0100\n"
+"PO-Revision-Date: 2015-02-25 16:13+0000\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>\n"
-"Language-Team: German (http://www.transifex.com/projects/p/FusionDirectory-108/language/de/)\n"
+"Language-Team: German (http://www.transifex.com/projects/p/FusionDirectory-109/language/de/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -103,7 +101,7 @@ msgstr "Alarm"
 msgid "Critical"
 msgstr "Kritisch"
 
-#: addons/rsyslog/class_rsyslog.inc:351 addons/rsyslog/rSyslog.tpl.c:26
+#: addons/rsyslog/class_rsyslog.inc:351
 msgid "Error"
 msgstr "Fehler"
 
@@ -187,51 +185,3 @@ msgstr "Log alarm"
 #: addons/rsyslog/class_rsyslog.inc:384
 msgid "Clock"
 msgstr "Zeit"
-
-#: addons/rsyslog/rSyslog.tpl.c:2
-msgid "Filter"
-msgstr "Filter"
-
-#: addons/rsyslog/rSyslog.tpl.c:5
-msgid "Server"
-msgstr "Server"
-
-#: addons/rsyslog/rSyslog.tpl.c:8
-msgid "Host"
-msgstr "System"
-
-#: addons/rsyslog/rSyslog.tpl.c:11 addons/rsyslog/rSyslog.tpl.c:41
-msgid "Severity"
-msgstr "Schwere"
-
-#: addons/rsyslog/rSyslog.tpl.c:14
-msgid "From"
-msgstr "Von"
-
-#: addons/rsyslog/rSyslog.tpl.c:17
-msgid "till"
-msgstr "bis"
-
-#: addons/rsyslog/rSyslog.tpl.c:20 addons/rsyslog/rSyslog.tpl.c:23
-msgid "Search"
-msgstr "Suchen"
-
-#: addons/rsyslog/rSyslog.tpl.c:29
-msgid "Date"
-msgstr "Datum"
-
-#: addons/rsyslog/rSyslog.tpl.c:32
-msgid "Source"
-msgstr "Quelle"
-
-#: addons/rsyslog/rSyslog.tpl.c:35
-msgid "Header"
-msgstr "Kopfzeilen"
-
-#: addons/rsyslog/rSyslog.tpl.c:38
-msgid "Facility"
-msgstr "Facility"
-
-#: addons/rsyslog/rSyslog.tpl.c:44
-msgid "Message"
-msgstr "Nachricht"
diff --git a/rsyslog/locale/el_GR/fusiondirectory.po b/rsyslog/locale/el_GR/fusiondirectory.po
new file mode 100644
index 0000000000000000000000000000000000000000..3ce19b2efc82fa63bc5b99c565d585b2f575cba9
--- /dev/null
+++ b/rsyslog/locale/el_GR/fusiondirectory.po
@@ -0,0 +1,187 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR FusionDirectory Project
+# This file is distributed under the same license as the PACKAGE package.
+# 
+# Translators:
+msgid ""
+msgstr ""
+"Project-Id-Version: FusionDirectory-109\n"
+"Report-Msgid-Bugs-To: documentation@lists.fusiondirectory.org\n"
+"POT-Creation-Date: 2014-12-15 17:47+0100\n"
+"PO-Revision-Date: 2015-05-30 11:45+0000\n"
+"Last-Translator: Benoit Mortier <benoit.mortier@opensides.be>\n"
+"Language-Team: Greek (Greece) (http://www.transifex.com/projects/p/FusionDirectory-109/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/services/rsyslog/class_serviceSyslog.inc:30
+#: admin/systems/services/rsyslog/class_serviceSyslog.inc:31
+msgid "Logs service"
+msgstr ""
+
+#: admin/systems/services/rsyslog/class_serviceSyslog.inc:31
+msgid "Services"
+msgstr ""
+
+#: admin/systems/services/rsyslog/class_serviceSyslog.inc:41
+msgid "Logging service"
+msgstr ""
+
+#: admin/systems/services/rsyslog/class_serviceSyslog.inc:44
+msgid "Driver"
+msgstr ""
+
+#: admin/systems/services/rsyslog/class_serviceSyslog.inc:44
+msgid "Driver to use to contact this database."
+msgstr ""
+
+#: admin/systems/services/rsyslog/class_serviceSyslog.inc:48
+msgid "Database"
+msgstr ""
+
+#: admin/systems/services/rsyslog/class_serviceSyslog.inc:48
+msgid "Database in which syslog stores its informations"
+msgstr ""
+
+#: admin/systems/services/rsyslog/class_serviceSyslog.inc:53
+msgid "Database user"
+msgstr ""
+
+#: admin/systems/services/rsyslog/class_serviceSyslog.inc:53
+msgid "Database administrator"
+msgstr ""
+
+#: admin/systems/services/rsyslog/class_serviceSyslog.inc:58
+msgid "Password"
+msgstr ""
+
+#: admin/systems/services/rsyslog/class_serviceSyslog.inc:58
+msgid "Password for the database administrator"
+msgstr ""
+
+#: addons/rsyslog/class_rsyslog.inc:47 addons/rsyslog/class_rsyslog.inc:53
+#: addons/rsyslog/main.inc:38
+msgid "System logs"
+msgstr ""
+
+#: addons/rsyslog/class_rsyslog.inc:48
+msgid "This plugin allow to View system logs"
+msgstr ""
+
+#: addons/rsyslog/class_rsyslog.inc:142 addons/rsyslog/class_rsyslog.inc:148
+msgid "-"
+msgstr ""
+
+#: addons/rsyslog/class_rsyslog.inc:144 addons/rsyslog/class_rsyslog.inc:150
+msgid "All"
+msgstr ""
+
+#: addons/rsyslog/class_rsyslog.inc:176
+#, php-format
+msgid "%s entries match the filter"
+msgstr ""
+
+#: addons/rsyslog/class_rsyslog.inc:196
+#, php-format
+msgid "The selected server '%s' does not exists!"
+msgstr ""
+
+#: addons/rsyslog/class_rsyslog.inc:348
+msgid "Emergency"
+msgstr ""
+
+#: addons/rsyslog/class_rsyslog.inc:349
+msgid "Alert"
+msgstr ""
+
+#: addons/rsyslog/class_rsyslog.inc:350
+msgid "Critical"
+msgstr ""
+
+#: addons/rsyslog/class_rsyslog.inc:351
+msgid "Error"
+msgstr ""
+
+#: addons/rsyslog/class_rsyslog.inc:352
+msgid "Warning"
+msgstr ""
+
+#: addons/rsyslog/class_rsyslog.inc:353
+msgid "Notice"
+msgstr ""
+
+#: addons/rsyslog/class_rsyslog.inc:354
+msgid "Informational"
+msgstr ""
+
+#: addons/rsyslog/class_rsyslog.inc:355
+msgid "Debug"
+msgstr ""
+
+#: addons/rsyslog/class_rsyslog.inc:362 addons/rsyslog/class_rsyslog.inc:399
+#, php-format
+msgid "Unknown (%s)"
+msgstr ""
+
+#: addons/rsyslog/class_rsyslog.inc:369
+msgid "Kernel"
+msgstr ""
+
+#: addons/rsyslog/class_rsyslog.inc:370
+msgid "User level"
+msgstr ""
+
+#: addons/rsyslog/class_rsyslog.inc:371
+msgid "Mail system"
+msgstr ""
+
+#: addons/rsyslog/class_rsyslog.inc:372
+msgid "System daemon"
+msgstr ""
+
+#: addons/rsyslog/class_rsyslog.inc:373 addons/rsyslog/class_rsyslog.inc:379
+msgid "Security"
+msgstr ""
+
+#: addons/rsyslog/class_rsyslog.inc:374
+msgid "Internal"
+msgstr ""
+
+#: addons/rsyslog/class_rsyslog.inc:375
+msgid "Printing"
+msgstr ""
+
+#: addons/rsyslog/class_rsyslog.inc:376
+msgid "News"
+msgstr ""
+
+#: addons/rsyslog/class_rsyslog.inc:377
+msgid "UUCP"
+msgstr ""
+
+#: addons/rsyslog/class_rsyslog.inc:378
+msgid "Cron"
+msgstr ""
+
+#: addons/rsyslog/class_rsyslog.inc:380
+msgid "FTP"
+msgstr ""
+
+#: addons/rsyslog/class_rsyslog.inc:381
+msgid "NTP"
+msgstr ""
+
+#: addons/rsyslog/class_rsyslog.inc:382
+msgid "Log audit"
+msgstr ""
+
+#: addons/rsyslog/class_rsyslog.inc:383
+msgid "Log alert"
+msgstr ""
+
+#: addons/rsyslog/class_rsyslog.inc:384
+msgid "Clock"
+msgstr ""
diff --git a/rsyslog/locale/en/fusiondirectory.po b/rsyslog/locale/en/fusiondirectory.po
index 65343a6ef6f41da3a2ec0062df872e7799f83582..f29eacc061943408810670a9b4fda8b7d31433a6 100644
--- a/rsyslog/locale/en/fusiondirectory.po
+++ b/rsyslog/locale/en/fusiondirectory.po
@@ -6,13 +6,13 @@
 #, fuzzy
 msgid ""
 msgstr ""
-"Project-Id-Version: PACKAGE VERSION\n"
-"Report-Msgid-Bugs-To: documentation@lists.fusiondirectory.org\n"
-"POT-Creation-Date: 2015-03-31 11:49+0200\n"
+"Project-Id-Version: FusionDirectory VERSION\n"
+"Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
+"POT-Creation-Date: 2015-05-30 15:30+0200\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
-"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
-"Language-Team: LANGUAGE <LL@li.org>\n"
-"Language: \n"
+"Last-Translator: FusionDirectory project <contact@fusiondirectory.org>\n"
+"Language-Team: English\n"
+"Language: en\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
diff --git a/rsyslog/locale/es/fusiondirectory.po b/rsyslog/locale/es/fusiondirectory.po
index c3df0edc09de027643a77d79293b44b907552e69..2fd06466b13b0f4a99221192bdff481122209bf4 100644
--- a/rsyslog/locale/es/fusiondirectory.po
+++ b/rsyslog/locale/es/fusiondirectory.po
@@ -3,16 +3,14 @@
 # This file is distributed under the same license as the PACKAGE package.
 # 
 # Translators:
-# lars_g <lars.gold@gmail.com>, 2012
-# lars_g <lars.gold@gmail.com>, 2012
 msgid ""
 msgstr ""
-"Project-Id-Version: FusionDirectory-108\n"
+"Project-Id-Version: FusionDirectory-109\n"
 "Report-Msgid-Bugs-To: documentation@lists.fusiondirectory.org\n"
-"POT-Creation-Date: 2015-03-17 18:47+0100\n"
-"PO-Revision-Date: 2015-02-25 16:12+0000\n"
+"POT-Creation-Date: 2014-12-15 17:47+0100\n"
+"PO-Revision-Date: 2015-02-25 16:13+0000\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>\n"
-"Language-Team: Spanish (http://www.transifex.com/projects/p/FusionDirectory-108/language/es/)\n"
+"Language-Team: Spanish (http://www.transifex.com/projects/p/FusionDirectory-109/language/es/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -103,7 +101,7 @@ msgstr "Alerta"
 msgid "Critical"
 msgstr "Critico"
 
-#: addons/rsyslog/class_rsyslog.inc:351 addons/rsyslog/rSyslog.tpl.c:26
+#: addons/rsyslog/class_rsyslog.inc:351
 msgid "Error"
 msgstr "Error"
 
@@ -187,51 +185,3 @@ msgstr "Alerta de bitÃ¡cora"
 #: addons/rsyslog/class_rsyslog.inc:384
 msgid "Clock"
 msgstr "Reloj"
-
-#: addons/rsyslog/rSyslog.tpl.c:2
-msgid "Filter"
-msgstr "Filtro"
-
-#: addons/rsyslog/rSyslog.tpl.c:5
-msgid "Server"
-msgstr "Servidor"
-
-#: addons/rsyslog/rSyslog.tpl.c:8
-msgid "Host"
-msgstr "Nombre de equipo"
-
-#: addons/rsyslog/rSyslog.tpl.c:11 addons/rsyslog/rSyslog.tpl.c:41
-msgid "Severity"
-msgstr "Importancia"
-
-#: addons/rsyslog/rSyslog.tpl.c:14
-msgid "From"
-msgstr "Desde"
-
-#: addons/rsyslog/rSyslog.tpl.c:17
-msgid "till"
-msgstr "hasta"
-
-#: addons/rsyslog/rSyslog.tpl.c:20 addons/rsyslog/rSyslog.tpl.c:23
-msgid "Search"
-msgstr "Buscar"
-
-#: addons/rsyslog/rSyslog.tpl.c:29
-msgid "Date"
-msgstr "Fecha"
-
-#: addons/rsyslog/rSyslog.tpl.c:32
-msgid "Source"
-msgstr "Origen"
-
-#: addons/rsyslog/rSyslog.tpl.c:35
-msgid "Header"
-msgstr "Cabecera"
-
-#: addons/rsyslog/rSyslog.tpl.c:38
-msgid "Facility"
-msgstr "Facilidad"
-
-#: addons/rsyslog/rSyslog.tpl.c:44
-msgid "Message"
-msgstr "Mensaje"
diff --git a/rsyslog/locale/es_VE/fusiondirectory.po b/rsyslog/locale/es_VE/fusiondirectory.po
index 5d7245ce76f8c32e1bbb08520c3f27ec3e5a61e7..c9c82917643490b6b99141121c22ac052f3a32e2 100644
--- a/rsyslog/locale/es_VE/fusiondirectory.po
+++ b/rsyslog/locale/es_VE/fusiondirectory.po
@@ -3,16 +3,14 @@
 # This file is distributed under the same license as the PACKAGE package.
 # 
 # Translators:
-# lars_g <lars.gold@gmail.com>, 2012
-# lars_g <lars.gold@gmail.com>, 2012
 msgid ""
 msgstr ""
-"Project-Id-Version: FusionDirectory-108\n"
+"Project-Id-Version: FusionDirectory-109\n"
 "Report-Msgid-Bugs-To: documentation@lists.fusiondirectory.org\n"
-"POT-Creation-Date: 2015-03-17 18:47+0100\n"
-"PO-Revision-Date: 2015-02-25 16:12+0000\n"
+"POT-Creation-Date: 2014-12-15 17:47+0100\n"
+"PO-Revision-Date: 2015-02-25 16:13+0000\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>\n"
-"Language-Team: Spanish (Venezuela) (http://www.transifex.com/projects/p/FusionDirectory-108/language/es_VE/)\n"
+"Language-Team: Spanish (Venezuela) (http://www.transifex.com/projects/p/FusionDirectory-109/language/es_VE/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -103,7 +101,7 @@ msgstr "Alerta"
 msgid "Critical"
 msgstr "Critico"
 
-#: addons/rsyslog/class_rsyslog.inc:351 addons/rsyslog/rSyslog.tpl.c:26
+#: addons/rsyslog/class_rsyslog.inc:351
 msgid "Error"
 msgstr "Error"
 
@@ -187,51 +185,3 @@ msgstr "Alerta de bitÃ¡cora"
 #: addons/rsyslog/class_rsyslog.inc:384
 msgid "Clock"
 msgstr "Reloj"
-
-#: addons/rsyslog/rSyslog.tpl.c:2
-msgid "Filter"
-msgstr "Filtro"
-
-#: addons/rsyslog/rSyslog.tpl.c:5
-msgid "Server"
-msgstr "Servidor"
-
-#: addons/rsyslog/rSyslog.tpl.c:8
-msgid "Host"
-msgstr "Nombre de equipo"
-
-#: addons/rsyslog/rSyslog.tpl.c:11 addons/rsyslog/rSyslog.tpl.c:41
-msgid "Severity"
-msgstr "Importancia"
-
-#: addons/rsyslog/rSyslog.tpl.c:14
-msgid "From"
-msgstr "Desde"
-
-#: addons/rsyslog/rSyslog.tpl.c:17
-msgid "till"
-msgstr "hasta"
-
-#: addons/rsyslog/rSyslog.tpl.c:20 addons/rsyslog/rSyslog.tpl.c:23
-msgid "Search"
-msgstr "Buscar"
-
-#: addons/rsyslog/rSyslog.tpl.c:29
-msgid "Date"
-msgstr "Fecha"
-
-#: addons/rsyslog/rSyslog.tpl.c:32
-msgid "Source"
-msgstr "Origen"
-
-#: addons/rsyslog/rSyslog.tpl.c:35
-msgid "Header"
-msgstr "Cabecera"
-
-#: addons/rsyslog/rSyslog.tpl.c:38
-msgid "Facility"
-msgstr "Facilidad"
-
-#: addons/rsyslog/rSyslog.tpl.c:44
-msgid "Message"
-msgstr "Mensaje"
diff --git a/rsyslog/locale/fa_IR/fusiondirectory.po b/rsyslog/locale/fa_IR/fusiondirectory.po
index fee833a4831f2deaba27dd0b4a5960aa5e80fafd..f362a7bd6995c40e3fa82a64a2b00112f8ab9ddd 100644
--- a/rsyslog/locale/fa_IR/fusiondirectory.po
+++ b/rsyslog/locale/fa_IR/fusiondirectory.po
@@ -5,12 +5,12 @@
 # Translators:
 msgid ""
 msgstr ""
-"Project-Id-Version: FusionDirectory-108\n"
+"Project-Id-Version: FusionDirectory-109\n"
 "Report-Msgid-Bugs-To: documentation@lists.fusiondirectory.org\n"
-"POT-Creation-Date: 2015-03-17 18:47+0100\n"
-"PO-Revision-Date: 2015-02-25 15:53+0000\n"
+"POT-Creation-Date: 2014-12-15 17:47+0100\n"
+"PO-Revision-Date: 2014-12-15 17:03+0000\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>\n"
-"Language-Team: Persian (Iran) (http://www.transifex.com/projects/p/FusionDirectory-108/language/fa_IR/)\n"
+"Language-Team: Persian (Iran) (http://www.transifex.com/projects/p/FusionDirectory-109/language/fa_IR/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -101,7 +101,7 @@ msgstr ""
 msgid "Critical"
 msgstr ""
 
-#: addons/rsyslog/class_rsyslog.inc:351 addons/rsyslog/rSyslog.tpl.c:26
+#: addons/rsyslog/class_rsyslog.inc:351
 msgid "Error"
 msgstr "Ø®Ø·Ø§"
 
@@ -185,51 +185,3 @@ msgstr ""
 #: addons/rsyslog/class_rsyslog.inc:384
 msgid "Clock"
 msgstr ""
-
-#: addons/rsyslog/rSyslog.tpl.c:2
-msgid "Filter"
-msgstr ""
-
-#: addons/rsyslog/rSyslog.tpl.c:5
-msgid "Server"
-msgstr ""
-
-#: addons/rsyslog/rSyslog.tpl.c:8
-msgid "Host"
-msgstr ""
-
-#: addons/rsyslog/rSyslog.tpl.c:11 addons/rsyslog/rSyslog.tpl.c:41
-msgid "Severity"
-msgstr ""
-
-#: addons/rsyslog/rSyslog.tpl.c:14
-msgid "From"
-msgstr ""
-
-#: addons/rsyslog/rSyslog.tpl.c:17
-msgid "till"
-msgstr ""
-
-#: addons/rsyslog/rSyslog.tpl.c:20 addons/rsyslog/rSyslog.tpl.c:23
-msgid "Search"
-msgstr ""
-
-#: addons/rsyslog/rSyslog.tpl.c:29
-msgid "Date"
-msgstr ""
-
-#: addons/rsyslog/rSyslog.tpl.c:32
-msgid "Source"
-msgstr ""
-
-#: addons/rsyslog/rSyslog.tpl.c:35
-msgid "Header"
-msgstr ""
-
-#: addons/rsyslog/rSyslog.tpl.c:38
-msgid "Facility"
-msgstr ""
-
-#: addons/rsyslog/rSyslog.tpl.c:44
-msgid "Message"
-msgstr ""
diff --git a/rsyslog/locale/fr/fusiondirectory.po b/rsyslog/locale/fr/fusiondirectory.po
index 32641baa0a50553ef986432e8122f333bc37aa51..0d0f2811513f27c93cd84e7d8fd1bd33dad6d7d8 100644
--- a/rsyslog/locale/fr/fusiondirectory.po
+++ b/rsyslog/locale/fr/fusiondirectory.po
@@ -3,24 +3,15 @@
 # This file is distributed under the same license as the PACKAGE package.
 # 
 # Translators:
-# Benoit Mortier <benoit.mortier@opensides.be>, 2010
-# Benoit Mortier <benoit.mortier@opensides.be>, 2010
-# MCMic, 2014
 # fusiondirectory <contact@fusiondirectory.org>, 2013
-# fusiondirectory <contact@fusiondirectory.org>, 2012
-# fusiondirectory <contact@fusiondirectory.org>, 2012-2013
-# fusiondirectory <contact@fusiondirectory.org>, 2012
-# poterealpopolo <giuliano@opensides.be>, 2012
-# MCMic, 2014
-# poterealpopolo <giuliano@opensides.be>, 2012
 msgid ""
 msgstr ""
-"Project-Id-Version: FusionDirectory-108\n"
+"Project-Id-Version: FusionDirectory-109\n"
 "Report-Msgid-Bugs-To: documentation@lists.fusiondirectory.org\n"
-"POT-Creation-Date: 2015-03-17 18:47+0100\n"
-"PO-Revision-Date: 2015-02-25 16:12+0000\n"
+"POT-Creation-Date: 2014-12-15 17:47+0100\n"
+"PO-Revision-Date: 2015-02-25 16:13+0000\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>\n"
-"Language-Team: French (http://www.transifex.com/projects/p/FusionDirectory-108/language/fr/)\n"
+"Language-Team: French (http://www.transifex.com/projects/p/FusionDirectory-109/language/fr/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -34,7 +25,7 @@ msgstr "Service de Journaux systÃ¨mes"
 
 #: admin/systems/services/rsyslog/class_serviceSyslog.inc:31
 msgid "Services"
-msgstr "Services"
+msgstr "Service"
 
 #: admin/systems/services/rsyslog/class_serviceSyslog.inc:41
 msgid "Logging service"
@@ -46,7 +37,7 @@ msgstr "Pilote"
 
 #: admin/systems/services/rsyslog/class_serviceSyslog.inc:44
 msgid "Driver to use to contact this database."
-msgstr "Driver pour se connecter Ã  cette base de donnÃ©es."
+msgstr "Driver pour se connecter Ã  cette base de donnÃ©es"
 
 #: admin/systems/services/rsyslog/class_serviceSyslog.inc:48
 msgid "Database"
@@ -58,7 +49,7 @@ msgstr "Base de donnÃ©es dans laquelle syslog stocke ses informations"
 
 #: admin/systems/services/rsyslog/class_serviceSyslog.inc:53
 msgid "Database user"
-msgstr "Utilisateur de la base de donnÃ©es"
+msgstr "Base de donnÃ©es utilisateur"
 
 #: admin/systems/services/rsyslog/class_serviceSyslog.inc:53
 msgid "Database administrator"
@@ -79,7 +70,7 @@ msgstr "Journaux systÃ¨mes"
 
 #: addons/rsyslog/class_rsyslog.inc:48
 msgid "This plugin allow to View system logs"
-msgstr "Ce plugin vous permet de voir les journaux systÃ¨mes"
+msgstr "Cette extension vous permet de voir les journaux systÃ¨mes"
 
 #: addons/rsyslog/class_rsyslog.inc:142 addons/rsyslog/class_rsyslog.inc:148
 msgid "-"
@@ -87,7 +78,7 @@ msgstr "-"
 
 #: addons/rsyslog/class_rsyslog.inc:144 addons/rsyslog/class_rsyslog.inc:150
 msgid "All"
-msgstr "Tous"
+msgstr "Tout"
 
 #: addons/rsyslog/class_rsyslog.inc:176
 #, php-format
@@ -97,7 +88,7 @@ msgstr "%s entrÃ©es correspondent au filtre"
 #: addons/rsyslog/class_rsyslog.inc:196
 #, php-format
 msgid "The selected server '%s' does not exists!"
-msgstr "Le serveur '%s' n'existe pasâ€¯!"
+msgstr "Le serveur sÃ©lectionne '%s' n'existe pas !"
 
 #: addons/rsyslog/class_rsyslog.inc:348
 msgid "Emergency"
@@ -111,7 +102,7 @@ msgstr "Alerte"
 msgid "Critical"
 msgstr "Critique"
 
-#: addons/rsyslog/class_rsyslog.inc:351 addons/rsyslog/rSyslog.tpl.c:26
+#: addons/rsyslog/class_rsyslog.inc:351
 msgid "Error"
 msgstr "Erreur"
 
@@ -121,7 +112,7 @@ msgstr "Avertissement"
 
 #: addons/rsyslog/class_rsyslog.inc:353
 msgid "Notice"
-msgstr "Remarque"
+msgstr "Note"
 
 #: addons/rsyslog/class_rsyslog.inc:354
 msgid "Informational"
@@ -138,7 +129,7 @@ msgstr "Inconnu (%s)"
 
 #: addons/rsyslog/class_rsyslog.inc:369
 msgid "Kernel"
-msgstr "Noyau"
+msgstr "Kernel"
 
 #: addons/rsyslog/class_rsyslog.inc:370
 msgid "User level"
@@ -146,7 +137,7 @@ msgstr "Niveau utilisateur"
 
 #: addons/rsyslog/class_rsyslog.inc:371
 msgid "Mail system"
-msgstr "SystÃ¨me de courriel"
+msgstr "Messagerie"
 
 #: addons/rsyslog/class_rsyslog.inc:372
 msgid "System daemon"
@@ -166,7 +157,7 @@ msgstr "Impression"
 
 #: addons/rsyslog/class_rsyslog.inc:376
 msgid "News"
-msgstr "Nouvelles"
+msgstr "News"
 
 #: addons/rsyslog/class_rsyslog.inc:377
 msgid "UUCP"
@@ -186,60 +177,12 @@ msgstr "NTP"
 
 #: addons/rsyslog/class_rsyslog.inc:382
 msgid "Log audit"
-msgstr "Audit des journaux systÃ¨mes"
+msgstr "Audit du Journaux systÃ¨mes"
 
 #: addons/rsyslog/class_rsyslog.inc:383
 msgid "Log alert"
-msgstr "Alerte journaux systÃ¨mes"
+msgstr "Avertissement du Journaux systÃ¨mes"
 
 #: addons/rsyslog/class_rsyslog.inc:384
 msgid "Clock"
 msgstr "Horloge"
-
-#: addons/rsyslog/rSyslog.tpl.c:2
-msgid "Filter"
-msgstr "Filtre"
-
-#: addons/rsyslog/rSyslog.tpl.c:5
-msgid "Server"
-msgstr "Serveur"
-
-#: addons/rsyslog/rSyslog.tpl.c:8
-msgid "Host"
-msgstr "HÃ´te"
-
-#: addons/rsyslog/rSyslog.tpl.c:11 addons/rsyslog/rSyslog.tpl.c:41
-msgid "Severity"
-msgstr "SÃ©veritÃ©"
-
-#: addons/rsyslog/rSyslog.tpl.c:14
-msgid "From"
-msgstr "Depuis"
-
-#: addons/rsyslog/rSyslog.tpl.c:17
-msgid "till"
-msgstr "jusqu'au"
-
-#: addons/rsyslog/rSyslog.tpl.c:20 addons/rsyslog/rSyslog.tpl.c:23
-msgid "Search"
-msgstr "Recherche"
-
-#: addons/rsyslog/rSyslog.tpl.c:29
-msgid "Date"
-msgstr "Date"
-
-#: addons/rsyslog/rSyslog.tpl.c:32
-msgid "Source"
-msgstr "Source"
-
-#: addons/rsyslog/rSyslog.tpl.c:35
-msgid "Header"
-msgstr "EntÃªte"
-
-#: addons/rsyslog/rSyslog.tpl.c:38
-msgid "Facility"
-msgstr "FacilitÃ©"
-
-#: addons/rsyslog/rSyslog.tpl.c:44
-msgid "Message"
-msgstr "Message"
diff --git a/rsyslog/locale/id/fusiondirectory.po b/rsyslog/locale/id/fusiondirectory.po
index b3d681cea039b0486e095c386e97842e45c587cd..3732452d4444f30c3633fd2ccda5048491761b00 100644
--- a/rsyslog/locale/id/fusiondirectory.po
+++ b/rsyslog/locale/id/fusiondirectory.po
@@ -5,12 +5,12 @@
 # Translators:
 msgid ""
 msgstr ""
-"Project-Id-Version: FusionDirectory-108\n"
+"Project-Id-Version: FusionDirectory-109\n"
 "Report-Msgid-Bugs-To: documentation@lists.fusiondirectory.org\n"
-"POT-Creation-Date: 2015-03-17 18:47+0100\n"
-"PO-Revision-Date: 2015-02-25 15:53+0000\n"
+"POT-Creation-Date: 2014-12-15 17:47+0100\n"
+"PO-Revision-Date: 2014-12-15 17:03+0000\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>\n"
-"Language-Team: Indonesian (http://www.transifex.com/projects/p/FusionDirectory-108/language/id/)\n"
+"Language-Team: Indonesian (http://www.transifex.com/projects/p/FusionDirectory-109/language/id/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -101,7 +101,7 @@ msgstr ""
 msgid "Critical"
 msgstr ""
 
-#: addons/rsyslog/class_rsyslog.inc:351 addons/rsyslog/rSyslog.tpl.c:26
+#: addons/rsyslog/class_rsyslog.inc:351
 msgid "Error"
 msgstr ""
 
@@ -185,51 +185,3 @@ msgstr ""
 #: addons/rsyslog/class_rsyslog.inc:384
 msgid "Clock"
 msgstr ""
-
-#: addons/rsyslog/rSyslog.tpl.c:2
-msgid "Filter"
-msgstr ""
-
-#: addons/rsyslog/rSyslog.tpl.c:5
-msgid "Server"
-msgstr ""
-
-#: addons/rsyslog/rSyslog.tpl.c:8
-msgid "Host"
-msgstr ""
-
-#: addons/rsyslog/rSyslog.tpl.c:11 addons/rsyslog/rSyslog.tpl.c:41
-msgid "Severity"
-msgstr ""
-
-#: addons/rsyslog/rSyslog.tpl.c:14
-msgid "From"
-msgstr ""
-
-#: addons/rsyslog/rSyslog.tpl.c:17
-msgid "till"
-msgstr ""
-
-#: addons/rsyslog/rSyslog.tpl.c:20 addons/rsyslog/rSyslog.tpl.c:23
-msgid "Search"
-msgstr ""
-
-#: addons/rsyslog/rSyslog.tpl.c:29
-msgid "Date"
-msgstr ""
-
-#: addons/rsyslog/rSyslog.tpl.c:32
-msgid "Source"
-msgstr ""
-
-#: addons/rsyslog/rSyslog.tpl.c:35
-msgid "Header"
-msgstr ""
-
-#: addons/rsyslog/rSyslog.tpl.c:38
-msgid "Facility"
-msgstr ""
-
-#: addons/rsyslog/rSyslog.tpl.c:44
-msgid "Message"
-msgstr ""
diff --git a/rsyslog/locale/it/fusiondirectory.po b/rsyslog/locale/it/fusiondirectory.po
index e95b6f0a23ab7849c494500ad46fd4bf0a344517..27a4e0b4d6a789e504ea33a98fa5d3ec51532fa6 100644
--- a/rsyslog/locale/it/fusiondirectory.po
+++ b/rsyslog/locale/it/fusiondirectory.po
@@ -3,18 +3,14 @@
 # This file is distributed under the same license as the PACKAGE package.
 # 
 # Translators:
-# poterealpopolo <giuliano@opensides.be>, 2011
-# poterealpopolo <giuliano@opensides.be>, 2013
-# poterealpopolo <giuliano@opensides.be>, 2012
-# poterealpopolo <giuliano@opensides.be>, 2011-2013
 msgid ""
 msgstr ""
-"Project-Id-Version: FusionDirectory-108\n"
+"Project-Id-Version: FusionDirectory-109\n"
 "Report-Msgid-Bugs-To: documentation@lists.fusiondirectory.org\n"
-"POT-Creation-Date: 2015-03-17 18:47+0100\n"
-"PO-Revision-Date: 2015-02-25 16:12+0000\n"
+"POT-Creation-Date: 2014-12-15 17:47+0100\n"
+"PO-Revision-Date: 2015-02-25 16:13+0000\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>\n"
-"Language-Team: Italian (http://www.transifex.com/projects/p/FusionDirectory-108/language/it/)\n"
+"Language-Team: Italian (http://www.transifex.com/projects/p/FusionDirectory-109/language/it/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -52,7 +48,7 @@ msgstr "Base dati nella quale syslog immagazzina le sue informazioni"
 
 #: admin/systems/services/rsyslog/class_serviceSyslog.inc:53
 msgid "Database user"
-msgstr "Utente del database"
+msgstr "Database utente"
 
 #: admin/systems/services/rsyslog/class_serviceSyslog.inc:53
 msgid "Database administrator"
@@ -105,7 +101,7 @@ msgstr "Allarme"
 msgid "Critical"
 msgstr "Critico"
 
-#: addons/rsyslog/class_rsyslog.inc:351 addons/rsyslog/rSyslog.tpl.c:26
+#: addons/rsyslog/class_rsyslog.inc:351
 msgid "Error"
 msgstr "Errore"
 
@@ -189,51 +185,3 @@ msgstr "Registro degli avvisi"
 #: addons/rsyslog/class_rsyslog.inc:384
 msgid "Clock"
 msgstr "Ora"
-
-#: addons/rsyslog/rSyslog.tpl.c:2
-msgid "Filter"
-msgstr "Filtro"
-
-#: addons/rsyslog/rSyslog.tpl.c:5
-msgid "Server"
-msgstr "Server"
-
-#: addons/rsyslog/rSyslog.tpl.c:8
-msgid "Host"
-msgstr "Host"
-
-#: addons/rsyslog/rSyslog.tpl.c:11 addons/rsyslog/rSyslog.tpl.c:41
-msgid "Severity"
-msgstr "GravitÃ "
-
-#: addons/rsyslog/rSyslog.tpl.c:14
-msgid "From"
-msgstr "da"
-
-#: addons/rsyslog/rSyslog.tpl.c:17
-msgid "till"
-msgstr "fino a"
-
-#: addons/rsyslog/rSyslog.tpl.c:20 addons/rsyslog/rSyslog.tpl.c:23
-msgid "Search"
-msgstr "Cerca"
-
-#: addons/rsyslog/rSyslog.tpl.c:29
-msgid "Date"
-msgstr "Data"
-
-#: addons/rsyslog/rSyslog.tpl.c:32
-msgid "Source"
-msgstr "Origine"
-
-#: addons/rsyslog/rSyslog.tpl.c:35
-msgid "Header"
-msgstr "Intestazione"
-
-#: addons/rsyslog/rSyslog.tpl.c:38
-msgid "Facility"
-msgstr "Servizi"
-
-#: addons/rsyslog/rSyslog.tpl.c:44
-msgid "Message"
-msgstr "Messaggio"
diff --git a/rsyslog/locale/lv/fusiondirectory.po b/rsyslog/locale/lv/fusiondirectory.po
index a0d17e4bcd6e66a742819ce2099db9fc1098d851..1fe92e6764e2bac21663d7f1c44999a6dfe00366 100644
--- a/rsyslog/locale/lv/fusiondirectory.po
+++ b/rsyslog/locale/lv/fusiondirectory.po
@@ -5,12 +5,12 @@
 # Translators:
 msgid ""
 msgstr ""
-"Project-Id-Version: FusionDirectory-108\n"
+"Project-Id-Version: FusionDirectory-109\n"
 "Report-Msgid-Bugs-To: documentation@lists.fusiondirectory.org\n"
-"POT-Creation-Date: 2015-03-17 18:47+0100\n"
-"PO-Revision-Date: 2015-02-25 15:53+0000\n"
+"POT-Creation-Date: 2014-12-15 17:47+0100\n"
+"PO-Revision-Date: 2014-12-15 17:03+0000\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>\n"
-"Language-Team: Latvian (http://www.transifex.com/projects/p/FusionDirectory-108/language/lv/)\n"
+"Language-Team: Latvian (http://www.transifex.com/projects/p/FusionDirectory-109/language/lv/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -101,7 +101,7 @@ msgstr ""
 msgid "Critical"
 msgstr ""
 
-#: addons/rsyslog/class_rsyslog.inc:351 addons/rsyslog/rSyslog.tpl.c:26
+#: addons/rsyslog/class_rsyslog.inc:351
 msgid "Error"
 msgstr ""
 
@@ -185,51 +185,3 @@ msgstr ""
 #: addons/rsyslog/class_rsyslog.inc:384
 msgid "Clock"
 msgstr ""
-
-#: addons/rsyslog/rSyslog.tpl.c:2
-msgid "Filter"
-msgstr ""
-
-#: addons/rsyslog/rSyslog.tpl.c:5
-msgid "Server"
-msgstr ""
-
-#: addons/rsyslog/rSyslog.tpl.c:8
-msgid "Host"
-msgstr ""
-
-#: addons/rsyslog/rSyslog.tpl.c:11 addons/rsyslog/rSyslog.tpl.c:41
-msgid "Severity"
-msgstr ""
-
-#: addons/rsyslog/rSyslog.tpl.c:14
-msgid "From"
-msgstr ""
-
-#: addons/rsyslog/rSyslog.tpl.c:17
-msgid "till"
-msgstr ""
-
-#: addons/rsyslog/rSyslog.tpl.c:20 addons/rsyslog/rSyslog.tpl.c:23
-msgid "Search"
-msgstr ""
-
-#: addons/rsyslog/rSyslog.tpl.c:29
-msgid "Date"
-msgstr ""
-
-#: addons/rsyslog/rSyslog.tpl.c:32
-msgid "Source"
-msgstr ""
-
-#: addons/rsyslog/rSyslog.tpl.c:35
-msgid "Header"
-msgstr ""
-
-#: addons/rsyslog/rSyslog.tpl.c:38
-msgid "Facility"
-msgstr ""
-
-#: addons/rsyslog/rSyslog.tpl.c:44
-msgid "Message"
-msgstr ""
diff --git a/rsyslog/locale/nb/fusiondirectory.po b/rsyslog/locale/nb/fusiondirectory.po
index 9650fee873a5070bbf7de443e077202cb1bb8e54..aba68465317f87b070f20808d624949ec1c145f7 100644
--- a/rsyslog/locale/nb/fusiondirectory.po
+++ b/rsyslog/locale/nb/fusiondirectory.po
@@ -5,12 +5,12 @@
 # Translators:
 msgid ""
 msgstr ""
-"Project-Id-Version: FusionDirectory-108\n"
+"Project-Id-Version: FusionDirectory-109\n"
 "Report-Msgid-Bugs-To: documentation@lists.fusiondirectory.org\n"
-"POT-Creation-Date: 2015-03-17 18:47+0100\n"
-"PO-Revision-Date: 2015-02-25 16:12+0000\n"
+"POT-Creation-Date: 2014-12-15 17:47+0100\n"
+"PO-Revision-Date: 2014-12-15 17:03+0000\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>\n"
-"Language-Team: Norwegian BokmÃ¥l (http://www.transifex.com/projects/p/FusionDirectory-108/language/nb/)\n"
+"Language-Team: Norwegian BokmÃ¥l (http://www.transifex.com/projects/p/FusionDirectory-109/language/nb/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -101,7 +101,7 @@ msgstr ""
 msgid "Critical"
 msgstr ""
 
-#: addons/rsyslog/class_rsyslog.inc:351 addons/rsyslog/rSyslog.tpl.c:26
+#: addons/rsyslog/class_rsyslog.inc:351
 msgid "Error"
 msgstr "Feil"
 
@@ -185,51 +185,3 @@ msgstr ""
 #: addons/rsyslog/class_rsyslog.inc:384
 msgid "Clock"
 msgstr ""
-
-#: addons/rsyslog/rSyslog.tpl.c:2
-msgid "Filter"
-msgstr "Filter"
-
-#: addons/rsyslog/rSyslog.tpl.c:5
-msgid "Server"
-msgstr "Tjener"
-
-#: addons/rsyslog/rSyslog.tpl.c:8
-msgid "Host"
-msgstr "Vert"
-
-#: addons/rsyslog/rSyslog.tpl.c:11 addons/rsyslog/rSyslog.tpl.c:41
-msgid "Severity"
-msgstr ""
-
-#: addons/rsyslog/rSyslog.tpl.c:14
-msgid "From"
-msgstr ""
-
-#: addons/rsyslog/rSyslog.tpl.c:17
-msgid "till"
-msgstr ""
-
-#: addons/rsyslog/rSyslog.tpl.c:20 addons/rsyslog/rSyslog.tpl.c:23
-msgid "Search"
-msgstr ""
-
-#: addons/rsyslog/rSyslog.tpl.c:29
-msgid "Date"
-msgstr ""
-
-#: addons/rsyslog/rSyslog.tpl.c:32
-msgid "Source"
-msgstr ""
-
-#: addons/rsyslog/rSyslog.tpl.c:35
-msgid "Header"
-msgstr ""
-
-#: addons/rsyslog/rSyslog.tpl.c:38
-msgid "Facility"
-msgstr ""
-
-#: addons/rsyslog/rSyslog.tpl.c:44
-msgid "Message"
-msgstr ""
diff --git a/rsyslog/locale/nl/fusiondirectory.po b/rsyslog/locale/nl/fusiondirectory.po
index 28bf3c3742062e850a7a5fdb83e9376cb7c0adc8..e6c398fbdbfcb74e927ac22d69dfa04c46aad53e 100644
--- a/rsyslog/locale/nl/fusiondirectory.po
+++ b/rsyslog/locale/nl/fusiondirectory.po
@@ -3,16 +3,14 @@
 # This file is distributed under the same license as the PACKAGE package.
 # 
 # Translators:
-# Christophe Augello <christophe@augello.be>, 2012
-# Kenny Tordeurs <tordeurskenny@gmail.com>, 2012-2013
 msgid ""
 msgstr ""
-"Project-Id-Version: FusionDirectory-108\n"
+"Project-Id-Version: FusionDirectory-109\n"
 "Report-Msgid-Bugs-To: documentation@lists.fusiondirectory.org\n"
-"POT-Creation-Date: 2015-03-17 18:47+0100\n"
-"PO-Revision-Date: 2015-02-25 16:12+0000\n"
+"POT-Creation-Date: 2014-12-15 17:47+0100\n"
+"PO-Revision-Date: 2015-02-25 16:13+0000\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>\n"
-"Language-Team: Dutch (http://www.transifex.com/projects/p/FusionDirectory-108/language/nl/)\n"
+"Language-Team: Dutch (http://www.transifex.com/projects/p/FusionDirectory-109/language/nl/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -103,7 +101,7 @@ msgstr "Alert"
 msgid "Critical"
 msgstr "Kritiek"
 
-#: addons/rsyslog/class_rsyslog.inc:351 addons/rsyslog/rSyslog.tpl.c:26
+#: addons/rsyslog/class_rsyslog.inc:351
 msgid "Error"
 msgstr "Fout"
 
@@ -187,51 +185,3 @@ msgstr "Log alert"
 #: addons/rsyslog/class_rsyslog.inc:384
 msgid "Clock"
 msgstr "Klok"
-
-#: addons/rsyslog/rSyslog.tpl.c:2
-msgid "Filter"
-msgstr "Filter"
-
-#: addons/rsyslog/rSyslog.tpl.c:5
-msgid "Server"
-msgstr "Server"
-
-#: addons/rsyslog/rSyslog.tpl.c:8
-msgid "Host"
-msgstr "Host"
-
-#: addons/rsyslog/rSyslog.tpl.c:11 addons/rsyslog/rSyslog.tpl.c:41
-msgid "Severity"
-msgstr "Ernstigheidsgraad"
-
-#: addons/rsyslog/rSyslog.tpl.c:14
-msgid "From"
-msgstr "Van"
-
-#: addons/rsyslog/rSyslog.tpl.c:17
-msgid "till"
-msgstr "tot"
-
-#: addons/rsyslog/rSyslog.tpl.c:20 addons/rsyslog/rSyslog.tpl.c:23
-msgid "Search"
-msgstr "Zoeken"
-
-#: addons/rsyslog/rSyslog.tpl.c:29
-msgid "Date"
-msgstr "Datum"
-
-#: addons/rsyslog/rSyslog.tpl.c:32
-msgid "Source"
-msgstr "Bron"
-
-#: addons/rsyslog/rSyslog.tpl.c:35
-msgid "Header"
-msgstr "Header"
-
-#: addons/rsyslog/rSyslog.tpl.c:38
-msgid "Facility"
-msgstr "Faciliteit"
-
-#: addons/rsyslog/rSyslog.tpl.c:44
-msgid "Message"
-msgstr "Bericht"
diff --git a/rsyslog/locale/pl/fusiondirectory.po b/rsyslog/locale/pl/fusiondirectory.po
index 6416bfe529796149101411c5d75ccf1df3acf8c9..02015bd731a9b70de1fcef5e875a9f00beac7a44 100644
--- a/rsyslog/locale/pl/fusiondirectory.po
+++ b/rsyslog/locale/pl/fusiondirectory.po
@@ -5,12 +5,12 @@
 # Translators:
 msgid ""
 msgstr ""
-"Project-Id-Version: FusionDirectory-108\n"
+"Project-Id-Version: FusionDirectory-109\n"
 "Report-Msgid-Bugs-To: documentation@lists.fusiondirectory.org\n"
-"POT-Creation-Date: 2015-03-17 18:47+0100\n"
-"PO-Revision-Date: 2015-02-25 16:12+0000\n"
+"POT-Creation-Date: 2014-12-15 17:47+0100\n"
+"PO-Revision-Date: 2015-02-25 16:13+0000\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>\n"
-"Language-Team: Polish (http://www.transifex.com/projects/p/FusionDirectory-108/language/pl/)\n"
+"Language-Team: Polish (http://www.transifex.com/projects/p/FusionDirectory-109/language/pl/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -101,7 +101,7 @@ msgstr ""
 msgid "Critical"
 msgstr ""
 
-#: addons/rsyslog/class_rsyslog.inc:351 addons/rsyslog/rSyslog.tpl.c:26
+#: addons/rsyslog/class_rsyslog.inc:351
 msgid "Error"
 msgstr "BÅ‚Ä…d"
 
@@ -185,51 +185,3 @@ msgstr ""
 #: addons/rsyslog/class_rsyslog.inc:384
 msgid "Clock"
 msgstr ""
-
-#: addons/rsyslog/rSyslog.tpl.c:2
-msgid "Filter"
-msgstr "Filtr"
-
-#: addons/rsyslog/rSyslog.tpl.c:5
-msgid "Server"
-msgstr "Serwer"
-
-#: addons/rsyslog/rSyslog.tpl.c:8
-msgid "Host"
-msgstr ""
-
-#: addons/rsyslog/rSyslog.tpl.c:11 addons/rsyslog/rSyslog.tpl.c:41
-msgid "Severity"
-msgstr ""
-
-#: addons/rsyslog/rSyslog.tpl.c:14
-msgid "From"
-msgstr ""
-
-#: addons/rsyslog/rSyslog.tpl.c:17
-msgid "till"
-msgstr ""
-
-#: addons/rsyslog/rSyslog.tpl.c:20 addons/rsyslog/rSyslog.tpl.c:23
-msgid "Search"
-msgstr "Szukaj"
-
-#: addons/rsyslog/rSyslog.tpl.c:29
-msgid "Date"
-msgstr "Data"
-
-#: addons/rsyslog/rSyslog.tpl.c:32
-msgid "Source"
-msgstr "Å¹rÃ³dÅ‚o"
-
-#: addons/rsyslog/rSyslog.tpl.c:35
-msgid "Header"
-msgstr ""
-
-#: addons/rsyslog/rSyslog.tpl.c:38
-msgid "Facility"
-msgstr ""
-
-#: addons/rsyslog/rSyslog.tpl.c:44
-msgid "Message"
-msgstr "WiadomoÅ›Ä‡"
diff --git a/rsyslog/locale/pt/fusiondirectory.po b/rsyslog/locale/pt/fusiondirectory.po
index f4a82ff3e9e9da9c2a4d612186d7e0c36597f240..7fe2b27cca0fa2b74a6189f4e977727835852b71 100644
--- a/rsyslog/locale/pt/fusiondirectory.po
+++ b/rsyslog/locale/pt/fusiondirectory.po
@@ -5,12 +5,12 @@
 # Translators:
 msgid ""
 msgstr ""
-"Project-Id-Version: FusionDirectory-108\n"
+"Project-Id-Version: FusionDirectory-109\n"
 "Report-Msgid-Bugs-To: documentation@lists.fusiondirectory.org\n"
-"POT-Creation-Date: 2015-03-17 18:47+0100\n"
-"PO-Revision-Date: 2015-02-25 16:12+0000\n"
+"POT-Creation-Date: 2014-12-15 17:47+0100\n"
+"PO-Revision-Date: 2015-02-25 16:04+0000\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>\n"
-"Language-Team: Portuguese (http://www.transifex.com/projects/p/FusionDirectory-108/language/pt/)\n"
+"Language-Team: Portuguese (http://www.transifex.com/projects/p/FusionDirectory-109/language/pt/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -101,7 +101,7 @@ msgstr ""
 msgid "Critical"
 msgstr ""
 
-#: addons/rsyslog/class_rsyslog.inc:351 addons/rsyslog/rSyslog.tpl.c:26
+#: addons/rsyslog/class_rsyslog.inc:351
 msgid "Error"
 msgstr "Erro"
 
@@ -185,51 +185,3 @@ msgstr ""
 #: addons/rsyslog/class_rsyslog.inc:384
 msgid "Clock"
 msgstr ""
-
-#: addons/rsyslog/rSyslog.tpl.c:2
-msgid "Filter"
-msgstr ""
-
-#: addons/rsyslog/rSyslog.tpl.c:5
-msgid "Server"
-msgstr "Servidor"
-
-#: addons/rsyslog/rSyslog.tpl.c:8
-msgid "Host"
-msgstr ""
-
-#: addons/rsyslog/rSyslog.tpl.c:11 addons/rsyslog/rSyslog.tpl.c:41
-msgid "Severity"
-msgstr ""
-
-#: addons/rsyslog/rSyslog.tpl.c:14
-msgid "From"
-msgstr ""
-
-#: addons/rsyslog/rSyslog.tpl.c:17
-msgid "till"
-msgstr ""
-
-#: addons/rsyslog/rSyslog.tpl.c:20 addons/rsyslog/rSyslog.tpl.c:23
-msgid "Search"
-msgstr "Procura"
-
-#: addons/rsyslog/rSyslog.tpl.c:29
-msgid "Date"
-msgstr ""
-
-#: addons/rsyslog/rSyslog.tpl.c:32
-msgid "Source"
-msgstr ""
-
-#: addons/rsyslog/rSyslog.tpl.c:35
-msgid "Header"
-msgstr ""
-
-#: addons/rsyslog/rSyslog.tpl.c:38
-msgid "Facility"
-msgstr ""
-
-#: addons/rsyslog/rSyslog.tpl.c:44
-msgid "Message"
-msgstr ""
diff --git a/rsyslog/locale/pt_BR/fusiondirectory.po b/rsyslog/locale/pt_BR/fusiondirectory.po
index a709a25098c2d7b572a52849c2996eb0419ded3d..081a55eb17f76cbee41d0c63252ab43a52c91cf1 100644
--- a/rsyslog/locale/pt_BR/fusiondirectory.po
+++ b/rsyslog/locale/pt_BR/fusiondirectory.po
@@ -5,12 +5,12 @@
 # Translators:
 msgid ""
 msgstr ""
-"Project-Id-Version: FusionDirectory-108\n"
+"Project-Id-Version: FusionDirectory-109\n"
 "Report-Msgid-Bugs-To: documentation@lists.fusiondirectory.org\n"
-"POT-Creation-Date: 2015-03-17 18:47+0100\n"
-"PO-Revision-Date: 2015-02-25 16:12+0000\n"
+"POT-Creation-Date: 2014-12-15 17:47+0100\n"
+"PO-Revision-Date: 2015-02-25 16:13+0000\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>\n"
-"Language-Team: Portuguese (Brazil) (http://www.transifex.com/projects/p/FusionDirectory-108/language/pt_BR/)\n"
+"Language-Team: Portuguese (Brazil) (http://www.transifex.com/projects/p/FusionDirectory-109/language/pt_BR/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -101,7 +101,7 @@ msgstr ""
 msgid "Critical"
 msgstr ""
 
-#: addons/rsyslog/class_rsyslog.inc:351 addons/rsyslog/rSyslog.tpl.c:26
+#: addons/rsyslog/class_rsyslog.inc:351
 msgid "Error"
 msgstr "Erro"
 
@@ -185,51 +185,3 @@ msgstr ""
 #: addons/rsyslog/class_rsyslog.inc:384
 msgid "Clock"
 msgstr ""
-
-#: addons/rsyslog/rSyslog.tpl.c:2
-msgid "Filter"
-msgstr "Filtro"
-
-#: addons/rsyslog/rSyslog.tpl.c:5
-msgid "Server"
-msgstr "servidor"
-
-#: addons/rsyslog/rSyslog.tpl.c:8
-msgid "Host"
-msgstr "Host"
-
-#: addons/rsyslog/rSyslog.tpl.c:11 addons/rsyslog/rSyslog.tpl.c:41
-msgid "Severity"
-msgstr ""
-
-#: addons/rsyslog/rSyslog.tpl.c:14
-msgid "From"
-msgstr "De"
-
-#: addons/rsyslog/rSyslog.tpl.c:17
-msgid "till"
-msgstr ""
-
-#: addons/rsyslog/rSyslog.tpl.c:20 addons/rsyslog/rSyslog.tpl.c:23
-msgid "Search"
-msgstr "Pesquisar"
-
-#: addons/rsyslog/rSyslog.tpl.c:29
-msgid "Date"
-msgstr "Data"
-
-#: addons/rsyslog/rSyslog.tpl.c:32
-msgid "Source"
-msgstr "Fonte"
-
-#: addons/rsyslog/rSyslog.tpl.c:35
-msgid "Header"
-msgstr "CabeÃ§alho"
-
-#: addons/rsyslog/rSyslog.tpl.c:38
-msgid "Facility"
-msgstr ""
-
-#: addons/rsyslog/rSyslog.tpl.c:44
-msgid "Message"
-msgstr ""
diff --git a/rsyslog/locale/ru/fusiondirectory.po b/rsyslog/locale/ru/fusiondirectory.po
index a3ac63ec801515d68992b07f21dfeec7eb0eac9d..4e1d229237e6aab7ce4fceae37876a62bcc5e871 100644
--- a/rsyslog/locale/ru/fusiondirectory.po
+++ b/rsyslog/locale/ru/fusiondirectory.po
@@ -5,17 +5,17 @@
 # Translators:
 msgid ""
 msgstr ""
-"Project-Id-Version: FusionDirectory-108\n"
+"Project-Id-Version: FusionDirectory-109\n"
 "Report-Msgid-Bugs-To: documentation@lists.fusiondirectory.org\n"
-"POT-Creation-Date: 2015-03-17 18:47+0100\n"
-"PO-Revision-Date: 2015-02-25 16:12+0000\n"
+"POT-Creation-Date: 2014-12-15 17:47+0100\n"
+"PO-Revision-Date: 2015-04-18 18:07+0000\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>\n"
-"Language-Team: Russian (http://www.transifex.com/projects/p/FusionDirectory-108/language/ru/)\n"
+"Language-Team: Russian (http://www.transifex.com/projects/p/FusionDirectory-109/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=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);\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/rsyslog/class_serviceSyslog.inc:30
 #: admin/systems/services/rsyslog/class_serviceSyslog.inc:31
@@ -40,19 +40,19 @@ msgstr ""
 
 #: admin/systems/services/rsyslog/class_serviceSyslog.inc:48
 msgid "Database"
-msgstr ""
+msgstr "Ð‘Ð°Ð·Ð° Ð´Ð°Ð½Ð½Ñ‹Ñ…"
 
 #: admin/systems/services/rsyslog/class_serviceSyslog.inc:48
 msgid "Database in which syslog stores its informations"
-msgstr ""
+msgstr "Ð‘Ð°Ð·Ð° Ð´Ð°Ð½Ð½Ñ‹Ñ…, Ð² ÐºÐ¾Ñ‚Ð¾Ñ€Ð¾Ð¹ syslog Ð±ÑƒÐ´ÐµÑ‚ Ñ…Ñ€Ð°Ð½Ð¸Ñ‚ÑŒ ÑÐ²Ð¾ÑŽ Ð¸Ð½Ñ„Ð¾Ñ€Ð¼Ð°Ñ†Ð¸ÑŽ"
 
 #: admin/systems/services/rsyslog/class_serviceSyslog.inc:53
 msgid "Database user"
-msgstr ""
+msgstr "ÐŸÐ¾Ð»ÑŒÐ·Ð¾Ð²Ð°Ñ‚ÐµÐ»ÑŒ Ð±Ð°Ð·Ñ‹ Ð´Ð°Ð½Ð½Ñ‹Ñ…"
 
 #: admin/systems/services/rsyslog/class_serviceSyslog.inc:53
 msgid "Database administrator"
-msgstr ""
+msgstr "ÐÐ´Ð¼Ð¸Ð½Ð¸ÑÑ‚Ñ€Ð°Ñ‚Ð¾Ñ€ Ð±Ð°Ð·Ñ‹ Ð´Ð°Ð½Ð½Ñ‹Ñ…"
 
 #: admin/systems/services/rsyslog/class_serviceSyslog.inc:58
 msgid "Password"
@@ -60,7 +60,7 @@ msgstr "ÐŸÐ°Ñ€Ð¾Ð»ÑŒ"
 
 #: admin/systems/services/rsyslog/class_serviceSyslog.inc:58
 msgid "Password for the database administrator"
-msgstr ""
+msgstr "ÐŸÐ°Ñ€Ð¾Ð»ÑŒ Ð´Ð»Ñ Ð°Ð´Ð¼Ð¸Ð½Ð¸ÑÑ‚Ñ€Ð°Ñ‚Ð¾Ñ€Ð° Ð±Ð°Ð·Ñ‹ Ð´Ð°Ð½Ð½Ñ‹Ñ…"
 
 #: addons/rsyslog/class_rsyslog.inc:47 addons/rsyslog/class_rsyslog.inc:53
 #: addons/rsyslog/main.inc:38
@@ -73,7 +73,7 @@ msgstr ""
 
 #: addons/rsyslog/class_rsyslog.inc:142 addons/rsyslog/class_rsyslog.inc:148
 msgid "-"
-msgstr ""
+msgstr "-"
 
 #: addons/rsyslog/class_rsyslog.inc:144 addons/rsyslog/class_rsyslog.inc:150
 msgid "All"
@@ -82,12 +82,12 @@ msgstr "Ð’ÑÐµ"
 #: addons/rsyslog/class_rsyslog.inc:176
 #, php-format
 msgid "%s entries match the filter"
-msgstr ""
+msgstr "%s Ð·Ð°Ð¿Ð¸ÑÐ¸ ÑÐ¾Ð¾Ñ‚Ð²ÐµÑ‚ÑÑ‚Ð²ÑƒÑŽÑ‚ Ñ„Ð¸Ð»ÑŒÑ‚Ñ€Ñƒ"
 
 #: addons/rsyslog/class_rsyslog.inc:196
 #, php-format
 msgid "The selected server '%s' does not exists!"
-msgstr ""
+msgstr "Ð’Ñ‹Ð±Ñ€Ð°Ð½Ð½Ñ‹Ð¹ ÑÐµÑ€Ð²ÐµÑ€ '%s' Ð½Ðµ ÑÑƒÑ‰ÐµÑÑ‚Ð²ÑƒÐµÑ‚!"
 
 #: addons/rsyslog/class_rsyslog.inc:348
 msgid "Emergency"
@@ -101,7 +101,7 @@ msgstr ""
 msgid "Critical"
 msgstr ""
 
-#: addons/rsyslog/class_rsyslog.inc:351 addons/rsyslog/rSyslog.tpl.c:26
+#: addons/rsyslog/class_rsyslog.inc:351
 msgid "Error"
 msgstr "ÐžÑˆÐ¸Ð±ÐºÐ°"
 
@@ -124,7 +124,7 @@ msgstr ""
 #: addons/rsyslog/class_rsyslog.inc:362 addons/rsyslog/class_rsyslog.inc:399
 #, php-format
 msgid "Unknown (%s)"
-msgstr ""
+msgstr "ÐÐµÐ¸Ð·Ð²ÐµÑÑ‚Ð½Ð¾ (%s)"
 
 #: addons/rsyslog/class_rsyslog.inc:369
 msgid "Kernel"
@@ -160,11 +160,11 @@ msgstr ""
 
 #: addons/rsyslog/class_rsyslog.inc:377
 msgid "UUCP"
-msgstr ""
+msgstr "UUCP"
 
 #: addons/rsyslog/class_rsyslog.inc:378
 msgid "Cron"
-msgstr ""
+msgstr "Cron"
 
 #: addons/rsyslog/class_rsyslog.inc:380
 msgid "FTP"
@@ -172,7 +172,7 @@ msgstr "FTP"
 
 #: addons/rsyslog/class_rsyslog.inc:381
 msgid "NTP"
-msgstr ""
+msgstr "NTP"
 
 #: addons/rsyslog/class_rsyslog.inc:382
 msgid "Log audit"
@@ -185,51 +185,3 @@ msgstr ""
 #: addons/rsyslog/class_rsyslog.inc:384
 msgid "Clock"
 msgstr ""
-
-#: addons/rsyslog/rSyslog.tpl.c:2
-msgid "Filter"
-msgstr "Ð¤Ð¸Ð»ÑŒÑ‚Ñ€"
-
-#: addons/rsyslog/rSyslog.tpl.c:5
-msgid "Server"
-msgstr "Ð¡ÐµÑ€Ð²ÐµÑ€"
-
-#: addons/rsyslog/rSyslog.tpl.c:8
-msgid "Host"
-msgstr ""
-
-#: addons/rsyslog/rSyslog.tpl.c:11 addons/rsyslog/rSyslog.tpl.c:41
-msgid "Severity"
-msgstr ""
-
-#: addons/rsyslog/rSyslog.tpl.c:14
-msgid "From"
-msgstr ""
-
-#: addons/rsyslog/rSyslog.tpl.c:17
-msgid "till"
-msgstr ""
-
-#: addons/rsyslog/rSyslog.tpl.c:20 addons/rsyslog/rSyslog.tpl.c:23
-msgid "Search"
-msgstr "ÐŸÐ¾Ð¸ÑÐº"
-
-#: addons/rsyslog/rSyslog.tpl.c:29
-msgid "Date"
-msgstr "Ð”Ð°Ñ‚Ð°"
-
-#: addons/rsyslog/rSyslog.tpl.c:32
-msgid "Source"
-msgstr "Ð˜ÑÑ‚Ð¾Ñ‡Ð½Ð¸Ðº"
-
-#: addons/rsyslog/rSyslog.tpl.c:35
-msgid "Header"
-msgstr ""
-
-#: addons/rsyslog/rSyslog.tpl.c:38
-msgid "Facility"
-msgstr ""
-
-#: addons/rsyslog/rSyslog.tpl.c:44
-msgid "Message"
-msgstr "Ð¡Ð¾Ð¾Ð±Ñ‰ÐµÐ½Ð¸Ðµ"
diff --git a/rsyslog/locale/ru@petr1708/fusiondirectory.po b/rsyslog/locale/ru@petr1708/fusiondirectory.po
index 95a9e96428a9c12f4c5a8724057963dd46cf62ce..5c4965494dbaf49fe9da976fb4a683685a61c6d2 100644
--- a/rsyslog/locale/ru@petr1708/fusiondirectory.po
+++ b/rsyslog/locale/ru@petr1708/fusiondirectory.po
@@ -5,17 +5,17 @@
 # Translators:
 msgid ""
 msgstr ""
-"Project-Id-Version: FusionDirectory-108\n"
+"Project-Id-Version: FusionDirectory-109\n"
 "Report-Msgid-Bugs-To: documentation@lists.fusiondirectory.org\n"
-"POT-Creation-Date: 2015-03-17 18:47+0100\n"
-"PO-Revision-Date: 2015-02-25 15:53+0000\n"
+"POT-Creation-Date: 2014-12-15 17:47+0100\n"
+"PO-Revision-Date: 2014-12-15 17:03+0000\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>\n"
-"Language-Team: Russian Petrine orthography (http://www.transifex.com/projects/p/FusionDirectory-108/language/ru@petr1708/)\n"
+"Language-Team: Russian Petrine orthography (http://www.transifex.com/projects/p/FusionDirectory-109/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=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);\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/rsyslog/class_serviceSyslog.inc:30
 #: admin/systems/services/rsyslog/class_serviceSyslog.inc:31
@@ -101,7 +101,7 @@ msgstr ""
 msgid "Critical"
 msgstr ""
 
-#: addons/rsyslog/class_rsyslog.inc:351 addons/rsyslog/rSyslog.tpl.c:26
+#: addons/rsyslog/class_rsyslog.inc:351
 msgid "Error"
 msgstr ""
 
@@ -185,51 +185,3 @@ msgstr ""
 #: addons/rsyslog/class_rsyslog.inc:384
 msgid "Clock"
 msgstr ""
-
-#: addons/rsyslog/rSyslog.tpl.c:2
-msgid "Filter"
-msgstr ""
-
-#: addons/rsyslog/rSyslog.tpl.c:5
-msgid "Server"
-msgstr ""
-
-#: addons/rsyslog/rSyslog.tpl.c:8
-msgid "Host"
-msgstr ""
-
-#: addons/rsyslog/rSyslog.tpl.c:11 addons/rsyslog/rSyslog.tpl.c:41
-msgid "Severity"
-msgstr ""
-
-#: addons/rsyslog/rSyslog.tpl.c:14
-msgid "From"
-msgstr ""
-
-#: addons/rsyslog/rSyslog.tpl.c:17
-msgid "till"
-msgstr ""
-
-#: addons/rsyslog/rSyslog.tpl.c:20 addons/rsyslog/rSyslog.tpl.c:23
-msgid "Search"
-msgstr ""
-
-#: addons/rsyslog/rSyslog.tpl.c:29
-msgid "Date"
-msgstr ""
-
-#: addons/rsyslog/rSyslog.tpl.c:32
-msgid "Source"
-msgstr ""
-
-#: addons/rsyslog/rSyslog.tpl.c:35
-msgid "Header"
-msgstr ""
-
-#: addons/rsyslog/rSyslog.tpl.c:38
-msgid "Facility"
-msgstr ""
-
-#: addons/rsyslog/rSyslog.tpl.c:44
-msgid "Message"
-msgstr ""
diff --git a/rsyslog/locale/sv/fusiondirectory.po b/rsyslog/locale/sv/fusiondirectory.po
index 9ae73d86700e7e8ed3128d473576942a3d96a128..28bb4894005c72e019808cc08614a77f74a5af46 100644
--- a/rsyslog/locale/sv/fusiondirectory.po
+++ b/rsyslog/locale/sv/fusiondirectory.po
@@ -5,12 +5,12 @@
 # Translators:
 msgid ""
 msgstr ""
-"Project-Id-Version: FusionDirectory-108\n"
+"Project-Id-Version: FusionDirectory-109\n"
 "Report-Msgid-Bugs-To: documentation@lists.fusiondirectory.org\n"
-"POT-Creation-Date: 2015-03-17 18:47+0100\n"
-"PO-Revision-Date: 2015-02-25 16:12+0000\n"
+"POT-Creation-Date: 2014-12-15 17:47+0100\n"
+"PO-Revision-Date: 2015-02-25 16:04+0000\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>\n"
-"Language-Team: Swedish (http://www.transifex.com/projects/p/FusionDirectory-108/language/sv/)\n"
+"Language-Team: Swedish (http://www.transifex.com/projects/p/FusionDirectory-109/language/sv/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -101,7 +101,7 @@ msgstr ""
 msgid "Critical"
 msgstr ""
 
-#: addons/rsyslog/class_rsyslog.inc:351 addons/rsyslog/rSyslog.tpl.c:26
+#: addons/rsyslog/class_rsyslog.inc:351
 msgid "Error"
 msgstr "Fel"
 
@@ -185,51 +185,3 @@ msgstr ""
 #: addons/rsyslog/class_rsyslog.inc:384
 msgid "Clock"
 msgstr ""
-
-#: addons/rsyslog/rSyslog.tpl.c:2
-msgid "Filter"
-msgstr "Filter"
-
-#: addons/rsyslog/rSyslog.tpl.c:5
-msgid "Server"
-msgstr "Server"
-
-#: addons/rsyslog/rSyslog.tpl.c:8
-msgid "Host"
-msgstr "Host"
-
-#: addons/rsyslog/rSyslog.tpl.c:11 addons/rsyslog/rSyslog.tpl.c:41
-msgid "Severity"
-msgstr ""
-
-#: addons/rsyslog/rSyslog.tpl.c:14
-msgid "From"
-msgstr ""
-
-#: addons/rsyslog/rSyslog.tpl.c:17
-msgid "till"
-msgstr ""
-
-#: addons/rsyslog/rSyslog.tpl.c:20 addons/rsyslog/rSyslog.tpl.c:23
-msgid "Search"
-msgstr "SÃ¶k"
-
-#: addons/rsyslog/rSyslog.tpl.c:29
-msgid "Date"
-msgstr ""
-
-#: addons/rsyslog/rSyslog.tpl.c:32
-msgid "Source"
-msgstr ""
-
-#: addons/rsyslog/rSyslog.tpl.c:35
-msgid "Header"
-msgstr ""
-
-#: addons/rsyslog/rSyslog.tpl.c:38
-msgid "Facility"
-msgstr ""
-
-#: addons/rsyslog/rSyslog.tpl.c:44
-msgid "Message"
-msgstr ""
diff --git a/rsyslog/locale/ug/fusiondirectory.po b/rsyslog/locale/ug/fusiondirectory.po
index 0a434813b1ad95f702620c91873c22c4ca0d813f..caadae661ce718375f44453333c793d41735373e 100644
--- a/rsyslog/locale/ug/fusiondirectory.po
+++ b/rsyslog/locale/ug/fusiondirectory.po
@@ -5,12 +5,12 @@
 # Translators:
 msgid ""
 msgstr ""
-"Project-Id-Version: FusionDirectory-108\n"
+"Project-Id-Version: FusionDirectory-109\n"
 "Report-Msgid-Bugs-To: documentation@lists.fusiondirectory.org\n"
-"POT-Creation-Date: 2015-03-17 18:47+0100\n"
-"PO-Revision-Date: 2015-02-25 15:53+0000\n"
+"POT-Creation-Date: 2014-12-15 17:47+0100\n"
+"PO-Revision-Date: 2014-12-15 17:03+0000\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>\n"
-"Language-Team: Uighur (http://www.transifex.com/projects/p/FusionDirectory-108/language/ug/)\n"
+"Language-Team: Uighur (http://www.transifex.com/projects/p/FusionDirectory-109/language/ug/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -101,7 +101,7 @@ msgstr ""
 msgid "Critical"
 msgstr ""
 
-#: addons/rsyslog/class_rsyslog.inc:351 addons/rsyslog/rSyslog.tpl.c:26
+#: addons/rsyslog/class_rsyslog.inc:351
 msgid "Error"
 msgstr ""
 
@@ -185,51 +185,3 @@ msgstr ""
 #: addons/rsyslog/class_rsyslog.inc:384
 msgid "Clock"
 msgstr ""
-
-#: addons/rsyslog/rSyslog.tpl.c:2
-msgid "Filter"
-msgstr ""
-
-#: addons/rsyslog/rSyslog.tpl.c:5
-msgid "Server"
-msgstr ""
-
-#: addons/rsyslog/rSyslog.tpl.c:8
-msgid "Host"
-msgstr ""
-
-#: addons/rsyslog/rSyslog.tpl.c:11 addons/rsyslog/rSyslog.tpl.c:41
-msgid "Severity"
-msgstr ""
-
-#: addons/rsyslog/rSyslog.tpl.c:14
-msgid "From"
-msgstr ""
-
-#: addons/rsyslog/rSyslog.tpl.c:17
-msgid "till"
-msgstr ""
-
-#: addons/rsyslog/rSyslog.tpl.c:20 addons/rsyslog/rSyslog.tpl.c:23
-msgid "Search"
-msgstr ""
-
-#: addons/rsyslog/rSyslog.tpl.c:29
-msgid "Date"
-msgstr ""
-
-#: addons/rsyslog/rSyslog.tpl.c:32
-msgid "Source"
-msgstr ""
-
-#: addons/rsyslog/rSyslog.tpl.c:35
-msgid "Header"
-msgstr ""
-
-#: addons/rsyslog/rSyslog.tpl.c:38
-msgid "Facility"
-msgstr ""
-
-#: addons/rsyslog/rSyslog.tpl.c:44
-msgid "Message"
-msgstr ""
diff --git a/rsyslog/locale/vi_VN/fusiondirectory.po b/rsyslog/locale/vi_VN/fusiondirectory.po
index ae0eba82267ac4f1bd9707edd71aa29a318a70d4..191b2bb1d14cdb0a298833fbdc05c30321d1bbae 100644
--- a/rsyslog/locale/vi_VN/fusiondirectory.po
+++ b/rsyslog/locale/vi_VN/fusiondirectory.po
@@ -5,12 +5,12 @@
 # Translators:
 msgid ""
 msgstr ""
-"Project-Id-Version: FusionDirectory-108\n"
+"Project-Id-Version: FusionDirectory-109\n"
 "Report-Msgid-Bugs-To: documentation@lists.fusiondirectory.org\n"
-"POT-Creation-Date: 2015-03-17 18:47+0100\n"
-"PO-Revision-Date: 2015-02-25 16:12+0000\n"
+"POT-Creation-Date: 2014-12-15 17:47+0100\n"
+"PO-Revision-Date: 2015-02-25 16:04+0000\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>\n"
-"Language-Team: Vietnamese (Viet Nam) (http://www.transifex.com/projects/p/FusionDirectory-108/language/vi_VN/)\n"
+"Language-Team: Vietnamese (Viet Nam) (http://www.transifex.com/projects/p/FusionDirectory-109/language/vi_VN/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -101,7 +101,7 @@ msgstr ""
 msgid "Critical"
 msgstr ""
 
-#: addons/rsyslog/class_rsyslog.inc:351 addons/rsyslog/rSyslog.tpl.c:26
+#: addons/rsyslog/class_rsyslog.inc:351
 msgid "Error"
 msgstr "Lá»—i"
 
@@ -185,51 +185,3 @@ msgstr ""
 #: addons/rsyslog/class_rsyslog.inc:384
 msgid "Clock"
 msgstr ""
-
-#: addons/rsyslog/rSyslog.tpl.c:2
-msgid "Filter"
-msgstr ""
-
-#: addons/rsyslog/rSyslog.tpl.c:5
-msgid "Server"
-msgstr "MÃ¡y chá»§ (server)"
-
-#: addons/rsyslog/rSyslog.tpl.c:8
-msgid "Host"
-msgstr ""
-
-#: addons/rsyslog/rSyslog.tpl.c:11 addons/rsyslog/rSyslog.tpl.c:41
-msgid "Severity"
-msgstr ""
-
-#: addons/rsyslog/rSyslog.tpl.c:14
-msgid "From"
-msgstr ""
-
-#: addons/rsyslog/rSyslog.tpl.c:17
-msgid "till"
-msgstr ""
-
-#: addons/rsyslog/rSyslog.tpl.c:20 addons/rsyslog/rSyslog.tpl.c:23
-msgid "Search"
-msgstr "TÃ¬m kiáº¿m"
-
-#: addons/rsyslog/rSyslog.tpl.c:29
-msgid "Date"
-msgstr ""
-
-#: addons/rsyslog/rSyslog.tpl.c:32
-msgid "Source"
-msgstr ""
-
-#: addons/rsyslog/rSyslog.tpl.c:35
-msgid "Header"
-msgstr ""
-
-#: addons/rsyslog/rSyslog.tpl.c:38
-msgid "Facility"
-msgstr ""
-
-#: addons/rsyslog/rSyslog.tpl.c:44
-msgid "Message"
-msgstr ""
diff --git a/rsyslog/locale/zh/fusiondirectory.po b/rsyslog/locale/zh/fusiondirectory.po
index 4df34acc98f98b13f0e007c141f72ae2cfc3e606..c57088bfc64e7f5bfd2eac4d16b8b601ebdb7b38 100644
--- a/rsyslog/locale/zh/fusiondirectory.po
+++ b/rsyslog/locale/zh/fusiondirectory.po
@@ -5,12 +5,12 @@
 # Translators:
 msgid ""
 msgstr ""
-"Project-Id-Version: FusionDirectory-108\n"
+"Project-Id-Version: FusionDirectory-109\n"
 "Report-Msgid-Bugs-To: documentation@lists.fusiondirectory.org\n"
-"POT-Creation-Date: 2015-03-17 18:47+0100\n"
-"PO-Revision-Date: 2015-02-25 16:12+0000\n"
+"POT-Creation-Date: 2014-12-15 17:47+0100\n"
+"PO-Revision-Date: 2015-02-25 16:13+0000\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>\n"
-"Language-Team: Chinese (http://www.transifex.com/projects/p/FusionDirectory-108/language/zh/)\n"
+"Language-Team: Chinese (http://www.transifex.com/projects/p/FusionDirectory-109/language/zh/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -101,7 +101,7 @@ msgstr ""
 msgid "Critical"
 msgstr ""
 
-#: addons/rsyslog/class_rsyslog.inc:351 addons/rsyslog/rSyslog.tpl.c:26
+#: addons/rsyslog/class_rsyslog.inc:351
 msgid "Error"
 msgstr "é”™è¯¯"
 
@@ -185,51 +185,3 @@ msgstr ""
 #: addons/rsyslog/class_rsyslog.inc:384
 msgid "Clock"
 msgstr ""
-
-#: addons/rsyslog/rSyslog.tpl.c:2
-msgid "Filter"
-msgstr "è¿‡æ»¤å™¨"
-
-#: addons/rsyslog/rSyslog.tpl.c:5
-msgid "Server"
-msgstr "æœåŠ¡å™¨"
-
-#: addons/rsyslog/rSyslog.tpl.c:8
-msgid "Host"
-msgstr ""
-
-#: addons/rsyslog/rSyslog.tpl.c:11 addons/rsyslog/rSyslog.tpl.c:41
-msgid "Severity"
-msgstr ""
-
-#: addons/rsyslog/rSyslog.tpl.c:14
-msgid "From"
-msgstr ""
-
-#: addons/rsyslog/rSyslog.tpl.c:17
-msgid "till"
-msgstr "è‡³"
-
-#: addons/rsyslog/rSyslog.tpl.c:20 addons/rsyslog/rSyslog.tpl.c:23
-msgid "Search"
-msgstr "æŸ¥æ‰¾"
-
-#: addons/rsyslog/rSyslog.tpl.c:29
-msgid "Date"
-msgstr "æ—¥æœŸ"
-
-#: addons/rsyslog/rSyslog.tpl.c:32
-msgid "Source"
-msgstr "æº"
-
-#: addons/rsyslog/rSyslog.tpl.c:35
-msgid "Header"
-msgstr ""
-
-#: addons/rsyslog/rSyslog.tpl.c:38
-msgid "Facility"
-msgstr ""
-
-#: addons/rsyslog/rSyslog.tpl.c:44
-msgid "Message"
-msgstr "ä¿¡æ¯"
diff --git a/samba/locale/ar/fusiondirectory.po b/samba/locale/ar/fusiondirectory.po
index 4978b88d50d85209fd0dc221dc4985cd2588e85c..48a0f0189916d4771dedf5c1b77fb1614d045419 100644
--- a/samba/locale/ar/fusiondirectory.po
+++ b/samba/locale/ar/fusiondirectory.po
@@ -5,18 +5,95 @@
 # Translators:
 msgid ""
 msgstr ""
-"Project-Id-Version: FusionDirectory-108\n"
+"Project-Id-Version: FusionDirectory-109\n"
 "Report-Msgid-Bugs-To: documentation@lists.fusiondirectory.org\n"
-"POT-Creation-Date: 2015-03-17 18:47+0100\n"
-"PO-Revision-Date: 2015-02-25 16:02+0000\n"
+"POT-Creation-Date: 2014-12-15 17:47+0100\n"
+"PO-Revision-Date: 2015-02-25 16:04+0000\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>\n"
-"Language-Team: Arabic (http://www.transifex.com/projects/p/FusionDirectory-108/language/ar/)\n"
+"Language-Team: Arabic (http://www.transifex.com/projects/p/FusionDirectory-109/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/groups/samba/class_sambaGroup.inc:29
+#: personal/samba/class_sambaAccount.inc:135
+#: config/samba/class_sambaPluginConfig.inc:28
+msgid "Samba"
+msgstr ""
+
+#: admin/groups/samba/class_sambaGroup.inc:30
+msgid "Samba group settings"
+msgstr ""
+
+#: admin/groups/samba/class_sambaGroup.inc:42
+#: admin/groups/samba/class_sambaGroup.inc:45
+#: admin/systems/samba/class_winstationGeneric.inc:88
+#: personal/samba/class_sambaAccount.inc:176
+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:119
+msgid "Samba group"
+msgstr ""
+
+#: admin/groups/samba/class_sambaGroup.inc:60
+#: admin/groups/samba/class_sambaGroup.inc:119
+msgid "Domain admins"
+msgstr ""
+
+#: admin/groups/samba/class_sambaGroup.inc:60
+#: admin/groups/samba/class_sambaGroup.inc:119
+msgid "Domain users"
+msgstr ""
+
+#: admin/groups/samba/class_sambaGroup.inc:60
+#: admin/groups/samba/class_sambaGroup.inc:119
+msgid "Domain guests"
+msgstr ""
+
+#: admin/groups/samba/class_sambaGroup.inc:105
+msgid "Configuration error"
+msgstr ""
+
+#: admin/groups/samba/class_sambaGroup.inc:105
+msgid "Cannot find group SID in your configuration!"
+msgstr ""
+
+#: admin/groups/samba/class_sambaGroup.inc:119
+#, php-format
+msgid "Special group (%d)"
+msgstr ""
+
+#: admin/groups/samba/class_sambaGroup.inc:133
+#: personal/samba/class_sambaAccount.inc:478
+#: personal/samba/class_sambaAccount.inc:500
+msgid "Warning"
+msgstr "ØªØØ°ÙŠØ±"
+
+#: admin/groups/samba/class_sambaGroup.inc:133
+#: personal/samba/class_sambaAccount.inc:478
+msgid "Undefined Samba SID detected. Please fix this problem manually!"
+msgstr ""
+
 #: admin/samba/class_sambaDomainManagement.inc:35
 msgid "Samba domains"
 msgstr ""
@@ -200,11 +277,6 @@ msgstr "Ø§Ù„ÙˆØµÙ"
 msgid "A short description of the winstation"
 msgstr ""
 
-#: admin/systems/samba/class_winstationGeneric.inc:88
-#: personal/samba/class_sambaAccount.inc:176
-msgid "Domain"
-msgstr ""
-
 #: admin/systems/samba/class_winstationGeneric.inc:88
 #: personal/samba/class_sambaAccount.inc:176
 msgid "Samba domain name"
@@ -235,11 +307,6 @@ msgstr ""
 msgid "Samba Munged Dial"
 msgstr ""
 
-#: personal/samba/class_sambaAccount.inc:135
-#: config/samba/class_sambaPluginConfig.inc:28
-msgid "Samba"
-msgstr ""
-
 #: personal/samba/class_sambaAccount.inc:136
 #: config/samba/class_sambaPluginConfig.inc:41
 msgid "Samba settings"
@@ -507,16 +574,7 @@ msgstr ""
 msgid "The windows user manager allows eight clients at maximum!"
 msgstr ""
 
-#: personal/samba/class_sambaAccount.inc:478
 #: personal/samba/class_sambaAccount.inc:501
-msgid "Warning"
-msgstr "ØªØØ°ÙŠØ±"
-
-#: personal/samba/class_sambaAccount.inc:478
-msgid "Undefined Samba SID detected. Please fix this problem manually!"
-msgstr ""
-
-#: personal/samba/class_sambaAccount.inc:502
 msgid ""
 "Cannot convert primary group to samba group: group cannot be identified!"
 msgstr ""
@@ -578,11 +636,3 @@ msgstr ""
 #: config/samba/class_sambaPluginConfig.inc:72
 msgid "Needed to be compliant with Windows <= 98 or Samba < 3.2"
 msgstr ""
-
-#: personal/samba/sambaLogonHours.tpl.c:2
-msgid "Specify the hours this user is allowed to log in"
-msgstr ""
-
-#: personal/samba/sambaLogonHours.tpl.c:5
-msgid "Hour"
-msgstr ""
diff --git a/samba/locale/ca/fusiondirectory.po b/samba/locale/ca/fusiondirectory.po
index 6a1ef03978397e20295b869d9bbf81322df1ca11..a9c87a23e5e439680a4131fe318f0bdb5fa564ea 100644
--- a/samba/locale/ca/fusiondirectory.po
+++ b/samba/locale/ca/fusiondirectory.po
@@ -5,18 +5,95 @@
 # Translators:
 msgid ""
 msgstr ""
-"Project-Id-Version: FusionDirectory-108\n"
+"Project-Id-Version: FusionDirectory-109\n"
 "Report-Msgid-Bugs-To: documentation@lists.fusiondirectory.org\n"
-"POT-Creation-Date: 2015-03-17 18:47+0100\n"
-"PO-Revision-Date: 2015-02-25 16:02+0000\n"
+"POT-Creation-Date: 2014-12-15 17:47+0100\n"
+"PO-Revision-Date: 2015-03-31 11:41+0000\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>\n"
-"Language-Team: Catalan (http://www.transifex.com/projects/p/FusionDirectory-108/language/ca/)\n"
+"Language-Team: Catalan (http://www.transifex.com/projects/p/FusionDirectory-109/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/groups/samba/class_sambaGroup.inc:29
+#: personal/samba/class_sambaAccount.inc:135
+#: config/samba/class_sambaPluginConfig.inc:28
+msgid "Samba"
+msgstr ""
+
+#: admin/groups/samba/class_sambaGroup.inc:30
+msgid "Samba group settings"
+msgstr ""
+
+#: admin/groups/samba/class_sambaGroup.inc:42
+#: admin/groups/samba/class_sambaGroup.inc:45
+#: admin/systems/samba/class_winstationGeneric.inc:88
+#: personal/samba/class_sambaAccount.inc:176
+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:119
+msgid "Samba group"
+msgstr ""
+
+#: admin/groups/samba/class_sambaGroup.inc:60
+#: admin/groups/samba/class_sambaGroup.inc:119
+msgid "Domain admins"
+msgstr ""
+
+#: admin/groups/samba/class_sambaGroup.inc:60
+#: admin/groups/samba/class_sambaGroup.inc:119
+msgid "Domain users"
+msgstr ""
+
+#: admin/groups/samba/class_sambaGroup.inc:60
+#: admin/groups/samba/class_sambaGroup.inc:119
+msgid "Domain guests"
+msgstr ""
+
+#: admin/groups/samba/class_sambaGroup.inc:105
+msgid "Configuration error"
+msgstr "Error de la configuraciÃ³"
+
+#: admin/groups/samba/class_sambaGroup.inc:105
+msgid "Cannot find group SID in your configuration!"
+msgstr ""
+
+#: admin/groups/samba/class_sambaGroup.inc:119
+#, php-format
+msgid "Special group (%d)"
+msgstr ""
+
+#: admin/groups/samba/class_sambaGroup.inc:133
+#: personal/samba/class_sambaAccount.inc:478
+#: personal/samba/class_sambaAccount.inc:500
+msgid "Warning"
+msgstr "AvÃs"
+
+#: admin/groups/samba/class_sambaGroup.inc:133
+#: personal/samba/class_sambaAccount.inc:478
+msgid "Undefined Samba SID detected. Please fix this problem manually!"
+msgstr ""
+
 #: admin/samba/class_sambaDomainManagement.inc:35
 msgid "Samba domains"
 msgstr ""
@@ -200,11 +277,6 @@ msgstr ""
 msgid "A short description of the winstation"
 msgstr ""
 
-#: admin/systems/samba/class_winstationGeneric.inc:88
-#: personal/samba/class_sambaAccount.inc:176
-msgid "Domain"
-msgstr ""
-
 #: admin/systems/samba/class_winstationGeneric.inc:88
 #: personal/samba/class_sambaAccount.inc:176
 msgid "Samba domain name"
@@ -235,11 +307,6 @@ msgstr ""
 msgid "Samba Munged Dial"
 msgstr ""
 
-#: personal/samba/class_sambaAccount.inc:135
-#: config/samba/class_sambaPluginConfig.inc:28
-msgid "Samba"
-msgstr ""
-
 #: personal/samba/class_sambaAccount.inc:136
 #: config/samba/class_sambaPluginConfig.inc:41
 msgid "Samba settings"
@@ -507,16 +574,7 @@ msgstr ""
 msgid "The windows user manager allows eight clients at maximum!"
 msgstr ""
 
-#: personal/samba/class_sambaAccount.inc:478
 #: personal/samba/class_sambaAccount.inc:501
-msgid "Warning"
-msgstr "AvÃs"
-
-#: personal/samba/class_sambaAccount.inc:478
-msgid "Undefined Samba SID detected. Please fix this problem manually!"
-msgstr ""
-
-#: personal/samba/class_sambaAccount.inc:502
 msgid ""
 "Cannot convert primary group to samba group: group cannot be identified!"
 msgstr ""
@@ -578,11 +636,3 @@ msgstr ""
 #: config/samba/class_sambaPluginConfig.inc:72
 msgid "Needed to be compliant with Windows <= 98 or Samba < 3.2"
 msgstr ""
-
-#: personal/samba/sambaLogonHours.tpl.c:2
-msgid "Specify the hours this user is allowed to log in"
-msgstr ""
-
-#: personal/samba/sambaLogonHours.tpl.c:5
-msgid "Hour"
-msgstr ""
diff --git a/samba/locale/cs_CZ/fusiondirectory.po b/samba/locale/cs_CZ/fusiondirectory.po
index 75b51c201cea841dab8b12d87bfa780982cc4bd2..95da71a579e4966f3e7ff958ec57bce6e88b8e26 100644
--- a/samba/locale/cs_CZ/fusiondirectory.po
+++ b/samba/locale/cs_CZ/fusiondirectory.po
@@ -3,35 +3,110 @@
 # This file is distributed under the same license as the PACKAGE package.
 # 
 # Translators:
-# Pavel Borecki <pavel.borecki@gmail.com>, 2012
-# Pavel Borecki <pavel.borecki@gmail.com>, 2012
-# Pavel Borecki <pavel.borecki@gmail.com>, 2012
+# Pavel Borecki <pavel.borecki@gmail.com>, 2014-2015
 msgid ""
 msgstr ""
-"Project-Id-Version: FusionDirectory-108\n"
+"Project-Id-Version: FusionDirectory-109\n"
 "Report-Msgid-Bugs-To: documentation@lists.fusiondirectory.org\n"
-"POT-Creation-Date: 2015-03-17 18:47+0100\n"
-"PO-Revision-Date: 2015-02-25 16:12+0000\n"
-"Last-Translator: fusiondirectory <contact@fusiondirectory.org>\n"
-"Language-Team: Czech (Czech Republic) (http://www.transifex.com/projects/p/FusionDirectory-108/language/cs_CZ/)\n"
+"POT-Creation-Date: 2014-12-15 17:47+0100\n"
+"PO-Revision-Date: 2015-04-08 08:42+0000\n"
+"Last-Translator: Pavel Borecki <pavel.borecki@gmail.com>\n"
+"Language-Team: Czech (Czech Republic) (http://www.transifex.com/projects/p/FusionDirectory-109/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/groups/samba/class_sambaGroup.inc:29
+#: personal/samba/class_sambaAccount.inc:135
+#: config/samba/class_sambaPluginConfig.inc:28
+msgid "Samba"
+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:42
+#: admin/groups/samba/class_sambaGroup.inc:45
+#: admin/systems/samba/class_winstationGeneric.inc:88
+#: personal/samba/class_sambaAccount.inc:176
+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 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 skupiny Samby"
+
+#: admin/groups/samba/class_sambaGroup.inc:60
+#: admin/groups/samba/class_sambaGroup.inc:119
+msgid "Samba group"
+msgstr "Skupina v SambÄ›"
+
+#: admin/groups/samba/class_sambaGroup.inc:60
+#: admin/groups/samba/class_sambaGroup.inc:119
+msgid "Domain admins"
+msgstr "SprÃ¡vci domÃ©ny"
+
+#: admin/groups/samba/class_sambaGroup.inc:60
+#: admin/groups/samba/class_sambaGroup.inc:119
+msgid "Domain users"
+msgstr "DomÃ©novÃ uÅ¾ivatelÃ©"
+
+#: admin/groups/samba/class_sambaGroup.inc:60
+#: admin/groups/samba/class_sambaGroup.inc:119
+msgid "Domain guests"
+msgstr "DomÃ©novÃ hostÃ©"
+
+#: admin/groups/samba/class_sambaGroup.inc:105
+msgid "Configuration error"
+msgstr "Chyba v nastavenÃ"
+
+#: admin/groups/samba/class_sambaGroup.inc:105
+msgid "Cannot find group SID in your configuration!"
+msgstr "Ve vaÅ¡Ã konfiguraci nelze nalÃ©zt SID skupiny!"
+
+#: admin/groups/samba/class_sambaGroup.inc:119
+#, php-format
+msgid "Special group (%d)"
+msgstr "ZvlÃ¡Å¡tnÃ skupina (%d)"
+
+#: admin/groups/samba/class_sambaGroup.inc:133
+#: personal/samba/class_sambaAccount.inc:478
+#: personal/samba/class_sambaAccount.inc:500
+msgid "Warning"
+msgstr "VarovÃ¡nÃ"
+
+#: admin/groups/samba/class_sambaGroup.inc:133
+#: personal/samba/class_sambaAccount.inc:478
+msgid "Undefined Samba SID detected. Please fix this problem manually!"
+msgstr "ZjiÅ¡tÄ›no nedefinovanÃ© SID Samby. ProsÃm opravte tento problÃ©m ruÄnÃm zÃ¡sahem do nastavenÃ!"
+
 #: admin/samba/class_sambaDomainManagement.inc:35
 msgid "Samba domains"
-msgstr ""
+msgstr "DomÃ©ny Samba"
 
 #: admin/samba/class_sambaDomainManagement.inc:36
 msgid "Samba domain management"
-msgstr ""
+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 ""
+msgstr "Samba domÃ©na"
 
 #: admin/samba/class_sambaDomain.inc:35
 msgid "Samba domain settings"
@@ -40,11 +115,11 @@ msgstr "NastavenÃ Samba domÃ©ny"
 #: admin/samba/class_sambaDomain.inc:51
 #: admin/systems/samba/class_winstationGeneric.inc:64
 msgid "Properties"
-msgstr "vlastnosti"
+msgstr "Vlastnosti"
 
 #: admin/samba/class_sambaDomain.inc:54
 msgid "Domain name"
-msgstr "nÃ¡zev domÃ©ny"
+msgstr "NÃ¡zev domÃ©ny"
 
 #: admin/samba/class_sambaDomain.inc:54
 msgid "Name of this domain"
@@ -56,15 +131,15 @@ msgstr "SID"
 
 #: admin/samba/class_sambaDomain.inc:58
 msgid "SID of this domain"
-msgstr ""
+msgstr "BezpeÄnostnÃ identifikÃ¡tor tÃ©to domÃ©ny"
 
 #: admin/samba/class_sambaDomain.inc:62
 msgid "Rid base"
-msgstr ""
+msgstr "ZÃ¡klad RID"
 
 #: admin/samba/class_sambaDomain.inc:62
 msgid "Algorithmic rid base"
-msgstr ""
+msgstr "ZÃ¡klad algoritmickÃ©ho relativnÃho identifikÃ¡toru"
 
 #: admin/samba/class_sambaDomain.inc:66
 msgid "Minimum password age"
@@ -74,7 +149,7 @@ msgstr "minimÃ¡lnÃ stÃ¡Å™Ã hesla"
 msgid ""
 "Minimum password age, in seconds (default: 0 => allow immediate password "
 "change)"
-msgstr ""
+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"
@@ -83,39 +158,39 @@ msgstr "maximÃ¡lnÃ stÃ¡Å™Ã hesla"
 #: admin/samba/class_sambaDomain.inc:73
 msgid ""
 "Maximum password age, in seconds (default: -1 => never expire passwords)"
-msgstr ""
+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 ""
+msgstr "NÃ¡sledujÃcÃ RID identifikÃ¡tor"
 
 #: admin/samba/class_sambaDomain.inc:79
 msgid "Next NT rid to give out for anything"
-msgstr ""
+msgstr "PÅ™ÃÅ¡tÃ NT relativnÃ identifikÃ¡tor pro cokoli"
 
 #: admin/samba/class_sambaDomain.inc:83
 msgid "Next group RID"
-msgstr ""
+msgstr "RID identifikÃ¡tor nÃ¡sledujÃcÃ skupiny"
 
 #: admin/samba/class_sambaDomain.inc:84
 msgid "Next NT rid to give out for groups"
-msgstr ""
+msgstr "PÅ™ÃÅ¡tÃ NT relativnÃ identifikÃ¡tor pro skupiny"
 
 #: admin/samba/class_sambaDomain.inc:88
 msgid "Next user RID"
-msgstr ""
+msgstr "RelativnÃ identifikÃ¡tor dalÅ¡Ãho uÅ¾ivatele"
 
 #: admin/samba/class_sambaDomain.inc:89
 msgid "Next NT rid to give our for users"
-msgstr ""
+msgstr "PÅ™ÃÅ¡tÃ NT relativnÃ identifikÃ¡tor pro vaÅ¡e uÅ¾ivatele"
 
 #: admin/samba/class_sambaDomain.inc:93
 msgid "Minimum password length"
-msgstr "MinimÃ¡lnÃ dÃ©lka hesla"
+msgstr "NejkratÅ¡Ã umoÅ¾nÄ›nÃ¡ dÃ©lka hesla"
 
 #: admin/samba/class_sambaDomain.inc:94
 msgid "Minimal password length (default: 5)"
-msgstr "MinimÃ¡lnÃ dÃ©lka hesla (vÃ½chozÃ: 5 znakÅ¯)"
+msgstr "NejkratÅ¡Ã pÅ™ijatelnÃ¡ dÃ©lka hesla (vÃ½chozÃ: 5 znakÅ¯)"
 
 #: admin/samba/class_sambaDomain.inc:98
 msgid "Password history length"
@@ -123,47 +198,47 @@ msgstr "DÃ©lka historie hesla"
 
 #: admin/samba/class_sambaDomain.inc:99
 msgid "Length of Password History Entries (default: 0 => off)"
-msgstr ""
+msgstr "Hloubka historie hesel (vÃ½chozÃ: 0 => nepamatovat)"
 
 #: admin/samba/class_sambaDomain.inc:103
 msgid "Logon to change password"
-msgstr ""
+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 ""
+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Ã odemÄenÃ"
+msgstr "Doba trvÃ¡nÃ uzamÄenÃ"
 
 #: admin/samba/class_sambaDomain.inc:109
 msgid "Lockout duration in minutes (default: 30, -1 => forever)"
-msgstr ""
+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 ""
+msgstr "PozorovacÃ okno uzamÄenÃ"
 
 #: admin/samba/class_sambaDomain.inc:114
 msgid "Reset time after lockout in minutes (default: 30)"
-msgstr ""
+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 ""
+msgstr "PrÃ¡h uzamÄenÃ"
 
 #: admin/samba/class_sambaDomain.inc:119
 msgid "Lockout users after bad logon attempts (default: 0 => off)"
-msgstr ""
+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 ""
+msgstr "Vynutit odhlÃ¡Å¡enÃ"
 
 #: admin/samba/class_sambaDomain.inc:124
 msgid "Disconnect Users outside logon hours (default: -1 => off, 0 => on)"
-msgstr ""
+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"
@@ -171,29 +246,29 @@ msgstr "odmÃtnout zmÄ›nu hesla stroje"
 
 #: admin/samba/class_sambaDomain.inc:129
 msgid "Allow Machine Password changes (default: 0 => off)"
-msgstr ""
+msgstr "UmoÅ¾nit zmÄ›nu hesel poÄÃtaÄÅ¯ (vÃ½chozÃ: 0 => neumoÅ¾nit)"
 
 #: admin/systems/samba/class_winstationGeneric.inc:40
 msgid "Winstation"
-msgstr "pracovnÃ stanice s OS MS Windows"
+msgstr "PoÄÃtaÄ s MS Windows"
 
 #: admin/systems/samba/class_winstationGeneric.inc:41
 msgid "Windows workstation information"
-msgstr ""
+msgstr "Informace o poÄÃtaÄi s MS Windows"
 
 #: admin/systems/samba/class_winstationGeneric.inc:45
 #: admin/systems/samba/class_winstationGeneric.inc:46
 msgid "Windows workstation"
-msgstr "pracovnÃ stanice s OS MS Windows"
+msgstr "PoÄÃtaÄ s MS Windows"
 
 #: admin/systems/samba/class_winstationGeneric.inc:73
 #: admin/systems/samba/class_winstationGeneric.inc:77
 msgid "The name of the winstation"
-msgstr ""
+msgstr "NÃ¡zev poÄÃtaÄe s MS Windows"
 
 #: admin/systems/samba/class_winstationGeneric.inc:77
 msgid "Name"
-msgstr "jmÃ©no"
+msgstr "NÃ¡zev"
 
 #: admin/systems/samba/class_winstationGeneric.inc:84
 msgid "Description"
@@ -201,12 +276,7 @@ msgstr "popis"
 
 #: admin/systems/samba/class_winstationGeneric.inc:84
 msgid "A short description of the winstation"
-msgstr ""
-
-#: admin/systems/samba/class_winstationGeneric.inc:88
-#: personal/samba/class_sambaAccount.inc:176
-msgid "Domain"
-msgstr "domÃ©na"
+msgstr "StruÄnÃ½ popis poÄÃtaÄe s MS Windows"
 
 #: admin/systems/samba/class_winstationGeneric.inc:88
 #: personal/samba/class_sambaAccount.inc:176
@@ -215,33 +285,28 @@ msgstr "nÃ¡zev domÃ©ny Samba"
 
 #: admin/systems/samba/class_winstationGeneric.inc:92
 msgid "Location"
-msgstr "umÃstÄ›nÃ"
+msgstr "UmÃstÄ›nÃ"
 
 #: admin/systems/samba/class_winstationGeneric.inc:92
 msgid "The location of the winstation"
-msgstr ""
+msgstr "UmÃstÄ›nÃ poÄÃtaÄe s MS Windows"
 
 #: admin/systems/samba/class_winstationGeneric.inc:99
 #: admin/systems/samba/class_winstationGeneric.inc:103
 msgid "Action"
-msgstr "akce"
+msgstr "Akce"
 
 #: admin/systems/samba/class_winstationGeneric.inc:104
 msgid "Select action to execute for this terminal"
-msgstr "vyberte akci, kterÃ¡ mÃ¡ bÃ½t spuÅ¡tÄ›na na terminÃ¡lu"
+msgstr "Vyberte akci, kterÃ¡ mÃ¡ vykonÃ¡na na tomto terminÃ¡lu"
 
 #: admin/systems/samba/class_winstationGeneric.inc:110
 msgid "Network settings"
-msgstr ""
+msgstr "NastavenÃ sÃtÄ›"
 
 #: personal/samba/class_sambaAccount.inc:31
 msgid "Samba Munged Dial"
-msgstr ""
-
-#: personal/samba/class_sambaAccount.inc:135
-#: config/samba/class_sambaPluginConfig.inc:28
-msgid "Samba"
-msgstr "Samba"
+msgstr "Samba â€“ pÅ™Ãstup pÅ™es vytÃ¡ÄenÃ© spojenÃ"
 
 #: personal/samba/class_sambaAccount.inc:136
 #: config/samba/class_sambaPluginConfig.inc:41
@@ -250,7 +315,7 @@ msgstr "nastavenÃ Samby"
 
 #: personal/samba/class_sambaAccount.inc:160
 msgid "Samba profile"
-msgstr ""
+msgstr "Profil Samba"
 
 #: personal/samba/class_sambaAccount.inc:166
 #: personal/samba/class_sambaAccount.inc:199
@@ -260,30 +325,30 @@ msgstr "Disk s domovskou sloÅ¾kou"
 #: personal/samba/class_sambaAccount.inc:166
 #: personal/samba/class_sambaAccount.inc:199
 msgid "Letter for the home drive"
-msgstr ""
+msgstr "PÃsmenko domovskÃ©ho disku"
 
 #: personal/samba/class_sambaAccount.inc:171
 #: personal/samba/class_sambaAccount.inc:204
 msgid "Home directory path"
-msgstr "Cesta k domovskÃ© sloÅ¾ce"
+msgstr "UmÃstÄ›nÃ domovskÃ© sloÅ¾ky"
 
 #: personal/samba/class_sambaAccount.inc:171
 #: personal/samba/class_sambaAccount.inc:204
 msgid "UNC path for the home drive"
-msgstr ""
+msgstr "UmÃstÄ›nÃ (v UNC zÃ¡pisu) domovskÃ©ho disku"
 
 #: personal/samba/class_sambaAccount.inc:180
 msgid "Script path"
-msgstr "cesta ke skriptu"
+msgstr "UmÃstÄ›nÃ skriptu"
 
 #: personal/samba/class_sambaAccount.inc:180
 msgid "Login script path"
-msgstr "Cesta ke skriptu po spuÅ¡tÄ›nÃ"
+msgstr "UmÃstÄ›nÃ skriptu, spouÅ¡tÄ›nÃ©ho pÅ™i pÅ™ihlÃ¡Å¡ovÃ¡nÃ"
 
 #: personal/samba/class_sambaAccount.inc:184
 #: personal/samba/class_sambaAccount.inc:209
 msgid "Profile path"
-msgstr "cesta k profilu"
+msgstr "UmÃstÄ›nÃ profilu"
 
 #: personal/samba/class_sambaAccount.inc:184
 #: personal/samba/class_sambaAccount.inc:209
@@ -292,59 +357,59 @@ msgstr "Cesta k profilu v UNC zÃ¡pisu"
 
 #: personal/samba/class_sambaAccount.inc:191
 msgid "Terminal server"
-msgstr "terminÃ¡lovÃ½ server"
+msgstr "TerminÃ¡lovÃ½ server"
 
 #: personal/samba/class_sambaAccount.inc:195
 msgid "Allow login on terminal server"
-msgstr "povolit pÅ™ihlaÅ¡ovÃ¡nÃ k terminÃ¡lovÃ©mu serveru"
+msgstr "UmoÅ¾nit pÅ™ihlaÅ¡ovÃ¡nÃ k terminÃ¡lovÃ©mu serveru"
 
 #: personal/samba/class_sambaAccount.inc:214
 msgid "Inherit client config"
-msgstr "zdÄ›dit nastavenÃ klienta"
+msgstr "PÅ™evzÃt nastavenÃ klienta"
 
 #: personal/samba/class_sambaAccount.inc:214
 msgid "Inherit client configuration"
-msgstr ""
+msgstr "PÅ™evzÃt nastavenÃ klienta"
 
 #: personal/samba/class_sambaAccount.inc:218
 msgid "Initial progam"
-msgstr ""
+msgstr "ÃšvodnÃ program"
 
 #: personal/samba/class_sambaAccount.inc:218
 msgid "Program to start after connecting"
-msgstr ""
+msgstr "Program, kterÃ½ spustit po navÃ¡zÃ¡nÃ spojenÃ"
 
 #: personal/samba/class_sambaAccount.inc:222
 msgid "Working directory"
-msgstr "pracovnÃ adresÃ¡Å™"
+msgstr "PracovnÃ sloÅ¾ka"
 
 #: personal/samba/class_sambaAccount.inc:222
 msgid "Basic working directory"
-msgstr ""
+msgstr "ZÃ¡kladnÃ pracovnÃ sloÅ¾ka"
 
 #: personal/samba/class_sambaAccount.inc:226
 msgid "Connection timeout"
-msgstr ""
+msgstr "ÄŒasovÃ½ limit spojenÃ"
 
 #: personal/samba/class_sambaAccount.inc:226
 msgid "Timeout when connecting to terminal server"
-msgstr ""
+msgstr "NejdelÅ¡Ã pÅ™ijatelnÃ¡ doba ÄekÃ¡nÃ na spojenÃ s terminÃ¡lovÃ½m serverem"
 
 #: personal/samba/class_sambaAccount.inc:231
 msgid "Disconnection timeout"
-msgstr ""
+msgstr "ÄŒasovÃ½ limit odpojenÃ"
 
 #: personal/samba/class_sambaAccount.inc:231
 msgid "Timeout before disconnecting from terminal server"
-msgstr ""
+msgstr "Prodleva odpojenÃ od terminÃ¡lovÃ©ho serveru"
 
 #: personal/samba/class_sambaAccount.inc:236
 msgid "Idle timeout"
-msgstr ""
+msgstr "NejdelÅ¡Ã pÅ™ijatelnÃ¡ doba neÄinnosti"
 
 #: personal/samba/class_sambaAccount.inc:236
 msgid "Idle timeout before disconnecting from terminal server"
-msgstr ""
+msgstr "Doba neÄinnosti, po jejÃmÅ¾ uplynutÃ dojde k samoÄinnÃ©mu odpojenÃ od terminÃ¡lovÃ©ho serveru"
 
 #: personal/samba/class_sambaAccount.inc:241
 msgid "Connect client drives at logon"
@@ -352,35 +417,35 @@ msgstr "pÅ™i pÅ™ihlÃ¡Å¡enÃ pÅ™ipojit klientovy sÃÅ¥ovÃ© disky"
 
 #: personal/samba/class_sambaAccount.inc:241
 msgid "Drive to connect after login"
-msgstr ""
+msgstr "Jednotka, kterou pÅ™ipojit po pÅ™ihlÃ¡Å¡enÃ"
 
 #: personal/samba/class_sambaAccount.inc:245
 msgid "Connect client printers at logon"
-msgstr "pÅ™i pÅ™ihlÃ¡Å¡enÃ pÅ™ipojit klientovy sÃÅ¥ovÃ© tiskÃ¡rny"
+msgstr "PÅ™i pÅ™ihlÃ¡Å¡enÃ pÅ™ipojit klientovy sÃÅ¥ovÃ© tiskÃ¡rny"
 
 #: personal/samba/class_sambaAccount.inc:245
 msgid "Printers to connect after login"
-msgstr ""
+msgstr "TiskÃ¡rny, kterÃ© pÅ™ipojit po pÅ™ihlÃ¡Å¡enÃ"
 
 #: personal/samba/class_sambaAccount.inc:249
 msgid "Default to main client printer"
-msgstr "nastavit hlavnÃ tiskÃ¡rnu klienta jako vÃ½chozÃ"
+msgstr "HlavnÃ tiskÃ¡rnu klienta nastavit jako vÃ½chozÃ"
 
 #: personal/samba/class_sambaAccount.inc:249
 msgid "Default printer for this client"
-msgstr ""
+msgstr "VÃ½chozÃ tiskÃ¡rna pro tohoto klienta"
 
 #: personal/samba/class_sambaAccount.inc:253
 msgid "Shadowing"
-msgstr "skrÃ½vÃ¡nÃ"
+msgstr "SkrÃ½vÃ¡nÃ"
 
 #: personal/samba/class_sambaAccount.inc:256
 msgid "disabled"
-msgstr "zakÃ¡zÃ¡no"
+msgstr "vypnuto"
 
 #: personal/samba/class_sambaAccount.inc:256
 msgid "input on, notify on"
-msgstr "vstup a oznamovÃ¡nÃ zapnuty"
+msgstr "zapnout vstup a oznamovÃ¡nÃ"
 
 #: personal/samba/class_sambaAccount.inc:256
 msgid "input on, notify off"
@@ -400,7 +465,7 @@ msgstr "v pÅ™ÃpadÄ› vÃ½padku Äi vyprÅ¡enÃ ÄasovÃ©ho limitu spojenÃ"
 
 #: personal/samba/class_sambaAccount.inc:260
 msgid "What happen if disconnected or timeout"
-msgstr ""
+msgstr "Co nastane v pÅ™ÃpadÄ› odpojenÃ Äi vyprÅ¡enÃ ÄasovÃ©ho limitu"
 
 #: personal/samba/class_sambaAccount.inc:263
 msgid "disconnect"
@@ -412,43 +477,43 @@ msgstr "resetovat"
 
 #: personal/samba/class_sambaAccount.inc:266
 msgid "Reconnect if disconnected"
-msgstr "v pÅ™ÃpadÄ› odpojenÃ pÅ™ipojit znovu"
+msgstr "V pÅ™ÃpadÄ› odpojenÃ pÅ™ipojit znovu"
 
 #: personal/samba/class_sambaAccount.inc:269
 msgid "from any client"
-msgstr "z jakÃ©hokoli poÄÃtaÄe"
+msgstr "z jakÃ©hokoli klienta"
 
 #: personal/samba/class_sambaAccount.inc:269
 msgid "from previous client only"
-msgstr "pouze z naposledy pouÅ¾itÃ©ho poÄÃtaÄe"
+msgstr "Pouze z minule pouÅ¾itÃ©ho klienta"
 
 #: personal/samba/class_sambaAccount.inc:281
 msgid "Access options"
-msgstr "moÅ¾nosti pÅ™Ãstupu"
+msgstr "MoÅ¾nosti pÅ™Ãstupu"
 
 #: personal/samba/class_sambaAccount.inc:285
 msgid "Enforce password change"
-msgstr "vynutit zmÄ›nu hesla"
+msgstr "PÅ™imÄ›t ke zmÄ›nÄ› hesla"
 
 #: personal/samba/class_sambaAccount.inc:285
 msgid "Force the user to change his password"
-msgstr ""
+msgstr "PÅ™imÄ›t uÅ¾ivatele ke zmÄ›nÄ› hesla"
 
 #: personal/samba/class_sambaAccount.inc:290
 msgid "The password never expire"
-msgstr ""
+msgstr "Heslo je platnÃ© stÃ¡le"
 
 #: personal/samba/class_sambaAccount.inc:290
 msgid "The password will never expire"
-msgstr "Platnost hesla nikdy nevyprÅ¡Ã"
+msgstr "Platnost hesla nikdy neskonÄÃ"
 
 #: personal/samba/class_sambaAccount.inc:295
 msgid "Login from windows client requires no password"
-msgstr "pÅ™ihlÃ¡Å¡enÃ z klienta s MS Windows nevyÅ¾aduje heslo"
+msgstr "PÅ™ihlÃ¡Å¡enÃ z klienta s MS Windows nevyÅ¾aduje heslo"
 
 #: personal/samba/class_sambaAccount.inc:295
 msgid "Login from a client without a password"
-msgstr ""
+msgstr "PÅ™ihlÃ¡Å¡enÃ z klienta bez hesla"
 
 #: personal/samba/class_sambaAccount.inc:300
 msgid "Lock samba account"
@@ -460,15 +525,15 @@ msgstr "Uzamknout ÃºÄet"
 
 #: personal/samba/class_sambaAccount.inc:305
 msgid "Cannot change password"
-msgstr "heslo nepÅ¯jde zmÄ›nit"
+msgstr "Heslo nelze zmÄ›nit"
 
 #: personal/samba/class_sambaAccount.inc:305
 msgid "Not allowed to change password"
-msgstr "ZmÄ›na hesla nenÃ dovolena"
+msgstr "ZmÄ›na hesla nenÃ umoÅ¾nÄ›na"
 
 #: personal/samba/class_sambaAccount.inc:309
 msgid "Account expiration"
-msgstr "VyprÅ¡enÃ platnosti ÃºÄtu"
+msgstr "SkonÄenÃ platnosti ÃºÄtu"
 
 #: personal/samba/class_sambaAccount.inc:309
 msgid "When does the account expire"
@@ -484,7 +549,7 @@ msgstr "Ve kterÃ½ch Äasech je dovoleno se pÅ™ipojit"
 
 #: personal/samba/class_sambaAccount.inc:318
 msgid "Edit settings"
-msgstr "upravit nastavenÃ"
+msgstr "Upravit nastavenÃ"
 
 #: personal/samba/class_sambaAccount.inc:332
 msgid "System trust"
@@ -492,7 +557,7 @@ msgstr "systÃ©m dÅ¯vÄ›ryhodnosti"
 
 #: personal/samba/class_sambaAccount.inc:338
 msgid "Allow connection from these workstations only"
-msgstr "povolit pÅ™ipojenÃ pouze z tÄ›chto pracovnÃch stanic"
+msgstr "Povolit pÅ™ipojenÃ pouze z tÄ›chto poÄÃtaÄÅ¯"
 
 #: personal/samba/class_sambaAccount.inc:338
 msgid "Only allow this user to connect to this list of hosts"
@@ -508,18 +573,9 @@ msgstr "cesta k domovskÃ©mu ÃºloÅ¾iÅ¡ti"
 
 #: personal/samba/class_sambaAccount.inc:462
 msgid "The windows user manager allows eight clients at maximum!"
-msgstr "SprÃ¡vce uÅ¾ivatelskÃ½ch ÃºÄtÅ¯ v MS Windows povoluje maximÃ¡lnÄ› 8 klientÅ¯!"
+msgstr "SprÃ¡vce uÅ¾ivatelskÃ½ch ÃºÄtÅ¯ v MS Windows umoÅ¾Åˆuje nejvÃ½Å¡e 8 klientÅ¯!"
 
-#: personal/samba/class_sambaAccount.inc:478
 #: personal/samba/class_sambaAccount.inc:501
-msgid "Warning"
-msgstr "varovÃ¡nÃ"
-
-#: personal/samba/class_sambaAccount.inc:478
-msgid "Undefined Samba SID detected. Please fix this problem manually!"
-msgstr "ZjiÅ¡tÄ›no nedefinovanÃ© SID Samby. ProsÃm opravte tento problÃ©m ruÄnÃm zÃ¡sahem do nastavenÃ!"
-
-#: personal/samba/class_sambaAccount.inc:502
 msgid ""
 "Cannot convert primary group to samba group: group cannot be identified!"
 msgstr "Nemohu pÅ™evÃ©st primÃ¡rnÃ skupinu na skupinu Samby: skupinu se nepodaÅ™ilo identifikovat!"
@@ -538,13 +594,13 @@ msgstr "UmÃstÄ›nÃ, ve kterÃ©m bude FusionDirectory hledat novÃ© pracovnÃ stan
 
 #: config/samba/class_sambaPluginConfig.inc:49
 msgid "Samba ID mapping"
-msgstr ""
+msgstr "PÅ™evod identifikÃ¡torÅ¯ Samba"
 
 #: config/samba/class_sambaPluginConfig.inc:50
 msgid ""
 "Maintain sambaIdmapEntry objects. Depending on your setup this can "
 "drastically improve the windows login performance."
-msgstr ""
+msgstr "UchovÃ¡vat objekty sambaIdmapEntry. V zÃ¡vislosti na vaÅ¡em nastavenÃ to mÅ¯Å¾e vÃ½raznÄ› zrychlit pÅ™ihlaÅ¡ovÃ¡nÃ do Windows."
 
 #: config/samba/class_sambaPluginConfig.inc:54
 msgid "Samba SID"
@@ -554,7 +610,7 @@ msgstr "SID Samby"
 msgid ""
 "A samba SID if not available inside of the LDAP though samba schema. You can"
 " retrieve the current sid by net getlocalsid."
-msgstr ""
+msgstr "BezpeÄnosnÃ identifikÃ¡tor Samba nenÃ k dispozici v LDAP prostÅ™ednictvÃm samba schÃ©matu. AktuÃ¡lnÃ bezpeÄnostnÃ identifikÃ¡tor mÅ¯Å¾ete zÃskat pÅ™Ãkazem net getlocalsid."
 
 #: config/samba/class_sambaPluginConfig.inc:60
 msgid "Samba rid base"
@@ -564,7 +620,7 @@ msgstr "PoÄÃ¡tek Samba rid"
 msgid ""
 "The base id to add to ordinary sid calculations - if not available inside of"
 " the LDAP though samba schema."
-msgstr ""
+msgstr "ZÃ¡kladnÃ identifikÃ¡tor, kterÃ½ pÅ™idat k bÄ›Å¾nÃ½m vÃ½poÄtÅ¯m bezpeÄnostnÃch identifikÃ¡torÅ¯m â€“ pokud nenÃ k dispozici v LDAP prostÅ™ednictvÃm schÃ©matu Samba."
 
 #: config/samba/class_sambaPluginConfig.inc:66
 msgid "Expiration date synchronisaton"
@@ -572,20 +628,12 @@ msgstr "Synchronizace data vyprÅ¡enÃ platnosti"
 
 #: config/samba/class_sambaPluginConfig.inc:66
 msgid "Synchronisaton the expiration date with the POSIX one?"
-msgstr ""
+msgstr "Sjednotit dobu platnosti s tÃm v POSIX?"
 
 #: config/samba/class_sambaPluginConfig.inc:72
 msgid "Generate sambaLMPassword"
-msgstr ""
+msgstr "VytvoÅ™it sambaLMPassword"
 
 #: config/samba/class_sambaPluginConfig.inc:72
 msgid "Needed to be compliant with Windows <= 98 or Samba < 3.2"
-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 uÅ¾ivatel bude moci pÅ™ihlaÅ¡ovat."
-
-#: personal/samba/sambaLogonHours.tpl.c:5
-msgid "Hour"
-msgstr "hodina"
+msgstr "Je tÅ™eba pro zpÄ›tnou sluÄitelnost se systÃ©my Windows starÅ¡Ãmi neÅ¾ Windows 98 a Samba servery starÅ¡Ãmi neÅ¾ verze 3.2"
diff --git a/samba/locale/de/fusiondirectory.po b/samba/locale/de/fusiondirectory.po
index 819567b4746788320f1e5ffe30e2eb330774f376..0e821d2540983031e5085e5d02e3c093b2030ba4 100644
--- a/samba/locale/de/fusiondirectory.po
+++ b/samba/locale/de/fusiondirectory.po
@@ -3,24 +3,98 @@
 # This file is distributed under the same license as the PACKAGE package.
 # 
 # Translators:
-# Islam Adel, 2013
-# Islam Adel, 2013
-# Maik Wagner <maikwagner@yahoo.com>, 2013
-#  Stefan Koehler <stefan.koehler@GONICUS.de>, 2005
+# Ettore Atalan <atalanttore@googlemail.com>, 2014
 msgid ""
 msgstr ""
-"Project-Id-Version: FusionDirectory-108\n"
+"Project-Id-Version: FusionDirectory-109\n"
 "Report-Msgid-Bugs-To: documentation@lists.fusiondirectory.org\n"
-"POT-Creation-Date: 2015-03-17 18:47+0100\n"
-"PO-Revision-Date: 2015-02-25 16:12+0000\n"
-"Last-Translator: fusiondirectory <contact@fusiondirectory.org>\n"
-"Language-Team: German (http://www.transifex.com/projects/p/FusionDirectory-108/language/de/)\n"
+"POT-Creation-Date: 2014-12-15 17:47+0100\n"
+"PO-Revision-Date: 2015-03-31 11:41+0000\n"
+"Last-Translator: Ettore Atalan <atalanttore@googlemail.com>\n"
+"Language-Team: German (http://www.transifex.com/projects/p/FusionDirectory-109/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/groups/samba/class_sambaGroup.inc:29
+#: personal/samba/class_sambaAccount.inc:135
+#: 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:88
+#: personal/samba/class_sambaAccount.inc:176
+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:119
+msgid "Samba group"
+msgstr "Samba-Gruppe"
+
+#: admin/groups/samba/class_sambaGroup.inc:60
+#: admin/groups/samba/class_sambaGroup.inc:119
+msgid "Domain admins"
+msgstr "DomÃ¤nen-Administratoren"
+
+#: admin/groups/samba/class_sambaGroup.inc:60
+#: admin/groups/samba/class_sambaGroup.inc:119
+msgid "Domain users"
+msgstr "DomÃ¤nen-Benutzer"
+
+#: admin/groups/samba/class_sambaGroup.inc:60
+#: admin/groups/samba/class_sambaGroup.inc:119
+msgid "Domain guests"
+msgstr "DomÃ¤nen-GÃ¤ste"
+
+#: admin/groups/samba/class_sambaGroup.inc:105
+msgid "Configuration error"
+msgstr "Konfigurationsfehler"
+
+#: admin/groups/samba/class_sambaGroup.inc:105
+msgid "Cannot find group SID in your configuration!"
+msgstr "Kann keine Gruppen-SID in Ihrer Konfiguration finden!"
+
+#: admin/groups/samba/class_sambaGroup.inc:119
+#, php-format
+msgid "Special group (%d)"
+msgstr "Spezielle Gruppe (%d)"
+
+#: admin/groups/samba/class_sambaGroup.inc:133
+#: personal/samba/class_sambaAccount.inc:478
+#: personal/samba/class_sambaAccount.inc:500
+msgid "Warning"
+msgstr "Warnung"
+
+#: admin/groups/samba/class_sambaGroup.inc:133
+#: personal/samba/class_sambaAccount.inc:478
+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"
@@ -204,11 +278,6 @@ msgstr "Beschreibung"
 msgid "A short description of the winstation"
 msgstr "Eine kurze Beschreibung der winstation"
 
-#: admin/systems/samba/class_winstationGeneric.inc:88
-#: personal/samba/class_sambaAccount.inc:176
-msgid "Domain"
-msgstr "DomÃ¤ne"
-
 #: admin/systems/samba/class_winstationGeneric.inc:88
 #: personal/samba/class_sambaAccount.inc:176
 msgid "Samba domain name"
@@ -239,11 +308,6 @@ msgstr "Netzwerkeinstellungen"
 msgid "Samba Munged Dial"
 msgstr "Samba Munged Dial"
 
-#: personal/samba/class_sambaAccount.inc:135
-#: config/samba/class_sambaPluginConfig.inc:28
-msgid "Samba"
-msgstr "Samba"
-
 #: personal/samba/class_sambaAccount.inc:136
 #: config/samba/class_sambaPluginConfig.inc:41
 msgid "Samba settings"
@@ -284,7 +348,7 @@ msgstr "Loginskript-Pfad"
 #: personal/samba/class_sambaAccount.inc:184
 #: personal/samba/class_sambaAccount.inc:209
 msgid "Profile path"
-msgstr "Profilpfad"
+msgstr "Profil-Pfad"
 
 #: personal/samba/class_sambaAccount.inc:184
 #: personal/samba/class_sambaAccount.inc:209
@@ -429,7 +493,7 @@ msgstr "Zugriffsoptionen"
 
 #: personal/samba/class_sambaAccount.inc:285
 msgid "Enforce password change"
-msgstr "PasswortÃ¤nderung erzwingen"
+msgstr "Erzwinge Ã„nderung des Passwortes"
 
 #: personal/samba/class_sambaAccount.inc:285
 msgid "Force the user to change his password"
@@ -511,16 +575,7 @@ 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:478
 #: personal/samba/class_sambaAccount.inc:501
-msgid "Warning"
-msgstr "Warnung"
-
-#: personal/samba/class_sambaAccount.inc:478
-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:502
 msgid ""
 "Cannot convert primary group to samba group: group cannot be identified!"
 msgstr "Kann primÃ¤re Gruppe nicht in Samba-Gruppe Ã¼berfÃ¼hren: die Gruppe kann nicht identifiziert werden!"
@@ -582,11 +637,3 @@ msgstr "sambaLMPasswort generieren"
 #: config/samba/class_sambaPluginConfig.inc:72
 msgid "Needed to be compliant with Windows <= 98 or Samba < 3.2"
 msgstr "BenÃ¶tigt um KompatibilitÃ¤t mit Windows <=98 oder Samba < 3.2 zu haben"
-
-#: 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"
-
-#: personal/samba/sambaLogonHours.tpl.c:5
-msgid "Hour"
-msgstr "Stunde"
diff --git a/samba/locale/el_GR/fusiondirectory.po b/samba/locale/el_GR/fusiondirectory.po
new file mode 100644
index 0000000000000000000000000000000000000000..3a0edc092c2a9a7b14fc2a9be427ef49f9b87508
--- /dev/null
+++ b/samba/locale/el_GR/fusiondirectory.po
@@ -0,0 +1,638 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR FusionDirectory Project
+# This file is distributed under the same license as the PACKAGE package.
+# 
+# Translators:
+msgid ""
+msgstr ""
+"Project-Id-Version: FusionDirectory-109\n"
+"Report-Msgid-Bugs-To: documentation@lists.fusiondirectory.org\n"
+"POT-Creation-Date: 2014-12-15 17:47+0100\n"
+"PO-Revision-Date: 2015-05-30 11:45+0000\n"
+"Last-Translator: Benoit Mortier <benoit.mortier@opensides.be>\n"
+"Language-Team: Greek (Greece) (http://www.transifex.com/projects/p/FusionDirectory-109/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/groups/samba/class_sambaGroup.inc:29
+#: personal/samba/class_sambaAccount.inc:135
+#: config/samba/class_sambaPluginConfig.inc:28
+msgid "Samba"
+msgstr ""
+
+#: admin/groups/samba/class_sambaGroup.inc:30
+msgid "Samba group settings"
+msgstr ""
+
+#: admin/groups/samba/class_sambaGroup.inc:42
+#: admin/groups/samba/class_sambaGroup.inc:45
+#: admin/systems/samba/class_winstationGeneric.inc:88
+#: personal/samba/class_sambaAccount.inc:176
+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:119
+msgid "Samba group"
+msgstr ""
+
+#: admin/groups/samba/class_sambaGroup.inc:60
+#: admin/groups/samba/class_sambaGroup.inc:119
+msgid "Domain admins"
+msgstr ""
+
+#: admin/groups/samba/class_sambaGroup.inc:60
+#: admin/groups/samba/class_sambaGroup.inc:119
+msgid "Domain users"
+msgstr ""
+
+#: admin/groups/samba/class_sambaGroup.inc:60
+#: admin/groups/samba/class_sambaGroup.inc:119
+msgid "Domain guests"
+msgstr ""
+
+#: admin/groups/samba/class_sambaGroup.inc:105
+msgid "Configuration error"
+msgstr ""
+
+#: admin/groups/samba/class_sambaGroup.inc:105
+msgid "Cannot find group SID in your configuration!"
+msgstr ""
+
+#: admin/groups/samba/class_sambaGroup.inc:119
+#, php-format
+msgid "Special group (%d)"
+msgstr ""
+
+#: admin/groups/samba/class_sambaGroup.inc:133
+#: personal/samba/class_sambaAccount.inc:478
+#: personal/samba/class_sambaAccount.inc:500
+msgid "Warning"
+msgstr ""
+
+#: admin/groups/samba/class_sambaGroup.inc:133
+#: personal/samba/class_sambaAccount.inc:478
+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:64
+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_winstationGeneric.inc:40
+msgid "Winstation"
+msgstr ""
+
+#: admin/systems/samba/class_winstationGeneric.inc:41
+msgid "Windows workstation information"
+msgstr ""
+
+#: admin/systems/samba/class_winstationGeneric.inc:45
+#: admin/systems/samba/class_winstationGeneric.inc:46
+msgid "Windows workstation"
+msgstr ""
+
+#: admin/systems/samba/class_winstationGeneric.inc:73
+#: admin/systems/samba/class_winstationGeneric.inc:77
+msgid "The name of the winstation"
+msgstr ""
+
+#: admin/systems/samba/class_winstationGeneric.inc:77
+msgid "Name"
+msgstr ""
+
+#: admin/systems/samba/class_winstationGeneric.inc:84
+msgid "Description"
+msgstr ""
+
+#: admin/systems/samba/class_winstationGeneric.inc:84
+msgid "A short description of the winstation"
+msgstr ""
+
+#: admin/systems/samba/class_winstationGeneric.inc:88
+#: personal/samba/class_sambaAccount.inc:176
+msgid "Samba domain name"
+msgstr ""
+
+#: admin/systems/samba/class_winstationGeneric.inc:92
+msgid "Location"
+msgstr ""
+
+#: admin/systems/samba/class_winstationGeneric.inc:92
+msgid "The location of the winstation"
+msgstr ""
+
+#: admin/systems/samba/class_winstationGeneric.inc:99
+#: admin/systems/samba/class_winstationGeneric.inc:103
+msgid "Action"
+msgstr ""
+
+#: admin/systems/samba/class_winstationGeneric.inc:104
+msgid "Select action to execute for this terminal"
+msgstr ""
+
+#: admin/systems/samba/class_winstationGeneric.inc:110
+msgid "Network settings"
+msgstr ""
+
+#: personal/samba/class_sambaAccount.inc:31
+msgid "Samba Munged Dial"
+msgstr ""
+
+#: personal/samba/class_sambaAccount.inc:136
+#: config/samba/class_sambaPluginConfig.inc:41
+msgid "Samba settings"
+msgstr ""
+
+#: personal/samba/class_sambaAccount.inc:160
+msgid "Samba profile"
+msgstr ""
+
+#: personal/samba/class_sambaAccount.inc:166
+#: personal/samba/class_sambaAccount.inc:199
+msgid "Home directory drive"
+msgstr ""
+
+#: personal/samba/class_sambaAccount.inc:166
+#: personal/samba/class_sambaAccount.inc:199
+msgid "Letter for the home drive"
+msgstr ""
+
+#: personal/samba/class_sambaAccount.inc:171
+#: personal/samba/class_sambaAccount.inc:204
+msgid "Home directory path"
+msgstr ""
+
+#: personal/samba/class_sambaAccount.inc:171
+#: personal/samba/class_sambaAccount.inc:204
+msgid "UNC path for the home drive"
+msgstr ""
+
+#: personal/samba/class_sambaAccount.inc:180
+msgid "Script path"
+msgstr ""
+
+#: personal/samba/class_sambaAccount.inc:180
+msgid "Login script path"
+msgstr ""
+
+#: personal/samba/class_sambaAccount.inc:184
+#: personal/samba/class_sambaAccount.inc:209
+msgid "Profile path"
+msgstr ""
+
+#: personal/samba/class_sambaAccount.inc:184
+#: personal/samba/class_sambaAccount.inc:209
+msgid "UNC profile path"
+msgstr ""
+
+#: personal/samba/class_sambaAccount.inc:191
+msgid "Terminal server"
+msgstr ""
+
+#: personal/samba/class_sambaAccount.inc:195
+msgid "Allow login on terminal server"
+msgstr ""
+
+#: personal/samba/class_sambaAccount.inc:214
+msgid "Inherit client config"
+msgstr ""
+
+#: personal/samba/class_sambaAccount.inc:214
+msgid "Inherit client configuration"
+msgstr ""
+
+#: personal/samba/class_sambaAccount.inc:218
+msgid "Initial progam"
+msgstr ""
+
+#: personal/samba/class_sambaAccount.inc:218
+msgid "Program to start after connecting"
+msgstr ""
+
+#: personal/samba/class_sambaAccount.inc:222
+msgid "Working directory"
+msgstr ""
+
+#: personal/samba/class_sambaAccount.inc:222
+msgid "Basic working directory"
+msgstr ""
+
+#: personal/samba/class_sambaAccount.inc:226
+msgid "Connection timeout"
+msgstr ""
+
+#: personal/samba/class_sambaAccount.inc:226
+msgid "Timeout when connecting to terminal server"
+msgstr ""
+
+#: personal/samba/class_sambaAccount.inc:231
+msgid "Disconnection timeout"
+msgstr ""
+
+#: personal/samba/class_sambaAccount.inc:231
+msgid "Timeout before disconnecting from terminal server"
+msgstr ""
+
+#: personal/samba/class_sambaAccount.inc:236
+msgid "Idle timeout"
+msgstr ""
+
+#: personal/samba/class_sambaAccount.inc:236
+msgid "Idle timeout before disconnecting from terminal server"
+msgstr ""
+
+#: personal/samba/class_sambaAccount.inc:241
+msgid "Connect client drives at logon"
+msgstr ""
+
+#: personal/samba/class_sambaAccount.inc:241
+msgid "Drive to connect after login"
+msgstr ""
+
+#: personal/samba/class_sambaAccount.inc:245
+msgid "Connect client printers at logon"
+msgstr ""
+
+#: personal/samba/class_sambaAccount.inc:245
+msgid "Printers to connect after login"
+msgstr ""
+
+#: personal/samba/class_sambaAccount.inc:249
+msgid "Default to main client printer"
+msgstr ""
+
+#: personal/samba/class_sambaAccount.inc:249
+msgid "Default printer for this client"
+msgstr ""
+
+#: personal/samba/class_sambaAccount.inc:253
+msgid "Shadowing"
+msgstr ""
+
+#: personal/samba/class_sambaAccount.inc:256
+msgid "disabled"
+msgstr ""
+
+#: personal/samba/class_sambaAccount.inc:256
+msgid "input on, notify on"
+msgstr ""
+
+#: personal/samba/class_sambaAccount.inc:256
+msgid "input on, notify off"
+msgstr ""
+
+#: personal/samba/class_sambaAccount.inc:257
+msgid "input off, notify on"
+msgstr ""
+
+#: personal/samba/class_sambaAccount.inc:257
+msgid "input off, nofify off"
+msgstr ""
+
+#: personal/samba/class_sambaAccount.inc:260
+msgid "On broken or timed out"
+msgstr ""
+
+#: personal/samba/class_sambaAccount.inc:260
+msgid "What happen if disconnected or timeout"
+msgstr ""
+
+#: personal/samba/class_sambaAccount.inc:263
+msgid "disconnect"
+msgstr ""
+
+#: personal/samba/class_sambaAccount.inc:263
+msgid "reset"
+msgstr ""
+
+#: personal/samba/class_sambaAccount.inc:266
+msgid "Reconnect if disconnected"
+msgstr ""
+
+#: personal/samba/class_sambaAccount.inc:269
+msgid "from any client"
+msgstr ""
+
+#: personal/samba/class_sambaAccount.inc:269
+msgid "from previous client only"
+msgstr ""
+
+#: personal/samba/class_sambaAccount.inc:281
+msgid "Access options"
+msgstr ""
+
+#: personal/samba/class_sambaAccount.inc:285
+msgid "Enforce password change"
+msgstr ""
+
+#: personal/samba/class_sambaAccount.inc:285
+msgid "Force the user to change his password"
+msgstr ""
+
+#: personal/samba/class_sambaAccount.inc:290
+msgid "The password never expire"
+msgstr ""
+
+#: personal/samba/class_sambaAccount.inc:290
+msgid "The password will never expire"
+msgstr ""
+
+#: personal/samba/class_sambaAccount.inc:295
+msgid "Login from windows client requires no password"
+msgstr ""
+
+#: personal/samba/class_sambaAccount.inc:295
+msgid "Login from a client without a password"
+msgstr ""
+
+#: personal/samba/class_sambaAccount.inc:300
+msgid "Lock samba account"
+msgstr ""
+
+#: personal/samba/class_sambaAccount.inc:300
+msgid "Lock the account"
+msgstr ""
+
+#: personal/samba/class_sambaAccount.inc:305
+msgid "Cannot change password"
+msgstr ""
+
+#: personal/samba/class_sambaAccount.inc:305
+msgid "Not allowed to change password"
+msgstr ""
+
+#: personal/samba/class_sambaAccount.inc:309
+msgid "Account expiration"
+msgstr ""
+
+#: personal/samba/class_sambaAccount.inc:309
+msgid "When does the account expire"
+msgstr ""
+
+#: personal/samba/class_sambaAccount.inc:317
+msgid "Samba logon times"
+msgstr ""
+
+#: personal/samba/class_sambaAccount.inc:317
+msgid "What is the allowed time to connect"
+msgstr ""
+
+#: personal/samba/class_sambaAccount.inc:318
+msgid "Edit settings"
+msgstr ""
+
+#: personal/samba/class_sambaAccount.inc:332
+msgid "System trust"
+msgstr ""
+
+#: personal/samba/class_sambaAccount.inc:338
+msgid "Allow connection from these workstations only"
+msgstr ""
+
+#: personal/samba/class_sambaAccount.inc:338
+msgid "Only allow this user to connect to this list of hosts"
+msgstr ""
+
+#: personal/samba/class_sambaAccount.inc:454
+msgid "Home drive"
+msgstr ""
+
+#: personal/samba/class_sambaAccount.inc:457
+msgid "Home path"
+msgstr ""
+
+#: personal/samba/class_sambaAccount.inc:462
+msgid "The windows user manager allows eight clients at maximum!"
+msgstr ""
+
+#: personal/samba/class_sambaAccount.inc:501
+msgid ""
+"Cannot convert primary group to samba group: group cannot be identified!"
+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 ""
diff --git a/samba/locale/en/fusiondirectory.po b/samba/locale/en/fusiondirectory.po
index 5523219eee528ca9ccbc28017231fcf0cd389f91..7d69b0712a6b72b12ba5bc8fed275f759796a491 100644
--- a/samba/locale/en/fusiondirectory.po
+++ b/samba/locale/en/fusiondirectory.po
@@ -6,17 +6,94 @@
 #, fuzzy
 msgid ""
 msgstr ""
-"Project-Id-Version: PACKAGE VERSION\n"
-"Report-Msgid-Bugs-To: documentation@lists.fusiondirectory.org\n"
-"POT-Creation-Date: 2015-03-31 11:49+0200\n"
+"Project-Id-Version: FusionDirectory VERSION\n"
+"Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
+"POT-Creation-Date: 2015-05-30 15:30+0200\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
-"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
-"Language-Team: LANGUAGE <LL@li.org>\n"
-"Language: \n"
+"Last-Translator: FusionDirectory project <contact@fusiondirectory.org>\n"
+"Language-Team: English\n"
+"Language: en\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 
+#: admin/groups/samba/class_sambaGroup.inc:29
+#: personal/samba/class_sambaAccount.inc:135
+#: config/samba/class_sambaPluginConfig.inc:28
+msgid "Samba"
+msgstr ""
+
+#: admin/groups/samba/class_sambaGroup.inc:30
+msgid "Samba group settings"
+msgstr ""
+
+#: admin/groups/samba/class_sambaGroup.inc:42
+#: admin/groups/samba/class_sambaGroup.inc:45
+#: admin/systems/samba/class_winstationGeneric.inc:88
+#: personal/samba/class_sambaAccount.inc:176
+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:119
+msgid "Samba group"
+msgstr ""
+
+#: admin/groups/samba/class_sambaGroup.inc:60
+#: admin/groups/samba/class_sambaGroup.inc:119
+msgid "Domain admins"
+msgstr ""
+
+#: admin/groups/samba/class_sambaGroup.inc:60
+#: admin/groups/samba/class_sambaGroup.inc:119
+msgid "Domain users"
+msgstr ""
+
+#: admin/groups/samba/class_sambaGroup.inc:60
+#: admin/groups/samba/class_sambaGroup.inc:119
+msgid "Domain guests"
+msgstr ""
+
+#: admin/groups/samba/class_sambaGroup.inc:105
+msgid "Configuration error"
+msgstr ""
+
+#: admin/groups/samba/class_sambaGroup.inc:105
+msgid "Cannot find group SID in your configuration!"
+msgstr ""
+
+#: admin/groups/samba/class_sambaGroup.inc:119
+#, php-format
+msgid "Special group (%d)"
+msgstr ""
+
+#: admin/groups/samba/class_sambaGroup.inc:133
+#: personal/samba/class_sambaAccount.inc:478
+#: personal/samba/class_sambaAccount.inc:501
+msgid "Warning"
+msgstr ""
+
+#: admin/groups/samba/class_sambaGroup.inc:133
+#: personal/samba/class_sambaAccount.inc:478
+msgid "Undefined Samba SID detected. Please fix this problem manually!"
+msgstr ""
+
 #: admin/samba/class_sambaDomainManagement.inc:35
 msgid "Samba domains"
 msgstr ""
@@ -200,11 +277,6 @@ msgstr ""
 msgid "A short description of the winstation"
 msgstr ""
 
-#: admin/systems/samba/class_winstationGeneric.inc:88
-#: personal/samba/class_sambaAccount.inc:176
-msgid "Domain"
-msgstr ""
-
 #: admin/systems/samba/class_winstationGeneric.inc:88
 #: personal/samba/class_sambaAccount.inc:176
 msgid "Samba domain name"
@@ -235,11 +307,6 @@ msgstr ""
 msgid "Samba Munged Dial"
 msgstr ""
 
-#: personal/samba/class_sambaAccount.inc:135
-#: config/samba/class_sambaPluginConfig.inc:28
-msgid "Samba"
-msgstr ""
-
 #: personal/samba/class_sambaAccount.inc:136
 #: config/samba/class_sambaPluginConfig.inc:41
 msgid "Samba settings"
@@ -507,15 +574,6 @@ msgstr ""
 msgid "The windows user manager allows eight clients at maximum!"
 msgstr ""
 
-#: personal/samba/class_sambaAccount.inc:478
-#: personal/samba/class_sambaAccount.inc:501
-msgid "Warning"
-msgstr ""
-
-#: personal/samba/class_sambaAccount.inc:478
-msgid "Undefined Samba SID detected. Please fix this problem manually!"
-msgstr ""
-
 #: personal/samba/class_sambaAccount.inc:502
 msgid ""
 "Cannot convert primary group to samba group: group cannot be identified!"
diff --git a/samba/locale/es/fusiondirectory.po b/samba/locale/es/fusiondirectory.po
index b240437d019c031c736e6d8119412f09d8a00903..aa94a478ae464d756d8ddcd355a0e43b4a6f9960 100644
--- a/samba/locale/es/fusiondirectory.po
+++ b/samba/locale/es/fusiondirectory.po
@@ -3,21 +3,97 @@
 # This file is distributed under the same license as the PACKAGE package.
 # 
 # Translators:
-#  Alejandro Escanero Blanco <aescanero@gmail.com>, 2008,2010
 msgid ""
 msgstr ""
-"Project-Id-Version: FusionDirectory-108\n"
+"Project-Id-Version: FusionDirectory-109\n"
 "Report-Msgid-Bugs-To: documentation@lists.fusiondirectory.org\n"
-"POT-Creation-Date: 2015-03-17 18:47+0100\n"
-"PO-Revision-Date: 2015-02-25 16:12+0000\n"
+"POT-Creation-Date: 2014-12-15 17:47+0100\n"
+"PO-Revision-Date: 2015-03-31 11:41+0000\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>\n"
-"Language-Team: Spanish (http://www.transifex.com/projects/p/FusionDirectory-108/language/es/)\n"
+"Language-Team: Spanish (http://www.transifex.com/projects/p/FusionDirectory-109/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/groups/samba/class_sambaGroup.inc:29
+#: personal/samba/class_sambaAccount.inc:135
+#: 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:88
+#: personal/samba/class_sambaAccount.inc:176
+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:119
+msgid "Samba group"
+msgstr "Grupo de samba"
+
+#: admin/groups/samba/class_sambaGroup.inc:60
+#: admin/groups/samba/class_sambaGroup.inc:119
+msgid "Domain admins"
+msgstr "Administradores del dominio"
+
+#: admin/groups/samba/class_sambaGroup.inc:60
+#: admin/groups/samba/class_sambaGroup.inc:119
+msgid "Domain users"
+msgstr "Usuarios del dominio"
+
+#: admin/groups/samba/class_sambaGroup.inc:60
+#: admin/groups/samba/class_sambaGroup.inc:119
+msgid "Domain guests"
+msgstr "Invitados del dominio"
+
+#: admin/groups/samba/class_sambaGroup.inc:105
+msgid "Configuration error"
+msgstr "Error en la configuraciÃ³n"
+
+#: admin/groups/samba/class_sambaGroup.inc:105
+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:119
+#, php-format
+msgid "Special group (%d)"
+msgstr "Grupo especial (%d)"
+
+#: admin/groups/samba/class_sambaGroup.inc:133
+#: personal/samba/class_sambaAccount.inc:478
+#: personal/samba/class_sambaAccount.inc:500
+msgid "Warning"
+msgstr "Aviso"
+
+#: admin/groups/samba/class_sambaGroup.inc:133
+#: personal/samba/class_sambaAccount.inc:478
+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 ""
@@ -201,11 +277,6 @@ msgstr "DescripciÃ³n"
 msgid "A short description of the winstation"
 msgstr ""
 
-#: admin/systems/samba/class_winstationGeneric.inc:88
-#: personal/samba/class_sambaAccount.inc:176
-msgid "Domain"
-msgstr "Dominio"
-
 #: admin/systems/samba/class_winstationGeneric.inc:88
 #: personal/samba/class_sambaAccount.inc:176
 msgid "Samba domain name"
@@ -236,11 +307,6 @@ msgstr ""
 msgid "Samba Munged Dial"
 msgstr ""
 
-#: personal/samba/class_sambaAccount.inc:135
-#: config/samba/class_sambaPluginConfig.inc:28
-msgid "Samba"
-msgstr "Samba"
-
 #: personal/samba/class_sambaAccount.inc:136
 #: config/samba/class_sambaPluginConfig.inc:41
 msgid "Samba settings"
@@ -508,16 +574,7 @@ msgstr "Ruta inicial"
 msgid "The windows user manager allows eight clients at maximum!"
 msgstr ""
 
-#: personal/samba/class_sambaAccount.inc:478
 #: personal/samba/class_sambaAccount.inc:501
-msgid "Warning"
-msgstr "Aviso"
-
-#: personal/samba/class_sambaAccount.inc:478
-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:502
 msgid ""
 "Cannot convert primary group to samba group: group cannot be identified!"
 msgstr "No se puede convertir un grupo primario a grupo samba: Â¡El grupo no puede ser identificado!"
@@ -579,11 +636,3 @@ msgstr ""
 #: config/samba/class_sambaPluginConfig.inc:72
 msgid "Needed to be compliant with Windows <= 98 or Samba < 3.2"
 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"
-
-#: personal/samba/sambaLogonHours.tpl.c:5
-msgid "Hour"
-msgstr "Hora"
diff --git a/samba/locale/es_VE/fusiondirectory.po b/samba/locale/es_VE/fusiondirectory.po
index 5ddf03d255a3d80a0bf7dcecbe14da575d0be7a9..71a6a6317c9dea6f3f7cf99c4baa733c0971d740 100644
--- a/samba/locale/es_VE/fusiondirectory.po
+++ b/samba/locale/es_VE/fusiondirectory.po
@@ -3,23 +3,97 @@
 # This file is distributed under the same license as the PACKAGE package.
 # 
 # Translators:
-#  Alejandro Escanero Blanco <aescanero@gmail.com>, 2008,2010
-# lars_g <lars.gold@gmail.com>, 2012
-# lars_g <lars.gold@gmail.com>, 2012
 msgid ""
 msgstr ""
-"Project-Id-Version: FusionDirectory-108\n"
+"Project-Id-Version: FusionDirectory-109\n"
 "Report-Msgid-Bugs-To: documentation@lists.fusiondirectory.org\n"
-"POT-Creation-Date: 2015-03-17 18:47+0100\n"
-"PO-Revision-Date: 2015-02-25 16:12+0000\n"
+"POT-Creation-Date: 2014-12-15 17:47+0100\n"
+"PO-Revision-Date: 2015-03-31 11:41+0000\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>\n"
-"Language-Team: Spanish (Venezuela) (http://www.transifex.com/projects/p/FusionDirectory-108/language/es_VE/)\n"
+"Language-Team: Spanish (Venezuela) (http://www.transifex.com/projects/p/FusionDirectory-109/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/groups/samba/class_sambaGroup.inc:29
+#: personal/samba/class_sambaAccount.inc:135
+#: 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:88
+#: personal/samba/class_sambaAccount.inc:176
+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:119
+msgid "Samba group"
+msgstr "Grupo de samba"
+
+#: admin/groups/samba/class_sambaGroup.inc:60
+#: admin/groups/samba/class_sambaGroup.inc:119
+msgid "Domain admins"
+msgstr "Administradores del dominio"
+
+#: admin/groups/samba/class_sambaGroup.inc:60
+#: admin/groups/samba/class_sambaGroup.inc:119
+msgid "Domain users"
+msgstr "Usuarios del dominio"
+
+#: admin/groups/samba/class_sambaGroup.inc:60
+#: admin/groups/samba/class_sambaGroup.inc:119
+msgid "Domain guests"
+msgstr "Invitados del dominio"
+
+#: admin/groups/samba/class_sambaGroup.inc:105
+msgid "Configuration error"
+msgstr "Error en la configuraciÃ³n"
+
+#: admin/groups/samba/class_sambaGroup.inc:105
+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:119
+#, php-format
+msgid "Special group (%d)"
+msgstr "Grupo especial (%d)"
+
+#: admin/groups/samba/class_sambaGroup.inc:133
+#: personal/samba/class_sambaAccount.inc:478
+#: personal/samba/class_sambaAccount.inc:500
+msgid "Warning"
+msgstr "Aviso"
+
+#: admin/groups/samba/class_sambaGroup.inc:133
+#: personal/samba/class_sambaAccount.inc:478
+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 ""
@@ -203,11 +277,6 @@ msgstr "DescripciÃ³n"
 msgid "A short description of the winstation"
 msgstr ""
 
-#: admin/systems/samba/class_winstationGeneric.inc:88
-#: personal/samba/class_sambaAccount.inc:176
-msgid "Domain"
-msgstr "Dominio"
-
 #: admin/systems/samba/class_winstationGeneric.inc:88
 #: personal/samba/class_sambaAccount.inc:176
 msgid "Samba domain name"
@@ -238,11 +307,6 @@ msgstr ""
 msgid "Samba Munged Dial"
 msgstr ""
 
-#: personal/samba/class_sambaAccount.inc:135
-#: config/samba/class_sambaPluginConfig.inc:28
-msgid "Samba"
-msgstr "Samba"
-
 #: personal/samba/class_sambaAccount.inc:136
 #: config/samba/class_sambaPluginConfig.inc:41
 msgid "Samba settings"
@@ -510,16 +574,7 @@ 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:478
 #: personal/samba/class_sambaAccount.inc:501
-msgid "Warning"
-msgstr "Aviso"
-
-#: personal/samba/class_sambaAccount.inc:478
-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:502
 msgid ""
 "Cannot convert primary group to samba group: group cannot be identified!"
 msgstr "No se puede convertir un grupo primario a grupo samba: Â¡El grupo no puede ser identificado!"
@@ -581,11 +636,3 @@ msgstr ""
 #: config/samba/class_sambaPluginConfig.inc:72
 msgid "Needed to be compliant with Windows <= 98 or Samba < 3.2"
 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"
-
-#: personal/samba/sambaLogonHours.tpl.c:5
-msgid "Hour"
-msgstr "Hora"
diff --git a/samba/locale/fa_IR/fusiondirectory.po b/samba/locale/fa_IR/fusiondirectory.po
index 0e3ee77e1c891e4f3d16c727fb7c86036e5fe239..fffaa2edae121850db45dc1cfb772061baaa5e48 100644
--- a/samba/locale/fa_IR/fusiondirectory.po
+++ b/samba/locale/fa_IR/fusiondirectory.po
@@ -5,18 +5,95 @@
 # Translators:
 msgid ""
 msgstr ""
-"Project-Id-Version: FusionDirectory-108\n"
+"Project-Id-Version: FusionDirectory-109\n"
 "Report-Msgid-Bugs-To: documentation@lists.fusiondirectory.org\n"
-"POT-Creation-Date: 2015-03-17 18:47+0100\n"
-"PO-Revision-Date: 2015-02-25 15:53+0000\n"
+"POT-Creation-Date: 2014-12-15 17:47+0100\n"
+"PO-Revision-Date: 2014-12-15 17:04+0000\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>\n"
-"Language-Team: Persian (Iran) (http://www.transifex.com/projects/p/FusionDirectory-108/language/fa_IR/)\n"
+"Language-Team: Persian (Iran) (http://www.transifex.com/projects/p/FusionDirectory-109/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/groups/samba/class_sambaGroup.inc:29
+#: personal/samba/class_sambaAccount.inc:135
+#: config/samba/class_sambaPluginConfig.inc:28
+msgid "Samba"
+msgstr ""
+
+#: admin/groups/samba/class_sambaGroup.inc:30
+msgid "Samba group settings"
+msgstr ""
+
+#: admin/groups/samba/class_sambaGroup.inc:42
+#: admin/groups/samba/class_sambaGroup.inc:45
+#: admin/systems/samba/class_winstationGeneric.inc:88
+#: personal/samba/class_sambaAccount.inc:176
+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:119
+msgid "Samba group"
+msgstr ""
+
+#: admin/groups/samba/class_sambaGroup.inc:60
+#: admin/groups/samba/class_sambaGroup.inc:119
+msgid "Domain admins"
+msgstr ""
+
+#: admin/groups/samba/class_sambaGroup.inc:60
+#: admin/groups/samba/class_sambaGroup.inc:119
+msgid "Domain users"
+msgstr ""
+
+#: admin/groups/samba/class_sambaGroup.inc:60
+#: admin/groups/samba/class_sambaGroup.inc:119
+msgid "Domain guests"
+msgstr ""
+
+#: admin/groups/samba/class_sambaGroup.inc:105
+msgid "Configuration error"
+msgstr ""
+
+#: admin/groups/samba/class_sambaGroup.inc:105
+msgid "Cannot find group SID in your configuration!"
+msgstr ""
+
+#: admin/groups/samba/class_sambaGroup.inc:119
+#, php-format
+msgid "Special group (%d)"
+msgstr ""
+
+#: admin/groups/samba/class_sambaGroup.inc:133
+#: personal/samba/class_sambaAccount.inc:478
+#: personal/samba/class_sambaAccount.inc:500
+msgid "Warning"
+msgstr ""
+
+#: admin/groups/samba/class_sambaGroup.inc:133
+#: personal/samba/class_sambaAccount.inc:478
+msgid "Undefined Samba SID detected. Please fix this problem manually!"
+msgstr ""
+
 #: admin/samba/class_sambaDomainManagement.inc:35
 msgid "Samba domains"
 msgstr ""
@@ -200,11 +277,6 @@ msgstr ""
 msgid "A short description of the winstation"
 msgstr ""
 
-#: admin/systems/samba/class_winstationGeneric.inc:88
-#: personal/samba/class_sambaAccount.inc:176
-msgid "Domain"
-msgstr ""
-
 #: admin/systems/samba/class_winstationGeneric.inc:88
 #: personal/samba/class_sambaAccount.inc:176
 msgid "Samba domain name"
@@ -235,11 +307,6 @@ msgstr ""
 msgid "Samba Munged Dial"
 msgstr ""
 
-#: personal/samba/class_sambaAccount.inc:135
-#: config/samba/class_sambaPluginConfig.inc:28
-msgid "Samba"
-msgstr ""
-
 #: personal/samba/class_sambaAccount.inc:136
 #: config/samba/class_sambaPluginConfig.inc:41
 msgid "Samba settings"
@@ -507,16 +574,7 @@ msgstr ""
 msgid "The windows user manager allows eight clients at maximum!"
 msgstr ""
 
-#: personal/samba/class_sambaAccount.inc:478
 #: personal/samba/class_sambaAccount.inc:501
-msgid "Warning"
-msgstr ""
-
-#: personal/samba/class_sambaAccount.inc:478
-msgid "Undefined Samba SID detected. Please fix this problem manually!"
-msgstr ""
-
-#: personal/samba/class_sambaAccount.inc:502
 msgid ""
 "Cannot convert primary group to samba group: group cannot be identified!"
 msgstr ""
@@ -578,11 +636,3 @@ msgstr ""
 #: config/samba/class_sambaPluginConfig.inc:72
 msgid "Needed to be compliant with Windows <= 98 or Samba < 3.2"
 msgstr ""
-
-#: personal/samba/sambaLogonHours.tpl.c:2
-msgid "Specify the hours this user is allowed to log in"
-msgstr ""
-
-#: personal/samba/sambaLogonHours.tpl.c:5
-msgid "Hour"
-msgstr ""
diff --git a/samba/locale/fr/fusiondirectory.po b/samba/locale/fr/fusiondirectory.po
index 31147fcb1649c1cb917c43137ab208fca57ab0cb..1b0bb0608adf33c0739f1b52ed1230c4cdc1edd5 100644
--- a/samba/locale/fr/fusiondirectory.po
+++ b/samba/locale/fr/fusiondirectory.po
@@ -3,28 +3,97 @@
 # This file is distributed under the same license as the PACKAGE package.
 # 
 # Translators:
-# Anne Nicolas <ennael1@gmail.com>, 2014
-# Benoit Mortier <benoit.mortier@opensides.be>, 2005-2011
-# MCMic, 2014
-# fusiondirectory <contact@fusiondirectory.org>, 2013-2014
-# fusiondirectory <contact@fusiondirectory.org>, 2012
-# fusiondirectory <contact@fusiondirectory.org>, 2012
-# fusiondirectory <contact@fusiondirectory.org>, 2012
-# MCMic, 2014
 msgid ""
 msgstr ""
-"Project-Id-Version: FusionDirectory-108\n"
+"Project-Id-Version: FusionDirectory-109\n"
 "Report-Msgid-Bugs-To: documentation@lists.fusiondirectory.org\n"
-"POT-Creation-Date: 2015-03-17 18:47+0100\n"
-"PO-Revision-Date: 2015-02-25 16:12+0000\n"
+"POT-Creation-Date: 2014-12-15 17:47+0100\n"
+"PO-Revision-Date: 2015-03-31 11:31+0000\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>\n"
-"Language-Team: French (http://www.transifex.com/projects/p/FusionDirectory-108/language/fr/)\n"
+"Language-Team: French (http://www.transifex.com/projects/p/FusionDirectory-109/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/groups/samba/class_sambaGroup.inc:29
+#: personal/samba/class_sambaAccount.inc:135
+#: 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:88
+#: personal/samba/class_sambaAccount.inc:176
+msgid "Domain"
+msgstr "Domaine"
+
+#: 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 "Groupe Samba"
+
+#: admin/groups/samba/class_sambaGroup.inc:60
+#: admin/groups/samba/class_sambaGroup.inc:119
+msgid "Samba group"
+msgstr "Groupe Samba"
+
+#: admin/groups/samba/class_sambaGroup.inc:60
+#: admin/groups/samba/class_sambaGroup.inc:119
+msgid "Domain admins"
+msgstr "Administrateurs du domaine"
+
+#: admin/groups/samba/class_sambaGroup.inc:60
+#: admin/groups/samba/class_sambaGroup.inc:119
+msgid "Domain users"
+msgstr "Utilisateurs du domaine"
+
+#: admin/groups/samba/class_sambaGroup.inc:60
+#: admin/groups/samba/class_sambaGroup.inc:119
+msgid "Domain guests"
+msgstr "InvitÃ©s du domaine"
+
+#: admin/groups/samba/class_sambaGroup.inc:105
+msgid "Configuration error"
+msgstr "Erreur de configuration"
+
+#: admin/groups/samba/class_sambaGroup.inc:105
+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:119
+#, php-format
+msgid "Special group (%d)"
+msgstr "Groupe spÃ©cial (%d)"
+
+#: admin/groups/samba/class_sambaGroup.inc:133
+#: personal/samba/class_sambaAccount.inc:478
+#: personal/samba/class_sambaAccount.inc:500
+msgid "Warning"
+msgstr "Avertissement"
+
+#: admin/groups/samba/class_sambaGroup.inc:133
+#: personal/samba/class_sambaAccount.inc:478
+msgid "Undefined Samba SID detected. Please fix this problem manually!"
+msgstr "DÃ©tection d'un SID Samba non dÃ©fini. Veuillez fixer ceci manuellement !"
+
 #: admin/samba/class_sambaDomainManagement.inc:35
 msgid "Samba domains"
 msgstr "Domaines Samba"
@@ -73,17 +142,17 @@ msgstr "Algorithmic rid base"
 
 #: admin/samba/class_sambaDomain.inc:66
 msgid "Minimum password age"
-msgstr "Age minimum du mot de passe"
+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 avant changement, en secondes (dÃ©faut : 0 => permet le changement immÃ©diat du mot de passe)"
+msgstr "DurÃ©e minimum de validitÃ© du mot de passe, en secondes (dÃ©faut : 0 => permet le changement immÃ©diat du mot de passe)"
 
 #: admin/samba/class_sambaDomain.inc:72
 msgid "Maximum password age"
-msgstr "DurÃ©e de vie du mot de passe"
+msgstr "DurÃ©e de vie maximale du mot de passe"
 
 #: admin/samba/class_sambaDomain.inc:73
 msgid ""
@@ -96,7 +165,7 @@ msgstr "Prochain RID"
 
 #: admin/samba/class_sambaDomain.inc:79
 msgid "Next NT rid to give out for anything"
-msgstr "Prochain RID NT Ã  donner"
+msgstr "Prochain RID NT a donner"
 
 #: admin/samba/class_sambaDomain.inc:83
 msgid "Next group RID"
@@ -104,7 +173,7 @@ msgstr "Prochain RID de groupe"
 
 #: admin/samba/class_sambaDomain.inc:84
 msgid "Next NT rid to give out for groups"
-msgstr "Prochain RID NT Ã  donner pour les groupes"
+msgstr "Prochain rid NT a donner comme groupe"
 
 #: admin/samba/class_sambaDomain.inc:88
 msgid "Next user RID"
@@ -112,7 +181,7 @@ msgstr "Prochain RID utilisateur"
 
 #: admin/samba/class_sambaDomain.inc:89
 msgid "Next NT rid to give our for users"
-msgstr "Prochain RID NT Ã  donner pour les utilisateurs"
+msgstr "Prochain RID NT a donner pour un utilisateur"
 
 #: admin/samba/class_sambaDomain.inc:93
 msgid "Minimum password length"
@@ -120,7 +189,7 @@ msgstr "Taille minimale du mot de passe"
 
 #: admin/samba/class_sambaDomain.inc:94
 msgid "Minimal password length (default: 5)"
-msgstr "Taille de mot de passe minimale (dÃ©faut : 5)"
+msgstr "Taille de mot de passe par dÃ©faut (dÃ©faut : 5)"
 
 #: admin/samba/class_sambaDomain.inc:98
 msgid "Password history length"
@@ -128,15 +197,15 @@ 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 (par dÃ©fautâ€¯: 0 => dÃ©sactivÃ©)"
+msgstr "Taille de l'historique des mots de passe (par dÃ©faut :0 => dÃ©sactive)"
 
 #: admin/samba/class_sambaDomain.inc:103
 msgid "Logon to change password"
-msgstr "Se connecter pour changer de mot de passe"
+msgstr "Connectez-vous pour changer de mot de passe"
 
 #: admin/samba/class_sambaDomain.inc:104
 msgid "Force Users to logon for password change (default: 0 => off, 2 => on)"
-msgstr "Force les utilisateurs Ã  se connecter pour changer leur mot de passe (par dÃ©fautâ€¯: 0 => dÃ©sactivÃ©, 2 => activÃ©) "
+msgstr "Forcer les utilisateurs a se connecter pour changer leur mot de passe (par dÃ©faut: 0 => dÃ©sactive, 2 => activÃ©) "
 
 #: admin/samba/class_sambaDomain.inc:108
 msgid "Lockout duration"
@@ -144,7 +213,7 @@ msgstr "La durÃ©e de blocage"
 
 #: admin/samba/class_sambaDomain.inc:109
 msgid "Lockout duration in minutes (default: 30, -1 => forever)"
-msgstr "DurÃ©e du blocage du compte en minutes (par dÃ©fautâ€¯: 30, -1 => perpÃ©tuellement)"
+msgstr "DurÃ©e du blocage du compte (par dÃ©faut : 30, -1 => perpÃ©tuellement )"
 
 #: admin/samba/class_sambaDomain.inc:113
 msgid "Lockout observation window"
@@ -152,15 +221,15 @@ msgstr "FenÃªtre de verrouillage"
 
 #: admin/samba/class_sambaDomain.inc:114
 msgid "Reset time after lockout in minutes (default: 30)"
-msgstr "Temps avant remise Ã  zÃ©ro aprÃ¨s verrouillage, en minutes (dÃ©faut : 30)"
+msgstr "Temps de redÃ©marrage aprÃ¨s verrouillage, en minutes (dÃ©faut : 30)"
 
 #: admin/samba/class_sambaDomain.inc:118
 msgid "Lockout threshold"
-msgstr "Seuil de blocage"
+msgstr "La durÃ©e de blocage"
 
 #: admin/samba/class_sambaDomain.inc:119
 msgid "Lockout users after bad logon attempts (default: 0 => off)"
-msgstr "Verrouille le compte utilisateur aprÃ¨s tant dâ€™Ã©checs de tentative de connexion (dÃ©faut : 0 => dÃ©sactivÃ©)"
+msgstr "Verrouille le compte utilisateur aprÃ¨s Ã©chec de tentative de connexion (dÃ©faut : 0 => dÃ©sactivÃ©)"
 
 #: admin/samba/class_sambaDomain.inc:123
 msgid "Force logoff"
@@ -172,7 +241,7 @@ msgstr "DÃ©connecte les utilisateurs en dehors des heures de connexion (dÃ©faut
 
 #: admin/samba/class_sambaDomain.inc:128
 msgid "Refuse machine password change"
-msgstr "Refuser le changement de mot de passe machine"
+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)"
@@ -194,7 +263,7 @@ msgstr "Station de travail Windows"
 #: admin/systems/samba/class_winstationGeneric.inc:73
 #: admin/systems/samba/class_winstationGeneric.inc:77
 msgid "The name of the winstation"
-msgstr "Nom du PC Windows"
+msgstr "Nom de la machine Windows"
 
 #: admin/systems/samba/class_winstationGeneric.inc:77
 msgid "Name"
@@ -208,15 +277,10 @@ msgstr "Description"
 msgid "A short description of the winstation"
 msgstr "Une courte description de cette machine Windows"
 
-#: admin/systems/samba/class_winstationGeneric.inc:88
-#: personal/samba/class_sambaAccount.inc:176
-msgid "Domain"
-msgstr "Domaine"
-
 #: admin/systems/samba/class_winstationGeneric.inc:88
 #: personal/samba/class_sambaAccount.inc:176
 msgid "Samba domain name"
-msgstr "Nom du domaine Samba"
+msgstr "Domaine Samba"
 
 #: admin/systems/samba/class_winstationGeneric.inc:92
 msgid "Location"
@@ -224,7 +288,7 @@ msgstr "Lieu"
 
 #: admin/systems/samba/class_winstationGeneric.inc:92
 msgid "The location of the winstation"
-msgstr "Le lieu de la machine Windows"
+msgstr "Le dÃ©partement de la machine Windows"
 
 #: admin/systems/samba/class_winstationGeneric.inc:99
 #: admin/systems/samba/class_winstationGeneric.inc:103
@@ -233,7 +297,7 @@ msgstr "Action"
 
 #: admin/systems/samba/class_winstationGeneric.inc:104
 msgid "Select action to execute for this terminal"
-msgstr "SÃ©lectionnez l'action Ã  exÃ©cuter sur le terminal"
+msgstr "SÃ©lectionnez l'opÃ©ration Ã  exÃ©cuter sur le terminal"
 
 #: admin/systems/samba/class_winstationGeneric.inc:110
 msgid "Network settings"
@@ -243,11 +307,6 @@ msgstr "ParamÃ¨tres rÃ©seaux"
 msgid "Samba Munged Dial"
 msgstr "Samba Munged Dial"
 
-#: personal/samba/class_sambaAccount.inc:135
-#: config/samba/class_sambaPluginConfig.inc:28
-msgid "Samba"
-msgstr "Samba"
-
 #: personal/samba/class_sambaAccount.inc:136
 #: config/samba/class_sambaPluginConfig.inc:41
 msgid "Samba settings"
@@ -260,40 +319,40 @@ msgstr "Profil Samba"
 #: personal/samba/class_sambaAccount.inc:166
 #: personal/samba/class_sambaAccount.inc:199
 msgid "Home directory drive"
-msgstr "Disque du rÃ©pertoire personnel"
+msgstr "RÃ©pertoire Home"
 
 #: personal/samba/class_sambaAccount.inc:166
 #: personal/samba/class_sambaAccount.inc:199
 msgid "Letter for the home drive"
-msgstr "Lettre du disque contenant le rÃ©pertoire personnel"
+msgstr "Lecteur rÃ©seau par dÃ©faut"
 
 #: personal/samba/class_sambaAccount.inc:171
 #: personal/samba/class_sambaAccount.inc:204
 msgid "Home directory path"
-msgstr "Chemin du rÃ©pertoire personnel"
+msgstr "Chemin du rÃ©pertoire home"
 
 #: personal/samba/class_sambaAccount.inc:171
 #: personal/samba/class_sambaAccount.inc:204
 msgid "UNC path for the home drive"
-msgstr "Chemin UNC du rÃ©pertoire personnel de cet utilisateur"
+msgstr "Chemin UNC du  \"home\" de cet utilisateur"
 
 #: personal/samba/class_sambaAccount.inc:180
 msgid "Script path"
-msgstr "Chemin du script"
+msgstr "Chemin du Script"
 
 #: personal/samba/class_sambaAccount.inc:180
 msgid "Login script path"
-msgstr "Chemin du script de login"
+msgstr "Chemin du script par dÃ©faut"
 
 #: personal/samba/class_sambaAccount.inc:184
 #: personal/samba/class_sambaAccount.inc:209
 msgid "Profile path"
-msgstr "Chemin du profile"
+msgstr "Chemin du Profile"
 
 #: personal/samba/class_sambaAccount.inc:184
 #: personal/samba/class_sambaAccount.inc:209
 msgid "UNC profile path"
-msgstr "Chemin UNC du profile"
+msgstr "Chemin UNC du Profile"
 
 #: personal/samba/class_sambaAccount.inc:191
 msgid "Terminal server"
@@ -301,15 +360,15 @@ msgstr "Serveur de terminaux"
 
 #: personal/samba/class_sambaAccount.inc:195
 msgid "Allow login on terminal server"
-msgstr "Permet la connexion sur le serveur de terminaux"
+msgstr "Permet la connexion sur un serveur de terminaux"
 
 #: personal/samba/class_sambaAccount.inc:214
 msgid "Inherit client config"
-msgstr "HÃ©riter de la configuration du client"
+msgstr "HÃ©rite de la configuration du client"
 
 #: personal/samba/class_sambaAccount.inc:214
 msgid "Inherit client configuration"
-msgstr "HÃ©riter de la configuration du client"
+msgstr "HÃ©rite de la configuration du client"
 
 #: personal/samba/class_sambaAccount.inc:218
 msgid "Initial progam"
@@ -329,15 +388,15 @@ msgstr "RÃ©pertoire de travail"
 
 #: personal/samba/class_sambaAccount.inc:226
 msgid "Connection timeout"
-msgstr "DÃ©lai dâ€™attente de connexion"
+msgstr "DÃ©lai de connexion"
 
 #: personal/samba/class_sambaAccount.inc:226
 msgid "Timeout when connecting to terminal server"
-msgstr "DÃ©lai dâ€™attente lors de la connexion au serveur de terminal"
+msgstr "Timeout lors de la connexion au serveur de terminal"
 
 #: personal/samba/class_sambaAccount.inc:231
 msgid "Disconnection timeout"
-msgstr "DÃ©lai avant dÃ©connexion"
+msgstr "DÃ©lai avant la deconnexion"
 
 #: personal/samba/class_sambaAccount.inc:231
 msgid "Timeout before disconnecting from terminal server"
@@ -345,7 +404,7 @@ msgstr "DÃ©lai avant dÃ©connexion du serveur de terminal"
 
 #: personal/samba/class_sambaAccount.inc:236
 msgid "Idle timeout"
-msgstr "DÃ©lai d'inactivitÃ©"
+msgstr "DÃ©lai d'inactivitÃ© sans traffic"
 
 #: personal/samba/class_sambaAccount.inc:236
 msgid "Idle timeout before disconnecting from terminal server"
@@ -361,7 +420,7 @@ msgstr "Lecteur Ã  connecter aprÃ¨s la connexion"
 
 #: personal/samba/class_sambaAccount.inc:245
 msgid "Connect client printers at logon"
-msgstr "Connecter les imprimantes clientes Ã  l'identification"
+msgstr "Connecter les imprimantes clients Ã  l'identification"
 
 #: personal/samba/class_sambaAccount.inc:245
 msgid "Printers to connect after login"
@@ -373,7 +432,7 @@ msgstr "Imprimante par dÃ©faut"
 
 #: personal/samba/class_sambaAccount.inc:249
 msgid "Default printer for this client"
-msgstr "Met lâ€™imprimante par dÃ©faut sur ce client"
+msgstr "Imprimante par dÃ©faut"
 
 #: personal/samba/class_sambaAccount.inc:253
 msgid "Shadowing"
@@ -401,15 +460,15 @@ msgstr "entrÃ©e dÃ©sactivÃ©e, notification dÃ©sactivÃ©e"
 
 #: personal/samba/class_sambaAccount.inc:260
 msgid "On broken or timed out"
-msgstr "Lors dâ€™un problÃ¨me ou temps d'attente dÃ©passÃ©"
+msgstr "Sur interrompu ou temps d'attente dÃ©passÃ©"
 
 #: personal/samba/class_sambaAccount.inc:260
 msgid "What happen if disconnected or timeout"
-msgstr "Qu'arrive t-il en cas de dÃ©connexion ou dâ€™absence de rÃ©ponse"
+msgstr "Qu'arrive t-il en cas de dÃ©connexion ou de temporisation"
 
 #: personal/samba/class_sambaAccount.inc:263
 msgid "disconnect"
-msgstr "dÃ©connecter"
+msgstr "dÃ©connectÃ©"
 
 #: personal/samba/class_sambaAccount.inc:263
 msgid "reset"
@@ -465,7 +524,7 @@ msgstr "Verrouiller le compte Samba"
 
 #: personal/samba/class_sambaAccount.inc:305
 msgid "Cannot change password"
-msgstr "Mot de passe inchangeable"
+msgstr "Interdire le changement de mot de passe"
 
 #: personal/samba/class_sambaAccount.inc:305
 msgid "Not allowed to change password"
@@ -473,11 +532,11 @@ msgstr "Interdire le changement de mot de passe"
 
 #: personal/samba/class_sambaAccount.inc:309
 msgid "Account expiration"
-msgstr "Expiration du compte"
+msgstr "Utiliser l'expiration du compte"
 
 #: personal/samba/class_sambaAccount.inc:309
 msgid "When does the account expire"
-msgstr "Quand le compte expire-t-il"
+msgstr "Le compte expire aprÃ¨s"
 
 #: personal/samba/class_sambaAccount.inc:317
 msgid "Samba logon times"
@@ -485,11 +544,11 @@ msgstr "Heures d'accÃ¨s Ã  Samba"
 
 #: personal/samba/class_sambaAccount.inc:317
 msgid "What is the allowed time to connect"
-msgstr "Quel sont les horaires oÃ¹ la connexion est autorisÃ©e"
+msgstr "Machines qui peuvent se connecter"
 
 #: personal/samba/class_sambaAccount.inc:318
 msgid "Edit settings"
-msgstr "Ã‰diter les paramÃ¨tres"
+msgstr "Editer les paramÃ¨tres"
 
 #: personal/samba/class_sambaAccount.inc:332
 msgid "System trust"
@@ -501,11 +560,11 @@ msgstr "Permet la connections depuis ces stations seulement"
 
 #: personal/samba/class_sambaAccount.inc:338
 msgid "Only allow this user to connect to this list of hosts"
-msgstr "Autoriser seulement cet utilisateur Ã  se connecter sur ces hÃ´tes"
+msgstr "Autoriser seulement cet utilisateur Ã  se connecter sur cet hÃ´te"
 
 #: personal/samba/class_sambaAccount.inc:454
 msgid "Home drive"
-msgstr "Disque du rÃ©pertoire personnel"
+msgstr "RÃ©pertoire Home"
 
 #: personal/samba/class_sambaAccount.inc:457
 msgid "Home path"
@@ -513,33 +572,24 @@ msgstr "Chemin du rÃ©pertoire personnel"
 
 #: personal/samba/class_sambaAccount.inc:462
 msgid "The windows user manager allows eight clients at maximum!"
-msgstr "Le gestionnaire d'utilisateurs Windows accepte huit clients maximumâ€¯!"
+msgstr "Le gestionnaire d'utilisateurs windows accepte huit clients maximum !"
 
-#: personal/samba/class_sambaAccount.inc:478
 #: personal/samba/class_sambaAccount.inc:501
-msgid "Warning"
-msgstr "Avertissement"
-
-#: personal/samba/class_sambaAccount.inc:478
-msgid "Undefined Samba SID detected. Please fix this problem manually!"
-msgstr "DÃ©tection d'un SID Samba non dÃ©fini. Veuillez corriger ceci manuellementâ€¯!"
-
-#: personal/samba/class_sambaAccount.inc:502
 msgid ""
 "Cannot convert primary group to samba group: group cannot be identified!"
-msgstr "Impossible de convertir le groupe principal en un groupe sambaâ€¯: le groupe ne peut Ãªtre identifiÃ©â€¯!"
+msgstr "Impossible de convertir le groupe primaire en un groupe primaire samba : le groupe ne peut Ãªtre identifiÃ© !"
 
 #: config/samba/class_sambaPluginConfig.inc:29
 msgid "Samba plugin configuration"
-msgstr "Configuration du plugin Samba"
+msgstr "Configuration de l'extension Samba"
 
 #: config/samba/class_sambaPluginConfig.inc:44
 msgid "Samba machine account RDN"
-msgstr "Branche des machines Samba"
+msgstr "RDN ou sont stockÃ©s les machines Samba"
 
 #: config/samba/class_sambaPluginConfig.inc:44
 msgid "The location where FusionDirectory looks for new samba workstations."
-msgstr "L'endroit oÃ¹ FusionDirectory cherche de nouveaux postes de travail samba."
+msgstr "L'endroit oÃ¹ FusionDirectory regarde pour  de nouveaux postes de travail samba."
 
 #: config/samba/class_sambaPluginConfig.inc:49
 msgid "Samba ID mapping"
@@ -549,7 +599,7 @@ msgstr "Mapping des ID Samba"
 msgid ""
 "Maintain sambaIdmapEntry objects. Depending on your setup this can "
 "drastically improve the windows login performance."
-msgstr "Maintenir des objets sambaIdmapEntry. Selon votre configuration ceci peut amÃ©liorer considÃ©rablement les performances lors des connexion Ã  Windows."
+msgstr "Maintenir des  objets sambaIdmapEntry. Selon votre configuration ceci peut amÃ©liorer considÃ©rablement les performances lors des connexion Ã  Windows."
 
 #: config/samba/class_sambaPluginConfig.inc:54
 msgid "Samba SID"
@@ -559,38 +609,30 @@ msgstr "SID Samba"
 msgid ""
 "A samba SID if not available inside of the LDAP though samba schema. You can"
 " retrieve the current sid by net getlocalsid."
-msgstr "Un SID samba s'il n'est pas disponible sur le serveur LDAP par le biais du schÃ©ma samba. Vous pouvez rÃ©cupÃ©rer le sid par net getlocalsid."
+msgstr "Un SID samba  s'il n'est pas disponible sur le serveur LDAP par le biais du schÃ©ma samba. Vous pouvez rÃ©cupÃ©rer le sid par net getlocalsid."
 
 #: config/samba/class_sambaPluginConfig.inc:60
 msgid "Samba rid base"
-msgstr "Base RID Samba"
+msgstr "Samba rid base"
 
 #: 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 "L'identifiant de base Ã  ajouter aux calculs de SID - s'il n'est pas disponible sur le serveur LDAP par le biais du schÃ©ma samba."
+msgstr "L'identifiant de base Ã  ajouter Ã  des calculs de sid - s'il n'est pas disponible sur le serveur LDAP par le biais du schÃ©ma samba."
 
 #: config/samba/class_sambaPluginConfig.inc:66
 msgid "Expiration date synchronisaton"
-msgstr "Synchronisation de la date d'expiration"
+msgstr "Date d'expiration pour la synchronisation"
 
 #: config/samba/class_sambaPluginConfig.inc:66
 msgid "Synchronisaton the expiration date with the POSIX one?"
-msgstr "Synchronisation de la date d'expiration avec la date d'expiration POSIXâ€¯?"
+msgstr "Synchronisation la date d'expiration avec la date d'expiration POSIX?"
 
 #: config/samba/class_sambaPluginConfig.inc:72
 msgid "Generate sambaLMPassword"
-msgstr "GÃ©nÃ©rer sambaLMPassword"
+msgstr "GÃ©nÃ©rer l\"encodage sambaLMPassword"
 
 #: config/samba/class_sambaPluginConfig.inc:72
 msgid "Needed to be compliant with Windows <= 98 or Samba < 3.2"
-msgstr "NÃ©cessaire pour Ãªtre conforme avec Windowsâ€¯<=â€¯98 ou Sambaâ€¯<â€¯3.2"
-
-#: 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"
-
-#: personal/samba/sambaLogonHours.tpl.c:5
-msgid "Hour"
-msgstr "Heure"
+msgstr "NÃ©cessaire pour Ãªtre conforme avec Windows <= 98 ou Samba <3.2"
diff --git a/samba/locale/id/fusiondirectory.po b/samba/locale/id/fusiondirectory.po
index 70afa9bb388ab3f26d5ccf4207db9c33461d4c26..bdc24c6a5625edeb1e3c5e7de7a79114fcacde0d 100644
--- a/samba/locale/id/fusiondirectory.po
+++ b/samba/locale/id/fusiondirectory.po
@@ -5,18 +5,95 @@
 # Translators:
 msgid ""
 msgstr ""
-"Project-Id-Version: FusionDirectory-108\n"
+"Project-Id-Version: FusionDirectory-109\n"
 "Report-Msgid-Bugs-To: documentation@lists.fusiondirectory.org\n"
-"POT-Creation-Date: 2015-03-17 18:47+0100\n"
-"PO-Revision-Date: 2015-02-25 15:53+0000\n"
+"POT-Creation-Date: 2014-12-15 17:47+0100\n"
+"PO-Revision-Date: 2014-12-15 17:04+0000\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>\n"
-"Language-Team: Indonesian (http://www.transifex.com/projects/p/FusionDirectory-108/language/id/)\n"
+"Language-Team: Indonesian (http://www.transifex.com/projects/p/FusionDirectory-109/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/groups/samba/class_sambaGroup.inc:29
+#: personal/samba/class_sambaAccount.inc:135
+#: config/samba/class_sambaPluginConfig.inc:28
+msgid "Samba"
+msgstr ""
+
+#: admin/groups/samba/class_sambaGroup.inc:30
+msgid "Samba group settings"
+msgstr ""
+
+#: admin/groups/samba/class_sambaGroup.inc:42
+#: admin/groups/samba/class_sambaGroup.inc:45
+#: admin/systems/samba/class_winstationGeneric.inc:88
+#: personal/samba/class_sambaAccount.inc:176
+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:119
+msgid "Samba group"
+msgstr ""
+
+#: admin/groups/samba/class_sambaGroup.inc:60
+#: admin/groups/samba/class_sambaGroup.inc:119
+msgid "Domain admins"
+msgstr ""
+
+#: admin/groups/samba/class_sambaGroup.inc:60
+#: admin/groups/samba/class_sambaGroup.inc:119
+msgid "Domain users"
+msgstr ""
+
+#: admin/groups/samba/class_sambaGroup.inc:60
+#: admin/groups/samba/class_sambaGroup.inc:119
+msgid "Domain guests"
+msgstr ""
+
+#: admin/groups/samba/class_sambaGroup.inc:105
+msgid "Configuration error"
+msgstr ""
+
+#: admin/groups/samba/class_sambaGroup.inc:105
+msgid "Cannot find group SID in your configuration!"
+msgstr ""
+
+#: admin/groups/samba/class_sambaGroup.inc:119
+#, php-format
+msgid "Special group (%d)"
+msgstr ""
+
+#: admin/groups/samba/class_sambaGroup.inc:133
+#: personal/samba/class_sambaAccount.inc:478
+#: personal/samba/class_sambaAccount.inc:500
+msgid "Warning"
+msgstr ""
+
+#: admin/groups/samba/class_sambaGroup.inc:133
+#: personal/samba/class_sambaAccount.inc:478
+msgid "Undefined Samba SID detected. Please fix this problem manually!"
+msgstr ""
+
 #: admin/samba/class_sambaDomainManagement.inc:35
 msgid "Samba domains"
 msgstr ""
@@ -200,11 +277,6 @@ msgstr ""
 msgid "A short description of the winstation"
 msgstr ""
 
-#: admin/systems/samba/class_winstationGeneric.inc:88
-#: personal/samba/class_sambaAccount.inc:176
-msgid "Domain"
-msgstr ""
-
 #: admin/systems/samba/class_winstationGeneric.inc:88
 #: personal/samba/class_sambaAccount.inc:176
 msgid "Samba domain name"
@@ -235,11 +307,6 @@ msgstr ""
 msgid "Samba Munged Dial"
 msgstr ""
 
-#: personal/samba/class_sambaAccount.inc:135
-#: config/samba/class_sambaPluginConfig.inc:28
-msgid "Samba"
-msgstr ""
-
 #: personal/samba/class_sambaAccount.inc:136
 #: config/samba/class_sambaPluginConfig.inc:41
 msgid "Samba settings"
@@ -507,16 +574,7 @@ msgstr ""
 msgid "The windows user manager allows eight clients at maximum!"
 msgstr ""
 
-#: personal/samba/class_sambaAccount.inc:478
 #: personal/samba/class_sambaAccount.inc:501
-msgid "Warning"
-msgstr ""
-
-#: personal/samba/class_sambaAccount.inc:478
-msgid "Undefined Samba SID detected. Please fix this problem manually!"
-msgstr ""
-
-#: personal/samba/class_sambaAccount.inc:502
 msgid ""
 "Cannot convert primary group to samba group: group cannot be identified!"
 msgstr ""
@@ -578,11 +636,3 @@ msgstr ""
 #: config/samba/class_sambaPluginConfig.inc:72
 msgid "Needed to be compliant with Windows <= 98 or Samba < 3.2"
 msgstr ""
-
-#: personal/samba/sambaLogonHours.tpl.c:2
-msgid "Specify the hours this user is allowed to log in"
-msgstr ""
-
-#: personal/samba/sambaLogonHours.tpl.c:5
-msgid "Hour"
-msgstr ""
diff --git a/samba/locale/it/fusiondirectory.po b/samba/locale/it/fusiondirectory.po
index f4623771c392be866c6a85f01c245b320800f362..3666522a15117609ff1c19d6ac140277fae654e2 100644
--- a/samba/locale/it/fusiondirectory.po
+++ b/samba/locale/it/fusiondirectory.po
@@ -3,25 +3,97 @@
 # This file is distributed under the same license as the PACKAGE package.
 # 
 # Translators:
-# Alessandro Amici <a.amici@bopen.it>, 2005
-# poterealpopolo <giuliano@opensides.be>, 2011
-# poterealpopolo <giuliano@opensides.be>, 2013
-# poterealpopolo <giuliano@opensides.be>, 2012
-# poterealpopolo <giuliano@opensides.be>, 2011-2013
 msgid ""
 msgstr ""
-"Project-Id-Version: FusionDirectory-108\n"
+"Project-Id-Version: FusionDirectory-109\n"
 "Report-Msgid-Bugs-To: documentation@lists.fusiondirectory.org\n"
-"POT-Creation-Date: 2015-03-17 18:47+0100\n"
-"PO-Revision-Date: 2015-02-25 16:12+0000\n"
+"POT-Creation-Date: 2014-12-15 17:47+0100\n"
+"PO-Revision-Date: 2015-03-31 11:41+0000\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>\n"
-"Language-Team: Italian (http://www.transifex.com/projects/p/FusionDirectory-108/language/it/)\n"
+"Language-Team: Italian (http://www.transifex.com/projects/p/FusionDirectory-109/language/it/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Language: it\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
+#: admin/groups/samba/class_sambaGroup.inc:29
+#: personal/samba/class_sambaAccount.inc:135
+#: 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:88
+#: personal/samba/class_sambaAccount.inc:176
+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 di gruppo Samba"
+
+#: admin/groups/samba/class_sambaGroup.inc:60
+#: admin/groups/samba/class_sambaGroup.inc:119
+msgid "Samba group"
+msgstr "Gruppo Samba"
+
+#: admin/groups/samba/class_sambaGroup.inc:60
+#: admin/groups/samba/class_sambaGroup.inc:119
+msgid "Domain admins"
+msgstr "Amministratori di Dominio"
+
+#: admin/groups/samba/class_sambaGroup.inc:60
+#: admin/groups/samba/class_sambaGroup.inc:119
+msgid "Domain users"
+msgstr "Utenti di Dominio"
+
+#: admin/groups/samba/class_sambaGroup.inc:60
+#: admin/groups/samba/class_sambaGroup.inc:119
+msgid "Domain guests"
+msgstr "Ospiti di Dominio"
+
+#: admin/groups/samba/class_sambaGroup.inc:105
+msgid "Configuration error"
+msgstr "Errore di configurazione"
+
+#: admin/groups/samba/class_sambaGroup.inc:105
+msgid "Cannot find group SID in your configuration!"
+msgstr "Impossibile trovare il SID del gruppo nella tua configurazione !"
+
+#: admin/groups/samba/class_sambaGroup.inc:119
+#, php-format
+msgid "Special group (%d)"
+msgstr "Gruppo speciale (%d)"
+
+#: admin/groups/samba/class_sambaGroup.inc:133
+#: personal/samba/class_sambaAccount.inc:478
+#: personal/samba/class_sambaAccount.inc:500
+msgid "Warning"
+msgstr "Avvertimento"
+
+#: admin/groups/samba/class_sambaGroup.inc:133
+#: personal/samba/class_sambaAccount.inc:478
+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 ""
@@ -195,7 +267,7 @@ msgstr "Il nome del computer Windows"
 
 #: admin/systems/samba/class_winstationGeneric.inc:77
 msgid "Name"
-msgstr "Cognome"
+msgstr "Nome"
 
 #: admin/systems/samba/class_winstationGeneric.inc:84
 msgid "Description"
@@ -205,11 +277,6 @@ msgstr "Descrizione"
 msgid "A short description of the winstation"
 msgstr "Una breve descrizione del computer Windows"
 
-#: admin/systems/samba/class_winstationGeneric.inc:88
-#: personal/samba/class_sambaAccount.inc:176
-msgid "Domain"
-msgstr "Dominio"
-
 #: admin/systems/samba/class_winstationGeneric.inc:88
 #: personal/samba/class_sambaAccount.inc:176
 msgid "Samba domain name"
@@ -240,11 +307,6 @@ msgstr "Impostazioni di rete"
 msgid "Samba Munged Dial"
 msgstr "Samba Munged Dial"
 
-#: personal/samba/class_sambaAccount.inc:135
-#: config/samba/class_sambaPluginConfig.inc:28
-msgid "Samba"
-msgstr "Samba"
-
 #: personal/samba/class_sambaAccount.inc:136
 #: config/samba/class_sambaPluginConfig.inc:41
 msgid "Samba settings"
@@ -512,16 +574,7 @@ 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:478
 #: personal/samba/class_sambaAccount.inc:501
-msgid "Warning"
-msgstr "Avvertimento"
-
-#: personal/samba/class_sambaAccount.inc:478
-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:502
 msgid ""
 "Cannot convert primary group to samba group: group cannot be identified!"
 msgstr "Impossibile convertire il gruppo primario in un gruppo primario di samba : il gruppo non puÃ³ essere identificato !"
@@ -583,11 +636,3 @@ msgstr ""
 #: config/samba/class_sambaPluginConfig.inc:72
 msgid "Needed to be compliant with Windows <= 98 or Samba < 3.2"
 msgstr ""
-
-#: 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"
-
-#: personal/samba/sambaLogonHours.tpl.c:5
-msgid "Hour"
-msgstr "Ora"
diff --git a/samba/locale/lv/fusiondirectory.po b/samba/locale/lv/fusiondirectory.po
index 6639f7c1a5d341d56d46c8d55fa2f61ddb2a850d..43747e4de3ad9c5694311c49b50925faa550acc1 100644
--- a/samba/locale/lv/fusiondirectory.po
+++ b/samba/locale/lv/fusiondirectory.po
@@ -5,18 +5,95 @@
 # Translators:
 msgid ""
 msgstr ""
-"Project-Id-Version: FusionDirectory-108\n"
+"Project-Id-Version: FusionDirectory-109\n"
 "Report-Msgid-Bugs-To: documentation@lists.fusiondirectory.org\n"
-"POT-Creation-Date: 2015-03-17 18:47+0100\n"
-"PO-Revision-Date: 2015-02-25 15:53+0000\n"
+"POT-Creation-Date: 2014-12-15 17:47+0100\n"
+"PO-Revision-Date: 2014-12-15 17:04+0000\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>\n"
-"Language-Team: Latvian (http://www.transifex.com/projects/p/FusionDirectory-108/language/lv/)\n"
+"Language-Team: Latvian (http://www.transifex.com/projects/p/FusionDirectory-109/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/groups/samba/class_sambaGroup.inc:29
+#: personal/samba/class_sambaAccount.inc:135
+#: config/samba/class_sambaPluginConfig.inc:28
+msgid "Samba"
+msgstr ""
+
+#: admin/groups/samba/class_sambaGroup.inc:30
+msgid "Samba group settings"
+msgstr ""
+
+#: admin/groups/samba/class_sambaGroup.inc:42
+#: admin/groups/samba/class_sambaGroup.inc:45
+#: admin/systems/samba/class_winstationGeneric.inc:88
+#: personal/samba/class_sambaAccount.inc:176
+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:119
+msgid "Samba group"
+msgstr ""
+
+#: admin/groups/samba/class_sambaGroup.inc:60
+#: admin/groups/samba/class_sambaGroup.inc:119
+msgid "Domain admins"
+msgstr ""
+
+#: admin/groups/samba/class_sambaGroup.inc:60
+#: admin/groups/samba/class_sambaGroup.inc:119
+msgid "Domain users"
+msgstr ""
+
+#: admin/groups/samba/class_sambaGroup.inc:60
+#: admin/groups/samba/class_sambaGroup.inc:119
+msgid "Domain guests"
+msgstr ""
+
+#: admin/groups/samba/class_sambaGroup.inc:105
+msgid "Configuration error"
+msgstr ""
+
+#: admin/groups/samba/class_sambaGroup.inc:105
+msgid "Cannot find group SID in your configuration!"
+msgstr ""
+
+#: admin/groups/samba/class_sambaGroup.inc:119
+#, php-format
+msgid "Special group (%d)"
+msgstr ""
+
+#: admin/groups/samba/class_sambaGroup.inc:133
+#: personal/samba/class_sambaAccount.inc:478
+#: personal/samba/class_sambaAccount.inc:500
+msgid "Warning"
+msgstr ""
+
+#: admin/groups/samba/class_sambaGroup.inc:133
+#: personal/samba/class_sambaAccount.inc:478
+msgid "Undefined Samba SID detected. Please fix this problem manually!"
+msgstr ""
+
 #: admin/samba/class_sambaDomainManagement.inc:35
 msgid "Samba domains"
 msgstr ""
@@ -200,11 +277,6 @@ msgstr ""
 msgid "A short description of the winstation"
 msgstr ""
 
-#: admin/systems/samba/class_winstationGeneric.inc:88
-#: personal/samba/class_sambaAccount.inc:176
-msgid "Domain"
-msgstr ""
-
 #: admin/systems/samba/class_winstationGeneric.inc:88
 #: personal/samba/class_sambaAccount.inc:176
 msgid "Samba domain name"
@@ -235,11 +307,6 @@ msgstr ""
 msgid "Samba Munged Dial"
 msgstr ""
 
-#: personal/samba/class_sambaAccount.inc:135
-#: config/samba/class_sambaPluginConfig.inc:28
-msgid "Samba"
-msgstr ""
-
 #: personal/samba/class_sambaAccount.inc:136
 #: config/samba/class_sambaPluginConfig.inc:41
 msgid "Samba settings"
@@ -507,16 +574,7 @@ msgstr ""
 msgid "The windows user manager allows eight clients at maximum!"
 msgstr ""
 
-#: personal/samba/class_sambaAccount.inc:478
 #: personal/samba/class_sambaAccount.inc:501
-msgid "Warning"
-msgstr ""
-
-#: personal/samba/class_sambaAccount.inc:478
-msgid "Undefined Samba SID detected. Please fix this problem manually!"
-msgstr ""
-
-#: personal/samba/class_sambaAccount.inc:502
 msgid ""
 "Cannot convert primary group to samba group: group cannot be identified!"
 msgstr ""
@@ -578,11 +636,3 @@ msgstr ""
 #: config/samba/class_sambaPluginConfig.inc:72
 msgid "Needed to be compliant with Windows <= 98 or Samba < 3.2"
 msgstr ""
-
-#: personal/samba/sambaLogonHours.tpl.c:2
-msgid "Specify the hours this user is allowed to log in"
-msgstr ""
-
-#: personal/samba/sambaLogonHours.tpl.c:5
-msgid "Hour"
-msgstr ""
diff --git a/samba/locale/nb/fusiondirectory.po b/samba/locale/nb/fusiondirectory.po
index 2cd9bd498267b8e8cfe6186d49424fcee558d8fc..71f1c265fc98e9d9f3ce91181f7ca3d03e896222 100644
--- a/samba/locale/nb/fusiondirectory.po
+++ b/samba/locale/nb/fusiondirectory.po
@@ -5,18 +5,95 @@
 # Translators:
 msgid ""
 msgstr ""
-"Project-Id-Version: FusionDirectory-108\n"
+"Project-Id-Version: FusionDirectory-109\n"
 "Report-Msgid-Bugs-To: documentation@lists.fusiondirectory.org\n"
-"POT-Creation-Date: 2015-03-17 18:47+0100\n"
-"PO-Revision-Date: 2015-02-25 16:02+0000\n"
+"POT-Creation-Date: 2014-12-15 17:47+0100\n"
+"PO-Revision-Date: 2015-02-25 16:04+0000\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>\n"
-"Language-Team: Norwegian BokmÃ¥l (http://www.transifex.com/projects/p/FusionDirectory-108/language/nb/)\n"
+"Language-Team: Norwegian BokmÃ¥l (http://www.transifex.com/projects/p/FusionDirectory-109/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/groups/samba/class_sambaGroup.inc:29
+#: personal/samba/class_sambaAccount.inc:135
+#: config/samba/class_sambaPluginConfig.inc:28
+msgid "Samba"
+msgstr ""
+
+#: admin/groups/samba/class_sambaGroup.inc:30
+msgid "Samba group settings"
+msgstr ""
+
+#: admin/groups/samba/class_sambaGroup.inc:42
+#: admin/groups/samba/class_sambaGroup.inc:45
+#: admin/systems/samba/class_winstationGeneric.inc:88
+#: personal/samba/class_sambaAccount.inc:176
+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:119
+msgid "Samba group"
+msgstr ""
+
+#: admin/groups/samba/class_sambaGroup.inc:60
+#: admin/groups/samba/class_sambaGroup.inc:119
+msgid "Domain admins"
+msgstr ""
+
+#: admin/groups/samba/class_sambaGroup.inc:60
+#: admin/groups/samba/class_sambaGroup.inc:119
+msgid "Domain users"
+msgstr ""
+
+#: admin/groups/samba/class_sambaGroup.inc:60
+#: admin/groups/samba/class_sambaGroup.inc:119
+msgid "Domain guests"
+msgstr ""
+
+#: admin/groups/samba/class_sambaGroup.inc:105
+msgid "Configuration error"
+msgstr ""
+
+#: admin/groups/samba/class_sambaGroup.inc:105
+msgid "Cannot find group SID in your configuration!"
+msgstr ""
+
+#: admin/groups/samba/class_sambaGroup.inc:119
+#, php-format
+msgid "Special group (%d)"
+msgstr ""
+
+#: admin/groups/samba/class_sambaGroup.inc:133
+#: personal/samba/class_sambaAccount.inc:478
+#: personal/samba/class_sambaAccount.inc:500
+msgid "Warning"
+msgstr ""
+
+#: admin/groups/samba/class_sambaGroup.inc:133
+#: personal/samba/class_sambaAccount.inc:478
+msgid "Undefined Samba SID detected. Please fix this problem manually!"
+msgstr ""
+
 #: admin/samba/class_sambaDomainManagement.inc:35
 msgid "Samba domains"
 msgstr ""
@@ -200,11 +277,6 @@ msgstr "Beskrivelse"
 msgid "A short description of the winstation"
 msgstr ""
 
-#: admin/systems/samba/class_winstationGeneric.inc:88
-#: personal/samba/class_sambaAccount.inc:176
-msgid "Domain"
-msgstr ""
-
 #: admin/systems/samba/class_winstationGeneric.inc:88
 #: personal/samba/class_sambaAccount.inc:176
 msgid "Samba domain name"
@@ -235,11 +307,6 @@ msgstr ""
 msgid "Samba Munged Dial"
 msgstr ""
 
-#: personal/samba/class_sambaAccount.inc:135
-#: config/samba/class_sambaPluginConfig.inc:28
-msgid "Samba"
-msgstr ""
-
 #: personal/samba/class_sambaAccount.inc:136
 #: config/samba/class_sambaPluginConfig.inc:41
 msgid "Samba settings"
@@ -507,16 +574,7 @@ msgstr ""
 msgid "The windows user manager allows eight clients at maximum!"
 msgstr ""
 
-#: personal/samba/class_sambaAccount.inc:478
 #: personal/samba/class_sambaAccount.inc:501
-msgid "Warning"
-msgstr ""
-
-#: personal/samba/class_sambaAccount.inc:478
-msgid "Undefined Samba SID detected. Please fix this problem manually!"
-msgstr ""
-
-#: personal/samba/class_sambaAccount.inc:502
 msgid ""
 "Cannot convert primary group to samba group: group cannot be identified!"
 msgstr ""
@@ -578,11 +636,3 @@ msgstr ""
 #: config/samba/class_sambaPluginConfig.inc:72
 msgid "Needed to be compliant with Windows <= 98 or Samba < 3.2"
 msgstr ""
-
-#: personal/samba/sambaLogonHours.tpl.c:2
-msgid "Specify the hours this user is allowed to log in"
-msgstr ""
-
-#: personal/samba/sambaLogonHours.tpl.c:5
-msgid "Hour"
-msgstr ""
diff --git a/samba/locale/nl/fusiondirectory.po b/samba/locale/nl/fusiondirectory.po
index 776e25125302d8f698890678245289fbb202cefe..fcddc9dc4ded452feb42ea098c7fd8d345a25d5a 100644
--- a/samba/locale/nl/fusiondirectory.po
+++ b/samba/locale/nl/fusiondirectory.po
@@ -3,23 +3,97 @@
 # This file is distributed under the same license as the PACKAGE package.
 # 
 # Translators:
-# Kenny Tordeurs <tordeurskenny@gmail.com>, 2012
-#  Niels Klomp (CareWorks ICT Services) <nk@careworks.nl>, 2005-2008
-# Kenny Tordeurs <tordeurskenny@gmail.com>, 2012
 msgid ""
 msgstr ""
-"Project-Id-Version: FusionDirectory-108\n"
+"Project-Id-Version: FusionDirectory-109\n"
 "Report-Msgid-Bugs-To: documentation@lists.fusiondirectory.org\n"
-"POT-Creation-Date: 2015-03-17 18:47+0100\n"
-"PO-Revision-Date: 2015-02-25 16:12+0000\n"
+"POT-Creation-Date: 2014-12-15 17:47+0100\n"
+"PO-Revision-Date: 2015-03-31 11:41+0000\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>\n"
-"Language-Team: Dutch (http://www.transifex.com/projects/p/FusionDirectory-108/language/nl/)\n"
+"Language-Team: Dutch (http://www.transifex.com/projects/p/FusionDirectory-109/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/groups/samba/class_sambaGroup.inc:29
+#: personal/samba/class_sambaAccount.inc:135
+#: 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:88
+#: personal/samba/class_sambaAccount.inc:176
+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:119
+msgid "Samba group"
+msgstr "Samba groep"
+
+#: admin/groups/samba/class_sambaGroup.inc:60
+#: admin/groups/samba/class_sambaGroup.inc:119
+msgid "Domain admins"
+msgstr "Windows beheerders"
+
+#: admin/groups/samba/class_sambaGroup.inc:60
+#: admin/groups/samba/class_sambaGroup.inc:119
+msgid "Domain users"
+msgstr "Windows gebruikers"
+
+#: admin/groups/samba/class_sambaGroup.inc:60
+#: admin/groups/samba/class_sambaGroup.inc:119
+msgid "Domain guests"
+msgstr "Windows gasten"
+
+#: admin/groups/samba/class_sambaGroup.inc:105
+msgid "Configuration error"
+msgstr "Configuratie fout"
+
+#: admin/groups/samba/class_sambaGroup.inc:105
+msgid "Cannot find group SID in your configuration!"
+msgstr "Kan de goep SID niet vinden in je configuratie!"
+
+#: admin/groups/samba/class_sambaGroup.inc:119
+#, php-format
+msgid "Special group (%d)"
+msgstr "Speciale groep (%d)"
+
+#: admin/groups/samba/class_sambaGroup.inc:133
+#: personal/samba/class_sambaAccount.inc:478
+#: personal/samba/class_sambaAccount.inc:500
+msgid "Warning"
+msgstr "Waarschuwing"
+
+#: admin/groups/samba/class_sambaGroup.inc:133
+#: personal/samba/class_sambaAccount.inc:478
+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 ""
@@ -203,11 +277,6 @@ msgstr "Omschrijving"
 msgid "A short description of the winstation"
 msgstr ""
 
-#: admin/systems/samba/class_winstationGeneric.inc:88
-#: personal/samba/class_sambaAccount.inc:176
-msgid "Domain"
-msgstr "Domein"
-
 #: admin/systems/samba/class_winstationGeneric.inc:88
 #: personal/samba/class_sambaAccount.inc:176
 msgid "Samba domain name"
@@ -238,11 +307,6 @@ msgstr ""
 msgid "Samba Munged Dial"
 msgstr ""
 
-#: personal/samba/class_sambaAccount.inc:135
-#: config/samba/class_sambaPluginConfig.inc:28
-msgid "Samba"
-msgstr "Samba"
-
 #: personal/samba/class_sambaAccount.inc:136
 #: config/samba/class_sambaPluginConfig.inc:41
 msgid "Samba settings"
@@ -510,16 +574,7 @@ 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:478
 #: personal/samba/class_sambaAccount.inc:501
-msgid "Warning"
-msgstr "Waarschuwing"
-
-#: personal/samba/class_sambaAccount.inc:478
-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:502
 msgid ""
 "Cannot convert primary group to samba group: group cannot be identified!"
 msgstr "Kan primaire groep niet in een samba groep omzetten: group kan niet geidentificeerd worden"
@@ -581,11 +636,3 @@ msgstr ""
 #: config/samba/class_sambaPluginConfig.inc:72
 msgid "Needed to be compliant with Windows <= 98 or Samba < 3.2"
 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"
-
-#: personal/samba/sambaLogonHours.tpl.c:5
-msgid "Hour"
-msgstr "Uur"
diff --git a/samba/locale/pl/fusiondirectory.po b/samba/locale/pl/fusiondirectory.po
index b726debffeb2659815a1d7a7fb61764fb9f1a190..084d8efdc287d6cf576b79888d4681bad0072e9f 100644
--- a/samba/locale/pl/fusiondirectory.po
+++ b/samba/locale/pl/fusiondirectory.po
@@ -5,18 +5,95 @@
 # Translators:
 msgid ""
 msgstr ""
-"Project-Id-Version: FusionDirectory-108\n"
+"Project-Id-Version: FusionDirectory-109\n"
 "Report-Msgid-Bugs-To: documentation@lists.fusiondirectory.org\n"
-"POT-Creation-Date: 2015-03-17 18:47+0100\n"
-"PO-Revision-Date: 2015-02-25 16:02+0000\n"
+"POT-Creation-Date: 2014-12-15 17:47+0100\n"
+"PO-Revision-Date: 2015-03-31 11:41+0000\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>\n"
-"Language-Team: Polish (http://www.transifex.com/projects/p/FusionDirectory-108/language/pl/)\n"
+"Language-Team: Polish (http://www.transifex.com/projects/p/FusionDirectory-109/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/groups/samba/class_sambaGroup.inc:29
+#: personal/samba/class_sambaAccount.inc:135
+#: 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:88
+#: personal/samba/class_sambaAccount.inc:176
+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:119
+msgid "Samba group"
+msgstr "Grupa Samba"
+
+#: admin/groups/samba/class_sambaGroup.inc:60
+#: admin/groups/samba/class_sambaGroup.inc:119
+msgid "Domain admins"
+msgstr "Administratorzy domeny"
+
+#: admin/groups/samba/class_sambaGroup.inc:60
+#: admin/groups/samba/class_sambaGroup.inc:119
+msgid "Domain users"
+msgstr "UÅ¼ytkownicy domeny"
+
+#: admin/groups/samba/class_sambaGroup.inc:60
+#: admin/groups/samba/class_sambaGroup.inc:119
+msgid "Domain guests"
+msgstr "GoÅ›cie domeny"
+
+#: admin/groups/samba/class_sambaGroup.inc:105
+msgid "Configuration error"
+msgstr "BÅ‚Ä…d konfiguracji"
+
+#: admin/groups/samba/class_sambaGroup.inc:105
+msgid "Cannot find group SID in your configuration!"
+msgstr ""
+
+#: admin/groups/samba/class_sambaGroup.inc:119
+#, php-format
+msgid "Special group (%d)"
+msgstr "Specjalna grupa (%d)"
+
+#: admin/groups/samba/class_sambaGroup.inc:133
+#: personal/samba/class_sambaAccount.inc:478
+#: personal/samba/class_sambaAccount.inc:500
+msgid "Warning"
+msgstr "OstrzeÅ¼enie"
+
+#: admin/groups/samba/class_sambaGroup.inc:133
+#: personal/samba/class_sambaAccount.inc:478
+msgid "Undefined Samba SID detected. Please fix this problem manually!"
+msgstr ""
+
 #: admin/samba/class_sambaDomainManagement.inc:35
 msgid "Samba domains"
 msgstr ""
@@ -200,11 +277,6 @@ msgstr "Opis"
 msgid "A short description of the winstation"
 msgstr ""
 
-#: admin/systems/samba/class_winstationGeneric.inc:88
-#: personal/samba/class_sambaAccount.inc:176
-msgid "Domain"
-msgstr "Domena"
-
 #: admin/systems/samba/class_winstationGeneric.inc:88
 #: personal/samba/class_sambaAccount.inc:176
 msgid "Samba domain name"
@@ -235,11 +307,6 @@ msgstr ""
 msgid "Samba Munged Dial"
 msgstr ""
 
-#: personal/samba/class_sambaAccount.inc:135
-#: config/samba/class_sambaPluginConfig.inc:28
-msgid "Samba"
-msgstr "Samba"
-
 #: personal/samba/class_sambaAccount.inc:136
 #: config/samba/class_sambaPluginConfig.inc:41
 msgid "Samba settings"
@@ -507,16 +574,7 @@ msgstr ""
 msgid "The windows user manager allows eight clients at maximum!"
 msgstr ""
 
-#: personal/samba/class_sambaAccount.inc:478
 #: personal/samba/class_sambaAccount.inc:501
-msgid "Warning"
-msgstr "OstrzeÅ¼enie"
-
-#: personal/samba/class_sambaAccount.inc:478
-msgid "Undefined Samba SID detected. Please fix this problem manually!"
-msgstr ""
-
-#: personal/samba/class_sambaAccount.inc:502
 msgid ""
 "Cannot convert primary group to samba group: group cannot be identified!"
 msgstr ""
@@ -578,11 +636,3 @@ msgstr ""
 #: config/samba/class_sambaPluginConfig.inc:72
 msgid "Needed to be compliant with Windows <= 98 or Samba < 3.2"
 msgstr ""
-
-#: personal/samba/sambaLogonHours.tpl.c:2
-msgid "Specify the hours this user is allowed to log in"
-msgstr ""
-
-#: personal/samba/sambaLogonHours.tpl.c:5
-msgid "Hour"
-msgstr ""
diff --git a/samba/locale/pt/fusiondirectory.po b/samba/locale/pt/fusiondirectory.po
index 5493264d063316c6a5a0320dcc69a8f81d7a1746..bd6026ebd5a594f89b920c8289574c7ef77bc389 100644
--- a/samba/locale/pt/fusiondirectory.po
+++ b/samba/locale/pt/fusiondirectory.po
@@ -5,18 +5,95 @@
 # Translators:
 msgid ""
 msgstr ""
-"Project-Id-Version: FusionDirectory-108\n"
+"Project-Id-Version: FusionDirectory-109\n"
 "Report-Msgid-Bugs-To: documentation@lists.fusiondirectory.org\n"
-"POT-Creation-Date: 2015-03-17 18:47+0100\n"
-"PO-Revision-Date: 2015-02-25 16:02+0000\n"
+"POT-Creation-Date: 2014-12-15 17:47+0100\n"
+"PO-Revision-Date: 2015-03-31 11:41+0000\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>\n"
-"Language-Team: Portuguese (http://www.transifex.com/projects/p/FusionDirectory-108/language/pt/)\n"
+"Language-Team: Portuguese (http://www.transifex.com/projects/p/FusionDirectory-109/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/groups/samba/class_sambaGroup.inc:29
+#: personal/samba/class_sambaAccount.inc:135
+#: 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:88
+#: personal/samba/class_sambaAccount.inc:176
+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:119
+msgid "Samba group"
+msgstr "Grupo samba"
+
+#: admin/groups/samba/class_sambaGroup.inc:60
+#: admin/groups/samba/class_sambaGroup.inc:119
+msgid "Domain admins"
+msgstr "Administradores do domÃnio"
+
+#: admin/groups/samba/class_sambaGroup.inc:60
+#: admin/groups/samba/class_sambaGroup.inc:119
+msgid "Domain users"
+msgstr "UsuÃ¡rios do domÃnio"
+
+#: admin/groups/samba/class_sambaGroup.inc:60
+#: admin/groups/samba/class_sambaGroup.inc:119
+msgid "Domain guests"
+msgstr "Convidados do domÃnio"
+
+#: admin/groups/samba/class_sambaGroup.inc:105
+msgid "Configuration error"
+msgstr "Erro de configuraÃ§Ã£o"
+
+#: admin/groups/samba/class_sambaGroup.inc:105
+msgid "Cannot find group SID in your configuration!"
+msgstr ""
+
+#: admin/groups/samba/class_sambaGroup.inc:119
+#, php-format
+msgid "Special group (%d)"
+msgstr ""
+
+#: admin/groups/samba/class_sambaGroup.inc:133
+#: personal/samba/class_sambaAccount.inc:478
+#: personal/samba/class_sambaAccount.inc:500
+msgid "Warning"
+msgstr "AtenÃ§Ã£o"
+
+#: admin/groups/samba/class_sambaGroup.inc:133
+#: personal/samba/class_sambaAccount.inc:478
+msgid "Undefined Samba SID detected. Please fix this problem manually!"
+msgstr ""
+
 #: admin/samba/class_sambaDomainManagement.inc:35
 msgid "Samba domains"
 msgstr ""
@@ -200,11 +277,6 @@ msgstr "DescriÃ§Ã£o"
 msgid "A short description of the winstation"
 msgstr ""
 
-#: admin/systems/samba/class_winstationGeneric.inc:88
-#: personal/samba/class_sambaAccount.inc:176
-msgid "Domain"
-msgstr ""
-
 #: admin/systems/samba/class_winstationGeneric.inc:88
 #: personal/samba/class_sambaAccount.inc:176
 msgid "Samba domain name"
@@ -235,11 +307,6 @@ msgstr ""
 msgid "Samba Munged Dial"
 msgstr ""
 
-#: personal/samba/class_sambaAccount.inc:135
-#: config/samba/class_sambaPluginConfig.inc:28
-msgid "Samba"
-msgstr "Samba"
-
 #: personal/samba/class_sambaAccount.inc:136
 #: config/samba/class_sambaPluginConfig.inc:41
 msgid "Samba settings"
@@ -507,16 +574,7 @@ msgstr ""
 msgid "The windows user manager allows eight clients at maximum!"
 msgstr ""
 
-#: personal/samba/class_sambaAccount.inc:478
 #: personal/samba/class_sambaAccount.inc:501
-msgid "Warning"
-msgstr "AtenÃ§Ã£o"
-
-#: personal/samba/class_sambaAccount.inc:478
-msgid "Undefined Samba SID detected. Please fix this problem manually!"
-msgstr ""
-
-#: personal/samba/class_sambaAccount.inc:502
 msgid ""
 "Cannot convert primary group to samba group: group cannot be identified!"
 msgstr ""
@@ -578,11 +636,3 @@ msgstr ""
 #: config/samba/class_sambaPluginConfig.inc:72
 msgid "Needed to be compliant with Windows <= 98 or Samba < 3.2"
 msgstr ""
-
-#: personal/samba/sambaLogonHours.tpl.c:2
-msgid "Specify the hours this user is allowed to log in"
-msgstr ""
-
-#: personal/samba/sambaLogonHours.tpl.c:5
-msgid "Hour"
-msgstr ""
diff --git a/samba/locale/pt_BR/fusiondirectory.po b/samba/locale/pt_BR/fusiondirectory.po
index 31f589a2e24463911cc01c22ec29af113b143a6c..9c1b20df3b22e18604563eee908c43c4f968d8bb 100644
--- a/samba/locale/pt_BR/fusiondirectory.po
+++ b/samba/locale/pt_BR/fusiondirectory.po
@@ -3,22 +3,97 @@
 # This file is distributed under the same license as the PACKAGE package.
 # 
 # Translators:
-# marcosantos <marcoa.csantos@yahoo.it>, 2014
-# marcosantos <marcoa.csantos@yahoo.it>, 2014
 msgid ""
 msgstr ""
-"Project-Id-Version: FusionDirectory-108\n"
+"Project-Id-Version: FusionDirectory-109\n"
 "Report-Msgid-Bugs-To: documentation@lists.fusiondirectory.org\n"
-"POT-Creation-Date: 2015-03-17 18:47+0100\n"
-"PO-Revision-Date: 2015-02-25 16:12+0000\n"
+"POT-Creation-Date: 2014-12-15 17:47+0100\n"
+"PO-Revision-Date: 2015-03-31 11:41+0000\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>\n"
-"Language-Team: Portuguese (Brazil) (http://www.transifex.com/projects/p/FusionDirectory-108/language/pt_BR/)\n"
+"Language-Team: Portuguese (Brazil) (http://www.transifex.com/projects/p/FusionDirectory-109/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/groups/samba/class_sambaGroup.inc:29
+#: personal/samba/class_sambaAccount.inc:135
+#: 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:88
+#: personal/samba/class_sambaAccount.inc:176
+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:119
+msgid "Samba group"
+msgstr "Grupo Samba"
+
+#: admin/groups/samba/class_sambaGroup.inc:60
+#: admin/groups/samba/class_sambaGroup.inc:119
+msgid "Domain admins"
+msgstr "Administradores do domÃnio"
+
+#: admin/groups/samba/class_sambaGroup.inc:60
+#: admin/groups/samba/class_sambaGroup.inc:119
+msgid "Domain users"
+msgstr "UsuÃ¡rios do domÃnio"
+
+#: admin/groups/samba/class_sambaGroup.inc:60
+#: admin/groups/samba/class_sambaGroup.inc:119
+msgid "Domain guests"
+msgstr "Convidados do domÃnio"
+
+#: admin/groups/samba/class_sambaGroup.inc:105
+msgid "Configuration error"
+msgstr "Erro de configuraÃ§Ã£o"
+
+#: admin/groups/samba/class_sambaGroup.inc:105
+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:119
+#, php-format
+msgid "Special group (%d)"
+msgstr "Grupo especial (%d)"
+
+#: admin/groups/samba/class_sambaGroup.inc:133
+#: personal/samba/class_sambaAccount.inc:478
+#: personal/samba/class_sambaAccount.inc:500
+msgid "Warning"
+msgstr "Aviso"
+
+#: admin/groups/samba/class_sambaGroup.inc:133
+#: personal/samba/class_sambaAccount.inc:478
+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 ""
@@ -202,11 +277,6 @@ msgstr "DescriÃ§Ã£o"
 msgid "A short description of the winstation"
 msgstr "Uma pequena descriÃ§Ã£o do winstation"
 
-#: admin/systems/samba/class_winstationGeneric.inc:88
-#: personal/samba/class_sambaAccount.inc:176
-msgid "Domain"
-msgstr "DomÃnio"
-
 #: admin/systems/samba/class_winstationGeneric.inc:88
 #: personal/samba/class_sambaAccount.inc:176
 msgid "Samba domain name"
@@ -237,11 +307,6 @@ msgstr "ConfiguraÃ§Ãµes de rede"
 msgid "Samba Munged Dial"
 msgstr ""
 
-#: personal/samba/class_sambaAccount.inc:135
-#: config/samba/class_sambaPluginConfig.inc:28
-msgid "Samba"
-msgstr "Samba"
-
 #: personal/samba/class_sambaAccount.inc:136
 #: config/samba/class_sambaPluginConfig.inc:41
 msgid "Samba settings"
@@ -509,16 +574,7 @@ msgstr ""
 msgid "The windows user manager allows eight clients at maximum!"
 msgstr ""
 
-#: personal/samba/class_sambaAccount.inc:478
 #: personal/samba/class_sambaAccount.inc:501
-msgid "Warning"
-msgstr "Aviso"
-
-#: personal/samba/class_sambaAccount.inc:478
-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:502
 msgid ""
 "Cannot convert primary group to samba group: group cannot be identified!"
 msgstr "NÃ£o Ã© possÃvel converter o grupo principal para o grupo samba: o grupo nÃ£o pode ser identificado!"
@@ -580,11 +636,3 @@ msgstr "Gerar sambaLMPassword"
 #: config/samba/class_sambaPluginConfig.inc:72
 msgid "Needed to be compliant with Windows <= 98 or Samba < 3.2"
 msgstr "NecessÃ¡rio ser compatÃvel com Windows <=98 ou Samba < 3.2"
-
-#: personal/samba/sambaLogonHours.tpl.c:2
-msgid "Specify the hours this user is allowed to log in"
-msgstr ""
-
-#: personal/samba/sambaLogonHours.tpl.c:5
-msgid "Hour"
-msgstr "Hora"
diff --git a/samba/locale/ru/fusiondirectory.po b/samba/locale/ru/fusiondirectory.po
index cb6fb8db757f024d761a6443dac167be0fc5f10e..440506d21934967e7dd722e385790ab691593e1e 100644
--- a/samba/locale/ru/fusiondirectory.po
+++ b/samba/locale/ru/fusiondirectory.po
@@ -3,22 +3,96 @@
 # This file is distributed under the same license as the PACKAGE package.
 # 
 # Translators:
-# Alexey, 2015
-# Alexey, 2015
-#  Valia V. Vaneeva <fattie@altlinux.ru>, 2004
 msgid ""
 msgstr ""
-"Project-Id-Version: FusionDirectory-108\n"
+"Project-Id-Version: FusionDirectory-109\n"
 "Report-Msgid-Bugs-To: documentation@lists.fusiondirectory.org\n"
-"POT-Creation-Date: 2015-03-17 18:47+0100\n"
-"PO-Revision-Date: 2015-03-18 19:54+0000\n"
-"Last-Translator: Alexey\n"
-"Language-Team: Russian (http://www.transifex.com/projects/p/FusionDirectory-108/language/ru/)\n"
+"POT-Creation-Date: 2014-12-15 17:47+0100\n"
+"PO-Revision-Date: 2015-04-18 18:03+0000\n"
+"Last-Translator: fusiondirectory <contact@fusiondirectory.org>\n"
+"Language-Team: Russian (http://www.transifex.com/projects/p/FusionDirectory-109/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=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);\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:135
+#: 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:88
+#: personal/samba/class_sambaAccount.inc:176
+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 " Ð¢Ð¸Ð¿ Samba Ð³Ñ€ÑƒÐ¿Ð¿"
+
+#: admin/groups/samba/class_sambaGroup.inc:60
+#: admin/groups/samba/class_sambaGroup.inc:119
+msgid "Samba group"
+msgstr "Ð“Ñ€ÑƒÐ¿Ð¿Ð° Samba"
+
+#: admin/groups/samba/class_sambaGroup.inc:60
+#: admin/groups/samba/class_sambaGroup.inc:119
+msgid "Domain admins"
+msgstr "ÐÐ´Ð¼Ð¸Ð½Ð¸ÑÑ‚Ñ€Ð°Ñ‚Ð¾Ñ€Ñ‹ Ð´Ð¾Ð¼ÐµÐ½Ð°"
+
+#: admin/groups/samba/class_sambaGroup.inc:60
+#: admin/groups/samba/class_sambaGroup.inc:119
+msgid "Domain users"
+msgstr "ÐŸÐ¾Ð»ÑŒÐ·Ð¾Ð²Ð°Ñ‚ÐµÐ»Ð¸ Ð´Ð¾Ð¼ÐµÐ½Ð°"
+
+#: admin/groups/samba/class_sambaGroup.inc:60
+#: admin/groups/samba/class_sambaGroup.inc:119
+msgid "Domain guests"
+msgstr "ÐÐµÐ¿Ñ€Ð¸Ð²Ð¸Ð»ÐµÐ³Ð¸Ñ€Ð¾Ð²Ð°Ð½Ð½Ñ‹Ðµ Ð¿Ð¾Ð»ÑŒÐ·Ð¾Ð²Ð°Ñ‚ÐµÐ»Ð¸ Ð´Ð¾Ð¼ÐµÐ½Ð°"
+
+#: admin/groups/samba/class_sambaGroup.inc:105
+msgid "Configuration error"
+msgstr "ÐžÑˆÐ¸Ð±ÐºÐ° ÐºÐ¾Ð½Ñ„Ð¸Ð³ÑƒÑ€Ð°Ñ†Ð¸Ð¸"
+
+#: admin/groups/samba/class_sambaGroup.inc:105
+msgid "Cannot find group SID in your configuration!"
+msgstr "ÐÐµ Ð¼Ð¾Ð³Ñƒ Ð½Ð°Ð¹Ñ‚Ð¸ SID Ð³Ñ€ÑƒÐ¿Ð¿Ñ‹ Ð² Ð²Ð°ÑˆÐµÐ¹ ÐºÐ¾Ð½Ñ„Ð¸Ð³ÑƒÑ€Ð°Ñ†Ð¸Ð¸!"
+
+#: admin/groups/samba/class_sambaGroup.inc:119
+#, php-format
+msgid "Special group (%d)"
+msgstr "Ð¡Ð¿ÐµÑ†Ð¸Ð°Ð»ÑŒÐ½Ð°Ñ Ð³Ñ€ÑƒÐ¿Ð¿Ð° (%d)"
+
+#: admin/groups/samba/class_sambaGroup.inc:133
+#: personal/samba/class_sambaAccount.inc:478
+#: personal/samba/class_sambaAccount.inc:500
+msgid "Warning"
+msgstr "ÐŸÑ€ÐµÐ´ÑƒÐ¿Ñ€ÐµÐ¶Ð´ÐµÐ½Ð¸Ðµ"
+
+#: admin/groups/samba/class_sambaGroup.inc:133
+#: personal/samba/class_sambaAccount.inc:478
+msgid "Undefined Samba SID detected. Please fix this problem manually!"
+msgstr ""
 
 #: admin/samba/class_sambaDomainManagement.inc:35
 msgid "Samba domains"
@@ -175,11 +249,11 @@ msgstr ""
 
 #: admin/systems/samba/class_winstationGeneric.inc:40
 msgid "Winstation"
-msgstr ""
+msgstr "Ð Ð°Ð±Ð¾Ñ‡Ð°Ñ ÑÑ‚Ð°Ð½Ñ†Ð¸Ñ Windows"
 
 #: admin/systems/samba/class_winstationGeneric.inc:41
 msgid "Windows workstation information"
-msgstr ""
+msgstr "Ð˜Ð½Ñ„Ð¾Ñ€Ð¼Ð°Ñ†Ð¸Ñ Ð¾Ð± Ñ€Ð°Ð±Ð¾Ñ‡ÐµÐ¹ ÑÑ‚Ð°Ð½Ñ†Ð¸Ð¸ Windows"
 
 #: admin/systems/samba/class_winstationGeneric.inc:45
 #: admin/systems/samba/class_winstationGeneric.inc:46
@@ -189,7 +263,7 @@ msgstr "Ð Ð°Ð±Ð¾Ñ‡Ð°Ñ ÑÑ‚Ð°Ð½Ñ†Ð¸Ñ Windows"
 #: admin/systems/samba/class_winstationGeneric.inc:73
 #: admin/systems/samba/class_winstationGeneric.inc:77
 msgid "The name of the winstation"
-msgstr ""
+msgstr "ÐÐ°Ð·Ð²Ð°Ð½Ð¸Ðµ Ñ€Ð°Ð±Ð¾Ñ‡ÐµÐ¹ ÑÑ‚Ð°Ð½Ñ†Ð¸Ð¸ Windows"
 
 #: admin/systems/samba/class_winstationGeneric.inc:77
 msgid "Name"
@@ -201,12 +275,7 @@ msgstr "ÐžÐ¿Ð¸ÑÐ°Ð½Ð¸Ðµ"
 
 #: admin/systems/samba/class_winstationGeneric.inc:84
 msgid "A short description of the winstation"
-msgstr ""
-
-#: admin/systems/samba/class_winstationGeneric.inc:88
-#: personal/samba/class_sambaAccount.inc:176
-msgid "Domain"
-msgstr "Ð”Ð¾Ð¼ÐµÐ½"
+msgstr "ÐšÑ€Ð°Ñ‚ÐºÐ¾Ðµ Ð¾Ð¿Ð¸ÑÐ°Ð½Ð¸Ðµ Ñ€Ð°Ð±Ð¾Ñ‡ÐµÐ¹ ÑÑ‚Ð°Ð½Ñ†Ð¸Ð¸ Windows"
 
 #: admin/systems/samba/class_winstationGeneric.inc:88
 #: personal/samba/class_sambaAccount.inc:176
@@ -219,7 +288,7 @@ msgstr "ÐœÐµÑÑ‚Ð¾Ð¿Ð¾Ð»Ð¾Ð¶ÐµÐ½Ð¸Ðµ"
 
 #: admin/systems/samba/class_winstationGeneric.inc:92
 msgid "The location of the winstation"
-msgstr ""
+msgstr "Ð Ð°ÑÐ¿Ð¾Ð»Ð¾Ð¶ÐµÐ½Ð¸Ðµ Ñ€Ð°Ð±Ð¾Ñ‡ÐµÐ¹ ÑÑ‚Ð°Ð½Ñ†Ð¸Ð¸ Windows"
 
 #: admin/systems/samba/class_winstationGeneric.inc:99
 #: admin/systems/samba/class_winstationGeneric.inc:103
@@ -238,11 +307,6 @@ msgstr "Ð¡ÐµÑ‚ÐµÐ²Ñ‹Ðµ Ð½Ð°ÑÑ‚Ñ€Ð¾Ð¹ÐºÐ¸"
 msgid "Samba Munged Dial"
 msgstr ""
 
-#: personal/samba/class_sambaAccount.inc:135
-#: config/samba/class_sambaPluginConfig.inc:28
-msgid "Samba"
-msgstr "Samba"
-
 #: personal/samba/class_sambaAccount.inc:136
 #: config/samba/class_sambaPluginConfig.inc:41
 msgid "Samba settings"
@@ -250,17 +314,17 @@ msgstr "ÐÐ°ÑÑ‚Ñ€Ð¾Ð¹ÐºÐ¸ Samba"
 
 #: personal/samba/class_sambaAccount.inc:160
 msgid "Samba profile"
-msgstr ""
+msgstr "ÐŸÑ€Ð¾Ñ„Ð¸Ð»ÑŒ Samba"
 
 #: personal/samba/class_sambaAccount.inc:166
 #: personal/samba/class_sambaAccount.inc:199
 msgid "Home directory drive"
-msgstr ""
+msgstr "ÐÐ°Ð·Ð²Ð°Ð½Ð¸Ðµ Ð´Ð¸ÑÐºÐ° Ð´Ð¾Ð¼Ð°ÑˆÐ½ÐµÐ³Ð¾ ÐºÐ°Ñ‚Ð°Ð»Ð¾Ð³Ð°"
 
 #: personal/samba/class_sambaAccount.inc:166
 #: personal/samba/class_sambaAccount.inc:199
 msgid "Letter for the home drive"
-msgstr ""
+msgstr "Ð‘ÑƒÐºÐ²Ð° Ð´Ð¸ÑÐºÐ° Ð´Ð»Ñ Ð´Ð¾Ð¼Ð°ÑˆÐ½ÐµÐ³Ð¾ Ð´Ð¸ÑÐºÐ°"
 
 #: personal/samba/class_sambaAccount.inc:171
 #: personal/samba/class_sambaAccount.inc:204
@@ -304,15 +368,15 @@ msgstr "Ð£Ð½Ð°ÑÐ»ÐµÐ´Ð¾Ð²Ð°Ñ‚ÑŒ ÐºÐ¾Ð½Ñ„Ð¸Ð³ÑƒÑ€Ð°Ñ†Ð¸ÑŽ ÐºÐ»Ð¸ÐµÐ½Ñ‚Ð°"
 
 #: personal/samba/class_sambaAccount.inc:214
 msgid "Inherit client configuration"
-msgstr ""
+msgstr "ÐÐ°ÑÐ»ÐµÐ´Ð¾Ð²Ð°Ñ‚ÑŒ ÐºÐ¾Ð½Ñ„Ð¸Ð³ÑƒÑ€Ð°Ñ†Ð¸ÑŽ ÐºÐ»Ð¸ÐµÐ½Ñ‚Ð°"
 
 #: personal/samba/class_sambaAccount.inc:218
 msgid "Initial progam"
-msgstr ""
+msgstr "ÐÐ°Ñ‡Ð°Ð»ÑŒÐ½Ð°Ñ Ð¿Ñ€Ð¾Ð³Ñ€Ð°Ð¼Ð¼Ð°"
 
 #: personal/samba/class_sambaAccount.inc:218
 msgid "Program to start after connecting"
-msgstr ""
+msgstr "ÐŸÑ€Ð¾Ð³Ñ€Ð°Ð¼Ð¼Ð° Ð·Ð°Ð¿ÑƒÑÐºÐ°ÐµÐ¼Ð°Ñ Ð¿Ð¾ÑÐ»Ðµ ÑÐ¾ÐµÐ´Ð¸Ð½ÐµÐ½Ð¸Ñ"
 
 #: personal/samba/class_sambaAccount.inc:222
 msgid "Working directory"
@@ -320,31 +384,31 @@ msgstr "Ð Ð°Ð±Ð¾Ñ‡Ð¸Ð¹ ÐºÐ°Ñ‚Ð°Ð»Ð¾Ð³"
 
 #: personal/samba/class_sambaAccount.inc:222
 msgid "Basic working directory"
-msgstr ""
+msgstr "ÐžÑÐ½Ð¾Ð²Ð½Ð¾Ð¹ Ñ€Ð°Ð±Ð¾Ñ‡Ð¸Ð¹ ÐºÐ°Ñ‚Ð°Ð»Ð¾Ð³"
 
 #: personal/samba/class_sambaAccount.inc:226
 msgid "Connection timeout"
-msgstr ""
+msgstr "Ð¢Ð°Ð¹Ð¼-Ð°ÑƒÑ‚ ÑÐ¾ÐµÐ´Ð¸Ð½ÐµÐ½Ð¸Ñ"
 
 #: personal/samba/class_sambaAccount.inc:226
 msgid "Timeout when connecting to terminal server"
-msgstr ""
+msgstr "Ð’Ñ€ÐµÐ¼Ñ ÐºÐ¾Ñ‚Ð¾Ñ€Ð¾Ðµ Ð¾Ñ‚Ð²ÐµÐ´ÐµÐ½Ð¾ Ð½Ð° Ð¿Ð¾Ð´ÐºÐ»ÑŽÑ‡ÐµÐ½Ð¸Ðµ Ðº ÑÐµÑ€Ð²ÐµÑ€Ñƒ Ñ‚ÐµÑ€Ð¼Ð¸Ð½Ð°Ð»Ð¾Ð²"
 
 #: personal/samba/class_sambaAccount.inc:231
 msgid "Disconnection timeout"
-msgstr ""
+msgstr "Ð¢Ð°Ð¹Ð¼-Ð°ÑƒÑ‚ Ð¾Ñ‚ÐºÐ»ÑŽÑ‡ÐµÐ½Ð¸Ñ"
 
 #: personal/samba/class_sambaAccount.inc:231
 msgid "Timeout before disconnecting from terminal server"
-msgstr ""
+msgstr "Ð’Ñ€ÐµÐ¼Ñ Ð´Ð¾ Ð¾Ñ‚ÐºÐ»ÑŽÑ‡ÐµÐ½Ð¸Ñ Ð¾Ñ‚ Ñ‚ÐµÑ€Ð¼Ð¸Ð½Ð°Ð»ÑŒÐ½Ð¾Ð³Ð¾ ÑÐµÑ€Ð²ÐµÑ€Ð°"
 
 #: personal/samba/class_sambaAccount.inc:236
 msgid "Idle timeout"
-msgstr ""
+msgstr "Ð¢Ð°Ð¹Ð¼-Ð°ÑƒÑ‚ Ð¿Ñ€Ð¾ÑÑ‚Ð¾Ñ"
 
 #: personal/samba/class_sambaAccount.inc:236
 msgid "Idle timeout before disconnecting from terminal server"
-msgstr ""
+msgstr "Ð’Ñ€ÐµÐ¼Ñ Ð±ÐµÐ·Ð´ÐµÐ¹ÑÑ‚Ð²Ð¸Ñ Ð¿Ð¾ÑÐ»Ðµ ÐºÐ¾Ñ‚Ð¾Ñ€Ð¾Ð³Ð¾ Ð¿Ñ€Ð¾Ð¸Ð·Ð¾Ð¹Ð´ÐµÑ‚ Ð¾Ñ‚ÐºÐ»ÑŽÑ‡ÐµÐ½Ð¸Ðµ Ð¾Ñ‚ ÑÐµÑ€Ð²ÐµÑ€Ð° Ñ‚ÐµÑ€Ð¼Ð¸Ð½Ð°Ð»Ð¾Ð²"
 
 #: personal/samba/class_sambaAccount.inc:241
 msgid "Connect client drives at logon"
@@ -352,7 +416,7 @@ msgstr "ÐŸÐ¾Ð´ÐºÐ»ÑŽÑ‡Ð¸Ñ‚ÑŒ ÐºÐ»Ð¸ÐµÐ½Ñ‚ÑÐºÐ¸Ðµ ÑƒÑÑ‚Ñ€Ð¾Ð¹ÑÑ‚Ð²Ð° Ð¿Ñ€Ð¸ Ð²
 
 #: personal/samba/class_sambaAccount.inc:241
 msgid "Drive to connect after login"
-msgstr ""
+msgstr "Ð”Ð¸ÑÐº Ð¿Ð¾Ð´ÐºÐ»ÑŽÑ‡Ð°ÐµÐ¼Ñ‹Ð¹ Ð¿Ð¾ÑÐ»Ðµ Ð²Ñ…Ð¾Ð´Ð°"
 
 #: personal/samba/class_sambaAccount.inc:245
 msgid "Connect client printers at logon"
@@ -360,7 +424,7 @@ msgstr "ÐŸÐ¾Ð´ÐºÐ»ÑŽÑ‡Ð¸Ñ‚ÑŒ ÐºÐ»Ð¸ÐµÐ½Ñ‚ÑÐºÐ¸Ðµ Ð¿Ñ€Ð¸Ð½Ñ‚ÐµÑ€Ñ‹ Ð¿Ñ€Ð¸ Ð²Ñ…Ð¾
 
 #: personal/samba/class_sambaAccount.inc:245
 msgid "Printers to connect after login"
-msgstr ""
+msgstr "ÐŸÑ€Ð¸Ð½Ñ‚ÐµÑ€Ñ‹ Ð¿Ð¾Ð´ÐºÐ»ÑŽÑ‡Ð°ÐµÐ¼Ñ‹Ðµ Ð¿Ð¾ÑÐ»Ðµ Ð²Ñ…Ð¾Ð´Ð°"
 
 #: personal/samba/class_sambaAccount.inc:249
 msgid "Default to main client printer"
@@ -428,19 +492,19 @@ msgstr "ÐŸÐ°Ñ€Ð°Ð¼ÐµÑ‚Ñ€Ñ‹ Ð´Ð¾ÑÑ‚ÑƒÐ¿Ð°"
 
 #: personal/samba/class_sambaAccount.inc:285
 msgid "Enforce password change"
-msgstr ""
+msgstr "ÐŸÑ€Ð¸Ð½ÑƒÐ´Ð¸Ñ‚ÐµÐ»ÑŒÐ½Ð¾ Ð¸Ð·Ð¼ÐµÐ½Ð¸Ñ‚ÑŒ Ð¿Ð°Ñ€Ð¾Ð»ÑŒ Ð¿Ñ€Ð¸ ÑÐ»ÐµÐ´ÑƒÑŽÑ‰ÐµÐ¼ Ð²Ñ…Ð¾Ð´Ðµ."
 
 #: personal/samba/class_sambaAccount.inc:285
 msgid "Force the user to change his password"
-msgstr ""
+msgstr "Ð—Ð°ÑÑ‚Ð°Ð²Ð¸Ñ‚ÑŒ Ð¿Ð¾Ð»ÑŒÐ·Ð¾Ð²Ð°Ñ‚ÐµÐ»Ñ ÑÐ¼ÐµÐ½Ð¸Ñ‚ÑŒ ÑÐ²Ð¾Ð¹ Ð¿Ð°Ñ€Ð¾Ð»ÑŒ"
 
 #: personal/samba/class_sambaAccount.inc:290
 msgid "The password never expire"
-msgstr ""
+msgstr "Ð¡Ñ€Ð¾Ðº Ð´ÐµÐ¹ÑÑ‚Ð²Ð¸Ñ Ð¿Ð°Ñ€Ð¾Ð»Ñ Ð½Ðµ Ð¾Ð³Ñ€Ð°Ð½Ð¸Ñ‡ÐµÐ½"
 
 #: personal/samba/class_sambaAccount.inc:290
 msgid "The password will never expire"
-msgstr ""
+msgstr "Ð¡Ñ€Ð¾Ðº Ð´ÐµÐ¹ÑÑ‚Ð²Ð¸Ñ Ð¿Ð°Ñ€Ð¾Ð»Ñ Ð½Ðµ Ð¾Ð³Ñ€Ð°Ð½Ð¸Ñ‡ÐµÐ½"
 
 #: personal/samba/class_sambaAccount.inc:295
 msgid "Login from windows client requires no password"
@@ -448,43 +512,43 @@ msgstr "ÐÐµ ÑÐ¿Ñ€Ð°ÑˆÐ¸Ð²Ð°Ñ‚ÑŒ Ð¿Ð°Ñ€Ð¾Ð»ÑŒ Ð¿Ñ€Ð¸ Ð²Ñ…Ð¾Ð´Ðµ Ð² ÑÐ¸ÑÑ‚ÐµÐ¼
 
 #: personal/samba/class_sambaAccount.inc:295
 msgid "Login from a client without a password"
-msgstr ""
+msgstr "Ð Ð°Ð·Ñ€ÐµÑˆÐ¸Ñ‚ÑŒ Ð²Ñ…Ð¾Ð´ ÐºÐ»Ð¸ÐµÐ½Ñ‚Ñƒ Ð±ÐµÐ· Ð²Ð²Ð¾Ð´Ð° Ð¿Ð°Ñ€Ð¾Ð»Ñ"
 
 #: personal/samba/class_sambaAccount.inc:300
 msgid "Lock samba account"
-msgstr ""
+msgstr "ÐžÑ‚ÐºÐ»ÑŽÑ‡Ð¸Ñ‚ÑŒ Ð°ÐºÐºÐ°ÑƒÐ½Ñ‚ samba"
 
 #: personal/samba/class_sambaAccount.inc:300
 msgid "Lock the account"
-msgstr ""
+msgstr "Ð—Ð°Ð±Ð»Ð¾ÐºÐ¸Ñ€Ð¾Ð²Ð°Ñ‚ÑŒ ÑÑ‚Ð¾Ñ‚ Ð°ÐºÐºÐ°ÑƒÐ½Ñ‚"
 
 #: personal/samba/class_sambaAccount.inc:305
 msgid "Cannot change password"
-msgstr ""
+msgstr "Ð—Ð°Ð¿Ñ€ÐµÑ‚Ð¸Ñ‚ÑŒ Ð¸Ð·Ð¼ÐµÐ½ÐµÐ½Ð¸Ðµ Ð¿Ð°Ñ€Ð¾Ð»Ñ"
 
 #: personal/samba/class_sambaAccount.inc:305
 msgid "Not allowed to change password"
-msgstr ""
+msgstr "Ð—Ð°Ð¿Ñ€ÐµÑ‚Ð¸Ñ‚ÑŒ Ð¸Ð·Ð¼ÐµÐ½ÐµÐ½Ð¸Ðµ Ð¿Ð°Ñ€Ð¾Ð»Ñ"
 
 #: personal/samba/class_sambaAccount.inc:309
 msgid "Account expiration"
-msgstr ""
+msgstr "Ð¡Ñ€Ð¾Ðº Ð´ÐµÐ¹ÑÑ‚Ð²Ð¸Ñ Ð°ÐºÐºÐ°ÑƒÐ½Ñ‚Ð°"
 
 #: personal/samba/class_sambaAccount.inc:309
 msgid "When does the account expire"
-msgstr ""
+msgstr "ÐšÐ¾Ð³Ð´Ð° ÑÑ€Ð¾Ðº Ñ€Ð°Ð±Ð¾Ñ‚Ñ‹ ÑƒÑ‡ÐµÑ‚Ð½Ð¾Ð¹ Ð·Ð°Ð¿Ð¸ÑÐ¸ Ð¸ÑÑ‚ÐµÑ‡ÐµÑ‚"
 
 #: personal/samba/class_sambaAccount.inc:317
 msgid "Samba logon times"
-msgstr ""
+msgstr "Ð’Ñ€ÐµÐ¼Ñ Ð²Ñ…Ð¾Ð´Ð° Ð´Ð»Ñ Samba"
 
 #: personal/samba/class_sambaAccount.inc:317
 msgid "What is the allowed time to connect"
-msgstr ""
+msgstr "Ð’ ÐºÐ°ÐºÐ¾Ðµ Ð²Ñ€ÐµÐ¼Ñ Ñ€Ð°Ð·Ñ€ÐµÑˆÐµÐ½Ð¾ Ð¿Ð¾Ð´ÐºÐ»ÑŽÑ‡ÐµÐ½Ð¸Ðµ"
 
 #: personal/samba/class_sambaAccount.inc:318
 msgid "Edit settings"
-msgstr ""
+msgstr "Ð ÐµÐ´Ð°ÐºÑ‚Ð¸Ñ€Ð¾Ð²Ð°Ñ‚ÑŒ Ð½Ð°ÑÑ‚Ñ€Ð¾Ð¹ÐºÐ¸"
 
 #: personal/samba/class_sambaAccount.inc:332
 msgid "System trust"
@@ -500,7 +564,7 @@ msgstr "ÐŸÐ¾Ð»ÑŒÐ·Ð¾Ð²Ð°Ñ‚ÐµÐ»ÑŽ Ñ€Ð°Ð·Ñ€ÐµÑˆÐµÐ½Ð¾ Ð¿Ð¾Ð´ÐºÐ»ÑŽÑ‡Ð°Ñ‚ÑŒÑÑ Ñ‚
 
 #: personal/samba/class_sambaAccount.inc:454
 msgid "Home drive"
-msgstr ""
+msgstr "Ð”Ð¾Ð¼Ð°ÑˆÐ½Ð¸Ð¹ Ð´Ð¸ÑÐº"
 
 #: personal/samba/class_sambaAccount.inc:457
 msgid "Home path"
@@ -510,16 +574,7 @@ msgstr ""
 msgid "The windows user manager allows eight clients at maximum!"
 msgstr ""
 
-#: personal/samba/class_sambaAccount.inc:478
 #: personal/samba/class_sambaAccount.inc:501
-msgid "Warning"
-msgstr "ÐŸÑ€ÐµÐ´ÑƒÐ¿Ñ€ÐµÐ¶Ð´ÐµÐ½Ð¸Ðµ"
-
-#: personal/samba/class_sambaAccount.inc:478
-msgid "Undefined Samba SID detected. Please fix this problem manually!"
-msgstr ""
-
-#: personal/samba/class_sambaAccount.inc:502
 msgid ""
 "Cannot convert primary group to samba group: group cannot be identified!"
 msgstr ""
@@ -581,11 +636,3 @@ msgstr "Ð“ÐµÐ½ÐµÑ€Ð¸Ñ€Ð¾Ð²Ð°Ñ‚ÑŒ sambaLMPassword"
 #: config/samba/class_sambaPluginConfig.inc:72
 msgid "Needed to be compliant with Windows <= 98 or Samba < 3.2"
 msgstr ""
-
-#: personal/samba/sambaLogonHours.tpl.c:2
-msgid "Specify the hours this user is allowed to log in"
-msgstr ""
-
-#: personal/samba/sambaLogonHours.tpl.c:5
-msgid "Hour"
-msgstr ""
diff --git a/samba/locale/ru@petr1708/fusiondirectory.po b/samba/locale/ru@petr1708/fusiondirectory.po
index 7b6127bd01375a4cef457a436a6b3a48e2be508d..a993bb59ada6ddf759aa646c22dc02503522c8c3 100644
--- a/samba/locale/ru@petr1708/fusiondirectory.po
+++ b/samba/locale/ru@petr1708/fusiondirectory.po
@@ -5,17 +5,94 @@
 # Translators:
 msgid ""
 msgstr ""
-"Project-Id-Version: FusionDirectory-108\n"
+"Project-Id-Version: FusionDirectory-109\n"
 "Report-Msgid-Bugs-To: documentation@lists.fusiondirectory.org\n"
-"POT-Creation-Date: 2015-03-17 18:47+0100\n"
-"PO-Revision-Date: 2015-02-25 15:53+0000\n"
+"POT-Creation-Date: 2014-12-15 17:47+0100\n"
+"PO-Revision-Date: 2014-12-15 17:04+0000\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>\n"
-"Language-Team: Russian Petrine orthography (http://www.transifex.com/projects/p/FusionDirectory-108/language/ru@petr1708/)\n"
+"Language-Team: Russian Petrine orthography (http://www.transifex.com/projects/p/FusionDirectory-109/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=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);\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:135
+#: config/samba/class_sambaPluginConfig.inc:28
+msgid "Samba"
+msgstr ""
+
+#: admin/groups/samba/class_sambaGroup.inc:30
+msgid "Samba group settings"
+msgstr ""
+
+#: admin/groups/samba/class_sambaGroup.inc:42
+#: admin/groups/samba/class_sambaGroup.inc:45
+#: admin/systems/samba/class_winstationGeneric.inc:88
+#: personal/samba/class_sambaAccount.inc:176
+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:119
+msgid "Samba group"
+msgstr ""
+
+#: admin/groups/samba/class_sambaGroup.inc:60
+#: admin/groups/samba/class_sambaGroup.inc:119
+msgid "Domain admins"
+msgstr ""
+
+#: admin/groups/samba/class_sambaGroup.inc:60
+#: admin/groups/samba/class_sambaGroup.inc:119
+msgid "Domain users"
+msgstr ""
+
+#: admin/groups/samba/class_sambaGroup.inc:60
+#: admin/groups/samba/class_sambaGroup.inc:119
+msgid "Domain guests"
+msgstr ""
+
+#: admin/groups/samba/class_sambaGroup.inc:105
+msgid "Configuration error"
+msgstr ""
+
+#: admin/groups/samba/class_sambaGroup.inc:105
+msgid "Cannot find group SID in your configuration!"
+msgstr ""
+
+#: admin/groups/samba/class_sambaGroup.inc:119
+#, php-format
+msgid "Special group (%d)"
+msgstr ""
+
+#: admin/groups/samba/class_sambaGroup.inc:133
+#: personal/samba/class_sambaAccount.inc:478
+#: personal/samba/class_sambaAccount.inc:500
+msgid "Warning"
+msgstr ""
+
+#: admin/groups/samba/class_sambaGroup.inc:133
+#: personal/samba/class_sambaAccount.inc:478
+msgid "Undefined Samba SID detected. Please fix this problem manually!"
+msgstr ""
 
 #: admin/samba/class_sambaDomainManagement.inc:35
 msgid "Samba domains"
@@ -200,11 +277,6 @@ msgstr ""
 msgid "A short description of the winstation"
 msgstr ""
 
-#: admin/systems/samba/class_winstationGeneric.inc:88
-#: personal/samba/class_sambaAccount.inc:176
-msgid "Domain"
-msgstr ""
-
 #: admin/systems/samba/class_winstationGeneric.inc:88
 #: personal/samba/class_sambaAccount.inc:176
 msgid "Samba domain name"
@@ -235,11 +307,6 @@ msgstr ""
 msgid "Samba Munged Dial"
 msgstr ""
 
-#: personal/samba/class_sambaAccount.inc:135
-#: config/samba/class_sambaPluginConfig.inc:28
-msgid "Samba"
-msgstr ""
-
 #: personal/samba/class_sambaAccount.inc:136
 #: config/samba/class_sambaPluginConfig.inc:41
 msgid "Samba settings"
@@ -507,16 +574,7 @@ msgstr ""
 msgid "The windows user manager allows eight clients at maximum!"
 msgstr ""
 
-#: personal/samba/class_sambaAccount.inc:478
 #: personal/samba/class_sambaAccount.inc:501
-msgid "Warning"
-msgstr ""
-
-#: personal/samba/class_sambaAccount.inc:478
-msgid "Undefined Samba SID detected. Please fix this problem manually!"
-msgstr ""
-
-#: personal/samba/class_sambaAccount.inc:502
 msgid ""
 "Cannot convert primary group to samba group: group cannot be identified!"
 msgstr ""
@@ -578,11 +636,3 @@ msgstr ""
 #: config/samba/class_sambaPluginConfig.inc:72
 msgid "Needed to be compliant with Windows <= 98 or Samba < 3.2"
 msgstr ""
-
-#: personal/samba/sambaLogonHours.tpl.c:2
-msgid "Specify the hours this user is allowed to log in"
-msgstr ""
-
-#: personal/samba/sambaLogonHours.tpl.c:5
-msgid "Hour"
-msgstr ""
diff --git a/samba/locale/sv/fusiondirectory.po b/samba/locale/sv/fusiondirectory.po
index c881d0c028574cf6ff0f81830296854e484e0394..783665c425e283370f265390becd9dd89bd2570e 100644
--- a/samba/locale/sv/fusiondirectory.po
+++ b/samba/locale/sv/fusiondirectory.po
@@ -5,18 +5,95 @@
 # Translators:
 msgid ""
 msgstr ""
-"Project-Id-Version: FusionDirectory-108\n"
+"Project-Id-Version: FusionDirectory-109\n"
 "Report-Msgid-Bugs-To: documentation@lists.fusiondirectory.org\n"
-"POT-Creation-Date: 2015-03-17 18:47+0100\n"
-"PO-Revision-Date: 2015-02-25 16:02+0000\n"
+"POT-Creation-Date: 2014-12-15 17:47+0100\n"
+"PO-Revision-Date: 2015-03-31 11:41+0000\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>\n"
-"Language-Team: Swedish (http://www.transifex.com/projects/p/FusionDirectory-108/language/sv/)\n"
+"Language-Team: Swedish (http://www.transifex.com/projects/p/FusionDirectory-109/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/groups/samba/class_sambaGroup.inc:29
+#: personal/samba/class_sambaAccount.inc:135
+#: 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:88
+#: personal/samba/class_sambaAccount.inc:176
+msgid "Domain"
+msgstr "DomÃ¤n"
+
+#: 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-grupptyp"
+
+#: admin/groups/samba/class_sambaGroup.inc:60
+#: admin/groups/samba/class_sambaGroup.inc:119
+msgid "Samba group"
+msgstr "Samba-grupp"
+
+#: admin/groups/samba/class_sambaGroup.inc:60
+#: admin/groups/samba/class_sambaGroup.inc:119
+msgid "Domain admins"
+msgstr "DomÃ¤nadministratÃ¶rer"
+
+#: admin/groups/samba/class_sambaGroup.inc:60
+#: admin/groups/samba/class_sambaGroup.inc:119
+msgid "Domain users"
+msgstr "DomÃ¤nanvÃ¤ndare"
+
+#: admin/groups/samba/class_sambaGroup.inc:60
+#: admin/groups/samba/class_sambaGroup.inc:119
+msgid "Domain guests"
+msgstr "DomÃ¤ngÃ¤ster"
+
+#: admin/groups/samba/class_sambaGroup.inc:105
+msgid "Configuration error"
+msgstr "Konfigurationsfel"
+
+#: admin/groups/samba/class_sambaGroup.inc:105
+msgid "Cannot find group SID in your configuration!"
+msgstr "Kan inte hitta grupp-SID i konfigurationen"
+
+#: admin/groups/samba/class_sambaGroup.inc:119
+#, php-format
+msgid "Special group (%d)"
+msgstr "Specialgrupp (%d)"
+
+#: admin/groups/samba/class_sambaGroup.inc:133
+#: personal/samba/class_sambaAccount.inc:478
+#: personal/samba/class_sambaAccount.inc:500
+msgid "Warning"
+msgstr "Varning"
+
+#: admin/groups/samba/class_sambaGroup.inc:133
+#: personal/samba/class_sambaAccount.inc:478
+msgid "Undefined Samba SID detected. Please fix this problem manually!"
+msgstr ""
+
 #: admin/samba/class_sambaDomainManagement.inc:35
 msgid "Samba domains"
 msgstr ""
@@ -200,11 +277,6 @@ msgstr "Beskrivning"
 msgid "A short description of the winstation"
 msgstr ""
 
-#: admin/systems/samba/class_winstationGeneric.inc:88
-#: personal/samba/class_sambaAccount.inc:176
-msgid "Domain"
-msgstr "DomÃ¤n"
-
 #: admin/systems/samba/class_winstationGeneric.inc:88
 #: personal/samba/class_sambaAccount.inc:176
 msgid "Samba domain name"
@@ -235,11 +307,6 @@ msgstr ""
 msgid "Samba Munged Dial"
 msgstr ""
 
-#: personal/samba/class_sambaAccount.inc:135
-#: config/samba/class_sambaPluginConfig.inc:28
-msgid "Samba"
-msgstr "Samba"
-
 #: personal/samba/class_sambaAccount.inc:136
 #: config/samba/class_sambaPluginConfig.inc:41
 msgid "Samba settings"
@@ -507,16 +574,7 @@ msgstr ""
 msgid "The windows user manager allows eight clients at maximum!"
 msgstr ""
 
-#: personal/samba/class_sambaAccount.inc:478
 #: personal/samba/class_sambaAccount.inc:501
-msgid "Warning"
-msgstr "Varning"
-
-#: personal/samba/class_sambaAccount.inc:478
-msgid "Undefined Samba SID detected. Please fix this problem manually!"
-msgstr ""
-
-#: personal/samba/class_sambaAccount.inc:502
 msgid ""
 "Cannot convert primary group to samba group: group cannot be identified!"
 msgstr ""
@@ -578,11 +636,3 @@ msgstr ""
 #: config/samba/class_sambaPluginConfig.inc:72
 msgid "Needed to be compliant with Windows <= 98 or Samba < 3.2"
 msgstr ""
-
-#: personal/samba/sambaLogonHours.tpl.c:2
-msgid "Specify the hours this user is allowed to log in"
-msgstr ""
-
-#: personal/samba/sambaLogonHours.tpl.c:5
-msgid "Hour"
-msgstr ""
diff --git a/samba/locale/ug/fusiondirectory.po b/samba/locale/ug/fusiondirectory.po
index 5edaa829242029b7219959cc5dec3bd12f4ddb7f..a411be1168c418cc76dc4230f1c9011974dcc41e 100644
--- a/samba/locale/ug/fusiondirectory.po
+++ b/samba/locale/ug/fusiondirectory.po
@@ -5,18 +5,95 @@
 # Translators:
 msgid ""
 msgstr ""
-"Project-Id-Version: FusionDirectory-108\n"
+"Project-Id-Version: FusionDirectory-109\n"
 "Report-Msgid-Bugs-To: documentation@lists.fusiondirectory.org\n"
-"POT-Creation-Date: 2015-03-17 18:47+0100\n"
-"PO-Revision-Date: 2015-02-25 15:53+0000\n"
+"POT-Creation-Date: 2014-12-15 17:47+0100\n"
+"PO-Revision-Date: 2014-12-15 17:04+0000\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>\n"
-"Language-Team: Uighur (http://www.transifex.com/projects/p/FusionDirectory-108/language/ug/)\n"
+"Language-Team: Uighur (http://www.transifex.com/projects/p/FusionDirectory-109/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/groups/samba/class_sambaGroup.inc:29
+#: personal/samba/class_sambaAccount.inc:135
+#: config/samba/class_sambaPluginConfig.inc:28
+msgid "Samba"
+msgstr ""
+
+#: admin/groups/samba/class_sambaGroup.inc:30
+msgid "Samba group settings"
+msgstr ""
+
+#: admin/groups/samba/class_sambaGroup.inc:42
+#: admin/groups/samba/class_sambaGroup.inc:45
+#: admin/systems/samba/class_winstationGeneric.inc:88
+#: personal/samba/class_sambaAccount.inc:176
+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:119
+msgid "Samba group"
+msgstr ""
+
+#: admin/groups/samba/class_sambaGroup.inc:60
+#: admin/groups/samba/class_sambaGroup.inc:119
+msgid "Domain admins"
+msgstr ""
+
+#: admin/groups/samba/class_sambaGroup.inc:60
+#: admin/groups/samba/class_sambaGroup.inc:119
+msgid "Domain users"
+msgstr ""
+
+#: admin/groups/samba/class_sambaGroup.inc:60
+#: admin/groups/samba/class_sambaGroup.inc:119
+msgid "Domain guests"
+msgstr ""
+
+#: admin/groups/samba/class_sambaGroup.inc:105
+msgid "Configuration error"
+msgstr ""
+
+#: admin/groups/samba/class_sambaGroup.inc:105
+msgid "Cannot find group SID in your configuration!"
+msgstr ""
+
+#: admin/groups/samba/class_sambaGroup.inc:119
+#, php-format
+msgid "Special group (%d)"
+msgstr ""
+
+#: admin/groups/samba/class_sambaGroup.inc:133
+#: personal/samba/class_sambaAccount.inc:478
+#: personal/samba/class_sambaAccount.inc:500
+msgid "Warning"
+msgstr ""
+
+#: admin/groups/samba/class_sambaGroup.inc:133
+#: personal/samba/class_sambaAccount.inc:478
+msgid "Undefined Samba SID detected. Please fix this problem manually!"
+msgstr ""
+
 #: admin/samba/class_sambaDomainManagement.inc:35
 msgid "Samba domains"
 msgstr ""
@@ -200,11 +277,6 @@ msgstr ""
 msgid "A short description of the winstation"
 msgstr ""
 
-#: admin/systems/samba/class_winstationGeneric.inc:88
-#: personal/samba/class_sambaAccount.inc:176
-msgid "Domain"
-msgstr ""
-
 #: admin/systems/samba/class_winstationGeneric.inc:88
 #: personal/samba/class_sambaAccount.inc:176
 msgid "Samba domain name"
@@ -235,11 +307,6 @@ msgstr ""
 msgid "Samba Munged Dial"
 msgstr ""
 
-#: personal/samba/class_sambaAccount.inc:135
-#: config/samba/class_sambaPluginConfig.inc:28
-msgid "Samba"
-msgstr ""
-
 #: personal/samba/class_sambaAccount.inc:136
 #: config/samba/class_sambaPluginConfig.inc:41
 msgid "Samba settings"
@@ -507,16 +574,7 @@ msgstr ""
 msgid "The windows user manager allows eight clients at maximum!"
 msgstr ""
 
-#: personal/samba/class_sambaAccount.inc:478
 #: personal/samba/class_sambaAccount.inc:501
-msgid "Warning"
-msgstr ""
-
-#: personal/samba/class_sambaAccount.inc:478
-msgid "Undefined Samba SID detected. Please fix this problem manually!"
-msgstr ""
-
-#: personal/samba/class_sambaAccount.inc:502
 msgid ""
 "Cannot convert primary group to samba group: group cannot be identified!"
 msgstr ""
@@ -578,11 +636,3 @@ msgstr ""
 #: config/samba/class_sambaPluginConfig.inc:72
 msgid "Needed to be compliant with Windows <= 98 or Samba < 3.2"
 msgstr ""
-
-#: personal/samba/sambaLogonHours.tpl.c:2
-msgid "Specify the hours this user is allowed to log in"
-msgstr ""
-
-#: personal/samba/sambaLogonHours.tpl.c:5
-msgid "Hour"
-msgstr ""
diff --git a/samba/locale/vi_VN/fusiondirectory.po b/samba/locale/vi_VN/fusiondirectory.po
index 775697b62234bb0e37f4627589080ae425f3288e..b0d7417c482f806637d387e40fa0735bc601f218 100644
--- a/samba/locale/vi_VN/fusiondirectory.po
+++ b/samba/locale/vi_VN/fusiondirectory.po
@@ -5,18 +5,95 @@
 # Translators:
 msgid ""
 msgstr ""
-"Project-Id-Version: FusionDirectory-108\n"
+"Project-Id-Version: FusionDirectory-109\n"
 "Report-Msgid-Bugs-To: documentation@lists.fusiondirectory.org\n"
-"POT-Creation-Date: 2015-03-17 18:47+0100\n"
-"PO-Revision-Date: 2015-02-25 16:02+0000\n"
+"POT-Creation-Date: 2014-12-15 17:47+0100\n"
+"PO-Revision-Date: 2015-03-31 11:41+0000\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>\n"
-"Language-Team: Vietnamese (Viet Nam) (http://www.transifex.com/projects/p/FusionDirectory-108/language/vi_VN/)\n"
+"Language-Team: Vietnamese (Viet Nam) (http://www.transifex.com/projects/p/FusionDirectory-109/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/groups/samba/class_sambaGroup.inc:29
+#: personal/samba/class_sambaAccount.inc:135
+#: 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:88
+#: personal/samba/class_sambaAccount.inc:176
+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 "Loáº¡i nhÃ³m Samba"
+
+#: admin/groups/samba/class_sambaGroup.inc:60
+#: admin/groups/samba/class_sambaGroup.inc:119
+msgid "Samba group"
+msgstr "NhÃ³m Samba"
+
+#: admin/groups/samba/class_sambaGroup.inc:60
+#: admin/groups/samba/class_sambaGroup.inc:119
+msgid "Domain admins"
+msgstr "Admin miá»n"
+
+#: admin/groups/samba/class_sambaGroup.inc:60
+#: admin/groups/samba/class_sambaGroup.inc:119
+msgid "Domain users"
+msgstr "NgÆ°á»i dÃ¹ng miá»n"
+
+#: admin/groups/samba/class_sambaGroup.inc:60
+#: admin/groups/samba/class_sambaGroup.inc:119
+msgid "Domain guests"
+msgstr "KhÃ¡ch miá»n"
+
+#: admin/groups/samba/class_sambaGroup.inc:105
+msgid "Configuration error"
+msgstr "Lá»—i cáº¥u hÃ¬nh"
+
+#: admin/groups/samba/class_sambaGroup.inc:105
+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!"
+
+#: admin/groups/samba/class_sambaGroup.inc:119
+#, php-format
+msgid "Special group (%d)"
+msgstr "NhÃ³m Ä‘áº·c biá»‡t (%d)"
+
+#: admin/groups/samba/class_sambaGroup.inc:133
+#: personal/samba/class_sambaAccount.inc:478
+#: personal/samba/class_sambaAccount.inc:500
+msgid "Warning"
+msgstr "Cáº£nh bÃ¡o"
+
+#: admin/groups/samba/class_sambaGroup.inc:133
+#: personal/samba/class_sambaAccount.inc:478
+msgid "Undefined Samba SID detected. Please fix this problem manually!"
+msgstr ""
+
 #: admin/samba/class_sambaDomainManagement.inc:35
 msgid "Samba domains"
 msgstr ""
@@ -200,11 +277,6 @@ msgstr "MÃ´ táº£"
 msgid "A short description of the winstation"
 msgstr ""
 
-#: admin/systems/samba/class_winstationGeneric.inc:88
-#: personal/samba/class_sambaAccount.inc:176
-msgid "Domain"
-msgstr ""
-
 #: admin/systems/samba/class_winstationGeneric.inc:88
 #: personal/samba/class_sambaAccount.inc:176
 msgid "Samba domain name"
@@ -235,11 +307,6 @@ msgstr ""
 msgid "Samba Munged Dial"
 msgstr ""
 
-#: personal/samba/class_sambaAccount.inc:135
-#: config/samba/class_sambaPluginConfig.inc:28
-msgid "Samba"
-msgstr "Samba"
-
 #: personal/samba/class_sambaAccount.inc:136
 #: config/samba/class_sambaPluginConfig.inc:41
 msgid "Samba settings"
@@ -507,16 +574,7 @@ msgstr ""
 msgid "The windows user manager allows eight clients at maximum!"
 msgstr ""
 
-#: personal/samba/class_sambaAccount.inc:478
 #: personal/samba/class_sambaAccount.inc:501
-msgid "Warning"
-msgstr "Cáº£nh bÃ¡o"
-
-#: personal/samba/class_sambaAccount.inc:478
-msgid "Undefined Samba SID detected. Please fix this problem manually!"
-msgstr ""
-
-#: personal/samba/class_sambaAccount.inc:502
 msgid ""
 "Cannot convert primary group to samba group: group cannot be identified!"
 msgstr ""
@@ -578,11 +636,3 @@ msgstr ""
 #: config/samba/class_sambaPluginConfig.inc:72
 msgid "Needed to be compliant with Windows <= 98 or Samba < 3.2"
 msgstr ""
-
-#: personal/samba/sambaLogonHours.tpl.c:2
-msgid "Specify the hours this user is allowed to log in"
-msgstr ""
-
-#: personal/samba/sambaLogonHours.tpl.c:5
-msgid "Hour"
-msgstr ""
diff --git a/samba/locale/zh/fusiondirectory.po b/samba/locale/zh/fusiondirectory.po
index a595de26e00b4933563e61a27209df04207a2362..90533cfd64d05dde681721bf7426aafb3e6a4266 100644
--- a/samba/locale/zh/fusiondirectory.po
+++ b/samba/locale/zh/fusiondirectory.po
@@ -3,21 +3,97 @@
 # This file is distributed under the same license as the PACKAGE package.
 # 
 # Translators:
-#  Jiang Xin <worldhello.net@gmail.com>, 2007
 msgid ""
 msgstr ""
-"Project-Id-Version: FusionDirectory-108\n"
+"Project-Id-Version: FusionDirectory-109\n"
 "Report-Msgid-Bugs-To: documentation@lists.fusiondirectory.org\n"
-"POT-Creation-Date: 2015-03-17 18:47+0100\n"
-"PO-Revision-Date: 2015-02-25 16:12+0000\n"
+"POT-Creation-Date: 2014-12-15 17:47+0100\n"
+"PO-Revision-Date: 2015-02-25 16:04+0000\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>\n"
-"Language-Team: Chinese (http://www.transifex.com/projects/p/FusionDirectory-108/language/zh/)\n"
+"Language-Team: Chinese (http://www.transifex.com/projects/p/FusionDirectory-109/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/groups/samba/class_sambaGroup.inc:29
+#: personal/samba/class_sambaAccount.inc:135
+#: 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:88
+#: personal/samba/class_sambaAccount.inc:176
+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:119
+msgid "Samba group"
+msgstr "Samba ç»„"
+
+#: admin/groups/samba/class_sambaGroup.inc:60
+#: admin/groups/samba/class_sambaGroup.inc:119
+msgid "Domain admins"
+msgstr "åŸŸç®¡ç†å‘˜"
+
+#: admin/groups/samba/class_sambaGroup.inc:60
+#: admin/groups/samba/class_sambaGroup.inc:119
+msgid "Domain users"
+msgstr "åŸŸç”¨æˆ·"
+
+#: admin/groups/samba/class_sambaGroup.inc:60
+#: admin/groups/samba/class_sambaGroup.inc:119
+msgid "Domain guests"
+msgstr "åŸŸå guests"
+
+#: admin/groups/samba/class_sambaGroup.inc:105
+msgid "Configuration error"
+msgstr ""
+
+#: admin/groups/samba/class_sambaGroup.inc:105
+msgid "Cannot find group SID in your configuration!"
+msgstr ""
+
+#: admin/groups/samba/class_sambaGroup.inc:119
+#, php-format
+msgid "Special group (%d)"
+msgstr "ç‰¹æ®Šç»„ (%d)"
+
+#: admin/groups/samba/class_sambaGroup.inc:133
+#: personal/samba/class_sambaAccount.inc:478
+#: personal/samba/class_sambaAccount.inc:500
+msgid "Warning"
+msgstr "è¦å‘Š"
+
+#: admin/groups/samba/class_sambaGroup.inc:133
+#: personal/samba/class_sambaAccount.inc:478
+msgid "Undefined Samba SID detected. Please fix this problem manually!"
+msgstr ""
+
 #: admin/samba/class_sambaDomainManagement.inc:35
 msgid "Samba domains"
 msgstr ""
@@ -201,11 +277,6 @@ msgstr "æè¿°"
 msgid "A short description of the winstation"
 msgstr ""
 
-#: admin/systems/samba/class_winstationGeneric.inc:88
-#: personal/samba/class_sambaAccount.inc:176
-msgid "Domain"
-msgstr "åŸŸ"
-
 #: admin/systems/samba/class_winstationGeneric.inc:88
 #: personal/samba/class_sambaAccount.inc:176
 msgid "Samba domain name"
@@ -236,11 +307,6 @@ msgstr ""
 msgid "Samba Munged Dial"
 msgstr ""
 
-#: personal/samba/class_sambaAccount.inc:135
-#: config/samba/class_sambaPluginConfig.inc:28
-msgid "Samba"
-msgstr "Samba"
-
 #: personal/samba/class_sambaAccount.inc:136
 #: config/samba/class_sambaPluginConfig.inc:41
 msgid "Samba settings"
@@ -508,16 +574,7 @@ msgstr ""
 msgid "The windows user manager allows eight clients at maximum!"
 msgstr ""
 
-#: personal/samba/class_sambaAccount.inc:478
 #: personal/samba/class_sambaAccount.inc:501
-msgid "Warning"
-msgstr "è¦å‘Š"
-
-#: personal/samba/class_sambaAccount.inc:478
-msgid "Undefined Samba SID detected. Please fix this problem manually!"
-msgstr ""
-
-#: personal/samba/class_sambaAccount.inc:502
 msgid ""
 "Cannot convert primary group to samba group: group cannot be identified!"
 msgstr ""
@@ -579,11 +636,3 @@ msgstr ""
 #: config/samba/class_sambaPluginConfig.inc:72
 msgid "Needed to be compliant with Windows <= 98 or Samba < 3.2"
 msgstr ""
-
-#: personal/samba/sambaLogonHours.tpl.c:2
-msgid "Specify the hours this user is allowed to log in"
-msgstr "æŒ‡å®šç”¨æˆ·å…è®¸ç™»å½•å‡ ä¸ªå°æ—¶"
-
-#: personal/samba/sambaLogonHours.tpl.c:5
-msgid "Hour"
-msgstr "å°æ—¶"
diff --git a/sogo/locale/ar/fusiondirectory.po b/sogo/locale/ar/fusiondirectory.po
index 5484b87a8058ef838e1c466e9e5ef93a3e0b4e1e..ea6e421c19d5dcaf6de22979656032610cdb1e1f 100644
--- a/sogo/locale/ar/fusiondirectory.po
+++ b/sogo/locale/ar/fusiondirectory.po
@@ -5,12 +5,12 @@
 # Translators:
 msgid ""
 msgstr ""
-"Project-Id-Version: FusionDirectory-108\n"
+"Project-Id-Version: FusionDirectory-109\n"
 "Report-Msgid-Bugs-To: documentation@lists.fusiondirectory.org\n"
-"POT-Creation-Date: 2015-03-17 18:47+0100\n"
-"PO-Revision-Date: 2014-12-16 21:10+0000\n"
+"POT-Creation-Date: 2014-12-15 17:47+0100\n"
+"PO-Revision-Date: 2014-12-15 17:04+0000\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>\n"
-"Language-Team: Arabic (http://www.transifex.com/projects/p/FusionDirectory-108/language/ar/)\n"
+"Language-Team: Arabic (http://www.transifex.com/projects/p/FusionDirectory-109/language/ar/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
diff --git a/sogo/locale/ca/fusiondirectory.po b/sogo/locale/ca/fusiondirectory.po
index fd87157de5bae0c3f48841633fca8ba1d5dbbeff..1574bbb79f4a7848d4c09c63466fd477b7b1d7fb 100644
--- a/sogo/locale/ca/fusiondirectory.po
+++ b/sogo/locale/ca/fusiondirectory.po
@@ -5,12 +5,12 @@
 # Translators:
 msgid ""
 msgstr ""
-"Project-Id-Version: FusionDirectory-108\n"
+"Project-Id-Version: FusionDirectory-109\n"
 "Report-Msgid-Bugs-To: documentation@lists.fusiondirectory.org\n"
-"POT-Creation-Date: 2015-03-17 18:47+0100\n"
-"PO-Revision-Date: 2014-12-16 21:10+0000\n"
+"POT-Creation-Date: 2014-12-15 17:47+0100\n"
+"PO-Revision-Date: 2014-12-15 17:04+0000\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>\n"
-"Language-Team: Catalan (http://www.transifex.com/projects/p/FusionDirectory-108/language/ca/)\n"
+"Language-Team: Catalan (http://www.transifex.com/projects/p/FusionDirectory-109/language/ca/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
diff --git a/sogo/locale/cs_CZ/fusiondirectory.po b/sogo/locale/cs_CZ/fusiondirectory.po
index 25e7b5182a907fb90377af98c2dbd2df11ec5e94..3a10dbfaa9e7c807fcd2bf8b02f7e63c4579b6a5 100644
--- a/sogo/locale/cs_CZ/fusiondirectory.po
+++ b/sogo/locale/cs_CZ/fusiondirectory.po
@@ -3,14 +3,15 @@
 # This file is distributed under the same license as the PACKAGE package.
 # 
 # Translators:
+# Pavel Borecki <pavel.borecki@gmail.com>, 2014-2015
 msgid ""
 msgstr ""
-"Project-Id-Version: FusionDirectory-108\n"
+"Project-Id-Version: FusionDirectory-109\n"
 "Report-Msgid-Bugs-To: documentation@lists.fusiondirectory.org\n"
-"POT-Creation-Date: 2015-03-17 18:47+0100\n"
-"PO-Revision-Date: 2014-12-16 21:10+0000\n"
-"Last-Translator: fusiondirectory <contact@fusiondirectory.org>\n"
-"Language-Team: Czech (Czech Republic) (http://www.transifex.com/projects/p/FusionDirectory-108/language/cs_CZ/)\n"
+"POT-Creation-Date: 2014-12-15 17:47+0100\n"
+"PO-Revision-Date: 2015-04-03 14:47+0000\n"
+"Last-Translator: Pavel Borecki <pavel.borecki@gmail.com>\n"
+"Language-Team: Czech (Czech Republic) (http://www.transifex.com/projects/p/FusionDirectory-109/language/cs_CZ/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -20,7 +21,7 @@ msgstr ""
 #: admin/sogo/class_sogoResource.inc:31 admin/sogo/class_sogoResource.inc:32
 #: admin/sogo/class_sogoResource.inc:35 admin/sogo/class_sogoResource.inc:52
 msgid "SOGo resource"
-msgstr ""
+msgstr "SOGo zdroj"
 
 #: admin/sogo/class_sogoResource.inc:56
 msgid "Entry name"
@@ -32,11 +33,11 @@ msgstr "NÃ¡zev ÃºÄtu"
 
 #: admin/sogo/class_sogoResource.inc:60
 msgid "Mail"
-msgstr "e-mail"
+msgstr "E-mail"
 
 #: admin/sogo/class_sogoResource.inc:66
 msgid "description"
-msgstr "popis"
+msgstr "Popis"
 
 #: admin/sogo/class_sogoResource.inc:70
 msgid "Multiplebookings"
@@ -44,7 +45,7 @@ msgstr ""
 
 #: admin/sogo/class_sogoResource.inc:75
 msgid "Kind"
-msgstr ""
+msgstr "Druh"
 
 #: admin/sogo/class_sogoManagement.inc:34
 #: admin/sogo/class_sogoManagement.inc:39 config/sogo/class_sogoConfig.inc:42
@@ -53,7 +54,7 @@ msgstr ""
 
 #: admin/sogo/class_sogoManagement.inc:35
 msgid "SOGo management"
-msgstr ""
+msgstr "SprÃ¡va SOGo"
 
 #: config/sogo/class_sogoConfig.inc:28
 msgid "SOGo configuration"
@@ -61,12 +62,12 @@ msgstr "NastavenÃ SOGo"
 
 #: config/sogo/class_sogoConfig.inc:29
 msgid "FusionDirectory sogo plugin configuration"
-msgstr ""
+msgstr "NastavenÃ zÃ¡suvnÃ©ho modulu sogo pro FusionDirectory"
 
 #: config/sogo/class_sogoConfig.inc:45
 msgid "SOGo RDN"
-msgstr ""
+msgstr "RelativnÃ rozliÅ¡enÃ½ nÃ¡zev SOGo"
 
 #: config/sogo/class_sogoConfig.inc:45
 msgid "Branch in which SOGo objects will be stored"
-msgstr ""
+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 c49ee6f02e2498b86060676359256362eabd0d71..6e40dbebac29851defd988a9749c66ae34b88f29 100644
--- a/sogo/locale/de/fusiondirectory.po
+++ b/sogo/locale/de/fusiondirectory.po
@@ -3,14 +3,15 @@
 # This file is distributed under the same license as the PACKAGE package.
 # 
 # Translators:
+# Ettore Atalan <atalanttore@googlemail.com>, 2014
 msgid ""
 msgstr ""
-"Project-Id-Version: FusionDirectory-108\n"
+"Project-Id-Version: FusionDirectory-109\n"
 "Report-Msgid-Bugs-To: documentation@lists.fusiondirectory.org\n"
-"POT-Creation-Date: 2015-03-17 18:47+0100\n"
-"PO-Revision-Date: 2014-12-16 21:10+0000\n"
-"Last-Translator: fusiondirectory <contact@fusiondirectory.org>\n"
-"Language-Team: German (http://www.transifex.com/projects/p/FusionDirectory-108/language/de/)\n"
+"POT-Creation-Date: 2014-12-15 17:47+0100\n"
+"PO-Revision-Date: 2014-12-15 23:30+0000\n"
+"Last-Translator: Ettore Atalan <atalanttore@googlemail.com>\n"
+"Language-Team: German (http://www.transifex.com/projects/p/FusionDirectory-109/language/de/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
diff --git a/sogo/locale/el_GR/fusiondirectory.po b/sogo/locale/el_GR/fusiondirectory.po
new file mode 100644
index 0000000000000000000000000000000000000000..20a9c49a7ea3bc07156af76fbef4603c602a66ae
--- /dev/null
+++ b/sogo/locale/el_GR/fusiondirectory.po
@@ -0,0 +1,72 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR FusionDirectory Project
+# This file is distributed under the same license as the PACKAGE package.
+# 
+# Translators:
+msgid ""
+msgstr ""
+"Project-Id-Version: FusionDirectory-109\n"
+"Report-Msgid-Bugs-To: documentation@lists.fusiondirectory.org\n"
+"POT-Creation-Date: 2014-12-15 17:47+0100\n"
+"PO-Revision-Date: 2015-05-30 11:45+0000\n"
+"Last-Translator: Benoit Mortier <benoit.mortier@opensides.be>\n"
+"Language-Team: Greek (Greece) (http://www.transifex.com/projects/p/FusionDirectory-109/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/sogo/class_sogoResource.inc:31 admin/sogo/class_sogoResource.inc:32
+#: admin/sogo/class_sogoResource.inc:35 admin/sogo/class_sogoResource.inc:52
+msgid "SOGo resource"
+msgstr ""
+
+#: admin/sogo/class_sogoResource.inc:56
+msgid "Entry name"
+msgstr ""
+
+#: admin/sogo/class_sogoResource.inc:56
+msgid "Account name"
+msgstr ""
+
+#: admin/sogo/class_sogoResource.inc:60
+msgid "Mail"
+msgstr ""
+
+#: admin/sogo/class_sogoResource.inc:66
+msgid "description"
+msgstr ""
+
+#: admin/sogo/class_sogoResource.inc:70
+msgid "Multiplebookings"
+msgstr ""
+
+#: admin/sogo/class_sogoResource.inc:75
+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/en/fusiondirectory.po b/sogo/locale/en/fusiondirectory.po
index 7c9901162dd91bee476ed966061a44454ca97152..2be11aa6eb52062fc7c8f3eb3da5b784a368b95a 100644
--- a/sogo/locale/en/fusiondirectory.po
+++ b/sogo/locale/en/fusiondirectory.po
@@ -6,13 +6,13 @@
 #, fuzzy
 msgid ""
 msgstr ""
-"Project-Id-Version: PACKAGE VERSION\n"
-"Report-Msgid-Bugs-To: documentation@lists.fusiondirectory.org\n"
-"POT-Creation-Date: 2015-03-31 11:49+0200\n"
+"Project-Id-Version: FusionDirectory VERSION\n"
+"Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
+"POT-Creation-Date: 2015-05-30 15:30+0200\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
-"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
-"Language-Team: LANGUAGE <LL@li.org>\n"
-"Language: \n"
+"Last-Translator: FusionDirectory project <contact@fusiondirectory.org>\n"
+"Language-Team: English\n"
+"Language: en\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
diff --git a/sogo/locale/es/fusiondirectory.po b/sogo/locale/es/fusiondirectory.po
index 4f2c8658b28254975236cd70d4a6356045db0490..ed34351ceb9e4bd662bef44b286dfaed070c18a5 100644
--- a/sogo/locale/es/fusiondirectory.po
+++ b/sogo/locale/es/fusiondirectory.po
@@ -5,12 +5,12 @@
 # Translators:
 msgid ""
 msgstr ""
-"Project-Id-Version: FusionDirectory-108\n"
+"Project-Id-Version: FusionDirectory-109\n"
 "Report-Msgid-Bugs-To: documentation@lists.fusiondirectory.org\n"
-"POT-Creation-Date: 2015-03-17 18:47+0100\n"
-"PO-Revision-Date: 2014-12-16 21:10+0000\n"
+"POT-Creation-Date: 2014-12-15 17:47+0100\n"
+"PO-Revision-Date: 2014-12-15 17:04+0000\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>\n"
-"Language-Team: Spanish (http://www.transifex.com/projects/p/FusionDirectory-108/language/es/)\n"
+"Language-Team: Spanish (http://www.transifex.com/projects/p/FusionDirectory-109/language/es/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
diff --git a/sogo/locale/es_VE/fusiondirectory.po b/sogo/locale/es_VE/fusiondirectory.po
index 012f62561fe1f55cc5775948006a8ec7f7fda951..b68b255489f7b21a5ff1e52207c6c240e27a27c5 100644
--- a/sogo/locale/es_VE/fusiondirectory.po
+++ b/sogo/locale/es_VE/fusiondirectory.po
@@ -5,12 +5,12 @@
 # Translators:
 msgid ""
 msgstr ""
-"Project-Id-Version: FusionDirectory-108\n"
+"Project-Id-Version: FusionDirectory-109\n"
 "Report-Msgid-Bugs-To: documentation@lists.fusiondirectory.org\n"
-"POT-Creation-Date: 2015-03-17 18:47+0100\n"
-"PO-Revision-Date: 2014-12-16 21:10+0000\n"
+"POT-Creation-Date: 2014-12-15 17:47+0100\n"
+"PO-Revision-Date: 2014-12-15 17:04+0000\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>\n"
-"Language-Team: Spanish (Venezuela) (http://www.transifex.com/projects/p/FusionDirectory-108/language/es_VE/)\n"
+"Language-Team: Spanish (Venezuela) (http://www.transifex.com/projects/p/FusionDirectory-109/language/es_VE/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
diff --git a/sogo/locale/fa_IR/fusiondirectory.po b/sogo/locale/fa_IR/fusiondirectory.po
index e8346e9d008a365a8e3aa325bb96f7851aebd48d..06e32323393352201d6fedf16f29adac01acae92 100644
--- a/sogo/locale/fa_IR/fusiondirectory.po
+++ b/sogo/locale/fa_IR/fusiondirectory.po
@@ -5,12 +5,12 @@
 # Translators:
 msgid ""
 msgstr ""
-"Project-Id-Version: FusionDirectory-108\n"
+"Project-Id-Version: FusionDirectory-109\n"
 "Report-Msgid-Bugs-To: documentation@lists.fusiondirectory.org\n"
-"POT-Creation-Date: 2015-03-17 18:47+0100\n"
-"PO-Revision-Date: 2014-12-16 21:10+0000\n"
+"POT-Creation-Date: 2014-12-15 17:47+0100\n"
+"PO-Revision-Date: 2014-12-15 17:04+0000\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>\n"
-"Language-Team: Persian (Iran) (http://www.transifex.com/projects/p/FusionDirectory-108/language/fa_IR/)\n"
+"Language-Team: Persian (Iran) (http://www.transifex.com/projects/p/FusionDirectory-109/language/fa_IR/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
diff --git a/sogo/locale/fr/fusiondirectory.po b/sogo/locale/fr/fusiondirectory.po
index 4b2571cdca633f1586b77ea3d131bf9159df192d..b54a920cb08eb0f2bd6553effbe661562196ab9c 100644
--- a/sogo/locale/fr/fusiondirectory.po
+++ b/sogo/locale/fr/fusiondirectory.po
@@ -3,16 +3,15 @@
 # This file is distributed under the same license as the PACKAGE package.
 # 
 # Translators:
-# MCMic, 2014
-# MCMic, 2014
+# fusiondirectory <contact@fusiondirectory.org>, 2013
 msgid ""
 msgstr ""
-"Project-Id-Version: FusionDirectory-108\n"
+"Project-Id-Version: FusionDirectory-109\n"
 "Report-Msgid-Bugs-To: documentation@lists.fusiondirectory.org\n"
-"POT-Creation-Date: 2015-03-17 18:47+0100\n"
+"POT-Creation-Date: 2014-12-15 17:47+0100\n"
 "PO-Revision-Date: 2014-12-18 15:51+0000\n"
-"Last-Translator: MCMic\n"
-"Language-Team: French (http://www.transifex.com/projects/p/FusionDirectory-108/language/fr/)\n"
+"Last-Translator: fusiondirectory <contact@fusiondirectory.org>\n"
+"Language-Team: French (http://www.transifex.com/projects/p/FusionDirectory-109/language/fr/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -34,7 +33,7 @@ msgstr "Nom du compte"
 
 #: admin/sogo/class_sogoResource.inc:60
 msgid "Mail"
-msgstr "Courriel"
+msgstr "Messagerie"
 
 #: admin/sogo/class_sogoResource.inc:66
 msgid "description"
@@ -67,7 +66,7 @@ msgstr "Configuration du plugin SOGo"
 
 #: config/sogo/class_sogoConfig.inc:45
 msgid "SOGo RDN"
-msgstr "Branche SOGo"
+msgstr "SOGo RDN"
 
 #: config/sogo/class_sogoConfig.inc:45
 msgid "Branch in which SOGo objects will be stored"
diff --git a/sogo/locale/id/fusiondirectory.po b/sogo/locale/id/fusiondirectory.po
index cdcd14b40459b2f8aaa7b4327f62fecf1e9ff038..6f18500573829dd29e2cc512d66469d13acd5b87 100644
--- a/sogo/locale/id/fusiondirectory.po
+++ b/sogo/locale/id/fusiondirectory.po
@@ -5,12 +5,12 @@
 # Translators:
 msgid ""
 msgstr ""
-"Project-Id-Version: FusionDirectory-108\n"
+"Project-Id-Version: FusionDirectory-109\n"
 "Report-Msgid-Bugs-To: documentation@lists.fusiondirectory.org\n"
-"POT-Creation-Date: 2015-03-17 18:47+0100\n"
-"PO-Revision-Date: 2014-12-16 21:10+0000\n"
+"POT-Creation-Date: 2014-12-15 17:47+0100\n"
+"PO-Revision-Date: 2014-12-15 17:04+0000\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>\n"
-"Language-Team: Indonesian (http://www.transifex.com/projects/p/FusionDirectory-108/language/id/)\n"
+"Language-Team: Indonesian (http://www.transifex.com/projects/p/FusionDirectory-109/language/id/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
diff --git a/sogo/locale/it/fusiondirectory.po b/sogo/locale/it/fusiondirectory.po
index f3da286faf7111e33a2eb56307a45cb99733d1a5..ed231ca61d38588ba796b1705af997a356140501 100644
--- a/sogo/locale/it/fusiondirectory.po
+++ b/sogo/locale/it/fusiondirectory.po
@@ -5,12 +5,12 @@
 # Translators:
 msgid ""
 msgstr ""
-"Project-Id-Version: FusionDirectory-108\n"
+"Project-Id-Version: FusionDirectory-109\n"
 "Report-Msgid-Bugs-To: documentation@lists.fusiondirectory.org\n"
-"POT-Creation-Date: 2015-03-17 18:47+0100\n"
-"PO-Revision-Date: 2014-12-16 21:10+0000\n"
+"POT-Creation-Date: 2014-12-15 17:47+0100\n"
+"PO-Revision-Date: 2014-12-15 17:04+0000\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>\n"
-"Language-Team: Italian (http://www.transifex.com/projects/p/FusionDirectory-108/language/it/)\n"
+"Language-Team: Italian (http://www.transifex.com/projects/p/FusionDirectory-109/language/it/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
diff --git a/sogo/locale/lv/fusiondirectory.po b/sogo/locale/lv/fusiondirectory.po
index 07a6a7b6e36e802018d1067487da176878f22753..c806152dcb0f7bed3166332a7aa1bebf86916cd1 100644
--- a/sogo/locale/lv/fusiondirectory.po
+++ b/sogo/locale/lv/fusiondirectory.po
@@ -5,12 +5,12 @@
 # Translators:
 msgid ""
 msgstr ""
-"Project-Id-Version: FusionDirectory-108\n"
+"Project-Id-Version: FusionDirectory-109\n"
 "Report-Msgid-Bugs-To: documentation@lists.fusiondirectory.org\n"
-"POT-Creation-Date: 2015-03-17 18:47+0100\n"
-"PO-Revision-Date: 2014-12-16 21:10+0000\n"
+"POT-Creation-Date: 2014-12-15 17:47+0100\n"
+"PO-Revision-Date: 2014-12-15 17:04+0000\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>\n"
-"Language-Team: Latvian (http://www.transifex.com/projects/p/FusionDirectory-108/language/lv/)\n"
+"Language-Team: Latvian (http://www.transifex.com/projects/p/FusionDirectory-109/language/lv/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
diff --git a/sogo/locale/nb/fusiondirectory.po b/sogo/locale/nb/fusiondirectory.po
index 5fb41b47d6790b663e6eb1272592d75961136709..04a96e8f969845f7bc9e5ba13bc4aec342594fbb 100644
--- a/sogo/locale/nb/fusiondirectory.po
+++ b/sogo/locale/nb/fusiondirectory.po
@@ -5,12 +5,12 @@
 # Translators:
 msgid ""
 msgstr ""
-"Project-Id-Version: FusionDirectory-108\n"
+"Project-Id-Version: FusionDirectory-109\n"
 "Report-Msgid-Bugs-To: documentation@lists.fusiondirectory.org\n"
-"POT-Creation-Date: 2015-03-17 18:47+0100\n"
-"PO-Revision-Date: 2014-12-16 21:10+0000\n"
+"POT-Creation-Date: 2014-12-15 17:47+0100\n"
+"PO-Revision-Date: 2014-12-15 17:04+0000\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>\n"
-"Language-Team: Norwegian BokmÃ¥l (http://www.transifex.com/projects/p/FusionDirectory-108/language/nb/)\n"
+"Language-Team: Norwegian BokmÃ¥l (http://www.transifex.com/projects/p/FusionDirectory-109/language/nb/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
diff --git a/sogo/locale/nl/fusiondirectory.po b/sogo/locale/nl/fusiondirectory.po
index 35845066597e9057e18afc0a2346557eb72f0fdf..8ef1d1cbb0ba58c72e1ff7a75a8e0e424530c0b9 100644
--- a/sogo/locale/nl/fusiondirectory.po
+++ b/sogo/locale/nl/fusiondirectory.po
@@ -5,12 +5,12 @@
 # Translators:
 msgid ""
 msgstr ""
-"Project-Id-Version: FusionDirectory-108\n"
+"Project-Id-Version: FusionDirectory-109\n"
 "Report-Msgid-Bugs-To: documentation@lists.fusiondirectory.org\n"
-"POT-Creation-Date: 2015-03-17 18:47+0100\n"
-"PO-Revision-Date: 2014-12-16 21:10+0000\n"
+"POT-Creation-Date: 2014-12-15 17:47+0100\n"
+"PO-Revision-Date: 2014-12-15 17:04+0000\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>\n"
-"Language-Team: Dutch (http://www.transifex.com/projects/p/FusionDirectory-108/language/nl/)\n"
+"Language-Team: Dutch (http://www.transifex.com/projects/p/FusionDirectory-109/language/nl/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
diff --git a/sogo/locale/pl/fusiondirectory.po b/sogo/locale/pl/fusiondirectory.po
index 9ea6d802b0509c91bb10430cf72e467ac8870967..09410e3dda5b26988b4ca45444b9f1343d4ef8b7 100644
--- a/sogo/locale/pl/fusiondirectory.po
+++ b/sogo/locale/pl/fusiondirectory.po
@@ -5,12 +5,12 @@
 # Translators:
 msgid ""
 msgstr ""
-"Project-Id-Version: FusionDirectory-108\n"
+"Project-Id-Version: FusionDirectory-109\n"
 "Report-Msgid-Bugs-To: documentation@lists.fusiondirectory.org\n"
-"POT-Creation-Date: 2015-03-17 18:47+0100\n"
-"PO-Revision-Date: 2014-12-16 21:10+0000\n"
+"POT-Creation-Date: 2014-12-15 17:47+0100\n"
+"PO-Revision-Date: 2014-12-15 17:04+0000\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>\n"
-"Language-Team: Polish (http://www.transifex.com/projects/p/FusionDirectory-108/language/pl/)\n"
+"Language-Team: Polish (http://www.transifex.com/projects/p/FusionDirectory-109/language/pl/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
diff --git a/sogo/locale/pt/fusiondirectory.po b/sogo/locale/pt/fusiondirectory.po
index 81b21bf032c277742a2f7b9d43aa934cacf93da4..e4f689e690339ad8cea4c23ebceacc378b6e19d2 100644
--- a/sogo/locale/pt/fusiondirectory.po
+++ b/sogo/locale/pt/fusiondirectory.po
@@ -5,12 +5,12 @@
 # Translators:
 msgid ""
 msgstr ""
-"Project-Id-Version: FusionDirectory-108\n"
+"Project-Id-Version: FusionDirectory-109\n"
 "Report-Msgid-Bugs-To: documentation@lists.fusiondirectory.org\n"
-"POT-Creation-Date: 2015-03-17 18:47+0100\n"
-"PO-Revision-Date: 2014-12-16 21:10+0000\n"
+"POT-Creation-Date: 2014-12-15 17:47+0100\n"
+"PO-Revision-Date: 2014-12-15 17:04+0000\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>\n"
-"Language-Team: Portuguese (http://www.transifex.com/projects/p/FusionDirectory-108/language/pt/)\n"
+"Language-Team: Portuguese (http://www.transifex.com/projects/p/FusionDirectory-109/language/pt/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
diff --git a/sogo/locale/pt_BR/fusiondirectory.po b/sogo/locale/pt_BR/fusiondirectory.po
index a2979c16ac22e50a75bfd0a60ac27a05f41aa402..d2048f9e714b25315655605f5baeffaf32b4474c 100644
--- a/sogo/locale/pt_BR/fusiondirectory.po
+++ b/sogo/locale/pt_BR/fusiondirectory.po
@@ -3,15 +3,14 @@
 # This file is distributed under the same license as the PACKAGE package.
 # 
 # Translators:
-# ALEJANDRO BARRIOS <alejandrobarrios@interlegis.leg.br>, 2014
 msgid ""
 msgstr ""
-"Project-Id-Version: FusionDirectory-108\n"
+"Project-Id-Version: FusionDirectory-109\n"
 "Report-Msgid-Bugs-To: documentation@lists.fusiondirectory.org\n"
-"POT-Creation-Date: 2015-03-17 18:47+0100\n"
-"PO-Revision-Date: 2014-12-16 21:10+0000\n"
+"POT-Creation-Date: 2014-12-15 17:47+0100\n"
+"PO-Revision-Date: 2014-12-15 17:04+0000\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>\n"
-"Language-Team: Portuguese (Brazil) (http://www.transifex.com/projects/p/FusionDirectory-108/language/pt_BR/)\n"
+"Language-Team: Portuguese (Brazil) (http://www.transifex.com/projects/p/FusionDirectory-109/language/pt_BR/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
diff --git a/sogo/locale/ru/fusiondirectory.po b/sogo/locale/ru/fusiondirectory.po
index 083ec1573de79f034813504aabb8fae3405e29eb..89a3ed2ee0cf703de73ba7baf21b8c81cf95b75a 100644
--- a/sogo/locale/ru/fusiondirectory.po
+++ b/sogo/locale/ru/fusiondirectory.po
@@ -5,17 +5,17 @@
 # Translators:
 msgid ""
 msgstr ""
-"Project-Id-Version: FusionDirectory-108\n"
+"Project-Id-Version: FusionDirectory-109\n"
 "Report-Msgid-Bugs-To: documentation@lists.fusiondirectory.org\n"
-"POT-Creation-Date: 2015-03-17 18:47+0100\n"
-"PO-Revision-Date: 2014-12-16 21:10+0000\n"
+"POT-Creation-Date: 2014-12-15 17:47+0100\n"
+"PO-Revision-Date: 2014-12-15 17:04+0000\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>\n"
-"Language-Team: Russian (http://www.transifex.com/projects/p/FusionDirectory-108/language/ru/)\n"
+"Language-Team: Russian (http://www.transifex.com/projects/p/FusionDirectory-109/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=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);\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/sogo/class_sogoResource.inc:31 admin/sogo/class_sogoResource.inc:32
 #: admin/sogo/class_sogoResource.inc:35 admin/sogo/class_sogoResource.inc:52
diff --git a/sogo/locale/ru@petr1708/fusiondirectory.po b/sogo/locale/ru@petr1708/fusiondirectory.po
index 813ab47222c4032ce209df873cdefd955b88111d..6c05ed8b0756a7e6704c04de967add7846cad2f4 100644
--- a/sogo/locale/ru@petr1708/fusiondirectory.po
+++ b/sogo/locale/ru@petr1708/fusiondirectory.po
@@ -5,17 +5,17 @@
 # Translators:
 msgid ""
 msgstr ""
-"Project-Id-Version: FusionDirectory-108\n"
+"Project-Id-Version: FusionDirectory-109\n"
 "Report-Msgid-Bugs-To: documentation@lists.fusiondirectory.org\n"
-"POT-Creation-Date: 2015-03-17 18:47+0100\n"
-"PO-Revision-Date: 2014-12-16 21:10+0000\n"
+"POT-Creation-Date: 2014-12-15 17:47+0100\n"
+"PO-Revision-Date: 2014-12-15 17:04+0000\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>\n"
-"Language-Team: Russian Petrine orthography (http://www.transifex.com/projects/p/FusionDirectory-108/language/ru@petr1708/)\n"
+"Language-Team: Russian Petrine orthography (http://www.transifex.com/projects/p/FusionDirectory-109/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=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);\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/sogo/class_sogoResource.inc:31 admin/sogo/class_sogoResource.inc:32
 #: admin/sogo/class_sogoResource.inc:35 admin/sogo/class_sogoResource.inc:52
diff --git a/sogo/locale/sv/fusiondirectory.po b/sogo/locale/sv/fusiondirectory.po
index dd46a95cbc0a8591b55189e3107c5061a8d0ea0a..97b0baa66fdce8f4fb2329609667118be6057e2a 100644
--- a/sogo/locale/sv/fusiondirectory.po
+++ b/sogo/locale/sv/fusiondirectory.po
@@ -5,12 +5,12 @@
 # Translators:
 msgid ""
 msgstr ""
-"Project-Id-Version: FusionDirectory-108\n"
+"Project-Id-Version: FusionDirectory-109\n"
 "Report-Msgid-Bugs-To: documentation@lists.fusiondirectory.org\n"
-"POT-Creation-Date: 2015-03-17 18:47+0100\n"
-"PO-Revision-Date: 2014-12-16 21:10+0000\n"
+"POT-Creation-Date: 2014-12-15 17:47+0100\n"
+"PO-Revision-Date: 2014-12-15 17:04+0000\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>\n"
-"Language-Team: Swedish (http://www.transifex.com/projects/p/FusionDirectory-108/language/sv/)\n"
+"Language-Team: Swedish (http://www.transifex.com/projects/p/FusionDirectory-109/language/sv/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
diff --git a/sogo/locale/ug/fusiondirectory.po b/sogo/locale/ug/fusiondirectory.po
index 9103f634df312706655ba35a330e19927ccdb17e..9da5e534246e05f9fb682b918d925aa142774e05 100644
--- a/sogo/locale/ug/fusiondirectory.po
+++ b/sogo/locale/ug/fusiondirectory.po
@@ -5,12 +5,12 @@
 # Translators:
 msgid ""
 msgstr ""
-"Project-Id-Version: FusionDirectory-108\n"
+"Project-Id-Version: FusionDirectory-109\n"
 "Report-Msgid-Bugs-To: documentation@lists.fusiondirectory.org\n"
-"POT-Creation-Date: 2015-03-17 18:47+0100\n"
-"PO-Revision-Date: 2014-12-16 21:10+0000\n"
+"POT-Creation-Date: 2014-12-15 17:47+0100\n"
+"PO-Revision-Date: 2014-12-15 17:04+0000\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>\n"
-"Language-Team: Uighur (http://www.transifex.com/projects/p/FusionDirectory-108/language/ug/)\n"
+"Language-Team: Uighur (http://www.transifex.com/projects/p/FusionDirectory-109/language/ug/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
diff --git a/sogo/locale/vi_VN/fusiondirectory.po b/sogo/locale/vi_VN/fusiondirectory.po
index 74ceaa1aed5e5f381e9d5abfff1a70e4992d6b3e..b2815272512e37fc6ff52e20ddf2a0bbd4ce6b7c 100644
--- a/sogo/locale/vi_VN/fusiondirectory.po
+++ b/sogo/locale/vi_VN/fusiondirectory.po
@@ -5,12 +5,12 @@
 # Translators:
 msgid ""
 msgstr ""
-"Project-Id-Version: FusionDirectory-108\n"
+"Project-Id-Version: FusionDirectory-109\n"
 "Report-Msgid-Bugs-To: documentation@lists.fusiondirectory.org\n"
-"POT-Creation-Date: 2015-03-17 18:47+0100\n"
-"PO-Revision-Date: 2014-12-16 21:10+0000\n"
+"POT-Creation-Date: 2014-12-15 17:47+0100\n"
+"PO-Revision-Date: 2014-12-15 17:04+0000\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>\n"
-"Language-Team: Vietnamese (Viet Nam) (http://www.transifex.com/projects/p/FusionDirectory-108/language/vi_VN/)\n"
+"Language-Team: Vietnamese (Viet Nam) (http://www.transifex.com/projects/p/FusionDirectory-109/language/vi_VN/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
diff --git a/sogo/locale/zh/fusiondirectory.po b/sogo/locale/zh/fusiondirectory.po
index cc9b6c5ba437d4ca904cede763304122305786bd..cc9ef210f61a3d3af1e8e0e377519bfeaa9836f9 100644
--- a/sogo/locale/zh/fusiondirectory.po
+++ b/sogo/locale/zh/fusiondirectory.po
@@ -5,12 +5,12 @@
 # Translators:
 msgid ""
 msgstr ""
-"Project-Id-Version: FusionDirectory-108\n"
+"Project-Id-Version: FusionDirectory-109\n"
 "Report-Msgid-Bugs-To: documentation@lists.fusiondirectory.org\n"
-"POT-Creation-Date: 2015-03-17 18:47+0100\n"
-"PO-Revision-Date: 2014-12-16 21:10+0000\n"
+"POT-Creation-Date: 2014-12-15 17:47+0100\n"
+"PO-Revision-Date: 2014-12-15 17:04+0000\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>\n"
-"Language-Team: Chinese (http://www.transifex.com/projects/p/FusionDirectory-108/language/zh/)\n"
+"Language-Team: Chinese (http://www.transifex.com/projects/p/FusionDirectory-109/language/zh/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
diff --git a/squid/locale/ar/fusiondirectory.po b/squid/locale/ar/fusiondirectory.po
index 9cba3f58926b0a1ac46a084d95109913ffede289..06ae51b41aea6cbd2d53b833c236eea356bfcad7 100644
--- a/squid/locale/ar/fusiondirectory.po
+++ b/squid/locale/ar/fusiondirectory.po
@@ -5,12 +5,12 @@
 # Translators:
 msgid ""
 msgstr ""
-"Project-Id-Version: FusionDirectory-108\n"
+"Project-Id-Version: FusionDirectory-109\n"
 "Report-Msgid-Bugs-To: documentation@lists.fusiondirectory.org\n"
-"POT-Creation-Date: 2015-03-17 18:47+0100\n"
-"PO-Revision-Date: 2014-08-28 10:47+0000\n"
-"Last-Translator: fusiondirectory <contact@fusiondirectory.org>\n"
-"Language-Team: Arabic (http://www.transifex.com/projects/p/FusionDirectory-108/language/ar/)\n"
+"POT-Creation-Date: 2014-12-15 17:47+0100\n"
+"PO-Revision-Date: 2014-08-28 10:29+0000\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: Arabic (http://www.transifex.com/projects/p/FusionDirectory-109/language/ar/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
diff --git a/squid/locale/ca/fusiondirectory.po b/squid/locale/ca/fusiondirectory.po
index bf3eb377e87b82bc71411f24fa510da089fabdcd..2369811ff73801a68b261da4e57f3c09dac016c5 100644
--- a/squid/locale/ca/fusiondirectory.po
+++ b/squid/locale/ca/fusiondirectory.po
@@ -5,12 +5,12 @@
 # Translators:
 msgid ""
 msgstr ""
-"Project-Id-Version: FusionDirectory-108\n"
+"Project-Id-Version: FusionDirectory-109\n"
 "Report-Msgid-Bugs-To: documentation@lists.fusiondirectory.org\n"
-"POT-Creation-Date: 2015-03-17 18:47+0100\n"
-"PO-Revision-Date: 2014-08-28 10:47+0000\n"
-"Last-Translator: fusiondirectory <contact@fusiondirectory.org>\n"
-"Language-Team: Catalan (http://www.transifex.com/projects/p/FusionDirectory-108/language/ca/)\n"
+"POT-Creation-Date: 2014-12-15 17:47+0100\n"
+"PO-Revision-Date: 2014-08-28 10:29+0000\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: Catalan (http://www.transifex.com/projects/p/FusionDirectory-109/language/ca/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
diff --git a/squid/locale/cs_CZ/fusiondirectory.po b/squid/locale/cs_CZ/fusiondirectory.po
index 4c05ca4d32e6855994a83e78a943dd8d76386d0e..f8a955f44fa7bd99d8f2fe4dbe6b64596ab7b0ba 100644
--- a/squid/locale/cs_CZ/fusiondirectory.po
+++ b/squid/locale/cs_CZ/fusiondirectory.po
@@ -3,17 +3,15 @@
 # This file is distributed under the same license as the PACKAGE package.
 # 
 # Translators:
-# Pavel Borecki <pavel.borecki@gmail.com>, 2012
-# Pavel Borecki <pavel.borecki@gmail.com>, 2012
-# Pavel Borecki <pavel.borecki@gmail.com>, 2012
+# Pavel Borecki <pavel.borecki@gmail.com>, 2015
 msgid ""
 msgstr ""
-"Project-Id-Version: FusionDirectory-108\n"
+"Project-Id-Version: FusionDirectory-109\n"
 "Report-Msgid-Bugs-To: documentation@lists.fusiondirectory.org\n"
-"POT-Creation-Date: 2015-03-17 18:47+0100\n"
-"PO-Revision-Date: 2015-02-25 16:02+0000\n"
-"Last-Translator: fusiondirectory <contact@fusiondirectory.org>\n"
-"Language-Team: Czech (Czech Republic) (http://www.transifex.com/projects/p/FusionDirectory-108/language/cs_CZ/)\n"
+"POT-Creation-Date: 2014-12-15 17:47+0100\n"
+"PO-Revision-Date: 2015-04-04 08:51+0000\n"
+"Last-Translator: Pavel Borecki <pavel.borecki@gmail.com>\n"
+"Language-Team: Czech (Czech Republic) (http://www.transifex.com/projects/p/FusionDirectory-109/language/cs_CZ/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -22,19 +20,19 @@ msgstr ""
 
 #: personal/squid/class_proxyAccount.inc:65
 msgid "Proxy"
-msgstr "proxy"
+msgstr ""
 
 #: personal/squid/class_proxyAccount.inc:66
 msgid "This allow to store basic squid settings in ldap for each user"
-msgstr ""
+msgstr "Toto umoÅ¾Åˆuje uchovÃ¡vat v ldap zÃ¡kladnÃ nastavenÃ pro squid pro kaÅ¾dÃ©ho z uÅ¾ivatelÅ¯"
 
 #: personal/squid/class_proxyAccount.inc:84
 msgid "Proxy account"
-msgstr "ÃºÄet proxy"
+msgstr "ÃšÄet proxy"
 
 #: personal/squid/class_proxyAccount.inc:90
 msgid "Filter unwanted content (i.e. pornographic or violence related)"
-msgstr "nepropouÅ¡tÄ›t neÅ¾Ã¡doucÃ obsah (tj. pornografii Äi nÃ¡silÃ)"
+msgstr "NepropouÅ¡tÄ›t neÅ¾Ã¡doucÃ obsah (tj. pornografii Äi nÃ¡silÃ)"
 
 #: personal/squid/class_proxyAccount.inc:91
 msgid "filterF"
@@ -42,7 +40,7 @@ msgstr ""
 
 #: personal/squid/class_proxyAccount.inc:97
 msgid "Working Start"
-msgstr ""
+msgstr "ZaÄÃ¡tek provoznÃ doby"
 
 #: personal/squid/class_proxyAccount.inc:100
 #: personal/squid/class_proxyAccount.inc:112
@@ -55,11 +53,11 @@ msgstr ""
 
 #: personal/squid/class_proxyAccount.inc:106
 msgid "Limit proxy access to working time"
-msgstr "Povol pÅ™Ãstup k proxy jen v pracovnÃ dobu."
+msgstr "Omezit pÅ™Ãstup k proxy jen na pracovnÃ dobu."
 
 #: personal/squid/class_proxyAccount.inc:109
 msgid "Working Stop"
-msgstr ""
+msgstr "Konec provoznÃ doby"
 
 #: personal/squid/class_proxyAccount.inc:112
 msgid "-"
@@ -76,11 +74,11 @@ msgstr ""
 #: personal/squid/class_proxyAccount.inc:119
 #: personal/squid/class_proxyAccount.inc:128
 msgid "Restrict proxy usage by quota"
-msgstr "omez vyuÅ¾ÃvÃ¡nÃ proxy pomocÃ kvÃ³t"
+msgstr "Stanovit kvÃ³tu na vyuÅ¾ÃvÃ¡nÃ proxy"
 
 #: personal/squid/class_proxyAccount.inc:122
 msgid "Up"
-msgstr "nahoru"
+msgstr "Nahoru"
 
 #: personal/squid/class_proxyAccount.inc:131
 #: personal/squid/class_proxyAccount.inc:132
@@ -105,16 +103,16 @@ msgstr "mÄ›sÃc"
 
 #: personal/squid/class_proxyAccount.inc:138
 msgid "Start Working Hours"
-msgstr ""
+msgstr "ZaÄÃ¡tek provoznÃ doby"
 
 #: personal/squid/class_proxyAccount.inc:139
 msgid "Starting hours for internet access"
-msgstr ""
+msgstr "Od jakÃ© hodiny povolovat pÅ™Ãstup k Internetu"
 
 #: personal/squid/class_proxyAccount.inc:146
 msgid "Proxy Quota"
-msgstr ""
+msgstr "KvÃ³ta na proxy"
 
 #: personal/squid/class_proxyAccount.inc:147
 msgid "Max Data quota for the proxy"
-msgstr ""
+msgstr "KvÃ³ta dat pro proxy"
diff --git a/squid/locale/de/fusiondirectory.po b/squid/locale/de/fusiondirectory.po
index 0fc6db60f3b53c91fb8ba9a8a1b29692e14d57f2..7601655dcf25b6aa9fa2eb68646bc77a07c21326 100644
--- a/squid/locale/de/fusiondirectory.po
+++ b/squid/locale/de/fusiondirectory.po
@@ -3,16 +3,14 @@
 # This file is distributed under the same license as the PACKAGE package.
 # 
 # Translators:
-# Maik Wagner <maikwagner@yahoo.com>, 2014
-#  Stefan Koehler <stefan.koehler@GONICUS.de>, 2005
 msgid ""
 msgstr ""
-"Project-Id-Version: FusionDirectory-108\n"
+"Project-Id-Version: FusionDirectory-109\n"
 "Report-Msgid-Bugs-To: documentation@lists.fusiondirectory.org\n"
-"POT-Creation-Date: 2015-03-17 18:47+0100\n"
-"PO-Revision-Date: 2015-02-25 16:02+0000\n"
-"Last-Translator: fusiondirectory <contact@fusiondirectory.org>\n"
-"Language-Team: German (http://www.transifex.com/projects/p/FusionDirectory-108/language/de/)\n"
+"POT-Creation-Date: 2014-12-15 17:47+0100\n"
+"PO-Revision-Date: 2014-08-28 10:29+0000\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: German (http://www.transifex.com/projects/p/FusionDirectory-109/language/de/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
diff --git a/squid/locale/el_GR/fusiondirectory.po b/squid/locale/el_GR/fusiondirectory.po
new file mode 100644
index 0000000000000000000000000000000000000000..94fe6f07de3e28e75a3a9d840f28cf41ad28041b
--- /dev/null
+++ b/squid/locale/el_GR/fusiondirectory.po
@@ -0,0 +1,117 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR FusionDirectory Project
+# This file is distributed under the same license as the PACKAGE package.
+# 
+# Translators:
+msgid ""
+msgstr ""
+"Project-Id-Version: FusionDirectory-109\n"
+"Report-Msgid-Bugs-To: documentation@lists.fusiondirectory.org\n"
+"POT-Creation-Date: 2014-12-15 17:47+0100\n"
+"PO-Revision-Date: 2015-05-30 11:45+0000\n"
+"Last-Translator: Benoit Mortier <benoit.mortier@opensides.be>\n"
+"Language-Team: Greek (Greece) (http://www.transifex.com/projects/p/FusionDirectory-109/language/el_GR/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: el_GR\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
+
+#: personal/squid/class_proxyAccount.inc:65
+msgid "Proxy"
+msgstr ""
+
+#: personal/squid/class_proxyAccount.inc:66
+msgid "This allow to store basic squid settings in ldap for each user"
+msgstr ""
+
+#: personal/squid/class_proxyAccount.inc:84
+msgid "Proxy account"
+msgstr ""
+
+#: personal/squid/class_proxyAccount.inc:90
+msgid "Filter unwanted content (i.e. pornographic or violence related)"
+msgstr ""
+
+#: personal/squid/class_proxyAccount.inc:91
+msgid "filterF"
+msgstr ""
+
+#: personal/squid/class_proxyAccount.inc:97
+msgid "Working Start"
+msgstr ""
+
+#: personal/squid/class_proxyAccount.inc:100
+#: personal/squid/class_proxyAccount.inc:112
+msgid "HourStart"
+msgstr ""
+
+#: personal/squid/class_proxyAccount.inc:101
+msgid "MinuteStart"
+msgstr ""
+
+#: personal/squid/class_proxyAccount.inc:106
+msgid "Limit proxy access to working time"
+msgstr ""
+
+#: personal/squid/class_proxyAccount.inc:109
+msgid "Working Stop"
+msgstr ""
+
+#: personal/squid/class_proxyAccount.inc:112
+msgid "-"
+msgstr ""
+
+#: personal/squid/class_proxyAccount.inc:113
+msgid ":"
+msgstr ""
+
+#: personal/squid/class_proxyAccount.inc:113
+msgid "MinuteStop"
+msgstr ""
+
+#: personal/squid/class_proxyAccount.inc:119
+#: personal/squid/class_proxyAccount.inc:128
+msgid "Restrict proxy usage by quota"
+msgstr ""
+
+#: personal/squid/class_proxyAccount.inc:122
+msgid "Up"
+msgstr ""
+
+#: personal/squid/class_proxyAccount.inc:131
+#: personal/squid/class_proxyAccount.inc:132
+msgid "per"
+msgstr ""
+
+#: personal/squid/class_proxyAccount.inc:135
+msgid "hour"
+msgstr ""
+
+#: personal/squid/class_proxyAccount.inc:135
+msgid "day"
+msgstr ""
+
+#: personal/squid/class_proxyAccount.inc:135
+msgid "week"
+msgstr ""
+
+#: personal/squid/class_proxyAccount.inc:135
+msgid "month"
+msgstr ""
+
+#: personal/squid/class_proxyAccount.inc:138
+msgid "Start Working Hours"
+msgstr ""
+
+#: personal/squid/class_proxyAccount.inc:139
+msgid "Starting hours for internet access"
+msgstr ""
+
+#: personal/squid/class_proxyAccount.inc:146
+msgid "Proxy Quota"
+msgstr ""
+
+#: personal/squid/class_proxyAccount.inc:147
+msgid "Max Data quota for the proxy"
+msgstr ""
diff --git a/squid/locale/en/fusiondirectory.po b/squid/locale/en/fusiondirectory.po
index 53135191f08cab74c52a35cd1b69a40a623ab073..3f7b564107c9e5f5a86f980d7fa55d3a9bc86807 100644
--- a/squid/locale/en/fusiondirectory.po
+++ b/squid/locale/en/fusiondirectory.po
@@ -6,13 +6,13 @@
 #, fuzzy
 msgid ""
 msgstr ""
-"Project-Id-Version: PACKAGE VERSION\n"
-"Report-Msgid-Bugs-To: documentation@lists.fusiondirectory.org\n"
-"POT-Creation-Date: 2015-03-31 11:49+0200\n"
+"Project-Id-Version: FusionDirectory VERSION\n"
+"Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
+"POT-Creation-Date: 2015-05-30 15:30+0200\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
-"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
-"Language-Team: LANGUAGE <LL@li.org>\n"
-"Language: \n"
+"Last-Translator: FusionDirectory project <contact@fusiondirectory.org>\n"
+"Language-Team: English\n"
+"Language: en\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
diff --git a/squid/locale/es/fusiondirectory.po b/squid/locale/es/fusiondirectory.po
index fc9e9ba706d9c02e59c36109a95485c7fad9ea91..86c627de0b4585c652aaed1b6e03a532569863a8 100644
--- a/squid/locale/es/fusiondirectory.po
+++ b/squid/locale/es/fusiondirectory.po
@@ -3,16 +3,14 @@
 # This file is distributed under the same license as the PACKAGE package.
 # 
 # Translators:
-# lars_g <lars.gold@gmail.com>, 2012
-# lars_g <lars.gold@gmail.com>, 2012
 msgid ""
 msgstr ""
-"Project-Id-Version: FusionDirectory-108\n"
+"Project-Id-Version: FusionDirectory-109\n"
 "Report-Msgid-Bugs-To: documentation@lists.fusiondirectory.org\n"
-"POT-Creation-Date: 2015-03-17 18:47+0100\n"
-"PO-Revision-Date: 2015-02-25 16:02+0000\n"
-"Last-Translator: fusiondirectory <contact@fusiondirectory.org>\n"
-"Language-Team: Spanish (http://www.transifex.com/projects/p/FusionDirectory-108/language/es/)\n"
+"POT-Creation-Date: 2014-12-15 17:47+0100\n"
+"PO-Revision-Date: 2014-08-28 10:29+0000\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: Spanish (http://www.transifex.com/projects/p/FusionDirectory-109/language/es/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
diff --git a/squid/locale/es_VE/fusiondirectory.po b/squid/locale/es_VE/fusiondirectory.po
index 8888213372f141a9e15e2a14d802d1ffd3135f69..3ecdfbc6295d093cd3c97f24c69219662a3d65f4 100644
--- a/squid/locale/es_VE/fusiondirectory.po
+++ b/squid/locale/es_VE/fusiondirectory.po
@@ -3,16 +3,14 @@
 # This file is distributed under the same license as the PACKAGE package.
 # 
 # Translators:
-# lars_g <lars.gold@gmail.com>, 2012
-# lars_g <lars.gold@gmail.com>, 2012
 msgid ""
 msgstr ""
-"Project-Id-Version: FusionDirectory-108\n"
+"Project-Id-Version: FusionDirectory-109\n"
 "Report-Msgid-Bugs-To: documentation@lists.fusiondirectory.org\n"
-"POT-Creation-Date: 2015-03-17 18:47+0100\n"
-"PO-Revision-Date: 2015-02-25 16:02+0000\n"
-"Last-Translator: fusiondirectory <contact@fusiondirectory.org>\n"
-"Language-Team: Spanish (Venezuela) (http://www.transifex.com/projects/p/FusionDirectory-108/language/es_VE/)\n"
+"POT-Creation-Date: 2014-12-15 17:47+0100\n"
+"PO-Revision-Date: 2014-08-28 10:29+0000\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: Spanish (Venezuela) (http://www.transifex.com/projects/p/FusionDirectory-109/language/es_VE/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
diff --git a/squid/locale/fa_IR/fusiondirectory.po b/squid/locale/fa_IR/fusiondirectory.po
index 808129cf7e9cff46ed4e5ad48d6eb4b83273175c..458208318c5b2e1bd36a7c138356b669fde78826 100644
--- a/squid/locale/fa_IR/fusiondirectory.po
+++ b/squid/locale/fa_IR/fusiondirectory.po
@@ -5,12 +5,12 @@
 # Translators:
 msgid ""
 msgstr ""
-"Project-Id-Version: FusionDirectory-108\n"
+"Project-Id-Version: FusionDirectory-109\n"
 "Report-Msgid-Bugs-To: documentation@lists.fusiondirectory.org\n"
-"POT-Creation-Date: 2015-03-17 18:47+0100\n"
-"PO-Revision-Date: 2014-08-26 14:14+0000\n"
-"Last-Translator: fusiondirectory <contact@fusiondirectory.org>\n"
-"Language-Team: Persian (Iran) (http://www.transifex.com/projects/p/FusionDirectory-108/language/fa_IR/)\n"
+"POT-Creation-Date: 2014-12-15 17:47+0100\n"
+"PO-Revision-Date: 2014-08-28 10:29+0000\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: Persian (Iran) (http://www.transifex.com/projects/p/FusionDirectory-109/language/fa_IR/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
diff --git a/squid/locale/fr/fusiondirectory.po b/squid/locale/fr/fusiondirectory.po
index c9cee8a0f9de88920219b775f1fd4027294d0aa5..88ea11f486795e412d8cb38bc8442cce1bcaea2a 100644
--- a/squid/locale/fr/fusiondirectory.po
+++ b/squid/locale/fr/fusiondirectory.po
@@ -3,22 +3,14 @@
 # This file is distributed under the same license as the PACKAGE package.
 # 
 # Translators:
-# Benoit Mortier <benoit.mortier@opensides.be>, 2005-2008
-# MCMic, 2014
-# fusiondirectory <contact@fusiondirectory.org>, 2013
-# fusiondirectory <contact@fusiondirectory.org>, 2012
-# fusiondirectory <contact@fusiondirectory.org>, 2012-2013
-# poterealpopolo <giuliano@opensides.be>, 2013
-# MCMic, 2014
-# poterealpopolo <giuliano@opensides.be>, 2013
 msgid ""
 msgstr ""
-"Project-Id-Version: FusionDirectory-108\n"
+"Project-Id-Version: FusionDirectory-109\n"
 "Report-Msgid-Bugs-To: documentation@lists.fusiondirectory.org\n"
-"POT-Creation-Date: 2015-03-17 18:47+0100\n"
-"PO-Revision-Date: 2015-02-25 16:02+0000\n"
-"Last-Translator: MCMic\n"
-"Language-Team: French (http://www.transifex.com/projects/p/FusionDirectory-108/language/fr/)\n"
+"POT-Creation-Date: 2014-12-15 17:47+0100\n"
+"PO-Revision-Date: 2014-08-28 10:29+0000\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: French (http://www.transifex.com/projects/p/FusionDirectory-109/language/fr/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -31,7 +23,7 @@ msgstr "Proxy"
 
 #: personal/squid/class_proxyAccount.inc:66
 msgid "This allow to store basic squid settings in ldap for each user"
-msgstr "Permet de stocker les paramÃ¨tres squid dans lâ€™annuaire LDAP pour chaque utilisateur"
+msgstr "Cette extension stocke les paramÃ¨tres squid dans votre annuaire"
 
 #: personal/squid/class_proxyAccount.inc:84
 msgid "Proxy account"
@@ -85,7 +77,7 @@ msgstr "Restreindre la quantitÃ© de donnÃ©es tÃ©lÃ©chargeables par quota"
 
 #: personal/squid/class_proxyAccount.inc:122
 msgid "Up"
-msgstr "Haut"
+msgstr "Au dessus"
 
 #: personal/squid/class_proxyAccount.inc:131
 #: personal/squid/class_proxyAccount.inc:132
diff --git a/squid/locale/id/fusiondirectory.po b/squid/locale/id/fusiondirectory.po
index 998285ef10bf081baeebb3f257b2ef7beb26538b..4b7b3b5682397ac573ec4a482a220c105ec20d51 100644
--- a/squid/locale/id/fusiondirectory.po
+++ b/squid/locale/id/fusiondirectory.po
@@ -5,12 +5,12 @@
 # Translators:
 msgid ""
 msgstr ""
-"Project-Id-Version: FusionDirectory-108\n"
+"Project-Id-Version: FusionDirectory-109\n"
 "Report-Msgid-Bugs-To: documentation@lists.fusiondirectory.org\n"
-"POT-Creation-Date: 2015-03-17 18:47+0100\n"
-"PO-Revision-Date: 2014-08-26 14:14+0000\n"
-"Last-Translator: fusiondirectory <contact@fusiondirectory.org>\n"
-"Language-Team: Indonesian (http://www.transifex.com/projects/p/FusionDirectory-108/language/id/)\n"
+"POT-Creation-Date: 2014-12-15 17:47+0100\n"
+"PO-Revision-Date: 2014-08-28 10:29+0000\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: Indonesian (http://www.transifex.com/projects/p/FusionDirectory-109/language/id/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
diff --git a/squid/locale/it/fusiondirectory.po b/squid/locale/it/fusiondirectory.po
index 3ae8e3008c640ee8dd6ff1722b021cd0ab8ae54e..5b73922069c074de878e9d505360f74c8530e6f8 100644
--- a/squid/locale/it/fusiondirectory.po
+++ b/squid/locale/it/fusiondirectory.po
@@ -3,19 +3,14 @@
 # This file is distributed under the same license as the PACKAGE package.
 # 
 # Translators:
-# Alessandro Amici <a.amici@bopen.it>, 2005
-# poterealpopolo <giuliano@opensides.be>, 2011
-# poterealpopolo <giuliano@opensides.be>, 2013
-# poterealpopolo <giuliano@opensides.be>, 2012
-# poterealpopolo <giuliano@opensides.be>, 2011-2013
 msgid ""
 msgstr ""
-"Project-Id-Version: FusionDirectory-108\n"
+"Project-Id-Version: FusionDirectory-109\n"
 "Report-Msgid-Bugs-To: documentation@lists.fusiondirectory.org\n"
-"POT-Creation-Date: 2015-03-17 18:47+0100\n"
-"PO-Revision-Date: 2015-02-25 16:02+0000\n"
-"Last-Translator: fusiondirectory <contact@fusiondirectory.org>\n"
-"Language-Team: Italian (http://www.transifex.com/projects/p/FusionDirectory-108/language/it/)\n"
+"POT-Creation-Date: 2014-12-15 17:47+0100\n"
+"PO-Revision-Date: 2014-08-28 10:29+0000\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: Italian (http://www.transifex.com/projects/p/FusionDirectory-109/language/it/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
diff --git a/squid/locale/lv/fusiondirectory.po b/squid/locale/lv/fusiondirectory.po
index 759688c1979219e06e2903856130d71572592505..82739dbc02d6d6bfe2962a4111f5e2aa1b4a24e7 100644
--- a/squid/locale/lv/fusiondirectory.po
+++ b/squid/locale/lv/fusiondirectory.po
@@ -5,12 +5,12 @@
 # Translators:
 msgid ""
 msgstr ""
-"Project-Id-Version: FusionDirectory-108\n"
+"Project-Id-Version: FusionDirectory-109\n"
 "Report-Msgid-Bugs-To: documentation@lists.fusiondirectory.org\n"
-"POT-Creation-Date: 2015-03-17 18:47+0100\n"
-"PO-Revision-Date: 2014-08-26 14:14+0000\n"
-"Last-Translator: fusiondirectory <contact@fusiondirectory.org>\n"
-"Language-Team: Latvian (http://www.transifex.com/projects/p/FusionDirectory-108/language/lv/)\n"
+"POT-Creation-Date: 2014-12-15 17:47+0100\n"
+"PO-Revision-Date: 2014-08-28 10:29+0000\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: Latvian (http://www.transifex.com/projects/p/FusionDirectory-109/language/lv/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
diff --git a/squid/locale/nb/fusiondirectory.po b/squid/locale/nb/fusiondirectory.po
index 8d076c26a2338885d4c83a1b63d57016d1935888..42714871720ab40e30c37d00ce4e4d6746a5667a 100644
--- a/squid/locale/nb/fusiondirectory.po
+++ b/squid/locale/nb/fusiondirectory.po
@@ -5,12 +5,12 @@
 # Translators:
 msgid ""
 msgstr ""
-"Project-Id-Version: FusionDirectory-108\n"
+"Project-Id-Version: FusionDirectory-109\n"
 "Report-Msgid-Bugs-To: documentation@lists.fusiondirectory.org\n"
-"POT-Creation-Date: 2015-03-17 18:47+0100\n"
-"PO-Revision-Date: 2014-08-26 14:14+0000\n"
-"Last-Translator: fusiondirectory <contact@fusiondirectory.org>\n"
-"Language-Team: Norwegian BokmÃ¥l (http://www.transifex.com/projects/p/FusionDirectory-108/language/nb/)\n"
+"POT-Creation-Date: 2014-12-15 17:47+0100\n"
+"PO-Revision-Date: 2014-08-28 10:29+0000\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: Norwegian BokmÃ¥l (http://www.transifex.com/projects/p/FusionDirectory-109/language/nb/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
diff --git a/squid/locale/nl/fusiondirectory.po b/squid/locale/nl/fusiondirectory.po
index 6a00fd5dc4b2c3805a89affb067ff3a7e13bd2ff..6924068bbc634d50b0adfdec9658f19a1639d229 100644
--- a/squid/locale/nl/fusiondirectory.po
+++ b/squid/locale/nl/fusiondirectory.po
@@ -3,17 +3,14 @@
 # This file is distributed under the same license as the PACKAGE package.
 # 
 # Translators:
-# Kenny Tordeurs <tordeurskenny@gmail.com>, 2012-2013
-#  Niels Klomp (CareWorks ICT Services) <nk@careworks.nl>, 2005
-# Kenny Tordeurs <tordeurskenny@gmail.com>, 2012
 msgid ""
 msgstr ""
-"Project-Id-Version: FusionDirectory-108\n"
+"Project-Id-Version: FusionDirectory-109\n"
 "Report-Msgid-Bugs-To: documentation@lists.fusiondirectory.org\n"
-"POT-Creation-Date: 2015-03-17 18:47+0100\n"
-"PO-Revision-Date: 2015-02-25 16:02+0000\n"
-"Last-Translator: fusiondirectory <contact@fusiondirectory.org>\n"
-"Language-Team: Dutch (http://www.transifex.com/projects/p/FusionDirectory-108/language/nl/)\n"
+"POT-Creation-Date: 2014-12-15 17:47+0100\n"
+"PO-Revision-Date: 2014-08-28 10:29+0000\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: Dutch (http://www.transifex.com/projects/p/FusionDirectory-109/language/nl/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
diff --git a/squid/locale/pl/fusiondirectory.po b/squid/locale/pl/fusiondirectory.po
index c55808726ee372df574c45a0b56ac3a70eed780c..a94cc3a8b6f956ff82ed8e9707d04b035878f51e 100644
--- a/squid/locale/pl/fusiondirectory.po
+++ b/squid/locale/pl/fusiondirectory.po
@@ -5,12 +5,12 @@
 # Translators:
 msgid ""
 msgstr ""
-"Project-Id-Version: FusionDirectory-108\n"
+"Project-Id-Version: FusionDirectory-109\n"
 "Report-Msgid-Bugs-To: documentation@lists.fusiondirectory.org\n"
-"POT-Creation-Date: 2015-03-17 18:47+0100\n"
-"PO-Revision-Date: 2015-02-25 16:02+0000\n"
-"Last-Translator: fusiondirectory <contact@fusiondirectory.org>\n"
-"Language-Team: Polish (http://www.transifex.com/projects/p/FusionDirectory-108/language/pl/)\n"
+"POT-Creation-Date: 2014-12-15 17:47+0100\n"
+"PO-Revision-Date: 2014-08-28 10:29+0000\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: Polish (http://www.transifex.com/projects/p/FusionDirectory-109/language/pl/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
diff --git a/squid/locale/pt/fusiondirectory.po b/squid/locale/pt/fusiondirectory.po
index e0cc4b28bf4afbe4ec46751aaf9ec19f8f621f76..95fb1e5895de5cf6cafeecb9ed0b97b623e26656 100644
--- a/squid/locale/pt/fusiondirectory.po
+++ b/squid/locale/pt/fusiondirectory.po
@@ -5,12 +5,12 @@
 # Translators:
 msgid ""
 msgstr ""
-"Project-Id-Version: FusionDirectory-108\n"
+"Project-Id-Version: FusionDirectory-109\n"
 "Report-Msgid-Bugs-To: documentation@lists.fusiondirectory.org\n"
-"POT-Creation-Date: 2015-03-17 18:47+0100\n"
-"PO-Revision-Date: 2015-02-25 16:02+0000\n"
-"Last-Translator: fusiondirectory <contact@fusiondirectory.org>\n"
-"Language-Team: Portuguese (http://www.transifex.com/projects/p/FusionDirectory-108/language/pt/)\n"
+"POT-Creation-Date: 2014-12-15 17:47+0100\n"
+"PO-Revision-Date: 2014-08-28 10:29+0000\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: Portuguese (http://www.transifex.com/projects/p/FusionDirectory-109/language/pt/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
diff --git a/squid/locale/pt_BR/fusiondirectory.po b/squid/locale/pt_BR/fusiondirectory.po
index 31f93253dff89034becdc016796cb889127a5fe7..09e4b54ecb1cf5c666a977398abf95f564601c2b 100644
--- a/squid/locale/pt_BR/fusiondirectory.po
+++ b/squid/locale/pt_BR/fusiondirectory.po
@@ -3,15 +3,14 @@
 # This file is distributed under the same license as the PACKAGE package.
 # 
 # Translators:
-# ALEJANDRO BARRIOS <alejandrobarrios@interlegis.leg.br>, 2014
 msgid ""
 msgstr ""
-"Project-Id-Version: FusionDirectory-108\n"
+"Project-Id-Version: FusionDirectory-109\n"
 "Report-Msgid-Bugs-To: documentation@lists.fusiondirectory.org\n"
-"POT-Creation-Date: 2015-03-17 18:47+0100\n"
-"PO-Revision-Date: 2015-02-25 16:02+0000\n"
-"Last-Translator: fusiondirectory <contact@fusiondirectory.org>\n"
-"Language-Team: Portuguese (Brazil) (http://www.transifex.com/projects/p/FusionDirectory-108/language/pt_BR/)\n"
+"POT-Creation-Date: 2014-12-15 17:47+0100\n"
+"PO-Revision-Date: 2014-08-28 10:29+0000\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: Portuguese (Brazil) (http://www.transifex.com/projects/p/FusionDirectory-109/language/pt_BR/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
diff --git a/squid/locale/ru/fusiondirectory.po b/squid/locale/ru/fusiondirectory.po
index 8689ccf5d40044b7087d18824d746d229ba301c4..f526a56785859fe9dbab0f5639c37055b55c15d1 100644
--- a/squid/locale/ru/fusiondirectory.po
+++ b/squid/locale/ru/fusiondirectory.po
@@ -3,20 +3,19 @@
 # This file is distributed under the same license as the PACKAGE package.
 # 
 # Translators:
-#  Valia V. Vaneeva <fattie@altlinux.ru>, 2004
 msgid ""
 msgstr ""
-"Project-Id-Version: FusionDirectory-108\n"
+"Project-Id-Version: FusionDirectory-109\n"
 "Report-Msgid-Bugs-To: documentation@lists.fusiondirectory.org\n"
-"POT-Creation-Date: 2015-03-17 18:47+0100\n"
-"PO-Revision-Date: 2014-08-28 10:47+0000\n"
-"Last-Translator: fusiondirectory <contact@fusiondirectory.org>\n"
-"Language-Team: Russian (http://www.transifex.com/projects/p/FusionDirectory-108/language/ru/)\n"
+"POT-Creation-Date: 2014-12-15 17:47+0100\n"
+"PO-Revision-Date: 2014-08-28 10:29+0000\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: Russian (http://www.transifex.com/projects/p/FusionDirectory-109/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=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);\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/squid/class_proxyAccount.inc:65
 msgid "Proxy"
@@ -61,7 +60,7 @@ msgstr ""
 
 #: personal/squid/class_proxyAccount.inc:112
 msgid "-"
-msgstr ""
+msgstr "-"
 
 #: personal/squid/class_proxyAccount.inc:113
 msgid ":"
@@ -78,7 +77,7 @@ msgstr "ÐžÐ³Ñ€Ð°Ð½Ð¸Ñ‡Ð¸Ñ‚ÑŒ ÐºÐ²Ð¾Ñ‚Ð¾Ð¹ Ð¸ÑÐ¿Ð¾Ð»ÑŒÐ·Ð¾Ð²Ð°Ð½Ð¸Ðµ Ð¿Ñ€Ð¾ÐºÑ
 
 #: personal/squid/class_proxyAccount.inc:122
 msgid "Up"
-msgstr ""
+msgstr "ÐŸÐ¾ ÑƒÐ±Ñ‹Ð²Ð°Ð½Ð¸ÑŽ"
 
 #: personal/squid/class_proxyAccount.inc:131
 #: personal/squid/class_proxyAccount.inc:132
diff --git a/squid/locale/ru@petr1708/fusiondirectory.po b/squid/locale/ru@petr1708/fusiondirectory.po
index 3fbbf99fd9f137f47a9c5c1caf63eb85fcba4c42..f0a614101a49a94baf45b8a815464d60e3886693 100644
--- a/squid/locale/ru@petr1708/fusiondirectory.po
+++ b/squid/locale/ru@petr1708/fusiondirectory.po
@@ -5,17 +5,17 @@
 # Translators:
 msgid ""
 msgstr ""
-"Project-Id-Version: FusionDirectory-108\n"
+"Project-Id-Version: FusionDirectory-109\n"
 "Report-Msgid-Bugs-To: documentation@lists.fusiondirectory.org\n"
-"POT-Creation-Date: 2015-03-17 18:47+0100\n"
-"PO-Revision-Date: 2014-08-26 14:14+0000\n"
-"Last-Translator: fusiondirectory <contact@fusiondirectory.org>\n"
-"Language-Team: Russian Petrine orthography (http://www.transifex.com/projects/p/FusionDirectory-108/language/ru@petr1708/)\n"
+"POT-Creation-Date: 2014-12-15 17:47+0100\n"
+"PO-Revision-Date: 2014-08-28 10:29+0000\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: Russian Petrine orthography (http://www.transifex.com/projects/p/FusionDirectory-109/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=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);\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/squid/class_proxyAccount.inc:65
 msgid "Proxy"
diff --git a/squid/locale/sv/fusiondirectory.po b/squid/locale/sv/fusiondirectory.po
index 61c23528762c617c7baa9b8cfa4eac7e6a58de01..32599040fcc8a6438b62b77f8779cea839b4d1d2 100644
--- a/squid/locale/sv/fusiondirectory.po
+++ b/squid/locale/sv/fusiondirectory.po
@@ -5,12 +5,12 @@
 # Translators:
 msgid ""
 msgstr ""
-"Project-Id-Version: FusionDirectory-108\n"
+"Project-Id-Version: FusionDirectory-109\n"
 "Report-Msgid-Bugs-To: documentation@lists.fusiondirectory.org\n"
-"POT-Creation-Date: 2015-03-17 18:47+0100\n"
-"PO-Revision-Date: 2015-02-25 16:02+0000\n"
-"Last-Translator: fusiondirectory <contact@fusiondirectory.org>\n"
-"Language-Team: Swedish (http://www.transifex.com/projects/p/FusionDirectory-108/language/sv/)\n"
+"POT-Creation-Date: 2014-12-15 17:47+0100\n"
+"PO-Revision-Date: 2014-08-28 10:29+0000\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: Swedish (http://www.transifex.com/projects/p/FusionDirectory-109/language/sv/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
diff --git a/squid/locale/ug/fusiondirectory.po b/squid/locale/ug/fusiondirectory.po
index 575a5af742e6d9f1737bec7f2c9b8032f2fb538e..61127e172775955b3d41df841ed704951f8f1b1a 100644
--- a/squid/locale/ug/fusiondirectory.po
+++ b/squid/locale/ug/fusiondirectory.po
@@ -5,12 +5,12 @@
 # Translators:
 msgid ""
 msgstr ""
-"Project-Id-Version: FusionDirectory-108\n"
+"Project-Id-Version: FusionDirectory-109\n"
 "Report-Msgid-Bugs-To: documentation@lists.fusiondirectory.org\n"
-"POT-Creation-Date: 2015-03-17 18:47+0100\n"
-"PO-Revision-Date: 2014-08-26 14:14+0000\n"
-"Last-Translator: fusiondirectory <contact@fusiondirectory.org>\n"
-"Language-Team: Uighur (http://www.transifex.com/projects/p/FusionDirectory-108/language/ug/)\n"
+"POT-Creation-Date: 2014-12-15 17:47+0100\n"
+"PO-Revision-Date: 2014-08-28 10:29+0000\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: Uighur (http://www.transifex.com/projects/p/FusionDirectory-109/language/ug/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
diff --git a/squid/locale/vi_VN/fusiondirectory.po b/squid/locale/vi_VN/fusiondirectory.po
index 44150ef47e25f78f24035b1d9f431f2bbd134132..8fba56db16bee284f98fb7fda68012c72065c8ed 100644
--- a/squid/locale/vi_VN/fusiondirectory.po
+++ b/squid/locale/vi_VN/fusiondirectory.po
@@ -5,12 +5,12 @@
 # Translators:
 msgid ""
 msgstr ""
-"Project-Id-Version: FusionDirectory-108\n"
+"Project-Id-Version: FusionDirectory-109\n"
 "Report-Msgid-Bugs-To: documentation@lists.fusiondirectory.org\n"
-"POT-Creation-Date: 2015-03-17 18:47+0100\n"
-"PO-Revision-Date: 2015-02-25 16:02+0000\n"
-"Last-Translator: fusiondirectory <contact@fusiondirectory.org>\n"
-"Language-Team: Vietnamese (Viet Nam) (http://www.transifex.com/projects/p/FusionDirectory-108/language/vi_VN/)\n"
+"POT-Creation-Date: 2014-12-15 17:47+0100\n"
+"PO-Revision-Date: 2014-08-28 10:29+0000\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: Vietnamese (Viet Nam) (http://www.transifex.com/projects/p/FusionDirectory-109/language/vi_VN/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
diff --git a/squid/locale/zh/fusiondirectory.po b/squid/locale/zh/fusiondirectory.po
index cb5719d6741a9ac5baa94732e2cc45a3d4545538..5bfb30ab6d66005f8a26978ffe48c4fce9b78a17 100644
--- a/squid/locale/zh/fusiondirectory.po
+++ b/squid/locale/zh/fusiondirectory.po
@@ -3,15 +3,14 @@
 # This file is distributed under the same license as the PACKAGE package.
 # 
 # Translators:
-#  Jiang Xin <worldhello.net@gmail.com>, 2007
 msgid ""
 msgstr ""
-"Project-Id-Version: FusionDirectory-108\n"
+"Project-Id-Version: FusionDirectory-109\n"
 "Report-Msgid-Bugs-To: documentation@lists.fusiondirectory.org\n"
-"POT-Creation-Date: 2015-03-17 18:47+0100\n"
-"PO-Revision-Date: 2015-02-25 16:02+0000\n"
-"Last-Translator: fusiondirectory <contact@fusiondirectory.org>\n"
-"Language-Team: Chinese (http://www.transifex.com/projects/p/FusionDirectory-108/language/zh/)\n"
+"POT-Creation-Date: 2014-12-15 17:47+0100\n"
+"PO-Revision-Date: 2014-08-28 10:29+0000\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: Chinese (http://www.transifex.com/projects/p/FusionDirectory-109/language/zh/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
diff --git a/ssh/locale/ar/fusiondirectory.po b/ssh/locale/ar/fusiondirectory.po
index 919098cea5934292446f53539adf98ad0c3c2d75..14536869106e4458069666e4240a6fcff3329ede 100644
--- a/ssh/locale/ar/fusiondirectory.po
+++ b/ssh/locale/ar/fusiondirectory.po
@@ -3,16 +3,14 @@
 # This file is distributed under the same license as the PACKAGE package.
 # 
 # Translators:
-# Islam Adel, 2013
-# Islam Adel, 2013
 msgid ""
 msgstr ""
-"Project-Id-Version: FusionDirectory-108\n"
+"Project-Id-Version: FusionDirectory-109\n"
 "Report-Msgid-Bugs-To: documentation@lists.fusiondirectory.org\n"
-"POT-Creation-Date: 2015-03-17 18:47+0100\n"
-"PO-Revision-Date: 2014-08-28 10:47+0000\n"
-"Last-Translator: fusiondirectory <contact@fusiondirectory.org>\n"
-"Language-Team: Arabic (http://www.transifex.com/projects/p/FusionDirectory-108/language/ar/)\n"
+"POT-Creation-Date: 2014-12-15 17:47+0100\n"
+"PO-Revision-Date: 2014-08-28 10:29+0000\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: Arabic (http://www.transifex.com/projects/p/FusionDirectory-109/language/ar/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -35,15 +33,15 @@ msgstr "Ù…ÙØ§ØªÙŠØ Ø§Ù„Ù‚Ø´Ø±Ø© Ø§Ù„Ø¢Ù…Ù†Ø©"
 msgid "SSH public keys for this user"
 msgstr ""
 
-#: personal/ssh/class_sshAccount.inc:89
+#: personal/ssh/class_sshAccount.inc:90
 msgid "SSH"
 msgstr "Ù‚Ø´Ø±Ø© Ø¢Ù…Ù†Ø©"
 
-#: personal/ssh/class_sshAccount.inc:90
+#: personal/ssh/class_sshAccount.inc:91
 msgid "Edit user's SSH public keys"
 msgstr ""
 
-#: personal/ssh/class_sshAccount.inc:112
+#: personal/ssh/class_sshAccount.inc:113
 #, php-format
 msgid "Error : there are several keys with fingerprint %s"
 msgstr ""
diff --git a/ssh/locale/ca/fusiondirectory.po b/ssh/locale/ca/fusiondirectory.po
index 3fce0b70fad00f944b66c8dd78c90c1a7a448a65..af6a245357292c936f70008a238a030374ebae73 100644
--- a/ssh/locale/ca/fusiondirectory.po
+++ b/ssh/locale/ca/fusiondirectory.po
@@ -5,12 +5,12 @@
 # Translators:
 msgid ""
 msgstr ""
-"Project-Id-Version: FusionDirectory-108\n"
+"Project-Id-Version: FusionDirectory-109\n"
 "Report-Msgid-Bugs-To: documentation@lists.fusiondirectory.org\n"
-"POT-Creation-Date: 2015-03-17 18:47+0100\n"
-"PO-Revision-Date: 2014-08-26 14:13+0000\n"
-"Last-Translator: fusiondirectory <contact@fusiondirectory.org>\n"
-"Language-Team: Catalan (http://www.transifex.com/projects/p/FusionDirectory-108/language/ca/)\n"
+"POT-Creation-Date: 2014-12-15 17:47+0100\n"
+"PO-Revision-Date: 2014-08-28 10:29+0000\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: Catalan (http://www.transifex.com/projects/p/FusionDirectory-109/language/ca/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -33,15 +33,15 @@ msgstr ""
 msgid "SSH public keys for this user"
 msgstr ""
 
-#: personal/ssh/class_sshAccount.inc:89
+#: personal/ssh/class_sshAccount.inc:90
 msgid "SSH"
 msgstr ""
 
-#: personal/ssh/class_sshAccount.inc:90
+#: personal/ssh/class_sshAccount.inc:91
 msgid "Edit user's SSH public keys"
 msgstr ""
 
-#: personal/ssh/class_sshAccount.inc:112
+#: personal/ssh/class_sshAccount.inc:113
 #, php-format
 msgid "Error : there are several keys with fingerprint %s"
 msgstr ""
diff --git a/ssh/locale/cs_CZ/fusiondirectory.po b/ssh/locale/cs_CZ/fusiondirectory.po
index 86ade4ff345c6a101e5ffe243ba8d1430b8156d8..6db3c074c884385aa69478acb7b183ef661acbde 100644
--- a/ssh/locale/cs_CZ/fusiondirectory.po
+++ b/ssh/locale/cs_CZ/fusiondirectory.po
@@ -3,17 +3,15 @@
 # This file is distributed under the same license as the PACKAGE package.
 # 
 # Translators:
-# Pavel Borecki <pavel.borecki@gmail.com>, 2012
-# Pavel Borecki <pavel.borecki@gmail.com>, 2012
-# Pavel Borecki <pavel.borecki@gmail.com>, 2012
+# Pavel Borecki <pavel.borecki@gmail.com>, 2014-2015
 msgid ""
 msgstr ""
-"Project-Id-Version: FusionDirectory-108\n"
+"Project-Id-Version: FusionDirectory-109\n"
 "Report-Msgid-Bugs-To: documentation@lists.fusiondirectory.org\n"
-"POT-Creation-Date: 2015-03-17 18:47+0100\n"
-"PO-Revision-Date: 2014-12-08 21:51+0000\n"
-"Last-Translator: fusiondirectory <contact@fusiondirectory.org>\n"
-"Language-Team: Czech (Czech Republic) (http://www.transifex.com/projects/p/FusionDirectory-108/language/cs_CZ/)\n"
+"POT-Creation-Date: 2014-12-15 17:47+0100\n"
+"PO-Revision-Date: 2015-04-01 16:41+0000\n"
+"Last-Translator: Pavel Borecki <pavel.borecki@gmail.com>\n"
+"Language-Team: Czech (Czech Republic) (http://www.transifex.com/projects/p/FusionDirectory-109/language/cs_CZ/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -22,7 +20,7 @@ msgstr ""
 
 #: personal/ssh/class_sshAccount.inc:47
 msgid "Upload error"
-msgstr "chyba pÅ™i nahrÃ¡vÃ¡nÃ"
+msgstr "Chyba pÅ™i nahrÃ¡vÃ¡nÃ na protÄ›jÅ¡ek"
 
 #: personal/ssh/class_sshAccount.inc:47
 msgid "Unknown public key format!"
@@ -36,15 +34,15 @@ msgstr "SSH klÃÄe"
 msgid "SSH public keys for this user"
 msgstr "VeÅ™ejnÃ© ÄÃ¡sti SSH klÃÄÅ¯ tohoto uÅ¾ivatele"
 
-#: personal/ssh/class_sshAccount.inc:89
+#: personal/ssh/class_sshAccount.inc:90
 msgid "SSH"
 msgstr ""
 
-#: personal/ssh/class_sshAccount.inc:90
+#: personal/ssh/class_sshAccount.inc:91
 msgid "Edit user's SSH public keys"
-msgstr ""
+msgstr "Upravit veÅ™ejnÃ© ÄÃ¡sti SSH klÃÄÅ¯ tohoto uÅ¾ivatele"
 
-#: personal/ssh/class_sshAccount.inc:112
+#: personal/ssh/class_sshAccount.inc:113
 #, php-format
 msgid "Error : there are several keys with fingerprint %s"
-msgstr ""
+msgstr "Chyba : otisku %s odpovÃdÃ¡ hned nÄ›kolik klÃÄÅ¯"
diff --git a/ssh/locale/de/fusiondirectory.po b/ssh/locale/de/fusiondirectory.po
index 382b5e83826ac322a9ad63b8c0665e650cc53b6c..74d5776f50e3674d02965a573d66c6694b75924c 100644
--- a/ssh/locale/de/fusiondirectory.po
+++ b/ssh/locale/de/fusiondirectory.po
@@ -3,16 +3,14 @@
 # This file is distributed under the same license as the PACKAGE package.
 # 
 # Translators:
-# Maik Wagner <maikwagner@yahoo.com>, 2013
-#  Stefan Koehler <stefan.koehler@GONICUS.de>, 2005
 msgid ""
 msgstr ""
-"Project-Id-Version: FusionDirectory-108\n"
+"Project-Id-Version: FusionDirectory-109\n"
 "Report-Msgid-Bugs-To: documentation@lists.fusiondirectory.org\n"
-"POT-Creation-Date: 2015-03-17 18:47+0100\n"
-"PO-Revision-Date: 2014-08-28 10:47+0000\n"
-"Last-Translator: fusiondirectory <contact@fusiondirectory.org>\n"
-"Language-Team: German (http://www.transifex.com/projects/p/FusionDirectory-108/language/de/)\n"
+"POT-Creation-Date: 2014-12-15 17:47+0100\n"
+"PO-Revision-Date: 2014-08-28 10:29+0000\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: German (http://www.transifex.com/projects/p/FusionDirectory-109/language/de/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -35,15 +33,15 @@ msgstr "SSH SchlÃ¼ssel"
 msgid "SSH public keys for this user"
 msgstr "Ã–ffentliche SSH-SchlÃ¼ssel fÃ¼r diesen Benutzer"
 
-#: personal/ssh/class_sshAccount.inc:89
+#: personal/ssh/class_sshAccount.inc:90
 msgid "SSH"
 msgstr "SSH"
 
-#: personal/ssh/class_sshAccount.inc:90
+#: personal/ssh/class_sshAccount.inc:91
 msgid "Edit user's SSH public keys"
 msgstr "Die Ã¶ffentlichen SchlÃ¼ssel dieses Benutzers bearbeiten"
 
-#: personal/ssh/class_sshAccount.inc:112
+#: personal/ssh/class_sshAccount.inc:113
 #, php-format
 msgid "Error : there are several keys with fingerprint %s"
 msgstr "Fehler : Es gibt mehrere SchlÃ¼ssel mit Fingerprint %s"
diff --git a/ssh/locale/el_GR/fusiondirectory.po b/ssh/locale/el_GR/fusiondirectory.po
new file mode 100644
index 0000000000000000000000000000000000000000..1434fd62c6f4fe34ac995f6e53304b067eeab7ff
--- /dev/null
+++ b/ssh/locale/el_GR/fusiondirectory.po
@@ -0,0 +1,47 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR FusionDirectory Project
+# This file is distributed under the same license as the PACKAGE package.
+# 
+# Translators:
+msgid ""
+msgstr ""
+"Project-Id-Version: FusionDirectory-109\n"
+"Report-Msgid-Bugs-To: documentation@lists.fusiondirectory.org\n"
+"POT-Creation-Date: 2014-12-15 17:47+0100\n"
+"PO-Revision-Date: 2015-05-30 11:45+0000\n"
+"Last-Translator: Benoit Mortier <benoit.mortier@opensides.be>\n"
+"Language-Team: Greek (Greece) (http://www.transifex.com/projects/p/FusionDirectory-109/language/el_GR/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: el_GR\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
+
+#: personal/ssh/class_sshAccount.inc:47
+msgid "Upload error"
+msgstr ""
+
+#: personal/ssh/class_sshAccount.inc:47
+msgid "Unknown public key format!"
+msgstr ""
+
+#: personal/ssh/class_sshAccount.inc:70
+msgid "SSH Keys"
+msgstr ""
+
+#: personal/ssh/class_sshAccount.inc:76
+msgid "SSH public keys for this user"
+msgstr ""
+
+#: personal/ssh/class_sshAccount.inc:90
+msgid "SSH"
+msgstr ""
+
+#: personal/ssh/class_sshAccount.inc:91
+msgid "Edit user's SSH public keys"
+msgstr ""
+
+#: personal/ssh/class_sshAccount.inc:113
+#, php-format
+msgid "Error : there are several keys with fingerprint %s"
+msgstr ""
diff --git a/ssh/locale/en/fusiondirectory.po b/ssh/locale/en/fusiondirectory.po
index ea402881187e1ec214a87dbae8adce86727d640a..dec775be8e79ffd43e8496484eac62501f0a8e0a 100644
--- a/ssh/locale/en/fusiondirectory.po
+++ b/ssh/locale/en/fusiondirectory.po
@@ -6,13 +6,13 @@
 #, fuzzy
 msgid ""
 msgstr ""
-"Project-Id-Version: PACKAGE VERSION\n"
-"Report-Msgid-Bugs-To: documentation@lists.fusiondirectory.org\n"
-"POT-Creation-Date: 2015-03-31 11:49+0200\n"
+"Project-Id-Version: FusionDirectory VERSION\n"
+"Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
+"POT-Creation-Date: 2015-05-30 15:30+0200\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
-"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
-"Language-Team: LANGUAGE <LL@li.org>\n"
-"Language: \n"
+"Last-Translator: FusionDirectory project <contact@fusiondirectory.org>\n"
+"Language-Team: English\n"
+"Language: en\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -33,15 +33,15 @@ msgstr ""
 msgid "SSH public keys for this user"
 msgstr ""
 
-#: personal/ssh/class_sshAccount.inc:89
+#: personal/ssh/class_sshAccount.inc:90
 msgid "SSH"
 msgstr ""
 
-#: personal/ssh/class_sshAccount.inc:90
+#: personal/ssh/class_sshAccount.inc:91
 msgid "Edit user's SSH public keys"
 msgstr ""
 
-#: personal/ssh/class_sshAccount.inc:112
+#: personal/ssh/class_sshAccount.inc:113
 #, php-format
 msgid "Error : there are several keys with fingerprint %s"
 msgstr ""
diff --git a/ssh/locale/es/fusiondirectory.po b/ssh/locale/es/fusiondirectory.po
index e2af9ca69a9ecd59901114af118792e752241175..504db5ffe94a1187a22c044256e0221cffd86534 100644
--- a/ssh/locale/es/fusiondirectory.po
+++ b/ssh/locale/es/fusiondirectory.po
@@ -3,16 +3,14 @@
 # This file is distributed under the same license as the PACKAGE package.
 # 
 # Translators:
-# lars_g <lars.gold@gmail.com>, 2012
-# lars_g <lars.gold@gmail.com>, 2012
 msgid ""
 msgstr ""
-"Project-Id-Version: FusionDirectory-108\n"
+"Project-Id-Version: FusionDirectory-109\n"
 "Report-Msgid-Bugs-To: documentation@lists.fusiondirectory.org\n"
-"POT-Creation-Date: 2015-03-17 18:47+0100\n"
-"PO-Revision-Date: 2014-08-28 10:47+0000\n"
-"Last-Translator: fusiondirectory <contact@fusiondirectory.org>\n"
-"Language-Team: Spanish (http://www.transifex.com/projects/p/FusionDirectory-108/language/es/)\n"
+"POT-Creation-Date: 2014-12-15 17:47+0100\n"
+"PO-Revision-Date: 2014-08-28 10:29+0000\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: Spanish (http://www.transifex.com/projects/p/FusionDirectory-109/language/es/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -35,15 +33,15 @@ msgstr ""
 msgid "SSH public keys for this user"
 msgstr ""
 
-#: personal/ssh/class_sshAccount.inc:89
+#: personal/ssh/class_sshAccount.inc:90
 msgid "SSH"
 msgstr ""
 
-#: personal/ssh/class_sshAccount.inc:90
+#: personal/ssh/class_sshAccount.inc:91
 msgid "Edit user's SSH public keys"
 msgstr ""
 
-#: personal/ssh/class_sshAccount.inc:112
+#: personal/ssh/class_sshAccount.inc:113
 #, php-format
 msgid "Error : there are several keys with fingerprint %s"
 msgstr ""
diff --git a/ssh/locale/es_VE/fusiondirectory.po b/ssh/locale/es_VE/fusiondirectory.po
index a5538f7fd2e664e518a1e8c5d343d2eb347f3018..ccd471e437fa33d1956b80f8e8be53091ebb156e 100644
--- a/ssh/locale/es_VE/fusiondirectory.po
+++ b/ssh/locale/es_VE/fusiondirectory.po
@@ -3,16 +3,14 @@
 # This file is distributed under the same license as the PACKAGE package.
 # 
 # Translators:
-# lars_g <lars.gold@gmail.com>, 2012
-# lars_g <lars.gold@gmail.com>, 2012
 msgid ""
 msgstr ""
-"Project-Id-Version: FusionDirectory-108\n"
+"Project-Id-Version: FusionDirectory-109\n"
 "Report-Msgid-Bugs-To: documentation@lists.fusiondirectory.org\n"
-"POT-Creation-Date: 2015-03-17 18:47+0100\n"
-"PO-Revision-Date: 2014-08-28 10:47+0000\n"
-"Last-Translator: fusiondirectory <contact@fusiondirectory.org>\n"
-"Language-Team: Spanish (Venezuela) (http://www.transifex.com/projects/p/FusionDirectory-108/language/es_VE/)\n"
+"POT-Creation-Date: 2014-12-15 17:47+0100\n"
+"PO-Revision-Date: 2014-08-28 10:29+0000\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: Spanish (Venezuela) (http://www.transifex.com/projects/p/FusionDirectory-109/language/es_VE/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -35,15 +33,15 @@ msgstr ""
 msgid "SSH public keys for this user"
 msgstr ""
 
-#: personal/ssh/class_sshAccount.inc:89
+#: personal/ssh/class_sshAccount.inc:90
 msgid "SSH"
 msgstr ""
 
-#: personal/ssh/class_sshAccount.inc:90
+#: personal/ssh/class_sshAccount.inc:91
 msgid "Edit user's SSH public keys"
 msgstr ""
 
-#: personal/ssh/class_sshAccount.inc:112
+#: personal/ssh/class_sshAccount.inc:113
 #, php-format
 msgid "Error : there are several keys with fingerprint %s"
 msgstr ""
diff --git a/ssh/locale/fa_IR/fusiondirectory.po b/ssh/locale/fa_IR/fusiondirectory.po
index 6e350f90ec6e9bb66e245cb5b8dbd1c71e2a5750..8596ba4e192580dc6a546993923c200bfaaecec0 100644
--- a/ssh/locale/fa_IR/fusiondirectory.po
+++ b/ssh/locale/fa_IR/fusiondirectory.po
@@ -5,12 +5,12 @@
 # Translators:
 msgid ""
 msgstr ""
-"Project-Id-Version: FusionDirectory-108\n"
+"Project-Id-Version: FusionDirectory-109\n"
 "Report-Msgid-Bugs-To: documentation@lists.fusiondirectory.org\n"
-"POT-Creation-Date: 2015-03-17 18:47+0100\n"
-"PO-Revision-Date: 2014-08-26 14:14+0000\n"
-"Last-Translator: fusiondirectory <contact@fusiondirectory.org>\n"
-"Language-Team: Persian (Iran) (http://www.transifex.com/projects/p/FusionDirectory-108/language/fa_IR/)\n"
+"POT-Creation-Date: 2014-12-15 17:47+0100\n"
+"PO-Revision-Date: 2014-08-28 10:29+0000\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: Persian (Iran) (http://www.transifex.com/projects/p/FusionDirectory-109/language/fa_IR/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -33,15 +33,15 @@ msgstr ""
 msgid "SSH public keys for this user"
 msgstr ""
 
-#: personal/ssh/class_sshAccount.inc:89
+#: personal/ssh/class_sshAccount.inc:90
 msgid "SSH"
 msgstr ""
 
-#: personal/ssh/class_sshAccount.inc:90
+#: personal/ssh/class_sshAccount.inc:91
 msgid "Edit user's SSH public keys"
 msgstr ""
 
-#: personal/ssh/class_sshAccount.inc:112
+#: personal/ssh/class_sshAccount.inc:113
 #, php-format
 msgid "Error : there are several keys with fingerprint %s"
 msgstr ""
diff --git a/ssh/locale/fr/fusiondirectory.po b/ssh/locale/fr/fusiondirectory.po
index f9d2e7bf337704cce7ff33e569848b13c201ffd5..229cc9ece21ecaaa184c0565936106c25a139310 100644
--- a/ssh/locale/fr/fusiondirectory.po
+++ b/ssh/locale/fr/fusiondirectory.po
@@ -3,20 +3,14 @@
 # This file is distributed under the same license as the PACKAGE package.
 # 
 # Translators:
-# gallak <antoine.gallavardin@free.fr>, 2013
-# Benoit Mortier <benoit.mortier@opensides.be>, 2009
-# Benoit Mortier <benoit.mortier@opensides.be>, 2009
-# MCMic, 2014
-# gallak <antoine.gallavardin@free.fr>, 2013
-# MCMic, 2014
 msgid ""
 msgstr ""
-"Project-Id-Version: FusionDirectory-108\n"
+"Project-Id-Version: FusionDirectory-109\n"
 "Report-Msgid-Bugs-To: documentation@lists.fusiondirectory.org\n"
-"POT-Creation-Date: 2015-03-17 18:47+0100\n"
-"PO-Revision-Date: 2014-12-11 12:40+0000\n"
-"Last-Translator: MCMic\n"
-"Language-Team: French (http://www.transifex.com/projects/p/FusionDirectory-108/language/fr/)\n"
+"POT-Creation-Date: 2014-12-15 17:47+0100\n"
+"PO-Revision-Date: 2014-08-28 10:29+0000\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: French (http://www.transifex.com/projects/p/FusionDirectory-109/language/fr/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -39,15 +33,15 @@ msgstr "Clefs SSH"
 msgid "SSH public keys for this user"
 msgstr "Liste des clefs SSH publiques pour cet utilisateur"
 
-#: personal/ssh/class_sshAccount.inc:89
+#: personal/ssh/class_sshAccount.inc:90
 msgid "SSH"
 msgstr "SSH"
 
-#: personal/ssh/class_sshAccount.inc:90
+#: personal/ssh/class_sshAccount.inc:91
 msgid "Edit user's SSH public keys"
-msgstr "Ã‰diter les clÃ©s SSH de lâ€™utilisateur"
+msgstr "Editer les clefs SSH de l'utilisateur"
 
-#: personal/ssh/class_sshAccount.inc:112
+#: personal/ssh/class_sshAccount.inc:113
 #, php-format
 msgid "Error : there are several keys with fingerprint %s"
-msgstr "Erreurâ€¯: Il y a plusieurs clÃ©s avec l'empreinte %s"
+msgstr "Erreur: Il y a plusieurs clÃ©s avec l'empreinte %s"
diff --git a/ssh/locale/id/fusiondirectory.po b/ssh/locale/id/fusiondirectory.po
index ece3f4cd5a627e39265ea0e262aee1f778abb3d0..725208dd709c51c8f7d62fe14fcaac901dc167fa 100644
--- a/ssh/locale/id/fusiondirectory.po
+++ b/ssh/locale/id/fusiondirectory.po
@@ -5,12 +5,12 @@
 # Translators:
 msgid ""
 msgstr ""
-"Project-Id-Version: FusionDirectory-108\n"
+"Project-Id-Version: FusionDirectory-109\n"
 "Report-Msgid-Bugs-To: documentation@lists.fusiondirectory.org\n"
-"POT-Creation-Date: 2015-03-17 18:47+0100\n"
-"PO-Revision-Date: 2014-08-26 14:14+0000\n"
-"Last-Translator: fusiondirectory <contact@fusiondirectory.org>\n"
-"Language-Team: Indonesian (http://www.transifex.com/projects/p/FusionDirectory-108/language/id/)\n"
+"POT-Creation-Date: 2014-12-15 17:47+0100\n"
+"PO-Revision-Date: 2014-08-28 10:29+0000\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: Indonesian (http://www.transifex.com/projects/p/FusionDirectory-109/language/id/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -33,15 +33,15 @@ msgstr ""
 msgid "SSH public keys for this user"
 msgstr ""
 
-#: personal/ssh/class_sshAccount.inc:89
+#: personal/ssh/class_sshAccount.inc:90
 msgid "SSH"
 msgstr ""
 
-#: personal/ssh/class_sshAccount.inc:90
+#: personal/ssh/class_sshAccount.inc:91
 msgid "Edit user's SSH public keys"
 msgstr ""
 
-#: personal/ssh/class_sshAccount.inc:112
+#: personal/ssh/class_sshAccount.inc:113
 #, php-format
 msgid "Error : there are several keys with fingerprint %s"
 msgstr ""
diff --git a/ssh/locale/it/fusiondirectory.po b/ssh/locale/it/fusiondirectory.po
index c7b1654a08a1bff8d759b9ec85bd280766ee54aa..2ae91086ee84d8488ee7546f12208de10f66a13a 100644
--- a/ssh/locale/it/fusiondirectory.po
+++ b/ssh/locale/it/fusiondirectory.po
@@ -3,17 +3,14 @@
 # This file is distributed under the same license as the PACKAGE package.
 # 
 # Translators:
-# poterealpopolo <giuliano@opensides.be>, 2011
-# poterealpopolo <giuliano@opensides.be>, 2013
-# poterealpopolo <giuliano@opensides.be>, 2011,2013
 msgid ""
 msgstr ""
-"Project-Id-Version: FusionDirectory-108\n"
+"Project-Id-Version: FusionDirectory-109\n"
 "Report-Msgid-Bugs-To: documentation@lists.fusiondirectory.org\n"
-"POT-Creation-Date: 2015-03-17 18:47+0100\n"
-"PO-Revision-Date: 2014-08-28 10:47+0000\n"
-"Last-Translator: fusiondirectory <contact@fusiondirectory.org>\n"
-"Language-Team: Italian (http://www.transifex.com/projects/p/FusionDirectory-108/language/it/)\n"
+"POT-Creation-Date: 2014-12-15 17:47+0100\n"
+"PO-Revision-Date: 2014-08-28 10:29+0000\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: Italian (http://www.transifex.com/projects/p/FusionDirectory-109/language/it/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -36,15 +33,15 @@ msgstr "Chiavi SSH"
 msgid "SSH public keys for this user"
 msgstr "Chiavi pubbliche SSH per questo utente"
 
-#: personal/ssh/class_sshAccount.inc:89
+#: personal/ssh/class_sshAccount.inc:90
 msgid "SSH"
 msgstr "SSH"
 
-#: personal/ssh/class_sshAccount.inc:90
+#: personal/ssh/class_sshAccount.inc:91
 msgid "Edit user's SSH public keys"
 msgstr "Modifica le chiavi pubbliche SSH dell'utente"
 
-#: personal/ssh/class_sshAccount.inc:112
+#: personal/ssh/class_sshAccount.inc:113
 #, php-format
 msgid "Error : there are several keys with fingerprint %s"
 msgstr "Errore : ci sono piÃ¹ chiavi con  l'impronta %s"
diff --git a/ssh/locale/lv/fusiondirectory.po b/ssh/locale/lv/fusiondirectory.po
index 745786f53e9f4520390663d3d05235f59135f9f1..52080cbd61194c8df6bce778a282e4dc4e0280f6 100644
--- a/ssh/locale/lv/fusiondirectory.po
+++ b/ssh/locale/lv/fusiondirectory.po
@@ -5,12 +5,12 @@
 # Translators:
 msgid ""
 msgstr ""
-"Project-Id-Version: FusionDirectory-108\n"
+"Project-Id-Version: FusionDirectory-109\n"
 "Report-Msgid-Bugs-To: documentation@lists.fusiondirectory.org\n"
-"POT-Creation-Date: 2015-03-17 18:47+0100\n"
-"PO-Revision-Date: 2014-08-26 14:14+0000\n"
-"Last-Translator: fusiondirectory <contact@fusiondirectory.org>\n"
-"Language-Team: Latvian (http://www.transifex.com/projects/p/FusionDirectory-108/language/lv/)\n"
+"POT-Creation-Date: 2014-12-15 17:47+0100\n"
+"PO-Revision-Date: 2014-08-28 10:29+0000\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: Latvian (http://www.transifex.com/projects/p/FusionDirectory-109/language/lv/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -33,15 +33,15 @@ msgstr ""
 msgid "SSH public keys for this user"
 msgstr ""
 
-#: personal/ssh/class_sshAccount.inc:89
+#: personal/ssh/class_sshAccount.inc:90
 msgid "SSH"
 msgstr ""
 
-#: personal/ssh/class_sshAccount.inc:90
+#: personal/ssh/class_sshAccount.inc:91
 msgid "Edit user's SSH public keys"
 msgstr ""
 
-#: personal/ssh/class_sshAccount.inc:112
+#: personal/ssh/class_sshAccount.inc:113
 #, php-format
 msgid "Error : there are several keys with fingerprint %s"
 msgstr ""
diff --git a/ssh/locale/nb/fusiondirectory.po b/ssh/locale/nb/fusiondirectory.po
index 54f0bf6f347ba7bf27c77aed2a28ab44149c8f96..f9e64f58f0d4bd6074b00da23f8e6c4a834718d4 100644
--- a/ssh/locale/nb/fusiondirectory.po
+++ b/ssh/locale/nb/fusiondirectory.po
@@ -5,12 +5,12 @@
 # Translators:
 msgid ""
 msgstr ""
-"Project-Id-Version: FusionDirectory-108\n"
+"Project-Id-Version: FusionDirectory-109\n"
 "Report-Msgid-Bugs-To: documentation@lists.fusiondirectory.org\n"
-"POT-Creation-Date: 2015-03-17 18:47+0100\n"
-"PO-Revision-Date: 2014-08-26 14:14+0000\n"
-"Last-Translator: fusiondirectory <contact@fusiondirectory.org>\n"
-"Language-Team: Norwegian BokmÃ¥l (http://www.transifex.com/projects/p/FusionDirectory-108/language/nb/)\n"
+"POT-Creation-Date: 2014-12-15 17:47+0100\n"
+"PO-Revision-Date: 2014-08-28 10:29+0000\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: Norwegian BokmÃ¥l (http://www.transifex.com/projects/p/FusionDirectory-109/language/nb/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -33,15 +33,15 @@ msgstr ""
 msgid "SSH public keys for this user"
 msgstr ""
 
-#: personal/ssh/class_sshAccount.inc:89
+#: personal/ssh/class_sshAccount.inc:90
 msgid "SSH"
 msgstr ""
 
-#: personal/ssh/class_sshAccount.inc:90
+#: personal/ssh/class_sshAccount.inc:91
 msgid "Edit user's SSH public keys"
 msgstr ""
 
-#: personal/ssh/class_sshAccount.inc:112
+#: personal/ssh/class_sshAccount.inc:113
 #, php-format
 msgid "Error : there are several keys with fingerprint %s"
 msgstr ""
diff --git a/ssh/locale/nl/fusiondirectory.po b/ssh/locale/nl/fusiondirectory.po
index 8ebbc5696138ec3b3a7dc72e9a78021726468df9..4a9bf4457e564c09f3a59875d002c041408434ef 100644
--- a/ssh/locale/nl/fusiondirectory.po
+++ b/ssh/locale/nl/fusiondirectory.po
@@ -3,17 +3,14 @@
 # This file is distributed under the same license as the PACKAGE package.
 # 
 # Translators:
-# Christophe Augello <christophe@augello.be>, 2012
-# Christophe Augello <christophe@augello.be>, 2012
-# Kenny Tordeurs <tordeurskenny@gmail.com>, 2013
 msgid ""
 msgstr ""
-"Project-Id-Version: FusionDirectory-108\n"
+"Project-Id-Version: FusionDirectory-109\n"
 "Report-Msgid-Bugs-To: documentation@lists.fusiondirectory.org\n"
-"POT-Creation-Date: 2015-03-17 18:47+0100\n"
-"PO-Revision-Date: 2014-08-28 10:47+0000\n"
-"Last-Translator: fusiondirectory <contact@fusiondirectory.org>\n"
-"Language-Team: Dutch (http://www.transifex.com/projects/p/FusionDirectory-108/language/nl/)\n"
+"POT-Creation-Date: 2014-12-15 17:47+0100\n"
+"PO-Revision-Date: 2014-08-28 10:29+0000\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: Dutch (http://www.transifex.com/projects/p/FusionDirectory-109/language/nl/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -36,15 +33,15 @@ msgstr "SSH sleutels"
 msgid "SSH public keys for this user"
 msgstr "SSH publieke sleutels voor deze gebruiker"
 
-#: personal/ssh/class_sshAccount.inc:89
+#: personal/ssh/class_sshAccount.inc:90
 msgid "SSH"
 msgstr "SSH"
 
-#: personal/ssh/class_sshAccount.inc:90
+#: personal/ssh/class_sshAccount.inc:91
 msgid "Edit user's SSH public keys"
 msgstr "Wijzig de gebruiker zijn SSH publieke sleutels"
 
-#: personal/ssh/class_sshAccount.inc:112
+#: personal/ssh/class_sshAccount.inc:113
 #, php-format
 msgid "Error : there are several keys with fingerprint %s"
 msgstr "Error : er zijn verschillende sleutels met de vingerafdruk %s"
diff --git a/ssh/locale/pl/fusiondirectory.po b/ssh/locale/pl/fusiondirectory.po
index 37b0d75e360a319fe13964aa92c6ee98ee4fc9db..e8f1ed571ad82ac808302ba730d9f4202c1319a6 100644
--- a/ssh/locale/pl/fusiondirectory.po
+++ b/ssh/locale/pl/fusiondirectory.po
@@ -5,12 +5,12 @@
 # Translators:
 msgid ""
 msgstr ""
-"Project-Id-Version: FusionDirectory-108\n"
+"Project-Id-Version: FusionDirectory-109\n"
 "Report-Msgid-Bugs-To: documentation@lists.fusiondirectory.org\n"
-"POT-Creation-Date: 2015-03-17 18:47+0100\n"
-"PO-Revision-Date: 2014-08-26 14:14+0000\n"
-"Last-Translator: fusiondirectory <contact@fusiondirectory.org>\n"
-"Language-Team: Polish (http://www.transifex.com/projects/p/FusionDirectory-108/language/pl/)\n"
+"POT-Creation-Date: 2014-12-15 17:47+0100\n"
+"PO-Revision-Date: 2014-08-28 10:29+0000\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: Polish (http://www.transifex.com/projects/p/FusionDirectory-109/language/pl/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -33,15 +33,15 @@ msgstr ""
 msgid "SSH public keys for this user"
 msgstr ""
 
-#: personal/ssh/class_sshAccount.inc:89
+#: personal/ssh/class_sshAccount.inc:90
 msgid "SSH"
 msgstr ""
 
-#: personal/ssh/class_sshAccount.inc:90
+#: personal/ssh/class_sshAccount.inc:91
 msgid "Edit user's SSH public keys"
 msgstr ""
 
-#: personal/ssh/class_sshAccount.inc:112
+#: personal/ssh/class_sshAccount.inc:113
 #, php-format
 msgid "Error : there are several keys with fingerprint %s"
 msgstr ""
diff --git a/ssh/locale/pt/fusiondirectory.po b/ssh/locale/pt/fusiondirectory.po
index b0ab0582ce508f5a8efd11890e6b6c63265fdcdf..2f17deed46fe834f1244ff759f0ff8afa44925ed 100644
--- a/ssh/locale/pt/fusiondirectory.po
+++ b/ssh/locale/pt/fusiondirectory.po
@@ -5,12 +5,12 @@
 # Translators:
 msgid ""
 msgstr ""
-"Project-Id-Version: FusionDirectory-108\n"
+"Project-Id-Version: FusionDirectory-109\n"
 "Report-Msgid-Bugs-To: documentation@lists.fusiondirectory.org\n"
-"POT-Creation-Date: 2015-03-17 18:47+0100\n"
-"PO-Revision-Date: 2014-08-26 14:14+0000\n"
-"Last-Translator: fusiondirectory <contact@fusiondirectory.org>\n"
-"Language-Team: Portuguese (http://www.transifex.com/projects/p/FusionDirectory-108/language/pt/)\n"
+"POT-Creation-Date: 2014-12-15 17:47+0100\n"
+"PO-Revision-Date: 2014-08-28 10:29+0000\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: Portuguese (http://www.transifex.com/projects/p/FusionDirectory-109/language/pt/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -33,15 +33,15 @@ msgstr ""
 msgid "SSH public keys for this user"
 msgstr ""
 
-#: personal/ssh/class_sshAccount.inc:89
+#: personal/ssh/class_sshAccount.inc:90
 msgid "SSH"
 msgstr ""
 
-#: personal/ssh/class_sshAccount.inc:90
+#: personal/ssh/class_sshAccount.inc:91
 msgid "Edit user's SSH public keys"
 msgstr ""
 
-#: personal/ssh/class_sshAccount.inc:112
+#: personal/ssh/class_sshAccount.inc:113
 #, php-format
 msgid "Error : there are several keys with fingerprint %s"
 msgstr ""
diff --git a/ssh/locale/pt_BR/fusiondirectory.po b/ssh/locale/pt_BR/fusiondirectory.po
index 5d4b5188a632897454a2c55d226c9971efb0df6a..e12c98ece263d1ef2b651cc123fad76ac055fe31 100644
--- a/ssh/locale/pt_BR/fusiondirectory.po
+++ b/ssh/locale/pt_BR/fusiondirectory.po
@@ -3,15 +3,14 @@
 # This file is distributed under the same license as the PACKAGE package.
 # 
 # Translators:
-# ALEJANDRO BARRIOS <alejandrobarrios@interlegis.leg.br>, 2014
 msgid ""
 msgstr ""
-"Project-Id-Version: FusionDirectory-108\n"
+"Project-Id-Version: FusionDirectory-109\n"
 "Report-Msgid-Bugs-To: documentation@lists.fusiondirectory.org\n"
-"POT-Creation-Date: 2015-03-17 18:47+0100\n"
-"PO-Revision-Date: 2014-08-28 10:47+0000\n"
-"Last-Translator: fusiondirectory <contact@fusiondirectory.org>\n"
-"Language-Team: Portuguese (Brazil) (http://www.transifex.com/projects/p/FusionDirectory-108/language/pt_BR/)\n"
+"POT-Creation-Date: 2014-12-15 17:47+0100\n"
+"PO-Revision-Date: 2014-08-28 10:29+0000\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: Portuguese (Brazil) (http://www.transifex.com/projects/p/FusionDirectory-109/language/pt_BR/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -34,15 +33,15 @@ msgstr "Chaves SSH"
 msgid "SSH public keys for this user"
 msgstr "Chaves pÃºblicas de SSH para este usuÃ¡rio"
 
-#: personal/ssh/class_sshAccount.inc:89
+#: personal/ssh/class_sshAccount.inc:90
 msgid "SSH"
 msgstr "SSH"
 
-#: personal/ssh/class_sshAccount.inc:90
+#: personal/ssh/class_sshAccount.inc:91
 msgid "Edit user's SSH public keys"
 msgstr "Editar chaves pÃºblicas do usuÃ¡rio"
 
-#: personal/ssh/class_sshAccount.inc:112
+#: personal/ssh/class_sshAccount.inc:113
 #, php-format
 msgid "Error : there are several keys with fingerprint %s"
 msgstr "Erro: existem muitas chaves com impressÃ£o %s"
diff --git a/ssh/locale/ru/fusiondirectory.po b/ssh/locale/ru/fusiondirectory.po
index 1599159f0a1c284bcf5c842cbf7d6795711bce8f..5c84eae6b74e1b6fc68ba24c8710755bc0c7fe5d 100644
--- a/ssh/locale/ru/fusiondirectory.po
+++ b/ssh/locale/ru/fusiondirectory.po
@@ -3,20 +3,19 @@
 # This file is distributed under the same license as the PACKAGE package.
 # 
 # Translators:
-# Alexey, 2015
 msgid ""
 msgstr ""
-"Project-Id-Version: FusionDirectory-108\n"
+"Project-Id-Version: FusionDirectory-109\n"
 "Report-Msgid-Bugs-To: documentation@lists.fusiondirectory.org\n"
-"POT-Creation-Date: 2015-03-17 18:47+0100\n"
-"PO-Revision-Date: 2015-03-18 19:40+0000\n"
-"Last-Translator: Alexey\n"
-"Language-Team: Russian (http://www.transifex.com/projects/p/FusionDirectory-108/language/ru/)\n"
+"POT-Creation-Date: 2014-12-15 17:47+0100\n"
+"PO-Revision-Date: 2014-08-28 10:29+0000\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: Russian (http://www.transifex.com/projects/p/FusionDirectory-109/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=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);\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/ssh/class_sshAccount.inc:47
 msgid "Upload error"
@@ -34,15 +33,15 @@ msgstr "SSH ÐºÐ»ÑŽÑ‡Ð¸"
 msgid "SSH public keys for this user"
 msgstr "ÐŸÑƒÐ±Ð»Ð¸Ñ‡Ð½Ñ‹Ðµ SSH ÐºÐ»ÑŽÑ‡Ð¸ Ð´Ð»Ñ ÑÑ‚Ð¾Ð³Ð¾ Ð¿Ð¾Ð»ÑŒÐ·Ð¾Ð²Ð°Ñ‚ÐµÐ»Ñ"
 
-#: personal/ssh/class_sshAccount.inc:89
+#: personal/ssh/class_sshAccount.inc:90
 msgid "SSH"
 msgstr "SSH"
 
-#: personal/ssh/class_sshAccount.inc:90
+#: personal/ssh/class_sshAccount.inc:91
 msgid "Edit user's SSH public keys"
 msgstr "Ð ÐµÐ´Ð°ÐºÑ‚Ð¸Ñ€Ð¾Ð²Ð°Ñ‚ÑŒ Ð¿ÑƒÐ±Ð»Ð¸Ñ‡Ð½Ñ‹Ðµ ÐºÐ»ÑŽÑ‡Ð¸ SSH Ð¿Ð¾Ð»ÑŒÐ·Ð¾Ð²Ð°Ñ‚ÐµÐ»Ñ"
 
-#: personal/ssh/class_sshAccount.inc:112
+#: personal/ssh/class_sshAccount.inc:113
 #, php-format
 msgid "Error : there are several keys with fingerprint %s"
 msgstr ""
diff --git a/ssh/locale/ru@petr1708/fusiondirectory.po b/ssh/locale/ru@petr1708/fusiondirectory.po
index 2a4f24b2df87aa763ea5efd6ba54366def7725cf..6d235edfae12c52a4e6c88a0a16112c117304c07 100644
--- a/ssh/locale/ru@petr1708/fusiondirectory.po
+++ b/ssh/locale/ru@petr1708/fusiondirectory.po
@@ -5,17 +5,17 @@
 # Translators:
 msgid ""
 msgstr ""
-"Project-Id-Version: FusionDirectory-108\n"
+"Project-Id-Version: FusionDirectory-109\n"
 "Report-Msgid-Bugs-To: documentation@lists.fusiondirectory.org\n"
-"POT-Creation-Date: 2015-03-17 18:47+0100\n"
-"PO-Revision-Date: 2014-08-26 14:14+0000\n"
-"Last-Translator: fusiondirectory <contact@fusiondirectory.org>\n"
-"Language-Team: Russian Petrine orthography (http://www.transifex.com/projects/p/FusionDirectory-108/language/ru@petr1708/)\n"
+"POT-Creation-Date: 2014-12-15 17:47+0100\n"
+"PO-Revision-Date: 2014-08-28 10:29+0000\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: Russian Petrine orthography (http://www.transifex.com/projects/p/FusionDirectory-109/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=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);\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/ssh/class_sshAccount.inc:47
 msgid "Upload error"
@@ -33,15 +33,15 @@ msgstr ""
 msgid "SSH public keys for this user"
 msgstr ""
 
-#: personal/ssh/class_sshAccount.inc:89
+#: personal/ssh/class_sshAccount.inc:90
 msgid "SSH"
 msgstr ""
 
-#: personal/ssh/class_sshAccount.inc:90
+#: personal/ssh/class_sshAccount.inc:91
 msgid "Edit user's SSH public keys"
 msgstr ""
 
-#: personal/ssh/class_sshAccount.inc:112
+#: personal/ssh/class_sshAccount.inc:113
 #, php-format
 msgid "Error : there are several keys with fingerprint %s"
 msgstr ""
diff --git a/ssh/locale/sv/fusiondirectory.po b/ssh/locale/sv/fusiondirectory.po
index f20646ab6e5a8b4326cd720b2fdee2aada4f0108..7db93e6825cd529f10a6ce56e04ebac153996b0b 100644
--- a/ssh/locale/sv/fusiondirectory.po
+++ b/ssh/locale/sv/fusiondirectory.po
@@ -5,12 +5,12 @@
 # Translators:
 msgid ""
 msgstr ""
-"Project-Id-Version: FusionDirectory-108\n"
+"Project-Id-Version: FusionDirectory-109\n"
 "Report-Msgid-Bugs-To: documentation@lists.fusiondirectory.org\n"
-"POT-Creation-Date: 2015-03-17 18:47+0100\n"
-"PO-Revision-Date: 2014-08-26 14:14+0000\n"
-"Last-Translator: fusiondirectory <contact@fusiondirectory.org>\n"
-"Language-Team: Swedish (http://www.transifex.com/projects/p/FusionDirectory-108/language/sv/)\n"
+"POT-Creation-Date: 2014-12-15 17:47+0100\n"
+"PO-Revision-Date: 2014-08-28 10:29+0000\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: Swedish (http://www.transifex.com/projects/p/FusionDirectory-109/language/sv/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -33,15 +33,15 @@ msgstr ""
 msgid "SSH public keys for this user"
 msgstr ""
 
-#: personal/ssh/class_sshAccount.inc:89
+#: personal/ssh/class_sshAccount.inc:90
 msgid "SSH"
 msgstr ""
 
-#: personal/ssh/class_sshAccount.inc:90
+#: personal/ssh/class_sshAccount.inc:91
 msgid "Edit user's SSH public keys"
 msgstr ""
 
-#: personal/ssh/class_sshAccount.inc:112
+#: personal/ssh/class_sshAccount.inc:113
 #, php-format
 msgid "Error : there are several keys with fingerprint %s"
 msgstr ""
diff --git a/ssh/locale/ug/fusiondirectory.po b/ssh/locale/ug/fusiondirectory.po
index b8ff88aac5993c1fecc00aa371eb8413f45ace79..50f92fc328c41d45a41393713021aa1c0d76ca7d 100644
--- a/ssh/locale/ug/fusiondirectory.po
+++ b/ssh/locale/ug/fusiondirectory.po
@@ -5,12 +5,12 @@
 # Translators:
 msgid ""
 msgstr ""
-"Project-Id-Version: FusionDirectory-108\n"
+"Project-Id-Version: FusionDirectory-109\n"
 "Report-Msgid-Bugs-To: documentation@lists.fusiondirectory.org\n"
-"POT-Creation-Date: 2015-03-17 18:47+0100\n"
-"PO-Revision-Date: 2014-08-26 14:14+0000\n"
-"Last-Translator: fusiondirectory <contact@fusiondirectory.org>\n"
-"Language-Team: Uighur (http://www.transifex.com/projects/p/FusionDirectory-108/language/ug/)\n"
+"POT-Creation-Date: 2014-12-15 17:47+0100\n"
+"PO-Revision-Date: 2014-08-28 10:29+0000\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: Uighur (http://www.transifex.com/projects/p/FusionDirectory-109/language/ug/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -33,15 +33,15 @@ msgstr ""
 msgid "SSH public keys for this user"
 msgstr ""
 
-#: personal/ssh/class_sshAccount.inc:89
+#: personal/ssh/class_sshAccount.inc:90
 msgid "SSH"
 msgstr ""
 
-#: personal/ssh/class_sshAccount.inc:90
+#: personal/ssh/class_sshAccount.inc:91
 msgid "Edit user's SSH public keys"
 msgstr ""
 
-#: personal/ssh/class_sshAccount.inc:112
+#: personal/ssh/class_sshAccount.inc:113
 #, php-format
 msgid "Error : there are several keys with fingerprint %s"
 msgstr ""
diff --git a/ssh/locale/vi_VN/fusiondirectory.po b/ssh/locale/vi_VN/fusiondirectory.po
index 7d9b09cfc87f8eb4e76b95b19901e1a5dd137f59..572cf5b3ee689b16c92987d9defacc6c1bc5d036 100644
--- a/ssh/locale/vi_VN/fusiondirectory.po
+++ b/ssh/locale/vi_VN/fusiondirectory.po
@@ -5,12 +5,12 @@
 # Translators:
 msgid ""
 msgstr ""
-"Project-Id-Version: FusionDirectory-108\n"
+"Project-Id-Version: FusionDirectory-109\n"
 "Report-Msgid-Bugs-To: documentation@lists.fusiondirectory.org\n"
-"POT-Creation-Date: 2015-03-17 18:47+0100\n"
-"PO-Revision-Date: 2014-08-26 14:14+0000\n"
-"Last-Translator: fusiondirectory <contact@fusiondirectory.org>\n"
-"Language-Team: Vietnamese (Viet Nam) (http://www.transifex.com/projects/p/FusionDirectory-108/language/vi_VN/)\n"
+"POT-Creation-Date: 2014-12-15 17:47+0100\n"
+"PO-Revision-Date: 2014-08-28 10:29+0000\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: Vietnamese (Viet Nam) (http://www.transifex.com/projects/p/FusionDirectory-109/language/vi_VN/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -33,15 +33,15 @@ msgstr ""
 msgid "SSH public keys for this user"
 msgstr ""
 
-#: personal/ssh/class_sshAccount.inc:89
+#: personal/ssh/class_sshAccount.inc:90
 msgid "SSH"
 msgstr ""
 
-#: personal/ssh/class_sshAccount.inc:90
+#: personal/ssh/class_sshAccount.inc:91
 msgid "Edit user's SSH public keys"
 msgstr ""
 
-#: personal/ssh/class_sshAccount.inc:112
+#: personal/ssh/class_sshAccount.inc:113
 #, php-format
 msgid "Error : there are several keys with fingerprint %s"
 msgstr ""
diff --git a/ssh/locale/zh/fusiondirectory.po b/ssh/locale/zh/fusiondirectory.po
index 0516aab0b0ef072365b761199b69e2979e51bc84..a4b68c59b061a172ad4c2a1825defee34d8f7a1a 100644
--- a/ssh/locale/zh/fusiondirectory.po
+++ b/ssh/locale/zh/fusiondirectory.po
@@ -5,12 +5,12 @@
 # Translators:
 msgid ""
 msgstr ""
-"Project-Id-Version: FusionDirectory-108\n"
+"Project-Id-Version: FusionDirectory-109\n"
 "Report-Msgid-Bugs-To: documentation@lists.fusiondirectory.org\n"
-"POT-Creation-Date: 2015-03-17 18:47+0100\n"
-"PO-Revision-Date: 2014-08-26 14:14+0000\n"
-"Last-Translator: fusiondirectory <contact@fusiondirectory.org>\n"
-"Language-Team: Chinese (http://www.transifex.com/projects/p/FusionDirectory-108/language/zh/)\n"
+"POT-Creation-Date: 2014-12-15 17:47+0100\n"
+"PO-Revision-Date: 2014-08-28 10:29+0000\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: Chinese (http://www.transifex.com/projects/p/FusionDirectory-109/language/zh/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -33,15 +33,15 @@ msgstr ""
 msgid "SSH public keys for this user"
 msgstr ""
 
-#: personal/ssh/class_sshAccount.inc:89
+#: personal/ssh/class_sshAccount.inc:90
 msgid "SSH"
 msgstr ""
 
-#: personal/ssh/class_sshAccount.inc:90
+#: personal/ssh/class_sshAccount.inc:91
 msgid "Edit user's SSH public keys"
 msgstr ""
 
-#: personal/ssh/class_sshAccount.inc:112
+#: personal/ssh/class_sshAccount.inc:113
 #, php-format
 msgid "Error : there are several keys with fingerprint %s"
 msgstr ""
diff --git a/sudo/locale/ar/fusiondirectory.po b/sudo/locale/ar/fusiondirectory.po
index 7abadc05b4e332c52cb6f13d4c69d7feab133641..4c378c5768e1aef75c3a8e8a9abc1e78c42198ba 100644
--- a/sudo/locale/ar/fusiondirectory.po
+++ b/sudo/locale/ar/fusiondirectory.po
@@ -5,12 +5,12 @@
 # Translators:
 msgid ""
 msgstr ""
-"Project-Id-Version: FusionDirectory-108\n"
+"Project-Id-Version: FusionDirectory-109\n"
 "Report-Msgid-Bugs-To: documentation@lists.fusiondirectory.org\n"
-"POT-Creation-Date: 2015-03-17 18:47+0100\n"
-"PO-Revision-Date: 2015-02-25 16:02+0000\n"
+"POT-Creation-Date: 2014-12-15 17:47+0100\n"
+"PO-Revision-Date: 2015-02-25 16:04+0000\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>\n"
-"Language-Team: Arabic (http://www.transifex.com/projects/p/FusionDirectory-108/language/ar/)\n"
+"Language-Team: Arabic (http://www.transifex.com/projects/p/FusionDirectory-109/language/ar/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -26,36 +26,36 @@ msgstr ""
 msgid "The sudo option '%s' is invalid!"
 msgstr ""
 
-#: admin/sudo/class_sudoOption.inc:278
+#: admin/sudo/class_sudoOption.inc:276
 #, php-format
 msgid "%s (%s)"
 msgstr ""
 
-#: admin/sudo/class_sudoOption.inc:481
+#: admin/sudo/class_sudoOption.inc:479
 msgid "Available options"
 msgstr ""
 
-#: admin/sudo/class_sudoOption.inc:484
+#: admin/sudo/class_sudoOption.inc:482
 msgid "Option"
 msgstr "Ø¥Ø®ØªÙŠØ§Ø±"
 
-#: admin/sudo/class_sudoOption.inc:484
+#: admin/sudo/class_sudoOption.inc:482
 msgid "Add a new sudo option"
 msgstr ""
 
-#: admin/sudo/class_sudoOption.inc:489 admin/sudo/class_sudoOption.inc:491
+#: admin/sudo/class_sudoOption.inc:487 admin/sudo/class_sudoOption.inc:489
 msgid "Used sudo role options"
 msgstr ""
 
-#: admin/sudo/class_sudoOption.inc:563
+#: admin/sudo/class_sudoOption.inc:561
 msgid "Options"
 msgstr ""
 
-#: admin/sudo/class_sudoOption.inc:564
+#: admin/sudo/class_sudoOption.inc:562
 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:82
 #: config/sudo/class_sudoConfig.inc:42
 msgid "Sudo"
 msgstr ""
@@ -64,79 +64,93 @@ msgstr ""
 msgid "Sudo management"
 msgstr ""
 
-#: admin/sudo/class_sudoGeneric.inc:122 admin/sudo/class_sudoGeneric.inc:126
+#: admin/sudo/class_sudoGeneric.inc:83 admin/sudo/class_sudoGeneric.inc:87
 msgid "Sudo role"
 msgstr ""
 
-#: admin/sudo/class_sudoGeneric.inc:141
-msgid "Role settings"
+#: admin/sudo/class_sudoGeneric.inc:102
+msgid "Generic"
 msgstr ""
 
-#: admin/sudo/class_sudoGeneric.inc:146
+#: admin/sudo/class_sudoGeneric.inc:102
+msgid "global defaults"
+msgstr ""
+
+#: admin/sudo/class_sudoGeneric.inc:107
 msgid "Name"
 msgstr "Ø§Ù„Ø¥Ø³Ù…"
 
-#: admin/sudo/class_sudoGeneric.inc:146
+#: admin/sudo/class_sudoGeneric.inc:107
 msgid "Name of the role"
 msgstr ""
 
-#: admin/sudo/class_sudoGeneric.inc:151
+#: admin/sudo/class_sudoGeneric.inc:112
 msgid "Description"
 msgstr "Ø§Ù„ÙˆØµÙ"
 
-#: admin/sudo/class_sudoGeneric.inc:151
+#: admin/sudo/class_sudoGeneric.inc:112
 msgid "Description for the new sudo role"
 msgstr ""
 
-#: admin/sudo/class_sudoGeneric.inc:156
+#: admin/sudo/class_sudoGeneric.inc:117
 msgid "Commands"
 msgstr ""
 
-#: admin/sudo/class_sudoGeneric.inc:157
+#: admin/sudo/class_sudoGeneric.inc:118
 msgid ""
 "A Unix command with optional command line arguments, potentially including "
 "globbing characters (aka wild cards)"
 msgstr ""
 
-#: admin/sudo/class_sudoGeneric.inc:163
-msgid "Run as (user)"
-msgstr ""
-
-#: admin/sudo/class_sudoGeneric.inc:164
-msgid "User(s) impersonated by sudo"
+#: admin/sudo/class_sudoGeneric.inc:124
+msgid "Run as"
 msgstr ""
 
-#: admin/sudo/class_sudoGeneric.inc:171
-msgid "Run as (group)"
-msgstr ""
-
-#: admin/sudo/class_sudoGeneric.inc:172
-msgid "Group(s) impersonated by sudo"
+#: admin/sudo/class_sudoGeneric.inc:125
+msgid ""
+"A user that commands may be run as or a Unix group that contains a list of "
+"users that commands may be run as"
 msgstr ""
 
-#: admin/sudo/class_sudoGeneric.inc:178
+#: admin/sudo/class_sudoGeneric.inc:131
 msgid "Systems"
 msgstr "Ø£Ù†Ø¸Ù…Ø©"
 
-#: admin/sudo/class_sudoGeneric.inc:178
+#: admin/sudo/class_sudoGeneric.inc:131
 msgid "A host name, IP address or IP network"
 msgstr ""
 
-#: admin/sudo/class_sudoGeneric.inc:183
+#: admin/sudo/class_sudoGeneric.inc:136
 msgid "Users and groups"
 msgstr ""
 
-#: admin/sudo/class_sudoGeneric.inc:184
+#: admin/sudo/class_sudoGeneric.inc:137
 msgid ""
 "A user name, user ID (prefixed with '#'), Unix group (prefixed with '%')"
 msgstr ""
 
-#: admin/sudo/class_sudoGeneric.inc:188
-msgid "Priority"
+#: admin/sudo/class_sudoGeneric.inc:144
+msgid "System trust"
+msgstr ""
+
+#: admin/sudo/class_sudoGeneric.inc:148
+msgid "Trust mode"
+msgstr ""
+
+#: admin/sudo/class_sudoGeneric.inc:148
+msgid "Trust mode for the role"
+msgstr ""
+
+#: admin/sudo/class_sudoGeneric.inc:152
+msgid "disabled"
+msgstr ""
+
+#: admin/sudo/class_sudoGeneric.inc:152
+msgid "full access"
 msgstr ""
 
-#: admin/sudo/class_sudoGeneric.inc:188
-msgid "This rule priority compared to others"
+#: admin/sudo/class_sudoGeneric.inc:152
+msgid "allow access to these hosts"
 msgstr ""
 
 #: config/sudo/class_sudoConfig.inc:28
diff --git a/sudo/locale/ca/fusiondirectory.po b/sudo/locale/ca/fusiondirectory.po
index 3af571703862742ad8122aa13ea4d8a275a8369f..1ba97e4a03e2b565709843a367567bd6fe2dc754 100644
--- a/sudo/locale/ca/fusiondirectory.po
+++ b/sudo/locale/ca/fusiondirectory.po
@@ -5,12 +5,12 @@
 # Translators:
 msgid ""
 msgstr ""
-"Project-Id-Version: FusionDirectory-108\n"
+"Project-Id-Version: FusionDirectory-109\n"
 "Report-Msgid-Bugs-To: documentation@lists.fusiondirectory.org\n"
-"POT-Creation-Date: 2015-03-17 18:47+0100\n"
-"PO-Revision-Date: 2015-02-25 16:02+0000\n"
+"POT-Creation-Date: 2014-12-15 17:47+0100\n"
+"PO-Revision-Date: 2015-02-25 16:13+0000\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>\n"
-"Language-Team: Catalan (http://www.transifex.com/projects/p/FusionDirectory-108/language/ca/)\n"
+"Language-Team: Catalan (http://www.transifex.com/projects/p/FusionDirectory-109/language/ca/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -26,36 +26,36 @@ msgstr ""
 msgid "The sudo option '%s' is invalid!"
 msgstr ""
 
-#: admin/sudo/class_sudoOption.inc:278
+#: admin/sudo/class_sudoOption.inc:276
 #, php-format
 msgid "%s (%s)"
 msgstr ""
 
-#: admin/sudo/class_sudoOption.inc:481
+#: admin/sudo/class_sudoOption.inc:479
 msgid "Available options"
 msgstr ""
 
-#: admin/sudo/class_sudoOption.inc:484
+#: admin/sudo/class_sudoOption.inc:482
 msgid "Option"
 msgstr ""
 
-#: admin/sudo/class_sudoOption.inc:484
+#: admin/sudo/class_sudoOption.inc:482
 msgid "Add a new sudo option"
 msgstr ""
 
-#: admin/sudo/class_sudoOption.inc:489 admin/sudo/class_sudoOption.inc:491
+#: admin/sudo/class_sudoOption.inc:487 admin/sudo/class_sudoOption.inc:489
 msgid "Used sudo role options"
 msgstr ""
 
-#: admin/sudo/class_sudoOption.inc:563
+#: admin/sudo/class_sudoOption.inc:561
 msgid "Options"
 msgstr ""
 
-#: admin/sudo/class_sudoOption.inc:564
+#: admin/sudo/class_sudoOption.inc:562
 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:82
 #: config/sudo/class_sudoConfig.inc:42
 msgid "Sudo"
 msgstr ""
@@ -64,79 +64,93 @@ msgstr ""
 msgid "Sudo management"
 msgstr ""
 
-#: admin/sudo/class_sudoGeneric.inc:122 admin/sudo/class_sudoGeneric.inc:126
+#: admin/sudo/class_sudoGeneric.inc:83 admin/sudo/class_sudoGeneric.inc:87
 msgid "Sudo role"
 msgstr ""
 
-#: admin/sudo/class_sudoGeneric.inc:141
-msgid "Role settings"
+#: admin/sudo/class_sudoGeneric.inc:102
+msgid "Generic"
+msgstr "GenÃ¨ric"
+
+#: admin/sudo/class_sudoGeneric.inc:102
+msgid "global defaults"
 msgstr ""
 
-#: admin/sudo/class_sudoGeneric.inc:146
+#: admin/sudo/class_sudoGeneric.inc:107
 msgid "Name"
 msgstr "Nom"
 
-#: admin/sudo/class_sudoGeneric.inc:146
+#: admin/sudo/class_sudoGeneric.inc:107
 msgid "Name of the role"
 msgstr ""
 
-#: admin/sudo/class_sudoGeneric.inc:151
+#: admin/sudo/class_sudoGeneric.inc:112
 msgid "Description"
 msgstr ""
 
-#: admin/sudo/class_sudoGeneric.inc:151
+#: admin/sudo/class_sudoGeneric.inc:112
 msgid "Description for the new sudo role"
 msgstr ""
 
-#: admin/sudo/class_sudoGeneric.inc:156
+#: admin/sudo/class_sudoGeneric.inc:117
 msgid "Commands"
 msgstr ""
 
-#: admin/sudo/class_sudoGeneric.inc:157
+#: admin/sudo/class_sudoGeneric.inc:118
 msgid ""
 "A Unix command with optional command line arguments, potentially including "
 "globbing characters (aka wild cards)"
 msgstr ""
 
-#: admin/sudo/class_sudoGeneric.inc:163
-msgid "Run as (user)"
-msgstr ""
-
-#: admin/sudo/class_sudoGeneric.inc:164
-msgid "User(s) impersonated by sudo"
+#: admin/sudo/class_sudoGeneric.inc:124
+msgid "Run as"
 msgstr ""
 
-#: admin/sudo/class_sudoGeneric.inc:171
-msgid "Run as (group)"
-msgstr ""
-
-#: admin/sudo/class_sudoGeneric.inc:172
-msgid "Group(s) impersonated by sudo"
+#: admin/sudo/class_sudoGeneric.inc:125
+msgid ""
+"A user that commands may be run as or a Unix group that contains a list of "
+"users that commands may be run as"
 msgstr ""
 
-#: admin/sudo/class_sudoGeneric.inc:178
+#: admin/sudo/class_sudoGeneric.inc:131
 msgid "Systems"
 msgstr ""
 
-#: admin/sudo/class_sudoGeneric.inc:178
+#: admin/sudo/class_sudoGeneric.inc:131
 msgid "A host name, IP address or IP network"
 msgstr ""
 
-#: admin/sudo/class_sudoGeneric.inc:183
+#: admin/sudo/class_sudoGeneric.inc:136
 msgid "Users and groups"
 msgstr ""
 
-#: admin/sudo/class_sudoGeneric.inc:184
+#: admin/sudo/class_sudoGeneric.inc:137
 msgid ""
 "A user name, user ID (prefixed with '#'), Unix group (prefixed with '%')"
 msgstr ""
 
-#: admin/sudo/class_sudoGeneric.inc:188
-msgid "Priority"
+#: admin/sudo/class_sudoGeneric.inc:144
+msgid "System trust"
+msgstr ""
+
+#: admin/sudo/class_sudoGeneric.inc:148
+msgid "Trust mode"
+msgstr ""
+
+#: admin/sudo/class_sudoGeneric.inc:148
+msgid "Trust mode for the role"
+msgstr ""
+
+#: admin/sudo/class_sudoGeneric.inc:152
+msgid "disabled"
+msgstr ""
+
+#: admin/sudo/class_sudoGeneric.inc:152
+msgid "full access"
 msgstr ""
 
-#: admin/sudo/class_sudoGeneric.inc:188
-msgid "This rule priority compared to others"
+#: admin/sudo/class_sudoGeneric.inc:152
+msgid "allow access to these hosts"
 msgstr ""
 
 #: config/sudo/class_sudoConfig.inc:28
diff --git a/sudo/locale/cs_CZ/fusiondirectory.po b/sudo/locale/cs_CZ/fusiondirectory.po
index fb80a1a796df812a7ee18e47e46e4c52d6bcd410..8d87b9bfdb54b0678a5f4f02e341c7d08355ca8c 100644
--- a/sudo/locale/cs_CZ/fusiondirectory.po
+++ b/sudo/locale/cs_CZ/fusiondirectory.po
@@ -3,17 +3,15 @@
 # This file is distributed under the same license as the PACKAGE package.
 # 
 # Translators:
-# Pavel Borecki <pavel.borecki@gmail.com>, 2012
-# Pavel Borecki <pavel.borecki@gmail.com>, 2012
-# Pavel Borecki <pavel.borecki@gmail.com>, 2012
+# Pavel Borecki <pavel.borecki@gmail.com>, 2015
 msgid ""
 msgstr ""
-"Project-Id-Version: FusionDirectory-108\n"
+"Project-Id-Version: FusionDirectory-109\n"
 "Report-Msgid-Bugs-To: documentation@lists.fusiondirectory.org\n"
-"POT-Creation-Date: 2015-03-17 18:47+0100\n"
-"PO-Revision-Date: 2015-02-25 16:12+0000\n"
-"Last-Translator: fusiondirectory <contact@fusiondirectory.org>\n"
-"Language-Team: Czech (Czech Republic) (http://www.transifex.com/projects/p/FusionDirectory-108/language/cs_CZ/)\n"
+"POT-Creation-Date: 2014-12-15 17:47+0100\n"
+"PO-Revision-Date: 2015-04-07 19:21+0000\n"
+"Last-Translator: Pavel Borecki <pavel.borecki@gmail.com>\n"
+"Language-Team: Czech (Czech Republic) (http://www.transifex.com/projects/p/FusionDirectory-109/language/cs_CZ/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -22,138 +20,152 @@ msgstr ""
 
 #: admin/sudo/class_sudoOption.inc:82
 msgid "Unknown option"
-msgstr "neznÃ¡mÃ½ parametr"
+msgstr "NeznÃ¡mÃ¡ pÅ™edvolba"
 
 #: admin/sudo/class_sudoOption.inc:83
 #, php-format
 msgid "The sudo option '%s' is invalid!"
-msgstr "parametr '%s' pro sudo nenÃ platnÃ½!"
+msgstr "Parametr %s pro sudo nenÃ platnÃ½!"
 
-#: admin/sudo/class_sudoOption.inc:278
+#: admin/sudo/class_sudoOption.inc:276
 #, php-format
 msgid "%s (%s)"
 msgstr ""
 
-#: admin/sudo/class_sudoOption.inc:481
+#: admin/sudo/class_sudoOption.inc:479
 msgid "Available options"
 msgstr "dostupnÃ© volby"
 
-#: admin/sudo/class_sudoOption.inc:484
+#: admin/sudo/class_sudoOption.inc:482
 msgid "Option"
 msgstr "volba"
 
-#: admin/sudo/class_sudoOption.inc:484
+#: admin/sudo/class_sudoOption.inc:482
 msgid "Add a new sudo option"
-msgstr ""
+msgstr "PÅ™idat dalÅ¡Ã volbu pro sudo"
 
-#: admin/sudo/class_sudoOption.inc:489 admin/sudo/class_sudoOption.inc:491
+#: admin/sudo/class_sudoOption.inc:487 admin/sudo/class_sudoOption.inc:489
 msgid "Used sudo role options"
-msgstr ""
+msgstr "PouÅ¾itÃ© volby role sudo"
 
-#: admin/sudo/class_sudoOption.inc:563
+#: admin/sudo/class_sudoOption.inc:561
 msgid "Options"
-msgstr "volby"
+msgstr "MoÅ¾nosti"
 
-#: admin/sudo/class_sudoOption.inc:564
+#: admin/sudo/class_sudoOption.inc:562
 msgid "Sudo options"
 msgstr "nastavenÃ sudo"
 
-#: admin/sudo/class_sudoManagement.inc:32 admin/sudo/class_sudoGeneric.inc:121
+#: admin/sudo/class_sudoManagement.inc:32 admin/sudo/class_sudoGeneric.inc:82
 #: config/sudo/class_sudoConfig.inc:42
 msgid "Sudo"
 msgstr "sudo"
 
 #: admin/sudo/class_sudoManagement.inc:33
 msgid "Sudo management"
-msgstr "sprÃ¡va sudo"
+msgstr "SprÃ¡va sudo"
 
-#: admin/sudo/class_sudoGeneric.inc:122 admin/sudo/class_sudoGeneric.inc:126
+#: admin/sudo/class_sudoGeneric.inc:83 admin/sudo/class_sudoGeneric.inc:87
 msgid "Sudo role"
-msgstr "role v sudo"
+msgstr "Role v sudo"
 
-#: admin/sudo/class_sudoGeneric.inc:141
-msgid "Role settings"
-msgstr ""
+#: admin/sudo/class_sudoGeneric.inc:102
+msgid "Generic"
+msgstr "ObecnÃ©"
+
+#: admin/sudo/class_sudoGeneric.inc:102
+msgid "global defaults"
+msgstr "CelkovÃ© vÃ½chozÃ"
 
-#: admin/sudo/class_sudoGeneric.inc:146
+#: admin/sudo/class_sudoGeneric.inc:107
 msgid "Name"
-msgstr "nÃ¡zev"
+msgstr "NÃ¡zev"
 
-#: admin/sudo/class_sudoGeneric.inc:146
+#: admin/sudo/class_sudoGeneric.inc:107
 msgid "Name of the role"
-msgstr ""
+msgstr "NÃ¡zev role"
 
-#: admin/sudo/class_sudoGeneric.inc:151
+#: admin/sudo/class_sudoGeneric.inc:112
 msgid "Description"
-msgstr "popis"
+msgstr "Popis"
 
-#: admin/sudo/class_sudoGeneric.inc:151
+#: admin/sudo/class_sudoGeneric.inc:112
 msgid "Description for the new sudo role"
-msgstr ""
+msgstr "Popis pro novou roli sudo"
 
-#: admin/sudo/class_sudoGeneric.inc:156
+#: admin/sudo/class_sudoGeneric.inc:117
 msgid "Commands"
 msgstr "pÅ™Ãkazy"
 
-#: admin/sudo/class_sudoGeneric.inc:157
+#: admin/sudo/class_sudoGeneric.inc:118
 msgid ""
 "A Unix command with optional command line arguments, potentially including "
 "globbing characters (aka wild cards)"
-msgstr ""
+msgstr "UnixovÃ½ pÅ™Ãkaz s volitelnÃ½mi argumenty, pÅ™ÃpadnÄ› obsahujÃcÃ zÃ¡stupnÃ© znaky"
 
-#: admin/sudo/class_sudoGeneric.inc:163
-msgid "Run as (user)"
-msgstr ""
-
-#: admin/sudo/class_sudoGeneric.inc:164
-msgid "User(s) impersonated by sudo"
-msgstr ""
+#: admin/sudo/class_sudoGeneric.inc:124
+msgid "Run as"
+msgstr "Spustit jako"
 
-#: admin/sudo/class_sudoGeneric.inc:171
-msgid "Run as (group)"
-msgstr ""
-
-#: admin/sudo/class_sudoGeneric.inc:172
-msgid "Group(s) impersonated by sudo"
-msgstr ""
+#: admin/sudo/class_sudoGeneric.inc:125
+msgid ""
+"A user that commands may be run as or a Unix group that contains a list of "
+"users that commands may be run as"
+msgstr "UÅ¾ivatelskÃ½ ÃºÄet Äi unixovÃ¡ skupina, jejÃÅ¾ ÄlenovÃ© mohou spouÅ¡tÄ›t tyto pÅ™Ãkazy"
 
-#: admin/sudo/class_sudoGeneric.inc:178
+#: admin/sudo/class_sudoGeneric.inc:131
 msgid "Systems"
-msgstr "systÃ©my"
+msgstr "SystÃ©my"
 
-#: admin/sudo/class_sudoGeneric.inc:178
+#: admin/sudo/class_sudoGeneric.inc:131
 msgid "A host name, IP address or IP network"
-msgstr ""
+msgstr "NÃ¡zev poÄÃtaÄe, IP adresa nebo sÃÅ¥"
 
-#: admin/sudo/class_sudoGeneric.inc:183
+#: admin/sudo/class_sudoGeneric.inc:136
 msgid "Users and groups"
-msgstr "uÅ¾ivatelÃ© a skupiny"
+msgstr "UÅ¾ivatelÃ© a skupiny"
 
-#: admin/sudo/class_sudoGeneric.inc:184
+#: admin/sudo/class_sudoGeneric.inc:137
 msgid ""
 "A user name, user ID (prefixed with '#'), Unix group (prefixed with '%')"
-msgstr ""
+msgstr "UÅ¾ivatelskÃ© jmÃ©no, identifikÃ¡tor (pÅ™edeslanÃ½ znakem #), unixovÃ¡ skupiny (pÅ™edeslanÃ¡ znakem %)"
 
-#: admin/sudo/class_sudoGeneric.inc:188
-msgid "Priority"
-msgstr "priorita"
+#: admin/sudo/class_sudoGeneric.inc:144
+msgid "System trust"
+msgstr "systÃ©m dÅ¯vÄ›ryhodnosti"
 
-#: admin/sudo/class_sudoGeneric.inc:188
-msgid "This rule priority compared to others"
-msgstr ""
+#: admin/sudo/class_sudoGeneric.inc:148
+msgid "Trust mode"
+msgstr "reÅ¾im dÅ¯vÄ›ryhodnosti"
+
+#: admin/sudo/class_sudoGeneric.inc:148
+msgid "Trust mode for the role"
+msgstr "ReÅ¾im dÅ¯vÄ›ry pro roli"
+
+#: admin/sudo/class_sudoGeneric.inc:152
+msgid "disabled"
+msgstr "vypnuto"
+
+#: admin/sudo/class_sudoGeneric.inc:152
+msgid "full access"
+msgstr "plnÃ½ pÅ™Ãstup"
+
+#: admin/sudo/class_sudoGeneric.inc:152
+msgid "allow access to these hosts"
+msgstr "povolit pÅ™Ãstup k tÄ›mto poÄÃtaÄÅ¯m"
 
 #: config/sudo/class_sudoConfig.inc:28
 msgid "Sudo configuration"
-msgstr ""
+msgstr "NastavenÃ sudo"
 
 #: config/sudo/class_sudoConfig.inc:29
 msgid "FusionDirectory sudo plugin configuration"
-msgstr ""
+msgstr "NastavenÃ zÃ¡suvnÃ©ho modulu sudo pro FusionDirectory"
 
 #: config/sudo/class_sudoConfig.inc:45
 msgid "Sudo RDN"
-msgstr ""
+msgstr "RelativnÃ rozliÅ¡enÃ½ nÃ¡zev pro sudo"
 
 #: config/sudo/class_sudoConfig.inc:45
 msgid "Branch in which sudoers will be stored"
-msgstr ""
+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 e709e4b331ec10ac47690db0e75d9295c3b73512..1b24e4f0a697d831c252b318e95c49ff718a58eb 100644
--- a/sudo/locale/de/fusiondirectory.po
+++ b/sudo/locale/de/fusiondirectory.po
@@ -3,16 +3,14 @@
 # This file is distributed under the same license as the PACKAGE package.
 # 
 # Translators:
-#  Cajus Pollmeier <pollmeier@gonicus.de>, 2008
-# Maik Wagner <maikwagner@yahoo.com>, 2013
 msgid ""
 msgstr ""
-"Project-Id-Version: FusionDirectory-108\n"
+"Project-Id-Version: FusionDirectory-109\n"
 "Report-Msgid-Bugs-To: documentation@lists.fusiondirectory.org\n"
-"POT-Creation-Date: 2015-03-17 18:47+0100\n"
-"PO-Revision-Date: 2015-02-25 16:12+0000\n"
+"POT-Creation-Date: 2014-12-15 17:47+0100\n"
+"PO-Revision-Date: 2015-03-21 23:49+0000\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>\n"
-"Language-Team: German (http://www.transifex.com/projects/p/FusionDirectory-108/language/de/)\n"
+"Language-Team: German (http://www.transifex.com/projects/p/FusionDirectory-109/language/de/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -28,36 +26,36 @@ msgstr "Unbekannte Option"
 msgid "The sudo option '%s' is invalid!"
 msgstr "Die sudo-Option '%s' ist ungÃ¼ltig!"
 
-#: admin/sudo/class_sudoOption.inc:278
+#: admin/sudo/class_sudoOption.inc:276
 #, php-format
 msgid "%s (%s)"
 msgstr "%s (%s)"
 
-#: admin/sudo/class_sudoOption.inc:481
+#: admin/sudo/class_sudoOption.inc:479
 msgid "Available options"
 msgstr "VerfÃ¼gbare Optionen"
 
-#: admin/sudo/class_sudoOption.inc:484
+#: admin/sudo/class_sudoOption.inc:482
 msgid "Option"
 msgstr "Option"
 
-#: admin/sudo/class_sudoOption.inc:484
+#: admin/sudo/class_sudoOption.inc:482
 msgid "Add a new sudo option"
 msgstr "Eine neue sudo-Option hinzufÃ¼gen"
 
-#: admin/sudo/class_sudoOption.inc:489 admin/sudo/class_sudoOption.inc:491
+#: admin/sudo/class_sudoOption.inc:487 admin/sudo/class_sudoOption.inc:489
 msgid "Used sudo role options"
 msgstr "Benutzte sudo Rollenoptionen"
 
-#: admin/sudo/class_sudoOption.inc:563
+#: admin/sudo/class_sudoOption.inc:561
 msgid "Options"
 msgstr "Optionen"
 
-#: admin/sudo/class_sudoOption.inc:564
+#: admin/sudo/class_sudoOption.inc:562
 msgid "Sudo options"
 msgstr "Sudo-Optionen"
 
-#: admin/sudo/class_sudoManagement.inc:32 admin/sudo/class_sudoGeneric.inc:121
+#: admin/sudo/class_sudoManagement.inc:32 admin/sudo/class_sudoGeneric.inc:82
 #: config/sudo/class_sudoConfig.inc:42
 msgid "Sudo"
 msgstr "Sudo"
@@ -66,80 +64,94 @@ msgstr "Sudo"
 msgid "Sudo management"
 msgstr "SUDO-Verwaltung"
 
-#: admin/sudo/class_sudoGeneric.inc:122 admin/sudo/class_sudoGeneric.inc:126
+#: admin/sudo/class_sudoGeneric.inc:83 admin/sudo/class_sudoGeneric.inc:87
 msgid "Sudo role"
 msgstr "Sudo-Rolle"
 
-#: admin/sudo/class_sudoGeneric.inc:141
-msgid "Role settings"
-msgstr ""
+#: admin/sudo/class_sudoGeneric.inc:102
+msgid "Generic"
+msgstr "Allgemein"
+
+#: admin/sudo/class_sudoGeneric.inc:102
+msgid "global defaults"
+msgstr "globale Vorgaben"
 
-#: admin/sudo/class_sudoGeneric.inc:146
+#: admin/sudo/class_sudoGeneric.inc:107
 msgid "Name"
 msgstr "Name"
 
-#: admin/sudo/class_sudoGeneric.inc:146
+#: admin/sudo/class_sudoGeneric.inc:107
 msgid "Name of the role"
 msgstr "Name der Rolle"
 
-#: admin/sudo/class_sudoGeneric.inc:151
+#: admin/sudo/class_sudoGeneric.inc:112
 msgid "Description"
 msgstr "Beschreibung"
 
-#: admin/sudo/class_sudoGeneric.inc:151
+#: admin/sudo/class_sudoGeneric.inc:112
 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:117
 msgid "Commands"
 msgstr "Kommandos"
 
-#: admin/sudo/class_sudoGeneric.inc:157
+#: admin/sudo/class_sudoGeneric.inc:118
 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
-msgid "Run as (user)"
-msgstr ""
-
-#: admin/sudo/class_sudoGeneric.inc:164
-msgid "User(s) impersonated by sudo"
-msgstr ""
-
-#: admin/sudo/class_sudoGeneric.inc:171
-msgid "Run as (group)"
-msgstr ""
+#: admin/sudo/class_sudoGeneric.inc:124
+msgid "Run as"
+msgstr "AusfÃ¼hren als"
 
-#: admin/sudo/class_sudoGeneric.inc:172
-msgid "Group(s) impersonated by sudo"
-msgstr ""
+#: admin/sudo/class_sudoGeneric.inc:125
+msgid ""
+"A user that commands may be run as or a Unix group that contains a list of "
+"users that commands may be run as"
+msgstr "Ein befehlender Benutzer kann gestartet werden oder eine Unixgruppe, die eine List von Benutzern enthÃ¤lt unter der Befehle gestartet werden"
 
-#: admin/sudo/class_sudoGeneric.inc:178
+#: admin/sudo/class_sudoGeneric.inc:131
 msgid "Systems"
 msgstr "Systeme"
 
-#: admin/sudo/class_sudoGeneric.inc:178
+#: admin/sudo/class_sudoGeneric.inc:131
 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:136
 msgid "Users and groups"
 msgstr "Benutzer und Gruppen"
 
-#: admin/sudo/class_sudoGeneric.inc:184
+#: admin/sudo/class_sudoGeneric.inc:137
 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
-msgid "Priority"
-msgstr "PrioritÃ¤t"
+#: admin/sudo/class_sudoGeneric.inc:144
+msgid "System trust"
+msgstr "System-Vertrauen"
 
-#: admin/sudo/class_sudoGeneric.inc:188
-msgid "This rule priority compared to others"
-msgstr ""
+#: admin/sudo/class_sudoGeneric.inc:148
+msgid "Trust mode"
+msgstr "Vertrauens-Modus"
+
+#: admin/sudo/class_sudoGeneric.inc:148
+msgid "Trust mode for the role"
+msgstr "Vertrauensmodus fÃ¼r Rolle"
+
+#: admin/sudo/class_sudoGeneric.inc:152
+msgid "disabled"
+msgstr "deaktiviert"
+
+#: admin/sudo/class_sudoGeneric.inc:152
+msgid "full access"
+msgstr "Vollzugriff"
+
+#: admin/sudo/class_sudoGeneric.inc:152
+msgid "allow access to these hosts"
+msgstr "erlaube Zugriff auf diese Hosts"
 
 #: config/sudo/class_sudoConfig.inc:28
 msgid "Sudo configuration"
diff --git a/sudo/locale/el_GR/fusiondirectory.po b/sudo/locale/el_GR/fusiondirectory.po
new file mode 100644
index 0000000000000000000000000000000000000000..bd5912d85349a9ab64702139807f8070c98f3899
--- /dev/null
+++ b/sudo/locale/el_GR/fusiondirectory.po
@@ -0,0 +1,170 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR FusionDirectory Project
+# This file is distributed under the same license as the PACKAGE package.
+# 
+# Translators:
+msgid ""
+msgstr ""
+"Project-Id-Version: FusionDirectory-109\n"
+"Report-Msgid-Bugs-To: documentation@lists.fusiondirectory.org\n"
+"POT-Creation-Date: 2014-12-15 17:47+0100\n"
+"PO-Revision-Date: 2015-05-30 11:45+0000\n"
+"Last-Translator: Benoit Mortier <benoit.mortier@opensides.be>\n"
+"Language-Team: Greek (Greece) (http://www.transifex.com/projects/p/FusionDirectory-109/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/sudo/class_sudoOption.inc:82
+msgid "Unknown option"
+msgstr ""
+
+#: admin/sudo/class_sudoOption.inc:83
+#, php-format
+msgid "The sudo option '%s' is invalid!"
+msgstr ""
+
+#: admin/sudo/class_sudoOption.inc:276
+#, php-format
+msgid "%s (%s)"
+msgstr ""
+
+#: admin/sudo/class_sudoOption.inc:479
+msgid "Available options"
+msgstr ""
+
+#: admin/sudo/class_sudoOption.inc:482
+msgid "Option"
+msgstr ""
+
+#: admin/sudo/class_sudoOption.inc:482
+msgid "Add a new sudo option"
+msgstr ""
+
+#: admin/sudo/class_sudoOption.inc:487 admin/sudo/class_sudoOption.inc:489
+msgid "Used sudo role options"
+msgstr ""
+
+#: admin/sudo/class_sudoOption.inc:561
+msgid "Options"
+msgstr ""
+
+#: admin/sudo/class_sudoOption.inc:562
+msgid "Sudo options"
+msgstr ""
+
+#: admin/sudo/class_sudoManagement.inc:32 admin/sudo/class_sudoGeneric.inc:82
+#: config/sudo/class_sudoConfig.inc:42
+msgid "Sudo"
+msgstr ""
+
+#: admin/sudo/class_sudoManagement.inc:33
+msgid "Sudo management"
+msgstr ""
+
+#: admin/sudo/class_sudoGeneric.inc:83 admin/sudo/class_sudoGeneric.inc:87
+msgid "Sudo role"
+msgstr ""
+
+#: admin/sudo/class_sudoGeneric.inc:102
+msgid "Generic"
+msgstr ""
+
+#: admin/sudo/class_sudoGeneric.inc:102
+msgid "global defaults"
+msgstr ""
+
+#: admin/sudo/class_sudoGeneric.inc:107
+msgid "Name"
+msgstr ""
+
+#: admin/sudo/class_sudoGeneric.inc:107
+msgid "Name of the role"
+msgstr ""
+
+#: admin/sudo/class_sudoGeneric.inc:112
+msgid "Description"
+msgstr ""
+
+#: admin/sudo/class_sudoGeneric.inc:112
+msgid "Description for the new sudo role"
+msgstr ""
+
+#: admin/sudo/class_sudoGeneric.inc:117
+msgid "Commands"
+msgstr ""
+
+#: admin/sudo/class_sudoGeneric.inc:118
+msgid ""
+"A Unix command with optional command line arguments, potentially including "
+"globbing characters (aka wild cards)"
+msgstr ""
+
+#: admin/sudo/class_sudoGeneric.inc:124
+msgid "Run as"
+msgstr ""
+
+#: admin/sudo/class_sudoGeneric.inc:125
+msgid ""
+"A user that commands may be run as or a Unix group that contains a list of "
+"users that commands may be run as"
+msgstr ""
+
+#: admin/sudo/class_sudoGeneric.inc:131
+msgid "Systems"
+msgstr ""
+
+#: admin/sudo/class_sudoGeneric.inc:131
+msgid "A host name, IP address or IP network"
+msgstr ""
+
+#: admin/sudo/class_sudoGeneric.inc:136
+msgid "Users and groups"
+msgstr ""
+
+#: admin/sudo/class_sudoGeneric.inc:137
+msgid ""
+"A user name, user ID (prefixed with '#'), Unix group (prefixed with '%')"
+msgstr ""
+
+#: admin/sudo/class_sudoGeneric.inc:144
+msgid "System trust"
+msgstr ""
+
+#: admin/sudo/class_sudoGeneric.inc:148
+msgid "Trust mode"
+msgstr ""
+
+#: admin/sudo/class_sudoGeneric.inc:148
+msgid "Trust mode for the role"
+msgstr ""
+
+#: admin/sudo/class_sudoGeneric.inc:152
+msgid "disabled"
+msgstr ""
+
+#: admin/sudo/class_sudoGeneric.inc:152
+msgid "full access"
+msgstr ""
+
+#: admin/sudo/class_sudoGeneric.inc:152
+msgid "allow access to these hosts"
+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/en/fusiondirectory.po b/sudo/locale/en/fusiondirectory.po
index bf494d01016394334f12620196a6a8fc013b444d..4886872d0ff291392647d51d35a41e889ca92bff 100644
--- a/sudo/locale/en/fusiondirectory.po
+++ b/sudo/locale/en/fusiondirectory.po
@@ -6,13 +6,13 @@
 #, fuzzy
 msgid ""
 msgstr ""
-"Project-Id-Version: PACKAGE VERSION\n"
-"Report-Msgid-Bugs-To: documentation@lists.fusiondirectory.org\n"
-"POT-Creation-Date: 2015-03-31 11:49+0200\n"
+"Project-Id-Version: FusionDirectory VERSION\n"
+"Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
+"POT-Creation-Date: 2015-05-30 15:30+0200\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
-"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
-"Language-Team: LANGUAGE <LL@li.org>\n"
-"Language: \n"
+"Last-Translator: FusionDirectory project <contact@fusiondirectory.org>\n"
+"Language-Team: English\n"
+"Language: en\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
diff --git a/sudo/locale/es/fusiondirectory.po b/sudo/locale/es/fusiondirectory.po
index ef8500571f503e92e94a2658b9ca0255b651b161..c03d74bc86a780c0570c326982c5fa1880177fde 100644
--- a/sudo/locale/es/fusiondirectory.po
+++ b/sudo/locale/es/fusiondirectory.po
@@ -5,12 +5,12 @@
 # Translators:
 msgid ""
 msgstr ""
-"Project-Id-Version: FusionDirectory-108\n"
+"Project-Id-Version: FusionDirectory-109\n"
 "Report-Msgid-Bugs-To: documentation@lists.fusiondirectory.org\n"
-"POT-Creation-Date: 2015-03-17 18:47+0100\n"
-"PO-Revision-Date: 2015-02-25 16:12+0000\n"
+"POT-Creation-Date: 2014-12-15 17:47+0100\n"
+"PO-Revision-Date: 2015-03-21 23:49+0000\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>\n"
-"Language-Team: Spanish (http://www.transifex.com/projects/p/FusionDirectory-108/language/es/)\n"
+"Language-Team: Spanish (http://www.transifex.com/projects/p/FusionDirectory-109/language/es/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -26,36 +26,36 @@ msgstr "OpciÃ³n desconocida"
 msgid "The sudo option '%s' is invalid!"
 msgstr "Â¡La opciÃ³n Sudo %s no es vÃ¡lida!"
 
-#: admin/sudo/class_sudoOption.inc:278
+#: admin/sudo/class_sudoOption.inc:276
 #, php-format
 msgid "%s (%s)"
 msgstr ""
 
-#: admin/sudo/class_sudoOption.inc:481
+#: admin/sudo/class_sudoOption.inc:479
 msgid "Available options"
 msgstr "Opciones disponibles"
 
-#: admin/sudo/class_sudoOption.inc:484
+#: admin/sudo/class_sudoOption.inc:482
 msgid "Option"
 msgstr "OpciÃ³n"
 
-#: admin/sudo/class_sudoOption.inc:484
+#: admin/sudo/class_sudoOption.inc:482
 msgid "Add a new sudo option"
 msgstr ""
 
-#: admin/sudo/class_sudoOption.inc:489 admin/sudo/class_sudoOption.inc:491
+#: admin/sudo/class_sudoOption.inc:487 admin/sudo/class_sudoOption.inc:489
 msgid "Used sudo role options"
 msgstr ""
 
-#: admin/sudo/class_sudoOption.inc:563
+#: admin/sudo/class_sudoOption.inc:561
 msgid "Options"
 msgstr "Opciones"
 
-#: admin/sudo/class_sudoOption.inc:564
+#: admin/sudo/class_sudoOption.inc:562
 msgid "Sudo options"
 msgstr "Opciones Sudo"
 
-#: admin/sudo/class_sudoManagement.inc:32 admin/sudo/class_sudoGeneric.inc:121
+#: admin/sudo/class_sudoManagement.inc:32 admin/sudo/class_sudoGeneric.inc:82
 #: config/sudo/class_sudoConfig.inc:42
 msgid "Sudo"
 msgstr "Sudo"
@@ -64,81 +64,95 @@ msgstr "Sudo"
 msgid "Sudo management"
 msgstr "AdministraciÃ³n Sudo"
 
-#: admin/sudo/class_sudoGeneric.inc:122 admin/sudo/class_sudoGeneric.inc:126
+#: admin/sudo/class_sudoGeneric.inc:83 admin/sudo/class_sudoGeneric.inc:87
 msgid "Sudo role"
 msgstr "Rol Sudo"
 
-#: admin/sudo/class_sudoGeneric.inc:141
-msgid "Role settings"
-msgstr ""
+#: admin/sudo/class_sudoGeneric.inc:102
+msgid "Generic"
+msgstr "GenÃ©rico"
+
+#: admin/sudo/class_sudoGeneric.inc:102
+msgid "global defaults"
+msgstr "Opciones predeterminadas"
 
-#: admin/sudo/class_sudoGeneric.inc:146
+#: admin/sudo/class_sudoGeneric.inc:107
 msgid "Name"
 msgstr "Nombre"
 
-#: admin/sudo/class_sudoGeneric.inc:146
+#: admin/sudo/class_sudoGeneric.inc:107
 msgid "Name of the role"
 msgstr ""
 
-#: admin/sudo/class_sudoGeneric.inc:151
+#: admin/sudo/class_sudoGeneric.inc:112
 msgid "Description"
 msgstr "DescripciÃ³n"
 
-#: admin/sudo/class_sudoGeneric.inc:151
+#: admin/sudo/class_sudoGeneric.inc:112
 msgid "Description for the new sudo role"
 msgstr ""
 
-#: admin/sudo/class_sudoGeneric.inc:156
+#: admin/sudo/class_sudoGeneric.inc:117
 msgid "Commands"
 msgstr "Comandos"
 
-#: admin/sudo/class_sudoGeneric.inc:157
+#: admin/sudo/class_sudoGeneric.inc:118
 msgid ""
 "A Unix command with optional command line arguments, potentially including "
 "globbing characters (aka wild cards)"
 msgstr ""
 
-#: admin/sudo/class_sudoGeneric.inc:163
-msgid "Run as (user)"
-msgstr ""
-
-#: admin/sudo/class_sudoGeneric.inc:164
-msgid "User(s) impersonated by sudo"
-msgstr ""
-
-#: admin/sudo/class_sudoGeneric.inc:171
-msgid "Run as (group)"
-msgstr ""
+#: admin/sudo/class_sudoGeneric.inc:124
+msgid "Run as"
+msgstr "Ejecutar como"
 
-#: admin/sudo/class_sudoGeneric.inc:172
-msgid "Group(s) impersonated by sudo"
+#: admin/sudo/class_sudoGeneric.inc:125
+msgid ""
+"A user that commands may be run as or a Unix group that contains a list of "
+"users that commands may be run as"
 msgstr ""
 
-#: admin/sudo/class_sudoGeneric.inc:178
+#: admin/sudo/class_sudoGeneric.inc:131
 msgid "Systems"
 msgstr "Sistemas"
 
-#: admin/sudo/class_sudoGeneric.inc:178
+#: admin/sudo/class_sudoGeneric.inc:131
 msgid "A host name, IP address or IP network"
 msgstr ""
 
-#: admin/sudo/class_sudoGeneric.inc:183
+#: admin/sudo/class_sudoGeneric.inc:136
 msgid "Users and groups"
 msgstr "Usuarios y grupos"
 
-#: admin/sudo/class_sudoGeneric.inc:184
+#: admin/sudo/class_sudoGeneric.inc:137
 msgid ""
 "A user name, user ID (prefixed with '#'), Unix group (prefixed with '%')"
 msgstr ""
 
-#: admin/sudo/class_sudoGeneric.inc:188
-msgid "Priority"
-msgstr "Prioridad"
+#: admin/sudo/class_sudoGeneric.inc:144
+msgid "System trust"
+msgstr "Sistema de seguridad"
+
+#: admin/sudo/class_sudoGeneric.inc:148
+msgid "Trust mode"
+msgstr "Modo seguro"
 
-#: admin/sudo/class_sudoGeneric.inc:188
-msgid "This rule priority compared to others"
+#: admin/sudo/class_sudoGeneric.inc:148
+msgid "Trust mode for the role"
 msgstr ""
 
+#: admin/sudo/class_sudoGeneric.inc:152
+msgid "disabled"
+msgstr "desactivado"
+
+#: admin/sudo/class_sudoGeneric.inc:152
+msgid "full access"
+msgstr "Acceso sin restricciones"
+
+#: admin/sudo/class_sudoGeneric.inc:152
+msgid "allow access to these hosts"
+msgstr "Permitir el acceso a estos equipos"
+
 #: config/sudo/class_sudoConfig.inc:28
 msgid "Sudo configuration"
 msgstr ""
diff --git a/sudo/locale/es_VE/fusiondirectory.po b/sudo/locale/es_VE/fusiondirectory.po
index ada069eaf94dca3c73da60c1fc15986971073fd6..7e5d4032057500f75406c74d1dbcb76c44034047 100644
--- a/sudo/locale/es_VE/fusiondirectory.po
+++ b/sudo/locale/es_VE/fusiondirectory.po
@@ -3,16 +3,14 @@
 # This file is distributed under the same license as the PACKAGE package.
 # 
 # Translators:
-# lars_g <lars.gold@gmail.com>, 2012
-# lars_g <lars.gold@gmail.com>, 2012
 msgid ""
 msgstr ""
-"Project-Id-Version: FusionDirectory-108\n"
+"Project-Id-Version: FusionDirectory-109\n"
 "Report-Msgid-Bugs-To: documentation@lists.fusiondirectory.org\n"
-"POT-Creation-Date: 2015-03-17 18:47+0100\n"
-"PO-Revision-Date: 2015-02-25 16:12+0000\n"
+"POT-Creation-Date: 2014-12-15 17:47+0100\n"
+"PO-Revision-Date: 2015-03-21 23:49+0000\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>\n"
-"Language-Team: Spanish (Venezuela) (http://www.transifex.com/projects/p/FusionDirectory-108/language/es_VE/)\n"
+"Language-Team: Spanish (Venezuela) (http://www.transifex.com/projects/p/FusionDirectory-109/language/es_VE/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -28,36 +26,36 @@ msgstr "OpciÃ³n desconocida"
 msgid "The sudo option '%s' is invalid!"
 msgstr "Â¡La opciÃ³n Sudo %s no es vÃ¡lida!"
 
-#: admin/sudo/class_sudoOption.inc:278
+#: admin/sudo/class_sudoOption.inc:276
 #, php-format
 msgid "%s (%s)"
 msgstr ""
 
-#: admin/sudo/class_sudoOption.inc:481
+#: admin/sudo/class_sudoOption.inc:479
 msgid "Available options"
 msgstr "Opciones disponibles"
 
-#: admin/sudo/class_sudoOption.inc:484
+#: admin/sudo/class_sudoOption.inc:482
 msgid "Option"
 msgstr "OpciÃ³n"
 
-#: admin/sudo/class_sudoOption.inc:484
+#: admin/sudo/class_sudoOption.inc:482
 msgid "Add a new sudo option"
 msgstr ""
 
-#: admin/sudo/class_sudoOption.inc:489 admin/sudo/class_sudoOption.inc:491
+#: admin/sudo/class_sudoOption.inc:487 admin/sudo/class_sudoOption.inc:489
 msgid "Used sudo role options"
 msgstr ""
 
-#: admin/sudo/class_sudoOption.inc:563
+#: admin/sudo/class_sudoOption.inc:561
 msgid "Options"
 msgstr "Opciones"
 
-#: admin/sudo/class_sudoOption.inc:564
+#: admin/sudo/class_sudoOption.inc:562
 msgid "Sudo options"
 msgstr "Opciones Sudo"
 
-#: admin/sudo/class_sudoManagement.inc:32 admin/sudo/class_sudoGeneric.inc:121
+#: admin/sudo/class_sudoManagement.inc:32 admin/sudo/class_sudoGeneric.inc:82
 #: config/sudo/class_sudoConfig.inc:42
 msgid "Sudo"
 msgstr "Sudo"
@@ -66,81 +64,95 @@ msgstr "Sudo"
 msgid "Sudo management"
 msgstr "AdministraciÃ³n Sudo"
 
-#: admin/sudo/class_sudoGeneric.inc:122 admin/sudo/class_sudoGeneric.inc:126
+#: admin/sudo/class_sudoGeneric.inc:83 admin/sudo/class_sudoGeneric.inc:87
 msgid "Sudo role"
 msgstr "Rol Sudo"
 
-#: admin/sudo/class_sudoGeneric.inc:141
-msgid "Role settings"
-msgstr ""
+#: admin/sudo/class_sudoGeneric.inc:102
+msgid "Generic"
+msgstr "GenÃ©rico"
+
+#: admin/sudo/class_sudoGeneric.inc:102
+msgid "global defaults"
+msgstr "Opciones predeterminadas"
 
-#: admin/sudo/class_sudoGeneric.inc:146
+#: admin/sudo/class_sudoGeneric.inc:107
 msgid "Name"
 msgstr "Nombre"
 
-#: admin/sudo/class_sudoGeneric.inc:146
+#: admin/sudo/class_sudoGeneric.inc:107
 msgid "Name of the role"
 msgstr ""
 
-#: admin/sudo/class_sudoGeneric.inc:151
+#: admin/sudo/class_sudoGeneric.inc:112
 msgid "Description"
 msgstr "DescripciÃ³n"
 
-#: admin/sudo/class_sudoGeneric.inc:151
+#: admin/sudo/class_sudoGeneric.inc:112
 msgid "Description for the new sudo role"
 msgstr ""
 
-#: admin/sudo/class_sudoGeneric.inc:156
+#: admin/sudo/class_sudoGeneric.inc:117
 msgid "Commands"
 msgstr "Comandos"
 
-#: admin/sudo/class_sudoGeneric.inc:157
+#: admin/sudo/class_sudoGeneric.inc:118
 msgid ""
 "A Unix command with optional command line arguments, potentially including "
 "globbing characters (aka wild cards)"
 msgstr ""
 
-#: admin/sudo/class_sudoGeneric.inc:163
-msgid "Run as (user)"
-msgstr ""
-
-#: admin/sudo/class_sudoGeneric.inc:164
-msgid "User(s) impersonated by sudo"
-msgstr ""
-
-#: admin/sudo/class_sudoGeneric.inc:171
-msgid "Run as (group)"
-msgstr ""
+#: admin/sudo/class_sudoGeneric.inc:124
+msgid "Run as"
+msgstr "Ejecutar como"
 
-#: admin/sudo/class_sudoGeneric.inc:172
-msgid "Group(s) impersonated by sudo"
+#: admin/sudo/class_sudoGeneric.inc:125
+msgid ""
+"A user that commands may be run as or a Unix group that contains a list of "
+"users that commands may be run as"
 msgstr ""
 
-#: admin/sudo/class_sudoGeneric.inc:178
+#: admin/sudo/class_sudoGeneric.inc:131
 msgid "Systems"
 msgstr "Sistemas"
 
-#: admin/sudo/class_sudoGeneric.inc:178
+#: admin/sudo/class_sudoGeneric.inc:131
 msgid "A host name, IP address or IP network"
 msgstr ""
 
-#: admin/sudo/class_sudoGeneric.inc:183
+#: admin/sudo/class_sudoGeneric.inc:136
 msgid "Users and groups"
 msgstr "Usuarios y grupos"
 
-#: admin/sudo/class_sudoGeneric.inc:184
+#: admin/sudo/class_sudoGeneric.inc:137
 msgid ""
 "A user name, user ID (prefixed with '#'), Unix group (prefixed with '%')"
 msgstr ""
 
-#: admin/sudo/class_sudoGeneric.inc:188
-msgid "Priority"
-msgstr "Prioridad"
+#: admin/sudo/class_sudoGeneric.inc:144
+msgid "System trust"
+msgstr "Sistema de seguridad"
+
+#: admin/sudo/class_sudoGeneric.inc:148
+msgid "Trust mode"
+msgstr "Modo seguro"
 
-#: admin/sudo/class_sudoGeneric.inc:188
-msgid "This rule priority compared to others"
+#: admin/sudo/class_sudoGeneric.inc:148
+msgid "Trust mode for the role"
 msgstr ""
 
+#: admin/sudo/class_sudoGeneric.inc:152
+msgid "disabled"
+msgstr "desactivado"
+
+#: admin/sudo/class_sudoGeneric.inc:152
+msgid "full access"
+msgstr "Acceso sin restricciones"
+
+#: admin/sudo/class_sudoGeneric.inc:152
+msgid "allow access to these hosts"
+msgstr "Permitir el acceso a estos equipos"
+
 #: config/sudo/class_sudoConfig.inc:28
 msgid "Sudo configuration"
 msgstr ""
diff --git a/sudo/locale/fa_IR/fusiondirectory.po b/sudo/locale/fa_IR/fusiondirectory.po
index 36bfedd732ccc0f660870cfaada3912fb138ed3a..4f614e96472343846d268afe41b2c14dc10a88d3 100644
--- a/sudo/locale/fa_IR/fusiondirectory.po
+++ b/sudo/locale/fa_IR/fusiondirectory.po
@@ -5,12 +5,12 @@
 # Translators:
 msgid ""
 msgstr ""
-"Project-Id-Version: FusionDirectory-108\n"
+"Project-Id-Version: FusionDirectory-109\n"
 "Report-Msgid-Bugs-To: documentation@lists.fusiondirectory.org\n"
-"POT-Creation-Date: 2015-03-17 18:47+0100\n"
-"PO-Revision-Date: 2015-02-25 15:55+0000\n"
+"POT-Creation-Date: 2014-12-15 17:47+0100\n"
+"PO-Revision-Date: 2014-12-15 17:05+0000\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>\n"
-"Language-Team: Persian (Iran) (http://www.transifex.com/projects/p/FusionDirectory-108/language/fa_IR/)\n"
+"Language-Team: Persian (Iran) (http://www.transifex.com/projects/p/FusionDirectory-109/language/fa_IR/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -26,36 +26,36 @@ msgstr ""
 msgid "The sudo option '%s' is invalid!"
 msgstr ""
 
-#: admin/sudo/class_sudoOption.inc:278
+#: admin/sudo/class_sudoOption.inc:276
 #, php-format
 msgid "%s (%s)"
 msgstr ""
 
-#: admin/sudo/class_sudoOption.inc:481
+#: admin/sudo/class_sudoOption.inc:479
 msgid "Available options"
 msgstr ""
 
-#: admin/sudo/class_sudoOption.inc:484
+#: admin/sudo/class_sudoOption.inc:482
 msgid "Option"
 msgstr ""
 
-#: admin/sudo/class_sudoOption.inc:484
+#: admin/sudo/class_sudoOption.inc:482
 msgid "Add a new sudo option"
 msgstr ""
 
-#: admin/sudo/class_sudoOption.inc:489 admin/sudo/class_sudoOption.inc:491
+#: admin/sudo/class_sudoOption.inc:487 admin/sudo/class_sudoOption.inc:489
 msgid "Used sudo role options"
 msgstr ""
 
-#: admin/sudo/class_sudoOption.inc:563
+#: admin/sudo/class_sudoOption.inc:561
 msgid "Options"
 msgstr ""
 
-#: admin/sudo/class_sudoOption.inc:564
+#: admin/sudo/class_sudoOption.inc:562
 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:82
 #: config/sudo/class_sudoConfig.inc:42
 msgid "Sudo"
 msgstr ""
@@ -64,79 +64,93 @@ msgstr ""
 msgid "Sudo management"
 msgstr ""
 
-#: admin/sudo/class_sudoGeneric.inc:122 admin/sudo/class_sudoGeneric.inc:126
+#: admin/sudo/class_sudoGeneric.inc:83 admin/sudo/class_sudoGeneric.inc:87
 msgid "Sudo role"
 msgstr ""
 
-#: admin/sudo/class_sudoGeneric.inc:141
-msgid "Role settings"
+#: admin/sudo/class_sudoGeneric.inc:102
+msgid "Generic"
 msgstr ""
 
-#: admin/sudo/class_sudoGeneric.inc:146
+#: admin/sudo/class_sudoGeneric.inc:102
+msgid "global defaults"
+msgstr ""
+
+#: admin/sudo/class_sudoGeneric.inc:107
 msgid "Name"
 msgstr ""
 
-#: admin/sudo/class_sudoGeneric.inc:146
+#: admin/sudo/class_sudoGeneric.inc:107
 msgid "Name of the role"
 msgstr ""
 
-#: admin/sudo/class_sudoGeneric.inc:151
+#: admin/sudo/class_sudoGeneric.inc:112
 msgid "Description"
 msgstr ""
 
-#: admin/sudo/class_sudoGeneric.inc:151
+#: admin/sudo/class_sudoGeneric.inc:112
 msgid "Description for the new sudo role"
 msgstr ""
 
-#: admin/sudo/class_sudoGeneric.inc:156
+#: admin/sudo/class_sudoGeneric.inc:117
 msgid "Commands"
 msgstr ""
 
-#: admin/sudo/class_sudoGeneric.inc:157
+#: admin/sudo/class_sudoGeneric.inc:118
 msgid ""
 "A Unix command with optional command line arguments, potentially including "
 "globbing characters (aka wild cards)"
 msgstr ""
 
-#: admin/sudo/class_sudoGeneric.inc:163
-msgid "Run as (user)"
-msgstr ""
-
-#: admin/sudo/class_sudoGeneric.inc:164
-msgid "User(s) impersonated by sudo"
+#: admin/sudo/class_sudoGeneric.inc:124
+msgid "Run as"
 msgstr ""
 
-#: admin/sudo/class_sudoGeneric.inc:171
-msgid "Run as (group)"
-msgstr ""
-
-#: admin/sudo/class_sudoGeneric.inc:172
-msgid "Group(s) impersonated by sudo"
+#: admin/sudo/class_sudoGeneric.inc:125
+msgid ""
+"A user that commands may be run as or a Unix group that contains a list of "
+"users that commands may be run as"
 msgstr ""
 
-#: admin/sudo/class_sudoGeneric.inc:178
+#: admin/sudo/class_sudoGeneric.inc:131
 msgid "Systems"
 msgstr ""
 
-#: admin/sudo/class_sudoGeneric.inc:178
+#: admin/sudo/class_sudoGeneric.inc:131
 msgid "A host name, IP address or IP network"
 msgstr ""
 
-#: admin/sudo/class_sudoGeneric.inc:183
+#: admin/sudo/class_sudoGeneric.inc:136
 msgid "Users and groups"
 msgstr ""
 
-#: admin/sudo/class_sudoGeneric.inc:184
+#: admin/sudo/class_sudoGeneric.inc:137
 msgid ""
 "A user name, user ID (prefixed with '#'), Unix group (prefixed with '%')"
 msgstr ""
 
-#: admin/sudo/class_sudoGeneric.inc:188
-msgid "Priority"
+#: admin/sudo/class_sudoGeneric.inc:144
+msgid "System trust"
+msgstr ""
+
+#: admin/sudo/class_sudoGeneric.inc:148
+msgid "Trust mode"
+msgstr ""
+
+#: admin/sudo/class_sudoGeneric.inc:148
+msgid "Trust mode for the role"
+msgstr ""
+
+#: admin/sudo/class_sudoGeneric.inc:152
+msgid "disabled"
+msgstr ""
+
+#: admin/sudo/class_sudoGeneric.inc:152
+msgid "full access"
 msgstr ""
 
-#: admin/sudo/class_sudoGeneric.inc:188
-msgid "This rule priority compared to others"
+#: admin/sudo/class_sudoGeneric.inc:152
+msgid "allow access to these hosts"
 msgstr ""
 
 #: config/sudo/class_sudoConfig.inc:28
diff --git a/sudo/locale/fr/fusiondirectory.po b/sudo/locale/fr/fusiondirectory.po
index adf77757d7634b00bbc8e79104afd0483e4f66b3..0bf6535b24022754203a2d4d7d7bf057762a0e4b 100644
--- a/sudo/locale/fr/fusiondirectory.po
+++ b/sudo/locale/fr/fusiondirectory.po
@@ -3,25 +3,16 @@
 # This file is distributed under the same license as the PACKAGE package.
 # 
 # Translators:
-# Anne Nicolas <ennael1@gmail.com>, 2014
-# gallak <antoine.gallavardin@free.fr>, 2013
-# Benoit Mortier <benoit.mortier@opensides.be>, 2008-2011
-# Benoit Mortier <benoit.mortier@opensides.be>, 2015
-# MCMic, 2014
-# fusiondirectory <contact@fusiondirectory.org>, 2013
-# fusiondirectory <contact@fusiondirectory.org>, 2012
-# fusiondirectory <contact@fusiondirectory.org>, 2012-2013
-# fusiondirectory <contact@fusiondirectory.org>, 2012
-# gallak <antoine.gallavardin@free.fr>, 2013
-# MCMic, 2014
+# Ã‰ric Deschamps <erdesc@free.fr>, 2013
+# Ã‰ric Deschamps <erdesc@free.fr>, 2013
 msgid ""
 msgstr ""
-"Project-Id-Version: FusionDirectory-108\n"
+"Project-Id-Version: FusionDirectory-109\n"
 "Report-Msgid-Bugs-To: documentation@lists.fusiondirectory.org\n"
-"POT-Creation-Date: 2015-03-17 18:47+0100\n"
-"PO-Revision-Date: 2015-02-25 17:41+0000\n"
-"Last-Translator: Benoit Mortier <benoit.mortier@opensides.be>\n"
-"Language-Team: French (http://www.transifex.com/projects/p/FusionDirectory-108/language/fr/)\n"
+"POT-Creation-Date: 2014-12-15 17:47+0100\n"
+"PO-Revision-Date: 2015-03-21 13:57+0000\n"
+"Last-Translator: fusiondirectory <contact@fusiondirectory.org>\n"
+"Language-Team: French (http://www.transifex.com/projects/p/FusionDirectory-109/language/fr/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -35,38 +26,38 @@ msgstr "Option inconnue"
 #: admin/sudo/class_sudoOption.inc:83
 #, php-format
 msgid "The sudo option '%s' is invalid!"
-msgstr "L'option sudo '%s' est invalideâ€¯!"
+msgstr "L'option sudo '%s' est non valide !"
 
-#: admin/sudo/class_sudoOption.inc:278
+#: admin/sudo/class_sudoOption.inc:276
 #, php-format
 msgid "%s (%s)"
 msgstr "%s (%s)"
 
-#: admin/sudo/class_sudoOption.inc:481
+#: admin/sudo/class_sudoOption.inc:479
 msgid "Available options"
 msgstr "Options disponibles"
 
-#: admin/sudo/class_sudoOption.inc:484
+#: admin/sudo/class_sudoOption.inc:482
 msgid "Option"
 msgstr "Option"
 
-#: admin/sudo/class_sudoOption.inc:484
+#: admin/sudo/class_sudoOption.inc:482
 msgid "Add a new sudo option"
 msgstr "Ajouter une nouvelle option sudo "
 
-#: admin/sudo/class_sudoOption.inc:489 admin/sudo/class_sudoOption.inc:491
+#: admin/sudo/class_sudoOption.inc:487 admin/sudo/class_sudoOption.inc:489
 msgid "Used sudo role options"
 msgstr "Options sudo utilisÃ©es"
 
-#: admin/sudo/class_sudoOption.inc:563
+#: admin/sudo/class_sudoOption.inc:561
 msgid "Options"
 msgstr "Options"
 
-#: admin/sudo/class_sudoOption.inc:564
+#: admin/sudo/class_sudoOption.inc:562
 msgid "Sudo options"
 msgstr "Options Sudo"
 
-#: admin/sudo/class_sudoManagement.inc:32 admin/sudo/class_sudoGeneric.inc:121
+#: admin/sudo/class_sudoManagement.inc:32 admin/sudo/class_sudoGeneric.inc:82
 #: config/sudo/class_sudoConfig.inc:42
 msgid "Sudo"
 msgstr "Sudo"
@@ -75,80 +66,94 @@ msgstr "Sudo"
 msgid "Sudo management"
 msgstr "Gestion sudo"
 
-#: admin/sudo/class_sudoGeneric.inc:122 admin/sudo/class_sudoGeneric.inc:126
+#: admin/sudo/class_sudoGeneric.inc:83 admin/sudo/class_sudoGeneric.inc:87
 msgid "Sudo role"
 msgstr "RÃ´le sudo"
 
-#: admin/sudo/class_sudoGeneric.inc:141
-msgid "Role settings"
-msgstr "ParamÃ¨tres du rÃ´le"
+#: admin/sudo/class_sudoGeneric.inc:102
+msgid "Generic"
+msgstr "GÃ©nÃ©rique"
 
-#: admin/sudo/class_sudoGeneric.inc:146
+#: admin/sudo/class_sudoGeneric.inc:102
+msgid "global defaults"
+msgstr "ParamÃ¨tres globaux par dÃ©faut"
+
+#: admin/sudo/class_sudoGeneric.inc:107
 msgid "Name"
 msgstr "Nom"
 
-#: admin/sudo/class_sudoGeneric.inc:146
+#: admin/sudo/class_sudoGeneric.inc:107
 msgid "Name of the role"
 msgstr "Nom du rÃ´le "
 
-#: admin/sudo/class_sudoGeneric.inc:151
+#: admin/sudo/class_sudoGeneric.inc:112
 msgid "Description"
 msgstr "Description"
 
-#: admin/sudo/class_sudoGeneric.inc:151
+#: admin/sudo/class_sudoGeneric.inc:112
 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:117
 msgid "Commands"
 msgstr "Commandes"
 
-#: admin/sudo/class_sudoGeneric.inc:157
+#: admin/sudo/class_sudoGeneric.inc:118
 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
-msgid "Run as (user)"
-msgstr "ExÃ©cuter comme (utilisateur)"
+msgstr "Une commande Unix en option avec des arguments de ligne de commande, y compris les caractÃ¨res d'englobement potentiellement (aka wild cards)"
 
-#: admin/sudo/class_sudoGeneric.inc:164
-msgid "User(s) impersonated by sudo"
-msgstr "Utilisateur (s) personnifiÃ© par sudo"
+#: admin/sudo/class_sudoGeneric.inc:124
+msgid "Run as"
+msgstr "ExÃ©cuter comme"
 
-#: admin/sudo/class_sudoGeneric.inc:171
-msgid "Run as (group)"
-msgstr "ExÃ©cuter comme (groupe)"
-
-#: admin/sudo/class_sudoGeneric.inc:172
-msgid "Group(s) impersonated by sudo"
-msgstr "Groupe (s) personnifiÃ© par sudo"
+#: admin/sudo/class_sudoGeneric.inc:125
+msgid ""
+"A user that commands may be run as or a Unix group that contains a list of "
+"users that commands may be run as"
+msgstr "Un utilisateur Unix qui sera utilisÃ© pour l'exÃ©cution des commandes ou un groupe qui contient une liste d'utilisateurs "
 
-#: admin/sudo/class_sudoGeneric.inc:178
+#: admin/sudo/class_sudoGeneric.inc:131
 msgid "Systems"
 msgstr "SystÃ¨mes"
 
-#: admin/sudo/class_sudoGeneric.inc:178
+#: admin/sudo/class_sudoGeneric.inc:131
 msgid "A host name, IP address or IP network"
-msgstr "Un nom d'hÃ´te, une adresse IP ou un rÃ©seau IP"
+msgstr "Un nom d'hÃ´te, l'adresse IP ou le rÃ©seau IP"
 
-#: admin/sudo/class_sudoGeneric.inc:183
+#: admin/sudo/class_sudoGeneric.inc:136
 msgid "Users and groups"
 msgstr "Utilisateurs et groupes"
 
-#: admin/sudo/class_sudoGeneric.inc:184
+#: admin/sudo/class_sudoGeneric.inc:137
 msgid ""
 "A user name, user ID (prefixed with '#'), Unix group (prefixed with '%')"
-msgstr "Un nom d'utilisateur, ID utilisateur (prÃ©fixÃ© par '#'), groupe Unix (prÃ©fixÃ© par '%')"
+msgstr "Un nom d'utilisateur, ID utilisateur (prÃ©fixÃ© par '#'), Unix groupe (prÃ©fixÃ©s par '%')"
+
+#: admin/sudo/class_sudoGeneric.inc:144
+msgid "System trust"
+msgstr "SystÃ¨me de Confiance"
+
+#: admin/sudo/class_sudoGeneric.inc:148
+msgid "Trust mode"
+msgstr "Mode de confiance"
+
+#: admin/sudo/class_sudoGeneric.inc:148
+msgid "Trust mode for the role"
+msgstr "Mode de confiance pour le rÃ´le"
+
+#: admin/sudo/class_sudoGeneric.inc:152
+msgid "disabled"
+msgstr "dÃ©sactivÃ©"
 
-#: admin/sudo/class_sudoGeneric.inc:188
-msgid "Priority"
-msgstr "PrioritÃ©"
+#: admin/sudo/class_sudoGeneric.inc:152
+msgid "full access"
+msgstr "accÃ¨s complet"
 
-#: admin/sudo/class_sudoGeneric.inc:188
-msgid "This rule priority compared to others"
-msgstr "La prioritÃ© de cette rÃ¨gle par rapport au autres"
+#: admin/sudo/class_sudoGeneric.inc:152
+msgid "allow access to these hosts"
+msgstr "permettre l'accÃ¨s a ces hÃ´tes"
 
 #: config/sudo/class_sudoConfig.inc:28
 msgid "Sudo configuration"
@@ -160,7 +165,7 @@ msgstr "Configuration du plugin sudo"
 
 #: config/sudo/class_sudoConfig.inc:45
 msgid "Sudo RDN"
-msgstr "Branche sudo"
+msgstr "RDN sudo"
 
 #: config/sudo/class_sudoConfig.inc:45
 msgid "Branch in which sudoers will be stored"
diff --git a/sudo/locale/id/fusiondirectory.po b/sudo/locale/id/fusiondirectory.po
index 6a3c5a9a786448039911a641f7affcc5c5c6eef6..d1891c481f449ad304e634528fe76f9a25bab199 100644
--- a/sudo/locale/id/fusiondirectory.po
+++ b/sudo/locale/id/fusiondirectory.po
@@ -5,12 +5,12 @@
 # Translators:
 msgid ""
 msgstr ""
-"Project-Id-Version: FusionDirectory-108\n"
+"Project-Id-Version: FusionDirectory-109\n"
 "Report-Msgid-Bugs-To: documentation@lists.fusiondirectory.org\n"
-"POT-Creation-Date: 2015-03-17 18:47+0100\n"
-"PO-Revision-Date: 2015-02-25 15:55+0000\n"
+"POT-Creation-Date: 2014-12-15 17:47+0100\n"
+"PO-Revision-Date: 2014-12-15 17:05+0000\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>\n"
-"Language-Team: Indonesian (http://www.transifex.com/projects/p/FusionDirectory-108/language/id/)\n"
+"Language-Team: Indonesian (http://www.transifex.com/projects/p/FusionDirectory-109/language/id/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -26,36 +26,36 @@ msgstr ""
 msgid "The sudo option '%s' is invalid!"
 msgstr ""
 
-#: admin/sudo/class_sudoOption.inc:278
+#: admin/sudo/class_sudoOption.inc:276
 #, php-format
 msgid "%s (%s)"
 msgstr ""
 
-#: admin/sudo/class_sudoOption.inc:481
+#: admin/sudo/class_sudoOption.inc:479
 msgid "Available options"
 msgstr ""
 
-#: admin/sudo/class_sudoOption.inc:484
+#: admin/sudo/class_sudoOption.inc:482
 msgid "Option"
 msgstr ""
 
-#: admin/sudo/class_sudoOption.inc:484
+#: admin/sudo/class_sudoOption.inc:482
 msgid "Add a new sudo option"
 msgstr ""
 
-#: admin/sudo/class_sudoOption.inc:489 admin/sudo/class_sudoOption.inc:491
+#: admin/sudo/class_sudoOption.inc:487 admin/sudo/class_sudoOption.inc:489
 msgid "Used sudo role options"
 msgstr ""
 
-#: admin/sudo/class_sudoOption.inc:563
+#: admin/sudo/class_sudoOption.inc:561
 msgid "Options"
 msgstr ""
 
-#: admin/sudo/class_sudoOption.inc:564
+#: admin/sudo/class_sudoOption.inc:562
 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:82
 #: config/sudo/class_sudoConfig.inc:42
 msgid "Sudo"
 msgstr ""
@@ -64,79 +64,93 @@ msgstr ""
 msgid "Sudo management"
 msgstr ""
 
-#: admin/sudo/class_sudoGeneric.inc:122 admin/sudo/class_sudoGeneric.inc:126
+#: admin/sudo/class_sudoGeneric.inc:83 admin/sudo/class_sudoGeneric.inc:87
 msgid "Sudo role"
 msgstr ""
 
-#: admin/sudo/class_sudoGeneric.inc:141
-msgid "Role settings"
+#: admin/sudo/class_sudoGeneric.inc:102
+msgid "Generic"
 msgstr ""
 
-#: admin/sudo/class_sudoGeneric.inc:146
+#: admin/sudo/class_sudoGeneric.inc:102
+msgid "global defaults"
+msgstr ""
+
+#: admin/sudo/class_sudoGeneric.inc:107
 msgid "Name"
 msgstr ""
 
-#: admin/sudo/class_sudoGeneric.inc:146
+#: admin/sudo/class_sudoGeneric.inc:107
 msgid "Name of the role"
 msgstr ""
 
-#: admin/sudo/class_sudoGeneric.inc:151
+#: admin/sudo/class_sudoGeneric.inc:112
 msgid "Description"
 msgstr ""
 
-#: admin/sudo/class_sudoGeneric.inc:151
+#: admin/sudo/class_sudoGeneric.inc:112
 msgid "Description for the new sudo role"
 msgstr ""
 
-#: admin/sudo/class_sudoGeneric.inc:156
+#: admin/sudo/class_sudoGeneric.inc:117
 msgid "Commands"
 msgstr ""
 
-#: admin/sudo/class_sudoGeneric.inc:157
+#: admin/sudo/class_sudoGeneric.inc:118
 msgid ""
 "A Unix command with optional command line arguments, potentially including "
 "globbing characters (aka wild cards)"
 msgstr ""
 
-#: admin/sudo/class_sudoGeneric.inc:163
-msgid "Run as (user)"
-msgstr ""
-
-#: admin/sudo/class_sudoGeneric.inc:164
-msgid "User(s) impersonated by sudo"
+#: admin/sudo/class_sudoGeneric.inc:124
+msgid "Run as"
 msgstr ""
 
-#: admin/sudo/class_sudoGeneric.inc:171
-msgid "Run as (group)"
-msgstr ""
-
-#: admin/sudo/class_sudoGeneric.inc:172
-msgid "Group(s) impersonated by sudo"
+#: admin/sudo/class_sudoGeneric.inc:125
+msgid ""
+"A user that commands may be run as or a Unix group that contains a list of "
+"users that commands may be run as"
 msgstr ""
 
-#: admin/sudo/class_sudoGeneric.inc:178
+#: admin/sudo/class_sudoGeneric.inc:131
 msgid "Systems"
 msgstr ""
 
-#: admin/sudo/class_sudoGeneric.inc:178
+#: admin/sudo/class_sudoGeneric.inc:131
 msgid "A host name, IP address or IP network"
 msgstr ""
 
-#: admin/sudo/class_sudoGeneric.inc:183
+#: admin/sudo/class_sudoGeneric.inc:136
 msgid "Users and groups"
 msgstr ""
 
-#: admin/sudo/class_sudoGeneric.inc:184
+#: admin/sudo/class_sudoGeneric.inc:137
 msgid ""
 "A user name, user ID (prefixed with '#'), Unix group (prefixed with '%')"
 msgstr ""
 
-#: admin/sudo/class_sudoGeneric.inc:188
-msgid "Priority"
+#: admin/sudo/class_sudoGeneric.inc:144
+msgid "System trust"
+msgstr ""
+
+#: admin/sudo/class_sudoGeneric.inc:148
+msgid "Trust mode"
+msgstr ""
+
+#: admin/sudo/class_sudoGeneric.inc:148
+msgid "Trust mode for the role"
+msgstr ""
+
+#: admin/sudo/class_sudoGeneric.inc:152
+msgid "disabled"
+msgstr ""
+
+#: admin/sudo/class_sudoGeneric.inc:152
+msgid "full access"
 msgstr ""
 
-#: admin/sudo/class_sudoGeneric.inc:188
-msgid "This rule priority compared to others"
+#: admin/sudo/class_sudoGeneric.inc:152
+msgid "allow access to these hosts"
 msgstr ""
 
 #: config/sudo/class_sudoConfig.inc:28
diff --git a/sudo/locale/it/fusiondirectory.po b/sudo/locale/it/fusiondirectory.po
index b52edf51aacd24ea41decb8f45f01bf8f587048b..dab5e46795d14025f9c29ee4901b9f4e3df8a6d3 100644
--- a/sudo/locale/it/fusiondirectory.po
+++ b/sudo/locale/it/fusiondirectory.po
@@ -3,19 +3,14 @@
 # This file is distributed under the same license as the PACKAGE package.
 # 
 # Translators:
-# Alessandro Amici <a.amici@bopen.it>, 2005
-# poterealpopolo <giuliano@opensides.be>, 2011
-# poterealpopolo <giuliano@opensides.be>, 2013
-# poterealpopolo <giuliano@opensides.be>, 2012
-# poterealpopolo <giuliano@opensides.be>, 2011-2013
 msgid ""
 msgstr ""
-"Project-Id-Version: FusionDirectory-108\n"
+"Project-Id-Version: FusionDirectory-109\n"
 "Report-Msgid-Bugs-To: documentation@lists.fusiondirectory.org\n"
-"POT-Creation-Date: 2015-03-17 18:47+0100\n"
-"PO-Revision-Date: 2015-02-25 16:12+0000\n"
+"POT-Creation-Date: 2014-12-15 17:47+0100\n"
+"PO-Revision-Date: 2015-03-21 23:49+0000\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>\n"
-"Language-Team: Italian (http://www.transifex.com/projects/p/FusionDirectory-108/language/it/)\n"
+"Language-Team: Italian (http://www.transifex.com/projects/p/FusionDirectory-109/language/it/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -31,36 +26,36 @@ msgstr "Opzione sconosciuta"
 msgid "The sudo option '%s' is invalid!"
 msgstr "L'opzione di sudo '%s' non Ã¨ valida !"
 
-#: admin/sudo/class_sudoOption.inc:278
+#: admin/sudo/class_sudoOption.inc:276
 #, php-format
 msgid "%s (%s)"
 msgstr "%s (%s)"
 
-#: admin/sudo/class_sudoOption.inc:481
+#: admin/sudo/class_sudoOption.inc:479
 msgid "Available options"
 msgstr "Opzioni disponibili"
 
-#: admin/sudo/class_sudoOption.inc:484
+#: admin/sudo/class_sudoOption.inc:482
 msgid "Option"
 msgstr "Opzione"
 
-#: admin/sudo/class_sudoOption.inc:484
+#: admin/sudo/class_sudoOption.inc:482
 msgid "Add a new sudo option"
 msgstr "Aggiungi una nuova opzione sudo"
 
-#: admin/sudo/class_sudoOption.inc:489 admin/sudo/class_sudoOption.inc:491
+#: admin/sudo/class_sudoOption.inc:487 admin/sudo/class_sudoOption.inc:489
 msgid "Used sudo role options"
 msgstr "Opzioni utilizzate del ruolo sudo"
 
-#: admin/sudo/class_sudoOption.inc:563
+#: admin/sudo/class_sudoOption.inc:561
 msgid "Options"
 msgstr "Opzioni"
 
-#: admin/sudo/class_sudoOption.inc:564
+#: admin/sudo/class_sudoOption.inc:562
 msgid "Sudo options"
 msgstr "Opzioni di Sudo"
 
-#: admin/sudo/class_sudoManagement.inc:32 admin/sudo/class_sudoGeneric.inc:121
+#: admin/sudo/class_sudoManagement.inc:32 admin/sudo/class_sudoGeneric.inc:82
 #: config/sudo/class_sudoConfig.inc:42
 msgid "Sudo"
 msgstr "Sudo"
@@ -69,80 +64,94 @@ msgstr "Sudo"
 msgid "Sudo management"
 msgstr "Gestione di Sudo"
 
-#: admin/sudo/class_sudoGeneric.inc:122 admin/sudo/class_sudoGeneric.inc:126
+#: admin/sudo/class_sudoGeneric.inc:83 admin/sudo/class_sudoGeneric.inc:87
 msgid "Sudo role"
 msgstr "Ruolo Sudo"
 
-#: admin/sudo/class_sudoGeneric.inc:141
-msgid "Role settings"
-msgstr ""
+#: admin/sudo/class_sudoGeneric.inc:102
+msgid "Generic"
+msgstr "Informazioni"
+
+#: admin/sudo/class_sudoGeneric.inc:102
+msgid "global defaults"
+msgstr "Parametri globali di default"
 
-#: admin/sudo/class_sudoGeneric.inc:146
+#: admin/sudo/class_sudoGeneric.inc:107
 msgid "Name"
 msgstr "Nome"
 
-#: admin/sudo/class_sudoGeneric.inc:146
+#: admin/sudo/class_sudoGeneric.inc:107
 msgid "Name of the role"
 msgstr "Nome del ruolo"
 
-#: admin/sudo/class_sudoGeneric.inc:151
+#: admin/sudo/class_sudoGeneric.inc:112
 msgid "Description"
 msgstr "Descrizione"
 
-#: admin/sudo/class_sudoGeneric.inc:151
+#: admin/sudo/class_sudoGeneric.inc:112
 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:117
 msgid "Commands"
 msgstr "comandi"
 
-#: admin/sudo/class_sudoGeneric.inc:157
+#: admin/sudo/class_sudoGeneric.inc:118
 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
-msgid "Run as (user)"
-msgstr ""
-
-#: admin/sudo/class_sudoGeneric.inc:164
-msgid "User(s) impersonated by sudo"
-msgstr ""
-
-#: admin/sudo/class_sudoGeneric.inc:171
-msgid "Run as (group)"
-msgstr ""
+#: admin/sudo/class_sudoGeneric.inc:124
+msgid "Run as"
+msgstr "Esegui come"
 
-#: admin/sudo/class_sudoGeneric.inc:172
-msgid "Group(s) impersonated by sudo"
-msgstr ""
+#: admin/sudo/class_sudoGeneric.inc:125
+msgid ""
+"A user that commands may be run as or a Unix group that contains a list of "
+"users that commands may be run as"
+msgstr "Un utente che puÃ³ eseguire i comandi come runas, o un gruppo Unix che contiene un elenco di utenti che possono eseguire il comando come runas"
 
-#: admin/sudo/class_sudoGeneric.inc:178
+#: admin/sudo/class_sudoGeneric.inc:131
 msgid "Systems"
 msgstr "Sistemi"
 
-#: admin/sudo/class_sudoGeneric.inc:178
+#: admin/sudo/class_sudoGeneric.inc:131
 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:136
 msgid "Users and groups"
 msgstr "Utenti e gruppi"
 
-#: admin/sudo/class_sudoGeneric.inc:184
+#: admin/sudo/class_sudoGeneric.inc:137
 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
-msgid "Priority"
-msgstr "PrioritÃ "
+#: admin/sudo/class_sudoGeneric.inc:144
+msgid "System trust"
+msgstr "Sistema di fiducia"
 
-#: admin/sudo/class_sudoGeneric.inc:188
-msgid "This rule priority compared to others"
-msgstr ""
+#: admin/sudo/class_sudoGeneric.inc:148
+msgid "Trust mode"
+msgstr "ModalitÃ  di fiducia"
+
+#: admin/sudo/class_sudoGeneric.inc:148
+msgid "Trust mode for the role"
+msgstr "ModalitÃ  di fiducia per il ruolo"
+
+#: admin/sudo/class_sudoGeneric.inc:152
+msgid "disabled"
+msgstr "disattivato"
+
+#: admin/sudo/class_sudoGeneric.inc:152
+msgid "full access"
+msgstr "accesso completo"
+
+#: admin/sudo/class_sudoGeneric.inc:152
+msgid "allow access to these hosts"
+msgstr "autorizza l'accesso a questi host"
 
 #: config/sudo/class_sudoConfig.inc:28
 msgid "Sudo configuration"
diff --git a/sudo/locale/lv/fusiondirectory.po b/sudo/locale/lv/fusiondirectory.po
index 6367338d8a382c9d3eb4442e504241c95d6bd2f7..2010340f3bd69910eebad31792b1fa88504ba768 100644
--- a/sudo/locale/lv/fusiondirectory.po
+++ b/sudo/locale/lv/fusiondirectory.po
@@ -5,12 +5,12 @@
 # Translators:
 msgid ""
 msgstr ""
-"Project-Id-Version: FusionDirectory-108\n"
+"Project-Id-Version: FusionDirectory-109\n"
 "Report-Msgid-Bugs-To: documentation@lists.fusiondirectory.org\n"
-"POT-Creation-Date: 2015-03-17 18:47+0100\n"
-"PO-Revision-Date: 2015-02-25 15:55+0000\n"
+"POT-Creation-Date: 2014-12-15 17:47+0100\n"
+"PO-Revision-Date: 2014-12-15 17:05+0000\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>\n"
-"Language-Team: Latvian (http://www.transifex.com/projects/p/FusionDirectory-108/language/lv/)\n"
+"Language-Team: Latvian (http://www.transifex.com/projects/p/FusionDirectory-109/language/lv/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -26,36 +26,36 @@ msgstr ""
 msgid "The sudo option '%s' is invalid!"
 msgstr ""
 
-#: admin/sudo/class_sudoOption.inc:278
+#: admin/sudo/class_sudoOption.inc:276
 #, php-format
 msgid "%s (%s)"
 msgstr ""
 
-#: admin/sudo/class_sudoOption.inc:481
+#: admin/sudo/class_sudoOption.inc:479
 msgid "Available options"
 msgstr ""
 
-#: admin/sudo/class_sudoOption.inc:484
+#: admin/sudo/class_sudoOption.inc:482
 msgid "Option"
 msgstr ""
 
-#: admin/sudo/class_sudoOption.inc:484
+#: admin/sudo/class_sudoOption.inc:482
 msgid "Add a new sudo option"
 msgstr ""
 
-#: admin/sudo/class_sudoOption.inc:489 admin/sudo/class_sudoOption.inc:491
+#: admin/sudo/class_sudoOption.inc:487 admin/sudo/class_sudoOption.inc:489
 msgid "Used sudo role options"
 msgstr ""
 
-#: admin/sudo/class_sudoOption.inc:563
+#: admin/sudo/class_sudoOption.inc:561
 msgid "Options"
 msgstr ""
 
-#: admin/sudo/class_sudoOption.inc:564
+#: admin/sudo/class_sudoOption.inc:562
 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:82
 #: config/sudo/class_sudoConfig.inc:42
 msgid "Sudo"
 msgstr ""
@@ -64,79 +64,93 @@ msgstr ""
 msgid "Sudo management"
 msgstr ""
 
-#: admin/sudo/class_sudoGeneric.inc:122 admin/sudo/class_sudoGeneric.inc:126
+#: admin/sudo/class_sudoGeneric.inc:83 admin/sudo/class_sudoGeneric.inc:87
 msgid "Sudo role"
 msgstr ""
 
-#: admin/sudo/class_sudoGeneric.inc:141
-msgid "Role settings"
+#: admin/sudo/class_sudoGeneric.inc:102
+msgid "Generic"
 msgstr ""
 
-#: admin/sudo/class_sudoGeneric.inc:146
+#: admin/sudo/class_sudoGeneric.inc:102
+msgid "global defaults"
+msgstr ""
+
+#: admin/sudo/class_sudoGeneric.inc:107
 msgid "Name"
 msgstr ""
 
-#: admin/sudo/class_sudoGeneric.inc:146
+#: admin/sudo/class_sudoGeneric.inc:107
 msgid "Name of the role"
 msgstr ""
 
-#: admin/sudo/class_sudoGeneric.inc:151
+#: admin/sudo/class_sudoGeneric.inc:112
 msgid "Description"
 msgstr ""
 
-#: admin/sudo/class_sudoGeneric.inc:151
+#: admin/sudo/class_sudoGeneric.inc:112
 msgid "Description for the new sudo role"
 msgstr ""
 
-#: admin/sudo/class_sudoGeneric.inc:156
+#: admin/sudo/class_sudoGeneric.inc:117
 msgid "Commands"
 msgstr ""
 
-#: admin/sudo/class_sudoGeneric.inc:157
+#: admin/sudo/class_sudoGeneric.inc:118
 msgid ""
 "A Unix command with optional command line arguments, potentially including "
 "globbing characters (aka wild cards)"
 msgstr ""
 
-#: admin/sudo/class_sudoGeneric.inc:163
-msgid "Run as (user)"
-msgstr ""
-
-#: admin/sudo/class_sudoGeneric.inc:164
-msgid "User(s) impersonated by sudo"
+#: admin/sudo/class_sudoGeneric.inc:124
+msgid "Run as"
 msgstr ""
 
-#: admin/sudo/class_sudoGeneric.inc:171
-msgid "Run as (group)"
-msgstr ""
-
-#: admin/sudo/class_sudoGeneric.inc:172
-msgid "Group(s) impersonated by sudo"
+#: admin/sudo/class_sudoGeneric.inc:125
+msgid ""
+"A user that commands may be run as or a Unix group that contains a list of "
+"users that commands may be run as"
 msgstr ""
 
-#: admin/sudo/class_sudoGeneric.inc:178
+#: admin/sudo/class_sudoGeneric.inc:131
 msgid "Systems"
 msgstr ""
 
-#: admin/sudo/class_sudoGeneric.inc:178
+#: admin/sudo/class_sudoGeneric.inc:131
 msgid "A host name, IP address or IP network"
 msgstr ""
 
-#: admin/sudo/class_sudoGeneric.inc:183
+#: admin/sudo/class_sudoGeneric.inc:136
 msgid "Users and groups"
 msgstr ""
 
-#: admin/sudo/class_sudoGeneric.inc:184
+#: admin/sudo/class_sudoGeneric.inc:137
 msgid ""
 "A user name, user ID (prefixed with '#'), Unix group (prefixed with '%')"
 msgstr ""
 
-#: admin/sudo/class_sudoGeneric.inc:188
-msgid "Priority"
+#: admin/sudo/class_sudoGeneric.inc:144
+msgid "System trust"
+msgstr ""
+
+#: admin/sudo/class_sudoGeneric.inc:148
+msgid "Trust mode"
+msgstr ""
+
+#: admin/sudo/class_sudoGeneric.inc:148
+msgid "Trust mode for the role"
+msgstr ""
+
+#: admin/sudo/class_sudoGeneric.inc:152
+msgid "disabled"
+msgstr ""
+
+#: admin/sudo/class_sudoGeneric.inc:152
+msgid "full access"
 msgstr ""
 
-#: admin/sudo/class_sudoGeneric.inc:188
-msgid "This rule priority compared to others"
+#: admin/sudo/class_sudoGeneric.inc:152
+msgid "allow access to these hosts"
 msgstr ""
 
 #: config/sudo/class_sudoConfig.inc:28
diff --git a/sudo/locale/nb/fusiondirectory.po b/sudo/locale/nb/fusiondirectory.po
index d78b59769edd08c07ee0136489ab1ad8ac57e655..a113cb1a9479fe1292dec5114819a70c54caf487 100644
--- a/sudo/locale/nb/fusiondirectory.po
+++ b/sudo/locale/nb/fusiondirectory.po
@@ -5,12 +5,12 @@
 # Translators:
 msgid ""
 msgstr ""
-"Project-Id-Version: FusionDirectory-108\n"
+"Project-Id-Version: FusionDirectory-109\n"
 "Report-Msgid-Bugs-To: documentation@lists.fusiondirectory.org\n"
-"POT-Creation-Date: 2015-03-17 18:47+0100\n"
-"PO-Revision-Date: 2015-02-25 16:02+0000\n"
+"POT-Creation-Date: 2014-12-15 17:47+0100\n"
+"PO-Revision-Date: 2015-02-25 16:13+0000\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>\n"
-"Language-Team: Norwegian BokmÃ¥l (http://www.transifex.com/projects/p/FusionDirectory-108/language/nb/)\n"
+"Language-Team: Norwegian BokmÃ¥l (http://www.transifex.com/projects/p/FusionDirectory-109/language/nb/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -26,36 +26,36 @@ msgstr ""
 msgid "The sudo option '%s' is invalid!"
 msgstr ""
 
-#: admin/sudo/class_sudoOption.inc:278
+#: admin/sudo/class_sudoOption.inc:276
 #, php-format
 msgid "%s (%s)"
 msgstr ""
 
-#: admin/sudo/class_sudoOption.inc:481
+#: admin/sudo/class_sudoOption.inc:479
 msgid "Available options"
 msgstr ""
 
-#: admin/sudo/class_sudoOption.inc:484
+#: admin/sudo/class_sudoOption.inc:482
 msgid "Option"
 msgstr ""
 
-#: admin/sudo/class_sudoOption.inc:484
+#: admin/sudo/class_sudoOption.inc:482
 msgid "Add a new sudo option"
 msgstr ""
 
-#: admin/sudo/class_sudoOption.inc:489 admin/sudo/class_sudoOption.inc:491
+#: admin/sudo/class_sudoOption.inc:487 admin/sudo/class_sudoOption.inc:489
 msgid "Used sudo role options"
 msgstr ""
 
-#: admin/sudo/class_sudoOption.inc:563
+#: admin/sudo/class_sudoOption.inc:561
 msgid "Options"
 msgstr ""
 
-#: admin/sudo/class_sudoOption.inc:564
+#: admin/sudo/class_sudoOption.inc:562
 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:82
 #: config/sudo/class_sudoConfig.inc:42
 msgid "Sudo"
 msgstr ""
@@ -64,79 +64,93 @@ msgstr ""
 msgid "Sudo management"
 msgstr ""
 
-#: admin/sudo/class_sudoGeneric.inc:122 admin/sudo/class_sudoGeneric.inc:126
+#: admin/sudo/class_sudoGeneric.inc:83 admin/sudo/class_sudoGeneric.inc:87
 msgid "Sudo role"
 msgstr ""
 
-#: admin/sudo/class_sudoGeneric.inc:141
-msgid "Role settings"
+#: admin/sudo/class_sudoGeneric.inc:102
+msgid "Generic"
+msgstr "Generisk"
+
+#: admin/sudo/class_sudoGeneric.inc:102
+msgid "global defaults"
 msgstr ""
 
-#: admin/sudo/class_sudoGeneric.inc:146
+#: admin/sudo/class_sudoGeneric.inc:107
 msgid "Name"
 msgstr "Navn"
 
-#: admin/sudo/class_sudoGeneric.inc:146
+#: admin/sudo/class_sudoGeneric.inc:107
 msgid "Name of the role"
 msgstr ""
 
-#: admin/sudo/class_sudoGeneric.inc:151
+#: admin/sudo/class_sudoGeneric.inc:112
 msgid "Description"
 msgstr "Beskrivelse"
 
-#: admin/sudo/class_sudoGeneric.inc:151
+#: admin/sudo/class_sudoGeneric.inc:112
 msgid "Description for the new sudo role"
 msgstr ""
 
-#: admin/sudo/class_sudoGeneric.inc:156
+#: admin/sudo/class_sudoGeneric.inc:117
 msgid "Commands"
 msgstr ""
 
-#: admin/sudo/class_sudoGeneric.inc:157
+#: admin/sudo/class_sudoGeneric.inc:118
 msgid ""
 "A Unix command with optional command line arguments, potentially including "
 "globbing characters (aka wild cards)"
 msgstr ""
 
-#: admin/sudo/class_sudoGeneric.inc:163
-msgid "Run as (user)"
-msgstr ""
-
-#: admin/sudo/class_sudoGeneric.inc:164
-msgid "User(s) impersonated by sudo"
+#: admin/sudo/class_sudoGeneric.inc:124
+msgid "Run as"
 msgstr ""
 
-#: admin/sudo/class_sudoGeneric.inc:171
-msgid "Run as (group)"
-msgstr ""
-
-#: admin/sudo/class_sudoGeneric.inc:172
-msgid "Group(s) impersonated by sudo"
+#: admin/sudo/class_sudoGeneric.inc:125
+msgid ""
+"A user that commands may be run as or a Unix group that contains a list of "
+"users that commands may be run as"
 msgstr ""
 
-#: admin/sudo/class_sudoGeneric.inc:178
+#: admin/sudo/class_sudoGeneric.inc:131
 msgid "Systems"
 msgstr ""
 
-#: admin/sudo/class_sudoGeneric.inc:178
+#: admin/sudo/class_sudoGeneric.inc:131
 msgid "A host name, IP address or IP network"
 msgstr ""
 
-#: admin/sudo/class_sudoGeneric.inc:183
+#: admin/sudo/class_sudoGeneric.inc:136
 msgid "Users and groups"
 msgstr ""
 
-#: admin/sudo/class_sudoGeneric.inc:184
+#: admin/sudo/class_sudoGeneric.inc:137
 msgid ""
 "A user name, user ID (prefixed with '#'), Unix group (prefixed with '%')"
 msgstr ""
 
-#: admin/sudo/class_sudoGeneric.inc:188
-msgid "Priority"
+#: admin/sudo/class_sudoGeneric.inc:144
+msgid "System trust"
+msgstr ""
+
+#: admin/sudo/class_sudoGeneric.inc:148
+msgid "Trust mode"
+msgstr ""
+
+#: admin/sudo/class_sudoGeneric.inc:148
+msgid "Trust mode for the role"
+msgstr ""
+
+#: admin/sudo/class_sudoGeneric.inc:152
+msgid "disabled"
+msgstr ""
+
+#: admin/sudo/class_sudoGeneric.inc:152
+msgid "full access"
 msgstr ""
 
-#: admin/sudo/class_sudoGeneric.inc:188
-msgid "This rule priority compared to others"
+#: admin/sudo/class_sudoGeneric.inc:152
+msgid "allow access to these hosts"
 msgstr ""
 
 #: config/sudo/class_sudoConfig.inc:28
diff --git a/sudo/locale/nl/fusiondirectory.po b/sudo/locale/nl/fusiondirectory.po
index d6bc4acdff5d1d46ec72b02150fa39a68cc0cfaf..56fc2a8f748925e5c87c659ad991299f68a8e1fb 100644
--- a/sudo/locale/nl/fusiondirectory.po
+++ b/sudo/locale/nl/fusiondirectory.po
@@ -3,16 +3,14 @@
 # This file is distributed under the same license as the PACKAGE package.
 # 
 # Translators:
-# Christophe Augello <christophe@augello.be>, 2012
-#  Niels Klomp (CareWorks ICT Services) <nk@careworks.nl>, 2005
 msgid ""
 msgstr ""
-"Project-Id-Version: FusionDirectory-108\n"
+"Project-Id-Version: FusionDirectory-109\n"
 "Report-Msgid-Bugs-To: documentation@lists.fusiondirectory.org\n"
-"POT-Creation-Date: 2015-03-17 18:47+0100\n"
-"PO-Revision-Date: 2015-02-25 16:12+0000\n"
+"POT-Creation-Date: 2014-12-15 17:47+0100\n"
+"PO-Revision-Date: 2015-03-21 23:49+0000\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>\n"
-"Language-Team: Dutch (http://www.transifex.com/projects/p/FusionDirectory-108/language/nl/)\n"
+"Language-Team: Dutch (http://www.transifex.com/projects/p/FusionDirectory-109/language/nl/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -28,36 +26,36 @@ msgstr "Onbekende optie"
 msgid "The sudo option '%s' is invalid!"
 msgstr "Deze sudo optie '%s' is ongeldig!"
 
-#: admin/sudo/class_sudoOption.inc:278
+#: admin/sudo/class_sudoOption.inc:276
 #, php-format
 msgid "%s (%s)"
 msgstr ""
 
-#: admin/sudo/class_sudoOption.inc:481
+#: admin/sudo/class_sudoOption.inc:479
 msgid "Available options"
 msgstr "Beschikbare opties"
 
-#: admin/sudo/class_sudoOption.inc:484
+#: admin/sudo/class_sudoOption.inc:482
 msgid "Option"
 msgstr "Optie"
 
-#: admin/sudo/class_sudoOption.inc:484
+#: admin/sudo/class_sudoOption.inc:482
 msgid "Add a new sudo option"
 msgstr ""
 
-#: admin/sudo/class_sudoOption.inc:489 admin/sudo/class_sudoOption.inc:491
+#: admin/sudo/class_sudoOption.inc:487 admin/sudo/class_sudoOption.inc:489
 msgid "Used sudo role options"
 msgstr ""
 
-#: admin/sudo/class_sudoOption.inc:563
+#: admin/sudo/class_sudoOption.inc:561
 msgid "Options"
 msgstr "Opties"
 
-#: admin/sudo/class_sudoOption.inc:564
+#: admin/sudo/class_sudoOption.inc:562
 msgid "Sudo options"
 msgstr "Sudo opties"
 
-#: admin/sudo/class_sudoManagement.inc:32 admin/sudo/class_sudoGeneric.inc:121
+#: admin/sudo/class_sudoManagement.inc:32 admin/sudo/class_sudoGeneric.inc:82
 #: config/sudo/class_sudoConfig.inc:42
 msgid "Sudo"
 msgstr "Sudo"
@@ -66,81 +64,95 @@ msgstr "Sudo"
 msgid "Sudo management"
 msgstr "Sudo beheer"
 
-#: admin/sudo/class_sudoGeneric.inc:122 admin/sudo/class_sudoGeneric.inc:126
+#: admin/sudo/class_sudoGeneric.inc:83 admin/sudo/class_sudoGeneric.inc:87
 msgid "Sudo role"
 msgstr "Sudo rol"
 
-#: admin/sudo/class_sudoGeneric.inc:141
-msgid "Role settings"
-msgstr ""
+#: admin/sudo/class_sudoGeneric.inc:102
+msgid "Generic"
+msgstr "Algemeen"
+
+#: admin/sudo/class_sudoGeneric.inc:102
+msgid "global defaults"
+msgstr "Algemeene standaarden"
 
-#: admin/sudo/class_sudoGeneric.inc:146
+#: admin/sudo/class_sudoGeneric.inc:107
 msgid "Name"
 msgstr "Naam"
 
-#: admin/sudo/class_sudoGeneric.inc:146
+#: admin/sudo/class_sudoGeneric.inc:107
 msgid "Name of the role"
 msgstr "Naam van de rol"
 
-#: admin/sudo/class_sudoGeneric.inc:151
+#: admin/sudo/class_sudoGeneric.inc:112
 msgid "Description"
 msgstr "Omschrijving"
 
-#: admin/sudo/class_sudoGeneric.inc:151
+#: admin/sudo/class_sudoGeneric.inc:112
 msgid "Description for the new sudo role"
 msgstr ""
 
-#: admin/sudo/class_sudoGeneric.inc:156
+#: admin/sudo/class_sudoGeneric.inc:117
 msgid "Commands"
 msgstr "Commando's"
 
-#: admin/sudo/class_sudoGeneric.inc:157
+#: admin/sudo/class_sudoGeneric.inc:118
 msgid ""
 "A Unix command with optional command line arguments, potentially including "
 "globbing characters (aka wild cards)"
 msgstr ""
 
-#: admin/sudo/class_sudoGeneric.inc:163
-msgid "Run as (user)"
-msgstr ""
-
-#: admin/sudo/class_sudoGeneric.inc:164
-msgid "User(s) impersonated by sudo"
-msgstr ""
-
-#: admin/sudo/class_sudoGeneric.inc:171
-msgid "Run as (group)"
-msgstr ""
+#: admin/sudo/class_sudoGeneric.inc:124
+msgid "Run as"
+msgstr "Run as"
 
-#: admin/sudo/class_sudoGeneric.inc:172
-msgid "Group(s) impersonated by sudo"
+#: admin/sudo/class_sudoGeneric.inc:125
+msgid ""
+"A user that commands may be run as or a Unix group that contains a list of "
+"users that commands may be run as"
 msgstr ""
 
-#: admin/sudo/class_sudoGeneric.inc:178
+#: admin/sudo/class_sudoGeneric.inc:131
 msgid "Systems"
 msgstr "Systemen"
 
-#: admin/sudo/class_sudoGeneric.inc:178
+#: admin/sudo/class_sudoGeneric.inc:131
 msgid "A host name, IP address or IP network"
 msgstr ""
 
-#: admin/sudo/class_sudoGeneric.inc:183
+#: admin/sudo/class_sudoGeneric.inc:136
 msgid "Users and groups"
 msgstr "Gebruikers en groepen"
 
-#: admin/sudo/class_sudoGeneric.inc:184
+#: admin/sudo/class_sudoGeneric.inc:137
 msgid ""
 "A user name, user ID (prefixed with '#'), Unix group (prefixed with '%')"
 msgstr ""
 
-#: admin/sudo/class_sudoGeneric.inc:188
-msgid "Priority"
-msgstr "Prioriteit"
+#: admin/sudo/class_sudoGeneric.inc:144
+msgid "System trust"
+msgstr "Systeem vertrouwen"
+
+#: admin/sudo/class_sudoGeneric.inc:148
+msgid "Trust mode"
+msgstr "Vertrouwensmodus"
 
-#: admin/sudo/class_sudoGeneric.inc:188
-msgid "This rule priority compared to others"
+#: admin/sudo/class_sudoGeneric.inc:148
+msgid "Trust mode for the role"
 msgstr ""
 
+#: admin/sudo/class_sudoGeneric.inc:152
+msgid "disabled"
+msgstr "gedeactiveerd"
+
+#: admin/sudo/class_sudoGeneric.inc:152
+msgid "full access"
+msgstr "volledige toegang"
+
+#: admin/sudo/class_sudoGeneric.inc:152
+msgid "allow access to these hosts"
+msgstr "sta toegang op deze computers toe"
+
 #: config/sudo/class_sudoConfig.inc:28
 msgid "Sudo configuration"
 msgstr ""
diff --git a/sudo/locale/pl/fusiondirectory.po b/sudo/locale/pl/fusiondirectory.po
index 8a1080baad46d920eb44dae410e21e32bf0dfc65..c5b596d5b973bf7997adaea14f98108f17679e44 100644
--- a/sudo/locale/pl/fusiondirectory.po
+++ b/sudo/locale/pl/fusiondirectory.po
@@ -5,12 +5,12 @@
 # Translators:
 msgid ""
 msgstr ""
-"Project-Id-Version: FusionDirectory-108\n"
+"Project-Id-Version: FusionDirectory-109\n"
 "Report-Msgid-Bugs-To: documentation@lists.fusiondirectory.org\n"
-"POT-Creation-Date: 2015-03-17 18:47+0100\n"
-"PO-Revision-Date: 2015-02-25 16:12+0000\n"
+"POT-Creation-Date: 2014-12-15 17:47+0100\n"
+"PO-Revision-Date: 2015-02-25 16:13+0000\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>\n"
-"Language-Team: Polish (http://www.transifex.com/projects/p/FusionDirectory-108/language/pl/)\n"
+"Language-Team: Polish (http://www.transifex.com/projects/p/FusionDirectory-109/language/pl/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -26,36 +26,36 @@ msgstr ""
 msgid "The sudo option '%s' is invalid!"
 msgstr ""
 
-#: admin/sudo/class_sudoOption.inc:278
+#: admin/sudo/class_sudoOption.inc:276
 #, php-format
 msgid "%s (%s)"
 msgstr ""
 
-#: admin/sudo/class_sudoOption.inc:481
+#: admin/sudo/class_sudoOption.inc:479
 msgid "Available options"
 msgstr ""
 
-#: admin/sudo/class_sudoOption.inc:484
+#: admin/sudo/class_sudoOption.inc:482
 msgid "Option"
 msgstr "Opcja"
 
-#: admin/sudo/class_sudoOption.inc:484
+#: admin/sudo/class_sudoOption.inc:482
 msgid "Add a new sudo option"
 msgstr ""
 
-#: admin/sudo/class_sudoOption.inc:489 admin/sudo/class_sudoOption.inc:491
+#: admin/sudo/class_sudoOption.inc:487 admin/sudo/class_sudoOption.inc:489
 msgid "Used sudo role options"
 msgstr ""
 
-#: admin/sudo/class_sudoOption.inc:563
+#: admin/sudo/class_sudoOption.inc:561
 msgid "Options"
 msgstr "Opcje"
 
-#: admin/sudo/class_sudoOption.inc:564
+#: admin/sudo/class_sudoOption.inc:562
 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:82
 #: config/sudo/class_sudoConfig.inc:42
 msgid "Sudo"
 msgstr ""
@@ -64,81 +64,95 @@ msgstr ""
 msgid "Sudo management"
 msgstr ""
 
-#: admin/sudo/class_sudoGeneric.inc:122 admin/sudo/class_sudoGeneric.inc:126
+#: admin/sudo/class_sudoGeneric.inc:83 admin/sudo/class_sudoGeneric.inc:87
 msgid "Sudo role"
 msgstr ""
 
-#: admin/sudo/class_sudoGeneric.inc:141
-msgid "Role settings"
+#: admin/sudo/class_sudoGeneric.inc:102
+msgid "Generic"
+msgstr "OgÃ³lne"
+
+#: admin/sudo/class_sudoGeneric.inc:102
+msgid "global defaults"
 msgstr ""
 
-#: admin/sudo/class_sudoGeneric.inc:146
+#: admin/sudo/class_sudoGeneric.inc:107
 msgid "Name"
 msgstr "ImiÄ™"
 
-#: admin/sudo/class_sudoGeneric.inc:146
+#: admin/sudo/class_sudoGeneric.inc:107
 msgid "Name of the role"
 msgstr ""
 
-#: admin/sudo/class_sudoGeneric.inc:151
+#: admin/sudo/class_sudoGeneric.inc:112
 msgid "Description"
 msgstr "Opis"
 
-#: admin/sudo/class_sudoGeneric.inc:151
+#: admin/sudo/class_sudoGeneric.inc:112
 msgid "Description for the new sudo role"
 msgstr ""
 
-#: admin/sudo/class_sudoGeneric.inc:156
+#: admin/sudo/class_sudoGeneric.inc:117
 msgid "Commands"
 msgstr ""
 
-#: admin/sudo/class_sudoGeneric.inc:157
+#: admin/sudo/class_sudoGeneric.inc:118
 msgid ""
 "A Unix command with optional command line arguments, potentially including "
 "globbing characters (aka wild cards)"
 msgstr ""
 
-#: admin/sudo/class_sudoGeneric.inc:163
-msgid "Run as (user)"
-msgstr ""
-
-#: admin/sudo/class_sudoGeneric.inc:164
-msgid "User(s) impersonated by sudo"
-msgstr ""
-
-#: admin/sudo/class_sudoGeneric.inc:171
-msgid "Run as (group)"
+#: admin/sudo/class_sudoGeneric.inc:124
+msgid "Run as"
 msgstr ""
 
-#: admin/sudo/class_sudoGeneric.inc:172
-msgid "Group(s) impersonated by sudo"
+#: admin/sudo/class_sudoGeneric.inc:125
+msgid ""
+"A user that commands may be run as or a Unix group that contains a list of "
+"users that commands may be run as"
 msgstr ""
 
-#: admin/sudo/class_sudoGeneric.inc:178
+#: admin/sudo/class_sudoGeneric.inc:131
 msgid "Systems"
 msgstr "Systemy"
 
-#: admin/sudo/class_sudoGeneric.inc:178
+#: admin/sudo/class_sudoGeneric.inc:131
 msgid "A host name, IP address or IP network"
 msgstr ""
 
-#: admin/sudo/class_sudoGeneric.inc:183
+#: admin/sudo/class_sudoGeneric.inc:136
 msgid "Users and groups"
 msgstr ""
 
-#: admin/sudo/class_sudoGeneric.inc:184
+#: admin/sudo/class_sudoGeneric.inc:137
 msgid ""
 "A user name, user ID (prefixed with '#'), Unix group (prefixed with '%')"
 msgstr ""
 
-#: admin/sudo/class_sudoGeneric.inc:188
-msgid "Priority"
-msgstr "Priorytet"
+#: admin/sudo/class_sudoGeneric.inc:144
+msgid "System trust"
+msgstr "Zaufanie systemowe"
+
+#: admin/sudo/class_sudoGeneric.inc:148
+msgid "Trust mode"
+msgstr "Tryb zaufania"
 
-#: admin/sudo/class_sudoGeneric.inc:188
-msgid "This rule priority compared to others"
+#: admin/sudo/class_sudoGeneric.inc:148
+msgid "Trust mode for the role"
 msgstr ""
 
+#: admin/sudo/class_sudoGeneric.inc:152
+msgid "disabled"
+msgstr "wyÅ‚Ä…czone"
+
+#: admin/sudo/class_sudoGeneric.inc:152
+msgid "full access"
+msgstr "peÅ‚en dostÄ™p"
+
+#: admin/sudo/class_sudoGeneric.inc:152
+msgid "allow access to these hosts"
+msgstr "zezwÃ³l na dostÄ™p do tych hostÃ³w"
+
 #: config/sudo/class_sudoConfig.inc:28
 msgid "Sudo configuration"
 msgstr ""
diff --git a/sudo/locale/pt/fusiondirectory.po b/sudo/locale/pt/fusiondirectory.po
index ea70b093816d6cc00be3246fc794f322e47a54ee..48785580e1a03c04a1fc03fe263bee3dffdaa09c 100644
--- a/sudo/locale/pt/fusiondirectory.po
+++ b/sudo/locale/pt/fusiondirectory.po
@@ -5,12 +5,12 @@
 # Translators:
 msgid ""
 msgstr ""
-"Project-Id-Version: FusionDirectory-108\n"
+"Project-Id-Version: FusionDirectory-109\n"
 "Report-Msgid-Bugs-To: documentation@lists.fusiondirectory.org\n"
-"POT-Creation-Date: 2015-03-17 18:47+0100\n"
-"PO-Revision-Date: 2015-02-25 16:02+0000\n"
+"POT-Creation-Date: 2014-12-15 17:47+0100\n"
+"PO-Revision-Date: 2015-02-25 16:13+0000\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>\n"
-"Language-Team: Portuguese (http://www.transifex.com/projects/p/FusionDirectory-108/language/pt/)\n"
+"Language-Team: Portuguese (http://www.transifex.com/projects/p/FusionDirectory-109/language/pt/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -26,36 +26,36 @@ msgstr ""
 msgid "The sudo option '%s' is invalid!"
 msgstr ""
 
-#: admin/sudo/class_sudoOption.inc:278
+#: admin/sudo/class_sudoOption.inc:276
 #, php-format
 msgid "%s (%s)"
 msgstr ""
 
-#: admin/sudo/class_sudoOption.inc:481
+#: admin/sudo/class_sudoOption.inc:479
 msgid "Available options"
 msgstr ""
 
-#: admin/sudo/class_sudoOption.inc:484
+#: admin/sudo/class_sudoOption.inc:482
 msgid "Option"
 msgstr ""
 
-#: admin/sudo/class_sudoOption.inc:484
+#: admin/sudo/class_sudoOption.inc:482
 msgid "Add a new sudo option"
 msgstr ""
 
-#: admin/sudo/class_sudoOption.inc:489 admin/sudo/class_sudoOption.inc:491
+#: admin/sudo/class_sudoOption.inc:487 admin/sudo/class_sudoOption.inc:489
 msgid "Used sudo role options"
 msgstr ""
 
-#: admin/sudo/class_sudoOption.inc:563
+#: admin/sudo/class_sudoOption.inc:561
 msgid "Options"
 msgstr ""
 
-#: admin/sudo/class_sudoOption.inc:564
+#: admin/sudo/class_sudoOption.inc:562
 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:82
 #: config/sudo/class_sudoConfig.inc:42
 msgid "Sudo"
 msgstr ""
@@ -64,81 +64,95 @@ msgstr ""
 msgid "Sudo management"
 msgstr ""
 
-#: admin/sudo/class_sudoGeneric.inc:122 admin/sudo/class_sudoGeneric.inc:126
+#: admin/sudo/class_sudoGeneric.inc:83 admin/sudo/class_sudoGeneric.inc:87
 msgid "Sudo role"
 msgstr ""
 
-#: admin/sudo/class_sudoGeneric.inc:141
-msgid "Role settings"
+#: admin/sudo/class_sudoGeneric.inc:102
+msgid "Generic"
+msgstr "Geral"
+
+#: admin/sudo/class_sudoGeneric.inc:102
+msgid "global defaults"
 msgstr ""
 
-#: admin/sudo/class_sudoGeneric.inc:146
+#: admin/sudo/class_sudoGeneric.inc:107
 msgid "Name"
 msgstr "Nome"
 
-#: admin/sudo/class_sudoGeneric.inc:146
+#: admin/sudo/class_sudoGeneric.inc:107
 msgid "Name of the role"
 msgstr ""
 
-#: admin/sudo/class_sudoGeneric.inc:151
+#: admin/sudo/class_sudoGeneric.inc:112
 msgid "Description"
 msgstr "DescriÃ§Ã£o"
 
-#: admin/sudo/class_sudoGeneric.inc:151
+#: admin/sudo/class_sudoGeneric.inc:112
 msgid "Description for the new sudo role"
 msgstr ""
 
-#: admin/sudo/class_sudoGeneric.inc:156
+#: admin/sudo/class_sudoGeneric.inc:117
 msgid "Commands"
 msgstr ""
 
-#: admin/sudo/class_sudoGeneric.inc:157
+#: admin/sudo/class_sudoGeneric.inc:118
 msgid ""
 "A Unix command with optional command line arguments, potentially including "
 "globbing characters (aka wild cards)"
 msgstr ""
 
-#: admin/sudo/class_sudoGeneric.inc:163
-msgid "Run as (user)"
-msgstr ""
-
-#: admin/sudo/class_sudoGeneric.inc:164
-msgid "User(s) impersonated by sudo"
+#: admin/sudo/class_sudoGeneric.inc:124
+msgid "Run as"
 msgstr ""
 
-#: admin/sudo/class_sudoGeneric.inc:171
-msgid "Run as (group)"
-msgstr ""
-
-#: admin/sudo/class_sudoGeneric.inc:172
-msgid "Group(s) impersonated by sudo"
+#: admin/sudo/class_sudoGeneric.inc:125
+msgid ""
+"A user that commands may be run as or a Unix group that contains a list of "
+"users that commands may be run as"
 msgstr ""
 
-#: admin/sudo/class_sudoGeneric.inc:178
+#: admin/sudo/class_sudoGeneric.inc:131
 msgid "Systems"
 msgstr "Sistemas"
 
-#: admin/sudo/class_sudoGeneric.inc:178
+#: admin/sudo/class_sudoGeneric.inc:131
 msgid "A host name, IP address or IP network"
 msgstr ""
 
-#: admin/sudo/class_sudoGeneric.inc:183
+#: admin/sudo/class_sudoGeneric.inc:136
 msgid "Users and groups"
 msgstr ""
 
-#: admin/sudo/class_sudoGeneric.inc:184
+#: admin/sudo/class_sudoGeneric.inc:137
 msgid ""
 "A user name, user ID (prefixed with '#'), Unix group (prefixed with '%')"
 msgstr ""
 
-#: admin/sudo/class_sudoGeneric.inc:188
-msgid "Priority"
-msgstr ""
+#: admin/sudo/class_sudoGeneric.inc:144
+msgid "System trust"
+msgstr "Sistema de confianÃ§a"
+
+#: admin/sudo/class_sudoGeneric.inc:148
+msgid "Trust mode"
+msgstr "Modo de confianÃ§a"
 
-#: admin/sudo/class_sudoGeneric.inc:188
-msgid "This rule priority compared to others"
+#: admin/sudo/class_sudoGeneric.inc:148
+msgid "Trust mode for the role"
 msgstr ""
 
+#: admin/sudo/class_sudoGeneric.inc:152
+msgid "disabled"
+msgstr "desabilitado"
+
+#: admin/sudo/class_sudoGeneric.inc:152
+msgid "full access"
+msgstr "acesso completo"
+
+#: admin/sudo/class_sudoGeneric.inc:152
+msgid "allow access to these hosts"
+msgstr "permitir acesso a estas mÃ¡quinas"
+
 #: config/sudo/class_sudoConfig.inc:28
 msgid "Sudo configuration"
 msgstr ""
diff --git a/sudo/locale/pt_BR/fusiondirectory.po b/sudo/locale/pt_BR/fusiondirectory.po
index 27a31248efb6b237ef6768f55df24cf0bc462f2f..05bb31952a81dc5cd0a1de0ce75a8463f1caa36e 100644
--- a/sudo/locale/pt_BR/fusiondirectory.po
+++ b/sudo/locale/pt_BR/fusiondirectory.po
@@ -5,12 +5,12 @@
 # Translators:
 msgid ""
 msgstr ""
-"Project-Id-Version: FusionDirectory-108\n"
+"Project-Id-Version: FusionDirectory-109\n"
 "Report-Msgid-Bugs-To: documentation@lists.fusiondirectory.org\n"
-"POT-Creation-Date: 2015-03-17 18:47+0100\n"
-"PO-Revision-Date: 2015-02-25 16:12+0000\n"
+"POT-Creation-Date: 2014-12-15 17:47+0100\n"
+"PO-Revision-Date: 2015-03-21 23:49+0000\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>\n"
-"Language-Team: Portuguese (Brazil) (http://www.transifex.com/projects/p/FusionDirectory-108/language/pt_BR/)\n"
+"Language-Team: Portuguese (Brazil) (http://www.transifex.com/projects/p/FusionDirectory-109/language/pt_BR/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -26,36 +26,36 @@ msgstr "OpÃ§Ã£o desconhecida"
 msgid "The sudo option '%s' is invalid!"
 msgstr "A opÃ§Ã£o SUDO '%s' Ã© invÃ¡lida"
 
-#: admin/sudo/class_sudoOption.inc:278
+#: admin/sudo/class_sudoOption.inc:276
 #, php-format
 msgid "%s (%s)"
 msgstr "%s(%s)"
 
-#: admin/sudo/class_sudoOption.inc:481
+#: admin/sudo/class_sudoOption.inc:479
 msgid "Available options"
 msgstr "OpÃ§Ãµes disponÃveis"
 
-#: admin/sudo/class_sudoOption.inc:484
+#: admin/sudo/class_sudoOption.inc:482
 msgid "Option"
 msgstr "OpÃ§Ã£o"
 
-#: admin/sudo/class_sudoOption.inc:484
+#: admin/sudo/class_sudoOption.inc:482
 msgid "Add a new sudo option"
 msgstr "Adicionar nova opÃ§Ã£o de sudo"
 
-#: admin/sudo/class_sudoOption.inc:489 admin/sudo/class_sudoOption.inc:491
+#: admin/sudo/class_sudoOption.inc:487 admin/sudo/class_sudoOption.inc:489
 msgid "Used sudo role options"
 msgstr "OpÃ§Ãµes de funÃ§Ãµes sudo utilizados"
 
-#: admin/sudo/class_sudoOption.inc:563
+#: admin/sudo/class_sudoOption.inc:561
 msgid "Options"
 msgstr "OpÃ§Ãµes"
 
-#: admin/sudo/class_sudoOption.inc:564
+#: admin/sudo/class_sudoOption.inc:562
 msgid "Sudo options"
 msgstr "OpÃ§Ãµes de sudo"
 
-#: admin/sudo/class_sudoManagement.inc:32 admin/sudo/class_sudoGeneric.inc:121
+#: admin/sudo/class_sudoManagement.inc:32 admin/sudo/class_sudoGeneric.inc:82
 #: config/sudo/class_sudoConfig.inc:42
 msgid "Sudo"
 msgstr "Sudo"
@@ -64,80 +64,94 @@ msgstr "Sudo"
 msgid "Sudo management"
 msgstr "GestaÃ§Ã£o sudo"
 
-#: admin/sudo/class_sudoGeneric.inc:122 admin/sudo/class_sudoGeneric.inc:126
+#: admin/sudo/class_sudoGeneric.inc:83 admin/sudo/class_sudoGeneric.inc:87
 msgid "Sudo role"
 msgstr "FunÃ§Ã£o sudo"
 
-#: admin/sudo/class_sudoGeneric.inc:141
-msgid "Role settings"
-msgstr ""
+#: admin/sudo/class_sudoGeneric.inc:102
+msgid "Generic"
+msgstr "GenÃ©rico"
+
+#: admin/sudo/class_sudoGeneric.inc:102
+msgid "global defaults"
+msgstr "padrÃµes globais"
 
-#: admin/sudo/class_sudoGeneric.inc:146
+#: admin/sudo/class_sudoGeneric.inc:107
 msgid "Name"
 msgstr "Nome"
 
-#: admin/sudo/class_sudoGeneric.inc:146
+#: admin/sudo/class_sudoGeneric.inc:107
 msgid "Name of the role"
 msgstr "Nome da atribuiÃ§Ã£o"
 
-#: admin/sudo/class_sudoGeneric.inc:151
+#: admin/sudo/class_sudoGeneric.inc:112
 msgid "Description"
 msgstr "DescriÃ§Ã£o"
 
-#: admin/sudo/class_sudoGeneric.inc:151
+#: admin/sudo/class_sudoGeneric.inc:112
 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:117
 msgid "Commands"
 msgstr "Comandos"
 
-#: admin/sudo/class_sudoGeneric.inc:157
+#: admin/sudo/class_sudoGeneric.inc:118
 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
-msgid "Run as (user)"
-msgstr ""
-
-#: admin/sudo/class_sudoGeneric.inc:164
-msgid "User(s) impersonated by sudo"
-msgstr ""
-
-#: admin/sudo/class_sudoGeneric.inc:171
-msgid "Run as (group)"
-msgstr ""
+#: admin/sudo/class_sudoGeneric.inc:124
+msgid "Run as"
+msgstr "Executado como"
 
-#: admin/sudo/class_sudoGeneric.inc:172
-msgid "Group(s) impersonated by sudo"
-msgstr ""
+#: admin/sudo/class_sudoGeneric.inc:125
+msgid ""
+"A user that commands may be run as or a Unix group that contains a list of "
+"users that commands may be run as"
+msgstr "Um usuÃ¡rio que os comandos podem ser executados como Unix ou um grupo que contÃ©m uma lista de usuÃ¡rios que os comandos podem ser executados como"
 
-#: admin/sudo/class_sudoGeneric.inc:178
+#: admin/sudo/class_sudoGeneric.inc:131
 msgid "Systems"
 msgstr "Sistemas"
 
-#: admin/sudo/class_sudoGeneric.inc:178
+#: admin/sudo/class_sudoGeneric.inc:131
 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:136
 msgid "Users and groups"
 msgstr "UsuÃ¡rios e grupos"
 
-#: admin/sudo/class_sudoGeneric.inc:184
+#: admin/sudo/class_sudoGeneric.inc:137
 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
-msgid "Priority"
-msgstr ""
+#: admin/sudo/class_sudoGeneric.inc:144
+msgid "System trust"
+msgstr "Sistema de confianÃ§a"
 
-#: admin/sudo/class_sudoGeneric.inc:188
-msgid "This rule priority compared to others"
-msgstr ""
+#: admin/sudo/class_sudoGeneric.inc:148
+msgid "Trust mode"
+msgstr "Modo de confianÃ§a"
+
+#: admin/sudo/class_sudoGeneric.inc:148
+msgid "Trust mode for the role"
+msgstr "Modo de confianÃ§a para a funÃ§Ã£o"
+
+#: admin/sudo/class_sudoGeneric.inc:152
+msgid "disabled"
+msgstr "desabilitado"
+
+#: admin/sudo/class_sudoGeneric.inc:152
+msgid "full access"
+msgstr "Acesso total"
+
+#: admin/sudo/class_sudoGeneric.inc:152
+msgid "allow access to these hosts"
+msgstr "Permitir acesso a esses servidores"
 
 #: config/sudo/class_sudoConfig.inc:28
 msgid "Sudo configuration"
diff --git a/sudo/locale/ru/fusiondirectory.po b/sudo/locale/ru/fusiondirectory.po
index fd04b69bd42ea8c9d379906d0f8b6d6bd9c6fbaf..91049e4312f8740f7ffe102b2d9b46d851836a25 100644
--- a/sudo/locale/ru/fusiondirectory.po
+++ b/sudo/locale/ru/fusiondirectory.po
@@ -3,20 +3,19 @@
 # This file is distributed under the same license as the PACKAGE package.
 # 
 # Translators:
-#  Valia V. Vaneeva <fattie@altlinux.ru>, 2004
 msgid ""
 msgstr ""
-"Project-Id-Version: FusionDirectory-108\n"
+"Project-Id-Version: FusionDirectory-109\n"
 "Report-Msgid-Bugs-To: documentation@lists.fusiondirectory.org\n"
-"POT-Creation-Date: 2015-03-17 18:47+0100\n"
-"PO-Revision-Date: 2015-02-25 16:12+0000\n"
+"POT-Creation-Date: 2014-12-15 17:47+0100\n"
+"PO-Revision-Date: 2015-04-12 22:01+0000\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>\n"
-"Language-Team: Russian (http://www.transifex.com/projects/p/FusionDirectory-108/language/ru/)\n"
+"Language-Team: Russian (http://www.transifex.com/projects/p/FusionDirectory-109/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=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);\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/sudo/class_sudoOption.inc:82
 msgid "Unknown option"
@@ -27,36 +26,36 @@ msgstr ""
 msgid "The sudo option '%s' is invalid!"
 msgstr ""
 
-#: admin/sudo/class_sudoOption.inc:278
+#: admin/sudo/class_sudoOption.inc:276
 #, php-format
 msgid "%s (%s)"
 msgstr ""
 
-#: admin/sudo/class_sudoOption.inc:481
+#: admin/sudo/class_sudoOption.inc:479
 msgid "Available options"
 msgstr ""
 
-#: admin/sudo/class_sudoOption.inc:484
+#: admin/sudo/class_sudoOption.inc:482
 msgid "Option"
-msgstr ""
+msgstr "ÐžÐ¿Ñ†Ð¸Ð¸"
 
-#: admin/sudo/class_sudoOption.inc:484
+#: admin/sudo/class_sudoOption.inc:482
 msgid "Add a new sudo option"
 msgstr ""
 
-#: admin/sudo/class_sudoOption.inc:489 admin/sudo/class_sudoOption.inc:491
+#: admin/sudo/class_sudoOption.inc:487 admin/sudo/class_sudoOption.inc:489
 msgid "Used sudo role options"
 msgstr ""
 
-#: admin/sudo/class_sudoOption.inc:563
+#: admin/sudo/class_sudoOption.inc:561
 msgid "Options"
 msgstr "ÐŸÐ°Ñ€Ð°Ð¼ÐµÑ‚Ñ€Ñ‹"
 
-#: admin/sudo/class_sudoOption.inc:564
+#: admin/sudo/class_sudoOption.inc:562
 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:82
 #: config/sudo/class_sudoConfig.inc:42
 msgid "Sudo"
 msgstr ""
@@ -65,81 +64,95 @@ msgstr ""
 msgid "Sudo management"
 msgstr ""
 
-#: admin/sudo/class_sudoGeneric.inc:122 admin/sudo/class_sudoGeneric.inc:126
+#: admin/sudo/class_sudoGeneric.inc:83 admin/sudo/class_sudoGeneric.inc:87
 msgid "Sudo role"
 msgstr ""
 
-#: admin/sudo/class_sudoGeneric.inc:141
-msgid "Role settings"
+#: admin/sudo/class_sudoGeneric.inc:102
+msgid "Generic"
+msgstr "ÐžÐ±Ñ‰ÐµÐµ"
+
+#: admin/sudo/class_sudoGeneric.inc:102
+msgid "global defaults"
 msgstr ""
 
-#: admin/sudo/class_sudoGeneric.inc:146
+#: admin/sudo/class_sudoGeneric.inc:107
 msgid "Name"
 msgstr "Ð¤Ð°Ð¼Ð¸Ð»Ð¸Ñ"
 
-#: admin/sudo/class_sudoGeneric.inc:146
+#: admin/sudo/class_sudoGeneric.inc:107
 msgid "Name of the role"
 msgstr "Ð˜Ð¼Ñ Ñ€Ð¾Ð»Ð¸"
 
-#: admin/sudo/class_sudoGeneric.inc:151
+#: admin/sudo/class_sudoGeneric.inc:112
 msgid "Description"
 msgstr "ÐžÐ¿Ð¸ÑÐ°Ð½Ð¸Ðµ"
 
-#: admin/sudo/class_sudoGeneric.inc:151
+#: admin/sudo/class_sudoGeneric.inc:112
 msgid "Description for the new sudo role"
 msgstr ""
 
-#: admin/sudo/class_sudoGeneric.inc:156
+#: admin/sudo/class_sudoGeneric.inc:117
 msgid "Commands"
 msgstr ""
 
-#: admin/sudo/class_sudoGeneric.inc:157
+#: admin/sudo/class_sudoGeneric.inc:118
 msgid ""
 "A Unix command with optional command line arguments, potentially including "
 "globbing characters (aka wild cards)"
 msgstr ""
 
-#: admin/sudo/class_sudoGeneric.inc:163
-msgid "Run as (user)"
-msgstr ""
-
-#: admin/sudo/class_sudoGeneric.inc:164
-msgid "User(s) impersonated by sudo"
+#: admin/sudo/class_sudoGeneric.inc:124
+msgid "Run as"
 msgstr ""
 
-#: admin/sudo/class_sudoGeneric.inc:171
-msgid "Run as (group)"
-msgstr ""
-
-#: admin/sudo/class_sudoGeneric.inc:172
-msgid "Group(s) impersonated by sudo"
+#: admin/sudo/class_sudoGeneric.inc:125
+msgid ""
+"A user that commands may be run as or a Unix group that contains a list of "
+"users that commands may be run as"
 msgstr ""
 
-#: admin/sudo/class_sudoGeneric.inc:178
+#: admin/sudo/class_sudoGeneric.inc:131
 msgid "Systems"
 msgstr "Ð¡Ð¸ÑÑ‚ÐµÐ¼Ñ‹"
 
-#: admin/sudo/class_sudoGeneric.inc:178
+#: admin/sudo/class_sudoGeneric.inc:131
 msgid "A host name, IP address or IP network"
 msgstr ""
 
-#: admin/sudo/class_sudoGeneric.inc:183
+#: admin/sudo/class_sudoGeneric.inc:136
 msgid "Users and groups"
-msgstr ""
+msgstr "ÐŸÐ¾Ð»ÑŒÐ·Ð¾Ð²Ð°Ñ‚ÐµÐ»Ð¸ Ð¸ Ð³Ñ€ÑƒÐ¿Ð¿Ñ‹"
 
-#: admin/sudo/class_sudoGeneric.inc:184
+#: admin/sudo/class_sudoGeneric.inc:137
 msgid ""
 "A user name, user ID (prefixed with '#'), Unix group (prefixed with '%')"
 msgstr ""
 
-#: admin/sudo/class_sudoGeneric.inc:188
-msgid "Priority"
-msgstr ""
+#: admin/sudo/class_sudoGeneric.inc:144
+msgid "System trust"
+msgstr "Ð¡Ð¸ÑÑ‚ÐµÐ¼Ð½Ñ‹Ðµ Ð´Ð¾Ð²ÐµÑ€Ð¸Ñ"
+
+#: admin/sudo/class_sudoGeneric.inc:148
+msgid "Trust mode"
+msgstr "Ð ÐµÐ¶Ð¸Ð¼ Ð´Ð¾Ð²ÐµÑ€Ð¸Ñ"
 
-#: admin/sudo/class_sudoGeneric.inc:188
-msgid "This rule priority compared to others"
+#: admin/sudo/class_sudoGeneric.inc:148
+msgid "Trust mode for the role"
 msgstr ""
 
+#: admin/sudo/class_sudoGeneric.inc:152
+msgid "disabled"
+msgstr "Ð¾Ñ‚ÐºÐ»ÑŽÑ‡ÐµÐ½"
+
+#: admin/sudo/class_sudoGeneric.inc:152
+msgid "full access"
+msgstr "Ð¿Ð¾Ð»Ð½Ñ‹Ð¹ Ð´Ð¾ÑÑ‚ÑƒÐ¿"
+
+#: admin/sudo/class_sudoGeneric.inc:152
+msgid "allow access to these hosts"
+msgstr "Ñ€Ð°Ð·Ñ€ÐµÑˆÐ¸Ñ‚ÑŒ Ð´Ð¾ÑÑ‚ÑƒÐ¿ Ñ‚Ð¾Ð»ÑŒÐºÐ¾ Ð½Ð° ÑÑ‚Ð¸ Ñ…Ð¾ÑÑ‚Ñ‹"
+
 #: config/sudo/class_sudoConfig.inc:28
 msgid "Sudo configuration"
 msgstr ""
diff --git a/sudo/locale/ru@petr1708/fusiondirectory.po b/sudo/locale/ru@petr1708/fusiondirectory.po
index 7bb4ad60dd0afbbf5c3cc02d62a5cd68a525a308..52c0d3fa93a43250522f01f5a7234017899c6c7c 100644
--- a/sudo/locale/ru@petr1708/fusiondirectory.po
+++ b/sudo/locale/ru@petr1708/fusiondirectory.po
@@ -5,17 +5,17 @@
 # Translators:
 msgid ""
 msgstr ""
-"Project-Id-Version: FusionDirectory-108\n"
+"Project-Id-Version: FusionDirectory-109\n"
 "Report-Msgid-Bugs-To: documentation@lists.fusiondirectory.org\n"
-"POT-Creation-Date: 2015-03-17 18:47+0100\n"
-"PO-Revision-Date: 2015-02-25 15:55+0000\n"
+"POT-Creation-Date: 2014-12-15 17:47+0100\n"
+"PO-Revision-Date: 2014-12-15 17:05+0000\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>\n"
-"Language-Team: Russian Petrine orthography (http://www.transifex.com/projects/p/FusionDirectory-108/language/ru@petr1708/)\n"
+"Language-Team: Russian Petrine orthography (http://www.transifex.com/projects/p/FusionDirectory-109/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=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);\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/sudo/class_sudoOption.inc:82
 msgid "Unknown option"
@@ -26,36 +26,36 @@ msgstr ""
 msgid "The sudo option '%s' is invalid!"
 msgstr ""
 
-#: admin/sudo/class_sudoOption.inc:278
+#: admin/sudo/class_sudoOption.inc:276
 #, php-format
 msgid "%s (%s)"
 msgstr ""
 
-#: admin/sudo/class_sudoOption.inc:481
+#: admin/sudo/class_sudoOption.inc:479
 msgid "Available options"
 msgstr ""
 
-#: admin/sudo/class_sudoOption.inc:484
+#: admin/sudo/class_sudoOption.inc:482
 msgid "Option"
 msgstr ""
 
-#: admin/sudo/class_sudoOption.inc:484
+#: admin/sudo/class_sudoOption.inc:482
 msgid "Add a new sudo option"
 msgstr ""
 
-#: admin/sudo/class_sudoOption.inc:489 admin/sudo/class_sudoOption.inc:491
+#: admin/sudo/class_sudoOption.inc:487 admin/sudo/class_sudoOption.inc:489
 msgid "Used sudo role options"
 msgstr ""
 
-#: admin/sudo/class_sudoOption.inc:563
+#: admin/sudo/class_sudoOption.inc:561
 msgid "Options"
 msgstr ""
 
-#: admin/sudo/class_sudoOption.inc:564
+#: admin/sudo/class_sudoOption.inc:562
 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:82
 #: config/sudo/class_sudoConfig.inc:42
 msgid "Sudo"
 msgstr ""
@@ -64,79 +64,93 @@ msgstr ""
 msgid "Sudo management"
 msgstr ""
 
-#: admin/sudo/class_sudoGeneric.inc:122 admin/sudo/class_sudoGeneric.inc:126
+#: admin/sudo/class_sudoGeneric.inc:83 admin/sudo/class_sudoGeneric.inc:87
 msgid "Sudo role"
 msgstr ""
 
-#: admin/sudo/class_sudoGeneric.inc:141
-msgid "Role settings"
+#: admin/sudo/class_sudoGeneric.inc:102
+msgid "Generic"
 msgstr ""
 
-#: admin/sudo/class_sudoGeneric.inc:146
+#: admin/sudo/class_sudoGeneric.inc:102
+msgid "global defaults"
+msgstr ""
+
+#: admin/sudo/class_sudoGeneric.inc:107
 msgid "Name"
 msgstr ""
 
-#: admin/sudo/class_sudoGeneric.inc:146
+#: admin/sudo/class_sudoGeneric.inc:107
 msgid "Name of the role"
 msgstr ""
 
-#: admin/sudo/class_sudoGeneric.inc:151
+#: admin/sudo/class_sudoGeneric.inc:112
 msgid "Description"
 msgstr ""
 
-#: admin/sudo/class_sudoGeneric.inc:151
+#: admin/sudo/class_sudoGeneric.inc:112
 msgid "Description for the new sudo role"
 msgstr ""
 
-#: admin/sudo/class_sudoGeneric.inc:156
+#: admin/sudo/class_sudoGeneric.inc:117
 msgid "Commands"
 msgstr ""
 
-#: admin/sudo/class_sudoGeneric.inc:157
+#: admin/sudo/class_sudoGeneric.inc:118
 msgid ""
 "A Unix command with optional command line arguments, potentially including "
 "globbing characters (aka wild cards)"
 msgstr ""
 
-#: admin/sudo/class_sudoGeneric.inc:163
-msgid "Run as (user)"
-msgstr ""
-
-#: admin/sudo/class_sudoGeneric.inc:164
-msgid "User(s) impersonated by sudo"
+#: admin/sudo/class_sudoGeneric.inc:124
+msgid "Run as"
 msgstr ""
 
-#: admin/sudo/class_sudoGeneric.inc:171
-msgid "Run as (group)"
-msgstr ""
-
-#: admin/sudo/class_sudoGeneric.inc:172
-msgid "Group(s) impersonated by sudo"
+#: admin/sudo/class_sudoGeneric.inc:125
+msgid ""
+"A user that commands may be run as or a Unix group that contains a list of "
+"users that commands may be run as"
 msgstr ""
 
-#: admin/sudo/class_sudoGeneric.inc:178
+#: admin/sudo/class_sudoGeneric.inc:131
 msgid "Systems"
 msgstr ""
 
-#: admin/sudo/class_sudoGeneric.inc:178
+#: admin/sudo/class_sudoGeneric.inc:131
 msgid "A host name, IP address or IP network"
 msgstr ""
 
-#: admin/sudo/class_sudoGeneric.inc:183
+#: admin/sudo/class_sudoGeneric.inc:136
 msgid "Users and groups"
 msgstr ""
 
-#: admin/sudo/class_sudoGeneric.inc:184
+#: admin/sudo/class_sudoGeneric.inc:137
 msgid ""
 "A user name, user ID (prefixed with '#'), Unix group (prefixed with '%')"
 msgstr ""
 
-#: admin/sudo/class_sudoGeneric.inc:188
-msgid "Priority"
+#: admin/sudo/class_sudoGeneric.inc:144
+msgid "System trust"
+msgstr ""
+
+#: admin/sudo/class_sudoGeneric.inc:148
+msgid "Trust mode"
+msgstr ""
+
+#: admin/sudo/class_sudoGeneric.inc:148
+msgid "Trust mode for the role"
+msgstr ""
+
+#: admin/sudo/class_sudoGeneric.inc:152
+msgid "disabled"
+msgstr ""
+
+#: admin/sudo/class_sudoGeneric.inc:152
+msgid "full access"
 msgstr ""
 
-#: admin/sudo/class_sudoGeneric.inc:188
-msgid "This rule priority compared to others"
+#: admin/sudo/class_sudoGeneric.inc:152
+msgid "allow access to these hosts"
 msgstr ""
 
 #: config/sudo/class_sudoConfig.inc:28
diff --git a/sudo/locale/sv/fusiondirectory.po b/sudo/locale/sv/fusiondirectory.po
index 774a4bd07bdb76f60e3ec31e743ec53ea34da5be..caea813ec96054100fc784f94da7f8d776e9e49f 100644
--- a/sudo/locale/sv/fusiondirectory.po
+++ b/sudo/locale/sv/fusiondirectory.po
@@ -5,12 +5,12 @@
 # Translators:
 msgid ""
 msgstr ""
-"Project-Id-Version: FusionDirectory-108\n"
+"Project-Id-Version: FusionDirectory-109\n"
 "Report-Msgid-Bugs-To: documentation@lists.fusiondirectory.org\n"
-"POT-Creation-Date: 2015-03-17 18:47+0100\n"
-"PO-Revision-Date: 2015-02-25 16:12+0000\n"
+"POT-Creation-Date: 2014-12-15 17:47+0100\n"
+"PO-Revision-Date: 2015-02-25 16:13+0000\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>\n"
-"Language-Team: Swedish (http://www.transifex.com/projects/p/FusionDirectory-108/language/sv/)\n"
+"Language-Team: Swedish (http://www.transifex.com/projects/p/FusionDirectory-109/language/sv/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -26,36 +26,36 @@ msgstr ""
 msgid "The sudo option '%s' is invalid!"
 msgstr ""
 
-#: admin/sudo/class_sudoOption.inc:278
+#: admin/sudo/class_sudoOption.inc:276
 #, php-format
 msgid "%s (%s)"
 msgstr ""
 
-#: admin/sudo/class_sudoOption.inc:481
+#: admin/sudo/class_sudoOption.inc:479
 msgid "Available options"
 msgstr ""
 
-#: admin/sudo/class_sudoOption.inc:484
+#: admin/sudo/class_sudoOption.inc:482
 msgid "Option"
 msgstr ""
 
-#: admin/sudo/class_sudoOption.inc:484
+#: admin/sudo/class_sudoOption.inc:482
 msgid "Add a new sudo option"
 msgstr ""
 
-#: admin/sudo/class_sudoOption.inc:489 admin/sudo/class_sudoOption.inc:491
+#: admin/sudo/class_sudoOption.inc:487 admin/sudo/class_sudoOption.inc:489
 msgid "Used sudo role options"
 msgstr ""
 
-#: admin/sudo/class_sudoOption.inc:563
+#: admin/sudo/class_sudoOption.inc:561
 msgid "Options"
 msgstr "Alternativ"
 
-#: admin/sudo/class_sudoOption.inc:564
+#: admin/sudo/class_sudoOption.inc:562
 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:82
 #: config/sudo/class_sudoConfig.inc:42
 msgid "Sudo"
 msgstr ""
@@ -64,81 +64,95 @@ msgstr ""
 msgid "Sudo management"
 msgstr ""
 
-#: admin/sudo/class_sudoGeneric.inc:122 admin/sudo/class_sudoGeneric.inc:126
+#: admin/sudo/class_sudoGeneric.inc:83 admin/sudo/class_sudoGeneric.inc:87
 msgid "Sudo role"
 msgstr ""
 
-#: admin/sudo/class_sudoGeneric.inc:141
-msgid "Role settings"
+#: admin/sudo/class_sudoGeneric.inc:102
+msgid "Generic"
+msgstr "Generisk"
+
+#: admin/sudo/class_sudoGeneric.inc:102
+msgid "global defaults"
 msgstr ""
 
-#: admin/sudo/class_sudoGeneric.inc:146
+#: admin/sudo/class_sudoGeneric.inc:107
 msgid "Name"
 msgstr "Namn"
 
-#: admin/sudo/class_sudoGeneric.inc:146
+#: admin/sudo/class_sudoGeneric.inc:107
 msgid "Name of the role"
 msgstr ""
 
-#: admin/sudo/class_sudoGeneric.inc:151
+#: admin/sudo/class_sudoGeneric.inc:112
 msgid "Description"
 msgstr "Beskrivning"
 
-#: admin/sudo/class_sudoGeneric.inc:151
+#: admin/sudo/class_sudoGeneric.inc:112
 msgid "Description for the new sudo role"
 msgstr ""
 
-#: admin/sudo/class_sudoGeneric.inc:156
+#: admin/sudo/class_sudoGeneric.inc:117
 msgid "Commands"
 msgstr ""
 
-#: admin/sudo/class_sudoGeneric.inc:157
+#: admin/sudo/class_sudoGeneric.inc:118
 msgid ""
 "A Unix command with optional command line arguments, potentially including "
 "globbing characters (aka wild cards)"
 msgstr ""
 
-#: admin/sudo/class_sudoGeneric.inc:163
-msgid "Run as (user)"
-msgstr ""
-
-#: admin/sudo/class_sudoGeneric.inc:164
-msgid "User(s) impersonated by sudo"
-msgstr ""
-
-#: admin/sudo/class_sudoGeneric.inc:171
-msgid "Run as (group)"
+#: admin/sudo/class_sudoGeneric.inc:124
+msgid "Run as"
 msgstr ""
 
-#: admin/sudo/class_sudoGeneric.inc:172
-msgid "Group(s) impersonated by sudo"
+#: admin/sudo/class_sudoGeneric.inc:125
+msgid ""
+"A user that commands may be run as or a Unix group that contains a list of "
+"users that commands may be run as"
 msgstr ""
 
-#: admin/sudo/class_sudoGeneric.inc:178
+#: admin/sudo/class_sudoGeneric.inc:131
 msgid "Systems"
 msgstr "System"
 
-#: admin/sudo/class_sudoGeneric.inc:178
+#: admin/sudo/class_sudoGeneric.inc:131
 msgid "A host name, IP address or IP network"
 msgstr ""
 
-#: admin/sudo/class_sudoGeneric.inc:183
+#: admin/sudo/class_sudoGeneric.inc:136
 msgid "Users and groups"
 msgstr ""
 
-#: admin/sudo/class_sudoGeneric.inc:184
+#: admin/sudo/class_sudoGeneric.inc:137
 msgid ""
 "A user name, user ID (prefixed with '#'), Unix group (prefixed with '%')"
 msgstr ""
 
-#: admin/sudo/class_sudoGeneric.inc:188
-msgid "Priority"
-msgstr "Prioritet"
+#: admin/sudo/class_sudoGeneric.inc:144
+msgid "System trust"
+msgstr "System trust"
+
+#: admin/sudo/class_sudoGeneric.inc:148
+msgid "Trust mode"
+msgstr "Trust-lÃ¤ge"
 
-#: admin/sudo/class_sudoGeneric.inc:188
-msgid "This rule priority compared to others"
+#: admin/sudo/class_sudoGeneric.inc:148
+msgid "Trust mode for the role"
 msgstr ""
 
+#: admin/sudo/class_sudoGeneric.inc:152
+msgid "disabled"
+msgstr "avaktiverad"
+
+#: admin/sudo/class_sudoGeneric.inc:152
+msgid "full access"
+msgstr "full tillgÃ¥ng"
+
+#: admin/sudo/class_sudoGeneric.inc:152
+msgid "allow access to these hosts"
+msgstr "tillÃ¥t dessa hosts tillgÃ¥ng"
+
 #: config/sudo/class_sudoConfig.inc:28
 msgid "Sudo configuration"
 msgstr ""
diff --git a/sudo/locale/ug/fusiondirectory.po b/sudo/locale/ug/fusiondirectory.po
index 3047a876dcac4e9cc90b62d257c71256d95cf3a8..dac4acca4b27394e8621dc246ea9218f6d911b14 100644
--- a/sudo/locale/ug/fusiondirectory.po
+++ b/sudo/locale/ug/fusiondirectory.po
@@ -5,12 +5,12 @@
 # Translators:
 msgid ""
 msgstr ""
-"Project-Id-Version: FusionDirectory-108\n"
+"Project-Id-Version: FusionDirectory-109\n"
 "Report-Msgid-Bugs-To: documentation@lists.fusiondirectory.org\n"
-"POT-Creation-Date: 2015-03-17 18:47+0100\n"
-"PO-Revision-Date: 2015-02-25 15:55+0000\n"
+"POT-Creation-Date: 2014-12-15 17:47+0100\n"
+"PO-Revision-Date: 2014-12-15 17:05+0000\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>\n"
-"Language-Team: Uighur (http://www.transifex.com/projects/p/FusionDirectory-108/language/ug/)\n"
+"Language-Team: Uighur (http://www.transifex.com/projects/p/FusionDirectory-109/language/ug/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -26,36 +26,36 @@ msgstr ""
 msgid "The sudo option '%s' is invalid!"
 msgstr ""
 
-#: admin/sudo/class_sudoOption.inc:278
+#: admin/sudo/class_sudoOption.inc:276
 #, php-format
 msgid "%s (%s)"
 msgstr ""
 
-#: admin/sudo/class_sudoOption.inc:481
+#: admin/sudo/class_sudoOption.inc:479
 msgid "Available options"
 msgstr ""
 
-#: admin/sudo/class_sudoOption.inc:484
+#: admin/sudo/class_sudoOption.inc:482
 msgid "Option"
 msgstr ""
 
-#: admin/sudo/class_sudoOption.inc:484
+#: admin/sudo/class_sudoOption.inc:482
 msgid "Add a new sudo option"
 msgstr ""
 
-#: admin/sudo/class_sudoOption.inc:489 admin/sudo/class_sudoOption.inc:491
+#: admin/sudo/class_sudoOption.inc:487 admin/sudo/class_sudoOption.inc:489
 msgid "Used sudo role options"
 msgstr ""
 
-#: admin/sudo/class_sudoOption.inc:563
+#: admin/sudo/class_sudoOption.inc:561
 msgid "Options"
 msgstr ""
 
-#: admin/sudo/class_sudoOption.inc:564
+#: admin/sudo/class_sudoOption.inc:562
 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:82
 #: config/sudo/class_sudoConfig.inc:42
 msgid "Sudo"
 msgstr ""
@@ -64,79 +64,93 @@ msgstr ""
 msgid "Sudo management"
 msgstr ""
 
-#: admin/sudo/class_sudoGeneric.inc:122 admin/sudo/class_sudoGeneric.inc:126
+#: admin/sudo/class_sudoGeneric.inc:83 admin/sudo/class_sudoGeneric.inc:87
 msgid "Sudo role"
 msgstr ""
 
-#: admin/sudo/class_sudoGeneric.inc:141
-msgid "Role settings"
+#: admin/sudo/class_sudoGeneric.inc:102
+msgid "Generic"
 msgstr ""
 
-#: admin/sudo/class_sudoGeneric.inc:146
+#: admin/sudo/class_sudoGeneric.inc:102
+msgid "global defaults"
+msgstr ""
+
+#: admin/sudo/class_sudoGeneric.inc:107
 msgid "Name"
 msgstr ""
 
-#: admin/sudo/class_sudoGeneric.inc:146
+#: admin/sudo/class_sudoGeneric.inc:107
 msgid "Name of the role"
 msgstr ""
 
-#: admin/sudo/class_sudoGeneric.inc:151
+#: admin/sudo/class_sudoGeneric.inc:112
 msgid "Description"
 msgstr ""
 
-#: admin/sudo/class_sudoGeneric.inc:151
+#: admin/sudo/class_sudoGeneric.inc:112
 msgid "Description for the new sudo role"
 msgstr ""
 
-#: admin/sudo/class_sudoGeneric.inc:156
+#: admin/sudo/class_sudoGeneric.inc:117
 msgid "Commands"
 msgstr ""
 
-#: admin/sudo/class_sudoGeneric.inc:157
+#: admin/sudo/class_sudoGeneric.inc:118
 msgid ""
 "A Unix command with optional command line arguments, potentially including "
 "globbing characters (aka wild cards)"
 msgstr ""
 
-#: admin/sudo/class_sudoGeneric.inc:163
-msgid "Run as (user)"
-msgstr ""
-
-#: admin/sudo/class_sudoGeneric.inc:164
-msgid "User(s) impersonated by sudo"
+#: admin/sudo/class_sudoGeneric.inc:124
+msgid "Run as"
 msgstr ""
 
-#: admin/sudo/class_sudoGeneric.inc:171
-msgid "Run as (group)"
-msgstr ""
-
-#: admin/sudo/class_sudoGeneric.inc:172
-msgid "Group(s) impersonated by sudo"
+#: admin/sudo/class_sudoGeneric.inc:125
+msgid ""
+"A user that commands may be run as or a Unix group that contains a list of "
+"users that commands may be run as"
 msgstr ""
 
-#: admin/sudo/class_sudoGeneric.inc:178
+#: admin/sudo/class_sudoGeneric.inc:131
 msgid "Systems"
 msgstr ""
 
-#: admin/sudo/class_sudoGeneric.inc:178
+#: admin/sudo/class_sudoGeneric.inc:131
 msgid "A host name, IP address or IP network"
 msgstr ""
 
-#: admin/sudo/class_sudoGeneric.inc:183
+#: admin/sudo/class_sudoGeneric.inc:136
 msgid "Users and groups"
 msgstr ""
 
-#: admin/sudo/class_sudoGeneric.inc:184
+#: admin/sudo/class_sudoGeneric.inc:137
 msgid ""
 "A user name, user ID (prefixed with '#'), Unix group (prefixed with '%')"
 msgstr ""
 
-#: admin/sudo/class_sudoGeneric.inc:188
-msgid "Priority"
+#: admin/sudo/class_sudoGeneric.inc:144
+msgid "System trust"
+msgstr ""
+
+#: admin/sudo/class_sudoGeneric.inc:148
+msgid "Trust mode"
+msgstr ""
+
+#: admin/sudo/class_sudoGeneric.inc:148
+msgid "Trust mode for the role"
+msgstr ""
+
+#: admin/sudo/class_sudoGeneric.inc:152
+msgid "disabled"
+msgstr ""
+
+#: admin/sudo/class_sudoGeneric.inc:152
+msgid "full access"
 msgstr ""
 
-#: admin/sudo/class_sudoGeneric.inc:188
-msgid "This rule priority compared to others"
+#: admin/sudo/class_sudoGeneric.inc:152
+msgid "allow access to these hosts"
 msgstr ""
 
 #: config/sudo/class_sudoConfig.inc:28
diff --git a/sudo/locale/vi_VN/fusiondirectory.po b/sudo/locale/vi_VN/fusiondirectory.po
index 3058a3f4b3e165f5dd3326e1b13cb81d626bf5b6..436a1bb45dffe63b976ef82964be5e6c314d6ad7 100644
--- a/sudo/locale/vi_VN/fusiondirectory.po
+++ b/sudo/locale/vi_VN/fusiondirectory.po
@@ -5,12 +5,12 @@
 # Translators:
 msgid ""
 msgstr ""
-"Project-Id-Version: FusionDirectory-108\n"
+"Project-Id-Version: FusionDirectory-109\n"
 "Report-Msgid-Bugs-To: documentation@lists.fusiondirectory.org\n"
-"POT-Creation-Date: 2015-03-17 18:47+0100\n"
-"PO-Revision-Date: 2015-02-25 16:02+0000\n"
+"POT-Creation-Date: 2014-12-15 17:47+0100\n"
+"PO-Revision-Date: 2015-02-25 16:13+0000\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>\n"
-"Language-Team: Vietnamese (Viet Nam) (http://www.transifex.com/projects/p/FusionDirectory-108/language/vi_VN/)\n"
+"Language-Team: Vietnamese (Viet Nam) (http://www.transifex.com/projects/p/FusionDirectory-109/language/vi_VN/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -26,36 +26,36 @@ msgstr ""
 msgid "The sudo option '%s' is invalid!"
 msgstr ""
 
-#: admin/sudo/class_sudoOption.inc:278
+#: admin/sudo/class_sudoOption.inc:276
 #, php-format
 msgid "%s (%s)"
 msgstr ""
 
-#: admin/sudo/class_sudoOption.inc:481
+#: admin/sudo/class_sudoOption.inc:479
 msgid "Available options"
 msgstr ""
 
-#: admin/sudo/class_sudoOption.inc:484
+#: admin/sudo/class_sudoOption.inc:482
 msgid "Option"
 msgstr ""
 
-#: admin/sudo/class_sudoOption.inc:484
+#: admin/sudo/class_sudoOption.inc:482
 msgid "Add a new sudo option"
 msgstr ""
 
-#: admin/sudo/class_sudoOption.inc:489 admin/sudo/class_sudoOption.inc:491
+#: admin/sudo/class_sudoOption.inc:487 admin/sudo/class_sudoOption.inc:489
 msgid "Used sudo role options"
 msgstr ""
 
-#: admin/sudo/class_sudoOption.inc:563
+#: admin/sudo/class_sudoOption.inc:561
 msgid "Options"
 msgstr ""
 
-#: admin/sudo/class_sudoOption.inc:564
+#: admin/sudo/class_sudoOption.inc:562
 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:82
 #: config/sudo/class_sudoConfig.inc:42
 msgid "Sudo"
 msgstr ""
@@ -64,81 +64,95 @@ msgstr ""
 msgid "Sudo management"
 msgstr ""
 
-#: admin/sudo/class_sudoGeneric.inc:122 admin/sudo/class_sudoGeneric.inc:126
+#: admin/sudo/class_sudoGeneric.inc:83 admin/sudo/class_sudoGeneric.inc:87
 msgid "Sudo role"
 msgstr ""
 
-#: admin/sudo/class_sudoGeneric.inc:141
-msgid "Role settings"
+#: admin/sudo/class_sudoGeneric.inc:102
+msgid "Generic"
+msgstr "ThÃ´ng tin chung"
+
+#: admin/sudo/class_sudoGeneric.inc:102
+msgid "global defaults"
 msgstr ""
 
-#: admin/sudo/class_sudoGeneric.inc:146
+#: admin/sudo/class_sudoGeneric.inc:107
 msgid "Name"
 msgstr "TÃªn"
 
-#: admin/sudo/class_sudoGeneric.inc:146
+#: admin/sudo/class_sudoGeneric.inc:107
 msgid "Name of the role"
 msgstr ""
 
-#: admin/sudo/class_sudoGeneric.inc:151
+#: admin/sudo/class_sudoGeneric.inc:112
 msgid "Description"
 msgstr "MÃ´ táº£"
 
-#: admin/sudo/class_sudoGeneric.inc:151
+#: admin/sudo/class_sudoGeneric.inc:112
 msgid "Description for the new sudo role"
 msgstr ""
 
-#: admin/sudo/class_sudoGeneric.inc:156
+#: admin/sudo/class_sudoGeneric.inc:117
 msgid "Commands"
 msgstr ""
 
-#: admin/sudo/class_sudoGeneric.inc:157
+#: admin/sudo/class_sudoGeneric.inc:118
 msgid ""
 "A Unix command with optional command line arguments, potentially including "
 "globbing characters (aka wild cards)"
 msgstr ""
 
-#: admin/sudo/class_sudoGeneric.inc:163
-msgid "Run as (user)"
-msgstr ""
-
-#: admin/sudo/class_sudoGeneric.inc:164
-msgid "User(s) impersonated by sudo"
+#: admin/sudo/class_sudoGeneric.inc:124
+msgid "Run as"
 msgstr ""
 
-#: admin/sudo/class_sudoGeneric.inc:171
-msgid "Run as (group)"
-msgstr ""
-
-#: admin/sudo/class_sudoGeneric.inc:172
-msgid "Group(s) impersonated by sudo"
+#: admin/sudo/class_sudoGeneric.inc:125
+msgid ""
+"A user that commands may be run as or a Unix group that contains a list of "
+"users that commands may be run as"
 msgstr ""
 
-#: admin/sudo/class_sudoGeneric.inc:178
+#: admin/sudo/class_sudoGeneric.inc:131
 msgid "Systems"
 msgstr "CÃ¡c há»‡ thá»‘ng"
 
-#: admin/sudo/class_sudoGeneric.inc:178
+#: admin/sudo/class_sudoGeneric.inc:131
 msgid "A host name, IP address or IP network"
 msgstr ""
 
-#: admin/sudo/class_sudoGeneric.inc:183
+#: admin/sudo/class_sudoGeneric.inc:136
 msgid "Users and groups"
 msgstr ""
 
-#: admin/sudo/class_sudoGeneric.inc:184
+#: admin/sudo/class_sudoGeneric.inc:137
 msgid ""
 "A user name, user ID (prefixed with '#'), Unix group (prefixed with '%')"
 msgstr ""
 
-#: admin/sudo/class_sudoGeneric.inc:188
-msgid "Priority"
-msgstr ""
+#: admin/sudo/class_sudoGeneric.inc:144
+msgid "System trust"
+msgstr "á»¦y thÃ¡c há»‡ thá»‘ng"
+
+#: admin/sudo/class_sudoGeneric.inc:148
+msgid "Trust mode"
+msgstr "Cháº¿ Ä‘á»™ á»§y thÃ¡c"
 
-#: admin/sudo/class_sudoGeneric.inc:188
-msgid "This rule priority compared to others"
+#: admin/sudo/class_sudoGeneric.inc:148
+msgid "Trust mode for the role"
 msgstr ""
 
+#: admin/sudo/class_sudoGeneric.inc:152
+msgid "disabled"
+msgstr "ÄÃ£ vÃ´ hiá»‡u"
+
+#: admin/sudo/class_sudoGeneric.inc:152
+msgid "full access"
+msgstr "Truy cáºp hoÃ n toÃ n"
+
+#: admin/sudo/class_sudoGeneric.inc:152
+msgid "allow access to these hosts"
+msgstr "Cho phÃ©p truy cáºp Ä‘áº¿n cÃ¡c mÃ¡y chá»§ nÃ y"
+
 #: config/sudo/class_sudoConfig.inc:28
 msgid "Sudo configuration"
 msgstr ""
diff --git a/sudo/locale/zh/fusiondirectory.po b/sudo/locale/zh/fusiondirectory.po
index c0860c8c417b465a8915aa7c628eeacea7e71156..2de7833f5ca6e575d73107ce6e000fb324348160 100644
--- a/sudo/locale/zh/fusiondirectory.po
+++ b/sudo/locale/zh/fusiondirectory.po
@@ -3,15 +3,14 @@
 # This file is distributed under the same license as the PACKAGE package.
 # 
 # Translators:
-#  Jiang Xin <worldhello.net@gmail.com>, 2007
 msgid ""
 msgstr ""
-"Project-Id-Version: FusionDirectory-108\n"
+"Project-Id-Version: FusionDirectory-109\n"
 "Report-Msgid-Bugs-To: documentation@lists.fusiondirectory.org\n"
-"POT-Creation-Date: 2015-03-17 18:47+0100\n"
-"PO-Revision-Date: 2015-02-25 16:12+0000\n"
+"POT-Creation-Date: 2014-12-15 17:47+0100\n"
+"PO-Revision-Date: 2015-02-25 16:13+0000\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>\n"
-"Language-Team: Chinese (http://www.transifex.com/projects/p/FusionDirectory-108/language/zh/)\n"
+"Language-Team: Chinese (http://www.transifex.com/projects/p/FusionDirectory-109/language/zh/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -27,36 +26,36 @@ msgstr ""
 msgid "The sudo option '%s' is invalid!"
 msgstr ""
 
-#: admin/sudo/class_sudoOption.inc:278
+#: admin/sudo/class_sudoOption.inc:276
 #, php-format
 msgid "%s (%s)"
 msgstr ""
 
-#: admin/sudo/class_sudoOption.inc:481
+#: admin/sudo/class_sudoOption.inc:479
 msgid "Available options"
 msgstr ""
 
-#: admin/sudo/class_sudoOption.inc:484
+#: admin/sudo/class_sudoOption.inc:482
 msgid "Option"
 msgstr "é€‰é¡¹"
 
-#: admin/sudo/class_sudoOption.inc:484
+#: admin/sudo/class_sudoOption.inc:482
 msgid "Add a new sudo option"
 msgstr ""
 
-#: admin/sudo/class_sudoOption.inc:489 admin/sudo/class_sudoOption.inc:491
+#: admin/sudo/class_sudoOption.inc:487 admin/sudo/class_sudoOption.inc:489
 msgid "Used sudo role options"
 msgstr ""
 
-#: admin/sudo/class_sudoOption.inc:563
+#: admin/sudo/class_sudoOption.inc:561
 msgid "Options"
 msgstr "é€‰é¡¹"
 
-#: admin/sudo/class_sudoOption.inc:564
+#: admin/sudo/class_sudoOption.inc:562
 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:82
 #: config/sudo/class_sudoConfig.inc:42
 msgid "Sudo"
 msgstr ""
@@ -65,81 +64,95 @@ msgstr ""
 msgid "Sudo management"
 msgstr ""
 
-#: admin/sudo/class_sudoGeneric.inc:122 admin/sudo/class_sudoGeneric.inc:126
+#: admin/sudo/class_sudoGeneric.inc:83 admin/sudo/class_sudoGeneric.inc:87
 msgid "Sudo role"
 msgstr ""
 
-#: admin/sudo/class_sudoGeneric.inc:141
-msgid "Role settings"
+#: admin/sudo/class_sudoGeneric.inc:102
+msgid "Generic"
+msgstr "é€šç”¨é…ç½®"
+
+#: admin/sudo/class_sudoGeneric.inc:102
+msgid "global defaults"
 msgstr ""
 
-#: admin/sudo/class_sudoGeneric.inc:146
+#: admin/sudo/class_sudoGeneric.inc:107
 msgid "Name"
 msgstr "åç§°"
 
-#: admin/sudo/class_sudoGeneric.inc:146
+#: admin/sudo/class_sudoGeneric.inc:107
 msgid "Name of the role"
 msgstr ""
 
-#: admin/sudo/class_sudoGeneric.inc:151
+#: admin/sudo/class_sudoGeneric.inc:112
 msgid "Description"
 msgstr "æè¿°"
 
-#: admin/sudo/class_sudoGeneric.inc:151
+#: admin/sudo/class_sudoGeneric.inc:112
 msgid "Description for the new sudo role"
 msgstr ""
 
-#: admin/sudo/class_sudoGeneric.inc:156
+#: admin/sudo/class_sudoGeneric.inc:117
 msgid "Commands"
 msgstr ""
 
-#: admin/sudo/class_sudoGeneric.inc:157
+#: admin/sudo/class_sudoGeneric.inc:118
 msgid ""
 "A Unix command with optional command line arguments, potentially including "
 "globbing characters (aka wild cards)"
 msgstr ""
 
-#: admin/sudo/class_sudoGeneric.inc:163
-msgid "Run as (user)"
-msgstr ""
-
-#: admin/sudo/class_sudoGeneric.inc:164
-msgid "User(s) impersonated by sudo"
-msgstr ""
-
-#: admin/sudo/class_sudoGeneric.inc:171
-msgid "Run as (group)"
+#: admin/sudo/class_sudoGeneric.inc:124
+msgid "Run as"
 msgstr ""
 
-#: admin/sudo/class_sudoGeneric.inc:172
-msgid "Group(s) impersonated by sudo"
+#: admin/sudo/class_sudoGeneric.inc:125
+msgid ""
+"A user that commands may be run as or a Unix group that contains a list of "
+"users that commands may be run as"
 msgstr ""
 
-#: admin/sudo/class_sudoGeneric.inc:178
+#: admin/sudo/class_sudoGeneric.inc:131
 msgid "Systems"
 msgstr "ç³»ç»Ÿè®¾ç½®"
 
-#: admin/sudo/class_sudoGeneric.inc:178
+#: admin/sudo/class_sudoGeneric.inc:131
 msgid "A host name, IP address or IP network"
 msgstr ""
 
-#: admin/sudo/class_sudoGeneric.inc:183
+#: admin/sudo/class_sudoGeneric.inc:136
 msgid "Users and groups"
 msgstr ""
 
-#: admin/sudo/class_sudoGeneric.inc:184
+#: admin/sudo/class_sudoGeneric.inc:137
 msgid ""
 "A user name, user ID (prefixed with '#'), Unix group (prefixed with '%')"
 msgstr ""
 
-#: admin/sudo/class_sudoGeneric.inc:188
-msgid "Priority"
-msgstr "ä¼˜å…ˆçº§"
+#: admin/sudo/class_sudoGeneric.inc:144
+msgid "System trust"
+msgstr "ä¿¡èµ–çš„ç³»ç»Ÿ"
+
+#: admin/sudo/class_sudoGeneric.inc:148
+msgid "Trust mode"
+msgstr "ä¿¡èµ–æ¨¡å¼"
 
-#: admin/sudo/class_sudoGeneric.inc:188
-msgid "This rule priority compared to others"
+#: admin/sudo/class_sudoGeneric.inc:148
+msgid "Trust mode for the role"
 msgstr ""
 
+#: admin/sudo/class_sudoGeneric.inc:152
+msgid "disabled"
+msgstr "ç¦ç”¨"
+
+#: admin/sudo/class_sudoGeneric.inc:152
+msgid "full access"
+msgstr "å®Œå…¨è®¿é—®æƒé™"
+
+#: admin/sudo/class_sudoGeneric.inc:152
+msgid "allow access to these hosts"
+msgstr "å…è®¸è®¿é—®è¿™äº›ä¸»æœº"
+
 #: config/sudo/class_sudoConfig.inc:28
 msgid "Sudo configuration"
 msgstr ""
diff --git a/supann/locale/ar/fusiondirectory.po b/supann/locale/ar/fusiondirectory.po
index 0ee28a7923c304231dbf0137bc9fb73ccaf33e4e..7f2f3df6470ef908163b2b26bb72266a84512b83 100644
--- a/supann/locale/ar/fusiondirectory.po
+++ b/supann/locale/ar/fusiondirectory.po
@@ -5,12 +5,12 @@
 # Translators:
 msgid ""
 msgstr ""
-"Project-Id-Version: FusionDirectory-108\n"
+"Project-Id-Version: FusionDirectory-109\n"
 "Report-Msgid-Bugs-To: documentation@lists.fusiondirectory.org\n"
-"POT-Creation-Date: 2015-03-31 11:49+0200\n"
-"PO-Revision-Date: 2015-03-31 10:46+0000\n"
+"POT-Creation-Date: 2014-12-15 17:47+0100\n"
+"PO-Revision-Date: 2015-02-25 16:04+0000\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>\n"
-"Language-Team: Arabic (http://www.transifex.com/projects/p/FusionDirectory-108/language/ar/)\n"
+"Language-Team: Arabic (http://www.transifex.com/projects/p/FusionDirectory-109/language/ar/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -27,15 +27,16 @@ msgstr ""
 
 #: admin/supannStructures/class_entite.inc:31
 #: admin/supannStructures/class_entite.inc:52
-msgid "Entity"
+#: personal/supann/class_supannAccount.inc:442
+msgid "Entite"
 msgstr ""
 
 #: admin/supannStructures/class_entite.inc:32
-msgid "SUPANN Entity Settings"
+msgid "SUPANN Entite Settings"
 msgstr ""
 
 #: admin/supannStructures/class_entite.inc:35
-msgid "SUPANN Entity"
+msgid "SUPANN Entite"
 msgstr ""
 
 #: admin/supannStructures/class_entite.inc:55
@@ -44,7 +45,7 @@ msgid "Name"
 msgstr "Ø§Ù„Ø¥Ø³Ù…"
 
 #: admin/supannStructures/class_entite.inc:55
-msgid "The name to write in the ou attribute for this entity"
+msgid "The name to write in the ou attribute for this entite"
 msgstr ""
 
 #: admin/supannStructures/class_entite.inc:61
@@ -57,7 +58,7 @@ msgid "Telephone"
 msgstr ""
 
 #: admin/supannStructures/class_entite.inc:64
-msgid "Phone number for this entity"
+msgid "Phone number for this entite"
 msgstr ""
 
 #: admin/supannStructures/class_entite.inc:68
@@ -66,7 +67,7 @@ msgid "Fax"
 msgstr "Ø§Ù„ÙØ§ÙƒØ³"
 
 #: admin/supannStructures/class_entite.inc:68
-msgid "Fax number for this entity"
+msgid "Fax number for this entite"
 msgstr ""
 
 #: admin/supannStructures/class_entite.inc:72
@@ -74,7 +75,7 @@ msgid "Postal address"
 msgstr ""
 
 #: admin/supannStructures/class_entite.inc:72
-msgid "Postal address of this entity"
+msgid "Postal address of this entite"
 msgstr ""
 
 #: admin/supannStructures/class_entite.inc:76
@@ -83,7 +84,7 @@ msgid "Description"
 msgstr "Ø§Ù„ÙˆØµÙ"
 
 #: admin/supannStructures/class_entite.inc:76
-msgid "Short description of this entity"
+msgid "Short description of this entite"
 msgstr ""
 
 #: admin/supannStructures/class_entite.inc:82
@@ -91,27 +92,28 @@ msgid "SUPANN informations"
 msgstr ""
 
 #: admin/supannStructures/class_entite.inc:85
-msgid "Entity type"
+#: personal/supann/class_supannAccount.inc:438
+msgid "Entite type"
 msgstr ""
 
 #: admin/supannStructures/class_entite.inc:85
-msgid "The best SUPANN type that fits this entity"
+msgid "The best SUPANN type that fits this entite"
 msgstr ""
 
 #: admin/supannStructures/class_entite.inc:89
-msgid "Entity code"
+msgid "Entite code"
 msgstr ""
 
 #: admin/supannStructures/class_entite.inc:89
-msgid "The SUPANN code of this entity"
+msgid "The SUPANN code of this entite"
 msgstr ""
 
 #: admin/supannStructures/class_entite.inc:94
-msgid "Parent entity"
+msgid "Parent entite"
 msgstr ""
 
 #: admin/supannStructures/class_entite.inc:94
-msgid "The parent entity of this entity"
+msgid "The parent entite of this entite"
 msgstr ""
 
 #: admin/supannStructures/class_entite.inc:98
@@ -119,21 +121,21 @@ msgid "Reference ID"
 msgstr ""
 
 #: admin/supannStructures/class_entite.inc:98
-msgid "SUPANN reference ID of this entity"
+msgid "SUPANN reference ID of this entite"
 msgstr ""
 
 #: admin/supannStructures/class_etablissement.inc:31
-#: personal/supann/class_supannAccount.inc:324
-#: personal/supann/class_supannAccount.inc:363
-msgid "Establishment"
+#: personal/supann/class_supannAccount.inc:316
+#: personal/supann/class_supannAccount.inc:355
+msgid "Etablissement"
 msgstr ""
 
 #: admin/supannStructures/class_etablissement.inc:32
-msgid "SUPANN Establishment Settings"
+msgid "SUPANN Etablissement Settings"
 msgstr ""
 
 #: admin/supannStructures/class_etablissement.inc:35
-msgid "SUPANN Establishment"
+msgid "SUPANN Etablissement"
 msgstr ""
 
 #: admin/supannStructures/class_etablissement.inc:52
@@ -141,19 +143,19 @@ msgid "Properties"
 msgstr "Ø§Ù„Ø®ÙˆØ§Øµ"
 
 #: admin/supannStructures/class_etablissement.inc:55
-msgid "Root Establishment"
+msgid "Root etablissement"
 msgstr ""
 
 #: admin/supannStructures/class_etablissement.inc:55
-msgid "Set this Establishment as the root one"
+msgid "Set this etablissement as the root one"
 msgstr ""
 
 #: admin/supannStructures/class_etablissement.inc:59
-msgid "The name to write in the o attribute for this Establishment"
+msgid "The name to write in the o attribute for this etablissement"
 msgstr ""
 
 #: admin/supannStructures/class_etablissement.inc:63
-msgid "A short description of this Establishment"
+msgid "A short description of this etablissement"
 msgstr ""
 
 #: admin/supannStructures/class_etablissement.inc:69
@@ -162,7 +164,7 @@ msgid "Location"
 msgstr ""
 
 #: admin/supannStructures/class_etablissement.inc:72
-msgid "Usually the city where this Establishment is"
+msgid "Usually the city in which is this etablissement"
 msgstr ""
 
 #: admin/supannStructures/class_etablissement.inc:76
@@ -170,15 +172,15 @@ msgid "Address"
 msgstr "Ø§Ù„Ø¹Ù†ÙˆØ§Ù†"
 
 #: admin/supannStructures/class_etablissement.inc:76
-msgid "The postal address of this Establishment"
+msgid "The postal address of this etablissement"
 msgstr ""
 
 #: admin/supannStructures/class_etablissement.inc:80
-msgid "Phone number for this Establishment"
+msgid "Phone number for this etablissement"
 msgstr ""
 
 #: admin/supannStructures/class_etablissement.inc:84
-msgid "Fax number for this Establishment"
+msgid "Fax number for this etablissement"
 msgstr ""
 
 #: admin/supannStructures/class_etablissement.inc:90
@@ -186,11 +188,11 @@ msgid "SUPANN properties"
 msgstr ""
 
 #: admin/supannStructures/class_etablissement.inc:93
-msgid "Establishment code"
+msgid "Etablissement code"
 msgstr ""
 
 #: admin/supannStructures/class_etablissement.inc:93
-msgid "The code of this Establishment (must have a prefix between {})"
+msgid "The code of this etablissement (must have a prefix between {})"
 msgstr ""
 
 #: admin/supannStructures/class_etablissement.inc:98
@@ -198,7 +200,7 @@ msgid "SUPANN code"
 msgstr ""
 
 #: admin/supannStructures/class_etablissement.inc:98
-msgid "The SUPANN code for this Establishment"
+msgid "The SUPANN code for this etablissement"
 msgstr ""
 
 #: admin/supannStructures/class_etablissement.inc:103
@@ -206,7 +208,7 @@ msgid "Legal name"
 msgstr ""
 
 #: admin/supannStructures/class_etablissement.inc:103
-msgid "The legal name of this Establishment"
+msgid "The legal name of this etablissement"
 msgstr ""
 
 #: admin/supannStructures/class_etablissement.inc:107
@@ -214,7 +216,7 @@ msgid "Home page URI"
 msgstr ""
 
 #: admin/supannStructures/class_etablissement.inc:107
-msgid "The URI of this Establishment website home page"
+msgid "The URI of this etablissement website home page"
 msgstr ""
 
 #: admin/supannStructures/class_etablissement.inc:111
@@ -222,7 +224,7 @@ msgid "Institution URI"
 msgstr ""
 
 #: admin/supannStructures/class_etablissement.inc:111
-msgid "The URI of this Establishment institution website"
+msgid "The URI of this etablissement institution website"
 msgstr ""
 
 #: admin/supannStructures/class_etablissement.inc:115
@@ -230,12 +232,12 @@ msgid "White pages URI"
 msgstr ""
 
 #: admin/supannStructures/class_etablissement.inc:115
-msgid "The URI of this Establishment white pages"
+msgid "The URI of this etablissement white pages"
 msgstr ""
 
 #: admin/supannStructures/class_etablissement.inc:148
-#: admin/supannStructures/class_etablissement.inc:201
-#: admin/supannStructures/class_etablissement.inc:219
+#: admin/supannStructures/class_etablissement.inc:198
+#: admin/supannStructures/class_etablissement.inc:216
 msgid "LDAP error"
 msgstr ""
 
@@ -355,256 +357,243 @@ msgstr ""
 msgid "eduPersonNickName - Can contain a nick name for this user"
 msgstr ""
 
-#: personal/supann/class_supannAccount.inc:253
-msgid "Ref ids"
-msgstr ""
-
-#: personal/supann/class_supannAccount.inc:253
-msgid "supannRefId - IDs/links for this user on other systems"
-msgstr ""
-
-#: personal/supann/class_supannAccount.inc:262
+#: personal/supann/class_supannAccount.inc:254
 msgid "Contact"
 msgstr ""
 
-#: personal/supann/class_supannAccount.inc:266
+#: personal/supann/class_supannAccount.inc:258
 msgid "Other phone numbers"
 msgstr ""
 
-#: personal/supann/class_supannAccount.inc:266
+#: personal/supann/class_supannAccount.inc:258
 msgid "supannAutreTelephone - Other phone numbers for this user"
 msgstr ""
 
-#: personal/supann/class_supannAccount.inc:272
+#: personal/supann/class_supannAccount.inc:264
 msgid "Other mail addresses"
 msgstr ""
 
-#: personal/supann/class_supannAccount.inc:272
+#: personal/supann/class_supannAccount.inc:264
 msgid ""
 "supannAutreMail - Other mail addresses for this user. Each must be unique"
 msgstr ""
 
-#: personal/supann/class_supannAccount.inc:278
+#: personal/supann/class_supannAccount.inc:270
 msgid "Personal mail addresses"
 msgstr ""
 
-#: personal/supann/class_supannAccount.inc:278
+#: personal/supann/class_supannAccount.inc:270
 msgid "supannMailPerso - Personal mail addresses for this user"
 msgstr ""
 
-#: personal/supann/class_supannAccount.inc:283
-msgid "red List"
+#: personal/supann/class_supannAccount.inc:275
+msgid "Liste rouge"
 msgstr ""
 
-#: personal/supann/class_supannAccount.inc:283
+#: personal/supann/class_supannAccount.inc:275
 msgid "supannListeRouge - Should this person be on the red list"
 msgstr ""
 
-#: personal/supann/class_supannAccount.inc:289
+#: personal/supann/class_supannAccount.inc:281
 msgid "Affectation"
 msgstr ""
 
-#: personal/supann/class_supannAccount.inc:292
-msgid "Entity primary assignment"
+#: personal/supann/class_supannAccount.inc:284
+msgid "Entite affectation principale"
 msgstr ""
 
-#: personal/supann/class_supannAccount.inc:292
+#: personal/supann/class_supannAccount.inc:284
 msgid "supannEntiteAffectationPrincipale"
 msgstr ""
 
-#: personal/supann/class_supannAccount.inc:297
-#: personal/supann/class_supannAccount.inc:388
-#: personal/supann/class_supannAccount.inc:450
-msgid "Entity assignment"
+#: personal/supann/class_supannAccount.inc:289
+#: personal/supann/class_supannAccount.inc:380
+msgid "Entite affectation"
 msgstr ""
 
-#: personal/supann/class_supannAccount.inc:297
-#: personal/supann/class_supannAccount.inc:450
+#: personal/supann/class_supannAccount.inc:289
+#: personal/supann/class_supannAccount.inc:442
 msgid "supannEntiteAffectation"
 msgstr ""
 
-#: personal/supann/class_supannAccount.inc:303
-msgid "Entity type assignment"
+#: personal/supann/class_supannAccount.inc:295
+msgid "Type entite affectation"
 msgstr ""
 
-#: personal/supann/class_supannAccount.inc:303
-#: personal/supann/class_supannAccount.inc:446
+#: personal/supann/class_supannAccount.inc:295
+#: personal/supann/class_supannAccount.inc:438
 msgid "supannTypeEntiteAffectation"
 msgstr ""
 
-#: personal/supann/class_supannAccount.inc:310
+#: personal/supann/class_supannAccount.inc:302
 msgid "Affiliation"
 msgstr ""
 
-#: personal/supann/class_supannAccount.inc:313
+#: personal/supann/class_supannAccount.inc:305
 msgid "Primary affiliation"
 msgstr ""
 
-#: personal/supann/class_supannAccount.inc:313
+#: personal/supann/class_supannAccount.inc:305
 msgid "eduPersonPrimaryAffiliation"
 msgstr ""
 
-#: personal/supann/class_supannAccount.inc:318
+#: personal/supann/class_supannAccount.inc:310
 msgid "Affiliations"
 msgstr ""
 
-#: personal/supann/class_supannAccount.inc:318
+#: personal/supann/class_supannAccount.inc:310
 msgid "eduPersonAffiliation"
 msgstr ""
 
-#: personal/supann/class_supannAccount.inc:324
+#: personal/supann/class_supannAccount.inc:316
 msgid "supannEtablissement"
 msgstr ""
 
-#: personal/supann/class_supannAccount.inc:331
+#: personal/supann/class_supannAccount.inc:323
 msgid "Student profile"
 msgstr ""
 
-#: personal/supann/class_supannAccount.inc:334
+#: personal/supann/class_supannAccount.inc:326
 msgid "INE code"
 msgstr ""
 
-#: personal/supann/class_supannAccount.inc:334
+#: personal/supann/class_supannAccount.inc:326
 msgid "supannCodeINE - INE code of this student"
 msgstr ""
 
-#: personal/supann/class_supannAccount.inc:338
+#: personal/supann/class_supannAccount.inc:330
 msgid "Student ID"
 msgstr ""
 
-#: personal/supann/class_supannAccount.inc:338
+#: personal/supann/class_supannAccount.inc:330
 msgid "supannEtuId - scolarity id"
 msgstr ""
 
-#: personal/supann/class_supannAccount.inc:344
+#: personal/supann/class_supannAccount.inc:336
 msgid "Student subscriptions"
 msgstr ""
 
-#: personal/supann/class_supannAccount.inc:359
+#: personal/supann/class_supannAccount.inc:351
 msgid "supannEtuInscription - Subscriptions for this student"
 msgstr ""
 
-#: personal/supann/class_supannAccount.inc:363
+#: personal/supann/class_supannAccount.inc:355
 msgid ""
 "supannEtablissement - Etablissement in which this subscription was done"
 msgstr ""
 
-#: personal/supann/class_supannAccount.inc:367
+#: personal/supann/class_supannAccount.inc:359
 msgid "Year"
 msgstr ""
 
-#: personal/supann/class_supannAccount.inc:367
+#: personal/supann/class_supannAccount.inc:359
 msgid "supannEtuAnneeInscription - The year this subscription will begin"
 msgstr ""
 
-#: personal/supann/class_supannAccount.inc:372
+#: personal/supann/class_supannAccount.inc:364
 msgid "Subscription type"
 msgstr ""
 
-#: personal/supann/class_supannAccount.inc:372
+#: personal/supann/class_supannAccount.inc:364
 msgid "supannEtuRegimeInscription - The type of this subscription"
 msgstr ""
 
-#: personal/supann/class_supannAccount.inc:376
-msgid "Disciplinary Sector"
+#: personal/supann/class_supannAccount.inc:368
+msgid "Secteur Disciplinaire"
 msgstr ""
 
-#: personal/supann/class_supannAccount.inc:376
+#: personal/supann/class_supannAccount.inc:368
 msgid "supannEtuSecteurDisciplinaire"
 msgstr ""
 
-#: personal/supann/class_supannAccount.inc:380
+#: personal/supann/class_supannAccount.inc:372
 msgid "Diploma type"
 msgstr ""
 
-#: personal/supann/class_supannAccount.inc:380
+#: personal/supann/class_supannAccount.inc:372
 msgid "supannEtuTypeDiplome - Type of diploma"
 msgstr ""
 
-#: personal/supann/class_supannAccount.inc:384
-msgid "Curriculum year "
+#: personal/supann/class_supannAccount.inc:376
+msgid "Cursus annee"
 msgstr ""
 
-#: personal/supann/class_supannAccount.inc:384
+#: personal/supann/class_supannAccount.inc:376
 msgid "supannEtuCursusAnnee"
 msgstr ""
 
-#: personal/supann/class_supannAccount.inc:388
+#: personal/supann/class_supannAccount.inc:380
 msgid "supannEntiteAffectation_affect"
 msgstr ""
 
-#: personal/supann/class_supannAccount.inc:392
+#: personal/supann/class_supannAccount.inc:384
 msgid "Diploma"
 msgstr ""
 
-#: personal/supann/class_supannAccount.inc:392
+#: personal/supann/class_supannAccount.inc:384
 msgid "supannEtuDiplome"
 msgstr ""
 
-#: personal/supann/class_supannAccount.inc:396
+#: personal/supann/class_supannAccount.inc:388
 msgid "Step"
 msgstr ""
 
-#: personal/supann/class_supannAccount.inc:396
+#: personal/supann/class_supannAccount.inc:388
 msgid "supannEtuEtape"
 msgstr ""
 
-#: personal/supann/class_supannAccount.inc:400
+#: personal/supann/class_supannAccount.inc:392
 msgid "educational element"
 msgstr ""
 
-#: personal/supann/class_supannAccount.inc:400
+#: personal/supann/class_supannAccount.inc:392
 msgid "supannEtuElementPedagogique"
 msgstr ""
 
-#: personal/supann/class_supannAccount.inc:412
-msgid "Personal profile"
+#: personal/supann/class_supannAccount.inc:404
+msgid "Personnal profile"
 msgstr ""
 
-#: personal/supann/class_supannAccount.inc:415
+#: personal/supann/class_supannAccount.inc:407
 msgid "Personal ID"
 msgstr ""
 
-#: personal/supann/class_supannAccount.inc:415
+#: personal/supann/class_supannAccount.inc:407
 msgid "supannEmpId"
 msgstr ""
 
-#: personal/supann/class_supannAccount.inc:419
+#: personal/supann/class_supannAccount.inc:411
 msgid "Personal corps"
 msgstr ""
 
-#: personal/supann/class_supannAccount.inc:419
+#: personal/supann/class_supannAccount.inc:411
 msgid "supannEmpCorps"
 msgstr ""
 
-#: personal/supann/class_supannAccount.inc:424
-msgid "Activity"
+#: personal/supann/class_supannAccount.inc:416
+msgid "Activite"
 msgstr ""
 
-#: personal/supann/class_supannAccount.inc:424
+#: personal/supann/class_supannAccount.inc:416
 msgid "supannActivite"
 msgstr ""
 
-#: personal/supann/class_supannAccount.inc:431
+#: personal/supann/class_supannAccount.inc:423
 msgid "Roles"
 msgstr ""
 
-#: personal/supann/class_supannAccount.inc:438
+#: personal/supann/class_supannAccount.inc:430
 msgid "supannRoleEntite"
 msgstr ""
 
-#: personal/supann/class_supannAccount.inc:442
+#: personal/supann/class_supannAccount.inc:434
 msgid "Generic role"
 msgstr ""
 
-#: personal/supann/class_supannAccount.inc:442
+#: personal/supann/class_supannAccount.inc:434
 msgid "supannRoleGenerique"
 msgstr ""
 
-#: personal/supann/class_supannAccount.inc:446
-msgid "Entity assignment type"
-msgstr ""
-
 #: config/supann/class_supannConfig.inc:28
 msgid "SUPANN configuration"
 msgstr ""
diff --git a/supann/locale/ca/fusiondirectory.po b/supann/locale/ca/fusiondirectory.po
index d5ea1b6f0a83f6bfb19df2ed45fb330c248ad147..a2f9ad71f7e9746a15a39684f4cb0478971bcccc 100644
--- a/supann/locale/ca/fusiondirectory.po
+++ b/supann/locale/ca/fusiondirectory.po
@@ -5,12 +5,12 @@
 # Translators:
 msgid ""
 msgstr ""
-"Project-Id-Version: FusionDirectory-108\n"
+"Project-Id-Version: FusionDirectory-109\n"
 "Report-Msgid-Bugs-To: documentation@lists.fusiondirectory.org\n"
-"POT-Creation-Date: 2015-03-31 11:49+0200\n"
-"PO-Revision-Date: 2015-03-31 10:46+0000\n"
+"POT-Creation-Date: 2014-12-15 17:47+0100\n"
+"PO-Revision-Date: 2015-02-25 16:04+0000\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>\n"
-"Language-Team: Catalan (http://www.transifex.com/projects/p/FusionDirectory-108/language/ca/)\n"
+"Language-Team: Catalan (http://www.transifex.com/projects/p/FusionDirectory-109/language/ca/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -27,15 +27,16 @@ msgstr ""
 
 #: admin/supannStructures/class_entite.inc:31
 #: admin/supannStructures/class_entite.inc:52
-msgid "Entity"
+#: personal/supann/class_supannAccount.inc:442
+msgid "Entite"
 msgstr ""
 
 #: admin/supannStructures/class_entite.inc:32
-msgid "SUPANN Entity Settings"
+msgid "SUPANN Entite Settings"
 msgstr ""
 
 #: admin/supannStructures/class_entite.inc:35
-msgid "SUPANN Entity"
+msgid "SUPANN Entite"
 msgstr ""
 
 #: admin/supannStructures/class_entite.inc:55
@@ -44,7 +45,7 @@ msgid "Name"
 msgstr "Nom"
 
 #: admin/supannStructures/class_entite.inc:55
-msgid "The name to write in the ou attribute for this entity"
+msgid "The name to write in the ou attribute for this entite"
 msgstr ""
 
 #: admin/supannStructures/class_entite.inc:61
@@ -57,7 +58,7 @@ msgid "Telephone"
 msgstr ""
 
 #: admin/supannStructures/class_entite.inc:64
-msgid "Phone number for this entity"
+msgid "Phone number for this entite"
 msgstr ""
 
 #: admin/supannStructures/class_entite.inc:68
@@ -66,7 +67,7 @@ msgid "Fax"
 msgstr "Fax"
 
 #: admin/supannStructures/class_entite.inc:68
-msgid "Fax number for this entity"
+msgid "Fax number for this entite"
 msgstr ""
 
 #: admin/supannStructures/class_entite.inc:72
@@ -74,7 +75,7 @@ msgid "Postal address"
 msgstr "AdreÃ§a postal"
 
 #: admin/supannStructures/class_entite.inc:72
-msgid "Postal address of this entity"
+msgid "Postal address of this entite"
 msgstr ""
 
 #: admin/supannStructures/class_entite.inc:76
@@ -83,7 +84,7 @@ msgid "Description"
 msgstr ""
 
 #: admin/supannStructures/class_entite.inc:76
-msgid "Short description of this entity"
+msgid "Short description of this entite"
 msgstr ""
 
 #: admin/supannStructures/class_entite.inc:82
@@ -91,27 +92,28 @@ msgid "SUPANN informations"
 msgstr ""
 
 #: admin/supannStructures/class_entite.inc:85
-msgid "Entity type"
+#: personal/supann/class_supannAccount.inc:438
+msgid "Entite type"
 msgstr ""
 
 #: admin/supannStructures/class_entite.inc:85
-msgid "The best SUPANN type that fits this entity"
+msgid "The best SUPANN type that fits this entite"
 msgstr ""
 
 #: admin/supannStructures/class_entite.inc:89
-msgid "Entity code"
+msgid "Entite code"
 msgstr ""
 
 #: admin/supannStructures/class_entite.inc:89
-msgid "The SUPANN code of this entity"
+msgid "The SUPANN code of this entite"
 msgstr ""
 
 #: admin/supannStructures/class_entite.inc:94
-msgid "Parent entity"
+msgid "Parent entite"
 msgstr ""
 
 #: admin/supannStructures/class_entite.inc:94
-msgid "The parent entity of this entity"
+msgid "The parent entite of this entite"
 msgstr ""
 
 #: admin/supannStructures/class_entite.inc:98
@@ -119,21 +121,21 @@ msgid "Reference ID"
 msgstr ""
 
 #: admin/supannStructures/class_entite.inc:98
-msgid "SUPANN reference ID of this entity"
+msgid "SUPANN reference ID of this entite"
 msgstr ""
 
 #: admin/supannStructures/class_etablissement.inc:31
-#: personal/supann/class_supannAccount.inc:324
-#: personal/supann/class_supannAccount.inc:363
-msgid "Establishment"
+#: personal/supann/class_supannAccount.inc:316
+#: personal/supann/class_supannAccount.inc:355
+msgid "Etablissement"
 msgstr ""
 
 #: admin/supannStructures/class_etablissement.inc:32
-msgid "SUPANN Establishment Settings"
+msgid "SUPANN Etablissement Settings"
 msgstr ""
 
 #: admin/supannStructures/class_etablissement.inc:35
-msgid "SUPANN Establishment"
+msgid "SUPANN Etablissement"
 msgstr ""
 
 #: admin/supannStructures/class_etablissement.inc:52
@@ -141,19 +143,19 @@ msgid "Properties"
 msgstr ""
 
 #: admin/supannStructures/class_etablissement.inc:55
-msgid "Root Establishment"
+msgid "Root etablissement"
 msgstr ""
 
 #: admin/supannStructures/class_etablissement.inc:55
-msgid "Set this Establishment as the root one"
+msgid "Set this etablissement as the root one"
 msgstr ""
 
 #: admin/supannStructures/class_etablissement.inc:59
-msgid "The name to write in the o attribute for this Establishment"
+msgid "The name to write in the o attribute for this etablissement"
 msgstr ""
 
 #: admin/supannStructures/class_etablissement.inc:63
-msgid "A short description of this Establishment"
+msgid "A short description of this etablissement"
 msgstr ""
 
 #: admin/supannStructures/class_etablissement.inc:69
@@ -162,7 +164,7 @@ msgid "Location"
 msgstr "LocalitzaciÃ³"
 
 #: admin/supannStructures/class_etablissement.inc:72
-msgid "Usually the city where this Establishment is"
+msgid "Usually the city in which is this etablissement"
 msgstr ""
 
 #: admin/supannStructures/class_etablissement.inc:76
@@ -170,15 +172,15 @@ msgid "Address"
 msgstr "AdreÃ§a"
 
 #: admin/supannStructures/class_etablissement.inc:76
-msgid "The postal address of this Establishment"
+msgid "The postal address of this etablissement"
 msgstr ""
 
 #: admin/supannStructures/class_etablissement.inc:80
-msgid "Phone number for this Establishment"
+msgid "Phone number for this etablissement"
 msgstr ""
 
 #: admin/supannStructures/class_etablissement.inc:84
-msgid "Fax number for this Establishment"
+msgid "Fax number for this etablissement"
 msgstr ""
 
 #: admin/supannStructures/class_etablissement.inc:90
@@ -186,11 +188,11 @@ msgid "SUPANN properties"
 msgstr ""
 
 #: admin/supannStructures/class_etablissement.inc:93
-msgid "Establishment code"
+msgid "Etablissement code"
 msgstr ""
 
 #: admin/supannStructures/class_etablissement.inc:93
-msgid "The code of this Establishment (must have a prefix between {})"
+msgid "The code of this etablissement (must have a prefix between {})"
 msgstr ""
 
 #: admin/supannStructures/class_etablissement.inc:98
@@ -198,7 +200,7 @@ msgid "SUPANN code"
 msgstr ""
 
 #: admin/supannStructures/class_etablissement.inc:98
-msgid "The SUPANN code for this Establishment"
+msgid "The SUPANN code for this etablissement"
 msgstr ""
 
 #: admin/supannStructures/class_etablissement.inc:103
@@ -206,7 +208,7 @@ msgid "Legal name"
 msgstr ""
 
 #: admin/supannStructures/class_etablissement.inc:103
-msgid "The legal name of this Establishment"
+msgid "The legal name of this etablissement"
 msgstr ""
 
 #: admin/supannStructures/class_etablissement.inc:107
@@ -214,7 +216,7 @@ msgid "Home page URI"
 msgstr ""
 
 #: admin/supannStructures/class_etablissement.inc:107
-msgid "The URI of this Establishment website home page"
+msgid "The URI of this etablissement website home page"
 msgstr ""
 
 #: admin/supannStructures/class_etablissement.inc:111
@@ -222,7 +224,7 @@ msgid "Institution URI"
 msgstr ""
 
 #: admin/supannStructures/class_etablissement.inc:111
-msgid "The URI of this Establishment institution website"
+msgid "The URI of this etablissement institution website"
 msgstr ""
 
 #: admin/supannStructures/class_etablissement.inc:115
@@ -230,12 +232,12 @@ msgid "White pages URI"
 msgstr ""
 
 #: admin/supannStructures/class_etablissement.inc:115
-msgid "The URI of this Establishment white pages"
+msgid "The URI of this etablissement white pages"
 msgstr ""
 
 #: admin/supannStructures/class_etablissement.inc:148
-#: admin/supannStructures/class_etablissement.inc:201
-#: admin/supannStructures/class_etablissement.inc:219
+#: admin/supannStructures/class_etablissement.inc:198
+#: admin/supannStructures/class_etablissement.inc:216
 msgid "LDAP error"
 msgstr "Error d'LDAP"
 
@@ -355,256 +357,243 @@ msgstr ""
 msgid "eduPersonNickName - Can contain a nick name for this user"
 msgstr ""
 
-#: personal/supann/class_supannAccount.inc:253
-msgid "Ref ids"
-msgstr ""
-
-#: personal/supann/class_supannAccount.inc:253
-msgid "supannRefId - IDs/links for this user on other systems"
-msgstr ""
-
-#: personal/supann/class_supannAccount.inc:262
+#: personal/supann/class_supannAccount.inc:254
 msgid "Contact"
 msgstr ""
 
-#: personal/supann/class_supannAccount.inc:266
+#: personal/supann/class_supannAccount.inc:258
 msgid "Other phone numbers"
 msgstr ""
 
-#: personal/supann/class_supannAccount.inc:266
+#: personal/supann/class_supannAccount.inc:258
 msgid "supannAutreTelephone - Other phone numbers for this user"
 msgstr ""
 
-#: personal/supann/class_supannAccount.inc:272
+#: personal/supann/class_supannAccount.inc:264
 msgid "Other mail addresses"
 msgstr ""
 
-#: personal/supann/class_supannAccount.inc:272
+#: personal/supann/class_supannAccount.inc:264
 msgid ""
 "supannAutreMail - Other mail addresses for this user. Each must be unique"
 msgstr ""
 
-#: personal/supann/class_supannAccount.inc:278
+#: personal/supann/class_supannAccount.inc:270
 msgid "Personal mail addresses"
 msgstr ""
 
-#: personal/supann/class_supannAccount.inc:278
+#: personal/supann/class_supannAccount.inc:270
 msgid "supannMailPerso - Personal mail addresses for this user"
 msgstr ""
 
-#: personal/supann/class_supannAccount.inc:283
-msgid "red List"
+#: personal/supann/class_supannAccount.inc:275
+msgid "Liste rouge"
 msgstr ""
 
-#: personal/supann/class_supannAccount.inc:283
+#: personal/supann/class_supannAccount.inc:275
 msgid "supannListeRouge - Should this person be on the red list"
 msgstr ""
 
-#: personal/supann/class_supannAccount.inc:289
+#: personal/supann/class_supannAccount.inc:281
 msgid "Affectation"
 msgstr ""
 
-#: personal/supann/class_supannAccount.inc:292
-msgid "Entity primary assignment"
+#: personal/supann/class_supannAccount.inc:284
+msgid "Entite affectation principale"
 msgstr ""
 
-#: personal/supann/class_supannAccount.inc:292
+#: personal/supann/class_supannAccount.inc:284
 msgid "supannEntiteAffectationPrincipale"
 msgstr ""
 
-#: personal/supann/class_supannAccount.inc:297
-#: personal/supann/class_supannAccount.inc:388
-#: personal/supann/class_supannAccount.inc:450
-msgid "Entity assignment"
+#: personal/supann/class_supannAccount.inc:289
+#: personal/supann/class_supannAccount.inc:380
+msgid "Entite affectation"
 msgstr ""
 
-#: personal/supann/class_supannAccount.inc:297
-#: personal/supann/class_supannAccount.inc:450
+#: personal/supann/class_supannAccount.inc:289
+#: personal/supann/class_supannAccount.inc:442
 msgid "supannEntiteAffectation"
 msgstr ""
 
-#: personal/supann/class_supannAccount.inc:303
-msgid "Entity type assignment"
+#: personal/supann/class_supannAccount.inc:295
+msgid "Type entite affectation"
 msgstr ""
 
-#: personal/supann/class_supannAccount.inc:303
-#: personal/supann/class_supannAccount.inc:446
+#: personal/supann/class_supannAccount.inc:295
+#: personal/supann/class_supannAccount.inc:438
 msgid "supannTypeEntiteAffectation"
 msgstr ""
 
-#: personal/supann/class_supannAccount.inc:310
+#: personal/supann/class_supannAccount.inc:302
 msgid "Affiliation"
 msgstr ""
 
-#: personal/supann/class_supannAccount.inc:313
+#: personal/supann/class_supannAccount.inc:305
 msgid "Primary affiliation"
 msgstr ""
 
-#: personal/supann/class_supannAccount.inc:313
+#: personal/supann/class_supannAccount.inc:305
 msgid "eduPersonPrimaryAffiliation"
 msgstr ""
 
-#: personal/supann/class_supannAccount.inc:318
+#: personal/supann/class_supannAccount.inc:310
 msgid "Affiliations"
 msgstr ""
 
-#: personal/supann/class_supannAccount.inc:318
+#: personal/supann/class_supannAccount.inc:310
 msgid "eduPersonAffiliation"
 msgstr ""
 
-#: personal/supann/class_supannAccount.inc:324
+#: personal/supann/class_supannAccount.inc:316
 msgid "supannEtablissement"
 msgstr ""
 
-#: personal/supann/class_supannAccount.inc:331
+#: personal/supann/class_supannAccount.inc:323
 msgid "Student profile"
 msgstr ""
 
-#: personal/supann/class_supannAccount.inc:334
+#: personal/supann/class_supannAccount.inc:326
 msgid "INE code"
 msgstr ""
 
-#: personal/supann/class_supannAccount.inc:334
+#: personal/supann/class_supannAccount.inc:326
 msgid "supannCodeINE - INE code of this student"
 msgstr ""
 
-#: personal/supann/class_supannAccount.inc:338
+#: personal/supann/class_supannAccount.inc:330
 msgid "Student ID"
 msgstr ""
 
-#: personal/supann/class_supannAccount.inc:338
+#: personal/supann/class_supannAccount.inc:330
 msgid "supannEtuId - scolarity id"
 msgstr ""
 
-#: personal/supann/class_supannAccount.inc:344
+#: personal/supann/class_supannAccount.inc:336
 msgid "Student subscriptions"
 msgstr ""
 
-#: personal/supann/class_supannAccount.inc:359
+#: personal/supann/class_supannAccount.inc:351
 msgid "supannEtuInscription - Subscriptions for this student"
 msgstr ""
 
-#: personal/supann/class_supannAccount.inc:363
+#: personal/supann/class_supannAccount.inc:355
 msgid ""
 "supannEtablissement - Etablissement in which this subscription was done"
 msgstr ""
 
-#: personal/supann/class_supannAccount.inc:367
+#: personal/supann/class_supannAccount.inc:359
 msgid "Year"
 msgstr ""
 
-#: personal/supann/class_supannAccount.inc:367
+#: personal/supann/class_supannAccount.inc:359
 msgid "supannEtuAnneeInscription - The year this subscription will begin"
 msgstr ""
 
-#: personal/supann/class_supannAccount.inc:372
+#: personal/supann/class_supannAccount.inc:364
 msgid "Subscription type"
 msgstr ""
 
-#: personal/supann/class_supannAccount.inc:372
+#: personal/supann/class_supannAccount.inc:364
 msgid "supannEtuRegimeInscription - The type of this subscription"
 msgstr ""
 
-#: personal/supann/class_supannAccount.inc:376
-msgid "Disciplinary Sector"
+#: personal/supann/class_supannAccount.inc:368
+msgid "Secteur Disciplinaire"
 msgstr ""
 
-#: personal/supann/class_supannAccount.inc:376
+#: personal/supann/class_supannAccount.inc:368
 msgid "supannEtuSecteurDisciplinaire"
 msgstr ""
 
-#: personal/supann/class_supannAccount.inc:380
+#: personal/supann/class_supannAccount.inc:372
 msgid "Diploma type"
 msgstr ""
 
-#: personal/supann/class_supannAccount.inc:380
+#: personal/supann/class_supannAccount.inc:372
 msgid "supannEtuTypeDiplome - Type of diploma"
 msgstr ""
 
-#: personal/supann/class_supannAccount.inc:384
-msgid "Curriculum year "
+#: personal/supann/class_supannAccount.inc:376
+msgid "Cursus annee"
 msgstr ""
 
-#: personal/supann/class_supannAccount.inc:384
+#: personal/supann/class_supannAccount.inc:376
 msgid "supannEtuCursusAnnee"
 msgstr ""
 
-#: personal/supann/class_supannAccount.inc:388
+#: personal/supann/class_supannAccount.inc:380
 msgid "supannEntiteAffectation_affect"
 msgstr ""
 
-#: personal/supann/class_supannAccount.inc:392
+#: personal/supann/class_supannAccount.inc:384
 msgid "Diploma"
 msgstr ""
 
-#: personal/supann/class_supannAccount.inc:392
+#: personal/supann/class_supannAccount.inc:384
 msgid "supannEtuDiplome"
 msgstr ""
 
-#: personal/supann/class_supannAccount.inc:396
+#: personal/supann/class_supannAccount.inc:388
 msgid "Step"
 msgstr ""
 
-#: personal/supann/class_supannAccount.inc:396
+#: personal/supann/class_supannAccount.inc:388
 msgid "supannEtuEtape"
 msgstr ""
 
-#: personal/supann/class_supannAccount.inc:400
+#: personal/supann/class_supannAccount.inc:392
 msgid "educational element"
 msgstr ""
 
-#: personal/supann/class_supannAccount.inc:400
+#: personal/supann/class_supannAccount.inc:392
 msgid "supannEtuElementPedagogique"
 msgstr ""
 
-#: personal/supann/class_supannAccount.inc:412
-msgid "Personal profile"
+#: personal/supann/class_supannAccount.inc:404
+msgid "Personnal profile"
 msgstr ""
 
-#: personal/supann/class_supannAccount.inc:415
+#: personal/supann/class_supannAccount.inc:407
 msgid "Personal ID"
 msgstr ""
 
-#: personal/supann/class_supannAccount.inc:415
+#: personal/supann/class_supannAccount.inc:407
 msgid "supannEmpId"
 msgstr ""
 
-#: personal/supann/class_supannAccount.inc:419
+#: personal/supann/class_supannAccount.inc:411
 msgid "Personal corps"
 msgstr ""
 
-#: personal/supann/class_supannAccount.inc:419
+#: personal/supann/class_supannAccount.inc:411
 msgid "supannEmpCorps"
 msgstr ""
 
-#: personal/supann/class_supannAccount.inc:424
-msgid "Activity"
+#: personal/supann/class_supannAccount.inc:416
+msgid "Activite"
 msgstr ""
 
-#: personal/supann/class_supannAccount.inc:424
+#: personal/supann/class_supannAccount.inc:416
 msgid "supannActivite"
 msgstr ""
 
-#: personal/supann/class_supannAccount.inc:431
+#: personal/supann/class_supannAccount.inc:423
 msgid "Roles"
 msgstr ""
 
-#: personal/supann/class_supannAccount.inc:438
+#: personal/supann/class_supannAccount.inc:430
 msgid "supannRoleEntite"
 msgstr ""
 
-#: personal/supann/class_supannAccount.inc:442
+#: personal/supann/class_supannAccount.inc:434
 msgid "Generic role"
 msgstr ""
 
-#: personal/supann/class_supannAccount.inc:442
+#: personal/supann/class_supannAccount.inc:434
 msgid "supannRoleGenerique"
 msgstr ""
 
-#: personal/supann/class_supannAccount.inc:446
-msgid "Entity assignment type"
-msgstr ""
-
 #: config/supann/class_supannConfig.inc:28
 msgid "SUPANN configuration"
 msgstr ""
diff --git a/supann/locale/cs_CZ/fusiondirectory.po b/supann/locale/cs_CZ/fusiondirectory.po
index 341c01bc63772b862fb5e5bf918d6d632c79219d..38e0fd0f56547b7ac53d717544d35105e64ad69a 100644
--- a/supann/locale/cs_CZ/fusiondirectory.po
+++ b/supann/locale/cs_CZ/fusiondirectory.po
@@ -3,15 +3,15 @@
 # This file is distributed under the same license as the PACKAGE package.
 # 
 # Translators:
-# Pavel Borecki <pavel.borecki@gmail.com>, 2015
+# Pavel Borecki <pavel.borecki@gmail.com>, 2014-2015
 msgid ""
 msgstr ""
-"Project-Id-Version: FusionDirectory-108\n"
+"Project-Id-Version: FusionDirectory-109\n"
 "Report-Msgid-Bugs-To: documentation@lists.fusiondirectory.org\n"
-"POT-Creation-Date: 2015-03-31 11:49+0200\n"
-"PO-Revision-Date: 2015-03-31 11:41+0000\n"
+"POT-Creation-Date: 2014-12-15 17:47+0100\n"
+"PO-Revision-Date: 2015-04-05 09:02+0000\n"
 "Last-Translator: Pavel Borecki <pavel.borecki@gmail.com>\n"
-"Language-Team: Czech (Czech Republic) (http://www.transifex.com/projects/p/FusionDirectory-108/language/cs_CZ/)\n"
+"Language-Team: Czech (Czech Republic) (http://www.transifex.com/projects/p/FusionDirectory-109/language/cs_CZ/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -28,25 +28,26 @@ msgstr "SprÃ¡va struktur Supann"
 
 #: admin/supannStructures/class_entite.inc:31
 #: admin/supannStructures/class_entite.inc:52
-msgid "Entity"
+#: personal/supann/class_supannAccount.inc:442
+msgid "Entite"
 msgstr "Entita"
 
 #: admin/supannStructures/class_entite.inc:32
-msgid "SUPANN Entity Settings"
-msgstr "NastavenÃ SUPANN entity"
+msgid "SUPANN Entite Settings"
+msgstr "NastavenÃ entity SUPANN"
 
 #: admin/supannStructures/class_entite.inc:35
-msgid "SUPANN Entity"
+msgid "SUPANN Entite"
 msgstr "SUPANN entita"
 
 #: admin/supannStructures/class_entite.inc:55
 #: admin/supannStructures/class_etablissement.inc:59
 msgid "Name"
-msgstr "nÃ¡zev"
+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"
+msgid "The name to write in the ou attribute for this entite"
+msgstr "NÃ¡zev, kterÃ½ zapsat do atributu organizaÄnÃ jednotka tÃ©to entity"
 
 #: admin/supannStructures/class_entite.inc:61
 msgid "Administrative informations"
@@ -55,36 +56,36 @@ msgstr "SprÃ¡vnÃ Ãºdaje"
 #: admin/supannStructures/class_entite.inc:64
 #: admin/supannStructures/class_etablissement.inc:80
 msgid "Telephone"
-msgstr "telefon"
+msgstr "Telefon"
 
 #: admin/supannStructures/class_entite.inc:64
-msgid "Phone number for this entity"
-msgstr "TelefonnÃ ÄÃslo tÃ©to entity"
+msgid "Phone number for this entite"
+msgstr "TelefonÃ ÄÃslo pro tuto entitu"
 
 #: admin/supannStructures/class_entite.inc:68
 #: admin/supannStructures/class_etablissement.inc:84
 msgid "Fax"
-msgstr ""
+msgstr "fax"
 
 #: admin/supannStructures/class_entite.inc:68
-msgid "Fax number for this entity"
+msgid "Fax number for this entite"
 msgstr "FaxovÃ© ÄÃslo tÃ©to entity"
 
 #: admin/supannStructures/class_entite.inc:72
 msgid "Postal address"
-msgstr "poÅ¡tovnÃ adresa"
+msgstr "PoÅ¡tovnÃ adresa"
 
 #: admin/supannStructures/class_entite.inc:72
-msgid "Postal address of this entity"
+msgid "Postal address of this entite"
 msgstr "PoÅ¡tovnÃ adresa tÃ©to entity"
 
 #: admin/supannStructures/class_entite.inc:76
 #: admin/supannStructures/class_etablissement.inc:63
 msgid "Description"
-msgstr "popis"
+msgstr "Popis"
 
 #: admin/supannStructures/class_entite.inc:76
-msgid "Short description of this entity"
+msgid "Short description of this entite"
 msgstr "StruÄnÃ½ popis tÃ©to entity"
 
 #: admin/supannStructures/class_entite.inc:82
@@ -92,162 +93,163 @@ msgid "SUPANN informations"
 msgstr "Informace o SUPANN"
 
 #: admin/supannStructures/class_entite.inc:85
-msgid "Entity type"
+#: personal/supann/class_supannAccount.inc:438
+msgid "Entite type"
 msgstr "Typ entity"
 
 #: admin/supannStructures/class_entite.inc:85
-msgid "The best SUPANN type that fits this entity"
+msgid "The best SUPANN type that fits this entite"
 msgstr "SUPANN typ, nejlÃ©pe odpovÃdajÃcÃ tÃ©to entitÄ›"
 
 #: admin/supannStructures/class_entite.inc:89
-msgid "Entity code"
+msgid "Entite code"
 msgstr "KÃ³d entity"
 
 #: admin/supannStructures/class_entite.inc:89
-msgid "The SUPANN code of this entity"
+msgid "The SUPANN code of this entite"
 msgstr "SUPANN kÃ³d tÃ©to entity"
 
 #: admin/supannStructures/class_entite.inc:94
-msgid "Parent entity"
+msgid "Parent entite"
 msgstr "NadÅ™azenÃ¡ entita"
 
 #: admin/supannStructures/class_entite.inc:94
-msgid "The parent entity of this entity"
-msgstr "NadÅ™azenÃ¡ entita tÃ©to entity"
+msgid "The parent entite of this entite"
+msgstr "Entinta, nadÅ™azenÃ¡ tÃ©to entitÄ›"
 
 #: admin/supannStructures/class_entite.inc:98
 msgid "Reference ID"
-msgstr "IdentifikÃ¡tor odkazu"
+msgstr "ReferenÄnÃ identifikÃ¡tor"
 
 #: admin/supannStructures/class_entite.inc:98
-msgid "SUPANN reference ID of this entity"
-msgstr ""
+msgid "SUPANN reference ID of this entite"
+msgstr "ReferenÄnÃ SUPANN identifikÃ¡tor tÃ©to entity"
 
 #: admin/supannStructures/class_etablissement.inc:31
-#: personal/supann/class_supannAccount.inc:324
-#: personal/supann/class_supannAccount.inc:363
-msgid "Establishment"
+#: personal/supann/class_supannAccount.inc:316
+#: personal/supann/class_supannAccount.inc:355
+msgid "Etablissement"
 msgstr "Instituce"
 
 #: admin/supannStructures/class_etablissement.inc:32
-msgid "SUPANN Establishment Settings"
-msgstr ""
+msgid "SUPANN Etablissement Settings"
+msgstr "NastavenÃ SUPANN instituce"
 
 #: admin/supannStructures/class_etablissement.inc:35
-msgid "SUPANN Establishment"
-msgstr ""
+msgid "SUPANN Etablissement"
+msgstr "SUPANN instituce"
 
 #: admin/supannStructures/class_etablissement.inc:52
 msgid "Properties"
-msgstr "vlastnosti"
+msgstr "Vlastnosti"
 
 #: admin/supannStructures/class_etablissement.inc:55
-msgid "Root Establishment"
-msgstr ""
+msgid "Root etablissement"
+msgstr "MateÅ™skÃ¡ instituce"
 
 #: admin/supannStructures/class_etablissement.inc:55
-msgid "Set this Establishment as the root one"
-msgstr ""
+msgid "Set this etablissement 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 ""
+msgid "The name to write in the o attribute for this etablissement"
+msgstr "NÃ¡zev, kterÃ½ zapsat do atributu tÃ©to instituce"
 
 #: admin/supannStructures/class_etablissement.inc:63
-msgid "A short description of this Establishment"
+msgid "A short description of this etablissement"
 msgstr "StruÄnÃ½ popis tÃ©to instituce"
 
 #: admin/supannStructures/class_etablissement.inc:69
 #: admin/supannStructures/class_etablissement.inc:72
 msgid "Location"
-msgstr "umÃstÄ›nÃ"
+msgstr "UmÃstÄ›nÃ"
 
 #: admin/supannStructures/class_etablissement.inc:72
-msgid "Usually the city where this Establishment is"
-msgstr ""
+msgid "Usually the city in which is this etablissement"
+msgstr "Obvykle mÄ›sto, ve kterÃ©m se tato instituce nachÃ¡zÃ"
 
 #: admin/supannStructures/class_etablissement.inc:76
 msgid "Address"
-msgstr "adresa"
+msgstr "Adresa"
 
 #: admin/supannStructures/class_etablissement.inc:76
-msgid "The postal address of this Establishment"
+msgid "The postal address of this etablissement"
 msgstr "PoÅ¡tovnÃ adresa tÃ©to instituce"
 
 #: admin/supannStructures/class_etablissement.inc:80
-msgid "Phone number for this Establishment"
+msgid "Phone number for this etablissement"
 msgstr "TelefonnÃ ÄÃslo do tÃ©to instituce"
 
 #: admin/supannStructures/class_etablissement.inc:84
-msgid "Fax number for this Establishment"
-msgstr ""
+msgid "Fax number for this etablissement"
+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"
+msgid "Etablissement code"
 msgstr "KÃ³d instituce"
 
 #: admin/supannStructures/class_etablissement.inc:93
-msgid "The code of this Establishment (must have a prefix between {})"
-msgstr ""
+msgid "The code of this etablissement (must have a prefix between {})"
+msgstr "KÃ³d tÃ©to instituce (vÄetnÄ› pÅ™edpony mezi  {})"
 
 #: 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 ""
+msgid "The SUPANN code for this etablissement"
+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 ""
+msgid "The legal name of this etablissement"
+msgstr "ÃšÅ™ednÃ nÃ¡zev tÃ©to instituce"
 
 #: admin/supannStructures/class_etablissement.inc:107
 msgid "Home page URI"
-msgstr "URI adresa domovskÃ© strÃ¡nky"
+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"
+msgid "The URI of this etablissement website home page"
+msgstr "URI adresa domovskÃ½ch webovÃ½ch strÃ¡nek 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 ""
+msgid "The URI of this etablissement 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 ""
+msgid "The URI of this etablissement white pages"
+msgstr "URI adresa bÃlÃ½ch strÃ¡nek instituce"
 
 #: admin/supannStructures/class_etablissement.inc:148
-#: admin/supannStructures/class_etablissement.inc:201
-#: admin/supannStructures/class_etablissement.inc:219
+#: admin/supannStructures/class_etablissement.inc:198
+#: admin/supannStructures/class_etablissement.inc:216
 msgid "LDAP error"
-msgstr "chyba LDAPu"
+msgstr "Chyba LDAP"
 
 #: admin/supannStructures/class_supann.inc:53
 msgid "File error"
-msgstr "Chyba souboru"
+msgstr "Chyba v souboru"
 
 #: admin/supannStructures/class_supann.inc:54
 #, php-format
 msgid "Cannot read file: '%s'"
-msgstr "Soubor nelze naÄÃst: \"%s\""
+msgstr "Nelze naÄÃst soubor: %s"
 
 #: personal/supann/class_supannAccount.inc:35
 #: personal/supann/class_supannAccount.inc:109
@@ -324,7 +326,7 @@ msgstr "Identita"
 
 #: personal/supann/class_supannAccount.inc:235
 msgid "Civilite"
-msgstr "ZdvoÅ™ilÃ©"
+msgstr "ZdvoÅ™ilostnÃ"
 
 #: personal/supann/class_supannAccount.inc:235
 msgid "supannCivilite - Civilte for this person"
@@ -336,7 +338,7 @@ msgstr "AlternativnÃ pÅ™ihlaÅ¡ovacÃ jmÃ©no"
 
 #: personal/supann/class_supannAccount.inc:240
 msgid "supannAliasLogin - An alias for the login of this user"
-msgstr "supannAliasLogin â€“ alternativnÃ pÅ™ihlaÅ¡ovacÃ jmÃ©no tohoto uÅ¾ivatele"
+msgstr "supannAliasLogin â€“ alternativnÃ nÃ¡zev pro pÅ™ihlaÅ¡ovacÃ jmÃ©no tohoto uÅ¾ivatele"
 
 #: personal/supann/class_supannAccount.inc:244
 msgid "eduPersonPrincipalName"
@@ -356,256 +358,243 @@ msgstr "PÅ™ezdÃvka"
 msgid "eduPersonNickName - Can contain a nick name for this user"
 msgstr "eduPersonNickName â€“ mÅ¯Å¾e obsahovat pÅ™ezdÃvku tohoto uÅ¾ivatele"
 
-#: personal/supann/class_supannAccount.inc:253
-msgid "Ref ids"
-msgstr ""
-
-#: personal/supann/class_supannAccount.inc:253
-msgid "supannRefId - IDs/links for this user on other systems"
-msgstr ""
-
-#: personal/supann/class_supannAccount.inc:262
+#: personal/supann/class_supannAccount.inc:254
 msgid "Contact"
-msgstr "kontakt"
+msgstr "Kontakt"
 
-#: personal/supann/class_supannAccount.inc:266
+#: personal/supann/class_supannAccount.inc:258
 msgid "Other phone numbers"
 msgstr "OstatnÃ telefonnÃ ÄÃsla"
 
-#: personal/supann/class_supannAccount.inc:266
+#: personal/supann/class_supannAccount.inc:258
 msgid "supannAutreTelephone - Other phone numbers for this user"
 msgstr "supannAutreTelephone â€“ ostatnÃ telefonnÃ ÄÃsla tohoto uÅ¾ivatele"
 
-#: personal/supann/class_supannAccount.inc:272
+#: personal/supann/class_supannAccount.inc:264
 msgid "Other mail addresses"
 msgstr "OstatnÃ e-mailovÃ© adresy"
 
-#: personal/supann/class_supannAccount.inc:272
+#: personal/supann/class_supannAccount.inc:264
 msgid ""
 "supannAutreMail - Other mail addresses for this user. Each must be unique"
-msgstr "supannAutreMail â€“ ostatnÃ e-mailovÃ© adresy tohoto uÅ¾ivatele. Ty musÃ bÃ½t jedineÄnÃ©"
+msgstr "supannAutreMail â€“ ostatnÃ e-mailovÃ© adresy tohoto uÅ¾ivatele. Nemohou se opakovat"
 
-#: personal/supann/class_supannAccount.inc:278
+#: personal/supann/class_supannAccount.inc:270
 msgid "Personal mail addresses"
 msgstr "OsobnÃ e-mailovÃ¡ adresa"
 
-#: personal/supann/class_supannAccount.inc:278
+#: personal/supann/class_supannAccount.inc:270
 msgid "supannMailPerso - Personal mail addresses for this user"
 msgstr "supannMailPerso â€“ soukromÃ¡ poÅ¡tovnÃ adresa tohoto uÅ¾ivatele"
 
-#: personal/supann/class_supannAccount.inc:283
-msgid "red List"
+#: personal/supann/class_supannAccount.inc:275
+msgid "Liste rouge"
 msgstr "Seznam blokovanÃ½ch"
 
-#: personal/supann/class_supannAccount.inc:283
+#: personal/supann/class_supannAccount.inc:275
 msgid "supannListeRouge - Should this person be on the red list"
 msgstr "supannListeRouge â€“ Zda by tato osoba mÄ›la bÃ½t na seznamu blokovanÃ½ch"
 
-#: personal/supann/class_supannAccount.inc:289
+#: personal/supann/class_supannAccount.inc:281
 msgid "Affectation"
 msgstr "PÅ™iÅ™azenÃ"
 
-#: personal/supann/class_supannAccount.inc:292
-msgid "Entity primary assignment"
-msgstr "HlavnÃ pÅ™iÅ™azenÃ entity"
+#: personal/supann/class_supannAccount.inc:284
+msgid "Entite affectation principale"
+msgstr "HlavnÃ pÅ™iÅ™azenÃ subjektu"
 
-#: personal/supann/class_supannAccount.inc:292
+#: personal/supann/class_supannAccount.inc:284
 msgid "supannEntiteAffectationPrincipale"
 msgstr ""
 
-#: personal/supann/class_supannAccount.inc:297
-#: personal/supann/class_supannAccount.inc:388
-#: personal/supann/class_supannAccount.inc:450
-msgid "Entity assignment"
-msgstr "PÅ™iÅ™azenÃ entity"
+#: personal/supann/class_supannAccount.inc:289
+#: personal/supann/class_supannAccount.inc:380
+msgid "Entite affectation"
+msgstr "PÅ™iÅ™azenÃ subjektu"
 
-#: personal/supann/class_supannAccount.inc:297
-#: personal/supann/class_supannAccount.inc:450
+#: personal/supann/class_supannAccount.inc:289
+#: personal/supann/class_supannAccount.inc:442
 msgid "supannEntiteAffectation"
 msgstr ""
 
-#: personal/supann/class_supannAccount.inc:303
-msgid "Entity type assignment"
-msgstr "PÅ™iÅ™azenÃ typu entity"
+#: personal/supann/class_supannAccount.inc:295
+msgid "Type entite affectation"
+msgstr "Typ pÅ™iÅ™azenÃ subjektu"
 
-#: personal/supann/class_supannAccount.inc:303
-#: personal/supann/class_supannAccount.inc:446
+#: personal/supann/class_supannAccount.inc:295
+#: personal/supann/class_supannAccount.inc:438
 msgid "supannTypeEntiteAffectation"
 msgstr ""
 
-#: personal/supann/class_supannAccount.inc:310
+#: personal/supann/class_supannAccount.inc:302
 msgid "Affiliation"
 msgstr "PÅ™idruÅ¾enÃ"
 
-#: personal/supann/class_supannAccount.inc:313
+#: personal/supann/class_supannAccount.inc:305
 msgid "Primary affiliation"
 msgstr "HlavnÃ pÅ™idruÅ¾enÃ"
 
-#: personal/supann/class_supannAccount.inc:313
+#: personal/supann/class_supannAccount.inc:305
 msgid "eduPersonPrimaryAffiliation"
 msgstr ""
 
-#: personal/supann/class_supannAccount.inc:318
+#: personal/supann/class_supannAccount.inc:310
 msgid "Affiliations"
 msgstr "PÅ™idruÅ¾enÃ"
 
-#: personal/supann/class_supannAccount.inc:318
+#: personal/supann/class_supannAccount.inc:310
 msgid "eduPersonAffiliation"
 msgstr ""
 
-#: personal/supann/class_supannAccount.inc:324
+#: personal/supann/class_supannAccount.inc:316
 msgid "supannEtablissement"
 msgstr ""
 
-#: personal/supann/class_supannAccount.inc:331
+#: personal/supann/class_supannAccount.inc:323
 msgid "Student profile"
 msgstr "Profil studenta"
 
-#: personal/supann/class_supannAccount.inc:334
+#: personal/supann/class_supannAccount.inc:326
 msgid "INE code"
 msgstr "KÃ³d INE"
 
-#: personal/supann/class_supannAccount.inc:334
+#: personal/supann/class_supannAccount.inc:326
 msgid "supannCodeINE - INE code of this student"
 msgstr "supannCodeINE â€“ INE kÃ³d tohoto studenta"
 
-#: personal/supann/class_supannAccount.inc:338
+#: personal/supann/class_supannAccount.inc:330
 msgid "Student ID"
 msgstr "IdentifikÃ¡tor studenta"
 
-#: personal/supann/class_supannAccount.inc:338
+#: personal/supann/class_supannAccount.inc:330
 msgid "supannEtuId - scolarity id"
 msgstr "supannEtuId â€“ identifikÃ¡tor vÃ½uky"
 
-#: personal/supann/class_supannAccount.inc:344
+#: personal/supann/class_supannAccount.inc:336
 msgid "Student subscriptions"
-msgstr "ZapsÃ¡nÃ studenta"
+msgstr "ZÃ¡pisy studenta"
 
-#: personal/supann/class_supannAccount.inc:359
+#: personal/supann/class_supannAccount.inc:351
 msgid "supannEtuInscription - Subscriptions for this student"
-msgstr "supannEtuInscription â€“ pÅ™edplatnÃ© pro tohoto studenta"
+msgstr "supannEtuInscription â€“ zÃ¡pisy tohoto studenta"
 
-#: personal/supann/class_supannAccount.inc:363
+#: personal/supann/class_supannAccount.inc:355
 msgid ""
 "supannEtablissement - Etablissement in which this subscription was done"
-msgstr "supannEtablissement â€“ Instituce, ve kterÃ© bylo toto zapsÃ¡nÃ se dokonÄeno"
+msgstr "supannEtablissement â€“ Instituce, ve kterÃ© bylo toto zapsÃ¡nÃ provedeno"
 
-#: personal/supann/class_supannAccount.inc:367
+#: personal/supann/class_supannAccount.inc:359
 msgid "Year"
 msgstr "rok"
 
-#: personal/supann/class_supannAccount.inc:367
+#: personal/supann/class_supannAccount.inc:359
 msgid "supannEtuAnneeInscription - The year this subscription will begin"
 msgstr "supannEtuAnneeInscription â€“ rok, ve kterÃ©m tento zÃ¡pis zaÄne"
 
-#: personal/supann/class_supannAccount.inc:372
+#: personal/supann/class_supannAccount.inc:364
 msgid "Subscription type"
-msgstr "Typ pÅ™edplatnÃ©ho"
+msgstr "Typ zapsÃ¡nÃ se"
 
-#: personal/supann/class_supannAccount.inc:372
+#: personal/supann/class_supannAccount.inc:364
 msgid "supannEtuRegimeInscription - The type of this subscription"
-msgstr "supannEtuRegimeInscription â€“ typ tohoto zÃ¡pisu"
+msgstr "supannEtuRegimeInscription â€“ typ tohoto zapsÃ¡nÃ"
 
-#: personal/supann/class_supannAccount.inc:376
-msgid "Disciplinary Sector"
-msgstr ""
+#: personal/supann/class_supannAccount.inc:368
+msgid "Secteur Disciplinaire"
+msgstr "KÃ¡rnÃ© odvÄ›tvÃ"
 
-#: personal/supann/class_supannAccount.inc:376
+#: personal/supann/class_supannAccount.inc:368
 msgid "supannEtuSecteurDisciplinaire"
 msgstr ""
 
-#: personal/supann/class_supannAccount.inc:380
+#: personal/supann/class_supannAccount.inc:372
 msgid "Diploma type"
 msgstr "Typ diplomu"
 
-#: personal/supann/class_supannAccount.inc:380
+#: personal/supann/class_supannAccount.inc:372
 msgid "supannEtuTypeDiplome - Type of diploma"
 msgstr "supannEtuTypeDiplome â€“ typ diplomu"
 
-#: personal/supann/class_supannAccount.inc:384
-msgid "Curriculum year "
-msgstr "Rok studijnÃho plÃ¡nu"
+#: personal/supann/class_supannAccount.inc:376
+msgid "Cursus annee"
+msgstr "Rok vzdÄ›lÃ¡vacÃho programu"
 
-#: personal/supann/class_supannAccount.inc:384
+#: personal/supann/class_supannAccount.inc:376
 msgid "supannEtuCursusAnnee"
 msgstr ""
 
-#: personal/supann/class_supannAccount.inc:388
+#: personal/supann/class_supannAccount.inc:380
 msgid "supannEntiteAffectation_affect"
 msgstr ""
 
-#: personal/supann/class_supannAccount.inc:392
+#: personal/supann/class_supannAccount.inc:384
 msgid "Diploma"
 msgstr "Diplom"
 
-#: personal/supann/class_supannAccount.inc:392
+#: personal/supann/class_supannAccount.inc:384
 msgid "supannEtuDiplome"
 msgstr ""
 
-#: personal/supann/class_supannAccount.inc:396
+#: personal/supann/class_supannAccount.inc:388
 msgid "Step"
 msgstr "StupeÅˆ"
 
-#: personal/supann/class_supannAccount.inc:396
+#: personal/supann/class_supannAccount.inc:388
 msgid "supannEtuEtape"
 msgstr ""
 
-#: personal/supann/class_supannAccount.inc:400
+#: personal/supann/class_supannAccount.inc:392
 msgid "educational element"
 msgstr "vÃ½ukovÃ½ prvek"
 
-#: personal/supann/class_supannAccount.inc:400
+#: personal/supann/class_supannAccount.inc:392
 msgid "supannEtuElementPedagogique"
 msgstr ""
 
-#: personal/supann/class_supannAccount.inc:412
-msgid "Personal profile"
+#: personal/supann/class_supannAccount.inc:404
+msgid "Personnal profile"
 msgstr "OsobnÃ profil"
 
-#: personal/supann/class_supannAccount.inc:415
+#: personal/supann/class_supannAccount.inc:407
 msgid "Personal ID"
 msgstr "OsobnÃ identifikÃ¡tor"
 
-#: personal/supann/class_supannAccount.inc:415
+#: personal/supann/class_supannAccount.inc:407
 msgid "supannEmpId"
 msgstr ""
 
-#: personal/supann/class_supannAccount.inc:419
+#: personal/supann/class_supannAccount.inc:411
 msgid "Personal corps"
 msgstr "OsobnÃ sbor"
 
-#: personal/supann/class_supannAccount.inc:419
+#: personal/supann/class_supannAccount.inc:411
 msgid "supannEmpCorps"
 msgstr ""
 
-#: personal/supann/class_supannAccount.inc:424
-msgid "Activity"
+#: personal/supann/class_supannAccount.inc:416
+msgid "Activite"
 msgstr "ÄŒinnost"
 
-#: personal/supann/class_supannAccount.inc:424
+#: personal/supann/class_supannAccount.inc:416
 msgid "supannActivite"
 msgstr ""
 
-#: personal/supann/class_supannAccount.inc:431
+#: personal/supann/class_supannAccount.inc:423
 msgid "Roles"
-msgstr "role"
+msgstr "Role"
 
-#: personal/supann/class_supannAccount.inc:438
+#: personal/supann/class_supannAccount.inc:430
 msgid "supannRoleEntite"
 msgstr ""
 
-#: personal/supann/class_supannAccount.inc:442
+#: personal/supann/class_supannAccount.inc:434
 msgid "Generic role"
 msgstr "ObecnÃ¡ role"
 
-#: personal/supann/class_supannAccount.inc:442
+#: personal/supann/class_supannAccount.inc:434
 msgid "supannRoleGenerique"
 msgstr ""
 
-#: personal/supann/class_supannAccount.inc:446
-msgid "Entity assignment type"
-msgstr "Typ pÅ™iÅ™azenÃ entity"
-
 #: config/supann/class_supannConfig.inc:28
 msgid "SUPANN configuration"
 msgstr "NastavenÃ SUPANN"
@@ -620,7 +609,7 @@ msgstr ""
 
 #: config/supann/class_supannConfig.inc:45
 msgid "SUPANN RDN"
-msgstr ""
+msgstr "RelativnÃ rozliÅ¡enÃ½ nÃ¡zev SUPANN"
 
 #: config/supann/class_supannConfig.inc:45
 msgid "Branch in which SUPANN structures will be stored"
diff --git a/supann/locale/de/fusiondirectory.po b/supann/locale/de/fusiondirectory.po
index 33d7cd2ac3df731ea1d8adab285dda6073566f7f..a00969378fadce75f0d9594d44116a587d34b62a 100644
--- a/supann/locale/de/fusiondirectory.po
+++ b/supann/locale/de/fusiondirectory.po
@@ -3,15 +3,15 @@
 # This file is distributed under the same license as the PACKAGE package.
 # 
 # Translators:
-# Maik Wagner <maikwagner@yahoo.com>, 2014
+# Ettore Atalan <atalanttore@googlemail.com>, 2014-2015
 msgid ""
 msgstr ""
-"Project-Id-Version: FusionDirectory-108\n"
+"Project-Id-Version: FusionDirectory-109\n"
 "Report-Msgid-Bugs-To: documentation@lists.fusiondirectory.org\n"
-"POT-Creation-Date: 2015-03-31 11:49+0200\n"
-"PO-Revision-Date: 2015-03-31 10:46+0000\n"
-"Last-Translator: fusiondirectory <contact@fusiondirectory.org>\n"
-"Language-Team: German (http://www.transifex.com/projects/p/FusionDirectory-108/language/de/)\n"
+"POT-Creation-Date: 2014-12-15 17:47+0100\n"
+"PO-Revision-Date: 2015-05-30 13:10+0000\n"
+"Last-Translator: Ettore Atalan <atalanttore@googlemail.com>\n"
+"Language-Team: German (http://www.transifex.com/projects/p/FusionDirectory-109/language/de/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -28,15 +28,16 @@ msgstr ""
 
 #: admin/supannStructures/class_entite.inc:31
 #: admin/supannStructures/class_entite.inc:52
-msgid "Entity"
+#: personal/supann/class_supannAccount.inc:442
+msgid "Entite"
 msgstr ""
 
 #: admin/supannStructures/class_entite.inc:32
-msgid "SUPANN Entity Settings"
+msgid "SUPANN Entite Settings"
 msgstr ""
 
 #: admin/supannStructures/class_entite.inc:35
-msgid "SUPANN Entity"
+msgid "SUPANN Entite"
 msgstr ""
 
 #: admin/supannStructures/class_entite.inc:55
@@ -45,12 +46,12 @@ msgid "Name"
 msgstr "Name"
 
 #: admin/supannStructures/class_entite.inc:55
-msgid "The name to write in the ou attribute for this entity"
+msgid "The name to write in the ou attribute for this entite"
 msgstr ""
 
 #: admin/supannStructures/class_entite.inc:61
 msgid "Administrative informations"
-msgstr ""
+msgstr "Administrative Informationen"
 
 #: admin/supannStructures/class_entite.inc:64
 #: admin/supannStructures/class_etablissement.inc:80
@@ -58,7 +59,7 @@ msgid "Telephone"
 msgstr "Telefon"
 
 #: admin/supannStructures/class_entite.inc:64
-msgid "Phone number for this entity"
+msgid "Phone number for this entite"
 msgstr ""
 
 #: admin/supannStructures/class_entite.inc:68
@@ -67,7 +68,7 @@ msgid "Fax"
 msgstr "Fax"
 
 #: admin/supannStructures/class_entite.inc:68
-msgid "Fax number for this entity"
+msgid "Fax number for this entite"
 msgstr ""
 
 #: admin/supannStructures/class_entite.inc:72
@@ -75,7 +76,7 @@ msgid "Postal address"
 msgstr "Adresse"
 
 #: admin/supannStructures/class_entite.inc:72
-msgid "Postal address of this entity"
+msgid "Postal address of this entite"
 msgstr ""
 
 #: admin/supannStructures/class_entite.inc:76
@@ -84,57 +85,58 @@ msgid "Description"
 msgstr "Beschreibung"
 
 #: admin/supannStructures/class_entite.inc:76
-msgid "Short description of this entity"
+msgid "Short description of this entite"
 msgstr ""
 
 #: admin/supannStructures/class_entite.inc:82
 msgid "SUPANN informations"
-msgstr ""
+msgstr "SUPANN-Informationen"
 
 #: admin/supannStructures/class_entite.inc:85
-msgid "Entity type"
+#: personal/supann/class_supannAccount.inc:438
+msgid "Entite type"
 msgstr ""
 
 #: admin/supannStructures/class_entite.inc:85
-msgid "The best SUPANN type that fits this entity"
+msgid "The best SUPANN type that fits this entite"
 msgstr ""
 
 #: admin/supannStructures/class_entite.inc:89
-msgid "Entity code"
+msgid "Entite code"
 msgstr ""
 
 #: admin/supannStructures/class_entite.inc:89
-msgid "The SUPANN code of this entity"
+msgid "The SUPANN code of this entite"
 msgstr ""
 
 #: admin/supannStructures/class_entite.inc:94
-msgid "Parent entity"
+msgid "Parent entite"
 msgstr ""
 
 #: admin/supannStructures/class_entite.inc:94
-msgid "The parent entity of this entity"
+msgid "The parent entite of this entite"
 msgstr ""
 
 #: admin/supannStructures/class_entite.inc:98
 msgid "Reference ID"
-msgstr ""
+msgstr "Referenzkennung"
 
 #: admin/supannStructures/class_entite.inc:98
-msgid "SUPANN reference ID of this entity"
+msgid "SUPANN reference ID of this entite"
 msgstr ""
 
 #: admin/supannStructures/class_etablissement.inc:31
-#: personal/supann/class_supannAccount.inc:324
-#: personal/supann/class_supannAccount.inc:363
-msgid "Establishment"
+#: personal/supann/class_supannAccount.inc:316
+#: personal/supann/class_supannAccount.inc:355
+msgid "Etablissement"
 msgstr ""
 
 #: admin/supannStructures/class_etablissement.inc:32
-msgid "SUPANN Establishment Settings"
+msgid "SUPANN Etablissement Settings"
 msgstr ""
 
 #: admin/supannStructures/class_etablissement.inc:35
-msgid "SUPANN Establishment"
+msgid "SUPANN Etablissement"
 msgstr ""
 
 #: admin/supannStructures/class_etablissement.inc:52
@@ -142,19 +144,19 @@ msgid "Properties"
 msgstr "Eigenschaften"
 
 #: admin/supannStructures/class_etablissement.inc:55
-msgid "Root Establishment"
+msgid "Root etablissement"
 msgstr ""
 
 #: admin/supannStructures/class_etablissement.inc:55
-msgid "Set this Establishment as the root one"
+msgid "Set this etablissement as the root one"
 msgstr ""
 
 #: admin/supannStructures/class_etablissement.inc:59
-msgid "The name to write in the o attribute for this Establishment"
+msgid "The name to write in the o attribute for this etablissement"
 msgstr ""
 
 #: admin/supannStructures/class_etablissement.inc:63
-msgid "A short description of this Establishment"
+msgid "A short description of this etablissement"
 msgstr ""
 
 #: admin/supannStructures/class_etablissement.inc:69
@@ -163,7 +165,7 @@ msgid "Location"
 msgstr "Ort"
 
 #: admin/supannStructures/class_etablissement.inc:72
-msgid "Usually the city where this Establishment is"
+msgid "Usually the city in which is this etablissement"
 msgstr ""
 
 #: admin/supannStructures/class_etablissement.inc:76
@@ -171,35 +173,35 @@ msgid "Address"
 msgstr "Adresse"
 
 #: admin/supannStructures/class_etablissement.inc:76
-msgid "The postal address of this Establishment"
+msgid "The postal address of this etablissement"
 msgstr ""
 
 #: admin/supannStructures/class_etablissement.inc:80
-msgid "Phone number for this Establishment"
+msgid "Phone number for this etablissement"
 msgstr ""
 
 #: admin/supannStructures/class_etablissement.inc:84
-msgid "Fax number for this Establishment"
+msgid "Fax number for this etablissement"
 msgstr ""
 
 #: admin/supannStructures/class_etablissement.inc:90
 msgid "SUPANN properties"
-msgstr ""
+msgstr "SUPANN-Eigenschaften"
 
 #: admin/supannStructures/class_etablissement.inc:93
-msgid "Establishment code"
+msgid "Etablissement code"
 msgstr ""
 
 #: admin/supannStructures/class_etablissement.inc:93
-msgid "The code of this Establishment (must have a prefix between {})"
+msgid "The code of this etablissement (must have a prefix between {})"
 msgstr ""
 
 #: admin/supannStructures/class_etablissement.inc:98
 msgid "SUPANN code"
-msgstr ""
+msgstr "SUPANN-Code"
 
 #: admin/supannStructures/class_etablissement.inc:98
-msgid "The SUPANN code for this Establishment"
+msgid "The SUPANN code for this etablissement"
 msgstr ""
 
 #: admin/supannStructures/class_etablissement.inc:103
@@ -207,7 +209,7 @@ msgid "Legal name"
 msgstr ""
 
 #: admin/supannStructures/class_etablissement.inc:103
-msgid "The legal name of this Establishment"
+msgid "The legal name of this etablissement"
 msgstr ""
 
 #: admin/supannStructures/class_etablissement.inc:107
@@ -215,7 +217,7 @@ msgid "Home page URI"
 msgstr ""
 
 #: admin/supannStructures/class_etablissement.inc:107
-msgid "The URI of this Establishment website home page"
+msgid "The URI of this etablissement website home page"
 msgstr ""
 
 #: admin/supannStructures/class_etablissement.inc:111
@@ -223,7 +225,7 @@ msgid "Institution URI"
 msgstr ""
 
 #: admin/supannStructures/class_etablissement.inc:111
-msgid "The URI of this Establishment institution website"
+msgid "The URI of this etablissement institution website"
 msgstr ""
 
 #: admin/supannStructures/class_etablissement.inc:115
@@ -231,12 +233,12 @@ msgid "White pages URI"
 msgstr ""
 
 #: admin/supannStructures/class_etablissement.inc:115
-msgid "The URI of this Establishment white pages"
+msgid "The URI of this etablissement white pages"
 msgstr ""
 
 #: admin/supannStructures/class_etablissement.inc:148
-#: admin/supannStructures/class_etablissement.inc:201
-#: admin/supannStructures/class_etablissement.inc:219
+#: admin/supannStructures/class_etablissement.inc:198
+#: admin/supannStructures/class_etablissement.inc:216
 msgid "LDAP error"
 msgstr "LDAP-Fehler"
 
@@ -247,7 +249,7 @@ msgstr "Dateifehler"
 #: admin/supannStructures/class_supann.inc:54
 #, php-format
 msgid "Cannot read file: '%s'"
-msgstr ""
+msgstr "Kann Datei nicht lesen: '%s'"
 
 #: personal/supann/class_supannAccount.inc:35
 #: personal/supann/class_supannAccount.inc:109
@@ -356,256 +358,243 @@ msgstr ""
 msgid "eduPersonNickName - Can contain a nick name for this user"
 msgstr ""
 
-#: personal/supann/class_supannAccount.inc:253
-msgid "Ref ids"
-msgstr ""
-
-#: personal/supann/class_supannAccount.inc:253
-msgid "supannRefId - IDs/links for this user on other systems"
-msgstr ""
-
-#: personal/supann/class_supannAccount.inc:262
+#: personal/supann/class_supannAccount.inc:254
 msgid "Contact"
 msgstr "Kontakt"
 
-#: personal/supann/class_supannAccount.inc:266
+#: personal/supann/class_supannAccount.inc:258
 msgid "Other phone numbers"
-msgstr ""
+msgstr "Andere Telefonnummern"
 
-#: personal/supann/class_supannAccount.inc:266
+#: personal/supann/class_supannAccount.inc:258
 msgid "supannAutreTelephone - Other phone numbers for this user"
 msgstr ""
 
-#: personal/supann/class_supannAccount.inc:272
+#: personal/supann/class_supannAccount.inc:264
 msgid "Other mail addresses"
-msgstr ""
+msgstr "Andere E-Mail-Adressen"
 
-#: personal/supann/class_supannAccount.inc:272
+#: personal/supann/class_supannAccount.inc:264
 msgid ""
 "supannAutreMail - Other mail addresses for this user. Each must be unique"
 msgstr ""
 
-#: personal/supann/class_supannAccount.inc:278
+#: personal/supann/class_supannAccount.inc:270
 msgid "Personal mail addresses"
 msgstr "PersÃ¶nliche E-Mail-Adressen"
 
-#: personal/supann/class_supannAccount.inc:278
+#: personal/supann/class_supannAccount.inc:270
 msgid "supannMailPerso - Personal mail addresses for this user"
 msgstr ""
 
-#: personal/supann/class_supannAccount.inc:283
-msgid "red List"
+#: personal/supann/class_supannAccount.inc:275
+msgid "Liste rouge"
 msgstr ""
 
-#: personal/supann/class_supannAccount.inc:283
+#: personal/supann/class_supannAccount.inc:275
 msgid "supannListeRouge - Should this person be on the red list"
 msgstr ""
 
-#: personal/supann/class_supannAccount.inc:289
+#: personal/supann/class_supannAccount.inc:281
 msgid "Affectation"
 msgstr ""
 
-#: personal/supann/class_supannAccount.inc:292
-msgid "Entity primary assignment"
+#: personal/supann/class_supannAccount.inc:284
+msgid "Entite affectation principale"
 msgstr ""
 
-#: personal/supann/class_supannAccount.inc:292
+#: personal/supann/class_supannAccount.inc:284
 msgid "supannEntiteAffectationPrincipale"
 msgstr ""
 
-#: personal/supann/class_supannAccount.inc:297
-#: personal/supann/class_supannAccount.inc:388
-#: personal/supann/class_supannAccount.inc:450
-msgid "Entity assignment"
+#: personal/supann/class_supannAccount.inc:289
+#: personal/supann/class_supannAccount.inc:380
+msgid "Entite affectation"
 msgstr ""
 
-#: personal/supann/class_supannAccount.inc:297
-#: personal/supann/class_supannAccount.inc:450
+#: personal/supann/class_supannAccount.inc:289
+#: personal/supann/class_supannAccount.inc:442
 msgid "supannEntiteAffectation"
 msgstr ""
 
-#: personal/supann/class_supannAccount.inc:303
-msgid "Entity type assignment"
+#: personal/supann/class_supannAccount.inc:295
+msgid "Type entite affectation"
 msgstr ""
 
-#: personal/supann/class_supannAccount.inc:303
-#: personal/supann/class_supannAccount.inc:446
+#: personal/supann/class_supannAccount.inc:295
+#: personal/supann/class_supannAccount.inc:438
 msgid "supannTypeEntiteAffectation"
 msgstr ""
 
-#: personal/supann/class_supannAccount.inc:310
+#: personal/supann/class_supannAccount.inc:302
 msgid "Affiliation"
 msgstr ""
 
-#: personal/supann/class_supannAccount.inc:313
+#: personal/supann/class_supannAccount.inc:305
 msgid "Primary affiliation"
 msgstr ""
 
-#: personal/supann/class_supannAccount.inc:313
+#: personal/supann/class_supannAccount.inc:305
 msgid "eduPersonPrimaryAffiliation"
 msgstr ""
 
-#: personal/supann/class_supannAccount.inc:318
+#: personal/supann/class_supannAccount.inc:310
 msgid "Affiliations"
 msgstr ""
 
-#: personal/supann/class_supannAccount.inc:318
+#: personal/supann/class_supannAccount.inc:310
 msgid "eduPersonAffiliation"
 msgstr ""
 
-#: personal/supann/class_supannAccount.inc:324
+#: personal/supann/class_supannAccount.inc:316
 msgid "supannEtablissement"
 msgstr ""
 
-#: personal/supann/class_supannAccount.inc:331
+#: personal/supann/class_supannAccount.inc:323
 msgid "Student profile"
 msgstr ""
 
-#: personal/supann/class_supannAccount.inc:334
+#: personal/supann/class_supannAccount.inc:326
 msgid "INE code"
-msgstr ""
+msgstr "INE-Code"
 
-#: personal/supann/class_supannAccount.inc:334
+#: personal/supann/class_supannAccount.inc:326
 msgid "supannCodeINE - INE code of this student"
 msgstr ""
 
-#: personal/supann/class_supannAccount.inc:338
+#: personal/supann/class_supannAccount.inc:330
 msgid "Student ID"
 msgstr ""
 
-#: personal/supann/class_supannAccount.inc:338
+#: personal/supann/class_supannAccount.inc:330
 msgid "supannEtuId - scolarity id"
 msgstr ""
 
-#: personal/supann/class_supannAccount.inc:344
+#: personal/supann/class_supannAccount.inc:336
 msgid "Student subscriptions"
 msgstr ""
 
-#: personal/supann/class_supannAccount.inc:359
+#: personal/supann/class_supannAccount.inc:351
 msgid "supannEtuInscription - Subscriptions for this student"
 msgstr ""
 
-#: personal/supann/class_supannAccount.inc:363
+#: personal/supann/class_supannAccount.inc:355
 msgid ""
 "supannEtablissement - Etablissement in which this subscription was done"
 msgstr ""
 
-#: personal/supann/class_supannAccount.inc:367
+#: personal/supann/class_supannAccount.inc:359
 msgid "Year"
 msgstr "Jahr"
 
-#: personal/supann/class_supannAccount.inc:367
+#: personal/supann/class_supannAccount.inc:359
 msgid "supannEtuAnneeInscription - The year this subscription will begin"
 msgstr ""
 
-#: personal/supann/class_supannAccount.inc:372
+#: personal/supann/class_supannAccount.inc:364
 msgid "Subscription type"
 msgstr ""
 
-#: personal/supann/class_supannAccount.inc:372
+#: personal/supann/class_supannAccount.inc:364
 msgid "supannEtuRegimeInscription - The type of this subscription"
 msgstr ""
 
-#: personal/supann/class_supannAccount.inc:376
-msgid "Disciplinary Sector"
+#: personal/supann/class_supannAccount.inc:368
+msgid "Secteur Disciplinaire"
 msgstr ""
 
-#: personal/supann/class_supannAccount.inc:376
+#: personal/supann/class_supannAccount.inc:368
 msgid "supannEtuSecteurDisciplinaire"
 msgstr ""
 
-#: personal/supann/class_supannAccount.inc:380
+#: personal/supann/class_supannAccount.inc:372
 msgid "Diploma type"
 msgstr ""
 
-#: personal/supann/class_supannAccount.inc:380
+#: personal/supann/class_supannAccount.inc:372
 msgid "supannEtuTypeDiplome - Type of diploma"
 msgstr ""
 
-#: personal/supann/class_supannAccount.inc:384
-msgid "Curriculum year "
+#: personal/supann/class_supannAccount.inc:376
+msgid "Cursus annee"
 msgstr ""
 
-#: personal/supann/class_supannAccount.inc:384
+#: personal/supann/class_supannAccount.inc:376
 msgid "supannEtuCursusAnnee"
 msgstr ""
 
-#: personal/supann/class_supannAccount.inc:388
+#: personal/supann/class_supannAccount.inc:380
 msgid "supannEntiteAffectation_affect"
 msgstr ""
 
-#: personal/supann/class_supannAccount.inc:392
+#: personal/supann/class_supannAccount.inc:384
 msgid "Diploma"
 msgstr "Diplom"
 
-#: personal/supann/class_supannAccount.inc:392
+#: personal/supann/class_supannAccount.inc:384
 msgid "supannEtuDiplome"
 msgstr ""
 
-#: personal/supann/class_supannAccount.inc:396
+#: personal/supann/class_supannAccount.inc:388
 msgid "Step"
 msgstr "Schritt"
 
-#: personal/supann/class_supannAccount.inc:396
+#: personal/supann/class_supannAccount.inc:388
 msgid "supannEtuEtape"
 msgstr ""
 
-#: personal/supann/class_supannAccount.inc:400
+#: personal/supann/class_supannAccount.inc:392
 msgid "educational element"
 msgstr ""
 
-#: personal/supann/class_supannAccount.inc:400
+#: personal/supann/class_supannAccount.inc:392
 msgid "supannEtuElementPedagogique"
 msgstr ""
 
-#: personal/supann/class_supannAccount.inc:412
-msgid "Personal profile"
-msgstr ""
+#: personal/supann/class_supannAccount.inc:404
+msgid "Personnal profile"
+msgstr "PersÃ¶nliches Profil"
 
-#: personal/supann/class_supannAccount.inc:415
+#: personal/supann/class_supannAccount.inc:407
 msgid "Personal ID"
 msgstr "PersÃ¶nliche Kennung"
 
-#: personal/supann/class_supannAccount.inc:415
+#: personal/supann/class_supannAccount.inc:407
 msgid "supannEmpId"
 msgstr ""
 
-#: personal/supann/class_supannAccount.inc:419
+#: personal/supann/class_supannAccount.inc:411
 msgid "Personal corps"
 msgstr ""
 
-#: personal/supann/class_supannAccount.inc:419
+#: personal/supann/class_supannAccount.inc:411
 msgid "supannEmpCorps"
 msgstr ""
 
-#: personal/supann/class_supannAccount.inc:424
-msgid "Activity"
+#: personal/supann/class_supannAccount.inc:416
+msgid "Activite"
 msgstr ""
 
-#: personal/supann/class_supannAccount.inc:424
+#: personal/supann/class_supannAccount.inc:416
 msgid "supannActivite"
 msgstr ""
 
-#: personal/supann/class_supannAccount.inc:431
+#: personal/supann/class_supannAccount.inc:423
 msgid "Roles"
 msgstr "Rollen"
 
-#: personal/supann/class_supannAccount.inc:438
+#: personal/supann/class_supannAccount.inc:430
 msgid "supannRoleEntite"
 msgstr ""
 
-#: personal/supann/class_supannAccount.inc:442
+#: personal/supann/class_supannAccount.inc:434
 msgid "Generic role"
-msgstr ""
+msgstr "Generische Rolle"
 
-#: personal/supann/class_supannAccount.inc:442
+#: personal/supann/class_supannAccount.inc:434
 msgid "supannRoleGenerique"
 msgstr ""
 
-#: personal/supann/class_supannAccount.inc:446
-msgid "Entity assignment type"
-msgstr ""
-
 #: config/supann/class_supannConfig.inc:28
 msgid "SUPANN configuration"
 msgstr "SUPANN-Konfiguration"
diff --git a/supann/locale/el_GR/fusiondirectory.po b/supann/locale/el_GR/fusiondirectory.po
new file mode 100644
index 0000000000000000000000000000000000000000..cde6f790d8de195d6c32553106ea848841100c05
--- /dev/null
+++ b/supann/locale/el_GR/fusiondirectory.po
@@ -0,0 +1,615 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR FusionDirectory Project
+# This file is distributed under the same license as the PACKAGE package.
+# 
+# Translators:
+msgid ""
+msgstr ""
+"Project-Id-Version: FusionDirectory-109\n"
+"Report-Msgid-Bugs-To: documentation@lists.fusiondirectory.org\n"
+"POT-Creation-Date: 2014-12-15 17:47+0100\n"
+"PO-Revision-Date: 2015-05-30 11:45+0000\n"
+"Last-Translator: Benoit Mortier <benoit.mortier@opensides.be>\n"
+"Language-Team: Greek (Greece) (http://www.transifex.com/projects/p/FusionDirectory-109/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/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
+#: personal/supann/class_supannAccount.inc:442
+msgid "Entite"
+msgstr ""
+
+#: admin/supannStructures/class_entite.inc:32
+msgid "SUPANN Entite Settings"
+msgstr ""
+
+#: admin/supannStructures/class_entite.inc:35
+msgid "SUPANN Entite"
+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 entite"
+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 entite"
+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 entite"
+msgstr ""
+
+#: admin/supannStructures/class_entite.inc:72
+msgid "Postal address"
+msgstr ""
+
+#: admin/supannStructures/class_entite.inc:72
+msgid "Postal address of this entite"
+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 entite"
+msgstr ""
+
+#: admin/supannStructures/class_entite.inc:82
+msgid "SUPANN informations"
+msgstr ""
+
+#: admin/supannStructures/class_entite.inc:85
+#: personal/supann/class_supannAccount.inc:438
+msgid "Entite type"
+msgstr ""
+
+#: admin/supannStructures/class_entite.inc:85
+msgid "The best SUPANN type that fits this entite"
+msgstr ""
+
+#: admin/supannStructures/class_entite.inc:89
+msgid "Entite code"
+msgstr ""
+
+#: admin/supannStructures/class_entite.inc:89
+msgid "The SUPANN code of this entite"
+msgstr ""
+
+#: admin/supannStructures/class_entite.inc:94
+msgid "Parent entite"
+msgstr ""
+
+#: admin/supannStructures/class_entite.inc:94
+msgid "The parent entite of this entite"
+msgstr ""
+
+#: admin/supannStructures/class_entite.inc:98
+msgid "Reference ID"
+msgstr ""
+
+#: admin/supannStructures/class_entite.inc:98
+msgid "SUPANN reference ID of this entite"
+msgstr ""
+
+#: admin/supannStructures/class_etablissement.inc:31
+#: personal/supann/class_supannAccount.inc:316
+#: personal/supann/class_supannAccount.inc:355
+msgid "Etablissement"
+msgstr ""
+
+#: admin/supannStructures/class_etablissement.inc:32
+msgid "SUPANN Etablissement Settings"
+msgstr ""
+
+#: admin/supannStructures/class_etablissement.inc:35
+msgid "SUPANN Etablissement"
+msgstr ""
+
+#: admin/supannStructures/class_etablissement.inc:52
+msgid "Properties"
+msgstr ""
+
+#: admin/supannStructures/class_etablissement.inc:55
+msgid "Root etablissement"
+msgstr ""
+
+#: admin/supannStructures/class_etablissement.inc:55
+msgid "Set this etablissement as the root one"
+msgstr ""
+
+#: admin/supannStructures/class_etablissement.inc:59
+msgid "The name to write in the o attribute for this etablissement"
+msgstr ""
+
+#: admin/supannStructures/class_etablissement.inc:63
+msgid "A short description of this etablissement"
+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 in which is this etablissement"
+msgstr ""
+
+#: admin/supannStructures/class_etablissement.inc:76
+msgid "Address"
+msgstr ""
+
+#: admin/supannStructures/class_etablissement.inc:76
+msgid "The postal address of this etablissement"
+msgstr ""
+
+#: admin/supannStructures/class_etablissement.inc:80
+msgid "Phone number for this etablissement"
+msgstr ""
+
+#: admin/supannStructures/class_etablissement.inc:84
+msgid "Fax number for this etablissement"
+msgstr ""
+
+#: admin/supannStructures/class_etablissement.inc:90
+msgid "SUPANN properties"
+msgstr ""
+
+#: admin/supannStructures/class_etablissement.inc:93
+msgid "Etablissement code"
+msgstr ""
+
+#: admin/supannStructures/class_etablissement.inc:93
+msgid "The code of this etablissement (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 etablissement"
+msgstr ""
+
+#: admin/supannStructures/class_etablissement.inc:103
+msgid "Legal name"
+msgstr ""
+
+#: admin/supannStructures/class_etablissement.inc:103
+msgid "The legal name of this etablissement"
+msgstr ""
+
+#: admin/supannStructures/class_etablissement.inc:107
+msgid "Home page URI"
+msgstr ""
+
+#: admin/supannStructures/class_etablissement.inc:107
+msgid "The URI of this etablissement 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 etablissement 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 etablissement white pages"
+msgstr ""
+
+#: admin/supannStructures/class_etablissement.inc:148
+#: admin/supannStructures/class_etablissement.inc:198
+#: admin/supannStructures/class_etablissement.inc:216
+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:35
+#: personal/supann/class_supannAccount.inc:109
+msgid "None"
+msgstr ""
+
+#: personal/supann/class_supannAccount.inc:106
+msgid "Licence"
+msgstr ""
+
+#: personal/supann/class_supannAccount.inc:106
+msgid "Master"
+msgstr ""
+
+#: personal/supann/class_supannAccount.inc:106
+msgid "Ph.D."
+msgstr ""
+
+#: personal/supann/class_supannAccount.inc:106
+msgid "Another class of degree"
+msgstr ""
+
+#: personal/supann/class_supannAccount.inc:106
+msgid "post-graduate year"
+msgstr ""
+
+#: personal/supann/class_supannAccount.inc:109
+msgid "1st year"
+msgstr ""
+
+#: personal/supann/class_supannAccount.inc:109
+msgid "2nd year"
+msgstr ""
+
+#: personal/supann/class_supannAccount.inc:109
+msgid "3rd year"
+msgstr ""
+
+#: personal/supann/class_supannAccount.inc:110
+msgid "4th year"
+msgstr ""
+
+#: personal/supann/class_supannAccount.inc:110
+msgid "5th year"
+msgstr ""
+
+#: personal/supann/class_supannAccount.inc:110
+msgid "6th year"
+msgstr ""
+
+#: personal/supann/class_supannAccount.inc:111
+msgid "7th year"
+msgstr ""
+
+#: personal/supann/class_supannAccount.inc:111
+msgid "8th year"
+msgstr ""
+
+#: personal/supann/class_supannAccount.inc:111
+msgid "9th year"
+msgstr ""
+
+#: personal/supann/class_supannAccount.inc:214
+msgid "SupAnn"
+msgstr ""
+
+#: personal/supann/class_supannAccount.inc:215
+msgid "SupAnn informations management plugin"
+msgstr ""
+
+#: personal/supann/class_supannAccount.inc:232
+msgid "Identity"
+msgstr ""
+
+#: personal/supann/class_supannAccount.inc:235
+msgid "Civilite"
+msgstr ""
+
+#: personal/supann/class_supannAccount.inc:235
+msgid "supannCivilite - Civilte for this person"
+msgstr ""
+
+#: personal/supann/class_supannAccount.inc:240
+msgid "Alias login"
+msgstr ""
+
+#: personal/supann/class_supannAccount.inc:240
+msgid "supannAliasLogin - An alias for the login of this user"
+msgstr ""
+
+#: personal/supann/class_supannAccount.inc:244
+msgid "eduPersonPrincipalName"
+msgstr ""
+
+#: personal/supann/class_supannAccount.inc:244
+msgid ""
+"eduPersonPrincipalName - A name that look like <id>@<domain> which is unique"
+" for this domain, and has not be assigned to anyone else recently"
+msgstr ""
+
+#: personal/supann/class_supannAccount.inc:248
+msgid "Nick name"
+msgstr ""
+
+#: personal/supann/class_supannAccount.inc:248
+msgid "eduPersonNickName - Can contain a nick name for this user"
+msgstr ""
+
+#: personal/supann/class_supannAccount.inc:254
+msgid "Contact"
+msgstr ""
+
+#: personal/supann/class_supannAccount.inc:258
+msgid "Other phone numbers"
+msgstr ""
+
+#: personal/supann/class_supannAccount.inc:258
+msgid "supannAutreTelephone - Other phone numbers for this user"
+msgstr ""
+
+#: personal/supann/class_supannAccount.inc:264
+msgid "Other mail addresses"
+msgstr ""
+
+#: personal/supann/class_supannAccount.inc:264
+msgid ""
+"supannAutreMail - Other mail addresses for this user. Each must be unique"
+msgstr ""
+
+#: personal/supann/class_supannAccount.inc:270
+msgid "Personal mail addresses"
+msgstr ""
+
+#: personal/supann/class_supannAccount.inc:270
+msgid "supannMailPerso - Personal mail addresses for this user"
+msgstr ""
+
+#: personal/supann/class_supannAccount.inc:275
+msgid "Liste rouge"
+msgstr ""
+
+#: personal/supann/class_supannAccount.inc:275
+msgid "supannListeRouge - Should this person be on the red list"
+msgstr ""
+
+#: personal/supann/class_supannAccount.inc:281
+msgid "Affectation"
+msgstr ""
+
+#: personal/supann/class_supannAccount.inc:284
+msgid "Entite affectation principale"
+msgstr ""
+
+#: personal/supann/class_supannAccount.inc:284
+msgid "supannEntiteAffectationPrincipale"
+msgstr ""
+
+#: personal/supann/class_supannAccount.inc:289
+#: personal/supann/class_supannAccount.inc:380
+msgid "Entite affectation"
+msgstr ""
+
+#: personal/supann/class_supannAccount.inc:289
+#: personal/supann/class_supannAccount.inc:442
+msgid "supannEntiteAffectation"
+msgstr ""
+
+#: personal/supann/class_supannAccount.inc:295
+msgid "Type entite affectation"
+msgstr ""
+
+#: personal/supann/class_supannAccount.inc:295
+#: personal/supann/class_supannAccount.inc:438
+msgid "supannTypeEntiteAffectation"
+msgstr ""
+
+#: personal/supann/class_supannAccount.inc:302
+msgid "Affiliation"
+msgstr ""
+
+#: personal/supann/class_supannAccount.inc:305
+msgid "Primary affiliation"
+msgstr ""
+
+#: personal/supann/class_supannAccount.inc:305
+msgid "eduPersonPrimaryAffiliation"
+msgstr ""
+
+#: personal/supann/class_supannAccount.inc:310
+msgid "Affiliations"
+msgstr ""
+
+#: personal/supann/class_supannAccount.inc:310
+msgid "eduPersonAffiliation"
+msgstr ""
+
+#: personal/supann/class_supannAccount.inc:316
+msgid "supannEtablissement"
+msgstr ""
+
+#: personal/supann/class_supannAccount.inc:323
+msgid "Student profile"
+msgstr ""
+
+#: personal/supann/class_supannAccount.inc:326
+msgid "INE code"
+msgstr ""
+
+#: personal/supann/class_supannAccount.inc:326
+msgid "supannCodeINE - INE code of this student"
+msgstr ""
+
+#: personal/supann/class_supannAccount.inc:330
+msgid "Student ID"
+msgstr ""
+
+#: personal/supann/class_supannAccount.inc:330
+msgid "supannEtuId - scolarity id"
+msgstr ""
+
+#: personal/supann/class_supannAccount.inc:336
+msgid "Student subscriptions"
+msgstr ""
+
+#: personal/supann/class_supannAccount.inc:351
+msgid "supannEtuInscription - Subscriptions for this student"
+msgstr ""
+
+#: personal/supann/class_supannAccount.inc:355
+msgid ""
+"supannEtablissement - Etablissement in which this subscription was done"
+msgstr ""
+
+#: personal/supann/class_supannAccount.inc:359
+msgid "Year"
+msgstr ""
+
+#: personal/supann/class_supannAccount.inc:359
+msgid "supannEtuAnneeInscription - The year this subscription will begin"
+msgstr ""
+
+#: personal/supann/class_supannAccount.inc:364
+msgid "Subscription type"
+msgstr ""
+
+#: personal/supann/class_supannAccount.inc:364
+msgid "supannEtuRegimeInscription - The type of this subscription"
+msgstr ""
+
+#: personal/supann/class_supannAccount.inc:368
+msgid "Secteur Disciplinaire"
+msgstr ""
+
+#: personal/supann/class_supannAccount.inc:368
+msgid "supannEtuSecteurDisciplinaire"
+msgstr ""
+
+#: personal/supann/class_supannAccount.inc:372
+msgid "Diploma type"
+msgstr ""
+
+#: personal/supann/class_supannAccount.inc:372
+msgid "supannEtuTypeDiplome - Type of diploma"
+msgstr ""
+
+#: personal/supann/class_supannAccount.inc:376
+msgid "Cursus annee"
+msgstr ""
+
+#: personal/supann/class_supannAccount.inc:376
+msgid "supannEtuCursusAnnee"
+msgstr ""
+
+#: personal/supann/class_supannAccount.inc:380
+msgid "supannEntiteAffectation_affect"
+msgstr ""
+
+#: personal/supann/class_supannAccount.inc:384
+msgid "Diploma"
+msgstr ""
+
+#: personal/supann/class_supannAccount.inc:384
+msgid "supannEtuDiplome"
+msgstr ""
+
+#: personal/supann/class_supannAccount.inc:388
+msgid "Step"
+msgstr ""
+
+#: personal/supann/class_supannAccount.inc:388
+msgid "supannEtuEtape"
+msgstr ""
+
+#: personal/supann/class_supannAccount.inc:392
+msgid "educational element"
+msgstr ""
+
+#: personal/supann/class_supannAccount.inc:392
+msgid "supannEtuElementPedagogique"
+msgstr ""
+
+#: personal/supann/class_supannAccount.inc:404
+msgid "Personnal profile"
+msgstr ""
+
+#: personal/supann/class_supannAccount.inc:407
+msgid "Personal ID"
+msgstr ""
+
+#: personal/supann/class_supannAccount.inc:407
+msgid "supannEmpId"
+msgstr ""
+
+#: personal/supann/class_supannAccount.inc:411
+msgid "Personal corps"
+msgstr ""
+
+#: personal/supann/class_supannAccount.inc:411
+msgid "supannEmpCorps"
+msgstr ""
+
+#: personal/supann/class_supannAccount.inc:416
+msgid "Activite"
+msgstr ""
+
+#: personal/supann/class_supannAccount.inc:416
+msgid "supannActivite"
+msgstr ""
+
+#: personal/supann/class_supannAccount.inc:423
+msgid "Roles"
+msgstr ""
+
+#: personal/supann/class_supannAccount.inc:430
+msgid "supannRoleEntite"
+msgstr ""
+
+#: personal/supann/class_supannAccount.inc:434
+msgid "Generic role"
+msgstr ""
+
+#: personal/supann/class_supannAccount.inc:434
+msgid "supannRoleGenerique"
+msgstr ""
+
+#: config/supann/class_supannConfig.inc:28
+msgid "SUPANN configuration"
+msgstr ""
+
+#: config/supann/class_supannConfig.inc:29
+msgid "FusionDirectory SUPANN plugin configuration"
+msgstr ""
+
+#: config/supann/class_supannConfig.inc:42
+msgid "SUPANN"
+msgstr ""
+
+#: config/supann/class_supannConfig.inc:45
+msgid "SUPANN RDN"
+msgstr ""
+
+#: config/supann/class_supannConfig.inc:45
+msgid "Branch in which SUPANN structures will be stored"
+msgstr ""
diff --git a/supann/locale/en/fusiondirectory.po b/supann/locale/en/fusiondirectory.po
index bc038b5ae87ae51283b6b83e6e5c5ff922fc6242..eb8d5725077180216e057e003ba329923cf7d0eb 100644
--- a/supann/locale/en/fusiondirectory.po
+++ b/supann/locale/en/fusiondirectory.po
@@ -6,13 +6,13 @@
 #, fuzzy
 msgid ""
 msgstr ""
-"Project-Id-Version: PACKAGE VERSION\n"
-"Report-Msgid-Bugs-To: documentation@lists.fusiondirectory.org\n"
-"POT-Creation-Date: 2015-03-31 11:49+0200\n"
+"Project-Id-Version: FusionDirectory VERSION\n"
+"Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
+"POT-Creation-Date: 2015-05-30 15:30+0200\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
-"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
-"Language-Team: LANGUAGE <LL@li.org>\n"
-"Language: \n"
+"Last-Translator: FusionDirectory project <contact@fusiondirectory.org>\n"
+"Language-Team: English\n"
+"Language: en\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -234,8 +234,8 @@ msgid "The URI of this Establishment white pages"
 msgstr ""
 
 #: admin/supannStructures/class_etablissement.inc:148
-#: admin/supannStructures/class_etablissement.inc:201
-#: admin/supannStructures/class_etablissement.inc:219
+#: admin/supannStructures/class_etablissement.inc:198
+#: admin/supannStructures/class_etablissement.inc:216
 msgid "LDAP error"
 msgstr ""
 
diff --git a/supann/locale/es/fusiondirectory.po b/supann/locale/es/fusiondirectory.po
index c57a9f289f3f44ef0fb5206b25110dbe3d75f74e..327e493cacf5eb4fd312657e4d583e758f617f4f 100644
--- a/supann/locale/es/fusiondirectory.po
+++ b/supann/locale/es/fusiondirectory.po
@@ -5,12 +5,12 @@
 # Translators:
 msgid ""
 msgstr ""
-"Project-Id-Version: FusionDirectory-108\n"
+"Project-Id-Version: FusionDirectory-109\n"
 "Report-Msgid-Bugs-To: documentation@lists.fusiondirectory.org\n"
-"POT-Creation-Date: 2015-03-31 11:49+0200\n"
-"PO-Revision-Date: 2015-03-31 10:46+0000\n"
+"POT-Creation-Date: 2014-12-15 17:47+0100\n"
+"PO-Revision-Date: 2015-02-25 16:51+0000\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>\n"
-"Language-Team: Spanish (http://www.transifex.com/projects/p/FusionDirectory-108/language/es/)\n"
+"Language-Team: Spanish (http://www.transifex.com/projects/p/FusionDirectory-109/language/es/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -27,15 +27,16 @@ msgstr ""
 
 #: admin/supannStructures/class_entite.inc:31
 #: admin/supannStructures/class_entite.inc:52
-msgid "Entity"
+#: personal/supann/class_supannAccount.inc:442
+msgid "Entite"
 msgstr ""
 
 #: admin/supannStructures/class_entite.inc:32
-msgid "SUPANN Entity Settings"
+msgid "SUPANN Entite Settings"
 msgstr ""
 
 #: admin/supannStructures/class_entite.inc:35
-msgid "SUPANN Entity"
+msgid "SUPANN Entite"
 msgstr ""
 
 #: admin/supannStructures/class_entite.inc:55
@@ -44,7 +45,7 @@ msgid "Name"
 msgstr "Nombre"
 
 #: admin/supannStructures/class_entite.inc:55
-msgid "The name to write in the ou attribute for this entity"
+msgid "The name to write in the ou attribute for this entite"
 msgstr ""
 
 #: admin/supannStructures/class_entite.inc:61
@@ -57,7 +58,7 @@ msgid "Telephone"
 msgstr "TelÃ©fono"
 
 #: admin/supannStructures/class_entite.inc:64
-msgid "Phone number for this entity"
+msgid "Phone number for this entite"
 msgstr ""
 
 #: admin/supannStructures/class_entite.inc:68
@@ -66,7 +67,7 @@ msgid "Fax"
 msgstr "Fax"
 
 #: admin/supannStructures/class_entite.inc:68
-msgid "Fax number for this entity"
+msgid "Fax number for this entite"
 msgstr ""
 
 #: admin/supannStructures/class_entite.inc:72
@@ -74,7 +75,7 @@ msgid "Postal address"
 msgstr "CÃ³digo Postal"
 
 #: admin/supannStructures/class_entite.inc:72
-msgid "Postal address of this entity"
+msgid "Postal address of this entite"
 msgstr ""
 
 #: admin/supannStructures/class_entite.inc:76
@@ -83,7 +84,7 @@ msgid "Description"
 msgstr "DescripciÃ³n"
 
 #: admin/supannStructures/class_entite.inc:76
-msgid "Short description of this entity"
+msgid "Short description of this entite"
 msgstr ""
 
 #: admin/supannStructures/class_entite.inc:82
@@ -91,27 +92,28 @@ msgid "SUPANN informations"
 msgstr ""
 
 #: admin/supannStructures/class_entite.inc:85
-msgid "Entity type"
+#: personal/supann/class_supannAccount.inc:438
+msgid "Entite type"
 msgstr ""
 
 #: admin/supannStructures/class_entite.inc:85
-msgid "The best SUPANN type that fits this entity"
+msgid "The best SUPANN type that fits this entite"
 msgstr ""
 
 #: admin/supannStructures/class_entite.inc:89
-msgid "Entity code"
+msgid "Entite code"
 msgstr ""
 
 #: admin/supannStructures/class_entite.inc:89
-msgid "The SUPANN code of this entity"
+msgid "The SUPANN code of this entite"
 msgstr ""
 
 #: admin/supannStructures/class_entite.inc:94
-msgid "Parent entity"
+msgid "Parent entite"
 msgstr ""
 
 #: admin/supannStructures/class_entite.inc:94
-msgid "The parent entity of this entity"
+msgid "The parent entite of this entite"
 msgstr ""
 
 #: admin/supannStructures/class_entite.inc:98
@@ -119,21 +121,21 @@ msgid "Reference ID"
 msgstr ""
 
 #: admin/supannStructures/class_entite.inc:98
-msgid "SUPANN reference ID of this entity"
+msgid "SUPANN reference ID of this entite"
 msgstr ""
 
 #: admin/supannStructures/class_etablissement.inc:31
-#: personal/supann/class_supannAccount.inc:324
-#: personal/supann/class_supannAccount.inc:363
-msgid "Establishment"
+#: personal/supann/class_supannAccount.inc:316
+#: personal/supann/class_supannAccount.inc:355
+msgid "Etablissement"
 msgstr ""
 
 #: admin/supannStructures/class_etablissement.inc:32
-msgid "SUPANN Establishment Settings"
+msgid "SUPANN Etablissement Settings"
 msgstr ""
 
 #: admin/supannStructures/class_etablissement.inc:35
-msgid "SUPANN Establishment"
+msgid "SUPANN Etablissement"
 msgstr ""
 
 #: admin/supannStructures/class_etablissement.inc:52
@@ -141,19 +143,19 @@ msgid "Properties"
 msgstr "Propiedades"
 
 #: admin/supannStructures/class_etablissement.inc:55
-msgid "Root Establishment"
+msgid "Root etablissement"
 msgstr ""
 
 #: admin/supannStructures/class_etablissement.inc:55
-msgid "Set this Establishment as the root one"
+msgid "Set this etablissement as the root one"
 msgstr ""
 
 #: admin/supannStructures/class_etablissement.inc:59
-msgid "The name to write in the o attribute for this Establishment"
+msgid "The name to write in the o attribute for this etablissement"
 msgstr ""
 
 #: admin/supannStructures/class_etablissement.inc:63
-msgid "A short description of this Establishment"
+msgid "A short description of this etablissement"
 msgstr ""
 
 #: admin/supannStructures/class_etablissement.inc:69
@@ -162,7 +164,7 @@ msgid "Location"
 msgstr "LocalizaciÃ³n"
 
 #: admin/supannStructures/class_etablissement.inc:72
-msgid "Usually the city where this Establishment is"
+msgid "Usually the city in which is this etablissement"
 msgstr ""
 
 #: admin/supannStructures/class_etablissement.inc:76
@@ -170,15 +172,15 @@ msgid "Address"
 msgstr "DirecciÃ³n"
 
 #: admin/supannStructures/class_etablissement.inc:76
-msgid "The postal address of this Establishment"
+msgid "The postal address of this etablissement"
 msgstr ""
 
 #: admin/supannStructures/class_etablissement.inc:80
-msgid "Phone number for this Establishment"
+msgid "Phone number for this etablissement"
 msgstr ""
 
 #: admin/supannStructures/class_etablissement.inc:84
-msgid "Fax number for this Establishment"
+msgid "Fax number for this etablissement"
 msgstr ""
 
 #: admin/supannStructures/class_etablissement.inc:90
@@ -186,11 +188,11 @@ msgid "SUPANN properties"
 msgstr ""
 
 #: admin/supannStructures/class_etablissement.inc:93
-msgid "Establishment code"
+msgid "Etablissement code"
 msgstr ""
 
 #: admin/supannStructures/class_etablissement.inc:93
-msgid "The code of this Establishment (must have a prefix between {})"
+msgid "The code of this etablissement (must have a prefix between {})"
 msgstr ""
 
 #: admin/supannStructures/class_etablissement.inc:98
@@ -198,7 +200,7 @@ msgid "SUPANN code"
 msgstr ""
 
 #: admin/supannStructures/class_etablissement.inc:98
-msgid "The SUPANN code for this Establishment"
+msgid "The SUPANN code for this etablissement"
 msgstr ""
 
 #: admin/supannStructures/class_etablissement.inc:103
@@ -206,7 +208,7 @@ msgid "Legal name"
 msgstr ""
 
 #: admin/supannStructures/class_etablissement.inc:103
-msgid "The legal name of this Establishment"
+msgid "The legal name of this etablissement"
 msgstr ""
 
 #: admin/supannStructures/class_etablissement.inc:107
@@ -214,7 +216,7 @@ msgid "Home page URI"
 msgstr ""
 
 #: admin/supannStructures/class_etablissement.inc:107
-msgid "The URI of this Establishment website home page"
+msgid "The URI of this etablissement website home page"
 msgstr ""
 
 #: admin/supannStructures/class_etablissement.inc:111
@@ -222,7 +224,7 @@ msgid "Institution URI"
 msgstr ""
 
 #: admin/supannStructures/class_etablissement.inc:111
-msgid "The URI of this Establishment institution website"
+msgid "The URI of this etablissement institution website"
 msgstr ""
 
 #: admin/supannStructures/class_etablissement.inc:115
@@ -230,12 +232,12 @@ msgid "White pages URI"
 msgstr ""
 
 #: admin/supannStructures/class_etablissement.inc:115
-msgid "The URI of this Establishment white pages"
+msgid "The URI of this etablissement white pages"
 msgstr ""
 
 #: admin/supannStructures/class_etablissement.inc:148
-#: admin/supannStructures/class_etablissement.inc:201
-#: admin/supannStructures/class_etablissement.inc:219
+#: admin/supannStructures/class_etablissement.inc:198
+#: admin/supannStructures/class_etablissement.inc:216
 msgid "LDAP error"
 msgstr "Error LDAP"
 
@@ -355,256 +357,243 @@ msgstr ""
 msgid "eduPersonNickName - Can contain a nick name for this user"
 msgstr ""
 
-#: personal/supann/class_supannAccount.inc:253
-msgid "Ref ids"
-msgstr ""
-
-#: personal/supann/class_supannAccount.inc:253
-msgid "supannRefId - IDs/links for this user on other systems"
-msgstr ""
-
-#: personal/supann/class_supannAccount.inc:262
+#: personal/supann/class_supannAccount.inc:254
 msgid "Contact"
 msgstr "Contacto"
 
-#: personal/supann/class_supannAccount.inc:266
+#: personal/supann/class_supannAccount.inc:258
 msgid "Other phone numbers"
 msgstr ""
 
-#: personal/supann/class_supannAccount.inc:266
+#: personal/supann/class_supannAccount.inc:258
 msgid "supannAutreTelephone - Other phone numbers for this user"
 msgstr ""
 
-#: personal/supann/class_supannAccount.inc:272
+#: personal/supann/class_supannAccount.inc:264
 msgid "Other mail addresses"
 msgstr ""
 
-#: personal/supann/class_supannAccount.inc:272
+#: personal/supann/class_supannAccount.inc:264
 msgid ""
 "supannAutreMail - Other mail addresses for this user. Each must be unique"
 msgstr ""
 
-#: personal/supann/class_supannAccount.inc:278
+#: personal/supann/class_supannAccount.inc:270
 msgid "Personal mail addresses"
 msgstr ""
 
-#: personal/supann/class_supannAccount.inc:278
+#: personal/supann/class_supannAccount.inc:270
 msgid "supannMailPerso - Personal mail addresses for this user"
 msgstr ""
 
-#: personal/supann/class_supannAccount.inc:283
-msgid "red List"
+#: personal/supann/class_supannAccount.inc:275
+msgid "Liste rouge"
 msgstr ""
 
-#: personal/supann/class_supannAccount.inc:283
+#: personal/supann/class_supannAccount.inc:275
 msgid "supannListeRouge - Should this person be on the red list"
 msgstr ""
 
-#: personal/supann/class_supannAccount.inc:289
+#: personal/supann/class_supannAccount.inc:281
 msgid "Affectation"
 msgstr ""
 
-#: personal/supann/class_supannAccount.inc:292
-msgid "Entity primary assignment"
+#: personal/supann/class_supannAccount.inc:284
+msgid "Entite affectation principale"
 msgstr ""
 
-#: personal/supann/class_supannAccount.inc:292
+#: personal/supann/class_supannAccount.inc:284
 msgid "supannEntiteAffectationPrincipale"
 msgstr ""
 
-#: personal/supann/class_supannAccount.inc:297
-#: personal/supann/class_supannAccount.inc:388
-#: personal/supann/class_supannAccount.inc:450
-msgid "Entity assignment"
+#: personal/supann/class_supannAccount.inc:289
+#: personal/supann/class_supannAccount.inc:380
+msgid "Entite affectation"
 msgstr ""
 
-#: personal/supann/class_supannAccount.inc:297
-#: personal/supann/class_supannAccount.inc:450
+#: personal/supann/class_supannAccount.inc:289
+#: personal/supann/class_supannAccount.inc:442
 msgid "supannEntiteAffectation"
 msgstr ""
 
-#: personal/supann/class_supannAccount.inc:303
-msgid "Entity type assignment"
+#: personal/supann/class_supannAccount.inc:295
+msgid "Type entite affectation"
 msgstr ""
 
-#: personal/supann/class_supannAccount.inc:303
-#: personal/supann/class_supannAccount.inc:446
+#: personal/supann/class_supannAccount.inc:295
+#: personal/supann/class_supannAccount.inc:438
 msgid "supannTypeEntiteAffectation"
 msgstr ""
 
-#: personal/supann/class_supannAccount.inc:310
+#: personal/supann/class_supannAccount.inc:302
 msgid "Affiliation"
 msgstr ""
 
-#: personal/supann/class_supannAccount.inc:313
+#: personal/supann/class_supannAccount.inc:305
 msgid "Primary affiliation"
 msgstr ""
 
-#: personal/supann/class_supannAccount.inc:313
+#: personal/supann/class_supannAccount.inc:305
 msgid "eduPersonPrimaryAffiliation"
 msgstr ""
 
-#: personal/supann/class_supannAccount.inc:318
+#: personal/supann/class_supannAccount.inc:310
 msgid "Affiliations"
 msgstr ""
 
-#: personal/supann/class_supannAccount.inc:318
+#: personal/supann/class_supannAccount.inc:310
 msgid "eduPersonAffiliation"
 msgstr ""
 
-#: personal/supann/class_supannAccount.inc:324
+#: personal/supann/class_supannAccount.inc:316
 msgid "supannEtablissement"
 msgstr "supannEtablissement"
 
-#: personal/supann/class_supannAccount.inc:331
+#: personal/supann/class_supannAccount.inc:323
 msgid "Student profile"
 msgstr ""
 
-#: personal/supann/class_supannAccount.inc:334
+#: personal/supann/class_supannAccount.inc:326
 msgid "INE code"
 msgstr ""
 
-#: personal/supann/class_supannAccount.inc:334
+#: personal/supann/class_supannAccount.inc:326
 msgid "supannCodeINE - INE code of this student"
 msgstr ""
 
-#: personal/supann/class_supannAccount.inc:338
+#: personal/supann/class_supannAccount.inc:330
 msgid "Student ID"
 msgstr ""
 
-#: personal/supann/class_supannAccount.inc:338
+#: personal/supann/class_supannAccount.inc:330
 msgid "supannEtuId - scolarity id"
 msgstr ""
 
-#: personal/supann/class_supannAccount.inc:344
+#: personal/supann/class_supannAccount.inc:336
 msgid "Student subscriptions"
 msgstr ""
 
-#: personal/supann/class_supannAccount.inc:359
+#: personal/supann/class_supannAccount.inc:351
 msgid "supannEtuInscription - Subscriptions for this student"
 msgstr ""
 
-#: personal/supann/class_supannAccount.inc:363
+#: personal/supann/class_supannAccount.inc:355
 msgid ""
 "supannEtablissement - Etablissement in which this subscription was done"
 msgstr ""
 
-#: personal/supann/class_supannAccount.inc:367
+#: personal/supann/class_supannAccount.inc:359
 msgid "Year"
 msgstr "AÃ±o"
 
-#: personal/supann/class_supannAccount.inc:367
+#: personal/supann/class_supannAccount.inc:359
 msgid "supannEtuAnneeInscription - The year this subscription will begin"
 msgstr ""
 
-#: personal/supann/class_supannAccount.inc:372
+#: personal/supann/class_supannAccount.inc:364
 msgid "Subscription type"
 msgstr ""
 
-#: personal/supann/class_supannAccount.inc:372
+#: personal/supann/class_supannAccount.inc:364
 msgid "supannEtuRegimeInscription - The type of this subscription"
 msgstr ""
 
-#: personal/supann/class_supannAccount.inc:376
-msgid "Disciplinary Sector"
+#: personal/supann/class_supannAccount.inc:368
+msgid "Secteur Disciplinaire"
 msgstr ""
 
-#: personal/supann/class_supannAccount.inc:376
+#: personal/supann/class_supannAccount.inc:368
 msgid "supannEtuSecteurDisciplinaire"
 msgstr ""
 
-#: personal/supann/class_supannAccount.inc:380
+#: personal/supann/class_supannAccount.inc:372
 msgid "Diploma type"
 msgstr ""
 
-#: personal/supann/class_supannAccount.inc:380
+#: personal/supann/class_supannAccount.inc:372
 msgid "supannEtuTypeDiplome - Type of diploma"
 msgstr ""
 
-#: personal/supann/class_supannAccount.inc:384
-msgid "Curriculum year "
+#: personal/supann/class_supannAccount.inc:376
+msgid "Cursus annee"
 msgstr ""
 
-#: personal/supann/class_supannAccount.inc:384
+#: personal/supann/class_supannAccount.inc:376
 msgid "supannEtuCursusAnnee"
 msgstr ""
 
-#: personal/supann/class_supannAccount.inc:388
+#: personal/supann/class_supannAccount.inc:380
 msgid "supannEntiteAffectation_affect"
 msgstr ""
 
-#: personal/supann/class_supannAccount.inc:392
+#: personal/supann/class_supannAccount.inc:384
 msgid "Diploma"
 msgstr ""
 
-#: personal/supann/class_supannAccount.inc:392
+#: personal/supann/class_supannAccount.inc:384
 msgid "supannEtuDiplome"
 msgstr ""
 
-#: personal/supann/class_supannAccount.inc:396
+#: personal/supann/class_supannAccount.inc:388
 msgid "Step"
 msgstr ""
 
-#: personal/supann/class_supannAccount.inc:396
+#: personal/supann/class_supannAccount.inc:388
 msgid "supannEtuEtape"
 msgstr ""
 
-#: personal/supann/class_supannAccount.inc:400
+#: personal/supann/class_supannAccount.inc:392
 msgid "educational element"
 msgstr ""
 
-#: personal/supann/class_supannAccount.inc:400
+#: personal/supann/class_supannAccount.inc:392
 msgid "supannEtuElementPedagogique"
 msgstr ""
 
-#: personal/supann/class_supannAccount.inc:412
-msgid "Personal profile"
+#: personal/supann/class_supannAccount.inc:404
+msgid "Personnal profile"
 msgstr ""
 
-#: personal/supann/class_supannAccount.inc:415
+#: personal/supann/class_supannAccount.inc:407
 msgid "Personal ID"
 msgstr ""
 
-#: personal/supann/class_supannAccount.inc:415
+#: personal/supann/class_supannAccount.inc:407
 msgid "supannEmpId"
 msgstr ""
 
-#: personal/supann/class_supannAccount.inc:419
+#: personal/supann/class_supannAccount.inc:411
 msgid "Personal corps"
 msgstr ""
 
-#: personal/supann/class_supannAccount.inc:419
+#: personal/supann/class_supannAccount.inc:411
 msgid "supannEmpCorps"
 msgstr ""
 
-#: personal/supann/class_supannAccount.inc:424
-msgid "Activity"
+#: personal/supann/class_supannAccount.inc:416
+msgid "Activite"
 msgstr ""
 
-#: personal/supann/class_supannAccount.inc:424
+#: personal/supann/class_supannAccount.inc:416
 msgid "supannActivite"
 msgstr ""
 
-#: personal/supann/class_supannAccount.inc:431
+#: personal/supann/class_supannAccount.inc:423
 msgid "Roles"
 msgstr "Roles"
 
-#: personal/supann/class_supannAccount.inc:438
+#: personal/supann/class_supannAccount.inc:430
 msgid "supannRoleEntite"
 msgstr ""
 
-#: personal/supann/class_supannAccount.inc:442
+#: personal/supann/class_supannAccount.inc:434
 msgid "Generic role"
 msgstr ""
 
-#: personal/supann/class_supannAccount.inc:442
+#: personal/supann/class_supannAccount.inc:434
 msgid "supannRoleGenerique"
 msgstr ""
 
-#: personal/supann/class_supannAccount.inc:446
-msgid "Entity assignment type"
-msgstr ""
-
 #: config/supann/class_supannConfig.inc:28
 msgid "SUPANN configuration"
 msgstr ""
diff --git a/supann/locale/es_VE/fusiondirectory.po b/supann/locale/es_VE/fusiondirectory.po
index 018d28dc943489d651179e09f155015cacb9abe1..c5692550c4b4f880db22ae40e89d892200a4e6c2 100644
--- a/supann/locale/es_VE/fusiondirectory.po
+++ b/supann/locale/es_VE/fusiondirectory.po
@@ -5,12 +5,12 @@
 # Translators:
 msgid ""
 msgstr ""
-"Project-Id-Version: FusionDirectory-108\n"
+"Project-Id-Version: FusionDirectory-109\n"
 "Report-Msgid-Bugs-To: documentation@lists.fusiondirectory.org\n"
-"POT-Creation-Date: 2015-03-31 11:49+0200\n"
-"PO-Revision-Date: 2015-03-31 10:46+0000\n"
+"POT-Creation-Date: 2014-12-15 17:47+0100\n"
+"PO-Revision-Date: 2015-02-25 16:51+0000\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>\n"
-"Language-Team: Spanish (Venezuela) (http://www.transifex.com/projects/p/FusionDirectory-108/language/es_VE/)\n"
+"Language-Team: Spanish (Venezuela) (http://www.transifex.com/projects/p/FusionDirectory-109/language/es_VE/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -27,15 +27,16 @@ msgstr ""
 
 #: admin/supannStructures/class_entite.inc:31
 #: admin/supannStructures/class_entite.inc:52
-msgid "Entity"
+#: personal/supann/class_supannAccount.inc:442
+msgid "Entite"
 msgstr ""
 
 #: admin/supannStructures/class_entite.inc:32
-msgid "SUPANN Entity Settings"
+msgid "SUPANN Entite Settings"
 msgstr ""
 
 #: admin/supannStructures/class_entite.inc:35
-msgid "SUPANN Entity"
+msgid "SUPANN Entite"
 msgstr ""
 
 #: admin/supannStructures/class_entite.inc:55
@@ -44,7 +45,7 @@ msgid "Name"
 msgstr "Nombre"
 
 #: admin/supannStructures/class_entite.inc:55
-msgid "The name to write in the ou attribute for this entity"
+msgid "The name to write in the ou attribute for this entite"
 msgstr ""
 
 #: admin/supannStructures/class_entite.inc:61
@@ -57,7 +58,7 @@ msgid "Telephone"
 msgstr "TelÃ©fono"
 
 #: admin/supannStructures/class_entite.inc:64
-msgid "Phone number for this entity"
+msgid "Phone number for this entite"
 msgstr ""
 
 #: admin/supannStructures/class_entite.inc:68
@@ -66,7 +67,7 @@ msgid "Fax"
 msgstr "Fax"
 
 #: admin/supannStructures/class_entite.inc:68
-msgid "Fax number for this entity"
+msgid "Fax number for this entite"
 msgstr ""
 
 #: admin/supannStructures/class_entite.inc:72
@@ -74,7 +75,7 @@ msgid "Postal address"
 msgstr "CÃ³digo Postal"
 
 #: admin/supannStructures/class_entite.inc:72
-msgid "Postal address of this entity"
+msgid "Postal address of this entite"
 msgstr ""
 
 #: admin/supannStructures/class_entite.inc:76
@@ -83,7 +84,7 @@ msgid "Description"
 msgstr "DescripciÃ³n"
 
 #: admin/supannStructures/class_entite.inc:76
-msgid "Short description of this entity"
+msgid "Short description of this entite"
 msgstr ""
 
 #: admin/supannStructures/class_entite.inc:82
@@ -91,27 +92,28 @@ msgid "SUPANN informations"
 msgstr ""
 
 #: admin/supannStructures/class_entite.inc:85
-msgid "Entity type"
+#: personal/supann/class_supannAccount.inc:438
+msgid "Entite type"
 msgstr ""
 
 #: admin/supannStructures/class_entite.inc:85
-msgid "The best SUPANN type that fits this entity"
+msgid "The best SUPANN type that fits this entite"
 msgstr ""
 
 #: admin/supannStructures/class_entite.inc:89
-msgid "Entity code"
+msgid "Entite code"
 msgstr ""
 
 #: admin/supannStructures/class_entite.inc:89
-msgid "The SUPANN code of this entity"
+msgid "The SUPANN code of this entite"
 msgstr ""
 
 #: admin/supannStructures/class_entite.inc:94
-msgid "Parent entity"
+msgid "Parent entite"
 msgstr ""
 
 #: admin/supannStructures/class_entite.inc:94
-msgid "The parent entity of this entity"
+msgid "The parent entite of this entite"
 msgstr ""
 
 #: admin/supannStructures/class_entite.inc:98
@@ -119,21 +121,21 @@ msgid "Reference ID"
 msgstr ""
 
 #: admin/supannStructures/class_entite.inc:98
-msgid "SUPANN reference ID of this entity"
+msgid "SUPANN reference ID of this entite"
 msgstr ""
 
 #: admin/supannStructures/class_etablissement.inc:31
-#: personal/supann/class_supannAccount.inc:324
-#: personal/supann/class_supannAccount.inc:363
-msgid "Establishment"
+#: personal/supann/class_supannAccount.inc:316
+#: personal/supann/class_supannAccount.inc:355
+msgid "Etablissement"
 msgstr ""
 
 #: admin/supannStructures/class_etablissement.inc:32
-msgid "SUPANN Establishment Settings"
+msgid "SUPANN Etablissement Settings"
 msgstr ""
 
 #: admin/supannStructures/class_etablissement.inc:35
-msgid "SUPANN Establishment"
+msgid "SUPANN Etablissement"
 msgstr ""
 
 #: admin/supannStructures/class_etablissement.inc:52
@@ -141,19 +143,19 @@ msgid "Properties"
 msgstr "Propiedades"
 
 #: admin/supannStructures/class_etablissement.inc:55
-msgid "Root Establishment"
+msgid "Root etablissement"
 msgstr ""
 
 #: admin/supannStructures/class_etablissement.inc:55
-msgid "Set this Establishment as the root one"
+msgid "Set this etablissement as the root one"
 msgstr ""
 
 #: admin/supannStructures/class_etablissement.inc:59
-msgid "The name to write in the o attribute for this Establishment"
+msgid "The name to write in the o attribute for this etablissement"
 msgstr ""
 
 #: admin/supannStructures/class_etablissement.inc:63
-msgid "A short description of this Establishment"
+msgid "A short description of this etablissement"
 msgstr ""
 
 #: admin/supannStructures/class_etablissement.inc:69
@@ -162,7 +164,7 @@ msgid "Location"
 msgstr "LocalizaciÃ³n"
 
 #: admin/supannStructures/class_etablissement.inc:72
-msgid "Usually the city where this Establishment is"
+msgid "Usually the city in which is this etablissement"
 msgstr ""
 
 #: admin/supannStructures/class_etablissement.inc:76
@@ -170,15 +172,15 @@ msgid "Address"
 msgstr "DirecciÃ³n"
 
 #: admin/supannStructures/class_etablissement.inc:76
-msgid "The postal address of this Establishment"
+msgid "The postal address of this etablissement"
 msgstr ""
 
 #: admin/supannStructures/class_etablissement.inc:80
-msgid "Phone number for this Establishment"
+msgid "Phone number for this etablissement"
 msgstr ""
 
 #: admin/supannStructures/class_etablissement.inc:84
-msgid "Fax number for this Establishment"
+msgid "Fax number for this etablissement"
 msgstr ""
 
 #: admin/supannStructures/class_etablissement.inc:90
@@ -186,11 +188,11 @@ msgid "SUPANN properties"
 msgstr ""
 
 #: admin/supannStructures/class_etablissement.inc:93
-msgid "Establishment code"
+msgid "Etablissement code"
 msgstr ""
 
 #: admin/supannStructures/class_etablissement.inc:93
-msgid "The code of this Establishment (must have a prefix between {})"
+msgid "The code of this etablissement (must have a prefix between {})"
 msgstr ""
 
 #: admin/supannStructures/class_etablissement.inc:98
@@ -198,7 +200,7 @@ msgid "SUPANN code"
 msgstr ""
 
 #: admin/supannStructures/class_etablissement.inc:98
-msgid "The SUPANN code for this Establishment"
+msgid "The SUPANN code for this etablissement"
 msgstr ""
 
 #: admin/supannStructures/class_etablissement.inc:103
@@ -206,7 +208,7 @@ msgid "Legal name"
 msgstr ""
 
 #: admin/supannStructures/class_etablissement.inc:103
-msgid "The legal name of this Establishment"
+msgid "The legal name of this etablissement"
 msgstr ""
 
 #: admin/supannStructures/class_etablissement.inc:107
@@ -214,7 +216,7 @@ msgid "Home page URI"
 msgstr ""
 
 #: admin/supannStructures/class_etablissement.inc:107
-msgid "The URI of this Establishment website home page"
+msgid "The URI of this etablissement website home page"
 msgstr ""
 
 #: admin/supannStructures/class_etablissement.inc:111
@@ -222,7 +224,7 @@ msgid "Institution URI"
 msgstr ""
 
 #: admin/supannStructures/class_etablissement.inc:111
-msgid "The URI of this Establishment institution website"
+msgid "The URI of this etablissement institution website"
 msgstr ""
 
 #: admin/supannStructures/class_etablissement.inc:115
@@ -230,12 +232,12 @@ msgid "White pages URI"
 msgstr ""
 
 #: admin/supannStructures/class_etablissement.inc:115
-msgid "The URI of this Establishment white pages"
+msgid "The URI of this etablissement white pages"
 msgstr ""
 
 #: admin/supannStructures/class_etablissement.inc:148
-#: admin/supannStructures/class_etablissement.inc:201
-#: admin/supannStructures/class_etablissement.inc:219
+#: admin/supannStructures/class_etablissement.inc:198
+#: admin/supannStructures/class_etablissement.inc:216
 msgid "LDAP error"
 msgstr "Error de LDAP"
 
@@ -355,256 +357,243 @@ msgstr ""
 msgid "eduPersonNickName - Can contain a nick name for this user"
 msgstr ""
 
-#: personal/supann/class_supannAccount.inc:253
-msgid "Ref ids"
-msgstr ""
-
-#: personal/supann/class_supannAccount.inc:253
-msgid "supannRefId - IDs/links for this user on other systems"
-msgstr ""
-
-#: personal/supann/class_supannAccount.inc:262
+#: personal/supann/class_supannAccount.inc:254
 msgid "Contact"
 msgstr "Contacto"
 
-#: personal/supann/class_supannAccount.inc:266
+#: personal/supann/class_supannAccount.inc:258
 msgid "Other phone numbers"
 msgstr ""
 
-#: personal/supann/class_supannAccount.inc:266
+#: personal/supann/class_supannAccount.inc:258
 msgid "supannAutreTelephone - Other phone numbers for this user"
 msgstr ""
 
-#: personal/supann/class_supannAccount.inc:272
+#: personal/supann/class_supannAccount.inc:264
 msgid "Other mail addresses"
 msgstr ""
 
-#: personal/supann/class_supannAccount.inc:272
+#: personal/supann/class_supannAccount.inc:264
 msgid ""
 "supannAutreMail - Other mail addresses for this user. Each must be unique"
 msgstr ""
 
-#: personal/supann/class_supannAccount.inc:278
+#: personal/supann/class_supannAccount.inc:270
 msgid "Personal mail addresses"
 msgstr ""
 
-#: personal/supann/class_supannAccount.inc:278
+#: personal/supann/class_supannAccount.inc:270
 msgid "supannMailPerso - Personal mail addresses for this user"
 msgstr ""
 
-#: personal/supann/class_supannAccount.inc:283
-msgid "red List"
+#: personal/supann/class_supannAccount.inc:275
+msgid "Liste rouge"
 msgstr ""
 
-#: personal/supann/class_supannAccount.inc:283
+#: personal/supann/class_supannAccount.inc:275
 msgid "supannListeRouge - Should this person be on the red list"
 msgstr ""
 
-#: personal/supann/class_supannAccount.inc:289
+#: personal/supann/class_supannAccount.inc:281
 msgid "Affectation"
 msgstr ""
 
-#: personal/supann/class_supannAccount.inc:292
-msgid "Entity primary assignment"
+#: personal/supann/class_supannAccount.inc:284
+msgid "Entite affectation principale"
 msgstr ""
 
-#: personal/supann/class_supannAccount.inc:292
+#: personal/supann/class_supannAccount.inc:284
 msgid "supannEntiteAffectationPrincipale"
 msgstr ""
 
-#: personal/supann/class_supannAccount.inc:297
-#: personal/supann/class_supannAccount.inc:388
-#: personal/supann/class_supannAccount.inc:450
-msgid "Entity assignment"
+#: personal/supann/class_supannAccount.inc:289
+#: personal/supann/class_supannAccount.inc:380
+msgid "Entite affectation"
 msgstr ""
 
-#: personal/supann/class_supannAccount.inc:297
-#: personal/supann/class_supannAccount.inc:450
+#: personal/supann/class_supannAccount.inc:289
+#: personal/supann/class_supannAccount.inc:442
 msgid "supannEntiteAffectation"
 msgstr ""
 
-#: personal/supann/class_supannAccount.inc:303
-msgid "Entity type assignment"
+#: personal/supann/class_supannAccount.inc:295
+msgid "Type entite affectation"
 msgstr ""
 
-#: personal/supann/class_supannAccount.inc:303
-#: personal/supann/class_supannAccount.inc:446
+#: personal/supann/class_supannAccount.inc:295
+#: personal/supann/class_supannAccount.inc:438
 msgid "supannTypeEntiteAffectation"
 msgstr ""
 
-#: personal/supann/class_supannAccount.inc:310
+#: personal/supann/class_supannAccount.inc:302
 msgid "Affiliation"
 msgstr ""
 
-#: personal/supann/class_supannAccount.inc:313
+#: personal/supann/class_supannAccount.inc:305
 msgid "Primary affiliation"
 msgstr ""
 
-#: personal/supann/class_supannAccount.inc:313
+#: personal/supann/class_supannAccount.inc:305
 msgid "eduPersonPrimaryAffiliation"
 msgstr ""
 
-#: personal/supann/class_supannAccount.inc:318
+#: personal/supann/class_supannAccount.inc:310
 msgid "Affiliations"
 msgstr ""
 
-#: personal/supann/class_supannAccount.inc:318
+#: personal/supann/class_supannAccount.inc:310
 msgid "eduPersonAffiliation"
 msgstr ""
 
-#: personal/supann/class_supannAccount.inc:324
+#: personal/supann/class_supannAccount.inc:316
 msgid "supannEtablissement"
 msgstr "supannEtablissement"
 
-#: personal/supann/class_supannAccount.inc:331
+#: personal/supann/class_supannAccount.inc:323
 msgid "Student profile"
 msgstr ""
 
-#: personal/supann/class_supannAccount.inc:334
+#: personal/supann/class_supannAccount.inc:326
 msgid "INE code"
 msgstr ""
 
-#: personal/supann/class_supannAccount.inc:334
+#: personal/supann/class_supannAccount.inc:326
 msgid "supannCodeINE - INE code of this student"
 msgstr ""
 
-#: personal/supann/class_supannAccount.inc:338
+#: personal/supann/class_supannAccount.inc:330
 msgid "Student ID"
 msgstr ""
 
-#: personal/supann/class_supannAccount.inc:338
+#: personal/supann/class_supannAccount.inc:330
 msgid "supannEtuId - scolarity id"
 msgstr ""
 
-#: personal/supann/class_supannAccount.inc:344
+#: personal/supann/class_supannAccount.inc:336
 msgid "Student subscriptions"
 msgstr ""
 
-#: personal/supann/class_supannAccount.inc:359
+#: personal/supann/class_supannAccount.inc:351
 msgid "supannEtuInscription - Subscriptions for this student"
 msgstr ""
 
-#: personal/supann/class_supannAccount.inc:363
+#: personal/supann/class_supannAccount.inc:355
 msgid ""
 "supannEtablissement - Etablissement in which this subscription was done"
 msgstr ""
 
-#: personal/supann/class_supannAccount.inc:367
+#: personal/supann/class_supannAccount.inc:359
 msgid "Year"
 msgstr "AÃ±o"
 
-#: personal/supann/class_supannAccount.inc:367
+#: personal/supann/class_supannAccount.inc:359
 msgid "supannEtuAnneeInscription - The year this subscription will begin"
 msgstr ""
 
-#: personal/supann/class_supannAccount.inc:372
+#: personal/supann/class_supannAccount.inc:364
 msgid "Subscription type"
 msgstr ""
 
-#: personal/supann/class_supannAccount.inc:372
+#: personal/supann/class_supannAccount.inc:364
 msgid "supannEtuRegimeInscription - The type of this subscription"
 msgstr ""
 
-#: personal/supann/class_supannAccount.inc:376
-msgid "Disciplinary Sector"
+#: personal/supann/class_supannAccount.inc:368
+msgid "Secteur Disciplinaire"
 msgstr ""
 
-#: personal/supann/class_supannAccount.inc:376
+#: personal/supann/class_supannAccount.inc:368
 msgid "supannEtuSecteurDisciplinaire"
 msgstr ""
 
-#: personal/supann/class_supannAccount.inc:380
+#: personal/supann/class_supannAccount.inc:372
 msgid "Diploma type"
 msgstr ""
 
-#: personal/supann/class_supannAccount.inc:380
+#: personal/supann/class_supannAccount.inc:372
 msgid "supannEtuTypeDiplome - Type of diploma"
 msgstr ""
 
-#: personal/supann/class_supannAccount.inc:384
-msgid "Curriculum year "
+#: personal/supann/class_supannAccount.inc:376
+msgid "Cursus annee"
 msgstr ""
 
-#: personal/supann/class_supannAccount.inc:384
+#: personal/supann/class_supannAccount.inc:376
 msgid "supannEtuCursusAnnee"
 msgstr ""
 
-#: personal/supann/class_supannAccount.inc:388
+#: personal/supann/class_supannAccount.inc:380
 msgid "supannEntiteAffectation_affect"
 msgstr ""
 
-#: personal/supann/class_supannAccount.inc:392
+#: personal/supann/class_supannAccount.inc:384
 msgid "Diploma"
 msgstr ""
 
-#: personal/supann/class_supannAccount.inc:392
+#: personal/supann/class_supannAccount.inc:384
 msgid "supannEtuDiplome"
 msgstr ""
 
-#: personal/supann/class_supannAccount.inc:396
+#: personal/supann/class_supannAccount.inc:388
 msgid "Step"
 msgstr ""
 
-#: personal/supann/class_supannAccount.inc:396
+#: personal/supann/class_supannAccount.inc:388
 msgid "supannEtuEtape"
 msgstr ""
 
-#: personal/supann/class_supannAccount.inc:400
+#: personal/supann/class_supannAccount.inc:392
 msgid "educational element"
 msgstr ""
 
-#: personal/supann/class_supannAccount.inc:400
+#: personal/supann/class_supannAccount.inc:392
 msgid "supannEtuElementPedagogique"
 msgstr ""
 
-#: personal/supann/class_supannAccount.inc:412
-msgid "Personal profile"
+#: personal/supann/class_supannAccount.inc:404
+msgid "Personnal profile"
 msgstr ""
 
-#: personal/supann/class_supannAccount.inc:415
+#: personal/supann/class_supannAccount.inc:407
 msgid "Personal ID"
 msgstr ""
 
-#: personal/supann/class_supannAccount.inc:415
+#: personal/supann/class_supannAccount.inc:407
 msgid "supannEmpId"
 msgstr ""
 
-#: personal/supann/class_supannAccount.inc:419
+#: personal/supann/class_supannAccount.inc:411
 msgid "Personal corps"
 msgstr ""
 
-#: personal/supann/class_supannAccount.inc:419
+#: personal/supann/class_supannAccount.inc:411
 msgid "supannEmpCorps"
 msgstr ""
 
-#: personal/supann/class_supannAccount.inc:424
-msgid "Activity"
+#: personal/supann/class_supannAccount.inc:416
+msgid "Activite"
 msgstr ""
 
-#: personal/supann/class_supannAccount.inc:424
+#: personal/supann/class_supannAccount.inc:416
 msgid "supannActivite"
 msgstr ""
 
-#: personal/supann/class_supannAccount.inc:431
+#: personal/supann/class_supannAccount.inc:423
 msgid "Roles"
 msgstr "Roles"
 
-#: personal/supann/class_supannAccount.inc:438
+#: personal/supann/class_supannAccount.inc:430
 msgid "supannRoleEntite"
 msgstr ""
 
-#: personal/supann/class_supannAccount.inc:442
+#: personal/supann/class_supannAccount.inc:434
 msgid "Generic role"
 msgstr ""
 
-#: personal/supann/class_supannAccount.inc:442
+#: personal/supann/class_supannAccount.inc:434
 msgid "supannRoleGenerique"
 msgstr ""
 
-#: personal/supann/class_supannAccount.inc:446
-msgid "Entity assignment type"
-msgstr ""
-
 #: config/supann/class_supannConfig.inc:28
 msgid "SUPANN configuration"
 msgstr ""
diff --git a/supann/locale/fa_IR/fusiondirectory.po b/supann/locale/fa_IR/fusiondirectory.po
index b2ca5bc530b8579e3c7257c2010a752d2115e46f..d27bd7004ffb3b88bd32133174dc3585cf730a24 100644
--- a/supann/locale/fa_IR/fusiondirectory.po
+++ b/supann/locale/fa_IR/fusiondirectory.po
@@ -5,12 +5,12 @@
 # Translators:
 msgid ""
 msgstr ""
-"Project-Id-Version: FusionDirectory-108\n"
+"Project-Id-Version: FusionDirectory-109\n"
 "Report-Msgid-Bugs-To: documentation@lists.fusiondirectory.org\n"
-"POT-Creation-Date: 2015-03-31 11:49+0200\n"
-"PO-Revision-Date: 2015-03-31 10:46+0000\n"
+"POT-Creation-Date: 2014-12-15 17:47+0100\n"
+"PO-Revision-Date: 2015-02-25 15:54+0000\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>\n"
-"Language-Team: Persian (Iran) (http://www.transifex.com/projects/p/FusionDirectory-108/language/fa_IR/)\n"
+"Language-Team: Persian (Iran) (http://www.transifex.com/projects/p/FusionDirectory-109/language/fa_IR/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -27,15 +27,16 @@ msgstr ""
 
 #: admin/supannStructures/class_entite.inc:31
 #: admin/supannStructures/class_entite.inc:52
-msgid "Entity"
+#: personal/supann/class_supannAccount.inc:442
+msgid "Entite"
 msgstr ""
 
 #: admin/supannStructures/class_entite.inc:32
-msgid "SUPANN Entity Settings"
+msgid "SUPANN Entite Settings"
 msgstr ""
 
 #: admin/supannStructures/class_entite.inc:35
-msgid "SUPANN Entity"
+msgid "SUPANN Entite"
 msgstr ""
 
 #: admin/supannStructures/class_entite.inc:55
@@ -44,7 +45,7 @@ msgid "Name"
 msgstr ""
 
 #: admin/supannStructures/class_entite.inc:55
-msgid "The name to write in the ou attribute for this entity"
+msgid "The name to write in the ou attribute for this entite"
 msgstr ""
 
 #: admin/supannStructures/class_entite.inc:61
@@ -57,7 +58,7 @@ msgid "Telephone"
 msgstr ""
 
 #: admin/supannStructures/class_entite.inc:64
-msgid "Phone number for this entity"
+msgid "Phone number for this entite"
 msgstr ""
 
 #: admin/supannStructures/class_entite.inc:68
@@ -66,7 +67,7 @@ msgid "Fax"
 msgstr ""
 
 #: admin/supannStructures/class_entite.inc:68
-msgid "Fax number for this entity"
+msgid "Fax number for this entite"
 msgstr ""
 
 #: admin/supannStructures/class_entite.inc:72
@@ -74,7 +75,7 @@ msgid "Postal address"
 msgstr ""
 
 #: admin/supannStructures/class_entite.inc:72
-msgid "Postal address of this entity"
+msgid "Postal address of this entite"
 msgstr ""
 
 #: admin/supannStructures/class_entite.inc:76
@@ -83,7 +84,7 @@ msgid "Description"
 msgstr ""
 
 #: admin/supannStructures/class_entite.inc:76
-msgid "Short description of this entity"
+msgid "Short description of this entite"
 msgstr ""
 
 #: admin/supannStructures/class_entite.inc:82
@@ -91,27 +92,28 @@ msgid "SUPANN informations"
 msgstr ""
 
 #: admin/supannStructures/class_entite.inc:85
-msgid "Entity type"
+#: personal/supann/class_supannAccount.inc:438
+msgid "Entite type"
 msgstr ""
 
 #: admin/supannStructures/class_entite.inc:85
-msgid "The best SUPANN type that fits this entity"
+msgid "The best SUPANN type that fits this entite"
 msgstr ""
 
 #: admin/supannStructures/class_entite.inc:89
-msgid "Entity code"
+msgid "Entite code"
 msgstr ""
 
 #: admin/supannStructures/class_entite.inc:89
-msgid "The SUPANN code of this entity"
+msgid "The SUPANN code of this entite"
 msgstr ""
 
 #: admin/supannStructures/class_entite.inc:94
-msgid "Parent entity"
+msgid "Parent entite"
 msgstr ""
 
 #: admin/supannStructures/class_entite.inc:94
-msgid "The parent entity of this entity"
+msgid "The parent entite of this entite"
 msgstr ""
 
 #: admin/supannStructures/class_entite.inc:98
@@ -119,21 +121,21 @@ msgid "Reference ID"
 msgstr ""
 
 #: admin/supannStructures/class_entite.inc:98
-msgid "SUPANN reference ID of this entity"
+msgid "SUPANN reference ID of this entite"
 msgstr ""
 
 #: admin/supannStructures/class_etablissement.inc:31
-#: personal/supann/class_supannAccount.inc:324
-#: personal/supann/class_supannAccount.inc:363
-msgid "Establishment"
+#: personal/supann/class_supannAccount.inc:316
+#: personal/supann/class_supannAccount.inc:355
+msgid "Etablissement"
 msgstr ""
 
 #: admin/supannStructures/class_etablissement.inc:32
-msgid "SUPANN Establishment Settings"
+msgid "SUPANN Etablissement Settings"
 msgstr ""
 
 #: admin/supannStructures/class_etablissement.inc:35
-msgid "SUPANN Establishment"
+msgid "SUPANN Etablissement"
 msgstr ""
 
 #: admin/supannStructures/class_etablissement.inc:52
@@ -141,19 +143,19 @@ msgid "Properties"
 msgstr ""
 
 #: admin/supannStructures/class_etablissement.inc:55
-msgid "Root Establishment"
+msgid "Root etablissement"
 msgstr ""
 
 #: admin/supannStructures/class_etablissement.inc:55
-msgid "Set this Establishment as the root one"
+msgid "Set this etablissement as the root one"
 msgstr ""
 
 #: admin/supannStructures/class_etablissement.inc:59
-msgid "The name to write in the o attribute for this Establishment"
+msgid "The name to write in the o attribute for this etablissement"
 msgstr ""
 
 #: admin/supannStructures/class_etablissement.inc:63
-msgid "A short description of this Establishment"
+msgid "A short description of this etablissement"
 msgstr ""
 
 #: admin/supannStructures/class_etablissement.inc:69
@@ -162,7 +164,7 @@ msgid "Location"
 msgstr ""
 
 #: admin/supannStructures/class_etablissement.inc:72
-msgid "Usually the city where this Establishment is"
+msgid "Usually the city in which is this etablissement"
 msgstr ""
 
 #: admin/supannStructures/class_etablissement.inc:76
@@ -170,15 +172,15 @@ msgid "Address"
 msgstr "Ø¢Ø¯Ø±Ø³"
 
 #: admin/supannStructures/class_etablissement.inc:76
-msgid "The postal address of this Establishment"
+msgid "The postal address of this etablissement"
 msgstr ""
 
 #: admin/supannStructures/class_etablissement.inc:80
-msgid "Phone number for this Establishment"
+msgid "Phone number for this etablissement"
 msgstr ""
 
 #: admin/supannStructures/class_etablissement.inc:84
-msgid "Fax number for this Establishment"
+msgid "Fax number for this etablissement"
 msgstr ""
 
 #: admin/supannStructures/class_etablissement.inc:90
@@ -186,11 +188,11 @@ msgid "SUPANN properties"
 msgstr ""
 
 #: admin/supannStructures/class_etablissement.inc:93
-msgid "Establishment code"
+msgid "Etablissement code"
 msgstr ""
 
 #: admin/supannStructures/class_etablissement.inc:93
-msgid "The code of this Establishment (must have a prefix between {})"
+msgid "The code of this etablissement (must have a prefix between {})"
 msgstr ""
 
 #: admin/supannStructures/class_etablissement.inc:98
@@ -198,7 +200,7 @@ msgid "SUPANN code"
 msgstr ""
 
 #: admin/supannStructures/class_etablissement.inc:98
-msgid "The SUPANN code for this Establishment"
+msgid "The SUPANN code for this etablissement"
 msgstr ""
 
 #: admin/supannStructures/class_etablissement.inc:103
@@ -206,7 +208,7 @@ msgid "Legal name"
 msgstr ""
 
 #: admin/supannStructures/class_etablissement.inc:103
-msgid "The legal name of this Establishment"
+msgid "The legal name of this etablissement"
 msgstr ""
 
 #: admin/supannStructures/class_etablissement.inc:107
@@ -214,7 +216,7 @@ msgid "Home page URI"
 msgstr ""
 
 #: admin/supannStructures/class_etablissement.inc:107
-msgid "The URI of this Establishment website home page"
+msgid "The URI of this etablissement website home page"
 msgstr ""
 
 #: admin/supannStructures/class_etablissement.inc:111
@@ -222,7 +224,7 @@ msgid "Institution URI"
 msgstr ""
 
 #: admin/supannStructures/class_etablissement.inc:111
-msgid "The URI of this Establishment institution website"
+msgid "The URI of this etablissement institution website"
 msgstr ""
 
 #: admin/supannStructures/class_etablissement.inc:115
@@ -230,12 +232,12 @@ msgid "White pages URI"
 msgstr ""
 
 #: admin/supannStructures/class_etablissement.inc:115
-msgid "The URI of this Establishment white pages"
+msgid "The URI of this etablissement white pages"
 msgstr ""
 
 #: admin/supannStructures/class_etablissement.inc:148
-#: admin/supannStructures/class_etablissement.inc:201
-#: admin/supannStructures/class_etablissement.inc:219
+#: admin/supannStructures/class_etablissement.inc:198
+#: admin/supannStructures/class_etablissement.inc:216
 msgid "LDAP error"
 msgstr "Ø®Ø·Ø§ÛŒ LDAP"
 
@@ -355,256 +357,243 @@ msgstr ""
 msgid "eduPersonNickName - Can contain a nick name for this user"
 msgstr ""
 
-#: personal/supann/class_supannAccount.inc:253
-msgid "Ref ids"
-msgstr ""
-
-#: personal/supann/class_supannAccount.inc:253
-msgid "supannRefId - IDs/links for this user on other systems"
-msgstr ""
-
-#: personal/supann/class_supannAccount.inc:262
+#: personal/supann/class_supannAccount.inc:254
 msgid "Contact"
 msgstr ""
 
-#: personal/supann/class_supannAccount.inc:266
+#: personal/supann/class_supannAccount.inc:258
 msgid "Other phone numbers"
 msgstr ""
 
-#: personal/supann/class_supannAccount.inc:266
+#: personal/supann/class_supannAccount.inc:258
 msgid "supannAutreTelephone - Other phone numbers for this user"
 msgstr ""
 
-#: personal/supann/class_supannAccount.inc:272
+#: personal/supann/class_supannAccount.inc:264
 msgid "Other mail addresses"
 msgstr ""
 
-#: personal/supann/class_supannAccount.inc:272
+#: personal/supann/class_supannAccount.inc:264
 msgid ""
 "supannAutreMail - Other mail addresses for this user. Each must be unique"
 msgstr ""
 
-#: personal/supann/class_supannAccount.inc:278
+#: personal/supann/class_supannAccount.inc:270
 msgid "Personal mail addresses"
 msgstr ""
 
-#: personal/supann/class_supannAccount.inc:278
+#: personal/supann/class_supannAccount.inc:270
 msgid "supannMailPerso - Personal mail addresses for this user"
 msgstr ""
 
-#: personal/supann/class_supannAccount.inc:283
-msgid "red List"
+#: personal/supann/class_supannAccount.inc:275
+msgid "Liste rouge"
 msgstr ""
 
-#: personal/supann/class_supannAccount.inc:283
+#: personal/supann/class_supannAccount.inc:275
 msgid "supannListeRouge - Should this person be on the red list"
 msgstr ""
 
-#: personal/supann/class_supannAccount.inc:289
+#: personal/supann/class_supannAccount.inc:281
 msgid "Affectation"
 msgstr ""
 
-#: personal/supann/class_supannAccount.inc:292
-msgid "Entity primary assignment"
+#: personal/supann/class_supannAccount.inc:284
+msgid "Entite affectation principale"
 msgstr ""
 
-#: personal/supann/class_supannAccount.inc:292
+#: personal/supann/class_supannAccount.inc:284
 msgid "supannEntiteAffectationPrincipale"
 msgstr ""
 
-#: personal/supann/class_supannAccount.inc:297
-#: personal/supann/class_supannAccount.inc:388
-#: personal/supann/class_supannAccount.inc:450
-msgid "Entity assignment"
+#: personal/supann/class_supannAccount.inc:289
+#: personal/supann/class_supannAccount.inc:380
+msgid "Entite affectation"
 msgstr ""
 
-#: personal/supann/class_supannAccount.inc:297
-#: personal/supann/class_supannAccount.inc:450
+#: personal/supann/class_supannAccount.inc:289
+#: personal/supann/class_supannAccount.inc:442
 msgid "supannEntiteAffectation"
 msgstr ""
 
-#: personal/supann/class_supannAccount.inc:303
-msgid "Entity type assignment"
+#: personal/supann/class_supannAccount.inc:295
+msgid "Type entite affectation"
 msgstr ""
 
-#: personal/supann/class_supannAccount.inc:303
-#: personal/supann/class_supannAccount.inc:446
+#: personal/supann/class_supannAccount.inc:295
+#: personal/supann/class_supannAccount.inc:438
 msgid "supannTypeEntiteAffectation"
 msgstr ""
 
-#: personal/supann/class_supannAccount.inc:310
+#: personal/supann/class_supannAccount.inc:302
 msgid "Affiliation"
 msgstr ""
 
-#: personal/supann/class_supannAccount.inc:313
+#: personal/supann/class_supannAccount.inc:305
 msgid "Primary affiliation"
 msgstr ""
 
-#: personal/supann/class_supannAccount.inc:313
+#: personal/supann/class_supannAccount.inc:305
 msgid "eduPersonPrimaryAffiliation"
 msgstr ""
 
-#: personal/supann/class_supannAccount.inc:318
+#: personal/supann/class_supannAccount.inc:310
 msgid "Affiliations"
 msgstr ""
 
-#: personal/supann/class_supannAccount.inc:318
+#: personal/supann/class_supannAccount.inc:310
 msgid "eduPersonAffiliation"
 msgstr ""
 
-#: personal/supann/class_supannAccount.inc:324
+#: personal/supann/class_supannAccount.inc:316
 msgid "supannEtablissement"
 msgstr ""
 
-#: personal/supann/class_supannAccount.inc:331
+#: personal/supann/class_supannAccount.inc:323
 msgid "Student profile"
 msgstr ""
 
-#: personal/supann/class_supannAccount.inc:334
+#: personal/supann/class_supannAccount.inc:326
 msgid "INE code"
 msgstr ""
 
-#: personal/supann/class_supannAccount.inc:334
+#: personal/supann/class_supannAccount.inc:326
 msgid "supannCodeINE - INE code of this student"
 msgstr ""
 
-#: personal/supann/class_supannAccount.inc:338
+#: personal/supann/class_supannAccount.inc:330
 msgid "Student ID"
 msgstr ""
 
-#: personal/supann/class_supannAccount.inc:338
+#: personal/supann/class_supannAccount.inc:330
 msgid "supannEtuId - scolarity id"
 msgstr ""
 
-#: personal/supann/class_supannAccount.inc:344
+#: personal/supann/class_supannAccount.inc:336
 msgid "Student subscriptions"
 msgstr ""
 
-#: personal/supann/class_supannAccount.inc:359
+#: personal/supann/class_supannAccount.inc:351
 msgid "supannEtuInscription - Subscriptions for this student"
 msgstr ""
 
-#: personal/supann/class_supannAccount.inc:363
+#: personal/supann/class_supannAccount.inc:355
 msgid ""
 "supannEtablissement - Etablissement in which this subscription was done"
 msgstr ""
 
-#: personal/supann/class_supannAccount.inc:367
+#: personal/supann/class_supannAccount.inc:359
 msgid "Year"
 msgstr ""
 
-#: personal/supann/class_supannAccount.inc:367
+#: personal/supann/class_supannAccount.inc:359
 msgid "supannEtuAnneeInscription - The year this subscription will begin"
 msgstr ""
 
-#: personal/supann/class_supannAccount.inc:372
+#: personal/supann/class_supannAccount.inc:364
 msgid "Subscription type"
 msgstr ""
 
-#: personal/supann/class_supannAccount.inc:372
+#: personal/supann/class_supannAccount.inc:364
 msgid "supannEtuRegimeInscription - The type of this subscription"
 msgstr ""
 
-#: personal/supann/class_supannAccount.inc:376
-msgid "Disciplinary Sector"
+#: personal/supann/class_supannAccount.inc:368
+msgid "Secteur Disciplinaire"
 msgstr ""
 
-#: personal/supann/class_supannAccount.inc:376
+#: personal/supann/class_supannAccount.inc:368
 msgid "supannEtuSecteurDisciplinaire"
 msgstr ""
 
-#: personal/supann/class_supannAccount.inc:380
+#: personal/supann/class_supannAccount.inc:372
 msgid "Diploma type"
 msgstr ""
 
-#: personal/supann/class_supannAccount.inc:380
+#: personal/supann/class_supannAccount.inc:372
 msgid "supannEtuTypeDiplome - Type of diploma"
 msgstr ""
 
-#: personal/supann/class_supannAccount.inc:384
-msgid "Curriculum year "
+#: personal/supann/class_supannAccount.inc:376
+msgid "Cursus annee"
 msgstr ""
 
-#: personal/supann/class_supannAccount.inc:384
+#: personal/supann/class_supannAccount.inc:376
 msgid "supannEtuCursusAnnee"
 msgstr ""
 
-#: personal/supann/class_supannAccount.inc:388
+#: personal/supann/class_supannAccount.inc:380
 msgid "supannEntiteAffectation_affect"
 msgstr ""
 
-#: personal/supann/class_supannAccount.inc:392
+#: personal/supann/class_supannAccount.inc:384
 msgid "Diploma"
 msgstr ""
 
-#: personal/supann/class_supannAccount.inc:392
+#: personal/supann/class_supannAccount.inc:384
 msgid "supannEtuDiplome"
 msgstr ""
 
-#: personal/supann/class_supannAccount.inc:396
+#: personal/supann/class_supannAccount.inc:388
 msgid "Step"
 msgstr ""
 
-#: personal/supann/class_supannAccount.inc:396
+#: personal/supann/class_supannAccount.inc:388
 msgid "supannEtuEtape"
 msgstr ""
 
-#: personal/supann/class_supannAccount.inc:400
+#: personal/supann/class_supannAccount.inc:392
 msgid "educational element"
 msgstr ""
 
-#: personal/supann/class_supannAccount.inc:400
+#: personal/supann/class_supannAccount.inc:392
 msgid "supannEtuElementPedagogique"
 msgstr ""
 
-#: personal/supann/class_supannAccount.inc:412
-msgid "Personal profile"
+#: personal/supann/class_supannAccount.inc:404
+msgid "Personnal profile"
 msgstr ""
 
-#: personal/supann/class_supannAccount.inc:415
+#: personal/supann/class_supannAccount.inc:407
 msgid "Personal ID"
 msgstr ""
 
-#: personal/supann/class_supannAccount.inc:415
+#: personal/supann/class_supannAccount.inc:407
 msgid "supannEmpId"
 msgstr ""
 
-#: personal/supann/class_supannAccount.inc:419
+#: personal/supann/class_supannAccount.inc:411
 msgid "Personal corps"
 msgstr ""
 
-#: personal/supann/class_supannAccount.inc:419
+#: personal/supann/class_supannAccount.inc:411
 msgid "supannEmpCorps"
 msgstr ""
 
-#: personal/supann/class_supannAccount.inc:424
-msgid "Activity"
+#: personal/supann/class_supannAccount.inc:416
+msgid "Activite"
 msgstr ""
 
-#: personal/supann/class_supannAccount.inc:424
+#: personal/supann/class_supannAccount.inc:416
 msgid "supannActivite"
 msgstr ""
 
-#: personal/supann/class_supannAccount.inc:431
+#: personal/supann/class_supannAccount.inc:423
 msgid "Roles"
 msgstr ""
 
-#: personal/supann/class_supannAccount.inc:438
+#: personal/supann/class_supannAccount.inc:430
 msgid "supannRoleEntite"
 msgstr ""
 
-#: personal/supann/class_supannAccount.inc:442
+#: personal/supann/class_supannAccount.inc:434
 msgid "Generic role"
 msgstr ""
 
-#: personal/supann/class_supannAccount.inc:442
+#: personal/supann/class_supannAccount.inc:434
 msgid "supannRoleGenerique"
 msgstr ""
 
-#: personal/supann/class_supannAccount.inc:446
-msgid "Entity assignment type"
-msgstr ""
-
 #: config/supann/class_supannConfig.inc:28
 msgid "SUPANN configuration"
 msgstr ""
diff --git a/supann/locale/fr/fusiondirectory.po b/supann/locale/fr/fusiondirectory.po
index 975f11652fa9e9ecc3b1ffed5676fcba00b67d0e..a5b0c83632eb7b2f60156fae22eaa4133f393dcf 100644
--- a/supann/locale/fr/fusiondirectory.po
+++ b/supann/locale/fr/fusiondirectory.po
@@ -3,24 +3,14 @@
 # This file is distributed under the same license as the PACKAGE package.
 # 
 # Translators:
-# gallak <antoine.gallavardin@free.fr>, 2013
-# Benoit Mortier <benoit.mortier@opensides.be>, 2015
-# MCMic, 2014
-# fusiondirectory <contact@fusiondirectory.org>, 2013-2014
-# fusiondirectory <contact@fusiondirectory.org>, 2012-2013
-# fusiondirectory <contact@fusiondirectory.org>, 2012
-# gallak <antoine.gallavardin@free.fr>, 2013
-# poterealpopolo <giuliano@opensides.be>, 2012
-# MCMic, 2014
-# poterealpopolo <giuliano@opensides.be>, 2012
 msgid ""
 msgstr ""
-"Project-Id-Version: FusionDirectory-108\n"
+"Project-Id-Version: FusionDirectory-109\n"
 "Report-Msgid-Bugs-To: documentation@lists.fusiondirectory.org\n"
-"POT-Creation-Date: 2015-03-31 11:49+0200\n"
-"PO-Revision-Date: 2015-03-31 11:31+0000\n"
-"Last-Translator: Benoit Mortier <benoit.mortier@opensides.be>\n"
-"Language-Team: French (http://www.transifex.com/projects/p/FusionDirectory-108/language/fr/)\n"
+"POT-Creation-Date: 2014-12-15 17:47+0100\n"
+"PO-Revision-Date: 2015-02-25 16:51+0000\n"
+"Last-Translator: fusiondirectory <contact@fusiondirectory.org>\n"
+"Language-Team: French (http://www.transifex.com/projects/p/FusionDirectory-109/language/fr/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -29,23 +19,24 @@ msgstr ""
 
 #: admin/supannStructures/class_supannStructuresManagement.inc:35
 msgid "Supann structures"
-msgstr "Structures SUPANN"
+msgstr "Structures supann"
 
 #: admin/supannStructures/class_supannStructuresManagement.inc:36
 msgid "Supann structures management"
-msgstr "Gestion des structures SUPANN"
+msgstr "Gestion des structures supann"
 
 #: admin/supannStructures/class_entite.inc:31
 #: admin/supannStructures/class_entite.inc:52
-msgid "Entity"
+#: personal/supann/class_supannAccount.inc:442
+msgid "Entite"
 msgstr "EntitÃ©"
 
 #: admin/supannStructures/class_entite.inc:32
-msgid "SUPANN Entity Settings"
-msgstr "ParamÃ¨tres de lâ€™entitÃ© SUPANN"
+msgid "SUPANN Entite Settings"
+msgstr "ParamÃ¨tres des entitÃ©s SUPANN"
 
 #: admin/supannStructures/class_entite.inc:35
-msgid "SUPANN Entity"
+msgid "SUPANN Entite"
 msgstr "EntitÃ© SUPANN"
 
 #: admin/supannStructures/class_entite.inc:55
@@ -54,12 +45,12 @@ 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Ã©"
+msgid "The name to write in the ou attribute for this entite"
+msgstr "Nom Ã  Ã©crire dans l'attribut 'organizationalUnit' pour cet Ã©tablissement"
 
 #: admin/supannStructures/class_entite.inc:61
 msgid "Administrative informations"
-msgstr "Informations administratives"
+msgstr "Informations Administratives"
 
 #: admin/supannStructures/class_entite.inc:64
 #: admin/supannStructures/class_etablissement.inc:80
@@ -67,8 +58,8 @@ 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 de cette entitÃ©"
+msgid "Phone number for this entite"
+msgstr "NumÃ©ro de tÃ©lÃ©phone pour cette entitÃ©"
 
 #: admin/supannStructures/class_entite.inc:68
 #: admin/supannStructures/class_etablissement.inc:84
@@ -76,16 +67,16 @@ msgid "Fax"
 msgstr "Fax"
 
 #: admin/supannStructures/class_entite.inc:68
-msgid "Fax number for this entity"
-msgstr "NumÃ©ro de fax de cette entitÃ©"
+msgid "Fax number for this entite"
+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Ã©"
+msgid "Postal address of this entite"
+msgstr "Adresse postale pour cette entitÃ©"
 
 #: admin/supannStructures/class_entite.inc:76
 #: admin/supannStructures/class_etablissement.inc:63
@@ -93,78 +84,79 @@ msgid "Description"
 msgstr "Description"
 
 #: admin/supannStructures/class_entite.inc:76
-msgid "Short description of this entity"
-msgstr "Courte description de cette entitÃ©"
+msgid "Short description of this entite"
+msgstr "Description courte pour cette entitÃ©"
 
 #: admin/supannStructures/class_entite.inc:82
 msgid "SUPANN informations"
-msgstr "Informations SUPANN"
+msgstr "Informations Supann"
 
 #: admin/supannStructures/class_entite.inc:85
-msgid "Entity type"
-msgstr "Type dâ€™entitÃ©"
+#: personal/supann/class_supannAccount.inc:438
+msgid "Entite 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Ã©"
+msgid "The best SUPANN type that fits this entite"
+msgstr "Type Supann correspondant le mieux Ã  cette entitÃ©"
 
 #: admin/supannStructures/class_entite.inc:89
-msgid "Entity code"
-msgstr "Code entitÃ©"
+msgid "Entite code"
+msgstr "Code de l'entitÃ©"
 
 #: admin/supannStructures/class_entite.inc:89
-msgid "The SUPANN code of this entity"
-msgstr "Le code SUPANN de cette entitÃ©"
+msgid "The SUPANN code of this entite"
+msgstr "Code Supann de cette entitÃ©"
 
 #: admin/supannStructures/class_entite.inc:94
-msgid "Parent entity"
+msgid "Parent entite"
 msgstr "EntitÃ© parente"
 
 #: admin/supannStructures/class_entite.inc:94
-msgid "The parent entity of this entity"
-msgstr "Lâ€™entitÃ© parente de cette entitÃ©"
+msgid "The parent entite of this entite"
+msgstr "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Ã©"
+msgid "SUPANN reference ID of this entite"
+msgstr "Identifiant de rÃ©fÃ©rence Supann pour cette entitÃ©"
 
 #: admin/supannStructures/class_etablissement.inc:31
-#: personal/supann/class_supannAccount.inc:324
-#: personal/supann/class_supannAccount.inc:363
-msgid "Establishment"
+#: personal/supann/class_supannAccount.inc:316
+#: personal/supann/class_supannAccount.inc:355
+msgid "Etablissement"
 msgstr "Ã‰tablissement"
 
 #: admin/supannStructures/class_etablissement.inc:32
-msgid "SUPANN Establishment Settings"
-msgstr "ParamÃ¨tres de l'Ã©tablissement SUPANN"
+msgid "SUPANN Etablissement Settings"
+msgstr "ParamÃ¨tres de l'Ã©tablissement"
 
 #: admin/supannStructures/class_etablissement.inc:35
-msgid "SUPANN Establishment"
-msgstr "Ã‰tablissement SUPANN"
+msgid "SUPANN Etablissement"
+msgstr "Code de l'Ã©tablissement"
 
 #: admin/supannStructures/class_etablissement.inc:52
 msgid "Properties"
 msgstr "PropriÃ©tÃ©s"
 
 #: admin/supannStructures/class_etablissement.inc:55
-msgid "Root Establishment"
+msgid "Root etablissement"
 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"
+msgid "Set this etablissement as the root one"
+msgstr "Marquer 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"
+msgid "The name to write in the o attribute for this etablissement"
+msgstr "Nom Ã  Ã©crire dans l'attribut 'organization' pour cet Ã©tablissement"
 
 #: admin/supannStructures/class_etablissement.inc:63
-msgid "A short description of this Establishment"
-msgstr "Courte description de cette Ã©tablissement"
+msgid "A short description of this etablissement"
+msgstr "Une courte description de cet Ã©tablissement"
 
 #: admin/supannStructures/class_etablissement.inc:69
 #: admin/supannStructures/class_etablissement.inc:72
@@ -172,80 +164,80 @@ 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"
+msgid "Usually the city in which is this etablissement"
+msgstr "Habituellement la ville de 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"
+msgid "The postal address of this etablissement"
+msgstr "Adresse postale de cet Ã©tablissement"
 
 #: admin/supannStructures/class_etablissement.inc:80
-msgid "Phone number for this Establishment"
-msgstr "Le numÃ©ro de tÃ©lÃ©phone de lâ€™Ã©tablissement"
+msgid "Phone number for this etablissement"
+msgstr "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"
+msgid "Fax number for this etablissement"
+msgstr "NumÃ©ro de fax de l'Ã©tablissement"
 
 #: admin/supannStructures/class_etablissement.inc:90
 msgid "SUPANN properties"
-msgstr "PropriÃ©tÃ©s SUPANN"
+msgstr "PropriÃ©tÃ©s Supann"
 
 #: admin/supannStructures/class_etablissement.inc:93
-msgid "Establishment code"
+msgid "Etablissement 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 {â€¯})"
+msgid "The code of this etablissement (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"
+msgstr "Code Supann"
 
 #: admin/supannStructures/class_etablissement.inc:98
-msgid "The SUPANN code for this Establishment"
-msgstr "Le code SUPANN de cet Ã©tablissement"
+msgid "The SUPANN code for this etablissement"
+msgstr "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"
+msgid "The legal name of this etablissement"
+msgstr "Nom lÃ©gal de l'Ã©tablissement"
 
 #: admin/supannStructures/class_etablissement.inc:107
 msgid "Home page URI"
-msgstr "URL du site web"
+msgstr "URL du 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"
+msgid "The URI of this etablissement website home page"
+msgstr "URL du site web officiel de l'Ã©tablissement"
 
 #: admin/supannStructures/class_etablissement.inc:111
 msgid "Institution URI"
 msgstr "URI 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"
+msgid "The URI of this etablissement institution website"
+msgstr "URI du site web institutionnel de l'Ã©tablissement"
 
 #: admin/supannStructures/class_etablissement.inc:115
 msgid "White pages URI"
-msgstr "Annuaire pages blanches"
+msgstr "Annuaire pages blanches de l'Ã©tablissement"
 
 #: admin/supannStructures/class_etablissement.inc:115
-msgid "The URI of this Establishment white pages"
-msgstr "Lâ€™URI des pages blanches de cet Ã©tablissement"
+msgid "The URI of this etablissement white pages"
+msgstr "URI du service pages blanches de l'Ã©tablissement"
 
 #: admin/supannStructures/class_etablissement.inc:148
-#: admin/supannStructures/class_etablissement.inc:201
-#: admin/supannStructures/class_etablissement.inc:219
+#: admin/supannStructures/class_etablissement.inc:198
+#: admin/supannStructures/class_etablissement.inc:216
 msgid "LDAP error"
 msgstr "Erreur LDAP"
 
@@ -256,7 +248,7 @@ msgstr "Erreur de Fichier"
 #: admin/supannStructures/class_supann.inc:54
 #, php-format
 msgid "Cannot read file: '%s'"
-msgstr "Impossible de lire le fichierâ€¯: '%s'"
+msgstr "Impossible de lire le fichier '%s'"
 
 #: personal/supann/class_supannAccount.inc:35
 #: personal/supann/class_supannAccount.inc:109
@@ -321,11 +313,11 @@ msgstr "9Ã¨me annÃ©e"
 
 #: personal/supann/class_supannAccount.inc:214
 msgid "SupAnn"
-msgstr "SUPANN"
+msgstr "Supann"
 
 #: personal/supann/class_supannAccount.inc:215
 msgid "SupAnn informations management plugin"
-msgstr "Plugin de gestion des informations SUPANN"
+msgstr "Extension de gestion des informations Supann"
 
 #: personal/supann/class_supannAccount.inc:232
 msgid "Identity"
@@ -365,255 +357,242 @@ msgstr "Surnom"
 msgid "eduPersonNickName - Can contain a nick name for this user"
 msgstr "eduPersonNickName - peut contenir un surnom pour cet utilisateur"
 
-#: personal/supann/class_supannAccount.inc:253
-msgid "Ref ids"
-msgstr "Ids de rÃ©fÃ©rences"
-
-#: personal/supann/class_supannAccount.inc:253
-msgid "supannRefId - IDs/links for this user on other systems"
-msgstr "supannRefId - ID / liens pour cet utilisateur sur d'autres systÃ¨mes"
-
-#: personal/supann/class_supannAccount.inc:262
+#: personal/supann/class_supannAccount.inc:254
 msgid "Contact"
 msgstr "Contact"
 
-#: personal/supann/class_supannAccount.inc:266
+#: personal/supann/class_supannAccount.inc:258
 msgid "Other phone numbers"
 msgstr "Autre numÃ©ros de tÃ©lÃ©phone"
 
-#: personal/supann/class_supannAccount.inc:266
+#: personal/supann/class_supannAccount.inc:258
 msgid "supannAutreTelephone - Other phone numbers for this user"
 msgstr "supannAutreTelephone - Autres numÃ©ros de tÃ©lÃ©phone pour cet utilisateur"
 
-#: personal/supann/class_supannAccount.inc:272
+#: personal/supann/class_supannAccount.inc:264
 msgid "Other mail addresses"
 msgstr "Autres adresses emails"
 
-#: personal/supann/class_supannAccount.inc:272
+#: personal/supann/class_supannAccount.inc:264
 msgid ""
 "supannAutreMail - Other mail addresses for this user. Each must be unique"
-msgstr "supannAutreMail - Autres adresse email pour cet utilisateur. Chacune doit Ãªtre unique"
+msgstr "supannAutreMail - Autres adresse emailpour cet utilisateur. Chacun doit Ãªtre unique"
 
-#: personal/supann/class_supannAccount.inc:278
+#: personal/supann/class_supannAccount.inc:270
 msgid "Personal mail addresses"
-msgstr "Adresses email personnelles"
+msgstr "Adresse email personnelle"
 
-#: personal/supann/class_supannAccount.inc:278
+#: personal/supann/class_supannAccount.inc:270
 msgid "supannMailPerso - Personal mail addresses for this user"
-msgstr "supannMailPerso - Adresses email personnelles pour cet utilisateur"
+msgstr "supannMailPerso - Adresse email personnelle pour cet utilisateur"
 
-#: personal/supann/class_supannAccount.inc:283
-msgid "red List"
-msgstr "Liste rouge"
+#: personal/supann/class_supannAccount.inc:275
+msgid "Liste rouge"
+msgstr "Liste Rouge"
 
-#: personal/supann/class_supannAccount.inc:283
+#: personal/supann/class_supannAccount.inc:275
 msgid "supannListeRouge - Should this person be on the red list"
 msgstr "supannListeRouge - Cette personne ne doit pas apparaÃ®tre dans les annuaires pages blanches"
 
-#: personal/supann/class_supannAccount.inc:289
+#: personal/supann/class_supannAccount.inc:281
 msgid "Affectation"
 msgstr "Affectation"
 
-#: personal/supann/class_supannAccount.inc:292
-msgid "Entity primary assignment"
-msgstr "EntitÃ© principale"
+#: personal/supann/class_supannAccount.inc:284
+msgid "Entite affectation principale"
+msgstr "EntitÃ© principale d'affectation"
 
-#: personal/supann/class_supannAccount.inc:292
+#: personal/supann/class_supannAccount.inc:284
 msgid "supannEntiteAffectationPrincipale"
-msgstr "supannEntiteAffectationPrincipale"
+msgstr "Affectation entitÃ© principale"
 
-#: personal/supann/class_supannAccount.inc:297
-#: personal/supann/class_supannAccount.inc:388
-#: personal/supann/class_supannAccount.inc:450
-msgid "Entity assignment"
-msgstr "EntitÃ©s affectÃ©es"
+#: personal/supann/class_supannAccount.inc:289
+#: personal/supann/class_supannAccount.inc:380
+msgid "Entite affectation"
+msgstr "EntitÃ© d'affection"
 
-#: personal/supann/class_supannAccount.inc:297
-#: personal/supann/class_supannAccount.inc:450
+#: personal/supann/class_supannAccount.inc:289
+#: personal/supann/class_supannAccount.inc:442
 msgid "supannEntiteAffectation"
-msgstr "supannEntiteAffectation"
+msgstr "Affectation EntitÃ©"
 
-#: personal/supann/class_supannAccount.inc:303
-msgid "Entity type assignment"
-msgstr "Type dâ€™affectation"
+#: personal/supann/class_supannAccount.inc:295
+msgid "Type entite affectation"
+msgstr "Type de l'entitÃ© d'affectation"
 
-#: personal/supann/class_supannAccount.inc:303
-#: personal/supann/class_supannAccount.inc:446
+#: personal/supann/class_supannAccount.inc:295
+#: personal/supann/class_supannAccount.inc:438
 msgid "supannTypeEntiteAffectation"
-msgstr "supannTypeEntiteAffectation"
+msgstr "Type de l'entitÃ© d'affectation"
 
-#: personal/supann/class_supannAccount.inc:310
+#: personal/supann/class_supannAccount.inc:302
 msgid "Affiliation"
 msgstr "Affiliation"
 
-#: personal/supann/class_supannAccount.inc:313
+#: personal/supann/class_supannAccount.inc:305
 msgid "Primary affiliation"
-msgstr "Affiliation principale"
+msgstr "Affiliation primaire"
 
-#: personal/supann/class_supannAccount.inc:313
+#: personal/supann/class_supannAccount.inc:305
 msgid "eduPersonPrimaryAffiliation"
-msgstr "eduPersonPrimaryAffiliation"
+msgstr "Affiliation primaire eduPerson"
 
-#: personal/supann/class_supannAccount.inc:318
+#: personal/supann/class_supannAccount.inc:310
 msgid "Affiliations"
-msgstr "Affiliations"
+msgstr "Affiliation"
 
-#: personal/supann/class_supannAccount.inc:318
+#: personal/supann/class_supannAccount.inc:310
 msgid "eduPersonAffiliation"
-msgstr "eduPersonAffiliation"
+msgstr "Affiliation eduPerson"
 
-#: personal/supann/class_supannAccount.inc:324
+#: personal/supann/class_supannAccount.inc:316
 msgid "supannEtablissement"
-msgstr "supannEtablissement"
+msgstr "Code de l'Ã©tablissement"
 
-#: personal/supann/class_supannAccount.inc:331
+#: personal/supann/class_supannAccount.inc:323
 msgid "Student profile"
 msgstr "Profil Ã©tudiant"
 
-#: personal/supann/class_supannAccount.inc:334
+#: personal/supann/class_supannAccount.inc:326
 msgid "INE code"
 msgstr "Code INE"
 
-#: personal/supann/class_supannAccount.inc:334
+#: personal/supann/class_supannAccount.inc:326
 msgid "supannCodeINE - INE code of this student"
 msgstr "supannCodeINE - code INE de l'Ã©tudiant"
 
-#: personal/supann/class_supannAccount.inc:338
+#: personal/supann/class_supannAccount.inc:330
 msgid "Student ID"
-msgstr "Identifiant Ã©tudiant"
+msgstr "identifiant de Ã‰tudiant"
 
-#: personal/supann/class_supannAccount.inc:338
+#: personal/supann/class_supannAccount.inc:330
 msgid "supannEtuId - scolarity id"
 msgstr "supannEtuId - identifiant scolaire"
 
-#: personal/supann/class_supannAccount.inc:344
+#: personal/supann/class_supannAccount.inc:336
 msgid "Student subscriptions"
 msgstr "Inscriptions de l'Ã©tudiant"
 
-#: personal/supann/class_supannAccount.inc:359
+#: personal/supann/class_supannAccount.inc:351
 msgid "supannEtuInscription - Subscriptions for this student"
-msgstr "supannEtuInscription - Inscriptions pour cet Ã©tudiant"
+msgstr "supannEtuInscription - Inscription pour cet Ã©tudiant"
 
-#: personal/supann/class_supannAccount.inc:363
+#: personal/supann/class_supannAccount.inc:355
 msgid ""
 "supannEtablissement - Etablissement in which this subscription was done"
 msgstr "supannEtablissement - Ã‰tablissement dans lequel l'inscription a Ã©tÃ© faite"
 
-#: personal/supann/class_supannAccount.inc:367
+#: personal/supann/class_supannAccount.inc:359
 msgid "Year"
 msgstr "AnnÃ©e"
 
-#: personal/supann/class_supannAccount.inc:367
+#: personal/supann/class_supannAccount.inc:359
 msgid "supannEtuAnneeInscription - The year this subscription will begin"
 msgstr "supannEtuAnneeInscription - AnnÃ©e d'inscription"
 
-#: personal/supann/class_supannAccount.inc:372
+#: personal/supann/class_supannAccount.inc:364
 msgid "Subscription type"
 msgstr "Type d'inscription"
 
-#: personal/supann/class_supannAccount.inc:372
+#: personal/supann/class_supannAccount.inc:364
 msgid "supannEtuRegimeInscription - The type of this subscription"
 msgstr "supannEtuRegimeInscription - Type d'inscription"
 
-#: personal/supann/class_supannAccount.inc:376
-msgid "Disciplinary Sector"
+#: personal/supann/class_supannAccount.inc:368
+msgid "Secteur Disciplinaire"
 msgstr "Secteur disciplinaire"
 
-#: personal/supann/class_supannAccount.inc:376
+#: personal/supann/class_supannAccount.inc:368
 msgid "supannEtuSecteurDisciplinaire"
-msgstr "supannEtuSecteurDisciplinaire"
+msgstr "Secteur disciplinaire"
 
-#: personal/supann/class_supannAccount.inc:380
+#: personal/supann/class_supannAccount.inc:372
 msgid "Diploma type"
 msgstr "Type de diplÃ´me"
 
-#: personal/supann/class_supannAccount.inc:380
+#: personal/supann/class_supannAccount.inc:372
 msgid "supannEtuTypeDiplome - Type of diploma"
 msgstr "supannEtuTypeDiplome - Type de diplÃ´me"
 
-#: personal/supann/class_supannAccount.inc:384
-msgid "Curriculum year "
-msgstr "AnnÃ©e cursus"
+#: personal/supann/class_supannAccount.inc:376
+msgid "Cursus annee"
+msgstr "AnnÃ©e du cursus"
 
-#: personal/supann/class_supannAccount.inc:384
+#: personal/supann/class_supannAccount.inc:376
 msgid "supannEtuCursusAnnee"
-msgstr "supannEtuCursusAnnee"
+msgstr "AnnÃ©e du cursus"
 
-#: personal/supann/class_supannAccount.inc:388
+#: personal/supann/class_supannAccount.inc:380
 msgid "supannEntiteAffectation_affect"
-msgstr "supannEntiteAffectation_affect"
+msgstr "EntitÃ© d'affectation "
 
-#: personal/supann/class_supannAccount.inc:392
+#: personal/supann/class_supannAccount.inc:384
 msgid "Diploma"
 msgstr "DiplÃ´me"
 
-#: personal/supann/class_supannAccount.inc:392
+#: personal/supann/class_supannAccount.inc:384
 msgid "supannEtuDiplome"
-msgstr "supannEtuDiplome"
+msgstr "DiplÃ´me"
 
-#: personal/supann/class_supannAccount.inc:396
+#: personal/supann/class_supannAccount.inc:388
 msgid "Step"
 msgstr "Ã‰tape"
 
-#: personal/supann/class_supannAccount.inc:396
+#: personal/supann/class_supannAccount.inc:388
 msgid "supannEtuEtape"
-msgstr "supannEtuEtape"
+msgstr "Etape"
 
-#: personal/supann/class_supannAccount.inc:400
+#: personal/supann/class_supannAccount.inc:392
 msgid "educational element"
 msgstr "Ã‰lÃ©ment pÃ©dagogique"
 
-#: personal/supann/class_supannAccount.inc:400
+#: personal/supann/class_supannAccount.inc:392
 msgid "supannEtuElementPedagogique"
-msgstr "supannEtuElementPedagogique"
+msgstr "Ã‰lÃ©ment pÃ©dagogique"
 
-#: personal/supann/class_supannAccount.inc:412
-msgid "Personal profile"
-msgstr "Profil personel"
+#: personal/supann/class_supannAccount.inc:404
+msgid "Personnal profile"
+msgstr "Profil personnel"
 
-#: personal/supann/class_supannAccount.inc:415
+#: personal/supann/class_supannAccount.inc:407
 msgid "Personal ID"
 msgstr "Identifiant personnel"
 
-#: personal/supann/class_supannAccount.inc:415
+#: personal/supann/class_supannAccount.inc:407
 msgid "supannEmpId"
-msgstr "supannEmpId"
+msgstr "Emp Id"
 
-#: personal/supann/class_supannAccount.inc:419
+#: personal/supann/class_supannAccount.inc:411
 msgid "Personal corps"
 msgstr "Corps de la personne"
 
-#: personal/supann/class_supannAccount.inc:419
+#: personal/supann/class_supannAccount.inc:411
 msgid "supannEmpCorps"
-msgstr "supannEmpCorps"
+msgstr "Corps emp"
 
-#: personal/supann/class_supannAccount.inc:424
-msgid "Activity"
+#: personal/supann/class_supannAccount.inc:416
+msgid "Activite"
 msgstr "ActivitÃ©"
 
-#: personal/supann/class_supannAccount.inc:424
+#: personal/supann/class_supannAccount.inc:416
 msgid "supannActivite"
-msgstr "supannActivite"
+msgstr "ActivitÃ©"
 
-#: personal/supann/class_supannAccount.inc:431
+#: personal/supann/class_supannAccount.inc:423
 msgid "Roles"
 msgstr "RÃ´les"
 
-#: personal/supann/class_supannAccount.inc:438
+#: personal/supann/class_supannAccount.inc:430
 msgid "supannRoleEntite"
-msgstr "supannRoleEntite"
+msgstr "RÃ´le de l'entitÃ©"
 
-#: personal/supann/class_supannAccount.inc:442
+#: personal/supann/class_supannAccount.inc:434
 msgid "Generic role"
 msgstr "RÃ´le gÃ©nÃ©rique"
 
-#: personal/supann/class_supannAccount.inc:442
+#: personal/supann/class_supannAccount.inc:434
 msgid "supannRoleGenerique"
-msgstr "supannRoleGenerique"
-
-#: personal/supann/class_supannAccount.inc:446
-msgid "Entity assignment type"
-msgstr "Type dâ€™affectation"
+msgstr "RÃ´le gÃ©nÃ©rique"
 
 #: config/supann/class_supannConfig.inc:28
 msgid "SUPANN configuration"
@@ -621,16 +600,16 @@ msgstr "Configuration de SUPANN"
 
 #: config/supann/class_supannConfig.inc:29
 msgid "FusionDirectory SUPANN plugin configuration"
-msgstr "Configuration du plugin SUPANN "
+msgstr "Configuration de l'extension SUPANN "
 
 #: config/supann/class_supannConfig.inc:42
 msgid "SUPANN"
-msgstr "SUPANN"
+msgstr "Supann"
 
 #: config/supann/class_supannConfig.inc:45
 msgid "SUPANN RDN"
-msgstr "Branche SUPANN"
+msgstr "Chemin relatif pour les objets Supann"
 
 #: config/supann/class_supannConfig.inc:45
 msgid "Branch in which SUPANN structures will be stored"
-msgstr "Branche oÃ¹ seront stockÃ©s les objets SUPANN"
+msgstr "Branche oÃ¹ seront stockÃ©s les objets Supann"
diff --git a/supann/locale/id/fusiondirectory.po b/supann/locale/id/fusiondirectory.po
index efc83447417dc8faed66d22df40a95e950bb48a6..5bcdd4c5fc2dfa2b3152c68c5c907ca68f59b155 100644
--- a/supann/locale/id/fusiondirectory.po
+++ b/supann/locale/id/fusiondirectory.po
@@ -5,12 +5,12 @@
 # Translators:
 msgid ""
 msgstr ""
-"Project-Id-Version: FusionDirectory-108\n"
+"Project-Id-Version: FusionDirectory-109\n"
 "Report-Msgid-Bugs-To: documentation@lists.fusiondirectory.org\n"
-"POT-Creation-Date: 2015-03-31 11:49+0200\n"
-"PO-Revision-Date: 2015-03-31 10:46+0000\n"
+"POT-Creation-Date: 2014-12-15 17:47+0100\n"
+"PO-Revision-Date: 2014-12-15 17:05+0000\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>\n"
-"Language-Team: Indonesian (http://www.transifex.com/projects/p/FusionDirectory-108/language/id/)\n"
+"Language-Team: Indonesian (http://www.transifex.com/projects/p/FusionDirectory-109/language/id/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -27,15 +27,16 @@ msgstr ""
 
 #: admin/supannStructures/class_entite.inc:31
 #: admin/supannStructures/class_entite.inc:52
-msgid "Entity"
+#: personal/supann/class_supannAccount.inc:442
+msgid "Entite"
 msgstr ""
 
 #: admin/supannStructures/class_entite.inc:32
-msgid "SUPANN Entity Settings"
+msgid "SUPANN Entite Settings"
 msgstr ""
 
 #: admin/supannStructures/class_entite.inc:35
-msgid "SUPANN Entity"
+msgid "SUPANN Entite"
 msgstr ""
 
 #: admin/supannStructures/class_entite.inc:55
@@ -44,7 +45,7 @@ msgid "Name"
 msgstr ""
 
 #: admin/supannStructures/class_entite.inc:55
-msgid "The name to write in the ou attribute for this entity"
+msgid "The name to write in the ou attribute for this entite"
 msgstr ""
 
 #: admin/supannStructures/class_entite.inc:61
@@ -57,7 +58,7 @@ msgid "Telephone"
 msgstr ""
 
 #: admin/supannStructures/class_entite.inc:64
-msgid "Phone number for this entity"
+msgid "Phone number for this entite"
 msgstr ""
 
 #: admin/supannStructures/class_entite.inc:68
@@ -66,7 +67,7 @@ msgid "Fax"
 msgstr ""
 
 #: admin/supannStructures/class_entite.inc:68
-msgid "Fax number for this entity"
+msgid "Fax number for this entite"
 msgstr ""
 
 #: admin/supannStructures/class_entite.inc:72
@@ -74,7 +75,7 @@ msgid "Postal address"
 msgstr ""
 
 #: admin/supannStructures/class_entite.inc:72
-msgid "Postal address of this entity"
+msgid "Postal address of this entite"
 msgstr ""
 
 #: admin/supannStructures/class_entite.inc:76
@@ -83,7 +84,7 @@ msgid "Description"
 msgstr ""
 
 #: admin/supannStructures/class_entite.inc:76
-msgid "Short description of this entity"
+msgid "Short description of this entite"
 msgstr ""
 
 #: admin/supannStructures/class_entite.inc:82
@@ -91,27 +92,28 @@ msgid "SUPANN informations"
 msgstr ""
 
 #: admin/supannStructures/class_entite.inc:85
-msgid "Entity type"
+#: personal/supann/class_supannAccount.inc:438
+msgid "Entite type"
 msgstr ""
 
 #: admin/supannStructures/class_entite.inc:85
-msgid "The best SUPANN type that fits this entity"
+msgid "The best SUPANN type that fits this entite"
 msgstr ""
 
 #: admin/supannStructures/class_entite.inc:89
-msgid "Entity code"
+msgid "Entite code"
 msgstr ""
 
 #: admin/supannStructures/class_entite.inc:89
-msgid "The SUPANN code of this entity"
+msgid "The SUPANN code of this entite"
 msgstr ""
 
 #: admin/supannStructures/class_entite.inc:94
-msgid "Parent entity"
+msgid "Parent entite"
 msgstr ""
 
 #: admin/supannStructures/class_entite.inc:94
-msgid "The parent entity of this entity"
+msgid "The parent entite of this entite"
 msgstr ""
 
 #: admin/supannStructures/class_entite.inc:98
@@ -119,21 +121,21 @@ msgid "Reference ID"
 msgstr ""
 
 #: admin/supannStructures/class_entite.inc:98
-msgid "SUPANN reference ID of this entity"
+msgid "SUPANN reference ID of this entite"
 msgstr ""
 
 #: admin/supannStructures/class_etablissement.inc:31
-#: personal/supann/class_supannAccount.inc:324
-#: personal/supann/class_supannAccount.inc:363
-msgid "Establishment"
+#: personal/supann/class_supannAccount.inc:316
+#: personal/supann/class_supannAccount.inc:355
+msgid "Etablissement"
 msgstr ""
 
 #: admin/supannStructures/class_etablissement.inc:32
-msgid "SUPANN Establishment Settings"
+msgid "SUPANN Etablissement Settings"
 msgstr ""
 
 #: admin/supannStructures/class_etablissement.inc:35
-msgid "SUPANN Establishment"
+msgid "SUPANN Etablissement"
 msgstr ""
 
 #: admin/supannStructures/class_etablissement.inc:52
@@ -141,19 +143,19 @@ msgid "Properties"
 msgstr ""
 
 #: admin/supannStructures/class_etablissement.inc:55
-msgid "Root Establishment"
+msgid "Root etablissement"
 msgstr ""
 
 #: admin/supannStructures/class_etablissement.inc:55
-msgid "Set this Establishment as the root one"
+msgid "Set this etablissement as the root one"
 msgstr ""
 
 #: admin/supannStructures/class_etablissement.inc:59
-msgid "The name to write in the o attribute for this Establishment"
+msgid "The name to write in the o attribute for this etablissement"
 msgstr ""
 
 #: admin/supannStructures/class_etablissement.inc:63
-msgid "A short description of this Establishment"
+msgid "A short description of this etablissement"
 msgstr ""
 
 #: admin/supannStructures/class_etablissement.inc:69
@@ -162,7 +164,7 @@ msgid "Location"
 msgstr ""
 
 #: admin/supannStructures/class_etablissement.inc:72
-msgid "Usually the city where this Establishment is"
+msgid "Usually the city in which is this etablissement"
 msgstr ""
 
 #: admin/supannStructures/class_etablissement.inc:76
@@ -170,15 +172,15 @@ msgid "Address"
 msgstr ""
 
 #: admin/supannStructures/class_etablissement.inc:76
-msgid "The postal address of this Establishment"
+msgid "The postal address of this etablissement"
 msgstr ""
 
 #: admin/supannStructures/class_etablissement.inc:80
-msgid "Phone number for this Establishment"
+msgid "Phone number for this etablissement"
 msgstr ""
 
 #: admin/supannStructures/class_etablissement.inc:84
-msgid "Fax number for this Establishment"
+msgid "Fax number for this etablissement"
 msgstr ""
 
 #: admin/supannStructures/class_etablissement.inc:90
@@ -186,11 +188,11 @@ msgid "SUPANN properties"
 msgstr ""
 
 #: admin/supannStructures/class_etablissement.inc:93
-msgid "Establishment code"
+msgid "Etablissement code"
 msgstr ""
 
 #: admin/supannStructures/class_etablissement.inc:93
-msgid "The code of this Establishment (must have a prefix between {})"
+msgid "The code of this etablissement (must have a prefix between {})"
 msgstr ""
 
 #: admin/supannStructures/class_etablissement.inc:98
@@ -198,7 +200,7 @@ msgid "SUPANN code"
 msgstr ""
 
 #: admin/supannStructures/class_etablissement.inc:98
-msgid "The SUPANN code for this Establishment"
+msgid "The SUPANN code for this etablissement"
 msgstr ""
 
 #: admin/supannStructures/class_etablissement.inc:103
@@ -206,7 +208,7 @@ msgid "Legal name"
 msgstr ""
 
 #: admin/supannStructures/class_etablissement.inc:103
-msgid "The legal name of this Establishment"
+msgid "The legal name of this etablissement"
 msgstr ""
 
 #: admin/supannStructures/class_etablissement.inc:107
@@ -214,7 +216,7 @@ msgid "Home page URI"
 msgstr ""
 
 #: admin/supannStructures/class_etablissement.inc:107
-msgid "The URI of this Establishment website home page"
+msgid "The URI of this etablissement website home page"
 msgstr ""
 
 #: admin/supannStructures/class_etablissement.inc:111
@@ -222,7 +224,7 @@ msgid "Institution URI"
 msgstr ""
 
 #: admin/supannStructures/class_etablissement.inc:111
-msgid "The URI of this Establishment institution website"
+msgid "The URI of this etablissement institution website"
 msgstr ""
 
 #: admin/supannStructures/class_etablissement.inc:115
@@ -230,12 +232,12 @@ msgid "White pages URI"
 msgstr ""
 
 #: admin/supannStructures/class_etablissement.inc:115
-msgid "The URI of this Establishment white pages"
+msgid "The URI of this etablissement white pages"
 msgstr ""
 
 #: admin/supannStructures/class_etablissement.inc:148
-#: admin/supannStructures/class_etablissement.inc:201
-#: admin/supannStructures/class_etablissement.inc:219
+#: admin/supannStructures/class_etablissement.inc:198
+#: admin/supannStructures/class_etablissement.inc:216
 msgid "LDAP error"
 msgstr ""
 
@@ -355,256 +357,243 @@ msgstr ""
 msgid "eduPersonNickName - Can contain a nick name for this user"
 msgstr ""
 
-#: personal/supann/class_supannAccount.inc:253
-msgid "Ref ids"
-msgstr ""
-
-#: personal/supann/class_supannAccount.inc:253
-msgid "supannRefId - IDs/links for this user on other systems"
-msgstr ""
-
-#: personal/supann/class_supannAccount.inc:262
+#: personal/supann/class_supannAccount.inc:254
 msgid "Contact"
 msgstr ""
 
-#: personal/supann/class_supannAccount.inc:266
+#: personal/supann/class_supannAccount.inc:258
 msgid "Other phone numbers"
 msgstr ""
 
-#: personal/supann/class_supannAccount.inc:266
+#: personal/supann/class_supannAccount.inc:258
 msgid "supannAutreTelephone - Other phone numbers for this user"
 msgstr ""
 
-#: personal/supann/class_supannAccount.inc:272
+#: personal/supann/class_supannAccount.inc:264
 msgid "Other mail addresses"
 msgstr ""
 
-#: personal/supann/class_supannAccount.inc:272
+#: personal/supann/class_supannAccount.inc:264
 msgid ""
 "supannAutreMail - Other mail addresses for this user. Each must be unique"
 msgstr ""
 
-#: personal/supann/class_supannAccount.inc:278
+#: personal/supann/class_supannAccount.inc:270
 msgid "Personal mail addresses"
 msgstr ""
 
-#: personal/supann/class_supannAccount.inc:278
+#: personal/supann/class_supannAccount.inc:270
 msgid "supannMailPerso - Personal mail addresses for this user"
 msgstr ""
 
-#: personal/supann/class_supannAccount.inc:283
-msgid "red List"
+#: personal/supann/class_supannAccount.inc:275
+msgid "Liste rouge"
 msgstr ""
 
-#: personal/supann/class_supannAccount.inc:283
+#: personal/supann/class_supannAccount.inc:275
 msgid "supannListeRouge - Should this person be on the red list"
 msgstr ""
 
-#: personal/supann/class_supannAccount.inc:289
+#: personal/supann/class_supannAccount.inc:281
 msgid "Affectation"
 msgstr ""
 
-#: personal/supann/class_supannAccount.inc:292
-msgid "Entity primary assignment"
+#: personal/supann/class_supannAccount.inc:284
+msgid "Entite affectation principale"
 msgstr ""
 
-#: personal/supann/class_supannAccount.inc:292
+#: personal/supann/class_supannAccount.inc:284
 msgid "supannEntiteAffectationPrincipale"
 msgstr ""
 
-#: personal/supann/class_supannAccount.inc:297
-#: personal/supann/class_supannAccount.inc:388
-#: personal/supann/class_supannAccount.inc:450
-msgid "Entity assignment"
+#: personal/supann/class_supannAccount.inc:289
+#: personal/supann/class_supannAccount.inc:380
+msgid "Entite affectation"
 msgstr ""
 
-#: personal/supann/class_supannAccount.inc:297
-#: personal/supann/class_supannAccount.inc:450
+#: personal/supann/class_supannAccount.inc:289
+#: personal/supann/class_supannAccount.inc:442
 msgid "supannEntiteAffectation"
 msgstr ""
 
-#: personal/supann/class_supannAccount.inc:303
-msgid "Entity type assignment"
+#: personal/supann/class_supannAccount.inc:295
+msgid "Type entite affectation"
 msgstr ""
 
-#: personal/supann/class_supannAccount.inc:303
-#: personal/supann/class_supannAccount.inc:446
+#: personal/supann/class_supannAccount.inc:295
+#: personal/supann/class_supannAccount.inc:438
 msgid "supannTypeEntiteAffectation"
 msgstr ""
 
-#: personal/supann/class_supannAccount.inc:310
+#: personal/supann/class_supannAccount.inc:302
 msgid "Affiliation"
 msgstr ""
 
-#: personal/supann/class_supannAccount.inc:313
+#: personal/supann/class_supannAccount.inc:305
 msgid "Primary affiliation"
 msgstr ""
 
-#: personal/supann/class_supannAccount.inc:313
+#: personal/supann/class_supannAccount.inc:305
 msgid "eduPersonPrimaryAffiliation"
 msgstr ""
 
-#: personal/supann/class_supannAccount.inc:318
+#: personal/supann/class_supannAccount.inc:310
 msgid "Affiliations"
 msgstr ""
 
-#: personal/supann/class_supannAccount.inc:318
+#: personal/supann/class_supannAccount.inc:310
 msgid "eduPersonAffiliation"
 msgstr ""
 
-#: personal/supann/class_supannAccount.inc:324
+#: personal/supann/class_supannAccount.inc:316
 msgid "supannEtablissement"
 msgstr ""
 
-#: personal/supann/class_supannAccount.inc:331
+#: personal/supann/class_supannAccount.inc:323
 msgid "Student profile"
 msgstr ""
 
-#: personal/supann/class_supannAccount.inc:334
+#: personal/supann/class_supannAccount.inc:326
 msgid "INE code"
 msgstr ""
 
-#: personal/supann/class_supannAccount.inc:334
+#: personal/supann/class_supannAccount.inc:326
 msgid "supannCodeINE - INE code of this student"
 msgstr ""
 
-#: personal/supann/class_supannAccount.inc:338
+#: personal/supann/class_supannAccount.inc:330
 msgid "Student ID"
 msgstr ""
 
-#: personal/supann/class_supannAccount.inc:338
+#: personal/supann/class_supannAccount.inc:330
 msgid "supannEtuId - scolarity id"
 msgstr ""
 
-#: personal/supann/class_supannAccount.inc:344
+#: personal/supann/class_supannAccount.inc:336
 msgid "Student subscriptions"
 msgstr ""
 
-#: personal/supann/class_supannAccount.inc:359
+#: personal/supann/class_supannAccount.inc:351
 msgid "supannEtuInscription - Subscriptions for this student"
 msgstr ""
 
-#: personal/supann/class_supannAccount.inc:363
+#: personal/supann/class_supannAccount.inc:355
 msgid ""
 "supannEtablissement - Etablissement in which this subscription was done"
 msgstr ""
 
-#: personal/supann/class_supannAccount.inc:367
+#: personal/supann/class_supannAccount.inc:359
 msgid "Year"
 msgstr ""
 
-#: personal/supann/class_supannAccount.inc:367
+#: personal/supann/class_supannAccount.inc:359
 msgid "supannEtuAnneeInscription - The year this subscription will begin"
 msgstr ""
 
-#: personal/supann/class_supannAccount.inc:372
+#: personal/supann/class_supannAccount.inc:364
 msgid "Subscription type"
 msgstr ""
 
-#: personal/supann/class_supannAccount.inc:372
+#: personal/supann/class_supannAccount.inc:364
 msgid "supannEtuRegimeInscription - The type of this subscription"
 msgstr ""
 
-#: personal/supann/class_supannAccount.inc:376
-msgid "Disciplinary Sector"
+#: personal/supann/class_supannAccount.inc:368
+msgid "Secteur Disciplinaire"
 msgstr ""
 
-#: personal/supann/class_supannAccount.inc:376
+#: personal/supann/class_supannAccount.inc:368
 msgid "supannEtuSecteurDisciplinaire"
 msgstr ""
 
-#: personal/supann/class_supannAccount.inc:380
+#: personal/supann/class_supannAccount.inc:372
 msgid "Diploma type"
 msgstr ""
 
-#: personal/supann/class_supannAccount.inc:380
+#: personal/supann/class_supannAccount.inc:372
 msgid "supannEtuTypeDiplome - Type of diploma"
 msgstr ""
 
-#: personal/supann/class_supannAccount.inc:384
-msgid "Curriculum year "
+#: personal/supann/class_supannAccount.inc:376
+msgid "Cursus annee"
 msgstr ""
 
-#: personal/supann/class_supannAccount.inc:384
+#: personal/supann/class_supannAccount.inc:376
 msgid "supannEtuCursusAnnee"
 msgstr ""
 
-#: personal/supann/class_supannAccount.inc:388
+#: personal/supann/class_supannAccount.inc:380
 msgid "supannEntiteAffectation_affect"
 msgstr ""
 
-#: personal/supann/class_supannAccount.inc:392
+#: personal/supann/class_supannAccount.inc:384
 msgid "Diploma"
 msgstr ""
 
-#: personal/supann/class_supannAccount.inc:392
+#: personal/supann/class_supannAccount.inc:384
 msgid "supannEtuDiplome"
 msgstr ""
 
-#: personal/supann/class_supannAccount.inc:396
+#: personal/supann/class_supannAccount.inc:388
 msgid "Step"
 msgstr ""
 
-#: personal/supann/class_supannAccount.inc:396
+#: personal/supann/class_supannAccount.inc:388
 msgid "supannEtuEtape"
 msgstr ""
 
-#: personal/supann/class_supannAccount.inc:400
+#: personal/supann/class_supannAccount.inc:392
 msgid "educational element"
 msgstr ""
 
-#: personal/supann/class_supannAccount.inc:400
+#: personal/supann/class_supannAccount.inc:392
 msgid "supannEtuElementPedagogique"
 msgstr ""
 
-#: personal/supann/class_supannAccount.inc:412
-msgid "Personal profile"
+#: personal/supann/class_supannAccount.inc:404
+msgid "Personnal profile"
 msgstr ""
 
-#: personal/supann/class_supannAccount.inc:415
+#: personal/supann/class_supannAccount.inc:407
 msgid "Personal ID"
 msgstr ""
 
-#: personal/supann/class_supannAccount.inc:415
+#: personal/supann/class_supannAccount.inc:407
 msgid "supannEmpId"
 msgstr ""
 
-#: personal/supann/class_supannAccount.inc:419
+#: personal/supann/class_supannAccount.inc:411
 msgid "Personal corps"
 msgstr ""
 
-#: personal/supann/class_supannAccount.inc:419
+#: personal/supann/class_supannAccount.inc:411
 msgid "supannEmpCorps"
 msgstr ""
 
-#: personal/supann/class_supannAccount.inc:424
-msgid "Activity"
+#: personal/supann/class_supannAccount.inc:416
+msgid "Activite"
 msgstr ""
 
-#: personal/supann/class_supannAccount.inc:424
+#: personal/supann/class_supannAccount.inc:416
 msgid "supannActivite"
 msgstr ""
 
-#: personal/supann/class_supannAccount.inc:431
+#: personal/supann/class_supannAccount.inc:423
 msgid "Roles"
 msgstr ""
 
-#: personal/supann/class_supannAccount.inc:438
+#: personal/supann/class_supannAccount.inc:430
 msgid "supannRoleEntite"
 msgstr ""
 
-#: personal/supann/class_supannAccount.inc:442
+#: personal/supann/class_supannAccount.inc:434
 msgid "Generic role"
 msgstr ""
 
-#: personal/supann/class_supannAccount.inc:442
+#: personal/supann/class_supannAccount.inc:434
 msgid "supannRoleGenerique"
 msgstr ""
 
-#: personal/supann/class_supannAccount.inc:446
-msgid "Entity assignment type"
-msgstr ""
-
 #: config/supann/class_supannConfig.inc:28
 msgid "SUPANN configuration"
 msgstr ""
diff --git a/supann/locale/it/fusiondirectory.po b/supann/locale/it/fusiondirectory.po
index 27cc37b9814b631b572934f0c7cda14f91251bf9..4df25edb43ba576c8d4ee11a7533954c362f259c 100644
--- a/supann/locale/it/fusiondirectory.po
+++ b/supann/locale/it/fusiondirectory.po
@@ -3,17 +3,14 @@
 # This file is distributed under the same license as the PACKAGE package.
 # 
 # Translators:
-# poterealpopolo <giuliano@opensides.be>, 2013
-# poterealpopolo <giuliano@opensides.be>, 2012
-# poterealpopolo <giuliano@opensides.be>, 2012-2013
 msgid ""
 msgstr ""
-"Project-Id-Version: FusionDirectory-108\n"
+"Project-Id-Version: FusionDirectory-109\n"
 "Report-Msgid-Bugs-To: documentation@lists.fusiondirectory.org\n"
-"POT-Creation-Date: 2015-03-31 11:49+0200\n"
-"PO-Revision-Date: 2015-03-31 10:46+0000\n"
+"POT-Creation-Date: 2014-12-15 17:47+0100\n"
+"PO-Revision-Date: 2015-02-25 16:51+0000\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>\n"
-"Language-Team: Italian (http://www.transifex.com/projects/p/FusionDirectory-108/language/it/)\n"
+"Language-Team: Italian (http://www.transifex.com/projects/p/FusionDirectory-109/language/it/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -30,16 +27,17 @@ msgstr "Gestione delle strutture supann"
 
 #: admin/supannStructures/class_entite.inc:31
 #: admin/supannStructures/class_entite.inc:52
-msgid "Entity"
-msgstr ""
+#: personal/supann/class_supannAccount.inc:442
+msgid "Entite"
+msgstr "EntitÃ "
 
 #: admin/supannStructures/class_entite.inc:32
-msgid "SUPANN Entity Settings"
-msgstr ""
+msgid "SUPANN Entite Settings"
+msgstr "Impostazioni entitÃ  SUPANN"
 
 #: admin/supannStructures/class_entite.inc:35
-msgid "SUPANN Entity"
-msgstr ""
+msgid "SUPANN Entite"
+msgstr "EntitÃ  SUPANN"
 
 #: admin/supannStructures/class_entite.inc:55
 #: admin/supannStructures/class_etablissement.inc:59
@@ -47,7 +45,7 @@ msgid "Name"
 msgstr "Nome"
 
 #: admin/supannStructures/class_entite.inc:55
-msgid "The name to write in the ou attribute for this entity"
+msgid "The name to write in the ou attribute for this entite"
 msgstr ""
 
 #: admin/supannStructures/class_entite.inc:61
@@ -60,7 +58,7 @@ msgid "Telephone"
 msgstr "Telefono"
 
 #: admin/supannStructures/class_entite.inc:64
-msgid "Phone number for this entity"
+msgid "Phone number for this entite"
 msgstr ""
 
 #: admin/supannStructures/class_entite.inc:68
@@ -69,7 +67,7 @@ msgid "Fax"
 msgstr "Fax"
 
 #: admin/supannStructures/class_entite.inc:68
-msgid "Fax number for this entity"
+msgid "Fax number for this entite"
 msgstr ""
 
 #: admin/supannStructures/class_entite.inc:72
@@ -77,7 +75,7 @@ msgid "Postal address"
 msgstr "Indirizzo postale"
 
 #: admin/supannStructures/class_entite.inc:72
-msgid "Postal address of this entity"
+msgid "Postal address of this entite"
 msgstr ""
 
 #: admin/supannStructures/class_entite.inc:76
@@ -86,7 +84,7 @@ msgid "Description"
 msgstr "Descrizione"
 
 #: admin/supannStructures/class_entite.inc:76
-msgid "Short description of this entity"
+msgid "Short description of this entite"
 msgstr ""
 
 #: admin/supannStructures/class_entite.inc:82
@@ -94,27 +92,28 @@ msgid "SUPANN informations"
 msgstr ""
 
 #: admin/supannStructures/class_entite.inc:85
-msgid "Entity type"
+#: personal/supann/class_supannAccount.inc:438
+msgid "Entite type"
 msgstr ""
 
 #: admin/supannStructures/class_entite.inc:85
-msgid "The best SUPANN type that fits this entity"
+msgid "The best SUPANN type that fits this entite"
 msgstr ""
 
 #: admin/supannStructures/class_entite.inc:89
-msgid "Entity code"
+msgid "Entite code"
 msgstr ""
 
 #: admin/supannStructures/class_entite.inc:89
-msgid "The SUPANN code of this entity"
+msgid "The SUPANN code of this entite"
 msgstr ""
 
 #: admin/supannStructures/class_entite.inc:94
-msgid "Parent entity"
+msgid "Parent entite"
 msgstr ""
 
 #: admin/supannStructures/class_entite.inc:94
-msgid "The parent entity of this entity"
+msgid "The parent entite of this entite"
 msgstr ""
 
 #: admin/supannStructures/class_entite.inc:98
@@ -122,42 +121,42 @@ msgid "Reference ID"
 msgstr ""
 
 #: admin/supannStructures/class_entite.inc:98
-msgid "SUPANN reference ID of this entity"
+msgid "SUPANN reference ID of this entite"
 msgstr ""
 
 #: admin/supannStructures/class_etablissement.inc:31
-#: personal/supann/class_supannAccount.inc:324
-#: personal/supann/class_supannAccount.inc:363
-msgid "Establishment"
-msgstr ""
+#: personal/supann/class_supannAccount.inc:316
+#: personal/supann/class_supannAccount.inc:355
+msgid "Etablissement"
+msgstr "Immobile"
 
 #: admin/supannStructures/class_etablissement.inc:32
-msgid "SUPANN Establishment Settings"
-msgstr ""
+msgid "SUPANN Etablissement Settings"
+msgstr "Impostazioni supann dell'immobile"
 
 #: admin/supannStructures/class_etablissement.inc:35
-msgid "SUPANN Establishment"
-msgstr ""
+msgid "SUPANN Etablissement"
+msgstr "Immobile SUPANN"
 
 #: admin/supannStructures/class_etablissement.inc:52
 msgid "Properties"
 msgstr "ProprietÃ "
 
 #: admin/supannStructures/class_etablissement.inc:55
-msgid "Root Establishment"
-msgstr ""
+msgid "Root etablissement"
+msgstr "Immobile base"
 
 #: admin/supannStructures/class_etablissement.inc:55
-msgid "Set this Establishment as the root one"
-msgstr ""
+msgid "Set this etablissement as the root one"
+msgstr "Imposta questo immobile come base"
 
 #: admin/supannStructures/class_etablissement.inc:59
-msgid "The name to write in the o attribute for this Establishment"
-msgstr ""
+msgid "The name to write in the o attribute for this etablissement"
+msgstr "Il nome da scrivere nell'attributo o di questo immobile"
 
 #: admin/supannStructures/class_etablissement.inc:63
-msgid "A short description of this Establishment"
-msgstr ""
+msgid "A short description of this etablissement"
+msgstr "Una breve descrizione di questo immobile"
 
 #: admin/supannStructures/class_etablissement.inc:69
 #: admin/supannStructures/class_etablissement.inc:72
@@ -165,35 +164,35 @@ msgid "Location"
 msgstr "LocalitÃ "
 
 #: admin/supannStructures/class_etablissement.inc:72
-msgid "Usually the city where this Establishment is"
-msgstr ""
+msgid "Usually the city in which is this etablissement"
+msgstr "La cittÃ  dove Ã¨ 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 ""
+msgid "The postal address of this etablissement"
+msgstr "L'indirizzo postale di questo immobile"
 
 #: admin/supannStructures/class_etablissement.inc:80
-msgid "Phone number for this Establishment"
-msgstr ""
+msgid "Phone number for this etablissement"
+msgstr "Numero di telefono per questo immobile"
 
 #: admin/supannStructures/class_etablissement.inc:84
-msgid "Fax number for this Establishment"
-msgstr ""
+msgid "Fax number for this etablissement"
+msgstr "Numero di Fax per questo immobile"
 
 #: admin/supannStructures/class_etablissement.inc:90
 msgid "SUPANN properties"
 msgstr "ProprietÃ  SUPANN"
 
 #: admin/supannStructures/class_etablissement.inc:93
-msgid "Establishment code"
-msgstr ""
+msgid "Etablissement code"
+msgstr "Codice dell'immobile"
 
 #: admin/supannStructures/class_etablissement.inc:93
-msgid "The code of this Establishment (must have a prefix between {})"
+msgid "The code of this etablissement (must have a prefix between {})"
 msgstr ""
 
 #: admin/supannStructures/class_etablissement.inc:98
@@ -201,31 +200,31 @@ msgid "SUPANN code"
 msgstr "Codice SUPANN"
 
 #: admin/supannStructures/class_etablissement.inc:98
-msgid "The SUPANN code for this Establishment"
-msgstr ""
+msgid "The SUPANN code for this etablissement"
+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 ""
+msgid "The legal name of this etablissement"
+msgstr "Nome 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 ""
+msgid "The URI of this etablissement website home page"
+msgstr "L'URI della home page di questo immobile"
 
 #: admin/supannStructures/class_etablissement.inc:111
 msgid "Institution URI"
 msgstr ""
 
 #: admin/supannStructures/class_etablissement.inc:111
-msgid "The URI of this Establishment institution website"
+msgid "The URI of this etablissement institution website"
 msgstr ""
 
 #: admin/supannStructures/class_etablissement.inc:115
@@ -233,12 +232,12 @@ msgid "White pages URI"
 msgstr ""
 
 #: admin/supannStructures/class_etablissement.inc:115
-msgid "The URI of this Establishment white pages"
+msgid "The URI of this etablissement white pages"
 msgstr ""
 
 #: admin/supannStructures/class_etablissement.inc:148
-#: admin/supannStructures/class_etablissement.inc:201
-#: admin/supannStructures/class_etablissement.inc:219
+#: admin/supannStructures/class_etablissement.inc:198
+#: admin/supannStructures/class_etablissement.inc:216
 msgid "LDAP error"
 msgstr "Errore LDAP"
 
@@ -358,256 +357,243 @@ msgstr ""
 msgid "eduPersonNickName - Can contain a nick name for this user"
 msgstr ""
 
-#: personal/supann/class_supannAccount.inc:253
-msgid "Ref ids"
-msgstr ""
-
-#: personal/supann/class_supannAccount.inc:253
-msgid "supannRefId - IDs/links for this user on other systems"
-msgstr ""
-
-#: personal/supann/class_supannAccount.inc:262
+#: personal/supann/class_supannAccount.inc:254
 msgid "Contact"
 msgstr "Contatto"
 
-#: personal/supann/class_supannAccount.inc:266
+#: personal/supann/class_supannAccount.inc:258
 msgid "Other phone numbers"
 msgstr ""
 
-#: personal/supann/class_supannAccount.inc:266
+#: personal/supann/class_supannAccount.inc:258
 msgid "supannAutreTelephone - Other phone numbers for this user"
 msgstr ""
 
-#: personal/supann/class_supannAccount.inc:272
+#: personal/supann/class_supannAccount.inc:264
 msgid "Other mail addresses"
 msgstr ""
 
-#: personal/supann/class_supannAccount.inc:272
+#: personal/supann/class_supannAccount.inc:264
 msgid ""
 "supannAutreMail - Other mail addresses for this user. Each must be unique"
 msgstr ""
 
-#: personal/supann/class_supannAccount.inc:278
+#: personal/supann/class_supannAccount.inc:270
 msgid "Personal mail addresses"
 msgstr ""
 
-#: personal/supann/class_supannAccount.inc:278
+#: personal/supann/class_supannAccount.inc:270
 msgid "supannMailPerso - Personal mail addresses for this user"
 msgstr ""
 
-#: personal/supann/class_supannAccount.inc:283
-msgid "red List"
+#: personal/supann/class_supannAccount.inc:275
+msgid "Liste rouge"
 msgstr ""
 
-#: personal/supann/class_supannAccount.inc:283
+#: personal/supann/class_supannAccount.inc:275
 msgid "supannListeRouge - Should this person be on the red list"
 msgstr ""
 
-#: personal/supann/class_supannAccount.inc:289
+#: personal/supann/class_supannAccount.inc:281
 msgid "Affectation"
 msgstr "Affettazione"
 
-#: personal/supann/class_supannAccount.inc:292
-msgid "Entity primary assignment"
+#: personal/supann/class_supannAccount.inc:284
+msgid "Entite affectation principale"
 msgstr ""
 
-#: personal/supann/class_supannAccount.inc:292
+#: personal/supann/class_supannAccount.inc:284
 msgid "supannEntiteAffectationPrincipale"
 msgstr "supannEntiteAffectationPrincipale"
 
-#: personal/supann/class_supannAccount.inc:297
-#: personal/supann/class_supannAccount.inc:388
-#: personal/supann/class_supannAccount.inc:450
-msgid "Entity assignment"
+#: personal/supann/class_supannAccount.inc:289
+#: personal/supann/class_supannAccount.inc:380
+msgid "Entite affectation"
 msgstr ""
 
-#: personal/supann/class_supannAccount.inc:297
-#: personal/supann/class_supannAccount.inc:450
+#: personal/supann/class_supannAccount.inc:289
+#: personal/supann/class_supannAccount.inc:442
 msgid "supannEntiteAffectation"
 msgstr "supannEntiteAffectation"
 
-#: personal/supann/class_supannAccount.inc:303
-msgid "Entity type assignment"
+#: personal/supann/class_supannAccount.inc:295
+msgid "Type entite affectation"
 msgstr ""
 
-#: personal/supann/class_supannAccount.inc:303
-#: personal/supann/class_supannAccount.inc:446
+#: personal/supann/class_supannAccount.inc:295
+#: personal/supann/class_supannAccount.inc:438
 msgid "supannTypeEntiteAffectation"
 msgstr "supannTypeEntiteAffectation"
 
-#: personal/supann/class_supannAccount.inc:310
+#: personal/supann/class_supannAccount.inc:302
 msgid "Affiliation"
 msgstr "Affiliazione"
 
-#: personal/supann/class_supannAccount.inc:313
+#: personal/supann/class_supannAccount.inc:305
 msgid "Primary affiliation"
 msgstr ""
 
-#: personal/supann/class_supannAccount.inc:313
+#: personal/supann/class_supannAccount.inc:305
 msgid "eduPersonPrimaryAffiliation"
 msgstr "eduPersonPrimaryAffiliation"
 
-#: personal/supann/class_supannAccount.inc:318
+#: personal/supann/class_supannAccount.inc:310
 msgid "Affiliations"
 msgstr "Affiliazione"
 
-#: personal/supann/class_supannAccount.inc:318
+#: personal/supann/class_supannAccount.inc:310
 msgid "eduPersonAffiliation"
 msgstr "eduPersonAffiliation"
 
-#: personal/supann/class_supannAccount.inc:324
+#: personal/supann/class_supannAccount.inc:316
 msgid "supannEtablissement"
 msgstr "supannImmobile"
 
-#: personal/supann/class_supannAccount.inc:331
+#: personal/supann/class_supannAccount.inc:323
 msgid "Student profile"
 msgstr ""
 
-#: personal/supann/class_supannAccount.inc:334
+#: personal/supann/class_supannAccount.inc:326
 msgid "INE code"
 msgstr ""
 
-#: personal/supann/class_supannAccount.inc:334
+#: personal/supann/class_supannAccount.inc:326
 msgid "supannCodeINE - INE code of this student"
 msgstr ""
 
-#: personal/supann/class_supannAccount.inc:338
+#: personal/supann/class_supannAccount.inc:330
 msgid "Student ID"
 msgstr ""
 
-#: personal/supann/class_supannAccount.inc:338
+#: personal/supann/class_supannAccount.inc:330
 msgid "supannEtuId - scolarity id"
 msgstr ""
 
-#: personal/supann/class_supannAccount.inc:344
+#: personal/supann/class_supannAccount.inc:336
 msgid "Student subscriptions"
 msgstr ""
 
-#: personal/supann/class_supannAccount.inc:359
+#: personal/supann/class_supannAccount.inc:351
 msgid "supannEtuInscription - Subscriptions for this student"
 msgstr ""
 
-#: personal/supann/class_supannAccount.inc:363
+#: personal/supann/class_supannAccount.inc:355
 msgid ""
 "supannEtablissement - Etablissement in which this subscription was done"
 msgstr ""
 
-#: personal/supann/class_supannAccount.inc:367
+#: personal/supann/class_supannAccount.inc:359
 msgid "Year"
 msgstr "Anno"
 
-#: personal/supann/class_supannAccount.inc:367
+#: personal/supann/class_supannAccount.inc:359
 msgid "supannEtuAnneeInscription - The year this subscription will begin"
 msgstr ""
 
-#: personal/supann/class_supannAccount.inc:372
+#: personal/supann/class_supannAccount.inc:364
 msgid "Subscription type"
 msgstr ""
 
-#: personal/supann/class_supannAccount.inc:372
+#: personal/supann/class_supannAccount.inc:364
 msgid "supannEtuRegimeInscription - The type of this subscription"
 msgstr ""
 
-#: personal/supann/class_supannAccount.inc:376
-msgid "Disciplinary Sector"
+#: personal/supann/class_supannAccount.inc:368
+msgid "Secteur Disciplinaire"
 msgstr ""
 
-#: personal/supann/class_supannAccount.inc:376
+#: personal/supann/class_supannAccount.inc:368
 msgid "supannEtuSecteurDisciplinaire"
 msgstr ""
 
-#: personal/supann/class_supannAccount.inc:380
+#: personal/supann/class_supannAccount.inc:372
 msgid "Diploma type"
 msgstr ""
 
-#: personal/supann/class_supannAccount.inc:380
+#: personal/supann/class_supannAccount.inc:372
 msgid "supannEtuTypeDiplome - Type of diploma"
 msgstr ""
 
-#: personal/supann/class_supannAccount.inc:384
-msgid "Curriculum year "
+#: personal/supann/class_supannAccount.inc:376
+msgid "Cursus annee"
 msgstr ""
 
-#: personal/supann/class_supannAccount.inc:384
+#: personal/supann/class_supannAccount.inc:376
 msgid "supannEtuCursusAnnee"
 msgstr ""
 
-#: personal/supann/class_supannAccount.inc:388
+#: personal/supann/class_supannAccount.inc:380
 msgid "supannEntiteAffectation_affect"
 msgstr ""
 
-#: personal/supann/class_supannAccount.inc:392
+#: personal/supann/class_supannAccount.inc:384
 msgid "Diploma"
 msgstr ""
 
-#: personal/supann/class_supannAccount.inc:392
+#: personal/supann/class_supannAccount.inc:384
 msgid "supannEtuDiplome"
 msgstr ""
 
-#: personal/supann/class_supannAccount.inc:396
+#: personal/supann/class_supannAccount.inc:388
 msgid "Step"
 msgstr ""
 
-#: personal/supann/class_supannAccount.inc:396
+#: personal/supann/class_supannAccount.inc:388
 msgid "supannEtuEtape"
 msgstr ""
 
-#: personal/supann/class_supannAccount.inc:400
+#: personal/supann/class_supannAccount.inc:392
 msgid "educational element"
 msgstr ""
 
-#: personal/supann/class_supannAccount.inc:400
+#: personal/supann/class_supannAccount.inc:392
 msgid "supannEtuElementPedagogique"
 msgstr ""
 
-#: personal/supann/class_supannAccount.inc:412
-msgid "Personal profile"
+#: personal/supann/class_supannAccount.inc:404
+msgid "Personnal profile"
 msgstr ""
 
-#: personal/supann/class_supannAccount.inc:415
+#: personal/supann/class_supannAccount.inc:407
 msgid "Personal ID"
 msgstr ""
 
-#: personal/supann/class_supannAccount.inc:415
+#: personal/supann/class_supannAccount.inc:407
 msgid "supannEmpId"
 msgstr ""
 
-#: personal/supann/class_supannAccount.inc:419
+#: personal/supann/class_supannAccount.inc:411
 msgid "Personal corps"
 msgstr ""
 
-#: personal/supann/class_supannAccount.inc:419
+#: personal/supann/class_supannAccount.inc:411
 msgid "supannEmpCorps"
 msgstr ""
 
-#: personal/supann/class_supannAccount.inc:424
-msgid "Activity"
+#: personal/supann/class_supannAccount.inc:416
+msgid "Activite"
 msgstr ""
 
-#: personal/supann/class_supannAccount.inc:424
+#: personal/supann/class_supannAccount.inc:416
 msgid "supannActivite"
 msgstr ""
 
-#: personal/supann/class_supannAccount.inc:431
+#: personal/supann/class_supannAccount.inc:423
 msgid "Roles"
 msgstr "Ruoli"
 
-#: personal/supann/class_supannAccount.inc:438
+#: personal/supann/class_supannAccount.inc:430
 msgid "supannRoleEntite"
 msgstr ""
 
-#: personal/supann/class_supannAccount.inc:442
+#: personal/supann/class_supannAccount.inc:434
 msgid "Generic role"
 msgstr ""
 
-#: personal/supann/class_supannAccount.inc:442
+#: personal/supann/class_supannAccount.inc:434
 msgid "supannRoleGenerique"
 msgstr ""
 
-#: personal/supann/class_supannAccount.inc:446
-msgid "Entity assignment type"
-msgstr ""
-
 #: config/supann/class_supannConfig.inc:28
 msgid "SUPANN configuration"
 msgstr ""
diff --git a/supann/locale/lv/fusiondirectory.po b/supann/locale/lv/fusiondirectory.po
index 0956d1d8ea351af7fe4a74392076517009d5d844..08b58abfee14e607eca59d60b6beba422840f473 100644
--- a/supann/locale/lv/fusiondirectory.po
+++ b/supann/locale/lv/fusiondirectory.po
@@ -5,12 +5,12 @@
 # Translators:
 msgid ""
 msgstr ""
-"Project-Id-Version: FusionDirectory-108\n"
+"Project-Id-Version: FusionDirectory-109\n"
 "Report-Msgid-Bugs-To: documentation@lists.fusiondirectory.org\n"
-"POT-Creation-Date: 2015-03-31 11:49+0200\n"
-"PO-Revision-Date: 2015-03-31 10:46+0000\n"
+"POT-Creation-Date: 2014-12-15 17:47+0100\n"
+"PO-Revision-Date: 2014-12-15 17:05+0000\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>\n"
-"Language-Team: Latvian (http://www.transifex.com/projects/p/FusionDirectory-108/language/lv/)\n"
+"Language-Team: Latvian (http://www.transifex.com/projects/p/FusionDirectory-109/language/lv/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -27,15 +27,16 @@ msgstr ""
 
 #: admin/supannStructures/class_entite.inc:31
 #: admin/supannStructures/class_entite.inc:52
-msgid "Entity"
+#: personal/supann/class_supannAccount.inc:442
+msgid "Entite"
 msgstr ""
 
 #: admin/supannStructures/class_entite.inc:32
-msgid "SUPANN Entity Settings"
+msgid "SUPANN Entite Settings"
 msgstr ""
 
 #: admin/supannStructures/class_entite.inc:35
-msgid "SUPANN Entity"
+msgid "SUPANN Entite"
 msgstr ""
 
 #: admin/supannStructures/class_entite.inc:55
@@ -44,7 +45,7 @@ msgid "Name"
 msgstr ""
 
 #: admin/supannStructures/class_entite.inc:55
-msgid "The name to write in the ou attribute for this entity"
+msgid "The name to write in the ou attribute for this entite"
 msgstr ""
 
 #: admin/supannStructures/class_entite.inc:61
@@ -57,7 +58,7 @@ msgid "Telephone"
 msgstr ""
 
 #: admin/supannStructures/class_entite.inc:64
-msgid "Phone number for this entity"
+msgid "Phone number for this entite"
 msgstr ""
 
 #: admin/supannStructures/class_entite.inc:68
@@ -66,7 +67,7 @@ msgid "Fax"
 msgstr ""
 
 #: admin/supannStructures/class_entite.inc:68
-msgid "Fax number for this entity"
+msgid "Fax number for this entite"
 msgstr ""
 
 #: admin/supannStructures/class_entite.inc:72
@@ -74,7 +75,7 @@ msgid "Postal address"
 msgstr ""
 
 #: admin/supannStructures/class_entite.inc:72
-msgid "Postal address of this entity"
+msgid "Postal address of this entite"
 msgstr ""
 
 #: admin/supannStructures/class_entite.inc:76
@@ -83,7 +84,7 @@ msgid "Description"
 msgstr ""
 
 #: admin/supannStructures/class_entite.inc:76
-msgid "Short description of this entity"
+msgid "Short description of this entite"
 msgstr ""
 
 #: admin/supannStructures/class_entite.inc:82
@@ -91,27 +92,28 @@ msgid "SUPANN informations"
 msgstr ""
 
 #: admin/supannStructures/class_entite.inc:85
-msgid "Entity type"
+#: personal/supann/class_supannAccount.inc:438
+msgid "Entite type"
 msgstr ""
 
 #: admin/supannStructures/class_entite.inc:85
-msgid "The best SUPANN type that fits this entity"
+msgid "The best SUPANN type that fits this entite"
 msgstr ""
 
 #: admin/supannStructures/class_entite.inc:89
-msgid "Entity code"
+msgid "Entite code"
 msgstr ""
 
 #: admin/supannStructures/class_entite.inc:89
-msgid "The SUPANN code of this entity"
+msgid "The SUPANN code of this entite"
 msgstr ""
 
 #: admin/supannStructures/class_entite.inc:94
-msgid "Parent entity"
+msgid "Parent entite"
 msgstr ""
 
 #: admin/supannStructures/class_entite.inc:94
-msgid "The parent entity of this entity"
+msgid "The parent entite of this entite"
 msgstr ""
 
 #: admin/supannStructures/class_entite.inc:98
@@ -119,21 +121,21 @@ msgid "Reference ID"
 msgstr ""
 
 #: admin/supannStructures/class_entite.inc:98
-msgid "SUPANN reference ID of this entity"
+msgid "SUPANN reference ID of this entite"
 msgstr ""
 
 #: admin/supannStructures/class_etablissement.inc:31
-#: personal/supann/class_supannAccount.inc:324
-#: personal/supann/class_supannAccount.inc:363
-msgid "Establishment"
+#: personal/supann/class_supannAccount.inc:316
+#: personal/supann/class_supannAccount.inc:355
+msgid "Etablissement"
 msgstr ""
 
 #: admin/supannStructures/class_etablissement.inc:32
-msgid "SUPANN Establishment Settings"
+msgid "SUPANN Etablissement Settings"
 msgstr ""
 
 #: admin/supannStructures/class_etablissement.inc:35
-msgid "SUPANN Establishment"
+msgid "SUPANN Etablissement"
 msgstr ""
 
 #: admin/supannStructures/class_etablissement.inc:52
@@ -141,19 +143,19 @@ msgid "Properties"
 msgstr ""
 
 #: admin/supannStructures/class_etablissement.inc:55
-msgid "Root Establishment"
+msgid "Root etablissement"
 msgstr ""
 
 #: admin/supannStructures/class_etablissement.inc:55
-msgid "Set this Establishment as the root one"
+msgid "Set this etablissement as the root one"
 msgstr ""
 
 #: admin/supannStructures/class_etablissement.inc:59
-msgid "The name to write in the o attribute for this Establishment"
+msgid "The name to write in the o attribute for this etablissement"
 msgstr ""
 
 #: admin/supannStructures/class_etablissement.inc:63
-msgid "A short description of this Establishment"
+msgid "A short description of this etablissement"
 msgstr ""
 
 #: admin/supannStructures/class_etablissement.inc:69
@@ -162,7 +164,7 @@ msgid "Location"
 msgstr ""
 
 #: admin/supannStructures/class_etablissement.inc:72
-msgid "Usually the city where this Establishment is"
+msgid "Usually the city in which is this etablissement"
 msgstr ""
 
 #: admin/supannStructures/class_etablissement.inc:76
@@ -170,15 +172,15 @@ msgid "Address"
 msgstr ""
 
 #: admin/supannStructures/class_etablissement.inc:76
-msgid "The postal address of this Establishment"
+msgid "The postal address of this etablissement"
 msgstr ""
 
 #: admin/supannStructures/class_etablissement.inc:80
-msgid "Phone number for this Establishment"
+msgid "Phone number for this etablissement"
 msgstr ""
 
 #: admin/supannStructures/class_etablissement.inc:84
-msgid "Fax number for this Establishment"
+msgid "Fax number for this etablissement"
 msgstr ""
 
 #: admin/supannStructures/class_etablissement.inc:90
@@ -186,11 +188,11 @@ msgid "SUPANN properties"
 msgstr ""
 
 #: admin/supannStructures/class_etablissement.inc:93
-msgid "Establishment code"
+msgid "Etablissement code"
 msgstr ""
 
 #: admin/supannStructures/class_etablissement.inc:93
-msgid "The code of this Establishment (must have a prefix between {})"
+msgid "The code of this etablissement (must have a prefix between {})"
 msgstr ""
 
 #: admin/supannStructures/class_etablissement.inc:98
@@ -198,7 +200,7 @@ msgid "SUPANN code"
 msgstr ""
 
 #: admin/supannStructures/class_etablissement.inc:98
-msgid "The SUPANN code for this Establishment"
+msgid "The SUPANN code for this etablissement"
 msgstr ""
 
 #: admin/supannStructures/class_etablissement.inc:103
@@ -206,7 +208,7 @@ msgid "Legal name"
 msgstr ""
 
 #: admin/supannStructures/class_etablissement.inc:103
-msgid "The legal name of this Establishment"
+msgid "The legal name of this etablissement"
 msgstr ""
 
 #: admin/supannStructures/class_etablissement.inc:107
@@ -214,7 +216,7 @@ msgid "Home page URI"
 msgstr ""
 
 #: admin/supannStructures/class_etablissement.inc:107
-msgid "The URI of this Establishment website home page"
+msgid "The URI of this etablissement website home page"
 msgstr ""
 
 #: admin/supannStructures/class_etablissement.inc:111
@@ -222,7 +224,7 @@ msgid "Institution URI"
 msgstr ""
 
 #: admin/supannStructures/class_etablissement.inc:111
-msgid "The URI of this Establishment institution website"
+msgid "The URI of this etablissement institution website"
 msgstr ""
 
 #: admin/supannStructures/class_etablissement.inc:115
@@ -230,12 +232,12 @@ msgid "White pages URI"
 msgstr ""
 
 #: admin/supannStructures/class_etablissement.inc:115
-msgid "The URI of this Establishment white pages"
+msgid "The URI of this etablissement white pages"
 msgstr ""
 
 #: admin/supannStructures/class_etablissement.inc:148
-#: admin/supannStructures/class_etablissement.inc:201
-#: admin/supannStructures/class_etablissement.inc:219
+#: admin/supannStructures/class_etablissement.inc:198
+#: admin/supannStructures/class_etablissement.inc:216
 msgid "LDAP error"
 msgstr ""
 
@@ -355,256 +357,243 @@ msgstr ""
 msgid "eduPersonNickName - Can contain a nick name for this user"
 msgstr ""
 
-#: personal/supann/class_supannAccount.inc:253
-msgid "Ref ids"
-msgstr ""
-
-#: personal/supann/class_supannAccount.inc:253
-msgid "supannRefId - IDs/links for this user on other systems"
-msgstr ""
-
-#: personal/supann/class_supannAccount.inc:262
+#: personal/supann/class_supannAccount.inc:254
 msgid "Contact"
 msgstr ""
 
-#: personal/supann/class_supannAccount.inc:266
+#: personal/supann/class_supannAccount.inc:258
 msgid "Other phone numbers"
 msgstr ""
 
-#: personal/supann/class_supannAccount.inc:266
+#: personal/supann/class_supannAccount.inc:258
 msgid "supannAutreTelephone - Other phone numbers for this user"
 msgstr ""
 
-#: personal/supann/class_supannAccount.inc:272
+#: personal/supann/class_supannAccount.inc:264
 msgid "Other mail addresses"
 msgstr ""
 
-#: personal/supann/class_supannAccount.inc:272
+#: personal/supann/class_supannAccount.inc:264
 msgid ""
 "supannAutreMail - Other mail addresses for this user. Each must be unique"
 msgstr ""
 
-#: personal/supann/class_supannAccount.inc:278
+#: personal/supann/class_supannAccount.inc:270
 msgid "Personal mail addresses"
 msgstr ""
 
-#: personal/supann/class_supannAccount.inc:278
+#: personal/supann/class_supannAccount.inc:270
 msgid "supannMailPerso - Personal mail addresses for this user"
 msgstr ""
 
-#: personal/supann/class_supannAccount.inc:283
-msgid "red List"
+#: personal/supann/class_supannAccount.inc:275
+msgid "Liste rouge"
 msgstr ""
 
-#: personal/supann/class_supannAccount.inc:283
+#: personal/supann/class_supannAccount.inc:275
 msgid "supannListeRouge - Should this person be on the red list"
 msgstr ""
 
-#: personal/supann/class_supannAccount.inc:289
+#: personal/supann/class_supannAccount.inc:281
 msgid "Affectation"
 msgstr ""
 
-#: personal/supann/class_supannAccount.inc:292
-msgid "Entity primary assignment"
+#: personal/supann/class_supannAccount.inc:284
+msgid "Entite affectation principale"
 msgstr ""
 
-#: personal/supann/class_supannAccount.inc:292
+#: personal/supann/class_supannAccount.inc:284
 msgid "supannEntiteAffectationPrincipale"
 msgstr ""
 
-#: personal/supann/class_supannAccount.inc:297
-#: personal/supann/class_supannAccount.inc:388
-#: personal/supann/class_supannAccount.inc:450
-msgid "Entity assignment"
+#: personal/supann/class_supannAccount.inc:289
+#: personal/supann/class_supannAccount.inc:380
+msgid "Entite affectation"
 msgstr ""
 
-#: personal/supann/class_supannAccount.inc:297
-#: personal/supann/class_supannAccount.inc:450
+#: personal/supann/class_supannAccount.inc:289
+#: personal/supann/class_supannAccount.inc:442
 msgid "supannEntiteAffectation"
 msgstr ""
 
-#: personal/supann/class_supannAccount.inc:303
-msgid "Entity type assignment"
+#: personal/supann/class_supannAccount.inc:295
+msgid "Type entite affectation"
 msgstr ""
 
-#: personal/supann/class_supannAccount.inc:303
-#: personal/supann/class_supannAccount.inc:446
+#: personal/supann/class_supannAccount.inc:295
+#: personal/supann/class_supannAccount.inc:438
 msgid "supannTypeEntiteAffectation"
 msgstr ""
 
-#: personal/supann/class_supannAccount.inc:310
+#: personal/supann/class_supannAccount.inc:302
 msgid "Affiliation"
 msgstr ""
 
-#: personal/supann/class_supannAccount.inc:313
+#: personal/supann/class_supannAccount.inc:305
 msgid "Primary affiliation"
 msgstr ""
 
-#: personal/supann/class_supannAccount.inc:313
+#: personal/supann/class_supannAccount.inc:305
 msgid "eduPersonPrimaryAffiliation"
 msgstr ""
 
-#: personal/supann/class_supannAccount.inc:318
+#: personal/supann/class_supannAccount.inc:310
 msgid "Affiliations"
 msgstr ""
 
-#: personal/supann/class_supannAccount.inc:318
+#: personal/supann/class_supannAccount.inc:310
 msgid "eduPersonAffiliation"
 msgstr ""
 
-#: personal/supann/class_supannAccount.inc:324
+#: personal/supann/class_supannAccount.inc:316
 msgid "supannEtablissement"
 msgstr ""
 
-#: personal/supann/class_supannAccount.inc:331
+#: personal/supann/class_supannAccount.inc:323
 msgid "Student profile"
 msgstr ""
 
-#: personal/supann/class_supannAccount.inc:334
+#: personal/supann/class_supannAccount.inc:326
 msgid "INE code"
 msgstr ""
 
-#: personal/supann/class_supannAccount.inc:334
+#: personal/supann/class_supannAccount.inc:326
 msgid "supannCodeINE - INE code of this student"
 msgstr ""
 
-#: personal/supann/class_supannAccount.inc:338
+#: personal/supann/class_supannAccount.inc:330
 msgid "Student ID"
 msgstr ""
 
-#: personal/supann/class_supannAccount.inc:338
+#: personal/supann/class_supannAccount.inc:330
 msgid "supannEtuId - scolarity id"
 msgstr ""
 
-#: personal/supann/class_supannAccount.inc:344
+#: personal/supann/class_supannAccount.inc:336
 msgid "Student subscriptions"
 msgstr ""
 
-#: personal/supann/class_supannAccount.inc:359
+#: personal/supann/class_supannAccount.inc:351
 msgid "supannEtuInscription - Subscriptions for this student"
 msgstr ""
 
-#: personal/supann/class_supannAccount.inc:363
+#: personal/supann/class_supannAccount.inc:355
 msgid ""
 "supannEtablissement - Etablissement in which this subscription was done"
 msgstr ""
 
-#: personal/supann/class_supannAccount.inc:367
+#: personal/supann/class_supannAccount.inc:359
 msgid "Year"
 msgstr ""
 
-#: personal/supann/class_supannAccount.inc:367
+#: personal/supann/class_supannAccount.inc:359
 msgid "supannEtuAnneeInscription - The year this subscription will begin"
 msgstr ""
 
-#: personal/supann/class_supannAccount.inc:372
+#: personal/supann/class_supannAccount.inc:364
 msgid "Subscription type"
 msgstr ""
 
-#: personal/supann/class_supannAccount.inc:372
+#: personal/supann/class_supannAccount.inc:364
 msgid "supannEtuRegimeInscription - The type of this subscription"
 msgstr ""
 
-#: personal/supann/class_supannAccount.inc:376
-msgid "Disciplinary Sector"
+#: personal/supann/class_supannAccount.inc:368
+msgid "Secteur Disciplinaire"
 msgstr ""
 
-#: personal/supann/class_supannAccount.inc:376
+#: personal/supann/class_supannAccount.inc:368
 msgid "supannEtuSecteurDisciplinaire"
 msgstr ""
 
-#: personal/supann/class_supannAccount.inc:380
+#: personal/supann/class_supannAccount.inc:372
 msgid "Diploma type"
 msgstr ""
 
-#: personal/supann/class_supannAccount.inc:380
+#: personal/supann/class_supannAccount.inc:372
 msgid "supannEtuTypeDiplome - Type of diploma"
 msgstr ""
 
-#: personal/supann/class_supannAccount.inc:384
-msgid "Curriculum year "
+#: personal/supann/class_supannAccount.inc:376
+msgid "Cursus annee"
 msgstr ""
 
-#: personal/supann/class_supannAccount.inc:384
+#: personal/supann/class_supannAccount.inc:376
 msgid "supannEtuCursusAnnee"
 msgstr ""
 
-#: personal/supann/class_supannAccount.inc:388
+#: personal/supann/class_supannAccount.inc:380
 msgid "supannEntiteAffectation_affect"
 msgstr ""
 
-#: personal/supann/class_supannAccount.inc:392
+#: personal/supann/class_supannAccount.inc:384
 msgid "Diploma"
 msgstr ""
 
-#: personal/supann/class_supannAccount.inc:392
+#: personal/supann/class_supannAccount.inc:384
 msgid "supannEtuDiplome"
 msgstr ""
 
-#: personal/supann/class_supannAccount.inc:396
+#: personal/supann/class_supannAccount.inc:388
 msgid "Step"
 msgstr ""
 
-#: personal/supann/class_supannAccount.inc:396
+#: personal/supann/class_supannAccount.inc:388
 msgid "supannEtuEtape"
 msgstr ""
 
-#: personal/supann/class_supannAccount.inc:400
+#: personal/supann/class_supannAccount.inc:392
 msgid "educational element"
 msgstr ""
 
-#: personal/supann/class_supannAccount.inc:400
+#: personal/supann/class_supannAccount.inc:392
 msgid "supannEtuElementPedagogique"
 msgstr ""
 
-#: personal/supann/class_supannAccount.inc:412
-msgid "Personal profile"
+#: personal/supann/class_supannAccount.inc:404
+msgid "Personnal profile"
 msgstr ""
 
-#: personal/supann/class_supannAccount.inc:415
+#: personal/supann/class_supannAccount.inc:407
 msgid "Personal ID"
 msgstr ""
 
-#: personal/supann/class_supannAccount.inc:415
+#: personal/supann/class_supannAccount.inc:407
 msgid "supannEmpId"
 msgstr ""
 
-#: personal/supann/class_supannAccount.inc:419
+#: personal/supann/class_supannAccount.inc:411
 msgid "Personal corps"
 msgstr ""
 
-#: personal/supann/class_supannAccount.inc:419
+#: personal/supann/class_supannAccount.inc:411
 msgid "supannEmpCorps"
 msgstr ""
 
-#: personal/supann/class_supannAccount.inc:424
-msgid "Activity"
+#: personal/supann/class_supannAccount.inc:416
+msgid "Activite"
 msgstr ""
 
-#: personal/supann/class_supannAccount.inc:424
+#: personal/supann/class_supannAccount.inc:416
 msgid "supannActivite"
 msgstr ""
 
-#: personal/supann/class_supannAccount.inc:431
+#: personal/supann/class_supannAccount.inc:423
 msgid "Roles"
 msgstr ""
 
-#: personal/supann/class_supannAccount.inc:438
+#: personal/supann/class_supannAccount.inc:430
 msgid "supannRoleEntite"
 msgstr ""
 
-#: personal/supann/class_supannAccount.inc:442
+#: personal/supann/class_supannAccount.inc:434
 msgid "Generic role"
 msgstr ""
 
-#: personal/supann/class_supannAccount.inc:442
+#: personal/supann/class_supannAccount.inc:434
 msgid "supannRoleGenerique"
 msgstr ""
 
-#: personal/supann/class_supannAccount.inc:446
-msgid "Entity assignment type"
-msgstr ""
-
 #: config/supann/class_supannConfig.inc:28
 msgid "SUPANN configuration"
 msgstr ""
diff --git a/supann/locale/nb/fusiondirectory.po b/supann/locale/nb/fusiondirectory.po
index 11a0a3ec51c7f0aa3717970731ef0d00f409412b..60808e317eef2a5b43bba9602731a1a39f99e5d8 100644
--- a/supann/locale/nb/fusiondirectory.po
+++ b/supann/locale/nb/fusiondirectory.po
@@ -5,12 +5,12 @@
 # Translators:
 msgid ""
 msgstr ""
-"Project-Id-Version: FusionDirectory-108\n"
+"Project-Id-Version: FusionDirectory-109\n"
 "Report-Msgid-Bugs-To: documentation@lists.fusiondirectory.org\n"
-"POT-Creation-Date: 2015-03-31 11:49+0200\n"
-"PO-Revision-Date: 2015-03-31 10:46+0000\n"
+"POT-Creation-Date: 2014-12-15 17:47+0100\n"
+"PO-Revision-Date: 2015-02-25 16:04+0000\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>\n"
-"Language-Team: Norwegian BokmÃ¥l (http://www.transifex.com/projects/p/FusionDirectory-108/language/nb/)\n"
+"Language-Team: Norwegian BokmÃ¥l (http://www.transifex.com/projects/p/FusionDirectory-109/language/nb/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -27,15 +27,16 @@ msgstr ""
 
 #: admin/supannStructures/class_entite.inc:31
 #: admin/supannStructures/class_entite.inc:52
-msgid "Entity"
+#: personal/supann/class_supannAccount.inc:442
+msgid "Entite"
 msgstr ""
 
 #: admin/supannStructures/class_entite.inc:32
-msgid "SUPANN Entity Settings"
+msgid "SUPANN Entite Settings"
 msgstr ""
 
 #: admin/supannStructures/class_entite.inc:35
-msgid "SUPANN Entity"
+msgid "SUPANN Entite"
 msgstr ""
 
 #: admin/supannStructures/class_entite.inc:55
@@ -44,7 +45,7 @@ msgid "Name"
 msgstr "Navn"
 
 #: admin/supannStructures/class_entite.inc:55
-msgid "The name to write in the ou attribute for this entity"
+msgid "The name to write in the ou attribute for this entite"
 msgstr ""
 
 #: admin/supannStructures/class_entite.inc:61
@@ -57,7 +58,7 @@ msgid "Telephone"
 msgstr ""
 
 #: admin/supannStructures/class_entite.inc:64
-msgid "Phone number for this entity"
+msgid "Phone number for this entite"
 msgstr ""
 
 #: admin/supannStructures/class_entite.inc:68
@@ -66,7 +67,7 @@ msgid "Fax"
 msgstr ""
 
 #: admin/supannStructures/class_entite.inc:68
-msgid "Fax number for this entity"
+msgid "Fax number for this entite"
 msgstr ""
 
 #: admin/supannStructures/class_entite.inc:72
@@ -74,7 +75,7 @@ msgid "Postal address"
 msgstr ""
 
 #: admin/supannStructures/class_entite.inc:72
-msgid "Postal address of this entity"
+msgid "Postal address of this entite"
 msgstr ""
 
 #: admin/supannStructures/class_entite.inc:76
@@ -83,7 +84,7 @@ msgid "Description"
 msgstr "Beskrivelse"
 
 #: admin/supannStructures/class_entite.inc:76
-msgid "Short description of this entity"
+msgid "Short description of this entite"
 msgstr ""
 
 #: admin/supannStructures/class_entite.inc:82
@@ -91,27 +92,28 @@ msgid "SUPANN informations"
 msgstr ""
 
 #: admin/supannStructures/class_entite.inc:85
-msgid "Entity type"
+#: personal/supann/class_supannAccount.inc:438
+msgid "Entite type"
 msgstr ""
 
 #: admin/supannStructures/class_entite.inc:85
-msgid "The best SUPANN type that fits this entity"
+msgid "The best SUPANN type that fits this entite"
 msgstr ""
 
 #: admin/supannStructures/class_entite.inc:89
-msgid "Entity code"
+msgid "Entite code"
 msgstr ""
 
 #: admin/supannStructures/class_entite.inc:89
-msgid "The SUPANN code of this entity"
+msgid "The SUPANN code of this entite"
 msgstr ""
 
 #: admin/supannStructures/class_entite.inc:94
-msgid "Parent entity"
+msgid "Parent entite"
 msgstr ""
 
 #: admin/supannStructures/class_entite.inc:94
-msgid "The parent entity of this entity"
+msgid "The parent entite of this entite"
 msgstr ""
 
 #: admin/supannStructures/class_entite.inc:98
@@ -119,21 +121,21 @@ msgid "Reference ID"
 msgstr ""
 
 #: admin/supannStructures/class_entite.inc:98
-msgid "SUPANN reference ID of this entity"
+msgid "SUPANN reference ID of this entite"
 msgstr ""
 
 #: admin/supannStructures/class_etablissement.inc:31
-#: personal/supann/class_supannAccount.inc:324
-#: personal/supann/class_supannAccount.inc:363
-msgid "Establishment"
+#: personal/supann/class_supannAccount.inc:316
+#: personal/supann/class_supannAccount.inc:355
+msgid "Etablissement"
 msgstr ""
 
 #: admin/supannStructures/class_etablissement.inc:32
-msgid "SUPANN Establishment Settings"
+msgid "SUPANN Etablissement Settings"
 msgstr ""
 
 #: admin/supannStructures/class_etablissement.inc:35
-msgid "SUPANN Establishment"
+msgid "SUPANN Etablissement"
 msgstr ""
 
 #: admin/supannStructures/class_etablissement.inc:52
@@ -141,19 +143,19 @@ msgid "Properties"
 msgstr "Egenskaper"
 
 #: admin/supannStructures/class_etablissement.inc:55
-msgid "Root Establishment"
+msgid "Root etablissement"
 msgstr ""
 
 #: admin/supannStructures/class_etablissement.inc:55
-msgid "Set this Establishment as the root one"
+msgid "Set this etablissement as the root one"
 msgstr ""
 
 #: admin/supannStructures/class_etablissement.inc:59
-msgid "The name to write in the o attribute for this Establishment"
+msgid "The name to write in the o attribute for this etablissement"
 msgstr ""
 
 #: admin/supannStructures/class_etablissement.inc:63
-msgid "A short description of this Establishment"
+msgid "A short description of this etablissement"
 msgstr ""
 
 #: admin/supannStructures/class_etablissement.inc:69
@@ -162,7 +164,7 @@ msgid "Location"
 msgstr ""
 
 #: admin/supannStructures/class_etablissement.inc:72
-msgid "Usually the city where this Establishment is"
+msgid "Usually the city in which is this etablissement"
 msgstr ""
 
 #: admin/supannStructures/class_etablissement.inc:76
@@ -170,15 +172,15 @@ msgid "Address"
 msgstr ""
 
 #: admin/supannStructures/class_etablissement.inc:76
-msgid "The postal address of this Establishment"
+msgid "The postal address of this etablissement"
 msgstr ""
 
 #: admin/supannStructures/class_etablissement.inc:80
-msgid "Phone number for this Establishment"
+msgid "Phone number for this etablissement"
 msgstr ""
 
 #: admin/supannStructures/class_etablissement.inc:84
-msgid "Fax number for this Establishment"
+msgid "Fax number for this etablissement"
 msgstr ""
 
 #: admin/supannStructures/class_etablissement.inc:90
@@ -186,11 +188,11 @@ msgid "SUPANN properties"
 msgstr ""
 
 #: admin/supannStructures/class_etablissement.inc:93
-msgid "Establishment code"
+msgid "Etablissement code"
 msgstr ""
 
 #: admin/supannStructures/class_etablissement.inc:93
-msgid "The code of this Establishment (must have a prefix between {})"
+msgid "The code of this etablissement (must have a prefix between {})"
 msgstr ""
 
 #: admin/supannStructures/class_etablissement.inc:98
@@ -198,7 +200,7 @@ msgid "SUPANN code"
 msgstr ""
 
 #: admin/supannStructures/class_etablissement.inc:98
-msgid "The SUPANN code for this Establishment"
+msgid "The SUPANN code for this etablissement"
 msgstr ""
 
 #: admin/supannStructures/class_etablissement.inc:103
@@ -206,7 +208,7 @@ msgid "Legal name"
 msgstr ""
 
 #: admin/supannStructures/class_etablissement.inc:103
-msgid "The legal name of this Establishment"
+msgid "The legal name of this etablissement"
 msgstr ""
 
 #: admin/supannStructures/class_etablissement.inc:107
@@ -214,7 +216,7 @@ msgid "Home page URI"
 msgstr ""
 
 #: admin/supannStructures/class_etablissement.inc:107
-msgid "The URI of this Establishment website home page"
+msgid "The URI of this etablissement website home page"
 msgstr ""
 
 #: admin/supannStructures/class_etablissement.inc:111
@@ -222,7 +224,7 @@ msgid "Institution URI"
 msgstr ""
 
 #: admin/supannStructures/class_etablissement.inc:111
-msgid "The URI of this Establishment institution website"
+msgid "The URI of this etablissement institution website"
 msgstr ""
 
 #: admin/supannStructures/class_etablissement.inc:115
@@ -230,12 +232,12 @@ msgid "White pages URI"
 msgstr ""
 
 #: admin/supannStructures/class_etablissement.inc:115
-msgid "The URI of this Establishment white pages"
+msgid "The URI of this etablissement white pages"
 msgstr ""
 
 #: admin/supannStructures/class_etablissement.inc:148
-#: admin/supannStructures/class_etablissement.inc:201
-#: admin/supannStructures/class_etablissement.inc:219
+#: admin/supannStructures/class_etablissement.inc:198
+#: admin/supannStructures/class_etablissement.inc:216
 msgid "LDAP error"
 msgstr "LDAP-feil"
 
@@ -355,256 +357,243 @@ msgstr ""
 msgid "eduPersonNickName - Can contain a nick name for this user"
 msgstr ""
 
-#: personal/supann/class_supannAccount.inc:253
-msgid "Ref ids"
-msgstr ""
-
-#: personal/supann/class_supannAccount.inc:253
-msgid "supannRefId - IDs/links for this user on other systems"
-msgstr ""
-
-#: personal/supann/class_supannAccount.inc:262
+#: personal/supann/class_supannAccount.inc:254
 msgid "Contact"
 msgstr ""
 
-#: personal/supann/class_supannAccount.inc:266
+#: personal/supann/class_supannAccount.inc:258
 msgid "Other phone numbers"
 msgstr ""
 
-#: personal/supann/class_supannAccount.inc:266
+#: personal/supann/class_supannAccount.inc:258
 msgid "supannAutreTelephone - Other phone numbers for this user"
 msgstr ""
 
-#: personal/supann/class_supannAccount.inc:272
+#: personal/supann/class_supannAccount.inc:264
 msgid "Other mail addresses"
 msgstr ""
 
-#: personal/supann/class_supannAccount.inc:272
+#: personal/supann/class_supannAccount.inc:264
 msgid ""
 "supannAutreMail - Other mail addresses for this user. Each must be unique"
 msgstr ""
 
-#: personal/supann/class_supannAccount.inc:278
+#: personal/supann/class_supannAccount.inc:270
 msgid "Personal mail addresses"
 msgstr ""
 
-#: personal/supann/class_supannAccount.inc:278
+#: personal/supann/class_supannAccount.inc:270
 msgid "supannMailPerso - Personal mail addresses for this user"
 msgstr ""
 
-#: personal/supann/class_supannAccount.inc:283
-msgid "red List"
+#: personal/supann/class_supannAccount.inc:275
+msgid "Liste rouge"
 msgstr ""
 
-#: personal/supann/class_supannAccount.inc:283
+#: personal/supann/class_supannAccount.inc:275
 msgid "supannListeRouge - Should this person be on the red list"
 msgstr ""
 
-#: personal/supann/class_supannAccount.inc:289
+#: personal/supann/class_supannAccount.inc:281
 msgid "Affectation"
 msgstr ""
 
-#: personal/supann/class_supannAccount.inc:292
-msgid "Entity primary assignment"
+#: personal/supann/class_supannAccount.inc:284
+msgid "Entite affectation principale"
 msgstr ""
 
-#: personal/supann/class_supannAccount.inc:292
+#: personal/supann/class_supannAccount.inc:284
 msgid "supannEntiteAffectationPrincipale"
 msgstr ""
 
-#: personal/supann/class_supannAccount.inc:297
-#: personal/supann/class_supannAccount.inc:388
-#: personal/supann/class_supannAccount.inc:450
-msgid "Entity assignment"
+#: personal/supann/class_supannAccount.inc:289
+#: personal/supann/class_supannAccount.inc:380
+msgid "Entite affectation"
 msgstr ""
 
-#: personal/supann/class_supannAccount.inc:297
-#: personal/supann/class_supannAccount.inc:450
+#: personal/supann/class_supannAccount.inc:289
+#: personal/supann/class_supannAccount.inc:442
 msgid "supannEntiteAffectation"
 msgstr ""
 
-#: personal/supann/class_supannAccount.inc:303
-msgid "Entity type assignment"
+#: personal/supann/class_supannAccount.inc:295
+msgid "Type entite affectation"
 msgstr ""
 
-#: personal/supann/class_supannAccount.inc:303
-#: personal/supann/class_supannAccount.inc:446
+#: personal/supann/class_supannAccount.inc:295
+#: personal/supann/class_supannAccount.inc:438
 msgid "supannTypeEntiteAffectation"
 msgstr ""
 
-#: personal/supann/class_supannAccount.inc:310
+#: personal/supann/class_supannAccount.inc:302
 msgid "Affiliation"
 msgstr ""
 
-#: personal/supann/class_supannAccount.inc:313
+#: personal/supann/class_supannAccount.inc:305
 msgid "Primary affiliation"
 msgstr ""
 
-#: personal/supann/class_supannAccount.inc:313
+#: personal/supann/class_supannAccount.inc:305
 msgid "eduPersonPrimaryAffiliation"
 msgstr ""
 
-#: personal/supann/class_supannAccount.inc:318
+#: personal/supann/class_supannAccount.inc:310
 msgid "Affiliations"
 msgstr ""
 
-#: personal/supann/class_supannAccount.inc:318
+#: personal/supann/class_supannAccount.inc:310
 msgid "eduPersonAffiliation"
 msgstr ""
 
-#: personal/supann/class_supannAccount.inc:324
+#: personal/supann/class_supannAccount.inc:316
 msgid "supannEtablissement"
 msgstr ""
 
-#: personal/supann/class_supannAccount.inc:331
+#: personal/supann/class_supannAccount.inc:323
 msgid "Student profile"
 msgstr ""
 
-#: personal/supann/class_supannAccount.inc:334
+#: personal/supann/class_supannAccount.inc:326
 msgid "INE code"
 msgstr ""
 
-#: personal/supann/class_supannAccount.inc:334
+#: personal/supann/class_supannAccount.inc:326
 msgid "supannCodeINE - INE code of this student"
 msgstr ""
 
-#: personal/supann/class_supannAccount.inc:338
+#: personal/supann/class_supannAccount.inc:330
 msgid "Student ID"
 msgstr ""
 
-#: personal/supann/class_supannAccount.inc:338
+#: personal/supann/class_supannAccount.inc:330
 msgid "supannEtuId - scolarity id"
 msgstr ""
 
-#: personal/supann/class_supannAccount.inc:344
+#: personal/supann/class_supannAccount.inc:336
 msgid "Student subscriptions"
 msgstr ""
 
-#: personal/supann/class_supannAccount.inc:359
+#: personal/supann/class_supannAccount.inc:351
 msgid "supannEtuInscription - Subscriptions for this student"
 msgstr ""
 
-#: personal/supann/class_supannAccount.inc:363
+#: personal/supann/class_supannAccount.inc:355
 msgid ""
 "supannEtablissement - Etablissement in which this subscription was done"
 msgstr ""
 
-#: personal/supann/class_supannAccount.inc:367
+#: personal/supann/class_supannAccount.inc:359
 msgid "Year"
 msgstr ""
 
-#: personal/supann/class_supannAccount.inc:367
+#: personal/supann/class_supannAccount.inc:359
 msgid "supannEtuAnneeInscription - The year this subscription will begin"
 msgstr ""
 
-#: personal/supann/class_supannAccount.inc:372
+#: personal/supann/class_supannAccount.inc:364
 msgid "Subscription type"
 msgstr ""
 
-#: personal/supann/class_supannAccount.inc:372
+#: personal/supann/class_supannAccount.inc:364
 msgid "supannEtuRegimeInscription - The type of this subscription"
 msgstr ""
 
-#: personal/supann/class_supannAccount.inc:376
-msgid "Disciplinary Sector"
+#: personal/supann/class_supannAccount.inc:368
+msgid "Secteur Disciplinaire"
 msgstr ""
 
-#: personal/supann/class_supannAccount.inc:376
+#: personal/supann/class_supannAccount.inc:368
 msgid "supannEtuSecteurDisciplinaire"
 msgstr ""
 
-#: personal/supann/class_supannAccount.inc:380
+#: personal/supann/class_supannAccount.inc:372
 msgid "Diploma type"
 msgstr ""
 
-#: personal/supann/class_supannAccount.inc:380
+#: personal/supann/class_supannAccount.inc:372
 msgid "supannEtuTypeDiplome - Type of diploma"
 msgstr ""
 
-#: personal/supann/class_supannAccount.inc:384
-msgid "Curriculum year "
+#: personal/supann/class_supannAccount.inc:376
+msgid "Cursus annee"
 msgstr ""
 
-#: personal/supann/class_supannAccount.inc:384
+#: personal/supann/class_supannAccount.inc:376
 msgid "supannEtuCursusAnnee"
 msgstr ""
 
-#: personal/supann/class_supannAccount.inc:388
+#: personal/supann/class_supannAccount.inc:380
 msgid "supannEntiteAffectation_affect"
 msgstr ""
 
-#: personal/supann/class_supannAccount.inc:392
+#: personal/supann/class_supannAccount.inc:384
 msgid "Diploma"
 msgstr ""
 
-#: personal/supann/class_supannAccount.inc:392
+#: personal/supann/class_supannAccount.inc:384
 msgid "supannEtuDiplome"
 msgstr ""
 
-#: personal/supann/class_supannAccount.inc:396
+#: personal/supann/class_supannAccount.inc:388
 msgid "Step"
 msgstr ""
 
-#: personal/supann/class_supannAccount.inc:396
+#: personal/supann/class_supannAccount.inc:388
 msgid "supannEtuEtape"
 msgstr ""
 
-#: personal/supann/class_supannAccount.inc:400
+#: personal/supann/class_supannAccount.inc:392
 msgid "educational element"
 msgstr ""
 
-#: personal/supann/class_supannAccount.inc:400
+#: personal/supann/class_supannAccount.inc:392
 msgid "supannEtuElementPedagogique"
 msgstr ""
 
-#: personal/supann/class_supannAccount.inc:412
-msgid "Personal profile"
+#: personal/supann/class_supannAccount.inc:404
+msgid "Personnal profile"
 msgstr ""
 
-#: personal/supann/class_supannAccount.inc:415
+#: personal/supann/class_supannAccount.inc:407
 msgid "Personal ID"
 msgstr ""
 
-#: personal/supann/class_supannAccount.inc:415
+#: personal/supann/class_supannAccount.inc:407
 msgid "supannEmpId"
 msgstr ""
 
-#: personal/supann/class_supannAccount.inc:419
+#: personal/supann/class_supannAccount.inc:411
 msgid "Personal corps"
 msgstr ""
 
-#: personal/supann/class_supannAccount.inc:419
+#: personal/supann/class_supannAccount.inc:411
 msgid "supannEmpCorps"
 msgstr ""
 
-#: personal/supann/class_supannAccount.inc:424
-msgid "Activity"
+#: personal/supann/class_supannAccount.inc:416
+msgid "Activite"
 msgstr ""
 
-#: personal/supann/class_supannAccount.inc:424
+#: personal/supann/class_supannAccount.inc:416
 msgid "supannActivite"
 msgstr ""
 
-#: personal/supann/class_supannAccount.inc:431
+#: personal/supann/class_supannAccount.inc:423
 msgid "Roles"
 msgstr ""
 
-#: personal/supann/class_supannAccount.inc:438
+#: personal/supann/class_supannAccount.inc:430
 msgid "supannRoleEntite"
 msgstr ""
 
-#: personal/supann/class_supannAccount.inc:442
+#: personal/supann/class_supannAccount.inc:434
 msgid "Generic role"
 msgstr ""
 
-#: personal/supann/class_supannAccount.inc:442
+#: personal/supann/class_supannAccount.inc:434
 msgid "supannRoleGenerique"
 msgstr ""
 
-#: personal/supann/class_supannAccount.inc:446
-msgid "Entity assignment type"
-msgstr ""
-
 #: config/supann/class_supannConfig.inc:28
 msgid "SUPANN configuration"
 msgstr ""
diff --git a/supann/locale/nl/fusiondirectory.po b/supann/locale/nl/fusiondirectory.po
index 8a1d04827dc9052f2f1fdd814c02ddfed3db2a22..0a5532a8f84f9a45d520bab9d4455668b094f3d9 100644
--- a/supann/locale/nl/fusiondirectory.po
+++ b/supann/locale/nl/fusiondirectory.po
@@ -5,12 +5,12 @@
 # Translators:
 msgid ""
 msgstr ""
-"Project-Id-Version: FusionDirectory-108\n"
+"Project-Id-Version: FusionDirectory-109\n"
 "Report-Msgid-Bugs-To: documentation@lists.fusiondirectory.org\n"
-"POT-Creation-Date: 2015-03-31 11:49+0200\n"
-"PO-Revision-Date: 2015-03-31 10:46+0000\n"
+"POT-Creation-Date: 2014-12-15 17:47+0100\n"
+"PO-Revision-Date: 2015-02-25 16:51+0000\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>\n"
-"Language-Team: Dutch (http://www.transifex.com/projects/p/FusionDirectory-108/language/nl/)\n"
+"Language-Team: Dutch (http://www.transifex.com/projects/p/FusionDirectory-109/language/nl/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -27,15 +27,16 @@ msgstr ""
 
 #: admin/supannStructures/class_entite.inc:31
 #: admin/supannStructures/class_entite.inc:52
-msgid "Entity"
-msgstr ""
+#: personal/supann/class_supannAccount.inc:442
+msgid "Entite"
+msgstr "Entiteit"
 
 #: admin/supannStructures/class_entite.inc:32
-msgid "SUPANN Entity Settings"
+msgid "SUPANN Entite Settings"
 msgstr ""
 
 #: admin/supannStructures/class_entite.inc:35
-msgid "SUPANN Entity"
+msgid "SUPANN Entite"
 msgstr ""
 
 #: admin/supannStructures/class_entite.inc:55
@@ -44,7 +45,7 @@ msgid "Name"
 msgstr "Naam"
 
 #: admin/supannStructures/class_entite.inc:55
-msgid "The name to write in the ou attribute for this entity"
+msgid "The name to write in the ou attribute for this entite"
 msgstr ""
 
 #: admin/supannStructures/class_entite.inc:61
@@ -57,7 +58,7 @@ msgid "Telephone"
 msgstr "Telefoon"
 
 #: admin/supannStructures/class_entite.inc:64
-msgid "Phone number for this entity"
+msgid "Phone number for this entite"
 msgstr ""
 
 #: admin/supannStructures/class_entite.inc:68
@@ -66,7 +67,7 @@ msgid "Fax"
 msgstr "Fax"
 
 #: admin/supannStructures/class_entite.inc:68
-msgid "Fax number for this entity"
+msgid "Fax number for this entite"
 msgstr ""
 
 #: admin/supannStructures/class_entite.inc:72
@@ -74,7 +75,7 @@ msgid "Postal address"
 msgstr "Postadres"
 
 #: admin/supannStructures/class_entite.inc:72
-msgid "Postal address of this entity"
+msgid "Postal address of this entite"
 msgstr ""
 
 #: admin/supannStructures/class_entite.inc:76
@@ -83,7 +84,7 @@ msgid "Description"
 msgstr "Omschrijving"
 
 #: admin/supannStructures/class_entite.inc:76
-msgid "Short description of this entity"
+msgid "Short description of this entite"
 msgstr ""
 
 #: admin/supannStructures/class_entite.inc:82
@@ -91,27 +92,28 @@ msgid "SUPANN informations"
 msgstr ""
 
 #: admin/supannStructures/class_entite.inc:85
-msgid "Entity type"
+#: personal/supann/class_supannAccount.inc:438
+msgid "Entite type"
 msgstr ""
 
 #: admin/supannStructures/class_entite.inc:85
-msgid "The best SUPANN type that fits this entity"
+msgid "The best SUPANN type that fits this entite"
 msgstr ""
 
 #: admin/supannStructures/class_entite.inc:89
-msgid "Entity code"
+msgid "Entite code"
 msgstr ""
 
 #: admin/supannStructures/class_entite.inc:89
-msgid "The SUPANN code of this entity"
+msgid "The SUPANN code of this entite"
 msgstr ""
 
 #: admin/supannStructures/class_entite.inc:94
-msgid "Parent entity"
+msgid "Parent entite"
 msgstr ""
 
 #: admin/supannStructures/class_entite.inc:94
-msgid "The parent entity of this entity"
+msgid "The parent entite of this entite"
 msgstr ""
 
 #: admin/supannStructures/class_entite.inc:98
@@ -119,21 +121,21 @@ msgid "Reference ID"
 msgstr ""
 
 #: admin/supannStructures/class_entite.inc:98
-msgid "SUPANN reference ID of this entity"
+msgid "SUPANN reference ID of this entite"
 msgstr ""
 
 #: admin/supannStructures/class_etablissement.inc:31
-#: personal/supann/class_supannAccount.inc:324
-#: personal/supann/class_supannAccount.inc:363
-msgid "Establishment"
-msgstr ""
+#: personal/supann/class_supannAccount.inc:316
+#: personal/supann/class_supannAccount.inc:355
+msgid "Etablissement"
+msgstr "Instelling"
 
 #: admin/supannStructures/class_etablissement.inc:32
-msgid "SUPANN Establishment Settings"
+msgid "SUPANN Etablissement Settings"
 msgstr ""
 
 #: admin/supannStructures/class_etablissement.inc:35
-msgid "SUPANN Establishment"
+msgid "SUPANN Etablissement"
 msgstr ""
 
 #: admin/supannStructures/class_etablissement.inc:52
@@ -141,19 +143,19 @@ msgid "Properties"
 msgstr "Eigenschappen"
 
 #: admin/supannStructures/class_etablissement.inc:55
-msgid "Root Establishment"
+msgid "Root etablissement"
 msgstr ""
 
 #: admin/supannStructures/class_etablissement.inc:55
-msgid "Set this Establishment as the root one"
+msgid "Set this etablissement as the root one"
 msgstr ""
 
 #: admin/supannStructures/class_etablissement.inc:59
-msgid "The name to write in the o attribute for this Establishment"
+msgid "The name to write in the o attribute for this etablissement"
 msgstr ""
 
 #: admin/supannStructures/class_etablissement.inc:63
-msgid "A short description of this Establishment"
+msgid "A short description of this etablissement"
 msgstr ""
 
 #: admin/supannStructures/class_etablissement.inc:69
@@ -162,7 +164,7 @@ msgid "Location"
 msgstr "Plaats"
 
 #: admin/supannStructures/class_etablissement.inc:72
-msgid "Usually the city where this Establishment is"
+msgid "Usually the city in which is this etablissement"
 msgstr ""
 
 #: admin/supannStructures/class_etablissement.inc:76
@@ -170,15 +172,15 @@ msgid "Address"
 msgstr "Adres"
 
 #: admin/supannStructures/class_etablissement.inc:76
-msgid "The postal address of this Establishment"
+msgid "The postal address of this etablissement"
 msgstr ""
 
 #: admin/supannStructures/class_etablissement.inc:80
-msgid "Phone number for this Establishment"
+msgid "Phone number for this etablissement"
 msgstr ""
 
 #: admin/supannStructures/class_etablissement.inc:84
-msgid "Fax number for this Establishment"
+msgid "Fax number for this etablissement"
 msgstr ""
 
 #: admin/supannStructures/class_etablissement.inc:90
@@ -186,11 +188,11 @@ msgid "SUPANN properties"
 msgstr ""
 
 #: admin/supannStructures/class_etablissement.inc:93
-msgid "Establishment code"
+msgid "Etablissement code"
 msgstr ""
 
 #: admin/supannStructures/class_etablissement.inc:93
-msgid "The code of this Establishment (must have a prefix between {})"
+msgid "The code of this etablissement (must have a prefix between {})"
 msgstr ""
 
 #: admin/supannStructures/class_etablissement.inc:98
@@ -198,7 +200,7 @@ msgid "SUPANN code"
 msgstr ""
 
 #: admin/supannStructures/class_etablissement.inc:98
-msgid "The SUPANN code for this Establishment"
+msgid "The SUPANN code for this etablissement"
 msgstr ""
 
 #: admin/supannStructures/class_etablissement.inc:103
@@ -206,7 +208,7 @@ msgid "Legal name"
 msgstr ""
 
 #: admin/supannStructures/class_etablissement.inc:103
-msgid "The legal name of this Establishment"
+msgid "The legal name of this etablissement"
 msgstr ""
 
 #: admin/supannStructures/class_etablissement.inc:107
@@ -214,7 +216,7 @@ msgid "Home page URI"
 msgstr ""
 
 #: admin/supannStructures/class_etablissement.inc:107
-msgid "The URI of this Establishment website home page"
+msgid "The URI of this etablissement website home page"
 msgstr ""
 
 #: admin/supannStructures/class_etablissement.inc:111
@@ -222,7 +224,7 @@ msgid "Institution URI"
 msgstr ""
 
 #: admin/supannStructures/class_etablissement.inc:111
-msgid "The URI of this Establishment institution website"
+msgid "The URI of this etablissement institution website"
 msgstr ""
 
 #: admin/supannStructures/class_etablissement.inc:115
@@ -230,12 +232,12 @@ msgid "White pages URI"
 msgstr ""
 
 #: admin/supannStructures/class_etablissement.inc:115
-msgid "The URI of this Establishment white pages"
+msgid "The URI of this etablissement white pages"
 msgstr ""
 
 #: admin/supannStructures/class_etablissement.inc:148
-#: admin/supannStructures/class_etablissement.inc:201
-#: admin/supannStructures/class_etablissement.inc:219
+#: admin/supannStructures/class_etablissement.inc:198
+#: admin/supannStructures/class_etablissement.inc:216
 msgid "LDAP error"
 msgstr "LDAP fout"
 
@@ -355,256 +357,243 @@ msgstr ""
 msgid "eduPersonNickName - Can contain a nick name for this user"
 msgstr ""
 
-#: personal/supann/class_supannAccount.inc:253
-msgid "Ref ids"
-msgstr ""
-
-#: personal/supann/class_supannAccount.inc:253
-msgid "supannRefId - IDs/links for this user on other systems"
-msgstr ""
-
-#: personal/supann/class_supannAccount.inc:262
+#: personal/supann/class_supannAccount.inc:254
 msgid "Contact"
 msgstr "Contact"
 
-#: personal/supann/class_supannAccount.inc:266
+#: personal/supann/class_supannAccount.inc:258
 msgid "Other phone numbers"
 msgstr ""
 
-#: personal/supann/class_supannAccount.inc:266
+#: personal/supann/class_supannAccount.inc:258
 msgid "supannAutreTelephone - Other phone numbers for this user"
 msgstr ""
 
-#: personal/supann/class_supannAccount.inc:272
+#: personal/supann/class_supannAccount.inc:264
 msgid "Other mail addresses"
 msgstr ""
 
-#: personal/supann/class_supannAccount.inc:272
+#: personal/supann/class_supannAccount.inc:264
 msgid ""
 "supannAutreMail - Other mail addresses for this user. Each must be unique"
 msgstr ""
 
-#: personal/supann/class_supannAccount.inc:278
+#: personal/supann/class_supannAccount.inc:270
 msgid "Personal mail addresses"
 msgstr ""
 
-#: personal/supann/class_supannAccount.inc:278
+#: personal/supann/class_supannAccount.inc:270
 msgid "supannMailPerso - Personal mail addresses for this user"
 msgstr ""
 
-#: personal/supann/class_supannAccount.inc:283
-msgid "red List"
+#: personal/supann/class_supannAccount.inc:275
+msgid "Liste rouge"
 msgstr ""
 
-#: personal/supann/class_supannAccount.inc:283
+#: personal/supann/class_supannAccount.inc:275
 msgid "supannListeRouge - Should this person be on the red list"
 msgstr ""
 
-#: personal/supann/class_supannAccount.inc:289
+#: personal/supann/class_supannAccount.inc:281
 msgid "Affectation"
 msgstr "Affectatie"
 
-#: personal/supann/class_supannAccount.inc:292
-msgid "Entity primary assignment"
+#: personal/supann/class_supannAccount.inc:284
+msgid "Entite affectation principale"
 msgstr ""
 
-#: personal/supann/class_supannAccount.inc:292
+#: personal/supann/class_supannAccount.inc:284
 msgid "supannEntiteAffectationPrincipale"
 msgstr "supannHoofdEntiteitAffectatie"
 
-#: personal/supann/class_supannAccount.inc:297
-#: personal/supann/class_supannAccount.inc:388
-#: personal/supann/class_supannAccount.inc:450
-msgid "Entity assignment"
+#: personal/supann/class_supannAccount.inc:289
+#: personal/supann/class_supannAccount.inc:380
+msgid "Entite affectation"
 msgstr ""
 
-#: personal/supann/class_supannAccount.inc:297
-#: personal/supann/class_supannAccount.inc:450
+#: personal/supann/class_supannAccount.inc:289
+#: personal/supann/class_supannAccount.inc:442
 msgid "supannEntiteAffectation"
 msgstr "supannEntiteitAffectatie"
 
-#: personal/supann/class_supannAccount.inc:303
-msgid "Entity type assignment"
+#: personal/supann/class_supannAccount.inc:295
+msgid "Type entite affectation"
 msgstr ""
 
-#: personal/supann/class_supannAccount.inc:303
-#: personal/supann/class_supannAccount.inc:446
+#: personal/supann/class_supannAccount.inc:295
+#: personal/supann/class_supannAccount.inc:438
 msgid "supannTypeEntiteAffectation"
 msgstr "supannTypeEntiteitAffectatie"
 
-#: personal/supann/class_supannAccount.inc:310
+#: personal/supann/class_supannAccount.inc:302
 msgid "Affiliation"
 msgstr "Affiliatie"
 
-#: personal/supann/class_supannAccount.inc:313
+#: personal/supann/class_supannAccount.inc:305
 msgid "Primary affiliation"
 msgstr ""
 
-#: personal/supann/class_supannAccount.inc:313
+#: personal/supann/class_supannAccount.inc:305
 msgid "eduPersonPrimaryAffiliation"
 msgstr "eduPersoonHoofdAffiliatie"
 
-#: personal/supann/class_supannAccount.inc:318
+#: personal/supann/class_supannAccount.inc:310
 msgid "Affiliations"
 msgstr "Affiliatie"
 
-#: personal/supann/class_supannAccount.inc:318
+#: personal/supann/class_supannAccount.inc:310
 msgid "eduPersonAffiliation"
 msgstr "eduPersoonAffiliatie"
 
-#: personal/supann/class_supannAccount.inc:324
+#: personal/supann/class_supannAccount.inc:316
 msgid "supannEtablissement"
 msgstr "supannEtablissement"
 
-#: personal/supann/class_supannAccount.inc:331
+#: personal/supann/class_supannAccount.inc:323
 msgid "Student profile"
 msgstr ""
 
-#: personal/supann/class_supannAccount.inc:334
+#: personal/supann/class_supannAccount.inc:326
 msgid "INE code"
 msgstr ""
 
-#: personal/supann/class_supannAccount.inc:334
+#: personal/supann/class_supannAccount.inc:326
 msgid "supannCodeINE - INE code of this student"
 msgstr ""
 
-#: personal/supann/class_supannAccount.inc:338
+#: personal/supann/class_supannAccount.inc:330
 msgid "Student ID"
 msgstr ""
 
-#: personal/supann/class_supannAccount.inc:338
+#: personal/supann/class_supannAccount.inc:330
 msgid "supannEtuId - scolarity id"
 msgstr ""
 
-#: personal/supann/class_supannAccount.inc:344
+#: personal/supann/class_supannAccount.inc:336
 msgid "Student subscriptions"
 msgstr ""
 
-#: personal/supann/class_supannAccount.inc:359
+#: personal/supann/class_supannAccount.inc:351
 msgid "supannEtuInscription - Subscriptions for this student"
 msgstr ""
 
-#: personal/supann/class_supannAccount.inc:363
+#: personal/supann/class_supannAccount.inc:355
 msgid ""
 "supannEtablissement - Etablissement in which this subscription was done"
 msgstr ""
 
-#: personal/supann/class_supannAccount.inc:367
+#: personal/supann/class_supannAccount.inc:359
 msgid "Year"
 msgstr "Jaar"
 
-#: personal/supann/class_supannAccount.inc:367
+#: personal/supann/class_supannAccount.inc:359
 msgid "supannEtuAnneeInscription - The year this subscription will begin"
 msgstr ""
 
-#: personal/supann/class_supannAccount.inc:372
+#: personal/supann/class_supannAccount.inc:364
 msgid "Subscription type"
 msgstr ""
 
-#: personal/supann/class_supannAccount.inc:372
+#: personal/supann/class_supannAccount.inc:364
 msgid "supannEtuRegimeInscription - The type of this subscription"
 msgstr ""
 
-#: personal/supann/class_supannAccount.inc:376
-msgid "Disciplinary Sector"
+#: personal/supann/class_supannAccount.inc:368
+msgid "Secteur Disciplinaire"
 msgstr ""
 
-#: personal/supann/class_supannAccount.inc:376
+#: personal/supann/class_supannAccount.inc:368
 msgid "supannEtuSecteurDisciplinaire"
 msgstr "supannEtuDisciplinaireDienst"
 
-#: personal/supann/class_supannAccount.inc:380
+#: personal/supann/class_supannAccount.inc:372
 msgid "Diploma type"
 msgstr ""
 
-#: personal/supann/class_supannAccount.inc:380
+#: personal/supann/class_supannAccount.inc:372
 msgid "supannEtuTypeDiplome - Type of diploma"
 msgstr ""
 
-#: personal/supann/class_supannAccount.inc:384
-msgid "Curriculum year "
+#: personal/supann/class_supannAccount.inc:376
+msgid "Cursus annee"
 msgstr ""
 
-#: personal/supann/class_supannAccount.inc:384
+#: personal/supann/class_supannAccount.inc:376
 msgid "supannEtuCursusAnnee"
 msgstr "supannEtuCursusJaar"
 
-#: personal/supann/class_supannAccount.inc:388
+#: personal/supann/class_supannAccount.inc:380
 msgid "supannEntiteAffectation_affect"
 msgstr ""
 
-#: personal/supann/class_supannAccount.inc:392
+#: personal/supann/class_supannAccount.inc:384
 msgid "Diploma"
 msgstr ""
 
-#: personal/supann/class_supannAccount.inc:392
+#: personal/supann/class_supannAccount.inc:384
 msgid "supannEtuDiplome"
 msgstr "supannEtuDiploma"
 
-#: personal/supann/class_supannAccount.inc:396
+#: personal/supann/class_supannAccount.inc:388
 msgid "Step"
 msgstr ""
 
-#: personal/supann/class_supannAccount.inc:396
+#: personal/supann/class_supannAccount.inc:388
 msgid "supannEtuEtape"
 msgstr "supannEtuEtape"
 
-#: personal/supann/class_supannAccount.inc:400
+#: personal/supann/class_supannAccount.inc:392
 msgid "educational element"
 msgstr ""
 
-#: personal/supann/class_supannAccount.inc:400
+#: personal/supann/class_supannAccount.inc:392
 msgid "supannEtuElementPedagogique"
 msgstr "supannEtuPedagogischElement"
 
-#: personal/supann/class_supannAccount.inc:412
-msgid "Personal profile"
+#: personal/supann/class_supannAccount.inc:404
+msgid "Personnal profile"
 msgstr ""
 
-#: personal/supann/class_supannAccount.inc:415
+#: personal/supann/class_supannAccount.inc:407
 msgid "Personal ID"
 msgstr ""
 
-#: personal/supann/class_supannAccount.inc:415
+#: personal/supann/class_supannAccount.inc:407
 msgid "supannEmpId"
 msgstr "supannEmpId"
 
-#: personal/supann/class_supannAccount.inc:419
+#: personal/supann/class_supannAccount.inc:411
 msgid "Personal corps"
 msgstr ""
 
-#: personal/supann/class_supannAccount.inc:419
+#: personal/supann/class_supannAccount.inc:411
 msgid "supannEmpCorps"
 msgstr "supannEmpCorps"
 
-#: personal/supann/class_supannAccount.inc:424
-msgid "Activity"
+#: personal/supann/class_supannAccount.inc:416
+msgid "Activite"
 msgstr ""
 
-#: personal/supann/class_supannAccount.inc:424
+#: personal/supann/class_supannAccount.inc:416
 msgid "supannActivite"
 msgstr "supannActivite"
 
-#: personal/supann/class_supannAccount.inc:431
+#: personal/supann/class_supannAccount.inc:423
 msgid "Roles"
 msgstr "Rolen"
 
-#: personal/supann/class_supannAccount.inc:438
+#: personal/supann/class_supannAccount.inc:430
 msgid "supannRoleEntite"
 msgstr "supannRoleEntite"
 
-#: personal/supann/class_supannAccount.inc:442
+#: personal/supann/class_supannAccount.inc:434
 msgid "Generic role"
 msgstr ""
 
-#: personal/supann/class_supannAccount.inc:442
+#: personal/supann/class_supannAccount.inc:434
 msgid "supannRoleGenerique"
 msgstr "supannRoleGenerique"
 
-#: personal/supann/class_supannAccount.inc:446
-msgid "Entity assignment type"
-msgstr ""
-
 #: config/supann/class_supannConfig.inc:28
 msgid "SUPANN configuration"
 msgstr ""
diff --git a/supann/locale/pl/fusiondirectory.po b/supann/locale/pl/fusiondirectory.po
index 7d73719a971f54952a3fdb3fb543398435b3fe65..aecdfc0fb707e577823b467d0e7452c4237cdcf1 100644
--- a/supann/locale/pl/fusiondirectory.po
+++ b/supann/locale/pl/fusiondirectory.po
@@ -5,12 +5,12 @@
 # Translators:
 msgid ""
 msgstr ""
-"Project-Id-Version: FusionDirectory-108\n"
+"Project-Id-Version: FusionDirectory-109\n"
 "Report-Msgid-Bugs-To: documentation@lists.fusiondirectory.org\n"
-"POT-Creation-Date: 2015-03-31 11:49+0200\n"
-"PO-Revision-Date: 2015-03-31 10:46+0000\n"
+"POT-Creation-Date: 2014-12-15 17:47+0100\n"
+"PO-Revision-Date: 2015-02-25 16:04+0000\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>\n"
-"Language-Team: Polish (http://www.transifex.com/projects/p/FusionDirectory-108/language/pl/)\n"
+"Language-Team: Polish (http://www.transifex.com/projects/p/FusionDirectory-109/language/pl/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -27,15 +27,16 @@ msgstr ""
 
 #: admin/supannStructures/class_entite.inc:31
 #: admin/supannStructures/class_entite.inc:52
-msgid "Entity"
+#: personal/supann/class_supannAccount.inc:442
+msgid "Entite"
 msgstr ""
 
 #: admin/supannStructures/class_entite.inc:32
-msgid "SUPANN Entity Settings"
+msgid "SUPANN Entite Settings"
 msgstr ""
 
 #: admin/supannStructures/class_entite.inc:35
-msgid "SUPANN Entity"
+msgid "SUPANN Entite"
 msgstr ""
 
 #: admin/supannStructures/class_entite.inc:55
@@ -44,7 +45,7 @@ msgid "Name"
 msgstr "ImiÄ™"
 
 #: admin/supannStructures/class_entite.inc:55
-msgid "The name to write in the ou attribute for this entity"
+msgid "The name to write in the ou attribute for this entite"
 msgstr ""
 
 #: admin/supannStructures/class_entite.inc:61
@@ -57,7 +58,7 @@ msgid "Telephone"
 msgstr "Telefon"
 
 #: admin/supannStructures/class_entite.inc:64
-msgid "Phone number for this entity"
+msgid "Phone number for this entite"
 msgstr ""
 
 #: admin/supannStructures/class_entite.inc:68
@@ -66,7 +67,7 @@ msgid "Fax"
 msgstr "Fax"
 
 #: admin/supannStructures/class_entite.inc:68
-msgid "Fax number for this entity"
+msgid "Fax number for this entite"
 msgstr ""
 
 #: admin/supannStructures/class_entite.inc:72
@@ -74,7 +75,7 @@ msgid "Postal address"
 msgstr "Adres pocztowy"
 
 #: admin/supannStructures/class_entite.inc:72
-msgid "Postal address of this entity"
+msgid "Postal address of this entite"
 msgstr ""
 
 #: admin/supannStructures/class_entite.inc:76
@@ -83,7 +84,7 @@ msgid "Description"
 msgstr "Opis"
 
 #: admin/supannStructures/class_entite.inc:76
-msgid "Short description of this entity"
+msgid "Short description of this entite"
 msgstr ""
 
 #: admin/supannStructures/class_entite.inc:82
@@ -91,27 +92,28 @@ msgid "SUPANN informations"
 msgstr ""
 
 #: admin/supannStructures/class_entite.inc:85
-msgid "Entity type"
+#: personal/supann/class_supannAccount.inc:438
+msgid "Entite type"
 msgstr ""
 
 #: admin/supannStructures/class_entite.inc:85
-msgid "The best SUPANN type that fits this entity"
+msgid "The best SUPANN type that fits this entite"
 msgstr ""
 
 #: admin/supannStructures/class_entite.inc:89
-msgid "Entity code"
+msgid "Entite code"
 msgstr ""
 
 #: admin/supannStructures/class_entite.inc:89
-msgid "The SUPANN code of this entity"
+msgid "The SUPANN code of this entite"
 msgstr ""
 
 #: admin/supannStructures/class_entite.inc:94
-msgid "Parent entity"
+msgid "Parent entite"
 msgstr ""
 
 #: admin/supannStructures/class_entite.inc:94
-msgid "The parent entity of this entity"
+msgid "The parent entite of this entite"
 msgstr ""
 
 #: admin/supannStructures/class_entite.inc:98
@@ -119,21 +121,21 @@ msgid "Reference ID"
 msgstr ""
 
 #: admin/supannStructures/class_entite.inc:98
-msgid "SUPANN reference ID of this entity"
+msgid "SUPANN reference ID of this entite"
 msgstr ""
 
 #: admin/supannStructures/class_etablissement.inc:31
-#: personal/supann/class_supannAccount.inc:324
-#: personal/supann/class_supannAccount.inc:363
-msgid "Establishment"
+#: personal/supann/class_supannAccount.inc:316
+#: personal/supann/class_supannAccount.inc:355
+msgid "Etablissement"
 msgstr ""
 
 #: admin/supannStructures/class_etablissement.inc:32
-msgid "SUPANN Establishment Settings"
+msgid "SUPANN Etablissement Settings"
 msgstr ""
 
 #: admin/supannStructures/class_etablissement.inc:35
-msgid "SUPANN Establishment"
+msgid "SUPANN Etablissement"
 msgstr ""
 
 #: admin/supannStructures/class_etablissement.inc:52
@@ -141,19 +143,19 @@ msgid "Properties"
 msgstr "WÅ‚aÅ›ciwoÅ›ci"
 
 #: admin/supannStructures/class_etablissement.inc:55
-msgid "Root Establishment"
+msgid "Root etablissement"
 msgstr ""
 
 #: admin/supannStructures/class_etablissement.inc:55
-msgid "Set this Establishment as the root one"
+msgid "Set this etablissement as the root one"
 msgstr ""
 
 #: admin/supannStructures/class_etablissement.inc:59
-msgid "The name to write in the o attribute for this Establishment"
+msgid "The name to write in the o attribute for this etablissement"
 msgstr ""
 
 #: admin/supannStructures/class_etablissement.inc:63
-msgid "A short description of this Establishment"
+msgid "A short description of this etablissement"
 msgstr ""
 
 #: admin/supannStructures/class_etablissement.inc:69
@@ -162,7 +164,7 @@ msgid "Location"
 msgstr "Lokalizacja"
 
 #: admin/supannStructures/class_etablissement.inc:72
-msgid "Usually the city where this Establishment is"
+msgid "Usually the city in which is this etablissement"
 msgstr ""
 
 #: admin/supannStructures/class_etablissement.inc:76
@@ -170,15 +172,15 @@ msgid "Address"
 msgstr "Adres"
 
 #: admin/supannStructures/class_etablissement.inc:76
-msgid "The postal address of this Establishment"
+msgid "The postal address of this etablissement"
 msgstr ""
 
 #: admin/supannStructures/class_etablissement.inc:80
-msgid "Phone number for this Establishment"
+msgid "Phone number for this etablissement"
 msgstr ""
 
 #: admin/supannStructures/class_etablissement.inc:84
-msgid "Fax number for this Establishment"
+msgid "Fax number for this etablissement"
 msgstr ""
 
 #: admin/supannStructures/class_etablissement.inc:90
@@ -186,11 +188,11 @@ msgid "SUPANN properties"
 msgstr ""
 
 #: admin/supannStructures/class_etablissement.inc:93
-msgid "Establishment code"
+msgid "Etablissement code"
 msgstr ""
 
 #: admin/supannStructures/class_etablissement.inc:93
-msgid "The code of this Establishment (must have a prefix between {})"
+msgid "The code of this etablissement (must have a prefix between {})"
 msgstr ""
 
 #: admin/supannStructures/class_etablissement.inc:98
@@ -198,7 +200,7 @@ msgid "SUPANN code"
 msgstr ""
 
 #: admin/supannStructures/class_etablissement.inc:98
-msgid "The SUPANN code for this Establishment"
+msgid "The SUPANN code for this etablissement"
 msgstr ""
 
 #: admin/supannStructures/class_etablissement.inc:103
@@ -206,7 +208,7 @@ msgid "Legal name"
 msgstr ""
 
 #: admin/supannStructures/class_etablissement.inc:103
-msgid "The legal name of this Establishment"
+msgid "The legal name of this etablissement"
 msgstr ""
 
 #: admin/supannStructures/class_etablissement.inc:107
@@ -214,7 +216,7 @@ msgid "Home page URI"
 msgstr ""
 
 #: admin/supannStructures/class_etablissement.inc:107
-msgid "The URI of this Establishment website home page"
+msgid "The URI of this etablissement website home page"
 msgstr ""
 
 #: admin/supannStructures/class_etablissement.inc:111
@@ -222,7 +224,7 @@ msgid "Institution URI"
 msgstr ""
 
 #: admin/supannStructures/class_etablissement.inc:111
-msgid "The URI of this Establishment institution website"
+msgid "The URI of this etablissement institution website"
 msgstr ""
 
 #: admin/supannStructures/class_etablissement.inc:115
@@ -230,12 +232,12 @@ msgid "White pages URI"
 msgstr ""
 
 #: admin/supannStructures/class_etablissement.inc:115
-msgid "The URI of this Establishment white pages"
+msgid "The URI of this etablissement white pages"
 msgstr ""
 
 #: admin/supannStructures/class_etablissement.inc:148
-#: admin/supannStructures/class_etablissement.inc:201
-#: admin/supannStructures/class_etablissement.inc:219
+#: admin/supannStructures/class_etablissement.inc:198
+#: admin/supannStructures/class_etablissement.inc:216
 msgid "LDAP error"
 msgstr "bÅ‚Ä…d LDAP"
 
@@ -355,256 +357,243 @@ msgstr ""
 msgid "eduPersonNickName - Can contain a nick name for this user"
 msgstr ""
 
-#: personal/supann/class_supannAccount.inc:253
-msgid "Ref ids"
-msgstr ""
-
-#: personal/supann/class_supannAccount.inc:253
-msgid "supannRefId - IDs/links for this user on other systems"
-msgstr ""
-
-#: personal/supann/class_supannAccount.inc:262
+#: personal/supann/class_supannAccount.inc:254
 msgid "Contact"
 msgstr "Kontakt"
 
-#: personal/supann/class_supannAccount.inc:266
+#: personal/supann/class_supannAccount.inc:258
 msgid "Other phone numbers"
 msgstr ""
 
-#: personal/supann/class_supannAccount.inc:266
+#: personal/supann/class_supannAccount.inc:258
 msgid "supannAutreTelephone - Other phone numbers for this user"
 msgstr ""
 
-#: personal/supann/class_supannAccount.inc:272
+#: personal/supann/class_supannAccount.inc:264
 msgid "Other mail addresses"
 msgstr ""
 
-#: personal/supann/class_supannAccount.inc:272
+#: personal/supann/class_supannAccount.inc:264
 msgid ""
 "supannAutreMail - Other mail addresses for this user. Each must be unique"
 msgstr ""
 
-#: personal/supann/class_supannAccount.inc:278
+#: personal/supann/class_supannAccount.inc:270
 msgid "Personal mail addresses"
 msgstr ""
 
-#: personal/supann/class_supannAccount.inc:278
+#: personal/supann/class_supannAccount.inc:270
 msgid "supannMailPerso - Personal mail addresses for this user"
 msgstr ""
 
-#: personal/supann/class_supannAccount.inc:283
-msgid "red List"
+#: personal/supann/class_supannAccount.inc:275
+msgid "Liste rouge"
 msgstr ""
 
-#: personal/supann/class_supannAccount.inc:283
+#: personal/supann/class_supannAccount.inc:275
 msgid "supannListeRouge - Should this person be on the red list"
 msgstr ""
 
-#: personal/supann/class_supannAccount.inc:289
+#: personal/supann/class_supannAccount.inc:281
 msgid "Affectation"
 msgstr ""
 
-#: personal/supann/class_supannAccount.inc:292
-msgid "Entity primary assignment"
+#: personal/supann/class_supannAccount.inc:284
+msgid "Entite affectation principale"
 msgstr ""
 
-#: personal/supann/class_supannAccount.inc:292
+#: personal/supann/class_supannAccount.inc:284
 msgid "supannEntiteAffectationPrincipale"
 msgstr ""
 
-#: personal/supann/class_supannAccount.inc:297
-#: personal/supann/class_supannAccount.inc:388
-#: personal/supann/class_supannAccount.inc:450
-msgid "Entity assignment"
+#: personal/supann/class_supannAccount.inc:289
+#: personal/supann/class_supannAccount.inc:380
+msgid "Entite affectation"
 msgstr ""
 
-#: personal/supann/class_supannAccount.inc:297
-#: personal/supann/class_supannAccount.inc:450
+#: personal/supann/class_supannAccount.inc:289
+#: personal/supann/class_supannAccount.inc:442
 msgid "supannEntiteAffectation"
 msgstr ""
 
-#: personal/supann/class_supannAccount.inc:303
-msgid "Entity type assignment"
+#: personal/supann/class_supannAccount.inc:295
+msgid "Type entite affectation"
 msgstr ""
 
-#: personal/supann/class_supannAccount.inc:303
-#: personal/supann/class_supannAccount.inc:446
+#: personal/supann/class_supannAccount.inc:295
+#: personal/supann/class_supannAccount.inc:438
 msgid "supannTypeEntiteAffectation"
 msgstr ""
 
-#: personal/supann/class_supannAccount.inc:310
+#: personal/supann/class_supannAccount.inc:302
 msgid "Affiliation"
 msgstr ""
 
-#: personal/supann/class_supannAccount.inc:313
+#: personal/supann/class_supannAccount.inc:305
 msgid "Primary affiliation"
 msgstr ""
 
-#: personal/supann/class_supannAccount.inc:313
+#: personal/supann/class_supannAccount.inc:305
 msgid "eduPersonPrimaryAffiliation"
 msgstr ""
 
-#: personal/supann/class_supannAccount.inc:318
+#: personal/supann/class_supannAccount.inc:310
 msgid "Affiliations"
 msgstr ""
 
-#: personal/supann/class_supannAccount.inc:318
+#: personal/supann/class_supannAccount.inc:310
 msgid "eduPersonAffiliation"
 msgstr ""
 
-#: personal/supann/class_supannAccount.inc:324
+#: personal/supann/class_supannAccount.inc:316
 msgid "supannEtablissement"
 msgstr ""
 
-#: personal/supann/class_supannAccount.inc:331
+#: personal/supann/class_supannAccount.inc:323
 msgid "Student profile"
 msgstr ""
 
-#: personal/supann/class_supannAccount.inc:334
+#: personal/supann/class_supannAccount.inc:326
 msgid "INE code"
 msgstr ""
 
-#: personal/supann/class_supannAccount.inc:334
+#: personal/supann/class_supannAccount.inc:326
 msgid "supannCodeINE - INE code of this student"
 msgstr ""
 
-#: personal/supann/class_supannAccount.inc:338
+#: personal/supann/class_supannAccount.inc:330
 msgid "Student ID"
 msgstr ""
 
-#: personal/supann/class_supannAccount.inc:338
+#: personal/supann/class_supannAccount.inc:330
 msgid "supannEtuId - scolarity id"
 msgstr ""
 
-#: personal/supann/class_supannAccount.inc:344
+#: personal/supann/class_supannAccount.inc:336
 msgid "Student subscriptions"
 msgstr ""
 
-#: personal/supann/class_supannAccount.inc:359
+#: personal/supann/class_supannAccount.inc:351
 msgid "supannEtuInscription - Subscriptions for this student"
 msgstr ""
 
-#: personal/supann/class_supannAccount.inc:363
+#: personal/supann/class_supannAccount.inc:355
 msgid ""
 "supannEtablissement - Etablissement in which this subscription was done"
 msgstr ""
 
-#: personal/supann/class_supannAccount.inc:367
+#: personal/supann/class_supannAccount.inc:359
 msgid "Year"
 msgstr ""
 
-#: personal/supann/class_supannAccount.inc:367
+#: personal/supann/class_supannAccount.inc:359
 msgid "supannEtuAnneeInscription - The year this subscription will begin"
 msgstr ""
 
-#: personal/supann/class_supannAccount.inc:372
+#: personal/supann/class_supannAccount.inc:364
 msgid "Subscription type"
 msgstr ""
 
-#: personal/supann/class_supannAccount.inc:372
+#: personal/supann/class_supannAccount.inc:364
 msgid "supannEtuRegimeInscription - The type of this subscription"
 msgstr ""
 
-#: personal/supann/class_supannAccount.inc:376
-msgid "Disciplinary Sector"
+#: personal/supann/class_supannAccount.inc:368
+msgid "Secteur Disciplinaire"
 msgstr ""
 
-#: personal/supann/class_supannAccount.inc:376
+#: personal/supann/class_supannAccount.inc:368
 msgid "supannEtuSecteurDisciplinaire"
 msgstr ""
 
-#: personal/supann/class_supannAccount.inc:380
+#: personal/supann/class_supannAccount.inc:372
 msgid "Diploma type"
 msgstr ""
 
-#: personal/supann/class_supannAccount.inc:380
+#: personal/supann/class_supannAccount.inc:372
 msgid "supannEtuTypeDiplome - Type of diploma"
 msgstr ""
 
-#: personal/supann/class_supannAccount.inc:384
-msgid "Curriculum year "
+#: personal/supann/class_supannAccount.inc:376
+msgid "Cursus annee"
 msgstr ""
 
-#: personal/supann/class_supannAccount.inc:384
+#: personal/supann/class_supannAccount.inc:376
 msgid "supannEtuCursusAnnee"
 msgstr ""
 
-#: personal/supann/class_supannAccount.inc:388
+#: personal/supann/class_supannAccount.inc:380
 msgid "supannEntiteAffectation_affect"
 msgstr ""
 
-#: personal/supann/class_supannAccount.inc:392
+#: personal/supann/class_supannAccount.inc:384
 msgid "Diploma"
 msgstr ""
 
-#: personal/supann/class_supannAccount.inc:392
+#: personal/supann/class_supannAccount.inc:384
 msgid "supannEtuDiplome"
 msgstr ""
 
-#: personal/supann/class_supannAccount.inc:396
+#: personal/supann/class_supannAccount.inc:388
 msgid "Step"
 msgstr ""
 
-#: personal/supann/class_supannAccount.inc:396
+#: personal/supann/class_supannAccount.inc:388
 msgid "supannEtuEtape"
 msgstr ""
 
-#: personal/supann/class_supannAccount.inc:400
+#: personal/supann/class_supannAccount.inc:392
 msgid "educational element"
 msgstr ""
 
-#: personal/supann/class_supannAccount.inc:400
+#: personal/supann/class_supannAccount.inc:392
 msgid "supannEtuElementPedagogique"
 msgstr ""
 
-#: personal/supann/class_supannAccount.inc:412
-msgid "Personal profile"
+#: personal/supann/class_supannAccount.inc:404
+msgid "Personnal profile"
 msgstr ""
 
-#: personal/supann/class_supannAccount.inc:415
+#: personal/supann/class_supannAccount.inc:407
 msgid "Personal ID"
 msgstr ""
 
-#: personal/supann/class_supannAccount.inc:415
+#: personal/supann/class_supannAccount.inc:407
 msgid "supannEmpId"
 msgstr ""
 
-#: personal/supann/class_supannAccount.inc:419
+#: personal/supann/class_supannAccount.inc:411
 msgid "Personal corps"
 msgstr ""
 
-#: personal/supann/class_supannAccount.inc:419
+#: personal/supann/class_supannAccount.inc:411
 msgid "supannEmpCorps"
 msgstr ""
 
-#: personal/supann/class_supannAccount.inc:424
-msgid "Activity"
+#: personal/supann/class_supannAccount.inc:416
+msgid "Activite"
 msgstr ""
 
-#: personal/supann/class_supannAccount.inc:424
+#: personal/supann/class_supannAccount.inc:416
 msgid "supannActivite"
 msgstr ""
 
-#: personal/supann/class_supannAccount.inc:431
+#: personal/supann/class_supannAccount.inc:423
 msgid "Roles"
 msgstr ""
 
-#: personal/supann/class_supannAccount.inc:438
+#: personal/supann/class_supannAccount.inc:430
 msgid "supannRoleEntite"
 msgstr ""
 
-#: personal/supann/class_supannAccount.inc:442
+#: personal/supann/class_supannAccount.inc:434
 msgid "Generic role"
 msgstr ""
 
-#: personal/supann/class_supannAccount.inc:442
+#: personal/supann/class_supannAccount.inc:434
 msgid "supannRoleGenerique"
 msgstr ""
 
-#: personal/supann/class_supannAccount.inc:446
-msgid "Entity assignment type"
-msgstr ""
-
 #: config/supann/class_supannConfig.inc:28
 msgid "SUPANN configuration"
 msgstr ""
diff --git a/supann/locale/pt/fusiondirectory.po b/supann/locale/pt/fusiondirectory.po
index f3d414350a8991fde2aed155a60bbfce2fc775ea..1133a95c2371aeef2765ea3394628c029f33dc26 100644
--- a/supann/locale/pt/fusiondirectory.po
+++ b/supann/locale/pt/fusiondirectory.po
@@ -5,12 +5,12 @@
 # Translators:
 msgid ""
 msgstr ""
-"Project-Id-Version: FusionDirectory-108\n"
+"Project-Id-Version: FusionDirectory-109\n"
 "Report-Msgid-Bugs-To: documentation@lists.fusiondirectory.org\n"
-"POT-Creation-Date: 2015-03-31 11:49+0200\n"
-"PO-Revision-Date: 2015-03-31 10:46+0000\n"
+"POT-Creation-Date: 2014-12-15 17:47+0100\n"
+"PO-Revision-Date: 2015-02-25 16:04+0000\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>\n"
-"Language-Team: Portuguese (http://www.transifex.com/projects/p/FusionDirectory-108/language/pt/)\n"
+"Language-Team: Portuguese (http://www.transifex.com/projects/p/FusionDirectory-109/language/pt/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -27,15 +27,16 @@ msgstr ""
 
 #: admin/supannStructures/class_entite.inc:31
 #: admin/supannStructures/class_entite.inc:52
-msgid "Entity"
+#: personal/supann/class_supannAccount.inc:442
+msgid "Entite"
 msgstr ""
 
 #: admin/supannStructures/class_entite.inc:32
-msgid "SUPANN Entity Settings"
+msgid "SUPANN Entite Settings"
 msgstr ""
 
 #: admin/supannStructures/class_entite.inc:35
-msgid "SUPANN Entity"
+msgid "SUPANN Entite"
 msgstr ""
 
 #: admin/supannStructures/class_entite.inc:55
@@ -44,7 +45,7 @@ msgid "Name"
 msgstr "Nome"
 
 #: admin/supannStructures/class_entite.inc:55
-msgid "The name to write in the ou attribute for this entity"
+msgid "The name to write in the ou attribute for this entite"
 msgstr ""
 
 #: admin/supannStructures/class_entite.inc:61
@@ -57,7 +58,7 @@ msgid "Telephone"
 msgstr ""
 
 #: admin/supannStructures/class_entite.inc:64
-msgid "Phone number for this entity"
+msgid "Phone number for this entite"
 msgstr ""
 
 #: admin/supannStructures/class_entite.inc:68
@@ -66,7 +67,7 @@ msgid "Fax"
 msgstr "Fax"
 
 #: admin/supannStructures/class_entite.inc:68
-msgid "Fax number for this entity"
+msgid "Fax number for this entite"
 msgstr ""
 
 #: admin/supannStructures/class_entite.inc:72
@@ -74,7 +75,7 @@ msgid "Postal address"
 msgstr "Caixa postal"
 
 #: admin/supannStructures/class_entite.inc:72
-msgid "Postal address of this entity"
+msgid "Postal address of this entite"
 msgstr ""
 
 #: admin/supannStructures/class_entite.inc:76
@@ -83,7 +84,7 @@ msgid "Description"
 msgstr "DescriÃ§Ã£o"
 
 #: admin/supannStructures/class_entite.inc:76
-msgid "Short description of this entity"
+msgid "Short description of this entite"
 msgstr ""
 
 #: admin/supannStructures/class_entite.inc:82
@@ -91,27 +92,28 @@ msgid "SUPANN informations"
 msgstr ""
 
 #: admin/supannStructures/class_entite.inc:85
-msgid "Entity type"
+#: personal/supann/class_supannAccount.inc:438
+msgid "Entite type"
 msgstr ""
 
 #: admin/supannStructures/class_entite.inc:85
-msgid "The best SUPANN type that fits this entity"
+msgid "The best SUPANN type that fits this entite"
 msgstr ""
 
 #: admin/supannStructures/class_entite.inc:89
-msgid "Entity code"
+msgid "Entite code"
 msgstr ""
 
 #: admin/supannStructures/class_entite.inc:89
-msgid "The SUPANN code of this entity"
+msgid "The SUPANN code of this entite"
 msgstr ""
 
 #: admin/supannStructures/class_entite.inc:94
-msgid "Parent entity"
+msgid "Parent entite"
 msgstr ""
 
 #: admin/supannStructures/class_entite.inc:94
-msgid "The parent entity of this entity"
+msgid "The parent entite of this entite"
 msgstr ""
 
 #: admin/supannStructures/class_entite.inc:98
@@ -119,21 +121,21 @@ msgid "Reference ID"
 msgstr ""
 
 #: admin/supannStructures/class_entite.inc:98
-msgid "SUPANN reference ID of this entity"
+msgid "SUPANN reference ID of this entite"
 msgstr ""
 
 #: admin/supannStructures/class_etablissement.inc:31
-#: personal/supann/class_supannAccount.inc:324
-#: personal/supann/class_supannAccount.inc:363
-msgid "Establishment"
+#: personal/supann/class_supannAccount.inc:316
+#: personal/supann/class_supannAccount.inc:355
+msgid "Etablissement"
 msgstr ""
 
 #: admin/supannStructures/class_etablissement.inc:32
-msgid "SUPANN Establishment Settings"
+msgid "SUPANN Etablissement Settings"
 msgstr ""
 
 #: admin/supannStructures/class_etablissement.inc:35
-msgid "SUPANN Establishment"
+msgid "SUPANN Etablissement"
 msgstr ""
 
 #: admin/supannStructures/class_etablissement.inc:52
@@ -141,19 +143,19 @@ msgid "Properties"
 msgstr "Propriedades"
 
 #: admin/supannStructures/class_etablissement.inc:55
-msgid "Root Establishment"
+msgid "Root etablissement"
 msgstr ""
 
 #: admin/supannStructures/class_etablissement.inc:55
-msgid "Set this Establishment as the root one"
+msgid "Set this etablissement as the root one"
 msgstr ""
 
 #: admin/supannStructures/class_etablissement.inc:59
-msgid "The name to write in the o attribute for this Establishment"
+msgid "The name to write in the o attribute for this etablissement"
 msgstr ""
 
 #: admin/supannStructures/class_etablissement.inc:63
-msgid "A short description of this Establishment"
+msgid "A short description of this etablissement"
 msgstr ""
 
 #: admin/supannStructures/class_etablissement.inc:69
@@ -162,7 +164,7 @@ msgid "Location"
 msgstr "LocalizaÃ§Ã£o"
 
 #: admin/supannStructures/class_etablissement.inc:72
-msgid "Usually the city where this Establishment is"
+msgid "Usually the city in which is this etablissement"
 msgstr ""
 
 #: admin/supannStructures/class_etablissement.inc:76
@@ -170,15 +172,15 @@ msgid "Address"
 msgstr "EndereÃ§o"
 
 #: admin/supannStructures/class_etablissement.inc:76
-msgid "The postal address of this Establishment"
+msgid "The postal address of this etablissement"
 msgstr ""
 
 #: admin/supannStructures/class_etablissement.inc:80
-msgid "Phone number for this Establishment"
+msgid "Phone number for this etablissement"
 msgstr ""
 
 #: admin/supannStructures/class_etablissement.inc:84
-msgid "Fax number for this Establishment"
+msgid "Fax number for this etablissement"
 msgstr ""
 
 #: admin/supannStructures/class_etablissement.inc:90
@@ -186,11 +188,11 @@ msgid "SUPANN properties"
 msgstr ""
 
 #: admin/supannStructures/class_etablissement.inc:93
-msgid "Establishment code"
+msgid "Etablissement code"
 msgstr ""
 
 #: admin/supannStructures/class_etablissement.inc:93
-msgid "The code of this Establishment (must have a prefix between {})"
+msgid "The code of this etablissement (must have a prefix between {})"
 msgstr ""
 
 #: admin/supannStructures/class_etablissement.inc:98
@@ -198,7 +200,7 @@ msgid "SUPANN code"
 msgstr ""
 
 #: admin/supannStructures/class_etablissement.inc:98
-msgid "The SUPANN code for this Establishment"
+msgid "The SUPANN code for this etablissement"
 msgstr ""
 
 #: admin/supannStructures/class_etablissement.inc:103
@@ -206,7 +208,7 @@ msgid "Legal name"
 msgstr ""
 
 #: admin/supannStructures/class_etablissement.inc:103
-msgid "The legal name of this Establishment"
+msgid "The legal name of this etablissement"
 msgstr ""
 
 #: admin/supannStructures/class_etablissement.inc:107
@@ -214,7 +216,7 @@ msgid "Home page URI"
 msgstr ""
 
 #: admin/supannStructures/class_etablissement.inc:107
-msgid "The URI of this Establishment website home page"
+msgid "The URI of this etablissement website home page"
 msgstr ""
 
 #: admin/supannStructures/class_etablissement.inc:111
@@ -222,7 +224,7 @@ msgid "Institution URI"
 msgstr ""
 
 #: admin/supannStructures/class_etablissement.inc:111
-msgid "The URI of this Establishment institution website"
+msgid "The URI of this etablissement institution website"
 msgstr ""
 
 #: admin/supannStructures/class_etablissement.inc:115
@@ -230,12 +232,12 @@ msgid "White pages URI"
 msgstr ""
 
 #: admin/supannStructures/class_etablissement.inc:115
-msgid "The URI of this Establishment white pages"
+msgid "The URI of this etablissement white pages"
 msgstr ""
 
 #: admin/supannStructures/class_etablissement.inc:148
-#: admin/supannStructures/class_etablissement.inc:201
-#: admin/supannStructures/class_etablissement.inc:219
+#: admin/supannStructures/class_etablissement.inc:198
+#: admin/supannStructures/class_etablissement.inc:216
 msgid "LDAP error"
 msgstr "Erro de LDAP"
 
@@ -355,256 +357,243 @@ msgstr ""
 msgid "eduPersonNickName - Can contain a nick name for this user"
 msgstr ""
 
-#: personal/supann/class_supannAccount.inc:253
-msgid "Ref ids"
-msgstr ""
-
-#: personal/supann/class_supannAccount.inc:253
-msgid "supannRefId - IDs/links for this user on other systems"
-msgstr ""
-
-#: personal/supann/class_supannAccount.inc:262
+#: personal/supann/class_supannAccount.inc:254
 msgid "Contact"
 msgstr ""
 
-#: personal/supann/class_supannAccount.inc:266
+#: personal/supann/class_supannAccount.inc:258
 msgid "Other phone numbers"
 msgstr ""
 
-#: personal/supann/class_supannAccount.inc:266
+#: personal/supann/class_supannAccount.inc:258
 msgid "supannAutreTelephone - Other phone numbers for this user"
 msgstr ""
 
-#: personal/supann/class_supannAccount.inc:272
+#: personal/supann/class_supannAccount.inc:264
 msgid "Other mail addresses"
 msgstr ""
 
-#: personal/supann/class_supannAccount.inc:272
+#: personal/supann/class_supannAccount.inc:264
 msgid ""
 "supannAutreMail - Other mail addresses for this user. Each must be unique"
 msgstr ""
 
-#: personal/supann/class_supannAccount.inc:278
+#: personal/supann/class_supannAccount.inc:270
 msgid "Personal mail addresses"
 msgstr ""
 
-#: personal/supann/class_supannAccount.inc:278
+#: personal/supann/class_supannAccount.inc:270
 msgid "supannMailPerso - Personal mail addresses for this user"
 msgstr ""
 
-#: personal/supann/class_supannAccount.inc:283
-msgid "red List"
+#: personal/supann/class_supannAccount.inc:275
+msgid "Liste rouge"
 msgstr ""
 
-#: personal/supann/class_supannAccount.inc:283
+#: personal/supann/class_supannAccount.inc:275
 msgid "supannListeRouge - Should this person be on the red list"
 msgstr ""
 
-#: personal/supann/class_supannAccount.inc:289
+#: personal/supann/class_supannAccount.inc:281
 msgid "Affectation"
 msgstr ""
 
-#: personal/supann/class_supannAccount.inc:292
-msgid "Entity primary assignment"
+#: personal/supann/class_supannAccount.inc:284
+msgid "Entite affectation principale"
 msgstr ""
 
-#: personal/supann/class_supannAccount.inc:292
+#: personal/supann/class_supannAccount.inc:284
 msgid "supannEntiteAffectationPrincipale"
 msgstr ""
 
-#: personal/supann/class_supannAccount.inc:297
-#: personal/supann/class_supannAccount.inc:388
-#: personal/supann/class_supannAccount.inc:450
-msgid "Entity assignment"
+#: personal/supann/class_supannAccount.inc:289
+#: personal/supann/class_supannAccount.inc:380
+msgid "Entite affectation"
 msgstr ""
 
-#: personal/supann/class_supannAccount.inc:297
-#: personal/supann/class_supannAccount.inc:450
+#: personal/supann/class_supannAccount.inc:289
+#: personal/supann/class_supannAccount.inc:442
 msgid "supannEntiteAffectation"
 msgstr ""
 
-#: personal/supann/class_supannAccount.inc:303
-msgid "Entity type assignment"
+#: personal/supann/class_supannAccount.inc:295
+msgid "Type entite affectation"
 msgstr ""
 
-#: personal/supann/class_supannAccount.inc:303
-#: personal/supann/class_supannAccount.inc:446
+#: personal/supann/class_supannAccount.inc:295
+#: personal/supann/class_supannAccount.inc:438
 msgid "supannTypeEntiteAffectation"
 msgstr ""
 
-#: personal/supann/class_supannAccount.inc:310
+#: personal/supann/class_supannAccount.inc:302
 msgid "Affiliation"
 msgstr ""
 
-#: personal/supann/class_supannAccount.inc:313
+#: personal/supann/class_supannAccount.inc:305
 msgid "Primary affiliation"
 msgstr ""
 
-#: personal/supann/class_supannAccount.inc:313
+#: personal/supann/class_supannAccount.inc:305
 msgid "eduPersonPrimaryAffiliation"
 msgstr ""
 
-#: personal/supann/class_supannAccount.inc:318
+#: personal/supann/class_supannAccount.inc:310
 msgid "Affiliations"
 msgstr ""
 
-#: personal/supann/class_supannAccount.inc:318
+#: personal/supann/class_supannAccount.inc:310
 msgid "eduPersonAffiliation"
 msgstr ""
 
-#: personal/supann/class_supannAccount.inc:324
+#: personal/supann/class_supannAccount.inc:316
 msgid "supannEtablissement"
 msgstr ""
 
-#: personal/supann/class_supannAccount.inc:331
+#: personal/supann/class_supannAccount.inc:323
 msgid "Student profile"
 msgstr ""
 
-#: personal/supann/class_supannAccount.inc:334
+#: personal/supann/class_supannAccount.inc:326
 msgid "INE code"
 msgstr ""
 
-#: personal/supann/class_supannAccount.inc:334
+#: personal/supann/class_supannAccount.inc:326
 msgid "supannCodeINE - INE code of this student"
 msgstr ""
 
-#: personal/supann/class_supannAccount.inc:338
+#: personal/supann/class_supannAccount.inc:330
 msgid "Student ID"
 msgstr ""
 
-#: personal/supann/class_supannAccount.inc:338
+#: personal/supann/class_supannAccount.inc:330
 msgid "supannEtuId - scolarity id"
 msgstr ""
 
-#: personal/supann/class_supannAccount.inc:344
+#: personal/supann/class_supannAccount.inc:336
 msgid "Student subscriptions"
 msgstr ""
 
-#: personal/supann/class_supannAccount.inc:359
+#: personal/supann/class_supannAccount.inc:351
 msgid "supannEtuInscription - Subscriptions for this student"
 msgstr ""
 
-#: personal/supann/class_supannAccount.inc:363
+#: personal/supann/class_supannAccount.inc:355
 msgid ""
 "supannEtablissement - Etablissement in which this subscription was done"
 msgstr ""
 
-#: personal/supann/class_supannAccount.inc:367
+#: personal/supann/class_supannAccount.inc:359
 msgid "Year"
 msgstr ""
 
-#: personal/supann/class_supannAccount.inc:367
+#: personal/supann/class_supannAccount.inc:359
 msgid "supannEtuAnneeInscription - The year this subscription will begin"
 msgstr ""
 
-#: personal/supann/class_supannAccount.inc:372
+#: personal/supann/class_supannAccount.inc:364
 msgid "Subscription type"
 msgstr ""
 
-#: personal/supann/class_supannAccount.inc:372
+#: personal/supann/class_supannAccount.inc:364
 msgid "supannEtuRegimeInscription - The type of this subscription"
 msgstr ""
 
-#: personal/supann/class_supannAccount.inc:376
-msgid "Disciplinary Sector"
+#: personal/supann/class_supannAccount.inc:368
+msgid "Secteur Disciplinaire"
 msgstr ""
 
-#: personal/supann/class_supannAccount.inc:376
+#: personal/supann/class_supannAccount.inc:368
 msgid "supannEtuSecteurDisciplinaire"
 msgstr ""
 
-#: personal/supann/class_supannAccount.inc:380
+#: personal/supann/class_supannAccount.inc:372
 msgid "Diploma type"
 msgstr ""
 
-#: personal/supann/class_supannAccount.inc:380
+#: personal/supann/class_supannAccount.inc:372
 msgid "supannEtuTypeDiplome - Type of diploma"
 msgstr ""
 
-#: personal/supann/class_supannAccount.inc:384
-msgid "Curriculum year "
+#: personal/supann/class_supannAccount.inc:376
+msgid "Cursus annee"
 msgstr ""
 
-#: personal/supann/class_supannAccount.inc:384
+#: personal/supann/class_supannAccount.inc:376
 msgid "supannEtuCursusAnnee"
 msgstr ""
 
-#: personal/supann/class_supannAccount.inc:388
+#: personal/supann/class_supannAccount.inc:380
 msgid "supannEntiteAffectation_affect"
 msgstr ""
 
-#: personal/supann/class_supannAccount.inc:392
+#: personal/supann/class_supannAccount.inc:384
 msgid "Diploma"
 msgstr ""
 
-#: personal/supann/class_supannAccount.inc:392
+#: personal/supann/class_supannAccount.inc:384
 msgid "supannEtuDiplome"
 msgstr ""
 
-#: personal/supann/class_supannAccount.inc:396
+#: personal/supann/class_supannAccount.inc:388
 msgid "Step"
 msgstr ""
 
-#: personal/supann/class_supannAccount.inc:396
+#: personal/supann/class_supannAccount.inc:388
 msgid "supannEtuEtape"
 msgstr ""
 
-#: personal/supann/class_supannAccount.inc:400
+#: personal/supann/class_supannAccount.inc:392
 msgid "educational element"
 msgstr ""
 
-#: personal/supann/class_supannAccount.inc:400
+#: personal/supann/class_supannAccount.inc:392
 msgid "supannEtuElementPedagogique"
 msgstr ""
 
-#: personal/supann/class_supannAccount.inc:412
-msgid "Personal profile"
+#: personal/supann/class_supannAccount.inc:404
+msgid "Personnal profile"
 msgstr ""
 
-#: personal/supann/class_supannAccount.inc:415
+#: personal/supann/class_supannAccount.inc:407
 msgid "Personal ID"
 msgstr ""
 
-#: personal/supann/class_supannAccount.inc:415
+#: personal/supann/class_supannAccount.inc:407
 msgid "supannEmpId"
 msgstr ""
 
-#: personal/supann/class_supannAccount.inc:419
+#: personal/supann/class_supannAccount.inc:411
 msgid "Personal corps"
 msgstr ""
 
-#: personal/supann/class_supannAccount.inc:419
+#: personal/supann/class_supannAccount.inc:411
 msgid "supannEmpCorps"
 msgstr ""
 
-#: personal/supann/class_supannAccount.inc:424
-msgid "Activity"
+#: personal/supann/class_supannAccount.inc:416
+msgid "Activite"
 msgstr ""
 
-#: personal/supann/class_supannAccount.inc:424
+#: personal/supann/class_supannAccount.inc:416
 msgid "supannActivite"
 msgstr ""
 
-#: personal/supann/class_supannAccount.inc:431
+#: personal/supann/class_supannAccount.inc:423
 msgid "Roles"
 msgstr ""
 
-#: personal/supann/class_supannAccount.inc:438
+#: personal/supann/class_supannAccount.inc:430
 msgid "supannRoleEntite"
 msgstr ""
 
-#: personal/supann/class_supannAccount.inc:442
+#: personal/supann/class_supannAccount.inc:434
 msgid "Generic role"
 msgstr ""
 
-#: personal/supann/class_supannAccount.inc:442
+#: personal/supann/class_supannAccount.inc:434
 msgid "supannRoleGenerique"
 msgstr ""
 
-#: personal/supann/class_supannAccount.inc:446
-msgid "Entity assignment type"
-msgstr ""
-
 #: config/supann/class_supannConfig.inc:28
 msgid "SUPANN configuration"
 msgstr ""
diff --git a/supann/locale/pt_BR/fusiondirectory.po b/supann/locale/pt_BR/fusiondirectory.po
index f1875524f98a2159939d46f4cace3368ff24c8e5..a31e0043aa4f4c780a743bc23febbb63c1889907 100644
--- a/supann/locale/pt_BR/fusiondirectory.po
+++ b/supann/locale/pt_BR/fusiondirectory.po
@@ -3,15 +3,14 @@
 # This file is distributed under the same license as the PACKAGE package.
 # 
 # Translators:
-# ALEJANDRO BARRIOS <alejandrobarrios@interlegis.leg.br>, 2014
 msgid ""
 msgstr ""
-"Project-Id-Version: FusionDirectory-108\n"
+"Project-Id-Version: FusionDirectory-109\n"
 "Report-Msgid-Bugs-To: documentation@lists.fusiondirectory.org\n"
-"POT-Creation-Date: 2015-03-31 11:49+0200\n"
-"PO-Revision-Date: 2015-03-31 10:46+0000\n"
+"POT-Creation-Date: 2014-12-15 17:47+0100\n"
+"PO-Revision-Date: 2015-02-25 16:51+0000\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>\n"
-"Language-Team: Portuguese (Brazil) (http://www.transifex.com/projects/p/FusionDirectory-108/language/pt_BR/)\n"
+"Language-Team: Portuguese (Brazil) (http://www.transifex.com/projects/p/FusionDirectory-109/language/pt_BR/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -28,15 +27,16 @@ msgstr "Gerenciador de estruturas Supann"
 
 #: admin/supannStructures/class_entite.inc:31
 #: admin/supannStructures/class_entite.inc:52
-msgid "Entity"
+#: personal/supann/class_supannAccount.inc:442
+msgid "Entite"
 msgstr ""
 
 #: admin/supannStructures/class_entite.inc:32
-msgid "SUPANN Entity Settings"
+msgid "SUPANN Entite Settings"
 msgstr ""
 
 #: admin/supannStructures/class_entite.inc:35
-msgid "SUPANN Entity"
+msgid "SUPANN Entite"
 msgstr ""
 
 #: admin/supannStructures/class_entite.inc:55
@@ -45,7 +45,7 @@ msgid "Name"
 msgstr "Nome"
 
 #: admin/supannStructures/class_entite.inc:55
-msgid "The name to write in the ou attribute for this entity"
+msgid "The name to write in the ou attribute for this entite"
 msgstr ""
 
 #: admin/supannStructures/class_entite.inc:61
@@ -58,7 +58,7 @@ msgid "Telephone"
 msgstr "Telefone"
 
 #: admin/supannStructures/class_entite.inc:64
-msgid "Phone number for this entity"
+msgid "Phone number for this entite"
 msgstr ""
 
 #: admin/supannStructures/class_entite.inc:68
@@ -67,7 +67,7 @@ msgid "Fax"
 msgstr "Fax"
 
 #: admin/supannStructures/class_entite.inc:68
-msgid "Fax number for this entity"
+msgid "Fax number for this entite"
 msgstr ""
 
 #: admin/supannStructures/class_entite.inc:72
@@ -75,7 +75,7 @@ msgid "Postal address"
 msgstr "EndereÃ§os de correspondÃªncia"
 
 #: admin/supannStructures/class_entite.inc:72
-msgid "Postal address of this entity"
+msgid "Postal address of this entite"
 msgstr ""
 
 #: admin/supannStructures/class_entite.inc:76
@@ -84,7 +84,7 @@ msgid "Description"
 msgstr "DescriÃ§Ã£o"
 
 #: admin/supannStructures/class_entite.inc:76
-msgid "Short description of this entity"
+msgid "Short description of this entite"
 msgstr ""
 
 #: admin/supannStructures/class_entite.inc:82
@@ -92,27 +92,28 @@ msgid "SUPANN informations"
 msgstr "InformaÃ§Ãµes de SUPANN"
 
 #: admin/supannStructures/class_entite.inc:85
-msgid "Entity type"
+#: personal/supann/class_supannAccount.inc:438
+msgid "Entite type"
 msgstr ""
 
 #: admin/supannStructures/class_entite.inc:85
-msgid "The best SUPANN type that fits this entity"
+msgid "The best SUPANN type that fits this entite"
 msgstr ""
 
 #: admin/supannStructures/class_entite.inc:89
-msgid "Entity code"
+msgid "Entite code"
 msgstr ""
 
 #: admin/supannStructures/class_entite.inc:89
-msgid "The SUPANN code of this entity"
+msgid "The SUPANN code of this entite"
 msgstr ""
 
 #: admin/supannStructures/class_entite.inc:94
-msgid "Parent entity"
+msgid "Parent entite"
 msgstr ""
 
 #: admin/supannStructures/class_entite.inc:94
-msgid "The parent entity of this entity"
+msgid "The parent entite of this entite"
 msgstr ""
 
 #: admin/supannStructures/class_entite.inc:98
@@ -120,21 +121,21 @@ msgid "Reference ID"
 msgstr "ID de referÃªncia"
 
 #: admin/supannStructures/class_entite.inc:98
-msgid "SUPANN reference ID of this entity"
+msgid "SUPANN reference ID of this entite"
 msgstr ""
 
 #: admin/supannStructures/class_etablissement.inc:31
-#: personal/supann/class_supannAccount.inc:324
-#: personal/supann/class_supannAccount.inc:363
-msgid "Establishment"
+#: personal/supann/class_supannAccount.inc:316
+#: personal/supann/class_supannAccount.inc:355
+msgid "Etablissement"
 msgstr ""
 
 #: admin/supannStructures/class_etablissement.inc:32
-msgid "SUPANN Establishment Settings"
+msgid "SUPANN Etablissement Settings"
 msgstr ""
 
 #: admin/supannStructures/class_etablissement.inc:35
-msgid "SUPANN Establishment"
+msgid "SUPANN Etablissement"
 msgstr ""
 
 #: admin/supannStructures/class_etablissement.inc:52
@@ -142,19 +143,19 @@ msgid "Properties"
 msgstr "Propriedades"
 
 #: admin/supannStructures/class_etablissement.inc:55
-msgid "Root Establishment"
+msgid "Root etablissement"
 msgstr ""
 
 #: admin/supannStructures/class_etablissement.inc:55
-msgid "Set this Establishment as the root one"
+msgid "Set this etablissement as the root one"
 msgstr ""
 
 #: admin/supannStructures/class_etablissement.inc:59
-msgid "The name to write in the o attribute for this Establishment"
+msgid "The name to write in the o attribute for this etablissement"
 msgstr ""
 
 #: admin/supannStructures/class_etablissement.inc:63
-msgid "A short description of this Establishment"
+msgid "A short description of this etablissement"
 msgstr ""
 
 #: admin/supannStructures/class_etablissement.inc:69
@@ -163,7 +164,7 @@ msgid "Location"
 msgstr "LocalizaÃ§Ã£o"
 
 #: admin/supannStructures/class_etablissement.inc:72
-msgid "Usually the city where this Establishment is"
+msgid "Usually the city in which is this etablissement"
 msgstr ""
 
 #: admin/supannStructures/class_etablissement.inc:76
@@ -171,15 +172,15 @@ msgid "Address"
 msgstr "EndereÃ§o"
 
 #: admin/supannStructures/class_etablissement.inc:76
-msgid "The postal address of this Establishment"
+msgid "The postal address of this etablissement"
 msgstr ""
 
 #: admin/supannStructures/class_etablissement.inc:80
-msgid "Phone number for this Establishment"
+msgid "Phone number for this etablissement"
 msgstr ""
 
 #: admin/supannStructures/class_etablissement.inc:84
-msgid "Fax number for this Establishment"
+msgid "Fax number for this etablissement"
 msgstr ""
 
 #: admin/supannStructures/class_etablissement.inc:90
@@ -187,11 +188,11 @@ msgid "SUPANN properties"
 msgstr "Propriedades SUPANN"
 
 #: admin/supannStructures/class_etablissement.inc:93
-msgid "Establishment code"
+msgid "Etablissement code"
 msgstr ""
 
 #: admin/supannStructures/class_etablissement.inc:93
-msgid "The code of this Establishment (must have a prefix between {})"
+msgid "The code of this etablissement (must have a prefix between {})"
 msgstr ""
 
 #: admin/supannStructures/class_etablissement.inc:98
@@ -199,7 +200,7 @@ msgid "SUPANN code"
 msgstr "CÃ³digo SUPANN"
 
 #: admin/supannStructures/class_etablissement.inc:98
-msgid "The SUPANN code for this Establishment"
+msgid "The SUPANN code for this etablissement"
 msgstr ""
 
 #: admin/supannStructures/class_etablissement.inc:103
@@ -207,7 +208,7 @@ msgid "Legal name"
 msgstr "Nome legal"
 
 #: admin/supannStructures/class_etablissement.inc:103
-msgid "The legal name of this Establishment"
+msgid "The legal name of this etablissement"
 msgstr ""
 
 #: admin/supannStructures/class_etablissement.inc:107
@@ -215,7 +216,7 @@ msgid "Home page URI"
 msgstr ""
 
 #: admin/supannStructures/class_etablissement.inc:107
-msgid "The URI of this Establishment website home page"
+msgid "The URI of this etablissement website home page"
 msgstr ""
 
 #: admin/supannStructures/class_etablissement.inc:111
@@ -223,7 +224,7 @@ msgid "Institution URI"
 msgstr ""
 
 #: admin/supannStructures/class_etablissement.inc:111
-msgid "The URI of this Establishment institution website"
+msgid "The URI of this etablissement institution website"
 msgstr ""
 
 #: admin/supannStructures/class_etablissement.inc:115
@@ -231,12 +232,12 @@ msgid "White pages URI"
 msgstr ""
 
 #: admin/supannStructures/class_etablissement.inc:115
-msgid "The URI of this Establishment white pages"
+msgid "The URI of this etablissement white pages"
 msgstr ""
 
 #: admin/supannStructures/class_etablissement.inc:148
-#: admin/supannStructures/class_etablissement.inc:201
-#: admin/supannStructures/class_etablissement.inc:219
+#: admin/supannStructures/class_etablissement.inc:198
+#: admin/supannStructures/class_etablissement.inc:216
 msgid "LDAP error"
 msgstr "Erro de LDAP"
 
@@ -356,256 +357,243 @@ msgstr "Apelido"
 msgid "eduPersonNickName - Can contain a nick name for this user"
 msgstr ""
 
-#: personal/supann/class_supannAccount.inc:253
-msgid "Ref ids"
-msgstr ""
-
-#: personal/supann/class_supannAccount.inc:253
-msgid "supannRefId - IDs/links for this user on other systems"
-msgstr ""
-
-#: personal/supann/class_supannAccount.inc:262
+#: personal/supann/class_supannAccount.inc:254
 msgid "Contact"
 msgstr "Contato"
 
-#: personal/supann/class_supannAccount.inc:266
+#: personal/supann/class_supannAccount.inc:258
 msgid "Other phone numbers"
 msgstr "Outros nÃºmeros de telefone"
 
-#: personal/supann/class_supannAccount.inc:266
+#: personal/supann/class_supannAccount.inc:258
 msgid "supannAutreTelephone - Other phone numbers for this user"
 msgstr ""
 
-#: personal/supann/class_supannAccount.inc:272
+#: personal/supann/class_supannAccount.inc:264
 msgid "Other mail addresses"
 msgstr "Outro endereÃ§o de email"
 
-#: personal/supann/class_supannAccount.inc:272
+#: personal/supann/class_supannAccount.inc:264
 msgid ""
 "supannAutreMail - Other mail addresses for this user. Each must be unique"
 msgstr ""
 
-#: personal/supann/class_supannAccount.inc:278
+#: personal/supann/class_supannAccount.inc:270
 msgid "Personal mail addresses"
 msgstr "EndereÃ§os pessoais de correio"
 
-#: personal/supann/class_supannAccount.inc:278
+#: personal/supann/class_supannAccount.inc:270
 msgid "supannMailPerso - Personal mail addresses for this user"
 msgstr ""
 
-#: personal/supann/class_supannAccount.inc:283
-msgid "red List"
+#: personal/supann/class_supannAccount.inc:275
+msgid "Liste rouge"
 msgstr ""
 
-#: personal/supann/class_supannAccount.inc:283
+#: personal/supann/class_supannAccount.inc:275
 msgid "supannListeRouge - Should this person be on the red list"
 msgstr ""
 
-#: personal/supann/class_supannAccount.inc:289
+#: personal/supann/class_supannAccount.inc:281
 msgid "Affectation"
 msgstr ""
 
-#: personal/supann/class_supannAccount.inc:292
-msgid "Entity primary assignment"
+#: personal/supann/class_supannAccount.inc:284
+msgid "Entite affectation principale"
 msgstr ""
 
-#: personal/supann/class_supannAccount.inc:292
+#: personal/supann/class_supannAccount.inc:284
 msgid "supannEntiteAffectationPrincipale"
 msgstr ""
 
-#: personal/supann/class_supannAccount.inc:297
-#: personal/supann/class_supannAccount.inc:388
-#: personal/supann/class_supannAccount.inc:450
-msgid "Entity assignment"
+#: personal/supann/class_supannAccount.inc:289
+#: personal/supann/class_supannAccount.inc:380
+msgid "Entite affectation"
 msgstr ""
 
-#: personal/supann/class_supannAccount.inc:297
-#: personal/supann/class_supannAccount.inc:450
+#: personal/supann/class_supannAccount.inc:289
+#: personal/supann/class_supannAccount.inc:442
 msgid "supannEntiteAffectation"
 msgstr ""
 
-#: personal/supann/class_supannAccount.inc:303
-msgid "Entity type assignment"
+#: personal/supann/class_supannAccount.inc:295
+msgid "Type entite affectation"
 msgstr ""
 
-#: personal/supann/class_supannAccount.inc:303
-#: personal/supann/class_supannAccount.inc:446
+#: personal/supann/class_supannAccount.inc:295
+#: personal/supann/class_supannAccount.inc:438
 msgid "supannTypeEntiteAffectation"
 msgstr ""
 
-#: personal/supann/class_supannAccount.inc:310
+#: personal/supann/class_supannAccount.inc:302
 msgid "Affiliation"
 msgstr "AfiliaÃ§Ã£o"
 
-#: personal/supann/class_supannAccount.inc:313
+#: personal/supann/class_supannAccount.inc:305
 msgid "Primary affiliation"
 msgstr ""
 
-#: personal/supann/class_supannAccount.inc:313
+#: personal/supann/class_supannAccount.inc:305
 msgid "eduPersonPrimaryAffiliation"
 msgstr ""
 
-#: personal/supann/class_supannAccount.inc:318
+#: personal/supann/class_supannAccount.inc:310
 msgid "Affiliations"
 msgstr "AfiliaÃ§Ãµes"
 
-#: personal/supann/class_supannAccount.inc:318
+#: personal/supann/class_supannAccount.inc:310
 msgid "eduPersonAffiliation"
 msgstr ""
 
-#: personal/supann/class_supannAccount.inc:324
+#: personal/supann/class_supannAccount.inc:316
 msgid "supannEtablissement"
 msgstr ""
 
-#: personal/supann/class_supannAccount.inc:331
+#: personal/supann/class_supannAccount.inc:323
 msgid "Student profile"
 msgstr "Perfil de estudante"
 
-#: personal/supann/class_supannAccount.inc:334
+#: personal/supann/class_supannAccount.inc:326
 msgid "INE code"
 msgstr ""
 
-#: personal/supann/class_supannAccount.inc:334
+#: personal/supann/class_supannAccount.inc:326
 msgid "supannCodeINE - INE code of this student"
 msgstr ""
 
-#: personal/supann/class_supannAccount.inc:338
+#: personal/supann/class_supannAccount.inc:330
 msgid "Student ID"
 msgstr ""
 
-#: personal/supann/class_supannAccount.inc:338
+#: personal/supann/class_supannAccount.inc:330
 msgid "supannEtuId - scolarity id"
 msgstr ""
 
-#: personal/supann/class_supannAccount.inc:344
+#: personal/supann/class_supannAccount.inc:336
 msgid "Student subscriptions"
 msgstr ""
 
-#: personal/supann/class_supannAccount.inc:359
+#: personal/supann/class_supannAccount.inc:351
 msgid "supannEtuInscription - Subscriptions for this student"
 msgstr ""
 
-#: personal/supann/class_supannAccount.inc:363
+#: personal/supann/class_supannAccount.inc:355
 msgid ""
 "supannEtablissement - Etablissement in which this subscription was done"
 msgstr ""
 
-#: personal/supann/class_supannAccount.inc:367
+#: personal/supann/class_supannAccount.inc:359
 msgid "Year"
 msgstr "Ano"
 
-#: personal/supann/class_supannAccount.inc:367
+#: personal/supann/class_supannAccount.inc:359
 msgid "supannEtuAnneeInscription - The year this subscription will begin"
 msgstr ""
 
-#: personal/supann/class_supannAccount.inc:372
+#: personal/supann/class_supannAccount.inc:364
 msgid "Subscription type"
 msgstr "Tipo de inscriÃ§Ã£o"
 
-#: personal/supann/class_supannAccount.inc:372
+#: personal/supann/class_supannAccount.inc:364
 msgid "supannEtuRegimeInscription - The type of this subscription"
 msgstr ""
 
-#: personal/supann/class_supannAccount.inc:376
-msgid "Disciplinary Sector"
+#: personal/supann/class_supannAccount.inc:368
+msgid "Secteur Disciplinaire"
 msgstr ""
 
-#: personal/supann/class_supannAccount.inc:376
+#: personal/supann/class_supannAccount.inc:368
 msgid "supannEtuSecteurDisciplinaire"
 msgstr ""
 
-#: personal/supann/class_supannAccount.inc:380
+#: personal/supann/class_supannAccount.inc:372
 msgid "Diploma type"
 msgstr ""
 
-#: personal/supann/class_supannAccount.inc:380
+#: personal/supann/class_supannAccount.inc:372
 msgid "supannEtuTypeDiplome - Type of diploma"
 msgstr ""
 
-#: personal/supann/class_supannAccount.inc:384
-msgid "Curriculum year "
+#: personal/supann/class_supannAccount.inc:376
+msgid "Cursus annee"
 msgstr ""
 
-#: personal/supann/class_supannAccount.inc:384
+#: personal/supann/class_supannAccount.inc:376
 msgid "supannEtuCursusAnnee"
 msgstr ""
 
-#: personal/supann/class_supannAccount.inc:388
+#: personal/supann/class_supannAccount.inc:380
 msgid "supannEntiteAffectation_affect"
 msgstr ""
 
-#: personal/supann/class_supannAccount.inc:392
+#: personal/supann/class_supannAccount.inc:384
 msgid "Diploma"
 msgstr ""
 
-#: personal/supann/class_supannAccount.inc:392
+#: personal/supann/class_supannAccount.inc:384
 msgid "supannEtuDiplome"
 msgstr ""
 
-#: personal/supann/class_supannAccount.inc:396
+#: personal/supann/class_supannAccount.inc:388
 msgid "Step"
 msgstr ""
 
-#: personal/supann/class_supannAccount.inc:396
+#: personal/supann/class_supannAccount.inc:388
 msgid "supannEtuEtape"
 msgstr ""
 
-#: personal/supann/class_supannAccount.inc:400
+#: personal/supann/class_supannAccount.inc:392
 msgid "educational element"
 msgstr ""
 
-#: personal/supann/class_supannAccount.inc:400
+#: personal/supann/class_supannAccount.inc:392
 msgid "supannEtuElementPedagogique"
 msgstr ""
 
-#: personal/supann/class_supannAccount.inc:412
-msgid "Personal profile"
-msgstr ""
+#: personal/supann/class_supannAccount.inc:404
+msgid "Personnal profile"
+msgstr "Perfil pessoal"
 
-#: personal/supann/class_supannAccount.inc:415
+#: personal/supann/class_supannAccount.inc:407
 msgid "Personal ID"
 msgstr ""
 
-#: personal/supann/class_supannAccount.inc:415
+#: personal/supann/class_supannAccount.inc:407
 msgid "supannEmpId"
 msgstr ""
 
-#: personal/supann/class_supannAccount.inc:419
+#: personal/supann/class_supannAccount.inc:411
 msgid "Personal corps"
 msgstr ""
 
-#: personal/supann/class_supannAccount.inc:419
+#: personal/supann/class_supannAccount.inc:411
 msgid "supannEmpCorps"
 msgstr ""
 
-#: personal/supann/class_supannAccount.inc:424
-msgid "Activity"
+#: personal/supann/class_supannAccount.inc:416
+msgid "Activite"
 msgstr ""
 
-#: personal/supann/class_supannAccount.inc:424
+#: personal/supann/class_supannAccount.inc:416
 msgid "supannActivite"
 msgstr ""
 
-#: personal/supann/class_supannAccount.inc:431
+#: personal/supann/class_supannAccount.inc:423
 msgid "Roles"
 msgstr "AtribuiÃ§Ãµes"
 
-#: personal/supann/class_supannAccount.inc:438
+#: personal/supann/class_supannAccount.inc:430
 msgid "supannRoleEntite"
 msgstr ""
 
-#: personal/supann/class_supannAccount.inc:442
+#: personal/supann/class_supannAccount.inc:434
 msgid "Generic role"
 msgstr ""
 
-#: personal/supann/class_supannAccount.inc:442
+#: personal/supann/class_supannAccount.inc:434
 msgid "supannRoleGenerique"
 msgstr ""
 
-#: personal/supann/class_supannAccount.inc:446
-msgid "Entity assignment type"
-msgstr ""
-
 #: config/supann/class_supannConfig.inc:28
 msgid "SUPANN configuration"
 msgstr ""
diff --git a/supann/locale/ru/fusiondirectory.po b/supann/locale/ru/fusiondirectory.po
index c9d8b5d3fa6242a9653a10c6be3dcd3385d87a7a..4c55902d3f875fc9a5332ada7a305bc4f899dd61 100644
--- a/supann/locale/ru/fusiondirectory.po
+++ b/supann/locale/ru/fusiondirectory.po
@@ -5,17 +5,17 @@
 # Translators:
 msgid ""
 msgstr ""
-"Project-Id-Version: FusionDirectory-108\n"
+"Project-Id-Version: FusionDirectory-109\n"
 "Report-Msgid-Bugs-To: documentation@lists.fusiondirectory.org\n"
-"POT-Creation-Date: 2015-03-31 11:49+0200\n"
-"PO-Revision-Date: 2015-03-31 10:46+0000\n"
+"POT-Creation-Date: 2014-12-15 17:47+0100\n"
+"PO-Revision-Date: 2015-04-07 13:01+0000\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>\n"
-"Language-Team: Russian (http://www.transifex.com/projects/p/FusionDirectory-108/language/ru/)\n"
+"Language-Team: Russian (http://www.transifex.com/projects/p/FusionDirectory-109/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=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);\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"
@@ -27,15 +27,16 @@ msgstr ""
 
 #: admin/supannStructures/class_entite.inc:31
 #: admin/supannStructures/class_entite.inc:52
-msgid "Entity"
+#: personal/supann/class_supannAccount.inc:442
+msgid "Entite"
 msgstr ""
 
 #: admin/supannStructures/class_entite.inc:32
-msgid "SUPANN Entity Settings"
+msgid "SUPANN Entite Settings"
 msgstr ""
 
 #: admin/supannStructures/class_entite.inc:35
-msgid "SUPANN Entity"
+msgid "SUPANN Entite"
 msgstr ""
 
 #: admin/supannStructures/class_entite.inc:55
@@ -44,7 +45,7 @@ msgid "Name"
 msgstr "Ð¤Ð°Ð¼Ð¸Ð»Ð¸Ñ"
 
 #: admin/supannStructures/class_entite.inc:55
-msgid "The name to write in the ou attribute for this entity"
+msgid "The name to write in the ou attribute for this entite"
 msgstr ""
 
 #: admin/supannStructures/class_entite.inc:61
@@ -57,7 +58,7 @@ msgid "Telephone"
 msgstr "Ð¢ÐµÐ»ÐµÑ„Ð¾Ð½"
 
 #: admin/supannStructures/class_entite.inc:64
-msgid "Phone number for this entity"
+msgid "Phone number for this entite"
 msgstr ""
 
 #: admin/supannStructures/class_entite.inc:68
@@ -66,7 +67,7 @@ msgid "Fax"
 msgstr "Ð¤Ð°ÐºÑ"
 
 #: admin/supannStructures/class_entite.inc:68
-msgid "Fax number for this entity"
+msgid "Fax number for this entite"
 msgstr ""
 
 #: admin/supannStructures/class_entite.inc:72
@@ -74,7 +75,7 @@ msgid "Postal address"
 msgstr "ÐŸÐ¾Ñ‡Ñ‚Ð¾Ð²Ñ‹Ð¹ Ð°Ð´Ñ€ÐµÑ"
 
 #: admin/supannStructures/class_entite.inc:72
-msgid "Postal address of this entity"
+msgid "Postal address of this entite"
 msgstr ""
 
 #: admin/supannStructures/class_entite.inc:76
@@ -83,7 +84,7 @@ msgid "Description"
 msgstr "ÐžÐ¿Ð¸ÑÐ°Ð½Ð¸Ðµ"
 
 #: admin/supannStructures/class_entite.inc:76
-msgid "Short description of this entity"
+msgid "Short description of this entite"
 msgstr ""
 
 #: admin/supannStructures/class_entite.inc:82
@@ -91,27 +92,28 @@ msgid "SUPANN informations"
 msgstr ""
 
 #: admin/supannStructures/class_entite.inc:85
-msgid "Entity type"
+#: personal/supann/class_supannAccount.inc:438
+msgid "Entite type"
 msgstr ""
 
 #: admin/supannStructures/class_entite.inc:85
-msgid "The best SUPANN type that fits this entity"
+msgid "The best SUPANN type that fits this entite"
 msgstr ""
 
 #: admin/supannStructures/class_entite.inc:89
-msgid "Entity code"
+msgid "Entite code"
 msgstr ""
 
 #: admin/supannStructures/class_entite.inc:89
-msgid "The SUPANN code of this entity"
+msgid "The SUPANN code of this entite"
 msgstr ""
 
 #: admin/supannStructures/class_entite.inc:94
-msgid "Parent entity"
+msgid "Parent entite"
 msgstr ""
 
 #: admin/supannStructures/class_entite.inc:94
-msgid "The parent entity of this entity"
+msgid "The parent entite of this entite"
 msgstr ""
 
 #: admin/supannStructures/class_entite.inc:98
@@ -119,21 +121,21 @@ msgid "Reference ID"
 msgstr ""
 
 #: admin/supannStructures/class_entite.inc:98
-msgid "SUPANN reference ID of this entity"
+msgid "SUPANN reference ID of this entite"
 msgstr ""
 
 #: admin/supannStructures/class_etablissement.inc:31
-#: personal/supann/class_supannAccount.inc:324
-#: personal/supann/class_supannAccount.inc:363
-msgid "Establishment"
+#: personal/supann/class_supannAccount.inc:316
+#: personal/supann/class_supannAccount.inc:355
+msgid "Etablissement"
 msgstr ""
 
 #: admin/supannStructures/class_etablissement.inc:32
-msgid "SUPANN Establishment Settings"
+msgid "SUPANN Etablissement Settings"
 msgstr ""
 
 #: admin/supannStructures/class_etablissement.inc:35
-msgid "SUPANN Establishment"
+msgid "SUPANN Etablissement"
 msgstr ""
 
 #: admin/supannStructures/class_etablissement.inc:52
@@ -141,19 +143,19 @@ msgid "Properties"
 msgstr "Ð¡Ð²Ð¾Ð¹ÑÑ‚Ð²Ð°"
 
 #: admin/supannStructures/class_etablissement.inc:55
-msgid "Root Establishment"
+msgid "Root etablissement"
 msgstr ""
 
 #: admin/supannStructures/class_etablissement.inc:55
-msgid "Set this Establishment as the root one"
+msgid "Set this etablissement as the root one"
 msgstr ""
 
 #: admin/supannStructures/class_etablissement.inc:59
-msgid "The name to write in the o attribute for this Establishment"
+msgid "The name to write in the o attribute for this etablissement"
 msgstr ""
 
 #: admin/supannStructures/class_etablissement.inc:63
-msgid "A short description of this Establishment"
+msgid "A short description of this etablissement"
 msgstr ""
 
 #: admin/supannStructures/class_etablissement.inc:69
@@ -162,7 +164,7 @@ msgid "Location"
 msgstr "ÐœÐµÑÑ‚Ð¾Ð¿Ð¾Ð»Ð¾Ð¶ÐµÐ½Ð¸Ðµ"
 
 #: admin/supannStructures/class_etablissement.inc:72
-msgid "Usually the city where this Establishment is"
+msgid "Usually the city in which is this etablissement"
 msgstr ""
 
 #: admin/supannStructures/class_etablissement.inc:76
@@ -170,15 +172,15 @@ msgid "Address"
 msgstr "ÐÐ´Ñ€ÐµÑ"
 
 #: admin/supannStructures/class_etablissement.inc:76
-msgid "The postal address of this Establishment"
+msgid "The postal address of this etablissement"
 msgstr ""
 
 #: admin/supannStructures/class_etablissement.inc:80
-msgid "Phone number for this Establishment"
+msgid "Phone number for this etablissement"
 msgstr ""
 
 #: admin/supannStructures/class_etablissement.inc:84
-msgid "Fax number for this Establishment"
+msgid "Fax number for this etablissement"
 msgstr ""
 
 #: admin/supannStructures/class_etablissement.inc:90
@@ -186,11 +188,11 @@ msgid "SUPANN properties"
 msgstr ""
 
 #: admin/supannStructures/class_etablissement.inc:93
-msgid "Establishment code"
+msgid "Etablissement code"
 msgstr ""
 
 #: admin/supannStructures/class_etablissement.inc:93
-msgid "The code of this Establishment (must have a prefix between {})"
+msgid "The code of this etablissement (must have a prefix between {})"
 msgstr ""
 
 #: admin/supannStructures/class_etablissement.inc:98
@@ -198,7 +200,7 @@ msgid "SUPANN code"
 msgstr ""
 
 #: admin/supannStructures/class_etablissement.inc:98
-msgid "The SUPANN code for this Establishment"
+msgid "The SUPANN code for this etablissement"
 msgstr ""
 
 #: admin/supannStructures/class_etablissement.inc:103
@@ -206,7 +208,7 @@ msgid "Legal name"
 msgstr ""
 
 #: admin/supannStructures/class_etablissement.inc:103
-msgid "The legal name of this Establishment"
+msgid "The legal name of this etablissement"
 msgstr ""
 
 #: admin/supannStructures/class_etablissement.inc:107
@@ -214,7 +216,7 @@ msgid "Home page URI"
 msgstr ""
 
 #: admin/supannStructures/class_etablissement.inc:107
-msgid "The URI of this Establishment website home page"
+msgid "The URI of this etablissement website home page"
 msgstr ""
 
 #: admin/supannStructures/class_etablissement.inc:111
@@ -222,7 +224,7 @@ msgid "Institution URI"
 msgstr ""
 
 #: admin/supannStructures/class_etablissement.inc:111
-msgid "The URI of this Establishment institution website"
+msgid "The URI of this etablissement institution website"
 msgstr ""
 
 #: admin/supannStructures/class_etablissement.inc:115
@@ -230,12 +232,12 @@ msgid "White pages URI"
 msgstr ""
 
 #: admin/supannStructures/class_etablissement.inc:115
-msgid "The URI of this Establishment white pages"
+msgid "The URI of this etablissement white pages"
 msgstr ""
 
 #: admin/supannStructures/class_etablissement.inc:148
-#: admin/supannStructures/class_etablissement.inc:201
-#: admin/supannStructures/class_etablissement.inc:219
+#: admin/supannStructures/class_etablissement.inc:198
+#: admin/supannStructures/class_etablissement.inc:216
 msgid "LDAP error"
 msgstr "ÐžÑˆÐ¸Ð±ÐºÐ° LDAP"
 
@@ -355,256 +357,243 @@ msgstr ""
 msgid "eduPersonNickName - Can contain a nick name for this user"
 msgstr ""
 
-#: personal/supann/class_supannAccount.inc:253
-msgid "Ref ids"
-msgstr ""
-
-#: personal/supann/class_supannAccount.inc:253
-msgid "supannRefId - IDs/links for this user on other systems"
-msgstr ""
-
-#: personal/supann/class_supannAccount.inc:262
+#: personal/supann/class_supannAccount.inc:254
 msgid "Contact"
 msgstr "ÐšÐ¾Ð½Ñ‚Ð°ÐºÑ‚"
 
-#: personal/supann/class_supannAccount.inc:266
+#: personal/supann/class_supannAccount.inc:258
 msgid "Other phone numbers"
 msgstr ""
 
-#: personal/supann/class_supannAccount.inc:266
+#: personal/supann/class_supannAccount.inc:258
 msgid "supannAutreTelephone - Other phone numbers for this user"
 msgstr ""
 
-#: personal/supann/class_supannAccount.inc:272
+#: personal/supann/class_supannAccount.inc:264
 msgid "Other mail addresses"
 msgstr ""
 
-#: personal/supann/class_supannAccount.inc:272
+#: personal/supann/class_supannAccount.inc:264
 msgid ""
 "supannAutreMail - Other mail addresses for this user. Each must be unique"
 msgstr ""
 
-#: personal/supann/class_supannAccount.inc:278
+#: personal/supann/class_supannAccount.inc:270
 msgid "Personal mail addresses"
 msgstr ""
 
-#: personal/supann/class_supannAccount.inc:278
+#: personal/supann/class_supannAccount.inc:270
 msgid "supannMailPerso - Personal mail addresses for this user"
 msgstr ""
 
-#: personal/supann/class_supannAccount.inc:283
-msgid "red List"
+#: personal/supann/class_supannAccount.inc:275
+msgid "Liste rouge"
 msgstr ""
 
-#: personal/supann/class_supannAccount.inc:283
+#: personal/supann/class_supannAccount.inc:275
 msgid "supannListeRouge - Should this person be on the red list"
 msgstr ""
 
-#: personal/supann/class_supannAccount.inc:289
+#: personal/supann/class_supannAccount.inc:281
 msgid "Affectation"
 msgstr ""
 
-#: personal/supann/class_supannAccount.inc:292
-msgid "Entity primary assignment"
+#: personal/supann/class_supannAccount.inc:284
+msgid "Entite affectation principale"
 msgstr ""
 
-#: personal/supann/class_supannAccount.inc:292
+#: personal/supann/class_supannAccount.inc:284
 msgid "supannEntiteAffectationPrincipale"
 msgstr ""
 
-#: personal/supann/class_supannAccount.inc:297
-#: personal/supann/class_supannAccount.inc:388
-#: personal/supann/class_supannAccount.inc:450
-msgid "Entity assignment"
+#: personal/supann/class_supannAccount.inc:289
+#: personal/supann/class_supannAccount.inc:380
+msgid "Entite affectation"
 msgstr ""
 
-#: personal/supann/class_supannAccount.inc:297
-#: personal/supann/class_supannAccount.inc:450
+#: personal/supann/class_supannAccount.inc:289
+#: personal/supann/class_supannAccount.inc:442
 msgid "supannEntiteAffectation"
 msgstr ""
 
-#: personal/supann/class_supannAccount.inc:303
-msgid "Entity type assignment"
+#: personal/supann/class_supannAccount.inc:295
+msgid "Type entite affectation"
 msgstr ""
 
-#: personal/supann/class_supannAccount.inc:303
-#: personal/supann/class_supannAccount.inc:446
+#: personal/supann/class_supannAccount.inc:295
+#: personal/supann/class_supannAccount.inc:438
 msgid "supannTypeEntiteAffectation"
 msgstr ""
 
-#: personal/supann/class_supannAccount.inc:310
+#: personal/supann/class_supannAccount.inc:302
 msgid "Affiliation"
 msgstr ""
 
-#: personal/supann/class_supannAccount.inc:313
+#: personal/supann/class_supannAccount.inc:305
 msgid "Primary affiliation"
 msgstr ""
 
-#: personal/supann/class_supannAccount.inc:313
+#: personal/supann/class_supannAccount.inc:305
 msgid "eduPersonPrimaryAffiliation"
 msgstr ""
 
-#: personal/supann/class_supannAccount.inc:318
+#: personal/supann/class_supannAccount.inc:310
 msgid "Affiliations"
 msgstr ""
 
-#: personal/supann/class_supannAccount.inc:318
+#: personal/supann/class_supannAccount.inc:310
 msgid "eduPersonAffiliation"
 msgstr ""
 
-#: personal/supann/class_supannAccount.inc:324
+#: personal/supann/class_supannAccount.inc:316
 msgid "supannEtablissement"
 msgstr ""
 
-#: personal/supann/class_supannAccount.inc:331
+#: personal/supann/class_supannAccount.inc:323
 msgid "Student profile"
 msgstr ""
 
-#: personal/supann/class_supannAccount.inc:334
+#: personal/supann/class_supannAccount.inc:326
 msgid "INE code"
 msgstr ""
 
-#: personal/supann/class_supannAccount.inc:334
+#: personal/supann/class_supannAccount.inc:326
 msgid "supannCodeINE - INE code of this student"
 msgstr ""
 
-#: personal/supann/class_supannAccount.inc:338
+#: personal/supann/class_supannAccount.inc:330
 msgid "Student ID"
 msgstr ""
 
-#: personal/supann/class_supannAccount.inc:338
+#: personal/supann/class_supannAccount.inc:330
 msgid "supannEtuId - scolarity id"
 msgstr ""
 
-#: personal/supann/class_supannAccount.inc:344
+#: personal/supann/class_supannAccount.inc:336
 msgid "Student subscriptions"
 msgstr ""
 
-#: personal/supann/class_supannAccount.inc:359
+#: personal/supann/class_supannAccount.inc:351
 msgid "supannEtuInscription - Subscriptions for this student"
 msgstr ""
 
-#: personal/supann/class_supannAccount.inc:363
+#: personal/supann/class_supannAccount.inc:355
 msgid ""
 "supannEtablissement - Etablissement in which this subscription was done"
 msgstr ""
 
-#: personal/supann/class_supannAccount.inc:367
+#: personal/supann/class_supannAccount.inc:359
 msgid "Year"
 msgstr ""
 
-#: personal/supann/class_supannAccount.inc:367
+#: personal/supann/class_supannAccount.inc:359
 msgid "supannEtuAnneeInscription - The year this subscription will begin"
 msgstr ""
 
-#: personal/supann/class_supannAccount.inc:372
+#: personal/supann/class_supannAccount.inc:364
 msgid "Subscription type"
 msgstr ""
 
-#: personal/supann/class_supannAccount.inc:372
+#: personal/supann/class_supannAccount.inc:364
 msgid "supannEtuRegimeInscription - The type of this subscription"
 msgstr ""
 
-#: personal/supann/class_supannAccount.inc:376
-msgid "Disciplinary Sector"
+#: personal/supann/class_supannAccount.inc:368
+msgid "Secteur Disciplinaire"
 msgstr ""
 
-#: personal/supann/class_supannAccount.inc:376
+#: personal/supann/class_supannAccount.inc:368
 msgid "supannEtuSecteurDisciplinaire"
 msgstr ""
 
-#: personal/supann/class_supannAccount.inc:380
+#: personal/supann/class_supannAccount.inc:372
 msgid "Diploma type"
 msgstr ""
 
-#: personal/supann/class_supannAccount.inc:380
+#: personal/supann/class_supannAccount.inc:372
 msgid "supannEtuTypeDiplome - Type of diploma"
 msgstr ""
 
-#: personal/supann/class_supannAccount.inc:384
-msgid "Curriculum year "
+#: personal/supann/class_supannAccount.inc:376
+msgid "Cursus annee"
 msgstr ""
 
-#: personal/supann/class_supannAccount.inc:384
+#: personal/supann/class_supannAccount.inc:376
 msgid "supannEtuCursusAnnee"
 msgstr ""
 
-#: personal/supann/class_supannAccount.inc:388
+#: personal/supann/class_supannAccount.inc:380
 msgid "supannEntiteAffectation_affect"
 msgstr ""
 
-#: personal/supann/class_supannAccount.inc:392
+#: personal/supann/class_supannAccount.inc:384
 msgid "Diploma"
 msgstr ""
 
-#: personal/supann/class_supannAccount.inc:392
+#: personal/supann/class_supannAccount.inc:384
 msgid "supannEtuDiplome"
 msgstr ""
 
-#: personal/supann/class_supannAccount.inc:396
+#: personal/supann/class_supannAccount.inc:388
 msgid "Step"
 msgstr ""
 
-#: personal/supann/class_supannAccount.inc:396
+#: personal/supann/class_supannAccount.inc:388
 msgid "supannEtuEtape"
 msgstr ""
 
-#: personal/supann/class_supannAccount.inc:400
+#: personal/supann/class_supannAccount.inc:392
 msgid "educational element"
 msgstr ""
 
-#: personal/supann/class_supannAccount.inc:400
+#: personal/supann/class_supannAccount.inc:392
 msgid "supannEtuElementPedagogique"
 msgstr ""
 
-#: personal/supann/class_supannAccount.inc:412
-msgid "Personal profile"
+#: personal/supann/class_supannAccount.inc:404
+msgid "Personnal profile"
 msgstr ""
 
-#: personal/supann/class_supannAccount.inc:415
+#: personal/supann/class_supannAccount.inc:407
 msgid "Personal ID"
 msgstr ""
 
-#: personal/supann/class_supannAccount.inc:415
+#: personal/supann/class_supannAccount.inc:407
 msgid "supannEmpId"
 msgstr ""
 
-#: personal/supann/class_supannAccount.inc:419
+#: personal/supann/class_supannAccount.inc:411
 msgid "Personal corps"
 msgstr ""
 
-#: personal/supann/class_supannAccount.inc:419
+#: personal/supann/class_supannAccount.inc:411
 msgid "supannEmpCorps"
 msgstr ""
 
-#: personal/supann/class_supannAccount.inc:424
-msgid "Activity"
+#: personal/supann/class_supannAccount.inc:416
+msgid "Activite"
 msgstr ""
 
-#: personal/supann/class_supannAccount.inc:424
+#: personal/supann/class_supannAccount.inc:416
 msgid "supannActivite"
 msgstr ""
 
-#: personal/supann/class_supannAccount.inc:431
+#: personal/supann/class_supannAccount.inc:423
 msgid "Roles"
 msgstr "Ð Ð¾Ð»Ð¸"
 
-#: personal/supann/class_supannAccount.inc:438
+#: personal/supann/class_supannAccount.inc:430
 msgid "supannRoleEntite"
 msgstr ""
 
-#: personal/supann/class_supannAccount.inc:442
+#: personal/supann/class_supannAccount.inc:434
 msgid "Generic role"
 msgstr ""
 
-#: personal/supann/class_supannAccount.inc:442
+#: personal/supann/class_supannAccount.inc:434
 msgid "supannRoleGenerique"
 msgstr ""
 
-#: personal/supann/class_supannAccount.inc:446
-msgid "Entity assignment type"
-msgstr ""
-
 #: config/supann/class_supannConfig.inc:28
 msgid "SUPANN configuration"
 msgstr ""
diff --git a/supann/locale/ru@petr1708/fusiondirectory.po b/supann/locale/ru@petr1708/fusiondirectory.po
index 8ed8cab5a417e9b85adc33f5b7df7f5466061a15..548d9f5b637191eaaa57b1c9f1d40cbb52be3c63 100644
--- a/supann/locale/ru@petr1708/fusiondirectory.po
+++ b/supann/locale/ru@petr1708/fusiondirectory.po
@@ -5,17 +5,17 @@
 # Translators:
 msgid ""
 msgstr ""
-"Project-Id-Version: FusionDirectory-108\n"
+"Project-Id-Version: FusionDirectory-109\n"
 "Report-Msgid-Bugs-To: documentation@lists.fusiondirectory.org\n"
-"POT-Creation-Date: 2015-03-31 11:49+0200\n"
-"PO-Revision-Date: 2015-03-31 10:46+0000\n"
+"POT-Creation-Date: 2014-12-15 17:47+0100\n"
+"PO-Revision-Date: 2014-12-15 17:05+0000\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>\n"
-"Language-Team: Russian Petrine orthography (http://www.transifex.com/projects/p/FusionDirectory-108/language/ru@petr1708/)\n"
+"Language-Team: Russian Petrine orthography (http://www.transifex.com/projects/p/FusionDirectory-109/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=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);\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"
@@ -27,15 +27,16 @@ msgstr ""
 
 #: admin/supannStructures/class_entite.inc:31
 #: admin/supannStructures/class_entite.inc:52
-msgid "Entity"
+#: personal/supann/class_supannAccount.inc:442
+msgid "Entite"
 msgstr ""
 
 #: admin/supannStructures/class_entite.inc:32
-msgid "SUPANN Entity Settings"
+msgid "SUPANN Entite Settings"
 msgstr ""
 
 #: admin/supannStructures/class_entite.inc:35
-msgid "SUPANN Entity"
+msgid "SUPANN Entite"
 msgstr ""
 
 #: admin/supannStructures/class_entite.inc:55
@@ -44,7 +45,7 @@ msgid "Name"
 msgstr ""
 
 #: admin/supannStructures/class_entite.inc:55
-msgid "The name to write in the ou attribute for this entity"
+msgid "The name to write in the ou attribute for this entite"
 msgstr ""
 
 #: admin/supannStructures/class_entite.inc:61
@@ -57,7 +58,7 @@ msgid "Telephone"
 msgstr ""
 
 #: admin/supannStructures/class_entite.inc:64
-msgid "Phone number for this entity"
+msgid "Phone number for this entite"
 msgstr ""
 
 #: admin/supannStructures/class_entite.inc:68
@@ -66,7 +67,7 @@ msgid "Fax"
 msgstr ""
 
 #: admin/supannStructures/class_entite.inc:68
-msgid "Fax number for this entity"
+msgid "Fax number for this entite"
 msgstr ""
 
 #: admin/supannStructures/class_entite.inc:72
@@ -74,7 +75,7 @@ msgid "Postal address"
 msgstr ""
 
 #: admin/supannStructures/class_entite.inc:72
-msgid "Postal address of this entity"
+msgid "Postal address of this entite"
 msgstr ""
 
 #: admin/supannStructures/class_entite.inc:76
@@ -83,7 +84,7 @@ msgid "Description"
 msgstr ""
 
 #: admin/supannStructures/class_entite.inc:76
-msgid "Short description of this entity"
+msgid "Short description of this entite"
 msgstr ""
 
 #: admin/supannStructures/class_entite.inc:82
@@ -91,27 +92,28 @@ msgid "SUPANN informations"
 msgstr ""
 
 #: admin/supannStructures/class_entite.inc:85
-msgid "Entity type"
+#: personal/supann/class_supannAccount.inc:438
+msgid "Entite type"
 msgstr ""
 
 #: admin/supannStructures/class_entite.inc:85
-msgid "The best SUPANN type that fits this entity"
+msgid "The best SUPANN type that fits this entite"
 msgstr ""
 
 #: admin/supannStructures/class_entite.inc:89
-msgid "Entity code"
+msgid "Entite code"
 msgstr ""
 
 #: admin/supannStructures/class_entite.inc:89
-msgid "The SUPANN code of this entity"
+msgid "The SUPANN code of this entite"
 msgstr ""
 
 #: admin/supannStructures/class_entite.inc:94
-msgid "Parent entity"
+msgid "Parent entite"
 msgstr ""
 
 #: admin/supannStructures/class_entite.inc:94
-msgid "The parent entity of this entity"
+msgid "The parent entite of this entite"
 msgstr ""
 
 #: admin/supannStructures/class_entite.inc:98
@@ -119,21 +121,21 @@ msgid "Reference ID"
 msgstr ""
 
 #: admin/supannStructures/class_entite.inc:98
-msgid "SUPANN reference ID of this entity"
+msgid "SUPANN reference ID of this entite"
 msgstr ""
 
 #: admin/supannStructures/class_etablissement.inc:31
-#: personal/supann/class_supannAccount.inc:324
-#: personal/supann/class_supannAccount.inc:363
-msgid "Establishment"
+#: personal/supann/class_supannAccount.inc:316
+#: personal/supann/class_supannAccount.inc:355
+msgid "Etablissement"
 msgstr ""
 
 #: admin/supannStructures/class_etablissement.inc:32
-msgid "SUPANN Establishment Settings"
+msgid "SUPANN Etablissement Settings"
 msgstr ""
 
 #: admin/supannStructures/class_etablissement.inc:35
-msgid "SUPANN Establishment"
+msgid "SUPANN Etablissement"
 msgstr ""
 
 #: admin/supannStructures/class_etablissement.inc:52
@@ -141,19 +143,19 @@ msgid "Properties"
 msgstr ""
 
 #: admin/supannStructures/class_etablissement.inc:55
-msgid "Root Establishment"
+msgid "Root etablissement"
 msgstr ""
 
 #: admin/supannStructures/class_etablissement.inc:55
-msgid "Set this Establishment as the root one"
+msgid "Set this etablissement as the root one"
 msgstr ""
 
 #: admin/supannStructures/class_etablissement.inc:59
-msgid "The name to write in the o attribute for this Establishment"
+msgid "The name to write in the o attribute for this etablissement"
 msgstr ""
 
 #: admin/supannStructures/class_etablissement.inc:63
-msgid "A short description of this Establishment"
+msgid "A short description of this etablissement"
 msgstr ""
 
 #: admin/supannStructures/class_etablissement.inc:69
@@ -162,7 +164,7 @@ msgid "Location"
 msgstr ""
 
 #: admin/supannStructures/class_etablissement.inc:72
-msgid "Usually the city where this Establishment is"
+msgid "Usually the city in which is this etablissement"
 msgstr ""
 
 #: admin/supannStructures/class_etablissement.inc:76
@@ -170,15 +172,15 @@ msgid "Address"
 msgstr ""
 
 #: admin/supannStructures/class_etablissement.inc:76
-msgid "The postal address of this Establishment"
+msgid "The postal address of this etablissement"
 msgstr ""
 
 #: admin/supannStructures/class_etablissement.inc:80
-msgid "Phone number for this Establishment"
+msgid "Phone number for this etablissement"
 msgstr ""
 
 #: admin/supannStructures/class_etablissement.inc:84
-msgid "Fax number for this Establishment"
+msgid "Fax number for this etablissement"
 msgstr ""
 
 #: admin/supannStructures/class_etablissement.inc:90
@@ -186,11 +188,11 @@ msgid "SUPANN properties"
 msgstr ""
 
 #: admin/supannStructures/class_etablissement.inc:93
-msgid "Establishment code"
+msgid "Etablissement code"
 msgstr ""
 
 #: admin/supannStructures/class_etablissement.inc:93
-msgid "The code of this Establishment (must have a prefix between {})"
+msgid "The code of this etablissement (must have a prefix between {})"
 msgstr ""
 
 #: admin/supannStructures/class_etablissement.inc:98
@@ -198,7 +200,7 @@ msgid "SUPANN code"
 msgstr ""
 
 #: admin/supannStructures/class_etablissement.inc:98
-msgid "The SUPANN code for this Establishment"
+msgid "The SUPANN code for this etablissement"
 msgstr ""
 
 #: admin/supannStructures/class_etablissement.inc:103
@@ -206,7 +208,7 @@ msgid "Legal name"
 msgstr ""
 
 #: admin/supannStructures/class_etablissement.inc:103
-msgid "The legal name of this Establishment"
+msgid "The legal name of this etablissement"
 msgstr ""
 
 #: admin/supannStructures/class_etablissement.inc:107
@@ -214,7 +216,7 @@ msgid "Home page URI"
 msgstr ""
 
 #: admin/supannStructures/class_etablissement.inc:107
-msgid "The URI of this Establishment website home page"
+msgid "The URI of this etablissement website home page"
 msgstr ""
 
 #: admin/supannStructures/class_etablissement.inc:111
@@ -222,7 +224,7 @@ msgid "Institution URI"
 msgstr ""
 
 #: admin/supannStructures/class_etablissement.inc:111
-msgid "The URI of this Establishment institution website"
+msgid "The URI of this etablissement institution website"
 msgstr ""
 
 #: admin/supannStructures/class_etablissement.inc:115
@@ -230,12 +232,12 @@ msgid "White pages URI"
 msgstr ""
 
 #: admin/supannStructures/class_etablissement.inc:115
-msgid "The URI of this Establishment white pages"
+msgid "The URI of this etablissement white pages"
 msgstr ""
 
 #: admin/supannStructures/class_etablissement.inc:148
-#: admin/supannStructures/class_etablissement.inc:201
-#: admin/supannStructures/class_etablissement.inc:219
+#: admin/supannStructures/class_etablissement.inc:198
+#: admin/supannStructures/class_etablissement.inc:216
 msgid "LDAP error"
 msgstr ""
 
@@ -355,256 +357,243 @@ msgstr ""
 msgid "eduPersonNickName - Can contain a nick name for this user"
 msgstr ""
 
-#: personal/supann/class_supannAccount.inc:253
-msgid "Ref ids"
-msgstr ""
-
-#: personal/supann/class_supannAccount.inc:253
-msgid "supannRefId - IDs/links for this user on other systems"
-msgstr ""
-
-#: personal/supann/class_supannAccount.inc:262
+#: personal/supann/class_supannAccount.inc:254
 msgid "Contact"
 msgstr ""
 
-#: personal/supann/class_supannAccount.inc:266
+#: personal/supann/class_supannAccount.inc:258
 msgid "Other phone numbers"
 msgstr ""
 
-#: personal/supann/class_supannAccount.inc:266
+#: personal/supann/class_supannAccount.inc:258
 msgid "supannAutreTelephone - Other phone numbers for this user"
 msgstr ""
 
-#: personal/supann/class_supannAccount.inc:272
+#: personal/supann/class_supannAccount.inc:264
 msgid "Other mail addresses"
 msgstr ""
 
-#: personal/supann/class_supannAccount.inc:272
+#: personal/supann/class_supannAccount.inc:264
 msgid ""
 "supannAutreMail - Other mail addresses for this user. Each must be unique"
 msgstr ""
 
-#: personal/supann/class_supannAccount.inc:278
+#: personal/supann/class_supannAccount.inc:270
 msgid "Personal mail addresses"
 msgstr ""
 
-#: personal/supann/class_supannAccount.inc:278
+#: personal/supann/class_supannAccount.inc:270
 msgid "supannMailPerso - Personal mail addresses for this user"
 msgstr ""
 
-#: personal/supann/class_supannAccount.inc:283
-msgid "red List"
+#: personal/supann/class_supannAccount.inc:275
+msgid "Liste rouge"
 msgstr ""
 
-#: personal/supann/class_supannAccount.inc:283
+#: personal/supann/class_supannAccount.inc:275
 msgid "supannListeRouge - Should this person be on the red list"
 msgstr ""
 
-#: personal/supann/class_supannAccount.inc:289
+#: personal/supann/class_supannAccount.inc:281
 msgid "Affectation"
 msgstr ""
 
-#: personal/supann/class_supannAccount.inc:292
-msgid "Entity primary assignment"
+#: personal/supann/class_supannAccount.inc:284
+msgid "Entite affectation principale"
 msgstr ""
 
-#: personal/supann/class_supannAccount.inc:292
+#: personal/supann/class_supannAccount.inc:284
 msgid "supannEntiteAffectationPrincipale"
 msgstr ""
 
-#: personal/supann/class_supannAccount.inc:297
-#: personal/supann/class_supannAccount.inc:388
-#: personal/supann/class_supannAccount.inc:450
-msgid "Entity assignment"
+#: personal/supann/class_supannAccount.inc:289
+#: personal/supann/class_supannAccount.inc:380
+msgid "Entite affectation"
 msgstr ""
 
-#: personal/supann/class_supannAccount.inc:297
-#: personal/supann/class_supannAccount.inc:450
+#: personal/supann/class_supannAccount.inc:289
+#: personal/supann/class_supannAccount.inc:442
 msgid "supannEntiteAffectation"
 msgstr ""
 
-#: personal/supann/class_supannAccount.inc:303
-msgid "Entity type assignment"
+#: personal/supann/class_supannAccount.inc:295
+msgid "Type entite affectation"
 msgstr ""
 
-#: personal/supann/class_supannAccount.inc:303
-#: personal/supann/class_supannAccount.inc:446
+#: personal/supann/class_supannAccount.inc:295
+#: personal/supann/class_supannAccount.inc:438
 msgid "supannTypeEntiteAffectation"
 msgstr ""
 
-#: personal/supann/class_supannAccount.inc:310
+#: personal/supann/class_supannAccount.inc:302
 msgid "Affiliation"
 msgstr ""
 
-#: personal/supann/class_supannAccount.inc:313
+#: personal/supann/class_supannAccount.inc:305
 msgid "Primary affiliation"
 msgstr ""
 
-#: personal/supann/class_supannAccount.inc:313
+#: personal/supann/class_supannAccount.inc:305
 msgid "eduPersonPrimaryAffiliation"
 msgstr ""
 
-#: personal/supann/class_supannAccount.inc:318
+#: personal/supann/class_supannAccount.inc:310
 msgid "Affiliations"
 msgstr ""
 
-#: personal/supann/class_supannAccount.inc:318
+#: personal/supann/class_supannAccount.inc:310
 msgid "eduPersonAffiliation"
 msgstr ""
 
-#: personal/supann/class_supannAccount.inc:324
+#: personal/supann/class_supannAccount.inc:316
 msgid "supannEtablissement"
 msgstr ""
 
-#: personal/supann/class_supannAccount.inc:331
+#: personal/supann/class_supannAccount.inc:323
 msgid "Student profile"
 msgstr ""
 
-#: personal/supann/class_supannAccount.inc:334
+#: personal/supann/class_supannAccount.inc:326
 msgid "INE code"
 msgstr ""
 
-#: personal/supann/class_supannAccount.inc:334
+#: personal/supann/class_supannAccount.inc:326
 msgid "supannCodeINE - INE code of this student"
 msgstr ""
 
-#: personal/supann/class_supannAccount.inc:338
+#: personal/supann/class_supannAccount.inc:330
 msgid "Student ID"
 msgstr ""
 
-#: personal/supann/class_supannAccount.inc:338
+#: personal/supann/class_supannAccount.inc:330
 msgid "supannEtuId - scolarity id"
 msgstr ""
 
-#: personal/supann/class_supannAccount.inc:344
+#: personal/supann/class_supannAccount.inc:336
 msgid "Student subscriptions"
 msgstr ""
 
-#: personal/supann/class_supannAccount.inc:359
+#: personal/supann/class_supannAccount.inc:351
 msgid "supannEtuInscription - Subscriptions for this student"
 msgstr ""
 
-#: personal/supann/class_supannAccount.inc:363
+#: personal/supann/class_supannAccount.inc:355
 msgid ""
 "supannEtablissement - Etablissement in which this subscription was done"
 msgstr ""
 
-#: personal/supann/class_supannAccount.inc:367
+#: personal/supann/class_supannAccount.inc:359
 msgid "Year"
 msgstr ""
 
-#: personal/supann/class_supannAccount.inc:367
+#: personal/supann/class_supannAccount.inc:359
 msgid "supannEtuAnneeInscription - The year this subscription will begin"
 msgstr ""
 
-#: personal/supann/class_supannAccount.inc:372
+#: personal/supann/class_supannAccount.inc:364
 msgid "Subscription type"
 msgstr ""
 
-#: personal/supann/class_supannAccount.inc:372
+#: personal/supann/class_supannAccount.inc:364
 msgid "supannEtuRegimeInscription - The type of this subscription"
 msgstr ""
 
-#: personal/supann/class_supannAccount.inc:376
-msgid "Disciplinary Sector"
+#: personal/supann/class_supannAccount.inc:368
+msgid "Secteur Disciplinaire"
 msgstr ""
 
-#: personal/supann/class_supannAccount.inc:376
+#: personal/supann/class_supannAccount.inc:368
 msgid "supannEtuSecteurDisciplinaire"
 msgstr ""
 
-#: personal/supann/class_supannAccount.inc:380
+#: personal/supann/class_supannAccount.inc:372
 msgid "Diploma type"
 msgstr ""
 
-#: personal/supann/class_supannAccount.inc:380
+#: personal/supann/class_supannAccount.inc:372
 msgid "supannEtuTypeDiplome - Type of diploma"
 msgstr ""
 
-#: personal/supann/class_supannAccount.inc:384
-msgid "Curriculum year "
+#: personal/supann/class_supannAccount.inc:376
+msgid "Cursus annee"
 msgstr ""
 
-#: personal/supann/class_supannAccount.inc:384
+#: personal/supann/class_supannAccount.inc:376
 msgid "supannEtuCursusAnnee"
 msgstr ""
 
-#: personal/supann/class_supannAccount.inc:388
+#: personal/supann/class_supannAccount.inc:380
 msgid "supannEntiteAffectation_affect"
 msgstr ""
 
-#: personal/supann/class_supannAccount.inc:392
+#: personal/supann/class_supannAccount.inc:384
 msgid "Diploma"
 msgstr ""
 
-#: personal/supann/class_supannAccount.inc:392
+#: personal/supann/class_supannAccount.inc:384
 msgid "supannEtuDiplome"
 msgstr ""
 
-#: personal/supann/class_supannAccount.inc:396
+#: personal/supann/class_supannAccount.inc:388
 msgid "Step"
 msgstr ""
 
-#: personal/supann/class_supannAccount.inc:396
+#: personal/supann/class_supannAccount.inc:388
 msgid "supannEtuEtape"
 msgstr ""
 
-#: personal/supann/class_supannAccount.inc:400
+#: personal/supann/class_supannAccount.inc:392
 msgid "educational element"
 msgstr ""
 
-#: personal/supann/class_supannAccount.inc:400
+#: personal/supann/class_supannAccount.inc:392
 msgid "supannEtuElementPedagogique"
 msgstr ""
 
-#: personal/supann/class_supannAccount.inc:412
-msgid "Personal profile"
+#: personal/supann/class_supannAccount.inc:404
+msgid "Personnal profile"
 msgstr ""
 
-#: personal/supann/class_supannAccount.inc:415
+#: personal/supann/class_supannAccount.inc:407
 msgid "Personal ID"
 msgstr ""
 
-#: personal/supann/class_supannAccount.inc:415
+#: personal/supann/class_supannAccount.inc:407
 msgid "supannEmpId"
 msgstr ""
 
-#: personal/supann/class_supannAccount.inc:419
+#: personal/supann/class_supannAccount.inc:411
 msgid "Personal corps"
 msgstr ""
 
-#: personal/supann/class_supannAccount.inc:419
+#: personal/supann/class_supannAccount.inc:411
 msgid "supannEmpCorps"
 msgstr ""
 
-#: personal/supann/class_supannAccount.inc:424
-msgid "Activity"
+#: personal/supann/class_supannAccount.inc:416
+msgid "Activite"
 msgstr ""
 
-#: personal/supann/class_supannAccount.inc:424
+#: personal/supann/class_supannAccount.inc:416
 msgid "supannActivite"
 msgstr ""
 
-#: personal/supann/class_supannAccount.inc:431
+#: personal/supann/class_supannAccount.inc:423
 msgid "Roles"
 msgstr ""
 
-#: personal/supann/class_supannAccount.inc:438
+#: personal/supann/class_supannAccount.inc:430
 msgid "supannRoleEntite"
 msgstr ""
 
-#: personal/supann/class_supannAccount.inc:442
+#: personal/supann/class_supannAccount.inc:434
 msgid "Generic role"
 msgstr ""
 
-#: personal/supann/class_supannAccount.inc:442
+#: personal/supann/class_supannAccount.inc:434
 msgid "supannRoleGenerique"
 msgstr ""
 
-#: personal/supann/class_supannAccount.inc:446
-msgid "Entity assignment type"
-msgstr ""
-
 #: config/supann/class_supannConfig.inc:28
 msgid "SUPANN configuration"
 msgstr ""
diff --git a/supann/locale/sv/fusiondirectory.po b/supann/locale/sv/fusiondirectory.po
index 0eb4d4d85400a6e016da28efa9abaddaf59f54bd..345dc856fed3097ba408be11aa405c65a23c5319 100644
--- a/supann/locale/sv/fusiondirectory.po
+++ b/supann/locale/sv/fusiondirectory.po
@@ -5,12 +5,12 @@
 # Translators:
 msgid ""
 msgstr ""
-"Project-Id-Version: FusionDirectory-108\n"
+"Project-Id-Version: FusionDirectory-109\n"
 "Report-Msgid-Bugs-To: documentation@lists.fusiondirectory.org\n"
-"POT-Creation-Date: 2015-03-31 11:49+0200\n"
-"PO-Revision-Date: 2015-03-31 10:46+0000\n"
+"POT-Creation-Date: 2014-12-15 17:47+0100\n"
+"PO-Revision-Date: 2015-02-25 16:04+0000\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>\n"
-"Language-Team: Swedish (http://www.transifex.com/projects/p/FusionDirectory-108/language/sv/)\n"
+"Language-Team: Swedish (http://www.transifex.com/projects/p/FusionDirectory-109/language/sv/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -27,15 +27,16 @@ msgstr ""
 
 #: admin/supannStructures/class_entite.inc:31
 #: admin/supannStructures/class_entite.inc:52
-msgid "Entity"
+#: personal/supann/class_supannAccount.inc:442
+msgid "Entite"
 msgstr ""
 
 #: admin/supannStructures/class_entite.inc:32
-msgid "SUPANN Entity Settings"
+msgid "SUPANN Entite Settings"
 msgstr ""
 
 #: admin/supannStructures/class_entite.inc:35
-msgid "SUPANN Entity"
+msgid "SUPANN Entite"
 msgstr ""
 
 #: admin/supannStructures/class_entite.inc:55
@@ -44,7 +45,7 @@ msgid "Name"
 msgstr "Namn"
 
 #: admin/supannStructures/class_entite.inc:55
-msgid "The name to write in the ou attribute for this entity"
+msgid "The name to write in the ou attribute for this entite"
 msgstr ""
 
 #: admin/supannStructures/class_entite.inc:61
@@ -57,7 +58,7 @@ msgid "Telephone"
 msgstr "Telefon"
 
 #: admin/supannStructures/class_entite.inc:64
-msgid "Phone number for this entity"
+msgid "Phone number for this entite"
 msgstr ""
 
 #: admin/supannStructures/class_entite.inc:68
@@ -66,7 +67,7 @@ msgid "Fax"
 msgstr "Fax"
 
 #: admin/supannStructures/class_entite.inc:68
-msgid "Fax number for this entity"
+msgid "Fax number for this entite"
 msgstr ""
 
 #: admin/supannStructures/class_entite.inc:72
@@ -74,7 +75,7 @@ msgid "Postal address"
 msgstr "Postadress"
 
 #: admin/supannStructures/class_entite.inc:72
-msgid "Postal address of this entity"
+msgid "Postal address of this entite"
 msgstr ""
 
 #: admin/supannStructures/class_entite.inc:76
@@ -83,7 +84,7 @@ msgid "Description"
 msgstr "Beskrivning"
 
 #: admin/supannStructures/class_entite.inc:76
-msgid "Short description of this entity"
+msgid "Short description of this entite"
 msgstr ""
 
 #: admin/supannStructures/class_entite.inc:82
@@ -91,27 +92,28 @@ msgid "SUPANN informations"
 msgstr ""
 
 #: admin/supannStructures/class_entite.inc:85
-msgid "Entity type"
+#: personal/supann/class_supannAccount.inc:438
+msgid "Entite type"
 msgstr ""
 
 #: admin/supannStructures/class_entite.inc:85
-msgid "The best SUPANN type that fits this entity"
+msgid "The best SUPANN type that fits this entite"
 msgstr ""
 
 #: admin/supannStructures/class_entite.inc:89
-msgid "Entity code"
+msgid "Entite code"
 msgstr ""
 
 #: admin/supannStructures/class_entite.inc:89
-msgid "The SUPANN code of this entity"
+msgid "The SUPANN code of this entite"
 msgstr ""
 
 #: admin/supannStructures/class_entite.inc:94
-msgid "Parent entity"
+msgid "Parent entite"
 msgstr ""
 
 #: admin/supannStructures/class_entite.inc:94
-msgid "The parent entity of this entity"
+msgid "The parent entite of this entite"
 msgstr ""
 
 #: admin/supannStructures/class_entite.inc:98
@@ -119,21 +121,21 @@ msgid "Reference ID"
 msgstr ""
 
 #: admin/supannStructures/class_entite.inc:98
-msgid "SUPANN reference ID of this entity"
+msgid "SUPANN reference ID of this entite"
 msgstr ""
 
 #: admin/supannStructures/class_etablissement.inc:31
-#: personal/supann/class_supannAccount.inc:324
-#: personal/supann/class_supannAccount.inc:363
-msgid "Establishment"
+#: personal/supann/class_supannAccount.inc:316
+#: personal/supann/class_supannAccount.inc:355
+msgid "Etablissement"
 msgstr ""
 
 #: admin/supannStructures/class_etablissement.inc:32
-msgid "SUPANN Establishment Settings"
+msgid "SUPANN Etablissement Settings"
 msgstr ""
 
 #: admin/supannStructures/class_etablissement.inc:35
-msgid "SUPANN Establishment"
+msgid "SUPANN Etablissement"
 msgstr ""
 
 #: admin/supannStructures/class_etablissement.inc:52
@@ -141,19 +143,19 @@ msgid "Properties"
 msgstr "Egenskaper"
 
 #: admin/supannStructures/class_etablissement.inc:55
-msgid "Root Establishment"
+msgid "Root etablissement"
 msgstr ""
 
 #: admin/supannStructures/class_etablissement.inc:55
-msgid "Set this Establishment as the root one"
+msgid "Set this etablissement as the root one"
 msgstr ""
 
 #: admin/supannStructures/class_etablissement.inc:59
-msgid "The name to write in the o attribute for this Establishment"
+msgid "The name to write in the o attribute for this etablissement"
 msgstr ""
 
 #: admin/supannStructures/class_etablissement.inc:63
-msgid "A short description of this Establishment"
+msgid "A short description of this etablissement"
 msgstr ""
 
 #: admin/supannStructures/class_etablissement.inc:69
@@ -162,7 +164,7 @@ msgid "Location"
 msgstr "Plats"
 
 #: admin/supannStructures/class_etablissement.inc:72
-msgid "Usually the city where this Establishment is"
+msgid "Usually the city in which is this etablissement"
 msgstr ""
 
 #: admin/supannStructures/class_etablissement.inc:76
@@ -170,15 +172,15 @@ msgid "Address"
 msgstr "Adress"
 
 #: admin/supannStructures/class_etablissement.inc:76
-msgid "The postal address of this Establishment"
+msgid "The postal address of this etablissement"
 msgstr ""
 
 #: admin/supannStructures/class_etablissement.inc:80
-msgid "Phone number for this Establishment"
+msgid "Phone number for this etablissement"
 msgstr ""
 
 #: admin/supannStructures/class_etablissement.inc:84
-msgid "Fax number for this Establishment"
+msgid "Fax number for this etablissement"
 msgstr ""
 
 #: admin/supannStructures/class_etablissement.inc:90
@@ -186,11 +188,11 @@ msgid "SUPANN properties"
 msgstr ""
 
 #: admin/supannStructures/class_etablissement.inc:93
-msgid "Establishment code"
+msgid "Etablissement code"
 msgstr ""
 
 #: admin/supannStructures/class_etablissement.inc:93
-msgid "The code of this Establishment (must have a prefix between {})"
+msgid "The code of this etablissement (must have a prefix between {})"
 msgstr ""
 
 #: admin/supannStructures/class_etablissement.inc:98
@@ -198,7 +200,7 @@ msgid "SUPANN code"
 msgstr ""
 
 #: admin/supannStructures/class_etablissement.inc:98
-msgid "The SUPANN code for this Establishment"
+msgid "The SUPANN code for this etablissement"
 msgstr ""
 
 #: admin/supannStructures/class_etablissement.inc:103
@@ -206,7 +208,7 @@ msgid "Legal name"
 msgstr ""
 
 #: admin/supannStructures/class_etablissement.inc:103
-msgid "The legal name of this Establishment"
+msgid "The legal name of this etablissement"
 msgstr ""
 
 #: admin/supannStructures/class_etablissement.inc:107
@@ -214,7 +216,7 @@ msgid "Home page URI"
 msgstr ""
 
 #: admin/supannStructures/class_etablissement.inc:107
-msgid "The URI of this Establishment website home page"
+msgid "The URI of this etablissement website home page"
 msgstr ""
 
 #: admin/supannStructures/class_etablissement.inc:111
@@ -222,7 +224,7 @@ msgid "Institution URI"
 msgstr ""
 
 #: admin/supannStructures/class_etablissement.inc:111
-msgid "The URI of this Establishment institution website"
+msgid "The URI of this etablissement institution website"
 msgstr ""
 
 #: admin/supannStructures/class_etablissement.inc:115
@@ -230,12 +232,12 @@ msgid "White pages URI"
 msgstr ""
 
 #: admin/supannStructures/class_etablissement.inc:115
-msgid "The URI of this Establishment white pages"
+msgid "The URI of this etablissement white pages"
 msgstr ""
 
 #: admin/supannStructures/class_etablissement.inc:148
-#: admin/supannStructures/class_etablissement.inc:201
-#: admin/supannStructures/class_etablissement.inc:219
+#: admin/supannStructures/class_etablissement.inc:198
+#: admin/supannStructures/class_etablissement.inc:216
 msgid "LDAP error"
 msgstr "LDAP-fel"
 
@@ -355,256 +357,243 @@ msgstr ""
 msgid "eduPersonNickName - Can contain a nick name for this user"
 msgstr ""
 
-#: personal/supann/class_supannAccount.inc:253
-msgid "Ref ids"
-msgstr ""
-
-#: personal/supann/class_supannAccount.inc:253
-msgid "supannRefId - IDs/links for this user on other systems"
-msgstr ""
-
-#: personal/supann/class_supannAccount.inc:262
+#: personal/supann/class_supannAccount.inc:254
 msgid "Contact"
 msgstr ""
 
-#: personal/supann/class_supannAccount.inc:266
+#: personal/supann/class_supannAccount.inc:258
 msgid "Other phone numbers"
 msgstr ""
 
-#: personal/supann/class_supannAccount.inc:266
+#: personal/supann/class_supannAccount.inc:258
 msgid "supannAutreTelephone - Other phone numbers for this user"
 msgstr ""
 
-#: personal/supann/class_supannAccount.inc:272
+#: personal/supann/class_supannAccount.inc:264
 msgid "Other mail addresses"
 msgstr ""
 
-#: personal/supann/class_supannAccount.inc:272
+#: personal/supann/class_supannAccount.inc:264
 msgid ""
 "supannAutreMail - Other mail addresses for this user. Each must be unique"
 msgstr ""
 
-#: personal/supann/class_supannAccount.inc:278
+#: personal/supann/class_supannAccount.inc:270
 msgid "Personal mail addresses"
 msgstr ""
 
-#: personal/supann/class_supannAccount.inc:278
+#: personal/supann/class_supannAccount.inc:270
 msgid "supannMailPerso - Personal mail addresses for this user"
 msgstr ""
 
-#: personal/supann/class_supannAccount.inc:283
-msgid "red List"
+#: personal/supann/class_supannAccount.inc:275
+msgid "Liste rouge"
 msgstr ""
 
-#: personal/supann/class_supannAccount.inc:283
+#: personal/supann/class_supannAccount.inc:275
 msgid "supannListeRouge - Should this person be on the red list"
 msgstr ""
 
-#: personal/supann/class_supannAccount.inc:289
+#: personal/supann/class_supannAccount.inc:281
 msgid "Affectation"
 msgstr ""
 
-#: personal/supann/class_supannAccount.inc:292
-msgid "Entity primary assignment"
+#: personal/supann/class_supannAccount.inc:284
+msgid "Entite affectation principale"
 msgstr ""
 
-#: personal/supann/class_supannAccount.inc:292
+#: personal/supann/class_supannAccount.inc:284
 msgid "supannEntiteAffectationPrincipale"
 msgstr ""
 
-#: personal/supann/class_supannAccount.inc:297
-#: personal/supann/class_supannAccount.inc:388
-#: personal/supann/class_supannAccount.inc:450
-msgid "Entity assignment"
+#: personal/supann/class_supannAccount.inc:289
+#: personal/supann/class_supannAccount.inc:380
+msgid "Entite affectation"
 msgstr ""
 
-#: personal/supann/class_supannAccount.inc:297
-#: personal/supann/class_supannAccount.inc:450
+#: personal/supann/class_supannAccount.inc:289
+#: personal/supann/class_supannAccount.inc:442
 msgid "supannEntiteAffectation"
 msgstr ""
 
-#: personal/supann/class_supannAccount.inc:303
-msgid "Entity type assignment"
+#: personal/supann/class_supannAccount.inc:295
+msgid "Type entite affectation"
 msgstr ""
 
-#: personal/supann/class_supannAccount.inc:303
-#: personal/supann/class_supannAccount.inc:446
+#: personal/supann/class_supannAccount.inc:295
+#: personal/supann/class_supannAccount.inc:438
 msgid "supannTypeEntiteAffectation"
 msgstr ""
 
-#: personal/supann/class_supannAccount.inc:310
+#: personal/supann/class_supannAccount.inc:302
 msgid "Affiliation"
 msgstr ""
 
-#: personal/supann/class_supannAccount.inc:313
+#: personal/supann/class_supannAccount.inc:305
 msgid "Primary affiliation"
 msgstr ""
 
-#: personal/supann/class_supannAccount.inc:313
+#: personal/supann/class_supannAccount.inc:305
 msgid "eduPersonPrimaryAffiliation"
 msgstr ""
 
-#: personal/supann/class_supannAccount.inc:318
+#: personal/supann/class_supannAccount.inc:310
 msgid "Affiliations"
 msgstr ""
 
-#: personal/supann/class_supannAccount.inc:318
+#: personal/supann/class_supannAccount.inc:310
 msgid "eduPersonAffiliation"
 msgstr ""
 
-#: personal/supann/class_supannAccount.inc:324
+#: personal/supann/class_supannAccount.inc:316
 msgid "supannEtablissement"
 msgstr ""
 
-#: personal/supann/class_supannAccount.inc:331
+#: personal/supann/class_supannAccount.inc:323
 msgid "Student profile"
 msgstr ""
 
-#: personal/supann/class_supannAccount.inc:334
+#: personal/supann/class_supannAccount.inc:326
 msgid "INE code"
 msgstr ""
 
-#: personal/supann/class_supannAccount.inc:334
+#: personal/supann/class_supannAccount.inc:326
 msgid "supannCodeINE - INE code of this student"
 msgstr ""
 
-#: personal/supann/class_supannAccount.inc:338
+#: personal/supann/class_supannAccount.inc:330
 msgid "Student ID"
 msgstr ""
 
-#: personal/supann/class_supannAccount.inc:338
+#: personal/supann/class_supannAccount.inc:330
 msgid "supannEtuId - scolarity id"
 msgstr ""
 
-#: personal/supann/class_supannAccount.inc:344
+#: personal/supann/class_supannAccount.inc:336
 msgid "Student subscriptions"
 msgstr ""
 
-#: personal/supann/class_supannAccount.inc:359
+#: personal/supann/class_supannAccount.inc:351
 msgid "supannEtuInscription - Subscriptions for this student"
 msgstr ""
 
-#: personal/supann/class_supannAccount.inc:363
+#: personal/supann/class_supannAccount.inc:355
 msgid ""
 "supannEtablissement - Etablissement in which this subscription was done"
 msgstr ""
 
-#: personal/supann/class_supannAccount.inc:367
+#: personal/supann/class_supannAccount.inc:359
 msgid "Year"
 msgstr ""
 
-#: personal/supann/class_supannAccount.inc:367
+#: personal/supann/class_supannAccount.inc:359
 msgid "supannEtuAnneeInscription - The year this subscription will begin"
 msgstr ""
 
-#: personal/supann/class_supannAccount.inc:372
+#: personal/supann/class_supannAccount.inc:364
 msgid "Subscription type"
 msgstr ""
 
-#: personal/supann/class_supannAccount.inc:372
+#: personal/supann/class_supannAccount.inc:364
 msgid "supannEtuRegimeInscription - The type of this subscription"
 msgstr ""
 
-#: personal/supann/class_supannAccount.inc:376
-msgid "Disciplinary Sector"
+#: personal/supann/class_supannAccount.inc:368
+msgid "Secteur Disciplinaire"
 msgstr ""
 
-#: personal/supann/class_supannAccount.inc:376
+#: personal/supann/class_supannAccount.inc:368
 msgid "supannEtuSecteurDisciplinaire"
 msgstr ""
 
-#: personal/supann/class_supannAccount.inc:380
+#: personal/supann/class_supannAccount.inc:372
 msgid "Diploma type"
 msgstr ""
 
-#: personal/supann/class_supannAccount.inc:380
+#: personal/supann/class_supannAccount.inc:372
 msgid "supannEtuTypeDiplome - Type of diploma"
 msgstr ""
 
-#: personal/supann/class_supannAccount.inc:384
-msgid "Curriculum year "
+#: personal/supann/class_supannAccount.inc:376
+msgid "Cursus annee"
 msgstr ""
 
-#: personal/supann/class_supannAccount.inc:384
+#: personal/supann/class_supannAccount.inc:376
 msgid "supannEtuCursusAnnee"
 msgstr ""
 
-#: personal/supann/class_supannAccount.inc:388
+#: personal/supann/class_supannAccount.inc:380
 msgid "supannEntiteAffectation_affect"
 msgstr ""
 
-#: personal/supann/class_supannAccount.inc:392
+#: personal/supann/class_supannAccount.inc:384
 msgid "Diploma"
 msgstr ""
 
-#: personal/supann/class_supannAccount.inc:392
+#: personal/supann/class_supannAccount.inc:384
 msgid "supannEtuDiplome"
 msgstr ""
 
-#: personal/supann/class_supannAccount.inc:396
+#: personal/supann/class_supannAccount.inc:388
 msgid "Step"
 msgstr ""
 
-#: personal/supann/class_supannAccount.inc:396
+#: personal/supann/class_supannAccount.inc:388
 msgid "supannEtuEtape"
 msgstr ""
 
-#: personal/supann/class_supannAccount.inc:400
+#: personal/supann/class_supannAccount.inc:392
 msgid "educational element"
 msgstr ""
 
-#: personal/supann/class_supannAccount.inc:400
+#: personal/supann/class_supannAccount.inc:392
 msgid "supannEtuElementPedagogique"
 msgstr ""
 
-#: personal/supann/class_supannAccount.inc:412
-msgid "Personal profile"
+#: personal/supann/class_supannAccount.inc:404
+msgid "Personnal profile"
 msgstr ""
 
-#: personal/supann/class_supannAccount.inc:415
+#: personal/supann/class_supannAccount.inc:407
 msgid "Personal ID"
 msgstr ""
 
-#: personal/supann/class_supannAccount.inc:415
+#: personal/supann/class_supannAccount.inc:407
 msgid "supannEmpId"
 msgstr ""
 
-#: personal/supann/class_supannAccount.inc:419
+#: personal/supann/class_supannAccount.inc:411
 msgid "Personal corps"
 msgstr ""
 
-#: personal/supann/class_supannAccount.inc:419
+#: personal/supann/class_supannAccount.inc:411
 msgid "supannEmpCorps"
 msgstr ""
 
-#: personal/supann/class_supannAccount.inc:424
-msgid "Activity"
+#: personal/supann/class_supannAccount.inc:416
+msgid "Activite"
 msgstr ""
 
-#: personal/supann/class_supannAccount.inc:424
+#: personal/supann/class_supannAccount.inc:416
 msgid "supannActivite"
 msgstr ""
 
-#: personal/supann/class_supannAccount.inc:431
+#: personal/supann/class_supannAccount.inc:423
 msgid "Roles"
 msgstr ""
 
-#: personal/supann/class_supannAccount.inc:438
+#: personal/supann/class_supannAccount.inc:430
 msgid "supannRoleEntite"
 msgstr ""
 
-#: personal/supann/class_supannAccount.inc:442
+#: personal/supann/class_supannAccount.inc:434
 msgid "Generic role"
 msgstr ""
 
-#: personal/supann/class_supannAccount.inc:442
+#: personal/supann/class_supannAccount.inc:434
 msgid "supannRoleGenerique"
 msgstr ""
 
-#: personal/supann/class_supannAccount.inc:446
-msgid "Entity assignment type"
-msgstr ""
-
 #: config/supann/class_supannConfig.inc:28
 msgid "SUPANN configuration"
 msgstr ""
diff --git a/supann/locale/ug/fusiondirectory.po b/supann/locale/ug/fusiondirectory.po
index 7316b42ef90d57b019e5fd0755b88ef2323ca2f1..25682aa734185d8bb8c265c8ba0cf7ed9cb8d229 100644
--- a/supann/locale/ug/fusiondirectory.po
+++ b/supann/locale/ug/fusiondirectory.po
@@ -5,12 +5,12 @@
 # Translators:
 msgid ""
 msgstr ""
-"Project-Id-Version: FusionDirectory-108\n"
+"Project-Id-Version: FusionDirectory-109\n"
 "Report-Msgid-Bugs-To: documentation@lists.fusiondirectory.org\n"
-"POT-Creation-Date: 2015-03-31 11:49+0200\n"
-"PO-Revision-Date: 2015-03-31 10:46+0000\n"
+"POT-Creation-Date: 2014-12-15 17:47+0100\n"
+"PO-Revision-Date: 2014-12-15 17:05+0000\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>\n"
-"Language-Team: Uighur (http://www.transifex.com/projects/p/FusionDirectory-108/language/ug/)\n"
+"Language-Team: Uighur (http://www.transifex.com/projects/p/FusionDirectory-109/language/ug/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -27,15 +27,16 @@ msgstr ""
 
 #: admin/supannStructures/class_entite.inc:31
 #: admin/supannStructures/class_entite.inc:52
-msgid "Entity"
+#: personal/supann/class_supannAccount.inc:442
+msgid "Entite"
 msgstr ""
 
 #: admin/supannStructures/class_entite.inc:32
-msgid "SUPANN Entity Settings"
+msgid "SUPANN Entite Settings"
 msgstr ""
 
 #: admin/supannStructures/class_entite.inc:35
-msgid "SUPANN Entity"
+msgid "SUPANN Entite"
 msgstr ""
 
 #: admin/supannStructures/class_entite.inc:55
@@ -44,7 +45,7 @@ msgid "Name"
 msgstr ""
 
 #: admin/supannStructures/class_entite.inc:55
-msgid "The name to write in the ou attribute for this entity"
+msgid "The name to write in the ou attribute for this entite"
 msgstr ""
 
 #: admin/supannStructures/class_entite.inc:61
@@ -57,7 +58,7 @@ msgid "Telephone"
 msgstr ""
 
 #: admin/supannStructures/class_entite.inc:64
-msgid "Phone number for this entity"
+msgid "Phone number for this entite"
 msgstr ""
 
 #: admin/supannStructures/class_entite.inc:68
@@ -66,7 +67,7 @@ msgid "Fax"
 msgstr ""
 
 #: admin/supannStructures/class_entite.inc:68
-msgid "Fax number for this entity"
+msgid "Fax number for this entite"
 msgstr ""
 
 #: admin/supannStructures/class_entite.inc:72
@@ -74,7 +75,7 @@ msgid "Postal address"
 msgstr ""
 
 #: admin/supannStructures/class_entite.inc:72
-msgid "Postal address of this entity"
+msgid "Postal address of this entite"
 msgstr ""
 
 #: admin/supannStructures/class_entite.inc:76
@@ -83,7 +84,7 @@ msgid "Description"
 msgstr ""
 
 #: admin/supannStructures/class_entite.inc:76
-msgid "Short description of this entity"
+msgid "Short description of this entite"
 msgstr ""
 
 #: admin/supannStructures/class_entite.inc:82
@@ -91,27 +92,28 @@ msgid "SUPANN informations"
 msgstr ""
 
 #: admin/supannStructures/class_entite.inc:85
-msgid "Entity type"
+#: personal/supann/class_supannAccount.inc:438
+msgid "Entite type"
 msgstr ""
 
 #: admin/supannStructures/class_entite.inc:85
-msgid "The best SUPANN type that fits this entity"
+msgid "The best SUPANN type that fits this entite"
 msgstr ""
 
 #: admin/supannStructures/class_entite.inc:89
-msgid "Entity code"
+msgid "Entite code"
 msgstr ""
 
 #: admin/supannStructures/class_entite.inc:89
-msgid "The SUPANN code of this entity"
+msgid "The SUPANN code of this entite"
 msgstr ""
 
 #: admin/supannStructures/class_entite.inc:94
-msgid "Parent entity"
+msgid "Parent entite"
 msgstr ""
 
 #: admin/supannStructures/class_entite.inc:94
-msgid "The parent entity of this entity"
+msgid "The parent entite of this entite"
 msgstr ""
 
 #: admin/supannStructures/class_entite.inc:98
@@ -119,21 +121,21 @@ msgid "Reference ID"
 msgstr ""
 
 #: admin/supannStructures/class_entite.inc:98
-msgid "SUPANN reference ID of this entity"
+msgid "SUPANN reference ID of this entite"
 msgstr ""
 
 #: admin/supannStructures/class_etablissement.inc:31
-#: personal/supann/class_supannAccount.inc:324
-#: personal/supann/class_supannAccount.inc:363
-msgid "Establishment"
+#: personal/supann/class_supannAccount.inc:316
+#: personal/supann/class_supannAccount.inc:355
+msgid "Etablissement"
 msgstr ""
 
 #: admin/supannStructures/class_etablissement.inc:32
-msgid "SUPANN Establishment Settings"
+msgid "SUPANN Etablissement Settings"
 msgstr ""
 
 #: admin/supannStructures/class_etablissement.inc:35
-msgid "SUPANN Establishment"
+msgid "SUPANN Etablissement"
 msgstr ""
 
 #: admin/supannStructures/class_etablissement.inc:52
@@ -141,19 +143,19 @@ msgid "Properties"
 msgstr ""
 
 #: admin/supannStructures/class_etablissement.inc:55
-msgid "Root Establishment"
+msgid "Root etablissement"
 msgstr ""
 
 #: admin/supannStructures/class_etablissement.inc:55
-msgid "Set this Establishment as the root one"
+msgid "Set this etablissement as the root one"
 msgstr ""
 
 #: admin/supannStructures/class_etablissement.inc:59
-msgid "The name to write in the o attribute for this Establishment"
+msgid "The name to write in the o attribute for this etablissement"
 msgstr ""
 
 #: admin/supannStructures/class_etablissement.inc:63
-msgid "A short description of this Establishment"
+msgid "A short description of this etablissement"
 msgstr ""
 
 #: admin/supannStructures/class_etablissement.inc:69
@@ -162,7 +164,7 @@ msgid "Location"
 msgstr ""
 
 #: admin/supannStructures/class_etablissement.inc:72
-msgid "Usually the city where this Establishment is"
+msgid "Usually the city in which is this etablissement"
 msgstr ""
 
 #: admin/supannStructures/class_etablissement.inc:76
@@ -170,15 +172,15 @@ msgid "Address"
 msgstr ""
 
 #: admin/supannStructures/class_etablissement.inc:76
-msgid "The postal address of this Establishment"
+msgid "The postal address of this etablissement"
 msgstr ""
 
 #: admin/supannStructures/class_etablissement.inc:80
-msgid "Phone number for this Establishment"
+msgid "Phone number for this etablissement"
 msgstr ""
 
 #: admin/supannStructures/class_etablissement.inc:84
-msgid "Fax number for this Establishment"
+msgid "Fax number for this etablissement"
 msgstr ""
 
 #: admin/supannStructures/class_etablissement.inc:90
@@ -186,11 +188,11 @@ msgid "SUPANN properties"
 msgstr ""
 
 #: admin/supannStructures/class_etablissement.inc:93
-msgid "Establishment code"
+msgid "Etablissement code"
 msgstr ""
 
 #: admin/supannStructures/class_etablissement.inc:93
-msgid "The code of this Establishment (must have a prefix between {})"
+msgid "The code of this etablissement (must have a prefix between {})"
 msgstr ""
 
 #: admin/supannStructures/class_etablissement.inc:98
@@ -198,7 +200,7 @@ msgid "SUPANN code"
 msgstr ""
 
 #: admin/supannStructures/class_etablissement.inc:98
-msgid "The SUPANN code for this Establishment"
+msgid "The SUPANN code for this etablissement"
 msgstr ""
 
 #: admin/supannStructures/class_etablissement.inc:103
@@ -206,7 +208,7 @@ msgid "Legal name"
 msgstr ""
 
 #: admin/supannStructures/class_etablissement.inc:103
-msgid "The legal name of this Establishment"
+msgid "The legal name of this etablissement"
 msgstr ""
 
 #: admin/supannStructures/class_etablissement.inc:107
@@ -214,7 +216,7 @@ msgid "Home page URI"
 msgstr ""
 
 #: admin/supannStructures/class_etablissement.inc:107
-msgid "The URI of this Establishment website home page"
+msgid "The URI of this etablissement website home page"
 msgstr ""
 
 #: admin/supannStructures/class_etablissement.inc:111
@@ -222,7 +224,7 @@ msgid "Institution URI"
 msgstr ""
 
 #: admin/supannStructures/class_etablissement.inc:111
-msgid "The URI of this Establishment institution website"
+msgid "The URI of this etablissement institution website"
 msgstr ""
 
 #: admin/supannStructures/class_etablissement.inc:115
@@ -230,12 +232,12 @@ msgid "White pages URI"
 msgstr ""
 
 #: admin/supannStructures/class_etablissement.inc:115
-msgid "The URI of this Establishment white pages"
+msgid "The URI of this etablissement white pages"
 msgstr ""
 
 #: admin/supannStructures/class_etablissement.inc:148
-#: admin/supannStructures/class_etablissement.inc:201
-#: admin/supannStructures/class_etablissement.inc:219
+#: admin/supannStructures/class_etablissement.inc:198
+#: admin/supannStructures/class_etablissement.inc:216
 msgid "LDAP error"
 msgstr ""
 
@@ -355,256 +357,243 @@ msgstr ""
 msgid "eduPersonNickName - Can contain a nick name for this user"
 msgstr ""
 
-#: personal/supann/class_supannAccount.inc:253
-msgid "Ref ids"
-msgstr ""
-
-#: personal/supann/class_supannAccount.inc:253
-msgid "supannRefId - IDs/links for this user on other systems"
-msgstr ""
-
-#: personal/supann/class_supannAccount.inc:262
+#: personal/supann/class_supannAccount.inc:254
 msgid "Contact"
 msgstr ""
 
-#: personal/supann/class_supannAccount.inc:266
+#: personal/supann/class_supannAccount.inc:258
 msgid "Other phone numbers"
 msgstr ""
 
-#: personal/supann/class_supannAccount.inc:266
+#: personal/supann/class_supannAccount.inc:258
 msgid "supannAutreTelephone - Other phone numbers for this user"
 msgstr ""
 
-#: personal/supann/class_supannAccount.inc:272
+#: personal/supann/class_supannAccount.inc:264
 msgid "Other mail addresses"
 msgstr ""
 
-#: personal/supann/class_supannAccount.inc:272
+#: personal/supann/class_supannAccount.inc:264
 msgid ""
 "supannAutreMail - Other mail addresses for this user. Each must be unique"
 msgstr ""
 
-#: personal/supann/class_supannAccount.inc:278
+#: personal/supann/class_supannAccount.inc:270
 msgid "Personal mail addresses"
 msgstr ""
 
-#: personal/supann/class_supannAccount.inc:278
+#: personal/supann/class_supannAccount.inc:270
 msgid "supannMailPerso - Personal mail addresses for this user"
 msgstr ""
 
-#: personal/supann/class_supannAccount.inc:283
-msgid "red List"
+#: personal/supann/class_supannAccount.inc:275
+msgid "Liste rouge"
 msgstr ""
 
-#: personal/supann/class_supannAccount.inc:283
+#: personal/supann/class_supannAccount.inc:275
 msgid "supannListeRouge - Should this person be on the red list"
 msgstr ""
 
-#: personal/supann/class_supannAccount.inc:289
+#: personal/supann/class_supannAccount.inc:281
 msgid "Affectation"
 msgstr ""
 
-#: personal/supann/class_supannAccount.inc:292
-msgid "Entity primary assignment"
+#: personal/supann/class_supannAccount.inc:284
+msgid "Entite affectation principale"
 msgstr ""
 
-#: personal/supann/class_supannAccount.inc:292
+#: personal/supann/class_supannAccount.inc:284
 msgid "supannEntiteAffectationPrincipale"
 msgstr ""
 
-#: personal/supann/class_supannAccount.inc:297
-#: personal/supann/class_supannAccount.inc:388
-#: personal/supann/class_supannAccount.inc:450
-msgid "Entity assignment"
+#: personal/supann/class_supannAccount.inc:289
+#: personal/supann/class_supannAccount.inc:380
+msgid "Entite affectation"
 msgstr ""
 
-#: personal/supann/class_supannAccount.inc:297
-#: personal/supann/class_supannAccount.inc:450
+#: personal/supann/class_supannAccount.inc:289
+#: personal/supann/class_supannAccount.inc:442
 msgid "supannEntiteAffectation"
 msgstr ""
 
-#: personal/supann/class_supannAccount.inc:303
-msgid "Entity type assignment"
+#: personal/supann/class_supannAccount.inc:295
+msgid "Type entite affectation"
 msgstr ""
 
-#: personal/supann/class_supannAccount.inc:303
-#: personal/supann/class_supannAccount.inc:446
+#: personal/supann/class_supannAccount.inc:295
+#: personal/supann/class_supannAccount.inc:438
 msgid "supannTypeEntiteAffectation"
 msgstr ""
 
-#: personal/supann/class_supannAccount.inc:310
+#: personal/supann/class_supannAccount.inc:302
 msgid "Affiliation"
 msgstr ""
 
-#: personal/supann/class_supannAccount.inc:313
+#: personal/supann/class_supannAccount.inc:305
 msgid "Primary affiliation"
 msgstr ""
 
-#: personal/supann/class_supannAccount.inc:313
+#: personal/supann/class_supannAccount.inc:305
 msgid "eduPersonPrimaryAffiliation"
 msgstr ""
 
-#: personal/supann/class_supannAccount.inc:318
+#: personal/supann/class_supannAccount.inc:310
 msgid "Affiliations"
 msgstr ""
 
-#: personal/supann/class_supannAccount.inc:318
+#: personal/supann/class_supannAccount.inc:310
 msgid "eduPersonAffiliation"
 msgstr ""
 
-#: personal/supann/class_supannAccount.inc:324
+#: personal/supann/class_supannAccount.inc:316
 msgid "supannEtablissement"
 msgstr ""
 
-#: personal/supann/class_supannAccount.inc:331
+#: personal/supann/class_supannAccount.inc:323
 msgid "Student profile"
 msgstr ""
 
-#: personal/supann/class_supannAccount.inc:334
+#: personal/supann/class_supannAccount.inc:326
 msgid "INE code"
 msgstr ""
 
-#: personal/supann/class_supannAccount.inc:334
+#: personal/supann/class_supannAccount.inc:326
 msgid "supannCodeINE - INE code of this student"
 msgstr ""
 
-#: personal/supann/class_supannAccount.inc:338
+#: personal/supann/class_supannAccount.inc:330
 msgid "Student ID"
 msgstr ""
 
-#: personal/supann/class_supannAccount.inc:338
+#: personal/supann/class_supannAccount.inc:330
 msgid "supannEtuId - scolarity id"
 msgstr ""
 
-#: personal/supann/class_supannAccount.inc:344
+#: personal/supann/class_supannAccount.inc:336
 msgid "Student subscriptions"
 msgstr ""
 
-#: personal/supann/class_supannAccount.inc:359
+#: personal/supann/class_supannAccount.inc:351
 msgid "supannEtuInscription - Subscriptions for this student"
 msgstr ""
 
-#: personal/supann/class_supannAccount.inc:363
+#: personal/supann/class_supannAccount.inc:355
 msgid ""
 "supannEtablissement - Etablissement in which this subscription was done"
 msgstr ""
 
-#: personal/supann/class_supannAccount.inc:367
+#: personal/supann/class_supannAccount.inc:359
 msgid "Year"
 msgstr ""
 
-#: personal/supann/class_supannAccount.inc:367
+#: personal/supann/class_supannAccount.inc:359
 msgid "supannEtuAnneeInscription - The year this subscription will begin"
 msgstr ""
 
-#: personal/supann/class_supannAccount.inc:372
+#: personal/supann/class_supannAccount.inc:364
 msgid "Subscription type"
 msgstr ""
 
-#: personal/supann/class_supannAccount.inc:372
+#: personal/supann/class_supannAccount.inc:364
 msgid "supannEtuRegimeInscription - The type of this subscription"
 msgstr ""
 
-#: personal/supann/class_supannAccount.inc:376
-msgid "Disciplinary Sector"
+#: personal/supann/class_supannAccount.inc:368
+msgid "Secteur Disciplinaire"
 msgstr ""
 
-#: personal/supann/class_supannAccount.inc:376
+#: personal/supann/class_supannAccount.inc:368
 msgid "supannEtuSecteurDisciplinaire"
 msgstr ""
 
-#: personal/supann/class_supannAccount.inc:380
+#: personal/supann/class_supannAccount.inc:372
 msgid "Diploma type"
 msgstr ""
 
-#: personal/supann/class_supannAccount.inc:380
+#: personal/supann/class_supannAccount.inc:372
 msgid "supannEtuTypeDiplome - Type of diploma"
 msgstr ""
 
-#: personal/supann/class_supannAccount.inc:384
-msgid "Curriculum year "
+#: personal/supann/class_supannAccount.inc:376
+msgid "Cursus annee"
 msgstr ""
 
-#: personal/supann/class_supannAccount.inc:384
+#: personal/supann/class_supannAccount.inc:376
 msgid "supannEtuCursusAnnee"
 msgstr ""
 
-#: personal/supann/class_supannAccount.inc:388
+#: personal/supann/class_supannAccount.inc:380
 msgid "supannEntiteAffectation_affect"
 msgstr ""
 
-#: personal/supann/class_supannAccount.inc:392
+#: personal/supann/class_supannAccount.inc:384
 msgid "Diploma"
 msgstr ""
 
-#: personal/supann/class_supannAccount.inc:392
+#: personal/supann/class_supannAccount.inc:384
 msgid "supannEtuDiplome"
 msgstr ""
 
-#: personal/supann/class_supannAccount.inc:396
+#: personal/supann/class_supannAccount.inc:388
 msgid "Step"
 msgstr ""
 
-#: personal/supann/class_supannAccount.inc:396
+#: personal/supann/class_supannAccount.inc:388
 msgid "supannEtuEtape"
 msgstr ""
 
-#: personal/supann/class_supannAccount.inc:400
+#: personal/supann/class_supannAccount.inc:392
 msgid "educational element"
 msgstr ""
 
-#: personal/supann/class_supannAccount.inc:400
+#: personal/supann/class_supannAccount.inc:392
 msgid "supannEtuElementPedagogique"
 msgstr ""
 
-#: personal/supann/class_supannAccount.inc:412
-msgid "Personal profile"
+#: personal/supann/class_supannAccount.inc:404
+msgid "Personnal profile"
 msgstr ""
 
-#: personal/supann/class_supannAccount.inc:415
+#: personal/supann/class_supannAccount.inc:407
 msgid "Personal ID"
 msgstr ""
 
-#: personal/supann/class_supannAccount.inc:415
+#: personal/supann/class_supannAccount.inc:407
 msgid "supannEmpId"
 msgstr ""
 
-#: personal/supann/class_supannAccount.inc:419
+#: personal/supann/class_supannAccount.inc:411
 msgid "Personal corps"
 msgstr ""
 
-#: personal/supann/class_supannAccount.inc:419
+#: personal/supann/class_supannAccount.inc:411
 msgid "supannEmpCorps"
 msgstr ""
 
-#: personal/supann/class_supannAccount.inc:424
-msgid "Activity"
+#: personal/supann/class_supannAccount.inc:416
+msgid "Activite"
 msgstr ""
 
-#: personal/supann/class_supannAccount.inc:424
+#: personal/supann/class_supannAccount.inc:416
 msgid "supannActivite"
 msgstr ""
 
-#: personal/supann/class_supannAccount.inc:431
+#: personal/supann/class_supannAccount.inc:423
 msgid "Roles"
 msgstr ""
 
-#: personal/supann/class_supannAccount.inc:438
+#: personal/supann/class_supannAccount.inc:430
 msgid "supannRoleEntite"
 msgstr ""
 
-#: personal/supann/class_supannAccount.inc:442
+#: personal/supann/class_supannAccount.inc:434
 msgid "Generic role"
 msgstr ""
 
-#: personal/supann/class_supannAccount.inc:442
+#: personal/supann/class_supannAccount.inc:434
 msgid "supannRoleGenerique"
 msgstr ""
 
-#: personal/supann/class_supannAccount.inc:446
-msgid "Entity assignment type"
-msgstr ""
-
 #: config/supann/class_supannConfig.inc:28
 msgid "SUPANN configuration"
 msgstr ""
diff --git a/supann/locale/vi_VN/fusiondirectory.po b/supann/locale/vi_VN/fusiondirectory.po
index be3102abfa72e39f3c062e38beb74a0914b11191..0ed999b9915b08867d77212cd8817c1b51fbed08 100644
--- a/supann/locale/vi_VN/fusiondirectory.po
+++ b/supann/locale/vi_VN/fusiondirectory.po
@@ -5,12 +5,12 @@
 # Translators:
 msgid ""
 msgstr ""
-"Project-Id-Version: FusionDirectory-108\n"
+"Project-Id-Version: FusionDirectory-109\n"
 "Report-Msgid-Bugs-To: documentation@lists.fusiondirectory.org\n"
-"POT-Creation-Date: 2015-03-31 11:49+0200\n"
-"PO-Revision-Date: 2015-03-31 10:46+0000\n"
+"POT-Creation-Date: 2014-12-15 17:47+0100\n"
+"PO-Revision-Date: 2015-02-25 16:04+0000\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>\n"
-"Language-Team: Vietnamese (Viet Nam) (http://www.transifex.com/projects/p/FusionDirectory-108/language/vi_VN/)\n"
+"Language-Team: Vietnamese (Viet Nam) (http://www.transifex.com/projects/p/FusionDirectory-109/language/vi_VN/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -27,15 +27,16 @@ msgstr ""
 
 #: admin/supannStructures/class_entite.inc:31
 #: admin/supannStructures/class_entite.inc:52
-msgid "Entity"
+#: personal/supann/class_supannAccount.inc:442
+msgid "Entite"
 msgstr ""
 
 #: admin/supannStructures/class_entite.inc:32
-msgid "SUPANN Entity Settings"
+msgid "SUPANN Entite Settings"
 msgstr ""
 
 #: admin/supannStructures/class_entite.inc:35
-msgid "SUPANN Entity"
+msgid "SUPANN Entite"
 msgstr ""
 
 #: admin/supannStructures/class_entite.inc:55
@@ -44,7 +45,7 @@ msgid "Name"
 msgstr "TÃªn"
 
 #: admin/supannStructures/class_entite.inc:55
-msgid "The name to write in the ou attribute for this entity"
+msgid "The name to write in the ou attribute for this entite"
 msgstr ""
 
 #: admin/supannStructures/class_entite.inc:61
@@ -57,7 +58,7 @@ msgid "Telephone"
 msgstr "Sá»‘ Ä‘iá»‡n thoáº¡i"
 
 #: admin/supannStructures/class_entite.inc:64
-msgid "Phone number for this entity"
+msgid "Phone number for this entite"
 msgstr ""
 
 #: admin/supannStructures/class_entite.inc:68
@@ -66,7 +67,7 @@ msgid "Fax"
 msgstr "Sá»‘ fax"
 
 #: admin/supannStructures/class_entite.inc:68
-msgid "Fax number for this entity"
+msgid "Fax number for this entite"
 msgstr ""
 
 #: admin/supannStructures/class_entite.inc:72
@@ -74,7 +75,7 @@ msgid "Postal address"
 msgstr "Äá»‹a chá»‰ theo bÆ°u Ä‘iá»‡n"
 
 #: admin/supannStructures/class_entite.inc:72
-msgid "Postal address of this entity"
+msgid "Postal address of this entite"
 msgstr ""
 
 #: admin/supannStructures/class_entite.inc:76
@@ -83,7 +84,7 @@ msgid "Description"
 msgstr "MÃ´ táº£"
 
 #: admin/supannStructures/class_entite.inc:76
-msgid "Short description of this entity"
+msgid "Short description of this entite"
 msgstr ""
 
 #: admin/supannStructures/class_entite.inc:82
@@ -91,27 +92,28 @@ msgid "SUPANN informations"
 msgstr ""
 
 #: admin/supannStructures/class_entite.inc:85
-msgid "Entity type"
+#: personal/supann/class_supannAccount.inc:438
+msgid "Entite type"
 msgstr ""
 
 #: admin/supannStructures/class_entite.inc:85
-msgid "The best SUPANN type that fits this entity"
+msgid "The best SUPANN type that fits this entite"
 msgstr ""
 
 #: admin/supannStructures/class_entite.inc:89
-msgid "Entity code"
+msgid "Entite code"
 msgstr ""
 
 #: admin/supannStructures/class_entite.inc:89
-msgid "The SUPANN code of this entity"
+msgid "The SUPANN code of this entite"
 msgstr ""
 
 #: admin/supannStructures/class_entite.inc:94
-msgid "Parent entity"
+msgid "Parent entite"
 msgstr ""
 
 #: admin/supannStructures/class_entite.inc:94
-msgid "The parent entity of this entity"
+msgid "The parent entite of this entite"
 msgstr ""
 
 #: admin/supannStructures/class_entite.inc:98
@@ -119,21 +121,21 @@ msgid "Reference ID"
 msgstr ""
 
 #: admin/supannStructures/class_entite.inc:98
-msgid "SUPANN reference ID of this entity"
+msgid "SUPANN reference ID of this entite"
 msgstr ""
 
 #: admin/supannStructures/class_etablissement.inc:31
-#: personal/supann/class_supannAccount.inc:324
-#: personal/supann/class_supannAccount.inc:363
-msgid "Establishment"
+#: personal/supann/class_supannAccount.inc:316
+#: personal/supann/class_supannAccount.inc:355
+msgid "Etablissement"
 msgstr ""
 
 #: admin/supannStructures/class_etablissement.inc:32
-msgid "SUPANN Establishment Settings"
+msgid "SUPANN Etablissement Settings"
 msgstr ""
 
 #: admin/supannStructures/class_etablissement.inc:35
-msgid "SUPANN Establishment"
+msgid "SUPANN Etablissement"
 msgstr ""
 
 #: admin/supannStructures/class_etablissement.inc:52
@@ -141,19 +143,19 @@ msgid "Properties"
 msgstr "Properties"
 
 #: admin/supannStructures/class_etablissement.inc:55
-msgid "Root Establishment"
+msgid "Root etablissement"
 msgstr ""
 
 #: admin/supannStructures/class_etablissement.inc:55
-msgid "Set this Establishment as the root one"
+msgid "Set this etablissement as the root one"
 msgstr ""
 
 #: admin/supannStructures/class_etablissement.inc:59
-msgid "The name to write in the o attribute for this Establishment"
+msgid "The name to write in the o attribute for this etablissement"
 msgstr ""
 
 #: admin/supannStructures/class_etablissement.inc:63
-msgid "A short description of this Establishment"
+msgid "A short description of this etablissement"
 msgstr ""
 
 #: admin/supannStructures/class_etablissement.inc:69
@@ -162,7 +164,7 @@ msgid "Location"
 msgstr "Vá»‹ trÃ"
 
 #: admin/supannStructures/class_etablissement.inc:72
-msgid "Usually the city where this Establishment is"
+msgid "Usually the city in which is this etablissement"
 msgstr ""
 
 #: admin/supannStructures/class_etablissement.inc:76
@@ -170,15 +172,15 @@ msgid "Address"
 msgstr "Äá»‹a chá»‰"
 
 #: admin/supannStructures/class_etablissement.inc:76
-msgid "The postal address of this Establishment"
+msgid "The postal address of this etablissement"
 msgstr ""
 
 #: admin/supannStructures/class_etablissement.inc:80
-msgid "Phone number for this Establishment"
+msgid "Phone number for this etablissement"
 msgstr ""
 
 #: admin/supannStructures/class_etablissement.inc:84
-msgid "Fax number for this Establishment"
+msgid "Fax number for this etablissement"
 msgstr ""
 
 #: admin/supannStructures/class_etablissement.inc:90
@@ -186,11 +188,11 @@ msgid "SUPANN properties"
 msgstr ""
 
 #: admin/supannStructures/class_etablissement.inc:93
-msgid "Establishment code"
+msgid "Etablissement code"
 msgstr ""
 
 #: admin/supannStructures/class_etablissement.inc:93
-msgid "The code of this Establishment (must have a prefix between {})"
+msgid "The code of this etablissement (must have a prefix between {})"
 msgstr ""
 
 #: admin/supannStructures/class_etablissement.inc:98
@@ -198,7 +200,7 @@ msgid "SUPANN code"
 msgstr ""
 
 #: admin/supannStructures/class_etablissement.inc:98
-msgid "The SUPANN code for this Establishment"
+msgid "The SUPANN code for this etablissement"
 msgstr ""
 
 #: admin/supannStructures/class_etablissement.inc:103
@@ -206,7 +208,7 @@ msgid "Legal name"
 msgstr ""
 
 #: admin/supannStructures/class_etablissement.inc:103
-msgid "The legal name of this Establishment"
+msgid "The legal name of this etablissement"
 msgstr ""
 
 #: admin/supannStructures/class_etablissement.inc:107
@@ -214,7 +216,7 @@ msgid "Home page URI"
 msgstr ""
 
 #: admin/supannStructures/class_etablissement.inc:107
-msgid "The URI of this Establishment website home page"
+msgid "The URI of this etablissement website home page"
 msgstr ""
 
 #: admin/supannStructures/class_etablissement.inc:111
@@ -222,7 +224,7 @@ msgid "Institution URI"
 msgstr ""
 
 #: admin/supannStructures/class_etablissement.inc:111
-msgid "The URI of this Establishment institution website"
+msgid "The URI of this etablissement institution website"
 msgstr ""
 
 #: admin/supannStructures/class_etablissement.inc:115
@@ -230,12 +232,12 @@ msgid "White pages URI"
 msgstr ""
 
 #: admin/supannStructures/class_etablissement.inc:115
-msgid "The URI of this Establishment white pages"
+msgid "The URI of this etablissement white pages"
 msgstr ""
 
 #: admin/supannStructures/class_etablissement.inc:148
-#: admin/supannStructures/class_etablissement.inc:201
-#: admin/supannStructures/class_etablissement.inc:219
+#: admin/supannStructures/class_etablissement.inc:198
+#: admin/supannStructures/class_etablissement.inc:216
 msgid "LDAP error"
 msgstr "Lá»—i LDAP"
 
@@ -355,256 +357,243 @@ msgstr ""
 msgid "eduPersonNickName - Can contain a nick name for this user"
 msgstr ""
 
-#: personal/supann/class_supannAccount.inc:253
-msgid "Ref ids"
-msgstr ""
-
-#: personal/supann/class_supannAccount.inc:253
-msgid "supannRefId - IDs/links for this user on other systems"
-msgstr ""
-
-#: personal/supann/class_supannAccount.inc:262
+#: personal/supann/class_supannAccount.inc:254
 msgid "Contact"
 msgstr ""
 
-#: personal/supann/class_supannAccount.inc:266
+#: personal/supann/class_supannAccount.inc:258
 msgid "Other phone numbers"
 msgstr ""
 
-#: personal/supann/class_supannAccount.inc:266
+#: personal/supann/class_supannAccount.inc:258
 msgid "supannAutreTelephone - Other phone numbers for this user"
 msgstr ""
 
-#: personal/supann/class_supannAccount.inc:272
+#: personal/supann/class_supannAccount.inc:264
 msgid "Other mail addresses"
 msgstr ""
 
-#: personal/supann/class_supannAccount.inc:272
+#: personal/supann/class_supannAccount.inc:264
 msgid ""
 "supannAutreMail - Other mail addresses for this user. Each must be unique"
 msgstr ""
 
-#: personal/supann/class_supannAccount.inc:278
+#: personal/supann/class_supannAccount.inc:270
 msgid "Personal mail addresses"
 msgstr ""
 
-#: personal/supann/class_supannAccount.inc:278
+#: personal/supann/class_supannAccount.inc:270
 msgid "supannMailPerso - Personal mail addresses for this user"
 msgstr ""
 
-#: personal/supann/class_supannAccount.inc:283
-msgid "red List"
+#: personal/supann/class_supannAccount.inc:275
+msgid "Liste rouge"
 msgstr ""
 
-#: personal/supann/class_supannAccount.inc:283
+#: personal/supann/class_supannAccount.inc:275
 msgid "supannListeRouge - Should this person be on the red list"
 msgstr ""
 
-#: personal/supann/class_supannAccount.inc:289
+#: personal/supann/class_supannAccount.inc:281
 msgid "Affectation"
 msgstr ""
 
-#: personal/supann/class_supannAccount.inc:292
-msgid "Entity primary assignment"
+#: personal/supann/class_supannAccount.inc:284
+msgid "Entite affectation principale"
 msgstr ""
 
-#: personal/supann/class_supannAccount.inc:292
+#: personal/supann/class_supannAccount.inc:284
 msgid "supannEntiteAffectationPrincipale"
 msgstr ""
 
-#: personal/supann/class_supannAccount.inc:297
-#: personal/supann/class_supannAccount.inc:388
-#: personal/supann/class_supannAccount.inc:450
-msgid "Entity assignment"
+#: personal/supann/class_supannAccount.inc:289
+#: personal/supann/class_supannAccount.inc:380
+msgid "Entite affectation"
 msgstr ""
 
-#: personal/supann/class_supannAccount.inc:297
-#: personal/supann/class_supannAccount.inc:450
+#: personal/supann/class_supannAccount.inc:289
+#: personal/supann/class_supannAccount.inc:442
 msgid "supannEntiteAffectation"
 msgstr ""
 
-#: personal/supann/class_supannAccount.inc:303
-msgid "Entity type assignment"
+#: personal/supann/class_supannAccount.inc:295
+msgid "Type entite affectation"
 msgstr ""
 
-#: personal/supann/class_supannAccount.inc:303
-#: personal/supann/class_supannAccount.inc:446
+#: personal/supann/class_supannAccount.inc:295
+#: personal/supann/class_supannAccount.inc:438
 msgid "supannTypeEntiteAffectation"
 msgstr ""
 
-#: personal/supann/class_supannAccount.inc:310
+#: personal/supann/class_supannAccount.inc:302
 msgid "Affiliation"
 msgstr ""
 
-#: personal/supann/class_supannAccount.inc:313
+#: personal/supann/class_supannAccount.inc:305
 msgid "Primary affiliation"
 msgstr ""
 
-#: personal/supann/class_supannAccount.inc:313
+#: personal/supann/class_supannAccount.inc:305
 msgid "eduPersonPrimaryAffiliation"
 msgstr ""
 
-#: personal/supann/class_supannAccount.inc:318
+#: personal/supann/class_supannAccount.inc:310
 msgid "Affiliations"
 msgstr ""
 
-#: personal/supann/class_supannAccount.inc:318
+#: personal/supann/class_supannAccount.inc:310
 msgid "eduPersonAffiliation"
 msgstr ""
 
-#: personal/supann/class_supannAccount.inc:324
+#: personal/supann/class_supannAccount.inc:316
 msgid "supannEtablissement"
 msgstr ""
 
-#: personal/supann/class_supannAccount.inc:331
+#: personal/supann/class_supannAccount.inc:323
 msgid "Student profile"
 msgstr ""
 
-#: personal/supann/class_supannAccount.inc:334
+#: personal/supann/class_supannAccount.inc:326
 msgid "INE code"
 msgstr ""
 
-#: personal/supann/class_supannAccount.inc:334
+#: personal/supann/class_supannAccount.inc:326
 msgid "supannCodeINE - INE code of this student"
 msgstr ""
 
-#: personal/supann/class_supannAccount.inc:338
+#: personal/supann/class_supannAccount.inc:330
 msgid "Student ID"
 msgstr ""
 
-#: personal/supann/class_supannAccount.inc:338
+#: personal/supann/class_supannAccount.inc:330
 msgid "supannEtuId - scolarity id"
 msgstr ""
 
-#: personal/supann/class_supannAccount.inc:344
+#: personal/supann/class_supannAccount.inc:336
 msgid "Student subscriptions"
 msgstr ""
 
-#: personal/supann/class_supannAccount.inc:359
+#: personal/supann/class_supannAccount.inc:351
 msgid "supannEtuInscription - Subscriptions for this student"
 msgstr ""
 
-#: personal/supann/class_supannAccount.inc:363
+#: personal/supann/class_supannAccount.inc:355
 msgid ""
 "supannEtablissement - Etablissement in which this subscription was done"
 msgstr ""
 
-#: personal/supann/class_supannAccount.inc:367
+#: personal/supann/class_supannAccount.inc:359
 msgid "Year"
 msgstr ""
 
-#: personal/supann/class_supannAccount.inc:367
+#: personal/supann/class_supannAccount.inc:359
 msgid "supannEtuAnneeInscription - The year this subscription will begin"
 msgstr ""
 
-#: personal/supann/class_supannAccount.inc:372
+#: personal/supann/class_supannAccount.inc:364
 msgid "Subscription type"
 msgstr ""
 
-#: personal/supann/class_supannAccount.inc:372
+#: personal/supann/class_supannAccount.inc:364
 msgid "supannEtuRegimeInscription - The type of this subscription"
 msgstr ""
 
-#: personal/supann/class_supannAccount.inc:376
-msgid "Disciplinary Sector"
+#: personal/supann/class_supannAccount.inc:368
+msgid "Secteur Disciplinaire"
 msgstr ""
 
-#: personal/supann/class_supannAccount.inc:376
+#: personal/supann/class_supannAccount.inc:368
 msgid "supannEtuSecteurDisciplinaire"
 msgstr ""
 
-#: personal/supann/class_supannAccount.inc:380
+#: personal/supann/class_supannAccount.inc:372
 msgid "Diploma type"
 msgstr ""
 
-#: personal/supann/class_supannAccount.inc:380
+#: personal/supann/class_supannAccount.inc:372
 msgid "supannEtuTypeDiplome - Type of diploma"
 msgstr ""
 
-#: personal/supann/class_supannAccount.inc:384
-msgid "Curriculum year "
+#: personal/supann/class_supannAccount.inc:376
+msgid "Cursus annee"
 msgstr ""
 
-#: personal/supann/class_supannAccount.inc:384
+#: personal/supann/class_supannAccount.inc:376
 msgid "supannEtuCursusAnnee"
 msgstr ""
 
-#: personal/supann/class_supannAccount.inc:388
+#: personal/supann/class_supannAccount.inc:380
 msgid "supannEntiteAffectation_affect"
 msgstr ""
 
-#: personal/supann/class_supannAccount.inc:392
+#: personal/supann/class_supannAccount.inc:384
 msgid "Diploma"
 msgstr ""
 
-#: personal/supann/class_supannAccount.inc:392
+#: personal/supann/class_supannAccount.inc:384
 msgid "supannEtuDiplome"
 msgstr ""
 
-#: personal/supann/class_supannAccount.inc:396
+#: personal/supann/class_supannAccount.inc:388
 msgid "Step"
 msgstr ""
 
-#: personal/supann/class_supannAccount.inc:396
+#: personal/supann/class_supannAccount.inc:388
 msgid "supannEtuEtape"
 msgstr ""
 
-#: personal/supann/class_supannAccount.inc:400
+#: personal/supann/class_supannAccount.inc:392
 msgid "educational element"
 msgstr ""
 
-#: personal/supann/class_supannAccount.inc:400
+#: personal/supann/class_supannAccount.inc:392
 msgid "supannEtuElementPedagogique"
 msgstr ""
 
-#: personal/supann/class_supannAccount.inc:412
-msgid "Personal profile"
+#: personal/supann/class_supannAccount.inc:404
+msgid "Personnal profile"
 msgstr ""
 
-#: personal/supann/class_supannAccount.inc:415
+#: personal/supann/class_supannAccount.inc:407
 msgid "Personal ID"
 msgstr ""
 
-#: personal/supann/class_supannAccount.inc:415
+#: personal/supann/class_supannAccount.inc:407
 msgid "supannEmpId"
 msgstr ""
 
-#: personal/supann/class_supannAccount.inc:419
+#: personal/supann/class_supannAccount.inc:411
 msgid "Personal corps"
 msgstr ""
 
-#: personal/supann/class_supannAccount.inc:419
+#: personal/supann/class_supannAccount.inc:411
 msgid "supannEmpCorps"
 msgstr ""
 
-#: personal/supann/class_supannAccount.inc:424
-msgid "Activity"
+#: personal/supann/class_supannAccount.inc:416
+msgid "Activite"
 msgstr ""
 
-#: personal/supann/class_supannAccount.inc:424
+#: personal/supann/class_supannAccount.inc:416
 msgid "supannActivite"
 msgstr ""
 
-#: personal/supann/class_supannAccount.inc:431
+#: personal/supann/class_supannAccount.inc:423
 msgid "Roles"
 msgstr ""
 
-#: personal/supann/class_supannAccount.inc:438
+#: personal/supann/class_supannAccount.inc:430
 msgid "supannRoleEntite"
 msgstr ""
 
-#: personal/supann/class_supannAccount.inc:442
+#: personal/supann/class_supannAccount.inc:434
 msgid "Generic role"
 msgstr ""
 
-#: personal/supann/class_supannAccount.inc:442
+#: personal/supann/class_supannAccount.inc:434
 msgid "supannRoleGenerique"
 msgstr ""
 
-#: personal/supann/class_supannAccount.inc:446
-msgid "Entity assignment type"
-msgstr ""
-
 #: config/supann/class_supannConfig.inc:28
 msgid "SUPANN configuration"
 msgstr ""
diff --git a/supann/locale/zh/fusiondirectory.po b/supann/locale/zh/fusiondirectory.po
index 2ad87fffd179f02746267794e10c4eb01173736c..018ea50ae2233ccc173e91ffb6f37d213d88a5f1 100644
--- a/supann/locale/zh/fusiondirectory.po
+++ b/supann/locale/zh/fusiondirectory.po
@@ -5,12 +5,12 @@
 # Translators:
 msgid ""
 msgstr ""
-"Project-Id-Version: FusionDirectory-108\n"
+"Project-Id-Version: FusionDirectory-109\n"
 "Report-Msgid-Bugs-To: documentation@lists.fusiondirectory.org\n"
-"POT-Creation-Date: 2015-03-31 11:49+0200\n"
-"PO-Revision-Date: 2015-03-31 10:46+0000\n"
+"POT-Creation-Date: 2014-12-15 17:47+0100\n"
+"PO-Revision-Date: 2015-02-25 16:04+0000\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>\n"
-"Language-Team: Chinese (http://www.transifex.com/projects/p/FusionDirectory-108/language/zh/)\n"
+"Language-Team: Chinese (http://www.transifex.com/projects/p/FusionDirectory-109/language/zh/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -27,15 +27,16 @@ msgstr ""
 
 #: admin/supannStructures/class_entite.inc:31
 #: admin/supannStructures/class_entite.inc:52
-msgid "Entity"
+#: personal/supann/class_supannAccount.inc:442
+msgid "Entite"
 msgstr ""
 
 #: admin/supannStructures/class_entite.inc:32
-msgid "SUPANN Entity Settings"
+msgid "SUPANN Entite Settings"
 msgstr ""
 
 #: admin/supannStructures/class_entite.inc:35
-msgid "SUPANN Entity"
+msgid "SUPANN Entite"
 msgstr ""
 
 #: admin/supannStructures/class_entite.inc:55
@@ -44,7 +45,7 @@ msgid "Name"
 msgstr "åç§°"
 
 #: admin/supannStructures/class_entite.inc:55
-msgid "The name to write in the ou attribute for this entity"
+msgid "The name to write in the ou attribute for this entite"
 msgstr ""
 
 #: admin/supannStructures/class_entite.inc:61
@@ -57,7 +58,7 @@ msgid "Telephone"
 msgstr "ç”µè¯"
 
 #: admin/supannStructures/class_entite.inc:64
-msgid "Phone number for this entity"
+msgid "Phone number for this entite"
 msgstr ""
 
 #: admin/supannStructures/class_entite.inc:68
@@ -66,7 +67,7 @@ msgid "Fax"
 msgstr "ä¼ çœŸ"
 
 #: admin/supannStructures/class_entite.inc:68
-msgid "Fax number for this entity"
+msgid "Fax number for this entite"
 msgstr ""
 
 #: admin/supannStructures/class_entite.inc:72
@@ -74,7 +75,7 @@ msgid "Postal address"
 msgstr "åœ°å€"
 
 #: admin/supannStructures/class_entite.inc:72
-msgid "Postal address of this entity"
+msgid "Postal address of this entite"
 msgstr ""
 
 #: admin/supannStructures/class_entite.inc:76
@@ -83,7 +84,7 @@ msgid "Description"
 msgstr "æè¿°"
 
 #: admin/supannStructures/class_entite.inc:76
-msgid "Short description of this entity"
+msgid "Short description of this entite"
 msgstr ""
 
 #: admin/supannStructures/class_entite.inc:82
@@ -91,27 +92,28 @@ msgid "SUPANN informations"
 msgstr ""
 
 #: admin/supannStructures/class_entite.inc:85
-msgid "Entity type"
+#: personal/supann/class_supannAccount.inc:438
+msgid "Entite type"
 msgstr ""
 
 #: admin/supannStructures/class_entite.inc:85
-msgid "The best SUPANN type that fits this entity"
+msgid "The best SUPANN type that fits this entite"
 msgstr ""
 
 #: admin/supannStructures/class_entite.inc:89
-msgid "Entity code"
+msgid "Entite code"
 msgstr ""
 
 #: admin/supannStructures/class_entite.inc:89
-msgid "The SUPANN code of this entity"
+msgid "The SUPANN code of this entite"
 msgstr ""
 
 #: admin/supannStructures/class_entite.inc:94
-msgid "Parent entity"
+msgid "Parent entite"
 msgstr ""
 
 #: admin/supannStructures/class_entite.inc:94
-msgid "The parent entity of this entity"
+msgid "The parent entite of this entite"
 msgstr ""
 
 #: admin/supannStructures/class_entite.inc:98
@@ -119,21 +121,21 @@ msgid "Reference ID"
 msgstr ""
 
 #: admin/supannStructures/class_entite.inc:98
-msgid "SUPANN reference ID of this entity"
+msgid "SUPANN reference ID of this entite"
 msgstr ""
 
 #: admin/supannStructures/class_etablissement.inc:31
-#: personal/supann/class_supannAccount.inc:324
-#: personal/supann/class_supannAccount.inc:363
-msgid "Establishment"
+#: personal/supann/class_supannAccount.inc:316
+#: personal/supann/class_supannAccount.inc:355
+msgid "Etablissement"
 msgstr ""
 
 #: admin/supannStructures/class_etablissement.inc:32
-msgid "SUPANN Establishment Settings"
+msgid "SUPANN Etablissement Settings"
 msgstr ""
 
 #: admin/supannStructures/class_etablissement.inc:35
-msgid "SUPANN Establishment"
+msgid "SUPANN Etablissement"
 msgstr ""
 
 #: admin/supannStructures/class_etablissement.inc:52
@@ -141,19 +143,19 @@ msgid "Properties"
 msgstr "å±žæ€§"
 
 #: admin/supannStructures/class_etablissement.inc:55
-msgid "Root Establishment"
+msgid "Root etablissement"
 msgstr ""
 
 #: admin/supannStructures/class_etablissement.inc:55
-msgid "Set this Establishment as the root one"
+msgid "Set this etablissement as the root one"
 msgstr ""
 
 #: admin/supannStructures/class_etablissement.inc:59
-msgid "The name to write in the o attribute for this Establishment"
+msgid "The name to write in the o attribute for this etablissement"
 msgstr ""
 
 #: admin/supannStructures/class_etablissement.inc:63
-msgid "A short description of this Establishment"
+msgid "A short description of this etablissement"
 msgstr ""
 
 #: admin/supannStructures/class_etablissement.inc:69
@@ -162,7 +164,7 @@ msgid "Location"
 msgstr "ä½ç½®"
 
 #: admin/supannStructures/class_etablissement.inc:72
-msgid "Usually the city where this Establishment is"
+msgid "Usually the city in which is this etablissement"
 msgstr ""
 
 #: admin/supannStructures/class_etablissement.inc:76
@@ -170,15 +172,15 @@ msgid "Address"
 msgstr "ä½å€"
 
 #: admin/supannStructures/class_etablissement.inc:76
-msgid "The postal address of this Establishment"
+msgid "The postal address of this etablissement"
 msgstr ""
 
 #: admin/supannStructures/class_etablissement.inc:80
-msgid "Phone number for this Establishment"
+msgid "Phone number for this etablissement"
 msgstr ""
 
 #: admin/supannStructures/class_etablissement.inc:84
-msgid "Fax number for this Establishment"
+msgid "Fax number for this etablissement"
 msgstr ""
 
 #: admin/supannStructures/class_etablissement.inc:90
@@ -186,11 +188,11 @@ msgid "SUPANN properties"
 msgstr ""
 
 #: admin/supannStructures/class_etablissement.inc:93
-msgid "Establishment code"
+msgid "Etablissement code"
 msgstr ""
 
 #: admin/supannStructures/class_etablissement.inc:93
-msgid "The code of this Establishment (must have a prefix between {})"
+msgid "The code of this etablissement (must have a prefix between {})"
 msgstr ""
 
 #: admin/supannStructures/class_etablissement.inc:98
@@ -198,7 +200,7 @@ msgid "SUPANN code"
 msgstr ""
 
 #: admin/supannStructures/class_etablissement.inc:98
-msgid "The SUPANN code for this Establishment"
+msgid "The SUPANN code for this etablissement"
 msgstr ""
 
 #: admin/supannStructures/class_etablissement.inc:103
@@ -206,7 +208,7 @@ msgid "Legal name"
 msgstr ""
 
 #: admin/supannStructures/class_etablissement.inc:103
-msgid "The legal name of this Establishment"
+msgid "The legal name of this etablissement"
 msgstr ""
 
 #: admin/supannStructures/class_etablissement.inc:107
@@ -214,7 +216,7 @@ msgid "Home page URI"
 msgstr ""
 
 #: admin/supannStructures/class_etablissement.inc:107
-msgid "The URI of this Establishment website home page"
+msgid "The URI of this etablissement website home page"
 msgstr ""
 
 #: admin/supannStructures/class_etablissement.inc:111
@@ -222,7 +224,7 @@ msgid "Institution URI"
 msgstr ""
 
 #: admin/supannStructures/class_etablissement.inc:111
-msgid "The URI of this Establishment institution website"
+msgid "The URI of this etablissement institution website"
 msgstr ""
 
 #: admin/supannStructures/class_etablissement.inc:115
@@ -230,12 +232,12 @@ msgid "White pages URI"
 msgstr ""
 
 #: admin/supannStructures/class_etablissement.inc:115
-msgid "The URI of this Establishment white pages"
+msgid "The URI of this etablissement white pages"
 msgstr ""
 
 #: admin/supannStructures/class_etablissement.inc:148
-#: admin/supannStructures/class_etablissement.inc:201
-#: admin/supannStructures/class_etablissement.inc:219
+#: admin/supannStructures/class_etablissement.inc:198
+#: admin/supannStructures/class_etablissement.inc:216
 msgid "LDAP error"
 msgstr "LDAP é”™è¯¯"
 
@@ -355,256 +357,243 @@ msgstr ""
 msgid "eduPersonNickName - Can contain a nick name for this user"
 msgstr ""
 
-#: personal/supann/class_supannAccount.inc:253
-msgid "Ref ids"
-msgstr ""
-
-#: personal/supann/class_supannAccount.inc:253
-msgid "supannRefId - IDs/links for this user on other systems"
-msgstr ""
-
-#: personal/supann/class_supannAccount.inc:262
+#: personal/supann/class_supannAccount.inc:254
 msgid "Contact"
 msgstr "è”ç³»"
 
-#: personal/supann/class_supannAccount.inc:266
+#: personal/supann/class_supannAccount.inc:258
 msgid "Other phone numbers"
 msgstr ""
 
-#: personal/supann/class_supannAccount.inc:266
+#: personal/supann/class_supannAccount.inc:258
 msgid "supannAutreTelephone - Other phone numbers for this user"
 msgstr ""
 
-#: personal/supann/class_supannAccount.inc:272
+#: personal/supann/class_supannAccount.inc:264
 msgid "Other mail addresses"
 msgstr ""
 
-#: personal/supann/class_supannAccount.inc:272
+#: personal/supann/class_supannAccount.inc:264
 msgid ""
 "supannAutreMail - Other mail addresses for this user. Each must be unique"
 msgstr ""
 
-#: personal/supann/class_supannAccount.inc:278
+#: personal/supann/class_supannAccount.inc:270
 msgid "Personal mail addresses"
 msgstr ""
 
-#: personal/supann/class_supannAccount.inc:278
+#: personal/supann/class_supannAccount.inc:270
 msgid "supannMailPerso - Personal mail addresses for this user"
 msgstr ""
 
-#: personal/supann/class_supannAccount.inc:283
-msgid "red List"
+#: personal/supann/class_supannAccount.inc:275
+msgid "Liste rouge"
 msgstr ""
 
-#: personal/supann/class_supannAccount.inc:283
+#: personal/supann/class_supannAccount.inc:275
 msgid "supannListeRouge - Should this person be on the red list"
 msgstr ""
 
-#: personal/supann/class_supannAccount.inc:289
+#: personal/supann/class_supannAccount.inc:281
 msgid "Affectation"
 msgstr ""
 
-#: personal/supann/class_supannAccount.inc:292
-msgid "Entity primary assignment"
+#: personal/supann/class_supannAccount.inc:284
+msgid "Entite affectation principale"
 msgstr ""
 
-#: personal/supann/class_supannAccount.inc:292
+#: personal/supann/class_supannAccount.inc:284
 msgid "supannEntiteAffectationPrincipale"
 msgstr ""
 
-#: personal/supann/class_supannAccount.inc:297
-#: personal/supann/class_supannAccount.inc:388
-#: personal/supann/class_supannAccount.inc:450
-msgid "Entity assignment"
+#: personal/supann/class_supannAccount.inc:289
+#: personal/supann/class_supannAccount.inc:380
+msgid "Entite affectation"
 msgstr ""
 
-#: personal/supann/class_supannAccount.inc:297
-#: personal/supann/class_supannAccount.inc:450
+#: personal/supann/class_supannAccount.inc:289
+#: personal/supann/class_supannAccount.inc:442
 msgid "supannEntiteAffectation"
 msgstr ""
 
-#: personal/supann/class_supannAccount.inc:303
-msgid "Entity type assignment"
+#: personal/supann/class_supannAccount.inc:295
+msgid "Type entite affectation"
 msgstr ""
 
-#: personal/supann/class_supannAccount.inc:303
-#: personal/supann/class_supannAccount.inc:446
+#: personal/supann/class_supannAccount.inc:295
+#: personal/supann/class_supannAccount.inc:438
 msgid "supannTypeEntiteAffectation"
 msgstr ""
 
-#: personal/supann/class_supannAccount.inc:310
+#: personal/supann/class_supannAccount.inc:302
 msgid "Affiliation"
 msgstr ""
 
-#: personal/supann/class_supannAccount.inc:313
+#: personal/supann/class_supannAccount.inc:305
 msgid "Primary affiliation"
 msgstr ""
 
-#: personal/supann/class_supannAccount.inc:313
+#: personal/supann/class_supannAccount.inc:305
 msgid "eduPersonPrimaryAffiliation"
 msgstr ""
 
-#: personal/supann/class_supannAccount.inc:318
+#: personal/supann/class_supannAccount.inc:310
 msgid "Affiliations"
 msgstr ""
 
-#: personal/supann/class_supannAccount.inc:318
+#: personal/supann/class_supannAccount.inc:310
 msgid "eduPersonAffiliation"
 msgstr ""
 
-#: personal/supann/class_supannAccount.inc:324
+#: personal/supann/class_supannAccount.inc:316
 msgid "supannEtablissement"
 msgstr ""
 
-#: personal/supann/class_supannAccount.inc:331
+#: personal/supann/class_supannAccount.inc:323
 msgid "Student profile"
 msgstr ""
 
-#: personal/supann/class_supannAccount.inc:334
+#: personal/supann/class_supannAccount.inc:326
 msgid "INE code"
 msgstr ""
 
-#: personal/supann/class_supannAccount.inc:334
+#: personal/supann/class_supannAccount.inc:326
 msgid "supannCodeINE - INE code of this student"
 msgstr ""
 
-#: personal/supann/class_supannAccount.inc:338
+#: personal/supann/class_supannAccount.inc:330
 msgid "Student ID"
 msgstr ""
 
-#: personal/supann/class_supannAccount.inc:338
+#: personal/supann/class_supannAccount.inc:330
 msgid "supannEtuId - scolarity id"
 msgstr ""
 
-#: personal/supann/class_supannAccount.inc:344
+#: personal/supann/class_supannAccount.inc:336
 msgid "Student subscriptions"
 msgstr ""
 
-#: personal/supann/class_supannAccount.inc:359
+#: personal/supann/class_supannAccount.inc:351
 msgid "supannEtuInscription - Subscriptions for this student"
 msgstr ""
 
-#: personal/supann/class_supannAccount.inc:363
+#: personal/supann/class_supannAccount.inc:355
 msgid ""
 "supannEtablissement - Etablissement in which this subscription was done"
 msgstr ""
 
-#: personal/supann/class_supannAccount.inc:367
+#: personal/supann/class_supannAccount.inc:359
 msgid "Year"
 msgstr ""
 
-#: personal/supann/class_supannAccount.inc:367
+#: personal/supann/class_supannAccount.inc:359
 msgid "supannEtuAnneeInscription - The year this subscription will begin"
 msgstr ""
 
-#: personal/supann/class_supannAccount.inc:372
+#: personal/supann/class_supannAccount.inc:364
 msgid "Subscription type"
 msgstr ""
 
-#: personal/supann/class_supannAccount.inc:372
+#: personal/supann/class_supannAccount.inc:364
 msgid "supannEtuRegimeInscription - The type of this subscription"
 msgstr ""
 
-#: personal/supann/class_supannAccount.inc:376
-msgid "Disciplinary Sector"
+#: personal/supann/class_supannAccount.inc:368
+msgid "Secteur Disciplinaire"
 msgstr ""
 
-#: personal/supann/class_supannAccount.inc:376
+#: personal/supann/class_supannAccount.inc:368
 msgid "supannEtuSecteurDisciplinaire"
 msgstr ""
 
-#: personal/supann/class_supannAccount.inc:380
+#: personal/supann/class_supannAccount.inc:372
 msgid "Diploma type"
 msgstr ""
 
-#: personal/supann/class_supannAccount.inc:380
+#: personal/supann/class_supannAccount.inc:372
 msgid "supannEtuTypeDiplome - Type of diploma"
 msgstr ""
 
-#: personal/supann/class_supannAccount.inc:384
-msgid "Curriculum year "
+#: personal/supann/class_supannAccount.inc:376
+msgid "Cursus annee"
 msgstr ""
 
-#: personal/supann/class_supannAccount.inc:384
+#: personal/supann/class_supannAccount.inc:376
 msgid "supannEtuCursusAnnee"
 msgstr ""
 
-#: personal/supann/class_supannAccount.inc:388
+#: personal/supann/class_supannAccount.inc:380
 msgid "supannEntiteAffectation_affect"
 msgstr ""
 
-#: personal/supann/class_supannAccount.inc:392
+#: personal/supann/class_supannAccount.inc:384
 msgid "Diploma"
 msgstr ""
 
-#: personal/supann/class_supannAccount.inc:392
+#: personal/supann/class_supannAccount.inc:384
 msgid "supannEtuDiplome"
 msgstr ""
 
-#: personal/supann/class_supannAccount.inc:396
+#: personal/supann/class_supannAccount.inc:388
 msgid "Step"
 msgstr ""
 
-#: personal/supann/class_supannAccount.inc:396
+#: personal/supann/class_supannAccount.inc:388
 msgid "supannEtuEtape"
 msgstr ""
 
-#: personal/supann/class_supannAccount.inc:400
+#: personal/supann/class_supannAccount.inc:392
 msgid "educational element"
 msgstr ""
 
-#: personal/supann/class_supannAccount.inc:400
+#: personal/supann/class_supannAccount.inc:392
 msgid "supannEtuElementPedagogique"
 msgstr ""
 
-#: personal/supann/class_supannAccount.inc:412
-msgid "Personal profile"
+#: personal/supann/class_supannAccount.inc:404
+msgid "Personnal profile"
 msgstr ""
 
-#: personal/supann/class_supannAccount.inc:415
+#: personal/supann/class_supannAccount.inc:407
 msgid "Personal ID"
 msgstr ""
 
-#: personal/supann/class_supannAccount.inc:415
+#: personal/supann/class_supannAccount.inc:407
 msgid "supannEmpId"
 msgstr ""
 
-#: personal/supann/class_supannAccount.inc:419
+#: personal/supann/class_supannAccount.inc:411
 msgid "Personal corps"
 msgstr ""
 
-#: personal/supann/class_supannAccount.inc:419
+#: personal/supann/class_supannAccount.inc:411
 msgid "supannEmpCorps"
 msgstr ""
 
-#: personal/supann/class_supannAccount.inc:424
-msgid "Activity"
+#: personal/supann/class_supannAccount.inc:416
+msgid "Activite"
 msgstr ""
 
-#: personal/supann/class_supannAccount.inc:424
+#: personal/supann/class_supannAccount.inc:416
 msgid "supannActivite"
 msgstr ""
 
-#: personal/supann/class_supannAccount.inc:431
+#: personal/supann/class_supannAccount.inc:423
 msgid "Roles"
 msgstr ""
 
-#: personal/supann/class_supannAccount.inc:438
+#: personal/supann/class_supannAccount.inc:430
 msgid "supannRoleEntite"
 msgstr ""
 
-#: personal/supann/class_supannAccount.inc:442
+#: personal/supann/class_supannAccount.inc:434
 msgid "Generic role"
 msgstr ""
 
-#: personal/supann/class_supannAccount.inc:442
+#: personal/supann/class_supannAccount.inc:434
 msgid "supannRoleGenerique"
 msgstr ""
 
-#: personal/supann/class_supannAccount.inc:446
-msgid "Entity assignment type"
-msgstr ""
-
 #: config/supann/class_supannConfig.inc:28
 msgid "SUPANN configuration"
 msgstr ""
diff --git a/sympa/locale/ar/fusiondirectory.po b/sympa/locale/ar/fusiondirectory.po
index 0eae60893f0b48dd65c03b7ea3b36322f92019a1..b389163a92c3597b0360afc6d6b6ac446d6de178 100644
--- a/sympa/locale/ar/fusiondirectory.po
+++ b/sympa/locale/ar/fusiondirectory.po
@@ -5,12 +5,12 @@
 # Translators:
 msgid ""
 msgstr ""
-"Project-Id-Version: FusionDirectory-108\n"
+"Project-Id-Version: FusionDirectory-109\n"
 "Report-Msgid-Bugs-To: documentation@lists.fusiondirectory.org\n"
-"POT-Creation-Date: 2015-03-17 18:47+0100\n"
-"PO-Revision-Date: 2015-02-25 16:02+0000\n"
-"Last-Translator: fusiondirectory <contact@fusiondirectory.org>\n"
-"Language-Team: Arabic (http://www.transifex.com/projects/p/FusionDirectory-108/language/ar/)\n"
+"POT-Creation-Date: 2014-12-15 17:47+0100\n"
+"PO-Revision-Date: 2014-08-28 10:29+0000\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: Arabic (http://www.transifex.com/projects/p/FusionDirectory-109/language/ar/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
diff --git a/sympa/locale/ca/fusiondirectory.po b/sympa/locale/ca/fusiondirectory.po
index aa8cb281f9f6052635cef688267c4d02e7f5b74f..61fb21d5b76ef705e26f950e9ef8b897b7f8c679 100644
--- a/sympa/locale/ca/fusiondirectory.po
+++ b/sympa/locale/ca/fusiondirectory.po
@@ -5,12 +5,12 @@
 # Translators:
 msgid ""
 msgstr ""
-"Project-Id-Version: FusionDirectory-108\n"
+"Project-Id-Version: FusionDirectory-109\n"
 "Report-Msgid-Bugs-To: documentation@lists.fusiondirectory.org\n"
-"POT-Creation-Date: 2015-03-17 18:47+0100\n"
-"PO-Revision-Date: 2015-02-25 16:02+0000\n"
-"Last-Translator: fusiondirectory <contact@fusiondirectory.org>\n"
-"Language-Team: Catalan (http://www.transifex.com/projects/p/FusionDirectory-108/language/ca/)\n"
+"POT-Creation-Date: 2014-12-15 17:47+0100\n"
+"PO-Revision-Date: 2014-08-28 10:29+0000\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: Catalan (http://www.transifex.com/projects/p/FusionDirectory-109/language/ca/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
diff --git a/sympa/locale/cs_CZ/fusiondirectory.po b/sympa/locale/cs_CZ/fusiondirectory.po
index b786b1918ed630ba0fc6a299b2c5d8656dad3768..bd2cd6631d2f1a09233a7e47d32573829409686c 100644
--- a/sympa/locale/cs_CZ/fusiondirectory.po
+++ b/sympa/locale/cs_CZ/fusiondirectory.po
@@ -3,14 +3,15 @@
 # This file is distributed under the same license as the PACKAGE package.
 # 
 # Translators:
+# Pavel Borecki <pavel.borecki@gmail.com>, 2015
 msgid ""
 msgstr ""
-"Project-Id-Version: FusionDirectory-108\n"
+"Project-Id-Version: FusionDirectory-109\n"
 "Report-Msgid-Bugs-To: documentation@lists.fusiondirectory.org\n"
-"POT-Creation-Date: 2015-03-17 18:47+0100\n"
-"PO-Revision-Date: 2015-02-25 16:51+0000\n"
-"Last-Translator: fusiondirectory <contact@fusiondirectory.org>\n"
-"Language-Team: Czech (Czech Republic) (http://www.transifex.com/projects/p/FusionDirectory-108/language/cs_CZ/)\n"
+"POT-Creation-Date: 2014-12-15 17:47+0100\n"
+"PO-Revision-Date: 2015-04-04 09:01+0000\n"
+"Last-Translator: Pavel Borecki <pavel.borecki@gmail.com>\n"
+"Language-Team: Czech (Czech Republic) (http://www.transifex.com/projects/p/FusionDirectory-109/language/cs_CZ/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -20,27 +21,27 @@ msgstr ""
 #: admin/sympa/class_sympaAlias.inc:31 admin/sympa/class_sympaAlias.inc:32
 #: admin/sympa/class_sympaAlias.inc:35 admin/sympa/class_sympaAlias.inc:52
 msgid "Sympa list alias"
-msgstr ""
+msgstr "AlternativnÃ nÃ¡zev seznamu Sympa"
 
 #: admin/sympa/class_sympaAlias.inc:55
 msgid "Name"
-msgstr "nÃ¡zev"
+msgstr "NÃ¡zev"
 
 #: admin/sympa/class_sympaAlias.inc:55
 msgid "Name to identify this alias"
-msgstr ""
+msgstr "NÃ¡zev pro identifikaci tohoto alternativnÃho nÃ¡zvu"
 
 #: admin/sympa/class_sympaAlias.inc:57
 msgid "Description"
-msgstr "popis"
+msgstr "Popis"
 
 #: admin/sympa/class_sympaAlias.inc:57
 msgid "Description of this alias"
-msgstr ""
+msgstr "Popis tohoto alternativnÃho nÃ¡zvu"
 
 #: admin/sympa/class_sympaAlias.inc:62
 msgid "Email address"
-msgstr "e-mailovÃ¡ adresa"
+msgstr "E-mailovÃ¡ adresa"
 
 #: admin/sympa/class_sympaAlias.inc:67
 #: admin/systems/services/sympa/class_serviceSympa.inc:46
@@ -49,7 +50,7 @@ msgstr ""
 
 #: admin/sympa/class_sympaAlias.inc:67
 msgid "Sympa server fot this alias"
-msgstr ""
+msgstr "Sympa server pro tento alternativnÃ nÃ¡zev"
 
 #: admin/systems/services/sympa/class_serviceSympa.inc:31
 #: admin/systems/services/sympa/class_serviceSympa.inc:32
@@ -58,7 +59,7 @@ msgstr ""
 
 #: admin/systems/services/sympa/class_serviceSympa.inc:32
 msgid "Services"
-msgstr "sluÅ¾by"
+msgstr "SluÅ¾by"
 
 #: admin/systems/services/sympa/class_serviceSympa.inc:49
 msgid "URL"
@@ -66,20 +67,20 @@ msgstr "URL"
 
 #: admin/systems/services/sympa/class_serviceSympa.inc:49
 msgid "URL to access the sympa server"
-msgstr ""
+msgstr "URL adresa pro pÅ™Ãstup k sympa serveru"
 
 #: admin/systems/services/sympa/class_serviceSympa.inc:53
 msgid "User"
-msgstr "uÅ¾ivatel"
+msgstr "UÅ¾ivatel"
 
 #: admin/systems/services/sympa/class_serviceSympa.inc:53
 msgid "User to access sympa server SOAP API."
-msgstr ""
+msgstr "UÅ¾ivatelskÃ½ ÃºÄet, kterÃ½m pÅ™istupovat SOAP API rozhranÃ na serveru"
 
 #: admin/systems/services/sympa/class_serviceSympa.inc:57
 msgid "Password"
-msgstr "heslo"
+msgstr "Heslo"
 
 #: admin/systems/services/sympa/class_serviceSympa.inc:57
 msgid "Password to access sympa server SOAP API."
-msgstr ""
+msgstr "Heslo pro pÅ™Ãstup k SOAP API na sympa serveru"
diff --git a/sympa/locale/de/fusiondirectory.po b/sympa/locale/de/fusiondirectory.po
index 7ccb3eccfce04729565ab96046fd58f6e48b10cb..c237aacd008f9e5e4a3f791f0df8d61ab060effe 100644
--- a/sympa/locale/de/fusiondirectory.po
+++ b/sympa/locale/de/fusiondirectory.po
@@ -3,15 +3,14 @@
 # This file is distributed under the same license as the PACKAGE package.
 # 
 # Translators:
-# Maik Wagner <maikwagner@yahoo.com>, 2014
 msgid ""
 msgstr ""
-"Project-Id-Version: FusionDirectory-108\n"
+"Project-Id-Version: FusionDirectory-109\n"
 "Report-Msgid-Bugs-To: documentation@lists.fusiondirectory.org\n"
-"POT-Creation-Date: 2015-03-17 18:47+0100\n"
-"PO-Revision-Date: 2015-02-25 16:51+0000\n"
-"Last-Translator: fusiondirectory <contact@fusiondirectory.org>\n"
-"Language-Team: German (http://www.transifex.com/projects/p/FusionDirectory-108/language/de/)\n"
+"POT-Creation-Date: 2014-12-15 17:47+0100\n"
+"PO-Revision-Date: 2014-08-28 10:29+0000\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: German (http://www.transifex.com/projects/p/FusionDirectory-109/language/de/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
diff --git a/sympa/locale/el_GR/fusiondirectory.po b/sympa/locale/el_GR/fusiondirectory.po
new file mode 100644
index 0000000000000000000000000000000000000000..1693f919b6e1d3944e6cfaefa753bef49a81d10d
--- /dev/null
+++ b/sympa/locale/el_GR/fusiondirectory.po
@@ -0,0 +1,85 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR FusionDirectory Project
+# This file is distributed under the same license as the PACKAGE package.
+# 
+# Translators:
+msgid ""
+msgstr ""
+"Project-Id-Version: FusionDirectory-109\n"
+"Report-Msgid-Bugs-To: documentation@lists.fusiondirectory.org\n"
+"POT-Creation-Date: 2014-12-15 17:47+0100\n"
+"PO-Revision-Date: 2015-05-30 11:45+0000\n"
+"Last-Translator: Benoit Mortier <benoit.mortier@opensides.be>\n"
+"Language-Team: Greek (Greece) (http://www.transifex.com/projects/p/FusionDirectory-109/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/sympa/class_sympaAlias.inc:31 admin/sympa/class_sympaAlias.inc:32
+#: admin/sympa/class_sympaAlias.inc:35 admin/sympa/class_sympaAlias.inc:52
+msgid "Sympa list alias"
+msgstr ""
+
+#: admin/sympa/class_sympaAlias.inc:55
+msgid "Name"
+msgstr ""
+
+#: admin/sympa/class_sympaAlias.inc:55
+msgid "Name to identify this alias"
+msgstr ""
+
+#: admin/sympa/class_sympaAlias.inc:57
+msgid "Description"
+msgstr ""
+
+#: admin/sympa/class_sympaAlias.inc:57
+msgid "Description of this alias"
+msgstr ""
+
+#: admin/sympa/class_sympaAlias.inc:62
+msgid "Email address"
+msgstr ""
+
+#: admin/sympa/class_sympaAlias.inc:67
+#: admin/systems/services/sympa/class_serviceSympa.inc:46
+msgid "Sympa server"
+msgstr ""
+
+#: admin/sympa/class_sympaAlias.inc:67
+msgid "Sympa server fot this alias"
+msgstr ""
+
+#: admin/systems/services/sympa/class_serviceSympa.inc:31
+#: admin/systems/services/sympa/class_serviceSympa.inc:32
+msgid "Sympa Server"
+msgstr ""
+
+#: admin/systems/services/sympa/class_serviceSympa.inc:32
+msgid "Services"
+msgstr ""
+
+#: admin/systems/services/sympa/class_serviceSympa.inc:49
+msgid "URL"
+msgstr ""
+
+#: admin/systems/services/sympa/class_serviceSympa.inc:49
+msgid "URL to access the sympa server"
+msgstr ""
+
+#: admin/systems/services/sympa/class_serviceSympa.inc:53
+msgid "User"
+msgstr ""
+
+#: admin/systems/services/sympa/class_serviceSympa.inc:53
+msgid "User to access sympa server SOAP API."
+msgstr ""
+
+#: admin/systems/services/sympa/class_serviceSympa.inc:57
+msgid "Password"
+msgstr ""
+
+#: admin/systems/services/sympa/class_serviceSympa.inc:57
+msgid "Password to access sympa server SOAP API."
+msgstr ""
diff --git a/sympa/locale/en/fusiondirectory.po b/sympa/locale/en/fusiondirectory.po
index 9b44e52d656c318e9284ac1a5cab922dc611e9ef..e3610e7ac849ffbe00a84b88e5cc85403cc93602 100644
--- a/sympa/locale/en/fusiondirectory.po
+++ b/sympa/locale/en/fusiondirectory.po
@@ -6,13 +6,13 @@
 #, fuzzy
 msgid ""
 msgstr ""
-"Project-Id-Version: PACKAGE VERSION\n"
-"Report-Msgid-Bugs-To: documentation@lists.fusiondirectory.org\n"
-"POT-Creation-Date: 2015-03-31 11:49+0200\n"
+"Project-Id-Version: FusionDirectory VERSION\n"
+"Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
+"POT-Creation-Date: 2015-05-30 15:30+0200\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
-"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
-"Language-Team: LANGUAGE <LL@li.org>\n"
-"Language: \n"
+"Last-Translator: FusionDirectory project <contact@fusiondirectory.org>\n"
+"Language-Team: English\n"
+"Language: en\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
diff --git a/sympa/locale/es/fusiondirectory.po b/sympa/locale/es/fusiondirectory.po
index 51666c524475e7d2692b9c02ce64ca2855372b36..b0e8d4ce697cb6f33fb8a5194d78f87427be6adf 100644
--- a/sympa/locale/es/fusiondirectory.po
+++ b/sympa/locale/es/fusiondirectory.po
@@ -5,12 +5,12 @@
 # Translators:
 msgid ""
 msgstr ""
-"Project-Id-Version: FusionDirectory-108\n"
+"Project-Id-Version: FusionDirectory-109\n"
 "Report-Msgid-Bugs-To: documentation@lists.fusiondirectory.org\n"
-"POT-Creation-Date: 2015-03-17 18:47+0100\n"
-"PO-Revision-Date: 2015-02-25 16:51+0000\n"
-"Last-Translator: fusiondirectory <contact@fusiondirectory.org>\n"
-"Language-Team: Spanish (http://www.transifex.com/projects/p/FusionDirectory-108/language/es/)\n"
+"POT-Creation-Date: 2014-12-15 17:47+0100\n"
+"PO-Revision-Date: 2014-08-28 10:29+0000\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: Spanish (http://www.transifex.com/projects/p/FusionDirectory-109/language/es/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
diff --git a/sympa/locale/es_VE/fusiondirectory.po b/sympa/locale/es_VE/fusiondirectory.po
index b48e01f242405370856fe770ad9d40b5276cd299..ed14c1eff1e9aeea1cf2aa578da85d1df3acfd2a 100644
--- a/sympa/locale/es_VE/fusiondirectory.po
+++ b/sympa/locale/es_VE/fusiondirectory.po
@@ -5,12 +5,12 @@
 # Translators:
 msgid ""
 msgstr ""
-"Project-Id-Version: FusionDirectory-108\n"
+"Project-Id-Version: FusionDirectory-109\n"
 "Report-Msgid-Bugs-To: documentation@lists.fusiondirectory.org\n"
-"POT-Creation-Date: 2015-03-17 18:47+0100\n"
-"PO-Revision-Date: 2015-02-25 16:51+0000\n"
-"Last-Translator: fusiondirectory <contact@fusiondirectory.org>\n"
-"Language-Team: Spanish (Venezuela) (http://www.transifex.com/projects/p/FusionDirectory-108/language/es_VE/)\n"
+"POT-Creation-Date: 2014-12-15 17:47+0100\n"
+"PO-Revision-Date: 2014-08-28 10:29+0000\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: Spanish (Venezuela) (http://www.transifex.com/projects/p/FusionDirectory-109/language/es_VE/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
diff --git a/sympa/locale/fa_IR/fusiondirectory.po b/sympa/locale/fa_IR/fusiondirectory.po
index a1bdb441c2b4382bb054b38c44b3b35052717eef..88413dff2113b571be124afa828fd92d99bbc5a5 100644
--- a/sympa/locale/fa_IR/fusiondirectory.po
+++ b/sympa/locale/fa_IR/fusiondirectory.po
@@ -5,12 +5,12 @@
 # Translators:
 msgid ""
 msgstr ""
-"Project-Id-Version: FusionDirectory-108\n"
+"Project-Id-Version: FusionDirectory-109\n"
 "Report-Msgid-Bugs-To: documentation@lists.fusiondirectory.org\n"
-"POT-Creation-Date: 2015-03-17 18:47+0100\n"
-"PO-Revision-Date: 2014-08-26 14:14+0000\n"
-"Last-Translator: fusiondirectory <contact@fusiondirectory.org>\n"
-"Language-Team: Persian (Iran) (http://www.transifex.com/projects/p/FusionDirectory-108/language/fa_IR/)\n"
+"POT-Creation-Date: 2014-12-15 17:47+0100\n"
+"PO-Revision-Date: 2014-08-28 10:29+0000\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: Persian (Iran) (http://www.transifex.com/projects/p/FusionDirectory-109/language/fa_IR/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
diff --git a/sympa/locale/fr/fusiondirectory.po b/sympa/locale/fr/fusiondirectory.po
index 76689d52a67545c4e37605a1c707bf5e06791e7c..1cd36c1035b28738b6bbbc7a85dbb2ad097be705 100644
--- a/sympa/locale/fr/fusiondirectory.po
+++ b/sympa/locale/fr/fusiondirectory.po
@@ -3,18 +3,14 @@
 # This file is distributed under the same license as the PACKAGE package.
 # 
 # Translators:
-# MCMic, 2014
-# fusiondirectory <contact@fusiondirectory.org>, 2012
-# fusiondirectory <contact@fusiondirectory.org>, 2012
-# MCMic, 2014
 msgid ""
 msgstr ""
-"Project-Id-Version: FusionDirectory-108\n"
+"Project-Id-Version: FusionDirectory-109\n"
 "Report-Msgid-Bugs-To: documentation@lists.fusiondirectory.org\n"
-"POT-Creation-Date: 2015-03-17 18:47+0100\n"
+"POT-Creation-Date: 2014-12-15 17:47+0100\n"
 "PO-Revision-Date: 2015-02-25 16:51+0000\n"
-"Last-Translator: MCMic\n"
-"Language-Team: French (http://www.transifex.com/projects/p/FusionDirectory-108/language/fr/)\n"
+"Last-Translator: fusiondirectory <contact@fusiondirectory.org>\n"
+"Language-Team: French (http://www.transifex.com/projects/p/FusionDirectory-109/language/fr/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -24,7 +20,7 @@ msgstr ""
 #: admin/sympa/class_sympaAlias.inc:31 admin/sympa/class_sympaAlias.inc:32
 #: admin/sympa/class_sympaAlias.inc:35 admin/sympa/class_sympaAlias.inc:52
 msgid "Sympa list alias"
-msgstr "Alias de liste sympa"
+msgstr "Liste des alias sympa"
 
 #: admin/sympa/class_sympaAlias.inc:55
 msgid "Name"
@@ -32,7 +28,7 @@ msgstr "Nom"
 
 #: admin/sympa/class_sympaAlias.inc:55
 msgid "Name to identify this alias"
-msgstr "Identification de cet alias"
+msgstr "Nom de l'alias"
 
 #: admin/sympa/class_sympaAlias.inc:57
 msgid "Description"
@@ -44,7 +40,7 @@ msgstr "Description de l'alias"
 
 #: admin/sympa/class_sympaAlias.inc:62
 msgid "Email address"
-msgstr "Adresse de courriel"
+msgstr "Adresse de messagerie"
 
 #: admin/sympa/class_sympaAlias.inc:67
 #: admin/systems/services/sympa/class_serviceSympa.inc:46
@@ -62,7 +58,7 @@ msgstr "Serveur Sympa"
 
 #: admin/systems/services/sympa/class_serviceSympa.inc:32
 msgid "Services"
-msgstr "Services"
+msgstr "Service"
 
 #: admin/systems/services/sympa/class_serviceSympa.inc:49
 msgid "URL"
@@ -78,7 +74,7 @@ msgstr "Utilisateur"
 
 #: admin/systems/services/sympa/class_serviceSympa.inc:53
 msgid "User to access sympa server SOAP API."
-msgstr "Utilisateur pour accÃ©der Ã  lâ€™interface SOAP"
+msgstr "Utilisateur pour accÃ©der a l'interface SOAP"
 
 #: admin/systems/services/sympa/class_serviceSympa.inc:57
 msgid "Password"
@@ -86,4 +82,4 @@ msgstr "Mot de passe"
 
 #: admin/systems/services/sympa/class_serviceSympa.inc:57
 msgid "Password to access sympa server SOAP API."
-msgstr "Mot de passe pour accÃ©der Ã  lâ€™interface SOAP"
+msgstr "Mot de passe pour accÃ©der Ã  l'interface SOAP"
diff --git a/sympa/locale/id/fusiondirectory.po b/sympa/locale/id/fusiondirectory.po
index 85b9ab084fcf8cb72e139888a5ce963b5a444ae5..237e6e78606f32bec8f2a89fb9280b3e1f4c4e48 100644
--- a/sympa/locale/id/fusiondirectory.po
+++ b/sympa/locale/id/fusiondirectory.po
@@ -5,12 +5,12 @@
 # Translators:
 msgid ""
 msgstr ""
-"Project-Id-Version: FusionDirectory-108\n"
+"Project-Id-Version: FusionDirectory-109\n"
 "Report-Msgid-Bugs-To: documentation@lists.fusiondirectory.org\n"
-"POT-Creation-Date: 2015-03-17 18:47+0100\n"
-"PO-Revision-Date: 2014-08-26 14:14+0000\n"
-"Last-Translator: fusiondirectory <contact@fusiondirectory.org>\n"
-"Language-Team: Indonesian (http://www.transifex.com/projects/p/FusionDirectory-108/language/id/)\n"
+"POT-Creation-Date: 2014-12-15 17:47+0100\n"
+"PO-Revision-Date: 2014-08-28 10:29+0000\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: Indonesian (http://www.transifex.com/projects/p/FusionDirectory-109/language/id/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
diff --git a/sympa/locale/it/fusiondirectory.po b/sympa/locale/it/fusiondirectory.po
index dab0e7b639010a79661bdeee805789959e7cdae2..3ecba3f823ba293987268ce114959e593a672183 100644
--- a/sympa/locale/it/fusiondirectory.po
+++ b/sympa/locale/it/fusiondirectory.po
@@ -3,16 +3,14 @@
 # This file is distributed under the same license as the PACKAGE package.
 # 
 # Translators:
-# poterealpopolo <giuliano@opensides.be>, 2013
-# poterealpopolo <giuliano@opensides.be>, 2013
 msgid ""
 msgstr ""
-"Project-Id-Version: FusionDirectory-108\n"
+"Project-Id-Version: FusionDirectory-109\n"
 "Report-Msgid-Bugs-To: documentation@lists.fusiondirectory.org\n"
-"POT-Creation-Date: 2015-03-17 18:47+0100\n"
-"PO-Revision-Date: 2015-02-25 16:51+0000\n"
-"Last-Translator: fusiondirectory <contact@fusiondirectory.org>\n"
-"Language-Team: Italian (http://www.transifex.com/projects/p/FusionDirectory-108/language/it/)\n"
+"POT-Creation-Date: 2014-12-15 17:47+0100\n"
+"PO-Revision-Date: 2014-08-28 10:29+0000\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: Italian (http://www.transifex.com/projects/p/FusionDirectory-109/language/it/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
diff --git a/sympa/locale/lv/fusiondirectory.po b/sympa/locale/lv/fusiondirectory.po
index 4068edef62c51646dabff7ad148bc3a1d6aa9c8f..7ef1060d412aff9e3abdf5de09ee8e33f7dcbc5b 100644
--- a/sympa/locale/lv/fusiondirectory.po
+++ b/sympa/locale/lv/fusiondirectory.po
@@ -5,12 +5,12 @@
 # Translators:
 msgid ""
 msgstr ""
-"Project-Id-Version: FusionDirectory-108\n"
+"Project-Id-Version: FusionDirectory-109\n"
 "Report-Msgid-Bugs-To: documentation@lists.fusiondirectory.org\n"
-"POT-Creation-Date: 2015-03-17 18:47+0100\n"
-"PO-Revision-Date: 2014-08-26 14:14+0000\n"
-"Last-Translator: fusiondirectory <contact@fusiondirectory.org>\n"
-"Language-Team: Latvian (http://www.transifex.com/projects/p/FusionDirectory-108/language/lv/)\n"
+"POT-Creation-Date: 2014-12-15 17:47+0100\n"
+"PO-Revision-Date: 2014-08-28 10:29+0000\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: Latvian (http://www.transifex.com/projects/p/FusionDirectory-109/language/lv/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
diff --git a/sympa/locale/nb/fusiondirectory.po b/sympa/locale/nb/fusiondirectory.po
index 667629b1d3f14966bdd207728485c42559c7374c..7310af42b0c16fc56757b6389edb455a7f8bb29c 100644
--- a/sympa/locale/nb/fusiondirectory.po
+++ b/sympa/locale/nb/fusiondirectory.po
@@ -5,12 +5,12 @@
 # Translators:
 msgid ""
 msgstr ""
-"Project-Id-Version: FusionDirectory-108\n"
+"Project-Id-Version: FusionDirectory-109\n"
 "Report-Msgid-Bugs-To: documentation@lists.fusiondirectory.org\n"
-"POT-Creation-Date: 2015-03-17 18:47+0100\n"
-"PO-Revision-Date: 2015-02-25 16:02+0000\n"
-"Last-Translator: fusiondirectory <contact@fusiondirectory.org>\n"
-"Language-Team: Norwegian BokmÃ¥l (http://www.transifex.com/projects/p/FusionDirectory-108/language/nb/)\n"
+"POT-Creation-Date: 2014-12-15 17:47+0100\n"
+"PO-Revision-Date: 2014-08-28 10:29+0000\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: Norwegian BokmÃ¥l (http://www.transifex.com/projects/p/FusionDirectory-109/language/nb/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
diff --git a/sympa/locale/nl/fusiondirectory.po b/sympa/locale/nl/fusiondirectory.po
index 211f89bdf6f50991c3e3bb114ec4dece39e5169c..18ee7cde857bdcc3b86b9886466f526d18b7d9c2 100644
--- a/sympa/locale/nl/fusiondirectory.po
+++ b/sympa/locale/nl/fusiondirectory.po
@@ -3,15 +3,14 @@
 # This file is distributed under the same license as the PACKAGE package.
 # 
 # Translators:
-# Kenny Tordeurs <tordeurskenny@gmail.com>, 2013
 msgid ""
 msgstr ""
-"Project-Id-Version: FusionDirectory-108\n"
+"Project-Id-Version: FusionDirectory-109\n"
 "Report-Msgid-Bugs-To: documentation@lists.fusiondirectory.org\n"
-"POT-Creation-Date: 2015-03-17 18:47+0100\n"
-"PO-Revision-Date: 2015-02-25 16:51+0000\n"
-"Last-Translator: fusiondirectory <contact@fusiondirectory.org>\n"
-"Language-Team: Dutch (http://www.transifex.com/projects/p/FusionDirectory-108/language/nl/)\n"
+"POT-Creation-Date: 2014-12-15 17:47+0100\n"
+"PO-Revision-Date: 2014-08-28 10:29+0000\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: Dutch (http://www.transifex.com/projects/p/FusionDirectory-109/language/nl/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -33,7 +32,7 @@ msgstr "Naam om deze alias te identificeren"
 
 #: admin/sympa/class_sympaAlias.inc:57
 msgid "Description"
-msgstr "Beschrijving"
+msgstr "Omschrijving"
 
 #: admin/sympa/class_sympaAlias.inc:57
 msgid "Description of this alias"
diff --git a/sympa/locale/pl/fusiondirectory.po b/sympa/locale/pl/fusiondirectory.po
index c07d4e296ee40dc7a769dba256cfe52a81d8f4d4..813510855298634eb2cb2ac73032467bc2006086 100644
--- a/sympa/locale/pl/fusiondirectory.po
+++ b/sympa/locale/pl/fusiondirectory.po
@@ -5,12 +5,12 @@
 # Translators:
 msgid ""
 msgstr ""
-"Project-Id-Version: FusionDirectory-108\n"
+"Project-Id-Version: FusionDirectory-109\n"
 "Report-Msgid-Bugs-To: documentation@lists.fusiondirectory.org\n"
-"POT-Creation-Date: 2015-03-17 18:47+0100\n"
-"PO-Revision-Date: 2015-02-25 16:51+0000\n"
-"Last-Translator: fusiondirectory <contact@fusiondirectory.org>\n"
-"Language-Team: Polish (http://www.transifex.com/projects/p/FusionDirectory-108/language/pl/)\n"
+"POT-Creation-Date: 2014-12-15 17:47+0100\n"
+"PO-Revision-Date: 2014-08-28 10:29+0000\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: Polish (http://www.transifex.com/projects/p/FusionDirectory-109/language/pl/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
diff --git a/sympa/locale/pt/fusiondirectory.po b/sympa/locale/pt/fusiondirectory.po
index 5be0476d5da9dcbc764e37ea5fd9f4b3eaed6fb8..6434b0726cbceb3240c95815287919ba6baa9c91 100644
--- a/sympa/locale/pt/fusiondirectory.po
+++ b/sympa/locale/pt/fusiondirectory.po
@@ -5,12 +5,12 @@
 # Translators:
 msgid ""
 msgstr ""
-"Project-Id-Version: FusionDirectory-108\n"
+"Project-Id-Version: FusionDirectory-109\n"
 "Report-Msgid-Bugs-To: documentation@lists.fusiondirectory.org\n"
-"POT-Creation-Date: 2015-03-17 18:47+0100\n"
-"PO-Revision-Date: 2015-02-25 16:02+0000\n"
-"Last-Translator: fusiondirectory <contact@fusiondirectory.org>\n"
-"Language-Team: Portuguese (http://www.transifex.com/projects/p/FusionDirectory-108/language/pt/)\n"
+"POT-Creation-Date: 2014-12-15 17:47+0100\n"
+"PO-Revision-Date: 2014-08-28 10:29+0000\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: Portuguese (http://www.transifex.com/projects/p/FusionDirectory-109/language/pt/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
diff --git a/sympa/locale/pt_BR/fusiondirectory.po b/sympa/locale/pt_BR/fusiondirectory.po
index 787b8f4a78ec014b743f7e8583d9d0d0151cfba0..2c75780b960f08dd36ac2a3dd5b1a8c223a3efe8 100644
--- a/sympa/locale/pt_BR/fusiondirectory.po
+++ b/sympa/locale/pt_BR/fusiondirectory.po
@@ -5,12 +5,12 @@
 # Translators:
 msgid ""
 msgstr ""
-"Project-Id-Version: FusionDirectory-108\n"
+"Project-Id-Version: FusionDirectory-109\n"
 "Report-Msgid-Bugs-To: documentation@lists.fusiondirectory.org\n"
-"POT-Creation-Date: 2015-03-17 18:47+0100\n"
-"PO-Revision-Date: 2015-02-25 16:51+0000\n"
-"Last-Translator: fusiondirectory <contact@fusiondirectory.org>\n"
-"Language-Team: Portuguese (Brazil) (http://www.transifex.com/projects/p/FusionDirectory-108/language/pt_BR/)\n"
+"POT-Creation-Date: 2014-12-15 17:47+0100\n"
+"PO-Revision-Date: 2014-08-28 10:29+0000\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: Portuguese (Brazil) (http://www.transifex.com/projects/p/FusionDirectory-109/language/pt_BR/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
diff --git a/sympa/locale/ru/fusiondirectory.po b/sympa/locale/ru/fusiondirectory.po
index 1f7a2d4de2516621777eb6d145780b3f205605d9..5c3673f5eb5288cf0bd78a28fd0cfdba4195cbad 100644
--- a/sympa/locale/ru/fusiondirectory.po
+++ b/sympa/locale/ru/fusiondirectory.po
@@ -5,17 +5,17 @@
 # Translators:
 msgid ""
 msgstr ""
-"Project-Id-Version: FusionDirectory-108\n"
+"Project-Id-Version: FusionDirectory-109\n"
 "Report-Msgid-Bugs-To: documentation@lists.fusiondirectory.org\n"
-"POT-Creation-Date: 2015-03-17 18:47+0100\n"
-"PO-Revision-Date: 2015-03-06 07:10+0000\n"
-"Last-Translator: fusiondirectory <contact@fusiondirectory.org>\n"
-"Language-Team: Russian (http://www.transifex.com/projects/p/FusionDirectory-108/language/ru/)\n"
+"POT-Creation-Date: 2014-12-15 17:47+0100\n"
+"PO-Revision-Date: 2014-08-28 10:29+0000\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: Russian (http://www.transifex.com/projects/p/FusionDirectory-109/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=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);\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/sympa/class_sympaAlias.inc:31 admin/sympa/class_sympaAlias.inc:32
 #: admin/sympa/class_sympaAlias.inc:35 admin/sympa/class_sympaAlias.inc:52
@@ -28,7 +28,7 @@ msgstr "Ð¤Ð°Ð¼Ð¸Ð»Ð¸Ñ"
 
 #: admin/sympa/class_sympaAlias.inc:55
 msgid "Name to identify this alias"
-msgstr ""
+msgstr "Ð˜Ð¼Ñ Ð¾Ð¿Ñ€ÐµÐ´ÐµÐ»ÑÑŽÑ‰ÐµÐµ ÑÑ‚Ð¾Ñ‚ Ð¿ÑÐµÐ²Ð¾Ð´Ð¾Ð½Ð¸Ð¼"
 
 #: admin/sympa/class_sympaAlias.inc:57
 msgid "Description"
@@ -36,7 +36,7 @@ msgstr "ÐžÐ¿Ð¸ÑÐ°Ð½Ð¸Ðµ"
 
 #: admin/sympa/class_sympaAlias.inc:57
 msgid "Description of this alias"
-msgstr ""
+msgstr "ÐžÐ¿Ð¸ÑÐ°Ð½Ð¸Ðµ Ð¿ÑÐµÐ²Ð¾Ð´Ð¾Ð½Ð¸Ð¼Ð°"
 
 #: admin/sympa/class_sympaAlias.inc:62
 msgid "Email address"
diff --git a/sympa/locale/ru@petr1708/fusiondirectory.po b/sympa/locale/ru@petr1708/fusiondirectory.po
index 1ef5d81a01f205465f4b160a61ba226d914d35f0..29e44f1426cf8067d322a54a97dcb4724d571ab0 100644
--- a/sympa/locale/ru@petr1708/fusiondirectory.po
+++ b/sympa/locale/ru@petr1708/fusiondirectory.po
@@ -5,17 +5,17 @@
 # Translators:
 msgid ""
 msgstr ""
-"Project-Id-Version: FusionDirectory-108\n"
+"Project-Id-Version: FusionDirectory-109\n"
 "Report-Msgid-Bugs-To: documentation@lists.fusiondirectory.org\n"
-"POT-Creation-Date: 2015-03-17 18:47+0100\n"
-"PO-Revision-Date: 2014-08-26 14:14+0000\n"
-"Last-Translator: fusiondirectory <contact@fusiondirectory.org>\n"
-"Language-Team: Russian Petrine orthography (http://www.transifex.com/projects/p/FusionDirectory-108/language/ru@petr1708/)\n"
+"POT-Creation-Date: 2014-12-15 17:47+0100\n"
+"PO-Revision-Date: 2014-08-28 10:29+0000\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: Russian Petrine orthography (http://www.transifex.com/projects/p/FusionDirectory-109/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=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);\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/sympa/class_sympaAlias.inc:31 admin/sympa/class_sympaAlias.inc:32
 #: admin/sympa/class_sympaAlias.inc:35 admin/sympa/class_sympaAlias.inc:52
diff --git a/sympa/locale/sv/fusiondirectory.po b/sympa/locale/sv/fusiondirectory.po
index 18e7ec1a5ce8c44552262daa614ba3aa697bb444..9abae543a63a7e75c390ef13d874f50821b59a84 100644
--- a/sympa/locale/sv/fusiondirectory.po
+++ b/sympa/locale/sv/fusiondirectory.po
@@ -5,12 +5,12 @@
 # Translators:
 msgid ""
 msgstr ""
-"Project-Id-Version: FusionDirectory-108\n"
+"Project-Id-Version: FusionDirectory-109\n"
 "Report-Msgid-Bugs-To: documentation@lists.fusiondirectory.org\n"
-"POT-Creation-Date: 2015-03-17 18:47+0100\n"
-"PO-Revision-Date: 2015-02-25 16:51+0000\n"
-"Last-Translator: fusiondirectory <contact@fusiondirectory.org>\n"
-"Language-Team: Swedish (http://www.transifex.com/projects/p/FusionDirectory-108/language/sv/)\n"
+"POT-Creation-Date: 2014-12-15 17:47+0100\n"
+"PO-Revision-Date: 2014-08-28 10:29+0000\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: Swedish (http://www.transifex.com/projects/p/FusionDirectory-109/language/sv/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
diff --git a/sympa/locale/ug/fusiondirectory.po b/sympa/locale/ug/fusiondirectory.po
index 88cb52a65d8be3ac3ea78d4709f2365a631312c6..38d2d89f5a712b86f1feb4ef12ca9e24ab112b62 100644
--- a/sympa/locale/ug/fusiondirectory.po
+++ b/sympa/locale/ug/fusiondirectory.po
@@ -5,12 +5,12 @@
 # Translators:
 msgid ""
 msgstr ""
-"Project-Id-Version: FusionDirectory-108\n"
+"Project-Id-Version: FusionDirectory-109\n"
 "Report-Msgid-Bugs-To: documentation@lists.fusiondirectory.org\n"
-"POT-Creation-Date: 2015-03-17 18:47+0100\n"
-"PO-Revision-Date: 2014-08-26 14:14+0000\n"
-"Last-Translator: fusiondirectory <contact@fusiondirectory.org>\n"
-"Language-Team: Uighur (http://www.transifex.com/projects/p/FusionDirectory-108/language/ug/)\n"
+"POT-Creation-Date: 2014-12-15 17:47+0100\n"
+"PO-Revision-Date: 2014-08-28 10:29+0000\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: Uighur (http://www.transifex.com/projects/p/FusionDirectory-109/language/ug/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
diff --git a/sympa/locale/vi_VN/fusiondirectory.po b/sympa/locale/vi_VN/fusiondirectory.po
index 42e30f7b1d245855ded354c344fa136332d8376a..a27b7116b0ddf181823a31f68ed01fc25f62b189 100644
--- a/sympa/locale/vi_VN/fusiondirectory.po
+++ b/sympa/locale/vi_VN/fusiondirectory.po
@@ -5,12 +5,12 @@
 # Translators:
 msgid ""
 msgstr ""
-"Project-Id-Version: FusionDirectory-108\n"
+"Project-Id-Version: FusionDirectory-109\n"
 "Report-Msgid-Bugs-To: documentation@lists.fusiondirectory.org\n"
-"POT-Creation-Date: 2015-03-17 18:47+0100\n"
-"PO-Revision-Date: 2015-02-25 16:02+0000\n"
-"Last-Translator: fusiondirectory <contact@fusiondirectory.org>\n"
-"Language-Team: Vietnamese (Viet Nam) (http://www.transifex.com/projects/p/FusionDirectory-108/language/vi_VN/)\n"
+"POT-Creation-Date: 2014-12-15 17:47+0100\n"
+"PO-Revision-Date: 2014-08-28 10:29+0000\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: Vietnamese (Viet Nam) (http://www.transifex.com/projects/p/FusionDirectory-109/language/vi_VN/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
diff --git a/sympa/locale/zh/fusiondirectory.po b/sympa/locale/zh/fusiondirectory.po
index 274b208f2942d7956df08d03168063a73de99d79..fd5b76e621d3d5c5c322c84973228ed1713a948d 100644
--- a/sympa/locale/zh/fusiondirectory.po
+++ b/sympa/locale/zh/fusiondirectory.po
@@ -5,12 +5,12 @@
 # Translators:
 msgid ""
 msgstr ""
-"Project-Id-Version: FusionDirectory-108\n"
+"Project-Id-Version: FusionDirectory-109\n"
 "Report-Msgid-Bugs-To: documentation@lists.fusiondirectory.org\n"
-"POT-Creation-Date: 2015-03-17 18:47+0100\n"
-"PO-Revision-Date: 2015-02-25 16:51+0000\n"
-"Last-Translator: fusiondirectory <contact@fusiondirectory.org>\n"
-"Language-Team: Chinese (http://www.transifex.com/projects/p/FusionDirectory-108/language/zh/)\n"
+"POT-Creation-Date: 2014-12-15 17:47+0100\n"
+"PO-Revision-Date: 2014-08-28 10:29+0000\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: Chinese (http://www.transifex.com/projects/p/FusionDirectory-109/language/zh/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
diff --git a/systems/locale/ar/fusiondirectory.po b/systems/locale/ar/fusiondirectory.po
index 4f8f79381701fb913a089a0d7b16b2863d4086a0..630d20758768f547035fe86b9d9d51f0bfa3b43a 100644
--- a/systems/locale/ar/fusiondirectory.po
+++ b/systems/locale/ar/fusiondirectory.po
@@ -5,12 +5,12 @@
 # Translators:
 msgid ""
 msgstr ""
-"Project-Id-Version: FusionDirectory-108\n"
+"Project-Id-Version: FusionDirectory-109\n"
 "Report-Msgid-Bugs-To: documentation@lists.fusiondirectory.org\n"
-"POT-Creation-Date: 2015-03-31 11:49+0200\n"
-"PO-Revision-Date: 2015-03-31 11:24+0000\n"
+"POT-Creation-Date: 2014-12-15 17:47+0100\n"
+"PO-Revision-Date: 2015-02-25 16:13+0000\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>\n"
-"Language-Team: Arabic (http://www.transifex.com/projects/p/FusionDirectory-108/language/ar/)\n"
+"Language-Team: Arabic (http://www.transifex.com/projects/p/FusionDirectory-109/language/ar/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -26,29 +26,24 @@ msgid "Locked"
 msgstr ""
 
 #: admin/ogroups/goto/class_termgroup.inc:118
-#: admin/systems/class_terminalGeneric.inc:121
+#: admin/systems/class_terminalStartup.inc:145
 msgid "Local swap"
 msgstr ""
 
 #: admin/ogroups/goto/class_termgroup.inc:124
 #: admin/ogroups/goto/class_termgroup.inc:136
-#: admin/systems/class_workstationGeneric.inc:352
-#: admin/systems/class_terminalGeneric.inc:109
-#: admin/systems/class_terminalGeneric.inc:125
+#: admin/systems/class_terminalStartup.inc:133
+#: admin/systems/class_terminalStartup.inc:149
 msgid "inherited"
 msgstr ""
 
 #: admin/ogroups/goto/class_termgroup.inc:220
-#: admin/systems/class_workstationGeneric.inc:72
-#: admin/systems/class_workstationGeneric.inc:443
-#: admin/systems/class_systemManagement.inc:295
-#: admin/systems/class_systemManagement.inc:325
-msgid "Infrastructure service"
+#: admin/systems/class_systemManagement.inc:165
+#: admin/systems/class_systemManagement.inc:186
+msgid "Service infrastructure"
 msgstr ""
 
 #: admin/ogroups/goto/class_termgroup.inc:224
-#: admin/systems/class_workstationGeneric.inc:75
-#: admin/systems/class_workstationGeneric.inc:78
 msgid "Event error"
 msgstr ""
 
@@ -58,12 +53,10 @@ msgid "Event '%s' is not available!"
 msgstr ""
 
 #: admin/ogroups/goto/class_termgroup.inc:274
-#: admin/systems/class_workstationGeneric.inc:112
 msgid "Switch off"
 msgstr ""
 
 #: admin/ogroups/goto/class_termgroup.inc:274
-#: admin/systems/class_workstationGeneric.inc:113
 msgid "Reboot"
 msgstr "Ø¥Ø¹Ø§Ø¯Ø© ØªØ´ØºÙŠÙ„"
 
@@ -84,7 +77,6 @@ msgid "Reinstall"
 msgstr "Ø¥Ø¹Ø§Ø¯Ø© Ø¥Ø¹Ø¯Ø§Ø¯"
 
 #: admin/ogroups/goto/class_termgroup.inc:279
-#: admin/systems/class_workstationGeneric.inc:108
 msgid "Memory test"
 msgstr ""
 
@@ -93,21 +85,18 @@ msgid "System analysis"
 msgstr ""
 
 #: admin/ogroups/goto/class_termgroup.inc:386
-#: admin/systems/class_printGeneric.inc:670
-#: admin/systems/class_printGeneric.inc:970
-#: admin/systems/class_systemManagement.inc:816
 #: admin/systems/services/class_goService.inc:123
 #: admin/systems/services/class_goService.inc:151
 #: admin/systems/services/class_goService.inc:187
-#: admin/systems/class_networkSettings.inc:478
-#: admin/systems/class_networkSettings.inc:491
-#: admin/systems/class_networkSettings.inc:757
-#: admin/systems/class_networkSettings.inc:816
-#: admin/systems/class_networkSettings.inc:835
-#: admin/systems/class_networkSettings.inc:852
-#: admin/systems/class_networkSettings.inc:861
-#: admin/systems/class_networkSettings.inc:879
-#: admin/systems/class_networkSettings.inc:951
+#: admin/systems/class_networkSettings.inc:470
+#: admin/systems/class_networkSettings.inc:483
+#: admin/systems/class_networkSettings.inc:749
+#: admin/systems/class_networkSettings.inc:808
+#: admin/systems/class_networkSettings.inc:827
+#: admin/systems/class_networkSettings.inc:844
+#: admin/systems/class_networkSettings.inc:853
+#: admin/systems/class_networkSettings.inc:871
+#: admin/systems/class_networkSettings.inc:943
 msgid "LDAP error"
 msgstr ""
 
@@ -119,195 +108,125 @@ msgstr "Ù†Ø¸Ø§Ù…"
 msgid "System group"
 msgstr ""
 
-#: admin/ogroups/goto/class_termgroup.inc:401
-#: admin/ogroups/goto/termgroup.tpl.c:17
+#: admin/ogroups/goto/class_termgroup.inc:402
 msgid "Mode"
 msgstr ""
 
-#: admin/ogroups/goto/class_termgroup.inc:402
-#: admin/systems/class_workstationGeneric.inc:189
-#: admin/ogroups/goto/termgroup.tpl.c:23
+#: admin/ogroups/goto/class_termgroup.inc:403
+#: admin/systems/class_systemServers.inc:35
 msgid "Syslog server"
 msgstr ""
 
-#: admin/ogroups/goto/class_termgroup.inc:403
+#: admin/ogroups/goto/class_termgroup.inc:404
 msgid "Action flag"
 msgstr ""
 
-#: admin/ogroups/goto/class_termgroup.inc:404
+#: admin/ogroups/goto/class_termgroup.inc:405
 msgid "Ntp server"
 msgstr ""
 
-#: admin/ogroups/goto/class_termgroup.inc:405
-#: admin/systems/class_terminalGeneric.inc:41
-#: admin/ogroups/goto/termgroup.tpl.c:29
+#: admin/ogroups/goto/class_termgroup.inc:406
+#: admin/systems/class_terminalStartup.inc:65
 msgid "Root server"
 msgstr ""
 
-#: admin/ogroups/goto/class_termgroup.inc:406
-#: admin/systems/class_terminalGeneric.inc:47
-#: admin/ogroups/goto/termgroup.tpl.c:35
+#: admin/ogroups/goto/class_termgroup.inc:407
+#: admin/systems/class_terminalStartup.inc:69
 msgid "Swap server"
 msgstr ""
 
-#: admin/systems/class_terminalStartup.inc:63
+#: admin/systems/class_terminalStartup.inc:62
 msgid "Startup parameters"
 msgstr ""
 
-#: admin/systems/class_terminalStartup.inc:66
+#: admin/systems/class_terminalStartup.inc:65
+msgid "The root server the terminal should be using"
+msgstr ""
+
+#: admin/systems/class_terminalStartup.inc:69
+msgid "The swap server the terminal should be using"
+msgstr ""
+
+#: admin/systems/class_terminalStartup.inc:73
 msgid "Boot kernel"
 msgstr ""
 
-#: admin/systems/class_terminalStartup.inc:66
+#: admin/systems/class_terminalStartup.inc:73
 msgid "Linux kernel to be installed and booted"
 msgstr ""
 
-#: admin/systems/class_terminalStartup.inc:70
+#: admin/systems/class_terminalStartup.inc:77
 msgid "Boot kernel parameters"
 msgstr ""
 
-#: admin/systems/class_terminalStartup.inc:70
+#: admin/systems/class_terminalStartup.inc:77
 msgid "Linux kernel parameters to be ran"
 msgstr ""
 
-#: admin/systems/class_terminalStartup.inc:82
-msgid "Startup"
-msgstr "Ø§Ù„Ø¨Ø¯Ø§ÙŠØ©"
-
 #: admin/systems/class_terminalStartup.inc:83
-msgid "Terminal startup"
-msgstr ""
-
-#: admin/systems/system-list.xml:10
-msgid "List of systems"
-msgstr "Ù‚Ø§Ø¦Ù…Ø© Ø§Ù„Ø£Ù†Ø¸Ù…Ø©"
-
-#: admin/systems/system-list.xml:14
-msgid "New workstation"
-msgstr ""
-
-#: admin/systems/system-list.xml:22
-msgid "Locked server"
-msgstr ""
-
-#: admin/systems/system-list.xml:30
-msgid "Locked workstation"
-msgstr ""
-
-#: admin/systems/system-list.xml:38
-msgid "Locked terminal"
-msgstr ""
-
-#: admin/systems/system-list.xml:47
-msgid "New terminal"
-msgstr ""
-
-#: admin/systems/system-list.xml:55
-msgid "New device"
+msgid "Remote desktop"
 msgstr ""
 
-#: admin/systems/system-list.xml:63
-msgid "Workstation template"
+#: admin/systems/class_terminalStartup.inc:87
+msgid "Connect method"
 msgstr ""
 
-#: admin/systems/system-list.xml:71
-msgid "Terminal template"
+#: admin/systems/class_terminalStartup.inc:91
+msgid "XDMCP"
 msgstr ""
 
-#: admin/systems/system-list.xml:79
-msgid "Winstation"
+#: admin/systems/class_terminalStartup.inc:91
+msgid "LDM"
 msgstr ""
 
-#: admin/systems/system-list.xml:87 admin/systems/system-list.xml:234
-#: admin/systems/class_systemImport.inc:169
-#: admin/systems/class_serverGeneric.inc:46
-#: admin/systems/class_serverGeneric.inc:51
-#: admin/systems/class_serverGeneric.inc:52
-#: admin/systems/class_SelectDeviceType.inc:58
-msgid "Server"
-msgstr "Ø®Ø§Ø¯Ù…"
-
-#: admin/systems/system-list.xml:95 admin/systems/system-list.xml:242
-#: admin/systems/class_workstationGeneric.inc:458
-#: admin/systems/class_workstationGeneric.inc:463
-#: admin/systems/class_workstationGeneric.inc:464
-#: admin/systems/class_SelectDeviceType.inc:58
-msgid "Workstation"
+#: admin/systems/class_terminalStartup.inc:91
+msgid "Shell"
 msgstr ""
 
-#: admin/systems/system-list.xml:103 admin/systems/system-list.xml:250
-#: admin/systems/class_terminalGeneric.inc:81
-#: admin/systems/class_terminalGeneric.inc:86
-#: admin/systems/class_terminalGeneric.inc:87
-#: admin/systems/class_SelectDeviceType.inc:58
-msgid "Terminal"
+#: admin/systems/class_terminalStartup.inc:91
+msgid "Telnet"
 msgstr ""
 
-#: admin/systems/system-list.xml:111 admin/systems/class_printGeneric.inc:1005
-#: admin/systems/class_printGeneric.inc:1011
-#: admin/systems/class_printGeneric.inc:1012
-msgid "Printer"
-msgstr "Ø·Ø§Ø¨Ø¹Ø©"
-
-#: admin/systems/system-list.xml:119 admin/systems/system-list.xml:274
-#: admin/systems/class_mobilePhoneGeneric.inc:74
-#: admin/systems/phoneSelect/phoneSelect-list.xml:14
-msgid "Phone"
-msgstr "Ø§Ù„Ù‡Ø§ØªÙ"
-
-#: admin/systems/system-list.xml:127
-#: admin/systems/class_mobilePhoneGeneric.inc:36
-#: admin/systems/class_mobilePhoneGeneric.inc:41
-#: admin/systems/class_mobilePhoneGeneric.inc:42
-#: admin/systems/phoneSelect/phoneSelect-list.xml:22
-msgid "Mobile phone"
+#: admin/systems/class_terminalStartup.inc:91
+msgid "Windows RDP"
 msgstr ""
 
-#: admin/systems/system-list.xml:135
-#: admin/systems/class_componentGeneric.inc:36
-msgid "Component"
+#: admin/systems/class_terminalStartup.inc:95
+msgid "Terminal server"
 msgstr ""
 
-#: admin/systems/system-list.xml:143 admin/systems/system-list.xml:298
-msgid "IPMI"
-msgstr ""
+#: admin/systems/system-list.xml:10
+msgid "List of systems"
+msgstr "Ù‚Ø§Ø¦Ù…Ø© Ø§Ù„Ø£Ù†Ø¸Ù…Ø©"
 
-#: admin/systems/system-list.xml:169
-#: admin/systems/class_workstationGeneric.inc:154
-#: admin/systems/class_printGeneric.inc:752
-#: admin/systems/class_printGeneric.inc:762
-#: admin/systems/class_printGeneric.inc:781
-#: admin/systems/class_printGeneric.inc:1022
-#: admin/systems/class_componentGeneric.inc:64
-#: admin/systems/class_mobilePhoneGeneric.inc:63
-#: admin/systems/phoneSelect/phoneSelect-list.xml:48
+#: admin/systems/system-list.xml:31
+#: admin/systems/class_workstationGeneric.inc:46
+#: admin/systems/class_printGeneric.inc:60
+#: admin/systems/class_componentGeneric.inc:58
+#: admin/systems/class_mobilePhoneGeneric.inc:60
 #: admin/systems/services/shares/class_serviceShare.inc:52
-#: admin/systems/system-filter.tpl.c:32
-#: admin/systems/phoneSelect/phoneSelect-filter.tpl.c:11
 msgid "Name"
 msgstr "Ø§Ù„Ø¥Ø³Ù…"
 
-#: admin/systems/system-list.xml:177
-#: admin/systems/phoneSelect/phoneSelect-list.xml:63
+#: admin/systems/system-list.xml:39
 msgid "IP"
 msgstr ""
 
-#: admin/systems/system-list.xml:185
+#: admin/systems/system-list.xml:47
 msgid "MAC"
 msgstr ""
 
-#: admin/systems/system-list.xml:193
-#: admin/systems/class_workstationGeneric.inc:160
-#: admin/systems/class_printGeneric.inc:1024
-#: admin/systems/class_componentGeneric.inc:68
-#: admin/systems/class_mobilePhoneGeneric.inc:67
+#: admin/systems/system-list.xml:55
+#: admin/systems/class_workstationGeneric.inc:51
+#: admin/systems/class_printGeneric.inc:64
+#: admin/systems/class_componentGeneric.inc:62
+#: admin/systems/class_mobilePhoneGeneric.inc:64
 #: admin/systems/serverService-list.xml:35
 #: admin/systems/services/shares/class_serviceShare.inc:56
-#: admin/systems/printer.tpl.c:8 admin/systems/printer.tpl.c:17
 msgid "Description"
 msgstr "Ø§Ù„ÙˆØµÙ"
 
-#: admin/systems/system-list.xml:201 admin/systems/class_serverService.inc:57
+#: admin/systems/system-list.xml:63 admin/systems/class_serverService.inc:57
 #: admin/systems/services/terminal/class_serviceTerminal.inc:30
 #: admin/systems/services/cups/class_serviceCUPS.inc:85
 #: admin/systems/services/shares/class_serviceShare.inc:31
@@ -316,378 +235,186 @@ msgstr "Ø§Ù„ÙˆØµÙ"
 msgid "Services"
 msgstr "Ø®Ø¯Ù…Ø§Øª"
 
-#: admin/systems/system-list.xml:209
+#: admin/systems/system-list.xml:71
 msgid "Release"
 msgstr ""
 
-#: admin/systems/system-list.xml:217 admin/systems/serverService-list.xml:43
-#: admin/systems/phoneSelect/phoneSelect-list.xml:70
+#: admin/systems/system-list.xml:79 admin/systems/serverService-list.xml:43
 msgid "Actions"
 msgstr ""
 
-#: admin/systems/system-list.xml:228 admin/systems/serverService-list.xml:54
+#: admin/systems/system-list.xml:90 admin/systems/serverService-list.xml:54
 msgid "Create"
 msgstr ""
 
-#: admin/systems/system-list.xml:258
-msgid "winStation"
-msgstr ""
-
-#: admin/systems/system-list.xml:266
-msgid "Network printer"
-msgstr ""
-
-#: admin/systems/system-list.xml:282
-#: admin/systems/class_componentGeneric.inc:41
-#: admin/systems/class_componentGeneric.inc:42
-msgid "Network device"
-msgstr ""
-
-#: admin/systems/system-list.xml:290
-msgid "Mobile Phone"
-msgstr ""
-
-#: admin/systems/system-list.xml:310
+#: admin/systems/system-list.xml:100
 msgid "Trigger action"
 msgstr ""
 
-#: admin/systems/system-list.xml:317
+#: admin/systems/system-list.xml:107
 msgid "Schedule action"
 msgstr ""
 
-#: admin/systems/system-list.xml:330
-msgid "Activate systems"
-msgstr ""
-
-#: admin/systems/system-list.xml:337 admin/systems/serverService-list.xml:69
-#: admin/systems/printer.tpl.c:35
+#: admin/systems/system-list.xml:119 admin/systems/serverService-list.xml:69
 msgid "Remove"
 msgstr "Ø¥Ø²Ø§Ù„Ø©"
 
-#: admin/systems/system-list.xml:367
-msgid "Create ISO"
-msgstr ""
-
-#: admin/systems/system-list.xml:379
+#: admin/systems/system-list.xml:150
 msgid "Edit system"
 msgstr ""
 
-#: admin/systems/system-list.xml:392
+#: admin/systems/system-list.xml:163
 msgid "Remove system"
 msgstr ""
 
-#: admin/systems/class_workstationGeneric.inc:75
-#, php-format
-msgid "Event %s is not available!"
-msgstr ""
-
-#: admin/systems/class_workstationGeneric.inc:78
-msgid "Events are not available!"
-msgstr ""
-
-#: admin/systems/class_workstationGeneric.inc:106
-msgid "(Re)Install"
-msgstr ""
-
-#: admin/systems/class_workstationGeneric.inc:107
-msgid "Software update"
-msgstr ""
-
-#: admin/systems/class_workstationGeneric.inc:115
-msgid "Wake up"
-msgstr ""
-
-#: admin/systems/class_workstationGeneric.inc:144
-#: admin/systems/class_printGeneric.inc:604
+#: admin/systems/class_workstationGeneric.inc:35
 msgid "workstation"
 msgstr ""
 
-#: admin/systems/class_workstationGeneric.inc:151
-#: admin/systems/class_componentGeneric.inc:61
-#: admin/systems/class_mobilePhoneGeneric.inc:60
+#: admin/systems/class_workstationGeneric.inc:42
+#: admin/systems/class_printGeneric.inc:56
+#: admin/systems/class_componentGeneric.inc:55
+#: admin/systems/class_mobilePhoneGeneric.inc:56
 msgid "Properties"
 msgstr "Ø§Ù„Ø®ÙˆØ§Øµ"
 
-#: admin/systems/class_workstationGeneric.inc:155
+#: admin/systems/class_workstationGeneric.inc:47
 #, php-format
 msgid "The name of the %s"
 msgstr ""
 
-#: admin/systems/class_workstationGeneric.inc:161
+#: admin/systems/class_workstationGeneric.inc:52
 #, php-format
 msgid "A short description of the %s"
 msgstr ""
 
-#: admin/systems/class_workstationGeneric.inc:166
-#: admin/systems/class_printGeneric.inc:1025
+#: admin/systems/class_workstationGeneric.inc:56
 msgid "Location"
 msgstr ""
 
-#: admin/systems/class_workstationGeneric.inc:167
+#: admin/systems/class_workstationGeneric.inc:57
 #, php-format
 msgid "The location of the %s"
 msgstr ""
 
-#: admin/systems/class_workstationGeneric.inc:173
+#: admin/systems/class_workstationGeneric.inc:61
 #, php-format
 msgid "Lock this %s"
 msgstr ""
 
-#: admin/systems/class_workstationGeneric.inc:174
+#: admin/systems/class_workstationGeneric.inc:62
 #, php-format
 msgid "This will prevent the %s from being reinstalled"
 msgstr ""
 
-#: admin/systems/class_workstationGeneric.inc:185
-#: addons/dashboard/class_dashBoardSystems.inc:48
-msgid "Servers"
-msgstr "Ø®Ø§Ø¯Ù…"
-
-#: admin/systems/class_workstationGeneric.inc:190
-#, php-format
-msgid "The syslog server the %s should be using"
-msgstr ""
-
-#: admin/systems/class_workstationGeneric.inc:195
-msgid "Inherit NTP servers"
-msgstr ""
-
-#: admin/systems/class_workstationGeneric.inc:196
-msgid "Inherit time server attributes from ogroup"
-msgstr ""
-
-#: admin/systems/class_workstationGeneric.inc:202
-msgid "NTP servers"
+#: admin/systems/class_workstationGeneric.inc:73
+#: admin/systems/class_printGeneric.inc:83
+#: admin/systems/class_componentGeneric.inc:69
+#: admin/systems/class_mobilePhoneGeneric.inc:102
+#: admin/systems/class_networkSettings.inc:1008
+msgid "Network settings"
 msgstr ""
 
-#: admin/systems/class_workstationGeneric.inc:203
-#, php-format
-msgid "The NTP servers for the %s"
+#: admin/systems/class_workstationGeneric.inc:78
+#: admin/systems/class_printGeneric.inc:87
+#: admin/systems/class_componentGeneric.inc:73
+#: admin/systems/class_mobilePhoneGeneric.inc:106
+#: admin/systems/class_networkSettings.inc:630
+#: admin/systems/class_networkSettings.inc:643
+#: admin/systems/class_networkSettings.inc:645
+#: admin/systems/class_networkSettings.inc:1014
+msgid "IP address"
 msgstr ""
 
-#: admin/systems/class_workstationGeneric.inc:209
-msgid "Inherit LDAP servers"
+#: admin/systems/class_workstationGeneric.inc:78
+msgid "IP addresses this system uses (v4 or v6)"
 msgstr ""
 
-#: admin/systems/class_workstationGeneric.inc:210
-msgid "Inherit LDAP server attributes from ogroup"
+#: admin/systems/class_workstationGeneric.inc:83
+#: admin/systems/class_printGeneric.inc:91
+#: admin/systems/class_componentGeneric.inc:77
+#: admin/systems/class_mobilePhoneGeneric.inc:110
+msgid "Mac address"
 msgstr ""
 
-#: admin/systems/class_workstationGeneric.inc:216
-msgid "LDAP servers"
+#: admin/systems/class_workstationGeneric.inc:83
+#: admin/systems/class_printGeneric.inc:91
+#: admin/systems/class_componentGeneric.inc:77
+#: admin/systems/class_mobilePhoneGeneric.inc:110
+msgid "Mac address of this system"
 msgstr ""
 
-#: admin/systems/class_workstationGeneric.inc:217
-#, php-format
-msgid "The LDAP servers for the %s"
+#: admin/systems/class_workstationGeneric.inc:125
+#: admin/systems/class_workstationGeneric.inc:130
+#: admin/systems/class_workstationGeneric.inc:131
+msgid "Workstation"
 msgstr ""
 
-#: admin/systems/class_workstationGeneric.inc:225
-#: admin/systems/class_workstationGeneric.inc:229
-#: admin/ogroups/goto/termgroup.tpl.c:41
-msgid "Action"
+#: admin/systems/class_workstationGeneric.inc:126
+msgid "Workstation information"
 msgstr ""
 
-#: admin/systems/class_workstationGeneric.inc:230
-#: admin/ogroups/goto/termgroup.tpl.c:44
-msgid "Select action to execute for this terminal"
-msgstr ""
+#: admin/systems/class_printGeneric.inc:32
+#: admin/systems/class_printGeneric.inc:37
+#: admin/systems/class_printGeneric.inc:38
+msgid "Printer"
+msgstr "Ø·Ø§Ø¨Ø¹Ø©"
 
-#: admin/systems/class_workstationGeneric.inc:236
-#: admin/systems/class_componentGeneric.inc:75
-#: admin/systems/class_mobilePhoneGeneric.inc:106
-#: admin/systems/class_networkSettings.inc:1016
-msgid "Network settings"
+#: admin/systems/class_printGeneric.inc:33
+msgid "Printer information"
 msgstr ""
 
-#: admin/systems/class_workstationGeneric.inc:459
-msgid "Workstation information"
+#: admin/systems/class_printGeneric.inc:60
+msgid "The name of the printer"
 msgstr ""
 
-#: admin/systems/class_printGeneric.inc:131
-#: admin/systems/class_printGeneric.inc:1065
-#: admin/systems/class_systemManagement.inc:678
-msgid "Internal error"
-msgstr "Ø®Ø·Ø£ Ø¯Ø§Ø®Ù„ÙŠ"
-
-#: admin/systems/class_printGeneric.inc:131
-#, php-format
-msgid ""
-"Cannot determine a valid department for this object. Setting base to '%s'!"
+#: admin/systems/class_printGeneric.inc:64
+msgid "A short description of the printer"
 msgstr ""
 
-#: admin/systems/class_printGeneric.inc:311
-#: admin/systems/class_printGeneric.inc:319
-#: admin/systems/class_printGeneric.inc:324
-#: admin/systems/class_printGeneric.inc:374
-#: admin/systems/class_printGeneric.inc:390
-#: admin/systems/class_printGeneric.inc:393
-msgid "Add printer extension"
+#: admin/systems/class_printGeneric.inc:70
+msgid "Details"
 msgstr ""
 
-#: admin/systems/class_printGeneric.inc:312
-msgid ""
-"Could not initialize printer tab, parameter parent was missing while "
-"construction."
+#: admin/systems/class_printGeneric.inc:73
+msgid "Printer location"
 msgstr ""
 
-#: admin/systems/class_printGeneric.inc:320
-msgid "This is a workstation template, printer tab is disabled."
+#: admin/systems/class_printGeneric.inc:73
+msgid "The location of the printer"
 msgstr ""
 
-#: admin/systems/class_printGeneric.inc:325
-msgid "This is a terminal template, printer tab is disabled."
+#: admin/systems/class_printGeneric.inc:77
+msgid "Printer URL"
 msgstr ""
 
-#: admin/systems/class_printGeneric.inc:367
-#: admin/systems/class_printGeneric.inc:375
-#: admin/systems/class_printGeneric.inc:383
-#: admin/systems/class_printGeneric.inc:386
-#: admin/systems/class_printGeneric.inc:391
-#: admin/systems/class_printGeneric.inc:394
-msgid "printer"
+#: admin/systems/class_printGeneric.inc:77
+msgid "The URL of the printer"
 msgstr ""
 
-#: admin/systems/class_printGeneric.inc:375
-msgid ""
-"You can't enable it while 'cn' is not present in entry. Possibly you are "
-"currently creating a new terminal template."
+#: admin/systems/class_printGeneric.inc:87
+#: admin/systems/class_componentGeneric.inc:73
+#: admin/systems/class_mobilePhoneGeneric.inc:106
+msgid "IP address this system uses"
 msgstr ""
 
-#: admin/systems/class_printGeneric.inc:382
-#: admin/systems/class_printGeneric.inc:385
-msgid "Remove printer extension"
+#: admin/systems/class_serverService.inc:58
+msgid "Server services"
 msgstr ""
 
-#: admin/systems/class_printGeneric.inc:474
-#: admin/systems/class_printGeneric.inc:652
-#: admin/systems/class_printGeneric.inc:659
-#: admin/systems/class_printGeneric.inc:718
-#: admin/systems/class_printGeneric.inc:1105
-#: admin/systems/class_printGeneric.inc:1116
 #: admin/systems/class_serverService.inc:224
 #: admin/systems/class_serverService.inc:270
 #: admin/systems/class_serverService.inc:393
-#: admin/systems/class_systemManagement.inc:341
-#: admin/systems/class_systemManagement.inc:624
-#: admin/systems/class_systemManagement.inc:639
 #: admin/systems/services/shares/class_serviceShare.inc:103
-#: admin/systems/class_networkSettings.inc:305
-#: admin/systems/class_networkSettings.inc:336
-#: admin/systems/class_networkSettings.inc:584
-#: admin/systems/class_networkSettings.inc:591
-#: admin/systems/class_networkSettings.inc:597
-#: admin/systems/class_networkSettings.inc:604
+#: admin/systems/class_networkSettings.inc:297
+#: admin/systems/class_networkSettings.inc:328
+#: admin/systems/class_networkSettings.inc:576
+#: admin/systems/class_networkSettings.inc:583
+#: admin/systems/class_networkSettings.inc:589
+#: admin/systems/class_networkSettings.inc:596
 msgid "Error"
 msgstr "Ø®Ø·Ø£"
 
-#: admin/systems/class_printGeneric.inc:577
-#, php-format
-msgid "Your currently selected PPD file '%s' doesn't exist."
-msgstr ""
-
-#: admin/systems/class_printGeneric.inc:583
-msgid "Not defined"
-msgstr ""
-
-#: admin/systems/class_printGeneric.inc:587
-#: admin/systems/ppd/class_printerPPDDialog.inc:116
-msgid "Can't get ppd informations."
-msgstr ""
-
-#: admin/systems/class_printGeneric.inc:602
-#: admin/systems/class_printGeneric.inc:604
-#, php-format
-msgid "This printer belongs to %s. You can't rename this printer."
-msgstr ""
-
-#: admin/systems/class_printGeneric.inc:602
-#: admin/systems/class_terminalGeneric.inc:34
-msgid "terminal"
-msgstr ""
-
-#: admin/systems/class_printGeneric.inc:652
-#: admin/systems/class_printGeneric.inc:659
-msgid "Object is no printer!"
-msgstr ""
-
-#: admin/systems/class_printGeneric.inc:767 admin/systems/printer.tpl.c:23
-msgid "Printer URL"
-msgstr ""
-
-#: admin/systems/class_printGeneric.inc:989
-#: admin/systems/class_printGeneric.inc:991
-msgid "Group"
-msgstr "Ù…Ø¬Ù…ÙˆØ¹Ø©"
-
-#: admin/systems/class_printGeneric.inc:994
-msgid "User"
-msgstr ""
-
-#: admin/systems/class_printGeneric.inc:1006
-msgid "Printer information"
-msgstr ""
-
-#: admin/systems/class_printGeneric.inc:1023
-#: admin/systems/serverService-list.tpl.c:2
-#: admin/systems/phoneSelect/phoneSelect-list.tpl.c:2
-#: admin/systems/printer.tpl.c:11
-msgid "Base"
-msgstr ""
-
-#: admin/systems/class_printGeneric.inc:1026
-msgid "LabeledURL"
-msgstr ""
-
-#: admin/systems/class_printGeneric.inc:1027
-msgid "Printer PPD"
-msgstr ""
-
-#: admin/systems/class_printGeneric.inc:1028 admin/systems/printer.tpl.c:38
-msgid "Permissions"
-msgstr ""
-
-#: admin/systems/class_printGeneric.inc:1030
-msgid "Windows inf file"
-msgstr ""
-
-#: admin/systems/class_printGeneric.inc:1031
-msgid "Windows driver dir"
-msgstr ""
-
-#: admin/systems/class_printGeneric.inc:1032 admin/systems/printer.tpl.c:62
-msgid "Driver printer name"
-msgstr ""
-
-#: admin/systems/class_printGeneric.inc:1048
-#: admin/systems/class_printGeneric.inc:1070
-msgid "Permission error"
-msgstr ""
-
-#: admin/systems/class_printGeneric.inc:1048
-#: admin/systems/class_printGeneric.inc:1070
-msgid "printer user"
-msgstr ""
-
-#: admin/systems/class_printGeneric.inc:1065
-#, php-format
-msgid "Illegal member type '%s'!"
-msgstr ""
-
-#: admin/systems/class_printGeneric.inc:1105
-#, php-format
-msgid "'%s' is already used!"
-msgstr ""
-
-#: admin/systems/class_printGeneric.inc:1116
-#, php-format
-msgid "'%s' does not exist!"
-msgstr ""
-
-#: admin/systems/class_serverService.inc:58
-msgid "Server services"
-msgstr ""
-
 #: admin/systems/class_serverService.inc:332
 msgid "Filter error"
 msgstr ""
@@ -711,217 +438,20 @@ msgstr ""
 msgid "Could not get execute action %s on service %s."
 msgstr ""
 
-#: admin/systems/class_terminalGeneric.inc:42
-#, php-format
-msgid "The root server the terminal should be using"
+#: admin/systems/class_terminalGeneric.inc:31
+msgid "terminal"
 msgstr ""
 
+#: admin/systems/class_terminalGeneric.inc:43
 #: admin/systems/class_terminalGeneric.inc:48
-#, php-format
-msgid "The swap server the terminal should be using"
-msgstr ""
-
-#: admin/systems/class_terminalGeneric.inc:54
-msgid "Remote desktop"
-msgstr ""
-
-#: admin/systems/class_terminalGeneric.inc:58
-msgid "Connect method"
-msgstr ""
-
-#: admin/systems/class_terminalGeneric.inc:62
-msgid "XDMCP"
-msgstr ""
-
-#: admin/systems/class_terminalGeneric.inc:62
-msgid "LDM"
-msgstr ""
-
-#: admin/systems/class_terminalGeneric.inc:62
-msgid "Shell"
-msgstr ""
-
-#: admin/systems/class_terminalGeneric.inc:62
-msgid "Telnet"
-msgstr ""
-
-#: admin/systems/class_terminalGeneric.inc:62
-msgid "Windows RDP"
-msgstr ""
-
-#: admin/systems/class_terminalGeneric.inc:66
-msgid "Terminal server"
+#: admin/systems/class_terminalGeneric.inc:49
+msgid "Terminal"
 msgstr ""
 
-#: admin/systems/class_terminalGeneric.inc:82
+#: admin/systems/class_terminalGeneric.inc:44
 msgid "Terminal information"
 msgstr ""
 
-#: admin/systems/ppd/class_printerPPDSelectionDialog.inc:91
-#: admin/systems/ppd/class_printerPPDSelectionDialog.inc:116
-#: admin/systems/ppd/class_printerPPDSelectionDialog.inc:139
-#: admin/systems/ppd/class_printerPPDDialog.inc:92
-#: admin/systems/ppd/class_printerPPDDialog.inc:160
-#: admin/systems/ppd/class_printerPPDDialog.inc:241
-#: admin/systems/ppd/class_printerPPDDialog.inc:256
-#: admin/systems/ppd/class_printerPPDDialog.inc:269
-#: admin/systems/ppd/class_printerPPDDialog.inc:297
-#: admin/systems/ppd/class_printerPPDDialog.inc:314
-#: admin/systems/ppd/class_printerPPDDialog.inc:337
-#: admin/systems/ppd/class_printerPPDDialog.inc:351
-#: admin/systems/ppd/class_printerPPDDialog.inc:361
-#: admin/systems/ppd/class_printerPPDDialog.inc:365
-#: admin/systems/ppd/class_printerPPDDialog.inc:560
-#: admin/systems/ppd/class_printerPPDDialog.inc:577
-#: admin/systems/ppd/class_printerPPDDialog.inc:580
-#: admin/systems/ppd/class_printerPPDDialog.inc:583
-msgid "PPD error"
-msgstr ""
-
-#: admin/systems/ppd/class_printerPPDSelectionDialog.inc:139
-#, php-format
-msgid "Cannot locate vendor '%s' in available PPDs!"
-msgstr ""
-
-#: admin/systems/ppd/class_printerPPDSelectionDialog.inc:148
-msgid "Printer ppd selection."
-msgstr ""
-
-#: admin/systems/ppd/class_printerPPDSelectionDialog.inc:155
-msgid "delete"
-msgstr ""
-
-#: admin/systems/ppd/class_printerPPDSelectionDialog.inc:166
-msgid "back"
-msgstr ""
-
-#: admin/systems/ppd/class_printerPPDDialog.inc:74
-#: admin/systems/ppd/class_printerPPDDialog.inc:140
-#: admin/systems/services/class_goService.inc:241
-msgid "Configuration error"
-msgstr ""
-
-#: admin/systems/ppd/class_printerPPDDialog.inc:92
-#, php-format
-msgid "Cannot open PPD '%s'!"
-msgstr ""
-
-#: admin/systems/ppd/class_printerPPDDialog.inc:141
-#, php-format
-msgid "Cannot open PPD path '%s' for reading and writing!"
-msgstr ""
-
-#: admin/systems/ppd/class_printerPPDDialog.inc:160
-#: admin/systems/ppd/class_printerPPDDialog.inc:365
-msgid "file is empty"
-msgstr ""
-
-#: admin/systems/ppd/class_printerPPDDialog.inc:314
-#, php-format
-msgid "Cannot parse PPD '%s'!"
-msgstr ""
-
-#: admin/systems/ppd/class_printerPPDDialog.inc:340
-msgid "Overwrite existing PPD"
-msgstr ""
-
-#: admin/systems/ppd/class_printerPPDDialog.inc:341
-msgid ""
-"There is already a ppd file for this kind of printer. Do you want to "
-"overwrite it?"
-msgstr ""
-
-#: admin/systems/ppd/class_printerPPDDialog.inc:491
-msgid "Section"
-msgstr ""
-
-#: admin/systems/ppd/class_printerPPDDialog.inc:551
-#: admin/systems/ppd/class_printerPPDDialog.inc:554
-msgid "True"
-msgstr ""
-
-#: admin/systems/ppd/class_printerPPDDialog.inc:552
-#: admin/systems/ppd/class_printerPPDDialog.inc:555
-msgid "False"
-msgstr ""
-
-#: admin/systems/ppd/class_printerPPDDialog.inc:560
-#, php-format
-msgid "PPD type '%s' is not supported!"
-msgstr ""
-
-#: admin/systems/ppd/class_printerPPDDialog.inc:597
-msgid ""
-"Please select a valid ppd file or use 'Cancel' to go back to printer "
-"configuration."
-msgstr ""
-
-#: admin/systems/ppd/class_ppdManager.inc:44
-#: admin/systems/ppd/class_ppdManager.inc:188
-#: admin/systems/ppd/class_ppdManager.inc:190
-msgid "PPD manager error"
-msgstr ""
-
-#: admin/systems/ppd/class_ppdManager.inc:44
-#, php-format
-msgid "The specified path '%s' does not exist."
-msgstr ""
-
-#: admin/systems/ppd/class_ppdManager.inc:188
-#, php-format
-msgid "Specified PPD file '%s' cannot be opened for reading."
-msgstr ""
-
-#: admin/systems/ppd/class_ppdManager.inc:190
-#, php-format
-msgid "The temporary file '%s' cannot be opened for writing."
-msgstr ""
-
-#: admin/systems/ppd/class_ppdManager.inc:212
-#: admin/systems/ppd/class_ppdManager.inc:350
-msgid "Parsing PPD file failed - file is empty!"
-msgstr ""
-
-#: admin/systems/ppd/class_ppdManager.inc:222
-#, php-format
-msgid ""
-"Parsing PPD file %s failed - line too long. Trailing characters have been "
-"ignored!"
-msgstr ""
-
-#: admin/systems/ppd/class_ppdManager.inc:230
-msgid "Nested groups are not supported!"
-msgstr ""
-
-#: admin/systems/ppd/class_ppdManager.inc:234
-msgid "Group name not unique!"
-msgstr ""
-
-#: admin/systems/ppd/class_ppdManager.inc:240
-#: admin/systems/ppd/class_ppdManager.inc:270
-msgid "Symbol values are not supported yet!"
-msgstr ""
-
-#: admin/systems/ppd/class_ppdManager.inc:264
-msgid "Nested options are not supported!"
-msgstr ""
-
-#: admin/systems/ppd/class_ppdManager.inc:289
-msgid "PickMany is not supported yet!"
-msgstr ""
-
-#: admin/systems/ppd/class_ppdManager.inc:370
-#, php-format
-msgid ""
-"Parsing PPD file %s failed - line too long. Trailing characters have been "
-"ignored"
-msgstr ""
-
-#: admin/systems/ppd/class_ppdManager.inc:395
-#, php-format
-msgid "Parsing PPD file %s failed - no information found."
-msgstr ""
-
 #: admin/systems/class_systemImport.inc:72
 #, php-format
 msgid "Could not parse %s"
@@ -941,83 +471,130 @@ msgstr ""
 msgid "Import"
 msgstr ""
 
+#: admin/systems/class_systemImport.inc:169
+#: admin/systems/class_serverGeneric.inc:43
+#: admin/systems/class_serverGeneric.inc:48
+#: admin/systems/class_serverGeneric.inc:49
+msgid "Server"
+msgstr "Ø®Ø§Ø¯Ù…"
+
 #: admin/systems/class_systemImport.inc:169
 msgid "The server you wish to import hosts from"
 msgstr ""
 
-#: admin/systems/class_serverGeneric.inc:34
+#: admin/systems/class_serverGeneric.inc:31
 msgid "server"
 msgstr "Ø®Ø§Ø¯Ù…"
 
-#: admin/systems/class_serverGeneric.inc:47
+#: admin/systems/class_serverGeneric.inc:44
 msgid "Server information"
 msgstr ""
 
-#: admin/systems/class_componentGeneric.inc:37
+#: admin/systems/class_componentGeneric.inc:31
+msgid "Component"
+msgstr ""
+
+#: admin/systems/class_componentGeneric.inc:32
 msgid "Component information"
 msgstr ""
 
-#: admin/systems/class_componentGeneric.inc:64
+#: admin/systems/class_componentGeneric.inc:36
+#: admin/systems/class_componentGeneric.inc:37
+msgid "Network device"
+msgstr ""
+
+#: admin/systems/class_componentGeneric.inc:58
 msgid "The name of the component"
 msgstr ""
 
-#: admin/systems/class_componentGeneric.inc:68
+#: admin/systems/class_componentGeneric.inc:62
 msgid "A short description of the component"
 msgstr ""
 
+#: admin/systems/class_systemServers.inc:31
+#: admin/systems/class_systemServers.inc:53
+msgid "Servers"
+msgstr "Ø®Ø§Ø¯Ù…"
+
+#: admin/systems/class_systemServers.inc:35
+msgid "The syslog server the system should be using"
+msgstr ""
+
+#: admin/systems/class_systemServers.inc:40
+msgid "NTP servers"
+msgstr ""
+
+#: admin/systems/class_systemServers.inc:40
+msgid "The NTP servers for this system"
+msgstr ""
+
+#: admin/systems/class_systemServers.inc:54
+msgid "Servers this system is using"
+msgstr ""
+
+#: admin/systems/class_mobilePhoneGeneric.inc:32
 #: admin/systems/class_mobilePhoneGeneric.inc:37
+#: admin/systems/class_mobilePhoneGeneric.inc:38
+msgid "Mobile phone"
+msgstr ""
+
+#: admin/systems/class_mobilePhoneGeneric.inc:33
 msgid "Mobile phone information"
 msgstr ""
 
-#: admin/systems/class_mobilePhoneGeneric.inc:63
+#: admin/systems/class_mobilePhoneGeneric.inc:60
 msgid "The name of the mobile phone"
 msgstr ""
 
-#: admin/systems/class_mobilePhoneGeneric.inc:67
+#: admin/systems/class_mobilePhoneGeneric.inc:64
 msgid "A short description of the mobile phone"
 msgstr ""
 
-#: admin/systems/class_mobilePhoneGeneric.inc:77
+#: admin/systems/class_mobilePhoneGeneric.inc:70
+msgid "Phone"
+msgstr "Ø§Ù„Ù‡Ø§ØªÙ"
+
+#: admin/systems/class_mobilePhoneGeneric.inc:73
 msgid "Serial Number"
 msgstr ""
 
-#: admin/systems/class_mobilePhoneGeneric.inc:77
+#: admin/systems/class_mobilePhoneGeneric.inc:73
 msgid "The serial number of the mobile phone"
 msgstr ""
 
-#: admin/systems/class_mobilePhoneGeneric.inc:81
+#: admin/systems/class_mobilePhoneGeneric.inc:77
 msgid "IMEI Number"
 msgstr ""
 
-#: admin/systems/class_mobilePhoneGeneric.inc:81
+#: admin/systems/class_mobilePhoneGeneric.inc:77
 msgid "The IMEI number of the mobile phone"
 msgstr ""
 
-#: admin/systems/class_mobilePhoneGeneric.inc:86
+#: admin/systems/class_mobilePhoneGeneric.inc:82
 msgid "OS"
 msgstr ""
 
-#: admin/systems/class_mobilePhoneGeneric.inc:86
+#: admin/systems/class_mobilePhoneGeneric.inc:82
 msgid "The Operating System installed on this phone"
 msgstr ""
 
-#: admin/systems/class_mobilePhoneGeneric.inc:92
+#: admin/systems/class_mobilePhoneGeneric.inc:88
 msgid "SimCard"
 msgstr ""
 
-#: admin/systems/class_mobilePhoneGeneric.inc:95
+#: admin/systems/class_mobilePhoneGeneric.inc:91
 msgid "Telephone Number"
 msgstr ""
 
-#: admin/systems/class_mobilePhoneGeneric.inc:95
+#: admin/systems/class_mobilePhoneGeneric.inc:91
 msgid "The telephone number of the mobile phone"
 msgstr ""
 
-#: admin/systems/class_mobilePhoneGeneric.inc:99
+#: admin/systems/class_mobilePhoneGeneric.inc:95
 msgid "PUK Number"
 msgstr ""
 
-#: admin/systems/class_mobilePhoneGeneric.inc:99
+#: admin/systems/class_mobilePhoneGeneric.inc:95
 msgid "The PUK number of the simcard in this mobile phone"
 msgstr ""
 
@@ -1033,97 +610,47 @@ msgstr ""
 msgid "!"
 msgstr ""
 
-#: admin/systems/serverService-list.xml:89
-msgid "Get status"
-msgstr ""
-
-#: admin/systems/serverService-list.xml:97
-#: admin/systems/services/cups/class_serviceCUPS.inc:92
-msgid "Start"
-msgstr "Ø§Ù„Ø¨Ø¯Ø§ÙŠØ©"
-
-#: admin/systems/serverService-list.xml:105
-#: admin/systems/services/cups/class_serviceCUPS.inc:93
-msgid "Stop"
-msgstr ""
-
-#: admin/systems/serverService-list.xml:113
-#: admin/systems/services/cups/class_serviceCUPS.inc:94
-msgid "Restart"
-msgstr ""
-
-#: admin/systems/serverService-list.xml:121
-msgid "Edit service"
-msgstr ""
-
-#: admin/systems/serverService-list.xml:129
-msgid "Remove service"
-msgstr ""
-
-#: admin/systems/phoneSelect/phoneSelect-list.xml:10
-msgid "Please select the desired entries"
-msgstr ""
-
-#: admin/systems/phoneSelect/phoneSelect-list.xml:56
-msgid "Number"
-msgstr ""
-
-#: admin/systems/phoneSelect/phoneSelect-list.xml:83
-msgid "Select this number"
-msgstr ""
-
-#: admin/systems/class_systemManagement.inc:177
-msgid "Back"
-msgstr "Ø§Ù„Ø±Ø¬ÙˆØ¹"
-
-#: admin/systems/class_systemManagement.inc:223
-msgid "Creating the image failed. Please see the report below."
-msgstr ""
-
-#: admin/systems/class_systemManagement.inc:228
-#, php-format
-msgid "Command '%s', specified for ISO creation doesn't seem to exist."
+#: admin/systems/serverService-list.xml:89
+msgid "Get status"
 msgstr ""
 
-#: admin/systems/class_systemManagement.inc:398
-#: admin/systems/class_systemManagement.inc:473
-#: admin/systems/class_systemManagement.inc:858
-#: admin/systems/class_systemManagement.inc:905
-#: admin/systems/class_systemManagement.inc:926
-msgid "Permission"
-msgstr ""
+#: admin/systems/serverService-list.xml:97
+#: admin/systems/services/cups/class_serviceCUPS.inc:92
+msgid "Start"
+msgstr "Ø§Ù„Ø¨Ø¯Ø§ÙŠØ©"
 
-#: admin/systems/class_systemManagement.inc:678
-msgid "Cannot set mode to 'active'!"
+#: admin/systems/serverService-list.xml:105
+#: admin/systems/services/cups/class_serviceCUPS.inc:93
+msgid "Stop"
 msgstr ""
 
-#: admin/systems/class_systemManagement.inc:858
-#, php-format
-msgid "You are not allowed to create a snapshot for %s."
+#: admin/systems/serverService-list.xml:113
+#: admin/systems/services/cups/class_serviceCUPS.inc:94
+msgid "Restart"
 msgstr ""
 
-#: admin/systems/class_systemManagement.inc:905
-#: admin/systems/class_systemManagement.inc:926
-#, php-format
-msgid "You are not allowed to restore a snapshot for %s."
+#: admin/systems/serverService-list.xml:121
+msgid "Edit service"
 msgstr ""
 
-#: admin/systems/class_systemManagement.inc:1169
-#, php-format
-msgid "Inherited from %s"
+#: admin/systems/serverService-list.xml:129
+msgid "Remove service"
 msgstr ""
 
-#: admin/systems/class_systemManagement.inc:1224
-#: admin/systems/class_systemManagement.inc:1228
-#: addons/dashboard/class_dashBoardSystems.inc:199
+#: admin/systems/class_systemManagement.inc:48
 #: config/systems/class_systemsPluginConfig.inc:28
 msgid "Systems"
 msgstr "Ø£Ù†Ø¸Ù…Ø©"
 
-#: admin/systems/class_systemManagement.inc:1225
+#: admin/systems/class_systemManagement.inc:49
 msgid "Systems Management"
 msgstr "ØªØÙƒÙ… Ø§Ù„Ø£Ù†Ø¸Ù…Ø©"
 
+#: admin/systems/class_systemManagement.inc:250
+#, php-format
+msgid "Inherited from %s"
+msgstr ""
+
 #: admin/systems/services/terminal/class_serviceTerminal.inc:29
 #: admin/systems/services/terminal/class_serviceTerminal.inc:30
 #: admin/systems/services/terminal/class_serviceTerminal.inc:41
@@ -1161,6 +688,10 @@ msgstr ""
 msgid "Empty service"
 msgstr ""
 
+#: admin/systems/services/class_goService.inc:241
+msgid "Configuration error"
+msgstr ""
+
 #: admin/systems/services/shares/class_serviceShare.inc:30
 #: admin/systems/services/shares/class_serviceShare.inc:31
 msgid "Share service"
@@ -1219,8 +750,6 @@ msgid "You need to configure encodings first"
 msgstr ""
 
 #: admin/systems/services/shares/class_serviceShare.inc:110
-#: admin/ogroups/goto/termgroup.tpl.c:2 admin/systems/remove.tpl.c:2
-#: admin/systems/ppd/remove_ppd.tpl.c:2
 msgid "Warning"
 msgstr "ØªØØ°ÙŠØ±"
 
@@ -1346,153 +875,93 @@ msgstr ""
 msgid "LDAP"
 msgstr ""
 
-#: admin/systems/class_networkSettings.inc:305
+#: admin/systems/class_networkSettings.inc:297
 msgid "NOT IMPLEMENTED"
 msgstr ""
 
-#: admin/systems/class_networkSettings.inc:437
+#: admin/systems/class_networkSettings.inc:429
 msgid "Not matching"
 msgstr ""
 
-#: admin/systems/class_networkSettings.inc:584
+#: admin/systems/class_networkSettings.inc:576
 #, php-format
 msgid "Was not able to contact argonaut server: %s"
 msgstr ""
 
-#: admin/systems/class_networkSettings.inc:591
+#: admin/systems/class_networkSettings.inc:583
 #, php-format
 msgid "Was not able to find DNS server for zone %s"
 msgstr ""
 
-#: admin/systems/class_networkSettings.inc:597
+#: admin/systems/class_networkSettings.inc:589
 #, php-format
 msgid "Was not able to find mac address of DNS server %s"
 msgstr ""
 
-#: admin/systems/class_networkSettings.inc:604
+#: admin/systems/class_networkSettings.inc:596
 #, php-format
 msgid "Was not able to launch ldap2zone: %s"
 msgstr ""
 
-#: admin/systems/class_networkSettings.inc:630
+#: admin/systems/class_networkSettings.inc:622
 #, php-format
 msgid "IP address %s"
 msgstr ""
 
-#: admin/systems/class_networkSettings.inc:638
-#: admin/systems/class_networkSettings.inc:651
-#: admin/systems/class_networkSettings.inc:653
-#: admin/systems/class_networkSettings.inc:1022
-msgid "IP address"
-msgstr ""
-
-#: admin/systems/class_networkSettings.inc:644
-#: admin/systems/class_networkSettings.inc:660
-#: admin/systems/class_networkSettings.inc:662
-#: admin/systems/class_networkSettings.inc:1023
+#: admin/systems/class_networkSettings.inc:636
+#: admin/systems/class_networkSettings.inc:652
+#: admin/systems/class_networkSettings.inc:654
+#: admin/systems/class_networkSettings.inc:1015
 msgid "MAC address"
 msgstr ""
 
-#: admin/systems/class_networkSettings.inc:676
+#: admin/systems/class_networkSettings.inc:668
 #, php-format
 msgid "The IP address '%s' is not part of the selected reverse zone '%s'!"
 msgstr ""
 
-#: admin/systems/class_networkSettings.inc:686
+#: admin/systems/class_networkSettings.inc:678
 #, php-format
 msgid "Record type '%s' is duplicated!"
 msgstr ""
 
-#: admin/systems/class_networkSettings.inc:693
+#: admin/systems/class_networkSettings.inc:685
 #, php-format
 msgid "Uniq record type '%s' is duplicated!"
 msgstr ""
 
-#: admin/systems/class_networkSettings.inc:705
+#: admin/systems/class_networkSettings.inc:697
 #, php-format
 msgid ""
 "The IP address '%s' will be added as 'A Record', this will be done "
 "automatically, please remove the record."
 msgstr ""
 
-#: admin/systems/class_networkSettings.inc:712
+#: admin/systems/class_networkSettings.inc:704
 #, php-format
 msgid "Only lowercase records are allowed, please check your '%ss'."
 msgstr ""
 
-#: admin/systems/class_networkSettings.inc:978
+#: admin/systems/class_networkSettings.inc:970
 msgid "Delete"
 msgstr ""
 
-#: admin/systems/class_networkSettings.inc:984
+#: admin/systems/class_networkSettings.inc:976
 msgid "Add"
 msgstr ""
 
-#: admin/systems/class_networkSettings.inc:1015
-#: addons/dashboard/class_dashBoardNetwork.inc:127
+#: admin/systems/class_networkSettings.inc:1007
 msgid "Network"
 msgstr ""
 
-#: admin/systems/class_networkSettings.inc:1030
+#: admin/systems/class_networkSettings.inc:1022
 msgid "DNS configuration"
 msgstr ""
 
-#: admin/systems/class_networkSettings.inc:1033
+#: admin/systems/class_networkSettings.inc:1025
 msgid "DHCP configuration"
 msgstr ""
 
-#: addons/dashboard/class_dashBoardSystems.inc:45
-msgid "Workstations"
-msgstr ""
-
-#: addons/dashboard/class_dashBoardSystems.inc:51
-msgid "Windows Workstations"
-msgstr ""
-
-#: addons/dashboard/class_dashBoardSystems.inc:54
-msgid "Terminals"
-msgstr ""
-
-#: addons/dashboard/class_dashBoardSystems.inc:57
-msgid "Printers"
-msgstr ""
-
-#: addons/dashboard/class_dashBoardSystems.inc:60
-msgid "Phones"
-msgstr ""
-
-#: addons/dashboard/class_dashBoardSystems.inc:63
-msgid "Components"
-msgstr ""
-
-#: addons/dashboard/class_dashBoardSystems.inc:66
-msgid "Mobile phones"
-msgstr ""
-
-#: addons/dashboard/class_dashBoardSystems.inc:183
-msgid "Statistics"
-msgstr ""
-
-#: addons/dashboard/class_dashBoardSystems.inc:188
-msgid "Computer name to use by unit"
-msgstr ""
-
-#: addons/dashboard/class_dashBoardSystems.inc:200
-msgid "Statistics and informations about systems"
-msgstr ""
-
-#: addons/dashboard/class_dashBoardNetwork.inc:111
-msgid "DHCP"
-msgstr ""
-
-#: addons/dashboard/class_dashBoardNetwork.inc:116
-msgid "DNS"
-msgstr ""
-
-#: addons/dashboard/class_dashBoardNetwork.inc:128
-msgid "Statistics and various informations"
-msgstr ""
-
 #: config/systems/class_systemsPluginConfig.inc:29
 msgid "Systems plugin configuration"
 msgstr ""
@@ -1584,412 +1053,3 @@ msgstr ""
 #: config/systems/class_systemsPluginConfig.inc:101
 msgid "Encodings"
 msgstr ""
-
-#: admin/ogroups/goto/termgroup.tpl.c:5
-msgid ""
-"Actions you choose here influence all systems in this object group. "
-"Additionally, all values editable here can be inherited by the clients "
-"assigned to this object group."
-msgstr ""
-
-#: admin/ogroups/goto/termgroup.tpl.c:8
-msgid "Generic"
-msgstr ""
-
-#: admin/ogroups/goto/termgroup.tpl.c:11
-msgid "NTP server"
-msgstr ""
-
-#: admin/ogroups/goto/termgroup.tpl.c:14
-msgid "Choose server to use for synchronizing time"
-msgstr ""
-
-#: admin/ogroups/goto/termgroup.tpl.c:20
-msgid "Select terminal mode"
-msgstr ""
-
-#: admin/ogroups/goto/termgroup.tpl.c:26
-msgid "Choose server to use for logging"
-msgstr ""
-
-#: admin/ogroups/goto/termgroup.tpl.c:32
-msgid "Select NFS root filesystem to use"
-msgstr ""
-
-#: admin/ogroups/goto/termgroup.tpl.c:38
-msgid "Choose NFS filesystem to place swap files on"
-msgstr ""
-
-#: admin/ogroups/goto/termgroup.tpl.c:47
-msgid "Execute"
-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 admin/systems/network.tpl.c:11
-msgid "Propose ip"
-msgstr ""
-
-#: admin/systems/network.tpl.c:14
-msgid "MAC-address"
-msgstr ""
-
-#: admin/systems/network.tpl.c:17
-msgid "Autodetect"
-msgstr ""
-
-#: admin/systems/network.tpl.c:20 admin/systems/network.tpl.c:23
-msgid "Enable DHCP for this device"
-msgstr ""
-
-#: admin/systems/network.tpl.c:26 admin/systems/network.tpl.c:50
-msgid "not configured"
-msgstr ""
-
-#: admin/systems/network.tpl.c:29
-msgid "Parent node"
-msgstr ""
-
-#: admin/systems/network.tpl.c:32
-msgid "Edit settings"
-msgstr ""
-
-#: admin/systems/network.tpl.c:35 admin/systems/network.tpl.c:47
-msgid "Enable DNS for this device"
-msgstr ""
-
-#: admin/systems/network.tpl.c:38
-msgid "Zone"
-msgstr ""
-
-#: admin/systems/network.tpl.c:41
-msgid "TTL"
-msgstr ""
-
-#: admin/systems/network.tpl.c:44
-msgid "Dns records"
-msgstr ""
-
-#: admin/systems/password.tpl.c:2
-msgid ""
-"To change the terminal root password use the fields below. The changes take "
-"effect during the next reboot. Please memorize the new password, because you"
-" wouldn't be able to log in."
-msgstr ""
-
-#: admin/systems/password.tpl.c:5
-msgid "Leave fields blank for password inheritance from default entries."
-msgstr ""
-
-#: admin/systems/password.tpl.c:8
-msgid "Changing the password impinges on authentification only."
-msgstr ""
-
-#: admin/systems/password.tpl.c:11
-msgid "New password"
-msgstr ""
-
-#: admin/systems/password.tpl.c:14
-msgid "Repeat new password"
-msgstr ""
-
-#: admin/systems/password.tpl.c:17
-msgid "Password strength"
-msgstr ""
-
-#: admin/systems/password.tpl.c:20
-msgid "Set password"
-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/gencd.tpl.c:2
-msgid "CD-Install-Image generation"
-msgstr ""
-
-#: admin/systems/gencd.tpl.c:5
-msgid ""
-"This option enables you to generate FAI install CD images for the selected "
-"workstation. The procedure may take about 10 minutes to complete, so please "
-"be patient after pressing the 'Create ISO-Image' button."
-msgstr ""
-
-#: admin/systems/gencd.tpl.c:8
-msgid "Create ISO-Image"
-msgstr ""
-
-#: admin/systems/remove.tpl.c:5
-msgid ""
-"This includes all account data, system access rules, imap settings, etc. for"
-" this user. Please double check if your really want to do this since there "
-"is no way for FusionDirectory to get your data back."
-msgstr ""
-
-#: admin/systems/remove.tpl.c:8
-msgid "So - if you're sure - press 'Delete' to continue or 'Cancel' to abort."
-msgstr ""
-
-#: admin/systems/system-filter.tpl.c:2
-#: admin/systems/phoneSelect/phoneSelect-filter.tpl.c:2
-msgid "Filter"
-msgstr ""
-
-#: admin/systems/system-filter.tpl.c:5
-msgid "Show servers"
-msgstr ""
-
-#: admin/systems/system-filter.tpl.c:8
-msgid "Show workstations"
-msgstr ""
-
-#: admin/systems/system-filter.tpl.c:11
-msgid "Show terminals"
-msgstr ""
-
-#: admin/systems/system-filter.tpl.c:14
-msgid "Show network printer"
-msgstr ""
-
-#: admin/systems/system-filter.tpl.c:17
-#: admin/systems/phoneSelect/phoneSelect-filter.tpl.c:5
-msgid "Show phones"
-msgstr ""
-
-#: admin/systems/system-filter.tpl.c:20
-msgid "Show windows based workstations"
-msgstr ""
-
-#: admin/systems/system-filter.tpl.c:23
-msgid "Show network devices"
-msgstr ""
-
-#: admin/systems/system-filter.tpl.c:26
-#: admin/systems/phoneSelect/phoneSelect-filter.tpl.c:8
-msgid "Show mobile phones"
-msgstr ""
-
-#: admin/systems/system-filter.tpl.c:29
-msgid "Show IPMI interfaces"
-msgstr ""
-
-#: admin/systems/ppd/printerPPDSelectionDialog.tpl.c:2
-msgid "Select objects to add"
-msgstr ""
-
-#: admin/systems/ppd/printerPPDSelectionDialog.tpl.c:5
-msgid "Filters"
-msgstr ""
-
-#: admin/systems/ppd/printerPPDSelectionDialog.tpl.c:8
-msgid "Display objects matching"
-msgstr ""
-
-#: admin/systems/ppd/printerPPDSelectionDialog.tpl.c:11
-msgid "Regular expression for matching object names"
-msgstr ""
-
-#: admin/systems/ppd/printerPPDSelectionDialog.tpl.c:14
-msgid "Close"
-msgstr ""
-
-#: admin/systems/ppd/printerPPDDialog.tpl.c:2
-msgid "Printer driver"
-msgstr ""
-
-#: admin/systems/ppd/printerPPDDialog.tpl.c:5
-msgid "Model"
-msgstr ""
-
-#: admin/systems/ppd/printerPPDDialog.tpl.c:8
-msgid "Select"
-msgstr ""
-
-#: admin/systems/ppd/printerPPDDialog.tpl.c:11
-msgid "New driver"
-msgstr ""
-
-#: admin/systems/ppd/printerPPDDialog.tpl.c:14
-msgid "Upload"
-msgstr ""
-
-#: admin/systems/ppd/printerPPDDialog.tpl.c:17
-msgid "Options"
-msgstr ""
-
-#: admin/systems/ppd/remove_ppd.tpl.c:5
-msgid "The ppd file will be removed from the server and can not be restored."
-msgstr ""
-
-#: admin/systems/printer.tpl.c:2
-msgid "General"
-msgstr ""
-
-#: admin/systems/printer.tpl.c:5
-msgid "Printer name"
-msgstr ""
-
-#: admin/systems/printer.tpl.c:14
-msgid "Details"
-msgstr ""
-
-#: admin/systems/printer.tpl.c:20
-msgid "Printer location"
-msgstr ""
-
-#: admin/systems/printer.tpl.c:26
-msgid "PPD Provider"
-msgstr ""
-
-#: admin/systems/printer.tpl.c:29
-msgid "Driver"
-msgstr ""
-
-#: admin/systems/printer.tpl.c:32
-msgid "Edit"
-msgstr ""
-
-#: admin/systems/printer.tpl.c:41
-msgid "Users which are allowed to use this printer"
-msgstr ""
-
-#: admin/systems/printer.tpl.c:44
-msgid "Users"
-msgstr ""
-
-#: admin/systems/printer.tpl.c:47
-msgid "Users which are allowed to administrate this printer"
-msgstr ""
-
-#: admin/systems/printer.tpl.c:50
-msgid "Admins"
-msgstr ""
-
-#: admin/systems/printer.tpl.c:53
-msgid "Windows paths"
-msgstr ""
-
-#: admin/systems/printer.tpl.c:56
-msgid "Printer windows inf file"
-msgstr ""
-
-#: admin/systems/printer.tpl.c:59
-msgid "Printer driver directory"
-msgstr ""
-
-#: admin/systems/gencd_frame.tpl.c:2
-msgid "Your browser does not supprt iframes."
-msgstr ""
-
-#: admin/systems/services/cups/serviceCUPS.tpl.c:2
-msgid "Print Service"
-msgstr ""
-
-#: admin/systems/services/cups/serviceCUPS.tpl.c:5
-msgid "enabled"
-msgstr ""
-
-#: admin/systems/services/ServiceAddDialog.tpl.c:2
-msgid "Adding a new service to the current server"
-msgstr ""
-
-#: admin/systems/services/ServiceAddDialog.tpl.c:5
-msgid ""
-"This dialog allows you to add new services to the currenty edited server "
-"object. The box below shows all available but not already used services."
-msgstr ""
-
-#: admin/systems/services/ServiceAddDialog.tpl.c:8
-msgid "Service to add"
-msgstr ""
-
-#: admin/systems/services/ServiceAddDialog.tpl.c:11
-msgid "All available services are already in use."
-msgstr ""
-
-#: admin/systems/services/ServiceAddDialog.tpl.c:14
-#: admin/systems/SelectDeviceType.tpl.c:26
-msgid "Continue"
-msgstr ""
-
-#: admin/systems/SelectDeviceType.tpl.c:2
-msgid ""
-"This system has no system type configured. Please choose a system type for "
-"this object and an optional inheritance group. Press the 'continue' button "
-"to proceed."
-msgstr ""
-
-#: admin/systems/SelectDeviceType.tpl.c:5
-msgid ""
-"Please select a system type and an optional bundle of predefined settings to"
-" be inherited."
-msgstr ""
-
-#: admin/systems/SelectDeviceType.tpl.c:8
-msgid ""
-"Please select a system type and a bundle of predefined settings to be "
-"inherited."
-msgstr ""
-
-#: admin/systems/SelectDeviceType.tpl.c:11
-#: admin/systems/SelectDeviceType.tpl.c:14
-msgid "System type"
-msgstr ""
-
-#: admin/systems/SelectDeviceType.tpl.c:17
-msgid "Choose an object group as template"
-msgstr ""
-
-#: admin/systems/SelectDeviceType.tpl.c:20
-msgid "Object group"
-msgstr ""
-
-#: admin/systems/SelectDeviceType.tpl.c:23
-msgid "none"
-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] ""
-msgstr[4] ""
-msgstr[5] ""
-
-#: 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] ""
diff --git a/systems/locale/ca/fusiondirectory.po b/systems/locale/ca/fusiondirectory.po
index ad23eccec61ef171c0252fce9b3b591d83bf8e87..c7bc636bc19bdb0e06091532c6de80cc8fbb1188 100644
--- a/systems/locale/ca/fusiondirectory.po
+++ b/systems/locale/ca/fusiondirectory.po
@@ -5,12 +5,12 @@
 # Translators:
 msgid ""
 msgstr ""
-"Project-Id-Version: FusionDirectory-108\n"
+"Project-Id-Version: FusionDirectory-109\n"
 "Report-Msgid-Bugs-To: documentation@lists.fusiondirectory.org\n"
-"POT-Creation-Date: 2015-03-31 11:49+0200\n"
-"PO-Revision-Date: 2015-03-31 11:41+0000\n"
+"POT-Creation-Date: 2014-12-15 17:47+0100\n"
+"PO-Revision-Date: 2015-03-31 11:42+0000\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>\n"
-"Language-Team: Catalan (http://www.transifex.com/projects/p/FusionDirectory-108/language/ca/)\n"
+"Language-Team: Catalan (http://www.transifex.com/projects/p/FusionDirectory-109/language/ca/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -26,29 +26,24 @@ msgid "Locked"
 msgstr ""
 
 #: admin/ogroups/goto/class_termgroup.inc:118
-#: admin/systems/class_terminalGeneric.inc:121
+#: admin/systems/class_terminalStartup.inc:145
 msgid "Local swap"
 msgstr ""
 
 #: admin/ogroups/goto/class_termgroup.inc:124
 #: admin/ogroups/goto/class_termgroup.inc:136
-#: admin/systems/class_workstationGeneric.inc:352
-#: admin/systems/class_terminalGeneric.inc:109
-#: admin/systems/class_terminalGeneric.inc:125
+#: admin/systems/class_terminalStartup.inc:133
+#: admin/systems/class_terminalStartup.inc:149
 msgid "inherited"
 msgstr ""
 
 #: admin/ogroups/goto/class_termgroup.inc:220
-#: admin/systems/class_workstationGeneric.inc:72
-#: admin/systems/class_workstationGeneric.inc:443
-#: admin/systems/class_systemManagement.inc:295
-#: admin/systems/class_systemManagement.inc:325
-msgid "Infrastructure service"
+#: admin/systems/class_systemManagement.inc:165
+#: admin/systems/class_systemManagement.inc:186
+msgid "Service infrastructure"
 msgstr ""
 
 #: admin/ogroups/goto/class_termgroup.inc:224
-#: admin/systems/class_workstationGeneric.inc:75
-#: admin/systems/class_workstationGeneric.inc:78
 msgid "Event error"
 msgstr ""
 
@@ -58,12 +53,10 @@ msgid "Event '%s' is not available!"
 msgstr ""
 
 #: admin/ogroups/goto/class_termgroup.inc:274
-#: admin/systems/class_workstationGeneric.inc:112
 msgid "Switch off"
 msgstr ""
 
 #: admin/ogroups/goto/class_termgroup.inc:274
-#: admin/systems/class_workstationGeneric.inc:113
 msgid "Reboot"
 msgstr ""
 
@@ -84,7 +77,6 @@ msgid "Reinstall"
 msgstr ""
 
 #: admin/ogroups/goto/class_termgroup.inc:279
-#: admin/systems/class_workstationGeneric.inc:108
 msgid "Memory test"
 msgstr ""
 
@@ -93,21 +85,18 @@ msgid "System analysis"
 msgstr ""
 
 #: admin/ogroups/goto/class_termgroup.inc:386
-#: admin/systems/class_printGeneric.inc:670
-#: admin/systems/class_printGeneric.inc:970
-#: admin/systems/class_systemManagement.inc:816
 #: admin/systems/services/class_goService.inc:123
 #: admin/systems/services/class_goService.inc:151
 #: admin/systems/services/class_goService.inc:187
-#: admin/systems/class_networkSettings.inc:478
-#: admin/systems/class_networkSettings.inc:491
-#: admin/systems/class_networkSettings.inc:757
-#: admin/systems/class_networkSettings.inc:816
-#: admin/systems/class_networkSettings.inc:835
-#: admin/systems/class_networkSettings.inc:852
-#: admin/systems/class_networkSettings.inc:861
-#: admin/systems/class_networkSettings.inc:879
-#: admin/systems/class_networkSettings.inc:951
+#: admin/systems/class_networkSettings.inc:470
+#: admin/systems/class_networkSettings.inc:483
+#: admin/systems/class_networkSettings.inc:749
+#: admin/systems/class_networkSettings.inc:808
+#: admin/systems/class_networkSettings.inc:827
+#: admin/systems/class_networkSettings.inc:844
+#: admin/systems/class_networkSettings.inc:853
+#: admin/systems/class_networkSettings.inc:871
+#: admin/systems/class_networkSettings.inc:943
 msgid "LDAP error"
 msgstr "Error d'LDAP"
 
@@ -119,195 +108,125 @@ msgstr ""
 msgid "System group"
 msgstr ""
 
-#: admin/ogroups/goto/class_termgroup.inc:401
-#: admin/ogroups/goto/termgroup.tpl.c:17
+#: admin/ogroups/goto/class_termgroup.inc:402
 msgid "Mode"
 msgstr ""
 
-#: admin/ogroups/goto/class_termgroup.inc:402
-#: admin/systems/class_workstationGeneric.inc:189
-#: admin/ogroups/goto/termgroup.tpl.c:23
+#: admin/ogroups/goto/class_termgroup.inc:403
+#: admin/systems/class_systemServers.inc:35
 msgid "Syslog server"
 msgstr ""
 
-#: admin/ogroups/goto/class_termgroup.inc:403
+#: admin/ogroups/goto/class_termgroup.inc:404
 msgid "Action flag"
 msgstr ""
 
-#: admin/ogroups/goto/class_termgroup.inc:404
+#: admin/ogroups/goto/class_termgroup.inc:405
 msgid "Ntp server"
 msgstr ""
 
-#: admin/ogroups/goto/class_termgroup.inc:405
-#: admin/systems/class_terminalGeneric.inc:41
-#: admin/ogroups/goto/termgroup.tpl.c:29
+#: admin/ogroups/goto/class_termgroup.inc:406
+#: admin/systems/class_terminalStartup.inc:65
 msgid "Root server"
 msgstr ""
 
-#: admin/ogroups/goto/class_termgroup.inc:406
-#: admin/systems/class_terminalGeneric.inc:47
-#: admin/ogroups/goto/termgroup.tpl.c:35
+#: admin/ogroups/goto/class_termgroup.inc:407
+#: admin/systems/class_terminalStartup.inc:69
 msgid "Swap server"
 msgstr ""
 
-#: admin/systems/class_terminalStartup.inc:63
+#: admin/systems/class_terminalStartup.inc:62
 msgid "Startup parameters"
 msgstr ""
 
-#: admin/systems/class_terminalStartup.inc:66
+#: admin/systems/class_terminalStartup.inc:65
+msgid "The root server the terminal should be using"
+msgstr ""
+
+#: admin/systems/class_terminalStartup.inc:69
+msgid "The swap server the terminal should be using"
+msgstr ""
+
+#: admin/systems/class_terminalStartup.inc:73
 msgid "Boot kernel"
 msgstr ""
 
-#: admin/systems/class_terminalStartup.inc:66
+#: admin/systems/class_terminalStartup.inc:73
 msgid "Linux kernel to be installed and booted"
 msgstr ""
 
-#: admin/systems/class_terminalStartup.inc:70
+#: admin/systems/class_terminalStartup.inc:77
 msgid "Boot kernel parameters"
 msgstr ""
 
-#: admin/systems/class_terminalStartup.inc:70
+#: admin/systems/class_terminalStartup.inc:77
 msgid "Linux kernel parameters to be ran"
 msgstr ""
 
-#: admin/systems/class_terminalStartup.inc:82
-msgid "Startup"
-msgstr ""
-
 #: admin/systems/class_terminalStartup.inc:83
-msgid "Terminal startup"
-msgstr ""
-
-#: admin/systems/system-list.xml:10
-msgid "List of systems"
-msgstr ""
-
-#: admin/systems/system-list.xml:14
-msgid "New workstation"
-msgstr ""
-
-#: admin/systems/system-list.xml:22
-msgid "Locked server"
-msgstr ""
-
-#: admin/systems/system-list.xml:30
-msgid "Locked workstation"
-msgstr ""
-
-#: admin/systems/system-list.xml:38
-msgid "Locked terminal"
-msgstr ""
-
-#: admin/systems/system-list.xml:47
-msgid "New terminal"
-msgstr ""
-
-#: admin/systems/system-list.xml:55
-msgid "New device"
-msgstr ""
-
-#: admin/systems/system-list.xml:63
-msgid "Workstation template"
-msgstr ""
-
-#: admin/systems/system-list.xml:71
-msgid "Terminal template"
+msgid "Remote desktop"
 msgstr ""
 
-#: admin/systems/system-list.xml:79
-msgid "Winstation"
+#: admin/systems/class_terminalStartup.inc:87
+msgid "Connect method"
 msgstr ""
 
-#: admin/systems/system-list.xml:87 admin/systems/system-list.xml:234
-#: admin/systems/class_systemImport.inc:169
-#: admin/systems/class_serverGeneric.inc:46
-#: admin/systems/class_serverGeneric.inc:51
-#: admin/systems/class_serverGeneric.inc:52
-#: admin/systems/class_SelectDeviceType.inc:58
-msgid "Server"
+#: admin/systems/class_terminalStartup.inc:91
+msgid "XDMCP"
 msgstr ""
 
-#: admin/systems/system-list.xml:95 admin/systems/system-list.xml:242
-#: admin/systems/class_workstationGeneric.inc:458
-#: admin/systems/class_workstationGeneric.inc:463
-#: admin/systems/class_workstationGeneric.inc:464
-#: admin/systems/class_SelectDeviceType.inc:58
-msgid "Workstation"
+#: admin/systems/class_terminalStartup.inc:91
+msgid "LDM"
 msgstr ""
 
-#: admin/systems/system-list.xml:103 admin/systems/system-list.xml:250
-#: admin/systems/class_terminalGeneric.inc:81
-#: admin/systems/class_terminalGeneric.inc:86
-#: admin/systems/class_terminalGeneric.inc:87
-#: admin/systems/class_SelectDeviceType.inc:58
-msgid "Terminal"
-msgstr ""
+#: admin/systems/class_terminalStartup.inc:91
+msgid "Shell"
+msgstr "IntÃ¨rpret d'ordres"
 
-#: admin/systems/system-list.xml:111 admin/systems/class_printGeneric.inc:1005
-#: admin/systems/class_printGeneric.inc:1011
-#: admin/systems/class_printGeneric.inc:1012
-msgid "Printer"
+#: admin/systems/class_terminalStartup.inc:91
+msgid "Telnet"
 msgstr ""
 
-#: admin/systems/system-list.xml:119 admin/systems/system-list.xml:274
-#: admin/systems/class_mobilePhoneGeneric.inc:74
-#: admin/systems/phoneSelect/phoneSelect-list.xml:14
-msgid "Phone"
-msgstr "TelÃ¨fon"
-
-#: admin/systems/system-list.xml:127
-#: admin/systems/class_mobilePhoneGeneric.inc:36
-#: admin/systems/class_mobilePhoneGeneric.inc:41
-#: admin/systems/class_mobilePhoneGeneric.inc:42
-#: admin/systems/phoneSelect/phoneSelect-list.xml:22
-msgid "Mobile phone"
+#: admin/systems/class_terminalStartup.inc:91
+msgid "Windows RDP"
 msgstr ""
 
-#: admin/systems/system-list.xml:135
-#: admin/systems/class_componentGeneric.inc:36
-msgid "Component"
+#: admin/systems/class_terminalStartup.inc:95
+msgid "Terminal server"
 msgstr ""
 
-#: admin/systems/system-list.xml:143 admin/systems/system-list.xml:298
-msgid "IPMI"
+#: admin/systems/system-list.xml:10
+msgid "List of systems"
 msgstr ""
 
-#: admin/systems/system-list.xml:169
-#: admin/systems/class_workstationGeneric.inc:154
-#: admin/systems/class_printGeneric.inc:752
-#: admin/systems/class_printGeneric.inc:762
-#: admin/systems/class_printGeneric.inc:781
-#: admin/systems/class_printGeneric.inc:1022
-#: admin/systems/class_componentGeneric.inc:64
-#: admin/systems/class_mobilePhoneGeneric.inc:63
-#: admin/systems/phoneSelect/phoneSelect-list.xml:48
+#: admin/systems/system-list.xml:31
+#: admin/systems/class_workstationGeneric.inc:46
+#: admin/systems/class_printGeneric.inc:60
+#: admin/systems/class_componentGeneric.inc:58
+#: admin/systems/class_mobilePhoneGeneric.inc:60
 #: admin/systems/services/shares/class_serviceShare.inc:52
-#: admin/systems/system-filter.tpl.c:32
-#: admin/systems/phoneSelect/phoneSelect-filter.tpl.c:11
 msgid "Name"
 msgstr "Nom"
 
-#: admin/systems/system-list.xml:177
-#: admin/systems/phoneSelect/phoneSelect-list.xml:63
+#: admin/systems/system-list.xml:39
 msgid "IP"
 msgstr ""
 
-#: admin/systems/system-list.xml:185
+#: admin/systems/system-list.xml:47
 msgid "MAC"
 msgstr ""
 
-#: admin/systems/system-list.xml:193
-#: admin/systems/class_workstationGeneric.inc:160
-#: admin/systems/class_printGeneric.inc:1024
-#: admin/systems/class_componentGeneric.inc:68
-#: admin/systems/class_mobilePhoneGeneric.inc:67
+#: admin/systems/system-list.xml:55
+#: admin/systems/class_workstationGeneric.inc:51
+#: admin/systems/class_printGeneric.inc:64
+#: admin/systems/class_componentGeneric.inc:62
+#: admin/systems/class_mobilePhoneGeneric.inc:64
 #: admin/systems/serverService-list.xml:35
 #: admin/systems/services/shares/class_serviceShare.inc:56
-#: admin/systems/printer.tpl.c:8 admin/systems/printer.tpl.c:17
 msgid "Description"
 msgstr ""
 
-#: admin/systems/system-list.xml:201 admin/systems/class_serverService.inc:57
+#: admin/systems/system-list.xml:63 admin/systems/class_serverService.inc:57
 #: admin/systems/services/terminal/class_serviceTerminal.inc:30
 #: admin/systems/services/cups/class_serviceCUPS.inc:85
 #: admin/systems/services/shares/class_serviceShare.inc:31
@@ -316,378 +235,186 @@ msgstr ""
 msgid "Services"
 msgstr ""
 
-#: admin/systems/system-list.xml:209
+#: admin/systems/system-list.xml:71
 msgid "Release"
 msgstr ""
 
-#: admin/systems/system-list.xml:217 admin/systems/serverService-list.xml:43
-#: admin/systems/phoneSelect/phoneSelect-list.xml:70
+#: admin/systems/system-list.xml:79 admin/systems/serverService-list.xml:43
 msgid "Actions"
 msgstr ""
 
-#: admin/systems/system-list.xml:228 admin/systems/serverService-list.xml:54
+#: admin/systems/system-list.xml:90 admin/systems/serverService-list.xml:54
 msgid "Create"
 msgstr ""
 
-#: admin/systems/system-list.xml:258
-msgid "winStation"
-msgstr ""
-
-#: admin/systems/system-list.xml:266
-msgid "Network printer"
-msgstr ""
-
-#: admin/systems/system-list.xml:282
-#: admin/systems/class_componentGeneric.inc:41
-#: admin/systems/class_componentGeneric.inc:42
-msgid "Network device"
-msgstr ""
-
-#: admin/systems/system-list.xml:290
-msgid "Mobile Phone"
-msgstr ""
-
-#: admin/systems/system-list.xml:310
+#: admin/systems/system-list.xml:100
 msgid "Trigger action"
 msgstr ""
 
-#: admin/systems/system-list.xml:317
+#: admin/systems/system-list.xml:107
 msgid "Schedule action"
 msgstr ""
 
-#: admin/systems/system-list.xml:330
-msgid "Activate systems"
-msgstr ""
-
-#: admin/systems/system-list.xml:337 admin/systems/serverService-list.xml:69
-#: admin/systems/printer.tpl.c:35
+#: admin/systems/system-list.xml:119 admin/systems/serverService-list.xml:69
 msgid "Remove"
 msgstr ""
 
-#: admin/systems/system-list.xml:367
-msgid "Create ISO"
-msgstr ""
-
-#: admin/systems/system-list.xml:379
+#: admin/systems/system-list.xml:150
 msgid "Edit system"
 msgstr ""
 
-#: admin/systems/system-list.xml:392
+#: admin/systems/system-list.xml:163
 msgid "Remove system"
 msgstr ""
 
-#: admin/systems/class_workstationGeneric.inc:75
-#, php-format
-msgid "Event %s is not available!"
-msgstr ""
-
-#: admin/systems/class_workstationGeneric.inc:78
-msgid "Events are not available!"
-msgstr ""
-
-#: admin/systems/class_workstationGeneric.inc:106
-msgid "(Re)Install"
-msgstr ""
-
-#: admin/systems/class_workstationGeneric.inc:107
-msgid "Software update"
-msgstr ""
-
-#: admin/systems/class_workstationGeneric.inc:115
-msgid "Wake up"
-msgstr ""
-
-#: admin/systems/class_workstationGeneric.inc:144
-#: admin/systems/class_printGeneric.inc:604
+#: admin/systems/class_workstationGeneric.inc:35
 msgid "workstation"
 msgstr ""
 
-#: admin/systems/class_workstationGeneric.inc:151
-#: admin/systems/class_componentGeneric.inc:61
-#: admin/systems/class_mobilePhoneGeneric.inc:60
+#: admin/systems/class_workstationGeneric.inc:42
+#: admin/systems/class_printGeneric.inc:56
+#: admin/systems/class_componentGeneric.inc:55
+#: admin/systems/class_mobilePhoneGeneric.inc:56
 msgid "Properties"
 msgstr ""
 
-#: admin/systems/class_workstationGeneric.inc:155
+#: admin/systems/class_workstationGeneric.inc:47
 #, php-format
 msgid "The name of the %s"
 msgstr ""
 
-#: admin/systems/class_workstationGeneric.inc:161
+#: admin/systems/class_workstationGeneric.inc:52
 #, php-format
 msgid "A short description of the %s"
 msgstr ""
 
-#: admin/systems/class_workstationGeneric.inc:166
-#: admin/systems/class_printGeneric.inc:1025
+#: admin/systems/class_workstationGeneric.inc:56
 msgid "Location"
 msgstr "LocalitzaciÃ³"
 
-#: admin/systems/class_workstationGeneric.inc:167
+#: admin/systems/class_workstationGeneric.inc:57
 #, php-format
 msgid "The location of the %s"
 msgstr ""
 
-#: admin/systems/class_workstationGeneric.inc:173
+#: admin/systems/class_workstationGeneric.inc:61
 #, php-format
 msgid "Lock this %s"
 msgstr ""
 
-#: admin/systems/class_workstationGeneric.inc:174
+#: admin/systems/class_workstationGeneric.inc:62
 #, php-format
 msgid "This will prevent the %s from being reinstalled"
 msgstr ""
 
-#: admin/systems/class_workstationGeneric.inc:185
-#: addons/dashboard/class_dashBoardSystems.inc:48
-msgid "Servers"
-msgstr ""
-
-#: admin/systems/class_workstationGeneric.inc:190
-#, php-format
-msgid "The syslog server the %s should be using"
-msgstr ""
-
-#: admin/systems/class_workstationGeneric.inc:195
-msgid "Inherit NTP servers"
-msgstr ""
-
-#: admin/systems/class_workstationGeneric.inc:196
-msgid "Inherit time server attributes from ogroup"
-msgstr ""
-
-#: admin/systems/class_workstationGeneric.inc:202
-msgid "NTP servers"
+#: admin/systems/class_workstationGeneric.inc:73
+#: admin/systems/class_printGeneric.inc:83
+#: admin/systems/class_componentGeneric.inc:69
+#: admin/systems/class_mobilePhoneGeneric.inc:102
+#: admin/systems/class_networkSettings.inc:1008
+msgid "Network settings"
 msgstr ""
 
-#: admin/systems/class_workstationGeneric.inc:203
-#, php-format
-msgid "The NTP servers for the %s"
+#: admin/systems/class_workstationGeneric.inc:78
+#: admin/systems/class_printGeneric.inc:87
+#: admin/systems/class_componentGeneric.inc:73
+#: admin/systems/class_mobilePhoneGeneric.inc:106
+#: admin/systems/class_networkSettings.inc:630
+#: admin/systems/class_networkSettings.inc:643
+#: admin/systems/class_networkSettings.inc:645
+#: admin/systems/class_networkSettings.inc:1014
+msgid "IP address"
 msgstr ""
 
-#: admin/systems/class_workstationGeneric.inc:209
-msgid "Inherit LDAP servers"
+#: admin/systems/class_workstationGeneric.inc:78
+msgid "IP addresses this system uses (v4 or v6)"
 msgstr ""
 
-#: admin/systems/class_workstationGeneric.inc:210
-msgid "Inherit LDAP server attributes from ogroup"
+#: admin/systems/class_workstationGeneric.inc:83
+#: admin/systems/class_printGeneric.inc:91
+#: admin/systems/class_componentGeneric.inc:77
+#: admin/systems/class_mobilePhoneGeneric.inc:110
+msgid "Mac address"
 msgstr ""
 
-#: admin/systems/class_workstationGeneric.inc:216
-msgid "LDAP servers"
+#: admin/systems/class_workstationGeneric.inc:83
+#: admin/systems/class_printGeneric.inc:91
+#: admin/systems/class_componentGeneric.inc:77
+#: admin/systems/class_mobilePhoneGeneric.inc:110
+msgid "Mac address of this system"
 msgstr ""
 
-#: admin/systems/class_workstationGeneric.inc:217
-#, php-format
-msgid "The LDAP servers for the %s"
+#: admin/systems/class_workstationGeneric.inc:125
+#: admin/systems/class_workstationGeneric.inc:130
+#: admin/systems/class_workstationGeneric.inc:131
+msgid "Workstation"
 msgstr ""
 
-#: admin/systems/class_workstationGeneric.inc:225
-#: admin/systems/class_workstationGeneric.inc:229
-#: admin/ogroups/goto/termgroup.tpl.c:41
-msgid "Action"
+#: admin/systems/class_workstationGeneric.inc:126
+msgid "Workstation information"
 msgstr ""
 
-#: admin/systems/class_workstationGeneric.inc:230
-#: admin/ogroups/goto/termgroup.tpl.c:44
-msgid "Select action to execute for this terminal"
+#: admin/systems/class_printGeneric.inc:32
+#: admin/systems/class_printGeneric.inc:37
+#: admin/systems/class_printGeneric.inc:38
+msgid "Printer"
 msgstr ""
 
-#: admin/systems/class_workstationGeneric.inc:236
-#: admin/systems/class_componentGeneric.inc:75
-#: admin/systems/class_mobilePhoneGeneric.inc:106
-#: admin/systems/class_networkSettings.inc:1016
-msgid "Network settings"
+#: admin/systems/class_printGeneric.inc:33
+msgid "Printer information"
 msgstr ""
 
-#: admin/systems/class_workstationGeneric.inc:459
-msgid "Workstation information"
+#: admin/systems/class_printGeneric.inc:60
+msgid "The name of the printer"
 msgstr ""
 
-#: admin/systems/class_printGeneric.inc:131
-#: admin/systems/class_printGeneric.inc:1065
-#: admin/systems/class_systemManagement.inc:678
-msgid "Internal error"
+#: admin/systems/class_printGeneric.inc:64
+msgid "A short description of the printer"
 msgstr ""
 
-#: admin/systems/class_printGeneric.inc:131
-#, php-format
-msgid ""
-"Cannot determine a valid department for this object. Setting base to '%s'!"
-msgstr ""
-
-#: admin/systems/class_printGeneric.inc:311
-#: admin/systems/class_printGeneric.inc:319
-#: admin/systems/class_printGeneric.inc:324
-#: admin/systems/class_printGeneric.inc:374
-#: admin/systems/class_printGeneric.inc:390
-#: admin/systems/class_printGeneric.inc:393
-msgid "Add printer extension"
+#: admin/systems/class_printGeneric.inc:70
+msgid "Details"
 msgstr ""
 
-#: admin/systems/class_printGeneric.inc:312
-msgid ""
-"Could not initialize printer tab, parameter parent was missing while "
-"construction."
+#: admin/systems/class_printGeneric.inc:73
+msgid "Printer location"
 msgstr ""
 
-#: admin/systems/class_printGeneric.inc:320
-msgid "This is a workstation template, printer tab is disabled."
+#: admin/systems/class_printGeneric.inc:73
+msgid "The location of the printer"
 msgstr ""
 
-#: admin/systems/class_printGeneric.inc:325
-msgid "This is a terminal template, printer tab is disabled."
+#: admin/systems/class_printGeneric.inc:77
+msgid "Printer URL"
 msgstr ""
 
-#: admin/systems/class_printGeneric.inc:367
-#: admin/systems/class_printGeneric.inc:375
-#: admin/systems/class_printGeneric.inc:383
-#: admin/systems/class_printGeneric.inc:386
-#: admin/systems/class_printGeneric.inc:391
-#: admin/systems/class_printGeneric.inc:394
-msgid "printer"
+#: admin/systems/class_printGeneric.inc:77
+msgid "The URL of the printer"
 msgstr ""
 
-#: admin/systems/class_printGeneric.inc:375
-msgid ""
-"You can't enable it while 'cn' is not present in entry. Possibly you are "
-"currently creating a new terminal template."
+#: admin/systems/class_printGeneric.inc:87
+#: admin/systems/class_componentGeneric.inc:73
+#: admin/systems/class_mobilePhoneGeneric.inc:106
+msgid "IP address this system uses"
 msgstr ""
 
-#: admin/systems/class_printGeneric.inc:382
-#: admin/systems/class_printGeneric.inc:385
-msgid "Remove printer extension"
+#: admin/systems/class_serverService.inc:58
+msgid "Server services"
 msgstr ""
 
-#: admin/systems/class_printGeneric.inc:474
-#: admin/systems/class_printGeneric.inc:652
-#: admin/systems/class_printGeneric.inc:659
-#: admin/systems/class_printGeneric.inc:718
-#: admin/systems/class_printGeneric.inc:1105
-#: admin/systems/class_printGeneric.inc:1116
 #: admin/systems/class_serverService.inc:224
 #: admin/systems/class_serverService.inc:270
 #: admin/systems/class_serverService.inc:393
-#: admin/systems/class_systemManagement.inc:341
-#: admin/systems/class_systemManagement.inc:624
-#: admin/systems/class_systemManagement.inc:639
 #: admin/systems/services/shares/class_serviceShare.inc:103
-#: admin/systems/class_networkSettings.inc:305
-#: admin/systems/class_networkSettings.inc:336
-#: admin/systems/class_networkSettings.inc:584
-#: admin/systems/class_networkSettings.inc:591
-#: admin/systems/class_networkSettings.inc:597
-#: admin/systems/class_networkSettings.inc:604
+#: admin/systems/class_networkSettings.inc:297
+#: admin/systems/class_networkSettings.inc:328
+#: admin/systems/class_networkSettings.inc:576
+#: admin/systems/class_networkSettings.inc:583
+#: admin/systems/class_networkSettings.inc:589
+#: admin/systems/class_networkSettings.inc:596
 msgid "Error"
 msgstr "Error"
 
-#: admin/systems/class_printGeneric.inc:577
-#, php-format
-msgid "Your currently selected PPD file '%s' doesn't exist."
-msgstr ""
-
-#: admin/systems/class_printGeneric.inc:583
-msgid "Not defined"
-msgstr ""
-
-#: admin/systems/class_printGeneric.inc:587
-#: admin/systems/ppd/class_printerPPDDialog.inc:116
-msgid "Can't get ppd informations."
-msgstr ""
-
-#: admin/systems/class_printGeneric.inc:602
-#: admin/systems/class_printGeneric.inc:604
-#, php-format
-msgid "This printer belongs to %s. You can't rename this printer."
-msgstr ""
-
-#: admin/systems/class_printGeneric.inc:602
-#: admin/systems/class_terminalGeneric.inc:34
-msgid "terminal"
-msgstr ""
-
-#: admin/systems/class_printGeneric.inc:652
-#: admin/systems/class_printGeneric.inc:659
-msgid "Object is no printer!"
-msgstr ""
-
-#: admin/systems/class_printGeneric.inc:767 admin/systems/printer.tpl.c:23
-msgid "Printer URL"
-msgstr ""
-
-#: admin/systems/class_printGeneric.inc:989
-#: admin/systems/class_printGeneric.inc:991
-msgid "Group"
-msgstr ""
-
-#: admin/systems/class_printGeneric.inc:994
-msgid "User"
-msgstr ""
-
-#: admin/systems/class_printGeneric.inc:1006
-msgid "Printer information"
-msgstr ""
-
-#: admin/systems/class_printGeneric.inc:1023
-#: admin/systems/serverService-list.tpl.c:2
-#: admin/systems/phoneSelect/phoneSelect-list.tpl.c:2
-#: admin/systems/printer.tpl.c:11
-msgid "Base"
-msgstr "Base"
-
-#: admin/systems/class_printGeneric.inc:1026
-msgid "LabeledURL"
-msgstr ""
-
-#: admin/systems/class_printGeneric.inc:1027
-msgid "Printer PPD"
-msgstr ""
-
-#: admin/systems/class_printGeneric.inc:1028 admin/systems/printer.tpl.c:38
-msgid "Permissions"
-msgstr ""
-
-#: admin/systems/class_printGeneric.inc:1030
-msgid "Windows inf file"
-msgstr ""
-
-#: admin/systems/class_printGeneric.inc:1031
-msgid "Windows driver dir"
-msgstr ""
-
-#: admin/systems/class_printGeneric.inc:1032 admin/systems/printer.tpl.c:62
-msgid "Driver printer name"
-msgstr ""
-
-#: admin/systems/class_printGeneric.inc:1048
-#: admin/systems/class_printGeneric.inc:1070
-msgid "Permission error"
-msgstr ""
-
-#: admin/systems/class_printGeneric.inc:1048
-#: admin/systems/class_printGeneric.inc:1070
-msgid "printer user"
-msgstr ""
-
-#: admin/systems/class_printGeneric.inc:1065
-#, php-format
-msgid "Illegal member type '%s'!"
-msgstr ""
-
-#: admin/systems/class_printGeneric.inc:1105
-#, php-format
-msgid "'%s' is already used!"
-msgstr ""
-
-#: admin/systems/class_printGeneric.inc:1116
-#, php-format
-msgid "'%s' does not exist!"
-msgstr ""
-
-#: admin/systems/class_serverService.inc:58
-msgid "Server services"
-msgstr ""
-
 #: admin/systems/class_serverService.inc:332
 msgid "Filter error"
 msgstr ""
@@ -711,313 +438,163 @@ msgstr ""
 msgid "Could not get execute action %s on service %s."
 msgstr ""
 
-#: admin/systems/class_terminalGeneric.inc:42
-#, php-format
-msgid "The root server the terminal should be using"
+#: admin/systems/class_terminalGeneric.inc:31
+msgid "terminal"
 msgstr ""
 
+#: admin/systems/class_terminalGeneric.inc:43
 #: admin/systems/class_terminalGeneric.inc:48
-#, php-format
-msgid "The swap server the terminal should be using"
-msgstr ""
-
-#: admin/systems/class_terminalGeneric.inc:54
-msgid "Remote desktop"
-msgstr ""
-
-#: admin/systems/class_terminalGeneric.inc:58
-msgid "Connect method"
-msgstr ""
-
-#: admin/systems/class_terminalGeneric.inc:62
-msgid "XDMCP"
-msgstr ""
-
-#: admin/systems/class_terminalGeneric.inc:62
-msgid "LDM"
-msgstr ""
-
-#: admin/systems/class_terminalGeneric.inc:62
-msgid "Shell"
-msgstr "IntÃ¨rpret d'ordres"
-
-#: admin/systems/class_terminalGeneric.inc:62
-msgid "Telnet"
-msgstr ""
-
-#: admin/systems/class_terminalGeneric.inc:62
-msgid "Windows RDP"
-msgstr ""
-
-#: admin/systems/class_terminalGeneric.inc:66
-msgid "Terminal server"
+#: admin/systems/class_terminalGeneric.inc:49
+msgid "Terminal"
 msgstr ""
 
-#: admin/systems/class_terminalGeneric.inc:82
+#: admin/systems/class_terminalGeneric.inc:44
 msgid "Terminal information"
 msgstr ""
 
-#: admin/systems/ppd/class_printerPPDSelectionDialog.inc:91
-#: admin/systems/ppd/class_printerPPDSelectionDialog.inc:116
-#: admin/systems/ppd/class_printerPPDSelectionDialog.inc:139
-#: admin/systems/ppd/class_printerPPDDialog.inc:92
-#: admin/systems/ppd/class_printerPPDDialog.inc:160
-#: admin/systems/ppd/class_printerPPDDialog.inc:241
-#: admin/systems/ppd/class_printerPPDDialog.inc:256
-#: admin/systems/ppd/class_printerPPDDialog.inc:269
-#: admin/systems/ppd/class_printerPPDDialog.inc:297
-#: admin/systems/ppd/class_printerPPDDialog.inc:314
-#: admin/systems/ppd/class_printerPPDDialog.inc:337
-#: admin/systems/ppd/class_printerPPDDialog.inc:351
-#: admin/systems/ppd/class_printerPPDDialog.inc:361
-#: admin/systems/ppd/class_printerPPDDialog.inc:365
-#: admin/systems/ppd/class_printerPPDDialog.inc:560
-#: admin/systems/ppd/class_printerPPDDialog.inc:577
-#: admin/systems/ppd/class_printerPPDDialog.inc:580
-#: admin/systems/ppd/class_printerPPDDialog.inc:583
-msgid "PPD error"
-msgstr ""
-
-#: admin/systems/ppd/class_printerPPDSelectionDialog.inc:139
-#, php-format
-msgid "Cannot locate vendor '%s' in available PPDs!"
-msgstr ""
-
-#: admin/systems/ppd/class_printerPPDSelectionDialog.inc:148
-msgid "Printer ppd selection."
-msgstr ""
-
-#: admin/systems/ppd/class_printerPPDSelectionDialog.inc:155
-msgid "delete"
-msgstr ""
-
-#: admin/systems/ppd/class_printerPPDSelectionDialog.inc:166
-msgid "back"
-msgstr ""
-
-#: admin/systems/ppd/class_printerPPDDialog.inc:74
-#: admin/systems/ppd/class_printerPPDDialog.inc:140
-#: admin/systems/services/class_goService.inc:241
-msgid "Configuration error"
-msgstr "Error de la configuraciÃ³"
-
-#: admin/systems/ppd/class_printerPPDDialog.inc:92
-#, php-format
-msgid "Cannot open PPD '%s'!"
-msgstr ""
-
-#: admin/systems/ppd/class_printerPPDDialog.inc:141
-#, php-format
-msgid "Cannot open PPD path '%s' for reading and writing!"
-msgstr ""
-
-#: admin/systems/ppd/class_printerPPDDialog.inc:160
-#: admin/systems/ppd/class_printerPPDDialog.inc:365
-msgid "file is empty"
-msgstr ""
-
-#: admin/systems/ppd/class_printerPPDDialog.inc:314
-#, php-format
-msgid "Cannot parse PPD '%s'!"
-msgstr ""
-
-#: admin/systems/ppd/class_printerPPDDialog.inc:340
-msgid "Overwrite existing PPD"
-msgstr ""
-
-#: admin/systems/ppd/class_printerPPDDialog.inc:341
-msgid ""
-"There is already a ppd file for this kind of printer. Do you want to "
-"overwrite it?"
-msgstr ""
-
-#: admin/systems/ppd/class_printerPPDDialog.inc:491
-msgid "Section"
-msgstr ""
-
-#: admin/systems/ppd/class_printerPPDDialog.inc:551
-#: admin/systems/ppd/class_printerPPDDialog.inc:554
-msgid "True"
-msgstr ""
-
-#: admin/systems/ppd/class_printerPPDDialog.inc:552
-#: admin/systems/ppd/class_printerPPDDialog.inc:555
-msgid "False"
-msgstr ""
-
-#: admin/systems/ppd/class_printerPPDDialog.inc:560
-#, php-format
-msgid "PPD type '%s' is not supported!"
-msgstr ""
-
-#: admin/systems/ppd/class_printerPPDDialog.inc:597
-msgid ""
-"Please select a valid ppd file or use 'Cancel' to go back to printer "
-"configuration."
-msgstr ""
-
-#: admin/systems/ppd/class_ppdManager.inc:44
-#: admin/systems/ppd/class_ppdManager.inc:188
-#: admin/systems/ppd/class_ppdManager.inc:190
-msgid "PPD manager error"
-msgstr ""
-
-#: admin/systems/ppd/class_ppdManager.inc:44
-#, php-format
-msgid "The specified path '%s' does not exist."
-msgstr ""
-
-#: admin/systems/ppd/class_ppdManager.inc:188
+#: admin/systems/class_systemImport.inc:72
 #, php-format
-msgid "Specified PPD file '%s' cannot be opened for reading."
+msgid "Could not parse %s"
 msgstr ""
 
-#: admin/systems/ppd/class_ppdManager.inc:190
+#: admin/systems/class_systemImport.inc:116
 #, php-format
-msgid "The temporary file '%s' cannot be opened for writing."
-msgstr ""
-
-#: admin/systems/ppd/class_ppdManager.inc:212
-#: admin/systems/ppd/class_ppdManager.inc:350
-msgid "Parsing PPD file failed - file is empty!"
+msgid "No DHCP server found for ip %s"
 msgstr ""
 
-#: admin/systems/ppd/class_ppdManager.inc:222
+#: admin/systems/class_systemImport.inc:130
 #, php-format
-msgid ""
-"Parsing PPD file %s failed - line too long. Trailing characters have been "
-"ignored!"
-msgstr ""
-
-#: admin/systems/ppd/class_ppdManager.inc:230
-msgid "Nested groups are not supported!"
+msgid "No DNS server found for zone %s"
 msgstr ""
 
-#: admin/systems/ppd/class_ppdManager.inc:234
-msgid "Group name not unique!"
+#: admin/systems/class_systemImport.inc:165
+msgid "Import"
 msgstr ""
 
-#: admin/systems/ppd/class_ppdManager.inc:240
-#: admin/systems/ppd/class_ppdManager.inc:270
-msgid "Symbol values are not supported yet!"
+#: admin/systems/class_systemImport.inc:169
+#: admin/systems/class_serverGeneric.inc:43
+#: admin/systems/class_serverGeneric.inc:48
+#: admin/systems/class_serverGeneric.inc:49
+msgid "Server"
 msgstr ""
 
-#: admin/systems/ppd/class_ppdManager.inc:264
-msgid "Nested options are not supported!"
+#: admin/systems/class_systemImport.inc:169
+msgid "The server you wish to import hosts from"
 msgstr ""
 
-#: admin/systems/ppd/class_ppdManager.inc:289
-msgid "PickMany is not supported yet!"
+#: admin/systems/class_serverGeneric.inc:31
+msgid "server"
 msgstr ""
 
-#: admin/systems/ppd/class_ppdManager.inc:370
-#, php-format
-msgid ""
-"Parsing PPD file %s failed - line too long. Trailing characters have been "
-"ignored"
+#: admin/systems/class_serverGeneric.inc:44
+msgid "Server information"
 msgstr ""
 
-#: admin/systems/ppd/class_ppdManager.inc:395
-#, php-format
-msgid "Parsing PPD file %s failed - no information found."
+#: admin/systems/class_componentGeneric.inc:31
+msgid "Component"
 msgstr ""
 
-#: admin/systems/class_systemImport.inc:72
-#, php-format
-msgid "Could not parse %s"
+#: admin/systems/class_componentGeneric.inc:32
+msgid "Component information"
 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/class_componentGeneric.inc:37
+msgid "Network device"
 msgstr ""
 
-#: admin/systems/class_systemImport.inc:130
-#, php-format
-msgid "No DNS server found for zone %s"
+#: admin/systems/class_componentGeneric.inc:58
+msgid "The name of the component"
 msgstr ""
 
-#: admin/systems/class_systemImport.inc:165
-msgid "Import"
+#: admin/systems/class_componentGeneric.inc:62
+msgid "A short description of the component"
 msgstr ""
 
-#: admin/systems/class_systemImport.inc:169
-msgid "The server you wish to import hosts from"
+#: admin/systems/class_systemServers.inc:31
+#: admin/systems/class_systemServers.inc:53
+msgid "Servers"
 msgstr ""
 
-#: admin/systems/class_serverGeneric.inc:34
-msgid "server"
+#: admin/systems/class_systemServers.inc:35
+msgid "The syslog server the system should be using"
 msgstr ""
 
-#: admin/systems/class_serverGeneric.inc:47
-msgid "Server information"
+#: admin/systems/class_systemServers.inc:40
+msgid "NTP servers"
 msgstr ""
 
-#: admin/systems/class_componentGeneric.inc:37
-msgid "Component information"
+#: admin/systems/class_systemServers.inc:40
+msgid "The NTP servers for this system"
 msgstr ""
 
-#: admin/systems/class_componentGeneric.inc:64
-msgid "The name of the component"
+#: admin/systems/class_systemServers.inc:54
+msgid "Servers this system is using"
 msgstr ""
 
-#: admin/systems/class_componentGeneric.inc:68
-msgid "A short description of the component"
+#: admin/systems/class_mobilePhoneGeneric.inc:32
+#: admin/systems/class_mobilePhoneGeneric.inc:37
+#: admin/systems/class_mobilePhoneGeneric.inc:38
+msgid "Mobile phone"
 msgstr ""
 
-#: admin/systems/class_mobilePhoneGeneric.inc:37
+#: admin/systems/class_mobilePhoneGeneric.inc:33
 msgid "Mobile phone information"
 msgstr ""
 
-#: admin/systems/class_mobilePhoneGeneric.inc:63
+#: admin/systems/class_mobilePhoneGeneric.inc:60
 msgid "The name of the mobile phone"
 msgstr ""
 
-#: admin/systems/class_mobilePhoneGeneric.inc:67
+#: admin/systems/class_mobilePhoneGeneric.inc:64
 msgid "A short description of the mobile phone"
 msgstr ""
 
-#: admin/systems/class_mobilePhoneGeneric.inc:77
+#: admin/systems/class_mobilePhoneGeneric.inc:70
+msgid "Phone"
+msgstr "TelÃ¨fon"
+
+#: admin/systems/class_mobilePhoneGeneric.inc:73
 msgid "Serial Number"
 msgstr ""
 
-#: admin/systems/class_mobilePhoneGeneric.inc:77
+#: admin/systems/class_mobilePhoneGeneric.inc:73
 msgid "The serial number of the mobile phone"
 msgstr ""
 
-#: admin/systems/class_mobilePhoneGeneric.inc:81
+#: admin/systems/class_mobilePhoneGeneric.inc:77
 msgid "IMEI Number"
 msgstr ""
 
-#: admin/systems/class_mobilePhoneGeneric.inc:81
+#: admin/systems/class_mobilePhoneGeneric.inc:77
 msgid "The IMEI number of the mobile phone"
 msgstr ""
 
-#: admin/systems/class_mobilePhoneGeneric.inc:86
+#: admin/systems/class_mobilePhoneGeneric.inc:82
 msgid "OS"
 msgstr ""
 
-#: admin/systems/class_mobilePhoneGeneric.inc:86
+#: admin/systems/class_mobilePhoneGeneric.inc:82
 msgid "The Operating System installed on this phone"
 msgstr ""
 
-#: admin/systems/class_mobilePhoneGeneric.inc:92
+#: admin/systems/class_mobilePhoneGeneric.inc:88
 msgid "SimCard"
 msgstr ""
 
-#: admin/systems/class_mobilePhoneGeneric.inc:95
+#: admin/systems/class_mobilePhoneGeneric.inc:91
 msgid "Telephone Number"
 msgstr ""
 
-#: admin/systems/class_mobilePhoneGeneric.inc:95
+#: admin/systems/class_mobilePhoneGeneric.inc:91
 msgid "The telephone number of the mobile phone"
 msgstr ""
 
-#: admin/systems/class_mobilePhoneGeneric.inc:99
+#: admin/systems/class_mobilePhoneGeneric.inc:95
 msgid "PUK Number"
 msgstr ""
 
-#: admin/systems/class_mobilePhoneGeneric.inc:99
+#: admin/systems/class_mobilePhoneGeneric.inc:95
 msgid "The PUK number of the simcard in this mobile phone"
 msgstr ""
 
@@ -1060,70 +637,20 @@ msgstr ""
 msgid "Remove service"
 msgstr ""
 
-#: admin/systems/phoneSelect/phoneSelect-list.xml:10
-msgid "Please select the desired entries"
-msgstr ""
-
-#: admin/systems/phoneSelect/phoneSelect-list.xml:56
-msgid "Number"
-msgstr ""
-
-#: admin/systems/phoneSelect/phoneSelect-list.xml:83
-msgid "Select this number"
-msgstr ""
-
-#: admin/systems/class_systemManagement.inc:177
-msgid "Back"
-msgstr "Enrere"
-
-#: admin/systems/class_systemManagement.inc:223
-msgid "Creating the image failed. Please see the report below."
-msgstr ""
-
-#: admin/systems/class_systemManagement.inc:228
-#, php-format
-msgid "Command '%s', specified for ISO creation doesn't seem to exist."
-msgstr ""
-
-#: admin/systems/class_systemManagement.inc:398
-#: admin/systems/class_systemManagement.inc:473
-#: admin/systems/class_systemManagement.inc:858
-#: admin/systems/class_systemManagement.inc:905
-#: admin/systems/class_systemManagement.inc:926
-msgid "Permission"
-msgstr ""
-
-#: admin/systems/class_systemManagement.inc:678
-msgid "Cannot set mode to 'active'!"
-msgstr ""
-
-#: admin/systems/class_systemManagement.inc:858
-#, php-format
-msgid "You are not allowed to create a snapshot for %s."
+#: admin/systems/class_systemManagement.inc:48
+#: config/systems/class_systemsPluginConfig.inc:28
+msgid "Systems"
 msgstr ""
 
-#: admin/systems/class_systemManagement.inc:905
-#: admin/systems/class_systemManagement.inc:926
-#, php-format
-msgid "You are not allowed to restore a snapshot for %s."
+#: admin/systems/class_systemManagement.inc:49
+msgid "Systems Management"
 msgstr ""
 
-#: admin/systems/class_systemManagement.inc:1169
+#: admin/systems/class_systemManagement.inc:250
 #, php-format
 msgid "Inherited from %s"
 msgstr ""
 
-#: admin/systems/class_systemManagement.inc:1224
-#: admin/systems/class_systemManagement.inc:1228
-#: addons/dashboard/class_dashBoardSystems.inc:199
-#: config/systems/class_systemsPluginConfig.inc:28
-msgid "Systems"
-msgstr ""
-
-#: admin/systems/class_systemManagement.inc:1225
-msgid "Systems Management"
-msgstr ""
-
 #: admin/systems/services/terminal/class_serviceTerminal.inc:29
 #: admin/systems/services/terminal/class_serviceTerminal.inc:30
 #: admin/systems/services/terminal/class_serviceTerminal.inc:41
@@ -1161,6 +688,10 @@ msgstr ""
 msgid "Empty service"
 msgstr ""
 
+#: admin/systems/services/class_goService.inc:241
+msgid "Configuration error"
+msgstr "Error de la configuraciÃ³"
+
 #: admin/systems/services/shares/class_serviceShare.inc:30
 #: admin/systems/services/shares/class_serviceShare.inc:31
 msgid "Share service"
@@ -1219,8 +750,6 @@ msgid "You need to configure encodings first"
 msgstr ""
 
 #: admin/systems/services/shares/class_serviceShare.inc:110
-#: admin/ogroups/goto/termgroup.tpl.c:2 admin/systems/remove.tpl.c:2
-#: admin/systems/ppd/remove_ppd.tpl.c:2
 msgid "Warning"
 msgstr "AvÃs"
 
@@ -1346,153 +875,93 @@ msgstr ""
 msgid "LDAP"
 msgstr ""
 
-#: admin/systems/class_networkSettings.inc:305
+#: admin/systems/class_networkSettings.inc:297
 msgid "NOT IMPLEMENTED"
 msgstr ""
 
-#: admin/systems/class_networkSettings.inc:437
+#: admin/systems/class_networkSettings.inc:429
 msgid "Not matching"
 msgstr ""
 
-#: admin/systems/class_networkSettings.inc:584
+#: admin/systems/class_networkSettings.inc:576
 #, php-format
 msgid "Was not able to contact argonaut server: %s"
 msgstr ""
 
-#: admin/systems/class_networkSettings.inc:591
+#: admin/systems/class_networkSettings.inc:583
 #, php-format
 msgid "Was not able to find DNS server for zone %s"
 msgstr ""
 
-#: admin/systems/class_networkSettings.inc:597
+#: admin/systems/class_networkSettings.inc:589
 #, php-format
 msgid "Was not able to find mac address of DNS server %s"
 msgstr ""
 
-#: admin/systems/class_networkSettings.inc:604
+#: admin/systems/class_networkSettings.inc:596
 #, php-format
 msgid "Was not able to launch ldap2zone: %s"
 msgstr ""
 
-#: admin/systems/class_networkSettings.inc:630
+#: admin/systems/class_networkSettings.inc:622
 #, php-format
 msgid "IP address %s"
 msgstr ""
 
-#: admin/systems/class_networkSettings.inc:638
-#: admin/systems/class_networkSettings.inc:651
-#: admin/systems/class_networkSettings.inc:653
-#: admin/systems/class_networkSettings.inc:1022
-msgid "IP address"
-msgstr ""
-
-#: admin/systems/class_networkSettings.inc:644
-#: admin/systems/class_networkSettings.inc:660
-#: admin/systems/class_networkSettings.inc:662
-#: admin/systems/class_networkSettings.inc:1023
+#: admin/systems/class_networkSettings.inc:636
+#: admin/systems/class_networkSettings.inc:652
+#: admin/systems/class_networkSettings.inc:654
+#: admin/systems/class_networkSettings.inc:1015
 msgid "MAC address"
 msgstr ""
 
-#: admin/systems/class_networkSettings.inc:676
+#: admin/systems/class_networkSettings.inc:668
 #, php-format
 msgid "The IP address '%s' is not part of the selected reverse zone '%s'!"
 msgstr ""
 
-#: admin/systems/class_networkSettings.inc:686
+#: admin/systems/class_networkSettings.inc:678
 #, php-format
 msgid "Record type '%s' is duplicated!"
 msgstr ""
 
-#: admin/systems/class_networkSettings.inc:693
+#: admin/systems/class_networkSettings.inc:685
 #, php-format
 msgid "Uniq record type '%s' is duplicated!"
 msgstr ""
 
-#: admin/systems/class_networkSettings.inc:705
+#: admin/systems/class_networkSettings.inc:697
 #, php-format
 msgid ""
 "The IP address '%s' will be added as 'A Record', this will be done "
 "automatically, please remove the record."
 msgstr ""
 
-#: admin/systems/class_networkSettings.inc:712
+#: admin/systems/class_networkSettings.inc:704
 #, php-format
 msgid "Only lowercase records are allowed, please check your '%ss'."
 msgstr ""
 
-#: admin/systems/class_networkSettings.inc:978
+#: admin/systems/class_networkSettings.inc:970
 msgid "Delete"
 msgstr ""
 
-#: admin/systems/class_networkSettings.inc:984
+#: admin/systems/class_networkSettings.inc:976
 msgid "Add"
 msgstr ""
 
-#: admin/systems/class_networkSettings.inc:1015
-#: addons/dashboard/class_dashBoardNetwork.inc:127
+#: admin/systems/class_networkSettings.inc:1007
 msgid "Network"
 msgstr ""
 
-#: admin/systems/class_networkSettings.inc:1030
+#: admin/systems/class_networkSettings.inc:1022
 msgid "DNS configuration"
 msgstr ""
 
-#: admin/systems/class_networkSettings.inc:1033
+#: admin/systems/class_networkSettings.inc:1025
 msgid "DHCP configuration"
 msgstr ""
 
-#: addons/dashboard/class_dashBoardSystems.inc:45
-msgid "Workstations"
-msgstr ""
-
-#: addons/dashboard/class_dashBoardSystems.inc:51
-msgid "Windows Workstations"
-msgstr ""
-
-#: addons/dashboard/class_dashBoardSystems.inc:54
-msgid "Terminals"
-msgstr ""
-
-#: addons/dashboard/class_dashBoardSystems.inc:57
-msgid "Printers"
-msgstr ""
-
-#: addons/dashboard/class_dashBoardSystems.inc:60
-msgid "Phones"
-msgstr ""
-
-#: addons/dashboard/class_dashBoardSystems.inc:63
-msgid "Components"
-msgstr ""
-
-#: addons/dashboard/class_dashBoardSystems.inc:66
-msgid "Mobile phones"
-msgstr ""
-
-#: addons/dashboard/class_dashBoardSystems.inc:183
-msgid "Statistics"
-msgstr ""
-
-#: addons/dashboard/class_dashBoardSystems.inc:188
-msgid "Computer name to use by unit"
-msgstr ""
-
-#: addons/dashboard/class_dashBoardSystems.inc:200
-msgid "Statistics and informations about systems"
-msgstr ""
-
-#: addons/dashboard/class_dashBoardNetwork.inc:111
-msgid "DHCP"
-msgstr ""
-
-#: addons/dashboard/class_dashBoardNetwork.inc:116
-msgid "DNS"
-msgstr ""
-
-#: addons/dashboard/class_dashBoardNetwork.inc:128
-msgid "Statistics and various informations"
-msgstr ""
-
 #: config/systems/class_systemsPluginConfig.inc:29
 msgid "Systems plugin configuration"
 msgstr ""
@@ -1584,404 +1053,3 @@ msgstr ""
 #: config/systems/class_systemsPluginConfig.inc:101
 msgid "Encodings"
 msgstr ""
-
-#: admin/ogroups/goto/termgroup.tpl.c:5
-msgid ""
-"Actions you choose here influence all systems in this object group. "
-"Additionally, all values editable here can be inherited by the clients "
-"assigned to this object group."
-msgstr ""
-
-#: admin/ogroups/goto/termgroup.tpl.c:8
-msgid "Generic"
-msgstr "GenÃ¨ric"
-
-#: admin/ogroups/goto/termgroup.tpl.c:11
-msgid "NTP server"
-msgstr ""
-
-#: admin/ogroups/goto/termgroup.tpl.c:14
-msgid "Choose server to use for synchronizing time"
-msgstr ""
-
-#: admin/ogroups/goto/termgroup.tpl.c:20
-msgid "Select terminal mode"
-msgstr ""
-
-#: admin/ogroups/goto/termgroup.tpl.c:26
-msgid "Choose server to use for logging"
-msgstr ""
-
-#: admin/ogroups/goto/termgroup.tpl.c:32
-msgid "Select NFS root filesystem to use"
-msgstr ""
-
-#: admin/ogroups/goto/termgroup.tpl.c:38
-msgid "Choose NFS filesystem to place swap files on"
-msgstr ""
-
-#: admin/ogroups/goto/termgroup.tpl.c:47
-msgid "Execute"
-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 admin/systems/network.tpl.c:11
-msgid "Propose ip"
-msgstr ""
-
-#: admin/systems/network.tpl.c:14
-msgid "MAC-address"
-msgstr ""
-
-#: admin/systems/network.tpl.c:17
-msgid "Autodetect"
-msgstr ""
-
-#: admin/systems/network.tpl.c:20 admin/systems/network.tpl.c:23
-msgid "Enable DHCP for this device"
-msgstr ""
-
-#: admin/systems/network.tpl.c:26 admin/systems/network.tpl.c:50
-msgid "not configured"
-msgstr ""
-
-#: admin/systems/network.tpl.c:29
-msgid "Parent node"
-msgstr ""
-
-#: admin/systems/network.tpl.c:32
-msgid "Edit settings"
-msgstr ""
-
-#: admin/systems/network.tpl.c:35 admin/systems/network.tpl.c:47
-msgid "Enable DNS for this device"
-msgstr ""
-
-#: admin/systems/network.tpl.c:38
-msgid "Zone"
-msgstr ""
-
-#: admin/systems/network.tpl.c:41
-msgid "TTL"
-msgstr ""
-
-#: admin/systems/network.tpl.c:44
-msgid "Dns records"
-msgstr ""
-
-#: admin/systems/password.tpl.c:2
-msgid ""
-"To change the terminal root password use the fields below. The changes take "
-"effect during the next reboot. Please memorize the new password, because you"
-" wouldn't be able to log in."
-msgstr ""
-
-#: admin/systems/password.tpl.c:5
-msgid "Leave fields blank for password inheritance from default entries."
-msgstr ""
-
-#: admin/systems/password.tpl.c:8
-msgid "Changing the password impinges on authentification only."
-msgstr ""
-
-#: admin/systems/password.tpl.c:11
-msgid "New password"
-msgstr "Contrasenya nova"
-
-#: admin/systems/password.tpl.c:14
-msgid "Repeat new password"
-msgstr "Repeteix la contrasenya nova"
-
-#: admin/systems/password.tpl.c:17
-msgid "Password strength"
-msgstr "Qualitat de la contrasenya"
-
-#: admin/systems/password.tpl.c:20
-msgid "Set password"
-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/gencd.tpl.c:2
-msgid "CD-Install-Image generation"
-msgstr ""
-
-#: admin/systems/gencd.tpl.c:5
-msgid ""
-"This option enables you to generate FAI install CD images for the selected "
-"workstation. The procedure may take about 10 minutes to complete, so please "
-"be patient after pressing the 'Create ISO-Image' button."
-msgstr ""
-
-#: admin/systems/gencd.tpl.c:8
-msgid "Create ISO-Image"
-msgstr ""
-
-#: admin/systems/remove.tpl.c:5
-msgid ""
-"This includes all account data, system access rules, imap settings, etc. for"
-" this user. Please double check if your really want to do this since there "
-"is no way for FusionDirectory to get your data back."
-msgstr ""
-
-#: admin/systems/remove.tpl.c:8
-msgid "So - if you're sure - press 'Delete' to continue or 'Cancel' to abort."
-msgstr ""
-
-#: admin/systems/system-filter.tpl.c:2
-#: admin/systems/phoneSelect/phoneSelect-filter.tpl.c:2
-msgid "Filter"
-msgstr ""
-
-#: admin/systems/system-filter.tpl.c:5
-msgid "Show servers"
-msgstr ""
-
-#: admin/systems/system-filter.tpl.c:8
-msgid "Show workstations"
-msgstr ""
-
-#: admin/systems/system-filter.tpl.c:11
-msgid "Show terminals"
-msgstr ""
-
-#: admin/systems/system-filter.tpl.c:14
-msgid "Show network printer"
-msgstr ""
-
-#: admin/systems/system-filter.tpl.c:17
-#: admin/systems/phoneSelect/phoneSelect-filter.tpl.c:5
-msgid "Show phones"
-msgstr ""
-
-#: admin/systems/system-filter.tpl.c:20
-msgid "Show windows based workstations"
-msgstr ""
-
-#: admin/systems/system-filter.tpl.c:23
-msgid "Show network devices"
-msgstr ""
-
-#: admin/systems/system-filter.tpl.c:26
-#: admin/systems/phoneSelect/phoneSelect-filter.tpl.c:8
-msgid "Show mobile phones"
-msgstr ""
-
-#: admin/systems/system-filter.tpl.c:29
-msgid "Show IPMI interfaces"
-msgstr ""
-
-#: admin/systems/ppd/printerPPDSelectionDialog.tpl.c:2
-msgid "Select objects to add"
-msgstr ""
-
-#: admin/systems/ppd/printerPPDSelectionDialog.tpl.c:5
-msgid "Filters"
-msgstr ""
-
-#: admin/systems/ppd/printerPPDSelectionDialog.tpl.c:8
-msgid "Display objects matching"
-msgstr ""
-
-#: admin/systems/ppd/printerPPDSelectionDialog.tpl.c:11
-msgid "Regular expression for matching object names"
-msgstr ""
-
-#: admin/systems/ppd/printerPPDSelectionDialog.tpl.c:14
-msgid "Close"
-msgstr ""
-
-#: admin/systems/ppd/printerPPDDialog.tpl.c:2
-msgid "Printer driver"
-msgstr ""
-
-#: admin/systems/ppd/printerPPDDialog.tpl.c:5
-msgid "Model"
-msgstr ""
-
-#: admin/systems/ppd/printerPPDDialog.tpl.c:8
-msgid "Select"
-msgstr ""
-
-#: admin/systems/ppd/printerPPDDialog.tpl.c:11
-msgid "New driver"
-msgstr ""
-
-#: admin/systems/ppd/printerPPDDialog.tpl.c:14
-msgid "Upload"
-msgstr ""
-
-#: admin/systems/ppd/printerPPDDialog.tpl.c:17
-msgid "Options"
-msgstr ""
-
-#: admin/systems/ppd/remove_ppd.tpl.c:5
-msgid "The ppd file will be removed from the server and can not be restored."
-msgstr ""
-
-#: admin/systems/printer.tpl.c:2
-msgid "General"
-msgstr ""
-
-#: admin/systems/printer.tpl.c:5
-msgid "Printer name"
-msgstr ""
-
-#: admin/systems/printer.tpl.c:14
-msgid "Details"
-msgstr ""
-
-#: admin/systems/printer.tpl.c:20
-msgid "Printer location"
-msgstr ""
-
-#: admin/systems/printer.tpl.c:26
-msgid "PPD Provider"
-msgstr ""
-
-#: admin/systems/printer.tpl.c:29
-msgid "Driver"
-msgstr ""
-
-#: admin/systems/printer.tpl.c:32
-msgid "Edit"
-msgstr ""
-
-#: admin/systems/printer.tpl.c:41
-msgid "Users which are allowed to use this printer"
-msgstr ""
-
-#: admin/systems/printer.tpl.c:44
-msgid "Users"
-msgstr ""
-
-#: admin/systems/printer.tpl.c:47
-msgid "Users which are allowed to administrate this printer"
-msgstr ""
-
-#: admin/systems/printer.tpl.c:50
-msgid "Admins"
-msgstr ""
-
-#: admin/systems/printer.tpl.c:53
-msgid "Windows paths"
-msgstr ""
-
-#: admin/systems/printer.tpl.c:56
-msgid "Printer windows inf file"
-msgstr ""
-
-#: admin/systems/printer.tpl.c:59
-msgid "Printer driver directory"
-msgstr ""
-
-#: admin/systems/gencd_frame.tpl.c:2
-msgid "Your browser does not supprt iframes."
-msgstr ""
-
-#: admin/systems/services/cups/serviceCUPS.tpl.c:2
-msgid "Print Service"
-msgstr ""
-
-#: admin/systems/services/cups/serviceCUPS.tpl.c:5
-msgid "enabled"
-msgstr ""
-
-#: admin/systems/services/ServiceAddDialog.tpl.c:2
-msgid "Adding a new service to the current server"
-msgstr ""
-
-#: admin/systems/services/ServiceAddDialog.tpl.c:5
-msgid ""
-"This dialog allows you to add new services to the currenty edited server "
-"object. The box below shows all available but not already used services."
-msgstr ""
-
-#: admin/systems/services/ServiceAddDialog.tpl.c:8
-msgid "Service to add"
-msgstr ""
-
-#: admin/systems/services/ServiceAddDialog.tpl.c:11
-msgid "All available services are already in use."
-msgstr ""
-
-#: admin/systems/services/ServiceAddDialog.tpl.c:14
-#: admin/systems/SelectDeviceType.tpl.c:26
-msgid "Continue"
-msgstr "Continua"
-
-#: admin/systems/SelectDeviceType.tpl.c:2
-msgid ""
-"This system has no system type configured. Please choose a system type for "
-"this object and an optional inheritance group. Press the 'continue' button "
-"to proceed."
-msgstr ""
-
-#: admin/systems/SelectDeviceType.tpl.c:5
-msgid ""
-"Please select a system type and an optional bundle of predefined settings to"
-" be inherited."
-msgstr ""
-
-#: admin/systems/SelectDeviceType.tpl.c:8
-msgid ""
-"Please select a system type and a bundle of predefined settings to be "
-"inherited."
-msgstr ""
-
-#: admin/systems/SelectDeviceType.tpl.c:11
-#: admin/systems/SelectDeviceType.tpl.c:14
-msgid "System type"
-msgstr ""
-
-#: admin/systems/SelectDeviceType.tpl.c:17
-msgid "Choose an object group as template"
-msgstr ""
-
-#: admin/systems/SelectDeviceType.tpl.c:20
-msgid "Object group"
-msgstr ""
-
-#: admin/systems/SelectDeviceType.tpl.c:23
-msgid "none"
-msgstr "cap"
-
-#: addons/dashboard/systems_stats.tpl.c:2
-msgid "There are several argonaut servers! (this is not yet supported)"
-msgstr ""
-
-#: addons/dashboard/systems_stats.tpl.c:5
-msgid "There is an argonaut server running on %1 (%3://%2:%4)"
-msgstr ""
-
-#: addons/dashboard/systems_stats.tpl.c:8
-msgid "Only one system is configured to run an argonaut client."
-msgid_plural "%1 systems are configured to run an argonaut client."
-msgstr[0] ""
-msgstr[1] ""
-
-#: addons/dashboard/systems_stats.tpl.c:11
-msgid "But no system is configured to run an argonaut client!"
-msgstr ""
-
-#: addons/dashboard/systems_stats.tpl.c:14
-msgid ""
-"A system is configured to run an argonaut client, but there is no argonaut "
-"server configured!"
-msgid_plural ""
-"%1 systems are configured to run an argonaut client, but there is no "
-"argonaut server configured!"
-msgstr[0] ""
-msgstr[1] ""
diff --git a/systems/locale/cs_CZ/fusiondirectory.po b/systems/locale/cs_CZ/fusiondirectory.po
index d51d29dcf896b9d27a392043382b1c626b3ab34e..5c8060e18491d9f7df87da43bcd4f1681a879d94 100644
--- a/systems/locale/cs_CZ/fusiondirectory.po
+++ b/systems/locale/cs_CZ/fusiondirectory.po
@@ -3,17 +3,15 @@
 # This file is distributed under the same license as the PACKAGE package.
 # 
 # Translators:
-# Pavel Borecki <pavel.borecki@gmail.com>, 2012
-# Pavel Borecki <pavel.borecki@gmail.com>, 2012,2015
-# Pavel Borecki <pavel.borecki@gmail.com>, 2012
+# Pavel Borecki <pavel.borecki@gmail.com>, 2014-2015
 msgid ""
 msgstr ""
-"Project-Id-Version: FusionDirectory-108\n"
+"Project-Id-Version: FusionDirectory-109\n"
 "Report-Msgid-Bugs-To: documentation@lists.fusiondirectory.org\n"
-"POT-Creation-Date: 2015-03-31 11:49+0200\n"
-"PO-Revision-Date: 2015-03-31 11:51+0000\n"
+"POT-Creation-Date: 2014-12-15 17:47+0100\n"
+"PO-Revision-Date: 2015-04-07 19:21+0000\n"
 "Last-Translator: Pavel Borecki <pavel.borecki@gmail.com>\n"
-"Language-Team: Czech (Czech Republic) (http://www.transifex.com/projects/p/FusionDirectory-108/language/cs_CZ/)\n"
+"Language-Team: Czech (Czech Republic) (http://www.transifex.com/projects/p/FusionDirectory-109/language/cs_CZ/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -22,690 +20,417 @@ msgstr ""
 
 #: admin/ogroups/goto/class_termgroup.inc:70
 msgid "Activated"
-msgstr "aktivovÃ¡no"
+msgstr "Zapnuto"
 
 #: admin/ogroups/goto/class_termgroup.inc:71
 msgid "Locked"
-msgstr "uzamÄeno"
+msgstr "UzamÄeno"
 
 #: admin/ogroups/goto/class_termgroup.inc:118
-#: admin/systems/class_terminalGeneric.inc:121
+#: admin/systems/class_terminalStartup.inc:145
 msgid "Local swap"
 msgstr "strÃ¡nkovat (swap) na mÃstnÃ ÃºloÅ¾iÅ¡tÄ›"
 
 #: admin/ogroups/goto/class_termgroup.inc:124
 #: admin/ogroups/goto/class_termgroup.inc:136
-#: admin/systems/class_workstationGeneric.inc:352
-#: admin/systems/class_terminalGeneric.inc:109
-#: admin/systems/class_terminalGeneric.inc:125
+#: admin/systems/class_terminalStartup.inc:133
+#: admin/systems/class_terminalStartup.inc:149
 msgid "inherited"
 msgstr "zdÄ›dÄ›nÃ©"
 
 #: admin/ogroups/goto/class_termgroup.inc:220
-#: admin/systems/class_workstationGeneric.inc:72
-#: admin/systems/class_workstationGeneric.inc:443
-#: admin/systems/class_systemManagement.inc:295
-#: admin/systems/class_systemManagement.inc:325
-msgid "Infrastructure service"
-msgstr "SluÅ¾ba infrastruktura"
+#: admin/systems/class_systemManagement.inc:165
+#: admin/systems/class_systemManagement.inc:186
+msgid "Service infrastructure"
+msgstr "servisnÃ infrastruktura"
 
 #: admin/ogroups/goto/class_termgroup.inc:224
-#: admin/systems/class_workstationGeneric.inc:75
-#: admin/systems/class_workstationGeneric.inc:78
 msgid "Event error"
 msgstr "chyba udÃ¡losti"
 
 #: admin/ogroups/goto/class_termgroup.inc:225
 #, php-format
 msgid "Event '%s' is not available!"
-msgstr "UdÃ¡lost '%s' nenÃ dostupnÃ¡!"
+msgstr "UdÃ¡lost %s nenÃ dostupnÃ¡!"
 
 #: admin/ogroups/goto/class_termgroup.inc:274
-#: admin/systems/class_workstationGeneric.inc:112
 msgid "Switch off"
-msgstr "vypnout"
+msgstr "Vypnout"
 
 #: admin/ogroups/goto/class_termgroup.inc:274
-#: admin/systems/class_workstationGeneric.inc:113
 msgid "Reboot"
-msgstr "restartartovat"
+msgstr "Restart"
 
 #: admin/ogroups/goto/class_termgroup.inc:275
 msgid "Instant update"
-msgstr "okamÅ¾itÃ¡ aktualizace"
+msgstr "OkamÅ¾itÃ¡ aktualizace"
 
 #: admin/ogroups/goto/class_termgroup.inc:276
 msgid "Scheduled update"
-msgstr "naplÃ¡novanÃ¡ aktualizace"
+msgstr "NaplÃ¡novanÃ¡ aktualizace"
 
 #: admin/ogroups/goto/class_termgroup.inc:277
 msgid "Wake"
-msgstr "probudit"
+msgstr "Probudit"
 
 #: admin/ogroups/goto/class_termgroup.inc:278
 msgid "Reinstall"
-msgstr "pÅ™einstalovat"
+msgstr "PÅ™einstalovat"
 
 #: admin/ogroups/goto/class_termgroup.inc:279
-#: admin/systems/class_workstationGeneric.inc:108
 msgid "Memory test"
 msgstr "test operaÄnÃ pamÄ›ti"
 
 #: admin/ogroups/goto/class_termgroup.inc:280
 msgid "System analysis"
-msgstr "analÃ½za systÃ©mu"
+msgstr "AnalÃ½za systÃ©mu"
 
 #: admin/ogroups/goto/class_termgroup.inc:386
-#: admin/systems/class_printGeneric.inc:670
-#: admin/systems/class_printGeneric.inc:970
-#: admin/systems/class_systemManagement.inc:816
 #: admin/systems/services/class_goService.inc:123
 #: admin/systems/services/class_goService.inc:151
 #: admin/systems/services/class_goService.inc:187
-#: admin/systems/class_networkSettings.inc:478
-#: admin/systems/class_networkSettings.inc:491
-#: admin/systems/class_networkSettings.inc:757
-#: admin/systems/class_networkSettings.inc:816
-#: admin/systems/class_networkSettings.inc:835
-#: admin/systems/class_networkSettings.inc:852
-#: admin/systems/class_networkSettings.inc:861
-#: admin/systems/class_networkSettings.inc:879
-#: admin/systems/class_networkSettings.inc:951
+#: admin/systems/class_networkSettings.inc:470
+#: admin/systems/class_networkSettings.inc:483
+#: admin/systems/class_networkSettings.inc:749
+#: admin/systems/class_networkSettings.inc:808
+#: admin/systems/class_networkSettings.inc:827
+#: admin/systems/class_networkSettings.inc:844
+#: admin/systems/class_networkSettings.inc:853
+#: admin/systems/class_networkSettings.inc:871
+#: admin/systems/class_networkSettings.inc:943
 msgid "LDAP error"
-msgstr "chyba LDAPu"
+msgstr "Chyba LDAP"
 
 #: admin/ogroups/goto/class_termgroup.inc:394
 msgid "System"
-msgstr "systÃ©m"
+msgstr "SystÃ©m"
 
 #: admin/ogroups/goto/class_termgroup.inc:395
 msgid "System group"
-msgstr "skupina systÃ©mu"
+msgstr "SystÃ©movÃ¡ skupina"
 
-#: admin/ogroups/goto/class_termgroup.inc:401
-#: admin/ogroups/goto/termgroup.tpl.c:17
+#: admin/ogroups/goto/class_termgroup.inc:402
 msgid "Mode"
 msgstr "reÅ¾im"
 
-#: admin/ogroups/goto/class_termgroup.inc:402
-#: admin/systems/class_workstationGeneric.inc:189
-#: admin/ogroups/goto/termgroup.tpl.c:23
+#: admin/ogroups/goto/class_termgroup.inc:403
+#: admin/systems/class_systemServers.inc:35
 msgid "Syslog server"
 msgstr ""
 
-#: admin/ogroups/goto/class_termgroup.inc:403
+#: admin/ogroups/goto/class_termgroup.inc:404
 msgid "Action flag"
 msgstr "nÃ¡vÄ›stÃ akce"
 
-#: admin/ogroups/goto/class_termgroup.inc:404
+#: admin/ogroups/goto/class_termgroup.inc:405
 msgid "Ntp server"
 msgstr "NTP server"
 
-#: admin/ogroups/goto/class_termgroup.inc:405
-#: admin/systems/class_terminalGeneric.inc:41
-#: admin/ogroups/goto/termgroup.tpl.c:29
+#: admin/ogroups/goto/class_termgroup.inc:406
+#: admin/systems/class_terminalStartup.inc:65
 msgid "Root server"
 msgstr "KoÅ™enovÃ½ server"
 
-#: admin/ogroups/goto/class_termgroup.inc:406
-#: admin/systems/class_terminalGeneric.inc:47
-#: admin/ogroups/goto/termgroup.tpl.c:35
+#: admin/ogroups/goto/class_termgroup.inc:407
+#: admin/systems/class_terminalStartup.inc:69
 msgid "Swap server"
-msgstr "strÃ¡nkovacÃ (swap) server"
+msgstr "Server pro odklÃ¡dÃ¡nÃ pamÄ›ti"
 
-#: admin/systems/class_terminalStartup.inc:63
+#: admin/systems/class_terminalStartup.inc:62
 msgid "Startup parameters"
 msgstr "Parametry zavÃ¡dÄ›nÃ systÃ©mu"
 
-#: admin/systems/class_terminalStartup.inc:66
+#: admin/systems/class_terminalStartup.inc:65
+msgid "The root server the terminal should be using"
+msgstr "KoÅ™enovÃ½ server, kterÃ½ by mÄ›l terminÃ¡l pouÅ¾Ãvat"
+
+#: admin/systems/class_terminalStartup.inc:69
+msgid "The swap server the terminal should be using"
+msgstr "OdklÃ¡dacÃ (swap) server, kterÃ½ by mÄ›l terminÃ¡l pouÅ¾Ãvat"
+
+#: admin/systems/class_terminalStartup.inc:73
 msgid "Boot kernel"
-msgstr "ZavÃ¡dÄ›nÃ© jÃ¡dro"
+msgstr "zavÃ¡dÄ›nÃ© jÃ¡dro"
 
-#: admin/systems/class_terminalStartup.inc:66
+#: admin/systems/class_terminalStartup.inc:73
 msgid "Linux kernel to be installed and booted"
 msgstr "JÃ¡dro Linux, kterÃ© mÃ¡ bÃ½t nainstalovÃ¡no a zavedeno"
 
-#: admin/systems/class_terminalStartup.inc:70
+#: admin/systems/class_terminalStartup.inc:77
 msgid "Boot kernel parameters"
 msgstr "Parametry zavÃ¡dÄ›nÃ jÃ¡dra"
 
-#: admin/systems/class_terminalStartup.inc:70
+#: admin/systems/class_terminalStartup.inc:77
 msgid "Linux kernel parameters to be ran"
-msgstr "Parametry jÃ¡dra Linux, se kterÃ½mi mÃ¡ bÃ½t spuÅ¡tÄ›no"
-
-#: admin/systems/class_terminalStartup.inc:82
-msgid "Startup"
-msgstr "po spuÅ¡tÄ›nÃ"
+msgstr "Parametry jÃ¡dra Linux, se kterÃ½mi mÃ¡ bÃ½t zavedeno"
 
 #: admin/systems/class_terminalStartup.inc:83
-msgid "Terminal startup"
-msgstr "SpuÅ¡tÄ›nÃ terminÃ¡lu"
-
-#: admin/systems/system-list.xml:10
-msgid "List of systems"
-msgstr "seznam systÃ©mÅ¯"
-
-#: admin/systems/system-list.xml:14
-msgid "New workstation"
-msgstr "novÃ¡ pracovnÃ stanice"
-
-#: admin/systems/system-list.xml:22
-msgid "Locked server"
-msgstr "uzamÄenÃ½ server"
-
-#: admin/systems/system-list.xml:30
-msgid "Locked workstation"
-msgstr "uzamÄenÃ¡ pracovnÃ stanice"
-
-#: admin/systems/system-list.xml:38
-msgid "Locked terminal"
-msgstr "uzamÄenÃ½ terminÃ¡l"
-
-#: admin/systems/system-list.xml:47
-msgid "New terminal"
-msgstr "novÃ½ terminÃ¡l"
-
-#: admin/systems/system-list.xml:55
-msgid "New device"
-msgstr "novÃ© zaÅ™ÃzenÃ"
-
-#: admin/systems/system-list.xml:63
-msgid "Workstation template"
-msgstr "Å¡ablona pracovnÃ stanice"
-
-#: admin/systems/system-list.xml:71
-msgid "Terminal template"
-msgstr "Å¡ablona terminÃ¡lu"
-
-#: admin/systems/system-list.xml:79
-msgid "Winstation"
-msgstr "pracovnÃ stanice s OS MS Windows"
+msgid "Remote desktop"
+msgstr "VzdÃ¡lenÃ¡ plocha"
 
-#: admin/systems/system-list.xml:87 admin/systems/system-list.xml:234
-#: admin/systems/class_systemImport.inc:169
-#: admin/systems/class_serverGeneric.inc:46
-#: admin/systems/class_serverGeneric.inc:51
-#: admin/systems/class_serverGeneric.inc:52
-#: admin/systems/class_SelectDeviceType.inc:58
-msgid "Server"
-msgstr "server"
+#: admin/systems/class_terminalStartup.inc:87
+msgid "Connect method"
+msgstr "ZpÅ¯sob pÅ™ipojovÃ¡nÃ"
 
-#: admin/systems/system-list.xml:95 admin/systems/system-list.xml:242
-#: admin/systems/class_workstationGeneric.inc:458
-#: admin/systems/class_workstationGeneric.inc:463
-#: admin/systems/class_workstationGeneric.inc:464
-#: admin/systems/class_SelectDeviceType.inc:58
-msgid "Workstation"
-msgstr "pracovnÃ stanice"
+#: admin/systems/class_terminalStartup.inc:91
+msgid "XDMCP"
+msgstr ""
 
-#: admin/systems/system-list.xml:103 admin/systems/system-list.xml:250
-#: admin/systems/class_terminalGeneric.inc:81
-#: admin/systems/class_terminalGeneric.inc:86
-#: admin/systems/class_terminalGeneric.inc:87
-#: admin/systems/class_SelectDeviceType.inc:58
-msgid "Terminal"
-msgstr "terminÃ¡l"
+#: admin/systems/class_terminalStartup.inc:91
+msgid "LDM"
+msgstr ""
 
-#: admin/systems/system-list.xml:111 admin/systems/class_printGeneric.inc:1005
-#: admin/systems/class_printGeneric.inc:1011
-#: admin/systems/class_printGeneric.inc:1012
-msgid "Printer"
-msgstr "tiskÃ¡rna"
+#: admin/systems/class_terminalStartup.inc:91
+msgid "Shell"
+msgstr "shell"
 
-#: admin/systems/system-list.xml:119 admin/systems/system-list.xml:274
-#: admin/systems/class_mobilePhoneGeneric.inc:74
-#: admin/systems/phoneSelect/phoneSelect-list.xml:14
-msgid "Phone"
-msgstr "telefon"
+#: admin/systems/class_terminalStartup.inc:91
+msgid "Telnet"
+msgstr ""
 
-#: admin/systems/system-list.xml:127
-#: admin/systems/class_mobilePhoneGeneric.inc:36
-#: admin/systems/class_mobilePhoneGeneric.inc:41
-#: admin/systems/class_mobilePhoneGeneric.inc:42
-#: admin/systems/phoneSelect/phoneSelect-list.xml:22
-msgid "Mobile phone"
-msgstr "mobilnÃ telefon"
+#: admin/systems/class_terminalStartup.inc:91
+msgid "Windows RDP"
+msgstr ""
 
-#: admin/systems/system-list.xml:135
-#: admin/systems/class_componentGeneric.inc:36
-msgid "Component"
-msgstr "souÄÃ¡st"
+#: admin/systems/class_terminalStartup.inc:95
+msgid "Terminal server"
+msgstr "TerminÃ¡lovÃ½ server"
 
-#: admin/systems/system-list.xml:143 admin/systems/system-list.xml:298
-msgid "IPMI"
-msgstr ""
+#: admin/systems/system-list.xml:10
+msgid "List of systems"
+msgstr "Seznam systÃ©mÅ¯"
 
-#: admin/systems/system-list.xml:169
-#: admin/systems/class_workstationGeneric.inc:154
-#: admin/systems/class_printGeneric.inc:752
-#: admin/systems/class_printGeneric.inc:762
-#: admin/systems/class_printGeneric.inc:781
-#: admin/systems/class_printGeneric.inc:1022
-#: admin/systems/class_componentGeneric.inc:64
-#: admin/systems/class_mobilePhoneGeneric.inc:63
-#: admin/systems/phoneSelect/phoneSelect-list.xml:48
+#: admin/systems/system-list.xml:31
+#: admin/systems/class_workstationGeneric.inc:46
+#: admin/systems/class_printGeneric.inc:60
+#: admin/systems/class_componentGeneric.inc:58
+#: admin/systems/class_mobilePhoneGeneric.inc:60
 #: admin/systems/services/shares/class_serviceShare.inc:52
-#: admin/systems/system-filter.tpl.c:32
-#: admin/systems/phoneSelect/phoneSelect-filter.tpl.c:11
 msgid "Name"
-msgstr "nÃ¡zev"
+msgstr "NÃ¡zev"
 
-#: admin/systems/system-list.xml:177
-#: admin/systems/phoneSelect/phoneSelect-list.xml:63
+#: admin/systems/system-list.xml:39
 msgid "IP"
 msgstr ""
 
-#: admin/systems/system-list.xml:185
+#: admin/systems/system-list.xml:47
 msgid "MAC"
 msgstr ""
 
-#: admin/systems/system-list.xml:193
-#: admin/systems/class_workstationGeneric.inc:160
-#: admin/systems/class_printGeneric.inc:1024
-#: admin/systems/class_componentGeneric.inc:68
-#: admin/systems/class_mobilePhoneGeneric.inc:67
+#: admin/systems/system-list.xml:55
+#: admin/systems/class_workstationGeneric.inc:51
+#: admin/systems/class_printGeneric.inc:64
+#: admin/systems/class_componentGeneric.inc:62
+#: admin/systems/class_mobilePhoneGeneric.inc:64
 #: admin/systems/serverService-list.xml:35
 #: admin/systems/services/shares/class_serviceShare.inc:56
-#: admin/systems/printer.tpl.c:8 admin/systems/printer.tpl.c:17
 msgid "Description"
-msgstr "popis"
+msgstr "Popis"
 
-#: admin/systems/system-list.xml:201 admin/systems/class_serverService.inc:57
+#: admin/systems/system-list.xml:63 admin/systems/class_serverService.inc:57
 #: admin/systems/services/terminal/class_serviceTerminal.inc:30
 #: admin/systems/services/cups/class_serviceCUPS.inc:85
 #: admin/systems/services/shares/class_serviceShare.inc:31
 #: admin/systems/services/ntp/class_serviceNTP.inc:30
 #: admin/systems/services/ldap/class_serviceLDAP.inc:97
 msgid "Services"
-msgstr "sluÅ¾by"
+msgstr "SluÅ¾by"
 
-#: admin/systems/system-list.xml:209
+#: admin/systems/system-list.xml:71
 msgid "Release"
-msgstr "vydÃ¡nÃ"
+msgstr "VydÃ¡nÃ"
 
-#: admin/systems/system-list.xml:217 admin/systems/serverService-list.xml:43
-#: admin/systems/phoneSelect/phoneSelect-list.xml:70
+#: admin/systems/system-list.xml:79 admin/systems/serverService-list.xml:43
 msgid "Actions"
-msgstr "akce"
+msgstr "Akce"
 
-#: admin/systems/system-list.xml:228 admin/systems/serverService-list.xml:54
+#: admin/systems/system-list.xml:90 admin/systems/serverService-list.xml:54
 msgid "Create"
-msgstr "vytvoÅ™it"
-
-#: admin/systems/system-list.xml:258
-msgid "winStation"
-msgstr ""
-
-#: admin/systems/system-list.xml:266
-msgid "Network printer"
-msgstr "sÃÅ¥ovÃ¡ tiskÃ¡rna"
+msgstr "VytvoÅ™it"
 
-#: admin/systems/system-list.xml:282
-#: 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:290
-msgid "Mobile Phone"
-msgstr "MobilnÃ telefon"
-
-#: admin/systems/system-list.xml:310
+#: admin/systems/system-list.xml:100
 msgid "Trigger action"
-msgstr "spustit akci"
+msgstr "Spustit akci"
 
-#: admin/systems/system-list.xml:317
+#: admin/systems/system-list.xml:107
 msgid "Schedule action"
-msgstr "naplÃ¡novat akci"
-
-#: admin/systems/system-list.xml:330
-msgid "Activate systems"
-msgstr "aktivovat systÃ©my"
+msgstr "NaplÃ¡novat akci"
 
-#: admin/systems/system-list.xml:337 admin/systems/serverService-list.xml:69
-#: admin/systems/printer.tpl.c:35
+#: admin/systems/system-list.xml:119 admin/systems/serverService-list.xml:69
 msgid "Remove"
-msgstr "odebrat"
+msgstr "Odstranit"
 
-#: admin/systems/system-list.xml:367
-msgid "Create ISO"
-msgstr "vytvoÅ™it ISO"
-
-#: admin/systems/system-list.xml:379
+#: admin/systems/system-list.xml:150
 msgid "Edit system"
 msgstr "Upravit systÃ©m"
 
-#: admin/systems/system-list.xml:392
+#: admin/systems/system-list.xml:163
 msgid "Remove system"
-msgstr "odebrat systÃ©m"
-
-#: admin/systems/class_workstationGeneric.inc:75
-#, php-format
-msgid "Event %s is not available!"
-msgstr "UdÃ¡lost %s nenÃ k dispozici!"
-
-#: admin/systems/class_workstationGeneric.inc:78
-msgid "Events are not available!"
-msgstr "UdÃ¡losti nejsou dostupnÃ©!"
+msgstr "Odstranit systÃ©m"
 
-#: admin/systems/class_workstationGeneric.inc:106
-msgid "(Re)Install"
-msgstr "(PÅ™e)Instalovat"
-
-#: admin/systems/class_workstationGeneric.inc:107
-msgid "Software update"
-msgstr "aktualizace softwaru"
-
-#: admin/systems/class_workstationGeneric.inc:115
-msgid "Wake up"
-msgstr "zapnout na dÃ¡lku"
-
-#: admin/systems/class_workstationGeneric.inc:144
-#: admin/systems/class_printGeneric.inc:604
+#: admin/systems/class_workstationGeneric.inc:35
 msgid "workstation"
-msgstr "pracovnÃ stanice"
+msgstr "PoÄÃtaÄ"
 
-#: admin/systems/class_workstationGeneric.inc:151
-#: admin/systems/class_componentGeneric.inc:61
-#: admin/systems/class_mobilePhoneGeneric.inc:60
+#: admin/systems/class_workstationGeneric.inc:42
+#: admin/systems/class_printGeneric.inc:56
+#: admin/systems/class_componentGeneric.inc:55
+#: admin/systems/class_mobilePhoneGeneric.inc:56
 msgid "Properties"
-msgstr "vlastnosti"
+msgstr "Vlastnosti"
 
-#: admin/systems/class_workstationGeneric.inc:155
+#: admin/systems/class_workstationGeneric.inc:47
 #, php-format
 msgid "The name of the %s"
 msgstr "NÃ¡zev %s"
 
-#: admin/systems/class_workstationGeneric.inc:161
+#: admin/systems/class_workstationGeneric.inc:52
 #, php-format
 msgid "A short description of the %s"
 msgstr "StruÄnÃ½ popis %s"
 
-#: admin/systems/class_workstationGeneric.inc:166
-#: admin/systems/class_printGeneric.inc:1025
+#: admin/systems/class_workstationGeneric.inc:56
 msgid "Location"
-msgstr "umÃstÄ›nÃ"
+msgstr "UmÃstÄ›nÃ"
 
-#: admin/systems/class_workstationGeneric.inc:167
+#: admin/systems/class_workstationGeneric.inc:57
 #, php-format
 msgid "The location of the %s"
 msgstr "UmÃstÄ›nÃ %s"
 
-#: admin/systems/class_workstationGeneric.inc:173
+#: admin/systems/class_workstationGeneric.inc:61
 #, php-format
 msgid "Lock this %s"
 msgstr "Uzamknout toto %s"
 
-#: admin/systems/class_workstationGeneric.inc:174
+#: admin/systems/class_workstationGeneric.inc:62
 #, 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:185
-#: addons/dashboard/class_dashBoardSystems.inc:48
-msgid "Servers"
-msgstr "servery"
-
-#: admin/systems/class_workstationGeneric.inc:190
-#, php-format
-msgid "The syslog server the %s should be using"
-msgstr "Syslog server, kterÃ½ by %s mÄ›lo pouÅ¾Ãvat"
-
-#: admin/systems/class_workstationGeneric.inc:195
-msgid "Inherit NTP servers"
-msgstr "ZdÄ›dit NTP servery"
-
-#: admin/systems/class_workstationGeneric.inc:196
-msgid "Inherit time server attributes from ogroup"
-msgstr ""
-
-#: admin/systems/class_workstationGeneric.inc:202
-msgid "NTP servers"
-msgstr "NTP servery"
-
-#: admin/systems/class_workstationGeneric.inc:203
-#, php-format
-msgid "The NTP servers for the %s"
-msgstr ""
-
-#: admin/systems/class_workstationGeneric.inc:209
-msgid "Inherit LDAP servers"
-msgstr "PÅ™evzÃt LDAP servery"
-
-#: admin/systems/class_workstationGeneric.inc:210
-msgid "Inherit LDAP server attributes from ogroup"
-msgstr ""
-
-#: admin/systems/class_workstationGeneric.inc:216
-msgid "LDAP servers"
-msgstr "LDAP servery"
-
-#: admin/systems/class_workstationGeneric.inc:217
-#, php-format
-msgid "The LDAP servers for the %s"
-msgstr ""
-
-#: admin/systems/class_workstationGeneric.inc:225
-#: admin/systems/class_workstationGeneric.inc:229
-#: admin/ogroups/goto/termgroup.tpl.c:41
-msgid "Action"
-msgstr "akce"
-
-#: admin/systems/class_workstationGeneric.inc:230
-#: admin/ogroups/goto/termgroup.tpl.c:44
-msgid "Select action to execute for this terminal"
-msgstr "vyberte akci, kterÃ¡ mÃ¡ bÃ½t spuÅ¡tÄ›na na terminÃ¡lu"
-
-#: admin/systems/class_workstationGeneric.inc:236
-#: admin/systems/class_componentGeneric.inc:75
-#: admin/systems/class_mobilePhoneGeneric.inc:106
-#: admin/systems/class_networkSettings.inc:1016
+#: admin/systems/class_workstationGeneric.inc:73
+#: admin/systems/class_printGeneric.inc:83
+#: admin/systems/class_componentGeneric.inc:69
+#: admin/systems/class_mobilePhoneGeneric.inc:102
+#: admin/systems/class_networkSettings.inc:1008
 msgid "Network settings"
 msgstr "NastavenÃ sÃtÄ›"
 
-#: admin/systems/class_workstationGeneric.inc:459
-msgid "Workstation information"
-msgstr "Informace o poÄÃtaÄi"
-
-#: admin/systems/class_printGeneric.inc:131
-#: admin/systems/class_printGeneric.inc:1065
-#: admin/systems/class_systemManagement.inc:678
-msgid "Internal error"
-msgstr "vnitÅ™nÃ chyba"
-
-#: admin/systems/class_printGeneric.inc:131
-#, php-format
-msgid ""
-"Cannot determine a valid department for this object. Setting base to '%s'!"
-msgstr ""
-
-#: admin/systems/class_printGeneric.inc:311
-#: admin/systems/class_printGeneric.inc:319
-#: admin/systems/class_printGeneric.inc:324
-#: admin/systems/class_printGeneric.inc:374
-#: admin/systems/class_printGeneric.inc:390
-#: admin/systems/class_printGeneric.inc:393
-msgid "Add printer extension"
-msgstr "pÅ™idat rozÅ¡ÃÅ™enÃ tiskÃ¡rny"
-
-#: admin/systems/class_printGeneric.inc:312
-msgid ""
-"Could not initialize printer tab, parameter parent was missing while "
-"construction."
-msgstr ""
-
-#: admin/systems/class_printGeneric.inc:320
-msgid "This is a workstation template, printer tab is disabled."
-msgstr "Toto je Å¡ablona pracovnÃ stanice, zÃ¡loÅ¾ka 'tiskÃ¡rna' je neaktivnÃ."
-
-#: admin/systems/class_printGeneric.inc:325
-msgid "This is a terminal template, printer tab is disabled."
-msgstr "Toto je Å¡ablona terminÃ¡lu, zÃ¡loÅ¾ka 'tiskÃ¡rna' je neaktivnÃ."
-
-#: admin/systems/class_printGeneric.inc:367
-#: admin/systems/class_printGeneric.inc:375
-#: admin/systems/class_printGeneric.inc:383
-#: admin/systems/class_printGeneric.inc:386
-#: admin/systems/class_printGeneric.inc:391
-#: admin/systems/class_printGeneric.inc:394
-msgid "printer"
-msgstr "tiskÃ¡rna"
-
-#: admin/systems/class_printGeneric.inc:375
-msgid ""
-"You can't enable it while 'cn' is not present in entry. Possibly you are "
-"currently creating a new terminal template."
-msgstr ""
-
-#: admin/systems/class_printGeneric.inc:382
-#: admin/systems/class_printGeneric.inc:385
-msgid "Remove printer extension"
-msgstr "odebrat rozÅ¡ÃÅ™enÃ tiskÃ¡rny"
-
-#: admin/systems/class_printGeneric.inc:474
-#: admin/systems/class_printGeneric.inc:652
-#: admin/systems/class_printGeneric.inc:659
-#: admin/systems/class_printGeneric.inc:718
-#: admin/systems/class_printGeneric.inc:1105
-#: admin/systems/class_printGeneric.inc:1116
-#: admin/systems/class_serverService.inc:224
-#: admin/systems/class_serverService.inc:270
-#: admin/systems/class_serverService.inc:393
-#: admin/systems/class_systemManagement.inc:341
-#: admin/systems/class_systemManagement.inc:624
-#: admin/systems/class_systemManagement.inc:639
-#: admin/systems/services/shares/class_serviceShare.inc:103
-#: admin/systems/class_networkSettings.inc:305
-#: admin/systems/class_networkSettings.inc:336
-#: admin/systems/class_networkSettings.inc:584
-#: admin/systems/class_networkSettings.inc:591
-#: admin/systems/class_networkSettings.inc:597
-#: admin/systems/class_networkSettings.inc:604
-msgid "Error"
-msgstr "chyba"
-
-#: admin/systems/class_printGeneric.inc:577
-#, php-format
-msgid "Your currently selected PPD file '%s' doesn't exist."
-msgstr "ZvolenÃ½ PPD soubor '%s' neexistuje."
-
-#: admin/systems/class_printGeneric.inc:583
-msgid "Not defined"
-msgstr "nedefinovÃ¡no"
-
-#: admin/systems/class_printGeneric.inc:587
-#: admin/systems/ppd/class_printerPPDDialog.inc:116
-msgid "Can't get ppd informations."
-msgstr "Nelze zjistit informace o PPD."
-
-#: admin/systems/class_printGeneric.inc:602
-#: admin/systems/class_printGeneric.inc:604
-#, php-format
-msgid "This printer belongs to %s. You can't rename this printer."
-msgstr "Tato tiskÃ¡rna pÅ™inÃ¡leÅ¾Ã k %s. Proto ji nelze pÅ™ejmenovat."
+#: admin/systems/class_workstationGeneric.inc:78
+#: admin/systems/class_printGeneric.inc:87
+#: admin/systems/class_componentGeneric.inc:73
+#: admin/systems/class_mobilePhoneGeneric.inc:106
+#: admin/systems/class_networkSettings.inc:630
+#: admin/systems/class_networkSettings.inc:643
+#: admin/systems/class_networkSettings.inc:645
+#: admin/systems/class_networkSettings.inc:1014
+msgid "IP address"
+msgstr "IP adresa"
 
-#: admin/systems/class_printGeneric.inc:602
-#: admin/systems/class_terminalGeneric.inc:34
-msgid "terminal"
-msgstr "terminÃ¡l"
+#: admin/systems/class_workstationGeneric.inc:78
+msgid "IP addresses this system uses (v4 or v6)"
+msgstr "IP adresy, pouÅ¾ÃvanÃ© tÃmto systÃ©mem (v4 nebo v6)"
+
+#: admin/systems/class_workstationGeneric.inc:83
+#: admin/systems/class_printGeneric.inc:91
+#: admin/systems/class_componentGeneric.inc:77
+#: admin/systems/class_mobilePhoneGeneric.inc:110
+msgid "Mac address"
+msgstr "MAC adresa"
 
-#: admin/systems/class_printGeneric.inc:652
-#: admin/systems/class_printGeneric.inc:659
-msgid "Object is no printer!"
-msgstr "Tento objekt nenÃ tiskÃ¡rna!"
+#: admin/systems/class_workstationGeneric.inc:83
+#: admin/systems/class_printGeneric.inc:91
+#: admin/systems/class_componentGeneric.inc:77
+#: admin/systems/class_mobilePhoneGeneric.inc:110
+msgid "Mac address of this system"
+msgstr "MAC adresa tohoto poÄÃtaÄe"
 
-#: admin/systems/class_printGeneric.inc:767 admin/systems/printer.tpl.c:23
-msgid "Printer URL"
-msgstr "adresa (URL) tiskÃ¡rny"
+#: admin/systems/class_workstationGeneric.inc:125
+#: admin/systems/class_workstationGeneric.inc:130
+#: admin/systems/class_workstationGeneric.inc:131
+msgid "Workstation"
+msgstr "PoÄÃtaÄ"
 
-#: admin/systems/class_printGeneric.inc:989
-#: admin/systems/class_printGeneric.inc:991
-msgid "Group"
-msgstr "skupina"
+#: admin/systems/class_workstationGeneric.inc:126
+msgid "Workstation information"
+msgstr "Informace o poÄÃtaÄi"
 
-#: admin/systems/class_printGeneric.inc:994
-msgid "User"
-msgstr "uÅ¾ivatel"
+#: admin/systems/class_printGeneric.inc:32
+#: admin/systems/class_printGeneric.inc:37
+#: admin/systems/class_printGeneric.inc:38
+msgid "Printer"
+msgstr "TiskÃ¡rna"
 
-#: admin/systems/class_printGeneric.inc:1006
+#: admin/systems/class_printGeneric.inc:33
 msgid "Printer information"
 msgstr "Informace o tiskÃ¡rnÄ›"
 
-#: admin/systems/class_printGeneric.inc:1023
-#: admin/systems/serverService-list.tpl.c:2
-#: admin/systems/phoneSelect/phoneSelect-list.tpl.c:2
-#: admin/systems/printer.tpl.c:11
-msgid "Base"
-msgstr "zÃ¡klad"
-
-#: admin/systems/class_printGeneric.inc:1026
-msgid "LabeledURL"
-msgstr ""
-
-#: admin/systems/class_printGeneric.inc:1027
-msgid "Printer PPD"
-msgstr "PPD soubor pro tiskÃ¡rnu"
-
-#: admin/systems/class_printGeneric.inc:1028 admin/systems/printer.tpl.c:38
-msgid "Permissions"
-msgstr "oprÃ¡vnÄ›nÃ"
+#: admin/systems/class_printGeneric.inc:60
+msgid "The name of the printer"
+msgstr "NÃ¡zev tiskÃ¡rny"
 
-#: admin/systems/class_printGeneric.inc:1030
-msgid "Windows inf file"
-msgstr ".inf soubor Windows"
+#: admin/systems/class_printGeneric.inc:64
+msgid "A short description of the printer"
+msgstr "StruÄnÃ½ popis tiskÃ¡rny"
 
-#: admin/systems/class_printGeneric.inc:1031
-msgid "Windows driver dir"
-msgstr "SloÅ¾ka ovladaÄe pro Windows"
+#: admin/systems/class_printGeneric.inc:70
+msgid "Details"
+msgstr "Podrobnosti"
 
-#: admin/systems/class_printGeneric.inc:1032 admin/systems/printer.tpl.c:62
-msgid "Driver printer name"
-msgstr "NÃ¡zev ovladaÄe tiskÃ¡rny"
+#: admin/systems/class_printGeneric.inc:73
+msgid "Printer location"
+msgstr "UmÃstÄ›nÃ tiskÃ¡rny"
 
-#: admin/systems/class_printGeneric.inc:1048
-#: admin/systems/class_printGeneric.inc:1070
-msgid "Permission error"
-msgstr "chyba oprÃ¡vnÄ›nÃ"
+#: admin/systems/class_printGeneric.inc:73
+msgid "The location of the printer"
+msgstr "UmÃstÄ›nÃ tiskÃ¡rny"
 
-#: admin/systems/class_printGeneric.inc:1048
-#: admin/systems/class_printGeneric.inc:1070
-msgid "printer user"
-msgstr "uÅ¾ivatel tiskÃ¡rny"
+#: admin/systems/class_printGeneric.inc:77
+msgid "Printer URL"
+msgstr "URL adresa tiskÃ¡rny"
 
-#: admin/systems/class_printGeneric.inc:1065
-#, php-format
-msgid "Illegal member type '%s'!"
-msgstr "NeplatnÃ½ typ Älena '%s'!"
+#: admin/systems/class_printGeneric.inc:77
+msgid "The URL of the printer"
+msgstr "URL adresa tiskÃ¡rny"
 
-#: admin/systems/class_printGeneric.inc:1105
-#, php-format
-msgid "'%s' is already used!"
-msgstr "%s je jiÅ¾ pouÅ¾ito!"
-
-#: admin/systems/class_printGeneric.inc:1116
-#, php-format
-msgid "'%s' does not exist!"
-msgstr "'%s' neexistuje!"
+#: admin/systems/class_printGeneric.inc:87
+#: admin/systems/class_componentGeneric.inc:73
+#: admin/systems/class_mobilePhoneGeneric.inc:106
+msgid "IP address this system uses"
+msgstr "IP adresa pouÅ¾ÃvanÃ¡ tÃmto poÄÃtaÄem"
 
 #: admin/systems/class_serverService.inc:58
 msgid "Server services"
 msgstr "SluÅ¾by serveru"
 
+#: admin/systems/class_serverService.inc:224
+#: admin/systems/class_serverService.inc:270
+#: admin/systems/class_serverService.inc:393
+#: admin/systems/services/shares/class_serviceShare.inc:103
+#: admin/systems/class_networkSettings.inc:297
+#: admin/systems/class_networkSettings.inc:328
+#: admin/systems/class_networkSettings.inc:576
+#: admin/systems/class_networkSettings.inc:583
+#: admin/systems/class_networkSettings.inc:589
+#: admin/systems/class_networkSettings.inc:596
+msgid "Error"
+msgstr "Chyba"
+
 #: admin/systems/class_serverService.inc:332
 msgid "Filter error"
-msgstr "chyba filtru"
+msgstr "Chyba filtru"
 
 #: admin/systems/class_serverService.inc:332
 msgid "The filter is incomplete!"
-msgstr "Tento filtr je neÃºplnÃ½!"
+msgstr "Filtr je neÃºplnÃ½!"
 
 #: admin/systems/class_serverService.inc:387
 msgid "Information"
-msgstr "informace"
+msgstr "Informace"
 
 #: admin/systems/class_serverService.inc:387
 msgid "Cannot update service status until it has been saved!"
-msgstr "Nemohu aktualizovat stav sluÅ¾by dokud nebude uloÅ¾ena!"
+msgstr "Stav sluÅ¾by nelze aktualizovat dokud nebude uloÅ¾ena!"
 
 #: admin/systems/class_serverService.inc:415
 #: admin/systems/class_serverService.inc:424
@@ -714,217 +439,20 @@ msgstr "Nemohu aktualizovat stav sluÅ¾by dokud nebude uloÅ¾ena!"
 msgid "Could not get execute action %s on service %s."
 msgstr "Nelze spustit akci %s na sluÅ¾bÄ› %s."
 
-#: admin/systems/class_terminalGeneric.inc:42
-#, 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:31
+msgid "terminal"
+msgstr "terminÃ¡l"
 
+#: admin/systems/class_terminalGeneric.inc:43
 #: admin/systems/class_terminalGeneric.inc:48
-#, php-format
-msgid "The swap server the terminal should be using"
-msgstr "OdklÃ¡dacÃ server, kterÃ½ by mÄ›l terminÃ¡l pouÅ¾Ãvat"
-
-#: admin/systems/class_terminalGeneric.inc:54
-msgid "Remote desktop"
-msgstr "vzdÃ¡lenÃ½ desktop"
-
-#: admin/systems/class_terminalGeneric.inc:58
-msgid "Connect method"
-msgstr "zpÅ¯sob pÅ™ipojovÃ¡nÃ"
-
-#: admin/systems/class_terminalGeneric.inc:62
-msgid "XDMCP"
-msgstr ""
-
-#: admin/systems/class_terminalGeneric.inc:62
-msgid "LDM"
-msgstr ""
-
-#: admin/systems/class_terminalGeneric.inc:62
-msgid "Shell"
-msgstr ""
-
-#: admin/systems/class_terminalGeneric.inc:62
-msgid "Telnet"
-msgstr ""
-
-#: admin/systems/class_terminalGeneric.inc:62
-msgid "Windows RDP"
-msgstr ""
-
-#: admin/systems/class_terminalGeneric.inc:66
-msgid "Terminal server"
-msgstr "terminÃ¡lovÃ½ server"
+#: admin/systems/class_terminalGeneric.inc:49
+msgid "Terminal"
+msgstr "TerminÃ¡l"
 
-#: admin/systems/class_terminalGeneric.inc:82
+#: admin/systems/class_terminalGeneric.inc:44
 msgid "Terminal information"
 msgstr "Informace o terminÃ¡lu"
 
-#: admin/systems/ppd/class_printerPPDSelectionDialog.inc:91
-#: admin/systems/ppd/class_printerPPDSelectionDialog.inc:116
-#: admin/systems/ppd/class_printerPPDSelectionDialog.inc:139
-#: admin/systems/ppd/class_printerPPDDialog.inc:92
-#: admin/systems/ppd/class_printerPPDDialog.inc:160
-#: admin/systems/ppd/class_printerPPDDialog.inc:241
-#: admin/systems/ppd/class_printerPPDDialog.inc:256
-#: admin/systems/ppd/class_printerPPDDialog.inc:269
-#: admin/systems/ppd/class_printerPPDDialog.inc:297
-#: admin/systems/ppd/class_printerPPDDialog.inc:314
-#: admin/systems/ppd/class_printerPPDDialog.inc:337
-#: admin/systems/ppd/class_printerPPDDialog.inc:351
-#: admin/systems/ppd/class_printerPPDDialog.inc:361
-#: admin/systems/ppd/class_printerPPDDialog.inc:365
-#: admin/systems/ppd/class_printerPPDDialog.inc:560
-#: admin/systems/ppd/class_printerPPDDialog.inc:577
-#: admin/systems/ppd/class_printerPPDDialog.inc:580
-#: admin/systems/ppd/class_printerPPDDialog.inc:583
-msgid "PPD error"
-msgstr "chyba PPD"
-
-#: admin/systems/ppd/class_printerPPDSelectionDialog.inc:139
-#, php-format
-msgid "Cannot locate vendor '%s' in available PPDs!"
-msgstr "V dostupnÃ½ch PPD souborech nebyl nalezen vÃ½robce '%s' !"
-
-#: admin/systems/ppd/class_printerPPDSelectionDialog.inc:148
-msgid "Printer ppd selection."
-msgstr "vÃ½bÄ›r PPD pro tiskÃ¡rnu"
-
-#: admin/systems/ppd/class_printerPPDSelectionDialog.inc:155
-msgid "delete"
-msgstr "smazat"
-
-#: admin/systems/ppd/class_printerPPDSelectionDialog.inc:166
-msgid "back"
-msgstr "zpÄ›t"
-
-#: admin/systems/ppd/class_printerPPDDialog.inc:74
-#: admin/systems/ppd/class_printerPPDDialog.inc:140
-#: admin/systems/services/class_goService.inc:241
-msgid "Configuration error"
-msgstr "chyba v nastavenÃ"
-
-#: admin/systems/ppd/class_printerPPDDialog.inc:92
-#, php-format
-msgid "Cannot open PPD '%s'!"
-msgstr "Nelze otevÅ™Ãt PPD '%s'!"
-
-#: admin/systems/ppd/class_printerPPDDialog.inc:141
-#, php-format
-msgid "Cannot open PPD path '%s' for reading and writing!"
-msgstr "UmÃstÄ›nÃ PPD souboru %s se nedaÅ™Ã otevÅ™Ãt pro ÄtenÃ a zÃ¡pis!"
-
-#: admin/systems/ppd/class_printerPPDDialog.inc:160
-#: admin/systems/ppd/class_printerPPDDialog.inc:365
-msgid "file is empty"
-msgstr "soubor je prÃ¡zdnÃ½"
-
-#: admin/systems/ppd/class_printerPPDDialog.inc:314
-#, php-format
-msgid "Cannot parse PPD '%s'!"
-msgstr ""
-
-#: admin/systems/ppd/class_printerPPDDialog.inc:340
-msgid "Overwrite existing PPD"
-msgstr "pÅ™epsat existujÃcÃ PPD"
-
-#: admin/systems/ppd/class_printerPPDDialog.inc:341
-msgid ""
-"There is already a ppd file for this kind of printer. Do you want to "
-"overwrite it?"
-msgstr "Pro tento typ tiskÃ¡rny je pÅ™Ãtomen PPD soubor. Chcete jej pÅ™epsat?"
-
-#: admin/systems/ppd/class_printerPPDDialog.inc:491
-msgid "Section"
-msgstr "sekce"
-
-#: admin/systems/ppd/class_printerPPDDialog.inc:551
-#: admin/systems/ppd/class_printerPPDDialog.inc:554
-msgid "True"
-msgstr "platÃ"
-
-#: admin/systems/ppd/class_printerPPDDialog.inc:552
-#: admin/systems/ppd/class_printerPPDDialog.inc:555
-msgid "False"
-msgstr "neplatÃ"
-
-#: admin/systems/ppd/class_printerPPDDialog.inc:560
-#, php-format
-msgid "PPD type '%s' is not supported!"
-msgstr "PPD typu '%s' nenÃ podporovÃ¡n! "
-
-#: admin/systems/ppd/class_printerPPDDialog.inc:597
-msgid ""
-"Please select a valid ppd file or use 'Cancel' to go back to printer "
-"configuration."
-msgstr "Zvolte platnÃ½ ppd soubor nebo kliknÄ›te na Storno pro nÃ¡vrat do nastavenÃ tiskÃ¡rny"
-
-#: admin/systems/ppd/class_ppdManager.inc:44
-#: admin/systems/ppd/class_ppdManager.inc:188
-#: admin/systems/ppd/class_ppdManager.inc:190
-msgid "PPD manager error"
-msgstr "chyba sprÃ¡vce PPD"
-
-#: admin/systems/ppd/class_ppdManager.inc:44
-#, php-format
-msgid "The specified path '%s' does not exist."
-msgstr "ZadanÃ¡ cesta '%s' neexistuje."
-
-#: admin/systems/ppd/class_ppdManager.inc:188
-#, php-format
-msgid "Specified PPD file '%s' cannot be opened for reading."
-msgstr "ZadanÃ½ PPD soubor '%s' nenÃ moÅ¾nÃ© otevÅ™Ãt (pro ÄtenÃ)."
-
-#: admin/systems/ppd/class_ppdManager.inc:190
-#, php-format
-msgid "The temporary file '%s' cannot be opened for writing."
-msgstr "Do doÄasnÃ©ho souboru '%s' nelze zapisovat (oprÃ¡vnÄ›nÃ)."
-
-#: admin/systems/ppd/class_ppdManager.inc:212
-#: admin/systems/ppd/class_ppdManager.inc:350
-msgid "Parsing PPD file failed - file is empty!"
-msgstr "NaÄÃtÃ¡nÃ souboru PPD se nezdaÅ™ilo â€“ je prÃ¡zdnÃ½!"
-
-#: admin/systems/ppd/class_ppdManager.inc:222
-#, php-format
-msgid ""
-"Parsing PPD file %s failed - line too long. Trailing characters have been "
-"ignored!"
-msgstr ""
-
-#: admin/systems/ppd/class_ppdManager.inc:230
-msgid "Nested groups are not supported!"
-msgstr "VnoÅ™enÃ© skupiny nejsou podporovÃ¡ny!"
-
-#: admin/systems/ppd/class_ppdManager.inc:234
-msgid "Group name not unique!"
-msgstr "NÃ¡zev skupiny nenÃ jedineÄnÃ½!"
-
-#: admin/systems/ppd/class_ppdManager.inc:240
-#: admin/systems/ppd/class_ppdManager.inc:270
-msgid "Symbol values are not supported yet!"
-msgstr "SymbolickÃ© hodnoty jeÅ¡tÄ› nejsou podporovÃ¡ny!"
-
-#: admin/systems/ppd/class_ppdManager.inc:264
-msgid "Nested options are not supported!"
-msgstr "VnoÅ™enÃ© pÅ™edvolby nejsou podporovÃ¡ny!"
-
-#: admin/systems/ppd/class_ppdManager.inc:289
-msgid "PickMany is not supported yet!"
-msgstr ""
-
-#: admin/systems/ppd/class_ppdManager.inc:370
-#, php-format
-msgid ""
-"Parsing PPD file %s failed - line too long. Trailing characters have been "
-"ignored"
-msgstr ""
-
-#: admin/systems/ppd/class_ppdManager.inc:395
-#, php-format
-msgid "Parsing PPD file %s failed - no information found."
-msgstr ""
-
 #: admin/systems/class_systemImport.inc:72
 #, php-format
 msgid "Could not parse %s"
@@ -942,99 +470,146 @@ msgstr "Pro zÃ³nu %s nebyl nalezen Å¾Ã¡dnÃ½ DNS server"
 
 #: admin/systems/class_systemImport.inc:165
 msgid "Import"
-msgstr "Importovat"
+msgstr "import(ovat)"
+
+#: admin/systems/class_systemImport.inc:169
+#: admin/systems/class_serverGeneric.inc:43
+#: admin/systems/class_serverGeneric.inc:48
+#: admin/systems/class_serverGeneric.inc:49
+msgid "Server"
+msgstr "Server"
 
 #: 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_serverGeneric.inc:34
+#: admin/systems/class_serverGeneric.inc:31
 msgid "server"
-msgstr "server"
+msgstr ""
 
-#: admin/systems/class_serverGeneric.inc:47
+#: admin/systems/class_serverGeneric.inc:44
 msgid "Server information"
 msgstr "Informace o serveru"
 
-#: admin/systems/class_componentGeneric.inc:37
+#: admin/systems/class_componentGeneric.inc:31
+msgid "Component"
+msgstr "SouÄÃ¡st"
+
+#: admin/systems/class_componentGeneric.inc:32
 msgid "Component information"
 msgstr "Informace o souÄÃ¡sti"
 
-#: admin/systems/class_componentGeneric.inc:64
+#: admin/systems/class_componentGeneric.inc:36
+#: admin/systems/class_componentGeneric.inc:37
+msgid "Network device"
+msgstr "SÃÅ¥ovÃ© zaÅ™ÃzenÃ"
+
+#: admin/systems/class_componentGeneric.inc:58
 msgid "The name of the component"
 msgstr "NÃ¡zev souÄÃ¡sti"
 
-#: admin/systems/class_componentGeneric.inc:68
+#: admin/systems/class_componentGeneric.inc:62
 msgid "A short description of the component"
 msgstr "StruÄnÃ½ popis souÄÃ¡sti"
 
+#: admin/systems/class_systemServers.inc:31
+#: admin/systems/class_systemServers.inc:53
+msgid "Servers"
+msgstr "Servery"
+
+#: admin/systems/class_systemServers.inc:35
+msgid "The syslog server the system should be using"
+msgstr "KterÃ½ syslog server by mÄ›l tento systÃ©m pouÅ¾Ãvat"
+
+#: admin/systems/class_systemServers.inc:40
+msgid "NTP servers"
+msgstr "NTP servery"
+
+#: admin/systems/class_systemServers.inc:40
+msgid "The NTP servers for this system"
+msgstr "ÄŒasovÃ© servery (NTP) pro tento systÃ©m"
+
+#: admin/systems/class_systemServers.inc:54
+msgid "Servers this system is using"
+msgstr "Servery, kterÃ© tento systÃ©m pouÅ¾ÃvÃ¡"
+
+#: admin/systems/class_mobilePhoneGeneric.inc:32
 #: admin/systems/class_mobilePhoneGeneric.inc:37
+#: admin/systems/class_mobilePhoneGeneric.inc:38
+msgid "Mobile phone"
+msgstr "MobilnÃ telefon"
+
+#: admin/systems/class_mobilePhoneGeneric.inc:33
 msgid "Mobile phone information"
 msgstr "Ãšdaje o mobilnÃm telefonu"
 
-#: admin/systems/class_mobilePhoneGeneric.inc:63
+#: admin/systems/class_mobilePhoneGeneric.inc:60
 msgid "The name of the mobile phone"
 msgstr "NÃ¡zev mobilnÃho telefonu"
 
-#: admin/systems/class_mobilePhoneGeneric.inc:67
+#: admin/systems/class_mobilePhoneGeneric.inc:64
 msgid "A short description of the mobile phone"
 msgstr "StruÄnÃ½ popis mobilnÃho telefonu"
 
-#: admin/systems/class_mobilePhoneGeneric.inc:77
+#: admin/systems/class_mobilePhoneGeneric.inc:70
+msgid "Phone"
+msgstr "Telefon"
+
+#: admin/systems/class_mobilePhoneGeneric.inc:73
 msgid "Serial Number"
 msgstr "SÃ©riovÃ© ÄÃslo"
 
-#: admin/systems/class_mobilePhoneGeneric.inc:77
+#: admin/systems/class_mobilePhoneGeneric.inc:73
 msgid "The serial number of the mobile phone"
 msgstr "SÃ©riovÃ© ÄÃslo mobilnÃho telefonu"
 
-#: admin/systems/class_mobilePhoneGeneric.inc:81
+#: admin/systems/class_mobilePhoneGeneric.inc:77
 msgid "IMEI Number"
 msgstr "IMEI identifikÃ¡tor"
 
-#: admin/systems/class_mobilePhoneGeneric.inc:81
+#: admin/systems/class_mobilePhoneGeneric.inc:77
 msgid "The IMEI number of the mobile phone"
 msgstr "IMEI identifikÃ¡tor mobilnÃho telefonu"
 
-#: admin/systems/class_mobilePhoneGeneric.inc:86
+#: admin/systems/class_mobilePhoneGeneric.inc:82
 msgid "OS"
 msgstr ""
 
-#: admin/systems/class_mobilePhoneGeneric.inc:86
+#: admin/systems/class_mobilePhoneGeneric.inc:82
 msgid "The Operating System installed on this phone"
 msgstr "OperaÄnÃ systÃ©m, nainstalovanÃ½ na tomto telefonu"
 
-#: admin/systems/class_mobilePhoneGeneric.inc:92
+#: admin/systems/class_mobilePhoneGeneric.inc:88
 msgid "SimCard"
 msgstr "SIM karta"
 
-#: admin/systems/class_mobilePhoneGeneric.inc:95
+#: admin/systems/class_mobilePhoneGeneric.inc:91
 msgid "Telephone Number"
 msgstr "TelefonÃ ÄÃslo"
 
-#: admin/systems/class_mobilePhoneGeneric.inc:95
+#: admin/systems/class_mobilePhoneGeneric.inc:91
 msgid "The telephone number of the mobile phone"
 msgstr "TelefonÃ ÄÃslo mobilnÃho telefonu"
 
-#: admin/systems/class_mobilePhoneGeneric.inc:99
+#: admin/systems/class_mobilePhoneGeneric.inc:95
 msgid "PUK Number"
 msgstr "KÃ³d PUK"
 
-#: admin/systems/class_mobilePhoneGeneric.inc:99
+#: admin/systems/class_mobilePhoneGeneric.inc:95
 msgid "The PUK number of the simcard in this mobile phone"
 msgstr "KÃ³d PUK SIM karty v tomto mobilnÃm telefonu"
 
 #: admin/systems/serverService-list.xml:10
 msgid "List of services"
-msgstr "seznam sluÅ¾eb"
+msgstr "Seznam sluÅ¾eb"
 
 #: admin/systems/serverService-list.xml:14
 msgid "Service"
-msgstr "sluÅ¾ba"
+msgstr "SluÅ¾ba"
 
 #: admin/systems/serverService-list.xml:27
 msgid "!"
-msgstr ""
+msgstr "!"
 
 #: admin/systems/serverService-list.xml:89
 msgid "Get status"
@@ -1043,107 +618,57 @@ msgstr "Zjistit stav"
 #: admin/systems/serverService-list.xml:97
 #: admin/systems/services/cups/class_serviceCUPS.inc:92
 msgid "Start"
-msgstr "spuÅ¡tÄ›nÃ"
+msgstr "Spustit"
 
 #: admin/systems/serverService-list.xml:105
 #: admin/systems/services/cups/class_serviceCUPS.inc:93
 msgid "Stop"
-msgstr "zastavenÃ"
+msgstr "Zastavit"
 
 #: admin/systems/serverService-list.xml:113
 #: admin/systems/services/cups/class_serviceCUPS.inc:94
 msgid "Restart"
-msgstr "restartovÃ¡nÃ"
+msgstr "Restartovat"
 
 #: admin/systems/serverService-list.xml:121
 msgid "Edit service"
-msgstr "upravit sluÅ¾bu"
+msgstr "Upravit sluÅ¾bu"
 
 #: admin/systems/serverService-list.xml:129
 msgid "Remove service"
-msgstr "odebrat sluÅ¾bu"
-
-#: admin/systems/phoneSelect/phoneSelect-list.xml:10
-msgid "Please select the desired entries"
-msgstr "vyberte prosÃm poÅ¾adovanÃ© poloÅ¾ky"
-
-#: admin/systems/phoneSelect/phoneSelect-list.xml:56
-msgid "Number"
-msgstr "ÄÃslo"
+msgstr "Odebrat sluÅ¾bu"
 
-#: admin/systems/phoneSelect/phoneSelect-list.xml:83
-msgid "Select this number"
-msgstr "Vyberte toto ÄÃslo"
-
-#: admin/systems/class_systemManagement.inc:177
-msgid "Back"
-msgstr "zpÄ›t"
-
-#: admin/systems/class_systemManagement.inc:223
-msgid "Creating the image failed. Please see the report below."
-msgstr "VytvoÅ™enÃ obrazu selhalo. VÃce informacÃ poskytne nÃÅ¾e uvedenÃ© hlÃ¡Å¡enÃ."
-
-#: admin/systems/class_systemManagement.inc:228
-#, php-format
-msgid "Command '%s', specified for ISO creation doesn't seem to exist."
-msgstr "PÅ™Ãkaz '%s', nastavenÃ½ pro vytvÃ¡Å™enÃ ISO obrazÅ¯ pravdÄ›podobnÄ› neexistuje."
-
-#: admin/systems/class_systemManagement.inc:398
-#: admin/systems/class_systemManagement.inc:473
-#: admin/systems/class_systemManagement.inc:858
-#: admin/systems/class_systemManagement.inc:905
-#: admin/systems/class_systemManagement.inc:926
-msgid "Permission"
-msgstr "oprÃ¡vnÄ›nÃ"
-
-#: admin/systems/class_systemManagement.inc:678
-msgid "Cannot set mode to 'active'!"
-msgstr "Nemohu nastavit reÅ¾im na 'aktivnÃ'!"
-
-#: admin/systems/class_systemManagement.inc:858
-#, php-format
-msgid "You are not allowed to create a snapshot for %s."
-msgstr "Nejste oprÃ¡vnÄ›n(a) vytvoÅ™it snÃmek %s."
-
-#: admin/systems/class_systemManagement.inc:905
-#: admin/systems/class_systemManagement.inc:926
-#, php-format
-msgid "You are not allowed to restore a snapshot for %s."
-msgstr "Nejste oprÃ¡vnÄ›n(a) obnovit ze snÃmku %s."
-
-#: admin/systems/class_systemManagement.inc:1169
-#, php-format
-msgid "Inherited from %s"
-msgstr "zdÄ›dÄ›no z %s"
-
-#: admin/systems/class_systemManagement.inc:1224
-#: admin/systems/class_systemManagement.inc:1228
-#: addons/dashboard/class_dashBoardSystems.inc:199
+#: admin/systems/class_systemManagement.inc:48
 #: config/systems/class_systemsPluginConfig.inc:28
 msgid "Systems"
-msgstr "systÃ©my"
+msgstr "SystÃ©my"
 
-#: admin/systems/class_systemManagement.inc:1225
+#: admin/systems/class_systemManagement.inc:49
 msgid "Systems Management"
-msgstr "sprÃ¡va systÃ©mÅ¯"
+msgstr "SprÃ¡va systÃ©mÅ¯"
+
+#: admin/systems/class_systemManagement.inc:250
+#, php-format
+msgid "Inherited from %s"
+msgstr "PÅ™evzato z %s"
 
 #: admin/systems/services/terminal/class_serviceTerminal.inc:29
 #: admin/systems/services/terminal/class_serviceTerminal.inc:30
 #: admin/systems/services/terminal/class_serviceTerminal.inc:41
 msgid "Terminal service"
-msgstr "terminÃ¡lovÃ¡ sluÅ¾ba"
+msgstr "TerminÃ¡lovÃ¡ sluÅ¾ba"
 
 #: admin/systems/services/terminal/class_serviceTerminal.inc:44
 msgid "Temporary disable login"
-msgstr "doÄasnÄ› zakÃ¡zat pÅ™ihlaÅ¡ovÃ¡nÃ"
+msgstr "DoÄasnÄ› zakÃ¡zat pÅ™ihlaÅ¡ovÃ¡nÃ"
 
 #: admin/systems/services/terminal/class_serviceTerminal.inc:45
 msgid "Disables the login on this terminal server"
-msgstr "ZnemoÅ¾nit pÅ™ihlaÅ¡ovÃ¡nÃ k tomuto terminÃ¡lovÃ©mu serveru"
+msgstr "ZnemoÅ¾nÃ pÅ™ihlaÅ¡ovÃ¡nÃ k tomuto terminÃ¡lovÃ©mu serveru"
 
 #: admin/systems/services/terminal/class_serviceTerminal.inc:54
 msgid "Supported session types"
-msgstr "podporovanÃ© typy relacÃ"
+msgstr "PodporovanÃ© typy sezenÃ"
 
 #: admin/systems/services/terminal/class_serviceTerminal.inc:55
 msgid "The session types supported by this terminal server"
@@ -1153,7 +678,7 @@ msgstr "Typy sezenÃ, podporovanÃ© tÃmto terminÃ¡lovÃ½m serverem"
 #: admin/systems/services/cups/class_serviceCUPS.inc:64
 #: admin/systems/services/cups/class_serviceCUPS.inc:85
 msgid "Print service"
-msgstr "sluÅ¾ba tisku"
+msgstr "SluÅ¾ba tisknutÃ"
 
 #: admin/systems/services/cups/class_serviceCUPS.inc:84
 msgid "Cups"
@@ -1162,16 +687,20 @@ msgstr "CUPS"
 #: admin/systems/services/class_goService.inc:44
 #: admin/systems/services/class_goService.inc:78
 msgid "Empty service"
-msgstr "prÃ¡zdnÃ¡ sluÅ¾ba"
+msgstr "PrÃ¡zdnÃ¡ sluÅ¾ba"
+
+#: admin/systems/services/class_goService.inc:241
+msgid "Configuration error"
+msgstr "Chyba v nastavenÃ"
 
 #: admin/systems/services/shares/class_serviceShare.inc:30
 #: admin/systems/services/shares/class_serviceShare.inc:31
 msgid "Share service"
-msgstr "SluÅ¾by sdÃlenÃ"
+msgstr "SluÅ¾ba sdÃlenÃ"
 
 #: admin/systems/services/shares/class_serviceShare.inc:43
 msgid "Shares"
-msgstr "sdÃlenÃ"
+msgstr "SdÃlenÃ"
 
 #: admin/systems/services/shares/class_serviceShare.inc:48
 msgid "Shares this server hosts"
@@ -1187,7 +716,7 @@ msgstr "Popis tohoto sdÃlenÃ"
 
 #: admin/systems/services/shares/class_serviceShare.inc:60
 msgid "Type"
-msgstr "typ"
+msgstr "Typ"
 
 #: admin/systems/services/shares/class_serviceShare.inc:60
 msgid "Type of share"
@@ -1222,10 +751,8 @@ msgid "You need to configure encodings first"
 msgstr "Nejprve je tÅ™eba nastavit kÃ³dovÃ¡nÃ znakÅ¯"
 
 #: admin/systems/services/shares/class_serviceShare.inc:110
-#: admin/ogroups/goto/termgroup.tpl.c:2 admin/systems/remove.tpl.c:2
-#: admin/systems/ppd/remove_ppd.tpl.c:2
 msgid "Warning"
-msgstr "varovÃ¡nÃ"
+msgstr "VarovÃ¡nÃ"
 
 #: admin/systems/services/shares/class_serviceShare.inc:110
 #, php-format
@@ -1234,11 +761,11 @@ msgstr "NeplatnÃ¡ hodnota v kÃ³dovÃ¡nÃ znakÅ¯ : %s"
 
 #: admin/systems/services/ntp/class_serviceNTP.inc:29
 msgid "Time service"
-msgstr "sluÅ¾ba synchronizace Äasu"
+msgstr "SluÅ¾ba synchronizace Äasu"
 
 #: admin/systems/services/ntp/class_serviceNTP.inc:30
 msgid "Time service - NTP"
-msgstr "sluÅ¾ba synchronizace Äasu â€“ NTP"
+msgstr "SluÅ¾ba synchronizace Äasu â€“ NTP"
 
 #: admin/systems/services/ntp/class_serviceNTP.inc:41
 msgid "Informations"
@@ -1255,7 +782,7 @@ msgstr "Seznam pouÅ¾ÃvanÃ½ch zdrojÅ¯ pÅ™esnÃ©ho Äasu"
 #: admin/systems/services/ldap/class_serviceLDAP.inc:35
 #: admin/systems/services/ldap/class_serviceLDAP.inc:96
 msgid "LDAP service"
-msgstr "sluÅ¾ba LDAP"
+msgstr "SluÅ¾ba LDAP"
 
 #: admin/systems/services/ldap/class_serviceLDAP.inc:39
 msgid "LDAP Base"
@@ -1267,7 +794,7 @@ msgstr "ZÃ¡klad LDAP, kterÃ½ pouÅ¾Ãt pro tento LDAP server"
 
 #: admin/systems/services/ldap/class_serviceLDAP.inc:44
 msgid "LDAP URI"
-msgstr "adresa (URI) LDAPu"
+msgstr "URI adresa LDAP"
 
 #: admin/systems/services/ldap/class_serviceLDAP.inc:44
 msgid "The LDAP URI to use in order to contact this LDAP server"
@@ -1323,7 +850,7 @@ msgstr "TLS cert. cert. autority "
 
 #: admin/systems/services/ldap/class_serviceLDAP.inc:74
 msgid "Filepath to tls ca certificate"
-msgstr "UmÃstÄ›nÃ souboru s tls certifikÃ¡tem cert. autority"
+msgstr "UmÃstÄ›nÃ souboru s TLS certifikÃ¡tem cert. autority"
 
 #: admin/systems/services/ldap/class_serviceLDAP.inc:78
 msgid "TLS ReqCert"
@@ -1337,7 +864,7 @@ msgstr "UrÄuje co vÅ¡e ovÄ›Å™ovat u pÅ™ÃpadnÃ©ho serverovÃ©ho certifikÃ¡tu v r
 
 #: admin/systems/services/ldap/class_serviceLDAP.inc:83
 msgid "TLS CrlCheck"
-msgstr ""
+msgstr "TLS â€“ kontrola zneplatnÄ›nÃ"
 
 #: admin/systems/services/ldap/class_serviceLDAP.inc:83
 msgid ""
@@ -1349,152 +876,92 @@ msgstr "UrÄuje, zda kontrolovat, zda nebyla zruÅ¡ena platnost certifikÃ¡tu serv
 msgid "LDAP"
 msgstr "LDAP"
 
-#: admin/systems/class_networkSettings.inc:305
+#: admin/systems/class_networkSettings.inc:297
 msgid "NOT IMPLEMENTED"
 msgstr "NEIMPLEMENTOVÃNO"
 
-#: admin/systems/class_networkSettings.inc:437
+#: admin/systems/class_networkSettings.inc:429
 msgid "Not matching"
-msgstr "neshoduje se"
+msgstr "Neshoduje se"
 
-#: admin/systems/class_networkSettings.inc:584
+#: admin/systems/class_networkSettings.inc:576
 #, php-format
 msgid "Was not able to contact argonaut server: %s"
 msgstr "Nebyl schopen kontaktovat Argonaut server: %s"
 
-#: admin/systems/class_networkSettings.inc:591
+#: admin/systems/class_networkSettings.inc:583
 #, php-format
 msgid "Was not able to find DNS server for zone %s"
 msgstr "DNS server pro zÃ³nu %s nebyl nalezen"
 
-#: admin/systems/class_networkSettings.inc:597
+#: admin/systems/class_networkSettings.inc:589
 #, php-format
 msgid "Was not able to find mac address of DNS server %s"
 msgstr "Nebylo moÅ¾nÃ© zjistit MAC adresu DNS serveru %s"
 
-#: admin/systems/class_networkSettings.inc:604
+#: admin/systems/class_networkSettings.inc:596
 #, php-format
 msgid "Was not able to launch ldap2zone: %s"
-msgstr "Nebyl schopen spustit ldap2zone: %s"
+msgstr "Nebylo moÅ¾nÃ© spustit ldap2zone: %s"
 
-#: admin/systems/class_networkSettings.inc:630
+#: admin/systems/class_networkSettings.inc:622
 #, php-format
 msgid "IP address %s"
-msgstr "IP adresa je %s"
+msgstr "IP adresa %s"
 
-#: admin/systems/class_networkSettings.inc:638
-#: admin/systems/class_networkSettings.inc:651
-#: admin/systems/class_networkSettings.inc:653
-#: admin/systems/class_networkSettings.inc:1022
-msgid "IP address"
-msgstr "IP adresa"
-
-#: admin/systems/class_networkSettings.inc:644
-#: admin/systems/class_networkSettings.inc:660
-#: admin/systems/class_networkSettings.inc:662
-#: admin/systems/class_networkSettings.inc:1023
+#: admin/systems/class_networkSettings.inc:636
+#: admin/systems/class_networkSettings.inc:652
+#: admin/systems/class_networkSettings.inc:654
+#: admin/systems/class_networkSettings.inc:1015
 msgid "MAC address"
 msgstr "MAC adresa"
 
-#: admin/systems/class_networkSettings.inc:676
+#: admin/systems/class_networkSettings.inc:668
 #, php-format
 msgid "The IP address '%s' is not part of the selected reverse zone '%s'!"
-msgstr "IP adresa '%s' nespadÃ¡ do zvolenÃ© obrÃ¡cenÃ© zÃ³ny '%s'!"
+msgstr "IP adresa %s nespadÃ¡ do zvolenÃ© obrÃ¡cenÃ© zÃ³ny %s!"
 
-#: admin/systems/class_networkSettings.inc:686
+#: admin/systems/class_networkSettings.inc:678
 #, php-format
 msgid "Record type '%s' is duplicated!"
-msgstr "ZÃ¡znam typu '%s' existuje vÃcekrÃ¡t!"
+msgstr "ZÃ¡znam typu %s existuje vÃcekrÃ¡t!"
 
-#: admin/systems/class_networkSettings.inc:693
+#: admin/systems/class_networkSettings.inc:685
 #, php-format
 msgid "Uniq record type '%s' is duplicated!"
 msgstr "ZÃ¡znam typu '%s' mÅ¯Å¾e sprÃ¡vnÄ› existovat nejvÃ½Å¡e jeden â€“ ale existuje vÃcekrÃ¡t!"
 
-#: admin/systems/class_networkSettings.inc:705
+#: admin/systems/class_networkSettings.inc:697
 #, php-format
 msgid ""
 "The IP address '%s' will be added as 'A Record', this will be done "
 "automatically, please remove the record."
-msgstr "IP adresa '%s' bude pÅ™idÃ¡na jako 'zÃ¡znam typu A'. Stane se tak automaticky â€“ prosÃm smaÅ¾te ho."
+msgstr "IP adresa %s bude pÅ™idÃ¡na jako zÃ¡znam typu A. Stane se tak samoÄinnÄ› â€“ smaÅ¾te ho."
 
-#: admin/systems/class_networkSettings.inc:712
+#: admin/systems/class_networkSettings.inc:704
 #, php-format
 msgid "Only lowercase records are allowed, please check your '%ss'."
-msgstr "Dovolena jsou pouze malÃ¡ pÃsmena â€“ zkontrolujte prosÃm VÃ¡Å¡ '%ss'."
+msgstr "Dovolena jsou pouze malÃ¡ pÃsmena â€“ zkontrolujte svÃ© %ss."
 
-#: admin/systems/class_networkSettings.inc:978
+#: admin/systems/class_networkSettings.inc:970
 msgid "Delete"
-msgstr "smazat"
+msgstr "Smazat"
 
-#: admin/systems/class_networkSettings.inc:984
+#: admin/systems/class_networkSettings.inc:976
 msgid "Add"
-msgstr "pÅ™idat"
+msgstr "PÅ™idat"
 
-#: admin/systems/class_networkSettings.inc:1015
-#: addons/dashboard/class_dashBoardNetwork.inc:127
+#: admin/systems/class_networkSettings.inc:1007
 msgid "Network"
 msgstr "SÃÅ¥"
 
-#: admin/systems/class_networkSettings.inc:1030
+#: admin/systems/class_networkSettings.inc:1022
 msgid "DNS configuration"
-msgstr "nastavenÃ DNS"
+msgstr "NastavenÃ DNS"
 
-#: admin/systems/class_networkSettings.inc:1033
+#: admin/systems/class_networkSettings.inc:1025
 msgid "DHCP configuration"
-msgstr "nastavenÃ DHCP"
-
-#: addons/dashboard/class_dashBoardSystems.inc:45
-msgid "Workstations"
-msgstr ""
-
-#: addons/dashboard/class_dashBoardSystems.inc:51
-msgid "Windows Workstations"
-msgstr ""
-
-#: addons/dashboard/class_dashBoardSystems.inc:54
-msgid "Terminals"
-msgstr ""
-
-#: addons/dashboard/class_dashBoardSystems.inc:57
-msgid "Printers"
-msgstr ""
-
-#: addons/dashboard/class_dashBoardSystems.inc:60
-msgid "Phones"
-msgstr ""
-
-#: addons/dashboard/class_dashBoardSystems.inc:63
-msgid "Components"
-msgstr ""
-
-#: addons/dashboard/class_dashBoardSystems.inc:66
-msgid "Mobile phones"
-msgstr ""
-
-#: addons/dashboard/class_dashBoardSystems.inc:183
-msgid "Statistics"
-msgstr "Statistiky"
-
-#: addons/dashboard/class_dashBoardSystems.inc:188
-msgid "Computer name to use by unit"
-msgstr ""
-
-#: addons/dashboard/class_dashBoardSystems.inc:200
-msgid "Statistics and informations about systems"
-msgstr ""
-
-#: addons/dashboard/class_dashBoardNetwork.inc:111
-msgid "DHCP"
-msgstr ""
-
-#: addons/dashboard/class_dashBoardNetwork.inc:116
-msgid "DNS"
-msgstr "DNS"
-
-#: addons/dashboard/class_dashBoardNetwork.inc:128
-msgid "Statistics and various informations"
-msgstr "Statistiky a rÅ¯znÃ© dalÅ¡Ã Ãºdaje"
+msgstr "NastavenÃ DHCP"
 
 #: config/systems/class_systemsPluginConfig.inc:29
 msgid "Systems plugin configuration"
@@ -1510,7 +977,7 @@ 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 uklÃ¡dÃ¡ny systÃ©my"
+msgstr "VÄ›tev, ve kterÃ© budou uloÅ¾eny systÃ©my"
 
 #: config/systems/class_systemsPluginConfig.inc:48
 msgid "Server RDN"
@@ -1522,7 +989,7 @@ msgstr "VÄ›tev, ve kterÃ© budou uloÅ¾eny servery"
 
 #: config/systems/class_systemsPluginConfig.inc:53
 msgid "Workstations RDN"
-msgstr "RozliÅ¡enÃ½ nÃ¡zev poÄÃtaÄe"
+msgstr "RelativnÃ rozliÅ¡enÃ½ nÃ¡zev poÄÃtaÄÅ¯"
 
 #: config/systems/class_systemsPluginConfig.inc:53
 msgid "Branch in which workstations will be stored"
@@ -1562,7 +1029,7 @@ msgstr "VÄ›tev, ve kterÃ© budou uloÅ¾eny mobilnÃ telefony"
 
 #: config/systems/class_systemsPluginConfig.inc:80
 msgid "Miscellaneous"
-msgstr "rÅ¯znÃ©"
+msgstr "RÅ¯znÃ©"
 
 #: config/systems/class_systemsPluginConfig.inc:84
 msgid "Available encodings for share services"
@@ -1578,7 +1045,7 @@ msgstr "NÃ¡zev tohoto kÃ³dovÃ¡nÃ znakÅ¯"
 
 #: config/systems/class_systemsPluginConfig.inc:93
 msgid "Label"
-msgstr "jmenovka"
+msgstr "Å tÃtek"
 
 #: config/systems/class_systemsPluginConfig.inc:93
 msgid "The encoding displayed name"
@@ -1587,406 +1054,3 @@ msgstr "ZobrazovanÃ½ nÃ¡zev tohoto kÃ³dovÃ¡nÃ znakÅ¯"
 #: config/systems/class_systemsPluginConfig.inc:101
 msgid "Encodings"
 msgstr "ZnakovÃ© sady"
-
-#: admin/ogroups/goto/termgroup.tpl.c:5
-msgid ""
-"Actions you choose here influence all systems in this object group. "
-"Additionally, all values editable here can be inherited by the clients "
-"assigned to this object group."
-msgstr ""
-
-#: admin/ogroups/goto/termgroup.tpl.c:8
-msgid "Generic"
-msgstr "obecnÃ©"
-
-#: admin/ogroups/goto/termgroup.tpl.c:11
-msgid "NTP server"
-msgstr ""
-
-#: admin/ogroups/goto/termgroup.tpl.c:14
-msgid "Choose server to use for synchronizing time"
-msgstr "zvolte server, se kterÃ½m bude synchronizovÃ¡n Äas"
-
-#: admin/ogroups/goto/termgroup.tpl.c:20
-msgid "Select terminal mode"
-msgstr "zvolit reÅ¾im terminÃ¡lu"
-
-#: admin/ogroups/goto/termgroup.tpl.c:26
-msgid "Choose server to use for logging"
-msgstr "zvolte server na kterÃ½ budou uklÃ¡dÃ¡ny zÃ¡znamy o provozu"
-
-#: admin/ogroups/goto/termgroup.tpl.c:32
-msgid "Select NFS root filesystem to use"
-msgstr ""
-
-#: admin/ogroups/goto/termgroup.tpl.c:38
-msgid "Choose NFS filesystem to place swap files on"
-msgstr ""
-
-#: admin/ogroups/goto/termgroup.tpl.c:47
-msgid "Execute"
-msgstr "spustit"
-
-#: 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 admin/systems/network.tpl.c:11
-msgid "Propose ip"
-msgstr "doporuÄit IP"
-
-#: admin/systems/network.tpl.c:14
-msgid "MAC-address"
-msgstr "MAC adresa"
-
-#: admin/systems/network.tpl.c:17
-msgid "Autodetect"
-msgstr "autodetekce"
-
-#: admin/systems/network.tpl.c:20 admin/systems/network.tpl.c:23
-msgid "Enable DHCP for this device"
-msgstr "dovolit tomuto zaÅ™ÃzenÃ vyuÅ¾Ãvat DHCP"
-
-#: admin/systems/network.tpl.c:26 admin/systems/network.tpl.c:50
-msgid "not configured"
-msgstr "nenastaveno"
-
-#: admin/systems/network.tpl.c:29
-msgid "Parent node"
-msgstr "nadÅ™azenÃ½ uzel"
-
-#: admin/systems/network.tpl.c:32
-msgid "Edit settings"
-msgstr "upravit nastavenÃ"
-
-#: admin/systems/network.tpl.c:35 admin/systems/network.tpl.c:47
-msgid "Enable DNS for this device"
-msgstr "dovolit tomuto zaÅ™ÃzenÃ vyuÅ¾Ãvat DNS"
-
-#: admin/systems/network.tpl.c:38
-msgid "Zone"
-msgstr "zÃ³na"
-
-#: admin/systems/network.tpl.c:41
-msgid "TTL"
-msgstr ""
-
-#: admin/systems/network.tpl.c:44
-msgid "Dns records"
-msgstr "DNS zÃ¡znamy"
-
-#: admin/systems/password.tpl.c:2
-msgid ""
-"To change the terminal root password use the fields below. The changes take "
-"effect during the next reboot. Please memorize the new password, because you"
-" wouldn't be able to log in."
-msgstr "Pro zmÄ›nu hesla sprÃ¡vce terminÃ¡lu (root) pouÅ¾ijte polÃ nÃÅ¾e. ZmÄ›na se projevÃ po jeho restartu. Zapamatujte si prosÃm novÃ© heslo, protoÅ¾e jinak se nebudete moci pÅ™ihlÃ¡sit."
-
-#: admin/systems/password.tpl.c:5
-msgid "Leave fields blank for password inheritance from default entries."
-msgstr "Pokud chcete pouÅ¾Ãt vÃ½chozÃ heslo, ponechte pÅ™ÃsluÅ¡nÃ¡ pole prÃ¡zdnÃ¡."
-
-#: admin/systems/password.tpl.c:8
-msgid "Changing the password impinges on authentification only."
-msgstr "ZmÄ›na hesla se tÃ½kÃ¡ pouze ovÄ›Å™ovÃ¡nÃ."
-
-#: admin/systems/password.tpl.c:11
-msgid "New password"
-msgstr "novÃ© heslo"
-
-#: admin/systems/password.tpl.c:14
-msgid "Repeat new password"
-msgstr "zopakovÃ¡nÃ novÃ©ho hesla"
-
-#: admin/systems/password.tpl.c:17
-msgid "Password strength"
-msgstr "odolnost hesla"
-
-#: admin/systems/password.tpl.c:20
-msgid "Set password"
-msgstr "nastavit heslo"
-
-#: 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/gencd.tpl.c:2
-msgid "CD-Install-Image generation"
-msgstr "vytvoÅ™enÃ obrazu instalaÄnÃho mÃ©dia (CD)"
-
-#: admin/systems/gencd.tpl.c:5
-msgid ""
-"This option enables you to generate FAI install CD images for the selected "
-"workstation. The procedure may take about 10 minutes to complete, so please "
-"be patient after pressing the 'Create ISO-Image' button."
-msgstr ""
-
-#: admin/systems/gencd.tpl.c:8
-msgid "Create ISO-Image"
-msgstr "vytvoÅ™it obraz ISO"
-
-#: admin/systems/remove.tpl.c:5
-msgid ""
-"This includes all account data, system access rules, imap settings, etc. for"
-" this user. Please double check if your really want to do this since there "
-"is no way for FusionDirectory to get your data back."
-msgstr "TÃ½kÃ¡ se veÅ¡kerÃ½ch informacÃ o tÃ©to poloÅ¾ce v adresÃ¡Å™i. ProsÃm velmi dobÅ™e si rozmyslete, zda to opravdu chcete udÄ›lat, protoÅ¾e provedenÃ© zmÄ›ny uÅ¾ ve FusionDirectory nepÅ¯jde vzÃt nijak jednoduÅ¡e zpÄ›t (nanejvÃ½Å¡ sloÅ¾itÄ› ze zÃ¡loh, pokud existujÃ a obsahujÃ potÅ™ebnÃ¡ data)!"
-
-#: admin/systems/remove.tpl.c:8
-msgid "So - if you're sure - press 'Delete' to continue or 'Cancel' to abort."
-msgstr "Tedy â€“ pokud jste si jist(a), stisknÄ›te 'smazat'. V opaÄnÃ©m pÅ™ÃpadÄ› operaci zruÅ¡te pomocÃ 'zruÅ¡it'."
-
-#: admin/systems/system-filter.tpl.c:2
-#: admin/systems/phoneSelect/phoneSelect-filter.tpl.c:2
-msgid "Filter"
-msgstr "filtr"
-
-#: admin/systems/system-filter.tpl.c:5
-msgid "Show servers"
-msgstr "zobrazit servery"
-
-#: admin/systems/system-filter.tpl.c:8
-msgid "Show workstations"
-msgstr "zobrazit pracovnÃ stanice"
-
-#: admin/systems/system-filter.tpl.c:11
-msgid "Show terminals"
-msgstr "zobrazit terminÃ¡ly"
-
-#: admin/systems/system-filter.tpl.c:14
-msgid "Show network printer"
-msgstr "zobrazit sÃÅ¥ovou tiskÃ¡rnu"
-
-#: admin/systems/system-filter.tpl.c:17
-#: admin/systems/phoneSelect/phoneSelect-filter.tpl.c:5
-msgid "Show phones"
-msgstr "zobrazit telefony"
-
-#: admin/systems/system-filter.tpl.c:20
-msgid "Show windows based workstations"
-msgstr "zobraz pracovnÃ stanice s OS MS Windows"
-
-#: admin/systems/system-filter.tpl.c:23
-msgid "Show network devices"
-msgstr "zobrazit sÃÅ¥ovÃ¡ zaÅ™ÃzenÃ"
-
-#: admin/systems/system-filter.tpl.c:26
-#: admin/systems/phoneSelect/phoneSelect-filter.tpl.c:8
-msgid "Show mobile phones"
-msgstr "Zobrazit mobilnÃ telefony"
-
-#: admin/systems/system-filter.tpl.c:29
-msgid "Show IPMI interfaces"
-msgstr "Zobrazit IPMI rozhranÃ"
-
-#: admin/systems/ppd/printerPPDSelectionDialog.tpl.c:2
-msgid "Select objects to add"
-msgstr "vyberte objekty, kterÃ© budou pÅ™idÃ¡ny"
-
-#: admin/systems/ppd/printerPPDSelectionDialog.tpl.c:5
-msgid "Filters"
-msgstr "filtry"
-
-#: admin/systems/ppd/printerPPDSelectionDialog.tpl.c:8
-msgid "Display objects matching"
-msgstr "zobrazit odpovÃdajÃcÃ objekty"
-
-#: admin/systems/ppd/printerPPDSelectionDialog.tpl.c:11
-msgid "Regular expression for matching object names"
-msgstr "regulÃ¡rnÃ vÃ½raz pro hledÃ¡nÃ objektÅ¯ s odpovÃdajÃcÃmi nÃ¡zvy"
-
-#: admin/systems/ppd/printerPPDSelectionDialog.tpl.c:14
-msgid "Close"
-msgstr "zavÅ™Ãt"
-
-#: admin/systems/ppd/printerPPDDialog.tpl.c:2
-msgid "Printer driver"
-msgstr "ovladaÄ tiskÃ¡rny"
-
-#: admin/systems/ppd/printerPPDDialog.tpl.c:5
-msgid "Model"
-msgstr "typ"
-
-#: admin/systems/ppd/printerPPDDialog.tpl.c:8
-msgid "Select"
-msgstr "vybrat"
-
-#: admin/systems/ppd/printerPPDDialog.tpl.c:11
-msgid "New driver"
-msgstr "novÃ½ ovladaÄ"
-
-#: admin/systems/ppd/printerPPDDialog.tpl.c:14
-msgid "Upload"
-msgstr "nahrÃ¡t"
-
-#: admin/systems/ppd/printerPPDDialog.tpl.c:17
-msgid "Options"
-msgstr "volby"
-
-#: admin/systems/ppd/remove_ppd.tpl.c:5
-msgid "The ppd file will be removed from the server and can not be restored."
-msgstr "PPD soubor bude definitivnÄ› odebrÃ¡n ze serveru â€“ nepÅ¯jde ho pak (jednoduÅ¡e) obnovit."
-
-#: admin/systems/printer.tpl.c:2
-msgid "General"
-msgstr "obecnÃ©"
-
-#: admin/systems/printer.tpl.c:5
-msgid "Printer name"
-msgstr "nÃ¡zev tiskÃ¡rny"
-
-#: admin/systems/printer.tpl.c:14
-msgid "Details"
-msgstr "podrobnosti"
-
-#: admin/systems/printer.tpl.c:20
-msgid "Printer location"
-msgstr "kde se tiskÃ¡rna nachÃ¡zÃ"
-
-#: admin/systems/printer.tpl.c:26
-msgid "PPD Provider"
-msgstr "poskytovatel PPD"
-
-#: admin/systems/printer.tpl.c:29
-msgid "Driver"
-msgstr "ovladaÄ"
-
-#: admin/systems/printer.tpl.c:32
-msgid "Edit"
-msgstr "upravit"
-
-#: admin/systems/printer.tpl.c:41
-msgid "Users which are allowed to use this printer"
-msgstr "uÅ¾ivatelÃ©, kteÅ™Ã smÄ›jÃ pouÅ¾Ãvat tuto tiskÃ¡rnu"
-
-#: admin/systems/printer.tpl.c:44
-msgid "Users"
-msgstr "uÅ¾ivatelÃ©"
-
-#: admin/systems/printer.tpl.c:47
-msgid "Users which are allowed to administrate this printer"
-msgstr "uÅ¾ivatelÃ©, kteÅ™Ã smÄ›jÃ spravovat tuto tiskÃ¡rnu"
-
-#: admin/systems/printer.tpl.c:50
-msgid "Admins"
-msgstr "sprÃ¡vci"
-
-#: admin/systems/printer.tpl.c:53
-msgid "Windows paths"
-msgstr ""
-
-#: admin/systems/printer.tpl.c:56
-msgid "Printer windows inf file"
-msgstr "Windows inf soubor tiskÃ¡rny"
-
-#: admin/systems/printer.tpl.c:59
-msgid "Printer driver directory"
-msgstr "SloÅ¾ka s ovladaÄem k tiskÃ¡rnÄ›"
-
-#: admin/systems/gencd_frame.tpl.c:2
-msgid "Your browser does not supprt iframes."
-msgstr "VÃ¡Å¡ webovÃ½ prohlÃÅ¾eÄ nepodporuje prvek â€žiframeâ€œ."
-
-#: admin/systems/services/cups/serviceCUPS.tpl.c:2
-msgid "Print Service"
-msgstr "sluÅ¾ba tisku"
-
-#: admin/systems/services/cups/serviceCUPS.tpl.c:5
-msgid "enabled"
-msgstr "povoleno"
-
-#: admin/systems/services/ServiceAddDialog.tpl.c:2
-msgid "Adding a new service to the current server"
-msgstr "PÅ™idÃ¡nÃ novÃ© sluÅ¾by na tento server."
-
-#: admin/systems/services/ServiceAddDialog.tpl.c:5
-msgid ""
-"This dialog allows you to add new services to the currenty edited server "
-"object. The box below shows all available but not already used services."
-msgstr "Tento dialog VÃ¡m umoÅ¾nÃ pÅ™idat na v souÄasnosti upravovanÃ½ server novou sluÅ¾bu. NÃÅ¾e je uveden vÃ½pis dostupnÃ½ch, ale jeÅ¡tÄ› nevyuÅ¾ÃvanÃ½ch sluÅ¾eb."
-
-#: admin/systems/services/ServiceAddDialog.tpl.c:8
-msgid "Service to add"
-msgstr "sluÅ¾ba, kterou chcete pÅ™idat"
-
-#: admin/systems/services/ServiceAddDialog.tpl.c:11
-msgid "All available services are already in use."
-msgstr "VÅ¡echny dostupnÃ© sluÅ¾by jsou jiÅ¾ vyuÅ¾ÃvÃ¡ny."
-
-#: admin/systems/services/ServiceAddDialog.tpl.c:14
-#: admin/systems/SelectDeviceType.tpl.c:26
-msgid "Continue"
-msgstr "pokraÄovat"
-
-#: admin/systems/SelectDeviceType.tpl.c:2
-msgid ""
-"This system has no system type configured. Please choose a system type for "
-"this object and an optional inheritance group. Press the 'continue' button "
-"to proceed."
-msgstr ""
-
-#: admin/systems/SelectDeviceType.tpl.c:5
-msgid ""
-"Please select a system type and an optional bundle of predefined settings to"
-" be inherited."
-msgstr ""
-
-#: admin/systems/SelectDeviceType.tpl.c:8
-msgid ""
-"Please select a system type and a bundle of predefined settings to be "
-"inherited."
-msgstr ""
-
-#: admin/systems/SelectDeviceType.tpl.c:11
-#: admin/systems/SelectDeviceType.tpl.c:14
-msgid "System type"
-msgstr "typ systÃ©mu"
-
-#: admin/systems/SelectDeviceType.tpl.c:17
-msgid "Choose an object group as template"
-msgstr "jako Å¡ablonu zvolte skupinu objektu"
-
-#: admin/systems/SelectDeviceType.tpl.c:20
-msgid "Object group"
-msgstr "skupina objektu"
-
-#: admin/systems/SelectDeviceType.tpl.c:23
-msgid "none"
-msgstr "Å¾Ã¡dnÃ¡/Ã½/Ã©"
-
-#: 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] ""
-
-#: 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] ""
diff --git a/systems/locale/de/fusiondirectory.po b/systems/locale/de/fusiondirectory.po
index a80aec34f6dff0043b38d62fd6e7ff8fd9eb21b5..c91ab7dc46fd2595f4e19d6bd7e3b8ae617e914a 100644
--- a/systems/locale/de/fusiondirectory.po
+++ b/systems/locale/de/fusiondirectory.po
@@ -3,16 +3,15 @@
 # This file is distributed under the same license as the PACKAGE package.
 # 
 # Translators:
-# Maik Wagner <maikwagner@yahoo.com>, 2013
-#  Stefan Koehler <stefan.koehler@GONICUS.de>, 2005
+# Ettore Atalan <atalanttore@googlemail.com>, 2014-2015
 msgid ""
 msgstr ""
-"Project-Id-Version: FusionDirectory-108\n"
+"Project-Id-Version: FusionDirectory-109\n"
 "Report-Msgid-Bugs-To: documentation@lists.fusiondirectory.org\n"
-"POT-Creation-Date: 2015-03-31 11:49+0200\n"
-"PO-Revision-Date: 2015-03-31 11:41+0000\n"
-"Last-Translator: fusiondirectory <contact@fusiondirectory.org>\n"
-"Language-Team: German (http://www.transifex.com/projects/p/FusionDirectory-108/language/de/)\n"
+"POT-Creation-Date: 2014-12-15 17:47+0100\n"
+"PO-Revision-Date: 2015-04-23 14:50+0000\n"
+"Last-Translator: Ettore Atalan <atalanttore@googlemail.com>\n"
+"Language-Team: German (http://www.transifex.com/projects/p/FusionDirectory-109/language/de/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -21,36 +20,31 @@ msgstr ""
 
 #: admin/ogroups/goto/class_termgroup.inc:70
 msgid "Activated"
-msgstr "Aktiv"
+msgstr "Aktiviert"
 
 #: admin/ogroups/goto/class_termgroup.inc:71
 msgid "Locked"
 msgstr "Gesperrt"
 
 #: admin/ogroups/goto/class_termgroup.inc:118
-#: admin/systems/class_terminalGeneric.inc:121
+#: admin/systems/class_terminalStartup.inc:145
 msgid "Local swap"
 msgstr "Lokaler Auslagerungsspeicher"
 
 #: admin/ogroups/goto/class_termgroup.inc:124
 #: admin/ogroups/goto/class_termgroup.inc:136
-#: admin/systems/class_workstationGeneric.inc:352
-#: admin/systems/class_terminalGeneric.inc:109
-#: admin/systems/class_terminalGeneric.inc:125
+#: admin/systems/class_terminalStartup.inc:133
+#: admin/systems/class_terminalStartup.inc:149
 msgid "inherited"
 msgstr "geerbt"
 
 #: admin/ogroups/goto/class_termgroup.inc:220
-#: admin/systems/class_workstationGeneric.inc:72
-#: admin/systems/class_workstationGeneric.inc:443
-#: admin/systems/class_systemManagement.inc:295
-#: admin/systems/class_systemManagement.inc:325
-msgid "Infrastructure service"
-msgstr ""
+#: admin/systems/class_systemManagement.inc:165
+#: admin/systems/class_systemManagement.inc:186
+msgid "Service infrastructure"
+msgstr "Dienst-Infrastruktur"
 
 #: admin/ogroups/goto/class_termgroup.inc:224
-#: admin/systems/class_workstationGeneric.inc:75
-#: admin/systems/class_workstationGeneric.inc:78
 msgid "Event error"
 msgstr "Ereignisfehler"
 
@@ -60,22 +54,20 @@ msgid "Event '%s' is not available!"
 msgstr "Das Ereignis '%s' ist nicht verfÃ¼gbar!"
 
 #: admin/ogroups/goto/class_termgroup.inc:274
-#: admin/systems/class_workstationGeneric.inc:112
 msgid "Switch off"
 msgstr "Ausschalten"
 
 #: admin/ogroups/goto/class_termgroup.inc:274
-#: admin/systems/class_workstationGeneric.inc:113
 msgid "Reboot"
 msgstr "Neustarten"
 
 #: admin/ogroups/goto/class_termgroup.inc:275
 msgid "Instant update"
-msgstr "Sofortiges Update"
+msgstr "Sofortige Aktualisierung"
 
 #: admin/ogroups/goto/class_termgroup.inc:276
 msgid "Scheduled update"
-msgstr "Geplantes Update"
+msgstr "Geplante Aktualisierung"
 
 #: admin/ogroups/goto/class_termgroup.inc:277
 msgid "Wake"
@@ -83,10 +75,9 @@ msgstr "Aufwecken"
 
 #: admin/ogroups/goto/class_termgroup.inc:278
 msgid "Reinstall"
-msgstr "Neu-Installation"
+msgstr "Erneut installieren"
 
 #: admin/ogroups/goto/class_termgroup.inc:279
-#: admin/systems/class_workstationGeneric.inc:108
 msgid "Memory test"
 msgstr "Speichertest"
 
@@ -95,21 +86,18 @@ msgid "System analysis"
 msgstr "Systemanalyse"
 
 #: admin/ogroups/goto/class_termgroup.inc:386
-#: admin/systems/class_printGeneric.inc:670
-#: admin/systems/class_printGeneric.inc:970
-#: admin/systems/class_systemManagement.inc:816
 #: admin/systems/services/class_goService.inc:123
 #: admin/systems/services/class_goService.inc:151
 #: admin/systems/services/class_goService.inc:187
-#: admin/systems/class_networkSettings.inc:478
-#: admin/systems/class_networkSettings.inc:491
-#: admin/systems/class_networkSettings.inc:757
-#: admin/systems/class_networkSettings.inc:816
-#: admin/systems/class_networkSettings.inc:835
-#: admin/systems/class_networkSettings.inc:852
-#: admin/systems/class_networkSettings.inc:861
-#: admin/systems/class_networkSettings.inc:879
-#: admin/systems/class_networkSettings.inc:951
+#: admin/systems/class_networkSettings.inc:470
+#: admin/systems/class_networkSettings.inc:483
+#: admin/systems/class_networkSettings.inc:749
+#: admin/systems/class_networkSettings.inc:808
+#: admin/systems/class_networkSettings.inc:827
+#: admin/systems/class_networkSettings.inc:844
+#: admin/systems/class_networkSettings.inc:853
+#: admin/systems/class_networkSettings.inc:871
+#: admin/systems/class_networkSettings.inc:943
 msgid "LDAP error"
 msgstr "LDAP-Fehler"
 
@@ -119,197 +107,127 @@ msgstr "System"
 
 #: admin/ogroups/goto/class_termgroup.inc:395
 msgid "System group"
-msgstr "System-Gruppe"
+msgstr "Systemgruppe"
 
-#: admin/ogroups/goto/class_termgroup.inc:401
-#: admin/ogroups/goto/termgroup.tpl.c:17
+#: admin/ogroups/goto/class_termgroup.inc:402
 msgid "Mode"
 msgstr "Modus"
 
-#: admin/ogroups/goto/class_termgroup.inc:402
-#: admin/systems/class_workstationGeneric.inc:189
-#: admin/ogroups/goto/termgroup.tpl.c:23
+#: admin/ogroups/goto/class_termgroup.inc:403
+#: admin/systems/class_systemServers.inc:35
 msgid "Syslog server"
 msgstr "Syslog-Server"
 
-#: admin/ogroups/goto/class_termgroup.inc:403
+#: admin/ogroups/goto/class_termgroup.inc:404
 msgid "Action flag"
 msgstr "Ablaufstatus"
 
-#: admin/ogroups/goto/class_termgroup.inc:404
+#: admin/ogroups/goto/class_termgroup.inc:405
 msgid "Ntp server"
 msgstr "NTP-Dienst"
 
-#: admin/ogroups/goto/class_termgroup.inc:405
-#: admin/systems/class_terminalGeneric.inc:41
-#: admin/ogroups/goto/termgroup.tpl.c:29
+#: admin/ogroups/goto/class_termgroup.inc:406
+#: admin/systems/class_terminalStartup.inc:65
 msgid "Root server"
 msgstr "Root-Server"
 
-#: admin/ogroups/goto/class_termgroup.inc:406
-#: admin/systems/class_terminalGeneric.inc:47
-#: admin/ogroups/goto/termgroup.tpl.c:35
+#: admin/ogroups/goto/class_termgroup.inc:407
+#: admin/systems/class_terminalStartup.inc:69
 msgid "Swap server"
-msgstr "Auslagerungs-Server"
+msgstr "Auslagerungsaerver"
 
-#: admin/systems/class_terminalStartup.inc:63
+#: admin/systems/class_terminalStartup.inc:62
 msgid "Startup parameters"
 msgstr "Startparameter"
 
-#: admin/systems/class_terminalStartup.inc:66
+#: admin/systems/class_terminalStartup.inc:65
+msgid "The root server the terminal should be using"
+msgstr "Der root-Server den das Terminal verwenden sollte"
+
+#: admin/systems/class_terminalStartup.inc:69
+msgid "The swap server the terminal should be using"
+msgstr "Der swap-Server den das Terminal verwenden sollte"
+
+#: admin/systems/class_terminalStartup.inc:73
 msgid "Boot kernel"
 msgstr "Boot-Kernel"
 
-#: admin/systems/class_terminalStartup.inc:66
+#: admin/systems/class_terminalStartup.inc:73
 msgid "Linux kernel to be installed and booted"
 msgstr "Zu installierender und bootender Linux-Kernel"
 
-#: admin/systems/class_terminalStartup.inc:70
+#: admin/systems/class_terminalStartup.inc:77
 msgid "Boot kernel parameters"
 msgstr "Boot Kernel Parameter"
 
-#: admin/systems/class_terminalStartup.inc:70
+#: admin/systems/class_terminalStartup.inc:77
 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/class_terminalStartup.inc:83
-msgid "Terminal startup"
-msgstr "Terminal-Start"
-
-#: admin/systems/system-list.xml:10
-msgid "List of systems"
-msgstr "Liste der Systeme"
-
-#: admin/systems/system-list.xml:14
-msgid "New workstation"
-msgstr "Neue Arbeitsstation"
-
-#: admin/systems/system-list.xml:22
-msgid "Locked server"
-msgstr "Gesperrter Server"
-
-#: admin/systems/system-list.xml:30
-msgid "Locked workstation"
-msgstr "Gesperrte Arbeitsstation"
-
-#: admin/systems/system-list.xml:38
-msgid "Locked terminal"
-msgstr "Gesperrtes Terminal"
-
-#: admin/systems/system-list.xml:47
-msgid "New terminal"
-msgstr "Neues Terminal"
-
-#: admin/systems/system-list.xml:55
-msgid "New device"
-msgstr "Neues GerÃ¤t"
-
-#: admin/systems/system-list.xml:63
-msgid "Workstation template"
-msgstr "Arbeitsstations-Vorlage"
-
-#: admin/systems/system-list.xml:71
-msgid "Terminal template"
-msgstr "Terminal-Vorlage"
+msgid "Remote desktop"
+msgstr "Entfernte ArbeitsflÃ¤che"
 
-#: admin/systems/system-list.xml:79
-msgid "Winstation"
-msgstr "Windows-Arbeitsstation"
+#: admin/systems/class_terminalStartup.inc:87
+msgid "Connect method"
+msgstr "Verbindungsmethode"
 
-#: admin/systems/system-list.xml:87 admin/systems/system-list.xml:234
-#: admin/systems/class_systemImport.inc:169
-#: admin/systems/class_serverGeneric.inc:46
-#: admin/systems/class_serverGeneric.inc:51
-#: admin/systems/class_serverGeneric.inc:52
-#: admin/systems/class_SelectDeviceType.inc:58
-msgid "Server"
-msgstr "Server"
+#: admin/systems/class_terminalStartup.inc:91
+msgid "XDMCP"
+msgstr "XDMCP"
 
-#: admin/systems/system-list.xml:95 admin/systems/system-list.xml:242
-#: admin/systems/class_workstationGeneric.inc:458
-#: admin/systems/class_workstationGeneric.inc:463
-#: admin/systems/class_workstationGeneric.inc:464
-#: admin/systems/class_SelectDeviceType.inc:58
-msgid "Workstation"
-msgstr "Arbeitsstation"
+#: admin/systems/class_terminalStartup.inc:91
+msgid "LDM"
+msgstr "LDM"
 
-#: admin/systems/system-list.xml:103 admin/systems/system-list.xml:250
-#: admin/systems/class_terminalGeneric.inc:81
-#: admin/systems/class_terminalGeneric.inc:86
-#: admin/systems/class_terminalGeneric.inc:87
-#: admin/systems/class_SelectDeviceType.inc:58
-msgid "Terminal"
-msgstr "Terminal"
+#: admin/systems/class_terminalStartup.inc:91
+msgid "Shell"
+msgstr "Shell"
 
-#: admin/systems/system-list.xml:111 admin/systems/class_printGeneric.inc:1005
-#: admin/systems/class_printGeneric.inc:1011
-#: admin/systems/class_printGeneric.inc:1012
-msgid "Printer"
-msgstr "Drucker"
+#: admin/systems/class_terminalStartup.inc:91
+msgid "Telnet"
+msgstr "Telnet"
 
-#: admin/systems/system-list.xml:119 admin/systems/system-list.xml:274
-#: admin/systems/class_mobilePhoneGeneric.inc:74
-#: admin/systems/phoneSelect/phoneSelect-list.xml:14
-msgid "Phone"
-msgstr "Telefon"
+#: admin/systems/class_terminalStartup.inc:91
+msgid "Windows RDP"
+msgstr "Windows RDP"
 
-#: admin/systems/system-list.xml:127
-#: admin/systems/class_mobilePhoneGeneric.inc:36
-#: admin/systems/class_mobilePhoneGeneric.inc:41
-#: admin/systems/class_mobilePhoneGeneric.inc:42
-#: admin/systems/phoneSelect/phoneSelect-list.xml:22
-msgid "Mobile phone"
-msgstr "Mobiltelefon"
+#: admin/systems/class_terminalStartup.inc:95
+msgid "Terminal server"
+msgstr "Terminal-Server"
 
-#: admin/systems/system-list.xml:135
-#: admin/systems/class_componentGeneric.inc:36
-msgid "Component"
-msgstr "Komponente"
+#: admin/systems/system-list.xml:10
+msgid "List of systems"
+msgstr "Liste der Systeme"
 
-#: admin/systems/system-list.xml:143 admin/systems/system-list.xml:298
-msgid "IPMI"
-msgstr "IPMI"
-
-#: admin/systems/system-list.xml:169
-#: admin/systems/class_workstationGeneric.inc:154
-#: admin/systems/class_printGeneric.inc:752
-#: admin/systems/class_printGeneric.inc:762
-#: admin/systems/class_printGeneric.inc:781
-#: admin/systems/class_printGeneric.inc:1022
-#: admin/systems/class_componentGeneric.inc:64
-#: admin/systems/class_mobilePhoneGeneric.inc:63
-#: admin/systems/phoneSelect/phoneSelect-list.xml:48
+#: admin/systems/system-list.xml:31
+#: admin/systems/class_workstationGeneric.inc:46
+#: admin/systems/class_printGeneric.inc:60
+#: admin/systems/class_componentGeneric.inc:58
+#: admin/systems/class_mobilePhoneGeneric.inc:60
 #: admin/systems/services/shares/class_serviceShare.inc:52
-#: admin/systems/system-filter.tpl.c:32
-#: admin/systems/phoneSelect/phoneSelect-filter.tpl.c:11
 msgid "Name"
 msgstr "Name"
 
-#: admin/systems/system-list.xml:177
-#: admin/systems/phoneSelect/phoneSelect-list.xml:63
+#: admin/systems/system-list.xml:39
 msgid "IP"
 msgstr "IP"
 
-#: admin/systems/system-list.xml:185
+#: admin/systems/system-list.xml:47
 msgid "MAC"
 msgstr "MAC"
 
-#: admin/systems/system-list.xml:193
-#: admin/systems/class_workstationGeneric.inc:160
-#: admin/systems/class_printGeneric.inc:1024
-#: admin/systems/class_componentGeneric.inc:68
-#: admin/systems/class_mobilePhoneGeneric.inc:67
+#: admin/systems/system-list.xml:55
+#: admin/systems/class_workstationGeneric.inc:51
+#: admin/systems/class_printGeneric.inc:64
+#: admin/systems/class_componentGeneric.inc:62
+#: admin/systems/class_mobilePhoneGeneric.inc:64
 #: admin/systems/serverService-list.xml:35
 #: admin/systems/services/shares/class_serviceShare.inc:56
-#: admin/systems/printer.tpl.c:8 admin/systems/printer.tpl.c:17
 msgid "Description"
 msgstr "Beschreibung"
 
-#: admin/systems/system-list.xml:201 admin/systems/class_serverService.inc:57
+#: admin/systems/system-list.xml:63 admin/systems/class_serverService.inc:57
 #: admin/systems/services/terminal/class_serviceTerminal.inc:30
 #: admin/systems/services/cups/class_serviceCUPS.inc:85
 #: admin/systems/services/shares/class_serviceShare.inc:31
@@ -318,381 +236,189 @@ msgstr "Beschreibung"
 msgid "Services"
 msgstr "Dienste"
 
-#: admin/systems/system-list.xml:209
+#: admin/systems/system-list.xml:71
 msgid "Release"
 msgstr "Release"
 
-#: admin/systems/system-list.xml:217 admin/systems/serverService-list.xml:43
-#: admin/systems/phoneSelect/phoneSelect-list.xml:70
+#: admin/systems/system-list.xml:79 admin/systems/serverService-list.xml:43
 msgid "Actions"
 msgstr "Aktionen"
 
-#: admin/systems/system-list.xml:228 admin/systems/serverService-list.xml:54
+#: admin/systems/system-list.xml:90 admin/systems/serverService-list.xml:54
 msgid "Create"
 msgstr "Anlegen"
 
-#: admin/systems/system-list.xml:258
-msgid "winStation"
-msgstr "winStation"
-
-#: admin/systems/system-list.xml:266
-msgid "Network printer"
-msgstr "Netzwerk-Drucker"
-
-#: admin/systems/system-list.xml:282
-#: admin/systems/class_componentGeneric.inc:41
-#: admin/systems/class_componentGeneric.inc:42
-msgid "Network device"
-msgstr "Netzwerk-GerÃ¤t"
-
-#: admin/systems/system-list.xml:290
-msgid "Mobile Phone"
-msgstr "Mobiltelefon"
-
-#: admin/systems/system-list.xml:310
+#: admin/systems/system-list.xml:100
 msgid "Trigger action"
 msgstr "Aktion auslÃ¶sen"
 
-#: admin/systems/system-list.xml:317
+#: admin/systems/system-list.xml:107
 msgid "Schedule action"
 msgstr "Aktion planen"
 
-#: admin/systems/system-list.xml:330
-msgid "Activate systems"
-msgstr "Aktiviere Systeme"
-
-#: admin/systems/system-list.xml:337 admin/systems/serverService-list.xml:69
-#: admin/systems/printer.tpl.c:35
+#: admin/systems/system-list.xml:119 admin/systems/serverService-list.xml:69
 msgid "Remove"
 msgstr "Entfernen"
 
-#: admin/systems/system-list.xml:367
-msgid "Create ISO"
-msgstr "DVD-ISO anlegen"
-
-#: admin/systems/system-list.xml:379
+#: admin/systems/system-list.xml:150
 msgid "Edit system"
 msgstr "System bearbeiten"
 
-#: admin/systems/system-list.xml:392
+#: admin/systems/system-list.xml:163
 msgid "Remove system"
 msgstr "System entfernen"
 
-#: admin/systems/class_workstationGeneric.inc:75
-#, php-format
-msgid "Event %s is not available!"
-msgstr "Ereignis %s ist nicht verfÃ¼gbar!"
-
-#: admin/systems/class_workstationGeneric.inc:78
-msgid "Events are not available!"
-msgstr "Ereignisse sind nicht verfÃ¼gbar!"
-
-#: admin/systems/class_workstationGeneric.inc:106
-msgid "(Re)Install"
-msgstr "(Re)Installieren"
-
-#: admin/systems/class_workstationGeneric.inc:107
-msgid "Software update"
-msgstr "Softwareupdate"
-
-#: admin/systems/class_workstationGeneric.inc:115
-msgid "Wake up"
-msgstr "Aufwecken"
-
-#: admin/systems/class_workstationGeneric.inc:144
-#: admin/systems/class_printGeneric.inc:604
+#: admin/systems/class_workstationGeneric.inc:35
 msgid "workstation"
 msgstr "Arbeitsstation"
 
-#: admin/systems/class_workstationGeneric.inc:151
-#: admin/systems/class_componentGeneric.inc:61
-#: admin/systems/class_mobilePhoneGeneric.inc:60
+#: admin/systems/class_workstationGeneric.inc:42
+#: admin/systems/class_printGeneric.inc:56
+#: admin/systems/class_componentGeneric.inc:55
+#: admin/systems/class_mobilePhoneGeneric.inc:56
 msgid "Properties"
 msgstr "Eigenschaften"
 
-#: admin/systems/class_workstationGeneric.inc:155
+#: admin/systems/class_workstationGeneric.inc:47
 #, php-format
 msgid "The name of the %s"
 msgstr "Der Name der %s"
 
-#: admin/systems/class_workstationGeneric.inc:161
+#: admin/systems/class_workstationGeneric.inc:52
 #, php-format
 msgid "A short description of the %s"
 msgstr "Eine kurze Beschreibung der %s"
 
-#: admin/systems/class_workstationGeneric.inc:166
-#: admin/systems/class_printGeneric.inc:1025
+#: admin/systems/class_workstationGeneric.inc:56
 msgid "Location"
 msgstr "Ort"
 
-#: admin/systems/class_workstationGeneric.inc:167
+#: admin/systems/class_workstationGeneric.inc:57
 #, php-format
 msgid "The location of the %s"
 msgstr "Der Ort des %s"
 
-#: admin/systems/class_workstationGeneric.inc:173
+#: admin/systems/class_workstationGeneric.inc:61
 #, php-format
 msgid "Lock this %s"
 msgstr "Sperren dieser %s"
 
-#: admin/systems/class_workstationGeneric.inc:174
+#: admin/systems/class_workstationGeneric.inc:62
 #, 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:185
-#: addons/dashboard/class_dashBoardSystems.inc:48
-msgid "Servers"
-msgstr "Server"
-
-#: admin/systems/class_workstationGeneric.inc:190
-#, php-format
-msgid "The syslog server the %s should be using"
-msgstr "Der Syslogserver den %s verwenden sollte"
-
-#: admin/systems/class_workstationGeneric.inc:195
-msgid "Inherit NTP servers"
-msgstr "Erben von NTP-Servern"
-
-#: admin/systems/class_workstationGeneric.inc:196
-msgid "Inherit time server attributes from ogroup"
-msgstr "Erben von Zeitserverattributen von ogroup"
-
-#: admin/systems/class_workstationGeneric.inc:202
-msgid "NTP servers"
-msgstr "NTP Server"
+#: admin/systems/class_workstationGeneric.inc:73
+#: admin/systems/class_printGeneric.inc:83
+#: admin/systems/class_componentGeneric.inc:69
+#: admin/systems/class_mobilePhoneGeneric.inc:102
+#: admin/systems/class_networkSettings.inc:1008
+msgid "Network settings"
+msgstr "Netzwerkeinstellungen"
 
-#: admin/systems/class_workstationGeneric.inc:203
-#, php-format
-msgid "The NTP servers for the %s"
-msgstr "Die NTP Server fÃ¼r die %s"
+#: admin/systems/class_workstationGeneric.inc:78
+#: admin/systems/class_printGeneric.inc:87
+#: admin/systems/class_componentGeneric.inc:73
+#: admin/systems/class_mobilePhoneGeneric.inc:106
+#: admin/systems/class_networkSettings.inc:630
+#: admin/systems/class_networkSettings.inc:643
+#: admin/systems/class_networkSettings.inc:645
+#: admin/systems/class_networkSettings.inc:1014
+msgid "IP address"
+msgstr "IP-Adresse"
 
-#: admin/systems/class_workstationGeneric.inc:209
-msgid "Inherit LDAP servers"
-msgstr "Erben von LDAP-Servern"
+#: admin/systems/class_workstationGeneric.inc:78
+msgid "IP addresses this system uses (v4 or v6)"
+msgstr ""
 
-#: admin/systems/class_workstationGeneric.inc:210
-msgid "Inherit LDAP server attributes from ogroup"
-msgstr "Erben von LDAP Serverattributen von ogroup"
+#: admin/systems/class_workstationGeneric.inc:83
+#: admin/systems/class_printGeneric.inc:91
+#: admin/systems/class_componentGeneric.inc:77
+#: admin/systems/class_mobilePhoneGeneric.inc:110
+msgid "Mac address"
+msgstr "MAC-Adresse"
 
-#: admin/systems/class_workstationGeneric.inc:216
-msgid "LDAP servers"
-msgstr "LDAP Server"
+#: admin/systems/class_workstationGeneric.inc:83
+#: admin/systems/class_printGeneric.inc:91
+#: admin/systems/class_componentGeneric.inc:77
+#: admin/systems/class_mobilePhoneGeneric.inc:110
+msgid "Mac address of this system"
+msgstr "MAC-Adresse von diesem System"
 
-#: admin/systems/class_workstationGeneric.inc:217
-#, php-format
-msgid "The LDAP servers for the %s"
-msgstr "Die LDAP-Server fÃ¼r die %s"
-
-#: admin/systems/class_workstationGeneric.inc:225
-#: admin/systems/class_workstationGeneric.inc:229
-#: admin/ogroups/goto/termgroup.tpl.c:41
-msgid "Action"
-msgstr "Aktion"
-
-#: admin/systems/class_workstationGeneric.inc:230
-#: admin/ogroups/goto/termgroup.tpl.c:44
-msgid "Select action to execute for this terminal"
-msgstr "WÃ¤hlen Sie die auszufÃ¼hrende Aktion fÃ¼r dieses Terminal"
-
-#: admin/systems/class_workstationGeneric.inc:236
-#: admin/systems/class_componentGeneric.inc:75
-#: admin/systems/class_mobilePhoneGeneric.inc:106
-#: admin/systems/class_networkSettings.inc:1016
-msgid "Network settings"
-msgstr "Netzwerkeinstellungen"
+#: admin/systems/class_workstationGeneric.inc:125
+#: admin/systems/class_workstationGeneric.inc:130
+#: admin/systems/class_workstationGeneric.inc:131
+msgid "Workstation"
+msgstr "Arbeitsstation"
 
-#: admin/systems/class_workstationGeneric.inc:459
+#: admin/systems/class_workstationGeneric.inc:126
 msgid "Workstation information"
 msgstr ""
 
-#: admin/systems/class_printGeneric.inc:131
-#: admin/systems/class_printGeneric.inc:1065
-#: admin/systems/class_systemManagement.inc:678
-msgid "Internal error"
-msgstr "Interner Fehler"
-
-#: admin/systems/class_printGeneric.inc:131
-#, php-format
-msgid ""
-"Cannot determine a valid department for this object. Setting base to '%s'!"
-msgstr "Kann keine gÃ¼ltige Abteilung fÃ¼r dieses Objekt ermitteln, setze Basis auf '%s'."
-
-#: admin/systems/class_printGeneric.inc:311
-#: admin/systems/class_printGeneric.inc:319
-#: admin/systems/class_printGeneric.inc:324
-#: admin/systems/class_printGeneric.inc:374
-#: admin/systems/class_printGeneric.inc:390
-#: admin/systems/class_printGeneric.inc:393
-msgid "Add printer extension"
-msgstr "Drucker-Erweiterung hinzufÃ¼gen"
-
-#: admin/systems/class_printGeneric.inc:312
-msgid ""
-"Could not initialize printer tab, parameter parent was missing while "
-"construction."
-msgstr "Konnte den 'Druck'-Reiter nicht initialisieren, der Parameter 'parent' fehlte wÃ¤hrend der Erstellung."
-
-#: admin/systems/class_printGeneric.inc:320
-msgid "This is a workstation template, printer tab is disabled."
-msgstr "Dies ist eine Arbeitsstations-Vorlage, der Drucker-Tab ist deaktiviert."
-
-#: admin/systems/class_printGeneric.inc:325
-msgid "This is a terminal template, printer tab is disabled."
-msgstr "Dies ist eine Terminal-Vorlage, das Drucker-Tab ist deaktiviert."
-
-#: admin/systems/class_printGeneric.inc:367
-#: admin/systems/class_printGeneric.inc:375
-#: admin/systems/class_printGeneric.inc:383
-#: admin/systems/class_printGeneric.inc:386
-#: admin/systems/class_printGeneric.inc:391
-#: admin/systems/class_printGeneric.inc:394
-msgid "printer"
+#: admin/systems/class_printGeneric.inc:32
+#: admin/systems/class_printGeneric.inc:37
+#: admin/systems/class_printGeneric.inc:38
+msgid "Printer"
 msgstr "Drucker"
 
-#: admin/systems/class_printGeneric.inc:375
-msgid ""
-"You can't enable it while 'cn' is not present in entry. Possibly you are "
-"currently creating a new terminal template."
-msgstr "Sie kÃ¶nnen es nicht aktivieren, solange das 'cn'-Attribut nicht im Eintrag enthalten ist. Wahrscheinlich erstellen Sie gerade eine neue Terminal-Vorlage."
-
-#: admin/systems/class_printGeneric.inc:382
-#: admin/systems/class_printGeneric.inc:385
-msgid "Remove printer extension"
-msgstr "Drucker-Erweiterung entfernen"
-
-#: admin/systems/class_printGeneric.inc:474
-#: admin/systems/class_printGeneric.inc:652
-#: admin/systems/class_printGeneric.inc:659
-#: admin/systems/class_printGeneric.inc:718
-#: admin/systems/class_printGeneric.inc:1105
-#: admin/systems/class_printGeneric.inc:1116
-#: admin/systems/class_serverService.inc:224
-#: admin/systems/class_serverService.inc:270
-#: admin/systems/class_serverService.inc:393
-#: admin/systems/class_systemManagement.inc:341
-#: admin/systems/class_systemManagement.inc:624
-#: admin/systems/class_systemManagement.inc:639
-#: admin/systems/services/shares/class_serviceShare.inc:103
-#: admin/systems/class_networkSettings.inc:305
-#: admin/systems/class_networkSettings.inc:336
-#: admin/systems/class_networkSettings.inc:584
-#: admin/systems/class_networkSettings.inc:591
-#: admin/systems/class_networkSettings.inc:597
-#: admin/systems/class_networkSettings.inc:604
-msgid "Error"
-msgstr "Fehler"
-
-#: admin/systems/class_printGeneric.inc:577
-#, php-format
-msgid "Your currently selected PPD file '%s' doesn't exist."
-msgstr "Die momentan gewÃ¤hlte PPD-Datei '%s' wurde nicht gefunden."
-
-#: admin/systems/class_printGeneric.inc:583
-msgid "Not defined"
-msgstr "Nicht definiert"
-
-#: admin/systems/class_printGeneric.inc:587
-#: admin/systems/ppd/class_printerPPDDialog.inc:116
-msgid "Can't get ppd informations."
-msgstr "Kann PPD-Information nicht lesen"
-
-#: admin/systems/class_printGeneric.inc:602
-#: admin/systems/class_printGeneric.inc:604
-#, php-format
-msgid "This printer belongs to %s. You can't rename this printer."
-msgstr "Dieser Drucker gehÃ¶rt zu %s. Sie kÃ¶nnen ihn nicht umbenennen."
-
-#: admin/systems/class_printGeneric.inc:602
-#: admin/systems/class_terminalGeneric.inc:34
-msgid "terminal"
-msgstr "Terminal"
-
-#: admin/systems/class_printGeneric.inc:652
-#: admin/systems/class_printGeneric.inc:659
-msgid "Object is no printer!"
-msgstr "Das Objekt ist kein Drucker!"
-
-#: admin/systems/class_printGeneric.inc:767 admin/systems/printer.tpl.c:23
-msgid "Printer URL"
-msgstr "Drucker URL"
-
-#: admin/systems/class_printGeneric.inc:989
-#: admin/systems/class_printGeneric.inc:991
-msgid "Group"
-msgstr "Gruppe"
-
-#: admin/systems/class_printGeneric.inc:994
-msgid "User"
-msgstr "Benutzer"
-
-#: admin/systems/class_printGeneric.inc:1006
+#: admin/systems/class_printGeneric.inc:33
 msgid "Printer information"
 msgstr "Druckerinformation"
 
-#: admin/systems/class_printGeneric.inc:1023
-#: admin/systems/serverService-list.tpl.c:2
-#: admin/systems/phoneSelect/phoneSelect-list.tpl.c:2
-#: admin/systems/printer.tpl.c:11
-msgid "Base"
-msgstr "Basis"
-
-#: admin/systems/class_printGeneric.inc:1026
-msgid "LabeledURL"
-msgstr "Benannte URL"
-
-#: admin/systems/class_printGeneric.inc:1027
-msgid "Printer PPD"
-msgstr "Drucker-PPD"
-
-#: admin/systems/class_printGeneric.inc:1028 admin/systems/printer.tpl.c:38
-msgid "Permissions"
-msgstr "Berechtigungen"
+#: admin/systems/class_printGeneric.inc:60
+msgid "The name of the printer"
+msgstr "Der Name des Druckers"
 
-#: admin/systems/class_printGeneric.inc:1030
-msgid "Windows inf file"
-msgstr "Windows inf Datei"
+#: admin/systems/class_printGeneric.inc:64
+msgid "A short description of the printer"
+msgstr "Eine kurze Beschreibung des Druckers"
 
-#: admin/systems/class_printGeneric.inc:1031
-msgid "Windows driver dir"
-msgstr "Windows Treiber Verz"
-
-#: admin/systems/class_printGeneric.inc:1032 admin/systems/printer.tpl.c:62
-msgid "Driver printer name"
-msgstr "Treiber Druckername"
+#: admin/systems/class_printGeneric.inc:70
+msgid "Details"
+msgstr "Details"
 
-#: admin/systems/class_printGeneric.inc:1048
-#: admin/systems/class_printGeneric.inc:1070
-msgid "Permission error"
-msgstr "Berechtigungsfehler"
+#: admin/systems/class_printGeneric.inc:73
+msgid "Printer location"
+msgstr "Drucker-Standort"
 
-#: admin/systems/class_printGeneric.inc:1048
-#: admin/systems/class_printGeneric.inc:1070
-msgid "printer user"
-msgstr "Druckerbenutzer"
+#: admin/systems/class_printGeneric.inc:73
+msgid "The location of the printer"
+msgstr "Der Standort des Druckers"
 
-#: admin/systems/class_printGeneric.inc:1065
-#, php-format
-msgid "Illegal member type '%s'!"
-msgstr "UngÃ¼ltiger Mitgliedstyp '%s'!"
+#: admin/systems/class_printGeneric.inc:77
+msgid "Printer URL"
+msgstr "Drucker-URL"
 
-#: admin/systems/class_printGeneric.inc:1105
-#, php-format
-msgid "'%s' is already used!"
-msgstr "'%s' wird bereits verwendet!"
+#: admin/systems/class_printGeneric.inc:77
+msgid "The URL of the printer"
+msgstr "Die URL des Druckers"
 
-#: admin/systems/class_printGeneric.inc:1116
-#, php-format
-msgid "'%s' does not exist!"
-msgstr "'%s' existiert nicht!"
+#: admin/systems/class_printGeneric.inc:87
+#: admin/systems/class_componentGeneric.inc:73
+#: admin/systems/class_mobilePhoneGeneric.inc:106
+msgid "IP address this system uses"
+msgstr ""
 
 #: admin/systems/class_serverService.inc:58
 msgid "Server services"
 msgstr "Serverdienste"
 
+#: admin/systems/class_serverService.inc:224
+#: admin/systems/class_serverService.inc:270
+#: admin/systems/class_serverService.inc:393
+#: admin/systems/services/shares/class_serviceShare.inc:103
+#: admin/systems/class_networkSettings.inc:297
+#: admin/systems/class_networkSettings.inc:328
+#: admin/systems/class_networkSettings.inc:576
+#: admin/systems/class_networkSettings.inc:583
+#: admin/systems/class_networkSettings.inc:589
+#: admin/systems/class_networkSettings.inc:596
+msgid "Error"
+msgstr "Fehler"
+
 #: admin/systems/class_serverService.inc:332
 msgid "Filter error"
-msgstr "Filter Fehler"
+msgstr "Filterfehler"
 
 #: admin/systems/class_serverService.inc:332
 msgid "The filter is incomplete!"
@@ -704,324 +430,174 @@ msgstr "Information"
 
 #: admin/systems/class_serverService.inc:387
 msgid "Cannot update service status until it has been saved!"
-msgstr "Kann den Dienst-Status nicht setzen bis der Server gespeichert wurde."
+msgstr "Kann den Dienststatus nicht aktualisieren bis er gespeichert wurde!"
 
 #: admin/systems/class_serverService.inc:415
 #: admin/systems/class_serverService.inc:424
 #: admin/systems/class_serverService.inc:435
 #, php-format
 msgid "Could not get execute action %s on service %s."
-msgstr "Konnte nicht ausfÃ¼hr Aktion %s auf Dienst %s bekommen."
+msgstr "Konnte ausfÃ¼hrbare Aktion %s auf Dienst %s nicht bekommen."
 
-#: admin/systems/class_terminalGeneric.inc:42
-#, 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:31
+msgid "terminal"
+msgstr "Terminal"
 
+#: admin/systems/class_terminalGeneric.inc:43
 #: admin/systems/class_terminalGeneric.inc:48
-#, 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:54
-msgid "Remote desktop"
-msgstr "Entfernte ArbeitsflÃ¤che"
-
-#: admin/systems/class_terminalGeneric.inc:58
-msgid "Connect method"
-msgstr "Verbindungsmethode"
-
-#: admin/systems/class_terminalGeneric.inc:62
-msgid "XDMCP"
-msgstr "XDMCP"
-
-#: admin/systems/class_terminalGeneric.inc:62
-msgid "LDM"
-msgstr "LDM"
-
-#: admin/systems/class_terminalGeneric.inc:62
-msgid "Shell"
-msgstr "Shell"
-
-#: admin/systems/class_terminalGeneric.inc:62
-msgid "Telnet"
-msgstr "Telnet"
-
-#: admin/systems/class_terminalGeneric.inc:62
-msgid "Windows RDP"
-msgstr "Windows RDP"
-
-#: admin/systems/class_terminalGeneric.inc:66
-msgid "Terminal server"
-msgstr "Terminal-Server"
+#: admin/systems/class_terminalGeneric.inc:49
+msgid "Terminal"
+msgstr "Terminal"
 
-#: admin/systems/class_terminalGeneric.inc:82
+#: admin/systems/class_terminalGeneric.inc:44
 msgid "Terminal information"
 msgstr "Terminalinformation"
 
-#: admin/systems/ppd/class_printerPPDSelectionDialog.inc:91
-#: admin/systems/ppd/class_printerPPDSelectionDialog.inc:116
-#: admin/systems/ppd/class_printerPPDSelectionDialog.inc:139
-#: admin/systems/ppd/class_printerPPDDialog.inc:92
-#: admin/systems/ppd/class_printerPPDDialog.inc:160
-#: admin/systems/ppd/class_printerPPDDialog.inc:241
-#: admin/systems/ppd/class_printerPPDDialog.inc:256
-#: admin/systems/ppd/class_printerPPDDialog.inc:269
-#: admin/systems/ppd/class_printerPPDDialog.inc:297
-#: admin/systems/ppd/class_printerPPDDialog.inc:314
-#: admin/systems/ppd/class_printerPPDDialog.inc:337
-#: admin/systems/ppd/class_printerPPDDialog.inc:351
-#: admin/systems/ppd/class_printerPPDDialog.inc:361
-#: admin/systems/ppd/class_printerPPDDialog.inc:365
-#: admin/systems/ppd/class_printerPPDDialog.inc:560
-#: admin/systems/ppd/class_printerPPDDialog.inc:577
-#: admin/systems/ppd/class_printerPPDDialog.inc:580
-#: admin/systems/ppd/class_printerPPDDialog.inc:583
-msgid "PPD error"
-msgstr "PPD-Fehler"
-
-#: admin/systems/ppd/class_printerPPDSelectionDialog.inc:139
-#, php-format
-msgid "Cannot locate vendor '%s' in available PPDs!"
-msgstr "Kann Hersteller '%s' nicht in den verfÃ¼gbaren PPDs finden!"
-
-#: admin/systems/ppd/class_printerPPDSelectionDialog.inc:148
-msgid "Printer ppd selection."
-msgstr "Auswahl der Drucker-PPD"
-
-#: admin/systems/ppd/class_printerPPDSelectionDialog.inc:155
-msgid "delete"
-msgstr "Entfernen"
-
-#: admin/systems/ppd/class_printerPPDSelectionDialog.inc:166
-msgid "back"
-msgstr "zurÃ¼ck"
-
-#: admin/systems/ppd/class_printerPPDDialog.inc:74
-#: admin/systems/ppd/class_printerPPDDialog.inc:140
-#: admin/systems/services/class_goService.inc:241
-msgid "Configuration error"
-msgstr "Konfigurationsfehler"
-
-#: admin/systems/ppd/class_printerPPDDialog.inc:92
-#, php-format
-msgid "Cannot open PPD '%s'!"
-msgstr "Kann PPD '%s' nicht Ã¶ffnen!"
-
-#: admin/systems/ppd/class_printerPPDDialog.inc:141
-#, php-format
-msgid "Cannot open PPD path '%s' for reading and writing!"
-msgstr "Kann PPD-Pfad '%s' nicht zum Lesen und Schreiben Ã¶ffnen!"
-
-#: admin/systems/ppd/class_printerPPDDialog.inc:160
-#: admin/systems/ppd/class_printerPPDDialog.inc:365
-msgid "file is empty"
-msgstr "Die Datei ist leer"
-
-#: admin/systems/ppd/class_printerPPDDialog.inc:314
-#, php-format
-msgid "Cannot parse PPD '%s'!"
-msgstr "Kann PPD '%s' nicht einlesen!"
-
-#: admin/systems/ppd/class_printerPPDDialog.inc:340
-msgid "Overwrite existing PPD"
-msgstr "Existierende PPD Ã¼berschreiben"
-
-#: admin/systems/ppd/class_printerPPDDialog.inc:341
-msgid ""
-"There is already a ppd file for this kind of printer. Do you want to "
-"overwrite it?"
-msgstr "Der von Ihnen gewÃ¤hlte Drucker-Typ verfÃ¼gt bereits Ã¼ber eine PPD-Datei. MÃ¶chten Sie diese Ã¼berschreiben?"
-
-#: admin/systems/ppd/class_printerPPDDialog.inc:491
-msgid "Section"
-msgstr "Section"
-
-#: admin/systems/ppd/class_printerPPDDialog.inc:551
-#: admin/systems/ppd/class_printerPPDDialog.inc:554
-msgid "True"
-msgstr "wahr"
-
-#: admin/systems/ppd/class_printerPPDDialog.inc:552
-#: admin/systems/ppd/class_printerPPDDialog.inc:555
-msgid "False"
-msgstr "falsch"
-
-#: admin/systems/ppd/class_printerPPDDialog.inc:560
-#, php-format
-msgid "PPD type '%s' is not supported!"
-msgstr "PPD-Typ '%s' wird nicht unterstÃ¼tzt!"
-
-#: admin/systems/ppd/class_printerPPDDialog.inc:597
-msgid ""
-"Please select a valid ppd file or use 'Cancel' to go back to printer "
-"configuration."
-msgstr "Bitte wÃ¤hlen Sie eine gÃ¼ltige PPD-Datei oder drÃ¼cken Sie 'Abbrechen', um zurÃ¼ck zur Drucker-Konfiguration zu gelangen."
-
-#: admin/systems/ppd/class_ppdManager.inc:44
-#: admin/systems/ppd/class_ppdManager.inc:188
-#: admin/systems/ppd/class_ppdManager.inc:190
-msgid "PPD manager error"
-msgstr "PPD-Manager-Fehler"
-
-#: admin/systems/ppd/class_ppdManager.inc:44
-#, php-format
-msgid "The specified path '%s' does not exist."
-msgstr "Der angegebene Pfad '%s' existiert nicht."
-
-#: admin/systems/ppd/class_ppdManager.inc:188
-#, php-format
-msgid "Specified PPD file '%s' cannot be opened for reading."
-msgstr "Die PPD-Datei '%s' konnte nicht zum Lesen geÃ¶ffnet werden."
-
-#: admin/systems/ppd/class_ppdManager.inc:190
-#, php-format
-msgid "The temporary file '%s' cannot be opened for writing."
-msgstr "Die temporÃ¤re Datei '%s' kann nicht zum Schreiben geÃ¶ffnet werden."
-
-#: admin/systems/ppd/class_ppdManager.inc:212
-#: admin/systems/ppd/class_ppdManager.inc:350
-msgid "Parsing PPD file failed - file is empty!"
-msgstr "Das Verarbeiten der PPD-Datei ist fehlgeschlagen - die Datei ist leer!"
-
-#: admin/systems/ppd/class_ppdManager.inc:222
-#, php-format
-msgid ""
-"Parsing PPD file %s failed - line too long. Trailing characters have been "
-"ignored!"
-msgstr "Das Verarbeiten der PPD-Datei '%s' ist fehlgeschlagen - Zeile zu lang. Nachfolgende Zeichen wurden ausgelassen!"
-
-#: admin/systems/ppd/class_ppdManager.inc:230
-msgid "Nested groups are not supported!"
-msgstr "Verschachtelte Gruppen werden nicht unterstÃ¼tzt!"
-
-#: admin/systems/ppd/class_ppdManager.inc:234
-msgid "Group name not unique!"
-msgstr "Der Gruppenname ist nicht eindeutig!"
-
-#: admin/systems/ppd/class_ppdManager.inc:240
-#: admin/systems/ppd/class_ppdManager.inc:270
-msgid "Symbol values are not supported yet!"
-msgstr "Symbolische Werte werden noch nicht unterstÃ¼tzt!"
-
-#: admin/systems/ppd/class_ppdManager.inc:264
-msgid "Nested options are not supported!"
-msgstr "Verschachtelte Werte werden noch nicht unterstÃ¼tzt."
-
-#: admin/systems/ppd/class_ppdManager.inc:289
-msgid "PickMany is not supported yet!"
-msgstr "Die Option PickMany wird noch nicht unterstÃ¼tzt!"
-
-#: admin/systems/ppd/class_ppdManager.inc:370
-#, php-format
-msgid ""
-"Parsing PPD file %s failed - line too long. Trailing characters have been "
-"ignored"
-msgstr "Das Verarbeiten der PPD-Datei '%s' ist fehlgeschlagen - Zeile zu lang. Nachfolgende Zeichen wurden ausgelassen."
-
-#: admin/systems/ppd/class_ppdManager.inc:395
-#, php-format
-msgid "Parsing PPD file %s failed - no information found."
-msgstr "Das Verarbeiten der PPD-Datei '%s' ist fehlgeschlagen - keine Information gefunden."
-
 #: admin/systems/class_systemImport.inc:72
 #, php-format
 msgid "Could not parse %s"
-msgstr "Kann %s nicht parsen"
+msgstr "Konnte %s nicht parsen"
 
 #: 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"
+msgstr "Kein DHCP-Server fÃ¼r IP %s gefunden"
 
 #: admin/systems/class_systemImport.inc:130
 #, php-format
 msgid "No DNS server found for zone %s"
-msgstr "Kein DNS Server fÃ¼r Zone %s gefunden"
+msgstr "Kein DNS-Server fÃ¼r Zone %s gefunden"
 
 #: admin/systems/class_systemImport.inc:165
 msgid "Import"
 msgstr "Importieren"
 
+#: admin/systems/class_systemImport.inc:169
+#: admin/systems/class_serverGeneric.inc:43
+#: admin/systems/class_serverGeneric.inc:48
+#: admin/systems/class_serverGeneric.inc:49
+msgid "Server"
+msgstr "Server"
+
 #: admin/systems/class_systemImport.inc:169
 msgid "The server you wish to import hosts from"
 msgstr ""
 
-#: admin/systems/class_serverGeneric.inc:34
+#: admin/systems/class_serverGeneric.inc:31
 msgid "server"
 msgstr "Server"
 
-#: admin/systems/class_serverGeneric.inc:47
+#: admin/systems/class_serverGeneric.inc:44
 msgid "Server information"
 msgstr "Serverinformation"
 
-#: admin/systems/class_componentGeneric.inc:37
+#: admin/systems/class_componentGeneric.inc:31
+msgid "Component"
+msgstr "Komponente"
+
+#: admin/systems/class_componentGeneric.inc:32
 msgid "Component information"
 msgstr "Komponenteninformation"
 
-#: admin/systems/class_componentGeneric.inc:64
+#: admin/systems/class_componentGeneric.inc:36
+#: admin/systems/class_componentGeneric.inc:37
+msgid "Network device"
+msgstr "NetzwerkgerÃ¤t"
+
+#: admin/systems/class_componentGeneric.inc:58
 msgid "The name of the component"
 msgstr "Der Name der Komponente"
 
-#: admin/systems/class_componentGeneric.inc:68
+#: admin/systems/class_componentGeneric.inc:62
 msgid "A short description of the component"
 msgstr "Eine kurze Beschreibung der Komponente"
 
+#: admin/systems/class_systemServers.inc:31
+#: admin/systems/class_systemServers.inc:53
+msgid "Servers"
+msgstr "Server"
+
+#: admin/systems/class_systemServers.inc:35
+msgid "The syslog server the system should be using"
+msgstr ""
+
+#: admin/systems/class_systemServers.inc:40
+msgid "NTP servers"
+msgstr "NTP-Server"
+
+#: admin/systems/class_systemServers.inc:40
+msgid "The NTP servers for this system"
+msgstr "Der NTP-Server fÃ¼r dieses System"
+
+#: admin/systems/class_systemServers.inc:54
+msgid "Servers this system is using"
+msgstr ""
+
+#: admin/systems/class_mobilePhoneGeneric.inc:32
 #: admin/systems/class_mobilePhoneGeneric.inc:37
+#: admin/systems/class_mobilePhoneGeneric.inc:38
+msgid "Mobile phone"
+msgstr "Mobiltelefon"
+
+#: admin/systems/class_mobilePhoneGeneric.inc:33
 msgid "Mobile phone information"
 msgstr ""
 
-#: admin/systems/class_mobilePhoneGeneric.inc:63
+#: admin/systems/class_mobilePhoneGeneric.inc:60
 msgid "The name of the mobile phone"
 msgstr "Der Name des Mobiltelefons"
 
-#: admin/systems/class_mobilePhoneGeneric.inc:67
+#: admin/systems/class_mobilePhoneGeneric.inc:64
 msgid "A short description of the mobile phone"
 msgstr "Eine kurze Beschreibung des Mobiltelefons"
 
-#: admin/systems/class_mobilePhoneGeneric.inc:77
+#: admin/systems/class_mobilePhoneGeneric.inc:70
+msgid "Phone"
+msgstr "Telefon"
+
+#: admin/systems/class_mobilePhoneGeneric.inc:73
 msgid "Serial Number"
 msgstr "Seriennummer"
 
-#: admin/systems/class_mobilePhoneGeneric.inc:77
+#: admin/systems/class_mobilePhoneGeneric.inc:73
 msgid "The serial number of the mobile phone"
 msgstr "Die Seriennummer des Mobiltelefons"
 
-#: admin/systems/class_mobilePhoneGeneric.inc:81
+#: admin/systems/class_mobilePhoneGeneric.inc:77
 msgid "IMEI Number"
-msgstr "IMEI Nummer"
+msgstr "IMEI-Nummer"
 
-#: admin/systems/class_mobilePhoneGeneric.inc:81
+#: admin/systems/class_mobilePhoneGeneric.inc:77
 msgid "The IMEI number of the mobile phone"
-msgstr "Die IMEI Nummer des Mobiltelefons"
+msgstr "Die IMEI-Nummer des Mobiltelefons"
 
-#: admin/systems/class_mobilePhoneGeneric.inc:86
+#: admin/systems/class_mobilePhoneGeneric.inc:82
 msgid "OS"
-msgstr "OS"
+msgstr "BS"
 
-#: admin/systems/class_mobilePhoneGeneric.inc:86
+#: admin/systems/class_mobilePhoneGeneric.inc:82
 msgid "The Operating System installed on this phone"
-msgstr "Das Betriebssystem,welches auf diesem Telefon installiert ist"
+msgstr "Das Betriebssystem, welches auf diesem Telefon installiert ist"
 
-#: admin/systems/class_mobilePhoneGeneric.inc:92
+#: admin/systems/class_mobilePhoneGeneric.inc:88
 msgid "SimCard"
-msgstr "SimCard"
+msgstr "SIM-Karte"
 
-#: admin/systems/class_mobilePhoneGeneric.inc:95
+#: admin/systems/class_mobilePhoneGeneric.inc:91
 msgid "Telephone Number"
 msgstr "Telefonnummer"
 
-#: admin/systems/class_mobilePhoneGeneric.inc:95
+#: admin/systems/class_mobilePhoneGeneric.inc:91
 msgid "The telephone number of the mobile phone"
 msgstr "Die Telefonnumer des Mobiltelefons"
 
-#: admin/systems/class_mobilePhoneGeneric.inc:99
+#: admin/systems/class_mobilePhoneGeneric.inc:95
 msgid "PUK Number"
-msgstr "PUK Nummer"
+msgstr "PUK-Nummer"
 
-#: admin/systems/class_mobilePhoneGeneric.inc:99
+#: admin/systems/class_mobilePhoneGeneric.inc:95
 msgid "The PUK number of the simcard in this mobile phone"
-msgstr "Die PUK Nummer der SIM-Karte in diesem Mobiltelefon"
+msgstr "Die PUK-Nummer der SIM-Karte in diesem Mobiltelefon"
 
 #: admin/systems/serverService-list.xml:10
 msgid "List of services"
@@ -1062,75 +638,25 @@ msgstr "Dienst bearbeiten"
 msgid "Remove service"
 msgstr "Dienst entfernen"
 
-#: admin/systems/phoneSelect/phoneSelect-list.xml:10
-msgid "Please select the desired entries"
-msgstr "Bitte wÃ¤hlen Sie die gewÃ¼nschten EintrÃ¤ge"
-
-#: admin/systems/phoneSelect/phoneSelect-list.xml:56
-msgid "Number"
-msgstr "Nummer"
-
-#: admin/systems/phoneSelect/phoneSelect-list.xml:83
-msgid "Select this number"
-msgstr "WÃ¤hlen Sie diese Anzahl"
-
-#: admin/systems/class_systemManagement.inc:177
-msgid "Back"
-msgstr "ZurÃ¼ck"
-
-#: admin/systems/class_systemManagement.inc:223
-msgid "Creating the image failed. Please see the report below."
-msgstr "Erstellen des Abbilds fehlgeschlagen. Bitte Ã¼berprÃ¼fen Sie den Fehlerbericht unterhalb."
-
-#: admin/systems/class_systemManagement.inc:228
-#, php-format
-msgid "Command '%s', specified for ISO creation doesn't seem to exist."
-msgstr "Das Kommando '%s', angegeben fÃ¼r die ISO-Erstellung, scheint nicht zu existieren."
-
-#: admin/systems/class_systemManagement.inc:398
-#: admin/systems/class_systemManagement.inc:473
-#: admin/systems/class_systemManagement.inc:858
-#: admin/systems/class_systemManagement.inc:905
-#: admin/systems/class_systemManagement.inc:926
-msgid "Permission"
-msgstr "Berechtigung"
-
-#: admin/systems/class_systemManagement.inc:678
-msgid "Cannot set mode to 'active'!"
-msgstr "Kann Modus nicht auf 'aktiv' setzen!"
-
-#: admin/systems/class_systemManagement.inc:858
-#, php-format
-msgid "You are not allowed to create a snapshot for %s."
-msgstr "Ihnen ist es nicht erlaubt, einen Snapshot fÃ¼r %s zu erstellen."
-
-#: admin/systems/class_systemManagement.inc:905
-#: admin/systems/class_systemManagement.inc:926
-#, php-format
-msgid "You are not allowed to restore a snapshot for %s."
-msgstr "Ihnen ist es nicht erlaubt, einen Snapshot fÃ¼r %s wiederherzustellen."
-
-#: admin/systems/class_systemManagement.inc:1169
-#, php-format
-msgid "Inherited from %s"
-msgstr "Geerbt von %s"
-
-#: admin/systems/class_systemManagement.inc:1224
-#: admin/systems/class_systemManagement.inc:1228
-#: addons/dashboard/class_dashBoardSystems.inc:199
+#: admin/systems/class_systemManagement.inc:48
 #: config/systems/class_systemsPluginConfig.inc:28
 msgid "Systems"
 msgstr "Systeme"
 
-#: admin/systems/class_systemManagement.inc:1225
+#: admin/systems/class_systemManagement.inc:49
 msgid "Systems Management"
 msgstr "Systemverwaltung"
 
+#: admin/systems/class_systemManagement.inc:250
+#, php-format
+msgid "Inherited from %s"
+msgstr "Geerbt von %s"
+
 #: admin/systems/services/terminal/class_serviceTerminal.inc:29
 #: admin/systems/services/terminal/class_serviceTerminal.inc:30
 #: admin/systems/services/terminal/class_serviceTerminal.inc:41
 msgid "Terminal service"
-msgstr "Terminal-Dienst"
+msgstr "Terminaldienst"
 
 #: admin/systems/services/terminal/class_serviceTerminal.inc:44
 msgid "Temporary disable login"
@@ -1152,7 +678,7 @@ msgstr ""
 #: admin/systems/services/cups/class_serviceCUPS.inc:64
 #: admin/systems/services/cups/class_serviceCUPS.inc:85
 msgid "Print service"
-msgstr "Druck-Dienst"
+msgstr "Druckdienst"
 
 #: admin/systems/services/cups/class_serviceCUPS.inc:84
 msgid "Cups"
@@ -1163,6 +689,10 @@ msgstr "CUPS"
 msgid "Empty service"
 msgstr "Leerer Dienst"
 
+#: admin/systems/services/class_goService.inc:241
+msgid "Configuration error"
+msgstr "Konfigurationsfehler"
+
 #: admin/systems/services/shares/class_serviceShare.inc:30
 #: admin/systems/services/shares/class_serviceShare.inc:31
 msgid "Share service"
@@ -1194,19 +724,19 @@ msgstr "Typ der Freigabe"
 
 #: admin/systems/services/shares/class_serviceShare.inc:65
 msgid "Codepage"
-msgstr "Codepage"
+msgstr "Codeseite"
 
 #: admin/systems/services/shares/class_serviceShare.inc:65
 msgid "Codepage for this share"
-msgstr "Codepage fÃ¼r diese Freigabe"
+msgstr "Codeseite fÃ¼r diese Freigabe"
 
 #: admin/systems/services/shares/class_serviceShare.inc:69
 msgid "Path / Volume"
-msgstr "Pfad / Volume"
+msgstr "Pfad / Volumen"
 
 #: admin/systems/services/shares/class_serviceShare.inc:69
 msgid "Path or volume concerned by this share"
-msgstr "Pfad oder Volume, die diese Freigabe betrifft"
+msgstr "Pfad oder Volumen, die diese Freigabe betrifft"
 
 #: admin/systems/services/shares/class_serviceShare.inc:73
 msgid "Option"
@@ -1214,30 +744,28 @@ msgstr "Option"
 
 #: admin/systems/services/shares/class_serviceShare.inc:73
 msgid "Special option(s) for this share"
-msgstr "Spezille Option(en) fÃ¼r diese Freigabe"
+msgstr "Spezielle Option(en) fÃ¼r diese Freigabe"
 
 #: admin/systems/services/shares/class_serviceShare.inc:103
 msgid "You need to configure encodings first"
-msgstr "Sie mÃ¼ssen zuerst die Encodings konfigurieren"
+msgstr "Sie mÃ¼ssen zuerst die Kodierungen konfigurieren"
 
 #: admin/systems/services/shares/class_serviceShare.inc:110
-#: admin/ogroups/goto/termgroup.tpl.c:2 admin/systems/remove.tpl.c:2
-#: admin/systems/ppd/remove_ppd.tpl.c:2
 msgid "Warning"
 msgstr "Warnung"
 
 #: admin/systems/services/shares/class_serviceShare.inc:110
 #, php-format
 msgid "Invalid value in encodings : %s"
-msgstr "UngÃ¼ltiger Wert in Encodings : %s"
+msgstr "UngÃ¼ltiger Wert in Kodierungen : %s"
 
 #: admin/systems/services/ntp/class_serviceNTP.inc:29
 msgid "Time service"
-msgstr "Zeit-Dienst"
+msgstr "Zeitdienst"
 
 #: admin/systems/services/ntp/class_serviceNTP.inc:30
 msgid "Time service - NTP"
-msgstr "Zeit-Dienst - NTP"
+msgstr "Zeitdienst - NTP"
 
 #: admin/systems/services/ntp/class_serviceNTP.inc:41
 msgid "Informations"
@@ -1258,11 +786,11 @@ msgstr "LDAP-Dienst"
 
 #: admin/systems/services/ldap/class_serviceLDAP.inc:39
 msgid "LDAP Base"
-msgstr "LDAP Basis"
+msgstr "LDAP-Basis"
 
 #: admin/systems/services/ldap/class_serviceLDAP.inc:39
 msgid "The LDAP base to use for this LDAP server"
-msgstr "Die zu verwendende LDAP Basis fÃ¼r diesen LDAP-Server"
+msgstr "Die zu verwendende LDAP-Basis fÃ¼r diesen LDAP-Server"
 
 #: admin/systems/services/ldap/class_serviceLDAP.inc:44
 msgid "LDAP URI"
@@ -1302,19 +830,19 @@ msgstr "Spezifiziert wie alias-Dereferenzierung bei einer Suche erfolgt "
 
 #: admin/systems/services/ldap/class_serviceLDAP.inc:66
 msgid "TLS Cert"
-msgstr "TLS Cert"
+msgstr "TLS-Zertifikat"
 
 #: admin/systems/services/ldap/class_serviceLDAP.inc:66
 msgid "Filepath to tls certificate"
-msgstr "Dateipfad zum tls-Zertifikat"
+msgstr "Dateipfad zum TLS-Zertifikat"
 
 #: admin/systems/services/ldap/class_serviceLDAP.inc:70
 msgid "TLS Key"
-msgstr "TLS SchlÃ¼ssel"
+msgstr "TLS-SchlÃ¼ssel"
 
 #: admin/systems/services/ldap/class_serviceLDAP.inc:70
 msgid "Filepath to tls key"
-msgstr "Dateipfad zum tls-SchlÃ¼ssel"
+msgstr "Dateipfad zum TLS-SchlÃ¼ssel"
 
 #: admin/systems/services/ldap/class_serviceLDAP.inc:74
 msgid "TLS CaCert"
@@ -1322,7 +850,7 @@ msgstr "TLS CaCert"
 
 #: admin/systems/services/ldap/class_serviceLDAP.inc:74
 msgid "Filepath to tls ca certificate"
-msgstr "Dateipfad zum tls ca Zertifikat"
+msgstr "Dateipfad zum TLS CA-Zertifikat"
 
 #: admin/systems/services/ldap/class_serviceLDAP.inc:78
 msgid "TLS ReqCert"
@@ -1332,7 +860,7 @@ msgstr "TLS ReqCert"
 msgid ""
 "Specifies what checks to perform on server certificates in a TLS session, if"
 " any"
-msgstr "Spezifiziert welche Checks auf Serverzertfikaten in einer TLS-Sitzung, wenn vorhanden, gemacht werden sollen"
+msgstr "Spezifiziert, welche ÃœberprÃ¼fungen an den Serverzertifikaten in einer TLS-Sitzung, wenn vorhanden, gemacht werden sollen"
 
 #: admin/systems/services/ldap/class_serviceLDAP.inc:83
 msgid "TLS CrlCheck"
@@ -1348,160 +876,100 @@ msgstr "Spezifiziert die Certificate Revocation List (CRL) des CA sollte verwend
 msgid "LDAP"
 msgstr "LDAP"
 
-#: admin/systems/class_networkSettings.inc:305
+#: admin/systems/class_networkSettings.inc:297
 msgid "NOT IMPLEMENTED"
 msgstr "NICHT IMPLEMENTIERT"
 
-#: admin/systems/class_networkSettings.inc:437
+#: admin/systems/class_networkSettings.inc:429
 msgid "Not matching"
 msgstr "Nicht zutreffend"
 
-#: admin/systems/class_networkSettings.inc:584
+#: admin/systems/class_networkSettings.inc:576
 #, php-format
 msgid "Was not able to contact argonaut server: %s"
 msgstr "Es ist nicht mÃ¶glich gewesen, argonaut Server: %s zu kontaktieren"
 
-#: admin/systems/class_networkSettings.inc:591
+#: admin/systems/class_networkSettings.inc:583
 #, php-format
 msgid "Was not able to find DNS server for zone %s"
 msgstr "War nicht in der Lage, DNS Server fÃ¼r Zone %s zu finden"
 
-#: admin/systems/class_networkSettings.inc:597
+#: admin/systems/class_networkSettings.inc:589
 #, php-format
 msgid "Was not able to find mac address of DNS server %s"
 msgstr "War nicht in der Lage, mac-Adresse von DNS Server %s zu finden"
 
-#: admin/systems/class_networkSettings.inc:604
+#: admin/systems/class_networkSettings.inc:596
 #, php-format
 msgid "Was not able to launch ldap2zone: %s"
 msgstr "Es ist nicht mÃ¶glich gewesen ldap2zone: %s zu starten"
 
-#: admin/systems/class_networkSettings.inc:630
+#: admin/systems/class_networkSettings.inc:622
 #, php-format
 msgid "IP address %s"
 msgstr "IP-Adresse %s"
 
-#: admin/systems/class_networkSettings.inc:638
-#: admin/systems/class_networkSettings.inc:651
-#: admin/systems/class_networkSettings.inc:653
-#: admin/systems/class_networkSettings.inc:1022
-msgid "IP address"
-msgstr "IP-Adresse"
-
-#: admin/systems/class_networkSettings.inc:644
-#: admin/systems/class_networkSettings.inc:660
-#: admin/systems/class_networkSettings.inc:662
-#: admin/systems/class_networkSettings.inc:1023
+#: admin/systems/class_networkSettings.inc:636
+#: admin/systems/class_networkSettings.inc:652
+#: admin/systems/class_networkSettings.inc:654
+#: admin/systems/class_networkSettings.inc:1015
 msgid "MAC address"
 msgstr "MAC-Adresse"
 
-#: admin/systems/class_networkSettings.inc:676
+#: admin/systems/class_networkSettings.inc:668
 #, php-format
 msgid "The IP address '%s' is not part of the selected reverse zone '%s'!"
 msgstr "Die IP-Adresse '%s' passt nicht in die gewÃ¤hlte Reverse-Zone '%s'!"
 
-#: admin/systems/class_networkSettings.inc:686
+#: admin/systems/class_networkSettings.inc:678
 #, php-format
 msgid "Record type '%s' is duplicated!"
 msgstr "Datensatz-Typ '%s' ist doppelt vorhanden!"
 
-#: admin/systems/class_networkSettings.inc:693
+#: admin/systems/class_networkSettings.inc:685
 #, php-format
 msgid "Uniq record type '%s' is duplicated!"
 msgstr "Eindeutiger Datensatz-Typ '%s' ist doppelt vorhanden!"
 
-#: admin/systems/class_networkSettings.inc:705
+#: admin/systems/class_networkSettings.inc:697
 #, php-format
 msgid ""
 "The IP address '%s' will be added as 'A Record', this will be done "
 "automatically, please remove the record."
 msgstr "Die IP-Adresse '%s' wird automatisch als 'A'-Datensatz eingefÃ¼gt. Bitte entfernen Sie den Eintrag."
 
-#: admin/systems/class_networkSettings.inc:712
+#: admin/systems/class_networkSettings.inc:704
 #, php-format
 msgid "Only lowercase records are allowed, please check your '%ss'."
 msgstr "Es sind nur Kleinbuchstaben in DatensÃ¤tzen erlaubt, bitte prÃ¼fen Sie '%ss'."
 
-#: admin/systems/class_networkSettings.inc:978
+#: admin/systems/class_networkSettings.inc:970
 msgid "Delete"
 msgstr "Entfernen"
 
-#: admin/systems/class_networkSettings.inc:984
+#: admin/systems/class_networkSettings.inc:976
 msgid "Add"
 msgstr "HinzufÃ¼gen"
 
-#: admin/systems/class_networkSettings.inc:1015
-#: addons/dashboard/class_dashBoardNetwork.inc:127
+#: admin/systems/class_networkSettings.inc:1007
 msgid "Network"
 msgstr "Netzwerk"
 
-#: admin/systems/class_networkSettings.inc:1030
+#: admin/systems/class_networkSettings.inc:1022
 msgid "DNS configuration"
 msgstr "DNS-Konfiguration"
 
-#: admin/systems/class_networkSettings.inc:1033
+#: admin/systems/class_networkSettings.inc:1025
 msgid "DHCP configuration"
 msgstr "DHCP-Konfiguration"
 
-#: addons/dashboard/class_dashBoardSystems.inc:45
-msgid "Workstations"
-msgstr "Arbeitsstationen"
-
-#: addons/dashboard/class_dashBoardSystems.inc:51
-msgid "Windows Workstations"
-msgstr "Windows Workstations"
-
-#: addons/dashboard/class_dashBoardSystems.inc:54
-msgid "Terminals"
-msgstr "Terminals"
-
-#: addons/dashboard/class_dashBoardSystems.inc:57
-msgid "Printers"
-msgstr "Drucker"
-
-#: addons/dashboard/class_dashBoardSystems.inc:60
-msgid "Phones"
-msgstr "Telefone"
-
-#: addons/dashboard/class_dashBoardSystems.inc:63
-msgid "Components"
-msgstr "Komponenten"
-
-#: addons/dashboard/class_dashBoardSystems.inc:66
-msgid "Mobile phones"
-msgstr "Mobiltelefone"
-
-#: addons/dashboard/class_dashBoardSystems.inc:183
-msgid "Statistics"
-msgstr "Statistiken"
-
-#: addons/dashboard/class_dashBoardSystems.inc:188
-msgid "Computer name to use by unit"
-msgstr "Computername, der von Einheit genutzt werden soll"
-
-#: addons/dashboard/class_dashBoardSystems.inc:200
-msgid "Statistics and informations about systems"
-msgstr "Statistiken und Informationen Ã¼ber Systeme"
-
-#: addons/dashboard/class_dashBoardNetwork.inc:111
-msgid "DHCP"
-msgstr "DHCP"
-
-#: addons/dashboard/class_dashBoardNetwork.inc:116
-msgid "DNS"
-msgstr "DNS"
-
-#: addons/dashboard/class_dashBoardNetwork.inc:128
-msgid "Statistics and various informations"
-msgstr "Statistiken und verschiedene Informationen"
-
 #: 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"
+msgstr "LDAP-Baum fÃ¼r Systeme"
 
 #: config/systems/class_systemsPluginConfig.inc:43
 msgid "Systems RDN"
@@ -1586,404 +1054,3 @@ msgstr "Der angezeigte Encodingname"
 #: config/systems/class_systemsPluginConfig.inc:101
 msgid "Encodings"
 msgstr "Encodings"
-
-#: admin/ogroups/goto/termgroup.tpl.c:5
-msgid ""
-"Actions you choose here influence all systems in this object group. "
-"Additionally, all values editable here can be inherited by the clients "
-"assigned to this object group."
-msgstr "Aktionen die hier ausgewÃ¤hlt werden beeinflussen alle Systeme dieser Objektgruppe. ZusÃ¤tzlich kÃ¶nnen alle hier einstellbaren Werte von den Systemen ererbt werden."
-
-#: admin/ogroups/goto/termgroup.tpl.c:8
-msgid "Generic"
-msgstr "Allgemein"
-
-#: admin/ogroups/goto/termgroup.tpl.c:11
-msgid "NTP server"
-msgstr "Zeit-Server"
-
-#: admin/ogroups/goto/termgroup.tpl.c:14
-msgid "Choose server to use for synchronizing time"
-msgstr "WÃ¤hlen Sie den Server, der zur Zeit-Synchronisation genutzt werden soll"
-
-#: admin/ogroups/goto/termgroup.tpl.c:20
-msgid "Select terminal mode"
-msgstr "WÃ¤hlen Sie den Terminal-Modus"
-
-#: admin/ogroups/goto/termgroup.tpl.c:26
-msgid "Choose server to use for logging"
-msgstr "WÃ¤hlen Sie den Server, der fÃ¼r das Protokollieren genutzt werden soll"
-
-#: admin/ogroups/goto/termgroup.tpl.c:32
-msgid "Select NFS root filesystem to use"
-msgstr "WÃ¤hlen Sie das NFS-Root-Dateisystem"
-
-#: admin/ogroups/goto/termgroup.tpl.c:38
-msgid "Choose NFS filesystem to place swap files on"
-msgstr "WÃ¤hlen Sie das NFS-Dateisystem, in dem die Auslagerungsdateien abgelegt werden sollen"
-
-#: admin/ogroups/goto/termgroup.tpl.c:47
-msgid "Execute"
-msgstr "AusfÃ¼hren"
-
-#: 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 admin/systems/network.tpl.c:11
-msgid "Propose ip"
-msgstr "Schlage IP vor"
-
-#: admin/systems/network.tpl.c:14
-msgid "MAC-address"
-msgstr "MAC-Adresse"
-
-#: admin/systems/network.tpl.c:17
-msgid "Autodetect"
-msgstr "Automatisch feststellen"
-
-#: admin/systems/network.tpl.c:20 admin/systems/network.tpl.c:23
-msgid "Enable DHCP for this device"
-msgstr "DHCP fÃ¼r dieses GerÃ¤t aktivieren"
-
-#: admin/systems/network.tpl.c:26 admin/systems/network.tpl.c:50
-msgid "not configured"
-msgstr "unkonfiguriert"
-
-#: admin/systems/network.tpl.c:29
-msgid "Parent node"
-msgstr "Parent-Node"
-
-#: admin/systems/network.tpl.c:32
-msgid "Edit settings"
-msgstr "Einstellungen bearbeiten"
-
-#: admin/systems/network.tpl.c:35 admin/systems/network.tpl.c:47
-msgid "Enable DNS for this device"
-msgstr "DNS fÃ¼r dieses GerÃ¤t aktivieren"
-
-#: admin/systems/network.tpl.c:38
-msgid "Zone"
-msgstr "Zone"
-
-#: admin/systems/network.tpl.c:41
-msgid "TTL"
-msgstr "TTL"
-
-#: admin/systems/network.tpl.c:44
-msgid "Dns records"
-msgstr "DNS-EintrÃ¤ge"
-
-#: admin/systems/password.tpl.c:2
-msgid ""
-"To change the terminal root password use the fields below. The changes take "
-"effect during the next reboot. Please memorize the new password, because you"
-" wouldn't be able to log in."
-msgstr "Um das root-Passwort des Terminals zu Ã¤ndern, nutzen Sie die Felder unten. Die Ã„nderungen werden beim nÃ¤chsten Neustart wirksam. Merken Sie sich das Passwort, da eine Anmeldung ohne dieses Passwort nicht mÃ¶glich ist."
-
-#: admin/systems/password.tpl.c:5
-msgid "Leave fields blank for password inheritance from default entries."
-msgstr "Lassen Sie die Felder leer, um das Passwort aus den Standard-EintrÃ¤gen zu Ã¼bernehmen."
-
-#: admin/systems/password.tpl.c:8
-msgid "Changing the password impinges on authentification only."
-msgstr "Das Ã„ndern des Passwortes wirkt sich nur auf die Authentifizierung aus."
-
-#: admin/systems/password.tpl.c:11
-msgid "New password"
-msgstr "Neues Passwort"
-
-#: admin/systems/password.tpl.c:14
-msgid "Repeat new password"
-msgstr "Neues Passwort (Wiederholung)"
-
-#: admin/systems/password.tpl.c:17
-msgid "Password strength"
-msgstr "Passwort-StÃ¤rke"
-
-#: admin/systems/password.tpl.c:20
-msgid "Set password"
-msgstr "Passwort setzen"
-
-#: 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/gencd.tpl.c:2
-msgid "CD-Install-Image generation"
-msgstr "Erstellung der Installations-CD (Abbild)"
-
-#: admin/systems/gencd.tpl.c:5
-msgid ""
-"This option enables you to generate FAI install CD images for the selected "
-"workstation. The procedure may take about 10 minutes to complete, so please "
-"be patient after pressing the 'Create ISO-Image' button."
-msgstr "Diese Option erlaubt es Ihnen, ein Abbild einer FAI-Installations-CD fÃ¼r die gewÃ¤hlte Arbeitsstation zu erstellen. Dieser Vorgang dauert etwa 10 Minuten, haben Sie also Geduld, nachdem Sie den Knopf 'Erstelle ISO-Abbild' gedrÃ¼ckt haben."
-
-#: admin/systems/gencd.tpl.c:8
-msgid "Create ISO-Image"
-msgstr "Erstelle ISO-Abbild"
-
-#: admin/systems/remove.tpl.c:5
-msgid ""
-"This includes all account data, system access rules, imap settings, etc. for"
-" this user. Please double check if your really want to do this since there "
-"is no way for FusionDirectory to get your data back."
-msgstr "Dies beinhaltet alle Kontendaten, Systemzugangsregeln, Imap-Einstellungen etc. fÃ¼r diesen Benutzer. Bitte Ã¼berprÃ¼fen Sie nochmals ob Sie dies tun wollen, da es keinen Weg fÃ¼r FusionDirectory gibt Ihre Daten zurÃ¼ck zu bekommen."
-
-#: admin/systems/remove.tpl.c:8
-msgid "So - if you're sure - press 'Delete' to continue or 'Cancel' to abort."
-msgstr "Wenn Sie sicher sind, drÃ¼cken Sie 'Entfernen' um fortzufahren oder 'Abbrechen' zum Abbruch."
-
-#: admin/systems/system-filter.tpl.c:2
-#: admin/systems/phoneSelect/phoneSelect-filter.tpl.c:2
-msgid "Filter"
-msgstr "Filter"
-
-#: admin/systems/system-filter.tpl.c:5
-msgid "Show servers"
-msgstr "Zeige Server"
-
-#: admin/systems/system-filter.tpl.c:8
-msgid "Show workstations"
-msgstr "Zeige Arbeitsstationen"
-
-#: admin/systems/system-filter.tpl.c:11
-msgid "Show terminals"
-msgstr "Zeige Terminals"
-
-#: admin/systems/system-filter.tpl.c:14
-msgid "Show network printer"
-msgstr "Zeige Netzwerk-Drucker"
-
-#: admin/systems/system-filter.tpl.c:17
-#: admin/systems/phoneSelect/phoneSelect-filter.tpl.c:5
-msgid "Show phones"
-msgstr "Zeige Telefone"
-
-#: admin/systems/system-filter.tpl.c:20
-msgid "Show windows based workstations"
-msgstr "Zeige Windows Arbeitsstationen"
-
-#: admin/systems/system-filter.tpl.c:23
-msgid "Show network devices"
-msgstr "Zeige Netzwerk-GerÃ¤te"
-
-#: admin/systems/system-filter.tpl.c:26
-#: admin/systems/phoneSelect/phoneSelect-filter.tpl.c:8
-msgid "Show mobile phones"
-msgstr "Mobiltelefone anzeigen"
-
-#: admin/systems/system-filter.tpl.c:29
-msgid "Show IPMI interfaces"
-msgstr "IPMI-Schnittstellen anzeigen"
-
-#: admin/systems/ppd/printerPPDSelectionDialog.tpl.c:2
-msgid "Select objects to add"
-msgstr "WÃ¤hlen Sie die hinzuzufÃ¼genden Objekte"
-
-#: admin/systems/ppd/printerPPDSelectionDialog.tpl.c:5
-msgid "Filters"
-msgstr "Filter"
-
-#: admin/systems/ppd/printerPPDSelectionDialog.tpl.c:8
-msgid "Display objects matching"
-msgstr "Zeige die Objekte, auf die Folgendes passt"
-
-#: admin/systems/ppd/printerPPDSelectionDialog.tpl.c:11
-msgid "Regular expression for matching object names"
-msgstr "RegulÃ¤rer Ausdruck zum Erkennen von Objekt-Namen"
-
-#: admin/systems/ppd/printerPPDSelectionDialog.tpl.c:14
-msgid "Close"
-msgstr "Schliessen"
-
-#: admin/systems/ppd/printerPPDDialog.tpl.c:2
-msgid "Printer driver"
-msgstr "Drucker-Treiber"
-
-#: admin/systems/ppd/printerPPDDialog.tpl.c:5
-msgid "Model"
-msgstr "Modell"
-
-#: admin/systems/ppd/printerPPDDialog.tpl.c:8
-msgid "Select"
-msgstr "Auswahl"
-
-#: admin/systems/ppd/printerPPDDialog.tpl.c:11
-msgid "New driver"
-msgstr "Neuer Treiber"
-
-#: admin/systems/ppd/printerPPDDialog.tpl.c:14
-msgid "Upload"
-msgstr "Hochladen"
-
-#: admin/systems/ppd/printerPPDDialog.tpl.c:17
-msgid "Options"
-msgstr "Optionen"
-
-#: admin/systems/ppd/remove_ppd.tpl.c:5
-msgid "The ppd file will be removed from the server and can not be restored."
-msgstr "Die PPD-Datei wird vom Server entfernt und kann nicht wiederhergestellt werden."
-
-#: admin/systems/printer.tpl.c:2
-msgid "General"
-msgstr "Allgemein"
-
-#: admin/systems/printer.tpl.c:5
-msgid "Printer name"
-msgstr "Druckername"
-
-#: admin/systems/printer.tpl.c:14
-msgid "Details"
-msgstr "Details"
-
-#: admin/systems/printer.tpl.c:20
-msgid "Printer location"
-msgstr "Drucker-Standort"
-
-#: admin/systems/printer.tpl.c:26
-msgid "PPD Provider"
-msgstr "PPD Anbieter"
-
-#: admin/systems/printer.tpl.c:29
-msgid "Driver"
-msgstr "Treiber"
-
-#: admin/systems/printer.tpl.c:32
-msgid "Edit"
-msgstr "Bearbeiten"
-
-#: admin/systems/printer.tpl.c:41
-msgid "Users which are allowed to use this printer"
-msgstr "Benutzer mit Berechtigung, diesen Drucker zu nutzen"
-
-#: admin/systems/printer.tpl.c:44
-msgid "Users"
-msgstr "Benutzer"
-
-#: admin/systems/printer.tpl.c:47
-msgid "Users which are allowed to administrate this printer"
-msgstr "Benutzer mit Berechtigung, diesen Drucker zu verwalten"
-
-#: admin/systems/printer.tpl.c:50
-msgid "Admins"
-msgstr "Administratoren"
-
-#: admin/systems/printer.tpl.c:53
-msgid "Windows paths"
-msgstr "Windowspfade"
-
-#: admin/systems/printer.tpl.c:56
-msgid "Printer windows inf file"
-msgstr "Drucker windows inf Datei"
-
-#: admin/systems/printer.tpl.c:59
-msgid "Printer driver directory"
-msgstr "Druckertreiber-Verzeichnis"
-
-#: admin/systems/gencd_frame.tpl.c:2
-msgid "Your browser does not supprt iframes."
-msgstr "Ihr Browser unterstÃ¼tzt keine iframes."
-
-#: admin/systems/services/cups/serviceCUPS.tpl.c:2
-msgid "Print Service"
-msgstr "Druck-Dienst"
-
-#: admin/systems/services/cups/serviceCUPS.tpl.c:5
-msgid "enabled"
-msgstr "aktiviert"
-
-#: admin/systems/services/ServiceAddDialog.tpl.c:2
-msgid "Adding a new service to the current server"
-msgstr "HinzufÃ¼gen eines neues Dienstes zum gewÃ¤hlten Server"
-
-#: admin/systems/services/ServiceAddDialog.tpl.c:5
-msgid ""
-"This dialog allows you to add new services to the currenty edited server "
-"object. The box below shows all available but not already used services."
-msgstr "Dieser Dialog ermÃ¶glicht Ihnen das HinzufÃ¼gen neuer Dienste zum momentan gewÃ¤hlten Server. Die Box unterhalb zeigt alle verfÃ¼gbaren aber momentan nicht verwendeten Dienste."
-
-#: admin/systems/services/ServiceAddDialog.tpl.c:8
-msgid "Service to add"
-msgstr "Dienst, der hinzugefÃ¼gt wird"
-
-#: admin/systems/services/ServiceAddDialog.tpl.c:11
-msgid "All available services are already in use."
-msgstr "Alle verfÃ¼gbaren Dienste werden bereits verwendet."
-
-#: admin/systems/services/ServiceAddDialog.tpl.c:14
-#: admin/systems/SelectDeviceType.tpl.c:26
-msgid "Continue"
-msgstr "Fortsetzen"
-
-#: admin/systems/SelectDeviceType.tpl.c:2
-msgid ""
-"This system has no system type configured. Please choose a system type for "
-"this object and an optional inheritance group. Press the 'continue' button "
-"to proceed."
-msgstr "Dieses System hat keinen zugewiesenen Typ. Bitte wÃ¤hlen Sie einen Typ und eine optionale Gruppe mit vordefinierten Eigenschaften. DrÃ¼cken Sie 'Weiter' um fortzufahren."
-
-#: admin/systems/SelectDeviceType.tpl.c:5
-msgid ""
-"Please select a system type and an optional bundle of predefined settings to"
-" be inherited."
-msgstr "Bitte wÃ¤hlen Sie einen Systemtyp und (optional) einen Satz von vordefinierten Einstellungen (werden automatisch Ã¼bernommen)."
-
-#: admin/systems/SelectDeviceType.tpl.c:8
-msgid ""
-"Please select a system type and a bundle of predefined settings to be "
-"inherited."
-msgstr "Bitte wÃ¤hlen Sie einen Systemtyp und (optional) einen Satz von  vordefinierten Einstellungen."
-
-#: admin/systems/SelectDeviceType.tpl.c:11
-#: admin/systems/SelectDeviceType.tpl.c:14
-msgid "System type"
-msgstr "System-Typ"
-
-#: admin/systems/SelectDeviceType.tpl.c:17
-msgid "Choose an object group as template"
-msgstr "WÃ¤hlen Sie eine Objektgruppe als Vorlageobjekt"
-
-#: admin/systems/SelectDeviceType.tpl.c:20
-msgid "Object group"
-msgstr "Objektgruppe"
-
-#: admin/systems/SelectDeviceType.tpl.c:23
-msgid "none"
-msgstr "keine"
-
-#: 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 ""
-
-#: 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 "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] ""
-msgstr[1] ""
diff --git a/systems/locale/el_GR/fusiondirectory.po b/systems/locale/el_GR/fusiondirectory.po
new file mode 100644
index 0000000000000000000000000000000000000000..67259f49d72e18de04c383394906913db84f2452
--- /dev/null
+++ b/systems/locale/el_GR/fusiondirectory.po
@@ -0,0 +1,1055 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR FusionDirectory Project
+# This file is distributed under the same license as the PACKAGE package.
+# 
+# Translators:
+msgid ""
+msgstr ""
+"Project-Id-Version: FusionDirectory-109\n"
+"Report-Msgid-Bugs-To: documentation@lists.fusiondirectory.org\n"
+"POT-Creation-Date: 2014-12-15 17:47+0100\n"
+"PO-Revision-Date: 2015-05-30 11:45+0000\n"
+"Last-Translator: Benoit Mortier <benoit.mortier@opensides.be>\n"
+"Language-Team: Greek (Greece) (http://www.transifex.com/projects/p/FusionDirectory-109/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/ogroups/goto/class_termgroup.inc:70
+msgid "Activated"
+msgstr ""
+
+#: admin/ogroups/goto/class_termgroup.inc:71
+msgid "Locked"
+msgstr ""
+
+#: admin/ogroups/goto/class_termgroup.inc:118
+#: admin/systems/class_terminalStartup.inc:145
+msgid "Local swap"
+msgstr ""
+
+#: admin/ogroups/goto/class_termgroup.inc:124
+#: admin/ogroups/goto/class_termgroup.inc:136
+#: admin/systems/class_terminalStartup.inc:133
+#: admin/systems/class_terminalStartup.inc:149
+msgid "inherited"
+msgstr ""
+
+#: admin/ogroups/goto/class_termgroup.inc:220
+#: admin/systems/class_systemManagement.inc:165
+#: admin/systems/class_systemManagement.inc:186
+msgid "Service infrastructure"
+msgstr ""
+
+#: admin/ogroups/goto/class_termgroup.inc:224
+msgid "Event error"
+msgstr ""
+
+#: admin/ogroups/goto/class_termgroup.inc:225
+#, php-format
+msgid "Event '%s' is not available!"
+msgstr ""
+
+#: admin/ogroups/goto/class_termgroup.inc:274
+msgid "Switch off"
+msgstr ""
+
+#: admin/ogroups/goto/class_termgroup.inc:274
+msgid "Reboot"
+msgstr ""
+
+#: admin/ogroups/goto/class_termgroup.inc:275
+msgid "Instant update"
+msgstr ""
+
+#: admin/ogroups/goto/class_termgroup.inc:276
+msgid "Scheduled update"
+msgstr ""
+
+#: admin/ogroups/goto/class_termgroup.inc:277
+msgid "Wake"
+msgstr ""
+
+#: admin/ogroups/goto/class_termgroup.inc:278
+msgid "Reinstall"
+msgstr ""
+
+#: admin/ogroups/goto/class_termgroup.inc:279
+msgid "Memory test"
+msgstr ""
+
+#: admin/ogroups/goto/class_termgroup.inc:280
+msgid "System analysis"
+msgstr ""
+
+#: admin/ogroups/goto/class_termgroup.inc:386
+#: admin/systems/services/class_goService.inc:123
+#: admin/systems/services/class_goService.inc:151
+#: admin/systems/services/class_goService.inc:187
+#: admin/systems/class_networkSettings.inc:470
+#: admin/systems/class_networkSettings.inc:483
+#: admin/systems/class_networkSettings.inc:749
+#: admin/systems/class_networkSettings.inc:808
+#: admin/systems/class_networkSettings.inc:827
+#: admin/systems/class_networkSettings.inc:844
+#: admin/systems/class_networkSettings.inc:853
+#: admin/systems/class_networkSettings.inc:871
+#: admin/systems/class_networkSettings.inc:943
+msgid "LDAP error"
+msgstr ""
+
+#: admin/ogroups/goto/class_termgroup.inc:394
+msgid "System"
+msgstr ""
+
+#: admin/ogroups/goto/class_termgroup.inc:395
+msgid "System group"
+msgstr ""
+
+#: admin/ogroups/goto/class_termgroup.inc:402
+msgid "Mode"
+msgstr ""
+
+#: admin/ogroups/goto/class_termgroup.inc:403
+#: admin/systems/class_systemServers.inc:35
+msgid "Syslog server"
+msgstr ""
+
+#: admin/ogroups/goto/class_termgroup.inc:404
+msgid "Action flag"
+msgstr ""
+
+#: admin/ogroups/goto/class_termgroup.inc:405
+msgid "Ntp server"
+msgstr ""
+
+#: admin/ogroups/goto/class_termgroup.inc:406
+#: admin/systems/class_terminalStartup.inc:65
+msgid "Root server"
+msgstr ""
+
+#: admin/ogroups/goto/class_termgroup.inc:407
+#: admin/systems/class_terminalStartup.inc:69
+msgid "Swap server"
+msgstr ""
+
+#: admin/systems/class_terminalStartup.inc:62
+msgid "Startup parameters"
+msgstr ""
+
+#: admin/systems/class_terminalStartup.inc:65
+msgid "The root server the terminal should be using"
+msgstr ""
+
+#: admin/systems/class_terminalStartup.inc:69
+msgid "The swap server the terminal should be using"
+msgstr ""
+
+#: admin/systems/class_terminalStartup.inc:73
+msgid "Boot kernel"
+msgstr ""
+
+#: admin/systems/class_terminalStartup.inc:73
+msgid "Linux kernel to be installed and booted"
+msgstr ""
+
+#: admin/systems/class_terminalStartup.inc:77
+msgid "Boot kernel parameters"
+msgstr ""
+
+#: admin/systems/class_terminalStartup.inc:77
+msgid "Linux kernel parameters to be ran"
+msgstr ""
+
+#: admin/systems/class_terminalStartup.inc:83
+msgid "Remote desktop"
+msgstr ""
+
+#: admin/systems/class_terminalStartup.inc:87
+msgid "Connect method"
+msgstr ""
+
+#: admin/systems/class_terminalStartup.inc:91
+msgid "XDMCP"
+msgstr ""
+
+#: admin/systems/class_terminalStartup.inc:91
+msgid "LDM"
+msgstr ""
+
+#: admin/systems/class_terminalStartup.inc:91
+msgid "Shell"
+msgstr ""
+
+#: admin/systems/class_terminalStartup.inc:91
+msgid "Telnet"
+msgstr ""
+
+#: admin/systems/class_terminalStartup.inc:91
+msgid "Windows RDP"
+msgstr ""
+
+#: admin/systems/class_terminalStartup.inc:95
+msgid "Terminal server"
+msgstr ""
+
+#: admin/systems/system-list.xml:10
+msgid "List of systems"
+msgstr ""
+
+#: admin/systems/system-list.xml:31
+#: admin/systems/class_workstationGeneric.inc:46
+#: admin/systems/class_printGeneric.inc:60
+#: admin/systems/class_componentGeneric.inc:58
+#: admin/systems/class_mobilePhoneGeneric.inc:60
+#: admin/systems/services/shares/class_serviceShare.inc:52
+msgid "Name"
+msgstr ""
+
+#: admin/systems/system-list.xml:39
+msgid "IP"
+msgstr ""
+
+#: admin/systems/system-list.xml:47
+msgid "MAC"
+msgstr ""
+
+#: admin/systems/system-list.xml:55
+#: admin/systems/class_workstationGeneric.inc:51
+#: admin/systems/class_printGeneric.inc:64
+#: admin/systems/class_componentGeneric.inc:62
+#: admin/systems/class_mobilePhoneGeneric.inc:64
+#: admin/systems/serverService-list.xml:35
+#: admin/systems/services/shares/class_serviceShare.inc:56
+msgid "Description"
+msgstr ""
+
+#: admin/systems/system-list.xml:63 admin/systems/class_serverService.inc:57
+#: admin/systems/services/terminal/class_serviceTerminal.inc:30
+#: admin/systems/services/cups/class_serviceCUPS.inc:85
+#: admin/systems/services/shares/class_serviceShare.inc:31
+#: admin/systems/services/ntp/class_serviceNTP.inc:30
+#: admin/systems/services/ldap/class_serviceLDAP.inc:97
+msgid "Services"
+msgstr ""
+
+#: admin/systems/system-list.xml:71
+msgid "Release"
+msgstr ""
+
+#: admin/systems/system-list.xml:79 admin/systems/serverService-list.xml:43
+msgid "Actions"
+msgstr ""
+
+#: admin/systems/system-list.xml:90 admin/systems/serverService-list.xml:54
+msgid "Create"
+msgstr ""
+
+#: admin/systems/system-list.xml:100
+msgid "Trigger action"
+msgstr ""
+
+#: admin/systems/system-list.xml:107
+msgid "Schedule action"
+msgstr ""
+
+#: admin/systems/system-list.xml:119 admin/systems/serverService-list.xml:69
+msgid "Remove"
+msgstr ""
+
+#: admin/systems/system-list.xml:150
+msgid "Edit system"
+msgstr ""
+
+#: admin/systems/system-list.xml:163
+msgid "Remove system"
+msgstr ""
+
+#: admin/systems/class_workstationGeneric.inc:35
+msgid "workstation"
+msgstr ""
+
+#: admin/systems/class_workstationGeneric.inc:42
+#: admin/systems/class_printGeneric.inc:56
+#: admin/systems/class_componentGeneric.inc:55
+#: admin/systems/class_mobilePhoneGeneric.inc:56
+msgid "Properties"
+msgstr ""
+
+#: admin/systems/class_workstationGeneric.inc:47
+#, php-format
+msgid "The name of the %s"
+msgstr ""
+
+#: admin/systems/class_workstationGeneric.inc:52
+#, php-format
+msgid "A short description of the %s"
+msgstr ""
+
+#: admin/systems/class_workstationGeneric.inc:56
+msgid "Location"
+msgstr ""
+
+#: admin/systems/class_workstationGeneric.inc:57
+#, php-format
+msgid "The location of the %s"
+msgstr ""
+
+#: admin/systems/class_workstationGeneric.inc:61
+#, php-format
+msgid "Lock this %s"
+msgstr ""
+
+#: admin/systems/class_workstationGeneric.inc:62
+#, php-format
+msgid "This will prevent the %s from being reinstalled"
+msgstr ""
+
+#: admin/systems/class_workstationGeneric.inc:73
+#: admin/systems/class_printGeneric.inc:83
+#: admin/systems/class_componentGeneric.inc:69
+#: admin/systems/class_mobilePhoneGeneric.inc:102
+#: admin/systems/class_networkSettings.inc:1008
+msgid "Network settings"
+msgstr ""
+
+#: admin/systems/class_workstationGeneric.inc:78
+#: admin/systems/class_printGeneric.inc:87
+#: admin/systems/class_componentGeneric.inc:73
+#: admin/systems/class_mobilePhoneGeneric.inc:106
+#: admin/systems/class_networkSettings.inc:630
+#: admin/systems/class_networkSettings.inc:643
+#: admin/systems/class_networkSettings.inc:645
+#: admin/systems/class_networkSettings.inc:1014
+msgid "IP address"
+msgstr ""
+
+#: admin/systems/class_workstationGeneric.inc:78
+msgid "IP addresses this system uses (v4 or v6)"
+msgstr ""
+
+#: admin/systems/class_workstationGeneric.inc:83
+#: admin/systems/class_printGeneric.inc:91
+#: admin/systems/class_componentGeneric.inc:77
+#: admin/systems/class_mobilePhoneGeneric.inc:110
+msgid "Mac address"
+msgstr ""
+
+#: admin/systems/class_workstationGeneric.inc:83
+#: admin/systems/class_printGeneric.inc:91
+#: admin/systems/class_componentGeneric.inc:77
+#: admin/systems/class_mobilePhoneGeneric.inc:110
+msgid "Mac address of this system"
+msgstr ""
+
+#: admin/systems/class_workstationGeneric.inc:125
+#: admin/systems/class_workstationGeneric.inc:130
+#: admin/systems/class_workstationGeneric.inc:131
+msgid "Workstation"
+msgstr ""
+
+#: admin/systems/class_workstationGeneric.inc:126
+msgid "Workstation information"
+msgstr ""
+
+#: admin/systems/class_printGeneric.inc:32
+#: admin/systems/class_printGeneric.inc:37
+#: admin/systems/class_printGeneric.inc:38
+msgid "Printer"
+msgstr ""
+
+#: admin/systems/class_printGeneric.inc:33
+msgid "Printer information"
+msgstr ""
+
+#: admin/systems/class_printGeneric.inc:60
+msgid "The name of the printer"
+msgstr ""
+
+#: admin/systems/class_printGeneric.inc:64
+msgid "A short description of the printer"
+msgstr ""
+
+#: admin/systems/class_printGeneric.inc:70
+msgid "Details"
+msgstr ""
+
+#: admin/systems/class_printGeneric.inc:73
+msgid "Printer location"
+msgstr ""
+
+#: admin/systems/class_printGeneric.inc:73
+msgid "The location of the printer"
+msgstr ""
+
+#: admin/systems/class_printGeneric.inc:77
+msgid "Printer URL"
+msgstr ""
+
+#: admin/systems/class_printGeneric.inc:77
+msgid "The URL of the printer"
+msgstr ""
+
+#: admin/systems/class_printGeneric.inc:87
+#: admin/systems/class_componentGeneric.inc:73
+#: admin/systems/class_mobilePhoneGeneric.inc:106
+msgid "IP address this system uses"
+msgstr ""
+
+#: admin/systems/class_serverService.inc:58
+msgid "Server services"
+msgstr ""
+
+#: admin/systems/class_serverService.inc:224
+#: admin/systems/class_serverService.inc:270
+#: admin/systems/class_serverService.inc:393
+#: admin/systems/services/shares/class_serviceShare.inc:103
+#: admin/systems/class_networkSettings.inc:297
+#: admin/systems/class_networkSettings.inc:328
+#: admin/systems/class_networkSettings.inc:576
+#: admin/systems/class_networkSettings.inc:583
+#: admin/systems/class_networkSettings.inc:589
+#: admin/systems/class_networkSettings.inc:596
+msgid "Error"
+msgstr ""
+
+#: admin/systems/class_serverService.inc:332
+msgid "Filter error"
+msgstr ""
+
+#: admin/systems/class_serverService.inc:332
+msgid "The filter is incomplete!"
+msgstr ""
+
+#: admin/systems/class_serverService.inc:387
+msgid "Information"
+msgstr ""
+
+#: admin/systems/class_serverService.inc:387
+msgid "Cannot update service status until it has been saved!"
+msgstr ""
+
+#: admin/systems/class_serverService.inc:415
+#: admin/systems/class_serverService.inc:424
+#: admin/systems/class_serverService.inc:435
+#, php-format
+msgid "Could not get execute action %s on service %s."
+msgstr ""
+
+#: admin/systems/class_terminalGeneric.inc:31
+msgid "terminal"
+msgstr ""
+
+#: admin/systems/class_terminalGeneric.inc:43
+#: admin/systems/class_terminalGeneric.inc:48
+#: admin/systems/class_terminalGeneric.inc:49
+msgid "Terminal"
+msgstr ""
+
+#: admin/systems/class_terminalGeneric.inc:44
+msgid "Terminal information"
+msgstr ""
+
+#: admin/systems/class_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
+#: admin/systems/class_serverGeneric.inc:43
+#: admin/systems/class_serverGeneric.inc:48
+#: admin/systems/class_serverGeneric.inc:49
+msgid "Server"
+msgstr ""
+
+#: admin/systems/class_systemImport.inc:169
+msgid "The server you wish to import hosts from"
+msgstr ""
+
+#: admin/systems/class_serverGeneric.inc:31
+msgid "server"
+msgstr ""
+
+#: admin/systems/class_serverGeneric.inc:44
+msgid "Server information"
+msgstr ""
+
+#: admin/systems/class_componentGeneric.inc:31
+msgid "Component"
+msgstr ""
+
+#: admin/systems/class_componentGeneric.inc:32
+msgid "Component information"
+msgstr ""
+
+#: admin/systems/class_componentGeneric.inc:36
+#: admin/systems/class_componentGeneric.inc:37
+msgid "Network device"
+msgstr ""
+
+#: admin/systems/class_componentGeneric.inc:58
+msgid "The name of the component"
+msgstr ""
+
+#: admin/systems/class_componentGeneric.inc:62
+msgid "A short description of the component"
+msgstr ""
+
+#: admin/systems/class_systemServers.inc:31
+#: admin/systems/class_systemServers.inc:53
+msgid "Servers"
+msgstr ""
+
+#: admin/systems/class_systemServers.inc:35
+msgid "The syslog server the system should be using"
+msgstr ""
+
+#: admin/systems/class_systemServers.inc:40
+msgid "NTP servers"
+msgstr ""
+
+#: admin/systems/class_systemServers.inc:40
+msgid "The NTP servers for this system"
+msgstr ""
+
+#: admin/systems/class_systemServers.inc:54
+msgid "Servers this system is using"
+msgstr ""
+
+#: admin/systems/class_mobilePhoneGeneric.inc:32
+#: admin/systems/class_mobilePhoneGeneric.inc:37
+#: admin/systems/class_mobilePhoneGeneric.inc:38
+msgid "Mobile phone"
+msgstr ""
+
+#: admin/systems/class_mobilePhoneGeneric.inc:33
+msgid "Mobile phone information"
+msgstr ""
+
+#: admin/systems/class_mobilePhoneGeneric.inc:60
+msgid "The name of the mobile phone"
+msgstr ""
+
+#: admin/systems/class_mobilePhoneGeneric.inc:64
+msgid "A short description of the mobile phone"
+msgstr ""
+
+#: admin/systems/class_mobilePhoneGeneric.inc:70
+msgid "Phone"
+msgstr ""
+
+#: admin/systems/class_mobilePhoneGeneric.inc:73
+msgid "Serial Number"
+msgstr ""
+
+#: admin/systems/class_mobilePhoneGeneric.inc:73
+msgid "The serial number of the mobile phone"
+msgstr ""
+
+#: admin/systems/class_mobilePhoneGeneric.inc:77
+msgid "IMEI Number"
+msgstr ""
+
+#: admin/systems/class_mobilePhoneGeneric.inc:77
+msgid "The IMEI number of the mobile phone"
+msgstr ""
+
+#: admin/systems/class_mobilePhoneGeneric.inc:82
+msgid "OS"
+msgstr ""
+
+#: admin/systems/class_mobilePhoneGeneric.inc:82
+msgid "The Operating System installed on this phone"
+msgstr ""
+
+#: admin/systems/class_mobilePhoneGeneric.inc:88
+msgid "SimCard"
+msgstr ""
+
+#: admin/systems/class_mobilePhoneGeneric.inc:91
+msgid "Telephone Number"
+msgstr ""
+
+#: admin/systems/class_mobilePhoneGeneric.inc:91
+msgid "The telephone number of the mobile phone"
+msgstr ""
+
+#: admin/systems/class_mobilePhoneGeneric.inc:95
+msgid "PUK Number"
+msgstr ""
+
+#: admin/systems/class_mobilePhoneGeneric.inc:95
+msgid "The PUK number of the simcard in this mobile phone"
+msgstr ""
+
+#: admin/systems/serverService-list.xml:10
+msgid "List of services"
+msgstr ""
+
+#: admin/systems/serverService-list.xml:14
+msgid "Service"
+msgstr ""
+
+#: admin/systems/serverService-list.xml:27
+msgid "!"
+msgstr ""
+
+#: admin/systems/serverService-list.xml:89
+msgid "Get status"
+msgstr ""
+
+#: admin/systems/serverService-list.xml:97
+#: admin/systems/services/cups/class_serviceCUPS.inc:92
+msgid "Start"
+msgstr ""
+
+#: admin/systems/serverService-list.xml:105
+#: admin/systems/services/cups/class_serviceCUPS.inc:93
+msgid "Stop"
+msgstr ""
+
+#: admin/systems/serverService-list.xml:113
+#: admin/systems/services/cups/class_serviceCUPS.inc:94
+msgid "Restart"
+msgstr ""
+
+#: admin/systems/serverService-list.xml:121
+msgid "Edit service"
+msgstr ""
+
+#: admin/systems/serverService-list.xml:129
+msgid "Remove service"
+msgstr ""
+
+#: admin/systems/class_systemManagement.inc:48
+#: config/systems/class_systemsPluginConfig.inc:28
+msgid "Systems"
+msgstr ""
+
+#: admin/systems/class_systemManagement.inc:49
+msgid "Systems Management"
+msgstr ""
+
+#: admin/systems/class_systemManagement.inc:250
+#, php-format
+msgid "Inherited from %s"
+msgstr ""
+
+#: admin/systems/services/terminal/class_serviceTerminal.inc:29
+#: admin/systems/services/terminal/class_serviceTerminal.inc:30
+#: admin/systems/services/terminal/class_serviceTerminal.inc:41
+msgid "Terminal service"
+msgstr ""
+
+#: admin/systems/services/terminal/class_serviceTerminal.inc:44
+msgid "Temporary disable login"
+msgstr ""
+
+#: admin/systems/services/terminal/class_serviceTerminal.inc:45
+msgid "Disables the login on this terminal server"
+msgstr ""
+
+#: admin/systems/services/terminal/class_serviceTerminal.inc:54
+msgid "Supported session types"
+msgstr ""
+
+#: admin/systems/services/terminal/class_serviceTerminal.inc:55
+msgid "The session types supported by this terminal server"
+msgstr ""
+
+#: admin/systems/services/cups/class_serviceCUPS.inc:43
+#: admin/systems/services/cups/class_serviceCUPS.inc:64
+#: admin/systems/services/cups/class_serviceCUPS.inc:85
+msgid "Print service"
+msgstr ""
+
+#: admin/systems/services/cups/class_serviceCUPS.inc:84
+msgid "Cups"
+msgstr ""
+
+#: admin/systems/services/class_goService.inc:44
+#: admin/systems/services/class_goService.inc:78
+msgid "Empty service"
+msgstr ""
+
+#: admin/systems/services/class_goService.inc:241
+msgid "Configuration error"
+msgstr ""
+
+#: admin/systems/services/shares/class_serviceShare.inc:30
+#: admin/systems/services/shares/class_serviceShare.inc:31
+msgid "Share service"
+msgstr ""
+
+#: admin/systems/services/shares/class_serviceShare.inc:43
+msgid "Shares"
+msgstr ""
+
+#: admin/systems/services/shares/class_serviceShare.inc:48
+msgid "Shares this server hosts"
+msgstr ""
+
+#: admin/systems/services/shares/class_serviceShare.inc:52
+msgid "Name of this share"
+msgstr ""
+
+#: admin/systems/services/shares/class_serviceShare.inc:56
+msgid "Description of this share"
+msgstr ""
+
+#: admin/systems/services/shares/class_serviceShare.inc:60
+msgid "Type"
+msgstr ""
+
+#: admin/systems/services/shares/class_serviceShare.inc:60
+msgid "Type of share"
+msgstr ""
+
+#: admin/systems/services/shares/class_serviceShare.inc:65
+msgid "Codepage"
+msgstr ""
+
+#: admin/systems/services/shares/class_serviceShare.inc:65
+msgid "Codepage for this share"
+msgstr ""
+
+#: admin/systems/services/shares/class_serviceShare.inc:69
+msgid "Path / Volume"
+msgstr ""
+
+#: admin/systems/services/shares/class_serviceShare.inc:69
+msgid "Path or volume concerned by this share"
+msgstr ""
+
+#: admin/systems/services/shares/class_serviceShare.inc:73
+msgid "Option"
+msgstr ""
+
+#: admin/systems/services/shares/class_serviceShare.inc:73
+msgid "Special option(s) for this share"
+msgstr ""
+
+#: admin/systems/services/shares/class_serviceShare.inc:103
+msgid "You need to configure encodings first"
+msgstr ""
+
+#: admin/systems/services/shares/class_serviceShare.inc:110
+msgid "Warning"
+msgstr ""
+
+#: admin/systems/services/shares/class_serviceShare.inc:110
+#, php-format
+msgid "Invalid value in encodings : %s"
+msgstr ""
+
+#: admin/systems/services/ntp/class_serviceNTP.inc:29
+msgid "Time service"
+msgstr ""
+
+#: admin/systems/services/ntp/class_serviceNTP.inc:30
+msgid "Time service - NTP"
+msgstr ""
+
+#: admin/systems/services/ntp/class_serviceNTP.inc:41
+msgid "Informations"
+msgstr ""
+
+#: admin/systems/services/ntp/class_serviceNTP.inc:45
+msgid "Time servers"
+msgstr ""
+
+#: admin/systems/services/ntp/class_serviceNTP.inc:45
+msgid "List of time sources to use"
+msgstr ""
+
+#: admin/systems/services/ldap/class_serviceLDAP.inc:35
+#: admin/systems/services/ldap/class_serviceLDAP.inc:96
+msgid "LDAP service"
+msgstr ""
+
+#: admin/systems/services/ldap/class_serviceLDAP.inc:39
+msgid "LDAP Base"
+msgstr ""
+
+#: admin/systems/services/ldap/class_serviceLDAP.inc:39
+msgid "The LDAP base to use for this LDAP server"
+msgstr ""
+
+#: admin/systems/services/ldap/class_serviceLDAP.inc:44
+msgid "LDAP URI"
+msgstr ""
+
+#: admin/systems/services/ldap/class_serviceLDAP.inc:44
+msgid "The LDAP URI to use in order to contact this LDAP server"
+msgstr ""
+
+#: admin/systems/services/ldap/class_serviceLDAP.inc:46
+msgid "fill-in-your-servers-dns-name"
+msgstr ""
+
+#: admin/systems/services/ldap/class_serviceLDAP.inc:51
+msgid "Size limit"
+msgstr ""
+
+#: admin/systems/services/ldap/class_serviceLDAP.inc:51
+msgid "Limit the number of record returned"
+msgstr ""
+
+#: admin/systems/services/ldap/class_serviceLDAP.inc:56
+msgid "Time limit"
+msgstr ""
+
+#: admin/systems/services/ldap/class_serviceLDAP.inc:56
+msgid "Time limit for the result to be returned"
+msgstr ""
+
+#: admin/systems/services/ldap/class_serviceLDAP.inc:61
+msgid "Deref"
+msgstr ""
+
+#: admin/systems/services/ldap/class_serviceLDAP.inc:61
+msgid "Specifies how alias dereferencing is done when performing a search"
+msgstr ""
+
+#: admin/systems/services/ldap/class_serviceLDAP.inc:66
+msgid "TLS Cert"
+msgstr ""
+
+#: admin/systems/services/ldap/class_serviceLDAP.inc:66
+msgid "Filepath to tls certificate"
+msgstr ""
+
+#: admin/systems/services/ldap/class_serviceLDAP.inc:70
+msgid "TLS Key"
+msgstr ""
+
+#: admin/systems/services/ldap/class_serviceLDAP.inc:70
+msgid "Filepath to tls key"
+msgstr ""
+
+#: admin/systems/services/ldap/class_serviceLDAP.inc:74
+msgid "TLS CaCert"
+msgstr ""
+
+#: admin/systems/services/ldap/class_serviceLDAP.inc:74
+msgid "Filepath to tls ca certificate"
+msgstr ""
+
+#: admin/systems/services/ldap/class_serviceLDAP.inc:78
+msgid "TLS ReqCert"
+msgstr ""
+
+#: admin/systems/services/ldap/class_serviceLDAP.inc:78
+msgid ""
+"Specifies what checks to perform on server certificates in a TLS session, if"
+" any"
+msgstr ""
+
+#: admin/systems/services/ldap/class_serviceLDAP.inc:83
+msgid "TLS CrlCheck"
+msgstr ""
+
+#: admin/systems/services/ldap/class_serviceLDAP.inc:83
+msgid ""
+"Specifies if the Certificate Revocation List (CRL) of the CA should be used "
+"to verify if the server certificates have  not  been  revoked"
+msgstr ""
+
+#: admin/systems/services/ldap/class_serviceLDAP.inc:97
+msgid "LDAP"
+msgstr ""
+
+#: admin/systems/class_networkSettings.inc:297
+msgid "NOT IMPLEMENTED"
+msgstr ""
+
+#: admin/systems/class_networkSettings.inc:429
+msgid "Not matching"
+msgstr ""
+
+#: admin/systems/class_networkSettings.inc:576
+#, php-format
+msgid "Was not able to contact argonaut server: %s"
+msgstr ""
+
+#: admin/systems/class_networkSettings.inc:583
+#, php-format
+msgid "Was not able to find DNS server for zone %s"
+msgstr ""
+
+#: admin/systems/class_networkSettings.inc:589
+#, php-format
+msgid "Was not able to find mac address of DNS server %s"
+msgstr ""
+
+#: admin/systems/class_networkSettings.inc:596
+#, php-format
+msgid "Was not able to launch ldap2zone: %s"
+msgstr ""
+
+#: admin/systems/class_networkSettings.inc:622
+#, php-format
+msgid "IP address %s"
+msgstr ""
+
+#: admin/systems/class_networkSettings.inc:636
+#: admin/systems/class_networkSettings.inc:652
+#: admin/systems/class_networkSettings.inc:654
+#: admin/systems/class_networkSettings.inc:1015
+msgid "MAC address"
+msgstr ""
+
+#: admin/systems/class_networkSettings.inc:668
+#, php-format
+msgid "The IP address '%s' is not part of the selected reverse zone '%s'!"
+msgstr ""
+
+#: admin/systems/class_networkSettings.inc:678
+#, php-format
+msgid "Record type '%s' is duplicated!"
+msgstr ""
+
+#: admin/systems/class_networkSettings.inc:685
+#, php-format
+msgid "Uniq record type '%s' is duplicated!"
+msgstr ""
+
+#: admin/systems/class_networkSettings.inc:697
+#, php-format
+msgid ""
+"The IP address '%s' will be added as 'A Record', this will be done "
+"automatically, please remove the record."
+msgstr ""
+
+#: admin/systems/class_networkSettings.inc:704
+#, php-format
+msgid "Only lowercase records are allowed, please check your '%ss'."
+msgstr ""
+
+#: admin/systems/class_networkSettings.inc:970
+msgid "Delete"
+msgstr ""
+
+#: admin/systems/class_networkSettings.inc:976
+msgid "Add"
+msgstr ""
+
+#: admin/systems/class_networkSettings.inc:1007
+msgid "Network"
+msgstr ""
+
+#: admin/systems/class_networkSettings.inc:1022
+msgid "DNS configuration"
+msgstr ""
+
+#: admin/systems/class_networkSettings.inc:1025
+msgid "DHCP configuration"
+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 "Mobile phone RDN"
+msgstr ""
+
+#: config/systems/class_systemsPluginConfig.inc:73
+msgid "Branch in which mobile phones will be stored"
+msgstr ""
+
+#: config/systems/class_systemsPluginConfig.inc:80
+msgid "Miscellaneous"
+msgstr ""
+
+#: config/systems/class_systemsPluginConfig.inc:84
+msgid "Available encodings for share services"
+msgstr ""
+
+#: config/systems/class_systemsPluginConfig.inc:88
+msgid "Encoding"
+msgstr ""
+
+#: config/systems/class_systemsPluginConfig.inc:88
+msgid "The encoding code name"
+msgstr ""
+
+#: config/systems/class_systemsPluginConfig.inc:93
+msgid "Label"
+msgstr ""
+
+#: config/systems/class_systemsPluginConfig.inc:93
+msgid "The encoding displayed name"
+msgstr ""
+
+#: config/systems/class_systemsPluginConfig.inc:101
+msgid "Encodings"
+msgstr ""
diff --git a/systems/locale/en/fusiondirectory.po b/systems/locale/en/fusiondirectory.po
index c457b441a702b3c9f73de88841a438ff977648aa..2ed9ad6b6ac4f4475c939b3ad91a2ff666b8df6b 100644
--- a/systems/locale/en/fusiondirectory.po
+++ b/systems/locale/en/fusiondirectory.po
@@ -3,18 +3,20 @@
 # This file is distributed under the same license as the PACKAGE package.
 # FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
 #
+#, fuzzy
 msgid ""
 msgstr ""
-"Project-Id-Version: PACKAGE VERSION\n"
-"Report-Msgid-Bugs-To: documentation@lists.fusiondirectory.org\n"
-"POT-Creation-Date: 2015-03-31 11:49+0200\n"
+"Project-Id-Version: FusionDirectory VERSION\n"
+"Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
+"POT-Creation-Date: 2015-05-30 15:30+0200\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
-"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
-"Language-Team: LANGUAGE <LL@li.org>\n"
-"Language: \n"
+"Last-Translator: FusionDirectory project <contact@fusiondirectory.org>\n"
+"Language-Team: English\n"
+"Language: en\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
 #: admin/ogroups/goto/class_termgroup.inc:70
 msgid "Activated"
@@ -25,23 +27,23 @@ msgid "Locked"
 msgstr ""
 
 #: admin/ogroups/goto/class_termgroup.inc:118
-#: admin/systems/class_terminalGeneric.inc:121
+#: admin/systems/class_terminalGeneric.inc:120
 msgid "Local swap"
 msgstr ""
 
 #: admin/ogroups/goto/class_termgroup.inc:124
 #: admin/ogroups/goto/class_termgroup.inc:136
-#: admin/systems/class_workstationGeneric.inc:352
-#: admin/systems/class_terminalGeneric.inc:109
-#: admin/systems/class_terminalGeneric.inc:125
+#: admin/systems/class_workstationGeneric.inc:358
+#: admin/systems/class_terminalGeneric.inc:108
+#: admin/systems/class_terminalGeneric.inc:124
 msgid "inherited"
 msgstr ""
 
 #: admin/ogroups/goto/class_termgroup.inc:220
 #: admin/systems/class_workstationGeneric.inc:72
-#: admin/systems/class_workstationGeneric.inc:443
-#: admin/systems/class_systemManagement.inc:295
-#: admin/systems/class_systemManagement.inc:325
+#: admin/systems/class_workstationGeneric.inc:449
+#: admin/systems/class_systemManagement.inc:189
+#: admin/systems/class_systemManagement.inc:210
 msgid "Infrastructure service"
 msgstr ""
 
@@ -92,21 +94,20 @@ msgid "System analysis"
 msgstr ""
 
 #: admin/ogroups/goto/class_termgroup.inc:386
-#: admin/systems/class_printGeneric.inc:670
-#: admin/systems/class_printGeneric.inc:970
-#: admin/systems/class_systemManagement.inc:816
+#: admin/systems/class_printGeneric.inc:676
+#: admin/systems/class_printGeneric.inc:976
 #: admin/systems/services/class_goService.inc:123
 #: admin/systems/services/class_goService.inc:151
 #: admin/systems/services/class_goService.inc:187
-#: admin/systems/class_networkSettings.inc:478
-#: admin/systems/class_networkSettings.inc:491
-#: admin/systems/class_networkSettings.inc:757
-#: admin/systems/class_networkSettings.inc:816
-#: admin/systems/class_networkSettings.inc:835
-#: admin/systems/class_networkSettings.inc:852
-#: admin/systems/class_networkSettings.inc:861
-#: admin/systems/class_networkSettings.inc:879
-#: admin/systems/class_networkSettings.inc:951
+#: admin/systems/class_networkSettings.inc:482
+#: admin/systems/class_networkSettings.inc:495
+#: admin/systems/class_networkSettings.inc:761
+#: admin/systems/class_networkSettings.inc:820
+#: admin/systems/class_networkSettings.inc:839
+#: admin/systems/class_networkSettings.inc:856
+#: admin/systems/class_networkSettings.inc:865
+#: admin/systems/class_networkSettings.inc:883
+#: admin/systems/class_networkSettings.inc:955
 msgid "LDAP error"
 msgstr ""
 
@@ -182,79 +183,56 @@ msgid "List of systems"
 msgstr ""
 
 #: admin/systems/system-list.xml:14
-msgid "New workstation"
-msgstr ""
-
-#: admin/systems/system-list.xml:22
 msgid "Locked server"
 msgstr ""
 
-#: admin/systems/system-list.xml:30
+#: admin/systems/system-list.xml:22
 msgid "Locked workstation"
 msgstr ""
 
-#: admin/systems/system-list.xml:38
+#: admin/systems/system-list.xml:30
 msgid "Locked terminal"
 msgstr ""
 
-#: admin/systems/system-list.xml:47
-msgid "New terminal"
-msgstr ""
-
-#: admin/systems/system-list.xml:55
-msgid "New device"
-msgstr ""
-
-#: admin/systems/system-list.xml:63
-msgid "Workstation template"
-msgstr ""
-
-#: admin/systems/system-list.xml:71
-msgid "Terminal template"
-msgstr ""
-
-#: admin/systems/system-list.xml:79
+#: admin/systems/system-list.xml:38
 msgid "Winstation"
 msgstr ""
 
-#: admin/systems/system-list.xml:87 admin/systems/system-list.xml:234
+#: admin/systems/system-list.xml:46 admin/systems/system-list.xml:193
 #: admin/systems/class_systemImport.inc:169
 #: admin/systems/class_serverGeneric.inc:46
 #: admin/systems/class_serverGeneric.inc:51
 #: admin/systems/class_serverGeneric.inc:52
-#: admin/systems/class_SelectDeviceType.inc:58
 msgid "Server"
 msgstr ""
 
-#: admin/systems/system-list.xml:95 admin/systems/system-list.xml:242
-#: admin/systems/class_workstationGeneric.inc:458
-#: admin/systems/class_workstationGeneric.inc:463
+#: admin/systems/system-list.xml:54 admin/systems/system-list.xml:201
 #: admin/systems/class_workstationGeneric.inc:464
-#: admin/systems/class_SelectDeviceType.inc:58
+#: admin/systems/class_workstationGeneric.inc:469
+#: admin/systems/class_workstationGeneric.inc:470
 msgid "Workstation"
 msgstr ""
 
-#: admin/systems/system-list.xml:103 admin/systems/system-list.xml:250
+#: admin/systems/system-list.xml:62 admin/systems/system-list.xml:209
 #: admin/systems/class_terminalGeneric.inc:81
 #: admin/systems/class_terminalGeneric.inc:86
 #: admin/systems/class_terminalGeneric.inc:87
-#: admin/systems/class_SelectDeviceType.inc:58
 msgid "Terminal"
 msgstr ""
 
-#: admin/systems/system-list.xml:111 admin/systems/class_printGeneric.inc:1005
-#: admin/systems/class_printGeneric.inc:1011
-#: admin/systems/class_printGeneric.inc:1012
+#: admin/systems/system-list.xml:70 admin/systems/class_printGeneric.inc:1011
+#: admin/systems/class_printGeneric.inc:1017
+#: admin/systems/class_printGeneric.inc:1018
 msgid "Printer"
 msgstr ""
 
-#: admin/systems/system-list.xml:119 admin/systems/system-list.xml:274
+#: admin/systems/system-list.xml:78 admin/systems/system-list.xml:233
 #: admin/systems/class_mobilePhoneGeneric.inc:74
 #: admin/systems/phoneSelect/phoneSelect-list.xml:14
 msgid "Phone"
 msgstr ""
 
-#: admin/systems/system-list.xml:127
+#: admin/systems/system-list.xml:86
 #: admin/systems/class_mobilePhoneGeneric.inc:36
 #: admin/systems/class_mobilePhoneGeneric.inc:41
 #: admin/systems/class_mobilePhoneGeneric.inc:42
@@ -262,22 +240,22 @@ msgstr ""
 msgid "Mobile phone"
 msgstr ""
 
-#: admin/systems/system-list.xml:135
+#: admin/systems/system-list.xml:94
 #: admin/systems/class_componentGeneric.inc:36
 msgid "Component"
 msgstr ""
 
-#: admin/systems/system-list.xml:143 admin/systems/system-list.xml:298
+#: admin/systems/system-list.xml:102 admin/systems/system-list.xml:257
 msgid "IPMI"
 msgstr ""
 
-#: admin/systems/system-list.xml:169
+#: admin/systems/system-list.xml:128
 #: admin/systems/class_workstationGeneric.inc:154
-#: admin/systems/class_printGeneric.inc:752
-#: admin/systems/class_printGeneric.inc:762
-#: admin/systems/class_printGeneric.inc:781
-#: admin/systems/class_printGeneric.inc:1022
-#: admin/systems/class_componentGeneric.inc:64
+#: admin/systems/class_printGeneric.inc:758
+#: admin/systems/class_printGeneric.inc:768
+#: admin/systems/class_printGeneric.inc:787
+#: admin/systems/class_printGeneric.inc:1027
+#: admin/systems/class_componentGeneric.inc:63
 #: admin/systems/class_mobilePhoneGeneric.inc:63
 #: admin/systems/phoneSelect/phoneSelect-list.xml:48
 #: admin/systems/services/shares/class_serviceShare.inc:52
@@ -286,19 +264,19 @@ msgstr ""
 msgid "Name"
 msgstr ""
 
-#: admin/systems/system-list.xml:177
+#: admin/systems/system-list.xml:136
 #: admin/systems/phoneSelect/phoneSelect-list.xml:63
 msgid "IP"
 msgstr ""
 
-#: admin/systems/system-list.xml:185
+#: admin/systems/system-list.xml:144
 msgid "MAC"
 msgstr ""
 
-#: admin/systems/system-list.xml:193
+#: admin/systems/system-list.xml:152
 #: admin/systems/class_workstationGeneric.inc:160
-#: admin/systems/class_printGeneric.inc:1024
-#: admin/systems/class_componentGeneric.inc:68
+#: admin/systems/class_printGeneric.inc:1029
+#: 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
@@ -306,7 +284,7 @@ msgstr ""
 msgid "Description"
 msgstr ""
 
-#: admin/systems/system-list.xml:201 admin/systems/class_serverService.inc:57
+#: admin/systems/system-list.xml:160 admin/systems/class_serverService.inc:57
 #: admin/systems/services/terminal/class_serviceTerminal.inc:30
 #: admin/systems/services/cups/class_serviceCUPS.inc:85
 #: admin/systems/services/shares/class_serviceShare.inc:31
@@ -315,63 +293,55 @@ msgstr ""
 msgid "Services"
 msgstr ""
 
-#: admin/systems/system-list.xml:209
+#: admin/systems/system-list.xml:168
 msgid "Release"
 msgstr ""
 
-#: admin/systems/system-list.xml:217 admin/systems/serverService-list.xml:43
+#: admin/systems/system-list.xml:176 admin/systems/serverService-list.xml:43
 #: admin/systems/phoneSelect/phoneSelect-list.xml:70
 msgid "Actions"
 msgstr ""
 
-#: admin/systems/system-list.xml:228 admin/systems/serverService-list.xml:54
+#: admin/systems/system-list.xml:187 admin/systems/serverService-list.xml:54
 msgid "Create"
 msgstr ""
 
-#: admin/systems/system-list.xml:258
+#: admin/systems/system-list.xml:217
 msgid "winStation"
 msgstr ""
 
-#: admin/systems/system-list.xml:266
+#: admin/systems/system-list.xml:225
 msgid "Network printer"
 msgstr ""
 
-#: admin/systems/system-list.xml:282
+#: admin/systems/system-list.xml:241
 #: admin/systems/class_componentGeneric.inc:41
 #: admin/systems/class_componentGeneric.inc:42
 msgid "Network device"
 msgstr ""
 
-#: admin/systems/system-list.xml:290
+#: admin/systems/system-list.xml:249
 msgid "Mobile Phone"
 msgstr ""
 
-#: admin/systems/system-list.xml:310
+#: admin/systems/system-list.xml:269
 msgid "Trigger action"
 msgstr ""
 
-#: admin/systems/system-list.xml:317
+#: admin/systems/system-list.xml:276
 msgid "Schedule action"
 msgstr ""
 
-#: admin/systems/system-list.xml:330
-msgid "Activate systems"
-msgstr ""
-
-#: admin/systems/system-list.xml:337 admin/systems/serverService-list.xml:69
+#: admin/systems/system-list.xml:288 admin/systems/serverService-list.xml:69
 #: admin/systems/printer.tpl.c:35
 msgid "Remove"
 msgstr ""
 
-#: admin/systems/system-list.xml:367
-msgid "Create ISO"
-msgstr ""
-
-#: admin/systems/system-list.xml:379
+#: admin/systems/system-list.xml:319
 msgid "Edit system"
 msgstr ""
 
-#: admin/systems/system-list.xml:392
+#: admin/systems/system-list.xml:332
 msgid "Remove system"
 msgstr ""
 
@@ -397,12 +367,12 @@ msgid "Wake up"
 msgstr ""
 
 #: admin/systems/class_workstationGeneric.inc:144
-#: admin/systems/class_printGeneric.inc:604
+#: admin/systems/class_printGeneric.inc:610
 msgid "workstation"
 msgstr ""
 
 #: admin/systems/class_workstationGeneric.inc:151
-#: admin/systems/class_componentGeneric.inc:61
+#: admin/systems/class_componentGeneric.inc:60
 #: admin/systems/class_mobilePhoneGeneric.inc:60
 msgid "Properties"
 msgstr ""
@@ -418,7 +388,7 @@ msgid "A short description of the %s"
 msgstr ""
 
 #: admin/systems/class_workstationGeneric.inc:166
-#: admin/systems/class_printGeneric.inc:1025
+#: admin/systems/class_printGeneric.inc:1030
 msgid "Location"
 msgstr ""
 
@@ -493,19 +463,18 @@ msgid "Select action to execute for this terminal"
 msgstr ""
 
 #: admin/systems/class_workstationGeneric.inc:236
-#: admin/systems/class_componentGeneric.inc:75
+#: admin/systems/class_componentGeneric.inc:74
 #: admin/systems/class_mobilePhoneGeneric.inc:106
-#: admin/systems/class_networkSettings.inc:1016
+#: admin/systems/class_networkSettings.inc:1020
 msgid "Network settings"
 msgstr ""
 
-#: admin/systems/class_workstationGeneric.inc:459
+#: admin/systems/class_workstationGeneric.inc:465
 msgid "Workstation information"
 msgstr ""
 
 #: admin/systems/class_printGeneric.inc:131
-#: admin/systems/class_printGeneric.inc:1065
-#: admin/systems/class_systemManagement.inc:678
+#: admin/systems/class_printGeneric.inc:1070
 msgid "Internal error"
 msgstr ""
 
@@ -515,170 +484,168 @@ msgid ""
 "Cannot determine a valid department for this object. Setting base to '%s'!"
 msgstr ""
 
-#: admin/systems/class_printGeneric.inc:311
-#: admin/systems/class_printGeneric.inc:319
-#: admin/systems/class_printGeneric.inc:324
-#: admin/systems/class_printGeneric.inc:374
-#: admin/systems/class_printGeneric.inc:390
-#: admin/systems/class_printGeneric.inc:393
+#: admin/systems/class_printGeneric.inc:317
+#: admin/systems/class_printGeneric.inc:325
+#: admin/systems/class_printGeneric.inc:330
+#: admin/systems/class_printGeneric.inc:380
+#: admin/systems/class_printGeneric.inc:396
+#: admin/systems/class_printGeneric.inc:399
 msgid "Add printer extension"
 msgstr ""
 
-#: admin/systems/class_printGeneric.inc:312
+#: admin/systems/class_printGeneric.inc:318
 msgid ""
 "Could not initialize printer tab, parameter parent was missing while "
 "construction."
 msgstr ""
 
-#: admin/systems/class_printGeneric.inc:320
+#: admin/systems/class_printGeneric.inc:326
 msgid "This is a workstation template, printer tab is disabled."
 msgstr ""
 
-#: admin/systems/class_printGeneric.inc:325
+#: admin/systems/class_printGeneric.inc:331
 msgid "This is a terminal template, printer tab is disabled."
 msgstr ""
 
-#: admin/systems/class_printGeneric.inc:367
-#: admin/systems/class_printGeneric.inc:375
-#: admin/systems/class_printGeneric.inc:383
-#: admin/systems/class_printGeneric.inc:386
-#: admin/systems/class_printGeneric.inc:391
-#: admin/systems/class_printGeneric.inc:394
+#: admin/systems/class_printGeneric.inc:373
+#: admin/systems/class_printGeneric.inc:381
+#: admin/systems/class_printGeneric.inc:389
+#: admin/systems/class_printGeneric.inc:392
+#: admin/systems/class_printGeneric.inc:397
+#: admin/systems/class_printGeneric.inc:400
 msgid "printer"
 msgstr ""
 
-#: admin/systems/class_printGeneric.inc:375
+#: admin/systems/class_printGeneric.inc:381
 msgid ""
 "You can't enable it while 'cn' is not present in entry. Possibly you are "
 "currently creating a new terminal template."
 msgstr ""
 
-#: admin/systems/class_printGeneric.inc:382
-#: admin/systems/class_printGeneric.inc:385
+#: admin/systems/class_printGeneric.inc:388
+#: admin/systems/class_printGeneric.inc:391
 msgid "Remove printer extension"
 msgstr ""
 
-#: admin/systems/class_printGeneric.inc:474
-#: admin/systems/class_printGeneric.inc:652
-#: admin/systems/class_printGeneric.inc:659
-#: admin/systems/class_printGeneric.inc:718
-#: admin/systems/class_printGeneric.inc:1105
-#: admin/systems/class_printGeneric.inc:1116
+#: admin/systems/class_printGeneric.inc:480
+#: admin/systems/class_printGeneric.inc:658
+#: admin/systems/class_printGeneric.inc:665
+#: admin/systems/class_printGeneric.inc:724
+#: admin/systems/class_printGeneric.inc:1110
+#: admin/systems/class_printGeneric.inc:1121
 #: admin/systems/class_serverService.inc:224
 #: admin/systems/class_serverService.inc:270
 #: admin/systems/class_serverService.inc:393
-#: admin/systems/class_systemManagement.inc:341
-#: admin/systems/class_systemManagement.inc:624
-#: admin/systems/class_systemManagement.inc:639
+#: admin/systems/class_systemManagement.inc:226
 #: admin/systems/services/shares/class_serviceShare.inc:103
-#: admin/systems/class_networkSettings.inc:305
-#: admin/systems/class_networkSettings.inc:336
-#: admin/systems/class_networkSettings.inc:584
-#: admin/systems/class_networkSettings.inc:591
-#: admin/systems/class_networkSettings.inc:597
-#: admin/systems/class_networkSettings.inc:604
+#: admin/systems/class_networkSettings.inc:309
+#: admin/systems/class_networkSettings.inc:340
+#: admin/systems/class_networkSettings.inc:588
+#: admin/systems/class_networkSettings.inc:595
+#: admin/systems/class_networkSettings.inc:601
+#: admin/systems/class_networkSettings.inc:608
 msgid "Error"
 msgstr ""
 
-#: admin/systems/class_printGeneric.inc:577
+#: admin/systems/class_printGeneric.inc:583
 #, php-format
 msgid "Your currently selected PPD file '%s' doesn't exist."
 msgstr ""
 
-#: admin/systems/class_printGeneric.inc:583
+#: admin/systems/class_printGeneric.inc:589
 msgid "Not defined"
 msgstr ""
 
-#: admin/systems/class_printGeneric.inc:587
+#: admin/systems/class_printGeneric.inc:593
 #: admin/systems/ppd/class_printerPPDDialog.inc:116
 msgid "Can't get ppd informations."
 msgstr ""
 
-#: admin/systems/class_printGeneric.inc:602
-#: admin/systems/class_printGeneric.inc:604
+#: admin/systems/class_printGeneric.inc:608
+#: admin/systems/class_printGeneric.inc:610
 #, php-format
 msgid "This printer belongs to %s. You can't rename this printer."
 msgstr ""
 
-#: admin/systems/class_printGeneric.inc:602
+#: admin/systems/class_printGeneric.inc:608
 #: admin/systems/class_terminalGeneric.inc:34
 msgid "terminal"
 msgstr ""
 
-#: admin/systems/class_printGeneric.inc:652
-#: admin/systems/class_printGeneric.inc:659
+#: admin/systems/class_printGeneric.inc:658
+#: admin/systems/class_printGeneric.inc:665
 msgid "Object is no printer!"
 msgstr ""
 
-#: admin/systems/class_printGeneric.inc:767 admin/systems/printer.tpl.c:23
+#: admin/systems/class_printGeneric.inc:773 admin/systems/printer.tpl.c:23
 msgid "Printer URL"
 msgstr ""
 
-#: admin/systems/class_printGeneric.inc:989
-#: admin/systems/class_printGeneric.inc:991
+#: admin/systems/class_printGeneric.inc:995
+#: admin/systems/class_printGeneric.inc:997
 msgid "Group"
 msgstr ""
 
-#: admin/systems/class_printGeneric.inc:994
+#: admin/systems/class_printGeneric.inc:1000
 msgid "User"
 msgstr ""
 
-#: admin/systems/class_printGeneric.inc:1006
+#: admin/systems/class_printGeneric.inc:1012
 msgid "Printer information"
 msgstr ""
 
-#: admin/systems/class_printGeneric.inc:1023
+#: admin/systems/class_printGeneric.inc:1028
 #: admin/systems/serverService-list.tpl.c:2
 #: admin/systems/phoneSelect/phoneSelect-list.tpl.c:2
 #: admin/systems/printer.tpl.c:11
 msgid "Base"
 msgstr ""
 
-#: admin/systems/class_printGeneric.inc:1026
+#: admin/systems/class_printGeneric.inc:1031
 msgid "LabeledURL"
 msgstr ""
 
-#: admin/systems/class_printGeneric.inc:1027
+#: admin/systems/class_printGeneric.inc:1032
 msgid "Printer PPD"
 msgstr ""
 
-#: admin/systems/class_printGeneric.inc:1028 admin/systems/printer.tpl.c:38
+#: admin/systems/class_printGeneric.inc:1033 admin/systems/printer.tpl.c:38
 msgid "Permissions"
 msgstr ""
 
-#: admin/systems/class_printGeneric.inc:1030
+#: admin/systems/class_printGeneric.inc:1035
 msgid "Windows inf file"
 msgstr ""
 
-#: admin/systems/class_printGeneric.inc:1031
+#: admin/systems/class_printGeneric.inc:1036
 msgid "Windows driver dir"
 msgstr ""
 
-#: admin/systems/class_printGeneric.inc:1032 admin/systems/printer.tpl.c:62
+#: admin/systems/class_printGeneric.inc:1037 admin/systems/printer.tpl.c:62
 msgid "Driver printer name"
 msgstr ""
 
-#: admin/systems/class_printGeneric.inc:1048
-#: admin/systems/class_printGeneric.inc:1070
+#: admin/systems/class_printGeneric.inc:1053
+#: admin/systems/class_printGeneric.inc:1075
 msgid "Permission error"
 msgstr ""
 
-#: admin/systems/class_printGeneric.inc:1048
-#: admin/systems/class_printGeneric.inc:1070
+#: admin/systems/class_printGeneric.inc:1053
+#: admin/systems/class_printGeneric.inc:1075
 msgid "printer user"
 msgstr ""
 
-#: admin/systems/class_printGeneric.inc:1065
+#: admin/systems/class_printGeneric.inc:1070
 #, php-format
 msgid "Illegal member type '%s'!"
 msgstr ""
 
-#: admin/systems/class_printGeneric.inc:1105
+#: admin/systems/class_printGeneric.inc:1110
 #, php-format
 msgid "'%s' is already used!"
 msgstr ""
 
-#: admin/systems/class_printGeneric.inc:1116
+#: admin/systems/class_printGeneric.inc:1121
 #, php-format
 msgid "'%s' does not exist!"
 msgstr ""
@@ -956,11 +923,11 @@ msgstr ""
 msgid "Component information"
 msgstr ""
 
-#: admin/systems/class_componentGeneric.inc:64
+#: admin/systems/class_componentGeneric.inc:63
 msgid "The name of the component"
 msgstr ""
 
-#: admin/systems/class_componentGeneric.inc:68
+#: admin/systems/class_componentGeneric.inc:67
 msgid "A short description of the component"
 msgstr ""
 
@@ -1071,55 +1038,38 @@ msgstr ""
 msgid "Select this number"
 msgstr ""
 
-#: admin/systems/class_systemManagement.inc:177
-msgid "Back"
-msgstr ""
-
-#: admin/systems/class_systemManagement.inc:223
-msgid "Creating the image failed. Please see the report below."
-msgstr ""
-
-#: admin/systems/class_systemManagement.inc:228
-#, php-format
-msgid "Command '%s', specified for ISO creation doesn't seem to exist."
-msgstr ""
-
-#: admin/systems/class_systemManagement.inc:398
-#: admin/systems/class_systemManagement.inc:473
-#: admin/systems/class_systemManagement.inc:858
-#: admin/systems/class_systemManagement.inc:905
-#: admin/systems/class_systemManagement.inc:926
+#: admin/systems/class_systemManagement.inc:283
+#: admin/systems/class_systemManagement.inc:358
+#: admin/systems/class_systemManagement.inc:448
+#: admin/systems/class_systemManagement.inc:495
+#: admin/systems/class_systemManagement.inc:516
 msgid "Permission"
 msgstr ""
 
-#: admin/systems/class_systemManagement.inc:678
-msgid "Cannot set mode to 'active'!"
-msgstr ""
-
-#: admin/systems/class_systemManagement.inc:858
+#: admin/systems/class_systemManagement.inc:448
 #, php-format
 msgid "You are not allowed to create a snapshot for %s."
 msgstr ""
 
-#: admin/systems/class_systemManagement.inc:905
-#: admin/systems/class_systemManagement.inc:926
+#: admin/systems/class_systemManagement.inc:495
+#: admin/systems/class_systemManagement.inc:516
 #, php-format
 msgid "You are not allowed to restore a snapshot for %s."
 msgstr ""
 
-#: admin/systems/class_systemManagement.inc:1169
+#: admin/systems/class_systemManagement.inc:742
 #, php-format
 msgid "Inherited from %s"
 msgstr ""
 
-#: admin/systems/class_systemManagement.inc:1224
-#: admin/systems/class_systemManagement.inc:1228
+#: admin/systems/class_systemManagement.inc:795
+#: admin/systems/class_systemManagement.inc:799
 #: addons/dashboard/class_dashBoardSystems.inc:199
 #: config/systems/class_systemsPluginConfig.inc:28
 msgid "Systems"
 msgstr ""
 
-#: admin/systems/class_systemManagement.inc:1225
+#: admin/systems/class_systemManagement.inc:796
 msgid "Systems Management"
 msgstr ""
 
@@ -1345,98 +1295,98 @@ msgstr ""
 msgid "LDAP"
 msgstr ""
 
-#: admin/systems/class_networkSettings.inc:305
+#: admin/systems/class_networkSettings.inc:309
 msgid "NOT IMPLEMENTED"
 msgstr ""
 
-#: admin/systems/class_networkSettings.inc:437
+#: admin/systems/class_networkSettings.inc:441
 msgid "Not matching"
 msgstr ""
 
-#: admin/systems/class_networkSettings.inc:584
+#: admin/systems/class_networkSettings.inc:588
 #, php-format
 msgid "Was not able to contact argonaut server: %s"
 msgstr ""
 
-#: admin/systems/class_networkSettings.inc:591
+#: admin/systems/class_networkSettings.inc:595
 #, php-format
 msgid "Was not able to find DNS server for zone %s"
 msgstr ""
 
-#: admin/systems/class_networkSettings.inc:597
+#: admin/systems/class_networkSettings.inc:601
 #, php-format
 msgid "Was not able to find mac address of DNS server %s"
 msgstr ""
 
-#: admin/systems/class_networkSettings.inc:604
+#: admin/systems/class_networkSettings.inc:608
 #, php-format
 msgid "Was not able to launch ldap2zone: %s"
 msgstr ""
 
-#: admin/systems/class_networkSettings.inc:630
+#: admin/systems/class_networkSettings.inc:634
 #, php-format
 msgid "IP address %s"
 msgstr ""
 
-#: admin/systems/class_networkSettings.inc:638
-#: admin/systems/class_networkSettings.inc:651
-#: admin/systems/class_networkSettings.inc:653
-#: admin/systems/class_networkSettings.inc:1022
+#: admin/systems/class_networkSettings.inc:642
+#: admin/systems/class_networkSettings.inc:655
+#: admin/systems/class_networkSettings.inc:657
+#: admin/systems/class_networkSettings.inc:1026
 msgid "IP address"
 msgstr ""
 
-#: admin/systems/class_networkSettings.inc:644
-#: admin/systems/class_networkSettings.inc:660
-#: admin/systems/class_networkSettings.inc:662
-#: admin/systems/class_networkSettings.inc:1023
+#: admin/systems/class_networkSettings.inc:648
+#: admin/systems/class_networkSettings.inc:664
+#: admin/systems/class_networkSettings.inc:666
+#: admin/systems/class_networkSettings.inc:1027
 msgid "MAC address"
 msgstr ""
 
-#: admin/systems/class_networkSettings.inc:676
+#: admin/systems/class_networkSettings.inc:680
 #, php-format
 msgid "The IP address '%s' is not part of the selected reverse zone '%s'!"
 msgstr ""
 
-#: admin/systems/class_networkSettings.inc:686
+#: admin/systems/class_networkSettings.inc:690
 #, php-format
 msgid "Record type '%s' is duplicated!"
 msgstr ""
 
-#: admin/systems/class_networkSettings.inc:693
+#: admin/systems/class_networkSettings.inc:697
 #, php-format
 msgid "Uniq record type '%s' is duplicated!"
 msgstr ""
 
-#: admin/systems/class_networkSettings.inc:705
+#: admin/systems/class_networkSettings.inc:709
 #, php-format
 msgid ""
 "The IP address '%s' will be added as 'A Record', this will be done "
 "automatically, please remove the record."
 msgstr ""
 
-#: admin/systems/class_networkSettings.inc:712
+#: admin/systems/class_networkSettings.inc:716
 #, php-format
 msgid "Only lowercase records are allowed, please check your '%ss'."
 msgstr ""
 
-#: admin/systems/class_networkSettings.inc:978
+#: admin/systems/class_networkSettings.inc:982
 msgid "Delete"
 msgstr ""
 
-#: admin/systems/class_networkSettings.inc:984
+#: admin/systems/class_networkSettings.inc:988
 msgid "Add"
 msgstr ""
 
-#: admin/systems/class_networkSettings.inc:1015
+#: admin/systems/class_networkSettings.inc:1019
 #: addons/dashboard/class_dashBoardNetwork.inc:127
 msgid "Network"
 msgstr ""
 
-#: admin/systems/class_networkSettings.inc:1030
+#: admin/systems/class_networkSettings.inc:1034
 msgid "DNS configuration"
 msgstr ""
 
-#: admin/systems/class_networkSettings.inc:1033
+#: admin/systems/class_networkSettings.inc:1037
 msgid "DHCP configuration"
 msgstr ""
 
@@ -1713,21 +1663,6 @@ msgid ""
 "be removed from OPSI."
 msgstr ""
 
-#: admin/systems/gencd.tpl.c:2
-msgid "CD-Install-Image generation"
-msgstr ""
-
-#: admin/systems/gencd.tpl.c:5
-msgid ""
-"This option enables you to generate FAI install CD images for the selected "
-"workstation. The procedure may take about 10 minutes to complete, so please "
-"be patient after pressing the 'Create ISO-Image' button."
-msgstr ""
-
-#: admin/systems/gencd.tpl.c:8
-msgid "Create ISO-Image"
-msgstr ""
-
 #: admin/systems/remove.tpl.c:5
 msgid ""
 "This includes all account data, system access rules, imap settings, etc. for "
@@ -1886,10 +1821,6 @@ msgstr ""
 msgid "Printer driver directory"
 msgstr ""
 
-#: admin/systems/gencd_frame.tpl.c:2
-msgid "Your browser does not supprt iframes."
-msgstr ""
-
 #: admin/systems/services/cups/serviceCUPS.tpl.c:2
 msgid "Print Service"
 msgstr ""
@@ -1898,65 +1829,6 @@ msgstr ""
 msgid "enabled"
 msgstr ""
 
-#: admin/systems/services/ServiceAddDialog.tpl.c:2
-msgid "Adding a new service to the current server"
-msgstr ""
-
-#: admin/systems/services/ServiceAddDialog.tpl.c:5
-msgid ""
-"This dialog allows you to add new services to the currenty edited server "
-"object. The box below shows all available but not already used services."
-msgstr ""
-
-#: admin/systems/services/ServiceAddDialog.tpl.c:8
-msgid "Service to add"
-msgstr ""
-
-#: admin/systems/services/ServiceAddDialog.tpl.c:11
-msgid "All available services are already in use."
-msgstr ""
-
-#: admin/systems/services/ServiceAddDialog.tpl.c:14
-#: admin/systems/SelectDeviceType.tpl.c:26
-msgid "Continue"
-msgstr ""
-
-#: admin/systems/SelectDeviceType.tpl.c:2
-msgid ""
-"This system has no system type configured. Please choose a system type for "
-"this object and an optional inheritance group. Press the 'continue' button "
-"to proceed."
-msgstr ""
-
-#: admin/systems/SelectDeviceType.tpl.c:5
-msgid ""
-"Please select a system type and an optional bundle of predefined settings to "
-"be inherited."
-msgstr ""
-
-#: admin/systems/SelectDeviceType.tpl.c:8
-msgid ""
-"Please select a system type and a bundle of predefined settings to be "
-"inherited."
-msgstr ""
-
-#: admin/systems/SelectDeviceType.tpl.c:11
-#: admin/systems/SelectDeviceType.tpl.c:14
-msgid "System type"
-msgstr ""
-
-#: admin/systems/SelectDeviceType.tpl.c:17
-msgid "Choose an object group as template"
-msgstr ""
-
-#: admin/systems/SelectDeviceType.tpl.c:20
-msgid "Object group"
-msgstr ""
-
-#: admin/systems/SelectDeviceType.tpl.c:23
-msgid "none"
-msgstr ""
-
 #: addons/dashboard/systems_stats.tpl.c:2
 msgid "There are several argonaut servers! (this is not yet supported)"
 msgstr ""
diff --git a/systems/locale/es/fusiondirectory.po b/systems/locale/es/fusiondirectory.po
index 72bc3803ab7721ee6837319ea6be0638b0f4f030..8207c02f0e72df16c9b5cdd8fd2eec55a51e9144 100644
--- a/systems/locale/es/fusiondirectory.po
+++ b/systems/locale/es/fusiondirectory.po
@@ -3,15 +3,14 @@
 # This file is distributed under the same license as the PACKAGE package.
 # 
 # Translators:
-#  Alejandro Escanero Blanco <aescanero@gmail.com>, 2008,2010
 msgid ""
 msgstr ""
-"Project-Id-Version: FusionDirectory-108\n"
+"Project-Id-Version: FusionDirectory-109\n"
 "Report-Msgid-Bugs-To: documentation@lists.fusiondirectory.org\n"
-"POT-Creation-Date: 2015-03-31 11:49+0200\n"
+"POT-Creation-Date: 2014-12-15 17:47+0100\n"
 "PO-Revision-Date: 2015-03-31 11:41+0000\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>\n"
-"Language-Team: Spanish (http://www.transifex.com/projects/p/FusionDirectory-108/language/es/)\n"
+"Language-Team: Spanish (http://www.transifex.com/projects/p/FusionDirectory-109/language/es/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -27,29 +26,24 @@ msgid "Locked"
 msgstr "Bloqueado"
 
 #: admin/ogroups/goto/class_termgroup.inc:118
-#: admin/systems/class_terminalGeneric.inc:121
+#: admin/systems/class_terminalStartup.inc:145
 msgid "Local swap"
 msgstr "Memoria de intercambio local"
 
 #: admin/ogroups/goto/class_termgroup.inc:124
 #: admin/ogroups/goto/class_termgroup.inc:136
-#: admin/systems/class_workstationGeneric.inc:352
-#: admin/systems/class_terminalGeneric.inc:109
-#: admin/systems/class_terminalGeneric.inc:125
+#: admin/systems/class_terminalStartup.inc:133
+#: admin/systems/class_terminalStartup.inc:149
 msgid "inherited"
 msgstr "heredado"
 
 #: admin/ogroups/goto/class_termgroup.inc:220
-#: admin/systems/class_workstationGeneric.inc:72
-#: admin/systems/class_workstationGeneric.inc:443
-#: admin/systems/class_systemManagement.inc:295
-#: admin/systems/class_systemManagement.inc:325
-msgid "Infrastructure service"
-msgstr ""
+#: admin/systems/class_systemManagement.inc:165
+#: admin/systems/class_systemManagement.inc:186
+msgid "Service infrastructure"
+msgstr "Infraestructura de servicio"
 
 #: admin/ogroups/goto/class_termgroup.inc:224
-#: admin/systems/class_workstationGeneric.inc:75
-#: admin/systems/class_workstationGeneric.inc:78
 msgid "Event error"
 msgstr "Evento de error"
 
@@ -59,12 +53,10 @@ msgid "Event '%s' is not available!"
 msgstr "Â¡El evento '%s' no estÃ¡ disponible!"
 
 #: admin/ogroups/goto/class_termgroup.inc:274
-#: admin/systems/class_workstationGeneric.inc:112
 msgid "Switch off"
 msgstr "Apagar"
 
 #: admin/ogroups/goto/class_termgroup.inc:274
-#: admin/systems/class_workstationGeneric.inc:113
 msgid "Reboot"
 msgstr "Reiniciar"
 
@@ -85,7 +77,6 @@ msgid "Reinstall"
 msgstr "Reinstalar"
 
 #: admin/ogroups/goto/class_termgroup.inc:279
-#: admin/systems/class_workstationGeneric.inc:108
 msgid "Memory test"
 msgstr "Chequeo de memoria"
 
@@ -94,21 +85,18 @@ msgid "System analysis"
 msgstr "AnÃ¡lisis del sistema"
 
 #: admin/ogroups/goto/class_termgroup.inc:386
-#: admin/systems/class_printGeneric.inc:670
-#: admin/systems/class_printGeneric.inc:970
-#: admin/systems/class_systemManagement.inc:816
 #: admin/systems/services/class_goService.inc:123
 #: admin/systems/services/class_goService.inc:151
 #: admin/systems/services/class_goService.inc:187
-#: admin/systems/class_networkSettings.inc:478
-#: admin/systems/class_networkSettings.inc:491
-#: admin/systems/class_networkSettings.inc:757
-#: admin/systems/class_networkSettings.inc:816
-#: admin/systems/class_networkSettings.inc:835
-#: admin/systems/class_networkSettings.inc:852
-#: admin/systems/class_networkSettings.inc:861
-#: admin/systems/class_networkSettings.inc:879
-#: admin/systems/class_networkSettings.inc:951
+#: admin/systems/class_networkSettings.inc:470
+#: admin/systems/class_networkSettings.inc:483
+#: admin/systems/class_networkSettings.inc:749
+#: admin/systems/class_networkSettings.inc:808
+#: admin/systems/class_networkSettings.inc:827
+#: admin/systems/class_networkSettings.inc:844
+#: admin/systems/class_networkSettings.inc:853
+#: admin/systems/class_networkSettings.inc:871
+#: admin/systems/class_networkSettings.inc:943
 msgid "LDAP error"
 msgstr "Error LDAP"
 
@@ -120,195 +108,125 @@ msgstr "Sistema"
 msgid "System group"
 msgstr "Grupos de sistemas"
 
-#: admin/ogroups/goto/class_termgroup.inc:401
-#: admin/ogroups/goto/termgroup.tpl.c:17
+#: admin/ogroups/goto/class_termgroup.inc:402
 msgid "Mode"
 msgstr "Modo"
 
-#: admin/ogroups/goto/class_termgroup.inc:402
-#: admin/systems/class_workstationGeneric.inc:189
-#: admin/ogroups/goto/termgroup.tpl.c:23
+#: admin/ogroups/goto/class_termgroup.inc:403
+#: admin/systems/class_systemServers.inc:35
 msgid "Syslog server"
 msgstr "Servidor de registro de sistema"
 
-#: admin/ogroups/goto/class_termgroup.inc:403
+#: admin/ogroups/goto/class_termgroup.inc:404
 msgid "Action flag"
 msgstr "Marca de acciÃ³n"
 
-#: admin/ogroups/goto/class_termgroup.inc:404
+#: admin/ogroups/goto/class_termgroup.inc:405
 msgid "Ntp server"
 msgstr "Servidor NTP"
 
-#: admin/ogroups/goto/class_termgroup.inc:405
-#: admin/systems/class_terminalGeneric.inc:41
-#: admin/ogroups/goto/termgroup.tpl.c:29
+#: admin/ogroups/goto/class_termgroup.inc:406
+#: admin/systems/class_terminalStartup.inc:65
 msgid "Root server"
 msgstr "Servidor RaÃz"
 
-#: admin/ogroups/goto/class_termgroup.inc:406
-#: admin/systems/class_terminalGeneric.inc:47
-#: admin/ogroups/goto/termgroup.tpl.c:35
+#: admin/ogroups/goto/class_termgroup.inc:407
+#: admin/systems/class_terminalStartup.inc:69
 msgid "Swap server"
 msgstr "Servidor de Intercambio"
 
-#: admin/systems/class_terminalStartup.inc:63
+#: admin/systems/class_terminalStartup.inc:62
 msgid "Startup parameters"
 msgstr ""
 
-#: admin/systems/class_terminalStartup.inc:66
+#: admin/systems/class_terminalStartup.inc:65
+msgid "The root server the terminal should be using"
+msgstr ""
+
+#: admin/systems/class_terminalStartup.inc:69
+msgid "The swap server the terminal should be using"
+msgstr ""
+
+#: admin/systems/class_terminalStartup.inc:73
 msgid "Boot kernel"
 msgstr "Kernel de inicio"
 
-#: admin/systems/class_terminalStartup.inc:66
+#: admin/systems/class_terminalStartup.inc:73
 msgid "Linux kernel to be installed and booted"
 msgstr ""
 
-#: admin/systems/class_terminalStartup.inc:70
+#: admin/systems/class_terminalStartup.inc:77
 msgid "Boot kernel parameters"
 msgstr ""
 
-#: admin/systems/class_terminalStartup.inc:70
+#: admin/systems/class_terminalStartup.inc:77
 msgid "Linux kernel parameters to be ran"
 msgstr ""
 
-#: admin/systems/class_terminalStartup.inc:82
-msgid "Startup"
-msgstr "Inicio"
-
 #: admin/systems/class_terminalStartup.inc:83
-msgid "Terminal startup"
-msgstr "Inicio de terminal"
-
-#: admin/systems/system-list.xml:10
-msgid "List of systems"
-msgstr "Lista de sistemas"
-
-#: admin/systems/system-list.xml:14
-msgid "New workstation"
-msgstr "Nueva estaciÃ³n de trabajo"
-
-#: admin/systems/system-list.xml:22
-msgid "Locked server"
-msgstr "Servidor bloqueado"
-
-#: admin/systems/system-list.xml:30
-msgid "Locked workstation"
-msgstr "EstaciÃ³n de trabajo bloqueada"
-
-#: admin/systems/system-list.xml:38
-msgid "Locked terminal"
-msgstr "Terminal bloqueado"
-
-#: admin/systems/system-list.xml:47
-msgid "New terminal"
-msgstr "Nuevo terminal"
-
-#: admin/systems/system-list.xml:55
-msgid "New device"
-msgstr "Nuevo dispositivo"
-
-#: admin/systems/system-list.xml:63
-msgid "Workstation template"
-msgstr "Plantilla de estaciÃ³n de trabajo"
-
-#: admin/systems/system-list.xml:71
-msgid "Terminal template"
-msgstr "Plantilla de terminal"
-
-#: admin/systems/system-list.xml:79
-msgid "Winstation"
-msgstr "EstaciÃ³n de trabajo Windows"
+msgid "Remote desktop"
+msgstr "Escritorio remoto"
 
-#: admin/systems/system-list.xml:87 admin/systems/system-list.xml:234
-#: admin/systems/class_systemImport.inc:169
-#: admin/systems/class_serverGeneric.inc:46
-#: admin/systems/class_serverGeneric.inc:51
-#: admin/systems/class_serverGeneric.inc:52
-#: admin/systems/class_SelectDeviceType.inc:58
-msgid "Server"
-msgstr "Servidor"
+#: admin/systems/class_terminalStartup.inc:87
+msgid "Connect method"
+msgstr "MÃ©todo de conexiÃ³n"
 
-#: admin/systems/system-list.xml:95 admin/systems/system-list.xml:242
-#: admin/systems/class_workstationGeneric.inc:458
-#: admin/systems/class_workstationGeneric.inc:463
-#: admin/systems/class_workstationGeneric.inc:464
-#: admin/systems/class_SelectDeviceType.inc:58
-msgid "Workstation"
-msgstr "EstaciÃ³n de trabajo"
+#: admin/systems/class_terminalStartup.inc:91
+msgid "XDMCP"
+msgstr "XDMCP"
 
-#: admin/systems/system-list.xml:103 admin/systems/system-list.xml:250
-#: admin/systems/class_terminalGeneric.inc:81
-#: admin/systems/class_terminalGeneric.inc:86
-#: admin/systems/class_terminalGeneric.inc:87
-#: admin/systems/class_SelectDeviceType.inc:58
-msgid "Terminal"
-msgstr "Terminal"
+#: admin/systems/class_terminalStartup.inc:91
+msgid "LDM"
+msgstr "LDM"
 
-#: admin/systems/system-list.xml:111 admin/systems/class_printGeneric.inc:1005
-#: admin/systems/class_printGeneric.inc:1011
-#: admin/systems/class_printGeneric.inc:1012
-msgid "Printer"
-msgstr "Impresora"
+#: admin/systems/class_terminalStartup.inc:91
+msgid "Shell"
+msgstr "Shell"
 
-#: admin/systems/system-list.xml:119 admin/systems/system-list.xml:274
-#: admin/systems/class_mobilePhoneGeneric.inc:74
-#: admin/systems/phoneSelect/phoneSelect-list.xml:14
-msgid "Phone"
-msgstr "TelÃ©fono"
+#: admin/systems/class_terminalStartup.inc:91
+msgid "Telnet"
+msgstr "Telnet"
 
-#: admin/systems/system-list.xml:127
-#: admin/systems/class_mobilePhoneGeneric.inc:36
-#: admin/systems/class_mobilePhoneGeneric.inc:41
-#: admin/systems/class_mobilePhoneGeneric.inc:42
-#: admin/systems/phoneSelect/phoneSelect-list.xml:22
-msgid "Mobile phone"
-msgstr "TelÃ©fono mÃ³vil"
+#: admin/systems/class_terminalStartup.inc:91
+msgid "Windows RDP"
+msgstr "Windows RDP"
 
-#: admin/systems/system-list.xml:135
-#: admin/systems/class_componentGeneric.inc:36
-msgid "Component"
-msgstr "componente"
+#: admin/systems/class_terminalStartup.inc:95
+msgid "Terminal server"
+msgstr "Servidor de terminal"
 
-#: admin/systems/system-list.xml:143 admin/systems/system-list.xml:298
-msgid "IPMI"
-msgstr ""
+#: admin/systems/system-list.xml:10
+msgid "List of systems"
+msgstr "Lista de sistemas"
 
-#: admin/systems/system-list.xml:169
-#: admin/systems/class_workstationGeneric.inc:154
-#: admin/systems/class_printGeneric.inc:752
-#: admin/systems/class_printGeneric.inc:762
-#: admin/systems/class_printGeneric.inc:781
-#: admin/systems/class_printGeneric.inc:1022
-#: admin/systems/class_componentGeneric.inc:64
-#: admin/systems/class_mobilePhoneGeneric.inc:63
-#: admin/systems/phoneSelect/phoneSelect-list.xml:48
+#: admin/systems/system-list.xml:31
+#: admin/systems/class_workstationGeneric.inc:46
+#: admin/systems/class_printGeneric.inc:60
+#: admin/systems/class_componentGeneric.inc:58
+#: admin/systems/class_mobilePhoneGeneric.inc:60
 #: admin/systems/services/shares/class_serviceShare.inc:52
-#: admin/systems/system-filter.tpl.c:32
-#: admin/systems/phoneSelect/phoneSelect-filter.tpl.c:11
 msgid "Name"
 msgstr "Nombre"
 
-#: admin/systems/system-list.xml:177
-#: admin/systems/phoneSelect/phoneSelect-list.xml:63
+#: admin/systems/system-list.xml:39
 msgid "IP"
 msgstr "IP"
 
-#: admin/systems/system-list.xml:185
+#: admin/systems/system-list.xml:47
 msgid "MAC"
 msgstr "MAC"
 
-#: admin/systems/system-list.xml:193
-#: admin/systems/class_workstationGeneric.inc:160
-#: admin/systems/class_printGeneric.inc:1024
-#: admin/systems/class_componentGeneric.inc:68
-#: admin/systems/class_mobilePhoneGeneric.inc:67
+#: admin/systems/system-list.xml:55
+#: admin/systems/class_workstationGeneric.inc:51
+#: admin/systems/class_printGeneric.inc:64
+#: admin/systems/class_componentGeneric.inc:62
+#: admin/systems/class_mobilePhoneGeneric.inc:64
 #: admin/systems/serverService-list.xml:35
 #: admin/systems/services/shares/class_serviceShare.inc:56
-#: admin/systems/printer.tpl.c:8 admin/systems/printer.tpl.c:17
 msgid "Description"
 msgstr "DescripciÃ³n"
 
-#: admin/systems/system-list.xml:201 admin/systems/class_serverService.inc:57
+#: admin/systems/system-list.xml:63 admin/systems/class_serverService.inc:57
 #: admin/systems/services/terminal/class_serviceTerminal.inc:30
 #: admin/systems/services/cups/class_serviceCUPS.inc:85
 #: admin/systems/services/shares/class_serviceShare.inc:31
@@ -317,378 +235,186 @@ msgstr "DescripciÃ³n"
 msgid "Services"
 msgstr "Servicios"
 
-#: admin/systems/system-list.xml:209
+#: admin/systems/system-list.xml:71
 msgid "Release"
 msgstr "VersiÃ³n"
 
-#: admin/systems/system-list.xml:217 admin/systems/serverService-list.xml:43
-#: admin/systems/phoneSelect/phoneSelect-list.xml:70
+#: admin/systems/system-list.xml:79 admin/systems/serverService-list.xml:43
 msgid "Actions"
 msgstr "Acciones"
 
-#: admin/systems/system-list.xml:228 admin/systems/serverService-list.xml:54
+#: admin/systems/system-list.xml:90 admin/systems/serverService-list.xml:54
 msgid "Create"
 msgstr "Crear"
 
-#: admin/systems/system-list.xml:258
-msgid "winStation"
-msgstr ""
-
-#: admin/systems/system-list.xml:266
-msgid "Network printer"
-msgstr "Impresora de Red"
-
-#: admin/systems/system-list.xml:282
-#: admin/systems/class_componentGeneric.inc:41
-#: admin/systems/class_componentGeneric.inc:42
-msgid "Network device"
-msgstr "Dispositivo de Red"
-
-#: admin/systems/system-list.xml:290
-msgid "Mobile Phone"
-msgstr ""
-
-#: admin/systems/system-list.xml:310
+#: admin/systems/system-list.xml:100
 msgid "Trigger action"
 msgstr "AcciÃ³n disparada"
 
-#: admin/systems/system-list.xml:317
+#: admin/systems/system-list.xml:107
 msgid "Schedule action"
 msgstr "AcciÃ³n programada"
 
-#: admin/systems/system-list.xml:330
-msgid "Activate systems"
-msgstr "Activar sistemas"
-
-#: admin/systems/system-list.xml:337 admin/systems/serverService-list.xml:69
-#: admin/systems/printer.tpl.c:35
+#: admin/systems/system-list.xml:119 admin/systems/serverService-list.xml:69
 msgid "Remove"
 msgstr "Eliminar"
 
-#: admin/systems/system-list.xml:367
-msgid "Create ISO"
-msgstr "Crear ISO"
-
-#: admin/systems/system-list.xml:379
+#: admin/systems/system-list.xml:150
 msgid "Edit system"
 msgstr ""
 
-#: admin/systems/system-list.xml:392
+#: admin/systems/system-list.xml:163
 msgid "Remove system"
 msgstr "Eliminar sistema"
 
-#: admin/systems/class_workstationGeneric.inc:75
-#, php-format
-msgid "Event %s is not available!"
-msgstr ""
-
-#: admin/systems/class_workstationGeneric.inc:78
-msgid "Events are not available!"
-msgstr ""
-
-#: admin/systems/class_workstationGeneric.inc:106
-msgid "(Re)Install"
-msgstr ""
-
-#: admin/systems/class_workstationGeneric.inc:107
-msgid "Software update"
-msgstr "ActualizaciÃ³n software"
-
-#: admin/systems/class_workstationGeneric.inc:115
-msgid "Wake up"
-msgstr "Despertar"
-
-#: admin/systems/class_workstationGeneric.inc:144
-#: admin/systems/class_printGeneric.inc:604
+#: admin/systems/class_workstationGeneric.inc:35
 msgid "workstation"
 msgstr "estaciÃ³n de trabajo"
 
-#: admin/systems/class_workstationGeneric.inc:151
-#: admin/systems/class_componentGeneric.inc:61
-#: admin/systems/class_mobilePhoneGeneric.inc:60
+#: admin/systems/class_workstationGeneric.inc:42
+#: admin/systems/class_printGeneric.inc:56
+#: admin/systems/class_componentGeneric.inc:55
+#: admin/systems/class_mobilePhoneGeneric.inc:56
 msgid "Properties"
 msgstr "Propiedades"
 
-#: admin/systems/class_workstationGeneric.inc:155
+#: admin/systems/class_workstationGeneric.inc:47
 #, php-format
 msgid "The name of the %s"
 msgstr ""
 
-#: admin/systems/class_workstationGeneric.inc:161
+#: admin/systems/class_workstationGeneric.inc:52
 #, php-format
 msgid "A short description of the %s"
 msgstr ""
 
-#: admin/systems/class_workstationGeneric.inc:166
-#: admin/systems/class_printGeneric.inc:1025
+#: admin/systems/class_workstationGeneric.inc:56
 msgid "Location"
 msgstr "LocalizaciÃ³n"
 
-#: admin/systems/class_workstationGeneric.inc:167
+#: admin/systems/class_workstationGeneric.inc:57
 #, php-format
 msgid "The location of the %s"
 msgstr ""
 
-#: admin/systems/class_workstationGeneric.inc:173
+#: admin/systems/class_workstationGeneric.inc:61
 #, php-format
 msgid "Lock this %s"
 msgstr ""
 
-#: admin/systems/class_workstationGeneric.inc:174
+#: admin/systems/class_workstationGeneric.inc:62
 #, php-format
 msgid "This will prevent the %s from being reinstalled"
 msgstr ""
 
-#: admin/systems/class_workstationGeneric.inc:185
-#: addons/dashboard/class_dashBoardSystems.inc:48
-msgid "Servers"
-msgstr "Servidores"
-
-#: admin/systems/class_workstationGeneric.inc:190
-#, php-format
-msgid "The syslog server the %s should be using"
+#: admin/systems/class_workstationGeneric.inc:73
+#: admin/systems/class_printGeneric.inc:83
+#: admin/systems/class_componentGeneric.inc:69
+#: admin/systems/class_mobilePhoneGeneric.inc:102
+#: admin/systems/class_networkSettings.inc:1008
+msgid "Network settings"
 msgstr ""
 
-#: admin/systems/class_workstationGeneric.inc:195
-msgid "Inherit NTP servers"
-msgstr ""
+#: admin/systems/class_workstationGeneric.inc:78
+#: admin/systems/class_printGeneric.inc:87
+#: admin/systems/class_componentGeneric.inc:73
+#: admin/systems/class_mobilePhoneGeneric.inc:106
+#: admin/systems/class_networkSettings.inc:630
+#: admin/systems/class_networkSettings.inc:643
+#: admin/systems/class_networkSettings.inc:645
+#: admin/systems/class_networkSettings.inc:1014
+msgid "IP address"
+msgstr "DirecciÃ³n IP"
 
-#: admin/systems/class_workstationGeneric.inc:196
-msgid "Inherit time server attributes from ogroup"
+#: admin/systems/class_workstationGeneric.inc:78
+msgid "IP addresses this system uses (v4 or v6)"
 msgstr ""
 
-#: admin/systems/class_workstationGeneric.inc:202
-msgid "NTP servers"
+#: admin/systems/class_workstationGeneric.inc:83
+#: admin/systems/class_printGeneric.inc:91
+#: admin/systems/class_componentGeneric.inc:77
+#: admin/systems/class_mobilePhoneGeneric.inc:110
+msgid "Mac address"
 msgstr ""
 
-#: admin/systems/class_workstationGeneric.inc:203
-#, php-format
-msgid "The NTP servers for the %s"
+#: admin/systems/class_workstationGeneric.inc:83
+#: admin/systems/class_printGeneric.inc:91
+#: admin/systems/class_componentGeneric.inc:77
+#: admin/systems/class_mobilePhoneGeneric.inc:110
+msgid "Mac address of this system"
 msgstr ""
 
-#: admin/systems/class_workstationGeneric.inc:209
-msgid "Inherit LDAP servers"
-msgstr ""
+#: admin/systems/class_workstationGeneric.inc:125
+#: admin/systems/class_workstationGeneric.inc:130
+#: admin/systems/class_workstationGeneric.inc:131
+msgid "Workstation"
+msgstr "EstaciÃ³n de trabajo"
 
-#: admin/systems/class_workstationGeneric.inc:210
-msgid "Inherit LDAP server attributes from ogroup"
+#: admin/systems/class_workstationGeneric.inc:126
+msgid "Workstation information"
 msgstr ""
 
-#: admin/systems/class_workstationGeneric.inc:216
-msgid "LDAP servers"
-msgstr ""
+#: admin/systems/class_printGeneric.inc:32
+#: admin/systems/class_printGeneric.inc:37
+#: admin/systems/class_printGeneric.inc:38
+msgid "Printer"
+msgstr "Impresora"
 
-#: admin/systems/class_workstationGeneric.inc:217
-#, php-format
-msgid "The LDAP servers for the %s"
+#: admin/systems/class_printGeneric.inc:33
+msgid "Printer information"
 msgstr ""
 
-#: admin/systems/class_workstationGeneric.inc:225
-#: admin/systems/class_workstationGeneric.inc:229
-#: admin/ogroups/goto/termgroup.tpl.c:41
-msgid "Action"
-msgstr "AcciÃ³n"
-
-#: admin/systems/class_workstationGeneric.inc:230
-#: admin/ogroups/goto/termgroup.tpl.c:44
-msgid "Select action to execute for this terminal"
-msgstr "Seleccione una acciÃ³n que se ejecutara en este terminal"
-
-#: admin/systems/class_workstationGeneric.inc:236
-#: admin/systems/class_componentGeneric.inc:75
-#: admin/systems/class_mobilePhoneGeneric.inc:106
-#: admin/systems/class_networkSettings.inc:1016
-msgid "Network settings"
+#: admin/systems/class_printGeneric.inc:60
+msgid "The name of the printer"
 msgstr ""
 
-#: admin/systems/class_workstationGeneric.inc:459
-msgid "Workstation information"
+#: admin/systems/class_printGeneric.inc:64
+msgid "A short description of the printer"
 msgstr ""
 
-#: admin/systems/class_printGeneric.inc:131
-#: admin/systems/class_printGeneric.inc:1065
-#: admin/systems/class_systemManagement.inc:678
-msgid "Internal error"
-msgstr "error interno"
-
-#: admin/systems/class_printGeneric.inc:131
-#, php-format
-msgid ""
-"Cannot determine a valid department for this object. Setting base to '%s'!"
-msgstr "No puedo determinar un departamento vÃ¡lido para este objeto, Â¡le sera puesta la base a '%s'!"
-
-#: admin/systems/class_printGeneric.inc:311
-#: admin/systems/class_printGeneric.inc:319
-#: admin/systems/class_printGeneric.inc:324
-#: admin/systems/class_printGeneric.inc:374
-#: admin/systems/class_printGeneric.inc:390
-#: admin/systems/class_printGeneric.inc:393
-msgid "Add printer extension"
-msgstr "AÃ±adir extensiÃ³n de impresora"
-
-#: admin/systems/class_printGeneric.inc:312
-msgid ""
-"Could not initialize printer tab, parameter parent was missing while "
-"construction."
-msgstr "No se puede activar la pestaÃ±a de impresora, el origen de los parametros desapareciÃ³ cuando se estaba construyendo."
-
-#: admin/systems/class_printGeneric.inc:320
-msgid "This is a workstation template, printer tab is disabled."
-msgstr "Esto es una plantilla de estaciÃ³n de trabajo, la pestaÃ±a de impresiÃ³n estÃ¡ desactivada."
-
-#: admin/systems/class_printGeneric.inc:325
-msgid "This is a terminal template, printer tab is disabled."
-msgstr "Esto es una plantilla de termina, la pestaÃ±a de impresiÃ³n estÃ¡ desactivada."
-
-#: admin/systems/class_printGeneric.inc:367
-#: admin/systems/class_printGeneric.inc:375
-#: admin/systems/class_printGeneric.inc:383
-#: admin/systems/class_printGeneric.inc:386
-#: admin/systems/class_printGeneric.inc:391
-#: admin/systems/class_printGeneric.inc:394
-msgid "printer"
-msgstr "impresora"
-
-#: admin/systems/class_printGeneric.inc:375
-msgid ""
-"You can't enable it while 'cn' is not present in entry. Possibly you are "
-"currently creating a new terminal template."
-msgstr "No puede activarla mientras un 'cn' no este presente en la entrada. Posiblemente esto ocurra porque actualmente estÃ¡ creando una nueva plantilla de terminal."
-
-#: admin/systems/class_printGeneric.inc:382
-#: admin/systems/class_printGeneric.inc:385
-msgid "Remove printer extension"
-msgstr "Eliminar extensiÃ³n de impresora"
-
-#: admin/systems/class_printGeneric.inc:474
-#: admin/systems/class_printGeneric.inc:652
-#: admin/systems/class_printGeneric.inc:659
-#: admin/systems/class_printGeneric.inc:718
-#: admin/systems/class_printGeneric.inc:1105
-#: admin/systems/class_printGeneric.inc:1116
-#: admin/systems/class_serverService.inc:224
-#: admin/systems/class_serverService.inc:270
-#: admin/systems/class_serverService.inc:393
-#: admin/systems/class_systemManagement.inc:341
-#: admin/systems/class_systemManagement.inc:624
-#: admin/systems/class_systemManagement.inc:639
-#: admin/systems/services/shares/class_serviceShare.inc:103
-#: admin/systems/class_networkSettings.inc:305
-#: admin/systems/class_networkSettings.inc:336
-#: admin/systems/class_networkSettings.inc:584
-#: admin/systems/class_networkSettings.inc:591
-#: admin/systems/class_networkSettings.inc:597
-#: admin/systems/class_networkSettings.inc:604
-msgid "Error"
-msgstr "Error"
-
-#: admin/systems/class_printGeneric.inc:577
-#, php-format
-msgid "Your currently selected PPD file '%s' doesn't exist."
-msgstr "El archivo PPD seleccionado '%s' no existe."
-
-#: admin/systems/class_printGeneric.inc:583
-msgid "Not defined"
-msgstr "No definido"
-
-#: admin/systems/class_printGeneric.inc:587
-#: admin/systems/ppd/class_printerPPDDialog.inc:116
-msgid "Can't get ppd informations."
-msgstr "No se puede acceder a la informaciÃ³n PPD"
-
-#: admin/systems/class_printGeneric.inc:602
-#: admin/systems/class_printGeneric.inc:604
-#, php-format
-msgid "This printer belongs to %s. You can't rename this printer."
-msgstr "Esta impresora pertenece a %s. No puede renombrar esta impresora."
+#: admin/systems/class_printGeneric.inc:70
+msgid "Details"
+msgstr "Detalles"
 
-#: admin/systems/class_printGeneric.inc:602
-#: admin/systems/class_terminalGeneric.inc:34
-msgid "terminal"
-msgstr "terminal"
+#: admin/systems/class_printGeneric.inc:73
+msgid "Printer location"
+msgstr "LocalizaciÃ³n de la impresora"
 
-#: admin/systems/class_printGeneric.inc:652
-#: admin/systems/class_printGeneric.inc:659
-msgid "Object is no printer!"
-msgstr "Â¡El objeto no es una impresora!"
+#: admin/systems/class_printGeneric.inc:73
+msgid "The location of the printer"
+msgstr ""
 
-#: admin/systems/class_printGeneric.inc:767 admin/systems/printer.tpl.c:23
+#: admin/systems/class_printGeneric.inc:77
 msgid "Printer URL"
 msgstr "URL de la impresora"
 
-#: admin/systems/class_printGeneric.inc:989
-#: admin/systems/class_printGeneric.inc:991
-msgid "Group"
-msgstr "Grupo"
-
-#: admin/systems/class_printGeneric.inc:994
-msgid "User"
-msgstr "Usuario"
-
-#: admin/systems/class_printGeneric.inc:1006
-msgid "Printer information"
+#: admin/systems/class_printGeneric.inc:77
+msgid "The URL of the printer"
 msgstr ""
 
-#: admin/systems/class_printGeneric.inc:1023
-#: admin/systems/serverService-list.tpl.c:2
-#: admin/systems/phoneSelect/phoneSelect-list.tpl.c:2
-#: admin/systems/printer.tpl.c:11
-msgid "Base"
-msgstr "Base"
-
-#: admin/systems/class_printGeneric.inc:1026
-msgid "LabeledURL"
-msgstr "LabeledURL"
-
-#: admin/systems/class_printGeneric.inc:1027
-msgid "Printer PPD"
-msgstr "Impresora PPD"
-
-#: admin/systems/class_printGeneric.inc:1028 admin/systems/printer.tpl.c:38
-msgid "Permissions"
-msgstr "Permisos"
-
-#: admin/systems/class_printGeneric.inc:1030
-msgid "Windows inf file"
-msgstr ""
-
-#: admin/systems/class_printGeneric.inc:1031
-msgid "Windows driver dir"
-msgstr ""
-
-#: admin/systems/class_printGeneric.inc:1032 admin/systems/printer.tpl.c:62
-msgid "Driver printer name"
+#: admin/systems/class_printGeneric.inc:87
+#: admin/systems/class_componentGeneric.inc:73
+#: admin/systems/class_mobilePhoneGeneric.inc:106
+msgid "IP address this system uses"
 msgstr ""
 
-#: admin/systems/class_printGeneric.inc:1048
-#: admin/systems/class_printGeneric.inc:1070
-msgid "Permission error"
-msgstr "Error de permisos"
-
-#: admin/systems/class_printGeneric.inc:1048
-#: admin/systems/class_printGeneric.inc:1070
-msgid "printer user"
-msgstr "usuario de impresora"
-
-#: admin/systems/class_printGeneric.inc:1065
-#, php-format
-msgid "Illegal member type '%s'!"
-msgstr "Â¡tipo de miembro ilegal '%s'!"
-
-#: admin/systems/class_printGeneric.inc:1105
-#, php-format
-msgid "'%s' is already used!"
-msgstr "Â¡'%s' ya esta siendo usado!"
-
-#: admin/systems/class_printGeneric.inc:1116
-#, php-format
-msgid "'%s' does not exist!"
-msgstr "Â¡'%s' no existe!"
-
 #: admin/systems/class_serverService.inc:58
 msgid "Server services"
 msgstr ""
 
+#: admin/systems/class_serverService.inc:224
+#: admin/systems/class_serverService.inc:270
+#: admin/systems/class_serverService.inc:393
+#: admin/systems/services/shares/class_serviceShare.inc:103
+#: admin/systems/class_networkSettings.inc:297
+#: admin/systems/class_networkSettings.inc:328
+#: admin/systems/class_networkSettings.inc:576
+#: admin/systems/class_networkSettings.inc:583
+#: admin/systems/class_networkSettings.inc:589
+#: admin/systems/class_networkSettings.inc:596
+msgid "Error"
+msgstr "Error"
+
 #: admin/systems/class_serverService.inc:332
 msgid "Filter error"
 msgstr "Error del filtro"
@@ -712,217 +438,20 @@ 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:42
-#, php-format
-msgid "The root server the terminal should be using"
-msgstr ""
+#: admin/systems/class_terminalGeneric.inc:31
+msgid "terminal"
+msgstr "terminal"
 
+#: admin/systems/class_terminalGeneric.inc:43
 #: admin/systems/class_terminalGeneric.inc:48
-#, php-format
-msgid "The swap server the terminal should be using"
-msgstr ""
-
-#: admin/systems/class_terminalGeneric.inc:54
-msgid "Remote desktop"
-msgstr "Escritorio remoto"
-
-#: admin/systems/class_terminalGeneric.inc:58
-msgid "Connect method"
-msgstr "MÃ©todo de conexiÃ³n"
-
-#: admin/systems/class_terminalGeneric.inc:62
-msgid "XDMCP"
-msgstr "XDMCP"
-
-#: admin/systems/class_terminalGeneric.inc:62
-msgid "LDM"
-msgstr "LDM"
-
-#: admin/systems/class_terminalGeneric.inc:62
-msgid "Shell"
-msgstr "Shell"
-
-#: admin/systems/class_terminalGeneric.inc:62
-msgid "Telnet"
-msgstr "Telnet"
-
-#: admin/systems/class_terminalGeneric.inc:62
-msgid "Windows RDP"
-msgstr "Windows RDP"
-
-#: admin/systems/class_terminalGeneric.inc:66
-msgid "Terminal server"
-msgstr "Servidor de terminal"
+#: admin/systems/class_terminalGeneric.inc:49
+msgid "Terminal"
+msgstr "Terminal"
 
-#: admin/systems/class_terminalGeneric.inc:82
+#: admin/systems/class_terminalGeneric.inc:44
 msgid "Terminal information"
 msgstr ""
 
-#: admin/systems/ppd/class_printerPPDSelectionDialog.inc:91
-#: admin/systems/ppd/class_printerPPDSelectionDialog.inc:116
-#: admin/systems/ppd/class_printerPPDSelectionDialog.inc:139
-#: admin/systems/ppd/class_printerPPDDialog.inc:92
-#: admin/systems/ppd/class_printerPPDDialog.inc:160
-#: admin/systems/ppd/class_printerPPDDialog.inc:241
-#: admin/systems/ppd/class_printerPPDDialog.inc:256
-#: admin/systems/ppd/class_printerPPDDialog.inc:269
-#: admin/systems/ppd/class_printerPPDDialog.inc:297
-#: admin/systems/ppd/class_printerPPDDialog.inc:314
-#: admin/systems/ppd/class_printerPPDDialog.inc:337
-#: admin/systems/ppd/class_printerPPDDialog.inc:351
-#: admin/systems/ppd/class_printerPPDDialog.inc:361
-#: admin/systems/ppd/class_printerPPDDialog.inc:365
-#: admin/systems/ppd/class_printerPPDDialog.inc:560
-#: admin/systems/ppd/class_printerPPDDialog.inc:577
-#: admin/systems/ppd/class_printerPPDDialog.inc:580
-#: admin/systems/ppd/class_printerPPDDialog.inc:583
-msgid "PPD error"
-msgstr "Error PPD"
-
-#: admin/systems/ppd/class_printerPPDSelectionDialog.inc:139
-#, php-format
-msgid "Cannot locate vendor '%s' in available PPDs!"
-msgstr "Â¡No puedo localizar el fabricante '%s' en los PPDs disponibles!"
-
-#: admin/systems/ppd/class_printerPPDSelectionDialog.inc:148
-msgid "Printer ppd selection."
-msgstr "SelecciÃ³n del ppd de la impresora."
-
-#: admin/systems/ppd/class_printerPPDSelectionDialog.inc:155
-msgid "delete"
-msgstr "eliminar"
-
-#: admin/systems/ppd/class_printerPPDSelectionDialog.inc:166
-msgid "back"
-msgstr "atrÃ¡s"
-
-#: admin/systems/ppd/class_printerPPDDialog.inc:74
-#: admin/systems/ppd/class_printerPPDDialog.inc:140
-#: admin/systems/services/class_goService.inc:241
-msgid "Configuration error"
-msgstr "Error en la configuraciÃ³n"
-
-#: admin/systems/ppd/class_printerPPDDialog.inc:92
-#, php-format
-msgid "Cannot open PPD '%s'!"
-msgstr "Â¡No se puede abrir el archivo PPD '%s'!"
-
-#: admin/systems/ppd/class_printerPPDDialog.inc:141
-#, php-format
-msgid "Cannot open PPD path '%s' for reading and writing!"
-msgstr "Â¡No se puede abrir la ruta archivo PPD '%s' para lectura y escritura!"
-
-#: admin/systems/ppd/class_printerPPDDialog.inc:160
-#: admin/systems/ppd/class_printerPPDDialog.inc:365
-msgid "file is empty"
-msgstr "el archivo estÃ¡ vacÃo"
-
-#: admin/systems/ppd/class_printerPPDDialog.inc:314
-#, php-format
-msgid "Cannot parse PPD '%s'!"
-msgstr "Â¡No se puede analizar el archivo PPD '%s'!"
-
-#: admin/systems/ppd/class_printerPPDDialog.inc:340
-msgid "Overwrite existing PPD"
-msgstr "Sobreescribir PPD existente"
-
-#: admin/systems/ppd/class_printerPPDDialog.inc:341
-msgid ""
-"There is already a ppd file for this kind of printer. Do you want to "
-"overwrite it?"
-msgstr "Ya existe un archivo PPD para ese tipo de impresora.Â¿Quiere sobreescribirlo?"
-
-#: admin/systems/ppd/class_printerPPDDialog.inc:491
-msgid "Section"
-msgstr "SecciÃ³n"
-
-#: admin/systems/ppd/class_printerPPDDialog.inc:551
-#: admin/systems/ppd/class_printerPPDDialog.inc:554
-msgid "True"
-msgstr "Verdadero"
-
-#: admin/systems/ppd/class_printerPPDDialog.inc:552
-#: admin/systems/ppd/class_printerPPDDialog.inc:555
-msgid "False"
-msgstr "Falso"
-
-#: admin/systems/ppd/class_printerPPDDialog.inc:560
-#, php-format
-msgid "PPD type '%s' is not supported!"
-msgstr "Â¡El tipo de PPD '%s' no estÃ¡ soportado!"
-
-#: admin/systems/ppd/class_printerPPDDialog.inc:597
-msgid ""
-"Please select a valid ppd file or use 'Cancel' to go back to printer "
-"configuration."
-msgstr "Por favor seleccione un archivo ppd vÃ¡lido o use 'Cancelar' para volver a la configuraciÃ³n de impresora."
-
-#: admin/systems/ppd/class_ppdManager.inc:44
-#: admin/systems/ppd/class_ppdManager.inc:188
-#: admin/systems/ppd/class_ppdManager.inc:190
-msgid "PPD manager error"
-msgstr "Gestor de errores PPD"
-
-#: admin/systems/ppd/class_ppdManager.inc:44
-#, php-format
-msgid "The specified path '%s' does not exist."
-msgstr "La ruta especificada '%s' no es valida."
-
-#: admin/systems/ppd/class_ppdManager.inc:188
-#, php-format
-msgid "Specified PPD file '%s' cannot be opened for reading."
-msgstr "El archivo ppd indicado '%s' no puede ser abierto para lectura."
-
-#: admin/systems/ppd/class_ppdManager.inc:190
-#, php-format
-msgid "The temporary file '%s' cannot be opened for writing."
-msgstr "El archivo temporal indicado '%s' no puede ser abierto para escritura."
-
-#: admin/systems/ppd/class_ppdManager.inc:212
-#: admin/systems/ppd/class_ppdManager.inc:350
-msgid "Parsing PPD file failed - file is empty!"
-msgstr "El anÃ¡lisis del archivo PPD 's' ha fallado - Â¡el archivo estÃ¡ vacÃo!"
-
-#: admin/systems/ppd/class_ppdManager.inc:222
-#, php-format
-msgid ""
-"Parsing PPD file %s failed - line too long. Trailing characters have been "
-"ignored!"
-msgstr "El anÃ¡lisis del archivo PPD '%s' ha fallado - linea demasiado larga. Â¡Los caracteres sobrantes han sido ignorados!"
-
-#: admin/systems/ppd/class_ppdManager.inc:230
-msgid "Nested groups are not supported!"
-msgstr "Â¡No se soportan grupos anidados!"
-
-#: admin/systems/ppd/class_ppdManager.inc:234
-msgid "Group name not unique!"
-msgstr "Â¡El nombre del grupo no es Ãºnico!"
-
-#: admin/systems/ppd/class_ppdManager.inc:240
-#: admin/systems/ppd/class_ppdManager.inc:270
-msgid "Symbol values are not supported yet!"
-msgstr "Â¡AÃºn no se soportan valores simbÃ³licos!"
-
-#: admin/systems/ppd/class_ppdManager.inc:264
-msgid "Nested options are not supported!"
-msgstr "Â¡No se soporta opciones anidadas!"
-
-#: admin/systems/ppd/class_ppdManager.inc:289
-msgid "PickMany is not supported yet!"
-msgstr "Â¡No se soporta selecciÃ³n mÃºltiple!"
-
-#: admin/systems/ppd/class_ppdManager.inc:370
-#, php-format
-msgid ""
-"Parsing PPD file %s failed - line too long. Trailing characters have been "
-"ignored"
-msgstr "El anÃ¡lisis del archivo PPD '%s' ha fallado - linea demasiado larga. Los caracteres sobrantes han sido ignorados"
-
-#: admin/systems/ppd/class_ppdManager.inc:395
-#, php-format
-msgid "Parsing PPD file %s failed - no information found."
-msgstr "El anÃ¡lisis del archivo PPD '%s' ha fallado - no se ha encontrado informaciÃ³n."
-
 #: admin/systems/class_systemImport.inc:72
 #, php-format
 msgid "Could not parse %s"
@@ -942,83 +471,130 @@ msgstr ""
 msgid "Import"
 msgstr "Importar"
 
+#: admin/systems/class_systemImport.inc:169
+#: admin/systems/class_serverGeneric.inc:43
+#: admin/systems/class_serverGeneric.inc:48
+#: admin/systems/class_serverGeneric.inc:49
+msgid "Server"
+msgstr "Servidor"
+
 #: admin/systems/class_systemImport.inc:169
 msgid "The server you wish to import hosts from"
 msgstr ""
 
-#: admin/systems/class_serverGeneric.inc:34
+#: admin/systems/class_serverGeneric.inc:31
 msgid "server"
 msgstr "Servidor"
 
-#: admin/systems/class_serverGeneric.inc:47
+#: admin/systems/class_serverGeneric.inc:44
 msgid "Server information"
 msgstr ""
 
-#: admin/systems/class_componentGeneric.inc:37
+#: admin/systems/class_componentGeneric.inc:31
+msgid "Component"
+msgstr "componente"
+
+#: admin/systems/class_componentGeneric.inc:32
 msgid "Component information"
 msgstr ""
 
-#: admin/systems/class_componentGeneric.inc:64
+#: admin/systems/class_componentGeneric.inc:36
+#: admin/systems/class_componentGeneric.inc:37
+msgid "Network device"
+msgstr "Dispositivo de Red"
+
+#: admin/systems/class_componentGeneric.inc:58
 msgid "The name of the component"
 msgstr ""
 
-#: admin/systems/class_componentGeneric.inc:68
+#: admin/systems/class_componentGeneric.inc:62
 msgid "A short description of the component"
 msgstr ""
 
+#: admin/systems/class_systemServers.inc:31
+#: admin/systems/class_systemServers.inc:53
+msgid "Servers"
+msgstr "Servidores"
+
+#: admin/systems/class_systemServers.inc:35
+msgid "The syslog server the system should be using"
+msgstr ""
+
+#: admin/systems/class_systemServers.inc:40
+msgid "NTP servers"
+msgstr ""
+
+#: admin/systems/class_systemServers.inc:40
+msgid "The NTP servers for this system"
+msgstr ""
+
+#: admin/systems/class_systemServers.inc:54
+msgid "Servers this system is using"
+msgstr ""
+
+#: admin/systems/class_mobilePhoneGeneric.inc:32
 #: admin/systems/class_mobilePhoneGeneric.inc:37
+#: admin/systems/class_mobilePhoneGeneric.inc:38
+msgid "Mobile phone"
+msgstr "TelÃ©fono mÃ³vil"
+
+#: admin/systems/class_mobilePhoneGeneric.inc:33
 msgid "Mobile phone information"
 msgstr ""
 
-#: admin/systems/class_mobilePhoneGeneric.inc:63
+#: admin/systems/class_mobilePhoneGeneric.inc:60
 msgid "The name of the mobile phone"
 msgstr ""
 
-#: admin/systems/class_mobilePhoneGeneric.inc:67
+#: admin/systems/class_mobilePhoneGeneric.inc:64
 msgid "A short description of the mobile phone"
 msgstr ""
 
-#: admin/systems/class_mobilePhoneGeneric.inc:77
+#: admin/systems/class_mobilePhoneGeneric.inc:70
+msgid "Phone"
+msgstr "TelÃ©fono"
+
+#: admin/systems/class_mobilePhoneGeneric.inc:73
 msgid "Serial Number"
 msgstr ""
 
-#: admin/systems/class_mobilePhoneGeneric.inc:77
+#: admin/systems/class_mobilePhoneGeneric.inc:73
 msgid "The serial number of the mobile phone"
 msgstr ""
 
-#: admin/systems/class_mobilePhoneGeneric.inc:81
+#: admin/systems/class_mobilePhoneGeneric.inc:77
 msgid "IMEI Number"
 msgstr ""
 
-#: admin/systems/class_mobilePhoneGeneric.inc:81
+#: admin/systems/class_mobilePhoneGeneric.inc:77
 msgid "The IMEI number of the mobile phone"
 msgstr ""
 
-#: admin/systems/class_mobilePhoneGeneric.inc:86
+#: admin/systems/class_mobilePhoneGeneric.inc:82
 msgid "OS"
 msgstr ""
 
-#: admin/systems/class_mobilePhoneGeneric.inc:86
+#: admin/systems/class_mobilePhoneGeneric.inc:82
 msgid "The Operating System installed on this phone"
 msgstr ""
 
-#: admin/systems/class_mobilePhoneGeneric.inc:92
+#: admin/systems/class_mobilePhoneGeneric.inc:88
 msgid "SimCard"
 msgstr ""
 
-#: admin/systems/class_mobilePhoneGeneric.inc:95
+#: admin/systems/class_mobilePhoneGeneric.inc:91
 msgid "Telephone Number"
 msgstr ""
 
-#: admin/systems/class_mobilePhoneGeneric.inc:95
+#: admin/systems/class_mobilePhoneGeneric.inc:91
 msgid "The telephone number of the mobile phone"
 msgstr ""
 
-#: admin/systems/class_mobilePhoneGeneric.inc:99
+#: admin/systems/class_mobilePhoneGeneric.inc:95
 msgid "PUK Number"
 msgstr ""
 
-#: admin/systems/class_mobilePhoneGeneric.inc:99
+#: admin/systems/class_mobilePhoneGeneric.inc:95
 msgid "The PUK number of the simcard in this mobile phone"
 msgstr ""
 
@@ -1061,70 +637,20 @@ msgstr "Editar servicio"
 msgid "Remove service"
 msgstr "Eliminar servicio"
 
-#: admin/systems/phoneSelect/phoneSelect-list.xml:10
-msgid "Please select the desired entries"
-msgstr "Por favor seleccione las entradas que desee"
-
-#: admin/systems/phoneSelect/phoneSelect-list.xml:56
-msgid "Number"
-msgstr "NÃºmero"
-
-#: admin/systems/phoneSelect/phoneSelect-list.xml:83
-msgid "Select this number"
-msgstr ""
-
-#: admin/systems/class_systemManagement.inc:177
-msgid "Back"
-msgstr "AtrÃ¡s"
-
-#: admin/systems/class_systemManagement.inc:223
-msgid "Creating the image failed. Please see the report below."
-msgstr "Ha fallado la creaciÃ³n de la imagen. Por favor compruebe el problema en el siguiente informe."
-
-#: admin/systems/class_systemManagement.inc:228
-#, php-format
-msgid "Command '%s', specified for ISO creation doesn't seem to exist."
-msgstr "No parece existir el comando '%s', especificado para la creaciÃ³n de imÃ¡genes ISO."
-
-#: admin/systems/class_systemManagement.inc:398
-#: admin/systems/class_systemManagement.inc:473
-#: admin/systems/class_systemManagement.inc:858
-#: admin/systems/class_systemManagement.inc:905
-#: admin/systems/class_systemManagement.inc:926
-msgid "Permission"
-msgstr "Permisos"
-
-#: admin/systems/class_systemManagement.inc:678
-msgid "Cannot set mode to 'active'!"
-msgstr "Â¡No se puede poner el modo a 'activo'!"
-
-#: admin/systems/class_systemManagement.inc:858
-#, 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:905
-#: admin/systems/class_systemManagement.inc:926
-#, 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:1169
-#, php-format
-msgid "Inherited from %s"
-msgstr "Heredado de %s"
-
-#: admin/systems/class_systemManagement.inc:1224
-#: admin/systems/class_systemManagement.inc:1228
-#: addons/dashboard/class_dashBoardSystems.inc:199
+#: admin/systems/class_systemManagement.inc:48
 #: config/systems/class_systemsPluginConfig.inc:28
 msgid "Systems"
 msgstr "Sistemas"
 
-#: admin/systems/class_systemManagement.inc:1225
+#: admin/systems/class_systemManagement.inc:49
 msgid "Systems Management"
 msgstr ""
 
+#: admin/systems/class_systemManagement.inc:250
+#, php-format
+msgid "Inherited from %s"
+msgstr "Heredado de %s"
+
 #: admin/systems/services/terminal/class_serviceTerminal.inc:29
 #: admin/systems/services/terminal/class_serviceTerminal.inc:30
 #: admin/systems/services/terminal/class_serviceTerminal.inc:41
@@ -1162,6 +688,10 @@ msgstr "Cups"
 msgid "Empty service"
 msgstr "Servicio nulo"
 
+#: admin/systems/services/class_goService.inc:241
+msgid "Configuration error"
+msgstr "Error en la configuraciÃ³n"
+
 #: admin/systems/services/shares/class_serviceShare.inc:30
 #: admin/systems/services/shares/class_serviceShare.inc:31
 msgid "Share service"
@@ -1220,8 +750,6 @@ msgid "You need to configure encodings first"
 msgstr ""
 
 #: admin/systems/services/shares/class_serviceShare.inc:110
-#: admin/ogroups/goto/termgroup.tpl.c:2 admin/systems/remove.tpl.c:2
-#: admin/systems/ppd/remove_ppd.tpl.c:2
 msgid "Warning"
 msgstr "Aviso"
 
@@ -1347,153 +875,93 @@ msgstr ""
 msgid "LDAP"
 msgstr "LDAP"
 
-#: admin/systems/class_networkSettings.inc:305
+#: admin/systems/class_networkSettings.inc:297
 msgid "NOT IMPLEMENTED"
 msgstr ""
 
-#: admin/systems/class_networkSettings.inc:437
+#: admin/systems/class_networkSettings.inc:429
 msgid "Not matching"
 msgstr "No mostrar los coincidentes"
 
-#: admin/systems/class_networkSettings.inc:584
+#: admin/systems/class_networkSettings.inc:576
 #, php-format
 msgid "Was not able to contact argonaut server: %s"
 msgstr ""
 
-#: admin/systems/class_networkSettings.inc:591
+#: admin/systems/class_networkSettings.inc:583
 #, php-format
 msgid "Was not able to find DNS server for zone %s"
 msgstr ""
 
-#: admin/systems/class_networkSettings.inc:597
+#: admin/systems/class_networkSettings.inc:589
 #, php-format
 msgid "Was not able to find mac address of DNS server %s"
 msgstr ""
 
-#: admin/systems/class_networkSettings.inc:604
+#: admin/systems/class_networkSettings.inc:596
 #, php-format
 msgid "Was not able to launch ldap2zone: %s"
 msgstr ""
 
-#: admin/systems/class_networkSettings.inc:630
+#: admin/systems/class_networkSettings.inc:622
 #, php-format
 msgid "IP address %s"
 msgstr "DirecciÃ³n IP %s"
 
-#: admin/systems/class_networkSettings.inc:638
-#: admin/systems/class_networkSettings.inc:651
-#: admin/systems/class_networkSettings.inc:653
-#: admin/systems/class_networkSettings.inc:1022
-msgid "IP address"
-msgstr "DirecciÃ³n IP"
-
-#: admin/systems/class_networkSettings.inc:644
-#: admin/systems/class_networkSettings.inc:660
-#: admin/systems/class_networkSettings.inc:662
-#: admin/systems/class_networkSettings.inc:1023
+#: admin/systems/class_networkSettings.inc:636
+#: admin/systems/class_networkSettings.inc:652
+#: admin/systems/class_networkSettings.inc:654
+#: admin/systems/class_networkSettings.inc:1015
 msgid "MAC address"
 msgstr "DirecciÃ³n MAC"
 
-#: admin/systems/class_networkSettings.inc:676
+#: admin/systems/class_networkSettings.inc:668
 #, php-format
 msgid "The IP address '%s' is not part of the selected reverse zone '%s'!"
 msgstr "Â¡La direcciÃ³n IP '%s' no estÃ¡ dentro de la zona inversa seleccionada '%s'!"
 
-#: admin/systems/class_networkSettings.inc:686
+#: admin/systems/class_networkSettings.inc:678
 #, php-format
 msgid "Record type '%s' is duplicated!"
 msgstr "Â¡El tipo de registro '%s' estÃ¡ duplicado!"
 
-#: admin/systems/class_networkSettings.inc:693
+#: admin/systems/class_networkSettings.inc:685
 #, php-format
 msgid "Uniq record type '%s' is duplicated!"
 msgstr "Â¡El tipo de registro Ãºnico '%s' estÃ¡ duplicado!"
 
-#: admin/systems/class_networkSettings.inc:705
+#: admin/systems/class_networkSettings.inc:697
 #, php-format
 msgid ""
 "The IP address '%s' will be added as 'A Record', this will be done "
 "automatically, please remove the record."
 msgstr "La direcciÃ³n IP '%s' se aÃ±adira como 'Registro A', esto se harÃ¡ automÃ¡ticamente, por favor elimine el registro."
 
-#: admin/systems/class_networkSettings.inc:712
+#: admin/systems/class_networkSettings.inc:704
 #, php-format
 msgid "Only lowercase records are allowed, please check your '%ss'."
 msgstr "Solo estÃ¡n permitidas minÃºsculas, por favor compruebe su '%ss'."
 
-#: admin/systems/class_networkSettings.inc:978
+#: admin/systems/class_networkSettings.inc:970
 msgid "Delete"
 msgstr "Eliminar"
 
-#: admin/systems/class_networkSettings.inc:984
+#: admin/systems/class_networkSettings.inc:976
 msgid "Add"
 msgstr "AÃ±adir"
 
-#: admin/systems/class_networkSettings.inc:1015
-#: addons/dashboard/class_dashBoardNetwork.inc:127
+#: admin/systems/class_networkSettings.inc:1007
 msgid "Network"
 msgstr ""
 
-#: admin/systems/class_networkSettings.inc:1030
+#: admin/systems/class_networkSettings.inc:1022
 msgid "DNS configuration"
 msgstr "ConfiguraciÃ³n DNS"
 
-#: admin/systems/class_networkSettings.inc:1033
+#: admin/systems/class_networkSettings.inc:1025
 msgid "DHCP configuration"
 msgstr "ConfiguraciÃ³n DHCP"
 
-#: addons/dashboard/class_dashBoardSystems.inc:45
-msgid "Workstations"
-msgstr ""
-
-#: addons/dashboard/class_dashBoardSystems.inc:51
-msgid "Windows Workstations"
-msgstr ""
-
-#: addons/dashboard/class_dashBoardSystems.inc:54
-msgid "Terminals"
-msgstr ""
-
-#: addons/dashboard/class_dashBoardSystems.inc:57
-msgid "Printers"
-msgstr ""
-
-#: addons/dashboard/class_dashBoardSystems.inc:60
-msgid "Phones"
-msgstr ""
-
-#: addons/dashboard/class_dashBoardSystems.inc:63
-msgid "Components"
-msgstr ""
-
-#: addons/dashboard/class_dashBoardSystems.inc:66
-msgid "Mobile phones"
-msgstr ""
-
-#: addons/dashboard/class_dashBoardSystems.inc:183
-msgid "Statistics"
-msgstr ""
-
-#: addons/dashboard/class_dashBoardSystems.inc:188
-msgid "Computer name to use by unit"
-msgstr ""
-
-#: addons/dashboard/class_dashBoardSystems.inc:200
-msgid "Statistics and informations about systems"
-msgstr ""
-
-#: addons/dashboard/class_dashBoardNetwork.inc:111
-msgid "DHCP"
-msgstr "DHCP"
-
-#: addons/dashboard/class_dashBoardNetwork.inc:116
-msgid "DNS"
-msgstr "DNS"
-
-#: addons/dashboard/class_dashBoardNetwork.inc:128
-msgid "Statistics and various informations"
-msgstr ""
-
 #: config/systems/class_systemsPluginConfig.inc:29
 msgid "Systems plugin configuration"
 msgstr ""
@@ -1585,404 +1053,3 @@ msgstr ""
 #: config/systems/class_systemsPluginConfig.inc:101
 msgid "Encodings"
 msgstr ""
-
-#: admin/ogroups/goto/termgroup.tpl.c:5
-msgid ""
-"Actions you choose here influence all systems in this object group. "
-"Additionally, all values editable here can be inherited by the clients "
-"assigned to this object group."
-msgstr "Las acciones aquÃ seleccionadas tendrÃ¡n influencia en todos los sistemas en este grupo de objetos. AdemÃ¡s, todos los valores aquÃ editados pueden ser heredados por los clientes asignados a este grupo de objetos."
-
-#: admin/ogroups/goto/termgroup.tpl.c:8
-msgid "Generic"
-msgstr "GenÃ©rico"
-
-#: admin/ogroups/goto/termgroup.tpl.c:11
-msgid "NTP server"
-msgstr "Servidor NTP"
-
-#: admin/ogroups/goto/termgroup.tpl.c:14
-msgid "Choose server to use for synchronizing time"
-msgstr "Elija un servidor que serÃ¡ usado para sincronizaciÃ³n horaria"
-
-#: admin/ogroups/goto/termgroup.tpl.c:20
-msgid "Select terminal mode"
-msgstr "Seleccionar modo de terminal"
-
-#: admin/ogroups/goto/termgroup.tpl.c:26
-msgid "Choose server to use for logging"
-msgstr "Elija un servidor que serÃ¡ usado para registro"
-
-#: admin/ogroups/goto/termgroup.tpl.c:32
-msgid "Select NFS root filesystem to use"
-msgstr "Seleccione sistema de archivos raÃz 'NFS' que se usarÃ¡"
-
-#: admin/ogroups/goto/termgroup.tpl.c:38
-msgid "Choose NFS filesystem to place swap files on"
-msgstr "Seleccione sistema de archivos 'NFS' donde estarÃ¡n los archivos de intercambio"
-
-#: admin/ogroups/goto/termgroup.tpl.c:47
-msgid "Execute"
-msgstr "Ejecute"
-
-#: 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 admin/systems/network.tpl.c:11
-msgid "Propose ip"
-msgstr "Proponer ip"
-
-#: admin/systems/network.tpl.c:14
-msgid "MAC-address"
-msgstr "DirecciÃ³n MAC"
-
-#: admin/systems/network.tpl.c:17
-msgid "Autodetect"
-msgstr "AutodetecciÃ³n"
-
-#: admin/systems/network.tpl.c:20 admin/systems/network.tpl.c:23
-msgid "Enable DHCP for this device"
-msgstr "Activar DHCP para este dispositivo"
-
-#: admin/systems/network.tpl.c:26 admin/systems/network.tpl.c:50
-msgid "not configured"
-msgstr "Sin configurar"
-
-#: admin/systems/network.tpl.c:29
-msgid "Parent node"
-msgstr "Servidor Origen"
-
-#: admin/systems/network.tpl.c:32
-msgid "Edit settings"
-msgstr "Editar caracterÃsticas"
-
-#: admin/systems/network.tpl.c:35 admin/systems/network.tpl.c:47
-msgid "Enable DNS for this device"
-msgstr "Activar DNS para este dispositivo"
-
-#: admin/systems/network.tpl.c:38
-msgid "Zone"
-msgstr "Zona"
-
-#: admin/systems/network.tpl.c:41
-msgid "TTL"
-msgstr "TTL"
-
-#: admin/systems/network.tpl.c:44
-msgid "Dns records"
-msgstr "Registros DNS"
-
-#: admin/systems/password.tpl.c:2
-msgid ""
-"To change the terminal root password use the fields below. The changes take "
-"effect during the next reboot. Please memorize the new password, because you"
-" wouldn't be able to log in."
-msgstr "Para cambiar la contraseÃ±a del administrador del terminal use los campos a continuaciÃ³n. Los cambios tomarÃ¡n efecto en el prÃ³ximo inicio. Por favor, recuerde la nueva contraseÃ±a, porque no podrÃ¡ iniciar sesiÃ³n sin ella."
-
-#: admin/systems/password.tpl.c:5
-msgid "Leave fields blank for password inheritance from default entries."
-msgstr "Si deja los campos en blanco, se heredaran las contraseÃ±as de las entradas predeterminadas."
-
-#: admin/systems/password.tpl.c:8
-msgid "Changing the password impinges on authentification only."
-msgstr "Cambiar la contraseÃ±a solo afecta a la autenticaciÃ³n."
-
-#: admin/systems/password.tpl.c:11
-msgid "New password"
-msgstr "Nueva contraseÃ±a"
-
-#: admin/systems/password.tpl.c:14
-msgid "Repeat new password"
-msgstr "Reintroduzca la contraseÃ±a"
-
-#: admin/systems/password.tpl.c:17
-msgid "Password strength"
-msgstr "Resistencia de la contraseÃ±a"
-
-#: admin/systems/password.tpl.c:20
-msgid "Set password"
-msgstr "Introducir contraseÃ±a"
-
-#: 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/gencd.tpl.c:2
-msgid "CD-Install-Image generation"
-msgstr "GeneraciÃ³n de una imagen de CD de instalaciÃ³n"
-
-#: admin/systems/gencd.tpl.c:5
-msgid ""
-"This option enables you to generate FAI install CD images for the selected "
-"workstation. The procedure may take about 10 minutes to complete, so please "
-"be patient after pressing the 'Create ISO-Image' button."
-msgstr "Esta opciÃ³n le permite generar imÃ¡genes de instalaciÃ³n de CD FAI para la estaciÃ³n de trabajo seleccionada. El procedimiento puede tardar 10 minutos en completarse, porfavor tenga paciencia despues de presionar el botÃ³n 'Crear imagen ISO'."
-
-#: admin/systems/gencd.tpl.c:8
-msgid "Create ISO-Image"
-msgstr "Crear imagen ISO"
-
-#: admin/systems/remove.tpl.c:5
-msgid ""
-"This includes all account data, system access rules, imap settings, etc. for"
-" this user. Please double check if your really want to do this since there "
-"is no way for FusionDirectory to get your data back."
-msgstr "Esto incluye toda la data de la cuenta, las reglas de acceso de sistema, opciones de imap, etc. Para este usuario. Por favor verifique bien si quiere hacer esto ya que no hay forma para que FusionDirectory recupere la data."
-
-#: admin/systems/remove.tpl.c:8
-msgid "So - if you're sure - press 'Delete' to continue or 'Cancel' to abort."
-msgstr "Entonces, si esta seguro, presione <i>Eliminar</i> para continuar o <i>Cancelar</i> para Abortar."
-
-#: admin/systems/system-filter.tpl.c:2
-#: admin/systems/phoneSelect/phoneSelect-filter.tpl.c:2
-msgid "Filter"
-msgstr "Filtro"
-
-#: admin/systems/system-filter.tpl.c:5
-msgid "Show servers"
-msgstr "Mostrar servidores"
-
-#: admin/systems/system-filter.tpl.c:8
-msgid "Show workstations"
-msgstr "Mostrar estaciones de trabajo"
-
-#: admin/systems/system-filter.tpl.c:11
-msgid "Show terminals"
-msgstr "Mostrar terminales"
-
-#: admin/systems/system-filter.tpl.c:14
-msgid "Show network printer"
-msgstr "Mostrar la impresoras de red"
-
-#: admin/systems/system-filter.tpl.c:17
-#: admin/systems/phoneSelect/phoneSelect-filter.tpl.c:5
-msgid "Show phones"
-msgstr "Mostrar telÃ©fonos"
-
-#: admin/systems/system-filter.tpl.c:20
-msgid "Show windows based workstations"
-msgstr "Mostrara estaciones de trabajo basadas en windows"
-
-#: admin/systems/system-filter.tpl.c:23
-msgid "Show network devices"
-msgstr "Mostrar dispositivos de Red"
-
-#: admin/systems/system-filter.tpl.c:26
-#: admin/systems/phoneSelect/phoneSelect-filter.tpl.c:8
-msgid "Show mobile phones"
-msgstr ""
-
-#: admin/systems/system-filter.tpl.c:29
-msgid "Show IPMI interfaces"
-msgstr ""
-
-#: admin/systems/ppd/printerPPDSelectionDialog.tpl.c:2
-msgid "Select objects to add"
-msgstr "Seleccione los objetos a aÃ±adir"
-
-#: admin/systems/ppd/printerPPDSelectionDialog.tpl.c:5
-msgid "Filters"
-msgstr "Filtros"
-
-#: admin/systems/ppd/printerPPDSelectionDialog.tpl.c:8
-msgid "Display objects matching"
-msgstr "Mostrar objetos que coincidan"
-
-#: admin/systems/ppd/printerPPDSelectionDialog.tpl.c:11
-msgid "Regular expression for matching object names"
-msgstr "Expresiones regulares para buscar nombre de objetos"
-
-#: admin/systems/ppd/printerPPDSelectionDialog.tpl.c:14
-msgid "Close"
-msgstr "Cerrar"
-
-#: admin/systems/ppd/printerPPDDialog.tpl.c:2
-msgid "Printer driver"
-msgstr "Controlador de impresora"
-
-#: admin/systems/ppd/printerPPDDialog.tpl.c:5
-msgid "Model"
-msgstr "Modelo"
-
-#: admin/systems/ppd/printerPPDDialog.tpl.c:8
-msgid "Select"
-msgstr "Seleccionar"
-
-#: admin/systems/ppd/printerPPDDialog.tpl.c:11
-msgid "New driver"
-msgstr "Nuevo controlador"
-
-#: admin/systems/ppd/printerPPDDialog.tpl.c:14
-msgid "Upload"
-msgstr "Enviar"
-
-#: admin/systems/ppd/printerPPDDialog.tpl.c:17
-msgid "Options"
-msgstr "Opciones"
-
-#: admin/systems/ppd/remove_ppd.tpl.c:5
-msgid "The ppd file will be removed from the server and can not be restored."
-msgstr "El archivo ppd serÃ¡ eliminado del servidor y no podrÃ¡ ser recuperado."
-
-#: admin/systems/printer.tpl.c:2
-msgid "General"
-msgstr "General"
-
-#: admin/systems/printer.tpl.c:5
-msgid "Printer name"
-msgstr "Nombre de la impresora"
-
-#: admin/systems/printer.tpl.c:14
-msgid "Details"
-msgstr "Detalles"
-
-#: admin/systems/printer.tpl.c:20
-msgid "Printer location"
-msgstr "LocalizaciÃ³n de la impresora"
-
-#: admin/systems/printer.tpl.c:26
-msgid "PPD Provider"
-msgstr "Proveedor PPD"
-
-#: admin/systems/printer.tpl.c:29
-msgid "Driver"
-msgstr "Controlador"
-
-#: admin/systems/printer.tpl.c:32
-msgid "Edit"
-msgstr "Editar"
-
-#: admin/systems/printer.tpl.c:41
-msgid "Users which are allowed to use this printer"
-msgstr "Usuarios que tienen permiso para acceder a esta impresora"
-
-#: admin/systems/printer.tpl.c:44
-msgid "Users"
-msgstr "Usuarios"
-
-#: admin/systems/printer.tpl.c:47
-msgid "Users which are allowed to administrate this printer"
-msgstr "usuarios que tienen permisos para administrar esta impresora"
-
-#: admin/systems/printer.tpl.c:50
-msgid "Admins"
-msgstr "Administradores"
-
-#: admin/systems/printer.tpl.c:53
-msgid "Windows paths"
-msgstr ""
-
-#: admin/systems/printer.tpl.c:56
-msgid "Printer windows inf file"
-msgstr ""
-
-#: admin/systems/printer.tpl.c:59
-msgid "Printer driver directory"
-msgstr ""
-
-#: admin/systems/gencd_frame.tpl.c:2
-msgid "Your browser does not supprt iframes."
-msgstr "Su navegador no soporta iframes."
-
-#: admin/systems/services/cups/serviceCUPS.tpl.c:2
-msgid "Print Service"
-msgstr "Servicio de impresiÃ³n"
-
-#: admin/systems/services/cups/serviceCUPS.tpl.c:5
-msgid "enabled"
-msgstr "activado"
-
-#: admin/systems/services/ServiceAddDialog.tpl.c:2
-msgid "Adding a new service to the current server"
-msgstr "AÃ±adiendo un nuevo servicio al servidor seleccionado"
-
-#: admin/systems/services/ServiceAddDialog.tpl.c:5
-msgid ""
-"This dialog allows you to add new services to the currenty edited server "
-"object. The box below shows all available but not already used services."
-msgstr "Este diÃ¡logo le permite aÃ±adir nuevos servicios al servidor que estÃ¡ configurando. El panel inferior muestra todos los servicios disponibles y que no estÃ¡n siendo usados."
-
-#: admin/systems/services/ServiceAddDialog.tpl.c:8
-msgid "Service to add"
-msgstr "Servicio a aÃ±adir"
-
-#: admin/systems/services/ServiceAddDialog.tpl.c:11
-msgid "All available services are already in use."
-msgstr "Todos los servicios disponibles ya estÃ¡n en uso."
-
-#: admin/systems/services/ServiceAddDialog.tpl.c:14
-#: admin/systems/SelectDeviceType.tpl.c:26
-msgid "Continue"
-msgstr "Continuar"
-
-#: admin/systems/SelectDeviceType.tpl.c:2
-msgid ""
-"This system has no system type configured. Please choose a system type for "
-"this object and an optional inheritance group. Press the 'continue' button "
-"to proceed."
-msgstr "El sistema no tiene tipo de sistema configurado. Por favor elija un tipo de sistema para el objeto y un grupo de herencia opcional. Pulse el botÃ³n 'continuar' para proceder."
-
-#: admin/systems/SelectDeviceType.tpl.c:5
-msgid ""
-"Please select a system type and an optional bundle of predefined settings to"
-" be inherited."
-msgstr "Por favor seleccione un tipo de sistema y un paquete opcional de configuraciones predefinidas para ser heredadas."
-
-#: admin/systems/SelectDeviceType.tpl.c:8
-msgid ""
-"Please select a system type and a bundle of predefined settings to be "
-"inherited."
-msgstr "Por favor seleccione un tipo de sistema y un paquete de configuraciones predefinidas para ser heredadas."
-
-#: admin/systems/SelectDeviceType.tpl.c:11
-#: admin/systems/SelectDeviceType.tpl.c:14
-msgid "System type"
-msgstr "Tipo de sistema"
-
-#: admin/systems/SelectDeviceType.tpl.c:17
-msgid "Choose an object group as template"
-msgstr "Elija un grupo de objetos como plantilla"
-
-#: admin/systems/SelectDeviceType.tpl.c:20
-msgid "Object group"
-msgstr "Grupo de objetos"
-
-#: admin/systems/SelectDeviceType.tpl.c:23
-msgid "none"
-msgstr "ninguno"
-
-#: addons/dashboard/systems_stats.tpl.c:2
-msgid "There are several argonaut servers! (this is not yet supported)"
-msgstr ""
-
-#: addons/dashboard/systems_stats.tpl.c:5
-msgid "There is an argonaut server running on %1 (%3://%2:%4)"
-msgstr ""
-
-#: addons/dashboard/systems_stats.tpl.c:8
-msgid "Only one system is configured to run an argonaut client."
-msgid_plural "%1 systems are configured to run an argonaut client."
-msgstr[0] ""
-msgstr[1] ""
-
-#: addons/dashboard/systems_stats.tpl.c:11
-msgid "But no system is configured to run an argonaut client!"
-msgstr ""
-
-#: addons/dashboard/systems_stats.tpl.c:14
-msgid ""
-"A system is configured to run an argonaut client, but there is no argonaut "
-"server configured!"
-msgid_plural ""
-"%1 systems are configured to run an argonaut client, but there is no "
-"argonaut server configured!"
-msgstr[0] ""
-msgstr[1] ""
diff --git a/systems/locale/es_VE/fusiondirectory.po b/systems/locale/es_VE/fusiondirectory.po
index 57771761519552b9dc99f958b476f3aca106e21f..6c1f21236c75f70b16ae2e0109a0f26b7f9ebc26 100644
--- a/systems/locale/es_VE/fusiondirectory.po
+++ b/systems/locale/es_VE/fusiondirectory.po
@@ -3,17 +3,14 @@
 # This file is distributed under the same license as the PACKAGE package.
 # 
 # Translators:
-#  Alejandro Escanero Blanco <aescanero@gmail.com>, 2008,2010
-# lars_g <lars.gold@gmail.com>, 2012
-# lars_g <lars.gold@gmail.com>, 2012
 msgid ""
 msgstr ""
-"Project-Id-Version: FusionDirectory-108\n"
+"Project-Id-Version: FusionDirectory-109\n"
 "Report-Msgid-Bugs-To: documentation@lists.fusiondirectory.org\n"
-"POT-Creation-Date: 2015-03-31 11:49+0200\n"
-"PO-Revision-Date: 2015-03-31 11:41+0000\n"
+"POT-Creation-Date: 2014-12-15 17:47+0100\n"
+"PO-Revision-Date: 2015-03-31 11:42+0000\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>\n"
-"Language-Team: Spanish (Venezuela) (http://www.transifex.com/projects/p/FusionDirectory-108/language/es_VE/)\n"
+"Language-Team: Spanish (Venezuela) (http://www.transifex.com/projects/p/FusionDirectory-109/language/es_VE/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -29,29 +26,24 @@ msgid "Locked"
 msgstr "Bloqueado"
 
 #: admin/ogroups/goto/class_termgroup.inc:118
-#: admin/systems/class_terminalGeneric.inc:121
+#: admin/systems/class_terminalStartup.inc:145
 msgid "Local swap"
 msgstr "Memoria de intercambio local"
 
 #: admin/ogroups/goto/class_termgroup.inc:124
 #: admin/ogroups/goto/class_termgroup.inc:136
-#: admin/systems/class_workstationGeneric.inc:352
-#: admin/systems/class_terminalGeneric.inc:109
-#: admin/systems/class_terminalGeneric.inc:125
+#: admin/systems/class_terminalStartup.inc:133
+#: admin/systems/class_terminalStartup.inc:149
 msgid "inherited"
 msgstr "heredado"
 
 #: admin/ogroups/goto/class_termgroup.inc:220
-#: admin/systems/class_workstationGeneric.inc:72
-#: admin/systems/class_workstationGeneric.inc:443
-#: admin/systems/class_systemManagement.inc:295
-#: admin/systems/class_systemManagement.inc:325
-msgid "Infrastructure service"
-msgstr ""
+#: admin/systems/class_systemManagement.inc:165
+#: admin/systems/class_systemManagement.inc:186
+msgid "Service infrastructure"
+msgstr "Infraestructura de servicio"
 
 #: admin/ogroups/goto/class_termgroup.inc:224
-#: admin/systems/class_workstationGeneric.inc:75
-#: admin/systems/class_workstationGeneric.inc:78
 msgid "Event error"
 msgstr "Evento de error"
 
@@ -61,12 +53,10 @@ msgid "Event '%s' is not available!"
 msgstr "Â¡El evento '%s' no estÃ¡ disponible!"
 
 #: admin/ogroups/goto/class_termgroup.inc:274
-#: admin/systems/class_workstationGeneric.inc:112
 msgid "Switch off"
 msgstr "Apagar"
 
 #: admin/ogroups/goto/class_termgroup.inc:274
-#: admin/systems/class_workstationGeneric.inc:113
 msgid "Reboot"
 msgstr "Reiniciar"
 
@@ -87,7 +77,6 @@ msgid "Reinstall"
 msgstr "Reinstalar"
 
 #: admin/ogroups/goto/class_termgroup.inc:279
-#: admin/systems/class_workstationGeneric.inc:108
 msgid "Memory test"
 msgstr "Chequeo de memoria"
 
@@ -96,23 +85,20 @@ msgid "System analysis"
 msgstr "AnÃ¡lisis del sistema"
 
 #: admin/ogroups/goto/class_termgroup.inc:386
-#: admin/systems/class_printGeneric.inc:670
-#: admin/systems/class_printGeneric.inc:970
-#: admin/systems/class_systemManagement.inc:816
 #: admin/systems/services/class_goService.inc:123
 #: admin/systems/services/class_goService.inc:151
 #: admin/systems/services/class_goService.inc:187
-#: admin/systems/class_networkSettings.inc:478
-#: admin/systems/class_networkSettings.inc:491
-#: admin/systems/class_networkSettings.inc:757
-#: admin/systems/class_networkSettings.inc:816
-#: admin/systems/class_networkSettings.inc:835
-#: admin/systems/class_networkSettings.inc:852
-#: admin/systems/class_networkSettings.inc:861
-#: admin/systems/class_networkSettings.inc:879
-#: admin/systems/class_networkSettings.inc:951
+#: admin/systems/class_networkSettings.inc:470
+#: admin/systems/class_networkSettings.inc:483
+#: admin/systems/class_networkSettings.inc:749
+#: admin/systems/class_networkSettings.inc:808
+#: admin/systems/class_networkSettings.inc:827
+#: admin/systems/class_networkSettings.inc:844
+#: admin/systems/class_networkSettings.inc:853
+#: admin/systems/class_networkSettings.inc:871
+#: admin/systems/class_networkSettings.inc:943
 msgid "LDAP error"
-msgstr "Error LDAP"
+msgstr "Error de LDAP"
 
 #: admin/ogroups/goto/class_termgroup.inc:394
 msgid "System"
@@ -122,195 +108,125 @@ msgstr "Sistema"
 msgid "System group"
 msgstr "Grupos de sistemas"
 
-#: admin/ogroups/goto/class_termgroup.inc:401
-#: admin/ogroups/goto/termgroup.tpl.c:17
+#: admin/ogroups/goto/class_termgroup.inc:402
 msgid "Mode"
 msgstr "Modo"
 
-#: admin/ogroups/goto/class_termgroup.inc:402
-#: admin/systems/class_workstationGeneric.inc:189
-#: admin/ogroups/goto/termgroup.tpl.c:23
+#: admin/ogroups/goto/class_termgroup.inc:403
+#: admin/systems/class_systemServers.inc:35
 msgid "Syslog server"
 msgstr "Servidor de registro de sistema"
 
-#: admin/ogroups/goto/class_termgroup.inc:403
+#: admin/ogroups/goto/class_termgroup.inc:404
 msgid "Action flag"
 msgstr "Marca de acciÃ³n"
 
-#: admin/ogroups/goto/class_termgroup.inc:404
+#: admin/ogroups/goto/class_termgroup.inc:405
 msgid "Ntp server"
 msgstr "Servidor NTP"
 
-#: admin/ogroups/goto/class_termgroup.inc:405
-#: admin/systems/class_terminalGeneric.inc:41
-#: admin/ogroups/goto/termgroup.tpl.c:29
+#: admin/ogroups/goto/class_termgroup.inc:406
+#: admin/systems/class_terminalStartup.inc:65
 msgid "Root server"
 msgstr "Servidor RaÃz"
 
-#: admin/ogroups/goto/class_termgroup.inc:406
-#: admin/systems/class_terminalGeneric.inc:47
-#: admin/ogroups/goto/termgroup.tpl.c:35
+#: admin/ogroups/goto/class_termgroup.inc:407
+#: admin/systems/class_terminalStartup.inc:69
 msgid "Swap server"
 msgstr "Servidor de Intercambio"
 
-#: admin/systems/class_terminalStartup.inc:63
+#: admin/systems/class_terminalStartup.inc:62
 msgid "Startup parameters"
 msgstr ""
 
-#: admin/systems/class_terminalStartup.inc:66
+#: admin/systems/class_terminalStartup.inc:65
+msgid "The root server the terminal should be using"
+msgstr ""
+
+#: admin/systems/class_terminalStartup.inc:69
+msgid "The swap server the terminal should be using"
+msgstr ""
+
+#: admin/systems/class_terminalStartup.inc:73
 msgid "Boot kernel"
 msgstr "Kernel de inicio"
 
-#: admin/systems/class_terminalStartup.inc:66
+#: admin/systems/class_terminalStartup.inc:73
 msgid "Linux kernel to be installed and booted"
 msgstr ""
 
-#: admin/systems/class_terminalStartup.inc:70
+#: admin/systems/class_terminalStartup.inc:77
 msgid "Boot kernel parameters"
 msgstr ""
 
-#: admin/systems/class_terminalStartup.inc:70
+#: admin/systems/class_terminalStartup.inc:77
 msgid "Linux kernel parameters to be ran"
 msgstr ""
 
-#: admin/systems/class_terminalStartup.inc:82
-msgid "Startup"
-msgstr "Inicio"
-
 #: admin/systems/class_terminalStartup.inc:83
-msgid "Terminal startup"
-msgstr "Inicio de terminal"
-
-#: admin/systems/system-list.xml:10
-msgid "List of systems"
-msgstr "Lista de sistemas"
-
-#: admin/systems/system-list.xml:14
-msgid "New workstation"
-msgstr "Nueva estaciÃ³n de trabajo"
-
-#: admin/systems/system-list.xml:22
-msgid "Locked server"
-msgstr "Servidor bloqueado"
-
-#: admin/systems/system-list.xml:30
-msgid "Locked workstation"
-msgstr "EstaciÃ³n de trabajo bloqueada"
-
-#: admin/systems/system-list.xml:38
-msgid "Locked terminal"
-msgstr "Terminal bloqueado"
-
-#: admin/systems/system-list.xml:47
-msgid "New terminal"
-msgstr "Nuevo terminal"
-
-#: admin/systems/system-list.xml:55
-msgid "New device"
-msgstr "Nuevo dispositivo"
-
-#: admin/systems/system-list.xml:63
-msgid "Workstation template"
-msgstr "Plantilla de estaciÃ³n de trabajo"
-
-#: admin/systems/system-list.xml:71
-msgid "Terminal template"
-msgstr "Plantilla de terminal"
-
-#: admin/systems/system-list.xml:79
-msgid "Winstation"
-msgstr "EstaciÃ³n de trabajo Windows"
+msgid "Remote desktop"
+msgstr "Escritorio remoto"
 
-#: admin/systems/system-list.xml:87 admin/systems/system-list.xml:234
-#: admin/systems/class_systemImport.inc:169
-#: admin/systems/class_serverGeneric.inc:46
-#: admin/systems/class_serverGeneric.inc:51
-#: admin/systems/class_serverGeneric.inc:52
-#: admin/systems/class_SelectDeviceType.inc:58
-msgid "Server"
-msgstr "Servidor"
+#: admin/systems/class_terminalStartup.inc:87
+msgid "Connect method"
+msgstr "MÃ©todo de conexiÃ³n"
 
-#: admin/systems/system-list.xml:95 admin/systems/system-list.xml:242
-#: admin/systems/class_workstationGeneric.inc:458
-#: admin/systems/class_workstationGeneric.inc:463
-#: admin/systems/class_workstationGeneric.inc:464
-#: admin/systems/class_SelectDeviceType.inc:58
-msgid "Workstation"
-msgstr "EstaciÃ³n de trabajo"
+#: admin/systems/class_terminalStartup.inc:91
+msgid "XDMCP"
+msgstr "XDMCP"
 
-#: admin/systems/system-list.xml:103 admin/systems/system-list.xml:250
-#: admin/systems/class_terminalGeneric.inc:81
-#: admin/systems/class_terminalGeneric.inc:86
-#: admin/systems/class_terminalGeneric.inc:87
-#: admin/systems/class_SelectDeviceType.inc:58
-msgid "Terminal"
-msgstr "Terminal"
+#: admin/systems/class_terminalStartup.inc:91
+msgid "LDM"
+msgstr "LDM"
 
-#: admin/systems/system-list.xml:111 admin/systems/class_printGeneric.inc:1005
-#: admin/systems/class_printGeneric.inc:1011
-#: admin/systems/class_printGeneric.inc:1012
-msgid "Printer"
-msgstr "Impresora"
+#: admin/systems/class_terminalStartup.inc:91
+msgid "Shell"
+msgstr "Shell"
 
-#: admin/systems/system-list.xml:119 admin/systems/system-list.xml:274
-#: admin/systems/class_mobilePhoneGeneric.inc:74
-#: admin/systems/phoneSelect/phoneSelect-list.xml:14
-msgid "Phone"
-msgstr "TelÃ©fono"
+#: admin/systems/class_terminalStartup.inc:91
+msgid "Telnet"
+msgstr "Telnet"
 
-#: admin/systems/system-list.xml:127
-#: admin/systems/class_mobilePhoneGeneric.inc:36
-#: admin/systems/class_mobilePhoneGeneric.inc:41
-#: admin/systems/class_mobilePhoneGeneric.inc:42
-#: admin/systems/phoneSelect/phoneSelect-list.xml:22
-msgid "Mobile phone"
-msgstr ""
+#: admin/systems/class_terminalStartup.inc:91
+msgid "Windows RDP"
+msgstr "Windows RDP"
 
-#: admin/systems/system-list.xml:135
-#: admin/systems/class_componentGeneric.inc:36
-msgid "Component"
-msgstr "componente"
+#: admin/systems/class_terminalStartup.inc:95
+msgid "Terminal server"
+msgstr "Servidor de terminal"
 
-#: admin/systems/system-list.xml:143 admin/systems/system-list.xml:298
-msgid "IPMI"
-msgstr ""
+#: admin/systems/system-list.xml:10
+msgid "List of systems"
+msgstr "Lista de sistemas"
 
-#: admin/systems/system-list.xml:169
-#: admin/systems/class_workstationGeneric.inc:154
-#: admin/systems/class_printGeneric.inc:752
-#: admin/systems/class_printGeneric.inc:762
-#: admin/systems/class_printGeneric.inc:781
-#: admin/systems/class_printGeneric.inc:1022
-#: admin/systems/class_componentGeneric.inc:64
-#: admin/systems/class_mobilePhoneGeneric.inc:63
-#: admin/systems/phoneSelect/phoneSelect-list.xml:48
+#: admin/systems/system-list.xml:31
+#: admin/systems/class_workstationGeneric.inc:46
+#: admin/systems/class_printGeneric.inc:60
+#: admin/systems/class_componentGeneric.inc:58
+#: admin/systems/class_mobilePhoneGeneric.inc:60
 #: admin/systems/services/shares/class_serviceShare.inc:52
-#: admin/systems/system-filter.tpl.c:32
-#: admin/systems/phoneSelect/phoneSelect-filter.tpl.c:11
 msgid "Name"
 msgstr "Nombre"
 
-#: admin/systems/system-list.xml:177
-#: admin/systems/phoneSelect/phoneSelect-list.xml:63
+#: admin/systems/system-list.xml:39
 msgid "IP"
 msgstr "IP"
 
-#: admin/systems/system-list.xml:185
+#: admin/systems/system-list.xml:47
 msgid "MAC"
 msgstr "MAC"
 
-#: admin/systems/system-list.xml:193
-#: admin/systems/class_workstationGeneric.inc:160
-#: admin/systems/class_printGeneric.inc:1024
-#: admin/systems/class_componentGeneric.inc:68
-#: admin/systems/class_mobilePhoneGeneric.inc:67
+#: admin/systems/system-list.xml:55
+#: admin/systems/class_workstationGeneric.inc:51
+#: admin/systems/class_printGeneric.inc:64
+#: admin/systems/class_componentGeneric.inc:62
+#: admin/systems/class_mobilePhoneGeneric.inc:64
 #: admin/systems/serverService-list.xml:35
 #: admin/systems/services/shares/class_serviceShare.inc:56
-#: admin/systems/printer.tpl.c:8 admin/systems/printer.tpl.c:17
 msgid "Description"
 msgstr "DescripciÃ³n"
 
-#: admin/systems/system-list.xml:201 admin/systems/class_serverService.inc:57
+#: admin/systems/system-list.xml:63 admin/systems/class_serverService.inc:57
 #: admin/systems/services/terminal/class_serviceTerminal.inc:30
 #: admin/systems/services/cups/class_serviceCUPS.inc:85
 #: admin/systems/services/shares/class_serviceShare.inc:31
@@ -319,378 +235,186 @@ msgstr "DescripciÃ³n"
 msgid "Services"
 msgstr "Servicios"
 
-#: admin/systems/system-list.xml:209
+#: admin/systems/system-list.xml:71
 msgid "Release"
 msgstr "VersiÃ³n"
 
-#: admin/systems/system-list.xml:217 admin/systems/serverService-list.xml:43
-#: admin/systems/phoneSelect/phoneSelect-list.xml:70
+#: admin/systems/system-list.xml:79 admin/systems/serverService-list.xml:43
 msgid "Actions"
 msgstr "Acciones"
 
-#: admin/systems/system-list.xml:228 admin/systems/serverService-list.xml:54
+#: admin/systems/system-list.xml:90 admin/systems/serverService-list.xml:54
 msgid "Create"
 msgstr "Crear"
 
-#: admin/systems/system-list.xml:258
-msgid "winStation"
-msgstr ""
-
-#: admin/systems/system-list.xml:266
-msgid "Network printer"
-msgstr "Impresora de Red"
-
-#: admin/systems/system-list.xml:282
-#: admin/systems/class_componentGeneric.inc:41
-#: admin/systems/class_componentGeneric.inc:42
-msgid "Network device"
-msgstr "Dispositivo de Red"
-
-#: admin/systems/system-list.xml:290
-msgid "Mobile Phone"
-msgstr ""
-
-#: admin/systems/system-list.xml:310
+#: admin/systems/system-list.xml:100
 msgid "Trigger action"
 msgstr "AcciÃ³n disparada"
 
-#: admin/systems/system-list.xml:317
+#: admin/systems/system-list.xml:107
 msgid "Schedule action"
 msgstr "AcciÃ³n programada"
 
-#: admin/systems/system-list.xml:330
-msgid "Activate systems"
-msgstr "Activar sistemas"
-
-#: admin/systems/system-list.xml:337 admin/systems/serverService-list.xml:69
-#: admin/systems/printer.tpl.c:35
+#: admin/systems/system-list.xml:119 admin/systems/serverService-list.xml:69
 msgid "Remove"
 msgstr "Eliminar"
 
-#: admin/systems/system-list.xml:367
-msgid "Create ISO"
-msgstr "Crear ISO"
-
-#: admin/systems/system-list.xml:379
+#: admin/systems/system-list.xml:150
 msgid "Edit system"
 msgstr ""
 
-#: admin/systems/system-list.xml:392
+#: admin/systems/system-list.xml:163
 msgid "Remove system"
 msgstr "Eliminar sistema"
 
-#: admin/systems/class_workstationGeneric.inc:75
-#, php-format
-msgid "Event %s is not available!"
-msgstr ""
-
-#: admin/systems/class_workstationGeneric.inc:78
-msgid "Events are not available!"
-msgstr ""
-
-#: admin/systems/class_workstationGeneric.inc:106
-msgid "(Re)Install"
-msgstr ""
-
-#: admin/systems/class_workstationGeneric.inc:107
-msgid "Software update"
-msgstr "ActualizaciÃ³n software"
-
-#: admin/systems/class_workstationGeneric.inc:115
-msgid "Wake up"
-msgstr "Despertar"
-
-#: admin/systems/class_workstationGeneric.inc:144
-#: admin/systems/class_printGeneric.inc:604
+#: admin/systems/class_workstationGeneric.inc:35
 msgid "workstation"
 msgstr "estaciÃ³n de trabajo"
 
-#: admin/systems/class_workstationGeneric.inc:151
-#: admin/systems/class_componentGeneric.inc:61
-#: admin/systems/class_mobilePhoneGeneric.inc:60
+#: admin/systems/class_workstationGeneric.inc:42
+#: admin/systems/class_printGeneric.inc:56
+#: admin/systems/class_componentGeneric.inc:55
+#: admin/systems/class_mobilePhoneGeneric.inc:56
 msgid "Properties"
 msgstr "Propiedades"
 
-#: admin/systems/class_workstationGeneric.inc:155
+#: admin/systems/class_workstationGeneric.inc:47
 #, php-format
 msgid "The name of the %s"
 msgstr ""
 
-#: admin/systems/class_workstationGeneric.inc:161
+#: admin/systems/class_workstationGeneric.inc:52
 #, php-format
 msgid "A short description of the %s"
 msgstr ""
 
-#: admin/systems/class_workstationGeneric.inc:166
-#: admin/systems/class_printGeneric.inc:1025
+#: admin/systems/class_workstationGeneric.inc:56
 msgid "Location"
 msgstr "LocalizaciÃ³n"
 
-#: admin/systems/class_workstationGeneric.inc:167
+#: admin/systems/class_workstationGeneric.inc:57
 #, php-format
 msgid "The location of the %s"
 msgstr ""
 
-#: admin/systems/class_workstationGeneric.inc:173
+#: admin/systems/class_workstationGeneric.inc:61
 #, php-format
 msgid "Lock this %s"
 msgstr ""
 
-#: admin/systems/class_workstationGeneric.inc:174
+#: admin/systems/class_workstationGeneric.inc:62
 #, php-format
 msgid "This will prevent the %s from being reinstalled"
 msgstr ""
 
-#: admin/systems/class_workstationGeneric.inc:185
-#: addons/dashboard/class_dashBoardSystems.inc:48
-msgid "Servers"
-msgstr "Servidor"
-
-#: admin/systems/class_workstationGeneric.inc:190
-#, php-format
-msgid "The syslog server the %s should be using"
+#: admin/systems/class_workstationGeneric.inc:73
+#: admin/systems/class_printGeneric.inc:83
+#: admin/systems/class_componentGeneric.inc:69
+#: admin/systems/class_mobilePhoneGeneric.inc:102
+#: admin/systems/class_networkSettings.inc:1008
+msgid "Network settings"
 msgstr ""
 
-#: admin/systems/class_workstationGeneric.inc:195
-msgid "Inherit NTP servers"
-msgstr ""
+#: admin/systems/class_workstationGeneric.inc:78
+#: admin/systems/class_printGeneric.inc:87
+#: admin/systems/class_componentGeneric.inc:73
+#: admin/systems/class_mobilePhoneGeneric.inc:106
+#: admin/systems/class_networkSettings.inc:630
+#: admin/systems/class_networkSettings.inc:643
+#: admin/systems/class_networkSettings.inc:645
+#: admin/systems/class_networkSettings.inc:1014
+msgid "IP address"
+msgstr "DirecciÃ³n IP"
 
-#: admin/systems/class_workstationGeneric.inc:196
-msgid "Inherit time server attributes from ogroup"
+#: admin/systems/class_workstationGeneric.inc:78
+msgid "IP addresses this system uses (v4 or v6)"
 msgstr ""
 
-#: admin/systems/class_workstationGeneric.inc:202
-msgid "NTP servers"
+#: admin/systems/class_workstationGeneric.inc:83
+#: admin/systems/class_printGeneric.inc:91
+#: admin/systems/class_componentGeneric.inc:77
+#: admin/systems/class_mobilePhoneGeneric.inc:110
+msgid "Mac address"
 msgstr ""
 
-#: admin/systems/class_workstationGeneric.inc:203
-#, php-format
-msgid "The NTP servers for the %s"
+#: admin/systems/class_workstationGeneric.inc:83
+#: admin/systems/class_printGeneric.inc:91
+#: admin/systems/class_componentGeneric.inc:77
+#: admin/systems/class_mobilePhoneGeneric.inc:110
+msgid "Mac address of this system"
 msgstr ""
 
-#: admin/systems/class_workstationGeneric.inc:209
-msgid "Inherit LDAP servers"
-msgstr ""
+#: admin/systems/class_workstationGeneric.inc:125
+#: admin/systems/class_workstationGeneric.inc:130
+#: admin/systems/class_workstationGeneric.inc:131
+msgid "Workstation"
+msgstr "EstaciÃ³n de trabajo"
 
-#: admin/systems/class_workstationGeneric.inc:210
-msgid "Inherit LDAP server attributes from ogroup"
+#: admin/systems/class_workstationGeneric.inc:126
+msgid "Workstation information"
 msgstr ""
 
-#: admin/systems/class_workstationGeneric.inc:216
-msgid "LDAP servers"
-msgstr ""
+#: admin/systems/class_printGeneric.inc:32
+#: admin/systems/class_printGeneric.inc:37
+#: admin/systems/class_printGeneric.inc:38
+msgid "Printer"
+msgstr "Impresora"
 
-#: admin/systems/class_workstationGeneric.inc:217
-#, php-format
-msgid "The LDAP servers for the %s"
+#: admin/systems/class_printGeneric.inc:33
+msgid "Printer information"
 msgstr ""
 
-#: admin/systems/class_workstationGeneric.inc:225
-#: admin/systems/class_workstationGeneric.inc:229
-#: admin/ogroups/goto/termgroup.tpl.c:41
-msgid "Action"
-msgstr "AcciÃ³n"
-
-#: admin/systems/class_workstationGeneric.inc:230
-#: admin/ogroups/goto/termgroup.tpl.c:44
-msgid "Select action to execute for this terminal"
-msgstr "Seleccione una acciÃ³n que se ejecutara en este terminal"
-
-#: admin/systems/class_workstationGeneric.inc:236
-#: admin/systems/class_componentGeneric.inc:75
-#: admin/systems/class_mobilePhoneGeneric.inc:106
-#: admin/systems/class_networkSettings.inc:1016
-msgid "Network settings"
+#: admin/systems/class_printGeneric.inc:60
+msgid "The name of the printer"
 msgstr ""
 
-#: admin/systems/class_workstationGeneric.inc:459
-msgid "Workstation information"
+#: admin/systems/class_printGeneric.inc:64
+msgid "A short description of the printer"
 msgstr ""
 
-#: admin/systems/class_printGeneric.inc:131
-#: admin/systems/class_printGeneric.inc:1065
-#: admin/systems/class_systemManagement.inc:678
-msgid "Internal error"
-msgstr "error interno"
-
-#: admin/systems/class_printGeneric.inc:131
-#, php-format
-msgid ""
-"Cannot determine a valid department for this object. Setting base to '%s'!"
-msgstr "No puedo determinar un departamento vÃ¡lido para este objeto, Â¡le sera puesta la base a '%s'!"
-
-#: admin/systems/class_printGeneric.inc:311
-#: admin/systems/class_printGeneric.inc:319
-#: admin/systems/class_printGeneric.inc:324
-#: admin/systems/class_printGeneric.inc:374
-#: admin/systems/class_printGeneric.inc:390
-#: admin/systems/class_printGeneric.inc:393
-msgid "Add printer extension"
-msgstr "AÃ±adir extensiÃ³n de impresora"
-
-#: admin/systems/class_printGeneric.inc:312
-msgid ""
-"Could not initialize printer tab, parameter parent was missing while "
-"construction."
-msgstr "No se puede activar la pestaÃ±a de impresora, el origen de los parametros desapareciÃ³ cuando se estaba construyendo."
-
-#: admin/systems/class_printGeneric.inc:320
-msgid "This is a workstation template, printer tab is disabled."
-msgstr "Esto es una plantilla de estaciÃ³n de trabajo, la pestaÃ±a de impresiÃ³n estÃ¡ desactivada."
-
-#: admin/systems/class_printGeneric.inc:325
-msgid "This is a terminal template, printer tab is disabled."
-msgstr "Esto es una plantilla de termina, la pestaÃ±a de impresiÃ³n estÃ¡ desactivada."
-
-#: admin/systems/class_printGeneric.inc:367
-#: admin/systems/class_printGeneric.inc:375
-#: admin/systems/class_printGeneric.inc:383
-#: admin/systems/class_printGeneric.inc:386
-#: admin/systems/class_printGeneric.inc:391
-#: admin/systems/class_printGeneric.inc:394
-msgid "printer"
-msgstr "impresora"
-
-#: admin/systems/class_printGeneric.inc:375
-msgid ""
-"You can't enable it while 'cn' is not present in entry. Possibly you are "
-"currently creating a new terminal template."
-msgstr "No puede activarla mientras un 'cn' no este presente en la entrada. Posiblemente esto ocurra porque actualmente estÃ¡ creando una nueva plantilla de terminal."
-
-#: admin/systems/class_printGeneric.inc:382
-#: admin/systems/class_printGeneric.inc:385
-msgid "Remove printer extension"
-msgstr "Eliminar extensiÃ³n de impresora"
-
-#: admin/systems/class_printGeneric.inc:474
-#: admin/systems/class_printGeneric.inc:652
-#: admin/systems/class_printGeneric.inc:659
-#: admin/systems/class_printGeneric.inc:718
-#: admin/systems/class_printGeneric.inc:1105
-#: admin/systems/class_printGeneric.inc:1116
-#: admin/systems/class_serverService.inc:224
-#: admin/systems/class_serverService.inc:270
-#: admin/systems/class_serverService.inc:393
-#: admin/systems/class_systemManagement.inc:341
-#: admin/systems/class_systemManagement.inc:624
-#: admin/systems/class_systemManagement.inc:639
-#: admin/systems/services/shares/class_serviceShare.inc:103
-#: admin/systems/class_networkSettings.inc:305
-#: admin/systems/class_networkSettings.inc:336
-#: admin/systems/class_networkSettings.inc:584
-#: admin/systems/class_networkSettings.inc:591
-#: admin/systems/class_networkSettings.inc:597
-#: admin/systems/class_networkSettings.inc:604
-msgid "Error"
-msgstr "Error"
-
-#: admin/systems/class_printGeneric.inc:577
-#, php-format
-msgid "Your currently selected PPD file '%s' doesn't exist."
-msgstr "El archivo PPD seleccionado '%s' no existe."
-
-#: admin/systems/class_printGeneric.inc:583
-msgid "Not defined"
-msgstr "No definido"
-
-#: admin/systems/class_printGeneric.inc:587
-#: admin/systems/ppd/class_printerPPDDialog.inc:116
-msgid "Can't get ppd informations."
-msgstr "No se puede acceder a la informaciÃ³n PPD"
-
-#: admin/systems/class_printGeneric.inc:602
-#: admin/systems/class_printGeneric.inc:604
-#, php-format
-msgid "This printer belongs to %s. You can't rename this printer."
-msgstr "Esta impresora pertenece a %s. No puede renombrar esta impresora."
+#: admin/systems/class_printGeneric.inc:70
+msgid "Details"
+msgstr "Detalles"
 
-#: admin/systems/class_printGeneric.inc:602
-#: admin/systems/class_terminalGeneric.inc:34
-msgid "terminal"
-msgstr "terminal"
+#: admin/systems/class_printGeneric.inc:73
+msgid "Printer location"
+msgstr "LocalizaciÃ³n de la impresora"
 
-#: admin/systems/class_printGeneric.inc:652
-#: admin/systems/class_printGeneric.inc:659
-msgid "Object is no printer!"
-msgstr "Â¡El objeto no es una impresora!"
+#: admin/systems/class_printGeneric.inc:73
+msgid "The location of the printer"
+msgstr ""
 
-#: admin/systems/class_printGeneric.inc:767 admin/systems/printer.tpl.c:23
+#: admin/systems/class_printGeneric.inc:77
 msgid "Printer URL"
 msgstr "URL de la impresora"
 
-#: admin/systems/class_printGeneric.inc:989
-#: admin/systems/class_printGeneric.inc:991
-msgid "Group"
-msgstr "Grupo"
-
-#: admin/systems/class_printGeneric.inc:994
-msgid "User"
-msgstr "Usuario"
-
-#: admin/systems/class_printGeneric.inc:1006
-msgid "Printer information"
+#: admin/systems/class_printGeneric.inc:77
+msgid "The URL of the printer"
 msgstr ""
 
-#: admin/systems/class_printGeneric.inc:1023
-#: admin/systems/serverService-list.tpl.c:2
-#: admin/systems/phoneSelect/phoneSelect-list.tpl.c:2
-#: admin/systems/printer.tpl.c:11
-msgid "Base"
-msgstr "Base"
-
-#: admin/systems/class_printGeneric.inc:1026
-msgid "LabeledURL"
-msgstr "LabeledURL"
-
-#: admin/systems/class_printGeneric.inc:1027
-msgid "Printer PPD"
-msgstr "Impresora PPD"
-
-#: admin/systems/class_printGeneric.inc:1028 admin/systems/printer.tpl.c:38
-msgid "Permissions"
-msgstr "Permisos"
-
-#: admin/systems/class_printGeneric.inc:1030
-msgid "Windows inf file"
-msgstr ""
-
-#: admin/systems/class_printGeneric.inc:1031
-msgid "Windows driver dir"
-msgstr ""
-
-#: admin/systems/class_printGeneric.inc:1032 admin/systems/printer.tpl.c:62
-msgid "Driver printer name"
+#: admin/systems/class_printGeneric.inc:87
+#: admin/systems/class_componentGeneric.inc:73
+#: admin/systems/class_mobilePhoneGeneric.inc:106
+msgid "IP address this system uses"
 msgstr ""
 
-#: admin/systems/class_printGeneric.inc:1048
-#: admin/systems/class_printGeneric.inc:1070
-msgid "Permission error"
-msgstr "Error de permisos"
-
-#: admin/systems/class_printGeneric.inc:1048
-#: admin/systems/class_printGeneric.inc:1070
-msgid "printer user"
-msgstr "usuario de impresora"
-
-#: admin/systems/class_printGeneric.inc:1065
-#, php-format
-msgid "Illegal member type '%s'!"
-msgstr "Â¡tipo de miembro ilegal '%s'!"
-
-#: admin/systems/class_printGeneric.inc:1105
-#, php-format
-msgid "'%s' is already used!"
-msgstr "Â¡'%s' ya esta siendo usado!"
-
-#: admin/systems/class_printGeneric.inc:1116
-#, php-format
-msgid "'%s' does not exist!"
-msgstr "Â¡'%s' no existe!"
-
 #: admin/systems/class_serverService.inc:58
 msgid "Server services"
 msgstr ""
 
+#: admin/systems/class_serverService.inc:224
+#: admin/systems/class_serverService.inc:270
+#: admin/systems/class_serverService.inc:393
+#: admin/systems/services/shares/class_serviceShare.inc:103
+#: admin/systems/class_networkSettings.inc:297
+#: admin/systems/class_networkSettings.inc:328
+#: admin/systems/class_networkSettings.inc:576
+#: admin/systems/class_networkSettings.inc:583
+#: admin/systems/class_networkSettings.inc:589
+#: admin/systems/class_networkSettings.inc:596
+msgid "Error"
+msgstr "Error"
+
 #: admin/systems/class_serverService.inc:332
 msgid "Filter error"
 msgstr "Error del filtro"
@@ -714,217 +438,20 @@ 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:42
-#, php-format
-msgid "The root server the terminal should be using"
-msgstr ""
+#: admin/systems/class_terminalGeneric.inc:31
+msgid "terminal"
+msgstr "terminal"
 
+#: admin/systems/class_terminalGeneric.inc:43
 #: admin/systems/class_terminalGeneric.inc:48
-#, php-format
-msgid "The swap server the terminal should be using"
-msgstr ""
-
-#: admin/systems/class_terminalGeneric.inc:54
-msgid "Remote desktop"
-msgstr "Escritorio remoto"
-
-#: admin/systems/class_terminalGeneric.inc:58
-msgid "Connect method"
-msgstr "MÃ©todo de conexiÃ³n"
-
-#: admin/systems/class_terminalGeneric.inc:62
-msgid "XDMCP"
-msgstr "XDMCP"
-
-#: admin/systems/class_terminalGeneric.inc:62
-msgid "LDM"
-msgstr "LDM"
-
-#: admin/systems/class_terminalGeneric.inc:62
-msgid "Shell"
-msgstr "Shell"
-
-#: admin/systems/class_terminalGeneric.inc:62
-msgid "Telnet"
-msgstr "Telnet"
-
-#: admin/systems/class_terminalGeneric.inc:62
-msgid "Windows RDP"
-msgstr "Windows RDP"
-
-#: admin/systems/class_terminalGeneric.inc:66
-msgid "Terminal server"
-msgstr "Servidor de terminal"
+#: admin/systems/class_terminalGeneric.inc:49
+msgid "Terminal"
+msgstr "Terminal"
 
-#: admin/systems/class_terminalGeneric.inc:82
+#: admin/systems/class_terminalGeneric.inc:44
 msgid "Terminal information"
 msgstr ""
 
-#: admin/systems/ppd/class_printerPPDSelectionDialog.inc:91
-#: admin/systems/ppd/class_printerPPDSelectionDialog.inc:116
-#: admin/systems/ppd/class_printerPPDSelectionDialog.inc:139
-#: admin/systems/ppd/class_printerPPDDialog.inc:92
-#: admin/systems/ppd/class_printerPPDDialog.inc:160
-#: admin/systems/ppd/class_printerPPDDialog.inc:241
-#: admin/systems/ppd/class_printerPPDDialog.inc:256
-#: admin/systems/ppd/class_printerPPDDialog.inc:269
-#: admin/systems/ppd/class_printerPPDDialog.inc:297
-#: admin/systems/ppd/class_printerPPDDialog.inc:314
-#: admin/systems/ppd/class_printerPPDDialog.inc:337
-#: admin/systems/ppd/class_printerPPDDialog.inc:351
-#: admin/systems/ppd/class_printerPPDDialog.inc:361
-#: admin/systems/ppd/class_printerPPDDialog.inc:365
-#: admin/systems/ppd/class_printerPPDDialog.inc:560
-#: admin/systems/ppd/class_printerPPDDialog.inc:577
-#: admin/systems/ppd/class_printerPPDDialog.inc:580
-#: admin/systems/ppd/class_printerPPDDialog.inc:583
-msgid "PPD error"
-msgstr "Error PPD"
-
-#: admin/systems/ppd/class_printerPPDSelectionDialog.inc:139
-#, php-format
-msgid "Cannot locate vendor '%s' in available PPDs!"
-msgstr "Â¡No puedo localizar el fabricante '%s' en los PPDs disponibles!"
-
-#: admin/systems/ppd/class_printerPPDSelectionDialog.inc:148
-msgid "Printer ppd selection."
-msgstr "SelecciÃ³n del ppd de la impresora."
-
-#: admin/systems/ppd/class_printerPPDSelectionDialog.inc:155
-msgid "delete"
-msgstr "eliminar"
-
-#: admin/systems/ppd/class_printerPPDSelectionDialog.inc:166
-msgid "back"
-msgstr "atrÃ¡s"
-
-#: admin/systems/ppd/class_printerPPDDialog.inc:74
-#: admin/systems/ppd/class_printerPPDDialog.inc:140
-#: admin/systems/services/class_goService.inc:241
-msgid "Configuration error"
-msgstr "Error en la configuraciÃ³n"
-
-#: admin/systems/ppd/class_printerPPDDialog.inc:92
-#, php-format
-msgid "Cannot open PPD '%s'!"
-msgstr "Â¡No se puede abrir el archivo PPD '%s'!"
-
-#: admin/systems/ppd/class_printerPPDDialog.inc:141
-#, php-format
-msgid "Cannot open PPD path '%s' for reading and writing!"
-msgstr "Â¡No se puede abrir la ruta archivo PPD '%s' para lectura y escritura!"
-
-#: admin/systems/ppd/class_printerPPDDialog.inc:160
-#: admin/systems/ppd/class_printerPPDDialog.inc:365
-msgid "file is empty"
-msgstr "el archivo estÃ¡ vacÃo"
-
-#: admin/systems/ppd/class_printerPPDDialog.inc:314
-#, php-format
-msgid "Cannot parse PPD '%s'!"
-msgstr "Â¡No se puede analizar el archivo PPD '%s'!"
-
-#: admin/systems/ppd/class_printerPPDDialog.inc:340
-msgid "Overwrite existing PPD"
-msgstr "Sobreescribir PPD existente"
-
-#: admin/systems/ppd/class_printerPPDDialog.inc:341
-msgid ""
-"There is already a ppd file for this kind of printer. Do you want to "
-"overwrite it?"
-msgstr "Ya existe un archivo PPD para ese tipo de impresora.Â¿Quiere sobreescribirlo?"
-
-#: admin/systems/ppd/class_printerPPDDialog.inc:491
-msgid "Section"
-msgstr "SecciÃ³n"
-
-#: admin/systems/ppd/class_printerPPDDialog.inc:551
-#: admin/systems/ppd/class_printerPPDDialog.inc:554
-msgid "True"
-msgstr "Verdadero"
-
-#: admin/systems/ppd/class_printerPPDDialog.inc:552
-#: admin/systems/ppd/class_printerPPDDialog.inc:555
-msgid "False"
-msgstr "Falso"
-
-#: admin/systems/ppd/class_printerPPDDialog.inc:560
-#, php-format
-msgid "PPD type '%s' is not supported!"
-msgstr "Â¡El tipo de PPD '%s' no estÃ¡ soportado!"
-
-#: admin/systems/ppd/class_printerPPDDialog.inc:597
-msgid ""
-"Please select a valid ppd file or use 'Cancel' to go back to printer "
-"configuration."
-msgstr "Por favor seleccione un archivo ppd vÃ¡lido o use 'Cancelar' para volver a la configuraciÃ³n de impresora."
-
-#: admin/systems/ppd/class_ppdManager.inc:44
-#: admin/systems/ppd/class_ppdManager.inc:188
-#: admin/systems/ppd/class_ppdManager.inc:190
-msgid "PPD manager error"
-msgstr "Gestor de errores PPD"
-
-#: admin/systems/ppd/class_ppdManager.inc:44
-#, php-format
-msgid "The specified path '%s' does not exist."
-msgstr "La ruta especificada '%s' no es valida."
-
-#: admin/systems/ppd/class_ppdManager.inc:188
-#, php-format
-msgid "Specified PPD file '%s' cannot be opened for reading."
-msgstr "El archivo ppd indicado '%s' no puede ser abierto para lectura."
-
-#: admin/systems/ppd/class_ppdManager.inc:190
-#, php-format
-msgid "The temporary file '%s' cannot be opened for writing."
-msgstr "El archivo temporal indicado '%s' no puede ser abierto para escritura."
-
-#: admin/systems/ppd/class_ppdManager.inc:212
-#: admin/systems/ppd/class_ppdManager.inc:350
-msgid "Parsing PPD file failed - file is empty!"
-msgstr "El anÃ¡lisis del archivo PPD 's' ha fallado - Â¡el archivo estÃ¡ vacÃo!"
-
-#: admin/systems/ppd/class_ppdManager.inc:222
-#, php-format
-msgid ""
-"Parsing PPD file %s failed - line too long. Trailing characters have been "
-"ignored!"
-msgstr "El anÃ¡lisis del archivo PPD '%s' ha fallado - linea demasiado larga. Â¡Los caracteres sobrantes han sido ignorados!"
-
-#: admin/systems/ppd/class_ppdManager.inc:230
-msgid "Nested groups are not supported!"
-msgstr "Â¡No se soportan grupos anidados!"
-
-#: admin/systems/ppd/class_ppdManager.inc:234
-msgid "Group name not unique!"
-msgstr "Â¡El nombre del grupo no es Ãºnico!"
-
-#: admin/systems/ppd/class_ppdManager.inc:240
-#: admin/systems/ppd/class_ppdManager.inc:270
-msgid "Symbol values are not supported yet!"
-msgstr "Â¡AÃºn no se soportan valores simbÃ³licos!"
-
-#: admin/systems/ppd/class_ppdManager.inc:264
-msgid "Nested options are not supported!"
-msgstr "Â¡No se soporta opciones anidadas!"
-
-#: admin/systems/ppd/class_ppdManager.inc:289
-msgid "PickMany is not supported yet!"
-msgstr "Â¡No se soporta selecciÃ³n mÃºltiple!"
-
-#: admin/systems/ppd/class_ppdManager.inc:370
-#, php-format
-msgid ""
-"Parsing PPD file %s failed - line too long. Trailing characters have been "
-"ignored"
-msgstr "El anÃ¡lisis del archivo PPD '%s' ha fallado - linea demasiado larga. Los caracteres sobrantes han sido ignorados"
-
-#: admin/systems/ppd/class_ppdManager.inc:395
-#, php-format
-msgid "Parsing PPD file %s failed - no information found."
-msgstr "El anÃ¡lisis del archivo PPD '%s' ha fallado - no se ha encontrado informaciÃ³n."
-
 #: admin/systems/class_systemImport.inc:72
 #, php-format
 msgid "Could not parse %s"
@@ -944,83 +471,130 @@ msgstr ""
 msgid "Import"
 msgstr "Importar"
 
+#: admin/systems/class_systemImport.inc:169
+#: admin/systems/class_serverGeneric.inc:43
+#: admin/systems/class_serverGeneric.inc:48
+#: admin/systems/class_serverGeneric.inc:49
+msgid "Server"
+msgstr "Servidor"
+
 #: admin/systems/class_systemImport.inc:169
 msgid "The server you wish to import hosts from"
 msgstr ""
 
-#: admin/systems/class_serverGeneric.inc:34
+#: admin/systems/class_serverGeneric.inc:31
 msgid "server"
 msgstr "Servidor"
 
-#: admin/systems/class_serverGeneric.inc:47
+#: admin/systems/class_serverGeneric.inc:44
 msgid "Server information"
 msgstr ""
 
-#: admin/systems/class_componentGeneric.inc:37
+#: admin/systems/class_componentGeneric.inc:31
+msgid "Component"
+msgstr "componente"
+
+#: admin/systems/class_componentGeneric.inc:32
 msgid "Component information"
 msgstr ""
 
-#: admin/systems/class_componentGeneric.inc:64
+#: admin/systems/class_componentGeneric.inc:36
+#: admin/systems/class_componentGeneric.inc:37
+msgid "Network device"
+msgstr "Dispositivo de Red"
+
+#: admin/systems/class_componentGeneric.inc:58
 msgid "The name of the component"
 msgstr ""
 
-#: admin/systems/class_componentGeneric.inc:68
+#: admin/systems/class_componentGeneric.inc:62
 msgid "A short description of the component"
 msgstr ""
 
+#: admin/systems/class_systemServers.inc:31
+#: admin/systems/class_systemServers.inc:53
+msgid "Servers"
+msgstr "Servidor"
+
+#: admin/systems/class_systemServers.inc:35
+msgid "The syslog server the system should be using"
+msgstr ""
+
+#: admin/systems/class_systemServers.inc:40
+msgid "NTP servers"
+msgstr ""
+
+#: admin/systems/class_systemServers.inc:40
+msgid "The NTP servers for this system"
+msgstr ""
+
+#: admin/systems/class_systemServers.inc:54
+msgid "Servers this system is using"
+msgstr ""
+
+#: admin/systems/class_mobilePhoneGeneric.inc:32
 #: admin/systems/class_mobilePhoneGeneric.inc:37
+#: admin/systems/class_mobilePhoneGeneric.inc:38
+msgid "Mobile phone"
+msgstr ""
+
+#: admin/systems/class_mobilePhoneGeneric.inc:33
 msgid "Mobile phone information"
 msgstr ""
 
-#: admin/systems/class_mobilePhoneGeneric.inc:63
+#: admin/systems/class_mobilePhoneGeneric.inc:60
 msgid "The name of the mobile phone"
 msgstr ""
 
-#: admin/systems/class_mobilePhoneGeneric.inc:67
+#: admin/systems/class_mobilePhoneGeneric.inc:64
 msgid "A short description of the mobile phone"
 msgstr ""
 
-#: admin/systems/class_mobilePhoneGeneric.inc:77
+#: admin/systems/class_mobilePhoneGeneric.inc:70
+msgid "Phone"
+msgstr "TelÃ©fono"
+
+#: admin/systems/class_mobilePhoneGeneric.inc:73
 msgid "Serial Number"
 msgstr ""
 
-#: admin/systems/class_mobilePhoneGeneric.inc:77
+#: admin/systems/class_mobilePhoneGeneric.inc:73
 msgid "The serial number of the mobile phone"
 msgstr ""
 
-#: admin/systems/class_mobilePhoneGeneric.inc:81
+#: admin/systems/class_mobilePhoneGeneric.inc:77
 msgid "IMEI Number"
 msgstr ""
 
-#: admin/systems/class_mobilePhoneGeneric.inc:81
+#: admin/systems/class_mobilePhoneGeneric.inc:77
 msgid "The IMEI number of the mobile phone"
 msgstr ""
 
-#: admin/systems/class_mobilePhoneGeneric.inc:86
+#: admin/systems/class_mobilePhoneGeneric.inc:82
 msgid "OS"
 msgstr ""
 
-#: admin/systems/class_mobilePhoneGeneric.inc:86
+#: admin/systems/class_mobilePhoneGeneric.inc:82
 msgid "The Operating System installed on this phone"
 msgstr ""
 
-#: admin/systems/class_mobilePhoneGeneric.inc:92
+#: admin/systems/class_mobilePhoneGeneric.inc:88
 msgid "SimCard"
 msgstr ""
 
-#: admin/systems/class_mobilePhoneGeneric.inc:95
+#: admin/systems/class_mobilePhoneGeneric.inc:91
 msgid "Telephone Number"
 msgstr ""
 
-#: admin/systems/class_mobilePhoneGeneric.inc:95
+#: admin/systems/class_mobilePhoneGeneric.inc:91
 msgid "The telephone number of the mobile phone"
 msgstr ""
 
-#: admin/systems/class_mobilePhoneGeneric.inc:99
+#: admin/systems/class_mobilePhoneGeneric.inc:95
 msgid "PUK Number"
 msgstr ""
 
-#: admin/systems/class_mobilePhoneGeneric.inc:99
+#: admin/systems/class_mobilePhoneGeneric.inc:95
 msgid "The PUK number of the simcard in this mobile phone"
 msgstr ""
 
@@ -1063,70 +637,20 @@ msgstr "Editar servicio"
 msgid "Remove service"
 msgstr "Eliminar servicio"
 
-#: admin/systems/phoneSelect/phoneSelect-list.xml:10
-msgid "Please select the desired entries"
-msgstr "Por favor seleccione las entradas que desee"
-
-#: admin/systems/phoneSelect/phoneSelect-list.xml:56
-msgid "Number"
-msgstr "NÃºmero"
-
-#: admin/systems/phoneSelect/phoneSelect-list.xml:83
-msgid "Select this number"
-msgstr ""
-
-#: admin/systems/class_systemManagement.inc:177
-msgid "Back"
-msgstr "AtrÃ¡s"
-
-#: admin/systems/class_systemManagement.inc:223
-msgid "Creating the image failed. Please see the report below."
-msgstr "Ha fallado la creaciÃ³n de la imagen. Por favor compruebe el problema en el siguiente informe."
-
-#: admin/systems/class_systemManagement.inc:228
-#, php-format
-msgid "Command '%s', specified for ISO creation doesn't seem to exist."
-msgstr "No parece existir el comando '%s', especificado para la creaciÃ³n de imÃ¡genes ISO."
-
-#: admin/systems/class_systemManagement.inc:398
-#: admin/systems/class_systemManagement.inc:473
-#: admin/systems/class_systemManagement.inc:858
-#: admin/systems/class_systemManagement.inc:905
-#: admin/systems/class_systemManagement.inc:926
-msgid "Permission"
-msgstr "Permisos"
-
-#: admin/systems/class_systemManagement.inc:678
-msgid "Cannot set mode to 'active'!"
-msgstr "Â¡No se puede poner el modo a 'activo'!"
-
-#: admin/systems/class_systemManagement.inc:858
-#, 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:905
-#: admin/systems/class_systemManagement.inc:926
-#, 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:1169
-#, php-format
-msgid "Inherited from %s"
-msgstr "Heredado de %s"
-
-#: admin/systems/class_systemManagement.inc:1224
-#: admin/systems/class_systemManagement.inc:1228
-#: addons/dashboard/class_dashBoardSystems.inc:199
+#: admin/systems/class_systemManagement.inc:48
 #: config/systems/class_systemsPluginConfig.inc:28
 msgid "Systems"
 msgstr "Sistemas"
 
-#: admin/systems/class_systemManagement.inc:1225
+#: admin/systems/class_systemManagement.inc:49
 msgid "Systems Management"
 msgstr "AdministraciÃ³n de Sistemas"
 
+#: admin/systems/class_systemManagement.inc:250
+#, php-format
+msgid "Inherited from %s"
+msgstr "Heredado de %s"
+
 #: admin/systems/services/terminal/class_serviceTerminal.inc:29
 #: admin/systems/services/terminal/class_serviceTerminal.inc:30
 #: admin/systems/services/terminal/class_serviceTerminal.inc:41
@@ -1164,6 +688,10 @@ msgstr "Cups"
 msgid "Empty service"
 msgstr "Servicio nulo"
 
+#: admin/systems/services/class_goService.inc:241
+msgid "Configuration error"
+msgstr "Error en la configuraciÃ³n"
+
 #: admin/systems/services/shares/class_serviceShare.inc:30
 #: admin/systems/services/shares/class_serviceShare.inc:31
 msgid "Share service"
@@ -1222,8 +750,6 @@ msgid "You need to configure encodings first"
 msgstr ""
 
 #: admin/systems/services/shares/class_serviceShare.inc:110
-#: admin/ogroups/goto/termgroup.tpl.c:2 admin/systems/remove.tpl.c:2
-#: admin/systems/ppd/remove_ppd.tpl.c:2
 msgid "Warning"
 msgstr "Aviso"
 
@@ -1349,153 +875,93 @@ msgstr ""
 msgid "LDAP"
 msgstr "LDAP"
 
-#: admin/systems/class_networkSettings.inc:305
+#: admin/systems/class_networkSettings.inc:297
 msgid "NOT IMPLEMENTED"
 msgstr "NO IMPLEMENTADO"
 
-#: admin/systems/class_networkSettings.inc:437
+#: admin/systems/class_networkSettings.inc:429
 msgid "Not matching"
 msgstr "No mostrar los coincidentes"
 
-#: admin/systems/class_networkSettings.inc:584
+#: admin/systems/class_networkSettings.inc:576
 #, php-format
 msgid "Was not able to contact argonaut server: %s"
-msgstr "No fue posible conectar al servidor Argonaut: %s"
+msgstr "No fue posible contactar el servidor Argonaut: %s"
 
-#: admin/systems/class_networkSettings.inc:591
+#: admin/systems/class_networkSettings.inc:583
 #, php-format
 msgid "Was not able to find DNS server for zone %s"
 msgstr ""
 
-#: admin/systems/class_networkSettings.inc:597
+#: admin/systems/class_networkSettings.inc:589
 #, php-format
 msgid "Was not able to find mac address of DNS server %s"
 msgstr ""
 
-#: admin/systems/class_networkSettings.inc:604
+#: admin/systems/class_networkSettings.inc:596
 #, php-format
 msgid "Was not able to launch ldap2zone: %s"
 msgstr "No fue posible lanzar ldap2zone: %s"
 
-#: admin/systems/class_networkSettings.inc:630
+#: admin/systems/class_networkSettings.inc:622
 #, php-format
 msgid "IP address %s"
 msgstr "DirecciÃ³n IP %s"
 
-#: admin/systems/class_networkSettings.inc:638
-#: admin/systems/class_networkSettings.inc:651
-#: admin/systems/class_networkSettings.inc:653
-#: admin/systems/class_networkSettings.inc:1022
-msgid "IP address"
-msgstr "DirecciÃ³n IP"
-
-#: admin/systems/class_networkSettings.inc:644
-#: admin/systems/class_networkSettings.inc:660
-#: admin/systems/class_networkSettings.inc:662
-#: admin/systems/class_networkSettings.inc:1023
+#: admin/systems/class_networkSettings.inc:636
+#: admin/systems/class_networkSettings.inc:652
+#: admin/systems/class_networkSettings.inc:654
+#: admin/systems/class_networkSettings.inc:1015
 msgid "MAC address"
 msgstr "DirecciÃ³n MAC"
 
-#: admin/systems/class_networkSettings.inc:676
+#: admin/systems/class_networkSettings.inc:668
 #, php-format
 msgid "The IP address '%s' is not part of the selected reverse zone '%s'!"
 msgstr "Â¡La direcciÃ³n IP '%s' no estÃ¡ dentro de la zona inversa seleccionada '%s'!"
 
-#: admin/systems/class_networkSettings.inc:686
+#: admin/systems/class_networkSettings.inc:678
 #, php-format
 msgid "Record type '%s' is duplicated!"
 msgstr "Â¡El tipo de registro '%s' estÃ¡ duplicado!"
 
-#: admin/systems/class_networkSettings.inc:693
+#: admin/systems/class_networkSettings.inc:685
 #, php-format
 msgid "Uniq record type '%s' is duplicated!"
 msgstr "Â¡El tipo de registro Ãºnico '%s' estÃ¡ duplicado!"
 
-#: admin/systems/class_networkSettings.inc:705
+#: admin/systems/class_networkSettings.inc:697
 #, php-format
 msgid ""
 "The IP address '%s' will be added as 'A Record', this will be done "
 "automatically, please remove the record."
 msgstr "La direcciÃ³n IP '%s' se aÃ±adira como 'Registro A', esto se harÃ¡ automÃ¡ticamente, por favor elimine el registro."
 
-#: admin/systems/class_networkSettings.inc:712
+#: admin/systems/class_networkSettings.inc:704
 #, php-format
 msgid "Only lowercase records are allowed, please check your '%ss'."
 msgstr "Solo estÃ¡n permitidas minÃºsculas, por favor compruebe su '%ss'."
 
-#: admin/systems/class_networkSettings.inc:978
+#: admin/systems/class_networkSettings.inc:970
 msgid "Delete"
 msgstr "Eliminar"
 
-#: admin/systems/class_networkSettings.inc:984
+#: admin/systems/class_networkSettings.inc:976
 msgid "Add"
 msgstr "AÃ±adir"
 
-#: admin/systems/class_networkSettings.inc:1015
-#: addons/dashboard/class_dashBoardNetwork.inc:127
+#: admin/systems/class_networkSettings.inc:1007
 msgid "Network"
 msgstr ""
 
-#: admin/systems/class_networkSettings.inc:1030
+#: admin/systems/class_networkSettings.inc:1022
 msgid "DNS configuration"
 msgstr "ConfiguraciÃ³n DNS"
 
-#: admin/systems/class_networkSettings.inc:1033
+#: admin/systems/class_networkSettings.inc:1025
 msgid "DHCP configuration"
 msgstr "ConfiguraciÃ³n DHCP"
 
-#: addons/dashboard/class_dashBoardSystems.inc:45
-msgid "Workstations"
-msgstr ""
-
-#: addons/dashboard/class_dashBoardSystems.inc:51
-msgid "Windows Workstations"
-msgstr ""
-
-#: addons/dashboard/class_dashBoardSystems.inc:54
-msgid "Terminals"
-msgstr ""
-
-#: addons/dashboard/class_dashBoardSystems.inc:57
-msgid "Printers"
-msgstr ""
-
-#: addons/dashboard/class_dashBoardSystems.inc:60
-msgid "Phones"
-msgstr ""
-
-#: addons/dashboard/class_dashBoardSystems.inc:63
-msgid "Components"
-msgstr ""
-
-#: addons/dashboard/class_dashBoardSystems.inc:66
-msgid "Mobile phones"
-msgstr ""
-
-#: addons/dashboard/class_dashBoardSystems.inc:183
-msgid "Statistics"
-msgstr ""
-
-#: addons/dashboard/class_dashBoardSystems.inc:188
-msgid "Computer name to use by unit"
-msgstr ""
-
-#: addons/dashboard/class_dashBoardSystems.inc:200
-msgid "Statistics and informations about systems"
-msgstr ""
-
-#: addons/dashboard/class_dashBoardNetwork.inc:111
-msgid "DHCP"
-msgstr "DHCP"
-
-#: addons/dashboard/class_dashBoardNetwork.inc:116
-msgid "DNS"
-msgstr "DNS"
-
-#: addons/dashboard/class_dashBoardNetwork.inc:128
-msgid "Statistics and various informations"
-msgstr ""
-
 #: config/systems/class_systemsPluginConfig.inc:29
 msgid "Systems plugin configuration"
 msgstr ""
@@ -1587,404 +1053,3 @@ msgstr ""
 #: config/systems/class_systemsPluginConfig.inc:101
 msgid "Encodings"
 msgstr ""
-
-#: admin/ogroups/goto/termgroup.tpl.c:5
-msgid ""
-"Actions you choose here influence all systems in this object group. "
-"Additionally, all values editable here can be inherited by the clients "
-"assigned to this object group."
-msgstr "Las acciones aquÃ seleccionadas tendrÃ¡n influencia en todos los sistemas en este grupo de objetos. AdemÃ¡s, todos los valores aquÃ editados pueden ser heredados por los clientes asignados a este grupo de objetos."
-
-#: admin/ogroups/goto/termgroup.tpl.c:8
-msgid "Generic"
-msgstr "GenÃ©rico"
-
-#: admin/ogroups/goto/termgroup.tpl.c:11
-msgid "NTP server"
-msgstr "Servidor NTP"
-
-#: admin/ogroups/goto/termgroup.tpl.c:14
-msgid "Choose server to use for synchronizing time"
-msgstr "Elija un servidor que serÃ¡ usado para sincronizaciÃ³n horaria"
-
-#: admin/ogroups/goto/termgroup.tpl.c:20
-msgid "Select terminal mode"
-msgstr "Seleccionar modo de terminal"
-
-#: admin/ogroups/goto/termgroup.tpl.c:26
-msgid "Choose server to use for logging"
-msgstr "Elija un servidor que serÃ¡ usado para registro"
-
-#: admin/ogroups/goto/termgroup.tpl.c:32
-msgid "Select NFS root filesystem to use"
-msgstr "Seleccione sistema de archivos raÃz 'NFS' que se usarÃ¡"
-
-#: admin/ogroups/goto/termgroup.tpl.c:38
-msgid "Choose NFS filesystem to place swap files on"
-msgstr "Seleccione sistema de archivos 'NFS' donde estarÃ¡n los archivos de intercambio"
-
-#: admin/ogroups/goto/termgroup.tpl.c:47
-msgid "Execute"
-msgstr "Ejecute"
-
-#: 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 admin/systems/network.tpl.c:11
-msgid "Propose ip"
-msgstr "Proponer ip"
-
-#: admin/systems/network.tpl.c:14
-msgid "MAC-address"
-msgstr "DirecciÃ³n MAC"
-
-#: admin/systems/network.tpl.c:17
-msgid "Autodetect"
-msgstr "AutodetecciÃ³n"
-
-#: admin/systems/network.tpl.c:20 admin/systems/network.tpl.c:23
-msgid "Enable DHCP for this device"
-msgstr "Activar DHCP para este dispositivo"
-
-#: admin/systems/network.tpl.c:26 admin/systems/network.tpl.c:50
-msgid "not configured"
-msgstr "Sin configurar"
-
-#: admin/systems/network.tpl.c:29
-msgid "Parent node"
-msgstr "Nodo padre"
-
-#: admin/systems/network.tpl.c:32
-msgid "Edit settings"
-msgstr "Editar caracterÃsticas"
-
-#: admin/systems/network.tpl.c:35 admin/systems/network.tpl.c:47
-msgid "Enable DNS for this device"
-msgstr "Activar DNS para este dispositivo"
-
-#: admin/systems/network.tpl.c:38
-msgid "Zone"
-msgstr "Zona"
-
-#: admin/systems/network.tpl.c:41
-msgid "TTL"
-msgstr "TTL"
-
-#: admin/systems/network.tpl.c:44
-msgid "Dns records"
-msgstr "Registros DNS"
-
-#: admin/systems/password.tpl.c:2
-msgid ""
-"To change the terminal root password use the fields below. The changes take "
-"effect during the next reboot. Please memorize the new password, because you"
-" wouldn't be able to log in."
-msgstr "Para cambiar la contraseÃ±a del administrador del terminal use los campos a continuaciÃ³n. Los cambios tomarÃ¡n efecto en el prÃ³ximo inicio. Por favor, recuerde la nueva contraseÃ±a, porque no podrÃ¡ iniciar sesiÃ³n sin ella."
-
-#: admin/systems/password.tpl.c:5
-msgid "Leave fields blank for password inheritance from default entries."
-msgstr "Si deja los campos en blanco, se heredaran las contraseÃ±as de las entradas predeterminadas."
-
-#: admin/systems/password.tpl.c:8
-msgid "Changing the password impinges on authentification only."
-msgstr "Cambiar la contraseÃ±a solo afecta a la autenticaciÃ³n."
-
-#: admin/systems/password.tpl.c:11
-msgid "New password"
-msgstr "Nueva contraseÃ±a"
-
-#: admin/systems/password.tpl.c:14
-msgid "Repeat new password"
-msgstr "Reintroduzca la contraseÃ±a"
-
-#: admin/systems/password.tpl.c:17
-msgid "Password strength"
-msgstr "Resistencia de la contraseÃ±a"
-
-#: admin/systems/password.tpl.c:20
-msgid "Set password"
-msgstr "Introducir contraseÃ±a"
-
-#: 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/gencd.tpl.c:2
-msgid "CD-Install-Image generation"
-msgstr "CreaciÃ³n de Imagen-CD-InstalaciÃ³n"
-
-#: admin/systems/gencd.tpl.c:5
-msgid ""
-"This option enables you to generate FAI install CD images for the selected "
-"workstation. The procedure may take about 10 minutes to complete, so please "
-"be patient after pressing the 'Create ISO-Image' button."
-msgstr "Esta opciÃ³n le permite generar imÃ¡genes de instalaciÃ³n de CD FAI para la estaciÃ³n de trabajo seleccionada. El procedimiento puede tardar 10 minutos en completarse, porfavor tenga paciencia despues de presionar el botÃ³n 'Crear imagen ISO'."
-
-#: admin/systems/gencd.tpl.c:8
-msgid "Create ISO-Image"
-msgstr "Crear Imagen-ISO"
-
-#: admin/systems/remove.tpl.c:5
-msgid ""
-"This includes all account data, system access rules, imap settings, etc. for"
-" this user. Please double check if your really want to do this since there "
-"is no way for FusionDirectory to get your data back."
-msgstr "Esto incluye toda la data de la cuenta, reglas de acceso de sistema, opciones imap, etc. para este usuario. Por favor verifique que realmente desea hacer esto ya que FusionDirectory no tiene forma de recuperar la data"
-
-#: admin/systems/remove.tpl.c:8
-msgid "So - if you're sure - press 'Delete' to continue or 'Cancel' to abort."
-msgstr "Entonces, si esta seguro, presione <i>Eliminar</i> para continuar o <i>Cancelar</i> para Abortar."
-
-#: admin/systems/system-filter.tpl.c:2
-#: admin/systems/phoneSelect/phoneSelect-filter.tpl.c:2
-msgid "Filter"
-msgstr "Filtro"
-
-#: admin/systems/system-filter.tpl.c:5
-msgid "Show servers"
-msgstr "Mostrar servidores"
-
-#: admin/systems/system-filter.tpl.c:8
-msgid "Show workstations"
-msgstr "Mostrar estaciones de trabajo"
-
-#: admin/systems/system-filter.tpl.c:11
-msgid "Show terminals"
-msgstr "Mostrar terminales"
-
-#: admin/systems/system-filter.tpl.c:14
-msgid "Show network printer"
-msgstr "Mostrar la impresoras de red"
-
-#: admin/systems/system-filter.tpl.c:17
-#: admin/systems/phoneSelect/phoneSelect-filter.tpl.c:5
-msgid "Show phones"
-msgstr "Mostrar telÃ©fonos"
-
-#: admin/systems/system-filter.tpl.c:20
-msgid "Show windows based workstations"
-msgstr "Mostrara estaciones de trabajo basadas en windows"
-
-#: admin/systems/system-filter.tpl.c:23
-msgid "Show network devices"
-msgstr "Mostrar dispositivos de Red"
-
-#: admin/systems/system-filter.tpl.c:26
-#: admin/systems/phoneSelect/phoneSelect-filter.tpl.c:8
-msgid "Show mobile phones"
-msgstr ""
-
-#: admin/systems/system-filter.tpl.c:29
-msgid "Show IPMI interfaces"
-msgstr ""
-
-#: admin/systems/ppd/printerPPDSelectionDialog.tpl.c:2
-msgid "Select objects to add"
-msgstr "Seleccione los objetos a aÃ±adir"
-
-#: admin/systems/ppd/printerPPDSelectionDialog.tpl.c:5
-msgid "Filters"
-msgstr "Filtros"
-
-#: admin/systems/ppd/printerPPDSelectionDialog.tpl.c:8
-msgid "Display objects matching"
-msgstr "Mostrar objetos que coincidan"
-
-#: admin/systems/ppd/printerPPDSelectionDialog.tpl.c:11
-msgid "Regular expression for matching object names"
-msgstr "Expresiones regulares para buscar nombre de objetos"
-
-#: admin/systems/ppd/printerPPDSelectionDialog.tpl.c:14
-msgid "Close"
-msgstr "Cerrar"
-
-#: admin/systems/ppd/printerPPDDialog.tpl.c:2
-msgid "Printer driver"
-msgstr "Controlador de impresora"
-
-#: admin/systems/ppd/printerPPDDialog.tpl.c:5
-msgid "Model"
-msgstr "Modelo"
-
-#: admin/systems/ppd/printerPPDDialog.tpl.c:8
-msgid "Select"
-msgstr "Seleccionar"
-
-#: admin/systems/ppd/printerPPDDialog.tpl.c:11
-msgid "New driver"
-msgstr "Nuevo controlador"
-
-#: admin/systems/ppd/printerPPDDialog.tpl.c:14
-msgid "Upload"
-msgstr "Enviar"
-
-#: admin/systems/ppd/printerPPDDialog.tpl.c:17
-msgid "Options"
-msgstr "Opciones"
-
-#: admin/systems/ppd/remove_ppd.tpl.c:5
-msgid "The ppd file will be removed from the server and can not be restored."
-msgstr "El archivo ppd serÃ¡ eliminado del servidor y no podrÃ¡ ser recuperado."
-
-#: admin/systems/printer.tpl.c:2
-msgid "General"
-msgstr "General"
-
-#: admin/systems/printer.tpl.c:5
-msgid "Printer name"
-msgstr "Nombre de la impresora"
-
-#: admin/systems/printer.tpl.c:14
-msgid "Details"
-msgstr "Detalles"
-
-#: admin/systems/printer.tpl.c:20
-msgid "Printer location"
-msgstr "LocalizaciÃ³n de la impresora"
-
-#: admin/systems/printer.tpl.c:26
-msgid "PPD Provider"
-msgstr "Proveedor PPD"
-
-#: admin/systems/printer.tpl.c:29
-msgid "Driver"
-msgstr "Controlador"
-
-#: admin/systems/printer.tpl.c:32
-msgid "Edit"
-msgstr "Editar"
-
-#: admin/systems/printer.tpl.c:41
-msgid "Users which are allowed to use this printer"
-msgstr "Usuarios que tienen permiso para acceder a esta impresora"
-
-#: admin/systems/printer.tpl.c:44
-msgid "Users"
-msgstr "Usuarios"
-
-#: admin/systems/printer.tpl.c:47
-msgid "Users which are allowed to administrate this printer"
-msgstr "usuarios que tienen permisos para administrar esta impresora"
-
-#: admin/systems/printer.tpl.c:50
-msgid "Admins"
-msgstr "Administradores"
-
-#: admin/systems/printer.tpl.c:53
-msgid "Windows paths"
-msgstr ""
-
-#: admin/systems/printer.tpl.c:56
-msgid "Printer windows inf file"
-msgstr ""
-
-#: admin/systems/printer.tpl.c:59
-msgid "Printer driver directory"
-msgstr ""
-
-#: admin/systems/gencd_frame.tpl.c:2
-msgid "Your browser does not supprt iframes."
-msgstr "Su navegador no soporta iframes."
-
-#: admin/systems/services/cups/serviceCUPS.tpl.c:2
-msgid "Print Service"
-msgstr "Servicio de impresiÃ³n"
-
-#: admin/systems/services/cups/serviceCUPS.tpl.c:5
-msgid "enabled"
-msgstr "activado"
-
-#: admin/systems/services/ServiceAddDialog.tpl.c:2
-msgid "Adding a new service to the current server"
-msgstr "AÃ±adiendo un nuevo servicio al servidor seleccionado"
-
-#: admin/systems/services/ServiceAddDialog.tpl.c:5
-msgid ""
-"This dialog allows you to add new services to the currenty edited server "
-"object. The box below shows all available but not already used services."
-msgstr "Este diÃ¡logo le permite aÃ±adir nuevos servicios al servidor que estÃ¡ configurando. El panel inferior muestra todos los servicios disponibles y que no estÃ¡n siendo usados."
-
-#: admin/systems/services/ServiceAddDialog.tpl.c:8
-msgid "Service to add"
-msgstr "Servicio a aÃ±adir"
-
-#: admin/systems/services/ServiceAddDialog.tpl.c:11
-msgid "All available services are already in use."
-msgstr "Todos los servicios disponibles ya estÃ¡n en uso."
-
-#: admin/systems/services/ServiceAddDialog.tpl.c:14
-#: admin/systems/SelectDeviceType.tpl.c:26
-msgid "Continue"
-msgstr "Continuar"
-
-#: admin/systems/SelectDeviceType.tpl.c:2
-msgid ""
-"This system has no system type configured. Please choose a system type for "
-"this object and an optional inheritance group. Press the 'continue' button "
-"to proceed."
-msgstr "El sistema no tiene tipo de sistema configurado. Por favor elija un tipo de sistema para el objeto y un grupo de herencia opcional. Pulse el botÃ³n 'continuar' para proceder."
-
-#: admin/systems/SelectDeviceType.tpl.c:5
-msgid ""
-"Please select a system type and an optional bundle of predefined settings to"
-" be inherited."
-msgstr "Por favor seleccione un tipo de sistema y un paquete opcional de configuraciones predefinidas para ser heredadas."
-
-#: admin/systems/SelectDeviceType.tpl.c:8
-msgid ""
-"Please select a system type and a bundle of predefined settings to be "
-"inherited."
-msgstr "Por favor seleccione un tipo de sistema y un paquete de configuraciones predefinidas para ser heredadas."
-
-#: admin/systems/SelectDeviceType.tpl.c:11
-#: admin/systems/SelectDeviceType.tpl.c:14
-msgid "System type"
-msgstr "Tipo de sistema"
-
-#: admin/systems/SelectDeviceType.tpl.c:17
-msgid "Choose an object group as template"
-msgstr "Elija un grupo de objetos como plantilla"
-
-#: admin/systems/SelectDeviceType.tpl.c:20
-msgid "Object group"
-msgstr "Grupo de objetos"
-
-#: admin/systems/SelectDeviceType.tpl.c:23
-msgid "none"
-msgstr "ninguno"
-
-#: addons/dashboard/systems_stats.tpl.c:2
-msgid "There are several argonaut servers! (this is not yet supported)"
-msgstr ""
-
-#: addons/dashboard/systems_stats.tpl.c:5
-msgid "There is an argonaut server running on %1 (%3://%2:%4)"
-msgstr ""
-
-#: addons/dashboard/systems_stats.tpl.c:8
-msgid "Only one system is configured to run an argonaut client."
-msgid_plural "%1 systems are configured to run an argonaut client."
-msgstr[0] ""
-msgstr[1] ""
-
-#: addons/dashboard/systems_stats.tpl.c:11
-msgid "But no system is configured to run an argonaut client!"
-msgstr ""
-
-#: addons/dashboard/systems_stats.tpl.c:14
-msgid ""
-"A system is configured to run an argonaut client, but there is no argonaut "
-"server configured!"
-msgid_plural ""
-"%1 systems are configured to run an argonaut client, but there is no "
-"argonaut server configured!"
-msgstr[0] ""
-msgstr[1] ""
diff --git a/systems/locale/fa_IR/fusiondirectory.po b/systems/locale/fa_IR/fusiondirectory.po
index ee9649d753a932de02e29ce14cb58e3bf449c0eb..7149e38a160e7860c7d2f369ebf4fd4e222646c9 100644
--- a/systems/locale/fa_IR/fusiondirectory.po
+++ b/systems/locale/fa_IR/fusiondirectory.po
@@ -5,12 +5,12 @@
 # Translators:
 msgid ""
 msgstr ""
-"Project-Id-Version: FusionDirectory-108\n"
+"Project-Id-Version: FusionDirectory-109\n"
 "Report-Msgid-Bugs-To: documentation@lists.fusiondirectory.org\n"
-"POT-Creation-Date: 2015-03-31 11:49+0200\n"
-"PO-Revision-Date: 2015-03-31 11:24+0000\n"
+"POT-Creation-Date: 2014-12-15 17:47+0100\n"
+"PO-Revision-Date: 2014-12-15 17:06+0000\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>\n"
-"Language-Team: Persian (Iran) (http://www.transifex.com/projects/p/FusionDirectory-108/language/fa_IR/)\n"
+"Language-Team: Persian (Iran) (http://www.transifex.com/projects/p/FusionDirectory-109/language/fa_IR/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -26,29 +26,24 @@ msgid "Locked"
 msgstr ""
 
 #: admin/ogroups/goto/class_termgroup.inc:118
-#: admin/systems/class_terminalGeneric.inc:121
+#: admin/systems/class_terminalStartup.inc:145
 msgid "Local swap"
 msgstr ""
 
 #: admin/ogroups/goto/class_termgroup.inc:124
 #: admin/ogroups/goto/class_termgroup.inc:136
-#: admin/systems/class_workstationGeneric.inc:352
-#: admin/systems/class_terminalGeneric.inc:109
-#: admin/systems/class_terminalGeneric.inc:125
+#: admin/systems/class_terminalStartup.inc:133
+#: admin/systems/class_terminalStartup.inc:149
 msgid "inherited"
 msgstr ""
 
 #: admin/ogroups/goto/class_termgroup.inc:220
-#: admin/systems/class_workstationGeneric.inc:72
-#: admin/systems/class_workstationGeneric.inc:443
-#: admin/systems/class_systemManagement.inc:295
-#: admin/systems/class_systemManagement.inc:325
-msgid "Infrastructure service"
+#: admin/systems/class_systemManagement.inc:165
+#: admin/systems/class_systemManagement.inc:186
+msgid "Service infrastructure"
 msgstr ""
 
 #: admin/ogroups/goto/class_termgroup.inc:224
-#: admin/systems/class_workstationGeneric.inc:75
-#: admin/systems/class_workstationGeneric.inc:78
 msgid "Event error"
 msgstr ""
 
@@ -58,12 +53,10 @@ msgid "Event '%s' is not available!"
 msgstr ""
 
 #: admin/ogroups/goto/class_termgroup.inc:274
-#: admin/systems/class_workstationGeneric.inc:112
 msgid "Switch off"
 msgstr ""
 
 #: admin/ogroups/goto/class_termgroup.inc:274
-#: admin/systems/class_workstationGeneric.inc:113
 msgid "Reboot"
 msgstr ""
 
@@ -84,7 +77,6 @@ msgid "Reinstall"
 msgstr ""
 
 #: admin/ogroups/goto/class_termgroup.inc:279
-#: admin/systems/class_workstationGeneric.inc:108
 msgid "Memory test"
 msgstr ""
 
@@ -93,21 +85,18 @@ msgid "System analysis"
 msgstr ""
 
 #: admin/ogroups/goto/class_termgroup.inc:386
-#: admin/systems/class_printGeneric.inc:670
-#: admin/systems/class_printGeneric.inc:970
-#: admin/systems/class_systemManagement.inc:816
 #: admin/systems/services/class_goService.inc:123
 #: admin/systems/services/class_goService.inc:151
 #: admin/systems/services/class_goService.inc:187
-#: admin/systems/class_networkSettings.inc:478
-#: admin/systems/class_networkSettings.inc:491
-#: admin/systems/class_networkSettings.inc:757
-#: admin/systems/class_networkSettings.inc:816
-#: admin/systems/class_networkSettings.inc:835
-#: admin/systems/class_networkSettings.inc:852
-#: admin/systems/class_networkSettings.inc:861
-#: admin/systems/class_networkSettings.inc:879
-#: admin/systems/class_networkSettings.inc:951
+#: admin/systems/class_networkSettings.inc:470
+#: admin/systems/class_networkSettings.inc:483
+#: admin/systems/class_networkSettings.inc:749
+#: admin/systems/class_networkSettings.inc:808
+#: admin/systems/class_networkSettings.inc:827
+#: admin/systems/class_networkSettings.inc:844
+#: admin/systems/class_networkSettings.inc:853
+#: admin/systems/class_networkSettings.inc:871
+#: admin/systems/class_networkSettings.inc:943
 msgid "LDAP error"
 msgstr "Ø®Ø·Ø§ÛŒ LDAP"
 
@@ -119,195 +108,125 @@ msgstr ""
 msgid "System group"
 msgstr ""
 
-#: admin/ogroups/goto/class_termgroup.inc:401
-#: admin/ogroups/goto/termgroup.tpl.c:17
+#: admin/ogroups/goto/class_termgroup.inc:402
 msgid "Mode"
 msgstr ""
 
-#: admin/ogroups/goto/class_termgroup.inc:402
-#: admin/systems/class_workstationGeneric.inc:189
-#: admin/ogroups/goto/termgroup.tpl.c:23
+#: admin/ogroups/goto/class_termgroup.inc:403
+#: admin/systems/class_systemServers.inc:35
 msgid "Syslog server"
 msgstr ""
 
-#: admin/ogroups/goto/class_termgroup.inc:403
+#: admin/ogroups/goto/class_termgroup.inc:404
 msgid "Action flag"
 msgstr ""
 
-#: admin/ogroups/goto/class_termgroup.inc:404
+#: admin/ogroups/goto/class_termgroup.inc:405
 msgid "Ntp server"
 msgstr ""
 
-#: admin/ogroups/goto/class_termgroup.inc:405
-#: admin/systems/class_terminalGeneric.inc:41
-#: admin/ogroups/goto/termgroup.tpl.c:29
+#: admin/ogroups/goto/class_termgroup.inc:406
+#: admin/systems/class_terminalStartup.inc:65
 msgid "Root server"
 msgstr ""
 
-#: admin/ogroups/goto/class_termgroup.inc:406
-#: admin/systems/class_terminalGeneric.inc:47
-#: admin/ogroups/goto/termgroup.tpl.c:35
+#: admin/ogroups/goto/class_termgroup.inc:407
+#: admin/systems/class_terminalStartup.inc:69
 msgid "Swap server"
 msgstr ""
 
-#: admin/systems/class_terminalStartup.inc:63
+#: admin/systems/class_terminalStartup.inc:62
 msgid "Startup parameters"
 msgstr ""
 
-#: admin/systems/class_terminalStartup.inc:66
+#: admin/systems/class_terminalStartup.inc:65
+msgid "The root server the terminal should be using"
+msgstr ""
+
+#: admin/systems/class_terminalStartup.inc:69
+msgid "The swap server the terminal should be using"
+msgstr ""
+
+#: admin/systems/class_terminalStartup.inc:73
 msgid "Boot kernel"
 msgstr ""
 
-#: admin/systems/class_terminalStartup.inc:66
+#: admin/systems/class_terminalStartup.inc:73
 msgid "Linux kernel to be installed and booted"
 msgstr ""
 
-#: admin/systems/class_terminalStartup.inc:70
+#: admin/systems/class_terminalStartup.inc:77
 msgid "Boot kernel parameters"
 msgstr ""
 
-#: admin/systems/class_terminalStartup.inc:70
+#: admin/systems/class_terminalStartup.inc:77
 msgid "Linux kernel parameters to be ran"
 msgstr ""
 
-#: admin/systems/class_terminalStartup.inc:82
-msgid "Startup"
-msgstr ""
-
 #: admin/systems/class_terminalStartup.inc:83
-msgid "Terminal startup"
-msgstr ""
-
-#: admin/systems/system-list.xml:10
-msgid "List of systems"
-msgstr ""
-
-#: admin/systems/system-list.xml:14
-msgid "New workstation"
-msgstr ""
-
-#: admin/systems/system-list.xml:22
-msgid "Locked server"
-msgstr ""
-
-#: admin/systems/system-list.xml:30
-msgid "Locked workstation"
-msgstr ""
-
-#: admin/systems/system-list.xml:38
-msgid "Locked terminal"
-msgstr ""
-
-#: admin/systems/system-list.xml:47
-msgid "New terminal"
-msgstr ""
-
-#: admin/systems/system-list.xml:55
-msgid "New device"
-msgstr ""
-
-#: admin/systems/system-list.xml:63
-msgid "Workstation template"
-msgstr ""
-
-#: admin/systems/system-list.xml:71
-msgid "Terminal template"
+msgid "Remote desktop"
 msgstr ""
 
-#: admin/systems/system-list.xml:79
-msgid "Winstation"
+#: admin/systems/class_terminalStartup.inc:87
+msgid "Connect method"
 msgstr ""
 
-#: admin/systems/system-list.xml:87 admin/systems/system-list.xml:234
-#: admin/systems/class_systemImport.inc:169
-#: admin/systems/class_serverGeneric.inc:46
-#: admin/systems/class_serverGeneric.inc:51
-#: admin/systems/class_serverGeneric.inc:52
-#: admin/systems/class_SelectDeviceType.inc:58
-msgid "Server"
+#: admin/systems/class_terminalStartup.inc:91
+msgid "XDMCP"
 msgstr ""
 
-#: admin/systems/system-list.xml:95 admin/systems/system-list.xml:242
-#: admin/systems/class_workstationGeneric.inc:458
-#: admin/systems/class_workstationGeneric.inc:463
-#: admin/systems/class_workstationGeneric.inc:464
-#: admin/systems/class_SelectDeviceType.inc:58
-msgid "Workstation"
+#: admin/systems/class_terminalStartup.inc:91
+msgid "LDM"
 msgstr ""
 
-#: admin/systems/system-list.xml:103 admin/systems/system-list.xml:250
-#: admin/systems/class_terminalGeneric.inc:81
-#: admin/systems/class_terminalGeneric.inc:86
-#: admin/systems/class_terminalGeneric.inc:87
-#: admin/systems/class_SelectDeviceType.inc:58
-msgid "Terminal"
+#: admin/systems/class_terminalStartup.inc:91
+msgid "Shell"
 msgstr ""
 
-#: admin/systems/system-list.xml:111 admin/systems/class_printGeneric.inc:1005
-#: admin/systems/class_printGeneric.inc:1011
-#: admin/systems/class_printGeneric.inc:1012
-msgid "Printer"
+#: admin/systems/class_terminalStartup.inc:91
+msgid "Telnet"
 msgstr ""
 
-#: admin/systems/system-list.xml:119 admin/systems/system-list.xml:274
-#: admin/systems/class_mobilePhoneGeneric.inc:74
-#: admin/systems/phoneSelect/phoneSelect-list.xml:14
-msgid "Phone"
-msgstr "ØªÙ„ÙÙ†"
-
-#: admin/systems/system-list.xml:127
-#: admin/systems/class_mobilePhoneGeneric.inc:36
-#: admin/systems/class_mobilePhoneGeneric.inc:41
-#: admin/systems/class_mobilePhoneGeneric.inc:42
-#: admin/systems/phoneSelect/phoneSelect-list.xml:22
-msgid "Mobile phone"
+#: admin/systems/class_terminalStartup.inc:91
+msgid "Windows RDP"
 msgstr ""
 
-#: admin/systems/system-list.xml:135
-#: admin/systems/class_componentGeneric.inc:36
-msgid "Component"
+#: admin/systems/class_terminalStartup.inc:95
+msgid "Terminal server"
 msgstr ""
 
-#: admin/systems/system-list.xml:143 admin/systems/system-list.xml:298
-msgid "IPMI"
+#: admin/systems/system-list.xml:10
+msgid "List of systems"
 msgstr ""
 
-#: admin/systems/system-list.xml:169
-#: admin/systems/class_workstationGeneric.inc:154
-#: admin/systems/class_printGeneric.inc:752
-#: admin/systems/class_printGeneric.inc:762
-#: admin/systems/class_printGeneric.inc:781
-#: admin/systems/class_printGeneric.inc:1022
-#: admin/systems/class_componentGeneric.inc:64
-#: admin/systems/class_mobilePhoneGeneric.inc:63
-#: admin/systems/phoneSelect/phoneSelect-list.xml:48
+#: admin/systems/system-list.xml:31
+#: admin/systems/class_workstationGeneric.inc:46
+#: admin/systems/class_printGeneric.inc:60
+#: admin/systems/class_componentGeneric.inc:58
+#: admin/systems/class_mobilePhoneGeneric.inc:60
 #: admin/systems/services/shares/class_serviceShare.inc:52
-#: admin/systems/system-filter.tpl.c:32
-#: admin/systems/phoneSelect/phoneSelect-filter.tpl.c:11
 msgid "Name"
 msgstr ""
 
-#: admin/systems/system-list.xml:177
-#: admin/systems/phoneSelect/phoneSelect-list.xml:63
+#: admin/systems/system-list.xml:39
 msgid "IP"
 msgstr ""
 
-#: admin/systems/system-list.xml:185
+#: admin/systems/system-list.xml:47
 msgid "MAC"
 msgstr ""
 
-#: admin/systems/system-list.xml:193
-#: admin/systems/class_workstationGeneric.inc:160
-#: admin/systems/class_printGeneric.inc:1024
-#: admin/systems/class_componentGeneric.inc:68
-#: admin/systems/class_mobilePhoneGeneric.inc:67
+#: admin/systems/system-list.xml:55
+#: admin/systems/class_workstationGeneric.inc:51
+#: admin/systems/class_printGeneric.inc:64
+#: admin/systems/class_componentGeneric.inc:62
+#: admin/systems/class_mobilePhoneGeneric.inc:64
 #: admin/systems/serverService-list.xml:35
 #: admin/systems/services/shares/class_serviceShare.inc:56
-#: admin/systems/printer.tpl.c:8 admin/systems/printer.tpl.c:17
 msgid "Description"
 msgstr ""
 
-#: admin/systems/system-list.xml:201 admin/systems/class_serverService.inc:57
+#: admin/systems/system-list.xml:63 admin/systems/class_serverService.inc:57
 #: admin/systems/services/terminal/class_serviceTerminal.inc:30
 #: admin/systems/services/cups/class_serviceCUPS.inc:85
 #: admin/systems/services/shares/class_serviceShare.inc:31
@@ -316,378 +235,186 @@ msgstr ""
 msgid "Services"
 msgstr ""
 
-#: admin/systems/system-list.xml:209
+#: admin/systems/system-list.xml:71
 msgid "Release"
 msgstr ""
 
-#: admin/systems/system-list.xml:217 admin/systems/serverService-list.xml:43
-#: admin/systems/phoneSelect/phoneSelect-list.xml:70
+#: admin/systems/system-list.xml:79 admin/systems/serverService-list.xml:43
 msgid "Actions"
 msgstr ""
 
-#: admin/systems/system-list.xml:228 admin/systems/serverService-list.xml:54
+#: admin/systems/system-list.xml:90 admin/systems/serverService-list.xml:54
 msgid "Create"
 msgstr ""
 
-#: admin/systems/system-list.xml:258
-msgid "winStation"
-msgstr ""
-
-#: admin/systems/system-list.xml:266
-msgid "Network printer"
-msgstr ""
-
-#: admin/systems/system-list.xml:282
-#: admin/systems/class_componentGeneric.inc:41
-#: admin/systems/class_componentGeneric.inc:42
-msgid "Network device"
-msgstr ""
-
-#: admin/systems/system-list.xml:290
-msgid "Mobile Phone"
-msgstr ""
-
-#: admin/systems/system-list.xml:310
+#: admin/systems/system-list.xml:100
 msgid "Trigger action"
 msgstr ""
 
-#: admin/systems/system-list.xml:317
+#: admin/systems/system-list.xml:107
 msgid "Schedule action"
 msgstr ""
 
-#: admin/systems/system-list.xml:330
-msgid "Activate systems"
-msgstr ""
-
-#: admin/systems/system-list.xml:337 admin/systems/serverService-list.xml:69
-#: admin/systems/printer.tpl.c:35
+#: admin/systems/system-list.xml:119 admin/systems/serverService-list.xml:69
 msgid "Remove"
 msgstr ""
 
-#: admin/systems/system-list.xml:367
-msgid "Create ISO"
-msgstr ""
-
-#: admin/systems/system-list.xml:379
+#: admin/systems/system-list.xml:150
 msgid "Edit system"
 msgstr ""
 
-#: admin/systems/system-list.xml:392
+#: admin/systems/system-list.xml:163
 msgid "Remove system"
 msgstr ""
 
-#: admin/systems/class_workstationGeneric.inc:75
-#, php-format
-msgid "Event %s is not available!"
-msgstr ""
-
-#: admin/systems/class_workstationGeneric.inc:78
-msgid "Events are not available!"
-msgstr ""
-
-#: admin/systems/class_workstationGeneric.inc:106
-msgid "(Re)Install"
-msgstr ""
-
-#: admin/systems/class_workstationGeneric.inc:107
-msgid "Software update"
-msgstr ""
-
-#: admin/systems/class_workstationGeneric.inc:115
-msgid "Wake up"
-msgstr ""
-
-#: admin/systems/class_workstationGeneric.inc:144
-#: admin/systems/class_printGeneric.inc:604
+#: admin/systems/class_workstationGeneric.inc:35
 msgid "workstation"
 msgstr ""
 
-#: admin/systems/class_workstationGeneric.inc:151
-#: admin/systems/class_componentGeneric.inc:61
-#: admin/systems/class_mobilePhoneGeneric.inc:60
+#: admin/systems/class_workstationGeneric.inc:42
+#: admin/systems/class_printGeneric.inc:56
+#: admin/systems/class_componentGeneric.inc:55
+#: admin/systems/class_mobilePhoneGeneric.inc:56
 msgid "Properties"
 msgstr ""
 
-#: admin/systems/class_workstationGeneric.inc:155
+#: admin/systems/class_workstationGeneric.inc:47
 #, php-format
 msgid "The name of the %s"
 msgstr ""
 
-#: admin/systems/class_workstationGeneric.inc:161
+#: admin/systems/class_workstationGeneric.inc:52
 #, php-format
 msgid "A short description of the %s"
 msgstr ""
 
-#: admin/systems/class_workstationGeneric.inc:166
-#: admin/systems/class_printGeneric.inc:1025
+#: admin/systems/class_workstationGeneric.inc:56
 msgid "Location"
 msgstr ""
 
-#: admin/systems/class_workstationGeneric.inc:167
+#: admin/systems/class_workstationGeneric.inc:57
 #, php-format
 msgid "The location of the %s"
 msgstr ""
 
-#: admin/systems/class_workstationGeneric.inc:173
+#: admin/systems/class_workstationGeneric.inc:61
 #, php-format
 msgid "Lock this %s"
 msgstr ""
 
-#: admin/systems/class_workstationGeneric.inc:174
+#: admin/systems/class_workstationGeneric.inc:62
 #, php-format
 msgid "This will prevent the %s from being reinstalled"
 msgstr ""
 
-#: admin/systems/class_workstationGeneric.inc:185
-#: addons/dashboard/class_dashBoardSystems.inc:48
-msgid "Servers"
-msgstr ""
-
-#: admin/systems/class_workstationGeneric.inc:190
-#, php-format
-msgid "The syslog server the %s should be using"
-msgstr ""
-
-#: admin/systems/class_workstationGeneric.inc:195
-msgid "Inherit NTP servers"
-msgstr ""
-
-#: admin/systems/class_workstationGeneric.inc:196
-msgid "Inherit time server attributes from ogroup"
-msgstr ""
-
-#: admin/systems/class_workstationGeneric.inc:202
-msgid "NTP servers"
+#: admin/systems/class_workstationGeneric.inc:73
+#: admin/systems/class_printGeneric.inc:83
+#: admin/systems/class_componentGeneric.inc:69
+#: admin/systems/class_mobilePhoneGeneric.inc:102
+#: admin/systems/class_networkSettings.inc:1008
+msgid "Network settings"
 msgstr ""
 
-#: admin/systems/class_workstationGeneric.inc:203
-#, php-format
-msgid "The NTP servers for the %s"
+#: admin/systems/class_workstationGeneric.inc:78
+#: admin/systems/class_printGeneric.inc:87
+#: admin/systems/class_componentGeneric.inc:73
+#: admin/systems/class_mobilePhoneGeneric.inc:106
+#: admin/systems/class_networkSettings.inc:630
+#: admin/systems/class_networkSettings.inc:643
+#: admin/systems/class_networkSettings.inc:645
+#: admin/systems/class_networkSettings.inc:1014
+msgid "IP address"
 msgstr ""
 
-#: admin/systems/class_workstationGeneric.inc:209
-msgid "Inherit LDAP servers"
+#: admin/systems/class_workstationGeneric.inc:78
+msgid "IP addresses this system uses (v4 or v6)"
 msgstr ""
 
-#: admin/systems/class_workstationGeneric.inc:210
-msgid "Inherit LDAP server attributes from ogroup"
+#: admin/systems/class_workstationGeneric.inc:83
+#: admin/systems/class_printGeneric.inc:91
+#: admin/systems/class_componentGeneric.inc:77
+#: admin/systems/class_mobilePhoneGeneric.inc:110
+msgid "Mac address"
 msgstr ""
 
-#: admin/systems/class_workstationGeneric.inc:216
-msgid "LDAP servers"
+#: admin/systems/class_workstationGeneric.inc:83
+#: admin/systems/class_printGeneric.inc:91
+#: admin/systems/class_componentGeneric.inc:77
+#: admin/systems/class_mobilePhoneGeneric.inc:110
+msgid "Mac address of this system"
 msgstr ""
 
-#: admin/systems/class_workstationGeneric.inc:217
-#, php-format
-msgid "The LDAP servers for the %s"
+#: admin/systems/class_workstationGeneric.inc:125
+#: admin/systems/class_workstationGeneric.inc:130
+#: admin/systems/class_workstationGeneric.inc:131
+msgid "Workstation"
 msgstr ""
 
-#: admin/systems/class_workstationGeneric.inc:225
-#: admin/systems/class_workstationGeneric.inc:229
-#: admin/ogroups/goto/termgroup.tpl.c:41
-msgid "Action"
+#: admin/systems/class_workstationGeneric.inc:126
+msgid "Workstation information"
 msgstr ""
 
-#: admin/systems/class_workstationGeneric.inc:230
-#: admin/ogroups/goto/termgroup.tpl.c:44
-msgid "Select action to execute for this terminal"
+#: admin/systems/class_printGeneric.inc:32
+#: admin/systems/class_printGeneric.inc:37
+#: admin/systems/class_printGeneric.inc:38
+msgid "Printer"
 msgstr ""
 
-#: admin/systems/class_workstationGeneric.inc:236
-#: admin/systems/class_componentGeneric.inc:75
-#: admin/systems/class_mobilePhoneGeneric.inc:106
-#: admin/systems/class_networkSettings.inc:1016
-msgid "Network settings"
+#: admin/systems/class_printGeneric.inc:33
+msgid "Printer information"
 msgstr ""
 
-#: admin/systems/class_workstationGeneric.inc:459
-msgid "Workstation information"
+#: admin/systems/class_printGeneric.inc:60
+msgid "The name of the printer"
 msgstr ""
 
-#: admin/systems/class_printGeneric.inc:131
-#: admin/systems/class_printGeneric.inc:1065
-#: admin/systems/class_systemManagement.inc:678
-msgid "Internal error"
-msgstr "Ø®Ø·Ø§ÛŒ Ø¯Ø§Ø®Ù„ÛŒ"
-
-#: admin/systems/class_printGeneric.inc:131
-#, php-format
-msgid ""
-"Cannot determine a valid department for this object. Setting base to '%s'!"
+#: admin/systems/class_printGeneric.inc:64
+msgid "A short description of the printer"
 msgstr ""
 
-#: admin/systems/class_printGeneric.inc:311
-#: admin/systems/class_printGeneric.inc:319
-#: admin/systems/class_printGeneric.inc:324
-#: admin/systems/class_printGeneric.inc:374
-#: admin/systems/class_printGeneric.inc:390
-#: admin/systems/class_printGeneric.inc:393
-msgid "Add printer extension"
+#: admin/systems/class_printGeneric.inc:70
+msgid "Details"
 msgstr ""
 
-#: admin/systems/class_printGeneric.inc:312
-msgid ""
-"Could not initialize printer tab, parameter parent was missing while "
-"construction."
+#: admin/systems/class_printGeneric.inc:73
+msgid "Printer location"
 msgstr ""
 
-#: admin/systems/class_printGeneric.inc:320
-msgid "This is a workstation template, printer tab is disabled."
+#: admin/systems/class_printGeneric.inc:73
+msgid "The location of the printer"
 msgstr ""
 
-#: admin/systems/class_printGeneric.inc:325
-msgid "This is a terminal template, printer tab is disabled."
+#: admin/systems/class_printGeneric.inc:77
+msgid "Printer URL"
 msgstr ""
 
-#: admin/systems/class_printGeneric.inc:367
-#: admin/systems/class_printGeneric.inc:375
-#: admin/systems/class_printGeneric.inc:383
-#: admin/systems/class_printGeneric.inc:386
-#: admin/systems/class_printGeneric.inc:391
-#: admin/systems/class_printGeneric.inc:394
-msgid "printer"
+#: admin/systems/class_printGeneric.inc:77
+msgid "The URL of the printer"
 msgstr ""
 
-#: admin/systems/class_printGeneric.inc:375
-msgid ""
-"You can't enable it while 'cn' is not present in entry. Possibly you are "
-"currently creating a new terminal template."
+#: admin/systems/class_printGeneric.inc:87
+#: admin/systems/class_componentGeneric.inc:73
+#: admin/systems/class_mobilePhoneGeneric.inc:106
+msgid "IP address this system uses"
 msgstr ""
 
-#: admin/systems/class_printGeneric.inc:382
-#: admin/systems/class_printGeneric.inc:385
-msgid "Remove printer extension"
+#: admin/systems/class_serverService.inc:58
+msgid "Server services"
 msgstr ""
 
-#: admin/systems/class_printGeneric.inc:474
-#: admin/systems/class_printGeneric.inc:652
-#: admin/systems/class_printGeneric.inc:659
-#: admin/systems/class_printGeneric.inc:718
-#: admin/systems/class_printGeneric.inc:1105
-#: admin/systems/class_printGeneric.inc:1116
 #: admin/systems/class_serverService.inc:224
 #: admin/systems/class_serverService.inc:270
 #: admin/systems/class_serverService.inc:393
-#: admin/systems/class_systemManagement.inc:341
-#: admin/systems/class_systemManagement.inc:624
-#: admin/systems/class_systemManagement.inc:639
 #: admin/systems/services/shares/class_serviceShare.inc:103
-#: admin/systems/class_networkSettings.inc:305
-#: admin/systems/class_networkSettings.inc:336
-#: admin/systems/class_networkSettings.inc:584
-#: admin/systems/class_networkSettings.inc:591
-#: admin/systems/class_networkSettings.inc:597
-#: admin/systems/class_networkSettings.inc:604
+#: admin/systems/class_networkSettings.inc:297
+#: admin/systems/class_networkSettings.inc:328
+#: admin/systems/class_networkSettings.inc:576
+#: admin/systems/class_networkSettings.inc:583
+#: admin/systems/class_networkSettings.inc:589
+#: admin/systems/class_networkSettings.inc:596
 msgid "Error"
 msgstr "Ø®Ø·Ø§"
 
-#: admin/systems/class_printGeneric.inc:577
-#, php-format
-msgid "Your currently selected PPD file '%s' doesn't exist."
-msgstr ""
-
-#: admin/systems/class_printGeneric.inc:583
-msgid "Not defined"
-msgstr ""
-
-#: admin/systems/class_printGeneric.inc:587
-#: admin/systems/ppd/class_printerPPDDialog.inc:116
-msgid "Can't get ppd informations."
-msgstr ""
-
-#: admin/systems/class_printGeneric.inc:602
-#: admin/systems/class_printGeneric.inc:604
-#, php-format
-msgid "This printer belongs to %s. You can't rename this printer."
-msgstr ""
-
-#: admin/systems/class_printGeneric.inc:602
-#: admin/systems/class_terminalGeneric.inc:34
-msgid "terminal"
-msgstr ""
-
-#: admin/systems/class_printGeneric.inc:652
-#: admin/systems/class_printGeneric.inc:659
-msgid "Object is no printer!"
-msgstr ""
-
-#: admin/systems/class_printGeneric.inc:767 admin/systems/printer.tpl.c:23
-msgid "Printer URL"
-msgstr ""
-
-#: admin/systems/class_printGeneric.inc:989
-#: admin/systems/class_printGeneric.inc:991
-msgid "Group"
-msgstr ""
-
-#: admin/systems/class_printGeneric.inc:994
-msgid "User"
-msgstr ""
-
-#: admin/systems/class_printGeneric.inc:1006
-msgid "Printer information"
-msgstr ""
-
-#: admin/systems/class_printGeneric.inc:1023
-#: admin/systems/serverService-list.tpl.c:2
-#: admin/systems/phoneSelect/phoneSelect-list.tpl.c:2
-#: admin/systems/printer.tpl.c:11
-msgid "Base"
-msgstr ""
-
-#: admin/systems/class_printGeneric.inc:1026
-msgid "LabeledURL"
-msgstr ""
-
-#: admin/systems/class_printGeneric.inc:1027
-msgid "Printer PPD"
-msgstr ""
-
-#: admin/systems/class_printGeneric.inc:1028 admin/systems/printer.tpl.c:38
-msgid "Permissions"
-msgstr ""
-
-#: admin/systems/class_printGeneric.inc:1030
-msgid "Windows inf file"
-msgstr ""
-
-#: admin/systems/class_printGeneric.inc:1031
-msgid "Windows driver dir"
-msgstr ""
-
-#: admin/systems/class_printGeneric.inc:1032 admin/systems/printer.tpl.c:62
-msgid "Driver printer name"
-msgstr ""
-
-#: admin/systems/class_printGeneric.inc:1048
-#: admin/systems/class_printGeneric.inc:1070
-msgid "Permission error"
-msgstr ""
-
-#: admin/systems/class_printGeneric.inc:1048
-#: admin/systems/class_printGeneric.inc:1070
-msgid "printer user"
-msgstr ""
-
-#: admin/systems/class_printGeneric.inc:1065
-#, php-format
-msgid "Illegal member type '%s'!"
-msgstr ""
-
-#: admin/systems/class_printGeneric.inc:1105
-#, php-format
-msgid "'%s' is already used!"
-msgstr ""
-
-#: admin/systems/class_printGeneric.inc:1116
-#, php-format
-msgid "'%s' does not exist!"
-msgstr ""
-
-#: admin/systems/class_serverService.inc:58
-msgid "Server services"
-msgstr ""
-
 #: admin/systems/class_serverService.inc:332
 msgid "Filter error"
 msgstr ""
@@ -711,313 +438,163 @@ msgstr ""
 msgid "Could not get execute action %s on service %s."
 msgstr ""
 
-#: admin/systems/class_terminalGeneric.inc:42
-#, php-format
-msgid "The root server the terminal should be using"
+#: admin/systems/class_terminalGeneric.inc:31
+msgid "terminal"
 msgstr ""
 
+#: admin/systems/class_terminalGeneric.inc:43
 #: admin/systems/class_terminalGeneric.inc:48
-#, php-format
-msgid "The swap server the terminal should be using"
-msgstr ""
-
-#: admin/systems/class_terminalGeneric.inc:54
-msgid "Remote desktop"
-msgstr ""
-
-#: admin/systems/class_terminalGeneric.inc:58
-msgid "Connect method"
-msgstr ""
-
-#: admin/systems/class_terminalGeneric.inc:62
-msgid "XDMCP"
-msgstr ""
-
-#: admin/systems/class_terminalGeneric.inc:62
-msgid "LDM"
-msgstr ""
-
-#: admin/systems/class_terminalGeneric.inc:62
-msgid "Shell"
-msgstr ""
-
-#: admin/systems/class_terminalGeneric.inc:62
-msgid "Telnet"
-msgstr ""
-
-#: admin/systems/class_terminalGeneric.inc:62
-msgid "Windows RDP"
-msgstr ""
-
-#: admin/systems/class_terminalGeneric.inc:66
-msgid "Terminal server"
+#: admin/systems/class_terminalGeneric.inc:49
+msgid "Terminal"
 msgstr ""
 
-#: admin/systems/class_terminalGeneric.inc:82
+#: admin/systems/class_terminalGeneric.inc:44
 msgid "Terminal information"
 msgstr ""
 
-#: admin/systems/ppd/class_printerPPDSelectionDialog.inc:91
-#: admin/systems/ppd/class_printerPPDSelectionDialog.inc:116
-#: admin/systems/ppd/class_printerPPDSelectionDialog.inc:139
-#: admin/systems/ppd/class_printerPPDDialog.inc:92
-#: admin/systems/ppd/class_printerPPDDialog.inc:160
-#: admin/systems/ppd/class_printerPPDDialog.inc:241
-#: admin/systems/ppd/class_printerPPDDialog.inc:256
-#: admin/systems/ppd/class_printerPPDDialog.inc:269
-#: admin/systems/ppd/class_printerPPDDialog.inc:297
-#: admin/systems/ppd/class_printerPPDDialog.inc:314
-#: admin/systems/ppd/class_printerPPDDialog.inc:337
-#: admin/systems/ppd/class_printerPPDDialog.inc:351
-#: admin/systems/ppd/class_printerPPDDialog.inc:361
-#: admin/systems/ppd/class_printerPPDDialog.inc:365
-#: admin/systems/ppd/class_printerPPDDialog.inc:560
-#: admin/systems/ppd/class_printerPPDDialog.inc:577
-#: admin/systems/ppd/class_printerPPDDialog.inc:580
-#: admin/systems/ppd/class_printerPPDDialog.inc:583
-msgid "PPD error"
-msgstr ""
-
-#: admin/systems/ppd/class_printerPPDSelectionDialog.inc:139
-#, php-format
-msgid "Cannot locate vendor '%s' in available PPDs!"
-msgstr ""
-
-#: admin/systems/ppd/class_printerPPDSelectionDialog.inc:148
-msgid "Printer ppd selection."
-msgstr ""
-
-#: admin/systems/ppd/class_printerPPDSelectionDialog.inc:155
-msgid "delete"
-msgstr ""
-
-#: admin/systems/ppd/class_printerPPDSelectionDialog.inc:166
-msgid "back"
-msgstr ""
-
-#: admin/systems/ppd/class_printerPPDDialog.inc:74
-#: admin/systems/ppd/class_printerPPDDialog.inc:140
-#: admin/systems/services/class_goService.inc:241
-msgid "Configuration error"
-msgstr ""
-
-#: admin/systems/ppd/class_printerPPDDialog.inc:92
-#, php-format
-msgid "Cannot open PPD '%s'!"
-msgstr ""
-
-#: admin/systems/ppd/class_printerPPDDialog.inc:141
-#, php-format
-msgid "Cannot open PPD path '%s' for reading and writing!"
-msgstr ""
-
-#: admin/systems/ppd/class_printerPPDDialog.inc:160
-#: admin/systems/ppd/class_printerPPDDialog.inc:365
-msgid "file is empty"
-msgstr ""
-
-#: admin/systems/ppd/class_printerPPDDialog.inc:314
-#, php-format
-msgid "Cannot parse PPD '%s'!"
-msgstr ""
-
-#: admin/systems/ppd/class_printerPPDDialog.inc:340
-msgid "Overwrite existing PPD"
-msgstr ""
-
-#: admin/systems/ppd/class_printerPPDDialog.inc:341
-msgid ""
-"There is already a ppd file for this kind of printer. Do you want to "
-"overwrite it?"
-msgstr ""
-
-#: admin/systems/ppd/class_printerPPDDialog.inc:491
-msgid "Section"
-msgstr ""
-
-#: admin/systems/ppd/class_printerPPDDialog.inc:551
-#: admin/systems/ppd/class_printerPPDDialog.inc:554
-msgid "True"
-msgstr ""
-
-#: admin/systems/ppd/class_printerPPDDialog.inc:552
-#: admin/systems/ppd/class_printerPPDDialog.inc:555
-msgid "False"
-msgstr ""
-
-#: admin/systems/ppd/class_printerPPDDialog.inc:560
-#, php-format
-msgid "PPD type '%s' is not supported!"
-msgstr ""
-
-#: admin/systems/ppd/class_printerPPDDialog.inc:597
-msgid ""
-"Please select a valid ppd file or use 'Cancel' to go back to printer "
-"configuration."
-msgstr ""
-
-#: admin/systems/ppd/class_ppdManager.inc:44
-#: admin/systems/ppd/class_ppdManager.inc:188
-#: admin/systems/ppd/class_ppdManager.inc:190
-msgid "PPD manager error"
-msgstr ""
-
-#: admin/systems/ppd/class_ppdManager.inc:44
-#, php-format
-msgid "The specified path '%s' does not exist."
-msgstr ""
-
-#: admin/systems/ppd/class_ppdManager.inc:188
+#: admin/systems/class_systemImport.inc:72
 #, php-format
-msgid "Specified PPD file '%s' cannot be opened for reading."
+msgid "Could not parse %s"
 msgstr ""
 
-#: admin/systems/ppd/class_ppdManager.inc:190
+#: admin/systems/class_systemImport.inc:116
 #, php-format
-msgid "The temporary file '%s' cannot be opened for writing."
-msgstr ""
-
-#: admin/systems/ppd/class_ppdManager.inc:212
-#: admin/systems/ppd/class_ppdManager.inc:350
-msgid "Parsing PPD file failed - file is empty!"
+msgid "No DHCP server found for ip %s"
 msgstr ""
 
-#: admin/systems/ppd/class_ppdManager.inc:222
+#: admin/systems/class_systemImport.inc:130
 #, php-format
-msgid ""
-"Parsing PPD file %s failed - line too long. Trailing characters have been "
-"ignored!"
-msgstr ""
-
-#: admin/systems/ppd/class_ppdManager.inc:230
-msgid "Nested groups are not supported!"
+msgid "No DNS server found for zone %s"
 msgstr ""
 
-#: admin/systems/ppd/class_ppdManager.inc:234
-msgid "Group name not unique!"
+#: admin/systems/class_systemImport.inc:165
+msgid "Import"
 msgstr ""
 
-#: admin/systems/ppd/class_ppdManager.inc:240
-#: admin/systems/ppd/class_ppdManager.inc:270
-msgid "Symbol values are not supported yet!"
+#: admin/systems/class_systemImport.inc:169
+#: admin/systems/class_serverGeneric.inc:43
+#: admin/systems/class_serverGeneric.inc:48
+#: admin/systems/class_serverGeneric.inc:49
+msgid "Server"
 msgstr ""
 
-#: admin/systems/ppd/class_ppdManager.inc:264
-msgid "Nested options are not supported!"
+#: admin/systems/class_systemImport.inc:169
+msgid "The server you wish to import hosts from"
 msgstr ""
 
-#: admin/systems/ppd/class_ppdManager.inc:289
-msgid "PickMany is not supported yet!"
+#: admin/systems/class_serverGeneric.inc:31
+msgid "server"
 msgstr ""
 
-#: admin/systems/ppd/class_ppdManager.inc:370
-#, php-format
-msgid ""
-"Parsing PPD file %s failed - line too long. Trailing characters have been "
-"ignored"
+#: admin/systems/class_serverGeneric.inc:44
+msgid "Server information"
 msgstr ""
 
-#: admin/systems/ppd/class_ppdManager.inc:395
-#, php-format
-msgid "Parsing PPD file %s failed - no information found."
+#: admin/systems/class_componentGeneric.inc:31
+msgid "Component"
 msgstr ""
 
-#: admin/systems/class_systemImport.inc:72
-#, php-format
-msgid "Could not parse %s"
+#: admin/systems/class_componentGeneric.inc:32
+msgid "Component information"
 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/class_componentGeneric.inc:37
+msgid "Network device"
 msgstr ""
 
-#: admin/systems/class_systemImport.inc:130
-#, php-format
-msgid "No DNS server found for zone %s"
+#: admin/systems/class_componentGeneric.inc:58
+msgid "The name of the component"
 msgstr ""
 
-#: admin/systems/class_systemImport.inc:165
-msgid "Import"
+#: admin/systems/class_componentGeneric.inc:62
+msgid "A short description of the component"
 msgstr ""
 
-#: admin/systems/class_systemImport.inc:169
-msgid "The server you wish to import hosts from"
+#: admin/systems/class_systemServers.inc:31
+#: admin/systems/class_systemServers.inc:53
+msgid "Servers"
 msgstr ""
 
-#: admin/systems/class_serverGeneric.inc:34
-msgid "server"
+#: admin/systems/class_systemServers.inc:35
+msgid "The syslog server the system should be using"
 msgstr ""
 
-#: admin/systems/class_serverGeneric.inc:47
-msgid "Server information"
+#: admin/systems/class_systemServers.inc:40
+msgid "NTP servers"
 msgstr ""
 
-#: admin/systems/class_componentGeneric.inc:37
-msgid "Component information"
+#: admin/systems/class_systemServers.inc:40
+msgid "The NTP servers for this system"
 msgstr ""
 
-#: admin/systems/class_componentGeneric.inc:64
-msgid "The name of the component"
+#: admin/systems/class_systemServers.inc:54
+msgid "Servers this system is using"
 msgstr ""
 
-#: admin/systems/class_componentGeneric.inc:68
-msgid "A short description of the component"
+#: admin/systems/class_mobilePhoneGeneric.inc:32
+#: admin/systems/class_mobilePhoneGeneric.inc:37
+#: admin/systems/class_mobilePhoneGeneric.inc:38
+msgid "Mobile phone"
 msgstr ""
 
-#: admin/systems/class_mobilePhoneGeneric.inc:37
+#: admin/systems/class_mobilePhoneGeneric.inc:33
 msgid "Mobile phone information"
 msgstr ""
 
-#: admin/systems/class_mobilePhoneGeneric.inc:63
+#: admin/systems/class_mobilePhoneGeneric.inc:60
 msgid "The name of the mobile phone"
 msgstr ""
 
-#: admin/systems/class_mobilePhoneGeneric.inc:67
+#: admin/systems/class_mobilePhoneGeneric.inc:64
 msgid "A short description of the mobile phone"
 msgstr ""
 
-#: admin/systems/class_mobilePhoneGeneric.inc:77
+#: admin/systems/class_mobilePhoneGeneric.inc:70
+msgid "Phone"
+msgstr "ØªÙ„ÙÙ†"
+
+#: admin/systems/class_mobilePhoneGeneric.inc:73
 msgid "Serial Number"
 msgstr ""
 
-#: admin/systems/class_mobilePhoneGeneric.inc:77
+#: admin/systems/class_mobilePhoneGeneric.inc:73
 msgid "The serial number of the mobile phone"
 msgstr ""
 
-#: admin/systems/class_mobilePhoneGeneric.inc:81
+#: admin/systems/class_mobilePhoneGeneric.inc:77
 msgid "IMEI Number"
 msgstr ""
 
-#: admin/systems/class_mobilePhoneGeneric.inc:81
+#: admin/systems/class_mobilePhoneGeneric.inc:77
 msgid "The IMEI number of the mobile phone"
 msgstr ""
 
-#: admin/systems/class_mobilePhoneGeneric.inc:86
+#: admin/systems/class_mobilePhoneGeneric.inc:82
 msgid "OS"
 msgstr ""
 
-#: admin/systems/class_mobilePhoneGeneric.inc:86
+#: admin/systems/class_mobilePhoneGeneric.inc:82
 msgid "The Operating System installed on this phone"
 msgstr ""
 
-#: admin/systems/class_mobilePhoneGeneric.inc:92
+#: admin/systems/class_mobilePhoneGeneric.inc:88
 msgid "SimCard"
 msgstr ""
 
-#: admin/systems/class_mobilePhoneGeneric.inc:95
+#: admin/systems/class_mobilePhoneGeneric.inc:91
 msgid "Telephone Number"
 msgstr ""
 
-#: admin/systems/class_mobilePhoneGeneric.inc:95
+#: admin/systems/class_mobilePhoneGeneric.inc:91
 msgid "The telephone number of the mobile phone"
 msgstr ""
 
-#: admin/systems/class_mobilePhoneGeneric.inc:99
+#: admin/systems/class_mobilePhoneGeneric.inc:95
 msgid "PUK Number"
 msgstr ""
 
-#: admin/systems/class_mobilePhoneGeneric.inc:99
+#: admin/systems/class_mobilePhoneGeneric.inc:95
 msgid "The PUK number of the simcard in this mobile phone"
 msgstr ""
 
@@ -1029,101 +606,51 @@ msgstr ""
 msgid "Service"
 msgstr ""
 
-#: admin/systems/serverService-list.xml:27
-msgid "!"
-msgstr ""
-
-#: admin/systems/serverService-list.xml:89
-msgid "Get status"
-msgstr ""
-
-#: admin/systems/serverService-list.xml:97
-#: admin/systems/services/cups/class_serviceCUPS.inc:92
-msgid "Start"
-msgstr ""
-
-#: admin/systems/serverService-list.xml:105
-#: admin/systems/services/cups/class_serviceCUPS.inc:93
-msgid "Stop"
-msgstr ""
-
-#: admin/systems/serverService-list.xml:113
-#: admin/systems/services/cups/class_serviceCUPS.inc:94
-msgid "Restart"
-msgstr ""
-
-#: admin/systems/serverService-list.xml:121
-msgid "Edit service"
-msgstr ""
-
-#: admin/systems/serverService-list.xml:129
-msgid "Remove service"
-msgstr ""
-
-#: admin/systems/phoneSelect/phoneSelect-list.xml:10
-msgid "Please select the desired entries"
-msgstr ""
-
-#: admin/systems/phoneSelect/phoneSelect-list.xml:56
-msgid "Number"
-msgstr ""
-
-#: admin/systems/phoneSelect/phoneSelect-list.xml:83
-msgid "Select this number"
-msgstr ""
-
-#: admin/systems/class_systemManagement.inc:177
-msgid "Back"
+#: admin/systems/serverService-list.xml:27
+msgid "!"
 msgstr ""
 
-#: admin/systems/class_systemManagement.inc:223
-msgid "Creating the image failed. Please see the report below."
+#: admin/systems/serverService-list.xml:89
+msgid "Get status"
 msgstr ""
 
-#: admin/systems/class_systemManagement.inc:228
-#, php-format
-msgid "Command '%s', specified for ISO creation doesn't seem to exist."
+#: admin/systems/serverService-list.xml:97
+#: admin/systems/services/cups/class_serviceCUPS.inc:92
+msgid "Start"
 msgstr ""
 
-#: admin/systems/class_systemManagement.inc:398
-#: admin/systems/class_systemManagement.inc:473
-#: admin/systems/class_systemManagement.inc:858
-#: admin/systems/class_systemManagement.inc:905
-#: admin/systems/class_systemManagement.inc:926
-msgid "Permission"
-msgstr "Ø¬ÙˆØ§Ø²"
-
-#: admin/systems/class_systemManagement.inc:678
-msgid "Cannot set mode to 'active'!"
+#: admin/systems/serverService-list.xml:105
+#: admin/systems/services/cups/class_serviceCUPS.inc:93
+msgid "Stop"
 msgstr ""
 
-#: admin/systems/class_systemManagement.inc:858
-#, php-format
-msgid "You are not allowed to create a snapshot for %s."
+#: admin/systems/serverService-list.xml:113
+#: admin/systems/services/cups/class_serviceCUPS.inc:94
+msgid "Restart"
 msgstr ""
 
-#: admin/systems/class_systemManagement.inc:905
-#: admin/systems/class_systemManagement.inc:926
-#, php-format
-msgid "You are not allowed to restore a snapshot for %s."
+#: admin/systems/serverService-list.xml:121
+msgid "Edit service"
 msgstr ""
 
-#: admin/systems/class_systemManagement.inc:1169
-#, php-format
-msgid "Inherited from %s"
+#: admin/systems/serverService-list.xml:129
+msgid "Remove service"
 msgstr ""
 
-#: admin/systems/class_systemManagement.inc:1224
-#: admin/systems/class_systemManagement.inc:1228
-#: addons/dashboard/class_dashBoardSystems.inc:199
+#: admin/systems/class_systemManagement.inc:48
 #: config/systems/class_systemsPluginConfig.inc:28
 msgid "Systems"
 msgstr ""
 
-#: admin/systems/class_systemManagement.inc:1225
+#: admin/systems/class_systemManagement.inc:49
 msgid "Systems Management"
 msgstr ""
 
+#: admin/systems/class_systemManagement.inc:250
+#, php-format
+msgid "Inherited from %s"
+msgstr ""
+
 #: admin/systems/services/terminal/class_serviceTerminal.inc:29
 #: admin/systems/services/terminal/class_serviceTerminal.inc:30
 #: admin/systems/services/terminal/class_serviceTerminal.inc:41
@@ -1161,6 +688,10 @@ msgstr ""
 msgid "Empty service"
 msgstr ""
 
+#: admin/systems/services/class_goService.inc:241
+msgid "Configuration error"
+msgstr ""
+
 #: admin/systems/services/shares/class_serviceShare.inc:30
 #: admin/systems/services/shares/class_serviceShare.inc:31
 msgid "Share service"
@@ -1219,8 +750,6 @@ msgid "You need to configure encodings first"
 msgstr ""
 
 #: admin/systems/services/shares/class_serviceShare.inc:110
-#: admin/ogroups/goto/termgroup.tpl.c:2 admin/systems/remove.tpl.c:2
-#: admin/systems/ppd/remove_ppd.tpl.c:2
 msgid "Warning"
 msgstr ""
 
@@ -1346,153 +875,93 @@ msgstr ""
 msgid "LDAP"
 msgstr ""
 
-#: admin/systems/class_networkSettings.inc:305
+#: admin/systems/class_networkSettings.inc:297
 msgid "NOT IMPLEMENTED"
 msgstr ""
 
-#: admin/systems/class_networkSettings.inc:437
+#: admin/systems/class_networkSettings.inc:429
 msgid "Not matching"
 msgstr ""
 
-#: admin/systems/class_networkSettings.inc:584
+#: admin/systems/class_networkSettings.inc:576
 #, php-format
 msgid "Was not able to contact argonaut server: %s"
 msgstr ""
 
-#: admin/systems/class_networkSettings.inc:591
+#: admin/systems/class_networkSettings.inc:583
 #, php-format
 msgid "Was not able to find DNS server for zone %s"
 msgstr ""
 
-#: admin/systems/class_networkSettings.inc:597
+#: admin/systems/class_networkSettings.inc:589
 #, php-format
 msgid "Was not able to find mac address of DNS server %s"
 msgstr ""
 
-#: admin/systems/class_networkSettings.inc:604
+#: admin/systems/class_networkSettings.inc:596
 #, php-format
 msgid "Was not able to launch ldap2zone: %s"
 msgstr ""
 
-#: admin/systems/class_networkSettings.inc:630
+#: admin/systems/class_networkSettings.inc:622
 #, php-format
 msgid "IP address %s"
 msgstr ""
 
-#: admin/systems/class_networkSettings.inc:638
-#: admin/systems/class_networkSettings.inc:651
-#: admin/systems/class_networkSettings.inc:653
-#: admin/systems/class_networkSettings.inc:1022
-msgid "IP address"
-msgstr ""
-
-#: admin/systems/class_networkSettings.inc:644
-#: admin/systems/class_networkSettings.inc:660
-#: admin/systems/class_networkSettings.inc:662
-#: admin/systems/class_networkSettings.inc:1023
+#: admin/systems/class_networkSettings.inc:636
+#: admin/systems/class_networkSettings.inc:652
+#: admin/systems/class_networkSettings.inc:654
+#: admin/systems/class_networkSettings.inc:1015
 msgid "MAC address"
 msgstr ""
 
-#: admin/systems/class_networkSettings.inc:676
+#: admin/systems/class_networkSettings.inc:668
 #, php-format
 msgid "The IP address '%s' is not part of the selected reverse zone '%s'!"
 msgstr ""
 
-#: admin/systems/class_networkSettings.inc:686
+#: admin/systems/class_networkSettings.inc:678
 #, php-format
 msgid "Record type '%s' is duplicated!"
 msgstr ""
 
-#: admin/systems/class_networkSettings.inc:693
+#: admin/systems/class_networkSettings.inc:685
 #, php-format
 msgid "Uniq record type '%s' is duplicated!"
 msgstr ""
 
-#: admin/systems/class_networkSettings.inc:705
+#: admin/systems/class_networkSettings.inc:697
 #, php-format
 msgid ""
 "The IP address '%s' will be added as 'A Record', this will be done "
 "automatically, please remove the record."
 msgstr ""
 
-#: admin/systems/class_networkSettings.inc:712
+#: admin/systems/class_networkSettings.inc:704
 #, php-format
 msgid "Only lowercase records are allowed, please check your '%ss'."
 msgstr ""
 
-#: admin/systems/class_networkSettings.inc:978
+#: admin/systems/class_networkSettings.inc:970
 msgid "Delete"
 msgstr ""
 
-#: admin/systems/class_networkSettings.inc:984
+#: admin/systems/class_networkSettings.inc:976
 msgid "Add"
 msgstr ""
 
-#: admin/systems/class_networkSettings.inc:1015
-#: addons/dashboard/class_dashBoardNetwork.inc:127
+#: admin/systems/class_networkSettings.inc:1007
 msgid "Network"
 msgstr ""
 
-#: admin/systems/class_networkSettings.inc:1030
+#: admin/systems/class_networkSettings.inc:1022
 msgid "DNS configuration"
 msgstr ""
 
-#: admin/systems/class_networkSettings.inc:1033
+#: admin/systems/class_networkSettings.inc:1025
 msgid "DHCP configuration"
 msgstr ""
 
-#: addons/dashboard/class_dashBoardSystems.inc:45
-msgid "Workstations"
-msgstr ""
-
-#: addons/dashboard/class_dashBoardSystems.inc:51
-msgid "Windows Workstations"
-msgstr ""
-
-#: addons/dashboard/class_dashBoardSystems.inc:54
-msgid "Terminals"
-msgstr ""
-
-#: addons/dashboard/class_dashBoardSystems.inc:57
-msgid "Printers"
-msgstr ""
-
-#: addons/dashboard/class_dashBoardSystems.inc:60
-msgid "Phones"
-msgstr ""
-
-#: addons/dashboard/class_dashBoardSystems.inc:63
-msgid "Components"
-msgstr ""
-
-#: addons/dashboard/class_dashBoardSystems.inc:66
-msgid "Mobile phones"
-msgstr ""
-
-#: addons/dashboard/class_dashBoardSystems.inc:183
-msgid "Statistics"
-msgstr ""
-
-#: addons/dashboard/class_dashBoardSystems.inc:188
-msgid "Computer name to use by unit"
-msgstr ""
-
-#: addons/dashboard/class_dashBoardSystems.inc:200
-msgid "Statistics and informations about systems"
-msgstr ""
-
-#: addons/dashboard/class_dashBoardNetwork.inc:111
-msgid "DHCP"
-msgstr ""
-
-#: addons/dashboard/class_dashBoardNetwork.inc:116
-msgid "DNS"
-msgstr ""
-
-#: addons/dashboard/class_dashBoardNetwork.inc:128
-msgid "Statistics and various informations"
-msgstr ""
-
 #: config/systems/class_systemsPluginConfig.inc:29
 msgid "Systems plugin configuration"
 msgstr ""
@@ -1584,402 +1053,3 @@ msgstr ""
 #: config/systems/class_systemsPluginConfig.inc:101
 msgid "Encodings"
 msgstr ""
-
-#: admin/ogroups/goto/termgroup.tpl.c:5
-msgid ""
-"Actions you choose here influence all systems in this object group. "
-"Additionally, all values editable here can be inherited by the clients "
-"assigned to this object group."
-msgstr ""
-
-#: admin/ogroups/goto/termgroup.tpl.c:8
-msgid "Generic"
-msgstr ""
-
-#: admin/ogroups/goto/termgroup.tpl.c:11
-msgid "NTP server"
-msgstr ""
-
-#: admin/ogroups/goto/termgroup.tpl.c:14
-msgid "Choose server to use for synchronizing time"
-msgstr ""
-
-#: admin/ogroups/goto/termgroup.tpl.c:20
-msgid "Select terminal mode"
-msgstr ""
-
-#: admin/ogroups/goto/termgroup.tpl.c:26
-msgid "Choose server to use for logging"
-msgstr ""
-
-#: admin/ogroups/goto/termgroup.tpl.c:32
-msgid "Select NFS root filesystem to use"
-msgstr ""
-
-#: admin/ogroups/goto/termgroup.tpl.c:38
-msgid "Choose NFS filesystem to place swap files on"
-msgstr ""
-
-#: admin/ogroups/goto/termgroup.tpl.c:47
-msgid "Execute"
-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 admin/systems/network.tpl.c:11
-msgid "Propose ip"
-msgstr ""
-
-#: admin/systems/network.tpl.c:14
-msgid "MAC-address"
-msgstr ""
-
-#: admin/systems/network.tpl.c:17
-msgid "Autodetect"
-msgstr ""
-
-#: admin/systems/network.tpl.c:20 admin/systems/network.tpl.c:23
-msgid "Enable DHCP for this device"
-msgstr ""
-
-#: admin/systems/network.tpl.c:26 admin/systems/network.tpl.c:50
-msgid "not configured"
-msgstr ""
-
-#: admin/systems/network.tpl.c:29
-msgid "Parent node"
-msgstr ""
-
-#: admin/systems/network.tpl.c:32
-msgid "Edit settings"
-msgstr ""
-
-#: admin/systems/network.tpl.c:35 admin/systems/network.tpl.c:47
-msgid "Enable DNS for this device"
-msgstr ""
-
-#: admin/systems/network.tpl.c:38
-msgid "Zone"
-msgstr ""
-
-#: admin/systems/network.tpl.c:41
-msgid "TTL"
-msgstr ""
-
-#: admin/systems/network.tpl.c:44
-msgid "Dns records"
-msgstr ""
-
-#: admin/systems/password.tpl.c:2
-msgid ""
-"To change the terminal root password use the fields below. The changes take "
-"effect during the next reboot. Please memorize the new password, because you"
-" wouldn't be able to log in."
-msgstr ""
-
-#: admin/systems/password.tpl.c:5
-msgid "Leave fields blank for password inheritance from default entries."
-msgstr ""
-
-#: admin/systems/password.tpl.c:8
-msgid "Changing the password impinges on authentification only."
-msgstr ""
-
-#: admin/systems/password.tpl.c:11
-msgid "New password"
-msgstr "Ú©Ù„Ù…Ù‡ Ø¹Ø¨ÙˆØ± Ø¬Ø¯ÛŒØ¯"
-
-#: admin/systems/password.tpl.c:14
-msgid "Repeat new password"
-msgstr ""
-
-#: admin/systems/password.tpl.c:17
-msgid "Password strength"
-msgstr ""
-
-#: admin/systems/password.tpl.c:20
-msgid "Set password"
-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/gencd.tpl.c:2
-msgid "CD-Install-Image generation"
-msgstr ""
-
-#: admin/systems/gencd.tpl.c:5
-msgid ""
-"This option enables you to generate FAI install CD images for the selected "
-"workstation. The procedure may take about 10 minutes to complete, so please "
-"be patient after pressing the 'Create ISO-Image' button."
-msgstr ""
-
-#: admin/systems/gencd.tpl.c:8
-msgid "Create ISO-Image"
-msgstr ""
-
-#: admin/systems/remove.tpl.c:5
-msgid ""
-"This includes all account data, system access rules, imap settings, etc. for"
-" this user. Please double check if your really want to do this since there "
-"is no way for FusionDirectory to get your data back."
-msgstr ""
-
-#: admin/systems/remove.tpl.c:8
-msgid "So - if you're sure - press 'Delete' to continue or 'Cancel' to abort."
-msgstr ""
-
-#: admin/systems/system-filter.tpl.c:2
-#: admin/systems/phoneSelect/phoneSelect-filter.tpl.c:2
-msgid "Filter"
-msgstr ""
-
-#: admin/systems/system-filter.tpl.c:5
-msgid "Show servers"
-msgstr ""
-
-#: admin/systems/system-filter.tpl.c:8
-msgid "Show workstations"
-msgstr ""
-
-#: admin/systems/system-filter.tpl.c:11
-msgid "Show terminals"
-msgstr ""
-
-#: admin/systems/system-filter.tpl.c:14
-msgid "Show network printer"
-msgstr ""
-
-#: admin/systems/system-filter.tpl.c:17
-#: admin/systems/phoneSelect/phoneSelect-filter.tpl.c:5
-msgid "Show phones"
-msgstr ""
-
-#: admin/systems/system-filter.tpl.c:20
-msgid "Show windows based workstations"
-msgstr ""
-
-#: admin/systems/system-filter.tpl.c:23
-msgid "Show network devices"
-msgstr ""
-
-#: admin/systems/system-filter.tpl.c:26
-#: admin/systems/phoneSelect/phoneSelect-filter.tpl.c:8
-msgid "Show mobile phones"
-msgstr ""
-
-#: admin/systems/system-filter.tpl.c:29
-msgid "Show IPMI interfaces"
-msgstr ""
-
-#: admin/systems/ppd/printerPPDSelectionDialog.tpl.c:2
-msgid "Select objects to add"
-msgstr ""
-
-#: admin/systems/ppd/printerPPDSelectionDialog.tpl.c:5
-msgid "Filters"
-msgstr ""
-
-#: admin/systems/ppd/printerPPDSelectionDialog.tpl.c:8
-msgid "Display objects matching"
-msgstr ""
-
-#: admin/systems/ppd/printerPPDSelectionDialog.tpl.c:11
-msgid "Regular expression for matching object names"
-msgstr ""
-
-#: admin/systems/ppd/printerPPDSelectionDialog.tpl.c:14
-msgid "Close"
-msgstr ""
-
-#: admin/systems/ppd/printerPPDDialog.tpl.c:2
-msgid "Printer driver"
-msgstr ""
-
-#: admin/systems/ppd/printerPPDDialog.tpl.c:5
-msgid "Model"
-msgstr ""
-
-#: admin/systems/ppd/printerPPDDialog.tpl.c:8
-msgid "Select"
-msgstr ""
-
-#: admin/systems/ppd/printerPPDDialog.tpl.c:11
-msgid "New driver"
-msgstr ""
-
-#: admin/systems/ppd/printerPPDDialog.tpl.c:14
-msgid "Upload"
-msgstr ""
-
-#: admin/systems/ppd/printerPPDDialog.tpl.c:17
-msgid "Options"
-msgstr ""
-
-#: admin/systems/ppd/remove_ppd.tpl.c:5
-msgid "The ppd file will be removed from the server and can not be restored."
-msgstr ""
-
-#: admin/systems/printer.tpl.c:2
-msgid "General"
-msgstr ""
-
-#: admin/systems/printer.tpl.c:5
-msgid "Printer name"
-msgstr ""
-
-#: admin/systems/printer.tpl.c:14
-msgid "Details"
-msgstr ""
-
-#: admin/systems/printer.tpl.c:20
-msgid "Printer location"
-msgstr ""
-
-#: admin/systems/printer.tpl.c:26
-msgid "PPD Provider"
-msgstr ""
-
-#: admin/systems/printer.tpl.c:29
-msgid "Driver"
-msgstr ""
-
-#: admin/systems/printer.tpl.c:32
-msgid "Edit"
-msgstr ""
-
-#: admin/systems/printer.tpl.c:41
-msgid "Users which are allowed to use this printer"
-msgstr ""
-
-#: admin/systems/printer.tpl.c:44
-msgid "Users"
-msgstr ""
-
-#: admin/systems/printer.tpl.c:47
-msgid "Users which are allowed to administrate this printer"
-msgstr ""
-
-#: admin/systems/printer.tpl.c:50
-msgid "Admins"
-msgstr ""
-
-#: admin/systems/printer.tpl.c:53
-msgid "Windows paths"
-msgstr ""
-
-#: admin/systems/printer.tpl.c:56
-msgid "Printer windows inf file"
-msgstr ""
-
-#: admin/systems/printer.tpl.c:59
-msgid "Printer driver directory"
-msgstr ""
-
-#: admin/systems/gencd_frame.tpl.c:2
-msgid "Your browser does not supprt iframes."
-msgstr ""
-
-#: admin/systems/services/cups/serviceCUPS.tpl.c:2
-msgid "Print Service"
-msgstr ""
-
-#: admin/systems/services/cups/serviceCUPS.tpl.c:5
-msgid "enabled"
-msgstr ""
-
-#: admin/systems/services/ServiceAddDialog.tpl.c:2
-msgid "Adding a new service to the current server"
-msgstr ""
-
-#: admin/systems/services/ServiceAddDialog.tpl.c:5
-msgid ""
-"This dialog allows you to add new services to the currenty edited server "
-"object. The box below shows all available but not already used services."
-msgstr ""
-
-#: admin/systems/services/ServiceAddDialog.tpl.c:8
-msgid "Service to add"
-msgstr ""
-
-#: admin/systems/services/ServiceAddDialog.tpl.c:11
-msgid "All available services are already in use."
-msgstr ""
-
-#: admin/systems/services/ServiceAddDialog.tpl.c:14
-#: admin/systems/SelectDeviceType.tpl.c:26
-msgid "Continue"
-msgstr ""
-
-#: admin/systems/SelectDeviceType.tpl.c:2
-msgid ""
-"This system has no system type configured. Please choose a system type for "
-"this object and an optional inheritance group. Press the 'continue' button "
-"to proceed."
-msgstr ""
-
-#: admin/systems/SelectDeviceType.tpl.c:5
-msgid ""
-"Please select a system type and an optional bundle of predefined settings to"
-" be inherited."
-msgstr ""
-
-#: admin/systems/SelectDeviceType.tpl.c:8
-msgid ""
-"Please select a system type and a bundle of predefined settings to be "
-"inherited."
-msgstr ""
-
-#: admin/systems/SelectDeviceType.tpl.c:11
-#: admin/systems/SelectDeviceType.tpl.c:14
-msgid "System type"
-msgstr ""
-
-#: admin/systems/SelectDeviceType.tpl.c:17
-msgid "Choose an object group as template"
-msgstr ""
-
-#: admin/systems/SelectDeviceType.tpl.c:20
-msgid "Object group"
-msgstr ""
-
-#: admin/systems/SelectDeviceType.tpl.c:23
-msgid "none"
-msgstr ""
-
-#: addons/dashboard/systems_stats.tpl.c:2
-msgid "There are several argonaut servers! (this is not yet supported)"
-msgstr ""
-
-#: addons/dashboard/systems_stats.tpl.c:5
-msgid "There is an argonaut server running on %1 (%3://%2:%4)"
-msgstr ""
-
-#: addons/dashboard/systems_stats.tpl.c:8
-msgid "Only one system is configured to run an argonaut client."
-msgid_plural "%1 systems are configured to run an argonaut client."
-msgstr[0] ""
-
-#: addons/dashboard/systems_stats.tpl.c:11
-msgid "But no system is configured to run an argonaut client!"
-msgstr ""
-
-#: addons/dashboard/systems_stats.tpl.c:14
-msgid ""
-"A system is configured to run an argonaut client, but there is no argonaut "
-"server configured!"
-msgid_plural ""
-"%1 systems are configured to run an argonaut client, but there is no "
-"argonaut server configured!"
-msgstr[0] ""
diff --git a/systems/locale/fr/fusiondirectory.po b/systems/locale/fr/fusiondirectory.po
index b5e642a2716ebcc6a9caec39ad17e7b3d29346b2..86993cb6821957a9e6a186252d01bb21e104c400 100644
--- a/systems/locale/fr/fusiondirectory.po
+++ b/systems/locale/fr/fusiondirectory.po
@@ -3,24 +3,14 @@
 # This file is distributed under the same license as the PACKAGE package.
 # 
 # Translators:
-# gallak <antoine.gallavardin@free.fr>, 2013
-# Benoit Mortier <benoit.mortier@opensides.be>, 2005-2011
-# Benoit Mortier <benoit.mortier@opensides.be>, 2015
-# MCMic, 2014
-# fusiondirectory <contact@fusiondirectory.org>, 2013-2014
-# fusiondirectory <contact@fusiondirectory.org>, 2012
-# fusiondirectory <contact@fusiondirectory.org>, 2012
-# fusiondirectory <contact@fusiondirectory.org>, 2012
-# gallak <antoine.gallavardin@free.fr>, 2013
-# MCMic, 2014
 msgid ""
 msgstr ""
-"Project-Id-Version: FusionDirectory-108\n"
+"Project-Id-Version: FusionDirectory-109\n"
 "Report-Msgid-Bugs-To: documentation@lists.fusiondirectory.org\n"
-"POT-Creation-Date: 2015-03-31 11:49+0200\n"
-"PO-Revision-Date: 2015-03-31 11:41+0000\n"
-"Last-Translator: Benoit Mortier <benoit.mortier@opensides.be>\n"
-"Language-Team: French (http://www.transifex.com/projects/p/FusionDirectory-108/language/fr/)\n"
+"POT-Creation-Date: 2014-12-15 17:47+0100\n"
+"PO-Revision-Date: 2015-03-31 11:31+0000\n"
+"Last-Translator: fusiondirectory <contact@fusiondirectory.org>\n"
+"Language-Team: French (http://www.transifex.com/projects/p/FusionDirectory-109/language/fr/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -36,29 +26,24 @@ msgid "Locked"
 msgstr "VerrouillÃ©"
 
 #: admin/ogroups/goto/class_termgroup.inc:118
-#: admin/systems/class_terminalGeneric.inc:121
+#: admin/systems/class_terminalStartup.inc:145
 msgid "Local swap"
-msgstr "Swap local"
+msgstr "swap locale"
 
 #: admin/ogroups/goto/class_termgroup.inc:124
 #: admin/ogroups/goto/class_termgroup.inc:136
-#: admin/systems/class_workstationGeneric.inc:352
-#: admin/systems/class_terminalGeneric.inc:109
-#: admin/systems/class_terminalGeneric.inc:125
+#: admin/systems/class_terminalStartup.inc:133
+#: admin/systems/class_terminalStartup.inc:149
 msgid "inherited"
 msgstr "hÃ©ritÃ©"
 
 #: admin/ogroups/goto/class_termgroup.inc:220
-#: admin/systems/class_workstationGeneric.inc:72
-#: admin/systems/class_workstationGeneric.inc:443
-#: admin/systems/class_systemManagement.inc:295
-#: admin/systems/class_systemManagement.inc:325
-msgid "Infrastructure service"
-msgstr "Service dâ€™infrastructure"
+#: admin/systems/class_systemManagement.inc:165
+#: admin/systems/class_systemManagement.inc:186
+msgid "Service infrastructure"
+msgstr "Service d'infrastructure"
 
 #: admin/ogroups/goto/class_termgroup.inc:224
-#: admin/systems/class_workstationGeneric.inc:75
-#: admin/systems/class_workstationGeneric.inc:78
 msgid "Event error"
 msgstr "Erreur d'Ã©vÃ©nement"
 
@@ -68,12 +53,10 @@ msgid "Event '%s' is not available!"
 msgstr "L'Ã©vÃ©nement '%s' n'est pas disponible !"
 
 #: admin/ogroups/goto/class_termgroup.inc:274
-#: admin/systems/class_workstationGeneric.inc:112
 msgid "Switch off"
-msgstr "Ã‰teindre"
+msgstr "Eteindre"
 
 #: admin/ogroups/goto/class_termgroup.inc:274
-#: admin/systems/class_workstationGeneric.inc:113
 msgid "Reboot"
 msgstr "RedÃ©marrer"
 
@@ -94,7 +77,6 @@ msgid "Reinstall"
 msgstr "Reinstaller"
 
 #: admin/ogroups/goto/class_termgroup.inc:279
-#: admin/systems/class_workstationGeneric.inc:108
 msgid "Memory test"
 msgstr "Test mÃ©moire"
 
@@ -103,21 +85,18 @@ msgid "System analysis"
 msgstr "Analyse du systÃ¨me"
 
 #: admin/ogroups/goto/class_termgroup.inc:386
-#: admin/systems/class_printGeneric.inc:670
-#: admin/systems/class_printGeneric.inc:970
-#: admin/systems/class_systemManagement.inc:816
 #: admin/systems/services/class_goService.inc:123
 #: admin/systems/services/class_goService.inc:151
 #: admin/systems/services/class_goService.inc:187
-#: admin/systems/class_networkSettings.inc:478
-#: admin/systems/class_networkSettings.inc:491
-#: admin/systems/class_networkSettings.inc:757
-#: admin/systems/class_networkSettings.inc:816
-#: admin/systems/class_networkSettings.inc:835
-#: admin/systems/class_networkSettings.inc:852
-#: admin/systems/class_networkSettings.inc:861
-#: admin/systems/class_networkSettings.inc:879
-#: admin/systems/class_networkSettings.inc:951
+#: admin/systems/class_networkSettings.inc:470
+#: admin/systems/class_networkSettings.inc:483
+#: admin/systems/class_networkSettings.inc:749
+#: admin/systems/class_networkSettings.inc:808
+#: admin/systems/class_networkSettings.inc:827
+#: admin/systems/class_networkSettings.inc:844
+#: admin/systems/class_networkSettings.inc:853
+#: admin/systems/class_networkSettings.inc:871
+#: admin/systems/class_networkSettings.inc:943
 msgid "LDAP error"
 msgstr "Erreur LDAP"
 
@@ -129,582 +108,320 @@ msgstr "SystÃ¨me"
 msgid "System group"
 msgstr "Groupe systÃ¨me"
 
-#: admin/ogroups/goto/class_termgroup.inc:401
-#: admin/ogroups/goto/termgroup.tpl.c:17
+#: admin/ogroups/goto/class_termgroup.inc:402
 msgid "Mode"
 msgstr "Mode"
 
-#: admin/ogroups/goto/class_termgroup.inc:402
-#: admin/systems/class_workstationGeneric.inc:189
-#: admin/ogroups/goto/termgroup.tpl.c:23
+#: admin/ogroups/goto/class_termgroup.inc:403
+#: admin/systems/class_systemServers.inc:35
 msgid "Syslog server"
-msgstr "Serveur Syslog"
+msgstr "Serveur de journaux systÃ¨mes"
 
-#: admin/ogroups/goto/class_termgroup.inc:403
+#: admin/ogroups/goto/class_termgroup.inc:404
 msgid "Action flag"
 msgstr "Indicateur d'action"
 
-#: admin/ogroups/goto/class_termgroup.inc:404
+#: admin/ogroups/goto/class_termgroup.inc:405
 msgid "Ntp server"
 msgstr "Serveur NTP"
 
-#: admin/ogroups/goto/class_termgroup.inc:405
-#: admin/systems/class_terminalGeneric.inc:41
-#: admin/ogroups/goto/termgroup.tpl.c:29
+#: admin/ogroups/goto/class_termgroup.inc:406
+#: admin/systems/class_terminalStartup.inc:65
 msgid "Root server"
-msgstr "Serveur racine"
+msgstr "Serveur Primaire"
 
-#: admin/ogroups/goto/class_termgroup.inc:406
-#: admin/systems/class_terminalGeneric.inc:47
-#: admin/ogroups/goto/termgroup.tpl.c:35
+#: admin/ogroups/goto/class_termgroup.inc:407
+#: admin/systems/class_terminalStartup.inc:69
 msgid "Swap server"
-msgstr "Serveur de swap"
+msgstr "Serveur de Swap"
 
-#: admin/systems/class_terminalStartup.inc:63
+#: admin/systems/class_terminalStartup.inc:62
 msgid "Startup parameters"
 msgstr "ParamÃ¨tres de dÃ©marrage"
 
-#: admin/systems/class_terminalStartup.inc:66
+#: admin/systems/class_terminalStartup.inc:65
+msgid "The root server the terminal should be using"
+msgstr "Le serveur racine que le terminal doit utiliser"
+
+#: admin/systems/class_terminalStartup.inc:69
+msgid "The swap server the terminal should be using"
+msgstr "Le serveur de swap que le terminal doit utiliser"
+
+#: admin/systems/class_terminalStartup.inc:73
 msgid "Boot kernel"
-msgstr "Noyau utilisÃ© au dÃ©marrage"
+msgstr "Kernel utilisÃ© au dÃ©marrage"
 
-#: admin/systems/class_terminalStartup.inc:66
+#: admin/systems/class_terminalStartup.inc:73
 msgid "Linux kernel to be installed and booted"
-msgstr "Noyau Linux Ã  installer et Ã  dÃ©marrer"
+msgstr "Kernel linux Ã  installer et Ã  demarrer"
 
-#: admin/systems/class_terminalStartup.inc:70
+#: admin/systems/class_terminalStartup.inc:77
 msgid "Boot kernel parameters"
-msgstr "ParamÃ¨tres de dÃ©marrage du noyau"
+msgstr "ParamÃ¨tres de demarrage pour ce kernel"
 
-#: admin/systems/class_terminalStartup.inc:70
+#: admin/systems/class_terminalStartup.inc:77
 msgid "Linux kernel parameters to be ran"
-msgstr "ParamÃ¨tres de dÃ©marrage Ã  passer au noyau Linux"
-
-#: admin/systems/class_terminalStartup.inc:82
-msgid "Startup"
-msgstr "DÃ©marrage"
+msgstr "ParamÃ¨tres de dÃ©marrage pour ce kernel"
 
 #: admin/systems/class_terminalStartup.inc:83
-msgid "Terminal startup"
-msgstr "DÃ©marrage du terminal"
-
-#: admin/systems/system-list.xml:10
-msgid "List of systems"
-msgstr "Liste des systÃ¨mes"
-
-#: admin/systems/system-list.xml:14
-msgid "New workstation"
-msgstr "Nouvelle station de travail"
-
-#: admin/systems/system-list.xml:22
-msgid "Locked server"
-msgstr "Serveur verrouillÃ©"
-
-#: admin/systems/system-list.xml:30
-msgid "Locked workstation"
-msgstr "Station de travail verrouillÃ©e"
-
-#: admin/systems/system-list.xml:38
-msgid "Locked terminal"
-msgstr "Terminal verrouillÃ©"
-
-#: admin/systems/system-list.xml:47
-msgid "New terminal"
-msgstr "Nouveau terminal"
-
-#: admin/systems/system-list.xml:55
-msgid "New device"
-msgstr "Nouveau pÃ©riphÃ©rique"
-
-#: admin/systems/system-list.xml:63
-msgid "Workstation template"
-msgstr "ModÃ¨le de station de travail"
-
-#: admin/systems/system-list.xml:71
-msgid "Terminal template"
-msgstr "ModÃ¨le de terminal"
+msgid "Remote desktop"
+msgstr "Bureau distant"
 
-#: admin/systems/system-list.xml:79
-msgid "Winstation"
-msgstr "PC Windows"
+#: admin/systems/class_terminalStartup.inc:87
+msgid "Connect method"
+msgstr "MÃ©thode de connexion"
 
-#: admin/systems/system-list.xml:87 admin/systems/system-list.xml:234
-#: admin/systems/class_systemImport.inc:169
-#: admin/systems/class_serverGeneric.inc:46
-#: admin/systems/class_serverGeneric.inc:51
-#: admin/systems/class_serverGeneric.inc:52
-#: admin/systems/class_SelectDeviceType.inc:58
-msgid "Server"
-msgstr "Serveur"
+#: admin/systems/class_terminalStartup.inc:91
+msgid "XDMCP"
+msgstr "XDMCP"
 
-#: admin/systems/system-list.xml:95 admin/systems/system-list.xml:242
-#: admin/systems/class_workstationGeneric.inc:458
-#: admin/systems/class_workstationGeneric.inc:463
-#: admin/systems/class_workstationGeneric.inc:464
-#: admin/systems/class_SelectDeviceType.inc:58
-msgid "Workstation"
-msgstr "Station de travail"
+#: admin/systems/class_terminalStartup.inc:91
+msgid "LDM"
+msgstr "LDM"
 
-#: admin/systems/system-list.xml:103 admin/systems/system-list.xml:250
-#: admin/systems/class_terminalGeneric.inc:81
-#: admin/systems/class_terminalGeneric.inc:86
-#: admin/systems/class_terminalGeneric.inc:87
-#: admin/systems/class_SelectDeviceType.inc:58
-msgid "Terminal"
-msgstr "Terminal"
+#: admin/systems/class_terminalStartup.inc:91
+msgid "Shell"
+msgstr "Shell"
 
-#: admin/systems/system-list.xml:111 admin/systems/class_printGeneric.inc:1005
-#: admin/systems/class_printGeneric.inc:1011
-#: admin/systems/class_printGeneric.inc:1012
-msgid "Printer"
-msgstr "Imprimante"
+#: admin/systems/class_terminalStartup.inc:91
+msgid "Telnet"
+msgstr "Telnet"
 
-#: admin/systems/system-list.xml:119 admin/systems/system-list.xml:274
-#: admin/systems/class_mobilePhoneGeneric.inc:74
-#: admin/systems/phoneSelect/phoneSelect-list.xml:14
-msgid "Phone"
-msgstr "TÃ©lÃ©phone"
+#: admin/systems/class_terminalStartup.inc:91
+msgid "Windows RDP"
+msgstr "Windows RDP"
 
-#: admin/systems/system-list.xml:127
-#: admin/systems/class_mobilePhoneGeneric.inc:36
-#: admin/systems/class_mobilePhoneGeneric.inc:41
-#: admin/systems/class_mobilePhoneGeneric.inc:42
-#: admin/systems/phoneSelect/phoneSelect-list.xml:22
-msgid "Mobile phone"
-msgstr "TÃ©lÃ©phone portable"
+#: admin/systems/class_terminalStartup.inc:95
+msgid "Terminal server"
+msgstr "Serveur de terminaux"
 
-#: admin/systems/system-list.xml:135
-#: admin/systems/class_componentGeneric.inc:36
-msgid "Component"
-msgstr "Composant"
+#: admin/systems/system-list.xml:10
+msgid "List of systems"
+msgstr "Liste des systÃ¨mes"
 
-#: admin/systems/system-list.xml:143 admin/systems/system-list.xml:298
-msgid "IPMI"
-msgstr "IPMI"
-
-#: admin/systems/system-list.xml:169
-#: admin/systems/class_workstationGeneric.inc:154
-#: admin/systems/class_printGeneric.inc:752
-#: admin/systems/class_printGeneric.inc:762
-#: admin/systems/class_printGeneric.inc:781
-#: admin/systems/class_printGeneric.inc:1022
-#: admin/systems/class_componentGeneric.inc:64
-#: admin/systems/class_mobilePhoneGeneric.inc:63
-#: admin/systems/phoneSelect/phoneSelect-list.xml:48
+#: admin/systems/system-list.xml:31
+#: admin/systems/class_workstationGeneric.inc:46
+#: admin/systems/class_printGeneric.inc:60
+#: admin/systems/class_componentGeneric.inc:58
+#: admin/systems/class_mobilePhoneGeneric.inc:60
 #: admin/systems/services/shares/class_serviceShare.inc:52
-#: admin/systems/system-filter.tpl.c:32
-#: admin/systems/phoneSelect/phoneSelect-filter.tpl.c:11
 msgid "Name"
 msgstr "Nom"
 
-#: admin/systems/system-list.xml:177
-#: admin/systems/phoneSelect/phoneSelect-list.xml:63
+#: admin/systems/system-list.xml:39
 msgid "IP"
 msgstr "IP"
 
-#: admin/systems/system-list.xml:185
+#: admin/systems/system-list.xml:47
 msgid "MAC"
 msgstr "MAC"
 
-#: admin/systems/system-list.xml:193
-#: admin/systems/class_workstationGeneric.inc:160
-#: admin/systems/class_printGeneric.inc:1024
-#: admin/systems/class_componentGeneric.inc:68
-#: admin/systems/class_mobilePhoneGeneric.inc:67
+#: admin/systems/system-list.xml:55
+#: admin/systems/class_workstationGeneric.inc:51
+#: admin/systems/class_printGeneric.inc:64
+#: admin/systems/class_componentGeneric.inc:62
+#: admin/systems/class_mobilePhoneGeneric.inc:64
 #: admin/systems/serverService-list.xml:35
 #: admin/systems/services/shares/class_serviceShare.inc:56
-#: admin/systems/printer.tpl.c:8 admin/systems/printer.tpl.c:17
 msgid "Description"
 msgstr "Description"
 
-#: admin/systems/system-list.xml:201 admin/systems/class_serverService.inc:57
+#: admin/systems/system-list.xml:63 admin/systems/class_serverService.inc:57
 #: admin/systems/services/terminal/class_serviceTerminal.inc:30
 #: admin/systems/services/cups/class_serviceCUPS.inc:85
 #: admin/systems/services/shares/class_serviceShare.inc:31
 #: admin/systems/services/ntp/class_serviceNTP.inc:30
 #: admin/systems/services/ldap/class_serviceLDAP.inc:97
 msgid "Services"
-msgstr "Services"
+msgstr "Service"
 
-#: admin/systems/system-list.xml:209
+#: admin/systems/system-list.xml:71
 msgid "Release"
 msgstr "Version"
 
-#: admin/systems/system-list.xml:217 admin/systems/serverService-list.xml:43
-#: admin/systems/phoneSelect/phoneSelect-list.xml:70
+#: admin/systems/system-list.xml:79 admin/systems/serverService-list.xml:43
 msgid "Actions"
 msgstr "Actions"
 
-#: admin/systems/system-list.xml:228 admin/systems/serverService-list.xml:54
+#: admin/systems/system-list.xml:90 admin/systems/serverService-list.xml:54
 msgid "Create"
 msgstr "CrÃ©er"
 
-#: admin/systems/system-list.xml:258
-msgid "winStation"
-msgstr "PC Windows"
-
-#: admin/systems/system-list.xml:266
-msgid "Network printer"
-msgstr "Imprimante rÃ©seau"
-
-#: admin/systems/system-list.xml:282
-#: 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:290
-msgid "Mobile Phone"
-msgstr "TÃ©lÃ©phone portable"
-
-#: admin/systems/system-list.xml:310
+#: admin/systems/system-list.xml:100
 msgid "Trigger action"
 msgstr "DÃ©clencher une action"
 
-#: admin/systems/system-list.xml:317
+#: admin/systems/system-list.xml:107
 msgid "Schedule action"
 msgstr "Programmer une action"
 
-#: admin/systems/system-list.xml:330
-msgid "Activate systems"
-msgstr "Activer des systÃ¨mes"
-
-#: admin/systems/system-list.xml:337 admin/systems/serverService-list.xml:69
-#: admin/systems/printer.tpl.c:35
+#: admin/systems/system-list.xml:119 admin/systems/serverService-list.xml:69
 msgid "Remove"
 msgstr "Supprimer"
 
-#: admin/systems/system-list.xml:367
-msgid "Create ISO"
-msgstr "CrÃ©er une image ISO"
-
-#: admin/systems/system-list.xml:379
+#: admin/systems/system-list.xml:150
 msgid "Edit system"
 msgstr "Ã‰diter le systÃ¨me"
 
-#: admin/systems/system-list.xml:392
+#: admin/systems/system-list.xml:163
 msgid "Remove system"
-msgstr "Supprimer le systÃ¨me"
+msgstr "Suppression du systÃ¨me"
 
-#: admin/systems/class_workstationGeneric.inc:75
-#, php-format
-msgid "Event %s is not available!"
-msgstr "L'Ã©vÃ©nement '%s' n'est pas disponibleâ€¯!"
-
-#: admin/systems/class_workstationGeneric.inc:78
-msgid "Events are not available!"
-msgstr "Les Ã©vÃ©nements ne sont pas disponiblesâ€¯!"
-
-#: admin/systems/class_workstationGeneric.inc:106
-msgid "(Re)Install"
-msgstr "(RÃ©)installer"
-
-#: admin/systems/class_workstationGeneric.inc:107
-msgid "Software update"
-msgstr "Mise Ã  jour logicielle"
-
-#: admin/systems/class_workstationGeneric.inc:115
-msgid "Wake up"
-msgstr "RÃ©veiller"
-
-#: admin/systems/class_workstationGeneric.inc:144
-#: admin/systems/class_printGeneric.inc:604
+#: admin/systems/class_workstationGeneric.inc:35
 msgid "workstation"
-msgstr "station de travail"
+msgstr "stations de travail"
 
-#: admin/systems/class_workstationGeneric.inc:151
-#: admin/systems/class_componentGeneric.inc:61
-#: admin/systems/class_mobilePhoneGeneric.inc:60
+#: admin/systems/class_workstationGeneric.inc:42
+#: admin/systems/class_printGeneric.inc:56
+#: admin/systems/class_componentGeneric.inc:55
+#: admin/systems/class_mobilePhoneGeneric.inc:56
 msgid "Properties"
 msgstr "PropriÃ©tÃ©s"
 
-#: admin/systems/class_workstationGeneric.inc:155
+#: admin/systems/class_workstationGeneric.inc:47
 #, php-format
 msgid "The name of the %s"
-msgstr "Le nom de ce %s"
+msgstr "Le nom de %s"
 
-#: admin/systems/class_workstationGeneric.inc:161
+#: admin/systems/class_workstationGeneric.inc:52
 #, php-format
 msgid "A short description of the %s"
-msgstr "Une courte description de ce %s"
+msgstr "Une courte description de %s"
 
-#: admin/systems/class_workstationGeneric.inc:166
-#: admin/systems/class_printGeneric.inc:1025
+#: admin/systems/class_workstationGeneric.inc:56
 msgid "Location"
 msgstr "Lieu"
 
-#: admin/systems/class_workstationGeneric.inc:167
+#: admin/systems/class_workstationGeneric.inc:57
 #, php-format
 msgid "The location of the %s"
-msgstr "L'emplacement de ce %s"
+msgstr "L'emplacement de %s"
 
-#: admin/systems/class_workstationGeneric.inc:173
+#: admin/systems/class_workstationGeneric.inc:61
 #, php-format
 msgid "Lock this %s"
-msgstr "Verrouiller ce %s"
+msgstr "Verrouiller %s"
 
-#: admin/systems/class_workstationGeneric.inc:174
+#: admin/systems/class_workstationGeneric.inc:62
 #, 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:185
-#: addons/dashboard/class_dashBoardSystems.inc:48
-msgid "Servers"
-msgstr "Serveurs"
-
-#: admin/systems/class_workstationGeneric.inc:190
-#, php-format
-msgid "The syslog server the %s should be using"
-msgstr "Le serveur de logs que ce %s devrait utiliser"
-
-#: admin/systems/class_workstationGeneric.inc:195
-msgid "Inherit NTP servers"
-msgstr "HÃ©riter des serveurs NTP"
-
-#: admin/systems/class_workstationGeneric.inc:196
-msgid "Inherit time server attributes from ogroup"
-msgstr "HÃ©rite des serveurs NTP depuis l'object group"
-
-#: admin/systems/class_workstationGeneric.inc:202
-msgid "NTP servers"
-msgstr "Serveurs NTP"
-
-#: admin/systems/class_workstationGeneric.inc:203
-#, php-format
-msgid "The NTP servers for the %s"
-msgstr "Les serveurs NTP pour ce %s"
-
-#: admin/systems/class_workstationGeneric.inc:209
-msgid "Inherit LDAP servers"
-msgstr "HÃ©riter les serveurs LDAP"
+msgstr "Ceci empÃªchera %s d'Ãªtre rÃ©installÃ©"
 
-#: admin/systems/class_workstationGeneric.inc:210
-msgid "Inherit LDAP server attributes from ogroup"
-msgstr "HÃ©rite des serveurs LDAP du groupe dâ€™objet"
-
-#: admin/systems/class_workstationGeneric.inc:216
-msgid "LDAP servers"
-msgstr "Serveurs LDAP"
-
-#: admin/systems/class_workstationGeneric.inc:217
-#, php-format
-msgid "The LDAP servers for the %s"
-msgstr "Les serveurs LDAP pour ce %s"
-
-#: admin/systems/class_workstationGeneric.inc:225
-#: admin/systems/class_workstationGeneric.inc:229
-#: admin/ogroups/goto/termgroup.tpl.c:41
-msgid "Action"
-msgstr "Action"
-
-#: admin/systems/class_workstationGeneric.inc:230
-#: admin/ogroups/goto/termgroup.tpl.c:44
-msgid "Select action to execute for this terminal"
-msgstr "SÃ©lectionnez l'opÃ©ration Ã  exÃ©cuter sur le terminal"
-
-#: admin/systems/class_workstationGeneric.inc:236
-#: admin/systems/class_componentGeneric.inc:75
-#: admin/systems/class_mobilePhoneGeneric.inc:106
-#: admin/systems/class_networkSettings.inc:1016
+#: admin/systems/class_workstationGeneric.inc:73
+#: admin/systems/class_printGeneric.inc:83
+#: admin/systems/class_componentGeneric.inc:69
+#: admin/systems/class_mobilePhoneGeneric.inc:102
+#: admin/systems/class_networkSettings.inc:1008
 msgid "Network settings"
 msgstr "ParamÃ¨tres rÃ©seaux"
 
-#: admin/systems/class_workstationGeneric.inc:459
-msgid "Workstation information"
-msgstr "Information de la station de travail"
-
-#: admin/systems/class_printGeneric.inc:131
-#: admin/systems/class_printGeneric.inc:1065
-#: admin/systems/class_systemManagement.inc:678
-msgid "Internal error"
-msgstr "Erreur interne"
-
-#: admin/systems/class_printGeneric.inc:131
-#, php-format
-msgid ""
-"Cannot determine a valid department for this object. Setting base to '%s'!"
-msgstr "Impossible d'obtenir un dÃ©partement valide pour cet objet. Base mise Ã  '%s'â€¯!"
-
-#: admin/systems/class_printGeneric.inc:311
-#: admin/systems/class_printGeneric.inc:319
-#: admin/systems/class_printGeneric.inc:324
-#: admin/systems/class_printGeneric.inc:374
-#: admin/systems/class_printGeneric.inc:390
-#: admin/systems/class_printGeneric.inc:393
-msgid "Add printer extension"
-msgstr "Ajouter une extension d'imprimante"
-
-#: admin/systems/class_printGeneric.inc:312
-msgid ""
-"Could not initialize printer tab, parameter parent was missing while "
-"construction."
-msgstr "Impossible d'initialiser l'onglet imprimante, le paramÃ¨tre parent Ã©tait manquant pendant la construction."
-
-#: admin/systems/class_printGeneric.inc:320
-msgid "This is a workstation template, printer tab is disabled."
-msgstr "Ceci est un modÃ¨le de station de travail, l'onglet imprimante est dÃ©sactivÃ©."
-
-#: admin/systems/class_printGeneric.inc:325
-msgid "This is a terminal template, printer tab is disabled."
-msgstr "Ceci est un modÃ¨le de terminal, l'onglet imprimante est dÃ©sactivÃ©."
-
-#: admin/systems/class_printGeneric.inc:367
-#: admin/systems/class_printGeneric.inc:375
-#: admin/systems/class_printGeneric.inc:383
-#: admin/systems/class_printGeneric.inc:386
-#: admin/systems/class_printGeneric.inc:391
-#: admin/systems/class_printGeneric.inc:394
-msgid "printer"
-msgstr "imprimante"
-
-#: admin/systems/class_printGeneric.inc:375
-msgid ""
-"You can't enable it while 'cn' is not present in entry. Possibly you are "
-"currently creating a new terminal template."
-msgstr "Vous ne pouvez l'activer tant qu'un 'cn' n'est pas prÃ©sent dans l'entrÃ©e. Vous Ãªtes probablement en train de crÃ©er un nouveau modÃ¨le de terminal."
-
-#: admin/systems/class_printGeneric.inc:382
-#: admin/systems/class_printGeneric.inc:385
-msgid "Remove printer extension"
-msgstr "Enlever l'extension d'impression"
-
-#: admin/systems/class_printGeneric.inc:474
-#: admin/systems/class_printGeneric.inc:652
-#: admin/systems/class_printGeneric.inc:659
-#: admin/systems/class_printGeneric.inc:718
-#: admin/systems/class_printGeneric.inc:1105
-#: admin/systems/class_printGeneric.inc:1116
-#: admin/systems/class_serverService.inc:224
-#: admin/systems/class_serverService.inc:270
-#: admin/systems/class_serverService.inc:393
-#: admin/systems/class_systemManagement.inc:341
-#: admin/systems/class_systemManagement.inc:624
-#: admin/systems/class_systemManagement.inc:639
-#: admin/systems/services/shares/class_serviceShare.inc:103
-#: admin/systems/class_networkSettings.inc:305
-#: admin/systems/class_networkSettings.inc:336
-#: admin/systems/class_networkSettings.inc:584
-#: admin/systems/class_networkSettings.inc:591
-#: admin/systems/class_networkSettings.inc:597
-#: admin/systems/class_networkSettings.inc:604
-msgid "Error"
-msgstr "Erreur"
-
-#: admin/systems/class_printGeneric.inc:577
-#, php-format
-msgid "Your currently selected PPD file '%s' doesn't exist."
-msgstr "Le fichier PPD sÃ©lectionnÃ© '%s' n'existe pas."
-
-#: admin/systems/class_printGeneric.inc:583
-msgid "Not defined"
-msgstr "Non dÃ©fini"
-
-#: admin/systems/class_printGeneric.inc:587
-#: admin/systems/ppd/class_printerPPDDialog.inc:116
-msgid "Can't get ppd informations."
-msgstr "Impossible d'obtenir les informations PPD."
-
-#: admin/systems/class_printGeneric.inc:602
-#: admin/systems/class_printGeneric.inc:604
-#, php-format
-msgid "This printer belongs to %s. You can't rename this printer."
-msgstr "Cette imprimante appartient Ã  %s. Vous ne pouvez pas changer son nom."
+#: admin/systems/class_workstationGeneric.inc:78
+#: admin/systems/class_printGeneric.inc:87
+#: admin/systems/class_componentGeneric.inc:73
+#: admin/systems/class_mobilePhoneGeneric.inc:106
+#: admin/systems/class_networkSettings.inc:630
+#: admin/systems/class_networkSettings.inc:643
+#: admin/systems/class_networkSettings.inc:645
+#: admin/systems/class_networkSettings.inc:1014
+msgid "IP address"
+msgstr "Adresse IP"
 
-#: admin/systems/class_printGeneric.inc:602
-#: admin/systems/class_terminalGeneric.inc:34
-msgid "terminal"
-msgstr "terminal"
+#: admin/systems/class_workstationGeneric.inc:78
+msgid "IP addresses this system uses (v4 or v6)"
+msgstr ""
 
-#: admin/systems/class_printGeneric.inc:652
-#: admin/systems/class_printGeneric.inc:659
-msgid "Object is no printer!"
-msgstr "Cet objet n'est pas une imprimanteâ€¯!"
+#: admin/systems/class_workstationGeneric.inc:83
+#: admin/systems/class_printGeneric.inc:91
+#: admin/systems/class_componentGeneric.inc:77
+#: admin/systems/class_mobilePhoneGeneric.inc:110
+msgid "Mac address"
+msgstr "Adresse mac"
+
+#: admin/systems/class_workstationGeneric.inc:83
+#: admin/systems/class_printGeneric.inc:91
+#: admin/systems/class_componentGeneric.inc:77
+#: admin/systems/class_mobilePhoneGeneric.inc:110
+msgid "Mac address of this system"
+msgstr ""
 
-#: admin/systems/class_printGeneric.inc:767 admin/systems/printer.tpl.c:23
-msgid "Printer URL"
-msgstr "URL de l'imprimante"
+#: admin/systems/class_workstationGeneric.inc:125
+#: admin/systems/class_workstationGeneric.inc:130
+#: admin/systems/class_workstationGeneric.inc:131
+msgid "Workstation"
+msgstr "Stations de travail"
 
-#: admin/systems/class_printGeneric.inc:989
-#: admin/systems/class_printGeneric.inc:991
-msgid "Group"
-msgstr "Groupe"
+#: admin/systems/class_workstationGeneric.inc:126
+msgid "Workstation information"
+msgstr "Information de la station de travail"
 
-#: admin/systems/class_printGeneric.inc:994
-msgid "User"
-msgstr "Utilisateur"
+#: admin/systems/class_printGeneric.inc:32
+#: admin/systems/class_printGeneric.inc:37
+#: admin/systems/class_printGeneric.inc:38
+msgid "Printer"
+msgstr "Imprimante"
 
-#: admin/systems/class_printGeneric.inc:1006
+#: admin/systems/class_printGeneric.inc:33
 msgid "Printer information"
 msgstr "Information de lâ€™imprimante"
 
-#: admin/systems/class_printGeneric.inc:1023
-#: admin/systems/serverService-list.tpl.c:2
-#: admin/systems/phoneSelect/phoneSelect-list.tpl.c:2
-#: admin/systems/printer.tpl.c:11
-msgid "Base"
-msgstr "Base"
-
-#: admin/systems/class_printGeneric.inc:1026
-msgid "LabeledURL"
-msgstr "URL de l'imprimante"
-
-#: admin/systems/class_printGeneric.inc:1027
-msgid "Printer PPD"
-msgstr "PPD de  l'imprimante"
-
-#: admin/systems/class_printGeneric.inc:1028 admin/systems/printer.tpl.c:38
-msgid "Permissions"
-msgstr "Permissions"
-
-#: admin/systems/class_printGeneric.inc:1030
-msgid "Windows inf file"
-msgstr "Fichier INF Windows"
+#: admin/systems/class_printGeneric.inc:60
+msgid "The name of the printer"
+msgstr ""
 
-#: admin/systems/class_printGeneric.inc:1031
-msgid "Windows driver dir"
-msgstr "RÃ©pertoire du pilote Windows"
+#: admin/systems/class_printGeneric.inc:64
+msgid "A short description of the printer"
+msgstr ""
 
-#: admin/systems/class_printGeneric.inc:1032 admin/systems/printer.tpl.c:62
-msgid "Driver printer name"
-msgstr "Nom du driver d'imprimante"
+#: admin/systems/class_printGeneric.inc:70
+msgid "Details"
+msgstr "DÃ©tails"
 
-#: admin/systems/class_printGeneric.inc:1048
-#: admin/systems/class_printGeneric.inc:1070
-msgid "Permission error"
-msgstr "Erreur de permission"
+#: admin/systems/class_printGeneric.inc:73
+msgid "Printer location"
+msgstr "Localisation de l'imprimante"
 
-#: admin/systems/class_printGeneric.inc:1048
-#: admin/systems/class_printGeneric.inc:1070
-msgid "printer user"
-msgstr "utilisateur de l'imprimante"
+#: admin/systems/class_printGeneric.inc:73
+msgid "The location of the printer"
+msgstr ""
 
-#: admin/systems/class_printGeneric.inc:1065
-#, php-format
-msgid "Illegal member type '%s'!"
-msgstr "Type de membre illÃ©gal '%s'â€¯!"
+#: admin/systems/class_printGeneric.inc:77
+msgid "Printer URL"
+msgstr "URL de l'imprimante"
 
-#: admin/systems/class_printGeneric.inc:1105
-#, php-format
-msgid "'%s' is already used!"
-msgstr "'%s' est dÃ©jÃ  utilisÃ© !"
+#: admin/systems/class_printGeneric.inc:77
+msgid "The URL of the printer"
+msgstr ""
 
-#: admin/systems/class_printGeneric.inc:1116
-#, php-format
-msgid "'%s' does not exist!"
-msgstr "'%s' n'existe pas !"
+#: admin/systems/class_printGeneric.inc:87
+#: admin/systems/class_componentGeneric.inc:73
+#: admin/systems/class_mobilePhoneGeneric.inc:106
+msgid "IP address this system uses"
+msgstr ""
 
 #: admin/systems/class_serverService.inc:58
 msgid "Server services"
-msgstr "Services du serveur"
+msgstr "Services serveur"
+
+#: admin/systems/class_serverService.inc:224
+#: admin/systems/class_serverService.inc:270
+#: admin/systems/class_serverService.inc:393
+#: admin/systems/services/shares/class_serviceShare.inc:103
+#: admin/systems/class_networkSettings.inc:297
+#: admin/systems/class_networkSettings.inc:328
+#: admin/systems/class_networkSettings.inc:576
+#: admin/systems/class_networkSettings.inc:583
+#: admin/systems/class_networkSettings.inc:589
+#: admin/systems/class_networkSettings.inc:596
+msgid "Error"
+msgstr "Erreur"
 
 #: admin/systems/class_serverService.inc:332
 msgid "Filter error"
-msgstr "Erreur de filtre"
+msgstr "Erreur de Filtre"
 
 #: admin/systems/class_serverService.inc:332
 msgid "The filter is incomplete!"
-msgstr "Le filtre est incompletâ€¯!"
+msgstr "Le filtre est incomplet !"
 
 #: admin/systems/class_serverService.inc:387
 msgid "Information"
@@ -712,7 +429,7 @@ msgstr "Information"
 
 #: admin/systems/class_serverService.inc:387
 msgid "Cannot update service status until it has been saved!"
-msgstr "Impossible de mettre Ã  jour le statut du service avant quâ€™il soit sauvÃ©â€¯!"
+msgstr "Impossible de mettre Ã  jour le statut avant que cela soit sauvÃ© !"
 
 #: admin/systems/class_serverService.inc:415
 #: admin/systems/class_serverService.inc:424
@@ -721,315 +438,165 @@ msgstr "Impossible de mettre Ã  jour le statut du service avant quâ€™il soit sau
 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:42
-#, 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:31
+msgid "terminal"
+msgstr "terminal"
 
+#: admin/systems/class_terminalGeneric.inc:43
 #: admin/systems/class_terminalGeneric.inc:48
-#, 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:54
-msgid "Remote desktop"
-msgstr "Bureau distant"
-
-#: admin/systems/class_terminalGeneric.inc:58
-msgid "Connect method"
-msgstr "MÃ©thode de connexion"
-
-#: admin/systems/class_terminalGeneric.inc:62
-msgid "XDMCP"
-msgstr "XDMCP"
-
-#: admin/systems/class_terminalGeneric.inc:62
-msgid "LDM"
-msgstr "LDM"
-
-#: admin/systems/class_terminalGeneric.inc:62
-msgid "Shell"
-msgstr "Shell"
-
-#: admin/systems/class_terminalGeneric.inc:62
-msgid "Telnet"
-msgstr "Telnet"
-
-#: admin/systems/class_terminalGeneric.inc:62
-msgid "Windows RDP"
-msgstr "Windows RDP"
-
-#: admin/systems/class_terminalGeneric.inc:66
-msgid "Terminal server"
-msgstr "Serveur de terminaux"
+#: admin/systems/class_terminalGeneric.inc:49
+msgid "Terminal"
+msgstr "Terminal"
 
-#: admin/systems/class_terminalGeneric.inc:82
+#: admin/systems/class_terminalGeneric.inc:44
 msgid "Terminal information"
 msgstr "Information du terminal"
 
-#: admin/systems/ppd/class_printerPPDSelectionDialog.inc:91
-#: admin/systems/ppd/class_printerPPDSelectionDialog.inc:116
-#: admin/systems/ppd/class_printerPPDSelectionDialog.inc:139
-#: admin/systems/ppd/class_printerPPDDialog.inc:92
-#: admin/systems/ppd/class_printerPPDDialog.inc:160
-#: admin/systems/ppd/class_printerPPDDialog.inc:241
-#: admin/systems/ppd/class_printerPPDDialog.inc:256
-#: admin/systems/ppd/class_printerPPDDialog.inc:269
-#: admin/systems/ppd/class_printerPPDDialog.inc:297
-#: admin/systems/ppd/class_printerPPDDialog.inc:314
-#: admin/systems/ppd/class_printerPPDDialog.inc:337
-#: admin/systems/ppd/class_printerPPDDialog.inc:351
-#: admin/systems/ppd/class_printerPPDDialog.inc:361
-#: admin/systems/ppd/class_printerPPDDialog.inc:365
-#: admin/systems/ppd/class_printerPPDDialog.inc:560
-#: admin/systems/ppd/class_printerPPDDialog.inc:577
-#: admin/systems/ppd/class_printerPPDDialog.inc:580
-#: admin/systems/ppd/class_printerPPDDialog.inc:583
-msgid "PPD error"
-msgstr "Erreur de PPD"
-
-#: admin/systems/ppd/class_printerPPDSelectionDialog.inc:139
-#, php-format
-msgid "Cannot locate vendor '%s' in available PPDs!"
-msgstr "Impossible de trouver le vendeur '%s' dans les PPDs disponiblesâ€¯!"
-
-#: admin/systems/ppd/class_printerPPDSelectionDialog.inc:148
-msgid "Printer ppd selection."
-msgstr "SÃ©lection du PPD de lâ€™imprimante."
-
-#: admin/systems/ppd/class_printerPPDSelectionDialog.inc:155
-msgid "delete"
-msgstr "supprimer"
-
-#: admin/systems/ppd/class_printerPPDSelectionDialog.inc:166
-msgid "back"
-msgstr "retour"
-
-#: admin/systems/ppd/class_printerPPDDialog.inc:74
-#: admin/systems/ppd/class_printerPPDDialog.inc:140
-#: admin/systems/services/class_goService.inc:241
-msgid "Configuration error"
-msgstr "Erreur de configuration"
-
-#: admin/systems/ppd/class_printerPPDDialog.inc:92
-#, php-format
-msgid "Cannot open PPD '%s'!"
-msgstr "Impossible de lire le PPD '%s'â€¯!"
-
-#: admin/systems/ppd/class_printerPPDDialog.inc:141
-#, php-format
-msgid "Cannot open PPD path '%s' for reading and writing!"
-msgstr "Impossible de lire et d'Ã©crire dans le chemin spÃ©cifiÃ© pour le PPD '%s'â€¯!"
-
-#: admin/systems/ppd/class_printerPPDDialog.inc:160
-#: admin/systems/ppd/class_printerPPDDialog.inc:365
-msgid "file is empty"
-msgstr "le fichier est vide"
-
-#: admin/systems/ppd/class_printerPPDDialog.inc:314
-#, php-format
-msgid "Cannot parse PPD '%s'!"
-msgstr "Impossible dâ€™analyser le PPD '%s'â€¯!"
-
-#: admin/systems/ppd/class_printerPPDDialog.inc:340
-msgid "Overwrite existing PPD"
-msgstr "Ã‰crasement du PPD existant"
-
-#: admin/systems/ppd/class_printerPPDDialog.inc:341
-msgid ""
-"There is already a ppd file for this kind of printer. Do you want to "
-"overwrite it?"
-msgstr "Il y a dÃ©jÃ  un fichier PPD pour ce type d'imprimante. Voulez vous lâ€™Ã©craserâ€¯?"
-
-#: admin/systems/ppd/class_printerPPDDialog.inc:491
-msgid "Section"
-msgstr "Section"
-
-#: admin/systems/ppd/class_printerPPDDialog.inc:551
-#: admin/systems/ppd/class_printerPPDDialog.inc:554
-msgid "True"
-msgstr "Vrai"
-
-#: admin/systems/ppd/class_printerPPDDialog.inc:552
-#: admin/systems/ppd/class_printerPPDDialog.inc:555
-msgid "False"
-msgstr "Faux"
-
-#: admin/systems/ppd/class_printerPPDDialog.inc:560
-#, php-format
-msgid "PPD type '%s' is not supported!"
-msgstr " PPD de type '%s' non supportÃ© !"
-
-#: admin/systems/ppd/class_printerPPDDialog.inc:597
-msgid ""
-"Please select a valid ppd file or use 'Cancel' to go back to printer "
-"configuration."
-msgstr "Veuillez sÃ©lectionner un fichier PPD valide ou utiliser 'Annuler' pour revenir Ã  la configuration de l'imprimante."
-
-#: admin/systems/ppd/class_ppdManager.inc:44
-#: admin/systems/ppd/class_ppdManager.inc:188
-#: admin/systems/ppd/class_ppdManager.inc:190
-msgid "PPD manager error"
-msgstr "Erreur du gestionnaire de PPD"
-
-#: admin/systems/ppd/class_ppdManager.inc:44
-#, php-format
-msgid "The specified path '%s' does not exist."
-msgstr "Le chemin '%s' n'existe pas."
-
-#: admin/systems/ppd/class_ppdManager.inc:188
-#, php-format
-msgid "Specified PPD file '%s' cannot be opened for reading."
-msgstr "Le fichier PPD '%s' ne peut pas Ãªtre ouvert en lecture."
-
-#: admin/systems/ppd/class_ppdManager.inc:190
-#, php-format
-msgid "The temporary file '%s' cannot be opened for writing."
-msgstr "Le fichier temporaire '%s' n'a pas pu Ãªtre ouvert en Ã©criture."
-
-#: admin/systems/ppd/class_ppdManager.inc:212
-#: admin/systems/ppd/class_ppdManager.inc:350
-msgid "Parsing PPD file failed - file is empty!"
-msgstr "La lecture du fichier PPD a Ã©chouÃ© - le fichier est vide !"
-
-#: admin/systems/ppd/class_ppdManager.inc:222
-#, php-format
-msgid ""
-"Parsing PPD file %s failed - line too long. Trailing characters have been "
-"ignored!"
-msgstr "La lecture du PPD %s a Ã©chouÃ© - ligne trop longue. Les caractÃ¨res restant ont Ã©tÃ© ignorÃ©s !"
-
-#: admin/systems/ppd/class_ppdManager.inc:230
-msgid "Nested groups are not supported!"
-msgstr "Les groupes imbriquÃ©s ne sont pas supportÃ©s !"
-
-#: admin/systems/ppd/class_ppdManager.inc:234
-msgid "Group name not unique!"
-msgstr "Le nom du groupe n'est pas unique !"
-
-#: admin/systems/ppd/class_ppdManager.inc:240
-#: admin/systems/ppd/class_ppdManager.inc:270
-msgid "Symbol values are not supported yet!"
-msgstr "Les valeurs symboles ne sont pas encore supportÃ©s"
-
-#: admin/systems/ppd/class_ppdManager.inc:264
-msgid "Nested options are not supported!"
-msgstr "Les options imbriquÃ©es ne sont pas supportÃ©es !"
-
-#: admin/systems/ppd/class_ppdManager.inc:289
-msgid "PickMany is not supported yet!"
-msgstr "La sÃ©lection multiple n'est pas encore supportÃ©e !"
-
-#: admin/systems/ppd/class_ppdManager.inc:370
-#, php-format
-msgid ""
-"Parsing PPD file %s failed - line too long. Trailing characters have been "
-"ignored"
-msgstr "La lecture du PPD %s a Ã©chouÃ© - ligne trop longue. Les caractÃ¨res restant ont Ã©tÃ© ignorÃ©s"
-
-#: admin/systems/ppd/class_ppdManager.inc:395
-#, php-format
-msgid "Parsing PPD file %s failed - no information found."
-msgstr "Lâ€™analyse du fichier PPD %s a Ã©chouÃ© - pas de donnÃ©es."
-
 #: admin/systems/class_systemImport.inc:72
 #, php-format
 msgid "Could not parse %s"
-msgstr "Impossible dâ€™analyser le contenu de %s"
+msgstr "Impossible de lire le contenu de %s"
 
 #: 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"
+msgstr "Pas de serveur dhcp trouvÃ© pour l'ip %s"
 
 #: admin/systems/class_systemImport.inc:130
 #, php-format
 msgid "No DNS server found for zone %s"
-msgstr "Pas de serveur DNS trouvÃ© pour la zone %s"
+msgstr "Pas de serveur dns trouvÃ© pour l'ip %s"
 
 #: admin/systems/class_systemImport.inc:165
 msgid "Import"
 msgstr "Importer"
 
+#: admin/systems/class_systemImport.inc:169
+#: admin/systems/class_serverGeneric.inc:43
+#: admin/systems/class_serverGeneric.inc:48
+#: admin/systems/class_serverGeneric.inc:49
+msgid "Server"
+msgstr "Serveur"
+
 #: admin/systems/class_systemImport.inc:169
 msgid "The server you wish to import hosts from"
-msgstr "Le serveur duquel vous souhaitez importer des machines"
+msgstr "Le serveur duquel vous souhaitez importer les machines"
 
-#: admin/systems/class_serverGeneric.inc:34
+#: admin/systems/class_serverGeneric.inc:31
 msgid "server"
 msgstr "serveur"
 
-#: admin/systems/class_serverGeneric.inc:47
+#: admin/systems/class_serverGeneric.inc:44
 msgid "Server information"
 msgstr "Information du serveur"
 
-#: admin/systems/class_componentGeneric.inc:37
+#: admin/systems/class_componentGeneric.inc:31
+msgid "Component"
+msgstr "Composant"
+
+#: admin/systems/class_componentGeneric.inc:32
 msgid "Component information"
 msgstr "Information du composant"
 
-#: admin/systems/class_componentGeneric.inc:64
+#: admin/systems/class_componentGeneric.inc:36
+#: admin/systems/class_componentGeneric.inc:37
+msgid "Network device"
+msgstr "PÃ©riphÃ©rique rÃ©seau"
+
+#: admin/systems/class_componentGeneric.inc:58
 msgid "The name of the component"
 msgstr "Nom du composant"
 
-#: admin/systems/class_componentGeneric.inc:68
+#: admin/systems/class_componentGeneric.inc:62
 msgid "A short description of the component"
 msgstr "Description courte du composant"
 
+#: admin/systems/class_systemServers.inc:31
+#: admin/systems/class_systemServers.inc:53
+msgid "Servers"
+msgstr "Serveurs"
+
+#: admin/systems/class_systemServers.inc:35
+msgid "The syslog server the system should be using"
+msgstr ""
+
+#: admin/systems/class_systemServers.inc:40
+msgid "NTP servers"
+msgstr "Serveurs NTP"
+
+#: admin/systems/class_systemServers.inc:40
+msgid "The NTP servers for this system"
+msgstr ""
+
+#: admin/systems/class_systemServers.inc:54
+msgid "Servers this system is using"
+msgstr ""
+
+#: admin/systems/class_mobilePhoneGeneric.inc:32
 #: admin/systems/class_mobilePhoneGeneric.inc:37
+#: admin/systems/class_mobilePhoneGeneric.inc:38
+msgid "Mobile phone"
+msgstr "TÃ©lÃ©phone portable"
+
+#: admin/systems/class_mobilePhoneGeneric.inc:33
 msgid "Mobile phone information"
 msgstr "Information du tÃ©lÃ©phone portable"
 
-#: admin/systems/class_mobilePhoneGeneric.inc:63
+#: admin/systems/class_mobilePhoneGeneric.inc:60
 msgid "The name of the mobile phone"
-msgstr "Nom du tÃ©lÃ©phone portable"
+msgstr "Nom du tÃ©lÃ©phone mobile"
 
-#: admin/systems/class_mobilePhoneGeneric.inc:67
+#: admin/systems/class_mobilePhoneGeneric.inc:64
 msgid "A short description of the mobile phone"
 msgstr "Courte description du tÃ©lÃ©phone"
 
-#: admin/systems/class_mobilePhoneGeneric.inc:77
+#: admin/systems/class_mobilePhoneGeneric.inc:70
+msgid "Phone"
+msgstr "TÃ©lÃ©phone"
+
+#: admin/systems/class_mobilePhoneGeneric.inc:73
 msgid "Serial Number"
 msgstr "NumÃ©ro de sÃ©rie"
 
-#: admin/systems/class_mobilePhoneGeneric.inc:77
+#: admin/systems/class_mobilePhoneGeneric.inc:73
 msgid "The serial number of the mobile phone"
-msgstr "NumÃ©ro de sÃ©rie du tÃ©lÃ©phone portable"
+msgstr "NumÃ©ro de sÃ©rie du tÃ©lÃ©phone mobile"
 
-#: admin/systems/class_mobilePhoneGeneric.inc:81
+#: admin/systems/class_mobilePhoneGeneric.inc:77
 msgid "IMEI Number"
 msgstr "NumÃ©ro IMEI"
 
-#: admin/systems/class_mobilePhoneGeneric.inc:81
+#: admin/systems/class_mobilePhoneGeneric.inc:77
 msgid "The IMEI number of the mobile phone"
-msgstr "NumÃ©ro IMEI du tÃ©lÃ©phone portable"
+msgstr "NumÃ©ro IMEI du tÃ©lÃ©phone mobile"
 
-#: admin/systems/class_mobilePhoneGeneric.inc:86
+#: admin/systems/class_mobilePhoneGeneric.inc:82
 msgid "OS"
 msgstr "SystÃ¨me d'exploitation"
 
-#: admin/systems/class_mobilePhoneGeneric.inc:86
+#: admin/systems/class_mobilePhoneGeneric.inc:82
 msgid "The Operating System installed on this phone"
 msgstr "SystÃ¨me d'exploitation installÃ© sur ce tÃ©lÃ©phone"
 
-#: admin/systems/class_mobilePhoneGeneric.inc:92
+#: admin/systems/class_mobilePhoneGeneric.inc:88
 msgid "SimCard"
-msgstr "Carte SIM"
+msgstr "Carte  SIM"
 
-#: admin/systems/class_mobilePhoneGeneric.inc:95
+#: admin/systems/class_mobilePhoneGeneric.inc:91
 msgid "Telephone Number"
 msgstr "NumÃ©ro de tÃ©lÃ©phone"
 
-#: admin/systems/class_mobilePhoneGeneric.inc:95
+#: admin/systems/class_mobilePhoneGeneric.inc:91
 msgid "The telephone number of the mobile phone"
-msgstr "NumÃ©ro du tÃ©lÃ©phone portable"
+msgstr "NumÃ©ro du tÃ©lÃ©phone mobile"
 
-#: admin/systems/class_mobilePhoneGeneric.inc:99
+#: admin/systems/class_mobilePhoneGeneric.inc:95
 msgid "PUK Number"
 msgstr "NumÃ©ro PUK"
 
-#: admin/systems/class_mobilePhoneGeneric.inc:99
+#: admin/systems/class_mobilePhoneGeneric.inc:95
 msgid "The PUK number of the simcard in this mobile phone"
-msgstr "NumÃ©ro PUK de la carte SIM du tÃ©lÃ©phone portable"
+msgstr "NumÃ©ro PUK de la carte SIM du tÃ©lÃ©phone mobile"
 
 #: admin/systems/serverService-list.xml:10
 msgid "List of services"
@@ -1050,7 +617,7 @@ msgstr "Obtenir le status"
 #: admin/systems/serverService-list.xml:97
 #: admin/systems/services/cups/class_serviceCUPS.inc:92
 msgid "Start"
-msgstr "DÃ©marrer"
+msgstr "DÃ©marrage"
 
 #: admin/systems/serverService-list.xml:105
 #: admin/systems/services/cups/class_serviceCUPS.inc:93
@@ -1060,89 +627,39 @@ msgstr "ArrÃªter"
 #: admin/systems/serverService-list.xml:113
 #: admin/systems/services/cups/class_serviceCUPS.inc:94
 msgid "Restart"
-msgstr "RedÃ©marrer"
+msgstr "RÃ©essayer"
 
 #: admin/systems/serverService-list.xml:121
 msgid "Edit service"
-msgstr "Ã‰diter le service"
+msgstr "Editer le service"
 
 #: admin/systems/serverService-list.xml:129
 msgid "Remove service"
-msgstr "Supprimer le service"
-
-#: admin/systems/phoneSelect/phoneSelect-list.xml:10
-msgid "Please select the desired entries"
-msgstr "Veuillez sÃ©lectionner les entrÃ©es dÃ©sirÃ©es"
-
-#: admin/systems/phoneSelect/phoneSelect-list.xml:56
-msgid "Number"
-msgstr "NumÃ©ro"
-
-#: admin/systems/phoneSelect/phoneSelect-list.xml:83
-msgid "Select this number"
-msgstr "Choisir ce numÃ©ro"
+msgstr "Suppression du service"
 
-#: admin/systems/class_systemManagement.inc:177
-msgid "Back"
-msgstr "Retour"
-
-#: admin/systems/class_systemManagement.inc:223
-msgid "Creating the image failed. Please see the report below."
-msgstr "La crÃ©ation de l'image a Ã©chouÃ©. Veuillez lire le rapport ci dessous."
-
-#: admin/systems/class_systemManagement.inc:228
-#, php-format
-msgid "Command '%s', specified for ISO creation doesn't seem to exist."
-msgstr "La commande '%s', utilisÃ©e dans la crÃ©ation de l'image ISO n'existe pas."
-
-#: admin/systems/class_systemManagement.inc:398
-#: admin/systems/class_systemManagement.inc:473
-#: admin/systems/class_systemManagement.inc:858
-#: admin/systems/class_systemManagement.inc:905
-#: admin/systems/class_systemManagement.inc:926
-msgid "Permission"
-msgstr "Permission"
-
-#: admin/systems/class_systemManagement.inc:678
-msgid "Cannot set mode to 'active'!"
-msgstr "Impossible de mettre le mode Ã  'actif'â€¯!"
-
-#: admin/systems/class_systemManagement.inc:858
-#, php-format
-msgid "You are not allowed to create a snapshot for %s."
-msgstr "Vous n'Ãªtes pas autorisÃ© Ã  crÃ©er un nouvel instantanÃ© pour %s."
-
-#: admin/systems/class_systemManagement.inc:905
-#: admin/systems/class_systemManagement.inc:926
-#, php-format
-msgid "You are not allowed to restore a snapshot for %s."
-msgstr "Vous n'Ãªtes pas autorisÃ© Ã  restaurer un instantanÃ© de %s."
-
-#: admin/systems/class_systemManagement.inc:1169
-#, php-format
-msgid "Inherited from %s"
-msgstr "HÃ©ritÃ© de %s"
-
-#: admin/systems/class_systemManagement.inc:1224
-#: admin/systems/class_systemManagement.inc:1228
-#: addons/dashboard/class_dashBoardSystems.inc:199
+#: admin/systems/class_systemManagement.inc:48
 #: config/systems/class_systemsPluginConfig.inc:28
 msgid "Systems"
 msgstr "SystÃ¨mes"
 
-#: admin/systems/class_systemManagement.inc:1225
+#: admin/systems/class_systemManagement.inc:49
 msgid "Systems Management"
 msgstr "Gestion des systÃ¨mes"
 
+#: admin/systems/class_systemManagement.inc:250
+#, php-format
+msgid "Inherited from %s"
+msgstr "HÃ©ritÃ© de %s"
+
 #: admin/systems/services/terminal/class_serviceTerminal.inc:29
 #: admin/systems/services/terminal/class_serviceTerminal.inc:30
 #: admin/systems/services/terminal/class_serviceTerminal.inc:41
 msgid "Terminal service"
-msgstr "Service de terminal"
+msgstr "Services de terminaux"
 
 #: admin/systems/services/terminal/class_serviceTerminal.inc:44
 msgid "Temporary disable login"
-msgstr "DÃ©sactiver temporairement l'identification"
+msgstr "DÃ©sactiver temporairement l'identifiant"
 
 #: admin/systems/services/terminal/class_serviceTerminal.inc:45
 msgid "Disables the login on this terminal server"
@@ -1171,6 +688,10 @@ msgstr "Cups"
 msgid "Empty service"
 msgstr "Service vide"
 
+#: admin/systems/services/class_goService.inc:241
+msgid "Configuration error"
+msgstr "Erreur de configuration"
+
 #: admin/systems/services/shares/class_serviceShare.inc:30
 #: admin/systems/services/shares/class_serviceShare.inc:31
 msgid "Share service"
@@ -1202,7 +723,7 @@ msgstr "Type de partage"
 
 #: admin/systems/services/shares/class_serviceShare.inc:65
 msgid "Codepage"
-msgstr "Page de code"
+msgstr "Codage des caractÃ¨res"
 
 #: admin/systems/services/shares/class_serviceShare.inc:65
 msgid "Codepage for this share"
@@ -1229,23 +750,21 @@ msgid "You need to configure encodings first"
 msgstr "Vous devez configurer en premier l'encodage"
 
 #: admin/systems/services/shares/class_serviceShare.inc:110
-#: admin/ogroups/goto/termgroup.tpl.c:2 admin/systems/remove.tpl.c:2
-#: admin/systems/ppd/remove_ppd.tpl.c:2
 msgid "Warning"
 msgstr "Avertissement"
 
 #: admin/systems/services/shares/class_serviceShare.inc:110
 #, php-format
 msgid "Invalid value in encodings : %s"
-msgstr "Valeur dâ€™encodage invalideâ€¯: %s"
+msgstr "Valeur d'encodage invalide: %s"
 
 #: admin/systems/services/ntp/class_serviceNTP.inc:29
 msgid "Time service"
-msgstr "Service de temps"
+msgstr "Services de temps"
 
 #: admin/systems/services/ntp/class_serviceNTP.inc:30
 msgid "Time service - NTP"
-msgstr "Service de temps - NTP"
+msgstr "Services de temps - NTP"
 
 #: admin/systems/services/ntp/class_serviceNTP.inc:41
 msgid "Informations"
@@ -1282,7 +801,7 @@ msgstr "l'URI LDAP Ã  utiliser pour communiquer avec le serveur LDAP"
 
 #: admin/systems/services/ldap/class_serviceLDAP.inc:46
 msgid "fill-in-your-servers-dns-name"
-msgstr "remplir-avec-votre-nom-de-domaine"
+msgstr "Veuillez indiquer vos serveurs dns"
 
 #: admin/systems/services/ldap/class_serviceLDAP.inc:51
 msgid "Size limit"
@@ -1290,7 +809,7 @@ msgstr "Taille limite"
 
 #: admin/systems/services/ldap/class_serviceLDAP.inc:51
 msgid "Limit the number of record returned"
-msgstr "Limiter le nombre d'entrÃ©es retournÃ©es"
+msgstr "Limiter le nombre d'entrÃ©es retournÃ©s"
 
 #: admin/systems/services/ldap/class_serviceLDAP.inc:56
 msgid "Time limit"
@@ -1302,11 +821,11 @@ msgstr "Limite de temps pour les rÃ©sultats Ã  retourner"
 
 #: admin/systems/services/ldap/class_serviceLDAP.inc:61
 msgid "Deref"
-msgstr "DÃ©ref"
+msgstr "Deref"
 
 #: admin/systems/services/ldap/class_serviceLDAP.inc:61
 msgid "Specifies how alias dereferencing is done when performing a search"
-msgstr "SpÃ©cifie comment le dÃ©-rÃ©fÃ©rencement dâ€™alias est fait lors de lâ€™exÃ©cution d'une recherche"
+msgstr "SpÃ©cifie comment les alias de dÃ©-rÃ©fÃ©rencement sont fait lors de lâ€™exÃ©cution d'une recherche"
 
 #: admin/systems/services/ldap/class_serviceLDAP.inc:66
 msgid "TLS Cert"
@@ -1326,7 +845,7 @@ msgstr "Chemin vers le fichier de la clÃ© TLS"
 
 #: admin/systems/services/ldap/class_serviceLDAP.inc:74
 msgid "TLS CaCert"
-msgstr "AutoritÃ© de certification TLS"
+msgstr "Chemin vers le fichier contenant l'autoritÃ© de certification TLS"
 
 #: admin/systems/services/ldap/class_serviceLDAP.inc:74
 msgid "Filepath to tls ca certificate"
@@ -1344,168 +863,108 @@ msgstr "Indique quels sont les vÃ©rifications Ã  faire sur les certificats serve
 
 #: admin/systems/services/ldap/class_serviceLDAP.inc:83
 msgid "TLS CrlCheck"
-msgstr "VÃ©rification de rÃ©vocation TLS"
+msgstr "VÃ©rification de la liste de rÃ©vocation des certificats TLS"
 
 #: admin/systems/services/ldap/class_serviceLDAP.inc:83
 msgid ""
 "Specifies if the Certificate Revocation List (CRL) of the CA should be used "
 "to verify if the server certificates have  not  been  revoked"
-msgstr "Indique si la liste de certificats rÃ©voquÃ©s (CRL) de l'autoritÃ© de certification doit Ãªtre utilisÃ©e pour vÃ©rifier si le certificat a Ã©tÃ© rÃ©voquÃ© ou non"
+msgstr "Indique si la liste de certificats rÃ©voquÃ©s (CRL) de l'autoritÃ© de certification doit Ãªtre utilisÃ© pour vÃ©rifier si le certificat a Ã©tÃ© rÃ©voquÃ© ou non"
 
 #: admin/systems/services/ldap/class_serviceLDAP.inc:97
 msgid "LDAP"
 msgstr "LDAP"
 
-#: admin/systems/class_networkSettings.inc:305
+#: admin/systems/class_networkSettings.inc:297
 msgid "NOT IMPLEMENTED"
 msgstr "Non implÃ©mentÃ©"
 
-#: admin/systems/class_networkSettings.inc:437
+#: admin/systems/class_networkSettings.inc:429
 msgid "Not matching"
-msgstr "Ne correspond pas"
+msgstr "Pas Ã©quivalent"
 
-#: admin/systems/class_networkSettings.inc:584
+#: admin/systems/class_networkSettings.inc:576
 #, php-format
 msgid "Was not able to contact argonaut server: %s"
-msgstr "Impossible de contacter le serveur Argonautâ€¯: %s"
+msgstr "Impossible de contacter le serveur Argonaut : %s"
 
-#: admin/systems/class_networkSettings.inc:591
+#: admin/systems/class_networkSettings.inc:583
 #, php-format
 msgid "Was not able to find DNS server for zone %s"
 msgstr "Impossible de trouver le serveur DNS pour la zone %s"
 
-#: admin/systems/class_networkSettings.inc:597
+#: admin/systems/class_networkSettings.inc:589
 #, php-format
 msgid "Was not able to find mac address of DNS server %s"
 msgstr "Impossible de trouver l'adresse mac du serveur DNS pour la zone %s"
 
-#: admin/systems/class_networkSettings.inc:604
+#: admin/systems/class_networkSettings.inc:596
 #, php-format
 msgid "Was not able to launch ldap2zone: %s"
-msgstr "Impossible de dÃ©marrer ldap2zoneâ€¯: %s"
+msgstr "Impossible de dÃ©marrer ldap2zone: %s"
 
-#: admin/systems/class_networkSettings.inc:630
+#: admin/systems/class_networkSettings.inc:622
 #, php-format
 msgid "IP address %s"
 msgstr "Adresse IP %s"
 
-#: admin/systems/class_networkSettings.inc:638
-#: admin/systems/class_networkSettings.inc:651
-#: admin/systems/class_networkSettings.inc:653
-#: admin/systems/class_networkSettings.inc:1022
-msgid "IP address"
-msgstr "Adresse IP"
-
-#: admin/systems/class_networkSettings.inc:644
-#: admin/systems/class_networkSettings.inc:660
-#: admin/systems/class_networkSettings.inc:662
-#: admin/systems/class_networkSettings.inc:1023
+#: admin/systems/class_networkSettings.inc:636
+#: admin/systems/class_networkSettings.inc:652
+#: admin/systems/class_networkSettings.inc:654
+#: admin/systems/class_networkSettings.inc:1015
 msgid "MAC address"
 msgstr "Adresse MAC"
 
-#: admin/systems/class_networkSettings.inc:676
+#: admin/systems/class_networkSettings.inc:668
 #, php-format
 msgid "The IP address '%s' is not part of the selected reverse zone '%s'!"
-msgstr "L'adresse spÃ©cifiÃ©e '%s' ne correspond pas Ã  l'entrÃ©e de la zone inverse sÃ©lectionnÃ©e '%s'â€¯!"
+msgstr "L'adresse spÃ©cifiÃ©e '%s' ne correspond pas Ã  la l'entrÃ©e de la zone inverse sÃ©lectionnÃ©e '%s'."
 
-#: admin/systems/class_networkSettings.inc:686
+#: admin/systems/class_networkSettings.inc:678
 #, php-format
 msgid "Record type '%s' is duplicated!"
-msgstr "L'enregistrement de type '%s' est dupliquÃ©â€¯!"
+msgstr "L'enregistrement de type '%s' est dupliquÃ©e !"
 
-#: admin/systems/class_networkSettings.inc:693
+#: admin/systems/class_networkSettings.inc:685
 #, php-format
 msgid "Uniq record type '%s' is duplicated!"
-msgstr "L'enregistrement de type '%s' est dupliquÃ©â€¯!"
+msgstr "L'enregistrement de type '%s' est dupliquÃ© !"
 
-#: admin/systems/class_networkSettings.inc:705
+#: admin/systems/class_networkSettings.inc:697
 #, php-format
 msgid ""
 "The IP address '%s' will be added as 'A Record', this will be done "
 "automatically, please remove the record."
 msgstr "L'adresse IP '%s' est ajoutÃ©e comme un 'A' record, ceci sera fait automatiquement, veuillez enlever l'enregistrement."
 
-#: admin/systems/class_networkSettings.inc:712
+#: admin/systems/class_networkSettings.inc:704
 #, php-format
 msgid "Only lowercase records are allowed, please check your '%ss'."
-msgstr "Seulement les minuscules sont autorisÃ©es, veuillez vÃ©rifier votre '%ss'."
+msgstr "Seulement les minuscules sont autorisÃ©e, veuillez vÃ©rifier votre '%ss'."
 
-#: admin/systems/class_networkSettings.inc:978
+#: admin/systems/class_networkSettings.inc:970
 msgid "Delete"
 msgstr "Supprimer"
 
-#: admin/systems/class_networkSettings.inc:984
+#: admin/systems/class_networkSettings.inc:976
 msgid "Add"
 msgstr "Ajouter"
 
-#: admin/systems/class_networkSettings.inc:1015
-#: addons/dashboard/class_dashBoardNetwork.inc:127
+#: admin/systems/class_networkSettings.inc:1007
 msgid "Network"
 msgstr "RÃ©seau"
 
-#: admin/systems/class_networkSettings.inc:1030
+#: admin/systems/class_networkSettings.inc:1022
 msgid "DNS configuration"
 msgstr "Configuration du DNS"
 
-#: admin/systems/class_networkSettings.inc:1033
+#: admin/systems/class_networkSettings.inc:1025
 msgid "DHCP configuration"
 msgstr "Configuration de DHCP"
 
-#: addons/dashboard/class_dashBoardSystems.inc:45
-msgid "Workstations"
-msgstr "Stations de travail"
-
-#: addons/dashboard/class_dashBoardSystems.inc:51
-msgid "Windows Workstations"
-msgstr "Stations de travail Windows"
-
-#: addons/dashboard/class_dashBoardSystems.inc:54
-msgid "Terminals"
-msgstr "Terminaux"
-
-#: addons/dashboard/class_dashBoardSystems.inc:57
-msgid "Printers"
-msgstr "Imprimantes"
-
-#: addons/dashboard/class_dashBoardSystems.inc:60
-msgid "Phones"
-msgstr "TÃ©lÃ©phones"
-
-#: addons/dashboard/class_dashBoardSystems.inc:63
-msgid "Components"
-msgstr "Composants"
-
-#: addons/dashboard/class_dashBoardSystems.inc:66
-msgid "Mobile phones"
-msgstr "TÃ©lÃ©phone mobile"
-
-#: addons/dashboard/class_dashBoardSystems.inc:183
-msgid "Statistics"
-msgstr "Statistiques"
-
-#: addons/dashboard/class_dashBoardSystems.inc:188
-msgid "Computer name to use by unit"
-msgstr "Nom de l'ordinateur Ã  utiliser par unitÃ©"
-
-#: addons/dashboard/class_dashBoardSystems.inc:200
-msgid "Statistics and informations about systems"
-msgstr "Statistiques et informations sur les systÃ¨mes"
-
-#: addons/dashboard/class_dashBoardNetwork.inc:111
-msgid "DHCP"
-msgstr "DHCP"
-
-#: addons/dashboard/class_dashBoardNetwork.inc:116
-msgid "DNS"
-msgstr "DNS"
-
-#: addons/dashboard/class_dashBoardNetwork.inc:128
-msgid "Statistics and various informations"
-msgstr "Statistiques et informations diverses"
-
 #: config/systems/class_systemsPluginConfig.inc:29
 msgid "Systems plugin configuration"
-msgstr "Configuration du plugin SystÃ¨mes"
+msgstr "Configuration de l'extension SystÃ¨mes"
 
 #: config/systems/class_systemsPluginConfig.inc:40
 msgid "LDAP tree for systems"
@@ -1513,7 +972,7 @@ msgstr "Arbre LDAPÂ des systÃ¨mes"
 
 #: config/systems/class_systemsPluginConfig.inc:43
 msgid "Systems RDN"
-msgstr "Branche des systÃ¨mes"
+msgstr "Chemin relatif des systÃ¨mes"
 
 #: config/systems/class_systemsPluginConfig.inc:43
 msgid "Branch in which systems will be stored"
@@ -1521,7 +980,7 @@ msgstr "Branche oÃ¹ seront stockÃ©s les systÃ¨mes"
 
 #: config/systems/class_systemsPluginConfig.inc:48
 msgid "Server RDN"
-msgstr "Branche des serveurs"
+msgstr "Chemin relatif des serveurs"
 
 #: config/systems/class_systemsPluginConfig.inc:48
 msgid "Branch in which servers will be stored"
@@ -1529,15 +988,15 @@ msgstr "Branche oÃ¹ seront stockÃ©s les serveurs"
 
 #: config/systems/class_systemsPluginConfig.inc:53
 msgid "Workstations RDN"
-msgstr "Branche des stations de travail"
+msgstr "Chemin relatif 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"
+msgstr "Branches oÃ¹ seront stockÃ©s les stations de travail"
 
 #: config/systems/class_systemsPluginConfig.inc:58
 msgid "Terminal RDN"
-msgstr "Branche des terminaux"
+msgstr "Chemin relatif des terminaux"
 
 #: config/systems/class_systemsPluginConfig.inc:58
 msgid "Branch in which terminals will be stored"
@@ -1545,15 +1004,15 @@ msgstr "Branche oÃ¹ seront stockÃ©s les terminaux"
 
 #: config/systems/class_systemsPluginConfig.inc:63
 msgid "Printer RDN"
-msgstr "Branche des imprimantes"
+msgstr "Chemin relatif des imprimantes"
 
 #: config/systems/class_systemsPluginConfig.inc:63
 msgid "Branch in which printers will be stored"
-msgstr "Branche oÃ¹ seront stockÃ©es les imprimantes"
+msgstr "Branche oÃ¹ seront stockÃ©s les imprimantes"
 
 #: config/systems/class_systemsPluginConfig.inc:68
 msgid "Component RDN"
-msgstr "Branche des composants"
+msgstr "Chemin relatif des composants"
 
 #: config/systems/class_systemsPluginConfig.inc:68
 msgid "Branch in which network devices will be stored"
@@ -1561,11 +1020,11 @@ msgstr "Branche oÃ¹ seront stockÃ©s les pÃ©riphÃ©riques rÃ©seaux"
 
 #: config/systems/class_systemsPluginConfig.inc:73
 msgid "Mobile phone RDN"
-msgstr "Branche des tÃ©lÃ©phones portables"
+msgstr "Chemin relatif des tÃ©lÃ©phones mobiles"
 
 #: config/systems/class_systemsPluginConfig.inc:73
 msgid "Branch in which mobile phones will be stored"
-msgstr "Branche oÃ¹ seront stockÃ©s les tÃ©lÃ©phones portables"
+msgstr "Branche oÃ¹ seront stockÃ©s les tÃ©lÃ©phones mobiles"
 
 #: config/systems/class_systemsPluginConfig.inc:80
 msgid "Miscellaneous"
@@ -1577,15 +1036,15 @@ msgstr "Encodages disponibles pour les services de partage"
 
 #: config/systems/class_systemsPluginConfig.inc:88
 msgid "Encoding"
-msgstr "Encodage"
+msgstr "Encodages"
 
 #: config/systems/class_systemsPluginConfig.inc:88
 msgid "The encoding code name"
-msgstr "Code de l'encodage"
+msgstr "Nom de l'encodage"
 
 #: config/systems/class_systemsPluginConfig.inc:93
 msgid "Label"
-msgstr "Ã‰tiquette"
+msgstr "Etiquette"
 
 #: config/systems/class_systemsPluginConfig.inc:93
 msgid "The encoding displayed name"
@@ -1594,404 +1053,3 @@ msgstr "Nom affichÃ© de l'encodage"
 #: config/systems/class_systemsPluginConfig.inc:101
 msgid "Encodings"
 msgstr "Encodages"
-
-#: admin/ogroups/goto/termgroup.tpl.c:5
-msgid ""
-"Actions you choose here influence all systems in this object group. "
-"Additionally, all values editable here can be inherited by the clients "
-"assigned to this object group."
-msgstr "Les actions que vous choisissez ici influencent tout les systÃ¨mes dans ce groupe d'objet. De plus tout les valeurs Ã©ditables ici peuvent Ãªtre hÃ©ritÃ© par les clients assignÃ© Ã  ce groupe d'objets."
-
-#: admin/ogroups/goto/termgroup.tpl.c:8
-msgid "Generic"
-msgstr "Application"
-
-#: admin/ogroups/goto/termgroup.tpl.c:11
-msgid "NTP server"
-msgstr "Serveur NTP"
-
-#: admin/ogroups/goto/termgroup.tpl.c:14
-msgid "Choose server to use for synchronizing time"
-msgstr "SÃ©lectionnez le serveur pour la synchronisation du temps"
-
-#: admin/ogroups/goto/termgroup.tpl.c:20
-msgid "Select terminal mode"
-msgstr "SÃ©lectionnez le mode du terminal"
-
-#: admin/ogroups/goto/termgroup.tpl.c:26
-msgid "Choose server to use for logging"
-msgstr "SÃ©lectionnez le serveur de journaux Ã  utiliser"
-
-#: admin/ogroups/goto/termgroup.tpl.c:32
-msgid "Select NFS root filesystem to use"
-msgstr "SÃ©lectionnez le systÃ¨me de fichier racine NFS Ã  utiliser"
-
-#: admin/ogroups/goto/termgroup.tpl.c:38
-msgid "Choose NFS filesystem to place swap files on"
-msgstr "SÃ©lectionnez le systÃ¨me de fichier NFS oÃ¹ sera placÃ© le swap"
-
-#: admin/ogroups/goto/termgroup.tpl.c:47
-msgid "Execute"
-msgstr "ExÃ©cuter"
-
-#: admin/systems/network.tpl.c:2
-msgid "Network  settings"
-msgstr "Configuration rÃ©seau"
-
-#: admin/systems/network.tpl.c:5
-msgid "IP-address"
-msgstr "Adresse IP"
-
-#: admin/systems/network.tpl.c:8 admin/systems/network.tpl.c:11
-msgid "Propose ip"
-msgstr "Proposer une adresse ip"
-
-#: admin/systems/network.tpl.c:14
-msgid "MAC-address"
-msgstr "Adresse MAC"
-
-#: admin/systems/network.tpl.c:17
-msgid "Autodetect"
-msgstr "AutodÃ©tection"
-
-#: admin/systems/network.tpl.c:20 admin/systems/network.tpl.c:23
-msgid "Enable DHCP for this device"
-msgstr "Activer le DHCP pour ce pÃ©riphÃ©rique"
-
-#: admin/systems/network.tpl.c:26 admin/systems/network.tpl.c:50
-msgid "not configured"
-msgstr "non configurÃ©"
-
-#: admin/systems/network.tpl.c:29
-msgid "Parent node"
-msgstr "NÅ“ud parent"
-
-#: admin/systems/network.tpl.c:32
-msgid "Edit settings"
-msgstr "Ã‰diter les paramÃ¨tres"
-
-#: admin/systems/network.tpl.c:35 admin/systems/network.tpl.c:47
-msgid "Enable DNS for this device"
-msgstr "Activer le DNS pour ce pÃ©riphÃ©rique"
-
-#: admin/systems/network.tpl.c:38
-msgid "Zone"
-msgstr "Zone"
-
-#: admin/systems/network.tpl.c:41
-msgid "TTL"
-msgstr "TTL"
-
-#: admin/systems/network.tpl.c:44
-msgid "Dns records"
-msgstr "Enregistrement dns"
-
-#: admin/systems/password.tpl.c:2
-msgid ""
-"To change the terminal root password use the fields below. The changes take "
-"effect during the next reboot. Please memorize the new password, because you"
-" wouldn't be able to log in."
-msgstr "Pour changer le mot de passe root du terminal, utilisez le champ ci-dessous. Les changements prennent effet immÃ©diatement. Veuillez mÃ©moriser le nouveau mot de passe sinon vous ne pourrez pas vous identifier sans celui-ci."
-
-#: admin/systems/password.tpl.c:5
-msgid "Leave fields blank for password inheritance from default entries."
-msgstr "Laissez le champ vide pour le mot de passe afin de l'obtenir depuis l'entrÃ©e par dÃ©faut."
-
-#: admin/systems/password.tpl.c:8
-msgid "Changing the password impinges on authentification only."
-msgstr "Changer le mot de passe influe seulement sur l'authentification."
-
-#: admin/systems/password.tpl.c:11
-msgid "New password"
-msgstr "Nouveau mot de passe"
-
-#: admin/systems/password.tpl.c:14
-msgid "Repeat new password"
-msgstr "Confirmation du nouveau mot de passe"
-
-#: admin/systems/password.tpl.c:17
-msgid "Password strength"
-msgstr "SÃ©curitÃ© du mot de passe"
-
-#: admin/systems/password.tpl.c:20
-msgid "Set password"
-msgstr "Changer le mot de passe"
-
-#: 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, ils seront gÃ©rÃ©s par lui, donc si vous supprimez ou dÃ©sactivez leur onglet OPSI, ils seront retirÃ©s de OPSI."
-
-#: admin/systems/gencd.tpl.c:2
-msgid "CD-Install-Image generation"
-msgstr "GÃ©nÃ©ration d'une image d'installation"
-
-#: admin/systems/gencd.tpl.c:5
-msgid ""
-"This option enables you to generate FAI install CD images for the selected "
-"workstation. The procedure may take about 10 minutes to complete, so please "
-"be patient after pressing the 'Create ISO-Image' button."
-msgstr "Cette option permet de crÃ©er des images d'installation FAI pour le poste de travail sÃ©lectionnÃ©. La procÃ©dure peut mettre 10 minutes pour se terminer, veuillez Ãªtre patient aprÃ¨s avoir cliquer sur  'CrÃ©er une image ISO'."
-
-#: admin/systems/gencd.tpl.c:8
-msgid "Create ISO-Image"
-msgstr "CrÃ©er une image iso"
-
-#: admin/systems/remove.tpl.c:5
-msgid ""
-"This includes all account data, system access rules, imap settings, etc. for"
-" this user. Please double check if your really want to do this since there "
-"is no way for FusionDirectory to get your data back."
-msgstr "Cela inclut toutes les donnÃ©es des comptes, les droits d'accÃ¨s, la configuration imap, etc. pour cet utilisateur. Veuillez vous assurer que vous voulez effectuez cette opÃ©ration Ã©tant donnÃ© qu'il sera impossible pour FusionDirectory de rÃ©cupÃ©rer vos donnÃ©es."
-
-#: admin/systems/remove.tpl.c:8
-msgid "So - if you're sure - press 'Delete' to continue or 'Cancel' to abort."
-msgstr "Donc - si vous Ãªtes sÃ»r - cliquez sur 'Supprimer' pour continuer ou sur 'Annuler' pour abandonner."
-
-#: admin/systems/system-filter.tpl.c:2
-#: admin/systems/phoneSelect/phoneSelect-filter.tpl.c:2
-msgid "Filter"
-msgstr "Filtre"
-
-#: admin/systems/system-filter.tpl.c:5
-msgid "Show servers"
-msgstr "Afficher les serveurs"
-
-#: admin/systems/system-filter.tpl.c:8
-msgid "Show workstations"
-msgstr "Afficher les stations de travail"
-
-#: admin/systems/system-filter.tpl.c:11
-msgid "Show terminals"
-msgstr "Afficher les terminaux"
-
-#: admin/systems/system-filter.tpl.c:14
-msgid "Show network printer"
-msgstr "Imprimantes rÃ©seaux"
-
-#: admin/systems/system-filter.tpl.c:17
-#: admin/systems/phoneSelect/phoneSelect-filter.tpl.c:5
-msgid "Show phones"
-msgstr "TÃ©lÃ©phones"
-
-#: admin/systems/system-filter.tpl.c:20
-msgid "Show windows based workstations"
-msgstr "PC Windows"
-
-#: admin/systems/system-filter.tpl.c:23
-msgid "Show network devices"
-msgstr "PÃ©riphÃ©riques rÃ©seau"
-
-#: admin/systems/system-filter.tpl.c:26
-#: admin/systems/phoneSelect/phoneSelect-filter.tpl.c:8
-msgid "Show mobile phones"
-msgstr "Montrer les tÃ©lÃ©phones mobiles"
-
-#: admin/systems/system-filter.tpl.c:29
-msgid "Show IPMI interfaces"
-msgstr "Montrer les interfaces IPMI"
-
-#: admin/systems/ppd/printerPPDSelectionDialog.tpl.c:2
-msgid "Select objects to add"
-msgstr "SÃ©lectionnez les objets Ã  ajouter"
-
-#: admin/systems/ppd/printerPPDSelectionDialog.tpl.c:5
-msgid "Filters"
-msgstr "Filtres"
-
-#: admin/systems/ppd/printerPPDSelectionDialog.tpl.c:8
-msgid "Display objects matching"
-msgstr "Afficher les objets correspondants"
-
-#: admin/systems/ppd/printerPPDSelectionDialog.tpl.c:11
-msgid "Regular expression for matching object names"
-msgstr "Expression rÃ©guliÃ¨re pour trouver les objets correspondants"
-
-#: admin/systems/ppd/printerPPDSelectionDialog.tpl.c:14
-msgid "Close"
-msgstr "Fermer"
-
-#: admin/systems/ppd/printerPPDDialog.tpl.c:2
-msgid "Printer driver"
-msgstr "Pilote d'imprimante"
-
-#: admin/systems/ppd/printerPPDDialog.tpl.c:5
-msgid "Model"
-msgstr "ModÃ¨le"
-
-#: admin/systems/ppd/printerPPDDialog.tpl.c:8
-msgid "Select"
-msgstr "SÃ©lectionner"
-
-#: admin/systems/ppd/printerPPDDialog.tpl.c:11
-msgid "New driver"
-msgstr "Nouveau pilote"
-
-#: admin/systems/ppd/printerPPDDialog.tpl.c:14
-msgid "Upload"
-msgstr "TÃ©lÃ©verser"
-
-#: admin/systems/ppd/printerPPDDialog.tpl.c:17
-msgid "Options"
-msgstr "Options"
-
-#: admin/systems/ppd/remove_ppd.tpl.c:5
-msgid "The ppd file will be removed from the server and can not be restored."
-msgstr "Le fichier ppd sera effacÃ© du serveur et ne pourra pas Ãªtre rÃ©cupÃ©rÃ©."
-
-#: admin/systems/printer.tpl.c:2
-msgid "General"
-msgstr "GÃ©nÃ©ral"
-
-#: admin/systems/printer.tpl.c:5
-msgid "Printer name"
-msgstr "Nom de l'imprimante"
-
-#: admin/systems/printer.tpl.c:14
-msgid "Details"
-msgstr "DÃ©tails"
-
-#: admin/systems/printer.tpl.c:20
-msgid "Printer location"
-msgstr "Localisation de l'imprimante"
-
-#: admin/systems/printer.tpl.c:26
-msgid "PPD Provider"
-msgstr "Fournisseur de PPD"
-
-#: admin/systems/printer.tpl.c:29
-msgid "Driver"
-msgstr "Pilote"
-
-#: admin/systems/printer.tpl.c:32
-msgid "Edit"
-msgstr "Ã‰diter"
-
-#: admin/systems/printer.tpl.c:41
-msgid "Users which are allowed to use this printer"
-msgstr "Utilisateurs qui sont autorisÃ©s Ã  utiliser cette imprimante"
-
-#: admin/systems/printer.tpl.c:44
-msgid "Users"
-msgstr "Utilisateurs"
-
-#: admin/systems/printer.tpl.c:47
-msgid "Users which are allowed to administrate this printer"
-msgstr "Utilisateur qui sont autorisÃ©s Ã  administrer cette imprimante"
-
-#: admin/systems/printer.tpl.c:50
-msgid "Admins"
-msgstr "Administrateurs"
-
-#: admin/systems/printer.tpl.c:53
-msgid "Windows paths"
-msgstr "RÃ©pertoires Windows"
-
-#: admin/systems/printer.tpl.c:56
-msgid "Printer windows inf file"
-msgstr "Fichier INF Windows"
-
-#: admin/systems/printer.tpl.c:59
-msgid "Printer driver directory"
-msgstr "RÃ©pertoire du pilote d'imprimante"
-
-#: admin/systems/gencd_frame.tpl.c:2
-msgid "Your browser does not supprt iframes."
-msgstr "Votre navigateur ne supporte pas les iframes."
-
-#: admin/systems/services/cups/serviceCUPS.tpl.c:2
-msgid "Print Service"
-msgstr "Services d'impression"
-
-#: admin/systems/services/cups/serviceCUPS.tpl.c:5
-msgid "enabled"
-msgstr "activÃ©"
-
-#: admin/systems/services/ServiceAddDialog.tpl.c:2
-msgid "Adding a new service to the current server"
-msgstr "Ajouter un nouveau service au serveur sÃ©lectionnÃ©"
-
-#: admin/systems/services/ServiceAddDialog.tpl.c:5
-msgid ""
-"This dialog allows you to add new services to the currenty edited server "
-"object. The box below shows all available but not already used services."
-msgstr "Cette boite de dialogue vous permet d'ajouter des nouveaux services au serveur que vous Ã©ditez actuellement. Le cadre si dessous vous montre tout les services disponibles mais pas encore utilisÃ©s."
-
-#: admin/systems/services/ServiceAddDialog.tpl.c:8
-msgid "Service to add"
-msgstr "Service Ã  ajouter"
-
-#: admin/systems/services/ServiceAddDialog.tpl.c:11
-msgid "All available services are already in use."
-msgstr "Tout les services disponibles sont dÃ©jÃ  utilisÃ©s."
-
-#: admin/systems/services/ServiceAddDialog.tpl.c:14
-#: admin/systems/SelectDeviceType.tpl.c:26
-msgid "Continue"
-msgstr "Continuer"
-
-#: admin/systems/SelectDeviceType.tpl.c:2
-msgid ""
-"This system has no system type configured. Please choose a system type for "
-"this object and an optional inheritance group. Press the 'continue' button "
-"to proceed."
-msgstr "Ce systÃ¨me n'a pas de type de systÃ¨me configurÃ©. S'il vous plaÃ®t choisissez un type de systÃ¨me pourcet objet et un hÃ©ritage de groupe facultatif. Appuyez sur le bouton 'Continuer' pour continuer."
-
-#: admin/systems/SelectDeviceType.tpl.c:5
-msgid ""
-"Please select a system type and an optional bundle of predefined settings to"
-" be inherited."
-msgstr "Veuillez sÃ©lectionner un type de systÃ¨me et Ã©ventuellement d'un ensemble de paramÃ¨tres Ã  hÃ©riter."
-
-#: admin/systems/SelectDeviceType.tpl.c:8
-msgid ""
-"Please select a system type and a bundle of predefined settings to be "
-"inherited."
-msgstr "Veuillez sÃ©lectionner un type de systÃ¨me et d'un ensemble de paramÃ¨tres Ã  hÃ©riter."
-
-#: admin/systems/SelectDeviceType.tpl.c:11
-#: admin/systems/SelectDeviceType.tpl.c:14
-msgid "System type"
-msgstr "Type de systÃ¨me"
-
-#: admin/systems/SelectDeviceType.tpl.c:17
-msgid "Choose an object group as template"
-msgstr "Choisissez un groupe d'objets comme modÃ¨les"
-
-#: admin/systems/SelectDeviceType.tpl.c:20
-msgid "Object group"
-msgstr "Groupe d'objet"
-
-#: admin/systems/SelectDeviceType.tpl.c:23
-msgid "none"
-msgstr "aucun"
-
-#: 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 configure pour exÃ©cuter un client Argonaut"
-msgstr[1] "%1 systÃ¨mes sont configurÃ©s pour exÃ©cuter un client Argonaut."
-
-#: addons/dashboard/systems_stats.tpl.c:11
-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 configure pour exÃ©cuter un client Argonaut, mais il n'y a aucun serveur Argonaut de configure"
-msgstr[1] "%1 systÃ¨me est configurÃ© pour exÃ©cuter un client Argonaut, mais il nâ€™y a pas de serveur Argonaut configurÃ©â€¯!"
diff --git a/systems/locale/id/fusiondirectory.po b/systems/locale/id/fusiondirectory.po
index 3b39ac1a0440c76ce1ada4565e83167d4d75d7ba..f92bd6133f6f0fbb6ebe7de9928cb138179a607a 100644
--- a/systems/locale/id/fusiondirectory.po
+++ b/systems/locale/id/fusiondirectory.po
@@ -5,12 +5,12 @@
 # Translators:
 msgid ""
 msgstr ""
-"Project-Id-Version: FusionDirectory-108\n"
+"Project-Id-Version: FusionDirectory-109\n"
 "Report-Msgid-Bugs-To: documentation@lists.fusiondirectory.org\n"
-"POT-Creation-Date: 2015-03-31 11:49+0200\n"
-"PO-Revision-Date: 2015-03-31 11:24+0000\n"
+"POT-Creation-Date: 2014-12-15 17:47+0100\n"
+"PO-Revision-Date: 2014-12-15 17:06+0000\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>\n"
-"Language-Team: Indonesian (http://www.transifex.com/projects/p/FusionDirectory-108/language/id/)\n"
+"Language-Team: Indonesian (http://www.transifex.com/projects/p/FusionDirectory-109/language/id/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -26,29 +26,24 @@ msgid "Locked"
 msgstr ""
 
 #: admin/ogroups/goto/class_termgroup.inc:118
-#: admin/systems/class_terminalGeneric.inc:121
+#: admin/systems/class_terminalStartup.inc:145
 msgid "Local swap"
 msgstr ""
 
 #: admin/ogroups/goto/class_termgroup.inc:124
 #: admin/ogroups/goto/class_termgroup.inc:136
-#: admin/systems/class_workstationGeneric.inc:352
-#: admin/systems/class_terminalGeneric.inc:109
-#: admin/systems/class_terminalGeneric.inc:125
+#: admin/systems/class_terminalStartup.inc:133
+#: admin/systems/class_terminalStartup.inc:149
 msgid "inherited"
 msgstr ""
 
 #: admin/ogroups/goto/class_termgroup.inc:220
-#: admin/systems/class_workstationGeneric.inc:72
-#: admin/systems/class_workstationGeneric.inc:443
-#: admin/systems/class_systemManagement.inc:295
-#: admin/systems/class_systemManagement.inc:325
-msgid "Infrastructure service"
+#: admin/systems/class_systemManagement.inc:165
+#: admin/systems/class_systemManagement.inc:186
+msgid "Service infrastructure"
 msgstr ""
 
 #: admin/ogroups/goto/class_termgroup.inc:224
-#: admin/systems/class_workstationGeneric.inc:75
-#: admin/systems/class_workstationGeneric.inc:78
 msgid "Event error"
 msgstr ""
 
@@ -58,12 +53,10 @@ msgid "Event '%s' is not available!"
 msgstr ""
 
 #: admin/ogroups/goto/class_termgroup.inc:274
-#: admin/systems/class_workstationGeneric.inc:112
 msgid "Switch off"
 msgstr ""
 
 #: admin/ogroups/goto/class_termgroup.inc:274
-#: admin/systems/class_workstationGeneric.inc:113
 msgid "Reboot"
 msgstr ""
 
@@ -84,7 +77,6 @@ msgid "Reinstall"
 msgstr ""
 
 #: admin/ogroups/goto/class_termgroup.inc:279
-#: admin/systems/class_workstationGeneric.inc:108
 msgid "Memory test"
 msgstr ""
 
@@ -93,21 +85,18 @@ msgid "System analysis"
 msgstr ""
 
 #: admin/ogroups/goto/class_termgroup.inc:386
-#: admin/systems/class_printGeneric.inc:670
-#: admin/systems/class_printGeneric.inc:970
-#: admin/systems/class_systemManagement.inc:816
 #: admin/systems/services/class_goService.inc:123
 #: admin/systems/services/class_goService.inc:151
 #: admin/systems/services/class_goService.inc:187
-#: admin/systems/class_networkSettings.inc:478
-#: admin/systems/class_networkSettings.inc:491
-#: admin/systems/class_networkSettings.inc:757
-#: admin/systems/class_networkSettings.inc:816
-#: admin/systems/class_networkSettings.inc:835
-#: admin/systems/class_networkSettings.inc:852
-#: admin/systems/class_networkSettings.inc:861
-#: admin/systems/class_networkSettings.inc:879
-#: admin/systems/class_networkSettings.inc:951
+#: admin/systems/class_networkSettings.inc:470
+#: admin/systems/class_networkSettings.inc:483
+#: admin/systems/class_networkSettings.inc:749
+#: admin/systems/class_networkSettings.inc:808
+#: admin/systems/class_networkSettings.inc:827
+#: admin/systems/class_networkSettings.inc:844
+#: admin/systems/class_networkSettings.inc:853
+#: admin/systems/class_networkSettings.inc:871
+#: admin/systems/class_networkSettings.inc:943
 msgid "LDAP error"
 msgstr ""
 
@@ -119,195 +108,125 @@ msgstr ""
 msgid "System group"
 msgstr ""
 
-#: admin/ogroups/goto/class_termgroup.inc:401
-#: admin/ogroups/goto/termgroup.tpl.c:17
+#: admin/ogroups/goto/class_termgroup.inc:402
 msgid "Mode"
 msgstr ""
 
-#: admin/ogroups/goto/class_termgroup.inc:402
-#: admin/systems/class_workstationGeneric.inc:189
-#: admin/ogroups/goto/termgroup.tpl.c:23
+#: admin/ogroups/goto/class_termgroup.inc:403
+#: admin/systems/class_systemServers.inc:35
 msgid "Syslog server"
 msgstr ""
 
-#: admin/ogroups/goto/class_termgroup.inc:403
+#: admin/ogroups/goto/class_termgroup.inc:404
 msgid "Action flag"
 msgstr ""
 
-#: admin/ogroups/goto/class_termgroup.inc:404
+#: admin/ogroups/goto/class_termgroup.inc:405
 msgid "Ntp server"
 msgstr ""
 
-#: admin/ogroups/goto/class_termgroup.inc:405
-#: admin/systems/class_terminalGeneric.inc:41
-#: admin/ogroups/goto/termgroup.tpl.c:29
+#: admin/ogroups/goto/class_termgroup.inc:406
+#: admin/systems/class_terminalStartup.inc:65
 msgid "Root server"
 msgstr ""
 
-#: admin/ogroups/goto/class_termgroup.inc:406
-#: admin/systems/class_terminalGeneric.inc:47
-#: admin/ogroups/goto/termgroup.tpl.c:35
+#: admin/ogroups/goto/class_termgroup.inc:407
+#: admin/systems/class_terminalStartup.inc:69
 msgid "Swap server"
 msgstr ""
 
-#: admin/systems/class_terminalStartup.inc:63
+#: admin/systems/class_terminalStartup.inc:62
 msgid "Startup parameters"
 msgstr ""
 
-#: admin/systems/class_terminalStartup.inc:66
+#: admin/systems/class_terminalStartup.inc:65
+msgid "The root server the terminal should be using"
+msgstr ""
+
+#: admin/systems/class_terminalStartup.inc:69
+msgid "The swap server the terminal should be using"
+msgstr ""
+
+#: admin/systems/class_terminalStartup.inc:73
 msgid "Boot kernel"
 msgstr ""
 
-#: admin/systems/class_terminalStartup.inc:66
+#: admin/systems/class_terminalStartup.inc:73
 msgid "Linux kernel to be installed and booted"
 msgstr ""
 
-#: admin/systems/class_terminalStartup.inc:70
+#: admin/systems/class_terminalStartup.inc:77
 msgid "Boot kernel parameters"
 msgstr ""
 
-#: admin/systems/class_terminalStartup.inc:70
+#: admin/systems/class_terminalStartup.inc:77
 msgid "Linux kernel parameters to be ran"
 msgstr ""
 
-#: admin/systems/class_terminalStartup.inc:82
-msgid "Startup"
-msgstr ""
-
 #: admin/systems/class_terminalStartup.inc:83
-msgid "Terminal startup"
-msgstr ""
-
-#: admin/systems/system-list.xml:10
-msgid "List of systems"
-msgstr ""
-
-#: admin/systems/system-list.xml:14
-msgid "New workstation"
-msgstr ""
-
-#: admin/systems/system-list.xml:22
-msgid "Locked server"
-msgstr ""
-
-#: admin/systems/system-list.xml:30
-msgid "Locked workstation"
-msgstr ""
-
-#: admin/systems/system-list.xml:38
-msgid "Locked terminal"
-msgstr ""
-
-#: admin/systems/system-list.xml:47
-msgid "New terminal"
-msgstr ""
-
-#: admin/systems/system-list.xml:55
-msgid "New device"
-msgstr ""
-
-#: admin/systems/system-list.xml:63
-msgid "Workstation template"
-msgstr ""
-
-#: admin/systems/system-list.xml:71
-msgid "Terminal template"
-msgstr ""
-
-#: admin/systems/system-list.xml:79
-msgid "Winstation"
+msgid "Remote desktop"
 msgstr ""
 
-#: admin/systems/system-list.xml:87 admin/systems/system-list.xml:234
-#: admin/systems/class_systemImport.inc:169
-#: admin/systems/class_serverGeneric.inc:46
-#: admin/systems/class_serverGeneric.inc:51
-#: admin/systems/class_serverGeneric.inc:52
-#: admin/systems/class_SelectDeviceType.inc:58
-msgid "Server"
+#: admin/systems/class_terminalStartup.inc:87
+msgid "Connect method"
 msgstr ""
 
-#: admin/systems/system-list.xml:95 admin/systems/system-list.xml:242
-#: admin/systems/class_workstationGeneric.inc:458
-#: admin/systems/class_workstationGeneric.inc:463
-#: admin/systems/class_workstationGeneric.inc:464
-#: admin/systems/class_SelectDeviceType.inc:58
-msgid "Workstation"
+#: admin/systems/class_terminalStartup.inc:91
+msgid "XDMCP"
 msgstr ""
 
-#: admin/systems/system-list.xml:103 admin/systems/system-list.xml:250
-#: admin/systems/class_terminalGeneric.inc:81
-#: admin/systems/class_terminalGeneric.inc:86
-#: admin/systems/class_terminalGeneric.inc:87
-#: admin/systems/class_SelectDeviceType.inc:58
-msgid "Terminal"
+#: admin/systems/class_terminalStartup.inc:91
+msgid "LDM"
 msgstr ""
 
-#: admin/systems/system-list.xml:111 admin/systems/class_printGeneric.inc:1005
-#: admin/systems/class_printGeneric.inc:1011
-#: admin/systems/class_printGeneric.inc:1012
-msgid "Printer"
+#: admin/systems/class_terminalStartup.inc:91
+msgid "Shell"
 msgstr ""
 
-#: admin/systems/system-list.xml:119 admin/systems/system-list.xml:274
-#: admin/systems/class_mobilePhoneGeneric.inc:74
-#: admin/systems/phoneSelect/phoneSelect-list.xml:14
-msgid "Phone"
+#: admin/systems/class_terminalStartup.inc:91
+msgid "Telnet"
 msgstr ""
 
-#: admin/systems/system-list.xml:127
-#: admin/systems/class_mobilePhoneGeneric.inc:36
-#: admin/systems/class_mobilePhoneGeneric.inc:41
-#: admin/systems/class_mobilePhoneGeneric.inc:42
-#: admin/systems/phoneSelect/phoneSelect-list.xml:22
-msgid "Mobile phone"
+#: admin/systems/class_terminalStartup.inc:91
+msgid "Windows RDP"
 msgstr ""
 
-#: admin/systems/system-list.xml:135
-#: admin/systems/class_componentGeneric.inc:36
-msgid "Component"
+#: admin/systems/class_terminalStartup.inc:95
+msgid "Terminal server"
 msgstr ""
 
-#: admin/systems/system-list.xml:143 admin/systems/system-list.xml:298
-msgid "IPMI"
+#: admin/systems/system-list.xml:10
+msgid "List of systems"
 msgstr ""
 
-#: admin/systems/system-list.xml:169
-#: admin/systems/class_workstationGeneric.inc:154
-#: admin/systems/class_printGeneric.inc:752
-#: admin/systems/class_printGeneric.inc:762
-#: admin/systems/class_printGeneric.inc:781
-#: admin/systems/class_printGeneric.inc:1022
-#: admin/systems/class_componentGeneric.inc:64
-#: admin/systems/class_mobilePhoneGeneric.inc:63
-#: admin/systems/phoneSelect/phoneSelect-list.xml:48
+#: admin/systems/system-list.xml:31
+#: admin/systems/class_workstationGeneric.inc:46
+#: admin/systems/class_printGeneric.inc:60
+#: admin/systems/class_componentGeneric.inc:58
+#: admin/systems/class_mobilePhoneGeneric.inc:60
 #: admin/systems/services/shares/class_serviceShare.inc:52
-#: admin/systems/system-filter.tpl.c:32
-#: admin/systems/phoneSelect/phoneSelect-filter.tpl.c:11
 msgid "Name"
 msgstr ""
 
-#: admin/systems/system-list.xml:177
-#: admin/systems/phoneSelect/phoneSelect-list.xml:63
+#: admin/systems/system-list.xml:39
 msgid "IP"
 msgstr ""
 
-#: admin/systems/system-list.xml:185
+#: admin/systems/system-list.xml:47
 msgid "MAC"
 msgstr ""
 
-#: admin/systems/system-list.xml:193
-#: admin/systems/class_workstationGeneric.inc:160
-#: admin/systems/class_printGeneric.inc:1024
-#: admin/systems/class_componentGeneric.inc:68
-#: admin/systems/class_mobilePhoneGeneric.inc:67
+#: admin/systems/system-list.xml:55
+#: admin/systems/class_workstationGeneric.inc:51
+#: admin/systems/class_printGeneric.inc:64
+#: admin/systems/class_componentGeneric.inc:62
+#: admin/systems/class_mobilePhoneGeneric.inc:64
 #: admin/systems/serverService-list.xml:35
 #: admin/systems/services/shares/class_serviceShare.inc:56
-#: admin/systems/printer.tpl.c:8 admin/systems/printer.tpl.c:17
 msgid "Description"
 msgstr ""
 
-#: admin/systems/system-list.xml:201 admin/systems/class_serverService.inc:57
+#: admin/systems/system-list.xml:63 admin/systems/class_serverService.inc:57
 #: admin/systems/services/terminal/class_serviceTerminal.inc:30
 #: admin/systems/services/cups/class_serviceCUPS.inc:85
 #: admin/systems/services/shares/class_serviceShare.inc:31
@@ -316,378 +235,186 @@ msgstr ""
 msgid "Services"
 msgstr ""
 
-#: admin/systems/system-list.xml:209
+#: admin/systems/system-list.xml:71
 msgid "Release"
 msgstr ""
 
-#: admin/systems/system-list.xml:217 admin/systems/serverService-list.xml:43
-#: admin/systems/phoneSelect/phoneSelect-list.xml:70
+#: admin/systems/system-list.xml:79 admin/systems/serverService-list.xml:43
 msgid "Actions"
 msgstr ""
 
-#: admin/systems/system-list.xml:228 admin/systems/serverService-list.xml:54
+#: admin/systems/system-list.xml:90 admin/systems/serverService-list.xml:54
 msgid "Create"
 msgstr ""
 
-#: admin/systems/system-list.xml:258
-msgid "winStation"
-msgstr ""
-
-#: admin/systems/system-list.xml:266
-msgid "Network printer"
-msgstr ""
-
-#: admin/systems/system-list.xml:282
-#: admin/systems/class_componentGeneric.inc:41
-#: admin/systems/class_componentGeneric.inc:42
-msgid "Network device"
-msgstr ""
-
-#: admin/systems/system-list.xml:290
-msgid "Mobile Phone"
-msgstr ""
-
-#: admin/systems/system-list.xml:310
+#: admin/systems/system-list.xml:100
 msgid "Trigger action"
 msgstr ""
 
-#: admin/systems/system-list.xml:317
+#: admin/systems/system-list.xml:107
 msgid "Schedule action"
 msgstr ""
 
-#: admin/systems/system-list.xml:330
-msgid "Activate systems"
-msgstr ""
-
-#: admin/systems/system-list.xml:337 admin/systems/serverService-list.xml:69
-#: admin/systems/printer.tpl.c:35
+#: admin/systems/system-list.xml:119 admin/systems/serverService-list.xml:69
 msgid "Remove"
 msgstr ""
 
-#: admin/systems/system-list.xml:367
-msgid "Create ISO"
-msgstr ""
-
-#: admin/systems/system-list.xml:379
+#: admin/systems/system-list.xml:150
 msgid "Edit system"
 msgstr ""
 
-#: admin/systems/system-list.xml:392
+#: admin/systems/system-list.xml:163
 msgid "Remove system"
 msgstr ""
 
-#: admin/systems/class_workstationGeneric.inc:75
-#, php-format
-msgid "Event %s is not available!"
-msgstr ""
-
-#: admin/systems/class_workstationGeneric.inc:78
-msgid "Events are not available!"
-msgstr ""
-
-#: admin/systems/class_workstationGeneric.inc:106
-msgid "(Re)Install"
-msgstr ""
-
-#: admin/systems/class_workstationGeneric.inc:107
-msgid "Software update"
-msgstr ""
-
-#: admin/systems/class_workstationGeneric.inc:115
-msgid "Wake up"
-msgstr ""
-
-#: admin/systems/class_workstationGeneric.inc:144
-#: admin/systems/class_printGeneric.inc:604
+#: admin/systems/class_workstationGeneric.inc:35
 msgid "workstation"
 msgstr ""
 
-#: admin/systems/class_workstationGeneric.inc:151
-#: admin/systems/class_componentGeneric.inc:61
-#: admin/systems/class_mobilePhoneGeneric.inc:60
+#: admin/systems/class_workstationGeneric.inc:42
+#: admin/systems/class_printGeneric.inc:56
+#: admin/systems/class_componentGeneric.inc:55
+#: admin/systems/class_mobilePhoneGeneric.inc:56
 msgid "Properties"
 msgstr ""
 
-#: admin/systems/class_workstationGeneric.inc:155
+#: admin/systems/class_workstationGeneric.inc:47
 #, php-format
 msgid "The name of the %s"
 msgstr ""
 
-#: admin/systems/class_workstationGeneric.inc:161
+#: admin/systems/class_workstationGeneric.inc:52
 #, php-format
 msgid "A short description of the %s"
 msgstr ""
 
-#: admin/systems/class_workstationGeneric.inc:166
-#: admin/systems/class_printGeneric.inc:1025
+#: admin/systems/class_workstationGeneric.inc:56
 msgid "Location"
 msgstr ""
 
-#: admin/systems/class_workstationGeneric.inc:167
+#: admin/systems/class_workstationGeneric.inc:57
 #, php-format
 msgid "The location of the %s"
 msgstr ""
 
-#: admin/systems/class_workstationGeneric.inc:173
+#: admin/systems/class_workstationGeneric.inc:61
 #, php-format
 msgid "Lock this %s"
 msgstr ""
 
-#: admin/systems/class_workstationGeneric.inc:174
+#: admin/systems/class_workstationGeneric.inc:62
 #, php-format
 msgid "This will prevent the %s from being reinstalled"
 msgstr ""
 
-#: admin/systems/class_workstationGeneric.inc:185
-#: addons/dashboard/class_dashBoardSystems.inc:48
-msgid "Servers"
-msgstr ""
-
-#: admin/systems/class_workstationGeneric.inc:190
-#, php-format
-msgid "The syslog server the %s should be using"
-msgstr ""
-
-#: admin/systems/class_workstationGeneric.inc:195
-msgid "Inherit NTP servers"
-msgstr ""
-
-#: admin/systems/class_workstationGeneric.inc:196
-msgid "Inherit time server attributes from ogroup"
-msgstr ""
-
-#: admin/systems/class_workstationGeneric.inc:202
-msgid "NTP servers"
-msgstr ""
-
-#: admin/systems/class_workstationGeneric.inc:203
-#, php-format
-msgid "The NTP servers for the %s"
+#: admin/systems/class_workstationGeneric.inc:73
+#: admin/systems/class_printGeneric.inc:83
+#: admin/systems/class_componentGeneric.inc:69
+#: admin/systems/class_mobilePhoneGeneric.inc:102
+#: admin/systems/class_networkSettings.inc:1008
+msgid "Network settings"
 msgstr ""
 
-#: admin/systems/class_workstationGeneric.inc:209
-msgid "Inherit LDAP servers"
+#: admin/systems/class_workstationGeneric.inc:78
+#: admin/systems/class_printGeneric.inc:87
+#: admin/systems/class_componentGeneric.inc:73
+#: admin/systems/class_mobilePhoneGeneric.inc:106
+#: admin/systems/class_networkSettings.inc:630
+#: admin/systems/class_networkSettings.inc:643
+#: admin/systems/class_networkSettings.inc:645
+#: admin/systems/class_networkSettings.inc:1014
+msgid "IP address"
 msgstr ""
 
-#: admin/systems/class_workstationGeneric.inc:210
-msgid "Inherit LDAP server attributes from ogroup"
+#: admin/systems/class_workstationGeneric.inc:78
+msgid "IP addresses this system uses (v4 or v6)"
 msgstr ""
 
-#: admin/systems/class_workstationGeneric.inc:216
-msgid "LDAP servers"
+#: admin/systems/class_workstationGeneric.inc:83
+#: admin/systems/class_printGeneric.inc:91
+#: admin/systems/class_componentGeneric.inc:77
+#: admin/systems/class_mobilePhoneGeneric.inc:110
+msgid "Mac address"
 msgstr ""
 
-#: admin/systems/class_workstationGeneric.inc:217
-#, php-format
-msgid "The LDAP servers for the %s"
+#: admin/systems/class_workstationGeneric.inc:83
+#: admin/systems/class_printGeneric.inc:91
+#: admin/systems/class_componentGeneric.inc:77
+#: admin/systems/class_mobilePhoneGeneric.inc:110
+msgid "Mac address of this system"
 msgstr ""
 
-#: admin/systems/class_workstationGeneric.inc:225
-#: admin/systems/class_workstationGeneric.inc:229
-#: admin/ogroups/goto/termgroup.tpl.c:41
-msgid "Action"
+#: admin/systems/class_workstationGeneric.inc:125
+#: admin/systems/class_workstationGeneric.inc:130
+#: admin/systems/class_workstationGeneric.inc:131
+msgid "Workstation"
 msgstr ""
 
-#: admin/systems/class_workstationGeneric.inc:230
-#: admin/ogroups/goto/termgroup.tpl.c:44
-msgid "Select action to execute for this terminal"
+#: admin/systems/class_workstationGeneric.inc:126
+msgid "Workstation information"
 msgstr ""
 
-#: admin/systems/class_workstationGeneric.inc:236
-#: admin/systems/class_componentGeneric.inc:75
-#: admin/systems/class_mobilePhoneGeneric.inc:106
-#: admin/systems/class_networkSettings.inc:1016
-msgid "Network settings"
+#: admin/systems/class_printGeneric.inc:32
+#: admin/systems/class_printGeneric.inc:37
+#: admin/systems/class_printGeneric.inc:38
+msgid "Printer"
 msgstr ""
 
-#: admin/systems/class_workstationGeneric.inc:459
-msgid "Workstation information"
+#: admin/systems/class_printGeneric.inc:33
+msgid "Printer information"
 msgstr ""
 
-#: admin/systems/class_printGeneric.inc:131
-#: admin/systems/class_printGeneric.inc:1065
-#: admin/systems/class_systemManagement.inc:678
-msgid "Internal error"
+#: admin/systems/class_printGeneric.inc:60
+msgid "The name of the printer"
 msgstr ""
 
-#: admin/systems/class_printGeneric.inc:131
-#, php-format
-msgid ""
-"Cannot determine a valid department for this object. Setting base to '%s'!"
+#: admin/systems/class_printGeneric.inc:64
+msgid "A short description of the printer"
 msgstr ""
 
-#: admin/systems/class_printGeneric.inc:311
-#: admin/systems/class_printGeneric.inc:319
-#: admin/systems/class_printGeneric.inc:324
-#: admin/systems/class_printGeneric.inc:374
-#: admin/systems/class_printGeneric.inc:390
-#: admin/systems/class_printGeneric.inc:393
-msgid "Add printer extension"
+#: admin/systems/class_printGeneric.inc:70
+msgid "Details"
 msgstr ""
 
-#: admin/systems/class_printGeneric.inc:312
-msgid ""
-"Could not initialize printer tab, parameter parent was missing while "
-"construction."
+#: admin/systems/class_printGeneric.inc:73
+msgid "Printer location"
 msgstr ""
 
-#: admin/systems/class_printGeneric.inc:320
-msgid "This is a workstation template, printer tab is disabled."
+#: admin/systems/class_printGeneric.inc:73
+msgid "The location of the printer"
 msgstr ""
 
-#: admin/systems/class_printGeneric.inc:325
-msgid "This is a terminal template, printer tab is disabled."
+#: admin/systems/class_printGeneric.inc:77
+msgid "Printer URL"
 msgstr ""
 
-#: admin/systems/class_printGeneric.inc:367
-#: admin/systems/class_printGeneric.inc:375
-#: admin/systems/class_printGeneric.inc:383
-#: admin/systems/class_printGeneric.inc:386
-#: admin/systems/class_printGeneric.inc:391
-#: admin/systems/class_printGeneric.inc:394
-msgid "printer"
+#: admin/systems/class_printGeneric.inc:77
+msgid "The URL of the printer"
 msgstr ""
 
-#: admin/systems/class_printGeneric.inc:375
-msgid ""
-"You can't enable it while 'cn' is not present in entry. Possibly you are "
-"currently creating a new terminal template."
+#: admin/systems/class_printGeneric.inc:87
+#: admin/systems/class_componentGeneric.inc:73
+#: admin/systems/class_mobilePhoneGeneric.inc:106
+msgid "IP address this system uses"
 msgstr ""
 
-#: admin/systems/class_printGeneric.inc:382
-#: admin/systems/class_printGeneric.inc:385
-msgid "Remove printer extension"
+#: admin/systems/class_serverService.inc:58
+msgid "Server services"
 msgstr ""
 
-#: admin/systems/class_printGeneric.inc:474
-#: admin/systems/class_printGeneric.inc:652
-#: admin/systems/class_printGeneric.inc:659
-#: admin/systems/class_printGeneric.inc:718
-#: admin/systems/class_printGeneric.inc:1105
-#: admin/systems/class_printGeneric.inc:1116
 #: admin/systems/class_serverService.inc:224
 #: admin/systems/class_serverService.inc:270
 #: admin/systems/class_serverService.inc:393
-#: admin/systems/class_systemManagement.inc:341
-#: admin/systems/class_systemManagement.inc:624
-#: admin/systems/class_systemManagement.inc:639
 #: admin/systems/services/shares/class_serviceShare.inc:103
-#: admin/systems/class_networkSettings.inc:305
-#: admin/systems/class_networkSettings.inc:336
-#: admin/systems/class_networkSettings.inc:584
-#: admin/systems/class_networkSettings.inc:591
-#: admin/systems/class_networkSettings.inc:597
-#: admin/systems/class_networkSettings.inc:604
+#: admin/systems/class_networkSettings.inc:297
+#: admin/systems/class_networkSettings.inc:328
+#: admin/systems/class_networkSettings.inc:576
+#: admin/systems/class_networkSettings.inc:583
+#: admin/systems/class_networkSettings.inc:589
+#: admin/systems/class_networkSettings.inc:596
 msgid "Error"
 msgstr ""
 
-#: admin/systems/class_printGeneric.inc:577
-#, php-format
-msgid "Your currently selected PPD file '%s' doesn't exist."
-msgstr ""
-
-#: admin/systems/class_printGeneric.inc:583
-msgid "Not defined"
-msgstr ""
-
-#: admin/systems/class_printGeneric.inc:587
-#: admin/systems/ppd/class_printerPPDDialog.inc:116
-msgid "Can't get ppd informations."
-msgstr ""
-
-#: admin/systems/class_printGeneric.inc:602
-#: admin/systems/class_printGeneric.inc:604
-#, php-format
-msgid "This printer belongs to %s. You can't rename this printer."
-msgstr ""
-
-#: admin/systems/class_printGeneric.inc:602
-#: admin/systems/class_terminalGeneric.inc:34
-msgid "terminal"
-msgstr ""
-
-#: admin/systems/class_printGeneric.inc:652
-#: admin/systems/class_printGeneric.inc:659
-msgid "Object is no printer!"
-msgstr ""
-
-#: admin/systems/class_printGeneric.inc:767 admin/systems/printer.tpl.c:23
-msgid "Printer URL"
-msgstr ""
-
-#: admin/systems/class_printGeneric.inc:989
-#: admin/systems/class_printGeneric.inc:991
-msgid "Group"
-msgstr ""
-
-#: admin/systems/class_printGeneric.inc:994
-msgid "User"
-msgstr ""
-
-#: admin/systems/class_printGeneric.inc:1006
-msgid "Printer information"
-msgstr ""
-
-#: admin/systems/class_printGeneric.inc:1023
-#: admin/systems/serverService-list.tpl.c:2
-#: admin/systems/phoneSelect/phoneSelect-list.tpl.c:2
-#: admin/systems/printer.tpl.c:11
-msgid "Base"
-msgstr ""
-
-#: admin/systems/class_printGeneric.inc:1026
-msgid "LabeledURL"
-msgstr ""
-
-#: admin/systems/class_printGeneric.inc:1027
-msgid "Printer PPD"
-msgstr ""
-
-#: admin/systems/class_printGeneric.inc:1028 admin/systems/printer.tpl.c:38
-msgid "Permissions"
-msgstr ""
-
-#: admin/systems/class_printGeneric.inc:1030
-msgid "Windows inf file"
-msgstr ""
-
-#: admin/systems/class_printGeneric.inc:1031
-msgid "Windows driver dir"
-msgstr ""
-
-#: admin/systems/class_printGeneric.inc:1032 admin/systems/printer.tpl.c:62
-msgid "Driver printer name"
-msgstr ""
-
-#: admin/systems/class_printGeneric.inc:1048
-#: admin/systems/class_printGeneric.inc:1070
-msgid "Permission error"
-msgstr ""
-
-#: admin/systems/class_printGeneric.inc:1048
-#: admin/systems/class_printGeneric.inc:1070
-msgid "printer user"
-msgstr ""
-
-#: admin/systems/class_printGeneric.inc:1065
-#, php-format
-msgid "Illegal member type '%s'!"
-msgstr ""
-
-#: admin/systems/class_printGeneric.inc:1105
-#, php-format
-msgid "'%s' is already used!"
-msgstr ""
-
-#: admin/systems/class_printGeneric.inc:1116
-#, php-format
-msgid "'%s' does not exist!"
-msgstr ""
-
-#: admin/systems/class_serverService.inc:58
-msgid "Server services"
-msgstr ""
-
 #: admin/systems/class_serverService.inc:332
 msgid "Filter error"
 msgstr ""
@@ -711,313 +438,163 @@ msgstr ""
 msgid "Could not get execute action %s on service %s."
 msgstr ""
 
-#: admin/systems/class_terminalGeneric.inc:42
-#, php-format
-msgid "The root server the terminal should be using"
+#: admin/systems/class_terminalGeneric.inc:31
+msgid "terminal"
 msgstr ""
 
+#: admin/systems/class_terminalGeneric.inc:43
 #: admin/systems/class_terminalGeneric.inc:48
-#, php-format
-msgid "The swap server the terminal should be using"
-msgstr ""
-
-#: admin/systems/class_terminalGeneric.inc:54
-msgid "Remote desktop"
-msgstr ""
-
-#: admin/systems/class_terminalGeneric.inc:58
-msgid "Connect method"
-msgstr ""
-
-#: admin/systems/class_terminalGeneric.inc:62
-msgid "XDMCP"
-msgstr ""
-
-#: admin/systems/class_terminalGeneric.inc:62
-msgid "LDM"
-msgstr ""
-
-#: admin/systems/class_terminalGeneric.inc:62
-msgid "Shell"
-msgstr ""
-
-#: admin/systems/class_terminalGeneric.inc:62
-msgid "Telnet"
-msgstr ""
-
-#: admin/systems/class_terminalGeneric.inc:62
-msgid "Windows RDP"
-msgstr ""
-
-#: admin/systems/class_terminalGeneric.inc:66
-msgid "Terminal server"
+#: admin/systems/class_terminalGeneric.inc:49
+msgid "Terminal"
 msgstr ""
 
-#: admin/systems/class_terminalGeneric.inc:82
+#: admin/systems/class_terminalGeneric.inc:44
 msgid "Terminal information"
 msgstr ""
 
-#: admin/systems/ppd/class_printerPPDSelectionDialog.inc:91
-#: admin/systems/ppd/class_printerPPDSelectionDialog.inc:116
-#: admin/systems/ppd/class_printerPPDSelectionDialog.inc:139
-#: admin/systems/ppd/class_printerPPDDialog.inc:92
-#: admin/systems/ppd/class_printerPPDDialog.inc:160
-#: admin/systems/ppd/class_printerPPDDialog.inc:241
-#: admin/systems/ppd/class_printerPPDDialog.inc:256
-#: admin/systems/ppd/class_printerPPDDialog.inc:269
-#: admin/systems/ppd/class_printerPPDDialog.inc:297
-#: admin/systems/ppd/class_printerPPDDialog.inc:314
-#: admin/systems/ppd/class_printerPPDDialog.inc:337
-#: admin/systems/ppd/class_printerPPDDialog.inc:351
-#: admin/systems/ppd/class_printerPPDDialog.inc:361
-#: admin/systems/ppd/class_printerPPDDialog.inc:365
-#: admin/systems/ppd/class_printerPPDDialog.inc:560
-#: admin/systems/ppd/class_printerPPDDialog.inc:577
-#: admin/systems/ppd/class_printerPPDDialog.inc:580
-#: admin/systems/ppd/class_printerPPDDialog.inc:583
-msgid "PPD error"
-msgstr ""
-
-#: admin/systems/ppd/class_printerPPDSelectionDialog.inc:139
-#, php-format
-msgid "Cannot locate vendor '%s' in available PPDs!"
-msgstr ""
-
-#: admin/systems/ppd/class_printerPPDSelectionDialog.inc:148
-msgid "Printer ppd selection."
-msgstr ""
-
-#: admin/systems/ppd/class_printerPPDSelectionDialog.inc:155
-msgid "delete"
-msgstr ""
-
-#: admin/systems/ppd/class_printerPPDSelectionDialog.inc:166
-msgid "back"
-msgstr ""
-
-#: admin/systems/ppd/class_printerPPDDialog.inc:74
-#: admin/systems/ppd/class_printerPPDDialog.inc:140
-#: admin/systems/services/class_goService.inc:241
-msgid "Configuration error"
-msgstr ""
-
-#: admin/systems/ppd/class_printerPPDDialog.inc:92
-#, php-format
-msgid "Cannot open PPD '%s'!"
-msgstr ""
-
-#: admin/systems/ppd/class_printerPPDDialog.inc:141
-#, php-format
-msgid "Cannot open PPD path '%s' for reading and writing!"
-msgstr ""
-
-#: admin/systems/ppd/class_printerPPDDialog.inc:160
-#: admin/systems/ppd/class_printerPPDDialog.inc:365
-msgid "file is empty"
-msgstr ""
-
-#: admin/systems/ppd/class_printerPPDDialog.inc:314
-#, php-format
-msgid "Cannot parse PPD '%s'!"
-msgstr ""
-
-#: admin/systems/ppd/class_printerPPDDialog.inc:340
-msgid "Overwrite existing PPD"
-msgstr ""
-
-#: admin/systems/ppd/class_printerPPDDialog.inc:341
-msgid ""
-"There is already a ppd file for this kind of printer. Do you want to "
-"overwrite it?"
-msgstr ""
-
-#: admin/systems/ppd/class_printerPPDDialog.inc:491
-msgid "Section"
-msgstr ""
-
-#: admin/systems/ppd/class_printerPPDDialog.inc:551
-#: admin/systems/ppd/class_printerPPDDialog.inc:554
-msgid "True"
-msgstr ""
-
-#: admin/systems/ppd/class_printerPPDDialog.inc:552
-#: admin/systems/ppd/class_printerPPDDialog.inc:555
-msgid "False"
-msgstr ""
-
-#: admin/systems/ppd/class_printerPPDDialog.inc:560
-#, php-format
-msgid "PPD type '%s' is not supported!"
-msgstr ""
-
-#: admin/systems/ppd/class_printerPPDDialog.inc:597
-msgid ""
-"Please select a valid ppd file or use 'Cancel' to go back to printer "
-"configuration."
-msgstr ""
-
-#: admin/systems/ppd/class_ppdManager.inc:44
-#: admin/systems/ppd/class_ppdManager.inc:188
-#: admin/systems/ppd/class_ppdManager.inc:190
-msgid "PPD manager error"
-msgstr ""
-
-#: admin/systems/ppd/class_ppdManager.inc:44
-#, php-format
-msgid "The specified path '%s' does not exist."
-msgstr ""
-
-#: admin/systems/ppd/class_ppdManager.inc:188
+#: admin/systems/class_systemImport.inc:72
 #, php-format
-msgid "Specified PPD file '%s' cannot be opened for reading."
+msgid "Could not parse %s"
 msgstr ""
 
-#: admin/systems/ppd/class_ppdManager.inc:190
+#: admin/systems/class_systemImport.inc:116
 #, php-format
-msgid "The temporary file '%s' cannot be opened for writing."
-msgstr ""
-
-#: admin/systems/ppd/class_ppdManager.inc:212
-#: admin/systems/ppd/class_ppdManager.inc:350
-msgid "Parsing PPD file failed - file is empty!"
+msgid "No DHCP server found for ip %s"
 msgstr ""
 
-#: admin/systems/ppd/class_ppdManager.inc:222
+#: admin/systems/class_systemImport.inc:130
 #, php-format
-msgid ""
-"Parsing PPD file %s failed - line too long. Trailing characters have been "
-"ignored!"
-msgstr ""
-
-#: admin/systems/ppd/class_ppdManager.inc:230
-msgid "Nested groups are not supported!"
+msgid "No DNS server found for zone %s"
 msgstr ""
 
-#: admin/systems/ppd/class_ppdManager.inc:234
-msgid "Group name not unique!"
+#: admin/systems/class_systemImport.inc:165
+msgid "Import"
 msgstr ""
 
-#: admin/systems/ppd/class_ppdManager.inc:240
-#: admin/systems/ppd/class_ppdManager.inc:270
-msgid "Symbol values are not supported yet!"
+#: admin/systems/class_systemImport.inc:169
+#: admin/systems/class_serverGeneric.inc:43
+#: admin/systems/class_serverGeneric.inc:48
+#: admin/systems/class_serverGeneric.inc:49
+msgid "Server"
 msgstr ""
 
-#: admin/systems/ppd/class_ppdManager.inc:264
-msgid "Nested options are not supported!"
+#: admin/systems/class_systemImport.inc:169
+msgid "The server you wish to import hosts from"
 msgstr ""
 
-#: admin/systems/ppd/class_ppdManager.inc:289
-msgid "PickMany is not supported yet!"
+#: admin/systems/class_serverGeneric.inc:31
+msgid "server"
 msgstr ""
 
-#: admin/systems/ppd/class_ppdManager.inc:370
-#, php-format
-msgid ""
-"Parsing PPD file %s failed - line too long. Trailing characters have been "
-"ignored"
+#: admin/systems/class_serverGeneric.inc:44
+msgid "Server information"
 msgstr ""
 
-#: admin/systems/ppd/class_ppdManager.inc:395
-#, php-format
-msgid "Parsing PPD file %s failed - no information found."
+#: admin/systems/class_componentGeneric.inc:31
+msgid "Component"
 msgstr ""
 
-#: admin/systems/class_systemImport.inc:72
-#, php-format
-msgid "Could not parse %s"
+#: admin/systems/class_componentGeneric.inc:32
+msgid "Component information"
 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/class_componentGeneric.inc:37
+msgid "Network device"
 msgstr ""
 
-#: admin/systems/class_systemImport.inc:130
-#, php-format
-msgid "No DNS server found for zone %s"
+#: admin/systems/class_componentGeneric.inc:58
+msgid "The name of the component"
 msgstr ""
 
-#: admin/systems/class_systemImport.inc:165
-msgid "Import"
+#: admin/systems/class_componentGeneric.inc:62
+msgid "A short description of the component"
 msgstr ""
 
-#: admin/systems/class_systemImport.inc:169
-msgid "The server you wish to import hosts from"
+#: admin/systems/class_systemServers.inc:31
+#: admin/systems/class_systemServers.inc:53
+msgid "Servers"
 msgstr ""
 
-#: admin/systems/class_serverGeneric.inc:34
-msgid "server"
+#: admin/systems/class_systemServers.inc:35
+msgid "The syslog server the system should be using"
 msgstr ""
 
-#: admin/systems/class_serverGeneric.inc:47
-msgid "Server information"
+#: admin/systems/class_systemServers.inc:40
+msgid "NTP servers"
 msgstr ""
 
-#: admin/systems/class_componentGeneric.inc:37
-msgid "Component information"
+#: admin/systems/class_systemServers.inc:40
+msgid "The NTP servers for this system"
 msgstr ""
 
-#: admin/systems/class_componentGeneric.inc:64
-msgid "The name of the component"
+#: admin/systems/class_systemServers.inc:54
+msgid "Servers this system is using"
 msgstr ""
 
-#: admin/systems/class_componentGeneric.inc:68
-msgid "A short description of the component"
+#: admin/systems/class_mobilePhoneGeneric.inc:32
+#: admin/systems/class_mobilePhoneGeneric.inc:37
+#: admin/systems/class_mobilePhoneGeneric.inc:38
+msgid "Mobile phone"
 msgstr ""
 
-#: admin/systems/class_mobilePhoneGeneric.inc:37
+#: admin/systems/class_mobilePhoneGeneric.inc:33
 msgid "Mobile phone information"
 msgstr ""
 
-#: admin/systems/class_mobilePhoneGeneric.inc:63
+#: admin/systems/class_mobilePhoneGeneric.inc:60
 msgid "The name of the mobile phone"
 msgstr ""
 
-#: admin/systems/class_mobilePhoneGeneric.inc:67
+#: admin/systems/class_mobilePhoneGeneric.inc:64
 msgid "A short description of the mobile phone"
 msgstr ""
 
-#: admin/systems/class_mobilePhoneGeneric.inc:77
+#: admin/systems/class_mobilePhoneGeneric.inc:70
+msgid "Phone"
+msgstr ""
+
+#: admin/systems/class_mobilePhoneGeneric.inc:73
 msgid "Serial Number"
 msgstr ""
 
-#: admin/systems/class_mobilePhoneGeneric.inc:77
+#: admin/systems/class_mobilePhoneGeneric.inc:73
 msgid "The serial number of the mobile phone"
 msgstr ""
 
-#: admin/systems/class_mobilePhoneGeneric.inc:81
+#: admin/systems/class_mobilePhoneGeneric.inc:77
 msgid "IMEI Number"
 msgstr ""
 
-#: admin/systems/class_mobilePhoneGeneric.inc:81
+#: admin/systems/class_mobilePhoneGeneric.inc:77
 msgid "The IMEI number of the mobile phone"
 msgstr ""
 
-#: admin/systems/class_mobilePhoneGeneric.inc:86
+#: admin/systems/class_mobilePhoneGeneric.inc:82
 msgid "OS"
 msgstr ""
 
-#: admin/systems/class_mobilePhoneGeneric.inc:86
+#: admin/systems/class_mobilePhoneGeneric.inc:82
 msgid "The Operating System installed on this phone"
 msgstr ""
 
-#: admin/systems/class_mobilePhoneGeneric.inc:92
+#: admin/systems/class_mobilePhoneGeneric.inc:88
 msgid "SimCard"
 msgstr ""
 
-#: admin/systems/class_mobilePhoneGeneric.inc:95
+#: admin/systems/class_mobilePhoneGeneric.inc:91
 msgid "Telephone Number"
 msgstr ""
 
-#: admin/systems/class_mobilePhoneGeneric.inc:95
+#: admin/systems/class_mobilePhoneGeneric.inc:91
 msgid "The telephone number of the mobile phone"
 msgstr ""
 
-#: admin/systems/class_mobilePhoneGeneric.inc:99
+#: admin/systems/class_mobilePhoneGeneric.inc:95
 msgid "PUK Number"
 msgstr ""
 
-#: admin/systems/class_mobilePhoneGeneric.inc:99
+#: admin/systems/class_mobilePhoneGeneric.inc:95
 msgid "The PUK number of the simcard in this mobile phone"
 msgstr ""
 
@@ -1029,101 +606,51 @@ msgstr ""
 msgid "Service"
 msgstr ""
 
-#: admin/systems/serverService-list.xml:27
-msgid "!"
-msgstr ""
-
-#: admin/systems/serverService-list.xml:89
-msgid "Get status"
-msgstr ""
-
-#: admin/systems/serverService-list.xml:97
-#: admin/systems/services/cups/class_serviceCUPS.inc:92
-msgid "Start"
-msgstr ""
-
-#: admin/systems/serverService-list.xml:105
-#: admin/systems/services/cups/class_serviceCUPS.inc:93
-msgid "Stop"
-msgstr ""
-
-#: admin/systems/serverService-list.xml:113
-#: admin/systems/services/cups/class_serviceCUPS.inc:94
-msgid "Restart"
-msgstr ""
-
-#: admin/systems/serverService-list.xml:121
-msgid "Edit service"
-msgstr ""
-
-#: admin/systems/serverService-list.xml:129
-msgid "Remove service"
-msgstr ""
-
-#: admin/systems/phoneSelect/phoneSelect-list.xml:10
-msgid "Please select the desired entries"
-msgstr ""
-
-#: admin/systems/phoneSelect/phoneSelect-list.xml:56
-msgid "Number"
-msgstr ""
-
-#: admin/systems/phoneSelect/phoneSelect-list.xml:83
-msgid "Select this number"
-msgstr ""
-
-#: admin/systems/class_systemManagement.inc:177
-msgid "Back"
-msgstr ""
-
-#: admin/systems/class_systemManagement.inc:223
-msgid "Creating the image failed. Please see the report below."
+#: admin/systems/serverService-list.xml:27
+msgid "!"
 msgstr ""
 
-#: admin/systems/class_systemManagement.inc:228
-#, php-format
-msgid "Command '%s', specified for ISO creation doesn't seem to exist."
+#: admin/systems/serverService-list.xml:89
+msgid "Get status"
 msgstr ""
 
-#: admin/systems/class_systemManagement.inc:398
-#: admin/systems/class_systemManagement.inc:473
-#: admin/systems/class_systemManagement.inc:858
-#: admin/systems/class_systemManagement.inc:905
-#: admin/systems/class_systemManagement.inc:926
-msgid "Permission"
+#: admin/systems/serverService-list.xml:97
+#: admin/systems/services/cups/class_serviceCUPS.inc:92
+msgid "Start"
 msgstr ""
 
-#: admin/systems/class_systemManagement.inc:678
-msgid "Cannot set mode to 'active'!"
+#: admin/systems/serverService-list.xml:105
+#: admin/systems/services/cups/class_serviceCUPS.inc:93
+msgid "Stop"
 msgstr ""
 
-#: admin/systems/class_systemManagement.inc:858
-#, php-format
-msgid "You are not allowed to create a snapshot for %s."
+#: admin/systems/serverService-list.xml:113
+#: admin/systems/services/cups/class_serviceCUPS.inc:94
+msgid "Restart"
 msgstr ""
 
-#: admin/systems/class_systemManagement.inc:905
-#: admin/systems/class_systemManagement.inc:926
-#, php-format
-msgid "You are not allowed to restore a snapshot for %s."
+#: admin/systems/serverService-list.xml:121
+msgid "Edit service"
 msgstr ""
 
-#: admin/systems/class_systemManagement.inc:1169
-#, php-format
-msgid "Inherited from %s"
+#: admin/systems/serverService-list.xml:129
+msgid "Remove service"
 msgstr ""
 
-#: admin/systems/class_systemManagement.inc:1224
-#: admin/systems/class_systemManagement.inc:1228
-#: addons/dashboard/class_dashBoardSystems.inc:199
+#: admin/systems/class_systemManagement.inc:48
 #: config/systems/class_systemsPluginConfig.inc:28
 msgid "Systems"
 msgstr ""
 
-#: admin/systems/class_systemManagement.inc:1225
+#: admin/systems/class_systemManagement.inc:49
 msgid "Systems Management"
 msgstr ""
 
+#: admin/systems/class_systemManagement.inc:250
+#, php-format
+msgid "Inherited from %s"
+msgstr ""
+
 #: admin/systems/services/terminal/class_serviceTerminal.inc:29
 #: admin/systems/services/terminal/class_serviceTerminal.inc:30
 #: admin/systems/services/terminal/class_serviceTerminal.inc:41
@@ -1161,6 +688,10 @@ msgstr ""
 msgid "Empty service"
 msgstr ""
 
+#: admin/systems/services/class_goService.inc:241
+msgid "Configuration error"
+msgstr ""
+
 #: admin/systems/services/shares/class_serviceShare.inc:30
 #: admin/systems/services/shares/class_serviceShare.inc:31
 msgid "Share service"
@@ -1219,8 +750,6 @@ msgid "You need to configure encodings first"
 msgstr ""
 
 #: admin/systems/services/shares/class_serviceShare.inc:110
-#: admin/ogroups/goto/termgroup.tpl.c:2 admin/systems/remove.tpl.c:2
-#: admin/systems/ppd/remove_ppd.tpl.c:2
 msgid "Warning"
 msgstr ""
 
@@ -1346,153 +875,93 @@ msgstr ""
 msgid "LDAP"
 msgstr ""
 
-#: admin/systems/class_networkSettings.inc:305
+#: admin/systems/class_networkSettings.inc:297
 msgid "NOT IMPLEMENTED"
 msgstr ""
 
-#: admin/systems/class_networkSettings.inc:437
+#: admin/systems/class_networkSettings.inc:429
 msgid "Not matching"
 msgstr ""
 
-#: admin/systems/class_networkSettings.inc:584
+#: admin/systems/class_networkSettings.inc:576
 #, php-format
 msgid "Was not able to contact argonaut server: %s"
 msgstr ""
 
-#: admin/systems/class_networkSettings.inc:591
+#: admin/systems/class_networkSettings.inc:583
 #, php-format
 msgid "Was not able to find DNS server for zone %s"
 msgstr ""
 
-#: admin/systems/class_networkSettings.inc:597
+#: admin/systems/class_networkSettings.inc:589
 #, php-format
 msgid "Was not able to find mac address of DNS server %s"
 msgstr ""
 
-#: admin/systems/class_networkSettings.inc:604
+#: admin/systems/class_networkSettings.inc:596
 #, php-format
 msgid "Was not able to launch ldap2zone: %s"
 msgstr ""
 
-#: admin/systems/class_networkSettings.inc:630
+#: admin/systems/class_networkSettings.inc:622
 #, php-format
 msgid "IP address %s"
 msgstr ""
 
-#: admin/systems/class_networkSettings.inc:638
-#: admin/systems/class_networkSettings.inc:651
-#: admin/systems/class_networkSettings.inc:653
-#: admin/systems/class_networkSettings.inc:1022
-msgid "IP address"
-msgstr ""
-
-#: admin/systems/class_networkSettings.inc:644
-#: admin/systems/class_networkSettings.inc:660
-#: admin/systems/class_networkSettings.inc:662
-#: admin/systems/class_networkSettings.inc:1023
+#: admin/systems/class_networkSettings.inc:636
+#: admin/systems/class_networkSettings.inc:652
+#: admin/systems/class_networkSettings.inc:654
+#: admin/systems/class_networkSettings.inc:1015
 msgid "MAC address"
 msgstr ""
 
-#: admin/systems/class_networkSettings.inc:676
+#: admin/systems/class_networkSettings.inc:668
 #, php-format
 msgid "The IP address '%s' is not part of the selected reverse zone '%s'!"
 msgstr ""
 
-#: admin/systems/class_networkSettings.inc:686
+#: admin/systems/class_networkSettings.inc:678
 #, php-format
 msgid "Record type '%s' is duplicated!"
 msgstr ""
 
-#: admin/systems/class_networkSettings.inc:693
+#: admin/systems/class_networkSettings.inc:685
 #, php-format
 msgid "Uniq record type '%s' is duplicated!"
 msgstr ""
 
-#: admin/systems/class_networkSettings.inc:705
+#: admin/systems/class_networkSettings.inc:697
 #, php-format
 msgid ""
 "The IP address '%s' will be added as 'A Record', this will be done "
 "automatically, please remove the record."
 msgstr ""
 
-#: admin/systems/class_networkSettings.inc:712
+#: admin/systems/class_networkSettings.inc:704
 #, php-format
 msgid "Only lowercase records are allowed, please check your '%ss'."
 msgstr ""
 
-#: admin/systems/class_networkSettings.inc:978
+#: admin/systems/class_networkSettings.inc:970
 msgid "Delete"
 msgstr ""
 
-#: admin/systems/class_networkSettings.inc:984
+#: admin/systems/class_networkSettings.inc:976
 msgid "Add"
 msgstr ""
 
-#: admin/systems/class_networkSettings.inc:1015
-#: addons/dashboard/class_dashBoardNetwork.inc:127
+#: admin/systems/class_networkSettings.inc:1007
 msgid "Network"
 msgstr ""
 
-#: admin/systems/class_networkSettings.inc:1030
+#: admin/systems/class_networkSettings.inc:1022
 msgid "DNS configuration"
 msgstr ""
 
-#: admin/systems/class_networkSettings.inc:1033
+#: admin/systems/class_networkSettings.inc:1025
 msgid "DHCP configuration"
 msgstr ""
 
-#: addons/dashboard/class_dashBoardSystems.inc:45
-msgid "Workstations"
-msgstr ""
-
-#: addons/dashboard/class_dashBoardSystems.inc:51
-msgid "Windows Workstations"
-msgstr ""
-
-#: addons/dashboard/class_dashBoardSystems.inc:54
-msgid "Terminals"
-msgstr ""
-
-#: addons/dashboard/class_dashBoardSystems.inc:57
-msgid "Printers"
-msgstr ""
-
-#: addons/dashboard/class_dashBoardSystems.inc:60
-msgid "Phones"
-msgstr ""
-
-#: addons/dashboard/class_dashBoardSystems.inc:63
-msgid "Components"
-msgstr ""
-
-#: addons/dashboard/class_dashBoardSystems.inc:66
-msgid "Mobile phones"
-msgstr ""
-
-#: addons/dashboard/class_dashBoardSystems.inc:183
-msgid "Statistics"
-msgstr ""
-
-#: addons/dashboard/class_dashBoardSystems.inc:188
-msgid "Computer name to use by unit"
-msgstr ""
-
-#: addons/dashboard/class_dashBoardSystems.inc:200
-msgid "Statistics and informations about systems"
-msgstr ""
-
-#: addons/dashboard/class_dashBoardNetwork.inc:111
-msgid "DHCP"
-msgstr ""
-
-#: addons/dashboard/class_dashBoardNetwork.inc:116
-msgid "DNS"
-msgstr ""
-
-#: addons/dashboard/class_dashBoardNetwork.inc:128
-msgid "Statistics and various informations"
-msgstr ""
-
 #: config/systems/class_systemsPluginConfig.inc:29
 msgid "Systems plugin configuration"
 msgstr ""
@@ -1584,402 +1053,3 @@ msgstr ""
 #: config/systems/class_systemsPluginConfig.inc:101
 msgid "Encodings"
 msgstr ""
-
-#: admin/ogroups/goto/termgroup.tpl.c:5
-msgid ""
-"Actions you choose here influence all systems in this object group. "
-"Additionally, all values editable here can be inherited by the clients "
-"assigned to this object group."
-msgstr ""
-
-#: admin/ogroups/goto/termgroup.tpl.c:8
-msgid "Generic"
-msgstr ""
-
-#: admin/ogroups/goto/termgroup.tpl.c:11
-msgid "NTP server"
-msgstr ""
-
-#: admin/ogroups/goto/termgroup.tpl.c:14
-msgid "Choose server to use for synchronizing time"
-msgstr ""
-
-#: admin/ogroups/goto/termgroup.tpl.c:20
-msgid "Select terminal mode"
-msgstr ""
-
-#: admin/ogroups/goto/termgroup.tpl.c:26
-msgid "Choose server to use for logging"
-msgstr ""
-
-#: admin/ogroups/goto/termgroup.tpl.c:32
-msgid "Select NFS root filesystem to use"
-msgstr ""
-
-#: admin/ogroups/goto/termgroup.tpl.c:38
-msgid "Choose NFS filesystem to place swap files on"
-msgstr ""
-
-#: admin/ogroups/goto/termgroup.tpl.c:47
-msgid "Execute"
-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 admin/systems/network.tpl.c:11
-msgid "Propose ip"
-msgstr ""
-
-#: admin/systems/network.tpl.c:14
-msgid "MAC-address"
-msgstr ""
-
-#: admin/systems/network.tpl.c:17
-msgid "Autodetect"
-msgstr ""
-
-#: admin/systems/network.tpl.c:20 admin/systems/network.tpl.c:23
-msgid "Enable DHCP for this device"
-msgstr ""
-
-#: admin/systems/network.tpl.c:26 admin/systems/network.tpl.c:50
-msgid "not configured"
-msgstr ""
-
-#: admin/systems/network.tpl.c:29
-msgid "Parent node"
-msgstr ""
-
-#: admin/systems/network.tpl.c:32
-msgid "Edit settings"
-msgstr ""
-
-#: admin/systems/network.tpl.c:35 admin/systems/network.tpl.c:47
-msgid "Enable DNS for this device"
-msgstr ""
-
-#: admin/systems/network.tpl.c:38
-msgid "Zone"
-msgstr ""
-
-#: admin/systems/network.tpl.c:41
-msgid "TTL"
-msgstr ""
-
-#: admin/systems/network.tpl.c:44
-msgid "Dns records"
-msgstr ""
-
-#: admin/systems/password.tpl.c:2
-msgid ""
-"To change the terminal root password use the fields below. The changes take "
-"effect during the next reboot. Please memorize the new password, because you"
-" wouldn't be able to log in."
-msgstr ""
-
-#: admin/systems/password.tpl.c:5
-msgid "Leave fields blank for password inheritance from default entries."
-msgstr ""
-
-#: admin/systems/password.tpl.c:8
-msgid "Changing the password impinges on authentification only."
-msgstr ""
-
-#: admin/systems/password.tpl.c:11
-msgid "New password"
-msgstr ""
-
-#: admin/systems/password.tpl.c:14
-msgid "Repeat new password"
-msgstr ""
-
-#: admin/systems/password.tpl.c:17
-msgid "Password strength"
-msgstr ""
-
-#: admin/systems/password.tpl.c:20
-msgid "Set password"
-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/gencd.tpl.c:2
-msgid "CD-Install-Image generation"
-msgstr ""
-
-#: admin/systems/gencd.tpl.c:5
-msgid ""
-"This option enables you to generate FAI install CD images for the selected "
-"workstation. The procedure may take about 10 minutes to complete, so please "
-"be patient after pressing the 'Create ISO-Image' button."
-msgstr ""
-
-#: admin/systems/gencd.tpl.c:8
-msgid "Create ISO-Image"
-msgstr ""
-
-#: admin/systems/remove.tpl.c:5
-msgid ""
-"This includes all account data, system access rules, imap settings, etc. for"
-" this user. Please double check if your really want to do this since there "
-"is no way for FusionDirectory to get your data back."
-msgstr ""
-
-#: admin/systems/remove.tpl.c:8
-msgid "So - if you're sure - press 'Delete' to continue or 'Cancel' to abort."
-msgstr ""
-
-#: admin/systems/system-filter.tpl.c:2
-#: admin/systems/phoneSelect/phoneSelect-filter.tpl.c:2
-msgid "Filter"
-msgstr ""
-
-#: admin/systems/system-filter.tpl.c:5
-msgid "Show servers"
-msgstr ""
-
-#: admin/systems/system-filter.tpl.c:8
-msgid "Show workstations"
-msgstr ""
-
-#: admin/systems/system-filter.tpl.c:11
-msgid "Show terminals"
-msgstr ""
-
-#: admin/systems/system-filter.tpl.c:14
-msgid "Show network printer"
-msgstr ""
-
-#: admin/systems/system-filter.tpl.c:17
-#: admin/systems/phoneSelect/phoneSelect-filter.tpl.c:5
-msgid "Show phones"
-msgstr ""
-
-#: admin/systems/system-filter.tpl.c:20
-msgid "Show windows based workstations"
-msgstr ""
-
-#: admin/systems/system-filter.tpl.c:23
-msgid "Show network devices"
-msgstr ""
-
-#: admin/systems/system-filter.tpl.c:26
-#: admin/systems/phoneSelect/phoneSelect-filter.tpl.c:8
-msgid "Show mobile phones"
-msgstr ""
-
-#: admin/systems/system-filter.tpl.c:29
-msgid "Show IPMI interfaces"
-msgstr ""
-
-#: admin/systems/ppd/printerPPDSelectionDialog.tpl.c:2
-msgid "Select objects to add"
-msgstr ""
-
-#: admin/systems/ppd/printerPPDSelectionDialog.tpl.c:5
-msgid "Filters"
-msgstr ""
-
-#: admin/systems/ppd/printerPPDSelectionDialog.tpl.c:8
-msgid "Display objects matching"
-msgstr ""
-
-#: admin/systems/ppd/printerPPDSelectionDialog.tpl.c:11
-msgid "Regular expression for matching object names"
-msgstr ""
-
-#: admin/systems/ppd/printerPPDSelectionDialog.tpl.c:14
-msgid "Close"
-msgstr ""
-
-#: admin/systems/ppd/printerPPDDialog.tpl.c:2
-msgid "Printer driver"
-msgstr ""
-
-#: admin/systems/ppd/printerPPDDialog.tpl.c:5
-msgid "Model"
-msgstr ""
-
-#: admin/systems/ppd/printerPPDDialog.tpl.c:8
-msgid "Select"
-msgstr ""
-
-#: admin/systems/ppd/printerPPDDialog.tpl.c:11
-msgid "New driver"
-msgstr ""
-
-#: admin/systems/ppd/printerPPDDialog.tpl.c:14
-msgid "Upload"
-msgstr ""
-
-#: admin/systems/ppd/printerPPDDialog.tpl.c:17
-msgid "Options"
-msgstr ""
-
-#: admin/systems/ppd/remove_ppd.tpl.c:5
-msgid "The ppd file will be removed from the server and can not be restored."
-msgstr ""
-
-#: admin/systems/printer.tpl.c:2
-msgid "General"
-msgstr ""
-
-#: admin/systems/printer.tpl.c:5
-msgid "Printer name"
-msgstr ""
-
-#: admin/systems/printer.tpl.c:14
-msgid "Details"
-msgstr ""
-
-#: admin/systems/printer.tpl.c:20
-msgid "Printer location"
-msgstr ""
-
-#: admin/systems/printer.tpl.c:26
-msgid "PPD Provider"
-msgstr ""
-
-#: admin/systems/printer.tpl.c:29
-msgid "Driver"
-msgstr ""
-
-#: admin/systems/printer.tpl.c:32
-msgid "Edit"
-msgstr ""
-
-#: admin/systems/printer.tpl.c:41
-msgid "Users which are allowed to use this printer"
-msgstr ""
-
-#: admin/systems/printer.tpl.c:44
-msgid "Users"
-msgstr ""
-
-#: admin/systems/printer.tpl.c:47
-msgid "Users which are allowed to administrate this printer"
-msgstr ""
-
-#: admin/systems/printer.tpl.c:50
-msgid "Admins"
-msgstr ""
-
-#: admin/systems/printer.tpl.c:53
-msgid "Windows paths"
-msgstr ""
-
-#: admin/systems/printer.tpl.c:56
-msgid "Printer windows inf file"
-msgstr ""
-
-#: admin/systems/printer.tpl.c:59
-msgid "Printer driver directory"
-msgstr ""
-
-#: admin/systems/gencd_frame.tpl.c:2
-msgid "Your browser does not supprt iframes."
-msgstr ""
-
-#: admin/systems/services/cups/serviceCUPS.tpl.c:2
-msgid "Print Service"
-msgstr ""
-
-#: admin/systems/services/cups/serviceCUPS.tpl.c:5
-msgid "enabled"
-msgstr ""
-
-#: admin/systems/services/ServiceAddDialog.tpl.c:2
-msgid "Adding a new service to the current server"
-msgstr ""
-
-#: admin/systems/services/ServiceAddDialog.tpl.c:5
-msgid ""
-"This dialog allows you to add new services to the currenty edited server "
-"object. The box below shows all available but not already used services."
-msgstr ""
-
-#: admin/systems/services/ServiceAddDialog.tpl.c:8
-msgid "Service to add"
-msgstr ""
-
-#: admin/systems/services/ServiceAddDialog.tpl.c:11
-msgid "All available services are already in use."
-msgstr ""
-
-#: admin/systems/services/ServiceAddDialog.tpl.c:14
-#: admin/systems/SelectDeviceType.tpl.c:26
-msgid "Continue"
-msgstr ""
-
-#: admin/systems/SelectDeviceType.tpl.c:2
-msgid ""
-"This system has no system type configured. Please choose a system type for "
-"this object and an optional inheritance group. Press the 'continue' button "
-"to proceed."
-msgstr ""
-
-#: admin/systems/SelectDeviceType.tpl.c:5
-msgid ""
-"Please select a system type and an optional bundle of predefined settings to"
-" be inherited."
-msgstr ""
-
-#: admin/systems/SelectDeviceType.tpl.c:8
-msgid ""
-"Please select a system type and a bundle of predefined settings to be "
-"inherited."
-msgstr ""
-
-#: admin/systems/SelectDeviceType.tpl.c:11
-#: admin/systems/SelectDeviceType.tpl.c:14
-msgid "System type"
-msgstr ""
-
-#: admin/systems/SelectDeviceType.tpl.c:17
-msgid "Choose an object group as template"
-msgstr ""
-
-#: admin/systems/SelectDeviceType.tpl.c:20
-msgid "Object group"
-msgstr ""
-
-#: admin/systems/SelectDeviceType.tpl.c:23
-msgid "none"
-msgstr ""
-
-#: addons/dashboard/systems_stats.tpl.c:2
-msgid "There are several argonaut servers! (this is not yet supported)"
-msgstr ""
-
-#: addons/dashboard/systems_stats.tpl.c:5
-msgid "There is an argonaut server running on %1 (%3://%2:%4)"
-msgstr ""
-
-#: addons/dashboard/systems_stats.tpl.c:8
-msgid "Only one system is configured to run an argonaut client."
-msgid_plural "%1 systems are configured to run an argonaut client."
-msgstr[0] ""
-
-#: addons/dashboard/systems_stats.tpl.c:11
-msgid "But no system is configured to run an argonaut client!"
-msgstr ""
-
-#: addons/dashboard/systems_stats.tpl.c:14
-msgid ""
-"A system is configured to run an argonaut client, but there is no argonaut "
-"server configured!"
-msgid_plural ""
-"%1 systems are configured to run an argonaut client, but there is no "
-"argonaut server configured!"
-msgstr[0] ""
diff --git a/systems/locale/it/fusiondirectory.po b/systems/locale/it/fusiondirectory.po
index 02b145dac7956c08bd52d9703e91772ca0420cab..048df1085593adcb1643aa1107dfe870b8c0aff4 100644
--- a/systems/locale/it/fusiondirectory.po
+++ b/systems/locale/it/fusiondirectory.po
@@ -3,19 +3,14 @@
 # This file is distributed under the same license as the PACKAGE package.
 # 
 # Translators:
-# Alessandro Amici <a.amici@bopen.it>, 2005
-# poterealpopolo <giuliano@opensides.be>, 2011
-# poterealpopolo <giuliano@opensides.be>, 2013
-# poterealpopolo <giuliano@opensides.be>, 2012
-# poterealpopolo <giuliano@opensides.be>, 2011-2013
 msgid ""
 msgstr ""
-"Project-Id-Version: FusionDirectory-108\n"
+"Project-Id-Version: FusionDirectory-109\n"
 "Report-Msgid-Bugs-To: documentation@lists.fusiondirectory.org\n"
-"POT-Creation-Date: 2015-03-31 11:49+0200\n"
-"PO-Revision-Date: 2015-03-31 11:41+0000\n"
+"POT-Creation-Date: 2014-12-15 17:47+0100\n"
+"PO-Revision-Date: 2015-03-31 11:42+0000\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>\n"
-"Language-Team: Italian (http://www.transifex.com/projects/p/FusionDirectory-108/language/it/)\n"
+"Language-Team: Italian (http://www.transifex.com/projects/p/FusionDirectory-109/language/it/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -31,29 +26,24 @@ msgid "Locked"
 msgstr "Bloccato"
 
 #: admin/ogroups/goto/class_termgroup.inc:118
-#: admin/systems/class_terminalGeneric.inc:121
+#: admin/systems/class_terminalStartup.inc:145
 msgid "Local swap"
 msgstr "Swap locale"
 
 #: admin/ogroups/goto/class_termgroup.inc:124
 #: admin/ogroups/goto/class_termgroup.inc:136
-#: admin/systems/class_workstationGeneric.inc:352
-#: admin/systems/class_terminalGeneric.inc:109
-#: admin/systems/class_terminalGeneric.inc:125
+#: admin/systems/class_terminalStartup.inc:133
+#: admin/systems/class_terminalStartup.inc:149
 msgid "inherited"
 msgstr "eredita"
 
 #: admin/ogroups/goto/class_termgroup.inc:220
-#: admin/systems/class_workstationGeneric.inc:72
-#: admin/systems/class_workstationGeneric.inc:443
-#: admin/systems/class_systemManagement.inc:295
-#: admin/systems/class_systemManagement.inc:325
-msgid "Infrastructure service"
-msgstr ""
+#: admin/systems/class_systemManagement.inc:165
+#: admin/systems/class_systemManagement.inc:186
+msgid "Service infrastructure"
+msgstr "Servizio d'infrastruttura"
 
 #: admin/ogroups/goto/class_termgroup.inc:224
-#: admin/systems/class_workstationGeneric.inc:75
-#: admin/systems/class_workstationGeneric.inc:78
 msgid "Event error"
 msgstr "Errore nell'evento"
 
@@ -63,12 +53,10 @@ msgid "Event '%s' is not available!"
 msgstr "L'evento '%s' non Ã¨ disponibile!"
 
 #: admin/ogroups/goto/class_termgroup.inc:274
-#: admin/systems/class_workstationGeneric.inc:112
 msgid "Switch off"
 msgstr "Spegni"
 
 #: admin/ogroups/goto/class_termgroup.inc:274
-#: admin/systems/class_workstationGeneric.inc:113
 msgid "Reboot"
 msgstr "Riavvia"
 
@@ -89,7 +77,6 @@ msgid "Reinstall"
 msgstr "Installa di nuovo"
 
 #: admin/ogroups/goto/class_termgroup.inc:279
-#: admin/systems/class_workstationGeneric.inc:108
 msgid "Memory test"
 msgstr "Test della memoria"
 
@@ -98,21 +85,18 @@ msgid "System analysis"
 msgstr "Analisi del sistema"
 
 #: admin/ogroups/goto/class_termgroup.inc:386
-#: admin/systems/class_printGeneric.inc:670
-#: admin/systems/class_printGeneric.inc:970
-#: admin/systems/class_systemManagement.inc:816
 #: admin/systems/services/class_goService.inc:123
 #: admin/systems/services/class_goService.inc:151
 #: admin/systems/services/class_goService.inc:187
-#: admin/systems/class_networkSettings.inc:478
-#: admin/systems/class_networkSettings.inc:491
-#: admin/systems/class_networkSettings.inc:757
-#: admin/systems/class_networkSettings.inc:816
-#: admin/systems/class_networkSettings.inc:835
-#: admin/systems/class_networkSettings.inc:852
-#: admin/systems/class_networkSettings.inc:861
-#: admin/systems/class_networkSettings.inc:879
-#: admin/systems/class_networkSettings.inc:951
+#: admin/systems/class_networkSettings.inc:470
+#: admin/systems/class_networkSettings.inc:483
+#: admin/systems/class_networkSettings.inc:749
+#: admin/systems/class_networkSettings.inc:808
+#: admin/systems/class_networkSettings.inc:827
+#: admin/systems/class_networkSettings.inc:844
+#: admin/systems/class_networkSettings.inc:853
+#: admin/systems/class_networkSettings.inc:871
+#: admin/systems/class_networkSettings.inc:943
 msgid "LDAP error"
 msgstr "Errore LDAP"
 
@@ -124,195 +108,125 @@ msgstr "Sistema"
 msgid "System group"
 msgstr "Gruppo di sistema"
 
-#: admin/ogroups/goto/class_termgroup.inc:401
-#: admin/ogroups/goto/termgroup.tpl.c:17
+#: admin/ogroups/goto/class_termgroup.inc:402
 msgid "Mode"
 msgstr "ModalitÃ "
 
-#: admin/ogroups/goto/class_termgroup.inc:402
-#: admin/systems/class_workstationGeneric.inc:189
-#: admin/ogroups/goto/termgroup.tpl.c:23
+#: admin/ogroups/goto/class_termgroup.inc:403
+#: admin/systems/class_systemServers.inc:35
 msgid "Syslog server"
 msgstr "Server dei log di sistema"
 
-#: admin/ogroups/goto/class_termgroup.inc:403
+#: admin/ogroups/goto/class_termgroup.inc:404
 msgid "Action flag"
 msgstr "Indicatore d'azione"
 
-#: admin/ogroups/goto/class_termgroup.inc:404
+#: admin/ogroups/goto/class_termgroup.inc:405
 msgid "Ntp server"
 msgstr "Server NTP"
 
-#: admin/ogroups/goto/class_termgroup.inc:405
-#: admin/systems/class_terminalGeneric.inc:41
-#: admin/ogroups/goto/termgroup.tpl.c:29
+#: admin/ogroups/goto/class_termgroup.inc:406
+#: admin/systems/class_terminalStartup.inc:65
 msgid "Root server"
 msgstr "Server principale"
 
-#: admin/ogroups/goto/class_termgroup.inc:406
-#: admin/systems/class_terminalGeneric.inc:47
-#: admin/ogroups/goto/termgroup.tpl.c:35
+#: admin/ogroups/goto/class_termgroup.inc:407
+#: admin/systems/class_terminalStartup.inc:69
 msgid "Swap server"
 msgstr "Server di swap"
 
-#: admin/systems/class_terminalStartup.inc:63
+#: admin/systems/class_terminalStartup.inc:62
 msgid "Startup parameters"
 msgstr "Parametri di avvio"
 
-#: admin/systems/class_terminalStartup.inc:66
+#: admin/systems/class_terminalStartup.inc:65
+msgid "The root server the terminal should be using"
+msgstr "Il server principale che il terminale dovrebbe usare"
+
+#: admin/systems/class_terminalStartup.inc:69
+msgid "The swap server the terminal should be using"
+msgstr "La swap principale che il terminale dovrebbe usare"
+
+#: admin/systems/class_terminalStartup.inc:73
 msgid "Boot kernel"
 msgstr "Kernel d'avvio"
 
-#: admin/systems/class_terminalStartup.inc:66
+#: admin/systems/class_terminalStartup.inc:73
 msgid "Linux kernel to be installed and booted"
 msgstr "Kernel linux che dovrÃ  essere installato ed avviato"
 
-#: admin/systems/class_terminalStartup.inc:70
+#: admin/systems/class_terminalStartup.inc:77
 msgid "Boot kernel parameters"
 msgstr "Parametri del kernel d'avvio"
 
-#: admin/systems/class_terminalStartup.inc:70
+#: admin/systems/class_terminalStartup.inc:77
 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/class_terminalStartup.inc:83
-msgid "Terminal startup"
-msgstr "Avvio del terminale"
-
-#: admin/systems/system-list.xml:10
-msgid "List of systems"
-msgstr "Elenco dei sistemi"
-
-#: admin/systems/system-list.xml:14
-msgid "New workstation"
-msgstr "Nuova workstation"
-
-#: admin/systems/system-list.xml:22
-msgid "Locked server"
-msgstr "Server bloccato"
-
-#: admin/systems/system-list.xml:30
-msgid "Locked workstation"
-msgstr "Workstation bloccata"
-
-#: admin/systems/system-list.xml:38
-msgid "Locked terminal"
-msgstr "Terminale bloccato"
-
-#: admin/systems/system-list.xml:47
-msgid "New terminal"
-msgstr "Nuovo terminale"
-
-#: admin/systems/system-list.xml:55
-msgid "New device"
-msgstr "Nuova periferica"
-
-#: admin/systems/system-list.xml:63
-msgid "Workstation template"
-msgstr "Modello della Workstation"
-
-#: admin/systems/system-list.xml:71
-msgid "Terminal template"
-msgstr "Modello di terminale"
+msgid "Remote desktop"
+msgstr "Desktop a distanza"
 
-#: admin/systems/system-list.xml:79
-msgid "Winstation"
-msgstr "PC Windows"
+#: admin/systems/class_terminalStartup.inc:87
+msgid "Connect method"
+msgstr "Metodo di connessione"
 
-#: admin/systems/system-list.xml:87 admin/systems/system-list.xml:234
-#: admin/systems/class_systemImport.inc:169
-#: admin/systems/class_serverGeneric.inc:46
-#: admin/systems/class_serverGeneric.inc:51
-#: admin/systems/class_serverGeneric.inc:52
-#: admin/systems/class_SelectDeviceType.inc:58
-msgid "Server"
-msgstr "Server"
+#: admin/systems/class_terminalStartup.inc:91
+msgid "XDMCP"
+msgstr "XDMCP"
 
-#: admin/systems/system-list.xml:95 admin/systems/system-list.xml:242
-#: admin/systems/class_workstationGeneric.inc:458
-#: admin/systems/class_workstationGeneric.inc:463
-#: admin/systems/class_workstationGeneric.inc:464
-#: admin/systems/class_SelectDeviceType.inc:58
-msgid "Workstation"
-msgstr "Workstation"
+#: admin/systems/class_terminalStartup.inc:91
+msgid "LDM"
+msgstr "LDM"
 
-#: admin/systems/system-list.xml:103 admin/systems/system-list.xml:250
-#: admin/systems/class_terminalGeneric.inc:81
-#: admin/systems/class_terminalGeneric.inc:86
-#: admin/systems/class_terminalGeneric.inc:87
-#: admin/systems/class_SelectDeviceType.inc:58
-msgid "Terminal"
-msgstr "Terminale"
+#: admin/systems/class_terminalStartup.inc:91
+msgid "Shell"
+msgstr "Shell"
 
-#: admin/systems/system-list.xml:111 admin/systems/class_printGeneric.inc:1005
-#: admin/systems/class_printGeneric.inc:1011
-#: admin/systems/class_printGeneric.inc:1012
-msgid "Printer"
-msgstr "Stampante"
+#: admin/systems/class_terminalStartup.inc:91
+msgid "Telnet"
+msgstr "Telnet"
 
-#: admin/systems/system-list.xml:119 admin/systems/system-list.xml:274
-#: admin/systems/class_mobilePhoneGeneric.inc:74
-#: admin/systems/phoneSelect/phoneSelect-list.xml:14
-msgid "Phone"
-msgstr "Telefono"
+#: admin/systems/class_terminalStartup.inc:91
+msgid "Windows RDP"
+msgstr "Windows RDP"
 
-#: admin/systems/system-list.xml:127
-#: admin/systems/class_mobilePhoneGeneric.inc:36
-#: admin/systems/class_mobilePhoneGeneric.inc:41
-#: admin/systems/class_mobilePhoneGeneric.inc:42
-#: admin/systems/phoneSelect/phoneSelect-list.xml:22
-msgid "Mobile phone"
-msgstr "Numero di cellulare"
+#: admin/systems/class_terminalStartup.inc:95
+msgid "Terminal server"
+msgstr "Server terminale"
 
-#: admin/systems/system-list.xml:135
-#: admin/systems/class_componentGeneric.inc:36
-msgid "Component"
-msgstr "Componente"
+#: admin/systems/system-list.xml:10
+msgid "List of systems"
+msgstr "Elenco dei sistemi"
 
-#: admin/systems/system-list.xml:143 admin/systems/system-list.xml:298
-msgid "IPMI"
-msgstr "IPMI"
-
-#: admin/systems/system-list.xml:169
-#: admin/systems/class_workstationGeneric.inc:154
-#: admin/systems/class_printGeneric.inc:752
-#: admin/systems/class_printGeneric.inc:762
-#: admin/systems/class_printGeneric.inc:781
-#: admin/systems/class_printGeneric.inc:1022
-#: admin/systems/class_componentGeneric.inc:64
-#: admin/systems/class_mobilePhoneGeneric.inc:63
-#: admin/systems/phoneSelect/phoneSelect-list.xml:48
+#: admin/systems/system-list.xml:31
+#: admin/systems/class_workstationGeneric.inc:46
+#: admin/systems/class_printGeneric.inc:60
+#: admin/systems/class_componentGeneric.inc:58
+#: admin/systems/class_mobilePhoneGeneric.inc:60
 #: admin/systems/services/shares/class_serviceShare.inc:52
-#: admin/systems/system-filter.tpl.c:32
-#: admin/systems/phoneSelect/phoneSelect-filter.tpl.c:11
 msgid "Name"
 msgstr "Nome"
 
-#: admin/systems/system-list.xml:177
-#: admin/systems/phoneSelect/phoneSelect-list.xml:63
+#: admin/systems/system-list.xml:39
 msgid "IP"
 msgstr "IP"
 
-#: admin/systems/system-list.xml:185
+#: admin/systems/system-list.xml:47
 msgid "MAC"
 msgstr "MAC"
 
-#: admin/systems/system-list.xml:193
-#: admin/systems/class_workstationGeneric.inc:160
-#: admin/systems/class_printGeneric.inc:1024
-#: admin/systems/class_componentGeneric.inc:68
-#: admin/systems/class_mobilePhoneGeneric.inc:67
+#: admin/systems/system-list.xml:55
+#: admin/systems/class_workstationGeneric.inc:51
+#: admin/systems/class_printGeneric.inc:64
+#: admin/systems/class_componentGeneric.inc:62
+#: admin/systems/class_mobilePhoneGeneric.inc:64
 #: admin/systems/serverService-list.xml:35
 #: admin/systems/services/shares/class_serviceShare.inc:56
-#: admin/systems/printer.tpl.c:8 admin/systems/printer.tpl.c:17
 msgid "Description"
 msgstr "Descrizione"
 
-#: admin/systems/system-list.xml:201 admin/systems/class_serverService.inc:57
+#: admin/systems/system-list.xml:63 admin/systems/class_serverService.inc:57
 #: admin/systems/services/terminal/class_serviceTerminal.inc:30
 #: admin/systems/services/cups/class_serviceCUPS.inc:85
 #: admin/systems/services/shares/class_serviceShare.inc:31
@@ -321,378 +235,186 @@ msgstr "Descrizione"
 msgid "Services"
 msgstr "Servizi"
 
-#: admin/systems/system-list.xml:209
+#: admin/systems/system-list.xml:71
 msgid "Release"
 msgstr "Versione"
 
-#: admin/systems/system-list.xml:217 admin/systems/serverService-list.xml:43
-#: admin/systems/phoneSelect/phoneSelect-list.xml:70
+#: admin/systems/system-list.xml:79 admin/systems/serverService-list.xml:43
 msgid "Actions"
 msgstr "Azioni"
 
-#: admin/systems/system-list.xml:228 admin/systems/serverService-list.xml:54
+#: admin/systems/system-list.xml:90 admin/systems/serverService-list.xml:54
 msgid "Create"
 msgstr "Crea"
 
-#: admin/systems/system-list.xml:258
-msgid "winStation"
-msgstr "PC Windows"
-
-#: admin/systems/system-list.xml:266
-msgid "Network printer"
-msgstr "Stampante di rete"
-
-#: admin/systems/system-list.xml:282
-#: admin/systems/class_componentGeneric.inc:41
-#: admin/systems/class_componentGeneric.inc:42
-msgid "Network device"
-msgstr "Periferica di rete"
-
-#: admin/systems/system-list.xml:290
-msgid "Mobile Phone"
-msgstr "Telefono cellulare"
-
-#: admin/systems/system-list.xml:310
+#: admin/systems/system-list.xml:100
 msgid "Trigger action"
 msgstr "Innesco azione"
 
-#: admin/systems/system-list.xml:317
+#: admin/systems/system-list.xml:107
 msgid "Schedule action"
 msgstr "Pianifica un'azione"
 
-#: admin/systems/system-list.xml:330
-msgid "Activate systems"
-msgstr "Attiva un sistema"
-
-#: admin/systems/system-list.xml:337 admin/systems/serverService-list.xml:69
-#: admin/systems/printer.tpl.c:35
+#: admin/systems/system-list.xml:119 admin/systems/serverService-list.xml:69
 msgid "Remove"
 msgstr "Elimina"
 
-#: admin/systems/system-list.xml:367
-msgid "Create ISO"
-msgstr "Crea un'immagine ISO"
-
-#: admin/systems/system-list.xml:379
+#: admin/systems/system-list.xml:150
 msgid "Edit system"
 msgstr ""
 
-#: admin/systems/system-list.xml:392
+#: admin/systems/system-list.xml:163
 msgid "Remove system"
 msgstr "Elimina il sistema"
 
-#: admin/systems/class_workstationGeneric.inc:75
-#, php-format
-msgid "Event %s is not available!"
-msgstr "L'evento '%s' non Ã¨ disponibile!"
-
-#: admin/systems/class_workstationGeneric.inc:78
-msgid "Events are not available!"
-msgstr "Gli eventi non sono disponibili!"
-
-#: admin/systems/class_workstationGeneric.inc:106
-msgid "(Re)Install"
-msgstr "(Re)Installa"
-
-#: admin/systems/class_workstationGeneric.inc:107
-msgid "Software update"
-msgstr "Aggiornamento del software"
-
-#: admin/systems/class_workstationGeneric.inc:115
-msgid "Wake up"
-msgstr "Risvegliare"
-
-#: admin/systems/class_workstationGeneric.inc:144
-#: admin/systems/class_printGeneric.inc:604
+#: admin/systems/class_workstationGeneric.inc:35
 msgid "workstation"
 msgstr "workstation"
 
-#: admin/systems/class_workstationGeneric.inc:151
-#: admin/systems/class_componentGeneric.inc:61
-#: admin/systems/class_mobilePhoneGeneric.inc:60
+#: admin/systems/class_workstationGeneric.inc:42
+#: admin/systems/class_printGeneric.inc:56
+#: admin/systems/class_componentGeneric.inc:55
+#: admin/systems/class_mobilePhoneGeneric.inc:56
 msgid "Properties"
 msgstr "ProprietÃ "
 
-#: admin/systems/class_workstationGeneric.inc:155
+#: admin/systems/class_workstationGeneric.inc:47
 #, php-format
 msgid "The name of the %s"
 msgstr "Il nome di %s"
 
-#: admin/systems/class_workstationGeneric.inc:161
+#: admin/systems/class_workstationGeneric.inc:52
 #, php-format
 msgid "A short description of the %s"
 msgstr "Una breve descrizione del %s"
 
-#: admin/systems/class_workstationGeneric.inc:166
-#: admin/systems/class_printGeneric.inc:1025
+#: admin/systems/class_workstationGeneric.inc:56
 msgid "Location"
 msgstr "LocalitÃ "
 
-#: admin/systems/class_workstationGeneric.inc:167
+#: admin/systems/class_workstationGeneric.inc:57
 #, php-format
 msgid "The location of the %s"
 msgstr "L'ubicazione di %s"
 
-#: admin/systems/class_workstationGeneric.inc:173
+#: admin/systems/class_workstationGeneric.inc:61
 #, php-format
 msgid "Lock this %s"
 msgstr "Blocca questo %s"
 
-#: admin/systems/class_workstationGeneric.inc:174
+#: admin/systems/class_workstationGeneric.inc:62
 #, php-format
 msgid "This will prevent the %s from being reinstalled"
 msgstr "Questo eviterÃ  che %s venga reinstallato"
 
-#: admin/systems/class_workstationGeneric.inc:185
-#: addons/dashboard/class_dashBoardSystems.inc:48
-msgid "Servers"
-msgstr "Servers"
-
-#: admin/systems/class_workstationGeneric.inc:190
-#, php-format
-msgid "The syslog server the %s should be using"
-msgstr "Dovrebbe essere usato il server syslog %s"
-
-#: admin/systems/class_workstationGeneric.inc:195
-msgid "Inherit NTP servers"
-msgstr "Eredita i server NTP"
-
-#: admin/systems/class_workstationGeneric.inc:196
-msgid "Inherit time server attributes from ogroup"
-msgstr "Eredita gli attributi del server ntp dal ogroup"
-
-#: admin/systems/class_workstationGeneric.inc:202
-msgid "NTP servers"
-msgstr "Servers NTP"
+#: admin/systems/class_workstationGeneric.inc:73
+#: admin/systems/class_printGeneric.inc:83
+#: admin/systems/class_componentGeneric.inc:69
+#: admin/systems/class_mobilePhoneGeneric.inc:102
+#: admin/systems/class_networkSettings.inc:1008
+msgid "Network settings"
+msgstr "Impostazioni di rete"
 
-#: admin/systems/class_workstationGeneric.inc:203
-#, php-format
-msgid "The NTP servers for the %s"
-msgstr "I servers NTP per %s"
+#: admin/systems/class_workstationGeneric.inc:78
+#: admin/systems/class_printGeneric.inc:87
+#: admin/systems/class_componentGeneric.inc:73
+#: admin/systems/class_mobilePhoneGeneric.inc:106
+#: admin/systems/class_networkSettings.inc:630
+#: admin/systems/class_networkSettings.inc:643
+#: admin/systems/class_networkSettings.inc:645
+#: admin/systems/class_networkSettings.inc:1014
+msgid "IP address"
+msgstr "Indirizzo IP"
 
-#: admin/systems/class_workstationGeneric.inc:209
-msgid "Inherit LDAP servers"
-msgstr "Eredita i servers LDAP"
+#: admin/systems/class_workstationGeneric.inc:78
+msgid "IP addresses this system uses (v4 or v6)"
+msgstr ""
 
-#: admin/systems/class_workstationGeneric.inc:210
-msgid "Inherit LDAP server attributes from ogroup"
-msgstr "Eredita gli attributi del server LDAP dal ogroup"
+#: admin/systems/class_workstationGeneric.inc:83
+#: admin/systems/class_printGeneric.inc:91
+#: admin/systems/class_componentGeneric.inc:77
+#: admin/systems/class_mobilePhoneGeneric.inc:110
+msgid "Mac address"
+msgstr "Indirizzo MAC"
 
-#: admin/systems/class_workstationGeneric.inc:216
-msgid "LDAP servers"
-msgstr "Servers LDAP"
+#: admin/systems/class_workstationGeneric.inc:83
+#: admin/systems/class_printGeneric.inc:91
+#: admin/systems/class_componentGeneric.inc:77
+#: admin/systems/class_mobilePhoneGeneric.inc:110
+msgid "Mac address of this system"
+msgstr ""
 
-#: admin/systems/class_workstationGeneric.inc:217
-#, php-format
-msgid "The LDAP servers for the %s"
-msgstr "I server LDAP per %s"
-
-#: admin/systems/class_workstationGeneric.inc:225
-#: admin/systems/class_workstationGeneric.inc:229
-#: admin/ogroups/goto/termgroup.tpl.c:41
-msgid "Action"
-msgstr "Azione"
-
-#: admin/systems/class_workstationGeneric.inc:230
-#: admin/ogroups/goto/termgroup.tpl.c:44
-msgid "Select action to execute for this terminal"
-msgstr "Seleziona l'azione da eseguire per questo terminale"
-
-#: admin/systems/class_workstationGeneric.inc:236
-#: admin/systems/class_componentGeneric.inc:75
-#: admin/systems/class_mobilePhoneGeneric.inc:106
-#: admin/systems/class_networkSettings.inc:1016
-msgid "Network settings"
-msgstr "Impostazioni di rete"
+#: admin/systems/class_workstationGeneric.inc:125
+#: admin/systems/class_workstationGeneric.inc:130
+#: admin/systems/class_workstationGeneric.inc:131
+msgid "Workstation"
+msgstr "Workstation"
 
-#: admin/systems/class_workstationGeneric.inc:459
+#: admin/systems/class_workstationGeneric.inc:126
 msgid "Workstation information"
 msgstr ""
 
-#: admin/systems/class_printGeneric.inc:131
-#: admin/systems/class_printGeneric.inc:1065
-#: admin/systems/class_systemManagement.inc:678
-msgid "Internal error"
-msgstr "Errore interno"
-
-#: admin/systems/class_printGeneric.inc:131
-#, php-format
-msgid ""
-"Cannot determine a valid department for this object. Setting base to '%s'!"
-msgstr "Impossibile determinare un dipartimento valido per questo oggetto. Impostato di base a '%s'!"
-
-#: admin/systems/class_printGeneric.inc:311
-#: admin/systems/class_printGeneric.inc:319
-#: admin/systems/class_printGeneric.inc:324
-#: admin/systems/class_printGeneric.inc:374
-#: admin/systems/class_printGeneric.inc:390
-#: admin/systems/class_printGeneric.inc:393
-msgid "Add printer extension"
-msgstr "Aggiungi un'estensione della stampante"
-
-#: admin/systems/class_printGeneric.inc:312
-msgid ""
-"Could not initialize printer tab, parameter parent was missing while "
-"construction."
-msgstr "Impossibile inizializzare la linguetta della stampante, parametro genitore mancante al momento della costruzione."
-
-#: admin/systems/class_printGeneric.inc:320
-msgid "This is a workstation template, printer tab is disabled."
-msgstr "Si tratta di un modello di workstation, la linguetta della stampante Ã¨ disabilitata."
-
-#: admin/systems/class_printGeneric.inc:325
-msgid "This is a terminal template, printer tab is disabled."
-msgstr "Si tratta di un modello di terminale, la linguetta della stampante Ã¨ disabilitata."
-
-#: admin/systems/class_printGeneric.inc:367
-#: admin/systems/class_printGeneric.inc:375
-#: admin/systems/class_printGeneric.inc:383
-#: admin/systems/class_printGeneric.inc:386
-#: admin/systems/class_printGeneric.inc:391
-#: admin/systems/class_printGeneric.inc:394
-msgid "printer"
-msgstr "stampante"
-
-#: admin/systems/class_printGeneric.inc:375
-msgid ""
-"You can't enable it while 'cn' is not present in entry. Possibly you are "
-"currently creating a new terminal template."
-msgstr "Non posso abilitarlo fin quando 'cn' non sarÃ  presente nell'entry. Forse , stai attualmente creando un nuovo modello di terminale."
-
-#: admin/systems/class_printGeneric.inc:382
-#: admin/systems/class_printGeneric.inc:385
-msgid "Remove printer extension"
-msgstr "Rimuovi un'estensione della stampante"
-
-#: admin/systems/class_printGeneric.inc:474
-#: admin/systems/class_printGeneric.inc:652
-#: admin/systems/class_printGeneric.inc:659
-#: admin/systems/class_printGeneric.inc:718
-#: admin/systems/class_printGeneric.inc:1105
-#: admin/systems/class_printGeneric.inc:1116
-#: admin/systems/class_serverService.inc:224
-#: admin/systems/class_serverService.inc:270
-#: admin/systems/class_serverService.inc:393
-#: admin/systems/class_systemManagement.inc:341
-#: admin/systems/class_systemManagement.inc:624
-#: admin/systems/class_systemManagement.inc:639
-#: admin/systems/services/shares/class_serviceShare.inc:103
-#: admin/systems/class_networkSettings.inc:305
-#: admin/systems/class_networkSettings.inc:336
-#: admin/systems/class_networkSettings.inc:584
-#: admin/systems/class_networkSettings.inc:591
-#: admin/systems/class_networkSettings.inc:597
-#: admin/systems/class_networkSettings.inc:604
-msgid "Error"
-msgstr "Errore"
+#: admin/systems/class_printGeneric.inc:32
+#: admin/systems/class_printGeneric.inc:37
+#: admin/systems/class_printGeneric.inc:38
+msgid "Printer"
+msgstr "Stampante"
 
-#: admin/systems/class_printGeneric.inc:577
-#, php-format
-msgid "Your currently selected PPD file '%s' doesn't exist."
-msgstr "Il file PPD '%s' che hai selezionato non esiste."
+#: admin/systems/class_printGeneric.inc:33
+msgid "Printer information"
+msgstr ""
 
-#: admin/systems/class_printGeneric.inc:583
-msgid "Not defined"
-msgstr "Non definito"
+#: admin/systems/class_printGeneric.inc:60
+msgid "The name of the printer"
+msgstr ""
 
-#: admin/systems/class_printGeneric.inc:587
-#: admin/systems/ppd/class_printerPPDDialog.inc:116
-msgid "Can't get ppd informations."
-msgstr "Impossibile avere informazioni sul ppd."
+#: admin/systems/class_printGeneric.inc:64
+msgid "A short description of the printer"
+msgstr ""
 
-#: admin/systems/class_printGeneric.inc:602
-#: admin/systems/class_printGeneric.inc:604
-#, php-format
-msgid "This printer belongs to %s. You can't rename this printer."
-msgstr "Questa stampante appartiene a %s. Non puoi rinominare questa stampante."
+#: admin/systems/class_printGeneric.inc:70
+msgid "Details"
+msgstr "Dettagli"
 
-#: admin/systems/class_printGeneric.inc:602
-#: admin/systems/class_terminalGeneric.inc:34
-msgid "terminal"
-msgstr "terminale"
+#: admin/systems/class_printGeneric.inc:73
+msgid "Printer location"
+msgstr "Ubicazione della stampante"
 
-#: admin/systems/class_printGeneric.inc:652
-#: admin/systems/class_printGeneric.inc:659
-msgid "Object is no printer!"
-msgstr "L'oggetto non Ã¨ una stampante!"
+#: admin/systems/class_printGeneric.inc:73
+msgid "The location of the printer"
+msgstr ""
 
-#: admin/systems/class_printGeneric.inc:767 admin/systems/printer.tpl.c:23
+#: admin/systems/class_printGeneric.inc:77
 msgid "Printer URL"
 msgstr "URL della stampante"
 
-#: admin/systems/class_printGeneric.inc:989
-#: admin/systems/class_printGeneric.inc:991
-msgid "Group"
-msgstr "Gruppo"
-
-#: admin/systems/class_printGeneric.inc:994
-msgid "User"
-msgstr "Utente"
-
-#: admin/systems/class_printGeneric.inc:1006
-msgid "Printer information"
+#: admin/systems/class_printGeneric.inc:77
+msgid "The URL of the printer"
 msgstr ""
 
-#: admin/systems/class_printGeneric.inc:1023
-#: admin/systems/serverService-list.tpl.c:2
-#: admin/systems/phoneSelect/phoneSelect-list.tpl.c:2
-#: admin/systems/printer.tpl.c:11
-msgid "Base"
-msgstr "Base"
-
-#: admin/systems/class_printGeneric.inc:1026
-msgid "LabeledURL"
-msgstr "URL della stampante"
-
-#: admin/systems/class_printGeneric.inc:1027
-msgid "Printer PPD"
-msgstr "PPD stampante"
-
-#: admin/systems/class_printGeneric.inc:1028 admin/systems/printer.tpl.c:38
-msgid "Permissions"
-msgstr "Autorizzazioni"
-
-#: admin/systems/class_printGeneric.inc:1030
-msgid "Windows inf file"
-msgstr "File inf del driver"
-
-#: admin/systems/class_printGeneric.inc:1031
-msgid "Windows driver dir"
-msgstr "Cartella del driver"
-
-#: admin/systems/class_printGeneric.inc:1032 admin/systems/printer.tpl.c:62
-msgid "Driver printer name"
-msgstr "Nome del driver della stampante"
-
-#: admin/systems/class_printGeneric.inc:1048
-#: admin/systems/class_printGeneric.inc:1070
-msgid "Permission error"
-msgstr "Errore d'autorizzazione"
-
-#: admin/systems/class_printGeneric.inc:1048
-#: admin/systems/class_printGeneric.inc:1070
-msgid "printer user"
-msgstr "utilizzatore stampante"
-
-#: admin/systems/class_printGeneric.inc:1065
-#, php-format
-msgid "Illegal member type '%s'!"
-msgstr "Tipo di membro non valido '%s'!"
-
-#: admin/systems/class_printGeneric.inc:1105
-#, php-format
-msgid "'%s' is already used!"
-msgstr "'%s' Ã¨ giÃ  in corso d'uso!"
-
-#: admin/systems/class_printGeneric.inc:1116
-#, php-format
-msgid "'%s' does not exist!"
-msgstr "'%s' non esiste!"
+#: admin/systems/class_printGeneric.inc:87
+#: admin/systems/class_componentGeneric.inc:73
+#: admin/systems/class_mobilePhoneGeneric.inc:106
+msgid "IP address this system uses"
+msgstr ""
 
 #: admin/systems/class_serverService.inc:58
 msgid "Server services"
 msgstr "Servizi del server"
 
+#: admin/systems/class_serverService.inc:224
+#: admin/systems/class_serverService.inc:270
+#: admin/systems/class_serverService.inc:393
+#: admin/systems/services/shares/class_serviceShare.inc:103
+#: admin/systems/class_networkSettings.inc:297
+#: admin/systems/class_networkSettings.inc:328
+#: admin/systems/class_networkSettings.inc:576
+#: admin/systems/class_networkSettings.inc:583
+#: admin/systems/class_networkSettings.inc:589
+#: admin/systems/class_networkSettings.inc:596
+msgid "Error"
+msgstr "Errore"
+
 #: admin/systems/class_serverService.inc:332
 msgid "Filter error"
 msgstr "Errore di filtro"
@@ -716,217 +438,20 @@ msgstr "Impossibile aggiornare lo stato del servizio prima che questo venga regi
 msgid "Could not get execute action %s on service %s."
 msgstr "Impossibile eseguire l'azione %s sul servizio %s "
 
-#: admin/systems/class_terminalGeneric.inc:42
-#, 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:31
+msgid "terminal"
+msgstr "terminale"
 
+#: admin/systems/class_terminalGeneric.inc:43
 #: admin/systems/class_terminalGeneric.inc:48
-#, 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:54
-msgid "Remote desktop"
-msgstr "Desktop a distanza"
-
-#: admin/systems/class_terminalGeneric.inc:58
-msgid "Connect method"
-msgstr "Metodo di connessione"
-
-#: admin/systems/class_terminalGeneric.inc:62
-msgid "XDMCP"
-msgstr "XDMCP"
-
-#: admin/systems/class_terminalGeneric.inc:62
-msgid "LDM"
-msgstr "LDM"
-
-#: admin/systems/class_terminalGeneric.inc:62
-msgid "Shell"
-msgstr "Shell"
-
-#: admin/systems/class_terminalGeneric.inc:62
-msgid "Telnet"
-msgstr "Telnet"
-
-#: admin/systems/class_terminalGeneric.inc:62
-msgid "Windows RDP"
-msgstr "Windows RDP"
-
-#: admin/systems/class_terminalGeneric.inc:66
-msgid "Terminal server"
-msgstr "Server terminale"
+#: admin/systems/class_terminalGeneric.inc:49
+msgid "Terminal"
+msgstr "Terminale"
 
-#: admin/systems/class_terminalGeneric.inc:82
+#: admin/systems/class_terminalGeneric.inc:44
 msgid "Terminal information"
 msgstr ""
 
-#: admin/systems/ppd/class_printerPPDSelectionDialog.inc:91
-#: admin/systems/ppd/class_printerPPDSelectionDialog.inc:116
-#: admin/systems/ppd/class_printerPPDSelectionDialog.inc:139
-#: admin/systems/ppd/class_printerPPDDialog.inc:92
-#: admin/systems/ppd/class_printerPPDDialog.inc:160
-#: admin/systems/ppd/class_printerPPDDialog.inc:241
-#: admin/systems/ppd/class_printerPPDDialog.inc:256
-#: admin/systems/ppd/class_printerPPDDialog.inc:269
-#: admin/systems/ppd/class_printerPPDDialog.inc:297
-#: admin/systems/ppd/class_printerPPDDialog.inc:314
-#: admin/systems/ppd/class_printerPPDDialog.inc:337
-#: admin/systems/ppd/class_printerPPDDialog.inc:351
-#: admin/systems/ppd/class_printerPPDDialog.inc:361
-#: admin/systems/ppd/class_printerPPDDialog.inc:365
-#: admin/systems/ppd/class_printerPPDDialog.inc:560
-#: admin/systems/ppd/class_printerPPDDialog.inc:577
-#: admin/systems/ppd/class_printerPPDDialog.inc:580
-#: admin/systems/ppd/class_printerPPDDialog.inc:583
-msgid "PPD error"
-msgstr "Errore PPD"
-
-#: admin/systems/ppd/class_printerPPDSelectionDialog.inc:139
-#, php-format
-msgid "Cannot locate vendor '%s' in available PPDs!"
-msgstr "Non trovo il venditore '%s' del PPD disponibile!"
-
-#: admin/systems/ppd/class_printerPPDSelectionDialog.inc:148
-msgid "Printer ppd selection."
-msgstr "Selezione del ppd della stampante"
-
-#: admin/systems/ppd/class_printerPPDSelectionDialog.inc:155
-msgid "delete"
-msgstr "elimina"
-
-#: admin/systems/ppd/class_printerPPDSelectionDialog.inc:166
-msgid "back"
-msgstr "Indietro"
-
-#: admin/systems/ppd/class_printerPPDDialog.inc:74
-#: admin/systems/ppd/class_printerPPDDialog.inc:140
-#: admin/systems/services/class_goService.inc:241
-msgid "Configuration error"
-msgstr "Errore di configurazione"
-
-#: admin/systems/ppd/class_printerPPDDialog.inc:92
-#, php-format
-msgid "Cannot open PPD '%s'!"
-msgstr "Impossibile aprire il file PPD '%s'!"
-
-#: admin/systems/ppd/class_printerPPDDialog.inc:141
-#, php-format
-msgid "Cannot open PPD path '%s' for reading and writing!"
-msgstr "Impossibile aprire il cammino '%s' PPD in lettura e scrittura!"
-
-#: admin/systems/ppd/class_printerPPDDialog.inc:160
-#: admin/systems/ppd/class_printerPPDDialog.inc:365
-msgid "file is empty"
-msgstr "il file Ã¨ vuoto"
-
-#: admin/systems/ppd/class_printerPPDDialog.inc:314
-#, php-format
-msgid "Cannot parse PPD '%s'!"
-msgstr "Impossibile analizzare PPD '%s'!"
-
-#: admin/systems/ppd/class_printerPPDDialog.inc:340
-msgid "Overwrite existing PPD"
-msgstr "Sovrascrivi il ppd esistente"
-
-#: admin/systems/ppd/class_printerPPDDialog.inc:341
-msgid ""
-"There is already a ppd file for this kind of printer. Do you want to "
-"overwrite it?"
-msgstr "Esiste giÃ  un file PPD per questo tipo di stampante. Vuoi sovrascriverlo?"
-
-#: admin/systems/ppd/class_printerPPDDialog.inc:491
-msgid "Section"
-msgstr "Sezione"
-
-#: admin/systems/ppd/class_printerPPDDialog.inc:551
-#: admin/systems/ppd/class_printerPPDDialog.inc:554
-msgid "True"
-msgstr "Vero"
-
-#: admin/systems/ppd/class_printerPPDDialog.inc:552
-#: admin/systems/ppd/class_printerPPDDialog.inc:555
-msgid "False"
-msgstr "Falso"
-
-#: admin/systems/ppd/class_printerPPDDialog.inc:560
-#, php-format
-msgid "PPD type '%s' is not supported!"
-msgstr "Il tipo '%s' di PPD non Ã¨ supportato!"
-
-#: admin/systems/ppd/class_printerPPDDialog.inc:597
-msgid ""
-"Please select a valid ppd file or use 'Cancel' to go back to printer "
-"configuration."
-msgstr "Seleziona un file PPD valido o utilizza 'Annulla' per tornare alla configurazione della stampante."
-
-#: admin/systems/ppd/class_ppdManager.inc:44
-#: admin/systems/ppd/class_ppdManager.inc:188
-#: admin/systems/ppd/class_ppdManager.inc:190
-msgid "PPD manager error"
-msgstr "Errore manager PPD"
-
-#: admin/systems/ppd/class_ppdManager.inc:44
-#, php-format
-msgid "The specified path '%s' does not exist."
-msgstr "Il path '%s' specificato, non esiste."
-
-#: admin/systems/ppd/class_ppdManager.inc:188
-#, php-format
-msgid "Specified PPD file '%s' cannot be opened for reading."
-msgstr "Il file PPD '%s' specificato non puÃ³ essere aperto in lettura."
-
-#: admin/systems/ppd/class_ppdManager.inc:190
-#, php-format
-msgid "The temporary file '%s' cannot be opened for writing."
-msgstr "Il file temporaneo '%s' non puÃ³ essere aperto in scrittura."
-
-#: admin/systems/ppd/class_ppdManager.inc:212
-#: admin/systems/ppd/class_ppdManager.inc:350
-msgid "Parsing PPD file failed - file is empty!"
-msgstr "L'analisi del file PPD non Ã¨ riuscita - il file Ã¨ vuoto!"
-
-#: admin/systems/ppd/class_ppdManager.inc:222
-#, php-format
-msgid ""
-"Parsing PPD file %s failed - line too long. Trailing characters have been "
-"ignored!"
-msgstr "L'analisi del file PPD %s non Ã¨ riuscita - riga troppo lunga. I caratteri finali sono stati ignorati!"
-
-#: admin/systems/ppd/class_ppdManager.inc:230
-msgid "Nested groups are not supported!"
-msgstr "I gruppi nidificati non sono supportati!"
-
-#: admin/systems/ppd/class_ppdManager.inc:234
-msgid "Group name not unique!"
-msgstr "Nome del gruppo non unico!"
-
-#: admin/systems/ppd/class_ppdManager.inc:240
-#: admin/systems/ppd/class_ppdManager.inc:270
-msgid "Symbol values are not supported yet!"
-msgstr "I valori dei simboli non sono ancora supportati!"
-
-#: admin/systems/ppd/class_ppdManager.inc:264
-msgid "Nested options are not supported!"
-msgstr "Le opzioni nidificate non sono supportate!"
-
-#: admin/systems/ppd/class_ppdManager.inc:289
-msgid "PickMany is not supported yet!"
-msgstr "PickMany non Ã¨ ancora supportato!"
-
-#: admin/systems/ppd/class_ppdManager.inc:370
-#, php-format
-msgid ""
-"Parsing PPD file %s failed - line too long. Trailing characters have been "
-"ignored"
-msgstr "L'analisi del file PPD %s non Ã¨ riuscita - riga troppo lunga. I caratteri finali sono stati ignorati"
-
-#: admin/systems/ppd/class_ppdManager.inc:395
-#, php-format
-msgid "Parsing PPD file %s failed - no information found."
-msgstr "L'analisi del file PPD %s non Ã¨ riuscita - nessuna informazione Ã¨ stata trovata!"
-
 #: admin/systems/class_systemImport.inc:72
 #, php-format
 msgid "Could not parse %s"
@@ -946,83 +471,130 @@ msgstr "Nessun server DNS trovato per la zona %s"
 msgid "Import"
 msgstr "Importa"
 
+#: admin/systems/class_systemImport.inc:169
+#: admin/systems/class_serverGeneric.inc:43
+#: admin/systems/class_serverGeneric.inc:48
+#: admin/systems/class_serverGeneric.inc:49
+msgid "Server"
+msgstr "Server"
+
 #: admin/systems/class_systemImport.inc:169
 msgid "The server you wish to import hosts from"
 msgstr ""
 
-#: admin/systems/class_serverGeneric.inc:34
+#: admin/systems/class_serverGeneric.inc:31
 msgid "server"
 msgstr "server"
 
-#: admin/systems/class_serverGeneric.inc:47
+#: admin/systems/class_serverGeneric.inc:44
 msgid "Server information"
 msgstr ""
 
-#: admin/systems/class_componentGeneric.inc:37
+#: admin/systems/class_componentGeneric.inc:31
+msgid "Component"
+msgstr "Componente"
+
+#: admin/systems/class_componentGeneric.inc:32
 msgid "Component information"
 msgstr ""
 
-#: admin/systems/class_componentGeneric.inc:64
+#: admin/systems/class_componentGeneric.inc:36
+#: admin/systems/class_componentGeneric.inc:37
+msgid "Network device"
+msgstr "Periferica di rete"
+
+#: admin/systems/class_componentGeneric.inc:58
 msgid "The name of the component"
 msgstr "Il nome del componente"
 
-#: admin/systems/class_componentGeneric.inc:68
+#: admin/systems/class_componentGeneric.inc:62
 msgid "A short description of the component"
 msgstr "Una breve descrizione del componente"
 
+#: admin/systems/class_systemServers.inc:31
+#: admin/systems/class_systemServers.inc:53
+msgid "Servers"
+msgstr "Servers"
+
+#: admin/systems/class_systemServers.inc:35
+msgid "The syslog server the system should be using"
+msgstr ""
+
+#: admin/systems/class_systemServers.inc:40
+msgid "NTP servers"
+msgstr "Servers NTP"
+
+#: admin/systems/class_systemServers.inc:40
+msgid "The NTP servers for this system"
+msgstr ""
+
+#: admin/systems/class_systemServers.inc:54
+msgid "Servers this system is using"
+msgstr ""
+
+#: admin/systems/class_mobilePhoneGeneric.inc:32
 #: admin/systems/class_mobilePhoneGeneric.inc:37
+#: admin/systems/class_mobilePhoneGeneric.inc:38
+msgid "Mobile phone"
+msgstr "Numero di cellulare"
+
+#: admin/systems/class_mobilePhoneGeneric.inc:33
 msgid "Mobile phone information"
 msgstr ""
 
-#: admin/systems/class_mobilePhoneGeneric.inc:63
+#: admin/systems/class_mobilePhoneGeneric.inc:60
 msgid "The name of the mobile phone"
 msgstr "Il nome del telefonino"
 
-#: admin/systems/class_mobilePhoneGeneric.inc:67
+#: admin/systems/class_mobilePhoneGeneric.inc:64
 msgid "A short description of the mobile phone"
 msgstr "Una breve descrizione del telefono cellulare"
 
-#: admin/systems/class_mobilePhoneGeneric.inc:77
+#: admin/systems/class_mobilePhoneGeneric.inc:70
+msgid "Phone"
+msgstr "Telefono"
+
+#: admin/systems/class_mobilePhoneGeneric.inc:73
 msgid "Serial Number"
 msgstr "Numero di serie"
 
-#: admin/systems/class_mobilePhoneGeneric.inc:77
+#: admin/systems/class_mobilePhoneGeneric.inc:73
 msgid "The serial number of the mobile phone"
 msgstr "Il numero di serie del telefono cellulare"
 
-#: admin/systems/class_mobilePhoneGeneric.inc:81
+#: admin/systems/class_mobilePhoneGeneric.inc:77
 msgid "IMEI Number"
 msgstr "Numero IMEI"
 
-#: admin/systems/class_mobilePhoneGeneric.inc:81
+#: admin/systems/class_mobilePhoneGeneric.inc:77
 msgid "The IMEI number of the mobile phone"
 msgstr "Il numero IMEI del telefono cellulare"
 
-#: admin/systems/class_mobilePhoneGeneric.inc:86
+#: admin/systems/class_mobilePhoneGeneric.inc:82
 msgid "OS"
 msgstr "Sistema Operativo"
 
-#: admin/systems/class_mobilePhoneGeneric.inc:86
+#: admin/systems/class_mobilePhoneGeneric.inc:82
 msgid "The Operating System installed on this phone"
 msgstr "Il sistema operativo installato su questo telefono"
 
-#: admin/systems/class_mobilePhoneGeneric.inc:92
+#: admin/systems/class_mobilePhoneGeneric.inc:88
 msgid "SimCard"
 msgstr "Carta Sim"
 
-#: admin/systems/class_mobilePhoneGeneric.inc:95
+#: admin/systems/class_mobilePhoneGeneric.inc:91
 msgid "Telephone Number"
 msgstr "Numero di telefono"
 
-#: admin/systems/class_mobilePhoneGeneric.inc:95
+#: admin/systems/class_mobilePhoneGeneric.inc:91
 msgid "The telephone number of the mobile phone"
 msgstr "Il numero di telefono di questo telefono cellulare"
 
-#: admin/systems/class_mobilePhoneGeneric.inc:99
+#: admin/systems/class_mobilePhoneGeneric.inc:95
 msgid "PUK Number"
 msgstr "Numero PUK"
 
-#: admin/systems/class_mobilePhoneGeneric.inc:99
+#: admin/systems/class_mobilePhoneGeneric.inc:95
 msgid "The PUK number of the simcard in this mobile phone"
 msgstr "Il numero PUK della carta sim di questo telefono cellulare"
 
@@ -1065,70 +637,20 @@ msgstr "Modifica i servizi"
 msgid "Remove service"
 msgstr "Elimina il servizio"
 
-#: admin/systems/phoneSelect/phoneSelect-list.xml:10
-msgid "Please select the desired entries"
-msgstr "Seleziona le entries desiderate"
-
-#: admin/systems/phoneSelect/phoneSelect-list.xml:56
-msgid "Number"
-msgstr "Numero"
-
-#: admin/systems/phoneSelect/phoneSelect-list.xml:83
-msgid "Select this number"
-msgstr "Seleziona questo numero"
-
-#: admin/systems/class_systemManagement.inc:177
-msgid "Back"
-msgstr "Indietro"
-
-#: admin/systems/class_systemManagement.inc:223
-msgid "Creating the image failed. Please see the report below."
-msgstr "La creazione del'immagine non Ã¨ riuscita. Leggi il rapporto che segue."
-
-#: admin/systems/class_systemManagement.inc:228
-#, php-format
-msgid "Command '%s', specified for ISO creation doesn't seem to exist."
-msgstr "Il comando '%s', specificato nella creazione dell'immagine ISO, non sembra esistere."
-
-#: admin/systems/class_systemManagement.inc:398
-#: admin/systems/class_systemManagement.inc:473
-#: admin/systems/class_systemManagement.inc:858
-#: admin/systems/class_systemManagement.inc:905
-#: admin/systems/class_systemManagement.inc:926
-msgid "Permission"
-msgstr "Autorizzazioni"
-
-#: admin/systems/class_systemManagement.inc:678
-msgid "Cannot set mode to 'active'!"
-msgstr "Impossibile impostare la modalitÃ  su 'Attiva' !"
-
-#: admin/systems/class_systemManagement.inc:858
-#, php-format
-msgid "You are not allowed to create a snapshot for %s."
-msgstr "Non sei autorizzato a creare una 'copia instantanea' di %s."
-
-#: admin/systems/class_systemManagement.inc:905
-#: admin/systems/class_systemManagement.inc:926
-#, php-format
-msgid "You are not allowed to restore a snapshot for %s."
-msgstr "Non sei autorizzato a restaurare una 'copia instantanea' di %s."
-
-#: admin/systems/class_systemManagement.inc:1169
-#, php-format
-msgid "Inherited from %s"
-msgstr "Ereditato da %s"
-
-#: admin/systems/class_systemManagement.inc:1224
-#: admin/systems/class_systemManagement.inc:1228
-#: addons/dashboard/class_dashBoardSystems.inc:199
+#: admin/systems/class_systemManagement.inc:48
 #: config/systems/class_systemsPluginConfig.inc:28
 msgid "Systems"
 msgstr "Sistemi"
 
-#: admin/systems/class_systemManagement.inc:1225
+#: admin/systems/class_systemManagement.inc:49
 msgid "Systems Management"
 msgstr "Gestione dei sistemi"
 
+#: admin/systems/class_systemManagement.inc:250
+#, php-format
+msgid "Inherited from %s"
+msgstr "Ereditato da %s"
+
 #: admin/systems/services/terminal/class_serviceTerminal.inc:29
 #: admin/systems/services/terminal/class_serviceTerminal.inc:30
 #: admin/systems/services/terminal/class_serviceTerminal.inc:41
@@ -1166,6 +688,10 @@ msgstr "Cups"
 msgid "Empty service"
 msgstr "Servizio vuoto"
 
+#: admin/systems/services/class_goService.inc:241
+msgid "Configuration error"
+msgstr "Errore di configurazione"
+
 #: admin/systems/services/shares/class_serviceShare.inc:30
 #: admin/systems/services/shares/class_serviceShare.inc:31
 msgid "Share service"
@@ -1224,8 +750,6 @@ msgid "You need to configure encodings first"
 msgstr "Ãˆ necessario configurare prima le codifiche"
 
 #: admin/systems/services/shares/class_serviceShare.inc:110
-#: admin/ogroups/goto/termgroup.tpl.c:2 admin/systems/remove.tpl.c:2
-#: admin/systems/ppd/remove_ppd.tpl.c:2
 msgid "Warning"
 msgstr "Avvertimento"
 
@@ -1351,153 +875,93 @@ msgstr "Specifica se il Certificate Revocation List (CRL) del CA dovrebbe essere
 msgid "LDAP"
 msgstr "LDAP"
 
-#: admin/systems/class_networkSettings.inc:305
+#: admin/systems/class_networkSettings.inc:297
 msgid "NOT IMPLEMENTED"
 msgstr "NON IMPLEMENTATO"
 
-#: admin/systems/class_networkSettings.inc:437
+#: admin/systems/class_networkSettings.inc:429
 msgid "Not matching"
 msgstr "Nessuna corrispondenza"
 
-#: admin/systems/class_networkSettings.inc:584
+#: admin/systems/class_networkSettings.inc:576
 #, php-format
 msgid "Was not able to contact argonaut server: %s"
 msgstr "Non Ã¨ stato in grado di contattare il server argonaut: %s"
 
-#: admin/systems/class_networkSettings.inc:591
+#: admin/systems/class_networkSettings.inc:583
 #, php-format
 msgid "Was not able to find DNS server for zone %s"
 msgstr "Non Ã¨ stato in grado di trovare il server DNS per la zona %s"
 
-#: admin/systems/class_networkSettings.inc:597
+#: admin/systems/class_networkSettings.inc:589
 #, php-format
 msgid "Was not able to find mac address of DNS server %s"
 msgstr "Non Ã¨ stato in grado di trovare l'indirizzo mac del server DNS %s"
 
-#: admin/systems/class_networkSettings.inc:604
+#: admin/systems/class_networkSettings.inc:596
 #, php-format
 msgid "Was not able to launch ldap2zone: %s"
 msgstr "Non Ã¨ stato in grado di avviare ldap2zone: %s"
 
-#: admin/systems/class_networkSettings.inc:630
+#: admin/systems/class_networkSettings.inc:622
 #, php-format
 msgid "IP address %s"
 msgstr "Indirizzo IP %s"
 
-#: admin/systems/class_networkSettings.inc:638
-#: admin/systems/class_networkSettings.inc:651
-#: admin/systems/class_networkSettings.inc:653
-#: admin/systems/class_networkSettings.inc:1022
-msgid "IP address"
-msgstr "Indirizzo IP"
-
-#: admin/systems/class_networkSettings.inc:644
-#: admin/systems/class_networkSettings.inc:660
-#: admin/systems/class_networkSettings.inc:662
-#: admin/systems/class_networkSettings.inc:1023
+#: admin/systems/class_networkSettings.inc:636
+#: admin/systems/class_networkSettings.inc:652
+#: admin/systems/class_networkSettings.inc:654
+#: admin/systems/class_networkSettings.inc:1015
 msgid "MAC address"
 msgstr "Indirizzo MAC"
 
-#: admin/systems/class_networkSettings.inc:676
+#: admin/systems/class_networkSettings.inc:668
 #, php-format
 msgid "The IP address '%s' is not part of the selected reverse zone '%s'!"
 msgstr "L'indirizzo IP specificato '%s' non ha corrispondenze nella zona inversa selezionata '%s' !"
 
-#: admin/systems/class_networkSettings.inc:686
+#: admin/systems/class_networkSettings.inc:678
 #, php-format
 msgid "Record type '%s' is duplicated!"
 msgstr "Il record di tipo '%s' Ã¨ un duplicato !"
 
-#: admin/systems/class_networkSettings.inc:693
+#: admin/systems/class_networkSettings.inc:685
 #, php-format
 msgid "Uniq record type '%s' is duplicated!"
 msgstr "Il record di tipo '%s' Ã¨ un duplicato !"
 
-#: admin/systems/class_networkSettings.inc:705
+#: admin/systems/class_networkSettings.inc:697
 #, php-format
 msgid ""
 "The IP address '%s' will be added as 'A Record', this will be done "
 "automatically, please remove the record."
 msgstr "L'indirizzo IP '%s' sarÃ  aggiunto come 'A' record, l'operazione sarÃ  automatica quindi elimina il record."
 
-#: admin/systems/class_networkSettings.inc:712
+#: admin/systems/class_networkSettings.inc:704
 #, php-format
 msgid "Only lowercase records are allowed, please check your '%ss'."
 msgstr "Solo i caratteri minuscoli sono autorizzati, verifica il tuo '%ss'."
 
-#: admin/systems/class_networkSettings.inc:978
+#: admin/systems/class_networkSettings.inc:970
 msgid "Delete"
 msgstr "Elimina"
 
-#: admin/systems/class_networkSettings.inc:984
+#: admin/systems/class_networkSettings.inc:976
 msgid "Add"
 msgstr "Aggiungi"
 
-#: admin/systems/class_networkSettings.inc:1015
-#: addons/dashboard/class_dashBoardNetwork.inc:127
+#: admin/systems/class_networkSettings.inc:1007
 msgid "Network"
 msgstr "Rete"
 
-#: admin/systems/class_networkSettings.inc:1030
+#: admin/systems/class_networkSettings.inc:1022
 msgid "DNS configuration"
 msgstr "Configurazione del DNS"
 
-#: admin/systems/class_networkSettings.inc:1033
+#: admin/systems/class_networkSettings.inc:1025
 msgid "DHCP configuration"
 msgstr "Configurazione del DHCP"
 
-#: addons/dashboard/class_dashBoardSystems.inc:45
-msgid "Workstations"
-msgstr "Workstations"
-
-#: addons/dashboard/class_dashBoardSystems.inc:51
-msgid "Windows Workstations"
-msgstr "Workstations Windows"
-
-#: addons/dashboard/class_dashBoardSystems.inc:54
-msgid "Terminals"
-msgstr "Terminali"
-
-#: addons/dashboard/class_dashBoardSystems.inc:57
-msgid "Printers"
-msgstr "Stampanti"
-
-#: addons/dashboard/class_dashBoardSystems.inc:60
-msgid "Phones"
-msgstr "Telefoni"
-
-#: addons/dashboard/class_dashBoardSystems.inc:63
-msgid "Components"
-msgstr "Componenti"
-
-#: addons/dashboard/class_dashBoardSystems.inc:66
-msgid "Mobile phones"
-msgstr "Telefono cellulare"
-
-#: addons/dashboard/class_dashBoardSystems.inc:183
-msgid "Statistics"
-msgstr "Statistiche"
-
-#: addons/dashboard/class_dashBoardSystems.inc:188
-msgid "Computer name to use by unit"
-msgstr "Nome del computer da usare per unitÃ "
-
-#: addons/dashboard/class_dashBoardSystems.inc:200
-msgid "Statistics and informations about systems"
-msgstr "Statistiche e informazioni sui sistemi"
-
-#: addons/dashboard/class_dashBoardNetwork.inc:111
-msgid "DHCP"
-msgstr "DHCP"
-
-#: addons/dashboard/class_dashBoardNetwork.inc:116
-msgid "DNS"
-msgstr "DNS"
-
-#: addons/dashboard/class_dashBoardNetwork.inc:128
-msgid "Statistics and various informations"
-msgstr "Statistiche e informazioni varie"
-
 #: config/systems/class_systemsPluginConfig.inc:29
 msgid "Systems plugin configuration"
 msgstr "Configurazione del plugin systems"
@@ -1589,404 +1053,3 @@ msgstr "Il nome visualizzato per la codifica"
 #: config/systems/class_systemsPluginConfig.inc:101
 msgid "Encodings"
 msgstr "Codifiche"
-
-#: admin/ogroups/goto/termgroup.tpl.c:5
-msgid ""
-"Actions you choose here influence all systems in this object group. "
-"Additionally, all values editable here can be inherited by the clients "
-"assigned to this object group."
-msgstr "Le azioni che si scelgono qui influenzano tutti i sistemi in questo gruppo di oggetti. Inoltre, tutti i valori modificabili qui possono essere ereditati dai clienti assegnati a questo gruppo di oggetti."
-
-#: admin/ogroups/goto/termgroup.tpl.c:8
-msgid "Generic"
-msgstr "Informazioni"
-
-#: admin/ogroups/goto/termgroup.tpl.c:11
-msgid "NTP server"
-msgstr "Server NTP"
-
-#: admin/ogroups/goto/termgroup.tpl.c:14
-msgid "Choose server to use for synchronizing time"
-msgstr "Scegli il server da usare per la sincronizzazione dell'ora"
-
-#: admin/ogroups/goto/termgroup.tpl.c:20
-msgid "Select terminal mode"
-msgstr "Seleziona la modalitÃ  del terminale"
-
-#: admin/ogroups/goto/termgroup.tpl.c:26
-msgid "Choose server to use for logging"
-msgstr "Scegli un server da usare per i logs di sistema"
-
-#: admin/ogroups/goto/termgroup.tpl.c:32
-msgid "Select NFS root filesystem to use"
-msgstr "Scegli il filesystem NFS da usare"
-
-#: admin/ogroups/goto/termgroup.tpl.c:38
-msgid "Choose NFS filesystem to place swap files on"
-msgstr "Scegli il filesystem NFS in cui piazzare il file di swap"
-
-#: admin/ogroups/goto/termgroup.tpl.c:47
-msgid "Execute"
-msgstr "Esegui"
-
-#: 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 admin/systems/network.tpl.c:11
-msgid "Propose ip"
-msgstr "Proponi un indirizzo IP"
-
-#: admin/systems/network.tpl.c:14
-msgid "MAC-address"
-msgstr "Indirizzo MAC"
-
-#: admin/systems/network.tpl.c:17
-msgid "Autodetect"
-msgstr "Rilevazione automatica"
-
-#: admin/systems/network.tpl.c:20 admin/systems/network.tpl.c:23
-msgid "Enable DHCP for this device"
-msgstr "Attiva il DHCP per questa periferica"
-
-#: admin/systems/network.tpl.c:26 admin/systems/network.tpl.c:50
-msgid "not configured"
-msgstr "non configurato"
-
-#: admin/systems/network.tpl.c:29
-msgid "Parent node"
-msgstr "Nodo genitore"
-
-#: admin/systems/network.tpl.c:32
-msgid "Edit settings"
-msgstr "Modifica le impostazioni"
-
-#: admin/systems/network.tpl.c:35 admin/systems/network.tpl.c:47
-msgid "Enable DNS for this device"
-msgstr "Attiva il DNS per questa periferica"
-
-#: admin/systems/network.tpl.c:38
-msgid "Zone"
-msgstr "Zona"
-
-#: admin/systems/network.tpl.c:41
-msgid "TTL"
-msgstr "TTL"
-
-#: admin/systems/network.tpl.c:44
-msgid "Dns records"
-msgstr "Records Dns"
-
-#: admin/systems/password.tpl.c:2
-msgid ""
-"To change the terminal root password use the fields below. The changes take "
-"effect during the next reboot. Please memorize the new password, because you"
-" wouldn't be able to log in."
-msgstr "Per cambiare la password di root del terminale usa i campi qui sotto. La modifica avrÃ  un effetto immediatamente. Memorizza la nuova password perchÃ© non sarai piÃ¹ in grado di connetterti senza di essa."
-
-#: admin/systems/password.tpl.c:5
-msgid "Leave fields blank for password inheritance from default entries."
-msgstr "Lascia il campo vuoto per poter ereditare la password di default."
-
-#: admin/systems/password.tpl.c:8
-msgid "Changing the password impinges on authentification only."
-msgstr "La modifica della password influisce solo sull'autentificazione."
-
-#: admin/systems/password.tpl.c:11
-msgid "New password"
-msgstr "Imposta la nuova password"
-
-#: admin/systems/password.tpl.c:14
-msgid "Repeat new password"
-msgstr "Ripeti la nuova password"
-
-#: admin/systems/password.tpl.c:17
-msgid "Password strength"
-msgstr "Livello di sicurezza della password"
-
-#: admin/systems/password.tpl.c:20
-msgid "Set password"
-msgstr "Imposta la password"
-
-#: 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/gencd.tpl.c:2
-msgid "CD-Install-Image generation"
-msgstr "Generazione del CD dell'immagine d'installazione"
-
-#: admin/systems/gencd.tpl.c:5
-msgid ""
-"This option enables you to generate FAI install CD images for the selected "
-"workstation. The procedure may take about 10 minutes to complete, so please "
-"be patient after pressing the 'Create ISO-Image' button."
-msgstr "Questa opzione consente di generare dei CD di installazione delle immagini FAI per la workstation selezionata. La procedura potrebbe richiedere circa 10 minuti, quindi per favore sii paziente dopo aver premuto il tasto 'Crea un'immagine al formato ISO'."
-
-#: admin/systems/gencd.tpl.c:8
-msgid "Create ISO-Image"
-msgstr "Crea un'immagine al formato ISO"
-
-#: admin/systems/remove.tpl.c:5
-msgid ""
-"This includes all account data, system access rules, imap settings, etc. for"
-" this user. Please double check if your really want to do this since there "
-"is no way for FusionDirectory to get your data back."
-msgstr "Questo include tutti i dati degli account, i permessi di accesso al sistema, la configurazione imap, etc. di questo utente. Accertati che vuoi davvero eseguire questa azione visto che poi sarÃ  impossibile per FusionDirectory recuperare i tuoi dati."
-
-#: admin/systems/remove.tpl.c:8
-msgid "So - if you're sure - press 'Delete' to continue or 'Cancel' to abort."
-msgstr "Quindi - se sei sicuro - premi 'Rimuovi' per continuare oppure 'Annulla' per interrompere."
-
-#: admin/systems/system-filter.tpl.c:2
-#: admin/systems/phoneSelect/phoneSelect-filter.tpl.c:2
-msgid "Filter"
-msgstr "Filtro"
-
-#: admin/systems/system-filter.tpl.c:5
-msgid "Show servers"
-msgstr "Mostra i server"
-
-#: admin/systems/system-filter.tpl.c:8
-msgid "Show workstations"
-msgstr "Mostra le workstations"
-
-#: admin/systems/system-filter.tpl.c:11
-msgid "Show terminals"
-msgstr "Mostra i terminali"
-
-#: admin/systems/system-filter.tpl.c:14
-msgid "Show network printer"
-msgstr "Mostra le stampanti di rete"
-
-#: admin/systems/system-filter.tpl.c:17
-#: admin/systems/phoneSelect/phoneSelect-filter.tpl.c:5
-msgid "Show phones"
-msgstr "Mostra i telefoni"
-
-#: admin/systems/system-filter.tpl.c:20
-msgid "Show windows based workstations"
-msgstr "Mostra le workstation Windows"
-
-#: admin/systems/system-filter.tpl.c:23
-msgid "Show network devices"
-msgstr "Mostra le periferiche di rete"
-
-#: admin/systems/system-filter.tpl.c:26
-#: admin/systems/phoneSelect/phoneSelect-filter.tpl.c:8
-msgid "Show mobile phones"
-msgstr "Mostra i telefoni cellulari"
-
-#: admin/systems/system-filter.tpl.c:29
-msgid "Show IPMI interfaces"
-msgstr ""
-
-#: admin/systems/ppd/printerPPDSelectionDialog.tpl.c:2
-msgid "Select objects to add"
-msgstr "Seleziona gli oggetti da aggiungere"
-
-#: admin/systems/ppd/printerPPDSelectionDialog.tpl.c:5
-msgid "Filters"
-msgstr "Filtri"
-
-#: admin/systems/ppd/printerPPDSelectionDialog.tpl.c:8
-msgid "Display objects matching"
-msgstr "Mostra gli oggetti corrispondenti"
-
-#: admin/systems/ppd/printerPPDSelectionDialog.tpl.c:11
-msgid "Regular expression for matching object names"
-msgstr "Espressione regolare per trovare gli oggetti corrispondenti"
-
-#: admin/systems/ppd/printerPPDSelectionDialog.tpl.c:14
-msgid "Close"
-msgstr "Chiuso"
-
-#: admin/systems/ppd/printerPPDDialog.tpl.c:2
-msgid "Printer driver"
-msgstr "Driver della stampante"
-
-#: admin/systems/ppd/printerPPDDialog.tpl.c:5
-msgid "Model"
-msgstr "Modello"
-
-#: admin/systems/ppd/printerPPDDialog.tpl.c:8
-msgid "Select"
-msgstr "Scegli"
-
-#: admin/systems/ppd/printerPPDDialog.tpl.c:11
-msgid "New driver"
-msgstr "Nuovo driver"
-
-#: admin/systems/ppd/printerPPDDialog.tpl.c:14
-msgid "Upload"
-msgstr "Caricare"
-
-#: admin/systems/ppd/printerPPDDialog.tpl.c:17
-msgid "Options"
-msgstr "Opzioni"
-
-#: admin/systems/ppd/remove_ppd.tpl.c:5
-msgid "The ppd file will be removed from the server and can not be restored."
-msgstr "Il file ppd sarÃ  eliminato dal server e non potrÃ  piÃ¹ essere restaurato"
-
-#: admin/systems/printer.tpl.c:2
-msgid "General"
-msgstr "Generale"
-
-#: admin/systems/printer.tpl.c:5
-msgid "Printer name"
-msgstr "Nome della stampante"
-
-#: admin/systems/printer.tpl.c:14
-msgid "Details"
-msgstr "Dettagli"
-
-#: admin/systems/printer.tpl.c:20
-msgid "Printer location"
-msgstr "Ubicazione della stampante"
-
-#: admin/systems/printer.tpl.c:26
-msgid "PPD Provider"
-msgstr "Fornitore del PPD"
-
-#: admin/systems/printer.tpl.c:29
-msgid "Driver"
-msgstr "Driver"
-
-#: admin/systems/printer.tpl.c:32
-msgid "Edit"
-msgstr "Modifica"
-
-#: admin/systems/printer.tpl.c:41
-msgid "Users which are allowed to use this printer"
-msgstr "Utenti che sono autorizzati ad utilizzare questa stampante"
-
-#: admin/systems/printer.tpl.c:44
-msgid "Users"
-msgstr "Utenti"
-
-#: admin/systems/printer.tpl.c:47
-msgid "Users which are allowed to administrate this printer"
-msgstr "Utenti che sono autorizzati ad amministrare questa stampante"
-
-#: admin/systems/printer.tpl.c:50
-msgid "Admins"
-msgstr "Amministratori"
-
-#: admin/systems/printer.tpl.c:53
-msgid "Windows paths"
-msgstr "Path per le stampanti in Windows"
-
-#: admin/systems/printer.tpl.c:56
-msgid "Printer windows inf file"
-msgstr "File inf del driver stampante"
-
-#: admin/systems/printer.tpl.c:59
-msgid "Printer driver directory"
-msgstr "Cartella del driver stampante"
-
-#: admin/systems/gencd_frame.tpl.c:2
-msgid "Your browser does not supprt iframes."
-msgstr "Il tuo browser non supporta gli iframes."
-
-#: admin/systems/services/cups/serviceCUPS.tpl.c:2
-msgid "Print Service"
-msgstr "Servizio di stampa"
-
-#: admin/systems/services/cups/serviceCUPS.tpl.c:5
-msgid "enabled"
-msgstr "abilitato"
-
-#: admin/systems/services/ServiceAddDialog.tpl.c:2
-msgid "Adding a new service to the current server"
-msgstr "Aggiungi un nuovo servizio al server selezionato"
-
-#: admin/systems/services/ServiceAddDialog.tpl.c:5
-msgid ""
-"This dialog allows you to add new services to the currenty edited server "
-"object. The box below shows all available but not already used services."
-msgstr "Questa finestra ti permette di aggiungere dei nuovi servizi al server che stai modificando. Il riquadro qui sotto mostra tutti i servizi che sono disponibili, ma che non sono ancora usati."
-
-#: admin/systems/services/ServiceAddDialog.tpl.c:8
-msgid "Service to add"
-msgstr "Servizio da aggiungere"
-
-#: admin/systems/services/ServiceAddDialog.tpl.c:11
-msgid "All available services are already in use."
-msgstr "Tutti i servizi disponibili sono giÃ  in uso."
-
-#: admin/systems/services/ServiceAddDialog.tpl.c:14
-#: admin/systems/SelectDeviceType.tpl.c:26
-msgid "Continue"
-msgstr "Continua"
-
-#: admin/systems/SelectDeviceType.tpl.c:2
-msgid ""
-"This system has no system type configured. Please choose a system type for "
-"this object and an optional inheritance group. Press the 'continue' button "
-"to proceed."
-msgstr "Questo sistema non ha alcun tipo di sistema configurato. Si prega di scegliere un tipo di sistema per questo oggetto e in opzione un gruppo di ereditÃ . Premi il pulsante 'Continua' per procedere."
-
-#: admin/systems/SelectDeviceType.tpl.c:5
-msgid ""
-"Please select a system type and an optional bundle of predefined settings to"
-" be inherited."
-msgstr "Si prega di selezionare un tipo di sistema e in opzione un insieme di impostazioni predefinite che possono essere ereditate."
-
-#: admin/systems/SelectDeviceType.tpl.c:8
-msgid ""
-"Please select a system type and a bundle of predefined settings to be "
-"inherited."
-msgstr "Si prega di selezionare un tipo di sistema e un insieme di impostazioni predefinite che possono essere ereditate."
-
-#: admin/systems/SelectDeviceType.tpl.c:11
-#: admin/systems/SelectDeviceType.tpl.c:14
-msgid "System type"
-msgstr "Tipo di sistema"
-
-#: admin/systems/SelectDeviceType.tpl.c:17
-msgid "Choose an object group as template"
-msgstr "Scegli un gruppo di oggetti come modello"
-
-#: admin/systems/SelectDeviceType.tpl.c:20
-msgid "Object group"
-msgstr "Gruppo di oggetti"
-
-#: admin/systems/SelectDeviceType.tpl.c:23
-msgid "none"
-msgstr "nessuno"
-
-#: 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 ""
-
-#: 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 "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] ""
-msgstr[1] ""
diff --git a/systems/locale/lv/fusiondirectory.po b/systems/locale/lv/fusiondirectory.po
index 1b09b523a70504b0fceaa5bb541f332384150756..c125f02a9bc8d959f5353148858a8f86e5a5f2bd 100644
--- a/systems/locale/lv/fusiondirectory.po
+++ b/systems/locale/lv/fusiondirectory.po
@@ -5,12 +5,12 @@
 # Translators:
 msgid ""
 msgstr ""
-"Project-Id-Version: FusionDirectory-108\n"
+"Project-Id-Version: FusionDirectory-109\n"
 "Report-Msgid-Bugs-To: documentation@lists.fusiondirectory.org\n"
-"POT-Creation-Date: 2015-03-31 11:49+0200\n"
-"PO-Revision-Date: 2015-03-31 11:24+0000\n"
+"POT-Creation-Date: 2014-12-15 17:47+0100\n"
+"PO-Revision-Date: 2014-12-15 17:06+0000\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>\n"
-"Language-Team: Latvian (http://www.transifex.com/projects/p/FusionDirectory-108/language/lv/)\n"
+"Language-Team: Latvian (http://www.transifex.com/projects/p/FusionDirectory-109/language/lv/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -26,29 +26,24 @@ msgid "Locked"
 msgstr ""
 
 #: admin/ogroups/goto/class_termgroup.inc:118
-#: admin/systems/class_terminalGeneric.inc:121
+#: admin/systems/class_terminalStartup.inc:145
 msgid "Local swap"
 msgstr ""
 
 #: admin/ogroups/goto/class_termgroup.inc:124
 #: admin/ogroups/goto/class_termgroup.inc:136
-#: admin/systems/class_workstationGeneric.inc:352
-#: admin/systems/class_terminalGeneric.inc:109
-#: admin/systems/class_terminalGeneric.inc:125
+#: admin/systems/class_terminalStartup.inc:133
+#: admin/systems/class_terminalStartup.inc:149
 msgid "inherited"
 msgstr ""
 
 #: admin/ogroups/goto/class_termgroup.inc:220
-#: admin/systems/class_workstationGeneric.inc:72
-#: admin/systems/class_workstationGeneric.inc:443
-#: admin/systems/class_systemManagement.inc:295
-#: admin/systems/class_systemManagement.inc:325
-msgid "Infrastructure service"
+#: admin/systems/class_systemManagement.inc:165
+#: admin/systems/class_systemManagement.inc:186
+msgid "Service infrastructure"
 msgstr ""
 
 #: admin/ogroups/goto/class_termgroup.inc:224
-#: admin/systems/class_workstationGeneric.inc:75
-#: admin/systems/class_workstationGeneric.inc:78
 msgid "Event error"
 msgstr ""
 
@@ -58,12 +53,10 @@ msgid "Event '%s' is not available!"
 msgstr ""
 
 #: admin/ogroups/goto/class_termgroup.inc:274
-#: admin/systems/class_workstationGeneric.inc:112
 msgid "Switch off"
 msgstr ""
 
 #: admin/ogroups/goto/class_termgroup.inc:274
-#: admin/systems/class_workstationGeneric.inc:113
 msgid "Reboot"
 msgstr ""
 
@@ -84,7 +77,6 @@ msgid "Reinstall"
 msgstr ""
 
 #: admin/ogroups/goto/class_termgroup.inc:279
-#: admin/systems/class_workstationGeneric.inc:108
 msgid "Memory test"
 msgstr ""
 
@@ -93,21 +85,18 @@ msgid "System analysis"
 msgstr ""
 
 #: admin/ogroups/goto/class_termgroup.inc:386
-#: admin/systems/class_printGeneric.inc:670
-#: admin/systems/class_printGeneric.inc:970
-#: admin/systems/class_systemManagement.inc:816
 #: admin/systems/services/class_goService.inc:123
 #: admin/systems/services/class_goService.inc:151
 #: admin/systems/services/class_goService.inc:187
-#: admin/systems/class_networkSettings.inc:478
-#: admin/systems/class_networkSettings.inc:491
-#: admin/systems/class_networkSettings.inc:757
-#: admin/systems/class_networkSettings.inc:816
-#: admin/systems/class_networkSettings.inc:835
-#: admin/systems/class_networkSettings.inc:852
-#: admin/systems/class_networkSettings.inc:861
-#: admin/systems/class_networkSettings.inc:879
-#: admin/systems/class_networkSettings.inc:951
+#: admin/systems/class_networkSettings.inc:470
+#: admin/systems/class_networkSettings.inc:483
+#: admin/systems/class_networkSettings.inc:749
+#: admin/systems/class_networkSettings.inc:808
+#: admin/systems/class_networkSettings.inc:827
+#: admin/systems/class_networkSettings.inc:844
+#: admin/systems/class_networkSettings.inc:853
+#: admin/systems/class_networkSettings.inc:871
+#: admin/systems/class_networkSettings.inc:943
 msgid "LDAP error"
 msgstr ""
 
@@ -119,195 +108,125 @@ msgstr ""
 msgid "System group"
 msgstr ""
 
-#: admin/ogroups/goto/class_termgroup.inc:401
-#: admin/ogroups/goto/termgroup.tpl.c:17
+#: admin/ogroups/goto/class_termgroup.inc:402
 msgid "Mode"
 msgstr ""
 
-#: admin/ogroups/goto/class_termgroup.inc:402
-#: admin/systems/class_workstationGeneric.inc:189
-#: admin/ogroups/goto/termgroup.tpl.c:23
+#: admin/ogroups/goto/class_termgroup.inc:403
+#: admin/systems/class_systemServers.inc:35
 msgid "Syslog server"
 msgstr ""
 
-#: admin/ogroups/goto/class_termgroup.inc:403
+#: admin/ogroups/goto/class_termgroup.inc:404
 msgid "Action flag"
 msgstr ""
 
-#: admin/ogroups/goto/class_termgroup.inc:404
+#: admin/ogroups/goto/class_termgroup.inc:405
 msgid "Ntp server"
 msgstr ""
 
-#: admin/ogroups/goto/class_termgroup.inc:405
-#: admin/systems/class_terminalGeneric.inc:41
-#: admin/ogroups/goto/termgroup.tpl.c:29
+#: admin/ogroups/goto/class_termgroup.inc:406
+#: admin/systems/class_terminalStartup.inc:65
 msgid "Root server"
 msgstr ""
 
-#: admin/ogroups/goto/class_termgroup.inc:406
-#: admin/systems/class_terminalGeneric.inc:47
-#: admin/ogroups/goto/termgroup.tpl.c:35
+#: admin/ogroups/goto/class_termgroup.inc:407
+#: admin/systems/class_terminalStartup.inc:69
 msgid "Swap server"
 msgstr ""
 
-#: admin/systems/class_terminalStartup.inc:63
+#: admin/systems/class_terminalStartup.inc:62
 msgid "Startup parameters"
 msgstr ""
 
-#: admin/systems/class_terminalStartup.inc:66
+#: admin/systems/class_terminalStartup.inc:65
+msgid "The root server the terminal should be using"
+msgstr ""
+
+#: admin/systems/class_terminalStartup.inc:69
+msgid "The swap server the terminal should be using"
+msgstr ""
+
+#: admin/systems/class_terminalStartup.inc:73
 msgid "Boot kernel"
 msgstr ""
 
-#: admin/systems/class_terminalStartup.inc:66
+#: admin/systems/class_terminalStartup.inc:73
 msgid "Linux kernel to be installed and booted"
 msgstr ""
 
-#: admin/systems/class_terminalStartup.inc:70
+#: admin/systems/class_terminalStartup.inc:77
 msgid "Boot kernel parameters"
 msgstr ""
 
-#: admin/systems/class_terminalStartup.inc:70
+#: admin/systems/class_terminalStartup.inc:77
 msgid "Linux kernel parameters to be ran"
 msgstr ""
 
-#: admin/systems/class_terminalStartup.inc:82
-msgid "Startup"
-msgstr ""
-
 #: admin/systems/class_terminalStartup.inc:83
-msgid "Terminal startup"
-msgstr ""
-
-#: admin/systems/system-list.xml:10
-msgid "List of systems"
-msgstr ""
-
-#: admin/systems/system-list.xml:14
-msgid "New workstation"
-msgstr ""
-
-#: admin/systems/system-list.xml:22
-msgid "Locked server"
-msgstr ""
-
-#: admin/systems/system-list.xml:30
-msgid "Locked workstation"
-msgstr ""
-
-#: admin/systems/system-list.xml:38
-msgid "Locked terminal"
-msgstr ""
-
-#: admin/systems/system-list.xml:47
-msgid "New terminal"
-msgstr ""
-
-#: admin/systems/system-list.xml:55
-msgid "New device"
-msgstr ""
-
-#: admin/systems/system-list.xml:63
-msgid "Workstation template"
-msgstr ""
-
-#: admin/systems/system-list.xml:71
-msgid "Terminal template"
-msgstr ""
-
-#: admin/systems/system-list.xml:79
-msgid "Winstation"
+msgid "Remote desktop"
 msgstr ""
 
-#: admin/systems/system-list.xml:87 admin/systems/system-list.xml:234
-#: admin/systems/class_systemImport.inc:169
-#: admin/systems/class_serverGeneric.inc:46
-#: admin/systems/class_serverGeneric.inc:51
-#: admin/systems/class_serverGeneric.inc:52
-#: admin/systems/class_SelectDeviceType.inc:58
-msgid "Server"
+#: admin/systems/class_terminalStartup.inc:87
+msgid "Connect method"
 msgstr ""
 
-#: admin/systems/system-list.xml:95 admin/systems/system-list.xml:242
-#: admin/systems/class_workstationGeneric.inc:458
-#: admin/systems/class_workstationGeneric.inc:463
-#: admin/systems/class_workstationGeneric.inc:464
-#: admin/systems/class_SelectDeviceType.inc:58
-msgid "Workstation"
+#: admin/systems/class_terminalStartup.inc:91
+msgid "XDMCP"
 msgstr ""
 
-#: admin/systems/system-list.xml:103 admin/systems/system-list.xml:250
-#: admin/systems/class_terminalGeneric.inc:81
-#: admin/systems/class_terminalGeneric.inc:86
-#: admin/systems/class_terminalGeneric.inc:87
-#: admin/systems/class_SelectDeviceType.inc:58
-msgid "Terminal"
+#: admin/systems/class_terminalStartup.inc:91
+msgid "LDM"
 msgstr ""
 
-#: admin/systems/system-list.xml:111 admin/systems/class_printGeneric.inc:1005
-#: admin/systems/class_printGeneric.inc:1011
-#: admin/systems/class_printGeneric.inc:1012
-msgid "Printer"
+#: admin/systems/class_terminalStartup.inc:91
+msgid "Shell"
 msgstr ""
 
-#: admin/systems/system-list.xml:119 admin/systems/system-list.xml:274
-#: admin/systems/class_mobilePhoneGeneric.inc:74
-#: admin/systems/phoneSelect/phoneSelect-list.xml:14
-msgid "Phone"
+#: admin/systems/class_terminalStartup.inc:91
+msgid "Telnet"
 msgstr ""
 
-#: admin/systems/system-list.xml:127
-#: admin/systems/class_mobilePhoneGeneric.inc:36
-#: admin/systems/class_mobilePhoneGeneric.inc:41
-#: admin/systems/class_mobilePhoneGeneric.inc:42
-#: admin/systems/phoneSelect/phoneSelect-list.xml:22
-msgid "Mobile phone"
+#: admin/systems/class_terminalStartup.inc:91
+msgid "Windows RDP"
 msgstr ""
 
-#: admin/systems/system-list.xml:135
-#: admin/systems/class_componentGeneric.inc:36
-msgid "Component"
+#: admin/systems/class_terminalStartup.inc:95
+msgid "Terminal server"
 msgstr ""
 
-#: admin/systems/system-list.xml:143 admin/systems/system-list.xml:298
-msgid "IPMI"
+#: admin/systems/system-list.xml:10
+msgid "List of systems"
 msgstr ""
 
-#: admin/systems/system-list.xml:169
-#: admin/systems/class_workstationGeneric.inc:154
-#: admin/systems/class_printGeneric.inc:752
-#: admin/systems/class_printGeneric.inc:762
-#: admin/systems/class_printGeneric.inc:781
-#: admin/systems/class_printGeneric.inc:1022
-#: admin/systems/class_componentGeneric.inc:64
-#: admin/systems/class_mobilePhoneGeneric.inc:63
-#: admin/systems/phoneSelect/phoneSelect-list.xml:48
+#: admin/systems/system-list.xml:31
+#: admin/systems/class_workstationGeneric.inc:46
+#: admin/systems/class_printGeneric.inc:60
+#: admin/systems/class_componentGeneric.inc:58
+#: admin/systems/class_mobilePhoneGeneric.inc:60
 #: admin/systems/services/shares/class_serviceShare.inc:52
-#: admin/systems/system-filter.tpl.c:32
-#: admin/systems/phoneSelect/phoneSelect-filter.tpl.c:11
 msgid "Name"
 msgstr ""
 
-#: admin/systems/system-list.xml:177
-#: admin/systems/phoneSelect/phoneSelect-list.xml:63
+#: admin/systems/system-list.xml:39
 msgid "IP"
 msgstr ""
 
-#: admin/systems/system-list.xml:185
+#: admin/systems/system-list.xml:47
 msgid "MAC"
 msgstr ""
 
-#: admin/systems/system-list.xml:193
-#: admin/systems/class_workstationGeneric.inc:160
-#: admin/systems/class_printGeneric.inc:1024
-#: admin/systems/class_componentGeneric.inc:68
-#: admin/systems/class_mobilePhoneGeneric.inc:67
+#: admin/systems/system-list.xml:55
+#: admin/systems/class_workstationGeneric.inc:51
+#: admin/systems/class_printGeneric.inc:64
+#: admin/systems/class_componentGeneric.inc:62
+#: admin/systems/class_mobilePhoneGeneric.inc:64
 #: admin/systems/serverService-list.xml:35
 #: admin/systems/services/shares/class_serviceShare.inc:56
-#: admin/systems/printer.tpl.c:8 admin/systems/printer.tpl.c:17
 msgid "Description"
 msgstr ""
 
-#: admin/systems/system-list.xml:201 admin/systems/class_serverService.inc:57
+#: admin/systems/system-list.xml:63 admin/systems/class_serverService.inc:57
 #: admin/systems/services/terminal/class_serviceTerminal.inc:30
 #: admin/systems/services/cups/class_serviceCUPS.inc:85
 #: admin/systems/services/shares/class_serviceShare.inc:31
@@ -316,378 +235,186 @@ msgstr ""
 msgid "Services"
 msgstr ""
 
-#: admin/systems/system-list.xml:209
+#: admin/systems/system-list.xml:71
 msgid "Release"
 msgstr ""
 
-#: admin/systems/system-list.xml:217 admin/systems/serverService-list.xml:43
-#: admin/systems/phoneSelect/phoneSelect-list.xml:70
+#: admin/systems/system-list.xml:79 admin/systems/serverService-list.xml:43
 msgid "Actions"
 msgstr ""
 
-#: admin/systems/system-list.xml:228 admin/systems/serverService-list.xml:54
+#: admin/systems/system-list.xml:90 admin/systems/serverService-list.xml:54
 msgid "Create"
 msgstr ""
 
-#: admin/systems/system-list.xml:258
-msgid "winStation"
-msgstr ""
-
-#: admin/systems/system-list.xml:266
-msgid "Network printer"
-msgstr ""
-
-#: admin/systems/system-list.xml:282
-#: admin/systems/class_componentGeneric.inc:41
-#: admin/systems/class_componentGeneric.inc:42
-msgid "Network device"
-msgstr ""
-
-#: admin/systems/system-list.xml:290
-msgid "Mobile Phone"
-msgstr ""
-
-#: admin/systems/system-list.xml:310
+#: admin/systems/system-list.xml:100
 msgid "Trigger action"
 msgstr ""
 
-#: admin/systems/system-list.xml:317
+#: admin/systems/system-list.xml:107
 msgid "Schedule action"
 msgstr ""
 
-#: admin/systems/system-list.xml:330
-msgid "Activate systems"
-msgstr ""
-
-#: admin/systems/system-list.xml:337 admin/systems/serverService-list.xml:69
-#: admin/systems/printer.tpl.c:35
+#: admin/systems/system-list.xml:119 admin/systems/serverService-list.xml:69
 msgid "Remove"
 msgstr ""
 
-#: admin/systems/system-list.xml:367
-msgid "Create ISO"
-msgstr ""
-
-#: admin/systems/system-list.xml:379
+#: admin/systems/system-list.xml:150
 msgid "Edit system"
 msgstr ""
 
-#: admin/systems/system-list.xml:392
+#: admin/systems/system-list.xml:163
 msgid "Remove system"
 msgstr ""
 
-#: admin/systems/class_workstationGeneric.inc:75
-#, php-format
-msgid "Event %s is not available!"
-msgstr ""
-
-#: admin/systems/class_workstationGeneric.inc:78
-msgid "Events are not available!"
-msgstr ""
-
-#: admin/systems/class_workstationGeneric.inc:106
-msgid "(Re)Install"
-msgstr ""
-
-#: admin/systems/class_workstationGeneric.inc:107
-msgid "Software update"
-msgstr ""
-
-#: admin/systems/class_workstationGeneric.inc:115
-msgid "Wake up"
-msgstr ""
-
-#: admin/systems/class_workstationGeneric.inc:144
-#: admin/systems/class_printGeneric.inc:604
+#: admin/systems/class_workstationGeneric.inc:35
 msgid "workstation"
 msgstr ""
 
-#: admin/systems/class_workstationGeneric.inc:151
-#: admin/systems/class_componentGeneric.inc:61
-#: admin/systems/class_mobilePhoneGeneric.inc:60
+#: admin/systems/class_workstationGeneric.inc:42
+#: admin/systems/class_printGeneric.inc:56
+#: admin/systems/class_componentGeneric.inc:55
+#: admin/systems/class_mobilePhoneGeneric.inc:56
 msgid "Properties"
 msgstr ""
 
-#: admin/systems/class_workstationGeneric.inc:155
+#: admin/systems/class_workstationGeneric.inc:47
 #, php-format
 msgid "The name of the %s"
 msgstr ""
 
-#: admin/systems/class_workstationGeneric.inc:161
+#: admin/systems/class_workstationGeneric.inc:52
 #, php-format
 msgid "A short description of the %s"
 msgstr ""
 
-#: admin/systems/class_workstationGeneric.inc:166
-#: admin/systems/class_printGeneric.inc:1025
+#: admin/systems/class_workstationGeneric.inc:56
 msgid "Location"
 msgstr ""
 
-#: admin/systems/class_workstationGeneric.inc:167
+#: admin/systems/class_workstationGeneric.inc:57
 #, php-format
 msgid "The location of the %s"
 msgstr ""
 
-#: admin/systems/class_workstationGeneric.inc:173
+#: admin/systems/class_workstationGeneric.inc:61
 #, php-format
 msgid "Lock this %s"
 msgstr ""
 
-#: admin/systems/class_workstationGeneric.inc:174
+#: admin/systems/class_workstationGeneric.inc:62
 #, php-format
 msgid "This will prevent the %s from being reinstalled"
 msgstr ""
 
-#: admin/systems/class_workstationGeneric.inc:185
-#: addons/dashboard/class_dashBoardSystems.inc:48
-msgid "Servers"
-msgstr ""
-
-#: admin/systems/class_workstationGeneric.inc:190
-#, php-format
-msgid "The syslog server the %s should be using"
-msgstr ""
-
-#: admin/systems/class_workstationGeneric.inc:195
-msgid "Inherit NTP servers"
-msgstr ""
-
-#: admin/systems/class_workstationGeneric.inc:196
-msgid "Inherit time server attributes from ogroup"
-msgstr ""
-
-#: admin/systems/class_workstationGeneric.inc:202
-msgid "NTP servers"
-msgstr ""
-
-#: admin/systems/class_workstationGeneric.inc:203
-#, php-format
-msgid "The NTP servers for the %s"
+#: admin/systems/class_workstationGeneric.inc:73
+#: admin/systems/class_printGeneric.inc:83
+#: admin/systems/class_componentGeneric.inc:69
+#: admin/systems/class_mobilePhoneGeneric.inc:102
+#: admin/systems/class_networkSettings.inc:1008
+msgid "Network settings"
 msgstr ""
 
-#: admin/systems/class_workstationGeneric.inc:209
-msgid "Inherit LDAP servers"
+#: admin/systems/class_workstationGeneric.inc:78
+#: admin/systems/class_printGeneric.inc:87
+#: admin/systems/class_componentGeneric.inc:73
+#: admin/systems/class_mobilePhoneGeneric.inc:106
+#: admin/systems/class_networkSettings.inc:630
+#: admin/systems/class_networkSettings.inc:643
+#: admin/systems/class_networkSettings.inc:645
+#: admin/systems/class_networkSettings.inc:1014
+msgid "IP address"
 msgstr ""
 
-#: admin/systems/class_workstationGeneric.inc:210
-msgid "Inherit LDAP server attributes from ogroup"
+#: admin/systems/class_workstationGeneric.inc:78
+msgid "IP addresses this system uses (v4 or v6)"
 msgstr ""
 
-#: admin/systems/class_workstationGeneric.inc:216
-msgid "LDAP servers"
+#: admin/systems/class_workstationGeneric.inc:83
+#: admin/systems/class_printGeneric.inc:91
+#: admin/systems/class_componentGeneric.inc:77
+#: admin/systems/class_mobilePhoneGeneric.inc:110
+msgid "Mac address"
 msgstr ""
 
-#: admin/systems/class_workstationGeneric.inc:217
-#, php-format
-msgid "The LDAP servers for the %s"
+#: admin/systems/class_workstationGeneric.inc:83
+#: admin/systems/class_printGeneric.inc:91
+#: admin/systems/class_componentGeneric.inc:77
+#: admin/systems/class_mobilePhoneGeneric.inc:110
+msgid "Mac address of this system"
 msgstr ""
 
-#: admin/systems/class_workstationGeneric.inc:225
-#: admin/systems/class_workstationGeneric.inc:229
-#: admin/ogroups/goto/termgroup.tpl.c:41
-msgid "Action"
+#: admin/systems/class_workstationGeneric.inc:125
+#: admin/systems/class_workstationGeneric.inc:130
+#: admin/systems/class_workstationGeneric.inc:131
+msgid "Workstation"
 msgstr ""
 
-#: admin/systems/class_workstationGeneric.inc:230
-#: admin/ogroups/goto/termgroup.tpl.c:44
-msgid "Select action to execute for this terminal"
+#: admin/systems/class_workstationGeneric.inc:126
+msgid "Workstation information"
 msgstr ""
 
-#: admin/systems/class_workstationGeneric.inc:236
-#: admin/systems/class_componentGeneric.inc:75
-#: admin/systems/class_mobilePhoneGeneric.inc:106
-#: admin/systems/class_networkSettings.inc:1016
-msgid "Network settings"
+#: admin/systems/class_printGeneric.inc:32
+#: admin/systems/class_printGeneric.inc:37
+#: admin/systems/class_printGeneric.inc:38
+msgid "Printer"
 msgstr ""
 
-#: admin/systems/class_workstationGeneric.inc:459
-msgid "Workstation information"
+#: admin/systems/class_printGeneric.inc:33
+msgid "Printer information"
 msgstr ""
 
-#: admin/systems/class_printGeneric.inc:131
-#: admin/systems/class_printGeneric.inc:1065
-#: admin/systems/class_systemManagement.inc:678
-msgid "Internal error"
+#: admin/systems/class_printGeneric.inc:60
+msgid "The name of the printer"
 msgstr ""
 
-#: admin/systems/class_printGeneric.inc:131
-#, php-format
-msgid ""
-"Cannot determine a valid department for this object. Setting base to '%s'!"
+#: admin/systems/class_printGeneric.inc:64
+msgid "A short description of the printer"
 msgstr ""
 
-#: admin/systems/class_printGeneric.inc:311
-#: admin/systems/class_printGeneric.inc:319
-#: admin/systems/class_printGeneric.inc:324
-#: admin/systems/class_printGeneric.inc:374
-#: admin/systems/class_printGeneric.inc:390
-#: admin/systems/class_printGeneric.inc:393
-msgid "Add printer extension"
+#: admin/systems/class_printGeneric.inc:70
+msgid "Details"
 msgstr ""
 
-#: admin/systems/class_printGeneric.inc:312
-msgid ""
-"Could not initialize printer tab, parameter parent was missing while "
-"construction."
+#: admin/systems/class_printGeneric.inc:73
+msgid "Printer location"
 msgstr ""
 
-#: admin/systems/class_printGeneric.inc:320
-msgid "This is a workstation template, printer tab is disabled."
+#: admin/systems/class_printGeneric.inc:73
+msgid "The location of the printer"
 msgstr ""
 
-#: admin/systems/class_printGeneric.inc:325
-msgid "This is a terminal template, printer tab is disabled."
+#: admin/systems/class_printGeneric.inc:77
+msgid "Printer URL"
 msgstr ""
 
-#: admin/systems/class_printGeneric.inc:367
-#: admin/systems/class_printGeneric.inc:375
-#: admin/systems/class_printGeneric.inc:383
-#: admin/systems/class_printGeneric.inc:386
-#: admin/systems/class_printGeneric.inc:391
-#: admin/systems/class_printGeneric.inc:394
-msgid "printer"
+#: admin/systems/class_printGeneric.inc:77
+msgid "The URL of the printer"
 msgstr ""
 
-#: admin/systems/class_printGeneric.inc:375
-msgid ""
-"You can't enable it while 'cn' is not present in entry. Possibly you are "
-"currently creating a new terminal template."
+#: admin/systems/class_printGeneric.inc:87
+#: admin/systems/class_componentGeneric.inc:73
+#: admin/systems/class_mobilePhoneGeneric.inc:106
+msgid "IP address this system uses"
 msgstr ""
 
-#: admin/systems/class_printGeneric.inc:382
-#: admin/systems/class_printGeneric.inc:385
-msgid "Remove printer extension"
+#: admin/systems/class_serverService.inc:58
+msgid "Server services"
 msgstr ""
 
-#: admin/systems/class_printGeneric.inc:474
-#: admin/systems/class_printGeneric.inc:652
-#: admin/systems/class_printGeneric.inc:659
-#: admin/systems/class_printGeneric.inc:718
-#: admin/systems/class_printGeneric.inc:1105
-#: admin/systems/class_printGeneric.inc:1116
 #: admin/systems/class_serverService.inc:224
 #: admin/systems/class_serverService.inc:270
 #: admin/systems/class_serverService.inc:393
-#: admin/systems/class_systemManagement.inc:341
-#: admin/systems/class_systemManagement.inc:624
-#: admin/systems/class_systemManagement.inc:639
 #: admin/systems/services/shares/class_serviceShare.inc:103
-#: admin/systems/class_networkSettings.inc:305
-#: admin/systems/class_networkSettings.inc:336
-#: admin/systems/class_networkSettings.inc:584
-#: admin/systems/class_networkSettings.inc:591
-#: admin/systems/class_networkSettings.inc:597
-#: admin/systems/class_networkSettings.inc:604
+#: admin/systems/class_networkSettings.inc:297
+#: admin/systems/class_networkSettings.inc:328
+#: admin/systems/class_networkSettings.inc:576
+#: admin/systems/class_networkSettings.inc:583
+#: admin/systems/class_networkSettings.inc:589
+#: admin/systems/class_networkSettings.inc:596
 msgid "Error"
 msgstr ""
 
-#: admin/systems/class_printGeneric.inc:577
-#, php-format
-msgid "Your currently selected PPD file '%s' doesn't exist."
-msgstr ""
-
-#: admin/systems/class_printGeneric.inc:583
-msgid "Not defined"
-msgstr ""
-
-#: admin/systems/class_printGeneric.inc:587
-#: admin/systems/ppd/class_printerPPDDialog.inc:116
-msgid "Can't get ppd informations."
-msgstr ""
-
-#: admin/systems/class_printGeneric.inc:602
-#: admin/systems/class_printGeneric.inc:604
-#, php-format
-msgid "This printer belongs to %s. You can't rename this printer."
-msgstr ""
-
-#: admin/systems/class_printGeneric.inc:602
-#: admin/systems/class_terminalGeneric.inc:34
-msgid "terminal"
-msgstr ""
-
-#: admin/systems/class_printGeneric.inc:652
-#: admin/systems/class_printGeneric.inc:659
-msgid "Object is no printer!"
-msgstr ""
-
-#: admin/systems/class_printGeneric.inc:767 admin/systems/printer.tpl.c:23
-msgid "Printer URL"
-msgstr ""
-
-#: admin/systems/class_printGeneric.inc:989
-#: admin/systems/class_printGeneric.inc:991
-msgid "Group"
-msgstr ""
-
-#: admin/systems/class_printGeneric.inc:994
-msgid "User"
-msgstr ""
-
-#: admin/systems/class_printGeneric.inc:1006
-msgid "Printer information"
-msgstr ""
-
-#: admin/systems/class_printGeneric.inc:1023
-#: admin/systems/serverService-list.tpl.c:2
-#: admin/systems/phoneSelect/phoneSelect-list.tpl.c:2
-#: admin/systems/printer.tpl.c:11
-msgid "Base"
-msgstr ""
-
-#: admin/systems/class_printGeneric.inc:1026
-msgid "LabeledURL"
-msgstr ""
-
-#: admin/systems/class_printGeneric.inc:1027
-msgid "Printer PPD"
-msgstr ""
-
-#: admin/systems/class_printGeneric.inc:1028 admin/systems/printer.tpl.c:38
-msgid "Permissions"
-msgstr ""
-
-#: admin/systems/class_printGeneric.inc:1030
-msgid "Windows inf file"
-msgstr ""
-
-#: admin/systems/class_printGeneric.inc:1031
-msgid "Windows driver dir"
-msgstr ""
-
-#: admin/systems/class_printGeneric.inc:1032 admin/systems/printer.tpl.c:62
-msgid "Driver printer name"
-msgstr ""
-
-#: admin/systems/class_printGeneric.inc:1048
-#: admin/systems/class_printGeneric.inc:1070
-msgid "Permission error"
-msgstr ""
-
-#: admin/systems/class_printGeneric.inc:1048
-#: admin/systems/class_printGeneric.inc:1070
-msgid "printer user"
-msgstr ""
-
-#: admin/systems/class_printGeneric.inc:1065
-#, php-format
-msgid "Illegal member type '%s'!"
-msgstr ""
-
-#: admin/systems/class_printGeneric.inc:1105
-#, php-format
-msgid "'%s' is already used!"
-msgstr ""
-
-#: admin/systems/class_printGeneric.inc:1116
-#, php-format
-msgid "'%s' does not exist!"
-msgstr ""
-
-#: admin/systems/class_serverService.inc:58
-msgid "Server services"
-msgstr ""
-
 #: admin/systems/class_serverService.inc:332
 msgid "Filter error"
 msgstr ""
@@ -711,313 +438,163 @@ msgstr ""
 msgid "Could not get execute action %s on service %s."
 msgstr ""
 
-#: admin/systems/class_terminalGeneric.inc:42
-#, php-format
-msgid "The root server the terminal should be using"
+#: admin/systems/class_terminalGeneric.inc:31
+msgid "terminal"
 msgstr ""
 
+#: admin/systems/class_terminalGeneric.inc:43
 #: admin/systems/class_terminalGeneric.inc:48
-#, php-format
-msgid "The swap server the terminal should be using"
-msgstr ""
-
-#: admin/systems/class_terminalGeneric.inc:54
-msgid "Remote desktop"
-msgstr ""
-
-#: admin/systems/class_terminalGeneric.inc:58
-msgid "Connect method"
-msgstr ""
-
-#: admin/systems/class_terminalGeneric.inc:62
-msgid "XDMCP"
-msgstr ""
-
-#: admin/systems/class_terminalGeneric.inc:62
-msgid "LDM"
-msgstr ""
-
-#: admin/systems/class_terminalGeneric.inc:62
-msgid "Shell"
-msgstr ""
-
-#: admin/systems/class_terminalGeneric.inc:62
-msgid "Telnet"
-msgstr ""
-
-#: admin/systems/class_terminalGeneric.inc:62
-msgid "Windows RDP"
-msgstr ""
-
-#: admin/systems/class_terminalGeneric.inc:66
-msgid "Terminal server"
+#: admin/systems/class_terminalGeneric.inc:49
+msgid "Terminal"
 msgstr ""
 
-#: admin/systems/class_terminalGeneric.inc:82
+#: admin/systems/class_terminalGeneric.inc:44
 msgid "Terminal information"
 msgstr ""
 
-#: admin/systems/ppd/class_printerPPDSelectionDialog.inc:91
-#: admin/systems/ppd/class_printerPPDSelectionDialog.inc:116
-#: admin/systems/ppd/class_printerPPDSelectionDialog.inc:139
-#: admin/systems/ppd/class_printerPPDDialog.inc:92
-#: admin/systems/ppd/class_printerPPDDialog.inc:160
-#: admin/systems/ppd/class_printerPPDDialog.inc:241
-#: admin/systems/ppd/class_printerPPDDialog.inc:256
-#: admin/systems/ppd/class_printerPPDDialog.inc:269
-#: admin/systems/ppd/class_printerPPDDialog.inc:297
-#: admin/systems/ppd/class_printerPPDDialog.inc:314
-#: admin/systems/ppd/class_printerPPDDialog.inc:337
-#: admin/systems/ppd/class_printerPPDDialog.inc:351
-#: admin/systems/ppd/class_printerPPDDialog.inc:361
-#: admin/systems/ppd/class_printerPPDDialog.inc:365
-#: admin/systems/ppd/class_printerPPDDialog.inc:560
-#: admin/systems/ppd/class_printerPPDDialog.inc:577
-#: admin/systems/ppd/class_printerPPDDialog.inc:580
-#: admin/systems/ppd/class_printerPPDDialog.inc:583
-msgid "PPD error"
-msgstr ""
-
-#: admin/systems/ppd/class_printerPPDSelectionDialog.inc:139
-#, php-format
-msgid "Cannot locate vendor '%s' in available PPDs!"
-msgstr ""
-
-#: admin/systems/ppd/class_printerPPDSelectionDialog.inc:148
-msgid "Printer ppd selection."
-msgstr ""
-
-#: admin/systems/ppd/class_printerPPDSelectionDialog.inc:155
-msgid "delete"
-msgstr ""
-
-#: admin/systems/ppd/class_printerPPDSelectionDialog.inc:166
-msgid "back"
-msgstr ""
-
-#: admin/systems/ppd/class_printerPPDDialog.inc:74
-#: admin/systems/ppd/class_printerPPDDialog.inc:140
-#: admin/systems/services/class_goService.inc:241
-msgid "Configuration error"
-msgstr ""
-
-#: admin/systems/ppd/class_printerPPDDialog.inc:92
-#, php-format
-msgid "Cannot open PPD '%s'!"
-msgstr ""
-
-#: admin/systems/ppd/class_printerPPDDialog.inc:141
-#, php-format
-msgid "Cannot open PPD path '%s' for reading and writing!"
-msgstr ""
-
-#: admin/systems/ppd/class_printerPPDDialog.inc:160
-#: admin/systems/ppd/class_printerPPDDialog.inc:365
-msgid "file is empty"
-msgstr ""
-
-#: admin/systems/ppd/class_printerPPDDialog.inc:314
-#, php-format
-msgid "Cannot parse PPD '%s'!"
-msgstr ""
-
-#: admin/systems/ppd/class_printerPPDDialog.inc:340
-msgid "Overwrite existing PPD"
-msgstr ""
-
-#: admin/systems/ppd/class_printerPPDDialog.inc:341
-msgid ""
-"There is already a ppd file for this kind of printer. Do you want to "
-"overwrite it?"
-msgstr ""
-
-#: admin/systems/ppd/class_printerPPDDialog.inc:491
-msgid "Section"
-msgstr ""
-
-#: admin/systems/ppd/class_printerPPDDialog.inc:551
-#: admin/systems/ppd/class_printerPPDDialog.inc:554
-msgid "True"
-msgstr ""
-
-#: admin/systems/ppd/class_printerPPDDialog.inc:552
-#: admin/systems/ppd/class_printerPPDDialog.inc:555
-msgid "False"
-msgstr ""
-
-#: admin/systems/ppd/class_printerPPDDialog.inc:560
-#, php-format
-msgid "PPD type '%s' is not supported!"
-msgstr ""
-
-#: admin/systems/ppd/class_printerPPDDialog.inc:597
-msgid ""
-"Please select a valid ppd file or use 'Cancel' to go back to printer "
-"configuration."
-msgstr ""
-
-#: admin/systems/ppd/class_ppdManager.inc:44
-#: admin/systems/ppd/class_ppdManager.inc:188
-#: admin/systems/ppd/class_ppdManager.inc:190
-msgid "PPD manager error"
-msgstr ""
-
-#: admin/systems/ppd/class_ppdManager.inc:44
-#, php-format
-msgid "The specified path '%s' does not exist."
-msgstr ""
-
-#: admin/systems/ppd/class_ppdManager.inc:188
+#: admin/systems/class_systemImport.inc:72
 #, php-format
-msgid "Specified PPD file '%s' cannot be opened for reading."
+msgid "Could not parse %s"
 msgstr ""
 
-#: admin/systems/ppd/class_ppdManager.inc:190
+#: admin/systems/class_systemImport.inc:116
 #, php-format
-msgid "The temporary file '%s' cannot be opened for writing."
-msgstr ""
-
-#: admin/systems/ppd/class_ppdManager.inc:212
-#: admin/systems/ppd/class_ppdManager.inc:350
-msgid "Parsing PPD file failed - file is empty!"
+msgid "No DHCP server found for ip %s"
 msgstr ""
 
-#: admin/systems/ppd/class_ppdManager.inc:222
+#: admin/systems/class_systemImport.inc:130
 #, php-format
-msgid ""
-"Parsing PPD file %s failed - line too long. Trailing characters have been "
-"ignored!"
-msgstr ""
-
-#: admin/systems/ppd/class_ppdManager.inc:230
-msgid "Nested groups are not supported!"
+msgid "No DNS server found for zone %s"
 msgstr ""
 
-#: admin/systems/ppd/class_ppdManager.inc:234
-msgid "Group name not unique!"
+#: admin/systems/class_systemImport.inc:165
+msgid "Import"
 msgstr ""
 
-#: admin/systems/ppd/class_ppdManager.inc:240
-#: admin/systems/ppd/class_ppdManager.inc:270
-msgid "Symbol values are not supported yet!"
+#: admin/systems/class_systemImport.inc:169
+#: admin/systems/class_serverGeneric.inc:43
+#: admin/systems/class_serverGeneric.inc:48
+#: admin/systems/class_serverGeneric.inc:49
+msgid "Server"
 msgstr ""
 
-#: admin/systems/ppd/class_ppdManager.inc:264
-msgid "Nested options are not supported!"
+#: admin/systems/class_systemImport.inc:169
+msgid "The server you wish to import hosts from"
 msgstr ""
 
-#: admin/systems/ppd/class_ppdManager.inc:289
-msgid "PickMany is not supported yet!"
+#: admin/systems/class_serverGeneric.inc:31
+msgid "server"
 msgstr ""
 
-#: admin/systems/ppd/class_ppdManager.inc:370
-#, php-format
-msgid ""
-"Parsing PPD file %s failed - line too long. Trailing characters have been "
-"ignored"
+#: admin/systems/class_serverGeneric.inc:44
+msgid "Server information"
 msgstr ""
 
-#: admin/systems/ppd/class_ppdManager.inc:395
-#, php-format
-msgid "Parsing PPD file %s failed - no information found."
+#: admin/systems/class_componentGeneric.inc:31
+msgid "Component"
 msgstr ""
 
-#: admin/systems/class_systemImport.inc:72
-#, php-format
-msgid "Could not parse %s"
+#: admin/systems/class_componentGeneric.inc:32
+msgid "Component information"
 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/class_componentGeneric.inc:37
+msgid "Network device"
 msgstr ""
 
-#: admin/systems/class_systemImport.inc:130
-#, php-format
-msgid "No DNS server found for zone %s"
+#: admin/systems/class_componentGeneric.inc:58
+msgid "The name of the component"
 msgstr ""
 
-#: admin/systems/class_systemImport.inc:165
-msgid "Import"
+#: admin/systems/class_componentGeneric.inc:62
+msgid "A short description of the component"
 msgstr ""
 
-#: admin/systems/class_systemImport.inc:169
-msgid "The server you wish to import hosts from"
+#: admin/systems/class_systemServers.inc:31
+#: admin/systems/class_systemServers.inc:53
+msgid "Servers"
 msgstr ""
 
-#: admin/systems/class_serverGeneric.inc:34
-msgid "server"
+#: admin/systems/class_systemServers.inc:35
+msgid "The syslog server the system should be using"
 msgstr ""
 
-#: admin/systems/class_serverGeneric.inc:47
-msgid "Server information"
+#: admin/systems/class_systemServers.inc:40
+msgid "NTP servers"
 msgstr ""
 
-#: admin/systems/class_componentGeneric.inc:37
-msgid "Component information"
+#: admin/systems/class_systemServers.inc:40
+msgid "The NTP servers for this system"
 msgstr ""
 
-#: admin/systems/class_componentGeneric.inc:64
-msgid "The name of the component"
+#: admin/systems/class_systemServers.inc:54
+msgid "Servers this system is using"
 msgstr ""
 
-#: admin/systems/class_componentGeneric.inc:68
-msgid "A short description of the component"
+#: admin/systems/class_mobilePhoneGeneric.inc:32
+#: admin/systems/class_mobilePhoneGeneric.inc:37
+#: admin/systems/class_mobilePhoneGeneric.inc:38
+msgid "Mobile phone"
 msgstr ""
 
-#: admin/systems/class_mobilePhoneGeneric.inc:37
+#: admin/systems/class_mobilePhoneGeneric.inc:33
 msgid "Mobile phone information"
 msgstr ""
 
-#: admin/systems/class_mobilePhoneGeneric.inc:63
+#: admin/systems/class_mobilePhoneGeneric.inc:60
 msgid "The name of the mobile phone"
 msgstr ""
 
-#: admin/systems/class_mobilePhoneGeneric.inc:67
+#: admin/systems/class_mobilePhoneGeneric.inc:64
 msgid "A short description of the mobile phone"
 msgstr ""
 
-#: admin/systems/class_mobilePhoneGeneric.inc:77
+#: admin/systems/class_mobilePhoneGeneric.inc:70
+msgid "Phone"
+msgstr ""
+
+#: admin/systems/class_mobilePhoneGeneric.inc:73
 msgid "Serial Number"
 msgstr ""
 
-#: admin/systems/class_mobilePhoneGeneric.inc:77
+#: admin/systems/class_mobilePhoneGeneric.inc:73
 msgid "The serial number of the mobile phone"
 msgstr ""
 
-#: admin/systems/class_mobilePhoneGeneric.inc:81
+#: admin/systems/class_mobilePhoneGeneric.inc:77
 msgid "IMEI Number"
 msgstr ""
 
-#: admin/systems/class_mobilePhoneGeneric.inc:81
+#: admin/systems/class_mobilePhoneGeneric.inc:77
 msgid "The IMEI number of the mobile phone"
 msgstr ""
 
-#: admin/systems/class_mobilePhoneGeneric.inc:86
+#: admin/systems/class_mobilePhoneGeneric.inc:82
 msgid "OS"
 msgstr ""
 
-#: admin/systems/class_mobilePhoneGeneric.inc:86
+#: admin/systems/class_mobilePhoneGeneric.inc:82
 msgid "The Operating System installed on this phone"
 msgstr ""
 
-#: admin/systems/class_mobilePhoneGeneric.inc:92
+#: admin/systems/class_mobilePhoneGeneric.inc:88
 msgid "SimCard"
 msgstr ""
 
-#: admin/systems/class_mobilePhoneGeneric.inc:95
+#: admin/systems/class_mobilePhoneGeneric.inc:91
 msgid "Telephone Number"
 msgstr ""
 
-#: admin/systems/class_mobilePhoneGeneric.inc:95
+#: admin/systems/class_mobilePhoneGeneric.inc:91
 msgid "The telephone number of the mobile phone"
 msgstr ""
 
-#: admin/systems/class_mobilePhoneGeneric.inc:99
+#: admin/systems/class_mobilePhoneGeneric.inc:95
 msgid "PUK Number"
 msgstr ""
 
-#: admin/systems/class_mobilePhoneGeneric.inc:99
+#: admin/systems/class_mobilePhoneGeneric.inc:95
 msgid "The PUK number of the simcard in this mobile phone"
 msgstr ""
 
@@ -1029,101 +606,51 @@ msgstr ""
 msgid "Service"
 msgstr ""
 
-#: admin/systems/serverService-list.xml:27
-msgid "!"
-msgstr ""
-
-#: admin/systems/serverService-list.xml:89
-msgid "Get status"
-msgstr ""
-
-#: admin/systems/serverService-list.xml:97
-#: admin/systems/services/cups/class_serviceCUPS.inc:92
-msgid "Start"
-msgstr ""
-
-#: admin/systems/serverService-list.xml:105
-#: admin/systems/services/cups/class_serviceCUPS.inc:93
-msgid "Stop"
-msgstr ""
-
-#: admin/systems/serverService-list.xml:113
-#: admin/systems/services/cups/class_serviceCUPS.inc:94
-msgid "Restart"
-msgstr ""
-
-#: admin/systems/serverService-list.xml:121
-msgid "Edit service"
-msgstr ""
-
-#: admin/systems/serverService-list.xml:129
-msgid "Remove service"
-msgstr ""
-
-#: admin/systems/phoneSelect/phoneSelect-list.xml:10
-msgid "Please select the desired entries"
-msgstr ""
-
-#: admin/systems/phoneSelect/phoneSelect-list.xml:56
-msgid "Number"
-msgstr ""
-
-#: admin/systems/phoneSelect/phoneSelect-list.xml:83
-msgid "Select this number"
-msgstr ""
-
-#: admin/systems/class_systemManagement.inc:177
-msgid "Back"
-msgstr ""
-
-#: admin/systems/class_systemManagement.inc:223
-msgid "Creating the image failed. Please see the report below."
+#: admin/systems/serverService-list.xml:27
+msgid "!"
 msgstr ""
 
-#: admin/systems/class_systemManagement.inc:228
-#, php-format
-msgid "Command '%s', specified for ISO creation doesn't seem to exist."
+#: admin/systems/serverService-list.xml:89
+msgid "Get status"
 msgstr ""
 
-#: admin/systems/class_systemManagement.inc:398
-#: admin/systems/class_systemManagement.inc:473
-#: admin/systems/class_systemManagement.inc:858
-#: admin/systems/class_systemManagement.inc:905
-#: admin/systems/class_systemManagement.inc:926
-msgid "Permission"
+#: admin/systems/serverService-list.xml:97
+#: admin/systems/services/cups/class_serviceCUPS.inc:92
+msgid "Start"
 msgstr ""
 
-#: admin/systems/class_systemManagement.inc:678
-msgid "Cannot set mode to 'active'!"
+#: admin/systems/serverService-list.xml:105
+#: admin/systems/services/cups/class_serviceCUPS.inc:93
+msgid "Stop"
 msgstr ""
 
-#: admin/systems/class_systemManagement.inc:858
-#, php-format
-msgid "You are not allowed to create a snapshot for %s."
+#: admin/systems/serverService-list.xml:113
+#: admin/systems/services/cups/class_serviceCUPS.inc:94
+msgid "Restart"
 msgstr ""
 
-#: admin/systems/class_systemManagement.inc:905
-#: admin/systems/class_systemManagement.inc:926
-#, php-format
-msgid "You are not allowed to restore a snapshot for %s."
+#: admin/systems/serverService-list.xml:121
+msgid "Edit service"
 msgstr ""
 
-#: admin/systems/class_systemManagement.inc:1169
-#, php-format
-msgid "Inherited from %s"
+#: admin/systems/serverService-list.xml:129
+msgid "Remove service"
 msgstr ""
 
-#: admin/systems/class_systemManagement.inc:1224
-#: admin/systems/class_systemManagement.inc:1228
-#: addons/dashboard/class_dashBoardSystems.inc:199
+#: admin/systems/class_systemManagement.inc:48
 #: config/systems/class_systemsPluginConfig.inc:28
 msgid "Systems"
 msgstr ""
 
-#: admin/systems/class_systemManagement.inc:1225
+#: admin/systems/class_systemManagement.inc:49
 msgid "Systems Management"
 msgstr ""
 
+#: admin/systems/class_systemManagement.inc:250
+#, php-format
+msgid "Inherited from %s"
+msgstr ""
+
 #: admin/systems/services/terminal/class_serviceTerminal.inc:29
 #: admin/systems/services/terminal/class_serviceTerminal.inc:30
 #: admin/systems/services/terminal/class_serviceTerminal.inc:41
@@ -1161,6 +688,10 @@ msgstr ""
 msgid "Empty service"
 msgstr ""
 
+#: admin/systems/services/class_goService.inc:241
+msgid "Configuration error"
+msgstr ""
+
 #: admin/systems/services/shares/class_serviceShare.inc:30
 #: admin/systems/services/shares/class_serviceShare.inc:31
 msgid "Share service"
@@ -1219,8 +750,6 @@ msgid "You need to configure encodings first"
 msgstr ""
 
 #: admin/systems/services/shares/class_serviceShare.inc:110
-#: admin/ogroups/goto/termgroup.tpl.c:2 admin/systems/remove.tpl.c:2
-#: admin/systems/ppd/remove_ppd.tpl.c:2
 msgid "Warning"
 msgstr ""
 
@@ -1346,153 +875,93 @@ msgstr ""
 msgid "LDAP"
 msgstr ""
 
-#: admin/systems/class_networkSettings.inc:305
+#: admin/systems/class_networkSettings.inc:297
 msgid "NOT IMPLEMENTED"
 msgstr ""
 
-#: admin/systems/class_networkSettings.inc:437
+#: admin/systems/class_networkSettings.inc:429
 msgid "Not matching"
 msgstr ""
 
-#: admin/systems/class_networkSettings.inc:584
+#: admin/systems/class_networkSettings.inc:576
 #, php-format
 msgid "Was not able to contact argonaut server: %s"
 msgstr ""
 
-#: admin/systems/class_networkSettings.inc:591
+#: admin/systems/class_networkSettings.inc:583
 #, php-format
 msgid "Was not able to find DNS server for zone %s"
 msgstr ""
 
-#: admin/systems/class_networkSettings.inc:597
+#: admin/systems/class_networkSettings.inc:589
 #, php-format
 msgid "Was not able to find mac address of DNS server %s"
 msgstr ""
 
-#: admin/systems/class_networkSettings.inc:604
+#: admin/systems/class_networkSettings.inc:596
 #, php-format
 msgid "Was not able to launch ldap2zone: %s"
 msgstr ""
 
-#: admin/systems/class_networkSettings.inc:630
+#: admin/systems/class_networkSettings.inc:622
 #, php-format
 msgid "IP address %s"
 msgstr ""
 
-#: admin/systems/class_networkSettings.inc:638
-#: admin/systems/class_networkSettings.inc:651
-#: admin/systems/class_networkSettings.inc:653
-#: admin/systems/class_networkSettings.inc:1022
-msgid "IP address"
-msgstr ""
-
-#: admin/systems/class_networkSettings.inc:644
-#: admin/systems/class_networkSettings.inc:660
-#: admin/systems/class_networkSettings.inc:662
-#: admin/systems/class_networkSettings.inc:1023
+#: admin/systems/class_networkSettings.inc:636
+#: admin/systems/class_networkSettings.inc:652
+#: admin/systems/class_networkSettings.inc:654
+#: admin/systems/class_networkSettings.inc:1015
 msgid "MAC address"
 msgstr ""
 
-#: admin/systems/class_networkSettings.inc:676
+#: admin/systems/class_networkSettings.inc:668
 #, php-format
 msgid "The IP address '%s' is not part of the selected reverse zone '%s'!"
 msgstr ""
 
-#: admin/systems/class_networkSettings.inc:686
+#: admin/systems/class_networkSettings.inc:678
 #, php-format
 msgid "Record type '%s' is duplicated!"
 msgstr ""
 
-#: admin/systems/class_networkSettings.inc:693
+#: admin/systems/class_networkSettings.inc:685
 #, php-format
 msgid "Uniq record type '%s' is duplicated!"
 msgstr ""
 
-#: admin/systems/class_networkSettings.inc:705
+#: admin/systems/class_networkSettings.inc:697
 #, php-format
 msgid ""
 "The IP address '%s' will be added as 'A Record', this will be done "
 "automatically, please remove the record."
 msgstr ""
 
-#: admin/systems/class_networkSettings.inc:712
+#: admin/systems/class_networkSettings.inc:704
 #, php-format
 msgid "Only lowercase records are allowed, please check your '%ss'."
 msgstr ""
 
-#: admin/systems/class_networkSettings.inc:978
+#: admin/systems/class_networkSettings.inc:970
 msgid "Delete"
 msgstr ""
 
-#: admin/systems/class_networkSettings.inc:984
+#: admin/systems/class_networkSettings.inc:976
 msgid "Add"
 msgstr ""
 
-#: admin/systems/class_networkSettings.inc:1015
-#: addons/dashboard/class_dashBoardNetwork.inc:127
+#: admin/systems/class_networkSettings.inc:1007
 msgid "Network"
 msgstr ""
 
-#: admin/systems/class_networkSettings.inc:1030
+#: admin/systems/class_networkSettings.inc:1022
 msgid "DNS configuration"
 msgstr ""
 
-#: admin/systems/class_networkSettings.inc:1033
+#: admin/systems/class_networkSettings.inc:1025
 msgid "DHCP configuration"
 msgstr ""
 
-#: addons/dashboard/class_dashBoardSystems.inc:45
-msgid "Workstations"
-msgstr ""
-
-#: addons/dashboard/class_dashBoardSystems.inc:51
-msgid "Windows Workstations"
-msgstr ""
-
-#: addons/dashboard/class_dashBoardSystems.inc:54
-msgid "Terminals"
-msgstr ""
-
-#: addons/dashboard/class_dashBoardSystems.inc:57
-msgid "Printers"
-msgstr ""
-
-#: addons/dashboard/class_dashBoardSystems.inc:60
-msgid "Phones"
-msgstr ""
-
-#: addons/dashboard/class_dashBoardSystems.inc:63
-msgid "Components"
-msgstr ""
-
-#: addons/dashboard/class_dashBoardSystems.inc:66
-msgid "Mobile phones"
-msgstr ""
-
-#: addons/dashboard/class_dashBoardSystems.inc:183
-msgid "Statistics"
-msgstr ""
-
-#: addons/dashboard/class_dashBoardSystems.inc:188
-msgid "Computer name to use by unit"
-msgstr ""
-
-#: addons/dashboard/class_dashBoardSystems.inc:200
-msgid "Statistics and informations about systems"
-msgstr ""
-
-#: addons/dashboard/class_dashBoardNetwork.inc:111
-msgid "DHCP"
-msgstr ""
-
-#: addons/dashboard/class_dashBoardNetwork.inc:116
-msgid "DNS"
-msgstr ""
-
-#: addons/dashboard/class_dashBoardNetwork.inc:128
-msgid "Statistics and various informations"
-msgstr ""
-
 #: config/systems/class_systemsPluginConfig.inc:29
 msgid "Systems plugin configuration"
 msgstr ""
@@ -1584,406 +1053,3 @@ msgstr ""
 #: config/systems/class_systemsPluginConfig.inc:101
 msgid "Encodings"
 msgstr ""
-
-#: admin/ogroups/goto/termgroup.tpl.c:5
-msgid ""
-"Actions you choose here influence all systems in this object group. "
-"Additionally, all values editable here can be inherited by the clients "
-"assigned to this object group."
-msgstr ""
-
-#: admin/ogroups/goto/termgroup.tpl.c:8
-msgid "Generic"
-msgstr ""
-
-#: admin/ogroups/goto/termgroup.tpl.c:11
-msgid "NTP server"
-msgstr ""
-
-#: admin/ogroups/goto/termgroup.tpl.c:14
-msgid "Choose server to use for synchronizing time"
-msgstr ""
-
-#: admin/ogroups/goto/termgroup.tpl.c:20
-msgid "Select terminal mode"
-msgstr ""
-
-#: admin/ogroups/goto/termgroup.tpl.c:26
-msgid "Choose server to use for logging"
-msgstr ""
-
-#: admin/ogroups/goto/termgroup.tpl.c:32
-msgid "Select NFS root filesystem to use"
-msgstr ""
-
-#: admin/ogroups/goto/termgroup.tpl.c:38
-msgid "Choose NFS filesystem to place swap files on"
-msgstr ""
-
-#: admin/ogroups/goto/termgroup.tpl.c:47
-msgid "Execute"
-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 admin/systems/network.tpl.c:11
-msgid "Propose ip"
-msgstr ""
-
-#: admin/systems/network.tpl.c:14
-msgid "MAC-address"
-msgstr ""
-
-#: admin/systems/network.tpl.c:17
-msgid "Autodetect"
-msgstr ""
-
-#: admin/systems/network.tpl.c:20 admin/systems/network.tpl.c:23
-msgid "Enable DHCP for this device"
-msgstr ""
-
-#: admin/systems/network.tpl.c:26 admin/systems/network.tpl.c:50
-msgid "not configured"
-msgstr ""
-
-#: admin/systems/network.tpl.c:29
-msgid "Parent node"
-msgstr ""
-
-#: admin/systems/network.tpl.c:32
-msgid "Edit settings"
-msgstr ""
-
-#: admin/systems/network.tpl.c:35 admin/systems/network.tpl.c:47
-msgid "Enable DNS for this device"
-msgstr ""
-
-#: admin/systems/network.tpl.c:38
-msgid "Zone"
-msgstr ""
-
-#: admin/systems/network.tpl.c:41
-msgid "TTL"
-msgstr ""
-
-#: admin/systems/network.tpl.c:44
-msgid "Dns records"
-msgstr ""
-
-#: admin/systems/password.tpl.c:2
-msgid ""
-"To change the terminal root password use the fields below. The changes take "
-"effect during the next reboot. Please memorize the new password, because you"
-" wouldn't be able to log in."
-msgstr ""
-
-#: admin/systems/password.tpl.c:5
-msgid "Leave fields blank for password inheritance from default entries."
-msgstr ""
-
-#: admin/systems/password.tpl.c:8
-msgid "Changing the password impinges on authentification only."
-msgstr ""
-
-#: admin/systems/password.tpl.c:11
-msgid "New password"
-msgstr ""
-
-#: admin/systems/password.tpl.c:14
-msgid "Repeat new password"
-msgstr ""
-
-#: admin/systems/password.tpl.c:17
-msgid "Password strength"
-msgstr ""
-
-#: admin/systems/password.tpl.c:20
-msgid "Set password"
-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/gencd.tpl.c:2
-msgid "CD-Install-Image generation"
-msgstr ""
-
-#: admin/systems/gencd.tpl.c:5
-msgid ""
-"This option enables you to generate FAI install CD images for the selected "
-"workstation. The procedure may take about 10 minutes to complete, so please "
-"be patient after pressing the 'Create ISO-Image' button."
-msgstr ""
-
-#: admin/systems/gencd.tpl.c:8
-msgid "Create ISO-Image"
-msgstr ""
-
-#: admin/systems/remove.tpl.c:5
-msgid ""
-"This includes all account data, system access rules, imap settings, etc. for"
-" this user. Please double check if your really want to do this since there "
-"is no way for FusionDirectory to get your data back."
-msgstr ""
-
-#: admin/systems/remove.tpl.c:8
-msgid "So - if you're sure - press 'Delete' to continue or 'Cancel' to abort."
-msgstr ""
-
-#: admin/systems/system-filter.tpl.c:2
-#: admin/systems/phoneSelect/phoneSelect-filter.tpl.c:2
-msgid "Filter"
-msgstr ""
-
-#: admin/systems/system-filter.tpl.c:5
-msgid "Show servers"
-msgstr ""
-
-#: admin/systems/system-filter.tpl.c:8
-msgid "Show workstations"
-msgstr ""
-
-#: admin/systems/system-filter.tpl.c:11
-msgid "Show terminals"
-msgstr ""
-
-#: admin/systems/system-filter.tpl.c:14
-msgid "Show network printer"
-msgstr ""
-
-#: admin/systems/system-filter.tpl.c:17
-#: admin/systems/phoneSelect/phoneSelect-filter.tpl.c:5
-msgid "Show phones"
-msgstr ""
-
-#: admin/systems/system-filter.tpl.c:20
-msgid "Show windows based workstations"
-msgstr ""
-
-#: admin/systems/system-filter.tpl.c:23
-msgid "Show network devices"
-msgstr ""
-
-#: admin/systems/system-filter.tpl.c:26
-#: admin/systems/phoneSelect/phoneSelect-filter.tpl.c:8
-msgid "Show mobile phones"
-msgstr ""
-
-#: admin/systems/system-filter.tpl.c:29
-msgid "Show IPMI interfaces"
-msgstr ""
-
-#: admin/systems/ppd/printerPPDSelectionDialog.tpl.c:2
-msgid "Select objects to add"
-msgstr ""
-
-#: admin/systems/ppd/printerPPDSelectionDialog.tpl.c:5
-msgid "Filters"
-msgstr ""
-
-#: admin/systems/ppd/printerPPDSelectionDialog.tpl.c:8
-msgid "Display objects matching"
-msgstr ""
-
-#: admin/systems/ppd/printerPPDSelectionDialog.tpl.c:11
-msgid "Regular expression for matching object names"
-msgstr ""
-
-#: admin/systems/ppd/printerPPDSelectionDialog.tpl.c:14
-msgid "Close"
-msgstr ""
-
-#: admin/systems/ppd/printerPPDDialog.tpl.c:2
-msgid "Printer driver"
-msgstr ""
-
-#: admin/systems/ppd/printerPPDDialog.tpl.c:5
-msgid "Model"
-msgstr ""
-
-#: admin/systems/ppd/printerPPDDialog.tpl.c:8
-msgid "Select"
-msgstr ""
-
-#: admin/systems/ppd/printerPPDDialog.tpl.c:11
-msgid "New driver"
-msgstr ""
-
-#: admin/systems/ppd/printerPPDDialog.tpl.c:14
-msgid "Upload"
-msgstr ""
-
-#: admin/systems/ppd/printerPPDDialog.tpl.c:17
-msgid "Options"
-msgstr ""
-
-#: admin/systems/ppd/remove_ppd.tpl.c:5
-msgid "The ppd file will be removed from the server and can not be restored."
-msgstr ""
-
-#: admin/systems/printer.tpl.c:2
-msgid "General"
-msgstr ""
-
-#: admin/systems/printer.tpl.c:5
-msgid "Printer name"
-msgstr ""
-
-#: admin/systems/printer.tpl.c:14
-msgid "Details"
-msgstr ""
-
-#: admin/systems/printer.tpl.c:20
-msgid "Printer location"
-msgstr ""
-
-#: admin/systems/printer.tpl.c:26
-msgid "PPD Provider"
-msgstr ""
-
-#: admin/systems/printer.tpl.c:29
-msgid "Driver"
-msgstr ""
-
-#: admin/systems/printer.tpl.c:32
-msgid "Edit"
-msgstr ""
-
-#: admin/systems/printer.tpl.c:41
-msgid "Users which are allowed to use this printer"
-msgstr ""
-
-#: admin/systems/printer.tpl.c:44
-msgid "Users"
-msgstr ""
-
-#: admin/systems/printer.tpl.c:47
-msgid "Users which are allowed to administrate this printer"
-msgstr ""
-
-#: admin/systems/printer.tpl.c:50
-msgid "Admins"
-msgstr ""
-
-#: admin/systems/printer.tpl.c:53
-msgid "Windows paths"
-msgstr ""
-
-#: admin/systems/printer.tpl.c:56
-msgid "Printer windows inf file"
-msgstr ""
-
-#: admin/systems/printer.tpl.c:59
-msgid "Printer driver directory"
-msgstr ""
-
-#: admin/systems/gencd_frame.tpl.c:2
-msgid "Your browser does not supprt iframes."
-msgstr ""
-
-#: admin/systems/services/cups/serviceCUPS.tpl.c:2
-msgid "Print Service"
-msgstr ""
-
-#: admin/systems/services/cups/serviceCUPS.tpl.c:5
-msgid "enabled"
-msgstr ""
-
-#: admin/systems/services/ServiceAddDialog.tpl.c:2
-msgid "Adding a new service to the current server"
-msgstr ""
-
-#: admin/systems/services/ServiceAddDialog.tpl.c:5
-msgid ""
-"This dialog allows you to add new services to the currenty edited server "
-"object. The box below shows all available but not already used services."
-msgstr ""
-
-#: admin/systems/services/ServiceAddDialog.tpl.c:8
-msgid "Service to add"
-msgstr ""
-
-#: admin/systems/services/ServiceAddDialog.tpl.c:11
-msgid "All available services are already in use."
-msgstr ""
-
-#: admin/systems/services/ServiceAddDialog.tpl.c:14
-#: admin/systems/SelectDeviceType.tpl.c:26
-msgid "Continue"
-msgstr ""
-
-#: admin/systems/SelectDeviceType.tpl.c:2
-msgid ""
-"This system has no system type configured. Please choose a system type for "
-"this object and an optional inheritance group. Press the 'continue' button "
-"to proceed."
-msgstr ""
-
-#: admin/systems/SelectDeviceType.tpl.c:5
-msgid ""
-"Please select a system type and an optional bundle of predefined settings to"
-" be inherited."
-msgstr ""
-
-#: admin/systems/SelectDeviceType.tpl.c:8
-msgid ""
-"Please select a system type and a bundle of predefined settings to be "
-"inherited."
-msgstr ""
-
-#: admin/systems/SelectDeviceType.tpl.c:11
-#: admin/systems/SelectDeviceType.tpl.c:14
-msgid "System type"
-msgstr ""
-
-#: admin/systems/SelectDeviceType.tpl.c:17
-msgid "Choose an object group as template"
-msgstr ""
-
-#: admin/systems/SelectDeviceType.tpl.c:20
-msgid "Object group"
-msgstr ""
-
-#: admin/systems/SelectDeviceType.tpl.c:23
-msgid "none"
-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] ""
-
-#: 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] ""
diff --git a/systems/locale/nb/fusiondirectory.po b/systems/locale/nb/fusiondirectory.po
index aee134698a8e8ca021e7a615b157854c5add714a..8b0027a9feea8c5d49b18c2398ce01c89bd102b9 100644
--- a/systems/locale/nb/fusiondirectory.po
+++ b/systems/locale/nb/fusiondirectory.po
@@ -5,12 +5,12 @@
 # Translators:
 msgid ""
 msgstr ""
-"Project-Id-Version: FusionDirectory-108\n"
+"Project-Id-Version: FusionDirectory-109\n"
 "Report-Msgid-Bugs-To: documentation@lists.fusiondirectory.org\n"
-"POT-Creation-Date: 2015-03-31 11:49+0200\n"
-"PO-Revision-Date: 2015-03-31 11:24+0000\n"
+"POT-Creation-Date: 2014-12-15 17:47+0100\n"
+"PO-Revision-Date: 2015-02-25 16:13+0000\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>\n"
-"Language-Team: Norwegian BokmÃ¥l (http://www.transifex.com/projects/p/FusionDirectory-108/language/nb/)\n"
+"Language-Team: Norwegian BokmÃ¥l (http://www.transifex.com/projects/p/FusionDirectory-109/language/nb/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -26,29 +26,24 @@ msgid "Locked"
 msgstr ""
 
 #: admin/ogroups/goto/class_termgroup.inc:118
-#: admin/systems/class_terminalGeneric.inc:121
+#: admin/systems/class_terminalStartup.inc:145
 msgid "Local swap"
 msgstr ""
 
 #: admin/ogroups/goto/class_termgroup.inc:124
 #: admin/ogroups/goto/class_termgroup.inc:136
-#: admin/systems/class_workstationGeneric.inc:352
-#: admin/systems/class_terminalGeneric.inc:109
-#: admin/systems/class_terminalGeneric.inc:125
+#: admin/systems/class_terminalStartup.inc:133
+#: admin/systems/class_terminalStartup.inc:149
 msgid "inherited"
 msgstr ""
 
 #: admin/ogroups/goto/class_termgroup.inc:220
-#: admin/systems/class_workstationGeneric.inc:72
-#: admin/systems/class_workstationGeneric.inc:443
-#: admin/systems/class_systemManagement.inc:295
-#: admin/systems/class_systemManagement.inc:325
-msgid "Infrastructure service"
+#: admin/systems/class_systemManagement.inc:165
+#: admin/systems/class_systemManagement.inc:186
+msgid "Service infrastructure"
 msgstr ""
 
 #: admin/ogroups/goto/class_termgroup.inc:224
-#: admin/systems/class_workstationGeneric.inc:75
-#: admin/systems/class_workstationGeneric.inc:78
 msgid "Event error"
 msgstr ""
 
@@ -58,12 +53,10 @@ msgid "Event '%s' is not available!"
 msgstr ""
 
 #: admin/ogroups/goto/class_termgroup.inc:274
-#: admin/systems/class_workstationGeneric.inc:112
 msgid "Switch off"
 msgstr ""
 
 #: admin/ogroups/goto/class_termgroup.inc:274
-#: admin/systems/class_workstationGeneric.inc:113
 msgid "Reboot"
 msgstr ""
 
@@ -84,7 +77,6 @@ msgid "Reinstall"
 msgstr ""
 
 #: admin/ogroups/goto/class_termgroup.inc:279
-#: admin/systems/class_workstationGeneric.inc:108
 msgid "Memory test"
 msgstr ""
 
@@ -93,21 +85,18 @@ msgid "System analysis"
 msgstr ""
 
 #: admin/ogroups/goto/class_termgroup.inc:386
-#: admin/systems/class_printGeneric.inc:670
-#: admin/systems/class_printGeneric.inc:970
-#: admin/systems/class_systemManagement.inc:816
 #: admin/systems/services/class_goService.inc:123
 #: admin/systems/services/class_goService.inc:151
 #: admin/systems/services/class_goService.inc:187
-#: admin/systems/class_networkSettings.inc:478
-#: admin/systems/class_networkSettings.inc:491
-#: admin/systems/class_networkSettings.inc:757
-#: admin/systems/class_networkSettings.inc:816
-#: admin/systems/class_networkSettings.inc:835
-#: admin/systems/class_networkSettings.inc:852
-#: admin/systems/class_networkSettings.inc:861
-#: admin/systems/class_networkSettings.inc:879
-#: admin/systems/class_networkSettings.inc:951
+#: admin/systems/class_networkSettings.inc:470
+#: admin/systems/class_networkSettings.inc:483
+#: admin/systems/class_networkSettings.inc:749
+#: admin/systems/class_networkSettings.inc:808
+#: admin/systems/class_networkSettings.inc:827
+#: admin/systems/class_networkSettings.inc:844
+#: admin/systems/class_networkSettings.inc:853
+#: admin/systems/class_networkSettings.inc:871
+#: admin/systems/class_networkSettings.inc:943
 msgid "LDAP error"
 msgstr "LDAP-feil"
 
@@ -119,195 +108,125 @@ msgstr ""
 msgid "System group"
 msgstr ""
 
-#: admin/ogroups/goto/class_termgroup.inc:401
-#: admin/ogroups/goto/termgroup.tpl.c:17
+#: admin/ogroups/goto/class_termgroup.inc:402
 msgid "Mode"
 msgstr ""
 
-#: admin/ogroups/goto/class_termgroup.inc:402
-#: admin/systems/class_workstationGeneric.inc:189
-#: admin/ogroups/goto/termgroup.tpl.c:23
+#: admin/ogroups/goto/class_termgroup.inc:403
+#: admin/systems/class_systemServers.inc:35
 msgid "Syslog server"
 msgstr ""
 
-#: admin/ogroups/goto/class_termgroup.inc:403
+#: admin/ogroups/goto/class_termgroup.inc:404
 msgid "Action flag"
 msgstr ""
 
-#: admin/ogroups/goto/class_termgroup.inc:404
+#: admin/ogroups/goto/class_termgroup.inc:405
 msgid "Ntp server"
 msgstr ""
 
-#: admin/ogroups/goto/class_termgroup.inc:405
-#: admin/systems/class_terminalGeneric.inc:41
-#: admin/ogroups/goto/termgroup.tpl.c:29
+#: admin/ogroups/goto/class_termgroup.inc:406
+#: admin/systems/class_terminalStartup.inc:65
 msgid "Root server"
 msgstr ""
 
-#: admin/ogroups/goto/class_termgroup.inc:406
-#: admin/systems/class_terminalGeneric.inc:47
-#: admin/ogroups/goto/termgroup.tpl.c:35
+#: admin/ogroups/goto/class_termgroup.inc:407
+#: admin/systems/class_terminalStartup.inc:69
 msgid "Swap server"
 msgstr ""
 
-#: admin/systems/class_terminalStartup.inc:63
+#: admin/systems/class_terminalStartup.inc:62
 msgid "Startup parameters"
 msgstr ""
 
-#: admin/systems/class_terminalStartup.inc:66
+#: admin/systems/class_terminalStartup.inc:65
+msgid "The root server the terminal should be using"
+msgstr ""
+
+#: admin/systems/class_terminalStartup.inc:69
+msgid "The swap server the terminal should be using"
+msgstr ""
+
+#: admin/systems/class_terminalStartup.inc:73
 msgid "Boot kernel"
 msgstr ""
 
-#: admin/systems/class_terminalStartup.inc:66
+#: admin/systems/class_terminalStartup.inc:73
 msgid "Linux kernel to be installed and booted"
 msgstr ""
 
-#: admin/systems/class_terminalStartup.inc:70
+#: admin/systems/class_terminalStartup.inc:77
 msgid "Boot kernel parameters"
 msgstr ""
 
-#: admin/systems/class_terminalStartup.inc:70
+#: admin/systems/class_terminalStartup.inc:77
 msgid "Linux kernel parameters to be ran"
 msgstr ""
 
-#: admin/systems/class_terminalStartup.inc:82
-msgid "Startup"
-msgstr ""
-
 #: admin/systems/class_terminalStartup.inc:83
-msgid "Terminal startup"
-msgstr ""
-
-#: admin/systems/system-list.xml:10
-msgid "List of systems"
-msgstr ""
-
-#: admin/systems/system-list.xml:14
-msgid "New workstation"
-msgstr ""
-
-#: admin/systems/system-list.xml:22
-msgid "Locked server"
-msgstr ""
-
-#: admin/systems/system-list.xml:30
-msgid "Locked workstation"
-msgstr ""
-
-#: admin/systems/system-list.xml:38
-msgid "Locked terminal"
-msgstr ""
-
-#: admin/systems/system-list.xml:47
-msgid "New terminal"
-msgstr ""
-
-#: admin/systems/system-list.xml:55
-msgid "New device"
-msgstr ""
-
-#: admin/systems/system-list.xml:63
-msgid "Workstation template"
+msgid "Remote desktop"
 msgstr ""
 
-#: admin/systems/system-list.xml:71
-msgid "Terminal template"
+#: admin/systems/class_terminalStartup.inc:87
+msgid "Connect method"
 msgstr ""
 
-#: admin/systems/system-list.xml:79
-msgid "Winstation"
+#: admin/systems/class_terminalStartup.inc:91
+msgid "XDMCP"
 msgstr ""
 
-#: admin/systems/system-list.xml:87 admin/systems/system-list.xml:234
-#: admin/systems/class_systemImport.inc:169
-#: admin/systems/class_serverGeneric.inc:46
-#: admin/systems/class_serverGeneric.inc:51
-#: admin/systems/class_serverGeneric.inc:52
-#: admin/systems/class_SelectDeviceType.inc:58
-msgid "Server"
-msgstr "Tjener"
-
-#: admin/systems/system-list.xml:95 admin/systems/system-list.xml:242
-#: admin/systems/class_workstationGeneric.inc:458
-#: admin/systems/class_workstationGeneric.inc:463
-#: admin/systems/class_workstationGeneric.inc:464
-#: admin/systems/class_SelectDeviceType.inc:58
-msgid "Workstation"
-msgstr "Arbeidsstasjon"
-
-#: admin/systems/system-list.xml:103 admin/systems/system-list.xml:250
-#: admin/systems/class_terminalGeneric.inc:81
-#: admin/systems/class_terminalGeneric.inc:86
-#: admin/systems/class_terminalGeneric.inc:87
-#: admin/systems/class_SelectDeviceType.inc:58
-msgid "Terminal"
+#: admin/systems/class_terminalStartup.inc:91
+msgid "LDM"
 msgstr ""
 
-#: admin/systems/system-list.xml:111 admin/systems/class_printGeneric.inc:1005
-#: admin/systems/class_printGeneric.inc:1011
-#: admin/systems/class_printGeneric.inc:1012
-msgid "Printer"
+#: admin/systems/class_terminalStartup.inc:91
+msgid "Shell"
 msgstr ""
 
-#: admin/systems/system-list.xml:119 admin/systems/system-list.xml:274
-#: admin/systems/class_mobilePhoneGeneric.inc:74
-#: admin/systems/phoneSelect/phoneSelect-list.xml:14
-msgid "Phone"
+#: admin/systems/class_terminalStartup.inc:91
+msgid "Telnet"
 msgstr ""
 
-#: admin/systems/system-list.xml:127
-#: admin/systems/class_mobilePhoneGeneric.inc:36
-#: admin/systems/class_mobilePhoneGeneric.inc:41
-#: admin/systems/class_mobilePhoneGeneric.inc:42
-#: admin/systems/phoneSelect/phoneSelect-list.xml:22
-msgid "Mobile phone"
+#: admin/systems/class_terminalStartup.inc:91
+msgid "Windows RDP"
 msgstr ""
 
-#: admin/systems/system-list.xml:135
-#: admin/systems/class_componentGeneric.inc:36
-msgid "Component"
+#: admin/systems/class_terminalStartup.inc:95
+msgid "Terminal server"
 msgstr ""
 
-#: admin/systems/system-list.xml:143 admin/systems/system-list.xml:298
-msgid "IPMI"
+#: admin/systems/system-list.xml:10
+msgid "List of systems"
 msgstr ""
 
-#: admin/systems/system-list.xml:169
-#: admin/systems/class_workstationGeneric.inc:154
-#: admin/systems/class_printGeneric.inc:752
-#: admin/systems/class_printGeneric.inc:762
-#: admin/systems/class_printGeneric.inc:781
-#: admin/systems/class_printGeneric.inc:1022
-#: admin/systems/class_componentGeneric.inc:64
-#: admin/systems/class_mobilePhoneGeneric.inc:63
-#: admin/systems/phoneSelect/phoneSelect-list.xml:48
+#: admin/systems/system-list.xml:31
+#: admin/systems/class_workstationGeneric.inc:46
+#: admin/systems/class_printGeneric.inc:60
+#: admin/systems/class_componentGeneric.inc:58
+#: admin/systems/class_mobilePhoneGeneric.inc:60
 #: admin/systems/services/shares/class_serviceShare.inc:52
-#: admin/systems/system-filter.tpl.c:32
-#: admin/systems/phoneSelect/phoneSelect-filter.tpl.c:11
 msgid "Name"
 msgstr "Navn"
 
-#: admin/systems/system-list.xml:177
-#: admin/systems/phoneSelect/phoneSelect-list.xml:63
+#: admin/systems/system-list.xml:39
 msgid "IP"
 msgstr ""
 
-#: admin/systems/system-list.xml:185
+#: admin/systems/system-list.xml:47
 msgid "MAC"
 msgstr ""
 
-#: admin/systems/system-list.xml:193
-#: admin/systems/class_workstationGeneric.inc:160
-#: admin/systems/class_printGeneric.inc:1024
-#: admin/systems/class_componentGeneric.inc:68
-#: admin/systems/class_mobilePhoneGeneric.inc:67
+#: admin/systems/system-list.xml:55
+#: admin/systems/class_workstationGeneric.inc:51
+#: admin/systems/class_printGeneric.inc:64
+#: admin/systems/class_componentGeneric.inc:62
+#: admin/systems/class_mobilePhoneGeneric.inc:64
 #: admin/systems/serverService-list.xml:35
 #: admin/systems/services/shares/class_serviceShare.inc:56
-#: admin/systems/printer.tpl.c:8 admin/systems/printer.tpl.c:17
 msgid "Description"
 msgstr "Beskrivelse"
 
-#: admin/systems/system-list.xml:201 admin/systems/class_serverService.inc:57
+#: admin/systems/system-list.xml:63 admin/systems/class_serverService.inc:57
 #: admin/systems/services/terminal/class_serviceTerminal.inc:30
 #: admin/systems/services/cups/class_serviceCUPS.inc:85
 #: admin/systems/services/shares/class_serviceShare.inc:31
@@ -316,378 +235,186 @@ msgstr "Beskrivelse"
 msgid "Services"
 msgstr ""
 
-#: admin/systems/system-list.xml:209
+#: admin/systems/system-list.xml:71
 msgid "Release"
 msgstr ""
 
-#: admin/systems/system-list.xml:217 admin/systems/serverService-list.xml:43
-#: admin/systems/phoneSelect/phoneSelect-list.xml:70
+#: admin/systems/system-list.xml:79 admin/systems/serverService-list.xml:43
 msgid "Actions"
 msgstr ""
 
-#: admin/systems/system-list.xml:228 admin/systems/serverService-list.xml:54
+#: admin/systems/system-list.xml:90 admin/systems/serverService-list.xml:54
 msgid "Create"
 msgstr "Opprett"
 
-#: admin/systems/system-list.xml:258
-msgid "winStation"
-msgstr ""
-
-#: admin/systems/system-list.xml:266
-msgid "Network printer"
-msgstr ""
-
-#: admin/systems/system-list.xml:282
-#: admin/systems/class_componentGeneric.inc:41
-#: admin/systems/class_componentGeneric.inc:42
-msgid "Network device"
-msgstr ""
-
-#: admin/systems/system-list.xml:290
-msgid "Mobile Phone"
-msgstr ""
-
-#: admin/systems/system-list.xml:310
+#: admin/systems/system-list.xml:100
 msgid "Trigger action"
 msgstr ""
 
-#: admin/systems/system-list.xml:317
+#: admin/systems/system-list.xml:107
 msgid "Schedule action"
 msgstr ""
 
-#: admin/systems/system-list.xml:330
-msgid "Activate systems"
-msgstr ""
-
-#: admin/systems/system-list.xml:337 admin/systems/serverService-list.xml:69
-#: admin/systems/printer.tpl.c:35
+#: admin/systems/system-list.xml:119 admin/systems/serverService-list.xml:69
 msgid "Remove"
 msgstr "Fjern"
 
-#: admin/systems/system-list.xml:367
-msgid "Create ISO"
-msgstr ""
-
-#: admin/systems/system-list.xml:379
+#: admin/systems/system-list.xml:150
 msgid "Edit system"
 msgstr ""
 
-#: admin/systems/system-list.xml:392
+#: admin/systems/system-list.xml:163
 msgid "Remove system"
 msgstr ""
 
-#: admin/systems/class_workstationGeneric.inc:75
-#, php-format
-msgid "Event %s is not available!"
-msgstr ""
-
-#: admin/systems/class_workstationGeneric.inc:78
-msgid "Events are not available!"
-msgstr ""
-
-#: admin/systems/class_workstationGeneric.inc:106
-msgid "(Re)Install"
-msgstr ""
-
-#: admin/systems/class_workstationGeneric.inc:107
-msgid "Software update"
-msgstr ""
-
-#: admin/systems/class_workstationGeneric.inc:115
-msgid "Wake up"
-msgstr ""
-
-#: admin/systems/class_workstationGeneric.inc:144
-#: admin/systems/class_printGeneric.inc:604
+#: admin/systems/class_workstationGeneric.inc:35
 msgid "workstation"
 msgstr ""
 
-#: admin/systems/class_workstationGeneric.inc:151
-#: admin/systems/class_componentGeneric.inc:61
-#: admin/systems/class_mobilePhoneGeneric.inc:60
+#: admin/systems/class_workstationGeneric.inc:42
+#: admin/systems/class_printGeneric.inc:56
+#: admin/systems/class_componentGeneric.inc:55
+#: admin/systems/class_mobilePhoneGeneric.inc:56
 msgid "Properties"
 msgstr "Egenskaper"
 
-#: admin/systems/class_workstationGeneric.inc:155
+#: admin/systems/class_workstationGeneric.inc:47
 #, php-format
 msgid "The name of the %s"
 msgstr ""
 
-#: admin/systems/class_workstationGeneric.inc:161
+#: admin/systems/class_workstationGeneric.inc:52
 #, php-format
 msgid "A short description of the %s"
 msgstr ""
 
-#: admin/systems/class_workstationGeneric.inc:166
-#: admin/systems/class_printGeneric.inc:1025
+#: admin/systems/class_workstationGeneric.inc:56
 msgid "Location"
 msgstr ""
 
-#: admin/systems/class_workstationGeneric.inc:167
+#: admin/systems/class_workstationGeneric.inc:57
 #, php-format
 msgid "The location of the %s"
 msgstr ""
 
-#: admin/systems/class_workstationGeneric.inc:173
+#: admin/systems/class_workstationGeneric.inc:61
 #, php-format
 msgid "Lock this %s"
 msgstr ""
 
-#: admin/systems/class_workstationGeneric.inc:174
+#: admin/systems/class_workstationGeneric.inc:62
 #, php-format
 msgid "This will prevent the %s from being reinstalled"
 msgstr ""
 
-#: admin/systems/class_workstationGeneric.inc:185
-#: addons/dashboard/class_dashBoardSystems.inc:48
-msgid "Servers"
-msgstr "Tjener"
-
-#: admin/systems/class_workstationGeneric.inc:190
-#, php-format
-msgid "The syslog server the %s should be using"
-msgstr ""
-
-#: admin/systems/class_workstationGeneric.inc:195
-msgid "Inherit NTP servers"
-msgstr ""
-
-#: admin/systems/class_workstationGeneric.inc:196
-msgid "Inherit time server attributes from ogroup"
-msgstr ""
-
-#: admin/systems/class_workstationGeneric.inc:202
-msgid "NTP servers"
-msgstr ""
-
-#: admin/systems/class_workstationGeneric.inc:203
-#, php-format
-msgid "The NTP servers for the %s"
+#: admin/systems/class_workstationGeneric.inc:73
+#: admin/systems/class_printGeneric.inc:83
+#: admin/systems/class_componentGeneric.inc:69
+#: admin/systems/class_mobilePhoneGeneric.inc:102
+#: admin/systems/class_networkSettings.inc:1008
+msgid "Network settings"
 msgstr ""
 
-#: admin/systems/class_workstationGeneric.inc:209
-msgid "Inherit LDAP servers"
+#: admin/systems/class_workstationGeneric.inc:78
+#: admin/systems/class_printGeneric.inc:87
+#: admin/systems/class_componentGeneric.inc:73
+#: admin/systems/class_mobilePhoneGeneric.inc:106
+#: admin/systems/class_networkSettings.inc:630
+#: admin/systems/class_networkSettings.inc:643
+#: admin/systems/class_networkSettings.inc:645
+#: admin/systems/class_networkSettings.inc:1014
+msgid "IP address"
 msgstr ""
 
-#: admin/systems/class_workstationGeneric.inc:210
-msgid "Inherit LDAP server attributes from ogroup"
+#: admin/systems/class_workstationGeneric.inc:78
+msgid "IP addresses this system uses (v4 or v6)"
 msgstr ""
 
-#: admin/systems/class_workstationGeneric.inc:216
-msgid "LDAP servers"
+#: admin/systems/class_workstationGeneric.inc:83
+#: admin/systems/class_printGeneric.inc:91
+#: admin/systems/class_componentGeneric.inc:77
+#: admin/systems/class_mobilePhoneGeneric.inc:110
+msgid "Mac address"
 msgstr ""
 
-#: admin/systems/class_workstationGeneric.inc:217
-#, php-format
-msgid "The LDAP servers for the %s"
+#: admin/systems/class_workstationGeneric.inc:83
+#: admin/systems/class_printGeneric.inc:91
+#: admin/systems/class_componentGeneric.inc:77
+#: admin/systems/class_mobilePhoneGeneric.inc:110
+msgid "Mac address of this system"
 msgstr ""
 
-#: admin/systems/class_workstationGeneric.inc:225
-#: admin/systems/class_workstationGeneric.inc:229
-#: admin/ogroups/goto/termgroup.tpl.c:41
-msgid "Action"
-msgstr ""
+#: admin/systems/class_workstationGeneric.inc:125
+#: admin/systems/class_workstationGeneric.inc:130
+#: admin/systems/class_workstationGeneric.inc:131
+msgid "Workstation"
+msgstr "Arbeidsstasjon"
 
-#: admin/systems/class_workstationGeneric.inc:230
-#: admin/ogroups/goto/termgroup.tpl.c:44
-msgid "Select action to execute for this terminal"
+#: admin/systems/class_workstationGeneric.inc:126
+msgid "Workstation information"
 msgstr ""
 
-#: admin/systems/class_workstationGeneric.inc:236
-#: admin/systems/class_componentGeneric.inc:75
-#: admin/systems/class_mobilePhoneGeneric.inc:106
-#: admin/systems/class_networkSettings.inc:1016
-msgid "Network settings"
+#: admin/systems/class_printGeneric.inc:32
+#: admin/systems/class_printGeneric.inc:37
+#: admin/systems/class_printGeneric.inc:38
+msgid "Printer"
 msgstr ""
 
-#: admin/systems/class_workstationGeneric.inc:459
-msgid "Workstation information"
+#: admin/systems/class_printGeneric.inc:33
+msgid "Printer information"
 msgstr ""
 
-#: admin/systems/class_printGeneric.inc:131
-#: admin/systems/class_printGeneric.inc:1065
-#: admin/systems/class_systemManagement.inc:678
-msgid "Internal error"
+#: admin/systems/class_printGeneric.inc:60
+msgid "The name of the printer"
 msgstr ""
 
-#: admin/systems/class_printGeneric.inc:131
-#, php-format
-msgid ""
-"Cannot determine a valid department for this object. Setting base to '%s'!"
+#: admin/systems/class_printGeneric.inc:64
+msgid "A short description of the printer"
 msgstr ""
 
-#: admin/systems/class_printGeneric.inc:311
-#: admin/systems/class_printGeneric.inc:319
-#: admin/systems/class_printGeneric.inc:324
-#: admin/systems/class_printGeneric.inc:374
-#: admin/systems/class_printGeneric.inc:390
-#: admin/systems/class_printGeneric.inc:393
-msgid "Add printer extension"
+#: admin/systems/class_printGeneric.inc:70
+msgid "Details"
 msgstr ""
 
-#: admin/systems/class_printGeneric.inc:312
-msgid ""
-"Could not initialize printer tab, parameter parent was missing while "
-"construction."
+#: admin/systems/class_printGeneric.inc:73
+msgid "Printer location"
 msgstr ""
 
-#: admin/systems/class_printGeneric.inc:320
-msgid "This is a workstation template, printer tab is disabled."
+#: admin/systems/class_printGeneric.inc:73
+msgid "The location of the printer"
 msgstr ""
 
-#: admin/systems/class_printGeneric.inc:325
-msgid "This is a terminal template, printer tab is disabled."
+#: admin/systems/class_printGeneric.inc:77
+msgid "Printer URL"
 msgstr ""
 
-#: admin/systems/class_printGeneric.inc:367
-#: admin/systems/class_printGeneric.inc:375
-#: admin/systems/class_printGeneric.inc:383
-#: admin/systems/class_printGeneric.inc:386
-#: admin/systems/class_printGeneric.inc:391
-#: admin/systems/class_printGeneric.inc:394
-msgid "printer"
+#: admin/systems/class_printGeneric.inc:77
+msgid "The URL of the printer"
 msgstr ""
 
-#: admin/systems/class_printGeneric.inc:375
-msgid ""
-"You can't enable it while 'cn' is not present in entry. Possibly you are "
-"currently creating a new terminal template."
+#: admin/systems/class_printGeneric.inc:87
+#: admin/systems/class_componentGeneric.inc:73
+#: admin/systems/class_mobilePhoneGeneric.inc:106
+msgid "IP address this system uses"
 msgstr ""
 
-#: admin/systems/class_printGeneric.inc:382
-#: admin/systems/class_printGeneric.inc:385
-msgid "Remove printer extension"
+#: admin/systems/class_serverService.inc:58
+msgid "Server services"
 msgstr ""
 
-#: admin/systems/class_printGeneric.inc:474
-#: admin/systems/class_printGeneric.inc:652
-#: admin/systems/class_printGeneric.inc:659
-#: admin/systems/class_printGeneric.inc:718
-#: admin/systems/class_printGeneric.inc:1105
-#: admin/systems/class_printGeneric.inc:1116
 #: admin/systems/class_serverService.inc:224
 #: admin/systems/class_serverService.inc:270
 #: admin/systems/class_serverService.inc:393
-#: admin/systems/class_systemManagement.inc:341
-#: admin/systems/class_systemManagement.inc:624
-#: admin/systems/class_systemManagement.inc:639
 #: admin/systems/services/shares/class_serviceShare.inc:103
-#: admin/systems/class_networkSettings.inc:305
-#: admin/systems/class_networkSettings.inc:336
-#: admin/systems/class_networkSettings.inc:584
-#: admin/systems/class_networkSettings.inc:591
-#: admin/systems/class_networkSettings.inc:597
-#: admin/systems/class_networkSettings.inc:604
+#: admin/systems/class_networkSettings.inc:297
+#: admin/systems/class_networkSettings.inc:328
+#: admin/systems/class_networkSettings.inc:576
+#: admin/systems/class_networkSettings.inc:583
+#: admin/systems/class_networkSettings.inc:589
+#: admin/systems/class_networkSettings.inc:596
 msgid "Error"
 msgstr "Feil"
 
-#: admin/systems/class_printGeneric.inc:577
-#, php-format
-msgid "Your currently selected PPD file '%s' doesn't exist."
-msgstr ""
-
-#: admin/systems/class_printGeneric.inc:583
-msgid "Not defined"
-msgstr ""
-
-#: admin/systems/class_printGeneric.inc:587
-#: admin/systems/ppd/class_printerPPDDialog.inc:116
-msgid "Can't get ppd informations."
-msgstr ""
-
-#: admin/systems/class_printGeneric.inc:602
-#: admin/systems/class_printGeneric.inc:604
-#, php-format
-msgid "This printer belongs to %s. You can't rename this printer."
-msgstr ""
-
-#: admin/systems/class_printGeneric.inc:602
-#: admin/systems/class_terminalGeneric.inc:34
-msgid "terminal"
-msgstr ""
-
-#: admin/systems/class_printGeneric.inc:652
-#: admin/systems/class_printGeneric.inc:659
-msgid "Object is no printer!"
-msgstr ""
-
-#: admin/systems/class_printGeneric.inc:767 admin/systems/printer.tpl.c:23
-msgid "Printer URL"
-msgstr ""
-
-#: admin/systems/class_printGeneric.inc:989
-#: admin/systems/class_printGeneric.inc:991
-msgid "Group"
-msgstr ""
-
-#: admin/systems/class_printGeneric.inc:994
-msgid "User"
-msgstr "Bruker"
-
-#: admin/systems/class_printGeneric.inc:1006
-msgid "Printer information"
-msgstr ""
-
-#: admin/systems/class_printGeneric.inc:1023
-#: admin/systems/serverService-list.tpl.c:2
-#: admin/systems/phoneSelect/phoneSelect-list.tpl.c:2
-#: admin/systems/printer.tpl.c:11
-msgid "Base"
-msgstr ""
-
-#: admin/systems/class_printGeneric.inc:1026
-msgid "LabeledURL"
-msgstr ""
-
-#: admin/systems/class_printGeneric.inc:1027
-msgid "Printer PPD"
-msgstr ""
-
-#: admin/systems/class_printGeneric.inc:1028 admin/systems/printer.tpl.c:38
-msgid "Permissions"
-msgstr ""
-
-#: admin/systems/class_printGeneric.inc:1030
-msgid "Windows inf file"
-msgstr ""
-
-#: admin/systems/class_printGeneric.inc:1031
-msgid "Windows driver dir"
-msgstr ""
-
-#: admin/systems/class_printGeneric.inc:1032 admin/systems/printer.tpl.c:62
-msgid "Driver printer name"
-msgstr ""
-
-#: admin/systems/class_printGeneric.inc:1048
-#: admin/systems/class_printGeneric.inc:1070
-msgid "Permission error"
-msgstr ""
-
-#: admin/systems/class_printGeneric.inc:1048
-#: admin/systems/class_printGeneric.inc:1070
-msgid "printer user"
-msgstr ""
-
-#: admin/systems/class_printGeneric.inc:1065
-#, php-format
-msgid "Illegal member type '%s'!"
-msgstr ""
-
-#: admin/systems/class_printGeneric.inc:1105
-#, php-format
-msgid "'%s' is already used!"
-msgstr ""
-
-#: admin/systems/class_printGeneric.inc:1116
-#, php-format
-msgid "'%s' does not exist!"
-msgstr ""
-
-#: admin/systems/class_serverService.inc:58
-msgid "Server services"
-msgstr ""
-
 #: admin/systems/class_serverService.inc:332
 msgid "Filter error"
 msgstr ""
@@ -711,217 +438,20 @@ msgstr ""
 msgid "Could not get execute action %s on service %s."
 msgstr ""
 
-#: admin/systems/class_terminalGeneric.inc:42
-#, php-format
-msgid "The root server the terminal should be using"
+#: admin/systems/class_terminalGeneric.inc:31
+msgid "terminal"
 msgstr ""
 
+#: admin/systems/class_terminalGeneric.inc:43
 #: admin/systems/class_terminalGeneric.inc:48
-#, php-format
-msgid "The swap server the terminal should be using"
-msgstr ""
-
-#: admin/systems/class_terminalGeneric.inc:54
-msgid "Remote desktop"
-msgstr ""
-
-#: admin/systems/class_terminalGeneric.inc:58
-msgid "Connect method"
-msgstr ""
-
-#: admin/systems/class_terminalGeneric.inc:62
-msgid "XDMCP"
-msgstr ""
-
-#: admin/systems/class_terminalGeneric.inc:62
-msgid "LDM"
-msgstr ""
-
-#: admin/systems/class_terminalGeneric.inc:62
-msgid "Shell"
-msgstr ""
-
-#: admin/systems/class_terminalGeneric.inc:62
-msgid "Telnet"
-msgstr ""
-
-#: admin/systems/class_terminalGeneric.inc:62
-msgid "Windows RDP"
-msgstr ""
-
-#: admin/systems/class_terminalGeneric.inc:66
-msgid "Terminal server"
+#: admin/systems/class_terminalGeneric.inc:49
+msgid "Terminal"
 msgstr ""
 
-#: admin/systems/class_terminalGeneric.inc:82
+#: admin/systems/class_terminalGeneric.inc:44
 msgid "Terminal information"
 msgstr ""
 
-#: admin/systems/ppd/class_printerPPDSelectionDialog.inc:91
-#: admin/systems/ppd/class_printerPPDSelectionDialog.inc:116
-#: admin/systems/ppd/class_printerPPDSelectionDialog.inc:139
-#: admin/systems/ppd/class_printerPPDDialog.inc:92
-#: admin/systems/ppd/class_printerPPDDialog.inc:160
-#: admin/systems/ppd/class_printerPPDDialog.inc:241
-#: admin/systems/ppd/class_printerPPDDialog.inc:256
-#: admin/systems/ppd/class_printerPPDDialog.inc:269
-#: admin/systems/ppd/class_printerPPDDialog.inc:297
-#: admin/systems/ppd/class_printerPPDDialog.inc:314
-#: admin/systems/ppd/class_printerPPDDialog.inc:337
-#: admin/systems/ppd/class_printerPPDDialog.inc:351
-#: admin/systems/ppd/class_printerPPDDialog.inc:361
-#: admin/systems/ppd/class_printerPPDDialog.inc:365
-#: admin/systems/ppd/class_printerPPDDialog.inc:560
-#: admin/systems/ppd/class_printerPPDDialog.inc:577
-#: admin/systems/ppd/class_printerPPDDialog.inc:580
-#: admin/systems/ppd/class_printerPPDDialog.inc:583
-msgid "PPD error"
-msgstr ""
-
-#: admin/systems/ppd/class_printerPPDSelectionDialog.inc:139
-#, php-format
-msgid "Cannot locate vendor '%s' in available PPDs!"
-msgstr ""
-
-#: admin/systems/ppd/class_printerPPDSelectionDialog.inc:148
-msgid "Printer ppd selection."
-msgstr ""
-
-#: admin/systems/ppd/class_printerPPDSelectionDialog.inc:155
-msgid "delete"
-msgstr ""
-
-#: admin/systems/ppd/class_printerPPDSelectionDialog.inc:166
-msgid "back"
-msgstr ""
-
-#: admin/systems/ppd/class_printerPPDDialog.inc:74
-#: admin/systems/ppd/class_printerPPDDialog.inc:140
-#: admin/systems/services/class_goService.inc:241
-msgid "Configuration error"
-msgstr ""
-
-#: admin/systems/ppd/class_printerPPDDialog.inc:92
-#, php-format
-msgid "Cannot open PPD '%s'!"
-msgstr ""
-
-#: admin/systems/ppd/class_printerPPDDialog.inc:141
-#, php-format
-msgid "Cannot open PPD path '%s' for reading and writing!"
-msgstr ""
-
-#: admin/systems/ppd/class_printerPPDDialog.inc:160
-#: admin/systems/ppd/class_printerPPDDialog.inc:365
-msgid "file is empty"
-msgstr ""
-
-#: admin/systems/ppd/class_printerPPDDialog.inc:314
-#, php-format
-msgid "Cannot parse PPD '%s'!"
-msgstr ""
-
-#: admin/systems/ppd/class_printerPPDDialog.inc:340
-msgid "Overwrite existing PPD"
-msgstr ""
-
-#: admin/systems/ppd/class_printerPPDDialog.inc:341
-msgid ""
-"There is already a ppd file for this kind of printer. Do you want to "
-"overwrite it?"
-msgstr ""
-
-#: admin/systems/ppd/class_printerPPDDialog.inc:491
-msgid "Section"
-msgstr ""
-
-#: admin/systems/ppd/class_printerPPDDialog.inc:551
-#: admin/systems/ppd/class_printerPPDDialog.inc:554
-msgid "True"
-msgstr ""
-
-#: admin/systems/ppd/class_printerPPDDialog.inc:552
-#: admin/systems/ppd/class_printerPPDDialog.inc:555
-msgid "False"
-msgstr ""
-
-#: admin/systems/ppd/class_printerPPDDialog.inc:560
-#, php-format
-msgid "PPD type '%s' is not supported!"
-msgstr ""
-
-#: admin/systems/ppd/class_printerPPDDialog.inc:597
-msgid ""
-"Please select a valid ppd file or use 'Cancel' to go back to printer "
-"configuration."
-msgstr ""
-
-#: admin/systems/ppd/class_ppdManager.inc:44
-#: admin/systems/ppd/class_ppdManager.inc:188
-#: admin/systems/ppd/class_ppdManager.inc:190
-msgid "PPD manager error"
-msgstr ""
-
-#: admin/systems/ppd/class_ppdManager.inc:44
-#, php-format
-msgid "The specified path '%s' does not exist."
-msgstr ""
-
-#: admin/systems/ppd/class_ppdManager.inc:188
-#, php-format
-msgid "Specified PPD file '%s' cannot be opened for reading."
-msgstr ""
-
-#: admin/systems/ppd/class_ppdManager.inc:190
-#, php-format
-msgid "The temporary file '%s' cannot be opened for writing."
-msgstr ""
-
-#: admin/systems/ppd/class_ppdManager.inc:212
-#: admin/systems/ppd/class_ppdManager.inc:350
-msgid "Parsing PPD file failed - file is empty!"
-msgstr ""
-
-#: admin/systems/ppd/class_ppdManager.inc:222
-#, php-format
-msgid ""
-"Parsing PPD file %s failed - line too long. Trailing characters have been "
-"ignored!"
-msgstr ""
-
-#: admin/systems/ppd/class_ppdManager.inc:230
-msgid "Nested groups are not supported!"
-msgstr ""
-
-#: admin/systems/ppd/class_ppdManager.inc:234
-msgid "Group name not unique!"
-msgstr ""
-
-#: admin/systems/ppd/class_ppdManager.inc:240
-#: admin/systems/ppd/class_ppdManager.inc:270
-msgid "Symbol values are not supported yet!"
-msgstr ""
-
-#: admin/systems/ppd/class_ppdManager.inc:264
-msgid "Nested options are not supported!"
-msgstr ""
-
-#: admin/systems/ppd/class_ppdManager.inc:289
-msgid "PickMany is not supported yet!"
-msgstr ""
-
-#: admin/systems/ppd/class_ppdManager.inc:370
-#, php-format
-msgid ""
-"Parsing PPD file %s failed - line too long. Trailing characters have been "
-"ignored"
-msgstr ""
-
-#: admin/systems/ppd/class_ppdManager.inc:395
-#, php-format
-msgid "Parsing PPD file %s failed - no information found."
-msgstr ""
-
 #: admin/systems/class_systemImport.inc:72
 #, php-format
 msgid "Could not parse %s"
@@ -941,83 +471,130 @@ msgstr ""
 msgid "Import"
 msgstr ""
 
+#: admin/systems/class_systemImport.inc:169
+#: admin/systems/class_serverGeneric.inc:43
+#: admin/systems/class_serverGeneric.inc:48
+#: admin/systems/class_serverGeneric.inc:49
+msgid "Server"
+msgstr "Tjener"
+
 #: admin/systems/class_systemImport.inc:169
 msgid "The server you wish to import hosts from"
 msgstr ""
 
-#: admin/systems/class_serverGeneric.inc:34
+#: admin/systems/class_serverGeneric.inc:31
 msgid "server"
 msgstr "Tjener"
 
-#: admin/systems/class_serverGeneric.inc:47
+#: admin/systems/class_serverGeneric.inc:44
 msgid "Server information"
 msgstr ""
 
-#: admin/systems/class_componentGeneric.inc:37
+#: admin/systems/class_componentGeneric.inc:31
+msgid "Component"
+msgstr ""
+
+#: admin/systems/class_componentGeneric.inc:32
 msgid "Component information"
 msgstr ""
 
-#: admin/systems/class_componentGeneric.inc:64
+#: admin/systems/class_componentGeneric.inc:36
+#: admin/systems/class_componentGeneric.inc:37
+msgid "Network device"
+msgstr ""
+
+#: admin/systems/class_componentGeneric.inc:58
 msgid "The name of the component"
 msgstr ""
 
-#: admin/systems/class_componentGeneric.inc:68
+#: admin/systems/class_componentGeneric.inc:62
 msgid "A short description of the component"
 msgstr ""
 
+#: admin/systems/class_systemServers.inc:31
+#: admin/systems/class_systemServers.inc:53
+msgid "Servers"
+msgstr "Tjener"
+
+#: admin/systems/class_systemServers.inc:35
+msgid "The syslog server the system should be using"
+msgstr ""
+
+#: admin/systems/class_systemServers.inc:40
+msgid "NTP servers"
+msgstr ""
+
+#: admin/systems/class_systemServers.inc:40
+msgid "The NTP servers for this system"
+msgstr ""
+
+#: admin/systems/class_systemServers.inc:54
+msgid "Servers this system is using"
+msgstr ""
+
+#: admin/systems/class_mobilePhoneGeneric.inc:32
 #: admin/systems/class_mobilePhoneGeneric.inc:37
+#: admin/systems/class_mobilePhoneGeneric.inc:38
+msgid "Mobile phone"
+msgstr ""
+
+#: admin/systems/class_mobilePhoneGeneric.inc:33
 msgid "Mobile phone information"
 msgstr ""
 
-#: admin/systems/class_mobilePhoneGeneric.inc:63
+#: admin/systems/class_mobilePhoneGeneric.inc:60
 msgid "The name of the mobile phone"
 msgstr ""
 
-#: admin/systems/class_mobilePhoneGeneric.inc:67
+#: admin/systems/class_mobilePhoneGeneric.inc:64
 msgid "A short description of the mobile phone"
 msgstr ""
 
-#: admin/systems/class_mobilePhoneGeneric.inc:77
+#: admin/systems/class_mobilePhoneGeneric.inc:70
+msgid "Phone"
+msgstr ""
+
+#: admin/systems/class_mobilePhoneGeneric.inc:73
 msgid "Serial Number"
 msgstr ""
 
-#: admin/systems/class_mobilePhoneGeneric.inc:77
+#: admin/systems/class_mobilePhoneGeneric.inc:73
 msgid "The serial number of the mobile phone"
 msgstr ""
 
-#: admin/systems/class_mobilePhoneGeneric.inc:81
+#: admin/systems/class_mobilePhoneGeneric.inc:77
 msgid "IMEI Number"
 msgstr ""
 
-#: admin/systems/class_mobilePhoneGeneric.inc:81
+#: admin/systems/class_mobilePhoneGeneric.inc:77
 msgid "The IMEI number of the mobile phone"
 msgstr ""
 
-#: admin/systems/class_mobilePhoneGeneric.inc:86
+#: admin/systems/class_mobilePhoneGeneric.inc:82
 msgid "OS"
 msgstr ""
 
-#: admin/systems/class_mobilePhoneGeneric.inc:86
+#: admin/systems/class_mobilePhoneGeneric.inc:82
 msgid "The Operating System installed on this phone"
 msgstr ""
 
-#: admin/systems/class_mobilePhoneGeneric.inc:92
+#: admin/systems/class_mobilePhoneGeneric.inc:88
 msgid "SimCard"
 msgstr ""
 
-#: admin/systems/class_mobilePhoneGeneric.inc:95
+#: admin/systems/class_mobilePhoneGeneric.inc:91
 msgid "Telephone Number"
 msgstr ""
 
-#: admin/systems/class_mobilePhoneGeneric.inc:95
+#: admin/systems/class_mobilePhoneGeneric.inc:91
 msgid "The telephone number of the mobile phone"
 msgstr ""
 
-#: admin/systems/class_mobilePhoneGeneric.inc:99
+#: admin/systems/class_mobilePhoneGeneric.inc:95
 msgid "PUK Number"
 msgstr ""
 
-#: admin/systems/class_mobilePhoneGeneric.inc:99
+#: admin/systems/class_mobilePhoneGeneric.inc:95
 msgid "The PUK number of the simcard in this mobile phone"
 msgstr ""
 
@@ -1060,70 +637,20 @@ msgstr ""
 msgid "Remove service"
 msgstr ""
 
-#: admin/systems/phoneSelect/phoneSelect-list.xml:10
-msgid "Please select the desired entries"
-msgstr ""
-
-#: admin/systems/phoneSelect/phoneSelect-list.xml:56
-msgid "Number"
-msgstr ""
-
-#: admin/systems/phoneSelect/phoneSelect-list.xml:83
-msgid "Select this number"
-msgstr ""
-
-#: admin/systems/class_systemManagement.inc:177
-msgid "Back"
-msgstr ""
-
-#: admin/systems/class_systemManagement.inc:223
-msgid "Creating the image failed. Please see the report below."
-msgstr ""
-
-#: admin/systems/class_systemManagement.inc:228
-#, php-format
-msgid "Command '%s', specified for ISO creation doesn't seem to exist."
-msgstr ""
-
-#: admin/systems/class_systemManagement.inc:398
-#: admin/systems/class_systemManagement.inc:473
-#: admin/systems/class_systemManagement.inc:858
-#: admin/systems/class_systemManagement.inc:905
-#: admin/systems/class_systemManagement.inc:926
-msgid "Permission"
-msgstr ""
-
-#: admin/systems/class_systemManagement.inc:678
-msgid "Cannot set mode to 'active'!"
-msgstr ""
-
-#: admin/systems/class_systemManagement.inc:858
-#, php-format
-msgid "You are not allowed to create a snapshot for %s."
+#: admin/systems/class_systemManagement.inc:48
+#: config/systems/class_systemsPluginConfig.inc:28
+msgid "Systems"
 msgstr ""
 
-#: admin/systems/class_systemManagement.inc:905
-#: admin/systems/class_systemManagement.inc:926
-#, php-format
-msgid "You are not allowed to restore a snapshot for %s."
+#: admin/systems/class_systemManagement.inc:49
+msgid "Systems Management"
 msgstr ""
 
-#: admin/systems/class_systemManagement.inc:1169
+#: admin/systems/class_systemManagement.inc:250
 #, php-format
 msgid "Inherited from %s"
 msgstr ""
 
-#: admin/systems/class_systemManagement.inc:1224
-#: admin/systems/class_systemManagement.inc:1228
-#: addons/dashboard/class_dashBoardSystems.inc:199
-#: config/systems/class_systemsPluginConfig.inc:28
-msgid "Systems"
-msgstr ""
-
-#: admin/systems/class_systemManagement.inc:1225
-msgid "Systems Management"
-msgstr ""
-
 #: admin/systems/services/terminal/class_serviceTerminal.inc:29
 #: admin/systems/services/terminal/class_serviceTerminal.inc:30
 #: admin/systems/services/terminal/class_serviceTerminal.inc:41
@@ -1161,6 +688,10 @@ msgstr ""
 msgid "Empty service"
 msgstr ""
 
+#: admin/systems/services/class_goService.inc:241
+msgid "Configuration error"
+msgstr ""
+
 #: admin/systems/services/shares/class_serviceShare.inc:30
 #: admin/systems/services/shares/class_serviceShare.inc:31
 msgid "Share service"
@@ -1219,8 +750,6 @@ msgid "You need to configure encodings first"
 msgstr ""
 
 #: admin/systems/services/shares/class_serviceShare.inc:110
-#: admin/ogroups/goto/termgroup.tpl.c:2 admin/systems/remove.tpl.c:2
-#: admin/systems/ppd/remove_ppd.tpl.c:2
 msgid "Warning"
 msgstr ""
 
@@ -1346,153 +875,93 @@ msgstr ""
 msgid "LDAP"
 msgstr ""
 
-#: admin/systems/class_networkSettings.inc:305
+#: admin/systems/class_networkSettings.inc:297
 msgid "NOT IMPLEMENTED"
 msgstr ""
 
-#: admin/systems/class_networkSettings.inc:437
+#: admin/systems/class_networkSettings.inc:429
 msgid "Not matching"
 msgstr ""
 
-#: admin/systems/class_networkSettings.inc:584
+#: admin/systems/class_networkSettings.inc:576
 #, php-format
 msgid "Was not able to contact argonaut server: %s"
 msgstr ""
 
-#: admin/systems/class_networkSettings.inc:591
+#: admin/systems/class_networkSettings.inc:583
 #, php-format
 msgid "Was not able to find DNS server for zone %s"
 msgstr ""
 
-#: admin/systems/class_networkSettings.inc:597
+#: admin/systems/class_networkSettings.inc:589
 #, php-format
 msgid "Was not able to find mac address of DNS server %s"
 msgstr ""
 
-#: admin/systems/class_networkSettings.inc:604
+#: admin/systems/class_networkSettings.inc:596
 #, php-format
 msgid "Was not able to launch ldap2zone: %s"
 msgstr ""
 
-#: admin/systems/class_networkSettings.inc:630
+#: admin/systems/class_networkSettings.inc:622
 #, php-format
 msgid "IP address %s"
 msgstr ""
 
-#: admin/systems/class_networkSettings.inc:638
-#: admin/systems/class_networkSettings.inc:651
-#: admin/systems/class_networkSettings.inc:653
-#: admin/systems/class_networkSettings.inc:1022
-msgid "IP address"
-msgstr ""
-
-#: admin/systems/class_networkSettings.inc:644
-#: admin/systems/class_networkSettings.inc:660
-#: admin/systems/class_networkSettings.inc:662
-#: admin/systems/class_networkSettings.inc:1023
+#: admin/systems/class_networkSettings.inc:636
+#: admin/systems/class_networkSettings.inc:652
+#: admin/systems/class_networkSettings.inc:654
+#: admin/systems/class_networkSettings.inc:1015
 msgid "MAC address"
 msgstr ""
 
-#: admin/systems/class_networkSettings.inc:676
+#: admin/systems/class_networkSettings.inc:668
 #, php-format
 msgid "The IP address '%s' is not part of the selected reverse zone '%s'!"
 msgstr ""
 
-#: admin/systems/class_networkSettings.inc:686
+#: admin/systems/class_networkSettings.inc:678
 #, php-format
 msgid "Record type '%s' is duplicated!"
 msgstr ""
 
-#: admin/systems/class_networkSettings.inc:693
+#: admin/systems/class_networkSettings.inc:685
 #, php-format
 msgid "Uniq record type '%s' is duplicated!"
 msgstr ""
 
-#: admin/systems/class_networkSettings.inc:705
+#: admin/systems/class_networkSettings.inc:697
 #, php-format
 msgid ""
 "The IP address '%s' will be added as 'A Record', this will be done "
 "automatically, please remove the record."
 msgstr ""
 
-#: admin/systems/class_networkSettings.inc:712
+#: admin/systems/class_networkSettings.inc:704
 #, php-format
 msgid "Only lowercase records are allowed, please check your '%ss'."
 msgstr ""
 
-#: admin/systems/class_networkSettings.inc:978
+#: admin/systems/class_networkSettings.inc:970
 msgid "Delete"
 msgstr ""
 
-#: admin/systems/class_networkSettings.inc:984
+#: admin/systems/class_networkSettings.inc:976
 msgid "Add"
 msgstr ""
 
-#: admin/systems/class_networkSettings.inc:1015
-#: addons/dashboard/class_dashBoardNetwork.inc:127
+#: admin/systems/class_networkSettings.inc:1007
 msgid "Network"
 msgstr ""
 
-#: admin/systems/class_networkSettings.inc:1030
+#: admin/systems/class_networkSettings.inc:1022
 msgid "DNS configuration"
 msgstr ""
 
-#: admin/systems/class_networkSettings.inc:1033
+#: admin/systems/class_networkSettings.inc:1025
 msgid "DHCP configuration"
 msgstr ""
 
-#: addons/dashboard/class_dashBoardSystems.inc:45
-msgid "Workstations"
-msgstr ""
-
-#: addons/dashboard/class_dashBoardSystems.inc:51
-msgid "Windows Workstations"
-msgstr ""
-
-#: addons/dashboard/class_dashBoardSystems.inc:54
-msgid "Terminals"
-msgstr ""
-
-#: addons/dashboard/class_dashBoardSystems.inc:57
-msgid "Printers"
-msgstr ""
-
-#: addons/dashboard/class_dashBoardSystems.inc:60
-msgid "Phones"
-msgstr ""
-
-#: addons/dashboard/class_dashBoardSystems.inc:63
-msgid "Components"
-msgstr ""
-
-#: addons/dashboard/class_dashBoardSystems.inc:66
-msgid "Mobile phones"
-msgstr ""
-
-#: addons/dashboard/class_dashBoardSystems.inc:183
-msgid "Statistics"
-msgstr ""
-
-#: addons/dashboard/class_dashBoardSystems.inc:188
-msgid "Computer name to use by unit"
-msgstr ""
-
-#: addons/dashboard/class_dashBoardSystems.inc:200
-msgid "Statistics and informations about systems"
-msgstr ""
-
-#: addons/dashboard/class_dashBoardNetwork.inc:111
-msgid "DHCP"
-msgstr ""
-
-#: addons/dashboard/class_dashBoardNetwork.inc:116
-msgid "DNS"
-msgstr ""
-
-#: addons/dashboard/class_dashBoardNetwork.inc:128
-msgid "Statistics and various informations"
-msgstr ""
-
 #: config/systems/class_systemsPluginConfig.inc:29
 msgid "Systems plugin configuration"
 msgstr ""
@@ -1584,404 +1053,3 @@ msgstr ""
 #: config/systems/class_systemsPluginConfig.inc:101
 msgid "Encodings"
 msgstr ""
-
-#: admin/ogroups/goto/termgroup.tpl.c:5
-msgid ""
-"Actions you choose here influence all systems in this object group. "
-"Additionally, all values editable here can be inherited by the clients "
-"assigned to this object group."
-msgstr ""
-
-#: admin/ogroups/goto/termgroup.tpl.c:8
-msgid "Generic"
-msgstr "Generisk"
-
-#: admin/ogroups/goto/termgroup.tpl.c:11
-msgid "NTP server"
-msgstr ""
-
-#: admin/ogroups/goto/termgroup.tpl.c:14
-msgid "Choose server to use for synchronizing time"
-msgstr ""
-
-#: admin/ogroups/goto/termgroup.tpl.c:20
-msgid "Select terminal mode"
-msgstr ""
-
-#: admin/ogroups/goto/termgroup.tpl.c:26
-msgid "Choose server to use for logging"
-msgstr ""
-
-#: admin/ogroups/goto/termgroup.tpl.c:32
-msgid "Select NFS root filesystem to use"
-msgstr ""
-
-#: admin/ogroups/goto/termgroup.tpl.c:38
-msgid "Choose NFS filesystem to place swap files on"
-msgstr ""
-
-#: admin/ogroups/goto/termgroup.tpl.c:47
-msgid "Execute"
-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 admin/systems/network.tpl.c:11
-msgid "Propose ip"
-msgstr ""
-
-#: admin/systems/network.tpl.c:14
-msgid "MAC-address"
-msgstr ""
-
-#: admin/systems/network.tpl.c:17
-msgid "Autodetect"
-msgstr ""
-
-#: admin/systems/network.tpl.c:20 admin/systems/network.tpl.c:23
-msgid "Enable DHCP for this device"
-msgstr ""
-
-#: admin/systems/network.tpl.c:26 admin/systems/network.tpl.c:50
-msgid "not configured"
-msgstr ""
-
-#: admin/systems/network.tpl.c:29
-msgid "Parent node"
-msgstr ""
-
-#: admin/systems/network.tpl.c:32
-msgid "Edit settings"
-msgstr ""
-
-#: admin/systems/network.tpl.c:35 admin/systems/network.tpl.c:47
-msgid "Enable DNS for this device"
-msgstr ""
-
-#: admin/systems/network.tpl.c:38
-msgid "Zone"
-msgstr ""
-
-#: admin/systems/network.tpl.c:41
-msgid "TTL"
-msgstr ""
-
-#: admin/systems/network.tpl.c:44
-msgid "Dns records"
-msgstr ""
-
-#: admin/systems/password.tpl.c:2
-msgid ""
-"To change the terminal root password use the fields below. The changes take "
-"effect during the next reboot. Please memorize the new password, because you"
-" wouldn't be able to log in."
-msgstr ""
-
-#: admin/systems/password.tpl.c:5
-msgid "Leave fields blank for password inheritance from default entries."
-msgstr ""
-
-#: admin/systems/password.tpl.c:8
-msgid "Changing the password impinges on authentification only."
-msgstr ""
-
-#: admin/systems/password.tpl.c:11
-msgid "New password"
-msgstr ""
-
-#: admin/systems/password.tpl.c:14
-msgid "Repeat new password"
-msgstr ""
-
-#: admin/systems/password.tpl.c:17
-msgid "Password strength"
-msgstr ""
-
-#: admin/systems/password.tpl.c:20
-msgid "Set password"
-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/gencd.tpl.c:2
-msgid "CD-Install-Image generation"
-msgstr ""
-
-#: admin/systems/gencd.tpl.c:5
-msgid ""
-"This option enables you to generate FAI install CD images for the selected "
-"workstation. The procedure may take about 10 minutes to complete, so please "
-"be patient after pressing the 'Create ISO-Image' button."
-msgstr ""
-
-#: admin/systems/gencd.tpl.c:8
-msgid "Create ISO-Image"
-msgstr ""
-
-#: admin/systems/remove.tpl.c:5
-msgid ""
-"This includes all account data, system access rules, imap settings, etc. for"
-" this user. Please double check if your really want to do this since there "
-"is no way for FusionDirectory to get your data back."
-msgstr ""
-
-#: admin/systems/remove.tpl.c:8
-msgid "So - if you're sure - press 'Delete' to continue or 'Cancel' to abort."
-msgstr ""
-
-#: admin/systems/system-filter.tpl.c:2
-#: admin/systems/phoneSelect/phoneSelect-filter.tpl.c:2
-msgid "Filter"
-msgstr "Filter"
-
-#: admin/systems/system-filter.tpl.c:5
-msgid "Show servers"
-msgstr ""
-
-#: admin/systems/system-filter.tpl.c:8
-msgid "Show workstations"
-msgstr ""
-
-#: admin/systems/system-filter.tpl.c:11
-msgid "Show terminals"
-msgstr ""
-
-#: admin/systems/system-filter.tpl.c:14
-msgid "Show network printer"
-msgstr ""
-
-#: admin/systems/system-filter.tpl.c:17
-#: admin/systems/phoneSelect/phoneSelect-filter.tpl.c:5
-msgid "Show phones"
-msgstr ""
-
-#: admin/systems/system-filter.tpl.c:20
-msgid "Show windows based workstations"
-msgstr ""
-
-#: admin/systems/system-filter.tpl.c:23
-msgid "Show network devices"
-msgstr ""
-
-#: admin/systems/system-filter.tpl.c:26
-#: admin/systems/phoneSelect/phoneSelect-filter.tpl.c:8
-msgid "Show mobile phones"
-msgstr ""
-
-#: admin/systems/system-filter.tpl.c:29
-msgid "Show IPMI interfaces"
-msgstr ""
-
-#: admin/systems/ppd/printerPPDSelectionDialog.tpl.c:2
-msgid "Select objects to add"
-msgstr ""
-
-#: admin/systems/ppd/printerPPDSelectionDialog.tpl.c:5
-msgid "Filters"
-msgstr "Filter"
-
-#: admin/systems/ppd/printerPPDSelectionDialog.tpl.c:8
-msgid "Display objects matching"
-msgstr ""
-
-#: admin/systems/ppd/printerPPDSelectionDialog.tpl.c:11
-msgid "Regular expression for matching object names"
-msgstr ""
-
-#: admin/systems/ppd/printerPPDSelectionDialog.tpl.c:14
-msgid "Close"
-msgstr ""
-
-#: admin/systems/ppd/printerPPDDialog.tpl.c:2
-msgid "Printer driver"
-msgstr ""
-
-#: admin/systems/ppd/printerPPDDialog.tpl.c:5
-msgid "Model"
-msgstr ""
-
-#: admin/systems/ppd/printerPPDDialog.tpl.c:8
-msgid "Select"
-msgstr ""
-
-#: admin/systems/ppd/printerPPDDialog.tpl.c:11
-msgid "New driver"
-msgstr ""
-
-#: admin/systems/ppd/printerPPDDialog.tpl.c:14
-msgid "Upload"
-msgstr ""
-
-#: admin/systems/ppd/printerPPDDialog.tpl.c:17
-msgid "Options"
-msgstr ""
-
-#: admin/systems/ppd/remove_ppd.tpl.c:5
-msgid "The ppd file will be removed from the server and can not be restored."
-msgstr ""
-
-#: admin/systems/printer.tpl.c:2
-msgid "General"
-msgstr ""
-
-#: admin/systems/printer.tpl.c:5
-msgid "Printer name"
-msgstr ""
-
-#: admin/systems/printer.tpl.c:14
-msgid "Details"
-msgstr ""
-
-#: admin/systems/printer.tpl.c:20
-msgid "Printer location"
-msgstr ""
-
-#: admin/systems/printer.tpl.c:26
-msgid "PPD Provider"
-msgstr ""
-
-#: admin/systems/printer.tpl.c:29
-msgid "Driver"
-msgstr ""
-
-#: admin/systems/printer.tpl.c:32
-msgid "Edit"
-msgstr "Endre"
-
-#: admin/systems/printer.tpl.c:41
-msgid "Users which are allowed to use this printer"
-msgstr ""
-
-#: admin/systems/printer.tpl.c:44
-msgid "Users"
-msgstr ""
-
-#: admin/systems/printer.tpl.c:47
-msgid "Users which are allowed to administrate this printer"
-msgstr ""
-
-#: admin/systems/printer.tpl.c:50
-msgid "Admins"
-msgstr ""
-
-#: admin/systems/printer.tpl.c:53
-msgid "Windows paths"
-msgstr ""
-
-#: admin/systems/printer.tpl.c:56
-msgid "Printer windows inf file"
-msgstr ""
-
-#: admin/systems/printer.tpl.c:59
-msgid "Printer driver directory"
-msgstr ""
-
-#: admin/systems/gencd_frame.tpl.c:2
-msgid "Your browser does not supprt iframes."
-msgstr ""
-
-#: admin/systems/services/cups/serviceCUPS.tpl.c:2
-msgid "Print Service"
-msgstr ""
-
-#: admin/systems/services/cups/serviceCUPS.tpl.c:5
-msgid "enabled"
-msgstr ""
-
-#: admin/systems/services/ServiceAddDialog.tpl.c:2
-msgid "Adding a new service to the current server"
-msgstr ""
-
-#: admin/systems/services/ServiceAddDialog.tpl.c:5
-msgid ""
-"This dialog allows you to add new services to the currenty edited server "
-"object. The box below shows all available but not already used services."
-msgstr ""
-
-#: admin/systems/services/ServiceAddDialog.tpl.c:8
-msgid "Service to add"
-msgstr ""
-
-#: admin/systems/services/ServiceAddDialog.tpl.c:11
-msgid "All available services are already in use."
-msgstr ""
-
-#: admin/systems/services/ServiceAddDialog.tpl.c:14
-#: admin/systems/SelectDeviceType.tpl.c:26
-msgid "Continue"
-msgstr ""
-
-#: admin/systems/SelectDeviceType.tpl.c:2
-msgid ""
-"This system has no system type configured. Please choose a system type for "
-"this object and an optional inheritance group. Press the 'continue' button "
-"to proceed."
-msgstr ""
-
-#: admin/systems/SelectDeviceType.tpl.c:5
-msgid ""
-"Please select a system type and an optional bundle of predefined settings to"
-" be inherited."
-msgstr ""
-
-#: admin/systems/SelectDeviceType.tpl.c:8
-msgid ""
-"Please select a system type and a bundle of predefined settings to be "
-"inherited."
-msgstr ""
-
-#: admin/systems/SelectDeviceType.tpl.c:11
-#: admin/systems/SelectDeviceType.tpl.c:14
-msgid "System type"
-msgstr ""
-
-#: admin/systems/SelectDeviceType.tpl.c:17
-msgid "Choose an object group as template"
-msgstr ""
-
-#: admin/systems/SelectDeviceType.tpl.c:20
-msgid "Object group"
-msgstr ""
-
-#: admin/systems/SelectDeviceType.tpl.c:23
-msgid "none"
-msgstr ""
-
-#: addons/dashboard/systems_stats.tpl.c:2
-msgid "There are several argonaut servers! (this is not yet supported)"
-msgstr ""
-
-#: addons/dashboard/systems_stats.tpl.c:5
-msgid "There is an argonaut server running on %1 (%3://%2:%4)"
-msgstr ""
-
-#: addons/dashboard/systems_stats.tpl.c:8
-msgid "Only one system is configured to run an argonaut client."
-msgid_plural "%1 systems are configured to run an argonaut client."
-msgstr[0] ""
-msgstr[1] ""
-
-#: addons/dashboard/systems_stats.tpl.c:11
-msgid "But no system is configured to run an argonaut client!"
-msgstr ""
-
-#: addons/dashboard/systems_stats.tpl.c:14
-msgid ""
-"A system is configured to run an argonaut client, but there is no argonaut "
-"server configured!"
-msgid_plural ""
-"%1 systems are configured to run an argonaut client, but there is no "
-"argonaut server configured!"
-msgstr[0] ""
-msgstr[1] ""
diff --git a/systems/locale/nl/fusiondirectory.po b/systems/locale/nl/fusiondirectory.po
index 567af355c78ac9a2a0691fa4ac7871f15b3e38b3..4cd3b7501a1d9c41f64605e0b06ee941ec483adc 100644
--- a/systems/locale/nl/fusiondirectory.po
+++ b/systems/locale/nl/fusiondirectory.po
@@ -3,17 +3,14 @@
 # This file is distributed under the same license as the PACKAGE package.
 # 
 # Translators:
-# Christophe Augello <christophe@augello.be>, 2012
-# Kenny Tordeurs <tordeurskenny@gmail.com>, 2013
-#  Niels Klomp (CareWorks ICT Services) <nk@careworks.nl>, 2005
 msgid ""
 msgstr ""
-"Project-Id-Version: FusionDirectory-108\n"
+"Project-Id-Version: FusionDirectory-109\n"
 "Report-Msgid-Bugs-To: documentation@lists.fusiondirectory.org\n"
-"POT-Creation-Date: 2015-03-31 11:49+0200\n"
+"POT-Creation-Date: 2014-12-15 17:47+0100\n"
 "PO-Revision-Date: 2015-03-31 11:41+0000\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>\n"
-"Language-Team: Dutch (http://www.transifex.com/projects/p/FusionDirectory-108/language/nl/)\n"
+"Language-Team: Dutch (http://www.transifex.com/projects/p/FusionDirectory-109/language/nl/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -29,29 +26,24 @@ msgid "Locked"
 msgstr "Geblokkeerd"
 
 #: admin/ogroups/goto/class_termgroup.inc:118
-#: admin/systems/class_terminalGeneric.inc:121
+#: admin/systems/class_terminalStartup.inc:145
 msgid "Local swap"
 msgstr "Lokale swap"
 
 #: admin/ogroups/goto/class_termgroup.inc:124
 #: admin/ogroups/goto/class_termgroup.inc:136
-#: admin/systems/class_workstationGeneric.inc:352
-#: admin/systems/class_terminalGeneric.inc:109
-#: admin/systems/class_terminalGeneric.inc:125
+#: admin/systems/class_terminalStartup.inc:133
+#: admin/systems/class_terminalStartup.inc:149
 msgid "inherited"
 msgstr "overerfd"
 
 #: admin/ogroups/goto/class_termgroup.inc:220
-#: admin/systems/class_workstationGeneric.inc:72
-#: admin/systems/class_workstationGeneric.inc:443
-#: admin/systems/class_systemManagement.inc:295
-#: admin/systems/class_systemManagement.inc:325
-msgid "Infrastructure service"
-msgstr ""
+#: admin/systems/class_systemManagement.inc:165
+#: admin/systems/class_systemManagement.inc:186
+msgid "Service infrastructure"
+msgstr "Dienst infrastructuur"
 
 #: admin/ogroups/goto/class_termgroup.inc:224
-#: admin/systems/class_workstationGeneric.inc:75
-#: admin/systems/class_workstationGeneric.inc:78
 msgid "Event error"
 msgstr "Event fout"
 
@@ -61,12 +53,10 @@ msgid "Event '%s' is not available!"
 msgstr "Event '%s' is niet beschikbaar!"
 
 #: admin/ogroups/goto/class_termgroup.inc:274
-#: admin/systems/class_workstationGeneric.inc:112
 msgid "Switch off"
 msgstr "Uitschakelen"
 
 #: admin/ogroups/goto/class_termgroup.inc:274
-#: admin/systems/class_workstationGeneric.inc:113
 msgid "Reboot"
 msgstr "Herstarten"
 
@@ -87,7 +77,6 @@ msgid "Reinstall"
 msgstr "Herinstalleer"
 
 #: admin/ogroups/goto/class_termgroup.inc:279
-#: admin/systems/class_workstationGeneric.inc:108
 msgid "Memory test"
 msgstr "Geheugentest"
 
@@ -96,21 +85,18 @@ msgid "System analysis"
 msgstr "Systeem analyse"
 
 #: admin/ogroups/goto/class_termgroup.inc:386
-#: admin/systems/class_printGeneric.inc:670
-#: admin/systems/class_printGeneric.inc:970
-#: admin/systems/class_systemManagement.inc:816
 #: admin/systems/services/class_goService.inc:123
 #: admin/systems/services/class_goService.inc:151
 #: admin/systems/services/class_goService.inc:187
-#: admin/systems/class_networkSettings.inc:478
-#: admin/systems/class_networkSettings.inc:491
-#: admin/systems/class_networkSettings.inc:757
-#: admin/systems/class_networkSettings.inc:816
-#: admin/systems/class_networkSettings.inc:835
-#: admin/systems/class_networkSettings.inc:852
-#: admin/systems/class_networkSettings.inc:861
-#: admin/systems/class_networkSettings.inc:879
-#: admin/systems/class_networkSettings.inc:951
+#: admin/systems/class_networkSettings.inc:470
+#: admin/systems/class_networkSettings.inc:483
+#: admin/systems/class_networkSettings.inc:749
+#: admin/systems/class_networkSettings.inc:808
+#: admin/systems/class_networkSettings.inc:827
+#: admin/systems/class_networkSettings.inc:844
+#: admin/systems/class_networkSettings.inc:853
+#: admin/systems/class_networkSettings.inc:871
+#: admin/systems/class_networkSettings.inc:943
 msgid "LDAP error"
 msgstr "LDAP fout"
 
@@ -122,195 +108,125 @@ msgstr "Systeem"
 msgid "System group"
 msgstr "Systeem groep"
 
-#: admin/ogroups/goto/class_termgroup.inc:401
-#: admin/ogroups/goto/termgroup.tpl.c:17
+#: admin/ogroups/goto/class_termgroup.inc:402
 msgid "Mode"
 msgstr "Modus"
 
-#: admin/ogroups/goto/class_termgroup.inc:402
-#: admin/systems/class_workstationGeneric.inc:189
-#: admin/ogroups/goto/termgroup.tpl.c:23
+#: admin/ogroups/goto/class_termgroup.inc:403
+#: admin/systems/class_systemServers.inc:35
 msgid "Syslog server"
 msgstr "Syslog server"
 
-#: admin/ogroups/goto/class_termgroup.inc:403
+#: admin/ogroups/goto/class_termgroup.inc:404
 msgid "Action flag"
 msgstr "Actie vlag"
 
-#: admin/ogroups/goto/class_termgroup.inc:404
+#: admin/ogroups/goto/class_termgroup.inc:405
 msgid "Ntp server"
 msgstr "Ntp server"
 
-#: admin/ogroups/goto/class_termgroup.inc:405
-#: admin/systems/class_terminalGeneric.inc:41
-#: admin/ogroups/goto/termgroup.tpl.c:29
+#: admin/ogroups/goto/class_termgroup.inc:406
+#: admin/systems/class_terminalStartup.inc:65
 msgid "Root server"
 msgstr "Root server"
 
-#: admin/ogroups/goto/class_termgroup.inc:406
-#: admin/systems/class_terminalGeneric.inc:47
-#: admin/ogroups/goto/termgroup.tpl.c:35
+#: admin/ogroups/goto/class_termgroup.inc:407
+#: admin/systems/class_terminalStartup.inc:69
 msgid "Swap server"
 msgstr "Swap server"
 
-#: admin/systems/class_terminalStartup.inc:63
+#: admin/systems/class_terminalStartup.inc:62
 msgid "Startup parameters"
 msgstr "Opstart parameters"
 
-#: admin/systems/class_terminalStartup.inc:66
+#: admin/systems/class_terminalStartup.inc:65
+msgid "The root server the terminal should be using"
+msgstr ""
+
+#: admin/systems/class_terminalStartup.inc:69
+msgid "The swap server the terminal should be using"
+msgstr ""
+
+#: admin/systems/class_terminalStartup.inc:73
 msgid "Boot kernel"
 msgstr "Boot kernel"
 
-#: admin/systems/class_terminalStartup.inc:66
+#: admin/systems/class_terminalStartup.inc:73
 msgid "Linux kernel to be installed and booted"
 msgstr "Linux kernel om te installeren en te booten"
 
-#: admin/systems/class_terminalStartup.inc:70
+#: admin/systems/class_terminalStartup.inc:77
 msgid "Boot kernel parameters"
 msgstr "Boot kernel parameters"
 
-#: admin/systems/class_terminalStartup.inc:70
+#: admin/systems/class_terminalStartup.inc:77
 msgid "Linux kernel parameters to be ran"
 msgstr "Linux kernel parameters om te draaien"
 
-#: admin/systems/class_terminalStartup.inc:82
-msgid "Startup"
-msgstr "Opstarten"
-
 #: admin/systems/class_terminalStartup.inc:83
-msgid "Terminal startup"
-msgstr "Terminal startup"
-
-#: admin/systems/system-list.xml:10
-msgid "List of systems"
-msgstr "Lijst met systemen"
-
-#: admin/systems/system-list.xml:14
-msgid "New workstation"
-msgstr "Nieuw werkstation"
-
-#: admin/systems/system-list.xml:22
-msgid "Locked server"
-msgstr "Vergrendelde server"
-
-#: admin/systems/system-list.xml:30
-msgid "Locked workstation"
-msgstr "Vergrendelde workstation"
-
-#: admin/systems/system-list.xml:38
-msgid "Locked terminal"
-msgstr "Vergrendelde terminal"
-
-#: admin/systems/system-list.xml:47
-msgid "New terminal"
-msgstr "Nieuwe terminal"
-
-#: admin/systems/system-list.xml:55
-msgid "New device"
-msgstr "Nieuw apparatuur"
-
-#: admin/systems/system-list.xml:63
-msgid "Workstation template"
-msgstr "Werkstation sjabloon"
-
-#: admin/systems/system-list.xml:71
-msgid "Terminal template"
-msgstr "Terminal sjabloon"
-
-#: admin/systems/system-list.xml:79
-msgid "Winstation"
-msgstr "Windows werkstation"
+msgid "Remote desktop"
+msgstr "Remote desktop"
 
-#: admin/systems/system-list.xml:87 admin/systems/system-list.xml:234
-#: admin/systems/class_systemImport.inc:169
-#: admin/systems/class_serverGeneric.inc:46
-#: admin/systems/class_serverGeneric.inc:51
-#: admin/systems/class_serverGeneric.inc:52
-#: admin/systems/class_SelectDeviceType.inc:58
-msgid "Server"
-msgstr "Server"
+#: admin/systems/class_terminalStartup.inc:87
+msgid "Connect method"
+msgstr "Verbindings methode"
 
-#: admin/systems/system-list.xml:95 admin/systems/system-list.xml:242
-#: admin/systems/class_workstationGeneric.inc:458
-#: admin/systems/class_workstationGeneric.inc:463
-#: admin/systems/class_workstationGeneric.inc:464
-#: admin/systems/class_SelectDeviceType.inc:58
-msgid "Workstation"
-msgstr "Werkstation"
+#: admin/systems/class_terminalStartup.inc:91
+msgid "XDMCP"
+msgstr "XDMCP"
 
-#: admin/systems/system-list.xml:103 admin/systems/system-list.xml:250
-#: admin/systems/class_terminalGeneric.inc:81
-#: admin/systems/class_terminalGeneric.inc:86
-#: admin/systems/class_terminalGeneric.inc:87
-#: admin/systems/class_SelectDeviceType.inc:58
-msgid "Terminal"
-msgstr "Terminal"
+#: admin/systems/class_terminalStartup.inc:91
+msgid "LDM"
+msgstr "LDM"
 
-#: admin/systems/system-list.xml:111 admin/systems/class_printGeneric.inc:1005
-#: admin/systems/class_printGeneric.inc:1011
-#: admin/systems/class_printGeneric.inc:1012
-msgid "Printer"
-msgstr "Printer"
+#: admin/systems/class_terminalStartup.inc:91
+msgid "Shell"
+msgstr "Shell"
 
-#: admin/systems/system-list.xml:119 admin/systems/system-list.xml:274
-#: admin/systems/class_mobilePhoneGeneric.inc:74
-#: admin/systems/phoneSelect/phoneSelect-list.xml:14
-msgid "Phone"
-msgstr "Telefoon"
+#: admin/systems/class_terminalStartup.inc:91
+msgid "Telnet"
+msgstr "Telnet"
 
-#: admin/systems/system-list.xml:127
-#: admin/systems/class_mobilePhoneGeneric.inc:36
-#: admin/systems/class_mobilePhoneGeneric.inc:41
-#: admin/systems/class_mobilePhoneGeneric.inc:42
-#: admin/systems/phoneSelect/phoneSelect-list.xml:22
-msgid "Mobile phone"
-msgstr "GSM nummer"
+#: admin/systems/class_terminalStartup.inc:91
+msgid "Windows RDP"
+msgstr "Windows RDP"
 
-#: admin/systems/system-list.xml:135
-#: admin/systems/class_componentGeneric.inc:36
-msgid "Component"
-msgstr "Component"
+#: admin/systems/class_terminalStartup.inc:95
+msgid "Terminal server"
+msgstr "Terminal server"
 
-#: admin/systems/system-list.xml:143 admin/systems/system-list.xml:298
-msgid "IPMI"
-msgstr ""
+#: admin/systems/system-list.xml:10
+msgid "List of systems"
+msgstr "Lijst met systemen"
 
-#: admin/systems/system-list.xml:169
-#: admin/systems/class_workstationGeneric.inc:154
-#: admin/systems/class_printGeneric.inc:752
-#: admin/systems/class_printGeneric.inc:762
-#: admin/systems/class_printGeneric.inc:781
-#: admin/systems/class_printGeneric.inc:1022
-#: admin/systems/class_componentGeneric.inc:64
-#: admin/systems/class_mobilePhoneGeneric.inc:63
-#: admin/systems/phoneSelect/phoneSelect-list.xml:48
+#: admin/systems/system-list.xml:31
+#: admin/systems/class_workstationGeneric.inc:46
+#: admin/systems/class_printGeneric.inc:60
+#: admin/systems/class_componentGeneric.inc:58
+#: admin/systems/class_mobilePhoneGeneric.inc:60
 #: admin/systems/services/shares/class_serviceShare.inc:52
-#: admin/systems/system-filter.tpl.c:32
-#: admin/systems/phoneSelect/phoneSelect-filter.tpl.c:11
 msgid "Name"
 msgstr "Naam"
 
-#: admin/systems/system-list.xml:177
-#: admin/systems/phoneSelect/phoneSelect-list.xml:63
+#: admin/systems/system-list.xml:39
 msgid "IP"
 msgstr "IP"
 
-#: admin/systems/system-list.xml:185
+#: admin/systems/system-list.xml:47
 msgid "MAC"
 msgstr "MAC"
 
-#: admin/systems/system-list.xml:193
-#: admin/systems/class_workstationGeneric.inc:160
-#: admin/systems/class_printGeneric.inc:1024
-#: admin/systems/class_componentGeneric.inc:68
-#: admin/systems/class_mobilePhoneGeneric.inc:67
+#: admin/systems/system-list.xml:55
+#: admin/systems/class_workstationGeneric.inc:51
+#: admin/systems/class_printGeneric.inc:64
+#: admin/systems/class_componentGeneric.inc:62
+#: admin/systems/class_mobilePhoneGeneric.inc:64
 #: admin/systems/serverService-list.xml:35
 #: admin/systems/services/shares/class_serviceShare.inc:56
-#: admin/systems/printer.tpl.c:8 admin/systems/printer.tpl.c:17
 msgid "Description"
 msgstr "Omschrijving"
 
-#: admin/systems/system-list.xml:201 admin/systems/class_serverService.inc:57
+#: admin/systems/system-list.xml:63 admin/systems/class_serverService.inc:57
 #: admin/systems/services/terminal/class_serviceTerminal.inc:30
 #: admin/systems/services/cups/class_serviceCUPS.inc:85
 #: admin/systems/services/shares/class_serviceShare.inc:31
@@ -319,385 +235,193 @@ msgstr "Omschrijving"
 msgid "Services"
 msgstr "Services"
 
-#: admin/systems/system-list.xml:209
+#: admin/systems/system-list.xml:71
 msgid "Release"
 msgstr "Distributie versie"
 
-#: admin/systems/system-list.xml:217 admin/systems/serverService-list.xml:43
-#: admin/systems/phoneSelect/phoneSelect-list.xml:70
+#: admin/systems/system-list.xml:79 admin/systems/serverService-list.xml:43
 msgid "Actions"
 msgstr "Acties"
 
-#: admin/systems/system-list.xml:228 admin/systems/serverService-list.xml:54
+#: admin/systems/system-list.xml:90 admin/systems/serverService-list.xml:54
 msgid "Create"
 msgstr "Aanmaken"
 
-#: admin/systems/system-list.xml:258
-msgid "winStation"
-msgstr "winStation"
-
-#: admin/systems/system-list.xml:266
-msgid "Network printer"
-msgstr "Netwerk printer"
-
-#: admin/systems/system-list.xml:282
-#: admin/systems/class_componentGeneric.inc:41
-#: admin/systems/class_componentGeneric.inc:42
-msgid "Network device"
-msgstr "Netwerk apparatuur"
-
-#: admin/systems/system-list.xml:290
-msgid "Mobile Phone"
-msgstr ""
-
-#: admin/systems/system-list.xml:310
+#: admin/systems/system-list.xml:100
 msgid "Trigger action"
 msgstr "Trigger actie"
 
-#: admin/systems/system-list.xml:317
+#: admin/systems/system-list.xml:107
 msgid "Schedule action"
 msgstr "Plan actie"
 
-#: admin/systems/system-list.xml:330
-msgid "Activate systems"
-msgstr "Activeer systemen"
-
-#: admin/systems/system-list.xml:337 admin/systems/serverService-list.xml:69
-#: admin/systems/printer.tpl.c:35
+#: admin/systems/system-list.xml:119 admin/systems/serverService-list.xml:69
 msgid "Remove"
 msgstr "Verwijderen"
 
-#: admin/systems/system-list.xml:367
-msgid "Create ISO"
-msgstr "Make ISO"
-
-#: admin/systems/system-list.xml:379
+#: admin/systems/system-list.xml:150
 msgid "Edit system"
 msgstr ""
 
-#: admin/systems/system-list.xml:392
+#: admin/systems/system-list.xml:163
 msgid "Remove system"
 msgstr "Verwijder systeem"
 
-#: admin/systems/class_workstationGeneric.inc:75
-#, php-format
-msgid "Event %s is not available!"
-msgstr ""
-
-#: admin/systems/class_workstationGeneric.inc:78
-msgid "Events are not available!"
-msgstr ""
-
-#: admin/systems/class_workstationGeneric.inc:106
-msgid "(Re)Install"
-msgstr ""
-
-#: admin/systems/class_workstationGeneric.inc:107
-msgid "Software update"
-msgstr "Software update"
-
-#: admin/systems/class_workstationGeneric.inc:115
-msgid "Wake up"
-msgstr "Aanzetten"
-
-#: admin/systems/class_workstationGeneric.inc:144
-#: admin/systems/class_printGeneric.inc:604
+#: admin/systems/class_workstationGeneric.inc:35
 msgid "workstation"
 msgstr "workstation"
 
-#: admin/systems/class_workstationGeneric.inc:151
-#: admin/systems/class_componentGeneric.inc:61
-#: admin/systems/class_mobilePhoneGeneric.inc:60
+#: admin/systems/class_workstationGeneric.inc:42
+#: admin/systems/class_printGeneric.inc:56
+#: admin/systems/class_componentGeneric.inc:55
+#: admin/systems/class_mobilePhoneGeneric.inc:56
 msgid "Properties"
 msgstr "Eigenschappen"
 
-#: admin/systems/class_workstationGeneric.inc:155
+#: admin/systems/class_workstationGeneric.inc:47
 #, php-format
 msgid "The name of the %s"
 msgstr "De naam van deze %s"
 
-#: admin/systems/class_workstationGeneric.inc:161
+#: admin/systems/class_workstationGeneric.inc:52
 #, php-format
 msgid "A short description of the %s"
 msgstr "Een korte beschrijving van de %s"
 
-#: admin/systems/class_workstationGeneric.inc:166
-#: admin/systems/class_printGeneric.inc:1025
+#: admin/systems/class_workstationGeneric.inc:56
 msgid "Location"
 msgstr "Plaats"
 
-#: admin/systems/class_workstationGeneric.inc:167
+#: admin/systems/class_workstationGeneric.inc:57
 #, php-format
 msgid "The location of the %s"
 msgstr "De locatie van de %s"
 
-#: admin/systems/class_workstationGeneric.inc:173
+#: admin/systems/class_workstationGeneric.inc:61
 #, php-format
 msgid "Lock this %s"
 msgstr "Blokkeer dit %s"
 
-#: admin/systems/class_workstationGeneric.inc:174
+#: admin/systems/class_workstationGeneric.inc:62
 #, php-format
 msgid "This will prevent the %s from being reinstalled"
 msgstr ""
 
-#: admin/systems/class_workstationGeneric.inc:185
-#: addons/dashboard/class_dashBoardSystems.inc:48
-msgid "Servers"
-msgstr "Servers"
-
-#: admin/systems/class_workstationGeneric.inc:190
-#, php-format
-msgid "The syslog server the %s should be using"
+#: admin/systems/class_workstationGeneric.inc:73
+#: admin/systems/class_printGeneric.inc:83
+#: admin/systems/class_componentGeneric.inc:69
+#: admin/systems/class_mobilePhoneGeneric.inc:102
+#: admin/systems/class_networkSettings.inc:1008
+msgid "Network settings"
 msgstr ""
 
-#: admin/systems/class_workstationGeneric.inc:195
-msgid "Inherit NTP servers"
-msgstr ""
+#: admin/systems/class_workstationGeneric.inc:78
+#: admin/systems/class_printGeneric.inc:87
+#: admin/systems/class_componentGeneric.inc:73
+#: admin/systems/class_mobilePhoneGeneric.inc:106
+#: admin/systems/class_networkSettings.inc:630
+#: admin/systems/class_networkSettings.inc:643
+#: admin/systems/class_networkSettings.inc:645
+#: admin/systems/class_networkSettings.inc:1014
+msgid "IP address"
+msgstr "IP adres"
 
-#: admin/systems/class_workstationGeneric.inc:196
-msgid "Inherit time server attributes from ogroup"
+#: admin/systems/class_workstationGeneric.inc:78
+msgid "IP addresses this system uses (v4 or v6)"
 msgstr ""
 
-#: admin/systems/class_workstationGeneric.inc:202
-msgid "NTP servers"
-msgstr ""
+#: admin/systems/class_workstationGeneric.inc:83
+#: admin/systems/class_printGeneric.inc:91
+#: admin/systems/class_componentGeneric.inc:77
+#: admin/systems/class_mobilePhoneGeneric.inc:110
+msgid "Mac address"
+msgstr "Mac adress"
 
-#: admin/systems/class_workstationGeneric.inc:203
-#, php-format
-msgid "The NTP servers for the %s"
+#: admin/systems/class_workstationGeneric.inc:83
+#: admin/systems/class_printGeneric.inc:91
+#: admin/systems/class_componentGeneric.inc:77
+#: admin/systems/class_mobilePhoneGeneric.inc:110
+msgid "Mac address of this system"
 msgstr ""
 
-#: admin/systems/class_workstationGeneric.inc:209
-msgid "Inherit LDAP servers"
-msgstr ""
+#: admin/systems/class_workstationGeneric.inc:125
+#: admin/systems/class_workstationGeneric.inc:130
+#: admin/systems/class_workstationGeneric.inc:131
+msgid "Workstation"
+msgstr "Workstation"
 
-#: admin/systems/class_workstationGeneric.inc:210
-msgid "Inherit LDAP server attributes from ogroup"
+#: admin/systems/class_workstationGeneric.inc:126
+msgid "Workstation information"
 msgstr ""
 
-#: admin/systems/class_workstationGeneric.inc:216
-msgid "LDAP servers"
-msgstr ""
+#: admin/systems/class_printGeneric.inc:32
+#: admin/systems/class_printGeneric.inc:37
+#: admin/systems/class_printGeneric.inc:38
+msgid "Printer"
+msgstr "Printer"
 
-#: admin/systems/class_workstationGeneric.inc:217
-#, php-format
-msgid "The LDAP servers for the %s"
+#: admin/systems/class_printGeneric.inc:33
+msgid "Printer information"
 msgstr ""
 
-#: admin/systems/class_workstationGeneric.inc:225
-#: admin/systems/class_workstationGeneric.inc:229
-#: admin/ogroups/goto/termgroup.tpl.c:41
-msgid "Action"
-msgstr "Actie"
-
-#: admin/systems/class_workstationGeneric.inc:230
-#: admin/ogroups/goto/termgroup.tpl.c:44
-msgid "Select action to execute for this terminal"
-msgstr "Selecteer de voor deze terminal uit te voeren actie"
-
-#: admin/systems/class_workstationGeneric.inc:236
-#: admin/systems/class_componentGeneric.inc:75
-#: admin/systems/class_mobilePhoneGeneric.inc:106
-#: admin/systems/class_networkSettings.inc:1016
-msgid "Network settings"
+#: admin/systems/class_printGeneric.inc:60
+msgid "The name of the printer"
 msgstr ""
 
-#: admin/systems/class_workstationGeneric.inc:459
-msgid "Workstation information"
+#: admin/systems/class_printGeneric.inc:64
+msgid "A short description of the printer"
 msgstr ""
 
-#: admin/systems/class_printGeneric.inc:131
-#: admin/systems/class_printGeneric.inc:1065
-#: admin/systems/class_systemManagement.inc:678
-msgid "Internal error"
-msgstr "Interne fout"
-
-#: admin/systems/class_printGeneric.inc:131
-#, php-format
-msgid ""
-"Cannot determine a valid department for this object. Setting base to '%s'!"
-msgstr "Kan geen geldig afdeling bepalen voor dit object. Basis instelling om '%s'!"
-
-#: admin/systems/class_printGeneric.inc:311
-#: admin/systems/class_printGeneric.inc:319
-#: admin/systems/class_printGeneric.inc:324
-#: admin/systems/class_printGeneric.inc:374
-#: admin/systems/class_printGeneric.inc:390
-#: admin/systems/class_printGeneric.inc:393
-msgid "Add printer extension"
-msgstr "Voeg printer extensie toe"
-
-#: admin/systems/class_printGeneric.inc:312
-msgid ""
-"Could not initialize printer tab, parameter parent was missing while "
-"construction."
-msgstr "Kan printer tab niet initialiseren, parent parameter ontbreekt tijdens constructie."
-
-#: admin/systems/class_printGeneric.inc:320
-msgid "This is a workstation template, printer tab is disabled."
-msgstr "Dit is een werkstationsjabloon. Het printer tabblad is uitgeschakeld."
-
-#: admin/systems/class_printGeneric.inc:325
-msgid "This is a terminal template, printer tab is disabled."
-msgstr "Dit is een terminalsjabloon. Het printer tabblad is uitgeschakeld."
-
-#: admin/systems/class_printGeneric.inc:367
-#: admin/systems/class_printGeneric.inc:375
-#: admin/systems/class_printGeneric.inc:383
-#: admin/systems/class_printGeneric.inc:386
-#: admin/systems/class_printGeneric.inc:391
-#: admin/systems/class_printGeneric.inc:394
-msgid "printer"
-msgstr "printer"
-
-#: admin/systems/class_printGeneric.inc:375
-msgid ""
-"You can't enable it while 'cn' is not present in entry. Possibly you are "
-"currently creating a new terminal template."
-msgstr "U kan het niet activeren zolang 'cn' niet aanwezig is in invoer. Mogelijk bent u op dit moment bezig met het creÃ«ren van een nieuwe terminal sjabloon."
-
-#: admin/systems/class_printGeneric.inc:382
-#: admin/systems/class_printGeneric.inc:385
-msgid "Remove printer extension"
-msgstr "Verwijder printer mogelijkheden"
-
-#: admin/systems/class_printGeneric.inc:474
-#: admin/systems/class_printGeneric.inc:652
-#: admin/systems/class_printGeneric.inc:659
-#: admin/systems/class_printGeneric.inc:718
-#: admin/systems/class_printGeneric.inc:1105
-#: admin/systems/class_printGeneric.inc:1116
-#: admin/systems/class_serverService.inc:224
-#: admin/systems/class_serverService.inc:270
-#: admin/systems/class_serverService.inc:393
-#: admin/systems/class_systemManagement.inc:341
-#: admin/systems/class_systemManagement.inc:624
-#: admin/systems/class_systemManagement.inc:639
-#: admin/systems/services/shares/class_serviceShare.inc:103
-#: admin/systems/class_networkSettings.inc:305
-#: admin/systems/class_networkSettings.inc:336
-#: admin/systems/class_networkSettings.inc:584
-#: admin/systems/class_networkSettings.inc:591
-#: admin/systems/class_networkSettings.inc:597
-#: admin/systems/class_networkSettings.inc:604
-msgid "Error"
-msgstr "Fout"
-
-#: admin/systems/class_printGeneric.inc:577
-#, php-format
-msgid "Your currently selected PPD file '%s' doesn't exist."
-msgstr "Uw huidig geselecteerde PPD bestand '%s' bestaat niet."
-
-#: admin/systems/class_printGeneric.inc:583
-msgid "Not defined"
-msgstr "Onbepaald"
-
-#: admin/systems/class_printGeneric.inc:587
-#: admin/systems/ppd/class_printerPPDDialog.inc:116
-msgid "Can't get ppd informations."
-msgstr "Kan de PPD informatie niet ophalen."
-
-#: admin/systems/class_printGeneric.inc:602
-#: admin/systems/class_printGeneric.inc:604
-#, php-format
-msgid "This printer belongs to %s. You can't rename this printer."
-msgstr "Deze printer behoort to %s. U kan deze printer niet hernoemen."
+#: admin/systems/class_printGeneric.inc:70
+msgid "Details"
+msgstr "Details"
 
-#: admin/systems/class_printGeneric.inc:602
-#: admin/systems/class_terminalGeneric.inc:34
-msgid "terminal"
-msgstr "terminal"
+#: admin/systems/class_printGeneric.inc:73
+msgid "Printer location"
+msgstr "Printer locatie"
 
-#: admin/systems/class_printGeneric.inc:652
-#: admin/systems/class_printGeneric.inc:659
-msgid "Object is no printer!"
-msgstr "Object is geen printer!"
+#: admin/systems/class_printGeneric.inc:73
+msgid "The location of the printer"
+msgstr ""
 
-#: admin/systems/class_printGeneric.inc:767 admin/systems/printer.tpl.c:23
+#: admin/systems/class_printGeneric.inc:77
 msgid "Printer URL"
 msgstr "Printer URL"
 
-#: admin/systems/class_printGeneric.inc:989
-#: admin/systems/class_printGeneric.inc:991
-msgid "Group"
-msgstr "Groep"
-
-#: admin/systems/class_printGeneric.inc:994
-msgid "User"
-msgstr "Gebruiker"
-
-#: admin/systems/class_printGeneric.inc:1006
-msgid "Printer information"
+#: admin/systems/class_printGeneric.inc:77
+msgid "The URL of the printer"
 msgstr ""
 
-#: admin/systems/class_printGeneric.inc:1023
-#: admin/systems/serverService-list.tpl.c:2
-#: admin/systems/phoneSelect/phoneSelect-list.tpl.c:2
-#: admin/systems/printer.tpl.c:11
-msgid "Base"
-msgstr "Basis"
-
-#: admin/systems/class_printGeneric.inc:1026
-msgid "LabeledURL"
-msgstr "LabeledURL"
-
-#: admin/systems/class_printGeneric.inc:1027
-msgid "Printer PPD"
-msgstr "Printer PPD"
-
-#: admin/systems/class_printGeneric.inc:1028 admin/systems/printer.tpl.c:38
-msgid "Permissions"
-msgstr "Rechten"
-
-#: admin/systems/class_printGeneric.inc:1030
-msgid "Windows inf file"
-msgstr "Windows inf bestand"
-
-#: admin/systems/class_printGeneric.inc:1031
-msgid "Windows driver dir"
-msgstr "Windows driver map"
-
-#: admin/systems/class_printGeneric.inc:1032 admin/systems/printer.tpl.c:62
-msgid "Driver printer name"
-msgstr "Naam printer driver"
-
-#: admin/systems/class_printGeneric.inc:1048
-#: admin/systems/class_printGeneric.inc:1070
-msgid "Permission error"
-msgstr "Permissiefout"
-
-#: admin/systems/class_printGeneric.inc:1048
-#: admin/systems/class_printGeneric.inc:1070
-msgid "printer user"
-msgstr "printer gebruiker"
-
-#: admin/systems/class_printGeneric.inc:1065
-#, php-format
-msgid "Illegal member type '%s'!"
-msgstr "Ongeldige gebruiker type '%s'!"
-
-#: admin/systems/class_printGeneric.inc:1105
-#, php-format
-msgid "'%s' is already used!"
-msgstr "'%s' is al in gebuik!"
-
-#: admin/systems/class_printGeneric.inc:1116
-#, php-format
-msgid "'%s' does not exist!"
-msgstr "'%s' bestaat niet!"
+#: admin/systems/class_printGeneric.inc:87
+#: admin/systems/class_componentGeneric.inc:73
+#: admin/systems/class_mobilePhoneGeneric.inc:106
+msgid "IP address this system uses"
+msgstr ""
 
 #: admin/systems/class_serverService.inc:58
 msgid "Server services"
 msgstr ""
 
+#: admin/systems/class_serverService.inc:224
+#: admin/systems/class_serverService.inc:270
+#: admin/systems/class_serverService.inc:393
+#: admin/systems/services/shares/class_serviceShare.inc:103
+#: admin/systems/class_networkSettings.inc:297
+#: admin/systems/class_networkSettings.inc:328
+#: admin/systems/class_networkSettings.inc:576
+#: admin/systems/class_networkSettings.inc:583
+#: admin/systems/class_networkSettings.inc:589
+#: admin/systems/class_networkSettings.inc:596
+msgid "Error"
+msgstr "Fout"
+
 #: admin/systems/class_serverService.inc:332
 msgid "Filter error"
-msgstr "Filter fout"
+msgstr "Filter error"
 
 #: admin/systems/class_serverService.inc:332
 msgid "The filter is incomplete!"
-msgstr "Deze filter is niet compleet!"
+msgstr "De filter is niet volledig!"
 
 #: admin/systems/class_serverService.inc:387
 msgid "Information"
@@ -714,217 +438,20 @@ msgstr "Kan dienst status niet update zolang het niet opgeslagen is!"
 msgid "Could not get execute action %s on service %s."
 msgstr "Kan geen actie %s niet uitvoeren op service %s."
 
-#: admin/systems/class_terminalGeneric.inc:42
-#, php-format
-msgid "The root server the terminal should be using"
-msgstr ""
+#: admin/systems/class_terminalGeneric.inc:31
+msgid "terminal"
+msgstr "terminal"
 
+#: admin/systems/class_terminalGeneric.inc:43
 #: admin/systems/class_terminalGeneric.inc:48
-#, php-format
-msgid "The swap server the terminal should be using"
-msgstr ""
-
-#: admin/systems/class_terminalGeneric.inc:54
-msgid "Remote desktop"
-msgstr "Remote desktop"
-
-#: admin/systems/class_terminalGeneric.inc:58
-msgid "Connect method"
-msgstr "Verbindings methode"
-
-#: admin/systems/class_terminalGeneric.inc:62
-msgid "XDMCP"
-msgstr "XDMCP"
-
-#: admin/systems/class_terminalGeneric.inc:62
-msgid "LDM"
-msgstr "LDM"
-
-#: admin/systems/class_terminalGeneric.inc:62
-msgid "Shell"
-msgstr "Shell"
-
-#: admin/systems/class_terminalGeneric.inc:62
-msgid "Telnet"
-msgstr "Telnet"
-
-#: admin/systems/class_terminalGeneric.inc:62
-msgid "Windows RDP"
-msgstr "Windows RDP"
-
-#: admin/systems/class_terminalGeneric.inc:66
-msgid "Terminal server"
-msgstr "Terminal server"
+#: admin/systems/class_terminalGeneric.inc:49
+msgid "Terminal"
+msgstr "Terminal"
 
-#: admin/systems/class_terminalGeneric.inc:82
+#: admin/systems/class_terminalGeneric.inc:44
 msgid "Terminal information"
 msgstr ""
 
-#: admin/systems/ppd/class_printerPPDSelectionDialog.inc:91
-#: admin/systems/ppd/class_printerPPDSelectionDialog.inc:116
-#: admin/systems/ppd/class_printerPPDSelectionDialog.inc:139
-#: admin/systems/ppd/class_printerPPDDialog.inc:92
-#: admin/systems/ppd/class_printerPPDDialog.inc:160
-#: admin/systems/ppd/class_printerPPDDialog.inc:241
-#: admin/systems/ppd/class_printerPPDDialog.inc:256
-#: admin/systems/ppd/class_printerPPDDialog.inc:269
-#: admin/systems/ppd/class_printerPPDDialog.inc:297
-#: admin/systems/ppd/class_printerPPDDialog.inc:314
-#: admin/systems/ppd/class_printerPPDDialog.inc:337
-#: admin/systems/ppd/class_printerPPDDialog.inc:351
-#: admin/systems/ppd/class_printerPPDDialog.inc:361
-#: admin/systems/ppd/class_printerPPDDialog.inc:365
-#: admin/systems/ppd/class_printerPPDDialog.inc:560
-#: admin/systems/ppd/class_printerPPDDialog.inc:577
-#: admin/systems/ppd/class_printerPPDDialog.inc:580
-#: admin/systems/ppd/class_printerPPDDialog.inc:583
-msgid "PPD error"
-msgstr "PPD fout"
-
-#: admin/systems/ppd/class_printerPPDSelectionDialog.inc:139
-#, php-format
-msgid "Cannot locate vendor '%s' in available PPDs!"
-msgstr "Kan vendor '%s' niet vinden in beschikbare PPDs!"
-
-#: admin/systems/ppd/class_printerPPDSelectionDialog.inc:148
-msgid "Printer ppd selection."
-msgstr "Printer PPD selectie"
-
-#: admin/systems/ppd/class_printerPPDSelectionDialog.inc:155
-msgid "delete"
-msgstr "Verwijder"
-
-#: admin/systems/ppd/class_printerPPDSelectionDialog.inc:166
-msgid "back"
-msgstr "terug"
-
-#: admin/systems/ppd/class_printerPPDDialog.inc:74
-#: admin/systems/ppd/class_printerPPDDialog.inc:140
-#: admin/systems/services/class_goService.inc:241
-msgid "Configuration error"
-msgstr "Configuratie fout"
-
-#: admin/systems/ppd/class_printerPPDDialog.inc:92
-#, php-format
-msgid "Cannot open PPD '%s'!"
-msgstr "Kan PPD '%s' niet openen!"
-
-#: admin/systems/ppd/class_printerPPDDialog.inc:141
-#, php-format
-msgid "Cannot open PPD path '%s' for reading and writing!"
-msgstr "Kan PPD pad'%s' niet openen voor lezen en schrijven! "
-
-#: admin/systems/ppd/class_printerPPDDialog.inc:160
-#: admin/systems/ppd/class_printerPPDDialog.inc:365
-msgid "file is empty"
-msgstr "bestand is leeg"
-
-#: admin/systems/ppd/class_printerPPDDialog.inc:314
-#, php-format
-msgid "Cannot parse PPD '%s'!"
-msgstr "Kan PPD '%s' niet ontleden!"
-
-#: admin/systems/ppd/class_printerPPDDialog.inc:340
-msgid "Overwrite existing PPD"
-msgstr "Overschrijf bestaande PPD"
-
-#: admin/systems/ppd/class_printerPPDDialog.inc:341
-msgid ""
-"There is already a ppd file for this kind of printer. Do you want to "
-"overwrite it?"
-msgstr "Er is al een bestaande ppd bestand voor dit soort printer. Wilt u deze overschrijven?"
-
-#: admin/systems/ppd/class_printerPPDDialog.inc:491
-msgid "Section"
-msgstr "Sectie"
-
-#: admin/systems/ppd/class_printerPPDDialog.inc:551
-#: admin/systems/ppd/class_printerPPDDialog.inc:554
-msgid "True"
-msgstr "Ja"
-
-#: admin/systems/ppd/class_printerPPDDialog.inc:552
-#: admin/systems/ppd/class_printerPPDDialog.inc:555
-msgid "False"
-msgstr "Nee"
-
-#: admin/systems/ppd/class_printerPPDDialog.inc:560
-#, php-format
-msgid "PPD type '%s' is not supported!"
-msgstr "PPD type '%s' niet ondersteund!"
-
-#: admin/systems/ppd/class_printerPPDDialog.inc:597
-msgid ""
-"Please select a valid ppd file or use 'Cancel' to go back to printer "
-"configuration."
-msgstr "Gelieve een geldig ppd bestand te selecteren of  'Annuleer' om terug te keren naar de printer configuratie."
-
-#: admin/systems/ppd/class_ppdManager.inc:44
-#: admin/systems/ppd/class_ppdManager.inc:188
-#: admin/systems/ppd/class_ppdManager.inc:190
-msgid "PPD manager error"
-msgstr "PPD manager fout"
-
-#: admin/systems/ppd/class_ppdManager.inc:44
-#, php-format
-msgid "The specified path '%s' does not exist."
-msgstr "De specifieke pad '%s' bestaat niet."
-
-#: admin/systems/ppd/class_ppdManager.inc:188
-#, php-format
-msgid "Specified PPD file '%s' cannot be opened for reading."
-msgstr "Specifieke PPD file '%s' kan niet geopend worden voor raadpleging."
-
-#: admin/systems/ppd/class_ppdManager.inc:190
-#, php-format
-msgid "The temporary file '%s' cannot be opened for writing."
-msgstr "Tijdeljike bestand '%s' kan niet geopend word voor schrijven."
-
-#: admin/systems/ppd/class_ppdManager.inc:212
-#: admin/systems/ppd/class_ppdManager.inc:350
-msgid "Parsing PPD file failed - file is empty!"
-msgstr "Ontleding PPD bestand mislukt  - bestand is leeg!"
-
-#: admin/systems/ppd/class_ppdManager.inc:222
-#, php-format
-msgid ""
-"Parsing PPD file %s failed - line too long. Trailing characters have been "
-"ignored!"
-msgstr "Ontleding PPD bestand %s mislukt - lijn is te lang. Loshangende tekens zijn genereerd!"
-
-#: admin/systems/ppd/class_ppdManager.inc:230
-msgid "Nested groups are not supported!"
-msgstr "Geneste groepen worden niet ondersteund!"
-
-#: admin/systems/ppd/class_ppdManager.inc:234
-msgid "Group name not unique!"
-msgstr "Groepnaam is niet uniek!"
-
-#: admin/systems/ppd/class_ppdManager.inc:240
-#: admin/systems/ppd/class_ppdManager.inc:270
-msgid "Symbol values are not supported yet!"
-msgstr "Symbool waardes worden nog niet ondersteund!"
-
-#: admin/systems/ppd/class_ppdManager.inc:264
-msgid "Nested options are not supported!"
-msgstr "Geneste opties worden niet ondersteund!"
-
-#: admin/systems/ppd/class_ppdManager.inc:289
-msgid "PickMany is not supported yet!"
-msgstr "PickMany wordt nog niet ondersteund!"
-
-#: admin/systems/ppd/class_ppdManager.inc:370
-#, php-format
-msgid ""
-"Parsing PPD file %s failed - line too long. Trailing characters have been "
-"ignored"
-msgstr "Het parsen van PPD bestand %s is mislukt - regel was te lang. Resterende karakters zijn genegeerd."
-
-#: admin/systems/ppd/class_ppdManager.inc:395
-#, php-format
-msgid "Parsing PPD file %s failed - no information found."
-msgstr "Het parsen van PPD bestand %s is mislukt - er is geen informatie gevonden."
-
 #: admin/systems/class_systemImport.inc:72
 #, php-format
 msgid "Could not parse %s"
@@ -944,83 +471,130 @@ msgstr ""
 msgid "Import"
 msgstr "Importeren"
 
+#: admin/systems/class_systemImport.inc:169
+#: admin/systems/class_serverGeneric.inc:43
+#: admin/systems/class_serverGeneric.inc:48
+#: admin/systems/class_serverGeneric.inc:49
+msgid "Server"
+msgstr "Server"
+
 #: admin/systems/class_systemImport.inc:169
 msgid "The server you wish to import hosts from"
 msgstr ""
 
-#: admin/systems/class_serverGeneric.inc:34
+#: admin/systems/class_serverGeneric.inc:31
 msgid "server"
 msgstr "server"
 
-#: admin/systems/class_serverGeneric.inc:47
+#: admin/systems/class_serverGeneric.inc:44
 msgid "Server information"
 msgstr ""
 
-#: admin/systems/class_componentGeneric.inc:37
+#: admin/systems/class_componentGeneric.inc:31
+msgid "Component"
+msgstr "Component"
+
+#: admin/systems/class_componentGeneric.inc:32
 msgid "Component information"
 msgstr ""
 
-#: admin/systems/class_componentGeneric.inc:64
+#: admin/systems/class_componentGeneric.inc:36
+#: admin/systems/class_componentGeneric.inc:37
+msgid "Network device"
+msgstr "Netwerk apparatuur"
+
+#: admin/systems/class_componentGeneric.inc:58
 msgid "The name of the component"
 msgstr ""
 
-#: admin/systems/class_componentGeneric.inc:68
+#: admin/systems/class_componentGeneric.inc:62
 msgid "A short description of the component"
 msgstr ""
 
+#: admin/systems/class_systemServers.inc:31
+#: admin/systems/class_systemServers.inc:53
+msgid "Servers"
+msgstr "Servers"
+
+#: admin/systems/class_systemServers.inc:35
+msgid "The syslog server the system should be using"
+msgstr ""
+
+#: admin/systems/class_systemServers.inc:40
+msgid "NTP servers"
+msgstr ""
+
+#: admin/systems/class_systemServers.inc:40
+msgid "The NTP servers for this system"
+msgstr ""
+
+#: admin/systems/class_systemServers.inc:54
+msgid "Servers this system is using"
+msgstr ""
+
+#: admin/systems/class_mobilePhoneGeneric.inc:32
 #: admin/systems/class_mobilePhoneGeneric.inc:37
+#: admin/systems/class_mobilePhoneGeneric.inc:38
+msgid "Mobile phone"
+msgstr "GSM nummer"
+
+#: admin/systems/class_mobilePhoneGeneric.inc:33
 msgid "Mobile phone information"
 msgstr ""
 
-#: admin/systems/class_mobilePhoneGeneric.inc:63
+#: admin/systems/class_mobilePhoneGeneric.inc:60
 msgid "The name of the mobile phone"
 msgstr ""
 
-#: admin/systems/class_mobilePhoneGeneric.inc:67
+#: admin/systems/class_mobilePhoneGeneric.inc:64
 msgid "A short description of the mobile phone"
 msgstr ""
 
-#: admin/systems/class_mobilePhoneGeneric.inc:77
+#: admin/systems/class_mobilePhoneGeneric.inc:70
+msgid "Phone"
+msgstr "Telefoon"
+
+#: admin/systems/class_mobilePhoneGeneric.inc:73
 msgid "Serial Number"
 msgstr ""
 
-#: admin/systems/class_mobilePhoneGeneric.inc:77
+#: admin/systems/class_mobilePhoneGeneric.inc:73
 msgid "The serial number of the mobile phone"
 msgstr ""
 
-#: admin/systems/class_mobilePhoneGeneric.inc:81
+#: admin/systems/class_mobilePhoneGeneric.inc:77
 msgid "IMEI Number"
 msgstr ""
 
-#: admin/systems/class_mobilePhoneGeneric.inc:81
+#: admin/systems/class_mobilePhoneGeneric.inc:77
 msgid "The IMEI number of the mobile phone"
 msgstr ""
 
-#: admin/systems/class_mobilePhoneGeneric.inc:86
+#: admin/systems/class_mobilePhoneGeneric.inc:82
 msgid "OS"
 msgstr ""
 
-#: admin/systems/class_mobilePhoneGeneric.inc:86
+#: admin/systems/class_mobilePhoneGeneric.inc:82
 msgid "The Operating System installed on this phone"
 msgstr ""
 
-#: admin/systems/class_mobilePhoneGeneric.inc:92
+#: admin/systems/class_mobilePhoneGeneric.inc:88
 msgid "SimCard"
 msgstr ""
 
-#: admin/systems/class_mobilePhoneGeneric.inc:95
+#: admin/systems/class_mobilePhoneGeneric.inc:91
 msgid "Telephone Number"
 msgstr ""
 
-#: admin/systems/class_mobilePhoneGeneric.inc:95
+#: admin/systems/class_mobilePhoneGeneric.inc:91
 msgid "The telephone number of the mobile phone"
 msgstr ""
 
-#: admin/systems/class_mobilePhoneGeneric.inc:99
+#: admin/systems/class_mobilePhoneGeneric.inc:95
 msgid "PUK Number"
 msgstr ""
 
-#: admin/systems/class_mobilePhoneGeneric.inc:99
+#: admin/systems/class_mobilePhoneGeneric.inc:95
 msgid "The PUK number of the simcard in this mobile phone"
 msgstr ""
 
@@ -1063,70 +637,20 @@ msgstr "Bewerk dienst"
 msgid "Remove service"
 msgstr "Verwijder dienst"
 
-#: admin/systems/phoneSelect/phoneSelect-list.xml:10
-msgid "Please select the desired entries"
-msgstr "Gelieve de items te selecteren"
-
-#: admin/systems/phoneSelect/phoneSelect-list.xml:56
-msgid "Number"
-msgstr "Nummer"
-
-#: admin/systems/phoneSelect/phoneSelect-list.xml:83
-msgid "Select this number"
-msgstr ""
-
-#: admin/systems/class_systemManagement.inc:177
-msgid "Back"
-msgstr "Terug"
-
-#: admin/systems/class_systemManagement.inc:223
-msgid "Creating the image failed. Please see the report below."
-msgstr "Het maken van de image is mislukt. Zie hieronder het rapport."
-
-#: admin/systems/class_systemManagement.inc:228
-#, php-format
-msgid "Command '%s', specified for ISO creation doesn't seem to exist."
-msgstr "Commando '%s', die voor ISO-Creation lijkt niet te bestaan."
-
-#: admin/systems/class_systemManagement.inc:398
-#: admin/systems/class_systemManagement.inc:473
-#: admin/systems/class_systemManagement.inc:858
-#: admin/systems/class_systemManagement.inc:905
-#: admin/systems/class_systemManagement.inc:926
-msgid "Permission"
-msgstr "Rechten"
-
-#: admin/systems/class_systemManagement.inc:678
-msgid "Cannot set mode to 'active'!"
-msgstr "Kan mode niet instellen als 'actief'!"
-
-#: admin/systems/class_systemManagement.inc:858
-#, php-format
-msgid "You are not allowed to create a snapshot for %s."
-msgstr "U heeft geen toestemming om een snapshot te maken voor %s."
-
-#: admin/systems/class_systemManagement.inc:905
-#: admin/systems/class_systemManagement.inc:926
-#, php-format
-msgid "You are not allowed to restore a snapshot for %s."
-msgstr "U heeft geen toestemming om een snapshot te herstellen voor %s."
-
-#: admin/systems/class_systemManagement.inc:1169
-#, php-format
-msgid "Inherited from %s"
-msgstr "Overgenomen van %s"
-
-#: admin/systems/class_systemManagement.inc:1224
-#: admin/systems/class_systemManagement.inc:1228
-#: addons/dashboard/class_dashBoardSystems.inc:199
+#: admin/systems/class_systemManagement.inc:48
 #: config/systems/class_systemsPluginConfig.inc:28
 msgid "Systems"
 msgstr "Systemen"
 
-#: admin/systems/class_systemManagement.inc:1225
+#: admin/systems/class_systemManagement.inc:49
 msgid "Systems Management"
 msgstr "Systeem Management"
 
+#: admin/systems/class_systemManagement.inc:250
+#, php-format
+msgid "Inherited from %s"
+msgstr "Overgenomen van %s"
+
 #: admin/systems/services/terminal/class_serviceTerminal.inc:29
 #: admin/systems/services/terminal/class_serviceTerminal.inc:30
 #: admin/systems/services/terminal/class_serviceTerminal.inc:41
@@ -1164,6 +688,10 @@ msgstr "Cups"
 msgid "Empty service"
 msgstr "Lege dienst"
 
+#: admin/systems/services/class_goService.inc:241
+msgid "Configuration error"
+msgstr "Configuratie fout"
+
 #: admin/systems/services/shares/class_serviceShare.inc:30
 #: admin/systems/services/shares/class_serviceShare.inc:31
 msgid "Share service"
@@ -1222,8 +750,6 @@ msgid "You need to configure encodings first"
 msgstr ""
 
 #: admin/systems/services/shares/class_serviceShare.inc:110
-#: admin/ogroups/goto/termgroup.tpl.c:2 admin/systems/remove.tpl.c:2
-#: admin/systems/ppd/remove_ppd.tpl.c:2
 msgid "Warning"
 msgstr "Waarschuwing"
 
@@ -1349,153 +875,93 @@ msgstr ""
 msgid "LDAP"
 msgstr "LDAP"
 
-#: admin/systems/class_networkSettings.inc:305
+#: admin/systems/class_networkSettings.inc:297
 msgid "NOT IMPLEMENTED"
 msgstr "NIET GEÃMPLEMENTEERD"
 
-#: admin/systems/class_networkSettings.inc:437
+#: admin/systems/class_networkSettings.inc:429
 msgid "Not matching"
 msgstr "Niet overeenkomen"
 
-#: admin/systems/class_networkSettings.inc:584
+#: admin/systems/class_networkSettings.inc:576
 #, php-format
 msgid "Was not able to contact argonaut server: %s"
 msgstr "Kon argonaut server :%s niet contacteren"
 
-#: admin/systems/class_networkSettings.inc:591
+#: admin/systems/class_networkSettings.inc:583
 #, php-format
 msgid "Was not able to find DNS server for zone %s"
 msgstr ""
 
-#: admin/systems/class_networkSettings.inc:597
+#: admin/systems/class_networkSettings.inc:589
 #, php-format
 msgid "Was not able to find mac address of DNS server %s"
 msgstr ""
 
-#: admin/systems/class_networkSettings.inc:604
+#: admin/systems/class_networkSettings.inc:596
 #, php-format
 msgid "Was not able to launch ldap2zone: %s"
 msgstr "Kon ldap2zone : %s niet starten"
 
-#: admin/systems/class_networkSettings.inc:630
+#: admin/systems/class_networkSettings.inc:622
 #, php-format
 msgid "IP address %s"
 msgstr "IP adres %s"
 
-#: admin/systems/class_networkSettings.inc:638
-#: admin/systems/class_networkSettings.inc:651
-#: admin/systems/class_networkSettings.inc:653
-#: admin/systems/class_networkSettings.inc:1022
-msgid "IP address"
-msgstr "IP adres"
-
-#: admin/systems/class_networkSettings.inc:644
-#: admin/systems/class_networkSettings.inc:660
-#: admin/systems/class_networkSettings.inc:662
-#: admin/systems/class_networkSettings.inc:1023
+#: admin/systems/class_networkSettings.inc:636
+#: admin/systems/class_networkSettings.inc:652
+#: admin/systems/class_networkSettings.inc:654
+#: admin/systems/class_networkSettings.inc:1015
 msgid "MAC address"
 msgstr "Hardware adres (MAC)"
 
-#: admin/systems/class_networkSettings.inc:676
+#: admin/systems/class_networkSettings.inc:668
 #, php-format
 msgid "The IP address '%s' is not part of the selected reverse zone '%s'!"
 msgstr "Het IP-adres '%s' is geen onderdeel van de geselecteerde reverse zone '%s'!"
 
-#: admin/systems/class_networkSettings.inc:686
+#: admin/systems/class_networkSettings.inc:678
 #, php-format
 msgid "Record type '%s' is duplicated!"
 msgstr "Record type '%s' is dubbel!"
 
-#: admin/systems/class_networkSettings.inc:693
+#: admin/systems/class_networkSettings.inc:685
 #, php-format
 msgid "Uniq record type '%s' is duplicated!"
 msgstr "Uniek record type '%s' is dubbel!"
 
-#: admin/systems/class_networkSettings.inc:705
+#: admin/systems/class_networkSettings.inc:697
 #, php-format
 msgid ""
 "The IP address '%s' will be added as 'A Record', this will be done "
 "automatically, please remove the record."
 msgstr "Het IP-adres '%s' zal worden toegevoegd als 'A Record', dit gebeurt automatisch. Gelieve de record te verwijderen."
 
-#: admin/systems/class_networkSettings.inc:712
+#: admin/systems/class_networkSettings.inc:704
 #, php-format
 msgid "Only lowercase records are allowed, please check your '%ss'."
 msgstr "Enkel lowercase records zijn toegelaten, gelieve uw '%ss' te checken."
 
-#: admin/systems/class_networkSettings.inc:978
+#: admin/systems/class_networkSettings.inc:970
 msgid "Delete"
 msgstr "Verwijderen"
 
-#: admin/systems/class_networkSettings.inc:984
+#: admin/systems/class_networkSettings.inc:976
 msgid "Add"
 msgstr "Toevoegen"
 
-#: admin/systems/class_networkSettings.inc:1015
-#: addons/dashboard/class_dashBoardNetwork.inc:127
+#: admin/systems/class_networkSettings.inc:1007
 msgid "Network"
 msgstr ""
 
-#: admin/systems/class_networkSettings.inc:1030
+#: admin/systems/class_networkSettings.inc:1022
 msgid "DNS configuration"
 msgstr "DNS configuratie"
 
-#: admin/systems/class_networkSettings.inc:1033
+#: admin/systems/class_networkSettings.inc:1025
 msgid "DHCP configuration"
 msgstr "DHCP configuratie"
 
-#: addons/dashboard/class_dashBoardSystems.inc:45
-msgid "Workstations"
-msgstr ""
-
-#: addons/dashboard/class_dashBoardSystems.inc:51
-msgid "Windows Workstations"
-msgstr ""
-
-#: addons/dashboard/class_dashBoardSystems.inc:54
-msgid "Terminals"
-msgstr ""
-
-#: addons/dashboard/class_dashBoardSystems.inc:57
-msgid "Printers"
-msgstr ""
-
-#: addons/dashboard/class_dashBoardSystems.inc:60
-msgid "Phones"
-msgstr ""
-
-#: addons/dashboard/class_dashBoardSystems.inc:63
-msgid "Components"
-msgstr ""
-
-#: addons/dashboard/class_dashBoardSystems.inc:66
-msgid "Mobile phones"
-msgstr ""
-
-#: addons/dashboard/class_dashBoardSystems.inc:183
-msgid "Statistics"
-msgstr ""
-
-#: addons/dashboard/class_dashBoardSystems.inc:188
-msgid "Computer name to use by unit"
-msgstr ""
-
-#: addons/dashboard/class_dashBoardSystems.inc:200
-msgid "Statistics and informations about systems"
-msgstr ""
-
-#: addons/dashboard/class_dashBoardNetwork.inc:111
-msgid "DHCP"
-msgstr "DHCP"
-
-#: addons/dashboard/class_dashBoardNetwork.inc:116
-msgid "DNS"
-msgstr "DNS"
-
-#: addons/dashboard/class_dashBoardNetwork.inc:128
-msgid "Statistics and various informations"
-msgstr ""
-
 #: config/systems/class_systemsPluginConfig.inc:29
 msgid "Systems plugin configuration"
 msgstr ""
@@ -1587,404 +1053,3 @@ msgstr ""
 #: config/systems/class_systemsPluginConfig.inc:101
 msgid "Encodings"
 msgstr ""
-
-#: admin/ogroups/goto/termgroup.tpl.c:5
-msgid ""
-"Actions you choose here influence all systems in this object group. "
-"Additionally, all values editable here can be inherited by the clients "
-"assigned to this object group."
-msgstr "De acties die u hier kiest, beinvloeden alle systemen in deze objectgroep. Daarnaast kunnen alle hier bewerkbare waardes overerfd worden door terminal clients die aan deze objectgroep worden toegekend."
-
-#: admin/ogroups/goto/termgroup.tpl.c:8
-msgid "Generic"
-msgstr "Algemeen"
-
-#: admin/ogroups/goto/termgroup.tpl.c:11
-msgid "NTP server"
-msgstr "NTP tijdserver"
-
-#: admin/ogroups/goto/termgroup.tpl.c:14
-msgid "Choose server to use for synchronizing time"
-msgstr "Selecteer de server die gebruikt wordt voor tijdsynchronisatie"
-
-#: admin/ogroups/goto/termgroup.tpl.c:20
-msgid "Select terminal mode"
-msgstr "Selecteer terminal modus"
-
-#: admin/ogroups/goto/termgroup.tpl.c:26
-msgid "Choose server to use for logging"
-msgstr "Selecteer de server die gebruikt wordt voor log doeleinden"
-
-#: admin/ogroups/goto/termgroup.tpl.c:32
-msgid "Select NFS root filesystem to use"
-msgstr "Selecteer het te gebruiken NFS root bestandssysteem"
-
-#: admin/ogroups/goto/termgroup.tpl.c:38
-msgid "Choose NFS filesystem to place swap files on"
-msgstr "Kies het NFS bestandssysteem waarop de swapbestanden geplaatst worden"
-
-#: admin/ogroups/goto/termgroup.tpl.c:47
-msgid "Execute"
-msgstr "Commando"
-
-#: 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 admin/systems/network.tpl.c:11
-msgid "Propose ip"
-msgstr "IP voorstel"
-
-#: admin/systems/network.tpl.c:14
-msgid "MAC-address"
-msgstr "Hardware adres (MAC)"
-
-#: admin/systems/network.tpl.c:17
-msgid "Autodetect"
-msgstr "Auto detect."
-
-#: admin/systems/network.tpl.c:20 admin/systems/network.tpl.c:23
-msgid "Enable DHCP for this device"
-msgstr "Activeer DHCP voor dit apparatuur"
-
-#: admin/systems/network.tpl.c:26 admin/systems/network.tpl.c:50
-msgid "not configured"
-msgstr "niet ingesteld"
-
-#: admin/systems/network.tpl.c:29
-msgid "Parent node"
-msgstr "Parent node"
-
-#: admin/systems/network.tpl.c:32
-msgid "Edit settings"
-msgstr "Instellingen bewerken"
-
-#: admin/systems/network.tpl.c:35 admin/systems/network.tpl.c:47
-msgid "Enable DNS for this device"
-msgstr "DNS voor dit apparaat activeren"
-
-#: admin/systems/network.tpl.c:38
-msgid "Zone"
-msgstr "Zone"
-
-#: admin/systems/network.tpl.c:41
-msgid "TTL"
-msgstr "TTL"
-
-#: admin/systems/network.tpl.c:44
-msgid "Dns records"
-msgstr "DNS records"
-
-#: admin/systems/password.tpl.c:2
-msgid ""
-"To change the terminal root password use the fields below. The changes take "
-"effect during the next reboot. Please memorize the new password, because you"
-" wouldn't be able to log in."
-msgstr "Gebruik de velden hieronder om het terminal root wachtwoord te veranderen. De veranderingen worden onmiddelijk doorgevoerd. Onthoud het nieuwe wachtwoord a.u.b. aangezien u niet in kan loggen zonder dit wachtwoord."
-
-#: admin/systems/password.tpl.c:5
-msgid "Leave fields blank for password inheritance from default entries."
-msgstr "Laat velden leeg voor wachtwoord overerving vanuit standaard waarden."
-
-#: admin/systems/password.tpl.c:8
-msgid "Changing the password impinges on authentification only."
-msgstr "Het veranderen van het wachtwoord is alleen van toepassing op authenticatie."
-
-#: admin/systems/password.tpl.c:11
-msgid "New password"
-msgstr "Nieuw wachtwoord"
-
-#: admin/systems/password.tpl.c:14
-msgid "Repeat new password"
-msgstr "Herhaal het nieuwe wachtwoord"
-
-#: admin/systems/password.tpl.c:17
-msgid "Password strength"
-msgstr "Wachtwoord sterkte"
-
-#: admin/systems/password.tpl.c:20
-msgid "Set password"
-msgstr "Wachtwoord instellen"
-
-#: 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/gencd.tpl.c:2
-msgid "CD-Install-Image generation"
-msgstr "CD-install-Image generation"
-
-#: admin/systems/gencd.tpl.c:5
-msgid ""
-"This option enables you to generate FAI install CD images for the selected "
-"workstation. The procedure may take about 10 minutes to complete, so please "
-"be patient after pressing the 'Create ISO-Image' button."
-msgstr "Deze optie maakt het mogelijk om FAI installatie CD images te genereren voor de geselecteerde workstation. De procedure kan ongeveer 10 minuten duren, dus wees geduldig na het indrukken van de 'Create ISO-Image' knop."
-
-#: admin/systems/gencd.tpl.c:8
-msgid "Create ISO-Image"
-msgstr "Maak ISO-image"
-
-#: admin/systems/remove.tpl.c:5
-msgid ""
-"This includes all account data, system access rules, imap settings, etc. for"
-" this user. Please double check if your really want to do this since there "
-"is no way for FusionDirectory to get your data back."
-msgstr "Inclusief alle account data,system access rules,imap opties,etc. Voor deze gebruiker. Gelieve dubbel na te kijken of je dit echt wenst te doen want er is geen andere manier voor FusionDirectory om je data terug te krijgen."
-
-#: admin/systems/remove.tpl.c:8
-msgid "So - if you're sure - press 'Delete' to continue or 'Cancel' to abort."
-msgstr "Indien u zeker bent drukt u dan 'Verwijderen' om door te gaan of 'Annuleren' om te annuleren."
-
-#: admin/systems/system-filter.tpl.c:2
-#: admin/systems/phoneSelect/phoneSelect-filter.tpl.c:2
-msgid "Filter"
-msgstr "Filter"
-
-#: admin/systems/system-filter.tpl.c:5
-msgid "Show servers"
-msgstr "Toon servers"
-
-#: admin/systems/system-filter.tpl.c:8
-msgid "Show workstations"
-msgstr "Toon werkstations"
-
-#: admin/systems/system-filter.tpl.c:11
-msgid "Show terminals"
-msgstr "Toon terminals"
-
-#: admin/systems/system-filter.tpl.c:14
-msgid "Show network printer"
-msgstr "Toon netwerk printer"
-
-#: admin/systems/system-filter.tpl.c:17
-#: admin/systems/phoneSelect/phoneSelect-filter.tpl.c:5
-msgid "Show phones"
-msgstr "Toon telefoons"
-
-#: admin/systems/system-filter.tpl.c:20
-msgid "Show windows based workstations"
-msgstr "Toon windows based workstations"
-
-#: admin/systems/system-filter.tpl.c:23
-msgid "Show network devices"
-msgstr "Toon netwerk apparaten"
-
-#: admin/systems/system-filter.tpl.c:26
-#: admin/systems/phoneSelect/phoneSelect-filter.tpl.c:8
-msgid "Show mobile phones"
-msgstr ""
-
-#: admin/systems/system-filter.tpl.c:29
-msgid "Show IPMI interfaces"
-msgstr ""
-
-#: admin/systems/ppd/printerPPDSelectionDialog.tpl.c:2
-msgid "Select objects to add"
-msgstr "Selecteer de toe te voegen objecten"
-
-#: admin/systems/ppd/printerPPDSelectionDialog.tpl.c:5
-msgid "Filters"
-msgstr "Filters"
-
-#: admin/systems/ppd/printerPPDSelectionDialog.tpl.c:8
-msgid "Display objects matching"
-msgstr "Toon overeenkomende objecten"
-
-#: admin/systems/ppd/printerPPDSelectionDialog.tpl.c:11
-msgid "Regular expression for matching object names"
-msgstr "Reguliere expressie voor overeenkomende objectnamen"
-
-#: admin/systems/ppd/printerPPDSelectionDialog.tpl.c:14
-msgid "Close"
-msgstr "Sluiten"
-
-#: admin/systems/ppd/printerPPDDialog.tpl.c:2
-msgid "Printer driver"
-msgstr "Printer stuurprogramma"
-
-#: admin/systems/ppd/printerPPDDialog.tpl.c:5
-msgid "Model"
-msgstr "Model"
-
-#: admin/systems/ppd/printerPPDDialog.tpl.c:8
-msgid "Select"
-msgstr "Selecteer"
-
-#: admin/systems/ppd/printerPPDDialog.tpl.c:11
-msgid "New driver"
-msgstr "Nieuw stuurprogramma"
-
-#: admin/systems/ppd/printerPPDDialog.tpl.c:14
-msgid "Upload"
-msgstr "Uploaden"
-
-#: admin/systems/ppd/printerPPDDialog.tpl.c:17
-msgid "Options"
-msgstr "Opties"
-
-#: admin/systems/ppd/remove_ppd.tpl.c:5
-msgid "The ppd file will be removed from the server and can not be restored."
-msgstr "Het ppd bestand zal verwijderd worden van de server and kan niet hersteld worden."
-
-#: admin/systems/printer.tpl.c:2
-msgid "General"
-msgstr "Algemeen"
-
-#: admin/systems/printer.tpl.c:5
-msgid "Printer name"
-msgstr "Printernaam"
-
-#: admin/systems/printer.tpl.c:14
-msgid "Details"
-msgstr "Details"
-
-#: admin/systems/printer.tpl.c:20
-msgid "Printer location"
-msgstr "Printer locatie"
-
-#: admin/systems/printer.tpl.c:26
-msgid "PPD Provider"
-msgstr "PPD Provider"
-
-#: admin/systems/printer.tpl.c:29
-msgid "Driver"
-msgstr "Stuurprogramma"
-
-#: admin/systems/printer.tpl.c:32
-msgid "Edit"
-msgstr "Bewerken"
-
-#: admin/systems/printer.tpl.c:41
-msgid "Users which are allowed to use this printer"
-msgstr "Gebruikers die deze printer mogen gebruiken"
-
-#: admin/systems/printer.tpl.c:44
-msgid "Users"
-msgstr "Gebruikers"
-
-#: admin/systems/printer.tpl.c:47
-msgid "Users which are allowed to administrate this printer"
-msgstr "Gebruikers die deze printer mogen beheren"
-
-#: admin/systems/printer.tpl.c:50
-msgid "Admins"
-msgstr "Beheerders"
-
-#: admin/systems/printer.tpl.c:53
-msgid "Windows paths"
-msgstr "Windows paths"
-
-#: admin/systems/printer.tpl.c:56
-msgid "Printer windows inf file"
-msgstr "Printer windows inf bestand"
-
-#: admin/systems/printer.tpl.c:59
-msgid "Printer driver directory"
-msgstr "Printer driver map"
-
-#: admin/systems/gencd_frame.tpl.c:2
-msgid "Your browser does not supprt iframes."
-msgstr "Uw browser ondersteund iframes niet."
-
-#: admin/systems/services/cups/serviceCUPS.tpl.c:2
-msgid "Print Service"
-msgstr "Print Service"
-
-#: admin/systems/services/cups/serviceCUPS.tpl.c:5
-msgid "enabled"
-msgstr "Actief"
-
-#: admin/systems/services/ServiceAddDialog.tpl.c:2
-msgid "Adding a new service to the current server"
-msgstr "Voeg nieuwe dienst toe aan de huidige server"
-
-#: admin/systems/services/ServiceAddDialog.tpl.c:5
-msgid ""
-"This dialog allows you to add new services to the currenty edited server "
-"object. The box below shows all available but not already used services."
-msgstr "In dit dialoogvenster kunt u nieuwe diensten toe te voegen aan de server. De dialoog venster hieronder geeft alle beschikbare al gebruikt weer, maar geen diensten."
-
-#: admin/systems/services/ServiceAddDialog.tpl.c:8
-msgid "Service to add"
-msgstr "Dienst toevoegen"
-
-#: admin/systems/services/ServiceAddDialog.tpl.c:11
-msgid "All available services are already in use."
-msgstr "Alle beschikbare diensten zijn al in gebruik."
-
-#: admin/systems/services/ServiceAddDialog.tpl.c:14
-#: admin/systems/SelectDeviceType.tpl.c:26
-msgid "Continue"
-msgstr "Doorgaan"
-
-#: admin/systems/SelectDeviceType.tpl.c:2
-msgid ""
-"This system has no system type configured. Please choose a system type for "
-"this object and an optional inheritance group. Press the 'continue' button "
-"to proceed."
-msgstr "Dit systeem heeft geen geconfigureerd systeem type. Kies een type systeem voor dit object en een optionele erfenis groep. Druk op de knop 'Doorgaan' om verder te gaan."
-
-#: admin/systems/SelectDeviceType.tpl.c:5
-msgid ""
-"Please select a system type and an optional bundle of predefined settings to"
-" be inherited."
-msgstr "Selecteer a.u.b. een systeemtype en een optionele bundel met te overerven voorgedefinieerde instellingen."
-
-#: admin/systems/SelectDeviceType.tpl.c:8
-msgid ""
-"Please select a system type and a bundle of predefined settings to be "
-"inherited."
-msgstr "Selecteer een type systeem en een bundel van vooraf gedefinieerde instellingen die worden overgenomen."
-
-#: admin/systems/SelectDeviceType.tpl.c:11
-#: admin/systems/SelectDeviceType.tpl.c:14
-msgid "System type"
-msgstr "Systeemtype"
-
-#: admin/systems/SelectDeviceType.tpl.c:17
-msgid "Choose an object group as template"
-msgstr "Selecteer een objectgroep als sjabloon"
-
-#: admin/systems/SelectDeviceType.tpl.c:20
-msgid "Object group"
-msgstr "Objectgroep"
-
-#: admin/systems/SelectDeviceType.tpl.c:23
-msgid "none"
-msgstr "geen"
-
-#: addons/dashboard/systems_stats.tpl.c:2
-msgid "There are several argonaut servers! (this is not yet supported)"
-msgstr ""
-
-#: addons/dashboard/systems_stats.tpl.c:5
-msgid "There is an argonaut server running on %1 (%3://%2:%4)"
-msgstr ""
-
-#: addons/dashboard/systems_stats.tpl.c:8
-msgid "Only one system is configured to run an argonaut client."
-msgid_plural "%1 systems are configured to run an argonaut client."
-msgstr[0] ""
-msgstr[1] ""
-
-#: addons/dashboard/systems_stats.tpl.c:11
-msgid "But no system is configured to run an argonaut client!"
-msgstr ""
-
-#: addons/dashboard/systems_stats.tpl.c:14
-msgid ""
-"A system is configured to run an argonaut client, but there is no argonaut "
-"server configured!"
-msgid_plural ""
-"%1 systems are configured to run an argonaut client, but there is no "
-"argonaut server configured!"
-msgstr[0] ""
-msgstr[1] ""
diff --git a/systems/locale/pl/fusiondirectory.po b/systems/locale/pl/fusiondirectory.po
index c7857926359aaf0c007fb0be9c4ba0b76f72d358..3480368ecfd1c539ed51f9f09b34442f6497a822 100644
--- a/systems/locale/pl/fusiondirectory.po
+++ b/systems/locale/pl/fusiondirectory.po
@@ -5,12 +5,12 @@
 # Translators:
 msgid ""
 msgstr ""
-"Project-Id-Version: FusionDirectory-108\n"
+"Project-Id-Version: FusionDirectory-109\n"
 "Report-Msgid-Bugs-To: documentation@lists.fusiondirectory.org\n"
-"POT-Creation-Date: 2015-03-31 11:49+0200\n"
-"PO-Revision-Date: 2015-03-31 11:41+0000\n"
+"POT-Creation-Date: 2014-12-15 17:47+0100\n"
+"PO-Revision-Date: 2015-03-31 11:42+0000\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>\n"
-"Language-Team: Polish (http://www.transifex.com/projects/p/FusionDirectory-108/language/pl/)\n"
+"Language-Team: Polish (http://www.transifex.com/projects/p/FusionDirectory-109/language/pl/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -26,29 +26,24 @@ msgid "Locked"
 msgstr "Zablokowane"
 
 #: admin/ogroups/goto/class_termgroup.inc:118
-#: admin/systems/class_terminalGeneric.inc:121
+#: admin/systems/class_terminalStartup.inc:145
 msgid "Local swap"
 msgstr ""
 
 #: admin/ogroups/goto/class_termgroup.inc:124
 #: admin/ogroups/goto/class_termgroup.inc:136
-#: admin/systems/class_workstationGeneric.inc:352
-#: admin/systems/class_terminalGeneric.inc:109
-#: admin/systems/class_terminalGeneric.inc:125
+#: admin/systems/class_terminalStartup.inc:133
+#: admin/systems/class_terminalStartup.inc:149
 msgid "inherited"
 msgstr "odziedziczony"
 
 #: admin/ogroups/goto/class_termgroup.inc:220
-#: admin/systems/class_workstationGeneric.inc:72
-#: admin/systems/class_workstationGeneric.inc:443
-#: admin/systems/class_systemManagement.inc:295
-#: admin/systems/class_systemManagement.inc:325
-msgid "Infrastructure service"
+#: admin/systems/class_systemManagement.inc:165
+#: admin/systems/class_systemManagement.inc:186
+msgid "Service infrastructure"
 msgstr ""
 
 #: admin/ogroups/goto/class_termgroup.inc:224
-#: admin/systems/class_workstationGeneric.inc:75
-#: admin/systems/class_workstationGeneric.inc:78
 msgid "Event error"
 msgstr ""
 
@@ -58,12 +53,10 @@ msgid "Event '%s' is not available!"
 msgstr ""
 
 #: admin/ogroups/goto/class_termgroup.inc:274
-#: admin/systems/class_workstationGeneric.inc:112
 msgid "Switch off"
 msgstr "WyÅ‚Ä…cz"
 
 #: admin/ogroups/goto/class_termgroup.inc:274
-#: admin/systems/class_workstationGeneric.inc:113
 msgid "Reboot"
 msgstr "Restartuj"
 
@@ -84,7 +77,6 @@ msgid "Reinstall"
 msgstr "Przeinstaluj"
 
 #: admin/ogroups/goto/class_termgroup.inc:279
-#: admin/systems/class_workstationGeneric.inc:108
 msgid "Memory test"
 msgstr "Test pamiÄ™ci"
 
@@ -93,21 +85,18 @@ msgid "System analysis"
 msgstr "Analiza systemu"
 
 #: admin/ogroups/goto/class_termgroup.inc:386
-#: admin/systems/class_printGeneric.inc:670
-#: admin/systems/class_printGeneric.inc:970
-#: admin/systems/class_systemManagement.inc:816
 #: admin/systems/services/class_goService.inc:123
 #: admin/systems/services/class_goService.inc:151
 #: admin/systems/services/class_goService.inc:187
-#: admin/systems/class_networkSettings.inc:478
-#: admin/systems/class_networkSettings.inc:491
-#: admin/systems/class_networkSettings.inc:757
-#: admin/systems/class_networkSettings.inc:816
-#: admin/systems/class_networkSettings.inc:835
-#: admin/systems/class_networkSettings.inc:852
-#: admin/systems/class_networkSettings.inc:861
-#: admin/systems/class_networkSettings.inc:879
-#: admin/systems/class_networkSettings.inc:951
+#: admin/systems/class_networkSettings.inc:470
+#: admin/systems/class_networkSettings.inc:483
+#: admin/systems/class_networkSettings.inc:749
+#: admin/systems/class_networkSettings.inc:808
+#: admin/systems/class_networkSettings.inc:827
+#: admin/systems/class_networkSettings.inc:844
+#: admin/systems/class_networkSettings.inc:853
+#: admin/systems/class_networkSettings.inc:871
+#: admin/systems/class_networkSettings.inc:943
 msgid "LDAP error"
 msgstr "bÅ‚Ä…d LDAP"
 
@@ -119,195 +108,125 @@ msgstr "System"
 msgid "System group"
 msgstr "Grupa systemowa"
 
-#: admin/ogroups/goto/class_termgroup.inc:401
-#: admin/ogroups/goto/termgroup.tpl.c:17
+#: admin/ogroups/goto/class_termgroup.inc:402
 msgid "Mode"
 msgstr "Tryb"
 
-#: admin/ogroups/goto/class_termgroup.inc:402
-#: admin/systems/class_workstationGeneric.inc:189
-#: admin/ogroups/goto/termgroup.tpl.c:23
+#: admin/ogroups/goto/class_termgroup.inc:403
+#: admin/systems/class_systemServers.inc:35
 msgid "Syslog server"
 msgstr "Serwer Syslog"
 
-#: admin/ogroups/goto/class_termgroup.inc:403
+#: admin/ogroups/goto/class_termgroup.inc:404
 msgid "Action flag"
 msgstr "Flaga akcji"
 
-#: admin/ogroups/goto/class_termgroup.inc:404
+#: admin/ogroups/goto/class_termgroup.inc:405
 msgid "Ntp server"
 msgstr "Serwer NTP"
 
-#: admin/ogroups/goto/class_termgroup.inc:405
-#: admin/systems/class_terminalGeneric.inc:41
-#: admin/ogroups/goto/termgroup.tpl.c:29
+#: admin/ogroups/goto/class_termgroup.inc:406
+#: admin/systems/class_terminalStartup.inc:65
 msgid "Root server"
 msgstr "Serwer NFS"
 
-#: admin/ogroups/goto/class_termgroup.inc:406
-#: admin/systems/class_terminalGeneric.inc:47
-#: admin/ogroups/goto/termgroup.tpl.c:35
+#: admin/ogroups/goto/class_termgroup.inc:407
+#: admin/systems/class_terminalStartup.inc:69
 msgid "Swap server"
 msgstr "Serwer Swap"
 
-#: admin/systems/class_terminalStartup.inc:63
+#: admin/systems/class_terminalStartup.inc:62
 msgid "Startup parameters"
 msgstr ""
 
-#: admin/systems/class_terminalStartup.inc:66
+#: admin/systems/class_terminalStartup.inc:65
+msgid "The root server the terminal should be using"
+msgstr ""
+
+#: admin/systems/class_terminalStartup.inc:69
+msgid "The swap server the terminal should be using"
+msgstr ""
+
+#: admin/systems/class_terminalStartup.inc:73
 msgid "Boot kernel"
 msgstr "Uruchamiane jÄ…dro"
 
-#: admin/systems/class_terminalStartup.inc:66
+#: admin/systems/class_terminalStartup.inc:73
 msgid "Linux kernel to be installed and booted"
 msgstr ""
 
-#: admin/systems/class_terminalStartup.inc:70
+#: admin/systems/class_terminalStartup.inc:77
 msgid "Boot kernel parameters"
 msgstr ""
 
-#: admin/systems/class_terminalStartup.inc:70
+#: admin/systems/class_terminalStartup.inc:77
 msgid "Linux kernel parameters to be ran"
 msgstr ""
 
-#: admin/systems/class_terminalStartup.inc:82
-msgid "Startup"
-msgstr "Startup"
-
 #: admin/systems/class_terminalStartup.inc:83
-msgid "Terminal startup"
-msgstr ""
-
-#: admin/systems/system-list.xml:10
-msgid "List of systems"
-msgstr "Lista systemÃ³w"
-
-#: admin/systems/system-list.xml:14
-msgid "New workstation"
-msgstr "Nowa stacja robocza"
+msgid "Remote desktop"
+msgstr "Zdalny pulpit"
 
-#: admin/systems/system-list.xml:22
-msgid "Locked server"
-msgstr ""
+#: admin/systems/class_terminalStartup.inc:87
+msgid "Connect method"
+msgstr "Metoda poÅ‚Ä…czenia"
 
-#: admin/systems/system-list.xml:30
-msgid "Locked workstation"
+#: admin/systems/class_terminalStartup.inc:91
+msgid "XDMCP"
 msgstr ""
 
-#: admin/systems/system-list.xml:38
-msgid "Locked terminal"
+#: admin/systems/class_terminalStartup.inc:91
+msgid "LDM"
 msgstr ""
 
-#: admin/systems/system-list.xml:47
-msgid "New terminal"
-msgstr "Nowy terminal"
+#: admin/systems/class_terminalStartup.inc:91
+msgid "Shell"
+msgstr "Shell"
 
-#: admin/systems/system-list.xml:55
-msgid "New device"
+#: admin/systems/class_terminalStartup.inc:91
+msgid "Telnet"
 msgstr ""
 
-#: admin/systems/system-list.xml:63
-msgid "Workstation template"
-msgstr "Szablon stacji roboczej"
-
-#: admin/systems/system-list.xml:71
-msgid "Terminal template"
-msgstr "Szablon terminala"
-
-#: admin/systems/system-list.xml:79
-msgid "Winstation"
-msgstr "Stacja Windows"
-
-#: admin/systems/system-list.xml:87 admin/systems/system-list.xml:234
-#: admin/systems/class_systemImport.inc:169
-#: admin/systems/class_serverGeneric.inc:46
-#: admin/systems/class_serverGeneric.inc:51
-#: admin/systems/class_serverGeneric.inc:52
-#: admin/systems/class_SelectDeviceType.inc:58
-msgid "Server"
-msgstr "Serwer"
-
-#: admin/systems/system-list.xml:95 admin/systems/system-list.xml:242
-#: admin/systems/class_workstationGeneric.inc:458
-#: admin/systems/class_workstationGeneric.inc:463
-#: admin/systems/class_workstationGeneric.inc:464
-#: admin/systems/class_SelectDeviceType.inc:58
-msgid "Workstation"
-msgstr "Stacja robocza"
-
-#: admin/systems/system-list.xml:103 admin/systems/system-list.xml:250
-#: admin/systems/class_terminalGeneric.inc:81
-#: admin/systems/class_terminalGeneric.inc:86
-#: admin/systems/class_terminalGeneric.inc:87
-#: admin/systems/class_SelectDeviceType.inc:58
-msgid "Terminal"
-msgstr "Terminal"
-
-#: admin/systems/system-list.xml:111 admin/systems/class_printGeneric.inc:1005
-#: admin/systems/class_printGeneric.inc:1011
-#: admin/systems/class_printGeneric.inc:1012
-msgid "Printer"
-msgstr "Drukarka"
-
-#: admin/systems/system-list.xml:119 admin/systems/system-list.xml:274
-#: admin/systems/class_mobilePhoneGeneric.inc:74
-#: admin/systems/phoneSelect/phoneSelect-list.xml:14
-msgid "Phone"
-msgstr "Telefon"
-
-#: admin/systems/system-list.xml:127
-#: admin/systems/class_mobilePhoneGeneric.inc:36
-#: admin/systems/class_mobilePhoneGeneric.inc:41
-#: admin/systems/class_mobilePhoneGeneric.inc:42
-#: admin/systems/phoneSelect/phoneSelect-list.xml:22
-msgid "Mobile phone"
-msgstr "Telefon komÃ³rkowy"
+#: admin/systems/class_terminalStartup.inc:91
+msgid "Windows RDP"
+msgstr "Windows RDP"
 
-#: admin/systems/system-list.xml:135
-#: admin/systems/class_componentGeneric.inc:36
-msgid "Component"
-msgstr ""
+#: admin/systems/class_terminalStartup.inc:95
+msgid "Terminal server"
+msgstr "Serwer terminali"
 
-#: admin/systems/system-list.xml:143 admin/systems/system-list.xml:298
-msgid "IPMI"
-msgstr ""
+#: admin/systems/system-list.xml:10
+msgid "List of systems"
+msgstr "Lista systemÃ³w"
 
-#: admin/systems/system-list.xml:169
-#: admin/systems/class_workstationGeneric.inc:154
-#: admin/systems/class_printGeneric.inc:752
-#: admin/systems/class_printGeneric.inc:762
-#: admin/systems/class_printGeneric.inc:781
-#: admin/systems/class_printGeneric.inc:1022
-#: admin/systems/class_componentGeneric.inc:64
-#: admin/systems/class_mobilePhoneGeneric.inc:63
-#: admin/systems/phoneSelect/phoneSelect-list.xml:48
+#: admin/systems/system-list.xml:31
+#: admin/systems/class_workstationGeneric.inc:46
+#: admin/systems/class_printGeneric.inc:60
+#: admin/systems/class_componentGeneric.inc:58
+#: admin/systems/class_mobilePhoneGeneric.inc:60
 #: admin/systems/services/shares/class_serviceShare.inc:52
-#: admin/systems/system-filter.tpl.c:32
-#: admin/systems/phoneSelect/phoneSelect-filter.tpl.c:11
 msgid "Name"
 msgstr "ImiÄ™"
 
-#: admin/systems/system-list.xml:177
-#: admin/systems/phoneSelect/phoneSelect-list.xml:63
+#: admin/systems/system-list.xml:39
 msgid "IP"
 msgstr ""
 
-#: admin/systems/system-list.xml:185
+#: admin/systems/system-list.xml:47
 msgid "MAC"
 msgstr ""
 
-#: admin/systems/system-list.xml:193
-#: admin/systems/class_workstationGeneric.inc:160
-#: admin/systems/class_printGeneric.inc:1024
-#: admin/systems/class_componentGeneric.inc:68
-#: admin/systems/class_mobilePhoneGeneric.inc:67
+#: admin/systems/system-list.xml:55
+#: admin/systems/class_workstationGeneric.inc:51
+#: admin/systems/class_printGeneric.inc:64
+#: admin/systems/class_componentGeneric.inc:62
+#: admin/systems/class_mobilePhoneGeneric.inc:64
 #: admin/systems/serverService-list.xml:35
 #: admin/systems/services/shares/class_serviceShare.inc:56
-#: admin/systems/printer.tpl.c:8 admin/systems/printer.tpl.c:17
 msgid "Description"
 msgstr "Opis"
 
-#: admin/systems/system-list.xml:201 admin/systems/class_serverService.inc:57
+#: admin/systems/system-list.xml:63 admin/systems/class_serverService.inc:57
 #: admin/systems/services/terminal/class_serviceTerminal.inc:30
 #: admin/systems/services/cups/class_serviceCUPS.inc:85
 #: admin/systems/services/shares/class_serviceShare.inc:31
@@ -316,378 +235,186 @@ msgstr "Opis"
 msgid "Services"
 msgstr "UsÅ‚ugi"
 
-#: admin/systems/system-list.xml:209
+#: admin/systems/system-list.xml:71
 msgid "Release"
 msgstr "Wersja"
 
-#: admin/systems/system-list.xml:217 admin/systems/serverService-list.xml:43
-#: admin/systems/phoneSelect/phoneSelect-list.xml:70
+#: admin/systems/system-list.xml:79 admin/systems/serverService-list.xml:43
 msgid "Actions"
 msgstr "Akcje"
 
-#: admin/systems/system-list.xml:228 admin/systems/serverService-list.xml:54
+#: admin/systems/system-list.xml:90 admin/systems/serverService-list.xml:54
 msgid "Create"
 msgstr "UtwÃ³rz"
 
-#: admin/systems/system-list.xml:258
-msgid "winStation"
-msgstr ""
-
-#: admin/systems/system-list.xml:266
-msgid "Network printer"
-msgstr "Drukarka sieciowa"
-
-#: admin/systems/system-list.xml:282
-#: admin/systems/class_componentGeneric.inc:41
-#: admin/systems/class_componentGeneric.inc:42
-msgid "Network device"
-msgstr "UrzÄ…dzenia sieciowe"
-
-#: admin/systems/system-list.xml:290
-msgid "Mobile Phone"
-msgstr ""
-
-#: admin/systems/system-list.xml:310
+#: admin/systems/system-list.xml:100
 msgid "Trigger action"
 msgstr ""
 
-#: admin/systems/system-list.xml:317
+#: admin/systems/system-list.xml:107
 msgid "Schedule action"
 msgstr ""
 
-#: admin/systems/system-list.xml:330
-msgid "Activate systems"
-msgstr ""
-
-#: admin/systems/system-list.xml:337 admin/systems/serverService-list.xml:69
-#: admin/systems/printer.tpl.c:35
+#: admin/systems/system-list.xml:119 admin/systems/serverService-list.xml:69
 msgid "Remove"
 msgstr "UsuÅ„"
 
-#: admin/systems/system-list.xml:367
-msgid "Create ISO"
-msgstr ""
-
-#: admin/systems/system-list.xml:379
+#: admin/systems/system-list.xml:150
 msgid "Edit system"
 msgstr ""
 
-#: admin/systems/system-list.xml:392
+#: admin/systems/system-list.xml:163
 msgid "Remove system"
 msgstr ""
 
-#: admin/systems/class_workstationGeneric.inc:75
-#, php-format
-msgid "Event %s is not available!"
-msgstr ""
-
-#: admin/systems/class_workstationGeneric.inc:78
-msgid "Events are not available!"
-msgstr ""
-
-#: admin/systems/class_workstationGeneric.inc:106
-msgid "(Re)Install"
-msgstr ""
-
-#: admin/systems/class_workstationGeneric.inc:107
-msgid "Software update"
-msgstr ""
-
-#: admin/systems/class_workstationGeneric.inc:115
-msgid "Wake up"
-msgstr "ZbudÅº"
-
-#: admin/systems/class_workstationGeneric.inc:144
-#: admin/systems/class_printGeneric.inc:604
+#: admin/systems/class_workstationGeneric.inc:35
 msgid "workstation"
 msgstr ""
 
-#: admin/systems/class_workstationGeneric.inc:151
-#: admin/systems/class_componentGeneric.inc:61
-#: admin/systems/class_mobilePhoneGeneric.inc:60
+#: admin/systems/class_workstationGeneric.inc:42
+#: admin/systems/class_printGeneric.inc:56
+#: admin/systems/class_componentGeneric.inc:55
+#: admin/systems/class_mobilePhoneGeneric.inc:56
 msgid "Properties"
 msgstr "WÅ‚aÅ›ciwoÅ›ci"
 
-#: admin/systems/class_workstationGeneric.inc:155
+#: admin/systems/class_workstationGeneric.inc:47
 #, php-format
 msgid "The name of the %s"
 msgstr ""
 
-#: admin/systems/class_workstationGeneric.inc:161
+#: admin/systems/class_workstationGeneric.inc:52
 #, php-format
 msgid "A short description of the %s"
 msgstr ""
 
-#: admin/systems/class_workstationGeneric.inc:166
-#: admin/systems/class_printGeneric.inc:1025
+#: admin/systems/class_workstationGeneric.inc:56
 msgid "Location"
 msgstr "Lokalizacja"
 
-#: admin/systems/class_workstationGeneric.inc:167
+#: admin/systems/class_workstationGeneric.inc:57
 #, php-format
 msgid "The location of the %s"
 msgstr ""
 
-#: admin/systems/class_workstationGeneric.inc:173
+#: admin/systems/class_workstationGeneric.inc:61
 #, php-format
 msgid "Lock this %s"
 msgstr ""
 
-#: admin/systems/class_workstationGeneric.inc:174
+#: admin/systems/class_workstationGeneric.inc:62
 #, php-format
 msgid "This will prevent the %s from being reinstalled"
 msgstr ""
 
-#: admin/systems/class_workstationGeneric.inc:185
-#: addons/dashboard/class_dashBoardSystems.inc:48
-msgid "Servers"
-msgstr "Serwery"
-
-#: admin/systems/class_workstationGeneric.inc:190
-#, php-format
-msgid "The syslog server the %s should be using"
+#: admin/systems/class_workstationGeneric.inc:73
+#: admin/systems/class_printGeneric.inc:83
+#: admin/systems/class_componentGeneric.inc:69
+#: admin/systems/class_mobilePhoneGeneric.inc:102
+#: admin/systems/class_networkSettings.inc:1008
+msgid "Network settings"
 msgstr ""
 
-#: admin/systems/class_workstationGeneric.inc:195
-msgid "Inherit NTP servers"
-msgstr ""
+#: admin/systems/class_workstationGeneric.inc:78
+#: admin/systems/class_printGeneric.inc:87
+#: admin/systems/class_componentGeneric.inc:73
+#: admin/systems/class_mobilePhoneGeneric.inc:106
+#: admin/systems/class_networkSettings.inc:630
+#: admin/systems/class_networkSettings.inc:643
+#: admin/systems/class_networkSettings.inc:645
+#: admin/systems/class_networkSettings.inc:1014
+msgid "IP address"
+msgstr "adres IP"
 
-#: admin/systems/class_workstationGeneric.inc:196
-msgid "Inherit time server attributes from ogroup"
+#: admin/systems/class_workstationGeneric.inc:78
+msgid "IP addresses this system uses (v4 or v6)"
 msgstr ""
 
-#: admin/systems/class_workstationGeneric.inc:202
-msgid "NTP servers"
+#: admin/systems/class_workstationGeneric.inc:83
+#: admin/systems/class_printGeneric.inc:91
+#: admin/systems/class_componentGeneric.inc:77
+#: admin/systems/class_mobilePhoneGeneric.inc:110
+msgid "Mac address"
 msgstr ""
 
-#: admin/systems/class_workstationGeneric.inc:203
-#, php-format
-msgid "The NTP servers for the %s"
+#: admin/systems/class_workstationGeneric.inc:83
+#: admin/systems/class_printGeneric.inc:91
+#: admin/systems/class_componentGeneric.inc:77
+#: admin/systems/class_mobilePhoneGeneric.inc:110
+msgid "Mac address of this system"
 msgstr ""
 
-#: admin/systems/class_workstationGeneric.inc:209
-msgid "Inherit LDAP servers"
-msgstr ""
+#: admin/systems/class_workstationGeneric.inc:125
+#: admin/systems/class_workstationGeneric.inc:130
+#: admin/systems/class_workstationGeneric.inc:131
+msgid "Workstation"
+msgstr "Stacja robocza"
 
-#: admin/systems/class_workstationGeneric.inc:210
-msgid "Inherit LDAP server attributes from ogroup"
+#: admin/systems/class_workstationGeneric.inc:126
+msgid "Workstation information"
 msgstr ""
 
-#: admin/systems/class_workstationGeneric.inc:216
-msgid "LDAP servers"
-msgstr ""
+#: admin/systems/class_printGeneric.inc:32
+#: admin/systems/class_printGeneric.inc:37
+#: admin/systems/class_printGeneric.inc:38
+msgid "Printer"
+msgstr "Drukarka"
 
-#: admin/systems/class_workstationGeneric.inc:217
-#, php-format
-msgid "The LDAP servers for the %s"
+#: admin/systems/class_printGeneric.inc:33
+msgid "Printer information"
 msgstr ""
 
-#: admin/systems/class_workstationGeneric.inc:225
-#: admin/systems/class_workstationGeneric.inc:229
-#: admin/ogroups/goto/termgroup.tpl.c:41
-msgid "Action"
-msgstr "Akcja"
-
-#: admin/systems/class_workstationGeneric.inc:230
-#: admin/ogroups/goto/termgroup.tpl.c:44
-msgid "Select action to execute for this terminal"
-msgstr "ProszÄ™ wybraÄ‡ akcjÄ™ do wykonania dla tego terminala"
-
-#: admin/systems/class_workstationGeneric.inc:236
-#: admin/systems/class_componentGeneric.inc:75
-#: admin/systems/class_mobilePhoneGeneric.inc:106
-#: admin/systems/class_networkSettings.inc:1016
-msgid "Network settings"
+#: admin/systems/class_printGeneric.inc:60
+msgid "The name of the printer"
 msgstr ""
 
-#: admin/systems/class_workstationGeneric.inc:459
-msgid "Workstation information"
+#: admin/systems/class_printGeneric.inc:64
+msgid "A short description of the printer"
 msgstr ""
 
-#: admin/systems/class_printGeneric.inc:131
-#: admin/systems/class_printGeneric.inc:1065
-#: admin/systems/class_systemManagement.inc:678
-msgid "Internal error"
-msgstr "BÅ‚Ä…d wewnÄ™trzny"
-
-#: admin/systems/class_printGeneric.inc:131
-#, php-format
-msgid ""
-"Cannot determine a valid department for this object. Setting base to '%s'!"
-msgstr ""
+#: admin/systems/class_printGeneric.inc:70
+msgid "Details"
+msgstr "SzczegÃ³Å‚y"
 
-#: admin/systems/class_printGeneric.inc:311
-#: admin/systems/class_printGeneric.inc:319
-#: admin/systems/class_printGeneric.inc:324
-#: admin/systems/class_printGeneric.inc:374
-#: admin/systems/class_printGeneric.inc:390
-#: admin/systems/class_printGeneric.inc:393
-msgid "Add printer extension"
-msgstr "Dodaj rozszerzenie drukarki"
+#: admin/systems/class_printGeneric.inc:73
+msgid "Printer location"
+msgstr "Lokalizacja drukarki"
 
-#: admin/systems/class_printGeneric.inc:312
-msgid ""
-"Could not initialize printer tab, parameter parent was missing while "
-"construction."
+#: admin/systems/class_printGeneric.inc:73
+msgid "The location of the printer"
 msgstr ""
 
-#: admin/systems/class_printGeneric.inc:320
-msgid "This is a workstation template, printer tab is disabled."
-msgstr "To jest szablon stacji roboczej, zakÅ‚adka drukarek jest wyÅ‚Ä…czona."
-
-#: admin/systems/class_printGeneric.inc:325
-msgid "This is a terminal template, printer tab is disabled."
-msgstr "To jest szablon terminala, zakÅ‚adka drukarek jest wyÅ‚Ä…czona."
+#: admin/systems/class_printGeneric.inc:77
+msgid "Printer URL"
+msgstr "URL drukarki"
 
-#: admin/systems/class_printGeneric.inc:367
-#: admin/systems/class_printGeneric.inc:375
-#: admin/systems/class_printGeneric.inc:383
-#: admin/systems/class_printGeneric.inc:386
-#: admin/systems/class_printGeneric.inc:391
-#: admin/systems/class_printGeneric.inc:394
-msgid "printer"
+#: admin/systems/class_printGeneric.inc:77
+msgid "The URL of the printer"
 msgstr ""
 
-#: admin/systems/class_printGeneric.inc:375
-msgid ""
-"You can't enable it while 'cn' is not present in entry. Possibly you are "
-"currently creating a new terminal template."
+#: admin/systems/class_printGeneric.inc:87
+#: admin/systems/class_componentGeneric.inc:73
+#: admin/systems/class_mobilePhoneGeneric.inc:106
+msgid "IP address this system uses"
 msgstr ""
 
-#: admin/systems/class_printGeneric.inc:382
-#: admin/systems/class_printGeneric.inc:385
-msgid "Remove printer extension"
-msgstr "UsuÅ„ rozszerzenie drukarki"
+#: admin/systems/class_serverService.inc:58
+msgid "Server services"
+msgstr ""
 
-#: admin/systems/class_printGeneric.inc:474
-#: admin/systems/class_printGeneric.inc:652
-#: admin/systems/class_printGeneric.inc:659
-#: admin/systems/class_printGeneric.inc:718
-#: admin/systems/class_printGeneric.inc:1105
-#: admin/systems/class_printGeneric.inc:1116
 #: admin/systems/class_serverService.inc:224
 #: admin/systems/class_serverService.inc:270
 #: admin/systems/class_serverService.inc:393
-#: admin/systems/class_systemManagement.inc:341
-#: admin/systems/class_systemManagement.inc:624
-#: admin/systems/class_systemManagement.inc:639
 #: admin/systems/services/shares/class_serviceShare.inc:103
-#: admin/systems/class_networkSettings.inc:305
-#: admin/systems/class_networkSettings.inc:336
-#: admin/systems/class_networkSettings.inc:584
-#: admin/systems/class_networkSettings.inc:591
-#: admin/systems/class_networkSettings.inc:597
-#: admin/systems/class_networkSettings.inc:604
+#: admin/systems/class_networkSettings.inc:297
+#: admin/systems/class_networkSettings.inc:328
+#: admin/systems/class_networkSettings.inc:576
+#: admin/systems/class_networkSettings.inc:583
+#: admin/systems/class_networkSettings.inc:589
+#: admin/systems/class_networkSettings.inc:596
 msgid "Error"
 msgstr "BÅ‚Ä…d"
 
-#: admin/systems/class_printGeneric.inc:577
-#, php-format
-msgid "Your currently selected PPD file '%s' doesn't exist."
-msgstr "Wybrany plik PPD '%s' nie istnieje."
-
-#: admin/systems/class_printGeneric.inc:583
-msgid "Not defined"
-msgstr ""
-
-#: admin/systems/class_printGeneric.inc:587
-#: admin/systems/ppd/class_printerPPDDialog.inc:116
-msgid "Can't get ppd informations."
-msgstr "Nie moÅ¼na pobraÄ‡ informacji ppd."
-
-#: admin/systems/class_printGeneric.inc:602
-#: admin/systems/class_printGeneric.inc:604
-#, php-format
-msgid "This printer belongs to %s. You can't rename this printer."
-msgstr ""
-
-#: admin/systems/class_printGeneric.inc:602
-#: admin/systems/class_terminalGeneric.inc:34
-msgid "terminal"
-msgstr "Terminal"
-
-#: admin/systems/class_printGeneric.inc:652
-#: admin/systems/class_printGeneric.inc:659
-msgid "Object is no printer!"
-msgstr ""
-
-#: admin/systems/class_printGeneric.inc:767 admin/systems/printer.tpl.c:23
-msgid "Printer URL"
-msgstr "URL drukarki"
-
-#: admin/systems/class_printGeneric.inc:989
-#: admin/systems/class_printGeneric.inc:991
-msgid "Group"
-msgstr "Grupa"
-
-#: admin/systems/class_printGeneric.inc:994
-msgid "User"
-msgstr "UÅ¼ytkownik"
-
-#: admin/systems/class_printGeneric.inc:1006
-msgid "Printer information"
-msgstr ""
-
-#: admin/systems/class_printGeneric.inc:1023
-#: admin/systems/serverService-list.tpl.c:2
-#: admin/systems/phoneSelect/phoneSelect-list.tpl.c:2
-#: admin/systems/printer.tpl.c:11
-msgid "Base"
-msgstr "Kontener"
-
-#: admin/systems/class_printGeneric.inc:1026
-msgid "LabeledURL"
-msgstr ""
-
-#: admin/systems/class_printGeneric.inc:1027
-msgid "Printer PPD"
-msgstr "PPD drukarki"
-
-#: admin/systems/class_printGeneric.inc:1028 admin/systems/printer.tpl.c:38
-msgid "Permissions"
-msgstr "Uprawnienia"
-
-#: admin/systems/class_printGeneric.inc:1030
-msgid "Windows inf file"
-msgstr ""
-
-#: admin/systems/class_printGeneric.inc:1031
-msgid "Windows driver dir"
-msgstr ""
-
-#: admin/systems/class_printGeneric.inc:1032 admin/systems/printer.tpl.c:62
-msgid "Driver printer name"
-msgstr ""
-
-#: admin/systems/class_printGeneric.inc:1048
-#: admin/systems/class_printGeneric.inc:1070
-msgid "Permission error"
-msgstr ""
-
-#: admin/systems/class_printGeneric.inc:1048
-#: admin/systems/class_printGeneric.inc:1070
-msgid "printer user"
-msgstr ""
-
-#: admin/systems/class_printGeneric.inc:1065
-#, php-format
-msgid "Illegal member type '%s'!"
-msgstr ""
-
-#: admin/systems/class_printGeneric.inc:1105
-#, php-format
-msgid "'%s' is already used!"
-msgstr ""
-
-#: admin/systems/class_printGeneric.inc:1116
-#, php-format
-msgid "'%s' does not exist!"
-msgstr ""
-
-#: admin/systems/class_serverService.inc:58
-msgid "Server services"
-msgstr ""
-
 #: admin/systems/class_serverService.inc:332
 msgid "Filter error"
 msgstr ""
@@ -708,219 +435,22 @@ msgstr ""
 #: admin/systems/class_serverService.inc:424
 #: admin/systems/class_serverService.inc:435
 #, php-format
-msgid "Could not get execute action %s on service %s."
-msgstr ""
-
-#: admin/systems/class_terminalGeneric.inc:42
-#, php-format
-msgid "The root server the terminal should be using"
-msgstr ""
-
-#: admin/systems/class_terminalGeneric.inc:48
-#, php-format
-msgid "The swap server the terminal should be using"
-msgstr ""
-
-#: admin/systems/class_terminalGeneric.inc:54
-msgid "Remote desktop"
-msgstr "Zdalny pulpit"
-
-#: admin/systems/class_terminalGeneric.inc:58
-msgid "Connect method"
-msgstr "Metoda poÅ‚Ä…czenia"
-
-#: admin/systems/class_terminalGeneric.inc:62
-msgid "XDMCP"
-msgstr ""
-
-#: admin/systems/class_terminalGeneric.inc:62
-msgid "LDM"
-msgstr ""
-
-#: admin/systems/class_terminalGeneric.inc:62
-msgid "Shell"
-msgstr "Shell"
-
-#: admin/systems/class_terminalGeneric.inc:62
-msgid "Telnet"
-msgstr ""
-
-#: admin/systems/class_terminalGeneric.inc:62
-msgid "Windows RDP"
-msgstr "Windows RDP"
-
-#: admin/systems/class_terminalGeneric.inc:66
-msgid "Terminal server"
-msgstr "Serwer terminali"
-
-#: admin/systems/class_terminalGeneric.inc:82
-msgid "Terminal information"
-msgstr ""
-
-#: admin/systems/ppd/class_printerPPDSelectionDialog.inc:91
-#: admin/systems/ppd/class_printerPPDSelectionDialog.inc:116
-#: admin/systems/ppd/class_printerPPDSelectionDialog.inc:139
-#: admin/systems/ppd/class_printerPPDDialog.inc:92
-#: admin/systems/ppd/class_printerPPDDialog.inc:160
-#: admin/systems/ppd/class_printerPPDDialog.inc:241
-#: admin/systems/ppd/class_printerPPDDialog.inc:256
-#: admin/systems/ppd/class_printerPPDDialog.inc:269
-#: admin/systems/ppd/class_printerPPDDialog.inc:297
-#: admin/systems/ppd/class_printerPPDDialog.inc:314
-#: admin/systems/ppd/class_printerPPDDialog.inc:337
-#: admin/systems/ppd/class_printerPPDDialog.inc:351
-#: admin/systems/ppd/class_printerPPDDialog.inc:361
-#: admin/systems/ppd/class_printerPPDDialog.inc:365
-#: admin/systems/ppd/class_printerPPDDialog.inc:560
-#: admin/systems/ppd/class_printerPPDDialog.inc:577
-#: admin/systems/ppd/class_printerPPDDialog.inc:580
-#: admin/systems/ppd/class_printerPPDDialog.inc:583
-msgid "PPD error"
-msgstr ""
-
-#: admin/systems/ppd/class_printerPPDSelectionDialog.inc:139
-#, php-format
-msgid "Cannot locate vendor '%s' in available PPDs!"
-msgstr ""
-
-#: admin/systems/ppd/class_printerPPDSelectionDialog.inc:148
-msgid "Printer ppd selection."
-msgstr "WybÃ³r ppd drukarki."
-
-#: admin/systems/ppd/class_printerPPDSelectionDialog.inc:155
-msgid "delete"
-msgstr "UsuÅ„"
-
-#: admin/systems/ppd/class_printerPPDSelectionDialog.inc:166
-msgid "back"
-msgstr "wrÃ³Ä‡"
-
-#: admin/systems/ppd/class_printerPPDDialog.inc:74
-#: admin/systems/ppd/class_printerPPDDialog.inc:140
-#: admin/systems/services/class_goService.inc:241
-msgid "Configuration error"
-msgstr "BÅ‚Ä…d konfiguracji"
-
-#: admin/systems/ppd/class_printerPPDDialog.inc:92
-#, php-format
-msgid "Cannot open PPD '%s'!"
-msgstr ""
-
-#: admin/systems/ppd/class_printerPPDDialog.inc:141
-#, php-format
-msgid "Cannot open PPD path '%s' for reading and writing!"
-msgstr ""
-
-#: admin/systems/ppd/class_printerPPDDialog.inc:160
-#: admin/systems/ppd/class_printerPPDDialog.inc:365
-msgid "file is empty"
-msgstr ""
-
-#: admin/systems/ppd/class_printerPPDDialog.inc:314
-#, php-format
-msgid "Cannot parse PPD '%s'!"
-msgstr ""
-
-#: admin/systems/ppd/class_printerPPDDialog.inc:340
-msgid "Overwrite existing PPD"
-msgstr ""
-
-#: admin/systems/ppd/class_printerPPDDialog.inc:341
-msgid ""
-"There is already a ppd file for this kind of printer. Do you want to "
-"overwrite it?"
-msgstr ""
-
-#: admin/systems/ppd/class_printerPPDDialog.inc:491
-msgid "Section"
-msgstr "Sekcja"
-
-#: admin/systems/ppd/class_printerPPDDialog.inc:551
-#: admin/systems/ppd/class_printerPPDDialog.inc:554
-msgid "True"
-msgstr "Tak"
-
-#: admin/systems/ppd/class_printerPPDDialog.inc:552
-#: admin/systems/ppd/class_printerPPDDialog.inc:555
-msgid "False"
-msgstr "Nie"
-
-#: admin/systems/ppd/class_printerPPDDialog.inc:560
-#, php-format
-msgid "PPD type '%s' is not supported!"
-msgstr ""
-
-#: admin/systems/ppd/class_printerPPDDialog.inc:597
-msgid ""
-"Please select a valid ppd file or use 'Cancel' to go back to printer "
-"configuration."
-msgstr ""
-
-#: admin/systems/ppd/class_ppdManager.inc:44
-#: admin/systems/ppd/class_ppdManager.inc:188
-#: admin/systems/ppd/class_ppdManager.inc:190
-msgid "PPD manager error"
-msgstr ""
-
-#: admin/systems/ppd/class_ppdManager.inc:44
-#, php-format
-msgid "The specified path '%s' does not exist."
-msgstr ""
-
-#: admin/systems/ppd/class_ppdManager.inc:188
-#, php-format
-msgid "Specified PPD file '%s' cannot be opened for reading."
-msgstr ""
-
-#: admin/systems/ppd/class_ppdManager.inc:190
-#, php-format
-msgid "The temporary file '%s' cannot be opened for writing."
-msgstr ""
-
-#: admin/systems/ppd/class_ppdManager.inc:212
-#: admin/systems/ppd/class_ppdManager.inc:350
-msgid "Parsing PPD file failed - file is empty!"
-msgstr ""
-
-#: admin/systems/ppd/class_ppdManager.inc:222
-#, php-format
-msgid ""
-"Parsing PPD file %s failed - line too long. Trailing characters have been "
-"ignored!"
+msgid "Could not get execute action %s on service %s."
 msgstr ""
 
-#: admin/systems/ppd/class_ppdManager.inc:230
-msgid "Nested groups are not supported!"
-msgstr "ZagnieÅ¼dÅ¼one grupy nie sÄ… wspierane!"
-
-#: admin/systems/ppd/class_ppdManager.inc:234
-msgid "Group name not unique!"
-msgstr "Nazwa grupy nie jest unikalna"
-
-#: admin/systems/ppd/class_ppdManager.inc:240
-#: admin/systems/ppd/class_ppdManager.inc:270
-msgid "Symbol values are not supported yet!"
-msgstr "WartoÅ›ci symboliczne nie sÄ… jeszcze wspierane!"
-
-#: admin/systems/ppd/class_ppdManager.inc:264
-msgid "Nested options are not supported!"
-msgstr "Opcje zagnieÅ¼dÅ¼one nie sÄ… wspierane!"
-
-#: admin/systems/ppd/class_ppdManager.inc:289
-msgid "PickMany is not supported yet!"
-msgstr "PickMany nie jest jeszcze obsÅ‚ugiwany"
+#: admin/systems/class_terminalGeneric.inc:31
+msgid "terminal"
+msgstr "Terminal"
 
-#: admin/systems/ppd/class_ppdManager.inc:370
-#, php-format
-msgid ""
-"Parsing PPD file %s failed - line too long. Trailing characters have been "
-"ignored"
-msgstr "Parsowanie pliku PPD %s nieudane - linia za dÅ‚uga . KoÅ„cowe znaki zostaÅ‚y zignorowane"
+#: admin/systems/class_terminalGeneric.inc:43
+#: admin/systems/class_terminalGeneric.inc:48
+#: admin/systems/class_terminalGeneric.inc:49
+msgid "Terminal"
+msgstr "Terminal"
 
-#: admin/systems/ppd/class_ppdManager.inc:395
-#, php-format
-msgid "Parsing PPD file %s failed - no information found."
-msgstr "Parsowanie pliku PPD %s nieudane - nie znaleziono informacji."
+#: admin/systems/class_terminalGeneric.inc:44
+msgid "Terminal information"
+msgstr ""
 
 #: admin/systems/class_systemImport.inc:72
 #, php-format
@@ -941,83 +471,130 @@ msgstr ""
 msgid "Import"
 msgstr "Import"
 
+#: admin/systems/class_systemImport.inc:169
+#: admin/systems/class_serverGeneric.inc:43
+#: admin/systems/class_serverGeneric.inc:48
+#: admin/systems/class_serverGeneric.inc:49
+msgid "Server"
+msgstr "Serwer"
+
 #: admin/systems/class_systemImport.inc:169
 msgid "The server you wish to import hosts from"
 msgstr ""
 
-#: admin/systems/class_serverGeneric.inc:34
+#: admin/systems/class_serverGeneric.inc:31
 msgid "server"
 msgstr "Serwer"
 
-#: admin/systems/class_serverGeneric.inc:47
+#: admin/systems/class_serverGeneric.inc:44
 msgid "Server information"
 msgstr ""
 
-#: admin/systems/class_componentGeneric.inc:37
+#: admin/systems/class_componentGeneric.inc:31
+msgid "Component"
+msgstr ""
+
+#: admin/systems/class_componentGeneric.inc:32
 msgid "Component information"
 msgstr ""
 
-#: admin/systems/class_componentGeneric.inc:64
+#: admin/systems/class_componentGeneric.inc:36
+#: admin/systems/class_componentGeneric.inc:37
+msgid "Network device"
+msgstr "UrzÄ…dzenia sieciowe"
+
+#: admin/systems/class_componentGeneric.inc:58
 msgid "The name of the component"
 msgstr ""
 
-#: admin/systems/class_componentGeneric.inc:68
+#: admin/systems/class_componentGeneric.inc:62
 msgid "A short description of the component"
 msgstr ""
 
+#: admin/systems/class_systemServers.inc:31
+#: admin/systems/class_systemServers.inc:53
+msgid "Servers"
+msgstr "Serwery"
+
+#: admin/systems/class_systemServers.inc:35
+msgid "The syslog server the system should be using"
+msgstr ""
+
+#: admin/systems/class_systemServers.inc:40
+msgid "NTP servers"
+msgstr ""
+
+#: admin/systems/class_systemServers.inc:40
+msgid "The NTP servers for this system"
+msgstr ""
+
+#: admin/systems/class_systemServers.inc:54
+msgid "Servers this system is using"
+msgstr ""
+
+#: admin/systems/class_mobilePhoneGeneric.inc:32
 #: admin/systems/class_mobilePhoneGeneric.inc:37
+#: admin/systems/class_mobilePhoneGeneric.inc:38
+msgid "Mobile phone"
+msgstr "Telefon komÃ³rkowy"
+
+#: admin/systems/class_mobilePhoneGeneric.inc:33
 msgid "Mobile phone information"
 msgstr ""
 
-#: admin/systems/class_mobilePhoneGeneric.inc:63
+#: admin/systems/class_mobilePhoneGeneric.inc:60
 msgid "The name of the mobile phone"
 msgstr ""
 
-#: admin/systems/class_mobilePhoneGeneric.inc:67
+#: admin/systems/class_mobilePhoneGeneric.inc:64
 msgid "A short description of the mobile phone"
 msgstr ""
 
-#: admin/systems/class_mobilePhoneGeneric.inc:77
+#: admin/systems/class_mobilePhoneGeneric.inc:70
+msgid "Phone"
+msgstr "Telefon"
+
+#: admin/systems/class_mobilePhoneGeneric.inc:73
 msgid "Serial Number"
 msgstr ""
 
-#: admin/systems/class_mobilePhoneGeneric.inc:77
+#: admin/systems/class_mobilePhoneGeneric.inc:73
 msgid "The serial number of the mobile phone"
 msgstr ""
 
-#: admin/systems/class_mobilePhoneGeneric.inc:81
+#: admin/systems/class_mobilePhoneGeneric.inc:77
 msgid "IMEI Number"
 msgstr ""
 
-#: admin/systems/class_mobilePhoneGeneric.inc:81
+#: admin/systems/class_mobilePhoneGeneric.inc:77
 msgid "The IMEI number of the mobile phone"
 msgstr ""
 
-#: admin/systems/class_mobilePhoneGeneric.inc:86
+#: admin/systems/class_mobilePhoneGeneric.inc:82
 msgid "OS"
 msgstr ""
 
-#: admin/systems/class_mobilePhoneGeneric.inc:86
+#: admin/systems/class_mobilePhoneGeneric.inc:82
 msgid "The Operating System installed on this phone"
 msgstr ""
 
-#: admin/systems/class_mobilePhoneGeneric.inc:92
+#: admin/systems/class_mobilePhoneGeneric.inc:88
 msgid "SimCard"
 msgstr ""
 
-#: admin/systems/class_mobilePhoneGeneric.inc:95
+#: admin/systems/class_mobilePhoneGeneric.inc:91
 msgid "Telephone Number"
 msgstr ""
 
-#: admin/systems/class_mobilePhoneGeneric.inc:95
+#: admin/systems/class_mobilePhoneGeneric.inc:91
 msgid "The telephone number of the mobile phone"
 msgstr ""
 
-#: admin/systems/class_mobilePhoneGeneric.inc:99
+#: admin/systems/class_mobilePhoneGeneric.inc:95
 msgid "PUK Number"
 msgstr ""
 
-#: admin/systems/class_mobilePhoneGeneric.inc:99
+#: admin/systems/class_mobilePhoneGeneric.inc:95
 msgid "The PUK number of the simcard in this mobile phone"
 msgstr ""
 
@@ -1060,70 +637,20 @@ msgstr "Edytuj usÅ‚ugÄ™"
 msgid "Remove service"
 msgstr "UsuÅ„ usÅ‚ugÄ™"
 
-#: admin/systems/phoneSelect/phoneSelect-list.xml:10
-msgid "Please select the desired entries"
-msgstr ""
-
-#: admin/systems/phoneSelect/phoneSelect-list.xml:56
-msgid "Number"
-msgstr ""
-
-#: admin/systems/phoneSelect/phoneSelect-list.xml:83
-msgid "Select this number"
-msgstr ""
-
-#: admin/systems/class_systemManagement.inc:177
-msgid "Back"
-msgstr "WrÃ³Ä‡"
-
-#: admin/systems/class_systemManagement.inc:223
-msgid "Creating the image failed. Please see the report below."
-msgstr ""
-
-#: admin/systems/class_systemManagement.inc:228
-#, php-format
-msgid "Command '%s', specified for ISO creation doesn't seem to exist."
-msgstr ""
-
-#: admin/systems/class_systemManagement.inc:398
-#: admin/systems/class_systemManagement.inc:473
-#: admin/systems/class_systemManagement.inc:858
-#: admin/systems/class_systemManagement.inc:905
-#: admin/systems/class_systemManagement.inc:926
-msgid "Permission"
-msgstr "Uprawnienie"
-
-#: admin/systems/class_systemManagement.inc:678
-msgid "Cannot set mode to 'active'!"
-msgstr ""
-
-#: admin/systems/class_systemManagement.inc:858
-#, php-format
-msgid "You are not allowed to create a snapshot for %s."
-msgstr ""
-
-#: admin/systems/class_systemManagement.inc:905
-#: admin/systems/class_systemManagement.inc:926
-#, php-format
-msgid "You are not allowed to restore a snapshot for %s."
-msgstr ""
-
-#: admin/systems/class_systemManagement.inc:1169
-#, php-format
-msgid "Inherited from %s"
-msgstr ""
-
-#: admin/systems/class_systemManagement.inc:1224
-#: admin/systems/class_systemManagement.inc:1228
-#: addons/dashboard/class_dashBoardSystems.inc:199
+#: admin/systems/class_systemManagement.inc:48
 #: config/systems/class_systemsPluginConfig.inc:28
 msgid "Systems"
 msgstr "Systemy"
 
-#: admin/systems/class_systemManagement.inc:1225
+#: admin/systems/class_systemManagement.inc:49
 msgid "Systems Management"
 msgstr ""
 
+#: admin/systems/class_systemManagement.inc:250
+#, php-format
+msgid "Inherited from %s"
+msgstr ""
+
 #: admin/systems/services/terminal/class_serviceTerminal.inc:29
 #: admin/systems/services/terminal/class_serviceTerminal.inc:30
 #: admin/systems/services/terminal/class_serviceTerminal.inc:41
@@ -1161,6 +688,10 @@ msgstr "Cups"
 msgid "Empty service"
 msgstr ""
 
+#: admin/systems/services/class_goService.inc:241
+msgid "Configuration error"
+msgstr "BÅ‚Ä…d konfiguracji"
+
 #: admin/systems/services/shares/class_serviceShare.inc:30
 #: admin/systems/services/shares/class_serviceShare.inc:31
 msgid "Share service"
@@ -1219,8 +750,6 @@ msgid "You need to configure encodings first"
 msgstr ""
 
 #: admin/systems/services/shares/class_serviceShare.inc:110
-#: admin/ogroups/goto/termgroup.tpl.c:2 admin/systems/remove.tpl.c:2
-#: admin/systems/ppd/remove_ppd.tpl.c:2
 msgid "Warning"
 msgstr "OstrzeÅ¼enie"
 
@@ -1346,153 +875,93 @@ msgstr ""
 msgid "LDAP"
 msgstr "LDAP"
 
-#: admin/systems/class_networkSettings.inc:305
+#: admin/systems/class_networkSettings.inc:297
 msgid "NOT IMPLEMENTED"
 msgstr ""
 
-#: admin/systems/class_networkSettings.inc:437
+#: admin/systems/class_networkSettings.inc:429
 msgid "Not matching"
 msgstr ""
 
-#: admin/systems/class_networkSettings.inc:584
+#: admin/systems/class_networkSettings.inc:576
 #, php-format
 msgid "Was not able to contact argonaut server: %s"
 msgstr ""
 
-#: admin/systems/class_networkSettings.inc:591
+#: admin/systems/class_networkSettings.inc:583
 #, php-format
 msgid "Was not able to find DNS server for zone %s"
 msgstr ""
 
-#: admin/systems/class_networkSettings.inc:597
+#: admin/systems/class_networkSettings.inc:589
 #, php-format
 msgid "Was not able to find mac address of DNS server %s"
 msgstr ""
 
-#: admin/systems/class_networkSettings.inc:604
+#: admin/systems/class_networkSettings.inc:596
 #, php-format
 msgid "Was not able to launch ldap2zone: %s"
 msgstr ""
 
-#: admin/systems/class_networkSettings.inc:630
+#: admin/systems/class_networkSettings.inc:622
 #, php-format
 msgid "IP address %s"
 msgstr ""
 
-#: admin/systems/class_networkSettings.inc:638
-#: admin/systems/class_networkSettings.inc:651
-#: admin/systems/class_networkSettings.inc:653
-#: admin/systems/class_networkSettings.inc:1022
-msgid "IP address"
-msgstr "adres IP"
-
-#: admin/systems/class_networkSettings.inc:644
-#: admin/systems/class_networkSettings.inc:660
-#: admin/systems/class_networkSettings.inc:662
-#: admin/systems/class_networkSettings.inc:1023
+#: admin/systems/class_networkSettings.inc:636
+#: admin/systems/class_networkSettings.inc:652
+#: admin/systems/class_networkSettings.inc:654
+#: admin/systems/class_networkSettings.inc:1015
 msgid "MAC address"
 msgstr "Adres MAC"
 
-#: admin/systems/class_networkSettings.inc:676
+#: admin/systems/class_networkSettings.inc:668
 #, php-format
 msgid "The IP address '%s' is not part of the selected reverse zone '%s'!"
 msgstr ""
 
-#: admin/systems/class_networkSettings.inc:686
+#: admin/systems/class_networkSettings.inc:678
 #, php-format
 msgid "Record type '%s' is duplicated!"
 msgstr ""
 
-#: admin/systems/class_networkSettings.inc:693
+#: admin/systems/class_networkSettings.inc:685
 #, php-format
 msgid "Uniq record type '%s' is duplicated!"
 msgstr ""
 
-#: admin/systems/class_networkSettings.inc:705
+#: admin/systems/class_networkSettings.inc:697
 #, php-format
 msgid ""
 "The IP address '%s' will be added as 'A Record', this will be done "
 "automatically, please remove the record."
 msgstr ""
 
-#: admin/systems/class_networkSettings.inc:712
+#: admin/systems/class_networkSettings.inc:704
 #, php-format
 msgid "Only lowercase records are allowed, please check your '%ss'."
 msgstr ""
 
-#: admin/systems/class_networkSettings.inc:978
+#: admin/systems/class_networkSettings.inc:970
 msgid "Delete"
 msgstr "UsuÅ„"
 
-#: admin/systems/class_networkSettings.inc:984
+#: admin/systems/class_networkSettings.inc:976
 msgid "Add"
 msgstr "Dodaj"
 
-#: admin/systems/class_networkSettings.inc:1015
-#: addons/dashboard/class_dashBoardNetwork.inc:127
+#: admin/systems/class_networkSettings.inc:1007
 msgid "Network"
 msgstr ""
 
-#: admin/systems/class_networkSettings.inc:1030
+#: admin/systems/class_networkSettings.inc:1022
 msgid "DNS configuration"
 msgstr ""
 
-#: admin/systems/class_networkSettings.inc:1033
+#: admin/systems/class_networkSettings.inc:1025
 msgid "DHCP configuration"
 msgstr ""
 
-#: addons/dashboard/class_dashBoardSystems.inc:45
-msgid "Workstations"
-msgstr ""
-
-#: addons/dashboard/class_dashBoardSystems.inc:51
-msgid "Windows Workstations"
-msgstr ""
-
-#: addons/dashboard/class_dashBoardSystems.inc:54
-msgid "Terminals"
-msgstr ""
-
-#: addons/dashboard/class_dashBoardSystems.inc:57
-msgid "Printers"
-msgstr ""
-
-#: addons/dashboard/class_dashBoardSystems.inc:60
-msgid "Phones"
-msgstr ""
-
-#: addons/dashboard/class_dashBoardSystems.inc:63
-msgid "Components"
-msgstr ""
-
-#: addons/dashboard/class_dashBoardSystems.inc:66
-msgid "Mobile phones"
-msgstr ""
-
-#: addons/dashboard/class_dashBoardSystems.inc:183
-msgid "Statistics"
-msgstr ""
-
-#: addons/dashboard/class_dashBoardSystems.inc:188
-msgid "Computer name to use by unit"
-msgstr ""
-
-#: addons/dashboard/class_dashBoardSystems.inc:200
-msgid "Statistics and informations about systems"
-msgstr ""
-
-#: addons/dashboard/class_dashBoardNetwork.inc:111
-msgid "DHCP"
-msgstr ""
-
-#: addons/dashboard/class_dashBoardNetwork.inc:116
-msgid "DNS"
-msgstr "DNS"
-
-#: addons/dashboard/class_dashBoardNetwork.inc:128
-msgid "Statistics and various informations"
-msgstr ""
-
 #: config/systems/class_systemsPluginConfig.inc:29
 msgid "Systems plugin configuration"
 msgstr ""
@@ -1584,406 +1053,3 @@ msgstr ""
 #: config/systems/class_systemsPluginConfig.inc:101
 msgid "Encodings"
 msgstr ""
-
-#: admin/ogroups/goto/termgroup.tpl.c:5
-msgid ""
-"Actions you choose here influence all systems in this object group. "
-"Additionally, all values editable here can be inherited by the clients "
-"assigned to this object group."
-msgstr "Akcje wybrane tutaj wpÅ‚ywajÄ… na wszystkie systemy w tej grupie obiektÃ³w. Dodatkowo wszystkie wartoÅ›ci edytowalne tutaj mogÄ… byÄ‡ odziedziczone przez klientÃ³w przypisanych do tych grup obiektÃ³w."
-
-#: admin/ogroups/goto/termgroup.tpl.c:8
-msgid "Generic"
-msgstr "OgÃ³lne"
-
-#: admin/ogroups/goto/termgroup.tpl.c:11
-msgid "NTP server"
-msgstr "Serwer NTP"
-
-#: admin/ogroups/goto/termgroup.tpl.c:14
-msgid "Choose server to use for synchronizing time"
-msgstr "ProszÄ™ wybraÄ‡ serwer do synchronizacji czasu"
-
-#: admin/ogroups/goto/termgroup.tpl.c:20
-msgid "Select terminal mode"
-msgstr "ProszÄ™ wybraÄ‡ tryb terminala"
-
-#: admin/ogroups/goto/termgroup.tpl.c:26
-msgid "Choose server to use for logging"
-msgstr "ProszÄ™ wybraÄ‡ serwer do logowania"
-
-#: admin/ogroups/goto/termgroup.tpl.c:32
-msgid "Select NFS root filesystem to use"
-msgstr "ProszÄ™ wybraÄ‡ gÅ‚Ã³wny system plikÃ³w NFS"
-
-#: admin/ogroups/goto/termgroup.tpl.c:38
-msgid "Choose NFS filesystem to place swap files on"
-msgstr "ProszÄ™ wybraÄ‡ system plikÃ³w NFS dla plikÃ³w swap"
-
-#: admin/ogroups/goto/termgroup.tpl.c:47
-msgid "Execute"
-msgstr "Uruchom"
-
-#: 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 admin/systems/network.tpl.c:11
-msgid "Propose ip"
-msgstr ""
-
-#: admin/systems/network.tpl.c:14
-msgid "MAC-address"
-msgstr "adres MAC"
-
-#: admin/systems/network.tpl.c:17
-msgid "Autodetect"
-msgstr "Autowykrywanie"
-
-#: admin/systems/network.tpl.c:20 admin/systems/network.tpl.c:23
-msgid "Enable DHCP for this device"
-msgstr ""
-
-#: admin/systems/network.tpl.c:26 admin/systems/network.tpl.c:50
-msgid "not configured"
-msgstr ""
-
-#: admin/systems/network.tpl.c:29
-msgid "Parent node"
-msgstr ""
-
-#: admin/systems/network.tpl.c:32
-msgid "Edit settings"
-msgstr ""
-
-#: admin/systems/network.tpl.c:35 admin/systems/network.tpl.c:47
-msgid "Enable DNS for this device"
-msgstr "WÅ‚Ä…cz DNS dla tego urzÄ…dzenia."
-
-#: admin/systems/network.tpl.c:38
-msgid "Zone"
-msgstr "Strefa"
-
-#: admin/systems/network.tpl.c:41
-msgid "TTL"
-msgstr "TTL"
-
-#: admin/systems/network.tpl.c:44
-msgid "Dns records"
-msgstr "Rekordy DNS"
-
-#: admin/systems/password.tpl.c:2
-msgid ""
-"To change the terminal root password use the fields below. The changes take "
-"effect during the next reboot. Please memorize the new password, because you"
-" wouldn't be able to log in."
-msgstr "Aby zmieniÄ‡ hasÅ‚o root'a dla terminala uÅ¼yj pÃ³l poniÅ¼ej. Zmiany wchodzÄ… po nastÄ™pnym uruchomieniu. ProszÄ™ zapamiÄ™taÄ‡ nowe hasÅ‚o, gdyÅ¼ bez niego logowanie bÄ™dzie niemoÅ¼liwe"
-
-#: admin/systems/password.tpl.c:5
-msgid "Leave fields blank for password inheritance from default entries."
-msgstr "Pozostaw pola puste aby dziedziczyÄ‡ hasÅ‚o z wpisÃ³w domyÅ›lnych."
-
-#: admin/systems/password.tpl.c:8
-msgid "Changing the password impinges on authentification only."
-msgstr "Zmiana hasÅ‚a wpÅ‚ywa tylko na autentykacjÄ™."
-
-#: admin/systems/password.tpl.c:11
-msgid "New password"
-msgstr "Nowe hasÅ‚o"
-
-#: admin/systems/password.tpl.c:14
-msgid "Repeat new password"
-msgstr "PowtÃ³rz nowe hasÅ‚o"
-
-#: admin/systems/password.tpl.c:17
-msgid "Password strength"
-msgstr ""
-
-#: admin/systems/password.tpl.c:20
-msgid "Set password"
-msgstr "Ustaw hasÅ‚o"
-
-#: 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/gencd.tpl.c:2
-msgid "CD-Install-Image generation"
-msgstr ""
-
-#: admin/systems/gencd.tpl.c:5
-msgid ""
-"This option enables you to generate FAI install CD images for the selected "
-"workstation. The procedure may take about 10 minutes to complete, so please "
-"be patient after pressing the 'Create ISO-Image' button."
-msgstr ""
-
-#: admin/systems/gencd.tpl.c:8
-msgid "Create ISO-Image"
-msgstr ""
-
-#: admin/systems/remove.tpl.c:5
-msgid ""
-"This includes all account data, system access rules, imap settings, etc. for"
-" this user. Please double check if your really want to do this since there "
-"is no way for FusionDirectory to get your data back."
-msgstr ""
-
-#: admin/systems/remove.tpl.c:8
-msgid "So - if you're sure - press 'Delete' to continue or 'Cancel' to abort."
-msgstr "JeÅ›li jesteÅ› pewien - naciÅ›nij 'UsuÅ„' aby kontynuowaÄ‡ lub 'Anuluj' aby anulowaÄ‡."
-
-#: admin/systems/system-filter.tpl.c:2
-#: admin/systems/phoneSelect/phoneSelect-filter.tpl.c:2
-msgid "Filter"
-msgstr "Filtr"
-
-#: admin/systems/system-filter.tpl.c:5
-msgid "Show servers"
-msgstr "PokaÅ¼ serwery"
-
-#: admin/systems/system-filter.tpl.c:8
-msgid "Show workstations"
-msgstr "PokaÅ¼ stacje robocze"
-
-#: admin/systems/system-filter.tpl.c:11
-msgid "Show terminals"
-msgstr "PokaÅ¼ terminale"
-
-#: admin/systems/system-filter.tpl.c:14
-msgid "Show network printer"
-msgstr ""
-
-#: admin/systems/system-filter.tpl.c:17
-#: admin/systems/phoneSelect/phoneSelect-filter.tpl.c:5
-msgid "Show phones"
-msgstr "PokaÅ¼ telefony"
-
-#: admin/systems/system-filter.tpl.c:20
-msgid "Show windows based workstations"
-msgstr ""
-
-#: admin/systems/system-filter.tpl.c:23
-msgid "Show network devices"
-msgstr "PokaÅ¼ urzÄ…dzenia sieciowe"
-
-#: admin/systems/system-filter.tpl.c:26
-#: admin/systems/phoneSelect/phoneSelect-filter.tpl.c:8
-msgid "Show mobile phones"
-msgstr ""
-
-#: admin/systems/system-filter.tpl.c:29
-msgid "Show IPMI interfaces"
-msgstr ""
-
-#: admin/systems/ppd/printerPPDSelectionDialog.tpl.c:2
-msgid "Select objects to add"
-msgstr "Wybierz obiekty do dodania"
-
-#: admin/systems/ppd/printerPPDSelectionDialog.tpl.c:5
-msgid "Filters"
-msgstr "Filtry"
-
-#: admin/systems/ppd/printerPPDSelectionDialog.tpl.c:8
-msgid "Display objects matching"
-msgstr "WyÅ›wietl obiekty pasujÄ…ce"
-
-#: admin/systems/ppd/printerPPDSelectionDialog.tpl.c:11
-msgid "Regular expression for matching object names"
-msgstr "WyraÅ¼enie regularne dla dopasowania nazw obiektÃ³w"
-
-#: admin/systems/ppd/printerPPDSelectionDialog.tpl.c:14
-msgid "Close"
-msgstr "Zamknij"
-
-#: admin/systems/ppd/printerPPDDialog.tpl.c:2
-msgid "Printer driver"
-msgstr "Sterownik drulkarki"
-
-#: admin/systems/ppd/printerPPDDialog.tpl.c:5
-msgid "Model"
-msgstr "Model"
-
-#: admin/systems/ppd/printerPPDDialog.tpl.c:8
-msgid "Select"
-msgstr "Wybierz"
-
-#: admin/systems/ppd/printerPPDDialog.tpl.c:11
-msgid "New driver"
-msgstr "Nowy sterownik"
-
-#: admin/systems/ppd/printerPPDDialog.tpl.c:14
-msgid "Upload"
-msgstr "Wgraj"
-
-#: admin/systems/ppd/printerPPDDialog.tpl.c:17
-msgid "Options"
-msgstr "Opcje"
-
-#: admin/systems/ppd/remove_ppd.tpl.c:5
-msgid "The ppd file will be removed from the server and can not be restored."
-msgstr ""
-
-#: admin/systems/printer.tpl.c:2
-msgid "General"
-msgstr "OgÃ³lne"
-
-#: admin/systems/printer.tpl.c:5
-msgid "Printer name"
-msgstr "nazwa drukarki"
-
-#: admin/systems/printer.tpl.c:14
-msgid "Details"
-msgstr "SzczegÃ³Å‚y"
-
-#: admin/systems/printer.tpl.c:20
-msgid "Printer location"
-msgstr "Lokalizacja drukarki"
-
-#: admin/systems/printer.tpl.c:26
-msgid "PPD Provider"
-msgstr ""
-
-#: admin/systems/printer.tpl.c:29
-msgid "Driver"
-msgstr "Sterownik"
-
-#: admin/systems/printer.tpl.c:32
-msgid "Edit"
-msgstr "Edytuj"
-
-#: admin/systems/printer.tpl.c:41
-msgid "Users which are allowed to use this printer"
-msgstr "UÅ¼ytkownicy ktÃ³rzy mogÄ… uÅ¼ywaÄ‡ tej drukarki"
-
-#: admin/systems/printer.tpl.c:44
-msgid "Users"
-msgstr "UÅ¼ytkownicy"
-
-#: admin/systems/printer.tpl.c:47
-msgid "Users which are allowed to administrate this printer"
-msgstr "UÅ¼ytkownicy, ktÃ³rzy mogÄ… administrowaÄ‡ tÄ… drukarkÄ…"
-
-#: admin/systems/printer.tpl.c:50
-msgid "Admins"
-msgstr "Administratorzy"
-
-#: admin/systems/printer.tpl.c:53
-msgid "Windows paths"
-msgstr ""
-
-#: admin/systems/printer.tpl.c:56
-msgid "Printer windows inf file"
-msgstr ""
-
-#: admin/systems/printer.tpl.c:59
-msgid "Printer driver directory"
-msgstr ""
-
-#: admin/systems/gencd_frame.tpl.c:2
-msgid "Your browser does not supprt iframes."
-msgstr ""
-
-#: admin/systems/services/cups/serviceCUPS.tpl.c:2
-msgid "Print Service"
-msgstr "UsÅ‚uga drukowania"
-
-#: admin/systems/services/cups/serviceCUPS.tpl.c:5
-msgid "enabled"
-msgstr "wÅ‚Ä…czone"
-
-#: admin/systems/services/ServiceAddDialog.tpl.c:2
-msgid "Adding a new service to the current server"
-msgstr "Dodawania nowej usÅ‚ugi do tego serwera."
-
-#: admin/systems/services/ServiceAddDialog.tpl.c:5
-msgid ""
-"This dialog allows you to add new services to the currenty edited server "
-"object. The box below shows all available but not already used services."
-msgstr "Ten dialog umoÅ¼liwia dodawanie nowych usÅ‚ugo do obecnie edytowaniego serwera. Obszar poniÅ¼ej pokazuje wszystkie dostÄ™pne lecz jescze nieuÅ¼yte usÅ‚ugi."
-
-#: admin/systems/services/ServiceAddDialog.tpl.c:8
-msgid "Service to add"
-msgstr "UsÅ‚uga dla dodania"
-
-#: admin/systems/services/ServiceAddDialog.tpl.c:11
-msgid "All available services are already in use."
-msgstr "Wszystkie dostÄ™pne usÅ‚ugi sÄ… juÅ¼ w uÅ¼yciu."
-
-#: admin/systems/services/ServiceAddDialog.tpl.c:14
-#: admin/systems/SelectDeviceType.tpl.c:26
-msgid "Continue"
-msgstr "Kontynuuj"
-
-#: admin/systems/SelectDeviceType.tpl.c:2
-msgid ""
-"This system has no system type configured. Please choose a system type for "
-"this object and an optional inheritance group. Press the 'continue' button "
-"to proceed."
-msgstr ""
-
-#: admin/systems/SelectDeviceType.tpl.c:5
-msgid ""
-"Please select a system type and an optional bundle of predefined settings to"
-" be inherited."
-msgstr "ProszÄ™ wybraÄ‡ typ systemu i opcjonalny zestaw predefiniowanych ustawieÅ„ do dziedziczenia."
-
-#: admin/systems/SelectDeviceType.tpl.c:8
-msgid ""
-"Please select a system type and a bundle of predefined settings to be "
-"inherited."
-msgstr ""
-
-#: admin/systems/SelectDeviceType.tpl.c:11
-#: admin/systems/SelectDeviceType.tpl.c:14
-msgid "System type"
-msgstr "Typ systemu"
-
-#: admin/systems/SelectDeviceType.tpl.c:17
-msgid "Choose an object group as template"
-msgstr "Wybierz grupÄ™ obiektowÄ… jako szablon"
-
-#: admin/systems/SelectDeviceType.tpl.c:20
-msgid "Object group"
-msgstr "Grupa obiektu"
-
-#: admin/systems/SelectDeviceType.tpl.c:23
-msgid "none"
-msgstr "Å¼aden"
-
-#: 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] ""
-
-#: 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] ""
diff --git a/systems/locale/pt/fusiondirectory.po b/systems/locale/pt/fusiondirectory.po
index a9688610c50c70b52654da466f2447bb95108c83..02e5e6778dd3518e2f245b771abb30c6a04a965d 100644
--- a/systems/locale/pt/fusiondirectory.po
+++ b/systems/locale/pt/fusiondirectory.po
@@ -5,12 +5,12 @@
 # Translators:
 msgid ""
 msgstr ""
-"Project-Id-Version: FusionDirectory-108\n"
+"Project-Id-Version: FusionDirectory-109\n"
 "Report-Msgid-Bugs-To: documentation@lists.fusiondirectory.org\n"
-"POT-Creation-Date: 2015-03-31 11:49+0200\n"
+"POT-Creation-Date: 2014-12-15 17:47+0100\n"
 "PO-Revision-Date: 2015-03-31 11:41+0000\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>\n"
-"Language-Team: Portuguese (http://www.transifex.com/projects/p/FusionDirectory-108/language/pt/)\n"
+"Language-Team: Portuguese (http://www.transifex.com/projects/p/FusionDirectory-109/language/pt/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -26,29 +26,24 @@ msgid "Locked"
 msgstr ""
 
 #: admin/ogroups/goto/class_termgroup.inc:118
-#: admin/systems/class_terminalGeneric.inc:121
+#: admin/systems/class_terminalStartup.inc:145
 msgid "Local swap"
 msgstr ""
 
 #: admin/ogroups/goto/class_termgroup.inc:124
 #: admin/ogroups/goto/class_termgroup.inc:136
-#: admin/systems/class_workstationGeneric.inc:352
-#: admin/systems/class_terminalGeneric.inc:109
-#: admin/systems/class_terminalGeneric.inc:125
+#: admin/systems/class_terminalStartup.inc:133
+#: admin/systems/class_terminalStartup.inc:149
 msgid "inherited"
 msgstr ""
 
 #: admin/ogroups/goto/class_termgroup.inc:220
-#: admin/systems/class_workstationGeneric.inc:72
-#: admin/systems/class_workstationGeneric.inc:443
-#: admin/systems/class_systemManagement.inc:295
-#: admin/systems/class_systemManagement.inc:325
-msgid "Infrastructure service"
+#: admin/systems/class_systemManagement.inc:165
+#: admin/systems/class_systemManagement.inc:186
+msgid "Service infrastructure"
 msgstr ""
 
 #: admin/ogroups/goto/class_termgroup.inc:224
-#: admin/systems/class_workstationGeneric.inc:75
-#: admin/systems/class_workstationGeneric.inc:78
 msgid "Event error"
 msgstr ""
 
@@ -58,12 +53,10 @@ msgid "Event '%s' is not available!"
 msgstr ""
 
 #: admin/ogroups/goto/class_termgroup.inc:274
-#: admin/systems/class_workstationGeneric.inc:112
 msgid "Switch off"
 msgstr ""
 
 #: admin/ogroups/goto/class_termgroup.inc:274
-#: admin/systems/class_workstationGeneric.inc:113
 msgid "Reboot"
 msgstr ""
 
@@ -84,7 +77,6 @@ msgid "Reinstall"
 msgstr ""
 
 #: admin/ogroups/goto/class_termgroup.inc:279
-#: admin/systems/class_workstationGeneric.inc:108
 msgid "Memory test"
 msgstr ""
 
@@ -93,21 +85,18 @@ msgid "System analysis"
 msgstr ""
 
 #: admin/ogroups/goto/class_termgroup.inc:386
-#: admin/systems/class_printGeneric.inc:670
-#: admin/systems/class_printGeneric.inc:970
-#: admin/systems/class_systemManagement.inc:816
 #: admin/systems/services/class_goService.inc:123
 #: admin/systems/services/class_goService.inc:151
 #: admin/systems/services/class_goService.inc:187
-#: admin/systems/class_networkSettings.inc:478
-#: admin/systems/class_networkSettings.inc:491
-#: admin/systems/class_networkSettings.inc:757
-#: admin/systems/class_networkSettings.inc:816
-#: admin/systems/class_networkSettings.inc:835
-#: admin/systems/class_networkSettings.inc:852
-#: admin/systems/class_networkSettings.inc:861
-#: admin/systems/class_networkSettings.inc:879
-#: admin/systems/class_networkSettings.inc:951
+#: admin/systems/class_networkSettings.inc:470
+#: admin/systems/class_networkSettings.inc:483
+#: admin/systems/class_networkSettings.inc:749
+#: admin/systems/class_networkSettings.inc:808
+#: admin/systems/class_networkSettings.inc:827
+#: admin/systems/class_networkSettings.inc:844
+#: admin/systems/class_networkSettings.inc:853
+#: admin/systems/class_networkSettings.inc:871
+#: admin/systems/class_networkSettings.inc:943
 msgid "LDAP error"
 msgstr "Erro de LDAP"
 
@@ -119,195 +108,125 @@ msgstr ""
 msgid "System group"
 msgstr ""
 
-#: admin/ogroups/goto/class_termgroup.inc:401
-#: admin/ogroups/goto/termgroup.tpl.c:17
+#: admin/ogroups/goto/class_termgroup.inc:402
 msgid "Mode"
 msgstr ""
 
-#: admin/ogroups/goto/class_termgroup.inc:402
-#: admin/systems/class_workstationGeneric.inc:189
-#: admin/ogroups/goto/termgroup.tpl.c:23
+#: admin/ogroups/goto/class_termgroup.inc:403
+#: admin/systems/class_systemServers.inc:35
 msgid "Syslog server"
 msgstr ""
 
-#: admin/ogroups/goto/class_termgroup.inc:403
+#: admin/ogroups/goto/class_termgroup.inc:404
 msgid "Action flag"
 msgstr ""
 
-#: admin/ogroups/goto/class_termgroup.inc:404
+#: admin/ogroups/goto/class_termgroup.inc:405
 msgid "Ntp server"
 msgstr ""
 
-#: admin/ogroups/goto/class_termgroup.inc:405
-#: admin/systems/class_terminalGeneric.inc:41
-#: admin/ogroups/goto/termgroup.tpl.c:29
+#: admin/ogroups/goto/class_termgroup.inc:406
+#: admin/systems/class_terminalStartup.inc:65
 msgid "Root server"
 msgstr ""
 
-#: admin/ogroups/goto/class_termgroup.inc:406
-#: admin/systems/class_terminalGeneric.inc:47
-#: admin/ogroups/goto/termgroup.tpl.c:35
+#: admin/ogroups/goto/class_termgroup.inc:407
+#: admin/systems/class_terminalStartup.inc:69
 msgid "Swap server"
 msgstr ""
 
-#: admin/systems/class_terminalStartup.inc:63
+#: admin/systems/class_terminalStartup.inc:62
 msgid "Startup parameters"
 msgstr ""
 
-#: admin/systems/class_terminalStartup.inc:66
+#: admin/systems/class_terminalStartup.inc:65
+msgid "The root server the terminal should be using"
+msgstr ""
+
+#: admin/systems/class_terminalStartup.inc:69
+msgid "The swap server the terminal should be using"
+msgstr ""
+
+#: admin/systems/class_terminalStartup.inc:73
 msgid "Boot kernel"
 msgstr ""
 
-#: admin/systems/class_terminalStartup.inc:66
+#: admin/systems/class_terminalStartup.inc:73
 msgid "Linux kernel to be installed and booted"
 msgstr ""
 
-#: admin/systems/class_terminalStartup.inc:70
+#: admin/systems/class_terminalStartup.inc:77
 msgid "Boot kernel parameters"
 msgstr ""
 
-#: admin/systems/class_terminalStartup.inc:70
+#: admin/systems/class_terminalStartup.inc:77
 msgid "Linux kernel parameters to be ran"
 msgstr ""
 
-#: admin/systems/class_terminalStartup.inc:82
-msgid "Startup"
-msgstr "InÃcio"
-
 #: admin/systems/class_terminalStartup.inc:83
-msgid "Terminal startup"
-msgstr ""
-
-#: admin/systems/system-list.xml:10
-msgid "List of systems"
-msgstr ""
-
-#: admin/systems/system-list.xml:14
-msgid "New workstation"
-msgstr ""
-
-#: admin/systems/system-list.xml:22
-msgid "Locked server"
-msgstr ""
-
-#: admin/systems/system-list.xml:30
-msgid "Locked workstation"
-msgstr ""
-
-#: admin/systems/system-list.xml:38
-msgid "Locked terminal"
-msgstr ""
-
-#: admin/systems/system-list.xml:47
-msgid "New terminal"
-msgstr ""
-
-#: admin/systems/system-list.xml:55
-msgid "New device"
+msgid "Remote desktop"
 msgstr ""
 
-#: admin/systems/system-list.xml:63
-msgid "Workstation template"
+#: admin/systems/class_terminalStartup.inc:87
+msgid "Connect method"
 msgstr ""
 
-#: admin/systems/system-list.xml:71
-msgid "Terminal template"
+#: admin/systems/class_terminalStartup.inc:91
+msgid "XDMCP"
 msgstr ""
 
-#: admin/systems/system-list.xml:79
-msgid "Winstation"
+#: admin/systems/class_terminalStartup.inc:91
+msgid "LDM"
 msgstr ""
 
-#: admin/systems/system-list.xml:87 admin/systems/system-list.xml:234
-#: admin/systems/class_systemImport.inc:169
-#: admin/systems/class_serverGeneric.inc:46
-#: admin/systems/class_serverGeneric.inc:51
-#: admin/systems/class_serverGeneric.inc:52
-#: admin/systems/class_SelectDeviceType.inc:58
-msgid "Server"
-msgstr "Servidor"
-
-#: admin/systems/system-list.xml:95 admin/systems/system-list.xml:242
-#: admin/systems/class_workstationGeneric.inc:458
-#: admin/systems/class_workstationGeneric.inc:463
-#: admin/systems/class_workstationGeneric.inc:464
-#: admin/systems/class_SelectDeviceType.inc:58
-msgid "Workstation"
-msgstr "EstaÃ§Ã£o de trabalho"
+#: admin/systems/class_terminalStartup.inc:91
+msgid "Shell"
+msgstr "Shell"
 
-#: admin/systems/system-list.xml:103 admin/systems/system-list.xml:250
-#: admin/systems/class_terminalGeneric.inc:81
-#: admin/systems/class_terminalGeneric.inc:86
-#: admin/systems/class_terminalGeneric.inc:87
-#: admin/systems/class_SelectDeviceType.inc:58
-msgid "Terminal"
+#: admin/systems/class_terminalStartup.inc:91
+msgid "Telnet"
 msgstr ""
 
-#: admin/systems/system-list.xml:111 admin/systems/class_printGeneric.inc:1005
-#: admin/systems/class_printGeneric.inc:1011
-#: admin/systems/class_printGeneric.inc:1012
-msgid "Printer"
-msgstr "Impressora"
-
-#: admin/systems/system-list.xml:119 admin/systems/system-list.xml:274
-#: admin/systems/class_mobilePhoneGeneric.inc:74
-#: admin/systems/phoneSelect/phoneSelect-list.xml:14
-msgid "Phone"
-msgstr "Fone"
-
-#: admin/systems/system-list.xml:127
-#: admin/systems/class_mobilePhoneGeneric.inc:36
-#: admin/systems/class_mobilePhoneGeneric.inc:41
-#: admin/systems/class_mobilePhoneGeneric.inc:42
-#: admin/systems/phoneSelect/phoneSelect-list.xml:22
-msgid "Mobile phone"
+#: admin/systems/class_terminalStartup.inc:91
+msgid "Windows RDP"
 msgstr ""
 
-#: admin/systems/system-list.xml:135
-#: admin/systems/class_componentGeneric.inc:36
-msgid "Component"
+#: admin/systems/class_terminalStartup.inc:95
+msgid "Terminal server"
 msgstr ""
 
-#: admin/systems/system-list.xml:143 admin/systems/system-list.xml:298
-msgid "IPMI"
+#: admin/systems/system-list.xml:10
+msgid "List of systems"
 msgstr ""
 
-#: admin/systems/system-list.xml:169
-#: admin/systems/class_workstationGeneric.inc:154
-#: admin/systems/class_printGeneric.inc:752
-#: admin/systems/class_printGeneric.inc:762
-#: admin/systems/class_printGeneric.inc:781
-#: admin/systems/class_printGeneric.inc:1022
-#: admin/systems/class_componentGeneric.inc:64
-#: admin/systems/class_mobilePhoneGeneric.inc:63
-#: admin/systems/phoneSelect/phoneSelect-list.xml:48
+#: admin/systems/system-list.xml:31
+#: admin/systems/class_workstationGeneric.inc:46
+#: admin/systems/class_printGeneric.inc:60
+#: admin/systems/class_componentGeneric.inc:58
+#: admin/systems/class_mobilePhoneGeneric.inc:60
 #: admin/systems/services/shares/class_serviceShare.inc:52
-#: admin/systems/system-filter.tpl.c:32
-#: admin/systems/phoneSelect/phoneSelect-filter.tpl.c:11
 msgid "Name"
 msgstr "Nome"
 
-#: admin/systems/system-list.xml:177
-#: admin/systems/phoneSelect/phoneSelect-list.xml:63
+#: admin/systems/system-list.xml:39
 msgid "IP"
 msgstr ""
 
-#: admin/systems/system-list.xml:185
+#: admin/systems/system-list.xml:47
 msgid "MAC"
 msgstr ""
 
-#: admin/systems/system-list.xml:193
-#: admin/systems/class_workstationGeneric.inc:160
-#: admin/systems/class_printGeneric.inc:1024
-#: admin/systems/class_componentGeneric.inc:68
-#: admin/systems/class_mobilePhoneGeneric.inc:67
+#: admin/systems/system-list.xml:55
+#: admin/systems/class_workstationGeneric.inc:51
+#: admin/systems/class_printGeneric.inc:64
+#: admin/systems/class_componentGeneric.inc:62
+#: admin/systems/class_mobilePhoneGeneric.inc:64
 #: admin/systems/serverService-list.xml:35
 #: admin/systems/services/shares/class_serviceShare.inc:56
-#: admin/systems/printer.tpl.c:8 admin/systems/printer.tpl.c:17
 msgid "Description"
 msgstr "DescriÃ§Ã£o"
 
-#: admin/systems/system-list.xml:201 admin/systems/class_serverService.inc:57
+#: admin/systems/system-list.xml:63 admin/systems/class_serverService.inc:57
 #: admin/systems/services/terminal/class_serviceTerminal.inc:30
 #: admin/systems/services/cups/class_serviceCUPS.inc:85
 #: admin/systems/services/shares/class_serviceShare.inc:31
@@ -316,378 +235,186 @@ msgstr "DescriÃ§Ã£o"
 msgid "Services"
 msgstr ""
 
-#: admin/systems/system-list.xml:209
+#: admin/systems/system-list.xml:71
 msgid "Release"
 msgstr ""
 
-#: admin/systems/system-list.xml:217 admin/systems/serverService-list.xml:43
-#: admin/systems/phoneSelect/phoneSelect-list.xml:70
+#: admin/systems/system-list.xml:79 admin/systems/serverService-list.xml:43
 msgid "Actions"
 msgstr "AÃ§Ãµes"
 
-#: admin/systems/system-list.xml:228 admin/systems/serverService-list.xml:54
+#: admin/systems/system-list.xml:90 admin/systems/serverService-list.xml:54
 msgid "Create"
 msgstr "Criar"
 
-#: admin/systems/system-list.xml:258
-msgid "winStation"
-msgstr ""
-
-#: admin/systems/system-list.xml:266
-msgid "Network printer"
-msgstr ""
-
-#: admin/systems/system-list.xml:282
-#: admin/systems/class_componentGeneric.inc:41
-#: admin/systems/class_componentGeneric.inc:42
-msgid "Network device"
-msgstr ""
-
-#: admin/systems/system-list.xml:290
-msgid "Mobile Phone"
-msgstr ""
-
-#: admin/systems/system-list.xml:310
+#: admin/systems/system-list.xml:100
 msgid "Trigger action"
 msgstr ""
 
-#: admin/systems/system-list.xml:317
+#: admin/systems/system-list.xml:107
 msgid "Schedule action"
 msgstr ""
 
-#: admin/systems/system-list.xml:330
-msgid "Activate systems"
-msgstr ""
-
-#: admin/systems/system-list.xml:337 admin/systems/serverService-list.xml:69
-#: admin/systems/printer.tpl.c:35
+#: admin/systems/system-list.xml:119 admin/systems/serverService-list.xml:69
 msgid "Remove"
 msgstr "Remover"
 
-#: admin/systems/system-list.xml:367
-msgid "Create ISO"
-msgstr ""
-
-#: admin/systems/system-list.xml:379
+#: admin/systems/system-list.xml:150
 msgid "Edit system"
 msgstr ""
 
-#: admin/systems/system-list.xml:392
+#: admin/systems/system-list.xml:163
 msgid "Remove system"
 msgstr ""
 
-#: admin/systems/class_workstationGeneric.inc:75
-#, php-format
-msgid "Event %s is not available!"
-msgstr ""
-
-#: admin/systems/class_workstationGeneric.inc:78
-msgid "Events are not available!"
-msgstr ""
-
-#: admin/systems/class_workstationGeneric.inc:106
-msgid "(Re)Install"
-msgstr ""
-
-#: admin/systems/class_workstationGeneric.inc:107
-msgid "Software update"
-msgstr ""
-
-#: admin/systems/class_workstationGeneric.inc:115
-msgid "Wake up"
-msgstr ""
-
-#: admin/systems/class_workstationGeneric.inc:144
-#: admin/systems/class_printGeneric.inc:604
+#: admin/systems/class_workstationGeneric.inc:35
 msgid "workstation"
 msgstr ""
 
-#: admin/systems/class_workstationGeneric.inc:151
-#: admin/systems/class_componentGeneric.inc:61
-#: admin/systems/class_mobilePhoneGeneric.inc:60
+#: admin/systems/class_workstationGeneric.inc:42
+#: admin/systems/class_printGeneric.inc:56
+#: admin/systems/class_componentGeneric.inc:55
+#: admin/systems/class_mobilePhoneGeneric.inc:56
 msgid "Properties"
 msgstr "Propriedades"
 
-#: admin/systems/class_workstationGeneric.inc:155
+#: admin/systems/class_workstationGeneric.inc:47
 #, php-format
 msgid "The name of the %s"
 msgstr ""
 
-#: admin/systems/class_workstationGeneric.inc:161
+#: admin/systems/class_workstationGeneric.inc:52
 #, php-format
 msgid "A short description of the %s"
 msgstr ""
 
-#: admin/systems/class_workstationGeneric.inc:166
-#: admin/systems/class_printGeneric.inc:1025
+#: admin/systems/class_workstationGeneric.inc:56
 msgid "Location"
 msgstr "LocalizaÃ§Ã£o"
 
-#: admin/systems/class_workstationGeneric.inc:167
+#: admin/systems/class_workstationGeneric.inc:57
 #, php-format
 msgid "The location of the %s"
 msgstr ""
 
-#: admin/systems/class_workstationGeneric.inc:173
+#: admin/systems/class_workstationGeneric.inc:61
 #, php-format
 msgid "Lock this %s"
 msgstr ""
 
-#: admin/systems/class_workstationGeneric.inc:174
+#: admin/systems/class_workstationGeneric.inc:62
 #, php-format
 msgid "This will prevent the %s from being reinstalled"
 msgstr ""
 
-#: admin/systems/class_workstationGeneric.inc:185
-#: addons/dashboard/class_dashBoardSystems.inc:48
-msgid "Servers"
-msgstr "Servidor"
-
-#: admin/systems/class_workstationGeneric.inc:190
-#, php-format
-msgid "The syslog server the %s should be using"
-msgstr ""
-
-#: admin/systems/class_workstationGeneric.inc:195
-msgid "Inherit NTP servers"
-msgstr ""
-
-#: admin/systems/class_workstationGeneric.inc:196
-msgid "Inherit time server attributes from ogroup"
+#: admin/systems/class_workstationGeneric.inc:73
+#: admin/systems/class_printGeneric.inc:83
+#: admin/systems/class_componentGeneric.inc:69
+#: admin/systems/class_mobilePhoneGeneric.inc:102
+#: admin/systems/class_networkSettings.inc:1008
+msgid "Network settings"
 msgstr ""
 
-#: admin/systems/class_workstationGeneric.inc:202
-msgid "NTP servers"
+#: admin/systems/class_workstationGeneric.inc:78
+#: admin/systems/class_printGeneric.inc:87
+#: admin/systems/class_componentGeneric.inc:73
+#: admin/systems/class_mobilePhoneGeneric.inc:106
+#: admin/systems/class_networkSettings.inc:630
+#: admin/systems/class_networkSettings.inc:643
+#: admin/systems/class_networkSettings.inc:645
+#: admin/systems/class_networkSettings.inc:1014
+msgid "IP address"
 msgstr ""
 
-#: admin/systems/class_workstationGeneric.inc:203
-#, php-format
-msgid "The NTP servers for the %s"
+#: admin/systems/class_workstationGeneric.inc:78
+msgid "IP addresses this system uses (v4 or v6)"
 msgstr ""
 
-#: admin/systems/class_workstationGeneric.inc:209
-msgid "Inherit LDAP servers"
+#: admin/systems/class_workstationGeneric.inc:83
+#: admin/systems/class_printGeneric.inc:91
+#: admin/systems/class_componentGeneric.inc:77
+#: admin/systems/class_mobilePhoneGeneric.inc:110
+msgid "Mac address"
 msgstr ""
 
-#: admin/systems/class_workstationGeneric.inc:210
-msgid "Inherit LDAP server attributes from ogroup"
+#: admin/systems/class_workstationGeneric.inc:83
+#: admin/systems/class_printGeneric.inc:91
+#: admin/systems/class_componentGeneric.inc:77
+#: admin/systems/class_mobilePhoneGeneric.inc:110
+msgid "Mac address of this system"
 msgstr ""
 
-#: admin/systems/class_workstationGeneric.inc:216
-msgid "LDAP servers"
-msgstr ""
+#: admin/systems/class_workstationGeneric.inc:125
+#: admin/systems/class_workstationGeneric.inc:130
+#: admin/systems/class_workstationGeneric.inc:131
+msgid "Workstation"
+msgstr "EstaÃ§Ã£o de trabalho"
 
-#: admin/systems/class_workstationGeneric.inc:217
-#, php-format
-msgid "The LDAP servers for the %s"
+#: admin/systems/class_workstationGeneric.inc:126
+msgid "Workstation information"
 msgstr ""
 
-#: admin/systems/class_workstationGeneric.inc:225
-#: admin/systems/class_workstationGeneric.inc:229
-#: admin/ogroups/goto/termgroup.tpl.c:41
-msgid "Action"
-msgstr ""
+#: admin/systems/class_printGeneric.inc:32
+#: admin/systems/class_printGeneric.inc:37
+#: admin/systems/class_printGeneric.inc:38
+msgid "Printer"
+msgstr "Impressora"
 
-#: admin/systems/class_workstationGeneric.inc:230
-#: admin/ogroups/goto/termgroup.tpl.c:44
-msgid "Select action to execute for this terminal"
+#: admin/systems/class_printGeneric.inc:33
+msgid "Printer information"
 msgstr ""
 
-#: admin/systems/class_workstationGeneric.inc:236
-#: admin/systems/class_componentGeneric.inc:75
-#: admin/systems/class_mobilePhoneGeneric.inc:106
-#: admin/systems/class_networkSettings.inc:1016
-msgid "Network settings"
+#: admin/systems/class_printGeneric.inc:60
+msgid "The name of the printer"
 msgstr ""
 
-#: admin/systems/class_workstationGeneric.inc:459
-msgid "Workstation information"
+#: admin/systems/class_printGeneric.inc:64
+msgid "A short description of the printer"
 msgstr ""
 
-#: admin/systems/class_printGeneric.inc:131
-#: admin/systems/class_printGeneric.inc:1065
-#: admin/systems/class_systemManagement.inc:678
-msgid "Internal error"
-msgstr "Erro interno"
-
-#: admin/systems/class_printGeneric.inc:131
-#, php-format
-msgid ""
-"Cannot determine a valid department for this object. Setting base to '%s'!"
-msgstr ""
-
-#: admin/systems/class_printGeneric.inc:311
-#: admin/systems/class_printGeneric.inc:319
-#: admin/systems/class_printGeneric.inc:324
-#: admin/systems/class_printGeneric.inc:374
-#: admin/systems/class_printGeneric.inc:390
-#: admin/systems/class_printGeneric.inc:393
-msgid "Add printer extension"
+#: admin/systems/class_printGeneric.inc:70
+msgid "Details"
 msgstr ""
 
-#: admin/systems/class_printGeneric.inc:312
-msgid ""
-"Could not initialize printer tab, parameter parent was missing while "
-"construction."
+#: admin/systems/class_printGeneric.inc:73
+msgid "Printer location"
 msgstr ""
 
-#: admin/systems/class_printGeneric.inc:320
-msgid "This is a workstation template, printer tab is disabled."
+#: admin/systems/class_printGeneric.inc:73
+msgid "The location of the printer"
 msgstr ""
 
-#: admin/systems/class_printGeneric.inc:325
-msgid "This is a terminal template, printer tab is disabled."
+#: admin/systems/class_printGeneric.inc:77
+msgid "Printer URL"
 msgstr ""
 
-#: admin/systems/class_printGeneric.inc:367
-#: admin/systems/class_printGeneric.inc:375
-#: admin/systems/class_printGeneric.inc:383
-#: admin/systems/class_printGeneric.inc:386
-#: admin/systems/class_printGeneric.inc:391
-#: admin/systems/class_printGeneric.inc:394
-msgid "printer"
+#: admin/systems/class_printGeneric.inc:77
+msgid "The URL of the printer"
 msgstr ""
 
-#: admin/systems/class_printGeneric.inc:375
-msgid ""
-"You can't enable it while 'cn' is not present in entry. Possibly you are "
-"currently creating a new terminal template."
+#: admin/systems/class_printGeneric.inc:87
+#: admin/systems/class_componentGeneric.inc:73
+#: admin/systems/class_mobilePhoneGeneric.inc:106
+msgid "IP address this system uses"
 msgstr ""
 
-#: admin/systems/class_printGeneric.inc:382
-#: admin/systems/class_printGeneric.inc:385
-msgid "Remove printer extension"
+#: admin/systems/class_serverService.inc:58
+msgid "Server services"
 msgstr ""
 
-#: admin/systems/class_printGeneric.inc:474
-#: admin/systems/class_printGeneric.inc:652
-#: admin/systems/class_printGeneric.inc:659
-#: admin/systems/class_printGeneric.inc:718
-#: admin/systems/class_printGeneric.inc:1105
-#: admin/systems/class_printGeneric.inc:1116
 #: admin/systems/class_serverService.inc:224
 #: admin/systems/class_serverService.inc:270
 #: admin/systems/class_serverService.inc:393
-#: admin/systems/class_systemManagement.inc:341
-#: admin/systems/class_systemManagement.inc:624
-#: admin/systems/class_systemManagement.inc:639
 #: admin/systems/services/shares/class_serviceShare.inc:103
-#: admin/systems/class_networkSettings.inc:305
-#: admin/systems/class_networkSettings.inc:336
-#: admin/systems/class_networkSettings.inc:584
-#: admin/systems/class_networkSettings.inc:591
-#: admin/systems/class_networkSettings.inc:597
-#: admin/systems/class_networkSettings.inc:604
+#: admin/systems/class_networkSettings.inc:297
+#: admin/systems/class_networkSettings.inc:328
+#: admin/systems/class_networkSettings.inc:576
+#: admin/systems/class_networkSettings.inc:583
+#: admin/systems/class_networkSettings.inc:589
+#: admin/systems/class_networkSettings.inc:596
 msgid "Error"
 msgstr "Erro"
 
-#: admin/systems/class_printGeneric.inc:577
-#, php-format
-msgid "Your currently selected PPD file '%s' doesn't exist."
-msgstr ""
-
-#: admin/systems/class_printGeneric.inc:583
-msgid "Not defined"
-msgstr ""
-
-#: admin/systems/class_printGeneric.inc:587
-#: admin/systems/ppd/class_printerPPDDialog.inc:116
-msgid "Can't get ppd informations."
-msgstr ""
-
-#: admin/systems/class_printGeneric.inc:602
-#: admin/systems/class_printGeneric.inc:604
-#, php-format
-msgid "This printer belongs to %s. You can't rename this printer."
-msgstr ""
-
-#: admin/systems/class_printGeneric.inc:602
-#: admin/systems/class_terminalGeneric.inc:34
-msgid "terminal"
-msgstr ""
-
-#: admin/systems/class_printGeneric.inc:652
-#: admin/systems/class_printGeneric.inc:659
-msgid "Object is no printer!"
-msgstr ""
-
-#: admin/systems/class_printGeneric.inc:767 admin/systems/printer.tpl.c:23
-msgid "Printer URL"
-msgstr ""
-
-#: admin/systems/class_printGeneric.inc:989
-#: admin/systems/class_printGeneric.inc:991
-msgid "Group"
-msgstr ""
-
-#: admin/systems/class_printGeneric.inc:994
-msgid "User"
-msgstr "UsuÃ¡rio"
-
-#: admin/systems/class_printGeneric.inc:1006
-msgid "Printer information"
-msgstr ""
-
-#: admin/systems/class_printGeneric.inc:1023
-#: admin/systems/serverService-list.tpl.c:2
-#: admin/systems/phoneSelect/phoneSelect-list.tpl.c:2
-#: admin/systems/printer.tpl.c:11
-msgid "Base"
-msgstr "Base"
-
-#: admin/systems/class_printGeneric.inc:1026
-msgid "LabeledURL"
-msgstr ""
-
-#: admin/systems/class_printGeneric.inc:1027
-msgid "Printer PPD"
-msgstr ""
-
-#: admin/systems/class_printGeneric.inc:1028 admin/systems/printer.tpl.c:38
-msgid "Permissions"
-msgstr ""
-
-#: admin/systems/class_printGeneric.inc:1030
-msgid "Windows inf file"
-msgstr ""
-
-#: admin/systems/class_printGeneric.inc:1031
-msgid "Windows driver dir"
-msgstr ""
-
-#: admin/systems/class_printGeneric.inc:1032 admin/systems/printer.tpl.c:62
-msgid "Driver printer name"
-msgstr ""
-
-#: admin/systems/class_printGeneric.inc:1048
-#: admin/systems/class_printGeneric.inc:1070
-msgid "Permission error"
-msgstr ""
-
-#: admin/systems/class_printGeneric.inc:1048
-#: admin/systems/class_printGeneric.inc:1070
-msgid "printer user"
-msgstr ""
-
-#: admin/systems/class_printGeneric.inc:1065
-#, php-format
-msgid "Illegal member type '%s'!"
-msgstr ""
-
-#: admin/systems/class_printGeneric.inc:1105
-#, php-format
-msgid "'%s' is already used!"
-msgstr ""
-
-#: admin/systems/class_printGeneric.inc:1116
-#, php-format
-msgid "'%s' does not exist!"
-msgstr ""
-
-#: admin/systems/class_serverService.inc:58
-msgid "Server services"
-msgstr ""
-
 #: admin/systems/class_serverService.inc:332
 msgid "Filter error"
 msgstr ""
@@ -711,217 +438,20 @@ msgstr ""
 msgid "Could not get execute action %s on service %s."
 msgstr ""
 
-#: admin/systems/class_terminalGeneric.inc:42
-#, php-format
-msgid "The root server the terminal should be using"
+#: admin/systems/class_terminalGeneric.inc:31
+msgid "terminal"
 msgstr ""
 
+#: admin/systems/class_terminalGeneric.inc:43
 #: admin/systems/class_terminalGeneric.inc:48
-#, php-format
-msgid "The swap server the terminal should be using"
-msgstr ""
-
-#: admin/systems/class_terminalGeneric.inc:54
-msgid "Remote desktop"
-msgstr ""
-
-#: admin/systems/class_terminalGeneric.inc:58
-msgid "Connect method"
-msgstr ""
-
-#: admin/systems/class_terminalGeneric.inc:62
-msgid "XDMCP"
-msgstr ""
-
-#: admin/systems/class_terminalGeneric.inc:62
-msgid "LDM"
-msgstr ""
-
-#: admin/systems/class_terminalGeneric.inc:62
-msgid "Shell"
-msgstr "Shell"
-
-#: admin/systems/class_terminalGeneric.inc:62
-msgid "Telnet"
-msgstr ""
-
-#: admin/systems/class_terminalGeneric.inc:62
-msgid "Windows RDP"
-msgstr ""
-
-#: admin/systems/class_terminalGeneric.inc:66
-msgid "Terminal server"
+#: admin/systems/class_terminalGeneric.inc:49
+msgid "Terminal"
 msgstr ""
 
-#: admin/systems/class_terminalGeneric.inc:82
+#: admin/systems/class_terminalGeneric.inc:44
 msgid "Terminal information"
 msgstr ""
 
-#: admin/systems/ppd/class_printerPPDSelectionDialog.inc:91
-#: admin/systems/ppd/class_printerPPDSelectionDialog.inc:116
-#: admin/systems/ppd/class_printerPPDSelectionDialog.inc:139
-#: admin/systems/ppd/class_printerPPDDialog.inc:92
-#: admin/systems/ppd/class_printerPPDDialog.inc:160
-#: admin/systems/ppd/class_printerPPDDialog.inc:241
-#: admin/systems/ppd/class_printerPPDDialog.inc:256
-#: admin/systems/ppd/class_printerPPDDialog.inc:269
-#: admin/systems/ppd/class_printerPPDDialog.inc:297
-#: admin/systems/ppd/class_printerPPDDialog.inc:314
-#: admin/systems/ppd/class_printerPPDDialog.inc:337
-#: admin/systems/ppd/class_printerPPDDialog.inc:351
-#: admin/systems/ppd/class_printerPPDDialog.inc:361
-#: admin/systems/ppd/class_printerPPDDialog.inc:365
-#: admin/systems/ppd/class_printerPPDDialog.inc:560
-#: admin/systems/ppd/class_printerPPDDialog.inc:577
-#: admin/systems/ppd/class_printerPPDDialog.inc:580
-#: admin/systems/ppd/class_printerPPDDialog.inc:583
-msgid "PPD error"
-msgstr ""
-
-#: admin/systems/ppd/class_printerPPDSelectionDialog.inc:139
-#, php-format
-msgid "Cannot locate vendor '%s' in available PPDs!"
-msgstr ""
-
-#: admin/systems/ppd/class_printerPPDSelectionDialog.inc:148
-msgid "Printer ppd selection."
-msgstr ""
-
-#: admin/systems/ppd/class_printerPPDSelectionDialog.inc:155
-msgid "delete"
-msgstr ""
-
-#: admin/systems/ppd/class_printerPPDSelectionDialog.inc:166
-msgid "back"
-msgstr ""
-
-#: admin/systems/ppd/class_printerPPDDialog.inc:74
-#: admin/systems/ppd/class_printerPPDDialog.inc:140
-#: admin/systems/services/class_goService.inc:241
-msgid "Configuration error"
-msgstr "Erro de configuraÃ§Ã£o"
-
-#: admin/systems/ppd/class_printerPPDDialog.inc:92
-#, php-format
-msgid "Cannot open PPD '%s'!"
-msgstr ""
-
-#: admin/systems/ppd/class_printerPPDDialog.inc:141
-#, php-format
-msgid "Cannot open PPD path '%s' for reading and writing!"
-msgstr ""
-
-#: admin/systems/ppd/class_printerPPDDialog.inc:160
-#: admin/systems/ppd/class_printerPPDDialog.inc:365
-msgid "file is empty"
-msgstr ""
-
-#: admin/systems/ppd/class_printerPPDDialog.inc:314
-#, php-format
-msgid "Cannot parse PPD '%s'!"
-msgstr ""
-
-#: admin/systems/ppd/class_printerPPDDialog.inc:340
-msgid "Overwrite existing PPD"
-msgstr ""
-
-#: admin/systems/ppd/class_printerPPDDialog.inc:341
-msgid ""
-"There is already a ppd file for this kind of printer. Do you want to "
-"overwrite it?"
-msgstr ""
-
-#: admin/systems/ppd/class_printerPPDDialog.inc:491
-msgid "Section"
-msgstr ""
-
-#: admin/systems/ppd/class_printerPPDDialog.inc:551
-#: admin/systems/ppd/class_printerPPDDialog.inc:554
-msgid "True"
-msgstr ""
-
-#: admin/systems/ppd/class_printerPPDDialog.inc:552
-#: admin/systems/ppd/class_printerPPDDialog.inc:555
-msgid "False"
-msgstr ""
-
-#: admin/systems/ppd/class_printerPPDDialog.inc:560
-#, php-format
-msgid "PPD type '%s' is not supported!"
-msgstr ""
-
-#: admin/systems/ppd/class_printerPPDDialog.inc:597
-msgid ""
-"Please select a valid ppd file or use 'Cancel' to go back to printer "
-"configuration."
-msgstr ""
-
-#: admin/systems/ppd/class_ppdManager.inc:44
-#: admin/systems/ppd/class_ppdManager.inc:188
-#: admin/systems/ppd/class_ppdManager.inc:190
-msgid "PPD manager error"
-msgstr ""
-
-#: admin/systems/ppd/class_ppdManager.inc:44
-#, php-format
-msgid "The specified path '%s' does not exist."
-msgstr ""
-
-#: admin/systems/ppd/class_ppdManager.inc:188
-#, php-format
-msgid "Specified PPD file '%s' cannot be opened for reading."
-msgstr ""
-
-#: admin/systems/ppd/class_ppdManager.inc:190
-#, php-format
-msgid "The temporary file '%s' cannot be opened for writing."
-msgstr ""
-
-#: admin/systems/ppd/class_ppdManager.inc:212
-#: admin/systems/ppd/class_ppdManager.inc:350
-msgid "Parsing PPD file failed - file is empty!"
-msgstr ""
-
-#: admin/systems/ppd/class_ppdManager.inc:222
-#, php-format
-msgid ""
-"Parsing PPD file %s failed - line too long. Trailing characters have been "
-"ignored!"
-msgstr ""
-
-#: admin/systems/ppd/class_ppdManager.inc:230
-msgid "Nested groups are not supported!"
-msgstr ""
-
-#: admin/systems/ppd/class_ppdManager.inc:234
-msgid "Group name not unique!"
-msgstr ""
-
-#: admin/systems/ppd/class_ppdManager.inc:240
-#: admin/systems/ppd/class_ppdManager.inc:270
-msgid "Symbol values are not supported yet!"
-msgstr ""
-
-#: admin/systems/ppd/class_ppdManager.inc:264
-msgid "Nested options are not supported!"
-msgstr ""
-
-#: admin/systems/ppd/class_ppdManager.inc:289
-msgid "PickMany is not supported yet!"
-msgstr ""
-
-#: admin/systems/ppd/class_ppdManager.inc:370
-#, php-format
-msgid ""
-"Parsing PPD file %s failed - line too long. Trailing characters have been "
-"ignored"
-msgstr ""
-
-#: admin/systems/ppd/class_ppdManager.inc:395
-#, php-format
-msgid "Parsing PPD file %s failed - no information found."
-msgstr ""
-
 #: admin/systems/class_systemImport.inc:72
 #, php-format
 msgid "Could not parse %s"
@@ -941,83 +471,130 @@ msgstr ""
 msgid "Import"
 msgstr ""
 
+#: admin/systems/class_systemImport.inc:169
+#: admin/systems/class_serverGeneric.inc:43
+#: admin/systems/class_serverGeneric.inc:48
+#: admin/systems/class_serverGeneric.inc:49
+msgid "Server"
+msgstr "Servidor"
+
 #: admin/systems/class_systemImport.inc:169
 msgid "The server you wish to import hosts from"
 msgstr ""
 
-#: admin/systems/class_serverGeneric.inc:34
+#: admin/systems/class_serverGeneric.inc:31
 msgid "server"
 msgstr "Servidor"
 
-#: admin/systems/class_serverGeneric.inc:47
+#: admin/systems/class_serverGeneric.inc:44
 msgid "Server information"
 msgstr ""
 
-#: admin/systems/class_componentGeneric.inc:37
+#: admin/systems/class_componentGeneric.inc:31
+msgid "Component"
+msgstr ""
+
+#: admin/systems/class_componentGeneric.inc:32
 msgid "Component information"
 msgstr ""
 
-#: admin/systems/class_componentGeneric.inc:64
+#: admin/systems/class_componentGeneric.inc:36
+#: admin/systems/class_componentGeneric.inc:37
+msgid "Network device"
+msgstr ""
+
+#: admin/systems/class_componentGeneric.inc:58
 msgid "The name of the component"
 msgstr ""
 
-#: admin/systems/class_componentGeneric.inc:68
+#: admin/systems/class_componentGeneric.inc:62
 msgid "A short description of the component"
 msgstr ""
 
+#: admin/systems/class_systemServers.inc:31
+#: admin/systems/class_systemServers.inc:53
+msgid "Servers"
+msgstr "Servidor"
+
+#: admin/systems/class_systemServers.inc:35
+msgid "The syslog server the system should be using"
+msgstr ""
+
+#: admin/systems/class_systemServers.inc:40
+msgid "NTP servers"
+msgstr ""
+
+#: admin/systems/class_systemServers.inc:40
+msgid "The NTP servers for this system"
+msgstr ""
+
+#: admin/systems/class_systemServers.inc:54
+msgid "Servers this system is using"
+msgstr ""
+
+#: admin/systems/class_mobilePhoneGeneric.inc:32
 #: admin/systems/class_mobilePhoneGeneric.inc:37
+#: admin/systems/class_mobilePhoneGeneric.inc:38
+msgid "Mobile phone"
+msgstr ""
+
+#: admin/systems/class_mobilePhoneGeneric.inc:33
 msgid "Mobile phone information"
 msgstr ""
 
-#: admin/systems/class_mobilePhoneGeneric.inc:63
+#: admin/systems/class_mobilePhoneGeneric.inc:60
 msgid "The name of the mobile phone"
 msgstr ""
 
-#: admin/systems/class_mobilePhoneGeneric.inc:67
+#: admin/systems/class_mobilePhoneGeneric.inc:64
 msgid "A short description of the mobile phone"
 msgstr ""
 
-#: admin/systems/class_mobilePhoneGeneric.inc:77
+#: admin/systems/class_mobilePhoneGeneric.inc:70
+msgid "Phone"
+msgstr "Fone"
+
+#: admin/systems/class_mobilePhoneGeneric.inc:73
 msgid "Serial Number"
 msgstr ""
 
-#: admin/systems/class_mobilePhoneGeneric.inc:77
+#: admin/systems/class_mobilePhoneGeneric.inc:73
 msgid "The serial number of the mobile phone"
 msgstr ""
 
-#: admin/systems/class_mobilePhoneGeneric.inc:81
+#: admin/systems/class_mobilePhoneGeneric.inc:77
 msgid "IMEI Number"
 msgstr ""
 
-#: admin/systems/class_mobilePhoneGeneric.inc:81
+#: admin/systems/class_mobilePhoneGeneric.inc:77
 msgid "The IMEI number of the mobile phone"
 msgstr ""
 
-#: admin/systems/class_mobilePhoneGeneric.inc:86
+#: admin/systems/class_mobilePhoneGeneric.inc:82
 msgid "OS"
 msgstr ""
 
-#: admin/systems/class_mobilePhoneGeneric.inc:86
+#: admin/systems/class_mobilePhoneGeneric.inc:82
 msgid "The Operating System installed on this phone"
 msgstr ""
 
-#: admin/systems/class_mobilePhoneGeneric.inc:92
+#: admin/systems/class_mobilePhoneGeneric.inc:88
 msgid "SimCard"
 msgstr ""
 
-#: admin/systems/class_mobilePhoneGeneric.inc:95
+#: admin/systems/class_mobilePhoneGeneric.inc:91
 msgid "Telephone Number"
 msgstr ""
 
-#: admin/systems/class_mobilePhoneGeneric.inc:95
+#: admin/systems/class_mobilePhoneGeneric.inc:91
 msgid "The telephone number of the mobile phone"
 msgstr ""
 
-#: admin/systems/class_mobilePhoneGeneric.inc:99
+#: admin/systems/class_mobilePhoneGeneric.inc:95
 msgid "PUK Number"
 msgstr ""
 
-#: admin/systems/class_mobilePhoneGeneric.inc:99
+#: admin/systems/class_mobilePhoneGeneric.inc:95
 msgid "The PUK number of the simcard in this mobile phone"
 msgstr ""
 
@@ -1060,70 +637,20 @@ msgstr ""
 msgid "Remove service"
 msgstr ""
 
-#: admin/systems/phoneSelect/phoneSelect-list.xml:10
-msgid "Please select the desired entries"
-msgstr ""
-
-#: admin/systems/phoneSelect/phoneSelect-list.xml:56
-msgid "Number"
-msgstr ""
-
-#: admin/systems/phoneSelect/phoneSelect-list.xml:83
-msgid "Select this number"
-msgstr ""
-
-#: admin/systems/class_systemManagement.inc:177
-msgid "Back"
-msgstr "Voltar"
-
-#: admin/systems/class_systemManagement.inc:223
-msgid "Creating the image failed. Please see the report below."
-msgstr ""
-
-#: admin/systems/class_systemManagement.inc:228
-#, php-format
-msgid "Command '%s', specified for ISO creation doesn't seem to exist."
-msgstr ""
-
-#: admin/systems/class_systemManagement.inc:398
-#: admin/systems/class_systemManagement.inc:473
-#: admin/systems/class_systemManagement.inc:858
-#: admin/systems/class_systemManagement.inc:905
-#: admin/systems/class_systemManagement.inc:926
-msgid "Permission"
-msgstr ""
-
-#: admin/systems/class_systemManagement.inc:678
-msgid "Cannot set mode to 'active'!"
-msgstr ""
-
-#: admin/systems/class_systemManagement.inc:858
-#, php-format
-msgid "You are not allowed to create a snapshot for %s."
-msgstr ""
-
-#: admin/systems/class_systemManagement.inc:905
-#: admin/systems/class_systemManagement.inc:926
-#, php-format
-msgid "You are not allowed to restore a snapshot for %s."
-msgstr ""
-
-#: admin/systems/class_systemManagement.inc:1169
-#, php-format
-msgid "Inherited from %s"
-msgstr ""
-
-#: admin/systems/class_systemManagement.inc:1224
-#: admin/systems/class_systemManagement.inc:1228
-#: addons/dashboard/class_dashBoardSystems.inc:199
+#: admin/systems/class_systemManagement.inc:48
 #: config/systems/class_systemsPluginConfig.inc:28
 msgid "Systems"
 msgstr "Sistemas"
 
-#: admin/systems/class_systemManagement.inc:1225
+#: admin/systems/class_systemManagement.inc:49
 msgid "Systems Management"
 msgstr ""
 
+#: admin/systems/class_systemManagement.inc:250
+#, php-format
+msgid "Inherited from %s"
+msgstr ""
+
 #: admin/systems/services/terminal/class_serviceTerminal.inc:29
 #: admin/systems/services/terminal/class_serviceTerminal.inc:30
 #: admin/systems/services/terminal/class_serviceTerminal.inc:41
@@ -1161,6 +688,10 @@ msgstr ""
 msgid "Empty service"
 msgstr ""
 
+#: admin/systems/services/class_goService.inc:241
+msgid "Configuration error"
+msgstr "Erro de configuraÃ§Ã£o"
+
 #: admin/systems/services/shares/class_serviceShare.inc:30
 #: admin/systems/services/shares/class_serviceShare.inc:31
 msgid "Share service"
@@ -1219,8 +750,6 @@ msgid "You need to configure encodings first"
 msgstr ""
 
 #: admin/systems/services/shares/class_serviceShare.inc:110
-#: admin/ogroups/goto/termgroup.tpl.c:2 admin/systems/remove.tpl.c:2
-#: admin/systems/ppd/remove_ppd.tpl.c:2
 msgid "Warning"
 msgstr "AtenÃ§Ã£o"
 
@@ -1346,153 +875,93 @@ msgstr ""
 msgid "LDAP"
 msgstr ""
 
-#: admin/systems/class_networkSettings.inc:305
+#: admin/systems/class_networkSettings.inc:297
 msgid "NOT IMPLEMENTED"
 msgstr ""
 
-#: admin/systems/class_networkSettings.inc:437
+#: admin/systems/class_networkSettings.inc:429
 msgid "Not matching"
 msgstr ""
 
-#: admin/systems/class_networkSettings.inc:584
+#: admin/systems/class_networkSettings.inc:576
 #, php-format
 msgid "Was not able to contact argonaut server: %s"
 msgstr ""
 
-#: admin/systems/class_networkSettings.inc:591
+#: admin/systems/class_networkSettings.inc:583
 #, php-format
 msgid "Was not able to find DNS server for zone %s"
 msgstr ""
 
-#: admin/systems/class_networkSettings.inc:597
+#: admin/systems/class_networkSettings.inc:589
 #, php-format
 msgid "Was not able to find mac address of DNS server %s"
 msgstr ""
 
-#: admin/systems/class_networkSettings.inc:604
+#: admin/systems/class_networkSettings.inc:596
 #, php-format
 msgid "Was not able to launch ldap2zone: %s"
 msgstr ""
 
-#: admin/systems/class_networkSettings.inc:630
+#: admin/systems/class_networkSettings.inc:622
 #, php-format
 msgid "IP address %s"
 msgstr ""
 
-#: admin/systems/class_networkSettings.inc:638
-#: admin/systems/class_networkSettings.inc:651
-#: admin/systems/class_networkSettings.inc:653
-#: admin/systems/class_networkSettings.inc:1022
-msgid "IP address"
-msgstr ""
-
-#: admin/systems/class_networkSettings.inc:644
-#: admin/systems/class_networkSettings.inc:660
-#: admin/systems/class_networkSettings.inc:662
-#: admin/systems/class_networkSettings.inc:1023
+#: admin/systems/class_networkSettings.inc:636
+#: admin/systems/class_networkSettings.inc:652
+#: admin/systems/class_networkSettings.inc:654
+#: admin/systems/class_networkSettings.inc:1015
 msgid "MAC address"
 msgstr ""
 
-#: admin/systems/class_networkSettings.inc:676
+#: admin/systems/class_networkSettings.inc:668
 #, php-format
 msgid "The IP address '%s' is not part of the selected reverse zone '%s'!"
 msgstr ""
 
-#: admin/systems/class_networkSettings.inc:686
+#: admin/systems/class_networkSettings.inc:678
 #, php-format
 msgid "Record type '%s' is duplicated!"
 msgstr ""
 
-#: admin/systems/class_networkSettings.inc:693
+#: admin/systems/class_networkSettings.inc:685
 #, php-format
 msgid "Uniq record type '%s' is duplicated!"
 msgstr ""
 
-#: admin/systems/class_networkSettings.inc:705
+#: admin/systems/class_networkSettings.inc:697
 #, php-format
 msgid ""
 "The IP address '%s' will be added as 'A Record', this will be done "
 "automatically, please remove the record."
 msgstr ""
 
-#: admin/systems/class_networkSettings.inc:712
+#: admin/systems/class_networkSettings.inc:704
 #, php-format
 msgid "Only lowercase records are allowed, please check your '%ss'."
 msgstr ""
 
-#: admin/systems/class_networkSettings.inc:978
+#: admin/systems/class_networkSettings.inc:970
 msgid "Delete"
 msgstr "Deletar"
 
-#: admin/systems/class_networkSettings.inc:984
+#: admin/systems/class_networkSettings.inc:976
 msgid "Add"
 msgstr "Adicionar"
 
-#: admin/systems/class_networkSettings.inc:1015
-#: addons/dashboard/class_dashBoardNetwork.inc:127
+#: admin/systems/class_networkSettings.inc:1007
 msgid "Network"
 msgstr ""
 
-#: admin/systems/class_networkSettings.inc:1030
+#: admin/systems/class_networkSettings.inc:1022
 msgid "DNS configuration"
 msgstr ""
 
-#: admin/systems/class_networkSettings.inc:1033
+#: admin/systems/class_networkSettings.inc:1025
 msgid "DHCP configuration"
 msgstr ""
 
-#: addons/dashboard/class_dashBoardSystems.inc:45
-msgid "Workstations"
-msgstr ""
-
-#: addons/dashboard/class_dashBoardSystems.inc:51
-msgid "Windows Workstations"
-msgstr ""
-
-#: addons/dashboard/class_dashBoardSystems.inc:54
-msgid "Terminals"
-msgstr ""
-
-#: addons/dashboard/class_dashBoardSystems.inc:57
-msgid "Printers"
-msgstr ""
-
-#: addons/dashboard/class_dashBoardSystems.inc:60
-msgid "Phones"
-msgstr ""
-
-#: addons/dashboard/class_dashBoardSystems.inc:63
-msgid "Components"
-msgstr ""
-
-#: addons/dashboard/class_dashBoardSystems.inc:66
-msgid "Mobile phones"
-msgstr ""
-
-#: addons/dashboard/class_dashBoardSystems.inc:183
-msgid "Statistics"
-msgstr ""
-
-#: addons/dashboard/class_dashBoardSystems.inc:188
-msgid "Computer name to use by unit"
-msgstr ""
-
-#: addons/dashboard/class_dashBoardSystems.inc:200
-msgid "Statistics and informations about systems"
-msgstr ""
-
-#: addons/dashboard/class_dashBoardNetwork.inc:111
-msgid "DHCP"
-msgstr ""
-
-#: addons/dashboard/class_dashBoardNetwork.inc:116
-msgid "DNS"
-msgstr ""
-
-#: addons/dashboard/class_dashBoardNetwork.inc:128
-msgid "Statistics and various informations"
-msgstr ""
-
 #: config/systems/class_systemsPluginConfig.inc:29
 msgid "Systems plugin configuration"
 msgstr ""
@@ -1584,404 +1053,3 @@ msgstr ""
 #: config/systems/class_systemsPluginConfig.inc:101
 msgid "Encodings"
 msgstr ""
-
-#: admin/ogroups/goto/termgroup.tpl.c:5
-msgid ""
-"Actions you choose here influence all systems in this object group. "
-"Additionally, all values editable here can be inherited by the clients "
-"assigned to this object group."
-msgstr ""
-
-#: admin/ogroups/goto/termgroup.tpl.c:8
-msgid "Generic"
-msgstr "Geral"
-
-#: admin/ogroups/goto/termgroup.tpl.c:11
-msgid "NTP server"
-msgstr ""
-
-#: admin/ogroups/goto/termgroup.tpl.c:14
-msgid "Choose server to use for synchronizing time"
-msgstr ""
-
-#: admin/ogroups/goto/termgroup.tpl.c:20
-msgid "Select terminal mode"
-msgstr ""
-
-#: admin/ogroups/goto/termgroup.tpl.c:26
-msgid "Choose server to use for logging"
-msgstr ""
-
-#: admin/ogroups/goto/termgroup.tpl.c:32
-msgid "Select NFS root filesystem to use"
-msgstr ""
-
-#: admin/ogroups/goto/termgroup.tpl.c:38
-msgid "Choose NFS filesystem to place swap files on"
-msgstr ""
-
-#: admin/ogroups/goto/termgroup.tpl.c:47
-msgid "Execute"
-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 admin/systems/network.tpl.c:11
-msgid "Propose ip"
-msgstr ""
-
-#: admin/systems/network.tpl.c:14
-msgid "MAC-address"
-msgstr ""
-
-#: admin/systems/network.tpl.c:17
-msgid "Autodetect"
-msgstr ""
-
-#: admin/systems/network.tpl.c:20 admin/systems/network.tpl.c:23
-msgid "Enable DHCP for this device"
-msgstr ""
-
-#: admin/systems/network.tpl.c:26 admin/systems/network.tpl.c:50
-msgid "not configured"
-msgstr ""
-
-#: admin/systems/network.tpl.c:29
-msgid "Parent node"
-msgstr ""
-
-#: admin/systems/network.tpl.c:32
-msgid "Edit settings"
-msgstr ""
-
-#: admin/systems/network.tpl.c:35 admin/systems/network.tpl.c:47
-msgid "Enable DNS for this device"
-msgstr ""
-
-#: admin/systems/network.tpl.c:38
-msgid "Zone"
-msgstr ""
-
-#: admin/systems/network.tpl.c:41
-msgid "TTL"
-msgstr ""
-
-#: admin/systems/network.tpl.c:44
-msgid "Dns records"
-msgstr ""
-
-#: admin/systems/password.tpl.c:2
-msgid ""
-"To change the terminal root password use the fields below. The changes take "
-"effect during the next reboot. Please memorize the new password, because you"
-" wouldn't be able to log in."
-msgstr ""
-
-#: admin/systems/password.tpl.c:5
-msgid "Leave fields blank for password inheritance from default entries."
-msgstr ""
-
-#: admin/systems/password.tpl.c:8
-msgid "Changing the password impinges on authentification only."
-msgstr ""
-
-#: admin/systems/password.tpl.c:11
-msgid "New password"
-msgstr "Nova senha"
-
-#: admin/systems/password.tpl.c:14
-msgid "Repeat new password"
-msgstr "Repita nova senha"
-
-#: admin/systems/password.tpl.c:17
-msgid "Password strength"
-msgstr ""
-
-#: admin/systems/password.tpl.c:20
-msgid "Set password"
-msgstr "Definir a senha"
-
-#: 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/gencd.tpl.c:2
-msgid "CD-Install-Image generation"
-msgstr ""
-
-#: admin/systems/gencd.tpl.c:5
-msgid ""
-"This option enables you to generate FAI install CD images for the selected "
-"workstation. The procedure may take about 10 minutes to complete, so please "
-"be patient after pressing the 'Create ISO-Image' button."
-msgstr ""
-
-#: admin/systems/gencd.tpl.c:8
-msgid "Create ISO-Image"
-msgstr ""
-
-#: admin/systems/remove.tpl.c:5
-msgid ""
-"This includes all account data, system access rules, imap settings, etc. for"
-" this user. Please double check if your really want to do this since there "
-"is no way for FusionDirectory to get your data back."
-msgstr ""
-
-#: admin/systems/remove.tpl.c:8
-msgid "So - if you're sure - press 'Delete' to continue or 'Cancel' to abort."
-msgstr "EntÃ£o, se vocÃª tem certeza, pressione 'Deletar' para continuar ou 'Cancelar' para abortar."
-
-#: admin/systems/system-filter.tpl.c:2
-#: admin/systems/phoneSelect/phoneSelect-filter.tpl.c:2
-msgid "Filter"
-msgstr ""
-
-#: admin/systems/system-filter.tpl.c:5
-msgid "Show servers"
-msgstr ""
-
-#: admin/systems/system-filter.tpl.c:8
-msgid "Show workstations"
-msgstr ""
-
-#: admin/systems/system-filter.tpl.c:11
-msgid "Show terminals"
-msgstr ""
-
-#: admin/systems/system-filter.tpl.c:14
-msgid "Show network printer"
-msgstr ""
-
-#: admin/systems/system-filter.tpl.c:17
-#: admin/systems/phoneSelect/phoneSelect-filter.tpl.c:5
-msgid "Show phones"
-msgstr ""
-
-#: admin/systems/system-filter.tpl.c:20
-msgid "Show windows based workstations"
-msgstr ""
-
-#: admin/systems/system-filter.tpl.c:23
-msgid "Show network devices"
-msgstr ""
-
-#: admin/systems/system-filter.tpl.c:26
-#: admin/systems/phoneSelect/phoneSelect-filter.tpl.c:8
-msgid "Show mobile phones"
-msgstr ""
-
-#: admin/systems/system-filter.tpl.c:29
-msgid "Show IPMI interfaces"
-msgstr ""
-
-#: admin/systems/ppd/printerPPDSelectionDialog.tpl.c:2
-msgid "Select objects to add"
-msgstr ""
-
-#: admin/systems/ppd/printerPPDSelectionDialog.tpl.c:5
-msgid "Filters"
-msgstr "Filtros"
-
-#: admin/systems/ppd/printerPPDSelectionDialog.tpl.c:8
-msgid "Display objects matching"
-msgstr "Exibir combinaÃ§Ã£o de objetos"
-
-#: admin/systems/ppd/printerPPDSelectionDialog.tpl.c:11
-msgid "Regular expression for matching object names"
-msgstr "ExpressÃ£o regular para combinaÃ§Ã£o de nomes de objeto"
-
-#: admin/systems/ppd/printerPPDSelectionDialog.tpl.c:14
-msgid "Close"
-msgstr "Fechar"
-
-#: admin/systems/ppd/printerPPDDialog.tpl.c:2
-msgid "Printer driver"
-msgstr ""
-
-#: admin/systems/ppd/printerPPDDialog.tpl.c:5
-msgid "Model"
-msgstr ""
-
-#: admin/systems/ppd/printerPPDDialog.tpl.c:8
-msgid "Select"
-msgstr ""
-
-#: admin/systems/ppd/printerPPDDialog.tpl.c:11
-msgid "New driver"
-msgstr ""
-
-#: admin/systems/ppd/printerPPDDialog.tpl.c:14
-msgid "Upload"
-msgstr ""
-
-#: admin/systems/ppd/printerPPDDialog.tpl.c:17
-msgid "Options"
-msgstr ""
-
-#: admin/systems/ppd/remove_ppd.tpl.c:5
-msgid "The ppd file will be removed from the server and can not be restored."
-msgstr ""
-
-#: admin/systems/printer.tpl.c:2
-msgid "General"
-msgstr ""
-
-#: admin/systems/printer.tpl.c:5
-msgid "Printer name"
-msgstr ""
-
-#: admin/systems/printer.tpl.c:14
-msgid "Details"
-msgstr ""
-
-#: admin/systems/printer.tpl.c:20
-msgid "Printer location"
-msgstr ""
-
-#: admin/systems/printer.tpl.c:26
-msgid "PPD Provider"
-msgstr ""
-
-#: admin/systems/printer.tpl.c:29
-msgid "Driver"
-msgstr ""
-
-#: admin/systems/printer.tpl.c:32
-msgid "Edit"
-msgstr "Editar"
-
-#: admin/systems/printer.tpl.c:41
-msgid "Users which are allowed to use this printer"
-msgstr ""
-
-#: admin/systems/printer.tpl.c:44
-msgid "Users"
-msgstr "UsuÃ¡rios"
-
-#: admin/systems/printer.tpl.c:47
-msgid "Users which are allowed to administrate this printer"
-msgstr ""
-
-#: admin/systems/printer.tpl.c:50
-msgid "Admins"
-msgstr ""
-
-#: admin/systems/printer.tpl.c:53
-msgid "Windows paths"
-msgstr ""
-
-#: admin/systems/printer.tpl.c:56
-msgid "Printer windows inf file"
-msgstr ""
-
-#: admin/systems/printer.tpl.c:59
-msgid "Printer driver directory"
-msgstr ""
-
-#: admin/systems/gencd_frame.tpl.c:2
-msgid "Your browser does not supprt iframes."
-msgstr ""
-
-#: admin/systems/services/cups/serviceCUPS.tpl.c:2
-msgid "Print Service"
-msgstr ""
-
-#: admin/systems/services/cups/serviceCUPS.tpl.c:5
-msgid "enabled"
-msgstr ""
-
-#: admin/systems/services/ServiceAddDialog.tpl.c:2
-msgid "Adding a new service to the current server"
-msgstr ""
-
-#: admin/systems/services/ServiceAddDialog.tpl.c:5
-msgid ""
-"This dialog allows you to add new services to the currenty edited server "
-"object. The box below shows all available but not already used services."
-msgstr ""
-
-#: admin/systems/services/ServiceAddDialog.tpl.c:8
-msgid "Service to add"
-msgstr ""
-
-#: admin/systems/services/ServiceAddDialog.tpl.c:11
-msgid "All available services are already in use."
-msgstr ""
-
-#: admin/systems/services/ServiceAddDialog.tpl.c:14
-#: admin/systems/SelectDeviceType.tpl.c:26
-msgid "Continue"
-msgstr "Continuar"
-
-#: admin/systems/SelectDeviceType.tpl.c:2
-msgid ""
-"This system has no system type configured. Please choose a system type for "
-"this object and an optional inheritance group. Press the 'continue' button "
-"to proceed."
-msgstr ""
-
-#: admin/systems/SelectDeviceType.tpl.c:5
-msgid ""
-"Please select a system type and an optional bundle of predefined settings to"
-" be inherited."
-msgstr ""
-
-#: admin/systems/SelectDeviceType.tpl.c:8
-msgid ""
-"Please select a system type and a bundle of predefined settings to be "
-"inherited."
-msgstr ""
-
-#: admin/systems/SelectDeviceType.tpl.c:11
-#: admin/systems/SelectDeviceType.tpl.c:14
-msgid "System type"
-msgstr ""
-
-#: admin/systems/SelectDeviceType.tpl.c:17
-msgid "Choose an object group as template"
-msgstr ""
-
-#: admin/systems/SelectDeviceType.tpl.c:20
-msgid "Object group"
-msgstr ""
-
-#: admin/systems/SelectDeviceType.tpl.c:23
-msgid "none"
-msgstr "nenhum"
-
-#: addons/dashboard/systems_stats.tpl.c:2
-msgid "There are several argonaut servers! (this is not yet supported)"
-msgstr ""
-
-#: addons/dashboard/systems_stats.tpl.c:5
-msgid "There is an argonaut server running on %1 (%3://%2:%4)"
-msgstr ""
-
-#: addons/dashboard/systems_stats.tpl.c:8
-msgid "Only one system is configured to run an argonaut client."
-msgid_plural "%1 systems are configured to run an argonaut client."
-msgstr[0] ""
-msgstr[1] ""
-
-#: addons/dashboard/systems_stats.tpl.c:11
-msgid "But no system is configured to run an argonaut client!"
-msgstr ""
-
-#: addons/dashboard/systems_stats.tpl.c:14
-msgid ""
-"A system is configured to run an argonaut client, but there is no argonaut "
-"server configured!"
-msgid_plural ""
-"%1 systems are configured to run an argonaut client, but there is no "
-"argonaut server configured!"
-msgstr[0] ""
-msgstr[1] ""
diff --git a/systems/locale/pt_BR/fusiondirectory.po b/systems/locale/pt_BR/fusiondirectory.po
index 3b83426ad25dc8b4ac4e556ffa2e4f0c26cbb634..dda58d81a473be9bb8c872bcf0ad9f572ee9dd85 100644
--- a/systems/locale/pt_BR/fusiondirectory.po
+++ b/systems/locale/pt_BR/fusiondirectory.po
@@ -3,15 +3,14 @@
 # This file is distributed under the same license as the PACKAGE package.
 # 
 # Translators:
-# marcosantos <marcoa.csantos@yahoo.it>, 2014
 msgid ""
 msgstr ""
-"Project-Id-Version: FusionDirectory-108\n"
+"Project-Id-Version: FusionDirectory-109\n"
 "Report-Msgid-Bugs-To: documentation@lists.fusiondirectory.org\n"
-"POT-Creation-Date: 2015-03-31 11:49+0200\n"
+"POT-Creation-Date: 2014-12-15 17:47+0100\n"
 "PO-Revision-Date: 2015-03-31 11:41+0000\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>\n"
-"Language-Team: Portuguese (Brazil) (http://www.transifex.com/projects/p/FusionDirectory-108/language/pt_BR/)\n"
+"Language-Team: Portuguese (Brazil) (http://www.transifex.com/projects/p/FusionDirectory-109/language/pt_BR/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -27,29 +26,24 @@ msgid "Locked"
 msgstr "Bloqueado"
 
 #: admin/ogroups/goto/class_termgroup.inc:118
-#: admin/systems/class_terminalGeneric.inc:121
+#: admin/systems/class_terminalStartup.inc:145
 msgid "Local swap"
 msgstr "Ãrea de Swap local"
 
 #: admin/ogroups/goto/class_termgroup.inc:124
 #: admin/ogroups/goto/class_termgroup.inc:136
-#: admin/systems/class_workstationGeneric.inc:352
-#: admin/systems/class_terminalGeneric.inc:109
-#: admin/systems/class_terminalGeneric.inc:125
+#: admin/systems/class_terminalStartup.inc:133
+#: admin/systems/class_terminalStartup.inc:149
 msgid "inherited"
 msgstr "herdadas"
 
 #: admin/ogroups/goto/class_termgroup.inc:220
-#: admin/systems/class_workstationGeneric.inc:72
-#: admin/systems/class_workstationGeneric.inc:443
-#: admin/systems/class_systemManagement.inc:295
-#: admin/systems/class_systemManagement.inc:325
-msgid "Infrastructure service"
-msgstr ""
+#: admin/systems/class_systemManagement.inc:165
+#: admin/systems/class_systemManagement.inc:186
+msgid "Service infrastructure"
+msgstr "Infraestrutura do serviÃ§o"
 
 #: admin/ogroups/goto/class_termgroup.inc:224
-#: admin/systems/class_workstationGeneric.inc:75
-#: admin/systems/class_workstationGeneric.inc:78
 msgid "Event error"
 msgstr "Erro no evento"
 
@@ -59,12 +53,10 @@ msgid "Event '%s' is not available!"
 msgstr "O evento '%s' nÃ£o estÃ¡ disponÃvel!"
 
 #: admin/ogroups/goto/class_termgroup.inc:274
-#: admin/systems/class_workstationGeneric.inc:112
 msgid "Switch off"
 msgstr "Desligue"
 
 #: admin/ogroups/goto/class_termgroup.inc:274
-#: admin/systems/class_workstationGeneric.inc:113
 msgid "Reboot"
 msgstr "Reiniciar"
 
@@ -85,7 +77,6 @@ msgid "Reinstall"
 msgstr "Reinstalar"
 
 #: admin/ogroups/goto/class_termgroup.inc:279
-#: admin/systems/class_workstationGeneric.inc:108
 msgid "Memory test"
 msgstr "Teste de memÃ³ria"
 
@@ -94,21 +85,18 @@ msgid "System analysis"
 msgstr "AnÃ¡lises do sistema"
 
 #: admin/ogroups/goto/class_termgroup.inc:386
-#: admin/systems/class_printGeneric.inc:670
-#: admin/systems/class_printGeneric.inc:970
-#: admin/systems/class_systemManagement.inc:816
 #: admin/systems/services/class_goService.inc:123
 #: admin/systems/services/class_goService.inc:151
 #: admin/systems/services/class_goService.inc:187
-#: admin/systems/class_networkSettings.inc:478
-#: admin/systems/class_networkSettings.inc:491
-#: admin/systems/class_networkSettings.inc:757
-#: admin/systems/class_networkSettings.inc:816
-#: admin/systems/class_networkSettings.inc:835
-#: admin/systems/class_networkSettings.inc:852
-#: admin/systems/class_networkSettings.inc:861
-#: admin/systems/class_networkSettings.inc:879
-#: admin/systems/class_networkSettings.inc:951
+#: admin/systems/class_networkSettings.inc:470
+#: admin/systems/class_networkSettings.inc:483
+#: admin/systems/class_networkSettings.inc:749
+#: admin/systems/class_networkSettings.inc:808
+#: admin/systems/class_networkSettings.inc:827
+#: admin/systems/class_networkSettings.inc:844
+#: admin/systems/class_networkSettings.inc:853
+#: admin/systems/class_networkSettings.inc:871
+#: admin/systems/class_networkSettings.inc:943
 msgid "LDAP error"
 msgstr "Erro de LDAP"
 
@@ -120,195 +108,125 @@ msgstr "Sistema"
 msgid "System group"
 msgstr "Grupo do sistema"
 
-#: admin/ogroups/goto/class_termgroup.inc:401
-#: admin/ogroups/goto/termgroup.tpl.c:17
+#: admin/ogroups/goto/class_termgroup.inc:402
 msgid "Mode"
 msgstr "Modo"
 
-#: admin/ogroups/goto/class_termgroup.inc:402
-#: admin/systems/class_workstationGeneric.inc:189
-#: admin/ogroups/goto/termgroup.tpl.c:23
+#: admin/ogroups/goto/class_termgroup.inc:403
+#: admin/systems/class_systemServers.inc:35
 msgid "Syslog server"
 msgstr "Servirdor Syslog"
 
-#: admin/ogroups/goto/class_termgroup.inc:403
+#: admin/ogroups/goto/class_termgroup.inc:404
 msgid "Action flag"
 msgstr "Bandeira de aÃ§Ã£o"
 
-#: admin/ogroups/goto/class_termgroup.inc:404
+#: admin/ogroups/goto/class_termgroup.inc:405
 msgid "Ntp server"
-msgstr "servidor Ntp"
+msgstr "Servidor NTP"
 
-#: admin/ogroups/goto/class_termgroup.inc:405
-#: admin/systems/class_terminalGeneric.inc:41
-#: admin/ogroups/goto/termgroup.tpl.c:29
+#: admin/ogroups/goto/class_termgroup.inc:406
+#: admin/systems/class_terminalStartup.inc:65
 msgid "Root server"
 msgstr "Servidor raiz"
 
-#: admin/ogroups/goto/class_termgroup.inc:406
-#: admin/systems/class_terminalGeneric.inc:47
-#: admin/ogroups/goto/termgroup.tpl.c:35
+#: admin/ogroups/goto/class_termgroup.inc:407
+#: admin/systems/class_terminalStartup.inc:69
 msgid "Swap server"
 msgstr "Servidor de Swap"
 
-#: admin/systems/class_terminalStartup.inc:63
+#: admin/systems/class_terminalStartup.inc:62
 msgid "Startup parameters"
 msgstr "Parametros de inicializaÃ§Ã£o"
 
-#: admin/systems/class_terminalStartup.inc:66
+#: admin/systems/class_terminalStartup.inc:65
+msgid "The root server the terminal should be using"
+msgstr ""
+
+#: admin/systems/class_terminalStartup.inc:69
+msgid "The swap server the terminal should be using"
+msgstr ""
+
+#: admin/systems/class_terminalStartup.inc:73
 msgid "Boot kernel"
 msgstr "Kernel de boot"
 
-#: admin/systems/class_terminalStartup.inc:66
+#: admin/systems/class_terminalStartup.inc:73
 msgid "Linux kernel to be installed and booted"
 msgstr "O Kernel do linux estÃ¡ instalado e bootado."
 
-#: admin/systems/class_terminalStartup.inc:70
+#: admin/systems/class_terminalStartup.inc:77
 msgid "Boot kernel parameters"
 msgstr "ParÃ¢metros de boot do kernel"
 
-#: admin/systems/class_terminalStartup.inc:70
+#: admin/systems/class_terminalStartup.inc:77
 msgid "Linux kernel parameters to be ran"
 msgstr "ParÃ¢metros do kernel Linux para ser executado"
 
-#: admin/systems/class_terminalStartup.inc:82
-msgid "Startup"
-msgstr "ComeÃ§ar"
-
 #: admin/systems/class_terminalStartup.inc:83
-msgid "Terminal startup"
+msgid "Remote desktop"
 msgstr ""
 
-#: admin/systems/system-list.xml:10
-msgid "List of systems"
-msgstr "Lista de sistemas"
-
-#: admin/systems/system-list.xml:14
-msgid "New workstation"
-msgstr "Nova estaÃ§Ã£o de trabalho"
-
-#: admin/systems/system-list.xml:22
-msgid "Locked server"
-msgstr "Servidor bloqueado"
-
-#: admin/systems/system-list.xml:30
-msgid "Locked workstation"
-msgstr "EstaÃ§Ã£o de trabalho bloqueada"
-
-#: admin/systems/system-list.xml:38
-msgid "Locked terminal"
-msgstr "Terminal bloqueado"
-
-#: admin/systems/system-list.xml:47
-msgid "New terminal"
-msgstr "Novo terminal"
-
-#: admin/systems/system-list.xml:55
-msgid "New device"
-msgstr "Novo dispositivo"
-
-#: admin/systems/system-list.xml:63
-msgid "Workstation template"
-msgstr "Modelo de estaÃ§Ã£o de trabalho"
-
-#: admin/systems/system-list.xml:71
-msgid "Terminal template"
-msgstr "Modelo de terminal"
-
-#: admin/systems/system-list.xml:79
-msgid "Winstation"
-msgstr "Winstation"
+#: admin/systems/class_terminalStartup.inc:87
+msgid "Connect method"
+msgstr "MÃ©todo de conexÃ£o"
 
-#: admin/systems/system-list.xml:87 admin/systems/system-list.xml:234
-#: admin/systems/class_systemImport.inc:169
-#: admin/systems/class_serverGeneric.inc:46
-#: admin/systems/class_serverGeneric.inc:51
-#: admin/systems/class_serverGeneric.inc:52
-#: admin/systems/class_SelectDeviceType.inc:58
-msgid "Server"
-msgstr "Servidor"
+#: admin/systems/class_terminalStartup.inc:91
+msgid "XDMCP"
+msgstr "XDMCP"
 
-#: admin/systems/system-list.xml:95 admin/systems/system-list.xml:242
-#: admin/systems/class_workstationGeneric.inc:458
-#: admin/systems/class_workstationGeneric.inc:463
-#: admin/systems/class_workstationGeneric.inc:464
-#: admin/systems/class_SelectDeviceType.inc:58
-msgid "Workstation"
-msgstr "EstaÃ§Ã£o de trabalho"
+#: admin/systems/class_terminalStartup.inc:91
+msgid "LDM"
+msgstr "LDM"
 
-#: admin/systems/system-list.xml:103 admin/systems/system-list.xml:250
-#: admin/systems/class_terminalGeneric.inc:81
-#: admin/systems/class_terminalGeneric.inc:86
-#: admin/systems/class_terminalGeneric.inc:87
-#: admin/systems/class_SelectDeviceType.inc:58
-msgid "Terminal"
-msgstr "Terminal"
+#: admin/systems/class_terminalStartup.inc:91
+msgid "Shell"
+msgstr "Shell"
 
-#: admin/systems/system-list.xml:111 admin/systems/class_printGeneric.inc:1005
-#: admin/systems/class_printGeneric.inc:1011
-#: admin/systems/class_printGeneric.inc:1012
-msgid "Printer"
-msgstr "Impressora"
+#: admin/systems/class_terminalStartup.inc:91
+msgid "Telnet"
+msgstr "Telnet"
 
-#: admin/systems/system-list.xml:119 admin/systems/system-list.xml:274
-#: admin/systems/class_mobilePhoneGeneric.inc:74
-#: admin/systems/phoneSelect/phoneSelect-list.xml:14
-msgid "Phone"
-msgstr "Telefone"
+#: admin/systems/class_terminalStartup.inc:91
+msgid "Windows RDP"
+msgstr ""
 
-#: admin/systems/system-list.xml:127
-#: admin/systems/class_mobilePhoneGeneric.inc:36
-#: admin/systems/class_mobilePhoneGeneric.inc:41
-#: admin/systems/class_mobilePhoneGeneric.inc:42
-#: admin/systems/phoneSelect/phoneSelect-list.xml:22
-msgid "Mobile phone"
+#: admin/systems/class_terminalStartup.inc:95
+msgid "Terminal server"
 msgstr ""
 
-#: admin/systems/system-list.xml:135
-#: admin/systems/class_componentGeneric.inc:36
-msgid "Component"
-msgstr "Componente"
+#: admin/systems/system-list.xml:10
+msgid "List of systems"
+msgstr "Lista de sistemas"
 
-#: admin/systems/system-list.xml:143 admin/systems/system-list.xml:298
-msgid "IPMI"
-msgstr "IPMI"
-
-#: admin/systems/system-list.xml:169
-#: admin/systems/class_workstationGeneric.inc:154
-#: admin/systems/class_printGeneric.inc:752
-#: admin/systems/class_printGeneric.inc:762
-#: admin/systems/class_printGeneric.inc:781
-#: admin/systems/class_printGeneric.inc:1022
-#: admin/systems/class_componentGeneric.inc:64
-#: admin/systems/class_mobilePhoneGeneric.inc:63
-#: admin/systems/phoneSelect/phoneSelect-list.xml:48
+#: admin/systems/system-list.xml:31
+#: admin/systems/class_workstationGeneric.inc:46
+#: admin/systems/class_printGeneric.inc:60
+#: admin/systems/class_componentGeneric.inc:58
+#: admin/systems/class_mobilePhoneGeneric.inc:60
 #: admin/systems/services/shares/class_serviceShare.inc:52
-#: admin/systems/system-filter.tpl.c:32
-#: admin/systems/phoneSelect/phoneSelect-filter.tpl.c:11
 msgid "Name"
 msgstr "Nome"
 
-#: admin/systems/system-list.xml:177
-#: admin/systems/phoneSelect/phoneSelect-list.xml:63
+#: admin/systems/system-list.xml:39
 msgid "IP"
 msgstr "IP"
 
-#: admin/systems/system-list.xml:185
+#: admin/systems/system-list.xml:47
 msgid "MAC"
 msgstr "MAC"
 
-#: admin/systems/system-list.xml:193
-#: admin/systems/class_workstationGeneric.inc:160
-#: admin/systems/class_printGeneric.inc:1024
-#: admin/systems/class_componentGeneric.inc:68
-#: admin/systems/class_mobilePhoneGeneric.inc:67
+#: admin/systems/system-list.xml:55
+#: admin/systems/class_workstationGeneric.inc:51
+#: admin/systems/class_printGeneric.inc:64
+#: admin/systems/class_componentGeneric.inc:62
+#: admin/systems/class_mobilePhoneGeneric.inc:64
 #: admin/systems/serverService-list.xml:35
 #: admin/systems/services/shares/class_serviceShare.inc:56
-#: admin/systems/printer.tpl.c:8 admin/systems/printer.tpl.c:17
 msgid "Description"
 msgstr "DescriÃ§Ã£o"
 
-#: admin/systems/system-list.xml:201 admin/systems/class_serverService.inc:57
+#: admin/systems/system-list.xml:63 admin/systems/class_serverService.inc:57
 #: admin/systems/services/terminal/class_serviceTerminal.inc:30
 #: admin/systems/services/cups/class_serviceCUPS.inc:85
 #: admin/systems/services/shares/class_serviceShare.inc:31
@@ -317,610 +235,221 @@ msgstr "DescriÃ§Ã£o"
 msgid "Services"
 msgstr "ServiÃ§os"
 
-#: admin/systems/system-list.xml:209
+#: admin/systems/system-list.xml:71
 msgid "Release"
 msgstr "LiberaÃ§Ã£o"
 
-#: admin/systems/system-list.xml:217 admin/systems/serverService-list.xml:43
-#: admin/systems/phoneSelect/phoneSelect-list.xml:70
+#: admin/systems/system-list.xml:79 admin/systems/serverService-list.xml:43
 msgid "Actions"
 msgstr "AÃ§Ãµes"
 
-#: admin/systems/system-list.xml:228 admin/systems/serverService-list.xml:54
+#: admin/systems/system-list.xml:90 admin/systems/serverService-list.xml:54
 msgid "Create"
 msgstr "Criar"
 
-#: admin/systems/system-list.xml:258
-msgid "winStation"
-msgstr ""
-
-#: admin/systems/system-list.xml:266
-msgid "Network printer"
-msgstr "Impressora de rede"
-
-#: admin/systems/system-list.xml:282
-#: admin/systems/class_componentGeneric.inc:41
-#: admin/systems/class_componentGeneric.inc:42
-msgid "Network device"
-msgstr "Dispositivo de rede"
-
-#: admin/systems/system-list.xml:290
-msgid "Mobile Phone"
-msgstr ""
-
-#: admin/systems/system-list.xml:310
+#: admin/systems/system-list.xml:100
 msgid "Trigger action"
 msgstr "AÃ§Ã£o do gatilho"
 
-#: admin/systems/system-list.xml:317
+#: admin/systems/system-list.xml:107
 msgid "Schedule action"
 msgstr "Programar aÃ§Ã£o"
 
-#: admin/systems/system-list.xml:330
-msgid "Activate systems"
-msgstr "Sistemas ativos"
-
-#: admin/systems/system-list.xml:337 admin/systems/serverService-list.xml:69
-#: admin/systems/printer.tpl.c:35
+#: admin/systems/system-list.xml:119 admin/systems/serverService-list.xml:69
 msgid "Remove"
 msgstr "Remover"
 
-#: admin/systems/system-list.xml:367
-msgid "Create ISO"
-msgstr "Criar ISO"
-
-#: admin/systems/system-list.xml:379
+#: admin/systems/system-list.xml:150
 msgid "Edit system"
 msgstr ""
 
-#: admin/systems/system-list.xml:392
+#: admin/systems/system-list.xml:163
 msgid "Remove system"
 msgstr "Remover sistema"
 
-#: admin/systems/class_workstationGeneric.inc:75
-#, php-format
-msgid "Event %s is not available!"
-msgstr ""
-
-#: admin/systems/class_workstationGeneric.inc:78
-msgid "Events are not available!"
-msgstr ""
-
-#: admin/systems/class_workstationGeneric.inc:106
-msgid "(Re)Install"
-msgstr "(Re)Instalar"
-
-#: admin/systems/class_workstationGeneric.inc:107
-msgid "Software update"
-msgstr "AtualizaÃ§Ã£o de software"
-
-#: admin/systems/class_workstationGeneric.inc:115
-msgid "Wake up"
-msgstr "Acordar"
-
-#: admin/systems/class_workstationGeneric.inc:144
-#: admin/systems/class_printGeneric.inc:604
+#: admin/systems/class_workstationGeneric.inc:35
 msgid "workstation"
 msgstr ""
 
-#: admin/systems/class_workstationGeneric.inc:151
-#: admin/systems/class_componentGeneric.inc:61
-#: admin/systems/class_mobilePhoneGeneric.inc:60
+#: admin/systems/class_workstationGeneric.inc:42
+#: admin/systems/class_printGeneric.inc:56
+#: admin/systems/class_componentGeneric.inc:55
+#: admin/systems/class_mobilePhoneGeneric.inc:56
 msgid "Properties"
 msgstr "Propriedades"
 
-#: admin/systems/class_workstationGeneric.inc:155
+#: admin/systems/class_workstationGeneric.inc:47
 #, php-format
 msgid "The name of the %s"
 msgstr ""
 
-#: admin/systems/class_workstationGeneric.inc:161
+#: admin/systems/class_workstationGeneric.inc:52
 #, php-format
 msgid "A short description of the %s"
 msgstr ""
 
-#: admin/systems/class_workstationGeneric.inc:166
-#: admin/systems/class_printGeneric.inc:1025
+#: admin/systems/class_workstationGeneric.inc:56
 msgid "Location"
 msgstr "LocalizaÃ§Ã£o"
 
-#: admin/systems/class_workstationGeneric.inc:167
+#: admin/systems/class_workstationGeneric.inc:57
 #, php-format
 msgid "The location of the %s"
 msgstr ""
 
-#: admin/systems/class_workstationGeneric.inc:173
+#: admin/systems/class_workstationGeneric.inc:61
 #, php-format
 msgid "Lock this %s"
 msgstr ""
 
-#: admin/systems/class_workstationGeneric.inc:174
+#: admin/systems/class_workstationGeneric.inc:62
 #, php-format
 msgid "This will prevent the %s from being reinstalled"
 msgstr ""
 
-#: admin/systems/class_workstationGeneric.inc:185
-#: addons/dashboard/class_dashBoardSystems.inc:48
-msgid "Servers"
-msgstr "Servidores"
-
-#: admin/systems/class_workstationGeneric.inc:190
-#, php-format
-msgid "The syslog server the %s should be using"
-msgstr ""
-
-#: admin/systems/class_workstationGeneric.inc:195
-msgid "Inherit NTP servers"
-msgstr ""
-
-#: admin/systems/class_workstationGeneric.inc:196
-msgid "Inherit time server attributes from ogroup"
-msgstr ""
-
-#: admin/systems/class_workstationGeneric.inc:202
-msgid "NTP servers"
-msgstr "Servidores NTP"
-
-#: admin/systems/class_workstationGeneric.inc:203
-#, php-format
-msgid "The NTP servers for the %s"
-msgstr ""
-
-#: admin/systems/class_workstationGeneric.inc:209
-msgid "Inherit LDAP servers"
-msgstr ""
-
-#: admin/systems/class_workstationGeneric.inc:210
-msgid "Inherit LDAP server attributes from ogroup"
-msgstr ""
-
-#: admin/systems/class_workstationGeneric.inc:216
-msgid "LDAP servers"
-msgstr "Servidores LDAP"
-
-#: admin/systems/class_workstationGeneric.inc:217
-#, php-format
-msgid "The LDAP servers for the %s"
-msgstr ""
-
-#: admin/systems/class_workstationGeneric.inc:225
-#: admin/systems/class_workstationGeneric.inc:229
-#: admin/ogroups/goto/termgroup.tpl.c:41
-msgid "Action"
-msgstr "AÃ§Ã£o"
-
-#: admin/systems/class_workstationGeneric.inc:230
-#: admin/ogroups/goto/termgroup.tpl.c:44
-msgid "Select action to execute for this terminal"
-msgstr "Selecione a aÃ§Ã£o que serÃ¡ executada por esse terminal"
-
-#: admin/systems/class_workstationGeneric.inc:236
-#: admin/systems/class_componentGeneric.inc:75
-#: admin/systems/class_mobilePhoneGeneric.inc:106
-#: admin/systems/class_networkSettings.inc:1016
+#: admin/systems/class_workstationGeneric.inc:73
+#: admin/systems/class_printGeneric.inc:83
+#: admin/systems/class_componentGeneric.inc:69
+#: admin/systems/class_mobilePhoneGeneric.inc:102
+#: admin/systems/class_networkSettings.inc:1008
 msgid "Network settings"
 msgstr "ConfiguraÃ§Ãµes de rede"
 
-#: admin/systems/class_workstationGeneric.inc:459
-msgid "Workstation information"
-msgstr ""
-
-#: admin/systems/class_printGeneric.inc:131
-#: admin/systems/class_printGeneric.inc:1065
-#: admin/systems/class_systemManagement.inc:678
-msgid "Internal error"
-msgstr "Erro interno"
+#: admin/systems/class_workstationGeneric.inc:78
+#: admin/systems/class_printGeneric.inc:87
+#: admin/systems/class_componentGeneric.inc:73
+#: admin/systems/class_mobilePhoneGeneric.inc:106
+#: admin/systems/class_networkSettings.inc:630
+#: admin/systems/class_networkSettings.inc:643
+#: admin/systems/class_networkSettings.inc:645
+#: admin/systems/class_networkSettings.inc:1014
+msgid "IP address"
+msgstr "EndereÃ§o IP"
 
-#: admin/systems/class_printGeneric.inc:131
-#, php-format
-msgid ""
-"Cannot determine a valid department for this object. Setting base to '%s'!"
+#: admin/systems/class_workstationGeneric.inc:78
+msgid "IP addresses this system uses (v4 or v6)"
 msgstr ""
 
-#: admin/systems/class_printGeneric.inc:311
-#: admin/systems/class_printGeneric.inc:319
-#: admin/systems/class_printGeneric.inc:324
-#: admin/systems/class_printGeneric.inc:374
-#: admin/systems/class_printGeneric.inc:390
-#: admin/systems/class_printGeneric.inc:393
-msgid "Add printer extension"
-msgstr ""
+#: admin/systems/class_workstationGeneric.inc:83
+#: admin/systems/class_printGeneric.inc:91
+#: admin/systems/class_componentGeneric.inc:77
+#: admin/systems/class_mobilePhoneGeneric.inc:110
+msgid "Mac address"
+msgstr "EndereÃ§o MAC"
 
-#: admin/systems/class_printGeneric.inc:312
-msgid ""
-"Could not initialize printer tab, parameter parent was missing while "
-"construction."
+#: admin/systems/class_workstationGeneric.inc:83
+#: admin/systems/class_printGeneric.inc:91
+#: admin/systems/class_componentGeneric.inc:77
+#: admin/systems/class_mobilePhoneGeneric.inc:110
+msgid "Mac address of this system"
 msgstr ""
 
-#: admin/systems/class_printGeneric.inc:320
-msgid "This is a workstation template, printer tab is disabled."
-msgstr ""
+#: admin/systems/class_workstationGeneric.inc:125
+#: admin/systems/class_workstationGeneric.inc:130
+#: admin/systems/class_workstationGeneric.inc:131
+msgid "Workstation"
+msgstr "EstaÃ§Ã£o de trabalho"
 
-#: admin/systems/class_printGeneric.inc:325
-msgid "This is a terminal template, printer tab is disabled."
+#: admin/systems/class_workstationGeneric.inc:126
+msgid "Workstation information"
 msgstr ""
 
-#: admin/systems/class_printGeneric.inc:367
-#: admin/systems/class_printGeneric.inc:375
-#: admin/systems/class_printGeneric.inc:383
-#: admin/systems/class_printGeneric.inc:386
-#: admin/systems/class_printGeneric.inc:391
-#: admin/systems/class_printGeneric.inc:394
-msgid "printer"
-msgstr "impressora"
+#: admin/systems/class_printGeneric.inc:32
+#: admin/systems/class_printGeneric.inc:37
+#: admin/systems/class_printGeneric.inc:38
+msgid "Printer"
+msgstr "Impressora"
 
-#: admin/systems/class_printGeneric.inc:375
-msgid ""
-"You can't enable it while 'cn' is not present in entry. Possibly you are "
-"currently creating a new terminal template."
+#: admin/systems/class_printGeneric.inc:33
+msgid "Printer information"
 msgstr ""
 
-#: admin/systems/class_printGeneric.inc:382
-#: admin/systems/class_printGeneric.inc:385
-msgid "Remove printer extension"
-msgstr "Remover extensÃ£o da impressora"
-
-#: admin/systems/class_printGeneric.inc:474
-#: admin/systems/class_printGeneric.inc:652
-#: admin/systems/class_printGeneric.inc:659
-#: admin/systems/class_printGeneric.inc:718
-#: admin/systems/class_printGeneric.inc:1105
-#: admin/systems/class_printGeneric.inc:1116
-#: admin/systems/class_serverService.inc:224
-#: admin/systems/class_serverService.inc:270
-#: admin/systems/class_serverService.inc:393
-#: admin/systems/class_systemManagement.inc:341
-#: admin/systems/class_systemManagement.inc:624
-#: admin/systems/class_systemManagement.inc:639
-#: admin/systems/services/shares/class_serviceShare.inc:103
-#: admin/systems/class_networkSettings.inc:305
-#: admin/systems/class_networkSettings.inc:336
-#: admin/systems/class_networkSettings.inc:584
-#: admin/systems/class_networkSettings.inc:591
-#: admin/systems/class_networkSettings.inc:597
-#: admin/systems/class_networkSettings.inc:604
-msgid "Error"
-msgstr "Erro"
-
-#: admin/systems/class_printGeneric.inc:577
-#, php-format
-msgid "Your currently selected PPD file '%s' doesn't exist."
+#: admin/systems/class_printGeneric.inc:60
+msgid "The name of the printer"
 msgstr ""
 
-#: admin/systems/class_printGeneric.inc:583
-msgid "Not defined"
-msgstr "NÃ£o definido"
-
-#: admin/systems/class_printGeneric.inc:587
-#: admin/systems/ppd/class_printerPPDDialog.inc:116
-msgid "Can't get ppd informations."
+#: admin/systems/class_printGeneric.inc:64
+msgid "A short description of the printer"
 msgstr ""
 
-#: admin/systems/class_printGeneric.inc:602
-#: admin/systems/class_printGeneric.inc:604
-#, php-format
-msgid "This printer belongs to %s. You can't rename this printer."
-msgstr ""
+#: admin/systems/class_printGeneric.inc:70
+msgid "Details"
+msgstr "Detalhes"
 
-#: admin/systems/class_printGeneric.inc:602
-#: admin/systems/class_terminalGeneric.inc:34
-msgid "terminal"
-msgstr "Terminal"
+#: admin/systems/class_printGeneric.inc:73
+msgid "Printer location"
+msgstr "LocalizaÃ§Ã£o da impressora"
 
-#: admin/systems/class_printGeneric.inc:652
-#: admin/systems/class_printGeneric.inc:659
-msgid "Object is no printer!"
+#: admin/systems/class_printGeneric.inc:73
+msgid "The location of the printer"
 msgstr ""
 
-#: admin/systems/class_printGeneric.inc:767 admin/systems/printer.tpl.c:23
+#: admin/systems/class_printGeneric.inc:77
 msgid "Printer URL"
 msgstr "URL da impressora"
 
-#: admin/systems/class_printGeneric.inc:989
-#: admin/systems/class_printGeneric.inc:991
-msgid "Group"
-msgstr "Grupo"
-
-#: admin/systems/class_printGeneric.inc:994
-msgid "User"
-msgstr "UsuÃ¡rio"
-
-#: admin/systems/class_printGeneric.inc:1006
-msgid "Printer information"
-msgstr ""
-
-#: admin/systems/class_printGeneric.inc:1023
-#: admin/systems/serverService-list.tpl.c:2
-#: admin/systems/phoneSelect/phoneSelect-list.tpl.c:2
-#: admin/systems/printer.tpl.c:11
-msgid "Base"
-msgstr "Base"
-
-#: admin/systems/class_printGeneric.inc:1026
-msgid "LabeledURL"
-msgstr ""
-
-#: admin/systems/class_printGeneric.inc:1027
-msgid "Printer PPD"
-msgstr ""
-
-#: admin/systems/class_printGeneric.inc:1028 admin/systems/printer.tpl.c:38
-msgid "Permissions"
-msgstr "PermissÃµes"
-
-#: admin/systems/class_printGeneric.inc:1030
-msgid "Windows inf file"
-msgstr ""
-
-#: admin/systems/class_printGeneric.inc:1031
-msgid "Windows driver dir"
-msgstr ""
-
-#: admin/systems/class_printGeneric.inc:1032 admin/systems/printer.tpl.c:62
-msgid "Driver printer name"
-msgstr "Nome do driver da impressora"
-
-#: admin/systems/class_printGeneric.inc:1048
-#: admin/systems/class_printGeneric.inc:1070
-msgid "Permission error"
-msgstr "Erro de permissÃ£o"
-
-#: admin/systems/class_printGeneric.inc:1048
-#: admin/systems/class_printGeneric.inc:1070
-msgid "printer user"
+#: admin/systems/class_printGeneric.inc:77
+msgid "The URL of the printer"
 msgstr ""
 
-#: admin/systems/class_printGeneric.inc:1065
-#, php-format
-msgid "Illegal member type '%s'!"
+#: admin/systems/class_printGeneric.inc:87
+#: admin/systems/class_componentGeneric.inc:73
+#: admin/systems/class_mobilePhoneGeneric.inc:106
+msgid "IP address this system uses"
 msgstr ""
 
-#: admin/systems/class_printGeneric.inc:1105
-#, php-format
-msgid "'%s' is already used!"
-msgstr "'%s' jÃ¡ estÃ¡ em uso!"
-
-#: admin/systems/class_printGeneric.inc:1116
-#, php-format
-msgid "'%s' does not exist!"
-msgstr "'%s%' nÃ£o existe!"
-
 #: admin/systems/class_serverService.inc:58
 msgid "Server services"
 msgstr "ServiÃ§os do servidor"
 
-#: admin/systems/class_serverService.inc:332
-msgid "Filter error"
-msgstr "Erro no filtro"
-
-#: admin/systems/class_serverService.inc:332
-msgid "The filter is incomplete!"
-msgstr "O filtro estÃ¡ incompleto!"
-
-#: admin/systems/class_serverService.inc:387
-msgid "Information"
-msgstr "InformaÃ§Ã£o"
-
-#: admin/systems/class_serverService.inc:387
-msgid "Cannot update service status until it has been saved!"
-msgstr "NÃ£o Ã© possÃvel atualizar o status do serviÃ§o atÃ© que este seja salvo!"
-
-#: admin/systems/class_serverService.inc:415
-#: admin/systems/class_serverService.inc:424
-#: admin/systems/class_serverService.inc:435
-#, php-format
-msgid "Could not get execute action %s on service %s."
-msgstr ""
-
-#: admin/systems/class_terminalGeneric.inc:42
-#, php-format
-msgid "The root server the terminal should be using"
-msgstr ""
-
-#: admin/systems/class_terminalGeneric.inc:48
-#, php-format
-msgid "The swap server the terminal should be using"
-msgstr ""
-
-#: admin/systems/class_terminalGeneric.inc:54
-msgid "Remote desktop"
-msgstr ""
-
-#: admin/systems/class_terminalGeneric.inc:58
-msgid "Connect method"
-msgstr "MÃ©todo de conexÃ£o"
-
-#: admin/systems/class_terminalGeneric.inc:62
-msgid "XDMCP"
-msgstr "XDMCP"
-
-#: admin/systems/class_terminalGeneric.inc:62
-msgid "LDM"
-msgstr "LDM"
-
-#: admin/systems/class_terminalGeneric.inc:62
-msgid "Shell"
-msgstr "Shell"
-
-#: admin/systems/class_terminalGeneric.inc:62
-msgid "Telnet"
-msgstr "Telnet"
-
-#: admin/systems/class_terminalGeneric.inc:62
-msgid "Windows RDP"
-msgstr ""
-
-#: admin/systems/class_terminalGeneric.inc:66
-msgid "Terminal server"
-msgstr ""
-
-#: admin/systems/class_terminalGeneric.inc:82
-msgid "Terminal information"
-msgstr ""
-
-#: admin/systems/ppd/class_printerPPDSelectionDialog.inc:91
-#: admin/systems/ppd/class_printerPPDSelectionDialog.inc:116
-#: admin/systems/ppd/class_printerPPDSelectionDialog.inc:139
-#: admin/systems/ppd/class_printerPPDDialog.inc:92
-#: admin/systems/ppd/class_printerPPDDialog.inc:160
-#: admin/systems/ppd/class_printerPPDDialog.inc:241
-#: admin/systems/ppd/class_printerPPDDialog.inc:256
-#: admin/systems/ppd/class_printerPPDDialog.inc:269
-#: admin/systems/ppd/class_printerPPDDialog.inc:297
-#: admin/systems/ppd/class_printerPPDDialog.inc:314
-#: admin/systems/ppd/class_printerPPDDialog.inc:337
-#: admin/systems/ppd/class_printerPPDDialog.inc:351
-#: admin/systems/ppd/class_printerPPDDialog.inc:361
-#: admin/systems/ppd/class_printerPPDDialog.inc:365
-#: admin/systems/ppd/class_printerPPDDialog.inc:560
-#: admin/systems/ppd/class_printerPPDDialog.inc:577
-#: admin/systems/ppd/class_printerPPDDialog.inc:580
-#: admin/systems/ppd/class_printerPPDDialog.inc:583
-msgid "PPD error"
-msgstr ""
-
-#: admin/systems/ppd/class_printerPPDSelectionDialog.inc:139
-#, php-format
-msgid "Cannot locate vendor '%s' in available PPDs!"
-msgstr ""
-
-#: admin/systems/ppd/class_printerPPDSelectionDialog.inc:148
-msgid "Printer ppd selection."
-msgstr ""
-
-#: admin/systems/ppd/class_printerPPDSelectionDialog.inc:155
-msgid "delete"
-msgstr "deletar"
-
-#: admin/systems/ppd/class_printerPPDSelectionDialog.inc:166
-msgid "back"
-msgstr "voltar"
-
-#: admin/systems/ppd/class_printerPPDDialog.inc:74
-#: admin/systems/ppd/class_printerPPDDialog.inc:140
-#: admin/systems/services/class_goService.inc:241
-msgid "Configuration error"
-msgstr "Erro de configuraÃ§Ã£o"
-
-#: admin/systems/ppd/class_printerPPDDialog.inc:92
-#, php-format
-msgid "Cannot open PPD '%s'!"
-msgstr ""
-
-#: admin/systems/ppd/class_printerPPDDialog.inc:141
-#, php-format
-msgid "Cannot open PPD path '%s' for reading and writing!"
-msgstr ""
-
-#: admin/systems/ppd/class_printerPPDDialog.inc:160
-#: admin/systems/ppd/class_printerPPDDialog.inc:365
-msgid "file is empty"
-msgstr "arquivo estÃ¡ vazio"
-
-#: admin/systems/ppd/class_printerPPDDialog.inc:314
-#, php-format
-msgid "Cannot parse PPD '%s'!"
-msgstr ""
-
-#: admin/systems/ppd/class_printerPPDDialog.inc:340
-msgid "Overwrite existing PPD"
-msgstr ""
-
-#: admin/systems/ppd/class_printerPPDDialog.inc:341
-msgid ""
-"There is already a ppd file for this kind of printer. Do you want to "
-"overwrite it?"
-msgstr ""
-
-#: admin/systems/ppd/class_printerPPDDialog.inc:491
-msgid "Section"
-msgstr "SeÃ§Ã£o"
-
-#: admin/systems/ppd/class_printerPPDDialog.inc:551
-#: admin/systems/ppd/class_printerPPDDialog.inc:554
-msgid "True"
-msgstr "Verdadeiro"
-
-#: admin/systems/ppd/class_printerPPDDialog.inc:552
-#: admin/systems/ppd/class_printerPPDDialog.inc:555
-msgid "False"
-msgstr "Falso"
-
-#: admin/systems/ppd/class_printerPPDDialog.inc:560
-#, php-format
-msgid "PPD type '%s' is not supported!"
-msgstr ""
-
-#: admin/systems/ppd/class_printerPPDDialog.inc:597
-msgid ""
-"Please select a valid ppd file or use 'Cancel' to go back to printer "
-"configuration."
-msgstr ""
-
-#: admin/systems/ppd/class_ppdManager.inc:44
-#: admin/systems/ppd/class_ppdManager.inc:188
-#: admin/systems/ppd/class_ppdManager.inc:190
-msgid "PPD manager error"
-msgstr ""
-
-#: admin/systems/ppd/class_ppdManager.inc:44
-#, php-format
-msgid "The specified path '%s' does not exist."
-msgstr ""
-
-#: admin/systems/ppd/class_ppdManager.inc:188
-#, php-format
-msgid "Specified PPD file '%s' cannot be opened for reading."
-msgstr ""
-
-#: admin/systems/ppd/class_ppdManager.inc:190
-#, php-format
-msgid "The temporary file '%s' cannot be opened for writing."
-msgstr ""
-
-#: admin/systems/ppd/class_ppdManager.inc:212
-#: admin/systems/ppd/class_ppdManager.inc:350
-msgid "Parsing PPD file failed - file is empty!"
-msgstr ""
-
-#: admin/systems/ppd/class_ppdManager.inc:222
-#, php-format
-msgid ""
-"Parsing PPD file %s failed - line too long. Trailing characters have been "
-"ignored!"
-msgstr ""
-
-#: admin/systems/ppd/class_ppdManager.inc:230
-msgid "Nested groups are not supported!"
-msgstr ""
+#: admin/systems/class_serverService.inc:224
+#: admin/systems/class_serverService.inc:270
+#: admin/systems/class_serverService.inc:393
+#: admin/systems/services/shares/class_serviceShare.inc:103
+#: admin/systems/class_networkSettings.inc:297
+#: admin/systems/class_networkSettings.inc:328
+#: admin/systems/class_networkSettings.inc:576
+#: admin/systems/class_networkSettings.inc:583
+#: admin/systems/class_networkSettings.inc:589
+#: admin/systems/class_networkSettings.inc:596
+msgid "Error"
+msgstr "Erro"
 
-#: admin/systems/ppd/class_ppdManager.inc:234
-msgid "Group name not unique!"
-msgstr ""
+#: admin/systems/class_serverService.inc:332
+msgid "Filter error"
+msgstr "Erro no filtro"
 
-#: admin/systems/ppd/class_ppdManager.inc:240
-#: admin/systems/ppd/class_ppdManager.inc:270
-msgid "Symbol values are not supported yet!"
-msgstr ""
+#: admin/systems/class_serverService.inc:332
+msgid "The filter is incomplete!"
+msgstr "O filtro estÃ¡ incompleto!"
 
-#: admin/systems/ppd/class_ppdManager.inc:264
-msgid "Nested options are not supported!"
-msgstr ""
+#: admin/systems/class_serverService.inc:387
+msgid "Information"
+msgstr "InformaÃ§Ã£o"
 
-#: admin/systems/ppd/class_ppdManager.inc:289
-msgid "PickMany is not supported yet!"
-msgstr ""
+#: admin/systems/class_serverService.inc:387
+msgid "Cannot update service status until it has been saved!"
+msgstr "NÃ£o Ã© possÃvel atualizar o status do serviÃ§o atÃ© que este seja salvo!"
 
-#: admin/systems/ppd/class_ppdManager.inc:370
+#: admin/systems/class_serverService.inc:415
+#: admin/systems/class_serverService.inc:424
+#: admin/systems/class_serverService.inc:435
 #, php-format
-msgid ""
-"Parsing PPD file %s failed - line too long. Trailing characters have been "
-"ignored"
+msgid "Could not get execute action %s on service %s."
 msgstr ""
 
-#: admin/systems/ppd/class_ppdManager.inc:395
-#, php-format
-msgid "Parsing PPD file %s failed - no information found."
+#: admin/systems/class_terminalGeneric.inc:31
+msgid "terminal"
+msgstr "Terminal"
+
+#: admin/systems/class_terminalGeneric.inc:43
+#: admin/systems/class_terminalGeneric.inc:48
+#: admin/systems/class_terminalGeneric.inc:49
+msgid "Terminal"
+msgstr "Terminal"
+
+#: admin/systems/class_terminalGeneric.inc:44
+msgid "Terminal information"
 msgstr ""
 
 #: admin/systems/class_systemImport.inc:72
@@ -942,83 +471,130 @@ msgstr ""
 msgid "Import"
 msgstr "Importar"
 
+#: admin/systems/class_systemImport.inc:169
+#: admin/systems/class_serverGeneric.inc:43
+#: admin/systems/class_serverGeneric.inc:48
+#: admin/systems/class_serverGeneric.inc:49
+msgid "Server"
+msgstr "servidor"
+
 #: admin/systems/class_systemImport.inc:169
 msgid "The server you wish to import hosts from"
 msgstr ""
 
-#: admin/systems/class_serverGeneric.inc:34
+#: admin/systems/class_serverGeneric.inc:31
 msgid "server"
 msgstr "servidor"
 
-#: admin/systems/class_serverGeneric.inc:47
+#: admin/systems/class_serverGeneric.inc:44
 msgid "Server information"
 msgstr ""
 
-#: admin/systems/class_componentGeneric.inc:37
+#: admin/systems/class_componentGeneric.inc:31
+msgid "Component"
+msgstr "Componente"
+
+#: admin/systems/class_componentGeneric.inc:32
 msgid "Component information"
 msgstr ""
 
-#: admin/systems/class_componentGeneric.inc:64
+#: admin/systems/class_componentGeneric.inc:36
+#: admin/systems/class_componentGeneric.inc:37
+msgid "Network device"
+msgstr "Dispositivo de rede"
+
+#: admin/systems/class_componentGeneric.inc:58
 msgid "The name of the component"
 msgstr ""
 
-#: admin/systems/class_componentGeneric.inc:68
+#: admin/systems/class_componentGeneric.inc:62
 msgid "A short description of the component"
 msgstr ""
 
+#: admin/systems/class_systemServers.inc:31
+#: admin/systems/class_systemServers.inc:53
+msgid "Servers"
+msgstr "Servidores"
+
+#: admin/systems/class_systemServers.inc:35
+msgid "The syslog server the system should be using"
+msgstr ""
+
+#: admin/systems/class_systemServers.inc:40
+msgid "NTP servers"
+msgstr "Servidores NTP"
+
+#: admin/systems/class_systemServers.inc:40
+msgid "The NTP servers for this system"
+msgstr ""
+
+#: admin/systems/class_systemServers.inc:54
+msgid "Servers this system is using"
+msgstr ""
+
+#: admin/systems/class_mobilePhoneGeneric.inc:32
 #: admin/systems/class_mobilePhoneGeneric.inc:37
+#: admin/systems/class_mobilePhoneGeneric.inc:38
+msgid "Mobile phone"
+msgstr ""
+
+#: admin/systems/class_mobilePhoneGeneric.inc:33
 msgid "Mobile phone information"
 msgstr ""
 
-#: admin/systems/class_mobilePhoneGeneric.inc:63
+#: admin/systems/class_mobilePhoneGeneric.inc:60
 msgid "The name of the mobile phone"
 msgstr ""
 
-#: admin/systems/class_mobilePhoneGeneric.inc:67
+#: admin/systems/class_mobilePhoneGeneric.inc:64
 msgid "A short description of the mobile phone"
 msgstr ""
 
-#: admin/systems/class_mobilePhoneGeneric.inc:77
+#: admin/systems/class_mobilePhoneGeneric.inc:70
+msgid "Phone"
+msgstr "Telefone"
+
+#: admin/systems/class_mobilePhoneGeneric.inc:73
 msgid "Serial Number"
 msgstr "NÃºmero de SÃ©rie"
 
-#: admin/systems/class_mobilePhoneGeneric.inc:77
+#: admin/systems/class_mobilePhoneGeneric.inc:73
 msgid "The serial number of the mobile phone"
 msgstr "NÃºmero de sÃ©rie do telefone celular"
 
-#: admin/systems/class_mobilePhoneGeneric.inc:81
+#: admin/systems/class_mobilePhoneGeneric.inc:77
 msgid "IMEI Number"
 msgstr "NÃºmero do IMEI"
 
-#: admin/systems/class_mobilePhoneGeneric.inc:81
+#: admin/systems/class_mobilePhoneGeneric.inc:77
 msgid "The IMEI number of the mobile phone"
 msgstr ""
 
-#: admin/systems/class_mobilePhoneGeneric.inc:86
+#: admin/systems/class_mobilePhoneGeneric.inc:82
 msgid "OS"
 msgstr ""
 
-#: admin/systems/class_mobilePhoneGeneric.inc:86
+#: admin/systems/class_mobilePhoneGeneric.inc:82
 msgid "The Operating System installed on this phone"
 msgstr "O sistema operacional instalado neste telefone"
 
-#: admin/systems/class_mobilePhoneGeneric.inc:92
+#: admin/systems/class_mobilePhoneGeneric.inc:88
 msgid "SimCard"
 msgstr ""
 
-#: admin/systems/class_mobilePhoneGeneric.inc:95
+#: admin/systems/class_mobilePhoneGeneric.inc:91
 msgid "Telephone Number"
 msgstr "NÃºmero de telefone"
 
-#: admin/systems/class_mobilePhoneGeneric.inc:95
+#: admin/systems/class_mobilePhoneGeneric.inc:91
 msgid "The telephone number of the mobile phone"
 msgstr ""
 
-#: admin/systems/class_mobilePhoneGeneric.inc:99
+#: admin/systems/class_mobilePhoneGeneric.inc:95
 msgid "PUK Number"
 msgstr ""
 
-#: admin/systems/class_mobilePhoneGeneric.inc:99
+#: admin/systems/class_mobilePhoneGeneric.inc:95
 msgid "The PUK number of the simcard in this mobile phone"
 msgstr ""
 
@@ -1061,70 +637,20 @@ msgstr "Editar serviÃ§o"
 msgid "Remove service"
 msgstr "Remover serviÃ§o"
 
-#: admin/systems/phoneSelect/phoneSelect-list.xml:10
-msgid "Please select the desired entries"
-msgstr "Por favor, selecione as entradas desejadas"
-
-#: admin/systems/phoneSelect/phoneSelect-list.xml:56
-msgid "Number"
-msgstr "NÃºmero"
-
-#: admin/systems/phoneSelect/phoneSelect-list.xml:83
-msgid "Select this number"
-msgstr ""
-
-#: admin/systems/class_systemManagement.inc:177
-msgid "Back"
-msgstr "Voltar"
-
-#: admin/systems/class_systemManagement.inc:223
-msgid "Creating the image failed. Please see the report below."
-msgstr "A criaÃ§Ã£o da imagem falhou. Por favor, veja o relatÃ³rio abaixo."
-
-#: admin/systems/class_systemManagement.inc:228
-#, php-format
-msgid "Command '%s', specified for ISO creation doesn't seem to exist."
-msgstr "Comando '%s', espeficado para criaÃ§Ã£o da ISO parece nÃ£o existir."
-
-#: admin/systems/class_systemManagement.inc:398
-#: admin/systems/class_systemManagement.inc:473
-#: admin/systems/class_systemManagement.inc:858
-#: admin/systems/class_systemManagement.inc:905
-#: admin/systems/class_systemManagement.inc:926
-msgid "Permission"
-msgstr "PermissÃ£o"
-
-#: admin/systems/class_systemManagement.inc:678
-msgid "Cannot set mode to 'active'!"
-msgstr "NÃ£o Ã© possÃvel definir o modo para 'ativado'!"
-
-#: admin/systems/class_systemManagement.inc:858
-#, php-format
-msgid "You are not allowed to create a snapshot for %s."
-msgstr "VocÃª nÃ£o tem permissÃµes para criar um snapshot para %s."
-
-#: admin/systems/class_systemManagement.inc:905
-#: admin/systems/class_systemManagement.inc:926
-#, php-format
-msgid "You are not allowed to restore a snapshot for %s."
-msgstr "VocÃª nÃ£o tem permissÃµes para restaurar um snapshot para %s."
-
-#: admin/systems/class_systemManagement.inc:1169
-#, php-format
-msgid "Inherited from %s"
-msgstr "HeranÃ§a de %s"
-
-#: admin/systems/class_systemManagement.inc:1224
-#: admin/systems/class_systemManagement.inc:1228
-#: addons/dashboard/class_dashBoardSystems.inc:199
+#: admin/systems/class_systemManagement.inc:48
 #: config/systems/class_systemsPluginConfig.inc:28
 msgid "Systems"
 msgstr "Sistemas"
 
-#: admin/systems/class_systemManagement.inc:1225
+#: admin/systems/class_systemManagement.inc:49
 msgid "Systems Management"
 msgstr "Gerenciamento de Sistemas"
 
+#: admin/systems/class_systemManagement.inc:250
+#, php-format
+msgid "Inherited from %s"
+msgstr "HeranÃ§a de %s"
+
 #: admin/systems/services/terminal/class_serviceTerminal.inc:29
 #: admin/systems/services/terminal/class_serviceTerminal.inc:30
 #: admin/systems/services/terminal/class_serviceTerminal.inc:41
@@ -1162,6 +688,10 @@ msgstr ""
 msgid "Empty service"
 msgstr ""
 
+#: admin/systems/services/class_goService.inc:241
+msgid "Configuration error"
+msgstr "Erro de configuraÃ§Ã£o"
+
 #: admin/systems/services/shares/class_serviceShare.inc:30
 #: admin/systems/services/shares/class_serviceShare.inc:31
 msgid "Share service"
@@ -1220,8 +750,6 @@ msgid "You need to configure encodings first"
 msgstr ""
 
 #: admin/systems/services/shares/class_serviceShare.inc:110
-#: admin/ogroups/goto/termgroup.tpl.c:2 admin/systems/remove.tpl.c:2
-#: admin/systems/ppd/remove_ppd.tpl.c:2
 msgid "Warning"
 msgstr "Aviso"
 
@@ -1347,153 +875,93 @@ msgstr ""
 msgid "LDAP"
 msgstr "LDAP"
 
-#: admin/systems/class_networkSettings.inc:305
+#: admin/systems/class_networkSettings.inc:297
 msgid "NOT IMPLEMENTED"
 msgstr "NÃƒO IMPLEMENTADO"
 
-#: admin/systems/class_networkSettings.inc:437
+#: admin/systems/class_networkSettings.inc:429
 msgid "Not matching"
 msgstr "NÃ£o corresponde"
 
-#: admin/systems/class_networkSettings.inc:584
+#: admin/systems/class_networkSettings.inc:576
 #, php-format
 msgid "Was not able to contact argonaut server: %s"
 msgstr ""
 
-#: admin/systems/class_networkSettings.inc:591
+#: admin/systems/class_networkSettings.inc:583
 #, php-format
 msgid "Was not able to find DNS server for zone %s"
 msgstr ""
 
-#: admin/systems/class_networkSettings.inc:597
+#: admin/systems/class_networkSettings.inc:589
 #, php-format
 msgid "Was not able to find mac address of DNS server %s"
 msgstr ""
 
-#: admin/systems/class_networkSettings.inc:604
+#: admin/systems/class_networkSettings.inc:596
 #, php-format
 msgid "Was not able to launch ldap2zone: %s"
 msgstr ""
 
-#: admin/systems/class_networkSettings.inc:630
+#: admin/systems/class_networkSettings.inc:622
 #, php-format
 msgid "IP address %s"
 msgstr "EndereÃ§o IP %s"
 
-#: admin/systems/class_networkSettings.inc:638
-#: admin/systems/class_networkSettings.inc:651
-#: admin/systems/class_networkSettings.inc:653
-#: admin/systems/class_networkSettings.inc:1022
-msgid "IP address"
-msgstr "EndereÃ§o IP"
-
-#: admin/systems/class_networkSettings.inc:644
-#: admin/systems/class_networkSettings.inc:660
-#: admin/systems/class_networkSettings.inc:662
-#: admin/systems/class_networkSettings.inc:1023
+#: admin/systems/class_networkSettings.inc:636
+#: admin/systems/class_networkSettings.inc:652
+#: admin/systems/class_networkSettings.inc:654
+#: admin/systems/class_networkSettings.inc:1015
 msgid "MAC address"
 msgstr "EndereÃ§o MAC"
 
-#: admin/systems/class_networkSettings.inc:676
+#: admin/systems/class_networkSettings.inc:668
 #, php-format
 msgid "The IP address '%s' is not part of the selected reverse zone '%s'!"
 msgstr "O endereÃ§o IP '%s' nÃ£o Ã© parte da zona reversa '%s' selecionada!"
 
-#: admin/systems/class_networkSettings.inc:686
+#: admin/systems/class_networkSettings.inc:678
 #, php-format
 msgid "Record type '%s' is duplicated!"
 msgstr "Tipo de registro '%s' estÃ¡ duplicado!"
 
-#: admin/systems/class_networkSettings.inc:693
+#: admin/systems/class_networkSettings.inc:685
 #, php-format
 msgid "Uniq record type '%s' is duplicated!"
 msgstr ""
 
-#: admin/systems/class_networkSettings.inc:705
+#: admin/systems/class_networkSettings.inc:697
 #, php-format
 msgid ""
 "The IP address '%s' will be added as 'A Record', this will be done "
 "automatically, please remove the record."
 msgstr ""
 
-#: admin/systems/class_networkSettings.inc:712
+#: admin/systems/class_networkSettings.inc:704
 #, php-format
 msgid "Only lowercase records are allowed, please check your '%ss'."
 msgstr "SÃ£o permitidos somente registros com letras minÃºsculas, por favor verifique sua '%ss'."
 
-#: admin/systems/class_networkSettings.inc:978
+#: admin/systems/class_networkSettings.inc:970
 msgid "Delete"
 msgstr "Deletar"
 
-#: admin/systems/class_networkSettings.inc:984
+#: admin/systems/class_networkSettings.inc:976
 msgid "Add"
 msgstr "Adicionar"
 
-#: admin/systems/class_networkSettings.inc:1015
-#: addons/dashboard/class_dashBoardNetwork.inc:127
+#: admin/systems/class_networkSettings.inc:1007
 msgid "Network"
 msgstr "Rede"
 
-#: admin/systems/class_networkSettings.inc:1030
+#: admin/systems/class_networkSettings.inc:1022
 msgid "DNS configuration"
 msgstr "ConfiguraÃ§Ã£o DNS"
 
-#: admin/systems/class_networkSettings.inc:1033
+#: admin/systems/class_networkSettings.inc:1025
 msgid "DHCP configuration"
 msgstr "ConfiguraÃ§Ã£o DHCP"
 
-#: addons/dashboard/class_dashBoardSystems.inc:45
-msgid "Workstations"
-msgstr "EstaÃ§Ãµes de trabalho"
-
-#: addons/dashboard/class_dashBoardSystems.inc:51
-msgid "Windows Workstations"
-msgstr "EstaÃ§Ãµes de trabalho Windows"
-
-#: addons/dashboard/class_dashBoardSystems.inc:54
-msgid "Terminals"
-msgstr "Terminais"
-
-#: addons/dashboard/class_dashBoardSystems.inc:57
-msgid "Printers"
-msgstr "Impressoas"
-
-#: addons/dashboard/class_dashBoardSystems.inc:60
-msgid "Phones"
-msgstr "Telefones"
-
-#: addons/dashboard/class_dashBoardSystems.inc:63
-msgid "Components"
-msgstr "Componentes"
-
-#: addons/dashboard/class_dashBoardSystems.inc:66
-msgid "Mobile phones"
-msgstr "Celulares"
-
-#: addons/dashboard/class_dashBoardSystems.inc:183
-msgid "Statistics"
-msgstr "EstatÃsticas"
-
-#: addons/dashboard/class_dashBoardSystems.inc:188
-msgid "Computer name to use by unit"
-msgstr ""
-
-#: addons/dashboard/class_dashBoardSystems.inc:200
-msgid "Statistics and informations about systems"
-msgstr "EstatÃsticas e informaÃ§Ãµes sobre sistemas"
-
-#: addons/dashboard/class_dashBoardNetwork.inc:111
-msgid "DHCP"
-msgstr "DHCP"
-
-#: addons/dashboard/class_dashBoardNetwork.inc:116
-msgid "DNS"
-msgstr "DNS"
-
-#: addons/dashboard/class_dashBoardNetwork.inc:128
-msgid "Statistics and various informations"
-msgstr "EstatÃsticas e informaÃ§Ãµes diversas"
-
 #: config/systems/class_systemsPluginConfig.inc:29
 msgid "Systems plugin configuration"
 msgstr ""
@@ -1585,404 +1053,3 @@ msgstr ""
 #: config/systems/class_systemsPluginConfig.inc:101
 msgid "Encodings"
 msgstr ""
-
-#: admin/ogroups/goto/termgroup.tpl.c:5
-msgid ""
-"Actions you choose here influence all systems in this object group. "
-"Additionally, all values editable here can be inherited by the clients "
-"assigned to this object group."
-msgstr ""
-
-#: admin/ogroups/goto/termgroup.tpl.c:8
-msgid "Generic"
-msgstr "GenÃ©rico"
-
-#: admin/ogroups/goto/termgroup.tpl.c:11
-msgid "NTP server"
-msgstr "Servidor NTP"
-
-#: admin/ogroups/goto/termgroup.tpl.c:14
-msgid "Choose server to use for synchronizing time"
-msgstr ""
-
-#: admin/ogroups/goto/termgroup.tpl.c:20
-msgid "Select terminal mode"
-msgstr "Selecione o modo terminal"
-
-#: admin/ogroups/goto/termgroup.tpl.c:26
-msgid "Choose server to use for logging"
-msgstr ""
-
-#: admin/ogroups/goto/termgroup.tpl.c:32
-msgid "Select NFS root filesystem to use"
-msgstr ""
-
-#: admin/ogroups/goto/termgroup.tpl.c:38
-msgid "Choose NFS filesystem to place swap files on"
-msgstr ""
-
-#: admin/ogroups/goto/termgroup.tpl.c:47
-msgid "Execute"
-msgstr "Executar"
-
-#: admin/systems/network.tpl.c:2
-msgid "Network  settings"
-msgstr ""
-
-#: admin/systems/network.tpl.c:5
-msgid "IP-address"
-msgstr "EndereÃ§o-IP"
-
-#: admin/systems/network.tpl.c:8 admin/systems/network.tpl.c:11
-msgid "Propose ip"
-msgstr "Propor ip"
-
-#: admin/systems/network.tpl.c:14
-msgid "MAC-address"
-msgstr "EndereÃ§o-MAC"
-
-#: admin/systems/network.tpl.c:17
-msgid "Autodetect"
-msgstr "Auto detectar"
-
-#: admin/systems/network.tpl.c:20 admin/systems/network.tpl.c:23
-msgid "Enable DHCP for this device"
-msgstr ""
-
-#: admin/systems/network.tpl.c:26 admin/systems/network.tpl.c:50
-msgid "not configured"
-msgstr "nÃ£o configurado"
-
-#: admin/systems/network.tpl.c:29
-msgid "Parent node"
-msgstr "NÃ³ pai"
-
-#: admin/systems/network.tpl.c:32
-msgid "Edit settings"
-msgstr "Editar configuraÃ§Ãµes"
-
-#: admin/systems/network.tpl.c:35 admin/systems/network.tpl.c:47
-msgid "Enable DNS for this device"
-msgstr "Autorizar DNS para este dispositivo"
-
-#: admin/systems/network.tpl.c:38
-msgid "Zone"
-msgstr "Zona"
-
-#: admin/systems/network.tpl.c:41
-msgid "TTL"
-msgstr "TTL"
-
-#: admin/systems/network.tpl.c:44
-msgid "Dns records"
-msgstr "Registros de Dns"
-
-#: admin/systems/password.tpl.c:2
-msgid ""
-"To change the terminal root password use the fields below. The changes take "
-"effect during the next reboot. Please memorize the new password, because you"
-" wouldn't be able to log in."
-msgstr ""
-
-#: admin/systems/password.tpl.c:5
-msgid "Leave fields blank for password inheritance from default entries."
-msgstr "Deixe os campos em branco para heranÃ§a de senhas das entradas padrÃ£o."
-
-#: admin/systems/password.tpl.c:8
-msgid "Changing the password impinges on authentification only."
-msgstr ""
-
-#: admin/systems/password.tpl.c:11
-msgid "New password"
-msgstr "Nova senha"
-
-#: admin/systems/password.tpl.c:14
-msgid "Repeat new password"
-msgstr "Repita a nova senha"
-
-#: admin/systems/password.tpl.c:17
-msgid "Password strength"
-msgstr "Grau de seguranÃ§a da senha"
-
-#: admin/systems/password.tpl.c:20
-msgid "Set password"
-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/gencd.tpl.c:2
-msgid "CD-Install-Image generation"
-msgstr ""
-
-#: admin/systems/gencd.tpl.c:5
-msgid ""
-"This option enables you to generate FAI install CD images for the selected "
-"workstation. The procedure may take about 10 minutes to complete, so please "
-"be patient after pressing the 'Create ISO-Image' button."
-msgstr ""
-
-#: admin/systems/gencd.tpl.c:8
-msgid "Create ISO-Image"
-msgstr "Criar imagem ISO"
-
-#: admin/systems/remove.tpl.c:5
-msgid ""
-"This includes all account data, system access rules, imap settings, etc. for"
-" this user. Please double check if your really want to do this since there "
-"is no way for FusionDirectory to get your data back."
-msgstr "Isto inclui todos os dados da conta, regras de acesso ao sistema, configuraÃ§Ãµes do imap, etc. para este usuÃ¡rio. Por favor, tenha certeza que vocÃª quer fazer isso porque nÃ£o tem como recuperar seus dados do FusionDirectory de volta."
-
-#: admin/systems/remove.tpl.c:8
-msgid "So - if you're sure - press 'Delete' to continue or 'Cancel' to abort."
-msgstr "Se vocÃª tem certeza, pressione 'Delete' para continuar ou 'Cancel' para desistir."
-
-#: admin/systems/system-filter.tpl.c:2
-#: admin/systems/phoneSelect/phoneSelect-filter.tpl.c:2
-msgid "Filter"
-msgstr "Filtro"
-
-#: admin/systems/system-filter.tpl.c:5
-msgid "Show servers"
-msgstr "Exibir servidores"
-
-#: admin/systems/system-filter.tpl.c:8
-msgid "Show workstations"
-msgstr "Exibir estaÃ§Ãµes de trabalho"
-
-#: admin/systems/system-filter.tpl.c:11
-msgid "Show terminals"
-msgstr "Exibir terminais"
-
-#: admin/systems/system-filter.tpl.c:14
-msgid "Show network printer"
-msgstr "Exibir impressoras de rede"
-
-#: admin/systems/system-filter.tpl.c:17
-#: admin/systems/phoneSelect/phoneSelect-filter.tpl.c:5
-msgid "Show phones"
-msgstr "Exibir telefones"
-
-#: admin/systems/system-filter.tpl.c:20
-msgid "Show windows based workstations"
-msgstr ""
-
-#: admin/systems/system-filter.tpl.c:23
-msgid "Show network devices"
-msgstr "Exibir dispositivos de rede"
-
-#: admin/systems/system-filter.tpl.c:26
-#: admin/systems/phoneSelect/phoneSelect-filter.tpl.c:8
-msgid "Show mobile phones"
-msgstr ""
-
-#: admin/systems/system-filter.tpl.c:29
-msgid "Show IPMI interfaces"
-msgstr ""
-
-#: admin/systems/ppd/printerPPDSelectionDialog.tpl.c:2
-msgid "Select objects to add"
-msgstr "Selecione objetos para adicionar"
-
-#: admin/systems/ppd/printerPPDSelectionDialog.tpl.c:5
-msgid "Filters"
-msgstr "Filtros"
-
-#: admin/systems/ppd/printerPPDSelectionDialog.tpl.c:8
-msgid "Display objects matching"
-msgstr ""
-
-#: admin/systems/ppd/printerPPDSelectionDialog.tpl.c:11
-msgid "Regular expression for matching object names"
-msgstr ""
-
-#: admin/systems/ppd/printerPPDSelectionDialog.tpl.c:14
-msgid "Close"
-msgstr "Fechar"
-
-#: admin/systems/ppd/printerPPDDialog.tpl.c:2
-msgid "Printer driver"
-msgstr "Driver de impressora"
-
-#: admin/systems/ppd/printerPPDDialog.tpl.c:5
-msgid "Model"
-msgstr "Modelo"
-
-#: admin/systems/ppd/printerPPDDialog.tpl.c:8
-msgid "Select"
-msgstr "Selecionar"
-
-#: admin/systems/ppd/printerPPDDialog.tpl.c:11
-msgid "New driver"
-msgstr "Novo driver"
-
-#: admin/systems/ppd/printerPPDDialog.tpl.c:14
-msgid "Upload"
-msgstr "Upload"
-
-#: admin/systems/ppd/printerPPDDialog.tpl.c:17
-msgid "Options"
-msgstr "OpÃ§Ãµes"
-
-#: admin/systems/ppd/remove_ppd.tpl.c:5
-msgid "The ppd file will be removed from the server and can not be restored."
-msgstr ""
-
-#: admin/systems/printer.tpl.c:2
-msgid "General"
-msgstr "Geral"
-
-#: admin/systems/printer.tpl.c:5
-msgid "Printer name"
-msgstr "Nome da impressora"
-
-#: admin/systems/printer.tpl.c:14
-msgid "Details"
-msgstr "Detalhes"
-
-#: admin/systems/printer.tpl.c:20
-msgid "Printer location"
-msgstr "LocalizaÃ§Ã£o da impressora"
-
-#: admin/systems/printer.tpl.c:26
-msgid "PPD Provider"
-msgstr ""
-
-#: admin/systems/printer.tpl.c:29
-msgid "Driver"
-msgstr "Driver"
-
-#: admin/systems/printer.tpl.c:32
-msgid "Edit"
-msgstr "Editar"
-
-#: admin/systems/printer.tpl.c:41
-msgid "Users which are allowed to use this printer"
-msgstr ""
-
-#: admin/systems/printer.tpl.c:44
-msgid "Users"
-msgstr "UsuÃ¡rios"
-
-#: admin/systems/printer.tpl.c:47
-msgid "Users which are allowed to administrate this printer"
-msgstr "UsuÃ¡rios que estÃ£o autorizados a administrar esta impressora"
-
-#: admin/systems/printer.tpl.c:50
-msgid "Admins"
-msgstr "Administradores"
-
-#: admin/systems/printer.tpl.c:53
-msgid "Windows paths"
-msgstr ""
-
-#: admin/systems/printer.tpl.c:56
-msgid "Printer windows inf file"
-msgstr ""
-
-#: admin/systems/printer.tpl.c:59
-msgid "Printer driver directory"
-msgstr ""
-
-#: admin/systems/gencd_frame.tpl.c:2
-msgid "Your browser does not supprt iframes."
-msgstr ""
-
-#: admin/systems/services/cups/serviceCUPS.tpl.c:2
-msgid "Print Service"
-msgstr "ServiÃ§o de Impressora"
-
-#: admin/systems/services/cups/serviceCUPS.tpl.c:5
-msgid "enabled"
-msgstr "ativado"
-
-#: admin/systems/services/ServiceAddDialog.tpl.c:2
-msgid "Adding a new service to the current server"
-msgstr "Adicionando um novo serviÃ§o para o servidor atual"
-
-#: admin/systems/services/ServiceAddDialog.tpl.c:5
-msgid ""
-"This dialog allows you to add new services to the currenty edited server "
-"object. The box below shows all available but not already used services."
-msgstr ""
-
-#: admin/systems/services/ServiceAddDialog.tpl.c:8
-msgid "Service to add"
-msgstr "ServiÃ§o a ser adicionado"
-
-#: admin/systems/services/ServiceAddDialog.tpl.c:11
-msgid "All available services are already in use."
-msgstr ""
-
-#: admin/systems/services/ServiceAddDialog.tpl.c:14
-#: admin/systems/SelectDeviceType.tpl.c:26
-msgid "Continue"
-msgstr "Continuar"
-
-#: admin/systems/SelectDeviceType.tpl.c:2
-msgid ""
-"This system has no system type configured. Please choose a system type for "
-"this object and an optional inheritance group. Press the 'continue' button "
-"to proceed."
-msgstr ""
-
-#: admin/systems/SelectDeviceType.tpl.c:5
-msgid ""
-"Please select a system type and an optional bundle of predefined settings to"
-" be inherited."
-msgstr ""
-
-#: admin/systems/SelectDeviceType.tpl.c:8
-msgid ""
-"Please select a system type and a bundle of predefined settings to be "
-"inherited."
-msgstr ""
-
-#: admin/systems/SelectDeviceType.tpl.c:11
-#: admin/systems/SelectDeviceType.tpl.c:14
-msgid "System type"
-msgstr "Tipo de sistema"
-
-#: admin/systems/SelectDeviceType.tpl.c:17
-msgid "Choose an object group as template"
-msgstr ""
-
-#: admin/systems/SelectDeviceType.tpl.c:20
-msgid "Object group"
-msgstr "Grupo de objeto"
-
-#: admin/systems/SelectDeviceType.tpl.c:23
-msgid "none"
-msgstr "nenhum"
-
-#: addons/dashboard/systems_stats.tpl.c:2
-msgid "There are several argonaut servers! (this is not yet supported)"
-msgstr ""
-
-#: addons/dashboard/systems_stats.tpl.c:5
-msgid "There is an argonaut server running on %1 (%3://%2:%4)"
-msgstr ""
-
-#: addons/dashboard/systems_stats.tpl.c:8
-msgid "Only one system is configured to run an argonaut client."
-msgid_plural "%1 systems are configured to run an argonaut client."
-msgstr[0] ""
-msgstr[1] ""
-
-#: addons/dashboard/systems_stats.tpl.c:11
-msgid "But no system is configured to run an argonaut client!"
-msgstr ""
-
-#: addons/dashboard/systems_stats.tpl.c:14
-msgid ""
-"A system is configured to run an argonaut client, but there is no argonaut "
-"server configured!"
-msgid_plural ""
-"%1 systems are configured to run an argonaut client, but there is no "
-"argonaut server configured!"
-msgstr[0] ""
-msgstr[1] ""
diff --git a/systems/locale/ru/fusiondirectory.po b/systems/locale/ru/fusiondirectory.po
index 8d92c001ab0b66c3a98a7cf5d3669a42f4ed9268..209bd6974a3dd127b3ee4a55d4973d9a71b3a697 100644
--- a/systems/locale/ru/fusiondirectory.po
+++ b/systems/locale/ru/fusiondirectory.po
@@ -3,22 +3,19 @@
 # This file is distributed under the same license as the PACKAGE package.
 # 
 # Translators:
-# Alexey, 2015
-# Alexey, 2015
-#  Valia V. Vaneeva <fattie@altlinux.ru>, 2004
 msgid ""
 msgstr ""
-"Project-Id-Version: FusionDirectory-108\n"
+"Project-Id-Version: FusionDirectory-109\n"
 "Report-Msgid-Bugs-To: documentation@lists.fusiondirectory.org\n"
-"POT-Creation-Date: 2015-03-31 11:49+0200\n"
-"PO-Revision-Date: 2015-03-31 11:41+0000\n"
+"POT-Creation-Date: 2014-12-15 17:47+0100\n"
+"PO-Revision-Date: 2015-04-18 18:07+0000\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>\n"
-"Language-Team: Russian (http://www.transifex.com/projects/p/FusionDirectory-108/language/ru/)\n"
+"Language-Team: Russian (http://www.transifex.com/projects/p/FusionDirectory-109/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=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);\n"
+"Plural-Forms: nplurals=4; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%10<=4 && (n%100<12 || n%100>14) ? 1 : n%10==0 || (n%10>=5 && n%10<=9) || (n%100>=11 && n%100<=14)? 2 : 3);\n"
 
 #: admin/ogroups/goto/class_termgroup.inc:70
 msgid "Activated"
@@ -29,29 +26,24 @@ msgid "Locked"
 msgstr ""
 
 #: admin/ogroups/goto/class_termgroup.inc:118
-#: admin/systems/class_terminalGeneric.inc:121
+#: admin/systems/class_terminalStartup.inc:145
 msgid "Local swap"
 msgstr ""
 
 #: admin/ogroups/goto/class_termgroup.inc:124
 #: admin/ogroups/goto/class_termgroup.inc:136
-#: admin/systems/class_workstationGeneric.inc:352
-#: admin/systems/class_terminalGeneric.inc:109
-#: admin/systems/class_terminalGeneric.inc:125
+#: admin/systems/class_terminalStartup.inc:133
+#: admin/systems/class_terminalStartup.inc:149
 msgid "inherited"
 msgstr ""
 
 #: admin/ogroups/goto/class_termgroup.inc:220
-#: admin/systems/class_workstationGeneric.inc:72
-#: admin/systems/class_workstationGeneric.inc:443
-#: admin/systems/class_systemManagement.inc:295
-#: admin/systems/class_systemManagement.inc:325
-msgid "Infrastructure service"
+#: admin/systems/class_systemManagement.inc:165
+#: admin/systems/class_systemManagement.inc:186
+msgid "Service infrastructure"
 msgstr ""
 
 #: admin/ogroups/goto/class_termgroup.inc:224
-#: admin/systems/class_workstationGeneric.inc:75
-#: admin/systems/class_workstationGeneric.inc:78
 msgid "Event error"
 msgstr ""
 
@@ -61,12 +53,10 @@ msgid "Event '%s' is not available!"
 msgstr ""
 
 #: admin/ogroups/goto/class_termgroup.inc:274
-#: admin/systems/class_workstationGeneric.inc:112
 msgid "Switch off"
 msgstr "Ð’Ñ‹ÐºÐ»ÑŽÑ‡Ð¸Ñ‚ÑŒ"
 
 #: admin/ogroups/goto/class_termgroup.inc:274
-#: admin/systems/class_workstationGeneric.inc:113
 msgid "Reboot"
 msgstr "ÐŸÐµÑ€ÐµÐ·Ð°Ð³Ñ€ÑƒÐ·Ð¸Ñ‚ÑŒ"
 
@@ -84,10 +74,9 @@ msgstr ""
 
 #: admin/ogroups/goto/class_termgroup.inc:278
 msgid "Reinstall"
-msgstr ""
+msgstr "ÐŸÐµÑ€ÐµÑƒÑÑ‚Ð°Ð½Ð¾Ð²Ð¸Ñ‚ÑŒ"
 
 #: admin/ogroups/goto/class_termgroup.inc:279
-#: admin/systems/class_workstationGeneric.inc:108
 msgid "Memory test"
 msgstr "ÐŸÑ€Ð¾Ð²ÐµÑ€ÐºÐ° Ð¿Ð°Ð¼ÑÑ‚Ð¸"
 
@@ -96,21 +85,18 @@ msgid "System analysis"
 msgstr ""
 
 #: admin/ogroups/goto/class_termgroup.inc:386
-#: admin/systems/class_printGeneric.inc:670
-#: admin/systems/class_printGeneric.inc:970
-#: admin/systems/class_systemManagement.inc:816
 #: admin/systems/services/class_goService.inc:123
 #: admin/systems/services/class_goService.inc:151
 #: admin/systems/services/class_goService.inc:187
-#: admin/systems/class_networkSettings.inc:478
-#: admin/systems/class_networkSettings.inc:491
-#: admin/systems/class_networkSettings.inc:757
-#: admin/systems/class_networkSettings.inc:816
-#: admin/systems/class_networkSettings.inc:835
-#: admin/systems/class_networkSettings.inc:852
-#: admin/systems/class_networkSettings.inc:861
-#: admin/systems/class_networkSettings.inc:879
-#: admin/systems/class_networkSettings.inc:951
+#: admin/systems/class_networkSettings.inc:470
+#: admin/systems/class_networkSettings.inc:483
+#: admin/systems/class_networkSettings.inc:749
+#: admin/systems/class_networkSettings.inc:808
+#: admin/systems/class_networkSettings.inc:827
+#: admin/systems/class_networkSettings.inc:844
+#: admin/systems/class_networkSettings.inc:853
+#: admin/systems/class_networkSettings.inc:871
+#: admin/systems/class_networkSettings.inc:943
 msgid "LDAP error"
 msgstr "ÐžÑˆÐ¸Ð±ÐºÐ° LDAP"
 
@@ -122,195 +108,125 @@ msgstr ""
 msgid "System group"
 msgstr ""
 
-#: admin/ogroups/goto/class_termgroup.inc:401
-#: admin/ogroups/goto/termgroup.tpl.c:17
+#: admin/ogroups/goto/class_termgroup.inc:402
 msgid "Mode"
 msgstr "Ð ÐµÐ¶Ð¸Ð¼"
 
-#: admin/ogroups/goto/class_termgroup.inc:402
-#: admin/systems/class_workstationGeneric.inc:189
-#: admin/ogroups/goto/termgroup.tpl.c:23
+#: admin/ogroups/goto/class_termgroup.inc:403
+#: admin/systems/class_systemServers.inc:35
 msgid "Syslog server"
 msgstr "Ð¡ÐµÑ€Ð²ÐµÑ€ ÑÐ¸ÑÑ‚ÐµÐ¼Ð½Ñ‹Ñ… Ð¶ÑƒÑ€Ð½Ð°Ð»Ð¾Ð²"
 
-#: admin/ogroups/goto/class_termgroup.inc:403
+#: admin/ogroups/goto/class_termgroup.inc:404
 msgid "Action flag"
 msgstr ""
 
-#: admin/ogroups/goto/class_termgroup.inc:404
+#: admin/ogroups/goto/class_termgroup.inc:405
 msgid "Ntp server"
 msgstr "Ð¡ÐµÑ€Ð²ÐµÑ€ NTP"
 
-#: admin/ogroups/goto/class_termgroup.inc:405
-#: admin/systems/class_terminalGeneric.inc:41
-#: admin/ogroups/goto/termgroup.tpl.c:29
+#: admin/ogroups/goto/class_termgroup.inc:406
+#: admin/systems/class_terminalStartup.inc:65
 msgid "Root server"
 msgstr "ÐžÑÐ½Ð¾Ð²Ð½Ð¾Ð¹ ÑÐµÑ€Ð²ÐµÑ€"
 
-#: admin/ogroups/goto/class_termgroup.inc:406
-#: admin/systems/class_terminalGeneric.inc:47
-#: admin/ogroups/goto/termgroup.tpl.c:35
+#: admin/ogroups/goto/class_termgroup.inc:407
+#: admin/systems/class_terminalStartup.inc:69
 msgid "Swap server"
 msgstr "Ð¡ÐµÑ€Ð²ÐµÑ€ Ð¿Ð¾Ð´ÐºÐ°Ñ‡ÐºÐ¸"
 
-#: admin/systems/class_terminalStartup.inc:63
+#: admin/systems/class_terminalStartup.inc:62
 msgid "Startup parameters"
+msgstr "ÐŸÐ°Ñ€Ð°Ð¼ÐµÑ‚Ñ€Ñ‹ Ð·Ð°Ð¿ÑƒÑÐºÐ°"
+
+#: admin/systems/class_terminalStartup.inc:65
+msgid "The root server the terminal should be using"
+msgstr ""
+
+#: admin/systems/class_terminalStartup.inc:69
+msgid "The swap server the terminal should be using"
 msgstr ""
 
-#: admin/systems/class_terminalStartup.inc:66
+#: admin/systems/class_terminalStartup.inc:73
 msgid "Boot kernel"
 msgstr "Ð¯Ð´Ñ€Ð¾ Ð´Ð»Ñ Ð·Ð°Ð³Ñ€ÑƒÐ·ÐºÐ¸"
 
-#: admin/systems/class_terminalStartup.inc:66
+#: admin/systems/class_terminalStartup.inc:73
 msgid "Linux kernel to be installed and booted"
-msgstr ""
+msgstr "Linux ÑÐ´Ñ€Ð¾, ÐºÐ¾Ñ‚Ð¾Ñ€Ð¾Ðµ ÑƒÑÑ‚Ð°Ð½Ð¾Ð²Ð»ÐµÐ½Ð¾ Ð¸ Ð·Ð°Ð³Ñ€ÑƒÐ¶ÐµÐ½Ð¾"
 
-#: admin/systems/class_terminalStartup.inc:70
+#: admin/systems/class_terminalStartup.inc:77
 msgid "Boot kernel parameters"
-msgstr ""
+msgstr "ÐŸÐ°Ñ€Ð°Ð¼ÐµÑ‚Ñ€Ñ‹ Ð·Ð°Ð³Ñ€ÑƒÐ·ÐºÐ¸ ÑÐ´Ñ€Ð°"
 
-#: admin/systems/class_terminalStartup.inc:70
+#: admin/systems/class_terminalStartup.inc:77
 msgid "Linux kernel parameters to be ran"
-msgstr ""
-
-#: admin/systems/class_terminalStartup.inc:82
-msgid "Startup"
-msgstr "Ð—Ð°Ð¿ÑƒÑÐº"
+msgstr "ÐŸÐ°Ñ€Ð°Ð¼ÐµÑ‚Ñ€Ñ‹ Ñ ÐºÐ¾Ñ‚Ð¾Ñ€Ñ‹Ð¼Ð¸ Linux ÑÐ´Ñ€Ð¾ Ð±Ñ‹Ð»Ð¾ Ð·Ð°Ð¿ÑƒÑ‰ÐµÐ½Ð¾"
 
 #: admin/systems/class_terminalStartup.inc:83
-msgid "Terminal startup"
-msgstr ""
-
-#: admin/systems/system-list.xml:10
-msgid "List of systems"
-msgstr "Ð¡Ð¿Ð¸ÑÐ¾Ðº ÑÐ¸ÑÑ‚ÐµÐ¼"
-
-#: admin/systems/system-list.xml:14
-msgid "New workstation"
-msgstr "ÐÐ¾Ð²Ð°Ñ Ñ€Ð°Ð±Ð¾Ñ‡Ð°Ñ ÑÑ‚Ð°Ð½Ñ†Ð¸Ñ"
-
-#: admin/systems/system-list.xml:22
-msgid "Locked server"
-msgstr ""
-
-#: admin/systems/system-list.xml:30
-msgid "Locked workstation"
-msgstr ""
-
-#: admin/systems/system-list.xml:38
-msgid "Locked terminal"
-msgstr ""
-
-#: admin/systems/system-list.xml:47
-msgid "New terminal"
-msgstr "Ð¡Ð¾Ð·Ð´Ð°Ñ‚ÑŒ Ñ‚ÐµÑ€Ð¼Ð¸Ð½Ð°Ð»"
-
-#: admin/systems/system-list.xml:55
-msgid "New device"
-msgstr ""
-
-#: admin/systems/system-list.xml:63
-msgid "Workstation template"
-msgstr "Ð¨Ð°Ð±Ð»Ð¾Ð½ Ñ€Ð°Ð±Ð¾Ñ‡ÐµÐ¹ ÑÑ‚Ð°Ð½Ñ†Ð¸Ð¸"
-
-#: admin/systems/system-list.xml:71
-msgid "Terminal template"
-msgstr "Ð¨Ð°Ð±Ð»Ð¾Ð½ Ñ‚ÐµÑ€Ð¼Ð¸Ð½Ð°Ð»Ð°"
-
-#: admin/systems/system-list.xml:79
-msgid "Winstation"
-msgstr ""
+msgid "Remote desktop"
+msgstr "Ð£Ð´Ð°Ð»ÐµÐ½Ð½Ð°Ñ Ñ€Ð°Ð±Ð¾Ñ‡Ð°Ñ ÑÑ‚Ð°Ð½Ñ†Ð¸Ñ"
 
-#: admin/systems/system-list.xml:87 admin/systems/system-list.xml:234
-#: admin/systems/class_systemImport.inc:169
-#: admin/systems/class_serverGeneric.inc:46
-#: admin/systems/class_serverGeneric.inc:51
-#: admin/systems/class_serverGeneric.inc:52
-#: admin/systems/class_SelectDeviceType.inc:58
-msgid "Server"
-msgstr "Ð¡ÐµÑ€Ð²ÐµÑ€"
+#: admin/systems/class_terminalStartup.inc:87
+msgid "Connect method"
+msgstr "Ð¡Ð¿Ð¾ÑÐ¾Ð± Ð¿Ð¾Ð´ÐºÐ»ÑŽÑ‡ÐµÐ½Ð¸Ñ"
 
-#: admin/systems/system-list.xml:95 admin/systems/system-list.xml:242
-#: admin/systems/class_workstationGeneric.inc:458
-#: admin/systems/class_workstationGeneric.inc:463
-#: admin/systems/class_workstationGeneric.inc:464
-#: admin/systems/class_SelectDeviceType.inc:58
-msgid "Workstation"
-msgstr "Ð Ð°Ð±Ð¾Ñ‡Ð°Ñ ÑÑ‚Ð°Ð½Ñ†Ð¸Ñ"
+#: admin/systems/class_terminalStartup.inc:91
+msgid "XDMCP"
+msgstr "XDMCP"
 
-#: admin/systems/system-list.xml:103 admin/systems/system-list.xml:250
-#: admin/systems/class_terminalGeneric.inc:81
-#: admin/systems/class_terminalGeneric.inc:86
-#: admin/systems/class_terminalGeneric.inc:87
-#: admin/systems/class_SelectDeviceType.inc:58
-msgid "Terminal"
-msgstr ""
+#: admin/systems/class_terminalStartup.inc:91
+msgid "LDM"
+msgstr "LDM"
 
-#: admin/systems/system-list.xml:111 admin/systems/class_printGeneric.inc:1005
-#: admin/systems/class_printGeneric.inc:1011
-#: admin/systems/class_printGeneric.inc:1012
-msgid "Printer"
-msgstr "ÐŸÑ€Ð¸Ð½Ñ‚ÐµÑ€"
+#: admin/systems/class_terminalStartup.inc:91
+msgid "Shell"
+msgstr "ÐžÐ±Ð¾Ð»Ð¾Ñ‡ÐºÐ°"
 
-#: admin/systems/system-list.xml:119 admin/systems/system-list.xml:274
-#: admin/systems/class_mobilePhoneGeneric.inc:74
-#: admin/systems/phoneSelect/phoneSelect-list.xml:14
-msgid "Phone"
-msgstr "Ð¢ÐµÐ»ÐµÑ„Ð¾Ð½"
+#: admin/systems/class_terminalStartup.inc:91
+msgid "Telnet"
+msgstr "Telnet"
 
-#: admin/systems/system-list.xml:127
-#: admin/systems/class_mobilePhoneGeneric.inc:36
-#: admin/systems/class_mobilePhoneGeneric.inc:41
-#: admin/systems/class_mobilePhoneGeneric.inc:42
-#: admin/systems/phoneSelect/phoneSelect-list.xml:22
-msgid "Mobile phone"
-msgstr ""
+#: admin/systems/class_terminalStartup.inc:91
+msgid "Windows RDP"
+msgstr "Windows RDP"
 
-#: admin/systems/system-list.xml:135
-#: admin/systems/class_componentGeneric.inc:36
-msgid "Component"
-msgstr ""
+#: admin/systems/class_terminalStartup.inc:95
+msgid "Terminal server"
+msgstr "Ð¢ÐµÑ€Ð¼Ð¸Ð½Ð°Ð»-ÑÐµÑ€Ð²ÐµÑ€"
 
-#: admin/systems/system-list.xml:143 admin/systems/system-list.xml:298
-msgid "IPMI"
-msgstr "IPMI"
+#: admin/systems/system-list.xml:10
+msgid "List of systems"
+msgstr "Ð¡Ð¿Ð¸ÑÐ¾Ðº ÑÐ¸ÑÑ‚ÐµÐ¼"
 
-#: admin/systems/system-list.xml:169
-#: admin/systems/class_workstationGeneric.inc:154
-#: admin/systems/class_printGeneric.inc:752
-#: admin/systems/class_printGeneric.inc:762
-#: admin/systems/class_printGeneric.inc:781
-#: admin/systems/class_printGeneric.inc:1022
-#: admin/systems/class_componentGeneric.inc:64
-#: admin/systems/class_mobilePhoneGeneric.inc:63
-#: admin/systems/phoneSelect/phoneSelect-list.xml:48
+#: admin/systems/system-list.xml:31
+#: admin/systems/class_workstationGeneric.inc:46
+#: admin/systems/class_printGeneric.inc:60
+#: admin/systems/class_componentGeneric.inc:58
+#: admin/systems/class_mobilePhoneGeneric.inc:60
 #: admin/systems/services/shares/class_serviceShare.inc:52
-#: admin/systems/system-filter.tpl.c:32
-#: admin/systems/phoneSelect/phoneSelect-filter.tpl.c:11
 msgid "Name"
 msgstr "Ð¤Ð°Ð¼Ð¸Ð»Ð¸Ñ"
 
-#: admin/systems/system-list.xml:177
-#: admin/systems/phoneSelect/phoneSelect-list.xml:63
+#: admin/systems/system-list.xml:39
 msgid "IP"
 msgstr "IP"
 
-#: admin/systems/system-list.xml:185
+#: admin/systems/system-list.xml:47
 msgid "MAC"
 msgstr "MAC"
 
-#: admin/systems/system-list.xml:193
-#: admin/systems/class_workstationGeneric.inc:160
-#: admin/systems/class_printGeneric.inc:1024
-#: admin/systems/class_componentGeneric.inc:68
-#: admin/systems/class_mobilePhoneGeneric.inc:67
+#: admin/systems/system-list.xml:55
+#: admin/systems/class_workstationGeneric.inc:51
+#: admin/systems/class_printGeneric.inc:64
+#: admin/systems/class_componentGeneric.inc:62
+#: admin/systems/class_mobilePhoneGeneric.inc:64
 #: admin/systems/serverService-list.xml:35
 #: admin/systems/services/shares/class_serviceShare.inc:56
-#: admin/systems/printer.tpl.c:8 admin/systems/printer.tpl.c:17
 msgid "Description"
 msgstr "ÐžÐ¿Ð¸ÑÐ°Ð½Ð¸Ðµ"
 
-#: admin/systems/system-list.xml:201 admin/systems/class_serverService.inc:57
+#: admin/systems/system-list.xml:63 admin/systems/class_serverService.inc:57
 #: admin/systems/services/terminal/class_serviceTerminal.inc:30
 #: admin/systems/services/cups/class_serviceCUPS.inc:85
 #: admin/systems/services/shares/class_serviceShare.inc:31
@@ -319,378 +235,186 @@ msgstr "ÐžÐ¿Ð¸ÑÐ°Ð½Ð¸Ðµ"
 msgid "Services"
 msgstr "Ð¡ÐµÑ€Ð²Ð¸ÑÑ‹"
 
-#: admin/systems/system-list.xml:209
+#: admin/systems/system-list.xml:71
 msgid "Release"
 msgstr ""
 
-#: admin/systems/system-list.xml:217 admin/systems/serverService-list.xml:43
-#: admin/systems/phoneSelect/phoneSelect-list.xml:70
+#: admin/systems/system-list.xml:79 admin/systems/serverService-list.xml:43
 msgid "Actions"
 msgstr "Ð”ÐµÐ¹ÑÑ‚Ð²Ð¸Ñ"
 
-#: admin/systems/system-list.xml:228 admin/systems/serverService-list.xml:54
+#: admin/systems/system-list.xml:90 admin/systems/serverService-list.xml:54
 msgid "Create"
 msgstr "Ð¡Ð¾Ð·Ð´Ð°Ñ‚ÑŒ"
 
-#: admin/systems/system-list.xml:258
-msgid "winStation"
-msgstr ""
-
-#: admin/systems/system-list.xml:266
-msgid "Network printer"
-msgstr "Ð¡ÐµÑ‚ÐµÐ²Ð¾Ð¹ Ð¿Ñ€Ð¸Ð½Ñ‚ÐµÑ€"
-
-#: admin/systems/system-list.xml:282
-#: admin/systems/class_componentGeneric.inc:41
-#: admin/systems/class_componentGeneric.inc:42
-msgid "Network device"
-msgstr "Ð¡ÐµÑ‚ÐµÐ²Ð¾Ðµ ÑƒÑÑ‚Ñ€Ð¾Ð¹ÑÑ‚Ð²Ð¾"
-
-#: admin/systems/system-list.xml:290
-msgid "Mobile Phone"
-msgstr ""
-
-#: admin/systems/system-list.xml:310
+#: admin/systems/system-list.xml:100
 msgid "Trigger action"
 msgstr ""
 
-#: admin/systems/system-list.xml:317
+#: admin/systems/system-list.xml:107
 msgid "Schedule action"
 msgstr ""
 
-#: admin/systems/system-list.xml:330
-msgid "Activate systems"
-msgstr ""
-
-#: admin/systems/system-list.xml:337 admin/systems/serverService-list.xml:69
-#: admin/systems/printer.tpl.c:35
+#: admin/systems/system-list.xml:119 admin/systems/serverService-list.xml:69
 msgid "Remove"
 msgstr "Ð£Ð´Ð°Ð»Ð¸Ñ‚ÑŒ"
 
-#: admin/systems/system-list.xml:367
-msgid "Create ISO"
-msgstr "Ð¡Ð¾Ð·Ð´Ð°Ñ‚ÑŒ ISO"
-
-#: admin/systems/system-list.xml:379
+#: admin/systems/system-list.xml:150
 msgid "Edit system"
-msgstr ""
+msgstr "Ð ÐµÐ´Ð°ÐºÑ‚Ð¸Ñ€Ð¾Ð²Ð°Ñ‚ÑŒ ÑÐ¸ÑÑ‚ÐµÐ¼Ñƒ"
 
-#: admin/systems/system-list.xml:392
+#: admin/systems/system-list.xml:163
 msgid "Remove system"
-msgstr ""
-
-#: admin/systems/class_workstationGeneric.inc:75
-#, php-format
-msgid "Event %s is not available!"
-msgstr ""
-
-#: admin/systems/class_workstationGeneric.inc:78
-msgid "Events are not available!"
-msgstr ""
-
-#: admin/systems/class_workstationGeneric.inc:106
-msgid "(Re)Install"
-msgstr ""
-
-#: admin/systems/class_workstationGeneric.inc:107
-msgid "Software update"
-msgstr ""
-
-#: admin/systems/class_workstationGeneric.inc:115
-msgid "Wake up"
-msgstr "Ð’ÐµÑ€Ð½ÑƒÑ‚ÑŒ Ð² Ð¾Ð±Ñ‹Ñ‡Ð½Ñ‹Ð¹ Ñ€ÐµÐ¶Ð¸Ð¼"
+msgstr "Ð£Ð´Ð°Ð»Ð¸Ñ‚ÑŒ ÑÐ¸ÑÑ‚ÐµÐ¼Ñƒ"
 
-#: admin/systems/class_workstationGeneric.inc:144
-#: admin/systems/class_printGeneric.inc:604
+#: admin/systems/class_workstationGeneric.inc:35
 msgid "workstation"
-msgstr ""
+msgstr "Ñ€Ð°Ð±Ð¾Ñ‡Ð°Ñ ÑÑ‚Ð°Ð½Ñ†Ð¸Ñ"
 
-#: admin/systems/class_workstationGeneric.inc:151
-#: admin/systems/class_componentGeneric.inc:61
-#: admin/systems/class_mobilePhoneGeneric.inc:60
+#: admin/systems/class_workstationGeneric.inc:42
+#: admin/systems/class_printGeneric.inc:56
+#: admin/systems/class_componentGeneric.inc:55
+#: admin/systems/class_mobilePhoneGeneric.inc:56
 msgid "Properties"
 msgstr "Ð¡Ð²Ð¾Ð¹ÑÑ‚Ð²Ð°"
 
-#: admin/systems/class_workstationGeneric.inc:155
+#: admin/systems/class_workstationGeneric.inc:47
 #, php-format
 msgid "The name of the %s"
-msgstr ""
+msgstr "ÐÐ°Ð·Ð²Ð°Ð½Ð¸Ðµ %s"
 
-#: admin/systems/class_workstationGeneric.inc:161
+#: admin/systems/class_workstationGeneric.inc:52
 #, php-format
 msgid "A short description of the %s"
-msgstr ""
+msgstr "ÐšÑ€Ð°Ñ‚ÐºÐ¾Ðµ Ð¾Ð¿Ð¸ÑÐ°Ð½Ð¸Ðµ %s"
 
-#: admin/systems/class_workstationGeneric.inc:166
-#: admin/systems/class_printGeneric.inc:1025
+#: admin/systems/class_workstationGeneric.inc:56
 msgid "Location"
 msgstr "ÐœÐµÑÑ‚Ð¾Ð¿Ð¾Ð»Ð¾Ð¶ÐµÐ½Ð¸Ðµ"
 
-#: admin/systems/class_workstationGeneric.inc:167
+#: admin/systems/class_workstationGeneric.inc:57
 #, php-format
 msgid "The location of the %s"
-msgstr ""
+msgstr "ÐœÐµÑÑ‚Ð¾Ð¿Ð¾Ð»Ð¾Ð¶ÐµÐ½Ð¸Ðµ %s"
 
-#: admin/systems/class_workstationGeneric.inc:173
+#: admin/systems/class_workstationGeneric.inc:61
 #, php-format
 msgid "Lock this %s"
 msgstr ""
 
-#: admin/systems/class_workstationGeneric.inc:174
+#: admin/systems/class_workstationGeneric.inc:62
 #, php-format
 msgid "This will prevent the %s from being reinstalled"
 msgstr ""
 
-#: admin/systems/class_workstationGeneric.inc:185
-#: addons/dashboard/class_dashBoardSystems.inc:48
-msgid "Servers"
-msgstr "Ð¡ÐµÑ€Ð²ÐµÑ€Ñ‹"
-
-#: admin/systems/class_workstationGeneric.inc:190
-#, php-format
-msgid "The syslog server the %s should be using"
-msgstr ""
-
-#: admin/systems/class_workstationGeneric.inc:195
-msgid "Inherit NTP servers"
-msgstr ""
-
-#: admin/systems/class_workstationGeneric.inc:196
-msgid "Inherit time server attributes from ogroup"
-msgstr ""
-
-#: admin/systems/class_workstationGeneric.inc:202
-msgid "NTP servers"
-msgstr ""
+#: admin/systems/class_workstationGeneric.inc:73
+#: admin/systems/class_printGeneric.inc:83
+#: admin/systems/class_componentGeneric.inc:69
+#: admin/systems/class_mobilePhoneGeneric.inc:102
+#: admin/systems/class_networkSettings.inc:1008
+msgid "Network settings"
+msgstr "Ð¡ÐµÑ‚ÐµÐ²Ñ‹Ðµ Ð½Ð°ÑÑ‚Ñ€Ð¾Ð¹ÐºÐ¸"
 
-#: admin/systems/class_workstationGeneric.inc:203
-#, php-format
-msgid "The NTP servers for the %s"
-msgstr ""
+#: admin/systems/class_workstationGeneric.inc:78
+#: admin/systems/class_printGeneric.inc:87
+#: admin/systems/class_componentGeneric.inc:73
+#: admin/systems/class_mobilePhoneGeneric.inc:106
+#: admin/systems/class_networkSettings.inc:630
+#: admin/systems/class_networkSettings.inc:643
+#: admin/systems/class_networkSettings.inc:645
+#: admin/systems/class_networkSettings.inc:1014
+msgid "IP address"
+msgstr "IP Ð°Ð´Ñ€ÐµÑ"
 
-#: admin/systems/class_workstationGeneric.inc:209
-msgid "Inherit LDAP servers"
+#: admin/systems/class_workstationGeneric.inc:78
+msgid "IP addresses this system uses (v4 or v6)"
 msgstr ""
 
-#: admin/systems/class_workstationGeneric.inc:210
-msgid "Inherit LDAP server attributes from ogroup"
-msgstr ""
+#: admin/systems/class_workstationGeneric.inc:83
+#: admin/systems/class_printGeneric.inc:91
+#: admin/systems/class_componentGeneric.inc:77
+#: admin/systems/class_mobilePhoneGeneric.inc:110
+msgid "Mac address"
+msgstr "Mac Ð°Ð´Ñ€ÐµÑ"
 
-#: admin/systems/class_workstationGeneric.inc:216
-msgid "LDAP servers"
+#: admin/systems/class_workstationGeneric.inc:83
+#: admin/systems/class_printGeneric.inc:91
+#: admin/systems/class_componentGeneric.inc:77
+#: admin/systems/class_mobilePhoneGeneric.inc:110
+msgid "Mac address of this system"
 msgstr ""
 
-#: admin/systems/class_workstationGeneric.inc:217
-#, php-format
-msgid "The LDAP servers for the %s"
-msgstr ""
+#: admin/systems/class_workstationGeneric.inc:125
+#: admin/systems/class_workstationGeneric.inc:130
+#: admin/systems/class_workstationGeneric.inc:131
+msgid "Workstation"
+msgstr "Ð Ð°Ð±Ð¾Ñ‡Ð°Ñ ÑÑ‚Ð°Ð½Ñ†Ð¸Ñ"
 
-#: admin/systems/class_workstationGeneric.inc:225
-#: admin/systems/class_workstationGeneric.inc:229
-#: admin/ogroups/goto/termgroup.tpl.c:41
-msgid "Action"
-msgstr "Ð”ÐµÐ¹ÑÑ‚Ð²Ð¸Ðµ"
+#: admin/systems/class_workstationGeneric.inc:126
+msgid "Workstation information"
+msgstr "Ð˜Ð½Ñ„Ð¾Ñ€Ð¼Ð°Ñ†Ð¸Ñ Ð¾Ð± Ñ€Ð°Ð±Ð¾Ñ‡ÐµÐ¹ ÑÑ‚Ð°Ð½Ñ†Ð¸Ð¸"
 
-#: admin/systems/class_workstationGeneric.inc:230
-#: admin/ogroups/goto/termgroup.tpl.c:44
-msgid "Select action to execute for this terminal"
-msgstr "Ð’Ñ‹Ð±ÐµÑ€Ð¸Ñ‚Ðµ Ð´ÐµÐ¹ÑÑ‚Ð²Ð¸Ðµ, ÐºÐ¾Ñ‚Ð¾Ñ€Ð¾Ðµ Ð½ÑƒÐ¶Ð½Ð¾ Ð²Ñ‹Ð¿Ð¾Ð»Ð½Ð¸Ñ‚ÑŒ Ð½Ð° ÑÑ‚Ð¾Ð¼ Ñ‚ÐµÑ€Ð¼Ð¸Ð½Ð°Ð»Ðµ"
+#: admin/systems/class_printGeneric.inc:32
+#: admin/systems/class_printGeneric.inc:37
+#: admin/systems/class_printGeneric.inc:38
+msgid "Printer"
+msgstr "ÐŸÑ€Ð¸Ð½Ñ‚ÐµÑ€"
 
-#: admin/systems/class_workstationGeneric.inc:236
-#: admin/systems/class_componentGeneric.inc:75
-#: admin/systems/class_mobilePhoneGeneric.inc:106
-#: admin/systems/class_networkSettings.inc:1016
-msgid "Network settings"
-msgstr "Ð¡ÐµÑ‚ÐµÐ²Ñ‹Ðµ Ð½Ð°ÑÑ‚Ñ€Ð¾Ð¹ÐºÐ¸"
+#: admin/systems/class_printGeneric.inc:33
+msgid "Printer information"
+msgstr "Ð˜Ð½Ñ„Ð¾Ñ€Ð¼Ð°Ñ†Ð¸Ñ Ð¾ Ð¿Ñ€Ð¸Ð½Ñ‚ÐµÑ€Ðµ"
 
-#: admin/systems/class_workstationGeneric.inc:459
-msgid "Workstation information"
+#: admin/systems/class_printGeneric.inc:60
+msgid "The name of the printer"
 msgstr ""
 
-#: admin/systems/class_printGeneric.inc:131
-#: admin/systems/class_printGeneric.inc:1065
-#: admin/systems/class_systemManagement.inc:678
-msgid "Internal error"
-msgstr "Ð’Ð½ÑƒÑ‚Ñ€ÐµÐ½Ð½ÑÑ Ð¾ÑˆÐ¸Ð±ÐºÐ°"
-
-#: admin/systems/class_printGeneric.inc:131
-#, php-format
-msgid ""
-"Cannot determine a valid department for this object. Setting base to '%s'!"
+#: admin/systems/class_printGeneric.inc:64
+msgid "A short description of the printer"
 msgstr ""
 
-#: admin/systems/class_printGeneric.inc:311
-#: admin/systems/class_printGeneric.inc:319
-#: admin/systems/class_printGeneric.inc:324
-#: admin/systems/class_printGeneric.inc:374
-#: admin/systems/class_printGeneric.inc:390
-#: admin/systems/class_printGeneric.inc:393
-msgid "Add printer extension"
-msgstr ""
+#: admin/systems/class_printGeneric.inc:70
+msgid "Details"
+msgstr "Ð”ÐµÑ‚Ð°Ð»Ð¸"
 
-#: admin/systems/class_printGeneric.inc:312
-msgid ""
-"Could not initialize printer tab, parameter parent was missing while "
-"construction."
-msgstr ""
+#: admin/systems/class_printGeneric.inc:73
+msgid "Printer location"
+msgstr "ÐœÐµÑÑ‚Ð¾Ð½Ð°Ñ…Ð¾Ð¶Ð´ÐµÐ½Ð¸Ðµ Ð¿Ñ€Ð¸Ð½Ñ‚ÐµÑ€Ð°"
 
-#: admin/systems/class_printGeneric.inc:320
-msgid "This is a workstation template, printer tab is disabled."
+#: admin/systems/class_printGeneric.inc:73
+msgid "The location of the printer"
 msgstr ""
 
-#: admin/systems/class_printGeneric.inc:325
-msgid "This is a terminal template, printer tab is disabled."
-msgstr ""
+#: admin/systems/class_printGeneric.inc:77
+msgid "Printer URL"
+msgstr "URL Ð¿Ñ€Ð¸Ð½Ñ‚ÐµÑ€Ð°"
 
-#: admin/systems/class_printGeneric.inc:367
-#: admin/systems/class_printGeneric.inc:375
-#: admin/systems/class_printGeneric.inc:383
-#: admin/systems/class_printGeneric.inc:386
-#: admin/systems/class_printGeneric.inc:391
-#: admin/systems/class_printGeneric.inc:394
-msgid "printer"
+#: admin/systems/class_printGeneric.inc:77
+msgid "The URL of the printer"
 msgstr ""
 
-#: admin/systems/class_printGeneric.inc:375
-msgid ""
-"You can't enable it while 'cn' is not present in entry. Possibly you are "
-"currently creating a new terminal template."
+#: admin/systems/class_printGeneric.inc:87
+#: admin/systems/class_componentGeneric.inc:73
+#: admin/systems/class_mobilePhoneGeneric.inc:106
+msgid "IP address this system uses"
 msgstr ""
 
-#: admin/systems/class_printGeneric.inc:382
-#: admin/systems/class_printGeneric.inc:385
-msgid "Remove printer extension"
+#: admin/systems/class_serverService.inc:58
+msgid "Server services"
 msgstr ""
 
-#: admin/systems/class_printGeneric.inc:474
-#: admin/systems/class_printGeneric.inc:652
-#: admin/systems/class_printGeneric.inc:659
-#: admin/systems/class_printGeneric.inc:718
-#: admin/systems/class_printGeneric.inc:1105
-#: admin/systems/class_printGeneric.inc:1116
 #: admin/systems/class_serverService.inc:224
 #: admin/systems/class_serverService.inc:270
 #: admin/systems/class_serverService.inc:393
-#: admin/systems/class_systemManagement.inc:341
-#: admin/systems/class_systemManagement.inc:624
-#: admin/systems/class_systemManagement.inc:639
 #: admin/systems/services/shares/class_serviceShare.inc:103
-#: admin/systems/class_networkSettings.inc:305
-#: admin/systems/class_networkSettings.inc:336
-#: admin/systems/class_networkSettings.inc:584
-#: admin/systems/class_networkSettings.inc:591
-#: admin/systems/class_networkSettings.inc:597
-#: admin/systems/class_networkSettings.inc:604
+#: admin/systems/class_networkSettings.inc:297
+#: admin/systems/class_networkSettings.inc:328
+#: admin/systems/class_networkSettings.inc:576
+#: admin/systems/class_networkSettings.inc:583
+#: admin/systems/class_networkSettings.inc:589
+#: admin/systems/class_networkSettings.inc:596
 msgid "Error"
 msgstr "ÐžÑˆÐ¸Ð±ÐºÐ°"
 
-#: admin/systems/class_printGeneric.inc:577
-#, php-format
-msgid "Your currently selected PPD file '%s' doesn't exist."
-msgstr ""
-
-#: admin/systems/class_printGeneric.inc:583
-msgid "Not defined"
-msgstr ""
-
-#: admin/systems/class_printGeneric.inc:587
-#: admin/systems/ppd/class_printerPPDDialog.inc:116
-msgid "Can't get ppd informations."
-msgstr ""
-
-#: admin/systems/class_printGeneric.inc:602
-#: admin/systems/class_printGeneric.inc:604
-#, php-format
-msgid "This printer belongs to %s. You can't rename this printer."
-msgstr ""
-
-#: admin/systems/class_printGeneric.inc:602
-#: admin/systems/class_terminalGeneric.inc:34
-msgid "terminal"
-msgstr ""
-
-#: admin/systems/class_printGeneric.inc:652
-#: admin/systems/class_printGeneric.inc:659
-msgid "Object is no printer!"
-msgstr ""
-
-#: admin/systems/class_printGeneric.inc:767 admin/systems/printer.tpl.c:23
-msgid "Printer URL"
-msgstr "URL Ð¿Ñ€Ð¸Ð½Ñ‚ÐµÑ€Ð°"
-
-#: admin/systems/class_printGeneric.inc:989
-#: admin/systems/class_printGeneric.inc:991
-msgid "Group"
-msgstr "Ð“Ñ€ÑƒÐ¿Ð¿Ð°"
-
-#: admin/systems/class_printGeneric.inc:994
-msgid "User"
-msgstr "ÐŸÐ¾Ð»ÑŒÐ·Ð¾Ð²Ð°Ñ‚ÐµÐ»ÑŒ"
-
-#: admin/systems/class_printGeneric.inc:1006
-msgid "Printer information"
-msgstr ""
-
-#: admin/systems/class_printGeneric.inc:1023
-#: admin/systems/serverService-list.tpl.c:2
-#: admin/systems/phoneSelect/phoneSelect-list.tpl.c:2
-#: admin/systems/printer.tpl.c:11
-msgid "Base"
-msgstr "Ð’ÐµÑ‚ÐºÐ°"
-
-#: admin/systems/class_printGeneric.inc:1026
-msgid "LabeledURL"
-msgstr ""
-
-#: admin/systems/class_printGeneric.inc:1027
-msgid "Printer PPD"
-msgstr ""
-
-#: admin/systems/class_printGeneric.inc:1028 admin/systems/printer.tpl.c:38
-msgid "Permissions"
-msgstr ""
-
-#: admin/systems/class_printGeneric.inc:1030
-msgid "Windows inf file"
-msgstr ""
-
-#: admin/systems/class_printGeneric.inc:1031
-msgid "Windows driver dir"
-msgstr ""
-
-#: admin/systems/class_printGeneric.inc:1032 admin/systems/printer.tpl.c:62
-msgid "Driver printer name"
-msgstr ""
-
-#: admin/systems/class_printGeneric.inc:1048
-#: admin/systems/class_printGeneric.inc:1070
-msgid "Permission error"
-msgstr "ÐžÑˆÐ¸Ð±ÐºÐ° Ð´Ð¾ÑÑ‚ÑƒÐ¿Ð°"
-
-#: admin/systems/class_printGeneric.inc:1048
-#: admin/systems/class_printGeneric.inc:1070
-msgid "printer user"
-msgstr ""
-
-#: admin/systems/class_printGeneric.inc:1065
-#, php-format
-msgid "Illegal member type '%s'!"
-msgstr ""
-
-#: admin/systems/class_printGeneric.inc:1105
-#, php-format
-msgid "'%s' is already used!"
-msgstr ""
-
-#: admin/systems/class_printGeneric.inc:1116
-#, php-format
-msgid "'%s' does not exist!"
-msgstr ""
-
-#: admin/systems/class_serverService.inc:58
-msgid "Server services"
-msgstr ""
-
 #: admin/systems/class_serverService.inc:332
 msgid "Filter error"
 msgstr "ÐžÑˆÐ¸Ð±ÐºÐ° Ñ„Ð¸Ð»ÑŒÑ‚Ñ€Ð°"
@@ -714,217 +438,20 @@ msgstr ""
 msgid "Could not get execute action %s on service %s."
 msgstr ""
 
-#: admin/systems/class_terminalGeneric.inc:42
-#, php-format
-msgid "The root server the terminal should be using"
+#: admin/systems/class_terminalGeneric.inc:31
+msgid "terminal"
 msgstr ""
 
+#: admin/systems/class_terminalGeneric.inc:43
 #: admin/systems/class_terminalGeneric.inc:48
-#, php-format
-msgid "The swap server the terminal should be using"
-msgstr ""
-
-#: admin/systems/class_terminalGeneric.inc:54
-msgid "Remote desktop"
-msgstr "Ð£Ð´Ð°Ð»ÐµÐ½Ð½Ð°Ñ Ñ€Ð°Ð±Ð¾Ñ‡Ð°Ñ ÑÑ‚Ð°Ð½Ñ†Ð¸Ñ"
-
-#: admin/systems/class_terminalGeneric.inc:58
-msgid "Connect method"
-msgstr "Ð¡Ð¿Ð¾ÑÐ¾Ð± Ð¿Ð¾Ð´ÐºÐ»ÑŽÑ‡ÐµÐ½Ð¸Ñ"
-
-#: admin/systems/class_terminalGeneric.inc:62
-msgid "XDMCP"
-msgstr ""
-
-#: admin/systems/class_terminalGeneric.inc:62
-msgid "LDM"
-msgstr ""
-
-#: admin/systems/class_terminalGeneric.inc:62
-msgid "Shell"
-msgstr "ÐžÐ±Ð¾Ð»Ð¾Ñ‡ÐºÐ°"
-
-#: admin/systems/class_terminalGeneric.inc:62
-msgid "Telnet"
-msgstr ""
-
-#: admin/systems/class_terminalGeneric.inc:62
-msgid "Windows RDP"
-msgstr "Windows RDP"
-
-#: admin/systems/class_terminalGeneric.inc:66
-msgid "Terminal server"
-msgstr "Ð¢ÐµÑ€Ð¼Ð¸Ð½Ð°Ð»-ÑÐµÑ€Ð²ÐµÑ€"
+#: admin/systems/class_terminalGeneric.inc:49
+msgid "Terminal"
+msgstr "Ð¢ÐµÑ€Ð¼Ð¸Ð½Ð°Ð»"
 
-#: admin/systems/class_terminalGeneric.inc:82
+#: admin/systems/class_terminalGeneric.inc:44
 msgid "Terminal information"
 msgstr ""
 
-#: admin/systems/ppd/class_printerPPDSelectionDialog.inc:91
-#: admin/systems/ppd/class_printerPPDSelectionDialog.inc:116
-#: admin/systems/ppd/class_printerPPDSelectionDialog.inc:139
-#: admin/systems/ppd/class_printerPPDDialog.inc:92
-#: admin/systems/ppd/class_printerPPDDialog.inc:160
-#: admin/systems/ppd/class_printerPPDDialog.inc:241
-#: admin/systems/ppd/class_printerPPDDialog.inc:256
-#: admin/systems/ppd/class_printerPPDDialog.inc:269
-#: admin/systems/ppd/class_printerPPDDialog.inc:297
-#: admin/systems/ppd/class_printerPPDDialog.inc:314
-#: admin/systems/ppd/class_printerPPDDialog.inc:337
-#: admin/systems/ppd/class_printerPPDDialog.inc:351
-#: admin/systems/ppd/class_printerPPDDialog.inc:361
-#: admin/systems/ppd/class_printerPPDDialog.inc:365
-#: admin/systems/ppd/class_printerPPDDialog.inc:560
-#: admin/systems/ppd/class_printerPPDDialog.inc:577
-#: admin/systems/ppd/class_printerPPDDialog.inc:580
-#: admin/systems/ppd/class_printerPPDDialog.inc:583
-msgid "PPD error"
-msgstr ""
-
-#: admin/systems/ppd/class_printerPPDSelectionDialog.inc:139
-#, php-format
-msgid "Cannot locate vendor '%s' in available PPDs!"
-msgstr ""
-
-#: admin/systems/ppd/class_printerPPDSelectionDialog.inc:148
-msgid "Printer ppd selection."
-msgstr ""
-
-#: admin/systems/ppd/class_printerPPDSelectionDialog.inc:155
-msgid "delete"
-msgstr ""
-
-#: admin/systems/ppd/class_printerPPDSelectionDialog.inc:166
-msgid "back"
-msgstr ""
-
-#: admin/systems/ppd/class_printerPPDDialog.inc:74
-#: admin/systems/ppd/class_printerPPDDialog.inc:140
-#: admin/systems/services/class_goService.inc:241
-msgid "Configuration error"
-msgstr ""
-
-#: admin/systems/ppd/class_printerPPDDialog.inc:92
-#, php-format
-msgid "Cannot open PPD '%s'!"
-msgstr ""
-
-#: admin/systems/ppd/class_printerPPDDialog.inc:141
-#, php-format
-msgid "Cannot open PPD path '%s' for reading and writing!"
-msgstr ""
-
-#: admin/systems/ppd/class_printerPPDDialog.inc:160
-#: admin/systems/ppd/class_printerPPDDialog.inc:365
-msgid "file is empty"
-msgstr "Ñ„Ð°Ð¹Ð» Ð¿ÑƒÑÑ‚Ð¾Ð¹"
-
-#: admin/systems/ppd/class_printerPPDDialog.inc:314
-#, php-format
-msgid "Cannot parse PPD '%s'!"
-msgstr ""
-
-#: admin/systems/ppd/class_printerPPDDialog.inc:340
-msgid "Overwrite existing PPD"
-msgstr ""
-
-#: admin/systems/ppd/class_printerPPDDialog.inc:341
-msgid ""
-"There is already a ppd file for this kind of printer. Do you want to "
-"overwrite it?"
-msgstr ""
-
-#: admin/systems/ppd/class_printerPPDDialog.inc:491
-msgid "Section"
-msgstr ""
-
-#: admin/systems/ppd/class_printerPPDDialog.inc:551
-#: admin/systems/ppd/class_printerPPDDialog.inc:554
-msgid "True"
-msgstr ""
-
-#: admin/systems/ppd/class_printerPPDDialog.inc:552
-#: admin/systems/ppd/class_printerPPDDialog.inc:555
-msgid "False"
-msgstr ""
-
-#: admin/systems/ppd/class_printerPPDDialog.inc:560
-#, php-format
-msgid "PPD type '%s' is not supported!"
-msgstr ""
-
-#: admin/systems/ppd/class_printerPPDDialog.inc:597
-msgid ""
-"Please select a valid ppd file or use 'Cancel' to go back to printer "
-"configuration."
-msgstr ""
-
-#: admin/systems/ppd/class_ppdManager.inc:44
-#: admin/systems/ppd/class_ppdManager.inc:188
-#: admin/systems/ppd/class_ppdManager.inc:190
-msgid "PPD manager error"
-msgstr ""
-
-#: admin/systems/ppd/class_ppdManager.inc:44
-#, php-format
-msgid "The specified path '%s' does not exist."
-msgstr ""
-
-#: admin/systems/ppd/class_ppdManager.inc:188
-#, php-format
-msgid "Specified PPD file '%s' cannot be opened for reading."
-msgstr ""
-
-#: admin/systems/ppd/class_ppdManager.inc:190
-#, php-format
-msgid "The temporary file '%s' cannot be opened for writing."
-msgstr ""
-
-#: admin/systems/ppd/class_ppdManager.inc:212
-#: admin/systems/ppd/class_ppdManager.inc:350
-msgid "Parsing PPD file failed - file is empty!"
-msgstr ""
-
-#: admin/systems/ppd/class_ppdManager.inc:222
-#, php-format
-msgid ""
-"Parsing PPD file %s failed - line too long. Trailing characters have been "
-"ignored!"
-msgstr ""
-
-#: admin/systems/ppd/class_ppdManager.inc:230
-msgid "Nested groups are not supported!"
-msgstr ""
-
-#: admin/systems/ppd/class_ppdManager.inc:234
-msgid "Group name not unique!"
-msgstr ""
-
-#: admin/systems/ppd/class_ppdManager.inc:240
-#: admin/systems/ppd/class_ppdManager.inc:270
-msgid "Symbol values are not supported yet!"
-msgstr ""
-
-#: admin/systems/ppd/class_ppdManager.inc:264
-msgid "Nested options are not supported!"
-msgstr ""
-
-#: admin/systems/ppd/class_ppdManager.inc:289
-msgid "PickMany is not supported yet!"
-msgstr ""
-
-#: admin/systems/ppd/class_ppdManager.inc:370
-#, php-format
-msgid ""
-"Parsing PPD file %s failed - line too long. Trailing characters have been "
-"ignored"
-msgstr ""
-
-#: admin/systems/ppd/class_ppdManager.inc:395
-#, php-format
-msgid "Parsing PPD file %s failed - no information found."
-msgstr ""
-
 #: admin/systems/class_systemImport.inc:72
 #, php-format
 msgid "Could not parse %s"
@@ -938,91 +465,138 @@ msgstr ""
 #: admin/systems/class_systemImport.inc:130
 #, php-format
 msgid "No DNS server found for zone %s"
-msgstr ""
+msgstr "ÐÐµ Ð½Ð°Ð¹Ð´ÐµÐ½ DNS ÑÐµÑ€Ð²ÐµÑ€ Ð´Ð»Ñ Ð·Ð¾Ð½Ñ‹ %s"
 
 #: admin/systems/class_systemImport.inc:165
 msgid "Import"
 msgstr "Ð˜Ð¼Ð¿Ð¾Ñ€Ñ‚Ð¸Ñ€Ð¾Ð²Ð°Ñ‚ÑŒ"
 
+#: admin/systems/class_systemImport.inc:169
+#: admin/systems/class_serverGeneric.inc:43
+#: admin/systems/class_serverGeneric.inc:48
+#: admin/systems/class_serverGeneric.inc:49
+msgid "Server"
+msgstr "Ð¡ÐµÑ€Ð²ÐµÑ€"
+
 #: admin/systems/class_systemImport.inc:169
 msgid "The server you wish to import hosts from"
 msgstr ""
 
-#: admin/systems/class_serverGeneric.inc:34
+#: admin/systems/class_serverGeneric.inc:31
 msgid "server"
 msgstr "Ð¡ÐµÑ€Ð²ÐµÑ€"
 
-#: admin/systems/class_serverGeneric.inc:47
+#: admin/systems/class_serverGeneric.inc:44
 msgid "Server information"
+msgstr "Ð˜Ð½Ñ„Ð¾Ñ€Ð¼Ð°Ñ†Ð¸Ñ Ð¾ ÑÐµÑ€Ð²ÐµÑ€Ðµ"
+
+#: admin/systems/class_componentGeneric.inc:31
+msgid "Component"
 msgstr ""
 
-#: admin/systems/class_componentGeneric.inc:37
+#: admin/systems/class_componentGeneric.inc:32
 msgid "Component information"
 msgstr ""
 
-#: admin/systems/class_componentGeneric.inc:64
+#: admin/systems/class_componentGeneric.inc:36
+#: admin/systems/class_componentGeneric.inc:37
+msgid "Network device"
+msgstr "Ð¡ÐµÑ‚ÐµÐ²Ð¾Ðµ ÑƒÑÑ‚Ñ€Ð¾Ð¹ÑÑ‚Ð²Ð¾"
+
+#: admin/systems/class_componentGeneric.inc:58
 msgid "The name of the component"
 msgstr ""
 
-#: admin/systems/class_componentGeneric.inc:68
+#: admin/systems/class_componentGeneric.inc:62
 msgid "A short description of the component"
 msgstr ""
 
+#: admin/systems/class_systemServers.inc:31
+#: admin/systems/class_systemServers.inc:53
+msgid "Servers"
+msgstr "Ð¡ÐµÑ€Ð²ÐµÑ€Ñ‹"
+
+#: admin/systems/class_systemServers.inc:35
+msgid "The syslog server the system should be using"
+msgstr ""
+
+#: admin/systems/class_systemServers.inc:40
+msgid "NTP servers"
+msgstr "NTP ÑÐµÑ€Ð²ÐµÑ€Ð°"
+
+#: admin/systems/class_systemServers.inc:40
+msgid "The NTP servers for this system"
+msgstr ""
+
+#: admin/systems/class_systemServers.inc:54
+msgid "Servers this system is using"
+msgstr ""
+
+#: admin/systems/class_mobilePhoneGeneric.inc:32
 #: admin/systems/class_mobilePhoneGeneric.inc:37
+#: admin/systems/class_mobilePhoneGeneric.inc:38
+msgid "Mobile phone"
+msgstr "ÐœÐ¾Ð±Ð¸Ð»ÑŒÐ½Ñ‹Ð¹ Ñ‚ÐµÐ»ÐµÑ„Ð¾Ð½"
+
+#: admin/systems/class_mobilePhoneGeneric.inc:33
 msgid "Mobile phone information"
-msgstr ""
+msgstr "Ð˜Ð½Ñ„Ð¾Ñ€Ð¼Ð°Ñ†Ð¸Ñ Ð¾ Ð¼Ð¾Ð±Ð¸Ð»ÑŒÐ½Ð¾Ð¼ Ñ‚ÐµÐ»ÐµÑ„Ð¾Ð½Ðµ"
 
-#: admin/systems/class_mobilePhoneGeneric.inc:63
+#: admin/systems/class_mobilePhoneGeneric.inc:60
 msgid "The name of the mobile phone"
-msgstr ""
+msgstr "ÐÐ°Ð·Ð²Ð°Ð½Ð¸Ðµ Ð¼Ð¾Ð±Ð¸Ð»ÑŒÐ½Ð¾Ð³Ð¾ Ñ‚ÐµÐ»ÐµÑ„Ð¾Ð½Ð°"
 
-#: admin/systems/class_mobilePhoneGeneric.inc:67
+#: admin/systems/class_mobilePhoneGeneric.inc:64
 msgid "A short description of the mobile phone"
-msgstr ""
+msgstr "ÐšÑ€Ð°Ñ‚ÐºÐ¾Ðµ Ð¾Ð¿Ð¸ÑÐ°Ð½Ð¸Ðµ Ð¼Ð¾Ð±Ð¸Ð»ÑŒÐ½Ð¾Ð³Ð¾ Ñ‚ÐµÐ»ÐµÑ„Ð¾Ð½Ð°"
 
-#: admin/systems/class_mobilePhoneGeneric.inc:77
+#: admin/systems/class_mobilePhoneGeneric.inc:70
+msgid "Phone"
+msgstr "Ð¢ÐµÐ»ÐµÑ„Ð¾Ð½"
+
+#: admin/systems/class_mobilePhoneGeneric.inc:73
 msgid "Serial Number"
-msgstr ""
+msgstr "Ð¡ÐµÑ€Ð¸Ð¹Ð½Ñ‹Ð¹ Ð½Ð¾Ð¼ÐµÑ€"
 
-#: admin/systems/class_mobilePhoneGeneric.inc:77
+#: admin/systems/class_mobilePhoneGeneric.inc:73
 msgid "The serial number of the mobile phone"
-msgstr ""
+msgstr "Ð¡ÐµÑ€Ð¸Ð¹Ð½Ñ‹Ð¹ Ð½Ð¾Ð¼ÐµÑ€ Ð¼Ð¾Ð±Ð¸Ð»ÑŒÐ½Ð¾Ð³Ð¾ Ñ‚ÐµÐ»ÐµÑ„Ð¾Ð½Ð°"
 
-#: admin/systems/class_mobilePhoneGeneric.inc:81
+#: admin/systems/class_mobilePhoneGeneric.inc:77
 msgid "IMEI Number"
-msgstr ""
+msgstr "IMEI Ð½Ð¾Ð¼ÐµÑ€"
 
-#: admin/systems/class_mobilePhoneGeneric.inc:81
+#: admin/systems/class_mobilePhoneGeneric.inc:77
 msgid "The IMEI number of the mobile phone"
-msgstr ""
+msgstr "IMEI Ð½Ð¾Ð¼ÐµÑ€ Ð¼Ð¾Ð±Ð¸Ð»ÑŒÐ½Ð¾Ð³Ð¾ Ñ‚ÐµÐ»ÐµÑ„Ð¾Ð½Ð°"
 
-#: admin/systems/class_mobilePhoneGeneric.inc:86
+#: admin/systems/class_mobilePhoneGeneric.inc:82
 msgid "OS"
-msgstr ""
+msgstr "ÐžÐ¡"
 
-#: admin/systems/class_mobilePhoneGeneric.inc:86
+#: admin/systems/class_mobilePhoneGeneric.inc:82
 msgid "The Operating System installed on this phone"
-msgstr ""
+msgstr "ÐžÐ¿ÐµÑ€Ð°Ñ†Ð¸Ð¾Ð½Ð½Ð°Ñ ÑÐ¸ÑÑ‚ÐµÐ¼Ð° ÑƒÑÑ‚Ð°Ð½Ð¾Ð²Ð»ÐµÐ½Ð½Ð°Ñ Ð½Ð° ÑÑ‚Ð¾Ñ‚ Ñ‚ÐµÐ»ÐµÑ„Ð¾Ð½"
 
-#: admin/systems/class_mobilePhoneGeneric.inc:92
+#: admin/systems/class_mobilePhoneGeneric.inc:88
 msgid "SimCard"
-msgstr ""
+msgstr "Ð¡Ð¸Ð¼ÐšÐ°Ñ€Ñ‚Ð°"
 
-#: admin/systems/class_mobilePhoneGeneric.inc:95
+#: admin/systems/class_mobilePhoneGeneric.inc:91
 msgid "Telephone Number"
-msgstr ""
+msgstr "ÐÐ¾Ð¼ÐµÑ€ Ñ‚ÐµÐ»ÐµÑ„Ð¾Ð½Ð°"
 
-#: admin/systems/class_mobilePhoneGeneric.inc:95
+#: admin/systems/class_mobilePhoneGeneric.inc:91
 msgid "The telephone number of the mobile phone"
-msgstr ""
+msgstr "Ð¢ÐµÐ»ÐµÑ„Ð¾Ð½Ð½Ñ‹Ð¹ Ð½Ð¾Ð¼ÐµÑ€ Ð¼Ð¾Ð±Ð¸Ð»ÑŒÐ½Ð¾Ð³Ð¾ Ñ‚ÐµÐ»ÐµÑ„Ð¾Ð½Ð°"
 
-#: admin/systems/class_mobilePhoneGeneric.inc:99
+#: admin/systems/class_mobilePhoneGeneric.inc:95
 msgid "PUK Number"
-msgstr ""
+msgstr "PUK Ð½Ð¾Ð¼ÐµÑ€"
 
-#: admin/systems/class_mobilePhoneGeneric.inc:99
+#: admin/systems/class_mobilePhoneGeneric.inc:95
 msgid "The PUK number of the simcard in this mobile phone"
-msgstr ""
+msgstr "PUK Ð½Ð¾Ð¼ÐµÑ€ ÑÐ¸Ð¼ ÐºÐ°Ñ€Ñ‚Ñ‹ Ð² Ð¼Ð¾Ð±Ð¸Ð»ÑŒÐ½Ð¾Ð¼ Ñ‚ÐµÐ»ÐµÑ„Ð¾Ð½Ðµ "
 
 #: admin/systems/serverService-list.xml:10
 msgid "List of services"
@@ -1034,26 +608,26 @@ msgstr ""
 
 #: admin/systems/serverService-list.xml:27
 msgid "!"
-msgstr ""
+msgstr "!"
 
 #: admin/systems/serverService-list.xml:89
 msgid "Get status"
-msgstr ""
+msgstr "ÐŸÐ¾Ð»ÑƒÑ‡Ð¸Ñ‚ÑŒ ÑÑ‚Ð°Ñ‚ÑƒÑ"
 
 #: admin/systems/serverService-list.xml:97
 #: admin/systems/services/cups/class_serviceCUPS.inc:92
 msgid "Start"
-msgstr ""
+msgstr "Ð—Ð°Ð¿ÑƒÑÑ‚Ð¸Ñ‚ÑŒ"
 
 #: admin/systems/serverService-list.xml:105
 #: admin/systems/services/cups/class_serviceCUPS.inc:93
 msgid "Stop"
-msgstr ""
+msgstr "ÐžÑÑ‚Ð°Ð½Ð¾Ð²Ð¸Ñ‚ÑŒ"
 
 #: admin/systems/serverService-list.xml:113
 #: admin/systems/services/cups/class_serviceCUPS.inc:94
 msgid "Restart"
-msgstr ""
+msgstr "ÐŸÐµÑ€ÐµÐ·Ð°Ð¿ÑƒÑÑ‚Ð¸Ñ‚ÑŒ"
 
 #: admin/systems/serverService-list.xml:121
 msgid "Edit service"
@@ -1063,70 +637,20 @@ msgstr ""
 msgid "Remove service"
 msgstr ""
 
-#: admin/systems/phoneSelect/phoneSelect-list.xml:10
-msgid "Please select the desired entries"
-msgstr "ÐŸÐ¾Ð¶Ð°Ð»ÑƒÐ¹ÑÑ‚Ð° Ð²Ñ‹Ð±ÐµÑ€ÐµÑ‚Ðµ Ð½ÑƒÐ¶Ð½Ñ‹Ðµ Ð·Ð°Ð¿Ð¸ÑÐ¸"
-
-#: admin/systems/phoneSelect/phoneSelect-list.xml:56
-msgid "Number"
-msgstr ""
-
-#: admin/systems/phoneSelect/phoneSelect-list.xml:83
-msgid "Select this number"
-msgstr ""
-
-#: admin/systems/class_systemManagement.inc:177
-msgid "Back"
-msgstr "ÐÐ°Ð·Ð°Ð´"
-
-#: admin/systems/class_systemManagement.inc:223
-msgid "Creating the image failed. Please see the report below."
-msgstr ""
-
-#: admin/systems/class_systemManagement.inc:228
-#, php-format
-msgid "Command '%s', specified for ISO creation doesn't seem to exist."
-msgstr ""
-
-#: admin/systems/class_systemManagement.inc:398
-#: admin/systems/class_systemManagement.inc:473
-#: admin/systems/class_systemManagement.inc:858
-#: admin/systems/class_systemManagement.inc:905
-#: admin/systems/class_systemManagement.inc:926
-msgid "Permission"
-msgstr "ÐŸÑ€Ð°Ð²Ð°"
-
-#: admin/systems/class_systemManagement.inc:678
-msgid "Cannot set mode to 'active'!"
-msgstr ""
-
-#: admin/systems/class_systemManagement.inc:858
-#, php-format
-msgid "You are not allowed to create a snapshot for %s."
-msgstr "Ð’Ð°Ð¼ Ð½Ðµ Ñ€Ð°Ð·Ñ€ÐµÑˆÐµÐ½Ð¾ ÑÐ¾Ð·Ð´Ð°Ð²Ð°Ñ‚ÑŒ ÑÐ½Ð°Ð¿ÑˆÐ¾Ñ‚ Ð´Ð»Ñ %s."
-
-#: admin/systems/class_systemManagement.inc:905
-#: admin/systems/class_systemManagement.inc:926
-#, php-format
-msgid "You are not allowed to restore a snapshot for %s."
-msgstr "Ð’Ð°Ð¼ Ð½Ðµ Ñ€Ð°Ð·Ñ€ÐµÑˆÐµÐ½Ð¾ Ð²Ð¾ÑÑÑ‚Ð°Ð½Ð°Ð²Ð»Ð¸Ð²Ð°Ñ‚ÑŒ ÑÐ½Ð°Ð¿ÑˆÐ¾Ñ‚ Ð´Ð»Ñ %s."
-
-#: admin/systems/class_systemManagement.inc:1169
-#, php-format
-msgid "Inherited from %s"
-msgstr ""
-
-#: admin/systems/class_systemManagement.inc:1224
-#: admin/systems/class_systemManagement.inc:1228
-#: addons/dashboard/class_dashBoardSystems.inc:199
+#: admin/systems/class_systemManagement.inc:48
 #: config/systems/class_systemsPluginConfig.inc:28
 msgid "Systems"
 msgstr "Ð¡Ð¸ÑÑ‚ÐµÐ¼Ñ‹"
 
-#: admin/systems/class_systemManagement.inc:1225
+#: admin/systems/class_systemManagement.inc:49
 msgid "Systems Management"
 msgstr ""
 
+#: admin/systems/class_systemManagement.inc:250
+#, php-format
+msgid "Inherited from %s"
+msgstr ""
+
 #: admin/systems/services/terminal/class_serviceTerminal.inc:29
 #: admin/systems/services/terminal/class_serviceTerminal.inc:30
 #: admin/systems/services/terminal/class_serviceTerminal.inc:41
@@ -1157,13 +681,17 @@ msgstr "Ð¡Ð»ÑƒÐ¶Ð±Ð° Ð¿ÐµÑ‡Ð°Ñ‚Ð¸"
 
 #: admin/systems/services/cups/class_serviceCUPS.inc:84
 msgid "Cups"
-msgstr ""
+msgstr "Cups"
 
 #: admin/systems/services/class_goService.inc:44
 #: admin/systems/services/class_goService.inc:78
 msgid "Empty service"
 msgstr ""
 
+#: admin/systems/services/class_goService.inc:241
+msgid "Configuration error"
+msgstr "ÐžÑˆÐ¸Ð±ÐºÐ° ÐºÐ¾Ð½Ñ„Ð¸Ð³ÑƒÑ€Ð°Ñ†Ð¸Ð¸"
+
 #: admin/systems/services/shares/class_serviceShare.inc:30
 #: admin/systems/services/shares/class_serviceShare.inc:31
 msgid "Share service"
@@ -1195,7 +723,7 @@ msgstr ""
 
 #: admin/systems/services/shares/class_serviceShare.inc:65
 msgid "Codepage"
-msgstr ""
+msgstr "ÐšÐ¾Ð´Ð¾Ð²Ð°Ñ ÑÑ‚Ñ€Ð°Ð½Ð¸Ñ†Ð°"
 
 #: admin/systems/services/shares/class_serviceShare.inc:65
 msgid "Codepage for this share"
@@ -1211,7 +739,7 @@ msgstr ""
 
 #: admin/systems/services/shares/class_serviceShare.inc:73
 msgid "Option"
-msgstr ""
+msgstr "ÐžÐ¿Ñ†Ð¸Ð¸"
 
 #: admin/systems/services/shares/class_serviceShare.inc:73
 msgid "Special option(s) for this share"
@@ -1222,8 +750,6 @@ msgid "You need to configure encodings first"
 msgstr ""
 
 #: admin/systems/services/shares/class_serviceShare.inc:110
-#: admin/ogroups/goto/termgroup.tpl.c:2 admin/systems/remove.tpl.c:2
-#: admin/systems/ppd/remove_ppd.tpl.c:2
 msgid "Warning"
 msgstr "ÐŸÑ€ÐµÐ´ÑƒÐ¿Ñ€ÐµÐ¶Ð´ÐµÐ½Ð¸Ðµ"
 
@@ -1246,7 +772,7 @@ msgstr "Ð˜Ð½Ñ„Ð¾Ñ€Ð¼Ð°Ñ†Ð¸Ñ"
 
 #: admin/systems/services/ntp/class_serviceNTP.inc:45
 msgid "Time servers"
-msgstr ""
+msgstr "Ð¡ÐµÑ€Ð²ÐµÑ€Ð° Ð²Ñ€Ð¼ÐµÐ½Ð¸"
 
 #: admin/systems/services/ntp/class_serviceNTP.inc:45
 msgid "List of time sources to use"
@@ -1267,7 +793,7 @@ msgstr ""
 
 #: admin/systems/services/ldap/class_serviceLDAP.inc:44
 msgid "LDAP URI"
-msgstr ""
+msgstr "LDAP URI"
 
 #: admin/systems/services/ldap/class_serviceLDAP.inc:44
 msgid "The LDAP URI to use in order to contact this LDAP server"
@@ -1303,27 +829,27 @@ msgstr ""
 
 #: admin/systems/services/ldap/class_serviceLDAP.inc:66
 msgid "TLS Cert"
-msgstr ""
+msgstr "TLS ÑÐµÑ€Ñ‚Ð¸Ñ„Ð¸ÐºÐ°Ñ‚"
 
 #: admin/systems/services/ldap/class_serviceLDAP.inc:66
 msgid "Filepath to tls certificate"
-msgstr ""
+msgstr "ÐŸÑƒÑ‚ÑŒ Ðº Ñ„Ð°Ð¹Ð»Ñƒ tls ÑÐµÑ€Ñ‚Ð¸Ñ„Ð¸ÐºÐ°Ñ‚Ð°"
 
 #: admin/systems/services/ldap/class_serviceLDAP.inc:70
 msgid "TLS Key"
-msgstr ""
+msgstr "TLS ÐºÐ»ÑŽÑ‡"
 
 #: admin/systems/services/ldap/class_serviceLDAP.inc:70
 msgid "Filepath to tls key"
-msgstr ""
+msgstr "ÐŸÑƒÑ‚ÑŒ Ðº Ñ„Ð°Ð¹Ð»Ñƒ tls ÐºÐ»ÑŽÑ‡Ð°"
 
 #: admin/systems/services/ldap/class_serviceLDAP.inc:74
 msgid "TLS CaCert"
-msgstr ""
+msgstr "TLS ÐºÐ¾Ñ€Ð½ÐµÐ²Ð¾Ð¹ ÑÐµÑ€Ñ‚Ð¸Ñ„Ð¸ÐºÐ°Ñ‚"
 
 #: admin/systems/services/ldap/class_serviceLDAP.inc:74
 msgid "Filepath to tls ca certificate"
-msgstr ""
+msgstr "ÐŸÑƒÑ‚ÑŒ Ðº Ñ„Ð°Ð¹Ð»Ñƒ ÐºÐ¾Ñ€Ð½ÐµÐ²Ð¾Ð³Ð¾ ÑÐµÑ€Ñ‚Ð¸Ñ„Ð¸ÐºÐ°Ñ‚Ð° tls"
 
 #: admin/systems/services/ldap/class_serviceLDAP.inc:78
 msgid "TLS ReqCert"
@@ -1347,155 +873,95 @@ msgstr ""
 
 #: admin/systems/services/ldap/class_serviceLDAP.inc:97
 msgid "LDAP"
-msgstr ""
+msgstr "LDAP"
 
-#: admin/systems/class_networkSettings.inc:305
+#: admin/systems/class_networkSettings.inc:297
 msgid "NOT IMPLEMENTED"
 msgstr ""
 
-#: admin/systems/class_networkSettings.inc:437
+#: admin/systems/class_networkSettings.inc:429
 msgid "Not matching"
 msgstr ""
 
-#: admin/systems/class_networkSettings.inc:584
+#: admin/systems/class_networkSettings.inc:576
 #, php-format
 msgid "Was not able to contact argonaut server: %s"
 msgstr ""
 
-#: admin/systems/class_networkSettings.inc:591
+#: admin/systems/class_networkSettings.inc:583
 #, php-format
 msgid "Was not able to find DNS server for zone %s"
 msgstr ""
 
-#: admin/systems/class_networkSettings.inc:597
+#: admin/systems/class_networkSettings.inc:589
 #, php-format
 msgid "Was not able to find mac address of DNS server %s"
 msgstr ""
 
-#: admin/systems/class_networkSettings.inc:604
+#: admin/systems/class_networkSettings.inc:596
 #, php-format
 msgid "Was not able to launch ldap2zone: %s"
 msgstr ""
 
-#: admin/systems/class_networkSettings.inc:630
+#: admin/systems/class_networkSettings.inc:622
 #, php-format
 msgid "IP address %s"
 msgstr ""
 
-#: admin/systems/class_networkSettings.inc:638
-#: admin/systems/class_networkSettings.inc:651
-#: admin/systems/class_networkSettings.inc:653
-#: admin/systems/class_networkSettings.inc:1022
-msgid "IP address"
-msgstr "IP Ð°Ð´Ñ€ÐµÑ"
-
-#: admin/systems/class_networkSettings.inc:644
-#: admin/systems/class_networkSettings.inc:660
-#: admin/systems/class_networkSettings.inc:662
-#: admin/systems/class_networkSettings.inc:1023
+#: admin/systems/class_networkSettings.inc:636
+#: admin/systems/class_networkSettings.inc:652
+#: admin/systems/class_networkSettings.inc:654
+#: admin/systems/class_networkSettings.inc:1015
 msgid "MAC address"
-msgstr ""
+msgstr "MAC Ð°Ð´Ñ€ÐµÑ"
 
-#: admin/systems/class_networkSettings.inc:676
+#: admin/systems/class_networkSettings.inc:668
 #, php-format
 msgid "The IP address '%s' is not part of the selected reverse zone '%s'!"
 msgstr ""
 
-#: admin/systems/class_networkSettings.inc:686
+#: admin/systems/class_networkSettings.inc:678
 #, php-format
 msgid "Record type '%s' is duplicated!"
 msgstr ""
 
-#: admin/systems/class_networkSettings.inc:693
+#: admin/systems/class_networkSettings.inc:685
 #, php-format
 msgid "Uniq record type '%s' is duplicated!"
 msgstr ""
 
-#: admin/systems/class_networkSettings.inc:705
+#: admin/systems/class_networkSettings.inc:697
 #, php-format
 msgid ""
 "The IP address '%s' will be added as 'A Record', this will be done "
 "automatically, please remove the record."
 msgstr ""
 
-#: admin/systems/class_networkSettings.inc:712
+#: admin/systems/class_networkSettings.inc:704
 #, php-format
 msgid "Only lowercase records are allowed, please check your '%ss'."
 msgstr ""
 
-#: admin/systems/class_networkSettings.inc:978
+#: admin/systems/class_networkSettings.inc:970
 msgid "Delete"
 msgstr "Ð£Ð´Ð°Ð»Ð¸Ñ‚ÑŒ"
 
-#: admin/systems/class_networkSettings.inc:984
+#: admin/systems/class_networkSettings.inc:976
 msgid "Add"
 msgstr "Ð”Ð¾Ð±Ð°Ð²Ð¸Ñ‚ÑŒ"
 
-#: admin/systems/class_networkSettings.inc:1015
-#: addons/dashboard/class_dashBoardNetwork.inc:127
+#: admin/systems/class_networkSettings.inc:1007
 msgid "Network"
-msgstr ""
+msgstr "Ð¡ÐµÑ‚ÑŒ"
 
-#: admin/systems/class_networkSettings.inc:1030
+#: admin/systems/class_networkSettings.inc:1022
 msgid "DNS configuration"
-msgstr ""
+msgstr "ÐšÐ¾Ð½Ñ„Ð¸Ð³ÑƒÑ€Ð°Ñ†Ð¸Ñ DNS"
 
-#: admin/systems/class_networkSettings.inc:1033
+#: admin/systems/class_networkSettings.inc:1025
 msgid "DHCP configuration"
 msgstr ""
 
-#: addons/dashboard/class_dashBoardSystems.inc:45
-msgid "Workstations"
-msgstr ""
-
-#: addons/dashboard/class_dashBoardSystems.inc:51
-msgid "Windows Workstations"
-msgstr ""
-
-#: addons/dashboard/class_dashBoardSystems.inc:54
-msgid "Terminals"
-msgstr ""
-
-#: addons/dashboard/class_dashBoardSystems.inc:57
-msgid "Printers"
-msgstr ""
-
-#: addons/dashboard/class_dashBoardSystems.inc:60
-msgid "Phones"
-msgstr ""
-
-#: addons/dashboard/class_dashBoardSystems.inc:63
-msgid "Components"
-msgstr ""
-
-#: addons/dashboard/class_dashBoardSystems.inc:66
-msgid "Mobile phones"
-msgstr ""
-
-#: addons/dashboard/class_dashBoardSystems.inc:183
-msgid "Statistics"
-msgstr "Ð¡Ñ‚Ð°Ñ‚Ð¸ÑÑ‚Ð¸ÐºÐ°"
-
-#: addons/dashboard/class_dashBoardSystems.inc:188
-msgid "Computer name to use by unit"
-msgstr ""
-
-#: addons/dashboard/class_dashBoardSystems.inc:200
-msgid "Statistics and informations about systems"
-msgstr ""
-
-#: addons/dashboard/class_dashBoardNetwork.inc:111
-msgid "DHCP"
-msgstr "DHCP"
-
-#: addons/dashboard/class_dashBoardNetwork.inc:116
-msgid "DNS"
-msgstr "DNS"
-
-#: addons/dashboard/class_dashBoardNetwork.inc:128
-msgid "Statistics and various informations"
-msgstr "Ð¡Ñ‚Ð°Ñ‚Ð¸ÑÑ‚Ð¸ÐºÐ° Ð¸ Ñ€Ð°Ð·Ð»Ð¸Ñ‡Ð½Ð°Ñ Ð¸Ð½Ñ„Ð¾Ñ€Ð¼Ð°Ñ†Ð¸Ñ"
-
 #: config/systems/class_systemsPluginConfig.inc:29
 msgid "Systems plugin configuration"
 msgstr ""
@@ -1514,35 +980,35 @@ msgstr ""
 
 #: config/systems/class_systemsPluginConfig.inc:48
 msgid "Server RDN"
-msgstr ""
+msgstr "RDN Ð´Ð»Ñ ÑÐµÑ€Ð²ÐµÑ€Ð¾Ð²"
 
 #: config/systems/class_systemsPluginConfig.inc:48
 msgid "Branch in which servers will be stored"
-msgstr ""
+msgstr "Ð’ÐµÑ‚ÐºÐ° Ð² ÐºÐ¾Ñ‚Ð¾Ñ€Ð¾Ð¹ Ð±ÑƒÐ´ÑƒÑ‚ Ñ…Ñ€Ð°Ð½Ð¸Ñ‚ÑŒÑÑ ÑÐµÑ€Ð²ÐµÑ€Ð°"
 
 #: config/systems/class_systemsPluginConfig.inc:53
 msgid "Workstations RDN"
-msgstr ""
+msgstr "RDN Ð´Ð»Ñ Ñ€Ð°Ð±Ð¾Ñ‡Ð¸Ñ… ÑÑ‚Ð°Ñ†Ð¸Ð¹"
 
 #: config/systems/class_systemsPluginConfig.inc:53
 msgid "Branch in which workstations will be stored"
-msgstr ""
+msgstr "Ð’ÐµÑ‚ÐºÐ° Ð² ÐºÐ¾Ñ‚Ð¾Ñ€Ð¹ Ð±ÑƒÐ´ÑƒÑ‚ Ñ…Ñ€Ð°Ð½Ð¸Ñ‚ÑŒÑÑ Ñ€Ð°Ð±Ð¾Ñ‡Ð¸Ðµ ÑÑ‚Ð°Ð½Ñ†Ð¸Ð¸"
 
 #: config/systems/class_systemsPluginConfig.inc:58
 msgid "Terminal RDN"
-msgstr ""
+msgstr "RDN Ð´Ð»Ñ Ñ‚ÐµÑ€Ð¼Ð¸Ð½Ð°Ð»Ð¾Ð²"
 
 #: config/systems/class_systemsPluginConfig.inc:58
 msgid "Branch in which terminals will be stored"
-msgstr ""
+msgstr "Ð’ÐµÑ‚ÐºÐ° Ð² ÐºÐ¾Ñ‚Ð¾Ñ€Ð¾Ð¹ Ð±ÑƒÐ´ÑƒÑ‚ Ñ…Ñ€Ð°Ð½Ð¸Ñ‚ÑŒÑÑ Ñ‚ÐµÑ€Ð¼Ð¸Ð½Ð°Ð»Ñ‹"
 
 #: config/systems/class_systemsPluginConfig.inc:63
 msgid "Printer RDN"
-msgstr ""
+msgstr "RDN Ð´Ð»Ñ Ð¿Ñ€Ð¸Ð½Ñ‚ÐµÑ€Ð¾Ð²"
 
 #: config/systems/class_systemsPluginConfig.inc:63
 msgid "Branch in which printers will be stored"
-msgstr ""
+msgstr "Ð’ÐµÑ‚ÐºÐ° Ð² ÐºÐ¾Ñ‚Ð¾Ñ€Ð¾Ð¹ Ð±ÑƒÐ´ÑƒÑ‚ Ñ…Ñ€Ð°Ð½Ð¸Ñ‚ÑŒÑÑ Ð¿Ñ€Ð¸Ð½Ñ‚ÐµÑ€Ñ‹"
 
 #: config/systems/class_systemsPluginConfig.inc:68
 msgid "Component RDN"
@@ -1550,15 +1016,15 @@ msgstr ""
 
 #: config/systems/class_systemsPluginConfig.inc:68
 msgid "Branch in which network devices will be stored"
-msgstr ""
+msgstr "Ð’ÐµÑ‚ÐºÐ° Ð² ÐºÐ¾Ñ‚Ð¾Ñ€Ð¾Ð¹ ÑÐµÑ‚ÐµÐ²Ñ‹Ðµ ÑƒÑÑ‚Ñ€Ð¾Ð¹ÑÑ‚Ð²Ð° Ð±ÑƒÐ´ÑƒÑ‚ Ñ…Ñ€Ð°Ð½Ð¸Ñ‚ÑŒÑÑ"
 
 #: config/systems/class_systemsPluginConfig.inc:73
 msgid "Mobile phone RDN"
-msgstr ""
+msgstr "RDN Ð´Ð»Ñ Ð¼Ð¾Ð±Ð¸Ð»ÑŒÐ½Ñ‹Ñ… Ñ‚ÐµÐ»ÐµÑ„Ð¾Ð½Ð¾Ð²"
 
 #: config/systems/class_systemsPluginConfig.inc:73
 msgid "Branch in which mobile phones will be stored"
-msgstr ""
+msgstr "Ð’ÐµÑ‚ÐºÐ° Ð² ÐºÐ¾Ñ‚Ð¾Ñ€Ð¾Ð¹ Ð±ÑƒÐ´ÑƒÑ‚ Ñ…Ñ€Ð°Ð½Ð¸Ñ‚ÑŒÑÑ Ð¼Ð¾Ð±Ð¸Ð»ÑŒÐ½Ñ‹Ðµ Ñ‚ÐµÐ»ÐµÑ„Ð¾Ð½Ñ‹"
 
 #: config/systems/class_systemsPluginConfig.inc:80
 msgid "Miscellaneous"
@@ -1570,423 +1036,20 @@ msgstr ""
 
 #: config/systems/class_systemsPluginConfig.inc:88
 msgid "Encoding"
-msgstr ""
+msgstr "ÐšÐ¾Ð´Ð¸Ñ€Ð¾Ð²ÐºÐ°"
 
 #: config/systems/class_systemsPluginConfig.inc:88
 msgid "The encoding code name"
-msgstr ""
+msgstr "ÐÐ°Ð·Ð²Ð°Ð½Ð¸Ðµ ÐºÐ¾Ð´Ð¸Ñ€Ð¾Ð²ÐºÐ¸"
 
 #: config/systems/class_systemsPluginConfig.inc:93
 msgid "Label"
-msgstr ""
+msgstr "ÐžÐ±Ð¾Ð·Ð½Ð°Ñ‡ÐµÐ½Ð¸Ðµ"
 
 #: config/systems/class_systemsPluginConfig.inc:93
 msgid "The encoding displayed name"
-msgstr ""
+msgstr "ÐžÑ‚Ð¾Ð±Ñ€Ð°Ð¶Ð°ÐµÐ¼Ð¾Ðµ Ð¸Ð¼Ñ ÐºÐ¾Ð´Ð¸Ñ€Ð¾Ð²ÐºÐ¸"
 
 #: config/systems/class_systemsPluginConfig.inc:101
 msgid "Encodings"
 msgstr ""
-
-#: admin/ogroups/goto/termgroup.tpl.c:5
-msgid ""
-"Actions you choose here influence all systems in this object group. "
-"Additionally, all values editable here can be inherited by the clients "
-"assigned to this object group."
-msgstr ""
-
-#: admin/ogroups/goto/termgroup.tpl.c:8
-msgid "Generic"
-msgstr "ÐžÐ±Ñ‰ÐµÐµ"
-
-#: admin/ogroups/goto/termgroup.tpl.c:11
-msgid "NTP server"
-msgstr "Ð¡ÐµÑ€Ð²ÐµÑ€ NTP"
-
-#: admin/ogroups/goto/termgroup.tpl.c:14
-msgid "Choose server to use for synchronizing time"
-msgstr "Ð’Ñ‹Ð±ÐµÑ€Ð¸Ñ‚Ðµ ÑÐµÑ€Ð²ÐµÑ€ Ð´Ð»Ñ ÑÐ¸Ð½Ñ…Ñ€Ð¾Ð½Ð¸Ð·Ð°Ñ†Ð¸Ð¸ Ð²Ñ€ÐµÐ¼ÐµÐ½Ð¸"
-
-#: admin/ogroups/goto/termgroup.tpl.c:20
-msgid "Select terminal mode"
-msgstr "Ð’Ñ‹Ð±ÐµÑ€Ð¸Ñ‚Ðµ Ñ€ÐµÐ¶Ð¸Ð¼ Ñ‚ÐµÑ€Ð¼Ð¸Ð½Ð°Ð»Ð°"
-
-#: admin/ogroups/goto/termgroup.tpl.c:26
-msgid "Choose server to use for logging"
-msgstr "Ð’Ñ‹Ð±ÐµÑ€Ð¸Ñ‚Ðµ ÑÐµÑ€Ð²ÐµÑ€ Ð´Ð»Ñ Ð²ÐµÐ´ÐµÐ½Ð¸Ñ ÑÐ¸ÑÑ‚ÐµÐ¼Ð½Ñ‹Ñ… Ð¶ÑƒÑ€Ð½Ð°Ð»Ð¾Ð²"
-
-#: admin/ogroups/goto/termgroup.tpl.c:32
-msgid "Select NFS root filesystem to use"
-msgstr "Ð’Ñ‹Ð±ÐµÑ€Ð¸Ñ‚Ðµ ÐºÐ¾Ñ€Ð½ÐµÐ²ÑƒÑŽ Ñ„Ð°Ð¹Ð»Ð¾Ð²ÑƒÑŽ ÑÐ¸ÑÑ‚ÐµÐ¼Ñƒ NFS"
-
-#: admin/ogroups/goto/termgroup.tpl.c:38
-msgid "Choose NFS filesystem to place swap files on"
-msgstr "Ð’Ñ‹Ð±ÐµÑ€Ð¸Ñ‚Ðµ Ñ„Ð°Ð¹Ð»Ð¾Ð²ÑƒÑŽ ÑÐ¸ÑÑ‚ÐµÐ¼Ñƒ NFS Ð´Ð»Ñ Ñ„Ð°Ð¹Ð»Ð¾Ð² Ð¿Ð¾Ð´ÐºÐ°Ñ‡ÐºÐ¸"
-
-#: admin/ogroups/goto/termgroup.tpl.c:47
-msgid "Execute"
-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 admin/systems/network.tpl.c:11
-msgid "Propose ip"
-msgstr ""
-
-#: admin/systems/network.tpl.c:14
-msgid "MAC-address"
-msgstr "MAC-Ð°Ð´Ñ€ÐµÑ"
-
-#: admin/systems/network.tpl.c:17
-msgid "Autodetect"
-msgstr ""
-
-#: admin/systems/network.tpl.c:20 admin/systems/network.tpl.c:23
-msgid "Enable DHCP for this device"
-msgstr ""
-
-#: admin/systems/network.tpl.c:26 admin/systems/network.tpl.c:50
-msgid "not configured"
-msgstr ""
-
-#: admin/systems/network.tpl.c:29
-msgid "Parent node"
-msgstr ""
-
-#: admin/systems/network.tpl.c:32
-msgid "Edit settings"
-msgstr ""
-
-#: admin/systems/network.tpl.c:35 admin/systems/network.tpl.c:47
-msgid "Enable DNS for this device"
-msgstr ""
-
-#: admin/systems/network.tpl.c:38
-msgid "Zone"
-msgstr ""
-
-#: admin/systems/network.tpl.c:41
-msgid "TTL"
-msgstr "TTL"
-
-#: admin/systems/network.tpl.c:44
-msgid "Dns records"
-msgstr ""
-
-#: admin/systems/password.tpl.c:2
-msgid ""
-"To change the terminal root password use the fields below. The changes take "
-"effect during the next reboot. Please memorize the new password, because you"
-" wouldn't be able to log in."
-msgstr ""
-
-#: admin/systems/password.tpl.c:5
-msgid "Leave fields blank for password inheritance from default entries."
-msgstr ""
-
-#: admin/systems/password.tpl.c:8
-msgid "Changing the password impinges on authentification only."
-msgstr "Ð˜Ð·Ð¼ÐµÐ½ÐµÐ½Ð¸Ðµ Ð¿Ð°Ñ€Ð¾Ð»Ñ Ð²Ð»Ð¸ÑÐµÑ‚ Ñ‚Ð¾Ð»ÑŒÐºÐ¾ Ð½Ð° Ð°ÑƒÑ‚ÐµÐ½Ñ‚Ð¸Ñ„Ð¸ÐºÐ°Ñ†Ð¸ÑŽ Ð² ÑÐ¸ÑÑ‚ÐµÐ¼Ðµ."
-
-#: admin/systems/password.tpl.c:11
-msgid "New password"
-msgstr "ÐÐ¾Ð²Ñ‹Ð¹ Ð¿Ð°Ñ€Ð¾Ð»ÑŒ"
-
-#: admin/systems/password.tpl.c:14
-msgid "Repeat new password"
-msgstr "ÐŸÐ¾Ð´Ñ‚Ð²ÐµÑ€Ð¶Ð´ÐµÐ½Ð¸Ðµ"
-
-#: admin/systems/password.tpl.c:17
-msgid "Password strength"
-msgstr ""
-
-#: admin/systems/password.tpl.c:20
-msgid "Set password"
-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/gencd.tpl.c:2
-msgid "CD-Install-Image generation"
-msgstr ""
-
-#: admin/systems/gencd.tpl.c:5
-msgid ""
-"This option enables you to generate FAI install CD images for the selected "
-"workstation. The procedure may take about 10 minutes to complete, so please "
-"be patient after pressing the 'Create ISO-Image' button."
-msgstr ""
-
-#: admin/systems/gencd.tpl.c:8
-msgid "Create ISO-Image"
-msgstr ""
-
-#: admin/systems/remove.tpl.c:5
-msgid ""
-"This includes all account data, system access rules, imap settings, etc. for"
-" this user. Please double check if your really want to do this since there "
-"is no way for FusionDirectory to get your data back."
-msgstr ""
-
-#: admin/systems/remove.tpl.c:8
-msgid "So - if you're sure - press 'Delete' to continue or 'Cancel' to abort."
-msgstr "Ð˜Ñ‚Ð°Ðº - ÐµÑÐ»Ð¸ Ð²Ñ‹ ÑƒÐ²ÐµÑ€ÐµÐ½Ñ‹ - Ð½Ð°Ð¶Ð¼Ð¸Ñ‚Ðµ 'Ð£Ð´Ð°Ð»Ð¸Ñ‚ÑŒ', Ñ‡Ñ‚Ð¾Ð±Ñ‹ Ð¿Ñ€Ð¾Ð´Ð¾Ð»Ð¶Ð¸Ñ‚ÑŒ Ð¸Ð»Ð¸ 'ÐžÑ‚Ð¼ÐµÐ½Ð°' Ñ‡Ñ‚Ð¾Ð±Ñ‹ Ð¿Ñ€ÐµÑ€Ð²Ð°Ñ‚ÑŒ."
-
-#: admin/systems/system-filter.tpl.c:2
-#: admin/systems/phoneSelect/phoneSelect-filter.tpl.c:2
-msgid "Filter"
-msgstr "Ð¤Ð¸Ð»ÑŒÑ‚Ñ€"
-
-#: admin/systems/system-filter.tpl.c:5
-msgid "Show servers"
-msgstr "ÐŸÐ¾ÐºÐ°Ð·Ð°Ñ‚ÑŒ ÑÐµÑ€Ð²ÐµÑ€Ñ‹"
-
-#: admin/systems/system-filter.tpl.c:8
-msgid "Show workstations"
-msgstr "ÐŸÐ¾ÐºÐ°Ð·Ð°Ñ‚ÑŒ Ñ€Ð°Ð±Ð¾Ñ‡Ð¸Ðµ ÑÑ‚Ð°Ð½Ñ†Ð¸Ð¸"
-
-#: admin/systems/system-filter.tpl.c:11
-msgid "Show terminals"
-msgstr "ÐŸÐ¾ÐºÐ°Ð·Ð°Ñ‚ÑŒ Ñ‚ÐµÑ€Ð¼Ð¸Ð½Ð°Ð»Ñ‹"
-
-#: admin/systems/system-filter.tpl.c:14
-msgid "Show network printer"
-msgstr ""
-
-#: admin/systems/system-filter.tpl.c:17
-#: admin/systems/phoneSelect/phoneSelect-filter.tpl.c:5
-msgid "Show phones"
-msgstr "ÐŸÐ¾ÐºÐ°Ð·Ð°Ñ‚ÑŒ Ñ‚ÐµÐ»ÐµÑ„Ð¾Ð½Ñ‹"
-
-#: admin/systems/system-filter.tpl.c:20
-msgid "Show windows based workstations"
-msgstr ""
-
-#: admin/systems/system-filter.tpl.c:23
-msgid "Show network devices"
-msgstr ""
-
-#: admin/systems/system-filter.tpl.c:26
-#: admin/systems/phoneSelect/phoneSelect-filter.tpl.c:8
-msgid "Show mobile phones"
-msgstr ""
-
-#: admin/systems/system-filter.tpl.c:29
-msgid "Show IPMI interfaces"
-msgstr ""
-
-#: admin/systems/ppd/printerPPDSelectionDialog.tpl.c:2
-msgid "Select objects to add"
-msgstr "Ð’Ñ‹Ð±Ñ€Ð°Ñ‚ÑŒ Ð¾Ð±ÑŠÐµÐºÑ‚Ñ‹ Ð´Ð»Ñ Ð´Ð¾Ð±Ð°Ð²Ð»ÐµÐ½Ð¸Ñ"
-
-#: admin/systems/ppd/printerPPDSelectionDialog.tpl.c:5
-msgid "Filters"
-msgstr "Ð¤Ð¸Ð»ÑŒÑ‚Ñ€Ñ‹"
-
-#: admin/systems/ppd/printerPPDSelectionDialog.tpl.c:8
-msgid "Display objects matching"
-msgstr "ÐŸÐ¾ÐºÐ°Ð·Ð°Ñ‚ÑŒ ÑÐ¾Ð²Ð¿Ð°Ð´ÐµÐ½Ð¸Ñ Ð¾Ð±ÑŠÐµÐºÑ‚Ð¾Ð²"
-
-#: admin/systems/ppd/printerPPDSelectionDialog.tpl.c:11
-msgid "Regular expression for matching object names"
-msgstr "Ð ÐµÐ³ÑƒÐ»ÑÑ€Ð½Ð¾Ðµ Ð²Ñ‹Ñ€Ð°Ð¶ÐµÐ½Ð¸Ðµ, ÑÐ¾Ð¾Ñ‚Ð²ÐµÑ‚ÑÑ‚Ð²ÑƒÑŽÑ‰ÐµÐµ Ð¸Ð¼ÐµÐ½Ð°Ð¼ Ð¾Ð±ÑŠÐµÐºÑ‚Ð¾Ð²"
-
-#: admin/systems/ppd/printerPPDSelectionDialog.tpl.c:14
-msgid "Close"
-msgstr "Ð—Ð°ÐºÑ€Ñ‹Ñ‚ÑŒ"
-
-#: admin/systems/ppd/printerPPDDialog.tpl.c:2
-msgid "Printer driver"
-msgstr ""
-
-#: admin/systems/ppd/printerPPDDialog.tpl.c:5
-msgid "Model"
-msgstr "ÐœÐ¾Ð´ÐµÐ»ÑŒ"
-
-#: admin/systems/ppd/printerPPDDialog.tpl.c:8
-msgid "Select"
-msgstr ""
-
-#: admin/systems/ppd/printerPPDDialog.tpl.c:11
-msgid "New driver"
-msgstr ""
-
-#: admin/systems/ppd/printerPPDDialog.tpl.c:14
-msgid "Upload"
-msgstr "Ð—Ð°Ð³Ñ€ÑƒÐ·Ð¸Ñ‚ÑŒ"
-
-#: admin/systems/ppd/printerPPDDialog.tpl.c:17
-msgid "Options"
-msgstr "ÐŸÐ°Ñ€Ð°Ð¼ÐµÑ‚Ñ€Ñ‹"
-
-#: admin/systems/ppd/remove_ppd.tpl.c:5
-msgid "The ppd file will be removed from the server and can not be restored."
-msgstr ""
-
-#: admin/systems/printer.tpl.c:2
-msgid "General"
-msgstr ""
-
-#: admin/systems/printer.tpl.c:5
-msgid "Printer name"
-msgstr "Ð˜Ð¼Ñ Ð¿Ñ€Ð¸Ð½Ñ‚ÐµÑ€Ð°"
-
-#: admin/systems/printer.tpl.c:14
-msgid "Details"
-msgstr ""
-
-#: admin/systems/printer.tpl.c:20
-msgid "Printer location"
-msgstr ""
-
-#: admin/systems/printer.tpl.c:26
-msgid "PPD Provider"
-msgstr ""
-
-#: admin/systems/printer.tpl.c:29
-msgid "Driver"
-msgstr "Ð”Ñ€Ð°Ð¹Ð²ÐµÑ€"
-
-#: admin/systems/printer.tpl.c:32
-msgid "Edit"
-msgstr "Ð˜Ð·Ð¼ÐµÐ½Ð¸Ñ‚ÑŒ"
-
-#: admin/systems/printer.tpl.c:41
-msgid "Users which are allowed to use this printer"
-msgstr ""
-
-#: admin/systems/printer.tpl.c:44
-msgid "Users"
-msgstr "ÐŸÐ¾Ð»ÑŒÐ·Ð¾Ð²Ð°Ñ‚ÐµÐ»Ð¸"
-
-#: admin/systems/printer.tpl.c:47
-msgid "Users which are allowed to administrate this printer"
-msgstr ""
-
-#: admin/systems/printer.tpl.c:50
-msgid "Admins"
-msgstr ""
-
-#: admin/systems/printer.tpl.c:53
-msgid "Windows paths"
-msgstr ""
-
-#: admin/systems/printer.tpl.c:56
-msgid "Printer windows inf file"
-msgstr ""
-
-#: admin/systems/printer.tpl.c:59
-msgid "Printer driver directory"
-msgstr ""
-
-#: admin/systems/gencd_frame.tpl.c:2
-msgid "Your browser does not supprt iframes."
-msgstr ""
-
-#: admin/systems/services/cups/serviceCUPS.tpl.c:2
-msgid "Print Service"
-msgstr ""
-
-#: admin/systems/services/cups/serviceCUPS.tpl.c:5
-msgid "enabled"
-msgstr ""
-
-#: admin/systems/services/ServiceAddDialog.tpl.c:2
-msgid "Adding a new service to the current server"
-msgstr ""
-
-#: admin/systems/services/ServiceAddDialog.tpl.c:5
-msgid ""
-"This dialog allows you to add new services to the currenty edited server "
-"object. The box below shows all available but not already used services."
-msgstr ""
-
-#: admin/systems/services/ServiceAddDialog.tpl.c:8
-msgid "Service to add"
-msgstr ""
-
-#: admin/systems/services/ServiceAddDialog.tpl.c:11
-msgid "All available services are already in use."
-msgstr ""
-
-#: admin/systems/services/ServiceAddDialog.tpl.c:14
-#: admin/systems/SelectDeviceType.tpl.c:26
-msgid "Continue"
-msgstr "ÐŸÑ€Ð¾Ð´Ð¾Ð»Ð¶Ð¸Ñ‚ÑŒ"
-
-#: admin/systems/SelectDeviceType.tpl.c:2
-msgid ""
-"This system has no system type configured. Please choose a system type for "
-"this object and an optional inheritance group. Press the 'continue' button "
-"to proceed."
-msgstr ""
-
-#: admin/systems/SelectDeviceType.tpl.c:5
-msgid ""
-"Please select a system type and an optional bundle of predefined settings to"
-" be inherited."
-msgstr ""
-
-#: admin/systems/SelectDeviceType.tpl.c:8
-msgid ""
-"Please select a system type and a bundle of predefined settings to be "
-"inherited."
-msgstr ""
-
-#: admin/systems/SelectDeviceType.tpl.c:11
-#: admin/systems/SelectDeviceType.tpl.c:14
-msgid "System type"
-msgstr ""
-
-#: admin/systems/SelectDeviceType.tpl.c:17
-msgid "Choose an object group as template"
-msgstr ""
-
-#: admin/systems/SelectDeviceType.tpl.c:20
-msgid "Object group"
-msgstr "ÐžÐ±ÑŠÐµÐºÑ‚ Ð³Ñ€ÑƒÐ¿Ð¿Ñ‹"
-
-#: admin/systems/SelectDeviceType.tpl.c:23
-msgid "none"
-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] ""
-
-#: 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] ""
diff --git a/systems/locale/ru@petr1708/fusiondirectory.po b/systems/locale/ru@petr1708/fusiondirectory.po
index dd869a6579c034d1d6656ed63229c35715851c07..6b10281c2bc2b0c2aed25ee1a6458394b5a96040 100644
--- a/systems/locale/ru@petr1708/fusiondirectory.po
+++ b/systems/locale/ru@petr1708/fusiondirectory.po
@@ -5,17 +5,17 @@
 # Translators:
 msgid ""
 msgstr ""
-"Project-Id-Version: FusionDirectory-108\n"
+"Project-Id-Version: FusionDirectory-109\n"
 "Report-Msgid-Bugs-To: documentation@lists.fusiondirectory.org\n"
-"POT-Creation-Date: 2015-03-31 11:49+0200\n"
-"PO-Revision-Date: 2015-03-31 11:24+0000\n"
+"POT-Creation-Date: 2014-12-15 17:47+0100\n"
+"PO-Revision-Date: 2014-12-15 17:06+0000\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>\n"
-"Language-Team: Russian Petrine orthography (http://www.transifex.com/projects/p/FusionDirectory-108/language/ru@petr1708/)\n"
+"Language-Team: Russian Petrine orthography (http://www.transifex.com/projects/p/FusionDirectory-109/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=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);\n"
+"Plural-Forms: nplurals=4; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%10<=4 && (n%100<12 || n%100>14) ? 1 : n%10==0 || (n%10>=5 && n%10<=9) || (n%100>=11 && n%100<=14)? 2 : 3);\n"
 
 #: admin/ogroups/goto/class_termgroup.inc:70
 msgid "Activated"
@@ -26,29 +26,24 @@ msgid "Locked"
 msgstr ""
 
 #: admin/ogroups/goto/class_termgroup.inc:118
-#: admin/systems/class_terminalGeneric.inc:121
+#: admin/systems/class_terminalStartup.inc:145
 msgid "Local swap"
 msgstr ""
 
 #: admin/ogroups/goto/class_termgroup.inc:124
 #: admin/ogroups/goto/class_termgroup.inc:136
-#: admin/systems/class_workstationGeneric.inc:352
-#: admin/systems/class_terminalGeneric.inc:109
-#: admin/systems/class_terminalGeneric.inc:125
+#: admin/systems/class_terminalStartup.inc:133
+#: admin/systems/class_terminalStartup.inc:149
 msgid "inherited"
 msgstr ""
 
 #: admin/ogroups/goto/class_termgroup.inc:220
-#: admin/systems/class_workstationGeneric.inc:72
-#: admin/systems/class_workstationGeneric.inc:443
-#: admin/systems/class_systemManagement.inc:295
-#: admin/systems/class_systemManagement.inc:325
-msgid "Infrastructure service"
+#: admin/systems/class_systemManagement.inc:165
+#: admin/systems/class_systemManagement.inc:186
+msgid "Service infrastructure"
 msgstr ""
 
 #: admin/ogroups/goto/class_termgroup.inc:224
-#: admin/systems/class_workstationGeneric.inc:75
-#: admin/systems/class_workstationGeneric.inc:78
 msgid "Event error"
 msgstr ""
 
@@ -58,12 +53,10 @@ msgid "Event '%s' is not available!"
 msgstr ""
 
 #: admin/ogroups/goto/class_termgroup.inc:274
-#: admin/systems/class_workstationGeneric.inc:112
 msgid "Switch off"
 msgstr ""
 
 #: admin/ogroups/goto/class_termgroup.inc:274
-#: admin/systems/class_workstationGeneric.inc:113
 msgid "Reboot"
 msgstr ""
 
@@ -84,7 +77,6 @@ msgid "Reinstall"
 msgstr ""
 
 #: admin/ogroups/goto/class_termgroup.inc:279
-#: admin/systems/class_workstationGeneric.inc:108
 msgid "Memory test"
 msgstr ""
 
@@ -93,21 +85,18 @@ msgid "System analysis"
 msgstr ""
 
 #: admin/ogroups/goto/class_termgroup.inc:386
-#: admin/systems/class_printGeneric.inc:670
-#: admin/systems/class_printGeneric.inc:970
-#: admin/systems/class_systemManagement.inc:816
 #: admin/systems/services/class_goService.inc:123
 #: admin/systems/services/class_goService.inc:151
 #: admin/systems/services/class_goService.inc:187
-#: admin/systems/class_networkSettings.inc:478
-#: admin/systems/class_networkSettings.inc:491
-#: admin/systems/class_networkSettings.inc:757
-#: admin/systems/class_networkSettings.inc:816
-#: admin/systems/class_networkSettings.inc:835
-#: admin/systems/class_networkSettings.inc:852
-#: admin/systems/class_networkSettings.inc:861
-#: admin/systems/class_networkSettings.inc:879
-#: admin/systems/class_networkSettings.inc:951
+#: admin/systems/class_networkSettings.inc:470
+#: admin/systems/class_networkSettings.inc:483
+#: admin/systems/class_networkSettings.inc:749
+#: admin/systems/class_networkSettings.inc:808
+#: admin/systems/class_networkSettings.inc:827
+#: admin/systems/class_networkSettings.inc:844
+#: admin/systems/class_networkSettings.inc:853
+#: admin/systems/class_networkSettings.inc:871
+#: admin/systems/class_networkSettings.inc:943
 msgid "LDAP error"
 msgstr ""
 
@@ -119,195 +108,125 @@ msgstr ""
 msgid "System group"
 msgstr ""
 
-#: admin/ogroups/goto/class_termgroup.inc:401
-#: admin/ogroups/goto/termgroup.tpl.c:17
+#: admin/ogroups/goto/class_termgroup.inc:402
 msgid "Mode"
 msgstr ""
 
-#: admin/ogroups/goto/class_termgroup.inc:402
-#: admin/systems/class_workstationGeneric.inc:189
-#: admin/ogroups/goto/termgroup.tpl.c:23
+#: admin/ogroups/goto/class_termgroup.inc:403
+#: admin/systems/class_systemServers.inc:35
 msgid "Syslog server"
 msgstr ""
 
-#: admin/ogroups/goto/class_termgroup.inc:403
+#: admin/ogroups/goto/class_termgroup.inc:404
 msgid "Action flag"
 msgstr ""
 
-#: admin/ogroups/goto/class_termgroup.inc:404
+#: admin/ogroups/goto/class_termgroup.inc:405
 msgid "Ntp server"
 msgstr ""
 
-#: admin/ogroups/goto/class_termgroup.inc:405
-#: admin/systems/class_terminalGeneric.inc:41
-#: admin/ogroups/goto/termgroup.tpl.c:29
+#: admin/ogroups/goto/class_termgroup.inc:406
+#: admin/systems/class_terminalStartup.inc:65
 msgid "Root server"
 msgstr ""
 
-#: admin/ogroups/goto/class_termgroup.inc:406
-#: admin/systems/class_terminalGeneric.inc:47
-#: admin/ogroups/goto/termgroup.tpl.c:35
+#: admin/ogroups/goto/class_termgroup.inc:407
+#: admin/systems/class_terminalStartup.inc:69
 msgid "Swap server"
 msgstr ""
 
-#: admin/systems/class_terminalStartup.inc:63
+#: admin/systems/class_terminalStartup.inc:62
 msgid "Startup parameters"
 msgstr ""
 
-#: admin/systems/class_terminalStartup.inc:66
+#: admin/systems/class_terminalStartup.inc:65
+msgid "The root server the terminal should be using"
+msgstr ""
+
+#: admin/systems/class_terminalStartup.inc:69
+msgid "The swap server the terminal should be using"
+msgstr ""
+
+#: admin/systems/class_terminalStartup.inc:73
 msgid "Boot kernel"
 msgstr ""
 
-#: admin/systems/class_terminalStartup.inc:66
+#: admin/systems/class_terminalStartup.inc:73
 msgid "Linux kernel to be installed and booted"
 msgstr ""
 
-#: admin/systems/class_terminalStartup.inc:70
+#: admin/systems/class_terminalStartup.inc:77
 msgid "Boot kernel parameters"
 msgstr ""
 
-#: admin/systems/class_terminalStartup.inc:70
+#: admin/systems/class_terminalStartup.inc:77
 msgid "Linux kernel parameters to be ran"
 msgstr ""
 
-#: admin/systems/class_terminalStartup.inc:82
-msgid "Startup"
-msgstr ""
-
 #: admin/systems/class_terminalStartup.inc:83
-msgid "Terminal startup"
-msgstr ""
-
-#: admin/systems/system-list.xml:10
-msgid "List of systems"
-msgstr ""
-
-#: admin/systems/system-list.xml:14
-msgid "New workstation"
-msgstr ""
-
-#: admin/systems/system-list.xml:22
-msgid "Locked server"
-msgstr ""
-
-#: admin/systems/system-list.xml:30
-msgid "Locked workstation"
-msgstr ""
-
-#: admin/systems/system-list.xml:38
-msgid "Locked terminal"
-msgstr ""
-
-#: admin/systems/system-list.xml:47
-msgid "New terminal"
-msgstr ""
-
-#: admin/systems/system-list.xml:55
-msgid "New device"
-msgstr ""
-
-#: admin/systems/system-list.xml:63
-msgid "Workstation template"
-msgstr ""
-
-#: admin/systems/system-list.xml:71
-msgid "Terminal template"
-msgstr ""
-
-#: admin/systems/system-list.xml:79
-msgid "Winstation"
+msgid "Remote desktop"
 msgstr ""
 
-#: admin/systems/system-list.xml:87 admin/systems/system-list.xml:234
-#: admin/systems/class_systemImport.inc:169
-#: admin/systems/class_serverGeneric.inc:46
-#: admin/systems/class_serverGeneric.inc:51
-#: admin/systems/class_serverGeneric.inc:52
-#: admin/systems/class_SelectDeviceType.inc:58
-msgid "Server"
+#: admin/systems/class_terminalStartup.inc:87
+msgid "Connect method"
 msgstr ""
 
-#: admin/systems/system-list.xml:95 admin/systems/system-list.xml:242
-#: admin/systems/class_workstationGeneric.inc:458
-#: admin/systems/class_workstationGeneric.inc:463
-#: admin/systems/class_workstationGeneric.inc:464
-#: admin/systems/class_SelectDeviceType.inc:58
-msgid "Workstation"
+#: admin/systems/class_terminalStartup.inc:91
+msgid "XDMCP"
 msgstr ""
 
-#: admin/systems/system-list.xml:103 admin/systems/system-list.xml:250
-#: admin/systems/class_terminalGeneric.inc:81
-#: admin/systems/class_terminalGeneric.inc:86
-#: admin/systems/class_terminalGeneric.inc:87
-#: admin/systems/class_SelectDeviceType.inc:58
-msgid "Terminal"
+#: admin/systems/class_terminalStartup.inc:91
+msgid "LDM"
 msgstr ""
 
-#: admin/systems/system-list.xml:111 admin/systems/class_printGeneric.inc:1005
-#: admin/systems/class_printGeneric.inc:1011
-#: admin/systems/class_printGeneric.inc:1012
-msgid "Printer"
+#: admin/systems/class_terminalStartup.inc:91
+msgid "Shell"
 msgstr ""
 
-#: admin/systems/system-list.xml:119 admin/systems/system-list.xml:274
-#: admin/systems/class_mobilePhoneGeneric.inc:74
-#: admin/systems/phoneSelect/phoneSelect-list.xml:14
-msgid "Phone"
+#: admin/systems/class_terminalStartup.inc:91
+msgid "Telnet"
 msgstr ""
 
-#: admin/systems/system-list.xml:127
-#: admin/systems/class_mobilePhoneGeneric.inc:36
-#: admin/systems/class_mobilePhoneGeneric.inc:41
-#: admin/systems/class_mobilePhoneGeneric.inc:42
-#: admin/systems/phoneSelect/phoneSelect-list.xml:22
-msgid "Mobile phone"
+#: admin/systems/class_terminalStartup.inc:91
+msgid "Windows RDP"
 msgstr ""
 
-#: admin/systems/system-list.xml:135
-#: admin/systems/class_componentGeneric.inc:36
-msgid "Component"
+#: admin/systems/class_terminalStartup.inc:95
+msgid "Terminal server"
 msgstr ""
 
-#: admin/systems/system-list.xml:143 admin/systems/system-list.xml:298
-msgid "IPMI"
+#: admin/systems/system-list.xml:10
+msgid "List of systems"
 msgstr ""
 
-#: admin/systems/system-list.xml:169
-#: admin/systems/class_workstationGeneric.inc:154
-#: admin/systems/class_printGeneric.inc:752
-#: admin/systems/class_printGeneric.inc:762
-#: admin/systems/class_printGeneric.inc:781
-#: admin/systems/class_printGeneric.inc:1022
-#: admin/systems/class_componentGeneric.inc:64
-#: admin/systems/class_mobilePhoneGeneric.inc:63
-#: admin/systems/phoneSelect/phoneSelect-list.xml:48
+#: admin/systems/system-list.xml:31
+#: admin/systems/class_workstationGeneric.inc:46
+#: admin/systems/class_printGeneric.inc:60
+#: admin/systems/class_componentGeneric.inc:58
+#: admin/systems/class_mobilePhoneGeneric.inc:60
 #: admin/systems/services/shares/class_serviceShare.inc:52
-#: admin/systems/system-filter.tpl.c:32
-#: admin/systems/phoneSelect/phoneSelect-filter.tpl.c:11
 msgid "Name"
 msgstr ""
 
-#: admin/systems/system-list.xml:177
-#: admin/systems/phoneSelect/phoneSelect-list.xml:63
+#: admin/systems/system-list.xml:39
 msgid "IP"
 msgstr ""
 
-#: admin/systems/system-list.xml:185
+#: admin/systems/system-list.xml:47
 msgid "MAC"
 msgstr ""
 
-#: admin/systems/system-list.xml:193
-#: admin/systems/class_workstationGeneric.inc:160
-#: admin/systems/class_printGeneric.inc:1024
-#: admin/systems/class_componentGeneric.inc:68
-#: admin/systems/class_mobilePhoneGeneric.inc:67
+#: admin/systems/system-list.xml:55
+#: admin/systems/class_workstationGeneric.inc:51
+#: admin/systems/class_printGeneric.inc:64
+#: admin/systems/class_componentGeneric.inc:62
+#: admin/systems/class_mobilePhoneGeneric.inc:64
 #: admin/systems/serverService-list.xml:35
 #: admin/systems/services/shares/class_serviceShare.inc:56
-#: admin/systems/printer.tpl.c:8 admin/systems/printer.tpl.c:17
 msgid "Description"
 msgstr ""
 
-#: admin/systems/system-list.xml:201 admin/systems/class_serverService.inc:57
+#: admin/systems/system-list.xml:63 admin/systems/class_serverService.inc:57
 #: admin/systems/services/terminal/class_serviceTerminal.inc:30
 #: admin/systems/services/cups/class_serviceCUPS.inc:85
 #: admin/systems/services/shares/class_serviceShare.inc:31
@@ -316,378 +235,186 @@ msgstr ""
 msgid "Services"
 msgstr ""
 
-#: admin/systems/system-list.xml:209
+#: admin/systems/system-list.xml:71
 msgid "Release"
 msgstr ""
 
-#: admin/systems/system-list.xml:217 admin/systems/serverService-list.xml:43
-#: admin/systems/phoneSelect/phoneSelect-list.xml:70
+#: admin/systems/system-list.xml:79 admin/systems/serverService-list.xml:43
 msgid "Actions"
 msgstr ""
 
-#: admin/systems/system-list.xml:228 admin/systems/serverService-list.xml:54
+#: admin/systems/system-list.xml:90 admin/systems/serverService-list.xml:54
 msgid "Create"
 msgstr ""
 
-#: admin/systems/system-list.xml:258
-msgid "winStation"
-msgstr ""
-
-#: admin/systems/system-list.xml:266
-msgid "Network printer"
-msgstr ""
-
-#: admin/systems/system-list.xml:282
-#: admin/systems/class_componentGeneric.inc:41
-#: admin/systems/class_componentGeneric.inc:42
-msgid "Network device"
-msgstr ""
-
-#: admin/systems/system-list.xml:290
-msgid "Mobile Phone"
-msgstr ""
-
-#: admin/systems/system-list.xml:310
+#: admin/systems/system-list.xml:100
 msgid "Trigger action"
 msgstr ""
 
-#: admin/systems/system-list.xml:317
+#: admin/systems/system-list.xml:107
 msgid "Schedule action"
 msgstr ""
 
-#: admin/systems/system-list.xml:330
-msgid "Activate systems"
-msgstr ""
-
-#: admin/systems/system-list.xml:337 admin/systems/serverService-list.xml:69
-#: admin/systems/printer.tpl.c:35
+#: admin/systems/system-list.xml:119 admin/systems/serverService-list.xml:69
 msgid "Remove"
 msgstr ""
 
-#: admin/systems/system-list.xml:367
-msgid "Create ISO"
-msgstr ""
-
-#: admin/systems/system-list.xml:379
+#: admin/systems/system-list.xml:150
 msgid "Edit system"
 msgstr ""
 
-#: admin/systems/system-list.xml:392
+#: admin/systems/system-list.xml:163
 msgid "Remove system"
 msgstr ""
 
-#: admin/systems/class_workstationGeneric.inc:75
-#, php-format
-msgid "Event %s is not available!"
-msgstr ""
-
-#: admin/systems/class_workstationGeneric.inc:78
-msgid "Events are not available!"
-msgstr ""
-
-#: admin/systems/class_workstationGeneric.inc:106
-msgid "(Re)Install"
-msgstr ""
-
-#: admin/systems/class_workstationGeneric.inc:107
-msgid "Software update"
-msgstr ""
-
-#: admin/systems/class_workstationGeneric.inc:115
-msgid "Wake up"
-msgstr ""
-
-#: admin/systems/class_workstationGeneric.inc:144
-#: admin/systems/class_printGeneric.inc:604
+#: admin/systems/class_workstationGeneric.inc:35
 msgid "workstation"
 msgstr ""
 
-#: admin/systems/class_workstationGeneric.inc:151
-#: admin/systems/class_componentGeneric.inc:61
-#: admin/systems/class_mobilePhoneGeneric.inc:60
+#: admin/systems/class_workstationGeneric.inc:42
+#: admin/systems/class_printGeneric.inc:56
+#: admin/systems/class_componentGeneric.inc:55
+#: admin/systems/class_mobilePhoneGeneric.inc:56
 msgid "Properties"
 msgstr ""
 
-#: admin/systems/class_workstationGeneric.inc:155
+#: admin/systems/class_workstationGeneric.inc:47
 #, php-format
 msgid "The name of the %s"
 msgstr ""
 
-#: admin/systems/class_workstationGeneric.inc:161
+#: admin/systems/class_workstationGeneric.inc:52
 #, php-format
 msgid "A short description of the %s"
 msgstr ""
 
-#: admin/systems/class_workstationGeneric.inc:166
-#: admin/systems/class_printGeneric.inc:1025
+#: admin/systems/class_workstationGeneric.inc:56
 msgid "Location"
 msgstr ""
 
-#: admin/systems/class_workstationGeneric.inc:167
+#: admin/systems/class_workstationGeneric.inc:57
 #, php-format
 msgid "The location of the %s"
 msgstr ""
 
-#: admin/systems/class_workstationGeneric.inc:173
+#: admin/systems/class_workstationGeneric.inc:61
 #, php-format
 msgid "Lock this %s"
 msgstr ""
 
-#: admin/systems/class_workstationGeneric.inc:174
+#: admin/systems/class_workstationGeneric.inc:62
 #, php-format
 msgid "This will prevent the %s from being reinstalled"
 msgstr ""
 
-#: admin/systems/class_workstationGeneric.inc:185
-#: addons/dashboard/class_dashBoardSystems.inc:48
-msgid "Servers"
-msgstr ""
-
-#: admin/systems/class_workstationGeneric.inc:190
-#, php-format
-msgid "The syslog server the %s should be using"
-msgstr ""
-
-#: admin/systems/class_workstationGeneric.inc:195
-msgid "Inherit NTP servers"
-msgstr ""
-
-#: admin/systems/class_workstationGeneric.inc:196
-msgid "Inherit time server attributes from ogroup"
-msgstr ""
-
-#: admin/systems/class_workstationGeneric.inc:202
-msgid "NTP servers"
-msgstr ""
-
-#: admin/systems/class_workstationGeneric.inc:203
-#, php-format
-msgid "The NTP servers for the %s"
+#: admin/systems/class_workstationGeneric.inc:73
+#: admin/systems/class_printGeneric.inc:83
+#: admin/systems/class_componentGeneric.inc:69
+#: admin/systems/class_mobilePhoneGeneric.inc:102
+#: admin/systems/class_networkSettings.inc:1008
+msgid "Network settings"
 msgstr ""
 
-#: admin/systems/class_workstationGeneric.inc:209
-msgid "Inherit LDAP servers"
+#: admin/systems/class_workstationGeneric.inc:78
+#: admin/systems/class_printGeneric.inc:87
+#: admin/systems/class_componentGeneric.inc:73
+#: admin/systems/class_mobilePhoneGeneric.inc:106
+#: admin/systems/class_networkSettings.inc:630
+#: admin/systems/class_networkSettings.inc:643
+#: admin/systems/class_networkSettings.inc:645
+#: admin/systems/class_networkSettings.inc:1014
+msgid "IP address"
 msgstr ""
 
-#: admin/systems/class_workstationGeneric.inc:210
-msgid "Inherit LDAP server attributes from ogroup"
+#: admin/systems/class_workstationGeneric.inc:78
+msgid "IP addresses this system uses (v4 or v6)"
 msgstr ""
 
-#: admin/systems/class_workstationGeneric.inc:216
-msgid "LDAP servers"
+#: admin/systems/class_workstationGeneric.inc:83
+#: admin/systems/class_printGeneric.inc:91
+#: admin/systems/class_componentGeneric.inc:77
+#: admin/systems/class_mobilePhoneGeneric.inc:110
+msgid "Mac address"
 msgstr ""
 
-#: admin/systems/class_workstationGeneric.inc:217
-#, php-format
-msgid "The LDAP servers for the %s"
+#: admin/systems/class_workstationGeneric.inc:83
+#: admin/systems/class_printGeneric.inc:91
+#: admin/systems/class_componentGeneric.inc:77
+#: admin/systems/class_mobilePhoneGeneric.inc:110
+msgid "Mac address of this system"
 msgstr ""
 
-#: admin/systems/class_workstationGeneric.inc:225
-#: admin/systems/class_workstationGeneric.inc:229
-#: admin/ogroups/goto/termgroup.tpl.c:41
-msgid "Action"
+#: admin/systems/class_workstationGeneric.inc:125
+#: admin/systems/class_workstationGeneric.inc:130
+#: admin/systems/class_workstationGeneric.inc:131
+msgid "Workstation"
 msgstr ""
 
-#: admin/systems/class_workstationGeneric.inc:230
-#: admin/ogroups/goto/termgroup.tpl.c:44
-msgid "Select action to execute for this terminal"
+#: admin/systems/class_workstationGeneric.inc:126
+msgid "Workstation information"
 msgstr ""
 
-#: admin/systems/class_workstationGeneric.inc:236
-#: admin/systems/class_componentGeneric.inc:75
-#: admin/systems/class_mobilePhoneGeneric.inc:106
-#: admin/systems/class_networkSettings.inc:1016
-msgid "Network settings"
+#: admin/systems/class_printGeneric.inc:32
+#: admin/systems/class_printGeneric.inc:37
+#: admin/systems/class_printGeneric.inc:38
+msgid "Printer"
 msgstr ""
 
-#: admin/systems/class_workstationGeneric.inc:459
-msgid "Workstation information"
+#: admin/systems/class_printGeneric.inc:33
+msgid "Printer information"
 msgstr ""
 
-#: admin/systems/class_printGeneric.inc:131
-#: admin/systems/class_printGeneric.inc:1065
-#: admin/systems/class_systemManagement.inc:678
-msgid "Internal error"
+#: admin/systems/class_printGeneric.inc:60
+msgid "The name of the printer"
 msgstr ""
 
-#: admin/systems/class_printGeneric.inc:131
-#, php-format
-msgid ""
-"Cannot determine a valid department for this object. Setting base to '%s'!"
+#: admin/systems/class_printGeneric.inc:64
+msgid "A short description of the printer"
 msgstr ""
 
-#: admin/systems/class_printGeneric.inc:311
-#: admin/systems/class_printGeneric.inc:319
-#: admin/systems/class_printGeneric.inc:324
-#: admin/systems/class_printGeneric.inc:374
-#: admin/systems/class_printGeneric.inc:390
-#: admin/systems/class_printGeneric.inc:393
-msgid "Add printer extension"
+#: admin/systems/class_printGeneric.inc:70
+msgid "Details"
 msgstr ""
 
-#: admin/systems/class_printGeneric.inc:312
-msgid ""
-"Could not initialize printer tab, parameter parent was missing while "
-"construction."
+#: admin/systems/class_printGeneric.inc:73
+msgid "Printer location"
 msgstr ""
 
-#: admin/systems/class_printGeneric.inc:320
-msgid "This is a workstation template, printer tab is disabled."
+#: admin/systems/class_printGeneric.inc:73
+msgid "The location of the printer"
 msgstr ""
 
-#: admin/systems/class_printGeneric.inc:325
-msgid "This is a terminal template, printer tab is disabled."
+#: admin/systems/class_printGeneric.inc:77
+msgid "Printer URL"
 msgstr ""
 
-#: admin/systems/class_printGeneric.inc:367
-#: admin/systems/class_printGeneric.inc:375
-#: admin/systems/class_printGeneric.inc:383
-#: admin/systems/class_printGeneric.inc:386
-#: admin/systems/class_printGeneric.inc:391
-#: admin/systems/class_printGeneric.inc:394
-msgid "printer"
+#: admin/systems/class_printGeneric.inc:77
+msgid "The URL of the printer"
 msgstr ""
 
-#: admin/systems/class_printGeneric.inc:375
-msgid ""
-"You can't enable it while 'cn' is not present in entry. Possibly you are "
-"currently creating a new terminal template."
+#: admin/systems/class_printGeneric.inc:87
+#: admin/systems/class_componentGeneric.inc:73
+#: admin/systems/class_mobilePhoneGeneric.inc:106
+msgid "IP address this system uses"
 msgstr ""
 
-#: admin/systems/class_printGeneric.inc:382
-#: admin/systems/class_printGeneric.inc:385
-msgid "Remove printer extension"
+#: admin/systems/class_serverService.inc:58
+msgid "Server services"
 msgstr ""
 
-#: admin/systems/class_printGeneric.inc:474
-#: admin/systems/class_printGeneric.inc:652
-#: admin/systems/class_printGeneric.inc:659
-#: admin/systems/class_printGeneric.inc:718
-#: admin/systems/class_printGeneric.inc:1105
-#: admin/systems/class_printGeneric.inc:1116
 #: admin/systems/class_serverService.inc:224
 #: admin/systems/class_serverService.inc:270
 #: admin/systems/class_serverService.inc:393
-#: admin/systems/class_systemManagement.inc:341
-#: admin/systems/class_systemManagement.inc:624
-#: admin/systems/class_systemManagement.inc:639
 #: admin/systems/services/shares/class_serviceShare.inc:103
-#: admin/systems/class_networkSettings.inc:305
-#: admin/systems/class_networkSettings.inc:336
-#: admin/systems/class_networkSettings.inc:584
-#: admin/systems/class_networkSettings.inc:591
-#: admin/systems/class_networkSettings.inc:597
-#: admin/systems/class_networkSettings.inc:604
+#: admin/systems/class_networkSettings.inc:297
+#: admin/systems/class_networkSettings.inc:328
+#: admin/systems/class_networkSettings.inc:576
+#: admin/systems/class_networkSettings.inc:583
+#: admin/systems/class_networkSettings.inc:589
+#: admin/systems/class_networkSettings.inc:596
 msgid "Error"
 msgstr ""
 
-#: admin/systems/class_printGeneric.inc:577
-#, php-format
-msgid "Your currently selected PPD file '%s' doesn't exist."
-msgstr ""
-
-#: admin/systems/class_printGeneric.inc:583
-msgid "Not defined"
-msgstr ""
-
-#: admin/systems/class_printGeneric.inc:587
-#: admin/systems/ppd/class_printerPPDDialog.inc:116
-msgid "Can't get ppd informations."
-msgstr ""
-
-#: admin/systems/class_printGeneric.inc:602
-#: admin/systems/class_printGeneric.inc:604
-#, php-format
-msgid "This printer belongs to %s. You can't rename this printer."
-msgstr ""
-
-#: admin/systems/class_printGeneric.inc:602
-#: admin/systems/class_terminalGeneric.inc:34
-msgid "terminal"
-msgstr ""
-
-#: admin/systems/class_printGeneric.inc:652
-#: admin/systems/class_printGeneric.inc:659
-msgid "Object is no printer!"
-msgstr ""
-
-#: admin/systems/class_printGeneric.inc:767 admin/systems/printer.tpl.c:23
-msgid "Printer URL"
-msgstr ""
-
-#: admin/systems/class_printGeneric.inc:989
-#: admin/systems/class_printGeneric.inc:991
-msgid "Group"
-msgstr ""
-
-#: admin/systems/class_printGeneric.inc:994
-msgid "User"
-msgstr ""
-
-#: admin/systems/class_printGeneric.inc:1006
-msgid "Printer information"
-msgstr ""
-
-#: admin/systems/class_printGeneric.inc:1023
-#: admin/systems/serverService-list.tpl.c:2
-#: admin/systems/phoneSelect/phoneSelect-list.tpl.c:2
-#: admin/systems/printer.tpl.c:11
-msgid "Base"
-msgstr ""
-
-#: admin/systems/class_printGeneric.inc:1026
-msgid "LabeledURL"
-msgstr ""
-
-#: admin/systems/class_printGeneric.inc:1027
-msgid "Printer PPD"
-msgstr ""
-
-#: admin/systems/class_printGeneric.inc:1028 admin/systems/printer.tpl.c:38
-msgid "Permissions"
-msgstr ""
-
-#: admin/systems/class_printGeneric.inc:1030
-msgid "Windows inf file"
-msgstr ""
-
-#: admin/systems/class_printGeneric.inc:1031
-msgid "Windows driver dir"
-msgstr ""
-
-#: admin/systems/class_printGeneric.inc:1032 admin/systems/printer.tpl.c:62
-msgid "Driver printer name"
-msgstr ""
-
-#: admin/systems/class_printGeneric.inc:1048
-#: admin/systems/class_printGeneric.inc:1070
-msgid "Permission error"
-msgstr ""
-
-#: admin/systems/class_printGeneric.inc:1048
-#: admin/systems/class_printGeneric.inc:1070
-msgid "printer user"
-msgstr ""
-
-#: admin/systems/class_printGeneric.inc:1065
-#, php-format
-msgid "Illegal member type '%s'!"
-msgstr ""
-
-#: admin/systems/class_printGeneric.inc:1105
-#, php-format
-msgid "'%s' is already used!"
-msgstr ""
-
-#: admin/systems/class_printGeneric.inc:1116
-#, php-format
-msgid "'%s' does not exist!"
-msgstr ""
-
-#: admin/systems/class_serverService.inc:58
-msgid "Server services"
-msgstr ""
-
 #: admin/systems/class_serverService.inc:332
 msgid "Filter error"
 msgstr ""
@@ -711,313 +438,163 @@ msgstr ""
 msgid "Could not get execute action %s on service %s."
 msgstr ""
 
-#: admin/systems/class_terminalGeneric.inc:42
-#, php-format
-msgid "The root server the terminal should be using"
+#: admin/systems/class_terminalGeneric.inc:31
+msgid "terminal"
 msgstr ""
 
+#: admin/systems/class_terminalGeneric.inc:43
 #: admin/systems/class_terminalGeneric.inc:48
-#, php-format
-msgid "The swap server the terminal should be using"
-msgstr ""
-
-#: admin/systems/class_terminalGeneric.inc:54
-msgid "Remote desktop"
-msgstr ""
-
-#: admin/systems/class_terminalGeneric.inc:58
-msgid "Connect method"
-msgstr ""
-
-#: admin/systems/class_terminalGeneric.inc:62
-msgid "XDMCP"
-msgstr ""
-
-#: admin/systems/class_terminalGeneric.inc:62
-msgid "LDM"
-msgstr ""
-
-#: admin/systems/class_terminalGeneric.inc:62
-msgid "Shell"
-msgstr ""
-
-#: admin/systems/class_terminalGeneric.inc:62
-msgid "Telnet"
-msgstr ""
-
-#: admin/systems/class_terminalGeneric.inc:62
-msgid "Windows RDP"
-msgstr ""
-
-#: admin/systems/class_terminalGeneric.inc:66
-msgid "Terminal server"
+#: admin/systems/class_terminalGeneric.inc:49
+msgid "Terminal"
 msgstr ""
 
-#: admin/systems/class_terminalGeneric.inc:82
+#: admin/systems/class_terminalGeneric.inc:44
 msgid "Terminal information"
 msgstr ""
 
-#: admin/systems/ppd/class_printerPPDSelectionDialog.inc:91
-#: admin/systems/ppd/class_printerPPDSelectionDialog.inc:116
-#: admin/systems/ppd/class_printerPPDSelectionDialog.inc:139
-#: admin/systems/ppd/class_printerPPDDialog.inc:92
-#: admin/systems/ppd/class_printerPPDDialog.inc:160
-#: admin/systems/ppd/class_printerPPDDialog.inc:241
-#: admin/systems/ppd/class_printerPPDDialog.inc:256
-#: admin/systems/ppd/class_printerPPDDialog.inc:269
-#: admin/systems/ppd/class_printerPPDDialog.inc:297
-#: admin/systems/ppd/class_printerPPDDialog.inc:314
-#: admin/systems/ppd/class_printerPPDDialog.inc:337
-#: admin/systems/ppd/class_printerPPDDialog.inc:351
-#: admin/systems/ppd/class_printerPPDDialog.inc:361
-#: admin/systems/ppd/class_printerPPDDialog.inc:365
-#: admin/systems/ppd/class_printerPPDDialog.inc:560
-#: admin/systems/ppd/class_printerPPDDialog.inc:577
-#: admin/systems/ppd/class_printerPPDDialog.inc:580
-#: admin/systems/ppd/class_printerPPDDialog.inc:583
-msgid "PPD error"
-msgstr ""
-
-#: admin/systems/ppd/class_printerPPDSelectionDialog.inc:139
-#, php-format
-msgid "Cannot locate vendor '%s' in available PPDs!"
-msgstr ""
-
-#: admin/systems/ppd/class_printerPPDSelectionDialog.inc:148
-msgid "Printer ppd selection."
-msgstr ""
-
-#: admin/systems/ppd/class_printerPPDSelectionDialog.inc:155
-msgid "delete"
-msgstr ""
-
-#: admin/systems/ppd/class_printerPPDSelectionDialog.inc:166
-msgid "back"
-msgstr ""
-
-#: admin/systems/ppd/class_printerPPDDialog.inc:74
-#: admin/systems/ppd/class_printerPPDDialog.inc:140
-#: admin/systems/services/class_goService.inc:241
-msgid "Configuration error"
-msgstr ""
-
-#: admin/systems/ppd/class_printerPPDDialog.inc:92
-#, php-format
-msgid "Cannot open PPD '%s'!"
-msgstr ""
-
-#: admin/systems/ppd/class_printerPPDDialog.inc:141
-#, php-format
-msgid "Cannot open PPD path '%s' for reading and writing!"
-msgstr ""
-
-#: admin/systems/ppd/class_printerPPDDialog.inc:160
-#: admin/systems/ppd/class_printerPPDDialog.inc:365
-msgid "file is empty"
-msgstr ""
-
-#: admin/systems/ppd/class_printerPPDDialog.inc:314
-#, php-format
-msgid "Cannot parse PPD '%s'!"
-msgstr ""
-
-#: admin/systems/ppd/class_printerPPDDialog.inc:340
-msgid "Overwrite existing PPD"
-msgstr ""
-
-#: admin/systems/ppd/class_printerPPDDialog.inc:341
-msgid ""
-"There is already a ppd file for this kind of printer. Do you want to "
-"overwrite it?"
-msgstr ""
-
-#: admin/systems/ppd/class_printerPPDDialog.inc:491
-msgid "Section"
-msgstr ""
-
-#: admin/systems/ppd/class_printerPPDDialog.inc:551
-#: admin/systems/ppd/class_printerPPDDialog.inc:554
-msgid "True"
-msgstr ""
-
-#: admin/systems/ppd/class_printerPPDDialog.inc:552
-#: admin/systems/ppd/class_printerPPDDialog.inc:555
-msgid "False"
-msgstr ""
-
-#: admin/systems/ppd/class_printerPPDDialog.inc:560
-#, php-format
-msgid "PPD type '%s' is not supported!"
-msgstr ""
-
-#: admin/systems/ppd/class_printerPPDDialog.inc:597
-msgid ""
-"Please select a valid ppd file or use 'Cancel' to go back to printer "
-"configuration."
-msgstr ""
-
-#: admin/systems/ppd/class_ppdManager.inc:44
-#: admin/systems/ppd/class_ppdManager.inc:188
-#: admin/systems/ppd/class_ppdManager.inc:190
-msgid "PPD manager error"
-msgstr ""
-
-#: admin/systems/ppd/class_ppdManager.inc:44
-#, php-format
-msgid "The specified path '%s' does not exist."
-msgstr ""
-
-#: admin/systems/ppd/class_ppdManager.inc:188
+#: admin/systems/class_systemImport.inc:72
 #, php-format
-msgid "Specified PPD file '%s' cannot be opened for reading."
+msgid "Could not parse %s"
 msgstr ""
 
-#: admin/systems/ppd/class_ppdManager.inc:190
+#: admin/systems/class_systemImport.inc:116
 #, php-format
-msgid "The temporary file '%s' cannot be opened for writing."
-msgstr ""
-
-#: admin/systems/ppd/class_ppdManager.inc:212
-#: admin/systems/ppd/class_ppdManager.inc:350
-msgid "Parsing PPD file failed - file is empty!"
+msgid "No DHCP server found for ip %s"
 msgstr ""
 
-#: admin/systems/ppd/class_ppdManager.inc:222
+#: admin/systems/class_systemImport.inc:130
 #, php-format
-msgid ""
-"Parsing PPD file %s failed - line too long. Trailing characters have been "
-"ignored!"
-msgstr ""
-
-#: admin/systems/ppd/class_ppdManager.inc:230
-msgid "Nested groups are not supported!"
+msgid "No DNS server found for zone %s"
 msgstr ""
 
-#: admin/systems/ppd/class_ppdManager.inc:234
-msgid "Group name not unique!"
+#: admin/systems/class_systemImport.inc:165
+msgid "Import"
 msgstr ""
 
-#: admin/systems/ppd/class_ppdManager.inc:240
-#: admin/systems/ppd/class_ppdManager.inc:270
-msgid "Symbol values are not supported yet!"
+#: admin/systems/class_systemImport.inc:169
+#: admin/systems/class_serverGeneric.inc:43
+#: admin/systems/class_serverGeneric.inc:48
+#: admin/systems/class_serverGeneric.inc:49
+msgid "Server"
 msgstr ""
 
-#: admin/systems/ppd/class_ppdManager.inc:264
-msgid "Nested options are not supported!"
+#: admin/systems/class_systemImport.inc:169
+msgid "The server you wish to import hosts from"
 msgstr ""
 
-#: admin/systems/ppd/class_ppdManager.inc:289
-msgid "PickMany is not supported yet!"
+#: admin/systems/class_serverGeneric.inc:31
+msgid "server"
 msgstr ""
 
-#: admin/systems/ppd/class_ppdManager.inc:370
-#, php-format
-msgid ""
-"Parsing PPD file %s failed - line too long. Trailing characters have been "
-"ignored"
+#: admin/systems/class_serverGeneric.inc:44
+msgid "Server information"
 msgstr ""
 
-#: admin/systems/ppd/class_ppdManager.inc:395
-#, php-format
-msgid "Parsing PPD file %s failed - no information found."
+#: admin/systems/class_componentGeneric.inc:31
+msgid "Component"
 msgstr ""
 
-#: admin/systems/class_systemImport.inc:72
-#, php-format
-msgid "Could not parse %s"
+#: admin/systems/class_componentGeneric.inc:32
+msgid "Component information"
 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/class_componentGeneric.inc:37
+msgid "Network device"
 msgstr ""
 
-#: admin/systems/class_systemImport.inc:130
-#, php-format
-msgid "No DNS server found for zone %s"
+#: admin/systems/class_componentGeneric.inc:58
+msgid "The name of the component"
 msgstr ""
 
-#: admin/systems/class_systemImport.inc:165
-msgid "Import"
+#: admin/systems/class_componentGeneric.inc:62
+msgid "A short description of the component"
 msgstr ""
 
-#: admin/systems/class_systemImport.inc:169
-msgid "The server you wish to import hosts from"
+#: admin/systems/class_systemServers.inc:31
+#: admin/systems/class_systemServers.inc:53
+msgid "Servers"
 msgstr ""
 
-#: admin/systems/class_serverGeneric.inc:34
-msgid "server"
+#: admin/systems/class_systemServers.inc:35
+msgid "The syslog server the system should be using"
 msgstr ""
 
-#: admin/systems/class_serverGeneric.inc:47
-msgid "Server information"
+#: admin/systems/class_systemServers.inc:40
+msgid "NTP servers"
 msgstr ""
 
-#: admin/systems/class_componentGeneric.inc:37
-msgid "Component information"
+#: admin/systems/class_systemServers.inc:40
+msgid "The NTP servers for this system"
 msgstr ""
 
-#: admin/systems/class_componentGeneric.inc:64
-msgid "The name of the component"
+#: admin/systems/class_systemServers.inc:54
+msgid "Servers this system is using"
 msgstr ""
 
-#: admin/systems/class_componentGeneric.inc:68
-msgid "A short description of the component"
+#: admin/systems/class_mobilePhoneGeneric.inc:32
+#: admin/systems/class_mobilePhoneGeneric.inc:37
+#: admin/systems/class_mobilePhoneGeneric.inc:38
+msgid "Mobile phone"
 msgstr ""
 
-#: admin/systems/class_mobilePhoneGeneric.inc:37
+#: admin/systems/class_mobilePhoneGeneric.inc:33
 msgid "Mobile phone information"
 msgstr ""
 
-#: admin/systems/class_mobilePhoneGeneric.inc:63
+#: admin/systems/class_mobilePhoneGeneric.inc:60
 msgid "The name of the mobile phone"
 msgstr ""
 
-#: admin/systems/class_mobilePhoneGeneric.inc:67
+#: admin/systems/class_mobilePhoneGeneric.inc:64
 msgid "A short description of the mobile phone"
 msgstr ""
 
-#: admin/systems/class_mobilePhoneGeneric.inc:77
+#: admin/systems/class_mobilePhoneGeneric.inc:70
+msgid "Phone"
+msgstr ""
+
+#: admin/systems/class_mobilePhoneGeneric.inc:73
 msgid "Serial Number"
 msgstr ""
 
-#: admin/systems/class_mobilePhoneGeneric.inc:77
+#: admin/systems/class_mobilePhoneGeneric.inc:73
 msgid "The serial number of the mobile phone"
 msgstr ""
 
-#: admin/systems/class_mobilePhoneGeneric.inc:81
+#: admin/systems/class_mobilePhoneGeneric.inc:77
 msgid "IMEI Number"
 msgstr ""
 
-#: admin/systems/class_mobilePhoneGeneric.inc:81
+#: admin/systems/class_mobilePhoneGeneric.inc:77
 msgid "The IMEI number of the mobile phone"
 msgstr ""
 
-#: admin/systems/class_mobilePhoneGeneric.inc:86
+#: admin/systems/class_mobilePhoneGeneric.inc:82
 msgid "OS"
 msgstr ""
 
-#: admin/systems/class_mobilePhoneGeneric.inc:86
+#: admin/systems/class_mobilePhoneGeneric.inc:82
 msgid "The Operating System installed on this phone"
 msgstr ""
 
-#: admin/systems/class_mobilePhoneGeneric.inc:92
+#: admin/systems/class_mobilePhoneGeneric.inc:88
 msgid "SimCard"
 msgstr ""
 
-#: admin/systems/class_mobilePhoneGeneric.inc:95
+#: admin/systems/class_mobilePhoneGeneric.inc:91
 msgid "Telephone Number"
 msgstr ""
 
-#: admin/systems/class_mobilePhoneGeneric.inc:95
+#: admin/systems/class_mobilePhoneGeneric.inc:91
 msgid "The telephone number of the mobile phone"
 msgstr ""
 
-#: admin/systems/class_mobilePhoneGeneric.inc:99
+#: admin/systems/class_mobilePhoneGeneric.inc:95
 msgid "PUK Number"
 msgstr ""
 
-#: admin/systems/class_mobilePhoneGeneric.inc:99
+#: admin/systems/class_mobilePhoneGeneric.inc:95
 msgid "The PUK number of the simcard in this mobile phone"
 msgstr ""
 
@@ -1029,101 +606,51 @@ msgstr ""
 msgid "Service"
 msgstr ""
 
-#: admin/systems/serverService-list.xml:27
-msgid "!"
-msgstr ""
-
-#: admin/systems/serverService-list.xml:89
-msgid "Get status"
-msgstr ""
-
-#: admin/systems/serverService-list.xml:97
-#: admin/systems/services/cups/class_serviceCUPS.inc:92
-msgid "Start"
-msgstr ""
-
-#: admin/systems/serverService-list.xml:105
-#: admin/systems/services/cups/class_serviceCUPS.inc:93
-msgid "Stop"
-msgstr ""
-
-#: admin/systems/serverService-list.xml:113
-#: admin/systems/services/cups/class_serviceCUPS.inc:94
-msgid "Restart"
-msgstr ""
-
-#: admin/systems/serverService-list.xml:121
-msgid "Edit service"
-msgstr ""
-
-#: admin/systems/serverService-list.xml:129
-msgid "Remove service"
-msgstr ""
-
-#: admin/systems/phoneSelect/phoneSelect-list.xml:10
-msgid "Please select the desired entries"
-msgstr ""
-
-#: admin/systems/phoneSelect/phoneSelect-list.xml:56
-msgid "Number"
-msgstr ""
-
-#: admin/systems/phoneSelect/phoneSelect-list.xml:83
-msgid "Select this number"
-msgstr ""
-
-#: admin/systems/class_systemManagement.inc:177
-msgid "Back"
-msgstr ""
-
-#: admin/systems/class_systemManagement.inc:223
-msgid "Creating the image failed. Please see the report below."
+#: admin/systems/serverService-list.xml:27
+msgid "!"
 msgstr ""
 
-#: admin/systems/class_systemManagement.inc:228
-#, php-format
-msgid "Command '%s', specified for ISO creation doesn't seem to exist."
+#: admin/systems/serverService-list.xml:89
+msgid "Get status"
 msgstr ""
 
-#: admin/systems/class_systemManagement.inc:398
-#: admin/systems/class_systemManagement.inc:473
-#: admin/systems/class_systemManagement.inc:858
-#: admin/systems/class_systemManagement.inc:905
-#: admin/systems/class_systemManagement.inc:926
-msgid "Permission"
+#: admin/systems/serverService-list.xml:97
+#: admin/systems/services/cups/class_serviceCUPS.inc:92
+msgid "Start"
 msgstr ""
 
-#: admin/systems/class_systemManagement.inc:678
-msgid "Cannot set mode to 'active'!"
+#: admin/systems/serverService-list.xml:105
+#: admin/systems/services/cups/class_serviceCUPS.inc:93
+msgid "Stop"
 msgstr ""
 
-#: admin/systems/class_systemManagement.inc:858
-#, php-format
-msgid "You are not allowed to create a snapshot for %s."
+#: admin/systems/serverService-list.xml:113
+#: admin/systems/services/cups/class_serviceCUPS.inc:94
+msgid "Restart"
 msgstr ""
 
-#: admin/systems/class_systemManagement.inc:905
-#: admin/systems/class_systemManagement.inc:926
-#, php-format
-msgid "You are not allowed to restore a snapshot for %s."
+#: admin/systems/serverService-list.xml:121
+msgid "Edit service"
 msgstr ""
 
-#: admin/systems/class_systemManagement.inc:1169
-#, php-format
-msgid "Inherited from %s"
+#: admin/systems/serverService-list.xml:129
+msgid "Remove service"
 msgstr ""
 
-#: admin/systems/class_systemManagement.inc:1224
-#: admin/systems/class_systemManagement.inc:1228
-#: addons/dashboard/class_dashBoardSystems.inc:199
+#: admin/systems/class_systemManagement.inc:48
 #: config/systems/class_systemsPluginConfig.inc:28
 msgid "Systems"
 msgstr ""
 
-#: admin/systems/class_systemManagement.inc:1225
+#: admin/systems/class_systemManagement.inc:49
 msgid "Systems Management"
 msgstr ""
 
+#: admin/systems/class_systemManagement.inc:250
+#, php-format
+msgid "Inherited from %s"
+msgstr ""
+
 #: admin/systems/services/terminal/class_serviceTerminal.inc:29
 #: admin/systems/services/terminal/class_serviceTerminal.inc:30
 #: admin/systems/services/terminal/class_serviceTerminal.inc:41
@@ -1161,6 +688,10 @@ msgstr ""
 msgid "Empty service"
 msgstr ""
 
+#: admin/systems/services/class_goService.inc:241
+msgid "Configuration error"
+msgstr ""
+
 #: admin/systems/services/shares/class_serviceShare.inc:30
 #: admin/systems/services/shares/class_serviceShare.inc:31
 msgid "Share service"
@@ -1219,8 +750,6 @@ msgid "You need to configure encodings first"
 msgstr ""
 
 #: admin/systems/services/shares/class_serviceShare.inc:110
-#: admin/ogroups/goto/termgroup.tpl.c:2 admin/systems/remove.tpl.c:2
-#: admin/systems/ppd/remove_ppd.tpl.c:2
 msgid "Warning"
 msgstr ""
 
@@ -1346,153 +875,93 @@ msgstr ""
 msgid "LDAP"
 msgstr ""
 
-#: admin/systems/class_networkSettings.inc:305
+#: admin/systems/class_networkSettings.inc:297
 msgid "NOT IMPLEMENTED"
 msgstr ""
 
-#: admin/systems/class_networkSettings.inc:437
+#: admin/systems/class_networkSettings.inc:429
 msgid "Not matching"
 msgstr ""
 
-#: admin/systems/class_networkSettings.inc:584
+#: admin/systems/class_networkSettings.inc:576
 #, php-format
 msgid "Was not able to contact argonaut server: %s"
 msgstr ""
 
-#: admin/systems/class_networkSettings.inc:591
+#: admin/systems/class_networkSettings.inc:583
 #, php-format
 msgid "Was not able to find DNS server for zone %s"
 msgstr ""
 
-#: admin/systems/class_networkSettings.inc:597
+#: admin/systems/class_networkSettings.inc:589
 #, php-format
 msgid "Was not able to find mac address of DNS server %s"
 msgstr ""
 
-#: admin/systems/class_networkSettings.inc:604
+#: admin/systems/class_networkSettings.inc:596
 #, php-format
 msgid "Was not able to launch ldap2zone: %s"
 msgstr ""
 
-#: admin/systems/class_networkSettings.inc:630
+#: admin/systems/class_networkSettings.inc:622
 #, php-format
 msgid "IP address %s"
 msgstr ""
 
-#: admin/systems/class_networkSettings.inc:638
-#: admin/systems/class_networkSettings.inc:651
-#: admin/systems/class_networkSettings.inc:653
-#: admin/systems/class_networkSettings.inc:1022
-msgid "IP address"
-msgstr ""
-
-#: admin/systems/class_networkSettings.inc:644
-#: admin/systems/class_networkSettings.inc:660
-#: admin/systems/class_networkSettings.inc:662
-#: admin/systems/class_networkSettings.inc:1023
+#: admin/systems/class_networkSettings.inc:636
+#: admin/systems/class_networkSettings.inc:652
+#: admin/systems/class_networkSettings.inc:654
+#: admin/systems/class_networkSettings.inc:1015
 msgid "MAC address"
 msgstr ""
 
-#: admin/systems/class_networkSettings.inc:676
+#: admin/systems/class_networkSettings.inc:668
 #, php-format
 msgid "The IP address '%s' is not part of the selected reverse zone '%s'!"
 msgstr ""
 
-#: admin/systems/class_networkSettings.inc:686
+#: admin/systems/class_networkSettings.inc:678
 #, php-format
 msgid "Record type '%s' is duplicated!"
 msgstr ""
 
-#: admin/systems/class_networkSettings.inc:693
+#: admin/systems/class_networkSettings.inc:685
 #, php-format
 msgid "Uniq record type '%s' is duplicated!"
 msgstr ""
 
-#: admin/systems/class_networkSettings.inc:705
+#: admin/systems/class_networkSettings.inc:697
 #, php-format
 msgid ""
 "The IP address '%s' will be added as 'A Record', this will be done "
 "automatically, please remove the record."
 msgstr ""
 
-#: admin/systems/class_networkSettings.inc:712
+#: admin/systems/class_networkSettings.inc:704
 #, php-format
 msgid "Only lowercase records are allowed, please check your '%ss'."
 msgstr ""
 
-#: admin/systems/class_networkSettings.inc:978
+#: admin/systems/class_networkSettings.inc:970
 msgid "Delete"
 msgstr ""
 
-#: admin/systems/class_networkSettings.inc:984
+#: admin/systems/class_networkSettings.inc:976
 msgid "Add"
 msgstr ""
 
-#: admin/systems/class_networkSettings.inc:1015
-#: addons/dashboard/class_dashBoardNetwork.inc:127
+#: admin/systems/class_networkSettings.inc:1007
 msgid "Network"
 msgstr ""
 
-#: admin/systems/class_networkSettings.inc:1030
+#: admin/systems/class_networkSettings.inc:1022
 msgid "DNS configuration"
 msgstr ""
 
-#: admin/systems/class_networkSettings.inc:1033
+#: admin/systems/class_networkSettings.inc:1025
 msgid "DHCP configuration"
 msgstr ""
 
-#: addons/dashboard/class_dashBoardSystems.inc:45
-msgid "Workstations"
-msgstr ""
-
-#: addons/dashboard/class_dashBoardSystems.inc:51
-msgid "Windows Workstations"
-msgstr ""
-
-#: addons/dashboard/class_dashBoardSystems.inc:54
-msgid "Terminals"
-msgstr ""
-
-#: addons/dashboard/class_dashBoardSystems.inc:57
-msgid "Printers"
-msgstr ""
-
-#: addons/dashboard/class_dashBoardSystems.inc:60
-msgid "Phones"
-msgstr ""
-
-#: addons/dashboard/class_dashBoardSystems.inc:63
-msgid "Components"
-msgstr ""
-
-#: addons/dashboard/class_dashBoardSystems.inc:66
-msgid "Mobile phones"
-msgstr ""
-
-#: addons/dashboard/class_dashBoardSystems.inc:183
-msgid "Statistics"
-msgstr ""
-
-#: addons/dashboard/class_dashBoardSystems.inc:188
-msgid "Computer name to use by unit"
-msgstr ""
-
-#: addons/dashboard/class_dashBoardSystems.inc:200
-msgid "Statistics and informations about systems"
-msgstr ""
-
-#: addons/dashboard/class_dashBoardNetwork.inc:111
-msgid "DHCP"
-msgstr ""
-
-#: addons/dashboard/class_dashBoardNetwork.inc:116
-msgid "DNS"
-msgstr ""
-
-#: addons/dashboard/class_dashBoardNetwork.inc:128
-msgid "Statistics and various informations"
-msgstr ""
-
 #: config/systems/class_systemsPluginConfig.inc:29
 msgid "Systems plugin configuration"
 msgstr ""
@@ -1584,406 +1053,3 @@ msgstr ""
 #: config/systems/class_systemsPluginConfig.inc:101
 msgid "Encodings"
 msgstr ""
-
-#: admin/ogroups/goto/termgroup.tpl.c:5
-msgid ""
-"Actions you choose here influence all systems in this object group. "
-"Additionally, all values editable here can be inherited by the clients "
-"assigned to this object group."
-msgstr ""
-
-#: admin/ogroups/goto/termgroup.tpl.c:8
-msgid "Generic"
-msgstr ""
-
-#: admin/ogroups/goto/termgroup.tpl.c:11
-msgid "NTP server"
-msgstr ""
-
-#: admin/ogroups/goto/termgroup.tpl.c:14
-msgid "Choose server to use for synchronizing time"
-msgstr ""
-
-#: admin/ogroups/goto/termgroup.tpl.c:20
-msgid "Select terminal mode"
-msgstr ""
-
-#: admin/ogroups/goto/termgroup.tpl.c:26
-msgid "Choose server to use for logging"
-msgstr ""
-
-#: admin/ogroups/goto/termgroup.tpl.c:32
-msgid "Select NFS root filesystem to use"
-msgstr ""
-
-#: admin/ogroups/goto/termgroup.tpl.c:38
-msgid "Choose NFS filesystem to place swap files on"
-msgstr ""
-
-#: admin/ogroups/goto/termgroup.tpl.c:47
-msgid "Execute"
-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 admin/systems/network.tpl.c:11
-msgid "Propose ip"
-msgstr ""
-
-#: admin/systems/network.tpl.c:14
-msgid "MAC-address"
-msgstr ""
-
-#: admin/systems/network.tpl.c:17
-msgid "Autodetect"
-msgstr ""
-
-#: admin/systems/network.tpl.c:20 admin/systems/network.tpl.c:23
-msgid "Enable DHCP for this device"
-msgstr ""
-
-#: admin/systems/network.tpl.c:26 admin/systems/network.tpl.c:50
-msgid "not configured"
-msgstr ""
-
-#: admin/systems/network.tpl.c:29
-msgid "Parent node"
-msgstr ""
-
-#: admin/systems/network.tpl.c:32
-msgid "Edit settings"
-msgstr ""
-
-#: admin/systems/network.tpl.c:35 admin/systems/network.tpl.c:47
-msgid "Enable DNS for this device"
-msgstr ""
-
-#: admin/systems/network.tpl.c:38
-msgid "Zone"
-msgstr ""
-
-#: admin/systems/network.tpl.c:41
-msgid "TTL"
-msgstr ""
-
-#: admin/systems/network.tpl.c:44
-msgid "Dns records"
-msgstr ""
-
-#: admin/systems/password.tpl.c:2
-msgid ""
-"To change the terminal root password use the fields below. The changes take "
-"effect during the next reboot. Please memorize the new password, because you"
-" wouldn't be able to log in."
-msgstr ""
-
-#: admin/systems/password.tpl.c:5
-msgid "Leave fields blank for password inheritance from default entries."
-msgstr ""
-
-#: admin/systems/password.tpl.c:8
-msgid "Changing the password impinges on authentification only."
-msgstr ""
-
-#: admin/systems/password.tpl.c:11
-msgid "New password"
-msgstr ""
-
-#: admin/systems/password.tpl.c:14
-msgid "Repeat new password"
-msgstr ""
-
-#: admin/systems/password.tpl.c:17
-msgid "Password strength"
-msgstr ""
-
-#: admin/systems/password.tpl.c:20
-msgid "Set password"
-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/gencd.tpl.c:2
-msgid "CD-Install-Image generation"
-msgstr ""
-
-#: admin/systems/gencd.tpl.c:5
-msgid ""
-"This option enables you to generate FAI install CD images for the selected "
-"workstation. The procedure may take about 10 minutes to complete, so please "
-"be patient after pressing the 'Create ISO-Image' button."
-msgstr ""
-
-#: admin/systems/gencd.tpl.c:8
-msgid "Create ISO-Image"
-msgstr ""
-
-#: admin/systems/remove.tpl.c:5
-msgid ""
-"This includes all account data, system access rules, imap settings, etc. for"
-" this user. Please double check if your really want to do this since there "
-"is no way for FusionDirectory to get your data back."
-msgstr ""
-
-#: admin/systems/remove.tpl.c:8
-msgid "So - if you're sure - press 'Delete' to continue or 'Cancel' to abort."
-msgstr ""
-
-#: admin/systems/system-filter.tpl.c:2
-#: admin/systems/phoneSelect/phoneSelect-filter.tpl.c:2
-msgid "Filter"
-msgstr ""
-
-#: admin/systems/system-filter.tpl.c:5
-msgid "Show servers"
-msgstr ""
-
-#: admin/systems/system-filter.tpl.c:8
-msgid "Show workstations"
-msgstr ""
-
-#: admin/systems/system-filter.tpl.c:11
-msgid "Show terminals"
-msgstr ""
-
-#: admin/systems/system-filter.tpl.c:14
-msgid "Show network printer"
-msgstr ""
-
-#: admin/systems/system-filter.tpl.c:17
-#: admin/systems/phoneSelect/phoneSelect-filter.tpl.c:5
-msgid "Show phones"
-msgstr ""
-
-#: admin/systems/system-filter.tpl.c:20
-msgid "Show windows based workstations"
-msgstr ""
-
-#: admin/systems/system-filter.tpl.c:23
-msgid "Show network devices"
-msgstr ""
-
-#: admin/systems/system-filter.tpl.c:26
-#: admin/systems/phoneSelect/phoneSelect-filter.tpl.c:8
-msgid "Show mobile phones"
-msgstr ""
-
-#: admin/systems/system-filter.tpl.c:29
-msgid "Show IPMI interfaces"
-msgstr ""
-
-#: admin/systems/ppd/printerPPDSelectionDialog.tpl.c:2
-msgid "Select objects to add"
-msgstr ""
-
-#: admin/systems/ppd/printerPPDSelectionDialog.tpl.c:5
-msgid "Filters"
-msgstr ""
-
-#: admin/systems/ppd/printerPPDSelectionDialog.tpl.c:8
-msgid "Display objects matching"
-msgstr ""
-
-#: admin/systems/ppd/printerPPDSelectionDialog.tpl.c:11
-msgid "Regular expression for matching object names"
-msgstr ""
-
-#: admin/systems/ppd/printerPPDSelectionDialog.tpl.c:14
-msgid "Close"
-msgstr ""
-
-#: admin/systems/ppd/printerPPDDialog.tpl.c:2
-msgid "Printer driver"
-msgstr ""
-
-#: admin/systems/ppd/printerPPDDialog.tpl.c:5
-msgid "Model"
-msgstr ""
-
-#: admin/systems/ppd/printerPPDDialog.tpl.c:8
-msgid "Select"
-msgstr ""
-
-#: admin/systems/ppd/printerPPDDialog.tpl.c:11
-msgid "New driver"
-msgstr ""
-
-#: admin/systems/ppd/printerPPDDialog.tpl.c:14
-msgid "Upload"
-msgstr ""
-
-#: admin/systems/ppd/printerPPDDialog.tpl.c:17
-msgid "Options"
-msgstr ""
-
-#: admin/systems/ppd/remove_ppd.tpl.c:5
-msgid "The ppd file will be removed from the server and can not be restored."
-msgstr ""
-
-#: admin/systems/printer.tpl.c:2
-msgid "General"
-msgstr ""
-
-#: admin/systems/printer.tpl.c:5
-msgid "Printer name"
-msgstr ""
-
-#: admin/systems/printer.tpl.c:14
-msgid "Details"
-msgstr ""
-
-#: admin/systems/printer.tpl.c:20
-msgid "Printer location"
-msgstr ""
-
-#: admin/systems/printer.tpl.c:26
-msgid "PPD Provider"
-msgstr ""
-
-#: admin/systems/printer.tpl.c:29
-msgid "Driver"
-msgstr ""
-
-#: admin/systems/printer.tpl.c:32
-msgid "Edit"
-msgstr ""
-
-#: admin/systems/printer.tpl.c:41
-msgid "Users which are allowed to use this printer"
-msgstr ""
-
-#: admin/systems/printer.tpl.c:44
-msgid "Users"
-msgstr ""
-
-#: admin/systems/printer.tpl.c:47
-msgid "Users which are allowed to administrate this printer"
-msgstr ""
-
-#: admin/systems/printer.tpl.c:50
-msgid "Admins"
-msgstr ""
-
-#: admin/systems/printer.tpl.c:53
-msgid "Windows paths"
-msgstr ""
-
-#: admin/systems/printer.tpl.c:56
-msgid "Printer windows inf file"
-msgstr ""
-
-#: admin/systems/printer.tpl.c:59
-msgid "Printer driver directory"
-msgstr ""
-
-#: admin/systems/gencd_frame.tpl.c:2
-msgid "Your browser does not supprt iframes."
-msgstr ""
-
-#: admin/systems/services/cups/serviceCUPS.tpl.c:2
-msgid "Print Service"
-msgstr ""
-
-#: admin/systems/services/cups/serviceCUPS.tpl.c:5
-msgid "enabled"
-msgstr ""
-
-#: admin/systems/services/ServiceAddDialog.tpl.c:2
-msgid "Adding a new service to the current server"
-msgstr ""
-
-#: admin/systems/services/ServiceAddDialog.tpl.c:5
-msgid ""
-"This dialog allows you to add new services to the currenty edited server "
-"object. The box below shows all available but not already used services."
-msgstr ""
-
-#: admin/systems/services/ServiceAddDialog.tpl.c:8
-msgid "Service to add"
-msgstr ""
-
-#: admin/systems/services/ServiceAddDialog.tpl.c:11
-msgid "All available services are already in use."
-msgstr ""
-
-#: admin/systems/services/ServiceAddDialog.tpl.c:14
-#: admin/systems/SelectDeviceType.tpl.c:26
-msgid "Continue"
-msgstr ""
-
-#: admin/systems/SelectDeviceType.tpl.c:2
-msgid ""
-"This system has no system type configured. Please choose a system type for "
-"this object and an optional inheritance group. Press the 'continue' button "
-"to proceed."
-msgstr ""
-
-#: admin/systems/SelectDeviceType.tpl.c:5
-msgid ""
-"Please select a system type and an optional bundle of predefined settings to"
-" be inherited."
-msgstr ""
-
-#: admin/systems/SelectDeviceType.tpl.c:8
-msgid ""
-"Please select a system type and a bundle of predefined settings to be "
-"inherited."
-msgstr ""
-
-#: admin/systems/SelectDeviceType.tpl.c:11
-#: admin/systems/SelectDeviceType.tpl.c:14
-msgid "System type"
-msgstr ""
-
-#: admin/systems/SelectDeviceType.tpl.c:17
-msgid "Choose an object group as template"
-msgstr ""
-
-#: admin/systems/SelectDeviceType.tpl.c:20
-msgid "Object group"
-msgstr ""
-
-#: admin/systems/SelectDeviceType.tpl.c:23
-msgid "none"
-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] ""
-
-#: 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] ""
diff --git a/systems/locale/sv/fusiondirectory.po b/systems/locale/sv/fusiondirectory.po
index 465fe5b04a263b4625e8d60974aa752d76cf8126..d6e6ae513a277a85f22170d61777cd1b2d535dac 100644
--- a/systems/locale/sv/fusiondirectory.po
+++ b/systems/locale/sv/fusiondirectory.po
@@ -5,12 +5,12 @@
 # Translators:
 msgid ""
 msgstr ""
-"Project-Id-Version: FusionDirectory-108\n"
+"Project-Id-Version: FusionDirectory-109\n"
 "Report-Msgid-Bugs-To: documentation@lists.fusiondirectory.org\n"
-"POT-Creation-Date: 2015-03-31 11:49+0200\n"
-"PO-Revision-Date: 2015-03-31 11:41+0000\n"
+"POT-Creation-Date: 2014-12-15 17:47+0100\n"
+"PO-Revision-Date: 2015-03-31 11:42+0000\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>\n"
-"Language-Team: Swedish (http://www.transifex.com/projects/p/FusionDirectory-108/language/sv/)\n"
+"Language-Team: Swedish (http://www.transifex.com/projects/p/FusionDirectory-109/language/sv/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -26,29 +26,24 @@ msgid "Locked"
 msgstr ""
 
 #: admin/ogroups/goto/class_termgroup.inc:118
-#: admin/systems/class_terminalGeneric.inc:121
+#: admin/systems/class_terminalStartup.inc:145
 msgid "Local swap"
 msgstr ""
 
 #: admin/ogroups/goto/class_termgroup.inc:124
 #: admin/ogroups/goto/class_termgroup.inc:136
-#: admin/systems/class_workstationGeneric.inc:352
-#: admin/systems/class_terminalGeneric.inc:109
-#: admin/systems/class_terminalGeneric.inc:125
+#: admin/systems/class_terminalStartup.inc:133
+#: admin/systems/class_terminalStartup.inc:149
 msgid "inherited"
 msgstr ""
 
 #: admin/ogroups/goto/class_termgroup.inc:220
-#: admin/systems/class_workstationGeneric.inc:72
-#: admin/systems/class_workstationGeneric.inc:443
-#: admin/systems/class_systemManagement.inc:295
-#: admin/systems/class_systemManagement.inc:325
-msgid "Infrastructure service"
-msgstr ""
+#: admin/systems/class_systemManagement.inc:165
+#: admin/systems/class_systemManagement.inc:186
+msgid "Service infrastructure"
+msgstr "TjÃ¤nste-infrastruktur"
 
 #: admin/ogroups/goto/class_termgroup.inc:224
-#: admin/systems/class_workstationGeneric.inc:75
-#: admin/systems/class_workstationGeneric.inc:78
 msgid "Event error"
 msgstr ""
 
@@ -58,12 +53,10 @@ msgid "Event '%s' is not available!"
 msgstr ""
 
 #: admin/ogroups/goto/class_termgroup.inc:274
-#: admin/systems/class_workstationGeneric.inc:112
 msgid "Switch off"
 msgstr ""
 
 #: admin/ogroups/goto/class_termgroup.inc:274
-#: admin/systems/class_workstationGeneric.inc:113
 msgid "Reboot"
 msgstr ""
 
@@ -84,7 +77,6 @@ msgid "Reinstall"
 msgstr ""
 
 #: admin/ogroups/goto/class_termgroup.inc:279
-#: admin/systems/class_workstationGeneric.inc:108
 msgid "Memory test"
 msgstr ""
 
@@ -93,21 +85,18 @@ msgid "System analysis"
 msgstr ""
 
 #: admin/ogroups/goto/class_termgroup.inc:386
-#: admin/systems/class_printGeneric.inc:670
-#: admin/systems/class_printGeneric.inc:970
-#: admin/systems/class_systemManagement.inc:816
 #: admin/systems/services/class_goService.inc:123
 #: admin/systems/services/class_goService.inc:151
 #: admin/systems/services/class_goService.inc:187
-#: admin/systems/class_networkSettings.inc:478
-#: admin/systems/class_networkSettings.inc:491
-#: admin/systems/class_networkSettings.inc:757
-#: admin/systems/class_networkSettings.inc:816
-#: admin/systems/class_networkSettings.inc:835
-#: admin/systems/class_networkSettings.inc:852
-#: admin/systems/class_networkSettings.inc:861
-#: admin/systems/class_networkSettings.inc:879
-#: admin/systems/class_networkSettings.inc:951
+#: admin/systems/class_networkSettings.inc:470
+#: admin/systems/class_networkSettings.inc:483
+#: admin/systems/class_networkSettings.inc:749
+#: admin/systems/class_networkSettings.inc:808
+#: admin/systems/class_networkSettings.inc:827
+#: admin/systems/class_networkSettings.inc:844
+#: admin/systems/class_networkSettings.inc:853
+#: admin/systems/class_networkSettings.inc:871
+#: admin/systems/class_networkSettings.inc:943
 msgid "LDAP error"
 msgstr "LDAP-fel"
 
@@ -119,195 +108,125 @@ msgstr ""
 msgid "System group"
 msgstr ""
 
-#: admin/ogroups/goto/class_termgroup.inc:401
-#: admin/ogroups/goto/termgroup.tpl.c:17
+#: admin/ogroups/goto/class_termgroup.inc:402
 msgid "Mode"
 msgstr ""
 
-#: admin/ogroups/goto/class_termgroup.inc:402
-#: admin/systems/class_workstationGeneric.inc:189
-#: admin/ogroups/goto/termgroup.tpl.c:23
+#: admin/ogroups/goto/class_termgroup.inc:403
+#: admin/systems/class_systemServers.inc:35
 msgid "Syslog server"
 msgstr ""
 
-#: admin/ogroups/goto/class_termgroup.inc:403
+#: admin/ogroups/goto/class_termgroup.inc:404
 msgid "Action flag"
 msgstr ""
 
-#: admin/ogroups/goto/class_termgroup.inc:404
+#: admin/ogroups/goto/class_termgroup.inc:405
 msgid "Ntp server"
 msgstr ""
 
-#: admin/ogroups/goto/class_termgroup.inc:405
-#: admin/systems/class_terminalGeneric.inc:41
-#: admin/ogroups/goto/termgroup.tpl.c:29
+#: admin/ogroups/goto/class_termgroup.inc:406
+#: admin/systems/class_terminalStartup.inc:65
 msgid "Root server"
 msgstr ""
 
-#: admin/ogroups/goto/class_termgroup.inc:406
-#: admin/systems/class_terminalGeneric.inc:47
-#: admin/ogroups/goto/termgroup.tpl.c:35
+#: admin/ogroups/goto/class_termgroup.inc:407
+#: admin/systems/class_terminalStartup.inc:69
 msgid "Swap server"
 msgstr ""
 
-#: admin/systems/class_terminalStartup.inc:63
+#: admin/systems/class_terminalStartup.inc:62
 msgid "Startup parameters"
 msgstr "Uppstartsparametrar"
 
-#: admin/systems/class_terminalStartup.inc:66
+#: admin/systems/class_terminalStartup.inc:65
+msgid "The root server the terminal should be using"
+msgstr ""
+
+#: admin/systems/class_terminalStartup.inc:69
+msgid "The swap server the terminal should be using"
+msgstr ""
+
+#: admin/systems/class_terminalStartup.inc:73
 msgid "Boot kernel"
 msgstr "BootkÃ¤rna"
 
-#: admin/systems/class_terminalStartup.inc:66
+#: admin/systems/class_terminalStartup.inc:73
 msgid "Linux kernel to be installed and booted"
 msgstr "LinuxkÃ¤rna att installera och starta upp"
 
-#: admin/systems/class_terminalStartup.inc:70
+#: admin/systems/class_terminalStartup.inc:77
 msgid "Boot kernel parameters"
 msgstr "Parametrar fÃ¶r BootkÃ¤rna"
 
-#: admin/systems/class_terminalStartup.inc:70
+#: admin/systems/class_terminalStartup.inc:77
 msgid "Linux kernel parameters to be ran"
 msgstr "Linux kÃ¤rnparametrar att kÃ¶ra"
 
-#: admin/systems/class_terminalStartup.inc:82
-msgid "Startup"
-msgstr "Starta upp"
-
 #: admin/systems/class_terminalStartup.inc:83
-msgid "Terminal startup"
-msgstr ""
-
-#: admin/systems/system-list.xml:10
-msgid "List of systems"
-msgstr ""
-
-#: admin/systems/system-list.xml:14
-msgid "New workstation"
-msgstr ""
-
-#: admin/systems/system-list.xml:22
-msgid "Locked server"
-msgstr ""
-
-#: admin/systems/system-list.xml:30
-msgid "Locked workstation"
+msgid "Remote desktop"
 msgstr ""
 
-#: admin/systems/system-list.xml:38
-msgid "Locked terminal"
+#: admin/systems/class_terminalStartup.inc:87
+msgid "Connect method"
 msgstr ""
 
-#: admin/systems/system-list.xml:47
-msgid "New terminal"
+#: admin/systems/class_terminalStartup.inc:91
+msgid "XDMCP"
 msgstr ""
 
-#: admin/systems/system-list.xml:55
-msgid "New device"
+#: admin/systems/class_terminalStartup.inc:91
+msgid "LDM"
 msgstr ""
 
-#: admin/systems/system-list.xml:63
-msgid "Workstation template"
-msgstr ""
+#: admin/systems/class_terminalStartup.inc:91
+msgid "Shell"
+msgstr "Skal"
 
-#: admin/systems/system-list.xml:71
-msgid "Terminal template"
+#: admin/systems/class_terminalStartup.inc:91
+msgid "Telnet"
 msgstr ""
 
-#: admin/systems/system-list.xml:79
-msgid "Winstation"
-msgstr "Winstation"
-
-#: admin/systems/system-list.xml:87 admin/systems/system-list.xml:234
-#: admin/systems/class_systemImport.inc:169
-#: admin/systems/class_serverGeneric.inc:46
-#: admin/systems/class_serverGeneric.inc:51
-#: admin/systems/class_serverGeneric.inc:52
-#: admin/systems/class_SelectDeviceType.inc:58
-msgid "Server"
-msgstr "Server"
-
-#: admin/systems/system-list.xml:95 admin/systems/system-list.xml:242
-#: admin/systems/class_workstationGeneric.inc:458
-#: admin/systems/class_workstationGeneric.inc:463
-#: admin/systems/class_workstationGeneric.inc:464
-#: admin/systems/class_SelectDeviceType.inc:58
-msgid "Workstation"
-msgstr "Arbetsstation"
-
-#: admin/systems/system-list.xml:103 admin/systems/system-list.xml:250
-#: admin/systems/class_terminalGeneric.inc:81
-#: admin/systems/class_terminalGeneric.inc:86
-#: admin/systems/class_terminalGeneric.inc:87
-#: admin/systems/class_SelectDeviceType.inc:58
-msgid "Terminal"
-msgstr "Terminal"
-
-#: admin/systems/system-list.xml:111 admin/systems/class_printGeneric.inc:1005
-#: admin/systems/class_printGeneric.inc:1011
-#: admin/systems/class_printGeneric.inc:1012
-msgid "Printer"
-msgstr "Skrivare"
-
-#: admin/systems/system-list.xml:119 admin/systems/system-list.xml:274
-#: admin/systems/class_mobilePhoneGeneric.inc:74
-#: admin/systems/phoneSelect/phoneSelect-list.xml:14
-msgid "Phone"
-msgstr "Telefon"
-
-#: admin/systems/system-list.xml:127
-#: admin/systems/class_mobilePhoneGeneric.inc:36
-#: admin/systems/class_mobilePhoneGeneric.inc:41
-#: admin/systems/class_mobilePhoneGeneric.inc:42
-#: admin/systems/phoneSelect/phoneSelect-list.xml:22
-msgid "Mobile phone"
+#: admin/systems/class_terminalStartup.inc:91
+msgid "Windows RDP"
 msgstr ""
 
-#: admin/systems/system-list.xml:135
-#: admin/systems/class_componentGeneric.inc:36
-msgid "Component"
+#: admin/systems/class_terminalStartup.inc:95
+msgid "Terminal server"
 msgstr ""
 
-#: admin/systems/system-list.xml:143 admin/systems/system-list.xml:298
-msgid "IPMI"
+#: admin/systems/system-list.xml:10
+msgid "List of systems"
 msgstr ""
 
-#: admin/systems/system-list.xml:169
-#: admin/systems/class_workstationGeneric.inc:154
-#: admin/systems/class_printGeneric.inc:752
-#: admin/systems/class_printGeneric.inc:762
-#: admin/systems/class_printGeneric.inc:781
-#: admin/systems/class_printGeneric.inc:1022
-#: admin/systems/class_componentGeneric.inc:64
-#: admin/systems/class_mobilePhoneGeneric.inc:63
-#: admin/systems/phoneSelect/phoneSelect-list.xml:48
+#: admin/systems/system-list.xml:31
+#: admin/systems/class_workstationGeneric.inc:46
+#: admin/systems/class_printGeneric.inc:60
+#: admin/systems/class_componentGeneric.inc:58
+#: admin/systems/class_mobilePhoneGeneric.inc:60
 #: admin/systems/services/shares/class_serviceShare.inc:52
-#: admin/systems/system-filter.tpl.c:32
-#: admin/systems/phoneSelect/phoneSelect-filter.tpl.c:11
 msgid "Name"
 msgstr "Namn"
 
-#: admin/systems/system-list.xml:177
-#: admin/systems/phoneSelect/phoneSelect-list.xml:63
+#: admin/systems/system-list.xml:39
 msgid "IP"
 msgstr ""
 
-#: admin/systems/system-list.xml:185
+#: admin/systems/system-list.xml:47
 msgid "MAC"
 msgstr ""
 
-#: admin/systems/system-list.xml:193
-#: admin/systems/class_workstationGeneric.inc:160
-#: admin/systems/class_printGeneric.inc:1024
-#: admin/systems/class_componentGeneric.inc:68
-#: admin/systems/class_mobilePhoneGeneric.inc:67
+#: admin/systems/system-list.xml:55
+#: admin/systems/class_workstationGeneric.inc:51
+#: admin/systems/class_printGeneric.inc:64
+#: admin/systems/class_componentGeneric.inc:62
+#: admin/systems/class_mobilePhoneGeneric.inc:64
 #: admin/systems/serverService-list.xml:35
 #: admin/systems/services/shares/class_serviceShare.inc:56
-#: admin/systems/printer.tpl.c:8 admin/systems/printer.tpl.c:17
 msgid "Description"
 msgstr "Beskrivning"
 
-#: admin/systems/system-list.xml:201 admin/systems/class_serverService.inc:57
+#: admin/systems/system-list.xml:63 admin/systems/class_serverService.inc:57
 #: admin/systems/services/terminal/class_serviceTerminal.inc:30
 #: admin/systems/services/cups/class_serviceCUPS.inc:85
 #: admin/systems/services/shares/class_serviceShare.inc:31
@@ -316,378 +235,186 @@ msgstr "Beskrivning"
 msgid "Services"
 msgstr "TjÃ¤nster"
 
-#: admin/systems/system-list.xml:209
+#: admin/systems/system-list.xml:71
 msgid "Release"
 msgstr "Release"
 
-#: admin/systems/system-list.xml:217 admin/systems/serverService-list.xml:43
-#: admin/systems/phoneSelect/phoneSelect-list.xml:70
+#: admin/systems/system-list.xml:79 admin/systems/serverService-list.xml:43
 msgid "Actions"
 msgstr "Ã…tgÃ¤rder"
 
-#: admin/systems/system-list.xml:228 admin/systems/serverService-list.xml:54
+#: admin/systems/system-list.xml:90 admin/systems/serverService-list.xml:54
 msgid "Create"
 msgstr "Skapa"
 
-#: admin/systems/system-list.xml:258
-msgid "winStation"
-msgstr ""
-
-#: admin/systems/system-list.xml:266
-msgid "Network printer"
-msgstr ""
-
-#: admin/systems/system-list.xml:282
-#: admin/systems/class_componentGeneric.inc:41
-#: admin/systems/class_componentGeneric.inc:42
-msgid "Network device"
-msgstr ""
-
-#: admin/systems/system-list.xml:290
-msgid "Mobile Phone"
-msgstr ""
-
-#: admin/systems/system-list.xml:310
+#: admin/systems/system-list.xml:100
 msgid "Trigger action"
 msgstr ""
 
-#: admin/systems/system-list.xml:317
+#: admin/systems/system-list.xml:107
 msgid "Schedule action"
 msgstr ""
 
-#: admin/systems/system-list.xml:330
-msgid "Activate systems"
-msgstr ""
-
-#: admin/systems/system-list.xml:337 admin/systems/serverService-list.xml:69
-#: admin/systems/printer.tpl.c:35
+#: admin/systems/system-list.xml:119 admin/systems/serverService-list.xml:69
 msgid "Remove"
 msgstr "Ta bort"
 
-#: admin/systems/system-list.xml:367
-msgid "Create ISO"
-msgstr ""
-
-#: admin/systems/system-list.xml:379
+#: admin/systems/system-list.xml:150
 msgid "Edit system"
 msgstr ""
 
-#: admin/systems/system-list.xml:392
+#: admin/systems/system-list.xml:163
 msgid "Remove system"
 msgstr ""
 
-#: admin/systems/class_workstationGeneric.inc:75
-#, php-format
-msgid "Event %s is not available!"
-msgstr ""
-
-#: admin/systems/class_workstationGeneric.inc:78
-msgid "Events are not available!"
-msgstr ""
-
-#: admin/systems/class_workstationGeneric.inc:106
-msgid "(Re)Install"
-msgstr ""
-
-#: admin/systems/class_workstationGeneric.inc:107
-msgid "Software update"
-msgstr ""
-
-#: admin/systems/class_workstationGeneric.inc:115
-msgid "Wake up"
-msgstr ""
-
-#: admin/systems/class_workstationGeneric.inc:144
-#: admin/systems/class_printGeneric.inc:604
+#: admin/systems/class_workstationGeneric.inc:35
 msgid "workstation"
 msgstr ""
 
-#: admin/systems/class_workstationGeneric.inc:151
-#: admin/systems/class_componentGeneric.inc:61
-#: admin/systems/class_mobilePhoneGeneric.inc:60
+#: admin/systems/class_workstationGeneric.inc:42
+#: admin/systems/class_printGeneric.inc:56
+#: admin/systems/class_componentGeneric.inc:55
+#: admin/systems/class_mobilePhoneGeneric.inc:56
 msgid "Properties"
 msgstr "Egenskaper"
 
-#: admin/systems/class_workstationGeneric.inc:155
+#: admin/systems/class_workstationGeneric.inc:47
 #, php-format
 msgid "The name of the %s"
 msgstr ""
 
-#: admin/systems/class_workstationGeneric.inc:161
+#: admin/systems/class_workstationGeneric.inc:52
 #, php-format
 msgid "A short description of the %s"
 msgstr ""
 
-#: admin/systems/class_workstationGeneric.inc:166
-#: admin/systems/class_printGeneric.inc:1025
+#: admin/systems/class_workstationGeneric.inc:56
 msgid "Location"
 msgstr "Plats"
 
-#: admin/systems/class_workstationGeneric.inc:167
+#: admin/systems/class_workstationGeneric.inc:57
 #, php-format
 msgid "The location of the %s"
 msgstr ""
 
-#: admin/systems/class_workstationGeneric.inc:173
+#: admin/systems/class_workstationGeneric.inc:61
 #, php-format
 msgid "Lock this %s"
 msgstr ""
 
-#: admin/systems/class_workstationGeneric.inc:174
+#: admin/systems/class_workstationGeneric.inc:62
 #, php-format
 msgid "This will prevent the %s from being reinstalled"
 msgstr ""
 
-#: admin/systems/class_workstationGeneric.inc:185
-#: addons/dashboard/class_dashBoardSystems.inc:48
-msgid "Servers"
-msgstr "Server"
-
-#: admin/systems/class_workstationGeneric.inc:190
-#, php-format
-msgid "The syslog server the %s should be using"
-msgstr ""
-
-#: admin/systems/class_workstationGeneric.inc:195
-msgid "Inherit NTP servers"
-msgstr ""
-
-#: admin/systems/class_workstationGeneric.inc:196
-msgid "Inherit time server attributes from ogroup"
+#: admin/systems/class_workstationGeneric.inc:73
+#: admin/systems/class_printGeneric.inc:83
+#: admin/systems/class_componentGeneric.inc:69
+#: admin/systems/class_mobilePhoneGeneric.inc:102
+#: admin/systems/class_networkSettings.inc:1008
+msgid "Network settings"
 msgstr ""
 
-#: admin/systems/class_workstationGeneric.inc:202
-msgid "NTP servers"
+#: admin/systems/class_workstationGeneric.inc:78
+#: admin/systems/class_printGeneric.inc:87
+#: admin/systems/class_componentGeneric.inc:73
+#: admin/systems/class_mobilePhoneGeneric.inc:106
+#: admin/systems/class_networkSettings.inc:630
+#: admin/systems/class_networkSettings.inc:643
+#: admin/systems/class_networkSettings.inc:645
+#: admin/systems/class_networkSettings.inc:1014
+msgid "IP address"
 msgstr ""
 
-#: admin/systems/class_workstationGeneric.inc:203
-#, php-format
-msgid "The NTP servers for the %s"
+#: admin/systems/class_workstationGeneric.inc:78
+msgid "IP addresses this system uses (v4 or v6)"
 msgstr ""
 
-#: admin/systems/class_workstationGeneric.inc:209
-msgid "Inherit LDAP servers"
+#: admin/systems/class_workstationGeneric.inc:83
+#: admin/systems/class_printGeneric.inc:91
+#: admin/systems/class_componentGeneric.inc:77
+#: admin/systems/class_mobilePhoneGeneric.inc:110
+msgid "Mac address"
 msgstr ""
 
-#: admin/systems/class_workstationGeneric.inc:210
-msgid "Inherit LDAP server attributes from ogroup"
+#: admin/systems/class_workstationGeneric.inc:83
+#: admin/systems/class_printGeneric.inc:91
+#: admin/systems/class_componentGeneric.inc:77
+#: admin/systems/class_mobilePhoneGeneric.inc:110
+msgid "Mac address of this system"
 msgstr ""
 
-#: admin/systems/class_workstationGeneric.inc:216
-msgid "LDAP servers"
-msgstr ""
+#: admin/systems/class_workstationGeneric.inc:125
+#: admin/systems/class_workstationGeneric.inc:130
+#: admin/systems/class_workstationGeneric.inc:131
+msgid "Workstation"
+msgstr "Arbetsstation"
 
-#: admin/systems/class_workstationGeneric.inc:217
-#, php-format
-msgid "The LDAP servers for the %s"
+#: admin/systems/class_workstationGeneric.inc:126
+msgid "Workstation information"
 msgstr ""
 
-#: admin/systems/class_workstationGeneric.inc:225
-#: admin/systems/class_workstationGeneric.inc:229
-#: admin/ogroups/goto/termgroup.tpl.c:41
-msgid "Action"
-msgstr "Ã…tgÃ¤rd"
-
-#: admin/systems/class_workstationGeneric.inc:230
-#: admin/ogroups/goto/termgroup.tpl.c:44
-msgid "Select action to execute for this terminal"
-msgstr ""
+#: admin/systems/class_printGeneric.inc:32
+#: admin/systems/class_printGeneric.inc:37
+#: admin/systems/class_printGeneric.inc:38
+msgid "Printer"
+msgstr "Skrivare"
 
-#: admin/systems/class_workstationGeneric.inc:236
-#: admin/systems/class_componentGeneric.inc:75
-#: admin/systems/class_mobilePhoneGeneric.inc:106
-#: admin/systems/class_networkSettings.inc:1016
-msgid "Network settings"
+#: admin/systems/class_printGeneric.inc:33
+msgid "Printer information"
 msgstr ""
 
-#: admin/systems/class_workstationGeneric.inc:459
-msgid "Workstation information"
+#: admin/systems/class_printGeneric.inc:60
+msgid "The name of the printer"
 msgstr ""
 
-#: admin/systems/class_printGeneric.inc:131
-#: admin/systems/class_printGeneric.inc:1065
-#: admin/systems/class_systemManagement.inc:678
-msgid "Internal error"
-msgstr "Internt fel"
-
-#: admin/systems/class_printGeneric.inc:131
-#, php-format
-msgid ""
-"Cannot determine a valid department for this object. Setting base to '%s'!"
+#: admin/systems/class_printGeneric.inc:64
+msgid "A short description of the printer"
 msgstr ""
 
-#: admin/systems/class_printGeneric.inc:311
-#: admin/systems/class_printGeneric.inc:319
-#: admin/systems/class_printGeneric.inc:324
-#: admin/systems/class_printGeneric.inc:374
-#: admin/systems/class_printGeneric.inc:390
-#: admin/systems/class_printGeneric.inc:393
-msgid "Add printer extension"
+#: admin/systems/class_printGeneric.inc:70
+msgid "Details"
 msgstr ""
 
-#: admin/systems/class_printGeneric.inc:312
-msgid ""
-"Could not initialize printer tab, parameter parent was missing while "
-"construction."
+#: admin/systems/class_printGeneric.inc:73
+msgid "Printer location"
 msgstr ""
 
-#: admin/systems/class_printGeneric.inc:320
-msgid "This is a workstation template, printer tab is disabled."
+#: admin/systems/class_printGeneric.inc:73
+msgid "The location of the printer"
 msgstr ""
 
-#: admin/systems/class_printGeneric.inc:325
-msgid "This is a terminal template, printer tab is disabled."
+#: admin/systems/class_printGeneric.inc:77
+msgid "Printer URL"
 msgstr ""
 
-#: admin/systems/class_printGeneric.inc:367
-#: admin/systems/class_printGeneric.inc:375
-#: admin/systems/class_printGeneric.inc:383
-#: admin/systems/class_printGeneric.inc:386
-#: admin/systems/class_printGeneric.inc:391
-#: admin/systems/class_printGeneric.inc:394
-msgid "printer"
+#: admin/systems/class_printGeneric.inc:77
+msgid "The URL of the printer"
 msgstr ""
 
-#: admin/systems/class_printGeneric.inc:375
-msgid ""
-"You can't enable it while 'cn' is not present in entry. Possibly you are "
-"currently creating a new terminal template."
+#: admin/systems/class_printGeneric.inc:87
+#: admin/systems/class_componentGeneric.inc:73
+#: admin/systems/class_mobilePhoneGeneric.inc:106
+msgid "IP address this system uses"
 msgstr ""
 
-#: admin/systems/class_printGeneric.inc:382
-#: admin/systems/class_printGeneric.inc:385
-msgid "Remove printer extension"
+#: admin/systems/class_serverService.inc:58
+msgid "Server services"
 msgstr ""
 
-#: admin/systems/class_printGeneric.inc:474
-#: admin/systems/class_printGeneric.inc:652
-#: admin/systems/class_printGeneric.inc:659
-#: admin/systems/class_printGeneric.inc:718
-#: admin/systems/class_printGeneric.inc:1105
-#: admin/systems/class_printGeneric.inc:1116
 #: admin/systems/class_serverService.inc:224
 #: admin/systems/class_serverService.inc:270
 #: admin/systems/class_serverService.inc:393
-#: admin/systems/class_systemManagement.inc:341
-#: admin/systems/class_systemManagement.inc:624
-#: admin/systems/class_systemManagement.inc:639
 #: admin/systems/services/shares/class_serviceShare.inc:103
-#: admin/systems/class_networkSettings.inc:305
-#: admin/systems/class_networkSettings.inc:336
-#: admin/systems/class_networkSettings.inc:584
-#: admin/systems/class_networkSettings.inc:591
-#: admin/systems/class_networkSettings.inc:597
-#: admin/systems/class_networkSettings.inc:604
+#: admin/systems/class_networkSettings.inc:297
+#: admin/systems/class_networkSettings.inc:328
+#: admin/systems/class_networkSettings.inc:576
+#: admin/systems/class_networkSettings.inc:583
+#: admin/systems/class_networkSettings.inc:589
+#: admin/systems/class_networkSettings.inc:596
 msgid "Error"
 msgstr "Fel"
 
-#: admin/systems/class_printGeneric.inc:577
-#, php-format
-msgid "Your currently selected PPD file '%s' doesn't exist."
-msgstr ""
-
-#: admin/systems/class_printGeneric.inc:583
-msgid "Not defined"
-msgstr ""
-
-#: admin/systems/class_printGeneric.inc:587
-#: admin/systems/ppd/class_printerPPDDialog.inc:116
-msgid "Can't get ppd informations."
-msgstr ""
-
-#: admin/systems/class_printGeneric.inc:602
-#: admin/systems/class_printGeneric.inc:604
-#, php-format
-msgid "This printer belongs to %s. You can't rename this printer."
-msgstr ""
-
-#: admin/systems/class_printGeneric.inc:602
-#: admin/systems/class_terminalGeneric.inc:34
-msgid "terminal"
-msgstr "Terminal"
-
-#: admin/systems/class_printGeneric.inc:652
-#: admin/systems/class_printGeneric.inc:659
-msgid "Object is no printer!"
-msgstr ""
-
-#: admin/systems/class_printGeneric.inc:767 admin/systems/printer.tpl.c:23
-msgid "Printer URL"
-msgstr ""
-
-#: admin/systems/class_printGeneric.inc:989
-#: admin/systems/class_printGeneric.inc:991
-msgid "Group"
-msgstr "Grupp"
-
-#: admin/systems/class_printGeneric.inc:994
-msgid "User"
-msgstr "AnvÃ¤ndare"
-
-#: admin/systems/class_printGeneric.inc:1006
-msgid "Printer information"
-msgstr ""
-
-#: admin/systems/class_printGeneric.inc:1023
-#: admin/systems/serverService-list.tpl.c:2
-#: admin/systems/phoneSelect/phoneSelect-list.tpl.c:2
-#: admin/systems/printer.tpl.c:11
-msgid "Base"
-msgstr "Bas"
-
-#: admin/systems/class_printGeneric.inc:1026
-msgid "LabeledURL"
-msgstr ""
-
-#: admin/systems/class_printGeneric.inc:1027
-msgid "Printer PPD"
-msgstr ""
-
-#: admin/systems/class_printGeneric.inc:1028 admin/systems/printer.tpl.c:38
-msgid "Permissions"
-msgstr "RÃ¤ttigheter"
-
-#: admin/systems/class_printGeneric.inc:1030
-msgid "Windows inf file"
-msgstr ""
-
-#: admin/systems/class_printGeneric.inc:1031
-msgid "Windows driver dir"
-msgstr ""
-
-#: admin/systems/class_printGeneric.inc:1032 admin/systems/printer.tpl.c:62
-msgid "Driver printer name"
-msgstr ""
-
-#: admin/systems/class_printGeneric.inc:1048
-#: admin/systems/class_printGeneric.inc:1070
-msgid "Permission error"
-msgstr "RÃ¤ttighetsfel"
-
-#: admin/systems/class_printGeneric.inc:1048
-#: admin/systems/class_printGeneric.inc:1070
-msgid "printer user"
-msgstr ""
-
-#: admin/systems/class_printGeneric.inc:1065
-#, php-format
-msgid "Illegal member type '%s'!"
-msgstr ""
-
-#: admin/systems/class_printGeneric.inc:1105
-#, php-format
-msgid "'%s' is already used!"
-msgstr ""
-
-#: admin/systems/class_printGeneric.inc:1116
-#, php-format
-msgid "'%s' does not exist!"
-msgstr ""
-
-#: admin/systems/class_serverService.inc:58
-msgid "Server services"
-msgstr ""
-
 #: admin/systems/class_serverService.inc:332
 msgid "Filter error"
 msgstr "Filterfel"
@@ -711,313 +438,163 @@ msgstr ""
 msgid "Could not get execute action %s on service %s."
 msgstr ""
 
-#: admin/systems/class_terminalGeneric.inc:42
-#, php-format
-msgid "The root server the terminal should be using"
-msgstr ""
+#: admin/systems/class_terminalGeneric.inc:31
+msgid "terminal"
+msgstr "Terminal"
 
+#: admin/systems/class_terminalGeneric.inc:43
 #: admin/systems/class_terminalGeneric.inc:48
-#, php-format
-msgid "The swap server the terminal should be using"
-msgstr ""
-
-#: admin/systems/class_terminalGeneric.inc:54
-msgid "Remote desktop"
-msgstr ""
-
-#: admin/systems/class_terminalGeneric.inc:58
-msgid "Connect method"
-msgstr ""
-
-#: admin/systems/class_terminalGeneric.inc:62
-msgid "XDMCP"
-msgstr ""
-
-#: admin/systems/class_terminalGeneric.inc:62
-msgid "LDM"
-msgstr ""
-
-#: admin/systems/class_terminalGeneric.inc:62
-msgid "Shell"
-msgstr "Skal"
-
-#: admin/systems/class_terminalGeneric.inc:62
-msgid "Telnet"
-msgstr ""
-
-#: admin/systems/class_terminalGeneric.inc:62
-msgid "Windows RDP"
-msgstr ""
-
-#: admin/systems/class_terminalGeneric.inc:66
-msgid "Terminal server"
-msgstr ""
+#: admin/systems/class_terminalGeneric.inc:49
+msgid "Terminal"
+msgstr "Terminal"
 
-#: admin/systems/class_terminalGeneric.inc:82
+#: admin/systems/class_terminalGeneric.inc:44
 msgid "Terminal information"
 msgstr ""
 
-#: admin/systems/ppd/class_printerPPDSelectionDialog.inc:91
-#: admin/systems/ppd/class_printerPPDSelectionDialog.inc:116
-#: admin/systems/ppd/class_printerPPDSelectionDialog.inc:139
-#: admin/systems/ppd/class_printerPPDDialog.inc:92
-#: admin/systems/ppd/class_printerPPDDialog.inc:160
-#: admin/systems/ppd/class_printerPPDDialog.inc:241
-#: admin/systems/ppd/class_printerPPDDialog.inc:256
-#: admin/systems/ppd/class_printerPPDDialog.inc:269
-#: admin/systems/ppd/class_printerPPDDialog.inc:297
-#: admin/systems/ppd/class_printerPPDDialog.inc:314
-#: admin/systems/ppd/class_printerPPDDialog.inc:337
-#: admin/systems/ppd/class_printerPPDDialog.inc:351
-#: admin/systems/ppd/class_printerPPDDialog.inc:361
-#: admin/systems/ppd/class_printerPPDDialog.inc:365
-#: admin/systems/ppd/class_printerPPDDialog.inc:560
-#: admin/systems/ppd/class_printerPPDDialog.inc:577
-#: admin/systems/ppd/class_printerPPDDialog.inc:580
-#: admin/systems/ppd/class_printerPPDDialog.inc:583
-msgid "PPD error"
-msgstr ""
-
-#: admin/systems/ppd/class_printerPPDSelectionDialog.inc:139
-#, php-format
-msgid "Cannot locate vendor '%s' in available PPDs!"
-msgstr ""
-
-#: admin/systems/ppd/class_printerPPDSelectionDialog.inc:148
-msgid "Printer ppd selection."
-msgstr ""
-
-#: admin/systems/ppd/class_printerPPDSelectionDialog.inc:155
-msgid "delete"
-msgstr "ta bort"
-
-#: admin/systems/ppd/class_printerPPDSelectionDialog.inc:166
-msgid "back"
-msgstr ""
-
-#: admin/systems/ppd/class_printerPPDDialog.inc:74
-#: admin/systems/ppd/class_printerPPDDialog.inc:140
-#: admin/systems/services/class_goService.inc:241
-msgid "Configuration error"
-msgstr "Konfigurationsfel"
-
-#: admin/systems/ppd/class_printerPPDDialog.inc:92
-#, php-format
-msgid "Cannot open PPD '%s'!"
-msgstr ""
-
-#: admin/systems/ppd/class_printerPPDDialog.inc:141
-#, php-format
-msgid "Cannot open PPD path '%s' for reading and writing!"
-msgstr ""
-
-#: admin/systems/ppd/class_printerPPDDialog.inc:160
-#: admin/systems/ppd/class_printerPPDDialog.inc:365
-msgid "file is empty"
-msgstr "filen Ã¤r tom"
-
-#: admin/systems/ppd/class_printerPPDDialog.inc:314
-#, php-format
-msgid "Cannot parse PPD '%s'!"
-msgstr ""
-
-#: admin/systems/ppd/class_printerPPDDialog.inc:340
-msgid "Overwrite existing PPD"
-msgstr ""
-
-#: admin/systems/ppd/class_printerPPDDialog.inc:341
-msgid ""
-"There is already a ppd file for this kind of printer. Do you want to "
-"overwrite it?"
-msgstr ""
-
-#: admin/systems/ppd/class_printerPPDDialog.inc:491
-msgid "Section"
-msgstr "Sektion"
-
-#: admin/systems/ppd/class_printerPPDDialog.inc:551
-#: admin/systems/ppd/class_printerPPDDialog.inc:554
-msgid "True"
-msgstr "Sant"
-
-#: admin/systems/ppd/class_printerPPDDialog.inc:552
-#: admin/systems/ppd/class_printerPPDDialog.inc:555
-msgid "False"
-msgstr "Falskt"
-
-#: admin/systems/ppd/class_printerPPDDialog.inc:560
-#, php-format
-msgid "PPD type '%s' is not supported!"
-msgstr ""
-
-#: admin/systems/ppd/class_printerPPDDialog.inc:597
-msgid ""
-"Please select a valid ppd file or use 'Cancel' to go back to printer "
-"configuration."
-msgstr ""
-
-#: admin/systems/ppd/class_ppdManager.inc:44
-#: admin/systems/ppd/class_ppdManager.inc:188
-#: admin/systems/ppd/class_ppdManager.inc:190
-msgid "PPD manager error"
-msgstr ""
-
-#: admin/systems/ppd/class_ppdManager.inc:44
-#, php-format
-msgid "The specified path '%s' does not exist."
-msgstr ""
-
-#: admin/systems/ppd/class_ppdManager.inc:188
+#: admin/systems/class_systemImport.inc:72
 #, php-format
-msgid "Specified PPD file '%s' cannot be opened for reading."
+msgid "Could not parse %s"
 msgstr ""
 
-#: admin/systems/ppd/class_ppdManager.inc:190
+#: admin/systems/class_systemImport.inc:116
 #, php-format
-msgid "The temporary file '%s' cannot be opened for writing."
-msgstr ""
-
-#: admin/systems/ppd/class_ppdManager.inc:212
-#: admin/systems/ppd/class_ppdManager.inc:350
-msgid "Parsing PPD file failed - file is empty!"
+msgid "No DHCP server found for ip %s"
 msgstr ""
 
-#: admin/systems/ppd/class_ppdManager.inc:222
+#: admin/systems/class_systemImport.inc:130
 #, php-format
-msgid ""
-"Parsing PPD file %s failed - line too long. Trailing characters have been "
-"ignored!"
-msgstr ""
-
-#: admin/systems/ppd/class_ppdManager.inc:230
-msgid "Nested groups are not supported!"
-msgstr ""
-
-#: admin/systems/ppd/class_ppdManager.inc:234
-msgid "Group name not unique!"
+msgid "No DNS server found for zone %s"
 msgstr ""
 
-#: admin/systems/ppd/class_ppdManager.inc:240
-#: admin/systems/ppd/class_ppdManager.inc:270
-msgid "Symbol values are not supported yet!"
+#: admin/systems/class_systemImport.inc:165
+msgid "Import"
 msgstr ""
 
-#: admin/systems/ppd/class_ppdManager.inc:264
-msgid "Nested options are not supported!"
-msgstr ""
+#: admin/systems/class_systemImport.inc:169
+#: admin/systems/class_serverGeneric.inc:43
+#: admin/systems/class_serverGeneric.inc:48
+#: admin/systems/class_serverGeneric.inc:49
+msgid "Server"
+msgstr "Server"
 
-#: admin/systems/ppd/class_ppdManager.inc:289
-msgid "PickMany is not supported yet!"
+#: admin/systems/class_systemImport.inc:169
+msgid "The server you wish to import hosts from"
 msgstr ""
 
-#: admin/systems/ppd/class_ppdManager.inc:370
-#, php-format
-msgid ""
-"Parsing PPD file %s failed - line too long. Trailing characters have been "
-"ignored"
-msgstr ""
+#: admin/systems/class_serverGeneric.inc:31
+msgid "server"
+msgstr "Server"
 
-#: admin/systems/ppd/class_ppdManager.inc:395
-#, php-format
-msgid "Parsing PPD file %s failed - no information found."
+#: admin/systems/class_serverGeneric.inc:44
+msgid "Server information"
 msgstr ""
 
-#: admin/systems/class_systemImport.inc:72
-#, php-format
-msgid "Could not parse %s"
+#: admin/systems/class_componentGeneric.inc:31
+msgid "Component"
 msgstr ""
 
-#: admin/systems/class_systemImport.inc:116
-#, php-format
-msgid "No DHCP server found for ip %s"
+#: admin/systems/class_componentGeneric.inc:32
+msgid "Component information"
 msgstr ""
 
-#: admin/systems/class_systemImport.inc:130
-#, php-format
-msgid "No DNS server found for zone %s"
+#: admin/systems/class_componentGeneric.inc:36
+#: admin/systems/class_componentGeneric.inc:37
+msgid "Network device"
 msgstr ""
 
-#: admin/systems/class_systemImport.inc:165
-msgid "Import"
+#: admin/systems/class_componentGeneric.inc:58
+msgid "The name of the component"
 msgstr ""
-
-#: admin/systems/class_systemImport.inc:169
-msgid "The server you wish to import hosts from"
+
+#: admin/systems/class_componentGeneric.inc:62
+msgid "A short description of the component"
 msgstr ""
 
-#: admin/systems/class_serverGeneric.inc:34
-msgid "server"
+#: admin/systems/class_systemServers.inc:31
+#: admin/systems/class_systemServers.inc:53
+msgid "Servers"
 msgstr "Server"
 
-#: admin/systems/class_serverGeneric.inc:47
-msgid "Server information"
+#: admin/systems/class_systemServers.inc:35
+msgid "The syslog server the system should be using"
 msgstr ""
 
-#: admin/systems/class_componentGeneric.inc:37
-msgid "Component information"
+#: admin/systems/class_systemServers.inc:40
+msgid "NTP servers"
 msgstr ""
 
-#: admin/systems/class_componentGeneric.inc:64
-msgid "The name of the component"
+#: admin/systems/class_systemServers.inc:40
+msgid "The NTP servers for this system"
 msgstr ""
 
-#: admin/systems/class_componentGeneric.inc:68
-msgid "A short description of the component"
+#: admin/systems/class_systemServers.inc:54
+msgid "Servers this system is using"
 msgstr ""
 
+#: admin/systems/class_mobilePhoneGeneric.inc:32
 #: admin/systems/class_mobilePhoneGeneric.inc:37
+#: admin/systems/class_mobilePhoneGeneric.inc:38
+msgid "Mobile phone"
+msgstr ""
+
+#: admin/systems/class_mobilePhoneGeneric.inc:33
 msgid "Mobile phone information"
 msgstr ""
 
-#: admin/systems/class_mobilePhoneGeneric.inc:63
+#: admin/systems/class_mobilePhoneGeneric.inc:60
 msgid "The name of the mobile phone"
 msgstr ""
 
-#: admin/systems/class_mobilePhoneGeneric.inc:67
+#: admin/systems/class_mobilePhoneGeneric.inc:64
 msgid "A short description of the mobile phone"
 msgstr ""
 
-#: admin/systems/class_mobilePhoneGeneric.inc:77
+#: admin/systems/class_mobilePhoneGeneric.inc:70
+msgid "Phone"
+msgstr "Telefon"
+
+#: admin/systems/class_mobilePhoneGeneric.inc:73
 msgid "Serial Number"
 msgstr ""
 
-#: admin/systems/class_mobilePhoneGeneric.inc:77
+#: admin/systems/class_mobilePhoneGeneric.inc:73
 msgid "The serial number of the mobile phone"
 msgstr ""
 
-#: admin/systems/class_mobilePhoneGeneric.inc:81
+#: admin/systems/class_mobilePhoneGeneric.inc:77
 msgid "IMEI Number"
 msgstr ""
 
-#: admin/systems/class_mobilePhoneGeneric.inc:81
+#: admin/systems/class_mobilePhoneGeneric.inc:77
 msgid "The IMEI number of the mobile phone"
 msgstr ""
 
-#: admin/systems/class_mobilePhoneGeneric.inc:86
+#: admin/systems/class_mobilePhoneGeneric.inc:82
 msgid "OS"
 msgstr ""
 
-#: admin/systems/class_mobilePhoneGeneric.inc:86
+#: admin/systems/class_mobilePhoneGeneric.inc:82
 msgid "The Operating System installed on this phone"
 msgstr ""
 
-#: admin/systems/class_mobilePhoneGeneric.inc:92
+#: admin/systems/class_mobilePhoneGeneric.inc:88
 msgid "SimCard"
 msgstr ""
 
-#: admin/systems/class_mobilePhoneGeneric.inc:95
+#: admin/systems/class_mobilePhoneGeneric.inc:91
 msgid "Telephone Number"
 msgstr ""
 
-#: admin/systems/class_mobilePhoneGeneric.inc:95
+#: admin/systems/class_mobilePhoneGeneric.inc:91
 msgid "The telephone number of the mobile phone"
 msgstr ""
 
-#: admin/systems/class_mobilePhoneGeneric.inc:99
+#: admin/systems/class_mobilePhoneGeneric.inc:95
 msgid "PUK Number"
 msgstr ""
 
-#: admin/systems/class_mobilePhoneGeneric.inc:99
+#: admin/systems/class_mobilePhoneGeneric.inc:95
 msgid "The PUK number of the simcard in this mobile phone"
 msgstr ""
 
@@ -1060,70 +637,20 @@ msgstr ""
 msgid "Remove service"
 msgstr ""
 
-#: admin/systems/phoneSelect/phoneSelect-list.xml:10
-msgid "Please select the desired entries"
-msgstr "VÃ¤lj Ã¶nskade poster"
-
-#: admin/systems/phoneSelect/phoneSelect-list.xml:56
-msgid "Number"
-msgstr ""
-
-#: admin/systems/phoneSelect/phoneSelect-list.xml:83
-msgid "Select this number"
-msgstr ""
-
-#: admin/systems/class_systemManagement.inc:177
-msgid "Back"
-msgstr "Tillbaka"
-
-#: admin/systems/class_systemManagement.inc:223
-msgid "Creating the image failed. Please see the report below."
-msgstr ""
-
-#: admin/systems/class_systemManagement.inc:228
-#, php-format
-msgid "Command '%s', specified for ISO creation doesn't seem to exist."
-msgstr ""
-
-#: admin/systems/class_systemManagement.inc:398
-#: admin/systems/class_systemManagement.inc:473
-#: admin/systems/class_systemManagement.inc:858
-#: admin/systems/class_systemManagement.inc:905
-#: admin/systems/class_systemManagement.inc:926
-msgid "Permission"
-msgstr "RÃ¤ttighet"
-
-#: admin/systems/class_systemManagement.inc:678
-msgid "Cannot set mode to 'active'!"
-msgstr ""
-
-#: admin/systems/class_systemManagement.inc:858
-#, 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:905
-#: admin/systems/class_systemManagement.inc:926
-#, php-format
-msgid "You are not allowed to restore a snapshot for %s."
-msgstr "Du Ã¤r inte tillÃ¥ten att Ã¥terskapa en Ã¶gonblicksbild fÃ¶r %s."
-
-#: admin/systems/class_systemManagement.inc:1169
-#, php-format
-msgid "Inherited from %s"
-msgstr ""
-
-#: admin/systems/class_systemManagement.inc:1224
-#: admin/systems/class_systemManagement.inc:1228
-#: addons/dashboard/class_dashBoardSystems.inc:199
+#: admin/systems/class_systemManagement.inc:48
 #: config/systems/class_systemsPluginConfig.inc:28
 msgid "Systems"
 msgstr "System"
 
-#: admin/systems/class_systemManagement.inc:1225
+#: admin/systems/class_systemManagement.inc:49
 msgid "Systems Management"
 msgstr ""
 
+#: admin/systems/class_systemManagement.inc:250
+#, php-format
+msgid "Inherited from %s"
+msgstr ""
+
 #: admin/systems/services/terminal/class_serviceTerminal.inc:29
 #: admin/systems/services/terminal/class_serviceTerminal.inc:30
 #: admin/systems/services/terminal/class_serviceTerminal.inc:41
@@ -1161,6 +688,10 @@ msgstr ""
 msgid "Empty service"
 msgstr ""
 
+#: admin/systems/services/class_goService.inc:241
+msgid "Configuration error"
+msgstr "Konfigurationsfel"
+
 #: admin/systems/services/shares/class_serviceShare.inc:30
 #: admin/systems/services/shares/class_serviceShare.inc:31
 msgid "Share service"
@@ -1219,8 +750,6 @@ msgid "You need to configure encodings first"
 msgstr ""
 
 #: admin/systems/services/shares/class_serviceShare.inc:110
-#: admin/ogroups/goto/termgroup.tpl.c:2 admin/systems/remove.tpl.c:2
-#: admin/systems/ppd/remove_ppd.tpl.c:2
 msgid "Warning"
 msgstr "Varning"
 
@@ -1346,153 +875,93 @@ msgstr ""
 msgid "LDAP"
 msgstr ""
 
-#: admin/systems/class_networkSettings.inc:305
+#: admin/systems/class_networkSettings.inc:297
 msgid "NOT IMPLEMENTED"
 msgstr ""
 
-#: admin/systems/class_networkSettings.inc:437
+#: admin/systems/class_networkSettings.inc:429
 msgid "Not matching"
 msgstr ""
 
-#: admin/systems/class_networkSettings.inc:584
+#: admin/systems/class_networkSettings.inc:576
 #, php-format
 msgid "Was not able to contact argonaut server: %s"
 msgstr ""
 
-#: admin/systems/class_networkSettings.inc:591
+#: admin/systems/class_networkSettings.inc:583
 #, php-format
 msgid "Was not able to find DNS server for zone %s"
 msgstr ""
 
-#: admin/systems/class_networkSettings.inc:597
+#: admin/systems/class_networkSettings.inc:589
 #, php-format
 msgid "Was not able to find mac address of DNS server %s"
 msgstr ""
 
-#: admin/systems/class_networkSettings.inc:604
+#: admin/systems/class_networkSettings.inc:596
 #, php-format
 msgid "Was not able to launch ldap2zone: %s"
 msgstr ""
 
-#: admin/systems/class_networkSettings.inc:630
+#: admin/systems/class_networkSettings.inc:622
 #, php-format
 msgid "IP address %s"
 msgstr ""
 
-#: admin/systems/class_networkSettings.inc:638
-#: admin/systems/class_networkSettings.inc:651
-#: admin/systems/class_networkSettings.inc:653
-#: admin/systems/class_networkSettings.inc:1022
-msgid "IP address"
-msgstr ""
-
-#: admin/systems/class_networkSettings.inc:644
-#: admin/systems/class_networkSettings.inc:660
-#: admin/systems/class_networkSettings.inc:662
-#: admin/systems/class_networkSettings.inc:1023
+#: admin/systems/class_networkSettings.inc:636
+#: admin/systems/class_networkSettings.inc:652
+#: admin/systems/class_networkSettings.inc:654
+#: admin/systems/class_networkSettings.inc:1015
 msgid "MAC address"
 msgstr ""
 
-#: admin/systems/class_networkSettings.inc:676
+#: admin/systems/class_networkSettings.inc:668
 #, php-format
 msgid "The IP address '%s' is not part of the selected reverse zone '%s'!"
 msgstr ""
 
-#: admin/systems/class_networkSettings.inc:686
+#: admin/systems/class_networkSettings.inc:678
 #, php-format
 msgid "Record type '%s' is duplicated!"
 msgstr ""
 
-#: admin/systems/class_networkSettings.inc:693
+#: admin/systems/class_networkSettings.inc:685
 #, php-format
 msgid "Uniq record type '%s' is duplicated!"
 msgstr ""
 
-#: admin/systems/class_networkSettings.inc:705
+#: admin/systems/class_networkSettings.inc:697
 #, php-format
 msgid ""
 "The IP address '%s' will be added as 'A Record', this will be done "
 "automatically, please remove the record."
 msgstr ""
 
-#: admin/systems/class_networkSettings.inc:712
+#: admin/systems/class_networkSettings.inc:704
 #, php-format
 msgid "Only lowercase records are allowed, please check your '%ss'."
 msgstr ""
 
-#: admin/systems/class_networkSettings.inc:978
+#: admin/systems/class_networkSettings.inc:970
 msgid "Delete"
 msgstr "Ta bort"
 
-#: admin/systems/class_networkSettings.inc:984
+#: admin/systems/class_networkSettings.inc:976
 msgid "Add"
 msgstr "LÃ¤gg till"
 
-#: admin/systems/class_networkSettings.inc:1015
-#: addons/dashboard/class_dashBoardNetwork.inc:127
+#: admin/systems/class_networkSettings.inc:1007
 msgid "Network"
 msgstr ""
 
-#: admin/systems/class_networkSettings.inc:1030
+#: admin/systems/class_networkSettings.inc:1022
 msgid "DNS configuration"
 msgstr ""
 
-#: admin/systems/class_networkSettings.inc:1033
+#: admin/systems/class_networkSettings.inc:1025
 msgid "DHCP configuration"
 msgstr ""
 
-#: addons/dashboard/class_dashBoardSystems.inc:45
-msgid "Workstations"
-msgstr ""
-
-#: addons/dashboard/class_dashBoardSystems.inc:51
-msgid "Windows Workstations"
-msgstr ""
-
-#: addons/dashboard/class_dashBoardSystems.inc:54
-msgid "Terminals"
-msgstr ""
-
-#: addons/dashboard/class_dashBoardSystems.inc:57
-msgid "Printers"
-msgstr ""
-
-#: addons/dashboard/class_dashBoardSystems.inc:60
-msgid "Phones"
-msgstr ""
-
-#: addons/dashboard/class_dashBoardSystems.inc:63
-msgid "Components"
-msgstr ""
-
-#: addons/dashboard/class_dashBoardSystems.inc:66
-msgid "Mobile phones"
-msgstr ""
-
-#: addons/dashboard/class_dashBoardSystems.inc:183
-msgid "Statistics"
-msgstr ""
-
-#: addons/dashboard/class_dashBoardSystems.inc:188
-msgid "Computer name to use by unit"
-msgstr ""
-
-#: addons/dashboard/class_dashBoardSystems.inc:200
-msgid "Statistics and informations about systems"
-msgstr ""
-
-#: addons/dashboard/class_dashBoardNetwork.inc:111
-msgid "DHCP"
-msgstr ""
-
-#: addons/dashboard/class_dashBoardNetwork.inc:116
-msgid "DNS"
-msgstr ""
-
-#: addons/dashboard/class_dashBoardNetwork.inc:128
-msgid "Statistics and various informations"
-msgstr ""
-
 #: config/systems/class_systemsPluginConfig.inc:29
 msgid "Systems plugin configuration"
 msgstr ""
@@ -1584,404 +1053,3 @@ msgstr ""
 #: config/systems/class_systemsPluginConfig.inc:101
 msgid "Encodings"
 msgstr ""
-
-#: admin/ogroups/goto/termgroup.tpl.c:5
-msgid ""
-"Actions you choose here influence all systems in this object group. "
-"Additionally, all values editable here can be inherited by the clients "
-"assigned to this object group."
-msgstr ""
-
-#: admin/ogroups/goto/termgroup.tpl.c:8
-msgid "Generic"
-msgstr "Generisk"
-
-#: admin/ogroups/goto/termgroup.tpl.c:11
-msgid "NTP server"
-msgstr ""
-
-#: admin/ogroups/goto/termgroup.tpl.c:14
-msgid "Choose server to use for synchronizing time"
-msgstr ""
-
-#: admin/ogroups/goto/termgroup.tpl.c:20
-msgid "Select terminal mode"
-msgstr ""
-
-#: admin/ogroups/goto/termgroup.tpl.c:26
-msgid "Choose server to use for logging"
-msgstr ""
-
-#: admin/ogroups/goto/termgroup.tpl.c:32
-msgid "Select NFS root filesystem to use"
-msgstr ""
-
-#: admin/ogroups/goto/termgroup.tpl.c:38
-msgid "Choose NFS filesystem to place swap files on"
-msgstr ""
-
-#: admin/ogroups/goto/termgroup.tpl.c:47
-msgid "Execute"
-msgstr "Exekvera"
-
-#: 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 admin/systems/network.tpl.c:11
-msgid "Propose ip"
-msgstr ""
-
-#: admin/systems/network.tpl.c:14
-msgid "MAC-address"
-msgstr ""
-
-#: admin/systems/network.tpl.c:17
-msgid "Autodetect"
-msgstr ""
-
-#: admin/systems/network.tpl.c:20 admin/systems/network.tpl.c:23
-msgid "Enable DHCP for this device"
-msgstr ""
-
-#: admin/systems/network.tpl.c:26 admin/systems/network.tpl.c:50
-msgid "not configured"
-msgstr ""
-
-#: admin/systems/network.tpl.c:29
-msgid "Parent node"
-msgstr "FÃ¶rÃ¤ldranod"
-
-#: admin/systems/network.tpl.c:32
-msgid "Edit settings"
-msgstr ""
-
-#: admin/systems/network.tpl.c:35 admin/systems/network.tpl.c:47
-msgid "Enable DNS for this device"
-msgstr ""
-
-#: admin/systems/network.tpl.c:38
-msgid "Zone"
-msgstr ""
-
-#: admin/systems/network.tpl.c:41
-msgid "TTL"
-msgstr ""
-
-#: admin/systems/network.tpl.c:44
-msgid "Dns records"
-msgstr ""
-
-#: admin/systems/password.tpl.c:2
-msgid ""
-"To change the terminal root password use the fields below. The changes take "
-"effect during the next reboot. Please memorize the new password, because you"
-" wouldn't be able to log in."
-msgstr ""
-
-#: admin/systems/password.tpl.c:5
-msgid "Leave fields blank for password inheritance from default entries."
-msgstr ""
-
-#: admin/systems/password.tpl.c:8
-msgid "Changing the password impinges on authentification only."
-msgstr ""
-
-#: admin/systems/password.tpl.c:11
-msgid "New password"
-msgstr "Nytt lÃ¶senord"
-
-#: admin/systems/password.tpl.c:14
-msgid "Repeat new password"
-msgstr "Upprepa det nya lÃ¶senordet"
-
-#: admin/systems/password.tpl.c:17
-msgid "Password strength"
-msgstr "LÃ¶senordsstyrka"
-
-#: admin/systems/password.tpl.c:20
-msgid "Set password"
-msgstr "StÃ¤ll in lÃ¶senord"
-
-#: 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/gencd.tpl.c:2
-msgid "CD-Install-Image generation"
-msgstr ""
-
-#: admin/systems/gencd.tpl.c:5
-msgid ""
-"This option enables you to generate FAI install CD images for the selected "
-"workstation. The procedure may take about 10 minutes to complete, so please "
-"be patient after pressing the 'Create ISO-Image' button."
-msgstr ""
-
-#: admin/systems/gencd.tpl.c:8
-msgid "Create ISO-Image"
-msgstr ""
-
-#: admin/systems/remove.tpl.c:5
-msgid ""
-"This includes all account data, system access rules, imap settings, etc. for"
-" this user. Please double check if your really want to do this since there "
-"is no way for FusionDirectory to get your data back."
-msgstr "Detta inkluderar alla kontodata, systemrÃ¤ttighetsregler, imapinstÃ¤llningar, etc. fÃ¶r den hÃ¤r anvÃ¤ndaren. VÃ¤nligen dubbelkolla att du verkligen vill gÃ¶ra detta eftersom det inte finns nÃ¥got sÃ¤tt fÃ¶r FusionDirectory att fÃ¥ tillbaka informationen."
-
-#: admin/systems/remove.tpl.c:8
-msgid "So - if you're sure - press 'Delete' to continue or 'Cancel' to abort."
-msgstr "SÃ¥ - om du Ã¤r sÃ¤ker - tryck 'Ta bort' fÃ¶r att fortsÃ¤tta och 'Avbryt' fÃ¶r att avbryta."
-
-#: admin/systems/system-filter.tpl.c:2
-#: admin/systems/phoneSelect/phoneSelect-filter.tpl.c:2
-msgid "Filter"
-msgstr "Filter"
-
-#: admin/systems/system-filter.tpl.c:5
-msgid "Show servers"
-msgstr "Visa servrar"
-
-#: admin/systems/system-filter.tpl.c:8
-msgid "Show workstations"
-msgstr "Visa workstations"
-
-#: admin/systems/system-filter.tpl.c:11
-msgid "Show terminals"
-msgstr "Visa terminaler"
-
-#: admin/systems/system-filter.tpl.c:14
-msgid "Show network printer"
-msgstr ""
-
-#: admin/systems/system-filter.tpl.c:17
-#: admin/systems/phoneSelect/phoneSelect-filter.tpl.c:5
-msgid "Show phones"
-msgstr ""
-
-#: admin/systems/system-filter.tpl.c:20
-msgid "Show windows based workstations"
-msgstr ""
-
-#: admin/systems/system-filter.tpl.c:23
-msgid "Show network devices"
-msgstr ""
-
-#: admin/systems/system-filter.tpl.c:26
-#: admin/systems/phoneSelect/phoneSelect-filter.tpl.c:8
-msgid "Show mobile phones"
-msgstr ""
-
-#: admin/systems/system-filter.tpl.c:29
-msgid "Show IPMI interfaces"
-msgstr ""
-
-#: admin/systems/ppd/printerPPDSelectionDialog.tpl.c:2
-msgid "Select objects to add"
-msgstr "VÃ¤lj objekt att lÃ¤gga till"
-
-#: admin/systems/ppd/printerPPDSelectionDialog.tpl.c:5
-msgid "Filters"
-msgstr "Filter"
-
-#: admin/systems/ppd/printerPPDSelectionDialog.tpl.c:8
-msgid "Display objects matching"
-msgstr "Visa objekt som matchar"
-
-#: admin/systems/ppd/printerPPDSelectionDialog.tpl.c:11
-msgid "Regular expression for matching object names"
-msgstr "ReguljÃ¤rt uttryck fÃ¶r matchande objektnamn"
-
-#: admin/systems/ppd/printerPPDSelectionDialog.tpl.c:14
-msgid "Close"
-msgstr "StÃ¤ng"
-
-#: admin/systems/ppd/printerPPDDialog.tpl.c:2
-msgid "Printer driver"
-msgstr ""
-
-#: admin/systems/ppd/printerPPDDialog.tpl.c:5
-msgid "Model"
-msgstr ""
-
-#: admin/systems/ppd/printerPPDDialog.tpl.c:8
-msgid "Select"
-msgstr ""
-
-#: admin/systems/ppd/printerPPDDialog.tpl.c:11
-msgid "New driver"
-msgstr ""
-
-#: admin/systems/ppd/printerPPDDialog.tpl.c:14
-msgid "Upload"
-msgstr "Ladda upp"
-
-#: admin/systems/ppd/printerPPDDialog.tpl.c:17
-msgid "Options"
-msgstr "Alternativ"
-
-#: admin/systems/ppd/remove_ppd.tpl.c:5
-msgid "The ppd file will be removed from the server and can not be restored."
-msgstr ""
-
-#: admin/systems/printer.tpl.c:2
-msgid "General"
-msgstr ""
-
-#: admin/systems/printer.tpl.c:5
-msgid "Printer name"
-msgstr ""
-
-#: admin/systems/printer.tpl.c:14
-msgid "Details"
-msgstr ""
-
-#: admin/systems/printer.tpl.c:20
-msgid "Printer location"
-msgstr ""
-
-#: admin/systems/printer.tpl.c:26
-msgid "PPD Provider"
-msgstr ""
-
-#: admin/systems/printer.tpl.c:29
-msgid "Driver"
-msgstr ""
-
-#: admin/systems/printer.tpl.c:32
-msgid "Edit"
-msgstr "Redigera"
-
-#: admin/systems/printer.tpl.c:41
-msgid "Users which are allowed to use this printer"
-msgstr ""
-
-#: admin/systems/printer.tpl.c:44
-msgid "Users"
-msgstr "AnvÃ¤ndare"
-
-#: admin/systems/printer.tpl.c:47
-msgid "Users which are allowed to administrate this printer"
-msgstr ""
-
-#: admin/systems/printer.tpl.c:50
-msgid "Admins"
-msgstr ""
-
-#: admin/systems/printer.tpl.c:53
-msgid "Windows paths"
-msgstr ""
-
-#: admin/systems/printer.tpl.c:56
-msgid "Printer windows inf file"
-msgstr ""
-
-#: admin/systems/printer.tpl.c:59
-msgid "Printer driver directory"
-msgstr ""
-
-#: admin/systems/gencd_frame.tpl.c:2
-msgid "Your browser does not supprt iframes."
-msgstr ""
-
-#: admin/systems/services/cups/serviceCUPS.tpl.c:2
-msgid "Print Service"
-msgstr ""
-
-#: admin/systems/services/cups/serviceCUPS.tpl.c:5
-msgid "enabled"
-msgstr ""
-
-#: admin/systems/services/ServiceAddDialog.tpl.c:2
-msgid "Adding a new service to the current server"
-msgstr ""
-
-#: admin/systems/services/ServiceAddDialog.tpl.c:5
-msgid ""
-"This dialog allows you to add new services to the currenty edited server "
-"object. The box below shows all available but not already used services."
-msgstr ""
-
-#: admin/systems/services/ServiceAddDialog.tpl.c:8
-msgid "Service to add"
-msgstr ""
-
-#: admin/systems/services/ServiceAddDialog.tpl.c:11
-msgid "All available services are already in use."
-msgstr ""
-
-#: admin/systems/services/ServiceAddDialog.tpl.c:14
-#: admin/systems/SelectDeviceType.tpl.c:26
-msgid "Continue"
-msgstr "FortsÃ¤tt"
-
-#: admin/systems/SelectDeviceType.tpl.c:2
-msgid ""
-"This system has no system type configured. Please choose a system type for "
-"this object and an optional inheritance group. Press the 'continue' button "
-"to proceed."
-msgstr ""
-
-#: admin/systems/SelectDeviceType.tpl.c:5
-msgid ""
-"Please select a system type and an optional bundle of predefined settings to"
-" be inherited."
-msgstr ""
-
-#: admin/systems/SelectDeviceType.tpl.c:8
-msgid ""
-"Please select a system type and a bundle of predefined settings to be "
-"inherited."
-msgstr ""
-
-#: admin/systems/SelectDeviceType.tpl.c:11
-#: admin/systems/SelectDeviceType.tpl.c:14
-msgid "System type"
-msgstr ""
-
-#: admin/systems/SelectDeviceType.tpl.c:17
-msgid "Choose an object group as template"
-msgstr ""
-
-#: admin/systems/SelectDeviceType.tpl.c:20
-msgid "Object group"
-msgstr "Objektgrupp"
-
-#: admin/systems/SelectDeviceType.tpl.c:23
-msgid "none"
-msgstr "ingen"
-
-#: addons/dashboard/systems_stats.tpl.c:2
-msgid "There are several argonaut servers! (this is not yet supported)"
-msgstr ""
-
-#: addons/dashboard/systems_stats.tpl.c:5
-msgid "There is an argonaut server running on %1 (%3://%2:%4)"
-msgstr ""
-
-#: addons/dashboard/systems_stats.tpl.c:8
-msgid "Only one system is configured to run an argonaut client."
-msgid_plural "%1 systems are configured to run an argonaut client."
-msgstr[0] ""
-msgstr[1] ""
-
-#: addons/dashboard/systems_stats.tpl.c:11
-msgid "But no system is configured to run an argonaut client!"
-msgstr ""
-
-#: addons/dashboard/systems_stats.tpl.c:14
-msgid ""
-"A system is configured to run an argonaut client, but there is no argonaut "
-"server configured!"
-msgid_plural ""
-"%1 systems are configured to run an argonaut client, but there is no "
-"argonaut server configured!"
-msgstr[0] ""
-msgstr[1] ""
diff --git a/systems/locale/ug/fusiondirectory.po b/systems/locale/ug/fusiondirectory.po
index 8a9258123bd258a0d8046c0dd5241db61b43251d..2c0c2ff3777018adfd9ac87ecb3361dab4e0931a 100644
--- a/systems/locale/ug/fusiondirectory.po
+++ b/systems/locale/ug/fusiondirectory.po
@@ -5,12 +5,12 @@
 # Translators:
 msgid ""
 msgstr ""
-"Project-Id-Version: FusionDirectory-108\n"
+"Project-Id-Version: FusionDirectory-109\n"
 "Report-Msgid-Bugs-To: documentation@lists.fusiondirectory.org\n"
-"POT-Creation-Date: 2015-03-31 11:49+0200\n"
-"PO-Revision-Date: 2015-03-31 11:24+0000\n"
+"POT-Creation-Date: 2014-12-15 17:47+0100\n"
+"PO-Revision-Date: 2014-12-15 17:06+0000\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>\n"
-"Language-Team: Uighur (http://www.transifex.com/projects/p/FusionDirectory-108/language/ug/)\n"
+"Language-Team: Uighur (http://www.transifex.com/projects/p/FusionDirectory-109/language/ug/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -26,29 +26,24 @@ msgid "Locked"
 msgstr ""
 
 #: admin/ogroups/goto/class_termgroup.inc:118
-#: admin/systems/class_terminalGeneric.inc:121
+#: admin/systems/class_terminalStartup.inc:145
 msgid "Local swap"
 msgstr ""
 
 #: admin/ogroups/goto/class_termgroup.inc:124
 #: admin/ogroups/goto/class_termgroup.inc:136
-#: admin/systems/class_workstationGeneric.inc:352
-#: admin/systems/class_terminalGeneric.inc:109
-#: admin/systems/class_terminalGeneric.inc:125
+#: admin/systems/class_terminalStartup.inc:133
+#: admin/systems/class_terminalStartup.inc:149
 msgid "inherited"
 msgstr ""
 
 #: admin/ogroups/goto/class_termgroup.inc:220
-#: admin/systems/class_workstationGeneric.inc:72
-#: admin/systems/class_workstationGeneric.inc:443
-#: admin/systems/class_systemManagement.inc:295
-#: admin/systems/class_systemManagement.inc:325
-msgid "Infrastructure service"
+#: admin/systems/class_systemManagement.inc:165
+#: admin/systems/class_systemManagement.inc:186
+msgid "Service infrastructure"
 msgstr ""
 
 #: admin/ogroups/goto/class_termgroup.inc:224
-#: admin/systems/class_workstationGeneric.inc:75
-#: admin/systems/class_workstationGeneric.inc:78
 msgid "Event error"
 msgstr ""
 
@@ -58,12 +53,10 @@ msgid "Event '%s' is not available!"
 msgstr ""
 
 #: admin/ogroups/goto/class_termgroup.inc:274
-#: admin/systems/class_workstationGeneric.inc:112
 msgid "Switch off"
 msgstr ""
 
 #: admin/ogroups/goto/class_termgroup.inc:274
-#: admin/systems/class_workstationGeneric.inc:113
 msgid "Reboot"
 msgstr ""
 
@@ -84,7 +77,6 @@ msgid "Reinstall"
 msgstr ""
 
 #: admin/ogroups/goto/class_termgroup.inc:279
-#: admin/systems/class_workstationGeneric.inc:108
 msgid "Memory test"
 msgstr ""
 
@@ -93,21 +85,18 @@ msgid "System analysis"
 msgstr ""
 
 #: admin/ogroups/goto/class_termgroup.inc:386
-#: admin/systems/class_printGeneric.inc:670
-#: admin/systems/class_printGeneric.inc:970
-#: admin/systems/class_systemManagement.inc:816
 #: admin/systems/services/class_goService.inc:123
 #: admin/systems/services/class_goService.inc:151
 #: admin/systems/services/class_goService.inc:187
-#: admin/systems/class_networkSettings.inc:478
-#: admin/systems/class_networkSettings.inc:491
-#: admin/systems/class_networkSettings.inc:757
-#: admin/systems/class_networkSettings.inc:816
-#: admin/systems/class_networkSettings.inc:835
-#: admin/systems/class_networkSettings.inc:852
-#: admin/systems/class_networkSettings.inc:861
-#: admin/systems/class_networkSettings.inc:879
-#: admin/systems/class_networkSettings.inc:951
+#: admin/systems/class_networkSettings.inc:470
+#: admin/systems/class_networkSettings.inc:483
+#: admin/systems/class_networkSettings.inc:749
+#: admin/systems/class_networkSettings.inc:808
+#: admin/systems/class_networkSettings.inc:827
+#: admin/systems/class_networkSettings.inc:844
+#: admin/systems/class_networkSettings.inc:853
+#: admin/systems/class_networkSettings.inc:871
+#: admin/systems/class_networkSettings.inc:943
 msgid "LDAP error"
 msgstr ""
 
@@ -119,195 +108,125 @@ msgstr ""
 msgid "System group"
 msgstr ""
 
-#: admin/ogroups/goto/class_termgroup.inc:401
-#: admin/ogroups/goto/termgroup.tpl.c:17
+#: admin/ogroups/goto/class_termgroup.inc:402
 msgid "Mode"
 msgstr ""
 
-#: admin/ogroups/goto/class_termgroup.inc:402
-#: admin/systems/class_workstationGeneric.inc:189
-#: admin/ogroups/goto/termgroup.tpl.c:23
+#: admin/ogroups/goto/class_termgroup.inc:403
+#: admin/systems/class_systemServers.inc:35
 msgid "Syslog server"
 msgstr ""
 
-#: admin/ogroups/goto/class_termgroup.inc:403
+#: admin/ogroups/goto/class_termgroup.inc:404
 msgid "Action flag"
 msgstr ""
 
-#: admin/ogroups/goto/class_termgroup.inc:404
+#: admin/ogroups/goto/class_termgroup.inc:405
 msgid "Ntp server"
 msgstr ""
 
-#: admin/ogroups/goto/class_termgroup.inc:405
-#: admin/systems/class_terminalGeneric.inc:41
-#: admin/ogroups/goto/termgroup.tpl.c:29
+#: admin/ogroups/goto/class_termgroup.inc:406
+#: admin/systems/class_terminalStartup.inc:65
 msgid "Root server"
 msgstr ""
 
-#: admin/ogroups/goto/class_termgroup.inc:406
-#: admin/systems/class_terminalGeneric.inc:47
-#: admin/ogroups/goto/termgroup.tpl.c:35
+#: admin/ogroups/goto/class_termgroup.inc:407
+#: admin/systems/class_terminalStartup.inc:69
 msgid "Swap server"
 msgstr ""
 
-#: admin/systems/class_terminalStartup.inc:63
+#: admin/systems/class_terminalStartup.inc:62
 msgid "Startup parameters"
 msgstr ""
 
-#: admin/systems/class_terminalStartup.inc:66
+#: admin/systems/class_terminalStartup.inc:65
+msgid "The root server the terminal should be using"
+msgstr ""
+
+#: admin/systems/class_terminalStartup.inc:69
+msgid "The swap server the terminal should be using"
+msgstr ""
+
+#: admin/systems/class_terminalStartup.inc:73
 msgid "Boot kernel"
 msgstr ""
 
-#: admin/systems/class_terminalStartup.inc:66
+#: admin/systems/class_terminalStartup.inc:73
 msgid "Linux kernel to be installed and booted"
 msgstr ""
 
-#: admin/systems/class_terminalStartup.inc:70
+#: admin/systems/class_terminalStartup.inc:77
 msgid "Boot kernel parameters"
 msgstr ""
 
-#: admin/systems/class_terminalStartup.inc:70
+#: admin/systems/class_terminalStartup.inc:77
 msgid "Linux kernel parameters to be ran"
 msgstr ""
 
-#: admin/systems/class_terminalStartup.inc:82
-msgid "Startup"
-msgstr ""
-
 #: admin/systems/class_terminalStartup.inc:83
-msgid "Terminal startup"
-msgstr ""
-
-#: admin/systems/system-list.xml:10
-msgid "List of systems"
-msgstr ""
-
-#: admin/systems/system-list.xml:14
-msgid "New workstation"
-msgstr ""
-
-#: admin/systems/system-list.xml:22
-msgid "Locked server"
-msgstr ""
-
-#: admin/systems/system-list.xml:30
-msgid "Locked workstation"
-msgstr ""
-
-#: admin/systems/system-list.xml:38
-msgid "Locked terminal"
-msgstr ""
-
-#: admin/systems/system-list.xml:47
-msgid "New terminal"
-msgstr ""
-
-#: admin/systems/system-list.xml:55
-msgid "New device"
-msgstr ""
-
-#: admin/systems/system-list.xml:63
-msgid "Workstation template"
-msgstr ""
-
-#: admin/systems/system-list.xml:71
-msgid "Terminal template"
-msgstr ""
-
-#: admin/systems/system-list.xml:79
-msgid "Winstation"
+msgid "Remote desktop"
 msgstr ""
 
-#: admin/systems/system-list.xml:87 admin/systems/system-list.xml:234
-#: admin/systems/class_systemImport.inc:169
-#: admin/systems/class_serverGeneric.inc:46
-#: admin/systems/class_serverGeneric.inc:51
-#: admin/systems/class_serverGeneric.inc:52
-#: admin/systems/class_SelectDeviceType.inc:58
-msgid "Server"
+#: admin/systems/class_terminalStartup.inc:87
+msgid "Connect method"
 msgstr ""
 
-#: admin/systems/system-list.xml:95 admin/systems/system-list.xml:242
-#: admin/systems/class_workstationGeneric.inc:458
-#: admin/systems/class_workstationGeneric.inc:463
-#: admin/systems/class_workstationGeneric.inc:464
-#: admin/systems/class_SelectDeviceType.inc:58
-msgid "Workstation"
+#: admin/systems/class_terminalStartup.inc:91
+msgid "XDMCP"
 msgstr ""
 
-#: admin/systems/system-list.xml:103 admin/systems/system-list.xml:250
-#: admin/systems/class_terminalGeneric.inc:81
-#: admin/systems/class_terminalGeneric.inc:86
-#: admin/systems/class_terminalGeneric.inc:87
-#: admin/systems/class_SelectDeviceType.inc:58
-msgid "Terminal"
+#: admin/systems/class_terminalStartup.inc:91
+msgid "LDM"
 msgstr ""
 
-#: admin/systems/system-list.xml:111 admin/systems/class_printGeneric.inc:1005
-#: admin/systems/class_printGeneric.inc:1011
-#: admin/systems/class_printGeneric.inc:1012
-msgid "Printer"
+#: admin/systems/class_terminalStartup.inc:91
+msgid "Shell"
 msgstr ""
 
-#: admin/systems/system-list.xml:119 admin/systems/system-list.xml:274
-#: admin/systems/class_mobilePhoneGeneric.inc:74
-#: admin/systems/phoneSelect/phoneSelect-list.xml:14
-msgid "Phone"
+#: admin/systems/class_terminalStartup.inc:91
+msgid "Telnet"
 msgstr ""
 
-#: admin/systems/system-list.xml:127
-#: admin/systems/class_mobilePhoneGeneric.inc:36
-#: admin/systems/class_mobilePhoneGeneric.inc:41
-#: admin/systems/class_mobilePhoneGeneric.inc:42
-#: admin/systems/phoneSelect/phoneSelect-list.xml:22
-msgid "Mobile phone"
+#: admin/systems/class_terminalStartup.inc:91
+msgid "Windows RDP"
 msgstr ""
 
-#: admin/systems/system-list.xml:135
-#: admin/systems/class_componentGeneric.inc:36
-msgid "Component"
+#: admin/systems/class_terminalStartup.inc:95
+msgid "Terminal server"
 msgstr ""
 
-#: admin/systems/system-list.xml:143 admin/systems/system-list.xml:298
-msgid "IPMI"
+#: admin/systems/system-list.xml:10
+msgid "List of systems"
 msgstr ""
 
-#: admin/systems/system-list.xml:169
-#: admin/systems/class_workstationGeneric.inc:154
-#: admin/systems/class_printGeneric.inc:752
-#: admin/systems/class_printGeneric.inc:762
-#: admin/systems/class_printGeneric.inc:781
-#: admin/systems/class_printGeneric.inc:1022
-#: admin/systems/class_componentGeneric.inc:64
-#: admin/systems/class_mobilePhoneGeneric.inc:63
-#: admin/systems/phoneSelect/phoneSelect-list.xml:48
+#: admin/systems/system-list.xml:31
+#: admin/systems/class_workstationGeneric.inc:46
+#: admin/systems/class_printGeneric.inc:60
+#: admin/systems/class_componentGeneric.inc:58
+#: admin/systems/class_mobilePhoneGeneric.inc:60
 #: admin/systems/services/shares/class_serviceShare.inc:52
-#: admin/systems/system-filter.tpl.c:32
-#: admin/systems/phoneSelect/phoneSelect-filter.tpl.c:11
 msgid "Name"
 msgstr ""
 
-#: admin/systems/system-list.xml:177
-#: admin/systems/phoneSelect/phoneSelect-list.xml:63
+#: admin/systems/system-list.xml:39
 msgid "IP"
 msgstr ""
 
-#: admin/systems/system-list.xml:185
+#: admin/systems/system-list.xml:47
 msgid "MAC"
 msgstr ""
 
-#: admin/systems/system-list.xml:193
-#: admin/systems/class_workstationGeneric.inc:160
-#: admin/systems/class_printGeneric.inc:1024
-#: admin/systems/class_componentGeneric.inc:68
-#: admin/systems/class_mobilePhoneGeneric.inc:67
+#: admin/systems/system-list.xml:55
+#: admin/systems/class_workstationGeneric.inc:51
+#: admin/systems/class_printGeneric.inc:64
+#: admin/systems/class_componentGeneric.inc:62
+#: admin/systems/class_mobilePhoneGeneric.inc:64
 #: admin/systems/serverService-list.xml:35
 #: admin/systems/services/shares/class_serviceShare.inc:56
-#: admin/systems/printer.tpl.c:8 admin/systems/printer.tpl.c:17
 msgid "Description"
 msgstr ""
 
-#: admin/systems/system-list.xml:201 admin/systems/class_serverService.inc:57
+#: admin/systems/system-list.xml:63 admin/systems/class_serverService.inc:57
 #: admin/systems/services/terminal/class_serviceTerminal.inc:30
 #: admin/systems/services/cups/class_serviceCUPS.inc:85
 #: admin/systems/services/shares/class_serviceShare.inc:31
@@ -316,378 +235,186 @@ msgstr ""
 msgid "Services"
 msgstr ""
 
-#: admin/systems/system-list.xml:209
+#: admin/systems/system-list.xml:71
 msgid "Release"
 msgstr ""
 
-#: admin/systems/system-list.xml:217 admin/systems/serverService-list.xml:43
-#: admin/systems/phoneSelect/phoneSelect-list.xml:70
+#: admin/systems/system-list.xml:79 admin/systems/serverService-list.xml:43
 msgid "Actions"
 msgstr ""
 
-#: admin/systems/system-list.xml:228 admin/systems/serverService-list.xml:54
+#: admin/systems/system-list.xml:90 admin/systems/serverService-list.xml:54
 msgid "Create"
 msgstr ""
 
-#: admin/systems/system-list.xml:258
-msgid "winStation"
-msgstr ""
-
-#: admin/systems/system-list.xml:266
-msgid "Network printer"
-msgstr ""
-
-#: admin/systems/system-list.xml:282
-#: admin/systems/class_componentGeneric.inc:41
-#: admin/systems/class_componentGeneric.inc:42
-msgid "Network device"
-msgstr ""
-
-#: admin/systems/system-list.xml:290
-msgid "Mobile Phone"
-msgstr ""
-
-#: admin/systems/system-list.xml:310
+#: admin/systems/system-list.xml:100
 msgid "Trigger action"
 msgstr ""
 
-#: admin/systems/system-list.xml:317
+#: admin/systems/system-list.xml:107
 msgid "Schedule action"
 msgstr ""
 
-#: admin/systems/system-list.xml:330
-msgid "Activate systems"
-msgstr ""
-
-#: admin/systems/system-list.xml:337 admin/systems/serverService-list.xml:69
-#: admin/systems/printer.tpl.c:35
+#: admin/systems/system-list.xml:119 admin/systems/serverService-list.xml:69
 msgid "Remove"
 msgstr ""
 
-#: admin/systems/system-list.xml:367
-msgid "Create ISO"
-msgstr ""
-
-#: admin/systems/system-list.xml:379
+#: admin/systems/system-list.xml:150
 msgid "Edit system"
 msgstr ""
 
-#: admin/systems/system-list.xml:392
+#: admin/systems/system-list.xml:163
 msgid "Remove system"
 msgstr ""
 
-#: admin/systems/class_workstationGeneric.inc:75
-#, php-format
-msgid "Event %s is not available!"
-msgstr ""
-
-#: admin/systems/class_workstationGeneric.inc:78
-msgid "Events are not available!"
-msgstr ""
-
-#: admin/systems/class_workstationGeneric.inc:106
-msgid "(Re)Install"
-msgstr ""
-
-#: admin/systems/class_workstationGeneric.inc:107
-msgid "Software update"
-msgstr ""
-
-#: admin/systems/class_workstationGeneric.inc:115
-msgid "Wake up"
-msgstr ""
-
-#: admin/systems/class_workstationGeneric.inc:144
-#: admin/systems/class_printGeneric.inc:604
+#: admin/systems/class_workstationGeneric.inc:35
 msgid "workstation"
 msgstr ""
 
-#: admin/systems/class_workstationGeneric.inc:151
-#: admin/systems/class_componentGeneric.inc:61
-#: admin/systems/class_mobilePhoneGeneric.inc:60
+#: admin/systems/class_workstationGeneric.inc:42
+#: admin/systems/class_printGeneric.inc:56
+#: admin/systems/class_componentGeneric.inc:55
+#: admin/systems/class_mobilePhoneGeneric.inc:56
 msgid "Properties"
 msgstr ""
 
-#: admin/systems/class_workstationGeneric.inc:155
+#: admin/systems/class_workstationGeneric.inc:47
 #, php-format
 msgid "The name of the %s"
 msgstr ""
 
-#: admin/systems/class_workstationGeneric.inc:161
+#: admin/systems/class_workstationGeneric.inc:52
 #, php-format
 msgid "A short description of the %s"
 msgstr ""
 
-#: admin/systems/class_workstationGeneric.inc:166
-#: admin/systems/class_printGeneric.inc:1025
+#: admin/systems/class_workstationGeneric.inc:56
 msgid "Location"
 msgstr ""
 
-#: admin/systems/class_workstationGeneric.inc:167
+#: admin/systems/class_workstationGeneric.inc:57
 #, php-format
 msgid "The location of the %s"
 msgstr ""
 
-#: admin/systems/class_workstationGeneric.inc:173
+#: admin/systems/class_workstationGeneric.inc:61
 #, php-format
 msgid "Lock this %s"
 msgstr ""
 
-#: admin/systems/class_workstationGeneric.inc:174
+#: admin/systems/class_workstationGeneric.inc:62
 #, php-format
 msgid "This will prevent the %s from being reinstalled"
 msgstr ""
 
-#: admin/systems/class_workstationGeneric.inc:185
-#: addons/dashboard/class_dashBoardSystems.inc:48
-msgid "Servers"
-msgstr ""
-
-#: admin/systems/class_workstationGeneric.inc:190
-#, php-format
-msgid "The syslog server the %s should be using"
-msgstr ""
-
-#: admin/systems/class_workstationGeneric.inc:195
-msgid "Inherit NTP servers"
-msgstr ""
-
-#: admin/systems/class_workstationGeneric.inc:196
-msgid "Inherit time server attributes from ogroup"
-msgstr ""
-
-#: admin/systems/class_workstationGeneric.inc:202
-msgid "NTP servers"
-msgstr ""
-
-#: admin/systems/class_workstationGeneric.inc:203
-#, php-format
-msgid "The NTP servers for the %s"
+#: admin/systems/class_workstationGeneric.inc:73
+#: admin/systems/class_printGeneric.inc:83
+#: admin/systems/class_componentGeneric.inc:69
+#: admin/systems/class_mobilePhoneGeneric.inc:102
+#: admin/systems/class_networkSettings.inc:1008
+msgid "Network settings"
 msgstr ""
 
-#: admin/systems/class_workstationGeneric.inc:209
-msgid "Inherit LDAP servers"
+#: admin/systems/class_workstationGeneric.inc:78
+#: admin/systems/class_printGeneric.inc:87
+#: admin/systems/class_componentGeneric.inc:73
+#: admin/systems/class_mobilePhoneGeneric.inc:106
+#: admin/systems/class_networkSettings.inc:630
+#: admin/systems/class_networkSettings.inc:643
+#: admin/systems/class_networkSettings.inc:645
+#: admin/systems/class_networkSettings.inc:1014
+msgid "IP address"
 msgstr ""
 
-#: admin/systems/class_workstationGeneric.inc:210
-msgid "Inherit LDAP server attributes from ogroup"
+#: admin/systems/class_workstationGeneric.inc:78
+msgid "IP addresses this system uses (v4 or v6)"
 msgstr ""
 
-#: admin/systems/class_workstationGeneric.inc:216
-msgid "LDAP servers"
+#: admin/systems/class_workstationGeneric.inc:83
+#: admin/systems/class_printGeneric.inc:91
+#: admin/systems/class_componentGeneric.inc:77
+#: admin/systems/class_mobilePhoneGeneric.inc:110
+msgid "Mac address"
 msgstr ""
 
-#: admin/systems/class_workstationGeneric.inc:217
-#, php-format
-msgid "The LDAP servers for the %s"
+#: admin/systems/class_workstationGeneric.inc:83
+#: admin/systems/class_printGeneric.inc:91
+#: admin/systems/class_componentGeneric.inc:77
+#: admin/systems/class_mobilePhoneGeneric.inc:110
+msgid "Mac address of this system"
 msgstr ""
 
-#: admin/systems/class_workstationGeneric.inc:225
-#: admin/systems/class_workstationGeneric.inc:229
-#: admin/ogroups/goto/termgroup.tpl.c:41
-msgid "Action"
+#: admin/systems/class_workstationGeneric.inc:125
+#: admin/systems/class_workstationGeneric.inc:130
+#: admin/systems/class_workstationGeneric.inc:131
+msgid "Workstation"
 msgstr ""
 
-#: admin/systems/class_workstationGeneric.inc:230
-#: admin/ogroups/goto/termgroup.tpl.c:44
-msgid "Select action to execute for this terminal"
+#: admin/systems/class_workstationGeneric.inc:126
+msgid "Workstation information"
 msgstr ""
 
-#: admin/systems/class_workstationGeneric.inc:236
-#: admin/systems/class_componentGeneric.inc:75
-#: admin/systems/class_mobilePhoneGeneric.inc:106
-#: admin/systems/class_networkSettings.inc:1016
-msgid "Network settings"
+#: admin/systems/class_printGeneric.inc:32
+#: admin/systems/class_printGeneric.inc:37
+#: admin/systems/class_printGeneric.inc:38
+msgid "Printer"
 msgstr ""
 
-#: admin/systems/class_workstationGeneric.inc:459
-msgid "Workstation information"
+#: admin/systems/class_printGeneric.inc:33
+msgid "Printer information"
 msgstr ""
 
-#: admin/systems/class_printGeneric.inc:131
-#: admin/systems/class_printGeneric.inc:1065
-#: admin/systems/class_systemManagement.inc:678
-msgid "Internal error"
+#: admin/systems/class_printGeneric.inc:60
+msgid "The name of the printer"
 msgstr ""
 
-#: admin/systems/class_printGeneric.inc:131
-#, php-format
-msgid ""
-"Cannot determine a valid department for this object. Setting base to '%s'!"
+#: admin/systems/class_printGeneric.inc:64
+msgid "A short description of the printer"
 msgstr ""
 
-#: admin/systems/class_printGeneric.inc:311
-#: admin/systems/class_printGeneric.inc:319
-#: admin/systems/class_printGeneric.inc:324
-#: admin/systems/class_printGeneric.inc:374
-#: admin/systems/class_printGeneric.inc:390
-#: admin/systems/class_printGeneric.inc:393
-msgid "Add printer extension"
+#: admin/systems/class_printGeneric.inc:70
+msgid "Details"
 msgstr ""
 
-#: admin/systems/class_printGeneric.inc:312
-msgid ""
-"Could not initialize printer tab, parameter parent was missing while "
-"construction."
+#: admin/systems/class_printGeneric.inc:73
+msgid "Printer location"
 msgstr ""
 
-#: admin/systems/class_printGeneric.inc:320
-msgid "This is a workstation template, printer tab is disabled."
+#: admin/systems/class_printGeneric.inc:73
+msgid "The location of the printer"
 msgstr ""
 
-#: admin/systems/class_printGeneric.inc:325
-msgid "This is a terminal template, printer tab is disabled."
+#: admin/systems/class_printGeneric.inc:77
+msgid "Printer URL"
 msgstr ""
 
-#: admin/systems/class_printGeneric.inc:367
-#: admin/systems/class_printGeneric.inc:375
-#: admin/systems/class_printGeneric.inc:383
-#: admin/systems/class_printGeneric.inc:386
-#: admin/systems/class_printGeneric.inc:391
-#: admin/systems/class_printGeneric.inc:394
-msgid "printer"
+#: admin/systems/class_printGeneric.inc:77
+msgid "The URL of the printer"
 msgstr ""
 
-#: admin/systems/class_printGeneric.inc:375
-msgid ""
-"You can't enable it while 'cn' is not present in entry. Possibly you are "
-"currently creating a new terminal template."
+#: admin/systems/class_printGeneric.inc:87
+#: admin/systems/class_componentGeneric.inc:73
+#: admin/systems/class_mobilePhoneGeneric.inc:106
+msgid "IP address this system uses"
 msgstr ""
 
-#: admin/systems/class_printGeneric.inc:382
-#: admin/systems/class_printGeneric.inc:385
-msgid "Remove printer extension"
+#: admin/systems/class_serverService.inc:58
+msgid "Server services"
 msgstr ""
 
-#: admin/systems/class_printGeneric.inc:474
-#: admin/systems/class_printGeneric.inc:652
-#: admin/systems/class_printGeneric.inc:659
-#: admin/systems/class_printGeneric.inc:718
-#: admin/systems/class_printGeneric.inc:1105
-#: admin/systems/class_printGeneric.inc:1116
 #: admin/systems/class_serverService.inc:224
 #: admin/systems/class_serverService.inc:270
 #: admin/systems/class_serverService.inc:393
-#: admin/systems/class_systemManagement.inc:341
-#: admin/systems/class_systemManagement.inc:624
-#: admin/systems/class_systemManagement.inc:639
 #: admin/systems/services/shares/class_serviceShare.inc:103
-#: admin/systems/class_networkSettings.inc:305
-#: admin/systems/class_networkSettings.inc:336
-#: admin/systems/class_networkSettings.inc:584
-#: admin/systems/class_networkSettings.inc:591
-#: admin/systems/class_networkSettings.inc:597
-#: admin/systems/class_networkSettings.inc:604
+#: admin/systems/class_networkSettings.inc:297
+#: admin/systems/class_networkSettings.inc:328
+#: admin/systems/class_networkSettings.inc:576
+#: admin/systems/class_networkSettings.inc:583
+#: admin/systems/class_networkSettings.inc:589
+#: admin/systems/class_networkSettings.inc:596
 msgid "Error"
 msgstr ""
 
-#: admin/systems/class_printGeneric.inc:577
-#, php-format
-msgid "Your currently selected PPD file '%s' doesn't exist."
-msgstr ""
-
-#: admin/systems/class_printGeneric.inc:583
-msgid "Not defined"
-msgstr ""
-
-#: admin/systems/class_printGeneric.inc:587
-#: admin/systems/ppd/class_printerPPDDialog.inc:116
-msgid "Can't get ppd informations."
-msgstr ""
-
-#: admin/systems/class_printGeneric.inc:602
-#: admin/systems/class_printGeneric.inc:604
-#, php-format
-msgid "This printer belongs to %s. You can't rename this printer."
-msgstr ""
-
-#: admin/systems/class_printGeneric.inc:602
-#: admin/systems/class_terminalGeneric.inc:34
-msgid "terminal"
-msgstr ""
-
-#: admin/systems/class_printGeneric.inc:652
-#: admin/systems/class_printGeneric.inc:659
-msgid "Object is no printer!"
-msgstr ""
-
-#: admin/systems/class_printGeneric.inc:767 admin/systems/printer.tpl.c:23
-msgid "Printer URL"
-msgstr ""
-
-#: admin/systems/class_printGeneric.inc:989
-#: admin/systems/class_printGeneric.inc:991
-msgid "Group"
-msgstr ""
-
-#: admin/systems/class_printGeneric.inc:994
-msgid "User"
-msgstr ""
-
-#: admin/systems/class_printGeneric.inc:1006
-msgid "Printer information"
-msgstr ""
-
-#: admin/systems/class_printGeneric.inc:1023
-#: admin/systems/serverService-list.tpl.c:2
-#: admin/systems/phoneSelect/phoneSelect-list.tpl.c:2
-#: admin/systems/printer.tpl.c:11
-msgid "Base"
-msgstr ""
-
-#: admin/systems/class_printGeneric.inc:1026
-msgid "LabeledURL"
-msgstr ""
-
-#: admin/systems/class_printGeneric.inc:1027
-msgid "Printer PPD"
-msgstr ""
-
-#: admin/systems/class_printGeneric.inc:1028 admin/systems/printer.tpl.c:38
-msgid "Permissions"
-msgstr ""
-
-#: admin/systems/class_printGeneric.inc:1030
-msgid "Windows inf file"
-msgstr ""
-
-#: admin/systems/class_printGeneric.inc:1031
-msgid "Windows driver dir"
-msgstr ""
-
-#: admin/systems/class_printGeneric.inc:1032 admin/systems/printer.tpl.c:62
-msgid "Driver printer name"
-msgstr ""
-
-#: admin/systems/class_printGeneric.inc:1048
-#: admin/systems/class_printGeneric.inc:1070
-msgid "Permission error"
-msgstr ""
-
-#: admin/systems/class_printGeneric.inc:1048
-#: admin/systems/class_printGeneric.inc:1070
-msgid "printer user"
-msgstr ""
-
-#: admin/systems/class_printGeneric.inc:1065
-#, php-format
-msgid "Illegal member type '%s'!"
-msgstr ""
-
-#: admin/systems/class_printGeneric.inc:1105
-#, php-format
-msgid "'%s' is already used!"
-msgstr ""
-
-#: admin/systems/class_printGeneric.inc:1116
-#, php-format
-msgid "'%s' does not exist!"
-msgstr ""
-
-#: admin/systems/class_serverService.inc:58
-msgid "Server services"
-msgstr ""
-
 #: admin/systems/class_serverService.inc:332
 msgid "Filter error"
 msgstr ""
@@ -711,313 +438,163 @@ msgstr ""
 msgid "Could not get execute action %s on service %s."
 msgstr ""
 
-#: admin/systems/class_terminalGeneric.inc:42
-#, php-format
-msgid "The root server the terminal should be using"
+#: admin/systems/class_terminalGeneric.inc:31
+msgid "terminal"
 msgstr ""
 
+#: admin/systems/class_terminalGeneric.inc:43
 #: admin/systems/class_terminalGeneric.inc:48
-#, php-format
-msgid "The swap server the terminal should be using"
-msgstr ""
-
-#: admin/systems/class_terminalGeneric.inc:54
-msgid "Remote desktop"
-msgstr ""
-
-#: admin/systems/class_terminalGeneric.inc:58
-msgid "Connect method"
-msgstr ""
-
-#: admin/systems/class_terminalGeneric.inc:62
-msgid "XDMCP"
-msgstr ""
-
-#: admin/systems/class_terminalGeneric.inc:62
-msgid "LDM"
-msgstr ""
-
-#: admin/systems/class_terminalGeneric.inc:62
-msgid "Shell"
-msgstr ""
-
-#: admin/systems/class_terminalGeneric.inc:62
-msgid "Telnet"
-msgstr ""
-
-#: admin/systems/class_terminalGeneric.inc:62
-msgid "Windows RDP"
-msgstr ""
-
-#: admin/systems/class_terminalGeneric.inc:66
-msgid "Terminal server"
+#: admin/systems/class_terminalGeneric.inc:49
+msgid "Terminal"
 msgstr ""
 
-#: admin/systems/class_terminalGeneric.inc:82
+#: admin/systems/class_terminalGeneric.inc:44
 msgid "Terminal information"
 msgstr ""
 
-#: admin/systems/ppd/class_printerPPDSelectionDialog.inc:91
-#: admin/systems/ppd/class_printerPPDSelectionDialog.inc:116
-#: admin/systems/ppd/class_printerPPDSelectionDialog.inc:139
-#: admin/systems/ppd/class_printerPPDDialog.inc:92
-#: admin/systems/ppd/class_printerPPDDialog.inc:160
-#: admin/systems/ppd/class_printerPPDDialog.inc:241
-#: admin/systems/ppd/class_printerPPDDialog.inc:256
-#: admin/systems/ppd/class_printerPPDDialog.inc:269
-#: admin/systems/ppd/class_printerPPDDialog.inc:297
-#: admin/systems/ppd/class_printerPPDDialog.inc:314
-#: admin/systems/ppd/class_printerPPDDialog.inc:337
-#: admin/systems/ppd/class_printerPPDDialog.inc:351
-#: admin/systems/ppd/class_printerPPDDialog.inc:361
-#: admin/systems/ppd/class_printerPPDDialog.inc:365
-#: admin/systems/ppd/class_printerPPDDialog.inc:560
-#: admin/systems/ppd/class_printerPPDDialog.inc:577
-#: admin/systems/ppd/class_printerPPDDialog.inc:580
-#: admin/systems/ppd/class_printerPPDDialog.inc:583
-msgid "PPD error"
-msgstr ""
-
-#: admin/systems/ppd/class_printerPPDSelectionDialog.inc:139
-#, php-format
-msgid "Cannot locate vendor '%s' in available PPDs!"
-msgstr ""
-
-#: admin/systems/ppd/class_printerPPDSelectionDialog.inc:148
-msgid "Printer ppd selection."
-msgstr ""
-
-#: admin/systems/ppd/class_printerPPDSelectionDialog.inc:155
-msgid "delete"
-msgstr ""
-
-#: admin/systems/ppd/class_printerPPDSelectionDialog.inc:166
-msgid "back"
-msgstr ""
-
-#: admin/systems/ppd/class_printerPPDDialog.inc:74
-#: admin/systems/ppd/class_printerPPDDialog.inc:140
-#: admin/systems/services/class_goService.inc:241
-msgid "Configuration error"
-msgstr ""
-
-#: admin/systems/ppd/class_printerPPDDialog.inc:92
-#, php-format
-msgid "Cannot open PPD '%s'!"
-msgstr ""
-
-#: admin/systems/ppd/class_printerPPDDialog.inc:141
-#, php-format
-msgid "Cannot open PPD path '%s' for reading and writing!"
-msgstr ""
-
-#: admin/systems/ppd/class_printerPPDDialog.inc:160
-#: admin/systems/ppd/class_printerPPDDialog.inc:365
-msgid "file is empty"
-msgstr ""
-
-#: admin/systems/ppd/class_printerPPDDialog.inc:314
-#, php-format
-msgid "Cannot parse PPD '%s'!"
-msgstr ""
-
-#: admin/systems/ppd/class_printerPPDDialog.inc:340
-msgid "Overwrite existing PPD"
-msgstr ""
-
-#: admin/systems/ppd/class_printerPPDDialog.inc:341
-msgid ""
-"There is already a ppd file for this kind of printer. Do you want to "
-"overwrite it?"
-msgstr ""
-
-#: admin/systems/ppd/class_printerPPDDialog.inc:491
-msgid "Section"
-msgstr ""
-
-#: admin/systems/ppd/class_printerPPDDialog.inc:551
-#: admin/systems/ppd/class_printerPPDDialog.inc:554
-msgid "True"
-msgstr ""
-
-#: admin/systems/ppd/class_printerPPDDialog.inc:552
-#: admin/systems/ppd/class_printerPPDDialog.inc:555
-msgid "False"
-msgstr ""
-
-#: admin/systems/ppd/class_printerPPDDialog.inc:560
-#, php-format
-msgid "PPD type '%s' is not supported!"
-msgstr ""
-
-#: admin/systems/ppd/class_printerPPDDialog.inc:597
-msgid ""
-"Please select a valid ppd file or use 'Cancel' to go back to printer "
-"configuration."
-msgstr ""
-
-#: admin/systems/ppd/class_ppdManager.inc:44
-#: admin/systems/ppd/class_ppdManager.inc:188
-#: admin/systems/ppd/class_ppdManager.inc:190
-msgid "PPD manager error"
-msgstr ""
-
-#: admin/systems/ppd/class_ppdManager.inc:44
-#, php-format
-msgid "The specified path '%s' does not exist."
-msgstr ""
-
-#: admin/systems/ppd/class_ppdManager.inc:188
+#: admin/systems/class_systemImport.inc:72
 #, php-format
-msgid "Specified PPD file '%s' cannot be opened for reading."
+msgid "Could not parse %s"
 msgstr ""
 
-#: admin/systems/ppd/class_ppdManager.inc:190
+#: admin/systems/class_systemImport.inc:116
 #, php-format
-msgid "The temporary file '%s' cannot be opened for writing."
-msgstr ""
-
-#: admin/systems/ppd/class_ppdManager.inc:212
-#: admin/systems/ppd/class_ppdManager.inc:350
-msgid "Parsing PPD file failed - file is empty!"
+msgid "No DHCP server found for ip %s"
 msgstr ""
 
-#: admin/systems/ppd/class_ppdManager.inc:222
+#: admin/systems/class_systemImport.inc:130
 #, php-format
-msgid ""
-"Parsing PPD file %s failed - line too long. Trailing characters have been "
-"ignored!"
-msgstr ""
-
-#: admin/systems/ppd/class_ppdManager.inc:230
-msgid "Nested groups are not supported!"
+msgid "No DNS server found for zone %s"
 msgstr ""
 
-#: admin/systems/ppd/class_ppdManager.inc:234
-msgid "Group name not unique!"
+#: admin/systems/class_systemImport.inc:165
+msgid "Import"
 msgstr ""
 
-#: admin/systems/ppd/class_ppdManager.inc:240
-#: admin/systems/ppd/class_ppdManager.inc:270
-msgid "Symbol values are not supported yet!"
+#: admin/systems/class_systemImport.inc:169
+#: admin/systems/class_serverGeneric.inc:43
+#: admin/systems/class_serverGeneric.inc:48
+#: admin/systems/class_serverGeneric.inc:49
+msgid "Server"
 msgstr ""
 
-#: admin/systems/ppd/class_ppdManager.inc:264
-msgid "Nested options are not supported!"
+#: admin/systems/class_systemImport.inc:169
+msgid "The server you wish to import hosts from"
 msgstr ""
 
-#: admin/systems/ppd/class_ppdManager.inc:289
-msgid "PickMany is not supported yet!"
+#: admin/systems/class_serverGeneric.inc:31
+msgid "server"
 msgstr ""
 
-#: admin/systems/ppd/class_ppdManager.inc:370
-#, php-format
-msgid ""
-"Parsing PPD file %s failed - line too long. Trailing characters have been "
-"ignored"
+#: admin/systems/class_serverGeneric.inc:44
+msgid "Server information"
 msgstr ""
 
-#: admin/systems/ppd/class_ppdManager.inc:395
-#, php-format
-msgid "Parsing PPD file %s failed - no information found."
+#: admin/systems/class_componentGeneric.inc:31
+msgid "Component"
 msgstr ""
 
-#: admin/systems/class_systemImport.inc:72
-#, php-format
-msgid "Could not parse %s"
+#: admin/systems/class_componentGeneric.inc:32
+msgid "Component information"
 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/class_componentGeneric.inc:37
+msgid "Network device"
 msgstr ""
 
-#: admin/systems/class_systemImport.inc:130
-#, php-format
-msgid "No DNS server found for zone %s"
+#: admin/systems/class_componentGeneric.inc:58
+msgid "The name of the component"
 msgstr ""
 
-#: admin/systems/class_systemImport.inc:165
-msgid "Import"
+#: admin/systems/class_componentGeneric.inc:62
+msgid "A short description of the component"
 msgstr ""
 
-#: admin/systems/class_systemImport.inc:169
-msgid "The server you wish to import hosts from"
+#: admin/systems/class_systemServers.inc:31
+#: admin/systems/class_systemServers.inc:53
+msgid "Servers"
 msgstr ""
 
-#: admin/systems/class_serverGeneric.inc:34
-msgid "server"
+#: admin/systems/class_systemServers.inc:35
+msgid "The syslog server the system should be using"
 msgstr ""
 
-#: admin/systems/class_serverGeneric.inc:47
-msgid "Server information"
+#: admin/systems/class_systemServers.inc:40
+msgid "NTP servers"
 msgstr ""
 
-#: admin/systems/class_componentGeneric.inc:37
-msgid "Component information"
+#: admin/systems/class_systemServers.inc:40
+msgid "The NTP servers for this system"
 msgstr ""
 
-#: admin/systems/class_componentGeneric.inc:64
-msgid "The name of the component"
+#: admin/systems/class_systemServers.inc:54
+msgid "Servers this system is using"
 msgstr ""
 
-#: admin/systems/class_componentGeneric.inc:68
-msgid "A short description of the component"
+#: admin/systems/class_mobilePhoneGeneric.inc:32
+#: admin/systems/class_mobilePhoneGeneric.inc:37
+#: admin/systems/class_mobilePhoneGeneric.inc:38
+msgid "Mobile phone"
 msgstr ""
 
-#: admin/systems/class_mobilePhoneGeneric.inc:37
+#: admin/systems/class_mobilePhoneGeneric.inc:33
 msgid "Mobile phone information"
 msgstr ""
 
-#: admin/systems/class_mobilePhoneGeneric.inc:63
+#: admin/systems/class_mobilePhoneGeneric.inc:60
 msgid "The name of the mobile phone"
 msgstr ""
 
-#: admin/systems/class_mobilePhoneGeneric.inc:67
+#: admin/systems/class_mobilePhoneGeneric.inc:64
 msgid "A short description of the mobile phone"
 msgstr ""
 
-#: admin/systems/class_mobilePhoneGeneric.inc:77
+#: admin/systems/class_mobilePhoneGeneric.inc:70
+msgid "Phone"
+msgstr ""
+
+#: admin/systems/class_mobilePhoneGeneric.inc:73
 msgid "Serial Number"
 msgstr ""
 
-#: admin/systems/class_mobilePhoneGeneric.inc:77
+#: admin/systems/class_mobilePhoneGeneric.inc:73
 msgid "The serial number of the mobile phone"
 msgstr ""
 
-#: admin/systems/class_mobilePhoneGeneric.inc:81
+#: admin/systems/class_mobilePhoneGeneric.inc:77
 msgid "IMEI Number"
 msgstr ""
 
-#: admin/systems/class_mobilePhoneGeneric.inc:81
+#: admin/systems/class_mobilePhoneGeneric.inc:77
 msgid "The IMEI number of the mobile phone"
 msgstr ""
 
-#: admin/systems/class_mobilePhoneGeneric.inc:86
+#: admin/systems/class_mobilePhoneGeneric.inc:82
 msgid "OS"
 msgstr ""
 
-#: admin/systems/class_mobilePhoneGeneric.inc:86
+#: admin/systems/class_mobilePhoneGeneric.inc:82
 msgid "The Operating System installed on this phone"
 msgstr ""
 
-#: admin/systems/class_mobilePhoneGeneric.inc:92
+#: admin/systems/class_mobilePhoneGeneric.inc:88
 msgid "SimCard"
 msgstr ""
 
-#: admin/systems/class_mobilePhoneGeneric.inc:95
+#: admin/systems/class_mobilePhoneGeneric.inc:91
 msgid "Telephone Number"
 msgstr ""
 
-#: admin/systems/class_mobilePhoneGeneric.inc:95
+#: admin/systems/class_mobilePhoneGeneric.inc:91
 msgid "The telephone number of the mobile phone"
 msgstr ""
 
-#: admin/systems/class_mobilePhoneGeneric.inc:99
+#: admin/systems/class_mobilePhoneGeneric.inc:95
 msgid "PUK Number"
 msgstr ""
 
-#: admin/systems/class_mobilePhoneGeneric.inc:99
+#: admin/systems/class_mobilePhoneGeneric.inc:95
 msgid "The PUK number of the simcard in this mobile phone"
 msgstr ""
 
@@ -1029,101 +606,51 @@ msgstr ""
 msgid "Service"
 msgstr ""
 
-#: admin/systems/serverService-list.xml:27
-msgid "!"
-msgstr ""
-
-#: admin/systems/serverService-list.xml:89
-msgid "Get status"
-msgstr ""
-
-#: admin/systems/serverService-list.xml:97
-#: admin/systems/services/cups/class_serviceCUPS.inc:92
-msgid "Start"
-msgstr ""
-
-#: admin/systems/serverService-list.xml:105
-#: admin/systems/services/cups/class_serviceCUPS.inc:93
-msgid "Stop"
-msgstr ""
-
-#: admin/systems/serverService-list.xml:113
-#: admin/systems/services/cups/class_serviceCUPS.inc:94
-msgid "Restart"
-msgstr ""
-
-#: admin/systems/serverService-list.xml:121
-msgid "Edit service"
-msgstr ""
-
-#: admin/systems/serverService-list.xml:129
-msgid "Remove service"
-msgstr ""
-
-#: admin/systems/phoneSelect/phoneSelect-list.xml:10
-msgid "Please select the desired entries"
-msgstr ""
-
-#: admin/systems/phoneSelect/phoneSelect-list.xml:56
-msgid "Number"
-msgstr ""
-
-#: admin/systems/phoneSelect/phoneSelect-list.xml:83
-msgid "Select this number"
-msgstr ""
-
-#: admin/systems/class_systemManagement.inc:177
-msgid "Back"
-msgstr ""
-
-#: admin/systems/class_systemManagement.inc:223
-msgid "Creating the image failed. Please see the report below."
+#: admin/systems/serverService-list.xml:27
+msgid "!"
 msgstr ""
 
-#: admin/systems/class_systemManagement.inc:228
-#, php-format
-msgid "Command '%s', specified for ISO creation doesn't seem to exist."
+#: admin/systems/serverService-list.xml:89
+msgid "Get status"
 msgstr ""
 
-#: admin/systems/class_systemManagement.inc:398
-#: admin/systems/class_systemManagement.inc:473
-#: admin/systems/class_systemManagement.inc:858
-#: admin/systems/class_systemManagement.inc:905
-#: admin/systems/class_systemManagement.inc:926
-msgid "Permission"
+#: admin/systems/serverService-list.xml:97
+#: admin/systems/services/cups/class_serviceCUPS.inc:92
+msgid "Start"
 msgstr ""
 
-#: admin/systems/class_systemManagement.inc:678
-msgid "Cannot set mode to 'active'!"
+#: admin/systems/serverService-list.xml:105
+#: admin/systems/services/cups/class_serviceCUPS.inc:93
+msgid "Stop"
 msgstr ""
 
-#: admin/systems/class_systemManagement.inc:858
-#, php-format
-msgid "You are not allowed to create a snapshot for %s."
+#: admin/systems/serverService-list.xml:113
+#: admin/systems/services/cups/class_serviceCUPS.inc:94
+msgid "Restart"
 msgstr ""
 
-#: admin/systems/class_systemManagement.inc:905
-#: admin/systems/class_systemManagement.inc:926
-#, php-format
-msgid "You are not allowed to restore a snapshot for %s."
+#: admin/systems/serverService-list.xml:121
+msgid "Edit service"
 msgstr ""
 
-#: admin/systems/class_systemManagement.inc:1169
-#, php-format
-msgid "Inherited from %s"
+#: admin/systems/serverService-list.xml:129
+msgid "Remove service"
 msgstr ""
 
-#: admin/systems/class_systemManagement.inc:1224
-#: admin/systems/class_systemManagement.inc:1228
-#: addons/dashboard/class_dashBoardSystems.inc:199
+#: admin/systems/class_systemManagement.inc:48
 #: config/systems/class_systemsPluginConfig.inc:28
 msgid "Systems"
 msgstr ""
 
-#: admin/systems/class_systemManagement.inc:1225
+#: admin/systems/class_systemManagement.inc:49
 msgid "Systems Management"
 msgstr ""
 
+#: admin/systems/class_systemManagement.inc:250
+#, php-format
+msgid "Inherited from %s"
+msgstr ""
+
 #: admin/systems/services/terminal/class_serviceTerminal.inc:29
 #: admin/systems/services/terminal/class_serviceTerminal.inc:30
 #: admin/systems/services/terminal/class_serviceTerminal.inc:41
@@ -1161,6 +688,10 @@ msgstr ""
 msgid "Empty service"
 msgstr ""
 
+#: admin/systems/services/class_goService.inc:241
+msgid "Configuration error"
+msgstr ""
+
 #: admin/systems/services/shares/class_serviceShare.inc:30
 #: admin/systems/services/shares/class_serviceShare.inc:31
 msgid "Share service"
@@ -1219,8 +750,6 @@ msgid "You need to configure encodings first"
 msgstr ""
 
 #: admin/systems/services/shares/class_serviceShare.inc:110
-#: admin/ogroups/goto/termgroup.tpl.c:2 admin/systems/remove.tpl.c:2
-#: admin/systems/ppd/remove_ppd.tpl.c:2
 msgid "Warning"
 msgstr ""
 
@@ -1346,153 +875,93 @@ msgstr ""
 msgid "LDAP"
 msgstr ""
 
-#: admin/systems/class_networkSettings.inc:305
+#: admin/systems/class_networkSettings.inc:297
 msgid "NOT IMPLEMENTED"
 msgstr ""
 
-#: admin/systems/class_networkSettings.inc:437
+#: admin/systems/class_networkSettings.inc:429
 msgid "Not matching"
 msgstr ""
 
-#: admin/systems/class_networkSettings.inc:584
+#: admin/systems/class_networkSettings.inc:576
 #, php-format
 msgid "Was not able to contact argonaut server: %s"
 msgstr ""
 
-#: admin/systems/class_networkSettings.inc:591
+#: admin/systems/class_networkSettings.inc:583
 #, php-format
 msgid "Was not able to find DNS server for zone %s"
 msgstr ""
 
-#: admin/systems/class_networkSettings.inc:597
+#: admin/systems/class_networkSettings.inc:589
 #, php-format
 msgid "Was not able to find mac address of DNS server %s"
 msgstr ""
 
-#: admin/systems/class_networkSettings.inc:604
+#: admin/systems/class_networkSettings.inc:596
 #, php-format
 msgid "Was not able to launch ldap2zone: %s"
 msgstr ""
 
-#: admin/systems/class_networkSettings.inc:630
+#: admin/systems/class_networkSettings.inc:622
 #, php-format
 msgid "IP address %s"
 msgstr ""
 
-#: admin/systems/class_networkSettings.inc:638
-#: admin/systems/class_networkSettings.inc:651
-#: admin/systems/class_networkSettings.inc:653
-#: admin/systems/class_networkSettings.inc:1022
-msgid "IP address"
-msgstr ""
-
-#: admin/systems/class_networkSettings.inc:644
-#: admin/systems/class_networkSettings.inc:660
-#: admin/systems/class_networkSettings.inc:662
-#: admin/systems/class_networkSettings.inc:1023
+#: admin/systems/class_networkSettings.inc:636
+#: admin/systems/class_networkSettings.inc:652
+#: admin/systems/class_networkSettings.inc:654
+#: admin/systems/class_networkSettings.inc:1015
 msgid "MAC address"
 msgstr ""
 
-#: admin/systems/class_networkSettings.inc:676
+#: admin/systems/class_networkSettings.inc:668
 #, php-format
 msgid "The IP address '%s' is not part of the selected reverse zone '%s'!"
 msgstr ""
 
-#: admin/systems/class_networkSettings.inc:686
+#: admin/systems/class_networkSettings.inc:678
 #, php-format
 msgid "Record type '%s' is duplicated!"
 msgstr ""
 
-#: admin/systems/class_networkSettings.inc:693
+#: admin/systems/class_networkSettings.inc:685
 #, php-format
 msgid "Uniq record type '%s' is duplicated!"
 msgstr ""
 
-#: admin/systems/class_networkSettings.inc:705
+#: admin/systems/class_networkSettings.inc:697
 #, php-format
 msgid ""
 "The IP address '%s' will be added as 'A Record', this will be done "
 "automatically, please remove the record."
 msgstr ""
 
-#: admin/systems/class_networkSettings.inc:712
+#: admin/systems/class_networkSettings.inc:704
 #, php-format
 msgid "Only lowercase records are allowed, please check your '%ss'."
 msgstr ""
 
-#: admin/systems/class_networkSettings.inc:978
+#: admin/systems/class_networkSettings.inc:970
 msgid "Delete"
 msgstr ""
 
-#: admin/systems/class_networkSettings.inc:984
+#: admin/systems/class_networkSettings.inc:976
 msgid "Add"
 msgstr ""
 
-#: admin/systems/class_networkSettings.inc:1015
-#: addons/dashboard/class_dashBoardNetwork.inc:127
+#: admin/systems/class_networkSettings.inc:1007
 msgid "Network"
 msgstr ""
 
-#: admin/systems/class_networkSettings.inc:1030
+#: admin/systems/class_networkSettings.inc:1022
 msgid "DNS configuration"
 msgstr ""
 
-#: admin/systems/class_networkSettings.inc:1033
+#: admin/systems/class_networkSettings.inc:1025
 msgid "DHCP configuration"
 msgstr ""
 
-#: addons/dashboard/class_dashBoardSystems.inc:45
-msgid "Workstations"
-msgstr ""
-
-#: addons/dashboard/class_dashBoardSystems.inc:51
-msgid "Windows Workstations"
-msgstr ""
-
-#: addons/dashboard/class_dashBoardSystems.inc:54
-msgid "Terminals"
-msgstr ""
-
-#: addons/dashboard/class_dashBoardSystems.inc:57
-msgid "Printers"
-msgstr ""
-
-#: addons/dashboard/class_dashBoardSystems.inc:60
-msgid "Phones"
-msgstr ""
-
-#: addons/dashboard/class_dashBoardSystems.inc:63
-msgid "Components"
-msgstr ""
-
-#: addons/dashboard/class_dashBoardSystems.inc:66
-msgid "Mobile phones"
-msgstr ""
-
-#: addons/dashboard/class_dashBoardSystems.inc:183
-msgid "Statistics"
-msgstr ""
-
-#: addons/dashboard/class_dashBoardSystems.inc:188
-msgid "Computer name to use by unit"
-msgstr ""
-
-#: addons/dashboard/class_dashBoardSystems.inc:200
-msgid "Statistics and informations about systems"
-msgstr ""
-
-#: addons/dashboard/class_dashBoardNetwork.inc:111
-msgid "DHCP"
-msgstr ""
-
-#: addons/dashboard/class_dashBoardNetwork.inc:116
-msgid "DNS"
-msgstr ""
-
-#: addons/dashboard/class_dashBoardNetwork.inc:128
-msgid "Statistics and various informations"
-msgstr ""
-
 #: config/systems/class_systemsPluginConfig.inc:29
 msgid "Systems plugin configuration"
 msgstr ""
@@ -1584,402 +1053,3 @@ msgstr ""
 #: config/systems/class_systemsPluginConfig.inc:101
 msgid "Encodings"
 msgstr ""
-
-#: admin/ogroups/goto/termgroup.tpl.c:5
-msgid ""
-"Actions you choose here influence all systems in this object group. "
-"Additionally, all values editable here can be inherited by the clients "
-"assigned to this object group."
-msgstr ""
-
-#: admin/ogroups/goto/termgroup.tpl.c:8
-msgid "Generic"
-msgstr ""
-
-#: admin/ogroups/goto/termgroup.tpl.c:11
-msgid "NTP server"
-msgstr ""
-
-#: admin/ogroups/goto/termgroup.tpl.c:14
-msgid "Choose server to use for synchronizing time"
-msgstr ""
-
-#: admin/ogroups/goto/termgroup.tpl.c:20
-msgid "Select terminal mode"
-msgstr ""
-
-#: admin/ogroups/goto/termgroup.tpl.c:26
-msgid "Choose server to use for logging"
-msgstr ""
-
-#: admin/ogroups/goto/termgroup.tpl.c:32
-msgid "Select NFS root filesystem to use"
-msgstr ""
-
-#: admin/ogroups/goto/termgroup.tpl.c:38
-msgid "Choose NFS filesystem to place swap files on"
-msgstr ""
-
-#: admin/ogroups/goto/termgroup.tpl.c:47
-msgid "Execute"
-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 admin/systems/network.tpl.c:11
-msgid "Propose ip"
-msgstr ""
-
-#: admin/systems/network.tpl.c:14
-msgid "MAC-address"
-msgstr ""
-
-#: admin/systems/network.tpl.c:17
-msgid "Autodetect"
-msgstr ""
-
-#: admin/systems/network.tpl.c:20 admin/systems/network.tpl.c:23
-msgid "Enable DHCP for this device"
-msgstr ""
-
-#: admin/systems/network.tpl.c:26 admin/systems/network.tpl.c:50
-msgid "not configured"
-msgstr ""
-
-#: admin/systems/network.tpl.c:29
-msgid "Parent node"
-msgstr ""
-
-#: admin/systems/network.tpl.c:32
-msgid "Edit settings"
-msgstr ""
-
-#: admin/systems/network.tpl.c:35 admin/systems/network.tpl.c:47
-msgid "Enable DNS for this device"
-msgstr ""
-
-#: admin/systems/network.tpl.c:38
-msgid "Zone"
-msgstr ""
-
-#: admin/systems/network.tpl.c:41
-msgid "TTL"
-msgstr ""
-
-#: admin/systems/network.tpl.c:44
-msgid "Dns records"
-msgstr ""
-
-#: admin/systems/password.tpl.c:2
-msgid ""
-"To change the terminal root password use the fields below. The changes take "
-"effect during the next reboot. Please memorize the new password, because you"
-" wouldn't be able to log in."
-msgstr ""
-
-#: admin/systems/password.tpl.c:5
-msgid "Leave fields blank for password inheritance from default entries."
-msgstr ""
-
-#: admin/systems/password.tpl.c:8
-msgid "Changing the password impinges on authentification only."
-msgstr ""
-
-#: admin/systems/password.tpl.c:11
-msgid "New password"
-msgstr ""
-
-#: admin/systems/password.tpl.c:14
-msgid "Repeat new password"
-msgstr ""
-
-#: admin/systems/password.tpl.c:17
-msgid "Password strength"
-msgstr ""
-
-#: admin/systems/password.tpl.c:20
-msgid "Set password"
-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/gencd.tpl.c:2
-msgid "CD-Install-Image generation"
-msgstr ""
-
-#: admin/systems/gencd.tpl.c:5
-msgid ""
-"This option enables you to generate FAI install CD images for the selected "
-"workstation. The procedure may take about 10 minutes to complete, so please "
-"be patient after pressing the 'Create ISO-Image' button."
-msgstr ""
-
-#: admin/systems/gencd.tpl.c:8
-msgid "Create ISO-Image"
-msgstr ""
-
-#: admin/systems/remove.tpl.c:5
-msgid ""
-"This includes all account data, system access rules, imap settings, etc. for"
-" this user. Please double check if your really want to do this since there "
-"is no way for FusionDirectory to get your data back."
-msgstr ""
-
-#: admin/systems/remove.tpl.c:8
-msgid "So - if you're sure - press 'Delete' to continue or 'Cancel' to abort."
-msgstr ""
-
-#: admin/systems/system-filter.tpl.c:2
-#: admin/systems/phoneSelect/phoneSelect-filter.tpl.c:2
-msgid "Filter"
-msgstr ""
-
-#: admin/systems/system-filter.tpl.c:5
-msgid "Show servers"
-msgstr ""
-
-#: admin/systems/system-filter.tpl.c:8
-msgid "Show workstations"
-msgstr ""
-
-#: admin/systems/system-filter.tpl.c:11
-msgid "Show terminals"
-msgstr ""
-
-#: admin/systems/system-filter.tpl.c:14
-msgid "Show network printer"
-msgstr ""
-
-#: admin/systems/system-filter.tpl.c:17
-#: admin/systems/phoneSelect/phoneSelect-filter.tpl.c:5
-msgid "Show phones"
-msgstr ""
-
-#: admin/systems/system-filter.tpl.c:20
-msgid "Show windows based workstations"
-msgstr ""
-
-#: admin/systems/system-filter.tpl.c:23
-msgid "Show network devices"
-msgstr ""
-
-#: admin/systems/system-filter.tpl.c:26
-#: admin/systems/phoneSelect/phoneSelect-filter.tpl.c:8
-msgid "Show mobile phones"
-msgstr ""
-
-#: admin/systems/system-filter.tpl.c:29
-msgid "Show IPMI interfaces"
-msgstr ""
-
-#: admin/systems/ppd/printerPPDSelectionDialog.tpl.c:2
-msgid "Select objects to add"
-msgstr ""
-
-#: admin/systems/ppd/printerPPDSelectionDialog.tpl.c:5
-msgid "Filters"
-msgstr ""
-
-#: admin/systems/ppd/printerPPDSelectionDialog.tpl.c:8
-msgid "Display objects matching"
-msgstr ""
-
-#: admin/systems/ppd/printerPPDSelectionDialog.tpl.c:11
-msgid "Regular expression for matching object names"
-msgstr ""
-
-#: admin/systems/ppd/printerPPDSelectionDialog.tpl.c:14
-msgid "Close"
-msgstr ""
-
-#: admin/systems/ppd/printerPPDDialog.tpl.c:2
-msgid "Printer driver"
-msgstr ""
-
-#: admin/systems/ppd/printerPPDDialog.tpl.c:5
-msgid "Model"
-msgstr ""
-
-#: admin/systems/ppd/printerPPDDialog.tpl.c:8
-msgid "Select"
-msgstr ""
-
-#: admin/systems/ppd/printerPPDDialog.tpl.c:11
-msgid "New driver"
-msgstr ""
-
-#: admin/systems/ppd/printerPPDDialog.tpl.c:14
-msgid "Upload"
-msgstr ""
-
-#: admin/systems/ppd/printerPPDDialog.tpl.c:17
-msgid "Options"
-msgstr ""
-
-#: admin/systems/ppd/remove_ppd.tpl.c:5
-msgid "The ppd file will be removed from the server and can not be restored."
-msgstr ""
-
-#: admin/systems/printer.tpl.c:2
-msgid "General"
-msgstr ""
-
-#: admin/systems/printer.tpl.c:5
-msgid "Printer name"
-msgstr ""
-
-#: admin/systems/printer.tpl.c:14
-msgid "Details"
-msgstr ""
-
-#: admin/systems/printer.tpl.c:20
-msgid "Printer location"
-msgstr ""
-
-#: admin/systems/printer.tpl.c:26
-msgid "PPD Provider"
-msgstr ""
-
-#: admin/systems/printer.tpl.c:29
-msgid "Driver"
-msgstr ""
-
-#: admin/systems/printer.tpl.c:32
-msgid "Edit"
-msgstr ""
-
-#: admin/systems/printer.tpl.c:41
-msgid "Users which are allowed to use this printer"
-msgstr ""
-
-#: admin/systems/printer.tpl.c:44
-msgid "Users"
-msgstr ""
-
-#: admin/systems/printer.tpl.c:47
-msgid "Users which are allowed to administrate this printer"
-msgstr ""
-
-#: admin/systems/printer.tpl.c:50
-msgid "Admins"
-msgstr ""
-
-#: admin/systems/printer.tpl.c:53
-msgid "Windows paths"
-msgstr ""
-
-#: admin/systems/printer.tpl.c:56
-msgid "Printer windows inf file"
-msgstr ""
-
-#: admin/systems/printer.tpl.c:59
-msgid "Printer driver directory"
-msgstr ""
-
-#: admin/systems/gencd_frame.tpl.c:2
-msgid "Your browser does not supprt iframes."
-msgstr ""
-
-#: admin/systems/services/cups/serviceCUPS.tpl.c:2
-msgid "Print Service"
-msgstr ""
-
-#: admin/systems/services/cups/serviceCUPS.tpl.c:5
-msgid "enabled"
-msgstr ""
-
-#: admin/systems/services/ServiceAddDialog.tpl.c:2
-msgid "Adding a new service to the current server"
-msgstr ""
-
-#: admin/systems/services/ServiceAddDialog.tpl.c:5
-msgid ""
-"This dialog allows you to add new services to the currenty edited server "
-"object. The box below shows all available but not already used services."
-msgstr ""
-
-#: admin/systems/services/ServiceAddDialog.tpl.c:8
-msgid "Service to add"
-msgstr ""
-
-#: admin/systems/services/ServiceAddDialog.tpl.c:11
-msgid "All available services are already in use."
-msgstr ""
-
-#: admin/systems/services/ServiceAddDialog.tpl.c:14
-#: admin/systems/SelectDeviceType.tpl.c:26
-msgid "Continue"
-msgstr ""
-
-#: admin/systems/SelectDeviceType.tpl.c:2
-msgid ""
-"This system has no system type configured. Please choose a system type for "
-"this object and an optional inheritance group. Press the 'continue' button "
-"to proceed."
-msgstr ""
-
-#: admin/systems/SelectDeviceType.tpl.c:5
-msgid ""
-"Please select a system type and an optional bundle of predefined settings to"
-" be inherited."
-msgstr ""
-
-#: admin/systems/SelectDeviceType.tpl.c:8
-msgid ""
-"Please select a system type and a bundle of predefined settings to be "
-"inherited."
-msgstr ""
-
-#: admin/systems/SelectDeviceType.tpl.c:11
-#: admin/systems/SelectDeviceType.tpl.c:14
-msgid "System type"
-msgstr ""
-
-#: admin/systems/SelectDeviceType.tpl.c:17
-msgid "Choose an object group as template"
-msgstr ""
-
-#: admin/systems/SelectDeviceType.tpl.c:20
-msgid "Object group"
-msgstr ""
-
-#: admin/systems/SelectDeviceType.tpl.c:23
-msgid "none"
-msgstr ""
-
-#: addons/dashboard/systems_stats.tpl.c:2
-msgid "There are several argonaut servers! (this is not yet supported)"
-msgstr ""
-
-#: addons/dashboard/systems_stats.tpl.c:5
-msgid "There is an argonaut server running on %1 (%3://%2:%4)"
-msgstr ""
-
-#: addons/dashboard/systems_stats.tpl.c:8
-msgid "Only one system is configured to run an argonaut client."
-msgid_plural "%1 systems are configured to run an argonaut client."
-msgstr[0] ""
-
-#: addons/dashboard/systems_stats.tpl.c:11
-msgid "But no system is configured to run an argonaut client!"
-msgstr ""
-
-#: addons/dashboard/systems_stats.tpl.c:14
-msgid ""
-"A system is configured to run an argonaut client, but there is no argonaut "
-"server configured!"
-msgid_plural ""
-"%1 systems are configured to run an argonaut client, but there is no "
-"argonaut server configured!"
-msgstr[0] ""
diff --git a/systems/locale/vi_VN/fusiondirectory.po b/systems/locale/vi_VN/fusiondirectory.po
index 210d53cfea9a7ca3b692da3e3d22174ed8f0283e..1f6aa1e1d193b63e70ef71cf900e8628070f9ef9 100644
--- a/systems/locale/vi_VN/fusiondirectory.po
+++ b/systems/locale/vi_VN/fusiondirectory.po
@@ -5,12 +5,12 @@
 # Translators:
 msgid ""
 msgstr ""
-"Project-Id-Version: FusionDirectory-108\n"
+"Project-Id-Version: FusionDirectory-109\n"
 "Report-Msgid-Bugs-To: documentation@lists.fusiondirectory.org\n"
-"POT-Creation-Date: 2015-03-31 11:49+0200\n"
+"POT-Creation-Date: 2014-12-15 17:47+0100\n"
 "PO-Revision-Date: 2015-03-31 11:41+0000\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>\n"
-"Language-Team: Vietnamese (Viet Nam) (http://www.transifex.com/projects/p/FusionDirectory-108/language/vi_VN/)\n"
+"Language-Team: Vietnamese (Viet Nam) (http://www.transifex.com/projects/p/FusionDirectory-109/language/vi_VN/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -26,29 +26,24 @@ msgid "Locked"
 msgstr ""
 
 #: admin/ogroups/goto/class_termgroup.inc:118
-#: admin/systems/class_terminalGeneric.inc:121
+#: admin/systems/class_terminalStartup.inc:145
 msgid "Local swap"
 msgstr ""
 
 #: admin/ogroups/goto/class_termgroup.inc:124
 #: admin/ogroups/goto/class_termgroup.inc:136
-#: admin/systems/class_workstationGeneric.inc:352
-#: admin/systems/class_terminalGeneric.inc:109
-#: admin/systems/class_terminalGeneric.inc:125
+#: admin/systems/class_terminalStartup.inc:133
+#: admin/systems/class_terminalStartup.inc:149
 msgid "inherited"
 msgstr ""
 
 #: admin/ogroups/goto/class_termgroup.inc:220
-#: admin/systems/class_workstationGeneric.inc:72
-#: admin/systems/class_workstationGeneric.inc:443
-#: admin/systems/class_systemManagement.inc:295
-#: admin/systems/class_systemManagement.inc:325
-msgid "Infrastructure service"
+#: admin/systems/class_systemManagement.inc:165
+#: admin/systems/class_systemManagement.inc:186
+msgid "Service infrastructure"
 msgstr ""
 
 #: admin/ogroups/goto/class_termgroup.inc:224
-#: admin/systems/class_workstationGeneric.inc:75
-#: admin/systems/class_workstationGeneric.inc:78
 msgid "Event error"
 msgstr ""
 
@@ -58,12 +53,10 @@ msgid "Event '%s' is not available!"
 msgstr ""
 
 #: admin/ogroups/goto/class_termgroup.inc:274
-#: admin/systems/class_workstationGeneric.inc:112
 msgid "Switch off"
 msgstr ""
 
 #: admin/ogroups/goto/class_termgroup.inc:274
-#: admin/systems/class_workstationGeneric.inc:113
 msgid "Reboot"
 msgstr ""
 
@@ -84,7 +77,6 @@ msgid "Reinstall"
 msgstr ""
 
 #: admin/ogroups/goto/class_termgroup.inc:279
-#: admin/systems/class_workstationGeneric.inc:108
 msgid "Memory test"
 msgstr ""
 
@@ -93,21 +85,18 @@ msgid "System analysis"
 msgstr ""
 
 #: admin/ogroups/goto/class_termgroup.inc:386
-#: admin/systems/class_printGeneric.inc:670
-#: admin/systems/class_printGeneric.inc:970
-#: admin/systems/class_systemManagement.inc:816
 #: admin/systems/services/class_goService.inc:123
 #: admin/systems/services/class_goService.inc:151
 #: admin/systems/services/class_goService.inc:187
-#: admin/systems/class_networkSettings.inc:478
-#: admin/systems/class_networkSettings.inc:491
-#: admin/systems/class_networkSettings.inc:757
-#: admin/systems/class_networkSettings.inc:816
-#: admin/systems/class_networkSettings.inc:835
-#: admin/systems/class_networkSettings.inc:852
-#: admin/systems/class_networkSettings.inc:861
-#: admin/systems/class_networkSettings.inc:879
-#: admin/systems/class_networkSettings.inc:951
+#: admin/systems/class_networkSettings.inc:470
+#: admin/systems/class_networkSettings.inc:483
+#: admin/systems/class_networkSettings.inc:749
+#: admin/systems/class_networkSettings.inc:808
+#: admin/systems/class_networkSettings.inc:827
+#: admin/systems/class_networkSettings.inc:844
+#: admin/systems/class_networkSettings.inc:853
+#: admin/systems/class_networkSettings.inc:871
+#: admin/systems/class_networkSettings.inc:943
 msgid "LDAP error"
 msgstr "Lá»—i LDAP"
 
@@ -119,195 +108,125 @@ msgstr ""
 msgid "System group"
 msgstr ""
 
-#: admin/ogroups/goto/class_termgroup.inc:401
-#: admin/ogroups/goto/termgroup.tpl.c:17
+#: admin/ogroups/goto/class_termgroup.inc:402
 msgid "Mode"
 msgstr ""
 
-#: admin/ogroups/goto/class_termgroup.inc:402
-#: admin/systems/class_workstationGeneric.inc:189
-#: admin/ogroups/goto/termgroup.tpl.c:23
+#: admin/ogroups/goto/class_termgroup.inc:403
+#: admin/systems/class_systemServers.inc:35
 msgid "Syslog server"
 msgstr ""
 
-#: admin/ogroups/goto/class_termgroup.inc:403
+#: admin/ogroups/goto/class_termgroup.inc:404
 msgid "Action flag"
 msgstr ""
 
-#: admin/ogroups/goto/class_termgroup.inc:404
+#: admin/ogroups/goto/class_termgroup.inc:405
 msgid "Ntp server"
 msgstr ""
 
-#: admin/ogroups/goto/class_termgroup.inc:405
-#: admin/systems/class_terminalGeneric.inc:41
-#: admin/ogroups/goto/termgroup.tpl.c:29
+#: admin/ogroups/goto/class_termgroup.inc:406
+#: admin/systems/class_terminalStartup.inc:65
 msgid "Root server"
 msgstr ""
 
-#: admin/ogroups/goto/class_termgroup.inc:406
-#: admin/systems/class_terminalGeneric.inc:47
-#: admin/ogroups/goto/termgroup.tpl.c:35
+#: admin/ogroups/goto/class_termgroup.inc:407
+#: admin/systems/class_terminalStartup.inc:69
 msgid "Swap server"
 msgstr ""
 
-#: admin/systems/class_terminalStartup.inc:63
+#: admin/systems/class_terminalStartup.inc:62
 msgid "Startup parameters"
 msgstr ""
 
-#: admin/systems/class_terminalStartup.inc:66
+#: admin/systems/class_terminalStartup.inc:65
+msgid "The root server the terminal should be using"
+msgstr ""
+
+#: admin/systems/class_terminalStartup.inc:69
+msgid "The swap server the terminal should be using"
+msgstr ""
+
+#: admin/systems/class_terminalStartup.inc:73
 msgid "Boot kernel"
 msgstr ""
 
-#: admin/systems/class_terminalStartup.inc:66
+#: admin/systems/class_terminalStartup.inc:73
 msgid "Linux kernel to be installed and booted"
 msgstr ""
 
-#: admin/systems/class_terminalStartup.inc:70
+#: admin/systems/class_terminalStartup.inc:77
 msgid "Boot kernel parameters"
 msgstr ""
 
-#: admin/systems/class_terminalStartup.inc:70
+#: admin/systems/class_terminalStartup.inc:77
 msgid "Linux kernel parameters to be ran"
 msgstr ""
 
-#: admin/systems/class_terminalStartup.inc:82
-msgid "Startup"
-msgstr "Khá»Ÿi Ä‘á»™ng"
-
 #: admin/systems/class_terminalStartup.inc:83
-msgid "Terminal startup"
-msgstr ""
-
-#: admin/systems/system-list.xml:10
-msgid "List of systems"
-msgstr ""
-
-#: admin/systems/system-list.xml:14
-msgid "New workstation"
-msgstr ""
-
-#: admin/systems/system-list.xml:22
-msgid "Locked server"
-msgstr ""
-
-#: admin/systems/system-list.xml:30
-msgid "Locked workstation"
-msgstr ""
-
-#: admin/systems/system-list.xml:38
-msgid "Locked terminal"
+msgid "Remote desktop"
 msgstr ""
 
-#: admin/systems/system-list.xml:47
-msgid "New terminal"
+#: admin/systems/class_terminalStartup.inc:87
+msgid "Connect method"
 msgstr ""
 
-#: admin/systems/system-list.xml:55
-msgid "New device"
+#: admin/systems/class_terminalStartup.inc:91
+msgid "XDMCP"
 msgstr ""
 
-#: admin/systems/system-list.xml:63
-msgid "Workstation template"
+#: admin/systems/class_terminalStartup.inc:91
+msgid "LDM"
 msgstr ""
 
-#: admin/systems/system-list.xml:71
-msgid "Terminal template"
-msgstr ""
+#: admin/systems/class_terminalStartup.inc:91
+msgid "Shell"
+msgstr "Shell"
 
-#: admin/systems/system-list.xml:79
-msgid "Winstation"
+#: admin/systems/class_terminalStartup.inc:91
+msgid "Telnet"
 msgstr ""
 
-#: admin/systems/system-list.xml:87 admin/systems/system-list.xml:234
-#: admin/systems/class_systemImport.inc:169
-#: admin/systems/class_serverGeneric.inc:46
-#: admin/systems/class_serverGeneric.inc:51
-#: admin/systems/class_serverGeneric.inc:52
-#: admin/systems/class_SelectDeviceType.inc:58
-msgid "Server"
-msgstr "MÃ¡y chá»§ (server)"
-
-#: admin/systems/system-list.xml:95 admin/systems/system-list.xml:242
-#: admin/systems/class_workstationGeneric.inc:458
-#: admin/systems/class_workstationGeneric.inc:463
-#: admin/systems/class_workstationGeneric.inc:464
-#: admin/systems/class_SelectDeviceType.inc:58
-msgid "Workstation"
-msgstr "MÃ¡y tráº¡m"
-
-#: admin/systems/system-list.xml:103 admin/systems/system-list.xml:250
-#: admin/systems/class_terminalGeneric.inc:81
-#: admin/systems/class_terminalGeneric.inc:86
-#: admin/systems/class_terminalGeneric.inc:87
-#: admin/systems/class_SelectDeviceType.inc:58
-msgid "Terminal"
-msgstr "Thiáº¿t bá»‹ cuá»‘i "
-
-#: admin/systems/system-list.xml:111 admin/systems/class_printGeneric.inc:1005
-#: admin/systems/class_printGeneric.inc:1011
-#: admin/systems/class_printGeneric.inc:1012
-msgid "Printer"
-msgstr "MÃ¡y in"
-
-#: admin/systems/system-list.xml:119 admin/systems/system-list.xml:274
-#: admin/systems/class_mobilePhoneGeneric.inc:74
-#: admin/systems/phoneSelect/phoneSelect-list.xml:14
-msgid "Phone"
-msgstr "Sá»‘ Ä‘iá»‡n thoáº¡i"
-
-#: admin/systems/system-list.xml:127
-#: admin/systems/class_mobilePhoneGeneric.inc:36
-#: admin/systems/class_mobilePhoneGeneric.inc:41
-#: admin/systems/class_mobilePhoneGeneric.inc:42
-#: admin/systems/phoneSelect/phoneSelect-list.xml:22
-msgid "Mobile phone"
+#: admin/systems/class_terminalStartup.inc:91
+msgid "Windows RDP"
 msgstr ""
 
-#: admin/systems/system-list.xml:135
-#: admin/systems/class_componentGeneric.inc:36
-msgid "Component"
+#: admin/systems/class_terminalStartup.inc:95
+msgid "Terminal server"
 msgstr ""
 
-#: admin/systems/system-list.xml:143 admin/systems/system-list.xml:298
-msgid "IPMI"
+#: admin/systems/system-list.xml:10
+msgid "List of systems"
 msgstr ""
 
-#: admin/systems/system-list.xml:169
-#: admin/systems/class_workstationGeneric.inc:154
-#: admin/systems/class_printGeneric.inc:752
-#: admin/systems/class_printGeneric.inc:762
-#: admin/systems/class_printGeneric.inc:781
-#: admin/systems/class_printGeneric.inc:1022
-#: admin/systems/class_componentGeneric.inc:64
-#: admin/systems/class_mobilePhoneGeneric.inc:63
-#: admin/systems/phoneSelect/phoneSelect-list.xml:48
+#: admin/systems/system-list.xml:31
+#: admin/systems/class_workstationGeneric.inc:46
+#: admin/systems/class_printGeneric.inc:60
+#: admin/systems/class_componentGeneric.inc:58
+#: admin/systems/class_mobilePhoneGeneric.inc:60
 #: admin/systems/services/shares/class_serviceShare.inc:52
-#: admin/systems/system-filter.tpl.c:32
-#: admin/systems/phoneSelect/phoneSelect-filter.tpl.c:11
 msgid "Name"
 msgstr "TÃªn"
 
-#: admin/systems/system-list.xml:177
-#: admin/systems/phoneSelect/phoneSelect-list.xml:63
+#: admin/systems/system-list.xml:39
 msgid "IP"
 msgstr ""
 
-#: admin/systems/system-list.xml:185
+#: admin/systems/system-list.xml:47
 msgid "MAC"
 msgstr ""
 
-#: admin/systems/system-list.xml:193
-#: admin/systems/class_workstationGeneric.inc:160
-#: admin/systems/class_printGeneric.inc:1024
-#: admin/systems/class_componentGeneric.inc:68
-#: admin/systems/class_mobilePhoneGeneric.inc:67
+#: admin/systems/system-list.xml:55
+#: admin/systems/class_workstationGeneric.inc:51
+#: admin/systems/class_printGeneric.inc:64
+#: admin/systems/class_componentGeneric.inc:62
+#: admin/systems/class_mobilePhoneGeneric.inc:64
 #: admin/systems/serverService-list.xml:35
 #: admin/systems/services/shares/class_serviceShare.inc:56
-#: admin/systems/printer.tpl.c:8 admin/systems/printer.tpl.c:17
 msgid "Description"
 msgstr "MÃ´ táº£"
 
-#: admin/systems/system-list.xml:201 admin/systems/class_serverService.inc:57
+#: admin/systems/system-list.xml:63 admin/systems/class_serverService.inc:57
 #: admin/systems/services/terminal/class_serviceTerminal.inc:30
 #: admin/systems/services/cups/class_serviceCUPS.inc:85
 #: admin/systems/services/shares/class_serviceShare.inc:31
@@ -316,378 +235,186 @@ msgstr "MÃ´ táº£"
 msgid "Services"
 msgstr ""
 
-#: admin/systems/system-list.xml:209
+#: admin/systems/system-list.xml:71
 msgid "Release"
 msgstr ""
 
-#: admin/systems/system-list.xml:217 admin/systems/serverService-list.xml:43
-#: admin/systems/phoneSelect/phoneSelect-list.xml:70
+#: admin/systems/system-list.xml:79 admin/systems/serverService-list.xml:43
 msgid "Actions"
 msgstr "CÃ¡c thao tÃ¡c"
 
-#: admin/systems/system-list.xml:228 admin/systems/serverService-list.xml:54
+#: admin/systems/system-list.xml:90 admin/systems/serverService-list.xml:54
 msgid "Create"
 msgstr "Táº¡o "
 
-#: admin/systems/system-list.xml:258
-msgid "winStation"
-msgstr ""
-
-#: admin/systems/system-list.xml:266
-msgid "Network printer"
-msgstr ""
-
-#: admin/systems/system-list.xml:282
-#: admin/systems/class_componentGeneric.inc:41
-#: admin/systems/class_componentGeneric.inc:42
-msgid "Network device"
-msgstr ""
-
-#: admin/systems/system-list.xml:290
-msgid "Mobile Phone"
-msgstr ""
-
-#: admin/systems/system-list.xml:310
+#: admin/systems/system-list.xml:100
 msgid "Trigger action"
 msgstr ""
 
-#: admin/systems/system-list.xml:317
+#: admin/systems/system-list.xml:107
 msgid "Schedule action"
 msgstr ""
 
-#: admin/systems/system-list.xml:330
-msgid "Activate systems"
-msgstr ""
-
-#: admin/systems/system-list.xml:337 admin/systems/serverService-list.xml:69
-#: admin/systems/printer.tpl.c:35
+#: admin/systems/system-list.xml:119 admin/systems/serverService-list.xml:69
 msgid "Remove"
 msgstr "XÃ³a bá»"
 
-#: admin/systems/system-list.xml:367
-msgid "Create ISO"
-msgstr ""
-
-#: admin/systems/system-list.xml:379
+#: admin/systems/system-list.xml:150
 msgid "Edit system"
 msgstr ""
 
-#: admin/systems/system-list.xml:392
+#: admin/systems/system-list.xml:163
 msgid "Remove system"
 msgstr ""
 
-#: admin/systems/class_workstationGeneric.inc:75
-#, php-format
-msgid "Event %s is not available!"
-msgstr ""
-
-#: admin/systems/class_workstationGeneric.inc:78
-msgid "Events are not available!"
-msgstr ""
-
-#: admin/systems/class_workstationGeneric.inc:106
-msgid "(Re)Install"
-msgstr ""
-
-#: admin/systems/class_workstationGeneric.inc:107
-msgid "Software update"
-msgstr ""
-
-#: admin/systems/class_workstationGeneric.inc:115
-msgid "Wake up"
-msgstr ""
-
-#: admin/systems/class_workstationGeneric.inc:144
-#: admin/systems/class_printGeneric.inc:604
+#: admin/systems/class_workstationGeneric.inc:35
 msgid "workstation"
 msgstr ""
 
-#: admin/systems/class_workstationGeneric.inc:151
-#: admin/systems/class_componentGeneric.inc:61
-#: admin/systems/class_mobilePhoneGeneric.inc:60
+#: admin/systems/class_workstationGeneric.inc:42
+#: admin/systems/class_printGeneric.inc:56
+#: admin/systems/class_componentGeneric.inc:55
+#: admin/systems/class_mobilePhoneGeneric.inc:56
 msgid "Properties"
 msgstr "Properties"
 
-#: admin/systems/class_workstationGeneric.inc:155
+#: admin/systems/class_workstationGeneric.inc:47
 #, php-format
 msgid "The name of the %s"
 msgstr ""
 
-#: admin/systems/class_workstationGeneric.inc:161
+#: admin/systems/class_workstationGeneric.inc:52
 #, php-format
 msgid "A short description of the %s"
 msgstr ""
 
-#: admin/systems/class_workstationGeneric.inc:166
-#: admin/systems/class_printGeneric.inc:1025
+#: admin/systems/class_workstationGeneric.inc:56
 msgid "Location"
 msgstr "Vá»‹ trÃ"
 
-#: admin/systems/class_workstationGeneric.inc:167
+#: admin/systems/class_workstationGeneric.inc:57
 #, php-format
 msgid "The location of the %s"
 msgstr ""
 
-#: admin/systems/class_workstationGeneric.inc:173
+#: admin/systems/class_workstationGeneric.inc:61
 #, php-format
 msgid "Lock this %s"
 msgstr ""
 
-#: admin/systems/class_workstationGeneric.inc:174
+#: admin/systems/class_workstationGeneric.inc:62
 #, php-format
 msgid "This will prevent the %s from being reinstalled"
 msgstr ""
 
-#: admin/systems/class_workstationGeneric.inc:185
-#: addons/dashboard/class_dashBoardSystems.inc:48
-msgid "Servers"
-msgstr "MÃ¡y chá»§ (server)"
-
-#: admin/systems/class_workstationGeneric.inc:190
-#, php-format
-msgid "The syslog server the %s should be using"
-msgstr ""
-
-#: admin/systems/class_workstationGeneric.inc:195
-msgid "Inherit NTP servers"
-msgstr ""
-
-#: admin/systems/class_workstationGeneric.inc:196
-msgid "Inherit time server attributes from ogroup"
-msgstr ""
-
-#: admin/systems/class_workstationGeneric.inc:202
-msgid "NTP servers"
+#: admin/systems/class_workstationGeneric.inc:73
+#: admin/systems/class_printGeneric.inc:83
+#: admin/systems/class_componentGeneric.inc:69
+#: admin/systems/class_mobilePhoneGeneric.inc:102
+#: admin/systems/class_networkSettings.inc:1008
+msgid "Network settings"
 msgstr ""
 
-#: admin/systems/class_workstationGeneric.inc:203
-#, php-format
-msgid "The NTP servers for the %s"
+#: admin/systems/class_workstationGeneric.inc:78
+#: admin/systems/class_printGeneric.inc:87
+#: admin/systems/class_componentGeneric.inc:73
+#: admin/systems/class_mobilePhoneGeneric.inc:106
+#: admin/systems/class_networkSettings.inc:630
+#: admin/systems/class_networkSettings.inc:643
+#: admin/systems/class_networkSettings.inc:645
+#: admin/systems/class_networkSettings.inc:1014
+msgid "IP address"
 msgstr ""
 
-#: admin/systems/class_workstationGeneric.inc:209
-msgid "Inherit LDAP servers"
+#: admin/systems/class_workstationGeneric.inc:78
+msgid "IP addresses this system uses (v4 or v6)"
 msgstr ""
 
-#: admin/systems/class_workstationGeneric.inc:210
-msgid "Inherit LDAP server attributes from ogroup"
+#: admin/systems/class_workstationGeneric.inc:83
+#: admin/systems/class_printGeneric.inc:91
+#: admin/systems/class_componentGeneric.inc:77
+#: admin/systems/class_mobilePhoneGeneric.inc:110
+msgid "Mac address"
 msgstr ""
 
-#: admin/systems/class_workstationGeneric.inc:216
-msgid "LDAP servers"
+#: admin/systems/class_workstationGeneric.inc:83
+#: admin/systems/class_printGeneric.inc:91
+#: admin/systems/class_componentGeneric.inc:77
+#: admin/systems/class_mobilePhoneGeneric.inc:110
+msgid "Mac address of this system"
 msgstr ""
 
-#: admin/systems/class_workstationGeneric.inc:217
-#, php-format
-msgid "The LDAP servers for the %s"
-msgstr ""
+#: admin/systems/class_workstationGeneric.inc:125
+#: admin/systems/class_workstationGeneric.inc:130
+#: admin/systems/class_workstationGeneric.inc:131
+msgid "Workstation"
+msgstr "MÃ¡y tráº¡m"
 
-#: admin/systems/class_workstationGeneric.inc:225
-#: admin/systems/class_workstationGeneric.inc:229
-#: admin/ogroups/goto/termgroup.tpl.c:41
-msgid "Action"
+#: admin/systems/class_workstationGeneric.inc:126
+msgid "Workstation information"
 msgstr ""
 
-#: admin/systems/class_workstationGeneric.inc:230
-#: admin/ogroups/goto/termgroup.tpl.c:44
-msgid "Select action to execute for this terminal"
-msgstr ""
+#: admin/systems/class_printGeneric.inc:32
+#: admin/systems/class_printGeneric.inc:37
+#: admin/systems/class_printGeneric.inc:38
+msgid "Printer"
+msgstr "MÃ¡y in"
 
-#: admin/systems/class_workstationGeneric.inc:236
-#: admin/systems/class_componentGeneric.inc:75
-#: admin/systems/class_mobilePhoneGeneric.inc:106
-#: admin/systems/class_networkSettings.inc:1016
-msgid "Network settings"
+#: admin/systems/class_printGeneric.inc:33
+msgid "Printer information"
 msgstr ""
 
-#: admin/systems/class_workstationGeneric.inc:459
-msgid "Workstation information"
+#: admin/systems/class_printGeneric.inc:60
+msgid "The name of the printer"
 msgstr ""
 
-#: admin/systems/class_printGeneric.inc:131
-#: admin/systems/class_printGeneric.inc:1065
-#: admin/systems/class_systemManagement.inc:678
-msgid "Internal error"
-msgstr "Lá»—i ná»™i bá»™"
-
-#: admin/systems/class_printGeneric.inc:131
-#, php-format
-msgid ""
-"Cannot determine a valid department for this object. Setting base to '%s'!"
+#: admin/systems/class_printGeneric.inc:64
+msgid "A short description of the printer"
 msgstr ""
 
-#: admin/systems/class_printGeneric.inc:311
-#: admin/systems/class_printGeneric.inc:319
-#: admin/systems/class_printGeneric.inc:324
-#: admin/systems/class_printGeneric.inc:374
-#: admin/systems/class_printGeneric.inc:390
-#: admin/systems/class_printGeneric.inc:393
-msgid "Add printer extension"
+#: admin/systems/class_printGeneric.inc:70
+msgid "Details"
 msgstr ""
 
-#: admin/systems/class_printGeneric.inc:312
-msgid ""
-"Could not initialize printer tab, parameter parent was missing while "
-"construction."
+#: admin/systems/class_printGeneric.inc:73
+msgid "Printer location"
 msgstr ""
 
-#: admin/systems/class_printGeneric.inc:320
-msgid "This is a workstation template, printer tab is disabled."
+#: admin/systems/class_printGeneric.inc:73
+msgid "The location of the printer"
 msgstr ""
 
-#: admin/systems/class_printGeneric.inc:325
-msgid "This is a terminal template, printer tab is disabled."
+#: admin/systems/class_printGeneric.inc:77
+msgid "Printer URL"
 msgstr ""
 
-#: admin/systems/class_printGeneric.inc:367
-#: admin/systems/class_printGeneric.inc:375
-#: admin/systems/class_printGeneric.inc:383
-#: admin/systems/class_printGeneric.inc:386
-#: admin/systems/class_printGeneric.inc:391
-#: admin/systems/class_printGeneric.inc:394
-msgid "printer"
+#: admin/systems/class_printGeneric.inc:77
+msgid "The URL of the printer"
 msgstr ""
 
-#: admin/systems/class_printGeneric.inc:375
-msgid ""
-"You can't enable it while 'cn' is not present in entry. Possibly you are "
-"currently creating a new terminal template."
+#: admin/systems/class_printGeneric.inc:87
+#: admin/systems/class_componentGeneric.inc:73
+#: admin/systems/class_mobilePhoneGeneric.inc:106
+msgid "IP address this system uses"
 msgstr ""
 
-#: admin/systems/class_printGeneric.inc:382
-#: admin/systems/class_printGeneric.inc:385
-msgid "Remove printer extension"
+#: admin/systems/class_serverService.inc:58
+msgid "Server services"
 msgstr ""
 
-#: admin/systems/class_printGeneric.inc:474
-#: admin/systems/class_printGeneric.inc:652
-#: admin/systems/class_printGeneric.inc:659
-#: admin/systems/class_printGeneric.inc:718
-#: admin/systems/class_printGeneric.inc:1105
-#: admin/systems/class_printGeneric.inc:1116
 #: admin/systems/class_serverService.inc:224
 #: admin/systems/class_serverService.inc:270
 #: admin/systems/class_serverService.inc:393
-#: admin/systems/class_systemManagement.inc:341
-#: admin/systems/class_systemManagement.inc:624
-#: admin/systems/class_systemManagement.inc:639
 #: admin/systems/services/shares/class_serviceShare.inc:103
-#: admin/systems/class_networkSettings.inc:305
-#: admin/systems/class_networkSettings.inc:336
-#: admin/systems/class_networkSettings.inc:584
-#: admin/systems/class_networkSettings.inc:591
-#: admin/systems/class_networkSettings.inc:597
-#: admin/systems/class_networkSettings.inc:604
+#: admin/systems/class_networkSettings.inc:297
+#: admin/systems/class_networkSettings.inc:328
+#: admin/systems/class_networkSettings.inc:576
+#: admin/systems/class_networkSettings.inc:583
+#: admin/systems/class_networkSettings.inc:589
+#: admin/systems/class_networkSettings.inc:596
 msgid "Error"
 msgstr "Lá»—i"
 
-#: admin/systems/class_printGeneric.inc:577
-#, php-format
-msgid "Your currently selected PPD file '%s' doesn't exist."
-msgstr ""
-
-#: admin/systems/class_printGeneric.inc:583
-msgid "Not defined"
-msgstr ""
-
-#: admin/systems/class_printGeneric.inc:587
-#: admin/systems/ppd/class_printerPPDDialog.inc:116
-msgid "Can't get ppd informations."
-msgstr ""
-
-#: admin/systems/class_printGeneric.inc:602
-#: admin/systems/class_printGeneric.inc:604
-#, php-format
-msgid "This printer belongs to %s. You can't rename this printer."
-msgstr ""
-
-#: admin/systems/class_printGeneric.inc:602
-#: admin/systems/class_terminalGeneric.inc:34
-msgid "terminal"
-msgstr "Thiáº¿t bá»‹ cuá»‘i "
-
-#: admin/systems/class_printGeneric.inc:652
-#: admin/systems/class_printGeneric.inc:659
-msgid "Object is no printer!"
-msgstr ""
-
-#: admin/systems/class_printGeneric.inc:767 admin/systems/printer.tpl.c:23
-msgid "Printer URL"
-msgstr ""
-
-#: admin/systems/class_printGeneric.inc:989
-#: admin/systems/class_printGeneric.inc:991
-msgid "Group"
-msgstr "NhÃ³m "
-
-#: admin/systems/class_printGeneric.inc:994
-msgid "User"
-msgstr "NgÆ°á»i dÃ¹ng"
-
-#: admin/systems/class_printGeneric.inc:1006
-msgid "Printer information"
-msgstr ""
-
-#: admin/systems/class_printGeneric.inc:1023
-#: admin/systems/serverService-list.tpl.c:2
-#: admin/systems/phoneSelect/phoneSelect-list.tpl.c:2
-#: admin/systems/printer.tpl.c:11
-msgid "Base"
-msgstr "CÆ¡ sá»Ÿ"
-
-#: admin/systems/class_printGeneric.inc:1026
-msgid "LabeledURL"
-msgstr ""
-
-#: admin/systems/class_printGeneric.inc:1027
-msgid "Printer PPD"
-msgstr ""
-
-#: admin/systems/class_printGeneric.inc:1028 admin/systems/printer.tpl.c:38
-msgid "Permissions"
-msgstr ""
-
-#: admin/systems/class_printGeneric.inc:1030
-msgid "Windows inf file"
-msgstr ""
-
-#: admin/systems/class_printGeneric.inc:1031
-msgid "Windows driver dir"
-msgstr ""
-
-#: admin/systems/class_printGeneric.inc:1032 admin/systems/printer.tpl.c:62
-msgid "Driver printer name"
-msgstr ""
-
-#: admin/systems/class_printGeneric.inc:1048
-#: admin/systems/class_printGeneric.inc:1070
-msgid "Permission error"
-msgstr "Lá»—i vá» cáº¥p phÃ©p"
-
-#: admin/systems/class_printGeneric.inc:1048
-#: admin/systems/class_printGeneric.inc:1070
-msgid "printer user"
-msgstr ""
-
-#: admin/systems/class_printGeneric.inc:1065
-#, php-format
-msgid "Illegal member type '%s'!"
-msgstr ""
-
-#: admin/systems/class_printGeneric.inc:1105
-#, php-format
-msgid "'%s' is already used!"
-msgstr ""
-
-#: admin/systems/class_printGeneric.inc:1116
-#, php-format
-msgid "'%s' does not exist!"
-msgstr ""
-
-#: admin/systems/class_serverService.inc:58
-msgid "Server services"
-msgstr ""
-
 #: admin/systems/class_serverService.inc:332
 msgid "Filter error"
 msgstr ""
@@ -711,217 +438,20 @@ msgstr ""
 msgid "Could not get execute action %s on service %s."
 msgstr ""
 
-#: admin/systems/class_terminalGeneric.inc:42
-#, php-format
-msgid "The root server the terminal should be using"
-msgstr ""
+#: admin/systems/class_terminalGeneric.inc:31
+msgid "terminal"
+msgstr "Thiáº¿t bá»‹ cuá»‘i "
 
+#: admin/systems/class_terminalGeneric.inc:43
 #: admin/systems/class_terminalGeneric.inc:48
-#, php-format
-msgid "The swap server the terminal should be using"
-msgstr ""
-
-#: admin/systems/class_terminalGeneric.inc:54
-msgid "Remote desktop"
-msgstr ""
-
-#: admin/systems/class_terminalGeneric.inc:58
-msgid "Connect method"
-msgstr ""
-
-#: admin/systems/class_terminalGeneric.inc:62
-msgid "XDMCP"
-msgstr ""
-
-#: admin/systems/class_terminalGeneric.inc:62
-msgid "LDM"
-msgstr ""
-
-#: admin/systems/class_terminalGeneric.inc:62
-msgid "Shell"
-msgstr "Shell"
-
-#: admin/systems/class_terminalGeneric.inc:62
-msgid "Telnet"
-msgstr ""
-
-#: admin/systems/class_terminalGeneric.inc:62
-msgid "Windows RDP"
-msgstr ""
-
-#: admin/systems/class_terminalGeneric.inc:66
-msgid "Terminal server"
-msgstr ""
+#: admin/systems/class_terminalGeneric.inc:49
+msgid "Terminal"
+msgstr "Thiáº¿t bá»‹ cuá»‘i "
 
-#: admin/systems/class_terminalGeneric.inc:82
+#: admin/systems/class_terminalGeneric.inc:44
 msgid "Terminal information"
 msgstr ""
 
-#: admin/systems/ppd/class_printerPPDSelectionDialog.inc:91
-#: admin/systems/ppd/class_printerPPDSelectionDialog.inc:116
-#: admin/systems/ppd/class_printerPPDSelectionDialog.inc:139
-#: admin/systems/ppd/class_printerPPDDialog.inc:92
-#: admin/systems/ppd/class_printerPPDDialog.inc:160
-#: admin/systems/ppd/class_printerPPDDialog.inc:241
-#: admin/systems/ppd/class_printerPPDDialog.inc:256
-#: admin/systems/ppd/class_printerPPDDialog.inc:269
-#: admin/systems/ppd/class_printerPPDDialog.inc:297
-#: admin/systems/ppd/class_printerPPDDialog.inc:314
-#: admin/systems/ppd/class_printerPPDDialog.inc:337
-#: admin/systems/ppd/class_printerPPDDialog.inc:351
-#: admin/systems/ppd/class_printerPPDDialog.inc:361
-#: admin/systems/ppd/class_printerPPDDialog.inc:365
-#: admin/systems/ppd/class_printerPPDDialog.inc:560
-#: admin/systems/ppd/class_printerPPDDialog.inc:577
-#: admin/systems/ppd/class_printerPPDDialog.inc:580
-#: admin/systems/ppd/class_printerPPDDialog.inc:583
-msgid "PPD error"
-msgstr ""
-
-#: admin/systems/ppd/class_printerPPDSelectionDialog.inc:139
-#, php-format
-msgid "Cannot locate vendor '%s' in available PPDs!"
-msgstr ""
-
-#: admin/systems/ppd/class_printerPPDSelectionDialog.inc:148
-msgid "Printer ppd selection."
-msgstr ""
-
-#: admin/systems/ppd/class_printerPPDSelectionDialog.inc:155
-msgid "delete"
-msgstr ""
-
-#: admin/systems/ppd/class_printerPPDSelectionDialog.inc:166
-msgid "back"
-msgstr ""
-
-#: admin/systems/ppd/class_printerPPDDialog.inc:74
-#: admin/systems/ppd/class_printerPPDDialog.inc:140
-#: admin/systems/services/class_goService.inc:241
-msgid "Configuration error"
-msgstr "Lá»—i cáº¥u hÃ¬nh"
-
-#: admin/systems/ppd/class_printerPPDDialog.inc:92
-#, php-format
-msgid "Cannot open PPD '%s'!"
-msgstr ""
-
-#: admin/systems/ppd/class_printerPPDDialog.inc:141
-#, php-format
-msgid "Cannot open PPD path '%s' for reading and writing!"
-msgstr ""
-
-#: admin/systems/ppd/class_printerPPDDialog.inc:160
-#: admin/systems/ppd/class_printerPPDDialog.inc:365
-msgid "file is empty"
-msgstr ""
-
-#: admin/systems/ppd/class_printerPPDDialog.inc:314
-#, php-format
-msgid "Cannot parse PPD '%s'!"
-msgstr ""
-
-#: admin/systems/ppd/class_printerPPDDialog.inc:340
-msgid "Overwrite existing PPD"
-msgstr ""
-
-#: admin/systems/ppd/class_printerPPDDialog.inc:341
-msgid ""
-"There is already a ppd file for this kind of printer. Do you want to "
-"overwrite it?"
-msgstr ""
-
-#: admin/systems/ppd/class_printerPPDDialog.inc:491
-msgid "Section"
-msgstr ""
-
-#: admin/systems/ppd/class_printerPPDDialog.inc:551
-#: admin/systems/ppd/class_printerPPDDialog.inc:554
-msgid "True"
-msgstr ""
-
-#: admin/systems/ppd/class_printerPPDDialog.inc:552
-#: admin/systems/ppd/class_printerPPDDialog.inc:555
-msgid "False"
-msgstr ""
-
-#: admin/systems/ppd/class_printerPPDDialog.inc:560
-#, php-format
-msgid "PPD type '%s' is not supported!"
-msgstr ""
-
-#: admin/systems/ppd/class_printerPPDDialog.inc:597
-msgid ""
-"Please select a valid ppd file or use 'Cancel' to go back to printer "
-"configuration."
-msgstr ""
-
-#: admin/systems/ppd/class_ppdManager.inc:44
-#: admin/systems/ppd/class_ppdManager.inc:188
-#: admin/systems/ppd/class_ppdManager.inc:190
-msgid "PPD manager error"
-msgstr ""
-
-#: admin/systems/ppd/class_ppdManager.inc:44
-#, php-format
-msgid "The specified path '%s' does not exist."
-msgstr ""
-
-#: admin/systems/ppd/class_ppdManager.inc:188
-#, php-format
-msgid "Specified PPD file '%s' cannot be opened for reading."
-msgstr ""
-
-#: admin/systems/ppd/class_ppdManager.inc:190
-#, php-format
-msgid "The temporary file '%s' cannot be opened for writing."
-msgstr ""
-
-#: admin/systems/ppd/class_ppdManager.inc:212
-#: admin/systems/ppd/class_ppdManager.inc:350
-msgid "Parsing PPD file failed - file is empty!"
-msgstr ""
-
-#: admin/systems/ppd/class_ppdManager.inc:222
-#, php-format
-msgid ""
-"Parsing PPD file %s failed - line too long. Trailing characters have been "
-"ignored!"
-msgstr ""
-
-#: admin/systems/ppd/class_ppdManager.inc:230
-msgid "Nested groups are not supported!"
-msgstr ""
-
-#: admin/systems/ppd/class_ppdManager.inc:234
-msgid "Group name not unique!"
-msgstr ""
-
-#: admin/systems/ppd/class_ppdManager.inc:240
-#: admin/systems/ppd/class_ppdManager.inc:270
-msgid "Symbol values are not supported yet!"
-msgstr ""
-
-#: admin/systems/ppd/class_ppdManager.inc:264
-msgid "Nested options are not supported!"
-msgstr ""
-
-#: admin/systems/ppd/class_ppdManager.inc:289
-msgid "PickMany is not supported yet!"
-msgstr ""
-
-#: admin/systems/ppd/class_ppdManager.inc:370
-#, php-format
-msgid ""
-"Parsing PPD file %s failed - line too long. Trailing characters have been "
-"ignored"
-msgstr ""
-
-#: admin/systems/ppd/class_ppdManager.inc:395
-#, php-format
-msgid "Parsing PPD file %s failed - no information found."
-msgstr ""
-
 #: admin/systems/class_systemImport.inc:72
 #, php-format
 msgid "Could not parse %s"
@@ -941,83 +471,130 @@ msgstr ""
 msgid "Import"
 msgstr ""
 
+#: admin/systems/class_systemImport.inc:169
+#: admin/systems/class_serverGeneric.inc:43
+#: admin/systems/class_serverGeneric.inc:48
+#: admin/systems/class_serverGeneric.inc:49
+msgid "Server"
+msgstr "MÃ¡y chá»§ (server)"
+
 #: admin/systems/class_systemImport.inc:169
 msgid "The server you wish to import hosts from"
 msgstr ""
 
-#: admin/systems/class_serverGeneric.inc:34
+#: admin/systems/class_serverGeneric.inc:31
 msgid "server"
 msgstr "MÃ¡y chá»§ (server)"
 
-#: admin/systems/class_serverGeneric.inc:47
+#: admin/systems/class_serverGeneric.inc:44
 msgid "Server information"
 msgstr ""
 
-#: admin/systems/class_componentGeneric.inc:37
+#: admin/systems/class_componentGeneric.inc:31
+msgid "Component"
+msgstr ""
+
+#: admin/systems/class_componentGeneric.inc:32
 msgid "Component information"
 msgstr ""
 
-#: admin/systems/class_componentGeneric.inc:64
+#: admin/systems/class_componentGeneric.inc:36
+#: admin/systems/class_componentGeneric.inc:37
+msgid "Network device"
+msgstr ""
+
+#: admin/systems/class_componentGeneric.inc:58
 msgid "The name of the component"
 msgstr ""
 
-#: admin/systems/class_componentGeneric.inc:68
+#: admin/systems/class_componentGeneric.inc:62
 msgid "A short description of the component"
 msgstr ""
 
+#: admin/systems/class_systemServers.inc:31
+#: admin/systems/class_systemServers.inc:53
+msgid "Servers"
+msgstr "MÃ¡y chá»§ (server)"
+
+#: admin/systems/class_systemServers.inc:35
+msgid "The syslog server the system should be using"
+msgstr ""
+
+#: admin/systems/class_systemServers.inc:40
+msgid "NTP servers"
+msgstr ""
+
+#: admin/systems/class_systemServers.inc:40
+msgid "The NTP servers for this system"
+msgstr ""
+
+#: admin/systems/class_systemServers.inc:54
+msgid "Servers this system is using"
+msgstr ""
+
+#: admin/systems/class_mobilePhoneGeneric.inc:32
 #: admin/systems/class_mobilePhoneGeneric.inc:37
+#: admin/systems/class_mobilePhoneGeneric.inc:38
+msgid "Mobile phone"
+msgstr ""
+
+#: admin/systems/class_mobilePhoneGeneric.inc:33
 msgid "Mobile phone information"
 msgstr ""
 
-#: admin/systems/class_mobilePhoneGeneric.inc:63
+#: admin/systems/class_mobilePhoneGeneric.inc:60
 msgid "The name of the mobile phone"
 msgstr ""
 
-#: admin/systems/class_mobilePhoneGeneric.inc:67
+#: admin/systems/class_mobilePhoneGeneric.inc:64
 msgid "A short description of the mobile phone"
 msgstr ""
 
-#: admin/systems/class_mobilePhoneGeneric.inc:77
+#: admin/systems/class_mobilePhoneGeneric.inc:70
+msgid "Phone"
+msgstr "Sá»‘ Ä‘iá»‡n thoáº¡i"
+
+#: admin/systems/class_mobilePhoneGeneric.inc:73
 msgid "Serial Number"
 msgstr ""
 
-#: admin/systems/class_mobilePhoneGeneric.inc:77
+#: admin/systems/class_mobilePhoneGeneric.inc:73
 msgid "The serial number of the mobile phone"
 msgstr ""
 
-#: admin/systems/class_mobilePhoneGeneric.inc:81
+#: admin/systems/class_mobilePhoneGeneric.inc:77
 msgid "IMEI Number"
 msgstr ""
 
-#: admin/systems/class_mobilePhoneGeneric.inc:81
+#: admin/systems/class_mobilePhoneGeneric.inc:77
 msgid "The IMEI number of the mobile phone"
 msgstr ""
 
-#: admin/systems/class_mobilePhoneGeneric.inc:86
+#: admin/systems/class_mobilePhoneGeneric.inc:82
 msgid "OS"
 msgstr ""
 
-#: admin/systems/class_mobilePhoneGeneric.inc:86
+#: admin/systems/class_mobilePhoneGeneric.inc:82
 msgid "The Operating System installed on this phone"
 msgstr ""
 
-#: admin/systems/class_mobilePhoneGeneric.inc:92
+#: admin/systems/class_mobilePhoneGeneric.inc:88
 msgid "SimCard"
 msgstr ""
 
-#: admin/systems/class_mobilePhoneGeneric.inc:95
+#: admin/systems/class_mobilePhoneGeneric.inc:91
 msgid "Telephone Number"
 msgstr ""
 
-#: admin/systems/class_mobilePhoneGeneric.inc:95
+#: admin/systems/class_mobilePhoneGeneric.inc:91
 msgid "The telephone number of the mobile phone"
 msgstr ""
 
-#: admin/systems/class_mobilePhoneGeneric.inc:99
+#: admin/systems/class_mobilePhoneGeneric.inc:95
 msgid "PUK Number"
 msgstr ""
 
-#: admin/systems/class_mobilePhoneGeneric.inc:99
+#: admin/systems/class_mobilePhoneGeneric.inc:95
 msgid "The PUK number of the simcard in this mobile phone"
 msgstr ""
 
@@ -1060,70 +637,20 @@ msgstr ""
 msgid "Remove service"
 msgstr ""
 
-#: admin/systems/phoneSelect/phoneSelect-list.xml:10
-msgid "Please select the desired entries"
-msgstr ""
-
-#: admin/systems/phoneSelect/phoneSelect-list.xml:56
-msgid "Number"
-msgstr ""
-
-#: admin/systems/phoneSelect/phoneSelect-list.xml:83
-msgid "Select this number"
-msgstr ""
-
-#: admin/systems/class_systemManagement.inc:177
-msgid "Back"
-msgstr "Quay láº¡i"
-
-#: admin/systems/class_systemManagement.inc:223
-msgid "Creating the image failed. Please see the report below."
-msgstr ""
-
-#: admin/systems/class_systemManagement.inc:228
-#, php-format
-msgid "Command '%s', specified for ISO creation doesn't seem to exist."
-msgstr ""
-
-#: admin/systems/class_systemManagement.inc:398
-#: admin/systems/class_systemManagement.inc:473
-#: admin/systems/class_systemManagement.inc:858
-#: admin/systems/class_systemManagement.inc:905
-#: admin/systems/class_systemManagement.inc:926
-msgid "Permission"
-msgstr "Cho phÃ©p"
-
-#: admin/systems/class_systemManagement.inc:678
-msgid "Cannot set mode to 'active'!"
-msgstr ""
-
-#: admin/systems/class_systemManagement.inc:858
-#, php-format
-msgid "You are not allowed to create a snapshot for %s."
-msgstr "Báº¡n khÃ´ng Ä‘Æ°á»£c phÃ©p táº¡o ra snapshot cho %s."
-
-#: admin/systems/class_systemManagement.inc:905
-#: admin/systems/class_systemManagement.inc:926
-#, php-format
-msgid "You are not allowed to restore a snapshot for %s."
-msgstr "Báº¡n khÃ´ng Ä‘Æ°á»£c phÃ©p phá»¥c há»“i má»™t snapshot cho %s."
-
-#: admin/systems/class_systemManagement.inc:1169
-#, php-format
-msgid "Inherited from %s"
-msgstr ""
-
-#: admin/systems/class_systemManagement.inc:1224
-#: admin/systems/class_systemManagement.inc:1228
-#: addons/dashboard/class_dashBoardSystems.inc:199
+#: admin/systems/class_systemManagement.inc:48
 #: config/systems/class_systemsPluginConfig.inc:28
 msgid "Systems"
 msgstr "CÃ¡c há»‡ thá»‘ng"
 
-#: admin/systems/class_systemManagement.inc:1225
+#: admin/systems/class_systemManagement.inc:49
 msgid "Systems Management"
 msgstr ""
 
+#: admin/systems/class_systemManagement.inc:250
+#, php-format
+msgid "Inherited from %s"
+msgstr ""
+
 #: admin/systems/services/terminal/class_serviceTerminal.inc:29
 #: admin/systems/services/terminal/class_serviceTerminal.inc:30
 #: admin/systems/services/terminal/class_serviceTerminal.inc:41
@@ -1161,6 +688,10 @@ msgstr ""
 msgid "Empty service"
 msgstr ""
 
+#: admin/systems/services/class_goService.inc:241
+msgid "Configuration error"
+msgstr "Lá»—i cáº¥u hÃ¬nh"
+
 #: admin/systems/services/shares/class_serviceShare.inc:30
 #: admin/systems/services/shares/class_serviceShare.inc:31
 msgid "Share service"
@@ -1219,8 +750,6 @@ msgid "You need to configure encodings first"
 msgstr ""
 
 #: admin/systems/services/shares/class_serviceShare.inc:110
-#: admin/ogroups/goto/termgroup.tpl.c:2 admin/systems/remove.tpl.c:2
-#: admin/systems/ppd/remove_ppd.tpl.c:2
 msgid "Warning"
 msgstr "Cáº£nh bÃ¡o"
 
@@ -1346,153 +875,93 @@ msgstr ""
 msgid "LDAP"
 msgstr "LDAP"
 
-#: admin/systems/class_networkSettings.inc:305
+#: admin/systems/class_networkSettings.inc:297
 msgid "NOT IMPLEMENTED"
 msgstr ""
 
-#: admin/systems/class_networkSettings.inc:437
+#: admin/systems/class_networkSettings.inc:429
 msgid "Not matching"
 msgstr ""
 
-#: admin/systems/class_networkSettings.inc:584
+#: admin/systems/class_networkSettings.inc:576
 #, php-format
 msgid "Was not able to contact argonaut server: %s"
 msgstr ""
 
-#: admin/systems/class_networkSettings.inc:591
+#: admin/systems/class_networkSettings.inc:583
 #, php-format
 msgid "Was not able to find DNS server for zone %s"
 msgstr ""
 
-#: admin/systems/class_networkSettings.inc:597
+#: admin/systems/class_networkSettings.inc:589
 #, php-format
 msgid "Was not able to find mac address of DNS server %s"
 msgstr ""
 
-#: admin/systems/class_networkSettings.inc:604
+#: admin/systems/class_networkSettings.inc:596
 #, php-format
 msgid "Was not able to launch ldap2zone: %s"
 msgstr ""
 
-#: admin/systems/class_networkSettings.inc:630
+#: admin/systems/class_networkSettings.inc:622
 #, php-format
 msgid "IP address %s"
 msgstr ""
 
-#: admin/systems/class_networkSettings.inc:638
-#: admin/systems/class_networkSettings.inc:651
-#: admin/systems/class_networkSettings.inc:653
-#: admin/systems/class_networkSettings.inc:1022
-msgid "IP address"
-msgstr ""
-
-#: admin/systems/class_networkSettings.inc:644
-#: admin/systems/class_networkSettings.inc:660
-#: admin/systems/class_networkSettings.inc:662
-#: admin/systems/class_networkSettings.inc:1023
+#: admin/systems/class_networkSettings.inc:636
+#: admin/systems/class_networkSettings.inc:652
+#: admin/systems/class_networkSettings.inc:654
+#: admin/systems/class_networkSettings.inc:1015
 msgid "MAC address"
 msgstr ""
 
-#: admin/systems/class_networkSettings.inc:676
+#: admin/systems/class_networkSettings.inc:668
 #, php-format
 msgid "The IP address '%s' is not part of the selected reverse zone '%s'!"
 msgstr ""
 
-#: admin/systems/class_networkSettings.inc:686
+#: admin/systems/class_networkSettings.inc:678
 #, php-format
 msgid "Record type '%s' is duplicated!"
 msgstr ""
 
-#: admin/systems/class_networkSettings.inc:693
+#: admin/systems/class_networkSettings.inc:685
 #, php-format
 msgid "Uniq record type '%s' is duplicated!"
 msgstr ""
 
-#: admin/systems/class_networkSettings.inc:705
+#: admin/systems/class_networkSettings.inc:697
 #, php-format
 msgid ""
 "The IP address '%s' will be added as 'A Record', this will be done "
 "automatically, please remove the record."
 msgstr ""
 
-#: admin/systems/class_networkSettings.inc:712
+#: admin/systems/class_networkSettings.inc:704
 #, php-format
 msgid "Only lowercase records are allowed, please check your '%ss'."
 msgstr ""
 
-#: admin/systems/class_networkSettings.inc:978
+#: admin/systems/class_networkSettings.inc:970
 msgid "Delete"
 msgstr "XÃ³a"
 
-#: admin/systems/class_networkSettings.inc:984
+#: admin/systems/class_networkSettings.inc:976
 msgid "Add"
 msgstr "ThÃªm vÃ o"
 
-#: admin/systems/class_networkSettings.inc:1015
-#: addons/dashboard/class_dashBoardNetwork.inc:127
+#: admin/systems/class_networkSettings.inc:1007
 msgid "Network"
 msgstr ""
 
-#: admin/systems/class_networkSettings.inc:1030
+#: admin/systems/class_networkSettings.inc:1022
 msgid "DNS configuration"
 msgstr ""
 
-#: admin/systems/class_networkSettings.inc:1033
+#: admin/systems/class_networkSettings.inc:1025
 msgid "DHCP configuration"
 msgstr ""
 
-#: addons/dashboard/class_dashBoardSystems.inc:45
-msgid "Workstations"
-msgstr ""
-
-#: addons/dashboard/class_dashBoardSystems.inc:51
-msgid "Windows Workstations"
-msgstr ""
-
-#: addons/dashboard/class_dashBoardSystems.inc:54
-msgid "Terminals"
-msgstr ""
-
-#: addons/dashboard/class_dashBoardSystems.inc:57
-msgid "Printers"
-msgstr ""
-
-#: addons/dashboard/class_dashBoardSystems.inc:60
-msgid "Phones"
-msgstr ""
-
-#: addons/dashboard/class_dashBoardSystems.inc:63
-msgid "Components"
-msgstr ""
-
-#: addons/dashboard/class_dashBoardSystems.inc:66
-msgid "Mobile phones"
-msgstr ""
-
-#: addons/dashboard/class_dashBoardSystems.inc:183
-msgid "Statistics"
-msgstr ""
-
-#: addons/dashboard/class_dashBoardSystems.inc:188
-msgid "Computer name to use by unit"
-msgstr ""
-
-#: addons/dashboard/class_dashBoardSystems.inc:200
-msgid "Statistics and informations about systems"
-msgstr ""
-
-#: addons/dashboard/class_dashBoardNetwork.inc:111
-msgid "DHCP"
-msgstr ""
-
-#: addons/dashboard/class_dashBoardNetwork.inc:116
-msgid "DNS"
-msgstr ""
-
-#: addons/dashboard/class_dashBoardNetwork.inc:128
-msgid "Statistics and various informations"
-msgstr ""
-
 #: config/systems/class_systemsPluginConfig.inc:29
 msgid "Systems plugin configuration"
 msgstr ""
@@ -1584,402 +1053,3 @@ msgstr ""
 #: config/systems/class_systemsPluginConfig.inc:101
 msgid "Encodings"
 msgstr ""
-
-#: admin/ogroups/goto/termgroup.tpl.c:5
-msgid ""
-"Actions you choose here influence all systems in this object group. "
-"Additionally, all values editable here can be inherited by the clients "
-"assigned to this object group."
-msgstr ""
-
-#: admin/ogroups/goto/termgroup.tpl.c:8
-msgid "Generic"
-msgstr "ThÃ´ng tin chung"
-
-#: admin/ogroups/goto/termgroup.tpl.c:11
-msgid "NTP server"
-msgstr ""
-
-#: admin/ogroups/goto/termgroup.tpl.c:14
-msgid "Choose server to use for synchronizing time"
-msgstr ""
-
-#: admin/ogroups/goto/termgroup.tpl.c:20
-msgid "Select terminal mode"
-msgstr ""
-
-#: admin/ogroups/goto/termgroup.tpl.c:26
-msgid "Choose server to use for logging"
-msgstr ""
-
-#: admin/ogroups/goto/termgroup.tpl.c:32
-msgid "Select NFS root filesystem to use"
-msgstr ""
-
-#: admin/ogroups/goto/termgroup.tpl.c:38
-msgid "Choose NFS filesystem to place swap files on"
-msgstr ""
-
-#: admin/ogroups/goto/termgroup.tpl.c:47
-msgid "Execute"
-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 admin/systems/network.tpl.c:11
-msgid "Propose ip"
-msgstr ""
-
-#: admin/systems/network.tpl.c:14
-msgid "MAC-address"
-msgstr ""
-
-#: admin/systems/network.tpl.c:17
-msgid "Autodetect"
-msgstr ""
-
-#: admin/systems/network.tpl.c:20 admin/systems/network.tpl.c:23
-msgid "Enable DHCP for this device"
-msgstr ""
-
-#: admin/systems/network.tpl.c:26 admin/systems/network.tpl.c:50
-msgid "not configured"
-msgstr ""
-
-#: admin/systems/network.tpl.c:29
-msgid "Parent node"
-msgstr ""
-
-#: admin/systems/network.tpl.c:32
-msgid "Edit settings"
-msgstr ""
-
-#: admin/systems/network.tpl.c:35 admin/systems/network.tpl.c:47
-msgid "Enable DNS for this device"
-msgstr ""
-
-#: admin/systems/network.tpl.c:38
-msgid "Zone"
-msgstr ""
-
-#: admin/systems/network.tpl.c:41
-msgid "TTL"
-msgstr ""
-
-#: admin/systems/network.tpl.c:44
-msgid "Dns records"
-msgstr ""
-
-#: admin/systems/password.tpl.c:2
-msgid ""
-"To change the terminal root password use the fields below. The changes take "
-"effect during the next reboot. Please memorize the new password, because you"
-" wouldn't be able to log in."
-msgstr ""
-
-#: admin/systems/password.tpl.c:5
-msgid "Leave fields blank for password inheritance from default entries."
-msgstr ""
-
-#: admin/systems/password.tpl.c:8
-msgid "Changing the password impinges on authentification only."
-msgstr ""
-
-#: admin/systems/password.tpl.c:11
-msgid "New password"
-msgstr "Máºt kháº©u má»›i"
-
-#: admin/systems/password.tpl.c:14
-msgid "Repeat new password"
-msgstr "Láº·p láº¡i máºt kháº©u má»›i"
-
-#: admin/systems/password.tpl.c:17
-msgid "Password strength"
-msgstr "Æ¯u Ä‘iá»ƒm cá»§a máºt kháº©u"
-
-#: admin/systems/password.tpl.c:20
-msgid "Set password"
-msgstr "Äáº·t máºt kháº©u"
-
-#: 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/gencd.tpl.c:2
-msgid "CD-Install-Image generation"
-msgstr ""
-
-#: admin/systems/gencd.tpl.c:5
-msgid ""
-"This option enables you to generate FAI install CD images for the selected "
-"workstation. The procedure may take about 10 minutes to complete, so please "
-"be patient after pressing the 'Create ISO-Image' button."
-msgstr ""
-
-#: admin/systems/gencd.tpl.c:8
-msgid "Create ISO-Image"
-msgstr ""
-
-#: admin/systems/remove.tpl.c:5
-msgid ""
-"This includes all account data, system access rules, imap settings, etc. for"
-" this user. Please double check if your really want to do this since there "
-"is no way for FusionDirectory to get your data back."
-msgstr ""
-
-#: admin/systems/remove.tpl.c:8
-msgid "So - if you're sure - press 'Delete' to continue or 'Cancel' to abort."
-msgstr "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/system-filter.tpl.c:2
-#: admin/systems/phoneSelect/phoneSelect-filter.tpl.c:2
-msgid "Filter"
-msgstr ""
-
-#: admin/systems/system-filter.tpl.c:5
-msgid "Show servers"
-msgstr ""
-
-#: admin/systems/system-filter.tpl.c:8
-msgid "Show workstations"
-msgstr ""
-
-#: admin/systems/system-filter.tpl.c:11
-msgid "Show terminals"
-msgstr ""
-
-#: admin/systems/system-filter.tpl.c:14
-msgid "Show network printer"
-msgstr ""
-
-#: admin/systems/system-filter.tpl.c:17
-#: admin/systems/phoneSelect/phoneSelect-filter.tpl.c:5
-msgid "Show phones"
-msgstr ""
-
-#: admin/systems/system-filter.tpl.c:20
-msgid "Show windows based workstations"
-msgstr ""
-
-#: admin/systems/system-filter.tpl.c:23
-msgid "Show network devices"
-msgstr ""
-
-#: admin/systems/system-filter.tpl.c:26
-#: admin/systems/phoneSelect/phoneSelect-filter.tpl.c:8
-msgid "Show mobile phones"
-msgstr ""
-
-#: admin/systems/system-filter.tpl.c:29
-msgid "Show IPMI interfaces"
-msgstr ""
-
-#: admin/systems/ppd/printerPPDSelectionDialog.tpl.c:2
-msgid "Select objects to add"
-msgstr "Chá»n nhÃ³m Ä‘á»‘i tÆ°á»£ng Ä‘á»ƒ thÃªm vÃ o"
-
-#: admin/systems/ppd/printerPPDSelectionDialog.tpl.c:5
-msgid "Filters"
-msgstr "CÃ¡c bá»™ lá»c"
-
-#: admin/systems/ppd/printerPPDSelectionDialog.tpl.c:8
-msgid "Display objects matching"
-msgstr "Hiá»ƒn thá»‹ viá»‡c khá»›p cÃ¡c Ä‘á»‘i tÆ°á»£ng"
-
-#: admin/systems/ppd/printerPPDSelectionDialog.tpl.c:11
-msgid "Regular expression for matching object names"
-msgstr "Hiá»ƒn thá»‹ thÃ´ng thÆ°á»ng cho viá»‡c khá»›p tÃªn cÃ¡c Ä‘á»‘i tÆ°á»£ng"
-
-#: admin/systems/ppd/printerPPDSelectionDialog.tpl.c:14
-msgid "Close"
-msgstr "ÄÃ³ng"
-
-#: admin/systems/ppd/printerPPDDialog.tpl.c:2
-msgid "Printer driver"
-msgstr ""
-
-#: admin/systems/ppd/printerPPDDialog.tpl.c:5
-msgid "Model"
-msgstr ""
-
-#: admin/systems/ppd/printerPPDDialog.tpl.c:8
-msgid "Select"
-msgstr ""
-
-#: admin/systems/ppd/printerPPDDialog.tpl.c:11
-msgid "New driver"
-msgstr ""
-
-#: admin/systems/ppd/printerPPDDialog.tpl.c:14
-msgid "Upload"
-msgstr ""
-
-#: admin/systems/ppd/printerPPDDialog.tpl.c:17
-msgid "Options"
-msgstr ""
-
-#: admin/systems/ppd/remove_ppd.tpl.c:5
-msgid "The ppd file will be removed from the server and can not be restored."
-msgstr ""
-
-#: admin/systems/printer.tpl.c:2
-msgid "General"
-msgstr ""
-
-#: admin/systems/printer.tpl.c:5
-msgid "Printer name"
-msgstr ""
-
-#: admin/systems/printer.tpl.c:14
-msgid "Details"
-msgstr ""
-
-#: admin/systems/printer.tpl.c:20
-msgid "Printer location"
-msgstr ""
-
-#: admin/systems/printer.tpl.c:26
-msgid "PPD Provider"
-msgstr ""
-
-#: admin/systems/printer.tpl.c:29
-msgid "Driver"
-msgstr ""
-
-#: admin/systems/printer.tpl.c:32
-msgid "Edit"
-msgstr "Hiá»‡u chá»‰nh"
-
-#: admin/systems/printer.tpl.c:41
-msgid "Users which are allowed to use this printer"
-msgstr ""
-
-#: admin/systems/printer.tpl.c:44
-msgid "Users"
-msgstr "NgÆ°á»i dÃ¹ng"
-
-#: admin/systems/printer.tpl.c:47
-msgid "Users which are allowed to administrate this printer"
-msgstr ""
-
-#: admin/systems/printer.tpl.c:50
-msgid "Admins"
-msgstr ""
-
-#: admin/systems/printer.tpl.c:53
-msgid "Windows paths"
-msgstr ""
-
-#: admin/systems/printer.tpl.c:56
-msgid "Printer windows inf file"
-msgstr ""
-
-#: admin/systems/printer.tpl.c:59
-msgid "Printer driver directory"
-msgstr ""
-
-#: admin/systems/gencd_frame.tpl.c:2
-msgid "Your browser does not supprt iframes."
-msgstr ""
-
-#: admin/systems/services/cups/serviceCUPS.tpl.c:2
-msgid "Print Service"
-msgstr ""
-
-#: admin/systems/services/cups/serviceCUPS.tpl.c:5
-msgid "enabled"
-msgstr ""
-
-#: admin/systems/services/ServiceAddDialog.tpl.c:2
-msgid "Adding a new service to the current server"
-msgstr ""
-
-#: admin/systems/services/ServiceAddDialog.tpl.c:5
-msgid ""
-"This dialog allows you to add new services to the currenty edited server "
-"object. The box below shows all available but not already used services."
-msgstr ""
-
-#: admin/systems/services/ServiceAddDialog.tpl.c:8
-msgid "Service to add"
-msgstr ""
-
-#: admin/systems/services/ServiceAddDialog.tpl.c:11
-msgid "All available services are already in use."
-msgstr ""
-
-#: admin/systems/services/ServiceAddDialog.tpl.c:14
-#: admin/systems/SelectDeviceType.tpl.c:26
-msgid "Continue"
-msgstr "Tiáº¿p tá»¥c"
-
-#: admin/systems/SelectDeviceType.tpl.c:2
-msgid ""
-"This system has no system type configured. Please choose a system type for "
-"this object and an optional inheritance group. Press the 'continue' button "
-"to proceed."
-msgstr ""
-
-#: admin/systems/SelectDeviceType.tpl.c:5
-msgid ""
-"Please select a system type and an optional bundle of predefined settings to"
-" be inherited."
-msgstr ""
-
-#: admin/systems/SelectDeviceType.tpl.c:8
-msgid ""
-"Please select a system type and a bundle of predefined settings to be "
-"inherited."
-msgstr ""
-
-#: admin/systems/SelectDeviceType.tpl.c:11
-#: admin/systems/SelectDeviceType.tpl.c:14
-msgid "System type"
-msgstr ""
-
-#: admin/systems/SelectDeviceType.tpl.c:17
-msgid "Choose an object group as template"
-msgstr ""
-
-#: admin/systems/SelectDeviceType.tpl.c:20
-msgid "Object group"
-msgstr "NhÃ³m Ä‘á»‘i tÆ°á»£ng"
-
-#: admin/systems/SelectDeviceType.tpl.c:23
-msgid "none"
-msgstr "khÃ´ng cÃ³"
-
-#: addons/dashboard/systems_stats.tpl.c:2
-msgid "There are several argonaut servers! (this is not yet supported)"
-msgstr ""
-
-#: addons/dashboard/systems_stats.tpl.c:5
-msgid "There is an argonaut server running on %1 (%3://%2:%4)"
-msgstr ""
-
-#: addons/dashboard/systems_stats.tpl.c:8
-msgid "Only one system is configured to run an argonaut client."
-msgid_plural "%1 systems are configured to run an argonaut client."
-msgstr[0] ""
-
-#: addons/dashboard/systems_stats.tpl.c:11
-msgid "But no system is configured to run an argonaut client!"
-msgstr ""
-
-#: addons/dashboard/systems_stats.tpl.c:14
-msgid ""
-"A system is configured to run an argonaut client, but there is no argonaut "
-"server configured!"
-msgid_plural ""
-"%1 systems are configured to run an argonaut client, but there is no "
-"argonaut server configured!"
-msgstr[0] ""
diff --git a/systems/locale/zh/fusiondirectory.po b/systems/locale/zh/fusiondirectory.po
index 93c4e9f21fcad9c45d6f0a286ce5c6dc91e0f350..732a547dd5fab617424625abc3ad1d57e0762458 100644
--- a/systems/locale/zh/fusiondirectory.po
+++ b/systems/locale/zh/fusiondirectory.po
@@ -3,15 +3,14 @@
 # This file is distributed under the same license as the PACKAGE package.
 # 
 # Translators:
-#  Jiang Xin <worldhello.net@gmail.com>, 2007
 msgid ""
 msgstr ""
-"Project-Id-Version: FusionDirectory-108\n"
+"Project-Id-Version: FusionDirectory-109\n"
 "Report-Msgid-Bugs-To: documentation@lists.fusiondirectory.org\n"
-"POT-Creation-Date: 2015-03-31 11:49+0200\n"
-"PO-Revision-Date: 2015-03-31 11:24+0000\n"
+"POT-Creation-Date: 2014-12-15 17:47+0100\n"
+"PO-Revision-Date: 2015-02-25 16:13+0000\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>\n"
-"Language-Team: Chinese (http://www.transifex.com/projects/p/FusionDirectory-108/language/zh/)\n"
+"Language-Team: Chinese (http://www.transifex.com/projects/p/FusionDirectory-109/language/zh/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -27,29 +26,24 @@ msgid "Locked"
 msgstr "é”å®š"
 
 #: admin/ogroups/goto/class_termgroup.inc:118
-#: admin/systems/class_terminalGeneric.inc:121
+#: admin/systems/class_terminalStartup.inc:145
 msgid "Local swap"
 msgstr ""
 
 #: admin/ogroups/goto/class_termgroup.inc:124
 #: admin/ogroups/goto/class_termgroup.inc:136
-#: admin/systems/class_workstationGeneric.inc:352
-#: admin/systems/class_terminalGeneric.inc:109
-#: admin/systems/class_terminalGeneric.inc:125
+#: admin/systems/class_terminalStartup.inc:133
+#: admin/systems/class_terminalStartup.inc:149
 msgid "inherited"
 msgstr "ç»§æ‰¿"
 
 #: admin/ogroups/goto/class_termgroup.inc:220
-#: admin/systems/class_workstationGeneric.inc:72
-#: admin/systems/class_workstationGeneric.inc:443
-#: admin/systems/class_systemManagement.inc:295
-#: admin/systems/class_systemManagement.inc:325
-msgid "Infrastructure service"
+#: admin/systems/class_systemManagement.inc:165
+#: admin/systems/class_systemManagement.inc:186
+msgid "Service infrastructure"
 msgstr ""
 
 #: admin/ogroups/goto/class_termgroup.inc:224
-#: admin/systems/class_workstationGeneric.inc:75
-#: admin/systems/class_workstationGeneric.inc:78
 msgid "Event error"
 msgstr ""
 
@@ -59,12 +53,10 @@ msgid "Event '%s' is not available!"
 msgstr ""
 
 #: admin/ogroups/goto/class_termgroup.inc:274
-#: admin/systems/class_workstationGeneric.inc:112
 msgid "Switch off"
 msgstr "å…³é—"
 
 #: admin/ogroups/goto/class_termgroup.inc:274
-#: admin/systems/class_workstationGeneric.inc:113
 msgid "Reboot"
 msgstr "é‡å¯"
 
@@ -85,7 +77,6 @@ msgid "Reinstall"
 msgstr "é‡æ–°å®‰è£…"
 
 #: admin/ogroups/goto/class_termgroup.inc:279
-#: admin/systems/class_workstationGeneric.inc:108
 msgid "Memory test"
 msgstr "å†…å˜æµ‹è¯•"
 
@@ -94,21 +85,18 @@ msgid "System analysis"
 msgstr "ç³»ç»Ÿåˆ†æž"
 
 #: admin/ogroups/goto/class_termgroup.inc:386
-#: admin/systems/class_printGeneric.inc:670
-#: admin/systems/class_printGeneric.inc:970
-#: admin/systems/class_systemManagement.inc:816
 #: admin/systems/services/class_goService.inc:123
 #: admin/systems/services/class_goService.inc:151
 #: admin/systems/services/class_goService.inc:187
-#: admin/systems/class_networkSettings.inc:478
-#: admin/systems/class_networkSettings.inc:491
-#: admin/systems/class_networkSettings.inc:757
-#: admin/systems/class_networkSettings.inc:816
-#: admin/systems/class_networkSettings.inc:835
-#: admin/systems/class_networkSettings.inc:852
-#: admin/systems/class_networkSettings.inc:861
-#: admin/systems/class_networkSettings.inc:879
-#: admin/systems/class_networkSettings.inc:951
+#: admin/systems/class_networkSettings.inc:470
+#: admin/systems/class_networkSettings.inc:483
+#: admin/systems/class_networkSettings.inc:749
+#: admin/systems/class_networkSettings.inc:808
+#: admin/systems/class_networkSettings.inc:827
+#: admin/systems/class_networkSettings.inc:844
+#: admin/systems/class_networkSettings.inc:853
+#: admin/systems/class_networkSettings.inc:871
+#: admin/systems/class_networkSettings.inc:943
 msgid "LDAP error"
 msgstr "LDAP é”™è¯¯"
 
@@ -120,195 +108,125 @@ msgstr "ç³»ç»Ÿ"
 msgid "System group"
 msgstr ""
 
-#: admin/ogroups/goto/class_termgroup.inc:401
-#: admin/ogroups/goto/termgroup.tpl.c:17
+#: admin/ogroups/goto/class_termgroup.inc:402
 msgid "Mode"
 msgstr "æ¨¡å¼"
 
-#: admin/ogroups/goto/class_termgroup.inc:402
-#: admin/systems/class_workstationGeneric.inc:189
-#: admin/ogroups/goto/termgroup.tpl.c:23
+#: admin/ogroups/goto/class_termgroup.inc:403
+#: admin/systems/class_systemServers.inc:35
 msgid "Syslog server"
 msgstr "æ—¥å¿—æœåŠ¡å™¨"
 
-#: admin/ogroups/goto/class_termgroup.inc:403
+#: admin/ogroups/goto/class_termgroup.inc:404
 msgid "Action flag"
 msgstr ""
 
-#: admin/ogroups/goto/class_termgroup.inc:404
+#: admin/ogroups/goto/class_termgroup.inc:405
 msgid "Ntp server"
 msgstr "NTP æœåŠ¡å™¨"
 
-#: admin/ogroups/goto/class_termgroup.inc:405
-#: admin/systems/class_terminalGeneric.inc:41
-#: admin/ogroups/goto/termgroup.tpl.c:29
+#: admin/ogroups/goto/class_termgroup.inc:406
+#: admin/systems/class_terminalStartup.inc:65
 msgid "Root server"
 msgstr "æ ¹æœåŠ¡å™¨"
 
-#: admin/ogroups/goto/class_termgroup.inc:406
-#: admin/systems/class_terminalGeneric.inc:47
-#: admin/ogroups/goto/termgroup.tpl.c:35
+#: admin/ogroups/goto/class_termgroup.inc:407
+#: admin/systems/class_terminalStartup.inc:69
 msgid "Swap server"
 msgstr "äº¤æ¢æœåŠ¡å™¨"
 
-#: admin/systems/class_terminalStartup.inc:63
+#: admin/systems/class_terminalStartup.inc:62
 msgid "Startup parameters"
 msgstr ""
 
-#: admin/systems/class_terminalStartup.inc:66
+#: admin/systems/class_terminalStartup.inc:65
+msgid "The root server the terminal should be using"
+msgstr ""
+
+#: admin/systems/class_terminalStartup.inc:69
+msgid "The swap server the terminal should be using"
+msgstr ""
+
+#: admin/systems/class_terminalStartup.inc:73
 msgid "Boot kernel"
 msgstr "å¯åŠ¨å†…æ ¸"
 
-#: admin/systems/class_terminalStartup.inc:66
+#: admin/systems/class_terminalStartup.inc:73
 msgid "Linux kernel to be installed and booted"
 msgstr ""
 
-#: admin/systems/class_terminalStartup.inc:70
+#: admin/systems/class_terminalStartup.inc:77
 msgid "Boot kernel parameters"
 msgstr ""
 
-#: admin/systems/class_terminalStartup.inc:70
+#: admin/systems/class_terminalStartup.inc:77
 msgid "Linux kernel parameters to be ran"
 msgstr ""
 
-#: admin/systems/class_terminalStartup.inc:82
-msgid "Startup"
-msgstr "å¯åŠ¨"
-
 #: admin/systems/class_terminalStartup.inc:83
-msgid "Terminal startup"
-msgstr ""
-
-#: admin/systems/system-list.xml:10
-msgid "List of systems"
-msgstr "ç³»ç»Ÿåˆ—è¡¨"
-
-#: admin/systems/system-list.xml:14
-msgid "New workstation"
-msgstr "æ–°å·¥ä½œç«™"
+msgid "Remote desktop"
+msgstr "è¿œç¨‹æ¡Œé¢"
 
-#: admin/systems/system-list.xml:22
-msgid "Locked server"
-msgstr ""
+#: admin/systems/class_terminalStartup.inc:87
+msgid "Connect method"
+msgstr "è¿žæŽ¥æ–¹æ³•"
 
-#: admin/systems/system-list.xml:30
-msgid "Locked workstation"
+#: admin/systems/class_terminalStartup.inc:91
+msgid "XDMCP"
 msgstr ""
 
-#: admin/systems/system-list.xml:38
-msgid "Locked terminal"
+#: admin/systems/class_terminalStartup.inc:91
+msgid "LDM"
 msgstr ""
 
-#: admin/systems/system-list.xml:47
-msgid "New terminal"
-msgstr "æ–°ç»ˆç«¯"
+#: admin/systems/class_terminalStartup.inc:91
+msgid "Shell"
+msgstr "Shell"
 
-#: admin/systems/system-list.xml:55
-msgid "New device"
+#: admin/systems/class_terminalStartup.inc:91
+msgid "Telnet"
 msgstr ""
 
-#: admin/systems/system-list.xml:63
-msgid "Workstation template"
-msgstr "å·¥ä½œç«™æ¨¡æ¿"
-
-#: admin/systems/system-list.xml:71
-msgid "Terminal template"
-msgstr "ç»ˆç«¯æ¨¡æ¿"
-
-#: admin/systems/system-list.xml:79
-msgid "Winstation"
-msgstr "Windows å·¥ä½œç«™"
-
-#: admin/systems/system-list.xml:87 admin/systems/system-list.xml:234
-#: admin/systems/class_systemImport.inc:169
-#: admin/systems/class_serverGeneric.inc:46
-#: admin/systems/class_serverGeneric.inc:51
-#: admin/systems/class_serverGeneric.inc:52
-#: admin/systems/class_SelectDeviceType.inc:58
-msgid "Server"
-msgstr "æœåŠ¡å™¨"
-
-#: admin/systems/system-list.xml:95 admin/systems/system-list.xml:242
-#: admin/systems/class_workstationGeneric.inc:458
-#: admin/systems/class_workstationGeneric.inc:463
-#: admin/systems/class_workstationGeneric.inc:464
-#: admin/systems/class_SelectDeviceType.inc:58
-msgid "Workstation"
-msgstr "å·¥ä½œç«™"
-
-#: admin/systems/system-list.xml:103 admin/systems/system-list.xml:250
-#: admin/systems/class_terminalGeneric.inc:81
-#: admin/systems/class_terminalGeneric.inc:86
-#: admin/systems/class_terminalGeneric.inc:87
-#: admin/systems/class_SelectDeviceType.inc:58
-msgid "Terminal"
-msgstr "ç»ˆç«¯"
-
-#: admin/systems/system-list.xml:111 admin/systems/class_printGeneric.inc:1005
-#: admin/systems/class_printGeneric.inc:1011
-#: admin/systems/class_printGeneric.inc:1012
-msgid "Printer"
-msgstr "æ‰“å°æœº"
-
-#: admin/systems/system-list.xml:119 admin/systems/system-list.xml:274
-#: admin/systems/class_mobilePhoneGeneric.inc:74
-#: admin/systems/phoneSelect/phoneSelect-list.xml:14
-msgid "Phone"
-msgstr "ç”µè¯"
-
-#: admin/systems/system-list.xml:127
-#: admin/systems/class_mobilePhoneGeneric.inc:36
-#: admin/systems/class_mobilePhoneGeneric.inc:41
-#: admin/systems/class_mobilePhoneGeneric.inc:42
-#: admin/systems/phoneSelect/phoneSelect-list.xml:22
-msgid "Mobile phone"
-msgstr "ç§»åŠ¨ç”µè¯"
+#: admin/systems/class_terminalStartup.inc:91
+msgid "Windows RDP"
+msgstr "Windows RDP"
 
-#: admin/systems/system-list.xml:135
-#: admin/systems/class_componentGeneric.inc:36
-msgid "Component"
-msgstr ""
+#: admin/systems/class_terminalStartup.inc:95
+msgid "Terminal server"
+msgstr "ç»ˆç«¯æœåŠ¡å™¨"
 
-#: admin/systems/system-list.xml:143 admin/systems/system-list.xml:298
-msgid "IPMI"
-msgstr ""
+#: admin/systems/system-list.xml:10
+msgid "List of systems"
+msgstr "ç³»ç»Ÿåˆ—è¡¨"
 
-#: admin/systems/system-list.xml:169
-#: admin/systems/class_workstationGeneric.inc:154
-#: admin/systems/class_printGeneric.inc:752
-#: admin/systems/class_printGeneric.inc:762
-#: admin/systems/class_printGeneric.inc:781
-#: admin/systems/class_printGeneric.inc:1022
-#: admin/systems/class_componentGeneric.inc:64
-#: admin/systems/class_mobilePhoneGeneric.inc:63
-#: admin/systems/phoneSelect/phoneSelect-list.xml:48
+#: admin/systems/system-list.xml:31
+#: admin/systems/class_workstationGeneric.inc:46
+#: admin/systems/class_printGeneric.inc:60
+#: admin/systems/class_componentGeneric.inc:58
+#: admin/systems/class_mobilePhoneGeneric.inc:60
 #: admin/systems/services/shares/class_serviceShare.inc:52
-#: admin/systems/system-filter.tpl.c:32
-#: admin/systems/phoneSelect/phoneSelect-filter.tpl.c:11
 msgid "Name"
 msgstr "åç§°"
 
-#: admin/systems/system-list.xml:177
-#: admin/systems/phoneSelect/phoneSelect-list.xml:63
+#: admin/systems/system-list.xml:39
 msgid "IP"
 msgstr ""
 
-#: admin/systems/system-list.xml:185
+#: admin/systems/system-list.xml:47
 msgid "MAC"
 msgstr ""
 
-#: admin/systems/system-list.xml:193
-#: admin/systems/class_workstationGeneric.inc:160
-#: admin/systems/class_printGeneric.inc:1024
-#: admin/systems/class_componentGeneric.inc:68
-#: admin/systems/class_mobilePhoneGeneric.inc:67
+#: admin/systems/system-list.xml:55
+#: admin/systems/class_workstationGeneric.inc:51
+#: admin/systems/class_printGeneric.inc:64
+#: admin/systems/class_componentGeneric.inc:62
+#: admin/systems/class_mobilePhoneGeneric.inc:64
 #: admin/systems/serverService-list.xml:35
 #: admin/systems/services/shares/class_serviceShare.inc:56
-#: admin/systems/printer.tpl.c:8 admin/systems/printer.tpl.c:17
 msgid "Description"
 msgstr "æè¿°"
 
-#: admin/systems/system-list.xml:201 admin/systems/class_serverService.inc:57
+#: admin/systems/system-list.xml:63 admin/systems/class_serverService.inc:57
 #: admin/systems/services/terminal/class_serviceTerminal.inc:30
 #: admin/systems/services/cups/class_serviceCUPS.inc:85
 #: admin/systems/services/shares/class_serviceShare.inc:31
@@ -317,378 +235,186 @@ msgstr "æè¿°"
 msgid "Services"
 msgstr "æœåŠ¡"
 
-#: admin/systems/system-list.xml:209
+#: admin/systems/system-list.xml:71
 msgid "Release"
 msgstr "å‘è¡Œ"
 
-#: admin/systems/system-list.xml:217 admin/systems/serverService-list.xml:43
-#: admin/systems/phoneSelect/phoneSelect-list.xml:70
+#: admin/systems/system-list.xml:79 admin/systems/serverService-list.xml:43
 msgid "Actions"
 msgstr "åŠ¨ä½œ"
 
-#: admin/systems/system-list.xml:228 admin/systems/serverService-list.xml:54
+#: admin/systems/system-list.xml:90 admin/systems/serverService-list.xml:54
 msgid "Create"
 msgstr "åˆ›å»º"
 
-#: admin/systems/system-list.xml:258
-msgid "winStation"
-msgstr ""
-
-#: admin/systems/system-list.xml:266
-msgid "Network printer"
-msgstr "ç½‘ç»œæ‰“å°æœº"
-
-#: admin/systems/system-list.xml:282
-#: admin/systems/class_componentGeneric.inc:41
-#: admin/systems/class_componentGeneric.inc:42
-msgid "Network device"
-msgstr ""
-
-#: admin/systems/system-list.xml:290
-msgid "Mobile Phone"
-msgstr ""
-
-#: admin/systems/system-list.xml:310
+#: admin/systems/system-list.xml:100
 msgid "Trigger action"
 msgstr ""
 
-#: admin/systems/system-list.xml:317
+#: admin/systems/system-list.xml:107
 msgid "Schedule action"
 msgstr ""
 
-#: admin/systems/system-list.xml:330
-msgid "Activate systems"
-msgstr ""
-
-#: admin/systems/system-list.xml:337 admin/systems/serverService-list.xml:69
-#: admin/systems/printer.tpl.c:35
+#: admin/systems/system-list.xml:119 admin/systems/serverService-list.xml:69
 msgid "Remove"
 msgstr "åˆ é™¤"
 
-#: admin/systems/system-list.xml:367
-msgid "Create ISO"
-msgstr ""
-
-#: admin/systems/system-list.xml:379
+#: admin/systems/system-list.xml:150
 msgid "Edit system"
 msgstr ""
 
-#: admin/systems/system-list.xml:392
+#: admin/systems/system-list.xml:163
 msgid "Remove system"
 msgstr ""
 
-#: admin/systems/class_workstationGeneric.inc:75
-#, php-format
-msgid "Event %s is not available!"
-msgstr ""
-
-#: admin/systems/class_workstationGeneric.inc:78
-msgid "Events are not available!"
-msgstr ""
-
-#: admin/systems/class_workstationGeneric.inc:106
-msgid "(Re)Install"
-msgstr ""
-
-#: admin/systems/class_workstationGeneric.inc:107
-msgid "Software update"
-msgstr ""
-
-#: admin/systems/class_workstationGeneric.inc:115
-msgid "Wake up"
-msgstr "å”¤é†’"
-
-#: admin/systems/class_workstationGeneric.inc:144
-#: admin/systems/class_printGeneric.inc:604
+#: admin/systems/class_workstationGeneric.inc:35
 msgid "workstation"
 msgstr ""
 
-#: admin/systems/class_workstationGeneric.inc:151
-#: admin/systems/class_componentGeneric.inc:61
-#: admin/systems/class_mobilePhoneGeneric.inc:60
+#: admin/systems/class_workstationGeneric.inc:42
+#: admin/systems/class_printGeneric.inc:56
+#: admin/systems/class_componentGeneric.inc:55
+#: admin/systems/class_mobilePhoneGeneric.inc:56
 msgid "Properties"
 msgstr "å±žæ€§"
 
-#: admin/systems/class_workstationGeneric.inc:155
+#: admin/systems/class_workstationGeneric.inc:47
 #, php-format
 msgid "The name of the %s"
 msgstr ""
 
-#: admin/systems/class_workstationGeneric.inc:161
+#: admin/systems/class_workstationGeneric.inc:52
 #, php-format
 msgid "A short description of the %s"
 msgstr ""
 
-#: admin/systems/class_workstationGeneric.inc:166
-#: admin/systems/class_printGeneric.inc:1025
+#: admin/systems/class_workstationGeneric.inc:56
 msgid "Location"
 msgstr "ä½ç½®"
 
-#: admin/systems/class_workstationGeneric.inc:167
+#: admin/systems/class_workstationGeneric.inc:57
 #, php-format
 msgid "The location of the %s"
 msgstr ""
 
-#: admin/systems/class_workstationGeneric.inc:173
+#: admin/systems/class_workstationGeneric.inc:61
 #, php-format
 msgid "Lock this %s"
 msgstr ""
 
-#: admin/systems/class_workstationGeneric.inc:174
+#: admin/systems/class_workstationGeneric.inc:62
 #, php-format
 msgid "This will prevent the %s from being reinstalled"
 msgstr ""
 
-#: admin/systems/class_workstationGeneric.inc:185
-#: addons/dashboard/class_dashBoardSystems.inc:48
-msgid "Servers"
-msgstr "æœåŠ¡å™¨"
-
-#: admin/systems/class_workstationGeneric.inc:190
-#, php-format
-msgid "The syslog server the %s should be using"
-msgstr ""
-
-#: admin/systems/class_workstationGeneric.inc:195
-msgid "Inherit NTP servers"
-msgstr ""
-
-#: admin/systems/class_workstationGeneric.inc:196
-msgid "Inherit time server attributes from ogroup"
+#: admin/systems/class_workstationGeneric.inc:73
+#: admin/systems/class_printGeneric.inc:83
+#: admin/systems/class_componentGeneric.inc:69
+#: admin/systems/class_mobilePhoneGeneric.inc:102
+#: admin/systems/class_networkSettings.inc:1008
+msgid "Network settings"
 msgstr ""
 
-#: admin/systems/class_workstationGeneric.inc:202
-msgid "NTP servers"
+#: admin/systems/class_workstationGeneric.inc:78
+#: admin/systems/class_printGeneric.inc:87
+#: admin/systems/class_componentGeneric.inc:73
+#: admin/systems/class_mobilePhoneGeneric.inc:106
+#: admin/systems/class_networkSettings.inc:630
+#: admin/systems/class_networkSettings.inc:643
+#: admin/systems/class_networkSettings.inc:645
+#: admin/systems/class_networkSettings.inc:1014
+msgid "IP address"
 msgstr ""
 
-#: admin/systems/class_workstationGeneric.inc:203
-#, php-format
-msgid "The NTP servers for the %s"
+#: admin/systems/class_workstationGeneric.inc:78
+msgid "IP addresses this system uses (v4 or v6)"
 msgstr ""
 
-#: admin/systems/class_workstationGeneric.inc:209
-msgid "Inherit LDAP servers"
+#: admin/systems/class_workstationGeneric.inc:83
+#: admin/systems/class_printGeneric.inc:91
+#: admin/systems/class_componentGeneric.inc:77
+#: admin/systems/class_mobilePhoneGeneric.inc:110
+msgid "Mac address"
 msgstr ""
 
-#: admin/systems/class_workstationGeneric.inc:210
-msgid "Inherit LDAP server attributes from ogroup"
+#: admin/systems/class_workstationGeneric.inc:83
+#: admin/systems/class_printGeneric.inc:91
+#: admin/systems/class_componentGeneric.inc:77
+#: admin/systems/class_mobilePhoneGeneric.inc:110
+msgid "Mac address of this system"
 msgstr ""
 
-#: admin/systems/class_workstationGeneric.inc:216
-msgid "LDAP servers"
-msgstr ""
+#: admin/systems/class_workstationGeneric.inc:125
+#: admin/systems/class_workstationGeneric.inc:130
+#: admin/systems/class_workstationGeneric.inc:131
+msgid "Workstation"
+msgstr "å·¥ä½œç«™"
 
-#: admin/systems/class_workstationGeneric.inc:217
-#, php-format
-msgid "The LDAP servers for the %s"
+#: admin/systems/class_workstationGeneric.inc:126
+msgid "Workstation information"
 msgstr ""
 
-#: admin/systems/class_workstationGeneric.inc:225
-#: admin/systems/class_workstationGeneric.inc:229
-#: admin/ogroups/goto/termgroup.tpl.c:41
-msgid "Action"
-msgstr "è¡ŒåŠ¨"
-
-#: admin/systems/class_workstationGeneric.inc:230
-#: admin/ogroups/goto/termgroup.tpl.c:44
-msgid "Select action to execute for this terminal"
-msgstr "é€‰æ‹©è¿™ä¸ªç»ˆç«¯è¦æ‰§è¡Œçš„åŠ¨ä½œ"
+#: admin/systems/class_printGeneric.inc:32
+#: admin/systems/class_printGeneric.inc:37
+#: admin/systems/class_printGeneric.inc:38
+msgid "Printer"
+msgstr "æ‰“å°æœº"
 
-#: admin/systems/class_workstationGeneric.inc:236
-#: admin/systems/class_componentGeneric.inc:75
-#: admin/systems/class_mobilePhoneGeneric.inc:106
-#: admin/systems/class_networkSettings.inc:1016
-msgid "Network settings"
+#: admin/systems/class_printGeneric.inc:33
+msgid "Printer information"
 msgstr ""
 
-#: admin/systems/class_workstationGeneric.inc:459
-msgid "Workstation information"
+#: admin/systems/class_printGeneric.inc:60
+msgid "The name of the printer"
 msgstr ""
 
-#: admin/systems/class_printGeneric.inc:131
-#: admin/systems/class_printGeneric.inc:1065
-#: admin/systems/class_systemManagement.inc:678
-msgid "Internal error"
+#: admin/systems/class_printGeneric.inc:64
+msgid "A short description of the printer"
 msgstr ""
 
-#: admin/systems/class_printGeneric.inc:131
-#, php-format
-msgid ""
-"Cannot determine a valid department for this object. Setting base to '%s'!"
-msgstr ""
+#: admin/systems/class_printGeneric.inc:70
+msgid "Details"
+msgstr "è¯¦ç»†"
 
-#: admin/systems/class_printGeneric.inc:311
-#: admin/systems/class_printGeneric.inc:319
-#: admin/systems/class_printGeneric.inc:324
-#: admin/systems/class_printGeneric.inc:374
-#: admin/systems/class_printGeneric.inc:390
-#: admin/systems/class_printGeneric.inc:393
-msgid "Add printer extension"
-msgstr "æ·»åŠ æ‰“å°æœºæ‰©å±•"
+#: admin/systems/class_printGeneric.inc:73
+msgid "Printer location"
+msgstr "æ‰“å°æœºä½ç½®"
 
-#: admin/systems/class_printGeneric.inc:312
-msgid ""
-"Could not initialize printer tab, parameter parent was missing while "
-"construction."
+#: admin/systems/class_printGeneric.inc:73
+msgid "The location of the printer"
 msgstr ""
 
-#: admin/systems/class_printGeneric.inc:320
-msgid "This is a workstation template, printer tab is disabled."
-msgstr "è¿™æ˜¯ä¸€ä¸ªå·¥ä½œç«™æ¨¡æ¿ï¼Œæ‰“å°æœºé¡µè¢«ç¦ç”¨ã€‚"
-
-#: admin/systems/class_printGeneric.inc:325
-msgid "This is a terminal template, printer tab is disabled."
-msgstr "è¿™æ˜¯ä¸€ä¸ªç»ˆç«¯æ¨¡æ¿ï¼Œæ‰“å°æœºé¡µè¢«ç¦ç”¨ã€‚"
+#: admin/systems/class_printGeneric.inc:77
+msgid "Printer URL"
+msgstr "æ‰“å°æœº URL"
 
-#: admin/systems/class_printGeneric.inc:367
-#: admin/systems/class_printGeneric.inc:375
-#: admin/systems/class_printGeneric.inc:383
-#: admin/systems/class_printGeneric.inc:386
-#: admin/systems/class_printGeneric.inc:391
-#: admin/systems/class_printGeneric.inc:394
-msgid "printer"
+#: admin/systems/class_printGeneric.inc:77
+msgid "The URL of the printer"
 msgstr ""
 
-#: admin/systems/class_printGeneric.inc:375
-msgid ""
-"You can't enable it while 'cn' is not present in entry. Possibly you are "
-"currently creating a new terminal template."
+#: admin/systems/class_printGeneric.inc:87
+#: admin/systems/class_componentGeneric.inc:73
+#: admin/systems/class_mobilePhoneGeneric.inc:106
+msgid "IP address this system uses"
 msgstr ""
 
-#: admin/systems/class_printGeneric.inc:382
-#: admin/systems/class_printGeneric.inc:385
-msgid "Remove printer extension"
-msgstr "åˆ é™¤æ‰“å°æœºæ‰©å±•"
+#: admin/systems/class_serverService.inc:58
+msgid "Server services"
+msgstr ""
 
-#: admin/systems/class_printGeneric.inc:474
-#: admin/systems/class_printGeneric.inc:652
-#: admin/systems/class_printGeneric.inc:659
-#: admin/systems/class_printGeneric.inc:718
-#: admin/systems/class_printGeneric.inc:1105
-#: admin/systems/class_printGeneric.inc:1116
 #: admin/systems/class_serverService.inc:224
 #: admin/systems/class_serverService.inc:270
 #: admin/systems/class_serverService.inc:393
-#: admin/systems/class_systemManagement.inc:341
-#: admin/systems/class_systemManagement.inc:624
-#: admin/systems/class_systemManagement.inc:639
 #: admin/systems/services/shares/class_serviceShare.inc:103
-#: admin/systems/class_networkSettings.inc:305
-#: admin/systems/class_networkSettings.inc:336
-#: admin/systems/class_networkSettings.inc:584
-#: admin/systems/class_networkSettings.inc:591
-#: admin/systems/class_networkSettings.inc:597
-#: admin/systems/class_networkSettings.inc:604
+#: admin/systems/class_networkSettings.inc:297
+#: admin/systems/class_networkSettings.inc:328
+#: admin/systems/class_networkSettings.inc:576
+#: admin/systems/class_networkSettings.inc:583
+#: admin/systems/class_networkSettings.inc:589
+#: admin/systems/class_networkSettings.inc:596
 msgid "Error"
 msgstr "é”™è¯¯"
 
-#: admin/systems/class_printGeneric.inc:577
-#, php-format
-msgid "Your currently selected PPD file '%s' doesn't exist."
-msgstr "æ‚¨å½“å‰é€‰æ‹©çš„ PPD æ–‡ä»¶ '%s' ä¸å˜åœ¨ã€‚"
-
-#: admin/systems/class_printGeneric.inc:583
-msgid "Not defined"
-msgstr ""
-
-#: admin/systems/class_printGeneric.inc:587
-#: admin/systems/ppd/class_printerPPDDialog.inc:116
-msgid "Can't get ppd informations."
-msgstr "æ— æ³•èŽ·å– ppd ä¿¡æ¯ã€‚"
-
-#: admin/systems/class_printGeneric.inc:602
-#: admin/systems/class_printGeneric.inc:604
-#, php-format
-msgid "This printer belongs to %s. You can't rename this printer."
-msgstr ""
-
-#: admin/systems/class_printGeneric.inc:602
-#: admin/systems/class_terminalGeneric.inc:34
-msgid "terminal"
-msgstr "ç»ˆç«¯"
-
-#: admin/systems/class_printGeneric.inc:652
-#: admin/systems/class_printGeneric.inc:659
-msgid "Object is no printer!"
-msgstr ""
-
-#: admin/systems/class_printGeneric.inc:767 admin/systems/printer.tpl.c:23
-msgid "Printer URL"
-msgstr "æ‰“å°æœº URL"
-
-#: admin/systems/class_printGeneric.inc:989
-#: admin/systems/class_printGeneric.inc:991
-msgid "Group"
-msgstr "ç»„"
-
-#: admin/systems/class_printGeneric.inc:994
-msgid "User"
-msgstr "ç”¨æˆ·"
-
-#: admin/systems/class_printGeneric.inc:1006
-msgid "Printer information"
-msgstr ""
-
-#: admin/systems/class_printGeneric.inc:1023
-#: admin/systems/serverService-list.tpl.c:2
-#: admin/systems/phoneSelect/phoneSelect-list.tpl.c:2
-#: admin/systems/printer.tpl.c:11
-msgid "Base"
-msgstr "ä½ç½®"
-
-#: admin/systems/class_printGeneric.inc:1026
-msgid "LabeledURL"
-msgstr ""
-
-#: admin/systems/class_printGeneric.inc:1027
-msgid "Printer PPD"
-msgstr ""
-
-#: admin/systems/class_printGeneric.inc:1028 admin/systems/printer.tpl.c:38
-msgid "Permissions"
-msgstr "å…è®¸"
-
-#: admin/systems/class_printGeneric.inc:1030
-msgid "Windows inf file"
-msgstr ""
-
-#: admin/systems/class_printGeneric.inc:1031
-msgid "Windows driver dir"
-msgstr ""
-
-#: admin/systems/class_printGeneric.inc:1032 admin/systems/printer.tpl.c:62
-msgid "Driver printer name"
-msgstr ""
-
-#: admin/systems/class_printGeneric.inc:1048
-#: admin/systems/class_printGeneric.inc:1070
-msgid "Permission error"
-msgstr ""
-
-#: admin/systems/class_printGeneric.inc:1048
-#: admin/systems/class_printGeneric.inc:1070
-msgid "printer user"
-msgstr ""
-
-#: admin/systems/class_printGeneric.inc:1065
-#, php-format
-msgid "Illegal member type '%s'!"
-msgstr ""
-
-#: admin/systems/class_printGeneric.inc:1105
-#, php-format
-msgid "'%s' is already used!"
-msgstr ""
-
-#: admin/systems/class_printGeneric.inc:1116
-#, php-format
-msgid "'%s' does not exist!"
-msgstr ""
-
-#: admin/systems/class_serverService.inc:58
-msgid "Server services"
-msgstr ""
-
 #: admin/systems/class_serverService.inc:332
 msgid "Filter error"
 msgstr ""
@@ -712,216 +438,19 @@ msgstr ""
 msgid "Could not get execute action %s on service %s."
 msgstr ""
 
-#: admin/systems/class_terminalGeneric.inc:42
-#, php-format
-msgid "The root server the terminal should be using"
-msgstr ""
-
-#: admin/systems/class_terminalGeneric.inc:48
-#, php-format
-msgid "The swap server the terminal should be using"
-msgstr ""
-
-#: admin/systems/class_terminalGeneric.inc:54
-msgid "Remote desktop"
-msgstr "è¿œç¨‹æ¡Œé¢"
-
-#: admin/systems/class_terminalGeneric.inc:58
-msgid "Connect method"
-msgstr "è¿žæŽ¥æ–¹æ³•"
-
-#: admin/systems/class_terminalGeneric.inc:62
-msgid "XDMCP"
-msgstr ""
-
-#: admin/systems/class_terminalGeneric.inc:62
-msgid "LDM"
-msgstr ""
-
-#: admin/systems/class_terminalGeneric.inc:62
-msgid "Shell"
-msgstr "Shell"
-
-#: admin/systems/class_terminalGeneric.inc:62
-msgid "Telnet"
-msgstr ""
-
-#: admin/systems/class_terminalGeneric.inc:62
-msgid "Windows RDP"
-msgstr "Windows RDP"
-
-#: admin/systems/class_terminalGeneric.inc:66
-msgid "Terminal server"
-msgstr "ç»ˆç«¯æœåŠ¡å™¨"
-
-#: admin/systems/class_terminalGeneric.inc:82
-msgid "Terminal information"
-msgstr ""
-
-#: admin/systems/ppd/class_printerPPDSelectionDialog.inc:91
-#: admin/systems/ppd/class_printerPPDSelectionDialog.inc:116
-#: admin/systems/ppd/class_printerPPDSelectionDialog.inc:139
-#: admin/systems/ppd/class_printerPPDDialog.inc:92
-#: admin/systems/ppd/class_printerPPDDialog.inc:160
-#: admin/systems/ppd/class_printerPPDDialog.inc:241
-#: admin/systems/ppd/class_printerPPDDialog.inc:256
-#: admin/systems/ppd/class_printerPPDDialog.inc:269
-#: admin/systems/ppd/class_printerPPDDialog.inc:297
-#: admin/systems/ppd/class_printerPPDDialog.inc:314
-#: admin/systems/ppd/class_printerPPDDialog.inc:337
-#: admin/systems/ppd/class_printerPPDDialog.inc:351
-#: admin/systems/ppd/class_printerPPDDialog.inc:361
-#: admin/systems/ppd/class_printerPPDDialog.inc:365
-#: admin/systems/ppd/class_printerPPDDialog.inc:560
-#: admin/systems/ppd/class_printerPPDDialog.inc:577
-#: admin/systems/ppd/class_printerPPDDialog.inc:580
-#: admin/systems/ppd/class_printerPPDDialog.inc:583
-msgid "PPD error"
-msgstr ""
-
-#: admin/systems/ppd/class_printerPPDSelectionDialog.inc:139
-#, php-format
-msgid "Cannot locate vendor '%s' in available PPDs!"
-msgstr ""
-
-#: admin/systems/ppd/class_printerPPDSelectionDialog.inc:148
-msgid "Printer ppd selection."
-msgstr "æ‰“å°æœº ppd é€‰æ‹©ã€‚"
-
-#: admin/systems/ppd/class_printerPPDSelectionDialog.inc:155
-msgid "delete"
-msgstr "åˆ é™¤"
-
-#: admin/systems/ppd/class_printerPPDSelectionDialog.inc:166
-msgid "back"
-msgstr "è¿”å›ž"
-
-#: admin/systems/ppd/class_printerPPDDialog.inc:74
-#: admin/systems/ppd/class_printerPPDDialog.inc:140
-#: admin/systems/services/class_goService.inc:241
-msgid "Configuration error"
-msgstr ""
-
-#: admin/systems/ppd/class_printerPPDDialog.inc:92
-#, php-format
-msgid "Cannot open PPD '%s'!"
-msgstr ""
-
-#: admin/systems/ppd/class_printerPPDDialog.inc:141
-#, php-format
-msgid "Cannot open PPD path '%s' for reading and writing!"
-msgstr ""
-
-#: admin/systems/ppd/class_printerPPDDialog.inc:160
-#: admin/systems/ppd/class_printerPPDDialog.inc:365
-msgid "file is empty"
-msgstr ""
-
-#: admin/systems/ppd/class_printerPPDDialog.inc:314
-#, php-format
-msgid "Cannot parse PPD '%s'!"
-msgstr ""
-
-#: admin/systems/ppd/class_printerPPDDialog.inc:340
-msgid "Overwrite existing PPD"
-msgstr ""
-
-#: admin/systems/ppd/class_printerPPDDialog.inc:341
-msgid ""
-"There is already a ppd file for this kind of printer. Do you want to "
-"overwrite it?"
-msgstr ""
-
-#: admin/systems/ppd/class_printerPPDDialog.inc:491
-msgid "Section"
-msgstr "èŠ‚"
-
-#: admin/systems/ppd/class_printerPPDDialog.inc:551
-#: admin/systems/ppd/class_printerPPDDialog.inc:554
-msgid "True"
-msgstr "çœŸ"
-
-#: admin/systems/ppd/class_printerPPDDialog.inc:552
-#: admin/systems/ppd/class_printerPPDDialog.inc:555
-msgid "False"
-msgstr "å‡"
-
-#: admin/systems/ppd/class_printerPPDDialog.inc:560
-#, php-format
-msgid "PPD type '%s' is not supported!"
-msgstr ""
-
-#: admin/systems/ppd/class_printerPPDDialog.inc:597
-msgid ""
-"Please select a valid ppd file or use 'Cancel' to go back to printer "
-"configuration."
-msgstr "è¯·é€‰æ‹©ä¸€ä¸ªæœ‰æ•ˆçš„ ppd æ–‡ä»¶æˆ–è€…ç‚¹å‡»â€œå–æ¶ˆâ€æ¥è¿”å›žæ‰“å°æœºé…ç½®ã€‚"
-
-#: admin/systems/ppd/class_ppdManager.inc:44
-#: admin/systems/ppd/class_ppdManager.inc:188
-#: admin/systems/ppd/class_ppdManager.inc:190
-msgid "PPD manager error"
-msgstr ""
-
-#: admin/systems/ppd/class_ppdManager.inc:44
-#, php-format
-msgid "The specified path '%s' does not exist."
-msgstr ""
-
-#: admin/systems/ppd/class_ppdManager.inc:188
-#, php-format
-msgid "Specified PPD file '%s' cannot be opened for reading."
-msgstr ""
-
-#: admin/systems/ppd/class_ppdManager.inc:190
-#, php-format
-msgid "The temporary file '%s' cannot be opened for writing."
-msgstr ""
-
-#: admin/systems/ppd/class_ppdManager.inc:212
-#: admin/systems/ppd/class_ppdManager.inc:350
-msgid "Parsing PPD file failed - file is empty!"
-msgstr ""
-
-#: admin/systems/ppd/class_ppdManager.inc:222
-#, php-format
-msgid ""
-"Parsing PPD file %s failed - line too long. Trailing characters have been "
-"ignored!"
-msgstr ""
-
-#: admin/systems/ppd/class_ppdManager.inc:230
-msgid "Nested groups are not supported!"
-msgstr "ä¸æ”¯æŒåµŒå¥—ç»„ï¼"
-
-#: admin/systems/ppd/class_ppdManager.inc:234
-msgid "Group name not unique!"
-msgstr "ç»„åä¸å”¯ä¸€ï¼"
-
-#: admin/systems/ppd/class_ppdManager.inc:240
-#: admin/systems/ppd/class_ppdManager.inc:270
-msgid "Symbol values are not supported yet!"
-msgstr "å°šä¸æ”¯æŒç¬¦å·å€¼ï¼"
-
-#: admin/systems/ppd/class_ppdManager.inc:264
-msgid "Nested options are not supported!"
-msgstr "ä¸æ”¯æŒåµŒå¥—é€‰é¡¹ï¼"
-
-#: admin/systems/ppd/class_ppdManager.inc:289
-msgid "PickMany is not supported yet!"
-msgstr "å°šä¸æ”¯æŒ PickManyï¼"
+#: admin/systems/class_terminalGeneric.inc:31
+msgid "terminal"
+msgstr "ç»ˆç«¯"
 
-#: admin/systems/ppd/class_ppdManager.inc:370
-#, php-format
-msgid ""
-"Parsing PPD file %s failed - line too long. Trailing characters have been "
-"ignored"
-msgstr "è§£æž PPD æ–‡ä»¶ %s å¤±è´¥â”€â”€è¡Œå¤ªé•¿ã€‚æˆªæ–çš„å—ç¬¦è¢«å¿½ç•¥ã€‚"
+#: admin/systems/class_terminalGeneric.inc:43
+#: admin/systems/class_terminalGeneric.inc:48
+#: admin/systems/class_terminalGeneric.inc:49
+msgid "Terminal"
+msgstr "ç»ˆç«¯"
 
-#: admin/systems/ppd/class_ppdManager.inc:395
-#, php-format
-msgid "Parsing PPD file %s failed - no information found."
-msgstr "è§£æž PPD æ–‡ä»¶ %s å¤±è´¥â”€â”€æœªæ‰¾åˆ°ä¿¡æ¯ã€‚"
+#: admin/systems/class_terminalGeneric.inc:44
+msgid "Terminal information"
+msgstr ""
 
 #: admin/systems/class_systemImport.inc:72
 #, php-format
@@ -942,83 +471,130 @@ msgstr ""
 msgid "Import"
 msgstr "å¯¼å…¥"
 
+#: admin/systems/class_systemImport.inc:169
+#: admin/systems/class_serverGeneric.inc:43
+#: admin/systems/class_serverGeneric.inc:48
+#: admin/systems/class_serverGeneric.inc:49
+msgid "Server"
+msgstr "æœåŠ¡å™¨"
+
 #: admin/systems/class_systemImport.inc:169
 msgid "The server you wish to import hosts from"
 msgstr ""
 
-#: admin/systems/class_serverGeneric.inc:34
+#: admin/systems/class_serverGeneric.inc:31
 msgid "server"
 msgstr "æœåŠ¡å™¨"
 
-#: admin/systems/class_serverGeneric.inc:47
+#: admin/systems/class_serverGeneric.inc:44
 msgid "Server information"
 msgstr ""
 
-#: admin/systems/class_componentGeneric.inc:37
+#: admin/systems/class_componentGeneric.inc:31
+msgid "Component"
+msgstr ""
+
+#: admin/systems/class_componentGeneric.inc:32
 msgid "Component information"
 msgstr ""
 
-#: admin/systems/class_componentGeneric.inc:64
+#: admin/systems/class_componentGeneric.inc:36
+#: admin/systems/class_componentGeneric.inc:37
+msgid "Network device"
+msgstr ""
+
+#: admin/systems/class_componentGeneric.inc:58
 msgid "The name of the component"
 msgstr ""
 
-#: admin/systems/class_componentGeneric.inc:68
+#: admin/systems/class_componentGeneric.inc:62
 msgid "A short description of the component"
 msgstr ""
 
+#: admin/systems/class_systemServers.inc:31
+#: admin/systems/class_systemServers.inc:53
+msgid "Servers"
+msgstr "æœåŠ¡å™¨"
+
+#: admin/systems/class_systemServers.inc:35
+msgid "The syslog server the system should be using"
+msgstr ""
+
+#: admin/systems/class_systemServers.inc:40
+msgid "NTP servers"
+msgstr ""
+
+#: admin/systems/class_systemServers.inc:40
+msgid "The NTP servers for this system"
+msgstr ""
+
+#: admin/systems/class_systemServers.inc:54
+msgid "Servers this system is using"
+msgstr ""
+
+#: admin/systems/class_mobilePhoneGeneric.inc:32
 #: admin/systems/class_mobilePhoneGeneric.inc:37
+#: admin/systems/class_mobilePhoneGeneric.inc:38
+msgid "Mobile phone"
+msgstr "ç§»åŠ¨ç”µè¯"
+
+#: admin/systems/class_mobilePhoneGeneric.inc:33
 msgid "Mobile phone information"
 msgstr ""
 
-#: admin/systems/class_mobilePhoneGeneric.inc:63
+#: admin/systems/class_mobilePhoneGeneric.inc:60
 msgid "The name of the mobile phone"
 msgstr ""
 
-#: admin/systems/class_mobilePhoneGeneric.inc:67
+#: admin/systems/class_mobilePhoneGeneric.inc:64
 msgid "A short description of the mobile phone"
 msgstr ""
 
-#: admin/systems/class_mobilePhoneGeneric.inc:77
+#: admin/systems/class_mobilePhoneGeneric.inc:70
+msgid "Phone"
+msgstr "ç”µè¯"
+
+#: admin/systems/class_mobilePhoneGeneric.inc:73
 msgid "Serial Number"
 msgstr ""
 
-#: admin/systems/class_mobilePhoneGeneric.inc:77
+#: admin/systems/class_mobilePhoneGeneric.inc:73
 msgid "The serial number of the mobile phone"
 msgstr ""
 
-#: admin/systems/class_mobilePhoneGeneric.inc:81
+#: admin/systems/class_mobilePhoneGeneric.inc:77
 msgid "IMEI Number"
 msgstr ""
 
-#: admin/systems/class_mobilePhoneGeneric.inc:81
+#: admin/systems/class_mobilePhoneGeneric.inc:77
 msgid "The IMEI number of the mobile phone"
 msgstr ""
 
-#: admin/systems/class_mobilePhoneGeneric.inc:86
+#: admin/systems/class_mobilePhoneGeneric.inc:82
 msgid "OS"
 msgstr ""
 
-#: admin/systems/class_mobilePhoneGeneric.inc:86
+#: admin/systems/class_mobilePhoneGeneric.inc:82
 msgid "The Operating System installed on this phone"
 msgstr ""
 
-#: admin/systems/class_mobilePhoneGeneric.inc:92
+#: admin/systems/class_mobilePhoneGeneric.inc:88
 msgid "SimCard"
 msgstr ""
 
-#: admin/systems/class_mobilePhoneGeneric.inc:95
+#: admin/systems/class_mobilePhoneGeneric.inc:91
 msgid "Telephone Number"
 msgstr ""
 
-#: admin/systems/class_mobilePhoneGeneric.inc:95
+#: admin/systems/class_mobilePhoneGeneric.inc:91
 msgid "The telephone number of the mobile phone"
 msgstr ""
 
-#: admin/systems/class_mobilePhoneGeneric.inc:99
+#: admin/systems/class_mobilePhoneGeneric.inc:95
 msgid "PUK Number"
 msgstr ""
 
-#: admin/systems/class_mobilePhoneGeneric.inc:99
+#: admin/systems/class_mobilePhoneGeneric.inc:95
 msgid "The PUK number of the simcard in this mobile phone"
 msgstr ""
 
@@ -1061,70 +637,20 @@ msgstr ""
 msgid "Remove service"
 msgstr ""
 
-#: admin/systems/phoneSelect/phoneSelect-list.xml:10
-msgid "Please select the desired entries"
-msgstr ""
-
-#: admin/systems/phoneSelect/phoneSelect-list.xml:56
-msgid "Number"
-msgstr ""
-
-#: admin/systems/phoneSelect/phoneSelect-list.xml:83
-msgid "Select this number"
-msgstr ""
-
-#: admin/systems/class_systemManagement.inc:177
-msgid "Back"
-msgstr "è¿”å›ž"
-
-#: admin/systems/class_systemManagement.inc:223
-msgid "Creating the image failed. Please see the report below."
-msgstr "åˆ›å»ºå›¾ç‰‡é”™è¯¯ã€‚è¯·æ£€æŸ¥ä¸‹é¢çš„æŠ¥å‘Šã€‚"
-
-#: admin/systems/class_systemManagement.inc:228
-#, php-format
-msgid "Command '%s', specified for ISO creation doesn't seem to exist."
-msgstr "å‘½ä»¤ '%s'ï¼Œç”¨äºŽåˆ›å»º ISO å¥½åƒå¹¶ä¸å˜åœ¨ã€‚"
-
-#: admin/systems/class_systemManagement.inc:398
-#: admin/systems/class_systemManagement.inc:473
-#: admin/systems/class_systemManagement.inc:858
-#: admin/systems/class_systemManagement.inc:905
-#: admin/systems/class_systemManagement.inc:926
-msgid "Permission"
-msgstr "å…è®¸"
-
-#: admin/systems/class_systemManagement.inc:678
-msgid "Cannot set mode to 'active'!"
-msgstr ""
-
-#: admin/systems/class_systemManagement.inc:858
-#, php-format
-msgid "You are not allowed to create a snapshot for %s."
-msgstr ""
-
-#: admin/systems/class_systemManagement.inc:905
-#: admin/systems/class_systemManagement.inc:926
-#, php-format
-msgid "You are not allowed to restore a snapshot for %s."
-msgstr ""
-
-#: admin/systems/class_systemManagement.inc:1169
-#, php-format
-msgid "Inherited from %s"
-msgstr ""
-
-#: admin/systems/class_systemManagement.inc:1224
-#: admin/systems/class_systemManagement.inc:1228
-#: addons/dashboard/class_dashBoardSystems.inc:199
+#: admin/systems/class_systemManagement.inc:48
 #: config/systems/class_systemsPluginConfig.inc:28
 msgid "Systems"
 msgstr "ç³»ç»Ÿè®¾ç½®"
 
-#: admin/systems/class_systemManagement.inc:1225
+#: admin/systems/class_systemManagement.inc:49
 msgid "Systems Management"
 msgstr ""
 
+#: admin/systems/class_systemManagement.inc:250
+#, php-format
+msgid "Inherited from %s"
+msgstr ""
+
 #: admin/systems/services/terminal/class_serviceTerminal.inc:29
 #: admin/systems/services/terminal/class_serviceTerminal.inc:30
 #: admin/systems/services/terminal/class_serviceTerminal.inc:41
@@ -1162,6 +688,10 @@ msgstr ""
 msgid "Empty service"
 msgstr ""
 
+#: admin/systems/services/class_goService.inc:241
+msgid "Configuration error"
+msgstr ""
+
 #: admin/systems/services/shares/class_serviceShare.inc:30
 #: admin/systems/services/shares/class_serviceShare.inc:31
 msgid "Share service"
@@ -1220,8 +750,6 @@ msgid "You need to configure encodings first"
 msgstr ""
 
 #: admin/systems/services/shares/class_serviceShare.inc:110
-#: admin/ogroups/goto/termgroup.tpl.c:2 admin/systems/remove.tpl.c:2
-#: admin/systems/ppd/remove_ppd.tpl.c:2
 msgid "Warning"
 msgstr "è¦å‘Š"
 
@@ -1347,153 +875,93 @@ msgstr ""
 msgid "LDAP"
 msgstr ""
 
-#: admin/systems/class_networkSettings.inc:305
+#: admin/systems/class_networkSettings.inc:297
 msgid "NOT IMPLEMENTED"
 msgstr ""
 
-#: admin/systems/class_networkSettings.inc:437
+#: admin/systems/class_networkSettings.inc:429
 msgid "Not matching"
 msgstr "ä¸åŒ¹é…"
 
-#: admin/systems/class_networkSettings.inc:584
+#: admin/systems/class_networkSettings.inc:576
 #, php-format
 msgid "Was not able to contact argonaut server: %s"
 msgstr ""
 
-#: admin/systems/class_networkSettings.inc:591
+#: admin/systems/class_networkSettings.inc:583
 #, php-format
 msgid "Was not able to find DNS server for zone %s"
 msgstr ""
 
-#: admin/systems/class_networkSettings.inc:597
+#: admin/systems/class_networkSettings.inc:589
 #, php-format
 msgid "Was not able to find mac address of DNS server %s"
 msgstr ""
 
-#: admin/systems/class_networkSettings.inc:604
+#: admin/systems/class_networkSettings.inc:596
 #, php-format
 msgid "Was not able to launch ldap2zone: %s"
 msgstr ""
 
-#: admin/systems/class_networkSettings.inc:630
+#: admin/systems/class_networkSettings.inc:622
 #, php-format
 msgid "IP address %s"
 msgstr ""
 
-#: admin/systems/class_networkSettings.inc:638
-#: admin/systems/class_networkSettings.inc:651
-#: admin/systems/class_networkSettings.inc:653
-#: admin/systems/class_networkSettings.inc:1022
-msgid "IP address"
-msgstr ""
-
-#: admin/systems/class_networkSettings.inc:644
-#: admin/systems/class_networkSettings.inc:660
-#: admin/systems/class_networkSettings.inc:662
-#: admin/systems/class_networkSettings.inc:1023
+#: admin/systems/class_networkSettings.inc:636
+#: admin/systems/class_networkSettings.inc:652
+#: admin/systems/class_networkSettings.inc:654
+#: admin/systems/class_networkSettings.inc:1015
 msgid "MAC address"
 msgstr "MAC åœ°å€"
 
-#: admin/systems/class_networkSettings.inc:676
+#: admin/systems/class_networkSettings.inc:668
 #, php-format
 msgid "The IP address '%s' is not part of the selected reverse zone '%s'!"
 msgstr ""
 
-#: admin/systems/class_networkSettings.inc:686
+#: admin/systems/class_networkSettings.inc:678
 #, php-format
 msgid "Record type '%s' is duplicated!"
 msgstr ""
 
-#: admin/systems/class_networkSettings.inc:693
+#: admin/systems/class_networkSettings.inc:685
 #, php-format
 msgid "Uniq record type '%s' is duplicated!"
 msgstr ""
 
-#: admin/systems/class_networkSettings.inc:705
+#: admin/systems/class_networkSettings.inc:697
 #, php-format
 msgid ""
 "The IP address '%s' will be added as 'A Record', this will be done "
 "automatically, please remove the record."
 msgstr ""
 
-#: admin/systems/class_networkSettings.inc:712
+#: admin/systems/class_networkSettings.inc:704
 #, php-format
 msgid "Only lowercase records are allowed, please check your '%ss'."
 msgstr ""
 
-#: admin/systems/class_networkSettings.inc:978
+#: admin/systems/class_networkSettings.inc:970
 msgid "Delete"
 msgstr "åˆ é™¤"
 
-#: admin/systems/class_networkSettings.inc:984
+#: admin/systems/class_networkSettings.inc:976
 msgid "Add"
 msgstr "æ·»åŠ "
 
-#: admin/systems/class_networkSettings.inc:1015
-#: addons/dashboard/class_dashBoardNetwork.inc:127
+#: admin/systems/class_networkSettings.inc:1007
 msgid "Network"
 msgstr ""
 
-#: admin/systems/class_networkSettings.inc:1030
+#: admin/systems/class_networkSettings.inc:1022
 msgid "DNS configuration"
 msgstr ""
 
-#: admin/systems/class_networkSettings.inc:1033
+#: admin/systems/class_networkSettings.inc:1025
 msgid "DHCP configuration"
 msgstr ""
 
-#: addons/dashboard/class_dashBoardSystems.inc:45
-msgid "Workstations"
-msgstr ""
-
-#: addons/dashboard/class_dashBoardSystems.inc:51
-msgid "Windows Workstations"
-msgstr ""
-
-#: addons/dashboard/class_dashBoardSystems.inc:54
-msgid "Terminals"
-msgstr ""
-
-#: addons/dashboard/class_dashBoardSystems.inc:57
-msgid "Printers"
-msgstr ""
-
-#: addons/dashboard/class_dashBoardSystems.inc:60
-msgid "Phones"
-msgstr ""
-
-#: addons/dashboard/class_dashBoardSystems.inc:63
-msgid "Components"
-msgstr ""
-
-#: addons/dashboard/class_dashBoardSystems.inc:66
-msgid "Mobile phones"
-msgstr ""
-
-#: addons/dashboard/class_dashBoardSystems.inc:183
-msgid "Statistics"
-msgstr ""
-
-#: addons/dashboard/class_dashBoardSystems.inc:188
-msgid "Computer name to use by unit"
-msgstr ""
-
-#: addons/dashboard/class_dashBoardSystems.inc:200
-msgid "Statistics and informations about systems"
-msgstr ""
-
-#: addons/dashboard/class_dashBoardNetwork.inc:111
-msgid "DHCP"
-msgstr ""
-
-#: addons/dashboard/class_dashBoardNetwork.inc:116
-msgid "DNS"
-msgstr ""
-
-#: addons/dashboard/class_dashBoardNetwork.inc:128
-msgid "Statistics and various informations"
-msgstr ""
-
 #: config/systems/class_systemsPluginConfig.inc:29
 msgid "Systems plugin configuration"
 msgstr ""
@@ -1585,402 +1053,3 @@ msgstr ""
 #: config/systems/class_systemsPluginConfig.inc:101
 msgid "Encodings"
 msgstr ""
-
-#: admin/ogroups/goto/termgroup.tpl.c:5
-msgid ""
-"Actions you choose here influence all systems in this object group. "
-"Additionally, all values editable here can be inherited by the clients "
-"assigned to this object group."
-msgstr "æ‚¨è¿™é‡Œé€‰æ‹©çš„åŠ¨ä½œä¼šå½±å“è¿™ä¸ªå¯¹è±¡ç»„å†…æ‰€æœ‰ç³»ç»Ÿã€‚è€Œä¸”ï¼Œæ‰€æœ‰è¿™é‡Œå¯ä»¥ä¿®æ”¹çš„å€¼éƒ½å¯ä»¥è¢«åˆ†é…åˆ°è¯¥å¯¹è±¡ç»„çš„å¯¹è±¡ç»§æ‰¿ã€‚"
-
-#: admin/ogroups/goto/termgroup.tpl.c:8
-msgid "Generic"
-msgstr "é€šç”¨é…ç½®"
-
-#: admin/ogroups/goto/termgroup.tpl.c:11
-msgid "NTP server"
-msgstr "NTP æœåŠ¡å™¨"
-
-#: admin/ogroups/goto/termgroup.tpl.c:14
-msgid "Choose server to use for synchronizing time"
-msgstr "é€‰æ‹©è¦ç”¨äºŽåŒæ¥æ—¶é—´çš„æœåŠ¡å™¨"
-
-#: admin/ogroups/goto/termgroup.tpl.c:20
-msgid "Select terminal mode"
-msgstr "é€‰æ‹©ç»ˆç«¯ç±»åž‹"
-
-#: admin/ogroups/goto/termgroup.tpl.c:26
-msgid "Choose server to use for logging"
-msgstr "é™åˆ¶è®°å½•æ—¥å¿—çš„æœåŠ¡å™¨"
-
-#: admin/ogroups/goto/termgroup.tpl.c:32
-msgid "Select NFS root filesystem to use"
-msgstr "é€‰æ‹©è¦ç”¨çš„ NFS æ ¹æ–‡ä»¶ç³»ç»Ÿã€‚"
-
-#: admin/ogroups/goto/termgroup.tpl.c:38
-msgid "Choose NFS filesystem to place swap files on"
-msgstr "é€‰æ‹©æ”¾ç½®äº¤æ¢æ–‡ä»¶çš„ NFS æ–‡ä»¶ç³»ç»Ÿ"
-
-#: admin/ogroups/goto/termgroup.tpl.c:47
-msgid "Execute"
-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 admin/systems/network.tpl.c:11
-msgid "Propose ip"
-msgstr ""
-
-#: admin/systems/network.tpl.c:14
-msgid "MAC-address"
-msgstr "MAC åœ°å€"
-
-#: admin/systems/network.tpl.c:17
-msgid "Autodetect"
-msgstr "è‡ªåŠ¨æ£€æµ‹"
-
-#: admin/systems/network.tpl.c:20 admin/systems/network.tpl.c:23
-msgid "Enable DHCP for this device"
-msgstr ""
-
-#: admin/systems/network.tpl.c:26 admin/systems/network.tpl.c:50
-msgid "not configured"
-msgstr ""
-
-#: admin/systems/network.tpl.c:29
-msgid "Parent node"
-msgstr ""
-
-#: admin/systems/network.tpl.c:32
-msgid "Edit settings"
-msgstr ""
-
-#: admin/systems/network.tpl.c:35 admin/systems/network.tpl.c:47
-msgid "Enable DNS for this device"
-msgstr "å¯ç”¨è¯¥è®¾å¤‡ DNS"
-
-#: admin/systems/network.tpl.c:38
-msgid "Zone"
-msgstr "Zone"
-
-#: admin/systems/network.tpl.c:41
-msgid "TTL"
-msgstr "TTL"
-
-#: admin/systems/network.tpl.c:44
-msgid "Dns records"
-msgstr "Dns è®°å½•"
-
-#: admin/systems/password.tpl.c:2
-msgid ""
-"To change the terminal root password use the fields below. The changes take "
-"effect during the next reboot. Please memorize the new password, because you"
-" wouldn't be able to log in."
-msgstr "ç”¨ä¸‹é¢çš„å—æ®µæ¥ä¿®æ”¹ç»ˆç«¯ root å£ä»¤ã€‚è¿™é¡¹ä¿®æ”¹å°†åœ¨ä¸‹æ¬¡é‡å¯ä¹‹åŽèµ·ä½œç”¨ã€‚è¯·è®°ä½æ–°å£ä»¤ï¼Œå¦åˆ™æ‚¨æ— æ³•ç™»å½•ã€‚"
-
-#: admin/systems/password.tpl.c:5
-msgid "Leave fields blank for password inheritance from default entries."
-msgstr "å¦‚æžœè¦å£ä»¤ä»Žç¼ºçœæ¡ç›®ç»§æ‰¿ï¼Œæ¤é¡¹ç©ºç™½"
-
-#: admin/systems/password.tpl.c:8
-msgid "Changing the password impinges on authentification only."
-msgstr "ä¿®æ”¹å£ä»¤ä»…å½±å“åˆ°é‰´æƒã€‚"
-
-#: admin/systems/password.tpl.c:11
-msgid "New password"
-msgstr "æ–°å£ä»¤"
-
-#: admin/systems/password.tpl.c:14
-msgid "Repeat new password"
-msgstr "é‡å¤æ–°å£ä»¤"
-
-#: admin/systems/password.tpl.c:17
-msgid "Password strength"
-msgstr ""
-
-#: admin/systems/password.tpl.c:20
-msgid "Set password"
-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/gencd.tpl.c:2
-msgid "CD-Install-Image generation"
-msgstr "åˆ›å»º CD å®‰è£…é•œåƒ"
-
-#: admin/systems/gencd.tpl.c:5
-msgid ""
-"This option enables you to generate FAI install CD images for the selected "
-"workstation. The procedure may take about 10 minutes to complete, so please "
-"be patient after pressing the 'Create ISO-Image' button."
-msgstr "è¿™ä¸ªé€‰é¡¹ä½¿æ‚¨èƒ½å¤Ÿä¸ºé€‰æ‹©çš„å·¥ä½œç«™åˆ›å»º FAI å®‰è£…å…‰ç›˜é•œåƒã€‚è¿™ä¸ªè¿‡ç¨‹å¯èƒ½éœ€è¦ 10 åˆ†é’Ÿï¼Œæ‰€ä»¥è¯·åœ¨æŒ‰ä¸‹â€œåˆ›å»º ISO é•œåƒâ€åŽè€å¿ƒç‰å¾…ã€‚"
-
-#: admin/systems/gencd.tpl.c:8
-msgid "Create ISO-Image"
-msgstr "åˆ›å»º ISO é•œåƒ"
-
-#: admin/systems/remove.tpl.c:5
-msgid ""
-"This includes all account data, system access rules, imap settings, etc. for"
-" this user. Please double check if your really want to do this since there "
-"is no way for FusionDirectory to get your data back."
-msgstr ""
-
-#: admin/systems/remove.tpl.c:8
-msgid "So - if you're sure - press 'Delete' to continue or 'Cancel' to abort."
-msgstr "æ‰€ä»¥ï¼Œå¦‚æžœæ‚¨ç¡®å®šï¼Œè¯·æŒ‰â€œåˆ é™¤â€ç»§ç»ï¼Œå¦åˆ™æŒ‰â€œå–æ¶ˆâ€é€€å‡ºã€‚"
-
-#: admin/systems/system-filter.tpl.c:2
-#: admin/systems/phoneSelect/phoneSelect-filter.tpl.c:2
-msgid "Filter"
-msgstr "è¿‡æ»¤å™¨"
-
-#: admin/systems/system-filter.tpl.c:5
-msgid "Show servers"
-msgstr "æ˜¾ç¤ºæœåŠ¡å™¨"
-
-#: admin/systems/system-filter.tpl.c:8
-msgid "Show workstations"
-msgstr "æ˜¾ç¤ºå·¥ä½œç«™"
-
-#: admin/systems/system-filter.tpl.c:11
-msgid "Show terminals"
-msgstr "æ˜¾ç¤ºç»ˆç«¯"
-
-#: admin/systems/system-filter.tpl.c:14
-msgid "Show network printer"
-msgstr ""
-
-#: admin/systems/system-filter.tpl.c:17
-#: admin/systems/phoneSelect/phoneSelect-filter.tpl.c:5
-msgid "Show phones"
-msgstr "æ˜¾ç¤ºç”µè¯"
-
-#: admin/systems/system-filter.tpl.c:20
-msgid "Show windows based workstations"
-msgstr ""
-
-#: admin/systems/system-filter.tpl.c:23
-msgid "Show network devices"
-msgstr "æ˜¾ç¤ºç½‘ç»œè®¾å¤‡"
-
-#: admin/systems/system-filter.tpl.c:26
-#: admin/systems/phoneSelect/phoneSelect-filter.tpl.c:8
-msgid "Show mobile phones"
-msgstr ""
-
-#: admin/systems/system-filter.tpl.c:29
-msgid "Show IPMI interfaces"
-msgstr ""
-
-#: admin/systems/ppd/printerPPDSelectionDialog.tpl.c:2
-msgid "Select objects to add"
-msgstr "é€‰æ‹©è¦æ·»åŠ çš„å¯¹è±¡"
-
-#: admin/systems/ppd/printerPPDSelectionDialog.tpl.c:5
-msgid "Filters"
-msgstr "è¿‡æ»¤å™¨"
-
-#: admin/systems/ppd/printerPPDSelectionDialog.tpl.c:8
-msgid "Display objects matching"
-msgstr "æ˜¾ç¤ºåŒ¹é…å¯¹è±¡"
-
-#: admin/systems/ppd/printerPPDSelectionDialog.tpl.c:11
-msgid "Regular expression for matching object names"
-msgstr "åŒ¹é…å¯¹è±¡åçš„æ£åˆ™è¡¨è¾¾å¼"
-
-#: admin/systems/ppd/printerPPDSelectionDialog.tpl.c:14
-msgid "Close"
-msgstr "å…³é—"
-
-#: admin/systems/ppd/printerPPDDialog.tpl.c:2
-msgid "Printer driver"
-msgstr "æ‰“å°æœºé©±åŠ¨"
-
-#: admin/systems/ppd/printerPPDDialog.tpl.c:5
-msgid "Model"
-msgstr "æ¨¡åž‹"
-
-#: admin/systems/ppd/printerPPDDialog.tpl.c:8
-msgid "Select"
-msgstr "é€‰æ‹©"
-
-#: admin/systems/ppd/printerPPDDialog.tpl.c:11
-msgid "New driver"
-msgstr "æ–°é©±åŠ¨"
-
-#: admin/systems/ppd/printerPPDDialog.tpl.c:14
-msgid "Upload"
-msgstr "ä¸Šä¼ "
-
-#: admin/systems/ppd/printerPPDDialog.tpl.c:17
-msgid "Options"
-msgstr "é€‰é¡¹"
-
-#: admin/systems/ppd/remove_ppd.tpl.c:5
-msgid "The ppd file will be removed from the server and can not be restored."
-msgstr "æœåŠ¡å™¨ä¸çš„ ppd æ–‡ä»¶å°†è¢«åˆ é™¤å¹¶ä¸”ä¸èƒ½è¢«æ¢å¤ã€‚"
-
-#: admin/systems/printer.tpl.c:2
-msgid "General"
-msgstr "æ™®é€š"
-
-#: admin/systems/printer.tpl.c:5
-msgid "Printer name"
-msgstr "æ‰“å°æœºåç§°"
-
-#: admin/systems/printer.tpl.c:14
-msgid "Details"
-msgstr "è¯¦ç»†"
-
-#: admin/systems/printer.tpl.c:20
-msgid "Printer location"
-msgstr "æ‰“å°æœºä½ç½®"
-
-#: admin/systems/printer.tpl.c:26
-msgid "PPD Provider"
-msgstr ""
-
-#: admin/systems/printer.tpl.c:29
-msgid "Driver"
-msgstr "é©±åŠ¨"
-
-#: admin/systems/printer.tpl.c:32
-msgid "Edit"
-msgstr "ç¼–è¾‘"
-
-#: admin/systems/printer.tpl.c:41
-msgid "Users which are allowed to use this printer"
-msgstr "å…è®¸ä½¿ç”¨è¯¥æ‰“å°æœºçš„ç”¨æˆ·"
-
-#: admin/systems/printer.tpl.c:44
-msgid "Users"
-msgstr "ç”¨æˆ·"
-
-#: admin/systems/printer.tpl.c:47
-msgid "Users which are allowed to administrate this printer"
-msgstr "å…è®¸ç®¡ç†è¯¥æ‰“å°æœºçš„ç”¨æˆ·"
-
-#: admin/systems/printer.tpl.c:50
-msgid "Admins"
-msgstr "ç®¡ç†å‘˜"
-
-#: admin/systems/printer.tpl.c:53
-msgid "Windows paths"
-msgstr ""
-
-#: admin/systems/printer.tpl.c:56
-msgid "Printer windows inf file"
-msgstr ""
-
-#: admin/systems/printer.tpl.c:59
-msgid "Printer driver directory"
-msgstr ""
-
-#: admin/systems/gencd_frame.tpl.c:2
-msgid "Your browser does not supprt iframes."
-msgstr "æ‚¨çš„æµè§ˆå™¨ä¸æ”¯æŒ iframesã€‚"
-
-#: admin/systems/services/cups/serviceCUPS.tpl.c:2
-msgid "Print Service"
-msgstr "æ‰“å°æœåŠ¡"
-
-#: admin/systems/services/cups/serviceCUPS.tpl.c:5
-msgid "enabled"
-msgstr ""
-
-#: admin/systems/services/ServiceAddDialog.tpl.c:2
-msgid "Adding a new service to the current server"
-msgstr ""
-
-#: admin/systems/services/ServiceAddDialog.tpl.c:5
-msgid ""
-"This dialog allows you to add new services to the currenty edited server "
-"object. The box below shows all available but not already used services."
-msgstr ""
-
-#: admin/systems/services/ServiceAddDialog.tpl.c:8
-msgid "Service to add"
-msgstr ""
-
-#: admin/systems/services/ServiceAddDialog.tpl.c:11
-msgid "All available services are already in use."
-msgstr ""
-
-#: admin/systems/services/ServiceAddDialog.tpl.c:14
-#: admin/systems/SelectDeviceType.tpl.c:26
-msgid "Continue"
-msgstr "ç»§ç»"
-
-#: admin/systems/SelectDeviceType.tpl.c:2
-msgid ""
-"This system has no system type configured. Please choose a system type for "
-"this object and an optional inheritance group. Press the 'continue' button "
-"to proceed."
-msgstr ""
-
-#: admin/systems/SelectDeviceType.tpl.c:5
-msgid ""
-"Please select a system type and an optional bundle of predefined settings to"
-" be inherited."
-msgstr "è¯·é€‰æ‹©ä¸€ä¸ªç³»ç»Ÿç±»åž‹ä»¥åŠä¸€ä¸ªè¦ç»§æ‰¿çš„å¯é€‰çš„é¢„å®šä¹‰è®¾ç½®ã€‚"
-
-#: admin/systems/SelectDeviceType.tpl.c:8
-msgid ""
-"Please select a system type and a bundle of predefined settings to be "
-"inherited."
-msgstr ""
-
-#: admin/systems/SelectDeviceType.tpl.c:11
-#: admin/systems/SelectDeviceType.tpl.c:14
-msgid "System type"
-msgstr "ç³»ç»Ÿç±»åž‹"
-
-#: admin/systems/SelectDeviceType.tpl.c:17
-msgid "Choose an object group as template"
-msgstr "é€‰æ‹©ä¸€ä¸ªå¯¹è±¡ç»„ä½œä¸ºæ¨¡æ¿"
-
-#: admin/systems/SelectDeviceType.tpl.c:20
-msgid "Object group"
-msgstr "å¯¹è±¡ç»„"
-
-#: admin/systems/SelectDeviceType.tpl.c:23
-msgid "none"
-msgstr "æ— "
-
-#: addons/dashboard/systems_stats.tpl.c:2
-msgid "There are several argonaut servers! (this is not yet supported)"
-msgstr ""
-
-#: addons/dashboard/systems_stats.tpl.c:5
-msgid "There is an argonaut server running on %1 (%3://%2:%4)"
-msgstr ""
-
-#: addons/dashboard/systems_stats.tpl.c:8
-msgid "Only one system is configured to run an argonaut client."
-msgid_plural "%1 systems are configured to run an argonaut client."
-msgstr[0] ""
-
-#: addons/dashboard/systems_stats.tpl.c:11
-msgid "But no system is configured to run an argonaut client!"
-msgstr ""
-
-#: addons/dashboard/systems_stats.tpl.c:14
-msgid ""
-"A system is configured to run an argonaut client, but there is no argonaut "
-"server configured!"
-msgid_plural ""
-"%1 systems are configured to run an argonaut client, but there is no "
-"argonaut server configured!"
-msgstr[0] ""
diff --git a/weblink/locale/ar/fusiondirectory.po b/weblink/locale/ar/fusiondirectory.po
index 24a9d1ab6cf297d79b07f08ebbd03022ec87c042..a029625ce0cf66fe378df7d09f014f85f10990e0 100644
--- a/weblink/locale/ar/fusiondirectory.po
+++ b/weblink/locale/ar/fusiondirectory.po
@@ -5,12 +5,12 @@
 # Translators:
 msgid ""
 msgstr ""
-"Project-Id-Version: FusionDirectory-108\n"
+"Project-Id-Version: FusionDirectory-109\n"
 "Report-Msgid-Bugs-To: documentation@lists.fusiondirectory.org\n"
-"POT-Creation-Date: 2015-03-17 18:47+0100\n"
-"PO-Revision-Date: 2014-08-28 10:52+0000\n"
-"Last-Translator: fusiondirectory <contact@fusiondirectory.org>\n"
-"Language-Team: Arabic (http://www.transifex.com/projects/p/FusionDirectory-108/language/ar/)\n"
+"POT-Creation-Date: 2014-12-15 17:47+0100\n"
+"PO-Revision-Date: 2014-08-28 10:30+0000\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: Arabic (http://www.transifex.com/projects/p/FusionDirectory-109/language/ar/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
diff --git a/weblink/locale/ca/fusiondirectory.po b/weblink/locale/ca/fusiondirectory.po
index a8c19684bc8717fe9772887ffc38291c5db67df4..8188a30243f620aa6adfa9d3cd21ce829ec97101 100644
--- a/weblink/locale/ca/fusiondirectory.po
+++ b/weblink/locale/ca/fusiondirectory.po
@@ -5,12 +5,12 @@
 # Translators:
 msgid ""
 msgstr ""
-"Project-Id-Version: FusionDirectory-108\n"
+"Project-Id-Version: FusionDirectory-109\n"
 "Report-Msgid-Bugs-To: documentation@lists.fusiondirectory.org\n"
-"POT-Creation-Date: 2015-03-17 18:47+0100\n"
-"PO-Revision-Date: 2014-08-26 14:13+0000\n"
-"Last-Translator: fusiondirectory <contact@fusiondirectory.org>\n"
-"Language-Team: Catalan (http://www.transifex.com/projects/p/FusionDirectory-108/language/ca/)\n"
+"POT-Creation-Date: 2014-12-15 17:47+0100\n"
+"PO-Revision-Date: 2014-08-28 10:30+0000\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: Catalan (http://www.transifex.com/projects/p/FusionDirectory-109/language/ca/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
diff --git a/weblink/locale/cs_CZ/fusiondirectory.po b/weblink/locale/cs_CZ/fusiondirectory.po
index 65db88e756b0d34004e1de5882eb089a980a037c..56e0163b3978068de9ed726900ecf99108452405 100644
--- a/weblink/locale/cs_CZ/fusiondirectory.po
+++ b/weblink/locale/cs_CZ/fusiondirectory.po
@@ -3,14 +3,15 @@
 # This file is distributed under the same license as the PACKAGE package.
 # 
 # Translators:
+# Pavel Borecki <pavel.borecki@gmail.com>, 2014-2015
 msgid ""
 msgstr ""
-"Project-Id-Version: FusionDirectory-108\n"
+"Project-Id-Version: FusionDirectory-109\n"
 "Report-Msgid-Bugs-To: documentation@lists.fusiondirectory.org\n"
-"POT-Creation-Date: 2015-03-17 18:47+0100\n"
-"PO-Revision-Date: 2014-12-08 21:51+0000\n"
-"Last-Translator: fusiondirectory <contact@fusiondirectory.org>\n"
-"Language-Team: Czech (Czech Republic) (http://www.transifex.com/projects/p/FusionDirectory-108/language/cs_CZ/)\n"
+"POT-Creation-Date: 2014-12-15 17:47+0100\n"
+"PO-Revision-Date: 2015-03-28 21:14+0000\n"
+"Last-Translator: Pavel Borecki <pavel.borecki@gmail.com>\n"
+"Language-Team: Czech (Czech Republic) (http://www.transifex.com/projects/p/FusionDirectory-109/language/cs_CZ/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -35,12 +36,12 @@ msgstr "Protokol"
 
 #: admin/systems/weblink/class_webLink.inc:47
 msgid "Protocol to use to access the IPMI Web Admin page"
-msgstr ""
+msgstr "Protokol pro pÅ™Ãstup na webovÃ© sprÃ¡vnÃ rozhranÃ IPMI"
 
 #: admin/systems/weblink/class_webLink.inc:52
 msgid "Link"
-msgstr ""
+msgstr "Odkaz"
 
 #: admin/systems/weblink/class_webLink.inc:52
 msgid "Web link to this computer"
-msgstr ""
+msgstr "WebovÃ½ odkaz na tento poÄÃtaÄ"
diff --git a/weblink/locale/de/fusiondirectory.po b/weblink/locale/de/fusiondirectory.po
index 3dc77b6fd80b3d937d594edb3ccc0fce0a30d087..ee44ea044fe06d33466bc83a095146695f5f9aa2 100644
--- a/weblink/locale/de/fusiondirectory.po
+++ b/weblink/locale/de/fusiondirectory.po
@@ -3,14 +3,15 @@
 # This file is distributed under the same license as the PACKAGE package.
 # 
 # Translators:
+# Maik Wagner <maikwagner@yahoo.com>, 2013
 msgid ""
 msgstr ""
-"Project-Id-Version: FusionDirectory-108\n"
+"Project-Id-Version: FusionDirectory-109\n"
 "Report-Msgid-Bugs-To: documentation@lists.fusiondirectory.org\n"
-"POT-Creation-Date: 2015-03-17 18:47+0100\n"
-"PO-Revision-Date: 2014-08-28 10:52+0000\n"
-"Last-Translator: fusiondirectory <contact@fusiondirectory.org>\n"
-"Language-Team: German (http://www.transifex.com/projects/p/FusionDirectory-108/language/de/)\n"
+"POT-Creation-Date: 2014-12-15 17:47+0100\n"
+"PO-Revision-Date: 2014-08-28 10:30+0000\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: German (http://www.transifex.com/projects/p/FusionDirectory-109/language/de/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
diff --git a/weblink/locale/el_GR/fusiondirectory.po b/weblink/locale/el_GR/fusiondirectory.po
new file mode 100644
index 0000000000000000000000000000000000000000..4b52eed99b00ced503ae72de54e37651eebf2bf0
--- /dev/null
+++ b/weblink/locale/el_GR/fusiondirectory.po
@@ -0,0 +1,46 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR FusionDirectory Project
+# This file is distributed under the same license as the PACKAGE package.
+# 
+# Translators:
+msgid ""
+msgstr ""
+"Project-Id-Version: FusionDirectory-109\n"
+"Report-Msgid-Bugs-To: documentation@lists.fusiondirectory.org\n"
+"POT-Creation-Date: 2014-12-15 17:47+0100\n"
+"PO-Revision-Date: 2015-05-30 11:45+0000\n"
+"Last-Translator: Benoit Mortier <benoit.mortier@opensides.be>\n"
+"Language-Team: Greek (Greece) (http://www.transifex.com/projects/p/FusionDirectory-109/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/weblink/class_webLink.inc:31
+msgid "Web link"
+msgstr ""
+
+#: admin/systems/weblink/class_webLink.inc:32
+msgid "Edit web link"
+msgstr ""
+
+#: admin/systems/weblink/class_webLink.inc:44
+msgid "IPMI client settings"
+msgstr ""
+
+#: admin/systems/weblink/class_webLink.inc:47
+msgid "Protocol"
+msgstr ""
+
+#: admin/systems/weblink/class_webLink.inc:47
+msgid "Protocol to use to access the IPMI Web Admin page"
+msgstr ""
+
+#: admin/systems/weblink/class_webLink.inc:52
+msgid "Link"
+msgstr ""
+
+#: admin/systems/weblink/class_webLink.inc:52
+msgid "Web link to this computer"
+msgstr ""
diff --git a/weblink/locale/en/fusiondirectory.po b/weblink/locale/en/fusiondirectory.po
index 1635767563ed35cef699d74188410960ad0c0e8e..a59744c6f65af71ab981d10c6a7ba876f8b158f2 100644
--- a/weblink/locale/en/fusiondirectory.po
+++ b/weblink/locale/en/fusiondirectory.po
@@ -6,13 +6,13 @@
 #, fuzzy
 msgid ""
 msgstr ""
-"Project-Id-Version: PACKAGE VERSION\n"
-"Report-Msgid-Bugs-To: documentation@lists.fusiondirectory.org\n"
-"POT-Creation-Date: 2015-03-31 11:49+0200\n"
+"Project-Id-Version: FusionDirectory VERSION\n"
+"Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
+"POT-Creation-Date: 2015-05-30 15:30+0200\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
-"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
-"Language-Team: LANGUAGE <LL@li.org>\n"
-"Language: \n"
+"Last-Translator: FusionDirectory project <contact@fusiondirectory.org>\n"
+"Language-Team: English\n"
+"Language: en\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
diff --git a/weblink/locale/es/fusiondirectory.po b/weblink/locale/es/fusiondirectory.po
index 6db4e0bf9a192951aa7b9ef0d5e8975b01ac0475..9d106f5f5c08b8e79fb2096c8c43a483b583a9a9 100644
--- a/weblink/locale/es/fusiondirectory.po
+++ b/weblink/locale/es/fusiondirectory.po
@@ -5,12 +5,12 @@
 # Translators:
 msgid ""
 msgstr ""
-"Project-Id-Version: FusionDirectory-108\n"
+"Project-Id-Version: FusionDirectory-109\n"
 "Report-Msgid-Bugs-To: documentation@lists.fusiondirectory.org\n"
-"POT-Creation-Date: 2015-03-17 18:47+0100\n"
-"PO-Revision-Date: 2014-08-26 14:14+0000\n"
-"Last-Translator: fusiondirectory <contact@fusiondirectory.org>\n"
-"Language-Team: Spanish (http://www.transifex.com/projects/p/FusionDirectory-108/language/es/)\n"
+"POT-Creation-Date: 2014-12-15 17:47+0100\n"
+"PO-Revision-Date: 2014-08-28 10:30+0000\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: Spanish (http://www.transifex.com/projects/p/FusionDirectory-109/language/es/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
diff --git a/weblink/locale/es_VE/fusiondirectory.po b/weblink/locale/es_VE/fusiondirectory.po
index 5e5dba0de59b9f1e89da2f54bf9aeb274897e03c..ec262fb0b891ed8fa4a2157865b28d273917ae0e 100644
--- a/weblink/locale/es_VE/fusiondirectory.po
+++ b/weblink/locale/es_VE/fusiondirectory.po
@@ -5,12 +5,12 @@
 # Translators:
 msgid ""
 msgstr ""
-"Project-Id-Version: FusionDirectory-108\n"
+"Project-Id-Version: FusionDirectory-109\n"
 "Report-Msgid-Bugs-To: documentation@lists.fusiondirectory.org\n"
-"POT-Creation-Date: 2015-03-17 18:47+0100\n"
-"PO-Revision-Date: 2014-08-26 14:14+0000\n"
-"Last-Translator: fusiondirectory <contact@fusiondirectory.org>\n"
-"Language-Team: Spanish (Venezuela) (http://www.transifex.com/projects/p/FusionDirectory-108/language/es_VE/)\n"
+"POT-Creation-Date: 2014-12-15 17:47+0100\n"
+"PO-Revision-Date: 2014-08-28 10:30+0000\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: Spanish (Venezuela) (http://www.transifex.com/projects/p/FusionDirectory-109/language/es_VE/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
diff --git a/weblink/locale/fa_IR/fusiondirectory.po b/weblink/locale/fa_IR/fusiondirectory.po
index ac9194cd470e659166e65cb117d42d7b2b24b419..8b6b429e068b235cc2faba63277ce6ea244fb8e9 100644
--- a/weblink/locale/fa_IR/fusiondirectory.po
+++ b/weblink/locale/fa_IR/fusiondirectory.po
@@ -5,12 +5,12 @@
 # Translators:
 msgid ""
 msgstr ""
-"Project-Id-Version: FusionDirectory-108\n"
+"Project-Id-Version: FusionDirectory-109\n"
 "Report-Msgid-Bugs-To: documentation@lists.fusiondirectory.org\n"
-"POT-Creation-Date: 2015-03-17 18:47+0100\n"
-"PO-Revision-Date: 2014-08-26 14:14+0000\n"
-"Last-Translator: fusiondirectory <contact@fusiondirectory.org>\n"
-"Language-Team: Persian (Iran) (http://www.transifex.com/projects/p/FusionDirectory-108/language/fa_IR/)\n"
+"POT-Creation-Date: 2014-12-15 17:47+0100\n"
+"PO-Revision-Date: 2014-08-28 10:30+0000\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: Persian (Iran) (http://www.transifex.com/projects/p/FusionDirectory-109/language/fa_IR/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
diff --git a/weblink/locale/fr/fusiondirectory.po b/weblink/locale/fr/fusiondirectory.po
index e3e248b627db5a8d73d3e4c7a0dc253837d1c66d..6242736417e8ca953f1c351f24bd97f45b5a0b65 100644
--- a/weblink/locale/fr/fusiondirectory.po
+++ b/weblink/locale/fr/fusiondirectory.po
@@ -3,16 +3,14 @@
 # This file is distributed under the same license as the PACKAGE package.
 # 
 # Translators:
-# MCMic, 2014
-# MCMic, 2014
 msgid ""
 msgstr ""
-"Project-Id-Version: FusionDirectory-108\n"
+"Project-Id-Version: FusionDirectory-109\n"
 "Report-Msgid-Bugs-To: documentation@lists.fusiondirectory.org\n"
-"POT-Creation-Date: 2015-03-17 18:47+0100\n"
-"PO-Revision-Date: 2014-12-18 15:40+0000\n"
-"Last-Translator: MCMic\n"
-"Language-Team: French (http://www.transifex.com/projects/p/FusionDirectory-108/language/fr/)\n"
+"POT-Creation-Date: 2014-12-15 17:47+0100\n"
+"PO-Revision-Date: 2014-08-28 10:30+0000\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: French (http://www.transifex.com/projects/p/FusionDirectory-109/language/fr/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -29,7 +27,7 @@ msgstr "Editer le lien web"
 
 #: admin/systems/weblink/class_webLink.inc:44
 msgid "IPMI client settings"
-msgstr "ParamÃ¨tres du client IPMI"
+msgstr "Ã‰dition des paramÃ¨tres du client IPMI"
 
 #: admin/systems/weblink/class_webLink.inc:47
 msgid "Protocol"
@@ -37,7 +35,7 @@ msgstr "Protocole"
 
 #: admin/systems/weblink/class_webLink.inc:47
 msgid "Protocol to use to access the IPMI Web Admin page"
-msgstr "Protocole Ã  utiliser pour accÃ©der Ã  la page Web dâ€™administration IPMI"
+msgstr "Protocole Ã  utiliser pour accÃ©der Ã  la page Web Admin IPMI"
 
 #: admin/systems/weblink/class_webLink.inc:52
 msgid "Link"
@@ -45,4 +43,4 @@ msgstr "Lien"
 
 #: admin/systems/weblink/class_webLink.inc:52
 msgid "Web link to this computer"
-msgstr "Lien Web de cet ordinateur"
+msgstr "Lien Internet de cet ordinateur"
diff --git a/weblink/locale/id/fusiondirectory.po b/weblink/locale/id/fusiondirectory.po
index 9062912799934d869657578fa4a3c1e7a61537b8..58840f5e01b4b70b12576275b2d272e9681fbfb1 100644
--- a/weblink/locale/id/fusiondirectory.po
+++ b/weblink/locale/id/fusiondirectory.po
@@ -5,12 +5,12 @@
 # Translators:
 msgid ""
 msgstr ""
-"Project-Id-Version: FusionDirectory-108\n"
+"Project-Id-Version: FusionDirectory-109\n"
 "Report-Msgid-Bugs-To: documentation@lists.fusiondirectory.org\n"
-"POT-Creation-Date: 2015-03-17 18:47+0100\n"
-"PO-Revision-Date: 2014-08-26 14:14+0000\n"
-"Last-Translator: fusiondirectory <contact@fusiondirectory.org>\n"
-"Language-Team: Indonesian (http://www.transifex.com/projects/p/FusionDirectory-108/language/id/)\n"
+"POT-Creation-Date: 2014-12-15 17:47+0100\n"
+"PO-Revision-Date: 2014-08-28 10:30+0000\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: Indonesian (http://www.transifex.com/projects/p/FusionDirectory-109/language/id/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
diff --git a/weblink/locale/it/fusiondirectory.po b/weblink/locale/it/fusiondirectory.po
index deb4ca00b85d90dbe3fe5ad38cca795a899f5e32..82616118a2314716dfa841c636abed573c1d6049 100644
--- a/weblink/locale/it/fusiondirectory.po
+++ b/weblink/locale/it/fusiondirectory.po
@@ -5,12 +5,12 @@
 # Translators:
 msgid ""
 msgstr ""
-"Project-Id-Version: FusionDirectory-108\n"
+"Project-Id-Version: FusionDirectory-109\n"
 "Report-Msgid-Bugs-To: documentation@lists.fusiondirectory.org\n"
-"POT-Creation-Date: 2015-03-17 18:47+0100\n"
-"PO-Revision-Date: 2014-08-28 10:52+0000\n"
-"Last-Translator: fusiondirectory <contact@fusiondirectory.org>\n"
-"Language-Team: Italian (http://www.transifex.com/projects/p/FusionDirectory-108/language/it/)\n"
+"POT-Creation-Date: 2014-12-15 17:47+0100\n"
+"PO-Revision-Date: 2014-08-28 10:30+0000\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: Italian (http://www.transifex.com/projects/p/FusionDirectory-109/language/it/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
diff --git a/weblink/locale/lv/fusiondirectory.po b/weblink/locale/lv/fusiondirectory.po
index 1db7e77421f42649ab7f304cb57b5faa77976c2c..974c7e0a1d5f94db8a98f8a86e1e43e78b561e1b 100644
--- a/weblink/locale/lv/fusiondirectory.po
+++ b/weblink/locale/lv/fusiondirectory.po
@@ -5,12 +5,12 @@
 # Translators:
 msgid ""
 msgstr ""
-"Project-Id-Version: FusionDirectory-108\n"
+"Project-Id-Version: FusionDirectory-109\n"
 "Report-Msgid-Bugs-To: documentation@lists.fusiondirectory.org\n"
-"POT-Creation-Date: 2015-03-17 18:47+0100\n"
-"PO-Revision-Date: 2014-08-26 14:14+0000\n"
-"Last-Translator: fusiondirectory <contact@fusiondirectory.org>\n"
-"Language-Team: Latvian (http://www.transifex.com/projects/p/FusionDirectory-108/language/lv/)\n"
+"POT-Creation-Date: 2014-12-15 17:47+0100\n"
+"PO-Revision-Date: 2014-08-28 10:30+0000\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: Latvian (http://www.transifex.com/projects/p/FusionDirectory-109/language/lv/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
diff --git a/weblink/locale/nb/fusiondirectory.po b/weblink/locale/nb/fusiondirectory.po
index d9e8287317bd819304293a93558b334d0f4945a7..e90caf83c67e7cb27a0ebb82c895ef0163d35327 100644
--- a/weblink/locale/nb/fusiondirectory.po
+++ b/weblink/locale/nb/fusiondirectory.po
@@ -5,12 +5,12 @@
 # Translators:
 msgid ""
 msgstr ""
-"Project-Id-Version: FusionDirectory-108\n"
+"Project-Id-Version: FusionDirectory-109\n"
 "Report-Msgid-Bugs-To: documentation@lists.fusiondirectory.org\n"
-"POT-Creation-Date: 2015-03-17 18:47+0100\n"
-"PO-Revision-Date: 2014-08-26 14:14+0000\n"
-"Last-Translator: fusiondirectory <contact@fusiondirectory.org>\n"
-"Language-Team: Norwegian BokmÃ¥l (http://www.transifex.com/projects/p/FusionDirectory-108/language/nb/)\n"
+"POT-Creation-Date: 2014-12-15 17:47+0100\n"
+"PO-Revision-Date: 2014-08-28 10:30+0000\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: Norwegian BokmÃ¥l (http://www.transifex.com/projects/p/FusionDirectory-109/language/nb/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
diff --git a/weblink/locale/nl/fusiondirectory.po b/weblink/locale/nl/fusiondirectory.po
index 7f49535bfec1c613e7c7384359113c74566d1dd3..0d691faf7b0e965a1aa98068053ad944a48736e7 100644
--- a/weblink/locale/nl/fusiondirectory.po
+++ b/weblink/locale/nl/fusiondirectory.po
@@ -5,12 +5,12 @@
 # Translators:
 msgid ""
 msgstr ""
-"Project-Id-Version: FusionDirectory-108\n"
+"Project-Id-Version: FusionDirectory-109\n"
 "Report-Msgid-Bugs-To: documentation@lists.fusiondirectory.org\n"
-"POT-Creation-Date: 2015-03-17 18:47+0100\n"
-"PO-Revision-Date: 2014-08-26 14:14+0000\n"
-"Last-Translator: fusiondirectory <contact@fusiondirectory.org>\n"
-"Language-Team: Dutch (http://www.transifex.com/projects/p/FusionDirectory-108/language/nl/)\n"
+"POT-Creation-Date: 2014-12-15 17:47+0100\n"
+"PO-Revision-Date: 2014-08-28 10:30+0000\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: Dutch (http://www.transifex.com/projects/p/FusionDirectory-109/language/nl/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
diff --git a/weblink/locale/pl/fusiondirectory.po b/weblink/locale/pl/fusiondirectory.po
index 91803530664c5041648c78737ba03d550c3742da..d411113eb0f384986c94cf5ab1e55583dada37e8 100644
--- a/weblink/locale/pl/fusiondirectory.po
+++ b/weblink/locale/pl/fusiondirectory.po
@@ -5,12 +5,12 @@
 # Translators:
 msgid ""
 msgstr ""
-"Project-Id-Version: FusionDirectory-108\n"
+"Project-Id-Version: FusionDirectory-109\n"
 "Report-Msgid-Bugs-To: documentation@lists.fusiondirectory.org\n"
-"POT-Creation-Date: 2015-03-17 18:47+0100\n"
-"PO-Revision-Date: 2014-08-26 14:14+0000\n"
-"Last-Translator: fusiondirectory <contact@fusiondirectory.org>\n"
-"Language-Team: Polish (http://www.transifex.com/projects/p/FusionDirectory-108/language/pl/)\n"
+"POT-Creation-Date: 2014-12-15 17:47+0100\n"
+"PO-Revision-Date: 2014-08-28 10:30+0000\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: Polish (http://www.transifex.com/projects/p/FusionDirectory-109/language/pl/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
diff --git a/weblink/locale/pt/fusiondirectory.po b/weblink/locale/pt/fusiondirectory.po
index 26e7fd82a2cb97e6035b5aec519e3cd05013a30f..dfa49dd2aa69e03913266c81aded5ad66477c369 100644
--- a/weblink/locale/pt/fusiondirectory.po
+++ b/weblink/locale/pt/fusiondirectory.po
@@ -5,12 +5,12 @@
 # Translators:
 msgid ""
 msgstr ""
-"Project-Id-Version: FusionDirectory-108\n"
+"Project-Id-Version: FusionDirectory-109\n"
 "Report-Msgid-Bugs-To: documentation@lists.fusiondirectory.org\n"
-"POT-Creation-Date: 2015-03-17 18:47+0100\n"
-"PO-Revision-Date: 2014-08-26 14:14+0000\n"
-"Last-Translator: fusiondirectory <contact@fusiondirectory.org>\n"
-"Language-Team: Portuguese (http://www.transifex.com/projects/p/FusionDirectory-108/language/pt/)\n"
+"POT-Creation-Date: 2014-12-15 17:47+0100\n"
+"PO-Revision-Date: 2014-08-28 10:30+0000\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: Portuguese (http://www.transifex.com/projects/p/FusionDirectory-109/language/pt/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
diff --git a/weblink/locale/pt_BR/fusiondirectory.po b/weblink/locale/pt_BR/fusiondirectory.po
index 193b6704eea32957c3413019c488bfd4023bb785..503ae7aa4335d4f66c5578354daadb7cd4170d69 100644
--- a/weblink/locale/pt_BR/fusiondirectory.po
+++ b/weblink/locale/pt_BR/fusiondirectory.po
@@ -3,15 +3,14 @@
 # This file is distributed under the same license as the PACKAGE package.
 # 
 # Translators:
-# ALEJANDRO BARRIOS <alejandrobarrios@interlegis.leg.br>, 2014
 msgid ""
 msgstr ""
-"Project-Id-Version: FusionDirectory-108\n"
+"Project-Id-Version: FusionDirectory-109\n"
 "Report-Msgid-Bugs-To: documentation@lists.fusiondirectory.org\n"
-"POT-Creation-Date: 2015-03-17 18:47+0100\n"
-"PO-Revision-Date: 2014-08-28 10:52+0000\n"
-"Last-Translator: fusiondirectory <contact@fusiondirectory.org>\n"
-"Language-Team: Portuguese (Brazil) (http://www.transifex.com/projects/p/FusionDirectory-108/language/pt_BR/)\n"
+"POT-Creation-Date: 2014-12-15 17:47+0100\n"
+"PO-Revision-Date: 2014-08-28 10:30+0000\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: Portuguese (Brazil) (http://www.transifex.com/projects/p/FusionDirectory-109/language/pt_BR/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
diff --git a/weblink/locale/ru/fusiondirectory.po b/weblink/locale/ru/fusiondirectory.po
index 3aa0b08ecfdaebb471bed8d58712d5af686c41f3..19c3ad9195a80fa96708af117c9a0573b4e868d7 100644
--- a/weblink/locale/ru/fusiondirectory.po
+++ b/weblink/locale/ru/fusiondirectory.po
@@ -5,17 +5,17 @@
 # Translators:
 msgid ""
 msgstr ""
-"Project-Id-Version: FusionDirectory-108\n"
+"Project-Id-Version: FusionDirectory-109\n"
 "Report-Msgid-Bugs-To: documentation@lists.fusiondirectory.org\n"
-"POT-Creation-Date: 2015-03-17 18:47+0100\n"
-"PO-Revision-Date: 2014-08-26 14:14+0000\n"
-"Last-Translator: fusiondirectory <contact@fusiondirectory.org>\n"
-"Language-Team: Russian (http://www.transifex.com/projects/p/FusionDirectory-108/language/ru/)\n"
+"POT-Creation-Date: 2014-12-15 17:47+0100\n"
+"PO-Revision-Date: 2014-08-28 10:30+0000\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: Russian (http://www.transifex.com/projects/p/FusionDirectory-109/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=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);\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/weblink/class_webLink.inc:31
 msgid "Web link"
@@ -27,7 +27,7 @@ msgstr ""
 
 #: admin/systems/weblink/class_webLink.inc:44
 msgid "IPMI client settings"
-msgstr ""
+msgstr "ÐÐ°ÑÑ‚Ñ€Ð¾Ð¹ÐºÐ¸ ÐºÐ»Ð¸ÐµÐ½Ñ‚Ð° IPMI"
 
 #: admin/systems/weblink/class_webLink.inc:47
 msgid "Protocol"
diff --git a/weblink/locale/ru@petr1708/fusiondirectory.po b/weblink/locale/ru@petr1708/fusiondirectory.po
index e0169a2dceb448b6c81bcbded8baf6905ebb64ae..2c5d1a184a39543df1aeceff13c469a2f8cfe6ff 100644
--- a/weblink/locale/ru@petr1708/fusiondirectory.po
+++ b/weblink/locale/ru@petr1708/fusiondirectory.po
@@ -5,17 +5,17 @@
 # Translators:
 msgid ""
 msgstr ""
-"Project-Id-Version: FusionDirectory-108\n"
+"Project-Id-Version: FusionDirectory-109\n"
 "Report-Msgid-Bugs-To: documentation@lists.fusiondirectory.org\n"
-"POT-Creation-Date: 2015-03-17 18:47+0100\n"
-"PO-Revision-Date: 2014-08-26 14:14+0000\n"
-"Last-Translator: fusiondirectory <contact@fusiondirectory.org>\n"
-"Language-Team: Russian Petrine orthography (http://www.transifex.com/projects/p/FusionDirectory-108/language/ru@petr1708/)\n"
+"POT-Creation-Date: 2014-12-15 17:47+0100\n"
+"PO-Revision-Date: 2014-08-28 10:30+0000\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: Russian Petrine orthography (http://www.transifex.com/projects/p/FusionDirectory-109/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=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);\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/weblink/class_webLink.inc:31
 msgid "Web link"
diff --git a/weblink/locale/sv/fusiondirectory.po b/weblink/locale/sv/fusiondirectory.po
index 70d50ad8215e30294428b1e94eea65b496f76e63..76085c534bcee3471dcee9d12c9b79227f041cf0 100644
--- a/weblink/locale/sv/fusiondirectory.po
+++ b/weblink/locale/sv/fusiondirectory.po
@@ -5,12 +5,12 @@
 # Translators:
 msgid ""
 msgstr ""
-"Project-Id-Version: FusionDirectory-108\n"
+"Project-Id-Version: FusionDirectory-109\n"
 "Report-Msgid-Bugs-To: documentation@lists.fusiondirectory.org\n"
-"POT-Creation-Date: 2015-03-17 18:47+0100\n"
-"PO-Revision-Date: 2014-08-26 14:14+0000\n"
-"Last-Translator: fusiondirectory <contact@fusiondirectory.org>\n"
-"Language-Team: Swedish (http://www.transifex.com/projects/p/FusionDirectory-108/language/sv/)\n"
+"POT-Creation-Date: 2014-12-15 17:47+0100\n"
+"PO-Revision-Date: 2014-08-28 10:30+0000\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: Swedish (http://www.transifex.com/projects/p/FusionDirectory-109/language/sv/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
diff --git a/weblink/locale/ug/fusiondirectory.po b/weblink/locale/ug/fusiondirectory.po
index a7665fccc437cd9e4ec9d9ab6d83790900566ec6..377c289737d99f36058348f4b3c506d1127393b6 100644
--- a/weblink/locale/ug/fusiondirectory.po
+++ b/weblink/locale/ug/fusiondirectory.po
@@ -5,12 +5,12 @@
 # Translators:
 msgid ""
 msgstr ""
-"Project-Id-Version: FusionDirectory-108\n"
+"Project-Id-Version: FusionDirectory-109\n"
 "Report-Msgid-Bugs-To: documentation@lists.fusiondirectory.org\n"
-"POT-Creation-Date: 2015-03-17 18:47+0100\n"
-"PO-Revision-Date: 2014-08-26 14:14+0000\n"
-"Last-Translator: fusiondirectory <contact@fusiondirectory.org>\n"
-"Language-Team: Uighur (http://www.transifex.com/projects/p/FusionDirectory-108/language/ug/)\n"
+"POT-Creation-Date: 2014-12-15 17:47+0100\n"
+"PO-Revision-Date: 2014-08-28 10:30+0000\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: Uighur (http://www.transifex.com/projects/p/FusionDirectory-109/language/ug/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
diff --git a/weblink/locale/vi_VN/fusiondirectory.po b/weblink/locale/vi_VN/fusiondirectory.po
index 4c61bad54ee0ff8e704163f4f0239f89c01361da..ff24f38741900cd99a212fddcc1d3040bda78e7d 100644
--- a/weblink/locale/vi_VN/fusiondirectory.po
+++ b/weblink/locale/vi_VN/fusiondirectory.po
@@ -5,12 +5,12 @@
 # Translators:
 msgid ""
 msgstr ""
-"Project-Id-Version: FusionDirectory-108\n"
+"Project-Id-Version: FusionDirectory-109\n"
 "Report-Msgid-Bugs-To: documentation@lists.fusiondirectory.org\n"
-"POT-Creation-Date: 2015-03-17 18:47+0100\n"
-"PO-Revision-Date: 2014-08-26 14:14+0000\n"
-"Last-Translator: fusiondirectory <contact@fusiondirectory.org>\n"
-"Language-Team: Vietnamese (Viet Nam) (http://www.transifex.com/projects/p/FusionDirectory-108/language/vi_VN/)\n"
+"POT-Creation-Date: 2014-12-15 17:47+0100\n"
+"PO-Revision-Date: 2014-08-28 10:30+0000\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: Vietnamese (Viet Nam) (http://www.transifex.com/projects/p/FusionDirectory-109/language/vi_VN/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
diff --git a/weblink/locale/zh/fusiondirectory.po b/weblink/locale/zh/fusiondirectory.po
index d80eaf87e683a1c7a587908f8be4fe87999208fb..811ad953845865806bcaef94ca45edbec436123b 100644
--- a/weblink/locale/zh/fusiondirectory.po
+++ b/weblink/locale/zh/fusiondirectory.po
@@ -5,12 +5,12 @@
 # Translators:
 msgid ""
 msgstr ""
-"Project-Id-Version: FusionDirectory-108\n"
+"Project-Id-Version: FusionDirectory-109\n"
 "Report-Msgid-Bugs-To: documentation@lists.fusiondirectory.org\n"
-"POT-Creation-Date: 2015-03-17 18:47+0100\n"
-"PO-Revision-Date: 2014-08-26 14:14+0000\n"
-"Last-Translator: fusiondirectory <contact@fusiondirectory.org>\n"
-"Language-Team: Chinese (http://www.transifex.com/projects/p/FusionDirectory-108/language/zh/)\n"
+"POT-Creation-Date: 2014-12-15 17:47+0100\n"
+"PO-Revision-Date: 2014-08-28 10:30+0000\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: Chinese (http://www.transifex.com/projects/p/FusionDirectory-109/language/zh/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
diff --git a/webservice/locale/ar/fusiondirectory.po b/webservice/locale/ar/fusiondirectory.po
index 022cbbbf25d7e369d4fb7d866e58eea2de17173b..9f1fa3c51b3d991fe8314b0d318a9cd48985dbdc 100644
--- a/webservice/locale/ar/fusiondirectory.po
+++ b/webservice/locale/ar/fusiondirectory.po
@@ -5,12 +5,12 @@
 # Translators:
 msgid ""
 msgstr ""
-"Project-Id-Version: FusionDirectory-108\n"
+"Project-Id-Version: FusionDirectory-109\n"
 "Report-Msgid-Bugs-To: documentation@lists.fusiondirectory.org\n"
-"POT-Creation-Date: 2015-03-17 18:47+0100\n"
-"PO-Revision-Date: 2014-08-26 14:13+0000\n"
-"Last-Translator: fusiondirectory <contact@fusiondirectory.org>\n"
-"Language-Team: Arabic (http://www.transifex.com/projects/p/FusionDirectory-108/language/ar/)\n"
+"POT-Creation-Date: 2014-12-15 17:47+0100\n"
+"PO-Revision-Date: 2014-08-28 10:30+0000\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: Arabic (http://www.transifex.com/projects/p/FusionDirectory-109/language/ar/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
diff --git a/webservice/locale/ca/fusiondirectory.po b/webservice/locale/ca/fusiondirectory.po
index a9c3520bc2baf89dde209e1e03405bfd3b9583d5..91368254bcf28317bab6f1ed53879ee310530b11 100644
--- a/webservice/locale/ca/fusiondirectory.po
+++ b/webservice/locale/ca/fusiondirectory.po
@@ -5,12 +5,12 @@
 # Translators:
 msgid ""
 msgstr ""
-"Project-Id-Version: FusionDirectory-108\n"
+"Project-Id-Version: FusionDirectory-109\n"
 "Report-Msgid-Bugs-To: documentation@lists.fusiondirectory.org\n"
-"POT-Creation-Date: 2015-03-17 18:47+0100\n"
-"PO-Revision-Date: 2014-08-28 10:52+0000\n"
-"Last-Translator: fusiondirectory <contact@fusiondirectory.org>\n"
-"Language-Team: Catalan (http://www.transifex.com/projects/p/FusionDirectory-108/language/ca/)\n"
+"POT-Creation-Date: 2014-12-15 17:47+0100\n"
+"PO-Revision-Date: 2014-08-28 10:30+0000\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: Catalan (http://www.transifex.com/projects/p/FusionDirectory-109/language/ca/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
diff --git a/webservice/locale/cs_CZ/fusiondirectory.po b/webservice/locale/cs_CZ/fusiondirectory.po
index c49dadcd494c107aef4730e3c97dd1cd0d6c05c0..04c2f2c5ca80e6bc17c884d4b70a040c484224a2 100644
--- a/webservice/locale/cs_CZ/fusiondirectory.po
+++ b/webservice/locale/cs_CZ/fusiondirectory.po
@@ -3,14 +3,15 @@
 # This file is distributed under the same license as the PACKAGE package.
 # 
 # Translators:
+# Pavel Borecki <pavel.borecki@gmail.com>, 2014-2015
 msgid ""
 msgstr ""
-"Project-Id-Version: FusionDirectory-108\n"
+"Project-Id-Version: FusionDirectory-109\n"
 "Report-Msgid-Bugs-To: documentation@lists.fusiondirectory.org\n"
-"POT-Creation-Date: 2015-03-17 18:47+0100\n"
-"PO-Revision-Date: 2014-12-08 21:51+0000\n"
-"Last-Translator: fusiondirectory <contact@fusiondirectory.org>\n"
-"Language-Team: Czech (Czech Republic) (http://www.transifex.com/projects/p/FusionDirectory-108/language/cs_CZ/)\n"
+"POT-Creation-Date: 2014-12-15 17:47+0100\n"
+"PO-Revision-Date: 2015-04-05 10:21+0000\n"
+"Last-Translator: Pavel Borecki <pavel.borecki@gmail.com>\n"
+"Language-Team: Czech (Czech Republic) (http://www.transifex.com/projects/p/FusionDirectory-109/language/cs_CZ/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -25,11 +26,11 @@ msgstr "NastavenÃ %s/%s FusionDirectory nenÃ ÄitelnÃ©. Akce byla zruÅ¡ena."
 #: html/jsonrpc.php:62
 #, php-format
 msgid "Cannot locate file '%s' - please run '%s' to fix this"
-msgstr "Nemohu nalÃ©zt soubor '%s' â€“ opravte to prosÃm spuÅ¡tÄ›nÃm '%s' (na serveru)."
+msgstr "Nelze nalÃ©zt soubor %s â€“ opravte to spuÅ¡tÄ›nÃm %s (na serveru)."
 
 #: html/jsonrpc.php:253
 msgid "Plugin"
-msgstr "zÃ¡suvnÃ½ modul"
+msgstr "ZÃ¡suvnÃ½ modul"
 
 #: config/class_webserviceConfig.inc:28
 msgid "Webservice configuration"
@@ -37,16 +38,16 @@ msgstr "NastavenÃ webovÃ© sluÅ¾by"
 
 #: config/class_webserviceConfig.inc:29
 msgid "FusionDirectory webservice plugin configuration"
-msgstr ""
+msgstr "NastavenÃ zÃ¡suvnÃ©ho modulu webovÃ¡ sluÅ¾ba pro FusionDirectory"
 
 #: config/class_webserviceConfig.inc:42
 msgid "Webservice"
-msgstr ""
+msgstr "WebovÃ¡ sluÅ¾ba"
 
 #: config/class_webserviceConfig.inc:45
 msgid "Force SSL"
-msgstr ""
+msgstr "Vynutit SSL"
 
 #: config/class_webserviceConfig.inc:45
 msgid "Allow only HTTPS JSON-RPC requests"
-msgstr ""
+msgstr "UmoÅ¾nit JSON-RPC poÅ¾adavky pouze pÅ™es HTTPS"
diff --git a/webservice/locale/de/fusiondirectory.po b/webservice/locale/de/fusiondirectory.po
index 981bfac8ee7f6e510a8302b0f9cf8a57b9fc6b1f..f8300e98e9a33d2b05bad580c4b2592143ee003a 100644
--- a/webservice/locale/de/fusiondirectory.po
+++ b/webservice/locale/de/fusiondirectory.po
@@ -3,14 +3,15 @@
 # This file is distributed under the same license as the PACKAGE package.
 # 
 # Translators:
+# Ettore Atalan <atalanttore@googlemail.com>, 2014
 msgid ""
 msgstr ""
-"Project-Id-Version: FusionDirectory-108\n"
+"Project-Id-Version: FusionDirectory-109\n"
 "Report-Msgid-Bugs-To: documentation@lists.fusiondirectory.org\n"
-"POT-Creation-Date: 2015-03-17 18:47+0100\n"
+"POT-Creation-Date: 2014-12-15 17:47+0100\n"
 "PO-Revision-Date: 2014-09-21 16:11+0000\n"
-"Last-Translator: fusiondirectory <contact@fusiondirectory.org>\n"
-"Language-Team: German (http://www.transifex.com/projects/p/FusionDirectory-108/language/de/)\n"
+"Last-Translator: Ettore Atalan <atalanttore@googlemail.com>\n"
+"Language-Team: German (http://www.transifex.com/projects/p/FusionDirectory-109/language/de/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
diff --git a/webservice/locale/el_GR/fusiondirectory.po b/webservice/locale/el_GR/fusiondirectory.po
new file mode 100644
index 0000000000000000000000000000000000000000..4890296c9232cb7859b60649f4797fbd3e78214f
--- /dev/null
+++ b/webservice/locale/el_GR/fusiondirectory.po
@@ -0,0 +1,52 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR FusionDirectory Project
+# This file is distributed under the same license as the PACKAGE package.
+# 
+# Translators:
+msgid ""
+msgstr ""
+"Project-Id-Version: FusionDirectory-109\n"
+"Report-Msgid-Bugs-To: documentation@lists.fusiondirectory.org\n"
+"POT-Creation-Date: 2014-12-15 17:47+0100\n"
+"PO-Revision-Date: 2015-05-30 11:45+0000\n"
+"Last-Translator: Benoit Mortier <benoit.mortier@opensides.be>\n"
+"Language-Team: Greek (Greece) (http://www.transifex.com/projects/p/FusionDirectory-109/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"
+
+#: html/jsonrpc.php:52
+#, php-format
+msgid "FusionDirectory configuration %s/%s is not readable. Aborted."
+msgstr ""
+
+#: html/jsonrpc.php:62
+#, php-format
+msgid "Cannot locate file '%s' - please run '%s' to fix this"
+msgstr ""
+
+#: html/jsonrpc.php:253
+msgid "Plugin"
+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/en/fusiondirectory.po b/webservice/locale/en/fusiondirectory.po
index b681aa8952ec2dcf2887427050d64302a754b9e0..64e41ff74ba5d685305335739e36245938eda388 100644
--- a/webservice/locale/en/fusiondirectory.po
+++ b/webservice/locale/en/fusiondirectory.po
@@ -6,13 +6,13 @@
 #, fuzzy
 msgid ""
 msgstr ""
-"Project-Id-Version: PACKAGE VERSION\n"
-"Report-Msgid-Bugs-To: documentation@lists.fusiondirectory.org\n"
-"POT-Creation-Date: 2015-03-31 11:49+0200\n"
+"Project-Id-Version: FusionDirectory VERSION\n"
+"Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
+"POT-Creation-Date: 2015-05-30 15:30+0200\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
-"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
-"Language-Team: LANGUAGE <LL@li.org>\n"
-"Language: \n"
+"Last-Translator: FusionDirectory project <contact@fusiondirectory.org>\n"
+"Language-Team: English\n"
+"Language: en\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
diff --git a/webservice/locale/es/fusiondirectory.po b/webservice/locale/es/fusiondirectory.po
index c6f8fd99a3ee6bf4897ad7c7cd6775532c73077d..99b8d602b8c3efe8cbcb47c6ef6e9e609a6bb685 100644
--- a/webservice/locale/es/fusiondirectory.po
+++ b/webservice/locale/es/fusiondirectory.po
@@ -5,12 +5,12 @@
 # Translators:
 msgid ""
 msgstr ""
-"Project-Id-Version: FusionDirectory-108\n"
+"Project-Id-Version: FusionDirectory-109\n"
 "Report-Msgid-Bugs-To: documentation@lists.fusiondirectory.org\n"
-"POT-Creation-Date: 2015-03-17 18:47+0100\n"
-"PO-Revision-Date: 2014-08-28 10:52+0000\n"
-"Last-Translator: fusiondirectory <contact@fusiondirectory.org>\n"
-"Language-Team: Spanish (http://www.transifex.com/projects/p/FusionDirectory-108/language/es/)\n"
+"POT-Creation-Date: 2014-12-15 17:47+0100\n"
+"PO-Revision-Date: 2014-08-28 10:30+0000\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: Spanish (http://www.transifex.com/projects/p/FusionDirectory-109/language/es/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
diff --git a/webservice/locale/es_VE/fusiondirectory.po b/webservice/locale/es_VE/fusiondirectory.po
index b567fcfbaeac0e7048ec96266fca0f14be2e0378..78cad15671d87075b8484b5942a57c40554d11cd 100644
--- a/webservice/locale/es_VE/fusiondirectory.po
+++ b/webservice/locale/es_VE/fusiondirectory.po
@@ -5,12 +5,12 @@
 # Translators:
 msgid ""
 msgstr ""
-"Project-Id-Version: FusionDirectory-108\n"
+"Project-Id-Version: FusionDirectory-109\n"
 "Report-Msgid-Bugs-To: documentation@lists.fusiondirectory.org\n"
-"POT-Creation-Date: 2015-03-17 18:47+0100\n"
-"PO-Revision-Date: 2014-08-28 10:52+0000\n"
-"Last-Translator: fusiondirectory <contact@fusiondirectory.org>\n"
-"Language-Team: Spanish (Venezuela) (http://www.transifex.com/projects/p/FusionDirectory-108/language/es_VE/)\n"
+"POT-Creation-Date: 2014-12-15 17:47+0100\n"
+"PO-Revision-Date: 2014-08-28 10:30+0000\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: Spanish (Venezuela) (http://www.transifex.com/projects/p/FusionDirectory-109/language/es_VE/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
diff --git a/webservice/locale/fa_IR/fusiondirectory.po b/webservice/locale/fa_IR/fusiondirectory.po
index 46775528afc5fe125aa2dfc1d95cd3331737adb6..77127fcc535528706248474172fda6e3a7f933ca 100644
--- a/webservice/locale/fa_IR/fusiondirectory.po
+++ b/webservice/locale/fa_IR/fusiondirectory.po
@@ -5,12 +5,12 @@
 # Translators:
 msgid ""
 msgstr ""
-"Project-Id-Version: FusionDirectory-108\n"
+"Project-Id-Version: FusionDirectory-109\n"
 "Report-Msgid-Bugs-To: documentation@lists.fusiondirectory.org\n"
-"POT-Creation-Date: 2015-03-17 18:47+0100\n"
-"PO-Revision-Date: 2014-08-28 10:52+0000\n"
-"Last-Translator: fusiondirectory <contact@fusiondirectory.org>\n"
-"Language-Team: Persian (Iran) (http://www.transifex.com/projects/p/FusionDirectory-108/language/fa_IR/)\n"
+"POT-Creation-Date: 2014-12-15 17:47+0100\n"
+"PO-Revision-Date: 2014-08-28 10:30+0000\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: Persian (Iran) (http://www.transifex.com/projects/p/FusionDirectory-109/language/fa_IR/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
diff --git a/webservice/locale/fr/fusiondirectory.po b/webservice/locale/fr/fusiondirectory.po
index 0fcc0224e78fbd080cde0c5081c1c195b1249c50..9b8583c53352cf94daa18ffca125a01e741f2dbe 100644
--- a/webservice/locale/fr/fusiondirectory.po
+++ b/webservice/locale/fr/fusiondirectory.po
@@ -3,18 +3,14 @@
 # This file is distributed under the same license as the PACKAGE package.
 # 
 # Translators:
-# MCMic, 2014
-# fusiondirectory <contact@fusiondirectory.org>, 2014
-# fusiondirectory <contact@fusiondirectory.org>, 2014
-# MCMic, 2014
 msgid ""
 msgstr ""
-"Project-Id-Version: FusionDirectory-108\n"
+"Project-Id-Version: FusionDirectory-109\n"
 "Report-Msgid-Bugs-To: documentation@lists.fusiondirectory.org\n"
-"POT-Creation-Date: 2015-03-17 18:47+0100\n"
-"PO-Revision-Date: 2014-12-18 15:40+0000\n"
-"Last-Translator: MCMic\n"
-"Language-Team: French (http://www.transifex.com/projects/p/FusionDirectory-108/language/fr/)\n"
+"POT-Creation-Date: 2014-12-15 17:47+0100\n"
+"PO-Revision-Date: 2014-08-28 10:30+0000\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: French (http://www.transifex.com/projects/p/FusionDirectory-109/language/fr/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -29,15 +25,15 @@ msgstr "Le fichier de configuration de FusionDirectory %s/%s ne peut Ãªtre lu. A
 #: html/jsonrpc.php:62
 #, php-format
 msgid "Cannot locate file '%s' - please run '%s' to fix this"
-msgstr "Fichier introuvable '%s' - veuillez exÃ©cuter '%s' pour rÃ©gler ce problÃ¨me"
+msgstr "Je n'ai pas trouvÃ© '%s' - veuillez exÃ©cuter '%s' pour rÃ©gler ce problÃ¨me"
 
 #: html/jsonrpc.php:253
 msgid "Plugin"
-msgstr "Plugin"
+msgstr "Extension"
 
 #: config/class_webserviceConfig.inc:28
 msgid "Webservice configuration"
-msgstr "Configuration du service Web"
+msgstr "Configuration du Service Web"
 
 #: config/class_webserviceConfig.inc:29
 msgid "FusionDirectory webservice plugin configuration"
diff --git a/webservice/locale/id/fusiondirectory.po b/webservice/locale/id/fusiondirectory.po
index d738797ae93aaa79248c118d0fdba157a6864eb8..8b785ca90a193a1b7dd1546f0dff452e9112fca8 100644
--- a/webservice/locale/id/fusiondirectory.po
+++ b/webservice/locale/id/fusiondirectory.po
@@ -5,12 +5,12 @@
 # Translators:
 msgid ""
 msgstr ""
-"Project-Id-Version: FusionDirectory-108\n"
+"Project-Id-Version: FusionDirectory-109\n"
 "Report-Msgid-Bugs-To: documentation@lists.fusiondirectory.org\n"
-"POT-Creation-Date: 2015-03-17 18:47+0100\n"
-"PO-Revision-Date: 2014-08-26 14:14+0000\n"
-"Last-Translator: fusiondirectory <contact@fusiondirectory.org>\n"
-"Language-Team: Indonesian (http://www.transifex.com/projects/p/FusionDirectory-108/language/id/)\n"
+"POT-Creation-Date: 2014-12-15 17:47+0100\n"
+"PO-Revision-Date: 2014-08-28 10:30+0000\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: Indonesian (http://www.transifex.com/projects/p/FusionDirectory-109/language/id/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
diff --git a/webservice/locale/it/fusiondirectory.po b/webservice/locale/it/fusiondirectory.po
index c333642cd5d9c89c73efceeea973e085d3d49a02..9e17965c5189f9b4e5f404639770439f52998ac4 100644
--- a/webservice/locale/it/fusiondirectory.po
+++ b/webservice/locale/it/fusiondirectory.po
@@ -5,12 +5,12 @@
 # Translators:
 msgid ""
 msgstr ""
-"Project-Id-Version: FusionDirectory-108\n"
+"Project-Id-Version: FusionDirectory-109\n"
 "Report-Msgid-Bugs-To: documentation@lists.fusiondirectory.org\n"
-"POT-Creation-Date: 2015-03-17 18:47+0100\n"
-"PO-Revision-Date: 2014-08-28 10:52+0000\n"
-"Last-Translator: fusiondirectory <contact@fusiondirectory.org>\n"
-"Language-Team: Italian (http://www.transifex.com/projects/p/FusionDirectory-108/language/it/)\n"
+"POT-Creation-Date: 2014-12-15 17:47+0100\n"
+"PO-Revision-Date: 2014-08-28 10:30+0000\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: Italian (http://www.transifex.com/projects/p/FusionDirectory-109/language/it/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
diff --git a/webservice/locale/lv/fusiondirectory.po b/webservice/locale/lv/fusiondirectory.po
index 2e58a03742942c33189e1c32c04f53b6f066d6eb..3544d925c2b7ac9c727169a7fd83f20214b51e92 100644
--- a/webservice/locale/lv/fusiondirectory.po
+++ b/webservice/locale/lv/fusiondirectory.po
@@ -5,12 +5,12 @@
 # Translators:
 msgid ""
 msgstr ""
-"Project-Id-Version: FusionDirectory-108\n"
+"Project-Id-Version: FusionDirectory-109\n"
 "Report-Msgid-Bugs-To: documentation@lists.fusiondirectory.org\n"
-"POT-Creation-Date: 2015-03-17 18:47+0100\n"
-"PO-Revision-Date: 2014-08-26 14:14+0000\n"
-"Last-Translator: fusiondirectory <contact@fusiondirectory.org>\n"
-"Language-Team: Latvian (http://www.transifex.com/projects/p/FusionDirectory-108/language/lv/)\n"
+"POT-Creation-Date: 2014-12-15 17:47+0100\n"
+"PO-Revision-Date: 2014-08-28 10:30+0000\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: Latvian (http://www.transifex.com/projects/p/FusionDirectory-109/language/lv/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
diff --git a/webservice/locale/nb/fusiondirectory.po b/webservice/locale/nb/fusiondirectory.po
index 8a9b2396748049fa60d6bfceaa454c3d476977be..3d93e2df32e99d3881170e5f11f99264ac861812 100644
--- a/webservice/locale/nb/fusiondirectory.po
+++ b/webservice/locale/nb/fusiondirectory.po
@@ -5,12 +5,12 @@
 # Translators:
 msgid ""
 msgstr ""
-"Project-Id-Version: FusionDirectory-108\n"
+"Project-Id-Version: FusionDirectory-109\n"
 "Report-Msgid-Bugs-To: documentation@lists.fusiondirectory.org\n"
-"POT-Creation-Date: 2015-03-17 18:47+0100\n"
-"PO-Revision-Date: 2014-08-26 14:14+0000\n"
-"Last-Translator: fusiondirectory <contact@fusiondirectory.org>\n"
-"Language-Team: Norwegian BokmÃ¥l (http://www.transifex.com/projects/p/FusionDirectory-108/language/nb/)\n"
+"POT-Creation-Date: 2014-12-15 17:47+0100\n"
+"PO-Revision-Date: 2014-08-28 10:30+0000\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: Norwegian BokmÃ¥l (http://www.transifex.com/projects/p/FusionDirectory-109/language/nb/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
diff --git a/webservice/locale/nl/fusiondirectory.po b/webservice/locale/nl/fusiondirectory.po
index 032740bd8b3def40766d5c2bc4ca2f4fd301467e..b3aeeea20469a7bbb1fea825bac3d520eef6afb8 100644
--- a/webservice/locale/nl/fusiondirectory.po
+++ b/webservice/locale/nl/fusiondirectory.po
@@ -5,12 +5,12 @@
 # Translators:
 msgid ""
 msgstr ""
-"Project-Id-Version: FusionDirectory-108\n"
+"Project-Id-Version: FusionDirectory-109\n"
 "Report-Msgid-Bugs-To: documentation@lists.fusiondirectory.org\n"
-"POT-Creation-Date: 2015-03-17 18:47+0100\n"
-"PO-Revision-Date: 2014-08-28 10:52+0000\n"
-"Last-Translator: fusiondirectory <contact@fusiondirectory.org>\n"
-"Language-Team: Dutch (http://www.transifex.com/projects/p/FusionDirectory-108/language/nl/)\n"
+"POT-Creation-Date: 2014-12-15 17:47+0100\n"
+"PO-Revision-Date: 2014-08-28 10:30+0000\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: Dutch (http://www.transifex.com/projects/p/FusionDirectory-109/language/nl/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
diff --git a/webservice/locale/pl/fusiondirectory.po b/webservice/locale/pl/fusiondirectory.po
index e6f16ead0b365bbda196848dc5a1d347732e0e6e..b8f9da4d17b417d0fc48f2964ec4b3733d9f2c20 100644
--- a/webservice/locale/pl/fusiondirectory.po
+++ b/webservice/locale/pl/fusiondirectory.po
@@ -5,12 +5,12 @@
 # Translators:
 msgid ""
 msgstr ""
-"Project-Id-Version: FusionDirectory-108\n"
+"Project-Id-Version: FusionDirectory-109\n"
 "Report-Msgid-Bugs-To: documentation@lists.fusiondirectory.org\n"
-"POT-Creation-Date: 2015-03-17 18:47+0100\n"
-"PO-Revision-Date: 2014-08-28 10:52+0000\n"
-"Last-Translator: fusiondirectory <contact@fusiondirectory.org>\n"
-"Language-Team: Polish (http://www.transifex.com/projects/p/FusionDirectory-108/language/pl/)\n"
+"POT-Creation-Date: 2014-12-15 17:47+0100\n"
+"PO-Revision-Date: 2014-08-28 10:30+0000\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: Polish (http://www.transifex.com/projects/p/FusionDirectory-109/language/pl/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
diff --git a/webservice/locale/pt/fusiondirectory.po b/webservice/locale/pt/fusiondirectory.po
index 9014a63b7b4180ce2736c31251661ea40184e317..6890e69f5aa4c960d13f9b200445419ee3cb822e 100644
--- a/webservice/locale/pt/fusiondirectory.po
+++ b/webservice/locale/pt/fusiondirectory.po
@@ -5,12 +5,12 @@
 # Translators:
 msgid ""
 msgstr ""
-"Project-Id-Version: FusionDirectory-108\n"
+"Project-Id-Version: FusionDirectory-109\n"
 "Report-Msgid-Bugs-To: documentation@lists.fusiondirectory.org\n"
-"POT-Creation-Date: 2015-03-17 18:47+0100\n"
-"PO-Revision-Date: 2014-08-26 14:14+0000\n"
-"Last-Translator: fusiondirectory <contact@fusiondirectory.org>\n"
-"Language-Team: Portuguese (http://www.transifex.com/projects/p/FusionDirectory-108/language/pt/)\n"
+"POT-Creation-Date: 2014-12-15 17:47+0100\n"
+"PO-Revision-Date: 2014-08-28 10:30+0000\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: Portuguese (http://www.transifex.com/projects/p/FusionDirectory-109/language/pt/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
diff --git a/webservice/locale/pt_BR/fusiondirectory.po b/webservice/locale/pt_BR/fusiondirectory.po
index 9acdff3aef8a648410cbcc186d5b7397f7037771..8722f54b7c363b124f9b2f5cbd6ddf926fd649ae 100644
--- a/webservice/locale/pt_BR/fusiondirectory.po
+++ b/webservice/locale/pt_BR/fusiondirectory.po
@@ -5,12 +5,12 @@
 # Translators:
 msgid ""
 msgstr ""
-"Project-Id-Version: FusionDirectory-108\n"
+"Project-Id-Version: FusionDirectory-109\n"
 "Report-Msgid-Bugs-To: documentation@lists.fusiondirectory.org\n"
-"POT-Creation-Date: 2015-03-17 18:47+0100\n"
-"PO-Revision-Date: 2014-08-28 10:52+0000\n"
-"Last-Translator: fusiondirectory <contact@fusiondirectory.org>\n"
-"Language-Team: Portuguese (Brazil) (http://www.transifex.com/projects/p/FusionDirectory-108/language/pt_BR/)\n"
+"POT-Creation-Date: 2014-12-15 17:47+0100\n"
+"PO-Revision-Date: 2014-08-28 10:30+0000\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: Portuguese (Brazil) (http://www.transifex.com/projects/p/FusionDirectory-109/language/pt_BR/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
diff --git a/webservice/locale/ru/fusiondirectory.po b/webservice/locale/ru/fusiondirectory.po
index 035fa43f57982aeb07996e51ec3ed519430c18a2..9b3ef50f4b6722c1b39358081756d5356483c7fe 100644
--- a/webservice/locale/ru/fusiondirectory.po
+++ b/webservice/locale/ru/fusiondirectory.po
@@ -5,17 +5,17 @@
 # Translators:
 msgid ""
 msgstr ""
-"Project-Id-Version: FusionDirectory-108\n"
+"Project-Id-Version: FusionDirectory-109\n"
 "Report-Msgid-Bugs-To: documentation@lists.fusiondirectory.org\n"
-"POT-Creation-Date: 2015-03-17 18:47+0100\n"
-"PO-Revision-Date: 2015-03-05 06:51+0000\n"
-"Last-Translator: fusiondirectory <contact@fusiondirectory.org>\n"
-"Language-Team: Russian (http://www.transifex.com/projects/p/FusionDirectory-108/language/ru/)\n"
+"POT-Creation-Date: 2014-12-15 17:47+0100\n"
+"PO-Revision-Date: 2014-08-28 10:30+0000\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: Russian (http://www.transifex.com/projects/p/FusionDirectory-109/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=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);\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/jsonrpc.php:52
 #, php-format
@@ -25,7 +25,7 @@ msgstr ""
 #: html/jsonrpc.php:62
 #, php-format
 msgid "Cannot locate file '%s' - please run '%s' to fix this"
-msgstr ""
+msgstr "ÐÐµ Ð¼Ð¾Ð³Ñƒ Ð¾Ð±Ð½Ð°Ñ€ÑƒÐ¶Ð¸Ñ‚ÑŒ Ñ„Ð°Ð¹Ð» '%s' - Ð¿Ð¾Ð¶Ð°Ð»ÑƒÐ¹ÑÑ‚Ð° Ð·Ð°Ð¿ÑƒÑÑ‚Ð¸Ñ‚Ðµ '%s', Ñ‡Ñ‚Ð¾Ð±Ñ‹ Ð¸ÑÐ¿Ñ€Ð°Ð²Ð¸Ñ‚ÑŒ ÑÑ‚Ð¾."
 
 #: html/jsonrpc.php:253
 msgid "Plugin"
diff --git a/webservice/locale/ru@petr1708/fusiondirectory.po b/webservice/locale/ru@petr1708/fusiondirectory.po
index 6220269690669a5c86ccf149c5caf6c8ec5407c7..1fbf2fad9823ef42adb837bc189c22e3ccc2debc 100644
--- a/webservice/locale/ru@petr1708/fusiondirectory.po
+++ b/webservice/locale/ru@petr1708/fusiondirectory.po
@@ -5,17 +5,17 @@
 # Translators:
 msgid ""
 msgstr ""
-"Project-Id-Version: FusionDirectory-108\n"
+"Project-Id-Version: FusionDirectory-109\n"
 "Report-Msgid-Bugs-To: documentation@lists.fusiondirectory.org\n"
-"POT-Creation-Date: 2015-03-17 18:47+0100\n"
-"PO-Revision-Date: 2014-08-26 14:14+0000\n"
-"Last-Translator: fusiondirectory <contact@fusiondirectory.org>\n"
-"Language-Team: Russian Petrine orthography (http://www.transifex.com/projects/p/FusionDirectory-108/language/ru@petr1708/)\n"
+"POT-Creation-Date: 2014-12-15 17:47+0100\n"
+"PO-Revision-Date: 2014-08-28 10:30+0000\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: Russian Petrine orthography (http://www.transifex.com/projects/p/FusionDirectory-109/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=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);\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/jsonrpc.php:52
 #, php-format
diff --git a/webservice/locale/sv/fusiondirectory.po b/webservice/locale/sv/fusiondirectory.po
index a7ba730a0d6ae185fc07cf4ac5527ed31e1380f8..bf9213f757b0de0e4f3512cddd64654d95cd71b8 100644
--- a/webservice/locale/sv/fusiondirectory.po
+++ b/webservice/locale/sv/fusiondirectory.po
@@ -5,12 +5,12 @@
 # Translators:
 msgid ""
 msgstr ""
-"Project-Id-Version: FusionDirectory-108\n"
+"Project-Id-Version: FusionDirectory-109\n"
 "Report-Msgid-Bugs-To: documentation@lists.fusiondirectory.org\n"
-"POT-Creation-Date: 2015-03-17 18:47+0100\n"
-"PO-Revision-Date: 2014-08-28 10:52+0000\n"
-"Last-Translator: fusiondirectory <contact@fusiondirectory.org>\n"
-"Language-Team: Swedish (http://www.transifex.com/projects/p/FusionDirectory-108/language/sv/)\n"
+"POT-Creation-Date: 2014-12-15 17:47+0100\n"
+"PO-Revision-Date: 2014-08-28 10:30+0000\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: Swedish (http://www.transifex.com/projects/p/FusionDirectory-109/language/sv/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
diff --git a/webservice/locale/ug/fusiondirectory.po b/webservice/locale/ug/fusiondirectory.po
index 7c0a145559056da944bcce9792bc9fe086fece46..f580a2e23b99283cd96f69053e9e2ca7eb9927ee 100644
--- a/webservice/locale/ug/fusiondirectory.po
+++ b/webservice/locale/ug/fusiondirectory.po
@@ -5,12 +5,12 @@
 # Translators:
 msgid ""
 msgstr ""
-"Project-Id-Version: FusionDirectory-108\n"
+"Project-Id-Version: FusionDirectory-109\n"
 "Report-Msgid-Bugs-To: documentation@lists.fusiondirectory.org\n"
-"POT-Creation-Date: 2015-03-17 18:47+0100\n"
-"PO-Revision-Date: 2014-08-26 14:14+0000\n"
-"Last-Translator: fusiondirectory <contact@fusiondirectory.org>\n"
-"Language-Team: Uighur (http://www.transifex.com/projects/p/FusionDirectory-108/language/ug/)\n"
+"POT-Creation-Date: 2014-12-15 17:47+0100\n"
+"PO-Revision-Date: 2014-08-28 10:30+0000\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: Uighur (http://www.transifex.com/projects/p/FusionDirectory-109/language/ug/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
diff --git a/webservice/locale/vi_VN/fusiondirectory.po b/webservice/locale/vi_VN/fusiondirectory.po
index 0e2796b3433ceef3f9cd266b8de75a7d22f6ee2c..ce9f9a7bbf0e6c80b28cc29d2c942d70e63fbd6c 100644
--- a/webservice/locale/vi_VN/fusiondirectory.po
+++ b/webservice/locale/vi_VN/fusiondirectory.po
@@ -5,12 +5,12 @@
 # Translators:
 msgid ""
 msgstr ""
-"Project-Id-Version: FusionDirectory-108\n"
+"Project-Id-Version: FusionDirectory-109\n"
 "Report-Msgid-Bugs-To: documentation@lists.fusiondirectory.org\n"
-"POT-Creation-Date: 2015-03-17 18:47+0100\n"
-"PO-Revision-Date: 2014-08-28 10:52+0000\n"
-"Last-Translator: fusiondirectory <contact@fusiondirectory.org>\n"
-"Language-Team: Vietnamese (Viet Nam) (http://www.transifex.com/projects/p/FusionDirectory-108/language/vi_VN/)\n"
+"POT-Creation-Date: 2014-12-15 17:47+0100\n"
+"PO-Revision-Date: 2014-08-28 10:30+0000\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: Vietnamese (Viet Nam) (http://www.transifex.com/projects/p/FusionDirectory-109/language/vi_VN/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
diff --git a/webservice/locale/zh/fusiondirectory.po b/webservice/locale/zh/fusiondirectory.po
index 8b45636ab1ca081c3ebf4f3648f6004c7dfad525..d44bf90207567b2eb7483a1565c42461d15aa2ce 100644
--- a/webservice/locale/zh/fusiondirectory.po
+++ b/webservice/locale/zh/fusiondirectory.po
@@ -5,12 +5,12 @@
 # Translators:
 msgid ""
 msgstr ""
-"Project-Id-Version: FusionDirectory-108\n"
+"Project-Id-Version: FusionDirectory-109\n"
 "Report-Msgid-Bugs-To: documentation@lists.fusiondirectory.org\n"
-"POT-Creation-Date: 2015-03-17 18:47+0100\n"
-"PO-Revision-Date: 2014-08-26 14:14+0000\n"
-"Last-Translator: fusiondirectory <contact@fusiondirectory.org>\n"
-"Language-Team: Chinese (http://www.transifex.com/projects/p/FusionDirectory-108/language/zh/)\n"
+"POT-Creation-Date: 2014-12-15 17:47+0100\n"
+"PO-Revision-Date: 2014-08-28 10:30+0000\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: Chinese (http://www.transifex.com/projects/p/FusionDirectory-109/language/zh/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"